From 946f6fd74f6569d2bcdbbc1e006ad6638d2ac223 Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Sun, 15 Dec 2019 16:40:02 -0300
Subject: [PATCH 001/403] PubSubClient: Add disconnect type option

---
 lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
index 68cc2dafa..0748fdc4a 100644
--- a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
+++ b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
@@ -610,11 +610,13 @@ boolean PubSubClient::unsubscribe(const char* topic) {
     return false;
 }
 
-void PubSubClient::disconnect() {
+void PubSubClient::disconnect(bool disconnect_package) {
     buffer[0] = MQTTDISCONNECT;
     buffer[1] = 0;
     if (_client != nullptr) {
-      _client->write(buffer,2);
+      if (disconnect_package) {
+        _client->write(buffer,2);
+      }
       _client->flush();
       _client->stop();
     }

From 08032944b2d596d0020fe23b0506b9583038b89f Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Sun, 15 Dec 2019 16:45:03 -0300
Subject: [PATCH 002/403] PubSubClient: Add disconnect type option

Allow clean disconnect as optional.
This avoid the automatic deletion of LWT message in the broker for clean disconnections, in order to let LWT work also on all cases (Restart, Config Changes, etc) See https://github.com/arendst/Tasmota/issues/7189
---
 lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
index aa2080ed1..593077e8c 100644
--- a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
+++ b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
@@ -141,7 +141,7 @@ public:
    boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
    boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
    boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession);
-   void disconnect();
+   void disconnect(bool disconnect_package = false);
    boolean publish(const char* topic, const char* payload);
    boolean publish(const char* topic, const char* payload, boolean retained);
    boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);

From fa56e958e07008d14529dd113dc993c39e7d3d0d Mon Sep 17 00:00:00 2001
From: root <vinz@trans.am>
Date: Tue, 26 Nov 2019 16:51:53 +0100
Subject: [PATCH 003/403] domoticz -> tasmota support

---
 tasmota/i18n.h               |  1 -
 tasmota/xdrv_07_domoticz.ino | 48 +++++++++++++++++++++++++++++++++++-
 tasmota/xdrv_27_shutter.ino  |  8 +++---
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index fed6930d7..df7cff12b 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -494,7 +494,6 @@
     #define D_JSON_MOTOR_MIS "setMIS"
   #endif
 
-  // Commands xdrv_27_Shutter.ino
   #ifdef USE_SHUTTER
     #define D_PRFX_SHUTTER "Shutter"
     #define D_CMND_SHUTTER_OPEN "Open"
diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index f5e8af19c..9d24d6edf 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -51,6 +51,10 @@ uint32_t domoticz_fan_debounce = 0;             // iFan02 state debounce timer
 bool domoticz_subscribe = false;
 bool domoticz_update_flag = true;
 
+#ifdef USE_SHUTTER
+bool domoticz_is_shutter = false;
+#endif // USE_SHUTTER
+
 int DomoticzBatteryQuality(void)
 {
   // Battery 0%: ESP 2.6V (minimum operating voltage is 2.5)
@@ -108,6 +112,11 @@ void MqttPublishDomoticzPowerState(uint8_t device)
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     if ((device < 1) || (device > devices_present)) { device = 1; }
     if (Settings.domoticz_relay_idx[device -1]) {
+#ifdef USE_SHUTTER
+      if (domoticz_is_shutter) {
+        // Shutter is updated by sensor update - power state should not be sent
+      } else {
+#endif  // USE_SHUTTER
 #ifdef USE_SONOFF_IFAN
       if (IsModuleIfan() && (device > 1)) {
         // Fan handled by MqttPublishDomoticzFanState
@@ -121,6 +130,9 @@ void MqttPublishDomoticzPowerState(uint8_t device)
 #ifdef USE_SONOFF_IFAN
       }
 #endif // USE_SONOFF_IFAN
+#ifdef USE_SHUTTER
+      }
+#endif //USE_SHUTTER
     }
   }
 }
@@ -140,6 +152,13 @@ void DomoticzMqttUpdate(void)
     if (domoticz_update_timer <= 0) {
       domoticz_update_timer = Settings.domoticz_update_timer;
       for (uint32_t i = 1; i <= devices_present; i++) {
+#ifdef USE_SHUTTER
+        if (domoticz_is_shutter)
+        {
+            // no power state updates for shutters
+            break;
+        }
+#endif // USE_SHUTTER
 #ifdef USE_SONOFF_IFAN
         if (IsModuleIfan() && (i > 1)) {
           MqttPublishDomoticzFanState();
@@ -163,6 +182,7 @@ void DomoticzMqttSubscribe(void)
       domoticz_subscribe = true;
     }
   }
+
   if (domoticz_subscribe) {
     char stopic[TOPSZ];
     snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#")); // domoticz topic
@@ -230,6 +250,8 @@ bool DomoticzMqttData(void)
     for (uint32_t i = 0; i < maxdev; i++) {
       if (idx == Settings.domoticz_relay_idx[i]) {
         bool iscolordimmer = strcmp_P(domoticz["dtype"],PSTR("Color Switch")) == 0;
+        bool isShutter = strcmp_P(domoticz["dtype"],PSTR("Light/Switch")) == 0 & strncmp_P(domoticz["switchType"],PSTR("Blinds"), 6) == 0;
+
         char stemp1[10];
         snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), i +1);
 #ifdef USE_SONOFF_IFAN
@@ -252,6 +274,28 @@ bool DomoticzMqttData(void)
           found = true;
         } else
 #endif  // USE_SONOFF_IFAN
+#ifdef USE_SHUTTER
+        if (isShutter)
+        {
+          if (domoticz.containsKey("nvalue")) {
+            nvalue = domoticz["nvalue"];
+          }
+
+          uint8_t position = 0;
+          if (domoticz.containsKey("svalue1")) {
+            position = domoticz["svalue1"];
+          }
+          if (nvalue != 2) {
+            position = nvalue == 0 ? 0 : 100;
+          }
+
+          snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), position);
+          XdrvMailbox.data_len = position > 99 ? 3 : (position > 9 ? 2 : 1);
+
+          found = true;
+        } else
+#endif // USE_SHUTTER
         if (iscolordimmer && 10 == nvalue) {  // Color_SetColor
           JsonObject& color = domoticz["Color"];
           uint16_t level = nvalue = domoticz["svalue1"];
@@ -573,7 +617,6 @@ void DomoticzSaveSettings(void)
 bool Xdrv07(uint8_t function)
 {
   bool result = false;
-
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     switch (function) {
       case FUNC_EVERY_SECOND:
@@ -592,6 +635,9 @@ bool Xdrv07(uint8_t function)
 #endif  // USE_WEBSERVER
       case FUNC_MQTT_SUBSCRIBE:
         DomoticzMqttSubscribe();
+#ifdef USE_SHUTTER
+        if (Settings.domoticz_sensor_idx[DZ_SHUTTER]) { domoticz_is_shutter = true; }
+#endif // USE_SHUTTER
         break;
       case FUNC_MQTT_INIT:
         domoticz_update_timer = 2;
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index e13bba771..97212ad6e 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -528,12 +528,12 @@ void CmndShutterPosition(void)
     //limit the payload
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
 
+    // value 0 with data_len > 0 can mean Open
     if (XdrvMailbox.data_len > 1 &&  XdrvMailbox.payload <=0) {
       UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-      if (!strcmp(XdrvMailbox.data,"UP"))   { CmndShutterOpen(); }
-      if (!strcmp(XdrvMailbox.data,"DOWN")) { CmndShutterClose(); }
-      if (!strcmp(XdrvMailbox.data,"STOP")) { CmndShutterStop(); }
-      return;
+      if (!strcmp(XdrvMailbox.data,"UP"))   { CmndShutterOpen(); return; }
+      if (!strcmp(XdrvMailbox.data,"DOWN")) { CmndShutterClose(); return; }
+      if (!strcmp(XdrvMailbox.data,"STOP")) { CmndShutterStop(); return; }
     }
 
     int8_t target_pos_percent = XdrvMailbox.payload < 0 ? 0 : (XdrvMailbox.payload > 100 ? 100 : XdrvMailbox.payload);

From 082f5e40cefeda76ab458a93a03d4335840c2caa Mon Sep 17 00:00:00 2001
From: ahoiahoi <45395388+ahoiahoi@users.noreply.github.com>
Date: Tue, 26 Nov 2019 16:58:05 +0100
Subject: [PATCH 004/403] accidentally deleted linefeed

---
 tasmota/i18n.h               | 1 +
 tasmota/xdrv_07_domoticz.ino | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index df7cff12b..fed6930d7 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -494,6 +494,7 @@
     #define D_JSON_MOTOR_MIS "setMIS"
   #endif
 
+  // Commands xdrv_27_Shutter.ino
   #ifdef USE_SHUTTER
     #define D_PRFX_SHUTTER "Shutter"
     #define D_CMND_SHUTTER_OPEN "Open"
diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index 9d24d6edf..b20e0335c 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -617,6 +617,7 @@ void DomoticzSaveSettings(void)
 bool Xdrv07(uint8_t function)
 {
   bool result = false;
+
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     switch (function) {
       case FUNC_EVERY_SECOND:

From 15acf8487d980794f475804abcc51eb94f2895dc Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 25 Dec 2019 13:28:29 +0100
Subject: [PATCH 005/403] Bump version to 8.1.0.1

---
 RELEASENOTES.md           |  2 +-
 tasmota/CHANGELOG.md      | 10 ++++++++--
 tasmota/tasmota_version.h |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1e048b2f6..578d145b9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.0.0.3
+### Version 8.1.0 Doris
 
 - Change Settings text handling allowing variable length text within a total text pool of 699 characters
 - Change Smoother ``Fade`` using 100Hz instead of 20Hz animation (#7179)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b351cb091..80c6b480b 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## Unreleased (development)
 
+### 8.1.0.1 20191225
+
+## Released
+
+### 8.1.0 20191225
+
+- Release
+
 ### 8.0.0.3 20191224
 
 - Version bump due to internal Settings change
@@ -22,8 +30,6 @@
 - Add Zigbee coalesce sensor attributes into a single message
 - Add Deepsleep start delay based on Teleperiod if ``Teleperiod`` differs from 10 or 300
 
-## Released
-
 ### 7.2.0 20191221
 
 - Release
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 57329bcd1..8bc0a50e1 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08000003;
+const uint32_t VERSION = 0x08010001;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;

From 4f6a74730016d780273b9a0be1314d5136b59ccf Mon Sep 17 00:00:00 2001
From: Ian Duffy <ian@ianduffy.ie>
Date: Wed, 25 Dec 2019 21:44:38 +0000
Subject: [PATCH 006/403] Add manufactureURL to the hue description.xml
 endpoint

The netdisco library by HA looks for manufacture, modelNumber and manufactureURL for its auto discovery mechanism. https://github.com/home-assistant/netdisco/blob/master/netdisco/discoverables/philips_hue.py

Currently, tasmota doesn't return this, and as a result home assistant doesn't discover the emulator.

this commit adds a manufactureURL so discovery works
---
 tasmota/xdrv_20_hue.ino | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasmota/xdrv_20_hue.ino b/tasmota/xdrv_20_hue.ino
index 80e85d821..c9f0031b0 100644
--- a/tasmota/xdrv_20_hue.ino
+++ b/tasmota/xdrv_20_hue.ino
@@ -124,6 +124,7 @@ const char HUE_DESCRIPTION_XML[] PROGMEM =
     "<friendlyName>Amazon-Echo-HA-Bridge ({x1)</friendlyName>"
 //    "<friendlyName>Philips hue ({x1)</friendlyName>"
     "<manufacturer>Royal Philips Electronics</manufacturer>"
+    "<manufacturerURL>http://www.philips.com</manufacturerURL>"
     "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
     "<modelName>Philips hue bridge 2012</modelName>"
     "<modelNumber>929000226503</modelNumber>"

From aa155f9a52a28421ecb17d9977034d663497ebca Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Wed, 25 Dec 2019 21:59:42 -0300
Subject: [PATCH 007/403] AP MODE: Added Restore Config Button

---
 tasmota/xdrv_01_webserver.ino | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index d86562bb3..b9bad2812 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1693,10 +1693,11 @@ void HandleWifiConfiguration(void)
   }
 
   if (WifiIsInManagerMode()) {
-    WSContentSpaceButton(BUTTON_RESTART);
 #ifndef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESTORE);
     WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
 #endif  // FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESTART);
   } else {
     WSContentSpaceButton(BUTTON_CONFIGURATION);
   }
@@ -1970,7 +1971,11 @@ void HandleRestoreConfiguration(void)
   WSContentSendStyle();
   WSContentSend_P(HTTP_FORM_RST);
   WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  if (WifiIsInManagerMode()) {
+    WSContentSpaceButton(BUTTON_MAIN);
+  } else {
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+  }
   WSContentStop();
 
   Web.upload_error = 0;

From 96842eed7343b2e782eb2dba7c5aadb5c5abbee0 Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Wed, 25 Dec 2019 22:13:17 -0300
Subject: [PATCH 008/403] Better Button Spacing

---
 tasmota/xdrv_01_webserver.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index b9bad2812..d2b405437 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1695,7 +1695,7 @@ void HandleWifiConfiguration(void)
   if (WifiIsInManagerMode()) {
 #ifndef FIRMWARE_MINIMAL
     WSContentSpaceButton(BUTTON_RESTORE);
-    WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
+    WSContentButton(BUTTON_RESET_CONFIGURATION);
 #endif  // FIRMWARE_MINIMAL
     WSContentSpaceButton(BUTTON_RESTART);
   } else {

From e8626e9cca73188ba4b07d9f910b2c71fb9fab98 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 26 Dec 2019 12:26:06 +0100
Subject: [PATCH 009/403] Fix command processing

Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
---
 RELEASENOTES.md      | 14 ++------------
 tasmota/CHANGELOG.md |  2 ++
 tasmota/support.ino  |  7 +++++++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 578d145b9..e2a87362a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,16 +52,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0 Doris
+### Version 8.1.0.1
 
-- Change Settings text handling allowing variable length text within a total text pool of 699 characters
-- Change Smoother ``Fade`` using 100Hz instead of 20Hz animation (#7179)
-- Change number of rule ``Var``s and ``Mem``s from 5 to 16 (#4933)
-- Change number of ``FriendlyName``s from 4 to 8
-- Add commands ``WebButton1`` until ``WebButton16`` to support user defined GUI button text (#7166)
-- Add support for max 150 characters in most command parameter strings (#3686, #4754)
-- Add support for GPS as NTP server by Christian Baars and Adrian Scillato
-- Add support for ``AdcParam`` parameters to control ADC0 Moisture formula by Federico Leoni (#7309)
-- Add Zigbee coalesce sensor attributes into a single message
-- Add Zigbee better support for Xiaomi Double Switch and Xiaomi Vibration sensor
-- Add Deepsleep start delay based on Teleperiod if ``Teleperiod`` differs from 10 or 300
+- Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 80c6b480b..c208e88b8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### 8.1.0.1 20191225
 
+- Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+
 ## Released
 
 ### 8.1.0 20191225
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 4b2bc49fb..9b66fbc2a 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -731,6 +731,13 @@ bool DecodeCommand(const char* haystack, void (* const MyCommand[])(void))
 {
   GetTextIndexed(XdrvMailbox.command, CMDSZ, 0, haystack);  // Get prefix if available
   int prefix_length = strlen(XdrvMailbox.command);
+  if (prefix_length) {
+    char prefix[prefix_length +1];
+    snprintf_P(prefix, sizeof(prefix), XdrvMailbox.topic);  // Copy prefix part only
+    if (strcasecmp(prefix, XdrvMailbox.command)) {
+      return false;                                         // Prefix not in command
+    }
+  }
   int command_code = GetCommandCode(XdrvMailbox.command + prefix_length, CMDSZ, XdrvMailbox.topic + prefix_length, haystack);
   if (command_code > 0) {                                   // Skip prefix
     XdrvMailbox.command_code = command_code -1;

From 3fe685d2521b006490f9bd2ed7b1fc1033bf93da Mon Sep 17 00:00:00 2001
From: localhost61 <33861984+localhost61@users.noreply.github.com>
Date: Thu, 26 Dec 2019 13:28:27 +0100
Subject: [PATCH 010/403] Update French language to  v8.1.0.1

---
 tasmota/language/fr-FR.h | 106 +++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 840421ff3..d9d7019f8 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v7.1.2.4
+ * Updated until v8.1.0.1
 \*********************************************************************/
 
 #define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -83,7 +83,7 @@
 #define D_DNS_SERVER "Serveur DNS"
 #define D_DONE "Fait"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Émulation"
 #define D_ENABLED "Activé"
 #define D_ERASE "Effacer"
@@ -113,7 +113,7 @@
 #define D_LIGHT "Lumière"
 #define D_LWT "LWT"
 #define D_MODULE "Module"
-#define D_MOISTURE "Moisture"
+#define D_MOISTURE "Humidité"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-pression"
 #define D_NOISE "Bruit"
@@ -354,7 +354,7 @@
 #define D_UPLOAD_ERR_11 "Erreur d'effacement du chip RF"
 #define D_UPLOAD_ERR_12 "Erreur d'accès en écriture au chip RF"
 #define D_UPLOAD_ERR_13 "Erreur de décodage du firmware RF"
-#define D_UPLOAD_ERR_14 "Not compatible"
+#define D_UPLOAD_ERR_14 "Incompatible"
 #define D_UPLOAD_ERROR_CODE "Code d'erreur téléchargement"
 
 #define D_ENTER_COMMAND "Saisir une commande"
@@ -500,7 +500,7 @@
 #define D_CALIBRATE "Étalonner"
 #define D_CALIBRATION "Étalonnage"
 
-//xsns_35_tx20.ino
+//xsns_35_TX20.ino
 #define D_TX20_WIND_DIRECTION "Direction du vent"
 #define D_TX20_WIND_SPEED "Vitesse du vent"
 #define D_TX20_WIND_SPEED_AVG "Vitesse Moy."
@@ -521,7 +521,7 @@
 #define D_SENSOR_I2C_SDA       "I2C SDA"
 #define D_SENSOR_WS2812        "WS2812"
 #define D_SENSOR_DFR562        "MP3 Player"
-#define D_SENSOR_IRSEND        "ÉmetIR"
+#define D_SENSOR_IRSEND        "IR TX"
 #define D_SENSOR_SWITCH        "Inter."     // Suffix "1"
 #define D_SENSOR_BUTTON        "Bouton"     // Suffix "1"
 #define D_SENSOR_RELAY         "Relais"     // Suffix "1i"
@@ -529,15 +529,15 @@
 #define D_SENSOR_LED_LINK      "LedLink"    // Suffix "i"
 #define D_SENSOR_PWM           "PWM"        // Suffix "1"
 #define D_SENSOR_COUNTER       "Compteur"   // Suffix "1"
-#define D_SENSOR_IRRECV        "RécptIR"
-#define D_SENSOR_MHZ_RX        "MHZ Rx"
-#define D_SENSOR_MHZ_TX        "MHZ Tx"
-#define D_SENSOR_PZEM004_RX    "PZEM004 Rx"
-#define D_SENSOR_PZEM016_RX    "PZEM016 Rx"
-#define D_SENSOR_PZEM017_RX    "PZEM017 Rx"
-#define D_SENSOR_PZEM0XX_TX    "PZEM0XX Tx"
-#define D_SENSOR_SAIR_RX       "SAir Rx"
-#define D_SENSOR_SAIR_TX       "SAir Tx"
+#define D_SENSOR_IRRECV        "IR RX"
+#define D_SENSOR_MHZ_RX        "MHZ RX"
+#define D_SENSOR_MHZ_TX        "MHZ TX"
+#define D_SENSOR_PZEM004_RX    "PZEM004 RX"
+#define D_SENSOR_PZEM016_RX    "PZEM016 RX"
+#define D_SENSOR_PZEM017_RX    "PZEM017 RX"
+#define D_SENSOR_PZEM0XX_TX    "PZEM0XX TX"
+#define D_SENSOR_SAIR_RX       "SAir RX"
+#define D_SENSOR_SAIR_TX       "SAir TX"
 #define D_SENSOR_SPI_CS        "SPI CS"
 #define D_SENSOR_SPI_DC        "SPI DC"
 #define D_SENSOR_SPI_MISO      "SPI MISO"
@@ -545,28 +545,28 @@
 #define D_SENSOR_SPI_CLK       "SPI CLK"
 #define D_SENSOR_BACKLIGHT     "RétroÉcl"
 #define D_SENSOR_PMS5003       "PMS5003"
-#define D_SENSOR_SDS0X1_RX     "SDS0X1 Rx"
-#define D_SENSOR_SDS0X1_TX     "SDS0X1 Tx"
-#define D_SENSOR_HPMA_RX       "HPMA Rx"
-#define D_SENSOR_HPMA_TX       "HPMA Tx"
-#define D_SENSOR_SBR_RX        "SerBr Rx"
-#define D_SENSOR_SBR_TX        "SerBr Tx"
+#define D_SENSOR_SDS0X1_RX     "SDS0X1 RX"
+#define D_SENSOR_SDS0X1_TX     "SDS0X1 TX"
+#define D_SENSOR_HPMA_RX       "HPMA RX"
+#define D_SENSOR_HPMA_TX       "HPMA TX"
+#define D_SENSOR_SBR_RX        "SerBr RX"
+#define D_SENSOR_SBR_TX        "SerBr TX"
 #define D_SENSOR_SR04_TRIG     "SR04 Tri/TX"
 #define D_SENSOR_SR04_ECHO     "SR04 Ech/RX"
-#define D_SENSOR_SDM120_TX     "SDMx20 Tx"
-#define D_SENSOR_SDM120_RX     "SDMx20 Rx"
-#define D_SENSOR_SDM630_TX     "SDM630 Tx"
-#define D_SENSOR_SDM630_RX     "SDM630 Rx"
+#define D_SENSOR_SDM120_TX     "SDMx20 TX"
+#define D_SENSOR_SDM120_RX     "SDMx20 RX"
+#define D_SENSOR_SDM630_TX     "SDM630 TX"
+#define D_SENSOR_SDM630_RX     "SDM630 RX"
 #define D_SENSOR_TM1638_CLK    "TM16 CLK"
 #define D_SENSOR_TM1638_DIO    "TM16 DIO"
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
 #define D_SENSOR_TX20_TX       "TX20"
-#define D_SENSOR_RFSEND        "RFSend"
-#define D_SENSOR_RFRECV        "RFrecv"
-#define D_SENSOR_TUYA_TX       "Tuya Tx"
-#define D_SENSOR_TUYA_RX       "Tuya Rx"
+#define D_SENSOR_RFSEND        "RF TX"
+#define D_SENSOR_RFRECV        "RF RX"
+#define D_SENSOR_TUYA_TX       "Tuya TX"
+#define D_SENSOR_TUYA_RX       "Tuya RX"
 #define D_SENSOR_MGC3130_XFER  "MGC3130 Xfr"
 #define D_SENSOR_MGC3130_RESET "MGC3130 Rst"
 #define D_SENSOR_SSPI_MISO     "SSPI MISO"
@@ -575,8 +575,8 @@
 #define D_SENSOR_SSPI_CS       "SSPI CS"
 #define D_SENSOR_SSPI_DC       "SSPI DC"
 #define D_SENSOR_RF_SENSOR     "RF Sensor"
-#define D_SENSOR_AZ_RX         "AZ Rx"
-#define D_SENSOR_AZ_TX         "AZ Tx"
+#define D_SENSOR_AZ_RX         "AZ RX"
+#define D_SENSOR_AZ_TX         "AZ TX"
 #define D_SENSOR_MAX31855_CS   "MX31855 CS"
 #define D_SENSOR_MAX31855_CLK  "MX31855 CLK"
 #define D_SENSOR_MAX31855_DO   "MX31855 DO"
@@ -584,13 +584,13 @@
 #define D_SENSOR_NRG_CF1       "HLWBL CF1"
 #define D_SENSOR_HLW_CF        "HLW8012 CF"
 #define D_SENSOR_HJL_CF        "BL0937 CF"
-#define D_SENSOR_MCP39F5_TX    "MCP39F5 Tx"
-#define D_SENSOR_MCP39F5_RX    "MCP39F5 Rx"
+#define D_SENSOR_MCP39F5_TX    "MCP39F5 TX"
+#define D_SENSOR_MCP39F5_RX    "MCP39F5 RX"
 #define D_SENSOR_MCP39F5_RST   "MCP39F5 Rst"
-#define D_SENSOR_CSE7766_TX    "CSE7766 Tx"
-#define D_SENSOR_CSE7766_RX    "CSE7766 Rx"
-#define D_SENSOR_PN532_TX      "PN532 Tx"
-#define D_SENSOR_PN532_RX      "PN532 Rx"
+#define D_SENSOR_CSE7766_TX    "CSE7766 TX"
+#define D_SENSOR_CSE7766_RX    "CSE7766 RX"
+#define D_SENSOR_PN532_TX      "PN532 TX"
+#define D_SENSOR_PN532_RX      "PN532 RX"
 #define D_SENSOR_SM16716_CLK   "SM16716 CLK"
 #define D_SENSOR_SM16716_DAT   "SM16716 DAT"
 #define D_SENSOR_SM16716_POWER "SM16716 PWR"
@@ -598,18 +598,18 @@
 #define D_SENSOR_MY92X1_DCKI   "MY92x1 DCKI"
 #define D_SENSOR_ARIRFRCV      "ALux IrRcv"
 #define D_SENSOR_ARIRFSEL      "ALux IrSel"
-#define D_SENSOR_TXD           "Serial Tx"
-#define D_SENSOR_RXD           "Serial Rx"
+#define D_SENSOR_TXD           "Série TX"
+#define D_SENSOR_RXD           "Série RX"
 #define D_SENSOR_ROTARY        "Rotary"     // Suffix "1A"
 #define D_SENSOR_HRE_CLOCK     "HRE Clock"
 #define D_SENSOR_HRE_DATA      "HRE Data"
 #define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
 #define D_SENSOR_BUZZER        "Buzzer"
 #define D_SENSOR_OLED_RESET    "OLED Reset"
-#define D_SENSOR_ZIGBEE_TXD    "Zigbee Tx"
-#define D_SENSOR_ZIGBEE_RXD    "Zigbee Rx"
-#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
-#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
+#define D_SENSOR_ZIGBEE_TXD    "Zigbee TX"
+#define D_SENSOR_ZIGBEE_RXD    "Zigbee RX"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 TX"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 RX"
 #define D_SENSOR_IBEACON_TX    "iBeacon TX"
 #define D_SENSOR_IBEACON_RX    "iBeacon RX"
 #define D_SENSOR_RDM6300_RX    "RDM6300 RX"
@@ -620,19 +620,19 @@
 #define D_SENSOR_A4988_MS1     "A4988 MS1"
 #define D_SENSOR_A4988_MS2     "A4988 MS2"
 #define D_SENSOR_A4988_MS3     "A4988 MS3"
-#define D_SENSOR_DDS2382_TX    "DDS238-2 Tx"
-#define D_SENSOR_DDS2382_RX    "DDS238-2 Rx"
-#define D_SENSOR_DDSU666_TX    "DDSU666 Tx"
-#define D_SENSOR_DDSU666_RX    "DDSU666 Rx"
+#define D_SENSOR_DDS2382_TX    "DDS238-2 TX"
+#define D_SENSOR_DDS2382_RX    "DDS238-2 RX"
+#define D_SENSOR_DDSU666_TX    "DDSU666 TX"
+#define D_SENSOR_DDSU666_RX    "DDSU666 RX"
 #define D_SENSOR_SM2135_CLK    "SM2135 Clk"
 #define D_SENSOR_SM2135_DAT    "SM2135 Dat"
-#define D_SENSOR_DEEPSLEEP     "DeepSleep"
+#define D_SENSOR_DEEPSLEEP     "Hibernation"
 #define D_SENSOR_EXS_ENABLE    "EXS Enable"
-#define D_SENSOR_SLAVE_TX    "Slave TX"
-#define D_SENSOR_SLAVE_RX    "Slave RX"
-#define D_SENSOR_SLAVE_RESET "Slave RST"
-#define D_SENSOR_GPS_RX        "GPS RX"
+#define D_SENSOR_SLAVE_TX      "Esclave TX"
+#define D_SENSOR_SLAVE_RX      "Esclave RX"
+#define D_SENSOR_SLAVE_RESET   "Esclave Rst"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_GPS_RX        "GPS RX"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -647,7 +647,7 @@
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"

From baacd946252350eb429caf79cf1b78f43704d271 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 26 Dec 2019 17:23:10 +0100
Subject: [PATCH 011/403] Update de-DE.h

---
 tasmota/language/de-DE.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 89d36103d..9e30f42f8 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v8.0.0
+ * Updated until v8.1.0.1
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -66,7 +66,7 @@
 #define D_BYTES "Bytes"
 #define D_CELSIUS "Celsius"
 #define D_CHANNEL "Kanal"
-#define D_CO2 "CO²"
+#define D_CO2 "CO₂"
 #define D_CODE "code"                // Button code
 #define D_COLDLIGHT "kalt"
 #define D_COMMAND "Befehl"
@@ -83,7 +83,7 @@
 #define D_DNS_SERVER "DNS-Server"
 #define D_DONE "erledigt"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulation"
 #define D_ENABLED "aktiviert"
 #define D_ERASE "löschen"
@@ -647,7 +647,7 @@
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"

From 35e306f41047c6c842add3b6742c312a8b3d9793 Mon Sep 17 00:00:00 2001
From: Grzegorz <grzegorz914@icloud.com>
Date: Thu, 26 Dec 2019 19:11:51 +0100
Subject: [PATCH 012/403] Update pl-PL.h

Update PL to last changes.
---
 tasmota/language/pl-PL.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 58168516d..4f2c9c069 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -62,7 +62,7 @@
 #define D_BRIGHTLIGHT "Jasny"
 #define D_BSSID "BSSId"
 #define D_BUTTON "Przycisk"
-#define D_BY "by"                    // Written by me
+#define D_BY "przez"                    // Written by me
 #define D_BYTES "Bajtów"
 #define D_CELSIUS "Celsiusz"
 #define D_CHANNEL "Kanał"
@@ -71,7 +71,7 @@
 #define D_COLDLIGHT "Zimny"
 #define D_COMMAND "Komenda"
 #define D_CONNECTED "Połączony"
-#define D_CORS_DOMAIN "CORS Domain"
+#define D_CORS_DOMAIN "Domena CORS"
 #define D_COUNT "Licz"
 #define D_COUNTER "Licznik"
 #define D_CURRENT "Prąd"          // As in Voltage and Current
@@ -113,7 +113,7 @@
 #define D_LIGHT "Światło"
 #define D_LWT "LWT"
 #define D_MODULE "Moduł"
-#define D_MOISTURE "Moisture"
+#define D_MOISTURE "Wilgotność"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "Wielokrotne naciśnięcie"
 #define D_NOISE "Szum"

From 6ebe7b219b1cbef0d3834cd51f04fd6e8fc16275 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Thu, 26 Dec 2019 22:07:29 +0100
Subject: [PATCH 013/403] Fix White blend mode #7325

---
 tasmota/xdrv_04_light.ino | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index d6e71ab08..a7f996914 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1682,8 +1682,10 @@ void LightAnimate(void)
             cur_col_10bits[i] = changeUIntScale(cur_col_10bits[i] - min_rgb_10, 0, 1023, 0, adjust10);
             cur_col[i] = changeUIntScale(cur_col[i] - min_rgb, 0, 255, 0, Settings.rgbwwTable[i]);
           }
+
           // compute the adjusted white levels for 10 and 8 bits
-          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 255, 0, Settings.rgbwwTable[3]);  // set white power down corrected with rgbwwTable[3]
+          uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
+          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);  // set white power down corrected with rgbwwTable[3]
           uint32_t white = changeUIntScale(min_rgb, 0, 255, 0, Settings.rgbwwTable[3]);  // set white power down corrected with rgbwwTable[3]
           if (LST_RGBW == Light.subtype) {
             // we simply set the white channel
@@ -1863,8 +1865,9 @@ void LightSetOutputs(const uint8_t *cur_col, const uint16_t *cur_col_10bits) {
       }
     }
   }
-  // AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("LGT: R %02X(%d) G %02X(%d) B %02X(%d), CW %02X(%d) WW %02x(%d), D %d"),
-  // cur_col[0], cur_col_10bits[0], cur_col[1], cur_col_10bits[1], cur_col[2], cur_col_10bits[2], cur_col[3], cur_col_10bits[3], cur_col[4], cur_col_10bits[4], light_state.getDimmer());
+  char msg[24];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"),
+            ToHex_P((const unsigned char *)cur_col_10bits, 10, msg, sizeof(msg)));
 
   // Some devices need scaled RGB like Sonoff L1
   // TODO, should be probably moved to the Sonoff L1 support code
@@ -1873,8 +1876,6 @@ void LightSetOutputs(const uint8_t *cur_col, const uint16_t *cur_col_10bits) {
   for (uint32_t i = 0; i < 3; i++) {
     scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
   }
-  // AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("LGT: R%d(%d) G%d(%d) B%d(%d), C%d(%d) W%d(%d), D%d"),
-  //   cur_col[0], scale_col[0], cur_col[1], scale_col[1], cur_col[2], scale_col[2], cur_col[3], scale_col[3], cur_col[4], scale_col[4], light_state.getDimmer());
 
   char *tmp_data = XdrvMailbox.data;
   char *tmp_topic = XdrvMailbox.topic;

From 24aff9b4156d82e4056cb6bb6106c4325ff9001f Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 27 Dec 2019 11:13:22 +0100
Subject: [PATCH 014/403] Add info to Status 0

- Add SerialConfig to ``Status 1``
- Add WifiPower to ``Status 5``
---
 RELEASENOTES.md             |  2 ++
 tasmota/CHANGELOG.md        |  2 ++
 tasmota/support_command.ino | 12 ++++++------
 tasmota/support_wifi.ino    |  7 +++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e2a87362a..f7eabdb5b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -55,3 +55,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 ### Version 8.1.0.1
 
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Add SerialConfig to ``Status 1``
+- Add WifiPower to ``Status 5``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index c208e88b8..a6bc376b6 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### 8.1.0.1 20191225
 
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Add SerialConfig to ``Status 1``
+- Add WifiPower to ``Status 5``
 
 ## Released
 
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index f6413dd57..53f4601a8 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -193,7 +193,7 @@ void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
 //    backlog_delay = millis() + (100 * MIN_BACKLOG_DELAY);
     backlog_delay = millis() + Settings.param[P_BACKLOG_DELAY];
 
-    char command[CMDSZ];
+    char command[CMDSZ] = { 0 };
     XdrvMailbox.command = command;
     XdrvMailbox.index = index;
     XdrvMailbox.data_len = data_len;
@@ -368,10 +368,10 @@ void CmndStatus(void)
   }
 
   if ((0 == payload) || (1 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
                           D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
                           D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
-                          baudrate, SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
+                          baudrate, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
                           GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
                           Settings.cfg_holder, Settings.bootcount, Settings.save_flag, GetSettingsAddress());
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
@@ -417,10 +417,10 @@ void CmndStatus(void)
   if ((0 == payload) || (5 == payload)) {
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"" D_JSON_GATEWAY "\":\"%s\",\""
                           D_JSON_SUBNETMASK "\":\"%s\",\"" D_JSON_DNSSERVER "\":\"%s\",\"" D_JSON_MAC "\":\"%s\",\""
-                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d}}"),
+                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"),
                           my_hostname, WiFi.localIP().toString().c_str(), IPAddress(Settings.ip_address[1]).toString().c_str(),
                           IPAddress(Settings.ip_address[2]).toString().c_str(), IPAddress(Settings.ip_address[3]).toString().c_str(), WiFi.macAddress().c_str(),
-                          Settings.webserver, Settings.sta_config);
+                          Settings.webserver, Settings.sta_config, WifiGetOutputPower().c_str());
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "5"));
   }
 
@@ -1607,7 +1607,7 @@ void CmndWifiPower(void)
     }
     WifiSetOutputPower();
   }
-  ResponseCmndFloat((float)(Settings.wifi_output_power) / 10, 1);
+  ResponseCmndChar(WifiGetOutputPower().c_str());
 }
 
 #ifdef USE_I2C
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index c283f1bb5..0d54723ca 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -587,6 +587,13 @@ int WifiState(void)
   return state;
 }
 
+String WifiGetOutputPower(void)
+{
+  char stemp1[TOPSZ];
+  dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
+  return String(stemp1);
+}
+
 void WifiSetOutputPower(void)
 {
   WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);

From 5682675ac9faa14c6a80c80f3754015191d88900 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 27 Dec 2019 15:13:40 +0100
Subject: [PATCH 015/403] Fix some serial interface initializations

Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
---
 RELEASENOTES.md                 |  1 +
 tasmota/CHANGELOG.md            |  1 +
 tasmota/support.ino             | 17 +++++++++--------
 tasmota/support_tasmota.ino     | 10 +++-------
 tasmota/tasmota.ino             |  2 --
 tasmota/xdrv_06_snfbridge.ino   |  3 +--
 tasmota/xdrv_22_sonoff_ifan.ino |  4 +---
 tasmota/xlgt_05_sonoff_l1.ino   |  3 +--
 tasmota/xnrg_02_cse7766.ino     |  3 +--
 tasmota/xsns_04_snfsc.ino       |  6 +++---
 10 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f7eabdb5b..b3b5c8c2d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -54,6 +54,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ### Version 8.1.0.1
 
+- Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index a6bc376b6..321d405c5 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 8.1.0.1 20191225
 
+- Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 9b66fbc2a..32ef55731 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -790,14 +790,9 @@ String GetSerialConfig(void)
 
 void SetSerialBegin(uint32_t baudrate)
 {
-  if (seriallog_level) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Set Serial to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
-    delay(100);
-  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Set Serial to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
   Serial.flush();
   Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
-  delay(10);
-  Serial.println();
 }
 
 void SetSerialConfig(uint32_t serial_config)
@@ -812,11 +807,17 @@ void SetSerialConfig(uint32_t serial_config)
 void SetSerialBaudrate(int baudrate)
 {
   Settings.baudrate = baudrate / 300;
-  if (Serial.baudRate() == baudrate) { return; }
-
   SetSerialBegin(baudrate);
 }
 
+void PrepSerial(int prep_baudrate, uint32_t serial_config)
+{
+  Settings.flag.mqtt_serial = 0;  // CMND_SERIALSEND and CMND_SERIALLOG
+  Settings.serial_config = serial_config;
+  baudrate = prep_baudrate;
+  SetSeriallog(LOG_LEVEL_NONE);
+}
+
 void ClaimSerial(void)
 {
   serial_local = true;
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index c649d9379..153d8a1fd 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1296,20 +1296,16 @@ void GpioInit(void)
 //    devices_present = 1;
   }
   else if (SONOFF_DUAL == my_module_type) {
-    Settings.flag.mqtt_serial = 0;           // CMND_SERIALSEND and CMND_SERIALLOG
     devices_present = 2;
-    baudrate = 19200;
+    PrepSerial(19200, TS_SERIAL_8N1);
   }
   else if (CH4 == my_module_type) {
-    Settings.flag.mqtt_serial = 0;           // CMND_SERIALSEND and CMND_SERIALLOG
     devices_present = 4;
-    baudrate = 19200;
+    PrepSerial(19200, TS_SERIAL_8N1);
   }
 #ifdef USE_SONOFF_SC
   else if (SONOFF_SC == my_module_type) {
-    Settings.flag.mqtt_serial = 0;           // CMND_SERIALSEND and CMND_SERIALLOG
-    devices_present = 0;
-    baudrate = 19200;
+    PrepSerial(19200, TS_SERIAL_8N1);
   }
 #endif  // USE_SONOFF_SC
 
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index e80331366..e2866347e 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -194,8 +194,6 @@ void setup(void)
   RtcRebootSave();
 
   Serial.begin(baudrate);
-  delay(10);
-  Serial.println();
   seriallog_level = LOG_LEVEL_INFO;  // Allow specific serial messages until config loaded
 
   snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);  // Release version 6.3.0
diff --git a/tasmota/xdrv_06_snfbridge.ino b/tasmota/xdrv_06_snfbridge.ino
index 9f8a852d5..56ba3dabc 100644
--- a/tasmota/xdrv_06_snfbridge.ino
+++ b/tasmota/xdrv_06_snfbridge.ino
@@ -578,8 +578,7 @@ bool Xdrv06(uint8_t function)
         SonoffBridgeSendCommand(0xA7);  // Stop reading RF signals enabling iTead default RF handling
         break;
       case FUNC_PRE_INIT:
-        Settings.flag.mqtt_serial = 0;  // CMND_SERIALSEND and CMND_SERIALLOG
-        baudrate = 19200;
+        PrepSerial(19200, TS_SERIAL_8N1);
         break;
     }
   }
diff --git a/tasmota/xdrv_22_sonoff_ifan.ino b/tasmota/xdrv_22_sonoff_ifan.ino
index b260952f4..125800367 100644
--- a/tasmota/xdrv_22_sonoff_ifan.ino
+++ b/tasmota/xdrv_22_sonoff_ifan.ino
@@ -217,9 +217,7 @@ void CmndFanspeed(void)
 bool SonoffIfanInit(void)
 {
   if (SONOFF_IFAN03 == my_module_type) {
-    Settings.flag.mqtt_serial = 0;  // CMND_SERIALSEND and CMND_SERIALLOG
-    baudrate = 9600;
-    SetSeriallog(LOG_LEVEL_NONE);
+    PrepSerial(9600, TS_SERIAL_8N1);
   }
   return false;  // Continue init chain
 }
diff --git a/tasmota/xlgt_05_sonoff_l1.ino b/tasmota/xlgt_05_sonoff_l1.ino
index 3fef84576..11059f6ff 100644
--- a/tasmota/xlgt_05_sonoff_l1.ino
+++ b/tasmota/xlgt_05_sonoff_l1.ino
@@ -222,8 +222,7 @@ void SnfL1ModuleSelected(void)
 {
   if (SONOFF_L1 == my_module_type) {
     if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
-      Settings.flag.mqtt_serial = 0;  // CMND_SERIALSEND and CMND_SERIALLOG
-      baudrate = 19200;
+      PrepSerial(19200, TS_SERIAL_8N1);
 
       light_type = LT_RGB;
       light_flg = XLGT_05;
diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index d52ee9ca3..a10f6cc9d 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -210,8 +210,7 @@ void CseEverySecond(void)
 void CseDrvInit(void)
 {
   if ((3 == pin[GPIO_CSE7766_RX]) && (1 == pin[GPIO_CSE7766_TX])) {  // As it uses 8E1 currently only hardware serial is supported
-    baudrate = 4800;
-    Settings.serial_config = TS_SERIAL_8E1;
+    PrepSerial(4800, TS_SERIAL_8E1);
     if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
       Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;  // SetOption39 1..255
     }
diff --git a/tasmota/xsns_04_snfsc.ino b/tasmota/xsns_04_snfsc.ino
index 060321349..7f83f4e06 100644
--- a/tasmota/xsns_04_snfsc.ino
+++ b/tasmota/xsns_04_snfsc.ino
@@ -159,9 +159,6 @@ bool Xsns04(uint8_t function)
 
   if (SONOFF_SC == my_module_type) {
     switch (function) {
-      case FUNC_INIT:
-        SonoffScInit();
-        break;
       case FUNC_JSON_APPEND:
         SonoffScShow(1);
         break;
@@ -170,6 +167,9 @@ bool Xsns04(uint8_t function)
         SonoffScShow(0);
         break;
 #endif  // USE_WEBSERVER
+      case FUNC_INIT:
+        SonoffScInit();
+        break;
     }
   }
   return result;

From 782414c35d8eaa23d52518c3feafad5b6f15e246 Mon Sep 17 00:00:00 2001
From: Leonid Muravjev <asm@asm.pp.ru>
Date: Fri, 20 Dec 2019 22:29:54 +0300
Subject: [PATCH 016/403] ds1624: support for ds1621 and ds1624

[x] the I2C address reservation implemented.
[x] multiple sensors any combination with 8 addresses
[x] with and without HotPlug support
---
 BUILDS.md                  |   3 +-
 I2CDEVICES.md              |   2 +
 RELEASENOTES.md            |   2 +
 tasmota/tasmota_post.h     |   1 +
 tasmota/xsns_59_ds1624.ino | 200 +++++++++++++++++++++++++++++++++++++
 tools/decode-status.py     |   2 +-
 6 files changed, 208 insertions(+), 2 deletions(-)
 create mode 100644 tasmota/xsns_59_ds1624.ino

diff --git a/BUILDS.md b/BUILDS.md
index 5c897746a..4318635ec 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -107,6 +107,7 @@
 | USE_PCF8574           | - | - | - | - | - | - | - |
 | USE_HIH6              | - | - | - | - | x | - | - |
 | USE_DHT12             | - | - | - | - | x | - | - |
+| USE_DS1624            | - | - | - | - | x | - | - |
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_SPI               | - | - | - | - | - | - | x |
@@ -148,4 +149,4 @@
 | USE_DISPLAY_EPAPER_42 | - | - | - | - | - | - | x |
 | USE_DISPLAY_ILI9488   | - | - | - | - | - | - | - |
 | USE_DISPLAY_SSD1351   | - | - | - | - | - | - | - |
-| USE_DISPLAY_RA8876    | - | - | - | - | - | - | - |
\ No newline at end of file
+| USE_DISPLAY_RA8876    | - | - | - | - | - | - | - |
diff --git a/I2CDEVICES.md b/I2CDEVICES.md
index 6d0de4e1a..c7b42108f 100644
--- a/I2CDEVICES.md
+++ b/I2CDEVICES.md
@@ -62,4 +62,6 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   39  | USE_DISPLAY_RA8876  | xdsp_10 | FT5316   | 0x38        | Touch panel controller
   40  | USE_TSL2591         | xsns_57 | TLS2591  | 0x29        | Light intensity sensor
   41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
+  42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
+  42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e2a87362a..fb7a2436c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -50,6 +50,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 [Complete list](BUILDS.md) of available feature and sensors.
 
+For merge for Changelog:
+- Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 ## Changelog
 
 ### Version 8.1.0.1
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index c9f8396fe..5571da265 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -137,6 +137,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_SI1145                               // Add I2C code for SI1145/46/47 sensor (+1k code)
 #define USE_LM75AD                               // Add I2C code for LM75AD sensor (+0k5 code)
 #define USE_DHT12                                // Add I2C code for DHT12 temperature and humidity sensor (+0k7 code)
+#define USE_DS1624                               // Add I2C code for DS1624, DS1621 sensor
 //#define USE_APDS9960                             // Add I2C code for APDS9960 Proximity Sensor. Disables SHT and VEML6070 (+4k7 code)
 //#define USE_MCP230xx                             // Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
 //  #define USE_MCP230xx_ADDR 0x20                 // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x27 - set according to your wired setup)
diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
new file mode 100644
index 000000000..82ce7d8f6
--- /dev/null
+++ b/tasmota/xsns_59_ds1624.ino
@@ -0,0 +1,200 @@
+/*
+  xsns_59_ds1624.ino - Support for I2C DS1624 Temperature Sensor
+
+  Copyright (C) 2019 Leonid Myravjev <asm@asm.pp.ru>
+
+  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/>.
+*/
+
+#ifdef USE_I2C
+#ifdef USE_DS1624
+
+/*********************************************************************************************\
+ * DS1624,DS1621 - Temperature
+ * 
+ * I2C Address: 0x48 - 0x4F
+\*********************************************************************************************/
+
+#define XSNS_59                 59
+#define XI2C_42                 42  // See I2CDEVICES.md
+
+#define DS1624_MEM_REGISTER    0x17  //only for ds1624, don't exists on 1621
+#define DS1624_CONF_REGISTER   0xAC
+#define DS1624_TEMP_REGISTER   0xAA
+#define DS1624_START_REGISTER  0xEE
+#define DS1624_STOP_REGISTER   0x22
+
+#define DS1621_COUNTER_REGISTER   0xA8 //exists on 1621 and 1624(undocumented)
+#define DS1621_SLOPE_REGISTER     0xA9 //exists on 1624 and 1624(undocumented)
+
+enum {
+  DS1624_TYPE_DS1624,
+  DS1624_TYPE_DS1621
+};
+
+#define DS1624_MAX_SENSORS     8
+bool ds1624_init=false;
+struct {
+  bool  valid;
+  float value;
+  int   type;
+  char  name[9];
+} ds1624_sns[DS1624_MAX_SENSORS];
+
+uint32_t DS1624_Idx2Addr(int idx) {
+  return 0x48 + idx;
+}
+
+void DS1624_HotPlugUp(int idx) {
+  uint32_t addr;
+  uint8_t config,tmp;
+
+  addr = DS1624_Idx2Addr(idx);
+  if (I2cActive(addr)) return;
+  if (!I2cSetDevice(addr)) return;
+  if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    if (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER))
+         ds1624_sns[idx].type=DS1624_TYPE_DS1624;
+    else ds1624_sns[idx].type=DS1624_TYPE_DS1621;
+    if (ds1624_sns[idx].type==DS1624_TYPE_DS1621)
+          snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS1621_%d"), idx);
+    else  snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS1624_%d"), idx);
+    I2cSetActiveFound(addr, ds1624_sns[idx].name);
+    ds1624_sns[idx].valid=true;
+    if ((config & 1) == 1) {
+      config &= 0xfe;
+      I2cWrite8(addr, DS1624_CONF_REGISTER, config); //1show off
+      delay(10);// by spec after writing
+    }
+    I2cValidRead(addr, DS1624_START_REGISTER, 1); //FIXME 0 must read, but 0 isn't work for tasmota
+    AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
+  }
+}
+
+void DS1624_HotPlugDown(int idx) {
+  uint32_t addr=DS1624_Idx2Addr(idx);
+  if (I2cActive(addr)==false) return; 
+  I2cResetActive(addr);
+  ds1624_sns[idx].valid=false;
+  AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
+}
+
+bool DS1624GetTemp(float *value, int idx)
+{
+  uint16_t t;
+  bool     result;
+  uint32_t addr=DS1624_Idx2Addr(idx);
+
+  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) return false;
+  *value = ConvertTemp(((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625);
+  if (ds1624_sns[idx].type==DS1624_TYPE_DS1621) { // Higher resolution
+    uint8_t perc,remain;
+    if (I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)==false) return true;
+    if (I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)==false) return true;
+    *value += ((float)perc - (float)remain)/((float)perc) - 0.25;
+  }
+  return true;
+}
+
+void DS1624HotPlugScan(void)
+{
+  uint16_t t;
+
+  for (int idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
+    uint32_t addr=DS1624_Idx2Addr(idx);
+    if ((I2cActive(addr)==true) && (ds1624_sns[idx].valid==false))
+      continue; // is busy by another driver
+    if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) {
+      DS1624_HotPlugDown(idx);
+      continue; }
+    DS1624_HotPlugUp(idx);
+  }
+}
+
+void DS1624EverySecond(void)
+{
+  float t;
+  for (int i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (ds1624_sns[i].valid==false) continue;
+    if (!DS1624GetTemp(&t, i)) continue;
+    ds1624_sns[i].value=t;
+  }
+}
+
+void DS1624Show(bool json)
+{
+  int  i;
+  char temperature[33];
+
+  for (i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (ds1624_sns[i].valid==false) continue;
+
+    dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
+      if (0 == tele_period) { //FIXME 0==i WTF?
+  #ifdef USE_DOMOTICZ
+        DomoticzSensor(DZ_TEMP, temperature);
+  #endif  // USE_DOMOTICZ
+  #ifdef USE_KNX
+        KnxSensor(KNX_TEMPERATURE, temperature);
+  #endif // USE_KNX
+      }
+  #ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
+  #endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+#define FUNC_HOTPLUG_SCAN 999 // FIXME remove it after HOTPLUG supported
+
+bool Xsns59(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_20)) { return false; }
+
+  bool result = false;
+  if (FUNC_INIT == function) {
+    if (ds1624_init==false) {
+      memset(ds1624_sns, 0, sizeof(ds1624_sns));
+      ds1624_init=true;
+      DS1624HotPlugScan(); //If HotPlug is off
+    }
+  }
+  switch (function) {
+    case FUNC_HOTPLUG_SCAN:
+      DS1624HotPlugScan();
+      break;
+    case FUNC_EVERY_SECOND:
+      DS1624EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      DS1624Show(1);
+      break;
+  #ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      DS1624Show(0);
+      break;
+  #endif  // USE_WEBSERVER
+  }
+  return result;
+}
+
+#endif  // USE_DS1624
+#endif  // USE_I2C
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 492c300fa..81c5c0fc1 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -188,7 +188,7 @@ a_features = [[
     "USE_SHUTTER","USE_PCF8574","USE_DDSU666","USE_DEEPSLEEP",
     "USE_SONOFF_SC","USE_SONOFF_RF","USE_SONOFF_L1","USE_EXS_DIMMER",
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
-    "USE_DHT12","","USE_GPS","",
+    "USE_DHT12","USE_DS1624","USE_GPS","",
     "","","","",
     "","","",""
     ]]

From e48e5859cddeee636e43d01749482212aed3e491 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Fri, 27 Dec 2019 21:02:23 +0100
Subject: [PATCH 017/403] Change Lights: simplified gamma correction and 10
 bits internal computation

---
 tasmota/CHANGELOG.md      |   1 +
 tasmota/xdrv_04_light.ino | 341 ++++++++++++++++++--------------------
 2 files changed, 166 insertions(+), 176 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 321d405c5..077384325 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
+- Change Lights: simplified gamma correction and 10 bits internal computation
 
 ## Released
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index a7f996914..ecb966053 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -112,12 +112,11 @@
  *     to adjust leds with different power
  *  .g If rgbwwTable[4] is zero, blend RGB with White and adjust the level of
  *     White channel according to rgbwwTable[3]
- *  .h Avoid PMW values between 1008 and 1022, issue #1146
- *  .i Scale ranges from 10 bits to 0..PWMRange (by default 1023) so no change
+ *  .h Scale ranges from 10 bits to 0..PWMRange (by default 1023) so no change
  *     by default.
- *  .j Apply port remapping from Option37
- *  .k Invert PWM value if port is of type PMWxi instead of PMWx
- *  .l Apply PWM value with analogWrite() - if pin is configured
+ *  .i Apply port remapping from Option37
+ *  .j Invert PWM value if port is of type PMWxi instead of PMWx
+ *  .k Apply PWM value with analogWrite() - if pin is configured
  *
 \*********************************************************************************************/
 
@@ -161,73 +160,82 @@ struct LCwColor {
 const uint8_t MAX_FIXED_COLD_WARM = 4;
 const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
 
-// New version of Gamma correction table, with adaptative resolution
-// from 11 bits (lower values) to 8 bits (upper values).
-// We're using the fact that lower values are small and can fit within 8 bits
-// To save flash space, the array is only 8 bits uint
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t _ledTable[] PROGMEM = {
-#else
-const uint8_t _ledTable[] = {
-#endif
-  // 11 bits resolution
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  // 11 bits, 0..2047
-    2,  2,  2,  2,  3,  3,  3,  3,  4,  4,  4,  5,  5,  6,  6,  7,  // 11 bits, 0..2047
-    7,  8,  8,  9, 10, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19,  // 11 bits, 0..2047
-   20, 21, 22, 24, 25, 26, 28, 29, 30, 32, 33, 35, 37, 38, 40, 42,  // 11 bits, 0..2047
-  // 10 bits resolution
-   22, 23, 24, 25, 26, 27, 28, 30, 31, 32, 33, 34, 36, 37, 38, 39,  // 10 bits, 0..1023
-   41, 42, 44, 45, 47, 48, 50, 51, 53, 55, 56, 58, 60, 62, 64, 65,  // 10 bits, 0..1023
-   67, 69, 71, 73, 75, 78, 80, 82, 84, 86, 89, 91, 93, 96, 98,101,  // 10 bits, 0..1023
-  103,106,108,111,114,116,119,122,125,128,131,134,137,140,143,146,  // 10 bits, 0..1023
-  // 9 bits resolution
-   75, 77, 78, 80, 82, 84, 85, 87, 89, 91, 93, 94, 96, 98,100,102,  //  9 bits, 0..511
-  104,106,108,110,112,115,117,119,121,123,125,128,130,132,135,137,  //  9 bits, 0..511
-  140,142,144,147,149,152,155,157,160,163,165,168,171,173,176,179,  //  9 bits, 0..511
-  182,185,188,191,194,197,200,203,206,209,212,215,219,222,225,229,  //  9 bits, 0..511
-  // 8 bits resolution
-  116,118,120,121,123,125,127,128,130,132,134,136,138,139,141,143,  //  8 bits, 0..255
-  145,147,149,151,153,155,157,159,161,163,165,168,170,172,174,176,  //  8 bits, 0..255
-  178,181,183,185,187,190,192,194,197,199,201,204,206,209,211,214,  //  8 bits, 0..255
-  216,219,221,224,226,229,232,234,237,240,242,245,248,250,253,255   //  8 bits, 0..255
+// New version of Gamma correction compute
+// Instead of a table, we do a multi-linear approximation, which is close enough
+// At low levels, the slope is a bit higher than actual gamma, to make changes smoother
+// Internal resolution is 10 bits.
+
+typedef struct gamma_table_t {
+  uint16_t to_src;
+  uint16_t to_gamma;
+} gamma_table_t;
+
+const gamma_table_t gamma_table[] = {   // don't put in PROGMEM for performance reasons
+  {    3,      0 },
+  {  209,     13 },
+  {  312,     41 },
+  {  457,    106 },
+  {  626,    261 },
+  {  762,    450 },
+  {  895,    703 },
+  { 1023,   1023 },
+  { 0xFFFF, 0xFFFF }          // fail-safe if out of range
+};
+
+// simplified Gamma table for Fade, cheating a little at low brightness
+const gamma_table_t gamma_table_fast[] = {
+  {     0,      0 },
+  {   384,     67 },
+  {   768,    467 },
+  {  1023,   1023 },
+  { 0xFFFF, 0xFFFF }          // fail-safe if out of range
 };
 
 // For reference, below are the computed gamma tables, via ledGamma()
 // for 8 bits output:
-//  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-//  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-//  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,
-//  3,  3,  3,  3,  4,  4,  4,  4,  4,  4,  5,  5,  5,  5,  5,  6,
-//  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  9,  9,  9, 10, 10, 10,
-// 11, 11, 11, 12, 12, 12, 13, 13, 14, 14, 14, 15, 15, 16, 16, 17,
-// 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 23, 23, 24, 24, 25, 26,
-// 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, 37,
-// 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 47, 48, 49, 50, 51,
-// 52, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66, 68, 69,
-// 70, 71, 72, 74, 75, 76, 78, 79, 80, 82, 83, 84, 86, 87, 88, 90,
-// 91, 93, 94, 96, 97, 99,100,102,103,105,106,108,110,111,113,115,
-//116,118,120,121,123,125,127,128,130,132,134,136,138,139,141,143,
-//145,147,149,151,153,155,157,159,161,163,165,168,170,172,174,176,
-//178,181,183,185,187,190,192,194,197,199,201,204,206,209,211,214,
-//216,219,221,224,226,229,232,234,237,240,242,245,248,250,253,255
+//   0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+//   1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
+//   2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,
+//   3,  3,  3,  3,  3,  4,  4,  4,  4,  5,  5,  5,  5,  6,  6,  6,
+//   6,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 10, 10, 11,
+//  11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 17, 18,
+//  18, 19, 19, 20, 20, 21, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25,
+//  25, 26, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 36, 37, 38,
+//  39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, 51, 52, 53,
+//  54, 55, 56, 57, 58, 59, 60, 61, 61, 62, 63, 64, 65, 66, 68, 69,
+//  71, 72, 73, 75, 76, 78, 79, 80, 82, 83, 85, 86, 87, 88, 90, 91,
+//  93, 94, 95, 97, 98,100,101,102,104,105,107,108,109,111,112,114,
+// 116,118,120,121,123,125,127,129,131,133,135,137,139,141,142,144,
+// 146,148,150,152,154,156,158,160,162,164,166,168,170,171,173,175,
+// 177,180,182,185,187,190,192,195,197,200,202,205,207,210,212,215,
+// 217,220,222,225,227,230,233,235,238,240,243,245,248,250,253,255
 //
 // and for 10 bits output:
-//  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-//  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  4,
-//  4,  4,  4,  5,  5,  5,  6,  6,  6,  7,  7,  8,  8,  9,  9, 10,
-// 10, 11, 11, 12, 13, 13, 14, 15, 15, 16, 17, 18, 19, 19, 20, 21,
-// 22, 23, 24, 25, 26, 27, 28, 30, 31, 32, 33, 34, 36, 37, 38, 39,
-// 41, 42, 44, 45, 47, 48, 50, 51, 53, 55, 56, 58, 60, 62, 64, 65,
-// 67, 69, 71, 73, 75, 78, 80, 82, 84, 86, 89, 91, 93, 96, 98,101,
-//103,106,108,111,114,116,119,122,125,128,131,134,137,140,143,146,
-//151,155,157,161,165,169,171,175,179,183,187,189,193,197,201,205,
-//209,213,217,221,225,231,235,239,243,247,251,257,261,265,271,275,
-//281,285,289,295,299,305,311,315,321,327,331,337,343,347,353,359,
-//365,371,377,383,389,395,401,407,413,419,425,431,439,445,451,459,
-//467,475,483,487,495,503,511,515,523,531,539,547,555,559,567,575,
-//583,591,599,607,615,623,631,639,647,655,663,675,683,691,699,707,
-//715,727,735,743,751,763,771,779,791,799,807,819,827,839,847,859,
-//867,879,887,899,907,919,931,939,951,963,971,983,995,1003,1015,1023
+//    0,   1,   1,   1,   2,   2,   2,   2,   3,   3,   3,   3,   4,   4,   4,   4,
+//    5,   5,   5,   5,   5,   6,   6,   6,   6,   7,   7,   7,   7,   8,   8,   8,
+//    8,   8,   9,   9,   9,   9,  10,  10,  10,  10,  11,  11,  11,  11,  12,  12,
+//   12,  12,  13,  13,  13,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,
+//   26,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  42,  44,
+//   46,  47,  49,  51,  53,  54,  56,  58,  60,  62,  63,  65,  67,  69,  70,  72,
+//   74,  76,  78,  79,  81,  83,  85,  86,  88,  90,  92,  94,  95,  97,  99, 101,
+//  102, 104, 106, 110, 113, 117, 121, 124, 128, 132, 135, 139, 143, 146, 150, 154,
+//  158, 162, 166, 169, 173, 177, 180, 184, 188, 191, 195, 199, 202, 206, 210, 213,
+//  217, 221, 224, 228, 232, 235, 239, 243, 246, 250, 254, 257, 261, 266, 272, 277,
+//  283, 288, 294, 300, 305, 311, 316, 322, 327, 333, 339, 344, 350, 355, 361, 366,
+//  372, 378, 383, 389, 394, 400, 405, 411, 417, 422, 428, 433, 439, 444, 450, 457,
+//  464, 472, 480, 487, 495, 503, 510, 518, 525, 533, 541, 548, 556, 564, 571, 579,
+//  587, 594, 602, 609, 617, 627, 634, 642, 650, 657, 665, 672, 680, 688, 695, 703,
+//  712, 722, 732, 742, 752, 762, 772, 782, 792, 802, 812, 822, 832, 842, 852, 862,
+//  872, 882, 892, 902, 912, 923, 933, 943, 953, 963, 973, 983, 993,1003,1013,1023
+//
+// Output for Dimmer 0..100 values
+//   0,  1,  2,  3,  3,  4,  4,  5,  5,  6,  7,  7,  8,  8,  9,
+//  10, 10, 11, 12, 12, 13, 16, 18, 21, 23, 26, 29, 32, 34, 37,
+//  40, 44, 49, 53, 58, 62, 67, 70, 76, 79, 85, 90, 94, 99,102,
+// 110,117,128,135,146,158,166,177,184,195,202,213,221,232,239,
+// 250,261,272,288,300,316,327,344,355,372,389,400,417,428,444,
+// 457,480,495,518,533,556,579,594,617,634,657,672,695,712,742,
+// 772,792,822,842,872,892,923,943,973,993,1023
 
 struct LIGHT {
   uint32_t strip_timer_counter = 0;  // Bars and Gradient
@@ -256,9 +264,6 @@ struct LIGHT {
   bool pwm_multi_channels = false;        // SetOption68, treat each PWM channel as an independant dimmer
 
   bool     fade_running = false;
-  uint8_t  fade_start_8[LST_MAX] = {0,0,0,0,0};
-  uint8_t  fade_cur_8[LST_MAX];
-  uint8_t  fade_end_8[LST_MAX];        // 8 bits resolution target channel values
   uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
   uint16_t fade_cur_10[LST_MAX];
   uint16_t fade_end_10[LST_MAX];         // 10 bits resolution target channel values
@@ -1072,36 +1077,53 @@ public:
 LightStateClass light_state = LightStateClass();
 LightControllerClass light_controller = LightControllerClass(light_state);
 
+/*********************************************************************************************\
+ * Change scales from 8 bits to 10 bits and vice versa
+\*********************************************************************************************/
+// 8 to 10 to 8 is garanteed to give the same result
+uint16_t change8to10(uint8_t v) {
+  return changeUIntScale(v, 0, 255, 0, 1023);
+}
+// change from 10 bits to 8 bits, but any non-zero input will be non-zero
+uint8_t change10to8(uint16_t v) {
+  return (0 == v) ? 0 : changeUIntScale(v, 4, 1023, 1, 255);
+}
+
 /*********************************************************************************************\
  * Gamma correction
 \*********************************************************************************************/
 // Calculate the gamma corrected value for LEDS
-// You can request 11, 10, 9 or 8 bits resolution via 'bits_out' parameter
-uint16_t ledGamma(uint8_t v, uint16_t bits_out = 8) {
-  uint16_t result;
-  // bits_resolution: the resolution of _ledTable[v], between 8 and 11
-  uint32_t bits_resolution = 11 - (v / 64);                     // 8..11
-  int32_t  bits_correction = bits_out - bits_resolution;      // -3..3
-#ifdef XFUNC_PTR_IN_ROM
-  uint32_t uncorrected_value = pgm_read_byte(_ledTable + v);  // 0..255
-#else
-  uint32_t uncorrected_value = _ledTable[v];        // 0..255
-#endif
-  if (0 == bits_correction) {
-    // we already match the required resolution, no change
-    result = uncorrected_value;
-  } else if (bits_correction > 0) {
-    // the output resolution is higher than our value, we need to extrapolate
-    // we shift by bits_correction, and force last bits to 1
-    uint32_t bits_mask = (1 << bits_correction) - 1;  // 1, 3, 7
-    result = (uncorrected_value << bits_correction) | bits_mask;
-  } else {  // bits_correction < 0
-    // our resolution is too high, we need to remove bits
-    // we add 1, 3 or 7 to force rouding to the nearest high value
-    uint32_t bits_mask = (1 << -bits_correction) - 1;  // 1, 3, 7
-    result = ((uncorrected_value + bits_mask) >> -bits_correction);
+uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (v <= to_src) {
+      return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
+    }
+    from_src = to_src + 1;
+    from_gamma = to_gamma + 1;
   }
-  return result;
+}
+// 10_10 bits, fast fade mode
+uint16_t ledGamma10_10_fast(uint16_t v) {
+  return ledGamma_internal(v, gamma_table_fast);
+}
+
+// 10 bits in, 10 bits out
+uint16_t ledGamma10_10(uint16_t v) {
+  return ledGamma_internal(v, gamma_table);
+}
+// 10 bits resolution, 8 bits in
+uint16_t ledGamma10(uint8_t v) {
+  return ledGamma10_10(change8to10(v));
+}
+
+// Legacy function
+uint8_t ledGamma(uint8_t v) {
+  return change10to8(ledGamma10(v));
 }
 
 /********************************************************************************************/
@@ -1569,7 +1591,6 @@ void LightSetPower(void)
 // Light.power tells which lights or channels (SetOption68) are on/off
 void LightAnimate(void)
 {
-  uint8_t cur_col[LST_MAX];
   uint16_t light_still_on = 0;
   bool power_off = false;
 
@@ -1653,92 +1674,73 @@ void LightAnimate(void)
       Light.update = true;
     }
     if (Light.update) {
-      uint16_t cur_col_10bits[LST_MAX];   // 10 bits version of cur_col for PWM
+      uint16_t cur_col_10[LST_MAX];   // 10 bits resolution
       Light.update = false;
 
       // first set 8 and 10 bits channels
       for (uint32_t i = 0; i < LST_MAX; i++) {
-        cur_col[i] = Light.last_color[i] = Light.new_color[i];
+        Light.last_color[i] = Light.new_color[i];
         // Extend from 8 to 10 bits if no correction (in case no gamma correction is required)
-        cur_col_10bits[i] = changeUIntScale(cur_col[i], 0, 255, 0, 1023);
+        cur_col_10[i] = change8to10(Light.new_color[i]);
       }
 
       if (Light.pwm_multi_channels) {
-        calcGammaMultiChannels(cur_col, cur_col_10bits);
+        calcGammaMultiChannels(cur_col_10);
       } else {
-        calcGammaBulbs(cur_col, cur_col_10bits);
+        calcGammaBulbs(cur_col_10);
         if (PHILIPS == my_module_type) {
-          calcGammaCTPwm(cur_col, cur_col_10bits);
+          calcGammaCTPwm(cur_col_10);
         }
 
         // Now see if we need to mix RGB and True White
         // Valid only for LST_RGBW, LST_RGBWC, rgbwwTable[4] is zero, and white is zero (see doc)
-        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col[3]+cur_col[4])) {
-          uint32_t min_rgb_10 = min3(cur_col_10bits[0], cur_col_10bits[1], cur_col_10bits[2]);
-          uint8_t min_rgb = min3(cur_col[0], cur_col[1], cur_col[2]);
+        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
+          uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
           for (uint32_t i=0; i<3; i++) {
             // substract white and adjust according to rgbwwTable
-            uint32_t adjust10 = changeUIntScale(Settings.rgbwwTable[i], 0, 255, 0, 1023);
-            cur_col_10bits[i] = changeUIntScale(cur_col_10bits[i] - min_rgb_10, 0, 1023, 0, adjust10);
-            cur_col[i] = changeUIntScale(cur_col[i] - min_rgb, 0, 255, 0, Settings.rgbwwTable[i]);
+            uint32_t adjust10 = change8to10(Settings.rgbwwTable[i]);
+            cur_col_10[i] = changeUIntScale(cur_col_10[i] - min_rgb_10, 0, 1023, 0, adjust10);
           }
 
           // compute the adjusted white levels for 10 and 8 bits
           uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
           uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);  // set white power down corrected with rgbwwTable[3]
-          uint32_t white = changeUIntScale(min_rgb, 0, 255, 0, Settings.rgbwwTable[3]);  // set white power down corrected with rgbwwTable[3]
           if (LST_RGBW == Light.subtype) {
             // we simply set the white channel
-            cur_col_10bits[3] = white_10;
-            cur_col[3] = white;
+            cur_col_10[3] = white_10;
           } else {  // LST_RGBWC
             // we distribute white between cold and warm according to CT value
             uint32_t ct = light_state.getCT();
-            cur_col_10bits[4] = changeUIntScale(ct, 153, 500, 0, white_10);
-            cur_col_10bits[3] = white_10 - cur_col_10bits[4];
-            cur_col[4] = changeUIntScale(ct, 153, 500, 0, white);
-            cur_col[3] = white - cur_col[4];
+            cur_col_10[4] = changeUIntScale(ct, 153, 500, 0, white_10);
+            cur_col_10[3] = white_10 - cur_col_10[4];
           }
         }
       }
 
       // final adjusments for PMW, post-gamma correction
       for (uint32_t i = 0; i < LST_MAX; i++) {
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-        // Fix unwanted blinking and PWM watchdog errors for values close to pwm_range (H801, Arilux and BN-SZ01)
-        // but keep value 1023 if full range (PWM will be deactivated in this case)
-        if ((cur_col_10bits[i] > 1008) && (cur_col_10bits[i] < 1023)) {
-          cur_col_10bits[i] = 1008;
-        }
-#endif
         // scale from 0..1023 to 0..pwm_range, but keep any non-zero value to at least 1
-        cur_col_10bits[i] = (cur_col_10bits[i] > 0) ? changeUIntScale(cur_col_10bits[i], 1, 1023, 1, Settings.pwm_range) : 0;
+        cur_col_10[i] = (cur_col_10[i] > 0) ? changeUIntScale(cur_col_10[i], 1, 1023, 1, Settings.pwm_range) : 0;
       }
 
       // apply port remapping on both 8 bits and 10 bits versions
-      uint8_t  orig_col[LST_MAX];
       uint16_t orig_col_10bits[LST_MAX];
-      memcpy(orig_col, cur_col, sizeof(orig_col));
-      memcpy(orig_col_10bits, cur_col_10bits, sizeof(orig_col_10bits));
+      memcpy(orig_col_10bits, cur_col_10, sizeof(orig_col_10bits));
       for (uint32_t i = 0; i < LST_MAX; i++) {
-        cur_col[i] = orig_col[Light.color_remap[i]];
-        cur_col_10bits[i] = orig_col_10bits[Light.color_remap[i]];
+        cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
       }
 
       if (!Settings.light_fade || power_off) { // no fade
         // record the current value for a future Fade
-        memcpy(Light.fade_start_8, cur_col, sizeof(Light.fade_start_8));
-        memcpy(Light.fade_start_10, cur_col_10bits, sizeof(Light.fade_start_10));
+        memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
         // push the final values at 8 and 10 bits resolution to the PWMs
-        LightSetOutputs(cur_col, cur_col_10bits);
+        LightSetOutputs(cur_col_10);
       } else {  // fade on
         if (Light.fade_running) {
           // if fade is running, we take the curring value as the start for the next fade
-          memcpy(Light.fade_start_8, Light.fade_cur_8, sizeof(Light.fade_start_8));
           memcpy(Light.fade_start_10, Light.fade_cur_10, sizeof(Light.fade_start_10));
         }
-        memcpy(Light.fade_end_8, cur_col, sizeof(Light.fade_start_8));
-        memcpy(Light.fade_end_10, cur_col_10bits, sizeof(Light.fade_start_10));
+        memcpy(Light.fade_end_10, cur_col_10, sizeof(Light.fade_start_10));
         Light.fade_running = true;
         Light.fade_duration = 0;    // set the value to zero to force a recompute
         Light.fade_start = 0;
@@ -1747,11 +1749,10 @@ void LightAnimate(void)
     }
     if (Light.fade_running) {
       if (LightApplyFade()) {
-        // AddLog_P2(LOG_LEVEL_INFO, PSTR("LightApplyFade %d %d %d %d %d - %d %d %d %d %d"),
-        //   Light.fade_cur_8[0], Light.fade_cur_8[1], Light.fade_cur_8[2], Light.fade_cur_8[3], Light.fade_cur_8[4],
+        // AddLog_P2(LOG_LEVEL_INFO, PSTR("LightApplyFade %d %d %d %d %d"),
         //   Light.fade_cur_10[0], Light.fade_cur_10[1], Light.fade_cur_10[2], Light.fade_cur_10[3], Light.fade_cur_10[4]);
 
-        LightSetOutputs(Light.fade_cur_8, Light.fade_cur_10);
+        LightSetOutputs(Light.fade_cur_10);
       }
     }
   }
@@ -1799,9 +1800,6 @@ bool LightApplyFade(void) {   // did the value chanegd and needs to be applied
   if (fade_current <= Light.fade_duration) {    // fade not finished
     //Serial.printf("Fade: %d / %d - ", fade_current, Light.fade_duration);
     for (uint32_t i = 0; i < Light.subtype; i++) {
-      Light.fade_cur_8[i] = changeUIntScale(fade_current,
-                                            0, Light.fade_duration,
-                                            Light.fade_start_8[i], Light.fade_end_8[i]);
       Light.fade_cur_10[i] = changeUIntScale(fade_current,
                                               0, Light.fade_duration,
                                               Light.fade_start_10[i], Light.fade_end_10[i]);
@@ -1813,10 +1811,8 @@ bool LightApplyFade(void) {   // did the value chanegd and needs to be applied
     Light.fade_start = 0;
     Light.fade_duration = 0;
     // set light to target value
-    memcpy(Light.fade_cur_8, Light.fade_end_8, sizeof(Light.fade_end_8));
     memcpy(Light.fade_cur_10, Light.fade_end_10, sizeof(Light.fade_end_10));
     // record the last value for next start
-    memcpy(Light.fade_start_8, Light.fade_end_8, sizeof(Light.fade_start_8));
     memcpy(Light.fade_start_10, Light.fade_end_10, sizeof(Light.fade_start_10));
   }
   return true;
@@ -1855,20 +1851,24 @@ void LightApplyPower(uint8_t new_color[LST_MAX], power_t power) {
   }
 }
 
-void LightSetOutputs(const uint8_t *cur_col, const uint16_t *cur_col_10bits) {
+void LightSetOutputs(const uint16_t *cur_col_10) {
   // now apply the actual PWM values, adjusted and remapped 10-bits range
   if (light_type < LT_PWM6) {   // only for direct PWM lights, not for Tuya, Armtronix...
     for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) {
       if (pin[GPIO_PWM1 +i] < 99) {
-        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "Cur_Col%d 10 bits %d, Pwm%d %d"), i, cur_col_10bits[i], i+1, cur_col[i]);
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10bits[(i + Light.pwm_offset)] : cur_col_10bits[(i + Light.pwm_offset)]);
+        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "Cur_Col%d 10 bits %d"), i, cur_col_10[i]);
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10[(i + Light.pwm_offset)] : cur_col_10[(i + Light.pwm_offset)]);
       }
     }
   }
   char msg[24];
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"),
-            ToHex_P((const unsigned char *)cur_col_10bits, 10, msg, sizeof(msg)));
-
+            ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
+  
+  uint8_t cur_col[LST_MAX];
+  for (uint32_t i = 0; i < LST_MAX; i++) {
+    cur_col[i] = change10to8(cur_col_10[i]);
+  }
   // Some devices need scaled RGB like Sonoff L1
   // TODO, should be probably moved to the Sonoff L1 support code
   uint8_t scale_col[3];
@@ -1888,7 +1888,7 @@ void LightSetOutputs(const uint8_t *cur_col, const uint16_t *cur_col_10bits) {
 }
 
 // Do specific computation is SetOption73 is on, Color Temp is a separate PWM channel
-void calcGammaCTPwm(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
+void calcGammaCTPwm(uint16_t cur_col_10[5]) {
   // Xiaomi Philips bulbs follow a different scheme:
   uint8_t cold, warm;   // channel 1 is the color tone, mapped to cold channel (0..255)
   light_state.getCW(&cold, &warm);
@@ -1896,32 +1896,28 @@ void calcGammaCTPwm(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
   uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
   uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
   // overall brightness
-  uint16_t pxBri = cur_col[cw0] + cur_col[cw1];
-  if (pxBri > 255) { pxBri = 255; }
-  cur_col[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 255);   //
-  cur_col_10bits[cw1] = changeUIntScale(cur_col[cw1], 0, 255, 0, 1023);
+  uint16_t pxBri10 = cur_col_10[cw0] + cur_col_10[cw1];
+  if (pxBri10 > 1023) { pxBri10 = 1023; }
+  cur_col_10[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 1023);   //
   // channel 0=intensity, channel1=temperature
   if (Settings.light_correction) { // gamma correction
-    cur_col[cw0] = ledGamma(pxBri);
-    cur_col_10bits[cw0] = ledGamma(pxBri, 10);    // 10 bits gamma correction
+    cur_col_10[cw0] = ledGamma10_10(pxBri10);    // 10 bits gamma correction
   } else {
-    cur_col[cw0] = pxBri;
-    cur_col_10bits[cw0] = changeUIntScale(pxBri, 0, 255, 0, 1023);  // no gamma, extend to 10 bits
+    cur_col_10[cw0] = pxBri10;  // no gamma, extend to 10 bits
   }
 }
 
 // Just apply basic Gamma to each channel
-void calcGammaMultiChannels(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
+void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
   // Apply gamma correction for 8 and 10 bits resolutions, if needed
   if (Settings.light_correction) {
     for (uint32_t i = 0; i < LST_MAX; i++) {
-      cur_col_10bits[i] = ledGamma(cur_col[i], 10);
-      cur_col[i] = ledGamma(cur_col[i]);
+      cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
     }
   }
 }
 
-void calcGammaBulbs(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
+void calcGammaBulbs(uint16_t cur_col_10[5]) {
   // Apply gamma correction for 8 and 10 bits resolutions, if needed
   if (Settings.light_correction) {
     // First apply combined correction to the overall white power
@@ -1931,35 +1927,28 @@ void calcGammaBulbs(uint8_t cur_col[5], uint16_t cur_col_10bits[5]) {
         w_idx[0] = 3;
         w_idx[1] = 4;
       }
-      uint16_t white_bri = cur_col[w_idx[0]] + cur_col[w_idx[1]];
+      uint16_t white_bri10 = cur_col_10[w_idx[0]] + cur_col_10[w_idx[1]];
       // if sum of both channels is > 255, then channels are probablu uncorrelated
-      if (white_bri <= 255) {
+      if (white_bri10 <= 1023) {
         // we calculate the gamma corrected sum of CW + WW
-        uint16_t white_bri_10bits = ledGamma(white_bri, 10);
-        uint8_t white_bri_8bits = ledGamma(white_bri);
+        uint16_t white_bri_10bits = ledGamma10_10(white_bri10);
         // then we split the total energy among the cold and warm leds
-        cur_col_10bits[w_idx[0]] = changeUIntScale(cur_col[w_idx[0]], 0, white_bri, 0, white_bri_10bits);
-        cur_col_10bits[w_idx[1]] = changeUIntScale(cur_col[w_idx[1]], 0, white_bri, 0, white_bri_10bits);
-        cur_col[w_idx[0]] = changeUIntScale(cur_col[w_idx[0]], 0, white_bri, 0, white_bri_8bits);
-        cur_col[w_idx[1]] = changeUIntScale(cur_col[w_idx[1]], 0, white_bri, 0, white_bri_8bits);
+        cur_col_10[w_idx[0]] = changeUIntScale(cur_col_10[w_idx[0]], 0, white_bri10, 0, white_bri_10bits);
+        cur_col_10[w_idx[1]] = changeUIntScale(cur_col_10[w_idx[1]], 0, white_bri10, 0, white_bri_10bits);
       } else {
-        cur_col_10bits[w_idx[0]] = ledGamma(cur_col[w_idx[0]], 10);
-        cur_col_10bits[w_idx[1]] = ledGamma(cur_col[w_idx[1]], 10);
-        cur_col[w_idx[0]] = ledGamma(cur_col[w_idx[0]]);
-        cur_col[w_idx[1]] = ledGamma(cur_col[w_idx[1]]);
+        cur_col_10[w_idx[0]] = ledGamma10_10(cur_col_10[w_idx[0]]);
+        cur_col_10[w_idx[1]] = ledGamma10_10(cur_col_10[w_idx[1]]);
       }
     }
     // then apply gamma correction to RGB channels
     if (LST_RGB <= Light.subtype) {
       for (uint32_t i = 0; i < 3; i++) {
-        cur_col_10bits[i] = ledGamma(cur_col[i], 10);
-        cur_col[i] = ledGamma(cur_col[i]);
+        cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
       }
     }
     // If RGBW or Single channel, also adjust White channel
     if ((LST_COLDWARM != Light.subtype) && (LST_RGBWC != Light.subtype)) {
-      cur_col_10bits[3] = ledGamma(cur_col[3], 10);
-      cur_col[3] = ledGamma(cur_col[3]);
+      cur_col_10[3] = ledGamma10_10(cur_col_10[3]);
     }
   }
 }
@@ -2447,7 +2436,7 @@ bool Xdrv04(uint8_t function)
       case FUNC_LOOP:
         if (Light.fade_running) {
           if (LightApplyFade()) {
-            LightSetOutputs(Light.fade_cur_8, Light.fade_cur_10);
+            LightSetOutputs(Light.fade_cur_10);
           }
         }
         break;

From 1ba2239804540267a5fb76354759c2f9d0b8424d Mon Sep 17 00:00:00 2001
From: Bohdan Kmit <bkmit@maytech.net>
Date: Sat, 28 Dec 2019 00:29:25 +0200
Subject: [PATCH 018/403] Improved Ukrainian translation, renamed localization
 to proper uk-UA name

---
 platformio_tasmota_env.ini            |   2 +-
 tasmota/language/{uk-UK.h => uk-UA.h} | 150 +++++++++++++-------------
 tasmota/my_user_config.h              |   2 +-
 3 files changed, 77 insertions(+), 77 deletions(-)
 rename tasmota/language/{uk-UK.h => uk-UA.h} (88%)

diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index fd0571125..f2b46c131 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -97,4 +97,4 @@ build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR
 build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
 
 [env:tasmota-UK]
-build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK
+build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UA
diff --git a/tasmota/language/uk-UK.h b/tasmota/language/uk-UA.h
similarity index 88%
rename from tasmota/language/uk-UK.h
rename to tasmota/language/uk-UA.h
index dbf58fe35..cd77adebd 100644
--- a/tasmota/language/uk-UK.h
+++ b/tasmota/language/uk-UA.h
@@ -1,5 +1,5 @@
 /*
-  uk-UK.h - localization for Ukrainian - Ukraine for Tasmota
+  uk-UA.h - localization for Ukrainian - Ukraine for Tasmota
 
   Copyright (C) 2019  Theo Arends / vadym-adik
 
@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LANGUAGE_UK_UK_H_
-#define _LANGUAGE_UK_UK_H_
+#ifndef _LANGUAGE_UK_UA_H_
+#define _LANGUAGE_UK_UA_H_
 
 /*************************** ATTENTION *******************************\
  *
@@ -51,7 +51,7 @@
 #define D_DECIMAL_SEPARATOR ","
 
 // Common
-#define D_ADMIN "Admin"
+#define D_ADMIN "Адміністратор"
 #define D_AIR_QUALITY "Якість повітря"
 #define D_AP "Точка доступу"        // Access Point
 #define D_AS "як"
@@ -63,7 +63,7 @@
 #define D_BSSID "BSSId"
 #define D_BUTTON "Кнопка"
 #define D_BY " "                    // Written by me
-#define D_BYTES "Байт"
+#define D_BYTES "Байтів"
 #define D_CELSIUS "Цельсія"
 #define D_CHANNEL "Канал"
 #define D_CO2 "Вуглек. газ"
@@ -71,27 +71,27 @@
 #define D_COLDLIGHT "Холодний"
 #define D_COMMAND "Команда"
 #define D_CONNECTED "Під'єднано"
-#define D_CORS_DOMAIN "CORS Domain"
-#define D_COUNT "Розмір"
+#define D_CORS_DOMAIN "Домен CORS"
+#define D_COUNT "разів"
 #define D_COUNTER "Лічильник"
 #define D_CURRENT "Струм"           // As in Voltage and Current
 #define D_DATA "Дані"
 #define D_DARKLIGHT "Темний"
 #define D_DEBUG "Налагодження"
-#define D_DISABLED "Заблоковано"
+#define D_DISABLED "Вимкнено"
 #define D_DISTANCE "Відстань"
 #define D_DNS_SERVER "Сервер DNS"
 #define D_DONE "Виконано"
 #define D_DST_TIME "Літній час"
 #define D_ECO2 "eCO2"
 #define D_EMULATION "Емуляція"
-#define D_ENABLED "Активно"
+#define D_ENABLED "Увімкнено"
 #define D_ERASE "Стирати"
 #define D_ERROR "Помилка"
 #define D_FAHRENHEIT "Фаренгейт"
 #define D_FAILED "Невдало"
-#define D_FALLBACK "Зворотній зв'язок"
-#define D_FALLBACK_TOPIC "Топік зворотнього зв'язку"
+#define D_FALLBACK "Запасний"
+#define D_FALLBACK_TOPIC "Запасний топік"
 #define D_FALSE "Ні"
 #define D_FILE "Файл"
 #define D_FLOW_RATE "Потік"
@@ -106,34 +106,34 @@
 #define D_ILLUMINANCE "Освітленність"
 #define D_IMMEDIATE "Негайно"       // Button immediate
 #define D_INDEX "Індекс"
-#define D_INFO "Інфо"
+#define D_INFO "Інформація"
 #define D_INFRARED "Інфрачервоний"
 #define D_INITIALIZED "Ініціалізовано"
 #define D_IP_ADDRESS "IP адреса"
 #define D_LIGHT "Світло"
 #define D_LWT "LWT"
 #define D_MODULE "Модуль"
-#define D_MOISTURE "Moisture"
+#define D_MOISTURE "Волога"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "Багаторазове натискання"
 #define D_NOISE "Шум"
 #define D_NONE "Нічого"
-#define D_OFF "Вимк."
-#define D_OFFLINE "Офф-лайн"
+#define D_OFF "Вимкнено"
+#define D_OFFLINE "Неактивний"
 #define D_OK "Ок"
-#define D_ON "Увімк."
-#define D_ONLINE "Он-лайн"
+#define D_ON "Увімкнено"
+#define D_ONLINE "Активний"
 #define D_PASSWORD "Гасло"
 #define D_PORT "Порт"
 #define D_POWER_FACTOR "Коефіцієнт потужності"
 #define D_POWERUSAGE "Потужність"
 #define D_POWERUSAGE_ACTIVE "Активна потужність"
-#define D_POWERUSAGE_APPARENT "Дійсна потужність"
+#define D_POWERUSAGE_APPARENT "Загальна потужність"
 #define D_POWERUSAGE_REACTIVE "Реактивна потужність"
 #define D_PRESSURE "Тиск"
 #define D_PRESSUREATSEALEVEL "Тиск на рівні моря"
 #define D_PROGRAM_FLASH_SIZE "Розмір Flash для програм"
-#define D_PROGRAM_SIZE "Розмір програм"
+#define D_PROGRAM_SIZE "Розмір програми"
 #define D_PROJECT "Проект"
 #define D_RAIN "Дощ"
 #define D_RECEIVED "Отримано"
@@ -194,7 +194,7 @@
 #define D_SET_BAUDRATE_TO "Встановити швидкість передачі (Baudrate)"
 #define D_RECEIVED_TOPIC "Отриманий Топік"
 #define D_DATA_SIZE "Розмір даних"
-#define D_ANALOG_INPUT "Напруга"
+#define D_ANALOG_INPUT "Аналоговий вхід"
 
 // support.ino
 #define D_OSWATCH "osWatch"
@@ -203,7 +203,7 @@
 #define D_ACTIVE_FOR_3_MINUTES "активний протягом 3 хвилин"
 #define D_FAILED_TO_START "не вдалось запустити"
 #define D_PATCH_ISSUE_2186 "Проблема з виправленням 2186"
-#define D_CONNECTING_TO_AP "Підключення до AP"
+#define D_CONNECTING_TO_AP "Підключення до Точки Доступу"
 #define D_IN_MODE "в режимі"
 #define D_CONNECT_FAILED_NO_IP_ADDRESS "Помилка підключення, IP-адреса не отримана"
 #define D_CONNECT_FAILED_AP_NOT_REACHED "Помилка з'єднання, AP не знайдено"
@@ -213,12 +213,12 @@
 #define D_CHECKING_CONNECTION "Перевірка з'єднання..."
 #define D_QUERY_DONE "Запит виконаний. Виявлено сервер MQTT"
 #define D_MQTT_SERVICE_FOUND "MQTT сервер знайдено"
-#define D_FOUND_AT "знайдено в"
+#define D_FOUND_AT "знайдено за адресою"
 #define D_SYSLOG_HOST_NOT_FOUND "Сервер журналу не знайдено"
 
 // settings.ino
-#define D_SAVED_TO_FLASH_AT "Збережено в флэш-пам'ять"
-#define D_LOADED_FROM_FLASH_AT "Завантажено з флэш-пам'яті"
+#define D_SAVED_TO_FLASH_AT "Збережено в Flash-пам'ять"
+#define D_LOADED_FROM_FLASH_AT "Завантажено з Flash-пам'яті"
 #define D_USE_DEFAULTS "Використовувати значення за замовчуванням"
 #define D_ERASED_SECTOR "Стерто сектор"
 
@@ -230,7 +230,7 @@
 #define D_WEBSERVER_STOPPED "Веб-сервер зупинений"
 #define D_FILE_NOT_FOUND "Файл не знайдений"
 #define D_REDIRECTED "Перенаправлено на адаптивний портал"
-#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifi менеджер встановлює Точку Доступу і зберігає параметри"
+#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifi менеджер встановлює Точку Доступу і станцію"
 #define D_WIFIMANAGER_SET_ACCESSPOINT "Wifi менеджер встановив Точку Доступу"
 #define D_TRYING_TO_CONNECT "Спроба підключення пристрою до мережі"
 
@@ -286,18 +286,18 @@
 
 #define D_LOGGING_PARAMETERS "Параметри журналу"
 #define D_SERIAL_LOG_LEVEL "Serial рівень"
-#define D_MQTT_LOG_LEVEL "Mqtt log level"
+#define D_MQTT_LOG_LEVEL "Mqtt рівень"
 #define D_WEB_LOG_LEVEL "Web рівень"
-#define D_SYS_LOG_LEVEL "System рівень"
+#define D_SYS_LOG_LEVEL "Syslog рівень"
 #define D_MORE_DEBUG "Додаткова інформація для налагодження"
-#define D_SYSLOG_HOST "System хост"
-#define D_SYSLOG_PORT "System порт"
+#define D_SYSLOG_HOST "Syslog хост"
+#define D_SYSLOG_PORT "Syslog порт"
 #define D_TELEMETRY_PERIOD "Період телеметрії"
 
 #define D_OTHER_PARAMETERS "Параметри Інше"
 #define D_TEMPLATE "Шаблони"
-#define D_ACTIVATE "Activate"
-#define D_WEB_ADMIN_PASSWORD "Гасло Web адміністратора"
+#define D_ACTIVATE "Активувний"
+#define D_WEB_ADMIN_PASSWORD "Гасло адміністратора Web"
 #define D_MQTT_ENABLE "MQTT активний"
 #define D_FRIENDLY_NAME "Дружнє Ім'я"
 #define D_BELKIN_WEMO "Belkin WeMo"
@@ -328,14 +328,14 @@
 #define D_MQTT_GROUP_TOPIC "MQTT Топік групи"
 #define D_MQTT_FULL_TOPIC "MQTT Топік повний"
 #define D_MDNS_DISCOVERY "mDNS Виявлення"
-#define D_MDNS_ADVERTISE "mDNS Транcляція"
+#define D_MDNS_ADVERTISE "mDNS Анонс"
 #define D_ESP_CHIP_ID "ID чипу ESP"
 #define D_FLASH_CHIP_ID "ID чипу Flash пам'яті"
 #define D_FLASH_CHIP_SIZE "Розмір Flash пам'яті"
 #define D_FREE_PROGRAM_SPACE "Вільний простір для програм"
 
 #define D_UPGRADE_BY_WEBSERVER "Оновлення через Веб-сервер"
-#define D_OTA_URL "OTA Url"
+#define D_OTA_URL "OTA URL"
 #define D_START_UPGRADE "Почати оновлення"
 #define D_UPGRADE_BY_FILE_UPLOAD "Оновлення шляхом завантаження файлів"
 #define D_UPLOAD_STARTED "Завантаження почалось"
@@ -350,11 +350,11 @@
 #define D_UPLOAD_ERR_7 "Завантаження перервано"
 #define D_UPLOAD_ERR_8 "Файл невірний"
 #define D_UPLOAD_ERR_9 "Занадто великий файл"
-#define D_UPLOAD_ERR_10 "Помилка ініціалізаціції чипу FR"
+#define D_UPLOAD_ERR_10 "Помилка ініціалізаціції чипу RF"
 #define D_UPLOAD_ERR_11 "Помилка стирання чипу RF"
 #define D_UPLOAD_ERR_12 "Помилка запису чипу RF"
 #define D_UPLOAD_ERR_13 "Помилка розкодування прошивки RF"
-#define D_UPLOAD_ERR_14 "Not compatible"
+#define D_UPLOAD_ERR_14 "Не сумісно"
 #define D_UPLOAD_ERROR_CODE "Код помилки завантаження"
 
 #define D_ENTER_COMMAND "Уведіть команду"
@@ -363,7 +363,7 @@
 
 // xdrv_01_mqtt.ino
 #define D_FINGERPRINT "Перевірка відбитка TLS..."
-#define D_TLS_CONNECT_FAILED_TO "Збій підключення TLS до"
+#define D_TLS_CONNECT_FAILED_TO "Збій TLS підключення до"
 #define D_RETRY_IN "Повторити"
 #define D_VERIFIED "Перевірено відбиток"
 #define D_INSECURE "Небезпечне з'єднання, недійсний відбиток"
@@ -414,7 +414,7 @@
 #define D_TIMER_ARM "Увімкнений"
 #define D_TIMER_TIME "Час"
 #define D_TIMER_DAYS "Дні"
-#define D_TIMER_REPEAT "Повтор"
+#define D_TIMER_REPEAT "Повторення"
 #define D_TIMER_OUTPUT "Вихід"
 #define D_TIMER_ACTION "Дія"
 
@@ -459,9 +459,9 @@
 #define D_DEVICE_OUTPUT "Output"
 
 // xsns_05_ds18b20.ino
-#define D_SENSOR_BUSY "Датчик DS18x20 зайнятий"
-#define D_SENSOR_CRC_ERROR "Датчик DS18x20 - помилка CRC"
-#define D_SENSORS_FOUND "Датчик DS18x20 знайдено"
+#define D_SENSOR_BUSY "Давач DS18x20 зайнятий"
+#define D_SENSOR_CRC_ERROR "Давач DS18x20 - помилка CRC"
+#define D_SENSORS_FOUND "Давач DS18x20 знайдено"
 
 // xsns_06_dht.ino
 #define D_TIMEOUT_WAITING_FOR "Тайм-аут, в очікуванні"
@@ -471,7 +471,7 @@
 #define D_CHECKSUM_FAILURE "Помилка контрольної суми"
 
 // xsns_07_sht1x.ino
-#define D_SENSOR_DID_NOT_ACK_COMMAND "Датчик не підтвердив отримання команди"
+#define D_SENSOR_DID_NOT_ACK_COMMAND "Давач не підтвердив отримання команди"
 #define D_SHT1X_FOUND "SHT1X знайдено"
 
 // xsns_18_pms5003.ino
@@ -543,7 +543,7 @@
 #define D_SENSOR_SPI_MISO      "SPI MISO"
 #define D_SENSOR_SPI_MOSI      "SPI MOSI"
 #define D_SENSOR_SPI_CLK       "SPI CLK"
-#define D_SENSOR_BACKLIGHT     "Backlight"
+#define D_SENSOR_BACKLIGHT     "OLED Light"
 #define D_SENSOR_PMS5003       "PMS5003"
 #define D_SENSOR_SDS0X1_RX     "SDS0X1 Rx"
 #define D_SENSOR_SDS0X1_TX     "SDS0X1 Tx"
@@ -564,7 +564,7 @@
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
 #define D_SENSOR_TX20_TX       "TX20"
 #define D_SENSOR_RFSEND        "RFSend"
-#define D_SENSOR_RFRECV        "RFrecv"
+#define D_SENSOR_RFRECV        "RFRecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
 #define D_SENSOR_TUYA_RX       "Tuya Rx"
 #define D_SENSOR_MGC3130_XFER  "MGC3130 Xfr"
@@ -628,9 +628,9 @@
 #define D_SENSOR_SM2135_DAT    "SM2135 Dat"
 #define D_SENSOR_DEEPSLEEP     "DeepSleep"
 #define D_SENSOR_EXS_ENABLE    "EXS Enable"
-#define D_SENSOR_SLAVE_TX    "Slave TX"
-#define D_SENSOR_SLAVE_RX    "Slave RX"
-#define D_SENSOR_SLAVE_RESET "Slave RST"
+#define D_SENSOR_SLAVE_TX      "Slave TX"
+#define D_SENSOR_SLAVE_RX      "Slave RX"
+#define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
 
@@ -640,20 +640,20 @@
 #define D_UNIT_HERTZ "Гц"
 #define D_UNIT_HOUR "Г"
 #define D_UNIT_GALLONS "гал"
-#define D_UNIT_GALLONS_PER_MIN "g/m"
+#define D_UNIT_GALLONS_PER_MIN "гал/хв"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "кг"
 #define D_UNIT_KILOMETER_PER_HOUR "км/г"  // or "km/h"
 #define D_UNIT_KILOOHM "кОм"
-#define D_UNIT_KILOWATTHOUR "кВт"
+#define D_UNIT_KILOWATTHOUR "кВт/г"
 #define D_UNIT_LUX "лк"
 #define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м3"
 #define D_UNIT_MICROMETER "мкм"
-#define D_UNIT_MICROSECOND "мкс"
+#define D_UNIT_MICROSECOND "мкС"
 #define D_UNIT_MILLIAMPERE "мА"
 #define D_UNIT_MILLIMETER "мм"
 #define D_UNIT_MILLIMETER_MERCURY "ммHg"
-#define D_UNIT_MILLISECOND "мс"
+#define D_UNIT_MILLISECOND "мС"
 #define D_UNIT_MINUTE "хв"
 #define D_UNIT_PARTS_PER_BILLION "ppb"
 #define D_UNIT_PARTS_PER_DECILITER "ppd"
@@ -665,8 +665,8 @@
 #define D_UNIT_VAR "ВАр"
 #define D_UNIT_VOLT "В"
 #define D_UNIT_WATT "Вт"
-#define D_UNIT_WATTHOUR "Вт/Год"
-#define D_UNIT_WATT_METER_QUADRAT "Вт/m²"
+#define D_UNIT_WATTHOUR "Вт/г"
+#define D_UNIT_WATT_METER_QUADRAT "Вт/м²"
 
 //SDM220
 #define D_PHASE_ANGLE     "Кут фази"
@@ -679,27 +679,27 @@
 #define D_UNIT_ANGLE      "Град"
 
 //SOLAXX1
-#define D_PV1_VOLTAGE     "PV1 Voltage"
-#define D_PV1_CURRENT     "PV1 Current"
-#define D_PV1_POWER       "PV1 Power"
-#define D_PV2_VOLTAGE     "PV2 Voltage"
-#define D_PV2_CURRENT     "PV2 Current"
-#define D_PV2_POWER       "PV2 Power"
-#define D_SOLAR_POWER     "Solar Power"
-#define D_INVERTER_POWER  "Inverter Power"
-#define D_STATUS          "Status"
-#define D_WAITING         "Waiting"
-#define D_CHECKING        "Checking"
-#define D_WORKING         "Working"
-#define D_FAILURE         "Failure"
-#define D_SOLAX_ERROR_0   "No Error Code"
-#define D_SOLAX_ERROR_1   "Grid Lost Fault"
-#define D_SOLAX_ERROR_2   "Grid Voltage Fault"
-#define D_SOLAX_ERROR_3   "Grid Frequency Fault"
-#define D_SOLAX_ERROR_4   "Pv Voltage Fault"
-#define D_SOLAX_ERROR_5   "Isolation Fault"
-#define D_SOLAX_ERROR_6   "Over Temperature Fault"
-#define D_SOLAX_ERROR_7   "Fan Fault"
-#define D_SOLAX_ERROR_8   "Other Device Fault"
+#define D_PV1_VOLTAGE     "PV1 Напруга"
+#define D_PV1_CURRENT     "PV1 Струм"
+#define D_PV1_POWER       "PV1 Потужність"
+#define D_PV2_VOLTAGE     "PV2 Напруга"
+#define D_PV2_CURRENT     "PV2 Струм"
+#define D_PV2_POWER       "PV2 Потужність"
+#define D_SOLAR_POWER     "Solar Потужність"
+#define D_INVERTER_POWER  "Inverter Потужність"
+#define D_STATUS          "Стан"
+#define D_WAITING         "Очікування"
+#define D_CHECKING        "Перевірка"
+#define D_WORKING         "Працює"
+#define D_FAILURE         "Помилка"
+#define D_SOLAX_ERROR_0   "Немає помилки"
+#define D_SOLAX_ERROR_1   "Втрата мережі"
+#define D_SOLAX_ERROR_2   "Напруга мережі"
+#define D_SOLAX_ERROR_3   "Частота мережі"
+#define D_SOLAX_ERROR_4   "Напруга Pv"
+#define D_SOLAX_ERROR_5   "Ізоляція"
+#define D_SOLAX_ERROR_6   "Перегрів"
+#define D_SOLAX_ERROR_7   "Вентилятор"
+#define D_SOLAX_ERROR_8   "Інший пристрій"
 
-#endif // _LANGUAGE_UK_UK_H_
+#endif // _LANGUAGE_UK_UA_H_
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 13e7c6c64..b60651fec 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -265,7 +265,7 @@
 //#define MY_LANGUAGE            sk-SK           // Slovak in Slovakia
 //#define MY_LANGUAGE            sv-SE           // Swedish in Sweden
 //#define MY_LANGUAGE            tr-TR           // Turkish in Turkey
-//#define MY_LANGUAGE            uk-UK           // Ukrainian in Ukraine
+//#define MY_LANGUAGE            uk-UA           // Ukrainian in Ukraine
 //#define MY_LANGUAGE            zh-CN           // Chinese (Simplified) in China
 //#define MY_LANGUAGE            zh-TW           // Chinese (Traditional) in Taiwan
 

From 3f9018658c9ddee84326cef98f4e7c46eaaacc86 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 28 Dec 2019 09:58:30 +0100
Subject: [PATCH 019/403] Better gamma curve

---
 tasmota/xdrv_04_light.ino | 55 ++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index ecb966053..1310ff471 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -171,7 +171,8 @@ typedef struct gamma_table_t {
 } gamma_table_t;
 
 const gamma_table_t gamma_table[] = {   // don't put in PROGMEM for performance reasons
-  {    3,      0 },
+  {    1,      1 },
+  {    4,      1 },
   {  209,     13 },
   {  312,     41 },
   {  457,    106 },
@@ -196,46 +197,46 @@ const gamma_table_t gamma_table_fast[] = {
 //   0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
 //   1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
 //   2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,
-//   3,  3,  3,  3,  3,  4,  4,  4,  4,  5,  5,  5,  5,  6,  6,  6,
-//   6,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9, 10, 10, 10, 11,
-//  11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 17, 18,
+//   3,  3,  3,  3,  3,  3,  4,  4,  4,  4,  5,  5,  5,  6,  6,  6,
+//   6,  7,  7,  7,  7,  8,  8,  8,  9,  9,  9,  9, 10, 10, 10, 11,
+//  11, 12, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 17, 18,
 //  18, 19, 19, 20, 20, 21, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25,
 //  25, 26, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 36, 37, 38,
 //  39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, 51, 52, 53,
-//  54, 55, 56, 57, 58, 59, 60, 61, 61, 62, 63, 64, 65, 66, 68, 69,
-//  71, 72, 73, 75, 76, 78, 79, 80, 82, 83, 85, 86, 87, 88, 90, 91,
+//  54, 55, 56, 57, 58, 59, 60, 61, 61, 62, 63, 64, 65, 67, 68, 69,
+//  71, 72, 73, 75, 76, 78, 79, 80, 82, 83, 85, 86, 87, 89, 90, 91,
 //  93, 94, 95, 97, 98,100,101,102,104,105,107,108,109,111,112,114,
-// 116,118,120,121,123,125,127,129,131,133,135,137,139,141,142,144,
+// 116,118,120,122,124,125,127,129,131,133,135,137,139,141,143,144,
 // 146,148,150,152,154,156,158,160,162,164,166,168,170,171,173,175,
-// 177,180,182,185,187,190,192,195,197,200,202,205,207,210,212,215,
-// 217,220,222,225,227,230,233,235,238,240,243,245,248,250,253,255
+// 178,180,183,185,188,190,193,195,198,200,203,205,208,210,213,215,
+// 218,220,223,225,228,230,233,235,238,240,243,245,248,250,253,255
 //
 // and for 10 bits output:
 //    0,   1,   1,   1,   2,   2,   2,   2,   3,   3,   3,   3,   4,   4,   4,   4,
 //    5,   5,   5,   5,   5,   6,   6,   6,   6,   7,   7,   7,   7,   8,   8,   8,
 //    8,   8,   9,   9,   9,   9,  10,  10,  10,  10,  11,  11,  11,  11,  12,  12,
-//   12,  12,  13,  13,  13,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,
-//   26,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  42,  44,
-//   46,  47,  49,  51,  53,  54,  56,  58,  60,  62,  63,  65,  67,  69,  70,  72,
-//   74,  76,  78,  79,  81,  83,  85,  86,  88,  90,  92,  94,  95,  97,  99, 101,
+//   12,  12,  13,  13,  13,  14,  15,  16,  17,  18,  20,  21,  22,  23,  24,  25,
+//   26,  27,  28,  29,  30,  31,  33,  34,  35,  36,  37,  38,  39,  40,  41,  43,
+//   45,  47,  49,  50,  52,  54,  56,  58,  59,  61,  63,  65,  67,  68,  70,  72,
+//   74,  76,  77,  79,  81,  83,  84,  86,  88,  90,  92,  93,  95,  97,  99, 101,
 //  102, 104, 106, 110, 113, 117, 121, 124, 128, 132, 135, 139, 143, 146, 150, 154,
 //  158, 162, 166, 169, 173, 177, 180, 184, 188, 191, 195, 199, 202, 206, 210, 213,
-//  217, 221, 224, 228, 232, 235, 239, 243, 246, 250, 254, 257, 261, 266, 272, 277,
-//  283, 288, 294, 300, 305, 311, 316, 322, 327, 333, 339, 344, 350, 355, 361, 366,
-//  372, 378, 383, 389, 394, 400, 405, 411, 417, 422, 428, 433, 439, 444, 450, 457,
-//  464, 472, 480, 487, 495, 503, 510, 518, 525, 533, 541, 548, 556, 564, 571, 579,
-//  587, 594, 602, 609, 617, 627, 634, 642, 650, 657, 665, 672, 680, 688, 695, 703,
-//  712, 722, 732, 742, 752, 762, 772, 782, 792, 802, 812, 822, 832, 842, 852, 862,
-//  872, 882, 892, 902, 912, 923, 933, 943, 953, 963, 973, 983, 993,1003,1013,1023
+//  217, 221, 224, 228, 232, 235, 239, 243, 246, 250, 254, 257, 261, 267, 272, 278,
+//  283, 289, 294, 300, 305, 311, 317, 322, 328, 333, 339, 344, 350, 356, 361, 367,
+//  372, 378, 383, 389, 394, 400, 406, 411, 417, 422, 428, 433, 439, 444, 450, 458,
+//  465, 473, 480, 488, 496, 503, 511, 518, 526, 534, 541, 549, 557, 564, 572, 579,
+//  587, 595, 602, 610, 617, 627, 635, 642, 650, 657, 665, 673, 680, 688, 695, 703,
+//  713, 723, 733, 743, 753, 763, 773, 783, 793, 803, 813, 823, 833, 843, 853, 863,
+//  873, 883, 893, 903, 913, 923, 933, 943, 953, 963, 973, 983, 993,1003,1013,1023
 //
 // Output for Dimmer 0..100 values
 //   0,  1,  2,  3,  3,  4,  4,  5,  5,  6,  7,  7,  8,  8,  9,
-//  10, 10, 11, 12, 12, 13, 16, 18, 21, 23, 26, 29, 32, 34, 37,
-//  40, 44, 49, 53, 58, 62, 67, 70, 76, 79, 85, 90, 94, 99,102,
+//  10, 10, 11, 12, 12, 13, 15, 17, 21, 23, 26, 28, 31, 34, 37,
+//  40, 43, 49, 52, 58, 61, 67, 70, 76, 79, 84, 90, 93, 99,102,
 // 110,117,128,135,146,158,166,177,184,195,202,213,221,232,239,
-// 250,261,272,288,300,316,327,344,355,372,389,400,417,428,444,
-// 457,480,495,518,533,556,579,594,617,634,657,672,695,712,742,
-// 772,792,822,842,872,892,923,943,973,993,1023
+// 250,261,272,289,300,317,328,344,356,372,389,400,417,428,444,
+// 458,480,496,518,534,557,579,595,617,635,657,673,695,713,743,
+// 773,793,823,843,873,893,923,943,973,993,1023
 
 struct LIGHT {
   uint32_t strip_timer_counter = 0;  // Bars and Gradient
@@ -1103,8 +1104,8 @@ uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
     if (v <= to_src) {
       return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
     }
-    from_src = to_src + 1;
-    from_gamma = to_gamma + 1;
+    from_src = to_src;
+    from_gamma = to_gamma;
   }
 }
 // 10_10 bits, fast fade mode

From 7295b6631021fc68443033665c12373499658cbf Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 28 Dec 2019 10:42:00 +0100
Subject: [PATCH 020/403] Add DS1624 support

---
 RELEASENOTES.md              | 4 ++--
 tasmota/CHANGELOG.md         | 3 ++-
 tasmota/support_features.ino | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 16e5d63c2..e3b1e0fb4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -50,13 +50,13 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 [Complete list](BUILDS.md) of available feature and sensors.
 
-For merge for Changelog:
-- Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 ## Changelog
 
 ### Version 8.1.0.1
 
+- Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
+- Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 077384325..530b8c198 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 ### 8.1.0.1 20191225
 
+- Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
-- Change Lights: simplified gamma correction and 10 bits internal computation
+- Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 
 ## Released
 
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index dcc24de0b..696e5ee5d 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -492,7 +492,9 @@ void GetFeatures(void)
 #ifdef USE_DHT12
   feature5 |= 0x00100000;
 #endif
-//  feature5 |= 0x00200000;
+#ifdef USE_DS1624
+  feature5 |= 0x00200000;
+#endif
 #ifdef USE_GPS
   feature5 |= 0x00400000;
 #endif

From 5f62b59f05d82b15792e0cfda81a451825d8942f Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 28 Dec 2019 11:35:44 +0100
Subject: [PATCH 021/403] Refactor DS1624 driver

---
 tasmota/my_user_config.h   |   1 +
 tasmota/xsns_59_ds1624.ino | 134 ++++++++++++++++++++-----------------
 2 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index b60651fec..538301695 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -419,6 +419,7 @@
 //  #define USE_PCF8574                            // [I2cDriver2] Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x26 and 0x39 - 0x3F) (+1k9 code)
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
+//  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
index 82ce7d8f6..06b21d39e 100644
--- a/tasmota/xsns_59_ds1624.ino
+++ b/tasmota/xsns_59_ds1624.ino
@@ -21,8 +21,8 @@
 #ifdef USE_DS1624
 
 /*********************************************************************************************\
- * DS1624,DS1621 - Temperature
- * 
+ * DS1624, DS1621 - Temperature
+ *
  * I2C Address: 0x48 - 0x4F
 \*********************************************************************************************/
 
@@ -44,64 +44,68 @@ enum {
 };
 
 #define DS1624_MAX_SENSORS     8
-bool ds1624_init=false;
+
+bool ds1624_init = false;
+
 struct {
-  bool  valid;
-  float value;
-  int   type;
-  char  name[9];
+  float   value;
+  uint8_t type;
+  bool    valid;
+  char    name[9];
 } ds1624_sns[DS1624_MAX_SENSORS];
 
-uint32_t DS1624_Idx2Addr(int idx) {
+uint32_t DS1624_Idx2Addr(uint32_t idx) {
   return 0x48 + idx;
 }
 
-void DS1624_HotPlugUp(int idx) {
-  uint32_t addr;
-  uint8_t config,tmp;
+void DS1624_HotPlugUp(uint32_t idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
 
-  addr = DS1624_Idx2Addr(idx);
-  if (I2cActive(addr)) return;
-  if (!I2cSetDevice(addr)) return;
+  if (I2cActive(addr)) { return; }
+  if (!I2cSetDevice(addr)) { return; }
+
+  uint8_t config;
   if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
-    if (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER))
-         ds1624_sns[idx].type=DS1624_TYPE_DS1624;
-    else ds1624_sns[idx].type=DS1624_TYPE_DS1621;
-    if (ds1624_sns[idx].type==DS1624_TYPE_DS1621)
-          snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS1621_%d"), idx);
-    else  snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS1624_%d"), idx);
+    uint8_t tmp;
+    ds1624_sns[idx].type = (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER)) ? DS1624_TYPE_DS1624 : DS1624_TYPE_DS1621;
+
+    snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS162%c%c%d"),
+      (ds1624_sns[idx].type == DS1624_TYPE_DS1621) ? '1' : '4', IndexSeparator(), idx);
     I2cSetActiveFound(addr, ds1624_sns[idx].name);
-    ds1624_sns[idx].valid=true;
+
+    ds1624_sns[idx].valid = true;
     if ((config & 1) == 1) {
       config &= 0xfe;
-      I2cWrite8(addr, DS1624_CONF_REGISTER, config); //1show off
-      delay(10);// by spec after writing
+      I2cWrite8(addr, DS1624_CONF_REGISTER, config);  // 1show off
+      delay(10);                                      // by spec after writing
     }
-    I2cValidRead(addr, DS1624_START_REGISTER, 1); //FIXME 0 must read, but 0 isn't work for tasmota
+    I2cValidRead(addr, DS1624_START_REGISTER, 1);     // FIXME 0 must read, but 0 isn't work for tasmota
     AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
   }
 }
 
-void DS1624_HotPlugDown(int idx) {
-  uint32_t addr=DS1624_Idx2Addr(idx);
-  if (I2cActive(addr)==false) return; 
+void DS1624_HotPlugDown(int idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if (!I2cActive(addr)) { return; }
   I2cResetActive(addr);
-  ds1624_sns[idx].valid=false;
+  ds1624_sns[idx].valid = false;
   AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
 }
 
 bool DS1624GetTemp(float *value, int idx)
 {
-  uint16_t t;
-  bool     result;
-  uint32_t addr=DS1624_Idx2Addr(idx);
+  uint32_t addr = DS1624_Idx2Addr(idx);
 
-  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) return false;
-  *value = ConvertTemp(((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625);
-  if (ds1624_sns[idx].type==DS1624_TYPE_DS1621) { // Higher resolution
-    uint8_t perc,remain;
-    if (I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)==false) return true;
-    if (I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)==false) return true;
+  uint16_t t;
+  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
+  *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
+  if (ds1624_sns[idx].type == DS1624_TYPE_DS1621) {  // Higher resolution
+    uint8_t remain;
+    if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
+    uint8_t perc;
+    if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
     *value += ((float)perc - (float)remain)/((float)perc) - 0.25;
   }
   return true;
@@ -111,13 +115,15 @@ void DS1624HotPlugScan(void)
 {
   uint16_t t;
 
-  for (int idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
-    uint32_t addr=DS1624_Idx2Addr(idx);
-    if ((I2cActive(addr)==true) && (ds1624_sns[idx].valid==false))
-      continue; // is busy by another driver
+  for (uint32_t idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
+    uint32_t addr = DS1624_Idx2Addr(idx);
+    if (I2cActive(addr) && !ds1624_sns[idx].valid) {
+      continue;  // is busy by another driver
+    }
     if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) {
       DS1624_HotPlugDown(idx);
-      continue; }
+      continue;
+    }
     DS1624_HotPlugUp(idx);
   }
 }
@@ -125,36 +131,37 @@ void DS1624HotPlugScan(void)
 void DS1624EverySecond(void)
 {
   float t;
-  for (int i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (ds1624_sns[i].valid==false) continue;
-    if (!DS1624GetTemp(&t, i)) continue;
-    ds1624_sns[i].value=t;
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
+    if (!DS1624GetTemp(&t, i)) { continue; }
+    ds1624_sns[i].value = ConvertTemp(t);
   }
 }
 
 void DS1624Show(bool json)
 {
-  int  i;
   char temperature[33];
+  bool once = true;
 
-  for (i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (ds1624_sns[i].valid==false) continue;
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
 
     dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
     if (json) {
       ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
-      if (0 == tele_period) { //FIXME 0==i WTF?
-  #ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && once) {
+#ifdef USE_DOMOTICZ
         DomoticzSensor(DZ_TEMP, temperature);
-  #endif  // USE_DOMOTICZ
-  #ifdef USE_KNX
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
         KnxSensor(KNX_TEMPERATURE, temperature);
-  #endif // USE_KNX
+#endif // USE_KNX
+        once = false;
       }
-  #ifdef USE_WEBSERVER
+#ifdef USE_WEBSERVER
     } else {
       WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
-  #endif  // USE_WEBSERVER
+#endif  // USE_WEBSERVER
     }
   }
 }
@@ -163,18 +170,19 @@ void DS1624Show(bool json)
  * Interface
 \*********************************************************************************************/
 
-#define FUNC_HOTPLUG_SCAN 999 // FIXME remove it after HOTPLUG supported
+#define FUNC_HOTPLUG_SCAN 255 // FIXME remove it after HOTPLUG supported
 
 bool Xsns59(uint8_t function)
 {
-  if (!I2cEnabled(XI2C_20)) { return false; }
+  if (!I2cEnabled(XI2C_42)) { return false; }
 
   bool result = false;
+
   if (FUNC_INIT == function) {
-    if (ds1624_init==false) {
+    if (!ds1624_init) {
       memset(ds1624_sns, 0, sizeof(ds1624_sns));
-      ds1624_init=true;
-      DS1624HotPlugScan(); //If HotPlug is off
+      ds1624_init = true;
+      DS1624HotPlugScan();  // If HotPlug is off
     }
   }
   switch (function) {
@@ -187,11 +195,11 @@ bool Xsns59(uint8_t function)
     case FUNC_JSON_APPEND:
       DS1624Show(1);
       break;
-  #ifdef USE_WEBSERVER
+#ifdef USE_WEBSERVER
     case FUNC_WEB_SENSOR:
       DS1624Show(0);
       break;
-  #endif  // USE_WEBSERVER
+#endif  // USE_WEBSERVER
   }
   return result;
 }

From 4d9c55108314c789dc704ea758e74993ec490776 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 28 Dec 2019 13:14:51 +0100
Subject: [PATCH 022/403] Add WDT crash status

---
 tasmota/support_command.ino        | 5 ++++-
 tasmota/support_crash_recorder.ino | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 53f4601a8..397d60f30 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -334,7 +334,7 @@ void CmndStatus(void)
   if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }  // SetOption3 - Enable MQTT
   if (!energy_flg && (9 == payload)) { payload = 99; }
 
-  bool exception_flg = (ResetReason() == REASON_EXCEPTION_RST);
+  bool exception_flg = (ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST);
   if (!exception_flg && (12 == payload)) { payload = 99; }
 
   if ((0 == payload) || (99 == payload)) {
@@ -575,6 +575,9 @@ void CmndRestart(void)
   case -1:
     CmndCrash();    // force a crash
     break;
+  case -2:
+    CmndWDT();
+    break;
   case 99:
     AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
     EspRestart();
diff --git a/tasmota/support_crash_recorder.ino b/tasmota/support_crash_recorder.ino
index 87009bbc5..d354adb3b 100644
--- a/tasmota/support_crash_recorder.ino
+++ b/tasmota/support_crash_recorder.ino
@@ -50,6 +50,15 @@ void CmndCrash(void)
   dummy = *((uint32_t*) 0x00000000);
 }
 
+// do an infinite loop to trigger WDT watchdog
+void CmndWDT(void)
+{
+  volatile uint32_t dummy = 0;
+  while (1) {
+    dummy++;
+  }
+}
+
 // Clear the RTC dump counter when we do a normal reboot, this avoids garbage data to stay in RTC
 void CrashDumpClear(void)
 {

From eabac5e466027f9df1e616a97419e6ffd6f75fd5 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 28 Dec 2019 13:59:01 +0100
Subject: [PATCH 023/403] Zigbee attribute decoder for Xiaomi Aqara Cube

---
 tasmota/CHANGELOG.md                    |  1 +
 tasmota/xdrv_23_zigbee_5_converters.ino | 61 ++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 530b8c198..3abb0db81 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
+- Add Zigbee attribute decoder for Xiaomi Aqara Cube
 
 ## Released
 
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 1423c53f1..94853d629 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -601,7 +601,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   { 0x0012, 0x001C,  "Description",          &Z_Copy },
   { 0x0012, 0x004A,  "NumberOfStates",       &Z_Copy },
   { 0x0012, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0012, 0x0055,  "PresentValue",         &Z_Copy },
+  { 0x0012, 0x0055,  "PresentValue",         &Z_AqaraCube },
   { 0x0012, 0x0067,  "Reliability",          &Z_Copy },
   { 0x0012, 0x006F,  "StatusFlags",          &Z_Copy },
   { 0x0012, 0x0100,  "ApplicationType",      &Z_Copy },
@@ -836,6 +836,65 @@ int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpo
   XdrvRulesProcess();
 }
 
+// Aqara Cube
+int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;   // copy the original value
+  int32_t val = value;
+  const __FlashStringHelper *aqara_cube = F("AqaraCube");
+  const __FlashStringHelper *aqara_cube_side = F("AqaraCubeSide");
+  const __FlashStringHelper *aqara_cube_from_side = F("AqaraCubeFromSide");
+
+  switch (val) {
+    case 0:
+      json[aqara_cube] = F("shake");
+      break;
+    case 2:
+      json[aqara_cube] = F("wakeup");
+      break;
+    case 3:
+      json[aqara_cube] = F("fall");
+      break;
+    case 64 ... 127:
+      json[aqara_cube] = F("flip90");
+      json[aqara_cube_side] = val % 8;
+      json[aqara_cube_from_side] = (val - 64) / 8;
+      break;
+    case 128 ... 132:
+      json[aqara_cube] = F("flip180");
+      json[aqara_cube_side] = val - 128;
+      break;
+    case 256 ... 261:
+      json[aqara_cube] = F("slide");
+      json[aqara_cube_side] = val - 256;
+      break;
+    case 512 ... 517:
+      json[aqara_cube] = F("tap");
+      json[aqara_cube_side] = val - 512;
+      break;
+  }
+
+  //     Source: https://github.com/kirovilya/ioBroker.zigbee
+  //         +---+
+  //         | 2 |
+  //     +---+---+---+
+  //     | 4 | 0 | 1 |
+  //     +---+---+---+
+  //         |M5I|
+  //         +---+
+  //         | 3 |
+  //         +---+
+  //     Side 5 is with the MI logo, side 3 contains the battery door.
+  //     presentValue = 0 = shake
+  //     presentValue = 2 = wakeup
+  //     presentValue = 3 = fly/fall
+  //     presentValue = y + x * 8 + 64 = 90º Flip from side x on top to side y on top
+  //     presentValue = x + 128 = 180º flip to side x on top
+  //     presentValue = x + 256 = push/slide cube while side x is on top
+  //     presentValue = x + 512 = double tap while side x is on top
+
+  return 1;
+}
+
 // Aqara Vibration Sensor - special proprietary attributes
 int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
   //json[new_name] = value;

From ab167b097477b0fd53857e784edf77bfe955cbb4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 28 Dec 2019 14:54:26 +0100
Subject: [PATCH 024/403] Add more crash dump information

---
 RELEASENOTES.md                    |  1 +
 tasmota/support.ino                |  7 ++++++-
 tasmota/support_command.ino        |  9 +++++----
 tasmota/support_crash_recorder.ino | 15 ++++++++++++++-
 tasmota/xdrv_02_mqtt.ino           |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e3b1e0fb4..42788a5b9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -60,3 +60,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
+- Add Zigbee attribute decoder for Xiaomi Aqara Cube
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 32ef55731..8010f1e5c 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -57,8 +57,13 @@ void OsWatchTicker(void)
 //    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_OSWATCH " " D_BLOCKED_LOOP ". " D_RESTARTING));  // Save iram space
     RtcSettings.oswatch_blocked_loop = 1;
     RtcSettingsSave();
+
 //    ESP.restart();  // normal reboot
-    ESP.reset();  // hard reset
+//    ESP.reset();  // hard reset
+
+    // Force an exception to get a stackdump
+    volatile uint32_t dummy;
+    dummy = *((uint32_t*) 0x00000000);
   }
 }
 
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 397d60f30..0762fa329 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -333,9 +333,7 @@ void CmndStatus(void)
 
   if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }  // SetOption3 - Enable MQTT
   if (!energy_flg && (9 == payload)) { payload = 99; }
-
-  bool exception_flg = (ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST);
-  if (!exception_flg && (12 == payload)) { payload = 99; }
+  if (!CrashFlag() && (12 == payload)) { payload = 99; }
 
   if ((0 == payload) || (99 == payload)) {
     uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
@@ -482,7 +480,7 @@ void CmndStatus(void)
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "11"));
   }
 
-  if (exception_flg) {
+  if (CrashFlag()) {
     if ((0 == payload) || (12 == payload)) {
       Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":"));
       CrashDump();
@@ -578,6 +576,9 @@ void CmndRestart(void)
   case -2:
     CmndWDT();
     break;
+  case -3:
+    CmndBlockedLoop();
+    break;
   case 99:
     AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
     EspRestart();
diff --git a/tasmota/support_crash_recorder.ino b/tasmota/support_crash_recorder.ino
index d354adb3b..a51cb5dd2 100644
--- a/tasmota/support_crash_recorder.ino
+++ b/tasmota/support_crash_recorder.ino
@@ -50,7 +50,7 @@ void CmndCrash(void)
   dummy = *((uint32_t*) 0x00000000);
 }
 
-// do an infinite loop to trigger WDT watchdog
+// Do an infinite loop to trigger WDT watchdog
 void CmndWDT(void)
 {
   volatile uint32_t dummy = 0;
@@ -59,6 +59,14 @@ void CmndWDT(void)
   }
 }
 
+// This will trigger the os watch after OSWATCH_RESET_TIME (=120) seconds
+void CmndBlockedLoop(void)
+{
+  while (1) {
+    delay(1000);
+  }
+}
+
 // Clear the RTC dump counter when we do a normal reboot, this avoids garbage data to stay in RTC
 void CrashDumpClear(void)
 {
@@ -70,6 +78,11 @@ void CrashDumpClear(void)
  * CmndCrashDump - dump the crash history - called by `Status 12`
 \*********************************************************************************************/
 
+bool CrashFlag(void)
+{
+  return ((ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST) || oswatch_blocked_loop);
+}
+
 void CrashDump(void)
 {
   ResponseAppend_P(PSTR("{\"Exception\":%d,\"Reason\":\"%s\",\"EPC\":[\"%08x\",\"%08x\",\"%08x\"],\"EXCVADDR\":\"%08x\",\"DEPC\":\"%08x\""),
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 910a2ea6f..3544ec070 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -532,7 +532,7 @@ void MqttConnected(void)
     }
 #endif  // USE_WEBSERVER
     Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":"));
-    if (ResetReason() == REASON_EXCEPTION_RST) {
+    if (CrashFlag()) {
       CrashDump();
     } else {
       ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str());

From aefb3fb9de0e2f43afd54665006009a99d030eb8 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Sat, 28 Dec 2019 16:47:30 +0200
Subject: [PATCH 025/403] Reserve SetOption79

Used to enable resetting of the counter values to zero after telemetry data was transmitted.
---
 tasmota/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index eddc4f04b..0c47e5aca 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -92,7 +92,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t bootcount_update : 1;         // bit 26 (v7.0.0.4)  - SetOption76 - Enable incrementing bootcount when deepsleep is enabled
     uint32_t slider_dimmer_stay_on : 1;    // bit 27 (v7.0.0.6)  - SetOption77 - Do not power off if slider moved to far left
     uint32_t compatibility_check : 1;      // bit 28 (v7.1.2.6)  - SetOption78 - Disable OTA compatibility check
-    uint32_t spare29 : 1;
+    uint32_t counter_reset_on_tele : 1;    // bit 29 (v8.1.0.1)  - SetOption79 - Enable resetting of counters after telemetry was sent
     uint32_t shutter_mode : 1;             // bit 30 (v6.6.0.14) - SetOption80 - Enable shutter support
     uint32_t pcf8574_ports_inverted : 1;   // bit 31 (v6.6.0.14) - SetOption81 - Invert all ports on PCF8574 devices
   };

From 436cf830b9b5690d3f41a122160352c5106d87cf Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Sat, 28 Dec 2019 16:49:57 +0200
Subject: [PATCH 026/403] Add support for resetting counters on tele_period

Add support for resetting counters on tele_period if SetOption78 is enabled.
---
 tasmota/xsns_01_counter.ino | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tasmota/xsns_01_counter.ino b/tasmota/xsns_01_counter.ino
index 8ed615c86..c664ff811 100644
--- a/tasmota/xsns_01_counter.ino
+++ b/tasmota/xsns_01_counter.ino
@@ -150,6 +150,9 @@ void CounterShow(bool json)
           ResponseAppend_P(PSTR(",\"COUNTER\":{"));
         }
         ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
+        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
+          RtcSettings.pulse_counter[i] = 0;
+        }
         header = true;
 #ifdef USE_DOMOTICZ
         if ((0 == tele_period) && (1 == dsxflg)) {

From 4a9271acedc8cb11829d45c1632723f9c35ec5c5 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Sat, 28 Dec 2019 17:26:15 +0200
Subject: [PATCH 027/403] Update xsns_01_counter.ino

---
 tasmota/xsns_01_counter.ino | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/xsns_01_counter.ino b/tasmota/xsns_01_counter.ino
index c664ff811..985216392 100644
--- a/tasmota/xsns_01_counter.ino
+++ b/tasmota/xsns_01_counter.ino
@@ -150,9 +150,6 @@ void CounterShow(bool json)
           ResponseAppend_P(PSTR(",\"COUNTER\":{"));
         }
         ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
-        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
-          RtcSettings.pulse_counter[i] = 0;
-        }
         header = true;
 #ifdef USE_DOMOTICZ
         if ((0 == tele_period) && (1 == dsxflg)) {
@@ -160,6 +157,9 @@ void CounterShow(bool json)
           dsxflg++;
         }
 #endif  // USE_DOMOTICZ
+        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
+          RtcSettings.pulse_counter[i] = 0;
+        }
 #ifdef USE_WEBSERVER
       } else {
         WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),

From 6a06d356267b0291409f4f114cf7e1736d3a75ce Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 28 Dec 2019 16:33:51 +0100
Subject: [PATCH 028/403] Add command ``SetOption79 0/1``

Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
---
 RELEASENOTES.md      | 1 +
 tasmota/CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 42788a5b9..c0524023e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -57,6 +57,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 3abb0db81..0cb300692 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev

From daf3d27c9afe0f89d8eeb8cd92609e146764c3e3 Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Sat, 28 Dec 2019 23:24:52 +0700
Subject: [PATCH 029/403] Update xdrv_27_shutter.ino

Try to bugfix
---
 tasmota/xdrv_27_shutter.ino | 60 +++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 8392bebad..4b3936533 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -89,32 +89,33 @@ void ShutterRtc50mS(void)
   }
 }
 
-int32_t ShutterPercentToRealPosition(uint8_t percent,uint8_t i)
+
+int32_t ShutterPercentToRealPosition(uint8_t percent,uint8_t index)
 {
-	if (Settings.shutter_set50percent[i] != 50) {
-    return  percent <= 5 ?  Settings.shuttercoeff[2][i] * percent : Settings.shuttercoeff[1][i] * percent + Settings.shuttercoeff[0][i];
+	if (Settings.shutter_set50percent[index] != 50) {
+    return  percent <= 5 ?  Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
 	} else {
-    int32_t realpos;
+    uint32_t realpos;
     // check against DIV 0
     for (uint8_t j=0 ; j < 5 ; j++) {
-      if (Settings.shuttercoeff[j][i] == 0) {
+      if (Settings.shuttercoeff[j][index] == 0) {
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
         for (uint8_t k=0 ; k < 5 ; k++) {
-          Settings.shuttercoeff[k][i] = messwerte[k] * 1000 / messwerte[4];
+          Settings.shuttercoeff[k][index] = messwerte[k] * 1000 / messwerte[4];
         }
       }
     }
-    for (uint8_t l=0 ; l < 5 ; l++) {
-      if (percent*10 > Settings.shuttercoeff[l][i]) {
-        realpos = Shutter.open_max[i] * calibrate_pos[l+1] / 100;
-        //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP1: %d, %% %d, coeff %d"), realpos, percent, Settings.shuttercoeff[l][i]);
+    for (uint8_t i=0 ; i < 5 ; i++) {
+      if (percent*10 > Settings.shuttercoeff[i][index]) {
+        realpos = Shutter.open_max[index] * calibrate_pos[i+1] / 100;
+        //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP1: %d, %% %d, coeff %d"), realpos, percent, Settings.shuttercoeff[i][index]);
       } else {
-        if ( l == 0) {
-          realpos =  percent * Shutter.open_max[i] * calibrate_pos[l+1] / Settings.shuttercoeff[l][i] / 10;
+        if ( i == 0) {
+          realpos =  percent * Shutter.open_max[index] * calibrate_pos[i+1] / Settings.shuttercoeff[i][index] / 10;
         } else {
-          //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][i] ) * Shutter_Open_Max[i] * (calibrate_pos[l+1] - calibrate_pos[l]) / (Settings.shuttercoeff[l][i] -Settings.shuttercoeff[l-1][l]) / 100;
-          //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP2: %d, %% %d, coeff %d"), addon, (calibrate_pos[l+1] - calibrate_pos[l]), (Settings.shuttercoeff[l][i] -Settings.shuttercoeff[l-1][l]));
-          realpos += ( percent*10 - Settings.shuttercoeff[l-1][i] ) * Shutter.open_max[i] * (calibrate_pos[l+1] - calibrate_pos[l]) / (Settings.shuttercoeff[l][i] -Settings.shuttercoeff[l-1][i]) / 100;
+          //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
+          //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP2: %d, %% %d, coeff %d"), addon, (calibrate_pos[i+1] - calibrate_pos[i]), (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]));
+          realpos += ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
         }
         break;
       }
@@ -123,33 +124,34 @@ int32_t ShutterPercentToRealPosition(uint8_t percent,uint8_t i)
 	}
 }
 
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint8_t i)
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint8_t index)
 {
-	if (Settings.shutter_set50percent[i] != 50) {
-		return Settings.shuttercoeff[2][i] * 5 > realpos ? realpos / Settings.shuttercoeff[2][i] : (realpos-Settings.shuttercoeff[0][i]) / Settings.shuttercoeff[1][i];
+	if (Settings.shutter_set50percent[index] != 50) {
+		return Settings.shuttercoeff[2][index] * 5 > realpos ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
 	} else {
-    int16_t realpercent;
+    uint16_t realpercent;
 
-    for (uint8_t j=0 ; j < 5 ; j++) {
-      if (realpos > Shutter.open_max[i] * calibrate_pos[j+1] / 100) {
-        realpercent = Settings.shuttercoeff[j][i] /10;
-        //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP1: %d, %% %d, coeff %d"), realpercent, realpos, Shutter_Open_Max[i] * calibrate_pos[i+1] / 100);
+    for (uint8_t i=0 ; i < 5 ; i++) {
+      if (realpos > Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
+        realpercent = Settings.shuttercoeff[i][index] /10;
+        //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP1: %d, %% %d, coeff %d"), realpercent, realpos, Shutter_Open_Max[index] * calibrate_pos[i+1] / 100);
       } else {
         if ( i == 0) {
-          realpercent =  ( realpos - (Shutter.open_max[i] * calibrate_pos[j] / 100) ) * 10 * Settings.shuttercoeff[j][i] / calibrate_pos[j+1] / Shutter.open_max[i];
+          realpercent =  ( realpos - (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * Settings.shuttercoeff[i][index] / calibrate_pos[i+1] / Shutter.open_max[index];
         } else {
-          //uint16_t addon = ( realpos - (Shutter_Open_Max[i] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][i] - Settings.shuttercoeff[i-1][i]) / (calibrate_pos[i+1] - calibrate_pos[i])/ Shutter_Open_Max[i];
-          //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][i] ) * Shutter_Open_Max[i] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][i] -Settings.shuttercoeff[i-1][i]) / 100;
-          //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP2: %d, delta %d,  %% %d, coeff %d"), addon,( realpos - (Shutter_Open_Max[i] * calibrate_pos[i] / 100) ) , (calibrate_pos[i+1] - calibrate_pos[i])* Shutter_Open_Max[i]/100, (Settings.shuttercoeff[i][i] -Settings.shuttercoeff[i-1][i]));
-          realpercent += ( realpos -  (Shutter.open_max[i] * calibrate_pos[j] / 100) ) * 10 * (Settings.shuttercoeff[j][i] - Settings.shuttercoeff[j-1][i]) / (calibrate_pos[j+1] - calibrate_pos[j]) / Shutter.open_max[i] ;
+          //uint16_t addon = ( realpos - (Shutter_Open_Max[index] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]) / (calibrate_pos[i+1] - calibrate_pos[i])/ Shutter_Open_Max[index];
+          //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
+          //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP2: %d, delta %d,  %% %d, coeff %d"), addon,( realpos - (Shutter_Open_Max[index] * calibrate_pos[i] / 100) ) , (calibrate_pos[i+1] - calibrate_pos[i])* Shutter_Open_Max[index]/100, (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]));
+          realpercent += ( realpos -  (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]) / (calibrate_pos[i+1] - calibrate_pos[i]) / Shutter.open_max[index] ;
         }
         break;
       }
     }
-    return (realpercent < 0 ? 0 : (realpercent > 100 ? 0 : realpercent));
+    return realpercent;
   }
 }
 
+
 void ShutterInit(void)
 {
   shutters_present = 0;

From 7a49f523e7d3f296a3f1ae9ab2310be181cbc5b9 Mon Sep 17 00:00:00 2001
From: Bohdan Kmit <bkmit@maytech.net>
Date: Sat, 28 Dec 2019 19:25:43 +0200
Subject: [PATCH 030/403] Make scripter configuration interface localizable

Add tasmota-script build environment and travis entry
---
 tasmota/language/bg-BG.h     | 13 +++++++++++++
 tasmota/language/cs-CZ.h     | 13 +++++++++++++
 tasmota/language/de-DE.h     | 13 +++++++++++++
 tasmota/language/el-GR.h     | 13 +++++++++++++
 tasmota/language/en-GB.h     | 13 +++++++++++++
 tasmota/language/es-ES.h     | 13 +++++++++++++
 tasmota/language/fr-FR.h     | 13 +++++++++++++
 tasmota/language/he-HE.h     | 13 +++++++++++++
 tasmota/language/hu-HU.h     | 13 +++++++++++++
 tasmota/language/it-IT.h     | 13 +++++++++++++
 tasmota/language/ko-KO.h     | 13 +++++++++++++
 tasmota/language/nl-NL.h     | 13 +++++++++++++
 tasmota/language/pl-PL.h     | 13 +++++++++++++
 tasmota/language/pt-BR.h     | 13 +++++++++++++
 tasmota/language/pt-PT.h     | 13 +++++++++++++
 tasmota/language/ru-RU.h     | 13 +++++++++++++
 tasmota/language/sk-SK.h     | 13 +++++++++++++
 tasmota/language/sv-SE.h     | 13 +++++++++++++
 tasmota/language/tr-TR.h     | 13 +++++++++++++
 tasmota/language/uk-UA.h     | 23 ++++++++++++++++++-----
 tasmota/language/zh-CN.h     | 13 +++++++++++++
 tasmota/language/zh-TW.h     | 13 +++++++++++++
 tasmota/xdrv_10_scripter.ino | 19 +++++++------------
 23 files changed, 298 insertions(+), 17 deletions(-)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index f2ac56402..22e99f9f9 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Грешка - вентилатор"
 #define D_SOLAX_ERROR_8   "Грешка - друго оборудване"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_BG_BG_H_
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 272e2c5ca..92ba99b30 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_CS_CZ_H_
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 9e30f42f8..eeddc5580 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Lüfterfehler"
 #define D_SOLAX_ERROR_8   "sonstiger Fehler"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_DE_DE_H_
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 2b1e4748c..15b78fea7 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_EL_GR_H_
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index ab7f90cf8..72d30faac 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_EN_GB_H_
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index e41b4cb32..cc8cc3166 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Falla de Ventilador"
 #define D_SOLAX_ERROR_8   "Falla del Dispositivo"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_ES_ES_H_
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index d9d7019f8..c84610379 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Défaut Ventilateur"
 #define D_SOLAX_ERROR_8   "Défaut Autre équipement"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_FR_FR_H_
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index 9e26a6c5e..d21750fba 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_HE_HE_H_
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index b7f33a549..da61d1ffd 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_HU_HU_H_
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index d3c55579a..ca584ec8e 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Errore Ventilatore"
 #define D_SOLAX_ERROR_8   "Altro Errore del Dispositivo"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_IT_IT_H_
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index a6c2088a1..b85f60bce 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_KO_KO_H_
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 8fb492399..1fde4786d 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Ventilator"
 #define D_SOLAX_ERROR_8   "Overige"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_NL_NL_H_
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 4f2c9c069..f8250eda2 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Błąd - wentylator"
 #define D_SOLAX_ERROR_8   "Błąd - inne urządzenie"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_PL_PL_D_H_
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index 0c9891323..f5390be86 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Falha no Ventilador"
 #define D_SOLAX_ERROR_8   "Outra falha do dispositivo"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_PT_BR_H_
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 210ef8e29..154bebd70 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Falha no ventilador"
 #define D_SOLAX_ERROR_8   "Outra falha no dispositivo"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_PT_PT_H_
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 6696e0e48..89567f11f 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_RU_RU_H_
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 21120179a..c42130e11 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_SK_SK_H_
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 117fb40ed..074c81c8e 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_SV_SE_H_
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 9874688da..04cc270ec 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_TR_TR_H_
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index cd77adebd..af7672973 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -296,14 +296,14 @@
 
 #define D_OTHER_PARAMETERS "Параметри Інше"
 #define D_TEMPLATE "Шаблони"
-#define D_ACTIVATE "Активувний"
+#define D_ACTIVATE "Активований"
 #define D_WEB_ADMIN_PASSWORD "Гасло адміністратора Web"
 #define D_MQTT_ENABLE "MQTT активний"
-#define D_FRIENDLY_NAME "Дружнє Ім'я"
+#define D_FRIENDLY_NAME "Дружня назва"
 #define D_BELKIN_WEMO "Belkin WeMo"
-#define D_HUE_BRIDGE "Hue Bridge"
-#define D_SINGLE_DEVICE "одиночне"
-#define D_MULTI_DEVICE "мульти"
+#define D_HUE_BRIDGE "Міст Hue"
+#define D_SINGLE_DEVICE "один пристрій"
+#define D_MULTI_DEVICE "декілька пристроїв"
 
 #define D_CONFIGURE_TEMPLATE "Конфігурація шаблона"
 #define D_TEMPLATE_PARAMETERS "Параметри шаблона"
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Вентилятор"
 #define D_SOLAX_ERROR_8   "Інший пристрій"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Конфігурація сценарія"
+#define D_SCRIPT               "Редагування сценарія"
+#define D_SDCARD_UPLOAD        "завантажити файл на карту SD"
+#define D_SDCARD_DIR           "завантажити файл в каталог на карту SD"
+#define D_UPL_DONE             "Готово"
+#define D_SCRIPT_CHARS_LEFT    "символів ще вільно"
+#define D_SCRIPT_CHARS_NO_MORE "більше немає місця"
+#define D_SCRIPT_DOWNLOAD      "Звантажити"
+#define D_SCRIPT_ENABLE        "Сценарій увімкнено"
+#define D_SCRIPT_UPLOAD        "Завантажити"
+#define D_SCRIPT_UPLOAD_FILES  "Завантажити файли"
+
 #endif // _LANGUAGE_UK_UA_H_
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 7700e7e78..4c75b7bb7 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_ZH_CN_H_
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 34bb68e3d..f17ba46b7 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -702,4 +702,17 @@
 #define D_SOLAX_ERROR_7   "Fan Fault"
 #define D_SOLAX_ERROR_8   "Other Device Fault"
 
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Edit script"
+#define D_SCRIPT               "edit script"
+#define D_SDCARD_UPLOAD        "file upload"
+#define D_SDCARD_DIR           "sd card directory"
+#define D_UPL_DONE             "Done"
+#define D_SCRIPT_CHARS_LEFT    "chars left"
+#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_SCRIPT_DOWNLOAD      "Download"
+#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_UPLOAD        "Upload"
+#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+
 #endif  // _LANGUAGE_ZH_TW_H_
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index 6b97fa68a..29177482a 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -3033,11 +3033,6 @@ void Scripter_save_pvars(void) {
 #ifdef USE_WEBSERVER
 
 #define WEB_HANDLE_SCRIPT "s10"
-#define D_CONFIGURE_SCRIPT "Edit script"
-#define D_SCRIPT "edit script"
-#define D_SDCARD_UPLOAD "file upload"
-#define D_SDCARD_DIR "sd card directory"
-#define D_UPL_DONE "Done"
 
 const char S_CONFIGURE_SCRIPT[] PROGMEM = D_CONFIGURE_SCRIPT;
 
@@ -3051,7 +3046,7 @@ const char HTTP_FORM_SCRIPT[] PROGMEM =
 
 const char HTTP_FORM_SCRIPT1[] PROGMEM =
     "<div style='text-align:right' id='charNum'> </div>"
-    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>script enable</b><br/>"
+    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>" D_SCRIPT_ENABLE "</b><br/>"
     "<br><textarea  id='t1' name='t1' rows='8' cols='80' maxlength='%d' style='font-size: 12pt' >";
 
 const char HTTP_FORM_SCRIPT1b[] PROGMEM =
@@ -3064,9 +3059,9 @@ const char HTTP_FORM_SCRIPT1b[] PROGMEM =
     "var ml=this.getAttribute('maxlength');"
     "var cl=this.value.length;"
     "if(cl>=ml){"
-      "eb('charNum').innerHTML='no more chars';"
+    "eb('charNum').innerHTML='" D_SCRIPT_CHARS_NO_MORE "';"
     "}else{"
-      "eb('charNum').innerHTML=ml-cl+' chars left';"
+    "eb('charNum').innerHTML=ml-cl+' " D_SCRIPT_CHARS_LEFT "';"
     "}"
 
 #if 0
@@ -3137,13 +3132,13 @@ const char HTTP_SCRIPT_FORM_END[] PROGMEM =
 
 #ifdef USE_SCRIPT_FATFS
 const char HTTP_FORM_SCRIPT1c[] PROGMEM =
-"<button name='d%d' type='submit' class='button bgrn'>Download '%s'</button>";
+    "<button name='d%d' type='submit' class='button bgrn'>" D_SCRIPT_DOWNLOAD " '%s'</button>";
 #ifdef SDCARD_DIR
 const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-"<button method='post' name='upl' type='submit' class='button bgrn'>SD card directory</button>";
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SDCARD_DIR "</button>";
 #else
 const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-"<button method='post' name='upl' type='submit' class='button bgrn'>Upload files</button>";
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SCRIPT_UPLOAD_FILES "</button>";
 #endif
 
 #ifdef SDCARD_DIR
@@ -3286,7 +3281,7 @@ void Script_FileUploadConfiguration(void)
   WSContentStart_P(S_SCRIPT_FILE_UPLOAD);
   WSContentSendStyle();
   WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
-  WSContentSend_P(HTTP_FORM_FILE_UPG, "upload");
+  WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
 #ifdef SDCARD_DIR
   WSContentSend_P(HTTP_FORM_SDC_DIRa);
   if (glob_script_mem.script_sd_found) {

From e089ded193b4cbd389be29046772de504b9e5b43 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 28 Dec 2019 22:32:08 +0100
Subject: [PATCH 031/403] Fix ``White`` added to light status (#7142)

---
 tasmota/CHANGELOG.md      |  1 +
 tasmota/xdrv_04_light.ino | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 0cb300692..df8ebd11a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 - Add Zigbee attribute decoder for Xiaomi Aqara Cube
+- Fix ``White`` added to light status (#7142)
 
 ## Released
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 1310ff471..15e5c6053 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -936,9 +936,11 @@ public:
     switch (mode) {
       case 1:
         changeBriRGB(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }   // try to force CT
         break;
       case 2:
         changeBriCT(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }   // try to force CT
         break;
       default:
         changeBri(bri);
@@ -1421,6 +1423,14 @@ void LightState(uint8_t append)
       bri = changeUIntScale(bri, 0, 255, 0, 100);
 
       ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
+      // Add White level
+      if (LST_RGBW <= Light.subtype) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
+      }
+      // Add CT
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
+      }
       // Add status for each channel
       ResponseAppend_P(PSTR(",\"" D_CMND_CHANNEL "\":[" ));
       for (uint32_t i = 0; i < Light.subtype; i++) {
@@ -1432,9 +1442,6 @@ void LightState(uint8_t append)
       }
       ResponseAppend_P(PSTR("]"));
     }
-    if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
-      ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
-    }
 
     if (append) {
       if (Light.subtype >= LST_RGB) {
@@ -2087,18 +2094,12 @@ void CmndColor(void)
 
 void CmndWhite(void)
 {
-  if ((Light.subtype == LST_RGBW) && (XdrvMailbox.index == 1)) {
+  if (Light.pwm_multi_channels) { return; }
+  if ((Light.subtype >= LST_RGBW) && (XdrvMailbox.index == 1)) {
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      uint32_t whiteBri = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
-      char scolor[LIGHT_COLOR_SIZE];
-      snprintf_P(scolor, sizeof(scolor), PSTR("0,0,0,%d"), whiteBri);
-      light_state.setBri(whiteBri); // save target Bri, will be confirmed below
-      XdrvMailbox.data = scolor;
-      XdrvMailbox.data_len = strlen(scolor);
-    } else {
-      XdrvMailbox.data_len = 0;
+      light_controller.changeDimmer(XdrvMailbox.payload, 2);
+      LightPreparePower(2);
     }
-    CmndSupportColor();
   }
 }
 
@@ -2189,7 +2190,6 @@ void CmndHsbColor(void)
       if (validHSB) {
         light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
         LightPreparePower(1);
-        MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
       }
     } else {
       LightState(0);
@@ -2239,6 +2239,7 @@ void CmndWakeup(void)
 
 void CmndColorTemperature(void)
 {
+  if (Light.pwm_multi_channels) { return; }
   if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) { // ColorTemp
     uint32_t ct = light_state.getCT();
     if (1 == XdrvMailbox.data_len) {

From 990ee2e0bc34d1ed8788a9bf9e2a03b1a601a4be Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 28 Dec 2019 22:44:55 +0100
Subject: [PATCH 032/403] Translate Script

---
 tasmota/language/de-DE.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index eeddc5580..455e22ff6 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -703,16 +703,16 @@
 #define D_SOLAX_ERROR_8   "sonstiger Fehler"
 
 //xdrv_10_scripter.ino
-#define D_CONFIGURE_SCRIPT     "Edit script"
-#define D_SCRIPT               "edit script"
-#define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
-#define D_UPL_DONE             "Done"
-#define D_SCRIPT_CHARS_LEFT    "chars left"
-#define D_SCRIPT_CHARS_NO_MORE "no more chars"
+#define D_CONFIGURE_SCRIPT     "Skript konfigurieren"
+#define D_SCRIPT               "Skript bearbeiten"
+#define D_SDCARD_UPLOAD        "Datei speichern"
+#define D_SDCARD_DIR           "SD Card Verzeichnis"
+#define D_UPL_DONE             "Fertig"
+#define D_SCRIPT_CHARS_LEFT    "Zeichen übrig"
+#define D_SCRIPT_CHARS_NO_MORE "kein Speicher mehr"
 #define D_SCRIPT_DOWNLOAD      "Download"
-#define D_SCRIPT_ENABLE        "script enable"
+#define D_SCRIPT_ENABLE        "Skript aktivieren"
 #define D_SCRIPT_UPLOAD        "Upload"
-#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+#define D_SCRIPT_UPLOAD_FILES  "Upload Dateien"
 
 #endif  // _LANGUAGE_DE_DE_H_

From 1f57af1d12121e2228d2176729a81b4f8ea1b740 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 28 Dec 2019 22:59:20 +0100
Subject: [PATCH 033/403] More White fixes

---
 tasmota/xdrv_04_light.ino | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 15e5c6053..84f0f5771 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1416,15 +1416,17 @@ void LightState(uint8_t append)
 
     if (Light.subtype > LST_SINGLE) {
       ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
-      uint16_t hue;
-      uint8_t  sat, bri;
-      light_state.getHSB(&hue, &sat, &bri);
-      sat = changeUIntScale(sat, 0, 255, 0, 100);
-      bri = changeUIntScale(bri, 0, 255, 0, 100);
+      if (LST_RGB <= Light.subtype) {
+        uint16_t hue;
+        uint8_t  sat, bri;
+        light_state.getHSB(&hue, &sat, &bri);
+        sat = changeUIntScale(sat, 0, 255, 0, 100);
+        bri = changeUIntScale(bri, 0, 255, 0, 100);
 
-      ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
+        ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
+      }
       // Add White level
-      if (LST_RGBW <= Light.subtype) {
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
         ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
       }
       // Add CT
@@ -2095,10 +2097,12 @@ void CmndColor(void)
 void CmndWhite(void)
 {
   if (Light.pwm_multi_channels) { return; }
-  if ((Light.subtype >= LST_RGBW) && (XdrvMailbox.index == 1)) {
+  if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
       light_controller.changeDimmer(XdrvMailbox.payload, 2);
       LightPreparePower(2);
+    } else {
+      ResponseCmndNumber(light_state.getDimmer(2));
     }
   }
 }

From fd5c0871060f2c02be28c29d7d8a144282160202 Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Sat, 28 Dec 2019 19:23:38 -0300
Subject: [PATCH 034/403] Update Spanish Translation

---
 tasmota/language/es-ES.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index cc8cc3166..111ead8dc 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v7.0.0.5
+ * Updated until v8.1.0.1
 \*********************************************************************/
 
 #define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -71,7 +71,7 @@
 #define D_COLDLIGHT "Fría"
 #define D_COMMAND "Comando"
 #define D_CONNECTED "Conectado"
-#define D_CORS_DOMAIN "CORS Domain"
+#define D_CORS_DOMAIN "Sitio WEB para CORS"
 #define D_COUNT "Conteo"
 #define D_COUNTER "Contador"
 #define D_CURRENT "Corriente"          // As in Voltage and Current
@@ -80,7 +80,7 @@
 #define D_DEBUG "Debug"
 #define D_DISABLED "Deshabilitado"
 #define D_DISTANCE "Distancia"
-#define D_DNS_SERVER "DNS Server"
+#define D_DNS_SERVER "Servidor DNS"
 #define D_DONE "Listo"
 #define D_DST_TIME "DST"
 #define D_ECO2 "eCO2"
@@ -113,7 +113,7 @@
 #define D_LIGHT "Luz"
 #define D_LWT "LWT"
 #define D_MODULE "Módulo"
-#define D_MOISTURE "Moisture"
+#define D_MOISTURE "Humedad del Suelo"
 #define D_MQTT "MQTT"
 #define D_MULTI_PRESS "multi-press"
 #define D_NOISE "Ruido"
@@ -512,7 +512,7 @@
 
 // tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
 #define D_SENSOR_NONE          "Ninguno"
-#define D_SENSOR_USER          "User"
+#define D_SENSOR_USER          "Por Usuario"
 #define D_SENSOR_DHT11         "DHT11"
 #define D_SENSOR_AM2301        "AM2301"
 #define D_SENSOR_SI7021        "SI7021"
@@ -703,16 +703,16 @@
 #define D_SOLAX_ERROR_8   "Falla del Dispositivo"
 
 //xdrv_10_scripter.ino
-#define D_CONFIGURE_SCRIPT     "Edit script"
-#define D_SCRIPT               "edit script"
-#define D_SDCARD_UPLOAD        "file upload"
-#define D_SDCARD_DIR           "sd card directory"
-#define D_UPL_DONE             "Done"
-#define D_SCRIPT_CHARS_LEFT    "chars left"
-#define D_SCRIPT_CHARS_NO_MORE "no more chars"
-#define D_SCRIPT_DOWNLOAD      "Download"
-#define D_SCRIPT_ENABLE        "script enable"
-#define D_SCRIPT_UPLOAD        "Upload"
-#define D_SCRIPT_UPLOAD_FILES  "Upload files"
+#define D_CONFIGURE_SCRIPT     "Editar Script"
+#define D_SCRIPT               "Editar Script"
+#define D_SDCARD_UPLOAD        "Subir Archivo"
+#define D_SDCARD_DIR           "Directorio en Tarjeta SD"
+#define D_UPL_DONE             "Listo"
+#define D_SCRIPT_CHARS_LEFT    "Caracteres disponibles"
+#define D_SCRIPT_CHARS_NO_MORE "No hay mas espacio"
+#define D_SCRIPT_DOWNLOAD      "Descargar"
+#define D_SCRIPT_ENABLE        "Habilitar Script"
+#define D_SCRIPT_UPLOAD        "Cargar"
+#define D_SCRIPT_UPLOAD_FILES  "Cargar Archivos"
 
 #endif  // _LANGUAGE_ES_ES_H_

From 9974d297265ca4f1db444139561e3796dae4a361 Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Sun, 29 Dec 2019 13:04:34 +0700
Subject: [PATCH 035/403] Update xdrv_27_shutter.ino

Minor fix in recognizing stepper
---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 4b3936533..e41acc4dd 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -188,7 +188,7 @@ void ShutterInit(void)
         }
       } else {
         Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
-        if (pin[GPIO_PWM1+i] < 99 && pin[GPIO_CNTR1+i]) {
+        if (pin[GPIO_PWM1+i] < 99 && pin[GPIO_CNTR1+i] < 99) {
           Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
           Shutter.pwm_frequency = 0;
           analogWriteFreq(Shutter.pwm_frequency);

From ddbca8e3930296d904d8afb9dd67826fd89b75b9 Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Sun, 29 Dec 2019 16:19:26 +0700
Subject: [PATCH 036/403] Update xdrv_27_shutter.ino

Fix infinite loop for shutter
---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index e41acc4dd..21970d0fe 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -394,7 +394,7 @@ void ShutterWaitForMotorStop(uint8_t i)
 {
   AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
   if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-    if ( Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+    if ( Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
       //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Frequency change %d"), Shutter.pwm_frequency);
       while (Shutter.pwm_frequency > 0) {
         Shutter.accelerator[i] = 0;

From df944ed0583a6052970bee086403c65c42b7cca2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 29 Dec 2019 13:27:48 +0100
Subject: [PATCH 037/403] Fix Serial initialization regression

Fix Serial initialization regression from previous fix
---
 RELEASENOTES.md                 |  1 +
 tasmota/CHANGELOG.md            |  3 ++-
 tasmota/support.ino             | 31 ++++++++++++++++++-------------
 tasmota/support_command.ino     |  4 ++--
 tasmota/support_tasmota.ino     |  8 ++++----
 tasmota/tasmota.ino             |  6 +-----
 tasmota/xdrv_06_snfbridge.ino   |  2 +-
 tasmota/xdrv_22_sonoff_ifan.ino |  2 +-
 tasmota/xlgt_05_sonoff_l1.ino   |  2 +-
 tasmota/xnrg_02_cse7766.ino     |  2 +-
 10 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c0524023e..a1324e1f1 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -57,6 +57,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Fix ``White`` added to light status (#7142)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index df8ebd11a..172afb56a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,13 +4,14 @@
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
+- Fix Serial initialization regression from previous fix
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
+- Fix ``White`` added to light status (#7142)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 - Add Zigbee attribute decoder for Xiaomi Aqara Cube
-- Fix ``White`` added to light status (#7142)
 
 ## Released
 
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 8010f1e5c..8e4d4a5d9 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -793,34 +793,40 @@ String GetSerialConfig(void)
   return String(config);
 }
 
-void SetSerialBegin(uint32_t baudrate)
+void SetSerialBegin()
 {
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Set Serial to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
+  uint32_t baudrate = Settings.baudrate * 300;
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
   Serial.flush();
   Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
 }
 
 void SetSerialConfig(uint32_t serial_config)
 {
-  if (serial_config == Settings.serial_config) { return; }
-  if (serial_config > TS_SERIAL_8O2) { return; }
-
-  Settings.serial_config = serial_config;
-  SetSerialBegin(Serial.baudRate());
+  if (serial_config > TS_SERIAL_8O2) {
+    serial_config = TS_SERIAL_8N1;
+  }
+  if (serial_config != Settings.serial_config) {
+    Settings.serial_config = serial_config;
+    SetSerialBegin();
+  }
 }
 
-void SetSerialBaudrate(int baudrate)
+void SetSerialBaudrate(uint32_t baudrate)
 {
   Settings.baudrate = baudrate / 300;
-  SetSerialBegin(baudrate);
+  if (Serial.baudRate() != baudrate) {
+    SetSerialBegin();
+  }
 }
 
-void PrepSerial(int prep_baudrate, uint32_t serial_config)
+void SetSerial(uint32_t baudrate, uint32_t serial_config)
 {
   Settings.flag.mqtt_serial = 0;  // CMND_SERIALSEND and CMND_SERIALLOG
   Settings.serial_config = serial_config;
-  baudrate = prep_baudrate;
+  Settings.baudrate = baudrate / 300;
   SetSeriallog(LOG_LEVEL_NONE);
+  SetSerialBegin();
 }
 
 void ClaimSerial(void)
@@ -828,8 +834,7 @@ void ClaimSerial(void)
   serial_local = true;
   AddLog_P(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial"));
   SetSeriallog(LOG_LEVEL_NONE);
-  baudrate = Serial.baudRate();
-  Settings.baudrate = baudrate / 300;
+  Settings.baudrate = Serial.baudRate() / 300;
 }
 
 void SerialSendRaw(char *codes)
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 0762fa329..6022db994 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -369,7 +369,7 @@ void CmndStatus(void)
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
                           D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
                           D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
-                          baudrate, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
+                          Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
                           GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
                           Settings.cfg_holder, Settings.bootcount, Settings.save_flag, GetSettingsAddress());
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
@@ -1091,7 +1091,7 @@ void CmndBaudrate(void)
 {
   if (XdrvMailbox.payload >= 300) {
     XdrvMailbox.payload /= 300;  // Make it a valid baudrate
-    baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
+    uint32_t baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
     SetSerialBaudrate(baudrate);
   }
   ResponseCmndNumber(Settings.baudrate * 300);
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 153d8a1fd..8f520940c 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1169,7 +1169,7 @@ void GpioInit(void)
   SetModuleType();
 
   if (Settings.module != Settings.last_module) {
-    baudrate = APP_BAUDRATE;
+    Settings.baudrate = APP_BAUDRATE / 300;
   }
 
   for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
@@ -1297,15 +1297,15 @@ void GpioInit(void)
   }
   else if (SONOFF_DUAL == my_module_type) {
     devices_present = 2;
-    PrepSerial(19200, TS_SERIAL_8N1);
+    SetSerial(19200, TS_SERIAL_8N1);
   }
   else if (CH4 == my_module_type) {
     devices_present = 4;
-    PrepSerial(19200, TS_SERIAL_8N1);
+    SetSerial(19200, TS_SERIAL_8N1);
   }
 #ifdef USE_SONOFF_SC
   else if (SONOFF_SC == my_module_type) {
-    PrepSerial(19200, TS_SERIAL_8N1);
+    SetSerial(19200, TS_SERIAL_8N1);
   }
 #endif  // USE_SONOFF_SC
 
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index e2866347e..5e6947699 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -96,7 +96,6 @@ power_t blink_mask = 0;                     // Blink relay active mask
 power_t blink_powersave;                    // Blink start power save state
 power_t latching_power = 0;                 // Power state at latching start
 power_t rel_inverted = 0;                   // Relay inverted flag (1 = (0 = On, 1 = Off))
-int baudrate = APP_BAUDRATE;                // Serial interface baud rate
 int serial_in_byte_counter = 0;             // Index in receive buffer
 int ota_state_flag = 0;                     // OTA state flag
 int ota_result = 0;                         // OTA result
@@ -193,7 +192,7 @@ void setup(void)
   RtcReboot.fast_reboot_count++;
   RtcRebootSave();
 
-  Serial.begin(baudrate);
+  Serial.begin(APP_BAUDRATE);
   seriallog_level = LOG_LEVEL_INFO;  // Allow specific serial messages until config loaded
 
   snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);  // Release version 6.3.0
@@ -215,7 +214,6 @@ void setup(void)
     XdrvCall(FUNC_SETTINGS_OVERRIDE);
   }
 
-  baudrate = Settings.baudrate * 300;
 //  mdns_delayed_start = Settings.param[P_MDNS_DELAYED_START];
   seriallog_level = Settings.seriallog_level;
   seriallog_timer = SERIALLOG_TIMER;
@@ -274,8 +272,6 @@ void setup(void)
   GetEspHardwareType();
   GpioInit();
 
-  SetSerialBaudrate(baudrate);
-
   WifiConnect();
 
   if (MOTOR == my_module_type) { Settings.poweronstate = POWER_ALL_ON; }  // Needs always on else in limbo!
diff --git a/tasmota/xdrv_06_snfbridge.ino b/tasmota/xdrv_06_snfbridge.ino
index 56ba3dabc..a5385a4b6 100644
--- a/tasmota/xdrv_06_snfbridge.ino
+++ b/tasmota/xdrv_06_snfbridge.ino
@@ -578,7 +578,7 @@ bool Xdrv06(uint8_t function)
         SonoffBridgeSendCommand(0xA7);  // Stop reading RF signals enabling iTead default RF handling
         break;
       case FUNC_PRE_INIT:
-        PrepSerial(19200, TS_SERIAL_8N1);
+        SetSerial(19200, TS_SERIAL_8N1);
         break;
     }
   }
diff --git a/tasmota/xdrv_22_sonoff_ifan.ino b/tasmota/xdrv_22_sonoff_ifan.ino
index 125800367..b7761befe 100644
--- a/tasmota/xdrv_22_sonoff_ifan.ino
+++ b/tasmota/xdrv_22_sonoff_ifan.ino
@@ -217,7 +217,7 @@ void CmndFanspeed(void)
 bool SonoffIfanInit(void)
 {
   if (SONOFF_IFAN03 == my_module_type) {
-    PrepSerial(9600, TS_SERIAL_8N1);
+    SetSerial(9600, TS_SERIAL_8N1);
   }
   return false;  // Continue init chain
 }
diff --git a/tasmota/xlgt_05_sonoff_l1.ino b/tasmota/xlgt_05_sonoff_l1.ino
index 11059f6ff..e6befa564 100644
--- a/tasmota/xlgt_05_sonoff_l1.ino
+++ b/tasmota/xlgt_05_sonoff_l1.ino
@@ -222,7 +222,7 @@ void SnfL1ModuleSelected(void)
 {
   if (SONOFF_L1 == my_module_type) {
     if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
-      PrepSerial(19200, TS_SERIAL_8N1);
+      SetSerial(19200, TS_SERIAL_8N1);
 
       light_type = LT_RGB;
       light_flg = XLGT_05;
diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index a10f6cc9d..b148c5461 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -210,7 +210,7 @@ void CseEverySecond(void)
 void CseDrvInit(void)
 {
   if ((3 == pin[GPIO_CSE7766_RX]) && (1 == pin[GPIO_CSE7766_TX])) {  // As it uses 8E1 currently only hardware serial is supported
-    PrepSerial(4800, TS_SERIAL_8E1);
+    SetSerial(4800, TS_SERIAL_8E1);
     if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
       Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;  // SetOption39 1..255
     }

From 858103e08228dfdd706799c6a4062e26a3cb7e59 Mon Sep 17 00:00:00 2001
From: gemu2015 <gmutz2010@googlemail.com>
Date: Sun, 29 Dec 2019 16:49:36 +0100
Subject: [PATCH 038/403] support for hm17 (v110) and hm10 (V609)

---
 tasmota/xsns_52_ibeacon.ino | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/tasmota/xsns_52_ibeacon.ino b/tasmota/xsns_52_ibeacon.ino
index f61bdf97d..92444bfbb 100644
--- a/tasmota/xsns_52_ibeacon.ino
+++ b/tasmota/xsns_52_ibeacon.ino
@@ -27,7 +27,11 @@
 
 #define HM17_BAUDRATE 9600
 
-//#define IBEACON_DEBUG
+#define IBEACON_DEBUG
+
+// use this for Version 110
+#define HM17_V110
+
 
 // keyfob expires after N seconds
 #define IB_TIMEOUT_INTERVAL 30
@@ -322,6 +326,14 @@ void hm17_decode(void) {
         hm17_result=1;
 #ifdef IBEACON_DEBUG
         if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCS OK"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISIS",8)) {
+        hm17_sbclr();
+        hm17_result=1;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISIS OK"));
 #endif
         break;
       }
@@ -348,19 +360,26 @@ void hm17_decode(void) {
         break;
       }
       if (!strncmp(hm17_sbuffer,"OK+DIS0:",8)) {
-        if (hm17_sindex==20) {
-          hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) {
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
-            AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-          }
+        if (hm17_cmd==HM17_DISI) {
+#ifdef HM17_V110
+          goto hm17_v110;
 #endif
-          hm17_sbclr();
+        } else {
+          if (hm17_sindex==20) {
+            hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+            if (hm17_debug) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+            }
+#endif
+            hm17_sbclr();
+          }
         }
         break;
       }
       if (!strncmp(hm17_sbuffer,"OK+DISC:",8)) {
+hm17_v110:
         if (hm17_cmd==HM17_DISI) {
           if (hm17_sindex==78) {
 #ifdef IBEACON_DEBUG

From b7d2045c210a8ac2bf1432e98417324bc5be76a9 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 29 Dec 2019 17:26:45 +0100
Subject: [PATCH 039/403] Wrong spelling Particles

---
 tasmota/language/en-GB.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 72d30faac..eca509e0f 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -477,7 +477,7 @@
 // xsns_18_pms5003.ino
 #define D_STANDARD_CONCENTRATION "CF-1 PM"     // Standard Particle CF-1 Particle Matter
 #define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
-#define D_PARTICALS_BEYOND "Particals"
+#define D_PARTICALS_BEYOND "Particles"
 
 // xsns_32_mpu6050.ino
 #define D_AX_AXIS "Accel. X-Axis"

From 6c189b40bf47b915720d576229bc5359a72131d5 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 29 Dec 2019 19:41:31 +0100
Subject: [PATCH 040/403] add error checking for init

---
 tasmota/xsns_60_GPS.ino | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_60_GPS.ino b/tasmota/xsns_60_GPS.ino
index 519caac20..b0301a193 100644
--- a/tasmota/xsns_60_GPS.ino
+++ b/tasmota/xsns_60_GPS.ino
@@ -246,6 +246,7 @@ struct UBX_t {
   } state;
 
   struct {
+    uint32_t init:1;
     uint32_t filter_noise:1;
     uint32_t send_when_new:1; // no teleinterval
     uint32_t send_UI_only:1;
@@ -321,6 +322,7 @@ void UBXTriggerTele(void)
 
 void UBXDetect(void)
 {
+  UBX.mode.init = 0;
   if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
     UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, 96); // 64 byte buffer is NOT enough
     if (UBXSerial->begin(9600)) {
@@ -331,8 +333,13 @@ void UBXDetect(void)
       }
     }
   }
+  else {
+    return;
+  }
+
+  UBXinitCFG();                 // turn off NMEA, only use "our" UBX-messages
+  UBX.mode.init = 1;
 
-  UBXinitCFG();                 // turn of NMEA, only use "our" UBX-messages
 #ifdef USE_FLOG
   if (!Flog) {
     Flog = new FLOG;            // init Flash Log
@@ -813,11 +820,12 @@ bool Xsns60(uint8_t function)
 {
   bool result = false;
 
-  if (true) {
+  if (FUNC_INIT == function) {
+    UBXDetect();
+  }
+
+  if (UBX.mode.init) {
     switch (function) {
-      case FUNC_INIT:
-        UBXDetect();
-        break;
       case FUNC_COMMAND_SENSOR:
         if (XSNS_60 == XdrvMailbox.index) {
           result = UBXCmd();

From ed5330169abd3efcf68df84d3c4d15d437412120 Mon Sep 17 00:00:00 2001
From: Leonid Muravjev <asm@asm.pp.ru>
Date: Sat, 28 Dec 2019 23:12:46 +0300
Subject: [PATCH 041/403] HotPlug for sensors support added

---
 BUILDS.md                    |   1 +
 tasmota/settings.h           |   3 +-
 tasmota/support_features.ino |   4 +-
 tasmota/tasmota.h            |   2 +-
 tasmota/tasmota_post.h       |   5 ++
 tasmota/xdrv_32_hotplug.ino  | 100 +++++++++++++++++++++++++++++++++++
 tasmota/xsns_59_ds1624.ino   |   2 -
 7 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 tasmota/xdrv_32_hotplug.ino

diff --git a/BUILDS.md b/BUILDS.md
index 4318635ec..5cac6108f 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -26,6 +26,7 @@
 | USE_SCRIPT            | - | - | - | - | - | - | - |
 | USE_EXPRESSION        | - | - | - | - | - | - | - |
 | SUPPORT_IF_STATEMENT  | - | - | - | - | - | - | - |
+| USE_HOTPLUG           | - | - | - | - | x | - | - |
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | ROTARY_V1             | - | - | - | - | - | - | - |
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 0c47e5aca..56a44a3ff 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -464,8 +464,9 @@ struct SYSCFG {
   uint8_t       shutter_accuracy;          // F00
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
+  uint8_t       hotplug_scan;              // F03 -- scan for hotplug every 'hoplugscan' time
 
-  uint8_t       free_f03[233];             // F03
+  uint8_t       free_f04[232];             // F04
 
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
   uint32_t      cfg_timestamp;             // FF8
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 696e5ee5d..07fe0d8f8 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -498,7 +498,9 @@ void GetFeatures(void)
 #ifdef USE_GPS
   feature5 |= 0x00400000;
 #endif
-//  feature5 |= 0x00800000;
+#ifdef USE_HOTPLUG
+  feature5 |= 0x00800000;
+#endif
 
 //  feature5 |= 0x01000000;
 //  feature5 |= 0x02000000;
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index c0231d3c9..1f57a185f 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -271,7 +271,7 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_SET_POWER, FUNC_SET_DEVICE_POWER, FUNC_SHOW_SENSOR, FUNC_ANY_KEY,
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
                     FUNC_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED,
-                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME};
+                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN};
 
 enum AddressConfigSteps { ADDR_IDLE, ADDR_RECEIVE, ADDR_SEND };
 
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 5571da265..2440afbbb 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -99,6 +99,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+6k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
 #define USE_EXS_DIMMER                         // Add support for EX-Store WiFi Dimmer
+#define USE_HOTPLUG                               // Add support for HotPlug
 
 // -- Optional light modules ----------------------
 #define USE_LIGHT                                // Add Dimmer/Light support
@@ -268,6 +269,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_SHUTTER                               // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
+#undef USE_HOTPLUG                               // Disable support for HotPlug
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors (-14k code)
   #undef USE_PZEM004T                            // Disable PZEM004T energy sensor
@@ -340,6 +342,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_SHUTTER                               // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
+#undef USE_HOTPLUG                               // Disable support for HotPlug
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
@@ -439,6 +442,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_SHUTTER                               // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
+#undef USE_HOTPLUG                               // Disable support for HotPlug
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
@@ -547,6 +551,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_SHUTTER                               // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
+#undef USE_HOTPLUG                               // Disable support for HotPlug
 
 // -- Optional light modules ----------------------
 #undef USE_LIGHT                                 // Disable support for lights
diff --git a/tasmota/xdrv_32_hotplug.ino b/tasmota/xdrv_32_hotplug.ino
new file mode 100644
index 000000000..a2a52a90f
--- /dev/null
+++ b/tasmota/xdrv_32_hotplug.ino
@@ -0,0 +1,100 @@
+/*
+  xdrv_32_hotplug.ino - HotPlug support for sensors
+
+  Copyright (C) 2019  Leonid Myravjev
+
+  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/>.
+*/
+
+#ifdef USE_HOTPLUG
+/*********************************************************************************************\
+ * HotPlug Support
+ *
+ * - Rescan bus every N seconds. It send FUNC_HOTPLUG_SCAN event to every sensors.
+ * - If HotPlug is 0 or 0xFF -- HotPlug is off
+ *
+ * See wiki https://github.com/arendst/Tasmota/wiki/HotPlug FIXME
+\*********************************************************************************************/
+
+#define XDRV_32                32
+
+#define D_PRFX_HOTPLUG "HotPlug"
+
+const uint32_t HOTPLUG_MAX = 254; // 0 and 0xFF is OFF
+
+const char kHotPlugCommands[] PROGMEM = "|" D_PRFX_HOTPLUG;
+void (* const HotPlugCommand[])(void) PROGMEM = { &CmndHotPlugTime };
+
+uint32_t hotplug_sleeptime = 0;
+bool     hotplug_enabled = false;
+uint8_t  hotplug_timeout = 0;
+
+void HotPlugInit(void)
+{
+  // If empty eeprom is 0xFF by default
+  if (Settings.hotplug_scan == 0xFF) Settings.hotplug_scan = 0;
+  if (Settings.hotplug_scan != 0) {
+    hotplug_enabled = true;
+    hotplug_timeout = 1; // first scan in a second
+  } else
+    hotplug_enabled = false;
+}
+
+void HotPlugEverySecond(void)
+{
+  if (hotplug_enabled) {
+    if (hotplug_timeout == 0) {
+      XsnsCall(FUNC_HOTPLUG_SCAN);
+      hotplug_timeout = Settings.hotplug_scan;
+    }
+    hotplug_timeout--;
+  }
+}
+
+/*********************************************************************************************\
+* Commands
+\*********************************************************************************************/
+
+void CmndHotPlugTime(void)
+{
+  if (XdrvMailbox.payload <= HOTPLUG_MAX) {
+    Settings.hotplug_scan = XdrvMailbox.payload;
+    HotPlugInit();
+  }
+  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.hotplug_scan);
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv32(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_SECOND:
+      HotPlugEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kHotPlugCommands, HotPlugCommand);
+      break;
+    case FUNC_PRE_INIT:
+      HotPlugInit();
+      break;
+  }
+  return result;
+}
+     
+#endif //USE_HOTPLUG
diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
index 06b21d39e..6f3ce5b69 100644
--- a/tasmota/xsns_59_ds1624.ino
+++ b/tasmota/xsns_59_ds1624.ino
@@ -170,8 +170,6 @@ void DS1624Show(bool json)
  * Interface
 \*********************************************************************************************/
 
-#define FUNC_HOTPLUG_SCAN 255 // FIXME remove it after HOTPLUG supported
-
 bool Xsns59(uint8_t function)
 {
   if (!I2cEnabled(XI2C_42)) { return false; }

From 2d99eca6e860fdc642193948d77ed3990c0742db Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:03:14 +0100
Subject: [PATCH 042/403] =?UTF-8?q?u=20in=20=C2=B5=20and=20m3=20in=20m?=
 =?UTF-8?q?=C2=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tasmota/language/en-GB.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index eca509e0f..4062a1b84 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -647,9 +647,9 @@
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"

From 1526a59162f0097bcd4440a0f6aa35b22f7706e3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 30 Dec 2019 14:23:37 +0100
Subject: [PATCH 043/403] Refactor HotPlug

---
 tasmota/i18n.h              |  3 +++
 tasmota/my_user_config.h    |  1 +
 tasmota/support_tasmota.ino |  1 +
 tasmota/tasmota.ino         |  2 ++
 tasmota/tasmota_post.h      |  4 ++--
 tasmota/xdrv_32_hotplug.ino | 41 +++++++++++++++++++------------------
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index e726fdf5d..9e33de8bb 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -511,6 +511,9 @@
 #define D_CMND_SHUTTER_MOTORDELAY "MotorDelay"
 #define D_CMND_SHUTTER_FREQUENCY "Frequency"
 
+// Commands xdrv_32_hotplug.ino
+#define D_CMND_HOTPLUG "HotPlug"
+
 // Commands xsns_02_analog.ino
 #define D_CMND_ADCPARAM "AdcParam"
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 538301695..5239f152c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -349,6 +349,7 @@
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
+//#define USE_HOTPLUG                              // Add support for sensor HotPlug
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 8f520940c..28edd25c3 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1170,6 +1170,7 @@ void GpioInit(void)
 
   if (Settings.module != Settings.last_module) {
     Settings.baudrate = APP_BAUDRATE / 300;
+    Settings.serial_config = TS_SERIAL_8N1;
   }
 
   for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 5e6947699..9b2ce358e 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -272,6 +272,8 @@ void setup(void)
   GetEspHardwareType();
   GpioInit();
 
+//  SetSerialBaudrate(Settings.baudrate * 300);  // Allow reset of serial interface if current baudrate is different from requested baudrate
+
   WifiConnect();
 
   if (MOTOR == my_module_type) { Settings.poweronstate = POWER_ALL_ON; }  // Needs always on else in limbo!
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 2440afbbb..8c7c65198 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -98,8 +98,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_ARILUX_RF                            // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0))
 //#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+6k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
-#define USE_EXS_DIMMER                         // Add support for EX-Store WiFi Dimmer
-#define USE_HOTPLUG                               // Add support for HotPlug
+#define USE_EXS_DIMMER                           // Add support for EX-Store WiFi Dimmer
+#define USE_HOTPLUG                              // Add support for sensor HotPlug
 
 // -- Optional light modules ----------------------
 #define USE_LIGHT                                // Add Dimmer/Light support
diff --git a/tasmota/xdrv_32_hotplug.ino b/tasmota/xdrv_32_hotplug.ino
index a2a52a90f..7c368b45f 100644
--- a/tasmota/xdrv_32_hotplug.ino
+++ b/tasmota/xdrv_32_hotplug.ino
@@ -23,42 +23,43 @@
  *
  * - Rescan bus every N seconds. It send FUNC_HOTPLUG_SCAN event to every sensors.
  * - If HotPlug is 0 or 0xFF -- HotPlug is off
- *
- * See wiki https://github.com/arendst/Tasmota/wiki/HotPlug FIXME
 \*********************************************************************************************/
 
-#define XDRV_32                32
+#define XDRV_32              32
 
-#define D_PRFX_HOTPLUG "HotPlug"
+const uint32_t HOTPLUG_MAX = 254;  // 0 and 0xFF is OFF
 
-const uint32_t HOTPLUG_MAX = 254; // 0 and 0xFF is OFF
+const char kHotPlugCommands[] PROGMEM = "|"  // No prefix
+  D_CMND_HOTPLUG;
 
-const char kHotPlugCommands[] PROGMEM = "|" D_PRFX_HOTPLUG;
-void (* const HotPlugCommand[])(void) PROGMEM = { &CmndHotPlugTime };
+void (* const HotPlugCommand[])(void) PROGMEM = {
+  &CmndHotPlugTime };
 
-uint32_t hotplug_sleeptime = 0;
-bool     hotplug_enabled = false;
-uint8_t  hotplug_timeout = 0;
+struct {
+//  uint32_t sleeptime = 0;
+  bool     enabled = false;
+  uint8_t  timeout = 0;
+} Hotplug;
 
 void HotPlugInit(void)
 {
   // If empty eeprom is 0xFF by default
-  if (Settings.hotplug_scan == 0xFF) Settings.hotplug_scan = 0;
+  if (Settings.hotplug_scan == 0xFF) { Settings.hotplug_scan = 0; }
   if (Settings.hotplug_scan != 0) {
-    hotplug_enabled = true;
-    hotplug_timeout = 1; // first scan in a second
+    Hotplug.enabled = true;
+    Hotplug.timeout = 1;  // First scan in a second
   } else
-    hotplug_enabled = false;
+    Hotplug.enabled = false;
 }
 
 void HotPlugEverySecond(void)
 {
-  if (hotplug_enabled) {
-    if (hotplug_timeout == 0) {
+  if (Hotplug.enabled) {
+    if (Hotplug.timeout == 0) {
       XsnsCall(FUNC_HOTPLUG_SCAN);
-      hotplug_timeout = Settings.hotplug_scan;
+      Hotplug.timeout = Settings.hotplug_scan;
     }
-    hotplug_timeout--;
+    Hotplug.timeout--;
   }
 }
 
@@ -72,7 +73,7 @@ void CmndHotPlugTime(void)
     Settings.hotplug_scan = XdrvMailbox.payload;
     HotPlugInit();
   }
-  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.hotplug_scan);
+  ResponseCmndNumber(Settings.hotplug_scan);
 }
 
 /*********************************************************************************************\
@@ -96,5 +97,5 @@ bool Xdrv32(uint8_t function)
   }
   return result;
 }
-     
+
 #endif //USE_HOTPLUG

From be29e71c96ce010706e508ff8590ef968bcff0ba Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 30 Dec 2019 14:24:00 +0100
Subject: [PATCH 044/403] Update decode-status.py

---
 tools/decode-status.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/decode-status.py b/tools/decode-status.py
index 81c5c0fc1..e807b60fb 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -132,7 +132,7 @@ a_setoption = [[
     "Enable incrementing bootcount when deepsleep is enabled",
     "Do not power off if slider moved to far left",
     "Bypass Compatibility check",
-    "",
+    "Enable resetting of counters after telemetry was sent",
     "Enable shutter support",
     "Invert PCF8574 ports"
     ],[
@@ -188,7 +188,7 @@ a_features = [[
     "USE_SHUTTER","USE_PCF8574","USE_DDSU666","USE_DEEPSLEEP",
     "USE_SONOFF_SC","USE_SONOFF_RF","USE_SONOFF_L1","USE_EXS_DIMMER",
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
-    "USE_DHT12","USE_DS1624","USE_GPS","",
+    "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
     "","","","",
     "","","",""
     ]]

From 5d10b92c546ed8be7d566cba64e9569dab8a4421 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Mon, 30 Dec 2019 16:20:21 +0100
Subject: [PATCH 045/403] change height to altitude

---
 tasmota/xsns_60_GPS.ino | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tasmota/xsns_60_GPS.ino b/tasmota/xsns_60_GPS.ino
index b0301a193..376021ef0 100644
--- a/tasmota/xsns_60_GPS.ino
+++ b/tasmota/xsns_60_GPS.ino
@@ -183,7 +183,7 @@ struct UBX_t {
     uint32_t iTOW;
     int32_t lon;
     int32_t lat;
-    int32_t height;
+    int32_t alt;
     int32_t hMSL;
     uint32_t hAcc;
     uint32_t vAcc;
@@ -237,7 +237,7 @@ struct UBX_t {
     uint32_t last_iTOW;
     int32_t last_lat;
     int32_t last_lon;
-    int32_t last_height;
+    int32_t last_alt;
     uint32_t last_hAcc;
     uint32_t last_vAcc;
     uint8_t gpsFix;
@@ -603,7 +603,7 @@ bool UBXHandlePOSLLH()
     DEBUG_SENSOR_LOG(PSTR("UBX: lat/lon: %i / %i"), UBX.rec_buffer.values.lat, UBX.rec_buffer.values.lon);
     DEBUG_SENSOR_LOG(PSTR("UBX: hAcc: %d"), UBX.Message.navPosllh.hAcc);
     UBX.state.last_iTOW = UBX.Message.navPosllh.iTOW;
-    UBX.state.last_height = UBX.Message.navPosllh.height;
+    UBX.state.last_alt = UBX.Message.navPosllh.alt;
     UBX.state.last_vAcc = UBX.Message.navPosllh.vAcc;
     UBX.state.last_hAcc = UBX.Message.navPosllh.hAcc;
     if (UBX.mode.send_when_new) {
@@ -726,7 +726,7 @@ void UBXLoop(void)
 
   const char HTTP_SNS_GPS[] PROGMEM = "{s} GPS latitude {m}%s{e}"
                                       "{s} GPS longitude {m}%s{e}"
-                                      "{s} GPS height {m}%s   m{e}"
+                                      "{s} GPS altitude {m}%s   m{e}"
                                       "{s} GPS hor. Accuracy {m}%s   m{e}"
                                       "{s} GPS vert. Accuracy {m}%s   m{e}"
                                       "{s} GPS sat-fix status {m}%s{e}";
@@ -750,12 +750,12 @@ void UBXShow(bool json)
 {
   char lat[12];
   char lon[12];
-  char height[12];
+  char alt[12];
   char hAcc[12];
   char vAcc[12];
   dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
   dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
-  dtostrfd((double)UBX.state.last_height/1000.0f,3,height);
+  dtostrfd((double)UBX.state.last_alt/1000.0f,3,alt);
   dtostrfd((double)UBX.state.last_vAcc/1000.0f,3,hAcc);
   dtostrfd((double)UBX.state.last_hAcc/1000.0f,3,vAcc);
 
@@ -765,7 +765,7 @@ void UBXShow(bool json)
       uint32_t i = UBX.state.log_interval / 10;
       ResponseAppend_P(PSTR("\"fil\":%u,\"int\":%u}"), UBX.mode.filter_noise, i);
     } else {
-      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"height\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, height, hAcc, vAcc);
+      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"alt\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, alt, hAcc, vAcc);
     }
 #ifdef USE_FLOG
     ResponseAppend_P(PSTR(",\"FLOG\":{\"rec\":%u,\"mode\":%u,\"sec\":%u}"), Flog->recording, Flog->mode, Flog->sectors_left);
@@ -773,7 +773,7 @@ void UBXShow(bool json)
     UBX.mode.send_UI_only = false;
 #ifdef USE_WEBSERVER
   } else {
-      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, height, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
+      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, alt, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
       //WSContentSend_P(UBX_GOOGLE_MAPS, lat, lon);
 #ifdef DEBUG_TASMOTA_SENSOR
 #ifdef USE_FLOG

From a6cecfcb792f236bdbf7ef30e30674b1d42eb807 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 30 Dec 2019 16:42:53 +0100
Subject: [PATCH 046/403] Add support for ADC0 Current Transformer

- Bump version to 8.1.0.2
- Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
---
 RELEASENOTES.md            |   3 +-
 tasmota/CHANGELOG.md       |   4 +
 tasmota/i18n.h             |  28 +++---
 tasmota/language/bg-BG.h   |   1 +
 tasmota/language/cs-CZ.h   |   1 +
 tasmota/language/de-DE.h   |   1 +
 tasmota/language/el-GR.h   |   1 +
 tasmota/language/en-GB.h   |   1 +
 tasmota/language/es-ES.h   |   1 +
 tasmota/language/fr-FR.h   |   1 +
 tasmota/language/he-HE.h   |   1 +
 tasmota/language/hu-HU.h   |   1 +
 tasmota/language/it-IT.h   |   1 +
 tasmota/language/ko-KO.h   |   1 +
 tasmota/language/nl-NL.h   |   1 +
 tasmota/language/pl-PL.h   |   1 +
 tasmota/language/pt-BR.h   |   1 +
 tasmota/language/pt-PT.h   |   1 +
 tasmota/language/ru-RU.h   |   1 +
 tasmota/language/sk-SK.h   |   1 +
 tasmota/language/sv-SE.h   |   1 +
 tasmota/language/tr-TR.h   |   1 +
 tasmota/language/uk-UA.h   |   1 +
 tasmota/language/zh-CN.h   |   1 +
 tasmota/language/zh-TW.h   |   1 +
 tasmota/tasmota_template.h |   2 +
 tasmota/tasmota_version.h  |   2 +-
 tasmota/xdrv_03_energy.ino |   9 +-
 tasmota/xsns_02_analog.ino | 176 +++++++++++++++++++++++++++++--------
 29 files changed, 190 insertions(+), 56 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a1324e1f1..30f05d21e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.1
+### Version 8.1.0.2
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
@@ -63,3 +63,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 - Add Zigbee attribute decoder for Xiaomi Aqara Cube
+- Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 172afb56a..99aca3e2c 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.2 20191230
+
+- Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
+
 ### 8.1.0.1 20191225
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 9e33de8bb..bb8174e50 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -59,6 +59,7 @@
 #define D_JSON_ECO2 "eCO2"
 #define D_JSON_EMPTY "Empty"
 #define D_JSON_ENDDST "EndDST"           // End Daylight Savings Time
+#define D_JSON_ENERGY "Energy"
 #define D_JSON_ERASE "Erase"
 #define D_JSON_ERROR "Error"
 #define D_JSON_EVERY "Every"
@@ -613,18 +614,23 @@ static const char kMonthNames[] = D_MONTH3LIST;
 
 // xdrv_02_webserver.ino
 #ifdef USE_WEBSERVER
-const char HTTP_SNS_TEMP[] PROGMEM = "{s}%s " D_TEMPERATURE "{m}%s&deg;%c{e}";                    // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_HUM[] PROGMEM = "{s}%s " D_HUMIDITY "{m}%s%%{e}";                             // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_PRESSURE[] PROGMEM = "{s}%s " D_PRESSURE "{m}%s %s{e}";                       // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "{s}%s " D_PRESSUREATSEALEVEL "{m}%s %s{e}";          // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_ANALOG[] PROGMEM = "{s}%s " D_ANALOG_INPUT "%d{m}%d{e}";                      // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_ILLUMINANCE[] PROGMEM = "{s}%s " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}";     // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_CO2[] PROGMEM = "{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";       // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";  // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS " {e}";    // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN" {e}";   // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
-const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d %%{e}";                        // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
+// {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
+const char HTTP_SNS_TEMP[] PROGMEM = "{s}%s " D_TEMPERATURE "{m}%s&deg;%c{e}";
+const char HTTP_SNS_HUM[] PROGMEM = "{s}%s " D_HUMIDITY "{m}%s%%{e}";
+const char HTTP_SNS_PRESSURE[] PROGMEM = "{s}%s " D_PRESSURE "{m}%s %s{e}";
+const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "{s}%s " D_PRESSUREATSEALEVEL "{m}%s %s{e}";
+const char HTTP_SNS_ANALOG[] PROGMEM = "{s}%s " D_ANALOG_INPUT "%d{m}%d{e}";
+const char HTTP_SNS_ILLUMINANCE[] PROGMEM = "{s}%s " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}";
+const char HTTP_SNS_CO2[] PROGMEM = "{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";
+const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";
+const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS " {e}";
+const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN" {e}";
+const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d %%{e}";
 
+const char HTTP_SNS_VOLTAGE[] PROGMEM = "{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}";
+const char HTTP_SNS_CURRENT[] PROGMEM = "{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}";
+const char HTTP_SNS_POWER[] PROGMEM = "{s}" D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
+const char HTTP_SNS_ENERGY_TOTAL[] PROGMEM = "{s}" D_ENERGY_TOTAL "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
 
 const char S_MAIN_MENU[] PROGMEM = D_MAIN_MENU;
 const char S_CONFIGURATION[] PROGMEM = D_CONFIGURATION;
diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 22e99f9f9..cb1efbbf3 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS домейн"
 #define D_COUNT "Брой"
 #define D_COUNTER "Брояч"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Ток"          // As in Voltage and Current
 #define D_DATA "Данни"
 #define D_DARKLIGHT "Тъмна"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 92ba99b30..fbed64c80 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Počítej"
 #define D_COUNTER "Počítadlo"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Proud"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Tmavý"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 455e22ff6..5e9f43002 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "zählen"
 #define D_COUNTER "Zähler"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Strom"          // As in Voltage and Current
 #define D_DATA "Daten"
 #define D_DARKLIGHT "dunkel"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 15b78fea7..97c2fb063 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -74,6 +74,7 @@
 #define D_COUNT "Μέτρηση"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Μετρητής"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Ένταση"          // As in Voltage and Current
 #define D_DATA "Δεδομένα"
 #define D_DARKLIGHT "Σκοτεινό"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 4062a1b84..7f92ac447 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Count"
 #define D_COUNTER "Counter"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Current"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Dark"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 111ead8dc..c4ab3d239 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "Sitio WEB para CORS"
 #define D_COUNT "Conteo"
 #define D_COUNTER "Contador"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Corriente"          // As in Voltage and Current
 #define D_DATA "Datos"
 #define D_DARKLIGHT "Oscuro"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index c84610379..f9f2d0d87 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "Domaine CORS"
 #define D_COUNT "Compte"
 #define D_COUNTER "Compteur"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Courant"          // As in Voltage and Current
 #define D_DATA "Donnée"
 #define D_DARKLIGHT "Sombre"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index d21750fba..1cbab98c9 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "סופר"
 #define D_COUNTER "מונה"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "נוכחי"          // As in Voltage and Current
 #define D_DATA "נתונים"
 #define D_DARKLIGHT "חושך"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index da61d1ffd..b43fda2bb 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Szám"
 #define D_COUNTER "Számláló"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Áramerősség"          // As in Voltage and Current
 #define D_DATA "Adat"
 #define D_DARKLIGHT "Min. fényerő"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index ca584ec8e..bd5f145a0 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Conteggio"
 #define D_COUNTER "Contatore"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_DATA "Dati"
 #define D_DARKLIGHT "Scuro"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index b85f60bce..edddc292b 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -74,6 +74,7 @@
 #define D_COUNT "횟수"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Counter"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "전류"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "어둡게"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 1fde4786d..e475e7af8 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -74,6 +74,7 @@
 #define D_COUNT "Aantal"
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNTER "Teller"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Stroom"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Donker"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index f8250eda2..0ee1d10a5 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "Domena CORS"
 #define D_COUNT "Licz"
 #define D_COUNTER "Licznik"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Prąd"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Ciemny"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index f5390be86..b5198d81a 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_DATA "Dados"
 #define D_DARKLIGHT "Luz escura"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 154bebd70..bae64f156 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Contagem"
 #define D_COUNTER "Contador"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Corrente"          // As in Voltage and Current
 #define D_DATA "Dados"
 #define D_DARKLIGHT "Luz Escura"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 89567f11f..1d59105e0 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Подсчет"
 #define D_COUNTER "Счетчик"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Ток"          // As in Voltage and Current
 #define D_DATA "Данные"
 #define D_DARKLIGHT "Темный"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index c42130e11..4373b4957 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Počítaj"
 #define D_COUNTER "Počítadlo"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Prúd"          // As in Voltage and Current
 #define D_DATA "Dáta"
 #define D_FLOW_RATE "Flow rate"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 074c81c8e..e37212998 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Räkna"
 #define D_COUNTER "Räknare"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Ström"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Mörkt"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 04cc270ec..9990f6b03 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "Sayı"
 #define D_COUNTER "Sayaç"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Current"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Karanlık"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index af7672973..9b1c9d52f 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "Домен CORS"
 #define D_COUNT "разів"
 #define D_COUNTER "Лічильник"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "Струм"           // As in Voltage and Current
 #define D_DATA "Дані"
 #define D_DARKLIGHT "Темний"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 4c75b7bb7..c55500e4c 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "数量:"
 #define D_COUNTER "计数器"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "电流"          // As in Voltage and Current
 #define D_DATA "数据:"
 #define D_DARKLIGHT "暗"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index f17ba46b7..11c1f77a2 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -74,6 +74,7 @@
 #define D_CORS_DOMAIN "CORS Domain"
 #define D_COUNT "數量:"
 #define D_COUNTER "Counter"
+#define D_CT_POWER "CT Power"
 #define D_CURRENT "電流"          // As in Voltage and Current
 #define D_DATA "數據:"
 #define D_DARKLIGHT "Dark"
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 685546b91..24037dcbe 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -312,6 +312,7 @@ enum UserSelectableAdc0 {
   ADC0_BUTTON,         // Button
   ADC0_BUTTON_INV,
   ADC0_MOIST,          // Moisture
+  ADC0_CT_POWER,       // Current
 //  ADC0_SWITCH,         // Switch
 //  ADC0_SWITCH_INV,
   ADC0_END };
@@ -328,6 +329,7 @@ const char kAdc0Names[] PROGMEM =
   D_TEMPERATURE "|" D_LIGHT "|"
   D_SENSOR_BUTTON "|" D_SENSOR_BUTTON "i|"
   D_MOISTURE "|"
+  D_CT_POWER "|"
 //  D_SENSOR_SWITCH "|" D_SENSOR_SWITCH "i|"
   ;
 
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 8bc0a50e1..a1dac458d 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010001;
+const uint32_t VERSION = 0x08010002;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 6d8be5c2b..95c73754f 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -1062,15 +1062,12 @@ void EnergyShow(bool json)
 #ifdef USE_WEBSERVER
   } else {
     if (Energy.voltage_available) {
-      WSContentSend_PD(PSTR("{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"),
-        EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
     }
     if (Energy.current_available) {
-      WSContentSend_PD(PSTR("{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"),
-        EnergyFormat(value_chr, current_chr[0], json));
+      WSContentSend_PD(HTTP_SNS_CURRENT, EnergyFormat(value_chr, current_chr[0], json));
     }
-    WSContentSend_PD(PSTR("{s}" D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}"),
-      EnergyFormat(value_chr, active_power_chr[0], json));
+    WSContentSend_PD(HTTP_SNS_POWER, EnergyFormat(value_chr, active_power_chr[0], json));
     if (!Energy.type_dc) {
       if (Energy.current_available && Energy.voltage_available) {
         WSContentSend_PD(HTTP_ENERGY_SNS1, EnergyFormat(value_chr, apparent_power_chr[0], json),
diff --git a/tasmota/xsns_02_analog.ino b/tasmota/xsns_02_analog.ino
index 3dd974918..5bfe8c26d 100644
--- a/tasmota/xsns_02_analog.ino
+++ b/tasmota/xsns_02_analog.ino
@@ -47,8 +47,27 @@
 #define ANALOG_LDR_LUX_CALC_SCALAR    12518931         // Experimental
 #define ANALOG_LDR_LUX_CALC_EXPONENT  -1.4050          // Experimental
 
-uint16_t adc_last_value = 0;
-float adc_temp = 0;
+// CT Based Apparrent Power Measurement Parameters
+// 3V3 --- R1 ----v--- R1 --- Gnd
+//                |
+//         CT+   CT-
+//          |
+//        ADC0
+// Default settings for a 20A/1V Current Transformer.
+// Analog peak to peak range is measured and converted to RMS current using ANALOG_CT_MULTIPLIER
+#define ANALOG_CT_FLAGS               0                // (uint32_t) reserved for possible future use
+#define ANALOG_CT_MULTIPLIER          2146             // (uint32_t) Multiplier*100000 to convert raw ADC peak to peak range 0..1023 to RMS current in Amps. Value of 100000 corresponds to 1
+#define ANALOG_CT_VOLTAGE             2300             // (int) Convert current in Amps to apparrent power in Watts using voltage in Volts*10. Value of 2200 corresponds to 220V
+
+#define CT_FLAG_ENERGY_RESET          (1 << 0)         // Reset energy total
+
+struct {
+  float temperature = 0;
+  float current = 0;
+  float energy = 0;
+  uint32_t previous_millis = 0;
+  uint16_t last_value = 0;
+} Adc;
 
 void AdcInit(void)
 {
@@ -72,6 +91,12 @@ void AdcInit(void)
       Settings.adc_param2 = 1023;
       Settings.adc_param3 = 0;
     }
+    else if (ADC0_CT_POWER == my_adc0) {
+      Settings.adc_param_type = ADC0_CT_POWER;
+      Settings.adc_param1 = ANALOG_CT_FLAGS;              //(uint32_t) 0
+      Settings.adc_param2 = ANALOG_CT_MULTIPLIER;         //(uint32_t) 100000
+      Settings.adc_param3 = ANALOG_CT_VOLTAGE;            //(int)      10
+    }
   }
 }
 
@@ -97,9 +122,9 @@ void AdcEvery250ms(void)
 {
   if (ADC0_INPUT == my_adc0) {
     uint16_t new_value = AdcRead(5);
-    if ((new_value < adc_last_value -10) || (new_value > adc_last_value +10)) {
-      adc_last_value = new_value;
-      uint16_t value = adc_last_value / 10;
+    if ((new_value < Adc.last_value -10) || (new_value > Adc.last_value +10)) {
+      Adc.last_value = new_value;
+      uint16_t value = Adc.last_value / 10;
       Response_P(PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value);
       XdrvRulesProcess();
     }
@@ -120,17 +145,45 @@ uint16_t AdcGetLux(void)
 }
 
 uint16_t AdcGetMoist(void)
-// formula for calibration: value, fromLow, fromHigh, toHigh, toLow
-// Example: 632, 0, 1023, 100, 0
-// int( ( ( (<param2> - <analogue-value>) / ( <param2> - <param1> ) ) * ( <param3> - <param4> ) ) + <param4> )
-// double amoist = ((Settings.adc_param2 - (double)adc) / (Settings.adc_param2 - Settings.adc_param1) * 100;
-// int((((1023 - <analog-reading>) / ( 1023 - 0 )) * ( 100 - 0 )) + 0 )
-
 {
-   int adc = AdcRead(2);
-   double amoist = ((double)Settings.adc_param2 - (double)adc) / ((double)Settings.adc_param2 - (double)Settings.adc_param1) * 100;
-   //double amoist = ((1023 - (double)adc) / 1023) * 100;
-   return (uint16_t)amoist;
+  // formula for calibration: value, fromLow, fromHigh, toHigh, toLow
+  // Example: 632, 0, 1023, 100, 0
+  // int( ( ( (<param2> - <analogue-value>) / ( <param2> - <param1> ) ) * ( <param3> - <param4> ) ) + <param4> )
+  // double amoist = ((Settings.adc_param2 - (double)adc) / (Settings.adc_param2 - Settings.adc_param1) * 100;
+  // int((((1023 - <analog-reading>) / ( 1023 - 0 )) * ( 100 - 0 )) + 0 )
+  int adc = AdcRead(2);
+  double amoist = ((double)Settings.adc_param2 - (double)adc) / ((double)Settings.adc_param2 - (double)Settings.adc_param1) * 100;
+  //double amoist = ((1023 - (double)adc) / 1023) * 100;
+  return (uint16_t)amoist;
+}
+
+void AdcGetCurrentPower(uint8_t factor)
+{
+  // factor 1 = 2 samples
+  // factor 2 = 4 samples
+  // factor 3 = 8 samples
+  // factor 4 = 16 samples
+  // factor 5 = 32 samples
+  uint8_t samples = 1 << factor;
+  uint16_t analog = 0;
+  uint16_t analog_min = 1023;
+  uint16_t analog_max = 0;
+  for (uint32_t i = 0; i < samples; i++) {
+    analog = analogRead(A0);
+    if (analog < analog_min) {
+      analog_min = analog;
+    }
+    if (analog > analog_max) {
+      analog_max = analog;
+    }
+    delay(1);
+  }
+
+  Adc.current = (float)(analog_max-analog_min) * ((float)(Settings.adc_param2) / 100000);
+  float power = Adc.current * (float)(Settings.adc_param3) / 10;
+  uint32_t current_millis = millis();
+  Adc.energy = Adc.energy + ((power * (current_millis - Adc.previous_millis)) / 3600000000);
+  Adc.previous_millis = current_millis;
 }
 
 void AdcEverySecond(void)
@@ -141,7 +194,10 @@ void AdcEverySecond(void)
     double Rt = (adc * Settings.adc_param1) / (1024.0 * ANALOG_V33 - (double)adc);
     double BC = (double)Settings.adc_param3 / 10000;
     double T = BC / (BC / ANALOG_T0 + TaylorLog(Rt / (double)Settings.adc_param2));
-    adc_temp = ConvertTemp(TO_CELSIUS(T));
+    Adc.temperature = ConvertTemp(TO_CELSIUS(T));
+  }
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
   }
 }
 
@@ -158,9 +214,10 @@ void AdcShow(bool json)
 #endif  // USE_WEBSERVER
     }
   }
+
   else if (ADC0_TEMP == my_adc0) {
     char temperature[33];
-    dtostrfd(adc_temp, Settings.flag2.temperature_resolution, temperature);
+    dtostrfd(Adc.temperature, Settings.flag2.temperature_resolution, temperature);
 
     if (json) {
       ResponseAppend_P(JSON_SNS_TEMP, "ANALOG", temperature);
@@ -171,7 +228,7 @@ void AdcShow(bool json)
 #endif  // USE_DOMOTICZ
 #ifdef USE_KNX
       if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, adc_temp);
+        KnxSensor(KNX_TEMPERATURE, Adc.temperature);
       }
 #endif  // USE_KNX
 #ifdef USE_WEBSERVER
@@ -180,6 +237,7 @@ void AdcShow(bool json)
 #endif  // USE_WEBSERVER
     }
   }
+
   else if (ADC0_LIGHT == my_adc0) {
     uint16_t adc_light = AdcGetLux();
 
@@ -196,6 +254,7 @@ void AdcShow(bool json)
 #endif  // USE_WEBSERVER
     }
   }
+
   else if (ADC0_MOIST == my_adc0) {
     uint16_t adc_moist = AdcGetMoist();
 
@@ -207,6 +266,40 @@ void AdcShow(bool json)
 #endif  // USE_WEBSERVER
     }
   }
+
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
+
+    float voltage = (float)(Settings.adc_param3) / 10;
+    char voltage_chr[FLOATSZ];
+    dtostrfd(voltage, Settings.flag2.voltage_resolution, voltage_chr);
+    char current_chr[FLOATSZ];
+    dtostrfd(Adc.current, Settings.flag2.current_resolution, current_chr);
+    char power_chr[FLOATSZ];
+    dtostrfd(voltage * Adc.current, Settings.flag2.wattage_resolution, power_chr);
+    char energy_chr[FLOATSZ];
+    dtostrfd(Adc.energy, Settings.flag2.energy_resolution, energy_chr);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"ANALOG\":{\"" D_JSON_ENERGY "\":%s,\"" D_JSON_POWERUSAGE "\":%s,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s}"),
+        energy_chr, power_chr, voltage_chr, current_chr);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_POWER_ENERGY, power_chr);
+        DomoticzSensor(DZ_VOLTAGE, voltage_chr);
+        DomoticzSensor(DZ_CURRENT, current_chr);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, voltage_chr);
+      WSContentSend_PD(HTTP_SNS_CURRENT, current_chr);
+      WSContentSend_PD(HTTP_SNS_POWER, power_chr);
+      WSContentSend_PD(HTTP_SNS_ENERGY_TOTAL, energy_chr);
+#endif  // USE_WEBSERVER
+    }
+  }
+
 }
 
 /*********************************************************************************************\
@@ -247,23 +340,31 @@ void CmndAdcs(void)
 void CmndAdcParam(void)
 {
   if (XdrvMailbox.data_len) {
-    if ((ADC0_TEMP == XdrvMailbox.payload) || (ADC0_LIGHT == XdrvMailbox.payload) || (ADC0_MOIST == XdrvMailbox.payload)) {
-//      if ((XdrvMailbox.payload == my_adc0) && ((ADC0_TEMP == my_adc0) || (ADC0_LIGHT == my_adc0))) {
+    if ((ADC0_TEMP == XdrvMailbox.payload) ||
+        (ADC0_LIGHT == XdrvMailbox.payload) ||
+        (ADC0_MOIST == XdrvMailbox.payload) ||
+        (ADC0_CT_POWER == XdrvMailbox.payload)) {
       if (strstr(XdrvMailbox.data, ",") != nullptr) {  // Process parameter entry
         char sub_string[XdrvMailbox.data_len +1];
         // AdcParam 2, 32000, 10000, 3350
         // AdcParam 3, 10000, 12518931, -1.405
         Settings.adc_param_type = XdrvMailbox.payload;
-//          Settings.adc_param_type = my_adc0;
         Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
         Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
         if (!ADC0_MOIST == XdrvMailbox.payload) {
           Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
         }
+        if (ADC0_CT_POWER == XdrvMailbox.payload) {
+          if ((Settings.adc_param1 & CT_FLAG_ENERGY_RESET) > 0) {
+            Adc.energy = 0;
+            Settings.adc_param1 ^= CT_FLAG_ENERGY_RESET;  // Cancel energy reset flag
+          }
+        }
       } else {                                         // Set default values based on current adc type
         // AdcParam 2
         // AdcParam 3
         // AdcParam 6
+        // AdcParam 7
         Settings.adc_param_type = 0;
         AdcInit();
       }
@@ -271,22 +372,19 @@ void CmndAdcParam(void)
   }
 
   // AdcParam
-  int value = Settings.adc_param3;
-  uint8_t precision;
-  for (precision = 4; precision > 0; precision--) {
-    if (value % 10) { break; }
-    value /= 10;
-  }
-  char param3[33];
-  dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
-  if ((ADC0_TEMP == my_adc0) || (ADC0_LIGHT == my_adc0)) {
-    Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d,%s]}"),
-      Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2, param3);
-  }
-  else if (ADC0_MOIST == my_adc0) {
-    Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d]}"),
-      Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
+  Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
+  if (ADC0_MOIST != my_adc0) {
+    int value = Settings.adc_param3;
+    uint8_t precision;
+    for (precision = 4; precision > 0; precision--) {
+      if (value % 10) { break; }
+      value /= 10;
+    }
+    char param3[33];
+    dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
+    ResponseAppend_P(PSTR(",%s"), param3);
   }
+  ResponseAppend_P(PSTR("]}"));
 }
 
 /*********************************************************************************************\
@@ -302,7 +400,11 @@ bool Xsns02(uint8_t function)
       result = DecodeCommand(kAdcCommands, AdcCommand);
       break;
     default:
-      if ((ADC0_INPUT == my_adc0) || (ADC0_TEMP == my_adc0) || (ADC0_LIGHT == my_adc0) || (ADC0_MOIST == my_adc0)) {
+      if ((ADC0_INPUT == my_adc0) ||
+          (ADC0_TEMP == my_adc0) ||
+          (ADC0_LIGHT == my_adc0) ||
+          (ADC0_MOIST == my_adc0) ||
+          (ADC0_CT_POWER == my_adc0)) {
         switch (function) {
 #ifdef USE_RULES
           case FUNC_EVERY_250_MSECOND:

From 9e1a595d586d77f45b22259501ad2e7b4f8c3c06 Mon Sep 17 00:00:00 2001
From: localhost61 <33861984+localhost61@users.noreply.github.com>
Date: Mon, 30 Dec 2019 18:44:08 +0100
Subject: [PATCH 047/403] =?UTF-8?q?Use=20symbolic=20chars=20in=20WebUI=20f?=
 =?UTF-8?q?or=20all=20languages=20(=C2=B5,=CE=A9,=C2=B3,=E2=82=82)...=20bu?=
 =?UTF-8?q?t=20keep=20MHZ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tasmota/language/cs-CZ.h |  4 ++--
 tasmota/language/el-GR.h | 12 ++++++------
 tasmota/language/en-GB.h |  6 +++---
 tasmota/language/es-ES.h | 12 ++++++------
 tasmota/language/he-HE.h | 12 ++++++------
 tasmota/language/hu-HU.h |  8 ++++----
 tasmota/language/it-IT.h | 12 ++++++------
 tasmota/language/ko-KO.h |  6 +++---
 tasmota/language/nl-NL.h |  4 ++--
 tasmota/language/pl-PL.h | 10 +++++-----
 tasmota/language/pt-BR.h | 10 +++++-----
 tasmota/language/pt-PT.h | 12 ++++++------
 tasmota/language/ru-RU.h |  4 ++--
 tasmota/language/sk-SK.h | 10 +++++-----
 tasmota/language/sv-SE.h | 10 +++++-----
 tasmota/language/tr-TR.h | 12 ++++++------
 tasmota/language/uk-UA.h |  4 ++--
 tasmota/language/zh-CN.h |  2 +-
 tasmota/language/zh-TW.h |  2 +-
 19 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index fbed64c80..1342102b9 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Server DNS"
 #define D_DONE "Provedeno"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulace"
 #define D_ENABLED "Otevřený"
 #define D_ERASE "Smaž"
@@ -645,7 +645,7 @@
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
 #define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 97c2fb063..f5397d765 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Διακομιστής DNS"
 #define D_DONE "Ολοκληρώθηκε"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Εξομoίωση"
 #define D_ENABLED "Ενεργό"
 #define D_ERASE "Διαγραφή"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 7f92ac447..007029434 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Done"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulation"
 #define D_ENABLED "Enabled"
 #define D_ERASE "Erase"
@@ -639,13 +639,13 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
 #define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index c4ab3d239..f3c140906 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Servidor DNS"
 #define D_DONE "Listo"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulación"
 #define D_ENABLED "Habilitado"
 #define D_ERASE "Borrar"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index 1cbab98c9..f6e7d1daa 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS שרת"
 #define D_DONE "סיים"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "הדמיה"
 #define D_ENABLED "מאופשר"
 #define D_ERASE "מחיקה"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index b43fda2bb..67d7919f3 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS szerver"
 #define D_DONE "Kész"
 #define D_DST_TIME "nyári idő"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emuláció"
 #define D_ENABLED "Engedélyezve"
 #define D_ERASE "Törlés"
@@ -645,11 +645,11 @@
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index bd5f145a0..fdd12252c 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Fatto"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulazione"
 #define D_ENABLED "Abilitato"
 #define D_ERASE "Cancellare"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index edddc292b..fa075f2d0 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS 서버"
 #define D_DONE "완료"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "에뮬레이션"
 #define D_ENABLED "사용"
 #define D_ERASE "삭제"
@@ -645,10 +645,10 @@
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
 #define D_UNIT_MICROMETER "마이크로미터"
 #define D_UNIT_MICROSECOND "마이크로초"
 #define D_UNIT_MILLIAMPERE "mA"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index e475e7af8..6712f0d06 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Klaar"
 #define D_DST_TIME "ZT"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulatie"
 #define D_ENABLED "Geactiveerd"
 #define D_ERASE "Wissen"
@@ -648,7 +648,7 @@
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 0ee1d10a5..57e963b33 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Serwer DNS"
 #define D_DONE "Wykonane"
 #define D_DST_TIME "Czas DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulacja"
 #define D_ENABLED "Załączony"
 #define D_ERASE "Wyczyść"
@@ -645,12 +645,12 @@
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index b5198d81a..407ead653 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Servidor DNS"
 #define D_DONE "Concluído"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulação"
 #define D_ENABLED "Habilitado"
 #define D_ERASE "Apagar"
@@ -645,12 +645,12 @@
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index bae64f156..ee9778250 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Servidor DNS"
 #define D_DONE "Concluído"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulação"
 #define D_ENABLED "Habilitado"
 #define D_ERASE "Apagar"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 1d59105e0..499e65545 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS Сервер"
 #define D_DONE "Выполнено"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Эмуляция"
 #define D_ENABLED "Активно"
 #define D_ERASE "Стирать"
@@ -648,7 +648,7 @@
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
 #define D_UNIT_LUX "лк"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м³"
 #define D_UNIT_MICROMETER "мкм"
 #define D_UNIT_MICROSECOND "мкс"
 #define D_UNIT_MILLIAMPERE "мА"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 4373b4957..52ce3ca0e 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -85,7 +85,7 @@
 #define D_DNS_SERVER "Server DNS"
 #define D_DONE "Hotovo"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulácia"
 #define D_ENABLED "Otvorený"
 #define D_ERASE "Zmaž"
@@ -645,12 +645,12 @@
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index e37212998..30a4067ad 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS-server"
 #define D_DONE "Gjort"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emulation"
 #define D_ENABLED "Aktiverad"
 #define D_ERASE "Ta bort"
@@ -645,12 +645,12 @@
 #define D_UNIT_INCREMENTS "ink"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 9990f6b03..a9c7a95f3 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS Sunucu"
 #define D_DONE "Tamam"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Emülasyon"
 #define D_ENABLED "Etkin"
 #define D_ERASE "Temizle"
@@ -639,18 +639,18 @@
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_HOUR "Hr"
+#define D_UNIT_HOUR "h"
 #define D_UNIT_GALLONS "gal"
 #define D_UNIT_GALLONS_PER_MIN "g/m"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
-#define D_UNIT_KILOOHM "kOhm"
+#define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "ug/m3"
-#define D_UNIT_MICROMETER "um"
-#define D_UNIT_MICROSECOND "us"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
 #define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 9b1c9d52f..aaccc531d 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "Сервер DNS"
 #define D_DONE "Виконано"
 #define D_DST_TIME "Літній час"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "Емуляція"
 #define D_ENABLED "Увімкнено"
 #define D_ERASE "Стирати"
@@ -648,7 +648,7 @@
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт/г"
 #define D_UNIT_LUX "лк"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м3"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м³"
 #define D_UNIT_MICROMETER "мкм"
 #define D_UNIT_MICROSECOND "мкС"
 #define D_UNIT_MILLIAMPERE "мА"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index c55500e4c..2cc1b3568 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS服务器"
 #define D_DONE "完成"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "设备模拟"
 #define D_ENABLED "启用"
 #define D_ERASE "擦除"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 11c1f77a2..18494e924 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -84,7 +84,7 @@
 #define D_DNS_SERVER "DNS伺服器"
 #define D_DONE "完成"
 #define D_DST_TIME "DST"
-#define D_ECO2 "eCO2"
+#define D_ECO2 "eCO₂"
 #define D_EMULATION "設備模擬"
 #define D_ENABLED "啟用"
 #define D_ERASE "刪除"

From df9781d71edb2c88a30d7e27d8a2e77c9e108c17 Mon Sep 17 00:00:00 2001
From: Bohdan Kmit <bkmit@maytech.net>
Date: Tue, 31 Dec 2019 15:12:27 +0200
Subject: [PATCH 048/403] =?UTF-8?q?Use=20symbolic=20chars=20in=20WebUI=20f?=
 =?UTF-8?q?or=20Ukrainian=20language=20(=C2=B5,=CE=A9,=C2=B3,=E2=82=82)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tasmota/language/uk-UA.h | 64 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index aaccc531d..a7b68eba6 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -636,38 +636,38 @@
 #define D_SENSOR_GPS_TX        "GPS TX"
 
 // Units
-#define D_UNIT_AMPERE "А"
-#define D_UNIT_CENTIMETER "cм"
-#define D_UNIT_HERTZ "Гц"
-#define D_UNIT_HOUR "Г"
-#define D_UNIT_GALLONS "гал"
-#define D_UNIT_GALLONS_PER_MIN "гал/хв"
-#define D_UNIT_INCREMENTS "inc"
-#define D_UNIT_KILOGRAM "кг"
-#define D_UNIT_KILOMETER_PER_HOUR "км/г"  // or "km/h"
-#define D_UNIT_KILOOHM "кОм"
-#define D_UNIT_KILOWATTHOUR "кВт/г"
-#define D_UNIT_LUX "лк"
-#define D_UNIT_MICROGRAM_PER_CUBIC_METER "мкг/м³"
-#define D_UNIT_MICROMETER "мкм"
-#define D_UNIT_MICROSECOND "мкС"
-#define D_UNIT_MILLIAMPERE "мА"
-#define D_UNIT_MILLIMETER "мм"
-#define D_UNIT_MILLIMETER_MERCURY "ммHg"
-#define D_UNIT_MILLISECOND "мС"
-#define D_UNIT_MINUTE "хв"
-#define D_UNIT_PARTS_PER_BILLION "ppb"
-#define D_UNIT_PARTS_PER_DECILITER "ppd"
-#define D_UNIT_PARTS_PER_MILLION "ppm"
-#define D_UNIT_PRESSURE "гПа"
-#define D_UNIT_SECOND "сек"
-#define D_UNIT_SECTORS "секторів"
-#define D_UNIT_VA "ВА"
-#define D_UNIT_VAR "ВАр"
-#define D_UNIT_VOLT "В"
-#define D_UNIT_WATT "Вт"
-#define D_UNIT_WATTHOUR "Вт/г"
-#define D_UNIT_WATT_METER_QUADRAT "Вт/м²"
+#define D_UNIT_AMPERE                    "А"
+#define D_UNIT_CENTIMETER                "cм"
+#define D_UNIT_HERTZ                     "Гц"
+#define D_UNIT_HOUR                      "г"
+#define D_UNIT_GALLONS                   "гал"
+#define D_UNIT_GALLONS_PER_MIN           "гал/хв"
+#define D_UNIT_INCREMENTS                "інк"
+#define D_UNIT_KILOGRAM                  "кг"
+#define D_UNIT_KILOMETER_PER_HOUR        "км/г" // or "km/h"
+#define D_UNIT_KILOOHM                   "㏀"
+#define D_UNIT_KILOWATTHOUR              "кВт/г"
+#define D_UNIT_LUX                       "лк"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µг/м³"
+#define D_UNIT_MICROMETER                "µм"
+#define D_UNIT_MICROSECOND               "µС"
+#define D_UNIT_MILLIAMPERE               "мА"
+#define D_UNIT_MILLIMETER                "мм"
+#define D_UNIT_MILLIMETER_MERCURY        "ммHg"
+#define D_UNIT_MILLISECOND               "мС"
+#define D_UNIT_MINUTE                    "хв"
+#define D_UNIT_PARTS_PER_BILLION         "млрд⁻¹"
+#define D_UNIT_PARTS_PER_DECILITER       "децилітр⁻¹"
+#define D_UNIT_PARTS_PER_MILLION         "млн⁻¹"
+#define D_UNIT_PRESSURE                  "гПа"
+#define D_UNIT_SECOND                    "сек"
+#define D_UNIT_SECTORS                   "секторів"
+#define D_UNIT_VA                        "ВА"
+#define D_UNIT_VAR                       "ВАр"
+#define D_UNIT_VOLT                      "В"
+#define D_UNIT_WATT                      "Вт"
+#define D_UNIT_WATTHOUR                  "Вт/г"
+#define D_UNIT_WATT_METER_QUADRAT        "Вт/м²"
 
 //SDM220
 #define D_PHASE_ANGLE     "Кут фази"

From 8aa91096566c5a3d885c693c9f28cee387ec7b1b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 31 Dec 2019 14:23:34 +0100
Subject: [PATCH 049/403] Happy New Year

Happy New Year
---
 lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp |  2 +-
 lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h   |  2 +-
 lib/TasmotaSerial-2.4.1/src/TasmotaSerial.cpp |  2 +-
 lib/TasmotaSerial-2.4.1/src/TasmotaSerial.h   |  2 +-
 tasmota/i18n.h                                |  2 +-
 tasmota/language/bg-BG.h                      |  2 +-
 tasmota/language/cs-CZ.h                      |  2 +-
 tasmota/language/de-DE.h                      |  2 +-
 tasmota/language/el-GR.h                      |  2 +-
 tasmota/language/en-GB.h                      |  2 +-
 tasmota/language/es-ES.h                      |  2 +-
 tasmota/language/fr-FR.h                      |  2 +-
 tasmota/language/he-HE.h                      |  2 +-
 tasmota/language/hu-HU.h                      |  2 +-
 tasmota/language/it-IT.h                      |  2 +-
 tasmota/language/ko-KO.h                      |  2 +-
 tasmota/language/nl-NL.h                      |  2 +-
 tasmota/language/pl-PL.h                      |  2 +-
 tasmota/language/pt-BR.h                      |  2 +-
 tasmota/language/pt-PT.h                      |  2 +-
 tasmota/language/ru-RU.h                      |  2 +-
 tasmota/language/sk-SK.h                      |  2 +-
 tasmota/language/sv-SE.h                      |  2 +-
 tasmota/language/tr-TR.h                      |  2 +-
 tasmota/language/uk-UA.h                      |  2 +-
 tasmota/language/zh-CN.h                      |  2 +-
 tasmota/language/zh-TW.h                      |  2 +-
 tasmota/my_user_config.h                      |  2 +-
 tasmota/settings.h                            |  2 +-
 tasmota/settings.ino                          |  2 +-
 tasmota/support.ino                           |  2 +-
 tasmota/support_button.ino                    |  2 +-
 tasmota/support_command.ino                   |  2 +-
 tasmota/support_crash_recorder.ino            |  2 +-
 tasmota/support_esptool.ino                   |  2 +-
 tasmota/support_features.ino                  |  2 +-
 tasmota/support_flash_log.ino                 | 68 +++++++++----------
 tasmota/support_float.ino                     |  2 +-
 tasmota/support_legacy_cores.ino              |  2 +-
 tasmota/support_rotary.ino                    |  2 +-
 tasmota/support_rtc.ino                       |  2 +-
 tasmota/support_static_buffer.ino             |  2 +-
 tasmota/support_statistics.ino                |  2 +-
 tasmota/support_switch.ino                    |  2 +-
 tasmota/support_tasmota.ino                   |  2 +-
 tasmota/support_udp.ino                       |  2 +-
 tasmota/support_wifi.ino                      |  2 +-
 tasmota/tasmota.h                             |  2 +-
 tasmota/tasmota.ino                           |  2 +-
 tasmota/tasmota_ca.ino                        |  2 +-
 tasmota/tasmota_post.h                        |  2 +-
 tasmota/tasmota_template.h                    |  2 +-
 tasmota/tasmota_version.h                     |  2 +-
 tasmota/user_config_override_sample.h         |  2 +-
 tasmota/xdrv_01_webserver.ino                 |  2 +-
 tasmota/xdrv_02_mqtt.ino                      |  2 +-
 tasmota/xdrv_03_energy.ino                    |  2 +-
 tasmota/xdrv_04_light.ino                     |  4 +-
 tasmota/xdrv_05_irremote.ino                  |  2 +-
 tasmota/xdrv_05_irremote_full.ino             |  2 +-
 tasmota/xdrv_06_snfbridge.ino                 |  2 +-
 tasmota/xdrv_07_domoticz.ino                  |  2 +-
 tasmota/xdrv_08_serial_bridge.ino             |  2 +-
 tasmota/xdrv_09_timers.ino                    |  2 +-
 tasmota/xdrv_10_rules.ino                     |  2 +-
 tasmota/xdrv_10_scripter.ino                  |  2 +-
 tasmota/xdrv_11_knx.ino                       |  2 +-
 tasmota/xdrv_12_home_assistant.ino            |  2 +-
 tasmota/xdrv_13_display.ino                   |  2 +-
 tasmota/xdrv_14_mp3.ino                       |  2 +-
 tasmota/xdrv_15_pca9685.ino                   |  2 +-
 tasmota/xdrv_16_tuyamcu.ino                   |  2 +-
 tasmota/xdrv_17_rcswitch.ino                  |  2 +-
 tasmota/xdrv_18_armtronix_dimmers.ino         |  2 +-
 tasmota/xdrv_19_ps16dz_dimmer.ino             |  2 +-
 tasmota/xdrv_20_hue.ino                       |  2 +-
 tasmota/xdrv_21_wemo.ino                      |  2 +-
 tasmota/xdrv_22_sonoff_ifan.ino               |  2 +-
 tasmota/xdrv_23_zigbee_0_constants.ino        |  2 +-
 tasmota/xdrv_23_zigbee_1_headers.ino          |  2 +-
 tasmota/xdrv_23_zigbee_3_devices.ino          |  2 +-
 tasmota/xdrv_23_zigbee_5_converters.ino       |  4 +-
 tasmota/xdrv_23_zigbee_6_commands.ino         |  2 +-
 tasmota/xdrv_23_zigbee_7_statemachine.ino     |  2 +-
 tasmota/xdrv_23_zigbee_8_parsers.ino          |  2 +-
 tasmota/xdrv_23_zigbee_9_impl.ino             |  2 +-
 tasmota/xdrv_24_buzzer.ino                    |  2 +-
 tasmota/xdrv_25_A4988_Stepper.ino             |  2 +-
 tasmota/xdrv_26_ariluxrf.ino                  |  2 +-
 tasmota/xdrv_27_shutter.ino                   |  2 +-
 tasmota/xdrv_28_pcf8574.ino                   |  2 +-
 tasmota/xdrv_29_deepsleep.ino                 |  2 +-
 tasmota/xdrv_30_exs_dimmer.ino                |  2 +-
 tasmota/xdrv_31_tasmota_slave.ino             |  2 +-
 tasmota/xdrv_32_hotplug.ino                   |  2 +-
 tasmota/xdrv_99_debug.ino                     |  2 +-
 tasmota/xdrv_interface.ino                    |  2 +-
 tasmota/xdsp_01_lcd.ino                       |  2 +-
 tasmota/xdsp_02_ssd1306.ino                   |  2 +-
 tasmota/xdsp_03_matrix.ino                    |  2 +-
 tasmota/xdsp_04_ili9341.ino                   |  2 +-
 tasmota/xdsp_05_epaper_29.ino                 |  2 +-
 tasmota/xdsp_06_epaper_42.ino                 |  2 +-
 tasmota/xdsp_07_sh1106.ino                    |  2 +-
 tasmota/xdsp_08_ILI9488.ino                   |  2 +-
 tasmota/xdsp_09_SSD1351.ino                   |  2 +-
 tasmota/xdsp_10_RA8876.ino                    |  2 +-
 tasmota/xdsp_interface.ino                    |  2 +-
 tasmota/xlgt_01_ws2812.ino                    |  2 +-
 tasmota/xlgt_02_my92x1.ino                    |  2 +-
 tasmota/xlgt_03_sm16716.ino                   |  4 +-
 tasmota/xlgt_04_sm2135.ino                    |  2 +-
 tasmota/xlgt_05_sonoff_l1.ino                 |  2 +-
 tasmota/xlgt_interface.ino                    |  2 +-
 tasmota/xnrg_01_hlw8012.ino                   |  2 +-
 tasmota/xnrg_02_cse7766.ino                   |  2 +-
 tasmota/xnrg_03_pzem004t.ino                  |  2 +-
 tasmota/xnrg_04_mcp39f501.ino                 |  2 +-
 tasmota/xnrg_05_pzem_ac.ino                   |  2 +-
 tasmota/xnrg_06_pzem_dc.ino                   |  2 +-
 tasmota/xnrg_07_ade7953.ino                   |  2 +-
 tasmota/xnrg_08_sdm120.ino                    |  2 +-
 tasmota/xnrg_09_dds2382.ino                   |  2 +-
 tasmota/xnrg_10_sdm630.ino                    |  2 +-
 tasmota/xnrg_11_ddsu666.ino                   |  2 +-
 tasmota/xnrg_12_solaxX1.ino                   |  2 +-
 tasmota/xnrg_interface.ino                    |  2 +-
 tasmota/xsns_01_counter.ino                   |  2 +-
 tasmota/xsns_02_analog.ino                    |  2 +-
 tasmota/xsns_04_snfsc.ino                     |  2 +-
 tasmota/xsns_05_ds18x20.ino                   |  2 +-
 tasmota/xsns_06_dht.ino                       |  2 +-
 tasmota/xsns_07_sht1x.ino                     |  2 +-
 tasmota/xsns_08_htu21.ino                     |  2 +-
 tasmota/xsns_09_bmp.ino                       |  2 +-
 tasmota/xsns_10_bh1750.ino                    |  2 +-
 tasmota/xsns_11_veml6070.ino                  |  2 +-
 tasmota/xsns_12_ads1115.ino                   |  2 +-
 tasmota/xsns_13_ina219.ino                    |  2 +-
 tasmota/xsns_14_sht3x.ino                     |  2 +-
 tasmota/xsns_15_mhz19.ino                     |  2 +-
 tasmota/xsns_16_tsl2561.ino                   |  2 +-
 tasmota/xsns_17_senseair.ino                  |  2 +-
 tasmota/xsns_18_pms5003.ino                   |  2 +-
 tasmota/xsns_19_mgs.ino                       |  2 +-
 tasmota/xsns_20_novasds.ino                   |  2 +-
 tasmota/xsns_21_sgp30.ino                     |  2 +-
 tasmota/xsns_22_sr04.ino                      | 38 +++++------
 tasmota/xsns_24_si1145.ino                    |  2 +-
 tasmota/xsns_26_lm75ad.ino                    |  4 +-
 tasmota/xsns_27_apds9960.ino                  |  2 +-
 tasmota/xsns_28_tm1638.ino                    |  2 +-
 tasmota/xsns_29_mcp230xx.ino                  |  2 +-
 tasmota/xsns_30_mpr121.ino                    | 35 +++++-----
 tasmota/xsns_31_ccs811.ino                    |  2 +-
 tasmota/xsns_32_mpu6050.ino                   |  2 +-
 tasmota/xsns_33_ds3231.ino                    |  2 +-
 tasmota/xsns_34_hx711.ino                     |  6 +-
 tasmota/xsns_35_tx20.ino                      |  2 +-
 tasmota/xsns_36_mgc3130.ino                   |  2 +-
 tasmota/xsns_37_rfsensor.ino                  |  2 +-
 tasmota/xsns_38_az7798.ino                    |  2 +-
 tasmota/xsns_39_max31855.ino                  |  2 +-
 tasmota/xsns_40_pn532.ino                     |  2 +-
 tasmota/xsns_41_max44009.ino                  |  2 +-
 tasmota/xsns_42_scd30.ino                     |  2 +-
 tasmota/xsns_43_hre.ino                       |  2 +-
 tasmota/xsns_44_sps30.ino                     |  2 +-
 tasmota/xsns_45_vl53l0x.ino                   |  4 +-
 tasmota/xsns_46_MLX90614.ino                  |  2 +-
 tasmota/xsns_47_max31865.ino                  |  2 +-
 tasmota/xsns_48_chirp.ino                     |  2 +-
 tasmota/xsns_50_paj7620.ino                   |  2 +-
 tasmota/xsns_51_rdm6300.ino                   |  2 +-
 tasmota/xsns_52_ibeacon.ino                   |  2 +-
 tasmota/xsns_53_sml.ino                       |  2 +-
 tasmota/xsns_54_ina226.ino                    |  2 +-
 tasmota/xsns_55_hih_series.ino                |  2 +-
 tasmota/xsns_56_hpma.ino                      |  6 +-
 tasmota/xsns_57_tsl2591.ino                   |  2 +-
 tasmota/xsns_58_dht12.ino                     |  2 +-
 tasmota/xsns_59_ds1624.ino                    |  2 +-
 tasmota/xsns_60_GPS.ino                       |  2 +-
 tasmota/xsns_interface.ino                    |  2 +-
 tasmota/xx2c_interface.ino                    |  2 +-
 185 files changed, 263 insertions(+), 260 deletions(-)

diff --git a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp b/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
index dde74fd7c..057001779 100644
--- a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
+++ b/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
@@ -1,7 +1,7 @@
 /*
   TasmotaModbus.cpp - Basic modbus wrapper for TasmotaSerial for Tasmota
 
-  Copyright (C) 2018 Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h b/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h
index 2138e0c9d..4a5fbc7a8 100644
--- a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h
+++ b/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h
@@ -1,7 +1,7 @@
 /*
   TasmotaModbus.h - Basic modbus wrapper for TasmotaSerial for Tasmota
 
-  Copyright (C) 2018 Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.cpp b/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.cpp
index 45a1d47af..1fad7c0f5 100644
--- a/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.cpp
+++ b/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.cpp
@@ -1,7 +1,7 @@
 /*
   TasmotaSerial.cpp - Minimal implementation of software serial for Tasmota
 
-  Copyright (C) 2019 Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.h b/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.h
index 81545f522..3ef4ee43b 100644
--- a/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.h
+++ b/lib/TasmotaSerial-2.4.1/src/TasmotaSerial.h
@@ -1,7 +1,7 @@
 /*
   TasmotaSerial.h - Minimal implementation of software serial for Tasmota
 
-  Copyright (C) 2019 Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index bb8174e50..49f1f8496 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -1,7 +1,7 @@
 /*
   i18n.h - internationalization for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index cb1efbbf3..8f1c82bc3 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -1,7 +1,7 @@
 /*
   bg-BG.h - localization for Bulgaria - Bulgarian for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 1342102b9..3b11a7ebc 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -1,7 +1,7 @@
 /*
   cs-CZ.h - localization for Czech with diacritics - Czech for Tasmota
 
-  Copyright (C) 2019  Vladimír Synek
+  Copyright (C) 2020  Vladimír Synek
 
   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
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 5e9f43002..e09278526 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -1,7 +1,7 @@
 /*
   de-DE.h - localization for German - Germany for Tasmota
 
-  Copyright (C) 2019  VinceMasuka
+  Copyright (C) 2020  VinceMasuka
 
   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
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index f5397d765..070267215 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -1,7 +1,7 @@
 /*
   el-GR.h - localization for Greek - Greece for Tasmota
 
-  Copyright (C) 2019  Theo Arends, translated by Nick Galfas
+  Copyright (C) 2020  Theo Arends, translated by Nick Galfas
 
   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
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 007029434..5121a7471 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -1,7 +1,7 @@
 /*
   en-GB.h - localization for English - United Kingdom for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index f3c140906..8ff2b415f 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -1,7 +1,7 @@
 /*
   es-ES.h - localization for Spanish - Spain for Tasmota
 
-  Copyright (C) 2019  Adrian Scillato
+  Copyright (C) 2020  Adrian Scillato
 
   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
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index f9f2d0d87..3829a8681 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -1,7 +1,7 @@
 /*
   fr-FR.h - localization for French - France for Tasmota
 
-  Copyright (C) 2019  Olivier Francais
+  Copyright (C) 2020  Olivier Francais
 
   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
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index f6e7d1daa..d0c5e364b 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -1,7 +1,7 @@
 /*
   he-HE.h - localization for Hebrew - Israel for Tasmota
 
-  Copyright (C) 2019  Yuval Mejahez
+  Copyright (C) 2020  Yuval Mejahez
 
   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
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index 67d7919f3..70f219c98 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -1,7 +1,7 @@
 /*
   hu-HU.h - localization for Hungarian in Hungary for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index fdd12252c..73830deca 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -1,7 +1,7 @@
 /*
   it-IT.h - localization for Italian - Italy for Tasmota
 
-  Copyright (C) 2019 Gennaro Tortone - some mods by Antonio Fragola
+  Copyright (C) 2020 Gennaro Tortone - some mods by Antonio Fragola
 
   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
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index fa075f2d0..328acc568 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -1,7 +1,7 @@
 /*
   ko-KO.h - localization for Korean - Korean for Tasmota
 
-  Copyright (C) 2019  Theo Arends (translated by NyaamZ)
+  Copyright (C) 2020  Theo Arends (translated by NyaamZ)
 
   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
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 6712f0d06..3d5ec8b7d 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -1,7 +1,7 @@
 /*
   nl-NL.h - localization for Dutch - Nederland for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 57e963b33..63fe6fcad 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -1,7 +1,7 @@
 /*
   pl-PL-d.h - localization for Polish with diacritics - Poland for Tasmota
 
-  Copyright (C) 2019  Theo Arends (translated by roblad - Robert L., upgraded by R. Turala)
+  Copyright (C) 2020  Theo Arends (translated by roblad - Robert L., upgraded by R. Turala)
 
   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
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index 407ead653..da6e8ca1b 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -1,7 +1,7 @@
 /*
   pt-BR.h - localization for Portuguese - Brazil for Tasmota
 
-  Copyright (C) 2019  Fabiano Bovo
+  Copyright (C) 2020  Fabiano Bovo
 
   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
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index ee9778250..47137b90b 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -1,7 +1,7 @@
 /*
   pt-PT.h - localization for Portuguese - Portugal for Tasmota
 
-  Copyright (C) 2019  Paulo Paiva
+  Copyright (C) 2020  Paulo Paiva
 
   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
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 499e65545..31c295059 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -1,7 +1,7 @@
 /*
   ru-RU.h - localization for Russian - Rissia for Tasmota
 
-  Copyright (C) 2019  Theo Arends / roman-vn
+  Copyright (C) 2020  Theo Arends / roman-vn
 
   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
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 52ce3ca0e..89f3d7353 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -1,7 +1,7 @@
 /*
   sk-SK.h - localization for Slovak with diacritics - Slovak for Tasmota
 
-  Copyright (C) 2019  Vladimír Jendroľ
+  Copyright (C) 2020  Vladimír Jendroľ
 
   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
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 30a4067ad..ddc2307b4 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -1,7 +1,7 @@
 /*
   sv-SE.h - localization for Swedish - Svenska for Tasmota
 
-  Copyright (C) 2019  Gunnar Norin
+  Copyright (C) 2020  Gunnar Norin
 
   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
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index a9c7a95f3..38f125d6c 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -1,7 +1,7 @@
 /*
   tr-TR.h - localization for Turkish - Turkey for Tasmota
 
-  Copyright (C) 2019  Ali Sait Teke and Theo Arends
+  Copyright (C) 2020  Ali Sait Teke and Theo Arends
 
   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
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index a7b68eba6..b634935cf 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -1,7 +1,7 @@
 /*
   uk-UA.h - localization for Ukrainian - Ukraine for Tasmota
 
-  Copyright (C) 2019  Theo Arends / vadym-adik
+  Copyright (C) 2020  Theo Arends / vadym-adik
 
   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
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 2cc1b3568..97b41a29a 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -1,7 +1,7 @@
 /*
   zh-CN.h - localization for Chinese (Simplified) - China for Tasmota
 
-  Copyright (C) 2019  Theo Arends (translated by killadm)
+  Copyright (C) 2020  Theo Arends (translated by killadm)
 
   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
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 18494e924..1fd30e6e4 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -1,7 +1,7 @@
 /*
   zh-TW.h - localization for Chinese (Traditional) - Taiwan for Tasmota
 
-  Copyright (C) 2019  Theo Arends (translated by dannydu)
+  Copyright (C) 2020  Theo Arends (translated by dannydu)
 
   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
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 5239f152c..7bb79a73d 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -1,7 +1,7 @@
 /*
   my_user_config.h - user specific configuration for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 56a44a3ff..25bba319b 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -1,7 +1,7 @@
 /*
   settings.h - setting variables for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 6412d3fc9..dbd4c6d50 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1,7 +1,7 @@
 /*
   settings.ino - user settings for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 8e4d4a5d9..9e23c1423 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1,7 +1,7 @@
 /*
   support.ino - support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_button.ino b/tasmota/support_button.ino
index d1367eca7..f30f3a287 100644
--- a/tasmota/support_button.ino
+++ b/tasmota/support_button.ino
@@ -1,7 +1,7 @@
 /*
   support_button.ino - button support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 6022db994..d754e95cc 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1,7 +1,7 @@
 /*
   support_command.ino - command support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_crash_recorder.ino b/tasmota/support_crash_recorder.ino
index a51cb5dd2..cc9721cb4 100644
--- a/tasmota/support_crash_recorder.ino
+++ b/tasmota/support_crash_recorder.ino
@@ -1,7 +1,7 @@
 /*
   support_crash_recorder.ino - record the call stack in RTC in case of crash
 
-  Copyright (C) 2019  Stephan Hadinger, Theo Arends,
+  Copyright (C) 2020  Stephan Hadinger, Theo Arends,
 
   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
diff --git a/tasmota/support_esptool.ino b/tasmota/support_esptool.ino
index bf62a8da1..5bb82f999 100644
--- a/tasmota/support_esptool.ino
+++ b/tasmota/support_esptool.ino
@@ -1,7 +1,7 @@
 /*
   support_esptool.ino - esptool support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 07fe0d8f8..d86bf11bb 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -1,7 +1,7 @@
 /*
   support_features.ino - feature support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_flash_log.ino b/tasmota/support_flash_log.ino
index 8d02ec2e8..162ea1f0b 100644
--- a/tasmota/support_flash_log.ino
+++ b/tasmota/support_flash_log.ino
@@ -1,7 +1,7 @@
 /*
   support_flash_log.ino - log to flash support for Sonoff-Tasmota
 
-  Copyright (C) 2019  Theo Arends & Christian Baars
+  Copyright (C) 2020  Theo Arends & Christian Baars
 
   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
@@ -30,8 +30,8 @@
 
 /********************************************************************************************\
 | * Generic helper class to log arbitrary data to the OTA-partition
-| * Working principle: Add preferrable small chunks of data to the sector buffer, which will 
-| *                    be written to FLASH when full automatically. The next sector will be 
+| * Working principle: Add preferrable small chunks of data to the sector buffer, which will
+| *                    be written to FLASH when full automatically. The next sector will be
 | *                    erased and is the anchor point for downloading and state configuration
 | *                    after reboot.
 \*********************************************************************************************/
@@ -93,7 +93,7 @@ public:
   void startRecording(bool append);
   void stopRecording(void);
 
-  typedef void (*CallbackNoArgs) ();                      // simple typedef for a callback 
+  typedef void (*CallbackNoArgs) ();                      // simple typedef for a callback
   typedef void (*CallbackWithArgs) (uint8_t *_record);    // typedef for a callback with one argument
 
   void startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter);
@@ -129,41 +129,41 @@ ready = true;
 }
 
 /********************************************************************************************\
-| * 
+| *
 | * private helper functions
-| * 
+| *
 \*********************************************************************************************/
 
 /**
  * @brief Read a sector into the global buffer
- * 
+ *
  * @param one_sector as an uint8_t
  */
 void FLOG::_readSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);  
+  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);
   ESP.flashRead(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
 }
 /**
  * @brief Erase the given sector og the OTA-partition
- * 
+ *
  * @param one_sector as an uint8_t
  */
 void FLOG::_eraseSector(uint8_t one_sector){ // Erase sector of FLOG/OTA
-  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);  
+  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);
   ESP.flashEraseSector((start/FLASH_SECTOR_SIZE)+one_sector);
 }
 /**
  * @brief Write the global buffer to the given sector
- * 
+ *
  * @param one_sector as an uint8_t
  */
 void FLOG::_writeSector(uint8_t one_sector){ // Write sector of FLOG/OTA
-  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);  
+  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);
   ESP.flashWrite(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
 }
 /**
  * @brief Clear the global buffer, but leave the header intact
- * 
+ *
  */
 void FLOG::_clearBuffer(){ //not the header
   for (uint32_t i = sizeof(sector.header)/4; i<(sizeof(sector.dword_buffer)/4); i++){
@@ -174,7 +174,7 @@ void FLOG::_clearBuffer(){ //not the header
 }
 /**
  * @brief Write global buffer to FLASH and set the current sector to the next valid position, maybe to 0
- * 
+ *
  */
 void FLOG::_saveBufferToSector(){ // save buffer to already erased(!) sector, erase next sector, clear buffer, increment number
   DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to current sector: %u" ),current_sector);
@@ -193,7 +193,7 @@ void FLOG::_saveBufferToSector(){ // save buffer to already erased(!) sector, er
 
 /**
  * @brief Typically after restart find the first erased sector as a starting point for further operations
- * 
+ *
  */
 void FLOG::_findFirstErasedSector(){
   for (uint32_t i = 0; i<num_sectors; i++){
@@ -219,7 +219,7 @@ void FLOG::_findFirstErasedSector(){
 }
 /**
  * @brief Look at the sector before the first erased sector to check, if there could be saved data
- * 
+ *
  */
 void FLOG::_searchSaves(void){
   //check if old Data is present
@@ -260,13 +260,13 @@ void FLOG::_searchSaves(void){
 }
 /**
  * @brief Start with a new buffer to be able to start a write session
- * 
+ *
  */
 void FLOG::_initBuffer(void){
   if(!found_saved_data){ // we must re-init this, because the buffer is in an undefined state
-    sector.header.physical_start_sector = (uint16_t)first_erased_sector; 
+    sector.header.physical_start_sector = (uint16_t)first_erased_sector;
   }
-  DEBUG_SENSOR_LOG(PSTR("FLOG: init header")); 
+  DEBUG_SENSOR_LOG(PSTR("FLOG: init header"));
   sector.header.magic_word = MAGIC_WORD_FL; //F, L
   sector.header.number = 0;
   sector.header.buf_pointer = (uint16_t)sizeof(sector.header);
@@ -276,15 +276,15 @@ void FLOG::_initBuffer(void){
 }
 /**
  * @brief - a pure debug function
- * 
+ *
  */
 void FLOG::_showBuffer(void){
   DEBUG_SENSOR_LOG(PSTR("FLOG: Header: %c %c"), sector.byte_buffer[0],sector.byte_buffer[1]);
-  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer); 
+  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer);
   uint32_t j = 0;
-  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){ 
+  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){
       // DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %c %c %c %c %c %c %c %c  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
-      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);    
+      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
       j++;
       if(j>3){
         break;
@@ -294,7 +294,7 @@ void FLOG::_showBuffer(void){
 
 /**
  * @brief pass a data entry/record as uint8_t array with its size
- * 
+ *
  * @param src uint8_t array
  * @param size uint32_t size of the array
  */
@@ -327,7 +327,7 @@ void FLOG::addToBuffer(uint8_t src[], uint32_t size){
 
 /**
  * @brief shows that it is ready to accept recording
- * 
+ *
  * @param append - if true append to current log, else start a new log
  */
 void FLOG::startRecording(bool append){
@@ -339,14 +339,14 @@ void FLOG::startRecording(bool append){
     DEBUG_SENSOR_LOG(PSTR("FLOG: start recording"));
     _initBuffer();
     if(!found_saved_data) {
-      append = false; // nothing to append to, we silently start a new log 
+      append = false; // nothing to append to, we silently start a new log
     }
     if(append){
         sector.header.number = _saved_header.number+1; // continue with the next number
         sector.header.physical_start_sector = _saved_header.physical_start_sector; // keep the old start sector
     }
     else{ //new log, old data is lost
-        sector.header.physical_start_sector = (uint16_t)first_erased_sector; 
+        sector.header.physical_start_sector = (uint16_t)first_erased_sector;
         found_saved_data = false;
         sectors_left = 0;
     }
@@ -354,7 +354,7 @@ void FLOG::startRecording(bool append){
 
 /**
  * @brief stop recording including saving current buffer to FLASH
- * 
+ *
  */
 void FLOG::stopRecording(void){
       _saveBufferToSector();
@@ -367,16 +367,16 @@ void FLOG::stopRecording(void){
 
 /**
  * @brief Will start a downloads, needs the correct implementation of 3 callback functions
- * 
+ *
  * @param size:         size of the data entry/record in bytes, i.e. sizeof(myStruct)
  * @param sendHeader:   should implement at least something like:
  * @example             WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN); // This is very likely unknown!!
  *                      WebServer->sendHeader(F("Content-Disposition"), F("attachment; filename=myfile.txt"));
  * @param sendRecord:   will receive the memory address as "uint8_t* addr" and should consume the current entry/record
- * @example             myStruct_t *entry = (myStruct_t*)addr; 
+ * @example             myStruct_t *entry = (myStruct_t*)addr;
  *                      Then make useful Strings and send it, i.e.: WebServer->sendContent_P(myString);
- * @param sendFooter:   finish the download, should implement at least: 
- * @example             WebServer->sendContent(""); 
+ * @param sendFooter:   finish the download, should implement at least:
+ * @example             WebServer->sendContent("");
  */
   void FLOG::startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter){
 
@@ -409,7 +409,7 @@ void FLOG::stopRecording(void){
       else{
         bytes_left = 0;
         DEBUG_SENSOR_LOG(PSTR("FLOG: Flog->bytes_left not dividable by 8 ??????"));
-        }   
+        }
       }
     next_sector++;
     if(next_sector>num_sectors){
@@ -420,7 +420,7 @@ void FLOG::stopRecording(void){
     bytes_left = sector.header.buf_pointer - sizeof(sector.header);
     OsWatchLoop();
     delay(sleep);
-  }  
+  }
   running_download = false;
   // Callback 3: create a footer or simply finish the download with an empty payload
   sendFooter();
diff --git a/tasmota/support_float.ino b/tasmota/support_float.ino
index d08fc13f9..29613453a 100644
--- a/tasmota/support_float.ino
+++ b/tasmota/support_float.ino
@@ -1,7 +1,7 @@
 /*
   support_float.ino - Small floating point support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/support_legacy_cores.ino b/tasmota/support_legacy_cores.ino
index a4c26e8c9..f8c5b3060 100644
--- a/tasmota/support_legacy_cores.ino
+++ b/tasmota/support_legacy_cores.ino
@@ -1,7 +1,7 @@
 /*
   support_legacy_cores.ino - Legacy arduino core support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_rotary.ino b/tasmota/support_rotary.ino
index 1adf2423d..a7c9860c1 100644
--- a/tasmota/support_rotary.ino
+++ b/tasmota/support_rotary.ino
@@ -1,7 +1,7 @@
 /*
   support_rotary.ino - rotary switch support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino
index 823d0d650..03ebca18d 100644
--- a/tasmota/support_rtc.ino
+++ b/tasmota/support_rtc.ino
@@ -1,7 +1,7 @@
 /*
   support_rtc.ino - Real Time Clock support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_static_buffer.ino b/tasmota/support_static_buffer.ino
index b19ed931f..512ec0db1 100644
--- a/tasmota/support_static_buffer.ino
+++ b/tasmota/support_static_buffer.ino
@@ -1,7 +1,7 @@
 /*
   support_buffer.ino - Static binary buffer for Zigbee on Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/support_statistics.ino b/tasmota/support_statistics.ino
index 1907b1edc..59318e575 100644
--- a/tasmota/support_statistics.ino
+++ b/tasmota/support_statistics.ino
@@ -1,7 +1,7 @@
 /*
   support_statistics.ino - gather statistics for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index af085468a..b8ce8c646 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -1,7 +1,7 @@
 /*
   support_switch.ino - switch support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 28edd25c3..57ce2dd32 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1,7 +1,7 @@
 /*
   support_tasmota.ino - Core support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/support_udp.ino b/tasmota/support_udp.ino
index 9a33bcfed..71fb07490 100644
--- a/tasmota/support_udp.ino
+++ b/tasmota/support_udp.ino
@@ -1,7 +1,7 @@
 /*
   support_udp.ino - Udp support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp and Theo Arends
+  Copyright (C) 2020  Heiko Krupp and Theo Arends
 
   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
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 0d54723ca..3989f8c66 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -1,7 +1,7 @@
 /*
   support_wifi.ino - wifi support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 1f57a185f..4ed6ad7ef 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -1,7 +1,7 @@
 /*
   tasmota.h - Master header file for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 9b2ce358e..95c9285a2 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -1,7 +1,7 @@
 /*
   tasmota.ino - Tasmota firmware for iTead Sonoff, Wemos and NodeMCU hardware
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota_ca.ino b/tasmota/tasmota_ca.ino
index 3df65c9b9..8e75f891e 100644
--- a/tasmota/tasmota_ca.ino
+++ b/tasmota/tasmota_ca.ino
@@ -1,7 +1,7 @@
 /*
   tasmota_ca.ino - Certificate authorities for Tasmota, LetsEncrypt and AWS
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 8c7c65198..af2fe00f7 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -1,7 +1,7 @@
 /*
   tasmota_post.h - Post header file for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 24037dcbe..1793902eb 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -1,7 +1,7 @@
 /*
   tasmota_template.h - template settings for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index a1dac458d..4b410adf1 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -1,7 +1,7 @@
 /*
   tasmota_version.h - Version header file for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/user_config_override_sample.h b/tasmota/user_config_override_sample.h
index c70ec849f..5bd99175a 100644
--- a/tasmota/user_config_override_sample.h
+++ b/tasmota/user_config_override_sample.h
@@ -1,7 +1,7 @@
 /*
   user_config_override.h - user configuration overrides my_user_config.h for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index d2b405437..d5b838f0f 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_01_webserver.ino - webserver for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 3544ec070..5beac68f0 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_02_mqtt.ino - mqtt support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 95c73754f..900bb2767 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_03_energy.ino - Energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 84f0f5771..3c69eae38 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_04_light.ino - PWM, WS2812 and sonoff led support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
@@ -1874,7 +1874,7 @@ void LightSetOutputs(const uint16_t *cur_col_10) {
   char msg[24];
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"),
             ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
-  
+
   uint8_t cur_col[LST_MAX];
   for (uint32_t i = 0; i < LST_MAX; i++) {
     cur_col[i] = change10to8(cur_col_10[i]);
diff --git a/tasmota/xdrv_05_irremote.ino b/tasmota/xdrv_05_irremote.ino
index 7c66c4b98..3c9479937 100644
--- a/tasmota/xdrv_05_irremote.ino
+++ b/tasmota/xdrv_05_irremote.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_05_irremote.ino - infra red support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp, Lazar Obradovic and Theo Arends
+  Copyright (C) 2020  Heiko Krupp, Lazar Obradovic and Theo Arends
 
   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
diff --git a/tasmota/xdrv_05_irremote_full.ino b/tasmota/xdrv_05_irremote_full.ino
index d01291c7c..77fc3f7cc 100644
--- a/tasmota/xdrv_05_irremote_full.ino
+++ b/tasmota/xdrv_05_irremote_full.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_05_irremote_full.ino - complete integration of IRremoteESP8266 for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp, Lazar Obradovic, Theo Arends, Stephan Hadinger
+  Copyright (C) 2020  Heiko Krupp, Lazar Obradovic, Theo Arends, Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_06_snfbridge.ino b/tasmota/xdrv_06_snfbridge.ino
index a5385a4b6..c8e9db67e 100644
--- a/tasmota/xdrv_06_snfbridge.ino
+++ b/tasmota/xdrv_06_snfbridge.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_06_snfbridge.ino - sonoff RF bridge 433 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Erik Andrén Zachrisson (fw update)
+  Copyright (C) 2020  Theo Arends and Erik Andrén Zachrisson (fw update)
 
   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
diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index b20e0335c..b227c958f 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_07_domoticz.ino - domoticz support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_08_serial_bridge.ino b/tasmota/xdrv_08_serial_bridge.ino
index 2d9856186..3be49f6b2 100644
--- a/tasmota/xdrv_08_serial_bridge.ino
+++ b/tasmota/xdrv_08_serial_bridge.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_08_serial_bridge.ino - serial bridge support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Dániel Zoltán Tolnai
+  Copyright (C) 2020  Theo Arends and Dániel Zoltán Tolnai
 
   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
diff --git a/tasmota/xdrv_09_timers.ino b/tasmota/xdrv_09_timers.ino
index a6c7b23a9..b31a6a5ef 100644
--- a/tasmota/xdrv_09_timers.ino
+++ b/tasmota/xdrv_09_timers.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_09_timers.ino - timer support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 21c9de283..21b454e8c 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_10_rules.ino - rule support for Tasmota
 
-  Copyright (C) 2019  ESP Easy Group and Theo Arends
+  Copyright (C) 2020  ESP Easy Group and Theo Arends
 
   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
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index 29177482a..17ef36177 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_10_scripter.ino - script support for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xdrv_11_knx.ino b/tasmota/xdrv_11_knx.ino
index b52c37e4d..877ceb154 100644
--- a/tasmota/xdrv_11_knx.ino
+++ b/tasmota/xdrv_11_knx.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_11_knx.ino - KNX IP Protocol support for Tasmota
 
-  Copyright (C) 2019  Adrian Scillato  (https://github.com/ascillato)
+  Copyright (C) 2020  Adrian Scillato  (https://github.com/ascillato)
 
   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
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 50ac66761..03aeb3e6a 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_12_home_assistant.ino - home assistant support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_13_display.ino b/tasmota/xdrv_13_display.ino
index b34b8ed27..6dc29b6f4 100644
--- a/tasmota/xdrv_13_display.ino
+++ b/tasmota/xdrv_13_display.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_13_display.ino - Display support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_14_mp3.ino b/tasmota/xdrv_14_mp3.ino
index 14af8df56..c28f3e693 100644
--- a/tasmota/xdrv_14_mp3.ino
+++ b/tasmota/xdrv_14_mp3.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_14_mp3.ino - MP3 support for Tasmota
 
-  Copyright (C) 2019  gemu2015, mike2nl and Theo Arends
+  Copyright (C) 2020  gemu2015, mike2nl and Theo Arends
 
   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
diff --git a/tasmota/xdrv_15_pca9685.ino b/tasmota/xdrv_15_pca9685.ino
index b973d78eb..e4852ad92 100644
--- a/tasmota/xdrv_15_pca9685.ino
+++ b/tasmota/xdrv_15_pca9685.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_15_pca9685.ino - Support for I2C PCA9685 12bit 16 pin hardware PWM driver on Tasmota
 
-  Copyright (C) 2019  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Andre Thomas and Theo Arends
 
   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
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 27f0c11c2..a5f1df326 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_16_tuyamcu.ino - Tuya MCU support for Tasmota
 
-  Copyright (C) 2019  digiblur, Joel Stein and Theo Arends
+  Copyright (C) 2020  digiblur, Joel Stein and Theo Arends
 
   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
diff --git a/tasmota/xdrv_17_rcswitch.ino b/tasmota/xdrv_17_rcswitch.ino
index 156535876..4462a5e21 100644
--- a/tasmota/xdrv_17_rcswitch.ino
+++ b/tasmota/xdrv_17_rcswitch.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_17_rcswitch.ino - RF transceiver using RcSwitch library for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_18_armtronix_dimmers.ino b/tasmota/xdrv_18_armtronix_dimmers.ino
index 2c60c8170..4a1322b25 100644
--- a/tasmota/xdrv_18_armtronix_dimmers.ino
+++ b/tasmota/xdrv_18_armtronix_dimmers.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_18_armtronix_dimmers.ino - Armtronix dimmers support for Tasmota
 
-  Copyright (C) 2019  wvdv2002 and Theo Arends
+  Copyright (C) 2020  wvdv2002 and Theo Arends
 
   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
diff --git a/tasmota/xdrv_19_ps16dz_dimmer.ino b/tasmota/xdrv_19_ps16dz_dimmer.ino
index fa153703b..ab07289f7 100644
--- a/tasmota/xdrv_19_ps16dz_dimmer.ino
+++ b/tasmota/xdrv_19_ps16dz_dimmer.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_19_ps16dz.dimmer.ino - PS_16_DZ dimmer support for Tasmota
 
-  Copyright (C) 2019  Joel Stein and Theo Arends
+  Copyright (C) 2020  Joel Stein and Theo Arends
 
   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
diff --git a/tasmota/xdrv_20_hue.ino b/tasmota/xdrv_20_hue.ino
index c9f0031b0..1df6543ac 100644
--- a/tasmota/xdrv_20_hue.ino
+++ b/tasmota/xdrv_20_hue.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_20_hue.ino - Philips Hue support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp and Theo Arends
+  Copyright (C) 2020  Heiko Krupp and Theo Arends
 
   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
diff --git a/tasmota/xdrv_21_wemo.ino b/tasmota/xdrv_21_wemo.ino
index 13e867ae6..6aef27311 100644
--- a/tasmota/xdrv_21_wemo.ino
+++ b/tasmota/xdrv_21_wemo.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_21_wemo.ino - wemo support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp and Theo Arends
+  Copyright (C) 2020  Heiko Krupp and Theo Arends
 
   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
diff --git a/tasmota/xdrv_22_sonoff_ifan.ino b/tasmota/xdrv_22_sonoff_ifan.ino
index b7761befe..8c6ceffb6 100644
--- a/tasmota/xdrv_22_sonoff_ifan.ino
+++ b/tasmota/xdrv_22_sonoff_ifan.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_22_sonoff_ifan.ino - sonoff iFan02 and iFan03 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_23_zigbee_0_constants.ino b/tasmota/xdrv_23_zigbee_0_constants.ino
index f83acf21b..a37969f8b 100644
--- a/tasmota/xdrv_23_zigbee_0_constants.ino
+++ b/tasmota/xdrv_23_zigbee_0_constants.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee_constants.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_1_headers.ino b/tasmota/xdrv_23_zigbee_1_headers.ino
index 8bfc59b70..101d5703d 100644
--- a/tasmota/xdrv_23_zigbee_1_headers.ino
+++ b/tasmota/xdrv_23_zigbee_1_headers.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee_1_headers.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 1ec18d3e1..1d793f730 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 94853d629..58b055d2b 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee_converters.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
@@ -534,7 +534,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   // { 0x0008, 0x0012,  "OnTransitionTime",     &Z_Copy },
   // { 0x0008, 0x0013,  "OffTransitionTime",    &Z_Copy },
   // { 0x0008, 0x0014,  "DefaultMoveRate",      &Z_Copy },
-  
+
   // Alarms cluster
   { 0x0009, 0x0000,  "AlarmCount",           &Z_Copy },
   // Time cluster
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 70a8f0788..4c9b0672f 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee_converters.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 261a4ac6a..520dbd232 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index fcfeb06a7..d396b3fc4 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 59cf382b0..70c5659ca 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_23_zigbee.ino - zigbee support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Stephan Hadinger
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
 
   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
diff --git a/tasmota/xdrv_24_buzzer.ino b/tasmota/xdrv_24_buzzer.ino
index 968f91cad..9cfa7e111 100644
--- a/tasmota/xdrv_24_buzzer.ino
+++ b/tasmota/xdrv_24_buzzer.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_24_Buzzer.ino - buzzer support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_25_A4988_Stepper.ino b/tasmota/xdrv_25_A4988_Stepper.ino
index 736d86e24..d6456f2a1 100644
--- a/tasmota/xdrv_25_A4988_Stepper.ino
+++ b/tasmota/xdrv_25_A4988_Stepper.ino
@@ -2,7 +2,7 @@
 /*
   xdrv_25_a4988_stepper.ino - A4988 StepMotorDriverCircuit- support for Tasmota
 
-  Copyright (C) 2019  Tim Leuscher and Theo Arends
+  Copyright (C) 2020  Tim Leuscher and Theo Arends
 
   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
diff --git a/tasmota/xdrv_26_ariluxrf.ino b/tasmota/xdrv_26_ariluxrf.ino
index 583f9a9bc..2a6c73eaf 100644
--- a/tasmota/xdrv_26_ariluxrf.ino
+++ b/tasmota/xdrv_26_ariluxrf.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_26_ariluxrf.ino - Arilux Rf support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 0f7ae0195..457d2870f 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_27_shutter.ino - Shutter/Blind support for Tasmota
 
-  Copyright (C) 2019  Stefan Bode
+  Copyright (C) 2020  Stefan Bode
 
   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
diff --git a/tasmota/xdrv_28_pcf8574.ino b/tasmota/xdrv_28_pcf8574.ino
index 212217a49..ecbde786c 100644
--- a/tasmota/xdrv_28_pcf8574.ino
+++ b/tasmota/xdrv_28_pcf8574.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_28_pcf8574.ino - PCF8574 I2C support for Tasmota
 
-  Copyright (C) 2019  Stefan Bode
+  Copyright (C) 2020  Stefan Bode
 
   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
diff --git a/tasmota/xdrv_29_deepsleep.ino b/tasmota/xdrv_29_deepsleep.ino
index 69eed78f1..69366cdd8 100644
--- a/tasmota/xdrv_29_deepsleep.ino
+++ b/tasmota/xdrv_29_deepsleep.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_29_deepsleep.ino - DeepSleep support for Tasmota
 
-  Copyright (C) 2019  Stefan Bode
+  Copyright (C) 2020  Stefan Bode
 
   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
diff --git a/tasmota/xdrv_30_exs_dimmer.ino b/tasmota/xdrv_30_exs_dimmer.ino
index 4945bf928..765fba1c6 100644
--- a/tasmota/xdrv_30_exs_dimmer.ino
+++ b/tasmota/xdrv_30_exs_dimmer.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_30_exs_dimmer.ino - ex-store dimmer support for Tasmota
 
-  Copyright (C) 2019  Andreas Schultz
+  Copyright (C) 2020  Andreas Schultz
 
   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
diff --git a/tasmota/xdrv_31_tasmota_slave.ino b/tasmota/xdrv_31_tasmota_slave.ino
index 2f5369a12..a30e05bd3 100644
--- a/tasmota/xdrv_31_tasmota_slave.ino
+++ b/tasmota/xdrv_31_tasmota_slave.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_31_tasmota_slave.ino - Support for external microcontroller slave on serial
 
-  Copyright (C) 2019  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Andre Thomas and Theo Arends
 
   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
diff --git a/tasmota/xdrv_32_hotplug.ino b/tasmota/xdrv_32_hotplug.ino
index 7c368b45f..bfdafbd4b 100644
--- a/tasmota/xdrv_32_hotplug.ino
+++ b/tasmota/xdrv_32_hotplug.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_32_hotplug.ino - HotPlug support for sensors
 
-  Copyright (C) 2019  Leonid Myravjev
+  Copyright (C) 2020  Leonid Myravjev
 
   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
diff --git a/tasmota/xdrv_99_debug.ino b/tasmota/xdrv_99_debug.ino
index 22bc5e162..538ac7f71 100644
--- a/tasmota/xdrv_99_debug.ino
+++ b/tasmota/xdrv_99_debug.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_99_debug.ino - debug support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xdrv_interface.ino b/tasmota/xdrv_interface.ino
index 7494cfd9a..595caf04b 100644
--- a/tasmota/xdrv_interface.ino
+++ b/tasmota/xdrv_interface.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_interface.ino - Driver interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends inspired by ESPEasy
+  Copyright (C) 2020  Theo Arends inspired by ESPEasy
 
   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
diff --git a/tasmota/xdsp_01_lcd.ino b/tasmota/xdsp_01_lcd.ino
index ce28201e9..3fb17b9d4 100644
--- a/tasmota/xdsp_01_lcd.ino
+++ b/tasmota/xdsp_01_lcd.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_01_lcd.ino - Display LCD support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Adafruit
+  Copyright (C) 2020  Theo Arends and Adafruit
 
   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
diff --git a/tasmota/xdsp_02_ssd1306.ino b/tasmota/xdsp_02_ssd1306.ino
index 0bee9d10d..8cf938c6c 100644
--- a/tasmota/xdsp_02_ssd1306.ino
+++ b/tasmota/xdsp_02_ssd1306.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_02_ssd1306.ino - Display Oled SSD1306 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Adafruit
+  Copyright (C) 2020  Theo Arends and Adafruit
 
   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
diff --git a/tasmota/xdsp_03_matrix.ino b/tasmota/xdsp_03_matrix.ino
index e5a613a29..c6722a8e5 100644
--- a/tasmota/xdsp_03_matrix.ino
+++ b/tasmota/xdsp_03_matrix.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_03_matrix.ino - Display 8x8 matrix support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Adafruit
+  Copyright (C) 2020  Theo Arends and Adafruit
 
   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
diff --git a/tasmota/xdsp_04_ili9341.ino b/tasmota/xdsp_04_ili9341.ino
index f3b80e73a..5ad269e82 100644
--- a/tasmota/xdsp_04_ili9341.ino
+++ b/tasmota/xdsp_04_ili9341.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_04_ili9341.ino - Display Tft Ili9341 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Adafruit
+  Copyright (C) 2020  Theo Arends and Adafruit
 
   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
diff --git a/tasmota/xdsp_05_epaper_29.ino b/tasmota/xdsp_05_epaper_29.ino
index 47ed941c5..946fc6343 100644
--- a/tasmota/xdsp_05_epaper_29.ino
+++ b/tasmota/xdsp_05_epaper_29.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_05_epaper.ino - Display e-paper support for Tasmota
 
-  Copyright (C) 2019  Theo Arends, Gerhard Mutz and Waveshare
+  Copyright (C) 2020  Theo Arends, Gerhard Mutz and Waveshare
 
   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
diff --git a/tasmota/xdsp_06_epaper_42.ino b/tasmota/xdsp_06_epaper_42.ino
index 1a9c9d557..7a19ebb7f 100644
--- a/tasmota/xdsp_06_epaper_42.ino
+++ b/tasmota/xdsp_06_epaper_42.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_05_epaper.ino - Display e-paper support for Tasmota
 
-  Copyright (C) 2019  Theo Arends, Gerhard Mutz and Waveshare
+  Copyright (C) 2020  Theo Arends, Gerhard Mutz and Waveshare
 
   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
diff --git a/tasmota/xdsp_07_sh1106.ino b/tasmota/xdsp_07_sh1106.ino
index 00babbdf9..83a43f87a 100644
--- a/tasmota/xdsp_07_sh1106.ino
+++ b/tasmota/xdsp_07_sh1106.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_07_SH1106.ino - Display Oled SH1106 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Adafruit
+  Copyright (C) 2020  Theo Arends and Adafruit
 
   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
diff --git a/tasmota/xdsp_08_ILI9488.ino b/tasmota/xdsp_08_ILI9488.ino
index b37e0fa15..8b7438c5a 100644
--- a/tasmota/xdsp_08_ILI9488.ino
+++ b/tasmota/xdsp_08_ILI9488.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_08_ILI9488.ino - Display ILI9488 support for Tasmota
 
-  Copyright (C) 2019  Theo Arends, Gerhard Mutz
+  Copyright (C) 2020  Theo Arends, Gerhard Mutz
 
   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
diff --git a/tasmota/xdsp_09_SSD1351.ino b/tasmota/xdsp_09_SSD1351.ino
index 0391bf8f4..be7138f65 100644
--- a/tasmota/xdsp_09_SSD1351.ino
+++ b/tasmota/xdsp_09_SSD1351.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_09_SSD1351.ino - Display SSD1351 support for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xdsp_10_RA8876.ino b/tasmota/xdsp_10_RA8876.ino
index 205d91253..139a654ed 100644
--- a/tasmota/xdsp_10_RA8876.ino
+++ b/tasmota/xdsp_10_RA8876.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_09_SSD1351.ino - Display SSD1351 support for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xdsp_interface.ino b/tasmota/xdsp_interface.ino
index d959a19f3..f713bf2de 100644
--- a/tasmota/xdsp_interface.ino
+++ b/tasmota/xdsp_interface.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_interface.ino - Display interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xlgt_01_ws2812.ino b/tasmota/xlgt_01_ws2812.ino
index acf6e46ca..f6d332198 100644
--- a/tasmota/xlgt_01_ws2812.ino
+++ b/tasmota/xlgt_01_ws2812.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_01_ws2812.ino - led string support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xlgt_02_my92x1.ino b/tasmota/xlgt_02_my92x1.ino
index 254f1e78a..69bccaf36 100644
--- a/tasmota/xlgt_02_my92x1.ino
+++ b/tasmota/xlgt_02_my92x1.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_02_my92x1.ino - led support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xlgt_03_sm16716.ino b/tasmota/xlgt_03_sm16716.ino
index 6ae2066e4..8332c80d1 100644
--- a/tasmota/xlgt_03_sm16716.ino
+++ b/tasmota/xlgt_03_sm16716.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_03_sm16716.ino - sm16716 three channel led support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
@@ -21,7 +21,7 @@
 #ifdef USE_SM16716
 /*********************************************************************************************\
  * SM16716 - Controlling RGB over a synchronous serial line
- * Copyright (C) 2019  Gabor Simon
+ * Copyright (C) 2020  Gabor Simon
  *
  * Source: https://community.home-assistant.io/t/cheap-uk-wifi-bulbs-with-tasmota-teardown-help-tywe3s/40508/27
 \*********************************************************************************************/
diff --git a/tasmota/xlgt_04_sm2135.ino b/tasmota/xlgt_04_sm2135.ino
index f256d08cc..a77108dbb 100644
--- a/tasmota/xlgt_04_sm2135.ino
+++ b/tasmota/xlgt_04_sm2135.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_04_sm2135.ino - sm2135 five channel led support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xlgt_05_sonoff_l1.ino b/tasmota/xlgt_05_sonoff_l1.ino
index e6befa564..3caf1b06d 100644
--- a/tasmota/xlgt_05_sonoff_l1.ino
+++ b/tasmota/xlgt_05_sonoff_l1.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_05_sonoff_l1.ino - Sonoff L1 led support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xlgt_interface.ino b/tasmota/xlgt_interface.ino
index e0165861a..b38481fb1 100644
--- a/tasmota/xlgt_interface.ino
+++ b/tasmota/xlgt_interface.ino
@@ -1,7 +1,7 @@
 /*
   xlgt_interface.ino - Light driver interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_01_hlw8012.ino b/tasmota/xnrg_01_hlw8012.ino
index 3b01eaea7..4cbe111cd 100644
--- a/tasmota/xnrg_01_hlw8012.ino
+++ b/tasmota/xnrg_01_hlw8012.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_01_hlw8012.ino - HLW8012 (Sonoff Pow) energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index b148c5461..3b532c5b8 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_02_cse7766.ino - CSE7766 and HLW8032 energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_03_pzem004t.ino b/tasmota/xnrg_03_pzem004t.ino
index 0ab29d778..466298b0f 100644
--- a/tasmota/xnrg_03_pzem004t.ino
+++ b/tasmota/xnrg_03_pzem004t.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_03_pzem004t.ino - PZEM004T energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_04_mcp39f501.ino b/tasmota/xnrg_04_mcp39f501.ino
index d5a5dde4a..92eec2013 100644
--- a/tasmota/xnrg_04_mcp39f501.ino
+++ b/tasmota/xnrg_04_mcp39f501.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_04_mcp39f501.ino - MCP39F501 energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_05_pzem_ac.ino b/tasmota/xnrg_05_pzem_ac.ino
index 0e9e68a40..86c4355aa 100644
--- a/tasmota/xnrg_05_pzem_ac.ino
+++ b/tasmota/xnrg_05_pzem_ac.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_05_pzem_ac.ino - PZEM-014,016 Modbus AC energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_06_pzem_dc.ino b/tasmota/xnrg_06_pzem_dc.ino
index ec32e5d73..961e4f854 100644
--- a/tasmota/xnrg_06_pzem_dc.ino
+++ b/tasmota/xnrg_06_pzem_dc.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_06_pzem_dc.ino - PZEM-003,017 Modbus DC energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_07_ade7953.ino b/tasmota/xnrg_07_ade7953.ino
index 8643af065..46f2ebd81 100644
--- a/tasmota/xnrg_07_ade7953.ino
+++ b/tasmota/xnrg_07_ade7953.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_07_ade7953.ino - ADE7953 energy sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xnrg_08_sdm120.ino b/tasmota/xnrg_08_sdm120.ino
index 75c0962e9..e41323a73 100644
--- a/tasmota/xnrg_08_sdm120.ino
+++ b/tasmota/xnrg_08_sdm120.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_08_sdm120.ino - Eastron SDM120-Modbus energy meter support for Tasmota
 
-  Copyright (C) 2019  Gennaro Tortone and Theo Arends
+  Copyright (C) 2020  Gennaro Tortone and Theo Arends
 
   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
diff --git a/tasmota/xnrg_09_dds2382.ino b/tasmota/xnrg_09_dds2382.ino
index 8711af42a..b211fa698 100644
--- a/tasmota/xnrg_09_dds2382.ino
+++ b/tasmota/xnrg_09_dds2382.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_09_dds2382.ino - Hiking DDS238-2 Modbus energy meter support for Tasmota
 
-  Copyright (C) 2019  Matteo Campanella - based on the work of Gennaro Tortone
+  Copyright (C) 2020  Matteo Campanella - based on the work of Gennaro Tortone
 
   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
diff --git a/tasmota/xnrg_10_sdm630.ino b/tasmota/xnrg_10_sdm630.ino
index 31fb70031..81b8bdcbf 100644
--- a/tasmota/xnrg_10_sdm630.ino
+++ b/tasmota/xnrg_10_sdm630.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_10_sdm630.ino - Eastron SDM630-Modbus energy meter support for Tasmota
 
-  Copyright (C) 2019  Gennaro Tortone and Theo Arends
+  Copyright (C) 2020  Gennaro Tortone and Theo Arends
 
   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
diff --git a/tasmota/xnrg_11_ddsu666.ino b/tasmota/xnrg_11_ddsu666.ino
index daaadd72b..6299f4f4a 100644
--- a/tasmota/xnrg_11_ddsu666.ino
+++ b/tasmota/xnrg_11_ddsu666.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_11_ddsu666.ino - Chint DDSU666-Modbus energy meter support for Tasmota
 
-  Copyright (C) 2019  Pablo Zerón and Theo Arends
+  Copyright (C) 2020  Pablo Zerón and Theo Arends
 
   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
diff --git a/tasmota/xnrg_12_solaxX1.ino b/tasmota/xnrg_12_solaxX1.ino
index 910ca5822..e9da3147d 100644
--- a/tasmota/xnrg_12_solaxX1.ino
+++ b/tasmota/xnrg_12_solaxX1.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_12_solaxX1.ino - Solax X1 inverter RS485 support for Tasmota
 
-  Copyright (C) 2019  Pablo Zerón
+  Copyright (C) 2020  Pablo Zerón
 
   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
diff --git a/tasmota/xnrg_interface.ino b/tasmota/xnrg_interface.ino
index 897d6f8d8..b0a4784f5 100644
--- a/tasmota/xnrg_interface.ino
+++ b/tasmota/xnrg_interface.ino
@@ -1,7 +1,7 @@
 /*
   xnrg_interface.ino - Energy driver interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends inspired by ESPEasy
+  Copyright (C) 2020  Theo Arends inspired by ESPEasy
 
   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
diff --git a/tasmota/xsns_01_counter.ino b/tasmota/xsns_01_counter.ino
index 985216392..095693771 100644
--- a/tasmota/xsns_01_counter.ino
+++ b/tasmota/xsns_01_counter.ino
@@ -1,7 +1,7 @@
 /*
   xsns_01_counter.ino - Counter sensors (water meters, electricity meters etc.) sensor support for Tasmota
 
-  Copyright (C) 2019  Maarten Damen and Theo Arends
+  Copyright (C) 2020  Maarten Damen and Theo Arends
 
   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
diff --git a/tasmota/xsns_02_analog.ino b/tasmota/xsns_02_analog.ino
index 5bfe8c26d..f4de98d9a 100644
--- a/tasmota/xsns_02_analog.ino
+++ b/tasmota/xsns_02_analog.ino
@@ -1,7 +1,7 @@
 /*
   xsns_02_analog.ino - ESP8266 ADC support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_04_snfsc.ino b/tasmota/xsns_04_snfsc.ino
index 7f83f4e06..463882942 100644
--- a/tasmota/xsns_04_snfsc.ino
+++ b/tasmota/xsns_04_snfsc.ino
@@ -1,7 +1,7 @@
 /*
   xsns_04_snfsc.ino - sonoff SC support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_05_ds18x20.ino b/tasmota/xsns_05_ds18x20.ino
index 01159239e..4168eaa32 100644
--- a/tasmota/xsns_05_ds18x20.ino
+++ b/tasmota/xsns_05_ds18x20.ino
@@ -1,7 +1,7 @@
 /*
   xsns_05_ds18x20.ino - DS18x20 temperature sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_06_dht.ino b/tasmota/xsns_06_dht.ino
index 6ef7055ac..1c45a550e 100644
--- a/tasmota/xsns_06_dht.ino
+++ b/tasmota/xsns_06_dht.ino
@@ -1,7 +1,7 @@
 /*
   xsns_06_dht.ino - DHTxx, AM23xx and SI7021 temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_07_sht1x.ino b/tasmota/xsns_07_sht1x.ino
index eab315aa2..9679728f8 100644
--- a/tasmota/xsns_07_sht1x.ino
+++ b/tasmota/xsns_07_sht1x.ino
@@ -1,7 +1,7 @@
 /*
   xsns_07_sht1x.ino - SHT1x temperature and sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_08_htu21.ino b/tasmota/xsns_08_htu21.ino
index ec5a5c1ac..704952a4b 100644
--- a/tasmota/xsns_08_htu21.ino
+++ b/tasmota/xsns_08_htu21.ino
@@ -1,7 +1,7 @@
 /*
   xsns_08_htu21.ino - HTU21 temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp and Theo Arends
+  Copyright (C) 2020  Heiko Krupp and Theo Arends
 
   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
diff --git a/tasmota/xsns_09_bmp.ino b/tasmota/xsns_09_bmp.ino
index 9eeb70bd4..8f49e1bea 100644
--- a/tasmota/xsns_09_bmp.ino
+++ b/tasmota/xsns_09_bmp.ino
@@ -1,7 +1,7 @@
 /*
   xsns_09_bmp.ino - BMP pressure, temperature, humidity and gas sensor support for Tasmota
 
-  Copyright (C) 2019  Heiko Krupp and Theo Arends
+  Copyright (C) 2020  Heiko Krupp and Theo Arends
 
   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
diff --git a/tasmota/xsns_10_bh1750.ino b/tasmota/xsns_10_bh1750.ino
index cc6c9a45b..044089368 100644
--- a/tasmota/xsns_10_bh1750.ino
+++ b/tasmota/xsns_10_bh1750.ino
@@ -1,7 +1,7 @@
 /*
   xsns_10_bh1750.ino - BH1750 ambient light sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_11_veml6070.ino b/tasmota/xsns_11_veml6070.ino
index c1ab7816e..600364503 100644
--- a/tasmota/xsns_11_veml6070.ino
+++ b/tasmota/xsns_11_veml6070.ino
@@ -1,7 +1,7 @@
 /*
   xsns_11_veml6070.ino - VEML6070 ultra violet light sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_12_ads1115.ino b/tasmota/xsns_12_ads1115.ino
index eb21d943f..0faa24dd0 100644
--- a/tasmota/xsns_12_ads1115.ino
+++ b/tasmota/xsns_12_ads1115.ino
@@ -1,7 +1,7 @@
 /*
   xsns_12_ads1115_ada.ino - ADS1115 A/D Converter support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_13_ina219.ino b/tasmota/xsns_13_ina219.ino
index c764c7535..e1177e35f 100644
--- a/tasmota/xsns_13_ina219.ino
+++ b/tasmota/xsns_13_ina219.ino
@@ -1,7 +1,7 @@
 /*
   xsns_13_ina219.ino - INA219 Current Sensor support for Tasmota
 
-  Copyright (C) 2019  Stefan Bode and Theo Arends
+  Copyright (C) 2020  Stefan Bode and Theo Arends
 
   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
diff --git a/tasmota/xsns_14_sht3x.ino b/tasmota/xsns_14_sht3x.ino
index 3f7c1ce9b..521231d50 100644
--- a/tasmota/xsns_14_sht3x.ino
+++ b/tasmota/xsns_14_sht3x.ino
@@ -1,7 +1,7 @@
 /*
   xsns_14_sht3x.ino - SHT3X temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_15_mhz19.ino b/tasmota/xsns_15_mhz19.ino
index eda3da002..860eec8ce 100644
--- a/tasmota/xsns_15_mhz19.ino
+++ b/tasmota/xsns_15_mhz19.ino
@@ -1,7 +1,7 @@
 /*
   xsns_15_mhz19.ino - MH-Z19(B) CO2 sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_16_tsl2561.ino b/tasmota/xsns_16_tsl2561.ino
index 2c17469d2..99c243329 100644
--- a/tasmota/xsns_16_tsl2561.ino
+++ b/tasmota/xsns_16_tsl2561.ino
@@ -1,7 +1,7 @@
 /*
   xsns_16_tsl2561.ino - TSL2561 light sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends and Joachim Banzhaf
+  Copyright (C) 2020  Theo Arends and Joachim Banzhaf
 
   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
diff --git a/tasmota/xsns_17_senseair.ino b/tasmota/xsns_17_senseair.ino
index 8a8a925b7..27706a69f 100644
--- a/tasmota/xsns_17_senseair.ino
+++ b/tasmota/xsns_17_senseair.ino
@@ -1,7 +1,7 @@
 /*
   xsns_17_senseair.ino - SenseAir CO2 sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_18_pms5003.ino b/tasmota/xsns_18_pms5003.ino
index 4943b4a69..0909921dc 100644
--- a/tasmota/xsns_18_pms5003.ino
+++ b/tasmota/xsns_18_pms5003.ino
@@ -1,7 +1,7 @@
 /*
   xsns_18_pms5003.ino - PMS3003, PMS5003, PMS7003 particle concentration sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_19_mgs.ino b/tasmota/xsns_19_mgs.ino
index 3d289b99e..5a36183f8 100644
--- a/tasmota/xsns_19_mgs.ino
+++ b/tasmota/xsns_19_mgs.ino
@@ -1,7 +1,7 @@
 /*
   xsns_19_mgs.ino - Xadow and Grove Mutichannel Gas sensor support for Tasmota
 
-  Copyright (C) 2019  Palich2000 and Theo Arends
+  Copyright (C) 2020  Palich2000 and Theo Arends
 
   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
diff --git a/tasmota/xsns_20_novasds.ino b/tasmota/xsns_20_novasds.ino
index f0902bf37..0b1580dde 100644
--- a/tasmota/xsns_20_novasds.ino
+++ b/tasmota/xsns_20_novasds.ino
@@ -1,7 +1,7 @@
 /*
   xsns_20_novasds.ino - Nova SDS011/SDS021 particle concentration sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_21_sgp30.ino b/tasmota/xsns_21_sgp30.ino
index 721cd4300..e3aa2e9e8 100644
--- a/tasmota/xsns_21_sgp30.ino
+++ b/tasmota/xsns_21_sgp30.ino
@@ -1,7 +1,7 @@
 /*
   xsns_21_sgp30.ino - SGP30 gas and air quality sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_22_sr04.ino b/tasmota/xsns_22_sr04.ino
index c3d27872e..636992a57 100644
--- a/tasmota/xsns_22_sr04.ino
+++ b/tasmota/xsns_22_sr04.ino
@@ -1,7 +1,7 @@
 /*
   xsns_22_sr04.ino - SR04 ultrasonic sensor support for Tasmota
 
-  Copyright (C) 2019  Nuno Ferreira and Theo Arends
+  Copyright (C) 2020  Nuno Ferreira and Theo Arends
 
   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
@@ -42,7 +42,7 @@ TasmotaSerial* sonar_serial = nullptr;
 
 
 uint8_t Sr04TModeDetect(void)
-{  
+{
   sr04_type = 0;
   if (pin[GPIO_SR04_ECHO]>=99) return sr04_type;
 
@@ -50,11 +50,11 @@ uint8_t Sr04TModeDetect(void)
   sr04_trig_pin = (pin[GPIO_SR04_TRIG] < 99) ? pin[GPIO_SR04_TRIG] : -1;
   sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
 
-  if (sonar_serial->begin(9600,1)) {    
+  if (sonar_serial->begin(9600,1)) {
     DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode"));
-    
+
     if (sr04_trig_pin!=-1) {
-        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;        
+        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;
     } else {
         sr04_type = 2;
     }
@@ -90,34 +90,34 @@ uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third)
     return second;
   } else {
     return third;
-  }  
+  }
 }
 
 uint16_t Sr04TMode3Distance() {
-  
+
     sonar_serial->write(0x55);
     sonar_serial->flush();
 
     return Sr04TMode2Distance();
 }
 
-uint16_t Sr04TMode2Distance(void) 
-{ 
+uint16_t Sr04TMode2Distance(void)
+{
   sonar_serial->setTimeout(300);
   const char startByte = 0xff;
-  
+
   if (!sonar_serial->find(startByte)) {
       //DEBUG_SENSOR_LOG(PSTR("SR04: No start byte"));
       return NO_ECHO;
-  }  
-  
+  }
+
   delay(5);
 
   uint8_t crc = sonar_serial->read();
   //read high byte
-  uint16_t distance = ((uint16_t)crc) << 8;  
+  uint16_t distance = ((uint16_t)crc) << 8;
 
-  //read low byte  
+  //read low byte
   distance += sonar_serial->read();
   crc += distance & 0x00ff;
   crc += 0x00FF;
@@ -126,20 +126,20 @@ uint16_t Sr04TMode2Distance(void)
   if (crc != sonar_serial->read()) {
     AddLog_P2(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error."));
     return NO_ECHO;
-  }  
+  }
   //DEBUG_SENSOR_LOG(PSTR("SR04: Distance: %d"), distance);
-  return distance;  
+  return distance;
 }
 
 void Sr04TReading(void) {
-  
+
   if (sonar_serial==nullptr && sonar==nullptr) {
     Sr04TModeDetect();
   }
 
   switch (sr04_type) {
       case 3:
-        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10; //convert to cm        
+        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10; //convert to cm
         break;
       case 2:
         //empty input buffer first
@@ -162,7 +162,7 @@ const char HTTP_SNS_DISTANCE[] PROGMEM =
 #endif  // USE_WEBSERVER
 
 void Sr04Show(bool json)
-{  
+{
 
   if (distance != 0) {                // Check if read failed
     char distance_chr[33];
diff --git a/tasmota/xsns_24_si1145.ino b/tasmota/xsns_24_si1145.ino
index 336cdbc8a..ad89cad3b 100644
--- a/tasmota/xsns_24_si1145.ino
+++ b/tasmota/xsns_24_si1145.ino
@@ -1,7 +1,7 @@
 /*
   xsns_24_si1145.ino - SI1145/46/47 UV Index / IR / Visible light sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_26_lm75ad.ino b/tasmota/xsns_26_lm75ad.ino
index 78a85ad2b..5b735dcb7 100644
--- a/tasmota/xsns_26_lm75ad.ino
+++ b/tasmota/xsns_26_lm75ad.ino
@@ -1,7 +1,7 @@
 /*
   xsns_26_lm75ad.ino - Support for I2C LM75AD Temperature Sensor
 
-  Copyright (C) 2019  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Andre Thomas and Theo Arends
 
   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
@@ -53,7 +53,7 @@ void LM75ADDetect(void)
 {
   for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
     lm75ad_address = lm75ad_addresses[i];
-    if (I2cActive(lm75ad_address)) { 
+    if (I2cActive(lm75ad_address)) {
       continue; }
     if (!I2cSetDevice(lm75ad_address)) {
       break; // do not make the next step without a confirmed device on the bus
diff --git a/tasmota/xsns_27_apds9960.ino b/tasmota/xsns_27_apds9960.ino
index 87405a019..fe8f0ffec 100644
--- a/tasmota/xsns_27_apds9960.ino
+++ b/tasmota/xsns_27_apds9960.ino
@@ -1,7 +1,7 @@
 /*
   xsns_27_apds9960.ino - Support for I2C APDS9960 Proximity Sensor for Tasmota
 
-  Copyright (C) 2019  Shawn Hymel/Sparkfun and Theo Arends
+  Copyright (C) 2020  Shawn Hymel/Sparkfun and Theo Arends
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/tasmota/xsns_28_tm1638.ino b/tasmota/xsns_28_tm1638.ino
index 0f6a19078..da4de6999 100644
--- a/tasmota/xsns_28_tm1638.ino
+++ b/tasmota/xsns_28_tm1638.ino
@@ -1,7 +1,7 @@
 /*
   xsns_28_tm1638.ino - TM1638 8 switch, led and 7 segment unit support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_29_mcp230xx.ino b/tasmota/xsns_29_mcp230xx.ino
index 37776b626..0a831d869 100644
--- a/tasmota/xsns_29_mcp230xx.ino
+++ b/tasmota/xsns_29_mcp230xx.ino
@@ -1,7 +1,7 @@
 /*
   xsns_29_mcp230xx.ino - Support for I2C MCP23008/MCP23017 GPIO Expander on Tasmota
 
-  Copyright (C) 2019  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Andre Thomas and Theo Arends
 
   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
diff --git a/tasmota/xsns_30_mpr121.ino b/tasmota/xsns_30_mpr121.ino
index eb6b82993..9522f5383 100644
--- a/tasmota/xsns_30_mpr121.ino
+++ b/tasmota/xsns_30_mpr121.ino
@@ -1,3 +1,22 @@
+/*
+  xsns_30_mpr121.ino - MPR121 support for Tasmota
+
+  Copyright (C) 2020  Rene 'Renne' Bartsch and Theo Arends
+
+  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/>.
+*/
+
 /**
  *
  *  @file        xsns_30_mpr121.ino
@@ -24,22 +43,6 @@
  *  @license     GNU GPL v.3
  */
 
- /*
- *  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/>.
-*/
-
-
 #ifdef USE_I2C
 #ifdef USE_MPR121
 
diff --git a/tasmota/xsns_31_ccs811.ino b/tasmota/xsns_31_ccs811.ino
index e9729d174..a968319cb 100644
--- a/tasmota/xsns_31_ccs811.ino
+++ b/tasmota/xsns_31_ccs811.ino
@@ -1,7 +1,7 @@
 /*
   xsns_31_ccs811.ino - CCS811 gas and air quality sensor support for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_32_mpu6050.ino b/tasmota/xsns_32_mpu6050.ino
index bcec100b0..702d23224 100644
--- a/tasmota/xsns_32_mpu6050.ino
+++ b/tasmota/xsns_32_mpu6050.ino
@@ -1,7 +1,7 @@
 /*
   xsns_32_mpu6050.ino - MPU6050 gyroscope and temperature sensor support for Tasmota
 
-  Copyright (C) 2019  Oliver Welter
+  Copyright (C) 2020  Oliver Welter
 
   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
diff --git a/tasmota/xsns_33_ds3231.ino b/tasmota/xsns_33_ds3231.ino
index 264c53e9e..0c72c6b11 100644
--- a/tasmota/xsns_33_ds3231.ino
+++ b/tasmota/xsns_33_ds3231.ino
@@ -1,7 +1,7 @@
 /*
   xsns_33_ds3231.ino - ds3231 RTC chip, act like sensor support for Tasmota
 
-  Copyright (C) 2019  Guy Elgabsi (guy.elg AT gmail.com)
+  Copyright (C) 2020  Guy Elgabsi (guy.elg AT gmail.com)
 
   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
diff --git a/tasmota/xsns_34_hx711.ino b/tasmota/xsns_34_hx711.ino
index d64712a86..44bb9036c 100644
--- a/tasmota/xsns_34_hx711.ino
+++ b/tasmota/xsns_34_hx711.ino
@@ -1,7 +1,7 @@
 /*
   xsns_34_hx711.ino - HX711 load cell support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
@@ -159,7 +159,7 @@ void SetWeightDelta()
     return;
   }
 
-  // map upper values 101-255 to 
+  // map upper values 101-255 to
   if (Settings.weight_change > 100) {
     Hx.weight_delta = (Settings.weight_change - 100) * 10 + 100;
     return;
@@ -292,7 +292,7 @@ void HxInit(void)
     digitalWrite(Hx.pin_sck, LOW);
 
     SetWeightDelta();
-    
+
     if (HxIsReady(8 * HX_TIMEOUT)) {                 // Can take 600 milliseconds after power on
       if (!Settings.weight_max) { Settings.weight_max = HX_MAX_WEIGHT / 1000; }
       if (!Settings.weight_calibration) { Settings.weight_calibration = HX_SCALE; }
diff --git a/tasmota/xsns_35_tx20.ino b/tasmota/xsns_35_tx20.ino
index cc072d6ac..0c61392bc 100644
--- a/tasmota/xsns_35_tx20.ino
+++ b/tasmota/xsns_35_tx20.ino
@@ -1,7 +1,7 @@
 /*
   xsns_35_Tx20.ino - La Crosse Tx20 wind sensor support for Tasmota
 
-  Copyright (C) 2019  Thomas Eckerstorfer and Theo Arends
+  Copyright (C) 2020  Thomas Eckerstorfer and Theo Arends
 
   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
diff --git a/tasmota/xsns_36_mgc3130.ino b/tasmota/xsns_36_mgc3130.ino
index 51dc070d6..4dd76155b 100644
--- a/tasmota/xsns_36_mgc3130.ino
+++ b/tasmota/xsns_36_mgc3130.ino
@@ -1,7 +1,7 @@
 /*
   xsns_36_MGC3130.ino - Support for I2C MGC3130 Electric Field Sensor for Tasmota
 
-  Copyright (C) 2019  Christian Baars & Theo Arends
+  Copyright (C) 2020  Christian Baars & Theo Arends
 
   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
diff --git a/tasmota/xsns_37_rfsensor.ino b/tasmota/xsns_37_rfsensor.ino
index c3fb26a09..f07371f29 100644
--- a/tasmota/xsns_37_rfsensor.ino
+++ b/tasmota/xsns_37_rfsensor.ino
@@ -1,7 +1,7 @@
 /*
   xsns_37_rfsensor.ino - RF sensor receiver for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_38_az7798.ino b/tasmota/xsns_38_az7798.ino
index b1410bb5d..05afc7763 100644
--- a/tasmota/xsns_38_az7798.ino
+++ b/tasmota/xsns_38_az7798.ino
@@ -1,7 +1,7 @@
 /*
   xsns_38_az7798.ino - AZ_Instrument 7798 CO2/temperature/humidity meter support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_39_max31855.ino b/tasmota/xsns_39_max31855.ino
index 1c5ec2f3d..b4a430b54 100644
--- a/tasmota/xsns_39_max31855.ino
+++ b/tasmota/xsns_39_max31855.ino
@@ -1,7 +1,7 @@
 /*
   xsns_39_max31855.ino - MAX31855 thermocouple sensor support for Tasmota
 
-  Copyright (C) 2019  Markus Past
+  Copyright (C) 2020  Markus Past
 
   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
diff --git a/tasmota/xsns_40_pn532.ino b/tasmota/xsns_40_pn532.ino
index 8f6c8382e..b241eb320 100644
--- a/tasmota/xsns_40_pn532.ino
+++ b/tasmota/xsns_40_pn532.ino
@@ -1,7 +1,7 @@
 /*
   xsns_40_pn532.ino - Support for PN532 (HSU) NFC Tag Reader on Tasmota
 
-  Copyright (C) 2019  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Andre Thomas and Theo Arends
 
   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
diff --git a/tasmota/xsns_41_max44009.ino b/tasmota/xsns_41_max44009.ino
index e1ef99ee1..231cc961a 100644
--- a/tasmota/xsns_41_max44009.ino
+++ b/tasmota/xsns_41_max44009.ino
@@ -1,7 +1,7 @@
 /*
   xsns_41_max44009.ino - MAX44009 ambient light sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_42_scd30.ino b/tasmota/xsns_42_scd30.ino
index 12ac95cd2..267427c57 100644
--- a/tasmota/xsns_42_scd30.ino
+++ b/tasmota/xsns_42_scd30.ino
@@ -1,7 +1,7 @@
 /*
   xsns_42_scd30.ino - SC30 CO2 sensor support for Tasmota
 
-  Copyright (C) 2019 Frogmore42
+  Copyright (C) 2020 Frogmore42
 
   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
diff --git a/tasmota/xsns_43_hre.ino b/tasmota/xsns_43_hre.ino
index 6681a2ed7..fa03d0301 100644
--- a/tasmota/xsns_43_hre.ino
+++ b/tasmota/xsns_43_hre.ino
@@ -1,7 +1,7 @@
 /*
   xsns_43_hre.ino - Badger HR-E Water Meter Encoder interface
 
-  Copyright (C) 2019  Jon Little
+  Copyright (C) 2020  Jon Little
 
   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
diff --git a/tasmota/xsns_44_sps30.ino b/tasmota/xsns_44_sps30.ino
index daa4dce98..441a05754 100644
--- a/tasmota/xsns_44_sps30.ino
+++ b/tasmota/xsns_44_sps30.ino
@@ -1,7 +1,7 @@
 /*
   xsns_44_sps30.ino - Sensirion SPS30 support for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_45_vl53l0x.ino b/tasmota/xsns_45_vl53l0x.ino
index ff4e8f260..ef9de345c 100644
--- a/tasmota/xsns_45_vl53l0x.ino
+++ b/tasmota/xsns_45_vl53l0x.ino
@@ -1,7 +1,7 @@
 /*
-  xsns_99_vl53l0x.ino - VL53L0X support for Tasmota
+  xsns_45_vl53l0x.ino - VL53L0X support for Tasmota
 
-  Copyright (C) 2018  Theo Arends and Gerhard Mutz
+  Copyright (C) 2020  Theo Arends and Gerhard Mutz
 
   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
diff --git a/tasmota/xsns_46_MLX90614.ino b/tasmota/xsns_46_MLX90614.ino
index dc5850789..54e27f359 100644
--- a/tasmota/xsns_46_MLX90614.ino
+++ b/tasmota/xsns_46_MLX90614.ino
@@ -1,7 +1,7 @@
 /*
   xsns_46_MLX90614.ino - Support for MLX ir temperature sensor
 
-  Copyright (C) 2019   Gerhard Mutz and Theo Arends
+  Copyright (C) 2020   Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_47_max31865.ino b/tasmota/xsns_47_max31865.ino
index 7416bb4a6..3b8a11706 100644
--- a/tasmota/xsns_47_max31865.ino
+++ b/tasmota/xsns_47_max31865.ino
@@ -1,7 +1,7 @@
 /*
   xsns_39_MAX31865.ino - MAX31865 thermocouple sensor support for Tasmota
 
-  Copyright (C) 2019 Alberto Lopez Siemens
+  Copyright (C) 2020 Alberto Lopez Siemens
 
   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
diff --git a/tasmota/xsns_48_chirp.ino b/tasmota/xsns_48_chirp.ino
index f761e6afc..3cd3afe6f 100644
--- a/tasmota/xsns_48_chirp.ino
+++ b/tasmota/xsns_48_chirp.ino
@@ -1,7 +1,7 @@
 /*
   xsns_48_chirp.ino - soil moisture sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends & Christian Baars
+  Copyright (C) 2020  Theo Arends & Christian Baars
 
   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
diff --git a/tasmota/xsns_50_paj7620.ino b/tasmota/xsns_50_paj7620.ino
index d9f5c98fc..c0db8fa94 100644
--- a/tasmota/xsns_50_paj7620.ino
+++ b/tasmota/xsns_50_paj7620.ino
@@ -1,7 +1,7 @@
 /*
   xsns_50_paj7620.ino - gesture sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends & Christian Baars
+  Copyright (C) 2020  Theo Arends & Christian Baars
 
   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
diff --git a/tasmota/xsns_51_rdm6300.ino b/tasmota/xsns_51_rdm6300.ino
index 31d39a44e..7fd8bc5b5 100644
--- a/tasmota/xsns_51_rdm6300.ino
+++ b/tasmota/xsns_51_rdm6300.ino
@@ -1,7 +1,7 @@
 /*
   xsns_51_rdm6300.ino - Support for RDM6300 NFC Tag Reader on Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_52_ibeacon.ino b/tasmota/xsns_52_ibeacon.ino
index 92444bfbb..97130df2a 100644
--- a/tasmota/xsns_52_ibeacon.ino
+++ b/tasmota/xsns_52_ibeacon.ino
@@ -1,7 +1,7 @@
 /*
   xsns_52_ibeacon.ino - Support for HM17 BLE Module + ibeacon reader on Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index 672f7f826..1af1f526c 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -4,7 +4,7 @@
   Created by Gerhard Mutz on 07.10.11.
   adapted for Tasmota
 
-  Copyright (C) 2019  Gerhard Mutz and Theo Arends
+  Copyright (C) 2020  Gerhard Mutz and Theo Arends
 
   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
diff --git a/tasmota/xsns_54_ina226.ino b/tasmota/xsns_54_ina226.ino
index 5fd404414..725a63bb3 100644
--- a/tasmota/xsns_54_ina226.ino
+++ b/tasmota/xsns_54_ina226.ino
@@ -1,7 +1,7 @@
 /*
   xsns_54_ina226.ino - INA226 Current Sensor support for Tasmota
 
-  Copyright (C) 2019  Stephen Rodgers and Theo Arends
+  Copyright (C) 2020  Stephen Rodgers and Theo Arends
 
   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
diff --git a/tasmota/xsns_55_hih_series.ino b/tasmota/xsns_55_hih_series.ino
index 0707e0ed7..5ebcdea93 100644
--- a/tasmota/xsns_55_hih_series.ino
+++ b/tasmota/xsns_55_hih_series.ino
@@ -1,7 +1,7 @@
 /*
   xsns_55_hih_series.ino - Honeywell HIH series temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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
diff --git a/tasmota/xsns_56_hpma.ino b/tasmota/xsns_56_hpma.ino
index 28b8f102d..c9d50f28f 100644
--- a/tasmota/xsns_56_hpma.ino
+++ b/tasmota/xsns_56_hpma.ino
@@ -1,8 +1,8 @@
 /*
   xsns_56_hpma.ino - Honeywell HPMA115S0 particle concentration sensor support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
-  Copyright (C) 2019  David Hunt
+  Copyright (C) 2020  Theo Arends
+  Copyright (C) 2020  David Hunt
 
   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
@@ -68,7 +68,7 @@ void HpmaInit(void)
   if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
     HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
     hpma115S0 = new HPMA115S0(*HpmaSerial);
-    
+
     if (HpmaSerial->begin(9600)) {
       if (HpmaSerial->hardwareSerial()) {
         ClaimSerial();
diff --git a/tasmota/xsns_57_tsl2591.ino b/tasmota/xsns_57_tsl2591.ino
index e3cedc26f..8a96648e1 100644
--- a/tasmota/xsns_57_tsl2591.ino
+++ b/tasmota/xsns_57_tsl2591.ino
@@ -1,7 +1,7 @@
 /*
   xsns_57_tsl2591.ino - TSL2591 light sensor support for Tasmota
 
-  Copyright (C) 2019  Markus Bösling and Theo Arends
+  Copyright (C) 2020  Markus Bösling and Theo Arends
 
   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
diff --git a/tasmota/xsns_58_dht12.ino b/tasmota/xsns_58_dht12.ino
index 88dfd3598..454f90b00 100644
--- a/tasmota/xsns_58_dht12.ino
+++ b/tasmota/xsns_58_dht12.ino
@@ -1,7 +1,7 @@
 /*
   xsns_58_dht12.ino - DHT12 I2C temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2019  Stefan Oskamp and Theo Arends
+  Copyright (C) 2020  Stefan Oskamp and Theo Arends
 
   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
diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
index 6f3ce5b69..9fe34b7d8 100644
--- a/tasmota/xsns_59_ds1624.ino
+++ b/tasmota/xsns_59_ds1624.ino
@@ -1,7 +1,7 @@
 /*
   xsns_59_ds1624.ino - Support for I2C DS1624 Temperature Sensor
 
-  Copyright (C) 2019 Leonid Myravjev <asm@asm.pp.ru>
+  Copyright (C) 2020 Leonid Myravjev <asm@asm.pp.ru>
 
   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
diff --git a/tasmota/xsns_60_GPS.ino b/tasmota/xsns_60_GPS.ino
index 376021ef0..13cfebdbd 100644
--- a/tasmota/xsns_60_GPS.ino
+++ b/tasmota/xsns_60_GPS.ino
@@ -1,7 +1,7 @@
 /*
   xsns_60_GPS.ino - GPS UBLOX support for Tasmota
 
-  Copyright (C) 2019  Theo Arends, Christian Baars and Adrian Scillato
+  Copyright (C) 2020  Theo Arends, Christian Baars and Adrian Scillato
 
   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
diff --git a/tasmota/xsns_interface.ino b/tasmota/xsns_interface.ino
index 7afb33aef..b6abce101 100644
--- a/tasmota/xsns_interface.ino
+++ b/tasmota/xsns_interface.ino
@@ -1,7 +1,7 @@
 /*
   xsns_interface.ino - Sensor interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends inspired by ESPEasy
+  Copyright (C) 2020  Theo Arends inspired by ESPEasy
 
   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
diff --git a/tasmota/xx2c_interface.ino b/tasmota/xx2c_interface.ino
index 6a05b2948..d27459027 100644
--- a/tasmota/xx2c_interface.ino
+++ b/tasmota/xx2c_interface.ino
@@ -1,7 +1,7 @@
 /*
   xx2c_interface.ino - I2c interface support for Tasmota
 
-  Copyright (C) 2019  Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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

From 5281725b9bfd1e9d8b158343b2504981547f2d0d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 31 Dec 2019 15:34:27 +0100
Subject: [PATCH 050/403] Raise max valid load from 3.68 to 4kW

Raise max valid load from 3.68 to 4kW (#7155)
---
 tasmota/xnrg_02_cse7766.ino | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index 3b532c5b8..45001b55e 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -193,7 +193,9 @@ void CseEverySecond(void)
       if (cf_frequency && Energy.active_power[0])  {
         unsigned long delta = (cf_frequency * Settings.energy_power_calibration) / 36;
         // prevent invalid load delta steps even checksum is valid (issue #5789):
-        if (delta <= (3680*100/36) * 10 ) {  // max load for S31/Pow R2: 3.68kW
+//        if (delta <= (3680*100/36) * 10 ) {  // max load for S31/Pow R2: 3.68kW
+        // prevent invalid load delta steps even checksum is valid but allow up to 4kW (issue #7155):
+        if (delta <= (4000*100/36) * 10 ) {  // max load for S31/Pow R2: 4.00kW
           Cse.cf_pulses_last_time = Cse.cf_pulses;
           Energy.kWhtoday_delta += delta;
         }

From c13b755a5972ef0f9112d25d5c72fe3b239c3e56 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:17:30 +0100
Subject: [PATCH 051/403] Fix addition of backlog to IF clause

Fix addition of backlog to IF clause (#7342)
---
 tasmota/xdrv_10_rules.ino | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 21b454e8c..2b390bec9 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -437,8 +437,16 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
       commands.trim();
       String ucommand = commands;
       ucommand.toUpperCase();
+
 //      if (!ucommand.startsWith("BACKLOG")) { commands = "backlog " + commands; }  // Always use Backlog to prevent power race exception
-      if ((ucommand.indexOf("EVENT ") != -1) && (ucommand.indexOf("BACKLOG ") == -1)) { commands = "backlog " + commands; }  // Always use Backlog with event to prevent rule event loop exception
+
+//      if ((ucommand.indexOf("EVENT ") != -1) && (ucommand.indexOf("BACKLOG ") == -1)) {
+//        commands = "backlog " + commands;  // Always use Backlog with event to prevent rule event loop exception
+//      }
+
+      if ((ucommand.indexOf("IF ") == -1) && (ucommand.indexOf("EVENT ") != -1) && (ucommand.indexOf("BACKLOG ") == -1)) {
+        commands = "backlog " + commands;  // Use Backlog with event unless IF is used which uses an implicit backlog to prevent rule event loop exception
+      }
 
       RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);
       for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {

From b05301b1497942167a015a6113b7f424e42942cd Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:24:47 +0100
Subject: [PATCH 052/403] Refactor change

---
 tasmota/xdrv_10_rules.ino | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 2b390bec9..78cb73e10 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -439,13 +439,11 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
       ucommand.toUpperCase();
 
 //      if (!ucommand.startsWith("BACKLOG")) { commands = "backlog " + commands; }  // Always use Backlog to prevent power race exception
-
-//      if ((ucommand.indexOf("EVENT ") != -1) && (ucommand.indexOf("BACKLOG ") == -1)) {
-//        commands = "backlog " + commands;  // Always use Backlog with event to prevent rule event loop exception
-//      }
-
-      if ((ucommand.indexOf("IF ") == -1) && (ucommand.indexOf("EVENT ") != -1) && (ucommand.indexOf("BACKLOG ") == -1)) {
-        commands = "backlog " + commands;  // Use Backlog with event unless IF is used which uses an implicit backlog to prevent rule event loop exception
+      // Use Backlog with event to prevent rule event loop exception unless IF is used which uses an implicit backlog
+      if ((ucommand.indexOf("IF ") == -1) &&
+          (ucommand.indexOf("EVENT ") != -1) &&
+          (ucommand.indexOf("BACKLOG ") == -1)) {
+        commands = "backlog " + commands;
       }
 
       RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);

From 287b3b97f11270bd91f35752ec561a5beb3f22a0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 1 Jan 2020 15:13:58 +0100
Subject: [PATCH 053/403] Fix some display issues

- Fix LCD line and column positioning (#7387)
- Fix Display handling of hexadecimal escape characters (#7387)
---
 RELEASENOTES.md             |  2 ++
 tasmota/CHANGELOG.md        |  2 ++
 tasmota/xdrv_13_display.ino | 19 +++++++++++++------
 tasmota/xdsp_01_lcd.ino     |  4 ++++
 tools/decode-status.py      |  2 +-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 30f05d21e..c5bba2957 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -58,6 +58,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
+- Fix LCD line and column positioning (#7387)
+- Fix Display handling of hexadecimal escape characters (#7387)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 99aca3e2c..15a381d40 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### 8.1.0.2 20191230
 
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
+- Fix LCD line and column positioning (#7387)
+- Fix Display handling of hexadecimal escape characters (#7387)
 
 ### 8.1.0.1 20191225
 
diff --git a/tasmota/xdrv_13_display.ino b/tasmota/xdrv_13_display.ino
index 6dc29b6f4..117725024 100644
--- a/tasmota/xdrv_13_display.ino
+++ b/tasmota/xdrv_13_display.ino
@@ -328,7 +328,8 @@ uint8_t index=0;
 #define ESCAPE_CHAR '~'
 
 // decode text escapes, 1 hexbyte assumed
-void decode_te(char *line) {
+uint32_t decode_te(char *line) {
+  uint32_t skip = 0;
   char sbuf[3],*cp;
   while (*line) {
     if (*line==ESCAPE_CHAR) {
@@ -336,11 +337,12 @@ void decode_te(char *line) {
       if (*cp!=0 && *cp==ESCAPE_CHAR) {
         // escape escape, discard one
         memmove(cp,cp+1,strlen(cp));
+        skip++;
       } else {
         // escape HH
         if (strlen(cp)<2) {
           // illegal lenght, ignore
-          return;
+          return skip;
         }
         // take 2 hex chars
         sbuf[0]=*(cp);
@@ -349,10 +351,12 @@ void decode_te(char *line) {
         *line=strtol(sbuf,0,16);
         // must shift string 2 bytes shift zero also
         memmove(cp,cp+2,strlen(cp)-1);
+        skip += 2;
       }
     }
     line++;
   }
+  return skip;
 }
 
 /*-------------------------------------------------------------------------------------------*/
@@ -829,10 +833,13 @@ void DisplayText(void)
   }
   exit:
   // now draw buffer
-    decode_te(linebuf);
+    dp -= decode_te(linebuf);
     if ((uint32_t)dp - (uint32_t)linebuf) {
-      if (!fill) *dp = 0;
-      else linebuf[abs(fill)] = 0;
+      if (!fill) {
+        *dp = 0;
+      } else {
+        linebuf[abs(fill)] = 0;
+      }
       if (fill<0) {
         // right align
         alignright(linebuf);
@@ -1276,7 +1283,7 @@ void DisplaySetPower(void)
 {
   disp_power = bitRead(XdrvMailbox.index, disp_device -1);
 
-AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DSP: Power %d"), disp_power);
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DSP: Power %d"), disp_power);
 
   if (Settings.display_model) {
     if (!renderer) {
diff --git a/tasmota/xdsp_01_lcd.ino b/tasmota/xdsp_01_lcd.ino
index 3fb17b9d4..4a700488a 100644
--- a/tasmota/xdsp_01_lcd.ino
+++ b/tasmota/xdsp_01_lcd.ino
@@ -85,6 +85,10 @@ void LcdInitDriver(void)
 
 void LcdDrawStringAt(void)
 {
+  if (dsp_flag) {  // Supply Line and Column starting with Line 1 and Column 1
+    dsp_x--;
+    dsp_y--;
+  }
   lcd->setCursor(dsp_x, dsp_y);
   lcd->print(dsp_str);
 }
diff --git a/tools/decode-status.py b/tools/decode-status.py
index e807b60fb..01319d9e4 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -3,7 +3,7 @@
 """
   decode-status.py - decode status for Tasmota
 
-  Copyright (C) 2019 Theo Arends
+  Copyright (C) 2020  Theo Arends
 
   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

From 579a76ced6d4163cd921ac69d25620aa2d550ed5 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 1 Jan 2020 16:11:36 +0100
Subject: [PATCH 054/403] Fix Improved fade linearity with gamma correction

---
 tasmota/CHANGELOG.md      |  1 +
 tasmota/xdrv_04_light.ino | 66 ++++++++++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 15a381d40..e241a1e0a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
+- Fix Improved fade linearity with gamma correction
 
 ### 8.1.0.1 20191225
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 3c69eae38..9566c4c92 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -185,9 +185,8 @@ const gamma_table_t gamma_table[] = {   // don't put in PROGMEM for performance
 
 // simplified Gamma table for Fade, cheating a little at low brightness
 const gamma_table_t gamma_table_fast[] = {
-  {     0,      0 },
-  {   384,     67 },
-  {   768,    467 },
+  {   384,    192 },
+  {   768,    576 },
   {  1023,   1023 },
   { 0xFFFF, 0xFFFF }          // fail-safe if out of range
 };
@@ -264,6 +263,7 @@ struct LIGHT {
   bool update = true;
   bool pwm_multi_channels = false;        // SetOption68, treat each PWM channel as an independant dimmer
 
+  bool     fade_initialized = false;      // dont't fade at startup
   bool     fade_running = false;
   uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
   uint16_t fade_cur_10[LST_MAX];
@@ -1110,9 +1110,20 @@ uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
     from_gamma = to_gamma;
   }
 }
-// 10_10 bits, fast fade mode
-uint16_t ledGamma10_10_fast(uint16_t v) {
-  return ledGamma_internal(v, gamma_table_fast);
+// Calculate the reverse gamma value for LEDS
+uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (vg <= to_gamma) {
+      return changeUIntScale(vg, from_gamma, to_gamma, from_src, to_src);
+    }
+    from_src = to_src;
+    from_gamma = to_gamma;
+  }
 }
 
 // 10 bits in, 10 bits out
@@ -1740,11 +1751,12 @@ void LightAnimate(void)
         cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
       }
 
-      if (!Settings.light_fade || power_off) { // no fade
+      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) { // no fade
         // record the current value for a future Fade
         memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
         // push the final values at 8 and 10 bits resolution to the PWMs
         LightSetOutputs(cur_col_10);
+        Light.fade_initialized = true;      // it is now ok to fade
       } else {  // fade on
         if (Light.fade_running) {
           // if fade is running, we take the curring value as the start for the next fade
@@ -1768,6 +1780,33 @@ void LightAnimate(void)
   }
 }
 
+bool isChannelGammaCorrected(uint32_t channel) {
+  if (!Settings.light_correction) { return false; }   // Gamma correction not activated
+  if (channel >= Light.subtype) { return false; }     // Out of range
+
+  if (PHILIPS == my_module_type) {
+    if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }   // PMW reserved for CT
+    if ((LST_RGBWC == Light.subtype) && (4 == channel)) { return false; }   // PMW reserved for CT
+  }
+  return true;
+}
+
+// Calculate the Gamma correction, if any, for fading, using the fast Gamma curve (10 bits in+out)
+uint16_t fadeGamma(uint32_t channel, uint16_t v) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGamma_internal(v, gamma_table_fast);
+  } else {
+    return v;
+  }
+}
+uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGammaReverse_internal(vg, gamma_table_fast);
+  } else {
+    return vg;
+  }
+}
+
 bool LightApplyFade(void) {   // did the value chanegd and needs to be applied
   static uint32_t last_millis = 0;
   uint32_t now = millis();
@@ -1783,7 +1822,7 @@ bool LightApplyFade(void) {   // did the value chanegd and needs to be applied
     // compute the distance between start and and color (max of distance for each channel)
     uint32_t distance = 0;
     for (uint32_t i = 0; i < Light.subtype; i++) {
-      int32_t channel_distance = Light.fade_end_10[i] - Light.fade_start_10[i];
+      int32_t channel_distance = fadeGammaReverse(i, Light.fade_end_10[i]) - fadeGammaReverse(i, Light.fade_start_10[i]);
       if (channel_distance < 0) { channel_distance = - channel_distance; }
       if (channel_distance > distance) { distance = channel_distance; }
     }
@@ -1810,9 +1849,14 @@ bool LightApplyFade(void) {   // did the value chanegd and needs to be applied
   if (fade_current <= Light.fade_duration) {    // fade not finished
     //Serial.printf("Fade: %d / %d - ", fade_current, Light.fade_duration);
     for (uint32_t i = 0; i < Light.subtype; i++) {
-      Light.fade_cur_10[i] = changeUIntScale(fade_current,
-                                              0, Light.fade_duration,
-                                              Light.fade_start_10[i], Light.fade_end_10[i]);
+      Light.fade_cur_10[i] = fadeGamma(i,
+                                changeUIntScale(fadeGammaReverse(i, fade_current),
+                                             0, Light.fade_duration,
+                                             fadeGammaReverse(i, Light.fade_start_10[i]),
+                                             fadeGammaReverse(i, Light.fade_end_10[i])));
+      // Light.fade_cur_10[i] = changeUIntScale(fade_current,
+      //                                        0, Light.fade_duration,
+      //                                        Light.fade_start_10[i], Light.fade_end_10[i]);
     }
   } else {
     // stop fade

From 01b5df965110296a23ffd5dc1146d2e82723a0cc Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 1 Jan 2020 17:17:10 +0100
Subject: [PATCH 055/403] Add optional support for Prometheus

Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
---
 RELEASENOTES.md                |  2 +
 tasmota/CHANGELOG.md           |  1 +
 tasmota/xsns_91_prometheus.ino | 84 ++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 tasmota/xsns_91_prometheus.ino

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c5bba2957..0c3bcc9a7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -58,6 +58,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
+- Fix Improved fade linearity with gamma correction
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
@@ -66,3 +67,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
 - Add Zigbee attribute decoder for Xiaomi Aqara Cube
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
+- Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index e241a1e0a..07a487b93 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 8.1.0.2 20191230
 
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
+- Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
diff --git a/tasmota/xsns_91_prometheus.ino b/tasmota/xsns_91_prometheus.ino
new file mode 100644
index 000000000..2cc3d3cfe
--- /dev/null
+++ b/tasmota/xsns_91_prometheus.ino
@@ -0,0 +1,84 @@
+/*
+  xsns_91_prometheus.ino - Web based information for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+//#define USE_PROMETHEUS                         // Enable retrieval of metrics
+
+#ifdef USE_PROMETHEUS
+/*********************************************************************************************\
+ * Prometheus support
+\*********************************************************************************************/
+
+#define XSNS_91                    91
+
+void HandleMetrics(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR("Prometheus"));
+
+  WSContentBegin(200, CT_PLAIN);
+
+  char parameter[FLOATSZ];
+
+  if (global_temperature != 9999) {
+    dtostrfd(global_temperature, Settings.flag2.temperature_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_temperature gauge\nglobal_temperature %s\n"), parameter);
+  }
+  if (global_humidity != 0) {
+    dtostrfd(global_humidity, Settings.flag2.humidity_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_humidity gauge\nglobal_humidity %s\n"), parameter);
+  }
+  if (global_pressure != 0) {
+    dtostrfd(global_pressure, Settings.flag2.pressure_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_pressure gauge\nglobal_pressure %s\n"), parameter);
+  }
+
+#ifdef USE_ENERGY_SENSOR
+  dtostrfd(Energy.voltage[0], Settings.flag2.voltage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE voltage gauge\nvoltage %s\n"), parameter);
+  dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
+  dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE active_power guage\nactive_power %s\n"), parameter);
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_daily counter\nenergy_daily %s\n"), parameter);
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
+#endif
+
+  WSContentEnd();
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns91(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/metrics", HandleMetrics);
+      break;
+  }
+  return result;
+}
+
+#endif  // USE_PROMETHEUS

From ee7e9078f08af914a4d234c46ec7c751ed95462a Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Wed, 1 Jan 2020 19:09:20 +0100
Subject: [PATCH 056/403] initial commit

---
 lib/RF24/.gitignore                           |   26 +
 lib/RF24/CONTRIBUTING.md                      |    1 +
 lib/RF24/Doxyfile                             | 2462 +++++++++++++++++
 lib/RF24/LICENSE                              |  339 +++
 lib/RF24/Makefile                             |  126 +
 lib/RF24/README.md                            |    2 +
 lib/RF24/RF24.cpp                             | 1638 +++++++++++
 lib/RF24/RF24.h                               | 2030 ++++++++++++++
 lib/RF24/RF24_config.h                        |  166 ++
 lib/RF24/configure                            |  473 ++++
 lib/RF24/doxygen-custom.css                   |  835 ++++++
 .../GettingStarted/GettingStarted.ino         |  142 +
 .../GettingStarted_CallResponse.ino           |  138 +
 .../GettingStarted_HandlingData.ino           |  161 ++
 .../GettingStarted_HandlingFailures.ino       |  218 ++
 lib/RF24/examples/Transfer/Transfer.ino       |  149 +
 .../TransferTimeouts/TransferTimeouts.ino     |  189 ++
 lib/RF24/examples/Usage/led_remote/Jamfile    |  206 ++
 .../examples/Usage/led_remote/led_remote.pde  |  254 ++
 lib/RF24/examples/Usage/nordic_fob/Jamfile    |  219 ++
 .../examples/Usage/nordic_fob/nordic_fob.pde  |  142 +
 .../examples/Usage/pingpair_maple/Jamfile     |  182 ++
 .../examples/Usage/pingpair_maple/main.cpp    |   87 +
 .../Usage/pingpair_maple/pingpair_maple.pde   |  242 ++
 lib/RF24/examples/Usage/readme.md             |    1 +
 .../examples/pingpair_ack/pingpair_ack.ino    |  123 +
 lib/RF24/examples/pingpair_dyn/Jamfile        |  206 ++
 .../examples/pingpair_dyn/pingpair_dyn.ino    |  246 ++
 .../examples/pingpair_irq/pingpair_irq.ino    |  143 +
 .../pingpair_irq_simple.ino                   |  122 +
 lib/RF24/examples/pingpair_multi_dyn/Jamfile  |  206 ++
 .../pingpair_multi_dyn/pingpair_multi_dyn.ino |  263 ++
 .../pingpair_sleepy/pingpair_sleepy.ino       |  226 ++
 .../rf24_ATTiny/rf24ping85/rf24ping85.ino     |  101 +
 .../timingSearch3pin/timingSearch3pin.ino     |  396 +++
 lib/RF24/examples/scanner/Jamfile             |  210 ++
 lib/RF24/examples/scanner/scanner.ino         |  127 +
 lib/RF24/examples/starping/Jamfile            |  206 ++
 lib/RF24/examples/starping/starping.pde       |  293 ++
 lib/RF24/examples_linux/Makefile.examples     |   52 +
 lib/RF24/examples_linux/extra/Makefile        |   24 +
 lib/RF24/examples_linux/extra/rpi-hub.cpp     |  134 +
 lib/RF24/examples_linux/extra/scanner.cpp     |  143 +
 lib/RF24/examples_linux/gettingstarted.cpp    |  216 ++
 .../gettingstarted_call_response.cpp          |  169 ++
 lib/RF24/examples_linux/interrupts/Makefile   |   24 +
 .../gettingstarted_call_response_int.cpp      |  143 +
 .../gettingstarted_call_response_int2.cpp     |  155 ++
 .../interrupts/pingpair_dyn_int.cpp           |  183 ++
 .../interrupts/transfer_interrupt.cpp         |  192 ++
 lib/RF24/examples_linux/pingpair_dyn.cpp      |  211 ++
 lib/RF24/examples_linux/pingpair_dyn.py       |  141 +
 lib/RF24/examples_linux/readme.md             |    3 +
 lib/RF24/examples_linux/transfer.cpp          |  187 ++
 lib/RF24/keywords.txt                         |   16 +
 lib/RF24/library.json                         |   20 +
 lib/RF24/library.properties                   |    9 +
 lib/RF24/nRF24L01.h                           |  127 +
 lib/RF24/printf.h                             |   44 +
 lib/RF24/pyRF24/crossunixccompiler.py         |   38 +
 lib/RF24/pyRF24/pyRF24.cpp                    |  330 +++
 lib/RF24/pyRF24/pyRF24/crossunixccompiler.py  |   38 +
 lib/RF24/pyRF24/pyRF24/pyRF24.cpp             |  328 +++
 lib/RF24/pyRF24/pyRF24/readme.md              |    2 +
 lib/RF24/pyRF24/pyRF24/setup.py               |   48 +
 lib/RF24/pyRF24/pyRF24Mesh/example_master.py  |   22 +
 lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp     |  105 +
 lib/RF24/pyRF24/pyRF24Mesh/setup.py           |   17 +
 .../pyRF24Network/examples/helloworld_rx.py   |   56 +
 .../pyRF24Network/examples/helloworld_tx.py   |   64 +
 .../pyRF24/pyRF24Network/pyRF24Network.cpp    |  143 +
 lib/RF24/pyRF24/pyRF24Network/setup.py        |   18 +
 lib/RF24/pyRF24/readme.md                     |    2 +
 lib/RF24/pyRF24/setup.py                      |   48 +
 lib/RF24/tests/README                         |    7 +
 lib/RF24/tests/native/Jamfile                 |  300 ++
 lib/RF24/tests/native/pingpair_irq.pde        |  223 ++
 lib/RF24/tests/native/printf.h                |   33 +
 lib/RF24/tests/pingpair_blocking/Jamfile      |  219 ++
 .../pingpair_blocking/pingpair_blocking.pde   |  273 ++
 lib/RF24/tests/pingpair_blocking/printf.h     |   37 +
 lib/RF24/tests/pingpair_blocking/runtest.py   |   25 +
 lib/RF24/tests/pingpair_blocking/runtests.sh  |    5 +
 lib/RF24/tests/pingpair_blocking/test.ex      |   11 +
 lib/RF24/tests/pingpair_test/Jamfile          |  219 ++
 .../tests/pingpair_test/pingpair_test.pde     |  435 +++
 lib/RF24/tests/pingpair_test/printf.h         |   37 +
 lib/RF24/tests/pingpair_test/runtest.py       |   25 +
 lib/RF24/tests/pingpair_test/runtests.sh      |   21 +
 lib/RF24/tests/pingpair_test/test.ex          |   11 +
 lib/RF24/utility/ATTiny/RF24_arch_config.h    |   47 +
 lib/RF24/utility/ATTiny/spi.h                 |   53 +
 lib/RF24/utility/ATXMegaD3/README.md          |   54 +
 lib/RF24/utility/ATXMegaD3/RF24_arch_config.h |   85 +
 lib/RF24/utility/ATXMegaD3/compatibility.c    |   67 +
 lib/RF24/utility/ATXMegaD3/compatibility.h    |   45 +
 lib/RF24/utility/ATXMegaD3/gpio.cpp           |   50 +
 lib/RF24/utility/ATXMegaD3/gpio.h             |   63 +
 lib/RF24/utility/ATXMegaD3/gpio_helper.c      |   45 +
 lib/RF24/utility/ATXMegaD3/gpio_helper.h      |   89 +
 lib/RF24/utility/ATXMegaD3/includes.h         |   31 +
 lib/RF24/utility/ATXMegaD3/spi.cpp            |   64 +
 lib/RF24/utility/ATXMegaD3/spi.h              |   90 +
 lib/RF24/utility/Due/RF24_arch_config.h       |   37 +
 .../utility/LittleWire/RF24_arch_config.h     |   39 +
 lib/RF24/utility/LittleWire/includes.h        |   31 +
 lib/RF24/utility/MRAA/RF24_arch_config.h      |   64 +
 lib/RF24/utility/MRAA/compatibility.c         |   48 +
 lib/RF24/utility/MRAA/compatibility.h         |   29 +
 lib/RF24/utility/MRAA/gpio.cpp                |   83 +
 lib/RF24/utility/MRAA/gpio.h                  |   67 +
 lib/RF24/utility/MRAA/includes.h              |   11 +
 lib/RF24/utility/MRAA/spi.cpp                 |   47 +
 lib/RF24/utility/MRAA/spi.h                   |   55 +
 lib/RF24/utility/RPi/RF24_arch_config.h       |   44 +
 lib/RF24/utility/RPi/bcm2835.c                | 1984 +++++++++++++
 lib/RF24/utility/RPi/bcm2835.h                | 1986 +++++++++++++
 lib/RF24/utility/RPi/includes.h               |   10 +
 lib/RF24/utility/RPi/interrupt.c              |  226 ++
 lib/RF24/utility/RPi/interrupt.h              |   69 +
 lib/RF24/utility/RPi/spi.cpp                  |   55 +
 lib/RF24/utility/RPi/spi.h                    |   84 +
 lib/RF24/utility/SPIDEV/RF24_arch_config.h    |   69 +
 lib/RF24/utility/SPIDEV/compatibility.c       |   52 +
 lib/RF24/utility/SPIDEV/compatibility.h       |   31 +
 lib/RF24/utility/SPIDEV/gpio.cpp              |  145 +
 lib/RF24/utility/SPIDEV/gpio.h                |   89 +
 lib/RF24/utility/SPIDEV/includes.h            |    8 +
 lib/RF24/utility/SPIDEV/interrupt.c           |  226 ++
 lib/RF24/utility/SPIDEV/interrupt.h           |   69 +
 lib/RF24/utility/SPIDEV/spi.cpp               |  168 ++
 lib/RF24/utility/SPIDEV/spi.h                 |   93 +
 lib/RF24/utility/Teensy/RF24_arch_config.h    |   31 +
 lib/RF24/utility/Template/RF24_arch_config.h  |   84 +
 lib/RF24/utility/Template/compatibility.h     |   44 +
 lib/RF24/utility/Template/gpio.h              |   59 +
 lib/RF24/utility/Template/includes.h          |   31 +
 lib/RF24/utility/Template/spi.h               |   81 +
 lib/RF24/utility/wiringPi/RF24_arch_config.h  |   56 +
 lib/RF24/utility/wiringPi/includes.h          |   30 +
 lib/RF24/utility/wiringPi/spi.cpp             |   93 +
 lib/RF24/utility/wiringPi/spi.h               |   70 +
 lib/RF24/wikidoc.xslt                         |   41 +
 tasmota/my_user_config.h                      |   18 +-
 tasmota/xdrv_33_nrf24l01.ino                  |  103 +
 tasmota/xsns_61_MI_BLE.ino                    |  756 +++++
 146 files changed, 26823 insertions(+), 5 deletions(-)
 create mode 100644 lib/RF24/.gitignore
 create mode 100644 lib/RF24/CONTRIBUTING.md
 create mode 100644 lib/RF24/Doxyfile
 create mode 100644 lib/RF24/LICENSE
 create mode 100644 lib/RF24/Makefile
 create mode 100644 lib/RF24/README.md
 create mode 100644 lib/RF24/RF24.cpp
 create mode 100644 lib/RF24/RF24.h
 create mode 100644 lib/RF24/RF24_config.h
 create mode 100755 lib/RF24/configure
 create mode 100644 lib/RF24/doxygen-custom.css
 create mode 100644 lib/RF24/examples/GettingStarted/GettingStarted.ino
 create mode 100644 lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
 create mode 100755 lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
 create mode 100644 lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
 create mode 100644 lib/RF24/examples/Transfer/Transfer.ino
 create mode 100644 lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino
 create mode 100644 lib/RF24/examples/Usage/led_remote/Jamfile
 create mode 100644 lib/RF24/examples/Usage/led_remote/led_remote.pde
 create mode 100644 lib/RF24/examples/Usage/nordic_fob/Jamfile
 create mode 100644 lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde
 create mode 100644 lib/RF24/examples/Usage/pingpair_maple/Jamfile
 create mode 100644 lib/RF24/examples/Usage/pingpair_maple/main.cpp
 create mode 100644 lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
 create mode 100644 lib/RF24/examples/Usage/readme.md
 create mode 100644 lib/RF24/examples/pingpair_ack/pingpair_ack.ino
 create mode 100644 lib/RF24/examples/pingpair_dyn/Jamfile
 create mode 100644 lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino
 create mode 100644 lib/RF24/examples/pingpair_irq/pingpair_irq.ino
 create mode 100644 lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
 create mode 100755 lib/RF24/examples/pingpair_multi_dyn/Jamfile
 create mode 100644 lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
 create mode 100644 lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
 create mode 100644 lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
 create mode 100644 lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
 create mode 100644 lib/RF24/examples/scanner/Jamfile
 create mode 100644 lib/RF24/examples/scanner/scanner.ino
 create mode 100644 lib/RF24/examples/starping/Jamfile
 create mode 100644 lib/RF24/examples/starping/starping.pde
 create mode 100644 lib/RF24/examples_linux/Makefile.examples
 create mode 100644 lib/RF24/examples_linux/extra/Makefile
 create mode 100644 lib/RF24/examples_linux/extra/rpi-hub.cpp
 create mode 100644 lib/RF24/examples_linux/extra/scanner.cpp
 create mode 100644 lib/RF24/examples_linux/gettingstarted.cpp
 create mode 100644 lib/RF24/examples_linux/gettingstarted_call_response.cpp
 create mode 100644 lib/RF24/examples_linux/interrupts/Makefile
 create mode 100644 lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
 create mode 100644 lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
 create mode 100644 lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
 create mode 100644 lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp
 create mode 100644 lib/RF24/examples_linux/pingpair_dyn.cpp
 create mode 100755 lib/RF24/examples_linux/pingpair_dyn.py
 create mode 100644 lib/RF24/examples_linux/readme.md
 create mode 100644 lib/RF24/examples_linux/transfer.cpp
 create mode 100644 lib/RF24/keywords.txt
 create mode 100644 lib/RF24/library.json
 create mode 100644 lib/RF24/library.properties
 create mode 100644 lib/RF24/nRF24L01.h
 create mode 100644 lib/RF24/printf.h
 create mode 100644 lib/RF24/pyRF24/crossunixccompiler.py
 create mode 100644 lib/RF24/pyRF24/pyRF24.cpp
 create mode 100644 lib/RF24/pyRF24/pyRF24/crossunixccompiler.py
 create mode 100644 lib/RF24/pyRF24/pyRF24/pyRF24.cpp
 create mode 100644 lib/RF24/pyRF24/pyRF24/readme.md
 create mode 100644 lib/RF24/pyRF24/pyRF24/setup.py
 create mode 100644 lib/RF24/pyRF24/pyRF24Mesh/example_master.py
 create mode 100644 lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
 create mode 100644 lib/RF24/pyRF24/pyRF24Mesh/setup.py
 create mode 100644 lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
 create mode 100644 lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
 create mode 100644 lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
 create mode 100644 lib/RF24/pyRF24/pyRF24Network/setup.py
 create mode 100644 lib/RF24/pyRF24/readme.md
 create mode 100644 lib/RF24/pyRF24/setup.py
 create mode 100644 lib/RF24/tests/README
 create mode 100644 lib/RF24/tests/native/Jamfile
 create mode 100644 lib/RF24/tests/native/pingpair_irq.pde
 create mode 100644 lib/RF24/tests/native/printf.h
 create mode 100644 lib/RF24/tests/pingpair_blocking/Jamfile
 create mode 100644 lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde
 create mode 100644 lib/RF24/tests/pingpair_blocking/printf.h
 create mode 100755 lib/RF24/tests/pingpair_blocking/runtest.py
 create mode 100755 lib/RF24/tests/pingpair_blocking/runtests.sh
 create mode 100755 lib/RF24/tests/pingpair_blocking/test.ex
 create mode 100644 lib/RF24/tests/pingpair_test/Jamfile
 create mode 100644 lib/RF24/tests/pingpair_test/pingpair_test.pde
 create mode 100644 lib/RF24/tests/pingpair_test/printf.h
 create mode 100755 lib/RF24/tests/pingpair_test/runtest.py
 create mode 100755 lib/RF24/tests/pingpair_test/runtests.sh
 create mode 100755 lib/RF24/tests/pingpair_test/test.ex
 create mode 100644 lib/RF24/utility/ATTiny/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/ATTiny/spi.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/README.md
 create mode 100644 lib/RF24/utility/ATXMegaD3/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/compatibility.c
 create mode 100644 lib/RF24/utility/ATXMegaD3/compatibility.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/gpio.cpp
 create mode 100644 lib/RF24/utility/ATXMegaD3/gpio.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/gpio_helper.c
 create mode 100644 lib/RF24/utility/ATXMegaD3/gpio_helper.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/includes.h
 create mode 100644 lib/RF24/utility/ATXMegaD3/spi.cpp
 create mode 100644 lib/RF24/utility/ATXMegaD3/spi.h
 create mode 100644 lib/RF24/utility/Due/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/LittleWire/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/LittleWire/includes.h
 create mode 100644 lib/RF24/utility/MRAA/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/MRAA/compatibility.c
 create mode 100644 lib/RF24/utility/MRAA/compatibility.h
 create mode 100644 lib/RF24/utility/MRAA/gpio.cpp
 create mode 100644 lib/RF24/utility/MRAA/gpio.h
 create mode 100644 lib/RF24/utility/MRAA/includes.h
 create mode 100644 lib/RF24/utility/MRAA/spi.cpp
 create mode 100644 lib/RF24/utility/MRAA/spi.h
 create mode 100644 lib/RF24/utility/RPi/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/RPi/bcm2835.c
 create mode 100644 lib/RF24/utility/RPi/bcm2835.h
 create mode 100644 lib/RF24/utility/RPi/includes.h
 create mode 100644 lib/RF24/utility/RPi/interrupt.c
 create mode 100644 lib/RF24/utility/RPi/interrupt.h
 create mode 100644 lib/RF24/utility/RPi/spi.cpp
 create mode 100644 lib/RF24/utility/RPi/spi.h
 create mode 100644 lib/RF24/utility/SPIDEV/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/SPIDEV/compatibility.c
 create mode 100644 lib/RF24/utility/SPIDEV/compatibility.h
 create mode 100644 lib/RF24/utility/SPIDEV/gpio.cpp
 create mode 100644 lib/RF24/utility/SPIDEV/gpio.h
 create mode 100644 lib/RF24/utility/SPIDEV/includes.h
 create mode 100644 lib/RF24/utility/SPIDEV/interrupt.c
 create mode 100644 lib/RF24/utility/SPIDEV/interrupt.h
 create mode 100644 lib/RF24/utility/SPIDEV/spi.cpp
 create mode 100644 lib/RF24/utility/SPIDEV/spi.h
 create mode 100644 lib/RF24/utility/Teensy/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/Template/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/Template/compatibility.h
 create mode 100644 lib/RF24/utility/Template/gpio.h
 create mode 100644 lib/RF24/utility/Template/includes.h
 create mode 100644 lib/RF24/utility/Template/spi.h
 create mode 100644 lib/RF24/utility/wiringPi/RF24_arch_config.h
 create mode 100644 lib/RF24/utility/wiringPi/includes.h
 create mode 100644 lib/RF24/utility/wiringPi/spi.cpp
 create mode 100644 lib/RF24/utility/wiringPi/spi.h
 create mode 100644 lib/RF24/wikidoc.xslt
 create mode 100644 tasmota/xdrv_33_nrf24l01.ino
 create mode 100644 tasmota/xsns_61_MI_BLE.ino

diff --git a/lib/RF24/.gitignore b/lib/RF24/.gitignore
new file mode 100644
index 000000000..c05f1977e
--- /dev/null
+++ b/lib/RF24/.gitignore
@@ -0,0 +1,26 @@
+*.bak
+*.o
+.*.swp
+*.orig
+.swp
+docs/
+output/
+ojam/
+out/
+16000000/
+8000000/
+out_native/
+version.h
+Session.vim
+*.so
+*.so.*
+*.dylib
+*.dylib.*
+.DS_Store
+Makefile.inc
+utility/includes.h
+examples_linux/*
+!examples_linux/**/
+!examples_linux/*.*
+.directory
+.idea
diff --git a/lib/RF24/CONTRIBUTING.md b/lib/RF24/CONTRIBUTING.md
new file mode 100644
index 000000000..e02d19015
--- /dev/null
+++ b/lib/RF24/CONTRIBUTING.md
@@ -0,0 +1 @@
+Try your best to follow the NASA C style http://homepages.inf.ed.ac.uk/dts/pm/Papers/nasa-c-style.pdf
diff --git a/lib/RF24/Doxyfile b/lib/RF24/Doxyfile
new file mode 100644
index 000000000..b7979e410
--- /dev/null
+++ b/lib/RF24/Doxyfile
@@ -0,0 +1,2462 @@
+# Doxyfile 1.8.10
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Optimized High Speed NRF24L01+ Driver Class Documenation"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = V1.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "TMRh20 2014 - Optimized Fork of NRF24L01+ Driver"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "../../ArduinoBuilds/RF24 Docs"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = 
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = ino=c \
+                         pde=c
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = 
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ./ \
+                         ./arch/Template \
+                         ./utility/Template
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
+# *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.as \
+                         *.js \
+                         Makefile
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = bcm2835* \
+                         readme* \
+                         runtest* \
+                         tests*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = examples \
+                         examples_linux
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 10
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = doxygen-custom.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             = 
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               = 
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           = 
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      = 
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/lib/RF24/LICENSE b/lib/RF24/LICENSE
new file mode 100644
index 000000000..23cb79033
--- /dev/null
+++ b/lib/RF24/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/lib/RF24/Makefile b/lib/RF24/Makefile
new file mode 100644
index 000000000..1d330a961
--- /dev/null
+++ b/lib/RF24/Makefile
@@ -0,0 +1,126 @@
+#############################################################################
+#
+# Makefile for librf24
+#
+# License: GPL (General Public License)
+# Author:  Charles-Henri Hallard 
+# Date:    2013/03/13 
+#
+# Description:
+# ------------
+# use make all and make install to install the library 
+#
+
+CONFIG_FILE=Makefile.inc
+REMOTE_ERROR="[ERROR] Remote machine not configured. Run configure with respective arguments."
+
+include $(CONFIG_FILE)
+
+# Objects to compile
+OBJECTS=RF24.o
+ifeq ($(DRIVER), MRAA)
+OBJECTS+=spi.o gpio.o compatibility.o
+else ifeq ($(DRIVER), RPi)
+OBJECTS+=spi.o bcm2835.o interrupt.o
+else ifeq ($(DRIVER), SPIDEV)
+OBJECTS+=spi.o gpio.o compatibility.o interrupt.o
+else ifeq ($(DRIVER), wiringPi)
+OBJECTS+=spi.o
+endif
+
+# make all
+# reinstall the library after each recompilation
+all: $(LIBNAME)
+
+# Make the library
+$(LIBNAME): $(OBJECTS)
+	@echo "[Linking]"
+	$(CC) $(SHARED_LINKER_FLAGS) $(CFLAGS) -o $(LIBNAME) $^ $(SHARED_LINKER_LIBS)
+
+# Library parts
+RF24.o: RF24.cpp	
+	$(CXX) -fPIC $(CFLAGS) -c $^
+
+bcm2835.o: $(DRIVER_DIR)/bcm2835.c
+	$(CC) -fPIC $(CFLAGS) -c $^
+
+spi.o: $(DRIVER_DIR)/spi.cpp
+	$(CXX) -fPIC $(CFLAGS) -c $^
+
+compatibility.o: $(DRIVER_DIR)/compatibility.c
+	$(CC) -fPIC  $(CFLAGS) -c $(DRIVER_DIR)/compatibility.c
+
+gpio.o: $(DRIVER_DIR)/gpio.cpp
+	$(CXX) -fPIC $(CFLAGS) -c $(DRIVER_DIR)/gpio.cpp
+
+interrupt.o: $(DRIVER_DIR)/interrupt.c
+	$(CXX) -fPIC $(CFLAGS) -c $(DRIVER_DIR)/interrupt.c
+	
+# clear configuration files
+cleanconfig:
+	@echo "[Cleaning configuration]"
+	rm -rf $(CONFIG_FILE) utility/includes.h
+
+# clear build files
+clean:
+	@echo "[Cleaning]"
+	rm -rf *.o $(LIBNAME)
+
+$(CONFIG_FILE):
+	@echo "[Running configure]"
+	@./configure --no-clean
+
+install: all install-libs install-headers
+upload: all upload-libs upload-headers
+
+# Install the library to LIBPATH
+install-libs:
+	@echo "[Installing Libs to $(LIB_DIR)]"
+	@if ( test ! -d $(LIB_DIR) ); then mkdir -p $(LIB_DIR); fi
+	@install -m 0755 $(LIBNAME) $(LIB_DIR)
+	@orig=$(LIBNAME) && \
+	for sl in $(LIBSYMLINKS); do \
+		ln -sf $(LIB_DIR)/$${orig} $(LIB_DIR)/$${sl}; \
+		orig=$${sl}; \
+	done && \
+	if [ "$(LIBDEPRECATE)" ]; then ln -sf $(LIB_DIR)/$${orig} $(LIB_DIR)/$(LIBDEPRECATE); fi
+ifneq ($(LDCONFIG),)
+	@$(LDCONFIG)
+endif
+
+upload-libs:
+	@echo "[Uploading Libs to $(REMOTE):$(REMOTE_LIB_DIR)]"
+ifeq ($(REMOTE),)
+	@echo "$(REMOTE_ERROR)"
+	@exit 1
+endif
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "mkdir -p $(REMOTE_LIB_DIR)"
+	@scp -q -P $(REMOTE_PORT) $(LIBNAME) $(REMOTE):/tmp
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo install -m 0755 /tmp/$(LIBNAME) $(REMOTE_LIB_DIR) &&" \
+		" orig=$(LIBNAME) && for sl in $(LIBSYMLINKS); do sudo ln -sf $(REMOTE_LIB_DIR)/\$${orig} $(REMOTE_LIB_DIR)/\$${sl}; orig=\$${sl}; done &&" \
+		" if [ "$(LIBDEPRECATE)" ]; then sudo ln -sf $(REMOTE_LIB_DIR)/\$${orig} $(REMOTE_LIB_DIR)/$(LIBDEPRECATE); fi &&" \
+		" rm /tmp/$(LIBNAME)"
+ifneq ($(REMOTE_LDCONFIG),)
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo $(REMOTE_LDCONFIG)"
+endif
+
+install-headers:
+	@echo "[Installing Headers to $(HEADER_DIR)]"
+	@mkdir -p $(HEADER_DIR)/$(DRIVER_DIR)
+	@install -m 0644 *.h $(HEADER_DIR)
+	@install -m 0644 $(DRIVER_DIR)/*.h $(HEADER_DIR)/$(DRIVER_DIR)
+	@install -m 0644 $(ARCH_DIR)/*.h $(HEADER_DIR)/$(ARCH_DIR)
+
+upload-headers:
+	@echo "[Uploading Headers to $(REMOTE):$(REMOTE_HEADER_DIR)]"
+ifeq ($(REMOTE),)
+	@echo "$(REMOTE_ERROR)"
+	@exit 1
+endif
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo mkdir -p $(REMOTE_HEADER_DIR)/$(DRIVER_DIR)"
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "mkdir -p /tmp/RF24 && rm -rf /tmp/RF24/*"
+	@rsync -a --include="*.h" --include="*/" --exclude="*" -e "ssh -p $(REMOTE_PORT)" . $(REMOTE):/tmp/RF24
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo install -m 0644 /tmp/RF24/*.h $(REMOTE_HEADER_DIR)"
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo install -m 0644 /tmp/RF24/$(DRIVER_DIR)/*.h $(REMOTE_HEADER_DIR)/$(DRIVER_DIR)"
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo install -m 0644 /tmp/RF24/$(ARCH_DIR)/*.h $(REMOTE_HEADER_DIR)/$(ARCH_DIR)"
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "rm -rf /tmp/RF24"
diff --git a/lib/RF24/README.md b/lib/RF24/README.md
new file mode 100644
index 000000000..2176503a9
--- /dev/null
+++ b/lib/RF24/README.md
@@ -0,0 +1,2 @@
+
+**See http://tmrh20.github.io/RF24 for all documentation**
\ No newline at end of file
diff --git a/lib/RF24/RF24.cpp b/lib/RF24/RF24.cpp
new file mode 100644
index 000000000..07a44d549
--- /dev/null
+++ b/lib/RF24/RF24.cpp
@@ -0,0 +1,1638 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+#include "nRF24L01.h"
+#include "RF24_config.h"
+#include "RF24.h"
+
+/****************************************************************************/
+
+void RF24::csn(bool mode)
+{
+
+#if defined (RF24_TINY)
+	if (ce_pin != csn_pin) {
+		digitalWrite(csn_pin,mode);
+	} 
+	else {
+		if (mode == HIGH) {
+			PORTB |= (1<<PINB2);  	// SCK->CSN HIGH
+			delayMicroseconds(100); // allow csn to settle.
+		} 
+		else {
+			PORTB &= ~(1<<PINB2);	// SCK->CSN LOW
+			delayMicroseconds(11);  // allow csn to settle
+		}
+	}
+	// Return, CSN toggle complete
+	return;
+	
+#elif defined(ARDUINO) && !defined (RF24_SPI_TRANSACTIONS)
+	// Minimum ideal SPI bus speed is 2x data rate
+	// If we assume 2Mbs data rate and 16Mhz clock, a
+	// divider of 4 is the minimum we want.
+	// CLK:BUS 8Mhz:2Mhz, 16Mhz:4Mhz, or 20Mhz:5Mhz
+	
+      #if !defined (SOFTSPI)	
+		_SPI.setBitOrder(MSBFIRST);
+		_SPI.setDataMode(SPI_MODE0);
+		#if !defined(F_CPU) || F_CPU < 20000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV2);
+		#elif F_CPU < 40000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV4);
+		#elif F_CPU < 80000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV8);
+		#elif F_CPU < 160000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV16);
+		#elif F_CPU < 320000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV32);
+		#elif F_CPU < 640000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV64);
+		#elif F_CPU < 1280000000
+			_SPI.setClockDivider(SPI_CLOCK_DIV128);
+		#else
+			#error "Unsupported CPU frequency. Please set correct SPI divider."
+		#endif
+
+      #endif
+#elif defined (RF24_RPi)
+      if(!mode)
+	    _SPI.chipSelect(csn_pin);
+#endif
+
+#if !defined (RF24_LINUX)
+	digitalWrite(csn_pin,mode);
+	delayMicroseconds(csDelay);
+#endif
+
+}
+
+/****************************************************************************/
+
+void RF24::ce(bool level)
+{
+  //Allow for 3-pin use on ATTiny
+  if (ce_pin != csn_pin) digitalWrite(ce_pin,level);
+}
+
+/****************************************************************************/
+
+  inline void RF24::beginTransaction() {
+    #if defined (RF24_SPI_TRANSACTIONS)
+    _SPI.beginTransaction(SPISettings(RF24_SPI_SPEED, MSBFIRST, SPI_MODE0));
+    #endif
+    csn(LOW);
+  }
+
+/****************************************************************************/
+
+  inline void RF24::endTransaction() {
+    csn(HIGH);
+	#if defined (RF24_SPI_TRANSACTIONS)
+    _SPI.endTransaction();
+	#endif
+  }
+
+/****************************************************************************/
+
+uint8_t RF24::read_register(uint8_t reg, uint8_t* buf, uint8_t len)
+{
+  uint8_t status;
+
+  #if defined (RF24_LINUX)
+  beginTransaction(); //configures the spi settings for RPi, locks mutex and setting csn low
+  uint8_t * prx = spi_rxbuff;
+  uint8_t * ptx = spi_txbuff;
+  uint8_t size = len + 1; // Add register value to transmit buffer
+
+  *ptx++ = ( R_REGISTER | ( REGISTER_MASK & reg ) );
+
+  while (len--){ *ptx++ = RF24_NOP; } // Dummy operation, just for reading
+  
+  _SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, size);
+  
+  status = *prx++; // status is 1st byte of receive buffer
+
+  // decrement before to skip status byte
+  while ( --size ){ *buf++ = *prx++; } 
+  endTransaction(); //unlocks mutex and setting csn high
+
+#else
+
+  beginTransaction();
+  status = _SPI.transfer( R_REGISTER | ( REGISTER_MASK & reg ) );
+  while ( len-- ){
+    *buf++ = _SPI.transfer(0xff);
+  }
+  endTransaction();
+
+#endif
+
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::read_register(uint8_t reg)
+{
+  uint8_t result;
+  
+  #if defined (RF24_LINUX)
+	
+  beginTransaction();
+  
+  uint8_t * prx = spi_rxbuff;
+  uint8_t * ptx = spi_txbuff;	
+  *ptx++ = ( R_REGISTER | ( REGISTER_MASK & reg ) );
+  *ptx++ = RF24_NOP ; // Dummy operation, just for reading
+  
+  _SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, 2);
+  result = *++prx;   // result is 2nd byte of receive buffer
+  
+  endTransaction();
+  #else
+
+  beginTransaction();
+  _SPI.transfer( R_REGISTER | ( REGISTER_MASK & reg ) );
+  result = _SPI.transfer(0xff);
+  endTransaction();
+
+  #endif
+
+  return result;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::write_register(uint8_t reg, const uint8_t* buf, uint8_t len)
+{
+  uint8_t status;
+
+  #if defined (RF24_LINUX) 
+  beginTransaction();
+  uint8_t * prx = spi_rxbuff;
+  uint8_t * ptx = spi_txbuff;
+  uint8_t size = len + 1; // Add register value to transmit buffer
+
+  *ptx++ = ( W_REGISTER | ( REGISTER_MASK & reg ) );
+  while ( len-- )
+    *ptx++ = *buf++;
+  
+  _SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, size);
+  status = *prx; // status is 1st byte of receive buffer
+  endTransaction();
+  #else
+
+  beginTransaction();
+  status = _SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) );
+  while ( len-- )
+    _SPI.transfer(*buf++);
+  endTransaction();
+
+  #endif
+
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::write_register(uint8_t reg, uint8_t value)
+{
+  uint8_t status;
+
+  IF_SERIAL_DEBUG(printf_P(PSTR("write_register(%02x,%02x)\r\n"),reg,value));
+
+  #if defined (RF24_LINUX)
+    beginTransaction();
+	uint8_t * prx = spi_rxbuff;
+	uint8_t * ptx = spi_txbuff;
+	*ptx++ = ( W_REGISTER | ( REGISTER_MASK & reg ) );
+	*ptx = value ;	
+  	
+	_SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, 2);
+	status = *prx++; // status is 1st byte of receive buffer
+	endTransaction();
+  #else
+
+  beginTransaction();
+  status = _SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) );
+  _SPI.transfer(value);
+  endTransaction();
+
+  #endif
+
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::write_payload(const void* buf, uint8_t data_len, const uint8_t writeType)
+{
+  uint8_t status;
+  const uint8_t* current = reinterpret_cast<const uint8_t*>(buf);
+
+   data_len = rf24_min(data_len, payload_size);
+   uint8_t blank_len = dynamic_payloads_enabled ? 0 : payload_size - data_len;
+  
+  //printf("[Writing %u bytes %u blanks]",data_len,blank_len);
+  IF_SERIAL_DEBUG( printf("[Writing %u bytes %u blanks]\n",data_len,blank_len); );
+  
+ #if defined (RF24_LINUX)
+	beginTransaction();
+	uint8_t * prx = spi_rxbuff;
+	uint8_t * ptx = spi_txbuff;
+    uint8_t size;
+	size = data_len + blank_len + 1 ; // Add register value to transmit buffer
+
+	*ptx++ =  writeType;
+    while ( data_len-- )
+      *ptx++ =  *current++;
+    while ( blank_len-- )
+	  *ptx++ =  0;
+	
+	_SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, size);
+	status = *prx; // status is 1st byte of receive buffer
+	endTransaction();
+
+  #else
+
+  beginTransaction();
+  status = _SPI.transfer( writeType );
+  while ( data_len-- ) {
+    _SPI.transfer(*current++);
+  }
+  while ( blank_len-- ) {
+    _SPI.transfer(0);
+  }  
+  endTransaction();
+
+  #endif
+
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::read_payload(void* buf, uint8_t data_len)
+{
+  uint8_t status;
+  uint8_t* current = reinterpret_cast<uint8_t*>(buf);
+
+  if(data_len > payload_size) data_len = payload_size;
+  uint8_t blank_len = dynamic_payloads_enabled ? 0 : payload_size - data_len;
+  
+  //printf("[Reading %u bytes %u blanks]",data_len,blank_len);
+
+  IF_SERIAL_DEBUG( printf("[Reading %u bytes %u blanks]\n",data_len,blank_len); );
+  
+  #if defined (RF24_LINUX)
+	beginTransaction();
+	uint8_t * prx = spi_rxbuff;
+	uint8_t * ptx = spi_txbuff;
+    uint8_t size;
+    size = data_len + blank_len + 1; // Add register value to transmit buffer
+
+	*ptx++ =  R_RX_PAYLOAD;
+	while(--size) 
+		*ptx++ = RF24_NOP;
+		
+	size = data_len + blank_len + 1; // Size has been lost during while, re affect
+	
+	_SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, size);
+	
+	status = *prx++; // 1st byte is status	
+    
+    if (data_len > 0) {
+      while ( --data_len ) // Decrement before to skip 1st status byte
+          *current++ = *prx++;
+		
+      *current = *prx;
+    }
+	endTransaction();
+  #else
+
+  beginTransaction();
+  status = _SPI.transfer( R_RX_PAYLOAD );
+  while ( data_len-- ) {
+    *current++ = _SPI.transfer(0xFF);
+  }
+  while ( blank_len-- ) {
+    _SPI.transfer(0xff);
+  }
+  endTransaction();
+
+  #endif
+
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::flush_rx(void)
+{
+  return spiTrans( FLUSH_RX );
+}
+
+/****************************************************************************/
+
+uint8_t RF24::flush_tx(void)
+{
+  return spiTrans( FLUSH_TX );
+}
+
+/****************************************************************************/
+
+uint8_t RF24::spiTrans(uint8_t cmd){
+
+  uint8_t status;
+  
+  beginTransaction();
+  status = _SPI.transfer( cmd );
+  endTransaction();
+  
+  return status;
+}
+
+/****************************************************************************/
+
+uint8_t RF24::get_status(void)
+{
+  return spiTrans(RF24_NOP);
+}
+
+/****************************************************************************/
+#if !defined (MINIMAL)
+void RF24::print_status(uint8_t status)
+{
+  printf_P(PSTR("STATUS\t\t = 0x%02x RX_DR=%x TX_DS=%x MAX_RT=%x RX_P_NO=%x TX_FULL=%x\r\n"),
+           status,
+           (status & _BV(RX_DR))?1:0,
+           (status & _BV(TX_DS))?1:0,
+           (status & _BV(MAX_RT))?1:0,
+           ((status >> RX_P_NO) & 0x07),
+           (status & _BV(TX_FULL))?1:0
+          );
+}
+
+/****************************************************************************/
+
+void RF24::print_observe_tx(uint8_t value)
+{
+  printf_P(PSTR("OBSERVE_TX=%02x: POLS_CNT=%x ARC_CNT=%x\r\n"),
+           value,
+           (value >> PLOS_CNT) & 0x0F,
+           (value >> ARC_CNT) & 0x0F
+          );
+}
+
+/****************************************************************************/
+
+void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty)
+{
+  //char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
+  //printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
+  #if defined (RF24_LINUX)
+    printf("%s\t =", name);
+  #else
+    printf_P(PSTR(PRIPSTR"\t ="),name);
+  #endif
+  while (qty--)
+    printf_P(PSTR(" 0x%02x"),read_register(reg++));
+  printf_P(PSTR("\r\n"));
+}
+
+/****************************************************************************/
+
+void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty)
+{
+
+  #if defined (RF24_LINUX)
+    printf("%s\t =",name);
+  #else
+    printf_P(PSTR(PRIPSTR"\t ="),name);
+  #endif
+  while (qty--)
+  {
+    uint8_t buffer[addr_width];
+    read_register(reg++,buffer,sizeof buffer);
+
+    printf_P(PSTR(" 0x"));
+    uint8_t* bufptr = buffer + sizeof buffer;
+    while( --bufptr >= buffer )
+      printf_P(PSTR("%02x"),*bufptr);
+  }
+
+  printf_P(PSTR("\r\n"));
+}
+#endif
+/****************************************************************************/
+
+RF24::RF24():
+  p_variant(false),
+  payload_size(32), dynamic_payloads_enabled(false), addr_width(5),csDelay(5)//,pipe0_reading_address(0)
+{
+  pipe0_reading_address[0]=0;
+}
+
+/****************************************************************************/
+
+#if defined (RF24_LINUX) && !defined (MRAA)//RPi constructor
+
+RF24::RF24(uint16_t _cepin, uint16_t _cspin, uint32_t _spi_speed):
+  ce_pin(_cepin),csn_pin(_cspin),spi_speed(_spi_speed),p_variant(false), payload_size(32), dynamic_payloads_enabled(false),addr_width(5)//,pipe0_reading_address(0) 
+{
+  pipe0_reading_address[0]=0;
+}
+#endif
+
+/****************************************************************************/
+
+void RF24::setChannel(uint8_t channel)
+{
+  const uint8_t max_channel = 125;
+  write_register(RF_CH,rf24_min(channel,max_channel));
+}
+
+uint8_t RF24::getChannel()
+{
+  
+  return read_register(RF_CH);
+}
+/****************************************************************************/
+
+void RF24::setPayloadSize(uint8_t size)
+{
+  payload_size = rf24_min(size,32);
+}
+
+/****************************************************************************/
+
+uint8_t RF24::getPayloadSize(void)
+{
+  return payload_size;
+}
+
+/****************************************************************************/
+
+#if !defined (MINIMAL)
+
+static const char rf24_datarate_e_str_0[] PROGMEM = "1MBPS";
+static const char rf24_datarate_e_str_1[] PROGMEM = "2MBPS";
+static const char rf24_datarate_e_str_2[] PROGMEM = "250KBPS";
+static const char * const rf24_datarate_e_str_P[] PROGMEM = {
+  rf24_datarate_e_str_0,
+  rf24_datarate_e_str_1,
+  rf24_datarate_e_str_2,
+};
+static const char rf24_model_e_str_0[] PROGMEM = "nRF24L01";
+static const char rf24_model_e_str_1[] PROGMEM = "nRF24L01+";
+static const char * const rf24_model_e_str_P[] PROGMEM = {
+  rf24_model_e_str_0,
+  rf24_model_e_str_1,
+};
+static const char rf24_crclength_e_str_0[] PROGMEM = "Disabled";
+static const char rf24_crclength_e_str_1[] PROGMEM = "8 bits";
+static const char rf24_crclength_e_str_2[] PROGMEM = "16 bits" ;
+static const char * const rf24_crclength_e_str_P[] PROGMEM = {
+  rf24_crclength_e_str_0,
+  rf24_crclength_e_str_1,
+  rf24_crclength_e_str_2,
+};
+static const char rf24_pa_dbm_e_str_0[] PROGMEM = "PA_MIN";
+static const char rf24_pa_dbm_e_str_1[] PROGMEM = "PA_LOW";
+static const char rf24_pa_dbm_e_str_2[] PROGMEM = "PA_HIGH";
+static const char rf24_pa_dbm_e_str_3[] PROGMEM = "PA_MAX";
+static const char * const rf24_pa_dbm_e_str_P[] PROGMEM = {
+  rf24_pa_dbm_e_str_0,
+  rf24_pa_dbm_e_str_1,
+  rf24_pa_dbm_e_str_2,
+  rf24_pa_dbm_e_str_3,
+};
+
+#if defined (RF24_LINUX)
+static const char rf24_csn_e_str_0[] = "CE0 (PI Hardware Driven)";
+static const char rf24_csn_e_str_1[] = "CE1 (PI Hardware Driven)";
+static const char rf24_csn_e_str_2[] = "CE2 (PI Hardware Driven)";
+static const char rf24_csn_e_str_3[] = "Custom GPIO Software Driven";
+static const char * const rf24_csn_e_str_P[] = {
+  rf24_csn_e_str_0,
+  rf24_csn_e_str_1,
+  rf24_csn_e_str_2,
+  rf24_csn_e_str_3,
+};
+#endif
+
+void RF24::printDetails(void)
+{
+
+#if defined (RF24_RPi)
+  printf("================ SPI Configuration ================\n" );
+  if (csn_pin < BCM2835_SPI_CS_NONE ){
+    printf("CSN Pin  \t = %s\n",rf24_csn_e_str_P[csn_pin]);
+  }else{
+    printf("CSN Pin  \t = Custom GPIO%d%s\n", csn_pin,
+    csn_pin==RPI_V2_GPIO_P1_26 ? " (CE1) Software Driven" : "" );
+  }
+  printf("CE Pin  \t = Custom GPIO%d\n", ce_pin );
+  printf("Clock Speed\t = " );
+	switch (spi_speed)
+	{
+		case BCM2835_SPI_SPEED_64MHZ : printf("64 Mhz");	break ;
+		case BCM2835_SPI_SPEED_32MHZ : printf("32 Mhz");	break ;
+		case BCM2835_SPI_SPEED_16MHZ : printf("16 Mhz");	break ;
+		case BCM2835_SPI_SPEED_8MHZ  : printf("8 Mhz");	break ;
+		case BCM2835_SPI_SPEED_4MHZ  : printf("4 Mhz");	break ;
+		case BCM2835_SPI_SPEED_2MHZ  : printf("2 Mhz");	break ;
+		case BCM2835_SPI_SPEED_1MHZ  : printf("1 Mhz");	break ;
+		case BCM2835_SPI_SPEED_512KHZ: printf("512 KHz");	break ;
+		case BCM2835_SPI_SPEED_256KHZ: printf("256 KHz");	break ;
+		case BCM2835_SPI_SPEED_128KHZ: printf("128 KHz");	break ;
+		case BCM2835_SPI_SPEED_64KHZ : printf("64 KHz");	break ;
+		case BCM2835_SPI_SPEED_32KHZ : printf("32 KHz");	break ;
+		case BCM2835_SPI_SPEED_16KHZ : printf("16 KHz");	break ;
+		case BCM2835_SPI_SPEED_8KHZ  : printf("8 KHz");	break ;
+		default : printf("8 Mhz");	break ;
+	}
+	printf("\n================ NRF Configuration ================\n");
+ 
+#endif //Linux
+
+  print_status(get_status());
+
+  print_address_register(PSTR("RX_ADDR_P0-1"),RX_ADDR_P0,2);
+  print_byte_register(PSTR("RX_ADDR_P2-5"),RX_ADDR_P2,4);
+  print_address_register(PSTR("TX_ADDR\t"),TX_ADDR);
+
+  print_byte_register(PSTR("RX_PW_P0-6"),RX_PW_P0,6);
+  print_byte_register(PSTR("EN_AA\t"),EN_AA);
+  print_byte_register(PSTR("EN_RXADDR"),EN_RXADDR);
+  print_byte_register(PSTR("RF_CH\t"),RF_CH);
+  print_byte_register(PSTR("RF_SETUP"),RF_SETUP);
+  print_byte_register(PSTR("CONFIG\t"),NRF_CONFIG);
+  print_byte_register(PSTR("DYNPD/FEATURE"),DYNPD,2);
+
+  printf_P(PSTR("Data Rate\t = " PRIPSTR "\r\n"),pgm_read_ptr(&rf24_datarate_e_str_P[getDataRate()]));
+  printf_P(PSTR("Model\t\t = " PRIPSTR "\r\n"),pgm_read_ptr(&rf24_model_e_str_P[isPVariant()]));
+  printf_P(PSTR("CRC Length\t = " PRIPSTR "\r\n"),pgm_read_ptr(&rf24_crclength_e_str_P[getCRCLength()]));
+  printf_P(PSTR("PA Power\t = " PRIPSTR "\r\n"),  pgm_read_ptr(&rf24_pa_dbm_e_str_P[getPALevel()]));
+
+}
+
+#endif
+/****************************************************************************/
+
+bool RF24::begin(uint16_t _cepin, uint16_t _cspin)
+{
+    // Initizalize the ce_pin and ce_pin values
+  this->ce_pin = _cepin;
+  this->csn_pin = _cspin;
+
+  uint8_t setup=0;
+
+  #if defined (RF24_LINUX)
+
+	#if defined (MRAA)
+	  GPIO();	
+	  gpio.begin(ce_pin,csn_pin);	
+	#endif
+	
+    #ifdef RF24_RPi
+	  switch(csn_pin){     //Ensure valid hardware CS pin
+	    case 0: break;
+	    case 1: break;
+	    // Allow BCM2835 enums for RPi
+	    case 8: csn_pin = 0; break;
+	    case 7: csn_pin = 1; break;
+	    case 18: csn_pin = 10; break;	//to make it work on SPI1
+	    case 17: csn_pin = 11; break;
+	    case 16: csn_pin = 12; break;
+	    default: csn_pin = 0; break;
+	  }
+    #endif
+	
+    _SPI.begin(csn_pin);
+
+	pinMode(ce_pin,OUTPUT);
+	ce(LOW);    
+
+	delay(100);
+  
+  #elif defined(LITTLEWIRE)
+    pinMode(csn_pin,OUTPUT);
+    _SPI.begin();
+    csn(HIGH);
+  #elif defined(XMEGA_D3)
+	if (ce_pin != csn_pin) pinMode(ce_pin,OUTPUT);
+	_SPI.begin(csn_pin);
+	ce(LOW);
+	csn(HIGH);
+	delay(200);
+  #else
+    // Initialize pins
+    if (ce_pin != csn_pin) pinMode(ce_pin,OUTPUT);  
+  
+    #if ! defined(LITTLEWIRE)
+      if (ce_pin != csn_pin)
+    #endif
+        pinMode(csn_pin,OUTPUT);
+    
+    _SPI.begin();
+    ce(LOW);
+  	csn(HIGH);
+  	#if defined (__ARDUINO_X86__)
+		delay(100);
+  	#endif
+  #endif //Linux
+
+  // Must allow the radio time to settle else configuration bits will not necessarily stick.
+  // This is actually only required following power up but some settling time also appears to
+  // be required after resets too. For full coverage, we'll always assume the worst.
+  // Enabling 16b CRC is by far the most obvious case if the wrong timing is used - or skipped.
+  // Technically we require 4.5ms + 14us as a worst case. We'll just call it 5ms for good measure.
+  // WARNING: Delay is based on P-variant whereby non-P *may* require different timing.
+  delay( 5 ) ;
+
+  // Reset NRF_CONFIG and enable 16-bit CRC.
+  write_register( NRF_CONFIG, 0x0C ) ;
+
+  // Set 1500uS (minimum for 32B payload in ESB@250KBPS) timeouts, to make testing a little easier
+  // WARNING: If this is ever lowered, either 250KBS mode with AA is broken or maximum packet
+  // sizes must never be used. See documentation for a more complete explanation.
+  setRetries(5,15);
+
+  // Reset value is MAX
+  //setPALevel( RF24_PA_MAX ) ;
+
+  // check for connected module and if this is a p nRF24l01 variant
+  //
+  if( setDataRate( RF24_250KBPS ) )
+  {
+    p_variant = true ;
+  }
+  setup = read_register(RF_SETUP);
+  /*if( setup == 0b00001110 )     // register default for nRF24L01P
+  {
+    p_variant = true ;
+  }*/
+  
+  // Then set the data rate to the slowest (and most reliable) speed supported by all
+  // hardware.
+  setDataRate( RF24_1MBPS ) ;
+
+  // Initialize CRC and request 2-byte (16bit) CRC
+  //setCRCLength( RF24_CRC_16 ) ;
+
+  // Disable dynamic payloads, to match dynamic_payloads_enabled setting - Reset value is 0
+  toggle_features();
+  write_register(FEATURE,0 );
+  write_register(DYNPD,0);
+  dynamic_payloads_enabled = false;
+
+  // Reset current status
+  // Notice reset and flush is the last thing we do
+  write_register(NRF_STATUS,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
+
+  // Set up default configuration.  Callers can always change it later.
+  // This channel should be universally safe and not bleed over into adjacent
+  // spectrum.
+  setChannel(76);
+
+  // Flush buffers
+  flush_rx();
+  flush_tx();
+
+  powerUp(); //Power up by default when begin() is called
+
+  // Enable PTX, do not write CE high so radio will remain in standby I mode ( 130us max to transition to RX or TX instead of 1500us from powerUp )
+  // PTX should use only 22uA of power
+  write_register(NRF_CONFIG, ( read_register(NRF_CONFIG) ) & ~_BV(PRIM_RX) );
+
+  // if setup is 0 or ff then there was no response from module
+  return ( setup != 0 && setup != 0xff );
+}
+
+/****************************************************************************/
+
+bool RF24::isChipConnected()
+{
+  uint8_t setup = read_register(SETUP_AW);
+  if(setup >= 1 && setup <= 3)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+/****************************************************************************/
+
+void RF24::startListening(void)
+{
+ #if !defined (RF24_TINY) && ! defined(LITTLEWIRE)
+  powerUp();
+ #endif
+  write_register(NRF_CONFIG, read_register(NRF_CONFIG) | _BV(PRIM_RX));
+  write_register(NRF_STATUS, _BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
+  ce(HIGH);
+  // Restore the pipe0 adddress, if exists
+  if (pipe0_reading_address[0] > 0){
+    write_register(RX_ADDR_P0, pipe0_reading_address, addr_width);	
+  }else{
+	closeReadingPipe(0);
+  }
+
+  // Flush buffers
+  //flush_rx();
+  if(read_register(FEATURE) & _BV(EN_ACK_PAY)){
+	flush_tx();
+  }
+
+  // Go!
+  //delayMicroseconds(100);
+}
+
+/****************************************************************************/
+static const uint8_t child_pipe_enable[] PROGMEM =
+{
+  ERX_P0, ERX_P1, ERX_P2, ERX_P3, ERX_P4, ERX_P5
+};
+
+void RF24::stopListening(void)
+{  
+  ce(LOW);
+
+  delayMicroseconds(txDelay);
+  
+  if(read_register(FEATURE) & _BV(EN_ACK_PAY)){
+    delayMicroseconds(txDelay); //200
+	flush_tx();
+  }
+  //flush_rx();
+  write_register(NRF_CONFIG, ( read_register(NRF_CONFIG) ) & ~_BV(PRIM_RX) );
+ 
+  #if defined (RF24_TINY) || defined (LITTLEWIRE)
+  // for 3 pins solution TX mode is only left with additonal powerDown/powerUp cycle
+  if (ce_pin == csn_pin) {
+    powerDown();
+	powerUp();
+  }
+  #endif
+  write_register(EN_RXADDR,read_register(EN_RXADDR) | _BV(pgm_read_byte(&child_pipe_enable[0]))); // Enable RX on pipe0
+  
+  //delayMicroseconds(100);
+
+}
+
+/****************************************************************************/
+
+void RF24::powerDown(void)
+{
+  ce(LOW); // Guarantee CE is low on powerDown
+  write_register(NRF_CONFIG,read_register(NRF_CONFIG) & ~_BV(PWR_UP));
+}
+
+/****************************************************************************/
+
+//Power up now. Radio will not power down unless instructed by MCU for config changes etc.
+void RF24::powerUp(void)
+{
+   uint8_t cfg = read_register(NRF_CONFIG);
+
+   // if not powered up then power up and wait for the radio to initialize
+   if (!(cfg & _BV(PWR_UP))){
+      write_register(NRF_CONFIG, cfg | _BV(PWR_UP));
+
+      // For nRF24L01+ to go from power down mode to TX or RX mode it must first pass through stand-by mode.
+	  // There must be a delay of Tpd2stby (see Table 16.) after the nRF24L01+ leaves power down mode before
+	  // the CEis set high. - Tpd2stby can be up to 5ms per the 1.0 datasheet
+      delay(5);
+   }
+}
+
+/******************************************************************/
+#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+void RF24::errNotify(){
+	#if defined (SERIAL_DEBUG) || defined (RF24_LINUX)
+	  printf_P(PSTR("RF24 HARDWARE FAIL: Radio not responding, verify pin connections, wiring, etc.\r\n"));
+	#endif
+	#if defined (FAILURE_HANDLING)
+	failureDetected = 1;
+	#else
+	delay(5000);
+	#endif
+}
+#endif
+/******************************************************************/
+
+//Similar to the previous write, clears the interrupt flags
+bool RF24::write( const void* buf, uint8_t len, const bool multicast )
+{
+	//Start Writing
+	startFastWrite(buf,len,multicast);
+
+	//Wait until complete or failed
+	#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+		uint32_t timer = millis();
+	#endif 
+	
+	while( ! ( get_status()  & ( _BV(TX_DS) | _BV(MAX_RT) ))) { 
+		#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+			if(millis() - timer > 95){			
+				errNotify();
+				#if defined (FAILURE_HANDLING)
+				  return 0;		
+				#else
+				  delay(100);
+				#endif
+			}
+		#endif
+	}
+    
+	ce(LOW);
+
+	uint8_t status = write_register(NRF_STATUS,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
+
+  //Max retries exceeded
+  if( status & _BV(MAX_RT)){
+  	flush_tx(); //Only going to be 1 packet int the FIFO at a time using this method, so just flush
+  	return 0;
+  }
+	//TX OK 1 or 0
+  return 1;
+}
+
+bool RF24::write( const void* buf, uint8_t len ){
+	return write(buf,len,0);
+}
+/****************************************************************************/
+
+//For general use, the interrupt flags are not important to clear
+bool RF24::writeBlocking( const void* buf, uint8_t len, uint32_t timeout )
+{
+	//Block until the FIFO is NOT full.
+	//Keep track of the MAX retries and set auto-retry if seeing failures
+	//This way the FIFO will fill up and allow blocking until packets go through
+	//The radio will auto-clear everything in the FIFO as long as CE remains high
+
+	uint32_t timer = millis();							  //Get the time that the payload transmission started
+
+	while( ( get_status()  & ( _BV(TX_FULL) ))) {		  //Blocking only if FIFO is full. This will loop and block until TX is successful or timeout
+
+		if( get_status() & _BV(MAX_RT)){					  //If MAX Retries have been reached
+			reUseTX();										  //Set re-transmit and clear the MAX_RT interrupt flag
+			if(millis() - timer > timeout){ return 0; }		  //If this payload has exceeded the user-defined timeout, exit and return 0
+		}
+		#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+			if(millis() - timer > (timeout+95) ){			
+				errNotify();
+				#if defined (FAILURE_HANDLING)
+				return 0;			
+                #endif				
+			}
+		#endif
+
+  	}
+
+  	//Start Writing
+	startFastWrite(buf,len,0);								  //Write the payload if a buffer is clear
+
+	return 1;												  //Return 1 to indicate successful transmission
+}
+
+/****************************************************************************/
+
+void RF24::reUseTX(){
+		write_register(NRF_STATUS,_BV(MAX_RT) );			  //Clear max retry flag
+		spiTrans( REUSE_TX_PL );
+		ce(LOW);										  //Re-Transfer packet
+		ce(HIGH);
+}
+
+/****************************************************************************/
+
+bool RF24::writeFast( const void* buf, uint8_t len, const bool multicast )
+{
+	//Block until the FIFO is NOT full.
+	//Keep track of the MAX retries and set auto-retry if seeing failures
+	//Return 0 so the user can control the retrys and set a timer or failure counter if required
+	//The radio will auto-clear everything in the FIFO as long as CE remains high
+
+	#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+		uint32_t timer = millis();
+	#endif
+	
+	while( ( get_status()  & ( _BV(TX_FULL) ))) {			  //Blocking only if FIFO is full. This will loop and block until TX is successful or fail
+
+		if( get_status() & _BV(MAX_RT)){
+			//reUseTX();										  //Set re-transmit
+			write_register(NRF_STATUS,_BV(MAX_RT) );			  //Clear max retry flag
+			return 0;										  //Return 0. The previous payload has been retransmitted
+															  //From the user perspective, if you get a 0, just keep trying to send the same payload
+		}
+		#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+			if(millis() - timer > 95 ){			
+				errNotify();
+				#if defined (FAILURE_HANDLING)
+				return 0;							
+				#endif
+			}
+		#endif
+  	}
+		     //Start Writing
+	startFastWrite(buf,len,multicast);
+
+	return 1;
+}
+
+bool RF24::writeFast( const void* buf, uint8_t len ){
+	return writeFast(buf,len,0);
+}
+
+/****************************************************************************/
+
+//Per the documentation, we want to set PTX Mode when not listening. Then all we do is write data and set CE high
+//In this mode, if we can keep the FIFO buffers loaded, packets will transmit immediately (no 130us delay)
+//Otherwise we enter Standby-II mode, which is still faster than standby mode
+//Also, we remove the need to keep writing the config register over and over and delaying for 150 us each time if sending a stream of data
+
+void RF24::startFastWrite( const void* buf, uint8_t len, const bool multicast, bool startTx){ //TMRh20
+
+	//write_payload( buf,len);
+	write_payload( buf, len,multicast ? W_TX_PAYLOAD_NO_ACK : W_TX_PAYLOAD ) ;
+	if(startTx){
+		ce(HIGH);
+	}
+
+}
+
+/****************************************************************************/
+
+//Added the original startWrite back in so users can still use interrupts, ack payloads, etc
+//Allows the library to pass all tests
+void RF24::startWrite( const void* buf, uint8_t len, const bool multicast ){
+
+  // Send the payload
+
+  //write_payload( buf, len );
+  write_payload( buf, len,multicast? W_TX_PAYLOAD_NO_ACK : W_TX_PAYLOAD ) ;
+  ce(HIGH);
+  #if !defined(F_CPU) || F_CPU > 20000000
+	delayMicroseconds(10);
+  #endif
+  ce(LOW);
+
+
+}
+
+/****************************************************************************/
+
+bool RF24::rxFifoFull(){
+	return read_register(FIFO_STATUS) & _BV(RX_FULL);
+}
+/****************************************************************************/
+
+bool RF24::txStandBy(){
+
+    #if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+		uint32_t timeout = millis();
+	#endif
+	while( ! (read_register(FIFO_STATUS) & _BV(TX_EMPTY)) ){
+		if( get_status() & _BV(MAX_RT)){
+			write_register(NRF_STATUS,_BV(MAX_RT) );
+			ce(LOW);
+			flush_tx();    //Non blocking, flush the data
+			return 0;
+		}
+		#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+			if( millis() - timeout > 95){
+				errNotify();
+				#if defined (FAILURE_HANDLING)
+				return 0;	
+				#endif
+			}
+		#endif
+	}
+
+	ce(LOW);			   //Set STANDBY-I mode
+	return 1;
+}
+
+/****************************************************************************/
+
+bool RF24::txStandBy(uint32_t timeout, bool startTx){
+
+    if(startTx){
+	  stopListening();
+	  ce(HIGH);
+	}
+	uint32_t start = millis();
+
+	while( ! (read_register(FIFO_STATUS) & _BV(TX_EMPTY)) ){
+		if( get_status() & _BV(MAX_RT)){
+			write_register(NRF_STATUS,_BV(MAX_RT) );
+				ce(LOW);										  //Set re-transmit
+				ce(HIGH);
+				if(millis() - start >= timeout){
+					ce(LOW); flush_tx(); return 0;
+				}
+		}
+		#if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+			if( millis() - start > (timeout+95)){
+				errNotify();
+				#if defined (FAILURE_HANDLING)
+				return 0;	
+				#endif
+			}
+		#endif
+	}
+
+	
+	ce(LOW);				   //Set STANDBY-I mode
+	return 1;
+
+}
+
+/****************************************************************************/
+
+void RF24::maskIRQ(bool tx, bool fail, bool rx){
+
+	uint8_t config = read_register(NRF_CONFIG);
+	/* clear the interrupt flags */
+	config &= ~(1 << MASK_MAX_RT | 1 << MASK_TX_DS | 1 << MASK_RX_DR);
+	/* set the specified interrupt flags */
+	config |= fail << MASK_MAX_RT | tx << MASK_TX_DS | rx << MASK_RX_DR;
+	write_register(NRF_CONFIG, config);
+}
+
+/****************************************************************************/
+
+uint8_t RF24::getDynamicPayloadSize(void)
+{
+  uint8_t result = 0;
+
+  #if defined (RF24_LINUX)  
+  spi_txbuff[0] = R_RX_PL_WID;
+  spi_txbuff[1] = 0xff;
+  beginTransaction();
+  _SPI.transfernb( (char *) spi_txbuff, (char *) spi_rxbuff, 2);
+  result = spi_rxbuff[1];  
+  endTransaction();
+  #else
+  beginTransaction();
+  _SPI.transfer( R_RX_PL_WID );
+  result = _SPI.transfer(0xff);
+  endTransaction();
+  #endif
+
+  if(result > 32) { flush_rx(); delay(2); return 0; }
+  return result;
+}
+
+/****************************************************************************/
+
+bool RF24::available(void)
+{
+  return available(NULL);
+}
+
+/****************************************************************************/
+
+bool RF24::available(uint8_t* pipe_num)
+{
+  if (!( read_register(FIFO_STATUS) & _BV(RX_EMPTY) )){
+
+    // If the caller wants the pipe number, include that
+    if ( pipe_num ){
+	  uint8_t status = get_status();
+      *pipe_num = ( status >> RX_P_NO ) & 0x07;
+  	}
+  	return 1;
+  }
+
+
+  return 0;
+
+
+}
+
+/****************************************************************************/
+
+void RF24::read( void* buf, uint8_t len ){
+
+  // Fetch the payload
+  read_payload( buf, len );
+
+  //Clear the two possible interrupt flags with one command
+  write_register(NRF_STATUS,_BV(RX_DR) | _BV(MAX_RT) | _BV(TX_DS) );
+
+}
+
+/****************************************************************************/
+
+void RF24::whatHappened(bool& tx_ok,bool& tx_fail,bool& rx_ready)
+{
+  // Read the status & reset the status in one easy call
+  // Or is that such a good idea?
+  uint8_t status = write_register(NRF_STATUS,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
+
+  // Report to the user what happened
+  tx_ok = status & _BV(TX_DS);
+  tx_fail = status & _BV(MAX_RT);
+  rx_ready = status & _BV(RX_DR);
+}
+
+/****************************************************************************/
+
+void RF24::openWritingPipe(uint64_t value)
+{
+  // Note that AVR 8-bit uC's store this LSB first, and the NRF24L01(+)
+  // expects it LSB first too, so we're good.
+
+  write_register(RX_ADDR_P0, reinterpret_cast<uint8_t*>(&value), addr_width);
+  write_register(TX_ADDR, reinterpret_cast<uint8_t*>(&value), addr_width);
+  
+  
+  //const uint8_t max_payload_size = 32;
+  //write_register(RX_PW_P0,rf24_min(payload_size,max_payload_size));
+  write_register(RX_PW_P0,payload_size);
+}
+
+/****************************************************************************/
+void RF24::openWritingPipe(const uint8_t *address)
+{
+  // Note that AVR 8-bit uC's store this LSB first, and the NRF24L01(+)
+  // expects it LSB first too, so we're good.
+
+  write_register(RX_ADDR_P0,address, addr_width);
+  write_register(TX_ADDR, address, addr_width);
+
+  //const uint8_t max_payload_size = 32;
+  //write_register(RX_PW_P0,rf24_min(payload_size,max_payload_size));
+  write_register(RX_PW_P0,payload_size);
+}
+
+/****************************************************************************/
+static const uint8_t child_pipe[] PROGMEM =
+{
+  RX_ADDR_P0, RX_ADDR_P1, RX_ADDR_P2, RX_ADDR_P3, RX_ADDR_P4, RX_ADDR_P5
+};
+static const uint8_t child_payload_size[] PROGMEM =
+{
+  RX_PW_P0, RX_PW_P1, RX_PW_P2, RX_PW_P3, RX_PW_P4, RX_PW_P5
+};
+
+
+void RF24::openReadingPipe(uint8_t child, uint64_t address)
+{
+  // If this is pipe 0, cache the address.  This is needed because
+  // openWritingPipe() will overwrite the pipe 0 address, so
+  // startListening() will have to restore it.
+  if (child == 0){
+    memcpy(pipe0_reading_address,&address,addr_width);
+  }
+
+  if (child <= 6)
+  {
+    // For pipes 2-5, only write the LSB
+    if ( child < 2 )
+      write_register(pgm_read_byte(&child_pipe[child]), reinterpret_cast<const uint8_t*>(&address), addr_width);
+    else
+      write_register(pgm_read_byte(&child_pipe[child]), reinterpret_cast<const uint8_t*>(&address), 1);
+
+    write_register(pgm_read_byte(&child_payload_size[child]),payload_size);
+
+    // Note it would be more efficient to set all of the bits for all open
+    // pipes at once.  However, I thought it would make the calling code
+    // more simple to do it this way.
+    write_register(EN_RXADDR,read_register(EN_RXADDR) | _BV(pgm_read_byte(&child_pipe_enable[child])));
+  }
+}
+
+/****************************************************************************/
+void RF24::setAddressWidth(uint8_t a_width){
+
+	if(a_width -= 2){
+		write_register(SETUP_AW,a_width%4);
+		addr_width = (a_width%4) + 2;
+	}else{
+        write_register(SETUP_AW,0);
+        addr_width = 2;
+    }
+
+}
+
+/****************************************************************************/
+
+void RF24::openReadingPipe(uint8_t child, const uint8_t *address)
+{
+  // If this is pipe 0, cache the address.  This is needed because
+  // openWritingPipe() will overwrite the pipe 0 address, so
+  // startListening() will have to restore it.
+  if (child == 0){
+    memcpy(pipe0_reading_address,address,addr_width);
+  }
+  if (child <= 6)
+  {
+    // For pipes 2-5, only write the LSB
+    if ( child < 2 ){
+      write_register(pgm_read_byte(&child_pipe[child]), address, addr_width);
+    }else{
+      write_register(pgm_read_byte(&child_pipe[child]), address, 1);
+	}
+    write_register(pgm_read_byte(&child_payload_size[child]),payload_size);
+
+    // Note it would be more efficient to set all of the bits for all open
+    // pipes at once.  However, I thought it would make the calling code
+    // more simple to do it this way.
+    write_register(EN_RXADDR,read_register(EN_RXADDR) | _BV(pgm_read_byte(&child_pipe_enable[child])));
+
+  }
+}
+
+/****************************************************************************/
+
+void RF24::closeReadingPipe( uint8_t pipe )
+{
+  write_register(EN_RXADDR,read_register(EN_RXADDR) & ~_BV(pgm_read_byte(&child_pipe_enable[pipe])));
+}
+
+/****************************************************************************/
+
+void RF24::toggle_features(void)
+{
+    beginTransaction();
+	_SPI.transfer( ACTIVATE );
+    _SPI.transfer( 0x73 );
+	endTransaction();
+}
+
+/****************************************************************************/
+
+void RF24::enableDynamicPayloads(void)
+{
+  // Enable dynamic payload throughout the system
+
+    //toggle_features();
+    write_register(FEATURE,read_register(FEATURE) | _BV(EN_DPL) );
+
+
+  IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));
+
+  // Enable dynamic payload on all pipes
+  //
+  // Not sure the use case of only having dynamic payload on certain
+  // pipes, so the library does not support it.
+  write_register(DYNPD,read_register(DYNPD) | _BV(DPL_P5) | _BV(DPL_P4) | _BV(DPL_P3) | _BV(DPL_P2) | _BV(DPL_P1) | _BV(DPL_P0));
+
+  dynamic_payloads_enabled = true;
+}
+
+/****************************************************************************/
+void RF24::disableDynamicPayloads(void)
+{
+  // Disables dynamic payload throughout the system.  Also disables Ack Payloads
+
+  //toggle_features();
+  write_register(FEATURE, 0);
+
+
+  IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));
+
+  // Disable dynamic payload on all pipes
+  //
+  // Not sure the use case of only having dynamic payload on certain
+  // pipes, so the library does not support it.
+  write_register(DYNPD, 0);
+
+  dynamic_payloads_enabled = false;
+}
+
+/****************************************************************************/
+
+void RF24::enableAckPayload(void)
+{
+  //
+  // enable ack payload and dynamic payload features
+  //
+
+    //toggle_features();
+    write_register(FEATURE,read_register(FEATURE) | _BV(EN_ACK_PAY) | _BV(EN_DPL) );
+
+  IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));
+
+  //
+  // Enable dynamic payload on pipes 0 & 1
+  //
+
+  write_register(DYNPD,read_register(DYNPD) | _BV(DPL_P1) | _BV(DPL_P0));
+  dynamic_payloads_enabled = true;
+}
+
+/****************************************************************************/
+
+void RF24::enableDynamicAck(void){
+  //
+  // enable dynamic ack features
+  //
+    //toggle_features();
+    write_register(FEATURE,read_register(FEATURE) | _BV(EN_DYN_ACK) );
+
+  IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));
+
+
+}
+
+/****************************************************************************/
+
+void RF24::writeAckPayload(uint8_t pipe, const void* buf, uint8_t len)
+{
+  const uint8_t* current = reinterpret_cast<const uint8_t*>(buf);
+
+  uint8_t data_len = rf24_min(len,32);
+
+  #if defined (RF24_LINUX)
+    beginTransaction();
+    uint8_t * ptx = spi_txbuff;
+    uint8_t size = data_len + 1 ; // Add register value to transmit buffer
+	*ptx++ =  W_ACK_PAYLOAD | ( pipe & 0x07 );
+    while ( data_len-- ){
+      *ptx++ =  *current++;
+    }
+	
+    _SPI.transfern( (char *) spi_txbuff, size);
+	endTransaction();
+  #else
+  beginTransaction();
+  _SPI.transfer(W_ACK_PAYLOAD | ( pipe & 0x07 ) );
+
+  while ( data_len-- )
+    _SPI.transfer(*current++);
+  endTransaction();
+  	
+  #endif  
+
+}
+
+/****************************************************************************/
+
+bool RF24::isAckPayloadAvailable(void)
+{
+  return ! (read_register(FIFO_STATUS) & _BV(RX_EMPTY));
+}
+
+/****************************************************************************/
+
+bool RF24::isPVariant(void)
+{
+  return p_variant ;
+}
+
+/****************************************************************************/
+
+void RF24::setAutoAck(bool enable)
+{
+  if ( enable )
+    write_register(EN_AA, 0x3F);
+  else
+    write_register(EN_AA, 0);
+}
+
+/****************************************************************************/
+
+void RF24::setAutoAck( uint8_t pipe, bool enable )
+{
+  if ( pipe <= 6 )
+  {
+    uint8_t en_aa = read_register( EN_AA ) ;
+    if( enable )
+    {
+      en_aa |= _BV(pipe) ;
+    }
+    else
+    {
+      en_aa &= ~_BV(pipe) ;
+    }
+    write_register( EN_AA, en_aa ) ;
+  }
+}
+
+/****************************************************************************/
+
+bool RF24::testCarrier(void)
+{
+  return ( read_register(CD) & 1 );
+}
+
+/****************************************************************************/
+
+bool RF24::testRPD(void)
+{
+  return ( read_register(RPD) & 1 ) ;
+}
+
+/****************************************************************************/
+
+void RF24::setPALevel(uint8_t level)
+{
+
+  uint8_t setup = read_register(RF_SETUP) & 0xF8;
+
+  if(level > 3){  						// If invalid level, go to max PA
+	  level = (RF24_PA_MAX << 1) + 1;		// +1 to support the SI24R1 chip extra bit
+  }else{
+	  level = (level << 1) + 1;	 		// Else set level as requested
+  }
+
+
+  write_register( RF_SETUP, setup |= level ) ;	// Write it to the chip
+}
+
+/****************************************************************************/
+
+uint8_t RF24::getPALevel(void)
+{
+
+  return (read_register(RF_SETUP) & (_BV(RF_PWR_LOW) | _BV(RF_PWR_HIGH))) >> 1 ;
+}
+
+/****************************************************************************/
+
+bool RF24::setDataRate(rf24_datarate_e speed)
+{
+  bool result = false;
+  uint8_t setup = read_register(RF_SETUP) ;
+
+  // HIGH and LOW '00' is 1Mbs - our default
+  setup &= ~(_BV(RF_DR_LOW) | _BV(RF_DR_HIGH)) ;
+  
+  #if !defined(F_CPU) || F_CPU > 20000000
+    txDelay=250;
+  #else //16Mhz Arduino
+    txDelay=85;
+  #endif
+  if( speed == RF24_250KBPS )
+  {
+    // Must set the RF_DR_LOW to 1; RF_DR_HIGH (used to be RF_DR) is already 0
+    // Making it '10'.
+    setup |= _BV( RF_DR_LOW ) ;
+  #if !defined(F_CPU) || F_CPU > 20000000
+    txDelay=450;
+  #else //16Mhz Arduino
+	txDelay=155;
+  #endif
+  }
+  else
+  {
+    // Set 2Mbs, RF_DR (RF_DR_HIGH) is set 1
+    // Making it '01'
+    if ( speed == RF24_2MBPS )
+    {
+      setup |= _BV(RF_DR_HIGH);
+      #if !defined(F_CPU) || F_CPU > 20000000
+      txDelay=190;
+      #else //16Mhz Arduino	  
+	  txDelay=65;
+	  #endif
+    }
+  }
+  write_register(RF_SETUP,setup);
+
+  // Verify our result
+  if ( read_register(RF_SETUP) == setup )
+  {
+    result = true;
+  }
+  return result;
+}
+
+/****************************************************************************/
+
+rf24_datarate_e RF24::getDataRate( void )
+{
+  rf24_datarate_e result ;
+  uint8_t dr = read_register(RF_SETUP) & (_BV(RF_DR_LOW) | _BV(RF_DR_HIGH));
+
+  // switch uses RAM (evil!)
+  // Order matters in our case below
+  if ( dr == _BV(RF_DR_LOW) )
+  {
+    // '10' = 250KBPS
+    result = RF24_250KBPS ;
+  }
+  else if ( dr == _BV(RF_DR_HIGH) )
+  {
+    // '01' = 2MBPS
+    result = RF24_2MBPS ;
+  }
+  else
+  {
+    // '00' = 1MBPS
+    result = RF24_1MBPS ;
+  }
+  return result ;
+}
+
+/****************************************************************************/
+
+void RF24::setCRCLength(rf24_crclength_e length)
+{
+  uint8_t config = read_register(NRF_CONFIG) & ~( _BV(CRCO) | _BV(EN_CRC)) ;
+
+  // switch uses RAM (evil!)
+  if ( length == RF24_CRC_DISABLED )
+  {
+    // Do nothing, we turned it off above.
+  }
+  else if ( length == RF24_CRC_8 )
+  {
+    config |= _BV(EN_CRC);
+  }
+  else
+  {
+    config |= _BV(EN_CRC);
+    config |= _BV( CRCO );
+  }
+  write_register( NRF_CONFIG, config ) ;
+}
+
+/****************************************************************************/
+
+rf24_crclength_e RF24::getCRCLength(void)
+{
+  rf24_crclength_e result = RF24_CRC_DISABLED;
+  
+  uint8_t config = read_register(NRF_CONFIG) & ( _BV(CRCO) | _BV(EN_CRC)) ;
+  uint8_t AA = read_register(EN_AA);
+  
+  if ( config & _BV(EN_CRC ) || AA)
+  {
+    if ( config & _BV(CRCO) )
+      result = RF24_CRC_16;
+    else
+      result = RF24_CRC_8;
+  }
+
+  return result;
+}
+
+/****************************************************************************/
+
+void RF24::disableCRC( void )
+{
+  uint8_t disable = read_register(NRF_CONFIG) & ~_BV(EN_CRC) ;
+  write_register( NRF_CONFIG, disable ) ;
+}
+
+/****************************************************************************/
+void RF24::setRetries(uint8_t delay, uint8_t count)
+{
+ write_register(SETUP_RETR,(delay&0xf)<<ARD | (count&0xf)<<ARC);
+}
+
+
+//ATTiny support code pulled in from https://github.com/jscrane/RF24
+#if defined(RF24_TINY)
+
+void SPIClass::begin() {
+	// set USCK and DO for output
+	// set DI for input
+#if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+	DDRB |= (1 << PB2) | (1 << PB1);
+	DDRB &= ~(1 << PB0);
+#elif defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+	DDRA |= (1 << PA4) | (1 << PA5);
+	DDRA &= ~(1 << PA6);
+#elif defined(__AVR_ATtiny2313__) || defined(__AVR_ATtiny4313__)
+	DDRB |= (1 << PB7) | (1 << PB6);
+	DDRB &= ~(1 << PB5);
+#elif defined(__AVR_ATtiny861__)
+	DDRB |= (1 << PB2) | (1 << PB1);
+	DDRB &= ~(1 << PB0);
+#endif
+  USICR = _BV(USIWM0);
+
+}
+
+byte SPIClass::transfer(byte b) {
+
+  USIDR = b;
+  USISR = _BV(USIOIF);
+  do
+    USICR = _BV(USIWM0) | _BV(USICS1) | _BV(USICLK) | _BV(USITC);
+  while ((USISR & _BV(USIOIF)) == 0);
+  return USIDR;
+
+}
+
+void SPIClass::end() {}
+void SPIClass::setDataMode(uint8_t mode){}
+void SPIClass::setBitOrder(uint8_t bitOrder){}
+void SPIClass::setClockDivider(uint8_t rate){}
+
+
+#endif
diff --git a/lib/RF24/RF24.h b/lib/RF24/RF24.h
new file mode 100644
index 000000000..a01fdc12d
--- /dev/null
+++ b/lib/RF24/RF24.h
@@ -0,0 +1,2030 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * @file RF24.h
+ *
+ * Class declaration for RF24 and helper enums
+ */
+
+#ifndef __RF24_H__
+#define __RF24_H__
+
+#include "RF24_config.h"
+
+#if defined (RF24_LINUX) || defined (LITTLEWIRE)
+  #include "utility/includes.h"
+#elif defined SOFTSPI
+  #include <DigitalIO.h>
+#endif
+
+/**
+ * Power Amplifier level.
+ *
+ * For use with setPALevel()
+ */
+typedef enum { RF24_PA_MIN = 0,RF24_PA_LOW, RF24_PA_HIGH, RF24_PA_MAX, RF24_PA_ERROR } rf24_pa_dbm_e ;
+
+/**
+ * Data rate.  How fast data moves through the air.
+ *
+ * For use with setDataRate()
+ */
+typedef enum { RF24_1MBPS = 0, RF24_2MBPS, RF24_250KBPS } rf24_datarate_e;
+
+/**
+ * CRC Length.  How big (if any) of a CRC is included.
+ *
+ * For use with setCRCLength()
+ */
+typedef enum { RF24_CRC_DISABLED = 0, RF24_CRC_8, RF24_CRC_16 } rf24_crclength_e;
+
+/**
+ * Driver for nRF24L01(+) 2.4GHz Wireless Transceiver
+ */
+
+class RF24
+{
+private:
+#ifdef SOFTSPI
+  SoftSPI<SOFT_SPI_MISO_PIN, SOFT_SPI_MOSI_PIN, SOFT_SPI_SCK_PIN, SPI_MODE> spi;
+#elif defined (SPI_UART)
+  SPIUARTClass uspi;
+#endif
+
+#if defined (RF24_LINUX) || defined (XMEGA_D3) /* XMEGA can use SPI class */
+  SPI spi;
+#endif
+#if defined (MRAA)
+  GPIO gpio;
+#endif
+
+  uint16_t ce_pin; /**< "Chip Enable" pin, activates the RX or TX role */
+  uint16_t csn_pin; /**< SPI Chip select */
+  uint16_t spi_speed; /**< SPI Bus Speed */
+#if defined (RF24_LINUX) || defined (XMEGA_D3)
+  uint8_t spi_rxbuff[32+1] ; //SPI receive buffer (payload max 32 bytes)
+  uint8_t spi_txbuff[32+1] ; //SPI transmit buffer (payload max 32 bytes + 1 byte for the command)
+#endif  
+  bool p_variant; /* False for RF24L01 and true for RF24L01P */
+  uint8_t payload_size; /**< Fixed size of payloads */
+  bool dynamic_payloads_enabled; /**< Whether dynamic payloads are enabled. */
+  uint8_t pipe0_reading_address[5]; /**< Last address set on pipe 0 for reading. */
+  uint8_t addr_width; /**< The address width to use - 3,4 or 5 bytes. */
+  
+
+protected:
+  /**
+   * SPI transactions
+   *
+   * Common code for SPI transactions including CSN toggle
+   *
+   */
+  inline void beginTransaction();
+
+  inline void endTransaction();
+
+public:
+
+  /**
+   * @name Primary public interface
+   *
+   *  These are the main methods you need to operate the chip
+   */
+  /**@{*/
+
+  /**
+   * Arduino Constructor
+   *
+   * Creates a new instance of this driver.  Before using, you create an instance
+   * and send in the unique pins that this chip is connected to.
+   *
+   * @param _cepin The pin attached to Chip Enable on the RF module
+   * @param _cspin The pin attached to Chip Select
+   */
+  RF24(void);
+  //#if defined (RF24_LINUX)
+  
+    /**
+  * Optional Linux Constructor
+  *
+  * Creates a new instance of this driver.  Before using, you create an instance
+  * and send in the unique pins that this chip is connected to.
+  *
+  * @param _cepin The pin attached to Chip Enable on the RF module
+  * @param _cspin The pin attached to Chip Select
+  * @param spispeed For RPi, the SPI speed in MHZ ie: BCM2835_SPI_SPEED_8MHZ
+  */
+  
+  RF24(uint16_t _cepin, uint16_t _cspin, uint32_t spispeed );
+  //#endif
+
+  #if defined (RF24_LINUX)
+  virtual ~RF24() {};
+  #endif
+
+  /**
+   * Begin operation of the chip
+   * 
+   * Call this in setup(), before calling any other methods.
+   * @code radio.begin() @endcode
+   */
+  bool begin(uint16_t _cepin, uint16_t _cspin);
+
+  /**
+   * Checks if the chip is connected to the SPI bus
+   */
+  bool isChipConnected();
+
+  /**
+   * Start listening on the pipes opened for reading.
+   *
+   * 1. Be sure to call openReadingPipe() first.  
+   * 2. Do not call write() while in this mode, without first calling stopListening().
+   * 3. Call available() to check for incoming traffic, and read() to get it. 
+   *  
+   * @code
+   * Open reading pipe 1 using address CCCECCCECC
+   *  
+   * byte address[] = { 0xCC,0xCE,0xCC,0xCE,0xCC };
+   * radio.openReadingPipe(1,address);
+   * radio.startListening();
+   * @endcode
+   */
+  void startListening(void);
+
+  /**
+   * Stop listening for incoming messages, and switch to transmit mode.
+   *
+   * Do this before calling write().
+   * @code
+   * radio.stopListening();
+   * radio.write(&data,sizeof(data));
+   * @endcode
+   */
+  void stopListening(void);
+
+  /**
+   * Check whether there are bytes available to be read
+   * @code
+   * if(radio.available()){
+   *   radio.read(&data,sizeof(data));
+   * }
+   * @endcode
+   * @return True if there is a payload available, false if none is
+   */
+  bool available(void);
+
+  /**
+   * Read the available payload
+   *
+   * The size of data read is the fixed payload size, see getPayloadSize()
+   *
+   * @note I specifically chose 'void*' as a data type to make it easier
+   * for beginners to use.  No casting needed.
+   *
+   * @note No longer boolean. Use available to determine if packets are
+   * available. Interrupt flags are now cleared during reads instead of
+   * when calling available().
+   *
+   * @param buf Pointer to a buffer where the data should be written
+   * @param len Maximum number of bytes to read into the buffer
+   *
+   * @code
+   * if(radio.available()){
+   *   radio.read(&data,sizeof(data));
+   * }
+   * @endcode
+   * @return No return value. Use available().
+   */
+  void read( void* buf, uint8_t len );
+
+  /**
+   * Be sure to call openWritingPipe() first to set the destination
+   * of where to write to.
+   *
+   * This blocks until the message is successfully acknowledged by
+   * the receiver or the timeout/retransmit maxima are reached.  In
+   * the current configuration, the max delay here is 60-70ms.
+   *
+   * The maximum size of data written is the fixed payload size, see
+   * getPayloadSize().  However, you can write less, and the remainder
+   * will just be filled with zeroes.
+   *
+   * TX/RX/RT interrupt flags will be cleared every time write is called
+   *
+   * @param buf Pointer to the data to be sent
+   * @param len Number of bytes to be sent
+   *
+   * @code
+   * radio.stopListening();
+   * radio.write(&data,sizeof(data));
+   * @endcode
+   * @return True if the payload was delivered successfully and an ACK was received, or upon successfull transmission if auto-ack is disabled.
+   */
+  bool write( const void* buf, uint8_t len );
+
+  /**
+   * New: Open a pipe for writing via byte array. Old addressing format retained
+   * for compatibility.
+   *
+   * Only one writing pipe can be open at once, but you can change the address
+   * you'll write to. Call stopListening() first.
+   *
+   * Addresses are assigned via a byte array, default is 5 byte address length
+s   *
+   * @code
+   *   uint8_t addresses[][6] = {"1Node","2Node"};
+   *   radio.openWritingPipe(addresses[0]);
+   * @endcode
+   * @code
+   *  uint8_t address[] = { 0xCC,0xCE,0xCC,0xCE,0xCC };
+   *  radio.openWritingPipe(address);
+   *  address[0] = 0x33;
+   *  radio.openReadingPipe(1,address);
+   * @endcode
+   * @see setAddressWidth
+   *
+   * @param address The address of the pipe to open. Coordinate these pipe
+   * addresses amongst nodes on the network.
+   */
+
+  void openWritingPipe(const uint8_t *address);
+
+  /**
+   * Open a pipe for reading
+   *
+   * Up to 6 pipes can be open for reading at once.  Open all the required
+   * reading pipes, and then call startListening().
+   *
+   * @see openWritingPipe
+   * @see setAddressWidth
+   *
+   * @note Pipes 0 and 1 will store a full 5-byte address. Pipes 2-5 will technically 
+   * only store a single byte, borrowing up to 4 additional bytes from pipe #1 per the
+   * assigned address width.
+   * @warning Pipes 1-5 should share the same address, except the first byte.
+   * Only the first byte in the array should be unique, e.g.
+   * @code
+   *   uint8_t addresses[][6] = {"1Node","2Node"};
+   *   openReadingPipe(1,addresses[0]);
+   *   openReadingPipe(2,addresses[1]);
+   * @endcode
+   *
+   * @warning Pipe 0 is also used by the writing pipe.  So if you open
+   * pipe 0 for reading, and then startListening(), it will overwrite the
+   * writing pipe.  Ergo, do an openWritingPipe() again before write().
+   *
+   * @param number Which pipe# to open, 0-5.
+   * @param address The 24, 32 or 40 bit address of the pipe to open.
+   */
+
+  void openReadingPipe(uint8_t number, const uint8_t *address);
+
+   /**@}*/
+  /**
+   * @name Advanced Operation
+   *
+   *  Methods you can use to drive the chip in more advanced ways
+   */
+  /**@{*/
+
+  /**
+   * Print a giant block of debugging information to stdout
+   *
+   * @warning Does nothing if stdout is not defined.  See fdevopen in stdio.h
+   * The printf.h file is included with the library for Arduino.
+   * @code
+   * #include <printf.h>
+   * setup(){
+   *  Serial.begin(115200);
+   *  printf_begin();
+   *  ...
+   * }
+   * @endcode
+   */
+  void printDetails(void);
+
+  /**
+   * Test whether there are bytes available to be read in the
+   * FIFO buffers. 
+   *
+   * @param[out] pipe_num Which pipe has the payload available
+   *  
+   * @code
+   * uint8_t pipeNum;
+   * if(radio.available(&pipeNum)){
+   *   radio.read(&data,sizeof(data));
+   *   Serial.print("Got data on pipe");
+   *   Serial.println(pipeNum);
+   * }
+   * @endcode
+   * @return True if there is a payload available, false if none is
+   */
+  bool available(uint8_t* pipe_num);
+
+  /**
+   * Check if the radio needs to be read. Can be used to prevent data loss
+   * @return True if all three 32-byte radio buffers are full
+   */
+  bool rxFifoFull();
+
+  /**
+   * Enter low-power mode
+   *
+   * To return to normal power mode, call powerUp().
+   *
+   * @note After calling startListening(), a basic radio will consume about 13.5mA
+   * at max PA level.
+   * During active transmission, the radio will consume about 11.5mA, but this will
+   * be reduced to 26uA (.026mA) between sending.
+   * In full powerDown mode, the radio will consume approximately 900nA (.0009mA)   
+   *
+   * @code
+   * radio.powerDown();
+   * avr_enter_sleep_mode(); // Custom function to sleep the device
+   * radio.powerUp();
+   * @endcode
+   */
+  void powerDown(void);
+
+  /**
+   * Leave low-power mode - required for normal radio operation after calling powerDown()
+   * 
+   * To return to low power mode, call powerDown().
+   * @note This will take up to 5ms for maximum compatibility 
+   */
+  void powerUp(void) ;
+
+  /**
+  * Write for single NOACK writes. Optionally disables acknowledgements/autoretries for a single write.
+  *
+  * @note enableDynamicAck() must be called to enable this feature
+  *
+  * Can be used with enableAckPayload() to request a response
+  * @see enableDynamicAck()
+  * @see setAutoAck()
+  * @see write()
+  *
+  * @param buf Pointer to the data to be sent
+  * @param len Number of bytes to be sent
+  * @param multicast Request ACK (0), NOACK (1)
+  */
+  bool write( const void* buf, uint8_t len, const bool multicast );
+
+  /**
+   * This will not block until the 3 FIFO buffers are filled with data.
+   * Once the FIFOs are full, writeFast will simply wait for success or
+   * timeout, and return 1 or 0 respectively. From a user perspective, just
+   * keep trying to send the same data. The library will keep auto retrying
+   * the current payload using the built in functionality.
+   * @warning It is important to never keep the nRF24L01 in TX mode and FIFO full for more than 4ms at a time. If the auto
+   * retransmit is enabled, the nRF24L01 is never in TX mode long enough to disobey this rule. Allow the FIFO
+   * to clear by issuing txStandBy() or ensure appropriate time between transmissions.
+   *
+   * @code
+   * Example (Partial blocking):
+   *
+   *			radio.writeFast(&buf,32);  // Writes 1 payload to the buffers
+   *			txStandBy();     		   // Returns 0 if failed. 1 if success. Blocks only until MAX_RT timeout or success. Data flushed on fail.
+   *
+   *			radio.writeFast(&buf,32);  // Writes 1 payload to the buffers
+   *			txStandBy(1000);		   // Using extended timeouts, returns 1 if success. Retries failed payloads for 1 seconds before returning 0.
+   * @endcode
+   *
+   * @see txStandBy()
+   * @see write()
+   * @see writeBlocking()
+   *
+   * @param buf Pointer to the data to be sent
+   * @param len Number of bytes to be sent
+   * @return True if the payload was delivered successfully false if not
+   */
+  bool writeFast( const void* buf, uint8_t len );
+
+  /**
+  * WriteFast for single NOACK writes. Disables acknowledgements/autoretries for a single write.
+  *
+  * @note enableDynamicAck() must be called to enable this feature
+  * @see enableDynamicAck()
+  * @see setAutoAck()
+  *
+  * @param buf Pointer to the data to be sent
+  * @param len Number of bytes to be sent
+  * @param multicast Request ACK (0) or NOACK (1)
+  */
+  bool writeFast( const void* buf, uint8_t len, const bool multicast );
+
+  /**
+   * This function extends the auto-retry mechanism to any specified duration.
+   * It will not block until the 3 FIFO buffers are filled with data.
+   * If so the library will auto retry until a new payload is written
+   * or the user specified timeout period is reached.
+   * @warning It is important to never keep the nRF24L01 in TX mode and FIFO full for more than 4ms at a time. If the auto
+   * retransmit is enabled, the nRF24L01 is never in TX mode long enough to disobey this rule. Allow the FIFO
+   * to clear by issuing txStandBy() or ensure appropriate time between transmissions.
+   *
+   * @code
+   * Example (Full blocking):
+   *
+   *			radio.writeBlocking(&buf,32,1000); //Wait up to 1 second to write 1 payload to the buffers
+   *			txStandBy(1000);     			   //Wait up to 1 second for the payload to send. Return 1 if ok, 0 if failed.
+   *					  				   		   //Blocks only until user timeout or success. Data flushed on fail.
+   * @endcode
+   * @note If used from within an interrupt, the interrupt should be disabled until completion, and sei(); called to enable millis().
+   * @see txStandBy()
+   * @see write()
+   * @see writeFast()
+   *
+   * @param buf Pointer to the data to be sent
+   * @param len Number of bytes to be sent
+   * @param timeout User defined timeout in milliseconds.
+   * @return True if the payload was loaded into the buffer successfully false if not
+   */
+  bool writeBlocking( const void* buf, uint8_t len, uint32_t timeout );
+
+  /**
+   * This function should be called as soon as transmission is finished to
+   * drop the radio back to STANDBY-I mode. If not issued, the radio will
+   * remain in STANDBY-II mode which, per the data sheet, is not a recommended
+   * operating mode.
+   *
+   * @note When transmitting data in rapid succession, it is still recommended by
+   * the manufacturer to drop the radio out of TX or STANDBY-II mode if there is
+   * time enough between sends for the FIFOs to empty. This is not required if auto-ack
+   * is enabled.
+   *
+   * Relies on built-in auto retry functionality.
+   *
+   * @code
+   * Example (Partial blocking):
+   *
+   *			radio.writeFast(&buf,32);
+   *			radio.writeFast(&buf,32);
+   *			radio.writeFast(&buf,32);  //Fills the FIFO buffers up
+   *			bool ok = txStandBy();     //Returns 0 if failed. 1 if success.
+   *					  				   //Blocks only until MAX_RT timeout or success. Data flushed on fail.
+   * @endcode
+   * @see txStandBy(unsigned long timeout)
+   * @return True if transmission is successful
+   *
+   */
+   bool txStandBy();
+
+  /**
+   * This function allows extended blocking and auto-retries per a user defined timeout
+   * @code
+   *	Fully Blocking Example:
+   *
+   *			radio.writeFast(&buf,32);
+   *			radio.writeFast(&buf,32);
+   *			radio.writeFast(&buf,32);   //Fills the FIFO buffers up
+   *			bool ok = txStandBy(1000);  //Returns 0 if failed after 1 second of retries. 1 if success.
+   *					  				    //Blocks only until user defined timeout or success. Data flushed on fail.
+   * @endcode
+   * @note If used from within an interrupt, the interrupt should be disabled until completion, and sei(); called to enable millis().
+   * @param timeout Number of milliseconds to retry failed payloads
+   * @return True if transmission is successful
+   *
+   */
+   bool txStandBy(uint32_t timeout, bool startTx = 0);
+
+  /**
+   * Write an ack payload for the specified pipe
+   *
+   * The next time a message is received on @p pipe, the data in @p buf will
+   * be sent back in the acknowledgement.
+   * @see enableAckPayload()
+   * @see enableDynamicPayloads()
+   * @warning Only three of these can be pending at any time as there are only 3 FIFO buffers.<br> Dynamic payloads must be enabled.
+   * @note Ack payloads are handled automatically by the radio chip when a payload is received. Users should generally
+   * write an ack payload as soon as startListening() is called, so one is available when a regular payload is received.
+   * @note Ack payloads are dynamic payloads. This only works on pipes 0&1 by default. Call 
+   * enableDynamicPayloads() to enable on all pipes.
+   *
+   * @param pipe Which pipe# (typically 1-5) will get this response.
+   * @param buf Pointer to data that is sent
+   * @param len Length of the data to send, up to 32 bytes max.  Not affected
+   * by the static payload set by setPayloadSize().
+   */
+  void writeAckPayload(uint8_t pipe, const void* buf, uint8_t len);
+
+  /**
+   * Determine if an ack payload was received in the most recent call to
+   * write(). The regular available() can also be used.
+   *
+   * Call read() to retrieve the ack payload.
+   *
+   * @return True if an ack payload is available.
+   */
+  bool isAckPayloadAvailable(void);
+
+  /**
+   * Call this when you get an interrupt to find out why
+   *
+   * Tells you what caused the interrupt, and clears the state of
+   * interrupts.
+   *
+   * @param[out] tx_ok The send was successful (TX_DS)
+   * @param[out] tx_fail The send failed, too many retries (MAX_RT)
+   * @param[out] rx_ready There is a message waiting to be read (RX_DS)
+   */
+  void whatHappened(bool& tx_ok,bool& tx_fail,bool& rx_ready);
+
+  /**
+   * Non-blocking write to the open writing pipe used for buffered writes
+   *
+   * @note Optimization: This function now leaves the CE pin high, so the radio
+   * will remain in TX or STANDBY-II Mode until a txStandBy() command is issued. Can be used as an alternative to startWrite()
+   * if writing multiple payloads at once.
+   * @warning It is important to never keep the nRF24L01 in TX mode with FIFO full for more than 4ms at a time. If the auto
+   * retransmit/autoAck is enabled, the nRF24L01 is never in TX mode long enough to disobey this rule. Allow the FIFO
+   * to clear by issuing txStandBy() or ensure appropriate time between transmissions.
+   *
+   * @see write()
+   * @see writeFast()
+   * @see startWrite()
+   * @see writeBlocking()
+   *
+   * For single noAck writes see:
+   * @see enableDynamicAck()
+   * @see setAutoAck()
+   *
+   * @param buf Pointer to the data to be sent
+   * @param len Number of bytes to be sent
+   * @param multicast Request ACK (0) or NOACK (1)
+   * @return True if the payload was delivered successfully false if not
+   */
+  void startFastWrite( const void* buf, uint8_t len, const bool multicast, bool startTx = 1 );
+
+  /**
+   * Non-blocking write to the open writing pipe
+   *
+   * Just like write(), but it returns immediately. To find out what happened
+   * to the send, catch the IRQ and then call whatHappened().
+   *
+   * @see write()
+   * @see writeFast()
+   * @see startFastWrite()
+   * @see whatHappened()
+   *
+   * For single noAck writes see:
+   * @see enableDynamicAck()
+   * @see setAutoAck()
+   *
+   * @param buf Pointer to the data to be sent
+   * @param len Number of bytes to be sent
+   * @param multicast Request ACK (0) or NOACK (1)
+   *
+   */
+  void startWrite( const void* buf, uint8_t len, const bool multicast );
+  
+  /**
+   * This function is mainly used internally to take advantage of the auto payload
+   * re-use functionality of the chip, but can be beneficial to users as well.
+   *
+   * The function will instruct the radio to re-use the data in the FIFO buffers,
+   * and instructs the radio to re-send once the timeout limit has been reached.
+   * Used by writeFast and writeBlocking to initiate retries when a TX failure
+   * occurs. Retries are automatically initiated except with the standard write().
+   * This way, data is not flushed from the buffer until switching between modes.
+   *
+   * @note This is to be used AFTER auto-retry fails if wanting to resend
+   * using the built-in payload reuse features.
+   * After issuing reUseTX(), it will keep reending the same payload forever or until
+   * a payload is written to the FIFO, or a flush_tx command is given.
+   */
+   void reUseTX();
+
+  /**
+   * Empty the transmit buffer. This is generally not required in standard operation.
+   * May be required in specific cases after stopListening() , if operating at 250KBPS data rate.
+   *
+   * @return Current value of status register
+   */
+  uint8_t flush_tx(void);
+
+  /**
+   * Test whether there was a carrier on the line for the
+   * previous listening period.
+   *
+   * Useful to check for interference on the current channel.
+   *
+   * @return true if was carrier, false if not
+   */
+  bool testCarrier(void);
+
+  /**
+   * Test whether a signal (carrier or otherwise) greater than
+   * or equal to -64dBm is present on the channel. Valid only
+   * on nRF24L01P (+) hardware. On nRF24L01, use testCarrier().
+   *
+   * Useful to check for interference on the current channel and
+   * channel hopping strategies.
+   *
+   * @code
+   * bool goodSignal = radio.testRPD();
+   * if(radio.available()){
+   *    Serial.println(goodSignal ? "Strong signal > 64dBm" : "Weak signal < 64dBm" );
+   *    radio.read(0,0);
+   * }
+   * @endcode
+   * @return true if signal => -64dBm, false if not
+   */
+  bool testRPD(void) ;
+
+  /**
+   * Test whether this is a real radio, or a mock shim for
+   * debugging.  Setting either pin to 0xff is the way to
+   * indicate that this is not a real radio.
+   *
+   * @return true if this is a legitimate radio
+   */
+  bool isValid() { return ce_pin != 0xff && csn_pin != 0xff; }
+  
+   /**
+   * Close a pipe after it has been previously opened.
+   * Can be safely called without having previously opened a pipe.
+   * @param pipe Which pipe # to close, 0-5.
+   */
+  void closeReadingPipe( uint8_t pipe ) ;
+
+   /**
+   * 
+   * If a failure has been detected, it usually indicates a hardware issue. By default the library
+   * will cease operation when a failure is detected.  
+   * This should allow advanced users to detect and resolve intermittent hardware issues.  
+   *   
+   * In most cases, the radio must be re-enabled via radio.begin(); and the appropriate settings
+   * applied after a failure occurs, if wanting to re-enable the device immediately.
+   *
+   * The three main failure modes of the radio include:
+   *
+   * Writing to radio: Radio unresponsive - Fixed internally by adding a timeout to the internal write functions in RF24 (failure handling)
+   *
+   * Reading from radio: Available returns true always - Fixed by adding a timeout to available functions by the user. This is implemented internally in  RF24Network.
+   *
+   * Radio configuration settings are lost - Fixed by monitoring a value that is different from the default, and re-configuring the radio if this setting reverts to the default.
+   * 
+   * See the included example, GettingStarted_HandlingFailures
+   *    
+   *  @code
+   *  if(radio.failureDetected){ 
+   *    radio.begin();                       // Attempt to re-configure the radio with defaults
+   *    radio.failureDetected = 0;           // Reset the detection value
+   *	radio.openWritingPipe(addresses[1]); // Re-configure pipe addresses
+   *    radio.openReadingPipe(1,addresses[0]);
+   *    report_failure();                    // Blink leds, send a message, etc. to indicate failure
+   *  }
+   * @endcode
+  */
+  //#if defined (FAILURE_HANDLING)
+    bool failureDetected; 
+  //#endif
+    
+  /**@}*/
+
+  /**@}*/
+  /**
+   * @name Optional Configurators
+   *
+   *  Methods you can use to get or set the configuration of the chip.
+   *  None are required.  Calling begin() sets up a reasonable set of
+   *  defaults.
+   */
+  /**@{*/
+
+  /**
+  * Set the address width from 3 to 5 bytes (24, 32 or 40 bit)
+  *
+  * @param a_width The address width to use: 3,4 or 5
+  */
+
+  void setAddressWidth(uint8_t a_width);
+  
+  /**
+   * Set the number and delay of retries upon failed submit
+   *
+   * @param delay How long to wait between each retry, in multiples of 250us,
+   * max is 15.  0 means 250us, 15 means 4000us.
+   * @param count How many retries before giving up, max 15
+   */
+  void setRetries(uint8_t delay, uint8_t count);
+
+  /**
+   * Set RF communication channel
+   *
+   * @param channel Which RF channel to communicate on, 0-125
+   */
+  void setChannel(uint8_t channel);
+  
+    /**
+   * Get RF communication channel
+   *
+   * @return The currently configured RF Channel
+   */
+  uint8_t getChannel(void);
+
+  /**
+   * Set Static Payload Size
+   *
+   * This implementation uses a pre-stablished fixed payload size for all
+   * transmissions.  If this method is never called, the driver will always
+   * transmit the maximum payload size (32 bytes), no matter how much
+   * was sent to write().
+   *
+   * @todo Implement variable-sized payloads feature
+   *
+   * @param size The number of bytes in the payload
+   */
+  void setPayloadSize(uint8_t size);
+
+  /**
+   * Get Static Payload Size
+   *
+   * @see setPayloadSize()
+   *
+   * @return The number of bytes in the payload
+   */
+  uint8_t getPayloadSize(void);
+
+  /**
+   * Get Dynamic Payload Size
+   *
+   * For dynamic payloads, this pulls the size of the payload off
+   * the chip
+   *
+   * @note Corrupt packets are now detected and flushed per the
+   * manufacturer.
+   * @code
+   * if(radio.available()){
+   *   if(radio.getDynamicPayloadSize() < 1){
+   *     // Corrupt payload has been flushed
+   *     return; 
+   *   }
+   *   radio.read(&data,sizeof(data));
+   * }
+   * @endcode
+   *
+   * @return Payload length of last-received dynamic payload
+   */
+  uint8_t getDynamicPayloadSize(void);
+
+  /**
+   * Enable custom payloads on the acknowledge packets
+   *
+   * Ack payloads are a handy way to return data back to senders without
+   * manually changing the radio modes on both units.
+   *
+   * @note Ack payloads are dynamic payloads. This only works on pipes 0&1 by default. Call 
+   * enableDynamicPayloads() to enable on all pipes.
+   */
+  void enableAckPayload(void);
+
+  /**
+   * Enable dynamically-sized payloads
+   *
+   * This way you don't always have to send large packets just to send them
+   * once in a while.  This enables dynamic payloads on ALL pipes.
+   *
+   */
+  void enableDynamicPayloads(void);
+  
+  /**
+   * Disable dynamically-sized payloads
+   *
+   * This disables dynamic payloads on ALL pipes. Since Ack Payloads
+   * requires Dynamic Payloads, Ack Payloads are also disabled.
+   * If dynamic payloads are later re-enabled and ack payloads are desired
+   * then enableAckPayload() must be called again as well.
+   *
+   */
+  void disableDynamicPayloads(void);
+  
+  /**
+   * Enable dynamic ACKs (single write multicast or unicast) for chosen messages
+   *
+   * @note To enable full multicast or per-pipe multicast, use setAutoAck()
+   *
+   * @warning This MUST be called prior to attempting single write NOACK calls
+   * @code
+   * radio.enableDynamicAck();
+   * radio.write(&data,32,1);  // Sends a payload with no acknowledgement requested
+   * radio.write(&data,32,0);  // Sends a payload using auto-retry/autoACK
+   * @endcode
+   */
+  void enableDynamicAck();
+  
+  /**
+   * Determine whether the hardware is an nRF24L01+ or not.
+   *
+   * @return true if the hardware is nRF24L01+ (or compatible) and false
+   * if its not.
+   */
+  bool isPVariant(void) ;
+
+  /**
+   * Enable or disable auto-acknowlede packets
+   *
+   * This is enabled by default, so it's only needed if you want to turn
+   * it off for some reason.
+   *
+   * @param enable Whether to enable (true) or disable (false) auto-acks
+   */
+  void setAutoAck(bool enable);
+
+  /**
+   * Enable or disable auto-acknowlede packets on a per pipeline basis.
+   *
+   * AA is enabled by default, so it's only needed if you want to turn
+   * it off/on for some reason on a per pipeline basis.
+   *
+   * @param pipe Which pipeline to modify
+   * @param enable Whether to enable (true) or disable (false) auto-acks
+   */
+  void setAutoAck( uint8_t pipe, bool enable ) ;
+
+  /**
+   * Set Power Amplifier (PA) level to one of four levels:
+   * RF24_PA_MIN, RF24_PA_LOW, RF24_PA_HIGH and RF24_PA_MAX
+   *
+   * The power levels correspond to the following output levels respectively:
+   * NRF24L01: -18dBm, -12dBm,-6dBM, and 0dBm
+   *
+   * SI24R1: -6dBm, 0dBm, 3dBM, and 7dBm.
+   *
+   * @param level Desired PA level.
+   */
+  void setPALevel ( uint8_t level );
+
+  /**
+   * Fetches the current PA level.
+   *
+   * NRF24L01: -18dBm, -12dBm, -6dBm and 0dBm
+   * SI24R1:   -6dBm, 0dBm, 3dBm, 7dBm
+   *
+   * @return Returns values 0 to 3 representing the PA Level.
+   */
+   uint8_t getPALevel( void );
+
+  /**
+   * Set the transmission data rate
+   *
+   * @warning setting RF24_250KBPS will fail for non-plus units
+   *
+   * @param speed RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
+   * @return true if the change was successful
+   */
+  bool setDataRate(rf24_datarate_e speed);
+
+  /**
+   * Fetches the transmission data rate
+   *
+   * @return Returns the hardware's currently configured datarate. The value
+   * is one of 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS, as defined in the
+   * rf24_datarate_e enum.
+   */
+  rf24_datarate_e getDataRate( void ) ;
+
+  /**
+   * Set the CRC length
+   * <br>CRC checking cannot be disabled if auto-ack is enabled
+   * @param length RF24_CRC_8 for 8-bit or RF24_CRC_16 for 16-bit
+   */
+  void setCRCLength(rf24_crclength_e length);
+
+  /**
+   * Get the CRC length
+   * <br>CRC checking cannot be disabled if auto-ack is enabled
+   * @return RF24_CRC_DISABLED if disabled or RF24_CRC_8 for 8-bit or RF24_CRC_16 for 16-bit
+   */
+  rf24_crclength_e getCRCLength(void);
+
+  /**
+   * Disable CRC validation
+   * 
+   * @warning CRC cannot be disabled if auto-ack/ESB is enabled.
+   */
+  void disableCRC( void ) ;
+
+  /**
+  * The radio will generate interrupt signals when a transmission is complete,
+  * a transmission fails, or a payload is received. This allows users to mask
+  * those interrupts to prevent them from generating a signal on the interrupt
+  * pin. Interrupts are enabled on the radio chip by default.
+  *
+  * @code
+  * 	Mask all interrupts except the receive interrupt:
+  *
+  *		radio.maskIRQ(1,1,0);
+  * @endcode
+  *
+  * @param tx_ok  Mask transmission complete interrupts
+  * @param tx_fail  Mask transmit failure interrupts
+  * @param rx_ready Mask payload received interrupts
+  */
+  void maskIRQ(bool tx_ok,bool tx_fail,bool rx_ready);
+  
+  /**
+  * 
+  * The driver will delay for this duration when stopListening() is called
+  * 
+  * When responding to payloads, faster devices like ARM(RPi) are much faster than Arduino:
+  * 1. Arduino sends data to RPi, switches to RX mode
+  * 2. The RPi receives the data, switches to TX mode and sends before the Arduino radio is in RX mode
+  * 3. If AutoACK is disabled, this can be set as low as 0. If AA/ESB enabled, set to 100uS minimum on RPi
+  *
+  * @warning If set to 0, ensure 130uS delay after stopListening() and before any sends
+  */
+  
+  uint32_t txDelay;
+
+  /**
+  * 
+  * On all devices but Linux and ATTiny, a small delay is added to the CSN toggling function
+  * 
+  * This is intended to minimise the speed of SPI polling due to radio commands
+  *
+  * If using interrupts or timed requests, this can be set to 0 Default:5
+  */
+  
+  uint32_t csDelay;
+  
+  /**@}*/
+  /**
+   * @name Deprecated
+   *
+   *  Methods provided for backwards compabibility.
+   */
+  /**@{*/
+
+
+  /**
+   * Open a pipe for reading
+   * @note For compatibility with old code only, see new function
+   *
+   * @warning Pipes 1-5 should share the first 32 bits.
+   * Only the least significant byte should be unique, e.g.
+   * @code
+   *   openReadingPipe(1,0xF0F0F0F0AA);
+   *   openReadingPipe(2,0xF0F0F0F066);
+   * @endcode
+   *
+   * @warning Pipe 0 is also used by the writing pipe.  So if you open
+   * pipe 0 for reading, and then startListening(), it will overwrite the
+   * writing pipe.  Ergo, do an openWritingPipe() again before write().
+   *
+   * @param number Which pipe# to open, 0-5.
+   * @param address The 40-bit address of the pipe to open.
+   */
+  void openReadingPipe(uint8_t number, uint64_t address);
+
+  /**
+   * Open a pipe for writing
+   * @note For compatibility with old code only, see new function
+   *
+   * Addresses are 40-bit hex values, e.g.:
+   *
+   * @code
+   *   openWritingPipe(0xF0F0F0F0F0);
+   * @endcode
+   *
+   * @param address The 40-bit address of the pipe to open.
+   */
+  void openWritingPipe(uint64_t address);
+
+  /**
+   * Empty the receive buffer
+   *
+   * @return Current value of status register
+   */
+  uint8_t flush_rx(void);
+
+private:
+
+  /**
+   * @name Low-level internal interface.
+   *
+   *  Protected methods that address the chip directly.  Regular users cannot
+   *  ever call these.  They are documented for completeness and for developers who
+   *  may want to extend this class.
+   */
+  /**@{*/
+
+  /**
+   * Set chip select pin
+   *
+   * Running SPI bus at PI_CLOCK_DIV2 so we don't waste time transferring data
+   * and best of all, we make use of the radio's FIFO buffers. A lower speed
+   * means we're less likely to effectively leverage our FIFOs and pay a higher
+   * AVR runtime cost as toll.
+   *
+   * @param mode HIGH to take this unit off the SPI bus, LOW to put it on
+   */
+  void csn(bool mode);
+
+  /**
+   * Set chip enable
+   *
+   * @param level HIGH to actively begin transmission or LOW to put in standby.  Please see data sheet
+   * for a much more detailed description of this pin.
+   */
+  void ce(bool level);
+
+  /**
+   * Read a chunk of data in from a register
+   *
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @param buf Where to put the data
+   * @param len How many bytes of data to transfer
+   * @return Current value of status register
+   */
+  uint8_t read_register(uint8_t reg, uint8_t* buf, uint8_t len);
+
+  /**
+   * Read single byte from a register
+   *
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @return Current value of register @p reg
+   */
+  uint8_t read_register(uint8_t reg);
+
+  /**
+   * Write a chunk of data to a register
+   *
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @param buf Where to get the data
+   * @param len How many bytes of data to transfer
+   * @return Current value of status register
+   */
+  uint8_t write_register(uint8_t reg, const uint8_t* buf, uint8_t len);
+
+  /**
+   * Write a single byte to a register
+   *
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @param value The new value to write
+   * @return Current value of status register
+   */
+  uint8_t write_register(uint8_t reg, uint8_t value);
+
+  /**
+   * Write the transmit payload
+   *
+   * The size of data written is the fixed payload size, see getPayloadSize()
+   *
+   * @param buf Where to get the data
+   * @param len Number of bytes to be sent
+   * @return Current value of status register
+   */
+  uint8_t write_payload(const void* buf, uint8_t len, const uint8_t writeType);
+
+  /**
+   * Read the receive payload
+   *
+   * The size of data read is the fixed payload size, see getPayloadSize()
+   *
+   * @param buf Where to put the data
+   * @param len Maximum number of bytes to read
+   * @return Current value of status register
+   */
+  uint8_t read_payload(void* buf, uint8_t len);
+
+  /**
+   * Retrieve the current status of the chip
+   *
+   * @return Current value of status register
+   */
+  uint8_t get_status(void);
+
+  #if !defined (MINIMAL)
+  /**
+   * Decode and print the given status to stdout
+   *
+   * @param status Status value to print
+   *
+   * @warning Does nothing if stdout is not defined.  See fdevopen in stdio.h
+   */
+  void print_status(uint8_t status);
+
+  /**
+   * Decode and print the given 'observe_tx' value to stdout
+   *
+   * @param value The observe_tx value to print
+   *
+   * @warning Does nothing if stdout is not defined.  See fdevopen in stdio.h
+   */
+  void print_observe_tx(uint8_t value);
+
+  /**
+   * Print the name and value of an 8-bit register to stdout
+   *
+   * Optionally it can print some quantity of successive
+   * registers on the same line.  This is useful for printing a group
+   * of related registers on one line.
+   *
+   * @param name Name of the register
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @param qty How many successive registers to print
+   */
+  void print_byte_register(const char* name, uint8_t reg, uint8_t qty = 1);
+
+  /**
+   * Print the name and value of a 40-bit address register to stdout
+   *
+   * Optionally it can print some quantity of successive
+   * registers on the same line.  This is useful for printing a group
+   * of related registers on one line.
+   *
+   * @param name Name of the register
+   * @param reg Which register. Use constants from nRF24L01.h
+   * @param qty How many successive registers to print
+   */
+  void print_address_register(const char* name, uint8_t reg, uint8_t qty = 1);
+#endif
+  /**
+   * Turn on or off the special features of the chip
+   *
+   * The chip has certain 'features' which are only available when the 'features'
+   * are enabled.  See the datasheet for details.
+   */
+  void toggle_features(void);
+
+  /**
+   * Built in spi transfer function to simplify repeating code repeating code
+   */
+
+  uint8_t spiTrans(uint8_t cmd);
+  
+  #if defined (FAILURE_HANDLING) || defined (RF24_LINUX)
+	void errNotify(void);
+  #endif
+  
+  /**@}*/
+
+};
+
+
+/**
+ * @example GettingStarted.ino
+ * <b>For Arduino</b><br>
+ * <b>Updated: TMRh20 2014 </b><br>
+ *
+ * This is an example of how to use the RF24 class to communicate on a basic level. Configure and write this sketch to two
+ * different nodes. Put one of the nodes into 'transmit' mode by connecting with the serial monitor and <br>
+ * sending a 'T'. The ping node sends the current time to the pong node, which responds by sending the value
+ * back. The ping node can then see how long the whole cycle took. <br>
+ * @note For a more efficient call-response scenario see the GettingStarted_CallResponse.ino example.
+ * @note When switching between sketches, the radio may need to be powered down to clear settings that are not "un-set" otherwise
+ */
+
+ /**
+ * @example gettingstarted.cpp
+ * <b>For Linux</b><br>
+ * <b>Updated: TMRh20 2014 </b><br>
+ *
+ * This is an example of how to use the RF24 class to communicate on a basic level. Configure and write this sketch to two
+ * different nodes. Put one of the nodes into 'transmit' mode by connecting with the serial monitor and <br>
+ * sending a 'T'. The ping node sends the current time to the pong node, which responds by sending the value
+ * back. The ping node can then see how long the whole cycle took. <br>
+ * @note For a more efficient call-response scenario see the GettingStarted_CallResponse.ino example.
+ */
+ 
+/**
+ * @example GettingStarted_CallResponse.ino
+ * <b>For Arduino</b><br>
+ * <b>New: TMRh20 2014</b><br>
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well. <br>
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to <br>
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication.
+ */
+ 
+ /**
+ * @example gettingstarted_call_response.cpp
+ * <b>For Linux</b><br>
+ * <b>New: TMRh20 2014</b><br>
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well. <br>
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to <br>
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication.
+ */
+
+ /**
+ * @example GettingStarted_HandlingData.ino
+ * <b>Dec 2014 - TMRh20</b><br>
+ *
+ * This example demonstrates how to send multiple variables in a single payload and work with data. As usual, it is
+ * generally important to include an incrementing value like millis() in the payloads to prevent errors.
+ */
+ 
+ /**
+ * @example GettingStarted_HandlingFailures.ino
+ *
+ * This example demonstrates the basic getting started functionality, but with failure handling for the radio chip.
+ * Addresses random radio failures etc, potentially due to loose wiring on breadboards etc.
+ */
+ 
+ 
+/**
+ * @example Transfer.ino
+ * <b>For Arduino</b><br>
+ * This example demonstrates half-rate transfer using the FIFO buffers<br>
+ *
+ * It is an example of how to use the RF24 class.  Write this sketch to two
+ * different nodes.  Put one of the nodes into 'transmit' mode by connecting <br>
+ * with the serial monitor and sending a 'T'.  The data transfer will begin,
+ * with the receiver displaying the payload count. (32Byte Payloads) <br>
+ */
+ 
+ /**
+ * @example transfer.cpp
+ * <b>For Linux</b><br>
+ * This example demonstrates half-rate transfer using the FIFO buffers<br>
+ *
+ * It is an example of how to use the RF24 class.  Write this sketch to two
+ * different nodes.  Put one of the nodes into 'transmit' mode by connecting <br>
+ * with the serial monitor and sending a 'T'.  The data transfer will begin,
+ * with the receiver displaying the payload count. (32Byte Payloads) <br>
+ */
+
+/**
+ * @example TransferTimeouts.ino
+ * <b>New: TMRh20 </b><br>
+ * This example demonstrates the use of and extended timeout period and
+ * auto-retries/auto-reUse to increase reliability in noisy or low signal scenarios. <br>
+ *
+ * Write this sketch to two different nodes.  Put one of the nodes into 'transmit'
+ * mode by connecting with the serial monitor and sending a 'T'.  The data <br>
+ * transfer will begin, with the receiver displaying the payload count and the
+ * data transfer rate.
+ */
+
+/**
+ * @example starping.pde
+ *
+ * This sketch is a more complex example of using the RF24 library for Arduino.
+ * Deploy this on up to six nodes.  Set one as the 'pong receiver' by tying the
+ * role_pin low, and the others will be 'ping transmit' units.  The ping units
+ * unit will send out the value of millis() once a second.  The pong unit will
+ * respond back with a copy of the value.  Each ping unit can get that response
+ * back, and determine how long the whole cycle took.
+ *
+ * This example requires a bit more complexity to determine which unit is which.
+ * The pong receiver is identified by having its role_pin tied to ground.
+ * The ping senders are further differentiated by a byte in eeprom.
+ */
+
+/**
+ * @example pingpair_ack.ino
+ * <b>Update: TMRh20</b><br>
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well.<br>
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to if wanting<br>
+ * to initiate communication instead of respond to a commmunication.
+ */
+
+/**
+ * @example pingpair_irq.ino
+ * <b>Update: TMRh20</b><br>
+ * This is an example of how to user interrupts to interact with the radio, and a demonstration
+ * of how to use them to sleep when receiving, and not miss any payloads.<br>
+ * The pingpair_sleepy example expands on sleep functionality with a timed sleep option for the transmitter.
+ * Sleep functionality is built directly into my fork of the RF24Network library<br>
+ */
+
+ /**
+ * @example pingpair_irq_simple.ino
+ * <b>Dec 2014 - TMRh20</b><br>
+ * This is an example of how to user interrupts to interact with the radio, with bidirectional communication.
+ */
+ 
+/**
+ * @example pingpair_sleepy.ino
+ * <b>Update: TMRh20</b><br>
+ * This is an example of how to use the RF24 class to create a battery-
+ * efficient system.  It is just like the GettingStarted_CallResponse example, but the<br>
+ * ping node powers down the radio and sleeps the MCU after every
+ * ping/pong cycle, and the receiver sleeps between payloads. <br>
+ */
+
+ /**
+ * @example rf24ping85.ino
+ * <b>New: Contributed by https://github.com/tong67</b><br>
+ * This is an example of how to use the RF24 class to communicate with ATtiny85 and other node. <br>
+ */
+ 
+ /**
+ * @example timingSearch3pin.ino
+ * <b>New: Contributed by https://github.com/tong67</b><br>
+ * This is an example of how to determine the correct timing for ATtiny when using only 3-pins
+ */
+  
+/**
+ * @example pingpair_dyn.ino
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size on Arduino.
+ */
+ 
+ /**
+ * @example pingpair_dyn.cpp
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size on Linux.
+ */
+
+/**
+ * @example pingpair_dyn.py
+ *
+ * This is a python example for RPi of how to use payloads of a varying (dynamic) size.
+ */ 
+ 
+/**
+ * @example scanner.ino
+ *
+ * Example to detect interference on the various channels available.
+ * This is a good diagnostic tool to check whether you're picking a
+ * good channel for your application.
+ *
+ * Inspired by cpixip.
+ * See http://arduino.cc/forum/index.php/topic,54795.0.html
+ */
+
+/**
+ * @mainpage Optimized High Speed Driver for nRF24L01(+) 2.4GHz Wireless Transceiver
+ *
+ * @section Goals Design Goals
+ *
+ * This library fork is designed to be...
+ * @li More compliant with the manufacturer specified operation of the chip, while allowing advanced users
+ * to work outside the recommended operation.
+ * @li Utilize the capabilities of the radio to their full potential via Arduino
+ * @li More reliable, responsive, bug-free and feature rich
+ * @li Easy for beginners to use, with well documented examples and features
+ * @li Consumed with a public interface that's similar to other Arduino standard libraries
+ *
+ * @section News News
+ *
+ * **Dec 2015**<br>
+ * - ESP8266 support via Arduino IDE
+ * - <a href="https://github.com/stewarthou/Particle-RF24">Particle Photon/Core</a> fork available
+ * - ATTiny2313/4313 support added
+ * - Python 3 support added
+ * - RF24 added to Arduino library manager
+ * - RF24 added to PlatformIO library manager
+ *
+ * **March 2015**<br>
+ * - Uses SPI transactions on Arduino
+ * - New layout for <a href="Portability.html">easier portability:</a> Break out defines & includes for individual platforms to RF24/utility
+ * - <a href="MRAA.html">MRAA</a> support added ( Galileo, Edison, etc)
+ * - <a href="Linux.html">Generic Linux support (SPIDEV)</a> support
+ * - Support for RPi 2 added
+ * - Major Documentation cleanup & update (Move all docs to github.io)
+ *
+ *
+ * If issues are discovered with the documentation, please report them <a href="https://github.com/TMRh20/tmrh20.github.io/issues"> here</a>
+ *
+ * <br>
+ * @section Useful Useful References
+ *
+ *
+ * @li <a href="http://tmrh20.github.io/RF24/classRF24.html"><b>RF24</b> Class Documentation</a>
+ * @li <a href="https://github.com/TMRh20/RF24/archive/master.zip"><b>Download</b></a>
+ * @li <a href="https://github.com/tmrh20/RF24/"><b>Source Code</b></a>
+ * @li <a href="http://tmrh20.blogspot.com/2014/03/high-speed-data-transfers-and-wireless.html"><b>My Blog:</b> RF24 Optimization Overview</a> 
+ * @li <a href="http://tmrh20.blogspot.com/2016/08/raspberry-pilinux-with-nrf24l01.html"><b>My Blog:</b> RPi/Linux w/RF24Gateway</a> 
+ * @li <a href="http://www.nordicsemi.com/files/Product/data_sheet/nRF24L01_Product_Specification_v2_0.pdf">Chip Datasheet</a>
+ *
+ * **Additional Information and Add-ons**
+ *
+ * @li <a href="http://tmrh20.github.io/RF24Network"> <b>RF24Network:</b> OSI Network Layer for multi-device communication. Create a home sensor network.</a>
+ * @li <a href="http://tmrh20.github.io/RF24Mesh"> <b>RF24Mesh:</b> Dynamic Mesh Layer for RF24Network</a>
+ * @li <a href="http://tmrh20.github.io/RF24Ethernet"> <b>RF24Ethernet:</b> TCP/IP Radio Mesh Networking (shares Arduino Ethernet API)</a>
+ * @li <a href="http://tmrh20.github.io/RF24Audio"> <b>RF24Audio:</b> Realtime Wireless Audio streaming</a>
+ * @li <a href="http://tmrh20.github.io/">All TMRh20 Documentation Main Page</a>
+ *
+ * **More Information and RF24 Based Projects**
+ *
+ * @li <a href="http://TMRh20.blogspot.com"> Project Blog: TMRh20.blogspot.com </a>
+ * @li <a href="http://maniacalbits.blogspot.ca/"> Maniacal Bits Blog</a>
+ * @li <a href="http://www.mysensors.org/">MySensors.org (User friendly sensor networks/IoT)</a>
+ * @li <a href="https://github.com/mannkind/RF24Node_MsgProto"> RF24Node_MsgProto (MQTT)</a>
+ * @li <a href="https://bitbucket.org/pjhardy/rf24sensornet/"> RF24SensorNet </a>
+ * @li <a href="http://www.homeautomationforgeeks.com/rf24software.shtml">Home Automation for Geeks</a>
+ * @li <a href="https://maniacbug.wordpress.com/2012/03/30/rf24network/"> Original Maniacbug RF24Network Blog Post</a>
+ * @li <a href="https://github.com/maniacbug/RF24"> ManiacBug on GitHub (Original Library Author)</a>
+ * 
+ *
+ * <br>
+ *
+ * @section Platform_Support Platform Support Pages
+ *
+ * @li <a href="Arduino.html"><b>Arduino</b></a> (Uno, Nano, Mega, Due, Galileo, etc)
+ * @li <a href="ATTiny.html"><b>ATTiny</b></a>
+ * @li <a href="Linux.html"><b>Linux devices</b></a>( <a href="RPi.html"><b>RPi</b></a> , <a href="Linux.html"><b>Linux SPI userspace device</b></a>, <a href="MRAA.html"><b>MRAA</b></a> supported boards ( Galileo, Edison, etc), <a href="LittleWire.html"><b>LittleWire</b></a>)
+ * @li <a href="CrossCompile.html"><b>Cross-compilation</b></a> for linux devices
+ * @li <a href="Python.html"><b>Python</b></a> wrapper available for Linux devices
+ *
+ * <br>
+ * **General µC Pin layout** (See the individual board support pages for more info)
+ *
+ * The table below shows how to connect the the pins of the NRF24L01(+) to different boards.
+ * CE and CSN are configurable.
+ *
+ * | PIN | NRF24L01 | Arduino UNO | ATtiny25/45/85 [0] | ATtiny44/84 [1] | LittleWire [2]          |    RPI     | RPi -P1 Connector |
+ * |-----|----------|-------------|--------------------|-----------------|-------------------------|------------|-------------------|
+ * |  1  |   GND    |   GND       |     pin 4          |    pin 14       | GND                     | rpi-gnd    |     (25)          |
+ * |  2  |   VCC    |   3.3V      |     pin 8          |    pin  1       | regulator 3.3V required | rpi-3v3    |     (17)          |
+ * |  3  |   CE     |   digIO 7   |     pin 2          |    pin 12       | pin to 3.3V             | rpi-gpio22 |     (15)          |
+ * |  4  |   CSN    |   digIO 8   |     pin 3          |    pin 11       | RESET                   | rpi-gpio8  |     (24)          |
+ * |  5  |   SCK    |   digIO 13  |     pin 7          |    pin  9       | SCK                     | rpi-sckl   |     (23)          |
+ * |  6  |   MOSI   |   digIO 11  |     pin 6          |    pin  7       | MOSI                    | rpi-mosi   |     (19)          |
+ * |  7  |   MISO   |   digIO 12  |     pin 5          |    pin  8       | MISO                    | rpi-miso   |     (21)          |
+ * |  8  |   IRQ    |      -      |        -           |         -       | -                       |    -       |       -           |
+ *
+ * @li [0] https://learn.sparkfun.com/tutorials/tiny-avr-programmer-hookup-guide/attiny85-use-hints
+ * @li [1] http://highlowtech.org/?p=1695
+ * @li [2] http://littlewire.cc/   
+ * <br><br><br>
+ *
+ *
+ *
+ *
+ * @page Arduino Arduino
+ * 
+ * RF24 is fully compatible with Arduino boards <br>
+ * See <b> http://www.arduino.cc/en/Reference/Board </b> and <b> http://arduino.cc/en/Reference/SPI </b> for more information
+ * 
+ * RF24 makes use of the standard hardware SPI pins (MISO,MOSI,SCK) and requires two additional pins, to control
+ * the chip-select and chip-enable functions.<br>
+ * These pins must be chosen and designated by the user, in RF24 radio(ce_pin,cs_pin); and can use any 
+ * available pins.
+ * 
+ * <br>
+ * @section ARD_DUE Arduino Due
+ * 
+ * RF24 makes use of the extended SPI functionality available on the Arduino Due, and requires one of the
+ * defined hardware SS/CS pins to be designated in RF24 radio(ce_pin,cs_pin);<br>
+ * See http://arduino.cc/en/Reference/DueExtendedSPI for more information
+ *
+ * Initial Due support taken from https://github.com/mcrosson/RF24/tree/due
+ *
+ * <br>
+ * @section Alternate_SPI Alternate SPI Support
+ *
+ * RF24 supports alternate SPI methods, in case the standard hardware SPI pins are otherwise unavailable.
+ * 
+ * <br>
+ * **Software Driven SPI**
+ *
+ * Software driven SPI is provided by the <a href=https://github.com/greiman/DigitalIO>DigitalIO</a> library
+ *
+ * Setup:<br>
+ * 1. Install the digitalIO library<br>
+ * 2. Open RF24_config.h in a text editor. 
+      Uncomment the line 
+      @code
+      #define SOFTSPI
+      @endcode
+      or add the build flag/option
+      @code
+      -DSOFTSPI
+      @endcode
+ * 3. In your sketch, add
+ *     @code
+ *     #include DigitalIO.h
+ *     @endcode
+ *
+ * @note Note: Pins are listed as follows and can be modified by editing the RF24_config.h file<br>
+ *
+ *     #define SOFT_SPI_MISO_PIN 16
+ *     #define SOFT_SPI_MOSI_PIN 15
+ *     #define SOFT_SPI_SCK_PIN 14
+ * Or add the build flag/option
+ *
+ *     -DSOFT_SPI_MISO_PIN=16 -DSOFT_SPI_MOSI_PIN=15 -DSOFT_SPI_SCK_PIN=14
+ *
+ * <br>
+ * **Alternate Hardware (UART) Driven  SPI**
+ *
+ * The Serial Port (UART) on Arduino can also function in SPI mode, and can double-buffer data, while the 
+ * default SPI hardware cannot.
+ *
+ * The SPI_UART library is available at https://github.com/TMRh20/Sketches/tree/master/SPI_UART
+ * 
+ * Enabling:
+ * 1. Install the SPI_UART library
+ * 2. Edit RF24_config.h and uncomment #define SPI_UART
+ * 3. In your sketch, add @code #include <SPI_UART.h> @endcode
+ *
+ * SPI_UART SPI Pin Connections:
+ * | NRF |Arduino Uno Pin|
+ * |-----|---------------|
+ * | MOSI| TX(0)         |
+ * | MISO| RX(1)         |
+ * | SCK | XCK(4)        |
+ * | CE  | User Specified|
+ * | CSN | User Specified|
+ *
+ *
+ * @note SPI_UART on Mega boards requires soldering to an unused pin on the chip. <br>See
+ * https://github.com/TMRh20/RF24/issues/24 for more information on SPI_UART.
+ * 
+ * @page ATTiny ATTiny
+ *
+ * ATTiny support is built into the library, so users are not required to include SPI.h in their sketches<br>
+ * See the included rf24ping85 example for pin info and usage
+ * 
+ * Some versions of Arduino IDE may require a patch to allow use of the full program space on ATTiny<br>
+ * See https://github.com/TCWORLD/ATTinyCore/tree/master/PCREL%20Patch%20for%20GCC for ATTiny patch
+ *
+ * ATTiny board support initially added from https://github.com/jscrane/RF24
+ *
+ * @section Hardware Hardware Configuration
+ * By tong67 ( https://github.com/tong67 )
+ * 
+ *    **ATtiny25/45/85 Pin map with CE_PIN 3 and CSN_PIN 4**
+ * @code
+ *                                 +-\/-+
+ *                   NC      PB5  1|o   |8  Vcc --- nRF24L01  VCC, pin2 --- LED --- 5V
+ *    nRF24L01  CE, pin3 --- PB3  2|    |7  PB2 --- nRF24L01  SCK, pin5
+ *    nRF24L01 CSN, pin4 --- PB4  3|    |6  PB1 --- nRF24L01 MOSI, pin6
+ *    nRF24L01 GND, pin1 --- GND  4|    |5  PB0 --- nRF24L01 MISO, pin7
+ *                                 +----+ 
+ * @endcode
+ *
+ * <br>
+ *    **ATtiny25/45/85 Pin map with CE_PIN 3 and CSN_PIN 3** => PB3 and PB4 are free to use for application <br>
+ *    Circuit idea from http://nerdralph.blogspot.ca/2014/01/nrf24l01-control-with-3-attiny85-pins.html <br>
+ *   Original RC combination was 1K/100nF. 22K/10nF combination worked better.                          <br>
+ *	For best settletime delay value in RF24::csn() the timingSearch3pin.ino sketch can be used.         <br>
+ *    This configuration is enabled when CE_PIN and CSN_PIN are equal, e.g. both 3                      <br>
+ *    Because CE is always high the power consumption is higher than for 5 pins solution                <br>
+ * @code
+ *                                                                                           ^^         
+ *                                 +-\/-+           nRF24L01   CE, pin3 ------|              //         
+ *                           PB5  1|o   |8  Vcc --- nRF24L01  VCC, pin2 ------x----------x--|<|-- 5V    
+ *                   NC      PB3  2|    |7  PB2 --- nRF24L01  SCK, pin5 --|<|---x-[22k]--|  LED         
+ *                   NC      PB4  3|    |6  PB1 --- nRF24L01 MOSI, pin6  1n4148 |                       
+ *    nRF24L01 GND, pin1 -x- GND  4|    |5  PB0 --- nRF24L01 MISO, pin7         |                       
+ *                        |        +----+                                       |                       
+ *                        |-----------------------------------------------||----x-- nRF24L01 CSN, pin4  
+ *                                                                      10nF                            
+ * @endcode
+ *
+ * <br>
+ *    **ATtiny24/44/84 Pin map with CE_PIN 8 and CSN_PIN 7** <br>
+ *	Schematic provided and successfully tested by Carmine Pastore (https://github.com/Carminepz) <br>
+ * @code
+ *                                  +-\/-+                                                              
+ *    nRF24L01  VCC, pin2 --- VCC  1|o   |14 GND --- nRF24L01  GND, pin1
+ *                            PB0  2|    |13 AREF
+ *                            PB1  3|    |12 PA1
+ *                            PB3  4|    |11 PA2 --- nRF24L01   CE, pin3
+ *                            PB2  5|    |10 PA3 --- nRF24L01  CSN, pin4
+ *                            PA7  6|    |9  PA4 --- nRF24L01  SCK, pin5
+ *    nRF24L01 MISO, pin7 --- PA6  7|    |8  PA5 --- nRF24L01 MOSI, pin6
+ *                                  +----+
+ *	@endcode					 
+ *	
+ * <br>
+ *    **ATtiny2313/4313 Pin map with CE_PIN 12 and CSN_PIN 13** <br>
+ * @code
+ *                                  +-\/-+                                                              
+ *                            PA2  1|o   |20 VCC --- nRF24L01  VCC, pin2
+ *                            PD0  2|    |19 PB7 --- nRF24L01  SCK, pin5
+ *                            PD1  3|    |18 PB6 --- nRF24L01 MOSI, pin6
+ *                            PA1  4|    |17 PB5 --- nRF24L01 MISO, pin7
+ *                            PA0  5|    |16 PB4 --- nRF24L01  CSN, pin4
+ *                            PD2  6|    |15 PB3 --- nRF24L01   CE, pin3
+ *                            PD3  7|    |14 PB2
+ *                            PD4  8|    |13 PB1
+ *                            PD5  9|    |12 PB0
+ *    nRF24L01  GND, pin1 --- GND 10|    |11 PD6
+ *                                  +----+
+ *	@endcode					 
+ *
+ * <br><br><br>
+ *
+ *
+ * 
+ * 
+ *
+ *
+ * @page Linux Linux devices
+ *
+ * Generic Linux devices are supported via SPIDEV, MRAA, RPi native via BCM2835, or using LittleWire.
+ *
+ *  @note The SPIDEV option should work with most Linux systems supporting spi userspace device. <br>
+ *
+ * <br>
+ * @section AutoInstall Automated Install 
+ *(**Designed & Tested on RPi** - Defaults to SPIDEV on devices supporting it)
+ *
+ * 
+ * 1. Install prerequisites if there are any (MRAA, LittleWire libraries, setup SPI device etc)
+ * 2. Download the install.sh file from http://tmrh20.github.io/RF24Installer/RPi/install.sh
+ * @code wget http://tmrh20.github.io/RF24Installer/RPi/install.sh @endcode
+ * 3. Make it executable
+ * @code chmod +x install.sh @endcode
+ * 4. Run it and choose your options
+ * @code ./install.sh @endcode
+ * 5. Run an example from one of the libraries
+ * @code 
+ * cd rf24libs/RF24/examples_linux  
+ * @endcode
+ * Edit the gettingstarted example, to set your pin configuration
+ * @code nano gettingstarted.cpp
+ * make  
+ * sudo ./gettingstarted  
+ * @endcode
+ *
+ * <br>
+ * @section ManInstall Manual Install
+ * 1. Install prerequisites if there are any (MRAA, LittleWire libraries, setup SPI device etc)
+ * @note See the <a href="http://iotdk.intel.com/docs/master/mraa/index.html">MRAA </a> documentation for more info on installing MRAA <br>
+ * 2. Make a directory to contain the RF24 and possibly RF24Network lib and enter it
+ * @code
+ *  mkdir ~/rf24libs 
+ *  cd ~/rf24libs
+*  @endcode
+ * 3. Clone the RF24 repo
+ *    @code git clone https://github.com/tmrh20/RF24.git RF24 @endcode
+ * 4. Change to the new RF24 directory
+ *    @code cd RF24 @endcode
+ * 5. Configure build environment using @code ./configure @endcode script. It auto detectes device and build environment. For overriding autodetections, use command-line switches, see @code ./configure --help @endcode for description.
+ * 6. Build the library, and run an example file
+ * @code sudo make install @endcode
+ * @code
+ * cd examples_linux  
+ * @endcode
+ * Edit the gettingstarted example, to set your pin configuration
+ * @code nano gettingstarted.cpp 
+ * make 
+ * sudo ./gettingstarted
+ * @endcode
+ *
+ * <br><br>
+ *   
+ * @page MRAA MRAA
+ *  
+ * MRAA is a Low Level Skeleton Library for Communication on GNU/Linux platforms <br>
+ * See http://iotdk.intel.com/docs/master/mraa/index.html for more information
+ *
+ * RF24 supports all MRAA supported platforms, but might not be tested on each individual platform due to the wide range of hardware support:<br>
+ * <a href="https://github.com/TMRh20/RF24/issues">Report an RF24 bug or issue </a>
+ *
+ * @section Setup Setup and installation
+ * 1. Install the MRAA lib
+ * 2. As per your device, SPI may need to be enabled
+ * 3. Follow <a href="Linux.html">Linux installation steps</a> to install RF24 libraries
+ * 
+ *
+ * <br><br><br>
+ *
+ * 
+ *
+ *
+ * @page RPi Raspberry Pi
+ *
+ * RF24 supports a variety of Linux based devices via various drivers. Some boards like RPi can utilize multiple methods
+ * to drive the GPIO and SPI functionality.
+ *
+ * <br>
+ * @section PreConfig Potential PreConfiguration
+ *
+ * If SPI is not already enabled, load it on boot:
+ * @code sudo raspi-config  @endcode
+ * A. Update the tool via the menu as required<br>
+ * B. Select **Advanced** and **enable the SPI kernel module** <br>
+ * C. Update other software and libraries
+ * @code sudo apt-get update @endcode
+ * @code sudo apt-get upgrade @endcode 
+ * <br><br>
+ *
+ * @section Build Build Options
+ * The default build on Raspberry Pi utilizes the included **BCM2835** driver from http://www.airspayce.com/mikem/bcm2835
+ * 1. @code sudo make install -B @endcode
+ *
+ * Build using the **MRAA** library from http://iotdk.intel.com/docs/master/mraa/index.html <br>
+ * MRAA is not included. See the <a href="MRAA.html">MRAA</a> platform page for more information.
+ *
+ * 1. Install, and build MRAA
+ * @code
+ * git clone https://github.com/intel-iot-devkit/mraa.git
+ * cd mraa
+ * mkdir build
+ * cd build
+ * cmake .. -DBUILDSWIGNODE=OFF
+ * sudo make install
+ * @endcode
+ *
+ * 2. Complete the install <br>
+ * @code nano /etc/ld.so.conf @endcode
+ * Add the line @code /usr/local/lib/arm-linux-gnueabihf @endcode
+ * Run @code sudo ldconfig @endcode
+ *
+ * 3. Install RF24, using MRAA
+ * @code
+ * ./configure --driver=MRAA
+ * sudo make install -B
+ * @endcode
+ * See the gettingstarted example for an example of pin configuration
+ *
+ * Build using **SPIDEV**
+ *
+ * 1. Make sure that spi device support is enabled and /dev/spidev\<a\>.\<b\> is present
+ * 2. Install RF24, using SPIDEV
+ * @code
+ * ./configure --driver=SPIDEV
+ * sudo make install -B
+ * @endcode
+ * 3. See the gettingstarted example for an example of pin configuration
+ *
+ * <br>
+ * @section Pins Connections and Pin Configuration
+ *
+ *
+ * Using pin 15/GPIO 22 for CE, pin 24/GPIO8 (CE0) for CSN
+ *
+ * Can use either RPi CE0 or CE1 pins for radio CSN.<br>
+ * Choose any RPi output pin for radio CE pin.
+ *
+ * **BCM2835 Constructor:**
+ * @code
+ *  RF24 radio(RPI_V2_GPIO_P1_15,BCM2835_SPI_CS0, BCM2835_SPI_SPEED_8MHZ);
+ *   or
+ *  RF24 radio(RPI_V2_GPIO_P1_15,BCM2835_SPI_CS1, BCM2835_SPI_SPEED_8MHZ);
+ *	
+ *  RPi B+:
+ *  RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+ *  or
+ *  RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_26, BCM2835_SPI_SPEED_8MHZ);
+ *
+ *  General:
+ *  RF24 radio(22,0);
+ *  or
+ *  RF24 radio(22,1);
+ *
+ * @endcode
+ * See the gettingstarted example for an example of pin configuration
+ *
+ * See http://www.airspayce.com/mikem/bcm2835/index.html for BCM2835 class documentation.
+ * <br><br>
+ * **MRAA Constructor:**
+ *
+ * @code RF24 radio(15,0); @endcode
+ *
+ * See http://iotdk.intel.com/docs/master/mraa/rasppi.html
+ * <br><br>
+ * **SPI_DEV Constructor**
+ *
+ * @code RF24 radio(22,0); @endcode
+ * In general, use @code RF24 radio(<ce_pin>, <a>*10+<b>); @endcode for proper SPIDEV constructor to address correct spi device at /dev/spidev\<a\>.\<b\>
+ *
+ * See http://pi.gadgetoid.com/pinout
+ *
+ * **Pins:**  
+ *
+ * | PIN | NRF24L01 |    RPI     | RPi -P1 Connector |
+ * |-----|----------|------------|-------------------|
+ * |  1  |   GND    | rpi-gnd    |     (25)          |
+ * |  2  |   VCC    | rpi-3v3    |     (17)          |
+ * |  3  |   CE     | rpi-gpio22 |     (15)          |
+ * |  4  |   CSN    | rpi-gpio8  |     (24)          |
+ * |  5  |   SCK    | rpi-sckl   |     (23)          |
+ * |  6  |   MOSI   | rpi-mosi   |     (19)          |
+ * |  7  |   MISO   | rpi-miso   |     (21)          |
+ * |  8  |   IRQ    |    -       |       -           |
+ *   
+ *   
+ *  
+ *  
+ * <br><br>
+ ****************
+ *   
+ * Based on the arduino lib from J. Coliz <maniacbug@ymail.com>  <br>
+ * the library was berryfied by Purinda Gunasekara <purinda@gmail.com> <br>  
+ * then forked from github stanleyseow/RF24 to https://github.com/jscrane/RF24-rpi  <br>
+ * Network lib also based on https://github.com/farconada/RF24Network
+ *
+ * 
+ *
+ * 
+ * <br><br><br>
+ * 
+ *
+ *  
+ * @page Python Python Wrapper (by https://github.com/mz-fuzzy)
+ *
+ * @note Both python2 and python3 are supported.
+ *
+ * @section Install Installation:  
+ *
+ * 1. Install the python-dev (or python3-dev) and boost libraries
+ * @code sudo apt-get install python-dev libboost-python-dev @endcode
+ * @note For python3 in Raspbian, it's needed to manually link python boost library, like this:
+ * @code sudo ln -s /usr/lib/arm-linux-gnueabihf/libboost_python-py34.so /usr/lib/arm-linux-gnueabihf/libboost_python3.so @endcode
+ *
+ * 2. Install python-setuptools (or python3-setuptools)
+ * @code sudo apt-get install python-setuptools @endcode
+ *
+ * 3. Build the library
+ * @code ./setup.py build   @endcode
+ * @note Build takes several minutes on arm-based machines. Machines with RAM <1GB may need to increase amount of swap for build.
+ *
+ * 4. Install the library
+ * @code sudo ./setup.py install  @endcode
+ * See the additional <a href="pages.html">Platform Support</a> pages for information on connecting your hardware  <br>
+ * See the included <a href="pingpair_dyn_8py-example.html">example </a> for usage information.   
+ * 
+ * 5. Running the Example
+ * Edit the pingpair_dyn.py example to configure the appropriate pins per the above documentation:  
+ * @code nano pingpair_dyn.py   @endcode
+ * Configure another device, Arduino or RPi with the <a href="pingpair_dyn_8py-example.html">pingpair_dyn</a> example <br>
+ * Run the example  
+ * @code sudo ./pingpair_dyn.py  @endcode
+ *
+ * <br><br><br>
+ *
+ * @page CrossCompile Linux cross-compilation
+ * 
+ * RF24 library supports cross-compilation. Advantages of cross-compilation:
+ *  - development tools don't have to be installed on target machine
+ *  - resources of target machine don't have to be sufficient for compilation
+ *  - compilation time can be reduced for large projects
+ *
+ *  Following prerequisites need to be assured:
+ *  - ssh passwordless access to target machine (https://linuxconfig.org/passwordless-ssh)
+ *  - sudo of a remote user without password (http://askubuntu.com/questions/334318/sudoers-file-enable-nopasswd-for-user-all-commands)
+ *  - cross-compilation toolchain for your target machine; for RPi
+ *  @code git clone https://github.com/raspberrypi/tools rpi_tools @endcode
+ *  and cross-compilation tools must be in PATH, for example
+ *  @code export PATH=$PATH:/your/dir/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin @endcode
+ *
+ * @section CxSteps Cross compilation steps:
+ * 1. clone RF24 to a machine for cross-compilation
+ * @code
+ * git clone https://github.com/TMRh20/RF24
+ * cd RF24
+ * @endcode
+ * 2. configure for cross compilation
+ * @code ./configure --remote=pi@target_linux_host @endcode
+ * eventually
+ * @code ./configure --remote=pi@target_linux_host --driver=<driver> @endcode
+ * 3. build
+ * @code make @endcode
+ * 4. (opt) install library to cross-compilation machine into cross-exvironment - important for compilation of examples
+ * @code sudo make install @endcode
+ * 5. upload library to target machine
+ * @code make upload @endcode
+ * 6. (opt) compile examples
+ * @code
+ * cd examples_linux
+ * make
+ * @endcode
+ * 7. (opt) upload examples to target machine
+ * @code make upload @endcode
+ *
+ * @section CxStepsPython Cross comilation steps for python wrapper
+ *
+ * Prerequisites:
+ * - Python setuptools must be installed on both target and cross-compilation machines
+ *   @code sudo pip install setuptools @endcode
+ *   or
+ *   @code sudo apt-get install python-setuptools @endcode
+ *
+ * Installation steps:
+ * 1. Assure having libboost-python-dev library in your cross-compilation environment. Alternatively, you can install it into your target machine and copy /usr and /lib directories to the cross-compilation machine.
+ * For example
+ * @code
+ * mkdir -p rpi_root && rsync -a pi@target_linux_host:/usr :/lib rpi_root
+ * export CFLAGS="--sysroot=/your/dir/rpi_root -I/your/dir/rpi_root/usr/include/python2.7/"
+ * @endcode
+ *
+ * 2. Build the python wrapper
+ * @code
+ * cd pyRF24
+ * ./setup.py build --compiler=crossunix
+ * @endcode
+ *
+ * 3. Make the egg package
+ * @code ./setup.py bdist_egg --plat-name=cross @endcode
+ * dist/RF24-<version>-cross.egg should be created.
+ *
+ * 4. Upload it to the target machine and install there:
+ * @code
+ * scp dist/RF24-*-cross.egg pi@target_linux_host:
+ * ssh pi@target_linux_host 'sudo easy_install RF24-*-cross.egg'
+ * @endcode
+ *
+ * <br><br><br>
+ *
+ * @page ATXMEGA ATXMEGA
+ * 
+ * The RF24 driver can be build as a static library with Atmel Studio 7 in order to be included as any other library in another program for the XMEGA family.
+ *
+ * Currently only the <b>ATXMEGA D3</b> family is implemented.
+ * 
+ * @section Preparation 
+ * 
+ * Create an empty GCC Static Library project in AS7.<br>
+ * As not all files are required, copy the following directory structure in the project:
+ * 
+ * @code
+ * utility\
+ *   ATXMegaD3\
+ *     compatibility.c
+ *     compatibility.h
+ *     gpio.cpp
+ *     gpio.h
+ *     gpio_helper.c
+ *     gpio_helper.h
+ *     includes.h
+ *     RF24_arch_config.h
+ *     spi.cpp
+ *     spi.h
+ * nRF24L01.h
+ * printf.h
+ * RF24.cpp
+ * RF24.h
+ * RF24_config.h
+ * @endcode
+ * 
+ * @section Usage
+ * 
+ * Add the library to your project!<br>
+ * In the file where the **main()** is put the following in order to update the millisecond functionality:
+ * 
+ * @code
+ * ISR(TCE0_OVF_vect)
+ * {
+ * 	update_milisec();
+ * }
+ * @endcode
+ * 
+ * Declare the rf24 radio with **RF24 radio(XMEGA_PORTC_PIN3, XMEGA_SPI_PORT_C);**
+ * 
+ * First parameter is the CE pin which can be any available pin on the uC.
+ * 
+ * Second parameter is the CS which can be on port C (**XMEGA_SPI_PORT_C**) or on port D (**XMEGA_SPI_PORT_D**). 
+ * 
+ * Call the **__start_timer()** to start the millisecond timer.
+ * 
+ * @note Note about the millisecond functionality:<br>
+ * 
+ * 	The millisecond functionality is based on the TCE0 so don't use these pins as IO.<br>
+ * 	The operating frequency of the uC is 32MHz. If you have other frequency change the TCE0 registers appropriatly in function **__start_timer()** in **compatibility.c** file for your frequency. 
+ *
+ * @page Portability RF24 Portability
+ *
+ * The RF24 radio driver mainly utilizes the <a href="http://arduino.cc/en/reference/homePage">Arduino API</a> for GPIO, SPI, and timing functions, which are easily replicated
+ * on various platforms. <br>Support files for these platforms are stored under RF24/utility, and can be modified to provide 
+ * the required functionality.
+ * 
+ * <br>
+ * @section Hardware_Templates Basic Hardware Template
+ *
+ * **RF24/utility**
+ *
+ * The RF24 library now includes a basic hardware template to assist in porting to various platforms. <br> The following files can be included
+ * to replicate standard Arduino functions as needed, allowing devices from ATTiny to Raspberry Pi to utilize the same core RF24 driver.
+ *
+ * | File               |                   Purpose                                                    | 
+ * |--------------------|------------------------------------------------------------------------------| 
+ * | RF24_arch_config.h | Basic Arduino/AVR compatibility, includes for remaining support files, etc   | 
+ * | includes.h         | Linux only. Defines specific platform, include correct RF24_arch_config file | 
+ * | spi.h              | Provides standardized SPI ( transfer() ) methods                         | 
+ * | gpio.h             | Provides standardized GPIO ( digitalWrite() ) methods                        | 
+ * | compatibility.h    | Provides standardized timing (millis(), delay()) methods                     | 
+ * | your_custom_file.h | Provides access to custom drivers for spi,gpio, etc                          | 
+ *
+ * <br>
+ * Examples are provided via the included hardware support templates in **RF24/utility** <br>
+ * See the <a href="modules.html">modules</a> page for examples of class declarations 
+ *
+ *<br>
+ * @section Device_Detection Device Detection
+ *
+ * 1. The main detection for Linux devices is done in the configure script, with the includes.h from the proper hardware directory copied to RF24/utility/includes.h <br>
+ * 2. Secondary detection is completed in RF24_config.h, causing the include.h file to be included for all supported Linux devices <br>
+ * 3. RF24.h contains the declaration for SPI and GPIO objects 'spi' and 'gpio' to be used for porting-in related functions.
+ *
+ * <br>
+ * @section Ported_Code Code
+ * To have your ported code included in this library, or for assistance in porting, create a pull request or open an issue at https://github.com/TMRh20/RF24
+ * 
+ *
+ *<br><br><br>
+ */
+
+#endif // __RF24_H__
diff --git a/lib/RF24/RF24_config.h b/lib/RF24/RF24_config.h
new file mode 100644
index 000000000..8ef822758
--- /dev/null
+++ b/lib/RF24/RF24_config.h
@@ -0,0 +1,166 @@
+
+/*
+ Copyright (C) 
+  2011      J. Coliz <maniacbug@ymail.com>
+  2015-2019 TMRh20
+  2015      spaniakos <spaniakos@gmail.com>
+  2015      nerdralph
+  2015      zador-blood-stained
+  2016      akatran
+  2017-2019 Avamander <avamander@gmail.com>
+  2019      IkpeohaGodson
+         
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+*/
+
+#ifndef __RF24_CONFIG_H__
+#define __RF24_CONFIG_H__
+
+/*** USER DEFINES:  ***/  
+#define FAILURE_HANDLING
+//#define SERIAL_DEBUG
+//#define MINIMAL
+//#define SPI_UART  // Requires library from https://github.com/TMRh20/Sketches/tree/master/SPI_UART
+//#define SOFTSPI   // Requires library from https://github.com/greiman/DigitalIO
+  
+/**********************/
+#define rf24_max(a,b) (a>b?a:b)
+#define rf24_min(a,b) (a<b?a:b)
+
+#if defined (SPI_HAS_TRANSACTION) && !defined (SPI_UART) && !defined (SOFTSPI)
+  #define RF24_SPI_TRANSACTIONS
+#endif // defined (SPI_HAS_TRANSACTION) && !defined (SPI_UART) && !defined (SOFTSPI)
+
+//ATXMega
+#if defined (__AVR_ATxmega64D3__) || defined (__AVR_ATxmega128D3__) || defined (__AVR_ATxmega192D3__) || defined (__AVR_ATxmega256D3__) || defined (__AVR_ATxmega384D3__) // In order to be available both in Windows and Linux this should take presence here.
+  #define XMEGA
+  #define XMEGA_D3
+  #include "utility/ATXMegaD3/RF24_arch_config.h"
+
+#elif ( !defined (ARDUINO) ) // Any non-arduino device is handled via configure/Makefile
+  // The configure script detects device and copies the correct includes.h file to /utility/includes.h
+  // This behavior can be overridden by calling configure with respective parameters
+  // The includes.h file defines either RF24_RPi, MRAA, LITTLEWIRE or RF24_SPIDEV and includes the correct RF24_arch_config.h file
+  #include "utility/includes.h"
+
+//ATTiny  
+#elif defined (__AVR_ATtiny25__) || defined (__AVR_ATtiny45__) || defined (__AVR_ATtiny85__) || defined (__AVR_ATtiny24__) || defined (__AVR_ATtiny44__) || defined (__AVR_ATtiny84__) || defined (__AVR_ATtiny2313__) || defined (__AVR_ATtiny4313__) || defined (__AVR_ATtiny861__)  
+  #define RF24_TINY
+  #include "utility/ATTiny/RF24_arch_config.h"
+
+#elif defined (LITTLEWIRE) //LittleWire
+  #include "utility/LittleWire/RF24_arch_config.h"
+
+#elif defined (TEENSYDUINO) //Teensy
+  #include "utility/Teensy/RF24_arch_config.h"  
+
+#else //Everything else
+  #include <Arduino.h>
+  
+  // RF modules support 10 Mhz SPI bus speed
+  const uint32_t RF24_SPI_SPEED = 10000000;  
+
+  #if defined (ARDUINO) && !defined (__arm__) && !defined (__ARDUINO_X86__)
+    #if defined SPI_UART
+      #include <SPI_UART.h>
+      #define _SPI uspi
+    #elif defined (SOFTSPI)
+      // change these pins to your liking
+      //
+      #ifndef SOFT_SPI_MISO_PIN
+        #define SOFT_SPI_MISO_PIN 9
+      #endif // SOFT_SPI_MISO_PIN
+
+      #ifndef SOFT_SPI_MOSI_PIN
+        #define SOFT_SPI_MOSI_PIN 8
+      #endif // SOFT_SPI_MOSI_PIN
+
+      #ifndef SOFT_SPI_SCK_PIN
+        #define SOFT_SPI_SCK_PIN 7
+      #endif // SOFT_SPI_SCK_PIN
+
+      const uint8_t SPI_MODE = 0;
+      #define _SPI spi
+  
+    #else // !defined (SPI_UART) && !defined (SOFTSPI)
+      #include <SPI.h>
+      #define _SPI SPI
+    #endif // !defined (SPI_UART) && !defined (SOFTSPI)
+
+  #else // defined (ARDUINO) && !defined (__arm__) && !defined (__ARDUINO_X86__)
+    // Define _BV for non-Arduino platforms and for Arduino DUE
+    #include <stdint.h>
+    #include <stdio.h>
+    #include <string.h>
+
+    #if defined(__arm__) || defined (__ARDUINO_X86__)
+      #if defined (__arm__) && defined (SPI_UART)
+        #include <SPI_UART.h>
+        #define _SPI uspi
+
+      #else // !defined (__arm__) || !defined (SPI_UART)
+        #include <SPI.h>
+        #define _SPI SPI
+
+      #endif // !defined (__arm__) || !defined (SPI_UART)
+    #elif !defined(__arm__) && !defined (__ARDUINO_X86__)
+      extern HardwareSPI SPI;
+
+    #endif // !defined(__arm__) && !defined (__ARDUINO_X86__)
+ 
+    #define _BV(x) (1<<(x))
+  #endif // defined (ARDUINO) && !defined (__arm__) && !defined (__ARDUINO_X86__)
+
+  #ifdef SERIAL_DEBUG
+    #define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+    #define IF_SERIAL_DEBUG(x)
+    #if defined(RF24_TINY)
+      #define printf_P(...)
+
+    #endif // defined(RF24_TINY)
+  #endif // SERIAL_DEBUG
+  
+  #if defined (__ARDUINO_X86__)
+    #define printf_P printf
+    #define _BV(bit) (1<<(bit))
+
+  #endif // defined (__ARDUINO_X86__)
+  
+  // Progmem is Arduino-specific
+  // Arduino DUE is arm and does not include avr/pgmspace
+  #if defined (ARDUINO_ARCH_ESP8266) || defined (ESP32)
+    #include <pgmspace.h>
+    #define PRIPSTR "%s"
+
+  #elif defined (ESP32)
+    #include <pgmspace.h>
+    #define PRIPSTR "%s"
+
+  #elif defined (ARDUINO) && !defined (ESP_PLATFORM) && ! defined (__arm__) && !defined (__ARDUINO_X86__) || defined (XMEGA)
+    #include <avr/pgmspace.h>
+    #define PRIPSTR "%S"
+
+  #else // !defined (ARDUINO) || defined (ESP_PLATFORM) || defined (__arm__) || defined (__ARDUINO_X86__) && !defined (XMEGA)
+    #if !defined (ARDUINO) // This doesn't work on Arduino DUE
+      typedef char const char;
+
+    #else // Fill in pgm_read_byte that is used, but missing from DUE
+      #define pgm_read_byte(addr) (*(const unsigned char *)(addr))
+    #endif // !defined (ARDUINO)
+
+    typedef uint16_t prog_uint16_t;
+    #define PSTR(x) (x)
+    #define printf_P printf
+    #define strlen_P strlen
+    #define PROGMEM
+    #define pgm_read_word(p) (*(p))
+    #define pgm_read_ptr(p) (*(p))
+    #define PRIPSTR "%s"
+
+  #endif // !defined (ARDUINO) || defined (ESP_PLATFORM) || defined (__arm__) || defined (__ARDUINO_X86__) && !defined (XMEGA)
+#endif //Everything else
+
+#endif // __RF24_CONFIG_H__
diff --git a/lib/RF24/configure b/lib/RF24/configure
new file mode 100755
index 000000000..31a0f9de7
--- /dev/null
+++ b/lib/RF24/configure
@@ -0,0 +1,473 @@
+#!/bin/bash
+
+CROSS_CC=arm-linux-gnueabihf-gcc
+CROSS_CXX=arm-linux-gnueabihf-g++
+
+function help {
+cat <<EOF
+configure script for RF24 library.
+Options:
+
+Help:
+    -h, --help                  print this message
+
+Driver options:
+    --driver=[wiringPi|SPIDEV|MRAA|RPi|LittleWire]
+                                Driver for RF24 library. [configure autodetected]
+
+Building options:
+    --os=[LINUX|DARWIN]         Operating system. [configure autodetected]
+    --soc=[BCM2835|BCM2836|AM33XX|A10|A13|A20|H3]
+                                SoC type to be used. [configure autodetected]
+    --cpu-flags=<CFLAGS>        CPU defining/optimizing flags to be used. [configure autodetected]
+    --extra-cflags=<CFLAGS>     Extra C flags passed to C/C++ compilation. []
+    --extra-ldflags=<LDFLAGS>   Extra C flags passed to linking. []
+    --libname=<LIBNAME>         Library name. [rf24]
+    --c_compiler=<CC>           C compiler. [arm-linux-gnueabihf-gcc][gcc]
+    --cxx_compiler=<CXX>        C++ compiler [arm-linux-gnueabihf-g++][g++]
+    --no-clean                  Don't clean previous build artifacts
+
+Installation options:
+    --prefix=<PREFIX>           Installation prefix path. [/usr/local]
+    --lib-dir=<DIR>             Library target installation directory. [PREFIX/lib]
+    --header-dir=<DIR>          Header files target installation directory. [PREFIX/include]
+    --examples-dir=<DIR>        Example files installation directory. [PREFIX/bin]
+    --ldconfig=<LDCONFIG>       Ldconfig binary. Can be set to '' to skip ldconfig step. [ldconfig]
+
+Cross-compilation options:
+    --remote-host=<REMOTE_HOST> Remote hostname for installation.
+    --remote-user=<REMOTE_USER> Remote username for installation. [current user]
+    --remote-port=<REMOTE_PORT> Ssh port of remote machine. [22]
+    --remote=<USER@HOST>        Remote ssh host identification for installation [REMOTE_USER@REMOTE_HOST]
+    --remote-prefix=<RPREFIX>   Remote host installation prefix path. [/usr/local]
+    --remote-lib-dir=<DIR>      Remote library target installation directory [RPREFIX/lib]
+    --remote-header-dir=<DIR>   Remote header files target installation directory. [RPREFIX/include]
+    --remote-ldconfig=<RLDCON>  Remote ldconfig binary filename. Can be set to '' to skip ldconfig call. [ldconfig]
+    --remote-examples-dir=<DIR> Example files remote installation directory. Default: [REMOTE_PREFIX/bin]
+
+EOF
+}
+
+function execute_check {
+    if [ "${REMOTE}" ]; then
+        ssh -o 'PasswordAuthentication=no' -o 'PreferredAuthentications=publickey' -o 'ConnectTimeout=30' -o 'BatchMode=yes' -o 'StrictHostKeyChecking=no' -p ${REMOTE_PORT} ${REMOTE} $1
+    else
+        eval $1
+    fi
+}
+
+function die {
+    echo "[ERROR] $1"
+    exit $2
+}
+
+function detect_machine {
+    local cpu=$(execute_check "uname -m 2>/dev/null")
+    local machine=$(execute_check "cat /sys/firmware/devicetree/base/model 2>/dev/null")
+    local hardware=$(execute_check "grep sunxi_platform /sys/class/sunxi_info/sys_info 2>/dev/null | sed 's/^.*: \(.*\)$/\1/'")
+    if [ -z "$hardware" ]; then
+        local hardware=$(execute_check "grep Hardware /proc/cpuinfo 2>/dev/null | sed 's/^.*: \(.*\)$/\1/'")
+    fi
+    local soc="unknown"
+    local tp="unknown"
+
+    if [ -z "$cpu" ]; then
+        cpu="unknown"
+    fi
+
+    case $hardware in
+    BCM2708|BCM2835)
+        soc="BCM2835"
+        if [[ $machine == "Raspberry"* ]]; then
+            tp="RPi"
+        fi
+        ;;
+    BCM2709)
+        soc="BCM2836"
+        if [[ $machine == "Raspberry"* ]]; then
+            tp="RPi2"
+        fi
+        ;;
+    sun4i|Sun4iw1p1)
+        soc="A10"
+        ;;
+    sun5i|Sun4iw2p1)
+        soc="A13"
+        ;;
+    Sun4iw2p2)
+        soc="A12"
+        ;;
+    Sun4iw2p3)
+        soc="A10s"
+        ;;
+    sun6i|Sun8iw1p1)
+        soc="A31"
+        ;;
+    Sun8iw1p2)
+        soc="A31s"
+        ;;
+    sun7i|Sun8iw2p1)
+        soc="A20"
+        if [[ $machine == "Banana Pi"* ]]; then
+            tp="BananaPi"
+        elif [[ $machine == "Banana Pro"* ]]; then
+            tp="BananaPro"
+        fi
+        ;;
+    sun8i|Sun8iw7p1)
+        soc="H3"
+        ;;
+    Sun8iw3p1)
+        soc="A23"
+        ;;
+    Sun8iw5p1)
+        soc="A33"
+        ;;
+    Sun8iw6p1)
+        soc="A83t"
+        ;;
+    sun9i|Sun9iw1p1)
+        soc="A80"
+        ;;
+    Sun9iw1p2)
+        soc="A80t"
+        ;;
+    sun50i|Sun50iw1p1)
+        soc="A64"
+        ;;
+    'Generic AM33XX'*)
+        soc="AM33XX"
+        ;;
+    *)
+        soc="unknown"
+    esac
+    echo "${soc} ${tp} ${cpu}"
+}
+
+function gcc_cpu_flags {
+    local soc=$1
+    case $soc in
+    BCM2835)
+        flags="-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard"
+        ;;
+    BCM2836)
+        flags="-march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard"
+        ;;
+    AM33XX)
+        flags="-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard"
+        ;;
+    A10)
+        flags="-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard"
+        ;;
+    A13)
+        flags="-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard"
+        ;;
+    A20)
+        flags="-march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard"
+        ;;
+    H3)
+        flags="-march=armv8-a -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard"
+        ;;
+    *)
+        flags=""
+    esac
+    echo ${flags}
+}
+
+function detect_driver {
+    if [[ $(execute_check "cat /proc/cpuinfo | grep Hardware | grep 'BCM2708\|BCM2709\|BCM2835'") ]]; then
+        result=RPi
+    elif [[ $(execute_check 'ls /dev/spidev* 2>/dev/null') ]]; then
+        result=SPIDEV
+    elif [[ $(execute_check "file /usr/lib/libwiringPi.so*") ]]; then
+        result=wiringPi
+    elif [[ $(execute_check "${REMOTE_LDCONFIG} -p | grep libmraa") ]]; then
+        result=MRAA
+    elif [[ $(execute_check "${REMOTE_LDCONFIG} -p | grep liblittlewire-spi") ]]; then
+        result=LittleWire
+    else
+        result=""
+    fi
+    echo $result
+}
+
+function gen_symlink_names {
+    base_name="$1"
+    version="$2"
+
+    IFS='.' read -r -a ver <<< "$version"
+    versions=""
+    for index in "${!ver[@]}" ; do
+        verstr=""
+        for ind in `seq 0 $(expr $index - 1)` ; do
+            verstr="${verstr}.${ver[$ind]}"
+        done
+        versions="${base_name}${verstr} $versions"
+    done
+    echo ${versions}
+}
+
+params="OS SOC DRIVER CPUFLAGS CFLAGS PREFIX REMOTE_PREFIX LIB LIBNAME LIB_VERSION LIBSYMLINKS LIBDEPRECATE CC CXX LIB_DIR REMOTE_LIB_DIR HEADER_DIR REMOTE_HEADER_DIR DRIVER_DIR ARCH_DIR REMOTE REMOTE_HOST REMOTE_USER REMOTE_PORT SHARED_LINKER_FLAGS SHARED_LINKER_LIBS LDCONFIG REMOTE_LDCONFIG EXAMPLES_DIR REMOTE_EXAMPLES_DIR"
+
+for opt do
+    if [ "$opt" = "-h" ] || [ "$opt" = "--help" ]; then
+        help
+        exit 0
+    fi
+    optarg="${opt#*=}"
+    case "$opt" in
+    --os=*)
+        OS="$optarg"
+        ;;
+    --soc=*)
+        SOC="$optarg"
+        ;;
+    --cpu-flags=*)
+        CPUFLAGS="$optarg"
+        ;;
+    --extra-cflags=*)
+        CFLAGS="$optarg"
+        ;;
+    --extra-ldflags=*)
+        LDFLAGS="$optarg"
+        ;;
+    --libname=*)
+        LIB="$optarg"
+        ;;
+    --c_compiler=*)
+        CC="$optarg"
+        ;;
+    --cxx_compiler=*)
+        CXX="$optarg"
+        ;;
+    --no-clean*)
+        NO_CLEAN="1"
+        ;;
+    --prefix=*)
+        PREFIX="$optarg"
+        ;;
+    --lib-dir=*)
+        LIB_DIR="$optarg"
+        ;;
+    --header-dir=*)
+        HEADER_DIR="$optarg"
+        ;;
+    --examples-dir=*)
+        EXAMPLES_DIR="$optarg"
+        ;;
+    --ldconfig=*)
+        LDCONFIG="$optarg"
+        ;;
+    --driver=*)
+        DRIVER="$optarg"
+        ;;
+    --remote-host=*)
+        REMOTE_HOST="$optarg"
+        ;;
+    --remote-user=*)
+        REMOTE_USER="$optarg"
+        ;;
+    --remote-port=*)
+        REMOTE_PORT="$optarg"
+        ;;
+    --remote=*)
+        REMOTE="$optarg"
+        ;;
+    --remote-prefix=*)
+        REMOTE_PREFIX="$optarg"
+        ;;
+    --remote-lib-dir=*)
+        REMOTE_LIB_DIR="$optarg"
+        ;;
+    --remote-header-dir=*)
+        REMOTE_HEADER_DIR="$optarg"
+        ;;
+    --remote-ldconfig=*)
+        REMOTE_LDCONFIG="$optarg"
+        ;;
+    --remote-examples-dir=*)
+        REMOTE_EXAMPLES_DIR="$optarg"
+        ;;
+    *)
+        echo "[WARNING] Unknown option detected:$opt, ignored"
+        ;;
+    esac
+done
+
+#*******************************************
+# remote machine verification
+if [ "${REMOTE_HOST}" ]; then
+    if [ "${REMOTE_USER}" ]; then
+        REMOTE=${REMOTE_USER}@${REMOTE_HOST}
+    else
+        REMOTE=${REMOTE_HOST}
+    fi
+fi
+if [ "${REMOTE}" ]; then
+    echo "[SECTION] Checking remote host."
+    if [ -z "${REMOTE_HOST}" ]; then
+        REMOTE_HOST=${REMOTE/*@/}
+    fi
+    if [ -z "${REMOTE_PORT}" ]; then
+        REMOTE_PORT=22
+    fi
+    if [ "$(nmap ${REMOTE_HOST} -Pn  --host-timeout 30s -p ${REMOTE_PORT} 2>/dev/null | grep open)" ]; then
+        echo "  [OK] ssh daemon on ${REMOTE_HOST} port ${REMOTE_PORT} seems to be listening."
+    else
+        echo "  [WARNING] ssh on ${REMOTE_HOST} port ${REMOTE_PORT} seems not to be listening or nmap not installed."
+    fi
+    if [[ "$(execute_check 'echo ok 2>/dev/null' 2>/dev/null)" ]]; then
+        echo "  [OK] Remote machine ssh passwordless login configured fine."
+    else
+        die "Remote machine ssh and/or passwordless login check failed." 4
+    fi
+    if [[ $(execute_check "sudo echo ok 2>/dev/null") ]]; then
+        echo "  [OK] Remote machine sudo configured fine."
+    else
+        die "Remote machine sudo test failed." 5
+    fi
+fi
+
+if [ -z "${CC}" ]; then
+    echo "[SECTION] Detecting arm compilation environment."
+    if [[ $(command -v ${CROSS_CC} 2>/dev/null) ]]; then
+        echo "  [OK] ${CROSS_CC} detected."
+        CC=${CROSS_CC}
+        CROSS_SYSROOT="$(${CC} --print-sysroot)"
+        if [ "${CROSS_SYSROOT}" = "/" ]; then
+            CROSS_SYSROOT=""
+        fi
+    else
+        echo "  [INFO] ${CROSS_CC} not found."
+    fi
+    if [[ $(command -v ${CROSS_CXX} 2>/dev/null) ]]; then
+        echo "  [OK] ${CROSS_CXX} detected."
+        CXX=${CROSS_CXX}
+    else
+        echo "  [INFO] ${CROSS_CXX} not found."
+    fi
+fi
+
+if [ "${CROSS_SYSROOT}" ]; then
+    PREFIX="${CROSS_SYSROOT}/usr/local"
+fi
+
+PREFIX=${PREFIX:-/usr/local}
+REMOTE_PREFIX=${REMOTE_PREFIX:-/usr/local}
+LIB_DIR=${LIB_DIR:-${PREFIX}/lib}
+REMOTE_LIB_DIR=${REMOTE_LIB_DIR:-${REMOTE_PREFIX}/lib}
+HEADER_DIR=${HEADER_DIR:-${PREFIX}/include/RF24}
+REMOTE_HEADER_DIR=${REMOTE_HEADER_DIR:-${REMOTE_PREFIX}/include/RF24}
+EXAMPLES_DIR=${EXAMPLES_DIR:-${PREFIX}/bin}
+REMOTE_EXAMPLES_DIR=${REMOTE_EXAMPLES_DIR:-${REMOTE_PREFIX}/bin}
+LDCONFIG=${LDCONFIG-ldconfig}
+REMOTE_LDCONFIG=${REMOTE_LDCONFIG-/sbin/ldconfig}
+LIB=${LIB:-rf24}
+LIB_VERSION=${LIB_VERSION:-$(awk -F "=" '/version/ {print $2}' library.properties)}
+LIB_DEPRECATE_NAME=${LIB_DEPRECATE_NAME:-"rf24-bcm"}
+LIB_DEPRECATE_VERSION=${LIB_DEPRECATE_VERSION:-""}
+CC=${CC:-gcc}
+CXX=${CXX:-g++}
+ARCH_DIR=${ARCH_DIR:-utility}
+
+
+if [ -z "${SOC}" ]; then
+    echo "[SECTION] Detecting target machine."
+    info=($(detect_machine))
+    SOC=${info[0]}
+    TYPE=${info[1]}
+    CPU=${info[2]}
+    echo "[OK] machine detected: SoC=${SOC}, Type=${TYPE}, CPU=${CPU}."
+fi
+
+if [ -z "${CPUFLAGS}" ]; then
+    CPUFLAGS=$(gcc_cpu_flags $SOC)
+fi
+
+
+#*******************************************
+# DRIVER detection
+if [ -z "${DRIVER}" ]; then
+    echo "[SECTION] Detecting DRIVER"
+    DRIVER=$(detect_driver)
+    if [ -z "${DRIVER}" ]; then
+        die "No supported driver detected. Run configure with --driver=<driver> to set a driver explicitly." 1
+    fi
+    echo "  [OK] DRIVER detected:${DRIVER}."
+fi
+
+case ${DRIVER} in
+wiringPi)
+    SHARED_LINKER_LIBS+=" -pthread -lwiringPi"
+    CFLAGS+=" -lwiringPi"
+    ;;
+SPIDEV)
+    SHARED_LINKER_LIBS+=" -pthread"
+    ;;
+RPi)
+    SHARED_LINKER_LIBS+=" -pthread"
+    ;;
+MRAA)
+    SHARED_LINKER_LIBS+=" -lmraa"
+    ;;
+LittleWire)
+    SHARED_LINKER_LIBS+=" -llittlewire-spi"
+    ;;
+*)
+    die "Unsupported DRIVER: ${DRIVER}." 2
+    ;;
+esac
+
+#*******************************************
+# OS detection
+if [ -z "${OS}" ]; then
+    echo "[SECTION] Detecting OS."
+    OS=$(execute_check "uname")
+    OS=${OS^^}
+    echo "  [INFO] OS detected:${OS}."
+fi
+
+case ${OS} in
+LINUX)
+    DYN_SUFFIX=so
+    SHARED_LINKER_FLAGS+=" -shared -Wl,-soname,lib${LIB}.${DYN_SUFFIX}.${LIB_VERSION%%.*}"
+    ;;
+DARWIN)
+    DYN_SUFFIX=dylib
+    SHARED_LINKER_FLAGS+=" -dynamiclib -install_name ${LIB_DIR}/lib${LIB}.${DYN_SUFFIX}.${LIB_VERSION%%.*}"
+    ;;
+*)
+    die "Unsupported OS: ${OS}." 3
+    ;;
+esac
+
+
+LIBNAME=${LIBNAME:-lib${LIB}.${DYN_SUFFIX}.${LIB_VERSION}}
+LIBSYMLINKS="${LIBSYMLINKS:-$(gen_symlink_names lib${LIB}.${DYN_SUFFIX} ${LIB_VERSION})}"
+if [ "${LIB_DEPRECATE_NAME}" ]; then
+    LIBDEPRECATE="${LIBDEPRECATE:-lib${LIB_DEPRECATE_NAME}.${DYN_SUFFIX}}"
+    if [ "${LIB_DEPRECATE_VERSION}" ]; then
+        LIBDEPRECATE="${LIBDEPRECATE}.${LIB_DEPRECATE_VERSION}"
+    fi
+fi
+DRIVER_DIR=${DRIVER_DIR:-${ARCH_DIR}/${DRIVER}}
+CFLAGS="$CPUFLAGS -Ofast -Wall -pthread $CFLAGS"
+
+echo "[SECTION] Preparing configuration."
+cp ${DRIVER_DIR}/includes.h ${ARCH_DIR}/includes.h
+
+echo "[SECTION] Saving configuration."
+echo -n "" > Makefile.inc
+for param in ${params}; do
+    if [[ ${!param} ]]; then
+        echo "${param}=${!param}" >> Makefile.inc
+    fi
+done
+
+if [ -z "${NO_CLEAN}" ]; then
+    echo "[SECTION] Cleaning previous builds."
+    make clean >/dev/null
+fi
+
+
+echo "[OK] Finished."
diff --git a/lib/RF24/doxygen-custom.css b/lib/RF24/doxygen-custom.css
new file mode 100644
index 000000000..bec4472e8
--- /dev/null
+++ b/lib/RF24/doxygen-custom.css
@@ -0,0 +1,835 @@
+/* The standard CSS for doxygen */
+
+body, table, div, p, dl {
+	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+	font-size: 12px;
+}
+
+/* @group Heading Levels */
+
+h1 {
+	font-size: 150%;
+}
+
+.title {
+	font-size: 150%;
+	font-weight: bold;
+	margin: 10px 2px;
+}
+
+h2 {
+	font-size: 120%;
+}
+
+h3 {
+	font-size: 100%;
+}
+
+dt {
+	font-weight: bold;
+}
+
+div.multicol {
+	-moz-column-gap: 1em;
+	-webkit-column-gap: 1em;
+	-moz-column-count: 3;
+	-webkit-column-count: 3;
+}
+
+p.startli, p.startdd, p.starttd {
+	margin-top: 2px;
+}
+
+p.endli {
+	margin-bottom: 0px;
+}
+
+p.enddd {
+	margin-bottom: 4px;
+}
+
+p.endtd {
+	margin-bottom: 2px;
+}
+
+/* @end */
+
+caption {
+	font-weight: bold;
+}
+
+span.legend {
+        font-size: 70%;
+        text-align: center;
+}
+
+h3.version {
+        font-size: 90%;
+        text-align: center;
+}
+
+div.qindex, div.navtab{
+	background-color: #EBEFF6;
+	border: 1px solid #A3B4D7;
+	text-align: center;
+	margin: 2px;
+	padding: 2px;
+}
+
+div.qindex, div.navpath {
+	width: 100%;
+	line-height: 110%;
+}
+
+div.navtab {
+	margin-right: 15px;
+}
+
+/* @group Link Styling */
+
+a {
+	color: #3D578C;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+.contents a:visited {
+	color: #4665A2;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+a.qindex {
+	font-weight: bold;
+}
+
+a.qindexHL {
+	font-weight: bold;
+	background-color: #9CAFD4;
+	color: #ffffff;
+	border: 1px double #869DCA;
+}
+
+.contents a.qindexHL:visited {
+        color: #ffffff;
+}
+
+a.el {
+	font-weight: bold;
+}
+
+a.elRef {
+}
+
+a.code {
+	color: #4665A2;
+}
+
+a.codeRef {
+	color: #4665A2;
+}
+
+/* @end */
+
+dl.el {
+	margin-left: -1cm;
+}
+
+.fragment {
+	font-family: monospace, fixed;
+	font-size: 105%;
+}
+
+pre.fragment {
+	border: 1px solid #C4CFE5;
+	background-color: #FBFCFD;
+	padding: 4px 6px;
+	margin: 4px 8px 4px 2px;
+	overflow: auto;
+	word-wrap: break-word;
+	font-size:  9pt;
+	line-height: 125%;
+}
+
+div.ah {
+	background-color: black;
+	font-weight: bold;
+	color: #ffffff;
+	margin-bottom: 3px;
+	margin-top: 3px;
+	padding: 0.2em;
+	border: solid thin #333;
+	border-radius: 0.5em;
+	-webkit-border-radius: .5em;
+	-moz-border-radius: .5em;
+	box-shadow: 2px 2px 3px #999;
+	-webkit-box-shadow: 2px 2px 3px #999;
+	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
+	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
+}
+
+div.groupHeader {
+	margin-left: 16px;
+	margin-top: 12px;
+	font-weight: bold;
+}
+
+div.groupText {
+	margin-left: 16px;
+	font-style: italic;
+}
+
+body {
+	background: white;
+	color: black;
+        margin: 0;
+}
+
+div.contents {
+	margin-top: 10px;
+	margin-left: 10px;
+	margin-right: 5px;
+}
+
+td.indexkey {
+	background-color: #EBEFF6;
+	font-weight: bold;
+	border: 1px solid #C4CFE5;
+	margin: 2px 0px 2px 0;
+	padding: 2px 10px;
+}
+
+td.indexvalue {
+	background-color: #EBEFF6;
+	border: 1px solid #C4CFE5;
+	padding: 2px 10px;
+	margin: 2px 0px;
+}
+
+tr.memlist {
+	background-color: #EEF1F7;
+}
+
+p.formulaDsp {
+	text-align: center;
+}
+
+img.formulaDsp {
+	
+}
+
+img.formulaInl {
+	vertical-align: middle;
+}
+
+div.center {
+	text-align: center;
+        margin-top: 0px;
+        margin-bottom: 0px;
+        padding: 0px;
+}
+
+div.center img {
+	border: 0px;
+}
+
+address.footer {
+	text-align: right;
+	padding-right: 12px;
+}
+
+img.footer {
+	border: 0px;
+	vertical-align: middle;
+}
+
+/* @group Code Colorization */
+
+span.keyword {
+	color: #008000
+}
+
+span.keywordtype {
+	color: #604020
+}
+
+span.keywordflow {
+	color: #e08000
+}
+
+span.comment {
+	color: #800000
+}
+
+span.preprocessor {
+	color: #806020
+}
+
+span.stringliteral {
+	color: #002080
+}
+
+span.charliteral {
+	color: #008080
+}
+
+span.vhdldigit { 
+	color: #ff00ff 
+}
+
+span.vhdlchar { 
+	color: #000000 
+}
+
+span.vhdlkeyword { 
+	color: #700070 
+}
+
+span.vhdllogic { 
+	color: #ff0000 
+}
+
+/* @end */
+
+/*
+.search {
+	color: #003399;
+	font-weight: bold;
+}
+
+form.search {
+	margin-bottom: 0px;
+	margin-top: 0px;
+}
+
+input.search {
+	font-size: 75%;
+	color: #000080;
+	font-weight: normal;
+	background-color: #e8eef2;
+}
+*/
+
+td.tiny {
+	font-size: 75%;
+}
+
+.dirtab {
+	padding: 4px;
+	border-collapse: collapse;
+	border: 1px solid #A3B4D7;
+}
+
+th.dirtab {
+	background: #EBEFF6;
+	font-weight: bold;
+}
+
+hr {
+	height: 0px;
+	border: none;
+	border-top: 1px solid #4A6AAA;
+}
+
+hr.footer {
+	height: 1px;
+}
+
+/* @group Member Descriptions */
+
+table.memberdecls {
+	border-spacing: 0px;
+	padding: 0px;
+}
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+	background-color: #F9FAFC;
+	border: none;
+	margin: 4px;
+	padding: 1px 0 0 8px;
+}
+
+.mdescLeft, .mdescRight {
+	padding: 0px 8px 4px 8px;
+	color: #555;
+}
+
+.memItemLeft, .memItemRight, .memTemplParams {
+	border-top: 1px solid #C4CFE5;
+}
+
+.memItemLeft, .memTemplItemLeft {
+        white-space: nowrap;
+}
+
+.memItemRight {
+	width: 100%;
+}
+
+.memTemplParams {
+	color: #4665A2;
+        white-space: nowrap;
+}
+
+/* @end */
+
+/* @group Member Details */
+
+/* Styles for detailed member documentation */
+
+.memtemplate {
+	font-size: 80%;
+	color: #4665A2;
+	font-weight: normal;
+	margin-left: 9px;
+}
+
+.memnav {
+	background-color: #EBEFF6;
+	border: 1px solid #A3B4D7;
+	text-align: center;
+	margin: 2px;
+	margin-right: 15px;
+	padding: 2px;
+}
+
+.mempage {
+	width: 100%;
+}
+
+.memitem {
+	padding: 0;
+	margin-bottom: 10px;
+	margin-right: 5px;
+}
+
+.memname {
+        white-space: nowrap;
+        font-weight: bold;
+        margin-left: 6px;
+}
+
+.memproto {
+        border-top: 1px solid #A8B8D9;
+        border-left: 1px solid #A8B8D9;
+        border-right: 1px solid #A8B8D9;
+        padding: 6px 0px 6px 0px;
+        color: #253555;
+        font-weight: bold;
+        text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+        /* opera specific markup */
+        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        border-top-right-radius: 8px;
+        border-top-left-radius: 8px;
+        /* firefox specific markup */
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+        -moz-border-radius-topright: 8px;
+        -moz-border-radius-topleft: 8px;
+        /* webkit specific markup */
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        -webkit-border-top-right-radius: 8px;
+        -webkit-border-top-left-radius: 8px;
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
+
+}
+
+.memdoc {
+        border-bottom: 1px solid #A8B8D9;      
+        border-left: 1px solid #A8B8D9;      
+        border-right: 1px solid #A8B8D9; 
+        padding: 2px 5px;
+        background-color: #FBFCFD;
+        border-top-width: 0;
+        /* opera specific markup */
+        border-bottom-left-radius: 8px;
+        border-bottom-right-radius: 8px;
+        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        /* firefox specific markup */
+        -moz-border-radius-bottomleft: 8px;
+        -moz-border-radius-bottomright: 8px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
+        /* webkit specific markup */
+        -webkit-border-bottom-left-radius: 8px;
+        -webkit-border-bottom-right-radius: 8px;
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
+}
+
+.paramkey {
+	text-align: right;
+}
+
+.paramtype {
+	white-space: nowrap;
+}
+
+.paramname {
+	color: #602020;
+	white-space: nowrap;
+}
+.paramname em {
+	font-style: normal;
+}
+
+.params, .retval, .exception, .tparams {
+        border-spacing: 6px 2px;
+}       
+
+.params .paramname, .retval .paramname {
+        font-weight: bold;
+        vertical-align: top;
+}
+        
+.params .paramtype {
+        font-style: italic;
+        vertical-align: top;
+}       
+        
+.params .paramdir {
+        font-family: "courier new",courier,monospace;
+        vertical-align: top;
+}
+
+
+
+
+/* @end */
+
+/* @group Directory (tree) */
+
+/* for the tree view */
+
+.ftvtree {
+	font-family: sans-serif;
+	margin: 0px;
+}
+
+/* these are for tree view when used as main index */
+
+.directory {
+	font-size: 9pt;
+	font-weight: bold;
+	margin: 5px;
+}
+
+.directory h3 {
+	margin: 0px;
+	margin-top: 1em;
+	font-size: 11pt;
+}
+
+/*
+The following two styles can be used to replace the root node title
+with an image of your choice.  Simply uncomment the next two styles,
+specify the name of your image and be sure to set 'height' to the
+proper pixel height of your image.
+*/
+
+/*
+.directory h3.swap {
+	height: 61px;
+	background-repeat: no-repeat;
+	background-image: url("yourimage.gif");
+}
+.directory h3.swap span {
+	display: none;
+}
+*/
+
+.directory > h3 {
+	margin-top: 0;
+}
+
+.directory p {
+	margin: 0px;
+	white-space: nowrap;
+}
+
+.directory div {
+	display: none;
+	margin: 0px;
+}
+
+.directory img {
+	vertical-align: -30%;
+}
+
+/* these are for tree view when not used as main index */
+
+.directory-alt {
+	font-size: 100%;
+	font-weight: bold;
+}
+
+.directory-alt h3 {
+	margin: 0px;
+	margin-top: 1em;
+	font-size: 11pt;
+}
+
+.directory-alt > h3 {
+	margin-top: 0;
+}
+
+.directory-alt p {
+	margin: 0px;
+	white-space: nowrap;
+}
+
+.directory-alt div {
+	display: none;
+	margin: 0px;
+}
+
+.directory-alt img {
+	vertical-align: -30%;
+}
+
+/* @end */
+
+div.dynheader {
+        margin-top: 8px;
+}
+
+address {
+	font-style: normal;
+	color: #2A3D61;
+}
+
+table.doxtable {
+	border-collapse:collapse;
+}
+
+table.doxtable td, table.doxtable th {
+	border: 1px solid #2D4068;
+	padding: 3px 7px 2px;
+}
+
+table.doxtable th {
+	background-color: #374F7F;
+	color: #FFFFFF;
+	font-size: 110%;
+	padding-bottom: 4px;
+	padding-top: 5px;
+	text-align:left;
+}
+
+.tabsearch {
+	top: 0px;
+	left: 10px;
+	height: 36px;
+	background-image: url('tab_b.png');
+	z-index: 101;
+	overflow: hidden;
+	font-size: 13px;
+}
+
+.navpath ul
+{
+	font-size: 11px;
+	background-image:url('tab_b.png');
+	background-repeat:repeat-x;
+	height:30px;
+	line-height:30px;
+	color:#8AA0CC;
+	border:solid 1px #C2CDE4;
+	overflow:hidden;
+	margin:0px;
+	padding:0px;
+}
+
+.navpath li
+{
+	list-style-type:none;
+	float:left;
+	padding-left:10px;
+	padding-right:15px;
+	background-image:url('bc_s.png');
+	background-repeat:no-repeat;
+	background-position:right;
+	color:#364D7C;
+}
+
+.navpath li.navelem a
+{
+	height:32px;
+	display:block;
+	text-decoration: none;
+	outline: none;
+}
+
+.navpath li.navelem a:hover
+{
+	color:#6884BD;
+}
+
+.navpath li.footer
+{
+        list-style-type:none;
+        float:right;
+        padding-left:10px;
+        padding-right:15px;
+        background-image:none;
+        background-repeat:no-repeat;
+        background-position:right;
+        color:#364D7C;
+        font-size: 8pt;
+}
+
+
+div.summary
+{
+	float: right;
+	font-size: 8pt;
+	padding-right: 5px;
+	width: 50%;
+	text-align: right;
+}       
+
+div.summary a
+{
+	white-space: nowrap;
+}
+
+div.ingroups
+{
+	font-size: 8pt;
+	padding-left: 5px;
+	width: 50%;
+	text-align: left;
+}
+
+div.ingroups a
+{
+	white-space: nowrap;
+}
+
+div.header
+{
+        background-image:url('nav_h.png');
+        background-repeat:repeat-x;
+	background-color: #F9FAFC;
+	margin:  0px;
+	border-bottom: 1px solid #C4CFE5;
+}
+
+div.headertitle
+{
+	padding: 5px 5px 5px 10px;
+}
+
+dl
+{
+        padding: 0 0 0 10px;
+}
+
+dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+{
+        border-left:4px solid;
+        padding: 0 0 0 6px;
+}
+
+dl.note
+{
+        border-color: #D0C000;
+}
+
+dl.warning, dl.attention
+{
+        border-color: #FF0000;
+}
+
+dl.pre, dl.post, dl.invariant
+{
+        border-color: #00D000;
+}
+
+dl.deprecated
+{
+        border-color: #505050;
+}
+
+dl.todo
+{
+        border-color: #00C0E0;
+}
+
+dl.test
+{
+        border-color: #3030E0;
+}
+
+dl.bug
+{
+        border-color: #C08050;
+}
+
+#projectlogo
+{
+	text-align: center;
+	vertical-align: bottom;
+	border-collapse: separate;
+}
+ 
+#projectlogo img
+{ 
+	border: 0px none;
+}
+ 
+#projectname
+{
+	font: 300% Tahoma, Arial,sans-serif;
+	margin: 0px;
+	padding: 2px 0px;
+}
+    
+#projectbrief
+{
+	font: 120% Tahoma, Arial,sans-serif;
+	margin: 0px;
+	padding: 0px;
+}
+
+#projectnumber
+{
+	font: 50% Tahoma, Arial,sans-serif;
+	margin: 0px;
+	padding: 0px;
+}
+
+#titlearea
+{
+	padding: 0px;
+	margin: 0px;
+	width: 100%;
+	border-bottom: 1px solid #5373B4;
+}
+
+.image
+{
+        text-align: left;
+}
+
+.dotgraph
+{
+        text-align: center;
+}
+
+.mscgraph
+{
+        text-align: center;
+}
+
+.caption
+{
+	font-weight: bold;
+}
+
diff --git a/lib/RF24/examples/GettingStarted/GettingStarted.ino b/lib/RF24/examples/GettingStarted/GettingStarted.ino
new file mode 100644
index 000000000..5f7a2c501
--- /dev/null
+++ b/lib/RF24/examples/GettingStarted/GettingStarted.ino
@@ -0,0 +1,142 @@
+
+/*
+* Getting Started example sketch for nRF24L01+ radios
+* This is a very basic example of how to send data from one node to another
+* Updated: Dec 2014 by TMRh20
+*/
+
+#include <SPI.h>
+#include "RF24.h"
+
+/****************** User Config ***************************/
+/***      Set this radio as radio number 0 or 1         ***/
+bool radioNumber = 0;
+
+/* Hardware configuration: Set up nRF24L01 radio on SPI bus plus pins 7 & 8 */
+RF24 radio(7,8);
+/**********************************************************/
+
+byte addresses[][6] = {"1Node","2Node"};
+
+// Used to control whether this node is sending or receiving
+bool role = 0;
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println(F("RF24/examples/GettingStarted"));
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+  
+  radio.begin();
+
+  // Set the PA Level low to prevent power supply related issues since this is a
+ // getting_started sketch, and the likelihood of close proximity of the devices. RF24_PA_MAX is default.
+  radio.setPALevel(RF24_PA_LOW);
+  
+  // Open a writing and reading pipe on each radio, with opposite addresses
+  if(radioNumber){
+    radio.openWritingPipe(addresses[1]);
+    radio.openReadingPipe(1,addresses[0]);
+  }else{
+    radio.openWritingPipe(addresses[0]);
+    radio.openReadingPipe(1,addresses[1]);
+  }
+  
+  // Start the radio listening for data
+  radio.startListening();
+}
+
+void loop() {
+  
+  
+/****************** Ping Out Role ***************************/  
+if (role == 1)  {
+    
+    radio.stopListening();                                    // First, stop listening so we can talk.
+    
+    
+    Serial.println(F("Now sending"));
+
+    unsigned long start_time = micros();                             // Take the time, and send it.  This will block until complete
+     if (!radio.write( &start_time, sizeof(unsigned long) )){
+       Serial.println(F("failed"));
+     }
+        
+    radio.startListening();                                    // Now, continue listening
+    
+    unsigned long started_waiting_at = micros();               // Set up a timeout period, get the current microseconds
+    boolean timeout = false;                                   // Set up a variable to indicate if a response was received or not
+    
+    while ( ! radio.available() ){                             // While nothing is received
+      if (micros() - started_waiting_at > 200000 ){            // If waited longer than 200ms, indicate timeout and exit while loop
+          timeout = true;
+          break;
+      }      
+    }
+        
+    if ( timeout ){                                             // Describe the results
+        Serial.println(F("Failed, response timed out."));
+    }else{
+        unsigned long got_time;                                 // Grab the response, compare, and send to debugging spew
+        radio.read( &got_time, sizeof(unsigned long) );
+        unsigned long end_time = micros();
+        
+        // Spew it
+        Serial.print(F("Sent "));
+        Serial.print(start_time);
+        Serial.print(F(", Got response "));
+        Serial.print(got_time);
+        Serial.print(F(", Round-trip delay "));
+        Serial.print(end_time-start_time);
+        Serial.println(F(" microseconds"));
+    }
+
+    // Try again 1s later
+    delay(1000);
+  }
+
+
+
+/****************** Pong Back Role ***************************/
+
+  if ( role == 0 )
+  {
+    unsigned long got_time;
+    
+    if( radio.available()){
+                                                                    // Variable for the received timestamp
+      while (radio.available()) {                                   // While there is data ready
+        radio.read( &got_time, sizeof(unsigned long) );             // Get the payload
+      }
+     
+      radio.stopListening();                                        // First, stop listening so we can talk   
+      radio.write( &got_time, sizeof(unsigned long) );              // Send the final one back.      
+      radio.startListening();                                       // Now, resume listening so we catch the next packets.     
+      Serial.print(F("Sent response "));
+      Serial.println(got_time);  
+   }
+ }
+
+
+
+
+/****************** Change Roles via Serial Commands ***************************/
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == 0 ){      
+      Serial.println(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+      role = 1;                  // Become the primary transmitter (ping out)
+    
+   }else
+    if ( c == 'R' && role == 1 ){
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));      
+       role = 0;                // Become the primary receiver (pong back)
+       radio.startListening();
+       
+    }
+  }
+
+
+} // Loop
+
diff --git a/lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino b/lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
new file mode 100644
index 000000000..c0ca30c60
--- /dev/null
+++ b/lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
@@ -0,0 +1,138 @@
+/*
+   Dec 2014 - TMRh20 - Updated
+   Derived from examples by J. Coliz <maniacbug@ymail.com>
+*/
+/**
+ * Example for efficient call-response using ack-payloads 
+ * 
+ * This example continues to make use of all the normal functionality of the radios including 
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well. 
+ * This allows very fast call-response communication, with the responding radio never having to 
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to 
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication. 
+ */
+ 
+#include <SPI.h>
+#include "RF24.h"
+
+/****************** User Config ***************************/
+/***      Set this radio as radio number 0 or 1         ***/
+bool radioNumber = 0;
+
+/* Hardware configuration: Set up nRF24L01 radio on SPI bus plus pins 7 & 8 */
+RF24 radio(7,8);
+/**********************************************************/
+                                                                           // Topology
+byte addresses[][6] = {"1Node","2Node"};              // Radio pipe addresses for the 2 nodes to communicate.
+
+// Role management: Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  
+typedef enum { role_ping_out = 1, role_pong_back } role_e;                 // The various roles supported by this sketch
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};  // The debug-friendly names of those roles
+role_e role = role_pong_back;                                              // The role of the current running sketch
+
+byte counter = 1;                                                          // A single byte to keep track of the data being sent back and forth
+
+
+void setup(){
+
+  Serial.begin(115200);
+  Serial.println(F("RF24/examples/GettingStarted_CallResponse"));
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+ 
+  // Setup and configure radio
+
+  radio.begin();
+
+  radio.enableAckPayload();                     // Allow optional ack payloads
+  radio.enableDynamicPayloads();                // Ack payloads are dynamic payloads
+  
+  if(radioNumber){
+    radio.openWritingPipe(addresses[1]);        // Both radios listen on the same pipes by default, but opposite addresses
+    radio.openReadingPipe(1,addresses[0]);      // Open a reading pipe on address 0, pipe 1
+  }else{
+    radio.openWritingPipe(addresses[0]);
+    radio.openReadingPipe(1,addresses[1]);
+  }
+  radio.startListening();                       // Start listening  
+  
+  radio.writeAckPayload(1,&counter,1);          // Pre-load an ack-paylod into the FIFO buffer for pipe 1
+  //radio.printDetails();
+}
+
+void loop(void) {
+
+  
+/****************** Ping Out Role ***************************/
+
+  if (role == role_ping_out){                               // Radio is in ping mode
+
+    byte gotByte;                                           // Initialize a variable for the incoming response
+    
+    radio.stopListening();                                  // First, stop listening so we can talk.      
+    Serial.print(F("Now sending "));                         // Use a simple byte counter as payload
+    Serial.println(counter);
+    
+    unsigned long time = micros();                          // Record the current microsecond count   
+                                                            
+    if ( radio.write(&counter,1) ){                         // Send the counter variable to the other radio 
+        if(!radio.available()){                             // If nothing in the buffer, we got an ack but it is blank
+            Serial.print(F("Got blank response. round-trip delay: "));
+            Serial.print(micros()-time);
+            Serial.println(F(" microseconds"));     
+        }else{      
+            while(radio.available() ){                      // If an ack with payload was received
+                radio.read( &gotByte, 1 );                  // Read it, and display the response time
+                unsigned long timer = micros();
+                
+                Serial.print(F("Got response "));
+                Serial.print(gotByte);
+                Serial.print(F(" round-trip delay: "));
+                Serial.print(timer-time);
+                Serial.println(F(" microseconds"));
+                counter++;                                  // Increment the counter variable
+            }
+        }
+    
+    }else{        Serial.println(F("Sending failed.")); }          // If no ack response, sending failed
+    
+    delay(1000);  // Try again later
+  }
+
+
+/****************** Pong Back Role ***************************/
+
+  if ( role == role_pong_back ) {
+    byte pipeNo, gotByte;                          // Declare variables for the pipe and the byte received
+    while( radio.available(&pipeNo)){              // Read all available payloads
+      radio.read( &gotByte, 1 );                   
+                                                   // Since this is a call-response. Respond directly with an ack payload.
+      gotByte += 1;                                // Ack payloads are much more efficient than switching to transmit mode to respond to a call
+      radio.writeAckPayload(pipeNo,&gotByte, 1 );  // This can be commented out to send empty payloads.
+      Serial.print(F("Loaded next response "));
+      Serial.println(gotByte);  
+   }
+ }
+
+
+
+/****************** Change Roles via Serial Commands ***************************/
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == role_pong_back ){      
+      Serial.println(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+      role = role_ping_out;  // Become the primary transmitter (ping out)
+      counter = 1;
+   }else
+    if ( c == 'R' && role == role_ping_out ){
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));      
+       role = role_pong_back; // Become the primary receiver (pong back)
+       radio.startListening();
+       counter = 1;
+       radio.writeAckPayload(1,&counter,1);
+       
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino b/lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
new file mode 100755
index 000000000..d2efcb9c8
--- /dev/null
+++ b/lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
@@ -0,0 +1,161 @@
+
+/*
+* Getting Started example sketch for nRF24L01+ radios
+* This is an example of how to send data from one node to another using data structures
+* Updated: Dec 2014 by TMRh20
+*/
+
+#include <SPI.h>
+#include "RF24.h"
+
+byte addresses[][6] = {"1Node","2Node"};
+
+
+/****************** User Config ***************************/
+/***      Set this radio as radio number 0 or 1         ***/
+bool radioNumber = 1;
+
+/* Hardware configuration: Set up nRF24L01 radio on SPI bus plus pins 7 & 8 */
+RF24 radio(7,8);
+/**********************************************************/
+
+
+// Used to control whether this node is sending or receiving
+bool role = 0;
+
+/**
+* Create a data structure for transmitting and receiving data
+* This allows many variables to be easily sent and received in a single transmission
+* See http://www.cplusplus.com/doc/tutorial/structures/
+*/
+struct dataStruct{
+  unsigned long _micros;
+  float value;
+}myData;
+
+void setup() {
+
+  Serial.begin(115200);
+  Serial.println(F("RF24/examples/GettingStarted_HandlingData"));
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+  
+  radio.begin();
+
+  // Set the PA Level low to prevent power supply related issues since this is a
+ // getting_started sketch, and the likelihood of close proximity of the devices. RF24_PA_MAX is default.
+  radio.setPALevel(RF24_PA_LOW);
+  
+  // Open a writing and reading pipe on each radio, with opposite addresses
+  if(radioNumber){
+    radio.openWritingPipe(addresses[1]);
+    radio.openReadingPipe(1,addresses[0]);
+  }else{
+    radio.openWritingPipe(addresses[0]);
+    radio.openReadingPipe(1,addresses[1]);
+  }
+  
+  myData.value = 1.22;
+  // Start the radio listening for data
+  radio.startListening();
+}
+
+
+
+
+void loop() {
+  
+  
+/****************** Ping Out Role ***************************/  
+if (role == 1)  {
+    
+    radio.stopListening();                                    // First, stop listening so we can talk.
+    
+    
+    Serial.println(F("Now sending"));
+
+    myData._micros = micros();
+     if (!radio.write( &myData, sizeof(myData) )){
+       Serial.println(F("failed"));
+     }
+        
+    radio.startListening();                                    // Now, continue listening
+    
+    unsigned long started_waiting_at = micros();               // Set up a timeout period, get the current microseconds
+    boolean timeout = false;                                   // Set up a variable to indicate if a response was received or not
+    
+    while ( ! radio.available() ){                             // While nothing is received
+      if (micros() - started_waiting_at > 200000 ){            // If waited longer than 200ms, indicate timeout and exit while loop
+          timeout = true;
+          break;
+      }      
+    }
+        
+    if ( timeout ){                                             // Describe the results
+        Serial.println(F("Failed, response timed out."));
+    }else{
+                                                                // Grab the response, compare, and send to debugging spew
+        radio.read( &myData, sizeof(myData) );
+        unsigned long time = micros();
+        
+        // Spew it
+        Serial.print(F("Sent "));
+        Serial.print(time);
+        Serial.print(F(", Got response "));
+        Serial.print(myData._micros);
+        Serial.print(F(", Round-trip delay "));
+        Serial.print(time-myData._micros);
+        Serial.print(F(" microseconds Value "));
+        Serial.println(myData.value);
+    }
+
+    // Try again 1s later
+    delay(1000);
+  }
+
+
+
+/****************** Pong Back Role ***************************/
+
+  if ( role == 0 )
+  {
+    
+    if( radio.available()){
+                                                           // Variable for the received timestamp
+      while (radio.available()) {                          // While there is data ready
+        radio.read( &myData, sizeof(myData) );             // Get the payload
+      }
+     
+      radio.stopListening();                               // First, stop listening so we can talk  
+      myData.value += 0.01;                                // Increment the float value
+      radio.write( &myData, sizeof(myData) );              // Send the final one back.      
+      radio.startListening();                              // Now, resume listening so we catch the next packets.     
+      Serial.print(F("Sent response "));
+      Serial.print(myData._micros);  
+      Serial.print(F(" : "));
+      Serial.println(myData.value);
+   }
+ }
+
+
+
+
+/****************** Change Roles via Serial Commands ***************************/
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == 0 ){      
+      Serial.print(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+      role = 1;                  // Become the primary transmitter (ping out)
+    
+   }else
+    if ( c == 'R' && role == 1 ){
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));      
+       role = 0;                // Become the primary receiver (pong back)
+       radio.startListening();
+       
+    }
+  }
+
+
+} // Loop
diff --git a/lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino b/lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
new file mode 100644
index 000000000..10d1092c2
--- /dev/null
+++ b/lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
@@ -0,0 +1,218 @@
+
+/*
+* Getting Started example sketch for nRF24L01+ radios
+* This is a very basic example of how to send data from one node to another
+* but modified to include failure handling.
+* 
+* The nrf24l01+ radios are fairly reliable devices, but on breadboards etc, with inconsistent wiring, failures may
+* occur randomly after many hours to days or weeks. This sketch demonstrates how to handle the various failures and
+* keep the radio operational.
+* 
+* The three main failure modes of the radio include:
+* Writing to radio: Radio unresponsive - Fixed internally by adding a timeout to the internal write functions in RF24 (failure handling)
+* Reading from radio: Available returns true always - Fixed by adding a timeout to available functions by the user. This is implemented internally in  RF24Network.
+* Radio configuration settings are lost - Fixed by monitoring a value that is different from the default, and re-configuring the radio if this setting reverts to the default.
+* 
+* The printDetails output should appear as follows for radio #0:
+* 
+* STATUS         = 0x0e RX_DR=0 TX_DS=0 MAX_RT=0 RX_P_NO=7 TX_FULL=0
+* RX_ADDR_P0-1   = 0x65646f4e31 0x65646f4e32
+* RX_ADDR_P2-5   = 0xc3 0xc4 0xc5 0xc6
+* TX_ADDR        = 0x65646f4e31
+* RX_PW_P0-6     = 0x20 0x20 0x00 0x00 0x00 0x00
+* EN_AA          = 0x3f
+* EN_RXADDR      = 0x02
+* RF_CH          = 0x4c
+* RF_SETUP       = 0x03
+* CONFIG         = 0x0f
+* DYNPD/FEATURE  = 0x00 0x00
+* Data Rate      = 1MBPS
+* Model          = nRF24L01+
+* CRC Length     = 16 bits
+* PA Power       = PA_LOW
+*
+*Users can use this sketch to troubleshoot radio module wiring etc. as it makes the radios hot-swapable
+*
+* Updated: 2019 by TMRh20
+*/
+
+#include <SPI.h>
+#include "RF24.h"
+#include "printf.h"
+
+/****************** User Config ***************************/
+/***      Set this radio as radio number 0 or 1         ***/
+bool radioNumber = 0;
+
+/* Hardware configuration: Set up nRF24L01 radio on SPI bus plus pins 7 & 8 */
+RF24 radio(7,8);
+/**********************************************************/
+
+byte addresses[][6] = {"1Node","2Node"};
+
+// Used to control whether this node is sending or receiving
+bool role = 0;
+
+/**********************************************************/
+//Function to configure the radio
+void configureRadio(){
+
+  radio.begin();
+
+  // Set the PA Level low to prevent power supply related issues since this is a
+ // getting_started sketch, and the likelihood of close proximity of the devices. RF24_PA_MAX is default.
+  radio.setPALevel(RF24_PA_LOW);
+  
+  // Open a writing and reading pipe on each radio, with opposite addresses
+  if(radioNumber){
+    radio.openWritingPipe(addresses[1]);
+    radio.openReadingPipe(1,addresses[0]);
+  }else{
+    radio.openWritingPipe(addresses[0]);
+    radio.openReadingPipe(1,addresses[1]);
+  }
+  
+  // Start the radio listening for data
+  radio.startListening();
+  radio.printDetails();
+}
+
+/**********************************************************/
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println(F("RF24/examples/GettingStarted"));
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+
+  printf_begin();
+  
+  configureRadio();  
+}
+
+uint32_t configTimer =  millis();
+
+void loop() {
+  
+  if(radio.failureDetected){
+    radio.failureDetected = false;
+    delay(250);
+    Serial.println("Radio failure detected, restarting radio");
+    configureRadio();        
+  }
+  //Every 5 seconds, verify the configuration of the radio. This can be done using any 
+  //setting that is different from the radio defaults.
+  if(millis() - configTimer > 5000){
+    configTimer = millis();
+    if(radio.getDataRate() != RF24_1MBPS){
+      radio.failureDetected = true;
+      Serial.print("Radio configuration error detected");
+    }
+  }
+  
+/****************** Ping Out Role ***************************/  
+if (role == 1)  {
+    
+    radio.stopListening();                                    // First, stop listening so we can talk.
+    
+    
+    Serial.println(F("Now sending"));
+
+    unsigned long start_time = micros();                             // Take the time, and send it.  This will block until complete
+     if (!radio.write( &start_time, sizeof(unsigned long) )){
+       Serial.println(F("failed"));
+     }
+        
+    radio.startListening();                                    // Now, continue listening
+    
+    unsigned long started_waiting_at = micros();               // Set up a timeout period, get the current microseconds
+    boolean timeout = false;                                   // Set up a variable to indicate if a response was received or not
+    
+    while ( ! radio.available() ){                             // While nothing is received
+      if (micros() - started_waiting_at > 200000 ){            // If waited longer than 200ms, indicate timeout and exit while loop
+          timeout = true;
+          break;
+      }      
+    }
+        
+    if ( timeout ){                                             // Describe the results
+        Serial.println(F("Failed, response timed out."));
+    }else{
+        unsigned long got_time;                                 // Grab the response, compare, and send to debugging spew
+        
+        //Failure Handling:
+        uint32_t failTimer = millis();
+        while(radio.available()){                               //If available always returns true, there is a problem
+          if(millis() - failTimer > 250){
+            radio.failureDetected = true;
+            Serial.println("Radio available failure detected");
+            break;
+          }
+          radio.read( &got_time, sizeof(unsigned long) );
+        }
+        unsigned long end_time = micros();
+        
+        // Spew it
+        Serial.print(F("Sent "));
+        Serial.print(start_time);
+        Serial.print(F(", Got response "));
+        Serial.print(got_time);
+        Serial.print(F(", Round-trip delay "));
+        Serial.print(end_time-start_time);
+        Serial.println(F(" microseconds"));
+    }
+
+    // Try again 1s later
+    delay(1000);
+  }
+
+
+
+/****************** Pong Back Role ***************************/
+
+  if ( role == 0 )
+  {
+    unsigned long got_time;
+    
+    if( radio.available()){
+      
+      uint32_t failTimer = millis();                                                         // Variable for the received timestamp
+      while (radio.available()) {                                 // While there is data ready
+        if(millis()-failTimer > 500){
+          Serial.println("Radio available failure detected");
+          radio.failureDetected = true;
+          break;
+        }
+        radio.read( &got_time, sizeof(unsigned long) );             // Get the payload
+      }
+     
+      radio.stopListening();                                        // First, stop listening so we can talk   
+      radio.write( &got_time, sizeof(unsigned long) );              // Send the final one back.      
+      radio.startListening();                                       // Now, resume listening so we catch the next packets.     
+      Serial.print(F("Sent response "));
+      Serial.println(got_time);  
+   }
+ }
+
+
+
+
+/****************** Change Roles via Serial Commands ***************************/
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == 0 ){      
+      Serial.println(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+      role = 1;                  // Become the primary transmitter (ping out)
+    
+   }else
+    if ( c == 'R' && role == 1 ){
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));      
+       role = 0;                // Become the primary receiver (pong back)
+       radio.startListening();
+       
+    }
+  }
+
+
+} // Loop
diff --git a/lib/RF24/examples/Transfer/Transfer.ino b/lib/RF24/examples/Transfer/Transfer.ino
new file mode 100644
index 000000000..b1e3e7605
--- /dev/null
+++ b/lib/RF24/examples/Transfer/Transfer.ino
@@ -0,0 +1,149 @@
+/*
+ TMRh20 2014
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/*
+ General Data Transfer Rate Test
+ 
+ This example demonstrates basic data transfer functionality with the 
+ updated library. This example will display the transfer rates acheived 
+ using the slower form of high-speed transfer using blocking-writes.
+ */
+
+
+#include <SPI.h>
+#include "RF24.h"
+
+/*************  USER Configuration *****************************/
+                                           // Hardware configuration
+RF24 radio(7,8);                           // Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+
+/***************************************************************/
+
+const uint64_t pipes[2] = { 0xABCDABCD71LL, 0x544d52687CLL };   // Radio pipe addresses for the 2 nodes to communicate.
+
+byte data[32];                             //Data buffer for testing data transfer speeds
+
+unsigned long counter, rxTimer;            //Counter and timer for keeping track transfer info
+unsigned long startTime, stopTime;  
+bool TX=1,RX=0,role=0;
+
+void setup(void) {
+
+  Serial.begin(115200);
+
+  radio.begin();                           // Setup and configure rf radio
+  radio.setChannel(1);
+  radio.setPALevel(RF24_PA_MAX);           // If you want to save power use "RF24_PA_MIN" but keep in mind that reduces the module's range
+  radio.setDataRate(RF24_1MBPS);
+  radio.setAutoAck(1);                     // Ensure autoACK is enabled
+  radio.setRetries(2,15);                  // Optionally, increase the delay between retries & # of retries
+  
+  radio.setCRCLength(RF24_CRC_8);          // Use 8-bit CRC for performance
+  radio.openWritingPipe(pipes[0]);
+  radio.openReadingPipe(1,pipes[1]);
+  
+  radio.startListening();                  // Start listening
+  radio.printDetails();                    // Dump the configuration of the rf unit for debugging
+  
+  Serial.println(F("\n\rRF24/examples/Transfer/"));
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+  
+  randomSeed(analogRead(0));               //Seed for random number generation
+  
+  for(int i = 0; i < 32; i++){
+     data[i] = random(255);                //Load the buffer with random data
+  }
+  radio.powerUp();                         //Power up the radio
+}
+
+void loop(void){
+
+
+  if(role == TX){
+    delay(2000);
+    
+    Serial.println(F("Initiating Basic Data Transfer"));
+    
+    
+    unsigned long cycles = 10000; //Change this to a higher or lower number. 
+    
+    startTime = millis();
+    unsigned long pauseTime = millis();
+            
+    for(int i=0; i<cycles; i++){        //Loop through a number of cycles
+      data[0] = i;                      //Change the first byte of the payload for identification
+      if(!radio.writeFast(&data,32)){   //Write to the FIFO buffers        
+        counter++;                      //Keep count of failed payloads
+      }
+      
+      //This is only required when NO ACK ( enableAutoAck(0) ) payloads are used
+//      if(millis() - pauseTime > 3){
+//        pauseTime = millis();
+//        radio.txStandBy();          // Need to drop out of TX mode every 4ms if sending a steady stream of multicast data
+//        //delayMicroseconds(130);     // This gives the PLL time to sync back up   
+//      }
+      
+    }
+    
+   stopTime = millis();   
+                                         //This should be called to wait for completion and put the radio in standby mode after transmission, returns 0 if data still in FIFO (timed out), 1 if success
+   if(!radio.txStandBy()){ counter+=3; } //Standby, block only until FIFO empty or auto-retry timeout. Flush TX FIFO if failed
+   //radio.txStandBy(1000);              //Standby, using extended timeout period of 1 second
+   
+   float numBytes = cycles*32;
+   float rate = numBytes / (stopTime - startTime);
+    
+   Serial.print("Transfer complete at "); Serial.print(rate); Serial.println(" KB/s");
+   Serial.print(counter); Serial.print(" of "); Serial.print(cycles); Serial.println(" Packets Failed to Send");
+   counter = 0;   
+    
+   }
+  
+  
+  
+if(role == RX){
+     while(radio.available()){       
+      radio.read(&data,32);
+      counter++;
+     }
+   if(millis() - rxTimer > 1000){
+     rxTimer = millis();     
+     unsigned long numBytes = counter*32;
+     Serial.print(F("Rate: "));
+     //Prevent dividing into 0, which will cause issues over a period of time
+     Serial.println(numBytes > 0 ? numBytes/1000.0:0);
+     Serial.print(F("Payload Count: "));
+     Serial.println(counter);
+     counter = 0;
+   }
+  }
+  //
+  // Change roles
+  //
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == RX )
+    {
+      Serial.println(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+      radio.openWritingPipe(pipes[1]);
+      radio.openReadingPipe(1,pipes[0]);
+      radio.stopListening();
+      role = TX;                  // Become the primary transmitter (ping out)
+    }
+    else if ( c == 'R' && role == TX )
+    {
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]); 
+      radio.startListening();
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));
+      role = RX;                // Become the primary receiver (pong back)
+    }
+  }
+}
diff --git a/lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino b/lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino
new file mode 100644
index 000000000..95d765761
--- /dev/null
+++ b/lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino
@@ -0,0 +1,189 @@
+/*
+TMRh20 2014
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/** Reliably transmitting large volumes of data with a low signal or in noisy environments
+ * This example demonstrates data transfer functionality with the use of auto-retry
+ and auto-reUse functionality enabled. This sketch demonstrates how a user can extend
+ the auto-retry functionality to any chosen time period, preventing data loss and ensuring
+ the consistency of data.
+ 
+ This sketh demonstrates use of the writeBlocking() functionality, and extends the standard
+ retry functionality of the radio. Payloads will be auto-retried until successful or the
+ extended timeout period is reached.
+ */
+
+
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+/*************  USER Configuration *****************************/
+
+RF24 radio(7,8);                        // Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+unsigned long timeoutPeriod = 3000;     // Set a user-defined timeout period. With auto-retransmit set to (15,15) retransmission will take up to 60ms and as little as 7.5ms with it set to (1,15).
+                                        // With a timeout period of 1000, the radio will retry each payload for up to 1 second before giving up on the transmission and starting over
+
+/***************************************************************/
+
+const uint64_t pipes[2] = { 0xABCDABCD71LL, 0x544d52687CLL };   // Radio pipe addresses for the 2 nodes to communicate.
+
+byte data[32];                           //Data buffer
+
+volatile unsigned long counter;
+unsigned long rxTimer,startTime, stopTime, payloads = 0;  
+bool TX=1,RX=0,role=0, transferInProgress = 0;
+
+
+void setup(void) {
+
+  Serial.begin(115200);
+  printf_begin();
+
+  radio.begin();                           // Setup and configure rf radio
+  radio.setChannel(1);                     // Set the channel
+  radio.setPALevel(RF24_PA_LOW);           // Set PA LOW for this demonstration. We want the radio to be as lossy as possible for this example.
+  radio.setDataRate(RF24_1MBPS);           // Raise the data rate to reduce transmission distance and increase lossiness
+  radio.setAutoAck(1);                     // Ensure autoACK is enabled
+  radio.setRetries(2,15);                  // Optionally, increase the delay between retries. Want the number of auto-retries as high as possible (15)
+  radio.setCRCLength(RF24_CRC_16);         // Set CRC length to 16-bit to ensure quality of data
+  radio.openWritingPipe(pipes[0]);         // Open the default reading and writing pipe
+  radio.openReadingPipe(1,pipes[1]);       
+  
+  radio.startListening();                 // Start listening
+  radio.printDetails();                   // Dump the configuration of the rf unit for debugging
+  
+  printf("\n\rRF24/examples/Transfer Rates/\n\r");
+  printf("*** PRESS 'T' to begin transmitting to the other node\n\r");
+  
+  randomSeed(analogRead(0));              //Seed for random number generation  
+  for(int i=0; i<32; i++){
+     data[i] = random(255);               //Load the buffer with random data
+  }
+  radio.powerUp();                        //Power up the radio
+
+  
+}
+
+
+
+void loop(void){
+
+
+  if(role == TX){    
+    delay(2000);                                              // Pause for a couple seconds between transfers    
+    printf("Initiating Extended Timeout Data Transfer\n\r");
+
+    unsigned long cycles = 1000;                              // Change this to a higher or lower number. This is the number of payloads that will be sent.   
+    
+    unsigned long transferCMD[] = {'H','S',cycles };          // Indicate to the other radio that we are starting, and provide the number of payloads that will be sent 
+    radio.writeFast(&transferCMD,12);                         // Send the transfer command
+    if(radio.txStandBy(timeoutPeriod)){                       // If transfer initiation was successful, do the following
+   
+        startTime = millis();                                 // For calculating transfer rate
+        boolean timedOut = 0;                                 // Boolean for keeping track of failures
+      
+        for(int i=0; i<cycles; i++){                          // Loop through a number of cycles
+          data[0] = i;                                        // Change the first byte of the payload for identification
+       
+          if(!radio.writeBlocking(&data,32,timeoutPeriod)){   // If retries are failing and the user defined timeout is exceeded
+              timedOut = 1;                                   // Indicate failure
+              counter = cycles;                               // Set the fail count to maximum
+              break;                                          // Break out of the for loop
+          }  
+        }    
+  
+   
+        stopTime = millis();                                  // Capture the time of completion or failure
+   
+       //This should be called to wait for completion and put the radio in standby mode after transmission, returns 0 if data still in FIFO (timed out), 1 if success
+       if(timedOut){ radio.txStandBy(); }                     //Partially blocking standby, blocks until success or max retries. FIFO flushed if auto timeout reached
+       else{ radio.txStandBy(timeoutPeriod);     }            //Standby, block until FIFO empty (sent) or user specified timeout reached. FIFO flushed if user timeout reached.
+   
+   }else{                                             
+       Serial.println("Communication not established");       //If unsuccessful initiating transfer, exit and retry later
+   } 
+    
+   float rate = cycles * 32 / (stopTime - startTime);         //Display results:
+    
+   Serial.print("Transfer complete at "); Serial.print(rate); printf(" KB/s \n\r");
+   Serial.print(counter);
+   Serial.print(" of ");
+   Serial.print(cycles); Serial.println(" Packets Failed to Send");
+   counter = 0;   
+    
+   }
+  
+  
+  
+if(role == RX){  
+  
+  if(!transferInProgress){                       // If a bulk data transfer has not been started
+     if(radio.available()){                      
+        radio.read(&data,32);                    //Read any available payloads for analysis
+
+        if(data[0] == 'H' && data[4] == 'S'){    // If a bulk data transfer command has been received
+          payloads = data[8];                    // Read the first two bytes of the unsigned long. Need to read the 3rd and 4th if sending more than 65535 payloads
+          payloads |= data[9] << 8;              // This is the number of payloads that will be sent
+          counter = 0;                           // Reset the payload counter to 0
+          transferInProgress = 1;                // Indicate it has started
+          startTime = rxTimer = millis();        // Capture the start time to measure transfer rate and calculate timeouts
+        }
+     }
+  }else{
+     if(radio.available()){                     // If in bulk transfer mode, and a payload is available
+       radio.read(&data,32);                    // Read the payload
+       rxTimer = millis();                      // Reset the timeout timer
+       counter++;                               // Keep a count of received payloads
+     }else
+     if(millis() - rxTimer > timeoutPeriod){    // If no data available, check the timeout period
+       Serial.println("Transfer Failed");       // If per-payload timeout exceeeded, end the transfer
+       transferInProgress = 0; 
+     }else
+     if(counter >= payloads){                   // If the specified number of payloads is reached, transfer is completed
+      startTime = millis() - startTime;         // Calculate the total time spent during transfer
+      float numBytes = counter*32;              // Calculate the number of bytes transferred
+      Serial.print("Rate: ");                   // Print the transfer rate and number of payloads
+      Serial.print(numBytes/startTime);
+      Serial.println(" KB/s");
+      printf("Payload Count: %d \n\r", counter);
+      transferInProgress = 0;                   // End the transfer as complete
+    }     
+  }
+  
+   
+  }
+  
+  //
+  // Change roles
+  //
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == RX )
+    {
+      printf("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK\n\r");
+      radio.openWritingPipe(pipes[1]);
+      radio.openReadingPipe(1,pipes[0]);
+      radio.stopListening();
+      role = TX;                  // Become the primary transmitter (ping out)
+    }
+    else if ( c == 'R' && role == TX )
+    {
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]); 
+      radio.startListening();
+      printf("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK\n\r");      
+      role = RX;                // Become the primary receiver (pong back)
+    }
+  }
+}
+
+
diff --git a/lib/RF24/examples/Usage/led_remote/Jamfile b/lib/RF24/examples/Usage/led_remote/Jamfile
new file mode 100644
index 000000000..901f8da8c
--- /dev/null
+++ b/lib/RF24/examples/Usage/led_remote/Jamfile
@@ -0,0 +1,206 @@
+PROJECT_NAME 	= $(PWD:B) ;
+PROJECT_DIR 	= . ;
+PROJECT_LIBS = SPI RF24 ; 
+
+OUT_DIR = ojam ;
+F_CPU 		= 16000000 ;
+MCU             = atmega328p ;
+PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
+
+UPLOAD_RATE 	= 57600 ;
+AVRDUDE_PROTOCOL = stk500v1 ;
+COM 		= 33 ;
+
+# Host-specific overrides for locations 
+if $(OS) = MACOSX 
+{
+ARDUINO_VERSION	= 22 ;
+OLD_DIR 	= /opt/arduino-0021 ;
+AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+ARDUINO_DIR 	= /opt/Arduino ;
+ARDUINO_AVR 	= /usr/lib/avr/include ;
+}
+
+# Where is everything?
+ARDUINO_VERSION	?= 22 ;
+AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
+AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
+AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
+AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
+
+DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+CTUNING  	= -ffunction-sections -fdata-sections ;
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+CFLAGS  	= -Os -Wall -Wextra -mmcu=$(MCU) $(CTUNING) ;
+CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+
+# Search everywhere for headers
+HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp ] ;
+
+# In addition to explicitly-specified program modules, pick up anything from the current
+# dir.
+PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
+
+# Shortcut for the out files
+OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+
+# AvrDude setup
+AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
+
+rule GitVersion
+{
+  Always $(<) ;
+  Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+  echo "const char program_version[] = \"\\" > $(<)
+  git log -1 --pretty=format:%h >> $(<)
+  echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule AvrCc
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrCc
+{
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+}
+
+rule AvrC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrC++
+{
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule Pde
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+}
+
+actions Pde
+{
+  echo "#include <WProgram.h>" > $(<) 
+  echo "#line 1 \"$(>)\"" >> $(<)
+  cat $(>) >> $(<) 
+}
+
+rule AvrPde
+{
+  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  AvrC++ $(<) : $(_CPP) ;
+}
+
+rule AvrObject
+{
+  switch $(>:S)
+  {
+    case .c :   AvrCc $(<) : $(>) ;
+    case .cpp : AvrC++ $(<) : $(>) ;
+    case .pde : AvrPde $(<) : $(>) ;
+  }
+}
+
+rule AvrObjects
+{
+  for _I in $(<) 
+  {
+    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+  }
+}
+
+rule AvrMainFromObjects
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  MkDir $(<:D) ;
+  Depends all : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrMainFromObjects
+{
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+}
+
+rule AvrMain
+{
+  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
+  AvrObjects $(>) ;
+}
+
+rule AvrHex
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Depends hex : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrHex
+{
+  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule AvrUpload
+{
+  Depends $(1) : $(2) ;
+  Depends $(2) : $(3) ;
+  NotFile $(1) ;
+  Always $(1) ;
+  Always $(2) ;
+  AvrUploadAction $(2) : $(3) ;
+}
+
+actions AvrUploadAction
+{
+  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+AvrHex $(OUT).hex : $(OUT).elf ;
+
+AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+
diff --git a/lib/RF24/examples/Usage/led_remote/led_remote.pde b/lib/RF24/examples/Usage/led_remote/led_remote.pde
new file mode 100644
index 000000000..59bdf615e
--- /dev/null
+++ b/lib/RF24/examples/Usage/led_remote/led_remote.pde
@@ -0,0 +1,254 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example LED Remote
+ *
+ * This is an example of how to use the RF24 class to control a remote
+ * bank of LED's using buttons on a remote control.
+ *
+ * On the 'remote', connect any number of buttons or switches from
+ * an arduino pin to ground.  Update 'button_pins' to reflect the
+ * pins used.
+ *
+ * On the 'led' board, connect the same number of LED's from an
+ * arduino pin to a resistor to ground.  Update 'led_pins' to reflect
+ * the pins used.  Also connect a separate pin to ground and change
+ * the 'role_pin'.  This tells the sketch it's running on the LED board.
+ *
+ * Every time the buttons change on the remote, the entire state of
+ * buttons is send to the led board, which displays the state.
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 9 & 10 (CE & CS)
+
+RF24 radio(9,10);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'led' board receiver
+// Leave open to be the 'remote' transmitter
+const int role_pin = A4;
+
+// Pins on the remote for buttons
+const uint8_t button_pins[] = { 2,3,4,5,6,7 };
+const uint8_t num_button_pins = sizeof(button_pins);
+
+// Pins on the LED board for LED's
+const uint8_t led_pins[] = { 2,3,4,5,6,7 };
+const uint8_t num_led_pins = sizeof(led_pins);
+
+//
+// Topology
+//
+
+// Single radio pipe address for the 2 nodes to communicate.
+const uint64_t pipe = 0xE8E8F0F0E1LL;
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes in this
+// system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_remote = 1, role_led } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Remote", "LED Board"};
+
+// The role of the current running sketch
+role_e role;
+
+//
+// Payload
+//
+
+uint8_t button_states[num_button_pins];
+uint8_t led_states[num_led_pins];
+
+//
+// Setup
+//
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_remote;
+  else
+    role = role_led;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\n\rRF24/examples/led_remote/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens a single pipes for these two nodes to communicate
+  // back and forth.  One listens on it, the other talks to it.
+
+  if ( role == role_remote )
+  {
+    radio.openWritingPipe(pipe);
+  }
+  else
+  {
+    radio.openReadingPipe(1,pipe);
+  }
+
+  //
+  // Start listening
+  //
+
+  if ( role == role_led )
+    radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+
+  //
+  // Set up buttons / LED's
+  //
+
+  // Set pull-up resistors for all buttons
+  if ( role == role_remote )
+  {
+    int i = num_button_pins;
+    while(i--)
+    {
+      pinMode(button_pins[i],INPUT);
+      digitalWrite(button_pins[i],HIGH);
+    }
+  }
+
+  // Turn LED's ON until we start getting keys
+  if ( role == role_led )
+  {
+    int i = num_led_pins;
+    while(i--)
+    {
+      pinMode(led_pins[i],OUTPUT);
+      led_states[i] = HIGH;
+      digitalWrite(led_pins[i],led_states[i]);
+    }
+  }
+
+}
+
+//
+// Loop
+//
+
+void loop(void)
+{
+  //
+  // Remote role.  If the state of any button has changed, send the whole state of
+  // all buttons.
+  //
+
+  if ( role == role_remote )
+  {
+    // Get the current state of buttons, and
+    // Test if the current state is different from the last state we sent
+    int i = num_button_pins;
+    bool different = false;
+    while(i--)
+    {
+      uint8_t state = ! digitalRead(button_pins[i]);
+      if ( state != button_states[i] )
+      {
+        different = true;
+        button_states[i] = state;
+      }
+    }
+
+    // Send the state of the buttons to the LED board
+    if ( different )
+    {
+      printf("Now sending...");
+      bool ok = radio.write( button_states, num_button_pins );
+      if (ok)
+        printf("ok\n\r");
+      else
+        printf("failed\n\r");
+    }
+
+    // Try again in a short while
+    delay(20);
+  }
+
+  //
+  // LED role.  Receive the state of all buttons, and reflect that in the LEDs
+  //
+
+  if ( role == role_led )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      while (radio.available())
+      {
+        // Fetch the payload, and see if this was the last one.
+        radio.read( button_states, num_button_pins );
+
+        // Spew it
+        printf("Got buttons\n\r");
+
+        // For each button, if the button now on, then toggle the LED
+        int i = num_led_pins;
+        while(i--)
+        {
+          if ( button_states[i] )
+          {
+            led_states[i] ^= HIGH;
+            digitalWrite(led_pins[i],led_states[i]);
+          }
+        }
+      }
+    }
+  }
+}
+// vim:ai:cin:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/Usage/nordic_fob/Jamfile b/lib/RF24/examples/Usage/nordic_fob/Jamfile
new file mode 100644
index 000000000..ec519f7c5
--- /dev/null
+++ b/lib/RF24/examples/Usage/nordic_fob/Jamfile
@@ -0,0 +1,219 @@
+# (1) Project Information
+
+PROJECT_LIBS 	= RF24 SPI ; 
+PROJECT_DIRS	= $(PWD) ;
+
+# (2) Board Information
+
+UPLOAD_PROTOCOL ?= stk500v1 ;
+UPLOAD_SPEED 	?= 115200 ;
+MCU		?= atmega328p ;
+F_CPU 		?= 16000000 ;
+CORE		?= arduino ;
+VARIANT 	?= standard ;
+ARDUINO_VERSION	?= 100 ;
+
+# (3) USB Ports
+
+PORTS		= p4 p6 p9 u0 u1 u2 ;
+PORT_p6 	= /dev/tty.usbserial-A600eHIs ;
+PORT_p4 	= /dev/tty.usbserial-A40081RP ;
+PORT_p9		= /dev/tty.usbserial-A9007LmI ;
+PORT_u0 	= /dev/ttyUSB0 ;
+PORT_u1 	= /dev/ttyUSB1 ;
+PORT_u2 	= /dev/ttyUSB2 ;
+
+# (4) Location of AVR tools
+#
+# This configuration assumes using avr-tools that were obtained separate from the Arduino
+# distribution. 
+
+if $(OS) = MACOSX 
+{
+	AVR_BIN 	= /usr/local/avrtools/bin ;
+	AVR_ETC 	= /usr/local/avrtools/etc ;
+	AVR_INCLUDE	= /usr/local/avrtools/include ; 
+}
+else
+{
+	AVR_BIN 	= /usr/bin ;
+	AVR_INCLUDE 	= /usr/lib/avr/include ;
+	AVR_ETC 	= /etc ; 
+}
+
+# (5) Directories where Arduino core and libraries are located
+
+ARDUINO_DIR 	?= /opt/Arduino ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/$(CORE) $(ARDUINO_DIR)/hardware/arduino/variants/$(VARIANT) ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+
+#
+# --------------------------------------------------
+# Below this line usually never needs to be modified 
+#
+
+# Tool locations
+
+CC	  	= $(AVR_BIN)/avr-gcc ;
+C++	 	= $(AVR_BIN)/avr-g++ ;
+LINK	  	= $(AVR_BIN)/avr-gcc ;
+AR		= $(AVR_BIN)/avr-ar rcs ;
+RANLIB		= ;
+OBJCOPY 	= $(AVR_BIN)/avr-objcopy ;
+AVRDUDE 	= $(AVR_BIN)/avrdude ;
+
+# Flags
+
+DEFINES  	+= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+OPTIM		= -Os ;
+CCFLAGS  	= -Wall -Wextra -Wno-strict-aliasing -mmcu=$(MCU) -ffunction-sections -fdata-sections ; 
+C++FLAGS  	= $(CCFLAGS) -fno-exceptions -fno-strict-aliasing ;
+LINKFLAGS  	= $(OPTIM) -lm -Wl,--gc-sections -mmcu=$(MCU) ;
+AVRDUDEFLAGS	= -V -F -D -C $(AVR_ETC)/avrdude.conf -p $(MCU) -c $(UPLOAD_PROTOCOL) -b $(UPLOAD_SPEED) ;
+
+# Search everywhere for headers
+
+HDRS  	 	= $(PROJECT_DIRS) $(AVR_INCLUDE) $(ARDUINO_CORE) $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) ;
+
+# Output locations
+
+LOCATE_TARGET	= $(F_CPU) ;
+LOCATE_SOURCE	= $(F_CPU) ;
+
+#
+# Custom rules
+#
+
+rule GitVersion
+{
+	Always $(<) ;
+	Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+	echo "const char program_version[] = \"\\" > $(<)
+	git log -1 --pretty=format:%h >> $(<)
+	echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule Pde
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
+	Clean clean : $(<) ;
+}
+
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
+}
+
+actions Pde
+{
+	echo "#include <$(ARDUINO_H)>" > $(<) 
+	echo "#line 1 \"$(>)\"" >> $(<)
+	cat $(>) >> $(<) 
+}
+
+rule C++Pde
+{
+	local _CPP = $(>:B).cpp ;
+	Pde $(_CPP) : $(>) ;
+	C++ $(<) : $(_CPP) ;
+}
+
+rule UserObject
+{
+	switch $(>:S)
+	{
+		case .ino : C++Pde $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
+	}
+}
+
+rule Objects
+{
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
+        {
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
+        }
+}
+
+rule Library
+{
+	LibraryFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+	Objects $(>) ;
+}
+
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+rule Hex
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends hex : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Hex
+{
+	$(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule Upload
+{
+	Depends $(1) : $(2) ;
+	Depends $(2) : $(3) ;
+	NotFile $(1) ;
+	Always $(1) ;
+	Always $(2) ;
+	UploadAction $(2) : $(3) ;
+}
+
+actions UploadAction
+{
+	$(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+rule Arduino
+{
+	LINKFLAGS on $(<) = $(LINKFLAGS) -Wl,-Map=$(LOCATE_TARGET)/$(<:B).map ;
+	Main $(<) : $(>) ;
+	LinkLibraries $(<) : libs core ;
+	Hex $(<:B).hex : $(<) ;
+	for _p in $(PORTS)
+	{
+		Upload $(_p) : $(PORT_$(_p)) : $(<:B).hex ;
+	}
+}
+
+#
+# Targets
+#
+
+# Grab everything from the core directory
+Library core : [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+Library libs : [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# Main output executable
+Arduino $(PWD:B).elf : $(PROJECT_MODULES) [ GLOB $(PROJECT_DIRS) : *.c *.cpp *.pde *.ino ] ;
diff --git a/lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde b/lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde
new file mode 100644
index 000000000..473166823
--- /dev/null
+++ b/lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde
@@ -0,0 +1,142 @@
+/*
+ Copyright (C) 2012 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example Nordic FOB Receiver 
+ *
+ * This is an example of how to use the RF24 class to receive signals from the
+ * Sparkfun Nordic FOB.  Thanks to Kirk Mower for providing test hardware.
+ *
+ * See blog post at http://maniacbug.wordpress.com/2012/01/08/nordic-fob/
+ */
+
+#include <SPI.h>
+#include <RF24.h>
+#include "nRF24L01.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 9 & 10
+
+RF24 radio(9,10);
+
+//
+// Payload
+//
+
+struct payload_t
+{
+  uint8_t buttons;
+  uint16_t id;
+  uint8_t empty;
+};
+
+const char* button_names[] = { "Up", "Down", "Left", "Right", "Center" }; 
+const int num_buttons = 5;
+
+//
+// Forward declarations
+//
+
+uint16_t flip_endian(uint16_t in);
+
+//
+// Setup
+//
+
+void setup(void)
+{
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\r\nRF24/examples/nordic_fob/\r\n");
+
+  //
+  // Setup and configure rf radio according to the built-in parameters
+  // of the FOB.
+  //
+
+  radio.begin();
+  radio.setChannel(2);
+  radio.setPayloadSize(4);
+  radio.setAutoAck(false);
+  radio.setCRCLength(RF24_CRC_8);
+  radio.openReadingPipe(1,0xE7E7E7E7E7LL);
+
+  //
+  // Start listening
+  //
+
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+}
+
+//
+// Loop
+//
+
+void loop(void)
+{
+  //
+  // Receive each packet, dump it out
+  //
+
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Get the packet from the radio
+      payload_t payload;
+      radio.read( &payload, sizeof(payload) );
+
+      // Print the ID of this message.  Note that the message
+      // is sent 'big-endian', so we have to flip it.
+      printf("#%05u Buttons ",flip_endian(payload.id));
+
+      // Print the name of each button 
+      int i = num_buttons;
+      while (i--)
+      {
+	if ( ! ( payload.buttons & _BV(i) ) )
+	{
+	  printf("%s ",button_names[i]);
+	}
+      }
+
+      // If no buttons, print None
+      if ( payload.buttons == _BV(num_buttons) - 1 )
+	printf("None");
+
+      printf("\r\n");
+    }
+}
+
+//
+// Helper functions
+//
+
+// Change a big-endian word into a little-endian
+uint16_t flip_endian(uint16_t in)
+{
+  uint16_t low = in >> 8;
+  uint16_t high = in << 8;
+
+  return high | low;
+}
+
+// vim:cin:ai:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/Usage/pingpair_maple/Jamfile b/lib/RF24/examples/Usage/pingpair_maple/Jamfile
new file mode 100644
index 000000000..798096cc2
--- /dev/null
+++ b/lib/RF24/examples/Usage/pingpair_maple/Jamfile
@@ -0,0 +1,182 @@
+MCU		= cortex-m3 ;
+CHIP		= STM32F103ZE ;
+BOARD		= maple_native ;
+
+#CHIP		= at91sam3u4 ;
+#BOARD		= sam3u-ek ;
+
+if ! $(TOOLSET)
+{
+	TOOLSET = devkit ;
+	Echo "Assuming TOOLSET=devkit" ;
+}
+
+if $(TOOLSET) = yagarto
+{
+	TOOLS_PATH	= ~/Source/yagarto-4.6.2/bin ;
+	TOOLS_ARCH	= arm-none-eabi- ;
+}
+if $(TOOLSET) = yagarto-install
+{
+	TOOLS_PATH	= ~/Source/yagarto/install/bin ;
+	TOOLS_ARCH	= arm-none-eabi- ;
+}
+else if $(TOOLSET) = devkit
+{
+	TOOLS_PATH	= /opt/devkitARM/bin ;
+	TOOLS_ARCH	= arm-eabi- ;
+}
+else if $(TOOLSET) = maple
+{
+	TOOLS_PATH	= /opt/Maple/Resources/Java/hardware/tools/arm/bin ; 
+	TOOLS_ARCH	= arm-none-eabi- ;
+}
+else if $(TOOLSET) = ports
+{
+	TOOLS_PATH	= /opt/local/bin ;
+	TOOLS_ARCH	= arm-none-eabi- ;
+}
+
+CC	  	= $(TOOLS_PATH)/$(TOOLS_ARCH)gcc ;
+C++	 	= $(TOOLS_PATH)/$(TOOLS_ARCH)g++ ;
+AS	  	= $(TOOLS_PATH)/$(TOOLS_ARCH)gcc -c ;
+LINK	  	= $(TOOLS_PATH)/$(TOOLS_ARCH)g++ ;
+OBJCOPY 	= $(TOOLS_PATH)/$(TOOLS_ARCH)objcopy ;
+DFU		= dfu-util ;
+
+DEFINES  	+= VECT_TAB_FLASH BOARD_$(BOARD) MCU_$(CHIP) ERROR_LED_PORT=GPIOC ERROR_LED_PIN=15 STM32_HIGH_DENSITY MAPLE_IDE ;
+OPTIM		= -Os ;
+MFLAGS		= cpu=$(MCU) thumb arch=armv7-m ;
+CCFLAGS  	= -Wall -m$(MFLAGS) -g -nostdlib -ffunction-sections -fdata-sections -Wl,--gc-sections ;
+C++FLAGS  	= $(CCFLAGS) -fno-rtti -fno-exceptions ; 
+LINKFLAGS  	+= -m$(MFLAGS) -Xlinker --gc-sections ;
+DFUFLAGS	= -a1 -d 0x1eaf:0x0003 -R ;
+
+MAPLE_DIR	= $(HOME)/Source/SAM3U/libmaple ;
+MAPLE_LIBS	= Servo LiquidCrystal Wire FreeRTOS ;
+MAPLE_SUBDIRS	= wirish wirish/comm wirish/boards libmaple libmaple/usb libmaple/usb/usb_lib ; 
+
+SKETCH_DIR	= $(HOME)/Source/Arduino ;
+SKETCH_LIBS	= RF24 ;
+
+MODULE_DIRS	= . $(MAPLE_DIR)/$(MAPLE_SUBDIRS) $(MAPLE_DIR)/libraries/$(MAPLE_LIBS) $(SKETCH_DIR)/libraries/$(SKETCH_LIBS) ;
+HDRS		= $(MODULE_DIRS) ;
+LOCATE_TARGET	= out/$(TOOLSET) ;
+LOCATE_SOURCE	= $(LOCATE_TARGET) ; 
+
+rule Pde
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
+	Clean clean : $(<) ;
+}
+
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
+}
+
+actions Pde
+{
+	echo "#include <$(ARDUINO_H)>" > $(<) 
+	echo "#line 1 \"$(>)\"" >> $(<)
+	cat $(>) >> $(<) 
+}
+
+rule C++Pde
+{
+	local _CPP = $(>:B).cpp ;
+	Pde $(_CPP) : $(>) ;
+	C++ $(<) : $(_CPP) ;
+}
+
+rule Hex
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends hex : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Hex
+{
+	$(OBJCOPY) -O ihex $(>) $(<)
+}
+
+rule Binary
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends binary : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Binary
+{
+	$(OBJCOPY) -O binary $(>) $(<)
+}
+
+rule UserObject
+{
+	switch $(>:S)
+	{
+		case .S : As $(<) : $(>) ;
+		case .ino : C++Pde $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
+	}
+}
+
+rule Upload
+{
+	Depends up : $(<) ;
+	NotFile up ;
+	Always $(<) ;
+	Always up ;
+}
+
+actions Upload
+{
+	$(DFU) $(DFUFLAGS)  -D $(<)
+}
+
+# Override base objects rule, so all output can go in the output dir
+rule Objects
+{
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
+        {
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
+        }
+}
+
+# Override base main rule, so all output can go in the output dir
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+# Modules
+MODULES	= [ GLOB $(MODULE_DIRS) : *.pde *.c *.cpp *.S ] ; 
+
+# Main output executable
+MAIN		= $(PWD:B).elf ;
+
+# Linker script
+LINK_DIR	= $(MAPLE_DIR)/support/ld ;
+LINKSCRIPT	= $(LINK_DIR)/$(BOARD)/flash.ld ; 
+
+# Bring in the map and link script
+LINKFLAGS	+= -Wl,-Map=$(LOCATE_TARGET)/$(MAIN:B).map -T$(LINKSCRIPT) -L$(LINK_DIR) ;
+
+Main $(MAIN) : $(MODULES) ;
+Binary $(MAIN:B).bin : $(MAIN) ;
+Upload $(MAIN:B).bin ;
diff --git a/lib/RF24/examples/Usage/pingpair_maple/main.cpp b/lib/RF24/examples/Usage/pingpair_maple/main.cpp
new file mode 100644
index 000000000..b4f976d3e
--- /dev/null
+++ b/lib/RF24/examples/Usage/pingpair_maple/main.cpp
@@ -0,0 +1,87 @@
+#ifdef MAPLE_IDE
+
+#include <stdio.h>
+#include "wirish.h"
+
+extern void setup(void);
+extern void loop(void);
+
+void board_start(const char* program_name)
+{
+  // Set up the LED to steady on
+  pinMode(BOARD_LED_PIN, OUTPUT);
+  digitalWrite(BOARD_LED_PIN, HIGH);
+
+  // Setup the button as input
+  pinMode(BOARD_BUTTON_PIN, INPUT);
+  digitalWrite(BOARD_BUTTON_PIN, HIGH);
+
+  SerialUSB.begin();
+  SerialUSB.println("Press BUT");
+
+  // Wait for button press
+  while ( !isButtonPressed() )
+  {
+  }
+
+  SerialUSB.println("Welcome!");
+  SerialUSB.println(program_name);
+
+  int i = 11;
+  while (i--)
+  {
+    toggleLED();
+    delay(50);
+  }
+}
+
+/**
+ * Custom version of _write, which will print to the USB.
+ * In order to use it you MUST ADD __attribute__((weak))
+ * to _write in libmaple/syscalls.c
+*/
+extern "C" int _write (int file, char * ptr, int len)
+{
+  if ( (file != 1) && (file != 2) )
+    return 0; 
+  else
+    SerialUSB.write(ptr,len);
+  return len;
+}
+
+/**
+ * Re-entrant version of _write.  Yagarto and Devkit now use
+ * the re-entrant newlib, so these get called instead of the
+ * non_r versions.
+ */
+extern "C" int _write_r (void*, int file, char * ptr, int len)
+{
+  return _write( file, ptr, len);
+}
+
+__attribute__((constructor)) __attribute__ ((weak)) void premain()
+{
+  init();
+}
+
+__attribute__((weak)) void setup(void)
+{
+  board_start("No program defined");
+}
+
+__attribute__((weak)) void loop(void)
+{
+}
+
+__attribute__((weak)) int main(void)
+{
+  setup();
+
+  while (true)
+  {
+    loop();
+  }
+  return 0;
+}
+#endif // ifdef MAPLE_IDE
+// vim:cin:ai:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde b/lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
new file mode 100644
index 000000000..2d3925b76
--- /dev/null
+++ b/lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
@@ -0,0 +1,242 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example RF Radio Ping Pair ... for Maple
+ *
+ * This is an example of how to use the RF24 class.  Write this sketch to two different nodes,
+ * connect the role_pin to ground on one.  The ping node sends the current time to the pong node,
+ * which responds by sending the value back.  The ping node can then see how long the whole cycle
+ * took.
+ */
+
+#include "WProgram.h"
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+
+//
+// Maple specific setup.  Other than this section, the sketch is the same on Maple as on
+// Arduino
+//
+
+#ifdef MAPLE_IDE
+
+// External startup function
+extern void board_start(const char* program_name);
+
+// Use SPI #2.
+HardwareSPI SPI(2);
+
+#else
+#define board_startup printf
+#define toggleLED(x) (x)
+#endif
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 7 & 6
+// (This works for the Getting Started board plugged into the
+// Maple Native backwards.)
+
+RF24 radio(7,6);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const int role_pin = 10;
+
+//
+// Topology
+//
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_ping_out = 1, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  //
+  // Print preamble
+  //
+
+  board_start("\n\rRF24/examples/pingpair/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  // optionally, increase the delay between retries & # of retries
+  radio.setRetries(15,15);
+
+  // optionally, reduce the payload size.  seems to
+  // improve reliability
+  radio.setPayloadSize(8);
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+  // Open 'our' pipe for writing
+  // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
+
+  if ( role == role_ping_out )
+  {
+    radio.openWritingPipe(pipes[0]);
+    radio.openReadingPipe(1,pipes[1]);
+  }
+  else
+  {
+    radio.openWritingPipe(pipes[1]);
+    radio.openReadingPipe(1,pipes[0]);
+  }
+
+  //
+  // Start listening
+  //
+
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+}
+
+void loop(void)
+{
+  //
+  // Ping out role.  Repeatedly send the current time
+  //
+
+  if (role == role_ping_out)
+  {
+    toggleLED();
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    unsigned long time = millis();
+    printf("Now sending %lu...",time);
+    bool ok = radio.write( &time, sizeof(unsigned long) );
+
+    if (ok)
+      printf("ok...\r\n");
+    else
+      printf("failed.\r\n");
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout (250ms)
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 200 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      printf("Failed, response timed out.\r\n");
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      unsigned long got_time;
+      radio.read( &got_time, sizeof(unsigned long) );
+
+      // Spew it
+      printf("Got response %lu, round-trip delay: %lu\r\n",got_time,millis()-got_time);
+    }
+
+    toggleLED();
+
+    // Try again 1s later
+    delay(1000);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      unsigned long got_time;
+      bool done = false;
+      while (!done)
+      {
+        // Fetch the payload, and see if this was the last one.
+        done = radio.read( &got_time, sizeof(unsigned long) );
+
+        // Spew it
+        printf("Got payload %lu...",got_time);
+
+        // Delay just a little bit to let the other unit
+        // make the transition to receiver
+        delay(20);
+      }
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( &got_time, sizeof(unsigned long) );
+      printf("Sent response.\r\n");
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+}
+// vim:cin:ai:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/Usage/readme.md b/lib/RF24/examples/Usage/readme.md
new file mode 100644
index 000000000..69535e3bb
--- /dev/null
+++ b/lib/RF24/examples/Usage/readme.md
@@ -0,0 +1 @@
+Note: These examples may have not been maintained with library updates, and are provided as-is for reference purposes.
\ No newline at end of file
diff --git a/lib/RF24/examples/pingpair_ack/pingpair_ack.ino b/lib/RF24/examples/pingpair_ack/pingpair_ack.ino
new file mode 100644
index 000000000..8c2bec3c1
--- /dev/null
+++ b/lib/RF24/examples/pingpair_ack/pingpair_ack.ino
@@ -0,0 +1,123 @@
+/*
+  // March 2014 - TMRh20 - Updated along with High Speed RF24 Library fork
+  // Parts derived from examples by J. Coliz <maniacbug@ymail.com>
+*/
+/**
+ * Example for efficient call-response using ack-payloads 
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionally as well.
+ * This allows very fast call-response communication, with the responding radio never having to 
+ * switch out of Primary Receiver mode to send back a payload, but having the option to if wanting
+ * to initiate communication instead of respond to a commmunication.
+ */
+ 
+
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+// Hardware configuration: Set up nRF24L01 radio on SPI bus plus pins 7 & 8 
+RF24 radio(7,8);
+
+// Topology
+const uint64_t pipes[2] = { 0xABCDABCD71LL, 0x544d52687CLL };              // Radio pipe addresses for the 2 nodes to communicate.
+
+// Role management: Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  
+
+typedef enum { role_ping_out = 1, role_pong_back } role_e;                 // The various roles supported by this sketch
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};  // The debug-friendly names of those roles
+role_e role = role_pong_back;                                              // The role of the current running sketch
+
+// A single byte to keep track of the data being sent back and forth
+byte counter = 1;
+
+void setup(){
+
+  Serial.begin(115200);
+  printf_begin();
+  Serial.print(F("\n\rRF24/examples/pingpair_ack/\n\rROLE: "));
+  Serial.println(role_friendly_name[role]);
+  Serial.println(F("*** PRESS 'T' to begin transmitting to the other node"));
+
+  // Setup and configure rf radio
+
+  radio.begin();
+  radio.setAutoAck(1);                    // Ensure autoACK is enabled
+  radio.enableAckPayload();               // Allow optional ack payloads
+  radio.setRetries(0,15);                 // Smallest time between retries, max no. of retries
+  radio.setPayloadSize(1);                // Here we are sending 1-byte payloads to test the call-response speed
+  radio.openWritingPipe(pipes[1]);        // Both radios listen on the same pipes by default, and switch when writing
+  radio.openReadingPipe(1,pipes[0]);
+  radio.startListening();                 // Start listening
+  radio.printDetails();                   // Dump the configuration of the rf unit for debugging
+}
+
+void loop(void) {
+
+  if (role == role_ping_out){
+    
+    radio.stopListening();                                  // First, stop listening so we can talk.
+        
+    printf("Now sending %d as payload. ",counter);
+    byte gotByte;  
+    unsigned long time = micros();                          // Take the time, and send it.  This will block until complete   
+                                                            //Called when STANDBY-I mode is engaged (User is finished sending)
+    if (!radio.write( &counter, 1 )){
+      Serial.println(F("failed."));      
+    }else{
+
+      if(!radio.available()){ 
+        Serial.println(F("Blank Payload Received.")); 
+      }else{
+        while(radio.available() ){
+          unsigned long tim = micros();
+          radio.read( &gotByte, 1 );
+          printf("Got response %d, round-trip delay: %lu microseconds\n\r",gotByte,tim-time);
+          counter++;
+        }
+      }
+
+    }
+    // Try again later
+    delay(1000);
+  }
+
+  // Pong back role.  Receive each packet, dump it out, and send it back
+
+  if ( role == role_pong_back ) {
+    byte pipeNo;
+    byte gotByte;                                       // Dump the payloads until we've gotten everything
+    while( radio.available(&pipeNo)){
+      radio.read( &gotByte, 1 );
+      radio.writeAckPayload(pipeNo,&gotByte, 1 );    
+   }
+ }
+
+  // Change roles
+
+  if ( Serial.available() )
+  {
+    char c = toupper(Serial.read());
+    if ( c == 'T' && role == role_pong_back )
+    {
+      Serial.println(F("*** CHANGING TO TRANSMIT ROLE -- PRESS 'R' TO SWITCH BACK"));
+
+      role = role_ping_out;                  // Become the primary transmitter (ping out)
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]);
+    }
+    else if ( c == 'R' && role == role_ping_out )
+    {
+      Serial.println(F("*** CHANGING TO RECEIVE ROLE -- PRESS 'T' TO SWITCH BACK"));
+      
+       role = role_pong_back;                // Become the primary receiver (pong back)
+       radio.openWritingPipe(pipes[1]);
+       radio.openReadingPipe(1,pipes[0]);
+       radio.startListening();
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/RF24/examples/pingpair_dyn/Jamfile b/lib/RF24/examples/pingpair_dyn/Jamfile
new file mode 100644
index 000000000..901f8da8c
--- /dev/null
+++ b/lib/RF24/examples/pingpair_dyn/Jamfile
@@ -0,0 +1,206 @@
+PROJECT_NAME 	= $(PWD:B) ;
+PROJECT_DIR 	= . ;
+PROJECT_LIBS = SPI RF24 ; 
+
+OUT_DIR = ojam ;
+F_CPU 		= 16000000 ;
+MCU             = atmega328p ;
+PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
+
+UPLOAD_RATE 	= 57600 ;
+AVRDUDE_PROTOCOL = stk500v1 ;
+COM 		= 33 ;
+
+# Host-specific overrides for locations 
+if $(OS) = MACOSX 
+{
+ARDUINO_VERSION	= 22 ;
+OLD_DIR 	= /opt/arduino-0021 ;
+AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+ARDUINO_DIR 	= /opt/Arduino ;
+ARDUINO_AVR 	= /usr/lib/avr/include ;
+}
+
+# Where is everything?
+ARDUINO_VERSION	?= 22 ;
+AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
+AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
+AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
+AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
+
+DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+CTUNING  	= -ffunction-sections -fdata-sections ;
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+CFLAGS  	= -Os -Wall -Wextra -mmcu=$(MCU) $(CTUNING) ;
+CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+
+# Search everywhere for headers
+HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp ] ;
+
+# In addition to explicitly-specified program modules, pick up anything from the current
+# dir.
+PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
+
+# Shortcut for the out files
+OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+
+# AvrDude setup
+AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
+
+rule GitVersion
+{
+  Always $(<) ;
+  Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+  echo "const char program_version[] = \"\\" > $(<)
+  git log -1 --pretty=format:%h >> $(<)
+  echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule AvrCc
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrCc
+{
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+}
+
+rule AvrC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrC++
+{
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule Pde
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+}
+
+actions Pde
+{
+  echo "#include <WProgram.h>" > $(<) 
+  echo "#line 1 \"$(>)\"" >> $(<)
+  cat $(>) >> $(<) 
+}
+
+rule AvrPde
+{
+  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  AvrC++ $(<) : $(_CPP) ;
+}
+
+rule AvrObject
+{
+  switch $(>:S)
+  {
+    case .c :   AvrCc $(<) : $(>) ;
+    case .cpp : AvrC++ $(<) : $(>) ;
+    case .pde : AvrPde $(<) : $(>) ;
+  }
+}
+
+rule AvrObjects
+{
+  for _I in $(<) 
+  {
+    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+  }
+}
+
+rule AvrMainFromObjects
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  MkDir $(<:D) ;
+  Depends all : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrMainFromObjects
+{
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+}
+
+rule AvrMain
+{
+  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
+  AvrObjects $(>) ;
+}
+
+rule AvrHex
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Depends hex : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrHex
+{
+  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule AvrUpload
+{
+  Depends $(1) : $(2) ;
+  Depends $(2) : $(3) ;
+  NotFile $(1) ;
+  Always $(1) ;
+  Always $(2) ;
+  AvrUploadAction $(2) : $(3) ;
+}
+
+actions AvrUploadAction
+{
+  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+AvrHex $(OUT).hex : $(OUT).elf ;
+
+AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+
diff --git a/lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino b/lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino
new file mode 100644
index 000000000..5ef7095e2
--- /dev/null
+++ b/lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino
@@ -0,0 +1,246 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example using Dynamic Payloads 
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size. 
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+
+RF24 radio(7,8);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const int role_pin = 5;
+
+//
+// Topology
+//
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_ping_out = 1, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+//
+// Payload
+//
+
+const int min_payload_size = 4;
+const int max_payload_size = 32;
+const int payload_size_increments_by = 1;
+int next_payload_size = min_payload_size;
+
+char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  
+  Serial.println(F("RF24/examples/pingpair_dyn/"));
+  Serial.print(F("ROLE: "));
+  Serial.println(role_friendly_name[role]);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  // enable dynamic payloads
+  radio.enableDynamicPayloads();
+
+  // optionally, increase the delay between retries & # of retries
+  radio.setRetries(5,15);
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+  // Open 'our' pipe for writing
+  // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
+
+  if ( role == role_ping_out )
+  {
+    radio.openWritingPipe(pipes[0]);
+    radio.openReadingPipe(1,pipes[1]);
+  }
+  else
+  {
+    radio.openWritingPipe(pipes[1]);
+    radio.openReadingPipe(1,pipes[0]);
+  }
+
+  //
+  // Start listening
+  //
+
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+}
+
+void loop(void)
+{
+  //
+  // Ping out role.  Repeatedly send the current time
+  //
+
+  if (role == role_ping_out)
+  {
+    // The payload will always be the same, what will change is how much of it we send.
+    static char send_payload[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ789012";
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    Serial.print(F("Now sending length "));
+    Serial.println(next_payload_size);
+    radio.write( send_payload, next_payload_size );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 500 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      Serial.println(F("Failed, response timed out."));
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      uint8_t len = radio.getDynamicPayloadSize();
+      
+      // If a corrupt dynamic payload is received, it will be flushed
+      if(!len){
+        return; 
+      }
+      
+      radio.read( receive_payload, len );
+
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      Serial.print(F("Got response size="));
+      Serial.print(len);
+      Serial.print(F(" value="));
+      Serial.println(receive_payload);
+    }
+    
+    // Update size for next time.
+    next_payload_size += payload_size_increments_by;
+    if ( next_payload_size > max_payload_size )
+      next_payload_size = min_payload_size;
+
+    // Try again 1s later
+    delay(100);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    while ( radio.available() )
+    {
+
+      // Fetch the payload, and see if this was the last one.
+      uint8_t len = radio.getDynamicPayloadSize();
+      
+      // If a corrupt dynamic payload is received, it will be flushed
+      if(!len){
+        continue; 
+      }
+      
+      radio.read( receive_payload, len );
+
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      Serial.print(F("Got response size="));
+      Serial.print(len);
+      Serial.print(F(" value="));
+      Serial.println(receive_payload);
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( receive_payload, len );
+      Serial.println(F("Sent response."));
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+}
+// vim:cin:ai:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/pingpair_irq/pingpair_irq.ino b/lib/RF24/examples/pingpair_irq/pingpair_irq.ino
new file mode 100644
index 000000000..ae7768f92
--- /dev/null
+++ b/lib/RF24/examples/pingpair_irq/pingpair_irq.ino
@@ -0,0 +1,143 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ 
+ Update 2014 - TMRh20
+ */
+
+/**
+ * Example of using interrupts
+ *
+ * This is an example of how to user interrupts to interact with the radio, and a demonstration
+ * of how to use them to sleep when receiving, and not miss any payloads. 
+ * The pingpair_sleepy example expands on sleep functionality with a timed sleep option for the transmitter.
+ * Sleep functionality is built directly into my fork of the RF24Network library
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+// Hardware configuration
+RF24 radio(7,8);                          // Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+                                        
+const short role_pin = 5;                 // sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+                                          // Leave open to be the 'ping' transmitter
+
+// Demonstrates another method of setting up the addresses
+byte address[][5] = { 0xCC,0xCE,0xCC,0xCE,0xCC , 0xCE,0xCC,0xCE,0xCC,0xCE};
+
+// Role management
+
+// Set up role.  This sketch uses the same software for all the nodes in this
+// system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+// This is done through the role_pin
+typedef enum { role_sender = 1, role_receiver } role_e;                 // The various roles supported by this sketch
+const char* role_friendly_name[] = { "invalid", "Sender", "Receiver"};  // The debug-friendly names of those roles
+role_e role;                                                            // The role of the current running sketch
+
+static uint32_t message_count = 0;
+
+
+/********************** Setup *********************/
+
+void setup(){
+
+  pinMode(role_pin, INPUT);                        // set up the role pin                  
+  digitalWrite(role_pin,HIGH);                     // Change this to LOW/HIGH instead of using an external pin
+  delay(20);                                       // Just to get a solid reading on the role pin
+
+  if ( digitalRead(role_pin) )                    // read the address pin, establish our role
+    role = role_sender;
+  else
+    role = role_receiver;
+
+
+  Serial.begin(115200);
+  printf_begin();
+  Serial.print(F("\n\rRF24/examples/pingpair_irq\n\rROLE: "));
+  Serial.println(role_friendly_name[role]);
+
+  // Setup and configure rf radio
+  radio.begin();  
+  //radio.setPALevel(RF24_PA_LOW);
+  radio.enableAckPayload();                         // We will be using the Ack Payload feature, so please enable it
+  radio.enableDynamicPayloads();                    // Ack payloads are dynamic payloads
+                                                    // Open pipes to other node for communication
+  if ( role == role_sender ) {                      // This simple sketch opens a pipe on a single address for these two nodes to 
+     radio.openWritingPipe(address[0]);             // communicate back and forth.  One listens on it, the other talks to it.
+     radio.openReadingPipe(1,address[1]); 
+  }else{
+    radio.openWritingPipe(address[1]);
+    radio.openReadingPipe(1,address[0]);
+    radio.startListening();
+    radio.writeAckPayload( 1, &message_count, sizeof(message_count) );  // Add an ack packet for the next time around.  This is a simple
+    ++message_count;        
+  }
+  radio.printDetails();                             // Dump the configuration of the rf unit for debugging
+  delay(50);
+  attachInterrupt(0, check_radio, LOW);             // Attach interrupt handler to interrupt #0 (using pin 2) on BOTH the sender and receiver
+}
+
+
+
+/********************** Main Loop *********************/
+void loop() {
+
+
+  if (role == role_sender)  {                        // Sender role.  Repeatedly send the current time 
+    unsigned long time = millis();                   // Take the time, and send it.
+      Serial.print(F("Now sending "));
+      Serial.println(time);
+    radio.startWrite( &time, sizeof(unsigned long) ,0);
+    delay(2000);                                     // Try again soon
+  }
+
+
+  if(role == role_receiver){                        // Receiver does nothing except in IRQ
+  }  
+}
+
+
+/********************** Interrupt *********************/
+
+void check_radio(void)                                // Receiver role: Does nothing!  All the work is in IRQ
+{
+  
+  bool tx,fail,rx;
+  radio.whatHappened(tx,fail,rx);                     // What happened?
+  
+  if ( tx ) {                                         // Have we successfully transmitted?
+      if ( role == role_sender ){   Serial.println(F("Send:OK")); }
+      if ( role == role_receiver ){ Serial.println(F("Ack Payload:Sent")); }
+  }
+  
+  if ( fail ) {                                       // Have we failed to transmit?
+      if ( role == role_sender ){   Serial.println(F("Send:Failed"));  }
+      if ( role == role_receiver ){ Serial.println(F("Ack Payload:Failed"));  }
+  }
+  
+  if ( rx || radio.available()){                      // Did we receive a message?
+    
+    if ( role == role_sender ) {                      // If we're the sender, we've received an ack payload
+        radio.read(&message_count,sizeof(message_count));
+        Serial.print(F("Ack: "));
+        Serial.println(message_count);
+    }
+
+    
+    if ( role == role_receiver ) {                    // If we're the receiver, we've received a time message
+      static unsigned long got_time;                  // Get this payload and dump it
+      radio.read( &got_time, sizeof(got_time) );
+      Serial.print(F("Got payload "));
+      Serial.println(got_time);
+      radio.writeAckPayload( 1, &message_count, sizeof(message_count) );  // Add an ack packet for the next time around.  This is a simple
+      ++message_count;                                // packet counter
+    }
+  }
+}
diff --git a/lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino b/lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
new file mode 100644
index 000000000..80441f85b
--- /dev/null
+++ b/lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
@@ -0,0 +1,122 @@
+/*
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ 
+ Created Dec 2014 - TMRh20
+ */
+
+/**
+ * Example of using interrupts
+ *
+ * This is a very simple example of using two devices to communicate using interrupts.
+ * With multiple devices, each device would need to have a separate reading pipe
+ */
+
+#include <SPI.h>
+#include "RF24.h"
+#include <printf.h>
+
+// Hardware configuration
+// Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+RF24 radio(7,8);
+                                        
+// Use the same address for both devices
+uint8_t address[] = { "radio" };
+
+// Simple messages to represent a 'ping' and 'pong'
+uint8_t ping = 111;
+uint8_t pong = 222;
+
+volatile uint32_t round_trip_timer = 0;
+
+
+/********************** Setup *********************/
+
+void setup(){
+
+  Serial.begin(115200);
+  Serial.println(F("Simple pingpair example"));
+  Serial.println(F("Send a 'T' via Serial to transmit a single 'ping' "));
+  //printf_begin();
+  
+  // Setup and configure rf radio
+  radio.begin();
+
+  // Use dynamic payloads to improve response time
+  radio.enableDynamicPayloads();
+  radio.openWritingPipe(address);             // communicate back and forth.  One listens on it, the other talks to it.
+  radio.openReadingPipe(1,address); 
+  radio.startListening();
+  
+  //radio.printDetails();                             // Dump the configuration of the rf unit for debugging
+
+  attachInterrupt(0, check_radio, LOW);             // Attach interrupt handler to interrupt #0 (using pin 2) on BOTH the sender and receiver
+}
+
+
+
+/********************** Main Loop *********************/
+void loop() {
+
+  if(Serial.available()){
+    switch(toupper(Serial.read())){
+      case 'T': 
+                // Only allow 1 transmission per 45ms to prevent overlapping IRQ/reads/writes
+                // Default retries = 5,15 = ~20ms per transmission max
+                while(micros() - round_trip_timer < 45000){
+                  //delay between writes 
+                }
+                Serial.print(F("Sending Ping"));
+                radio.stopListening();                
+                round_trip_timer = micros();
+                radio.startWrite( &ping, sizeof(uint8_t),0 );
+                break;    
+    }
+  }  
+}
+
+/********************** Interrupt *********************/
+
+void check_radio(void)                                // Receiver role: Does nothing!  All the work is in IRQ
+{
+  
+  bool tx,fail,rx;
+  radio.whatHappened(tx,fail,rx);                     // What happened?
+
+ 
+  // If data is available, handle it accordingly
+  if ( rx ){
+    
+    if(radio.getDynamicPayloadSize() < 1){
+      // Corrupt payload has been flushed
+      return; 
+    }
+    // Read in the data
+    uint8_t received;
+    radio.read(&received,sizeof(received));
+
+    // If this is a ping, send back a pong
+    if(received == ping){
+      radio.stopListening();
+      // Normal delay will not work here, so cycle through some no-operations (16nops @16mhz = 1us delay)
+      for(uint32_t i=0; i<130;i++){
+         __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+      }
+      radio.startWrite(&pong,sizeof(pong),0);
+      Serial.print("pong");
+    }else    
+    // If this is a pong, get the current micros()
+    if(received == pong){
+      round_trip_timer = micros() - round_trip_timer;
+      Serial.print(F("Received Pong, Round Trip Time: "));
+      Serial.println(round_trip_timer);
+    }
+  }
+
+  // Start listening if transmission is complete
+  if( tx || fail ){
+     radio.startListening(); 
+     Serial.println(tx ? F(":OK") : F(":Fail"));
+  }  
+}
\ No newline at end of file
diff --git a/lib/RF24/examples/pingpair_multi_dyn/Jamfile b/lib/RF24/examples/pingpair_multi_dyn/Jamfile
new file mode 100755
index 000000000..901f8da8c
--- /dev/null
+++ b/lib/RF24/examples/pingpair_multi_dyn/Jamfile
@@ -0,0 +1,206 @@
+PROJECT_NAME 	= $(PWD:B) ;
+PROJECT_DIR 	= . ;
+PROJECT_LIBS = SPI RF24 ; 
+
+OUT_DIR = ojam ;
+F_CPU 		= 16000000 ;
+MCU             = atmega328p ;
+PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
+
+UPLOAD_RATE 	= 57600 ;
+AVRDUDE_PROTOCOL = stk500v1 ;
+COM 		= 33 ;
+
+# Host-specific overrides for locations 
+if $(OS) = MACOSX 
+{
+ARDUINO_VERSION	= 22 ;
+OLD_DIR 	= /opt/arduino-0021 ;
+AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+ARDUINO_DIR 	= /opt/Arduino ;
+ARDUINO_AVR 	= /usr/lib/avr/include ;
+}
+
+# Where is everything?
+ARDUINO_VERSION	?= 22 ;
+AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
+AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
+AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
+AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
+
+DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+CTUNING  	= -ffunction-sections -fdata-sections ;
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+CFLAGS  	= -Os -Wall -Wextra -mmcu=$(MCU) $(CTUNING) ;
+CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+
+# Search everywhere for headers
+HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp ] ;
+
+# In addition to explicitly-specified program modules, pick up anything from the current
+# dir.
+PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
+
+# Shortcut for the out files
+OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+
+# AvrDude setup
+AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
+
+rule GitVersion
+{
+  Always $(<) ;
+  Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+  echo "const char program_version[] = \"\\" > $(<)
+  git log -1 --pretty=format:%h >> $(<)
+  echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule AvrCc
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrCc
+{
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+}
+
+rule AvrC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrC++
+{
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule Pde
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+}
+
+actions Pde
+{
+  echo "#include <WProgram.h>" > $(<) 
+  echo "#line 1 \"$(>)\"" >> $(<)
+  cat $(>) >> $(<) 
+}
+
+rule AvrPde
+{
+  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  AvrC++ $(<) : $(_CPP) ;
+}
+
+rule AvrObject
+{
+  switch $(>:S)
+  {
+    case .c :   AvrCc $(<) : $(>) ;
+    case .cpp : AvrC++ $(<) : $(>) ;
+    case .pde : AvrPde $(<) : $(>) ;
+  }
+}
+
+rule AvrObjects
+{
+  for _I in $(<) 
+  {
+    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+  }
+}
+
+rule AvrMainFromObjects
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  MkDir $(<:D) ;
+  Depends all : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrMainFromObjects
+{
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+}
+
+rule AvrMain
+{
+  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
+  AvrObjects $(>) ;
+}
+
+rule AvrHex
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Depends hex : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrHex
+{
+  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule AvrUpload
+{
+  Depends $(1) : $(2) ;
+  Depends $(2) : $(3) ;
+  NotFile $(1) ;
+  Always $(1) ;
+  Always $(2) ;
+  AvrUploadAction $(2) : $(3) ;
+}
+
+actions AvrUploadAction
+{
+  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+AvrHex $(OUT).hex : $(OUT).elf ;
+
+AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+
diff --git a/lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino b/lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
new file mode 100644
index 000000000..03ef24c17
--- /dev/null
+++ b/lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
@@ -0,0 +1,263 @@
+/*
+ Copyright (C) 2011 James Coliz, Jr. <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example using Dynamic Payloads 
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size. 
+ */
+
+#include <SPI.h>
+#include "RF24.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 8 & 9
+RF24 radio(8,9);
+
+// Use multicast?
+// sets the multicast behavior this unit in hardware.  Connect to GND to use unicast
+// Leave open (default) to use multicast.
+const int multicast_pin = 6 ;
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const int role_pin = 7;
+bool multicast = true ;
+
+//
+// Topology
+//
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xEEFAFDFDEELL, 0xEEFDFAF50DFLL };
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_ping_out = 1, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+//
+// Payload
+//
+
+const int min_payload_size = 1;
+const int max_payload_size = 32;
+const int payload_size_increments_by = 1;
+int next_payload_size = min_payload_size;
+
+char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
+
+void setup(void)
+{
+  //
+  // Multicast
+  //
+  pinMode(multicast_pin, INPUT);
+  digitalWrite(multicast_pin,HIGH);
+  delay( 20 ) ;
+
+  // read multicast role, LOW for unicast
+  if( digitalRead( multicast_pin ) )
+    multicast = true ;
+  else
+    multicast = false ;
+
+
+ //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay( 20 ); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  
+  Serial.println(F("RF24/examples/pingpair_multi_dyn/"));
+  Serial.print(F("ROLE: "));
+  Serial.println(role_friendly_name[role]);
+  
+  Serial.print(F("MULTICAST: "));
+  Serial.println(multicast ? F("true (unreliable)") : F("false (reliable)"));
+  
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  // enable dynamic payloads
+  radio.enableDynamicPayloads();
+  radio.setCRCLength( RF24_CRC_16 ) ;
+
+  // optionally, increase the delay between retries & # of retries
+  radio.setRetries( 15, 5 ) ;
+  radio.setAutoAck( true ) ;
+  //radio.setPALevel( RF24_PA_LOW ) ;
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+  // Open 'our' pipe for writing
+  // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
+
+  if ( role == role_ping_out )
+  {
+    radio.openWritingPipe(pipes[0]);
+    radio.openReadingPipe(1,pipes[1]);
+  }
+  else
+  {
+    radio.openWritingPipe(pipes[1]);
+    radio.openReadingPipe(1,pipes[0]);
+  }
+
+  //
+  // Start listening
+  //
+  radio.powerUp() ;
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+}
+
+void loop(void)
+{
+  //
+  // Ping out role.  Repeatedly send the current time
+  //
+
+  if (role == role_ping_out)
+  {
+    // The payload will always be the same, what will change is how much of it we send.
+    static char send_payload[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ789012";
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    Serial.print(F("Now sending length "));
+    Serial.println(next_payload_size);
+    radio.write( send_payload, next_payload_size, multicast );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 500 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+       Serial.println(F("Failed, response timed out."));
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      uint8_t len = radio.getDynamicPayloadSize();
+      radio.read( receive_payload, len );
+
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      Serial.print(F("Got response size="));
+      Serial.print(len);
+      Serial.print(F(" value="));
+      Serial.println(receive_payload);
+    }
+    
+    // Update size for next time.
+    next_payload_size += payload_size_increments_by;
+    if ( next_payload_size > max_payload_size )
+      next_payload_size = min_payload_size;
+
+    // Try again 1s later
+    delay(250);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      uint8_t len;
+      bool done = false;
+      while (radio.available())
+      {
+        // Fetch the payload, and see if this was the last one.
+	len = radio.getDynamicPayloadSize();
+	radio.read( receive_payload, len );
+
+	// Put a zero at the end for easy printing
+	receive_payload[len] = 0;
+
+	// Spew it
+        Serial.print(F("Got response size="));
+        Serial.print(len);
+        Serial.print(F(" value="));
+        Serial.println(receive_payload);
+      }
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( receive_payload, len, multicast );
+      Serial.println(F("Sent response."));
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+}
+// vim:cin:ai:sts=2 sw=2 ft=cpp
\ No newline at end of file
diff --git a/lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino b/lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
new file mode 100644
index 000000000..b46480fac
--- /dev/null
+++ b/lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
@@ -0,0 +1,226 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ 
+ TMRh20 2014 - Updates to the library allow sleeping both in TX and RX modes:
+      TX Mode: The radio can be powered down (.9uA current) and the Arduino slept using the watchdog timer
+      RX Mode: The radio can be left in standby mode (22uA current) and the Arduino slept using an interrupt pin
+ */
+
+/**
+ * Example RF Radio Ping Pair which Sleeps between Sends
+ *
+ * This is an example of how to use the RF24 class to create a battery-
+ * efficient system.  It is just like the GettingStarted_CallResponse example, but the
+ * ping node powers down the radio and sleeps the MCU after every
+ * ping/pong cycle, and the receiver sleeps between payloads.
+ *
+ * Write this sketch to two different nodes,
+ * connect the role_pin to ground on one.  The ping node sends the current
+ * time to the pong node, which responds by sending the value back.  The ping
+ * node can then see how long the whole cycle took.
+ */
+
+#include <SPI.h>
+#include <avr/sleep.h>
+#include <avr/power.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+
+// Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+RF24 radio(7,8);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const int role_pin = 5;
+
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };   // Radio pipe addresses for the 2 nodes to communicate.
+
+// Role management
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+
+// The various roles supported by this sketch
+typedef enum { role_ping_out = 1, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+
+// Sleep declarations
+typedef enum { wdt_16ms = 0, wdt_32ms, wdt_64ms, wdt_128ms, wdt_250ms, wdt_500ms, wdt_1s, wdt_2s, wdt_4s, wdt_8s } wdt_prescalar_e;
+
+void setup_watchdog(uint8_t prescalar);
+void do_sleep(void);
+
+const short sleep_cycles_per_transmission = 4;
+volatile short sleep_cycles_remaining = sleep_cycles_per_transmission;
+
+
+
+void setup(){
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  Serial.begin(115200);
+  printf_begin();
+  Serial.print(F("\n\rRF24/examples/pingpair_sleepy/\n\rROLE: "));
+  Serial.println(role_friendly_name[role]);
+
+  // Prepare sleep parameters
+  // Only the ping out role uses WDT.  Wake up every 4s to send a ping
+  //if ( role == role_ping_out )
+    setup_watchdog(wdt_4s);
+
+  // Setup and configure rf radio
+
+  radio.begin();
+
+  // Open pipes to other nodes for communication
+
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+  // Open 'our' pipe for writing
+  // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
+
+  if ( role == role_ping_out ) {
+    radio.openWritingPipe(pipes[0]);
+    radio.openReadingPipe(1,pipes[1]);
+  } else {
+    radio.openWritingPipe(pipes[1]);
+    radio.openReadingPipe(1,pipes[0]);
+  }
+
+  // Start listening
+  radio.startListening();
+
+  // Dump the configuration of the rf unit for debugging
+  //radio.printDetails();
+}
+
+void loop(){
+
+  
+  if (role == role_ping_out)  {                     // Ping out role.  Repeatedly send the current time
+    radio.powerUp();                                // Power up the radio after sleeping
+    radio.stopListening();                          // First, stop listening so we can talk.
+                         
+    unsigned long time = millis();                  // Take the time, and send it.                     
+    Serial.print(F("Now sending... "));
+    Serial.println(time);
+    
+    radio.write( &time, sizeof(unsigned long) );
+
+    radio.startListening();                         // Now, continue listening
+    
+    unsigned long started_waiting_at = millis();    // Wait here until we get a response, or timeout (250ms)
+    bool timeout = false;
+    while ( ! radio.available()  ){
+        if (millis() - started_waiting_at > 250 ){  // Break out of the while loop if nothing available
+          timeout = true;
+          break;
+        }
+    }
+    
+    if ( timeout ) {                                // Describe the results
+        Serial.println(F("Failed, response timed out."));
+    } else {
+        unsigned long got_time;                     // Grab the response, compare, and send to debugging spew
+        radio.read( &got_time, sizeof(unsigned long) );
+    
+        printf("Got response %lu, round-trip delay: %lu\n\r",got_time,millis()-got_time);
+    }
+
+    // Shut down the system
+    delay(500);                     // Experiment with some delay here to see if it has an effect
+                                    // Power down the radio.  
+    radio.powerDown();              // NOTE: The radio MUST be powered back up again manually
+
+                                    // Sleep the MCU.
+      do_sleep();
+
+
+  }
+
+
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  if ( role == role_pong_back ) {
+    
+    if ( radio.available() ) {                                  // if there is data ready
+      
+        unsigned long got_time;
+        while (radio.available()) {                             // Dump the payloads until we've gotten everything
+          radio.read( &got_time, sizeof(unsigned long) );       // Get the payload, and see if this was the last one.
+                                                                // Spew it.  Include our time, because the ping_out millis counter is unreliable
+          printf("Got payload %lu @ %lu...",got_time,millis()); // due to it sleeping
+        }
+     
+        radio.stopListening();                                  // First, stop listening so we can talk
+        radio.write( &got_time, sizeof(unsigned long) );        // Send the final one back.
+        Serial.println(F("Sent response."));
+        radio.startListening();                                 // Now, resume listening so we catch the next packets.
+    } else {
+        Serial.println(F("Sleeping"));
+        delay(50);                                             // Delay so the serial data can print out
+        do_sleep();
+
+    }
+  }
+}
+
+void wakeUp(){
+  sleep_disable();
+}
+
+// Sleep helpers
+
+//Prescaler values
+// 0=16ms, 1=32ms,2=64ms,3=125ms,4=250ms,5=500ms
+// 6=1 sec,7=2 sec, 8=4 sec, 9= 8sec
+
+void setup_watchdog(uint8_t prescalar){
+
+  uint8_t wdtcsr = prescalar & 7;
+  if ( prescalar & 8 )
+    wdtcsr |= _BV(WDP3);
+  MCUSR &= ~_BV(WDRF);                      // Clear the WD System Reset Flag
+  WDTCSR = _BV(WDCE) | _BV(WDE);            // Write the WD Change enable bit to enable changing the prescaler and enable system reset
+  WDTCSR = _BV(WDCE) | wdtcsr | _BV(WDIE);  // Write the prescalar bits (how long to sleep, enable the interrupt to wake the MCU
+}
+
+ISR(WDT_vect)
+{
+  //--sleep_cycles_remaining;
+  Serial.println(F("WDT"));
+}
+
+void do_sleep(void)
+{
+  set_sleep_mode(SLEEP_MODE_PWR_DOWN); // sleep mode is set here
+  sleep_enable();
+  attachInterrupt(0,wakeUp,LOW);
+  WDTCSR |= _BV(WDIE);
+  sleep_mode();                        // System sleeps here
+                                       // The WDT_vect interrupt wakes the MCU from here
+  sleep_disable();                     // System continues execution here when watchdog timed out  
+  detachInterrupt(0);  
+  WDTCSR &= ~_BV(WDIE);  
+}
diff --git a/lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino b/lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
new file mode 100644
index 000000000..b5fc94ec0
--- /dev/null
+++ b/lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
@@ -0,0 +1,101 @@
+/*
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+    rf24ping85.ino by tong67 ( https://github.com/tong67 )
+    This is an example of how to use the RF24 class to communicate with ATtiny85 and other node.
+    Write this sketch to an ATtiny85. It will act like the 'transmit' mode of GettingStarted.ino
+    Write GettingStarted.ino sketch to UNO (or other board or RPi) and put the node in 'receiver' mode.
+    The ATtiny85 will transmit a counting number every second starting from 1.
+    The ATtiny85 uses the tiny-core by CodingBadly (https://code.google.com/p/arduino-tiny/)
+    When direct use of 3v3 does not work (UNO boards have bad 3v3 line) use 5v with LED (1.8V ~ 2.2V drop)
+    For low power consumption solutions floating pins (SCK and MOSI) should be pulled high or low with eg. 10K
+
+    ** Hardware configuration **
+    ATtiny25/45/85 Pin map with CE_PIN 3 and CSN_PIN 4
+                                 +-\/-+
+                   NC      PB5  1|o   |8  Vcc --- nRF24L01  VCC, pin2 --- LED --- 5V
+    nRF24L01  CE, pin3 --- PB3  2|    |7  PB2 --- nRF24L01  SCK, pin5
+    nRF24L01 CSN, pin4 --- PB4  3|    |6  PB1 --- nRF24L01 MOSI, pin7
+    nRF24L01 GND, pin1 --- GND  4|    |5  PB0 --- nRF24L01 MISO, pin6
+                                 +----+
+
+    ATtiny25/45/85 Pin map with CE_PIN 3 and CSN_PIN 3 => PB3 and PB4 are free to use for application
+    Circuit idea from http://nerdralph.blogspot.ca/2014/01/nrf24l01-control-with-3-attiny85-pins.html
+    Original RC combination was 1K/100nF. 22K/10nF combination worked better.
+	For best settletime delay value in RF24::csn() the timingSearch3pin.ino scatch can be used.
+    This configuration is enabled when CE_PIN and CSN_PIN are equal, e.g. both 3
+    Because CE is always high the power consumption is higher than for 5 pins solution
+                                                                                            ^^
+                                 +-\/-+           nRF24L01   CE, pin3 ------|              //
+                           PB5  1|o   |8  Vcc --- nRF24L01  VCC, pin2 ------x----------x--|<|-- 5V
+                   NC      PB3  2|    |7  PB2 --- nRF24L01  SCK, pin5 --|<|---x-[22k]--|  LED
+                   NC      PB4  3|    |6  PB1 --- nRF24L01 MOSI, pin6  1n4148 |
+    nRF24L01 GND, pin1 -x- GND  4|    |5  PB0 --- nRF24L01 MISO, pin7         |
+                        |        +----+                                       |
+                        |-----------------------------------------------||----x-- nRF24L01 CSN, pin4 
+                                                                       10nF
+
+    ATtiny24/44/84 Pin map with CE_PIN 8 and CSN_PIN 7
+	Schematic provided and successfully tested by Carmine Pastore (https://github.com/Carminepz)
+                                  +-\/-+
+    nRF24L01  VCC, pin2 --- VCC  1|o   |14 GND --- nRF24L01  GND, pin1
+                            PB0  2|    |13 AREF
+                            PB1  3|    |12 PA1
+                            PB3  4|    |11 PA2 --- nRF24L01   CE, pin3
+                            PB2  5|    |10 PA3 --- nRF24L01  CSN, pin4
+                            PA7  6|    |9  PA4 --- nRF24L01  SCK, pin5
+    nRF24L01 MOSI, pin7 --- PA6  7|    |8  PA5 --- nRF24L01 MISO, pin6
+                                  +----+
+*/
+
+// CE and CSN are configurable, specified values for ATtiny85 as connected above
+#define CE_PIN 3
+#define CSN_PIN 4
+//#define CSN_PIN 3 // uncomment for ATtiny85 3 pins solution
+
+#include "RF24.h"
+
+RF24 radio(CE_PIN, CSN_PIN);
+
+byte addresses[][6] = {
+  "1Node","2Node"};
+unsigned long payload = 0;
+
+void setup() {
+  // Setup and configure rf radio
+  radio.begin(); // Start up the radio
+  radio.setAutoAck(1); // Ensure autoACK is enabled
+  radio.setRetries(15,15); // Max delay between retries & number of retries
+  radio.openWritingPipe(addresses[1]); // Write to device address '2Node'
+  radio.openReadingPipe(1,addresses[0]); // Read on pipe 1 for device address '1Node'
+  radio.startListening(); // Start listening
+}
+
+void loop(void){
+  
+  radio.stopListening(); // First, stop listening so we can talk.
+  payload++;
+  radio.write( &payload, sizeof(unsigned long) );
+  radio.startListening(); // Now, continue listening
+
+    unsigned long started_waiting_at = micros(); // Set up a timeout period, get the current microseconds
+  boolean timeout = false; // Set up a variable to indicate if a response was received or not
+
+  while ( !radio.available() ){ // While nothing is received
+    if (micros() - started_waiting_at > 200000 ){ // If waited longer than 200ms, indicate timeout and exit while loop
+      timeout = true;
+      break;
+    }
+
+  }
+
+  if ( !timeout ){ // Describe the results
+    unsigned long got_time; // Grab the response, compare, and send to debugging spew
+    radio.read( &got_time, sizeof(unsigned long) );
+  }
+
+  // Try again 1s later
+  delay(1000);
+}
\ No newline at end of file
diff --git a/lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino b/lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
new file mode 100644
index 000000000..61e42a584
--- /dev/null
+++ b/lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
@@ -0,0 +1,396 @@
+/*
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+    timingSearch3pin.ino by tong67 ( https://github.com/tong67 )
+    This sketch can be used to determine the best settleTime values to use in RF24::csn().
+	The used settleTimeValues are 100/20. Depend on used RC combiniation and voltage drop by LED.
+    It is setup to be completely selfcontained, copied defines and code from RF24 library.
+    The ATtiny85 uses the tiny-core by CodingBadly (https://code.google.com/p/arduino-tiny/)
+	(Intermediate) results are written to TX (PB3, pin 2). For schematic see rf24ping85.ino 
+*/
+
+// nRF24L01.h copy
+
+/* Memory Map */
+#define CONFIG      0x00
+#define EN_AA       0x01
+#define EN_RXADDR   0x02
+#define SETUP_AW    0x03
+#define SETUP_RETR  0x04
+#define RF_CH       0x05
+#define RF_SETUP    0x06
+#define STATUS      0x07
+#define OBSERVE_TX  0x08
+#define CD          0x09
+#define RX_ADDR_P0  0x0A
+#define RX_ADDR_P1  0x0B
+#define RX_ADDR_P2  0x0C
+#define RX_ADDR_P3  0x0D
+#define RX_ADDR_P4  0x0E
+#define RX_ADDR_P5  0x0F
+#define TX_ADDR     0x10
+#define RX_PW_P0    0x11
+#define RX_PW_P1    0x12
+#define RX_PW_P2    0x13
+#define RX_PW_P3    0x14
+#define RX_PW_P4    0x15
+#define RX_PW_P5    0x16
+#define FIFO_STATUS 0x17
+#define DYNPD	    0x1C
+#define FEATURE	    0x1D
+
+/* Bit Mnemonics */
+#define MASK_RX_DR  6
+#define MASK_TX_DS  5
+#define MASK_MAX_RT 4
+#define EN_CRC      3
+#define CRCO        2
+#define PWR_UP      1
+#define PRIM_RX     0
+#define ENAA_P5     5
+#define ENAA_P4     4
+#define ENAA_P3     3
+#define ENAA_P2     2
+#define ENAA_P1     1
+#define ENAA_P0     0
+#define ERX_P5      5
+#define ERX_P4      4
+#define ERX_P3      3
+#define ERX_P2      2
+#define ERX_P1      1
+#define ERX_P0      0
+#define AW          0
+#define ARD         4
+#define ARC         0
+#define PLL_LOCK    4
+#define RF_DR       3
+#define RF_PWR      6
+#define RX_DR       6
+#define TX_DS       5
+#define MAX_RT      4
+#define RX_P_NO     1
+#define TX_FULL     0
+#define PLOS_CNT    4
+#define ARC_CNT     0
+#define TX_REUSE    6
+#define FIFO_FULL   5
+#define TX_EMPTY    4
+#define RX_FULL     1
+#define RX_EMPTY    0
+#define DPL_P5	    5
+#define DPL_P4	    4
+#define DPL_P3	    3
+#define DPL_P2	    2
+#define DPL_P1	    1
+#define DPL_P0	    0
+#define EN_DPL	    2
+#define EN_ACK_PAY  1
+#define EN_DYN_ACK  0
+
+/* Instruction Mnemonics */
+#define R_REGISTER    0x00
+#define W_REGISTER    0x20
+#define REGISTER_MASK 0x1F
+#define ACTIVATE      0x50
+#define R_RX_PL_WID   0x60
+#define R_RX_PAYLOAD  0x61
+#define W_TX_PAYLOAD  0xA0
+#define W_ACK_PAYLOAD 0xA8
+#define FLUSH_TX      0xE1
+#define FLUSH_RX      0xE2
+#define REUSE_TX_PL   0xE3
+#define RF24_NOP      0xFF
+
+/* Non-P omissions */
+#define LNA_HCURR   0
+
+/* P model memory Map */
+#define RPD         0x09
+#define W_TX_PAYLOAD_NO_ACK  0xB0
+
+/* P model bit Mnemonics */
+#define RF_DR_LOW   5
+#define RF_DR_HIGH  3
+#define RF_PWR_LOW  1
+#define RF_PWR_HIGH 2
+/****************************************************************************/
+
+//ATTiny support code pulled in from https://github.com/jscrane/RF24
+#if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+// see http://gammon.com.au/spi
+#	define DI   0  // D0, pin 5  Data In
+#	define DO   1  // D1, pin 6  Data Out (this is *not* MOSI)
+#	define USCK 2  // D2, pin 7  Universal Serial Interface clock
+#	define SS   3  // D3, pin 2  Slave Select
+#elif defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+// these depend on the core used (check pins_arduino.h)
+// this is for jeelabs' one (based on google-code core)
+#	define DI   4   // PA6
+#	define DO   5   // PA5
+#	define USCK 6   // PA4
+#	define SS   3   // PA7
+#endif
+
+#if defined (ARDUINO) && !defined (__arm__)
+	#if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__) || defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+		#define RF24_TINY
+	#else
+//		#include <SPI.h>
+	#endif
+#endif
+
+#if defined(RF24_TINY)
+#include <stdio.h>
+#include <Arduino.h>
+#include <avr/pgmspace.h>
+
+#define SPI_CLOCK_DIV4 0x00
+#define SPI_CLOCK_DIV16 0x01
+#define SPI_CLOCK_DIV64 0x02
+#define SPI_CLOCK_DIV128 0x03
+#define SPI_CLOCK_DIV2 0x04
+#define SPI_CLOCK_DIV8 0x05
+#define SPI_CLOCK_DIV32 0x06
+//#define SPI_CLOCK_DIV64 0x07
+
+#define SPI_MODE0 0x00
+#define SPI_MODE1 0x04
+#define SPI_MODE2 0x08
+#define SPI_MODE3 0x0C
+
+#define SPI_MODE_MASK 0x0C  // CPOL = bit 3, CPHA = bit 2 on SPCR
+#define SPI_CLOCK_MASK 0x03  // SPR1 = bit 1, SPR0 = bit 0 on SPCR
+#define SPI_2XCLOCK_MASK 0x01  // SPI2X = bit 0 on SPSR
+
+class SPIClass {
+public:
+  static byte transfer(byte _data);
+
+  // SPI Configuration methods
+
+  inline static void attachInterrupt();
+  inline static void detachInterrupt(); // Default
+
+  static void begin(); // Default
+  static void end();
+
+//  static void setBitOrder(uint8_t);
+//  static void setDataMode(uint8_t);
+//  static void setClockDivider(uint8_t);
+};
+extern SPIClass SPI;
+
+#endif /* RF24_TINY */
+
+
+#if defined(RF24_TINY)
+
+void SPIClass::begin() {
+  digitalWrite(SS, HIGH);
+  pinMode(USCK, OUTPUT);
+  pinMode(DO, OUTPUT);
+  pinMode(SS, OUTPUT);
+  pinMode(DI, INPUT);
+  USICR = _BV(USIWM0);
+}
+
+byte SPIClass::transfer(byte b) {
+  USIDR = b;
+  USISR = _BV(USIOIF);
+  do
+    USICR = _BV(USIWM0) | _BV(USICS1) | _BV(USICLK) | _BV(USITC);
+  while ((USISR & _BV(USIOIF)) == 0);
+  return USIDR;
+}
+
+void SPIClass::end() {}
+
+#endif /* RF24_TINY */
+
+/****************************************************************************/
+uint8_t ce_pin; /**< "Chip Enable" pin, activates the RX or TX role */
+uint8_t csn_pin; /**< SPI Chip select */  
+uint8_t csnHighSettle = 255;
+uint8_t csnLowSettle = 255;
+/****************************************************************************/
+void ce(bool level) {
+  if (ce_pin != csn_pin) digitalWrite(ce_pin,level);
+}
+
+/****************************************************************************/
+void setCsnHighSettle(uint8_t level) {
+  csnHighSettle = level;
+}
+
+/****************************************************************************/
+void setCsnLowSettle(uint8_t level) {
+  csnLowSettle = level;
+}
+/****************************************************************************/
+void csn(bool mode) {
+	if (ce_pin != csn_pin) {
+		digitalWrite(csn_pin,mode);
+	} else {
+		if (mode == HIGH) {
+			PORTB |= (1<<PINB2);  	// SCK->CSN HIGH
+			delayMicroseconds(csnHighSettle);  // allow csn to settle
+		} else {
+			PORTB &= ~(1<<PINB2);	// SCK->CSN LOW
+			delayMicroseconds(csnLowSettle);  // allow csn to settle
+		}
+	}	
+}
+
+/****************************************************************************/
+uint8_t read_register(uint8_t reg)
+{
+  csn(LOW);
+  SPI.transfer( R_REGISTER | ( REGISTER_MASK & reg ) );
+  uint8_t result = SPI.transfer(0xff);
+  csn(HIGH);
+  return result;
+}
+
+/****************************************************************************/
+uint8_t write_register2(uint8_t reg, uint8_t value)
+{
+  uint8_t status;
+
+  csn(LOW);
+  status = SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) );
+  SPI.transfer(value);
+  csn(HIGH);
+  return status;
+}
+
+/****************************************************************************/
+#if defined(RF24_TINY)
+#define CE_PIN   3
+#define CSN_PIN  3
+#else
+#define CE_PIN   7
+#define CSN_PIN  8
+#endif
+
+#define MAX_HIGH	100
+#define MAX_LOW		100
+#define MINIMAL		8
+
+void setup(void) {
+  uint8_t status;
+
+  // start serial port and SPI
+  Serial.begin(9600);
+  SPI.begin();
+
+  // configure ce and scn as output when used
+  ce_pin = CE_PIN;
+  csn_pin = CSN_PIN;
+
+  setCsnHighSettle(MAX_HIGH);
+  setCsnLowSettle(MAX_LOW);
+  // csn is used in SPI transfers. Set to LOW at start and HIGH after transfer. Set to HIGH to reflect no transfer active
+  // SPI command are accepted in Power Down state.
+  // ce represent PRX (LOW) or PTX (HIGH) mode apart from register settings. Start in PRX mode.  
+  ce(LOW);
+  csn(HIGH);
+
+  // nRF24L01 goes from to Power Down state 100ms after Power on Reset ( Vdd > 1.9V) or when PWR_UP is 0 in config register 
+  // Goto Power Down state (Powerup or force) and set in transmit mode
+  write_register2(CONFIG, read_register(CONFIG) & ~_BV(PWR_UP) & ~_BV(PRIM_RX));
+  delay(100);
+  
+  // Goto Standby-I
+  // Technically we require 4.5ms Tpd2stby+ 14us as a worst case. We'll just call it 5ms for good measure.
+  // WARNING: Delay is based on P-variant whereby non-P *may* require different timing.
+  write_register2(CONFIG, read_register(CONFIG) | _BV(PWR_UP));
+  delay(5) ;
+
+  // Goto Standby-II
+  ce(HIGH);
+  Serial.print("Scanning for optimal setting time for scn");
+}
+
+
+void loop(void) {
+  uint8_t status;
+  uint8_t i;
+  uint8_t j;
+  uint8_t k;
+  bool success = true;
+  uint8_t csnHigh = MAX_HIGH;
+  uint8_t csnLow = MAX_LOW;
+  uint8_t bottom_success;
+  bool bottom_found;
+  uint8_t value[] = {5,10};
+  uint8_t limit[] = {MAX_HIGH,MAX_LOW};
+  uint8_t advice[] = {MAX_HIGH,MAX_LOW};
+  
+  // check max values give correct behavior
+  for (k=0;k<2;k++) {
+    bottom_found = false;
+    bottom_success = 0;
+    while(bottom_success < 255) {
+      setCsnHighSettle(limit[0]);
+      setCsnLowSettle(limit[1]);
+      // check current values
+      i = 0;
+      while(i<255 & success) {
+        for (j=0;j<2;j++) {
+          write_register2(EN_AA, value[j]);
+          status = read_register(EN_AA);
+          if (value[j] != status) {
+            success = false;
+          }
+        }
+        i++;
+      }
+      // process result of current values 
+      if (!success) {
+        Serial.print("Settle NOK. csnHigh=");
+        Serial.print(limit[0],DEC);
+        Serial.print(" csnLow="); 
+        Serial.println(limit[1],DEC);
+        limit[k]++;
+        bottom_found = true;
+        bottom_success = 0;
+        success = true;
+      } else {
+        Serial.print("Settle OK. csnHigh=");
+        Serial.print(limit[0],DEC);
+        Serial.print(" csnLow="); 
+        Serial.println(limit[1],DEC);
+        if (!bottom_found) {
+          limit[k]--;
+          if (limit[k] == MINIMAL) {
+            bottom_found = true;
+            bottom_success = 0;
+            success = true;
+          }
+        } else {
+          bottom_success++;
+        }
+      }
+    }
+    Serial.print("Settle value found for ");
+    if (k == 0) {
+      Serial.print("csnHigh: ");
+    } else {
+      Serial.print("csnLow: ");
+    }
+    Serial.println(limit[k],DEC);
+    advice[k] = limit[k] + (limit[k] / 10);
+    limit[k] = 100;
+  }
+  Serial.print("Adviced Settle times are: csnHigh=");
+  Serial.print(advice[0],DEC);
+  Serial.print(" csnLow="); 
+  Serial.println(advice[1],DEC);
+  while (true)
+  {
+    ;
+  }
+}
+
diff --git a/lib/RF24/examples/scanner/Jamfile b/lib/RF24/examples/scanner/Jamfile
new file mode 100644
index 000000000..1bf541e68
--- /dev/null
+++ b/lib/RF24/examples/scanner/Jamfile
@@ -0,0 +1,210 @@
+# (1) Project Information
+
+PROJECT_LIBS 	= SPI RF24 ; 
+
+# (2) Board Information
+
+UPLOAD_PROTOCOL ?= stk500v1 ;
+UPLOAD_SPEED 	?= 57600 ;
+MCU		?= atmega328p ;
+F_CPU 		?= 16000000 ;
+CORE		?= arduino ;
+VARIANT 	?= standard ;
+ARDUINO_VERSION	?= 100 ;
+
+# (3) USB Ports
+
+PORTS		= p4 p6 p9 u0 u1 u2 ;
+PORT_p6 	= /dev/tty.usbserial-A600eHIs ;
+PORT_p4 	= /dev/tty.usbserial-A40081RP ;
+PORT_p9		= /dev/tty.usbserial-A9007LmI ;
+PORT_u0 	= /dev/ttyUSB0 ;
+PORT_u1 	= /dev/ttyUSB1 ;
+PORT_u2 	= /dev/ttyUSB2 ;
+
+# (4) Location of AVR tools
+#
+# This configuration assumes using avr-tools that were obtained separate from the Arduino
+# distribution. 
+
+if $(OS) = MACOSX 
+{
+	AVR_BIN 	= /usr/local/avrtools/bin ;
+	AVR_ETC 	= /usr/local/avrtools/etc ;
+	AVR_INCLUDE	= /usr/local/avrtools/include ; 
+}
+else
+{
+	AVR_BIN 	= /usr/bin ;
+	AVR_INCLUDE 	= /usr/lib/avr/include ;
+	AVR_ETC 	= /etc ; 
+}
+
+# (5) Directories where Arduino core and libraries are located
+
+ARDUINO_DIR 	?= /opt/Arduino ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/$(CORE) $(ARDUINO_DIR)/hardware/arduino/variants/$(VARIANT) ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+
+#
+# --------------------------------------------------
+# Below this line usually never needs to be modified 
+#
+
+# Tool locations
+
+CC	  	= $(AVR_BIN)/avr-gcc ;
+C++	 	= $(AVR_BIN)/avr-g++ ;
+LINK	  	= $(AVR_BIN)/avr-gcc ;
+OBJCOPY 	= $(AVR_BIN)/avr-objcopy ;
+AVRDUDE 	= $(AVR_BIN)/avrdude ;
+
+# Flags
+
+DEFINES  	+= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+OPTIM		= -Os ;
+CCFLAGS  	= -Wall -Wextra -mmcu=$(MCU) -ffunction-sections -fdata-sections ;
+C++FLAGS  	= $(CCFLAGS) -fno-exceptions -fno-strict-aliasing ;
+LINKFLAGS  	= $(OPTIM) -lm -Wl,--gc-sections -mmcu=$(MCU) ;
+AVRDUDEFLAGS	= -V -F -D -C $(AVR_ETC)/avrdude.conf -p $(MCU) -c $(UPLOAD_PROTOCOL) -b $(UPLOAD_SPEED) ;
+
+# Search everywhere for headers
+
+HDRS  	 	= $(PWD) $(AVR_INCLUDE) $(ARDUINO_CORE) $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) ;
+
+# Output locations
+
+LOCATE_TARGET	= $(F_CPU) ;
+LOCATE_SOURCE	= $(F_CPU) ;
+
+#
+# Custom rules
+#
+
+rule GitVersion
+{
+	Always $(<) ;
+	Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+	echo "const char program_version[] = \"\\" > $(<)
+	git log -1 --pretty=format:%h >> $(<)
+	echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule Pde
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
+	Clean clean : $(<) ;
+}
+
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
+}
+
+actions Pde
+{
+	echo "#include <$(ARDUINO_H)>" > $(<) 
+	echo "#line 1 \"$(>)\"" >> $(<)
+	cat $(>) >> $(<) 
+}
+
+rule C++Pde
+{
+	local _CPP = $(>:B).cpp ;
+	Pde $(_CPP) : $(>) ;
+	C++ $(<) : $(_CPP) ;
+}
+
+rule UserObject
+{
+	switch $(>:S)
+	{
+		case .ino : C++Pde $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
+	}
+}
+
+rule Objects
+{
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
+        {
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
+        }
+}
+
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+rule Hex
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends hex : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Hex
+{
+	$(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule Upload
+{
+	Depends $(1) : $(2) ;
+	Depends $(2) : $(3) ;
+	NotFile $(1) ;
+	Always $(1) ;
+	Always $(2) ;
+	UploadAction $(2) : $(3) ;
+}
+
+actions UploadAction
+{
+	$(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+#
+# Targets
+#
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# Grab everything from the current dir
+PROJECT_MODULES += [ GLOB $(PWD) : *.c *.cpp *.pde *.ino ] ;
+
+# Main output executable
+MAIN		= $(PWD:B).elf ;
+
+Main $(MAIN) : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+Hex $(MAIN:B).hex : $(MAIN) ;
+
+# Upload targets
+for _p in $(PORTS)
+{
+	Upload $(_p) : $(PORT_$(_p)) : $(MAIN:B).hex ;
+}
diff --git a/lib/RF24/examples/scanner/scanner.ino b/lib/RF24/examples/scanner/scanner.ino
new file mode 100644
index 000000000..fec9a2791
--- /dev/null
+++ b/lib/RF24/examples/scanner/scanner.ino
@@ -0,0 +1,127 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Channel scanner
+ *
+ * Example to detect interference on the various channels available.
+ * This is a good diagnostic tool to check whether you're picking a
+ * good channel for your application.
+ *
+ * Inspired by cpixip.
+ * See http://arduino.cc/forum/index.php/topic,54795.0.html
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 7 & 8
+
+RF24 radio(7,8);
+
+//
+// Channel info
+//
+
+const uint8_t num_channels = 126;
+uint8_t values[num_channels];
+
+//
+// Setup
+//
+
+void setup(void)
+{
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  Serial.println(F("\n\rRF24/examples/scanner/"));
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+  radio.setAutoAck(false);
+
+  // Get into standby mode
+  radio.startListening();
+  radio.stopListening();
+
+  radio.printDetails();
+
+  // Print out header, high then low digit
+  int i = 0;
+  while ( i < num_channels )
+  {
+    printf("%x",i>>4);
+    ++i;
+  }
+  Serial.println();
+  i = 0;
+  while ( i < num_channels )
+  {
+    printf("%x",i&0xf);
+    ++i;
+  }
+  Serial.println();
+}
+
+//
+// Loop
+//
+
+const int num_reps = 100;
+
+void loop(void)
+{
+  // Clear measurement values
+  memset(values,0,sizeof(values));
+
+  // Scan all channels num_reps times
+  int rep_counter = num_reps;
+  while (rep_counter--)
+  {
+    int i = num_channels;
+    while (i--)
+    {
+      // Select this channel
+      radio.setChannel(i);
+
+      // Listen for a little
+      radio.startListening();
+      delayMicroseconds(128);
+      radio.stopListening();
+
+      // Did we get a carrier?
+      if ( radio.testCarrier() ){
+        ++values[i];
+      }
+    }
+  }
+
+  // Print out channel measurements, clamped to a single hex digit
+  int i = 0;
+  while ( i < num_channels )
+  {
+    printf("%x",min(0xf,values[i]));
+    ++i;
+  }
+  Serial.println();
+}
+
+// vim:ai:cin:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples/starping/Jamfile b/lib/RF24/examples/starping/Jamfile
new file mode 100644
index 000000000..de9b1f67d
--- /dev/null
+++ b/lib/RF24/examples/starping/Jamfile
@@ -0,0 +1,206 @@
+PROJECT_NAME 	= $(PWD:B) ;
+PROJECT_DIR 	= . ;
+PROJECT_LIBS    = EEPROM SPI RF24 ; 
+
+OUT_DIR = ojam ;
+F_CPU 		= 16000000 ;
+MCU             = atmega328p ;
+PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
+
+UPLOAD_RATE 	= 57600 ;
+AVRDUDE_PROTOCOL = stk500v1 ;
+COM 		= 33 ;
+
+# Host-specific overrides for locations 
+if $(OS) = MACOSX 
+{
+ARDUINO_VERSION	= 22 ;
+OLD_DIR 	= /opt/arduino-0021 ;
+AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+ARDUINO_DIR 	= /opt/Arduino ;
+ARDUINO_AVR 	= /usr/lib/avr/include ;
+}
+
+# Where is everything?
+ARDUINO_VERSION	?= 22 ;
+AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
+AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
+AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
+AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
+
+DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+CTUNING  	= -ffunction-sections -fdata-sections ;
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+CFLAGS  	= -Os -Wall -Wextra -mmcu=$(MCU) $(CTUNING) ;
+CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+
+# Search everywhere for headers
+HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp ] ;
+
+# In addition to explicitly-specified program modules, pick up anything from the current
+# dir.
+PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
+
+# Shortcut for the out files
+OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+
+# AvrDude setup
+AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
+
+rule GitVersion
+{
+  Always $(<) ;
+  Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+  echo "const char program_version[] = \"\\" > $(<)
+  git log -1 --pretty=format:%h >> $(<)
+  echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule AvrCc
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrCc
+{
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+}
+
+rule AvrC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrC++
+{
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule Pde
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+}
+
+actions Pde
+{
+  echo "#include <WProgram.h>" > $(<) 
+  echo "#line 1 \"$(>)\"" >> $(<)
+  cat $(>) >> $(<) 
+}
+
+rule AvrPde
+{
+  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  AvrC++ $(<) : $(_CPP) ;
+}
+
+rule AvrObject
+{
+  switch $(>:S)
+  {
+    case .c :   AvrCc $(<) : $(>) ;
+    case .cpp : AvrC++ $(<) : $(>) ;
+    case .pde : AvrPde $(<) : $(>) ;
+  }
+}
+
+rule AvrObjects
+{
+  for _I in $(<) 
+  {
+    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+  }
+}
+
+rule AvrMainFromObjects
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  MkDir $(<:D) ;
+  Depends all : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrMainFromObjects
+{
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+}
+
+rule AvrMain
+{
+  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
+  AvrObjects $(>) ;
+}
+
+rule AvrHex
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Depends hex : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrHex
+{
+  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule AvrUpload
+{
+  Depends $(1) : $(2) ;
+  Depends $(2) : $(3) ;
+  NotFile $(1) ;
+  Always $(1) ;
+  Always $(2) ;
+  AvrUploadAction $(2) : $(3) ;
+}
+
+actions AvrUploadAction
+{
+  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+AvrHex $(OUT).hex : $(OUT).elf ;
+
+AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+
diff --git a/lib/RF24/examples/starping/starping.pde b/lib/RF24/examples/starping/starping.pde
new file mode 100644
index 000000000..c1a25729e
--- /dev/null
+++ b/lib/RF24/examples/starping/starping.pde
@@ -0,0 +1,293 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Example RF Radio Ping Star Group
+ *
+ * This sketch is a more complex example of using the RF24 library for Arduino.
+ * Deploy this on up to six nodes.  Set one as the 'pong receiver' by tying the
+ * role_pin low, and the others will be 'ping transmit' units.  The ping units
+ * unit will send out the value of millis() once a second.  The pong unit will
+ * respond back with a copy of the value.  Each ping unit can get that response
+ * back, and determine how long the whole cycle took.
+ *
+ * This example requires a bit more complexity to determine which unit is which.
+ * The pong receiver is identified by having its role_pin tied to ground.
+ * The ping senders are further differentiated by a byte in eeprom.
+ */
+
+#include <SPI.h>
+#include <EEPROM.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 9 & 10
+
+RF24 radio(9,10);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'pong' receiver.
+const int role_pin = 7;
+
+//
+// Topology
+//
+
+// Radio pipe addresses for the nodes to communicate.  Only ping nodes need
+// dedicated pipes in this topology.  Each ping node has a talking pipe
+// that it will ping into, and a listening pipe that it will listen for
+// the pong.  The pong node listens on all the ping node talking pipes
+// and sends the pong back on the sending node's specific listening pipe.
+
+const uint64_t talking_pipes[5] = { 0xF0F0F0F0D2LL, 0xF0F0F0F0C3LL, 0xF0F0F0F0B4LL, 0xF0F0F0F0A5LL, 0xF0F0F0F096LL };
+const uint64_t listening_pipes[5] = { 0x3A3A3A3AD2LL, 0x3A3A3A3AC3LL, 0x3A3A3A3AB4LL, 0x3A3A3A3AA5LL, 0x3A3A3A3A96LL };
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_invalid = 0, role_ping_out, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+//
+// Address management
+//
+
+// Where in EEPROM is the address stored?
+const uint8_t address_at_eeprom_location = 0;
+
+// What is our address (SRAM cache of the address from EEPROM)
+// Note that zero is an INVALID address.  The pong back unit takes address
+// 1, and the rest are 2-6
+uint8_t node_address;
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  //
+  // Address
+  //
+
+  if ( role == role_pong_back )
+    node_address = 1;
+  else
+  {
+    // Read the address from EEPROM
+    uint8_t reading = EEPROM.read(address_at_eeprom_location);
+
+    // If it is in a valid range for node addresses, it is our
+    // address.
+    if ( reading >= 2 && reading <= 6 )
+      node_address = reading;
+
+    // Otherwise, it is invalid, so set our address AND ROLE to 'invalid'
+    else
+    {
+      node_address = 0;
+      role = role_invalid;
+    }
+  }
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\n\rRF24/examples/starping/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+  printf("ADDRESS: %i\n\r",node_address);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // The pong node listens on all the ping node talking pipes
+  // and sends the pong back on the sending node's specific listening pipe.
+  if ( role == role_pong_back )
+  {
+    radio.openReadingPipe(1,talking_pipes[0]);
+    radio.openReadingPipe(2,talking_pipes[1]);
+    radio.openReadingPipe(3,talking_pipes[2]);
+    radio.openReadingPipe(4,talking_pipes[3]);
+    radio.openReadingPipe(5,talking_pipes[4]);
+  }
+
+  // Each ping node has a talking pipe that it will ping into, and a listening
+  // pipe that it will listen for the pong.
+  if ( role == role_ping_out )
+  {
+    // Write on our talking pipe
+    radio.openWritingPipe(talking_pipes[node_address-2]);
+    // Listen on our listening pipe
+    radio.openReadingPipe(1,listening_pipes[node_address-2]);
+  }
+
+  //
+  // Start listening
+  //
+
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+
+  //
+  // Prompt the user to assign a node address if we don't have one
+  //
+
+  if ( role == role_invalid )
+  {
+    printf("\n\r*** NO NODE ADDRESS ASSIGNED *** Send 1 through 6 to assign an address\n\r");
+  }
+}
+
+void loop(void)
+{
+  //
+  // Ping out role.  Repeatedly send the current time
+  //
+
+  if (role == role_ping_out)
+  {
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    unsigned long time = millis();
+    printf("Now sending %lu...",time);
+    radio.write( &time, sizeof(unsigned long) );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout (250ms)
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 250 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      printf("Failed, response timed out.\n\r");
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      unsigned long got_time;
+      radio.read( &got_time, sizeof(unsigned long) );
+
+      // Spew it
+      printf("Got response %lu, round-trip delay: %lu\n\r",got_time,millis()-got_time);
+    }
+
+    // Try again 1s later
+    delay(1000);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    uint8_t pipe_num;
+    if ( radio.available(&pipe_num) )
+    {
+      // Dump the payloads until we've gotten everything
+      unsigned long got_time;
+      bool done = false;
+      while (!done)
+      {
+        // Fetch the payload, and see if this was the last one.
+        done = radio.read( &got_time, sizeof(unsigned long) );
+
+        // Spew it
+        printf("Got payload %lu from node %i...",got_time,pipe_num+1);
+      }
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Open the correct pipe for writing
+      radio.openWritingPipe(listening_pipes[pipe_num-1]);
+
+      // Retain the low 2 bytes to identify the pipe for the spew
+      uint16_t pipe_id = listening_pipes[pipe_num-1] & 0xffff;
+
+      // Send the final one back.
+      radio.write( &got_time, sizeof(unsigned long) );
+      printf("Sent response to %04x.\n\r",pipe_id);
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+
+  //
+  // Listen for serial input, which is how we set the address
+  //
+  if (Serial.available())
+  {
+    // If the character on serial input is in a valid range...
+    char c = Serial.read();
+    if ( c >= '1' && c <= '6' )
+    {
+      // It is our address
+      EEPROM.write(address_at_eeprom_location,c-'0');
+
+      // And we are done right now (no easy way to soft reset)
+      printf("\n\rManually reset address to: %c\n\rPress RESET to continue!",c);
+      while(1) ;
+    }
+  }
+}
+// vim:ai:ci sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples_linux/Makefile.examples b/lib/RF24/examples_linux/Makefile.examples
new file mode 100644
index 000000000..a03483e10
--- /dev/null
+++ b/lib/RF24/examples_linux/Makefile.examples
@@ -0,0 +1,52 @@
+#############################################################################
+#
+# Makefile for librf24 examples on Linux
+#
+# License: GPL (General Public License)
+# Author:  gnulnulf <arco@appeltaart.mine.nu>
+# Date:    2013/02/07 (version 1.0)
+#
+# Description:
+# ------------
+# use make all and make install to install the examples
+#
+
+BINARY_PREFIX = rf24
+SOURCES = $(PROGRAMS:=.cpp)
+
+LIBS=-l$(LIB)
+ifeq ($(DRIVER), LittleWire)
+	LIBS+= -llittlewire-spi
+endif
+
+all: $(PROGRAMS)
+
+$(PROGRAMS): $(SOURCES)
+	$(CXX) $(CFLAGS) -I$(HEADER_DIR)/.. -I.. -L$(LIB_DIR) $@.cpp $(LIBS) -o $@
+
+clean:
+	@echo "[Cleaning]"
+	rm -rf $(PROGRAMS)
+
+install: all
+	@echo "[Installing examples to $(EXAMPLES_DIR)]"
+	@mkdir -p $(EXAMPLES_DIR)
+	@for prog in $(PROGRAMS); do \
+		install -m 0755 $${prog} $(EXAMPLES_DIR)/$(BINARY_PREFIX)-$${prog}; \
+	done
+
+upload: all
+	@echo "[Uploading examples to $(REMOTE):$(REMOTE_EXAMPLES_DIR)]"
+ifeq ($(REMOTE),)
+	@echo "[ERROR] Remote machine not configured. Run configure with respective arguments."
+	@exit 1
+endif
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "mkdir -p $(REMOTE_EXAMPLES_DIR)"
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "mkdir -p /tmp/RF24_examples"
+	@scp -q -P $(REMOTE_PORT) $(PROGRAMS) $(REMOTE):/tmp/RF24_examples
+	@for prog in $(PROGRAMS); do \
+		ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "sudo install -m 0755 /tmp/RF24_examples/$${prog} $(REMOTE_EXAMPLES_DIR)/$(BINARY_PREFIX)-$${prog}"; \
+	done
+	@ssh -q -t -p $(REMOTE_PORT) $(REMOTE) "rm -rf /tmp/RF24_examples"
+
+.PHONY: install upload
diff --git a/lib/RF24/examples_linux/extra/Makefile b/lib/RF24/examples_linux/extra/Makefile
new file mode 100644
index 000000000..6a5dbff4a
--- /dev/null
+++ b/lib/RF24/examples_linux/extra/Makefile
@@ -0,0 +1,24 @@
+#############################################################################
+#
+# Makefile for librf24 examples on Raspberry Pi
+#
+# License: GPL (General Public License)
+# Author:  gnulnulf <arco@appeltaart.mine.nu>
+# Date:    2013/02/07 (version 1.0)
+#
+# Description:
+# ------------
+# use make all and make install to install the examples
+# You can change the install directory by editing the prefix line
+#
+
+ifeq ($(wildcard ../../Makefile.inc), )
+    $(error Configuration not found. Run ./configure first)
+endif
+
+include ../../Makefile.inc
+
+# define all programs
+PROGRAMS = rpi-hub scanner
+
+include ../Makefile.examples
diff --git a/lib/RF24/examples_linux/extra/rpi-hub.cpp b/lib/RF24/examples_linux/extra/rpi-hub.cpp
new file mode 100644
index 000000000..590a98589
--- /dev/null
+++ b/lib/RF24/examples_linux/extra/rpi-hub.cpp
@@ -0,0 +1,134 @@
+/* 
+ *
+ *  Filename : rpi-hub.cpp
+ *
+ *  This program makes the RPi as a hub listening to all six pipes from the remote sensor nodes ( usually Arduino )
+ *  and will return the packet back to the sensor on pipe0 so that the sender can calculate the round trip delays
+ *  when the payload matches.
+ *  
+ *  I encounter that at times, it also receive from pipe7 ( or pipe0 ) with content of FFFFFFFFF that I will not sent
+ *  back to the sender
+ *
+ *  Refer to RF24/examples/rpi_hub_arduino/ for the corresponding Arduino sketches to work with this code.
+ * 
+ *  
+ *  CE is not used and CSN is GPIO25 (not pinout)
+ *
+ *  Refer to RPi docs for GPIO numbers
+ *
+ *  Author : Stanley Seow
+ *  e-mail : stanleyseow@gmail.com
+ *  date   : 6th Mar 2013
+ *
+ * 03/17/2013 : Charles-Henri Hallard (http://hallard.me)
+ *              Modified to use with Arduipi board http://hallard.me/arduipi
+ *						  Changed to use modified bcm2835 and RF24 library 
+ *
+ *
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <RF24/RF24.h>
+
+using namespace std;
+
+// Radio pipe addresses for the 2 nodes to communicate.
+// First pipe is for writing, 2nd, 3rd, 4th, 5th & 6th is for reading...
+const uint64_t pipes[6] = 
+					{ 0xF0F0F0F0D2LL, 0xF0F0F0F0E1LL, 
+						0xF0F0F0F0E2LL, 0xF0F0F0F0E3LL, 
+						0xF0F0F0F0F1, 0xF0F0F0F0F2 
+					};
+
+// CE Pin, CSN Pin, SPI Speed
+
+// Setup for GPIO 22 CE and GPIO 25 CSN with SPI Speed @ 1Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_18, BCM2835_SPI_SPEED_1MHZ);
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ); 
+
+// Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz
+RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);  
+
+
+int main(int argc, char** argv) 
+{
+	uint8_t len;
+
+	// Refer to RF24.h or nRF24L01 DS for settings
+	radio.begin();
+	radio.enableDynamicPayloads();
+	radio.setAutoAck(1);
+	radio.setRetries(15,15);
+	radio.setDataRate(RF24_1MBPS);
+	radio.setPALevel(RF24_PA_MAX);
+	radio.setChannel(76);
+	radio.setCRCLength(RF24_CRC_16);
+
+	// Open 6 pipes for readings ( 5 plus pipe0, also can be used for reading )
+	radio.openWritingPipe(pipes[0]);
+	radio.openReadingPipe(1,pipes[1]);
+	radio.openReadingPipe(2,pipes[2]);
+	radio.openReadingPipe(3,pipes[3]);
+	radio.openReadingPipe(4,pipes[4]);
+	radio.openReadingPipe(5,pipes[5]);
+
+	//
+	// Start listening
+	//
+	radio.startListening();
+
+	//
+	// Dump the configuration of the rf unit for debugging
+	//
+	radio.printDetails();
+	
+	printf("Output below : \n");
+	delay(1);
+	
+	while(1)
+	{
+		char receivePayload[32];
+		uint8_t pipe = 1;
+		
+		// Start listening
+		radio.startListening();
+					
+		while ( radio.available(&pipe) ) 
+		{
+			len = radio.getDynamicPayloadSize();
+			radio.read( receivePayload, len );
+
+			// Display it on screen
+			printf("Recv: size=%i payload=%s pipe=%i",len,receivePayload,pipe);
+
+			// Send back payload to sender
+			radio.stopListening();
+
+			// if pipe is 7, do not send it back
+			if ( pipe != 7 ) 
+			{
+				radio.write(receivePayload,len);
+				receivePayload[len]=0;
+				printf("\t Send: size=%i payload=%s pipe:%i\n",len,receivePayload,pipe);
+			}
+			else 
+			{
+				printf("\n");
+			}
+			
+			pipe++;
+			
+			// reset pipe to 0
+			if ( pipe > 6 ) 
+				pipe = 0;
+		}
+		
+		delayMicroseconds(20);
+	}
+	
+	return 0;
+}
+
diff --git a/lib/RF24/examples_linux/extra/scanner.cpp b/lib/RF24/examples_linux/extra/scanner.cpp
new file mode 100644
index 000000000..fea4ef8b9
--- /dev/null
+++ b/lib/RF24/examples_linux/extra/scanner.cpp
@@ -0,0 +1,143 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ 
+ 
+ 03/17/2013 : Charles-Henri Hallard (http://hallard.me)
+              Modified to use with Arduipi board http://hallard.me/arduipi
+						  Changed to use modified bcm2835 and RF24 library 
+
+ */
+
+/**
+ * Channel scanner
+ *
+ * Example to detect interference on the various channels available.
+ * This is a good diagnostic tool to check whether you're picking a
+ * good channel for your application.
+ *
+ * Inspired by cpixip.
+ * See http://arduino.cc/forum/index.php/topic,54795.0.html
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <RF24/RF24.h>
+
+using namespace std;
+
+//
+// Hardware configuration
+//
+
+// CE Pin, CSN Pin, SPI Speed
+
+// Setup for GPIO 22 CE and GPIO 25 CSN with SPI Speed @ 1Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_18, BCM2835_SPI_SPEED_1MHZ);
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ); 
+
+// Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz
+//RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);  
+
+// Generic setup
+RF24 radio(22, 0);
+
+//
+// Channel info
+//
+const uint8_t num_channels = 126;
+uint8_t values[num_channels];
+
+
+const int num_reps = 100;
+int reset_array=0;
+
+
+int main(int argc, char** argv)
+{
+  //
+  // Print preamble
+  //
+
+  //Serial.begin(115200);
+  //printf_begin();
+  printf("RF24/examples/scanner/\n");
+
+  //
+  // Setup and configure rf radio
+  //
+  radio.begin();
+	
+  radio.setAutoAck(false);
+
+  // Get into standby mode
+  radio.startListening();
+  radio.stopListening();
+
+  radio.printDetails();
+
+  // Print out header, high then low digit
+  int i = 0;
+	
+  while ( i < num_channels )
+  {
+    printf("%x",i>>4);
+    ++i;
+  }
+  printf("\n");
+	
+  i = 0;
+  while ( i < num_channels )
+  {
+    printf("%x",i&0xf);
+    ++i;
+  }
+  printf("\n");       
+	
+  // forever loop
+  while(1)
+  {
+    // Clear measurement values
+    memset(values,0,sizeof(values));
+
+    // Scan all channels num_reps times
+    int rep_counter = num_reps;
+    while(rep_counter--)
+    {
+
+      int i = num_channels;
+      while (i--)
+      {
+
+        // Select this channel
+	radio.setChannel(i);
+
+	// Listen for a little
+	radio.startListening();
+	delayMicroseconds(128);
+	radio.stopListening();
+
+	// Did we get a carrier?
+	if ( radio.testCarrier() ) ++values[i];
+      }
+    }
+
+    // Print out channel measurements, clamped to a single hex digit
+    i = 0;
+    while ( i < num_channels )
+    {
+      printf("%x",min(0xf,(values[i]&0xf)));
+      ++i;
+    }
+    printf("\n");
+  }
+
+  return 0;
+}
+
+// vim:ai:cin:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/examples_linux/gettingstarted.cpp b/lib/RF24/examples_linux/gettingstarted.cpp
new file mode 100644
index 000000000..d25155e83
--- /dev/null
+++ b/lib/RF24/examples_linux/gettingstarted.cpp
@@ -0,0 +1,216 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ 03/17/2013 : Charles-Henri Hallard (http://hallard.me)
+              Modified to use with Arduipi board http://hallard.me/arduipi
+						  Changed to use modified bcm2835 and RF24 library
+TMRh20 2014 - Updated to work with optimized RF24 Arduino library
+
+ */
+
+/**
+ * Example RF Radio Ping Pair
+ *
+ * This is an example of how to use the RF24 class on RPi, communicating to an Arduino running
+ * the GettingStarted sketch.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <unistd.h>
+#include <RF24/RF24.h>
+
+using namespace std;
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+// Radio CE Pin, CSN Pin, SPI Speed
+// See http://www.airspayce.com/mikem/bcm2835/group__constants.html#ga63c029bd6500167152db4e57736d0939 and the related enumerations for pin information.
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
+
+// NEW: Setup for RPi B+
+//RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+
+// Setup for GPIO 15 CE and CE0 CSN with SPI Speed @ 8Mhz
+//RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
+
+// RPi generic:
+RF24 radio(22,0);
+
+/*** RPi Alternate ***/
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number.
+// See http://tmrh20.github.io/RF24/RPi.html for more information on usage
+
+//RPi Alternate, with MRAA
+//RF24 radio(15,0);
+
+//RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+//RF24 radio(22,0);
+
+
+/****************** Linux (BBB,x86,etc) ***********************/
+
+// See http://tmrh20.github.io/RF24/pages.html for more information on usage
+// See http://iotdk.intel.com/docs/master/mraa/ for more information on MRAA
+// See https://www.kernel.org/doc/Documentation/spi/spidev for more information on SPIDEV
+
+// Setup for ARM(Linux) devices like BBB using spidev (default is "/dev/spidev1.0" )
+//RF24 radio(115,0);
+
+//BBB Alternate, with mraa
+// CE pin = (Header P9, Pin 13) = 59 = 13 + 46 
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number. 
+//RF24 radio(59,0);
+
+/********** User Config *********/
+// Assign a unique identifier for this node, 0 or 1
+bool radioNumber = 1;
+
+/********************************/
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint8_t pipes[][6] = {"1Node","2Node"};
+
+
+int main(int argc, char** argv){
+
+  bool role_ping_out = true, role_pong_back = false;
+  bool role = role_pong_back;
+
+  cout << "RF24/examples/GettingStarted/\n";
+
+  // Setup and configure rf radio
+  radio.begin();
+
+  // optionally, increase the delay between retries & # of retries
+  radio.setRetries(15,15);
+  // Dump the configuration of the rf unit for debugging
+  radio.printDetails();
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for pong_back, 1 for ping_out (CTRL+C to exit) \n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+
+    if ( !radioNumber )    {
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]);
+    } else {
+      radio.openWritingPipe(pipes[1]);
+      radio.openReadingPipe(1,pipes[0]);
+    }
+	
+	radio.startListening();
+	
+	// forever loop
+	while (1)
+	{
+		if (role == role_ping_out)
+		{
+			// First, stop listening so we can talk.
+			radio.stopListening();
+
+			// Take the time, and send it.  This will block until complete
+
+			printf("Now sending...\n");
+			unsigned long time = millis();
+
+			bool ok = radio.write( &time, sizeof(unsigned long) );
+
+			if (!ok){
+				printf("failed.\n");
+			}
+			// Now, continue listening
+			radio.startListening();
+
+			// Wait here until we get a response, or timeout (250ms)
+			unsigned long started_waiting_at = millis();
+			bool timeout = false;
+			while ( ! radio.available() && ! timeout ) {
+				if (millis() - started_waiting_at > 200 )
+					timeout = true;
+			}
+
+
+			// Describe the results
+			if ( timeout )
+			{
+				printf("Failed, response timed out.\n");
+			}
+			else
+			{
+				// Grab the response, compare, and send to debugging spew
+				unsigned long got_time;
+				radio.read( &got_time, sizeof(unsigned long) );
+
+				// Spew it
+				printf("Got response %lu, round-trip delay: %lu\n",got_time,millis()-got_time);
+			}
+			sleep(1);
+		}
+
+		//
+		// Pong back role.  Receive each packet, dump it out, and send it back
+		//
+
+		if ( role == role_pong_back )
+		{
+			
+			// if there is data ready
+			if ( radio.available() )
+			{
+				// Dump the payloads until we've gotten everything
+				unsigned long got_time;
+
+				// Fetch the payload, and see if this was the last one.
+				while(radio.available()){
+					radio.read( &got_time, sizeof(unsigned long) );
+				}
+				radio.stopListening();
+				
+				radio.write( &got_time, sizeof(unsigned long) );
+
+				// Now, resume listening so we catch the next packets.
+				radio.startListening();
+
+				// Spew it
+				printf("Got payload(%d) %lu...\n",sizeof(unsigned long), got_time);
+				
+				delay(925); //Delay after payload responded to, minimize RPi CPU time
+				
+			}
+		
+		}
+
+	} // forever loop
+
+  return 0;
+}
+
diff --git a/lib/RF24/examples_linux/gettingstarted_call_response.cpp b/lib/RF24/examples_linux/gettingstarted_call_response.cpp
new file mode 100644
index 000000000..970151240
--- /dev/null
+++ b/lib/RF24/examples_linux/gettingstarted_call_response.cpp
@@ -0,0 +1,169 @@
+/*
+TMRh20 2014 - Updated to work with optimized RF24 Arduino library
+*/
+
+
+/**
+ * Example for efficient call-response using ack-payloads
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well.
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <unistd.h>
+#include <RF24/RF24.h>
+
+using namespace std;
+
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+// Radio CE Pin, CSN Pin, SPI Speed
+// See http://www.airspayce.com/mikem/bcm2835/group__constants.html#ga63c029bd6500167152db4e57736d0939 and the related enumerations for pin information.
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
+
+// NEW: Setup for RPi B+
+//RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+
+// Setup for GPIO 15 CE and CE0 CSN with SPI Speed @ 8Mhz
+RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
+
+/*** RPi Alternate ***/
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number.
+// See http://tmrh20.github.io/RF24/RPi.html for more information on usage
+
+//RPi Alternate, with MRAA
+//RF24 radio(15,0);
+
+//RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+//RF24 radio(22,0);
+
+
+/****************** Linux (BBB,x86,etc) ***********************/
+
+// See http://tmrh20.github.io/RF24/pages.html for more information on usage
+// See http://iotdk.intel.com/docs/master/mraa/ for more information on MRAA
+// See https://www.kernel.org/doc/Documentation/spi/spidev for more information on SPIDEV
+
+// Setup for ARM(Linux) devices like BBB using spidev (default is "/dev/spidev1.0" )
+//RF24 radio(115,0);
+
+//BBB Alternate, with mraa
+// CE pin = (Header P9, Pin 13) = 59 = 13 + 46 
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number. 
+//RF24 radio(59,0);
+
+/********** User Config *********/
+// Assign a unique identifier for this node, 0 or 1. Arduino example uses radioNumber 0 by default.
+bool radioNumber = 1;
+
+/********************************/
+
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint8_t addresses[][6] = {"1Node","2Node"};
+
+bool role_ping_out = 1, role_pong_back = 0, role = 0;
+uint8_t counter = 1;                                                          // A single byte to keep track of the data being sent back and forth
+
+
+int main(int argc, char** argv){
+
+
+  cout << "RPi/RF24/examples/gettingstarted_call_response\n";
+  radio.begin();
+  radio.enableAckPayload();               // Allow optional ack payloads
+  radio.enableDynamicPayloads();
+  radio.printDetails();                   // Dump the configuration of the rf unit for debugging
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for pong_back, 1 for ping_out (CTRL+C to exit)\n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+  // This opens two pipes for these two nodes to communicate
+  // back and forth.
+    if ( !radioNumber )    {
+      radio.openWritingPipe(addresses[0]);
+      radio.openReadingPipe(1,addresses[1]);
+    }else{
+      radio.openWritingPipe(addresses[1]);
+      radio.openReadingPipe(1,addresses[0]);
+    }
+	radio.startListening();
+	radio.writeAckPayload(1,&counter,1);
+
+// forever loop
+while (1){
+
+
+/****************** Ping Out Role ***************************/
+
+  if (role == role_ping_out){                               // Radio is in ping mode
+
+    uint8_t gotByte;                                        // Initialize a variable for the incoming response
+
+    radio.stopListening();                                  // First, stop listening so we can talk.
+    printf("Now sending %d as payload. ",counter);          // Use a simple byte counter as payload
+    unsigned long time = millis();                          // Record the current microsecond count
+
+    if ( radio.write(&counter,1) ){                         // Send the counter variable to the other radio
+        if(!radio.available()){                             // If nothing in the buffer, we got an ack but it is blank
+            printf("Got blank response. round-trip delay: %lu ms\n\r",millis()-time);
+        }else{
+            while(radio.available() ){                      // If an ack with payload was received
+                radio.read( &gotByte, 1 );                  // Read it, and display the response time
+                printf("Got response %d, round-trip delay: %lu ms\n\r",gotByte,millis()-time);
+                counter++;                                  // Increment the counter variable
+            }
+        }
+
+    }else{        printf("Sending failed.\n\r"); }          // If no ack response, sending failed
+
+    sleep(1);  // Try again later
+  }
+
+/****************** Pong Back Role ***************************/
+
+  if ( role == role_pong_back ) {
+    uint8_t pipeNo, gotByte;           		        // Declare variables for the pipe and the byte received
+    if( radio.available(&pipeNo)){               	// Read all available payloads      
+      radio.read( &gotByte, 1 );
+													// Since this is a call-response. Respond directly with an ack payload.
+	  gotByte += 1;  								// Ack payloads are much more efficient than switching to transmit mode to respond to a call
+	  radio.writeAckPayload(pipeNo,&gotByte, 1 );   // This can be commented out to send empty payloads.	  
+      printf("Loaded next response %d \n\r", gotByte);
+	  delay(900); //Delay after a response to minimize CPU usage on RPi
+				  //Expects a payload every second      
+   }
+ }
+
+} //while 1
+} //main
+
+
diff --git a/lib/RF24/examples_linux/interrupts/Makefile b/lib/RF24/examples_linux/interrupts/Makefile
new file mode 100644
index 000000000..2c4809710
--- /dev/null
+++ b/lib/RF24/examples_linux/interrupts/Makefile
@@ -0,0 +1,24 @@
+#############################################################################
+#
+# Makefile for librf24 examples on Raspberry Pi
+#
+# License: GPL (General Public License)
+# Author:  gnulnulf <arco@appeltaart.mine.nu>
+# Date:    2013/02/07 (version 1.0)
+#
+# Description:
+# ------------
+# use make all and make install to install the examples
+# You can change the install directory by editing the prefix line
+#
+
+ifeq ($(wildcard ../../Makefile.inc), )
+    $(error Configuration not found. Run ./configure first)
+endif
+
+include ../../Makefile.inc
+
+# define all programs
+PROGRAMS = gettingstarted_call_response_int gettingstarted_call_response_int2 transfer_interrupt pingpair_dyn_int
+
+include ../Makefile.examples
diff --git a/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp b/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
new file mode 100644
index 000000000..7d35c4b77
--- /dev/null
+++ b/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
@@ -0,0 +1,143 @@
+/*
+TMRh20 2014 - Updated to work with optimized RF24 Arduino library
+*/
+
+
+/**
+ * Example for efficient call-response using ack-payloads and interrupts
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well.
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <unistd.h>
+#include <RF24/RF24.h>
+
+using namespace std;
+
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+RF24 radio(22,0); //GPIO, SPI-BUS
+
+/********** User Config *********/
+// Assign a unique identifier for this node, 0 or 1. Arduino example uses radioNumber 0 by default.
+bool radioNumber = 1;
+int interruptPin = 23;
+/********************************/
+
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint8_t addresses[][6] = {"1Node","2Node"};
+
+volatile bool role_ping_out = 1, role_pong_back = 0, role = 0;
+uint8_t counter = 1;                                                          // A single byte to keep track of the data being sent back and forth
+
+volatile bool gotResponse = false;
+
+void intHandler(){
+    
+  if ( role == role_pong_back ) {
+    uint8_t pipeNo, gotByte;           		        // Declare variables for the pipe and the byte received
+    if( radio.available(&pipeNo)){               	// Read all available payloads      
+      radio.read( &gotByte, 1 );
+													// Since this is a call-response. Respond directly with an ack payload.
+	  gotByte += 1;  								// Ack payloads are much more efficient than switching to transmit mode to respond to a call
+	  radio.writeAckPayload(pipeNo,&gotByte, 1 );   // This can be commented out to send empty payloads.	  
+      printf("Loaded next response %d \n\r", gotByte);
+   
+    }
+  }    
+}
+
+int main(int argc, char** argv){
+
+
+  cout << "RPi/RF24/examples/gettingstarted_call_response_int\n";
+  radio.begin();
+  radio.enableAckPayload();               // Allow optional ack payloads
+  radio.enableDynamicPayloads();
+  radio.printDetails();                   // Dump the configuration of the rf unit for debugging
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for pong_back, 1 for ping_out (CTRL+C to exit)\n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+  // This opens two pipes for these two nodes to communicate
+  // back and forth.
+    if ( !radioNumber )    {
+      radio.openWritingPipe(addresses[0]);
+      radio.openReadingPipe(1,addresses[1]);
+    }else{
+      radio.openWritingPipe(addresses[1]);
+      radio.openReadingPipe(1,addresses[0]);
+    }
+	radio.startListening();
+	radio.writeAckPayload(1,&counter,1);
+    
+    radio.maskIRQ(1,1,0); //Mask tx_ok & tx_fail interrupts
+    attachInterrupt(interruptPin, INT_EDGE_FALLING, intHandler); //Attach interrupt to bcm pin 23
+    
+// forever loop
+while (1){
+
+
+/****************** Ping Out Role ***************************/
+
+  if (role == role_ping_out){                               // Radio is in ping mode
+
+    uint8_t gotByte;                                        // Initialize a variable for the incoming response
+
+    radio.stopListening();                                  // First, stop listening so we can talk.
+    printf("Now sending %d as payload. ",counter);          // Use a simple byte counter as payload
+    unsigned long time = millis();                          // Record the current microsecond count
+
+    if ( radio.write(&counter,1) ){                         // Send the counter variable to the other radio
+        if(!radio.available()){                             // If nothing in the buffer, we got an ack but it is blank
+            printf("Got blank response. round-trip delay: %lu ms\n\r",millis()-time);
+        }else{
+            
+            while(radio.available() ){                      // If an ack with payload was received
+                radio.read( &gotByte, 1 );                  // Read it, and display the response time
+                printf("Got response %d, round-trip delay: %lu ms\n\r",gotByte,millis()-time);
+                counter++;                                  // Increment the counter variable
+            }
+        }
+
+    }else{        printf("Sending failed.\n\r"); }          // If no ack response, sending failed
+
+    sleep(1);  // Try again later
+  }
+
+/****************** Pong Back Role ***************************/
+
+
+
+} //while 1
+} //main
+
+
diff --git a/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp b/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
new file mode 100644
index 000000000..730a94720
--- /dev/null
+++ b/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
@@ -0,0 +1,155 @@
+/*
+TMRh20 2014 - Updated to work with optimized RF24 Arduino library
+*/
+
+
+/**
+ * Example for efficient call-response using ack-payloads
+ *
+ * This example continues to make use of all the normal functionality of the radios including
+ * the auto-ack and auto-retry features, but allows ack-payloads to be written optionlly as well.
+ * This allows very fast call-response communication, with the responding radio never having to
+ * switch out of Primary Receiver mode to send back a payload, but having the option to switch to
+ * primary transmitter if wanting to initiate communication instead of respond to a commmunication.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <unistd.h>
+#include <RF24/RF24.h>
+
+using namespace std;
+
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+RF24 radio(22,0);
+
+/********** User Config *********/
+// Assign a unique identifier for this node, 0 or 1. Arduino example uses radioNumber 0 by default.
+bool radioNumber = 1;
+int interruptPin = 23;
+/********************************/
+
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint8_t addresses[][6] = {"1Node","2Node"};
+
+bool role_ping_out = 1, role_pong_back = 0, role = 0;
+uint8_t counter = 1;                                                          // A single byte to keep track of the data being sent back and forth
+uint32_t timer = 0;
+
+void intHandler(){
+  
+  bool tx_ok,tx_fail,rx;
+  radio.whatHappened(tx_ok,tx_fail,rx);
+  
+  if(tx_fail){
+      printf("Sending failed.\n\r");
+  }
+  
+  if(role == role_ping_out && tx_ok){
+    if(!radio.available()){
+      printf("Got blank response. round-trip delay: %u ms\n\r",millis()-timer);
+    }
+  }
+  
+  if(role == role_ping_out ){
+    while(radio.available() ){
+      uint8_t gotByte;
+      radio.read( &gotByte, 1 );
+      printf("Got response %d, round-trip delay: %u ms\n\r",gotByte,millis()-timer);
+      counter++;
+    }
+  }
+    
+  if ( role == role_pong_back){
+    if(tx_ok) {
+        printf("Ack Payload Sent\n");
+    }  
+    uint8_t pipeNo, gotByte;
+    if( radio.available(&pipeNo)){   
+      radio.read( &gotByte, 1 );
+
+	  gotByte += 1;
+	  radio.writeAckPayload(pipeNo,&gotByte, 1 );
+      printf("Loaded next response %d \n\r", gotByte);
+   
+   }
+ }
+    
+}
+
+
+int main(int argc, char** argv){
+
+
+  cout << "RPi/RF24/examples/gettingstarted_call_response\n";
+  radio.begin();
+  radio.enableAckPayload();               // Allow optional ack payloads
+  radio.enableDynamicPayloads();
+  radio.printDetails();                   // Dump the configuration of the rf unit for debugging
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for pong_back, 1 for ping_out (CTRL+C to exit)\n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+  // This opens two pipes for these two nodes to communicate
+  // back and forth.
+    if ( !radioNumber )    {
+      radio.openWritingPipe(addresses[0]);
+      radio.openReadingPipe(1,addresses[1]);
+    }else{
+      radio.openWritingPipe(addresses[1]);
+      radio.openReadingPipe(1,addresses[0]);
+    }
+	radio.startListening();
+	radio.writeAckPayload(1,&counter,1);
+    
+    attachInterrupt(interruptPin, INT_EDGE_FALLING, intHandler); //Attach interrupt to bcm pin 23
+    
+// forever loop
+while (1){
+
+
+/****************** Ping Out Role ***************************/
+
+  if (role == role_ping_out){                               // Radio is in ping mode
+
+    //uint8_t gotByte;                                      // Initialize a variable for the incoming response
+
+    radio.stopListening();                                  // First, stop listening so we can talk.
+    printf("Now sending %d as payload. ",counter);          // Use a simple byte counter as payload
+    timer = millis();                                       // Record the current microsecond count
+
+    radio.startWrite(&counter,1,false);                         // Send the counter variable to the other radio
+    sleep(1);  // Try again later
+  }
+
+/****************** Pong Back Role ***************************/
+
+
+
+} //while 1
+} //main
+
+
diff --git a/lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp b/lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
new file mode 100644
index 000000000..c3598f9f6
--- /dev/null
+++ b/lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
@@ -0,0 +1,183 @@
+/*
+	TMRh20 2014 - Optimized RF24 Library Fork
+*/
+
+/**
+ * Example using Dynamic Payloads
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <RF24/RF24.h>
+
+
+using namespace std;
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+RF24 radio(22,0); // CE GPIO, CSN SPI-BUS
+
+int interruptPin = 23; // GPIO pin for interrupts
+
+/**************************************************************/
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
+
+
+
+const int min_payload_size = 4;
+const int max_payload_size = 32;
+const int payload_size_increments_by = 1;
+int next_payload_size = min_payload_size;
+
+char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
+bool role_ping_out = 1, role_pong_back = 0;
+bool role = 0;
+
+void intHandler(){
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      uint8_t len=0;
+
+      while (radio.available())
+      {
+        // Fetch the payload, and see if this was the last one.
+	len = radio.getDynamicPayloadSize();
+	radio.read( receive_payload, len );
+
+	// Put a zero at the end for easy printing
+	receive_payload[len] = 0;
+
+	// Spew it
+	printf("Got payload size=%i value=%s\n\r",len,receive_payload);
+      }
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( receive_payload, len );
+      printf("Sent response.\n\r");
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+}
+
+
+int main(int argc, char** argv){
+
+
+  // Print preamble:
+  cout << "RF24/examples/pingpair_dyn/\n";
+
+  // Setup and configure rf radio
+  radio.begin();
+  radio.enableDynamicPayloads();
+  radio.setRetries(5,15);
+  radio.printDetails();
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for receiver, 1 for transmitter (CTRL+C to exit) \n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+
+    if ( role == role_ping_out )    {
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]);
+    } else {
+      radio.openWritingPipe(pipes[1]);
+      radio.openReadingPipe(1,pipes[0]);
+      radio.startListening();
+    }
+    attachInterrupt(interruptPin, INT_EDGE_FALLING, intHandler); //Attach interrupt to bcm pin 23
+
+// forever loop
+	while (1)
+	{
+
+if (role == role_ping_out)
+  {
+    // The payload will always be the same, what will change is how much of it we send.
+    static char send_payload[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ789012";
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    printf("Now sending length %i...",next_payload_size);
+    radio.write( send_payload, next_payload_size );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 500 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      printf("Failed, response timed out.\n\r");
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      uint8_t len = radio.getDynamicPayloadSize();
+      radio.read( receive_payload, len );
+
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      printf("Got response size=%i value=%s\n\r",len,receive_payload);
+    }
+
+    // Update size for next time.
+    next_payload_size += payload_size_increments_by;
+    if ( next_payload_size > max_payload_size )
+      next_payload_size = min_payload_size;
+
+    // Try again 1s later
+    delay(100);
+  }
+
+
+}
+}
+
+
diff --git a/lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp b/lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp
new file mode 100644
index 000000000..3fb2528db
--- /dev/null
+++ b/lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp
@@ -0,0 +1,192 @@
+/*
+TMRh20 2014
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/** General Data Transfer Rate Test
+ * This example demonstrates basic data transfer functionality with the
+ updated library. This example will display the transfer rates acheived using
+ the slower form of high-speed transfer using blocking-writes.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <RF24/RF24.h>
+#include <unistd.h>
+
+using namespace std;
+//
+// Hardware configuration
+//
+
+/****************** Raspberry Pi ***********************/
+
+// Radio CE Pin, CSN Pin, SPI Speed
+// See http://www.airspayce.com/mikem/bcm2835/group__constants.html#ga63c029bd6500167152db4e57736d0939 and the related enumerations for pin information.
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
+
+// NEW: Setup for RPi B+
+//RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+
+// Setup for GPIO 15 CE and CE0 CSN with SPI Speed @ 8Mhz
+RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
+
+/*** RPi Alternate ***/
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number.
+// See http://tmrh20.github.io/RF24/RPi.html for more information on usage
+
+//RPi Alternate, with MRAA
+//RF24 radio(15,0);
+
+//RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+//RF24 radio(22,0);
+
+
+/****************** Linux (BBB,x86,etc) ***********************/
+
+// See http://tmrh20.github.io/RF24/pages.html for more information on usage
+// See http://iotdk.intel.com/docs/master/mraa/ for more information on MRAA
+// See https://www.kernel.org/doc/Documentation/spi/spidev for more information on SPIDEV
+
+// Setup for ARM(Linux) devices like BBB using spidev (default is "/dev/spidev1.0" )
+//RF24 radio(115,0);
+
+//BBB Alternate, with mraa
+// CE pin = (Header P9, Pin 13) = 59 = 13 + 46 
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number. 
+//RF24 radio(59,0);
+
+/**************************************************************/
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t addresses[2] = { 0xABCDABCD71LL, 0x544d52687CLL };
+
+
+uint8_t data[32];
+unsigned long startTime, stopTime, counter, rxTimer=0;
+
+void intHandler()
+{
+	//Read as long data is available
+	//Single interrupts may be lost if a lot of data comes in.
+	while(radio.available())
+	{
+      radio.read(&data,32);
+      counter++;
+    }
+}
+
+int main(int argc, char** argv){
+
+  bool role_ping_out = 1, role_pong_back = 0;
+  bool role = 0;
+
+  // Print preamble:
+
+  cout << "RF24/examples/Transfer/\n";
+
+  radio.begin();                           // Setup and configure rf radio
+  radio.setChannel(1);
+  radio.setPALevel(RF24_PA_MAX);
+  radio.setDataRate(RF24_1MBPS);
+  radio.setAutoAck(1);                     // Ensure autoACK is enabled
+  radio.setRetries(2,15);                  // Optionally, increase the delay between retries & # of retries
+  radio.setCRCLength(RF24_CRC_8);          // Use 8-bit CRC for performance
+  radio.printDetails();
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for receiver, 1 for transmitter (CTRL+C to exit)\n>";
+  getline(cin,input);
+
+  attachInterrupt(23, INT_EDGE_FALLING, intHandler); //Attach interrupt to bcm pin 23
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+
+    if ( role == role_ping_out )    {
+      radio.openWritingPipe(addresses[1]);
+      radio.openReadingPipe(1,addresses[0]);
+	  radio.stopListening();
+    } else {
+      radio.openWritingPipe(addresses[0]);
+      radio.openReadingPipe(1,addresses[1]);
+      radio.startListening();
+    }
+
+
+  for(int i=0; i<32; i++){
+     data[i] = rand() % 255;               			//Load the buffer with random data
+  }
+
+    // forever loop
+    while (1)
+	{
+	if (role == role_ping_out){
+		sleep(2);
+		printf("Initiating Basic Data Transfer\n\r");
+
+		long int cycles = 10000; 					//Change this to a higher or lower number.
+		
+		// unsigned long pauseTime = millis();		//Uncomment if autoAck == 1 ( NOACK )
+		startTime = millis();
+	
+		for(int i=0; i<cycles; i++){        		//Loop through a number of cycles
+      			data[0] = i;                        //Change the first byte of the payload for identification
+      			if(!radio.writeFast(&data,32)){     //Write to the FIFO buffers
+        			counter++;                      //Keep count of failed payloads
+      			}
+
+				
+				//This is only required when NO ACK ( enableAutoAck(0) ) payloads are used
+		/*		if(millis() - pauseTime > 3){       // Need to drop out of TX mode every 4ms if sending a steady stream of multicast data
+					pauseTime = millis();		    
+					radio.txStandBy();				// This gives the PLL time to sync back up	
+				}
+		*/
+		}
+		stopTime = millis();
+
+		if(!radio.txStandBy()){ counter+=3; }
+
+  		float numBytes = cycles*32;
+   		float rate = numBytes / (stopTime - startTime);
+
+  		printf("Transfer complete at %.2f KB/s \n\r",rate);
+   		printf("%lu of %lu Packets Failed to Send\n\r",counter,cycles);
+  		counter = 0;
+
+	}
+
+
+	if(role == role_pong_back)
+	{
+        if(millis() - rxTimer > 1000){
+		  rxTimer = millis();
+		  printf("Rate: ");
+		  float numBytes = counter*32;
+		  printf("%.2f KB/s \n\r",numBytes/1000);
+		  printf("Payload Count: %lu \n\r", counter);
+  		  counter = 0;
+        }
+        delay(2);
+	}
+	
+} // loop
+} // main
diff --git a/lib/RF24/examples_linux/pingpair_dyn.cpp b/lib/RF24/examples_linux/pingpair_dyn.cpp
new file mode 100644
index 000000000..7cae0d355
--- /dev/null
+++ b/lib/RF24/examples_linux/pingpair_dyn.cpp
@@ -0,0 +1,211 @@
+/*
+	TMRh20 2014 - Optimized RF24 Library Fork
+*/
+
+/**
+ * Example using Dynamic Payloads
+ *
+ * This is an example of how to use payloads of a varying (dynamic) size.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include "./RF24.h"
+
+
+using namespace std;
+//
+// Hardware configuration
+// Configure the appropriate pins for your connections
+
+/****************** Raspberry Pi ***********************/
+
+// Radio CE Pin, CSN Pin, SPI Speed
+// See http://www.airspayce.com/mikem/bcm2835/group__constants.html#ga63c029bd6500167152db4e57736d0939 and the related enumerations for pin information.
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
+
+// NEW: Setup for RPi B+
+//RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+
+// Setup for GPIO 15 CE and CE0 CSN with SPI Speed @ 8Mhz
+RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
+
+/*** RPi Alternate ***/
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number.
+// See http://tmrh20.github.io/RF24/RPi.html for more information on usage
+
+//RPi Alternate, with MRAA
+//RF24 radio(15,0);
+
+//RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+//RF24 radio(22,0);
+
+
+/****************** Linux (BBB,x86,etc) ***********************/
+
+// See http://tmrh20.github.io/RF24/pages.html for more information on usage
+// See http://iotdk.intel.com/docs/master/mraa/ for more information on MRAA
+// See https://www.kernel.org/doc/Documentation/spi/spidev for more information on SPIDEV
+
+// Setup for ARM(Linux) devices like BBB using spidev (default is "/dev/spidev1.0" )
+//RF24 radio(115,0);
+
+//BBB Alternate, with mraa
+// CE pin = (Header P9, Pin 13) = 59 = 13 + 46 
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number. 
+//RF24 radio(59,0);
+
+/**************************************************************/
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
+
+
+
+const int min_payload_size = 4;
+const int max_payload_size = 32;
+const int payload_size_increments_by = 1;
+int next_payload_size = min_payload_size;
+
+char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
+
+int main(int argc, char** argv){
+
+  bool role_ping_out = 1, role_pong_back = 0;
+  bool role = 0;
+
+  // Print preamble:
+  cout << "RF24/examples/pingpair_dyn/\n";
+
+  // Setup and configure rf radio
+  radio.begin();
+  radio.enableDynamicPayloads();
+  radio.setRetries(5,15);
+  radio.printDetails();
+
+
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for receiver, 1 for transmitter (CTRL+C to exit) \n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+
+    if ( role == role_ping_out )    {
+      radio.openWritingPipe(pipes[0]);
+      radio.openReadingPipe(1,pipes[1]);
+    } else {
+      radio.openWritingPipe(pipes[1]);
+      radio.openReadingPipe(1,pipes[0]);
+      radio.startListening();
+    }
+
+
+// forever loop
+	while (1)
+	{
+
+if (role == role_ping_out)
+  {
+    // The payload will always be the same, what will change is how much of it we send.
+    static char send_payload[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ789012";
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    printf("Now sending length %i...",next_payload_size);
+    radio.write( send_payload, next_payload_size );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 500 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      printf("Failed, response timed out.\n\r");
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      uint8_t len = radio.getDynamicPayloadSize();
+      radio.read( receive_payload, len );
+
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      printf("Got response size=%i value=%s\n\r",len,receive_payload);
+    }
+
+    // Update size for next time.
+    next_payload_size += payload_size_increments_by;
+    if ( next_payload_size > max_payload_size )
+      next_payload_size = min_payload_size;
+
+    // Try again 1s later
+    delay(100);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      uint8_t len;
+
+      while (radio.available())
+      {
+        // Fetch the payload, and see if this was the last one.
+	len = radio.getDynamicPayloadSize();
+	radio.read( receive_payload, len );
+
+	// Put a zero at the end for easy printing
+	receive_payload[len] = 0;
+
+	// Spew it
+	printf("Got payload size=%i value=%s\n\r",len,receive_payload);
+      }
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+
+      // Send the final one back.
+      radio.write( receive_payload, len );
+      printf("Sent response.\n\r");
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+    }
+  }
+}
+}
+
+
diff --git a/lib/RF24/examples_linux/pingpair_dyn.py b/lib/RF24/examples_linux/pingpair_dyn.py
new file mode 100755
index 000000000..d7ea78d0a
--- /dev/null
+++ b/lib/RF24/examples_linux/pingpair_dyn.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+
+#
+# Example using Dynamic Payloads
+# 
+#  This is an example of how to use payloads of a varying (dynamic) size.
+# 
+
+from __future__ import print_function
+import time
+from RF24 import *
+import RPi.GPIO as GPIO
+
+irq_gpio_pin = None
+
+########### USER CONFIGURATION ###########
+# See https://github.com/TMRh20/RF24/blob/master/pyRF24/readme.md
+
+# CE Pin, CSN Pin, SPI Speed
+
+# Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 8Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_8MHZ)
+
+#RPi B
+# Setup for GPIO 15 CE and CE1 CSN with SPI Speed @ 8Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_8MHZ)
+
+#RPi B+
+# Setup for GPIO 22 CE and CE0 CSN for RPi B+ with SPI Speed @ 8Mhz
+#radio = RF24(RPI_BPLUS_GPIO_J8_15, RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ)
+
+# RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+radio = RF24(22, 0);
+
+
+# Setup for connected IRQ pin, GPIO 24 on RPi B+; uncomment to activate
+#irq_gpio_pin = RPI_BPLUS_GPIO_J8_18
+#irq_gpio_pin = 24
+
+##########################################
+def try_read_data(channel=0):
+    if radio.available():
+        while radio.available():
+            len = radio.getDynamicPayloadSize()
+            receive_payload = radio.read(len)
+            print('Got payload size={} value="{}"'.format(len, receive_payload.decode('utf-8')))
+            # First, stop listening so we can talk
+            radio.stopListening()
+
+            # Send the final one back.
+            radio.write(receive_payload)
+            print('Sent response.')
+
+            # Now, resume listening so we catch the next packets.
+            radio.startListening()
+
+pipes = [0xF0F0F0F0E1, 0xF0F0F0F0D2]
+min_payload_size = 4
+max_payload_size = 32
+payload_size_increments_by = 1
+next_payload_size = min_payload_size
+inp_role = 'none'
+send_payload = b'ABCDEFGHIJKLMNOPQRSTUVWXYZ789012'
+millis = lambda: int(round(time.time() * 1000))
+
+print('pyRF24/examples/pingpair_dyn/')
+radio.begin()
+radio.enableDynamicPayloads()
+radio.setRetries(5,15)
+radio.printDetails()
+
+print(' ************ Role Setup *********** ')
+while (inp_role !='0') and (inp_role !='1'):
+    inp_role = str(input('Choose a role: Enter 0 for receiver, 1 for transmitter (CTRL+C to exit) '))
+
+if inp_role == '0':
+    print('Role: Pong Back, awaiting transmission')
+    if irq_gpio_pin is not None:
+        # set up callback for irq pin
+        GPIO.setmode(GPIO.BCM)
+        GPIO.setup(irq_gpio_pin, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+        GPIO.add_event_detect(irq_gpio_pin, GPIO.FALLING, callback=try_read_data)
+
+    radio.openWritingPipe(pipes[1])
+    radio.openReadingPipe(1,pipes[0])
+    radio.startListening()
+else:
+    print('Role: Ping Out, starting transmission')
+    radio.openWritingPipe(pipes[0])
+    radio.openReadingPipe(1,pipes[1])
+
+# forever loop
+while 1:
+    if inp_role == '1':   # ping out
+        # The payload will always be the same, what will change is how much of it we send.
+
+        # First, stop listening so we can talk.
+        radio.stopListening()
+
+        # Take the time, and send it.  This will block until complete
+        print('Now sending length {} ... '.format(next_payload_size), end="")
+        radio.write(send_payload[:next_payload_size])
+
+        # Now, continue listening
+        radio.startListening()
+
+        # Wait here until we get a response, or timeout
+        started_waiting_at = millis()
+        timeout = False
+        while (not radio.available()) and (not timeout):
+            if (millis() - started_waiting_at) > 500:
+                timeout = True
+
+        # Describe the results
+        if timeout:
+            print('failed, response timed out.')
+        else:
+            # Grab the response, compare, and send to debugging spew
+            len = radio.getDynamicPayloadSize()
+            receive_payload = radio.read(len)
+
+            # Spew it
+            print('got response size={} value="{}"'.format(len, receive_payload.decode('utf-8')))
+
+        # Update size for next time.
+        next_payload_size += payload_size_increments_by
+        if next_payload_size > max_payload_size:
+            next_payload_size = min_payload_size
+        time.sleep(0.1)
+    else:
+        # Pong back role.  Receive each packet, dump it out, and send it back
+
+        # if there is data ready
+        if irq_gpio_pin is None:
+            # no irq pin is set up -> poll it
+            try_read_data()
+        else:
+            # callback routine set for irq pin takes care for reading -
+            # do nothing, just sleeps in order not to burn cpu by looping
+            time.sleep(1000)
+
diff --git a/lib/RF24/examples_linux/readme.md b/lib/RF24/examples_linux/readme.md
new file mode 100644
index 000000000..4728bd321
--- /dev/null
+++ b/lib/RF24/examples_linux/readme.md
@@ -0,0 +1,3 @@
+Note: These examples were originally designed for RPi, but should work on any supported Linux platform, with the proper pin configuration.
+
+See http://tmrh20.github.io/RF24 for more information
\ No newline at end of file
diff --git a/lib/RF24/examples_linux/transfer.cpp b/lib/RF24/examples_linux/transfer.cpp
new file mode 100644
index 000000000..584454a84
--- /dev/null
+++ b/lib/RF24/examples_linux/transfer.cpp
@@ -0,0 +1,187 @@
+/*
+TMRh20 2014
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/** General Data Transfer Rate Test
+ * This example demonstrates basic data transfer functionality with the
+ updated library. This example will display the transfer rates acheived using
+ the slower form of high-speed transfer using blocking-writes.
+ */
+
+#include <cstdlib>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <RF24/RF24.h>
+#include <unistd.h>
+
+using namespace std;
+//
+// Hardware configuration
+//
+
+/****************** Raspberry Pi ***********************/
+
+// Radio CE Pin, CSN Pin, SPI Speed
+// See http://www.airspayce.com/mikem/bcm2835/group__constants.html#ga63c029bd6500167152db4e57736d0939 and the related enumerations for pin information.
+
+// Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+//RF24 radio(RPI_V2_GPIO_P1_22, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ);
+
+// NEW: Setup for RPi B+
+//RF24 radio(RPI_BPLUS_GPIO_J8_15,RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ);
+
+// Setup for GPIO 15 CE and CE0 CSN with SPI Speed @ 8Mhz
+RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
+
+/*** RPi Alternate ***/
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number.
+// See http://tmrh20.github.io/RF24/RPi.html for more information on usage
+
+//RPi Alternate, with MRAA
+//RF24 radio(15,0);
+
+//RPi Alternate, with SPIDEV - Note: Edit RF24/arch/BBB/spi.cpp and  set 'this->device = "/dev/spidev0.0";;' or as listed in /dev
+//RF24 radio(22,0);
+
+
+/****************** Linux (BBB,x86,etc) ***********************/
+
+// See http://tmrh20.github.io/RF24/pages.html for more information on usage
+// See http://iotdk.intel.com/docs/master/mraa/ for more information on MRAA
+// See https://www.kernel.org/doc/Documentation/spi/spidev for more information on SPIDEV
+
+// Setup for ARM(Linux) devices like BBB using spidev (default is "/dev/spidev1.0" )
+//RF24 radio(115,0);
+
+//BBB Alternate, with mraa
+// CE pin = (Header P9, Pin 13) = 59 = 13 + 46 
+//Note: Specify SPI BUS 0 or 1 instead of CS pin number. 
+//RF24 radio(59,0);
+
+/**************************************************************/
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t addresses[2] = { 0xABCDABCD71LL, 0x544d52687CLL };
+
+
+uint8_t data[32];
+unsigned long startTime, stopTime, counter, rxTimer=0;
+
+int main(int argc, char** argv){
+
+  bool role_ping_out = 1, role_pong_back = 0;
+  bool role = 0;
+
+  // Print preamble:
+
+  cout << "RF24/examples/Transfer/\n";
+
+  radio.begin();                           // Setup and configure rf radio
+  radio.setChannel(1);
+  radio.setPALevel(RF24_PA_MAX);
+  radio.setDataRate(RF24_1MBPS);
+  radio.setAutoAck(1);                     // Ensure autoACK is enabled
+  radio.setRetries(2,15);                  // Optionally, increase the delay between retries & # of retries
+  radio.setCRCLength(RF24_CRC_8);          // Use 8-bit CRC for performance
+  radio.printDetails();
+/********* Role chooser ***********/
+
+  printf("\n ************ Role Setup ***********\n");
+  string input = "";
+  char myChar = {0};
+  cout << "Choose a role: Enter 0 for receiver, 1 for transmitter (CTRL+C to exit)\n>";
+  getline(cin,input);
+
+  if(input.length() == 1) {
+	myChar = input[0];
+	if(myChar == '0'){
+		cout << "Role: Pong Back, awaiting transmission " << endl << endl;
+	}else{  cout << "Role: Ping Out, starting transmission " << endl << endl;
+		role = role_ping_out;
+	}
+  }
+/***********************************/
+
+    if ( role == role_ping_out )    {
+      radio.openWritingPipe(addresses[1]);
+      radio.openReadingPipe(1,addresses[0]);
+	  radio.stopListening();
+    } else {
+      radio.openWritingPipe(addresses[0]);
+      radio.openReadingPipe(1,addresses[1]);
+      radio.startListening();
+    }
+
+
+  for(int i=0; i<32; i++){
+     data[i] = rand() % 255;               			//Load the buffer with random data
+  }
+
+    // forever loop
+    while (1){
+
+	if (role == role_ping_out){
+		sleep(2);
+		printf("Initiating Basic Data Transfer\n\r");
+
+		long int cycles = 10000; 					//Change this to a higher or lower number.
+		
+		// unsigned long pauseTime = millis();		//Uncomment if autoAck == 1 ( NOACK )
+		startTime = millis();
+	
+		for(int i=0; i<cycles; i++){        		//Loop through a number of cycles
+      			data[0] = i;                        //Change the first byte of the payload for identification
+      			if(!radio.writeFast(&data,32)){     //Write to the FIFO buffers
+        			counter++;                      //Keep count of failed payloads
+      			}
+
+				
+				//This is only required when NO ACK ( enableAutoAck(0) ) payloads are used
+		/*		if(millis() - pauseTime > 3){       // Need to drop out of TX mode every 4ms if sending a steady stream of multicast data
+					pauseTime = millis();		    
+					radio.txStandBy();				// This gives the PLL time to sync back up	
+				}
+		*/
+		}
+		stopTime = millis();
+
+		if(!radio.txStandBy()){ counter+=3; }
+
+  		float numBytes = cycles*32;
+   		float rate = numBytes / (stopTime - startTime);
+
+  		printf("Transfer complete at %.2f KB/s \n\r",rate);
+   		printf("%lu of %lu Packets Failed to Send\n\r",counter,cycles);
+  		counter = 0;
+
+	}
+
+
+if(role == role_pong_back){
+     while(radio.available()){
+      radio.read(&data,32);
+      counter++;
+     }
+   if(millis() - rxTimer > 1000){
+     rxTimer = millis();
+     printf("Rate: ");
+     float numBytes = counter*32;
+     printf("%.2f KB/s \n\r",numBytes/1000);
+     printf("Payload Count: %lu \n\r", counter);
+     counter = 0;
+   }
+  }
+
+} // loop
+} // main
+
+
+
+
+
+
diff --git a/lib/RF24/keywords.txt b/lib/RF24/keywords.txt
new file mode 100644
index 000000000..13cbd594e
--- /dev/null
+++ b/lib/RF24/keywords.txt
@@ -0,0 +1,16 @@
+  RF24	KEYWORD1
+  begin	KEYWORD2
+  setChannel	KEYWORD2
+  setPayloadSize	KEYWORD2
+  getPayloadSize	KEYWORD2
+  print_details	KEYWORD2
+  startListening	KEYWORD2
+  stopListening	KEYWORD2
+  write	KEYWORD2
+  writeFast	KEYWORD2
+  writeBlocking	KEYWORD2
+  txStandBy	KEYWORD2
+  available	KEYWORD2
+  read	KEYWORD2
+  openWritingPipe	KEYWORD2
+  openReadingPipe	KEYWORD2
\ No newline at end of file
diff --git a/lib/RF24/library.json b/lib/RF24/library.json
new file mode 100644
index 000000000..eb442ae6c
--- /dev/null
+++ b/lib/RF24/library.json
@@ -0,0 +1,20 @@
+{
+  "name": "RF24",
+  "keywords": "rf, radio, wireless, spi",
+  "description": "Optimized High Speed Driver for nRF24L01(+) 2.4GHz Wireless Transceiver",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/nRF24/RF24.git"
+  },
+  "version": "1.3.3",
+  "frameworks": "arduino",
+  "platforms": [
+    "atmelavr",
+    "atmelsam",
+    "teensy",
+    "espressif32",
+    "espressif8266",
+    "linux_arm"
+  ]
+}
diff --git a/lib/RF24/library.properties b/lib/RF24/library.properties
new file mode 100644
index 000000000..878d39467
--- /dev/null
+++ b/lib/RF24/library.properties
@@ -0,0 +1,9 @@
+name=RF24
+version=1.3.3
+author=TMRh20
+maintainer=TMRh20,Avamander
+sentence=A library for NRF24L01(+) communication.
+paragraph=Optimized library for nRF24L01(+) that is simple to use for beginners, but yet offers a lot for advanced users. It also has a lot of good examples how to use the library.
+category=Communication
+url=https://tmrh20.github.io/RF24/
+architectures=avr,arm,x86,esp8266,esp32
diff --git a/lib/RF24/nRF24L01.h b/lib/RF24/nRF24L01.h
new file mode 100644
index 000000000..5df47b013
--- /dev/null
+++ b/lib/RF24/nRF24L01.h
@@ -0,0 +1,127 @@
+/*
+    Copyright (c) 2007 Stefan Engelke <mbox@stefanengelke.de>
+	Portions Copyright (C) 2011 Greg Copeland
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/* Memory Map */
+#define NRF_CONFIG      0x00
+#define EN_AA       0x01
+#define EN_RXADDR   0x02
+#define SETUP_AW    0x03
+#define SETUP_RETR  0x04
+#define RF_CH       0x05
+#define RF_SETUP    0x06
+#define NRF_STATUS  0x07
+#define OBSERVE_TX  0x08
+#define CD          0x09
+#define RX_ADDR_P0  0x0A
+#define RX_ADDR_P1  0x0B
+#define RX_ADDR_P2  0x0C
+#define RX_ADDR_P3  0x0D
+#define RX_ADDR_P4  0x0E
+#define RX_ADDR_P5  0x0F
+#define TX_ADDR     0x10
+#define RX_PW_P0    0x11
+#define RX_PW_P1    0x12
+#define RX_PW_P2    0x13
+#define RX_PW_P3    0x14
+#define RX_PW_P4    0x15
+#define RX_PW_P5    0x16
+#define FIFO_STATUS 0x17
+#define DYNPD	    0x1C
+#define FEATURE	    0x1D
+
+/* Bit Mnemonics */
+#define MASK_RX_DR  6
+#define MASK_TX_DS  5
+#define MASK_MAX_RT 4
+#define EN_CRC      3
+#define CRCO        2
+#define PWR_UP      1
+#define PRIM_RX     0
+#define ENAA_P5     5
+#define ENAA_P4     4
+#define ENAA_P3     3
+#define ENAA_P2     2
+#define ENAA_P1     1
+#define ENAA_P0     0
+#define ERX_P5      5
+#define ERX_P4      4
+#define ERX_P3      3
+#define ERX_P2      2
+#define ERX_P1      1
+#define ERX_P0      0
+#define AW          0
+#define ARD         4
+#define ARC         0
+#define PLL_LOCK    4
+#define RF_DR       3
+#define RF_PWR      6
+#define RX_DR       6
+#define TX_DS       5
+#define MAX_RT      4
+#define RX_P_NO     1
+#define TX_FULL     0
+#define PLOS_CNT    4
+#define ARC_CNT     0
+#define TX_REUSE    6
+#define FIFO_FULL   5
+#define TX_EMPTY    4
+#define RX_FULL     1
+#define RX_EMPTY    0
+#define DPL_P5	    5
+#define DPL_P4	    4
+#define DPL_P3	    3
+#define DPL_P2	    2
+#define DPL_P1	    1
+#define DPL_P0	    0
+#define EN_DPL	    2
+#define EN_ACK_PAY  1
+#define EN_DYN_ACK  0
+
+/* Instruction Mnemonics */
+#define R_REGISTER    0x00
+#define W_REGISTER    0x20
+#define REGISTER_MASK 0x1F
+#define ACTIVATE      0x50
+#define R_RX_PL_WID   0x60
+#define R_RX_PAYLOAD  0x61
+#define W_TX_PAYLOAD  0xA0
+#define W_ACK_PAYLOAD 0xA8
+#define FLUSH_TX      0xE1
+#define FLUSH_RX      0xE2
+#define REUSE_TX_PL   0xE3
+#define RF24_NOP      0xFF
+
+/* Non-P omissions */
+#define LNA_HCURR   0
+
+/* P model memory Map */
+#define RPD         0x09
+#define W_TX_PAYLOAD_NO_ACK  0xB0
+
+/* P model bit Mnemonics */
+#define RF_DR_LOW   5
+#define RF_DR_HIGH  3
+#define RF_PWR_LOW  1
+#define RF_PWR_HIGH 2
diff --git a/lib/RF24/printf.h b/lib/RF24/printf.h
new file mode 100644
index 000000000..643f434fa
--- /dev/null
+++ b/lib/RF24/printf.h
@@ -0,0 +1,44 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+ /*  Galileo support from spaniakos <spaniakos@gmail.com> */
+
+/**
+ * @file printf.h
+ *
+ * Setup necessary to direct stdout to the Arduino Serial library, which
+ * enables 'printf'
+ */
+
+#ifndef __PRINTF_H__
+#define __PRINTF_H__
+
+#if defined (ARDUINO_ARCH_AVR) || defined(__ARDUINO_X86__)
+
+int serial_putc( char c, FILE * )
+{
+  Serial.write( c );
+
+  return c;
+}
+#endif
+
+void printf_begin(void)
+{
+  #if defined (ARDUINO_ARCH_AVR)  
+    fdevopen( &serial_putc, 0 );
+    
+  #elif defined (__ARDUINO_X86__)
+    //JESUS - For reddirect stdout to /dev/ttyGS0 (Serial Monitor port)
+    stdout = freopen("/dev/ttyGS0","w",stdout);
+    delay(500);
+    printf("redirecting to Serial...");
+    
+  #endif
+}
+
+#endif // __PRINTF_H__
diff --git a/lib/RF24/pyRF24/crossunixccompiler.py b/lib/RF24/pyRF24/crossunixccompiler.py
new file mode 100644
index 000000000..0532c15e9
--- /dev/null
+++ b/lib/RF24/pyRF24/crossunixccompiler.py
@@ -0,0 +1,38 @@
+import sys
+from distutils import unixccompiler
+from distutils import ccompiler
+
+
+def register():
+    sys.modules['distutils.crossunixccompiler'] = sys.modules[__name__]
+    ccompiler.compiler_class['crossunix'] = (__name__,
+                                             'CrossUnixCCompiler',
+                                             'UNIX-style compiler for cross compilation')
+
+
+def try_remove_all(lst, starts):
+    lst[:] = [x for x in lst if not x.startswith(starts)]
+
+
+class CrossUnixCCompiler(unixccompiler.UnixCCompiler):
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        try_remove_all(self.compiler_so, ('-m64', '-fstack-protector-strong', '-mtune=generic'))
+        try_remove_all(cc_args, '-I/usr')
+        try_remove_all(pp_opts, '-I/usr')
+        return unixccompiler.UnixCCompiler._compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts)
+
+    def link(self, target_desc, objects,
+             output_filename, output_dir=None, libraries=None,
+             library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
+        try_remove_all(self.library_dirs, ('/usr'))
+        return unixccompiler.UnixCCompiler.link(self, target_desc, objects, output_filename, output_dir, libraries,
+                                                library_dirs, runtime_library_dirs, export_symbols, debug,
+                                                extra_preargs, extra_postargs, build_temp, target_lang)
+
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
+        self.__class__ = unixccompiler.UnixCCompiler
+        ret = unixccompiler.UnixCCompiler._fix_lib_args(self, libraries, library_dirs, runtime_library_dirs)
+        self.__class__ = CrossUnixCCompiler
+        return ret
diff --git a/lib/RF24/pyRF24/pyRF24.cpp b/lib/RF24/pyRF24/pyRF24.cpp
new file mode 100644
index 000000000..1b0445231
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24.cpp
@@ -0,0 +1,330 @@
+#include <RF24/RF24.h>
+#include <boost/python.hpp>
+
+namespace bp = boost::python;
+
+// ******************** explicit wrappers **************************
+// for methods which need it - mostly for buffer operations
+// 
+
+void throw_ba_exception(void)
+{
+    PyErr_SetString(PyExc_TypeError, "buf parameter must be bytes or bytearray");
+    bp::throw_error_already_set();
+}
+
+char *get_bytes_or_bytearray_str(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_AsString(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_AsString(py_ba);
+    else
+        throw_ba_exception();
+    return NULL;
+}
+
+int get_bytes_or_bytearray_ln(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_Size(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_Size(py_ba);
+    else
+        throw_ba_exception();
+    return 0;
+}
+
+bp::object read_wrap(RF24& ref, int maxlen)
+{
+    char *buf = new char[maxlen+1];
+    ref.read(buf, maxlen);
+    bp::object py_ba(bp::handle<>(PyByteArray_FromStringAndSize(buf, maxlen<ref.getPayloadSize()?maxlen:ref.getPayloadSize())));
+    delete[] buf;
+    return py_ba;
+}
+
+bool write_wrap1(RF24& ref, bp::object buf)
+{
+    return ref.write(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+}
+
+bool write_wrap2(RF24& ref, bp::object buf, const bool multicast)
+{
+    return ref.write(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void writeAckPayload_wrap(RF24& ref, uint8_t pipe, bp::object buf)
+{
+    ref.writeAckPayload(pipe, get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+
+}
+
+bool writeFast_wrap1(RF24& ref, bp::object buf)
+{
+    return ref.writeFast(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+}
+
+bool writeFast_wrap2(RF24& ref, bp::object buf, const bool multicast)
+{
+    return ref.writeFast(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+bool writeBlocking_wrap(RF24& ref, bp::object buf, uint32_t timeout)
+{
+    return ref.writeBlocking(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), timeout);
+}
+
+void startFastWrite_wrap1(RF24& ref, bp::object buf, const bool multicast)
+{
+    ref.startFastWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void startFastWrite_wrap2(RF24& ref, bp::object buf, const bool multicast, bool startTx)
+{
+    ref.startFastWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast, startTx);
+}
+
+void startWrite_wrap(RF24& ref, bp::object buf, const bool multicast)
+{
+    ref.startWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void openWritingPipe_wrap(RF24& ref, const bp::object address)
+{
+    ref.openWritingPipe((const uint8_t *)(get_bytes_or_bytearray_str(address)));
+}
+
+void openReadingPipe_wrap(RF24& ref, uint8_t number, const bp::object address)
+{
+    ref.openReadingPipe(number, (const uint8_t *)(get_bytes_or_bytearray_str(address)));
+}
+
+bp::tuple whatHappened_wrap(RF24& ref)
+{
+    bool tx_ok;
+    bool tx_fail;
+    bool tx_ready;
+
+    ref.whatHappened(tx_ok, tx_fail, tx_ready);
+    return bp::make_tuple(tx_ok, tx_fail, tx_ready);
+}
+
+bp::tuple available_wrap(RF24& ref)
+{
+    bool result;
+    uint8_t pipe;
+
+    result = ref.available(&pipe);
+    return bp::make_tuple(result, pipe);
+}
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(txStandBy_wrap1, RF24::txStandBy, 0, 2)
+//BOOST_PYTHON_FUNCTION_OVERLOADS(txStandBy_wrap2, RF24::txStandBy, 1, 2)
+
+// ******************** enums **************************
+// from both RF24 and bcm2835
+// 
+
+BOOST_PYTHON_MODULE(RF24){
+
+#ifdef BCM2835_H
+    bp::enum_< RPiGPIOPin>("RPiGPIOPin")
+        .value("RPI_GPIO_P1_03", RPI_GPIO_P1_03)
+        .value("RPI_GPIO_P1_05", RPI_GPIO_P1_05)
+        .value("RPI_GPIO_P1_07", RPI_GPIO_P1_07)
+        .value("RPI_GPIO_P1_08", RPI_GPIO_P1_08)
+        .value("RPI_GPIO_P1_10", RPI_GPIO_P1_10)
+        .value("RPI_GPIO_P1_11", RPI_GPIO_P1_11)
+        .value("RPI_GPIO_P1_12", RPI_GPIO_P1_12)
+        .value("RPI_GPIO_P1_13", RPI_GPIO_P1_13)
+        .value("RPI_GPIO_P1_15", RPI_GPIO_P1_15)
+        .value("RPI_GPIO_P1_16", RPI_GPIO_P1_16)
+        .value("RPI_GPIO_P1_18", RPI_GPIO_P1_18)
+        .value("RPI_GPIO_P1_19", RPI_GPIO_P1_19)
+        .value("RPI_GPIO_P1_21", RPI_GPIO_P1_21)
+        .value("RPI_GPIO_P1_22", RPI_GPIO_P1_22)
+        .value("RPI_GPIO_P1_23", RPI_GPIO_P1_23)
+        .value("RPI_GPIO_P1_24", RPI_GPIO_P1_24)
+        .value("RPI_GPIO_P1_26", RPI_GPIO_P1_26)
+        .value("RPI_V2_GPIO_P1_03", RPI_V2_GPIO_P1_03)
+        .value("RPI_V2_GPIO_P1_05", RPI_V2_GPIO_P1_05)
+        .value("RPI_V2_GPIO_P1_07", RPI_V2_GPIO_P1_07)
+        .value("RPI_V2_GPIO_P1_08", RPI_V2_GPIO_P1_08)
+        .value("RPI_V2_GPIO_P1_10", RPI_V2_GPIO_P1_10)
+        .value("RPI_V2_GPIO_P1_11", RPI_V2_GPIO_P1_11)
+        .value("RPI_V2_GPIO_P1_12", RPI_V2_GPIO_P1_12)
+        .value("RPI_V2_GPIO_P1_13", RPI_V2_GPIO_P1_13)
+        .value("RPI_V2_GPIO_P1_15", RPI_V2_GPIO_P1_15)
+        .value("RPI_V2_GPIO_P1_16", RPI_V2_GPIO_P1_16)
+        .value("RPI_V2_GPIO_P1_18", RPI_V2_GPIO_P1_18)
+        .value("RPI_V2_GPIO_P1_19", RPI_V2_GPIO_P1_19)
+        .value("RPI_V2_GPIO_P1_21", RPI_V2_GPIO_P1_21)
+        .value("RPI_V2_GPIO_P1_22", RPI_V2_GPIO_P1_22)
+        .value("RPI_V2_GPIO_P1_23", RPI_V2_GPIO_P1_23)
+        .value("RPI_V2_GPIO_P1_24", RPI_V2_GPIO_P1_24)
+        .value("RPI_V2_GPIO_P1_26", RPI_V2_GPIO_P1_26)
+        .value("RPI_V2_GPIO_P5_03", RPI_V2_GPIO_P5_03)
+        .value("RPI_V2_GPIO_P5_04", RPI_V2_GPIO_P5_04)
+        .value("RPI_V2_GPIO_P5_05", RPI_V2_GPIO_P5_05)
+        .value("RPI_V2_GPIO_P5_06", RPI_V2_GPIO_P5_06)
+        .value("RPI_BPLUS_GPIO_J8_03", RPI_BPLUS_GPIO_J8_03)
+        .value("RPI_BPLUS_GPIO_J8_05", RPI_BPLUS_GPIO_J8_05)
+        .value("RPI_BPLUS_GPIO_J8_07", RPI_BPLUS_GPIO_J8_07)
+        .value("RPI_BPLUS_GPIO_J8_08", RPI_BPLUS_GPIO_J8_08)
+        .value("RPI_BPLUS_GPIO_J8_10", RPI_BPLUS_GPIO_J8_10)
+        .value("RPI_BPLUS_GPIO_J8_11", RPI_BPLUS_GPIO_J8_11)
+        .value("RPI_BPLUS_GPIO_J8_12", RPI_BPLUS_GPIO_J8_12)
+        .value("RPI_BPLUS_GPIO_J8_13", RPI_BPLUS_GPIO_J8_13)
+        .value("RPI_BPLUS_GPIO_J8_15", RPI_BPLUS_GPIO_J8_15)
+        .value("RPI_BPLUS_GPIO_J8_16", RPI_BPLUS_GPIO_J8_16)
+        .value("RPI_BPLUS_GPIO_J8_18", RPI_BPLUS_GPIO_J8_18)
+        .value("RPI_BPLUS_GPIO_J8_19", RPI_BPLUS_GPIO_J8_19)
+        .value("RPI_BPLUS_GPIO_J8_21", RPI_BPLUS_GPIO_J8_21)
+        .value("RPI_BPLUS_GPIO_J8_22", RPI_BPLUS_GPIO_J8_22)
+        .value("RPI_BPLUS_GPIO_J8_23", RPI_BPLUS_GPIO_J8_23)
+        .value("RPI_BPLUS_GPIO_J8_24", RPI_BPLUS_GPIO_J8_24)
+        .value("RPI_BPLUS_GPIO_J8_26", RPI_BPLUS_GPIO_J8_26)
+        .value("RPI_BPLUS_GPIO_J8_29", RPI_BPLUS_GPIO_J8_29)
+        .value("RPI_BPLUS_GPIO_J8_31", RPI_BPLUS_GPIO_J8_31)
+        .value("RPI_BPLUS_GPIO_J8_32", RPI_BPLUS_GPIO_J8_32)
+        .value("RPI_BPLUS_GPIO_J8_33", RPI_BPLUS_GPIO_J8_33)
+        .value("RPI_BPLUS_GPIO_J8_35", RPI_BPLUS_GPIO_J8_35)
+        .value("RPI_BPLUS_GPIO_J8_36", RPI_BPLUS_GPIO_J8_36)
+        .value("RPI_BPLUS_GPIO_J8_37", RPI_BPLUS_GPIO_J8_37)
+        .value("RPI_BPLUS_GPIO_J8_38", RPI_BPLUS_GPIO_J8_38)
+        .value("RPI_BPLUS_GPIO_J8_40", RPI_BPLUS_GPIO_J8_40)
+        .export_values()
+        ;
+
+    bp::enum_< bcm2835SPIClockDivider>("bcm2835SPIClockDivider")
+        .value("BCM2835_SPI_CLOCK_DIVIDER_65536", BCM2835_SPI_CLOCK_DIVIDER_65536)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_32768", BCM2835_SPI_CLOCK_DIVIDER_32768)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_16384", BCM2835_SPI_CLOCK_DIVIDER_16384)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_8192", BCM2835_SPI_CLOCK_DIVIDER_8192)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_4096", BCM2835_SPI_CLOCK_DIVIDER_4096)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_2048", BCM2835_SPI_CLOCK_DIVIDER_2048)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_1024", BCM2835_SPI_CLOCK_DIVIDER_1024)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_512", BCM2835_SPI_CLOCK_DIVIDER_512)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_256", BCM2835_SPI_CLOCK_DIVIDER_256)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_128", BCM2835_SPI_CLOCK_DIVIDER_128)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_64", BCM2835_SPI_CLOCK_DIVIDER_64)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_32", BCM2835_SPI_CLOCK_DIVIDER_32)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_16", BCM2835_SPI_CLOCK_DIVIDER_16)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_8", BCM2835_SPI_CLOCK_DIVIDER_8)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_4", BCM2835_SPI_CLOCK_DIVIDER_4)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_2", BCM2835_SPI_CLOCK_DIVIDER_2)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_1", BCM2835_SPI_CLOCK_DIVIDER_1)
+        .export_values();
+
+
+    bp::enum_< bcm2835SPIChipSelect>("bcm2835SPIChipSelect")
+        .value("BCM2835_SPI_CS0", BCM2835_SPI_CS0)
+        .value("BCM2835_SPI_CS1", BCM2835_SPI_CS1)
+        .value("BCM2835_SPI_CS2", BCM2835_SPI_CS2)
+        .value("BCM2835_SPI_CS_NONE", BCM2835_SPI_CS_NONE)
+        .export_values();
+
+// exposing '#define's for SPI speed as this is needed for RF24 constructor
+    bp::scope().attr("BCM2835_SPI_SPEED_64MHZ") = BCM2835_SPI_SPEED_64MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_32MHZ") = BCM2835_SPI_SPEED_32MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_16MHZ") = BCM2835_SPI_SPEED_16MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_8MHZ") = BCM2835_SPI_SPEED_8MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_4MHZ") = BCM2835_SPI_SPEED_4MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_2MHZ") = BCM2835_SPI_SPEED_2MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_1MHZ") = BCM2835_SPI_SPEED_1MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_512KHZ") = BCM2835_SPI_SPEED_512KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_256KHZ") = BCM2835_SPI_SPEED_256KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_128KHZ") = BCM2835_SPI_SPEED_128KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_64KHZ") = BCM2835_SPI_SPEED_64KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_32KHZ") = BCM2835_SPI_SPEED_32KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_16KHZ") = BCM2835_SPI_SPEED_16KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_8KHZ") = BCM2835_SPI_SPEED_8KHZ;
+#endif  // BCM2835_H
+
+    bp::enum_< rf24_crclength_e>("rf24_crclength_e")
+        .value("RF24_CRC_DISABLED", RF24_CRC_DISABLED)
+        .value("RF24_CRC_8", RF24_CRC_8)
+        .value("RF24_CRC_16", RF24_CRC_16)
+        .export_values()
+        ;
+
+    bp::enum_< rf24_datarate_e>("rf24_datarate_e")
+        .value("RF24_1MBPS", RF24_1MBPS)
+        .value("RF24_2MBPS", RF24_2MBPS)
+        .value("RF24_250KBPS", RF24_250KBPS)
+        .export_values()
+        ;
+
+    bp::enum_< rf24_pa_dbm_e>("rf24_pa_dbm_e")
+        .value("RF24_PA_MIN", RF24_PA_MIN)
+        .value("RF24_PA_LOW", RF24_PA_LOW)
+        .value("RF24_PA_HIGH", RF24_PA_HIGH)
+        .value("RF24_PA_MAX", RF24_PA_MAX)
+        .value("RF24_PA_ERROR", RF24_PA_ERROR)
+        .export_values()
+        ;
+
+// ******************** RF24 class  **************************
+// 
+    bp::class_< RF24 >( "RF24", bp::init< uint8_t, uint8_t >(( bp::arg("_cepin"), bp::arg("_cspin") )) )
+#if defined (RF24_LINUX) && !defined (MRAA)
+        .def( bp::init< uint8_t, uint8_t, uint32_t >(( bp::arg("_cepin"), bp::arg("_cspin"), bp::arg("spispeed") )) )
+#endif
+        .def("available", (bool ( ::RF24::* )(  ) )( &::RF24::available ) )
+        .def("available_pipe", &available_wrap )    // needed to rename this method as python does not allow such overloading
+        .def("begin", &RF24::begin)    
+        .def("closeReadingPipe", &RF24::closeReadingPipe)
+        .def("disableCRC", &RF24::disableCRC)    
+        .def("enableAckPayload", &RF24::enableAckPayload)
+        .def("enableDynamicAck", &RF24::enableDynamicAck)    
+        .def("enableDynamicPayloads", &RF24::enableDynamicPayloads)
+        .def("flush_tx", &RF24::flush_tx)
+        .def("getCRCLength", &RF24::getCRCLength)
+        .def("getDataRate", &RF24::getDataRate)
+        .def("getDynamicPayloadSize", &RF24::getDynamicPayloadSize)
+        .def("getPALevel", &RF24::getPALevel)
+        .def("isAckPayloadAvailable", &RF24::isAckPayloadAvailable)    
+        .def("isPVariant", &RF24::isPVariant)
+        .def("isValid", &RF24::isValid)
+        .def("maskIRQ", &RF24::maskIRQ, ( bp::arg("tx_ok"), bp::arg("tx_fail"), bp::arg("rx_ready")))    
+        .def("openReadingPipe", &openReadingPipe_wrap, (bp::arg("number"), bp::arg("address")))    
+        .def("openReadingPipe", (void ( ::RF24::* )( ::uint8_t,::uint64_t ) )( &::RF24::openReadingPipe), (bp::arg("number"), bp::arg("address")))    
+        .def("openWritingPipe", &openWritingPipe_wrap, (bp::arg("address")))    
+        .def("openWritingPipe", (void ( ::RF24::* )( ::uint64_t ) )( &::RF24::openWritingPipe), ( bp::arg("address") ) )    
+        .def("powerDown", &RF24::powerDown)    
+        .def("powerUp", &RF24::powerUp)    
+        .def("printDetails", &RF24::printDetails)
+        .def("reUseTX", &RF24::reUseTX)
+        .def("read", &read_wrap, (bp::arg("maxlen")))    
+        .def("rxFifoFull", &RF24::rxFifoFull)
+        .def("setAddressWidth", &RF24::setAddressWidth)
+        .def("setAutoAck", (void ( ::RF24::* )( bool ) )( &::RF24::setAutoAck ), ( bp::arg("enable") ) )    
+        .def("setAutoAck", (void ( ::RF24::* )( ::uint8_t,bool ) )( &::RF24::setAutoAck ), ( bp::arg("pipe"), bp::arg("enable") ) )    
+        .def("setCRCLength", &RF24::setCRCLength, ( bp::arg("length") ) )    
+        .def("setChannel", &RF24::setChannel, ( bp::arg("channel") ) )    
+        .def("setDataRate", &RF24::setDataRate, ( bp::arg("speed") ) )    
+        .def("setPALevel", &RF24::setPALevel, ( bp::arg("level") ) )    
+        .def("setRetries", &RF24::setRetries , (bp::arg("delay"), bp::arg("count")))    
+        .def("startFastWrite", &startFastWrite_wrap1, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast") ) )    
+        .def("startFastWrite", &startFastWrite_wrap2, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast"), bp::arg("startTx") ) )    
+        .def("startListening", &RF24::startListening)    
+        .def("startWrite", &startWrite_wrap, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast") ) )    
+        .def("stopListening", &RF24::stopListening)
+        .def("testCarrier", &RF24::testCarrier)
+        .def("testRPD", &RF24::testRPD)
+        .def("txStandBy", (bool ( ::RF24::* )( ::uint32_t,bool))(&RF24::txStandBy), txStandBy_wrap1( bp::args("timeout", "startTx") ) )
+        .def("whatHappened", &whatHappened_wrap)    
+        .def("write", &write_wrap1, ( bp::arg("buf") ) )    
+        .def("write", &write_wrap2, ( bp::arg("buf"), bp::arg("multicast") ) )    
+        .def("writeAckPayload", writeAckPayload_wrap, ( bp::arg("pipe"), bp::arg("buf") ) )    
+        .def("writeBlocking", &writeBlocking_wrap, ( bp::arg("buf"), bp::arg("timeout") ) )    
+        .def("writeFast", &writeFast_wrap1, ( bp::arg("buf") ) )    
+        .def("writeFast", &writeFast_wrap2, ( bp::arg("buf"), bp::arg("multicast") ) )    
+        .add_property("payloadSize", &RF24::getPayloadSize, &RF24::setPayloadSize)
+        .def_readwrite( "failureDetected", &RF24::failureDetected );
+}
diff --git a/lib/RF24/pyRF24/pyRF24/crossunixccompiler.py b/lib/RF24/pyRF24/pyRF24/crossunixccompiler.py
new file mode 100644
index 000000000..0532c15e9
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24/crossunixccompiler.py
@@ -0,0 +1,38 @@
+import sys
+from distutils import unixccompiler
+from distutils import ccompiler
+
+
+def register():
+    sys.modules['distutils.crossunixccompiler'] = sys.modules[__name__]
+    ccompiler.compiler_class['crossunix'] = (__name__,
+                                             'CrossUnixCCompiler',
+                                             'UNIX-style compiler for cross compilation')
+
+
+def try_remove_all(lst, starts):
+    lst[:] = [x for x in lst if not x.startswith(starts)]
+
+
+class CrossUnixCCompiler(unixccompiler.UnixCCompiler):
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        try_remove_all(self.compiler_so, ('-m64', '-fstack-protector-strong', '-mtune=generic'))
+        try_remove_all(cc_args, '-I/usr')
+        try_remove_all(pp_opts, '-I/usr')
+        return unixccompiler.UnixCCompiler._compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts)
+
+    def link(self, target_desc, objects,
+             output_filename, output_dir=None, libraries=None,
+             library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
+        try_remove_all(self.library_dirs, ('/usr'))
+        return unixccompiler.UnixCCompiler.link(self, target_desc, objects, output_filename, output_dir, libraries,
+                                                library_dirs, runtime_library_dirs, export_symbols, debug,
+                                                extra_preargs, extra_postargs, build_temp, target_lang)
+
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
+        self.__class__ = unixccompiler.UnixCCompiler
+        ret = unixccompiler.UnixCCompiler._fix_lib_args(self, libraries, library_dirs, runtime_library_dirs)
+        self.__class__ = CrossUnixCCompiler
+        return ret
diff --git a/lib/RF24/pyRF24/pyRF24/pyRF24.cpp b/lib/RF24/pyRF24/pyRF24/pyRF24.cpp
new file mode 100644
index 000000000..fa0322886
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24/pyRF24.cpp
@@ -0,0 +1,328 @@
+#include <RF24/RF24.h>
+#include <boost/python.hpp>
+
+namespace bp = boost::python;
+
+// ******************** explicit wrappers **************************
+// for methods which need it - mostly for buffer operations
+// 
+
+void throw_ba_exception(void)
+{
+    PyErr_SetString(PyExc_TypeError, "buf parameter must be bytes or bytearray");
+    bp::throw_error_already_set();
+}
+
+char *get_bytes_or_bytearray_str(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_AsString(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_AsString(py_ba);
+    else
+        throw_ba_exception();
+    return NULL;
+}
+
+int get_bytes_or_bytearray_ln(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_Size(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_Size(py_ba);
+    else
+        throw_ba_exception();
+    return 0;
+}
+
+bp::object read_wrap(RF24& ref, int maxlen)
+{
+    char *buf = new char[maxlen+1];
+    ref.read(buf, maxlen);
+    bp::object py_ba(bp::handle<>(PyByteArray_FromStringAndSize(buf, maxlen<ref.getPayloadSize()?maxlen:ref.getPayloadSize())));
+    delete[] buf;
+    return py_ba;
+}
+
+bool write_wrap1(RF24& ref, bp::object buf)
+{
+    return ref.write(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+}
+
+bool write_wrap2(RF24& ref, bp::object buf, const bool multicast)
+{
+    return ref.write(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void writeAckPayload_wrap(RF24& ref, uint8_t pipe, bp::object buf)
+{
+    ref.writeAckPayload(pipe, get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+
+}
+
+bool writeFast_wrap1(RF24& ref, bp::object buf)
+{
+    return ref.writeFast(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+}
+
+bool writeFast_wrap2(RF24& ref, bp::object buf, const bool multicast)
+{
+    return ref.writeFast(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+bool writeBlocking_wrap(RF24& ref, bp::object buf, uint32_t timeout)
+{
+    return ref.writeBlocking(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), timeout);
+}
+
+void startFastWrite_wrap1(RF24& ref, bp::object buf, const bool multicast)
+{
+    ref.startFastWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void startFastWrite_wrap2(RF24& ref, bp::object buf, const bool multicast, bool startTx)
+{
+    ref.startFastWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast, startTx);
+}
+
+void startWrite_wrap(RF24& ref, bp::object buf, const bool multicast)
+{
+    ref.startWrite(get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf), multicast);
+}
+
+void openWritingPipe_wrap(RF24& ref, const bp::object address)
+{
+    ref.openWritingPipe((const uint8_t *)(get_bytes_or_bytearray_str(address)));
+}
+
+void openReadingPipe_wrap(RF24& ref, uint8_t number, const bp::object address)
+{
+    ref.openReadingPipe(number, (const uint8_t *)(get_bytes_or_bytearray_str(address)));
+}
+
+bp::tuple whatHappened_wrap(RF24& ref)
+{
+    bool tx_ok;
+    bool tx_fail;
+    bool tx_ready;
+
+    ref.whatHappened(tx_ok, tx_fail, tx_ready);
+    return bp::make_tuple(tx_ok, tx_fail, tx_ready);
+}
+
+bp::tuple available_wrap(RF24& ref)
+{
+    bool result;
+    uint8_t pipe;
+
+    result = ref.available(&pipe);
+    return bp::make_tuple(result, pipe);
+}
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(txStandBy_wrap1, RF24::txStandBy, 0, 2)
+//BOOST_PYTHON_FUNCTION_OVERLOADS(txStandBy_wrap2, RF24::txStandBy, 1, 2)
+
+// ******************** enums **************************
+// from both RF24 and bcm2835
+// 
+
+BOOST_PYTHON_MODULE(RF24){
+
+#ifdef BCM2835_H
+    bp::enum_< RPiGPIOPin>("RPiGPIOPin")
+        .value("RPI_GPIO_P1_03", RPI_GPIO_P1_03)
+        .value("RPI_GPIO_P1_05", RPI_GPIO_P1_05)
+        .value("RPI_GPIO_P1_07", RPI_GPIO_P1_07)
+        .value("RPI_GPIO_P1_08", RPI_GPIO_P1_08)
+        .value("RPI_GPIO_P1_10", RPI_GPIO_P1_10)
+        .value("RPI_GPIO_P1_11", RPI_GPIO_P1_11)
+        .value("RPI_GPIO_P1_12", RPI_GPIO_P1_12)
+        .value("RPI_GPIO_P1_13", RPI_GPIO_P1_13)
+        .value("RPI_GPIO_P1_15", RPI_GPIO_P1_15)
+        .value("RPI_GPIO_P1_16", RPI_GPIO_P1_16)
+        .value("RPI_GPIO_P1_18", RPI_GPIO_P1_18)
+        .value("RPI_GPIO_P1_19", RPI_GPIO_P1_19)
+        .value("RPI_GPIO_P1_21", RPI_GPIO_P1_21)
+        .value("RPI_GPIO_P1_22", RPI_GPIO_P1_22)
+        .value("RPI_GPIO_P1_23", RPI_GPIO_P1_23)
+        .value("RPI_GPIO_P1_24", RPI_GPIO_P1_24)
+        .value("RPI_GPIO_P1_26", RPI_GPIO_P1_26)
+        .value("RPI_V2_GPIO_P1_03", RPI_V2_GPIO_P1_03)
+        .value("RPI_V2_GPIO_P1_05", RPI_V2_GPIO_P1_05)
+        .value("RPI_V2_GPIO_P1_07", RPI_V2_GPIO_P1_07)
+        .value("RPI_V2_GPIO_P1_08", RPI_V2_GPIO_P1_08)
+        .value("RPI_V2_GPIO_P1_10", RPI_V2_GPIO_P1_10)
+        .value("RPI_V2_GPIO_P1_11", RPI_V2_GPIO_P1_11)
+        .value("RPI_V2_GPIO_P1_12", RPI_V2_GPIO_P1_12)
+        .value("RPI_V2_GPIO_P1_13", RPI_V2_GPIO_P1_13)
+        .value("RPI_V2_GPIO_P1_15", RPI_V2_GPIO_P1_15)
+        .value("RPI_V2_GPIO_P1_16", RPI_V2_GPIO_P1_16)
+        .value("RPI_V2_GPIO_P1_18", RPI_V2_GPIO_P1_18)
+        .value("RPI_V2_GPIO_P1_19", RPI_V2_GPIO_P1_19)
+        .value("RPI_V2_GPIO_P1_21", RPI_V2_GPIO_P1_21)
+        .value("RPI_V2_GPIO_P1_22", RPI_V2_GPIO_P1_22)
+        .value("RPI_V2_GPIO_P1_23", RPI_V2_GPIO_P1_23)
+        .value("RPI_V2_GPIO_P1_24", RPI_V2_GPIO_P1_24)
+        .value("RPI_V2_GPIO_P1_26", RPI_V2_GPIO_P1_26)
+        .value("RPI_V2_GPIO_P5_03", RPI_V2_GPIO_P5_03)
+        .value("RPI_V2_GPIO_P5_04", RPI_V2_GPIO_P5_04)
+        .value("RPI_V2_GPIO_P5_05", RPI_V2_GPIO_P5_05)
+        .value("RPI_V2_GPIO_P5_06", RPI_V2_GPIO_P5_06)
+        .value("RPI_BPLUS_GPIO_J8_03", RPI_BPLUS_GPIO_J8_03)
+        .value("RPI_BPLUS_GPIO_J8_05", RPI_BPLUS_GPIO_J8_05)
+        .value("RPI_BPLUS_GPIO_J8_07", RPI_BPLUS_GPIO_J8_07)
+        .value("RPI_BPLUS_GPIO_J8_08", RPI_BPLUS_GPIO_J8_08)
+        .value("RPI_BPLUS_GPIO_J8_10", RPI_BPLUS_GPIO_J8_10)
+        .value("RPI_BPLUS_GPIO_J8_11", RPI_BPLUS_GPIO_J8_11)
+        .value("RPI_BPLUS_GPIO_J8_12", RPI_BPLUS_GPIO_J8_12)
+        .value("RPI_BPLUS_GPIO_J8_13", RPI_BPLUS_GPIO_J8_13)
+        .value("RPI_BPLUS_GPIO_J8_15", RPI_BPLUS_GPIO_J8_15)
+        .value("RPI_BPLUS_GPIO_J8_16", RPI_BPLUS_GPIO_J8_16)
+        .value("RPI_BPLUS_GPIO_J8_18", RPI_BPLUS_GPIO_J8_18)
+        .value("RPI_BPLUS_GPIO_J8_19", RPI_BPLUS_GPIO_J8_19)
+        .value("RPI_BPLUS_GPIO_J8_21", RPI_BPLUS_GPIO_J8_21)
+        .value("RPI_BPLUS_GPIO_J8_22", RPI_BPLUS_GPIO_J8_22)
+        .value("RPI_BPLUS_GPIO_J8_23", RPI_BPLUS_GPIO_J8_23)
+        .value("RPI_BPLUS_GPIO_J8_24", RPI_BPLUS_GPIO_J8_24)
+        .value("RPI_BPLUS_GPIO_J8_26", RPI_BPLUS_GPIO_J8_26)
+        .value("RPI_BPLUS_GPIO_J8_29", RPI_BPLUS_GPIO_J8_29)
+        .value("RPI_BPLUS_GPIO_J8_31", RPI_BPLUS_GPIO_J8_31)
+        .value("RPI_BPLUS_GPIO_J8_32", RPI_BPLUS_GPIO_J8_32)
+        .value("RPI_BPLUS_GPIO_J8_33", RPI_BPLUS_GPIO_J8_33)
+        .value("RPI_BPLUS_GPIO_J8_35", RPI_BPLUS_GPIO_J8_35)
+        .value("RPI_BPLUS_GPIO_J8_36", RPI_BPLUS_GPIO_J8_36)
+        .value("RPI_BPLUS_GPIO_J8_37", RPI_BPLUS_GPIO_J8_37)
+        .value("RPI_BPLUS_GPIO_J8_38", RPI_BPLUS_GPIO_J8_38)
+        .value("RPI_BPLUS_GPIO_J8_40", RPI_BPLUS_GPIO_J8_40)
+        .export_values()
+        ;
+
+    bp::enum_< bcm2835SPIClockDivider>("bcm2835SPIClockDivider")
+        .value("BCM2835_SPI_CLOCK_DIVIDER_65536", BCM2835_SPI_CLOCK_DIVIDER_65536)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_32768", BCM2835_SPI_CLOCK_DIVIDER_32768)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_16384", BCM2835_SPI_CLOCK_DIVIDER_16384)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_8192", BCM2835_SPI_CLOCK_DIVIDER_8192)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_4096", BCM2835_SPI_CLOCK_DIVIDER_4096)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_2048", BCM2835_SPI_CLOCK_DIVIDER_2048)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_1024", BCM2835_SPI_CLOCK_DIVIDER_1024)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_512", BCM2835_SPI_CLOCK_DIVIDER_512)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_256", BCM2835_SPI_CLOCK_DIVIDER_256)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_128", BCM2835_SPI_CLOCK_DIVIDER_128)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_64", BCM2835_SPI_CLOCK_DIVIDER_64)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_32", BCM2835_SPI_CLOCK_DIVIDER_32)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_16", BCM2835_SPI_CLOCK_DIVIDER_16)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_8", BCM2835_SPI_CLOCK_DIVIDER_8)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_4", BCM2835_SPI_CLOCK_DIVIDER_4)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_2", BCM2835_SPI_CLOCK_DIVIDER_2)
+        .value("BCM2835_SPI_CLOCK_DIVIDER_1", BCM2835_SPI_CLOCK_DIVIDER_1)
+        .export_values();
+
+
+    bp::enum_< bcm2835SPIChipSelect>("bcm2835SPIChipSelect")
+        .value("BCM2835_SPI_CS0", BCM2835_SPI_CS0)
+        .value("BCM2835_SPI_CS1", BCM2835_SPI_CS1)
+        .value("BCM2835_SPI_CS2", BCM2835_SPI_CS2)
+        .value("BCM2835_SPI_CS_NONE", BCM2835_SPI_CS_NONE)
+        .export_values();
+
+// exposing '#define's for SPI speed as this is needed for RF24 constructor
+    bp::scope().attr("BCM2835_SPI_SPEED_64MHZ") = BCM2835_SPI_SPEED_64MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_32MHZ") = BCM2835_SPI_SPEED_32MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_16MHZ") = BCM2835_SPI_SPEED_16MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_8MHZ") = BCM2835_SPI_SPEED_8MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_4MHZ") = BCM2835_SPI_SPEED_4MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_2MHZ") = BCM2835_SPI_SPEED_2MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_1MHZ") = BCM2835_SPI_SPEED_1MHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_512KHZ") = BCM2835_SPI_SPEED_512KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_256KHZ") = BCM2835_SPI_SPEED_256KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_128KHZ") = BCM2835_SPI_SPEED_128KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_64KHZ") = BCM2835_SPI_SPEED_64KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_32KHZ") = BCM2835_SPI_SPEED_32KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_16KHZ") = BCM2835_SPI_SPEED_16KHZ;
+    bp::scope().attr("BCM2835_SPI_SPEED_8KHZ") = BCM2835_SPI_SPEED_8KHZ;
+#endif  // BCM2835_H
+
+    bp::enum_< rf24_crclength_e>("rf24_crclength_e")
+        .value("RF24_CRC_DISABLED", RF24_CRC_DISABLED)
+        .value("RF24_CRC_8", RF24_CRC_8)
+        .value("RF24_CRC_16", RF24_CRC_16)
+        .export_values()
+        ;
+
+    bp::enum_< rf24_datarate_e>("rf24_datarate_e")
+        .value("RF24_1MBPS", RF24_1MBPS)
+        .value("RF24_2MBPS", RF24_2MBPS)
+        .value("RF24_250KBPS", RF24_250KBPS)
+        .export_values()
+        ;
+
+    bp::enum_< rf24_pa_dbm_e>("rf24_pa_dbm_e")
+        .value("RF24_PA_MIN", RF24_PA_MIN)
+        .value("RF24_PA_LOW", RF24_PA_LOW)
+        .value("RF24_PA_HIGH", RF24_PA_HIGH)
+        .value("RF24_PA_MAX", RF24_PA_MAX)
+        .value("RF24_PA_ERROR", RF24_PA_ERROR)
+        .export_values()
+        ;
+
+// ******************** RF24 class  **************************
+// 
+    bp::class_< RF24 >( "RF24", bp::init< uint8_t, uint8_t >(( bp::arg("_cepin"), bp::arg("_cspin") )) )    
+        .def( bp::init< uint8_t, uint8_t, uint32_t >(( bp::arg("_cepin"), bp::arg("_cspin"), bp::arg("spispeed") )) )    
+        .def("available", (bool ( ::RF24::* )(  ) )( &::RF24::available ) )
+        .def("available_pipe", &available_wrap )    // needed to rename this method as python does not allow such overloading
+        .def("begin", &RF24::begin)    
+        .def("closeReadingPipe", &RF24::closeReadingPipe)
+        .def("disableCRC", &RF24::disableCRC)    
+        .def("enableAckPayload", &RF24::enableAckPayload)
+        .def("enableDynamicAck", &RF24::enableDynamicAck)    
+        .def("enableDynamicPayloads", &RF24::enableDynamicPayloads)
+        .def("flush_tx", &RF24::flush_tx)
+        .def("getCRCLength", &RF24::getCRCLength)
+        .def("getDataRate", &RF24::getDataRate)
+        .def("getDynamicPayloadSize", &RF24::getDynamicPayloadSize)
+        .def("getPALevel", &RF24::getPALevel)
+        .def("isAckPayloadAvailable", &RF24::isAckPayloadAvailable)    
+        .def("isPVariant", &RF24::isPVariant)
+        .def("isValid", &RF24::isValid)
+        .def("maskIRQ", &RF24::maskIRQ, ( bp::arg("tx_ok"), bp::arg("tx_fail"), bp::arg("rx_ready")))    
+        .def("openReadingPipe", &openReadingPipe_wrap, (bp::arg("number"), bp::arg("address")))    
+        .def("openReadingPipe", (void ( ::RF24::* )( ::uint8_t,::uint64_t ) )( &::RF24::openReadingPipe), (bp::arg("number"), bp::arg("address")))    
+        .def("openWritingPipe", &openWritingPipe_wrap, (bp::arg("address")))    
+        .def("openWritingPipe", (void ( ::RF24::* )( ::uint64_t ) )( &::RF24::openWritingPipe), ( bp::arg("address") ) )    
+        .def("powerDown", &RF24::powerDown)    
+        .def("powerUp", &RF24::powerUp)    
+        .def("printDetails", &RF24::printDetails)
+        .def("reUseTX", &RF24::reUseTX)
+        .def("read", &read_wrap, (bp::arg("maxlen")))    
+        .def("rxFifoFull", &RF24::rxFifoFull)
+        .def("setAddressWidth", &RF24::setAddressWidth)
+        .def("setAutoAck", (void ( ::RF24::* )( bool ) )( &::RF24::setAutoAck ), ( bp::arg("enable") ) )    
+        .def("setAutoAck", (void ( ::RF24::* )( ::uint8_t,bool ) )( &::RF24::setAutoAck ), ( bp::arg("pipe"), bp::arg("enable") ) )    
+        .def("setCRCLength", &RF24::setCRCLength, ( bp::arg("length") ) )    
+        .def("setChannel", &RF24::setChannel, ( bp::arg("channel") ) )    
+        .def("setDataRate", &RF24::setDataRate, ( bp::arg("speed") ) )    
+        .def("setPALevel", &RF24::setPALevel, ( bp::arg("level") ) )    
+        .def("setRetries", &RF24::setRetries , (bp::arg("delay"), bp::arg("count")))    
+        .def("startFastWrite", &startFastWrite_wrap1, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast") ) )    
+        .def("startFastWrite", &startFastWrite_wrap2, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast"), bp::arg("startTx") ) )    
+        .def("startListening", &RF24::startListening)    
+        .def("startWrite", &startWrite_wrap, ( bp::arg("buf"), bp::arg("len"), bp::arg("multicast") ) )    
+        .def("stopListening", &RF24::stopListening)
+        .def("testCarrier", &RF24::testCarrier)
+        .def("testRPD", &RF24::testRPD)
+        .def("txStandBy", (bool ( ::RF24::* )( ::uint32_t,bool))(&RF24::txStandBy), txStandBy_wrap1( bp::args("timeout", "startTx") ) )
+        .def("whatHappened", &whatHappened_wrap)    
+        .def("write", &write_wrap1, ( bp::arg("buf") ) )    
+        .def("write", &write_wrap2, ( bp::arg("buf"), bp::arg("multicast") ) )    
+        .def("writeAckPayload", writeAckPayload_wrap, ( bp::arg("pipe"), bp::arg("buf") ) )    
+        .def("writeBlocking", &writeBlocking_wrap, ( bp::arg("buf"), bp::arg("timeout") ) )    
+        .def("writeFast", &writeFast_wrap1, ( bp::arg("buf") ) )    
+        .def("writeFast", &writeFast_wrap2, ( bp::arg("buf"), bp::arg("multicast") ) )    
+        .add_property("payloadSize", &RF24::getPayloadSize, &RF24::setPayloadSize)
+        .def_readwrite( "failureDetected", &RF24::failureDetected );
+}
diff --git a/lib/RF24/pyRF24/pyRF24/readme.md b/lib/RF24/pyRF24/pyRF24/readme.md
new file mode 100644
index 000000000..b58563de7
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24/readme.md
@@ -0,0 +1,2 @@
+Python Wrapper for RF24
+See http://tmrh20.github.io/RF24 for more information
diff --git a/lib/RF24/pyRF24/pyRF24/setup.py b/lib/RF24/pyRF24/pyRF24/setup.py
new file mode 100644
index 000000000..f8ace892a
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24/setup.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import setuptools
+import crossunixccompiler
+
+version = ''
+
+
+def process_configparams():
+    global version
+
+    with open('../Makefile.inc') as f:
+        config_lines = f.read().splitlines()
+
+    cflags = os.getenv("CFLAGS", "")
+    for line in config_lines:
+        identifier, value = line.split('=', 1)
+        if identifier == "CPUFLAGS":
+            cflags += " " + value
+        elif identifier == "HEADER_DIR":
+            cflags += " -I" + os.path.dirname(value)
+        elif identifier == "LIB_DIR":
+            cflags += " -L" + value
+        elif identifier == "LIB_VERSION":
+            version = value
+        elif identifier in ("CC", "CXX"):
+            os.environ[identifier] = value
+
+    os.environ["CFLAGS"] = cflags
+
+
+if sys.version_info >= (3,):
+    BOOST_LIB = 'boost_python3'
+else:
+    BOOST_LIB = 'boost_python'
+
+process_configparams()
+crossunixccompiler.register()
+
+module_RF24 = setuptools.Extension('RF24',
+                                   libraries=['rf24', BOOST_LIB],
+                                   sources=['pyRF24.cpp'])
+
+setuptools.setup(name='RF24',
+                 version=version,
+                 ext_modules=[module_RF24])
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/example_master.py b/lib/RF24/pyRF24/pyRF24Mesh/example_master.py
new file mode 100644
index 000000000..43b94c45e
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Mesh/example_master.py
@@ -0,0 +1,22 @@
+from RF24 import *
+from RF24Network import *
+from RF24Mesh import *
+
+
+# radio setup for RPi B Rev2: CS0=Pin 24
+radio = RF24(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ)
+network = RF24Network(radio)
+mesh = RF24Mesh(radio, network)
+
+mesh.setNodeID(0)
+mesh.begin(108, RF24_250KBPS)
+radio.setPALevel(RF24_PA_MAX) # Power Amplifier
+radio.printDetails()
+
+while 1:
+    mesh.update()
+    mesh.DHCP()
+
+    while network.available():
+        print("Received message")
+        header, payload = network.read(10)
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp b/lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
new file mode 100644
index 000000000..26f6afccd
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
@@ -0,0 +1,105 @@
+#include "boost/python.hpp"
+#include "RF24/RF24.h"
+#include "RF24Network/RF24Network.h"
+#include "RF24Mesh/RF24Mesh.h"
+
+namespace bp = boost::python;
+
+
+// ******************** explicit wrappers **************************
+// where needed, especially where buffer is involved
+
+void throw_ba_exception(void)
+{
+    PyErr_SetString(PyExc_TypeError, "buf parameter must be bytes or bytearray");
+    bp::throw_error_already_set();
+}
+
+char *get_bytes_or_bytearray_str(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_AsString(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_AsString(py_ba);
+    else
+        throw_ba_exception();
+    return NULL;
+}
+
+int get_bytes_or_bytearray_ln(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_Size(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_Size(py_ba);
+    else
+        throw_ba_exception();
+    return 0;
+}
+
+bool write_wrap1(RF24Mesh& ref, bp::object buf, uint8_t msg_type)
+{
+	return ref.write(get_bytes_or_bytearray_str(buf), msg_type, get_bytes_or_bytearray_ln(buf));
+}
+
+bool write_wrap2(RF24Mesh& ref, bp::object buf, uint8_t msg_type, uint8_t nodeID)
+{
+	return ref.write(get_bytes_or_bytearray_str(buf), msg_type, get_bytes_or_bytearray_ln(buf), nodeID);
+}
+
+bool write_to_node_wrap(RF24Mesh& ref, uint16_t to_node,  bp::object buf, uint8_t msg_type)
+{
+	return ref.write(to_node, get_bytes_or_bytearray_str(buf), msg_type, get_bytes_or_bytearray_ln(buf));
+}
+
+// ******************** overload wrappers **************************
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(begin_overload, RF24Mesh::begin, 0, 3)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getNodeID_overload, RF24Mesh::getNodeID, 0, 1)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(renewAddress_overload, RF24Mesh::renewAddress, 0, 1)
+
+// ******************** RF24Mesh exposed  **************************
+BOOST_PYTHON_MODULE(RF24Mesh)
+{
+    { //::RF24Mesh
+        bp::class_<RF24Mesh>("RF24Mesh", bp::init<RF24&, RF24Network&>((bp::arg("_radio"), bp::arg("_network"))))
+            //bool begin(uint8_t channel = MESH_DEFAULT_CHANNEL, rf24_datarate_e data_rate = RF24_1MBPS, uint32_t timeout=MESH_RENEWAL_TIMEOUT );
+            .def("begin", &RF24Mesh::begin, begin_overload(bp::args("channel", "data_rate", "timeout")))
+            //uint8_t update();
+            .def("update", &RF24Mesh::update)
+            //bool write(const void* data, uint8_t msg_type, size_t size, uint8_t nodeID=0);
+            .def("write", &write_wrap1, (bp::arg("data"), bp::arg("msg_type")))
+            .def("write", &write_wrap2, (bp::arg("data"), bp::arg("msg_type"), bp::arg("nodeID")))
+            //bool write(uint16_t to_node, const void* data, uint8_t msg_type, size_t size );
+            .def("write", &write_to_node_wrap, (bp::arg("to_node"), bp::arg("data"), bp::arg("msg_type"), bp::arg("size")))
+            //void setNodeID(uint8_t nodeID);
+            .def("setNodeID", &RF24Mesh::setNodeID, (bp::arg("nodeID")))
+            //void DHCP();
+            .def("DHCP", &RF24Mesh::DHCP)
+            //int16_t getNodeID(uint16_t address=MESH_BLANK_ID);
+            .def("getNodeID", &RF24Mesh::getNodeID, getNodeID_overload(bp::args("address")))
+            //bool checkConnection();
+            .def("checkConnection", &RF24Mesh::checkConnection)
+            //uint16_t renewAddress(uint32_t timeout=MESH_RENEWAL_TIMEOUT);
+            .def("renewAddress", &RF24Mesh::renewAddress, getNodeID_overload(bp::args("timeout")))
+            //bool releaseAddress();
+            .def("releaseAddress", &RF24Mesh::releaseAddress)
+            //int16_t getAddress(uint8_t nodeID);
+            .def("getAddress", &RF24Mesh::getAddress, (bp::arg("nodeID")))
+            //void setChannel(uint8_t _channel);
+            .def("setChannel", &RF24Mesh::setChannel, (bp::arg("_channel")))
+            //void setChild(bool allow);
+            .def("setChild", &RF24Mesh::setChild, (bp::arg("allow")))
+            //void setAddress(uint8_t nodeID, uint16_t address);
+            .def("setAddress", &RF24Mesh::setAddress, (bp::arg("nodeID"), bp::arg("address")))
+            //void saveDHCP();
+            .def("saveDHCP", &RF24Mesh::saveDHCP)
+            //void loadDHCP();
+            .def("loadDHCP", &RF24Mesh::loadDHCP)
+            //void setStaticAddress(uint8_t nodeID, uint16_t address);
+            .def("setStaticAddress", &RF24Mesh::setStaticAddress, (bp::arg("nodeID"), bp::arg("address")));
+    }
+}
\ No newline at end of file
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/setup.py b/lib/RF24/pyRF24/pyRF24Mesh/setup.py
new file mode 100644
index 000000000..8d5eb7213
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Mesh/setup.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from distutils.core import setup, Extension
+import sys
+
+if sys.version_info >= (3,): 
+    BOOST_LIB = 'boost_python3' 
+else: 
+    BOOST_LIB = 'boost_python' 
+
+module_RF24Mesh = Extension('RF24Mesh',
+            libraries = ['rf24mesh', 'rf24network', BOOST_LIB],
+            sources = ['pyRF24Mesh.cpp'])
+
+setup(name='RF24Mesh',
+    version='1.0',
+    ext_modules=[module_RF24Mesh])
diff --git a/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py b/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
new file mode 100644
index 000000000..09a8bf7f2
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+#
+# Simplest possible example of using RF24Network,
+#
+#  RECEIVER NODE
+#  Listens for messages from the transmitter and prints them out.
+#
+from __future__ import print_function
+import time
+from struct import *
+from RF24 import *
+from RF24Network import *
+
+# CE Pin, CSN Pin, SPI Speed
+
+# Setup for GPIO 22 CE and GPIO 25 CSN with SPI Speed @ 1Mhz
+#radio = radio(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_18, BCM2835_SPI_SPEED_1MHZ)
+
+# Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ)
+
+# Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_8MHZ)
+
+# Setup for GPIO 22 CE and CE0 CSN for RPi B+ with SPI Speed @ 8Mhz
+#radio = RF24(RPI_BPLUS_GPIO_J8_22, RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ)
+
+radio = RF24(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ)
+network = RF24Network(radio)
+
+millis = lambda: int(round(time.time() * 1000))
+octlit = lambda n:int(n, 8)
+
+# Address of our node in Octal format (01, 021, etc)
+this_node = octlit("00")
+
+# Address of the other node
+other_node = octlit("01")
+
+radio.begin()
+time.sleep(0.1)
+network.begin(90, this_node)    # channel 90
+radio.printDetails()
+packets_sent = 0
+last_sent = 0
+
+while 1:
+    network.update()
+    while network.available():
+        header, payload = network.read(8)
+        print("payload length ", len(payload))
+        ms, number = unpack('<LL', bytes(payload))
+        print('Received payload ', number, ' at ', ms, ' from ', oct(header.from_node))
+    time.sleep(1)
+
diff --git a/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py b/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
new file mode 100644
index 000000000..fe73e3d2e
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+#
+# Simplest possible example of using RF24Network,
+#
+#  TRANSMITTER NODE
+#  Sends messages from to receiver.
+#
+from __future__ import print_function
+import time
+from struct import *
+from RF24 import *
+from RF24Network import *
+
+# CE Pin, CSN Pin, SPI Speed
+
+# Setup for GPIO 22 CE and GPIO 25 CSN with SPI Speed @ 1Mhz
+#radio = radio(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_18, BCM2835_SPI_SPEED_1MHZ)
+
+# Setup for GPIO 22 CE and CE0 CSN with SPI Speed @ 4Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_4MHZ)
+
+# Setup for GPIO 22 CE and CE1 CSN with SPI Speed @ 8Mhz
+#radio = RF24(RPI_V2_GPIO_P1_15, BCM2835_SPI_CS0, BCM2835_SPI_SPEED_8MHZ)
+
+# Setup for GPIO 22 CE and CE0 CSN for RPi B+ with SPI Speed @ 8Mhz
+#radio = RF24(RPI_BPLUS_GPIO_J8_22, RPI_BPLUS_GPIO_J8_24, BCM2835_SPI_SPEED_8MHZ)
+
+radio = RF24(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ)
+network = RF24Network(radio)
+
+millis = lambda: int(round(time.time() * 1000)) & 0xffffffff
+octlit = lambda n:int(n, 8)
+
+# Address of our node in Octal format (01,021, etc)
+this_node = octlit("01")
+
+# Address of the other node
+other_node = octlit("00")
+
+#ms -  How long to wait before sending the next message
+interval = 2000
+
+radio.begin()
+time.sleep(0.1);
+network.begin(90, this_node)    # channel 90
+radio.printDetails()
+packets_sent = 0
+last_sent = 0
+
+while 1:
+    network.update()
+    now = millis()
+    # If it's time to send a message, send it!
+    if ( now - last_sent >= interval  ):
+        last_sent = now
+        print('Sending ..')
+        payload = pack('<LL', millis(), packets_sent )
+        packets_sent += 1
+        ok = network.write(RF24NetworkHeader(other_node), payload)
+        if ok:
+            print('ok.')
+        else:
+            print('failed.')
diff --git a/lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp b/lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
new file mode 100644
index 000000000..7a5ac33ca
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
@@ -0,0 +1,143 @@
+#include "boost/python.hpp"
+#include "RF24/RF24.h"
+#include "RF24Network/RF24Network.h"
+
+namespace bp = boost::python;
+
+// **************** expicit wrappers *****************
+// where needed, especially where buffer is involved
+//
+void throw_ba_exception(void)
+{
+    PyErr_SetString(PyExc_TypeError, "buf parameter must be bytes or bytearray");
+    bp::throw_error_already_set();
+}
+
+char *get_bytes_or_bytearray_str(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_AsString(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_AsString(py_ba);
+    else
+        throw_ba_exception();
+    return NULL;
+}
+
+int get_bytes_or_bytearray_ln(bp::object buf)
+{
+    PyObject *py_ba;
+    py_ba = buf.ptr();
+    if (PyByteArray_Check(py_ba))
+        return PyByteArray_Size(py_ba);
+    else if (PyBytes_Check(py_ba))
+        return PyBytes_Size(py_ba);
+    else
+        throw_ba_exception();
+    return 0;
+}
+
+bp::tuple read_wrap(RF24Network& ref, size_t maxlen)
+{
+	char *buf = new char[maxlen+1];
+	RF24NetworkHeader header;
+
+	uint16_t len = ref.read(header, buf, maxlen);
+    bp::object py_ba(bp::handle<>(PyByteArray_FromStringAndSize(buf, len)));
+    delete[] buf;
+	
+	return bp::make_tuple(header, py_ba);
+}
+
+bool write_wrap(RF24Network& ref, RF24NetworkHeader& header, bp::object buf)
+{
+	return ref.write(header, get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
+}
+
+std::string toString_wrap(RF24NetworkHeader& ref)
+{
+	return std::string(ref.toString());
+}
+
+
+// **************** RF24Network exposed  *****************
+//
+BOOST_PYTHON_MODULE(RF24Network){
+    { //::RF24Network
+        typedef bp::class_< RF24Network > RF24Network_exposer_t;
+        RF24Network_exposer_t RF24Network_exposer = RF24Network_exposer_t( "RF24Network", bp::init< RF24 & >(( bp::arg("_radio") )) );
+        bp::scope RF24Network_scope( RF24Network_exposer );
+        bp::implicitly_convertible< RF24 &, RF24Network >();
+        { //::RF24Network::available
+        
+            typedef bool ( ::RF24Network::*available_function_type )(  ) ;
+            
+            RF24Network_exposer.def( 
+                "available"
+                , available_function_type( &::RF24Network::available ) );
+        
+        }
+        { //::RF24Network::begin
+        
+            typedef void ( ::RF24Network::*begin_function_type )( ::uint8_t,::uint16_t ) ;
+            
+            RF24Network_exposer.def( 
+                "begin"
+                , begin_function_type( &::RF24Network::begin )
+                , ( bp::arg("_channel"), bp::arg("_node_address") ) );
+        
+        }
+        { //::RF24Network::parent
+        
+            typedef ::uint16_t ( ::RF24Network::*parent_function_type )(  ) const;
+            
+            RF24Network_exposer.def( 
+                "parent"
+                , parent_function_type( &::RF24Network::parent ) );
+        
+        }
+        { //::RF24Network::read
+        
+            typedef bp::tuple ( *read_function_type )(::RF24Network&, size_t ) ;
+            
+            RF24Network_exposer.def( 
+                "read"
+                //, read_function_type( &::RF24Network::read )
+                , read_function_type( &read_wrap )
+                , ( bp::arg("maxlen") ) );
+        
+        }
+        { //::RF24Network::update
+        
+            typedef void ( ::RF24Network::*update_function_type )(  ) ;
+            
+            RF24Network_exposer.def( 
+                "update"
+                , update_function_type( &::RF24Network::update ) );
+        
+        }
+        { //::RF24Network::write
+        
+            typedef bool ( *write_function_type )( ::RF24Network&, ::RF24NetworkHeader&, bp::object ) ;
+            
+            RF24Network_exposer.def("write", write_function_type( &write_wrap ), ( bp::arg("header"), bp::arg("buf") ) );
+        
+        }
+        RF24Network_exposer.def_readwrite( "txTimeout", &RF24Network::txTimeout );
+    }
+
+// **************** RF24NetworkHeader exposed  *****************
+//
+    bp::class_< RF24NetworkHeader >( "RF24NetworkHeader", bp::init< >() )    
+        .def( bp::init< uint16_t, bp::optional< unsigned char > >(( bp::arg("_to"), bp::arg("_type")=(unsigned char)(0) )) )    
+        .def("toString", &toString_wrap )    
+        .def_readwrite( "from_node", &RF24NetworkHeader::from_node )    
+        .def_readwrite( "id", &RF24NetworkHeader::id )    
+        .def_readwrite( "next_id", RF24NetworkHeader::next_id )    
+        .def_readwrite( "reserved", &RF24NetworkHeader::reserved )    
+        .def_readwrite( "to_node", &RF24NetworkHeader::to_node )    
+        .def_readwrite( "type", &RF24NetworkHeader::type );
+}
+
diff --git a/lib/RF24/pyRF24/pyRF24Network/setup.py b/lib/RF24/pyRF24/pyRF24Network/setup.py
new file mode 100644
index 000000000..adaea150d
--- /dev/null
+++ b/lib/RF24/pyRF24/pyRF24Network/setup.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+from distutils.core import setup, Extension
+import sys
+
+if sys.version_info >= (3,): 
+    BOOST_LIB = 'boost_python3' 
+else: 
+    BOOST_LIB = 'boost_python' 
+
+module_RF24Network = Extension('RF24Network',
+            libraries = ['rf24network', BOOST_LIB],
+            sources = ['pyRF24Network.cpp'])
+
+setup(name='RF24Network',
+    version='1.0',
+    ext_modules=[module_RF24Network]
+      )
diff --git a/lib/RF24/pyRF24/readme.md b/lib/RF24/pyRF24/readme.md
new file mode 100644
index 000000000..b58563de7
--- /dev/null
+++ b/lib/RF24/pyRF24/readme.md
@@ -0,0 +1,2 @@
+Python Wrapper for RF24
+See http://tmrh20.github.io/RF24 for more information
diff --git a/lib/RF24/pyRF24/setup.py b/lib/RF24/pyRF24/setup.py
new file mode 100644
index 000000000..f8ace892a
--- /dev/null
+++ b/lib/RF24/pyRF24/setup.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import setuptools
+import crossunixccompiler
+
+version = ''
+
+
+def process_configparams():
+    global version
+
+    with open('../Makefile.inc') as f:
+        config_lines = f.read().splitlines()
+
+    cflags = os.getenv("CFLAGS", "")
+    for line in config_lines:
+        identifier, value = line.split('=', 1)
+        if identifier == "CPUFLAGS":
+            cflags += " " + value
+        elif identifier == "HEADER_DIR":
+            cflags += " -I" + os.path.dirname(value)
+        elif identifier == "LIB_DIR":
+            cflags += " -L" + value
+        elif identifier == "LIB_VERSION":
+            version = value
+        elif identifier in ("CC", "CXX"):
+            os.environ[identifier] = value
+
+    os.environ["CFLAGS"] = cflags
+
+
+if sys.version_info >= (3,):
+    BOOST_LIB = 'boost_python3'
+else:
+    BOOST_LIB = 'boost_python'
+
+process_configparams()
+crossunixccompiler.register()
+
+module_RF24 = setuptools.Extension('RF24',
+                                   libraries=['rf24', BOOST_LIB],
+                                   sources=['pyRF24.cpp'])
+
+setuptools.setup(name='RF24',
+                 version=version,
+                 ext_modules=[module_RF24])
diff --git a/lib/RF24/tests/README b/lib/RF24/tests/README
new file mode 100644
index 000000000..43ceaf540
--- /dev/null
+++ b/lib/RF24/tests/README
@@ -0,0 +1,7 @@
+The sketches in this directory are intended to be checkin tests.
+No code should be pushed to github without these tests passing.
+
+See "runtests.sh" script inside each sketch dir.  This script is fully compatible with
+git bisest.
+
+Note that this requires python and py-serial
diff --git a/lib/RF24/tests/native/Jamfile b/lib/RF24/tests/native/Jamfile
new file mode 100644
index 000000000..10d0336cc
--- /dev/null
+++ b/lib/RF24/tests/native/Jamfile
@@ -0,0 +1,300 @@
+PROJECT_NAME 	= $(PWD:B) ;
+PROJECT_DIR 	= . ;
+PROJECT_LIBS 	= RF24 ;
+
+OUT_DIR 	= ojam ;
+F_CPU 		= 16000000 ;
+MCU             = atmega328p ;
+PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
+
+UPLOAD_RATE 	= 57600 ;
+AVRDUDE_PROTOCOL = stk500v1 ;
+COM 		= 33 ;
+
+# Host-specific overrides for locations 
+if $(OS) = MACOSX 
+{
+ARDUINO_VERSION	= 22 ;
+OLD_DIR 	= /opt/arduino-0021 ;
+AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+ARDUINO_DIR 	= /opt/Arduino ;
+ARDUINO_AVR 	= /usr/lib/avr/include ;
+}
+
+# Where is everything?
+ARDUINO_VERSION	?= 22 ;
+SKETCH_DIR      = $(HOME)/Source/Arduino ;
+AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
+AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(SKETCH_DIR)/libraries ;
+AVR_AS  	= $(AVR_TOOLS_PATH)/avr-as ;
+AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
+AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
+AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
+AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
+
+DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H HAL=1 ;
+CTUNING  	= -ffunction-sections -fdata-sections ;
+CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+ASFLAGS  	= -mmcu=$(MCU) ; 
+CFLAGS  	= -Os -Wall -Wextra $(ASFLAGS) $(CTUNING) ;
+CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+
+# Search everywhere for headers
+HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
+HDRS  	 	+= [ GLOB $(HDRS) : utility ] ;
+
+# Grab everything from the core directory
+CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# In addition to explicitly-specified program modules, pick up anything from the current
+# dir.
+PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
+
+# Shortcut for the out files
+OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+
+# AvrDude setup
+AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
+
+rule GitVersion
+{
+  Always $(<) ;
+  Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+  echo "const char program_version[] = \"\\" > $(<)
+  git log -1 --pretty=format:%h >> $(<)
+  echo "\";" >> $(<)
+}
+
+# GitVersion version.h ;
+
+rule AvrAsm
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrAsm
+{
+  $(AVR_AS) $(ASFLAGS) -o $(<) $(>) 
+}
+
+rule AvrCc
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrCc
+{
+  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
+}
+
+rule AvrC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrC++
+{
+  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule AvrAsmFromC++
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+
+  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
+  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+}
+
+actions AvrAsmFromC++
+{
+  $(AVR_CXX) -S -fverbose-asm -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
+}
+
+rule Pde
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Clean clean : $(<) ;
+}
+
+actions Pde
+{
+  echo "#include <WProgram.h>" > $(<) 
+  echo "#line 1 \"$(>)\"" >> $(<)
+  cat $(>) >> $(<) 
+}
+
+rule AvrPde
+{
+  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  AvrC++ $(<) : $(_CPP) ;
+}
+
+rule AvrObject
+{
+  switch $(>:S)
+  {
+    case .S :   AvrAsm $(<) : $(>) ;
+    case .c :   AvrCc $(<) : $(>) ;
+    case .cpp : AvrC++ $(<) : $(>) ;
+    case .pde : AvrPde $(<) : $(>) ;
+  }
+}
+
+rule AvrObjects
+{
+  for _I in $(<) 
+  {
+    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+  }
+}
+
+rule AvrMainFromObjects
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  MkDir $(<:D) ;
+  Depends all : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrMainFromObjects
+{
+  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
+}
+
+rule AvrMain
+{
+  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
+  AvrObjects $(>) ;
+}
+
+rule AvrHex
+{
+  Depends $(<) : $(>) ;
+  Depends $(<) : $(<:D) ;
+  Depends hex : $(<) ;
+  Clean clean : $(<) ;
+}
+
+actions AvrHex
+{
+  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule AvrUpload
+{
+  Depends $(1) : $(2) ;
+  Depends $(2) : $(3) ;
+  NotFile $(1) ;
+  Always $(1) ;
+  Always $(2) ;
+  AvrUploadAction $(2) : $(3) ;
+}
+
+actions AvrUploadAction
+{
+  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES)
+AvrHex $(OUT).hex : $(OUT).elf ;
+
+AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+
+#
+# Native
+#
+
+OUT_DIR_NATIVE 	= out_native ;
+OUT_NATIVE      = $(OUT_DIR_NATIVE)/$(PROJECT_NAME) ;
+NATIVE_CORE    = $(SKETCH_DIR)/hardware/native ;
+HDRS = $(NATIVE_CORE) $(HDRS) ;
+NATIVE_CORE_MODULES = [ GLOB $(NATIVE_CORE) : *.c *.cpp ] ;
+NATIVE_MODULES  = ; 
+DEFINES += NATIVE ;
+
+rule NativePde
+{
+  local _CPP = $(OUT_DIR_NATIVE)/$(_I:B).cpp ;
+  Pde $(_CPP) : $(>) ;
+  C++ $(<) : $(_CPP) ;
+}
+
+rule UserObject
+{
+  switch $(>)
+  {
+  case *.pde : NativePde $(<) : $(>) ;
+  }
+} 
+
+rule Objects
+{
+  for _I in $(<) 
+  {
+    local _O = $(OUT_DIR_NATIVE)/$(_I:B).o ;
+    Object $(_O) : $(_I) ;
+  }
+}
+
+rule Main
+{
+  MainFromObjects $(<) : $(OUT_DIR_NATIVE)/$(>:B).o ;
+  Objects $(>) ;
+}
+
+actions C++
+{
+  c++ -c -o $(<) $(CCHDRS) $(CCDEFS) $(>) 
+}
+
+actions Link 
+{
+  c++  -o $(<) $(>) 
+}
+
+
+
+MkDir $(OUT_DIR_NATIVE) ;
+Depends $(OUT_NATIVE) : $(OUT_DIR_NATIVE) ;
+Main $(OUT_NATIVE) : $(NATIVE_CORE_MODULES) $(NATIVE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+
+Depends native : $(OUT_NATIVE) ;
+
diff --git a/lib/RF24/tests/native/pingpair_irq.pde b/lib/RF24/tests/native/pingpair_irq.pde
new file mode 100644
index 000000000..9d54e72c3
--- /dev/null
+++ b/lib/RF24/tests/native/pingpair_irq.pde
@@ -0,0 +1,223 @@
+/*
+ Copyright (C) 2011 James Coliz, Jr. <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Interrupt-driven test for native target
+ *
+ * This example is the friendliest for the native target because it doesn't do
+ * any polling.  Made a slight change to call done() at the end of setup.
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 8 & 9
+
+RF24 radio(8,9);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const short role_pin = 7;
+
+//
+// Topology
+//
+
+// Single radio pipe address for the 2 nodes to communicate.
+const uint64_t pipe = 0xE8E8F0F0E1LL;
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes in this
+// system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_sender = 1, role_receiver } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Sender", "Receiver"};
+
+// The role of the current running sketch
+role_e role;
+
+// Interrupt handler, check the radio because we got an IRQ
+void check_radio(void);
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_sender;
+  else
+    role = role_receiver;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\n\rRF24/examples/pingpair_irq/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  // We will be using the Ack Payload feature, so please enable it
+  radio.enableAckPayload();
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens a single pipe for these two nodes to communicate
+  // back and forth.  One listens on it, the other talks to it.
+
+  if ( role == role_sender )
+  {
+    radio.openWritingPipe(pipe);
+  }
+  else
+  {
+    radio.openReadingPipe(1,pipe);
+  }
+
+  //
+  // Start listening
+  //
+
+  if ( role == role_receiver )
+    radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+
+  //
+  // Attach interrupt handler to interrupt #0 (using pin 2)
+  // on BOTH the sender and receiver
+  //
+
+  attachInterrupt(0, check_radio, FALLING);
+
+  //
+  // On the native target, this is as far as we get
+  //
+#if NATIVE
+  done();
+#endif
+}
+
+static uint32_t message_count = 0;
+
+void loop(void)
+{
+  //
+  // Sender role.  Repeatedly send the current time
+  //
+
+  if (role == role_sender)
+  {
+    // Take the time, and send it.
+    unsigned long time = millis();
+    printf("Now sending %lu\n\r",time);
+    radio.startWrite( &time, sizeof(unsigned long) );
+
+    // Try again soon
+    delay(2000);
+  }
+
+  //
+  // Receiver role: Does nothing!  All the work is in IRQ
+  //
+
+}
+
+void check_radio(void)
+{
+  // What happened?
+  bool tx,fail,rx;
+  radio.whatHappened(tx,fail,rx);
+
+  // Have we successfully transmitted?
+  if ( tx )
+  {
+    if ( role == role_sender )
+      printf("Send:OK\n\r");
+
+    if ( role == role_receiver )
+      printf("Ack Payload:Sent\n\r");
+  }
+
+  // Have we failed to transmit?
+  if ( fail )
+  {
+    if ( role == role_sender )
+      printf("Send:Failed\n\r");
+
+    if ( role == role_receiver )
+      printf("Ack Payload:Failed\n\r");
+  }
+
+  // Transmitter can power down for now, because
+  // the transmission is done.
+  if ( ( tx || fail ) && ( role == role_sender ) )
+    radio.powerDown();
+
+  // Did we receive a message?
+  if ( rx )
+  {
+    // If we're the sender, we've received an ack payload
+    if ( role == role_sender )
+    {
+      radio.read(&message_count,sizeof(message_count));
+      printf("Ack:%lu\n\r",(unsigned long)message_count);
+    }
+
+    // If we're the receiver, we've received a time message
+    if ( role == role_receiver )
+    {
+      // Get this payload and dump it
+      static unsigned long got_time;
+      radio.read( &got_time, sizeof(got_time) );
+      printf("Got payload %lu\n\r",got_time);
+
+      // Add an ack packet for the next time around.  This is a simple
+      // packet counter
+      radio.writeAckPayload( 1, &message_count, sizeof(message_count) );
+      ++message_count;
+    }
+  }
+}
+
+// vim:ai:cin:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/tests/native/printf.h b/lib/RF24/tests/native/printf.h
new file mode 100644
index 000000000..df6c46ae3
--- /dev/null
+++ b/lib/RF24/tests/native/printf.h
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2011 James Coliz, Jr. <maniacbug@ymail.com>
+ 
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+ 
+/**
+ * @file printf.h
+ *
+ * Setup necessary to direct stdout to the Arduino Serial library, which
+ * enables 'printf'
+ */
+
+#ifndef __PRINTF_H__
+#define __PRINTF_H__
+
+#include "WProgram.h"
+
+int serial_putc( char c, FILE * ) 
+{
+  Serial.write( c );
+
+  return c;
+} 
+
+void printf_begin(void)
+{
+  fdevopen( &serial_putc, 0 );
+}
+
+#endif // __PRINTF_H__
diff --git a/lib/RF24/tests/pingpair_blocking/Jamfile b/lib/RF24/tests/pingpair_blocking/Jamfile
new file mode 100644
index 000000000..18244ec84
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/Jamfile
@@ -0,0 +1,219 @@
+# (1) Project Information
+
+PROJECT_LIBS 	= SPI RF24 ; 
+PROJECT_DIRS	= $(PWD) ;
+
+# (2) Board Information
+
+UPLOAD_PROTOCOL ?= arduino ;
+UPLOAD_SPEED 	?= 115200 ;
+MCU		?= atmega328p ;
+F_CPU 		?= 16000000 ;
+CORE		?= arduino ;
+VARIANT 	?= standard ;
+ARDUINO_VERSION	?= 100 ;
+
+# (3) USB Ports
+
+PORTS		= p4 p6 p9 u0 u1 u2 ;
+PORT_p6 	= /dev/tty.usbserial-A600eHIs ;
+PORT_p4 	= /dev/tty.usbserial-A40081RP ;
+PORT_p9		= /dev/tty.usbserial-A9007LmI ;
+PORT_u0 	= /dev/ttyUSB0 ;
+PORT_u1 	= /dev/ttyUSB1 ;
+PORT_u2 	= /dev/ttyUSB2 ;
+
+# (4) Location of AVR tools
+#
+# This configuration assumes using avr-tools that were obtained separate from the Arduino
+# distribution. 
+
+if $(OS) = MACOSX 
+{
+	AVR_BIN 	?= /usr/local/avrtools/bin ;
+	AVR_ETC 	= /usr/local/avrtools/etc ;
+	AVR_INCLUDE	= /usr/local/avrtools/include ; 
+}
+else
+{
+	AVR_BIN 	?= /usr/bin ;
+	AVR_INCLUDE 	= /usr/lib/avr/include ;
+	AVR_ETC 	= /etc ; 
+}
+
+# (5) Directories where Arduino core and libraries are located
+
+ARDUINO_DIR 	?= /opt/Arduino ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/$(CORE) $(ARDUINO_DIR)/hardware/arduino/variants/$(VARIANT) ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+
+#
+# --------------------------------------------------
+# Below this line usually never needs to be modified 
+#
+
+# Tool locations
+
+CC	  	= $(AVR_BIN)/avr-gcc ;
+C++	 	= $(AVR_BIN)/avr-g++ ;
+LINK	  	= $(AVR_BIN)/avr-gcc ;
+AR		= $(AVR_BIN)/avr-ar rcs ;
+RANLIB		= ;
+OBJCOPY 	= $(AVR_BIN)/avr-objcopy ;
+AVRDUDE 	?= $(AVR_BIN)/avrdude ;
+
+# Flags
+
+DEFINES  	+= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+OPTIM		= -Os ;
+CCFLAGS  	= -Wall -Wextra -Wno-strict-aliasing -mmcu=$(MCU) -ffunction-sections -fdata-sections ;
+C++FLAGS  	= $(CCFLAGS) -fno-exceptions -fno-strict-aliasing ;
+LINKFLAGS  	= $(OPTIM) -lm -Wl,--gc-sections -mmcu=$(MCU) ;
+AVRDUDEFLAGS	= -V -F -D -C $(AVR_ETC)/avrdude.conf -p $(MCU) -c $(UPLOAD_PROTOCOL) -b $(UPLOAD_SPEED) ;
+
+# Search everywhere for headers
+
+HDRS  	 	= $(PROJECT_DIRS) $(AVR_INCLUDE) $(ARDUINO_CORE) $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) ;
+
+# Output locations
+
+LOCATE_TARGET	= $(F_CPU) ;
+LOCATE_SOURCE	= $(F_CPU) ;
+
+#
+# Custom rules
+#
+
+rule GitVersion
+{
+	Always $(<) ;
+	Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+	echo "const char program_version[] = \"\\" > $(<)
+	git log -1 --pretty=format:%h >> $(<)
+	echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule Pde
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
+	Clean clean : $(<) ;
+}
+
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
+}
+
+actions Pde
+{
+	echo "#include <$(ARDUINO_H)>" > $(<) 
+	echo "#line 1 \"$(>)\"" >> $(<)
+	cat $(>) >> $(<) 
+}
+
+rule C++Pde
+{
+	local _CPP = $(>:B).cpp ;
+	Pde $(_CPP) : $(>) ;
+	C++ $(<) : $(_CPP) ;
+}
+
+rule UserObject
+{
+	switch $(>:S)
+	{
+		case .ino : C++Pde $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
+	}
+}
+
+rule Objects
+{
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
+        {
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
+        }
+}
+
+rule Library
+{
+	LibraryFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+	Objects $(>) ;
+}
+
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+rule Hex
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends hex : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Hex
+{
+	$(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule Upload
+{
+	Depends $(1) : $(2) ;
+	Depends $(2) : $(3) ;
+	NotFile $(1) ;
+	Always $(1) ;
+	Always $(2) ;
+	UploadAction $(2) : $(3) ;
+}
+
+actions UploadAction
+{
+	$(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+rule Arduino
+{
+	LINKFLAGS on $(<) = $(LINKFLAGS) -Wl,-Map=$(LOCATE_TARGET)/$(<:B).map ;
+	Main $(<) : $(>) ;
+	LinkLibraries $(<) : core libs ;
+	Hex $(<:B).hex : $(<) ;
+	for _p in $(PORTS)
+	{
+		Upload $(_p) : $(PORT_$(_p)) : $(<:B).hex ;
+	}
+}
+
+#
+# Targets
+#
+
+# Grab everything from the core directory
+Library core : [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+Library libs : [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# Main output executable
+Arduino $(PWD:B).elf : $(PROJECT_MODULES) [ GLOB $(PROJECT_DIRS) : *.c *.cpp *.pde *.ino ] ;
diff --git a/lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde b/lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde
new file mode 100644
index 000000000..e13eb8274
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde
@@ -0,0 +1,273 @@
+/*
+ Copyright (C) 2011 James Coliz, Jr. <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Test version of RF24, exposes some protected interface
+//
+
+class RF24Test: public RF24
+{
+public: RF24Test(int a, int b): RF24(a,b) {}
+};
+
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 8 & 9
+
+RF24Test radio(48,49);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const int role_pin = 5;
+
+//
+// Topology
+//
+
+// Radio pipe addresses for the 2 nodes to communicate.
+const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes
+// in this system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_ping_out = 1, role_pong_back } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Ping out", "Pong back"};
+
+// The role of the current running sketch
+role_e role;
+
+//
+// Test state
+//
+
+bool done; //*< Are we done with the test? */
+bool passed; //*< Have we passed the test? */
+bool notified; //*< Have we notified the user we're done? */
+const int num_needed = 10; //*< How many success/failures until we're done? */
+int receives_remaining = num_needed; //*< How many ack packets until we declare victory? */
+int failures_remaining = num_needed; //*< How many more failed sends until we declare failure? */
+const int interval = 100; //*< ms to wait between sends */
+
+char configuration = '1'; //*< Configuration key, one char sent in by the test framework to tell us how to configure, this is the default */
+
+void one_ok(void)
+{
+  // Have we received enough yet?
+  if ( ! --receives_remaining )
+  {
+    done = true;
+    passed = true;
+  }
+}
+
+void one_failed(void)
+{
+  // Have we failed enough yet?
+  if ( ! --failures_remaining )
+  {
+    done = true;
+    passed = false;
+  }
+}
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_ping_out;
+  else
+    role = role_pong_back;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\n\rRF24/tests/pingpair_blocking/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+
+  //
+  // get test config
+  //
+
+  printf("+READY press any key to start\n\r\n\r");
+
+  while (! Serial.available() ) {}
+  configuration = Serial.read();
+  printf("Configuration\t = %c\n\r",configuration);
+   
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens two pipes for these two nodes to communicate
+  // back and forth.
+  // Open 'our' pipe for writing
+  // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
+
+  if ( role == role_ping_out )
+  {
+    radio.openWritingPipe(pipes[0]);
+    radio.openReadingPipe(1,pipes[1]);
+  }
+  else
+  {
+    radio.openWritingPipe(pipes[1]);
+    radio.openReadingPipe(1,pipes[0]);
+  }
+
+  //
+  // Start listening
+  //
+
+  radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+  
+  if ( role == role_pong_back )
+    printf("\n\r+OK ");
+}
+
+void loop(void)
+{
+  //
+  // Ping out role.  Repeatedly send the current time
+  //
+
+  if (role == role_ping_out)
+  {
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Take the time, and send it.  This will block until complete
+    unsigned long time = millis();
+    printf("Now sending %lu...",time);
+    radio.write( &time, sizeof(unsigned long) );
+
+    // Now, continue listening
+    radio.startListening();
+
+    // Wait here until we get a response, or timeout (250ms)
+    unsigned long started_waiting_at = millis();
+    bool timeout = false;
+    while ( ! radio.available() && ! timeout )
+      if (millis() - started_waiting_at > 200 )
+        timeout = true;
+
+    // Describe the results
+    if ( timeout )
+    {
+      printf("Failed, response timed out.\n\r");
+      one_failed();
+    }
+    else
+    {
+      // Grab the response, compare, and send to debugging spew
+      unsigned long got_time;
+      radio.read( &got_time, sizeof(unsigned long) );
+
+      // Spew it
+      printf("Got response %lu, round-trip delay: %lu\n\r",got_time,millis()-got_time);
+      one_ok();
+    }
+
+    // Try again  later
+    delay(250);
+  }
+
+  //
+  // Pong back role.  Receive each packet, dump it out, and send it back
+  //
+
+  if ( role == role_pong_back )
+  {
+    // if there is data ready
+    if ( radio.available() )
+    {
+      // Dump the payloads until we've gotten everything
+      unsigned long got_time;
+      bool done = false;
+      while (radio.available())
+      {
+        // Fetch the payload, and see if this was the last one.
+        radio.read( &got_time, sizeof(unsigned long) );
+      }
+	// Delay just a little bit to let the other unit
+	// make the transition to receiver
+	//delay(20);
+      //}
+
+      // First, stop listening so we can talk
+      radio.stopListening();
+      
+              // Spew it
+        printf("Got payload %lu...",got_time);
+
+      // Send the final one back.
+      radio.write( &got_time, sizeof(unsigned long) );
+
+      // Now, resume listening so we catch the next packets.
+      radio.startListening();
+      printf("Sent response.\n\r");
+
+    }
+  }
+  
+  //
+  // Stop the test if we're done and report results
+  //
+  if ( done && ! notified )
+  {
+    notified = true;
+
+    printf("\n\r+OK ");
+    if ( passed )
+      printf("PASS\n\r\n\r");
+    else
+      printf("FAIL\n\r\n\r");
+  }
+}
+// vim:cin:ai:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/tests/pingpair_blocking/printf.h b/lib/RF24/tests/pingpair_blocking/printf.h
new file mode 100644
index 000000000..b2efd56ba
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/printf.h
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+ 
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+ 
+/**
+ * @file printf.h
+ *
+ * Setup necessary to direct stdout to the Arduino Serial library, which
+ * enables 'printf'
+ */
+
+#ifndef __PRINTF_H__
+#define __PRINTF_H__
+
+#ifdef ARDUINO
+
+int serial_putc( char c, FILE * ) 
+{
+  Serial.write( c );
+
+  return c;
+} 
+
+void printf_begin(void)
+{
+  fdevopen( &serial_putc, 0 );
+}
+
+#else
+#error This example is only for use on Arduino.
+#endif // ARDUINO
+
+#endif // __PRINTF_H__
diff --git a/lib/RF24/tests/pingpair_blocking/runtest.py b/lib/RF24/tests/pingpair_blocking/runtest.py
new file mode 100755
index 000000000..0772f9505
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/runtest.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+import sys,serial
+
+def read_until(token):
+	while 1: 
+		line = ser.readline(None)
+		sys.stdout.write(line)
+
+		if (line.startswith(token)):
+			break
+	return line
+
+
+ser = serial.Serial(sys.argv[1], 57600, timeout=5, dsrdtr=False, rtscts=False)
+
+read_until("+READY")
+ser.write(sys.argv[2])
+
+line = read_until("+OK")
+ser.close()
+if (line.find("PASS") != -1):
+	sys.exit(0)
+else:
+	sys.exit(1)
diff --git a/lib/RF24/tests/pingpair_blocking/runtests.sh b/lib/RF24/tests/pingpair_blocking/runtests.sh
new file mode 100755
index 000000000..e10644879
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/runtests.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Connect u0 to receiver, u1 to sender
+
+jam u0 u1 && expect test.ex 
diff --git a/lib/RF24/tests/pingpair_blocking/test.ex b/lib/RF24/tests/pingpair_blocking/test.ex
new file mode 100755
index 000000000..ea992add3
--- /dev/null
+++ b/lib/RF24/tests/pingpair_blocking/test.ex
@@ -0,0 +1,11 @@
+#/usr/bin/expect
+
+set timeout 100
+spawn picocom -b 57600 /dev/ttyUSB0
+expect "+READY"
+send "1"
+expect "+OK"
+spawn picocom -b 57600 /dev/ttyUSB1
+expect "+READY"
+send "1"
+expect "+OK"
diff --git a/lib/RF24/tests/pingpair_test/Jamfile b/lib/RF24/tests/pingpair_test/Jamfile
new file mode 100644
index 000000000..18244ec84
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/Jamfile
@@ -0,0 +1,219 @@
+# (1) Project Information
+
+PROJECT_LIBS 	= SPI RF24 ; 
+PROJECT_DIRS	= $(PWD) ;
+
+# (2) Board Information
+
+UPLOAD_PROTOCOL ?= arduino ;
+UPLOAD_SPEED 	?= 115200 ;
+MCU		?= atmega328p ;
+F_CPU 		?= 16000000 ;
+CORE		?= arduino ;
+VARIANT 	?= standard ;
+ARDUINO_VERSION	?= 100 ;
+
+# (3) USB Ports
+
+PORTS		= p4 p6 p9 u0 u1 u2 ;
+PORT_p6 	= /dev/tty.usbserial-A600eHIs ;
+PORT_p4 	= /dev/tty.usbserial-A40081RP ;
+PORT_p9		= /dev/tty.usbserial-A9007LmI ;
+PORT_u0 	= /dev/ttyUSB0 ;
+PORT_u1 	= /dev/ttyUSB1 ;
+PORT_u2 	= /dev/ttyUSB2 ;
+
+# (4) Location of AVR tools
+#
+# This configuration assumes using avr-tools that were obtained separate from the Arduino
+# distribution. 
+
+if $(OS) = MACOSX 
+{
+	AVR_BIN 	?= /usr/local/avrtools/bin ;
+	AVR_ETC 	= /usr/local/avrtools/etc ;
+	AVR_INCLUDE	= /usr/local/avrtools/include ; 
+}
+else
+{
+	AVR_BIN 	?= /usr/bin ;
+	AVR_INCLUDE 	= /usr/lib/avr/include ;
+	AVR_ETC 	= /etc ; 
+}
+
+# (5) Directories where Arduino core and libraries are located
+
+ARDUINO_DIR 	?= /opt/Arduino ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/$(CORE) $(ARDUINO_DIR)/hardware/arduino/variants/$(VARIANT) ;
+ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
+SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
+
+#
+# --------------------------------------------------
+# Below this line usually never needs to be modified 
+#
+
+# Tool locations
+
+CC	  	= $(AVR_BIN)/avr-gcc ;
+C++	 	= $(AVR_BIN)/avr-g++ ;
+LINK	  	= $(AVR_BIN)/avr-gcc ;
+AR		= $(AVR_BIN)/avr-ar rcs ;
+RANLIB		= ;
+OBJCOPY 	= $(AVR_BIN)/avr-objcopy ;
+AVRDUDE 	?= $(AVR_BIN)/avrdude ;
+
+# Flags
+
+DEFINES  	+= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+OPTIM		= -Os ;
+CCFLAGS  	= -Wall -Wextra -Wno-strict-aliasing -mmcu=$(MCU) -ffunction-sections -fdata-sections ;
+C++FLAGS  	= $(CCFLAGS) -fno-exceptions -fno-strict-aliasing ;
+LINKFLAGS  	= $(OPTIM) -lm -Wl,--gc-sections -mmcu=$(MCU) ;
+AVRDUDEFLAGS	= -V -F -D -C $(AVR_ETC)/avrdude.conf -p $(MCU) -c $(UPLOAD_PROTOCOL) -b $(UPLOAD_SPEED) ;
+
+# Search everywhere for headers
+
+HDRS  	 	= $(PROJECT_DIRS) $(AVR_INCLUDE) $(ARDUINO_CORE) $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) ;
+
+# Output locations
+
+LOCATE_TARGET	= $(F_CPU) ;
+LOCATE_SOURCE	= $(F_CPU) ;
+
+#
+# Custom rules
+#
+
+rule GitVersion
+{
+	Always $(<) ;
+	Depends all : $(<) ;
+}
+
+actions GitVersion
+{
+	echo "const char program_version[] = \"\\" > $(<)
+	git log -1 --pretty=format:%h >> $(<)
+	echo "\";" >> $(<)
+}
+
+GitVersion version.h ;
+
+rule Pde
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
+	Clean clean : $(<) ;
+}
+
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
+}
+
+actions Pde
+{
+	echo "#include <$(ARDUINO_H)>" > $(<) 
+	echo "#line 1 \"$(>)\"" >> $(<)
+	cat $(>) >> $(<) 
+}
+
+rule C++Pde
+{
+	local _CPP = $(>:B).cpp ;
+	Pde $(_CPP) : $(>) ;
+	C++ $(<) : $(_CPP) ;
+}
+
+rule UserObject
+{
+	switch $(>:S)
+	{
+		case .ino : C++Pde $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
+	}
+}
+
+rule Objects
+{
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
+        {
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
+        }
+}
+
+rule Library
+{
+	LibraryFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+	Objects $(>) ;
+}
+
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+rule Hex
+{
+	Depends $(<) : $(>) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
+	Depends hex : $(<) ;
+	Clean clean : $(<) ;
+}
+
+actions Hex
+{
+	$(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+}
+
+rule Upload
+{
+	Depends $(1) : $(2) ;
+	Depends $(2) : $(3) ;
+	NotFile $(1) ;
+	Always $(1) ;
+	Always $(2) ;
+	UploadAction $(2) : $(3) ;
+}
+
+actions UploadAction
+{
+	$(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+}
+
+rule Arduino
+{
+	LINKFLAGS on $(<) = $(LINKFLAGS) -Wl,-Map=$(LOCATE_TARGET)/$(<:B).map ;
+	Main $(<) : $(>) ;
+	LinkLibraries $(<) : core libs ;
+	Hex $(<:B).hex : $(<) ;
+	for _p in $(PORTS)
+	{
+		Upload $(_p) : $(PORT_$(_p)) : $(<:B).hex ;
+	}
+}
+
+#
+# Targets
+#
+
+# Grab everything from the core directory
+Library core : [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+Library libs : [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# Main output executable
+Arduino $(PWD:B).elf : $(PROJECT_MODULES) [ GLOB $(PROJECT_DIRS) : *.c *.cpp *.pde *.ino ] ;
diff --git a/lib/RF24/tests/pingpair_test/pingpair_test.pde b/lib/RF24/tests/pingpair_test/pingpair_test.pde
new file mode 100644
index 000000000..3c8404117
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/pingpair_test.pde
@@ -0,0 +1,435 @@
+/*
+ Copyright (C) 2011 James Coliz, Jr. <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+
+/**
+ * Full test on single RF pair
+ *
+ * This sketches uses as many RF24 methods as possible in a single test.
+ *
+ * To operate:
+ *  Upload this sketch on two nodes, each with IRQ -> pin 2
+ *  One node needs pin 7 -> GND, the other NC.  That's the receiving node
+ *  Monitor the sending node's serial output
+ *  Look for "+OK PASS" or "+OK FAIL"
+ */
+
+#include <SPI.h>
+#include "nRF24L01.h"
+#include "RF24.h"
+#include "printf.h"
+
+//
+// Hardware configuration
+//
+
+// Set up nRF24L01 radio on SPI bus plus pins 8 & 9
+
+RF24 radio(7,8);
+
+// sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
+// Leave open to be the 'ping' transmitter
+const short role_pin = 5;
+
+//
+// Topology
+//
+
+// Single radio pipe address for the 2 nodes to communicate.
+const uint64_t pipe = 0xE8E8F0F0E1LL;
+
+//
+// Role management
+//
+// Set up role.  This sketch uses the same software for all the nodes in this
+// system.  Doing so greatly simplifies testing.  The hardware itself specifies
+// which node it is.
+//
+// This is done through the role_pin
+//
+
+// The various roles supported by this sketch
+typedef enum { role_sender = 1, role_receiver } role_e;
+
+// The debug-friendly names of those roles
+const char* role_friendly_name[] = { "invalid", "Sender", "Receiver"};
+
+// The role of the current running sketch
+role_e role;
+
+// Interrupt handler, check the radio because we got an IRQ
+void check_radio(void);
+
+//
+// Payload
+//
+
+const int min_payload_size = 4;
+const int max_payload_size = 32;
+int payload_size_increments_by = 2;
+int next_payload_size = min_payload_size;
+
+char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
+
+//
+// Test state
+//
+
+bool done; //*< Are we done with the test? */
+bool passed; //*< Have we passed the test? */
+bool notified; //*< Have we notified the user we're done? */
+const int num_needed = 10; //*< How many success/failures until we're done? */
+int receives_remaining = num_needed; //*< How many ack packets until we declare victory? */
+int failures_remaining = num_needed; //*< How many more failed sends until we declare failure? */
+const int interval = 100; //*< ms to wait between sends */
+
+char configuration = '1'; //*< Configuration key, one char sent in by the test framework to tell us how to configure, this is the default */
+
+uint8_t pipe_number = 1; // Which pipe to send on.
+
+void one_ok(void)
+{
+  // Have we received enough yet?
+  if ( ! --receives_remaining )
+  {
+    done = true;
+    passed = true;
+  }
+}
+
+void one_failed(void)
+{
+  // Have we failed enough yet?
+  if ( ! --failures_remaining )
+  {
+    done = true;
+    passed = false;
+  }
+}
+
+//
+// Setup 
+//
+
+void setup(void)
+{
+  //
+  // Role
+  //
+
+  // set up the role pin
+  pinMode(role_pin, INPUT);
+  digitalWrite(role_pin,HIGH);
+  delay(20); // Just to get a solid reading on the role pin
+
+  // read the address pin, establish our role
+  if ( digitalRead(role_pin) )
+    role = role_sender;
+  else
+    role = role_receiver;
+
+  //
+  // Print preamble
+  //
+
+  Serial.begin(115200);
+  printf_begin();
+  printf("\n\rRF24/tests/pingpair_test/\n\r");
+  printf("ROLE: %s\n\r",role_friendly_name[role]);
+
+  //
+  // Read configuration from serial
+  //
+  // It would be a much better test if this program could accept configuration
+  // from the serial port.  Then it would be possible to run the same test under
+  // lots of different circumstances.
+  //
+  // The idea is that we will print "+READY" at this point.  The python script
+  // will wait for it, and then send down a configuration script that we
+  // execute here and then run with.
+  //
+  // The test controller will need to configure the receiver first, then go run
+  // the test on the sender.
+  //
+
+  printf("+READY press any key to start\n\r\n\r");
+
+  while (! Serial.available() ) {}
+  configuration = Serial.read();
+  printf("Configuration\t = %c\n\r",configuration);
+
+  //
+  // Setup and configure rf radio
+  //
+
+  radio.begin();
+
+  // We will be using the Ack Payload feature, so please enable it
+  radio.enableAckPayload();
+
+  // Config 2 is special radio config
+  if (configuration=='2')
+  {
+    radio.setCRCLength(RF24_CRC_8);
+    radio.setDataRate(RF24_250KBPS);
+    radio.setChannel(10);
+  }
+  else
+  {
+    //Otherwise, default radio config
+    
+    // Optional: Increase CRC length for improved reliability
+    radio.setCRCLength(RF24_CRC_16);
+
+    // Optional: Decrease data rate for improved reliability
+    radio.setDataRate(RF24_1MBPS);
+
+    // Optional: Pick a high channel
+    radio.setChannel(90);
+  }
+
+  // Config 3 is static payloads only
+  if (configuration == '3')
+  {
+    next_payload_size = 16;
+    payload_size_increments_by = 0;
+    radio.setPayloadSize(next_payload_size);
+  }
+  else
+  {
+    // enable dynamic payloads
+    radio.enableDynamicPayloads();
+  }
+
+  // Config 4 tests out a higher pipe ##
+  if (configuration == '4' && role == role_sender)
+  {
+    // Set top 4 bytes of the address in pipe 1 
+    radio.openReadingPipe(1,pipe & 0xFFFFFFFF00ULL);
+
+    // indicate the pipe to use 
+    pipe_number = 5;
+  }
+  else if ( role == role_sender )
+  {
+    radio.openReadingPipe(5,0);
+  }
+
+  //
+  // Open pipes to other nodes for communication
+  //
+
+  // This simple sketch opens a single pipe for these two nodes to communicate
+  // back and forth.  One listens on it, the other talks to it.
+
+  if ( role == role_sender )
+  {
+    radio.openWritingPipe(pipe);
+  }
+  else
+  {
+    radio.openReadingPipe(pipe_number,pipe);
+  }
+
+  //
+  // Start listening
+  //
+
+  if ( role == role_receiver )
+    radio.startListening();
+
+  //
+  // Dump the configuration of the rf unit for debugging
+  //
+
+  radio.printDetails();
+
+  //
+  // Attach interrupt handler to interrupt #0 (using pin 2)
+  // on BOTH the sender and receiver
+  //
+
+  attachInterrupt(0, check_radio, FALLING);
+  delay(50);
+  if ( role == role_receiver )
+    printf("\n\r+OK ");
+}
+
+//
+// Print buffer
+//
+// Printing from the interrupt handler is a bad idea, so we print from there
+// to this intermediate buffer
+//
+
+char prbuf[1000];
+char *prbuf_end = prbuf + sizeof(prbuf);
+char *prbuf_in = prbuf;
+char *prbuf_out = prbuf;
+
+//
+// Loop 
+//
+
+static uint32_t message_count = 0;
+static uint32_t last_message_count = 0;
+
+void loop(void)
+{
+  //
+  // Sender role.  Repeatedly send the current time
+  //
+
+  if (role == role_sender && !done)
+  {
+    // The payload will always be the same, what will change is how much of it we send.
+    static char send_payload[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ789012";
+
+    // First, stop listening so we can talk.
+    radio.stopListening();
+
+    // Send it.  This will block until complete
+    printf("\n\rNow sending length %i...",next_payload_size);
+    radio.startWrite( send_payload, next_payload_size,0 );
+
+    // Update size for next time.
+    next_payload_size += payload_size_increments_by;
+    if ( next_payload_size > max_payload_size )
+      next_payload_size = min_payload_size;
+    
+    // Try again soon
+    delay(interval);
+    
+    // Timeout if we have not received anything back ever
+    if ( ! last_message_count && millis() > interval * 100 )
+    {
+      printf("No responses received.  Are interrupts connected??\n\r");
+      done = true;
+    }
+  }
+
+  //
+  // Receiver role: Does nothing!  All the work is in IRQ
+  //
+  
+  //
+  // Spew print buffer
+  //
+
+  size_t write_length = prbuf_in - prbuf_out;
+  if ( write_length )
+  {
+    Serial.write(reinterpret_cast<uint8_t*>(prbuf_out),write_length);
+    prbuf_out += write_length;
+  }
+  
+  //
+  // Stop the test if we're done and report results
+  //
+  if ( done && ! notified )
+  {
+    notified = true;
+
+    printf("\n\r+OK ");
+    if ( passed )
+      printf("PASS\n\r\n\r");
+    else
+      printf("FAIL\n\r\n\r");
+  }
+
+}
+
+void check_radio(void)
+{
+  // What happened?
+  bool tx,fail,rx;
+  radio.whatHappened(tx,fail,rx);
+
+  // Have we successfully transmitted?
+  if ( tx )
+  {
+    if ( role == role_sender )
+      prbuf_in += sprintf(prbuf_in,"Send:OK ");
+
+    if ( role == role_receiver )
+      prbuf_in += sprintf(prbuf_in,"Ack Payload:Sent\n\r");
+  }
+
+  // Have we failed to transmit?
+  if ( fail )
+  {
+    if ( role == role_sender )
+    {
+      prbuf_in += sprintf(prbuf_in,"Send:Failed ");
+
+      // log status of this line
+      one_failed();
+    }
+
+    if ( role == role_receiver )
+      prbuf_in += sprintf(prbuf_in,"Ack Payload:Failed\n\r");
+  }
+
+  // Not powering down since radio is in standby mode
+  //if ( ( tx || fail ) && ( role == role_sender ) )
+    //radio.powerDown();
+
+  // Did we receive a message?
+  if ( rx )
+  {
+    // If we're the sender, we've received an ack payload
+    if ( role == role_sender )
+    {
+      radio.read(&message_count,sizeof(message_count));
+      prbuf_in += sprintf(prbuf_in,"Ack:%lu ",message_count);
+ 
+      // is this ack what we were expecting?  to account
+      // for failures, we simply want to make sure we get a
+      // DIFFERENT ack every time.
+      if ( ( message_count != last_message_count ) || ( configuration=='3' && message_count == 16 ) )
+      {
+	prbuf_in += sprintf(prbuf_in,"OK ");
+	one_ok();
+      }
+      else
+      {
+	prbuf_in += sprintf(prbuf_in,"FAILED ");
+	one_failed();
+      }
+      last_message_count = message_count;
+    }
+
+    // If we're the receiver, we've received a time message
+    if ( role == role_receiver )
+    {
+      // Get this payload and dump it
+      size_t len = max_payload_size;
+      memset(receive_payload,0,max_payload_size);
+      
+      if ( configuration == '3' ){
+	len = next_payload_size;
+      }else{
+	len = radio.getDynamicPayloadSize();
+      }
+      
+      radio.read( receive_payload, len );
+      
+      // Put a zero at the end for easy printing
+      receive_payload[len] = 0;
+
+      // Spew it
+      prbuf_in += sprintf(prbuf_in,"Recv size=%i val=%s len=%u\n\r",len,receive_payload,strlen(receive_payload));
+
+      // Add an ack packet for the next time around.
+      // Here we will report back how many bytes we got this time.
+      radio.writeAckPayload( pipe_number, &len, sizeof(len) );
+
+      ++message_count;
+    }
+
+  }
+}
diff --git a/lib/RF24/tests/pingpair_test/printf.h b/lib/RF24/tests/pingpair_test/printf.h
new file mode 100644
index 000000000..b2efd56ba
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/printf.h
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+ 
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ */
+ 
+/**
+ * @file printf.h
+ *
+ * Setup necessary to direct stdout to the Arduino Serial library, which
+ * enables 'printf'
+ */
+
+#ifndef __PRINTF_H__
+#define __PRINTF_H__
+
+#ifdef ARDUINO
+
+int serial_putc( char c, FILE * ) 
+{
+  Serial.write( c );
+
+  return c;
+} 
+
+void printf_begin(void)
+{
+  fdevopen( &serial_putc, 0 );
+}
+
+#else
+#error This example is only for use on Arduino.
+#endif // ARDUINO
+
+#endif // __PRINTF_H__
diff --git a/lib/RF24/tests/pingpair_test/runtest.py b/lib/RF24/tests/pingpair_test/runtest.py
new file mode 100755
index 000000000..45fb65cec
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/runtest.py
@@ -0,0 +1,25 @@
+#!/opt/local/bin/python
+
+import sys,serial
+
+def read_until(token):
+	while 1: 
+		line = ser.readline(None,"\r")
+		sys.stdout.write(line)
+
+		if (line.startswith(token)):
+			break
+	return line
+
+
+ser = serial.Serial(sys.argv[1], 57600, timeout=5, dsrdtr=False, rtscts=False)
+
+read_until("+READY")
+ser.write(sys.argv[2])
+
+line = read_until("+OK")
+ser.close()
+if (line.find("PASS") != -1):
+	sys.exit(0)
+else:
+	sys.exit(1)
diff --git a/lib/RF24/tests/pingpair_test/runtests.sh b/lib/RF24/tests/pingpair_test/runtests.sh
new file mode 100755
index 000000000..4d02310b9
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/runtests.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Connect u0 to receiver, u0 to sender
+# WARNING: Test config 2 only works with PLUS units.
+
+jam u0 u1 && expect test.ex 1
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB0
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB1
+expect test.ex 2
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB0
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB1
+expect test.ex 3
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB0
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB1
+expect test.ex 4
diff --git a/lib/RF24/tests/pingpair_test/test.ex b/lib/RF24/tests/pingpair_test/test.ex
new file mode 100755
index 000000000..a14ffef07
--- /dev/null
+++ b/lib/RF24/tests/pingpair_test/test.ex
@@ -0,0 +1,11 @@
+#/usr/bin/expect
+
+set timeout 100
+spawn picocom -b 57600 /dev/ttyUSB0
+expect "+READY"
+send [lindex $argv 0] 
+expect "+OK"
+spawn picocom -b 57600 /dev/ttyUSB1
+expect "+READY"
+send [lindex $argv 0]
+expect "+OK"
diff --git a/lib/RF24/utility/ATTiny/RF24_arch_config.h b/lib/RF24/utility/ATTiny/RF24_arch_config.h
new file mode 100644
index 000000000..16b512cbd
--- /dev/null
+++ b/lib/RF24/utility/ATTiny/RF24_arch_config.h
@@ -0,0 +1,47 @@
+
+/*
+ TMRh20 2015
+ ATTiny Configuration File
+*/
+
+#ifndef __RF24_ARCH_CONFIG_H__
+#define __RF24_ARCH_CONFIG_H__
+
+  /*** USER DEFINES:  ***/  
+  //#define FAILURE_HANDLING
+  //#define MINIMAL
+  /**********************/
+
+  #define rf24_max(a,b) (a>b?a:b)
+  #define rf24_min(a,b) (a<b?a:b)
+
+
+
+  #if ARDUINO < 100
+	#include <WProgram.h>
+  #else
+	#include <Arduino.h>
+  #endif
+  #include <stddef.h>  
+  
+  // Include the header file for SPI functions ( Main SPI code is contained in RF24.cpp for simplicity )
+  #include "spi.h"
+
+  #define _SPI SPI
+  
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+	#if defined(RF24_TINY)
+	#define printf_P(...)
+    #endif
+  #endif
+
+  #include <avr/pgmspace.h>
+  #define PRIPSTR "%S"
+  
+  
+
+#endif // __RF24_ARCH_CONFIG_H__
+
diff --git a/lib/RF24/utility/ATTiny/spi.h b/lib/RF24/utility/ATTiny/spi.h
new file mode 100644
index 000000000..c1864b5f4
--- /dev/null
+++ b/lib/RF24/utility/ATTiny/spi.h
@@ -0,0 +1,53 @@
+// ATTiny support code is from https://github.com/jscrane/RF24
+
+/**
+ * @file spi.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for SPI helper files
+ */
+ 
+#include <stdio.h>
+#include <Arduino.h>
+#include <avr/pgmspace.h>
+
+#define SPI_CLOCK_DIV4 0x00
+#define SPI_CLOCK_DIV16 0x01
+#define SPI_CLOCK_DIV64 0x02
+#define SPI_CLOCK_DIV128 0x03
+#define SPI_CLOCK_DIV2 0x04
+#define SPI_CLOCK_DIV8 0x05
+#define SPI_CLOCK_DIV32 0x06
+//#define SPI_CLOCK_DIV64 0x07
+
+#define SPI_MODE0 0x00
+#define SPI_MODE1 0x04
+#define SPI_MODE2 0x08
+#define SPI_MODE3 0x0C
+
+#define SPI_MODE_MASK 0x0C  // CPOL = bit 3, CPHA = bit 2 on SPCR
+#define SPI_CLOCK_MASK 0x03  // SPR1 = bit 1, SPR0 = bit 0 on SPCR
+#define SPI_2XCLOCK_MASK 0x01  // SPI2X = bit 0 on SPSR
+
+
+
+class SPIClass {
+public:
+  static byte transfer(byte _data);
+
+  // SPI Configuration methods
+
+  inline static void attachInterrupt();
+  inline static void detachInterrupt(); // Default
+
+  static void begin(); // Default
+  static void end();
+
+  static void setBitOrder(uint8_t);
+  static void setDataMode(uint8_t);
+  static void setClockDivider(uint8_t);
+};
+extern SPIClass SPI;
+
+/**
+ * \endcond
+ */
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/README.md b/lib/RF24/utility/ATXMegaD3/README.md
new file mode 100644
index 000000000..06cf94547
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/README.md
@@ -0,0 +1,54 @@
+This is a fork from **http://tmrh20.github.io/RF24** which can be build as a static library for Atmel Studio 7.
+
+Not all files are needed.
+
+Just copy the following structure into a GCC Static Library project in AS7:
+```
+utility\
+  ATXMega256D3\
+    compatibility.c
+    compatibility.h
+    gpio.cpp
+    gpio.h
+    gpio_helper.c
+    gpio_helper.h
+    includes.h
+    RF24_arch_config.h
+    spi.cpp
+    spi.h
+nRF24L01.h
+printf.h
+RF24.cpp
+RF24.h
+RF24_config.h
+```
+
+Only ATXMega256D3 is supported right now!
+
+## Notes
+The millisecond functionality is based on the TCE0 so don't use these pins as IO.
+
+The operating frequency of the uC is 32MHz. If else change the TCE0 registers appropriatly in function **__start_timer()** in **compatibility.c** file for your frequency. 
+
+
+## Usage
+Add the library to your project!
+In the file where the **main()** is put the following in order to update the millisecond functionality:
+```
+ISR(TCE0_OVF_vect)
+{
+	update_milisec();
+}
+```
+
+Declare the rf24 radio with **RF24 radio(XMEGA_PORTC_PIN3, XMEGA_SPI_PORT_C);**
+
+First parameter is the CE pin which can be any available pin on the uC.
+
+Second parameter is the CS which can be on port C (**XMEGA_SPI_PORT_C**) or on port D (**XMEGA_SPI_PORT_D**). 
+
+Call the **__start_timer()** to start the millisecond timer.
+
+
+
+** For further information please see http://tmrh20.github.io/RF24 for all documentation**
diff --git a/lib/RF24/utility/ATXMegaD3/RF24_arch_config.h b/lib/RF24/utility/ATXMegaD3/RF24_arch_config.h
new file mode 100644
index 000000000..53cc2f1af
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/RF24_arch_config.h
@@ -0,0 +1,85 @@
+
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ */
+ 
+ /**
+ * @file RF24_arch_config.h
+ * General defines and includes for RF24/Linux
+ */
+
+ /**
+ * Example of RF24_arch_config.h for RF24 portability
+ *
+ * @defgroup Porting_General Porting: General
+ *
+ * 
+ * @{
+ */
+ 
+ 
+#ifndef __RF24_ARCH_CONFIG_H__
+#define __RF24_ARCH_CONFIG_H__
+
+#include <stddef.h>
+#include <avr/pgmspace.h>
+#include "spi.h"
+#include "gpio.h"
+#include "compatibility.h"
+#include <stdint.h>
+#include <stdio.h>
+//#include <time.h>
+#include <string.h>
+//#include <sys/time.h>
+
+//#define _BV(x) (1<<(x))
+#define _SPI spi
+
+#undef SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
+#define IF_SERIAL_DEBUG(x) ({x;})
+#else
+#define IF_SERIAL_DEBUG(x)
+#endif
+
+// Use the avr pgmspace commands
+//// Avoid spurious warnings
+//#if 1
+//#if ! defined( NATIVE ) && defined( ARDUINO )
+//#undef PROGMEM
+//#define PROGMEM __attribute__(( section(".progmem.data") ))
+//#undef PSTR
+//#define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+//#endif
+//#endif
+
+typedef uint16_t prog_uint16_t;
+//#define PSTR(x) (x)
+//#define printf_P printf
+//#define strlen_P strlen
+//#define PROGMEM
+//#define pgm_read_word(p) (*(p)) 
+#define PRIPSTR "%s"
+//#define pgm_read_byte(p) (*(p))
+
+// Function, constant map as a result of migrating from Arduino
+#define LOW GPIO::OUTPUT_LOW
+#define HIGH GPIO::OUTPUT_HIGH
+#define INPUT GPIO::DIRECTION_IN
+#define OUTPUT GPIO::DIRECTION_OUT
+#define digitalWrite(pin, value) GPIO::write(pin, value)
+#define pinMode(pin, direction) GPIO::open(pin, direction)
+#define delay(milisec) __msleep(milisec)
+#define delayMicroseconds(usec) __usleep(usec)
+#define millis() __millis()
+
+
+#endif // __RF24_ARCH_CONFIG_H__
+
+
+/*@}*/	
diff --git a/lib/RF24/utility/ATXMegaD3/compatibility.c b/lib/RF24/utility/ATXMegaD3/compatibility.c
new file mode 100644
index 000000000..e909ea5af
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/compatibility.c
@@ -0,0 +1,67 @@
+/*
+ * compatibility.c
+ *
+ * Created: 19/1/2016 15:31:35
+ *  Author: akatran
+ */ 
+
+#include <avr/io.h>
+#include <stdint.h>
+#include <util/delay.h>
+
+volatile uint32_t _millis;
+
+void __msleep(int milisec)
+{
+	while(milisec-- >0)
+	{
+		_delay_ms(1);
+	}
+}
+
+void __usleep(int usec)
+{
+	while(usec-- >0)
+	{
+		_delay_us(1);
+	}
+}
+
+
+void __start_timer()
+{
+	
+	// Timer details : Clock is 32MHz, Timer resolution is 8bit, Prescaler is 256, Period is 124, Real Time is 0.001s
+
+	/* Set the timer to run at the fastest rate. */
+	TCE0.CTRLA = TC_CLKSEL_DIV256_gc;
+
+	/* Configure the timer for normal counting. */
+	TCE0.CTRLB = TC_WGMODE_NORMAL_gc;
+
+	/* At 2 MHz, one tick is 0.5 us.  Set period to 8 us. */
+	TCE0.PER = 124;
+	//TCC0.PER = 2;
+
+	/* Configure timer to generate an interrupt on overflow. */
+	TCE0.INTCTRLA = TC_OVFINTLVL_HI_gc;
+
+	/* Enable this interrupt level. */
+	PMIC.CTRL = PMIC_LOLVLEN_bm | PMIC_MEDLVLEN_bm | PMIC_HILVLEN_bm;
+	
+	_millis=0;
+}
+
+long __millis()
+{
+	return _millis;
+}
+
+void update_milisec()
+{
+	_millis++;
+}
+
+
+
+
diff --git a/lib/RF24/utility/ATXMegaD3/compatibility.h b/lib/RF24/utility/ATXMegaD3/compatibility.h
new file mode 100644
index 000000000..7eda40f1c
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/compatibility.h
@@ -0,0 +1,45 @@
+/* 
+ * File:   compatiblity.h
+ * Author: purinda
+ *
+ * Created on 24 June 2012, 3:08 PM
+ */
+
+ /**
+ * @file compatibility.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of compatibility.h class declaration for timing functions portability
+ *
+ * @defgroup Porting_Timing Porting: Timing
+ *
+ * 
+ * @{
+ */
+ 
+#ifndef COMPATIBLITY_H
+#define	COMPATIBLITY_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+	
+#include <stddef.h>
+//#include <time.h>
+//#include <sys/time.h>
+
+void __msleep(int milisec);
+void __usleep(int usec);
+void __start_timer();
+long __millis();
+void update_milisec();
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* COMPATIBLITY_H */
+
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/gpio.cpp b/lib/RF24/utility/ATXMegaD3/gpio.cpp
new file mode 100644
index 000000000..6f2321b3e
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/gpio.cpp
@@ -0,0 +1,50 @@
+/*
+ * gpio.cpp
+ *
+ * Created: 20/1/2016 11:57:21
+ *  Author: akatran
+ */ 
+
+//#include "gpio_helper.h"
+#include "gpio.h"
+#include <stdlib.h>
+
+void GPIO::open(int port, int DDR)
+{
+	uint8_t pin;
+	PORT_t * p = GPIO_getPort(port,&pin);
+	if (DDR==0)
+	{
+		p->DIRCLR=pin;
+	}else if (DDR==1)
+	{
+		p->DIRSET = pin;	
+	}
+}
+
+void GPIO::close(int port)
+{
+	// Nothing to do with close;
+}
+
+int read(int port)
+{
+	uint8_t pin;
+	PORT_t * p = GPIO_getPort(port,&pin);
+	return p->IN;
+}
+
+void GPIO::write(int port,int value)
+{
+	uint8_t pin;
+	PORT_t * p = GPIO_getPort(port,&pin);
+	if (value==0)
+	{
+		p->OUTCLR=pin;
+	}else if (value==1)
+	{
+		p->OUTSET = pin;	
+	}
+	
+}
+
diff --git a/lib/RF24/utility/ATXMegaD3/gpio.h b/lib/RF24/utility/ATXMegaD3/gpio.h
new file mode 100644
index 000000000..b3e65990e
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/gpio.h
@@ -0,0 +1,63 @@
+
+
+/**
+ * @file gpio.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of gpio.h class declaration for GPIO portability
+ *
+ * @defgroup Porting_GPIO Porting: GPIO
+ *
+ * 
+ * @{
+ */
+#ifndef GPIO_H
+#define	GPIO_H
+
+#include <avr/io.h>
+#include "gpio_helper.h"
+
+
+class GPIO {
+public:
+ 	/* Constants */
+	static const int DIRECTION_OUT = 1;
+	static const int DIRECTION_IN = 0;
+	
+	static const int OUTPUT_HIGH = 1;
+	static const int OUTPUT_LOW = 0;
+		
+	GPIO();
+	
+	/**
+	 * Similar to Arduino pinMode(pin,mode);
+     * @param port
+     * @param DDR
+     */
+	static void open(int port, int DDR);
+	/**
+	 * 
+     * @param port
+     */
+	static void close(int port);
+	/**
+	 * Similar to Arduino digitalRead(pin);
+     * @param port
+     * @param value
+     */
+	static int read(int port);
+	/**
+	* Similar to Arduino digitalWrite(pin,state);
+	* @param port
+	* @param value
+	*/	
+	static void write(int port,int value);	
+	
+	virtual ~GPIO();
+
+};
+
+#endif	/* GPIO_H */
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/gpio_helper.c b/lib/RF24/utility/ATXMegaD3/gpio_helper.c
new file mode 100644
index 000000000..f0b66ce49
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/gpio_helper.c
@@ -0,0 +1,45 @@
+/*
+ * gpio_helper.c
+ *
+ * Created: 22/1/2016 15:28:48
+ *  Author: akatran
+ */ 
+
+#include "gpio_helper.h"
+
+/**
+* Get the port corresponding in portnum. Default is PORTC.
+*/
+PORT_t * GPIO_getPort(int pinnum, uint8_t * pin_bm)
+//PORT_t * GPIO_getPort(int portnum)
+{
+	PORT_t * port = &PORTC;
+	if ( (pinnum >= XMEGA_PORTA_PIN0) && (pinnum<= XMEGA_PORTA_PIN7) )
+	{
+		port = &PORTA;
+		*pin_bm = (1<<pinnum);
+	}else if ( (pinnum >= XMEGA_PORTB_PIN0) && (pinnum<= XMEGA_PORTB_PIN7) )
+	{
+		port = &PORTB;
+		*pin_bm = (1<<(pinnum-8));
+	}else if ( (pinnum >= XMEGA_PORTC_PIN0) && (pinnum<= XMEGA_PORTC_PIN7) )
+	{
+		port = &PORTC;
+		*pin_bm = (1<<(pinnum-16));
+	}else if ( (pinnum >= XMEGA_PORTD_PIN0) && (pinnum<= XMEGA_PORTD_PIN7) )
+	{
+		port = &PORTD;
+		*pin_bm = (1<<(pinnum-24));
+	}else if ( (pinnum >= XMEGA_PORTE_PIN0) && (pinnum<= XMEGA_PORTE_PIN7) )
+	{
+		port = &PORTE;
+		*pin_bm = (1<<(pinnum-32));
+	}else if ( (pinnum >= XMEGA_PORTF_PIN0) && (pinnum<= XMEGA_PORTF_PIN7) )
+	{
+		port = &PORTF;
+		*pin_bm = (1<<(pinnum-40));
+	}
+
+	return port;
+
+}
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/gpio_helper.h b/lib/RF24/utility/ATXMegaD3/gpio_helper.h
new file mode 100644
index 000000000..27a380d87
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/gpio_helper.h
@@ -0,0 +1,89 @@
+/*
+ * gpio_helper.h
+ *
+ * Created: 22/1/2016 15:29:12
+ *  Author: akatran
+ */ 
+
+
+#ifndef GPIO_HELPER_H_
+#define GPIO_HELPER_H_
+
+#include <avr/io.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* Defines */
+
+
+#define XMEGA_PORTA_PIN0   0
+#define XMEGA_PORTA_PIN1   1
+#define XMEGA_PORTA_PIN2   2
+#define XMEGA_PORTA_PIN3   3
+#define XMEGA_PORTA_PIN4   4
+#define XMEGA_PORTA_PIN5   5
+#define XMEGA_PORTA_PIN6   6
+#define XMEGA_PORTA_PIN7   7
+
+#define XMEGA_PORTB_PIN0   8
+#define XMEGA_PORTB_PIN1   9
+#define XMEGA_PORTB_PIN2  10
+#define XMEGA_PORTB_PIN3  11
+#define XMEGA_PORTB_PIN4  12
+#define XMEGA_PORTB_PIN5  13
+#define XMEGA_PORTB_PIN6  14
+#define XMEGA_PORTB_PIN7  15
+
+#define XMEGA_PORTC_PIN0  16
+#define XMEGA_PORTC_PIN1  17
+#define XMEGA_PORTC_PIN2  18
+#define XMEGA_PORTC_PIN3  19
+#define XMEGA_PORTC_PIN4  20
+#define XMEGA_PORTC_PIN5  21
+#define XMEGA_PORTC_PIN6  22
+#define XMEGA_PORTC_PIN7  23
+
+#define XMEGA_PORTD_PIN0  24
+#define XMEGA_PORTD_PIN1  25
+#define XMEGA_PORTD_PIN2  26
+#define XMEGA_PORTD_PIN3  27
+#define XMEGA_PORTD_PIN4  28
+#define XMEGA_PORTD_PIN5  29
+#define XMEGA_PORTD_PIN6  30
+#define XMEGA_PORTD_PIN7  31
+
+#define XMEGA_PORTE_PIN0  32
+#define XMEGA_PORTE_PIN1  33
+#define XMEGA_PORTE_PIN2  34
+#define XMEGA_PORTE_PIN3  35
+#define XMEGA_PORTE_PIN4  36
+#define XMEGA_PORTE_PIN5  37
+#define XMEGA_PORTE_PIN6  38
+#define XMEGA_PORTE_PIN7  39
+
+#define XMEGA_PORTF_PIN0  40
+#define XMEGA_PORTF_PIN1  41
+#define XMEGA_PORTF_PIN2  42
+#define XMEGA_PORTF_PIN3  43
+#define XMEGA_PORTF_PIN4  44
+#define XMEGA_PORTF_PIN5  45
+#define XMEGA_PORTF_PIN6  46
+#define XMEGA_PORTF_PIN7  47
+
+
+
+#define XMEGA_SPI_PORT_C 20
+#define XMEGA_SPI_PORT_D 28
+
+
+//void GPIO_getPort(int pinnum, PORT_t * port, uint8_t pin);
+//void GPIO_getPort(int pinnum, PORT_t * port, uint8_t * pin_bm);
+PORT_t * GPIO_getPort(int pinnum, uint8_t * pin_bm);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* GPIO_HELPER_H_ */
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/includes.h b/lib/RF24/utility/ATXMegaD3/includes.h
new file mode 100644
index 000000000..7596433aa
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/includes.h
@@ -0,0 +1,31 @@
+
+ /**
+ * @file includes.h
+ * Configuration defines for RF24/Linux
+ */
+
+ /**
+ * Example of includes.h for RF24 Linux portability
+ *
+ * @defgroup Porting_Includes Porting: Includes
+ *
+ * 
+ * @{
+ */
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  /**
+   * Define a specific platform for this configuration
+   */
+ // #define RF24_BBB
+  
+  /**
+   * Load the correct configuration for this platform
+  */
+  //#include "BBB/RF24_arch_config.h"
+  
+#endif
+
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/spi.cpp b/lib/RF24/utility/ATXMegaD3/spi.cpp
new file mode 100644
index 000000000..f173dbe84
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/spi.cpp
@@ -0,0 +1,64 @@
+/*
+ * spi.cpp
+ *
+ * Created: 20/1/2016 10:10:39
+ *  Author: akatran
+ */ 
+
+#include <avr/io.h>
+#include "gpio_helper.h"
+#include "spi.h"
+
+using namespace std;
+
+void SPI::begin(uint8_t _port)
+{
+	if (_port==XMEGA_SPI_PORT_C) // Select SPI on PORTC
+	{
+		device = &SPIC;
+		port = &PORTC;
+	}else if (_port==XMEGA_SPI_PORT_D) // Select SPI on PORTD
+	{
+		device = &SPID;
+		port = &PORTD;
+	}
+	
+	init();
+}
+
+uint8_t SPI::transfer(uint8_t tx_)
+{
+	register8_t data;
+	device->DATA = tx_;
+	while(!(device->STATUS & (1<<7)));
+	data = device->DATA;
+	//PORTF.OUT = data;
+	return data;
+}
+
+void SPI::init()
+{
+	port->DIRCLR = SPI_MISO_bm;
+	port->DIRSET = SPI_MOSI_bm | SPI_SCK_bm | SPI_SS_bm;
+	
+	//device->CTRL = 0;
+	device->CTRL = SPI_ENABLE_bm | SPI_MASTER_bm | SPI_MODE_0_gc | SPI_PRESCALER_DIV4_gc;
+	device->INTCTRL =0; //Disable interrupts
+
+}
+
+
+SPI::SPI()
+{
+	
+}
+
+SPI::~SPI()
+{
+ 	
+}
+
+void operator delete(void * p) // or delete(void *, std::size_t)
+{
+
+}
\ No newline at end of file
diff --git a/lib/RF24/utility/ATXMegaD3/spi.h b/lib/RF24/utility/ATXMegaD3/spi.h
new file mode 100644
index 000000000..b792c1980
--- /dev/null
+++ b/lib/RF24/utility/ATXMegaD3/spi.h
@@ -0,0 +1,90 @@
+
+/**
+ * @file spi.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of spi.h class declaration for SPI portability
+ *
+ * @defgroup Porting_SPI Porting: SPI
+ *
+ * 
+ * @{
+ */
+
+#ifndef __XMEGASPI_H__
+#define __XMEGASPI_H__
+
+#include <avr/io.h>
+#include <stdint.h>
+//#include <string.h>
+//#include <unistd.h>
+//#include <stdio.h>
+//#include <stdlib.h>
+//#include <getopt.h>
+//#include <fcntl.h>
+//#include <sys/ioctl.h>
+//#include <inttypes.h>
+//#include <linux/types.h>
+//#include <linux/spi/spidev.h> 
+
+#define SPI_SS_bm (1<<4) /* SPI SS pin mask 4 */
+#define SPI_MOSI_bm (1<<5) /* SPI MOSI pin mask 5 */
+#define SPI_MISO_bm (1<<6) /* SPI MISO pin mask 6 */
+#define SPI_SCK_bm (1<<7) /* SPI SCK pin mask 7 */
+
+using namespace std;
+
+
+
+class SPI {
+public:
+
+	/**
+	* SPI constructor
+	*/	 
+	SPI();
+	
+	/**
+	* Start SPI
+	* @param port is the SPI port (XMEGA_SPI_PORT_C for SPI on PORTC, XMEGA_SPI_PORT_D on PORTD etc).
+	*/
+	void begin(uint8_t port);
+	/**
+	* Transfer a single byte
+	* @param tx_ Byte to send
+	* @return Data returned via spi
+	*/
+	uint8_t transfer(uint8_t tx_);
+	
+	/**
+	* Transfer a buffer of data
+	* @param tbuf Transmit buffer
+	* @param rbuf Receive buffer
+	* @param len Length of the data
+	*/
+	void transfernb(char* tbuf, char* rbuf, uint32_t len);
+
+	/**
+	* Transfer a buffer of data without an rx buffer
+	* @param buf Pointer to a buffer of data
+	* @param len Length of the data
+	*/	
+	void transfern(char* buf, uint32_t len);
+	
+	virtual ~SPI();
+
+private:
+    
+	/** Default SPI device */
+	SPI_t * device;
+	/* Port of the SPI */
+	PORT_t * port;
+
+	void init();	
+};
+
+#endif /*__XMEGASPI_H__*/
+
+/*@}*/
\ No newline at end of file
diff --git a/lib/RF24/utility/Due/RF24_arch_config.h b/lib/RF24/utility/Due/RF24_arch_config.h
new file mode 100644
index 000000000..73daa902e
--- /dev/null
+++ b/lib/RF24/utility/Due/RF24_arch_config.h
@@ -0,0 +1,37 @@
+
+/*
+ TMRh20 2015
+ RF24 Configuration file for Arduino Due
+ 
+ */
+
+#ifndef __RF24_ARCH_CONFIG_H__
+#define __RF24_ARCH_CONFIG_H__
+
+  /*** USER DEFINES:  ***/  
+  //#define FAILURE_HANDLING
+  //#define SERIAL_DEBUG
+  //#define MINIMAL
+  /**********************/
+  #define rf24_max(a,b) (a>b?a:b)
+  #define rf24_min(a,b) (a<b?a:b)
+
+  #include <Arduino.h>
+  #include <SPI.h>
+
+  #define _BV(x) (1<<(x))
+  #define _SPI SPI
+  
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+  #endif
+
+  #define printf_P printf
+  #define strlen_P strlen
+  #define PRIPSTR "%s"
+
+
+#endif // __RF24_CONFIG_H__
+
diff --git a/lib/RF24/utility/LittleWire/RF24_arch_config.h b/lib/RF24/utility/LittleWire/RF24_arch_config.h
new file mode 100644
index 000000000..512db47f5
--- /dev/null
+++ b/lib/RF24/utility/LittleWire/RF24_arch_config.h
@@ -0,0 +1,39 @@
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+#include <stdint.h>
+  #include <stdio.h>
+  #include <time.h>
+  #include <string.h>
+  #include <sys/time.h>
+  #include <stddef.h>
+
+  // Additional fixes for LittleWire
+  #include <LittleWireSPI/littlewirespi.h>
+  #include <LittleWireSPI/avr_fixes.h>
+  extern LittleWireSPI _SPI;
+
+  // GCC a Arduino Missing
+  #define _BV(x) (1<<(x))
+  #define pgm_read_word(p) (*(p))
+  #define pgm_read_byte(p) (*(p))
+  #define pgm_read_ptr(p) (*(p))
+  
+  //typedef uint16_t prog_uint16_t;
+  #define PSTR(x) (x)
+  #define printf_P printf
+  #define strlen_P strlen
+  #define PROGMEM
+  #define PRIPSTR "%s"
+
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+	#if defined(RF24_TINY)
+	  #define printf_P(...)
+    #endif
+  #endif
+  
+  
+#endif
diff --git a/lib/RF24/utility/LittleWire/includes.h b/lib/RF24/utility/LittleWire/includes.h
new file mode 100644
index 000000000..8e4b6af0f
--- /dev/null
+++ b/lib/RF24/utility/LittleWire/includes.h
@@ -0,0 +1,31 @@
+
+ /**
+ * @file includes.h
+ * Configuration defines for RF24/Linux
+ */
+
+ /**
+ * Example of includes.h for RF24 Linux portability
+ *
+ * @defgroup Porting_Includes Porting: Includes
+ *
+ * 
+ * @{
+ */
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  /**
+   * Define a specific platform for this configuration
+   */
+  #define LITTLEWIRE
+  
+  /**
+   * Load the correct configuration for this platform
+  */
+  #include "LittleWire/RF24_arch_config.h"
+  
+#endif
+
+/*@}*/	
diff --git a/lib/RF24/utility/MRAA/RF24_arch_config.h b/lib/RF24/utility/MRAA/RF24_arch_config.h
new file mode 100644
index 000000000..e4683ddc1
--- /dev/null
+++ b/lib/RF24/utility/MRAA/RF24_arch_config.h
@@ -0,0 +1,64 @@
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+  #include "mraa.h"
+  #include "spi.h"
+  #include "gpio.h"
+  #include "compatibility.h"
+
+  #include <stdint.h>
+  #include <stdio.h>
+  #include <time.h>
+  #include <string.h>
+  #include <sys/time.h>
+  #include <stddef.h>
+  #include <iostream>
+  #include <unistd.h>
+  #include <stdlib.h>
+  
+  //#include <UtilTime.h> // Precompiled arduino x86 based utiltime for timing functions
+
+  // GCC a Arduino Missing
+  #define HIGH	1
+  #define LOW	0
+  #define _BV(x) (1<<(x))
+  #define pgm_read_word(p) (*(p))
+  #define pgm_read_byte(p) (*(p))
+  #define pgm_read_ptr(p) (*(p))
+  #define _SPI spi
+  
+  #define RF24_LINUX
+  //typedef uint16_t prog_uint16_t;
+  #define PSTR(x) (x)
+  #define printf_P printf
+  #define sprintf_P sprintf
+  #define strlen_P strlen
+  #define PROGMEM
+  #define PRIPSTR "%s"
+
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+  #endif
+  
+  #define digitalWrite(pin, value) gpio.write(pin, value)
+  #define digitalRead(pin) GPIO::read(pin)
+  #define pinMode(pin, direction) gpio.open(pin, direction)
+
+  #ifndef __TIME_H__
+    // Prophet: Redefine time functions only if precompiled arduino time is not included
+	#define delay(milisec) __msleep(milisec)
+	#define delayMicroseconds(usec) __usleep(usec)
+	#define millis() __millis()
+  #endif
+  
+  #define INPUT mraa::DIR_IN
+  #define OUTPUT mraa::DIR_OUT  
+
+  // SPI defines for ARDUINO API
+  #define MSBFIRST 1
+  #define SPI_MODE0 mraa::SPI_MODE0
+  #define SPI_CLOCK_DIV2 8000000
+
+#endif
diff --git a/lib/RF24/utility/MRAA/compatibility.c b/lib/RF24/utility/MRAA/compatibility.c
new file mode 100644
index 000000000..afe555df1
--- /dev/null
+++ b/lib/RF24/utility/MRAA/compatibility.c
@@ -0,0 +1,48 @@
+
+#include "compatibility.h"
+
+static struct timeval start, end;
+//static long mtime, seconds, useconds;
+
+/**********************************************************************/
+/**
+ * This function is added in order to simulate arduino delay() function
+ * @param milisec
+ */
+void __msleep(int milisec)
+{
+	struct timespec req = {0};
+	req.tv_sec = 0;
+	req.tv_nsec = milisec * 1000000L;
+	nanosleep(&req, (struct timespec *)NULL);	
+	//usleep(milisec*1000);
+}
+
+void __usleep(int milisec)
+{
+	struct timespec req = {0};
+	req.tv_sec = 0;
+	req.tv_nsec = milisec * 1000L;
+	nanosleep(&req, (struct timespec *)NULL);	
+	//usleep(milisec);
+}
+
+/**
+ * This function is added in order to simulate arduino millis() function
+ */
+void __start_timer()
+{
+	gettimeofday(&start, NULL);
+}
+
+long __millis()
+{
+    static long mtime, seconds, useconds;
+	
+	gettimeofday(&end, NULL);
+    seconds  = end.tv_sec  - start.tv_sec;
+    useconds = end.tv_usec - start.tv_usec;
+
+    mtime = ((seconds) * 1000 + useconds/1000.0) + 0.5;	
+	return mtime;
+}
diff --git a/lib/RF24/utility/MRAA/compatibility.h b/lib/RF24/utility/MRAA/compatibility.h
new file mode 100644
index 000000000..f90083a61
--- /dev/null
+++ b/lib/RF24/utility/MRAA/compatibility.h
@@ -0,0 +1,29 @@
+/* 
+ * File:   compatiblity.h
+ * Author: purinda
+ *
+ * Created on 24 June 2012, 3:08 PM
+ */
+
+#ifndef COMPATIBLITY_H
+#define	COMPATIBLITY_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+	
+#include <stddef.h>
+#include <time.h>
+#include <sys/time.h>
+
+void __msleep(int milisec);
+void __usleep(int milisec);
+void __start_timer();
+long __millis();
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* COMPATIBLITY_H */
+
diff --git a/lib/RF24/utility/MRAA/gpio.cpp b/lib/RF24/utility/MRAA/gpio.cpp
new file mode 100644
index 000000000..93b59d1a5
--- /dev/null
+++ b/lib/RF24/utility/MRAA/gpio.cpp
@@ -0,0 +1,83 @@
+/* 
+ * TMRh20 2015
+ * 
+ */
+
+#include "gpio.h"
+
+GPIO::GPIO() {
+	// Prophet: basic members initialization
+	gpio_ce_pin = -1;
+	//gpio_cs_pin = -1;
+	gpio_0 = NULL;
+	//gpio_1 = NULL;
+}
+
+GPIO::~GPIO() {
+	// Prophet: this should free memory, and unexport pins when RF24 and/or GPIO gets deleted or goes out of scope
+	this->close(gpio_ce_pin);
+	//this->close(gpio_cs_pin);
+}
+
+void GPIO::begin(uint8_t ce_pin, uint8_t cs_pin)
+{	
+	gpio_ce_pin = ce_pin;
+	//gpio_cs_pin = cs_pin;
+	
+	// Prophet: owner can be set here, because we use our pins exclusively, and are making mraa:Gpio context persistent
+	// so pins will be unexported only if close is called, or on destruction
+	gpio_0 = new mraa::Gpio(ce_pin/*,0*/);
+	//gpio_1 = new mraa::Gpio(cs_pin/*,0*/);
+}
+void GPIO::open(int port, int DDR)
+{		
+	if(port == gpio_ce_pin){
+		gpio_0 = new mraa::Gpio(port,0);
+		gpio_0->useMmap(true);
+		gpio_0->dir( (mraa::Dir)DDR);
+	}/*else
+	if(port == gpio_cs_pin){
+		gpio_1 = new mraa::Gpio(port,0);
+		gpio_1->useMmap(true);
+		gpio_1->dir( (mraa::Dir)DDR);
+	}*/		
+}
+
+void GPIO::close(int port)
+{	
+	// Prophet: using same theme of working with port numbers as with GPIO::open,
+	// checking for mraa::Gpio context existence to be sure, that GPIO::begin was called
+	if(port == gpio_ce_pin)
+	{
+		if (gpio_0 != NULL)	{
+			delete gpio_0;
+		}
+	}
+
+	/*if(port == gpio_cs_pin) {
+		if (gpio_1 != NULL)	{
+			delete gpio_1;
+		}
+	}*/
+}
+
+int GPIO::read(int port)
+{	
+	if(port == gpio_ce_pin){
+		return gpio_0->read();
+	}/*else
+	if(port == gpio_cs_pin){
+		return gpio_1->read();
+	}*/
+	return -1;
+}
+
+void GPIO::write(int port, int value){
+	
+	if(port == gpio_ce_pin){
+		gpio_0->write( value);
+	}/*else
+	if(port == gpio_cs_pin){
+		gpio_1->write( value);
+	}*/
+}
diff --git a/lib/RF24/utility/MRAA/gpio.h b/lib/RF24/utility/MRAA/gpio.h
new file mode 100644
index 000000000..5d9e442ad
--- /dev/null
+++ b/lib/RF24/utility/MRAA/gpio.h
@@ -0,0 +1,67 @@
+/* 
+ * TMRh20 2015
+ * 
+ */
+
+#ifndef RF24_ARCH_GPIO_H
+#define	RF24_ARCH_GPIO_H
+ /**
+ * @file spi.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for GPIO helper files
+ */
+#include <cstdio>
+#include <stdio.h>
+#include "mraa.hpp"
+
+
+class GPIO {
+public:
+
+	/* Constants */
+		
+	GPIO();
+	virtual ~GPIO();
+	
+	/**
+	 * Sets up GPIO on the CE & CS pins
+     * @param ce_pin
+     * @param cs_pin
+     */	 
+	void begin(uint8_t ce_pin, uint8_t cs_pin);
+	
+	/**
+	 * 
+     * @param port
+     * @param DDR
+     */
+	void open(int port, int DDR);
+	/**
+	 * 
+     * @param port
+     */
+	void close(int port);
+	/**
+	 * 
+     * @param port
+     * @param value
+     */
+	int read(int port);
+	/**
+	* 
+	* @param port
+	* @param value
+	*/	
+	void write(int port,int value);	
+
+private:
+	int gpio_ce_pin; /** ce_pin value of the RF24 device **/
+	//int gpio_cs_pin; /** cs_pin value of the RF24 device **/
+	mraa::Gpio* gpio_0; /** gpio object for ce_pin **/
+	//mraa::Gpio* gpio_1; /** gpio object for cs_pin **/
+};
+/**
+ * \endcond
+ */
+#endif	/* RF24_ARCH_GPIO_H */
+
diff --git a/lib/RF24/utility/MRAA/includes.h b/lib/RF24/utility/MRAA/includes.h
new file mode 100644
index 000000000..12e22b95c
--- /dev/null
+++ b/lib/RF24/utility/MRAA/includes.h
@@ -0,0 +1,11 @@
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  #ifndef MRAA
+  	  #define MRAA
+  #endif
+  #include "MRAA/RF24_arch_config.h"
+   
+  
+#endif
diff --git a/lib/RF24/utility/MRAA/spi.cpp b/lib/RF24/utility/MRAA/spi.cpp
new file mode 100644
index 000000000..73ac8a98b
--- /dev/null
+++ b/lib/RF24/utility/MRAA/spi.cpp
@@ -0,0 +1,47 @@
+
+
+#include "spi.h"
+#include "mraa.h"
+
+SPI::SPI() {
+	mspi = NULL;
+}
+
+
+void SPI::begin(int busNo) {
+	mspi = new mraa::Spi(busNo); // init mraa spi bus, it will handle chip select internally. For CS pin wiring user must check SPI details in hardware manual
+
+	mspi->mode(mraa::SPI_MODE0);
+	mspi->bitPerWord(8);
+	mspi->frequency(8000000); // Prophet: this will try to set 8MHz, however MRAA will reset to max platform speed and syslog a message of it
+}
+
+void SPI::end() {
+	// Prophet: we should check for existence of mspi before deleting it
+	if (mspi != NULL)
+		delete mspi;
+}
+
+void SPI::setBitOrder(uint8_t bit_order) {
+	if (mspi != NULL)
+		mspi->lsbmode((mraa_boolean_t)bit_order); // Prophet: bit_order
+}
+
+void SPI::setDataMode(uint8_t data_mode) {
+	if (mspi != NULL)
+		mspi->mode((mraa::Spi_Mode)data_mode);
+}
+
+void SPI::setClockDivider(uint32_t spi_speed) {
+	if (mspi != NULL)
+		mspi->frequency(spi_speed);
+}
+
+void SPI::chipSelect(int csn_pin){
+
+}
+
+SPI::~SPI() {
+	// Prophet: we should call end here to free used memory and unexport SPI interface
+	this->end();
+}
diff --git a/lib/RF24/utility/MRAA/spi.h b/lib/RF24/utility/MRAA/spi.h
new file mode 100644
index 000000000..0c2871d2a
--- /dev/null
+++ b/lib/RF24/utility/MRAA/spi.h
@@ -0,0 +1,55 @@
+/*
+ * TMRh20 2015
+ * SPI layer for RF24
+ */
+
+#ifndef _SPI_H_INCLUDED
+#define _SPI_H_INCLUDED
+ /**
+ * @file spi.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for SPI helper files
+ */
+#include <stdio.h>
+#include "mraa.hpp"
+
+class SPI {
+public:
+
+  SPI();
+  virtual ~SPI();
+  
+  mraa::Spi* mspi;
+  
+  inline uint8_t transfer(uint8_t _data);
+  inline void transfernb(char* tbuf, char* rbuf, uint32_t len);
+  inline void transfern(char* buf, uint32_t len);  
+
+  void begin(int busNo);
+  void end();
+
+  void setBitOrder(uint8_t bit_order);
+  void setDataMode(uint8_t data_mode);
+  void setClockDivider(uint32_t spi_speed);
+  void chipSelect(int csn_pin);
+};
+
+
+uint8_t SPI::transfer(uint8_t _data)
+{
+	return mspi->writeByte(_data);	
+}
+
+void SPI::transfernb(char* tbuf, char* rbuf, uint32_t len){
+	mspi->transfer((uint8_t*)tbuf, (uint8_t*)rbuf, len);
+}
+
+void SPI::transfern(char* buf, uint32_t len)
+{
+    transfernb(buf, buf, len);
+}
+
+/**
+ * \endcond
+ */
+#endif
diff --git a/lib/RF24/utility/RPi/RF24_arch_config.h b/lib/RF24/utility/RPi/RF24_arch_config.h
new file mode 100644
index 000000000..c656195e1
--- /dev/null
+++ b/lib/RF24/utility/RPi/RF24_arch_config.h
@@ -0,0 +1,44 @@
+
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+  #define RF24_LINUX
+  
+  #include <stdint.h>
+  #include <stdio.h>
+  #include <time.h>
+  #include <string.h>
+  #include <sys/time.h>
+  #include <stddef.h>
+  
+  #include "bcm2835.h"
+  #include "spi.h"
+  #define _SPI spi
+	
+  #if defined SPI_HAS_TRANSACTION && !defined SPI_UART && !defined SOFTSPI
+    #define RF24_SPI_TRANSACTIONS
+  #endif	
+  // GCC a Arduino Missing
+  #define _BV(x) (1<<(x))
+  #define pgm_read_word(p) (*(p))
+  #define pgm_read_byte(p) (*(p))
+  #define pgm_read_ptr(p) (*(p))
+  
+  //typedef uint16_t prog_uint16_t;
+  #define PSTR(x) (x)
+  #define printf_P printf
+  #define strlen_P strlen
+  #define PROGMEM
+  #define PRIPSTR "%s"
+
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+  #endif
+  
+  #define digitalWrite(pin, value) bcm2835_gpio_write(pin, value)
+  #define pinMode(pin,value) bcm2835_gpio_fsel(pin,value);
+  #define OUTPUT BCM2835_GPIO_FSEL_OUTP
+  
+#endif
\ No newline at end of file
diff --git a/lib/RF24/utility/RPi/bcm2835.c b/lib/RF24/utility/RPi/bcm2835.c
new file mode 100644
index 000000000..3213ec95c
--- /dev/null
+++ b/lib/RF24/utility/RPi/bcm2835.c
@@ -0,0 +1,1984 @@
+/* bcm2835.c
+// C and C++ support for Broadcom BCM 2835 as used in Raspberry Pi
+// http://elinux.org/RPi_Low-level_peripherals
+// http://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf
+//
+// Author: Mike McCauley
+// Copyright (C) 2011-2013 Mike McCauley
+// $Id: bcm2835.c,v 1.27 2019/07/22 23:04:24 mikem Exp mikem $
+*/
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#define BCK2835_LIBRARY_BUILD
+#include "bcm2835.h"
+
+/* This define enables a little test program (by default a blinking output on pin RPI_GPIO_PIN_11)
+// You can do some safe, non-destructive testing on any platform with:
+// gcc bcm2835.c -D BCM2835_TEST
+// ./a.out
+*/
+/*#define BCM2835_TEST*/
+
+/* Uncommenting this define compiles alternative I2C code for the version 1 RPi
+// The P1 header I2C pins are connected to SDA0 and SCL0 on V1.
+// By default I2C code is generated for the V2 RPi which has SDA1 and SCL1 connected.
+*/
+/* #define I2C_V1*/
+
+/* Physical address and size of the peripherals block
+// May be overridden on RPi2
+*/
+uint32_t *bcm2835_peripherals_base = (uint32_t *)BCM2835_PERI_BASE;
+uint32_t bcm2835_peripherals_size = BCM2835_PERI_SIZE;
+
+/* Virtual memory address of the mapped peripherals block 
+ */
+uint32_t *bcm2835_peripherals = (uint32_t *)MAP_FAILED;
+
+/* And the register bases within the peripherals block
+ */
+volatile uint32_t *bcm2835_gpio        = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_pwm         = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_clk         = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_pads        = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_spi0        = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_bsc0        = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_bsc1        = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_st	       = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_aux	       = (uint32_t *)MAP_FAILED;
+volatile uint32_t *bcm2835_spi1        = (uint32_t *)MAP_FAILED;
+
+
+
+/* This variable allows us to test on hardware other than RPi.
+// It prevents access to the kernel memory, and does not do any peripheral access
+// Instead it prints out what it _would_ do if debug were 0
+ */
+static uint8_t debug = 0;
+
+/* RPI 4 has different pullup registers - we need to know if we have that type */
+
+static uint8_t pud_type_rpi4 = 0;
+
+/* RPI 4 has different pullup operation - make backwards compat */
+
+static uint8_t pud_compat_setting = BCM2835_GPIO_PUD_OFF;
+
+/* I2C The time needed to transmit one byte. In microseconds.
+ */
+static int i2c_byte_wait_us = 0;
+
+// Time for millis()
+static unsigned long long epoch ;
+
+/* SPI bit order. BCM2835 SPI0 only supports MSBFIRST, so we instead 
+ * have a software based bit reversal, based on a contribution by Damiano Benedetti
+ */
+static uint8_t bcm2835_spi_bit_order = BCM2835_SPI_BIT_ORDER_MSBFIRST;
+static uint8_t bcm2835_byte_reverse_table[] = 
+{
+    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+};
+
+static uint8_t bcm2835_correct_order(uint8_t b)
+{
+    if (bcm2835_spi_bit_order == BCM2835_SPI_BIT_ORDER_LSBFIRST)
+	return bcm2835_byte_reverse_table[b];
+    else
+	return b;
+}
+
+/*
+// Low level register access functions
+*/
+
+/* Function to return the pointers to the hardware register bases */
+uint32_t* bcm2835_regbase(uint8_t regbase)
+{
+    switch (regbase)
+    {
+	case BCM2835_REGBASE_ST:
+	    return (uint32_t *)bcm2835_st;
+	case BCM2835_REGBASE_GPIO:
+	    return (uint32_t *)bcm2835_gpio;
+	case BCM2835_REGBASE_PWM:
+	    return (uint32_t *)bcm2835_pwm;
+	case BCM2835_REGBASE_CLK:
+	    return (uint32_t *)bcm2835_clk;
+	case BCM2835_REGBASE_PADS:
+	    return (uint32_t *)bcm2835_pads;
+	case BCM2835_REGBASE_SPI0:
+	    return (uint32_t *)bcm2835_spi0;
+	case BCM2835_REGBASE_BSC0:
+	    return (uint32_t *)bcm2835_bsc0;
+	case BCM2835_REGBASE_BSC1:
+	    return (uint32_t *)bcm2835_st;
+	case BCM2835_REGBASE_AUX:
+	    return (uint32_t *)bcm2835_aux;
+	case BCM2835_REGBASE_SPI1:
+	    return (uint32_t *)bcm2835_spi1;
+
+    }
+    return (uint32_t *)MAP_FAILED;
+}
+
+void  bcm2835_set_debug(uint8_t d)
+{
+    debug = d;
+}
+
+unsigned int bcm2835_version(void) 
+{
+    return BCM2835_VERSION;
+}
+
+/* Read with memory barriers from peripheral
+ *
+ */
+uint32_t bcm2835_peri_read(volatile uint32_t* paddr)
+{
+    uint32_t ret;
+    if (debug)
+    {
+		printf("bcm2835_peri_read  paddr %p\n", (void *) paddr);
+		return 0;
+    }
+    else
+    {
+       __sync_synchronize();
+       ret = *paddr;
+       __sync_synchronize();
+       return ret;
+    }
+}
+
+/* read from peripheral without the read barrier
+ * This can only be used if more reads to THE SAME peripheral
+ * will follow.  The sequence must terminate with memory barrier
+ * before any read or write to another peripheral can occur.
+ * The MB can be explicit, or one of the barrier read/write calls.
+ */
+uint32_t bcm2835_peri_read_nb(volatile uint32_t* paddr)
+{
+    if (debug)
+    {
+	printf("bcm2835_peri_read_nb  paddr %p\n", paddr);
+	return 0;
+    }
+    else
+    {
+	return *paddr;
+    }
+}
+
+/* Write with memory barriers to peripheral
+ */
+
+void bcm2835_peri_write(volatile uint32_t* paddr, uint32_t value)
+{
+    if (debug)
+    {
+	printf("bcm2835_peri_write paddr %p, value %08X\n", paddr, value);
+    }
+    else
+    {
+        __sync_synchronize();
+        *paddr = value;
+        __sync_synchronize();
+    }
+}
+
+/* write to peripheral without the write barrier */
+void bcm2835_peri_write_nb(volatile uint32_t* paddr, uint32_t value)
+{
+    if (debug)
+    {
+	printf("bcm2835_peri_write_nb paddr %p, value %08X\n",
+                paddr, value);
+    }
+    else
+    {
+	*paddr = value;
+    }
+}
+
+/* Set/clear only the bits in value covered by the mask
+ * This is not atomic - can be interrupted.
+ */
+void bcm2835_peri_set_bits(volatile uint32_t* paddr, uint32_t value, uint32_t mask)
+{
+    uint32_t v = bcm2835_peri_read(paddr);
+    v = (v & ~mask) | (value & mask);
+    bcm2835_peri_write(paddr, v);
+}
+
+/*
+// Low level convenience functions
+*/
+
+/* Function select
+// pin is a BCM2835 GPIO pin number NOT RPi pin number
+//      There are 6 control registers, each control the functions of a block
+//      of 10 pins.
+//      Each control register has 10 sets of 3 bits per GPIO pin:
+//
+//      000 = GPIO Pin X is an input
+//      001 = GPIO Pin X is an output
+//      100 = GPIO Pin X takes alternate function 0
+//      101 = GPIO Pin X takes alternate function 1
+//      110 = GPIO Pin X takes alternate function 2
+//      111 = GPIO Pin X takes alternate function 3
+//      011 = GPIO Pin X takes alternate function 4
+//      010 = GPIO Pin X takes alternate function 5
+//
+// So the 3 bits for port X are:
+//      X / 10 + ((X % 10) * 3)
+*/
+void bcm2835_gpio_fsel(uint8_t pin, uint8_t mode)
+{
+    /* Function selects are 10 pins per 32 bit word, 3 bits per pin */
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPFSEL0/4 + (pin/10);
+    uint8_t   shift = (pin % 10) * 3;
+    uint32_t  mask = BCM2835_GPIO_FSEL_MASK << shift;
+    uint32_t  value = mode << shift;
+    bcm2835_peri_set_bits(paddr, value, mask);
+}
+
+/* Set output pin */
+void bcm2835_gpio_set(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPSET0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    bcm2835_peri_write(paddr, 1 << shift);
+}
+
+/* Clear output pin */
+void bcm2835_gpio_clr(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPCLR0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    bcm2835_peri_write(paddr, 1 << shift);
+}
+
+/* Set all output pins in the mask */
+void bcm2835_gpio_set_multi(uint32_t mask)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPSET0/4;
+    bcm2835_peri_write(paddr, mask);
+}
+
+/* Clear all output pins in the mask */
+void bcm2835_gpio_clr_multi(uint32_t mask)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPCLR0/4;
+    bcm2835_peri_write(paddr, mask);
+}
+
+/* Read input pin */
+uint8_t bcm2835_gpio_lev(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPLEV0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = bcm2835_peri_read(paddr);
+    return (value & (1 << shift)) ? HIGH : LOW;
+}
+
+/* See if an event detection bit is set
+// Sigh cant support interrupts yet
+*/
+uint8_t bcm2835_gpio_eds(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPEDS0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = bcm2835_peri_read(paddr);
+    return (value & (1 << shift)) ? HIGH : LOW;
+}
+
+uint32_t bcm2835_gpio_eds_multi(uint32_t mask)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPEDS0/4;
+    uint32_t value = bcm2835_peri_read(paddr);
+    return (value & mask);
+}
+
+/* Write a 1 to clear the bit in EDS */
+void bcm2835_gpio_set_eds(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPEDS0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_write(paddr, value);
+}
+
+void bcm2835_gpio_set_eds_multi(uint32_t mask)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPEDS0/4;
+    bcm2835_peri_write(paddr, mask);
+}
+
+/* Rising edge detect enable */
+void bcm2835_gpio_ren(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPREN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_ren(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPREN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* Falling edge detect enable */
+void bcm2835_gpio_fen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPFEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_fen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPFEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* High detect enable */
+void bcm2835_gpio_hen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPHEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_hen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPHEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* Low detect enable */
+void bcm2835_gpio_len(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPLEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_len(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPLEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* Async rising edge detect enable */
+void bcm2835_gpio_aren(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPAREN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_aren(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPAREN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* Async falling edge detect enable */
+void bcm2835_gpio_afen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPAFEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, value, value);
+}
+void bcm2835_gpio_clr_afen(uint8_t pin)
+{
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPAFEN0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    uint32_t value = 1 << shift;
+    bcm2835_peri_set_bits(paddr, 0, value);
+}
+
+/* Set pullup/down */
+void bcm2835_gpio_pud(uint8_t pud)
+{
+    if( pud_type_rpi4 )
+    {
+        pud_compat_setting = pud;
+    }
+    else {
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPPUD/4;
+    bcm2835_peri_write(paddr, pud);
+}
+}
+
+/* Pullup/down clock
+// Clocks the value of pud into the GPIO pin
+*/
+void bcm2835_gpio_pudclk(uint8_t pin, uint8_t on)
+{
+    if( pud_type_rpi4 )
+    {
+        if( on )
+            bcm2835_gpio_set_pud( pin, pud_compat_setting);
+    }
+    else
+    {
+    volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPPUDCLK0/4 + pin/32;
+    uint8_t shift = pin % 32;
+    bcm2835_peri_write(paddr, (on ? 1 : 0) << shift);
+}
+}
+
+/* Read GPIO pad behaviour for groups of GPIOs */
+uint32_t bcm2835_gpio_pad(uint8_t group)
+{
+  if (bcm2835_pads == MAP_FAILED)
+    return 0;
+  
+    volatile uint32_t* paddr = bcm2835_pads + BCM2835_PADS_GPIO_0_27/4 + group;
+    return bcm2835_peri_read(paddr);
+}
+
+/* Set GPIO pad behaviour for groups of GPIOs
+// powerup value for all pads is
+// BCM2835_PAD_SLEW_RATE_UNLIMITED | BCM2835_PAD_HYSTERESIS_ENABLED | BCM2835_PAD_DRIVE_8mA
+*/
+void bcm2835_gpio_set_pad(uint8_t group, uint32_t control)
+{
+  if (bcm2835_pads == MAP_FAILED)
+    return;
+  
+    volatile uint32_t* paddr = bcm2835_pads + BCM2835_PADS_GPIO_0_27/4 + group;
+    bcm2835_peri_write(paddr, control | BCM2835_PAD_PASSWRD);
+}
+
+/* Some convenient arduino-like functions
+// milliseconds
+*/
+void bcm2835_delay(unsigned int millis)
+{
+    struct timespec sleeper;
+    
+    sleeper.tv_sec  = (time_t)(millis / 1000);
+    sleeper.tv_nsec = (long)(millis % 1000) * 1000000;
+    nanosleep(&sleeper, NULL);
+}
+
+/* microseconds */
+void bcm2835_delayMicroseconds(uint64_t micros)
+{
+    struct timespec t1;
+    uint64_t        start;
+	
+    if (debug)
+    {
+	/* Cant access sytem timers in debug mode */
+	printf("bcm2835_delayMicroseconds %lld\n", (long long int) micros);
+	return;
+    }
+
+    /* Calling nanosleep() takes at least 100-200 us, so use it for
+    // long waits and use a busy wait on the System Timer for the rest.
+    */
+    start =  bcm2835_st_read();
+   
+    /* Not allowed to access timer registers (result is not as precise)*/
+    if (start==0)
+    {
+	t1.tv_sec = 0;
+	t1.tv_nsec = 1000 * (long)(micros);
+	nanosleep(&t1, NULL);
+	return;
+    }
+
+    if (micros > 450)
+    {
+	t1.tv_sec = 0;
+	t1.tv_nsec = 1000 * (long)(micros - 200);
+	nanosleep(&t1, NULL);
+    }    
+  
+    bcm2835_st_delay(start, micros);
+}
+
+// This function is added in order to simulate arduino millis() function
+unsigned int bcm2835_millis(void)
+{
+struct timeval now;
+unsigned long long ms;
+
+gettimeofday(&now, NULL);
+
+ms = (now.tv_sec * 1000000 + now.tv_usec) / 1000 ;
+
+return ((uint32_t) (ms - epoch ));
+}
+
+/*
+// Higher level convenience functions
+*/
+
+/* Set the state of an output */
+void bcm2835_gpio_write(uint8_t pin, uint8_t on)
+{
+    if (on)
+	bcm2835_gpio_set(pin);
+    else
+	bcm2835_gpio_clr(pin);
+}
+
+/* Set the state of a all 32 outputs in the mask to on or off */
+void bcm2835_gpio_write_multi(uint32_t mask, uint8_t on)
+{
+    if (on)
+	bcm2835_gpio_set_multi(mask);
+    else
+	bcm2835_gpio_clr_multi(mask);
+}
+
+/* Set the state of a all 32 outputs in the mask to the values in value */
+void bcm2835_gpio_write_mask(uint32_t value, uint32_t mask)
+{
+    bcm2835_gpio_set_multi(value & mask);
+    bcm2835_gpio_clr_multi((~value) & mask);
+}
+
+/* Set the pullup/down resistor for a pin
+//
+// The GPIO Pull-up/down Clock Registers control the actuation of internal pull-downs on
+// the respective GPIO pins. These registers must be used in conjunction with the GPPUD
+// register to effect GPIO Pull-up/down changes. The following sequence of events is
+// required:
+// 1. Write to GPPUD to set the required control signal (i.e. Pull-up or Pull-Down or neither
+// to remove the current Pull-up/down)
+// 2. Wait 150 cycles ? this provides the required set-up time for the control signal
+// 3. Write to GPPUDCLK0/1 to clock the control signal into the GPIO pads you wish to
+// modify ? NOTE only the pads which receive a clock will be modified, all others will
+// retain their previous state.
+// 4. Wait 150 cycles ? this provides the required hold time for the control signal
+// 5. Write to GPPUD to remove the control signal
+// 6. Write to GPPUDCLK0/1 to remove the clock
+//
+// RPi has P1-03 and P1-05 with 1k8 pullup resistor
+//
+// RPI 4 uses a different PUD method - no clock
+
+*/
+void bcm2835_gpio_set_pud(uint8_t pin, uint8_t pud)
+{
+    if( pud_type_rpi4 )
+    {
+        int shiftbits = (pin & 0xf) << 1;
+        uint32_t bits;
+        uint32_t pull;
+        
+        switch (pud)
+        {
+           case BCM2835_GPIO_PUD_OFF:  pull = 0; break;
+           case BCM2835_GPIO_PUD_UP:   pull = 1; break;
+           case BCM2835_GPIO_PUD_DOWN: pull = 2; break;
+           default: return;
+        }
+                
+        volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPPUPPDN0/4 + (pin >> 4);
+        
+        bits = bcm2835_peri_read_nb( paddr );
+        bits &= ~(3 << shiftbits);
+        bits |= (pull << shiftbits);
+        
+        bcm2835_peri_write_nb( paddr, bits );
+        
+    } else
+    {
+    bcm2835_gpio_pud(pud);
+    delayMicroseconds(10);
+    bcm2835_gpio_pudclk(pin, 1);
+    delayMicroseconds(10);
+    bcm2835_gpio_pud(BCM2835_GPIO_PUD_OFF);
+    bcm2835_gpio_pudclk(pin, 0);
+}
+
+}
+
+
+uint8_t bcm2835_gpio_get_pud(uint8_t pin)
+{
+    uint8_t ret = BCM2835_GPIO_PUD_ERROR;
+    
+    if( pud_type_rpi4 )
+    {
+        uint32_t bits;
+        volatile uint32_t* paddr = bcm2835_gpio + BCM2835_GPPUPPDN0/4 + (pin >> 4);
+        bits = (bcm2835_peri_read_nb( paddr ) >> ((pin & 0xf)<<1)) & 0x3;
+        
+        switch (bits)
+        {
+            case 0: ret = BCM2835_GPIO_PUD_OFF; break;
+            case 1: ret = BCM2835_GPIO_PUD_UP; break;
+            case 2: ret = BCM2835_GPIO_PUD_DOWN; break;
+            default: ret = BCM2835_GPIO_PUD_ERROR;
+        }   
+    }
+    
+    return ret;
+}
+
+
+int bcm2835_spi_begin(void)
+{
+    volatile uint32_t* paddr;
+
+    if (bcm2835_spi0 == MAP_FAILED)
+      return 0; /* bcm2835_init() failed, or not root */
+    
+    /* Set the SPI0 pins to the Alt 0 function to enable SPI0 access on them */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_26, BCM2835_GPIO_FSEL_ALT0); /* CE1 */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_24, BCM2835_GPIO_FSEL_ALT0); /* CE0 */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_21, BCM2835_GPIO_FSEL_ALT0); /* MISO */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_19, BCM2835_GPIO_FSEL_ALT0); /* MOSI */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_23, BCM2835_GPIO_FSEL_ALT0); /* CLK */
+    
+    /* Set the SPI CS register to the some sensible defaults */
+    paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    bcm2835_peri_write(paddr, 0); /* All 0s */
+    
+    /* Clear TX and RX fifos */
+    bcm2835_peri_write_nb(paddr, BCM2835_SPI0_CS_CLEAR);
+
+    return 1; // OK
+}
+
+void bcm2835_spi_end(void)
+{  
+    /* Set all the SPI0 pins back to input */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_26, BCM2835_GPIO_FSEL_INPT); /* CE1 */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_24, BCM2835_GPIO_FSEL_INPT); /* CE0 */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_21, BCM2835_GPIO_FSEL_INPT); /* MISO */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_19, BCM2835_GPIO_FSEL_INPT); /* MOSI */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_23, BCM2835_GPIO_FSEL_INPT); /* CLK */
+}
+
+void bcm2835_spi_setBitOrder(uint8_t order)
+{
+    bcm2835_spi_bit_order = order;
+}
+
+/* defaults to 0, which means a divider of 65536.
+// The divisor must be a power of 2. Odd numbers
+// rounded down. The maximum SPI clock rate is
+// of the APB clock
+*/
+void bcm2835_spi_setClockDivider(uint16_t divider)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CLK/4;
+    bcm2835_peri_write(paddr, divider);
+}
+
+void bcm2835_spi_set_speed_hz(uint32_t speed_hz)
+{
+	uint16_t divider = (uint16_t) ((uint32_t) BCM2835_CORE_CLK_HZ / speed_hz);
+	divider &= 0xFFFE;
+	bcm2835_spi_setClockDivider(divider);
+}
+
+void bcm2835_spi_setDataMode(uint8_t mode)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    /* Mask in the CPO and CPHA bits of CS */
+    bcm2835_peri_set_bits(paddr, mode << 2, BCM2835_SPI0_CS_CPOL | BCM2835_SPI0_CS_CPHA);
+}
+
+/* Writes (and reads) a single byte to SPI */
+uint8_t bcm2835_spi_transfer(uint8_t value)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
+    uint32_t ret;
+
+    /* This is Polled transfer as per section 10.6.1
+    // BUG ALERT: what happens if we get interupted in this section, and someone else
+    // accesses a different peripheral? 
+    // Clear TX and RX fifos
+    */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_CLEAR, BCM2835_SPI0_CS_CLEAR);
+
+    /* Set TA = 1 */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_TA, BCM2835_SPI0_CS_TA);
+
+    /* Maybe wait for TXD */
+    while (!(bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD))
+	;
+
+    /* Write to FIFO, no barrier */
+    bcm2835_peri_write_nb(fifo, bcm2835_correct_order(value));
+
+    /* Wait for DONE to be set */
+    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE))
+	;
+
+    /* Read any byte that was sent back by the slave while we sere sending to it */
+    ret = bcm2835_correct_order(bcm2835_peri_read_nb(fifo));
+
+    /* Set TA = 0, and also set the barrier */
+    bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
+
+    return ret;
+}
+
+/* Writes (and reads) an number of bytes to SPI */
+void bcm2835_spi_transfernb(char* tbuf, char* rbuf, uint32_t len)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
+    uint32_t TXCnt=0;
+    uint32_t RXCnt=0;
+
+    /* This is Polled transfer as per section 10.6.1
+    // BUG ALERT: what happens if we get interupted in this section, and someone else
+    // accesses a different peripheral? 
+    */
+
+    /* Clear TX and RX fifos */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_CLEAR, BCM2835_SPI0_CS_CLEAR);
+
+    /* Set TA = 1 */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_TA, BCM2835_SPI0_CS_TA);
+
+    /* Use the FIFO's to reduce the interbyte times */
+    while((TXCnt < len)||(RXCnt < len))
+    {
+        /* TX fifo not full, so add some more bytes */
+        while(((bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD))&&(TXCnt < len ))
+        {
+	    bcm2835_peri_write_nb(fifo, bcm2835_correct_order(tbuf[TXCnt]));
+	    TXCnt++;
+        }
+        /* Rx fifo not empty, so get the next received bytes */
+        while(((bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_RXD))&&( RXCnt < len ))
+        {
+	    rbuf[RXCnt] = bcm2835_correct_order(bcm2835_peri_read_nb(fifo));
+	    RXCnt++;
+        }
+    }
+    /* Wait for DONE to be set */
+    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE))
+	;
+
+    /* Set TA = 0, and also set the barrier */
+    bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
+}
+
+/* Writes an number of bytes to SPI */
+void bcm2835_spi_writenb(const char* tbuf, uint32_t len)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
+    uint32_t i;
+
+    /* This is Polled transfer as per section 10.6.1
+    // BUG ALERT: what happens if we get interupted in this section, and someone else
+    // accesses a different peripheral?
+    // Answer: an ISR is required to issue the required memory barriers.
+    */
+
+    /* Clear TX and RX fifos */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_CLEAR, BCM2835_SPI0_CS_CLEAR);
+
+    /* Set TA = 1 */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_TA, BCM2835_SPI0_CS_TA);
+
+    for (i = 0; i < len; i++)
+    {
+	/* Maybe wait for TXD */
+	while (!(bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD))
+	    ;
+	
+	/* Write to FIFO, no barrier */
+	bcm2835_peri_write_nb(fifo, bcm2835_correct_order(tbuf[i]));
+	
+	/* Read from FIFO to prevent stalling */
+	while (bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_RXD)
+	    (void) bcm2835_peri_read_nb(fifo);
+    }
+    
+    /* Wait for DONE to be set */
+    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE)) {
+	while (bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_RXD)
+		(void) bcm2835_peri_read_nb(fifo);
+    };
+
+    /* Set TA = 0, and also set the barrier */
+    bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
+}
+
+/* Writes (and reads) an number of bytes to SPI
+// Read bytes are copied over onto the transmit buffer
+*/
+void bcm2835_spi_transfern(char* buf, uint32_t len)
+{
+    bcm2835_spi_transfernb(buf, buf, len);
+}
+
+void bcm2835_spi_chipSelect(uint8_t cs)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    /* Mask in the CS bits of CS */
+    bcm2835_peri_set_bits(paddr, cs, BCM2835_SPI0_CS_CS);
+}
+
+void bcm2835_spi_setChipSelectPolarity(uint8_t cs, uint8_t active)
+{
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    uint8_t shift = 21 + cs;
+    /* Mask in the appropriate CSPOLn bit */
+    bcm2835_peri_set_bits(paddr, active << shift, 1 << shift);
+}
+
+void bcm2835_spi_write(uint16_t data)
+{
+#if 0
+	char buf[2];
+
+	buf[0] = data >> 8;
+	buf[1] = data & 0xFF;
+
+	bcm2835_spi_transfern(buf, 2);
+#else
+    volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
+    volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
+
+    /* Clear TX and RX fifos */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_CLEAR, BCM2835_SPI0_CS_CLEAR);
+
+    /* Set TA = 1 */
+    bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_TA, BCM2835_SPI0_CS_TA);
+
+	/* Maybe wait for TXD */
+	while (!(bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD))
+	    ;
+
+	/* Write to FIFO */
+	bcm2835_peri_write_nb(fifo,  (uint32_t) data >> 8);
+	bcm2835_peri_write_nb(fifo,  data & 0xFF);
+
+
+    /* Wait for DONE to be set */
+    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE))
+	;
+
+    /* Set TA = 0, and also set the barrier */
+    bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
+#endif
+}
+
+int bcm2835_aux_spi_begin(void)
+{
+    volatile uint32_t* enable = bcm2835_aux + BCM2835_AUX_ENABLE/4;
+    volatile uint32_t* cntl0 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL0/4;
+    volatile uint32_t* cntl1 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL1/4;
+
+    if (bcm2835_spi1 == MAP_FAILED)
+      return 0; /* bcm2835_init() failed, or not root */
+
+    /* Set the SPI pins to the Alt 4 function to enable SPI1 access on them */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_36, BCM2835_GPIO_FSEL_ALT4);	/* SPI1_CE2_N */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_35, BCM2835_GPIO_FSEL_ALT4);	/* SPI1_MISO */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_38, BCM2835_GPIO_FSEL_ALT4);	/* SPI1_MOSI */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_40, BCM2835_GPIO_FSEL_ALT4);	/* SPI1_SCLK */
+
+	bcm2835_aux_spi_setClockDivider(bcm2835_aux_spi_CalcClockDivider(1000000));	// Default 1MHz SPI
+
+	bcm2835_peri_write(enable, BCM2835_AUX_ENABLE_SPI0);
+	bcm2835_peri_write(cntl1, 0);
+	bcm2835_peri_write(cntl0, BCM2835_AUX_SPI_CNTL0_CLEARFIFO);
+
+    return 1; /* OK */
+}
+
+void bcm2835_aux_spi_end(void)
+{
+	/* Set all the SPI1 pins back to input */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_36, BCM2835_GPIO_FSEL_INPT);	/* SPI1_CE2_N */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_35, BCM2835_GPIO_FSEL_INPT);	/* SPI1_MISO */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_38, BCM2835_GPIO_FSEL_INPT);	/* SPI1_MOSI */
+	bcm2835_gpio_fsel(RPI_V2_GPIO_P1_40, BCM2835_GPIO_FSEL_INPT);	/* SPI1_SCLK */
+}
+
+#define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
+
+uint16_t bcm2835_aux_spi_CalcClockDivider(uint32_t speed_hz)
+{
+	uint16_t divider;
+
+	if (speed_hz < (uint32_t) BCM2835_AUX_SPI_CLOCK_MIN) {
+		speed_hz = (uint32_t) BCM2835_AUX_SPI_CLOCK_MIN;
+	} else if (speed_hz > (uint32_t) BCM2835_AUX_SPI_CLOCK_MAX) {
+		speed_hz = (uint32_t) BCM2835_AUX_SPI_CLOCK_MAX;
+	}
+
+	divider = (uint16_t) DIV_ROUND_UP(BCM2835_CORE_CLK_HZ, 2 * speed_hz) - 1;
+
+	if (divider > (uint16_t) BCM2835_AUX_SPI_CNTL0_SPEED_MAX) {
+		return (uint16_t) BCM2835_AUX_SPI_CNTL0_SPEED_MAX;
+	}
+
+	return divider;
+}
+
+static uint32_t spi1_speed;
+
+void bcm2835_aux_spi_setClockDivider(uint16_t divider)
+{
+		spi1_speed = (uint32_t) divider;
+}
+
+void bcm2835_aux_spi_write(uint16_t data)
+{
+    volatile uint32_t* cntl0 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL0/4;
+    volatile uint32_t* cntl1 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL1/4;
+    volatile uint32_t* stat = bcm2835_spi1 + BCM2835_AUX_SPI_STAT/4;
+    volatile uint32_t* io = bcm2835_spi1 + BCM2835_AUX_SPI_IO/4;
+
+	uint32_t _cntl0 = (spi1_speed << BCM2835_AUX_SPI_CNTL0_SPEED_SHIFT);
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_CS2_N;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_ENABLE;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_MSBF_OUT;
+	_cntl0 |= 16; // Shift length
+
+	bcm2835_peri_write(cntl0, _cntl0);
+	bcm2835_peri_write(cntl1, BCM2835_AUX_SPI_CNTL1_MSBF_IN);
+
+	while (bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_TX_FULL)
+		;
+
+	bcm2835_peri_write(io, (uint32_t) data << 16);
+}
+
+void bcm2835_aux_spi_writenb(const char *tbuf, uint32_t len) {
+    volatile uint32_t* cntl0 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL0/4;
+    volatile uint32_t* cntl1 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL1/4;
+    volatile uint32_t* stat = bcm2835_spi1 + BCM2835_AUX_SPI_STAT/4;
+    volatile uint32_t* txhold = bcm2835_spi1 + BCM2835_AUX_SPI_TXHOLD/4;
+    volatile uint32_t* io = bcm2835_spi1 + BCM2835_AUX_SPI_IO/4;
+
+	char *tx = (char *) tbuf;
+	uint32_t tx_len = len;
+	uint32_t count;
+	uint32_t data;
+	uint32_t i;
+	uint8_t byte;
+
+	uint32_t _cntl0 = (spi1_speed << BCM2835_AUX_SPI_CNTL0_SPEED_SHIFT);
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_CS2_N;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_ENABLE;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_MSBF_OUT;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_VAR_WIDTH;
+
+	bcm2835_peri_write(cntl0, _cntl0);
+	bcm2835_peri_write(cntl1, BCM2835_AUX_SPI_CNTL1_MSBF_IN);
+
+	while (tx_len > 0) {
+
+		while (bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_TX_FULL)
+			;
+
+		count = MIN(tx_len, 3);
+		data = 0;
+
+		for (i = 0; i < count; i++) {
+			byte = (tx != NULL) ? (uint8_t) *tx++ : (uint8_t) 0;
+			data |= byte << (8 * (2 - i));
+		}
+
+		data |= (count * 8) << 24;
+		tx_len -= count;
+
+		if (tx_len != 0) {
+			bcm2835_peri_write(txhold, data);
+		} else {
+			bcm2835_peri_write(io, data);
+		}
+
+		while (bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_BUSY)
+			;
+
+		(void) bcm2835_peri_read(io);
+	}
+}
+
+void bcm2835_aux_spi_transfernb(const char *tbuf, char *rbuf, uint32_t len) {
+    volatile uint32_t* cntl0 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL0/4;
+    volatile uint32_t* cntl1 = bcm2835_spi1 + BCM2835_AUX_SPI_CNTL1/4;
+    volatile uint32_t* stat = bcm2835_spi1 + BCM2835_AUX_SPI_STAT/4;
+    volatile uint32_t* txhold = bcm2835_spi1 + BCM2835_AUX_SPI_TXHOLD/4;
+    volatile uint32_t* io = bcm2835_spi1 + BCM2835_AUX_SPI_IO/4;
+
+	char *tx = (char *)tbuf;
+	char *rx = (char *)rbuf;
+	uint32_t tx_len = len;
+	uint32_t rx_len = len;
+	uint32_t count;
+	uint32_t data;
+	uint32_t i;
+	uint8_t byte;
+
+	uint32_t _cntl0 = (spi1_speed << BCM2835_AUX_SPI_CNTL0_SPEED_SHIFT);
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_CS2_N;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_ENABLE;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_MSBF_OUT;
+	_cntl0 |= BCM2835_AUX_SPI_CNTL0_VAR_WIDTH;
+
+	bcm2835_peri_write(cntl0, _cntl0);
+	bcm2835_peri_write(cntl1, BCM2835_AUX_SPI_CNTL1_MSBF_IN);
+
+	while ((tx_len > 0) || (rx_len > 0)) {
+
+		while (!(bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_TX_FULL) && (tx_len > 0)) {
+			count = MIN(tx_len, 3);
+			data = 0;
+
+			for (i = 0; i < count; i++) {
+				byte = (tx != NULL) ? (uint8_t) *tx++ : (uint8_t) 0;
+				data |= byte << (8 * (2 - i));
+			}
+
+			data |= (count * 8) << 24;
+			tx_len -= count;
+
+			if (tx_len != 0) {
+				bcm2835_peri_write(txhold, data);
+			} else {
+				bcm2835_peri_write(io, data);
+			}
+
+		}
+
+		while (!(bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_RX_EMPTY) && (rx_len > 0)) {
+			count = MIN(rx_len, 3);
+			data = bcm2835_peri_read(io);
+
+			if (rbuf != NULL) {
+				switch (count) {
+				case 3:
+					*rx++ = (char)((data >> 16) & 0xFF);
+					/*@fallthrough@*/
+					/* no break */
+				case 2:
+					*rx++ = (char)((data >> 8) & 0xFF);
+					/*@fallthrough@*/
+					/* no break */
+				case 1:
+					*rx++ = (char)((data >> 0) & 0xFF);
+				}
+			}
+
+			rx_len -= count;
+		}
+
+		while (!(bcm2835_peri_read(stat) & BCM2835_AUX_SPI_STAT_BUSY) && (rx_len > 0)) {
+			count = MIN(rx_len, 3);
+			data = bcm2835_peri_read(io);
+
+			if (rbuf != NULL) {
+				switch (count) {
+				case 3:
+					*rx++ = (char)((data >> 16) & 0xFF);
+					/*@fallthrough@*/
+					/* no break */
+				case 2:
+					*rx++ = (char)((data >> 8) & 0xFF);
+					/*@fallthrough@*/
+					/* no break */
+				case 1:
+					*rx++ = (char)((data >> 0) & 0xFF);
+				}
+			}
+
+			rx_len -= count;
+		}
+	}
+}
+
+void bcm2835_aux_spi_transfern(char *buf, uint32_t len) {
+	bcm2835_aux_spi_transfernb(buf, buf, len);
+}
+
+int bcm2835_i2c_begin(void)
+{
+    uint16_t cdiv;
+
+    if (   bcm2835_bsc0 == MAP_FAILED
+	|| bcm2835_bsc1 == MAP_FAILED)
+      return 0; /* bcm2835_init() failed, or not root */
+
+#ifdef I2C_V1
+    volatile uint32_t* paddr = bcm2835_bsc0 + BCM2835_BSC_DIV/4;
+    /* Set the I2C/BSC0 pins to the Alt 0 function to enable I2C access on them */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_03, BCM2835_GPIO_FSEL_ALT0); /* SDA */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_05, BCM2835_GPIO_FSEL_ALT0); /* SCL */
+#else
+    volatile uint32_t* paddr = bcm2835_bsc1 + BCM2835_BSC_DIV/4;
+    /* Set the I2C/BSC1 pins to the Alt 0 function to enable I2C access on them */
+    bcm2835_gpio_fsel(RPI_V2_GPIO_P1_03, BCM2835_GPIO_FSEL_ALT0); /* SDA */
+    bcm2835_gpio_fsel(RPI_V2_GPIO_P1_05, BCM2835_GPIO_FSEL_ALT0); /* SCL */
+#endif    
+
+    /* Read the clock divider register */
+    cdiv = bcm2835_peri_read(paddr);
+    /* Calculate time for transmitting one byte
+    // 1000000 = micros seconds in a second
+    // 9 = Clocks per byte : 8 bits + ACK
+    */
+    i2c_byte_wait_us = ((float)cdiv / BCM2835_CORE_CLK_HZ) * 1000000 * 9;
+
+    return 1;
+}
+
+void bcm2835_i2c_end(void)
+{
+#ifdef I2C_V1
+    /* Set all the I2C/BSC0 pins back to input */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_03, BCM2835_GPIO_FSEL_INPT); /* SDA */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_05, BCM2835_GPIO_FSEL_INPT); /* SCL */
+#else
+    /* Set all the I2C/BSC1 pins back to input */
+    bcm2835_gpio_fsel(RPI_V2_GPIO_P1_03, BCM2835_GPIO_FSEL_INPT); /* SDA */
+    bcm2835_gpio_fsel(RPI_V2_GPIO_P1_05, BCM2835_GPIO_FSEL_INPT); /* SCL */
+#endif
+}
+
+void bcm2835_i2c_setSlaveAddress(uint8_t addr)
+{
+    /* Set I2C Device Address */
+#ifdef I2C_V1
+    volatile uint32_t* paddr = bcm2835_bsc0 + BCM2835_BSC_A/4;
+#else	
+    volatile uint32_t* paddr = bcm2835_bsc1 + BCM2835_BSC_A/4;
+#endif
+    bcm2835_peri_write(paddr, addr);
+}
+
+/* defaults to 0x5dc, should result in a 166.666 kHz I2C clock frequency.
+// The divisor must be a power of 2. Odd numbers
+// rounded down.
+*/
+void bcm2835_i2c_setClockDivider(uint16_t divider)
+{
+#ifdef I2C_V1
+    volatile uint32_t* paddr = bcm2835_bsc0 + BCM2835_BSC_DIV/4;
+#else
+    volatile uint32_t* paddr = bcm2835_bsc1 + BCM2835_BSC_DIV/4;
+#endif    
+    bcm2835_peri_write(paddr, divider);
+    /* Calculate time for transmitting one byte
+    // 1000000 = micros seconds in a second
+    // 9 = Clocks per byte : 8 bits + ACK
+    */
+    i2c_byte_wait_us = ((float)divider / BCM2835_CORE_CLK_HZ) * 1000000 * 9;
+}
+
+/* set I2C clock divider by means of a baudrate number */
+void bcm2835_i2c_set_baudrate(uint32_t baudrate)
+{
+	uint32_t divider;
+	/* use 0xFFFE mask to limit a max value and round down any odd number */
+	divider = (BCM2835_CORE_CLK_HZ / baudrate) & 0xFFFE;
+	bcm2835_i2c_setClockDivider( (uint16_t)divider );
+}
+
+/* Writes an number of bytes to I2C */
+uint8_t bcm2835_i2c_write(const char * buf, uint32_t len)
+{
+#ifdef I2C_V1
+    volatile uint32_t* dlen    = bcm2835_bsc0 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc0 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc0 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc0 + BCM2835_BSC_C/4;
+#else
+    volatile uint32_t* dlen    = bcm2835_bsc1 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc1 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc1 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc1 + BCM2835_BSC_C/4;
+#endif    
+
+    uint32_t remaining = len;
+    uint32_t i = 0;
+    uint8_t reason = BCM2835_I2C_REASON_OK;
+
+    /* Clear FIFO */
+    bcm2835_peri_set_bits(control, BCM2835_BSC_C_CLEAR_1 , BCM2835_BSC_C_CLEAR_1 );
+    /* Clear Status */
+    bcm2835_peri_write(status, BCM2835_BSC_S_CLKT | BCM2835_BSC_S_ERR | BCM2835_BSC_S_DONE);
+    /* Set Data Length */
+    bcm2835_peri_write(dlen, len);
+    /* pre populate FIFO with max buffer */
+    while( remaining && ( i < BCM2835_BSC_FIFO_SIZE ) )
+    {
+        bcm2835_peri_write_nb(fifo, buf[i]);
+        i++;
+        remaining--;
+    }
+    
+    /* Enable device and start transfer */
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST);
+    
+    /* Transfer is over when BCM2835_BSC_S_DONE */
+    while(!(bcm2835_peri_read(status) & BCM2835_BSC_S_DONE ))
+    {
+        while ( remaining && (bcm2835_peri_read(status) & BCM2835_BSC_S_TXD ))
+    	{
+	    /* Write to FIFO */
+	    bcm2835_peri_write(fifo, buf[i]);
+	    i++;
+	    remaining--;
+    	}
+    }
+
+    /* Received a NACK */
+    if (bcm2835_peri_read(status) & BCM2835_BSC_S_ERR)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_NACK;
+    }
+
+    /* Received Clock Stretch Timeout */
+    else if (bcm2835_peri_read(status) & BCM2835_BSC_S_CLKT)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_CLKT;
+    }
+
+    /* Not all data is sent */
+    else if (remaining)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_DATA;
+    }
+
+    bcm2835_peri_set_bits(control, BCM2835_BSC_S_DONE , BCM2835_BSC_S_DONE);
+
+    return reason;
+}
+
+/* Read an number of bytes from I2C */
+uint8_t bcm2835_i2c_read(char* buf, uint32_t len)
+{
+#ifdef I2C_V1
+    volatile uint32_t* dlen    = bcm2835_bsc0 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc0 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc0 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc0 + BCM2835_BSC_C/4;
+#else
+    volatile uint32_t* dlen    = bcm2835_bsc1 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc1 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc1 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc1 + BCM2835_BSC_C/4;
+#endif    
+
+    uint32_t remaining = len;
+    uint32_t i = 0;
+    uint8_t reason = BCM2835_I2C_REASON_OK;
+
+    /* Clear FIFO */
+    bcm2835_peri_set_bits(control, BCM2835_BSC_C_CLEAR_1 , BCM2835_BSC_C_CLEAR_1 );
+    /* Clear Status */
+    bcm2835_peri_write_nb(status, BCM2835_BSC_S_CLKT | BCM2835_BSC_S_ERR | BCM2835_BSC_S_DONE);
+    /* Set Data Length */
+    bcm2835_peri_write_nb(dlen, len);
+    /* Start read */
+    bcm2835_peri_write_nb(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST | BCM2835_BSC_C_READ);
+    
+    /* wait for transfer to complete */
+    while (!(bcm2835_peri_read_nb(status) & BCM2835_BSC_S_DONE))
+    {
+        /* we must empty the FIFO as it is populated and not use any delay */
+        while (remaining && bcm2835_peri_read_nb(status) & BCM2835_BSC_S_RXD)
+    	{
+	    /* Read from FIFO, no barrier */
+	    buf[i] = bcm2835_peri_read_nb(fifo);
+	    i++;
+	    remaining--;
+    	}
+    }
+    
+    /* transfer has finished - grab any remaining stuff in FIFO */
+    while (remaining && (bcm2835_peri_read_nb(status) & BCM2835_BSC_S_RXD))
+    {
+        /* Read from FIFO, no barrier */
+        buf[i] = bcm2835_peri_read_nb(fifo);
+        i++;
+        remaining--;
+    }
+    
+    /* Received a NACK */
+    if (bcm2835_peri_read(status) & BCM2835_BSC_S_ERR)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_NACK;
+    }
+
+    /* Received Clock Stretch Timeout */
+    else if (bcm2835_peri_read(status) & BCM2835_BSC_S_CLKT)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_CLKT;
+    }
+
+    /* Not all data is received */
+    else if (remaining)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_DATA;
+    }
+
+    bcm2835_peri_set_bits(control, BCM2835_BSC_S_DONE , BCM2835_BSC_S_DONE);
+
+    return reason;
+}
+
+/* Read an number of bytes from I2C sending a repeated start after writing
+// the required register. Only works if your device supports this mode
+*/
+uint8_t bcm2835_i2c_read_register_rs(char* regaddr, char* buf, uint32_t len)
+{   
+#ifdef I2C_V1
+    volatile uint32_t* dlen    = bcm2835_bsc0 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc0 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc0 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc0 + BCM2835_BSC_C/4;
+#else
+    volatile uint32_t* dlen    = bcm2835_bsc1 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc1 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc1 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc1 + BCM2835_BSC_C/4;
+#endif    
+	uint32_t remaining = len;
+    uint32_t i = 0;
+    uint8_t reason = BCM2835_I2C_REASON_OK;
+    
+    /* Clear FIFO */
+    bcm2835_peri_set_bits(control, BCM2835_BSC_C_CLEAR_1 , BCM2835_BSC_C_CLEAR_1 );
+    /* Clear Status */
+    bcm2835_peri_write(status, BCM2835_BSC_S_CLKT | BCM2835_BSC_S_ERR | BCM2835_BSC_S_DONE);
+    /* Set Data Length */
+    bcm2835_peri_write(dlen, 1);
+    /* Enable device and start transfer */
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN);
+    bcm2835_peri_write(fifo, regaddr[0]);
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST);
+    
+    /* poll for transfer has started */
+    while ( !( bcm2835_peri_read(status) & BCM2835_BSC_S_TA ) )
+    {
+        /* Linux may cause us to miss entire transfer stage */
+        if(bcm2835_peri_read(status) & BCM2835_BSC_S_DONE)
+            break;
+    }
+    
+    /* Send a repeated start with read bit set in address */
+    bcm2835_peri_write(dlen, len);
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST  | BCM2835_BSC_C_READ );
+    
+    /* Wait for write to complete and first byte back. */
+    bcm2835_delayMicroseconds(i2c_byte_wait_us * 3);
+    
+    /* wait for transfer to complete */
+    while (!(bcm2835_peri_read(status) & BCM2835_BSC_S_DONE))
+    {
+        /* we must empty the FIFO as it is populated and not use any delay */
+        while (remaining && bcm2835_peri_read(status) & BCM2835_BSC_S_RXD)
+    	{
+	    /* Read from FIFO */
+	    buf[i] = bcm2835_peri_read(fifo);
+	    i++;
+	    remaining--;
+    	}
+    }
+    
+    /* transfer has finished - grab any remaining stuff in FIFO */
+    while (remaining && (bcm2835_peri_read(status) & BCM2835_BSC_S_RXD))
+    {
+        /* Read from FIFO */
+        buf[i] = bcm2835_peri_read(fifo);
+        i++;
+        remaining--;
+    }
+    
+    /* Received a NACK */
+    if (bcm2835_peri_read(status) & BCM2835_BSC_S_ERR)
+    {
+		reason = BCM2835_I2C_REASON_ERROR_NACK;
+    }
+
+    /* Received Clock Stretch Timeout */
+    else if (bcm2835_peri_read(status) & BCM2835_BSC_S_CLKT)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_CLKT;
+    }
+
+    /* Not all data is sent */
+    else if (remaining)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_DATA;
+    }
+
+    bcm2835_peri_set_bits(control, BCM2835_BSC_S_DONE , BCM2835_BSC_S_DONE);
+
+    return reason;
+}
+
+/* Sending an arbitrary number of bytes before issuing a repeated start 
+// (with no prior stop) and reading a response. Some devices require this behavior.
+*/
+uint8_t bcm2835_i2c_write_read_rs(char* cmds, uint32_t cmds_len, char* buf, uint32_t buf_len)
+{   
+#ifdef I2C_V1
+    volatile uint32_t* dlen    = bcm2835_bsc0 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc0 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc0 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc0 + BCM2835_BSC_C/4;
+#else
+    volatile uint32_t* dlen    = bcm2835_bsc1 + BCM2835_BSC_DLEN/4;
+    volatile uint32_t* fifo    = bcm2835_bsc1 + BCM2835_BSC_FIFO/4;
+    volatile uint32_t* status  = bcm2835_bsc1 + BCM2835_BSC_S/4;
+    volatile uint32_t* control = bcm2835_bsc1 + BCM2835_BSC_C/4;
+#endif    
+
+    uint32_t remaining = cmds_len;
+    uint32_t i = 0;
+    uint8_t reason = BCM2835_I2C_REASON_OK;
+    
+    /* Clear FIFO */
+    bcm2835_peri_set_bits(control, BCM2835_BSC_C_CLEAR_1 , BCM2835_BSC_C_CLEAR_1 );
+
+    /* Clear Status */
+    bcm2835_peri_write(status, BCM2835_BSC_S_CLKT | BCM2835_BSC_S_ERR | BCM2835_BSC_S_DONE);
+
+    /* Set Data Length */
+    bcm2835_peri_write(dlen, cmds_len);
+ 
+    /* pre populate FIFO with max buffer */
+    while( remaining && ( i < BCM2835_BSC_FIFO_SIZE ) )
+    {
+        bcm2835_peri_write_nb(fifo, cmds[i]);
+        i++;
+        remaining--;
+    }
+
+    /* Enable device and start transfer */
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST);
+    
+    /* poll for transfer has started (way to do repeated start, from BCM2835 datasheet) */
+    while ( !( bcm2835_peri_read(status) & BCM2835_BSC_S_TA ) )
+    {
+        /* Linux may cause us to miss entire transfer stage */
+        if(bcm2835_peri_read_nb(status) & BCM2835_BSC_S_DONE)
+            break;
+    }
+    
+    remaining = buf_len;
+    i = 0;
+
+    /* Send a repeated start with read bit set in address */
+    bcm2835_peri_write(dlen, buf_len);
+    bcm2835_peri_write(control, BCM2835_BSC_C_I2CEN | BCM2835_BSC_C_ST  | BCM2835_BSC_C_READ );
+    
+    /* Wait for write to complete and first byte back. */
+    bcm2835_delayMicroseconds(i2c_byte_wait_us * (cmds_len + 1));
+    
+    /* wait for transfer to complete */
+    while (!(bcm2835_peri_read_nb(status) & BCM2835_BSC_S_DONE))
+    {
+        /* we must empty the FIFO as it is populated and not use any delay */
+        while (remaining && bcm2835_peri_read(status) & BCM2835_BSC_S_RXD)
+    	{
+	    /* Read from FIFO, no barrier */
+	    buf[i] = bcm2835_peri_read_nb(fifo);
+	    i++;
+	    remaining--;
+    	}
+    }
+    
+    /* transfer has finished - grab any remaining stuff in FIFO */
+    while (remaining && (bcm2835_peri_read(status) & BCM2835_BSC_S_RXD))
+    {
+        /* Read from FIFO */
+        buf[i] = bcm2835_peri_read(fifo);
+        i++;
+        remaining--;
+    }
+    
+    /* Received a NACK */
+    if (bcm2835_peri_read(status) & BCM2835_BSC_S_ERR)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_NACK;
+    }
+
+    /* Received Clock Stretch Timeout */
+    else if (bcm2835_peri_read(status) & BCM2835_BSC_S_CLKT)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_CLKT;
+    }
+
+    /* Not all data is sent */
+    else if (remaining)
+    {
+	reason = BCM2835_I2C_REASON_ERROR_DATA;
+    }
+
+    bcm2835_peri_set_bits(control, BCM2835_BSC_S_DONE , BCM2835_BSC_S_DONE);
+
+    return reason;
+}
+
+/* Read the System Timer Counter (64-bits) */
+uint64_t bcm2835_st_read(void)
+{
+    volatile uint32_t* paddr;
+    uint32_t hi, lo;
+    uint64_t st;
+
+    if (bcm2835_st==MAP_FAILED)
+	return 0;
+
+    paddr = bcm2835_st + BCM2835_ST_CHI/4;
+    hi = bcm2835_peri_read(paddr);
+
+    paddr = bcm2835_st + BCM2835_ST_CLO/4;
+    lo = bcm2835_peri_read(paddr);
+    
+    paddr = bcm2835_st + BCM2835_ST_CHI/4;
+    st = bcm2835_peri_read(paddr);
+    
+    /* Test for overflow */
+    if (st == hi)
+    {
+        st <<= 32;
+        st += lo;
+    }
+    else
+    {
+        st <<= 32;
+        paddr = bcm2835_st + BCM2835_ST_CLO/4;
+        st += bcm2835_peri_read(paddr);
+    }
+    return st;
+}
+
+/* Delays for the specified number of microseconds with offset */
+void bcm2835_st_delay(uint64_t offset_micros, uint64_t micros)
+{
+    uint64_t compare = offset_micros + micros;
+
+    while(bcm2835_st_read() < compare)
+	;
+}
+
+/* PWM */
+
+void bcm2835_pwm_set_clock(uint32_t divisor)
+{
+    if (   bcm2835_clk == MAP_FAILED
+        || bcm2835_pwm == MAP_FAILED)
+      return; /* bcm2835_init() failed or not root */
+  
+    /* From Gerts code */
+    divisor &= 0xfff;
+    /* Stop PWM clock */
+    bcm2835_peri_write(bcm2835_clk + BCM2835_PWMCLK_CNTL, BCM2835_PWM_PASSWRD | 0x01);
+    bcm2835_delay(110); /* Prevents clock going slow */
+    /* Wait for the clock to be not busy */
+    while ((bcm2835_peri_read(bcm2835_clk + BCM2835_PWMCLK_CNTL) & 0x80) != 0)
+	bcm2835_delay(1); 
+    /* set the clock divider and enable PWM clock */
+    bcm2835_peri_write(bcm2835_clk + BCM2835_PWMCLK_DIV, BCM2835_PWM_PASSWRD | (divisor << 12));
+    bcm2835_peri_write(bcm2835_clk + BCM2835_PWMCLK_CNTL, BCM2835_PWM_PASSWRD | 0x11); /* Source=osc and enable */
+}
+
+void bcm2835_pwm_set_mode(uint8_t channel, uint8_t markspace, uint8_t enabled)
+{
+  if (   bcm2835_clk == MAP_FAILED
+       || bcm2835_pwm == MAP_FAILED)
+    return; /* bcm2835_init() failed or not root */
+
+  uint32_t control = bcm2835_peri_read(bcm2835_pwm + BCM2835_PWM_CONTROL);
+
+  if (channel == 0)
+    {
+      if (markspace)
+	control |= BCM2835_PWM0_MS_MODE;
+      else
+	control &= ~BCM2835_PWM0_MS_MODE;
+      if (enabled)
+	control |= BCM2835_PWM0_ENABLE;
+      else
+	control &= ~BCM2835_PWM0_ENABLE;
+    }
+  else if (channel == 1)
+    {
+      if (markspace)
+	control |= BCM2835_PWM1_MS_MODE;
+      else
+	control &= ~BCM2835_PWM1_MS_MODE;
+      if (enabled)
+	control |= BCM2835_PWM1_ENABLE;
+      else
+	control &= ~BCM2835_PWM1_ENABLE;
+    }
+
+  /* If you use the barrier here, wierd things happen, and the commands dont work */
+  bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM_CONTROL, control);
+  /*  bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM_CONTROL, BCM2835_PWM0_ENABLE | BCM2835_PWM1_ENABLE | BCM2835_PWM0_MS_MODE | BCM2835_PWM1_MS_MODE); */
+
+}
+
+void bcm2835_pwm_set_range(uint8_t channel, uint32_t range)
+{
+  if (   bcm2835_clk == MAP_FAILED
+       || bcm2835_pwm == MAP_FAILED)
+    return; /* bcm2835_init() failed or not root */
+
+  if (channel == 0)
+      bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM0_RANGE, range);
+  else if (channel == 1)
+      bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM1_RANGE, range);
+}
+
+void bcm2835_pwm_set_data(uint8_t channel, uint32_t data)
+{
+  if (   bcm2835_clk == MAP_FAILED
+       || bcm2835_pwm == MAP_FAILED)
+    return; /* bcm2835_init() failed or not root */
+
+  if (channel == 0)
+      bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM0_DATA, data);
+  else if (channel == 1)
+      bcm2835_peri_write_nb(bcm2835_pwm + BCM2835_PWM1_DATA, data);
+}
+
+/* Allocate page-aligned memory. */
+void *malloc_aligned(size_t size)
+{
+    void *mem;
+    errno = posix_memalign(&mem, BCM2835_PAGE_SIZE, size);
+    return (errno ? NULL : mem);
+}
+
+/* Map 'size' bytes starting at 'off' in file 'fd' to memory.
+// Return mapped address on success, MAP_FAILED otherwise.
+// On error print message.
+*/
+static void *mapmem(const char *msg, size_t size, int fd, off_t off)
+{
+    void *map = mmap(NULL, size, (PROT_READ | PROT_WRITE), MAP_SHARED, fd, off);
+    if (map == MAP_FAILED)
+	fprintf(stderr, "bcm2835_init: %s mmap failed: %s\n", msg, strerror(errno));
+    return map;
+}
+
+static void unmapmem(void **pmem, size_t size)
+{
+    if (*pmem == MAP_FAILED) return;
+    munmap(*pmem, size);
+    *pmem = MAP_FAILED;
+}
+
+/* Initialise this library. */
+int bcm2835_init(void)
+{
+    int  memfd;
+    int  ok;
+    FILE *fp;
+
+    if (debug) 
+    {
+        bcm2835_peripherals = (uint32_t*)BCM2835_PERI_BASE;
+
+	bcm2835_pads = bcm2835_peripherals + BCM2835_GPIO_PADS/4;
+	bcm2835_clk  = bcm2835_peripherals + BCM2835_CLOCK_BASE/4;
+	bcm2835_gpio = bcm2835_peripherals + BCM2835_GPIO_BASE/4;
+	bcm2835_pwm  = bcm2835_peripherals + BCM2835_GPIO_PWM/4;
+	bcm2835_spi0 = bcm2835_peripherals + BCM2835_SPI0_BASE/4;
+	bcm2835_bsc0 = bcm2835_peripherals + BCM2835_BSC0_BASE/4;
+	bcm2835_bsc1 = bcm2835_peripherals + BCM2835_BSC1_BASE/4;
+	bcm2835_st   = bcm2835_peripherals + BCM2835_ST_BASE/4;
+	bcm2835_aux  = bcm2835_peripherals + BCM2835_AUX_BASE/4;
+	bcm2835_spi1 = bcm2835_peripherals + BCM2835_SPI1_BASE/4;
+
+	return 1; /* Success */
+    }
+
+    /* Figure out the base and size of the peripheral address block
+    // using the device-tree. Required for RPi2/3/4, optional for RPi 1
+    */
+    if ((fp = fopen(BMC2835_RPI2_DT_FILENAME , "rb")))
+    {
+        unsigned char buf[16];
+        uint32_t base_address;
+        uint32_t peri_size;
+        if (fread(buf, 1, sizeof(buf), fp) >= 8)
+        {
+            base_address = (buf[4] << 24) |
+              (buf[5] << 16) |
+              (buf[6] << 8) |
+              (buf[7] << 0);
+            
+            peri_size = (buf[8] << 24) |
+              (buf[9] << 16) |
+              (buf[10] << 8) |
+              (buf[11] << 0);
+            
+            if (!base_address)
+            {
+                /* looks like RPI 4 */
+                base_address = (buf[8] << 24) |
+                      (buf[9] << 16) |
+                      (buf[10] << 8) |
+                      (buf[11] << 0);
+                      
+                peri_size = (buf[12] << 24) |
+                (buf[13] << 16) |
+                (buf[14] << 8) |
+                (buf[15] << 0);
+            }
+            /* check for valid known range formats */
+            if ((buf[0] == 0x7e) &&
+                    (buf[1] == 0x00) &&
+                    (buf[2] == 0x00) &&
+                    (buf[3] == 0x00) &&
+                    ((base_address == BCM2835_PERI_BASE) || (base_address == BCM2835_RPI2_PERI_BASE) || (base_address == BCM2835_RPI4_PERI_BASE)))
+            {
+                bcm2835_peripherals_base = (uint32_t *)base_address;
+                bcm2835_peripherals_size = peri_size;
+                if( base_address == BCM2835_RPI4_PERI_BASE )
+                {
+                    pud_type_rpi4 = 1;
+                }
+            }
+        
+        }
+        
+	fclose(fp);
+    }
+    /* else we are prob on RPi 1 with BCM2835, and use the hardwired defaults */
+
+    /* Now get ready to map the peripherals block 
+     * If we are not root, try for the new /dev/gpiomem interface and accept
+     * the fact that we can only access GPIO
+     * else try for the /dev/mem interface and get access to everything
+     */
+    memfd = -1;
+    ok = 0;
+    if (geteuid() == 0)
+    {
+      /* Open the master /dev/mem device */
+      if ((memfd = open("/dev/mem", O_RDWR | O_SYNC) ) < 0) 
+	{
+	  fprintf(stderr, "bcm2835_init: Unable to open /dev/mem: %s\n",
+		  strerror(errno)) ;
+	  goto exit;
+	}
+      
+      /* Base of the peripherals block is mapped to VM */
+      bcm2835_peripherals = mapmem("gpio", bcm2835_peripherals_size, memfd, (off_t)bcm2835_peripherals_base);
+      if (bcm2835_peripherals == MAP_FAILED) goto exit;
+      
+      /* Now compute the base addresses of various peripherals, 
+      // which are at fixed offsets within the mapped peripherals block
+      // Caution: bcm2835_peripherals is uint32_t*, so divide offsets by 4
+      */
+      bcm2835_gpio = bcm2835_peripherals + BCM2835_GPIO_BASE/4;
+      bcm2835_pwm  = bcm2835_peripherals + BCM2835_GPIO_PWM/4;
+      bcm2835_clk  = bcm2835_peripherals + BCM2835_CLOCK_BASE/4;
+      bcm2835_pads = bcm2835_peripherals + BCM2835_GPIO_PADS/4;
+      bcm2835_spi0 = bcm2835_peripherals + BCM2835_SPI0_BASE/4;
+      bcm2835_bsc0 = bcm2835_peripherals + BCM2835_BSC0_BASE/4; /* I2C */
+      bcm2835_bsc1 = bcm2835_peripherals + BCM2835_BSC1_BASE/4; /* I2C */
+      bcm2835_st   = bcm2835_peripherals + BCM2835_ST_BASE/4;
+      bcm2835_aux  = bcm2835_peripherals + BCM2835_AUX_BASE/4;
+      bcm2835_spi1 = bcm2835_peripherals + BCM2835_SPI1_BASE/4;
+
+      ok = 1;
+    }
+    else
+    {
+      /* Not root, try /dev/gpiomem */
+      /* Open the master /dev/mem device */
+      if ((memfd = open("/dev/gpiomem", O_RDWR | O_SYNC) ) < 0) 
+	{
+	  fprintf(stderr, "bcm2835_init: Unable to open /dev/gpiomem: %s\n",
+		  strerror(errno)) ;
+	  goto exit;
+	}
+      
+      /* Base of the peripherals block is mapped to VM */
+      bcm2835_peripherals_base = 0;
+      bcm2835_peripherals = mapmem("gpio", bcm2835_peripherals_size, memfd, (off_t)bcm2835_peripherals_base);
+      if (bcm2835_peripherals == MAP_FAILED) goto exit;
+      bcm2835_gpio = bcm2835_peripherals;
+      ok = 1;
+    }
+
+exit:
+    if (memfd >= 0)
+        close(memfd);
+
+    if (!ok)
+	bcm2835_close();
+
+    return ok;
+}
+
+/* Close this library and deallocate everything */
+int bcm2835_close(void)
+{
+    if (debug) return 1; /* Success */
+
+    unmapmem((void**) &bcm2835_peripherals, bcm2835_peripherals_size);
+    bcm2835_peripherals = MAP_FAILED;
+    bcm2835_gpio = MAP_FAILED;
+    bcm2835_pwm  = MAP_FAILED;
+    bcm2835_clk  = MAP_FAILED;
+    bcm2835_pads = MAP_FAILED;
+    bcm2835_spi0 = MAP_FAILED;
+    bcm2835_bsc0 = MAP_FAILED;
+    bcm2835_bsc1 = MAP_FAILED;
+    bcm2835_st   = MAP_FAILED;
+    bcm2835_aux  = MAP_FAILED;
+    bcm2835_spi1 = MAP_FAILED;
+    return 1; /* Success */
+}    
+
+#ifdef BCM2835_TEST
+/* this is a simple test program that prints out what it will do rather than 
+// actually doing it
+*/
+int main(int argc, char **argv)
+{
+    /* Be non-destructive */
+    bcm2835_set_debug(1);
+
+    if (!bcm2835_init())
+	return 1;
+
+    /* Configure some GPIO pins fo some testing
+    // Set RPI pin P1-11 to be an output
+    */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_11, BCM2835_GPIO_FSEL_OUTP);
+    /* Set RPI pin P1-15 to be an input */
+    bcm2835_gpio_fsel(RPI_GPIO_P1_15, BCM2835_GPIO_FSEL_INPT);
+    /*  with a pullup */
+    bcm2835_gpio_set_pud(RPI_GPIO_P1_15, BCM2835_GPIO_PUD_UP);
+    /* And a low detect enable */
+    bcm2835_gpio_len(RPI_GPIO_P1_15);
+    /* and input hysteresis disabled on GPIOs 0 to 27 */
+    bcm2835_gpio_set_pad(BCM2835_PAD_GROUP_GPIO_0_27, BCM2835_PAD_SLEW_RATE_UNLIMITED|BCM2835_PAD_DRIVE_8mA);
+
+#if 1
+    /* Blink */
+    while (1)
+    {
+	/* Turn it on */
+	bcm2835_gpio_write(RPI_GPIO_P1_11, HIGH);
+	
+	/* wait a bit */
+	bcm2835_delay(500);
+	
+	/* turn it off */
+	bcm2835_gpio_write(RPI_GPIO_P1_11, LOW);
+	
+	/* wait a bit */
+	bcm2835_delay(500);
+    }
+#endif
+
+#if 0
+    /* Read input */
+    while (1)
+    {
+	/* Read some data */
+	uint8_t value = bcm2835_gpio_lev(RPI_GPIO_P1_15);
+	printf("read from pin 15: %d\n", value);
+	
+	/* wait a bit */
+	bcm2835_delay(500);
+    }
+#endif
+
+#if 0
+    /* Look for a low event detection
+    // eds will be set whenever pin 15 goes low
+    */
+    while (1)
+    {
+	if (bcm2835_gpio_eds(RPI_GPIO_P1_15))
+	{
+	    /* Now clear the eds flag by setting it to 1 */
+	    bcm2835_gpio_set_eds(RPI_GPIO_P1_15);
+	    printf("low event detect for pin 15\n");
+	}
+
+	/* wait a bit */
+	bcm2835_delay(500);
+    }
+#endif
+
+    if (!bcm2835_close())
+	return 1;
+
+    return 0;
+}
+#endif
+
+
+
diff --git a/lib/RF24/utility/RPi/bcm2835.h b/lib/RF24/utility/RPi/bcm2835.h
new file mode 100644
index 000000000..67050e216
--- /dev/null
+++ b/lib/RF24/utility/RPi/bcm2835.h
@@ -0,0 +1,1986 @@
+/* bcm2835.h
+  
+   C and C++ support for Broadcom BCM 2835 as used in Raspberry Pi
+  
+   Author: Mike McCauley
+   Copyright (C) 2011-2013 Mike McCauley
+   $Id: bcm2835.h,v 1.25 2019/07/22 23:04:13 mikem Exp $
+*/
+
+/*! \mainpage C library for Broadcom BCM 2835 as used in Raspberry Pi
+  
+  This is a C library for Raspberry Pi (RPi). It provides access to 
+  GPIO and other IO functions on the Broadcom BCM 2835 chip, as used in the RaspberryPi,
+  allowing access to the GPIO pins on the
+  26 pin IDE plug on the RPi board so you can control and interface with various external devices.
+  
+  It provides functions for reading digital inputs and setting digital outputs, using SPI and I2C,
+  and for accessing the system timers.
+  Pin event detection is supported by polling (interrupts are not supported).
+
+  Works on all versions upt to and including RPI 4. 
+  Works with all versions of Debian up to and including Debian Buster 10.
+  
+  It is C++ compatible, and installs as a header file and non-shared library on 
+  any Linux-based distro (but clearly is no use except on Raspberry Pi or another board with 
+  BCM 2835).
+  
+  The version of the package that this documentation refers to can be downloaded 
+  from http://www.airspayce.com/mikem/bcm2835/bcm2835-1.60.tar.gz
+  You can find the latest version at http://www.airspayce.com/mikem/bcm2835
+  
+  Several example programs are provided.
+  
+  Based on data in http://elinux.org/RPi_Low-level_peripherals and 
+  http://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf
+  and http://www.scribd.com/doc/101830961/GPIO-Pads-Control2
+  
+  You can also find online help and discussion at http://groups.google.com/group/bcm2835
+  Please use that group for all questions and discussions on this topic. 
+  Do not contact the author directly, unless it is to discuss commercial licensing.
+  Before asking a question or reporting a bug, please read 
+  - http://en.wikipedia.org/wiki/Wikipedia:Reference_desk/How_to_ask_a_software_question
+  - http://www.catb.org/esr/faqs/smart-questions.html
+  - http://www.chiark.greenend.org.uk/~shgtatham/bugs.html
+  
+  Tested on debian6-19-04-2012, 2012-07-15-wheezy-raspbian, 2013-07-26-wheezy-raspbian
+  and Occidentalisv01, 2016-02-09 Raspbian Jessie.
+  CAUTION: it has been observed that when detect enables such as bcm2835_gpio_len() 
+  are used and the pin is pulled LOW
+  it can cause temporary hangs on 2012-07-15-wheezy-raspbian, 2013-07-26-wheezy-raspbian
+  and Occidentalisv01.
+  Reason for this is not yet determined, but we suspect that an interrupt handler is
+  hitting a hard loop on those OSs.
+  If you must use bcm2835_gpio_len() and friends, make sure you disable the pins with 
+  bcm2835_gpio_clr_len() and friends after use. 
+  
+  \par Running as root
+
+  Prior to the release of Raspbian Jessie in Feb 2016, access to any
+  peripheral device via /dev/mem on the RPi required the process to
+  run as root. Raspbian Jessie permits non-root users to access the
+  GPIO peripheral (only) via /dev/gpiomem, and this library supports
+  that limited mode of operation.
+
+  If the library runs with effective UID of 0 (ie root), then
+  bcm2835_init() will attempt to open /dev/mem, and, if successful, it
+  will permit use of all peripherals and library functions.
+
+  If the library runs with any other effective UID (ie not root), then
+  bcm2835_init() will attempt to open /dev/gpiomem, and, if
+  successful, will only permit GPIO operations. In particular,
+  bcm2835_spi_begin() and bcm2835_i2c_begin() will return false and all
+  other non-gpio operations may fail silently or crash.
+
+  \par Installation
+  
+  This library consists of a single non-shared library and header file, which will be
+  installed in the usual places by make install
+  
+  \code
+  # download the latest version of the library, say bcm2835-1.xx.tar.gz, then:
+  tar zxvf bcm2835-1.xx.tar.gz
+  cd bcm2835-1.xx
+  ./configure
+  make
+  sudo make check
+  sudo make install
+  \endcode
+  
+  \par Physical Addresses
+  
+  The functions bcm2835_peri_read(), bcm2835_peri_write() and bcm2835_peri_set_bits() 
+  are low level peripheral register access functions. They are designed to use
+  physical addresses as described in section 1.2.3 ARM physical addresses
+  of the BCM2835 ARM Peripherals manual. 
+  Physical addresses range from 0x20000000 to 0x20FFFFFF for peripherals. The bus
+  addresses for peripherals are set up to map onto the peripheral bus address range starting at
+  0x7E000000. Thus a peripheral advertised in the manual at bus address 0x7Ennnnnn is available at
+  physical address 0x20nnnnnn.
+  
+  On RPI 2, the peripheral addresses are different and the bcm2835 library gets them 
+  from reading /proc/device-tree/soc/ranges. This is only availble with recent versions of the kernel on RPI 2.
+  
+  After initialisation, the base address of the various peripheral 
+  registers are available with the following
+  externals:
+  bcm2835_gpio
+  bcm2835_pwm
+  bcm2835_clk
+  bcm2835_pads
+  bcm2835_spio0
+  bcm2835_st
+  bcm2835_bsc0
+  bcm2835_bsc1
+  bcm2835_aux
+  bcm2835_spi1
+
+  \par Raspberry Pi 2 (RPI2)
+
+  For this library to work correctly on RPI2, you MUST have the device tree support enabled in the kernel.
+  You should also ensure you are using the latest version of Linux. The library has been tested on RPI2
+  with 2015-02-16-raspbian-wheezy and ArchLinuxARM-rpi-2 as of 2015-03-29.
+
+  When device tree suport is enabled, the file /proc/device-tree/soc/ranges will appear in the file system, 
+  and the bcm2835 module relies on its presence to correctly run on RPI2 (it is optional for RPI1). 
+  Without device tree support enabled and the presence of this file, it will not work on RPI2.
+
+  To enable device tree support:
+
+  \code
+  sudo raspi-config
+   under Advanced Options - enable Device Tree
+   Reboot.
+  \endcode
+  
+  \par Pin Numbering
+  
+  The GPIO pin numbering as used by RPi is different to and inconsistent with the underlying 
+  BCM 2835 chip pin numbering. http://elinux.org/RPi_BCM2835_GPIOs
+   
+  RPi has a 26 pin IDE header that provides access to some of the GPIO pins on the BCM 2835,
+  as well as power and ground pins. Not all GPIO pins on the BCM 2835 are available on the 
+  IDE header.
+  
+  RPi Version 2 also has a P5 connector with 4 GPIO pins, 5V, 3.3V and Gnd.
+  
+  The functions in this library are designed to be passed the BCM 2835 GPIO pin number and _not_ 
+  the RPi pin number. There are symbolic definitions for each of the available pins
+  that you should use for convenience. See \ref RPiGPIOPin.
+  
+  \par SPI Pins
+   
+  The bcm2835_spi_* functions allow you to control the BCM 2835 SPI0 interface, 
+  allowing you to send and received data by SPI (Serial Peripheral Interface).
+  For more information about SPI, see http://en.wikipedia.org/wiki/Serial_Peripheral_Interface_Bus
+  
+  When bcm2835_spi_begin() is called it changes the bahaviour of the SPI interface pins from their 
+  default GPIO behaviour in order to support SPI. While SPI is in use, you will not be able 
+  to control the state of the SPI pins through the usual bcm2835_spi_gpio_write().
+  When bcm2835_spi_end() is called, the SPI pins will all revert to inputs, and can then be
+  configured and controled with the usual bcm2835_gpio_* calls.
+  
+  The Raspberry Pi GPIO pins used for SPI are:
+   
+  - P1-19 (MOSI)
+  - P1-21 (MISO) 
+  - P1-23 (CLK) 
+  - P1-24 (CE0) 
+  - P1-26 (CE1)
+
+  Although it is possible to select high speeds for the SPI interface, up to 125MHz (see bcm2835_spi_setClockDivider())
+  you should not expect to actually achieve those sorts of speeds with the RPi wiring. Our tests on RPi 2 show that the
+  SPI CLK line when unloaded has a resonant frequency of about 40MHz, and when loaded, the MOSI and MISO lines
+  ring at an even lower frequency. Measurements show that SPI waveforms are very poor and unusable at 62 and 125MHz.
+  Dont expect any speed faster than 31MHz to work reliably.
+
+  The bcm2835_aux_spi_* functions allow you to control the BCM 2835 SPI1 interface,
+  allowing you to send and received data by SPI (Serial Peripheral Interface).
+
+  The Raspberry Pi GPIO pins used for AUX SPI (SPI1) are:
+
+  - P1-38 (MOSI)
+  - P1-35 (MISO)
+  - P1-40 (CLK)
+  - P1-36 (CE2)
+
+  \par I2C Pins
+  
+  The bcm2835_i2c_* functions allow you to control the BCM 2835 BSC interface,
+  allowing you to send and received data by I2C ("eye-squared cee"; generically referred to as "two-wire interface") .
+  For more information about I?C, see http://en.wikipedia.org/wiki/I%C2%B2C
+  
+  The Raspberry Pi V2 GPIO pins used for I2C are:
+  
+  - P1-03 (SDA)
+  - P1-05 (SLC)
+  
+  \par PWM
+  
+  The BCM2835 supports hardware PWM on a limited subset of GPIO pins. This bcm2835 library provides 
+  functions for configuring and controlling PWM output on these pins.
+  
+  The BCM2835 contains 2 independent PWM channels (0 and 1), each of which be connnected to a limited subset of 
+  GPIO pins. The following GPIO pins may be connected to the following PWM channels (from section 9.5):
+  \code
+  GPIO PIN    RPi pin  PWM Channel    ALT FUN
+  12                    0            0
+  13                    1            0
+  18         1-12       0            5
+  19                    1            5
+  40                    0            0
+  41                    1            0
+  45                    1            0
+  52                    0            1
+  53                    1            1
+  \endcode
+  In order for a GPIO pin to emit output from its PWM channel, it must be set to the Alt Function given above.
+  Note carefully that current versions of the Raspberry Pi only expose one of these pins (GPIO 18 = RPi Pin 1-12)
+  on the IO headers, and therefore this is the only IO pin on the RPi that can be used for PWM.
+  Further it must be set to ALT FUN 5 to get PWM output.
+  
+  Both PWM channels are driven by the same PWM clock, whose clock dvider can be varied using 
+  bcm2835_pwm_set_clock(). Each channel can be separately enabled with bcm2835_pwm_set_mode().
+  The average output of the PWM channel is determined by the ratio of DATA/RANGE for that channel.
+  Use bcm2835_pwm_set_range() to set the range and bcm2835_pwm_set_data() to set the data in that ratio
+  
+  Each PWM channel can run in either Balanced or Mark-Space mode. In Balanced mode, the hardware 
+  sends a combination of clock pulses that results in an overall DATA pulses per RANGE pulses.
+  In Mark-Space mode, the hardware sets the output HIGH for DATA clock pulses wide, followed by 
+  LOW for RANGE-DATA clock pulses. 
+  
+  The PWM clock can be set to control the PWM pulse widths. The PWM clock is derived from 
+  a 19.2MHz clock. You can set any divider, but some common ones are provided by the BCM2835_PWM_CLOCK_DIVIDER_*
+  values of \ref bcm2835PWMClockDivider.
+   
+  For example, say you wanted to drive a DC motor with PWM at about 1kHz, 
+  and control the speed in 1/1024 increments from 
+  0/1024 (stopped) through to 1024/1024 (full on). In that case you might set the 
+  clock divider to be 16, and the RANGE to 1024. The pulse repetition frequency will be
+  1.2MHz/1024 = 1171.875Hz.
+  
+  \par Interactions with other systems
+ 
+  In order for bcm2835 library SPI to work, you may need to disable the SPI kernel module using:
+
+  \code
+  sudo raspi-config
+   under Advanced Options - enable Device Tree
+   under Advanced Options - disable SPI
+   Reboot.
+  \endcode
+
+  Since bcm2835 accesses the lowest level hardware interfaces (in eh intererests of speed and flexibility)
+  there can be intercations with other low level software trying to do similar things.
+
+  It seems that with "latest" 8.0 Jessie 4.9.24-v7+ kernel PWM just won't 
+  work unless you disable audio. There's a line
+  \code
+  dtparam=audio=on
+  \endcode
+  in the /boot/config.txt. 
+  Comment it out like this:
+  \code
+  #dtparam=audio=on
+  \endcode
+
+  \par Real Time performance constraints
+  
+  The bcm2835 is a library for user programs (i.e. they run in 'userland'). 
+  Such programs are not part of the kernel and are usually
+  subject to paging and swapping by the kernel while it does other things besides running your program. 
+  This means that you should not expect to get real-time performance or 
+  real-time timing constraints from such programs. In particular, there is no guarantee that the 
+  bcm2835_delay() and bcm2835_delayMicroseconds() will return after exactly the time requested. 
+  In fact, depending on other activity on the host, IO etc, you might get significantly longer delay times
+  than the one you asked for. So please dont expect to get exactly the time delay you request.
+  
+  Arjan reports that you can prevent swapping on Linux with the following code fragment:
+  
+  \code
+  #define <sched.h>
+  #define <sys/mman.h>
+
+  struct sched_param sp;
+  memset(&sp, 0, sizeof(sp));
+  sp.sched_priority = sched_get_priority_max(SCHED_FIFO);
+  sched_setscheduler(0, SCHED_FIFO, &sp);
+  mlockall(MCL_CURRENT | MCL_FUTURE);
+  \endcode
+  
+  \par Crashing on some versions of Raspbian
+  Some people have reported that various versions of Rasbian will crash or hang 
+  if certain GPIO pins are toggled: https://github.com/raspberrypi/linux/issues/2550
+  when using bcm2835.
+  A workaround is to add this line to your /boot/config.txt:
+  \code
+    dtoverlay=gpio-no-irq
+  \endcode
+
+  \par Bindings to other languages
+  
+  mikem has made Perl bindings available at CPAN:
+  http://search.cpan.org/~mikem/Device-BCM2835-1.9/lib/Device/BCM2835.pm
+  Matthew Baker has kindly made Python bindings available at:
+  https:  github.com/mubeta06/py-libbcm2835
+  Gary Marks has created a Serial Peripheral Interface (SPI) command-line utility 
+  for Raspberry Pi, based on the bcm2835 library. The 
+  utility, spincl, is licensed under Open Source GNU GPLv3 by iP Solutions (http://ipsolutionscorp.com), as a 
+  free download with source included: http://ipsolutionscorp.com/raspberry-pi-spi-utility/
+  
+  \par Open Source Licensing GPL V2
+  
+  This is the appropriate option if you want to share the source code of your
+  application with everyone you distribute it to, and you also want to give them
+  the right to share who uses it. If you wish to use this software under Open
+  Source Licensing, you must contribute all your source code to the open source
+  community in accordance with the GPL Version 2 when your application is
+  distributed. See https://www.gnu.org/licenses/gpl-2.0.html and COPYING
+  
+  \par Commercial Licensing
+
+ This is the appropriate option if you are creating proprietary applications
+ and you are not prepared to distribute and share the source code of your
+ application. To purchase a commercial license, contact info@airspayce.com
+
+  \par Acknowledgements
+  
+  Some of this code has been inspired by Dom and Gert.
+  The I2C code has been inspired by Alan Barr.
+   
+  \par Revision History
+  
+  \version 1.0 Initial release
+
+  \version 1.1 Minor bug fixes
+
+  \version 1.2 Added support for SPI
+
+  \version 1.3 Added bcm2835_spi_transfern()
+
+  \version 1.4 Fixed a problem that prevented SPI CE1 being used. Reported by David Robinson.
+
+  \version 1.5 Added bcm2835_close() to deinit the library. Suggested by C?sar Ortiz
+
+  \version 1.6 Document testing on 2012-07-15-wheezy-raspbian and Occidentalisv01
+  Functions bcm2835_gpio_ren(), bcm2835_gpio_fen(), bcm2835_gpio_hen()
+  bcm2835_gpio_len(), bcm2835_gpio_aren() and bcm2835_gpio_afen() now 
+  changes only the pin specified. Other pins that were already previously
+  enabled stay enabled.
+  Added  bcm2835_gpio_clr_ren(), bcm2835_gpio_clr_fen(), bcm2835_gpio_clr_hen()
+  bcm2835_gpio_clr_len(), bcm2835_gpio_clr_aren(), bcm2835_gpio_clr_afen() 
+  to clear the enable for individual pins, suggested by Andreas Sundstrom.
+
+  \version 1.7 Added bcm2835_spi_transfernb to support different buffers for read and write.
+
+  \version 1.8 Improvements to read barrier, as suggested by maddin.
+
+  \version 1.9 Improvements contributed by mikew: 
+  I noticed that it was mallocing memory for the mmaps on /dev/mem.
+  It's not necessary to do that, you can just mmap the file directly,
+  so I've removed the mallocs (and frees).
+  I've also modified delayMicroseconds() to use nanosleep() for long waits,
+  and a busy wait on a high resolution timer for the rest. This is because
+  I've found that calling nanosleep() takes at least 100-200 us.
+  You need to link using '-lrt' using this version.
+  I've added some unsigned casts to the debug prints to silence compiler
+  warnings I was getting, fixed some typos, and changed the value of
+  BCM2835_PAD_HYSTERESIS_ENABLED to 0x08 as per Gert van Loo's doc at
+  http://www.scribd.com/doc/101830961/GPIO-Pads-Control2
+  Also added a define for the passwrd value that Gert says is needed to
+  change pad control settings.
+
+  \version 1.10 Changed the names of the delay functions to bcm2835_delay() 
+  and bcm2835_delayMicroseconds() to prevent collisions with wiringPi.
+  Macros to map delay()-> bcm2835_delay() and
+  Macros to map delayMicroseconds()-> bcm2835_delayMicroseconds(), which
+  can be disabled by defining BCM2835_NO_DELAY_COMPATIBILITY
+
+  \version 1.11 Fixed incorrect link to download file
+
+  \version 1.12 New GPIO pin definitions for RPi version 2 (which has a different GPIO mapping)             
+
+  \version 1.13 New GPIO pin definitions for RPi version 2 plug P5
+  Hardware base pointers are now available (after initialisation) externally as bcm2835_gpio
+  bcm2835_pwm bcm2835_clk bcm2835_pads bcm2835_spi0.
+
+  \version 1.14 Now compiles even if CLOCK_MONOTONIC_RAW is not available, uses CLOCK_MONOTONIC instead.
+  Fixed errors in documentation of SPI divider frequencies based on 250MHz clock. 
+  Reported by Ben Simpson.
+
+  \version 1.15 Added bcm2835_close() to end of examples as suggested by Mark Wolfe.
+
+  \version 1.16 Added bcm2835_gpio_set_multi, bcm2835_gpio_clr_multi and bcm2835_gpio_write_multi
+  to allow a mask of pins to be set all at once. Requested by Sebastian Loncar.
+
+  \version 1.17  Added bcm2835_gpio_write_mask. Requested by Sebastian Loncar.
+
+  \version 1.18 Added bcm2835_i2c_* functions. Changes to bcm2835_delayMicroseconds: 
+  now uses the RPi system timer counter, instead of clock_gettime, for improved accuracy. 
+  No need to link with -lrt now. Contributed by Arjan van Vught.
+  \version 1.19 Removed inlines added by previous patch since they don't seem to work everywhere. 
+  Reported by olly.
+
+  \version 1.20 Patch from Mark Dootson to close /dev/mem after access to the peripherals has been granted.
+
+  \version 1.21 delayMicroseconds is now not susceptible to 32 bit timer overruns. 
+  Patch courtesy Jeremy Mortis.
+
+  \version 1.22 Fixed incorrect definition of BCM2835_GPFEN0 which broke the ability to set 
+  falling edge events. Reported by Mark Dootson.
+
+  \version 1.23 Added bcm2835_i2c_set_baudrate and bcm2835_i2c_read_register_rs. 
+  Improvements to bcm2835_i2c_read and bcm2835_i2c_write functions
+  to fix ocasional reads not completing. Patched by Mark Dootson.
+
+  \version 1.24 Mark Dootson p[atched a problem with his previously submitted code
+  under high load from other processes. 
+
+  \version 1.25 Updated author and distribution location details to airspayce.com
+
+  \version 1.26 Added missing unmapmem for pads in bcm2835_close to prevent a memory leak. 
+  Reported by Hartmut Henkel.
+
+  \version 1.27 bcm2835_gpio_set_pad() no longer needs BCM2835_PAD_PASSWRD: it is
+  now automatically included.
+  Added support for PWM mode with bcm2835_pwm_* functions.
+
+  \version 1.28 Fixed a problem where bcm2835_spi_writenb() would have problems with transfers of more than
+  64 bytes dues to read buffer filling. Patched by Peter Würtz.
+
+  \version 1.29 Further fix to SPI from Peter Würtz.
+
+  \version 1.30 10 microsecond delays from bcm2835_spi_transfer and bcm2835_spi_transfern for
+  significant performance improvements, Patch by Alan Watson.
+
+  \version 1.31 Fix a GCC warning about dummy variable, patched by Alan Watson. Thanks.
+
+  \version 1.32 Added option I2C_V1 definition to compile for version 1 RPi. 
+  By default I2C code is generated for the V2 RPi which has SDA1 and SCL1 connected.
+  Contributed by Malcolm Wiles based on work by Arvi Govindaraj.
+
+  \version 1.33 Added command line utilities i2c and gpio to examples. Contributed by Shahrooz Shahparnia.
+
+  \version 1.34 Added bcm2835_i2c_write_read_rs() which writes an arbitrary number of bytes, 
+  sends a repeat start, and reads from the device. Contributed by Eduardo Steinhorst.
+
+  \version 1.35 Fix build errors when compiled under Qt. Also performance improvements with SPI transfers. Contributed b Udo Klaas.
+
+  \version 1.36 Make automake's test runner detect that we're skipping tests when not root, the second
+  one makes us skip the test when using fakeroot (as used when building
+  Debian packages). Contributed by Guido Günther.
+
+  \version 1.37 Moved confiure.in to configure.ac as receommnded by autoreconf.<br>
+  Improvements to bcm2835_st_read to account for possible timer overflow, contributed by 'Ed'.<br>
+  Added definitions for Raspberry Pi B+ J8 header GPIO pins.<br>
+
+  \version 1.38 Added bcm2835_regbase for the benefit of C# wrappers, patch by Frank Hommers <br>
+
+  \version 1.39 Beta version of RPi2 compatibility. Not tested here on RPi2 hardware. 
+  Testers please confirm correct operation on RPi2.<br>
+  Unnecessary 'volatile' qualifiers removed from all variables and signatures.<br>
+  Removed unsupportable PWM dividers, based on a report from Christophe Cecillon.<br>
+  Minor improvements to spi.c example.<br>
+
+  \version 1.40 Correct operation on RPi2 has been confirmed.<br>
+  Fixed a number of compiler errors and warnings that occur when bcm2835.h is included
+  in code compiled with -Wall -Woverflow -Wstrict-overflow -Wshadow -Wextra -pedantic.
+  Reported by tlhackque.<br>
+  Fixed a problem where calling bcm2835_delayMicroseconds loops forever when debug is set. Reported by tlhackque.<br>
+  Reinstated use of volatile in 2 functions where there was a danger of lost reads or writes. Reported by tlhackque.<br>
+  
+  \version 1.41 Added BCM2835_VERSION macro and new function bcm2835_version(); Requested by tlhackque.<br>
+  Improvements to peripheral memory barriers as suggested by tlhackque.<br>
+  Reinstated some necessary volatile declarations as requested by tlhackque.<br>
+
+  \version 1.42 Further improvements to memory barriers with the patient assistance and patches of tlhackque.<br>
+
+  \version 1.43 Fixed problems with compiling barriers on RPI 2 with Arch Linux and gcc 4.9.2. 
+  Reported and patched by Lars Christensen.<br>
+  Testing on RPI 2, with ArchLinuxARM-rpi-2-latest and 2015-02-16-raspbian-wheezy.<br>
+
+  \version 1.44 Added documention about the need for device tree to be enabled on RPI2.<br>
+  Improvements to detection of availability of DMB instruction based on value of __ARM_ARCH macro.<br>
+
+  \version 1.45 Fixed an error in the pad group offsets that would prevent bcm2835_gpio_set_pad() 
+  and bcm2835_gpio_pad() working correctly with non-0 pad groups. Reported by Guido.
+
+  \version 1.46 2015-09-18
+  Added symbolic definitions for remaining pins on 40 pin GPIO header on RPi 2. <br>
+
+  \version 1.47 2015-11-18
+  Fixed possibly incorrect reads in bcm2835_i2c_read_register_rs, patch from Eckhardt Ulrich.<br>
+
+  \version 1.48 2015-12-08
+  Added patch from Eckhardt Ulrich that fixed problems that could cause hanging with bcm2835_i2c_read_register_rs
+  and others.
+
+  \version 1.49 2016-01-05
+  Added patch from Jonathan Perkin with new functions bcm2835_gpio_eds_multi() and bcm2835_gpio_set_eds_multi().
+
+  \version 1.50 2016-02-28
+  Added support for running as non-root, permitting access to GPIO only. Functions
+  bcm2835_spi_begin() and bcm2835_i2c_begin() will now return 0 if not running as root 
+  (which prevents access to the SPI and I2C peripherals, amongst others). 
+  Testing on Raspbian Jessie.
+
+  \version 1.51 2016-11-03
+  Added documentation about SPI clock divider and resulting SPI speeds on RPi3.
+  Fixed a problem where seg fault could occur in bcm2835_delayMicroseconds() if not running as root. Patch from Pok.
+
+  \version 1.52 2017-02-03
+  Added link to commercial license purchasing.
+
+  \version 1.53 2018-01-14
+  Added support for AUX SPI (SPI1)
+  Contributed by Arjan van Vught (http://www.raspberrypi-dmx.org/)
+
+  \version 1.54 2018-01-17
+  Fixed compile errors in new AUX spi code under some circumstances.
+
+  \version 1.55 2018-01-20
+  Fixed version numbers.
+  Fixed some warnings.
+
+  \version 1.56 2018-06-10
+  Supports bcm2835_spi_setBitOrder(BCM2835_SPI_BIT_ORDER_LSBFIRST), after which SPI bytes are reversed on read or write.
+  Based on a suggestion by Damiano Benedetti.
+  
+  \version 1.57 2018-08-28
+  Added SPI function bcm2835_spi_set_speed_hz(uint32_t speed_hz);
+  Contributed by Arjan van Vught (http://www.raspberrypi-dmx.org/)
+
+  \version 1.58 2018-11-29
+  Added examples/spiram, which shows how to use the included little library (spiram.c and spiram.h)
+  to read and write SPI RAM chips such as 23K256-I/P
+
+  \version 1.59 2019-05-22
+  Fixed a bug in bcm2835_i2c_read reported by Charles Hayward where a noisy I2C line cold cause a seg fault by
+  reading too many characters.
+  
+  \version 1.60 2019-07-23
+  Applied patch from Mark Dootson for RPi 4 compatibility. Thanks Mark. Not tested here on RPi4, but others report it works.
+  Tested as still working correctly on earlier RPi models. Tested with Debian Buster on earlier models
+
+  \author  Mike McCauley (mikem@airspayce.com) DO NOT CONTACT THE AUTHOR DIRECTLY: USE THE LISTS
+*/
+
+
+/* Defines for BCM2835 */
+#ifndef BCM2835_H
+#define BCM2835_H
+
+#include <stdint.h>
+
+#define BCM2835_VERSION 10060 /* Version 1.60 */
+
+/* RPi 2 is ARM v7, and has DMB instruction for memory barriers.
+   Older RPis are ARM v6 and don't, so a coprocessor instruction must be used instead.
+   However, not all versions of gcc in all distros support the dmb assembler instruction even on conmpatible processors.
+   This test is so any ARMv7 or higher processors with suitable GCC will use DMB.
+*/
+#if __ARM_ARCH >= 7
+#define BCM2835_HAVE_DMB
+#endif
+
+/*! \defgroup constants Constants for passing to and from library functions
+  The values here are designed to be passed to various functions in the bcm2835 library.
+  @{
+*/
+
+/*! This means pin HIGH, true, 3.3volts on a pin. */
+#define HIGH 0x1
+/*! This means pin LOW, false, 0volts on a pin. */
+#define LOW  0x0
+
+/*! Return the minimum of 2 numbers */
+#ifndef MIN
+#define MIN(a, b) (a < b ? a : b)
+#endif
+
+/*! Speed of the core clock core_clk */
+#define BCM2835_CORE_CLK_HZ		250000000	/*!< 250 MHz */
+
+/*! On all recent OSs, the base of the peripherals is read from a /proc file */
+#define BMC2835_RPI2_DT_FILENAME "/proc/device-tree/soc/ranges"
+
+/*! Physical addresses for various peripheral register sets
+  Base Physical Address of the BCM 2835 peripheral registers
+  Note this is different for the RPi2 BCM2836, where this is derived from /proc/device-tree/soc/ranges
+  If /proc/device-tree/soc/ranges exists on a RPi 1 OS, it would be expected to contain the
+  following numbers:
+*/
+/*! Peripherals block base address on RPi 1 */
+#define BCM2835_PERI_BASE               0x20000000
+/*! Size of the peripherals block on RPi 1 */
+#define BCM2835_PERI_SIZE               0x01000000
+/*! Alternate base address for RPI  2 / 3 */
+#define BCM2835_RPI2_PERI_BASE          0x3F000000
+/*! Alternate base address for RPI  4 */
+#define BCM2835_RPI4_PERI_BASE          0xFE000000
+/*! Alternate size for RPI  4 */
+#define BCM2835_RPI4_PERI_SIZE          0x01800000
+
+/*! Offsets for the bases of various peripherals within the peripherals block
+  /   Base Address of the System Timer registers
+*/
+#define BCM2835_ST_BASE					0x3000
+/*! Base Address of the Pads registers */
+#define BCM2835_GPIO_PADS               0x100000
+/*! Base Address of the Clock/timer registers */
+#define BCM2835_CLOCK_BASE              0x101000
+/*! Base Address of the GPIO registers */
+#define BCM2835_GPIO_BASE               0x200000
+/*! Base Address of the SPI0 registers */
+#define BCM2835_SPI0_BASE               0x204000
+/*! Base Address of the BSC0 registers */
+#define BCM2835_BSC0_BASE 				0x205000
+/*! Base Address of the PWM registers */
+#define BCM2835_GPIO_PWM                0x20C000
+/*! Base Address of the AUX registers */
+#define BCM2835_AUX_BASE				0x215000
+/*! Base Address of the AUX_SPI1 registers */
+#define BCM2835_SPI1_BASE				0x215080
+/*! Base Address of the AUX_SPI2 registers */
+#define BCM2835_SPI2_BASE				0x2150C0
+/*! Base Address of the BSC1 registers */
+#define BCM2835_BSC1_BASE				0x804000
+
+
+/*! Physical address and size of the peripherals block
+  May be overridden on RPi2
+*/
+extern uint32_t *bcm2835_peripherals_base;
+/*! Size of the peripherals block to be mapped */
+extern uint32_t bcm2835_peripherals_size;
+
+/*! Virtual memory address of the mapped peripherals block */
+extern uint32_t *bcm2835_peripherals;
+
+/*! Base of the ST (System Timer) registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_st;
+
+/*! Base of the GPIO registers.
+  Available after bcm2835_init has been called
+*/
+extern volatile uint32_t *bcm2835_gpio;
+
+/*! Base of the PWM registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_pwm;
+
+/*! Base of the CLK registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_clk;
+
+/*! Base of the PADS registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_pads;
+
+/*! Base of the SPI0 registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_spi0;
+
+/*! Base of the BSC0 registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_bsc0;
+
+/*! Base of the BSC1 registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_bsc1;
+
+/*! Base of the AUX registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_aux;
+
+/*! Base of the SPI1 registers.
+  Available after bcm2835_init has been called (as root)
+*/
+extern volatile uint32_t *bcm2835_spi1;
+
+
+/*! \brief bcm2835RegisterBase
+  Register bases for bcm2835_regbase()
+*/
+typedef enum
+{
+    BCM2835_REGBASE_ST   = 1, /*!< Base of the ST (System Timer) registers. */
+    BCM2835_REGBASE_GPIO = 2, /*!< Base of the GPIO registers. */
+    BCM2835_REGBASE_PWM  = 3, /*!< Base of the PWM registers. */
+    BCM2835_REGBASE_CLK  = 4, /*!< Base of the CLK registers. */
+    BCM2835_REGBASE_PADS = 5, /*!< Base of the PADS registers. */
+    BCM2835_REGBASE_SPI0 = 6, /*!< Base of the SPI0 registers. */
+    BCM2835_REGBASE_BSC0 = 7, /*!< Base of the BSC0 registers. */
+    BCM2835_REGBASE_BSC1 = 8,  /*!< Base of the BSC1 registers. */
+	BCM2835_REGBASE_AUX  = 9,  /*!< Base of the AUX registers. */
+	BCM2835_REGBASE_SPI1 = 10  /*!< Base of the SPI1 registers. */
+} bcm2835RegisterBase;
+
+/*! Size of memory page on RPi */
+#define BCM2835_PAGE_SIZE               (4*1024)
+/*! Size of memory block on RPi */
+#define BCM2835_BLOCK_SIZE              (4*1024)
+
+
+/* Defines for GPIO
+   The BCM2835 has 54 GPIO pins.
+   BCM2835 data sheet, Page 90 onwards.
+*/
+/*! GPIO register offsets from BCM2835_GPIO_BASE. 
+  Offsets into the GPIO Peripheral block in bytes per 6.1 Register View 
+*/
+#define BCM2835_GPFSEL0                      0x0000 /*!< GPIO Function Select 0 */
+#define BCM2835_GPFSEL1                      0x0004 /*!< GPIO Function Select 1 */
+#define BCM2835_GPFSEL2                      0x0008 /*!< GPIO Function Select 2 */
+#define BCM2835_GPFSEL3                      0x000c /*!< GPIO Function Select 3 */
+#define BCM2835_GPFSEL4                      0x0010 /*!< GPIO Function Select 4 */
+#define BCM2835_GPFSEL5                      0x0014 /*!< GPIO Function Select 5 */
+#define BCM2835_GPSET0                       0x001c /*!< GPIO Pin Output Set 0 */
+#define BCM2835_GPSET1                       0x0020 /*!< GPIO Pin Output Set 1 */
+#define BCM2835_GPCLR0                       0x0028 /*!< GPIO Pin Output Clear 0 */
+#define BCM2835_GPCLR1                       0x002c /*!< GPIO Pin Output Clear 1 */
+#define BCM2835_GPLEV0                       0x0034 /*!< GPIO Pin Level 0 */
+#define BCM2835_GPLEV1                       0x0038 /*!< GPIO Pin Level 1 */
+#define BCM2835_GPEDS0                       0x0040 /*!< GPIO Pin Event Detect Status 0 */
+#define BCM2835_GPEDS1                       0x0044 /*!< GPIO Pin Event Detect Status 1 */
+#define BCM2835_GPREN0                       0x004c /*!< GPIO Pin Rising Edge Detect Enable 0 */
+#define BCM2835_GPREN1                       0x0050 /*!< GPIO Pin Rising Edge Detect Enable 1 */
+#define BCM2835_GPFEN0                       0x0058 /*!< GPIO Pin Falling Edge Detect Enable 0 */
+#define BCM2835_GPFEN1                       0x005c /*!< GPIO Pin Falling Edge Detect Enable 1 */
+#define BCM2835_GPHEN0                       0x0064 /*!< GPIO Pin High Detect Enable 0 */
+#define BCM2835_GPHEN1                       0x0068 /*!< GPIO Pin High Detect Enable 1 */
+#define BCM2835_GPLEN0                       0x0070 /*!< GPIO Pin Low Detect Enable 0 */
+#define BCM2835_GPLEN1                       0x0074 /*!< GPIO Pin Low Detect Enable 1 */
+#define BCM2835_GPAREN0                      0x007c /*!< GPIO Pin Async. Rising Edge Detect 0 */
+#define BCM2835_GPAREN1                      0x0080 /*!< GPIO Pin Async. Rising Edge Detect 1 */
+#define BCM2835_GPAFEN0                      0x0088 /*!< GPIO Pin Async. Falling Edge Detect 0 */
+#define BCM2835_GPAFEN1                      0x008c /*!< GPIO Pin Async. Falling Edge Detect 1 */
+#define BCM2835_GPPUD                        0x0094 /*!< GPIO Pin Pull-up/down Enable */
+#define BCM2835_GPPUDCLK0                    0x0098 /*!< GPIO Pin Pull-up/down Enable Clock 0 */
+#define BCM2835_GPPUDCLK1                    0x009c /*!< GPIO Pin Pull-up/down Enable Clock 1 */
+
+/* 2711 has a different method for pin pull-up/down/enable  */
+#define BCM2835_GPPUPPDN0                    0x00e4 /* Pin pull-up/down for pins 15:0  */
+#define BCM2835_GPPUPPDN1                    0x00e8 /* Pin pull-up/down for pins 31:16 */
+#define BCM2835_GPPUPPDN2                    0x00ec /* Pin pull-up/down for pins 47:32 */
+#define BCM2835_GPPUPPDN3                    0x00f0 /* Pin pull-up/down for pins 57:48 */
+
+/*!   \brief bcm2835PortFunction
+  Port function select modes for bcm2835_gpio_fsel()
+*/
+typedef enum
+{
+    BCM2835_GPIO_FSEL_INPT  = 0x00,   /*!< Input 0b000 */
+    BCM2835_GPIO_FSEL_OUTP  = 0x01,   /*!< Output 0b001 */
+    BCM2835_GPIO_FSEL_ALT0  = 0x04,   /*!< Alternate function 0 0b100 */
+    BCM2835_GPIO_FSEL_ALT1  = 0x05,   /*!< Alternate function 1 0b101 */
+    BCM2835_GPIO_FSEL_ALT2  = 0x06,   /*!< Alternate function 2 0b110, */
+    BCM2835_GPIO_FSEL_ALT3  = 0x07,   /*!< Alternate function 3 0b111 */
+    BCM2835_GPIO_FSEL_ALT4  = 0x03,   /*!< Alternate function 4 0b011 */
+    BCM2835_GPIO_FSEL_ALT5  = 0x02,   /*!< Alternate function 5 0b010 */
+    BCM2835_GPIO_FSEL_MASK  = 0x07    /*!< Function select bits mask 0b111 */
+} bcm2835FunctionSelect;
+
+/*! \brief bcm2835PUDControl
+  Pullup/Pulldown defines for bcm2835_gpio_pud()
+*/
+typedef enum
+{
+    BCM2835_GPIO_PUD_OFF     = 0x00,   /*!< Off ? disable pull-up/down 0b00 */
+    BCM2835_GPIO_PUD_DOWN    = 0x01,   /*!< Enable Pull Down control 0b01 */
+    BCM2835_GPIO_PUD_UP      = 0x02    /*!< Enable Pull Up control 0b10  */
+} bcm2835PUDControl;
+
+/* need a value for pud functions that can't work unless RPI 4 */
+#define BCM2835_GPIO_PUD_ERROR  0x08 
+
+/*! Pad control register offsets from BCM2835_GPIO_PADS */
+#define BCM2835_PADS_GPIO_0_27               0x002c /*!< Pad control register for pads 0 to 27 */
+#define BCM2835_PADS_GPIO_28_45              0x0030 /*!< Pad control register for pads 28 to 45 */
+#define BCM2835_PADS_GPIO_46_53              0x0034 /*!< Pad control register for pads 46 to 53 */
+
+/*! Pad Control masks */
+#define BCM2835_PAD_PASSWRD                  (0x5A << 24)  /*!< Password to enable setting pad mask */
+#define BCM2835_PAD_SLEW_RATE_UNLIMITED      0x10 /*!< Slew rate unlimited */
+#define BCM2835_PAD_HYSTERESIS_ENABLED       0x08 /*!< Hysteresis enabled */
+#define BCM2835_PAD_DRIVE_2mA                0x00 /*!< 2mA drive current */
+#define BCM2835_PAD_DRIVE_4mA                0x01 /*!< 4mA drive current */
+#define BCM2835_PAD_DRIVE_6mA                0x02 /*!< 6mA drive current */
+#define BCM2835_PAD_DRIVE_8mA                0x03 /*!< 8mA drive current */
+#define BCM2835_PAD_DRIVE_10mA               0x04 /*!< 10mA drive current */
+#define BCM2835_PAD_DRIVE_12mA               0x05 /*!< 12mA drive current */
+#define BCM2835_PAD_DRIVE_14mA               0x06 /*!< 14mA drive current */
+#define BCM2835_PAD_DRIVE_16mA               0x07 /*!< 16mA drive current */
+
+/*! \brief bcm2835PadGroup
+  Pad group specification for bcm2835_gpio_pad()
+*/
+typedef enum
+{
+    BCM2835_PAD_GROUP_GPIO_0_27         = 0, /*!< Pad group for GPIO pads 0 to 27 */
+    BCM2835_PAD_GROUP_GPIO_28_45        = 1, /*!< Pad group for GPIO pads 28 to 45 */
+    BCM2835_PAD_GROUP_GPIO_46_53        = 2  /*!< Pad group for GPIO pads 46 to 53 */
+} bcm2835PadGroup;
+
+/*! \brief GPIO Pin Numbers
+  
+  Here we define Raspberry Pin GPIO pins on P1 in terms of the underlying BCM GPIO pin numbers.
+  These can be passed as a pin number to any function requiring a pin.
+  Not all pins on the RPi 26 bin IDE plug are connected to GPIO pins
+  and some can adopt an alternate function.
+  RPi version 2 has some slightly different pinouts, and these are values RPI_V2_*.
+  RPi B+ has yet differnet pinouts and these are defined in RPI_BPLUS_*.
+  At bootup, pins 8 and 10 are set to UART0_TXD, UART0_RXD (ie the alt0 function) respectively
+  When SPI0 is in use (ie after bcm2835_spi_begin()), SPI0 pins are dedicated to SPI
+  and cant be controlled independently.
+  If you are using the RPi Compute Module, just use the GPIO number: there is no need to use one of these
+  symbolic names
+*/
+typedef enum
+{
+    RPI_GPIO_P1_03        =  0,  /*!< Version 1, Pin P1-03 */
+    RPI_GPIO_P1_05        =  1,  /*!< Version 1, Pin P1-05 */
+    RPI_GPIO_P1_07        =  4,  /*!< Version 1, Pin P1-07 */
+    RPI_GPIO_P1_08        = 14,  /*!< Version 1, Pin P1-08, defaults to alt function 0 UART0_TXD */
+    RPI_GPIO_P1_10        = 15,  /*!< Version 1, Pin P1-10, defaults to alt function 0 UART0_RXD */
+    RPI_GPIO_P1_11        = 17,  /*!< Version 1, Pin P1-11 */
+    RPI_GPIO_P1_12        = 18,  /*!< Version 1, Pin P1-12, can be PWM channel 0 in ALT FUN 5 */
+    RPI_GPIO_P1_13        = 21,  /*!< Version 1, Pin P1-13 */
+    RPI_GPIO_P1_15        = 22,  /*!< Version 1, Pin P1-15 */
+    RPI_GPIO_P1_16        = 23,  /*!< Version 1, Pin P1-16 */
+    RPI_GPIO_P1_18        = 24,  /*!< Version 1, Pin P1-18 */
+    RPI_GPIO_P1_19        = 10,  /*!< Version 1, Pin P1-19, MOSI when SPI0 in use */
+    RPI_GPIO_P1_21        =  9,  /*!< Version 1, Pin P1-21, MISO when SPI0 in use */
+    RPI_GPIO_P1_22        = 25,  /*!< Version 1, Pin P1-22 */
+    RPI_GPIO_P1_23        = 11,  /*!< Version 1, Pin P1-23, CLK when SPI0 in use */
+    RPI_GPIO_P1_24        =  8,  /*!< Version 1, Pin P1-24, CE0 when SPI0 in use */
+    RPI_GPIO_P1_26        =  7,  /*!< Version 1, Pin P1-26, CE1 when SPI0 in use */
+
+    /* RPi Version 2 */
+    RPI_V2_GPIO_P1_03     =  2,  /*!< Version 2, Pin P1-03 */
+    RPI_V2_GPIO_P1_05     =  3,  /*!< Version 2, Pin P1-05 */
+    RPI_V2_GPIO_P1_07     =  4,  /*!< Version 2, Pin P1-07 */
+    RPI_V2_GPIO_P1_08     = 14,  /*!< Version 2, Pin P1-08, defaults to alt function 0 UART0_TXD */
+    RPI_V2_GPIO_P1_10     = 15,  /*!< Version 2, Pin P1-10, defaults to alt function 0 UART0_RXD */
+    RPI_V2_GPIO_P1_11     = 17,  /*!< Version 2, Pin P1-11 */
+    RPI_V2_GPIO_P1_12     = 18,  /*!< Version 2, Pin P1-12, can be PWM channel 0 in ALT FUN 5 */
+    RPI_V2_GPIO_P1_13     = 27,  /*!< Version 2, Pin P1-13 */
+    RPI_V2_GPIO_P1_15     = 22,  /*!< Version 2, Pin P1-15 */
+    RPI_V2_GPIO_P1_16     = 23,  /*!< Version 2, Pin P1-16 */
+    RPI_V2_GPIO_P1_18     = 24,  /*!< Version 2, Pin P1-18 */
+    RPI_V2_GPIO_P1_19     = 10,  /*!< Version 2, Pin P1-19, MOSI when SPI0 in use */
+    RPI_V2_GPIO_P1_21     =  9,  /*!< Version 2, Pin P1-21, MISO when SPI0 in use */
+    RPI_V2_GPIO_P1_22     = 25,  /*!< Version 2, Pin P1-22 */
+    RPI_V2_GPIO_P1_23     = 11,  /*!< Version 2, Pin P1-23, CLK when SPI0 in use */
+    RPI_V2_GPIO_P1_24     =  8,  /*!< Version 2, Pin P1-24, CE0 when SPI0 in use */
+    RPI_V2_GPIO_P1_26     =  7,  /*!< Version 2, Pin P1-26, CE1 when SPI0 in use */
+    RPI_V2_GPIO_P1_29     =  5,  /*!< Version 2, Pin P1-29 */
+    RPI_V2_GPIO_P1_31     =  6,  /*!< Version 2, Pin P1-31 */
+    RPI_V2_GPIO_P1_32     = 12,  /*!< Version 2, Pin P1-32 */
+    RPI_V2_GPIO_P1_33     = 13,  /*!< Version 2, Pin P1-33 */
+    RPI_V2_GPIO_P1_35     = 19,  /*!< Version 2, Pin P1-35, can be PWM channel 1 in ALT FUN 5  */
+    RPI_V2_GPIO_P1_36     = 16,  /*!< Version 2, Pin P1-36 */
+    RPI_V2_GPIO_P1_37     = 26,  /*!< Version 2, Pin P1-37 */
+    RPI_V2_GPIO_P1_38     = 20,  /*!< Version 2, Pin P1-38 */
+    RPI_V2_GPIO_P1_40     = 21,  /*!< Version 2, Pin P1-40 */
+
+    /* RPi Version 2, new plug P5 */
+    RPI_V2_GPIO_P5_03     = 28,  /*!< Version 2, Pin P5-03 */
+    RPI_V2_GPIO_P5_04     = 29,  /*!< Version 2, Pin P5-04 */
+    RPI_V2_GPIO_P5_05     = 30,  /*!< Version 2, Pin P5-05 */
+    RPI_V2_GPIO_P5_06     = 31,  /*!< Version 2, Pin P5-06 */
+
+    /* RPi B+ J8 header, also RPi 2 40 pin GPIO header */
+    RPI_BPLUS_GPIO_J8_03     =  2,  /*!< B+, Pin J8-03 */
+    RPI_BPLUS_GPIO_J8_05     =  3,  /*!< B+, Pin J8-05 */
+    RPI_BPLUS_GPIO_J8_07     =  4,  /*!< B+, Pin J8-07 */
+    RPI_BPLUS_GPIO_J8_08     = 14,  /*!< B+, Pin J8-08, defaults to alt function 0 UART0_TXD */
+    RPI_BPLUS_GPIO_J8_10     = 15,  /*!< B+, Pin J8-10, defaults to alt function 0 UART0_RXD */
+    RPI_BPLUS_GPIO_J8_11     = 17,  /*!< B+, Pin J8-11 */
+    RPI_BPLUS_GPIO_J8_12     = 18,  /*!< B+, Pin J8-12, can be PWM channel 0 in ALT FUN 5 */
+    RPI_BPLUS_GPIO_J8_13     = 27,  /*!< B+, Pin J8-13 */
+    RPI_BPLUS_GPIO_J8_15     = 22,  /*!< B+, Pin J8-15 */
+    RPI_BPLUS_GPIO_J8_16     = 23,  /*!< B+, Pin J8-16 */
+    RPI_BPLUS_GPIO_J8_18     = 24,  /*!< B+, Pin J8-18 */
+    RPI_BPLUS_GPIO_J8_19     = 10,  /*!< B+, Pin J8-19, MOSI when SPI0 in use */
+    RPI_BPLUS_GPIO_J8_21     =  9,  /*!< B+, Pin J8-21, MISO when SPI0 in use */
+    RPI_BPLUS_GPIO_J8_22     = 25,  /*!< B+, Pin J8-22 */
+    RPI_BPLUS_GPIO_J8_23     = 11,  /*!< B+, Pin J8-23, CLK when SPI0 in use */
+    RPI_BPLUS_GPIO_J8_24     =  8,  /*!< B+, Pin J8-24, CE0 when SPI0 in use */
+    RPI_BPLUS_GPIO_J8_26     =  7,  /*!< B+, Pin J8-26, CE1 when SPI0 in use */
+    RPI_BPLUS_GPIO_J8_29     =  5,  /*!< B+, Pin J8-29,  */
+    RPI_BPLUS_GPIO_J8_31     =  6,  /*!< B+, Pin J8-31,  */
+    RPI_BPLUS_GPIO_J8_32     = 12,  /*!< B+, Pin J8-32,  */
+    RPI_BPLUS_GPIO_J8_33     = 13,  /*!< B+, Pin J8-33,  */
+    RPI_BPLUS_GPIO_J8_35     = 19,  /*!< B+, Pin J8-35, can be PWM channel 1 in ALT FUN 5 */
+    RPI_BPLUS_GPIO_J8_36     = 16,  /*!< B+, Pin J8-36,  */
+    RPI_BPLUS_GPIO_J8_37     = 26,  /*!< B+, Pin J8-37,  */
+    RPI_BPLUS_GPIO_J8_38     = 20,  /*!< B+, Pin J8-38,  */
+    RPI_BPLUS_GPIO_J8_40     = 21   /*!< B+, Pin J8-40,  */
+} RPiGPIOPin;
+
+/* Defines for AUX
+  GPIO register offsets from BCM2835_AUX_BASE.
+*/
+#define BCM2835_AUX_IRQ			0x0000  /*!< xxx */
+#define BCM2835_AUX_ENABLE		0x0004  /*!< */
+
+#define BCM2835_AUX_ENABLE_UART1	0x01    /*!<  */
+#define BCM2835_AUX_ENABLE_SPI0		0x02	/*!< SPI0 (SPI1 in the device) */
+#define BCM2835_AUX_ENABLE_SPI1		0x04	/*!< SPI1 (SPI2 in the device) */
+
+
+#define BCM2835_AUX_SPI_CNTL0		0x0000  /*!< */
+#define BCM2835_AUX_SPI_CNTL1 		0x0004  /*!< */
+#define BCM2835_AUX_SPI_STAT 		0x0008  /*!< */
+#define BCM2835_AUX_SPI_PEEK		0x000C  /*!< Read but do not take from FF */
+#define BCM2835_AUX_SPI_IO		0x0020  /*!< Write = TX, read=RX */
+#define BCM2835_AUX_SPI_TXHOLD		0x0030  /*!< Write = TX keep CS, read=RX */
+
+#define BCM2835_AUX_SPI_CLOCK_MIN	30500		/*!< 30,5kHz */
+#define BCM2835_AUX_SPI_CLOCK_MAX	125000000 	/*!< 125Mhz */
+
+#define BCM2835_AUX_SPI_CNTL0_SPEED	0xFFF00000  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_SPEED_MAX	0xFFF      /*!< */
+#define BCM2835_AUX_SPI_CNTL0_SPEED_SHIFT 20        /*!< */
+
+#define BCM2835_AUX_SPI_CNTL0_CS0_N     0x000C0000 /*!< CS 0 low */
+#define BCM2835_AUX_SPI_CNTL0_CS1_N     0x000A0000 /*!< CS 1 low */
+#define BCM2835_AUX_SPI_CNTL0_CS2_N 	0x00060000 /*!< CS 2 low */
+
+#define BCM2835_AUX_SPI_CNTL0_POSTINPUT	0x00010000  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_VAR_CS	0x00008000  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_VAR_WIDTH	0x00004000  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_DOUTHOLD	0x00003000  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_ENABLE	0x00000800  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_CPHA_IN	0x00000400  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_CLEARFIFO	0x00000200  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_CPHA_OUT	0x00000100  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_CPOL	0x00000080  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_MSBF_OUT	0x00000040  /*!< */
+#define BCM2835_AUX_SPI_CNTL0_SHIFTLEN	0x0000003F  /*!< */
+
+#define BCM2835_AUX_SPI_CNTL1_CSHIGH	0x00000700  /*!< */
+#define BCM2835_AUX_SPI_CNTL1_IDLE	0x00000080  /*!< */
+#define BCM2835_AUX_SPI_CNTL1_TXEMPTY	0x00000040  /*!< */
+#define BCM2835_AUX_SPI_CNTL1_MSBF_IN	0x00000002  /*!< */
+#define BCM2835_AUX_SPI_CNTL1_KEEP_IN	0x00000001  /*!< */
+
+#define BCM2835_AUX_SPI_STAT_TX_LVL	0xFF000000  /*!< */
+#define BCM2835_AUX_SPI_STAT_RX_LVL	0x00FF0000  /*!< */
+#define BCM2835_AUX_SPI_STAT_TX_FULL	0x00000400  /*!< */
+#define BCM2835_AUX_SPI_STAT_TX_EMPTY	0x00000200  /*!< */
+#define BCM2835_AUX_SPI_STAT_RX_FULL	0x00000100  /*!< */
+#define BCM2835_AUX_SPI_STAT_RX_EMPTY	0x00000080  /*!< */
+#define BCM2835_AUX_SPI_STAT_BUSY	0x00000040  /*!< */
+#define BCM2835_AUX_SPI_STAT_BITCOUNT	0x0000003F  /*!< */
+
+/* Defines for SPI
+   GPIO register offsets from BCM2835_SPI0_BASE. 
+   Offsets into the SPI Peripheral block in bytes per 10.5 SPI Register Map
+*/
+#define BCM2835_SPI0_CS                      0x0000 /*!< SPI Master Control and Status */
+#define BCM2835_SPI0_FIFO                    0x0004 /*!< SPI Master TX and RX FIFOs */
+#define BCM2835_SPI0_CLK                     0x0008 /*!< SPI Master Clock Divider */
+#define BCM2835_SPI0_DLEN                    0x000c /*!< SPI Master Data Length */
+#define BCM2835_SPI0_LTOH                    0x0010 /*!< SPI LOSSI mode TOH */
+#define BCM2835_SPI0_DC                      0x0014 /*!< SPI DMA DREQ Controls */
+
+/* Register masks for SPI0_CS */
+#define BCM2835_SPI0_CS_LEN_LONG             0x02000000 /*!< Enable Long data word in Lossi mode if DMA_LEN is set */
+#define BCM2835_SPI0_CS_DMA_LEN              0x01000000 /*!< Enable DMA mode in Lossi mode */
+#define BCM2835_SPI0_CS_CSPOL2               0x00800000 /*!< Chip Select 2 Polarity */
+#define BCM2835_SPI0_CS_CSPOL1               0x00400000 /*!< Chip Select 1 Polarity */
+#define BCM2835_SPI0_CS_CSPOL0               0x00200000 /*!< Chip Select 0 Polarity */
+#define BCM2835_SPI0_CS_RXF                  0x00100000 /*!< RXF - RX FIFO Full */
+#define BCM2835_SPI0_CS_RXR                  0x00080000 /*!< RXR RX FIFO needs Reading (full) */
+#define BCM2835_SPI0_CS_TXD                  0x00040000 /*!< TXD TX FIFO can accept Data */
+#define BCM2835_SPI0_CS_RXD                  0x00020000 /*!< RXD RX FIFO contains Data */
+#define BCM2835_SPI0_CS_DONE                 0x00010000 /*!< Done transfer Done */
+#define BCM2835_SPI0_CS_TE_EN                0x00008000 /*!< Unused */
+#define BCM2835_SPI0_CS_LMONO                0x00004000 /*!< Unused */
+#define BCM2835_SPI0_CS_LEN                  0x00002000 /*!< LEN LoSSI enable */
+#define BCM2835_SPI0_CS_REN                  0x00001000 /*!< REN Read Enable */
+#define BCM2835_SPI0_CS_ADCS                 0x00000800 /*!< ADCS Automatically Deassert Chip Select */
+#define BCM2835_SPI0_CS_INTR                 0x00000400 /*!< INTR Interrupt on RXR */
+#define BCM2835_SPI0_CS_INTD                 0x00000200 /*!< INTD Interrupt on Done */
+#define BCM2835_SPI0_CS_DMAEN                0x00000100 /*!< DMAEN DMA Enable */
+#define BCM2835_SPI0_CS_TA                   0x00000080 /*!< Transfer Active */
+#define BCM2835_SPI0_CS_CSPOL                0x00000040 /*!< Chip Select Polarity */
+#define BCM2835_SPI0_CS_CLEAR                0x00000030 /*!< Clear FIFO Clear RX and TX */
+#define BCM2835_SPI0_CS_CLEAR_RX             0x00000020 /*!< Clear FIFO Clear RX  */
+#define BCM2835_SPI0_CS_CLEAR_TX             0x00000010 /*!< Clear FIFO Clear TX  */
+#define BCM2835_SPI0_CS_CPOL                 0x00000008 /*!< Clock Polarity */
+#define BCM2835_SPI0_CS_CPHA                 0x00000004 /*!< Clock Phase */
+#define BCM2835_SPI0_CS_CS                   0x00000003 /*!< Chip Select */
+
+/*! \brief bcm2835SPIBitOrder SPI Bit order
+  Specifies the SPI data bit ordering for bcm2835_spi_setBitOrder()
+*/
+typedef enum
+{
+    BCM2835_SPI_BIT_ORDER_LSBFIRST = 0,  /*!< LSB First */
+    BCM2835_SPI_BIT_ORDER_MSBFIRST = 1   /*!< MSB First */
+}bcm2835SPIBitOrder;
+
+/*! \brief SPI Data mode
+  Specify the SPI data mode to be passed to bcm2835_spi_setDataMode()
+*/
+typedef enum
+{
+    BCM2835_SPI_MODE0 = 0,  /*!< CPOL = 0, CPHA = 0 */
+    BCM2835_SPI_MODE1 = 1,  /*!< CPOL = 0, CPHA = 1 */
+    BCM2835_SPI_MODE2 = 2,  /*!< CPOL = 1, CPHA = 0 */
+    BCM2835_SPI_MODE3 = 3   /*!< CPOL = 1, CPHA = 1 */
+}bcm2835SPIMode;
+
+/*! \brief bcm2835SPIChipSelect
+  Specify the SPI chip select pin(s)
+*/
+typedef enum
+{
+    BCM2835_SPI_CS0 = 0,     /*!< Chip Select 0 */
+    BCM2835_SPI_CS1 = 1,     /*!< Chip Select 1 */
+    BCM2835_SPI_CS2 = 2,     /*!< Chip Select 2 (ie pins CS1 and CS2 are asserted) */
+    BCM2835_SPI_CS_NONE = 3  /*!< No CS, control it yourself */
+} bcm2835SPIChipSelect;
+
+/*! \brief bcm2835SPIClockDivider
+  Specifies the divider used to generate the SPI clock from the system clock.
+  Figures below give the divider, clock period and clock frequency.
+  Clock divided is based on nominal core clock rate of 250MHz on RPi1 and RPi2, and 400MHz on RPi3.
+  It is reported that (contrary to the documentation) any even divider may used.
+  The frequencies shown for each divider have been confirmed by measurement on RPi1 and RPi2.
+  The system clock frequency on RPi3 is different, so the frequency you get from a given divider will be different.
+  See comments in 'SPI Pins' for information about reliable SPI speeds.
+  Note: it is possible to change the core clock rate of the RPi 3 back to 250MHz, by putting 
+  \code
+  core_freq=250
+  \endcode
+  in the config.txt
+*/
+typedef enum
+{
+    BCM2835_SPI_CLOCK_DIVIDER_65536 = 0,       /*!< 65536 = 3.814697260kHz on Rpi2, 6.1035156kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_32768 = 32768,   /*!< 32768 = 7.629394531kHz on Rpi2, 12.20703125kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_16384 = 16384,   /*!< 16384 = 15.25878906kHz on Rpi2, 24.4140625kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_8192  = 8192,    /*!< 8192 = 30.51757813kHz on Rpi2, 48.828125kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_4096  = 4096,    /*!< 4096 = 61.03515625kHz on Rpi2, 97.65625kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_2048  = 2048,    /*!< 2048 = 122.0703125kHz on Rpi2, 195.3125kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_1024  = 1024,    /*!< 1024 = 244.140625kHz on Rpi2, 390.625kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_512   = 512,     /*!< 512 = 488.28125kHz on Rpi2, 781.25kHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_256   = 256,     /*!< 256 = 976.5625kHz on Rpi2, 1.5625MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_128   = 128,     /*!< 128 = 1.953125MHz on Rpi2, 3.125MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_64    = 64,      /*!< 64 = 3.90625MHz on Rpi2, 6.250MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_32    = 32,      /*!< 32 = 7.8125MHz on Rpi2, 12.5MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_16    = 16,      /*!< 16 = 15.625MHz on Rpi2, 25MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_8     = 8,       /*!< 8 = 31.25MHz on Rpi2, 50MHz on RPI3 */
+    BCM2835_SPI_CLOCK_DIVIDER_4     = 4,       /*!< 4 = 62.5MHz on Rpi2, 100MHz on RPI3. Dont expect this speed to work reliably. */
+    BCM2835_SPI_CLOCK_DIVIDER_2     = 2,       /*!< 2 = 125MHz on Rpi2, 200MHz on RPI3, fastest you can get. Dont expect this speed to work reliably.*/
+    BCM2835_SPI_CLOCK_DIVIDER_1     = 1        /*!< 1 = 3.814697260kHz on Rpi2, 6.1035156kHz on RPI3, same as 0/65536 */
+} bcm2835SPIClockDivider;
+
+/// \brief bcm2835SPISpeed
+/// Specifies the divider used to generate the SPI clock from the system clock.
+/// Figures below give the clock speed instead of clock divider.
+#define BCM2835_SPI_SPEED_64MHZ BCM2835_SPI_CLOCK_DIVIDER_4
+#define BCM2835_SPI_SPEED_32MHZ BCM2835_SPI_CLOCK_DIVIDER_8
+#define BCM2835_SPI_SPEED_16MHZ BCM2835_SPI_CLOCK_DIVIDER_16
+#define BCM2835_SPI_SPEED_8MHZ BCM2835_SPI_CLOCK_DIVIDER_32
+#define BCM2835_SPI_SPEED_4MHZ BCM2835_SPI_CLOCK_DIVIDER_64
+#define BCM2835_SPI_SPEED_2MHZ BCM2835_SPI_CLOCK_DIVIDER_128
+#define BCM2835_SPI_SPEED_1MHZ BCM2835_SPI_CLOCK_DIVIDER_256
+#define BCM2835_SPI_SPEED_512KHZ BCM2835_SPI_CLOCK_DIVIDER_512
+#define BCM2835_SPI_SPEED_256KHZ BCM2835_SPI_CLOCK_DIVIDER_1024
+#define BCM2835_SPI_SPEED_128KHZ BCM2835_SPI_CLOCK_DIVIDER_2048
+#define BCM2835_SPI_SPEED_64KHZ BCM2835_SPI_CLOCK_DIVIDER_4096
+#define BCM2835_SPI_SPEED_32KHZ BCM2835_SPI_CLOCK_DIVIDER_8192
+#define BCM2835_SPI_SPEED_16KHZ BCM2835_SPI_CLOCK_DIVIDER_16384
+#define BCM2835_SPI_SPEED_8KHZ BCM2835_SPI_CLOCK_DIVIDER_32768
+
+/* Defines for I2C
+   GPIO register offsets from BCM2835_BSC*_BASE.
+   Offsets into the BSC Peripheral block in bytes per 3.1 BSC Register Map
+*/
+#define BCM2835_BSC_C 							0x0000 /*!< BSC Master Control */
+#define BCM2835_BSC_S 			0x0004 /*!< BSC Master Status */
+#define BCM2835_BSC_DLEN		0x0008 /*!< BSC Master Data Length */
+#define BCM2835_BSC_A 			0x000c /*!< BSC Master Slave Address */
+#define BCM2835_BSC_FIFO		0x0010 /*!< BSC Master Data FIFO */
+#define BCM2835_BSC_DIV			0x0014 /*!< BSC Master Clock Divider */
+#define BCM2835_BSC_DEL			0x0018 /*!< BSC Master Data Delay */
+#define BCM2835_BSC_CLKT		0x001c /*!< BSC Master Clock Stretch Timeout */
+
+/* Register masks for BSC_C */
+#define BCM2835_BSC_C_I2CEN 		0x00008000 /*!< I2C Enable, 0 = disabled, 1 = enabled */
+#define BCM2835_BSC_C_INTR 		0x00000400 /*!< Interrupt on RX */
+#define BCM2835_BSC_C_INTT 		0x00000200 /*!< Interrupt on TX */
+#define BCM2835_BSC_C_INTD 		0x00000100 /*!< Interrupt on DONE */
+#define BCM2835_BSC_C_ST 		0x00000080 /*!< Start transfer, 1 = Start a new transfer */
+#define BCM2835_BSC_C_CLEAR_1 		0x00000020 /*!< Clear FIFO Clear */
+#define BCM2835_BSC_C_CLEAR_2 		0x00000010 /*!< Clear FIFO Clear */
+#define BCM2835_BSC_C_READ 		0x00000001 /*!<	Read transfer */
+
+/* Register masks for BSC_S */
+#define BCM2835_BSC_S_CLKT 		0x00000200 /*!< Clock stretch timeout */
+#define BCM2835_BSC_S_ERR 		0x00000100 /*!< ACK error */
+#define BCM2835_BSC_S_RXF 		0x00000080 /*!< RXF FIFO full, 0 = FIFO is not full, 1 = FIFO is full */
+#define BCM2835_BSC_S_TXE 		0x00000040 /*!< TXE FIFO full, 0 = FIFO is not full, 1 = FIFO is full */
+#define BCM2835_BSC_S_RXD 		0x00000020 /*!< RXD FIFO contains data */
+#define BCM2835_BSC_S_TXD 		0x00000010 /*!< TXD FIFO can accept data */
+#define BCM2835_BSC_S_RXR 		0x00000008 /*!< RXR FIFO needs reading (full) */
+#define BCM2835_BSC_S_TXW 		0x00000004 /*!< TXW FIFO needs writing (full) */
+#define BCM2835_BSC_S_DONE 		0x00000002 /*!< Transfer DONE */
+#define BCM2835_BSC_S_TA 		0x00000001 /*!< Transfer Active */
+
+#define BCM2835_BSC_FIFO_SIZE   	16 /*!< BSC FIFO size */
+
+/*! \brief bcm2835I2CClockDivider
+  Specifies the divider used to generate the I2C clock from the system clock.
+  Clock divided is based on nominal base clock rate of 250MHz
+*/
+typedef enum
+{
+    BCM2835_I2C_CLOCK_DIVIDER_2500   = 2500,      /*!< 2500 = 10us = 100 kHz */
+    BCM2835_I2C_CLOCK_DIVIDER_626    = 626,       /*!< 622 = 2.504us = 399.3610 kHz */
+    BCM2835_I2C_CLOCK_DIVIDER_150    = 150,       /*!< 150 = 60ns = 1.666 MHz (default at reset) */
+    BCM2835_I2C_CLOCK_DIVIDER_148    = 148        /*!< 148 = 59ns = 1.689 MHz */
+} bcm2835I2CClockDivider;
+
+/*! \brief bcm2835I2CReasonCodes
+  Specifies the reason codes for the bcm2835_i2c_write and bcm2835_i2c_read functions.
+*/
+typedef enum
+{
+    BCM2835_I2C_REASON_OK   	     = 0x00,      /*!< Success */
+    BCM2835_I2C_REASON_ERROR_NACK    = 0x01,      /*!< Received a NACK */
+    BCM2835_I2C_REASON_ERROR_CLKT    = 0x02,      /*!< Received Clock Stretch Timeout */
+    BCM2835_I2C_REASON_ERROR_DATA    = 0x04       /*!< Not all data is sent / received */
+} bcm2835I2CReasonCodes;
+
+/* Defines for ST
+   GPIO register offsets from BCM2835_ST_BASE.
+   Offsets into the ST Peripheral block in bytes per 12.1 System Timer Registers
+   The System Timer peripheral provides four 32-bit timer channels and a single 64-bit free running counter.
+   BCM2835_ST_CLO is the System Timer Counter Lower bits register.
+   The system timer free-running counter lower register is a read-only register that returns the current value
+   of the lower 32-bits of the free running counter.
+   BCM2835_ST_CHI is the System Timer Counter Upper bits register.
+   The system timer free-running counter upper register is a read-only register that returns the current value
+   of the upper 32-bits of the free running counter.
+*/
+#define BCM2835_ST_CS 			0x0000 /*!< System Timer Control/Status */
+#define BCM2835_ST_CLO 			0x0004 /*!< System Timer Counter Lower 32 bits */
+#define BCM2835_ST_CHI 			0x0008 /*!< System Timer Counter Upper 32 bits */
+
+/*! @} */
+
+
+/* Defines for PWM, word offsets (ie 4 byte multiples) */
+#define BCM2835_PWM_CONTROL 0
+#define BCM2835_PWM_STATUS  1
+#define BCM2835_PWM_DMAC    2
+#define BCM2835_PWM0_RANGE  4
+#define BCM2835_PWM0_DATA   5
+#define BCM2835_PWM_FIF1    6
+#define BCM2835_PWM1_RANGE  8
+#define BCM2835_PWM1_DATA   9
+
+/* Defines for PWM Clock, word offsets (ie 4 byte multiples) */
+#define BCM2835_PWMCLK_CNTL     40
+#define BCM2835_PWMCLK_DIV      41
+#define BCM2835_PWM_PASSWRD     (0x5A << 24)  /*!< Password to enable setting PWM clock */
+
+#define BCM2835_PWM1_MS_MODE    0x8000  /*!< Run in Mark/Space mode */
+#define BCM2835_PWM1_USEFIFO    0x2000  /*!< Data from FIFO */
+#define BCM2835_PWM1_REVPOLAR   0x1000  /*!< Reverse polarity */
+#define BCM2835_PWM1_OFFSTATE   0x0800  /*!< Ouput Off state */
+#define BCM2835_PWM1_REPEATFF   0x0400  /*!< Repeat last value if FIFO empty */
+#define BCM2835_PWM1_SERIAL     0x0200  /*!< Run in serial mode */
+#define BCM2835_PWM1_ENABLE     0x0100  /*!< Channel Enable */
+
+#define BCM2835_PWM0_MS_MODE    0x0080  /*!< Run in Mark/Space mode */
+#define BCM2835_PWM_CLEAR_FIFO  0x0040  /*!< Clear FIFO */
+#define BCM2835_PWM0_USEFIFO    0x0020  /*!< Data from FIFO */
+#define BCM2835_PWM0_REVPOLAR   0x0010  /*!< Reverse polarity */
+#define BCM2835_PWM0_OFFSTATE   0x0008  /*!< Ouput Off state */
+#define BCM2835_PWM0_REPEATFF   0x0004  /*!< Repeat last value if FIFO empty */
+#define BCM2835_PWM0_SERIAL     0x0002  /*!< Run in serial mode */
+#define BCM2835_PWM0_ENABLE     0x0001  /*!< Channel Enable */
+
+/*! \brief bcm2835PWMClockDivider
+  Specifies the divider used to generate the PWM clock from the system clock.
+  Figures below give the divider, clock period and clock frequency.
+  Clock divided is based on nominal PWM base clock rate of 19.2MHz
+  The frequencies shown for each divider have been confirmed by measurement
+*/
+typedef enum
+{
+    BCM2835_PWM_CLOCK_DIVIDER_2048  = 2048,    /*!< 2048 = 9.375kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_1024  = 1024,    /*!< 1024 = 18.75kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_512   = 512,     /*!< 512 = 37.5kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_256   = 256,     /*!< 256 = 75kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_128   = 128,     /*!< 128 = 150kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_64    = 64,      /*!< 64 = 300kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_32    = 32,      /*!< 32 = 600.0kHz */
+    BCM2835_PWM_CLOCK_DIVIDER_16    = 16,      /*!< 16 = 1.2MHz */
+    BCM2835_PWM_CLOCK_DIVIDER_8     = 8,       /*!< 8 = 2.4MHz */
+    BCM2835_PWM_CLOCK_DIVIDER_4     = 4,       /*!< 4 = 4.8MHz */
+    BCM2835_PWM_CLOCK_DIVIDER_2     = 2,       /*!< 2 = 9.6MHz, fastest you can get */
+    BCM2835_PWM_CLOCK_DIVIDER_1     = 1        /*!< 1 = 4.6875kHz, same as divider 4096 */
+} bcm2835PWMClockDivider;
+
+/* Historical name compatibility */
+#ifndef BCM2835_NO_DELAY_COMPATIBILITY
+#define delay(x) bcm2835_delay(x)
+#define delayMicroseconds(x) bcm2835_delayMicroseconds(x)
+#define millis() bcm2835_millis()
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*! \defgroup init Library initialisation and management
+      These functions allow you to intialise and control the bcm2835 library
+      @{
+    */
+
+    /*! Initialise the library by opening /dev/mem (if you are root) 
+      or /dev/gpiomem (if you are not)
+      and getting pointers to the 
+      internal memory for BCM 2835 device registers. You must call this (successfully)
+      before calling any other 
+      functions in this library (except bcm2835_set_debug). 
+      If bcm2835_init() fails by returning 0, 
+      calling any other function may result in crashes or other failures.
+      If bcm2835_init() succeeds but you are not running as root, then only gpio operations
+      are permitted, and calling any other functions may result in crashes or other failures. .
+      Prints messages to stderr in case of errors.
+      \return 1 if successful else 0
+    */
+    extern int bcm2835_init(void);
+
+    /*! Close the library, deallocating any allocated memory and closing /dev/mem
+      \return 1 if successful else 0
+    */
+    extern int bcm2835_close(void);
+
+    /*! Sets the debug level of the library.
+      A value of 1 prevents mapping to /dev/mem, and makes the library print out
+      what it would do, rather than accessing the GPIO registers.
+      A value of 0, the default, causes normal operation.
+      Call this before calling bcm2835_init();
+      \param[in] debug The new debug level. 1 means debug
+    */
+    extern void  bcm2835_set_debug(uint8_t debug);
+
+    /*! Returns the version number of the library, same as BCM2835_VERSION
+       \return the current library version number
+    */
+    extern unsigned int bcm2835_version(void);
+
+    /*! @} */
+
+    /*! \defgroup lowlevel Low level register access
+      These functions provide low level register access, and should not generally
+      need to be used 
+       
+      @{
+    */
+
+    /*! Gets the base of a register
+      \param[in] regbase You can use one of the common values BCM2835_REGBASE_*
+      in \ref bcm2835RegisterBase
+      \return the register base
+      \sa Physical Addresses
+    */
+    extern uint32_t* bcm2835_regbase(uint8_t regbase);
+
+    /*! Reads 32 bit value from a peripheral address WITH a memory barrier before and after each read.
+      This is safe, but slow.  The MB before protects this read from any in-flight reads that didn't
+      use a MB.  The MB after protects subsequent reads from another peripheral.
+
+      \param[in] paddr Physical address to read from. See BCM2835_GPIO_BASE etc.
+      \return the value read from the 32 bit register
+      \sa Physical Addresses
+    */
+    extern uint32_t bcm2835_peri_read(volatile uint32_t* paddr);
+
+    /*! Reads 32 bit value from a peripheral address WITHOUT the read barriers
+      You should only use this when:
+      o your code has previously called bcm2835_peri_read() for a register
+      within the same peripheral, and no read or write to another peripheral has occurred since.
+      o your code has called bcm2835_memory_barrier() since the last access to ANOTHER peripheral.
+
+      \param[in] paddr Physical address to read from. See BCM2835_GPIO_BASE etc.
+      \return the value read from the 32 bit register
+      \sa Physical Addresses
+    */
+    extern uint32_t bcm2835_peri_read_nb(volatile uint32_t* paddr);
+
+
+    /*! Writes 32 bit value from a peripheral address WITH a memory barrier before and after each write
+      This is safe, but slow.  The MB before ensures that any in-flight write to another peripheral
+      completes before this write is issued.  The MB after ensures that subsequent reads and writes
+      to another peripheral will see the effect of this write.
+
+      This is a tricky optimization; if you aren't sure, use the barrier version.
+
+      \param[in] paddr Physical address to read from. See BCM2835_GPIO_BASE etc.
+      \param[in] value The 32 bit value to write
+      \sa Physical Addresses
+    */
+    extern void bcm2835_peri_write(volatile uint32_t* paddr, uint32_t value);
+
+    /*! Writes 32 bit value from a peripheral address without the write barrier
+      You should only use this when:
+      o your code has previously called bcm2835_peri_write() for a register
+      within the same peripheral, and no other peripheral access has occurred since.
+      o your code has called bcm2835_memory_barrier() since the last access to ANOTHER peripheral.
+
+      This is a tricky optimization; if you aren't sure, use the barrier version.
+
+      \param[in] paddr Physical address to read from. See BCM2835_GPIO_BASE etc.
+      \param[in] value The 32 bit value to write
+      \sa Physical Addresses
+    */
+    extern void bcm2835_peri_write_nb(volatile uint32_t* paddr, uint32_t value);
+
+    /*! Alters a number of bits in a 32 peripheral regsiter.
+      It reads the current valu and then alters the bits defines as 1 in mask, 
+      according to the bit value in value. 
+      All other bits that are 0 in the mask are unaffected.
+      Use this to alter a subset of the bits in a register.
+      Memory barriers are used.  Note that this is not atomic; an interrupt
+      routine can cause unexpected results.
+      \param[in] paddr Physical address to read from. See BCM2835_GPIO_BASE etc.
+      \param[in] value The 32 bit value to write, masked in by mask.
+      \param[in] mask Bitmask that defines the bits that will be altered in the register.
+      \sa Physical Addresses
+    */
+    extern void bcm2835_peri_set_bits(volatile uint32_t* paddr, uint32_t value, uint32_t mask);
+    /*! @}    end of lowlevel */
+
+    /*! \defgroup gpio GPIO register access
+      These functions allow you to control the GPIO interface. You can set the 
+      function of each GPIO pin, read the input state and set the output state.
+      @{
+    */
+
+    /*! Sets the Function Select register for the given pin, which configures
+      the pin as Input, Output or one of the 6 alternate functions.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \param[in] mode Mode to set the pin to, one of BCM2835_GPIO_FSEL_* from \ref bcm2835FunctionSelect
+    */
+    extern void bcm2835_gpio_fsel(uint8_t pin, uint8_t mode);
+
+    /*! Sets the specified pin output to 
+      HIGH.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \sa bcm2835_gpio_write()
+    */
+    extern void bcm2835_gpio_set(uint8_t pin);
+
+    /*! Sets the specified pin output to 
+      LOW.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \sa bcm2835_gpio_write()
+    */
+    extern void bcm2835_gpio_clr(uint8_t pin);
+
+    /*! Sets any of the first 32 GPIO output pins specified in the mask to 
+      HIGH.
+      \param[in] mask Mask of pins to affect. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+      \sa bcm2835_gpio_write_multi()
+    */
+    extern void bcm2835_gpio_set_multi(uint32_t mask);
+
+    /*! Sets any of the first 32 GPIO output pins specified in the mask to 
+      LOW.
+      \param[in] mask Mask of pins to affect. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+      \sa bcm2835_gpio_write_multi()
+    */
+    extern void bcm2835_gpio_clr_multi(uint32_t mask);
+
+    /*! Reads the current level on the specified 
+      pin and returns either HIGH or LOW. Works whether or not the pin
+      is an input or an output.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \return the current level  either HIGH or LOW
+    */
+    extern uint8_t bcm2835_gpio_lev(uint8_t pin);
+
+    /*! Event Detect Status.
+      Tests whether the specified pin has detected a level or edge
+      as requested by bcm2835_gpio_ren(), bcm2835_gpio_fen(), bcm2835_gpio_hen(), 
+      bcm2835_gpio_len(), bcm2835_gpio_aren(), bcm2835_gpio_afen().
+      Clear the flag for a given pin by calling bcm2835_gpio_set_eds(pin);
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \return HIGH if the event detect status for the given pin is true.
+    */
+    extern uint8_t bcm2835_gpio_eds(uint8_t pin);
+
+    /*! Same as bcm2835_gpio_eds() but checks if any of the pins specified in
+      the mask have detected a level or edge.
+      \param[in] mask Mask of pins to check. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+      \return Mask of pins HIGH if the event detect status for the given pin is true.
+    */
+    extern uint32_t bcm2835_gpio_eds_multi(uint32_t mask);
+
+    /*! Sets the Event Detect Status register for a given pin to 1, 
+      which has the effect of clearing the flag. Use this afer seeing
+      an Event Detect Status on the pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_set_eds(uint8_t pin);
+
+    /*! Same as bcm2835_gpio_set_eds() but clears the flag for any pin which
+      is set in the mask.
+      \param[in] mask Mask of pins to clear. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+    */
+    extern void bcm2835_gpio_set_eds_multi(uint32_t mask);
+    
+    /*! Enable Rising Edge Detect Enable for the specified pin.
+      When a rising edge is detected, sets the appropriate pin in Event Detect Status.
+      The GPRENn registers use
+      synchronous edge detection. This means the input signal is sampled using the
+      system clock and then it is looking for a ?011? pattern on the sampled signal. This
+      has the effect of suppressing glitches.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_ren(uint8_t pin);
+
+    /*! Disable Rising Edge Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_ren(uint8_t pin);
+
+    /*! Enable Falling Edge Detect Enable for the specified pin.
+      When a falling edge is detected, sets the appropriate pin in Event Detect Status.
+      The GPRENn registers use
+      synchronous edge detection. This means the input signal is sampled using the
+      system clock and then it is looking for a ?100? pattern on the sampled signal. This
+      has the effect of suppressing glitches.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_fen(uint8_t pin);
+
+    /*! Disable Falling Edge Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_fen(uint8_t pin);
+
+    /*! Enable High Detect Enable for the specified pin.
+      When a HIGH level is detected on the pin, sets the appropriate pin in Event Detect Status.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_hen(uint8_t pin);
+
+    /*! Disable High Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_hen(uint8_t pin);
+
+    /*! Enable Low Detect Enable for the specified pin.
+      When a LOW level is detected on the pin, sets the appropriate pin in Event Detect Status.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_len(uint8_t pin);
+
+    /*! Disable Low Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_len(uint8_t pin);
+
+    /*! Enable Asynchronous Rising Edge Detect Enable for the specified pin.
+      When a rising edge is detected, sets the appropriate pin in Event Detect Status.
+      Asynchronous means the incoming signal is not sampled by the system clock. As such
+      rising edges of very short duration can be detected.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_aren(uint8_t pin);
+
+    /*! Disable Asynchronous Rising Edge Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_aren(uint8_t pin);
+
+    /*! Enable Asynchronous Falling Edge Detect Enable for the specified pin.
+      When a falling edge is detected, sets the appropriate pin in Event Detect Status.
+      Asynchronous means the incoming signal is not sampled by the system clock. As such
+      falling edges of very short duration can be detected.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_afen(uint8_t pin);
+
+    /*! Disable Asynchronous Falling Edge Detect Enable for the specified pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    extern void bcm2835_gpio_clr_afen(uint8_t pin);
+
+    /*! Sets the Pull-up/down register for the given pin. This is
+      used with bcm2835_gpio_pudclk() to set the  Pull-up/down resistor for the given pin.
+      However, it is usually more convenient to use bcm2835_gpio_set_pud().
+      \param[in] pud The desired Pull-up/down mode. One of BCM2835_GPIO_PUD_* from bcm2835PUDControl
+      On the RPI 4, although this function and bcm2835_gpio_pudclk() are supported for backward
+      compatibility, new code should always use bcm2835_gpio_set_pud().
+      \sa bcm2835_gpio_set_pud()
+    */
+    extern void bcm2835_gpio_pud(uint8_t pud);
+
+    /*! Clocks the Pull-up/down value set earlier by bcm2835_gpio_pud() into the pin.
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \param[in] on HIGH to clock the value from bcm2835_gpio_pud() into the pin. 
+      LOW to remove the clock. 
+      
+      On the RPI 4, although this function and bcm2835_gpio_pud() are supported for backward
+      compatibility, new code should always use bcm2835_gpio_set_pud().
+      
+      \sa bcm2835_gpio_set_pud()
+    */
+    extern void bcm2835_gpio_pudclk(uint8_t pin, uint8_t on);
+
+    /*! Reads and returns the Pad Control for the given GPIO group.
+      Caution: requires root access.
+      \param[in] group The GPIO pad group number, one of BCM2835_PAD_GROUP_GPIO_*
+      \return Mask of bits from BCM2835_PAD_* from \ref bcm2835PadGroup
+    */
+    extern uint32_t bcm2835_gpio_pad(uint8_t group);
+
+    /*! Sets the Pad Control for the given GPIO group.
+      Caution: requires root access.
+      \param[in] group The GPIO pad group number, one of BCM2835_PAD_GROUP_GPIO_*
+      \param[in] control Mask of bits from BCM2835_PAD_* from \ref bcm2835PadGroup. Note 
+      that it is not necessary to include BCM2835_PAD_PASSWRD in the mask as this
+      is automatically included.
+    */
+    extern void bcm2835_gpio_set_pad(uint8_t group, uint32_t control);
+
+    /*! Delays for the specified number of milliseconds.
+      Uses nanosleep(), and therefore does not use CPU until the time is up.
+      However, you are at the mercy of nanosleep(). From the manual for nanosleep():
+      If the interval specified in req is not an exact multiple of the granularity  
+      underlying  clock  (see  time(7)),  then the interval will be
+      rounded up to the next multiple. Furthermore, after the sleep completes, 
+      there may still be a delay before the CPU becomes free to once
+      again execute the calling thread.
+      \param[in] millis Delay in milliseconds
+    */
+    extern void bcm2835_delay (unsigned int millis);
+
+    /*! Delays for the specified number of microseconds.
+      Uses a combination of nanosleep() and a busy wait loop on the BCM2835 system timers,
+      However, you are at the mercy of nanosleep(). From the manual for nanosleep():
+      If the interval specified in req is not an exact multiple of the granularity  
+      underlying  clock  (see  time(7)),  then the interval will be
+      rounded up to the next multiple. Furthermore, after the sleep completes, 
+      there may still be a delay before the CPU becomes free to once
+      again execute the calling thread.
+      For times less than about 450 microseconds, uses a busy wait on the System Timer.
+      It is reported that a delay of 0 microseconds on RaspberryPi will in fact
+      result in a delay of about 80 microseconds. Your mileage may vary.
+      \param[in] micros Delay in microseconds
+    */
+    extern void bcm2835_delayMicroseconds (uint64_t micros);
+        
+    /// Indicate the number of milliseconds since startup of PI
+    /// This function is like the Arduino millis function
+    /// \return Number of milliseconds
+    extern unsigned int bcm2835_millis(void);
+   
+    /*! Sets the output state of the specified pin
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \param[in] on HIGH sets the output to HIGH and LOW to LOW.
+    */
+    extern void bcm2835_gpio_write(uint8_t pin, uint8_t on);
+
+    /*! Sets any of the first 32 GPIO output pins specified in the mask to the state given by on
+      \param[in] mask Mask of pins to affect. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+      \param[in] on HIGH sets the output to HIGH and LOW to LOW.
+    */
+    extern void bcm2835_gpio_write_multi(uint32_t mask, uint8_t on);
+
+    /*! Sets the first 32 GPIO output pins specified in the mask to the value given by value
+      \param[in] value values required for each bit masked in by mask, eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+      \param[in] mask Mask of pins to affect. Use eg: (1 << RPI_GPIO_P1_03) | (1 << RPI_GPIO_P1_05)
+    */
+    extern void bcm2835_gpio_write_mask(uint32_t value, uint32_t mask);
+
+    /*! Sets the Pull-up/down mode for the specified pin. This is more convenient than
+      clocking the mode in with bcm2835_gpio_pud() and bcm2835_gpio_pudclk().
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+      \param[in] pud The desired Pull-up/down mode. One of BCM2835_GPIO_PUD_* from bcm2835PUDControl
+    */
+    extern void bcm2835_gpio_set_pud(uint8_t pin, uint8_t pud);
+
+    /*! On the BCM2711 based RPI 4, gets the current Pull-up/down mode for the specified pin.
+      Returns one of BCM2835_GPIO_PUD_* from bcm2835PUDControl.
+      On earlier RPI versions not based on the BCM2711, returns BCM2835_GPIO_PUD_ERROR
+      \param[in] pin GPIO number, or one of RPI_GPIO_P1_* from \ref RPiGPIOPin.
+    */
+    
+    extern uint8_t bcm2835_gpio_get_pud(uint8_t pin);
+
+    /*! @}  */
+
+    /*! \defgroup spi SPI access
+      These functions let you use SPI0 (Serial Peripheral Interface) to 
+      interface with an external SPI device.
+      @{
+    */
+
+    /*! Start SPI operations.
+      Forces RPi SPI0 pins P1-19 (MOSI), P1-21 (MISO), P1-23 (CLK), P1-24 (CE0) and P1-26 (CE1)
+      to alternate function ALT0, which enables those pins for SPI interface.
+      You should call bcm2835_spi_end() when all SPI funcitons are complete to return the pins to 
+      their default functions.
+      \sa  bcm2835_spi_end()
+      \return 1 if successful, 0 otherwise (perhaps because you are not running as root)
+    */
+    extern int bcm2835_spi_begin(void);
+
+    /*! End SPI operations.
+      SPI0 pins P1-19 (MOSI), P1-21 (MISO), P1-23 (CLK), P1-24 (CE0) and P1-26 (CE1)
+      are returned to their default INPUT behaviour.
+    */
+    extern void bcm2835_spi_end(void);
+
+    /*! Sets the SPI bit order
+      Set the bit order to be used for transmit and receive. The bcm2835 SPI0 only supports BCM2835_SPI_BIT_ORDER_MSB,
+      so if you select BCM2835_SPI_BIT_ORDER_LSB, the bytes will be reversed in software.
+      The library defaults to BCM2835_SPI_BIT_ORDER_MSB.
+      \param[in] order The desired bit order, one of BCM2835_SPI_BIT_ORDER_*, 
+      see \ref bcm2835SPIBitOrder
+    */
+    extern void bcm2835_spi_setBitOrder(uint8_t order);
+
+    /*! Sets the SPI clock divider and therefore the 
+      SPI clock speed. 
+      \param[in] divider The desired SPI clock divider, one of BCM2835_SPI_CLOCK_DIVIDER_*, 
+      see \ref bcm2835SPIClockDivider
+    */
+    extern void bcm2835_spi_setClockDivider(uint16_t divider);
+
+    /*! Sets the SPI clock divider by converting the speed parameter to
+      the equivalent SPI clock divider. ( see \sa bcm2835_spi_setClockDivider)
+      \param[in] speed_hz The desired SPI clock speed in Hz
+    */
+   extern void bcm2835_spi_set_speed_hz(uint32_t speed_hz);
+
+    /*! Sets the SPI data mode
+      Sets the clock polariy and phase
+      \param[in] mode The desired data mode, one of BCM2835_SPI_MODE*, 
+      see \ref bcm2835SPIMode
+    */
+    extern void bcm2835_spi_setDataMode(uint8_t mode);
+
+    /*! Sets the chip select pin(s)
+      When an bcm2835_spi_transfer() is made, the selected pin(s) will be asserted during the
+      transfer.
+      \param[in] cs Specifies the CS pins(s) that are used to activate the desired slave. 
+      One of BCM2835_SPI_CS*, see \ref bcm2835SPIChipSelect
+    */
+    extern void bcm2835_spi_chipSelect(uint8_t cs);
+
+    /*! Sets the chip select pin polarity for a given pin
+      When an bcm2835_spi_transfer() occurs, the currently selected chip select pin(s) 
+      will be asserted to the 
+      value given by active. When transfers are not happening, the chip select pin(s) 
+      return to the complement (inactive) value.
+      \param[in] cs The chip select pin to affect
+      \param[in] active Whether the chip select pin is to be active HIGH
+    */
+    extern void bcm2835_spi_setChipSelectPolarity(uint8_t cs, uint8_t active);
+
+    /*! Transfers one byte to and from the currently selected SPI slave.
+      Asserts the currently selected CS pins (as previously set by bcm2835_spi_chipSelect) 
+      during the transfer.
+      Clocks the 8 bit value out on MOSI, and simultaneously clocks in data from MISO. 
+      Returns the read data byte from the slave.
+      Uses polled transfer as per section 10.6.1 of the BCM 2835 ARM Peripherls manual
+      \param[in] value The 8 bit data byte to write to MOSI
+      \return The 8 bit byte simultaneously read from  MISO
+      \sa bcm2835_spi_transfern()
+    */
+    extern uint8_t bcm2835_spi_transfer(uint8_t value);
+    
+    /*! Transfers any number of bytes to and from the currently selected SPI slave.
+      Asserts the currently selected CS pins (as previously set by bcm2835_spi_chipSelect) 
+      during the transfer.
+      Clocks the len 8 bit bytes out on MOSI, and simultaneously clocks in data from MISO. 
+      The data read read from the slave is placed into rbuf. rbuf must be at least len bytes long
+      Uses polled transfer as per section 10.6.1 of the BCM 2835 ARM Peripherls manual
+      \param[in] tbuf Buffer of bytes to send. 
+      \param[out] rbuf Received bytes will by put in this buffer
+      \param[in] len Number of bytes in the tbuf buffer, and the number of bytes to send/received
+      \sa bcm2835_spi_transfer()
+    */
+    extern void bcm2835_spi_transfernb(char* tbuf, char* rbuf, uint32_t len);
+
+    /*! Transfers any number of bytes to and from the currently selected SPI slave
+      using bcm2835_spi_transfernb.
+      The returned data from the slave replaces the transmitted data in the buffer.
+      \param[in,out] buf Buffer of bytes to send. Received bytes will replace the contents
+      \param[in] len Number of bytes int eh buffer, and the number of bytes to send/received
+      \sa bcm2835_spi_transfer()
+    */
+    extern void bcm2835_spi_transfern(char* buf, uint32_t len);
+
+    /*! Transfers any number of bytes to the currently selected SPI slave.
+      Asserts the currently selected CS pins (as previously set by bcm2835_spi_chipSelect)
+      during the transfer.
+      \param[in] buf Buffer of bytes to send.
+      \param[in] len Number of bytes in the buf buffer, and the number of bytes to send
+    */
+    extern void bcm2835_spi_writenb(const char* buf, uint32_t len);
+
+    /*! Transfers half-word to and from the currently selected SPI slave.
+      Asserts the currently selected CS pins (as previously set by bcm2835_spi_chipSelect)
+      during the transfer.
+      Clocks the 8 bit value out on MOSI, and simultaneously clocks in data from MISO.
+      Returns the read data byte from the slave.
+      Uses polled transfer as per section 10.6.1 of the BCM 2835 ARM Peripherls manual
+      \param[in] data The 8 bit data byte to write to MOSI
+      \sa bcm2835_spi_writenb()
+    */
+    extern void bcm2835_spi_write(uint16_t data);
+
+    /*! Start AUX SPI operations.
+      Forces RPi AUX SPI pins P1-36 (MOSI), P1-38 (MISO), P1-40 (CLK) and P1-36 (CE2)
+      to alternate function ALT4, which enables those pins for SPI interface.
+      \return 1 if successful, 0 otherwise (perhaps because you are not running as root)
+    */
+    extern int bcm2835_aux_spi_begin(void);
+
+    /*! End AUX SPI operations.
+       SPI1 pins P1-36 (MOSI), P1-38 (MISO), P1-40 (CLK) and P1-36 (CE2)
+       are returned to their default INPUT behaviour.
+     */
+    extern void bcm2835_aux_spi_end(void);
+
+    /*! Sets the AUX SPI clock divider and therefore the AUX SPI clock speed.
+      \param[in] divider The desired AUX SPI clock divider.
+    */
+    extern void bcm2835_aux_spi_setClockDivider(uint16_t divider);
+
+    /*!
+     * Calculates the input for \sa bcm2835_aux_spi_setClockDivider
+     * @param speed_hz A value between \sa BCM2835_AUX_SPI_CLOCK_MIN and \sa BCM2835_AUX_SPI_CLOCK_MAX
+     * @return Input for \sa bcm2835_aux_spi_setClockDivider
+     */
+    extern uint16_t bcm2835_aux_spi_CalcClockDivider(uint32_t speed_hz);
+
+    /*! Transfers half-word to and from the AUX SPI slave.
+      Asserts the currently selected CS pins during the transfer.
+      \param[in] data The 8 bit data byte to write to MOSI
+      \return The 8 bit byte simultaneously read from  MISO
+      \sa bcm2835_spi_transfern()
+    */
+    extern void bcm2835_aux_spi_write(uint16_t data);
+
+    /*! Transfers any number of bytes to the AUX SPI slave.
+      Asserts the CE2 pin during the transfer.
+      \param[in] buf Buffer of bytes to send.
+      \param[in] len Number of bytes in the tbuf buffer, and the number of bytes to send
+    */
+    extern void bcm2835_aux_spi_writenb(const char *buf, uint32_t len);
+
+    /*! Transfers any number of bytes to and from the AUX SPI slave
+      using bcm2835_aux_spi_transfernb.
+      The returned data from the slave replaces the transmitted data in the buffer.
+      \param[in,out] buf Buffer of bytes to send. Received bytes will replace the contents
+      \param[in] len Number of bytes int eh buffer, and the number of bytes to send/received
+      \sa bcm2835_aux_spi_transfer()
+    */
+    extern void bcm2835_aux_spi_transfern(char *buf, uint32_t len);
+
+    /*! Transfers any number of bytes to and from the AUX SPI slave.
+      Asserts the CE2 pin during the transfer.
+      Clocks the len 8 bit bytes out on MOSI, and simultaneously clocks in data from MISO.
+      The data read read from the slave is placed into rbuf. rbuf must be at least len bytes long
+      \param[in] tbuf Buffer of bytes to send.
+      \param[out] rbuf Received bytes will by put in this buffer
+      \param[in] len Number of bytes in the tbuf buffer, and the number of bytes to send/received
+    */
+    extern void bcm2835_aux_spi_transfernb(const char *tbuf, char *rbuf, uint32_t len);
+
+    /*! @} */
+
+    /*! \defgroup i2c I2C access
+      These functions let you use I2C (The Broadcom Serial Control bus with the Philips
+      I2C bus/interface version 2.1 January 2000.) to interface with an external I2C device.
+      @{
+    */
+
+    /*! Start I2C operations.
+      Forces RPi I2C pins P1-03 (SDA) and P1-05 (SCL)
+      to alternate function ALT0, which enables those pins for I2C interface.
+      You should call bcm2835_i2c_end() when all I2C functions are complete to return the pins to
+      their default functions
+      \return 1 if successful, 0 otherwise (perhaps because you are not running as root)
+      \sa  bcm2835_i2c_end()
+    */
+    extern int bcm2835_i2c_begin(void);
+
+    /*! End I2C operations.
+      I2C pins P1-03 (SDA) and P1-05 (SCL)
+      are returned to their default INPUT behaviour.
+    */
+    extern void bcm2835_i2c_end(void);
+
+    /*! Sets the I2C slave address.
+      \param[in] addr The I2C slave address.
+    */
+    extern void bcm2835_i2c_setSlaveAddress(uint8_t addr);
+
+    /*! Sets the I2C clock divider and therefore the I2C clock speed.
+      \param[in] divider The desired I2C clock divider, one of BCM2835_I2C_CLOCK_DIVIDER_*,
+      see \ref bcm2835I2CClockDivider
+    */
+    extern void bcm2835_i2c_setClockDivider(uint16_t divider);
+
+    /*! Sets the I2C clock divider by converting the baudrate parameter to
+      the equivalent I2C clock divider. ( see \sa bcm2835_i2c_setClockDivider)
+      For the I2C standard 100khz you would set baudrate to 100000
+      The use of baudrate corresponds to its use in the I2C kernel device
+      driver. (Of course, bcm2835 has nothing to do with the kernel driver)
+    */
+    extern void bcm2835_i2c_set_baudrate(uint32_t baudrate);
+
+    /*! Transfers any number of bytes to the currently selected I2C slave.
+      (as previously set by \sa bcm2835_i2c_setSlaveAddress)
+      \param[in] buf Buffer of bytes to send.
+      \param[in] len Number of bytes in the buf buffer, and the number of bytes to send.
+      \return reason see \ref bcm2835I2CReasonCodes
+    */
+    extern uint8_t bcm2835_i2c_write(const char * buf, uint32_t len);
+
+    /*! Transfers any number of bytes from the currently selected I2C slave.
+      (as previously set by \sa bcm2835_i2c_setSlaveAddress)
+      \param[in] buf Buffer of bytes to receive.
+      \param[in] len Number of bytes in the buf buffer, and the number of bytes to received.
+      \return reason see \ref bcm2835I2CReasonCodes
+    */
+    extern uint8_t bcm2835_i2c_read(char* buf, uint32_t len);
+
+    /*! Allows reading from I2C slaves that require a repeated start (without any prior stop)
+      to read after the required slave register has been set. For example, the popular
+      MPL3115A2 pressure and temperature sensor. Note that your device must support or
+      require this mode. If your device does not require this mode then the standard
+      combined:
+      \sa bcm2835_i2c_write
+      \sa bcm2835_i2c_read
+      are a better choice.
+      Will read from the slave previously set by \sa bcm2835_i2c_setSlaveAddress
+      \param[in] regaddr Buffer containing the slave register you wish to read from.
+      \param[in] buf Buffer of bytes to receive.
+      \param[in] len Number of bytes in the buf buffer, and the number of bytes to received.
+      \return reason see \ref bcm2835I2CReasonCodes
+    */
+    extern uint8_t bcm2835_i2c_read_register_rs(char* regaddr, char* buf, uint32_t len);
+
+    /*! Allows sending an arbitrary number of bytes to I2C slaves before issuing a repeated
+      start (with no prior stop) and reading a response.
+      Necessary for devices that require such behavior, such as the MLX90620.
+      Will write to and read from the slave previously set by \sa bcm2835_i2c_setSlaveAddress
+      \param[in] cmds Buffer containing the bytes to send before the repeated start condition.
+      \param[in] cmds_len Number of bytes to send from cmds buffer
+      \param[in] buf Buffer of bytes to receive.
+      \param[in] buf_len Number of bytes to receive in the buf buffer.
+      \return reason see \ref bcm2835I2CReasonCodes
+    */
+    extern uint8_t bcm2835_i2c_write_read_rs(char* cmds, uint32_t cmds_len, char* buf, uint32_t buf_len);
+
+    /*! @} */
+
+    /*! \defgroup st System Timer access
+      Allows access to and delays using the System Timer Counter.
+      @{
+    */
+
+    /*! Read the System Timer Counter register.
+      \return the value read from the System Timer Counter Lower 32 bits register
+    */
+    extern uint64_t bcm2835_st_read(void);
+
+    /*! Delays for the specified number of microseconds with offset.
+      \param[in] offset_micros Offset in microseconds
+      \param[in] micros Delay in microseconds
+    */
+    extern void bcm2835_st_delay(uint64_t offset_micros, uint64_t micros);
+
+    /*! @}  */
+
+    /*! \defgroup pwm Pulse Width Modulation
+      Allows control of 2 independent PWM channels. A limited subset of GPIO pins
+      can be connected to one of these 2 channels, allowing PWM control of GPIO pins.
+      You have to set the desired pin into a particular Alt Fun to PWM output. See the PWM
+      documentation on the Main Page.
+      @{
+    */
+
+    /*! Sets the PWM clock divisor, 
+      to control the basic PWM pulse widths.
+      \param[in] divisor Divides the basic 19.2MHz PWM clock. You can use one of the common
+      values BCM2835_PWM_CLOCK_DIVIDER_* in \ref bcm2835PWMClockDivider
+    */
+    extern void bcm2835_pwm_set_clock(uint32_t divisor);
+    
+    /*! Sets the mode of the given PWM channel,
+      allowing you to control the PWM mode and enable/disable that channel
+      \param[in] channel The PWM channel. 0 or 1.
+      \param[in] markspace Set true if you want Mark-Space mode. 0 for Balanced mode.
+      \param[in] enabled Set true to enable this channel and produce PWM pulses.
+    */
+    extern void bcm2835_pwm_set_mode(uint8_t channel, uint8_t markspace, uint8_t enabled);
+
+    /*! Sets the maximum range of the PWM output.
+      The data value can vary between 0 and this range to control PWM output
+      \param[in] channel The PWM channel. 0 or 1.
+      \param[in] range The maximum value permitted for DATA.
+    */
+    extern void bcm2835_pwm_set_range(uint8_t channel, uint32_t range);
+    
+    /*! Sets the PWM pulse ratio to emit to DATA/RANGE, 
+      where RANGE is set by bcm2835_pwm_set_range().
+      \param[in] channel The PWM channel. 0 or 1.
+      \param[in] data Controls the PWM output ratio as a fraction of the range. 
+      Can vary from 0 to RANGE.
+    */
+    extern void bcm2835_pwm_set_data(uint8_t channel, uint32_t data);
+
+    /*! @}  */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BCM2835_H */
+
+/*! @example blink.c
+  Blinks RPi GPIO pin 11 on and off
+*/
+
+/*! @example input.c
+  Reads the state of an RPi input pin
+*/
+
+/*! @example event.c
+  Shows how to use event detection on an input pin
+*/
+
+/*! @example spi.c
+  Shows how to use SPI interface to transfer a byte to and from an SPI device
+*/
+
+/*! @example spin.c
+  Shows how to use SPI interface to transfer a number of bytes to and from an SPI device
+*/
+
+/*! @example pwm.c
+  Shows how to use PWM to control GPIO pins
+*/
+
+/*! @example i2c.c
+Command line utility for executing i2c commands with the 
+Broadcom bcm2835. Contributed by Shahrooz Shahparnia.
+*/
+
+/*! example gpio.c
+  Command line utility for executing gpio commands with the 
+  Broadcom bcm2835. Contributed by Shahrooz Shahparnia.
+*/
+
+/*! example spimem_test.c
+  Shows how to use the included little library (spiram.c and spiram.h)
+  to read and write SPI RAM chips such as 23K256-I/P
+*/
diff --git a/lib/RF24/utility/RPi/includes.h b/lib/RF24/utility/RPi/includes.h
new file mode 100644
index 000000000..f2209af36
--- /dev/null
+++ b/lib/RF24/utility/RPi/includes.h
@@ -0,0 +1,10 @@
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  #define RF24_RPi
+  #include "RPi/bcm2835.h" 
+  #include "RPi/RF24_arch_config.h"
+  #include "RPi/interrupt.h"
+  
+#endif
diff --git a/lib/RF24/utility/RPi/interrupt.c b/lib/RF24/utility/RPi/interrupt.c
new file mode 100644
index 000000000..bec034a1e
--- /dev/null
+++ b/lib/RF24/utility/RPi/interrupt.c
@@ -0,0 +1,226 @@
+/*
+Interrupts functions extruded from wiringPi library by Oitzu.
+
+wiringPi Copyright (c) 2012 Gordon Henderson
+https://projects.drogon.net/raspberry-pi/wiringpi
+wiringPi is free software: GNU Lesser General Public License
+see <http://www.gnu.org/licenses/>
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <poll.h>
+#include <sys/stat.h>
+#include "interrupt.h"
+#include <pthread.h>
+
+#define delay(x) bcm2835_delay(x)
+
+static pthread_mutex_t pinMutex = PTHREAD_MUTEX_INITIALIZER;
+static volatile int    pinPass = -1 ;
+
+pthread_t threadId [64];
+
+// sysFds:
+//      Map a file descriptor from the /sys/class/gpio/gpioX/value
+static int sysFds [64] =
+{
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+} ;
+
+// ISR Data
+static void (*isrFunctions [64])(void) ;
+
+int waitForInterrupt (int pin, int mS)
+{
+  int fd, x ;
+  uint8_t c ;
+  struct pollfd polls ;
+
+  if ((fd = sysFds [pin]) == -1)
+    return -2 ;
+
+// Setup poll structure
+
+  polls.fd     = fd ;
+  polls.events = POLLPRI ;      // Urgent data!
+
+// Wait for it ...
+  x = poll (&polls, 1, mS) ;
+
+// Do a dummy read to clear the interrupt
+//      A one character read appars to be enough.
+//      Followed by a seek to reset it.
+
+  (void)read (fd, &c, 1) ;
+  lseek (fd, 0, SEEK_SET) ;
+
+  return x ;
+}
+
+
+int piHiPri (const int pri)
+{
+  struct sched_param sched ;
+
+  memset (&sched, 0, sizeof(sched)) ;
+
+  if (pri > sched_get_priority_max (SCHED_RR))
+    sched.sched_priority = sched_get_priority_max (SCHED_RR) ;
+  else
+    sched.sched_priority = pri ;
+
+  return sched_setscheduler (0, SCHED_RR, &sched) ;
+}
+
+
+void *interruptHandler (void *arg)
+{
+  int myPin ;
+
+  (void)piHiPri (55) ;  // Only effective if we run as root
+
+  myPin   = pinPass ;
+  pinPass = -1 ;
+
+  for (;;)
+    if (waitForInterrupt (myPin, -1) > 0){
+      pthread_mutex_lock (&pinMutex) ;
+      isrFunctions [myPin] () ;
+      pthread_mutex_unlock (&pinMutex) ;
+	  pthread_testcancel(); //Cancel at this point if we have an cancellation request.
+    }
+
+  return NULL ;
+}
+
+
+int attachInterrupt (int pin, int mode, void (*function)(void))
+{
+  const char *modeS ;
+  char fName   [64] ;
+  char  pinS [8] ;
+  pid_t pid ;
+  int   count, i ;
+  char  c ;
+  int   bcmGpioPin ;
+
+  bcmGpioPin = pin ;
+
+  if (mode != INT_EDGE_SETUP)
+  {
+    /**/ if (mode == INT_EDGE_FALLING)
+      modeS = "falling" ;
+    else if (mode == INT_EDGE_RISING)
+      modeS = "rising" ;
+    else
+      modeS = "both" ;
+
+    sprintf (pinS, "%d", bcmGpioPin) ;
+
+    if ((pid = fork ()) < 0)    // Fail
+      return printf("wiringPiISR: fork failed: %s\n", strerror (errno)) ;
+
+    if (pid == 0)       // Child, exec
+    {
+      /**/ if (access ("/usr/local/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else if (access ("/usr/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else
+        return printf ("wiringPiISR: Can't find gpio program\n") ;
+    }
+    else                // Parent, wait
+      wait (NULL) ;
+  }
+
+  if (sysFds [bcmGpioPin] == -1)
+  {
+    sprintf (fName, "/sys/class/gpio/gpio%d/value",bcmGpioPin);
+    if ((sysFds [bcmGpioPin] = open (fName, O_RDWR)) < 0)
+      return printf ("wiringPiISR: unable to open %s: %s\n", fName, strerror (errno)) ;
+  }
+
+    ioctl (sysFds [bcmGpioPin], FIONREAD, &count) ;
+  for (i = 0 ; i < count ; ++i)
+    read (sysFds [bcmGpioPin], &c, 1) ;
+
+  isrFunctions [pin] = function ;
+
+  pthread_mutex_lock (&pinMutex) ;
+    pinPass = pin ;
+    pthread_create (&threadId[bcmGpioPin], NULL, interruptHandler, NULL) ;
+    while (pinPass != -1)
+      delay (1) ;
+  pthread_mutex_unlock (&pinMutex) ;
+
+  return 0 ;
+}
+
+int detachInterrupt (int pin)
+{
+	char  pinS [8];
+    const char *modeS = "none";
+	pid_t pid ;
+	
+	if (pthread_cancel(threadId[pin]) != 0) //Cancel the thread
+	{
+	 return 0;
+	}
+	
+	if (close(sysFds[pin]) != 0) //Close filehandle
+	{
+		return 0;
+	}
+	
+	/* Set wiringPi to 'none' interrupt mode */
+
+    sprintf (pinS, "%d", pin) ;
+
+    if ((pid = fork ()) < 0)    // Fail
+      return printf("wiringPiISR: fork failed: %s\n", strerror (errno)) ;
+
+    if (pid == 0)       // Child, exec
+    {
+      /**/ if (access ("/usr/local/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else if (access ("/usr/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else
+        return printf ("wiringPiISR: Can't find gpio program\n") ;
+    }
+    else                // Parent, wait
+      wait (NULL) ;
+	  
+	return 1;
+}
+
+void rfNoInterrupts(){
+  pthread_mutex_lock (&pinMutex) ;
+}
+
+void rfInterrupts(){
+  pthread_mutex_unlock (&pinMutex) ;
+}
diff --git a/lib/RF24/utility/RPi/interrupt.h b/lib/RF24/utility/RPi/interrupt.h
new file mode 100644
index 000000000..fe6fa4f6b
--- /dev/null
+++ b/lib/RF24/utility/RPi/interrupt.h
@@ -0,0 +1,69 @@
+/*
+Interrupts functions extruded from wiringPi library by Oitzu.
+
+wiringPi Copyright (c) 2012 Gordon Henderson
+https://projects.drogon.net/raspberry-pi/wiringpi
+wiringPi is free software: GNU Lesser General Public License
+see <http://www.gnu.org/licenses/>
+*/
+
+#include "RF24_arch_config.h"
+
+#define INT_EDGE_SETUP          0
+#define INT_EDGE_FALLING        1
+#define INT_EDGE_RISING         2
+#define INT_EDGE_BOTH           3
+
+/*
+ * interruptHandler:
+ *      This is a thread and gets started to wait for the interrupt we're
+ *      hoping to catch. It will call the user-function when the interrupt
+ *      fires.
+ *********************************************************************************
+ */
+void *interruptHandler (void *arg);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * waitForInterrupt:
+ *      Pi Specific.
+ *      Wait for Interrupt on a GPIO pin.
+ *      This is actually done via the /sys/class/gpio interface regardless of
+ *      the wiringPi access mode in-use. Maybe sometime it might get a better
+ *      way for a bit more efficiency.
+ *********************************************************************************
+ */
+extern int waitForInterrupt (int pin, int mS);
+
+/*
+ * piHiPri:
+ *      Attempt to set a high priority schedulling for the running program
+ *********************************************************************************
+ */
+extern int piHiPri (const int pri);
+
+/*
+ * attachInterrupt (Original: wiringPiISR):
+ *      Pi Specific.
+ *      Take the details and create an interrupt handler that will do a call-
+ *      back to the user supplied function.
+ *********************************************************************************
+ */
+extern int attachInterrupt (int pin, int mode, void (*function)(void));
+
+/*
+ * detachInterrupt:
+ *      Pi Specific detachInterrupt.
+ *      Will cancel the interrupt thread, close the filehandle and 
+ *		setting wiringPi back to 'none' mode.
+ *********************************************************************************
+ */
+extern int detachInterrupt (int pin);
+
+extern void rfNoInterrupts();
+extern void rfInterrupts();
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/lib/RF24/utility/RPi/spi.cpp b/lib/RF24/utility/RPi/spi.cpp
new file mode 100644
index 000000000..b75d5f597
--- /dev/null
+++ b/lib/RF24/utility/RPi/spi.cpp
@@ -0,0 +1,55 @@
+#include "spi.h"
+#include <pthread.h>
+#include <unistd.h>
+
+static pthread_mutex_t spiMutex = PTHREAD_MUTEX_INITIALIZER;
+bool bcmIsInitialized = false;
+
+SPI::SPI() {
+
+}
+
+void SPI::begin( int busNo ) {
+    if(!bcmIsInitialized){	  
+      if (!bcm2835_init()){
+		return;
+	  }
+    }
+    bcmIsInitialized = true;
+    bcm2835_spi_begin();
+}
+
+void SPI::beginTransaction(SPISettings settings){
+	if (geteuid() != 0){
+		throw -1;
+	}
+	pthread_mutex_lock (&spiMutex);
+	setBitOrder(settings.border);
+	setDataMode(settings.dmode);
+	setClockDivider(settings.clck);
+}
+
+void SPI::endTransaction() {
+	pthread_mutex_unlock (&spiMutex);
+}
+
+void SPI::setBitOrder(uint8_t bit_order) {
+	bcm2835_spi_setBitOrder(bit_order);
+}
+
+void SPI::setDataMode(uint8_t data_mode) {
+  bcm2835_spi_setDataMode(data_mode);
+}
+
+void SPI::setClockDivider(uint16_t spi_speed) {
+	bcm2835_spi_setClockDivider(spi_speed);
+}
+
+void SPI::chipSelect(int csn_pin){
+	bcm2835_spi_chipSelect(csn_pin);
+	delayMicroseconds(5);
+}
+
+SPI::~SPI() {
+
+}
\ No newline at end of file
diff --git a/lib/RF24/utility/RPi/spi.h b/lib/RF24/utility/RPi/spi.h
new file mode 100644
index 000000000..0f559a353
--- /dev/null
+++ b/lib/RF24/utility/RPi/spi.h
@@ -0,0 +1,84 @@
+/*
+ * TMRh20 2015
+ * SPI layer for RF24 <-> BCM2835
+ */
+/**
+ * @file spi.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for SPI helper files
+ */
+#ifndef _SPI_H_INCLUDED
+#define _SPI_H_INCLUDED
+
+#include <stdio.h>
+#include "bcm2835.h"
+#include "interrupt.h"
+
+#define SPI_HAS_TRANSACTION
+#define MSBFIRST BCM2835_SPI_BIT_ORDER_MSBFIRST
+#define SPI_MODE0 BCM2835_SPI_MODE0
+#define RF24_SPI_SPEED BCM2835_SPI_SPEED_8MHZ
+    
+class SPISettings {
+public:
+	SPISettings(uint32_t clock, uint8_t bitOrder, uint8_t dataMode) {
+        init(clock,bitOrder,dataMode);
+	}
+    SPISettings() { init(RF24_SPI_SPEED, MSBFIRST, SPI_MODE0); }
+
+    uint32_t clck;
+    uint8_t border;
+    uint8_t dmode;
+private:
+
+	void init(uint32_t clock, uint8_t bitOrder, uint8_t dataMode) {
+                clck = clock;
+                border = bitOrder;
+                dmode = dataMode;
+	}
+	friend class SPIClass;
+};
+
+
+class SPI {
+public:
+
+  SPI();
+  virtual ~SPI();
+  
+  inline static uint8_t transfer(uint8_t _data);
+  inline static void transfernb(char* tbuf, char* rbuf, uint32_t len);
+  inline static void transfern(char* buf, uint32_t len);  
+
+  static void begin(int busNo);
+  static void end();
+
+  static void setBitOrder(uint8_t bit_order);
+  static void setDataMode(uint8_t data_mode);
+  static void setClockDivider(uint16_t spi_speed);
+  static void chipSelect(int csn_pin);
+  
+  static void beginTransaction(SPISettings settings);
+  static void endTransaction();
+  
+  
+};
+
+
+uint8_t SPI::transfer(uint8_t _data) {
+    uint8_t data = bcm2835_spi_transfer(_data);
+    return data;
+}
+
+void SPI::transfernb(char* tbuf, char* rbuf, uint32_t len){
+   bcm2835_spi_transfernb( tbuf, rbuf, len);
+}
+
+void SPI::transfern(char* buf, uint32_t len)
+{
+    transfernb(buf, buf, len);
+}
+/**
+ * \endcond
+ */
+#endif
diff --git a/lib/RF24/utility/SPIDEV/RF24_arch_config.h b/lib/RF24/utility/SPIDEV/RF24_arch_config.h
new file mode 100644
index 000000000..424f9a1ce
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/RF24_arch_config.h
@@ -0,0 +1,69 @@
+
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ */
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+#define RF24_LINUX
+
+#include <stddef.h>
+#include "spi.h"
+#include "gpio.h"
+#include "compatibility.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include <sys/time.h>
+
+#define RF24_SPI_SPEED RF24_SPIDEV_SPEED
+
+#define _BV(x) (1<<(x))
+#define _SPI spi
+
+//#undef SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
+#define IF_SERIAL_DEBUG(x) ({x;})
+#else
+#define IF_SERIAL_DEBUG(x)
+#endif
+
+// Avoid spurious warnings
+#if 1
+#if ! defined( NATIVE ) && defined( ARDUINO )
+#undef PROGMEM
+#define PROGMEM __attribute__(( section(".progmem.data") ))
+#undef PSTR
+#define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+#endif
+#endif
+
+typedef uint16_t prog_uint16_t;
+#define PSTR(x) (x)
+#define printf_P printf
+#define strlen_P strlen
+#define PROGMEM
+#define pgm_read_word(p) (*(p))
+#define PRIPSTR "%s"
+#define pgm_read_byte(p) (*(p))
+#define pgm_read_ptr(p) (*(p))
+
+// Function, constant map as a result of migrating from Arduino
+#define LOW GPIO::OUTPUT_LOW
+#define HIGH GPIO::OUTPUT_HIGH
+#define INPUT GPIO::DIRECTION_IN
+#define OUTPUT GPIO::DIRECTION_OUT
+#define digitalWrite(pin, value) GPIO::write(pin, value)
+#define pinMode(pin, direction) GPIO::open(pin, direction)
+#define delay(milisec) __msleep(milisec)
+#define delayMicroseconds(usec) __usleep(usec)
+#define millis() __millis()
+
+#endif // __ARCH_CONFIG_H__
+// vim:ai:cin:sts=2 sw=2 ft=cpp
diff --git a/lib/RF24/utility/SPIDEV/compatibility.c b/lib/RF24/utility/SPIDEV/compatibility.c
new file mode 100644
index 000000000..ec2eb0292
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/compatibility.c
@@ -0,0 +1,52 @@
+
+#include "compatibility.h"
+
+
+static uint32_t mtime, seconds, useconds;
+//static struct timeval start, end;
+struct timespec start, end;
+
+/**********************************************************************/
+/**
+ * This function is added in order to simulate arduino delay() function
+ * @param milisec
+ */
+void __msleep(int milisec)
+{
+	struct timespec req;// = {0};
+	req.tv_sec = (time_t) milisec / 1000;
+	req.tv_nsec = (milisec % 1000 ) * 1000000L;
+	//nanosleep(&req, (struct timespec *)NULL);	
+	clock_nanosleep(CLOCK_REALTIME, 0, &req, NULL);
+}
+
+void __usleep(int microsec)
+{
+	struct timespec req;// = {0};
+	req.tv_sec = (time_t) microsec/ 1000000;
+	req.tv_nsec = (microsec / 1000000) * 1000;
+	//nanosleep(&req, (struct timespec *)NULL);
+	clock_nanosleep(CLOCK_REALTIME, 0, &req, NULL);	
+}
+
+/**
+ * This function is added in order to simulate arduino millis() function
+ */
+
+ 
+void __start_timer()
+{
+	//gettimeofday(&start, NULL);
+	clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+}
+
+uint32_t __millis()
+{
+	//gettimeofday(&end, NULL);
+	clock_gettime(CLOCK_MONOTONIC_RAW,&end);
+    seconds  = end.tv_sec  - start.tv_sec;
+    useconds = (end.tv_nsec - start.tv_nsec)/1000;
+
+    mtime = ((seconds) * 1000 + useconds/1000.0) + 0.5;	
+	return mtime;
+}
diff --git a/lib/RF24/utility/SPIDEV/compatibility.h b/lib/RF24/utility/SPIDEV/compatibility.h
new file mode 100644
index 000000000..74446ec36
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/compatibility.h
@@ -0,0 +1,31 @@
+/* 
+ * File:   compatiblity.h
+ * Author: purinda
+ *
+ * Created on 24 June 2012, 3:08 PM
+ * patch for safer monotonic clock & millis() correction for 64bit LDV 2018
+ */
+
+#ifndef COMPATIBLITY_H
+#define	COMPATIBLITY_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>  // for uintXX_t types	
+#include <stddef.h>
+#include <time.h>
+#include <sys/time.h>
+
+void __msleep(int milisec);
+void __usleep(int milisec);
+void __start_timer();
+uint32_t __millis();
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* COMPATIBLITY_H */
+
diff --git a/lib/RF24/utility/SPIDEV/gpio.cpp b/lib/RF24/utility/SPIDEV/gpio.cpp
new file mode 100644
index 000000000..3cbdf738a
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/gpio.cpp
@@ -0,0 +1,145 @@
+/*
+ * https://github.com/mrshu/GPIOlib
+ * Copyright (c) 2011, Copyright (c) 2011 mr.Shu
+ * All rights reserved.
+ *
+ * Modified on 24 June 2012, 11:06 AM
+ * File:   gpio.cpp
+ * Author: purinda (purinda@gmail.com)
+ *
+ *  Patched for filedescriptor catching and error control by L Diaz 2018
+ */
+
+#include "gpio.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+std::map<int,GPIOfdCache_t> GPIO::cache;
+
+GPIO::GPIO() {
+}
+
+GPIO::~GPIO() {
+}
+
+void GPIO::open(int port, int DDR)
+{
+	FILE *f;
+	f = fopen("/sys/class/gpio/export", "w");
+	if(f==NULL) throw GPIOException("can't export GPIO pin .check access rights");
+	fprintf(f, "%d\n", port);
+	fclose(f);
+
+  int counter = 0;
+	char file[128];
+	sprintf(file, "/sys/class/gpio/gpio%d/direction", port);
+
+    while( ( f = fopen(file,"w")) == NULL ){ //Wait 10 seconds for the file to be accessible if not open on first attempt
+        sleep(1);
+        counter++;
+        if(counter > 10){
+					throw GPIOException("can't access /sys/class/gpio/gpio%d/direction GPIO pin. check access rights");
+          /*perror("Could not open /sys/class/gpio/gpio%d/direction");
+          exit(0); */
+        }
+    }
+	int l=(DDR==0) ? fprintf(f, "in\n") : fprintf(f, "out\n");
+	if(!(l==3 || l==4)) {
+		fclose(f);
+		throw GPIOException("can't set direction on GPIO pin. check access rights");
+	}
+	/*
+	if (DDR == 0)
+          fprintf(f, "in\n");
+	else  printf(f, "out\n");
+  */
+  fclose(f);
+
+	// Caches the GPIO descriptor;
+	sprintf(file, "/sys/class/gpio/gpio%d/value", port);
+	int flags= (DDR==0) ? O_RDONLY : O_WRONLY;
+	int fd=::open(file,flags);
+	if(fd<0) {
+		throw GPIOException("Can't open the GPIO");
+	} else {
+		cache[port]=fd;  // cache the fd;
+		lseek(fd,SEEK_SET,0);
+	}
+
+}
+
+void GPIO::close(int port)
+{
+  std::map<int,GPIOfdCache_t>::iterator i;
+	i=cache.find(port);
+	if(i!=cache.end()){
+		close(i->second); // close the cached fd
+		cache.erase(i); // Delete cache entry
+	}
+	// Do unexport
+	FILE *f;
+	f = fopen("/sys/class/gpio/unexport", "w");
+	if(f!=NULL) {
+		fprintf(f, "%d\n", port);
+	  fclose(f);
+	}
+}
+
+int GPIO::read(int port)
+{
+  std::map<int,GPIOfdCache_t>::iterator i;
+  int fd;
+	i=cache.find(port);
+	if(i==cache.end()){ // Fallback to open the gpio
+		GPIO::open(port,GPIO::DIRECTION_IN);
+		i=cache.find(port);
+		if(i==cache.end()) throw GPIOException("can't access to GPIO");
+		else fd=i->second;
+	} else fd=i->second;
+
+	char c;
+	if(lseek(fd,0,SEEK_SET)==0 && ::read(fd,&c,1)==1){
+		return (c=='0') ? 0 : 1;
+	} else throw GPIOException("can't access to GPIO");
+
+	/*FILE *f;
+
+	char file[128];
+	sprintf(file, "/sys/class/gpio/gpio%d/value", port);
+	f = fopen(file, "r");
+
+	int i;
+	fscanf(f, "%d", &i);
+	fclose(f);
+	return i;
+*/
+}
+void GPIO::write(int port, int value){
+	std::map<int,GPIOfdCache_t>::iterator i;
+  int fd;
+	i=cache.find(port);
+	if(i==cache.end()){ // Fallback to open the gpio
+		GPIO::open(port,GPIO::DIRECTION_OUT);
+		i=cache.find(port);
+		if(i==cache.end()) throw GPIOException("can't access to GPIO");
+		else fd=i->second;
+	} else fd=i->second;
+
+	if(lseek(fd,0,SEEK_SET)!=0) throw GPIOException("can't access to GPIO");
+	int l=(value==0) ? ::write(fd,"0\n",2) : ::write(fd,"1\n",2);
+	if(l!=2) throw GPIOException("can't access to GPIO");
+
+	/*FILE *f;
+
+	char file[128];
+	sprintf(file, "/sys/class/gpio/gpio%d/value", port);
+	f = fopen(file, "w");
+
+	if (value == 0)	fprintf(f, "0\n");
+	else		fprintf(f, "1\n");
+
+	fclose(f);*/
+}
diff --git a/lib/RF24/utility/SPIDEV/gpio.h b/lib/RF24/utility/SPIDEV/gpio.h
new file mode 100644
index 000000000..e500e1fe5
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/gpio.h
@@ -0,0 +1,89 @@
+/*
+ * https://github.com/mrshu/GPIOlib
+ * Copyright (c) 2011, Copyright (c) 2011 mr.Shu
+ * All rights reserved.
+ *
+ * Modified on 24 June 2012, 11:06 AM
+ * File:   gpio.h
+ * Author: purinda (purinda@gmail.com)
+ *
+ */
+
+#ifndef H
+#define	H
+
+#include <cstdio>
+#include <map>
+#include <stdexcept>
+
+/** Specific excpetion for SPI errors */
+class GPIOException : public std::runtime_error {
+	public:
+		explicit GPIOException(const std::string& msg) :  std::runtime_error(msg) { }
+};
+
+/**
+ * @file gpio.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for GPIO helper files
+ */
+
+
+/**
+ * Example GPIO.h file
+ *
+ * @defgroup GPIO GPIO Example
+ *
+ * See RF24_arch_config.h for additional information
+ * @{
+ */
+
+typedef int GPIOfdCache_t;
+
+class GPIO {
+public:
+
+	/* Constants */
+	static const int DIRECTION_OUT = 1;
+	static const int DIRECTION_IN = 0;
+
+	static const int OUTPUT_HIGH = 1;
+	static const int OUTPUT_LOW = 0;
+
+	GPIO();
+
+	/**
+	 * Similar to Arduino pinMode(pin,mode);
+     * @param port
+     * @param DDR
+     */
+	static void open(int port, int DDR);
+	/**
+	 *
+     * @param port
+     */
+	static void close(int port);
+	/**
+	 * Similar to Arduino digitalRead(pin);
+     * @param port
+     * @param value
+     */
+	static int read(int port);
+	/**
+	* Similar to Arduino digitalWrite(pin,state);
+	* @param port
+	* @param value
+	*/
+	static void write(int port,int value);
+
+	virtual ~GPIO();
+
+private:
+  /* fd cache */
+  static std::map<int,GPIOfdCache_t> cache;
+};
+/**
+ * \endcond
+ */
+/*@}*/
+#endif	/* H */
diff --git a/lib/RF24/utility/SPIDEV/includes.h b/lib/RF24/utility/SPIDEV/includes.h
new file mode 100644
index 000000000..bc8c7b837
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/includes.h
@@ -0,0 +1,8 @@
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+#define RF24_SPIDEV
+  #include "SPIDEV/RF24_arch_config.h"
+  #include "SPIDEV/interrupt.h"
+#endif
diff --git a/lib/RF24/utility/SPIDEV/interrupt.c b/lib/RF24/utility/SPIDEV/interrupt.c
new file mode 100644
index 000000000..0344b3649
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/interrupt.c
@@ -0,0 +1,226 @@
+/*
+Interrupts functions extruded from wiringPi library by Oitzu.
+
+wiringPi Copyright (c) 2012 Gordon Henderson
+https://projects.drogon.net/raspberry-pi/wiringpi
+wiringPi is free software: GNU Lesser General Public License
+see <http://www.gnu.org/licenses/>
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <poll.h>
+#include <sys/stat.h>
+#include "interrupt.h"
+#include <pthread.h>
+
+//#define delay(x) bcm2835_delay(x)
+
+static pthread_mutex_t pinMutex = PTHREAD_MUTEX_INITIALIZER ;
+static volatile int    pinPass = -1 ;
+
+pthread_t threadId [64];
+
+// sysFds:
+//      Map a file descriptor from the /sys/class/gpio/gpioX/value
+static int sysFds [64] =
+{
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+} ;
+
+// ISR Data
+static void (*isrFunctions [64])(void) ;
+
+int waitForInterrupt (int pin, int mS)
+{
+  int fd, x ;
+  uint8_t c ;
+  struct pollfd polls ;
+
+  if ((fd = sysFds [pin]) == -1)
+    return -2 ;
+
+// Setup poll structure
+
+  polls.fd     = fd ;
+  polls.events = POLLPRI ;      // Urgent data!
+
+// Wait for it ...
+  x = poll (&polls, 1, mS) ;
+
+// Do a dummy read to clear the interrupt
+//      A one character read appars to be enough.
+//      Followed by a seek to reset it.
+
+  (void)read (fd, &c, 1) ;
+  lseek (fd, 0, SEEK_SET) ;
+
+  return x ;
+}
+
+
+int piHiPri (const int pri)
+{
+  struct sched_param sched ;
+
+  memset (&sched, 0, sizeof(sched)) ;
+
+  if (pri > sched_get_priority_max (SCHED_RR))
+    sched.sched_priority = sched_get_priority_max (SCHED_RR) ;
+  else
+    sched.sched_priority = pri ;
+
+  return sched_setscheduler (0, SCHED_RR, &sched) ;
+}
+
+
+void *interruptHandler (void *arg)
+{
+  int myPin ;
+
+  (void)piHiPri (55) ;  // Only effective if we run as root
+
+  myPin   = pinPass ;
+  pinPass = -1 ;
+
+  for (;;)
+    if (waitForInterrupt (myPin, -1) > 0){
+      pthread_mutex_lock (&pinMutex) ;
+      isrFunctions [myPin] () ;
+      pthread_mutex_unlock (&pinMutex) ;
+	  pthread_testcancel(); //Cancel at this point if we have an cancellation request.
+    }
+
+  return NULL ;
+}
+
+
+int attachInterrupt (int pin, int mode, void (*function)(void))
+{
+  const char *modeS ;
+  char fName   [64] ;
+  char  pinS [8] ;
+  pid_t pid ;
+  int   count, i ;
+  char  c ;
+  int   bcmGpioPin ;
+
+  bcmGpioPin = pin ;
+
+  if (mode != INT_EDGE_SETUP)
+  {
+    /**/ if (mode == INT_EDGE_FALLING)
+      modeS = "falling" ;
+    else if (mode == INT_EDGE_RISING)
+      modeS = "rising" ;
+    else
+      modeS = "both" ;
+
+    sprintf (pinS, "%d", bcmGpioPin) ;
+
+    if ((pid = fork ()) < 0)    // Fail
+      return printf("wiringPiISR: fork failed: %s\n", strerror (errno)) ;
+
+    if (pid == 0)       // Child, exec
+    {
+      /**/ if (access ("/usr/local/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else if (access ("/usr/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else
+        return printf ("wiringPiISR: Can't find gpio program\n") ;
+    }
+    else                // Parent, wait
+      wait (NULL) ;
+  }
+
+  if (sysFds [bcmGpioPin] == -1)
+  {
+    sprintf (fName, "/sys/class/gpio/gpio%d/value",bcmGpioPin);
+    if ((sysFds [bcmGpioPin] = open (fName, O_RDWR)) < 0)
+      return printf ("wiringPiISR: unable to open %s: %s\n", fName, strerror (errno)) ;
+  }
+
+    ioctl (sysFds [bcmGpioPin], FIONREAD, &count) ;
+  for (i = 0 ; i < count ; ++i)
+    read (sysFds [bcmGpioPin], &c, 1) ;
+
+  isrFunctions [pin] = function ;
+
+  pthread_mutex_lock (&pinMutex) ;
+    pinPass = pin ;
+    pthread_create (&threadId[bcmGpioPin], NULL, interruptHandler, NULL) ;
+    while (pinPass != -1)
+      delay (1) ;
+  pthread_mutex_unlock (&pinMutex) ;
+
+  return 0 ;
+}
+
+int detachInterrupt (int pin)
+{
+	char  pinS [8];
+    const char *modeS = "none";
+	pid_t pid ;
+	
+	if (!pthread_cancel(threadId[pin])) //Cancel the thread
+	{
+	 return 0;
+	}
+	
+	if (!close(sysFds[pin])) //Close filehandle
+	{
+		return 0;
+	}
+	
+	/* Set wiringPi to 'none' interrupt mode */
+
+    sprintf (pinS, "%d", pin) ;
+
+    if ((pid = fork ()) < 0)    // Fail
+      return printf("wiringPiISR: fork failed: %s\n", strerror (errno)) ;
+
+    if (pid == 0)       // Child, exec
+    {
+      /**/ if (access ("/usr/local/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else if (access ("/usr/bin/gpio", X_OK) == 0)
+      {
+        execl ("/usr/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+        return printf ("wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+      }
+      else
+        return printf ("wiringPiISR: Can't find gpio program\n") ;
+    }
+    else                // Parent, wait
+      wait (NULL) ;
+	  
+	return 1;
+}
+
+void rfNoInterrupts(){
+  pthread_mutex_lock (&pinMutex) ;
+}
+
+void rfInterrupts(){
+  pthread_mutex_unlock (&pinMutex) ;
+}
\ No newline at end of file
diff --git a/lib/RF24/utility/SPIDEV/interrupt.h b/lib/RF24/utility/SPIDEV/interrupt.h
new file mode 100644
index 000000000..fe6fa4f6b
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/interrupt.h
@@ -0,0 +1,69 @@
+/*
+Interrupts functions extruded from wiringPi library by Oitzu.
+
+wiringPi Copyright (c) 2012 Gordon Henderson
+https://projects.drogon.net/raspberry-pi/wiringpi
+wiringPi is free software: GNU Lesser General Public License
+see <http://www.gnu.org/licenses/>
+*/
+
+#include "RF24_arch_config.h"
+
+#define INT_EDGE_SETUP          0
+#define INT_EDGE_FALLING        1
+#define INT_EDGE_RISING         2
+#define INT_EDGE_BOTH           3
+
+/*
+ * interruptHandler:
+ *      This is a thread and gets started to wait for the interrupt we're
+ *      hoping to catch. It will call the user-function when the interrupt
+ *      fires.
+ *********************************************************************************
+ */
+void *interruptHandler (void *arg);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * waitForInterrupt:
+ *      Pi Specific.
+ *      Wait for Interrupt on a GPIO pin.
+ *      This is actually done via the /sys/class/gpio interface regardless of
+ *      the wiringPi access mode in-use. Maybe sometime it might get a better
+ *      way for a bit more efficiency.
+ *********************************************************************************
+ */
+extern int waitForInterrupt (int pin, int mS);
+
+/*
+ * piHiPri:
+ *      Attempt to set a high priority schedulling for the running program
+ *********************************************************************************
+ */
+extern int piHiPri (const int pri);
+
+/*
+ * attachInterrupt (Original: wiringPiISR):
+ *      Pi Specific.
+ *      Take the details and create an interrupt handler that will do a call-
+ *      back to the user supplied function.
+ *********************************************************************************
+ */
+extern int attachInterrupt (int pin, int mode, void (*function)(void));
+
+/*
+ * detachInterrupt:
+ *      Pi Specific detachInterrupt.
+ *      Will cancel the interrupt thread, close the filehandle and 
+ *		setting wiringPi back to 'none' mode.
+ *********************************************************************************
+ */
+extern int detachInterrupt (int pin);
+
+extern void rfNoInterrupts();
+extern void rfInterrupts();
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/lib/RF24/utility/SPIDEV/spi.cpp b/lib/RF24/utility/SPIDEV/spi.cpp
new file mode 100644
index 000000000..6b36ca337
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/spi.cpp
@@ -0,0 +1,168 @@
+/*
+ * File:   spi.cpp
+ * Author: Purinda Gunasekara <purinda@gmail.com>
+ *
+ * Created on 24 June 2012, 11:00 AM
+ *
+ * Patched for exception handling and selectable SPI SPEED by ldiaz 2018.
+ *
+ * Inspired from spidev test in linux kernel documentation
+ * www.kernel.org/doc/Documentation/spi/spidev_test.c
+ */
+
+#include "spi.h"
+
+#include <fcntl.h>
+#include <linux/spi/spidev.h>
+#include <memory.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#define RF24_SPIDEV_BITS 8
+
+SPI::SPI():fd(-1), _spi_speed(RF24_SPIDEV_SPEED) {
+}
+
+bool spiIsInitialized = 0;
+
+void SPI::begin(int busNo,uint32_t spi_speed){
+
+    if(spiIsInitialized){
+       return; 
+    }
+    
+    /* set spidev accordingly to busNo like:
+     * busNo = 23 -> /dev/spidev2.3
+     *
+     * a bit messy but simple
+     * */
+	char device[] = "/dev/spidev0.0";
+	device[11] += (busNo / 10) % 10;
+	device[13] += busNo % 10;
+
+	if(this->fd >=0) // check whether spi is already open
+	{
+		close(this->fd);
+		this->fd=-1;
+	}
+
+	this->fd = open(device, O_RDWR);
+  if (this->fd < 0) throw SPIException("can't open device");
+	/*
+  {
+        perror("can't open device");
+        abort();
+
+  }*/
+    spiIsInitialized = true;
+	init(spi_speed);
+}
+
+void SPI::init(uint32_t speed)
+{
+	uint8_t bits = RF24_SPIDEV_BITS;
+	uint8_t mode = 0;
+
+	int ret;
+	/*
+	 * spi mode
+	 */
+	ret = ioctl(this->fd, SPI_IOC_WR_MODE, &mode);
+	if (ret == -1) throw SPIException("cant set WR spi mode");
+	/*{
+		perror("can't set spi mode");
+		abort();
+	}*/
+
+	ret = ioctl(this->fd, SPI_IOC_RD_MODE, &mode);
+	if (ret == -1) throw SPIException("can't set RD spi mode");
+	/*{
+		perror("can't set spi mode");
+		abort();
+	}*/
+
+	/*
+	 * bits per word
+	 */
+	ret = ioctl(this->fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
+	if (ret == -1) throw SPIException("can't set WR bits per word");
+	/*{
+		perror("can't set bits per word");
+		abort();
+	}*/
+
+	ret = ioctl(this->fd, SPI_IOC_RD_BITS_PER_WORD, &bits);
+	if (ret == -1) throw SPIException("can't set RD bits per word");
+	/*{
+		perror("can't set bits per word");
+		abort();
+	}*/
+	/*
+	 * max speed hz
+	 */
+	ret = ioctl(this->fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
+	if (ret == -1) throw SPIException("can't WR set max speed hz");
+	/*{
+		perror("can't set max speed hz");
+		abort();
+	}*/
+
+	ret = ioctl(this->fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed);
+	if (ret == -1) throw SPIException("can't RD set max speed hz");
+	/*{
+		perror("can't set max speed hz");
+		abort();
+	}*/
+	_spi_speed=speed;
+}
+
+uint8_t SPI::transfer(uint8_t tx)
+{
+	struct spi_ioc_transfer tr;
+	memset(&tr, 0, sizeof(tr));
+	tr.tx_buf = (unsigned long)&tx;
+	uint8_t rx;
+	tr.rx_buf = (unsigned long)&rx;
+	tr.len = sizeof(tx);
+	tr.speed_hz = _spi_speed; //RF24_SPIDEV_SPEED;
+	tr.delay_usecs = 0;
+	tr.bits_per_word = RF24_SPIDEV_BITS;
+	tr.cs_change = 0;
+
+	int ret;
+	ret = ioctl(this->fd, SPI_IOC_MESSAGE(1), &tr);
+	if (ret < 1) throw SPIException("can't send spi message");
+	/*{
+		perror("can't send spi message");
+		abort();
+	}*/
+
+	return rx;
+}
+
+void SPI::transfernb(char* tbuf, char* rbuf, uint32_t len)
+{
+    struct spi_ioc_transfer tr;
+    memset(&tr, 0, sizeof(tr));
+    tr.tx_buf = (unsigned long)tbuf;
+    tr.rx_buf = (unsigned long)rbuf;
+    tr.len = len;
+    tr.speed_hz = _spi_speed; //RF24_SPIDEV_SPEED;
+    tr.delay_usecs = 0;
+    tr.bits_per_word = RF24_SPIDEV_BITS;
+    tr.cs_change = 0;
+
+	int ret;
+	ret = ioctl(this->fd, SPI_IOC_MESSAGE(1), &tr);
+	if (ret < 1) throw SPIException("can't send spi message");
+	/*{
+		perror("can't send spi message");
+		abort();
+	}*/
+}
+
+SPI::~SPI() {
+	if (this->fd >= 0) close(this->fd);
+}
diff --git a/lib/RF24/utility/SPIDEV/spi.h b/lib/RF24/utility/SPIDEV/spi.h
new file mode 100644
index 000000000..2f3236b93
--- /dev/null
+++ b/lib/RF24/utility/SPIDEV/spi.h
@@ -0,0 +1,93 @@
+/*
+ * File:   spi.h
+ * Author: Purinda Gunasekara <purinda@gmail.com>
+ *
+ * Created on 24 June 2012, 11:00 AM
+ */
+
+#ifndef SPI_H
+#define	SPI_H
+
+/**
+ * @file spi.h
+ * \cond HIDDEN_SYMBOLS
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example GPIO.h file
+ *
+ * @defgroup SPI SPI Example
+ *
+ * See RF24_arch_config.h for additional information
+ * @{
+ */
+
+#include <inttypes.h>
+#include <stdexcept>
+
+#ifndef RF24_SPIDEV_SPEED
+/* 8MHz as default */
+#define RF24_SPIDEV_SPEED 8000000
+#endif
+
+/** Specific excpetion for SPI errors */
+class SPIException : public std::runtime_error {
+	public:
+		explicit SPIException(const std::string& msg) :  std::runtime_error(msg) { }
+};
+
+
+class SPI {
+
+public:
+
+	/**
+	* SPI constructor
+	*/
+	SPI();
+
+	/**
+	* Start SPI
+	*/
+	void begin(int busNo,uint32_t spi_speed=RF24_SPIDEV_SPEED);
+
+	/**
+	* Transfer a single byte
+	* @param tx Byte to send
+	* @return Data returned via spi
+	*/
+	uint8_t transfer(uint8_t tx);
+
+	/**
+	* Transfer a buffer of data
+	* @param tbuf Transmit buffer
+	* @param rbuf Receive buffer
+	* @param len Length of the data
+	*/
+	void transfernb(char* tbuf, char* rbuf, uint32_t len);
+
+	/**
+	* Transfer a buffer of data without an rx buffer
+	* @param buf Pointer to a buffer of data
+	* @param len Length of the data
+	*/
+	void transfern(char* buf, uint32_t len) {
+	  transfernb(buf, buf, len);
+	}
+
+	~SPI();
+
+private:
+
+	int fd;
+	uint32_t _spi_speed;
+
+	void init(uint32_t spi_speed=RF24_SPIDEV_SPEED);
+};
+
+/**
+ * \endcond
+ */
+/*@}*/
+#endif	/* SPI_H */
diff --git a/lib/RF24/utility/Teensy/RF24_arch_config.h b/lib/RF24/utility/Teensy/RF24_arch_config.h
new file mode 100644
index 000000000..4848343a1
--- /dev/null
+++ b/lib/RF24/utility/Teensy/RF24_arch_config.h
@@ -0,0 +1,31 @@
+
+
+  #if ARDUINO < 100
+	#include <WProgram.h>
+  #else
+	#include <Arduino.h>
+  #endif
+
+  #include <stddef.h>
+  
+  #include <stdint.h>
+  #include <stdio.h>
+  #include <string.h>
+
+  #include <SPI.h>
+  #define _SPI SPI
+
+  #define printf Serial.printf
+  
+  #ifdef SERIAL_DEBUG
+	#define IF_SERIAL_DEBUG(x) ({x;})
+  #else
+	#define IF_SERIAL_DEBUG(x)
+  #endif
+  
+
+  #define PRIPSTR "%s"
+
+
+
+
diff --git a/lib/RF24/utility/Template/RF24_arch_config.h b/lib/RF24/utility/Template/RF24_arch_config.h
new file mode 100644
index 000000000..f63420118
--- /dev/null
+++ b/lib/RF24/utility/Template/RF24_arch_config.h
@@ -0,0 +1,84 @@
+
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ */
+ 
+ /**
+ * @file RF24_arch_config.h
+ * General defines and includes for RF24/Linux
+ */
+
+ /**
+ * Example of RF24_arch_config.h for RF24 portability
+ *
+ * @defgroup Porting_General Porting: General
+ *
+ * 
+ * @{
+ */
+ 
+ 
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+#define RF24_LINUX
+
+#include <stddef.h>
+#include "spi.h"
+#include "gpio.h"
+#include "compatibility.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include <sys/time.h>
+
+#define _BV(x) (1<<(x))
+#define _SPI spi
+
+#undef SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
+#define IF_SERIAL_DEBUG(x) ({x;})
+#else
+#define IF_SERIAL_DEBUG(x)
+#endif
+
+// Avoid spurious warnings
+#if 1
+#if ! defined( NATIVE ) && defined( ARDUINO )
+#undef PROGMEM
+#define PROGMEM __attribute__(( section(".progmem.data") ))
+#undef PSTR
+#define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+#endif
+#endif
+
+typedef uint16_t prog_uint16_t;
+#define PSTR(x) (x)
+#define printf_P printf
+#define strlen_P strlen
+#define PROGMEM
+#define pgm_read_word(p) (*(p)) 
+#define PRIPSTR "%s"
+#define pgm_read_byte(p) (*(p))
+
+// Function, constant map as a result of migrating from Arduino
+#define LOW GPIO::OUTPUT_LOW
+#define HIGH GPIO::OUTPUT_HIGH
+#define INPUT GPIO::DIRECTION_IN
+#define OUTPUT GPIO::DIRECTION_OUT
+#define digitalWrite(pin, value) GPIO::write(pin, value)
+#define pinMode(pin, direction) GPIO::open(pin, direction)
+#define delay(milisec) __msleep(milisec)
+#define delayMicroseconds(usec) __usleep(usec)
+#define millis() __millis()
+
+#endif // __ARCH_CONFIG_H__
+
+
+/*@}*/	
diff --git a/lib/RF24/utility/Template/compatibility.h b/lib/RF24/utility/Template/compatibility.h
new file mode 100644
index 000000000..34b6a2af2
--- /dev/null
+++ b/lib/RF24/utility/Template/compatibility.h
@@ -0,0 +1,44 @@
+/* 
+ * File:   compatiblity.h
+ * Author: purinda
+ *
+ * Created on 24 June 2012, 3:08 PM
+ */
+
+ /**
+ * @file compatibility.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of compatibility.h class declaration for timing functions portability
+ *
+ * @defgroup Porting_Timing Porting: Timing
+ *
+ * 
+ * @{
+ */
+ 
+#ifndef COMPATIBLITY_H
+#define	COMPATIBLITY_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+	
+#include <stddef.h>
+#include <time.h>
+#include <sys/time.h>
+
+void __msleep(int milisec);
+void __usleep(int milisec);
+void __start_timer();
+long __millis();
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* COMPATIBLITY_H */
+
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/Template/gpio.h b/lib/RF24/utility/Template/gpio.h
new file mode 100644
index 000000000..9b39b68a5
--- /dev/null
+++ b/lib/RF24/utility/Template/gpio.h
@@ -0,0 +1,59 @@
+
+
+/**
+ * @file gpio.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of gpio.h class declaration for GPIO portability
+ *
+ * @defgroup Porting_GPIO Porting: GPIO
+ *
+ * 
+ * @{
+ */
+#ifndef H
+#define	H
+
+#include <cstdio>
+
+//class GPIO {
+public:
+ 	/* Constants */
+	static const int DIRECTION_OUT = 1;
+	static const int DIRECTION_IN = 0;
+	
+	static const int OUTPUT_HIGH = 1;
+	static const int OUTPUT_LOW = 0;
+		
+	GPIO();
+	
+	/**
+	 * Similar to Arduino pinMode(pin,mode);
+     * @param port
+     * @param DDR
+     */
+	static void open(int port, int DDR);
+	/**
+	 * 
+     * @param port
+     */
+	static void close(int port);
+	/**
+	 * Similar to Arduino digitalRead(pin);
+     * @param port
+     * @param value
+     */
+	static int read(int port);
+	/**
+	* Similar to Arduino digitalWrite(pin,state);
+	* @param port
+	* @param value
+	*/	
+	static void write(int port,int value);	
+	
+	virtual ~GPIO();
+};
+
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/Template/includes.h b/lib/RF24/utility/Template/includes.h
new file mode 100644
index 000000000..262cea00a
--- /dev/null
+++ b/lib/RF24/utility/Template/includes.h
@@ -0,0 +1,31 @@
+
+ /**
+ * @file includes.h
+ * Configuration defines for RF24/Linux
+ */
+
+ /**
+ * Example of includes.h for RF24 Linux portability
+ *
+ * @defgroup Porting_Includes Porting: Includes
+ *
+ * 
+ * @{
+ */
+  
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  /**
+   * Define a specific platform for this configuration
+   */
+  #define RF24_BBB
+  
+  /**
+   * Load the correct configuration for this platform
+  */
+  #include "BBB/RF24_arch_config.h"
+  
+#endif
+
+/*@}*/	
\ No newline at end of file
diff --git a/lib/RF24/utility/Template/spi.h b/lib/RF24/utility/Template/spi.h
new file mode 100644
index 000000000..00d5744eb
--- /dev/null
+++ b/lib/RF24/utility/Template/spi.h
@@ -0,0 +1,81 @@
+
+/**
+ * @file spi.h
+ * Class declaration for SPI helper files
+ */
+
+ /**
+ * Example of spi.h class declaration for SPI portability
+ *
+ * @defgroup Porting_SPI Porting: SPI
+ *
+ * 
+ * @{
+ */
+#include <string>
+#include <stdint.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <inttypes.h>
+#include <linux/types.h>
+#include <linux/spi/spidev.h> 
+
+using namespace std;
+//class SPI {
+public:
+
+/**
+	* SPI constructor
+	*/	 
+	SPI();
+	
+	/**
+	* Start SPI
+	*/
+	void begin(int busNo);
+	
+	/**
+	* Transfer a single byte
+	* @param tx_ Byte to send
+	* @return Data returned via spi
+	*/
+	uint8_t transfer(uint8_t tx_);
+	
+	/**
+	* Transfer a buffer of data
+	* @param tbuf Transmit buffer
+	* @param rbuf Receive buffer
+	* @param len Length of the data
+	*/
+	void transfernb(char* tbuf, char* rbuf, uint32_t len);
+
+	/**
+	* Transfer a buffer of data without an rx buffer
+	* @param buf Pointer to a buffer of data
+	* @param len Length of the data
+	*/	
+	void transfern(char* buf, uint32_t len);
+	
+	virtual ~SPI();
+
+private:
+
+	/** Default SPI device */
+	string device;
+	/** SPI Mode set */
+	uint8_t mode;
+	/** word size*/
+	uint8_t bits;
+	/** Set SPI speed*/
+	uint32_t speed;
+	int fd;
+
+	void init();	
+};
+
+
+/*@}*/
\ No newline at end of file
diff --git a/lib/RF24/utility/wiringPi/RF24_arch_config.h b/lib/RF24/utility/wiringPi/RF24_arch_config.h
new file mode 100644
index 000000000..8fb4bf550
--- /dev/null
+++ b/lib/RF24/utility/wiringPi/RF24_arch_config.h
@@ -0,0 +1,56 @@
+
+/*
+ Copyright (C) 2011 J. Coliz <maniacbug@ymail.com>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ */
+#ifndef __ARCH_CONFIG_H__
+#define __ARCH_CONFIG_H__
+
+#define RF24_LINUX
+
+#include <stddef.h>
+#include "spi.h"
+#include "wiringPi.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include <sys/time.h>
+
+#define _BV(x) (1<<(x))
+#define _SPI spi
+
+#undef SERIAL_DEBUG
+#ifdef SERIAL_DEBUG
+#define IF_SERIAL_DEBUG(x) ({x;})
+#else
+#define IF_SERIAL_DEBUG(x)
+#endif
+
+// Avoid spurious warnings
+#if 1
+#if ! defined( NATIVE ) && defined( ARDUINO )
+#undef PROGMEM
+#define PROGMEM __attribute__(( section(".progmem.data") ))
+#undef PSTR
+#define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+#endif
+#endif
+
+typedef uint16_t prog_uint16_t;
+#define PSTR(x) (x)
+#define printf_P printf
+#define strlen_P strlen
+#define PROGMEM
+#define pgm_read_word(p) (*(p))
+#define PRIPSTR "%s"
+#define pgm_read_byte(p) (*(p))
+#define pgm_read_ptr(p) (*(p))
+#endif // __ARCH_CONFIG_H__
+
+
+/*@}*/
diff --git a/lib/RF24/utility/wiringPi/includes.h b/lib/RF24/utility/wiringPi/includes.h
new file mode 100644
index 000000000..c8b877511
--- /dev/null
+++ b/lib/RF24/utility/wiringPi/includes.h
@@ -0,0 +1,30 @@
+
+ /**
+ * @file includes.h
+ * Configuration defines for RF24/Linux
+ */
+
+ /**
+ * Example of includes.h for RF24 Linux portability
+ *
+ * @defgroup Porting_Includes Porting: Includes
+ *
+ *
+ * @{
+ */
+
+#ifndef __RF24_INCLUDES_H__
+#define __RF24_INCLUDES_H__
+
+  /**
+   * Define RF24_WIRINGPI configuration for RaspberryPi platform
+   */
+  #define RF24_WIRINGPI
+
+  /**
+   * Load the correct configuration for this platform
+   */
+  #include "wiringPi/RF24_arch_config.h"
+
+#endif
+/*@}*/
\ No newline at end of file
diff --git a/lib/RF24/utility/wiringPi/spi.cpp b/lib/RF24/utility/wiringPi/spi.cpp
new file mode 100644
index 000000000..90d358bb4
--- /dev/null
+++ b/lib/RF24/utility/wiringPi/spi.cpp
@@ -0,0 +1,93 @@
+/*
+ * File:   spi.cpp
+ * Author:
+ *
+ * Created on
+ *
+ * Inspired from spi speed test from wiringPi
+ * wiringPi/examples/spiSpeed.c
+ */
+
+#include "spi.h"
+
+#include <wiringPi.h>
+#include <wiringPiSPI.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#define RF24_SPI_SPEED		8 * 1000000 // 8Mhz
+#define RF24_SPI_CHANNEL	0
+
+SPI::SPI():fd(-1)
+{
+    printf("wiringPi RF24 DRIVER\n");
+}
+
+void SPI::begin(int csn_pin)
+{
+    // initialize the wiringPiSPI
+    if ((this->fd = wiringPiSPISetup(RF24_SPI_CHANNEL, RF24_SPI_SPEED)) < 0)
+    {
+        printf("Cannot configure the SPI device!\n");
+        fflush(stdout);
+        abort();
+    }
+    else
+        printf("Configured SPI fd: %d - pin: %d\n", fd, csn_pin);
+}
+
+uint8_t SPI::transfer(uint8_t tx)
+{
+    memset(&msgByte, 0, sizeof(msgByte));
+    memcpy(&msgByte, &tx, sizeof(tx));
+
+    if(wiringPiSPIDataRW(RF24_SPI_CHANNEL, &msgByte, sizeof(tx)) < 0)
+    {
+        printf("transfer(): Cannot send data: %s\n", strerror(errno));
+        fflush(stdout);
+        abort();
+    }
+
+    return msgByte;
+}
+
+void SPI::transfern(char* buf, uint32_t len)
+{
+    printf("transfern(tx: %s)\n", buf);
+
+    if(wiringPiSPIDataRW(RF24_SPI_CHANNEL, (uint8_t *)buf, len) < 0)
+    {
+        printf("transfern(): Cannot send data %s\n", strerror(errno));
+        fflush(stdout);
+        abort();
+    }
+}
+
+void SPI::transfernb(char* tbuf, char* rbuf, uint32_t len)
+{
+    // using an auxiliary buffer to keep tx and rx different
+    memset(msg, 0, sizeof(msg));
+    memcpy(msg, tbuf, len);
+
+    if(wiringPiSPIDataRW(RF24_SPI_CHANNEL, msg, len) < 0)
+    {
+        printf("transfernb() Cannot send data %s\n", strerror(errno));
+        fflush(stdout);
+        abort();
+    }
+
+    memcpy(rbuf, msg, len);
+}
+
+SPI::~SPI()
+{
+    if (!(this->fd < 0))
+    {
+        close(this->fd);
+        this->fd = -1;
+    }
+}
diff --git a/lib/RF24/utility/wiringPi/spi.h b/lib/RF24/utility/wiringPi/spi.h
new file mode 100644
index 000000000..8fde9e474
--- /dev/null
+++ b/lib/RF24/utility/wiringPi/spi.h
@@ -0,0 +1,70 @@
+
+/**
+ * @file spi.h
+ * Class declaration for SPI helper files
+ */
+
+#ifndef SPI_H
+#define	SPI_H
+
+ /**
+ * Example of spi.h class declaration for SPI portability
+ *
+ * @defgroup Porting_SPI Porting: SPI
+ *
+ * @{
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+
+using namespace std;
+class SPI {
+public:
+        /**
+        * SPI default constructor
+        */
+        SPI();
+
+        /**
+        * Start SPI communication
+        * @param pin used for SPI
+        */
+        void begin(int);
+
+        /**
+        * Transfer a single byte of data
+        * @param tx Byte to send
+        * @return Data returned via spi
+        */
+        uint8_t transfer(uint8_t);
+
+        /**
+        * Transfer a buffer of data using rx and tx buffer
+        * @param tbuf Transmit buffer
+        * @param rbuf Receive buffer
+        * @param len Length of the data
+        */
+        void transfernb(char*, char*, uint32_t);
+
+        /**
+        * Transfer a buffer of data without using an rx buffer
+        * @param buf Pointer to a buffer of data
+        * @param len Length of the data
+        */
+        void transfern(char*, const uint32_t);
+
+        /**
+        * SPI destructor
+        */
+        virtual ~SPI();
+
+private:
+        int fd;
+        uint8_t msg[32 + 1];
+        uint8_t msgByte;
+};
+
+/*@}*/
+#endif	/* SPI_H */
+
diff --git a/lib/RF24/wikidoc.xslt b/lib/RF24/wikidoc.xslt
new file mode 100644
index 000000000..b94d3ef6c
--- /dev/null
+++ b/lib/RF24/wikidoc.xslt
@@ -0,0 +1,41 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output method="text" standalone="yes" />
+  <xsl:template match="/">
+    	<xsl:apply-templates select="//sectiondef[@kind='public-func']/memberdef[@kind='function']" />
+  </xsl:template>
+  <xsl:template match="memberdef">
+  		<!-- xsl:text>&#xA;=== </xsl:text><xsl:value-of select="definition"/> <xsl:value-of select="argsstring"/><xsl:text> ===&#xA;</xsl:text -->
+  		<xsl:text>&#xA;=== </xsl:text><xsl:value-of select="name"/><xsl:text> ===&#xA;&#xA;</xsl:text>
+  		<xsl:apply-templates select="briefdescription"/>
+  		<xsl:if test="count(detaileddescription/para[not(./*)]) &lt; 1"><xsl:text>&#xA;</xsl:text></xsl:if>
+  		<xsl:apply-templates select="detaileddescription"/>
+  </xsl:template>
+  <xsl:template match="briefdescription/para">''<xsl:value-of select="."/>'' </xsl:template>
+  <xsl:template match="detaileddescription/para/parameterlist">
+Parameters:
+
+<xsl:apply-templates select="parameteritem"/>
+  </xsl:template>
+  <xsl:template match="parameteritem">* ''<xsl:value-of select="parameternamelist/parametername"/>'': <xsl:value-of select="parameterdescription/para"/><xsl:text>&#xA;</xsl:text>
+  </xsl:template>
+  <xsl:template match="detaileddescription/para[not(./*)]">
+  	<xsl:value-of select="."/><xsl:text>&#xA;</xsl:text>
+  </xsl:template>
+  <xsl:template match="detaileddescription/para/simplesect[@kind='return']/para">
+Returns:
+
+* <xsl:value-of select="."/><xsl:text>&#xA;</xsl:text>
+  </xsl:template>
+  <xsl:template match="detaileddescription/para/simplesect[@kind='warning']/para">
+Warning: <xsl:value-of select="."/><xsl:text>&#xa;</xsl:text>
+
+  </xsl:template>
+  <xsl:template match="detaileddescription/para/programlisting">
+  	<xsl:text>&#xa;&lt;pre&gt;&#xa;</xsl:text><xsl:apply-templates select="codeline"/><xsl:text>&lt;/pre&gt;&#xa;</xsl:text>
+  </xsl:template>
+  <xsl:template match="codeline">
+  	<xsl:value-of select="."/><xsl:text>&#xa;</xsl:text>
+  </xsl:template>
+  <xsl:template match="text()"/>
+</xsl:stylesheet>
+
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 7bb79a73d..57d4d9205 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -439,18 +439,26 @@
 #endif  // USE_I2C
 
 // -- SPI sensors ---------------------------------
-//#define USE_SPI                                  // Hardware SPI using GPIO12(MISO), GPIO13(MOSI) and GPIO14(CLK) in addition to two user selectable GPIOs(CS and DC)
+#define USE_SPI                                  // Hardware SPI using GPIO12(MISO), GPIO13(MOSI) and GPIO14(CLK) in addition to two user selectable GPIOs(CS and DC)
 
 #ifdef USE_SPI
-  #ifndef USE_DISPLAY
-  #define USE_DISPLAY                            // Add SPI Display support for 320x240 and 480x320 TFT
-  #endif
-    #define USE_DISPLAY_ILI9341                  // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
+  // #ifndef USE_DISPLAY
+  // #define USE_DISPLAY                            // Add SPI Display support for 320x240 and 480x320 TFT
+  // #endif
+  //   #define USE_DISPLAY_ILI9341                  // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
 //    #define USE_DISPLAY_EPAPER_29                // [DisplayModel 5] Enable e-paper 2.9 inch display (+19k code)
 //    #define USE_DISPLAY_EPAPER_42                // [DisplayModel 6] Enable e-paper 4.2 inch display
 //    #define USE_DISPLAY_ILI9488                  // [DisplayModel 8] [I2cDriver38] (Touch)
 //    #define USE_DISPLAY_SSD1351                  // [DisplayModel 9]
 //    #define USE_DISPLAY_RA8876                   // [DisplayModel 10] [I2cDriver39] (Touch)
+  
+  #define USE_NRF24                                // add support for NRF24L01(+), (+2k3 of code)
+    #ifdef USE_DISPLAY
+      #undef USE_DISPLAY                           // Display drivers should be disabled
+    #endif
+    #ifdef USE_NRF24
+      #define USE_MIBLE                            // BLE-bridge for some Mijia-BLE-sensors (+4k6 of code)
+  #endif // USE_NRF24
 #endif  // USE_SPI
 
 // -- Serial sensors ------------------------------
diff --git a/tasmota/xdrv_33_nrf24l01.ino b/tasmota/xdrv_33_nrf24l01.ino
new file mode 100644
index 000000000..092fd85a5
--- /dev/null
+++ b/tasmota/xdrv_33_nrf24l01.ino
@@ -0,0 +1,103 @@
+/*
+  nrf24l01 support for Tasmota
+  Copyright (C) 2019  Christian Baars and Theo Arends
+  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/>.
+
+
+  --------------------------------------------------------------------------------------------
+  Version yyyymmdd  Action    Description
+  --------------------------------------------------------------------------------------------
+
+  ---
+  0.9.0.0 20191127  started - further development by Christian Baars
+                    forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
+
+*/
+
+#ifdef USE_SPI
+#ifdef USE_NRF24
+
+/*********************************************************************************************\
+* NRF24l01(+)
+*
+* Usage: 5 SPI-data-wires plus VVC/ground, use hardware SPI, select GPIO_SPI_CS/GPIO_SPI_DC
+\*********************************************************************************************/
+
+#define XDRV_33             33
+
+#define MOSI 13
+#define MISO 12
+#define SCK  14
+
+#include <SPI.h>
+#include <RF24.h>
+
+const char NRF24type[] PROGMEM = "NRF24";
+
+const char HTTP_NRF24[] PROGMEM =
+ "{s}%sL01%c: " "{m}started{e}";
+
+struct {
+  uint8_t chipType = 0; // NRF24l01 active: 32 - NRF24L01 , 43- NRF24L01+  ... we mis-use ascii-codes
+} NRF24;
+
+/********************************************************************************************/
+
+RF24 NRF24radio;
+
+bool NRF24initRadio() 
+{
+  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+  NRF24radio.powerUp();
+
+  if(NRF24radio.isChipConnected()){
+    DEBUG_DRIVER_LOG(PSTR("NRF24 chip connected"));
+    return true;
+  }
+  DEBUG_DRIVER_LOG(PSTR("NRF24 chip NOT !!!! connected"));
+  return false;
+}
+
+bool NRF24Detect(void)
+{  
+  if  ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
+    SPI.pins(SCK,MOSI,MISO,-1);
+    if(NRF24initRadio()){
+      NRF24.chipType = 32; // SPACE
+     AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01 initialized"));
+      if(NRF24radio.isPVariant()){
+        NRF24.chipType = 43; // +
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01+ detected"));
+      }
+      return true;
+    }
+  } 
+  return false;
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv33(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    result = NRF24Detect();
+  }
+  return result;
+}
+
+#endif  // USE_NRF24
+#endif  // USE_SPI
+
diff --git a/tasmota/xsns_61_MI_BLE.ino b/tasmota/xsns_61_MI_BLE.ino
new file mode 100644
index 000000000..52e49c89a
--- /dev/null
+++ b/tasmota/xsns_61_MI_BLE.ino
@@ -0,0 +1,756 @@
+/*
+  MI-BLE-sensors via nrf24l01 support for Tasmota
+  Copyright (C) 2019  Christian Baars and Theo Arends
+  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/>.
+
+
+  --------------------------------------------------------------------------------------------
+  Version yyyymmdd  Action    Description
+  --------------------------------------------------------------------------------------------
+
+  ---
+  0.9.0.0 20191127  started - further development by Christian Baars
+                    base    - code base from cbm80amiga, floe, Dmitry.GR
+                    forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
+
+*/
+
+#ifdef USE_SPI
+#ifdef USE_NRF24
+#ifdef USE_MIBLE
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  #define MIBLE_LOG_BUFFER(x) MIBLEshowBuffer(x);
+#else
+  #define MIBLE_LOG_BUFFER(x)
+#endif
+
+
+/*********************************************************************************************\
+* MIBLE
+* BLE-Sniffer/Bridge for MIJIA/XIAOMI Temperatur/Humidity-Sensor, Mi Flora
+*
+* Usage: Configure NRF24 
+\*********************************************************************************************/
+
+#define XSNS_61             61
+
+#include <vector>
+
+const char MIBLESlaveFlora[] PROGMEM = "Flora";
+const char MIBLESlaveMJ_HT_V1[] PROGMEM = "MJ_HT_V1";
+
+
+#pragma pack(1)  // important!!
+struct MJ_HT_V1Header_t {// related to the payload
+  uint8_t padding[3];
+  uint8_t mesSize;       // 3
+  uint8_t padding2;
+  uint16_t uuid;         // 5,6 -> 0xFE95
+  uint16_t type;         //  7,8 -> 0x2050 MI-TH-V1
+  uint8_t padding3[2];
+  uint8_t counter;       // 11 - counts up with every sent record
+  uint8_t serial[6];     // 12 - 17
+  uint8_t mode;          // 18
+  uint8_t padding5;
+  uint8_t effectiveDataLength;
+  };
+
+struct FlowerHeader_t {        // related to the payload
+  uint8_t padding[4];
+  uint8_t padding2;
+  uint16_t uuid;         // 5,6 -> 0xFE95
+  uint8_t mesSize;
+  uint8_t padding22;
+  uint16_t uuid2;        // 9,10 -> 0xFE95
+  uint16_t type;         //  11,12 -> 0x7120 Flowercare
+  uint8_t padding3[2];
+  uint8_t counter;       // 15 - counts up with every sent record
+  uint8_t serial[6];     // 16 - 21
+  uint8_t padding4;      //22
+  uint8_t mode;          // 23
+  };
+
+union floraPacket_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint16_t data;
+  } T;    // mode 04
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 3
+      uint16_t data;
+      uint8_t data2; // unknown meaning, maybe it is a real uint24_t (data with data2)
+  } L;    // mode 07
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint8_t data;
+  } M;    // mode 08
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 2
+      uint16_t data;
+  } F;    // mode 09
+};
+
+union MJ_HT_V1Packet_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 4
+      uint16_t temp;
+      uint16_t hum; 
+  } TH;   // mode 0d
+      struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint8_t battery;
+  } B;    // mode 0a
+  // We do NOT need the isolated T and H packet
+};
+
+struct bleAdvPacket_t { // for nRF24L01 max 32 bytes = 2+6+24
+  uint8_t pduType;
+  uint8_t payloadSize;
+  uint8_t mac[6];
+  union {
+    uint8_t payload[24];
+    MJ_HT_V1Header_t header;
+    FlowerHeader_t flowerHeader;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+        uint8_t hum_lb; // the high byte does not fit into the RX_buffer
+    } TH;   // mode 0d
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+    } T;    // mode 04
+    struct {
+        uint8_t padding[21];
+        uint16_t hum;
+    } H;    // mode 06
+    struct {
+        uint8_t padding[21];
+        uint8_t battery;
+    } B;    // mode 0a
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 2
+        uint16_t data;
+    } F_T;    // mode 04
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 3
+        uint16_t data;
+        uint8_t data2; // unknown meaning, maybe it is a real uint24_t (data with data2)
+    } F_L;    // mode 07
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 1
+        uint8_t data;
+    } F_M;    // mode 08
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 2
+        uint16_t data;
+    } F_F;    // mode 09
+  };
+};
+
+union FIFO_t{
+  bleAdvPacket_t bleAdv;
+  floraPacket_t floraPacket;
+  MJ_HT_V1Packet_t MJ_HT_V1Packet;
+  uint8_t raw[32];
+};
+
+#pragma pack(0)
+
+struct {
+  const uint8_t channel[3]   = {37,38,39};  // BLE advertisement channel number
+  const uint8_t frequency[3] = { 2,26,80};  // real frequency (2400+x MHz)
+
+  uint16_t timer;
+  uint8_t currentChan=0;
+  FIFO_t buffer;
+  uint8_t packetMode; // 0 - normal BLE-advertisements, 1 - special "flora"-packet, 2 - special "MJ_HT_V1"-packet
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  uint8_t streamBuffer[sizeof(buffer)]; //  raw data stream bytes
+  uint8_t lsfrBuffer[sizeof(buffer)];   //  correpsonding lfsr-bytes for the buffer, probably only useful for a BLE-packet
+#endif //  DEBUG_TASMOTA_SENSOR
+
+} MIBLE;
+
+struct mi_sensor_t{
+  uint8_t type; //flora = 1; MI-HT_V1=2
+  uint8_t serial[6];
+  uint8_t showedUp;
+  union {
+    struct {
+      float temp;
+      float moisture;
+      float fertility;
+      uint16_t lux;
+    } Flora;
+    struct {
+      float temp;
+      float hum;
+      uint8_t bat;
+    } MJ_HT_V1;
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+/********************************************************************************************/
+
+
+bool MIBLEinitBLE(uint8_t _mode) 
+{
+  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+  NRF24radio.setAutoAck(false);
+  NRF24radio.setDataRate(RF24_1MBPS);
+  NRF24radio.disableCRC();
+  NRF24radio.setChannel( MIBLE.frequency[MIBLE.currentChan] );
+  NRF24radio.setRetries(0,0);
+  NRF24radio.setPALevel(RF24_PA_MIN); // we only receive
+  NRF24radio.setAddressWidth(4);
+  // NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
+  // NRF24radio.openWritingPipe(  0x6B7D9171); // not used ATM
+  NRF24radio.powerUp();
+
+  if(NRF24radio.isChipConnected()){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE chip connected"));
+    MIBLEchangePacketModeTo(_mode);
+    return true;
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE chip NOT !!!! connected"));
+  return false;
+}
+
+void MIBLEhopChannel()
+{
+  MIBLE.currentChan++;
+  if(MIBLE.currentChan >= sizeof(MIBLE.channel)) {
+    MIBLE.currentChan = 0;
+  }
+  NRF24radio.setChannel( MIBLE.frequency[MIBLE.currentChan] );
+}
+
+/**
+ * @brief Read out FIFO-buffer, swap buffer and whiten
+ * 
+ * @return true - If something is in the buffer
+ * @return false - Nothing is in the buffer
+ */
+bool MIBLEreceivePacket(void)
+{
+  if(!NRF24radio.available()) {
+    return false;
+  }
+  while(NRF24radio.available()) {
+    // static uint8_t _lsfr = 0; //-> for testing out suitable lsfr-start-values for yet unknown packets
+    // _lsfr++;
+    NRF24radio.read( &MIBLE.buffer, sizeof(MIBLE.buffer) );
+#ifdef DEBUG_TASMOTA_SENSOR
+    memcpy(&MIBLE.streamBuffer, &MIBLE.buffer, sizeof(MIBLE.buffer));
+#endif // DEBUG_TASMOTA_SENSOR
+    MIBLEswapbuf( sizeof(MIBLE.buffer) );
+    // MIBLE_LOG_BUFFER();
+    switch (MIBLE.packetMode) {
+      case 0:
+      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  MIBLE.channel[MIBLE.currentChan] | 0x40);
+      break;
+      case 1:
+      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x17); // "flora" mode 0x17
+      break;
+      case 2:
+      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x72); // "MJ_HT_V1" mode 0x72
+      break;
+    }
+    // DEBUG_SENSOR_LOG(PSTR("MIBLE: LSFR:%x"),_lsfr);
+    // if (_lsfr>254) _lsfr=0;
+  }
+  // DEBUG_SENSOR_LOG(PSTR("MIBLE: did read FIFO"));
+  return true;
+}
+
+#ifdef DEBUG_TASMOTA_SENSOR
+void MIBLEshowBuffer(uint8_t (&buf)[32]){ // we use this only for the 32-byte-FIFO-buffer, so 32 is hardcoded
+  // DEBUG_SENSOR_LOG(PSTR("MIBLE: Buffer: %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c")
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
+  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
+  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
+  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
+  );
+}
+#endif // DEBUG_TASMOTA_SENSOR
+
+/**
+ * @brief change lsfrBuffer content to "wire bit order"
+ * 
+ * @param len Buffer lenght (could be hardcoded to 32)
+ */
+void MIBLEswapbuf(uint8_t len) 
+{
+  uint8_t* buf = (uint8_t*)&MIBLE.buffer;
+  while(len--) {
+    uint8_t a = *buf;
+    uint8_t v = 0;
+    if (a & 0x80) v |= 0x01;
+    if (a & 0x40) v |= 0x02;
+    if (a & 0x20) v |= 0x04;
+    if (a & 0x10) v |= 0x08;
+    if (a & 0x08) v |= 0x10;
+    if (a & 0x04) v |= 0x20;
+    if (a & 0x02) v |= 0x40;
+    if (a & 0x01) v |= 0x80;
+    *(buf++) = v;
+  }
+}
+
+/**
+ * @brief Whiten the packet buffer
+ * 
+ * @param buf   The packet buffer
+ * @param len   Lenght of the packet buffer
+ * @param lfsr  Start lsfr-byte
+ */
+void MIBLEwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
+{
+  while(len--) {
+    uint8_t res = 0;
+    // LFSR in "wire bit order"
+    for (uint8_t i = 1; i; i <<= 1) {
+      if (lfsr & 0x01) {
+        lfsr ^= 0x88;
+        res |= i;
+      }
+      lfsr >>= 1;
+    }
+    *(buf++) ^= res;
+#ifdef DEBUG_TASMOTA_SENSOR
+    MIBLE.lsfrBuffer[31-len] = lfsr;
+#endif //DEBUG_TASMOTA_SENSOR
+  }
+}
+
+
+/**
+ * @brief Set packet mode and fitting PDU-type of the NRF24L01
+ * 
+ * @param _mode The internal packet mode number
+ */
+void MIBLEchangePacketModeTo(uint8_t _mode) {
+  switch(_mode){      
+    case 0: // normal BLE advertisement
+      NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
+    break;
+    case 1: // special flora packet
+      NRF24radio.openReadingPipe(0,0xef3b8730); // 95 fe 71 20 -> flora, needs lfsr 0x17
+    break;
+    case 2: // special MJ_HT_V1 packet
+      NRF24radio.openReadingPipe(0,0xdbcc0cd3); // 95 fe 50 20 -> MJ_HT_V1, needs lsfr 0x72
+    break;
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: Change Mode to %u"),_mode);
+  MIBLE.timer = 0;
+  MIBLE.packetMode = _mode;
+}
+
+/**
+ * @brief Return the slot number of a known sensor or return create new sensor slot
+ * 
+ * @param _serial     BLE address of the sensor
+ * @param _type       Type number of the sensor
+ * @return uint32_t   Known or new slot in the sensors-vector
+ */
+uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){ // if we got an intact packet, the sensor should show up several times
+        MIBLEsensors.at(i).showedUp++;     // count up to the above number ... now we are pretty sure
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.Flora.temp =-1000.0f;
+      _newSensor.Flora.moisture =-1000.0f;
+      _newSensor.Flora.fertility =-1000.0f;
+      _newSensor.Flora.lux = 0xffff;
+      break;
+    case 2:
+      _newSensor.MJ_HT_V1.temp=-1000.0f;
+      _newSensor.MJ_HT_V1.hum=-1.0f;
+      _newSensor.MJ_HT_V1.bat=0xff;
+      break; 
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+/**
+ * @brief Remove "zombie" sensors after a certain amount of time.
+ *        If they showed up less than 3 times, they are probably
+ *        a product of data corruption.
+ */
+void MIBLEpurgeFakeSensors(void){
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(MIBLEsensors.at(i).showedUp<3){
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: remove FAKE sensor at slot: %u"), i);
+      MIBLEsensors.erase(MIBLEsensors.begin()+i);
+    }
+  }
+}
+
+
+void MIBLEhandleFloraPacket(void){
+  if(MIBLE.buffer.floraPacket.T.idWord!=0x9800 && MIBLE.buffer.floraPacket.T.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected Flora packet"));
+    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
+    return;
+  }
+  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.floraPacket.T.serial, 1); // T is not specific, any struct would be possible to use
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+
+  static float _tempFloat;
+  switch(MIBLE.buffer.floraPacket.L.mode) { // we can use any struct with a mode, they are all same at this point
+    case 4:
+    _tempFloat=(float)(MIBLE.buffer.floraPacket.T.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).Flora.temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MIBLE.buffer.floraPacket.T.data );
+    break;
+    case 7:
+    _tempFloat=MIBLE.buffer.floraPacket.L.data;
+    if(_tempFloat<65535){
+        MIBLEsensors.at(_slot).Flora.lux=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U8: %x  U16: %x Lux"), MIBLE.buffer.floraPacket.L.data, MIBLE.buffer.floraPacket.L.data);
+    break;
+    case 8:
+    _tempFloat =(float)MIBLE.buffer.floraPacket.M.data;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).Flora.moisture=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MIBLE.buffer.floraPacket.M.data);
+    break;
+    case 9:
+    _tempFloat=(float)(MIBLE.buffer.floraPacket.F.data);
+    if(_tempFloat<65535){ // ???
+        MIBLEsensors.at(_slot).Flora.fertility=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MIBLE.buffer.floraPacket.F.data);
+    break;
+  }
+}
+
+void MIBLEhandleMJ_HT_V1Packet(void){
+  if(MIBLE.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MIBLE.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected MJ_HT_V1-packet"));
+    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
+    return;
+  }
+  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.MJ_HT_V1Packet.TH.serial, 2); // B would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+
+  static float _tempFloat;
+  switch(MIBLE.buffer.MJ_HT_V1Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 0x0d:
+    _tempFloat=(float)(MIBLE.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).MJ_HT_V1.temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
+    }
+    _tempFloat=(float)(MIBLE.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).MJ_HT_V1.hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MIBLE.buffer.MJ_HT_V1Packet.TH.temp,  MIBLE.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MIBLE.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).MJ_HT_V1.bat = MIBLE.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MIBLE.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+
+}
+
+void MIBLE_EVERY_100_MSECOND() { // Every 100mseconds, with many sensors 50ms could make sense
+  static uint32_t _purgeCounter = 0;
+  if (MIBLE.timer>600){ // Change read mode every n/10 seconds
+    if(++_purgeCounter>8){ // happens every 8 x 600 = 4800 seconds
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: check for FAKE sensors"));
+      MIBLEpurgeFakeSensors();
+    }
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Change packet mode after 60 seconds, MIBLE.timer: %u"),MIBLE.timer);
+    if (MIBLE.packetMode == 2){
+      MIBLEinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
+    }
+    else {
+      MIBLEinitBLE(MIBLE.packetMode + 1);
+    }
+  }
+  MIBLE.timer++;
+
+  if (!MIBLEreceivePacket()){
+    MIBLEhopChannel();
+    NRF24radio.startListening();
+    return;
+  }
+
+  if(MIBLE.buffer.bleAdv.header.uuid==0xfe95){ // XIAOMI-BLE-Packet
+    MIBLE_LOG_BUFFER(MIBLE.streamBuffer);
+    MIBLE_LOG_BUFFER(MIBLE.lsfrBuffer);
+    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Type: %x"), MIBLE.buffer.bleAdv.header.type);
+    switch(MIBLE.buffer.bleAdv.header.type){
+      case 0x2050:
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: MJ_HT_V1 Packet"));
+      break;
+      case 0x1613:case 0x1614:case 0x1615:
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: Flora Packet"));
+      break;
+      default:
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: unknown Packet"));
+      break;
+    }
+  }
+  if (MIBLE.packetMode == 1){ // "flora" mode
+    MIBLEhandleFloraPacket();
+  }
+  if (MIBLE.packetMode == 2){ // "MJ_HT_V1" mode
+    MIBLEhandleMJ_HT_V1Packet();
+    }
+
+    MIBLEhopChannel();
+    NRF24radio.startListening();
+}
+
+const char HTTP_MIBLE_SERIAL[] PROGMEM =
+ "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_BATTERY[] PROGMEM =
+ "{s}%s" " Battery" "{m}%u%%{e}";
+
+const char HTTP_MIBLE_FLORA_DATA[] PROGMEM =
+  "{s}%s" " Fertility" "{m}%sus/cm{e}";
+
+
+void MIBLEShow(bool json)
+{
+  if (json && MIBLEsensors.size()) {
+    for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+      char slave[33];
+      switch(MIBLEsensors.at(i).type){
+        case 1:
+            if(MIBLEsensors.at(i).showedUp < 3){
+              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+              break;
+            }
+            sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveFlora,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+            char temperature_flora[33];
+            dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
+            char lux_flora[33];
+            dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
+            char moisture_flora[33];
+            dtostrfd(MIBLEsensors.at(i).Flora.moisture, 0, moisture_flora);
+            char fertility_flora[33];
+            dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
+            ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+            if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
+              ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature_flora);
+            }
+            if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
+              ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux_flora);
+            }
+            if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
+              ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture_flora);
+            }
+            if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
+              ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility_flora);
+            }
+            ResponseAppend_P(PSTR("}"));
+          break;
+        case 2:
+          if(MIBLEsensors.at(i).showedUp < 3){
+            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+            break;
+          }
+          sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveMJ_HT_V1,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
+          ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+          if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+          }
+          if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).MJ_HT_V1.bat);
+          }
+          ResponseAppend_P(PSTR("}"));
+          break;  
+      }
+    }
+#ifdef USE_WEBSERVER
+  } else {
+      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
+      for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+        switch(MIBLEsensors.at(i).type){
+          case 1:
+            if(MIBLEsensors.at(i).showedUp < 3){
+              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+              break;
+            }
+            char temperature_flora[33];
+            dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
+            char lux_flora[33];
+            dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
+            char fertility_flora[33];
+            dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
+
+            WSContentSend_PD(HTTP_MIBLE_SERIAL, F("Flora "), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+            if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
+              WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveFlora, temperature_flora, TempUnit());
+            }
+            if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
+              WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux); 
+            }
+            if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
+              WSContentSend_PD(HTTP_SNS_MOISTURE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.moisture);
+            }
+            if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
+              WSContentSend_PD(HTTP_MIBLE_FLORA_DATA, MIBLESlaveFlora, fertility_flora);
+            }
+            break;
+          case 2:
+            if(MIBLEsensors.at(i).showedUp < 3){
+              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+              break;
+            }
+            char temperature[33];
+            dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
+
+            WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+            if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){
+              WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveMJ_HT_V1, temperature, TempUnit());
+            }
+            if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1.0f){
+              WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveMJ_HT_V1, humidity);
+            }
+            if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){
+              WSContentSend_PD(HTTP_BATTERY, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).MJ_HT_V1.bat);
+            break;
+        }
+      }
+    }
+  }        
+#endif  // USE_WEBSERVER
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns61(uint8_t function)
+{
+  bool result = false;
+
+  if (NRF24.chipType) {
+    switch (function) {
+      case FUNC_INIT:
+        MIBLEinitBLE(1);
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("MIBLE: started"));
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        MIBLE_EVERY_100_MSECOND();
+        break;
+      case FUNC_JSON_APPEND:
+        MIBLEShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MIBLEShow(0);
+        break;
+#endif  // USE_WEBSERVER
+    }
+  }
+  return result;
+}
+
+#endif  // USE_MIBLE
+#endif  // USE_NRF24
+#endif  // USE_SPI
+

From 21ea26e132e48da9f2e70697fb9aa30a7395ace5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 09:54:58 +0100
Subject: [PATCH 057/403] Update my_user_config.h

---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 57d4d9205..07acca4e6 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -439,7 +439,7 @@
 #endif  // USE_I2C
 
 // -- SPI sensors ---------------------------------
-#define USE_SPI                                  // Hardware SPI using GPIO12(MISO), GPIO13(MOSI) and GPIO14(CLK) in addition to two user selectable GPIOs(CS and DC)
+//#define USE_SPI                                  // Hardware SPI using GPIO12(MISO), GPIO13(MOSI) and GPIO14(CLK) in addition to two user selectable GPIOs(CS and DC)
 
 #ifdef USE_SPI
   // #ifndef USE_DISPLAY

From 406a5a15f50f61b0525fa1d2f39cf5522358e3f7 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 2 Jan 2020 11:23:11 +0100
Subject: [PATCH 058/403] Initial support for shutter button control

New command "ShutterButton<x> <a> <b> <c> <d> <e> <f> <g> <h> <i> <j>" added that allows to assign a tasmota button <x> to control shutter <a>.

Single press button shutter is set to position <b>.  Double press button shutter is set to position <c>. Tripple press button shutter is set to position <d>. Hold button shutter is set to position <e>. Disabling any button action is given by <b> ... <e> equal to "-". Any press of the button while the shutter is moving will immediately stop that shutter.

Global steering of all your shutters at home is supported by MQTT. By any button action an MQTT command can be initiated to the <grouptopic> of the device. For single press button this can be enabled by <f> equal to "1". Disabling is indicated by <f> equal to "0". Double to hold actions are given by <g> ... <i>, correspondingly. When <j> is equal to "0" only "cmnd/<grouptopic>/Shutterposition<y> ..." with <y>=<x> is fired. When <j> is equal to "1" <y>=1...4 is used to control any shutter number of a tasmota device having same <grouptopic>.

Easy setup for an "up" button:
ShutterButton<x> <a> up (same as ShutterButton<x> <a> 100 50 74 100 0 0 0 1 1)
Single press will move shutter up to 100%, double press to 50% and tripple press to 74%. Holding the button for more than the hold time (SetOption32) moves all shutters with same <grouptopic> up to 100%.

Easy setup for an "down" button:
ShutterButton<x> <a> down (same as ShutterButton<x> <a> 0 50 24 0 0 0 0 1 1)
Single press will move shutter down to 0%, double press to 50% and tripple press to 24%. Holding the button for more than the hold time (SetOption32) moves all shutters with same <grouptopic> down to 0%.

Easy setup for an "updown" button:
ShutterButton<x> <a> updown (same as ShutterButton<x> <a> 100 0 50 - 0 0 0 0 0)
Single press will move shutter up to 100%, double press down to 0% and tripple press to 50%. No hold action and no other shutter control by MQTT.
---
 tasmota/i18n.h              |   1 +
 tasmota/settings.h          |   3 +-
 tasmota/xdrv_27_shutter.ino | 195 +++++++++++++++++++++++++++++++++++-
 3 files changed, 196 insertions(+), 3 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 49f1f8496..535ca09d4 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -514,6 +514,7 @@
 
 // Commands xdrv_32_hotplug.ino
 #define D_CMND_HOTPLUG "HotPlug"
+#define D_CMND_SHUTTER_BUTTON "Button"
 
 // Commands xsns_02_analog.ino
 #define D_CMND_ADCPARAM "AdcParam"
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 25bba319b..c8f732d55 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -465,8 +465,9 @@ struct SYSCFG {
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
   uint8_t       hotplug_scan;              // F03 -- scan for hotplug every 'hoplugscan' time
+  uint32_t      shutter_button[MAX_KEYS];  // F04
 
-  uint8_t       free_f04[232];             // F04
+  uint8_t       free_f03[216];             // F13
 
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
   uint32_t      cfg_timestamp;             // FF8
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 457d2870f..b3594d29a 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -34,18 +34,19 @@ uint16_t messwerte[5] = {30,50,70,90,100};
 uint16_t last_execute_step;
 
 enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE,};
 
 const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
   D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
   D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
-  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY;
+  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON;
 
 void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
   &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
-  &CmndShutterFrequency};
+  &CmndShutterFrequency, &CmndShutterButton};
 
 const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"direction\":%d}";
 const char MSG_SHUTTER_POS[] PROGMEM = "SHT: " D_PRFX_SHUTTER " %d: Real. %d, Start: %d, Stop: %d, dir %d, motordelay %d, rtc: %s [s], freq %d";
@@ -496,6 +497,104 @@ void ShutterRelayChanged(void)
 	}
 }
 
+void ShutterButtonHandler(void)
+{
+  uint8_t buttonState = SHT_NOT_PRESSED;
+  uint8_t button = XdrvMailbox.payload;
+  uint8_t press_index;
+  uint32_t button_index = XdrvMailbox.index;
+  uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
+
+  uint16_t loops_per_second = 1000 / Settings.button_debounce;  // ButtonDebounce (50)
+
+  if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+    if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
+        buttonState = SHT_PRESSED_MULTI;
+        press_index = 1;
+    } else {
+      if ((Shutter.direction[shutter_index]) && (Button.press_counter[button_index]==0)) {
+        buttonState = SHT_PRESSED_IMMEDIATE;
+        press_index = 1;
+        Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
+      } else
+        Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+      Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
+    }
+    blinks = 201;
+  }
+
+  if (NOT_PRESSED == button) {
+    Button.hold_timer[button_index] = 0;
+  } else {
+    Button.hold_timer[button_index]++;
+    if (!Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
+      if (Settings.param[P_HOLD_IGNORE] > 0) {         // SetOption40 (0) - Do not ignore button hold
+        if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+          Button.hold_timer[button_index] = 0;         // Reset button hold counter to stay below hold trigger
+          Button.press_counter[button_index] = 0;      // Discard button press to disable functionality
+        }
+      }
+      if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {  // SetOption32 (40) - Button hold
+        if (Button.press_counter[button_index]<99)
+          buttonState = SHT_PRESSED_HOLD;
+        Button.press_counter[button_index] = 0;
+      }
+    }
+  }
+
+  if (!Settings.flag.button_single) {                    // SetOption13 (0) - Allow multi-press
+    if (Button.window_timer[button_index]) {
+      Button.window_timer[button_index]--;
+    } else {
+      if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
+        if (Button.press_counter[button_index]<99) {
+          press_index = Button.press_counter[button_index];
+          buttonState = SHT_PRESSED_MULTI;
+        }
+        Button.press_counter[button_index] = 0;
+      }
+    }
+  }
+
+  if (buttonState != SHT_NOT_PRESSED) {
+    if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
+      if (press_index>3) press_index=3;
+      press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1); 
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, press_index+1);
+      XdrvMailbox.index = shutter_index +1;
+      if (buttonState == SHT_PRESSED_IMMEDIATE) {
+        XdrvMailbox.payload = XdrvMailbox.index;
+        CmndShutterStop();
+      }
+      else {
+        uint8_t position = (Settings.shutter_button[button_index]>>(6*press_index + 2)) & 0x03f;
+        if (position) {
+          if (Shutter.direction[shutter_index]) {
+            XdrvMailbox.payload = XdrvMailbox.index;
+            CmndShutterStop();
+          } else {
+            XdrvMailbox.payload = position = (position-1)<<1;
+            CmndShutterPosition();
+            if ((Settings.shutter_button[button_index]>>(press_index + 26)) & 0x01) {
+              // MQTT broadcast to grouptopic
+              char scommand[CMDSZ];
+              char stopic[TOPSZ];
+              for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+                if ((i==shutter_index) || ((Settings.shutter_button[button_index]>>30) & 0x01)) {
+                  snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
+                  GetGroupTopic_P(stopic, scommand);
+                  Response_P("%d", position);
+                  MqttPublish(stopic, false);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 void ShutterSetPosition(uint8_t device, uint8_t position)
 {
   char svalue[32];                   // Command and number parameter
@@ -676,6 +775,92 @@ void CmndShutterRelay(void)
   }
 }
 
+void CmndShutterButton(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KEYS)) {
+    uint32_t setting = 0;
+    // (setting>>31)&(0x01) : enabled
+    // (setting>>30)&(0x01) : mqtt broadcast to all index
+    // (setting>>29)&(0x01) : mqtt broadcast hold
+    // (setting>>28)&(0x01) : mqtt broadcast tripple press
+    // (setting>>27)&(0x01) : mqtt broadcast double press
+    // (setting>>26)&(0x01) : mqtt broadcast single press
+    // (setting>>20)&(0x3f) : shutter_position hold; 0 disabled, 1..101 == 0..100%
+    // (setting>>14)&(0x3f) : shutter_position tripple press 0 disabled, 1..101 == 0..100%
+    // (setting>> 8)&(0x3f) : shutter_position double press 0 disabled, 1..101 == 0..100%
+    // (setting>> 2)&(0x3f) : shutter_position single press 0 disabled, 1..101 == 0..100%
+    // (setting>> 0)&(0x03) : shutter_index
+    if (XdrvMailbox.data_len > 0) {
+        uint32_t i = 0;
+        bool done = false;
+        char *str_ptr;
+        char* version_dup = strdup(XdrvMailbox.data);  // Duplicate the version_str as strtok_r will modify it.
+        // Loop through the version string, splitting on ' ' seperators.
+        for (char *str = strtok_r(version_dup, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
+          int field;
+          if (str[0] == '-')
+            field = -1;
+          else
+            field = atoi(str);
+
+          switch (i) {
+            case 0:
+              if ((field >= 1) && (field<=4)) {
+                setting |= (1<<31);
+                setting |= field-1;
+              } else
+                done = true;
+            break;
+            case 1:
+              if (!strcmp_P(str, PSTR("up"))) {
+                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20) | (0x18<<26);
+                done = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("down"))) {
+                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20) | (0x18<<26);
+                done = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("updown"))) {
+                setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
+                done = true;
+                break;
+              }
+            case 2:
+            case 3:
+            case 4:
+              if ((field >= -1) && (field<=100))
+                setting |= (((field>>1)+1)<<(i*6 + (2-6)));
+            break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+              if (field==1)
+                setting |= (1<<(i + (26-5)));
+            break;
+          }
+          if (done) break;
+        }
+        free(version_dup);
+        Settings.shutter_button[XdrvMailbox.index-1] = setting;
+        ResponseCmndIdxChar(XdrvMailbox.data);
+      } else {
+        setting = Settings.shutter_button[XdrvMailbox.index-1];
+
+        char setting_chr[30] = "0";
+        if ((setting>>31)&(0x01)) {
+          snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d %d %d %d %d %d"), ((setting>> 0)&(0x03))+1, (((setting>> 2)&(0x3f))-1)<<1, (((setting>> 8)&(0x3f))-1)<<1, (((setting>>14)&(0x3f))-1)<<1, (((setting>>20)&(0x3f))-1)<<1, (setting>>26)&(0x01), (setting>>27)&(0x01),  (setting>>28)&(0x01), (setting>>29)&(0x01), (setting>>30)&(0x01));
+          for (uint32_t i=0 ; i < sizeof(setting_chr)-1 ; i++) {
+            if ((setting_chr[i]=='-') && (setting_chr[i+1])) setting_chr[++i]='-'; // dirty '-x' to '--'
+            if (!setting_chr[i]) break;
+          }
+        }
+        ResponseCmndIdxChar(setting_chr);
+      }
+   }
+}
+
 void CmndShutterSetHalfway(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
@@ -809,6 +994,12 @@ bool Xdrv27(uint8_t function)
           ExecuteCommandPower(i+1, 0, SRC_SHUTTER);
         }
       break;
+      case FUNC_BUTTON_PRESSED:
+        if (Settings.shutter_button[XdrvMailbox.index] & (1<<31)) {
+          ShutterButtonHandler();
+          result = true;
+        }
+      break;
     }
   }
   return result;

From f2a89605af0179b51ee23458ec6da5fb0725608c Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 2 Jan 2020 12:37:07 +0100
Subject: [PATCH 059/403] Add response to ShutterCalibration command

When ShutterCalibration<x> is called without any arguments no response was given before that allows to read out setting like for other commands. Workaround was to call ShutterRelay<x> <y>.
---
 tasmota/xdrv_27_shutter.ino | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 457d2870f..bc2e3066d 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -731,20 +731,24 @@ void CmndShutterCalibration(void)  // ????
         // Loop through the version string, splitting on '.' seperators.
         for (char *str = strtok_r(version_dup, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
           int field = atoi(str);
-          // The fields in a version string can only range from 1-255.
+          // The fields in a version string can only range from 1-30000.
           // and following value must be higher than previous one
-          if ((field <= 0) || (field > 255) ||  ( (i>0) && (field <= messwerte[i-1]) ) ) {
-            free(version_dup);
+          if ((field <= 0) || (field > 30000) ||  ( (i>0) && (field <= messwerte[i-1]) ) ) {
             break;
           }
           messwerte[i] = field;
         }
+        free(version_dup);
         for (i=0 ; i < 5 ; i++) {
-          Settings.shuttercoeff[i][XdrvMailbox.index -1] = messwerte[i] * 1000 / messwerte[4];
+          Settings.shuttercoeff[i][XdrvMailbox.index -1] = (uint32_t)messwerte[i] * 1000 / messwerte[4];
           AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
         }
         ShutterInit();
         ResponseCmndIdxChar(XdrvMailbox.data);
+    } else {
+      char setting_chr[30] = "0";
+      snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);
+      ResponseCmndIdxChar(setting_chr);
     }
   }
 }

From a9a5c33327b867f173acc51d0d3321e5d9a1e0a2 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 2 Jan 2020 12:46:12 +0100
Subject: [PATCH 060/403] Wrong shutter percentage reporting

With calibrated shutters and ShutterPosition<x> 100 the resulting position may not be 100. This is due to 2 issues. a) percentage is calculated wrong from position due to numerical precision. b) real_position and subsequently position after movement is slightly smaller than max_position.

a) is fixed here by avoiding calculation when position is equal to calibration point
b) open, not fixed here. Issue further depends on start_position which makes it hard to reproduce. Maybe 'stop_position_delta=20' results is real_position not reaching max_position.
---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 457d2870f..326e792fb 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -132,7 +132,7 @@ uint8_t ShutterRealToPercentPosition(int32_t realpos, uint8_t index)
     uint16_t realpercent;
 
     for (uint8_t i=0 ; i < 5 ; i++) {
-      if (realpos > Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
+      if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
         realpercent = Settings.shuttercoeff[i][index] /10;
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP1: %d, %% %d, coeff %d"), realpercent, realpos, Shutter_Open_Max[index] * calibrate_pos[i+1] / 100);
       } else {

From 7ea9204425130d203d866636915fb981a1f26a6b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 14:17:49 +0100
Subject: [PATCH 061/403] Add some info to Prometheus file

---
 tasmota/xsns_91_prometheus.ino | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tasmota/xsns_91_prometheus.ino b/tasmota/xsns_91_prometheus.ino
index 2cc3d3cfe..ff18f4e70 100644
--- a/tasmota/xsns_91_prometheus.ino
+++ b/tasmota/xsns_91_prometheus.ino
@@ -34,6 +34,7 @@ void HandleMetrics(void)
 
   WSContentBegin(200, CT_PLAIN);
 
+
   char parameter[FLOATSZ];
 
   if (global_temperature != 9999) {
@@ -57,11 +58,25 @@ void HandleMetrics(void)
   dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
   WSContentSend_P(PSTR("# TYPE active_power guage\nactive_power %s\n"), parameter);
   dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE energy_daily counter\nenergy_daily %s\n"), parameter);
+  WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
   dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
   WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
 #endif
 
+/*
+  // Alternative method using the complete sensor JSON data
+  // For prometheus it may need to be decoded to # TYPE messages
+  mqtt_data[0] = '\0';
+  MqttShowSensor();
+  char json[strlen(mqtt_data) +1];
+  snprintf_P(json, sizeof(json), mqtt_data);
+
+  // Do your Prometheus specific processing here.
+  // Look at function DisplayAnalyzeJson() in file xdrv_13_display.ino as an example how to decode the JSON message
+
+  WSContentSend_P(json);
+*/
+
   WSContentEnd();
 }
 

From f2b91117cda39aad0daec9bcdd0983720ea5f8f6 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 2 Jan 2020 14:46:31 +0100
Subject: [PATCH 062/403] rc-switch fix and support for Conrad_RS-200 protocol

There is a tiny bug hat prevents the usage for "Conrad RS-200" based devices. The RS-200 protocol does not repeat packets that often. One need already to detect the end of the first packet. The gap between two transmission are not handled right when RF packet is received first time.

a) 1st gap detection fixed
b) Furthermore the "Conrad RS-200" protocol is added.
---
 lib/rc-switch-2.6.2.13/RCSwitch.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/rc-switch-2.6.2.13/RCSwitch.cpp b/lib/rc-switch-2.6.2.13/RCSwitch.cpp
index 1a6736e24..76ad3a133 100644
--- a/lib/rc-switch-2.6.2.13/RCSwitch.cpp
+++ b/lib/rc-switch-2.6.2.13/RCSwitch.cpp
@@ -78,8 +78,10 @@ static const RCSwitch::Protocol PROGMEM proto[] = {
   { 100, { 30, 71 }, {  4, 11 }, {  9,  6 }, false },    // protocol 3
   { 380, {  1,  6 }, {  1,  3 }, {  3,  1 }, false },    // protocol 4
   { 500, {  6, 14 }, {  1,  2 }, {  2,  1 }, false },    // protocol 5
-  { 450, { 23,  1 }, {  1,  2 }, {  2,  1 }, true },      // protocol 6 (HT6P20B)
-  { 150, {  2, 62 }, {  1,  6 }, {  6,  1 }, false }     // protocol 7 (HS2303-PT, i. e. used in AUKEY Remote)
+  { 450, { 23,  1 }, {  1,  2 }, {  2,  1 }, true },     // protocol 6 (HT6P20B)
+  { 150, {  2, 62 }, {  1,  6 }, {  6,  1 }, false },    // protocol 7 (HS2303-PT, i. e. used in AUKEY Remote)
+  { 200, {  3, 130}, {  7, 16 }, {  3,  16}, false},     // protocol 8 Conrad RS-200 RX
+  { 200, { 130, 7 }, {  16, 7 }, { 16,  3 }, true}       // protocol 9 Conrad RS-200 TX
 };
 
 enum {
@@ -669,7 +671,7 @@ void RECEIVE_ATTR RCSwitch::handleInterrupt() {
   if (duration > RCSwitch::nSeparationLimit) {
     // A long stretch without signal level change occurred. This could
     // be the gap between two transmission.
-    if (diff(duration, RCSwitch::timings[0]) < 200) {
+    if ((repeatCount==0) || (diff(duration, RCSwitch::timings[0]) < 200)) {
       // This long signal is close in length to the long signal which
       // started the previously recorded timings; this suggests that
       // it may indeed by a a gap between two transmissions (we assume

From 044fae2a6e75a4a3e9a105af060b7cf3a9f94137 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 14:47:33 +0100
Subject: [PATCH 063/403] Update settings.h

---
 tasmota/settings.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index c8f732d55..4596ecad7 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -465,10 +465,11 @@ struct SYSCFG {
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
   uint8_t       hotplug_scan;              // F03 -- scan for hotplug every 'hoplugscan' time
-  uint32_t      shutter_button[MAX_KEYS];  // F04
-
-  uint8_t       free_f03[216];             // F13
+  uint8_t       reserved1;                 // F04
 
+  uint8_t       free_f05[215];             // F05
+  
+  uint32_t      shutter_button[MAX_KEYS];  // FDC
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
   uint32_t      cfg_timestamp;             // FF8
   uint32_t      cfg_crc32;                 // FFC

From 1e0550e750e259899b81c44aa3d628b1058053aa Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 15:12:59 +0100
Subject: [PATCH 064/403] Add command ShutterButton <parameters>

Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
---
 RELEASENOTES.md      | 1 +
 tasmota/CHANGELOG.md | 1 +
 tasmota/i18n.h       | 2 +-
 tasmota/settings.h   | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0c3bcc9a7..6705d76b4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -62,6 +62,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
+- Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 07a487b93..09fe8e5d0 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
 - Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
+- Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 535ca09d4..f5fa90e82 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -511,10 +511,10 @@
 #define D_CMND_SHUTTER_CLIBRATION "Calibration"
 #define D_CMND_SHUTTER_MOTORDELAY "MotorDelay"
 #define D_CMND_SHUTTER_FREQUENCY "Frequency"
+#define D_CMND_SHUTTER_BUTTON "Button"
 
 // Commands xdrv_32_hotplug.ino
 #define D_CMND_HOTPLUG "HotPlug"
-#define D_CMND_SHUTTER_BUTTON "Button"
 
 // Commands xsns_02_analog.ino
 #define D_CMND_ADCPARAM "AdcParam"
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 4596ecad7..7dae8a586 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -464,11 +464,11 @@ struct SYSCFG {
   uint8_t       shutter_accuracy;          // F00
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
-  uint8_t       hotplug_scan;              // F03 -- scan for hotplug every 'hoplugscan' time
-  uint8_t       reserved1;                 // F04
+  uint8_t       hotplug_scan;              // F03
+  uint8_t       reserved1;                 // F04 - reserved for s-hadinger
 
   uint8_t       free_f05[215];             // F05
-  
+
   uint32_t      shutter_button[MAX_KEYS];  // FDC
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
   uint32_t      cfg_timestamp;             // FF8

From 04a672cf4b3c78a0819ba8054345dd1646a40a24 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 2 Jan 2020 15:34:17 +0100
Subject: [PATCH 065/403] Add link for decode-config.py

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 35abdb7e6..e6e157efb 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ People helping to keep the show on the road:
 - Adrian Scillato for his (security)fixes and implementing and maintaining KNX
 - Gennaro Tortone for implementing and maintaining Eastron drivers
 - Raymond Mouthaan for managing Wemos Wiki information
-- Norbert Richter for his decode-config.py tool
+- Norbert Richter for his [decode-config.py](https://github.com/tasmota/decode-config) tool
 - Andre Thomas for providing [thehackbox](http://thehackbox.org/tasmota/) OTA support and daily development builds
 - Joel Stein, digiblur and Shantur Rathore for their Tuya research and driver
 - Frogmore42 and Jason2866 for providing many issue answers

From c4f6a359a729fda0a5ce0d76e52d8f38f6906ce8 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 16:58:20 +0100
Subject: [PATCH 066/403] Add experimental support for NRF24L01 as BLE-bridge

Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
---
 RELEASENOTES.md              |  1 +
 tasmota/CHANGELOG.md         |  1 +
 tasmota/my_user_config.h     | 30 +++++++++++++-----------------
 tasmota/xdrv_33_nrf24l01.ino | 14 +++++++++-----
 tasmota/xsns_61_MI_BLE.ino   | 36 ++++++++++++++++++++----------------
 5 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6705d76b4..a96235e31 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -69,3 +69,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add Zigbee attribute decoder for Xiaomi Aqara Cube
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
 - Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
+- Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 09fe8e5d0..676822799 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
 - Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
+- Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 07acca4e6..06e444658 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -440,25 +440,21 @@
 
 // -- SPI sensors ---------------------------------
 //#define USE_SPI                                  // Hardware SPI using GPIO12(MISO), GPIO13(MOSI) and GPIO14(CLK) in addition to two user selectable GPIOs(CS and DC)
-
 #ifdef USE_SPI
-  // #ifndef USE_DISPLAY
-  // #define USE_DISPLAY                            // Add SPI Display support for 320x240 and 480x320 TFT
-  // #endif
-  //   #define USE_DISPLAY_ILI9341                  // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
-//    #define USE_DISPLAY_EPAPER_29                // [DisplayModel 5] Enable e-paper 2.9 inch display (+19k code)
-//    #define USE_DISPLAY_EPAPER_42                // [DisplayModel 6] Enable e-paper 4.2 inch display
-//    #define USE_DISPLAY_ILI9488                  // [DisplayModel 8] [I2cDriver38] (Touch)
-//    #define USE_DISPLAY_SSD1351                  // [DisplayModel 9]
-//    #define USE_DISPLAY_RA8876                   // [DisplayModel 10] [I2cDriver39] (Touch)
-  
-  #define USE_NRF24                                // add support for NRF24L01(+), (+2k3 of code)
-    #ifdef USE_DISPLAY
-      #undef USE_DISPLAY                           // Display drivers should be disabled
+//  #define USE_NRF24                              // Add SPI support for NRF24L01(+) (+2k6 code)
+  #ifdef USE_NRF24
+    #define USE_MIBLE                            // BLE-bridge for some Mijia-BLE-sensors (+4k7 code)
+  #else
+    #ifndef USE_DISPLAY
+      #define USE_DISPLAY                        // Add SPI Display support for 320x240 and 480x320 TFT
     #endif
-    #ifdef USE_NRF24
-      #define USE_MIBLE                            // BLE-bridge for some Mijia-BLE-sensors (+4k6 of code)
-  #endif // USE_NRF24
+      #define USE_DISPLAY_ILI9341                // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
+//      #define USE_DISPLAY_EPAPER_29              // [DisplayModel 5] Enable e-paper 2.9 inch display (+19k code)
+//      #define USE_DISPLAY_EPAPER_42              // [DisplayModel 6] Enable e-paper 4.2 inch display
+//      #define USE_DISPLAY_ILI9488                // [DisplayModel 8] [I2cDriver38] (Touch)
+//      #define USE_DISPLAY_SSD1351                // [DisplayModel 9]
+//      #define USE_DISPLAY_RA8876                 // [DisplayModel 10] [I2cDriver39] (Touch)
+  #endif  // USE_NRF24
 #endif  // USE_SPI
 
 // -- Serial sensors ------------------------------
diff --git a/tasmota/xdrv_33_nrf24l01.ino b/tasmota/xdrv_33_nrf24l01.ino
index 092fd85a5..b6eecce32 100644
--- a/tasmota/xdrv_33_nrf24l01.ino
+++ b/tasmota/xdrv_33_nrf24l01.ino
@@ -1,14 +1,18 @@
 /*
-  nrf24l01 support for Tasmota
-  Copyright (C) 2019  Christian Baars and Theo Arends
+  xdrv_33_nrf24l01.ino - nrf24l01 support for Tasmota
+
+  Copyright (C) 2020  Christian Baars and Theo Arends
+
   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/>.
 
@@ -54,7 +58,7 @@ struct {
 
 RF24 NRF24radio;
 
-bool NRF24initRadio() 
+bool NRF24initRadio()
 {
   NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
   NRF24radio.powerUp();
@@ -68,7 +72,7 @@ bool NRF24initRadio()
 }
 
 bool NRF24Detect(void)
-{  
+{
   if  ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
     SPI.pins(SCK,MOSI,MISO,-1);
     if(NRF24initRadio()){
@@ -80,7 +84,7 @@ bool NRF24Detect(void)
       }
       return true;
     }
-  } 
+  }
   return false;
 }
 
diff --git a/tasmota/xsns_61_MI_BLE.ino b/tasmota/xsns_61_MI_BLE.ino
index 52e49c89a..025730a9b 100644
--- a/tasmota/xsns_61_MI_BLE.ino
+++ b/tasmota/xsns_61_MI_BLE.ino
@@ -1,14 +1,18 @@
 /*
-  MI-BLE-sensors via nrf24l01 support for Tasmota
-  Copyright (C) 2019  Christian Baars and Theo Arends
+  xsns_61_Ml_BLE.ino - MI-BLE-sensors via nrf24l01 support for Tasmota
+
+  Copyright (C) 2020  Christian Baars and Theo Arends
+
   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/>.
 
@@ -39,7 +43,7 @@
 * MIBLE
 * BLE-Sniffer/Bridge for MIJIA/XIAOMI Temperatur/Humidity-Sensor, Mi Flora
 *
-* Usage: Configure NRF24 
+* Usage: Configure NRF24
 \*********************************************************************************************/
 
 #define XSNS_61             61
@@ -131,7 +135,7 @@ union MJ_HT_V1Packet_t {    // related to the whole 32-byte-packet/buffer
       uint8_t valueTen;
       uint8_t effectiveDataLength; // 4
       uint16_t temp;
-      uint16_t hum; 
+      uint16_t hum;
   } TH;   // mode 0d
       struct {
       uint8_t padding[3];
@@ -246,7 +250,7 @@ std::vector<mi_sensor_t> MIBLEsensors;
 /********************************************************************************************/
 
 
-bool MIBLEinitBLE(uint8_t _mode) 
+bool MIBLEinitBLE(uint8_t _mode)
 {
   NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
   NRF24radio.setAutoAck(false);
@@ -280,7 +284,7 @@ void MIBLEhopChannel()
 
 /**
  * @brief Read out FIFO-buffer, swap buffer and whiten
- * 
+ *
  * @return true - If something is in the buffer
  * @return false - Nothing is in the buffer
  */
@@ -335,10 +339,10 @@ void MIBLEshowBuffer(uint8_t (&buf)[32]){ // we use this only for the 32-byte-FI
 
 /**
  * @brief change lsfrBuffer content to "wire bit order"
- * 
+ *
  * @param len Buffer lenght (could be hardcoded to 32)
  */
-void MIBLEswapbuf(uint8_t len) 
+void MIBLEswapbuf(uint8_t len)
 {
   uint8_t* buf = (uint8_t*)&MIBLE.buffer;
   while(len--) {
@@ -358,7 +362,7 @@ void MIBLEswapbuf(uint8_t len)
 
 /**
  * @brief Whiten the packet buffer
- * 
+ *
  * @param buf   The packet buffer
  * @param len   Lenght of the packet buffer
  * @param lfsr  Start lsfr-byte
@@ -385,11 +389,11 @@ void MIBLEwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
 
 /**
  * @brief Set packet mode and fitting PDU-type of the NRF24L01
- * 
+ *
  * @param _mode The internal packet mode number
  */
 void MIBLEchangePacketModeTo(uint8_t _mode) {
-  switch(_mode){      
+  switch(_mode){
     case 0: // normal BLE advertisement
       NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
     break;
@@ -407,7 +411,7 @@ void MIBLEchangePacketModeTo(uint8_t _mode) {
 
 /**
  * @brief Return the slot number of a known sensor or return create new sensor slot
- * 
+ *
  * @param _serial     BLE address of the sensor
  * @param _type       Type number of the sensor
  * @return uint32_t   Known or new slot in the sensors-vector
@@ -442,7 +446,7 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
       _newSensor.MJ_HT_V1.temp=-1000.0f;
       _newSensor.MJ_HT_V1.hum=-1.0f;
       _newSensor.MJ_HT_V1.bat=0xff;
-      break; 
+      break;
     default:
       break;
     }
@@ -659,7 +663,7 @@ void MIBLEShow(bool json)
             ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).MJ_HT_V1.bat);
           }
           ResponseAppend_P(PSTR("}"));
-          break;  
+          break;
       }
     }
 #ifdef USE_WEBSERVER
@@ -684,7 +688,7 @@ void MIBLEShow(bool json)
               WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveFlora, temperature_flora, TempUnit());
             }
             if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
-              WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux); 
+              WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux);
             }
             if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
               WSContentSend_PD(HTTP_SNS_MOISTURE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.moisture);
@@ -716,7 +720,7 @@ void MIBLEShow(bool json)
         }
       }
     }
-  }        
+  }
 #endif  // USE_WEBSERVER
 }
 

From 894950ca4ee20fb951a154336eff0b3fe5c8ff0f Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 2 Jan 2020 17:40:00 +0100
Subject: [PATCH 067/403] Fix wrong JSON sensor message

---
 tasmota/xsns_61_MI_BLE.ino | 101 +++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/tasmota/xsns_61_MI_BLE.ino b/tasmota/xsns_61_MI_BLE.ino
index 025730a9b..88983e533 100644
--- a/tasmota/xsns_61_MI_BLE.ino
+++ b/tasmota/xsns_61_MI_BLE.ino
@@ -609,8 +609,10 @@ const char HTTP_MIBLE_FLORA_DATA[] PROGMEM =
 
 void MIBLEShow(bool json)
 {
-  if (json && MIBLEsensors.size()) {
-    for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+  if (json) {
+    if (!MIBLEsensors.size()) { return; }
+
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
       char slave[33];
       switch(MIBLEsensors.at(i).type){
         case 1:
@@ -668,55 +670,58 @@ void MIBLEShow(bool json)
     }
 #ifdef USE_WEBSERVER
   } else {
-      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
-      for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-        switch(MIBLEsensors.at(i).type){
-          case 1:
-            if(MIBLEsensors.at(i).showedUp < 3){
-              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-              break;
-            }
-            char temperature_flora[33];
-            dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
-            char lux_flora[33];
-            dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
-            char fertility_flora[33];
-            dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
+    WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
 
-            WSContentSend_PD(HTTP_MIBLE_SERIAL, F("Flora "), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-            if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
-              WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveFlora, temperature_flora, TempUnit());
-            }
-            if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
-              WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux);
-            }
-            if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
-              WSContentSend_PD(HTTP_SNS_MOISTURE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.moisture);
-            }
-            if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
-              WSContentSend_PD(HTTP_MIBLE_FLORA_DATA, MIBLESlaveFlora, fertility_flora);
-            }
-            break;
-          case 2:
-            if(MIBLEsensors.at(i).showedUp < 3){
-              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-              break;
-            }
-            char temperature[33];
-            dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
-            char humidity[33];
-            dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
+    if (!MIBLEsensors.size()) { return; }
 
-            WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-            if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){
-              WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveMJ_HT_V1, temperature, TempUnit());
-            }
-            if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1.0f){
-              WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveMJ_HT_V1, humidity);
-            }
-            if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){
-              WSContentSend_PD(HTTP_BATTERY, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).MJ_HT_V1.bat);
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      switch(MIBLEsensors.at(i).type){
+        case 1:
+          if(MIBLEsensors.at(i).showedUp < 3){
+            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
             break;
+          }
+          char temperature_flora[33];
+          dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
+          char lux_flora[33];
+          dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
+          char fertility_flora[33];
+          dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
+
+          WSContentSend_PD(HTTP_MIBLE_SERIAL, F("Flora "), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+          if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveFlora, temperature_flora, TempUnit());
+          }
+          if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux);
+          }
+          if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_SNS_MOISTURE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.moisture);
+          }
+          if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_MIBLE_FLORA_DATA, MIBLESlaveFlora, fertility_flora);
+          }
+          break;
+        case 2:
+          if(MIBLEsensors.at(i).showedUp < 3){
+            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+            break;
+          }
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
+
+          WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+          if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveMJ_HT_V1, temperature, TempUnit());
+          }
+          if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1.0f){
+            WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveMJ_HT_V1, humidity);
+          }
+          if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).MJ_HT_V1.bat);
+          break;
         }
       }
     }

From 356e0059090207416884bdade26c0c1a4a6772d4 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Thu, 2 Jan 2020 22:38:18 +0200
Subject: [PATCH 068/403] BMPxxx - Enter power on state before deep sleep

---
 tasmota/xsns_09_bmp.ino | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tasmota/xsns_09_bmp.ino b/tasmota/xsns_09_bmp.ino
index 8f49e1bea..4190a675c 100644
--- a/tasmota/xsns_09_bmp.ino
+++ b/tasmota/xsns_09_bmp.ino
@@ -40,6 +40,10 @@
 
 #define BMP_REGISTER_CHIPID  0xD0
 
+#define BMP_REGISTER_RESET   0xE0 // Register to reset to power on defaults (used for sleep)
+
+#define BMP_CMND_RESET       0xB6 // I2C Parameter for RESET to put BMP into reset state
+
 #define BMP_MAX_SENSORS      2
 
 const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
@@ -601,6 +605,25 @@ void BmpShow(bool json)
   }
 }
 
+#ifdef USE_DEEPSLEEP
+
+void BMP_EnterSleep(void)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    switch (bmp_sensors[bmp_idx].bmp_type) {
+      case BMP180_CHIPID:
+      case BMP280_CHIPID:
+      case BME280_CHIPID:
+        I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP_REGISTER_RESET, BMP_CMND_RESET);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+#endif // USE_DEEPSLEEP
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -627,6 +650,11 @@ bool Xsns09(uint8_t function)
         BmpShow(0);
         break;
 #endif  // USE_WEBSERVER
+#ifdef USE_DEEPSLEEP
+      case FUNC_SAVE_BEFORE_RESTART:
+        BMP_EnterSleep();
+        break;
+#endif USE_DEEPSLEEP
     }
   }
   return result;

From 6a54eef50ab8c4fc4a287a1c036d13bd402ab262 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Thu, 2 Jan 2020 22:40:14 +0200
Subject: [PATCH 069/403] - Add support to BMP driver to enter reset state
 (sleep enable)

- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
---
 tasmota/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 676822799..36d7be89e 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
+- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
 
 ### 8.1.0.1 20191225
 

From d3d60141397710798a4aeb73193f2a664d4fdf71 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Thu, 2 Jan 2020 22:41:16 +0200
Subject: [PATCH 070/403] - Add support to BMP driver to enter reset state
 (sleep enable)

- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
---
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a96235e31..0335fc6e6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -70,3 +70,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
 - Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
 - Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
+- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota

From 06f053c1723cd374d01f18ca7e2f547dba4c28f1 Mon Sep 17 00:00:00 2001
From: Andre Thomas <470015+andrethomas@users.noreply.github.com>
Date: Thu, 2 Jan 2020 22:51:15 +0200
Subject: [PATCH 071/403] - Add support to BMP driver to enter reset state
 (sleep enable)

---
 tasmota/xsns_09_bmp.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xsns_09_bmp.ino b/tasmota/xsns_09_bmp.ino
index 4190a675c..057dac9df 100644
--- a/tasmota/xsns_09_bmp.ino
+++ b/tasmota/xsns_09_bmp.ino
@@ -654,7 +654,7 @@ bool Xsns09(uint8_t function)
       case FUNC_SAVE_BEFORE_RESTART:
         BMP_EnterSleep();
         break;
-#endif USE_DEEPSLEEP
+#endif // USE_DEEPSLEEP
     }
   }
   return result;

From 0ab3ba6fabd0b49834be27675ea8384a28bdeca8 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Thu, 2 Jan 2020 22:36:27 +0100
Subject: [PATCH 072/403] Fix wrong gamma correction for Module 48 lights (PWM5
 for CT)

---
 tasmota/CHANGELOG.md      |  1 +
 tasmota/xdrv_04_light.ino | 66 +++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 676822799..fff26d0c8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
+- Fix wrong gamma correction for Module 48 lights (PWM5 for CT)
 
 ### 8.1.0.1 20191225
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 9566c4c92..600642bfe 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1709,9 +1709,6 @@ void LightAnimate(void)
         calcGammaMultiChannels(cur_col_10);
       } else {
         calcGammaBulbs(cur_col_10);
-        if (PHILIPS == my_module_type) {
-          calcGammaCTPwm(cur_col_10);
-        }
 
         // Now see if we need to mix RGB and True White
         // Valid only for LST_RGBW, LST_RGBWC, rgbwwTable[4] is zero, and white is zero (see doc)
@@ -1941,26 +1938,6 @@ void LightSetOutputs(const uint16_t *cur_col_10) {
   XdrvMailbox.topic = tmp_topic;
 }
 
-// Do specific computation is SetOption73 is on, Color Temp is a separate PWM channel
-void calcGammaCTPwm(uint16_t cur_col_10[5]) {
-  // Xiaomi Philips bulbs follow a different scheme:
-  uint8_t cold, warm;   // channel 1 is the color tone, mapped to cold channel (0..255)
-  light_state.getCW(&cold, &warm);
-  // channels for white are always the last two channels
-  uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
-  uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
-  // overall brightness
-  uint16_t pxBri10 = cur_col_10[cw0] + cur_col_10[cw1];
-  if (pxBri10 > 1023) { pxBri10 = 1023; }
-  cur_col_10[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 1023);   //
-  // channel 0=intensity, channel1=temperature
-  if (Settings.light_correction) { // gamma correction
-    cur_col_10[cw0] = ledGamma10_10(pxBri10);    // 10 bits gamma correction
-  } else {
-    cur_col_10[cw0] = pxBri10;  // no gamma, extend to 10 bits
-  }
-}
-
 // Just apply basic Gamma to each channel
 void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
   // Apply gamma correction for 8 and 10 bits resolutions, if needed
@@ -1976,22 +1953,35 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
   if (Settings.light_correction) {
     // First apply combined correction to the overall white power
     if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
-      uint8_t w_idx[2] = {0, 1};        // if LST_COLDWARM, channels 0 and 1
-      if (LST_RGBWC == Light.subtype) { // if LST_RGBWC, channels 3 and 4
-        w_idx[0] = 3;
-        w_idx[1] = 4;
-      }
-      uint16_t white_bri10 = cur_col_10[w_idx[0]] + cur_col_10[w_idx[1]];
-      // if sum of both channels is > 255, then channels are probablu uncorrelated
-      if (white_bri10 <= 1023) {
-        // we calculate the gamma corrected sum of CW + WW
-        uint16_t white_bri_10bits = ledGamma10_10(white_bri10);
-        // then we split the total energy among the cold and warm leds
-        cur_col_10[w_idx[0]] = changeUIntScale(cur_col_10[w_idx[0]], 0, white_bri10, 0, white_bri_10bits);
-        cur_col_10[w_idx[1]] = changeUIntScale(cur_col_10[w_idx[1]], 0, white_bri10, 0, white_bri_10bits);
+      // channels for white are always the last two channels
+      uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
+      uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
+      uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];   // cumulated brightness
+      uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;    // max 1023
+
+      if (PHILIPS == my_module_type) {   // channel 1 is the color tone, mapped to cold channel (0..255)
+        // Xiaomi Philips bulbs follow a different scheme:
+        uint8_t cold, warm;
+        light_state.getCW(&cold, &warm);
+        cur_col_10[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 1023);   //
+        // channel 0=intensity, channel1=temperature
+        if (Settings.light_correction) { // gamma correction
+          cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);    // 10 bits gamma correction
+        } else {
+          cur_col_10[cw0] = white_bri10_1023;  // no gamma, extend to 10 bits
+        }
       } else {
-        cur_col_10[w_idx[0]] = ledGamma10_10(cur_col_10[w_idx[0]]);
-        cur_col_10[w_idx[1]] = ledGamma10_10(cur_col_10[w_idx[1]]);
+        // if sum of both channels is > 255, then channels are probably uncorrelated
+        if (white_bri10 <= 1031) {      // take a margin of 8 above 1023 to account for rounding errors
+          // we calculate the gamma corrected sum of CW + WW
+          uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
+          // then we split the total energy among the cold and warm leds
+          cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
+          cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
+        } else {
+          cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
+          cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
+        }
       }
     }
     // then apply gamma correction to RGB channels

From 5895637e9ab98c13fb653e0153e67522a50d7f23 Mon Sep 17 00:00:00 2001
From: Mark Furland <mtfurlan@i3detroit.org>
Date: Thu, 2 Jan 2020 19:26:34 -0500
Subject: [PATCH 073/403] fix: http-uploader.py cross platform support,
 espupload.py executable

---
 pio/espupload.py     | 0
 pio/http-uploader.py | 8 ++------
 2 files changed, 2 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 pio/espupload.py

diff --git a/pio/espupload.py b/pio/espupload.py
old mode 100644
new mode 100755
diff --git a/pio/http-uploader.py b/pio/http-uploader.py
index dd563177f..88d5a23ce 100644
--- a/pio/http-uploader.py
+++ b/pio/http-uploader.py
@@ -1,4 +1,5 @@
 Import("env")
+import os
 
 # pio < 4.0.0
 # from base64 import b64decode
@@ -7,11 +8,6 @@ Import("env")
 # env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES")
 
 # pio >= 4.0.0
-env.Replace(UPLOADER="pio\espupload.py")
+env.Replace(UPLOADER=os.path.join("pio", "espupload.py"))
 env.Replace(UPLOADERFLAGS="")
 env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES")
-
-'''
-env.Replace(UPLOADCMD="pio\espupload.py -f $SOURCES") # Windows
-env.Replace(UPLOADCMD="pio/espupload.py -f $SOURCES") # Linux
-'''
\ No newline at end of file

From 8078939d416db992d0e8c30c90d3443dba6aab6d Mon Sep 17 00:00:00 2001
From: Mark Furland <mtfurlan@i3detroit.org>
Date: Thu, 2 Jan 2020 19:49:11 -0500
Subject: [PATCH 074/403] fix(platformio_override_sample): extra_scripts
 doesn't deal well with commas

If you put commas in the extra_scripts, it seems to just ignore the script after the comma?
Newlines work fine though
---
 platformio_override_sample.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 9ac4084cd..45ab66897 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -59,12 +59,14 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 ; *** Upload file to OTA server using SCP
 ;upload_port               = user@host:/path
 ;extra_scripts             = ${scripts_defaults.extra_scripts}
-;                            pio/strip-floats.py, pio/sftp-uploader.py
+;                            pio/strip-floats.py
+;                            pio/sftp-uploader.py
 
 ; *** Upload file to OTA server in folder api/arduino using HTTP
 ;upload_port               = domus1:80/api/upload-arduino.php
 ;extra_scripts             = ${scripts_defaults.extra_scripts}
-;                            pio/strip-floats.py, pio/http-uploader.py
+;                            pio/strip-floats.py
+;                            pio/http-uploader.py
 
 [core_active]
 ; Select one core set for platform and build_flags

From d15969bd1ed855035e1cb462d7c80c4749039dfa Mon Sep 17 00:00:00 2001
From: Jan Penninkhof <jan@penninkhof.com>
Date: Fri, 3 Jan 2020 10:07:42 +0100
Subject: [PATCH 075/403] Reset before initialisation of the SSD1306 when OLED
 reset pin is set

If an OLED Reset pin has been selected using the PIN configuration, it makes sense to also send a reset signal to this pin before initialization of the display. The current value 0 doesn't send this signal, not even when a reset pin has been selected. Hence the change of value 0 into reset_pin >= 0. If no reset pin was set, the value of this variable is -1.
---
 tasmota/xdsp_02_ssd1306.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdsp_02_ssd1306.ino b/tasmota/xdsp_02_ssd1306.ino
index 8cf938c6c..6060686b9 100644
--- a/tasmota/xdsp_02_ssd1306.ino
+++ b/tasmota/xdsp_02_ssd1306.ino
@@ -83,7 +83,7 @@ void SSD1306InitDriver(void)
     // init renderer
     // oled1306 = new Adafruit_SSD1306(SSD1306_LCDWIDTH,SSD1306_LCDHEIGHT);
     oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin);
-    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], 0);
+    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], reset_pin >= 0);
     renderer = oled1306;
     renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font);
     renderer->setTextColor(1,0);

From 8c2ff7237ec3a1ee1f427095ba944f17374871e8 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 3 Jan 2020 16:50:56 +0100
Subject: [PATCH 076/403] Fix Arduino_OTA compile error

Fix Arduino_OTA compile error (#7413)
---
 tasmota/support_tasmota.ino | 12 +++++++++++-
 tasmota/tasmota.ino         |  5 +----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 57ce2dd32..b20e5ef26 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1000,7 +1000,9 @@ void ArduinoOTAInit(void)
 {
   ArduinoOTA.setPort(8266);
   ArduinoOTA.setHostname(my_hostname);
-  if (strlen(SettingsText(SET_WEBPWD))) { ArduinoOTA.setPassword(SettingsText(SET_WEBPWD)); }
+  if (strlen(SettingsText(SET_WEBPWD))) {
+    ArduinoOTA.setPassword(SettingsText(SET_WEBPWD));
+  }
 
   ArduinoOTA.onStart([]()
   {
@@ -1059,6 +1061,14 @@ void ArduinoOTAInit(void)
   ArduinoOTA.begin();
   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266"));
 }
+
+void ArduinoOtaLoop(void)
+{
+  MDNS.update();
+  ArduinoOTA.handle();
+  // Once OTA is triggered, only handle that and dont do other stuff. (otherwise it fails)
+  while (arduino_ota_triggered) { ArduinoOTA.handle(); }
+}
 #endif  // USE_ARDUINO_OTA
 
 /********************************************************************************************/
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 95c9285a2..fe90b1a33 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -405,10 +405,7 @@ void loop(void)
   if (!serial_local) { SerialInput(); }
 
 #ifdef USE_ARDUINO_OTA
-  MDNS.update();
-  ArduinoOTA.handle();
-  // Once OTA is triggered, only handle that and dont do other stuff. (otherwise it fails)
-  while (arduino_ota_triggered) ArduinoOTA.handle();
+  ArduinoOtaLoop();
 #endif  // USE_ARDUINO_OTA
 
   uint32_t my_activity = millis() - my_sleep;

From b82d1fdcc3fdf53d33becb38ed2b93ad4a022152 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 3 Jan 2020 17:07:40 +0100
Subject: [PATCH 077/403] Move all Rotary interrupt code to iRAM

Move all Rotary interrupt code to iRAM (#7410)
---
 tasmota/support_rotary.ino | 49 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/tasmota/support_rotary.ino b/tasmota/support_rotary.ino
index a7c9860c1..cb6782da1 100644
--- a/tasmota/support_rotary.ino
+++ b/tasmota/support_rotary.ino
@@ -36,41 +36,34 @@ struct ROTARY {
 
 /********************************************************************************************/
 
-void update_position(void)
-{
-  uint8_t s;
-
-  /*
-   * https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h
-   */
-
-  s = Rotary.state & 3;
-  if (digitalRead(pin[GPIO_ROT1A])) s |= 4;
-  if (digitalRead(pin[GPIO_ROT1B])) s |= 8;
-  switch (s) {
-    case 0: case 5: case 10: case 15:
-      break;
-    case 1: case 7: case 8: case 14:
-      Rotary.position++; break;
-    case 2: case 4: case 11: case 13:
-      Rotary.position--; break;
-    case 3: case 12:
-      Rotary.position = Rotary.position + 2; break;
-    default:
-      Rotary.position = Rotary.position - 2; break;
-  }
-  Rotary.state = (s >> 2);
-}
-
 #ifndef ARDUINO_ESP8266_RELEASE_2_3_0      // Fix core 2.5.x ISR not in IRAM Exception
 void update_rotary(void) ICACHE_RAM_ATTR;
 #endif  // ARDUINO_ESP8266_RELEASE_2_3_0
 
 void update_rotary(void)
 {
-  if (MI_DESK_LAMP == my_module_type){
+  if (MI_DESK_LAMP == my_module_type) {
     if (LightPower()) {
-      update_position();
+      /*
+      * https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h
+      */
+
+      uint8_t s = Rotary.state & 3;
+      if (digitalRead(pin[GPIO_ROT1A])) { s |= 4; }
+      if (digitalRead(pin[GPIO_ROT1B])) { s |= 8; }
+      switch (s) {
+        case 0: case 5: case 10: case 15:
+          break;
+        case 1: case 7: case 8: case 14:
+          Rotary.position++; break;
+        case 2: case 4: case 11: case 13:
+          Rotary.position--; break;
+        case 3: case 12:
+          Rotary.position = Rotary.position + 2; break;
+        default:
+          Rotary.position = Rotary.position - 2; break;
+      }
+      Rotary.state = (s >> 2);
     }
   }
 }

From 4f74c702702a510555d1caa2fc83307dce1cde1a Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Fri, 3 Jan 2020 17:57:47 +0100
Subject: [PATCH 078/403] Add LightPowerIRAM() for rotary interrupt handler

---
 tasmota/support_rotary.ino |  2 +-
 tasmota/xdrv_04_light.ino  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tasmota/support_rotary.ino b/tasmota/support_rotary.ino
index cb6782da1..071b15b92 100644
--- a/tasmota/support_rotary.ino
+++ b/tasmota/support_rotary.ino
@@ -43,7 +43,7 @@ void update_rotary(void) ICACHE_RAM_ATTR;
 void update_rotary(void)
 {
   if (MI_DESK_LAMP == my_module_type) {
-    if (LightPower()) {
+    if (LightPowerIRAM()) {
       /*
       * https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h
       */
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 600642bfe..736d46e5a 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -277,6 +277,16 @@ power_t LightPower(void)
   return Light.power;                     // Make external
 }
 
+// IRAM variant for rotary
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0      // Fix core 2.5.x ISR not in IRAM Exception
+power_t LightPowerIRAM(void) ICACHE_RAM_ATTR;
+#endif  // ARDUINO_ESP8266_RELEASE_2_3_0
+
+power_t LightPowerIRAM(void)
+{
+  return Light.power;                     // Make external
+}
+
 uint8_t LightDevice(void)
 {
   return Light.device;                    // Make external

From 1b451e722f38a4e3bd659c9737019af03dec4347 Mon Sep 17 00:00:00 2001
From: kabongsteve <kabong.steve@gmail.com>
Date: Sat, 4 Jan 2020 12:36:05 +1100
Subject: [PATCH 079/403] Improve multiple shutter operation and MQTT

---
 tasmota/i18n.h              |  2 +
 tasmota/xdrv_27_shutter.ino | 84 +++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index f5fa90e82..fb54edd4a 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -500,6 +500,8 @@
 #define D_PRFX_SHUTTER "Shutter"
 #define D_CMND_SHUTTER_OPEN "Open"
 #define D_CMND_SHUTTER_CLOSE "Close"
+#define D_CMND_SHUTTER_UP "Up"
+#define D_CMND_SHUTTER_DOWN "Down"
 #define D_CMND_SHUTTER_STOP "Stop"
 #define D_CMND_SHUTTER_POSITION "Position"
 #define D_CMND_SHUTTER_OPENTIME "OpenDuration"
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index aa7d13e3c..afa07e35d 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -242,6 +242,39 @@ void ShutterInit(void)
   }
 }
 
+
+void ShutterReportPosition(bool always = false)
+{
+  uint16_t shutter_moving = 0;
+  Response_P(PSTR("{"));
+  for (uint8_t i = 0; i < shutters_present; i++) {
+    //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
+    uint8_t position =  ShutterRealToPercentPosition(Shutter.real_position[i], i);
+    if (Shutter.direction[i] != 0) {
+      char stemp2[10];
+      uint8_t position =  ShutterRealToPercentPosition(Shutter.real_position[i], i);
+      dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
+      shutter_moving = 1;
+      //Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
+      AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
+    }
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
+    if (i < shutters_present - 1)
+      ResponseAppend_P(PSTR(", "));
+  }
+  ResponseJsonEnd();
+  if (always || shutter_moving == 1) {
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+  }
+  if (rules_flag.shutter_moving > shutter_moving) {
+    rules_flag.shutter_moved = 1;
+  } else {
+    rules_flag.shutter_moved = 0;
+  }
+  rules_flag.shutter_moving = shutter_moving;
+  //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
+}
+
 void ShutterUpdatePosition(void)
 {
 
@@ -344,11 +377,7 @@ void ShutterUpdatePosition(void)
         MqttPublish(stopic, Settings.flag.mqtt_power_retain);  // CMND_POWERRETAIN
 
         Shutter.direction[i] = 0;
-        uint8_t position =  Settings.shutter_invert[i] ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
-        Response_P(PSTR("{"));
-        ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, 0 /*Shutter.direction[i]*/);
-        ResponseJsonEnd();
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+        ShutterReportPosition(true);
         XdrvRulesProcess();
       }
     }
@@ -415,33 +444,6 @@ void ShutterWaitForMotorStop(uint8_t i)
   }
 }
 
-void ShutterReportPosition(void)
-{
-  uint16_t shutter_moving = 0;
-  for (uint8_t i = 0; i < shutters_present; i++) {
-    //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
-    if (Shutter.direction[i] != 0) {
-      char stemp2[10];
-      uint8_t position =  ShutterRealToPercentPosition(Shutter.real_position[i], i);
-      dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
-      shutter_moving = 1;
-      //Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
-      AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
-      Response_P(PSTR("{"));
-      ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
-      ResponseJsonEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-    }
-  }
-  if (rules_flag.shutter_moving > shutter_moving) {
-    rules_flag.shutter_moved = 1;
-  } else {
-    rules_flag.shutter_moved = 0;
-  }
-  rules_flag.shutter_moving = shutter_moving;
-  //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
-}
-
 int32_t ShutterCounterBasedPosition(uint8 i)
 {
   return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
@@ -660,10 +662,20 @@ void CmndShutterPosition(void)
 
     // value 0 with data_len > 0 can mean Open
     if (XdrvMailbox.data_len > 1 &&  XdrvMailbox.payload <=0) {
-      UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-      if (!strcmp(XdrvMailbox.data,"UP"))   { CmndShutterOpen(); return; }
-      if (!strcmp(XdrvMailbox.data,"DOWN")) { CmndShutterClose(); return; }
-      if (!strcmp(XdrvMailbox.data,"STOP")) { CmndShutterStop(); return; }
+      //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN)) { 
+        CmndShutterOpen(); 
+        return; 
+      }
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE)) {
+        CmndShutterClose(); 
+        return; 
+      }
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP)) { 
+        XdrvMailbox.payload = -99; 
+        CmndShutterStop(); 
+        return; 
+      }
     }
 
     int8_t target_pos_percent = XdrvMailbox.payload < 0 ? 0 : (XdrvMailbox.payload > 100 ? 100 : XdrvMailbox.payload);

From aa665c1439f37b5bf5e48432b83111f9a1791144 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 4 Jan 2020 11:01:44 +0100
Subject: [PATCH 080/403] Add SetOption82 to limit the CT range for Alexa to
 200..380

---
 tasmota/CHANGELOG.md               |   1 +
 tasmota/settings.h                 |   2 +-
 tasmota/tasmota.h                  |   2 +-
 tasmota/xdrv_01_webserver.ino      |   2 +-
 tasmota/xdrv_04_light.ino          | 108 ++++++++++++++++++++---------
 tasmota/xdrv_12_home_assistant.ino |   2 +-
 tasmota/xdrv_20_hue.ino            |   2 +-
 7 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b1687e5e3..a087ea907 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
 - Fix wrong gamma correction for Module 48 lights (PWM5 for CT)
+- Add SetOption82 to limit the CT range for Alexa to 200..380
 
 ### 8.1.0.1 20191225
 
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 7dae8a586..b46c0dd48 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -101,7 +101,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
 typedef union {                            // Restricted by MISRA-C Rule 18.4 but so useful...
   uint32_t data;                           // Allow bit manipulation using SetOption
   struct {                                 // SetOption82 .. SetOption113
-    uint32_t spare00 : 1;
+    uint32_t alexa_ct_range : 1;         // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
     uint32_t spare01 : 1;
     uint32_t spare02 : 1;
     uint32_t spare03 : 1;
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 4ed6ad7ef..32a85c80a 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -259,7 +259,7 @@ enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, D
 enum Ws2812ClockIndex { WS_SECOND, WS_MINUTE, WS_HOUR, WS_MARKER };
 enum Ws2812Color { WS_RED, WS_GREEN, WS_BLUE };
 
-enum LightSubtypes { LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB,   LST_RGBW, LST_RGBWC, LST_MAX=5 };   // Do not insert new fields
+enum LightSubtypes { LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB,   LST_RGBW, LST_RGBCW, LST_MAX=5 };   // Do not insert new fields
 enum LightTypes    { LT_BASIC, LT_PWM1,    LT_PWM2,      LT_PWM3,   LT_PWM4,  LT_PWM5,  LT_PWM6, LT_PWM7,
                      LT_NU8,   LT_SERIAL1, LT_SERIAL2,   LT_RGB,    LT_RGBW,  LT_RGBWC, LT_NU14, LT_NU15 };  // Do not insert new fields
 
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index d5b838f0f..eb14933d4 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1032,7 +1032,7 @@ void HandleRoot(void)
     if (light_type) {
       uint8_t light_subtype = light_type &7;
       if (!Settings.flag3.pwm_multi_channels) {  // SetOption68 0 - Enable multi-channels PWM instead of Color PWM
-        if ((LST_COLDWARM == light_subtype) || (LST_RGBWC == light_subtype)) {
+        if ((LST_COLDWARM == light_subtype) || (LST_RGBCW == light_subtype)) {
 
           WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // Cold Warm
             "a",             // a - Unique HTML id
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 736d46e5a..3eacfbcaa 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -79,6 +79,7 @@
  *  .b For white bulbs with Cold/Warm colortone, use changeCW() or changeCT()
  *     to change color-tone. Set overall brightness separately.
  *     Color-tone temperature can range from 153 (Cold) to 500 (Warm).
+ *     SetOption82 can expand the rendering from 200-380 due to Alexa reduced range.
  *     CW channels are stored at full brightness to avoid rounding errors.
  *  .c Alternatively, you can set all 5 channels at once with changeChannels(),
  *     in this case it will also set the corresponding brightness.
@@ -160,6 +161,13 @@ struct LCwColor {
 const uint8_t MAX_FIXED_COLD_WARM = 4;
 const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
 
+// CT min and max
+const uint16_t CT_MIN = 153;          // 6500K
+const uint16_t CT_MAX = 500;          // 2000K
+// Ranges used for Alexa
+const uint16_t CT_MIN_ALEXA = 200;    // also 5000K
+const uint16_t CT_MAX_ALEXA = 380;    // also 2600K
+
 // New version of Gamma correction compute
 // Instead of a table, we do a multi-linear approximation, which is close enough
 // At low levels, the slope is a bit higher than actual gamma, to make changes smoother
@@ -344,12 +352,19 @@ class LightStateClass {
     uint8_t  _b = 255;  // 0..255
 
     uint8_t  _subtype = 0;  // local copy of Light.subtype, if we need multiple lights
-    uint16_t _ct = 153;  // 153..500, default to 153 (cold white)
+    uint16_t _ct = CT_MIN;  // 153..500, default to 153 (cold white)
     uint8_t  _wc = 255;  // white cold channel
     uint8_t  _ww = 0;    // white warm channel
     uint8_t  _briCT = 255;
 
     uint8_t  _color_mode = LCM_RGB; // RGB by default
+    // the CT range below represents the rendered range,
+    // This is due to Alexa whose CT range is 199..383
+    // Hence setting Min=200 and Max=380 makes Alexa use the full range
+    // Please note that you can still set CT to 153..500, but any
+    // value below _ct_min_range or above _ct_max_range not change the CT
+    uint16_t _ct_min_range = CT_MIN;   // the minimum CT rendered range
+    uint16_t _ct_max_range = CT_MAX;   // the maximum CT rendered range
 
   public:
     LightStateClass() {
@@ -367,7 +382,7 @@ class LightStateClass {
     //   LST_COLDWARM:  LCM_CT
     //   LST_RGB:       LCM_RGB
     //   LST_RGBW:      LCM_RGB, LCM_CT or LCM_BOTH
-    //   LST_RGBWC:     LCM_RGB, LCM_CT or LCM_BOTH
+    //   LST_RGBCW:     LCM_RGB, LCM_CT or LCM_BOTH
     uint8_t setColorMode(uint8_t cm) {
       uint8_t prev_cm = _color_mode;
       if (cm < LCM_RGB) { cm = LCM_RGB; }
@@ -387,7 +402,7 @@ class LightStateClass {
           break;
 
         case LST_RGBW:
-        case LST_RGBWC:
+        case LST_RGBCW:
           _color_mode = cm;
           break;
       }
@@ -498,8 +513,23 @@ class LightStateClass {
       return BriToDimmer(bri);
     }
 
-    inline uint16_t getCT() {
-      return _ct; // 153..500
+    inline uint16_t getCT() const {
+      return _ct; // 153..500, or CT_MIN..CT_MAX
+    }
+
+    // get the CT value within the range into a 10 bits 0..1023 value
+    uint16_t getCT10bits() const {
+      return changeUIntScale(_ct, _ct_min_range, _ct_max_range, 0, 1023);
+    }
+
+    inline void setCTRange(uint16_t ct_min_range, uint16_t ct_max_range) {
+      _ct_min_range = ct_min_range;
+      _ct_max_range = ct_max_range;
+    }
+
+    inline void getCTRange(uint16_t *ct_min_range, uint16_t *ct_max_range) const {
+      if (ct_min_range) { *ct_min_range = _ct_min_range; }
+      if (ct_max_range) { *ct_max_range = _ct_max_range; }
     }
 
     // get current color in XY format
@@ -546,8 +576,8 @@ class LightStateClass {
         // disable ct mode
         setColorMode(LCM_RGB);  // try deactivating CT mode, setColorMode() will check which is legal
       } else {
-        ct = (ct < 153 ? 153 : (ct > 500 ? 500 : ct));
-        _ww = changeUIntScale(ct, 153, 500, 0, 255);
+        ct = (ct < CT_MIN ? CT_MIN : (ct > CT_MAX ? CT_MAX : ct));
+        _ww = changeUIntScale(ct, _ct_min_range, _ct_max_range, 0, 255);
         _wc = 255 - _ww;
         _ct = ct;
         addCTMode();
@@ -587,7 +617,7 @@ class LightStateClass {
           _ww = changeUIntScale(w, 0, max, 0, 255);
           _wc = changeUIntScale(c, 0, max, 0, 255);
         }
-        _ct = changeUIntScale(w, 0, sum, 153, 500);
+        _ct = changeUIntScale(w, 0, sum, _ct_min_range, _ct_max_range);
         addCTMode();   // activate CT mode if needed
         if (_color_mode & LCM_CT) { _briCT = free_range ? max : (sum > 255 ? 255 : sum); }
       }
@@ -860,6 +890,15 @@ public:
     return prev;
   }
 
+  void setAlexaCTRange(bool alexa_ct_range) {
+    // depending on SetOption82, full or limited CT range
+    if (alexa_ct_range) {
+      _state->setCTRange(CT_MIN_ALEXA, CT_MAX_ALEXA);   // 200..380
+    } else {
+      _state->setCTRange(CT_MIN, CT_MAX);               // 153..500
+    }
+  }
+
   inline bool isCTRGBLinked() {
     return _ct_rgb_linked;
   }
@@ -926,8 +965,8 @@ public:
   void changeCTB(uint16_t new_ct, uint8_t briCT) {
     /* Color Temperature (https://developers.meethue.com/documentation/core-concepts)
      *
-     * ct = 153 = 2000K = Warm = CCWW = 00FF
-     * ct = 500 = 6500K = Cold = CCWW = FF00
+     * ct = 153 = 6500K = Cold = CCWW = FF00
+     * ct = 500 = 2000K = Warm = CCWW = 00FF
      */
     // don't set CT if not supported
     if ((LST_COLDWARM != Light.subtype) && (LST_RGBW > Light.subtype)) {
@@ -1012,8 +1051,8 @@ public:
         current_color[1] = w;
         break;
       case LST_RGBW:
-      case LST_RGBWC:
-        if (LST_RGBWC == Light.subtype) {
+      case LST_RGBCW:
+        if (LST_RGBCW == Light.subtype) {
           current_color[3] = c;
           current_color[4] = w;
         } else {
@@ -1235,6 +1274,7 @@ void LightInit(void)
 
   light_controller.setSubType(Light.subtype);
   light_controller.loadSettings();
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
 
   if (LST_SINGLE == Light.subtype) {
     Settings.light_color[0] = 255;      // One channel only supports Dimmer but needs max color
@@ -1353,11 +1393,11 @@ void LightSetColorTemp(uint16_t ct)
 {
 /* Color Temperature (https://developers.meethue.com/documentation/core-concepts)
  *
- * ct = 153 = 2000K = Warm = CCWW = 00FF
- * ct = 500 = 6500K = Cold = CCWW = FF00
+ * ct = 153 = 6500K = Cold = CCWW = FF00
+ * ct = 600 = 2000K = Warm = CCWW = 00FF
  */
   // don't set CT if not supported
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBWC != Light.subtype)) {
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
     return;
   }
   light_controller.changeCTB(ct, light_state.getBriCT());
@@ -1366,7 +1406,7 @@ void LightSetColorTemp(uint16_t ct)
 uint16_t LightGetColorTemp(void)
 {
   // don't calculate CT for unsupported devices
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBWC != Light.subtype)) {
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
     return 0;
   }
   return (light_state.getColorMode() & LCM_CT) ? light_state.getCT() : 0;
@@ -1451,7 +1491,7 @@ void LightState(uint8_t append)
         ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
       }
       // Add CT
-      if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
         ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
       }
       // Add status for each channel
@@ -1625,6 +1665,8 @@ void LightAnimate(void)
   uint16_t light_still_on = 0;
   bool power_off = false;
 
+  // make sure we update CT range in case SetOption82 was changed
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
   Light.strip_timer_counter++;
 
   // set sleep parameter: either settings,
@@ -1721,7 +1763,7 @@ void LightAnimate(void)
         calcGammaBulbs(cur_col_10);
 
         // Now see if we need to mix RGB and True White
-        // Valid only for LST_RGBW, LST_RGBWC, rgbwwTable[4] is zero, and white is zero (see doc)
+        // Valid only for LST_RGBW, LST_RGBCW, rgbwwTable[4] is zero, and white is zero (see doc)
         if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
           uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
           for (uint32_t i=0; i<3; i++) {
@@ -1736,10 +1778,10 @@ void LightAnimate(void)
           if (LST_RGBW == Light.subtype) {
             // we simply set the white channel
             cur_col_10[3] = white_10;
-          } else {  // LST_RGBWC
+          } else {  // LST_RGBCW
             // we distribute white between cold and warm according to CT value
-            uint32_t ct = light_state.getCT();
-            cur_col_10[4] = changeUIntScale(ct, 153, 500, 0, white_10);
+            uint32_t ct = light_state.getCT10bits();
+            cur_col_10[4] = changeUIntScale(ct, 0, 1023, 0, white_10);
             cur_col_10[3] = white_10 - cur_col_10[4];
           }
         }
@@ -1793,7 +1835,7 @@ bool isChannelGammaCorrected(uint32_t channel) {
 
   if (PHILIPS == my_module_type) {
     if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }   // PMW reserved for CT
-    if ((LST_RGBWC == Light.subtype) && (4 == channel)) { return false; }   // PMW reserved for CT
+    if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }   // PMW reserved for CT
   }
   return true;
 }
@@ -1962,7 +2004,7 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
   // Apply gamma correction for 8 and 10 bits resolutions, if needed
   if (Settings.light_correction) {
     // First apply combined correction to the overall white power
-    if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
+    if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
       // channels for white are always the last two channels
       uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
       uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
@@ -1971,9 +2013,7 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
 
       if (PHILIPS == my_module_type) {   // channel 1 is the color tone, mapped to cold channel (0..255)
         // Xiaomi Philips bulbs follow a different scheme:
-        uint8_t cold, warm;
-        light_state.getCW(&cold, &warm);
-        cur_col_10[cw1] = changeUIntScale(cold, 0, cold + warm, 0, 1023);   //
+        cur_col_10[cw1] = light_state.getCT10bits();
         // channel 0=intensity, channel1=temperature
         if (Settings.light_correction) { // gamma correction
           cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);    // 10 bits gamma correction
@@ -2001,7 +2041,7 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
       }
     }
     // If RGBW or Single channel, also adjust White channel
-    if ((LST_COLDWARM != Light.subtype) && (LST_RGBWC != Light.subtype)) {
+    if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
       cur_col_10[3] = ledGamma10_10(cur_col_10[3]);
     }
   }
@@ -2072,7 +2112,7 @@ bool LightColorEntry(char *buffer, uint32_t buffer_length)
       memcpy_P(&Light.entry_color, &kFixedColdWarm[value -200], 2);
       entry_type = 1;                               // Hexadecimal
     }
-    else if (LST_RGBWC == Light.subtype) {
+    else if (LST_RGBCW == Light.subtype) {
       memcpy_P(&Light.entry_color[3], &kFixedColdWarm[value -200], 2);
       entry_type = 1;                               // Hexadecimal
     }
@@ -2288,17 +2328,17 @@ void CmndWakeup(void)
 void CmndColorTemperature(void)
 {
   if (Light.pwm_multi_channels) { return; }
-  if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) { // ColorTemp
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) { // ColorTemp
     uint32_t ct = light_state.getCT();
     if (1 == XdrvMailbox.data_len) {
       if ('+' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct > (500-34)) ? 500 : ct + 34;
+        XdrvMailbox.payload = (ct > (CT_MAX-34)) ? CT_MAX : ct + 34;
       }
       else if ('-' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct < (153+34)) ? 153 : ct - 34;
+        XdrvMailbox.payload = (ct < (CT_MIN+34)) ? CT_MIN : ct - 34;
       }
     }
-    if ((XdrvMailbox.payload >= 153) && (XdrvMailbox.payload <= 500)) {  // https://developers.meethue.com/documentation/core-concepts
+    if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {  // https://developers.meethue.com/documentation/core-concepts
       light_controller.changeCTB(XdrvMailbox.payload, light_state.getBri());
       LightPreparePower(2);
     } else {
@@ -2394,7 +2434,7 @@ void CmndRgbwwTable(void)
 {
   if ((XdrvMailbox.data_len > 0)) {
     if (strstr(XdrvMailbox.data, ",") != nullptr) {  // Command with up to 5 comma separated parameters
-      for (uint32_t i = 0; i < LST_RGBWC; i++) {
+      for (uint32_t i = 0; i < LST_RGBCW; i++) {
         char *substr;
 
         if (0 == i) {
@@ -2411,7 +2451,7 @@ void CmndRgbwwTable(void)
   }
   char scolor[LIGHT_COLOR_SIZE];
   scolor[0] = '\0';
-  for (uint32_t i = 0; i < LST_RGBWC; i++) {
+  for (uint32_t i = 0; i < LST_RGBCW; i++) {
     snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
   }
   ResponseCmndIdxChar(scolor);
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 03aeb3e6a..5babe4abb 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -292,7 +292,7 @@ void HAssAnnounceRelayLight(void)
           Shorten(&white_temp_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
         }
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
           char *color_temp_command_topic = stemp1;
 
           GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
diff --git a/tasmota/xdrv_20_hue.ino b/tasmota/xdrv_20_hue.ino
index 1df6543ac..37de3a902 100644
--- a/tasmota/xdrv_20_hue.ino
+++ b/tasmota/xdrv_20_hue.ino
@@ -231,7 +231,7 @@ void HueConfig(String *path)
 }
 
 // device is forced to CT mode instead of HSB
-// only makes sense for LST_COLDWARM, LST_RGBW and LST_RGBWC
+// only makes sense for LST_COLDWARM, LST_RGBW and LST_RGBCW
 bool g_gotct = false;
 
 // store previously set values from the Alexa app

From 8be7dbe235cff24600344b560721f5148c0fbf81 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 4 Jan 2020 14:20:41 +0100
Subject: [PATCH 081/403] Fix shutter JSON

---
 tasmota/xdrv_27_shutter.ino | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index afa07e35d..0cc9f846a 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -242,7 +242,6 @@ void ShutterInit(void)
   }
 }
 
-
 void ShutterReportPosition(bool always = false)
 {
   uint16_t shutter_moving = 0;
@@ -258,13 +257,15 @@ void ShutterReportPosition(bool always = false)
       //Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
       AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
     }
+
+    if (i) { ResponseAppend_P(PSTR(",")); }
     ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
-    if (i < shutters_present - 1)
-      ResponseAppend_P(PSTR(", "));
+//    if (i < shutters_present - 1)
+//      ResponseAppend_P(PSTR(", "));
   }
   ResponseJsonEnd();
-  if (always || shutter_moving == 1) {
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+  if (always || (1 == shutter_moving)) {
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_PRFX_SHUTTER));
   }
   if (rules_flag.shutter_moving > shutter_moving) {
     rules_flag.shutter_moved = 1;
@@ -561,7 +562,7 @@ void ShutterButtonHandler(void)
   if (buttonState != SHT_NOT_PRESSED) {
     if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
       if (press_index>3) press_index=3;
-      press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1); 
+      press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, press_index+1);
       XdrvMailbox.index = shutter_index +1;
       if (buttonState == SHT_PRESSED_IMMEDIATE) {
@@ -663,18 +664,18 @@ void CmndShutterPosition(void)
     // value 0 with data_len > 0 can mean Open
     if (XdrvMailbox.data_len > 1 &&  XdrvMailbox.payload <=0) {
       //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN)) { 
-        CmndShutterOpen(); 
-        return; 
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN)) {
+        CmndShutterOpen();
+        return;
       }
       if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE)) {
-        CmndShutterClose(); 
-        return; 
+        CmndShutterClose();
+        return;
       }
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP)) { 
-        XdrvMailbox.payload = -99; 
-        CmndShutterStop(); 
-        return; 
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP)) {
+        XdrvMailbox.payload = -99;
+        CmndShutterStop();
+        return;
       }
     }
 

From 49137ec79f0b1d1facf89e3731831e4b70c9a73a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 4 Jan 2020 15:09:57 +0100
Subject: [PATCH 082/403] Refactor shutters

---
 tasmota/xdrv_27_shutter.ino | 131 ++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 67 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 0cc9f846a..2b2028fdf 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -48,8 +48,7 @@ void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
   &CmndShutterFrequency, &CmndShutterButton};
 
-const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"direction\":%d}";
-const char MSG_SHUTTER_POS[] PROGMEM = "SHT: " D_PRFX_SHUTTER " %d: Real. %d, Start: %d, Stop: %d, dir %d, motordelay %d, rtc: %s [s], freq %d";
+const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
 
 #include <Ticker.h>
 
@@ -77,6 +76,14 @@ struct SHUTTER {
   int32_t accelerator[MAX_SHUTTERS];         // speed of ramp-up, ramp down of shutter
 } Shutter;
 
+void ShutterLogPos(uint32_t i)
+{
+  char stemp2[10];
+  dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
+    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency);
+}
+
 void ShutterRtc50mS(void)
 {
   for (uint32_t i = 0; i < shutters_present; i++) {
@@ -90,28 +97,27 @@ void ShutterRtc50mS(void)
   }
 }
 
-
-int32_t ShutterPercentToRealPosition(uint8_t percent,uint8_t index)
+int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 {
 	if (Settings.shutter_set50percent[index] != 50) {
-    return  percent <= 5 ?  Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
+    return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
 	} else {
     uint32_t realpos;
     // check against DIV 0
-    for (uint8_t j=0 ; j < 5 ; j++) {
-      if (Settings.shuttercoeff[j][index] == 0) {
+    for (uint32_t j = 0; j < 5; j++) {
+      if (0 == Settings.shuttercoeff[j][index]) {
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
-        for (uint8_t k=0 ; k < 5 ; k++) {
+        for (uint32_t k = 0; k < 5; k++) {
           Settings.shuttercoeff[k][index] = messwerte[k] * 1000 / messwerte[4];
         }
       }
     }
-    for (uint8_t i=0 ; i < 5 ; i++) {
-      if (percent*10 > Settings.shuttercoeff[i][index]) {
+    for (uint32_t i = 0; i < 5; i++) {
+      if ((percent * 10) > Settings.shuttercoeff[i][index]) {
         realpos = Shutter.open_max[index] * calibrate_pos[i+1] / 100;
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP1: %d, %% %d, coeff %d"), realpos, percent, Settings.shuttercoeff[i][index]);
       } else {
-        if ( i == 0) {
+        if (0 == i) {
           realpos =  percent * Shutter.open_max[index] * calibrate_pos[i+1] / Settings.shuttercoeff[i][index] / 10;
         } else {
           //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
@@ -121,24 +127,24 @@ int32_t ShutterPercentToRealPosition(uint8_t percent,uint8_t index)
         break;
       }
     }
-		return  realpos;
+		return realpos;
 	}
 }
 
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint8_t index)
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
 {
 	if (Settings.shutter_set50percent[index] != 50) {
-		return Settings.shuttercoeff[2][index] * 5 > realpos ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
+		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
 	} else {
     uint16_t realpercent;
 
-    for (uint8_t i=0 ; i < 5 ; i++) {
+    for (uint32_t i = 0; i < 5; i++) {
       if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
         realpercent = Settings.shuttercoeff[i][index] /10;
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP1: %d, %% %d, coeff %d"), realpercent, realpos, Shutter_Open_Max[index] * calibrate_pos[i+1] / 100);
       } else {
-        if ( i == 0) {
-          realpercent =  ( realpos - (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * Settings.shuttercoeff[i][index] / calibrate_pos[i+1] / Shutter.open_max[index];
+        if (0 == i) {
+          realpercent = ( realpos - (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * Settings.shuttercoeff[i][index] / calibrate_pos[i+1] / Shutter.open_max[index];
         } else {
           //uint16_t addon = ( realpos - (Shutter_Open_Max[index] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]) / (calibrate_pos[i+1] - calibrate_pos[i])/ Shutter_Open_Max[index];
           //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
@@ -152,7 +158,6 @@ uint8_t ShutterRealToPercentPosition(int32_t realpos, uint8_t index)
   }
 }
 
-
 void ShutterInit(void)
 {
   shutters_present = 0;
@@ -168,7 +173,7 @@ void ShutterInit(void)
   for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
     // set startrelay to 1 on first init, but only to shutter 1. 90% usecase
     Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i ==  0? 1 : Settings.shutter_startrelay[i]);
-    if (Settings.shutter_startrelay[i] && Settings.shutter_startrelay[i] <9) {
+    if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
       shutters_present++;
 
       // Determine shutter types
@@ -176,7 +181,7 @@ void ShutterInit(void)
 
       for (uint32_t j = 0; j < MAX_INTERLOCKS * Settings.flag.interlock; j++) {  // CMND_INTERLOCK - Enable/disable interlock
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Interlock state i=%d %d, flag %d, , shuttermask %d, maskedIL %d"),i, Settings.interlock[i], Settings.flag.interlock,Shutter.mask, Settings.interlock[i]&Shutter.mask);
-        if (Settings.interlock[j] && Settings.interlock[j] & Shutter.mask) {
+        if (Settings.interlock[j] && (Settings.interlock[j] & Shutter.mask)) {
           //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Relay in Interlock group"));
           relay_in_interlock = true;
         }
@@ -189,7 +194,7 @@ void ShutterInit(void)
         }
       } else {
         Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
-        if (pin[GPIO_PWM1+i] < 99 && pin[GPIO_CNTR1+i] < 99) {
+        if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
           Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
           Shutter.pwm_frequency = 0;
           analogWriteFreq(Shutter.pwm_frequency);
@@ -199,16 +204,16 @@ void ShutterInit(void)
 
       TickerShutter.attach_ms(50, ShutterRtc50mS );
       // default the 50 percent should not have any impact without changing it. set to 60
-      Settings.shutter_set50percent[i] = Settings.shutter_set50percent[i] > 0 ? Settings.shutter_set50percent[i] : 50;
+      Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] > 0) ? Settings.shutter_set50percent[i] : 50;
 
       // use 10 sec. as default to allow everybody to play without deep initialize
-      Shutter.open_time[i] = Settings.shutter_opentime[i] > 0 ? Settings.shutter_opentime[i] : 100;
-      Shutter.close_time[i] = Settings.shutter_closetime[i] > 0 ? Settings.shutter_closetime[i] : 100;
+      Shutter.open_time[i] = (Settings.shutter_opentime[i] > 0) ? Settings.shutter_opentime[i] : 100;
+      Shutter.close_time[i] = (Settings.shutter_closetime[i] > 0) ? Settings.shutter_closetime[i] : 100;
 
       // Update Calculation 20 because time interval is 0.05 sec
       Shutter.open_max[i] = 200 * Shutter.open_time[i];
-      Shutter.close_velocity[i] =  Shutter.open_max[i] /  Shutter.close_time[i] / 2 ;
-      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i]/Shutter.close_time[i];
+      Shutter.close_velocity[i] =  Shutter.open_max[i] / Shutter.close_time[i] / 2 ;
+      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i] / Shutter.close_time[i];
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d Closefreq: %d"),i, Shutter.max_close_pwm_frequency[i]);
 
       // calculate a ramp slope at the first 5 percent to compensate that shutters move with down part later than the upper part
@@ -217,7 +222,7 @@ void ShutterInit(void)
       	Settings.shuttercoeff[0][i] = Shutter.open_max[i] - (Settings.shuttercoeff[1][i] * 100);
       	Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
       }
-      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1)  ;
+      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1);
 
       Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
       //Shutter.real_position[i] =   Settings.shutter_position[i] <= 5 ?  Settings.shuttercoeff[2][i] * Settings.shutter_position[i] : Settings.shuttercoeff[1][i] * Settings.shutter_position[i] + Settings.shuttercoeff[0,i];
@@ -242,26 +247,19 @@ void ShutterInit(void)
   }
 }
 
-void ShutterReportPosition(bool always = false)
+void ShutterReportPosition(bool always)
 {
-  uint16_t shutter_moving = 0;
+  uint32_t shutter_moving = 0;
   Response_P(PSTR("{"));
-  for (uint8_t i = 0; i < shutters_present; i++) {
+  for (uint32_t i = 0; i < shutters_present; i++) {
     //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
-    uint8_t position =  ShutterRealToPercentPosition(Shutter.real_position[i], i);
+    uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
     if (Shutter.direction[i] != 0) {
-      char stemp2[10];
-      uint8_t position =  ShutterRealToPercentPosition(Shutter.real_position[i], i);
-      dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
       shutter_moving = 1;
-      //Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
-      AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
+      ShutterLogPos(i);
     }
-
     if (i) { ResponseAppend_P(PSTR(",")); }
     ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
-//    if (i < shutters_present - 1)
-//      ResponseAppend_P(PSTR(", "));
   }
   ResponseJsonEnd();
   if (always || (1 == shutter_moving)) {
@@ -281,7 +279,6 @@ void ShutterUpdatePosition(void)
 
   char scommand[CMDSZ];
   char stopic[TOPSZ];
-  char stemp2[10];
 
   for (uint32_t i = 0; i < shutters_present; i++) {
     if (Shutter.direction[i] != 0) {
@@ -367,8 +364,8 @@ void ShutterUpdatePosition(void)
         }
         Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
 
-        dtostrfd((float)Shutter.time[i] / steps_per_second, 1, stemp2);
-        AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
+        ShutterLogPos(i);
+
         Shutter.start_position[i] = Shutter.real_position[i];
 
         // sending MQTT result to broker
@@ -385,7 +382,7 @@ void ShutterUpdatePosition(void)
   }
 }
 
-bool ShutterState(uint8_t device)
+bool ShutterState(uint32_t device)
 {
   device--;
   device &= 3;
@@ -393,12 +390,12 @@ bool ShutterState(uint8_t device)
           (Shutter.mask & (1 << (Settings.shutter_startrelay[device]-1))) );
 }
 
-void ShutterStartInit(uint8_t i, int8_t direction, int32_t target_pos)
+void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
 {
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: dir %d, delta1 %d, delta2 %d, grant %d"),direction, (Shutter.open_max[i] - Shutter.real_position[i]) / Shutter.close_velocity[i], Shutter.real_position[i] / Shutter.close_velocity[i], 2+Shutter.motordelay[i]);
-  if (  ( direction ==  1 && (Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2 )
-     || ( direction == -1 && Shutter.real_position[i] / Shutter.close_velocity[i]   <= 2)) {
-    Shutter.skip_relay_change = 1 ;
+  if (  ( (1 == direction) && ((Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2) )
+     || ( (-1 == direction) && (Shutter.real_position[i] / Shutter.close_velocity[i] <= 2)) ) {
+    Shutter.skip_relay_change = 1;
   } else {
     if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
       Shutter.pwm_frequency = 0;
@@ -421,11 +418,11 @@ void ShutterStartInit(uint8_t i, int8_t direction, int32_t target_pos)
   //AddLog_P2(LOG_LEVEL_INFO,  PSTR("SHT: Start shutter: %d from %d to %d in directin %d"), i, Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i]);
 }
 
-void ShutterWaitForMotorStop(uint8_t i)
+void ShutterWaitForMotorStop(uint32_t i)
 {
   AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
-  if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-    if ( Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+  if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+    if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
       //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Frequency change %d"), Shutter.pwm_frequency);
       while (Shutter.pwm_frequency > 0) {
         Shutter.accelerator[i] = 0;
@@ -445,7 +442,7 @@ void ShutterWaitForMotorStop(uint8_t i)
   }
 }
 
-int32_t ShutterCounterBasedPosition(uint8 i)
+int32_t ShutterCounterBasedPosition(uint32_t i)
 {
   return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
 }
@@ -598,7 +595,7 @@ void ShutterButtonHandler(void)
   }
 }
 
-void ShutterSetPosition(uint8_t device, uint8_t position)
+void ShutterSetPosition(uint32_t device, uint32_t position)
 {
   char svalue[32];                   // Command and number parameter
   snprintf_P(svalue, sizeof(svalue), PSTR(D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION "%d %d"), device, position);
@@ -612,7 +609,7 @@ void ShutterSetPosition(uint8_t device, uint8_t position)
 void CmndShutterOpen(void)
 {
   //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Payload close: %d, i %d"), XdrvMailbox.payload, XdrvMailbox.i);
-  if ( XdrvMailbox.index == 1 && XdrvMailbox.payload != -99) {
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
     XdrvMailbox.index = XdrvMailbox.payload;
   }
   XdrvMailbox.payload = 100;
@@ -623,7 +620,7 @@ void CmndShutterOpen(void)
 void CmndShutterClose(void)
 {
   //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Payload open: %d, i %d"), XdrvMailbox.payload, XdrvMailbox.i);
-  if ( XdrvMailbox.index == 1 && XdrvMailbox.payload != -99) {
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
     XdrvMailbox.index = XdrvMailbox.payload;
   }
   XdrvMailbox.payload = 0;
@@ -635,7 +632,7 @@ void CmndShutterClose(void)
 void CmndShutterStop(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if ( XdrvMailbox.index == 1 && XdrvMailbox.payload != -99) {
+    if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
       XdrvMailbox.index = XdrvMailbox.payload;
     }
     uint32_t i = XdrvMailbox.index -1;
@@ -662,7 +659,7 @@ void CmndShutterPosition(void)
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
 
     // value 0 with data_len > 0 can mean Open
-    if (XdrvMailbox.data_len > 1 &&  XdrvMailbox.payload <=0) {
+    if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
       //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
       if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN)) {
         CmndShutterOpen();
@@ -679,33 +676,33 @@ void CmndShutterPosition(void)
       }
     }
 
-    int8_t target_pos_percent = XdrvMailbox.payload < 0 ? 0 : (XdrvMailbox.payload > 100 ? 100 : XdrvMailbox.payload);
+    int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
     // webgui still send also on inverted shutter the native position.
-    target_pos_percent = Settings.shutter_invert[index] &&  SRC_WEBGUI != last_source ? 100 - target_pos_percent : target_pos_percent;
+    target_pos_percent = (Settings.shutter_invert[index] && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
     if (XdrvMailbox.payload != -99) {
       //target_pos_percent = Settings.shutter_invert[index] ? 100 - target_pos_percent : target_pos_percent;
       Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-      Shutter.accelerator[index] = Shutter.max_pwm_frequency / (Shutter.motordelay[index]>0 ? Shutter.motordelay[index] : 1);
+      Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
       //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
     }
     if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
       int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
-      if (Shutter.direction[index] ==  -new_shutterdirection ) {
+      if (Shutter.direction[index] == -new_shutterdirection) {
         // direction need to be changed. on momentary switches first stop the Shutter
-        if (Shutter.mode == SHT_PULSE_OPEN__PULSE_CLOSE) {
+        if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
           // code for momentary shutters only small switch on to stop Shutter
-          ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+          ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
           delay(100);
         } else {
-          if (Shutter.mode == SHT_OFF_OPEN__OFF_CLOSE) {
-            ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 1 : 0), 0, SRC_SHUTTER);
+          if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
+            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
             ShutterWaitForMotorStop(index);
           }
         }
       }
-      if (Shutter.direction[index] !=  new_shutterdirection ) {
-        if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+      if (Shutter.direction[index] != new_shutterdirection) {
+        if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
           //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay5 5s, xdrv %d"), XdrvMailbox.payload);
           ShutterWaitForMotorStop(index);
           ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
@@ -969,7 +966,7 @@ bool Xdrv27(uint8_t function)
         break;
       case FUNC_EVERY_SECOND:
       //case FUNC_EVERY_250_MSECOND:
-        ShutterReportPosition();
+        ShutterReportPosition(false);
         break;
 
       case FUNC_COMMAND:

From cea20feab3d41a8697732737b121936ac3495b5c Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Sat, 4 Jan 2020 16:10:03 +0100
Subject: [PATCH 083/403] Fixed exception with ShutterButton

When a button assigned to a shutter is pressed before any command is issued an exception occured
---
 tasmota/xdrv_27_shutter.ino | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index aa7d13e3c..c4f28781f 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -562,6 +562,11 @@ void ShutterButtonHandler(void)
       press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1); 
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, press_index+1);
       XdrvMailbox.index = shutter_index +1;
+      last_source = SRC_BUTTON;
+      XdrvMailbox.data_len = 0;
+      char databuf[1] = "";
+      XdrvMailbox.data = databuf;
+      XdrvMailbox.command = NULL;
       if (buttonState == SHT_PRESSED_IMMEDIATE) {
         XdrvMailbox.payload = XdrvMailbox.index;
         CmndShutterStop();
@@ -646,7 +651,8 @@ void CmndShutterStop(void)
       last_source = SRC_WEBGUI;
       CmndShutterPosition();
     } else {
-      ResponseCmndDone();
+      if (XdrvMailbox.command)
+        ResponseCmndDone();
     }
   }
 }
@@ -714,7 +720,8 @@ void CmndShutterPosition(void)
       target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
     }
     XdrvMailbox.index = index +1;  // Fix random index for ShutterClose
-    ResponseCmndIdxNumber(Settings.shutter_invert[index] ? 100 - target_pos_percent : target_pos_percent);
+    if (XdrvMailbox.command)
+      ResponseCmndIdxNumber(Settings.shutter_invert[index] ? 100 - target_pos_percent : target_pos_percent);
   }
 }
 

From f6f4a3f88fd0fdad12d0503b128491c908568d8f Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Sat, 4 Jan 2020 16:24:45 +0100
Subject: [PATCH 084/403] inverted ShutterButton command

As discussed in doc repo this is the code for my inverted shutter button command.
---
 tasmota/xdrv_27_shutter.ino | 63 ++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 2b2028fdf..79db95b1d 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -575,12 +575,12 @@ void ShutterButtonHandler(void)
           } else {
             XdrvMailbox.payload = position = (position-1)<<1;
             CmndShutterPosition();
-            if ((Settings.shutter_button[button_index]>>(press_index + 26)) & 0x01) {
+            if (Settings.shutter_button[button_index] & ((0x01<<26)<<press_index)) {
               // MQTT broadcast to grouptopic
               char scommand[CMDSZ];
               char stopic[TOPSZ];
               for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-                if ((i==shutter_index) || ((Settings.shutter_button[button_index]>>30) & 0x01)) {
+                if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
                   snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
                   GetGroupTopic_P(stopic, scommand);
                   Response_P("%d", position);
@@ -787,7 +787,7 @@ void CmndShutterRelay(void)
 
 void CmndShutterButton(void)
 {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KEYS)) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
     uint32_t setting = 0;
     // (setting>>31)&(0x01) : enabled
     // (setting>>30)&(0x01) : mqtt broadcast to all index
@@ -801,7 +801,7 @@ void CmndShutterButton(void)
     // (setting>> 2)&(0x3f) : shutter_position single press 0 disabled, 1..101 == 0..100%
     // (setting>> 0)&(0x03) : shutter_index
     if (XdrvMailbox.data_len > 0) {
-        uint32_t i = 0;
+        uint32_t i = 0, button_index = 0;
         bool done = false;
         char *str_ptr;
         char* version_dup = strdup(XdrvMailbox.data);  // Duplicate the version_str as strtok_r will modify it.
@@ -815,9 +815,9 @@ void CmndShutterButton(void)
 
           switch (i) {
             case 0:
-              if ((field >= 1) && (field<=4)) {
-                setting |= (1<<31);
-                setting |= field-1;
+              if ((field >= -1) && (field<=4)) {
+                button_index = (field<=0)?(-1):field;
+                done = (button_index==-1);
               } else
                 done = true;
             break;
@@ -853,21 +853,48 @@ void CmndShutterButton(void)
           if (done) break;
         }
         free(version_dup);
-        Settings.shutter_button[XdrvMailbox.index-1] = setting;
-        ResponseCmndIdxChar(XdrvMailbox.data);
-      } else {
-        setting = Settings.shutter_button[XdrvMailbox.index-1];
 
-        char setting_chr[30] = "0";
-        if ((setting>>31)&(0x01)) {
-          snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d %d %d %d %d %d"), ((setting>> 0)&(0x03))+1, (((setting>> 2)&(0x3f))-1)<<1, (((setting>> 8)&(0x3f))-1)<<1, (((setting>>14)&(0x3f))-1)<<1, (((setting>>20)&(0x3f))-1)<<1, (setting>>26)&(0x01), (setting>>27)&(0x01),  (setting>>28)&(0x01), (setting>>29)&(0x01), (setting>>30)&(0x01));
-          for (uint32_t i=0 ; i < sizeof(setting_chr)-1 ; i++) {
-            if ((setting_chr[i]=='-') && (setting_chr[i+1])) setting_chr[++i]='-'; // dirty '-x' to '--'
-            if (!setting_chr[i]) break;
+        if (button_index) {
+          if (button_index==-1) {
+            // remove all buttons for this shutter
+            for (uint32_t i=0 ; i < MAX_KEYS ; i++)
+              if ((Settings.shutter_button[i]&0x3) == (XdrvMailbox.index-1))
+                Settings.shutter_button[i] = 0;
+          } else {
+            if (setting) {
+              // anything was set
+              setting |= (1<<31);
+              setting |= (XdrvMailbox.index-1) & 0x3;
+            }
+            Settings.shutter_button[button_index-1] = setting;
           }
         }
-        ResponseCmndIdxChar(setting_chr);
       }
+      char setting_chr[30*MAX_KEYS] = "-", *setting_chr_ptr = setting_chr;
+      for (uint32_t i=0 ; i < MAX_KEYS ; i++) {
+        setting = Settings.shutter_button[i];
+        if ((setting&(1<<31)) && ((setting&0x3) == (XdrvMailbox.index-1))) {
+          if (*setting_chr_ptr == 0)
+            setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|"));
+          setting_chr_ptr += snprintf_P(setting_chr_ptr, 2, PSTR("%d"), i+1);
+
+          for (uint32_t j=0 ; j < 4 ; j++) {
+            int8_t pos = (((setting>> (2+6*j))&(0x3f))-1)<<1;
+            if (pos>=0)
+              setting_chr_ptr += snprintf_P(setting_chr_ptr, 5, PSTR(" %d"), pos);
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+          for (uint32_t j=0 ; j < 5 ; j++) {
+            bool mqtt = ((setting>>(26+j))&(0x01)!=0);
+            if (mqtt)
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" 1"));
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+        }
+      }
+      ResponseCmndIdxChar(setting_chr);
    }
 }
 

From 61fe727685e9cb0cd75cf6204896c4e3a2807f99 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 4 Jan 2020 17:29:04 +0100
Subject: [PATCH 085/403] Possible fix for Domoticz color temp

Possible fix for Domoticz color temp (#7428)
---
 tasmota/xdrv_07_domoticz.ino | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index b227c958f..de2ce58f5 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -304,8 +304,20 @@ bool DomoticzMqttData(void)
           uint16_t b = color["b"]; b = b * level / 100;
           uint16_t cw = color["cw"]; cw = cw * level / 100;
           uint16_t ww = color["ww"]; ww = ww * level / 100;
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
+
+          uint16_t m = 0;
+          uint16_t t = 0;
+          if (color.containsKey("m")) {
+            m = color["m"];
+            t = color["t"];
+          }
+          if (2 == m) {  // White with color temperature. Valid fields: t
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLORTEMPERATURE ));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX));
+          } else {
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
+          }
           found = true;
         }
         else if ((!iscolordimmer && 2 == nvalue) ||  // gswitch_sSetLevel

From 4a432fc2cdc9b01bad1661358f221152b9dd4434 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 4 Jan 2020 18:24:33 +0100
Subject: [PATCH 086/403] Fix for Domoticz color temp (#7428)

Fix for Domoticz color temp (#7428)
---
 tasmota/xdrv_07_domoticz.ino | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index de2ce58f5..49e546b65 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -297,6 +297,7 @@ bool DomoticzMqttData(void)
         } else
 #endif // USE_SHUTTER
         if (iscolordimmer && 10 == nvalue) {  // Color_SetColor
+          // https://www.domoticz.com/wiki/Domoticz_API/JSON_URL%27s#Set_a_light_to_a_certain_color_or_color_temperature
           JsonObject& color = domoticz["Color"];
           uint16_t level = nvalue = domoticz["svalue1"];
           uint16_t r = color["r"]; r = r * level / 100;
@@ -304,7 +305,6 @@ bool DomoticzMqttData(void)
           uint16_t b = color["b"]; b = b * level / 100;
           uint16_t cw = color["cw"]; cw = cw * level / 100;
           uint16_t ww = color["ww"]; ww = ww * level / 100;
-
           uint16_t m = 0;
           uint16_t t = 0;
           if (color.containsKey("m")) {
@@ -312,8 +312,8 @@ bool DomoticzMqttData(void)
             t = color["t"];
           }
           if (2 == m) {  // White with color temperature. Valid fields: t
-            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLORTEMPERATURE ));
-            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX));
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_BACKLOG));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR(D_CMND_COLORTEMPERATURE " %d;" D_CMND_DIMMER " %d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX), level);
           } else {
             snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
             snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);

From dc2d7cc6816011af29acbb6ce5a6cab2f2b686d3 Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Sun, 5 Jan 2020 01:06:30 +0100
Subject: [PATCH 087/403] Added F&F LE-01MR support

---
 tasmota/language/en-GB.h       |   2 +
 tasmota/my_user_config.h       |   4 +-
 tasmota/support_features.ino   |   5 +-
 tasmota/tasmota_post.h         |   5 +
 tasmota/tasmota_template.h     |   9 +-
 tasmota/xnrg_13_fif_le01mr.ino | 290 +++++++++++++++++++++++++++++++++
 6 files changed, 311 insertions(+), 4 deletions(-)
 create mode 100644 tasmota/xnrg_13_fif_le01mr.ino

diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 5121a7471..7c68553a4 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 06e444658..18e48992f 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -498,7 +498,9 @@
 //#define USE_SOLAX_X1                             // Add support for Solax X1 series Modbus log info (+3k1 code)
   #define SOLAXX1_SPEED        9600              // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
   #define SOLAXX1_PV2                            // Solax X1 using second PV
-
+//#define USE_LE01MR                                 // Add support for F&F LE-01MR modbus energy meter
+  //#define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (2400 default)
+  //#define LE01MR_ADDR          0x01              // LE-01MR modbus address (0x01 default)
 // -- Low level interface devices -----------------
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)
 
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index d86bf11bb..8d37d3a71 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -501,8 +501,9 @@ void GetFeatures(void)
 #ifdef USE_HOTPLUG
   feature5 |= 0x00800000;
 #endif
-
-//  feature5 |= 0x01000000;
+#ifdef USE_LE01MR
+  feature5 |= 0x01000000;
+#endif
 //  feature5 |= 0x02000000;
 //  feature5 |= 0x04000000;
 //  feature5 |= 0x08000000;
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index af2fe00f7..8a16ffead 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -194,6 +194,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_DDS2382                              // Add support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #define USE_DDSU666                              // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 //#define USE_SOLAX_X1                             // Add support for Solax X1 series Modbus log info (+3k1 code)
+//#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
 
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #define USE_MAX31855                             // Add support for MAX31855 K-Type thermocouple sensor using softSPI
@@ -281,6 +282,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
   #undef USE_DDS2382                             // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
   #undef USE_DDSU666                             // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
   #undef USE_SOLAX_X1                            // Disable support for Solax X1 series Modbus log info (+3k1 code)
+  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter
 
 #define USE_I2C                                  // I2C using library wire (+10k code, 0k2 mem, 124 iram)
   #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
@@ -362,6 +364,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
   #undef USE_DDS2382                             // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
   #undef USE_DDSU666                             // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
   #undef USE_SOLAX_X1                            // Disable support for Solax X1 series Modbus log info (+3k1 code)
+  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter
 
 //#undef USE_DS18x20                               // Disable support for DS18x20 sensors with id sort, single scan and read retry (+1k3 code)
 
@@ -481,6 +484,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DDS2382                               // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #undef USE_DDSU666                               // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 #undef USE_SOLAX_X1                              // Disable support for Solax X1 series Modbus log info (+3k1 code)
+#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter
 
 #undef USE_DHT                                   // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI
@@ -592,6 +596,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DDS2382                               // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #undef USE_DDSU666                               // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 #undef USE_SOLAX_X1                              // Disable support for Solax X1 series Modbus log info (+3k1 code)
+#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter
 
 #undef USE_DHT                                   // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 1793902eb..0d0eab2f5 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -216,6 +216,8 @@ enum UserSelectablePins {
   GPIO_HPMA_TX,        // Honeywell HPMA115S0 Serial interface
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
+  GPIO_LE01MR_RX,      // F&F LE-01MR energy meter
+  GPIO_LE01MR_TX,      // F&F LE-01MR energy meter
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -296,7 +298,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_DEEPSLEEP "|" D_SENSOR_EXS_ENABLE "|"
   D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|"
   D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|"
-  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX
+  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|"
+  D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -676,6 +679,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_SOLAXX1_TX,     // Solax Inverter tx pin
   GPIO_SOLAXX1_RX,     // Solax Inverter rx pin
 #endif // USE_SOLAX_X1
+#ifdef USE_LE01MR
+  GPIO_LE01MR_RX,     // F7F LE-01MR energy meter rx pin
+  GPIO_LE01MR_TX,     // F7F LE-01MR energy meter tx pin
+#endif // IFDEF:USE_LE01MR
 #endif  // USE_ENERGY_SENSOR
 
 // Serial
diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
new file mode 100644
index 000000000..35e975358
--- /dev/null
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -0,0 +1,290 @@
+/*
+  xnrg_13_fif_le01mr.ino - F&F LE-01MR energy meter with Modbus interface - support for Tasmota
+
+  Copyright (C) 2020  Przemyslaw Wistuba
+
+  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/>.
+*/
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_LE01MR
+/*********************************************************************************************\
+ * F&F LE-01MR - This is a single phase energy meter with rs485 modbus interface 
+ *               (and bidirectional energy counting - enabled by RS485).
+ * It measure: Active energy imported AE+ [kWh] , Reactive energy imported RE+ [kvarh],
+ *             Voltage V [V], Current I [A], Frequency F [Hz], power factor (aka "cos-phi"),
+ *             Active power P [kW], Reactive power Q [kvar], Apparent power S [kVA],
+ *             *Active energy exported AE- [kWh] (when meter is switched to bi-directional counting then 
+ *                  reactive energy imported register contains value of Active energy exported).
+ *
+ * Meter descriptions at manufacturer page (english version have some description errors):
+ *    EN: https://www.fif.com.pl/en/usage-electric-power-meters/517-electricity-consumption-meter-le-01mr.html
+ *    PL: https://www.fif.com.pl/pl/liczniki-zuzycia-energii-elektrycznej/517-licznik-zuzycia-energii-le-01mr.html
+ * 
+ * Register descriptions (not all, only those that are being read):
+ * 
+ * /----------------------------------- Register address
+ * |        /-------------------------- Registers count
+ * |        |   /---------------------- Datatype and size
+ * |        |   |    /----------------- Resolution (or multiplier)
+ * |        |   |    |      /---------- Unit
+ * |        |   |    |      |     /---- Description
+ * 0x0130   1   U16  0.01   Hz    Frequency
+ * 0x0131   1   U16  0.01   V     Voltage
+ * 0x0139   2   U32  0.001  A     Current
+ * 0x0140   2   U32  0.001  kW    Active power
+ * 0x0148   2   U32  0.001  kvar  Reactive power
+ * 0x0150   2   U32  0.001  kVA   Apparent power
+ * 0x0158   1   S16  0.001  -     Power factor
+ * 0xA000   2   U32  0.01   kWh   Active energy imported
+ * 0xA01E   2   U32  0.01   kvarh Reactive energy imported
+ * 
+ * Datatype: S = signed int, U = unsigend int, 
+ *           U32 - the first (lower) register contains high word, 
+ *                 second register contains lower word of 32bit dword:
+ *                   value_32bit = (register+0)<<16 | (register+1); 
+ *                   /or/ val32bit = (reg+0)*65536 + (reg+1);
+\*********************************************************************************************/
+
+#define XNRG_13             13
+
+// can be user defined in my_user_config.h
+#ifndef LE01MR_SPEED
+  #define LE01MR_SPEED      2400    // default LE01MR Modbus speed
+#endif
+// can be user defined in my_user_config.h
+#ifndef LE01MR_ADDR
+  #define LE01MR_ADDR       1       // default LE01MR Modbus address
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *FifLEModbus;
+
+const uint8_t le01mr_table_sz = 9;
+
+const uint16_t le01mr_register_addresses[] {
+            // IDX                               (reg count/datatype)    [unit]
+  0x0130,   // 00 . LE01MR_FREQUENCY             (1/U16)    [Hz]
+  0x0131,   // 01 . LE01MR_VOLTAGE               (1/U16)    [V]
+  0x0158,   // 02 . LE01MR_POWER_FACTOR          (1/S16)      
+  0x0139,   // 03 . LE01MR_CURRENT               (2/U32)    [A]
+  0x0140,   // 04 . LE01MR_ACTIVE_POWER          (2/U32)    [kW]
+  0x0148,   // 05 . LE01MR_REACTIVE_POWER        (2/U32)    [kvar]
+  0x0150,   // 06 . LE01MR_APPARENT_POWER        (2/U32)    [kVA]
+  0xA000,   // 07 . LE01MR_TOTAL_ACTIVE_ENERGY   (2/U32)    [kWh]
+  0xA01E    // 08 . LE01MR_TOTAL_REACTIVE_ENERGY (2/U32)    [kvarh]
+};
+
+struct LE01MR {
+  float total_active = 0;
+  float total_reactive = 0;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+  uint8_t start_address_count = le01mr_table_sz;
+} Le01mr;
+
+/*********************************************************************************************/
+
+void FifLEEvery250ms(void)
+{
+  bool data_ready = FifLEModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];  // At least 9
+    uint8_t reg_count = 2;
+    if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) {
+      reg_count=1;
+    }
+
+    uint32_t error = FifLEModbus->ReceiveBuffer(buffer, reg_count);
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, FifLEModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+
+      // SA=Slave Address, FC=Function Code, BC=Byte Count, B3..B0=Data byte, Ch Cl = crc16 checksum
+      // U32 registers:
+      // 00 01 02 03 04 05 06 07 08
+      // SA FC BC B3 B2 B1 B0 Cl Ch
+      // 01 03 04 00 00 00 72 7A 16  = REG[B3..B2=0x0139,B1..B0=0x013A]   114 = 0.114 A
+      // 01 03 04 00 00 00 B0 FB 87  = REG[B3..B2=0xA01E,B1..B0=0xA01F]   176 = 1.76 kvarh
+      // U16/S16 registers:
+      // 00 01 02 03 04 05 06
+      // SA FC BC B1 B0 Cl Ch
+      // 01 03 02 5B 02 02 B5  = REG[B1..B0=0x0131]   23298 = 232.98 V
+      // 01 03 02 03 E8 B8 FA  = REG[B1..B0=0x0158]   1000  = 1.000 (power factor)
+      // there are 3 data types used:
+      // U16 - uint16_t
+      // U32 - uint32_t
+      // S16 -  int16_t
+      // everything drop into uint32 value, but depending on register ther will be 2 or 4 bytes
+      uint32_t value_buff = 0;
+      // for register table items 0..2 use 2 bytes (U16) 
+      if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) { // 
+        value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
+        //((uint8_t*)&value_buff)[1] = buffer[3];
+        //((uint8_t*)&value_buff)[0] = buffer[4];
+      } else {
+        value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
+      }
+
+      switch(Le01mr.read_state) {
+        case 0:
+          Energy.frequency[0] = value_buff * 0.01f;  // 5000 => 50.00
+          break;
+
+        case 1:
+          Energy.voltage[0] = value_buff * 0.01f;   // 23298 => 232.98 V
+          break;
+
+        case 2:
+          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f; // 1000 => 1.000
+          break;
+
+        case 3:
+          Energy.current[0] = value_buff * 0.001f; // 114 => 0.114 A
+          break;
+        
+        case 4:
+          Energy.active_power[0] = value_buff * 0.001f;
+          break;
+
+        case 5:
+          Energy.reactive_power[0] = value_buff * 0.001f;
+          break;
+
+        case 6:
+          Energy.apparent_power[0] = value_buff * 0.001f;
+          break;
+
+        case 7:
+          Le01mr.total_active = value_buff * 0.01f;
+          break;
+
+        case 8:
+          Le01mr.total_reactive = value_buff * 0.01f; // 176 => 1.76
+          break;
+      }
+
+      Le01mr.read_state++;
+      if (Le01mr.read_state == Le01mr.start_address_count) {
+        Le01mr.read_state = 0;
+
+        EnergyUpdateTotal(Le01mr.total_active, true);
+      }
+    }
+  } // end data ready
+
+  if (0 == Le01mr.send_retry || data_ready) {
+    uint8_t reg_count = 2;
+
+    Le01mr.send_retry = 5;
+    // some registers are 1reg in size
+    if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) reg_count=1;
+    // send request
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus req reg %X, count %d"), le01mr_register_addresses[Le01mr.read_state], reg_count);
+    FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
+  } else {
+    Le01mr.send_retry--;
+  }
+}
+
+void FifLESnsInit(void)
+{
+  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_RX]);
+  uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void FifLEDrvInit(void)
+{
+  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_RX] < 99)) {
+    energy_flg = XNRG_13;
+  }
+}
+
+void FifLEReset(void)
+{
+  Le01mr.total_active = 0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_LE01MR[] PROGMEM =
+  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}";
+#endif  // USE_WEBSERVER
+
+void FifLEShow(bool json)
+{
+  char total_reactive_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
+  
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_REACTIVE "\":%s"),
+      total_reactive_chr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_reactive_chr);
+#endif  // USE_WEBSERVER
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+#define SLOW_DOWN_X250MS 6
+uint8_t slowdown = SLOW_DOWN_X250MS;
+
+bool Xnrg13(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { 
+        if (--slowdown == 0) {
+          FifLEEvery250ms(); 
+          slowdown=SLOW_DOWN_X250MS;
+        }
+      }
+      break;
+    case FUNC_JSON_APPEND:
+      FifLEShow(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      FifLEShow(0);
+      break;
+#endif  // USE_WEBSERVER
+    case FUNC_ENERGY_RESET:
+      FifLEReset();
+      break;
+    case FUNC_INIT:
+      FifLESnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      FifLEDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif  // USE_LE01MR
+#endif  // USE_ENERGY_SENSOR

From 179a1c549d0f555e7c1c0bf8f39a3fd4b58eb191 Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Sun, 5 Jan 2020 14:32:35 +0100
Subject: [PATCH 088/403] Fixed few bugs (multiplers, 0's, etc)

---
 tasmota/xnrg_13_fif_le01mr.ino | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
index 35e975358..f5998d95f 100644
--- a/tasmota/xnrg_13_fif_le01mr.ino
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -102,7 +102,7 @@ void FifLEEvery250ms(void)
   if (data_ready) {
     uint8_t buffer[14];  // At least 9
     uint8_t reg_count = 2;
-    if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) {
+    if (Le01mr.read_state < 3) {
       reg_count=1;
     }
 
@@ -141,6 +141,9 @@ void FifLEEvery250ms(void)
         value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
       }
 
+      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR buff[3..6]: %2x %2x %2x %2x"), buffer[3], buffer[4], buffer[5], buffer[6]);
+      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR reg_count/value_buff: %d / %d"), reg_count,value_buff);
+
       switch(Le01mr.read_state) {
         case 0:
           Energy.frequency[0] = value_buff * 0.01f;  // 5000 => 50.00
@@ -159,23 +162,23 @@ void FifLEEvery250ms(void)
           break;
         
         case 4:
-          Energy.active_power[0] = value_buff * 0.001f;
+          Energy.active_power[0] = value_buff * 1.0f; // P [W]
           break;
 
         case 5:
-          Energy.reactive_power[0] = value_buff * 0.001f;
+          Energy.reactive_power[0] = value_buff * 1.0f; // Q [var]
           break;
 
         case 6:
-          Energy.apparent_power[0] = value_buff * 0.001f;
+          Energy.apparent_power[0] = value_buff * 1.0f; // S [VA]
           break;
 
         case 7:
-          Le01mr.total_active = value_buff * 0.01f;
+          Le01mr.total_active = value_buff * 0.01f; // [kWh]
           break;
 
         case 8:
-          Le01mr.total_reactive = value_buff * 0.01f; // 176 => 1.76
+          Le01mr.total_reactive = value_buff * 0.01f; // [kvarh] 176 => 1.76
           break;
       }
 
@@ -193,7 +196,7 @@ void FifLEEvery250ms(void)
 
     Le01mr.send_retry = 5;
     // some registers are 1reg in size
-    if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) reg_count=1;
+    if (Le01mr.read_state < 3) reg_count=1;
     // send request
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus req reg %X, count %d"), le01mr_register_addresses[Le01mr.read_state], reg_count);
     FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
@@ -204,7 +207,7 @@ void FifLEEvery250ms(void)
 
 void FifLESnsInit(void)
 {
-  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_RX]);
+  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_TX]);
   uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
   if (result) {
     if (2 == result) { ClaimSerial(); }
@@ -249,7 +252,8 @@ void FifLEShow(bool json)
  * Interface
 \*********************************************************************************************/
 
-#define SLOW_DOWN_X250MS 6
+// just to slow down tramitter (for deug purpouses)
+#define SLOW_DOWN_X250MS 1
 uint8_t slowdown = SLOW_DOWN_X250MS;
 
 bool Xnrg13(uint8_t function)

From f2ca1f3e47b9434ff84143cecb215b8a71ce0cf1 Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Sun, 5 Jan 2020 19:51:12 +0100
Subject: [PATCH 089/403] Added totalActive from le01, more code tunning

---
 tasmota/i18n.h                 |  1 +
 tasmota/language/en-GB.h       |  3 ++-
 tasmota/my_user_config.h       |  6 +++---
 tasmota/xnrg_13_fif_le01mr.ino | 31 ++++++++++++++++++++-----------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index fb54edd4a..67a262b75 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -183,6 +183,7 @@
 #define D_JSON_SOLAR_POWER "SolarPower"
 #define D_JSON_USAGE "Usage"
 #define D_JSON_EXPORT "Export"
+#define D_JSON_TOTAL_ACTIVE "TotalActive"
 
 #define D_RSLT_ENERGY "ENERGY"
 #define D_RSLT_HASS_STATE "HASS_STATE"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 7c68553a4..163a46b87 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -671,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -680,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 18e48992f..85d6737e9 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -498,9 +498,9 @@
 //#define USE_SOLAX_X1                             // Add support for Solax X1 series Modbus log info (+3k1 code)
   #define SOLAXX1_SPEED        9600              // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
   #define SOLAXX1_PV2                            // Solax X1 using second PV
-//#define USE_LE01MR                                 // Add support for F&F LE-01MR modbus energy meter
-  //#define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (2400 default)
-  //#define LE01MR_ADDR          0x01              // LE-01MR modbus address (0x01 default)
+//#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
+  #define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (2400 default)
+  #define LE01MR_ADDR          1                 // LE-01MR modbus address (0x01 default)
 // -- Low level interface devices -----------------
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)
 
diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
index f5998d95f..3ca424d66 100644
--- a/tasmota/xnrg_13_fif_le01mr.ino
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -198,7 +198,7 @@ void FifLEEvery250ms(void)
     // some registers are 1reg in size
     if (Le01mr.read_state < 3) reg_count=1;
     // send request
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus req reg %X, count %d"), le01mr_register_addresses[Le01mr.read_state], reg_count);
+    //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus req reg %X, count %d"), le01mr_register_addresses[Le01mr.read_state], reg_count);
     FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
   } else {
     Le01mr.send_retry--;
@@ -226,24 +226,30 @@ void FifLEDrvInit(void)
 void FifLEReset(void)
 {
   Le01mr.total_active = 0;
+  Le01mr.total_reactive = 0;
 }
 
 #ifdef USE_WEBSERVER
 const char HTTP_ENERGY_LE01MR[] PROGMEM =
-  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}";
+  "{s}" D_TOTAL_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_TOTAL_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  ;
 #endif  // USE_WEBSERVER
 
 void FifLEShow(bool json)
 {
   char total_reactive_chr[FLOATSZ];
   dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
+  char total_active_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
   
+
   if (json) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_REACTIVE "\":%s"),
-      total_reactive_chr);
+    ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
+      total_active_chr, total_reactive_chr);
 #ifdef USE_WEBSERVER
   } else {
-    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_reactive_chr);
+    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_active_chr, total_reactive_chr);
 #endif  // USE_WEBSERVER
   }
 }
@@ -253,20 +259,23 @@ void FifLEShow(bool json)
 \*********************************************************************************************/
 
 // just to slow down tramitter (for deug purpouses)
-#define SLOW_DOWN_X250MS 1
-uint8_t slowdown = SLOW_DOWN_X250MS;
+//#define SLOW_DOWN_X250MS 1
+//uint8_t slowdown = SLOW_DOWN_X250MS;
 
 bool Xnrg13(uint8_t function)
 {
   bool result = false;
 
   switch (function) {
+    // TODO: Verify if there is corrleaction with 250ms scan time, 
+    //       and MQTT breaking connection and causing exception in ESP8266 after few minutes
+    //       test with "FUNC_EVERY_SECOND"
     case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { 
-        if (--slowdown == 0) {
+      if (uptime > 4) {
+        //if (--slowdown == 0) {
           FifLEEvery250ms(); 
-          slowdown=SLOW_DOWN_X250MS;
-        }
+        //  slowdown=SLOW_DOWN_X250MS;
+        //}
       }
       break;
     case FUNC_JSON_APPEND:

From f145d22e90df65b3750ba643fa26dfe68ee57635 Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Sun, 5 Jan 2020 22:09:00 +0100
Subject: [PATCH 090/403] A bit more of code cleanup

---
 tasmota/xnrg_13_fif_le01mr.ino | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
index 3ca424d66..342e8cf17 100644
--- a/tasmota/xnrg_13_fif_le01mr.ino
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -113,6 +113,7 @@ void FifLEEvery250ms(void)
     if (error) {
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
     } else {
+      //if (Le01mr.read_state == 0) 
       Energy.data_valid[0] = 0;
 
       // SA=Slave Address, FC=Function Code, BC=Byte Count, B3..B0=Data byte, Ch Cl = crc16 checksum
@@ -135,8 +136,6 @@ void FifLEEvery250ms(void)
       // for register table items 0..2 use 2 bytes (U16) 
       if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) { // 
         value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
-        //((uint8_t*)&value_buff)[1] = buffer[3];
-        //((uint8_t*)&value_buff)[0] = buffer[4];
       } else {
         value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
       }
@@ -154,7 +153,7 @@ void FifLEEvery250ms(void)
           break;
 
         case 2:
-          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f; // 1000 => 1.000
+          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f; // 1000 => 1.000 //note: I never saw this negative...
           break;
 
         case 3:
@@ -218,7 +217,7 @@ void FifLESnsInit(void)
 
 void FifLEDrvInit(void)
 {
-  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_RX] < 99)) {
+  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_TX] < 99)) {
     energy_flg = XNRG_13;
   }
 }
@@ -258,24 +257,14 @@ void FifLEShow(bool json)
  * Interface
 \*********************************************************************************************/
 
-// just to slow down tramitter (for deug purpouses)
-//#define SLOW_DOWN_X250MS 1
-//uint8_t slowdown = SLOW_DOWN_X250MS;
-
 bool Xnrg13(uint8_t function)
 {
   bool result = false;
 
   switch (function) {
-    // TODO: Verify if there is corrleaction with 250ms scan time, 
-    //       and MQTT breaking connection and causing exception in ESP8266 after few minutes
-    //       test with "FUNC_EVERY_SECOND"
     case FUNC_EVERY_250_MSECOND:
       if (uptime > 4) {
-        //if (--slowdown == 0) {
           FifLEEvery250ms(); 
-        //  slowdown=SLOW_DOWN_X250MS;
-        //}
       }
       break;
     case FUNC_JSON_APPEND:

From 95fc96d5635e87e7eac66bea29c04a10df7bbec9 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 6 Jan 2020 14:52:04 +0100
Subject: [PATCH 091/403] Add support for gzipped binaries

Add support for gzipped binaries
---
 RELEASENOTES.md               |  4 +++-
 tasmota/CHANGELOG.md          | 16 ++++++++++------
 tasmota/settings.ino          |  5 +++++
 tasmota/tasmota_version.h     |  2 +-
 tasmota/xdrv_01_webserver.ino | 14 ++++++++------
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0335fc6e6..007b99fe2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.2
+### Version 8.1.0.3
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
@@ -62,6 +62,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
+- Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
@@ -71,3 +72,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
 - Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
 - Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
+- Add support for gzipped binaries
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index a087ea907..2c7e22a3f 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,17 +1,21 @@
 ## Unreleased (development)
 
+### 8.1.0.3 20200106
+
+- Add support for gzipped binaries
+
 ### 8.1.0.2 20191230
 
-- Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
-- Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
-- Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
-- Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
-- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix Improved fade linearity with gamma correction
 - Fix wrong gamma correction for Module 48 lights (PWM5 for CT)
-- Add SetOption82 to limit the CT range for Alexa to 200..380
+- Add support for ``AdcParam`` parameters to control ADC0 Current Transformer Apparent Power formula by Jodi Dillon (#7100)
+- Add optional support for Prometheus using file xsns_91_prometheus.ino (#7216)
+- Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
+- Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
+- Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
+- Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
 
 ### 8.1.0.1 20191225
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index dbd4c6d50..21f3e0ab4 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -359,6 +359,11 @@ uint32_t OtaVersion(void)
   bool found = false;
   for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
     ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
+    if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
+      version[1] = 0xFFFFFFFF;  // Ota file is gzipped and can not be checked for compatibility
+      found = true;
+      break;
+    }
     for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
       version[0] = version[1];
       version[1] = version[2];
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 4b410adf1..fab871449 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010002;
+const uint32_t VERSION = 0x08010003;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index eb14933d4..682663905 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2270,16 +2270,18 @@ void HandleUploadLoop(void)
         } else
 #endif
         {
-          if (upload.buf[0] != 0xE9) {
+          if ((upload.buf[0] != 0xE9) && (upload.buf[0] != 0x1F)) {  // 0x1F is gzipped 0xE9
             Web.upload_error = 3;  // Magic byte is not 0xE9
             return;
           }
-          uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
-          if(bin_flash_size > ESP.getFlashChipRealSize()) {
-            Web.upload_error = 4;  // Program flash size is larger than real flash size
-            return;
+          if (0xE9 == upload.buf[0]) {
+            uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
+            if (bin_flash_size > ESP.getFlashChipRealSize()) {
+              Web.upload_error = 4;  // Program flash size is larger than real flash size
+              return;
+            }
+//            upload.buf[2] = 3;  // Force DOUT - ESP8285
           }
-//          upload.buf[2] = 3;  // Force DOUT - ESP8285
         }
       }
     }

From 66909f7ceccac8aa53a654a1f8875462dec13d30 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 6 Jan 2020 16:10:44 +0100
Subject: [PATCH 092/403] Add support for gzipped binaries

Add support for gzipped binaries
---
 api/upload-arduino.php | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/api/upload-arduino.php b/api/upload-arduino.php
index 2b472c643..bf1f60846 100644
--- a/api/upload-arduino.php
+++ b/api/upload-arduino.php
@@ -3,12 +3,46 @@
 //
 //var_dump($_FILES);
 
+/**
+ * GZIPs a file on disk (appending .gz to the name)
+ *
+ * From http://stackoverflow.com/questions/6073397/how-do-you-create-a-gz-file-using-php
+ * Based on function by Kioob at:
+ * http://www.php.net/manual/en/function.gzwrite.php#34955
+ *
+ * @param string $source Path to file that should be compressed
+ * @param integer $level GZIP compression level (default: 9)
+ * @return string New filename (with .gz appended) if success, or false if operation fails
+ */
+function gzCompressFile($source, $level = 9){
+  $dest = $source . '.gz';
+  $mode = 'wb' . $level;
+  $error = false;
+  if ($fp_out = gzopen($dest, $mode)) {
+      if ($fp_in = fopen($source,'rb')) {
+          while (!feof($fp_in))
+              gzwrite($fp_out, fread($fp_in, 1024 * 512));
+          fclose($fp_in);
+      } else {
+          $error = true;
+      }
+      gzclose($fp_out);
+  } else {
+      $error = true;
+  }
+  if ($error)
+      return false;
+  else
+      return $dest;
+}
+
 $image = basename($_FILES["file"]["name"]);
 $target_file = "arduino/".$image;
 $hostname = $_SERVER['SERVER_NAME'];
 
 if (move_uploaded_file($_FILES["file"]["tmp_name"], $target_file)) {
-  echo "The file $image has been uploaded to OTA server $hostname. \n";
+  gzCompressFile($target_file);
+  echo "The files $image and $image.gz have been uploaded to OTA server $hostname. \n";
 } else {
   echo "Sorry, there was an error uploading your file $image to OTA server $hostname. \n";
 }

From 9d881b97015a4da2c37accc254fe23b323b42046 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Mon, 6 Jan 2020 17:27:36 +0100
Subject: [PATCH 093/403] Update IRremoteESP8266 lib updated to v2.7.2

---
 lib/IRremoteESP8266-2.7.1/src/ir_LG.h         |  15 -
 .../CPPLINT.cfg                               |   0
 .../LICENSE.txt                               |   0
 .../README.md                                 |   4 +-
 .../README_fr.md                              |   4 +-
 .../ReleaseNotes.md                           |  13 +
 .../SupportedProtocols.md                     |  10 +-
 .../CommonAcControl/CommonAcControl.ino       |   0
 .../examples/CommonAcControl/platformio.ini   |   0
 .../ControlSamsungAC/ControlSamsungAC.ino     |   0
 .../examples/ControlSamsungAC/platformio.ini  |   0
 .../DumbIRRepeater/DumbIRRepeater.ino         |   0
 .../examples/DumbIRRepeater/platformio.ini    |   0
 .../examples/IRGCSendDemo/IRGCSendDemo.ino    |   0
 .../examples/IRGCSendDemo/platformio.ini      |   0
 .../examples/IRGCTCPServer/IRGCTCPServer.ino  |   0
 .../examples/IRGCTCPServer/platformio.ini     |   0
 .../examples/IRMQTTServer/IRMQTTServer.h      |   0
 .../examples/IRMQTTServer/IRMQTTServer.ino    |   0
 .../examples/IRMQTTServer/platformio.ini      |   0
 .../examples/IRServer/IRServer.ino            |   0
 .../examples/IRServer/platformio.ini          |   0
 .../examples/IRrecvDemo/IRrecvDemo.ino        |   0
 .../examples/IRrecvDemo/platformio.ini        |   0
 .../examples/IRrecvDump/IRrecvDump.ino        |   0
 .../examples/IRrecvDump/platformio.ini        |   0
 .../examples/IRrecvDumpV2/IRrecvDumpV2.ino    |   0
 .../examples/IRrecvDumpV2/platformio.ini      |   0
 .../examples/IRsendDemo/IRsendDemo.ino        |   0
 .../examples/IRsendDemo/platformio.ini        |   0
 .../IRsendProntoDemo/IRsendProntoDemo.ino     |   0
 .../examples/IRsendProntoDemo/platformio.ini  |   0
 .../JVCPanasonicSendDemo.ino                  |   0
 .../JVCPanasonicSendDemo/platformio.ini       |   0
 .../examples/LGACSend/LGACSend.ino            |   0
 .../examples/LGACSend/platformio.ini          |   0
 .../SmartIRRepeater/SmartIRRepeater.ino       |   0
 .../examples/SmartIRRepeater/platformio.ini   |   0
 .../examples/TurnOnArgoAC/TurnOnArgoAC.ino    |   0
 .../examples/TurnOnArgoAC/platformio.ini      |   0
 .../TurnOnDaikinAC/TurnOnDaikinAC.ino         |   0
 .../examples/TurnOnDaikinAC/platformio.ini    |   0
 .../TurnOnFujitsuAC/TurnOnFujitsuAC.ino       |   0
 .../examples/TurnOnFujitsuAC/platformio.ini   |   0
 .../TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino |   0
 .../TurnOnKelvinatorAC/platformio.ini         |   0
 .../TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino |   0
 .../TurnOnMitsubishiAC/platformio.ini         |   0
 .../TurnOnMitsubishiHeavyAc.ino               |   0
 .../TurnOnMitsubishiHeavyAc/platformio.ini    |   0
 .../TurnOnPanasonicAC/TurnOnPanasonicAC.ino   |   0
 .../examples/TurnOnPanasonicAC/platformio.ini |   0
 .../TurnOnToshibaAC/TurnOnToshibaAC.ino       |   0
 .../examples/TurnOnToshibaAC/platformio.ini   |   0
 .../TurnOnTrotecAC/TurnOnTrotecAC.ino         |   0
 .../examples/TurnOnTrotecAC/platformio.ini    |   0
 .../examples/Web-AC-control/README.md         |   0
 .../Web-AC-control/Web-AC-control.ino         |   0
 .../examples/Web-AC-control/platformio.ini    |   0
 .../examples/Web-AC-control/printscreen.png   | Bin
 .../Web-AC-control/upload/favicon.ico         | Bin
 .../Web-AC-control/upload/level_1_off.svg     |   0
 .../Web-AC-control/upload/level_1_on.svg      |   0
 .../Web-AC-control/upload/level_2_off.svg     |   0
 .../Web-AC-control/upload/level_2_on.svg      |   0
 .../Web-AC-control/upload/level_3_off.svg     |   0
 .../Web-AC-control/upload/level_3_on.svg      |   0
 .../Web-AC-control/upload/level_4_off.svg     |   0
 .../Web-AC-control/upload/level_4_on.svg      |   0
 .../examples/Web-AC-control/upload/ui.html    |   0
 .../examples/Web-AC-control/upload/ui.js      |   0
 .../keywords.txt                              |  51 +++
 .../library.json                              |   2 +-
 .../library.properties                        |   2 +-
 .../pylintrc                                  |   0
 .../src/CPPLINT.cfg                           |   0
 .../src/IRac.cpp                              | 215 +++++++---
 .../src/IRac.h                                |  23 +-
 .../src/IRrecv.cpp                            |   0
 .../src/IRrecv.h                              |   0
 .../src/IRremoteESP8266.h                     |   6 +-
 .../src/IRsend.cpp                            |   0
 .../src/IRsend.h                              |   5 +
 .../src/IRtext.cpp                            |   0
 .../src/IRtext.h                              |   0
 .../src/IRtimer.cpp                           |   0
 .../src/IRtimer.h                             |   0
 .../src/IRutils.cpp                           |  22 +-
 .../src/IRutils.h                             |   0
 .../src/i18n.h                                |   0
 .../src/ir_Aiwa.cpp                           |   0
 .../src/ir_Amcor.cpp                          |   0
 .../src/ir_Amcor.h                            |   0
 .../src/ir_Argo.cpp                           |   0
 .../src/ir_Argo.h                             |   0
 .../src/ir_Carrier.cpp                        |   0
 .../src/ir_Coolix.cpp                         |   0
 .../src/ir_Coolix.h                           |   0
 .../src/ir_Daikin.cpp                         |   0
 .../src/ir_Daikin.h                           |   0
 .../src/ir_Denon.cpp                          |   0
 .../src/ir_Dish.cpp                           |   0
 .../src/ir_Electra.cpp                        |   0
 .../src/ir_Electra.h                          |   0
 .../src/ir_Fujitsu.cpp                        |   0
 .../src/ir_Fujitsu.h                          |   0
 .../src/ir_GICable.cpp                        |   0
 .../src/ir_GlobalCache.cpp                    |   0
 .../src/ir_Goodweather.cpp                    |   0
 .../src/ir_Goodweather.h                      |   0
 .../src/ir_Gree.cpp                           |   0
 .../src/ir_Gree.h                             |   0
 .../src/ir_Haier.cpp                          |   0
 .../src/ir_Haier.h                            |   0
 .../src/ir_Hitachi.cpp                        |   0
 .../src/ir_Hitachi.h                          |   0
 .../src/ir_Inax.cpp                           |   0
 .../src/ir_JVC.cpp                            |   0
 .../src/ir_Kelvinator.cpp                     |   0
 .../src/ir_Kelvinator.h                       |   0
 .../src/ir_LG.cpp                             | 261 ++++++++++++
 lib/IRremoteESP8266-2.7.2/src/ir_LG.h         | 108 +++++
 .../src/ir_Lasertag.cpp                       |   0
 .../src/ir_Lego.cpp                           |   0
 .../src/ir_Lutron.cpp                         |   0
 .../src/ir_MWM.cpp                            |   0
 .../src/ir_Magiquest.cpp                      |   0
 .../src/ir_Magiquest.h                        |   0
 .../src/ir_Midea.cpp                          |   0
 .../src/ir_Midea.h                            |   0
 .../src/ir_Mitsubishi.cpp                     |   0
 .../src/ir_Mitsubishi.h                       |   0
 .../src/ir_MitsubishiHeavy.cpp                |   0
 .../src/ir_MitsubishiHeavy.h                  |   0
 .../src/ir_NEC.cpp                            |   0
 .../src/ir_NEC.h                              |  29 ++
 .../src/ir_Neoclima.cpp                       |   0
 .../src/ir_Neoclima.h                         |   0
 .../src/ir_Nikai.cpp                          |   0
 .../src/ir_Panasonic.cpp                      |   0
 .../src/ir_Panasonic.h                        |   0
 .../src/ir_Pioneer.cpp                        |   0
 .../src/ir_Pronto.cpp                         |   0
 .../src/ir_RC5_RC6.cpp                        |   0
 .../src/ir_RCMM.cpp                           |   0
 .../src/ir_Samsung.cpp                        |   0
 .../src/ir_Samsung.h                          |   0
 .../src/ir_Sanyo.cpp                          |   0
 .../src/ir_Sharp.cpp                          |   0
 .../src/ir_Sharp.h                            |   0
 .../src/ir_Sherwood.cpp                       |   0
 .../src/ir_Sony.cpp                           |   0
 .../src/ir_Tcl.cpp                            |   0
 .../src/ir_Tcl.h                              |   0
 .../src/ir_Teco.cpp                           |   0
 .../src/ir_Teco.h                             |   0
 .../src/ir_Toshiba.cpp                        |   0
 .../src/ir_Toshiba.h                          |   0
 .../src/ir_Trotec.cpp                         |   0
 .../src/ir_Trotec.h                           |   0
 .../src/ir_Vestel.cpp                         |   0
 .../src/ir_Vestel.h                           |   0
 .../src/ir_Whirlpool.cpp                      |   0
 .../src/ir_Whirlpool.h                        |   0
 .../src/ir_Whynter.cpp                        |   0
 .../src/locale/README.md                      |   0
 .../src/locale/de-CH.h                        |   0
 .../src/locale/de-DE.h                        |   0
 .../src/locale/defaults.h                     |   0
 .../src/locale/en-AU.h                        |   0
 .../src/locale/en-IE.h                        |   0
 .../src/locale/en-UK.h                        |   0
 .../src/locale/en-US.h                        |   0
 .../src/locale/es-ES.h                        |   0
 .../src/locale/fr-FR.h                        |   0
 .../test/IRac_test.cpp                        | 112 +++++
 .../test/IRrecv_test.cpp                      |   0
 .../test/IRrecv_test.h                        |   0
 .../test/IRsend_test.cpp                      |   0
 .../test/IRsend_test.h                        |   0
 .../test/IRutils_test.cpp                     |   0
 .../test/Makefile                             |   2 +-
 .../test/ir_Aiwa_test.cpp                     |   0
 .../test/ir_Amcor_test.cpp                    |   0
 .../test/ir_Argo_test.cpp                     |   0
 .../test/ir_Carrier_test.cpp                  |   0
 .../test/ir_Coolix_test.cpp                   |   0
 .../test/ir_Daikin_test.cpp                   |   0
 .../test/ir_Denon_test.cpp                    |   0
 .../test/ir_Dish_test.cpp                     |   0
 .../test/ir_Electra_test.cpp                  |   0
 .../test/ir_Fujitsu_test.cpp                  |   0
 .../test/ir_GICable_test.cpp                  |   0
 .../test/ir_GlobalCache_test.cpp              |   0
 .../test/ir_Goodweather_test.cpp              |   0
 .../test/ir_Gree_test.cpp                     |   0
 .../test/ir_Haier_test.cpp                    |   0
 .../test/ir_Hitachi_test.cpp                  |   0
 .../test/ir_Inax_test.cpp                     |   0
 .../test/ir_JVC_test.cpp                      |   0
 .../test/ir_Kelvinator_test.cpp               |   0
 .../test/ir_LG_test.cpp                       | 400 +++++++++++++++++-
 .../test/ir_Lasertag_test.cpp                 |   0
 .../test/ir_Lego_test.cpp                     |   0
 .../test/ir_Lutron_test.cpp                   |   0
 .../test/ir_MWM_test.cpp                      |   0
 .../test/ir_Magiquest_test.cpp                |   0
 .../test/ir_Midea_test.cpp                    |   0
 .../test/ir_MitsubishiHeavy_test.cpp          |   0
 .../test/ir_Mitsubishi_test.cpp               |   0
 .../test/ir_NEC_test.cpp                      |   0
 .../test/ir_Neoclima_test.cpp                 |   0
 .../test/ir_Nikai_test.cpp                    |   0
 .../test/ir_Panasonic_test.cpp                |   0
 .../test/ir_Pioneer_test.cpp                  |   0
 .../test/ir_Pronto_test.cpp                   |   0
 .../test/ir_RC5_RC6_test.cpp                  |   0
 .../test/ir_RCMM_test.cpp                     |   0
 .../test/ir_Samsung_test.cpp                  |   0
 .../test/ir_Sanyo_test.cpp                    |   0
 .../test/ir_Sharp_test.cpp                    |   0
 .../test/ir_Sherwood_test.cpp                 |   0
 .../test/ir_Sony_test.cpp                     |   0
 .../test/ir_Tcl_test.cpp                      |   0
 .../test/ir_Teco_test.cpp                     |   0
 .../test/ir_Toshiba_test.cpp                  |   0
 .../test/ir_Trotec_test.cpp                   |   0
 .../test/ir_Vestel_test.cpp                   |   0
 .../test/ir_Whirlpool_test.cpp                |   0
 .../test/ir_Whynter_test.cpp                  |   0
 .../tools/Makefile                            |   2 +-
 .../tools/RawToGlobalCache.sh                 |   0
 .../tools/auto_analyse_raw_data.py            |   0
 .../tools/auto_analyse_raw_data_test.py       |   0
 .../tools/gc_decode.cpp                       |   0
 .../tools/generate_irtext_h.sh                |   0
 .../tools/mkkeywords                          |   0
 .../tools/mode2_decode.cpp                    |   0
 .../tools/scrape_supported_devices.py         |  13 +-
 tasmota/CHANGELOG.md                          |   1 +
 240 files changed, 1182 insertions(+), 118 deletions(-)
 delete mode 100644 lib/IRremoteESP8266-2.7.1/src/ir_LG.h
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/LICENSE.txt (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/README.md (98%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/README_fr.md (98%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/ReleaseNotes.md (98%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/SupportedProtocols.md (95%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/CommonAcControl/CommonAcControl.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/CommonAcControl/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/ControlSamsungAC/ControlSamsungAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/ControlSamsungAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/DumbIRRepeater/DumbIRRepeater.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/DumbIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRGCSendDemo/IRGCSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRGCSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRGCTCPServer/IRGCTCPServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRGCTCPServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRMQTTServer/IRMQTTServer.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRMQTTServer/IRMQTTServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRMQTTServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRServer/IRServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDemo/IRrecvDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDump/IRrecvDump.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDump/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDumpV2/IRrecvDumpV2.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRrecvDumpV2/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRsendDemo/IRsendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRsendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRsendProntoDemo/IRsendProntoDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/IRsendProntoDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/JVCPanasonicSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/LGACSend/LGACSend.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/LGACSend/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/SmartIRRepeater/SmartIRRepeater.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/SmartIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnArgoAC/TurnOnArgoAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnArgoAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnDaikinAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnFujitsuAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnKelvinatorAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnMitsubishiAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnMitsubishiHeavyAc/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnPanasonicAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnToshibaAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/TurnOnTrotecAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/Web-AC-control.ino (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/printscreen.png (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/favicon.ico (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_1_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_1_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_2_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_2_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_3_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_3_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_4_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/level_4_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/ui.html (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/examples/Web-AC-control/upload/ui.js (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/keywords.txt (98%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/library.json (97%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/library.properties (97%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/pylintrc (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRac.cpp (91%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRac.h (95%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRrecv.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRrecv.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRremoteESP8266.h (99%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRsend.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRsend.h (99%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRtext.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRtext.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRtimer.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRtimer.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRutils.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/IRutils.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/i18n.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Aiwa.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Amcor.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Amcor.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Argo.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Argo.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Carrier.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Coolix.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Coolix.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Daikin.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Daikin.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Denon.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Dish.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Electra.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Electra.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Fujitsu.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Fujitsu.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_GICable.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_GlobalCache.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Goodweather.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Goodweather.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Gree.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Gree.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Haier.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Haier.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Hitachi.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Hitachi.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Inax.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_JVC.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Kelvinator.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Kelvinator.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_LG.cpp (56%)
 create mode 100644 lib/IRremoteESP8266-2.7.2/src/ir_LG.h
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Lasertag.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Lego.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Lutron.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_MWM.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Magiquest.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Magiquest.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Midea.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Midea.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Mitsubishi.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Mitsubishi.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_MitsubishiHeavy.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_MitsubishiHeavy.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_NEC.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_NEC.h (53%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Neoclima.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Neoclima.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Nikai.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Panasonic.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Panasonic.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Pioneer.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Pronto.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_RC5_RC6.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_RCMM.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Samsung.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Samsung.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Sanyo.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Sharp.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Sharp.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Sherwood.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Sony.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Tcl.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Tcl.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Teco.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Teco.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Toshiba.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Toshiba.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Trotec.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Trotec.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Vestel.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Vestel.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Whirlpool.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Whirlpool.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/ir_Whynter.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/de-CH.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/de-DE.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/defaults.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/en-AU.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/en-IE.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/en-UK.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/en-US.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/es-ES.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/src/locale/fr-FR.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRac_test.cpp (93%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRrecv_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRrecv_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRsend_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRsend_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/IRutils_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/Makefile (99%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Aiwa_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Amcor_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Argo_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Carrier_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Coolix_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Daikin_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Denon_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Dish_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Electra_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Fujitsu_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_GICable_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_GlobalCache_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Goodweather_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Gree_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Haier_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Hitachi_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Inax_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_JVC_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Kelvinator_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_LG_test.cpp (59%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Lasertag_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Lego_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Lutron_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_MWM_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Magiquest_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Midea_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_MitsubishiHeavy_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Mitsubishi_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_NEC_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Neoclima_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Nikai_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Panasonic_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Pioneer_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Pronto_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_RC5_RC6_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_RCMM_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Samsung_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Sanyo_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Sharp_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Sherwood_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Sony_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Tcl_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Teco_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Toshiba_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Trotec_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Vestel_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Whirlpool_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/test/ir_Whynter_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/Makefile (99%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/RawToGlobalCache.sh (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/auto_analyse_raw_data.py (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/auto_analyse_raw_data_test.py (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/gc_decode.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/generate_irtext_h.sh (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/mkkeywords (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/mode2_decode.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.1 => IRremoteESP8266-2.7.2}/tools/scrape_supported_devices.py (96%)

diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_LG.h b/lib/IRremoteESP8266-2.7.1/src/ir_LG.h
deleted file mode 100644
index 01f81e2c1..000000000
--- a/lib/IRremoteESP8266-2.7.1/src/ir_LG.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 David Conran
-
-// Supports:
-//   Brand: LG,  Model: 6711A20083V remote
-//   Brand: LG,  Model: AKB74395308 remote
-
-#ifndef IR_LG_H_
-#define IR_LG_H_
-
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-
-uint8_t calcLGChecksum(uint16_t data);
-
-#endif  // IR_LG_H_
diff --git a/lib/IRremoteESP8266-2.7.1/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.2/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.2/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.1/LICENSE.txt b/lib/IRremoteESP8266-2.7.2/LICENSE.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/LICENSE.txt
rename to lib/IRremoteESP8266-2.7.2/LICENSE.txt
diff --git a/lib/IRremoteESP8266-2.7.1/README.md b/lib/IRremoteESP8266-2.7.2/README.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.1/README.md
rename to lib/IRremoteESP8266-2.7.2/README.md
index e06c8fb79..18066c612 100644
--- a/lib/IRremoteESP8266-2.7.1/README.md
+++ b/lib/IRremoteESP8266-2.7.2/README.md
@@ -9,8 +9,8 @@
 This library enables you to **send _and_ receive** infra-red signals on an [ESP8266](https://github.com/esp8266/Arduino) or an
 [ESP32](https://github.com/espressif/arduino-esp32) using the [Arduino framework](https://www.arduino.cc/) using common 940nm IR LEDs and common IR receiver modules. e.g. TSOP{17,22,24,36,38,44,48}* demodulators etc.
 
-## v2.7.1 Now Available
-Version 2.7.1 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
+## v2.7.2 Now Available
+Version 2.7.2 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
 
 #### Upgrading from pre-v2.0
 Usage of the library has been slightly changed in v2.0. You will need to change your usage to work with v2.0 and beyond. You can read more about the changes required on our [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.1/README_fr.md b/lib/IRremoteESP8266-2.7.2/README_fr.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.1/README_fr.md
rename to lib/IRremoteESP8266-2.7.2/README_fr.md
index b24d935c5..8dad47961 100644
--- a/lib/IRremoteESP8266-2.7.1/README_fr.md
+++ b/lib/IRremoteESP8266-2.7.2/README_fr.md
@@ -9,8 +9,8 @@
 Cette librairie vous permetra de **recevoir et d'envoyer des signaux** infrarouge sur le protocole [ESP8266](https://github.com/esp8266/Arduino) ou sur le protocole
 [ESP32](https://github.com/espressif/arduino-esp32) en utilisant le [Arduino framework](https://www.arduino.cc/) qui utilise la norme 940nm IR LEDs et le module basique de reception d'onde IR. Exemple : TSOP{17,22,24,36,38,44,48}* modules etc.
 
-## v2.7.1 disponible
-Version 2.7.1 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
+## v2.7.2 disponible
+Version 2.7.2 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
 
 #### mise à jour depuis pre-v2.0
 L'utilisation de la librairie à un peu changer depuis la version in v2.0. Si vous voulez l'utiliser vous devrez changer votre utilisation aussi. Vous pouvez vous renseigner sur les précondition d'utilisation ici : [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.1/ReleaseNotes.md b/lib/IRremoteESP8266-2.7.2/ReleaseNotes.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.1/ReleaseNotes.md
rename to lib/IRremoteESP8266-2.7.2/ReleaseNotes.md
index 537960ac9..04dee7b81 100644
--- a/lib/IRremoteESP8266-2.7.1/ReleaseNotes.md
+++ b/lib/IRremoteESP8266-2.7.2/ReleaseNotes.md
@@ -1,5 +1,18 @@
 # Release Notes
 
+## _v2.7.2 (20200106)_
+
+**[Bug Fixes]**
+- Common AC api: Better handle protocols with power toggles. (#1002)
+
+**[Features]**
+- Experimental detailed support for LG a/c. (#1008 #1009)
+
+**[Misc]**
+- Add remote codes for Aloka LED lamp. (#1005)
+- Improve Supported Devices scraping. (#1006)
+
+
 ## _v2.7.1 (20191125)_
 
 **[Bug Fixes]**
diff --git a/lib/IRremoteESP8266-2.7.1/SupportedProtocols.md b/lib/IRremoteESP8266-2.7.2/SupportedProtocols.md
similarity index 95%
rename from lib/IRremoteESP8266-2.7.1/SupportedProtocols.md
rename to lib/IRremoteESP8266-2.7.2/SupportedProtocols.md
index 02d51093a..440fe8e20 100644
--- a/lib/IRremoteESP8266-2.7.1/SupportedProtocols.md
+++ b/lib/IRremoteESP8266-2.7.2/SupportedProtocols.md
@@ -1,6 +1,6 @@
 <!--- WARNING: Do NOT edit this file directly.
       It is generated by './tools/scrape_supported_devices.py'.
-      Last generated: Mon Nov 25 11:12:06 2019 --->
+      Last generated: Sun Jan  5 15:53:26 2020 --->
 # IR Protocols supported by this library
 
 | Protocol | Brand | Model | A/C Model | Detailed A/C Support |
@@ -31,19 +31,21 @@
 | [JVC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_JVC.cpp) | **Unknown** |  |  | - |
 | [Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.cpp) | **[Green](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.h)** | YAPOF3 remote |  | Yes |
 | [Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.cpp) | **[Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.h)** | KSV26CRC A/C<BR>KSV26HRC A/C<BR>KSV35CRC A/C<BR>KSV35HRC A/C<BR>KSV53HRC A/C<BR>KSV62HRC A/C<BR>KSV70CRC A/C<BR>KSV70HRC A/C<BR>KSV80HRC A/C<BR>YALIF Remote |  | Yes |
-| [LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.cpp) | **[LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.h)** | 6711A20083V remote<BR>6711A20083V remote<BR>AKB74395308 remote<BR>AKB74395308 remote |  | Yes |
+| [LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.cpp) | **[General Electric](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.h)** | 6711AR2853M A/C Remote<BR>AG1BH09AW101 Split A/C |  | Yes |
+| [LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.cpp) | **[LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.h)** | 6711A20083V remote<BR>6711A20083V remote<BR>AKB74395308 remote<BR>AKB74395308 remote<BR>AKB75215403 remote (LG2)<BR>S4-W12JA3AA A/C (LG2) |  | Yes |
 | [Lasertag](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Lasertag.cpp) | **Unknown** |  |  | - |
 | [Lego](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Lego.cpp) | **LEGO Power Functions** | IR Receiver |  | - |
 | [Lutron](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Lutron.cpp) | **Unknown** |  |  | - |
 | [MWM](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MWM.cpp) | **Unknown** |  |  | - |
-| [Magiquest](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.cpp) | **[Unknown](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.h)** |  |  | Yes |
+| [Magiquest](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.cpp) | **[Unknown](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.h)** |  |  | - |
 | [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Comfee](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | MPD1-12CRN7 A/C |  | Yes |
 | [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Keystone](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | RG57H4(B)BGEF remote |  | Yes |
 | [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Pioneer System](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | RUBO18GMFILCAD A/C (18K BTU)<BR>RYBO12GMFILCAD A/C (12K BTU) |  | Yes |
 | [Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.cpp) | **[Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.h)** | HC3000 Projector<BR>KM14A 0179213 remote<BR>MS-GK24VA A/C<BR>TV |  | Yes |
 | [Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.cpp) | **[Mitsubishi Electric](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.h)** | 001CP T7WE10714 remote<BR>KPOA remote<BR>MSH-A24WV / MUH-A24WV A/C<BR>PEAD-RP71JAA Ducted A/C |  | Yes |
 | [MitsubishiHeavy](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.cpp) | **[Mitsubishi Heavy Industries](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.h)** | RKX502A001C remote<BR>RLA502A700B remote<BR>SRKxxZJ-S A/C<BR>SRKxxZM-S A/C<BR>SRKxxZMXA-S A/C |  | Yes |
-| [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Yamaha](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | RAV561 remote<BR>RXV585B A/V Receiver |  | Yes |
+| [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Aloka](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | SleepyLights LED Lamp |  | - |
+| [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Yamaha](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | RAV561 remote<BR>RXV585B A/V Receiver |  | - |
 | [Neoclima](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Neoclima.cpp) | **[Neoclima](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Neoclima.h)** | NS-09AHTI A/C<BR>NS-09AHTI A/C<BR>ZH/TY-01 remote<BR>ZH/TY-01 remote |  | Yes |
 | [Nikai](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Nikai.cpp) | **Unknown** |  |  | - |
 | [Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.cpp) | **[Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.h)** | A75C2311 remote (CKP)<BR>A75C3704 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>CKP series A/C<BR>CS-ME10CKPG A/C<BR>CS-ME12CKPG A/C<BR>CS-ME14CKPG A/C<BR>CS-YW9MKD A/C<BR>CS-Z9RKR A/C<BR>DKE series A/C<BR>JKE series A/C<BR>NKE series A/C<BR>RKR series A/C<BR>TV |  | Yes |
diff --git a/lib/IRremoteESP8266-2.7.1/examples/CommonAcControl/CommonAcControl.ino b/lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/CommonAcControl.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/CommonAcControl/CommonAcControl.ino
rename to lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/CommonAcControl.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/CommonAcControl/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/CommonAcControl/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/ControlSamsungAC/ControlSamsungAC.ino b/lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/ControlSamsungAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/ControlSamsungAC/ControlSamsungAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/ControlSamsungAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/ControlSamsungAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/ControlSamsungAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/DumbIRRepeater/DumbIRRepeater.ino b/lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/DumbIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/DumbIRRepeater/DumbIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/DumbIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/DumbIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/DumbIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRGCSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRGCSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRGCTCPServer/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRGCTCPServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/IRMQTTServer.h b/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/IRMQTTServer.h
rename to lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.h
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/IRMQTTServer.ino b/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266-2.7.2/examples/IRServer/IRServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRServer/IRServer.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRServer/IRServer.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRServer/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/IRrecvDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/IRrecvDump.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/IRrecvDump.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/IRrecvDumpV2.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/IRsendDemo.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/IRsendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266-2.7.2/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/LGACSend/LGACSend.ino
rename to lib/IRremoteESP8266-2.7.2/examples/LGACSend/LGACSend.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/LGACSend/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/LGACSend/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/LGACSend/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/SmartIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/SmartIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/SmartIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/README.md b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/README.md
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/README.md
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/Web-AC-control.ino b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/Web-AC-control.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/Web-AC-control.ino
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/Web-AC-control.ino
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/platformio.ini b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/platformio.ini
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/printscreen.png b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/printscreen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/printscreen.png
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/printscreen.png
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/favicon.ico b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/favicon.ico
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/favicon.ico
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/favicon.ico
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_off.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_off.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_off.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_on.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_on.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_on.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_off.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_off.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_off.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_on.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_on.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_on.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_off.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_off.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_off.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_on.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_on.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_on.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_off.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_off.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_off.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_on.svg b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_on.svg
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_on.svg
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.html b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.html
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.html
diff --git a/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.js b/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.js
rename to lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.js
diff --git a/lib/IRremoteESP8266-2.7.1/keywords.txt b/lib/IRremoteESP8266-2.7.2/keywords.txt
similarity index 98%
rename from lib/IRremoteESP8266-2.7.1/keywords.txt
rename to lib/IRremoteESP8266-2.7.2/keywords.txt
index f027e808b..2c8018ea6 100644
--- a/lib/IRremoteESP8266-2.7.1/keywords.txt
+++ b/lib/IRremoteESP8266-2.7.2/keywords.txt
@@ -39,6 +39,7 @@ IRHaierACYRW02	KEYWORD1
 IRHitachiAc	KEYWORD1
 IRHitachiAc424	KEYWORD1
 IRKelvinatorAC	KEYWORD1
+IRLgAc	KEYWORD1
 IRMideaAC	KEYWORD1
 IRMitsubishi112	KEYWORD1
 IRMitsubishi136	KEYWORD1
@@ -66,6 +67,7 @@ fanspeed_t	KEYWORD1
 fujitsu_ac_remote_model_t	KEYWORD1
 gree_ac_remote_model_t	KEYWORD1
 irparams_t	KEYWORD1
+lg_ac_remote_model_t	KEYWORD1
 match_result_t	KEYWORD1
 opmode_t	KEYWORD1
 panasonic_ac_remote_model_t	KEYWORD1
@@ -346,9 +348,11 @@ isSwingVToggle	KEYWORD2
 isTimeCommand	KEYWORD2
 isTimerActive	KEYWORD2
 isTimerEnabled	KEYWORD2
+isValidLgAc	KEYWORD2
 kelvinator	KEYWORD2
 ledOff	KEYWORD2
 ledOn	KEYWORD2
+lg	KEYWORD2
 mark	KEYWORD2
 match	KEYWORD2
 matchAtLeast	KEYWORD2
@@ -590,6 +594,7 @@ xorBytes	KEYWORD2
 //	LITERAL1
 AIWA_RC_T501	LITERAL1
 AIWA_RC_T501_BITS	LITERAL1
+AKB75215403	LITERAL1
 ALLOW_DELAY_CALLS	LITERAL1
 AMCOR	LITERAL1
 ARDB1	LITERAL1
@@ -748,6 +753,7 @@ FUJITSU_AC_SWING_BOTH	LITERAL1
 FUJITSU_AC_SWING_HORIZ	LITERAL1
 FUJITSU_AC_SWING_OFF	LITERAL1
 FUJITSU_AC_SWING_VERT	LITERAL1
+GE6711AR2853M	LITERAL1
 GICABLE	LITERAL1
 GICABLE_BITS	LITERAL1
 GLOBALCACHE	LITERAL1
@@ -1063,6 +1069,22 @@ kAiwaRcT501PostBits	LITERAL1
 kAiwaRcT501PostData	LITERAL1
 kAiwaRcT501PreBits	LITERAL1
 kAiwaRcT501PreData	LITERAL1
+kAlokaBits	LITERAL1
+kAlokaLedBlue	LITERAL1
+kAlokaLedGreen	LITERAL1
+kAlokaLedLightGreen	LITERAL1
+kAlokaLedMidBlue	LITERAL1
+kAlokaLedOrange	LITERAL1
+kAlokaLedPink	LITERAL1
+kAlokaLedPinkRed	LITERAL1
+kAlokaLedRainbow	LITERAL1
+kAlokaLedRed	LITERAL1
+kAlokaLedTreeGrow	LITERAL1
+kAlokaLedWhite	LITERAL1
+kAlokaLedYellow	LITERAL1
+kAlokaNightFade	LITERAL1
+kAlokaNightTimer	LITERAL1
+kAlokaPower	LITERAL1
 kAmcorAuto	LITERAL1
 kAmcorBits	LITERAL1
 kAmcorChecksumByte	LITERAL1
@@ -2094,9 +2116,38 @@ kLg32HdrSpace	LITERAL1
 kLg32HdrSpaceTicks	LITERAL1
 kLg32RptHdrMark	LITERAL1
 kLg32RptHdrMarkTicks	LITERAL1
+kLgAcAuto	LITERAL1
+kLgAcChecksumOffset	LITERAL1
+kLgAcChecksumSize	LITERAL1
+kLgAcCool	LITERAL1
+kLgAcDry	LITERAL1
+kLgAcFan	LITERAL1
+kLgAcFanAuto	LITERAL1
+kLgAcFanHigh	LITERAL1
+kLgAcFanLow	LITERAL1
+kLgAcFanMedium	LITERAL1
+kLgAcFanOffset	LITERAL1
+kLgAcFanSize	LITERAL1
+kLgAcHeat	LITERAL1
+kLgAcMaxTemp	LITERAL1
+kLgAcMinTemp	LITERAL1
+kLgAcModeOffset	LITERAL1
+kLgAcModeSize	LITERAL1
+kLgAcOffCommand	LITERAL1
+kLgAcPowerOff	LITERAL1
+kLgAcPowerOffset	LITERAL1
+kLgAcPowerOn	LITERAL1
+kLgAcPowerSize	LITERAL1
+kLgAcSignature	LITERAL1
+kLgAcSignatureOffset	LITERAL1
+kLgAcSignatureSize	LITERAL1
+kLgAcTempAdjust	LITERAL1
+kLgAcTempOffset	LITERAL1
+kLgAcTempSize	LITERAL1
 kLgBitMark	LITERAL1
 kLgBitMarkTicks	LITERAL1
 kLgBits	LITERAL1
+kLgDefaultRepeat	LITERAL1
 kLgHdrMark	LITERAL1
 kLgHdrMarkTicks	LITERAL1
 kLgHdrSpace	LITERAL1
diff --git a/lib/IRremoteESP8266-2.7.1/library.json b/lib/IRremoteESP8266-2.7.2/library.json
similarity index 97%
rename from lib/IRremoteESP8266-2.7.1/library.json
rename to lib/IRremoteESP8266-2.7.2/library.json
index 50464bed1..4ade0fa6b 100644
--- a/lib/IRremoteESP8266-2.7.1/library.json
+++ b/lib/IRremoteESP8266-2.7.2/library.json
@@ -1,6 +1,6 @@
 {
   "name": "IRremoteESP8266",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "keywords": "infrared, ir, remote, esp8266, esp32",
   "description": "Send and receive infrared signals with multiple protocols (ESP8266/ESP32)",
   "repository":
diff --git a/lib/IRremoteESP8266-2.7.1/library.properties b/lib/IRremoteESP8266-2.7.2/library.properties
similarity index 97%
rename from lib/IRremoteESP8266-2.7.1/library.properties
rename to lib/IRremoteESP8266-2.7.2/library.properties
index 6e7215626..b5d866c3d 100644
--- a/lib/IRremoteESP8266-2.7.1/library.properties
+++ b/lib/IRremoteESP8266-2.7.2/library.properties
@@ -1,5 +1,5 @@
 name=IRremoteESP8266
-version=2.7.1
+version=2.7.2
 author=David Conran, Sebastien Warin, Mark Szabo, Ken Shirriff
 maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto
 sentence=Send and receive infrared signals with multiple protocols (ESP8266/ESP32)
diff --git a/lib/IRremoteESP8266-2.7.1/pylintrc b/lib/IRremoteESP8266-2.7.2/pylintrc
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/pylintrc
rename to lib/IRremoteESP8266-2.7.2/pylintrc
diff --git a/lib/IRremoteESP8266-2.7.1/src/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.2/src/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.2/src/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRac.cpp b/lib/IRremoteESP8266-2.7.2/src/IRac.cpp
similarity index 91%
rename from lib/IRremoteESP8266-2.7.1/src/IRac.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRac.cpp
index f8e5ca759..5cb56b974 100644
--- a/lib/IRremoteESP8266-2.7.1/src/IRac.cpp
+++ b/lib/IRremoteESP8266-2.7.2/src/IRac.cpp
@@ -25,6 +25,7 @@
 #include "ir_Haier.h"
 #include "ir_Hitachi.h"
 #include "ir_Kelvinator.h"
+#include "ir_LG.h"
 #include "ir_Midea.h"
 #include "ir_Mitsubishi.h"
 #include "ir_MitsubishiHeavy.h"
@@ -149,6 +150,10 @@ bool IRac::isProtocolSupported(const decode_type_t protocol) {
 #if SEND_KELVINATOR
     case decode_type_t::KELVINATOR:
 #endif
+#if SEND_LG
+    case decode_type_t::LG:
+    case decode_type_t::LG2:
+#endif
 #if SEND_MIDEA
     case decode_type_t::MIDEA:
 #endif
@@ -719,6 +724,30 @@ void IRac::kelvinator(IRKelvinatorAC *ac,
 }
 #endif  // SEND_KELVINATOR
 
+#if SEND_LG
+void IRac::lg(IRLgAc *ac, const lg_ac_remote_model_t model,
+              const bool on, const stdAc::opmode_t mode,
+              const float degrees, const stdAc::fanspeed_t fan) {
+  ac->begin();
+  ac->setModel(model);
+  ac->setPower(on);
+  ac->setMode(ac->convertMode(mode));
+  ac->setTemp(degrees);
+  ac->setFan(ac->convertFan(fan));
+  // No Vertical swing setting available.
+  // No Horizontal swing setting available.
+  // No Quiet setting available.
+  // No Turbo setting available.
+  // No Light setting available.
+  // No Filter setting available.
+  // No Clean setting available.
+  // No Beep setting available.
+  // No Sleep setting available.
+  // No Clock setting available.
+  ac->send();
+}
+#endif  // SEND_LG
+
 #if SEND_MIDEA
 void IRac::midea(IRMideaAC *ac,
                  const bool on, const stdAc::opmode_t mode, const bool celsius,
@@ -1144,6 +1173,20 @@ void IRac::whirlpool(IRWhirlpoolAc *ac, const whirlpool_ac_remote_model_t model,
 }
 #endif  // SEND_WHIRLPOOL_AC
 
+// Create a new state base on the provided state that has been suitably fixed.
+// Args:
+//   state: The state_t structure describing the desired a/c state.
+//
+// Returns:
+//   A stdAc::state_t with the needed settings.
+stdAc::state_t IRac::cleanState(const stdAc::state_t state) {
+  stdAc::state_t result = state;
+  // A hack for Home Assistant, it appears to need/want an Off opmode.
+  // So enforce the power is off if the mode is also off.
+  if (state.mode == stdAc::opmode_t::kOff) result.power = false;
+  return result;
+}
+
 // Create a new state base on desired & previous states but handle
 // any state changes for options that need to be toggled.
 // Args:
@@ -1244,23 +1287,18 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
 // Returns:
 //   boolean: True, if accepted/converted/attempted. False, if unsupported.
 bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
-  stdAc::state_t send = this->handleToggles(desired, prev);
-  // Convert the temperature to Celsius.
-  float degC;
-  if (desired.celsius)
-    degC = send.degrees;
-  else
-    degC = fahrenheitToCelsius(desired.degrees);
-  bool on = desired.power;
-  // A hack for Home Assistant, it appears to need/want an Off opmode.
-  if (desired.mode == stdAc::opmode_t::kOff) on = false;
+  // Convert the temp from Fahrenheit to Celsius if we are not in Celsius mode.
+  float degC = desired.celsius ? desired.degrees
+                               : fahrenheitToCelsius(desired.degrees);
+  // special `state_t` that is required to be sent based on that.
+  stdAc::state_t send = this->handleToggles(this->cleanState(desired), prev);
   // Per vendor settings & setup.
   switch (send.protocol) {
 #if SEND_AMCOR
     case AMCOR:
     {
       IRAmcorAc ac(_pin, _inverted, _modulation);
-      amcor(&ac, on, send.mode, degC, send.fanspeed);
+      amcor(&ac, send.power, send.mode, degC, send.fanspeed);
       break;
     }
 #endif  // SEND_AMCOR
@@ -1268,8 +1306,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case ARGO:
     {
       IRArgoAC ac(_pin, _inverted, _modulation);
-      argo(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.turbo,
-          send.sleep);
+      argo(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+           send.turbo, send.sleep);
       break;
     }
 #endif  // SEND_ARGO
@@ -1277,8 +1315,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case COOLIX:
     {
       IRCoolixAC ac(_pin, _inverted, _modulation);
-      coolix(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.swingh,
-             send.turbo, send.light, send.clean, send.sleep);
+      coolix(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+             send.swingh, send.turbo, send.light, send.clean, send.sleep);
       break;
     }
 #endif  // SEND_COOLIX
@@ -1286,8 +1324,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN:
     {
       IRDaikinESP ac(_pin, _inverted, _modulation);
-      daikin(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.swingh,
-             send.quiet, send.turbo, send.econo, send.clean);
+      daikin(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+             send.swingh, send.quiet, send.turbo, send.econo, send.clean);
       break;
     }
 #endif  // SEND_DAIKIN
@@ -1295,7 +1333,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN128:
     {
       IRDaikin128 ac(_pin, _inverted, _modulation);
-      daikin128(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      daikin128(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                 send.quiet, send.turbo, send.light, send.econo, send.sleep,
                 send.clock);
       break;
@@ -1305,7 +1343,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN152:
     {
       IRDaikin152 ac(_pin, _inverted, _modulation);
-      daikin152(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      daikin152(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                 send.quiet, send.turbo, send.econo);
       break;
     }
@@ -1314,7 +1352,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN160:
     {
       IRDaikin160 ac(_pin, _inverted, _modulation);
-      daikin160(&ac, on, send.mode, degC, send.fanspeed, send.swingv);
+      daikin160(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv);
       break;
     }
 #endif  // SEND_DAIKIN160
@@ -1322,7 +1360,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN176:
     {
       IRDaikin176 ac(_pin, _inverted, _modulation);
-      daikin176(&ac, on, send.mode, degC, send.fanspeed, send.swingh);
+      daikin176(&ac, send.power, send.mode, degC, send.fanspeed, send.swingh);
       break;
     }
 #endif  // SEND_DAIKIN176
@@ -1330,9 +1368,9 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN2:
     {
       IRDaikin2 ac(_pin, _inverted, _modulation);
-      daikin2(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.swingh,
-              send.quiet, send.turbo, send.light, send.econo, send.filter,
-              send.clean, send.beep, send.sleep, send.clock);
+      daikin2(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+              send.swingh, send.quiet, send.turbo, send.light, send.econo,
+              send.filter, send.clean, send.beep, send.sleep, send.clock);
       break;
     }
 #endif  // SEND_DAIKIN2
@@ -1340,7 +1378,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case DAIKIN216:
     {
       IRDaikin216 ac(_pin, _inverted, _modulation);
-      daikin216(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      daikin216(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                 send.swingh, send.quiet, send.turbo);
       break;
     }
@@ -1349,7 +1387,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case ELECTRA_AC:
     {
       IRElectraAc ac(_pin, _inverted, _modulation);
-      electra(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      electra(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
               send.swingh);
       break;
     }
@@ -1359,9 +1397,9 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     {
       IRFujitsuAC ac(_pin, (fujitsu_ac_remote_model_t)send.model, _inverted,
                      _modulation);
-      fujitsu(&ac, (fujitsu_ac_remote_model_t)send.model, on, send.mode, degC,
-              send.fanspeed, send.swingv, send.swingh, send.quiet, send.turbo,
-              send.econo, send.filter, send.clean);
+      fujitsu(&ac, (fujitsu_ac_remote_model_t)send.model, send.power, send.mode,
+              degC, send.fanspeed, send.swingv, send.swingh, send.quiet,
+              send.turbo, send.econo, send.filter, send.clean);
       break;
     }
 #endif  // SEND_FUJITSU_AC
@@ -1369,7 +1407,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case GOODWEATHER:
     {
       IRGoodweatherAc ac(_pin, _inverted, _modulation);
-      goodweather(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      goodweather(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                   send.turbo, send.light, send.sleep);
       break;
     }
@@ -1379,7 +1417,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     {
       IRGreeAC ac(_pin, (gree_ac_remote_model_t)send.model, _inverted,
                   _modulation);
-      gree(&ac, (gree_ac_remote_model_t)send.model, on, send.mode, degC,
+      gree(&ac, (gree_ac_remote_model_t)send.model, send.power, send.mode, degC,
            send.fanspeed, send.swingv, send.turbo, send.light, send.clean,
            send.sleep);
       break;
@@ -1389,8 +1427,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case HAIER_AC:
     {
       IRHaierAC ac(_pin, _inverted, _modulation);
-      haier(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.filter,
-            send.sleep, send.clock);
+      haier(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+            send.filter, send.sleep, send.clock);
       break;
     }
 #endif  // SEND_HAIER_AC
@@ -1398,7 +1436,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case HAIER_AC_YRW02:
     {
       IRHaierACYRW02 ac(_pin, _inverted, _modulation);
-      haierYrwo2(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      haierYrwo2(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                  send.turbo, send.filter, send.sleep);
       break;
     }
@@ -1407,7 +1445,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case HITACHI_AC:
     {
       IRHitachiAc ac(_pin, _inverted, _modulation);
-      hitachi(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      hitachi(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
               send.swingh);
       break;
     }
@@ -1416,7 +1454,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case HITACHI_AC424:
     {
       IRHitachiAc424 ac(_pin, _inverted, _modulation);
-      hitachi424(&ac, on, send.mode, degC, send.fanspeed, send.swingv);
+      hitachi424(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv);
       break;
     }
 #endif  // SEND_HITACHI_AC424
@@ -1424,18 +1462,28 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case KELVINATOR:
     {
       IRKelvinatorAC ac(_pin, _inverted, _modulation);
-      kelvinator(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      kelvinator(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                  send.swingh, send.quiet, send.turbo, send.light, send.filter,
                  send.clean);
       break;
     }
 #endif  // SEND_KELVINATOR
+#if SEND_LG
+    case LG:
+    case LG2:
+    {
+      IRLgAc ac(_pin, _inverted, _modulation);
+      lg(&ac, (lg_ac_remote_model_t)send.model, send.power, send.mode,
+         send.degrees, send.fanspeed);
+      break;
+    }
+#endif  // SEND_LG
 #if SEND_MIDEA
     case MIDEA:
     {
       IRMideaAC ac(_pin, _inverted, _modulation);
-      midea(&ac, on, send.mode, send.celsius, send.degrees, send.fanspeed,
-            send.swingv, send.sleep);
+      midea(&ac, send.power, send.mode, send.celsius, send.degrees,
+            send.fanspeed, send.swingv, send.sleep);
       break;
     }
 #endif  // SEND_MIDEA
@@ -1443,7 +1491,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case MITSUBISHI_AC:
     {
       IRMitsubishiAC ac(_pin, _inverted, _modulation);
-      mitsubishi(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      mitsubishi(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                  send.swingh, send.quiet, send.clock);
       break;
     }
@@ -1452,8 +1500,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case MITSUBISHI112:
     {
       IRMitsubishi112 ac(_pin, _inverted, _modulation);
-      mitsubishi112(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
-                    send.swingh, send.quiet);
+      mitsubishi112(&ac, send.power, send.mode, degC, send.fanspeed,
+                    send.swingv, send.swingh, send.quiet);
       break;
     }
 #endif  // SEND_MITSUBISHI112
@@ -1461,8 +1509,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case MITSUBISHI136:
     {
       IRMitsubishi136 ac(_pin, _inverted, _modulation);
-      mitsubishi136(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
-                    send.quiet);
+      mitsubishi136(&ac, send.power, send.mode, degC, send.fanspeed,
+                    send.swingv, send.quiet);
       break;
     }
 #endif  // SEND_MITSUBISHI136
@@ -1470,16 +1518,17 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case MITSUBISHI_HEAVY_88:
     {
       IRMitsubishiHeavy88Ac ac(_pin, _inverted, _modulation);
-      mitsubishiHeavy88(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
-                        send.swingh, send.turbo, send.econo, send.clean);
+      mitsubishiHeavy88(&ac, send.power, send.mode, degC, send.fanspeed,
+                        send.swingv, send.swingh, send.turbo, send.econo,
+                        send.clean);
       break;
     }
     case MITSUBISHI_HEAVY_152:
     {
       IRMitsubishiHeavy152Ac ac(_pin, _inverted, _modulation);
-      mitsubishiHeavy152(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
-                         send.swingh, send.quiet, send.turbo, send.econo,
-                         send.filter, send.clean, send.sleep);
+      mitsubishiHeavy152(&ac, send.power, send.mode, degC, send.fanspeed,
+                         send.swingv, send.swingh, send.quiet, send.turbo,
+                         send.econo, send.filter, send.clean, send.sleep);
       break;
     }
 #endif  // SEND_MITSUBISHIHEAVY
@@ -1487,7 +1536,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case NEOCLIMA:
     {
       IRNeoclimaAc ac(_pin, _inverted, _modulation);
-      neoclima(&ac, on, send.mode, degC, send.fanspeed, send.swingv,
+      neoclima(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
                send.swingh, send.turbo, send.light, send.filter, send.sleep);
       break;
     }
@@ -1496,9 +1545,9 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case PANASONIC_AC:
     {
       IRPanasonicAc ac(_pin, _inverted, _modulation);
-      panasonic(&ac, (panasonic_ac_remote_model_t)send.model, on, send.mode,
-                degC, send.fanspeed, send.swingv, send.swingh, send.quiet,
-                send.turbo, send.clock);
+      panasonic(&ac, (panasonic_ac_remote_model_t)send.model, send.power,
+                send.mode, degC, send.fanspeed, send.swingv, send.swingh,
+                send.quiet, send.turbo, send.clock);
       break;
     }
 #endif  // SEND_PANASONIC_AC
@@ -1506,8 +1555,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case SAMSUNG_AC:
     {
       IRSamsungAc ac(_pin, _inverted, _modulation);
-      samsung(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.quiet,
-              send.turbo, send.clean, send.beep, prev->power);
+      samsung(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+              send.quiet, send.turbo, send.clean, send.beep, prev->power);
       break;
     }
 #endif  // SEND_SAMSUNG_AC
@@ -1515,7 +1564,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case SHARP_AC:
     {
       IRSharpAc ac(_pin, _inverted, _modulation);
-      sharp(&ac, on, send.mode, degC, send.fanspeed);
+      sharp(&ac, send.power, send.mode, degC, send.fanspeed);
       break;
     }
 #endif  // SEND_SHARP_AC
@@ -1523,8 +1572,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case TCL112AC:
     {
       IRTcl112Ac ac(_pin, _inverted, _modulation);
-      tcl112(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.swingh,
-             send.turbo, send.light, send.econo, send.filter);
+      tcl112(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+             send.swingh, send.turbo, send.light, send.econo, send.filter);
       break;
     }
 #endif  // SEND_TCL112AC
@@ -1532,8 +1581,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case TECO:
     {
       IRTecoAc ac(_pin, _inverted, _modulation);
-      teco(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.light,
-           send.sleep);
+      teco(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+           send.light, send.sleep);
       break;
     }
 #endif  // SEND_TECO
@@ -1541,7 +1590,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case TOSHIBA_AC:
     {
       IRToshibaAC ac(_pin, _inverted, _modulation);
-      toshiba(&ac, on, send.mode, degC, send.fanspeed);
+      toshiba(&ac, send.power, send.mode, degC, send.fanspeed);
       break;
     }
 #endif  // SEND_TOSHIBA_AC
@@ -1549,7 +1598,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case TROTEC:
     {
       IRTrotecESP ac(_pin, _inverted, _modulation);
-      trotec(&ac, on, send.mode, degC, send.fanspeed, send.sleep);
+      trotec(&ac, send.power, send.mode, degC, send.fanspeed, send.sleep);
       break;
     }
 #endif  // SEND_TROTEC
@@ -1557,8 +1606,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case VESTEL_AC:
     {
       IRVestelAc ac(_pin, _inverted, _modulation);
-      vestel(&ac, on, send.mode, degC, send.fanspeed, send.swingv, send.turbo,
-             send.filter, send.sleep, send.clock);
+      vestel(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
+             send.turbo, send.filter, send.sleep, send.clock);
       break;
     }
 #endif  // SEND_VESTEL_AC
@@ -1566,9 +1615,9 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     case WHIRLPOOL_AC:
     {
       IRWhirlpoolAc ac(_pin, _inverted, _modulation);
-      whirlpool(&ac, (whirlpool_ac_remote_model_t)send.model, on, send.mode,
-                degC, send.fanspeed, send.swingv, send.turbo, send.light,
-                send.sleep, send.clock);
+      whirlpool(&ac, (whirlpool_ac_remote_model_t)send.model, send.power,
+                send.mode, degC, send.fanspeed, send.swingv, send.turbo,
+                send.light, send.sleep, send.clock);
       break;
     }
 #endif  // SEND_WHIRLPOOL_AC
@@ -2129,6 +2178,21 @@ namespace IRAcUtils {
         return ac.toString();
       }
 #endif  // DECODE_TCL112AC
+#if DECODE_LG
+      case decode_type_t::LG:
+      case decode_type_t::LG2: {
+        IRLgAc ac(0);
+        ac.setRaw(result->value);  // Like Coolix, use value instead of state.
+        switch (result->decode_type) {
+          case decode_type_t::LG2:
+            ac.setModel(lg_ac_remote_model_t::AKB75215403);
+            break;
+          default:
+            ac.setModel(lg_ac_remote_model_t::GE6711AR2853M);
+        }
+        return ac.isValidLgAc() ? ac.toString() : "";
+      }
+#endif  // DECODE_LG
       default:
         return "";
     }
@@ -2299,6 +2363,23 @@ namespace IRAcUtils {
         break;
       }
 #endif  // DECODE_KELVINATOR
+#if DECODE_LG
+      case decode_type_t::LG:
+      case decode_type_t::LG2: {
+        IRLgAc ac(kGpioUnused);
+        ac.setRaw(decode->value);  // Uses value instead of state.
+        if (!ac.isValidLgAc()) return false;
+        switch (decode->decode_type) {
+          case decode_type_t::LG2:
+            ac.setModel(lg_ac_remote_model_t::AKB75215403);
+            break;
+          default:
+            ac.setModel(lg_ac_remote_model_t::GE6711AR2853M);
+        }
+        *result = ac.toCommon();
+        break;
+      }
+#endif  // DECODE_LG
 #if DECODE_MIDEA
       case decode_type_t::MIDEA: {
         IRMideaAC ac(kGpioUnused);
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRac.h b/lib/IRremoteESP8266-2.7.2/src/IRac.h
similarity index 95%
rename from lib/IRremoteESP8266-2.7.1/src/IRac.h
rename to lib/IRremoteESP8266-2.7.2/src/IRac.h
index 4e1237d8d..0f49943e4 100644
--- a/lib/IRremoteESP8266-2.7.1/src/IRac.h
+++ b/lib/IRremoteESP8266-2.7.2/src/IRac.h
@@ -18,6 +18,7 @@
 #include "ir_Haier.h"
 #include "ir_Hitachi.h"
 #include "ir_Kelvinator.h"
+#include "ir_LG.h"
 #include "ir_Midea.h"
 #include "ir_Mitsubishi.h"
 #include "ir_MitsubishiHeavy.h"
@@ -136,16 +137,16 @@ class IRac {
                  const bool quiet, const bool turbo, const bool econo);
 #endif  // SEND_DAIKIN152
 #if SEND_DAIKIN160
-void daikin160(IRDaikin160 *ac,
-               const bool on, const stdAc::opmode_t mode,
-               const float degrees, const stdAc::fanspeed_t fan,
-               const stdAc::swingv_t swingv);
+  void daikin160(IRDaikin160 *ac,
+                 const bool on, const stdAc::opmode_t mode,
+                 const float degrees, const stdAc::fanspeed_t fan,
+                 const stdAc::swingv_t swingv);
 #endif  // SEND_DAIKIN160
 #if SEND_DAIKIN176
-void daikin176(IRDaikin176 *ac,
-               const bool on, const stdAc::opmode_t mode,
-               const float degrees, const stdAc::fanspeed_t fan,
-               const stdAc::swingh_t swingh);
+  void daikin176(IRDaikin176 *ac,
+                 const bool on, const stdAc::opmode_t mode,
+                 const float degrees, const stdAc::fanspeed_t fan,
+                 const stdAc::swingh_t swingh);
 #endif  // SEND_DAIKIN176
 #if SEND_DAIKIN2
   void daikin2(IRDaikin2 *ac,
@@ -230,6 +231,11 @@ void electra(IRElectraAc *ac,
                   const bool quiet, const bool turbo, const bool light,
                   const bool filter, const bool clean);
 #endif  // SEND_KELVINATOR
+#if SEND_LG
+  void lg(IRLgAc *ac, const lg_ac_remote_model_t model,
+          const bool on, const stdAc::opmode_t mode,
+          const float degrees, const stdAc::fanspeed_t fan);
+#endif  // SEND_LG
 #if SEND_MIDEA
   void midea(IRMideaAC *ac,
              const bool on, const stdAc::opmode_t mode, const bool celsius,
@@ -340,6 +346,7 @@ void electra(IRElectraAc *ac,
                  const bool turbo, const bool light,
                  const int16_t sleep = -1, const int16_t clock = -1);
 #endif  // SEND_WHIRLPOOL_AC
+static stdAc::state_t cleanState(const stdAc::state_t state);
 static stdAc::state_t handleToggles(const stdAc::state_t desired,
                                     const stdAc::state_t *prev = NULL);
 };  // IRac class
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRrecv.cpp b/lib/IRremoteESP8266-2.7.2/src/IRrecv.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRrecv.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRrecv.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRrecv.h b/lib/IRremoteESP8266-2.7.2/src/IRrecv.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRrecv.h
rename to lib/IRremoteESP8266-2.7.2/src/IRrecv.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h b/lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h
rename to lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h
index 9e4cdbaab..856ec880a 100644
--- a/lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h
+++ b/lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h
@@ -1,4 +1,4 @@
-/***************************************************
+ /***************************************************
  * IRremote for ESP8266
  *
  * Based on the IRremote library for Arduino by Ken Shirriff
@@ -52,7 +52,7 @@
 #endif  // UNIT_TEST
 
 // Library Version
-#define _IRREMOTEESP8266_VERSION_ "2.7.1"
+#define _IRREMOTEESP8266_VERSION_ "2.7.2"
 
 // Set the language & locale for the library. See the `locale` dir for options.
 #ifndef _IR_LOCALE_
@@ -588,6 +588,7 @@ const uint16_t kSingleRepeat = 1;
 
 const uint16_t kAiwaRcT501Bits = 15;
 const uint16_t kAiwaRcT501MinRepeats = kSingleRepeat;
+const uint16_t kAlokaBits = 32;
 const uint16_t kAmcorStateLength = 8;
 const uint16_t kAmcorBits = kAmcorStateLength * 8;
 const uint16_t kAmcorDefaultRepeat = kSingleRepeat;
@@ -668,6 +669,7 @@ const uint16_t kLegoPfBits = 16;
 const uint16_t kLegoPfMinRepeat = kNoRepeat;
 const uint16_t kLgBits = 28;
 const uint16_t kLg32Bits = 32;
+const uint16_t kLgDefaultRepeat = kNoRepeat;
 const uint16_t kLutronBits = 35;
 const uint16_t kMagiquestBits = 56;
 const uint16_t kMideaBits = 48;
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRsend.cpp b/lib/IRremoteESP8266-2.7.2/src/IRsend.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRsend.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRsend.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRsend.h b/lib/IRremoteESP8266-2.7.2/src/IRsend.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.1/src/IRsend.h
rename to lib/IRremoteESP8266-2.7.2/src/IRsend.h
index b0956e77c..e86f4e7de 100644
--- a/lib/IRremoteESP8266-2.7.1/src/IRsend.h
+++ b/lib/IRremoteESP8266-2.7.2/src/IRsend.h
@@ -141,6 +141,11 @@ enum whirlpool_ac_remote_model_t {
   DG11J191,
 };
 
+enum lg_ac_remote_model_t {
+  GE6711AR2853M = 1,  // (1) LG 28-bit Protocol (default)
+  AKB75215403,        // (2) LG2 28-bit Protocol
+};
+
 
 // Classes
 class IRsend {
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRtext.cpp b/lib/IRremoteESP8266-2.7.2/src/IRtext.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRtext.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRtext.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRtext.h b/lib/IRremoteESP8266-2.7.2/src/IRtext.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRtext.h
rename to lib/IRremoteESP8266-2.7.2/src/IRtext.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRtimer.cpp b/lib/IRremoteESP8266-2.7.2/src/IRtimer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRtimer.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRtimer.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRtimer.h b/lib/IRremoteESP8266-2.7.2/src/IRtimer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRtimer.h
rename to lib/IRremoteESP8266-2.7.2/src/IRtimer.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRutils.cpp b/lib/IRremoteESP8266-2.7.2/src/IRutils.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.1/src/IRutils.cpp
rename to lib/IRremoteESP8266-2.7.2/src/IRutils.cpp
index 0aa19e821..e785f625d 100644
--- a/lib/IRremoteESP8266-2.7.1/src/IRutils.cpp
+++ b/lib/IRremoteESP8266-2.7.2/src/IRutils.cpp
@@ -824,13 +824,6 @@ namespace irutils {
 
   String modelToStr(const decode_type_t protocol, const int16_t model) {
     switch (protocol) {
-      case decode_type_t::GREE:
-        switch (model) {
-          case gree_ac_remote_model_t::YAW1F: return F("YAW1F");
-          case gree_ac_remote_model_t::YBOFB: return F("YBOFB");
-          default: return kUnknownStr;
-        }
-        break;
       case decode_type_t::FUJITSU_AC:
         switch (model) {
           case fujitsu_ac_remote_model_t::ARRAH2E: return F("ARRAH2E");
@@ -841,6 +834,21 @@ namespace irutils {
           default: return kUnknownStr;
         }
         break;
+      case decode_type_t::GREE:
+        switch (model) {
+          case gree_ac_remote_model_t::YAW1F: return F("YAW1F");
+          case gree_ac_remote_model_t::YBOFB: return F("YBOFB");
+          default: return kUnknownStr;
+        }
+        break;
+      case decode_type_t::LG:
+      case decode_type_t::LG2:
+        switch (model) {
+          case lg_ac_remote_model_t::GE6711AR2853M: return F("GE6711AR2853M");
+          case lg_ac_remote_model_t::AKB75215403: return F("AKB75215403");
+          default: return kUnknownStr;
+        }
+        break;
       case decode_type_t::PANASONIC_AC:
         switch (model) {
           case panasonic_ac_remote_model_t::kPanasonicLke: return F("LKE");
diff --git a/lib/IRremoteESP8266-2.7.1/src/IRutils.h b/lib/IRremoteESP8266-2.7.2/src/IRutils.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/IRutils.h
rename to lib/IRremoteESP8266-2.7.2/src/IRutils.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/i18n.h b/lib/IRremoteESP8266-2.7.2/src/i18n.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/i18n.h
rename to lib/IRremoteESP8266-2.7.2/src/i18n.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Aiwa.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Aiwa.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Aiwa.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Aiwa.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Amcor.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Amcor.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Amcor.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Amcor.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Amcor.h b/lib/IRremoteESP8266-2.7.2/src/ir_Amcor.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Amcor.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Amcor.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Argo.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Argo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Argo.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Argo.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Argo.h b/lib/IRremoteESP8266-2.7.2/src/ir_Argo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Argo.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Argo.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Carrier.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Carrier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Carrier.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Carrier.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Coolix.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Coolix.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Coolix.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Coolix.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Coolix.h b/lib/IRremoteESP8266-2.7.2/src/ir_Coolix.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Coolix.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Coolix.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Daikin.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Daikin.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Daikin.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Daikin.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Daikin.h b/lib/IRremoteESP8266-2.7.2/src/ir_Daikin.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Daikin.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Daikin.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Denon.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Denon.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Denon.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Denon.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Dish.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Dish.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Dish.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Dish.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Electra.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Electra.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Electra.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Electra.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Electra.h b/lib/IRremoteESP8266-2.7.2/src/ir_Electra.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Electra.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Electra.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Fujitsu.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Fujitsu.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Fujitsu.h b/lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Fujitsu.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_GICable.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_GICable.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_GICable.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_GICable.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_GlobalCache.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_GlobalCache.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_GlobalCache.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_GlobalCache.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Goodweather.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Goodweather.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Goodweather.h b/lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Goodweather.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Gree.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Gree.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Gree.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Gree.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Gree.h b/lib/IRremoteESP8266-2.7.2/src/ir_Gree.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Gree.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Gree.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Haier.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Haier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Haier.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Haier.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Haier.h b/lib/IRremoteESP8266-2.7.2/src/ir_Haier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Haier.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Haier.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Hitachi.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Hitachi.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Hitachi.h b/lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Hitachi.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Inax.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Inax.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Inax.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Inax.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_JVC.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_JVC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_JVC.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_JVC.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Kelvinator.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Kelvinator.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Kelvinator.h b/lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Kelvinator.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_LG.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_LG.cpp
similarity index 56%
rename from lib/IRremoteESP8266-2.7.1/src/ir_LG.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_LG.cpp
index 124256e9f..ce0a36d3d 100644
--- a/lib/IRremoteESP8266-2.7.1/src/ir_LG.cpp
+++ b/lib/IRremoteESP8266-2.7.2/src/ir_LG.cpp
@@ -8,10 +8,20 @@
 
 #include "ir_LG.h"
 #include <algorithm>
+#include "IRac.h"
 #include "IRrecv.h"
 #include "IRsend.h"
+#include "IRtext.h"
 #include "IRutils.h"
 
+using irutils::addBoolToString;
+using irutils::addModeToString;
+using irutils::addModelToString;
+using irutils::addFanToString;
+using irutils::addTempToString;
+using irutils::setBit;
+using irutils::setBits;
+
 // LG decode originally added by Darryl Smith (based on the JVC protocol)
 // LG send originally added by https://github.com/chaeplin
 
@@ -283,3 +293,254 @@ bool IRrecv::decodeLG(decode_results *results, uint16_t nbits, bool strict) {
   return true;
 }
 #endif
+
+// LG A/C Class
+// Support for LG-type A/C units.
+// Ref:
+//   https://github.com/arendst/Tasmota/blob/54c2eb283a02e4287640a4595e506bc6eadbd7f2/sonoff/xdrv_05_irremote.ino#L327-438
+IRLgAc::IRLgAc(const uint16_t pin, const bool inverted,
+               const bool use_modulation)
+    : _irsend(pin, inverted, use_modulation) { this->stateReset(); }
+
+void IRLgAc::stateReset(void) {
+  setRaw(kLgAcOffCommand);
+  setModel(lg_ac_remote_model_t::GE6711AR2853M);
+}
+
+void IRLgAc::begin(void) { _irsend.begin(); }
+
+#if SEND_LG
+void IRLgAc::send(const uint16_t repeat) {
+  if (this->getPower())
+    _irsend.send(this->_protocol, this->getRaw(), kLgBits, repeat);
+  else
+    // Always send the special Off command if the power is set to off.
+    // Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1008#issuecomment-570763580
+    _irsend.send(this->_protocol, kLgAcOffCommand, kLgBits, repeat);
+}
+#endif  // SEND_LG
+
+void IRLgAc::setModel(const lg_ac_remote_model_t model) {
+  switch (model) {
+    case lg_ac_remote_model_t::AKB75215403:
+      _protocol = decode_type_t::LG2;
+      break;
+    case lg_ac_remote_model_t::GE6711AR2853M:
+      // FALL THRU
+    default:
+      _protocol = decode_type_t::LG;
+  }
+}
+
+lg_ac_remote_model_t IRLgAc::getModel(void) {
+  switch (_protocol) {
+    case LG2:
+      return lg_ac_remote_model_t::AKB75215403;
+    case LG:
+      // FALL THRU
+    default:
+      return lg_ac_remote_model_t::GE6711AR2853M;
+  }
+}
+
+uint32_t IRLgAc::getRaw(void) {
+  checksum();
+  return remote_state;
+}
+
+void IRLgAc::setRaw(const uint32_t new_code) {
+  remote_state = new_code;
+  _temp = 15;  // Ensure there is a "sane" previous temp.
+  _temp = getTemp();
+}
+
+// Calculate the checksum for a given state.
+// Args:
+//   state:  The value to calculate the checksum of.
+// Returns:
+//   A uint8_t of the checksum.
+uint8_t IRLgAc::calcChecksum(const uint32_t state) {
+  return calcLGChecksum(state >> 4);
+}
+
+// Verify the checksum is valid for a given state.
+// Args:
+//   state:  The value to verify the checksum of.
+// Returns:
+//   A boolean.
+bool IRLgAc::validChecksum(const uint32_t state) {
+  return calcChecksum(state) == GETBITS32(state, kLgAcChecksumOffset,
+                                          kLgAcChecksumSize);
+}
+
+void IRLgAc::checksum(void) {
+  setBits(&remote_state, kLgAcChecksumOffset, kLgAcChecksumSize,
+          calcChecksum(remote_state));
+}
+
+void IRLgAc::on(void) { setPower(true); }
+
+void IRLgAc::off(void) { setPower(false); }
+
+void IRLgAc::setPower(const bool on) {
+  setBits(&remote_state, kLgAcPowerOffset, kLgAcPowerSize,
+          on ? kLgAcPowerOn : kLgAcPowerOff);
+  if (on)
+    setTemp(_temp);  // Reset the temp if we are on.
+  else
+    _setTemp(0);  // Off clears the temp.
+}
+
+bool IRLgAc::getPower(void) {
+  return GETBITS32(remote_state, kLgAcPowerOffset, kLgAcPowerSize) ==
+      kLgAcPowerOn;
+}
+
+// Set the temp. (Internal use only)
+void IRLgAc::_setTemp(const uint8_t value) {
+  setBits(&remote_state, kLgAcTempOffset, kLgAcTempSize, value);
+}
+
+// Set the temp. in deg C
+void IRLgAc::setTemp(const uint8_t degrees) {
+  uint8_t temp = std::max(kLgAcMinTemp, degrees);
+  temp = std::min(kLgAcMaxTemp, temp);
+  _temp = temp;
+  _setTemp(temp - kLgAcTempAdjust);
+}
+
+// Return the set temp. in deg C
+uint8_t IRLgAc::getTemp(void) {
+  if (getPower())
+    return GETBITS32(remote_state, kLgAcTempOffset, kLgAcTempSize) +
+        kLgAcTempAdjust;
+  else
+    return _temp;
+}
+
+// Set the speed of the fan.
+void IRLgAc::setFan(const uint8_t speed) {
+  switch (speed) {
+    case kLgAcFanAuto:
+    case kLgAcFanLow:
+    case kLgAcFanMedium:
+    case kLgAcFanHigh:
+      setBits(&remote_state, kLgAcFanOffset, kLgAcFanSize, speed);
+      break;
+    default:
+      setFan(kLgAcFanAuto);
+  }
+}
+
+uint8_t IRLgAc::getFan(void) {
+  return GETBITS32(remote_state, kLgAcFanOffset, kLgAcFanSize);
+}
+
+uint8_t IRLgAc::getMode(void) {
+  return GETBITS32(remote_state, kLgAcModeOffset, kLgAcModeSize);
+}
+
+void IRLgAc::setMode(const uint8_t mode) {
+  switch (mode) {
+    case kLgAcAuto:
+    case kLgAcDry:
+    case kLgAcHeat:
+    case kLgAcCool:
+    case kLgAcFan:
+      setBits(&remote_state, kLgAcModeOffset, kLgAcModeSize, mode);
+      break;
+    default:  // If we get an unexpected mode, default to AUTO.
+      this->setMode(kLgAcAuto);
+  }
+}
+
+// Convert a standard A/C mode into its native mode.
+uint8_t IRLgAc::convertMode(const stdAc::opmode_t mode) {
+  switch (mode) {
+    case stdAc::opmode_t::kCool: return kLgAcCool;
+    case stdAc::opmode_t::kHeat: return kLgAcHeat;
+    case stdAc::opmode_t::kFan:  return kLgAcFan;
+    case stdAc::opmode_t::kDry:  return kLgAcDry;
+    default:                     return kLgAcAuto;
+  }
+}
+
+// Convert a native mode to it's common equivalent.
+stdAc::opmode_t IRLgAc::toCommonMode(const uint8_t mode) {
+  switch (mode) {
+    case kLgAcCool: return stdAc::opmode_t::kCool;
+    case kLgAcHeat: return stdAc::opmode_t::kHeat;
+    case kLgAcDry:  return stdAc::opmode_t::kDry;
+    case kLgAcFan:  return stdAc::opmode_t::kFan;
+    default:        return stdAc::opmode_t::kAuto;
+  }
+}
+
+// Convert a standard A/C Fan speed into its native fan speed.
+uint8_t IRLgAc::convertFan(const stdAc::fanspeed_t speed) {
+  switch (speed) {
+    case stdAc::fanspeed_t::kMin:
+    case stdAc::fanspeed_t::kLow:    return kLgAcFanLow;
+    case stdAc::fanspeed_t::kMedium: return kLgAcFanMedium;
+    case stdAc::fanspeed_t::kHigh:
+    case stdAc::fanspeed_t::kMax:    return kHitachiAcFanHigh;
+    default:                         return kHitachiAcFanAuto;
+  }
+}
+
+// Convert a native fan speed to it's common equivalent.
+stdAc::fanspeed_t IRLgAc::toCommonFanSpeed(const uint8_t speed) {
+  switch (speed) {
+    case kLgAcFanHigh:    return stdAc::fanspeed_t::kMax;
+    case kLgAcFanMedium:  return stdAc::fanspeed_t::kMedium;
+    case kLgAcFanLow:     return stdAc::fanspeed_t::kLow;
+    default:              return stdAc::fanspeed_t::kAuto;
+  }
+}
+
+// Convert the A/C state to it's common equivalent.
+stdAc::state_t IRLgAc::toCommon(void) {
+  stdAc::state_t result;
+  result.protocol = decode_type_t::LG;
+  result.model = this->getModel();
+  result.power = this->getPower();
+  result.mode = this->toCommonMode(this->getMode());
+  result.celsius = true;
+  result.degrees = this->getTemp();
+  result.fanspeed = this->toCommonFanSpeed(this->getFan());
+  // Not supported.
+  result.swingv = stdAc::swingv_t::kOff;
+  result.swingh = stdAc::swingh_t::kOff;
+  result.quiet = false;
+  result.turbo = false;
+  result.light = false;
+  result.filter = false;
+  result.clean = false;
+  result.econo = false;
+  result.beep = false;
+  result.sleep = -1;
+  result.clock = -1;
+  return result;
+}
+
+// Convert the internal state into a human readable string.
+String IRLgAc::toString(void) {
+  String result = "";
+  result.reserve(80);  // Reserve some heap for the string to reduce fragging.
+  result += addModelToString(_protocol, getModel(), false);
+  result += addBoolToString(getPower(), kPowerStr);
+  if (getPower()) {  // Only display the rest if is in power on state.
+    result += addModeToString(getMode(), kLgAcAuto, kLgAcCool,
+                              kLgAcHeat, kLgAcDry, kLgAcFan);
+    result += addTempToString(getTemp());
+    result += addFanToString(getFan(), kLgAcFanHigh, kLgAcFanLow,
+                             kLgAcFanAuto, kLgAcFanAuto, kLgAcFanMedium);
+  }
+  return result;
+}
+
+bool IRLgAc::isValidLgAc(void) {
+  return validChecksum(remote_state) &&
+      (GETBITS32(remote_state, kLgAcSignatureOffset, kLgAcSignatureSize) ==
+       kLgAcSignature);
+}
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_LG.h b/lib/IRremoteESP8266-2.7.2/src/ir_LG.h
new file mode 100644
index 000000000..1147b30b7
--- /dev/null
+++ b/lib/IRremoteESP8266-2.7.2/src/ir_LG.h
@@ -0,0 +1,108 @@
+// Copyright 2017, 2019 David Conran
+
+// Supports:
+//   Brand: LG,  Model: 6711A20083V remote
+//   Brand: LG,  Model: AKB74395308 remote
+//   Brand: LG,  Model: S4-W12JA3AA A/C (LG2)
+//   Brand: LG,  Model: AKB75215403 remote (LG2)
+//   Brand: General Electric,  Model: AG1BH09AW101 Split A/C
+//   Brand: General Electric,  Model: 6711AR2853M A/C Remote
+
+#ifndef IR_LG_H_
+#define IR_LG_H_
+
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+#ifndef UNIT_TEST
+#include <Arduino.h>
+#endif
+#include "IRremoteESP8266.h"
+#include "IRsend.h"
+#include "IRutils.h"
+#ifdef UNIT_TEST
+#include "IRsend_test.h"
+#endif
+
+const uint8_t kLgAcChecksumOffset = 0;  // Nr. of bits
+const uint8_t kLgAcChecksumSize = kNibbleSize;  // Nr. of bits
+const uint8_t kLgAcFanOffset = 4;  // Nr. of bits
+const uint8_t kLgAcFanSize = 3;  // Nr. of bits
+const uint8_t kLgAcFanLow = 0;     // 0b000
+const uint8_t kLgAcFanMedium = 2;  // 0b010
+const uint8_t kLgAcFanHigh = 4;    // 0b100
+const uint8_t kLgAcFanAuto = 5;    // 0b101
+const uint8_t kLgAcTempOffset = 8;  // Nr. of bits
+const uint8_t kLgAcTempSize = 4;  // Nr. of bits
+const uint8_t kLgAcTempAdjust = 15;
+const uint8_t kLgAcMinTemp = 16;  // Celsius
+const uint8_t kLgAcMaxTemp = 30;  // Celsius
+const uint8_t kLgAcModeOffset = 12;  // Nr. of bits
+const uint8_t kLgAcModeSize = 3;  // Nr. of bits
+const uint8_t kLgAcCool = 0;  // 0b000
+const uint8_t kLgAcDry = 1;   // 0b001
+const uint8_t kLgAcFan = 2;   // 0b010
+const uint8_t kLgAcAuto = 3;  // 0b011
+const uint8_t kLgAcHeat = 4;  // 0b100
+const uint8_t kLgAcPowerOffset = 18;  // Nr. of bits
+const uint8_t kLgAcPowerSize = 2;  // Nr. of bits
+const uint8_t kLgAcPowerOff = 3;  // 0b11
+const uint8_t kLgAcPowerOn = 0;   // 0b00
+const uint8_t kLgAcSignatureOffset = 20;  // Nr. of bits
+const uint8_t kLgAcSignatureSize = 8;  // Nr. of bits
+const uint8_t kLgAcSignature = 0x88;
+
+const uint32_t kLgAcOffCommand = 0x88C0051;
+
+uint8_t calcLGChecksum(uint16_t data);
+
+// Classes
+class IRLgAc {
+ public:
+  explicit IRLgAc(const uint16_t pin, const bool inverted = false,
+                  const bool use_modulation = true);
+
+  void stateReset(void);
+  static uint8_t calcChecksum(const uint32_t state);
+  static bool validChecksum(const uint32_t state);
+  bool isValidLgAc(void);
+#if SEND_LG
+  void send(const uint16_t repeat = kLgDefaultRepeat);
+  uint8_t calibrate(void) { return _irsend.calibrate(); }
+#endif  // SEND_LG
+  void begin(void);
+  void on(void);
+  void off(void);
+  void setPower(const bool on);
+  bool getPower(void);
+  void setTemp(const uint8_t degrees);
+  uint8_t getTemp(void);
+  void setFan(const uint8_t speed);
+  uint8_t getFan(void);
+  void setMode(const uint8_t mode);
+  uint8_t getMode(void);
+  uint32_t getRaw(void);
+  void setRaw(const uint32_t new_code);
+  uint8_t convertMode(const stdAc::opmode_t mode);
+  static stdAc::opmode_t toCommonMode(const uint8_t mode);
+  static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
+  static uint8_t convertFan(const stdAc::fanspeed_t speed);
+  stdAc::state_t toCommon(void);
+  String toString(void);
+  void setModel(const lg_ac_remote_model_t model);
+  lg_ac_remote_model_t getModel(void);
+#ifndef UNIT_TEST
+
+ private:
+  IRsend _irsend;
+#else
+  IRsendTest _irsend;
+#endif
+  // The state of the IR remote in IR code form.
+  uint32_t remote_state;
+  uint8_t _temp;
+  decode_type_t _protocol;
+  void checksum(void);
+  void _setTemp(const uint8_t value);
+};
+
+#endif  // IR_LG_H_
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Lasertag.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Lasertag.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Lasertag.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Lasertag.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Lego.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Lego.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Lego.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Lego.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Lutron.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Lutron.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Lutron.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Lutron.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_MWM.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_MWM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_MWM.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_MWM.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Magiquest.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Magiquest.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Magiquest.h b/lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Magiquest.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Midea.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Midea.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Midea.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Midea.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Midea.h b/lib/IRremoteESP8266-2.7.2/src/ir_Midea.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Midea.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Midea.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Mitsubishi.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Mitsubishi.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Mitsubishi.h b/lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Mitsubishi.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_MitsubishiHeavy.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_MitsubishiHeavy.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_MitsubishiHeavy.h b/lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_MitsubishiHeavy.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_NEC.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_NEC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_NEC.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_NEC.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_NEC.h b/lib/IRremoteESP8266-2.7.2/src/ir_NEC.h
similarity index 53%
rename from lib/IRremoteESP8266-2.7.1/src/ir_NEC.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_NEC.h
index e45ff702c..6319d32dc 100644
--- a/lib/IRremoteESP8266-2.7.1/src/ir_NEC.h
+++ b/lib/IRremoteESP8266-2.7.2/src/ir_NEC.h
@@ -12,6 +12,7 @@
 // Supports:
 //   Brand: Yamaha,  Model: RAV561 remote
 //   Brand: Yamaha,  Model: RXV585B A/V Receiver
+//   Brand: Aloka,   Model: SleepyLights LED Lamp
 
 // Constants
 // Ref:
@@ -41,4 +42,32 @@ const uint16_t kNecMinGapTicks =
     (kNecHdrMarkTicks + kNecHdrSpaceTicks +
      kNECBits * (kNecBitMarkTicks + kNecOneSpaceTicks) + kNecBitMarkTicks);
 
+// IR codes and structure for kids ALOKA SleepyLights LED Lamp.
+// https://aloka-designs.com/
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1004
+//
+// May be useful for someone wanting to control the lamp.
+//
+// The lamp is toggled On and Off with the same power button.
+// The colour, when selected, is the brightest and there are 4 levels of
+// brightness that decrease on each send of the colour. A fifth send of the
+// colour resets to brightest again.
+//
+// Remote buttons defined left to right, top line to bottom line on the remote.
+const uint32_t kAlokaPower =         0xFF609F;
+const uint32_t kAlokaLedWhite =      0xFF906F;
+const uint32_t kAlokaLedGreen =      0xFF9867;
+const uint32_t kAlokaLedBlue =       0xFFD827;
+const uint32_t kAlokaLedPinkRed =    0xFF8877;
+const uint32_t kAlokaLedRed =        0xFFA857;
+const uint32_t kAlokaLedLightGreen = 0xFFE817;
+const uint32_t kAlokaLedMidBlue =    0xFF48B7;
+const uint32_t kAlokaLedPink =       0xFF6897;
+const uint32_t kAlokaLedOrange =     0xFFB24D;
+const uint32_t kAlokaLedYellow =     0xFF00FF;
+const uint32_t kAlokaNightFade =     0xFF50AF;
+const uint32_t kAlokaNightTimer =    0xFF7887;
+const uint32_t kAlokaLedRainbow =    0xFF708F;
+// Didn't have a better description for it...
+const uint32_t kAlokaLedTreeGrow =   0xFF58A7;
 #endif  // IR_NEC_H_
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Neoclima.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Neoclima.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Neoclima.h b/lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Neoclima.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Nikai.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Nikai.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Nikai.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Nikai.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Panasonic.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Panasonic.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Panasonic.h b/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Panasonic.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Pioneer.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Pioneer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Pioneer.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Pioneer.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Pronto.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Pronto.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Pronto.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Pronto.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_RC5_RC6.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_RC5_RC6.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_RC5_RC6.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_RC5_RC6.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_RCMM.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_RCMM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_RCMM.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_RCMM.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Samsung.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Samsung.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Samsung.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Samsung.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Samsung.h b/lib/IRremoteESP8266-2.7.2/src/ir_Samsung.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Samsung.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Samsung.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Sanyo.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Sanyo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Sanyo.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Sanyo.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Sharp.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Sharp.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Sharp.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Sharp.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Sharp.h b/lib/IRremoteESP8266-2.7.2/src/ir_Sharp.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Sharp.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Sharp.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Sherwood.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Sherwood.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Sherwood.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Sherwood.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Sony.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Sony.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Sony.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Sony.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Tcl.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Tcl.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Tcl.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Tcl.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Tcl.h b/lib/IRremoteESP8266-2.7.2/src/ir_Tcl.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Tcl.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Tcl.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Teco.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Teco.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Teco.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Teco.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Teco.h b/lib/IRremoteESP8266-2.7.2/src/ir_Teco.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Teco.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Teco.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Toshiba.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Toshiba.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Toshiba.h b/lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Toshiba.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Trotec.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Trotec.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Trotec.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Trotec.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Trotec.h b/lib/IRremoteESP8266-2.7.2/src/ir_Trotec.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Trotec.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Trotec.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Vestel.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Vestel.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Vestel.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Vestel.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Vestel.h b/lib/IRremoteESP8266-2.7.2/src/ir_Vestel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Vestel.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Vestel.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Whirlpool.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Whirlpool.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Whirlpool.h b/lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Whirlpool.h
rename to lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/ir_Whynter.cpp b/lib/IRremoteESP8266-2.7.2/src/ir_Whynter.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/ir_Whynter.cpp
rename to lib/IRremoteESP8266-2.7.2/src/ir_Whynter.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/README.md b/lib/IRremoteESP8266-2.7.2/src/locale/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/README.md
rename to lib/IRremoteESP8266-2.7.2/src/locale/README.md
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/de-CH.h b/lib/IRremoteESP8266-2.7.2/src/locale/de-CH.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/de-CH.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/de-CH.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/de-DE.h b/lib/IRremoteESP8266-2.7.2/src/locale/de-DE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/de-DE.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/de-DE.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/defaults.h b/lib/IRremoteESP8266-2.7.2/src/locale/defaults.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/defaults.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/defaults.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/en-AU.h b/lib/IRremoteESP8266-2.7.2/src/locale/en-AU.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/en-AU.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/en-AU.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/en-IE.h b/lib/IRremoteESP8266-2.7.2/src/locale/en-IE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/en-IE.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/en-IE.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/en-UK.h b/lib/IRremoteESP8266-2.7.2/src/locale/en-UK.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/en-UK.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/en-UK.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/en-US.h b/lib/IRremoteESP8266-2.7.2/src/locale/en-US.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/en-US.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/en-US.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/es-ES.h b/lib/IRremoteESP8266-2.7.2/src/locale/es-ES.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/es-ES.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/es-ES.h
diff --git a/lib/IRremoteESP8266-2.7.1/src/locale/fr-FR.h b/lib/IRremoteESP8266-2.7.2/src/locale/fr-FR.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/src/locale/fr-FR.h
rename to lib/IRremoteESP8266-2.7.2/src/locale/fr-FR.h
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRac_test.cpp b/lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp
similarity index 93%
rename from lib/IRremoteESP8266-2.7.1/test/IRac_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp
index 0d8dfdb12..2c17e2a92 100644
--- a/lib/IRremoteESP8266-2.7.1/test/IRac_test.cpp
+++ b/lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp
@@ -11,6 +11,7 @@
 #include "ir_Haier.h"
 #include "ir_Hitachi.h"
 #include "ir_Kelvinator.h"
+#include "ir_LG.h"
 #include "ir_Midea.h"
 #include "ir_Mitsubishi.h"
 #include "ir_MitsubishiHeavy.h"
@@ -640,6 +641,30 @@ TEST(TestIRac, Kelvinator) {
   ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
 
+TEST(TestIRac, LG) {
+  IRLgAc ac(0);
+  IRac irac(0);
+  IRrecv capture(0);
+  char expected[] =
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 1 (Dry), Temp: 27C, Fan: 2 (Medium)";
+
+  ac.begin();
+  irac.lg(&ac,
+          lg_ac_remote_model_t::GE6711AR2853M,  // Model
+          true,                                 // Power
+          stdAc::opmode_t::kDry,                // Mode
+          27,                                   // Degrees C
+          stdAc::fanspeed_t::kMedium);          // Fan speed
+
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(LG, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kLgBits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
+
 TEST(TestIRac, Midea) {
   IRMideaAC ac(0);
   IRac irac(0);
@@ -1485,3 +1510,90 @@ TEST(TestIRac, Issue821) {
       "m560s105040",
       ac._irsend.outputStr());
 }
+
+// Check power toggling in Whirlpool common a/c handling.
+TEST(TestIRac, Issue1001) {
+  stdAc::state_t desired;  // New desired state
+  stdAc::state_t prev;     // Previously desired state
+  stdAc::state_t result;   // State we need to send to get to `desired`
+  prev.protocol = decode_type_t::WHIRLPOOL_AC;
+  prev.model = 1;
+  prev.power = true;
+  prev.mode = stdAc::opmode_t::kAuto;
+  prev.degrees = 24;
+  prev.celsius = true;
+  prev.fanspeed = stdAc::fanspeed_t::kAuto;
+  prev.swingv = stdAc::swingv_t::kOff;
+  prev.swingh = stdAc::swingh_t::kOff;
+  prev.quiet = false;
+  prev.turbo = false;
+  prev.econo = false;
+  prev.light = false;
+  prev.filter = false;
+  prev.clean = false;
+  prev.beep = false;
+  prev.sleep = -1;
+
+  desired = prev;
+  desired.power = false;
+
+  IRac irac(0);
+  IRrecv capture(0);
+  IRWhirlpoolAc ac(0);
+
+  ac.begin();
+  ASSERT_TRUE(prev.power);
+  ASSERT_FALSE(desired.power);
+  result = irac.handleToggles(irac.cleanState(desired), &prev);
+  ASSERT_TRUE(result.power);
+  irac.sendAc(desired, &prev);
+  ASSERT_FALSE(desired.power);
+  irac.whirlpool(&ac,
+                 (whirlpool_ac_remote_model_t)result.model,  // Model
+                 result.power,     // Power
+                 result.mode,      // Mode
+                 result.degrees,   // Celsius
+                 result.fanspeed,  // Fan speed
+                 result.swingv,    // Veritcal swing
+                 result.turbo,     // Turbo
+                 result.light,     // Light
+                 result.sleep);    // Sleep
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(WHIRLPOOL_AC, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kWhirlpoolAcBits, ac._irsend.capture.bits);
+  ASSERT_EQ("Model: 1 (DG11J13A), Power Toggle: On, Mode: 1 (Auto), Temp: 24C, "
+            "Fan: 0 (Auto), Swing: Off, Light: Off, Clock: 00:00, "
+            "On Timer: Off, Off Timer: Off, Sleep: Off, Super: Off, "
+            "Command: 1 (Power)",
+            IRAcUtils::resultAcToString(&ac._irsend.capture));
+
+  // Now check if the mode is set to "Off" instead of just change to power off.
+  // i.e. How Home Assistant expects things to work.
+  ac._irsend.reset();
+  desired.power = true;
+  desired.mode = stdAc::opmode_t::kOff;
+  result = irac.handleToggles(irac.cleanState(desired), &prev);
+  ASSERT_TRUE(result.power);
+  irac.sendAc(desired, &prev);
+  ASSERT_TRUE(desired.power);
+  irac.whirlpool(&ac,
+                 (whirlpool_ac_remote_model_t)result.model,  // Model
+                 result.power,     // Power
+                 result.mode,      // Mode
+                 result.degrees,   // Celsius
+                 result.fanspeed,  // Fan speed
+                 result.swingv,    // Veritcal swing
+                 result.turbo,     // Turbo
+                 result.light,     // Light
+                 result.sleep);    // Sleep
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(WHIRLPOOL_AC, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kWhirlpoolAcBits, ac._irsend.capture.bits);
+  ASSERT_EQ("Model: 1 (DG11J13A), Power Toggle: On, Mode: 1 (Auto), Temp: 24C, "
+            "Fan: 0 (Auto), Swing: Off, Light: Off, Clock: 00:00, "
+            "On Timer: Off, Off Timer: Off, Sleep: Off, Super: Off, "
+            "Command: 1 (Power)",
+            IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRrecv_test.cpp b/lib/IRremoteESP8266-2.7.2/test/IRrecv_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/IRrecv_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/IRrecv_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRrecv_test.h b/lib/IRremoteESP8266-2.7.2/test/IRrecv_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/IRrecv_test.h
rename to lib/IRremoteESP8266-2.7.2/test/IRrecv_test.h
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRsend_test.cpp b/lib/IRremoteESP8266-2.7.2/test/IRsend_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/IRsend_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/IRsend_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRsend_test.h b/lib/IRremoteESP8266-2.7.2/test/IRsend_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/IRsend_test.h
rename to lib/IRremoteESP8266-2.7.2/test/IRsend_test.h
diff --git a/lib/IRremoteESP8266-2.7.1/test/IRutils_test.cpp b/lib/IRremoteESP8266-2.7.2/test/IRutils_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/IRutils_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/IRutils_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/Makefile b/lib/IRremoteESP8266-2.7.2/test/Makefile
similarity index 99%
rename from lib/IRremoteESP8266-2.7.1/test/Makefile
rename to lib/IRremoteESP8266-2.7.2/test/Makefile
index ad75937b8..cdf133913 100644
--- a/lib/IRremoteESP8266-2.7.1/test/Makefile
+++ b/lib/IRremoteESP8266-2.7.2/test/Makefile
@@ -265,7 +265,7 @@ ir_RCMM_test : $(COMMON_OBJ) ir_RCMM_test.o
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 ir_LG.o : $(USER_DIR)/ir_LG.h $(USER_DIR)/ir_LG.cpp $(COMMON_DEPS)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_LG.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_LG.cpp
 
 ir_LG_test.o : ir_LG_test.cpp $(USER_DIR)/ir_LG.h $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c ir_LG_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Aiwa_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Aiwa_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Aiwa_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Aiwa_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Amcor_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Amcor_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Amcor_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Amcor_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Argo_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Argo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Argo_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Argo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Carrier_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Carrier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Carrier_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Carrier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Coolix_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Coolix_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Coolix_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Coolix_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Daikin_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Daikin_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Daikin_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Daikin_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Denon_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Denon_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Denon_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Denon_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Dish_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Dish_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Dish_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Dish_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Electra_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Electra_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Electra_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Electra_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Fujitsu_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Fujitsu_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Fujitsu_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_GICable_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_GICable_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_GICable_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_GICable_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_GlobalCache_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_GlobalCache_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_GlobalCache_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Goodweather_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Goodweather_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Goodweather_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Goodweather_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Gree_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Gree_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Gree_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Gree_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Haier_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Haier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Haier_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Haier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Hitachi_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Hitachi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Hitachi_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Hitachi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Inax_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Inax_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Inax_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Inax_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_JVC_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_JVC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_JVC_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_JVC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Kelvinator_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Kelvinator_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Kelvinator_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_LG_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_LG_test.cpp
similarity index 59%
rename from lib/IRremoteESP8266-2.7.1/test/ir_LG_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_LG_test.cpp
index d1e1b8659..1c2b2a856 100644
--- a/lib/IRremoteESP8266-2.7.1/test/ir_LG_test.cpp
+++ b/lib/IRremoteESP8266-2.7.2/test/ir_LG_test.cpp
@@ -1,6 +1,7 @@
-// Copyright 2017 David Conran
+// Copyright 2017, 2019 David Conran
 
 #include "ir_LG.h"
+#include "IRac.h"
 #include "IRsend.h"
 #include "IRsend_test.h"
 #include "gtest/gtest.h"
@@ -18,6 +19,10 @@ TEST(TestCalcLGChecksum, General) {
   EXPECT_EQ(0xE, calcLGChecksum(0xABCD));
   EXPECT_EQ(0x1, calcLGChecksum(0x4AE5));
   EXPECT_EQ(0xC, calcLGChecksum(0xFFFF));
+  EXPECT_EQ(0x1, calcLGChecksum(0xC005));
+  EXPECT_EQ(0x1, IRLgAc::calcChecksum(0x88C0051));
+  EXPECT_EQ(0x4, calcLGChecksum(0xC035));
+  EXPECT_EQ(0x4, IRLgAc::calcChecksum(0x88C0354));
 }
 
 // Tests for sendLG().
@@ -457,6 +462,7 @@ TEST(TestDecodeLG, Issue620) {
 
   // Resend the same code as the report is a sent code doesn't decode
   // to the same message code.
+  IRLgAc ac(0);
   irsend.sendLG(0x8808721);
   irsend.makeDecodeResult();
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
@@ -465,6 +471,11 @@ TEST(TestDecodeLG, Issue620) {
   EXPECT_EQ(0x8808721, irsend.capture.value);
   EXPECT_EQ(0x88, irsend.capture.address);
   EXPECT_EQ(0x872, irsend.capture.command);
+  ac.setRaw(irsend.capture.value);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ("Model: 1 (GE6711AR2853M), "
+            "Power: On, Mode: 0 (Cool), Temp: 22C, Fan: 2 (Medium)",
+            ac.toString());
   // The following seems to match the rawData above.
   EXPECT_EQ(
       "f38000d50"
@@ -478,3 +489,390 @@ TEST(TestDecodeLG, Issue620) {
       "s55550",
       irsend.outputStr());
 }
+
+TEST(TestIRLgAcClass, SetAndGetPower) {
+  IRLgAc ac(0);
+  ac.on();
+  EXPECT_TRUE(ac.getPower());
+  ac.off();
+  EXPECT_FALSE(ac.getPower());
+  ac.setPower(true);
+  EXPECT_TRUE(ac.getPower());
+  ac.setPower(false);
+  EXPECT_FALSE(ac.getPower());
+}
+
+TEST(TestIRLgAcClass, SetAndGetTemp) {
+  IRLgAc ac(0);
+  ac.setTemp(25);
+  EXPECT_EQ(25, ac.getTemp());
+  ac.setTemp(kLgAcMinTemp);
+  EXPECT_EQ(kLgAcMinTemp, ac.getTemp());
+  ac.setTemp(kLgAcMinTemp - 1);
+  EXPECT_EQ(kLgAcMinTemp, ac.getTemp());
+  ac.setTemp(kLgAcMaxTemp);
+  EXPECT_EQ(kLgAcMaxTemp, ac.getTemp());
+  ac.setTemp(kLgAcMaxTemp + 1);
+  EXPECT_EQ(kLgAcMaxTemp, ac.getTemp());
+}
+
+TEST(TestIRLgAcClass, SetAndGetMode) {
+  IRLgAc ac(0);
+  ac.setMode(kLgAcCool);
+  ac.setFan(kLgAcFanAuto);
+  ac.setTemp(25);
+  EXPECT_EQ(25, ac.getTemp());
+  EXPECT_EQ(kLgAcCool, ac.getMode());
+  EXPECT_EQ(kLgAcFanAuto, ac.getFan());
+  ac.setMode(kLgAcHeat);
+  EXPECT_EQ(kLgAcHeat, ac.getMode());
+  ac.setMode(kLgAcDry);
+  EXPECT_EQ(kLgAcDry, ac.getMode());
+}
+
+TEST(TestIRLgAcClass, SetAndGetFan) {
+  IRLgAc ac(0);
+  ac.setMode(kLgAcCool);
+  ac.setFan(kLgAcFanAuto);
+  EXPECT_EQ(kLgAcFanAuto, ac.getFan());
+  ac.setFan(kLgAcFanLow);
+  EXPECT_EQ(kLgAcFanLow, ac.getFan());
+  ac.setFan(kLgAcFanHigh);
+  EXPECT_EQ(kLgAcFanHigh, ac.getFan());
+  ac.setFan(kLgAcFanAuto + 1);
+  EXPECT_EQ(kLgAcFanAuto, ac.getFan());
+  ac.setFan(kLgAcFanLow - 1);
+  EXPECT_EQ(kLgAcFanAuto, ac.getFan());
+}
+
+TEST(TestIRLgAcClass, toCommon) {
+  IRLgAc ac(0);
+  ac.setPower(true);
+  ac.setMode(kLgAcCool);
+  ac.setTemp(20);
+  ac.setFan(kLgAcFanHigh);
+  // Now test it.
+  ASSERT_EQ(decode_type_t::LG, ac.toCommon().protocol);
+  ASSERT_EQ(lg_ac_remote_model_t::GE6711AR2853M, ac.toCommon().model);
+  ASSERT_TRUE(ac.toCommon().power);
+  ASSERT_TRUE(ac.toCommon().celsius);
+  ASSERT_EQ(20, ac.toCommon().degrees);
+  ASSERT_EQ(stdAc::opmode_t::kCool, ac.toCommon().mode);
+  ASSERT_EQ(stdAc::fanspeed_t::kMax, ac.toCommon().fanspeed);
+  // Unsupported.
+  ASSERT_EQ(stdAc::swingv_t::kOff, ac.toCommon().swingv);
+  ASSERT_EQ(stdAc::swingh_t::kOff, ac.toCommon().swingh);
+  ASSERT_FALSE(ac.toCommon().turbo);
+  ASSERT_FALSE(ac.toCommon().clean);
+  ASSERT_FALSE(ac.toCommon().light);
+  ASSERT_FALSE(ac.toCommon().quiet);
+  ASSERT_FALSE(ac.toCommon().econo);
+  ASSERT_FALSE(ac.toCommon().filter);
+  ASSERT_FALSE(ac.toCommon().beep);
+  ASSERT_EQ(-1, ac.toCommon().sleep);
+  ASSERT_EQ(-1, ac.toCommon().clock);
+
+  // Change models
+  ac.setModel(AKB75215403);
+  ASSERT_EQ(lg_ac_remote_model_t::AKB75215403, ac.toCommon().model);
+}
+
+TEST(TestIRLgAcClass, HumanReadable) {
+  IRLgAc ac(0);
+
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: Off",
+      ac.toString());
+  ac.setMode(kLgAcHeat);
+  ac.setTemp(kLgAcMaxTemp);
+  ac.on();
+  ac.setFan(kLgAcFanHigh);
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 4 (Heat), Temp: 30C, Fan: 4 (High)",
+      ac.toString());
+  ac.setMode(kLgAcCool);
+  ac.setFan(kLgAcFanLow);
+  ac.setTemp(kLgAcMinTemp);
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 16C, Fan: 0 (Low)",
+      ac.toString());
+  ac.setTemp(ac.getTemp() + 1);
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 17C, Fan: 0 (Low)",
+      ac.toString());
+  ac.setTemp(ac.getTemp() - 1);
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 16C, Fan: 0 (Low)",
+      ac.toString());
+  ac.setPower(false);
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: Off",
+      ac.toString());
+}
+
+TEST(TestIRLgAcClass, SetAndGetRaw) {
+  IRLgAc ac(0);
+
+  ac.setRaw(0x8800A4E);
+  ASSERT_EQ(0x8800A4E, ac.getRaw());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 25C, Fan: 4 (High)",
+      ac.toString());
+
+  ac.setRaw(0x88C0051);
+  ASSERT_EQ(0x88C0051, ac.getRaw());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: Off",
+      ac.toString());
+}
+
+TEST(TestIRLgAcClass, MessageConstruction) {
+  IRLgAc ac(0);
+
+  ac.on();
+  ac.setMode(kLgAcCool);
+  ac.setTemp(25);
+  ac.setFan(kLgAcFanHigh);
+  ASSERT_EQ(0x8800A4E, ac.getRaw());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 25C, Fan: 4 (High)",
+      ac.toString());
+}
+
+TEST(TestIRLgAcClass, isValidLgAc) {
+  IRLgAc ac(0);
+
+  ac.setRaw(0x8800A4E);
+  ASSERT_TRUE(ac.isValidLgAc());
+
+  // Make the checksum wrong.
+  ac.setRaw(0x8800A4F);
+  ASSERT_FALSE(ac.isValidLgAc());
+
+  ac.setRaw(0x88C0051);
+  ASSERT_TRUE(ac.isValidLgAc());
+
+  // Use a wrong signature.
+  ac.setRaw(0x8000A4E);
+  ASSERT_FALSE(ac.isValidLgAc());
+}
+
+TEST(TestUtils, Housekeeping) {
+  ASSERT_EQ("LG", typeToString(decode_type_t::LG));
+  ASSERT_EQ(decode_type_t::LG, strToDecodeType("LG"));
+  ASSERT_FALSE(hasACState(decode_type_t::LG));
+  ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::LG));
+
+  ASSERT_EQ("LG2", typeToString(decode_type_t::LG2));
+  ASSERT_EQ(decode_type_t::LG2, strToDecodeType("LG2"));
+  ASSERT_FALSE(hasACState(decode_type_t::LG2));
+  ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::LG2));
+}
+
+TEST(TestIRLgAcClass, KnownExamples) {
+  IRLgAc ac(0);
+  // Ref:
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/1008#issuecomment-570646648
+
+  // Temp
+  ac.setRaw(0x880C152);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 4 (Heat), Temp: 16C, Fan: 5 (Auto)",
+      ac.toString());
+
+  ac.setRaw(0x880CF50);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 4 (Heat), Temp: 30C, Fan: 5 (Auto)",
+      ac.toString());
+
+  // Modes
+  ac.setRaw(0x880960F);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 1 (Dry), Temp: 21C, Fan: 0 (Low)",
+      ac.toString());
+
+  ac.setRaw(0x880C758);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 4 (Heat), Temp: 22C, Fan: 5 (Auto)",
+      ac.toString());
+
+  ac.setRaw(0x8808855);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 23C, Fan: 5 (Auto)",
+      ac.toString());
+
+  // Fan speeds
+  ac.setRaw(0x880870F);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 22C, Fan: 0 (Low)",
+      ac.toString());
+
+  ac.setRaw(0x8808721);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 22C, Fan: 2 (Medium)",
+      ac.toString());
+
+  ac.setRaw(0x8808743);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 22C, Fan: 4 (High)",
+      ac.toString());
+
+  ac.setRaw(0x8808754);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 22C, Fan: 5 (Auto)",
+      ac.toString());
+
+  ac.setRaw(0x880A745);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 2 (Fan), Temp: 22C, Fan: 4 (High)",
+      ac.toString());
+
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/1008#issuecomment-570794029
+  ac.setRaw(0x8800347);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 18C, Fan: 4 (High)",
+      ac.toString());
+  ac.setRaw(0x8808440);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 19C, Fan: 4 (High)",
+      ac.toString());
+  ac.setRaw(0x8800459);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 19C, Fan: 5 (Auto)",
+      ac.toString());
+  ac.setRaw(0x8809946);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 1 (Dry), Temp: 24C, Fan: 4 (High)",
+      ac.toString());
+  ac.setRaw(0x880A341);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 2 (Fan), Temp: 18C, Fan: 4 (High)",
+      ac.toString());
+  ac.setRaw(0x8810045);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 15C, Fan: 4 (High)",
+      ac.toString());
+  ac.setRaw(0x8810056);
+  ASSERT_TRUE(ac.isValidLgAc());
+  EXPECT_EQ(
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 15C, Fan: 5 (Auto)",
+      ac.toString());
+}
+
+// Verify decoding of LG2 message.
+TEST(TestDecodeLG2, Issue1008) {
+  IRsendTest irsend(0);
+  IRrecv capture(0);
+  irsend.begin();
+
+  irsend.reset();
+  // From https://github.com/crankyoldgit/IRremoteESP8266/issues/1008#issuecomment-570794029
+  // First entry.
+  uint16_t rawData[59] = {
+      3272, 9844, 506, 1588, 536, 498, 534, 498, 536, 498, 534, 1540, 534, 506,
+      534, 498, 534, 500, 532, 500, 534, 498, 534, 498, 534, 506, 534, 500, 534,
+      498, 534, 498, 534, 498, 534, 500, 534, 498, 534, 1566, 508, 1566, 508,
+      500, 534, 1540, 534, 506, 534, 500, 534, 500, 534, 1560, 508, 1540, 534,
+      1558, 508};  // UNKNOWN AFC3034C
+  irsend.sendRaw(rawData, 59, 38000);
+  irsend.makeDecodeResult();
+
+  ASSERT_TRUE(capture.decode(&irsend.capture));
+  ASSERT_EQ(LG2, irsend.capture.decode_type);
+  EXPECT_EQ(kLgBits, irsend.capture.bits);
+  EXPECT_EQ(0x8800347, irsend.capture.value);
+
+  irsend.reset();
+  IRLgAc ac(0);
+  ac.setRaw(0x8800347);
+  ac.setModel(lg_ac_remote_model_t::AKB75215403);  // aka. 2
+  ac.send();
+
+  char expected[] =
+      "Model: 2 (AKB75215403), "
+      "Power: On, Mode: 0 (Cool), Temp: 18C, Fan: 4 (High)";
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(LG2, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kLgBits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
+
+TEST(TestIRLgAcClass, DifferentModels) {
+  IRLgAc ac(0);
+  IRrecv capture(0);
+
+  ac.setRaw(0x8800347);
+
+  ac.setModel(lg_ac_remote_model_t::GE6711AR2853M);  // aka. 1
+  ac._irsend.reset();
+  ac.send();
+
+  char expected1[] =
+      "Model: 1 (GE6711AR2853M), "
+      "Power: On, Mode: 0 (Cool), Temp: 18C, Fan: 4 (High)";
+  ASSERT_EQ(expected1, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(LG, ac._irsend.capture.decode_type);  // Not "LG2"
+  ASSERT_EQ(kLgBits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected1, IRAcUtils::resultAcToString(&ac._irsend.capture));
+
+
+  ac.setModel(lg_ac_remote_model_t::AKB75215403);  // aka. 2
+  ac._irsend.reset();
+  ac.send();
+
+  char expected2[] =
+      "Model: 2 (AKB75215403), "
+      "Power: On, Mode: 0 (Cool), Temp: 18C, Fan: 4 (High)";
+  ASSERT_EQ(expected2, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(LG2, ac._irsend.capture.decode_type);  // Not "LG"
+  ASSERT_EQ(kLgBits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected2, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Lasertag_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Lasertag_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Lasertag_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Lasertag_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Lego_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Lego_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Lego_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Lego_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Lutron_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Lutron_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Lutron_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Lutron_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_MWM_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_MWM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_MWM_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_MWM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Magiquest_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Magiquest_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Magiquest_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Magiquest_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Midea_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Midea_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Midea_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Midea_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_MitsubishiHeavy_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_MitsubishiHeavy_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_MitsubishiHeavy_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_MitsubishiHeavy_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Mitsubishi_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Mitsubishi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Mitsubishi_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Mitsubishi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_NEC_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_NEC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_NEC_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_NEC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Neoclima_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Neoclima_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Neoclima_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Neoclima_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Nikai_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Nikai_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Nikai_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Nikai_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Panasonic_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Panasonic_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Panasonic_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Panasonic_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Pioneer_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Pioneer_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Pioneer_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Pioneer_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Pronto_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Pronto_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Pronto_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Pronto_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_RC5_RC6_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_RC5_RC6_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_RC5_RC6_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_RC5_RC6_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_RCMM_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_RCMM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_RCMM_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_RCMM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Samsung_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Samsung_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Samsung_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Samsung_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Sanyo_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Sanyo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Sanyo_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Sanyo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Sharp_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Sharp_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Sharp_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Sharp_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Sherwood_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Sherwood_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Sherwood_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Sherwood_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Sony_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Sony_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Sony_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Sony_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Tcl_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Tcl_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Tcl_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Tcl_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Teco_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Teco_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Teco_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Teco_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Toshiba_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Toshiba_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Toshiba_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Toshiba_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Trotec_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Trotec_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Trotec_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Trotec_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Vestel_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Vestel_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Vestel_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Vestel_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Whirlpool_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Whirlpool_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Whirlpool_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/test/ir_Whynter_test.cpp b/lib/IRremoteESP8266-2.7.2/test/ir_Whynter_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/test/ir_Whynter_test.cpp
rename to lib/IRremoteESP8266-2.7.2/test/ir_Whynter_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/tools/Makefile b/lib/IRremoteESP8266-2.7.2/tools/Makefile
similarity index 99%
rename from lib/IRremoteESP8266-2.7.1/tools/Makefile
rename to lib/IRremoteESP8266-2.7.2/tools/Makefile
index bf23fbce6..6868f97db 100644
--- a/lib/IRremoteESP8266-2.7.1/tools/Makefile
+++ b/lib/IRremoteESP8266-2.7.2/tools/Makefile
@@ -118,7 +118,7 @@ ir_RCMM.o : $(USER_DIR)/ir_RCMM.cpp $(COMMON_DEPS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_RCMM.cpp
 
 ir_LG.o : $(USER_DIR)/ir_LG.h $(USER_DIR)/ir_LG.cpp $(COMMON_DEPS)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_LG.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_LG.cpp
 
 ir_Mitsubishi.o : $(USER_DIR)/ir_Mitsubishi.h $(USER_DIR)/ir_Mitsubishi.cpp $(COMMON_DEPS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_Mitsubishi.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/tools/RawToGlobalCache.sh b/lib/IRremoteESP8266-2.7.2/tools/RawToGlobalCache.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/RawToGlobalCache.sh
rename to lib/IRremoteESP8266-2.7.2/tools/RawToGlobalCache.sh
diff --git a/lib/IRremoteESP8266-2.7.1/tools/auto_analyse_raw_data.py b/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/auto_analyse_raw_data.py
rename to lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data.py
diff --git a/lib/IRremoteESP8266-2.7.1/tools/auto_analyse_raw_data_test.py b/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data_test.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/auto_analyse_raw_data_test.py
rename to lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data_test.py
diff --git a/lib/IRremoteESP8266-2.7.1/tools/gc_decode.cpp b/lib/IRremoteESP8266-2.7.2/tools/gc_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/gc_decode.cpp
rename to lib/IRremoteESP8266-2.7.2/tools/gc_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/tools/generate_irtext_h.sh b/lib/IRremoteESP8266-2.7.2/tools/generate_irtext_h.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/generate_irtext_h.sh
rename to lib/IRremoteESP8266-2.7.2/tools/generate_irtext_h.sh
diff --git a/lib/IRremoteESP8266-2.7.1/tools/mkkeywords b/lib/IRremoteESP8266-2.7.2/tools/mkkeywords
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/mkkeywords
rename to lib/IRremoteESP8266-2.7.2/tools/mkkeywords
diff --git a/lib/IRremoteESP8266-2.7.1/tools/mode2_decode.cpp b/lib/IRremoteESP8266-2.7.2/tools/mode2_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.1/tools/mode2_decode.cpp
rename to lib/IRremoteESP8266-2.7.2/tools/mode2_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.1/tools/scrape_supported_devices.py b/lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py
similarity index 96%
rename from lib/IRremoteESP8266-2.7.1/tools/scrape_supported_devices.py
rename to lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py
index 574eac351..a0efd0774 100755
--- a/lib/IRremoteESP8266-2.7.1/tools/scrape_supported_devices.py
+++ b/lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py
@@ -12,11 +12,12 @@ BRAND_MODEL = re.compile(r"Brand: *(?P<brand>.+), *Model: *(?P<model>.+)")
 ENUMS = re.compile(r"enum \w+ {(.+?)};", re.DOTALL)
 ENUM_ENTRY = re.compile(r"^\s+(\w+)", re.MULTILINE)
 DECODED_PROTOCOLS = re.compile(r".*results->decode_type *=.*?(\w+);")
-AC_FN = re.compile(r"ir_(.+).h")
+AC_FN = re.compile(r"ir_(.+)\.h")
 
-ALL_FN = re.compile(r"ir_(.+).(h|cpp)")
+ALL_FN = re.compile(r"ir_(.+)\.(h|cpp)")
 
 EXCLUDED_PROTOCOLS = ["UNKNOWN", "UNUSED", "kLastDecodeType"]
+EXCLUDED_ACS = ["Magiquest", "NEC"]
 
 MARKDOWN_HEADER = """<!--- WARNING: Do NOT edit this file directly.
       It is generated by './tools/scrape_supported_devices.py'.
@@ -220,14 +221,14 @@ def main():
     protocol, brand = protocolbrand
     codes = allcodes[protocolbrand]
     codes.sort()
+    acmodels = []
+    acsupport = "-"
     if protocol in allacs:
       acmodels = list(allacs[protocol])
       acmodels.sort()
-      acsupport = "Yes"
       brand = makeurl(brand, protocol + ".h")
-    else:
-      acmodels = []
-      acsupport = "-"
+      if protocol not in EXCLUDED_ACS:
+        acsupport = "Yes"
 
     fout.write("| {} | **{}** | {} | {} | {} |\n".format(
         makeurl(protocol, protocol + ".cpp"),
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 2c7e22a3f..db1e951e9 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 8.1.0.3 20200106
 
 - Add support for gzipped binaries
+- Update IRremoteESP8266 lib updated to v2.7.2
 
 ### 8.1.0.2 20191230
 

From 14fa24817244d112a083a1bb0748f313b9a4e947 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 7 Jan 2020 13:08:30 +0100
Subject: [PATCH 094/403] gzip bin files

---
 pio/gzip-firmware.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pio/gzip-firmware.py

diff --git a/pio/gzip-firmware.py b/pio/gzip-firmware.py
new file mode 100644
index 000000000..1061f1010
--- /dev/null
+++ b/pio/gzip-firmware.py
@@ -0,0 +1,29 @@
+Import('env')
+import os
+import shutil
+import gzip
+
+OUTPUT_DIR = "build_output{}".format(os.path.sep)
+
+def bin_gzip(source, target, env):
+    variant = str(target[0]).split(os.path.sep)[1]
+    
+    # create string with location and file names based on variant
+    bin_file = "{}firmware{}{}.bin".format(OUTPUT_DIR, os.path.sep, variant)
+    gzip_file = "{}firmware{}{}.bin.gz".format(OUTPUT_DIR, os.path.sep, variant)
+
+    # check if new target files exist and remove if necessary
+    for f in [gzip_file]:
+        if os.path.isfile(f):
+            os.remove(f)
+
+    # write gzip firmware file
+    fp = open(bin_file,"rb")
+    data = fp.read()
+    bindata = bytearray(data)
+    with gzip.open(gzip_file, "wb") as f:
+        f.write(bindata)
+    fp.close()
+    f.close()
+
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_gzip])

From 0b067245aede4e75f2b08d846743b5dc02fdeea7 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 7 Jan 2020 13:10:00 +0100
Subject: [PATCH 095/403] add gzip PlatformIO script

---
 platformio_override_sample.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 45ab66897..ade3a4564 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -54,6 +54,7 @@ build_flags               = ${core_active.build_flags}
 upload_port               = COM5
 
 extra_scripts             = ${scripts_defaults.extra_scripts}
+                            pio/gzip-firmware.py
                             pio/obj-dump.py
 
 ; *** Upload file to OTA server using SCP

From 1c0db7e689f7394f71dc005ae845193dc2d0d7e0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 7 Jan 2020 17:01:48 +0100
Subject: [PATCH 096/403] Refactor version compatibility

---
 tasmota/settings.ino          | 34 +++++++++++++++++-----------------
 tasmota/support_tasmota.ino   |  3 +--
 tasmota/xdrv_01_webserver.ino |  3 +--
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 21f3e0ab4..0e32bc7bd 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -343,10 +343,10 @@ void SetFlashModeDout(void)
   delete[] _buffer;
 }
 
-uint32_t OtaVersion(void)
+bool VersionCompatible(void)
 {
   if (Settings.flag3.compatibility_check) {
-    return 0xFFFFFFFF;
+    return true;
   }
 
   eboot_command ebcmd;
@@ -362,15 +362,15 @@ uint32_t OtaVersion(void)
     if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
       version[1] = 0xFFFFFFFF;  // Ota file is gzipped and can not be checked for compatibility
       found = true;
-      break;
-    }
-    for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
-      version[0] = version[1];
-      version[1] = version[2];
-      version[2] = buffer[i];
-      if ((version[0] == MARKER_START) && (version[2] == MARKER_END)) {
-        found = true;
-        break;
+    } else {
+      for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
+        version[0] = version[1];
+        version[1] = version[2];
+        version[2] = buffer[i];
+        if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
+          found = true;
+          break;
+        }
       }
     }
     if (found) { break; }
@@ -381,13 +381,13 @@ uint32_t OtaVersion(void)
 
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
 
-  return version[1];
-}
+  if (version[1] < VERSION_COMPATIBLE) {
+    uint32_t eboot_magic = 0;  // Abandon OTA result
+    ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
+    return false;
+  }
 
-void AbandonOta(void)
-{
-  uint32_t eboot_magic = 0;
-  ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
+  return true;
 }
 
 void SettingsBufferFree(void)
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index b20e5ef26..4b0aa48bd 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -869,8 +869,7 @@ void Every250mSeconds(void)
         Response_P(PSTR("{\"" D_CMND_UPGRADE "\":\""));
         if (ota_result) {
 //          SetFlashModeDout();      // Force DOUT for both ESP8266 and ESP8285
-          if (OtaVersion() < VERSION_COMPATIBLE) {
-            AbandonOta();
+          if (!VersionCompatible()) {
             ResponseAppend_P(PSTR(D_JSON_FAILED " " D_UPLOAD_ERR_14));
           } else {
             ResponseAppend_P(PSTR(D_JSON_SUCCESSFUL ". " D_JSON_RESTARTING));
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 682663905..b6a45340a 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2398,8 +2398,7 @@ void HandleUploadLoop(void)
         Web.upload_error = 6;  // Upload failed. Enable logging 3
         return;
       }
-      if (OtaVersion() < VERSION_COMPATIBLE) {
-        AbandonOta();
+      if (!VersionCompatible()) {
         Web.upload_error = 14;  // Not compatible
         return;
       }

From ca7776573ab0c18f04ad6aa8891de05683688aa7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 7 Jan 2020 17:10:07 +0100
Subject: [PATCH 097/403] Remove debug info

---
 tasmota/xsns_56_hpma.ino | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasmota/xsns_56_hpma.ino b/tasmota/xsns_56_hpma.ino
index c9d50f28f..c66b3c7fd 100644
--- a/tasmota/xsns_56_hpma.ino
+++ b/tasmota/xsns_56_hpma.ino
@@ -64,7 +64,6 @@ void HpmaSecond(void)                 // Every second
 void HpmaInit(void)
 {
   hpma_type = 0;
-  Serial.println("SDS init");
   if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
     HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
     hpma115S0 = new HPMA115S0(*HpmaSerial);

From 8db49a0fe36b8a88bf0f63811c84084dc499d52e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 7 Jan 2020 17:28:06 +0100
Subject: [PATCH 098/403] Add support for tasmota-minimal.bin.gz

---
 tasmota/support_tasmota.ino | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 4b0aa48bd..a4ce37d36 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -833,13 +833,15 @@ void Every250mSeconds(void)
           strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
 #ifndef FIRMWARE_MINIMAL
           if (RtcSettings.ota_loader) {
-            char *bch = strrchr(mqtt_data, '/');                        // Only consider filename after last backslash prevent change of urls having "-" in it
+            char *bch = strrchr(mqtt_data, '/');                           // Only consider filename after last backslash prevent change of urls having "-" in it
             char *pch = strrchr((bch != nullptr) ? bch : mqtt_data, '-');  // Change from filename-DE.bin into filename-minimal.bin
-            char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');  // Change from filename.bin into filename-minimal.bin
+//            char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');  // Change from filename.bin into filename-minimal.bin
+            char *ech = strchr((bch != nullptr) ? bch : mqtt_data, '.');   // Change from filename.bin into filename-minimal.bin or filename.bin.gz into filename-minimal.bin.gz
             if (!pch) { pch = ech; }
             if (pch) {
               mqtt_data[pch - mqtt_data] = '\0';
-              char *ech = strrchr(SettingsText(SET_OTAURL), '.');  // Change from filename.bin into filename-minimal.bin
+//              char *ech = strrchr(SettingsText(SET_OTAURL), '.');          // Change from filename.bin into filename-minimal.bin
+              char *ech = strchr(SettingsText(SET_OTAURL), '.');          // Change from filename.bin into filename-minimal.bin
               snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ech);  // Minimal filename must be filename-minimal
             }
           }

From d2f14c6b83676dbf6c850e53f3d0afb842fa7d4a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 7 Jan 2020 20:59:35 +0100
Subject: [PATCH 099/403] add tasmota*.bin.gz to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e9c55b5b9..ef1e0a508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ build
 firmware.map
 firmware.asm
 tasmota*.bin
+tasmota*.bin.gz
 tasmota*.map
 platformio_override.ini
 

From 63b6cee1a19a53f9817fe1351672a81d6aa4f152 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Tue, 7 Jan 2020 22:32:48 +0100
Subject: [PATCH 100/403] Make gzip Python2.7 compatible

---
 pio/gzip-firmware.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pio/gzip-firmware.py b/pio/gzip-firmware.py
index 1061f1010..e8fae2c92 100644
--- a/pio/gzip-firmware.py
+++ b/pio/gzip-firmware.py
@@ -13,17 +13,11 @@ def bin_gzip(source, target, env):
     gzip_file = "{}firmware{}{}.bin.gz".format(OUTPUT_DIR, os.path.sep, variant)
 
     # check if new target files exist and remove if necessary
-    for f in [gzip_file]:
-        if os.path.isfile(f):
-            os.remove(f)
+    if os.path.isfile(gzip_file): os.remove(gzip_file)
 
     # write gzip firmware file
-    fp = open(bin_file,"rb")
-    data = fp.read()
-    bindata = bytearray(data)
-    with gzip.open(gzip_file, "wb") as f:
-        f.write(bindata)
-    fp.close()
-    f.close()
+    with open(bin_file,"rb") as fp:
+        with gzip.open(gzip_file, "wb") as f:
+            shutil.copyfileobj(fp, f)
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_gzip])

From 78aeeb1a8ddfcfaee6771d76988da4df6e5e6e38 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 8 Jan 2020 10:55:32 +0100
Subject: [PATCH 101/403] Update .gitpod.yml

---
 .gitpod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index ee7750c54..8ac16a8ad 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,3 +1,3 @@
 tasks:
-  - before: pip install -U platformio
+  - before: pip3 install -U platformio
     command: platformio run -e tasmota

From 7c43fca8e33a4a2bcfa1b8173a00941d62b898ee Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 8 Jan 2020 11:08:30 +0100
Subject: [PATCH 102/403] Use Python 3.7.6 with Gitpod

---
 .gitpod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index ee7750c54..8ac16a8ad 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,3 +1,3 @@
 tasks:
-  - before: pip install -U platformio
+  - before: pip3 install -U platformio
     command: platformio run -e tasmota

From 2c23364d486698600a3cc20d7176203501e77198 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 8 Jan 2020 11:43:39 +0100
Subject: [PATCH 103/403] Fix DDS238-2 total energy

Fix DDS238-2 total energy (#7457)
---
 tasmota/xnrg_09_dds2382.ino | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tasmota/xnrg_09_dds2382.ino b/tasmota/xnrg_09_dds2382.ino
index b211fa698..aea1f03ea 100644
--- a/tasmota/xnrg_09_dds2382.ino
+++ b/tasmota/xnrg_09_dds2382.ino
@@ -56,9 +56,14 @@ void Dds2382EverySecond(void)
 
       //           0     1     2     3     4     5     6     7     8     9     A     B     C     D     E     F    10    11           = ModBus register
       //  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40  = Buffer index
+      // 01 03 24 00 00 1C 7B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 F3 00 00 17 88 09 77 01 A6 03 F8 00 70 03 E1 13 8A 63 ED
+      // 01 03 24 00 00 1C AD 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 F3 00 00 17 BA 09 77 01 F1 04 AF 00 6C 03 E3 13 86 41 A2
       // SA FC BC EnergyTotal             ExportActiv ImportActiv                         Volta Curre APowe RPowe PFact Frequ Crc--  = DDS238-2 ZN/S version 1 (#6384)
       // SA FC BC EnergyTotal                                     ExportActiv ImportActiv Volta Curre APowe RPowe PFact Frequ Crc--  = DDS238-2 ZN/S version 2 (#6531)
 
+      // {"TotalStartTime":"2020-01-08T09:43:05","Total":0.060,"Yesterday":0.001,"Today":0.001,"ExportActive":12.670,"Period":0,"Power":1016,"ApparentPower":1020,"ReactivePower":112,"Factor":0.99,"Frequency":50,"Voltage":242,"Current":4.210}}
+      // {"TotalStartTime":"2020-01-08T00:00:00","Total":0.061,"Yesterday":0.001,"Today":0.001,"ExportActive":12.670,"Period":0.020,"Power":1199.000,"ApparentPower":1204.231,"ReactivePower":108.000,"Factor":1.00,"Frequency":49.98,"Voltage":242.3,"Current":4.970}}
+
       Energy.voltage[0] = (float)((buffer[27] << 8) + buffer[28]) / 10.0;
       Energy.current[0] = (float)((buffer[29] << 8) + buffer[30]) / 100.0;
       Energy.active_power[0] = (float)((buffer[31] << 8) + buffer[32]);
@@ -69,10 +74,10 @@ void Dds2382EverySecond(void)
       if (Settings.flag3.dds2382_model) {  // SetOption71 - Select different Modbus registers for Active Energy (#6531)
         offset = 19;
       }
-      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;  // 429496729.0 W
-      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;  // 429496729.0 W
+      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;    // 429496.729 kW
+      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;  // 429496.729 kW
 
-      EnergyUpdateTotal(import_active, false);  // 484.708 kWh
+      EnergyUpdateTotal(import_active, true);  // 484.708 kWh
     }
   } // end data ready
 

From edf15844310f77d0d1311f94cfb6ef44b9f39de3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 8 Jan 2020 16:45:43 +0100
Subject: [PATCH 104/403] Improve random color cycle for scheme 4

Improve random color cycle for scheme 4 (#7273)
---
 tasmota/xdrv_04_light.ino | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 3eacfbcaa..df65b1591 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1612,13 +1612,19 @@ void LightCycleColor(int8_t direction)
   if (0 == direction) {
     if (Light.random == Light.wheel) {
       Light.random = random(255);
+
+      uint8_t my_dir = ((Light.random < Light.wheel -128) || (Light.random > Light.wheel +128)) ? 1 : 0;
+      Light.random |= my_dir;
+
+//      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: random %d"), Light.random);
     }
-    direction = (Light.random < Light.wheel) ? -1 : 1;
+//    direction = (Light.random < Light.wheel) ? -1 : 1;
+    direction = (Light.random &1) ? -1 : 1;
   }
   Light.wheel += direction;
   uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);  // Scale to hue to keep amount of steps low (max 255 instead of 359)
 
-//  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: random %d, wheel %d, hue %d"), Light.random, Light.wheel, hue);
+//  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: random %d, wheel %d, hue %d"), Light.random, Light.wheel, hue);
 
   uint8_t sat;
   light_state.getHSB(nullptr, &sat, nullptr);  // Allow user control over Saturation
@@ -1964,9 +1970,9 @@ void LightSetOutputs(const uint16_t *cur_col_10) {
       }
     }
   }
-  char msg[24];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"),
-            ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
+
+//  char msg[24];
+//  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Channels %s"), ToHex_P((const unsigned char *)cur_col_10, 10, msg, sizeof(msg)));
 
   uint8_t cur_col[LST_MAX];
   for (uint32_t i = 0; i < LST_MAX; i++) {

From 7c68d7a754a06f56c7178e41cb4b4fae9756bbc1 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 8 Jan 2020 17:45:48 +0100
Subject: [PATCH 105/403] Improve random color cycle for scheme 4

Improve random color cycle for scheme 4 (#7273)
---
 tasmota/xdrv_04_light.ino | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index df65b1591..5cbcecdfa 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1613,13 +1613,15 @@ void LightCycleColor(int8_t direction)
     if (Light.random == Light.wheel) {
       Light.random = random(255);
 
-      uint8_t my_dir = ((Light.random < Light.wheel -128) || (Light.random > Light.wheel +128)) ? 1 : 0;
-      Light.random |= my_dir;
+      uint8_t my_dir = (Light.random < Light.wheel -128) ? 1 :
+                       (Light.random < Light.wheel     ) ? 0 :
+                       (Light.random > Light.wheel +128) ? 0 : 1;  // Increment or Decrement and roll-over
+      Light.random = (Light.random & 0xFE) | my_dir;
 
 //      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: random %d"), Light.random);
     }
 //    direction = (Light.random < Light.wheel) ? -1 : 1;
-    direction = (Light.random &1) ? -1 : 1;
+    direction = (Light.random &0x01) ? 1 : -1;
   }
   Light.wheel += direction;
   uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);  // Scale to hue to keep amount of steps low (max 255 instead of 359)

From 2c6659fca4e57f96fdc3a266e853c78ff9ca5032 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 9 Jan 2020 09:17:39 +0100
Subject: [PATCH 106/403] Fix labeling of web buttons for shutters

Instead of switching power of the shutter relais web buttons will issue shutter commands to work right when in shuttermode 1. Up down labels arrow up/down fixed for more than one shutter.
---
 tasmota/i18n.h                |  2 ++
 tasmota/xdrv_01_webserver.ino | 49 ++++++++++++++++++++++++-----------
 tasmota/xdrv_27_shutter.ino   |  6 ++---
 3 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index fb54edd4a..e8432bc48 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -502,6 +502,8 @@
 #define D_CMND_SHUTTER_CLOSE "Close"
 #define D_CMND_SHUTTER_UP "Up"
 #define D_CMND_SHUTTER_DOWN "Down"
+#define D_CMND_SHUTTER_TOGGLEUP "ToggleUp"
+#define D_CMND_SHUTTER_TOGGLEDOWN "ToggleDown"
 #define D_CMND_SHUTTER_STOP "Stop"
 #define D_CMND_SHUTTER_POSITION "Position"
 #define D_CMND_SHUTTER_OPENTIME "OpenDuration"
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index b6a45340a..00adbd73e 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1120,20 +1120,12 @@ void HandleRoot(void)
       for (uint32_t idx = 1; idx <= devices_present; idx++) {
         bool set_button = ((idx <= MAX_BUTTON_TEXT) && strlen(SettingsText(SET_BUTTON1 + idx -1)));
 #ifdef USE_SHUTTER
-        if (Settings.flag3.shutter_mode) {  // SetOption80 - Enable shutter support
-          bool shutter_used = false;
-          for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-            if (Settings.shutter_startrelay[i] == (((idx -1) & 0xFFFFFFFE) +1)) {
-              shutter_used = true;
-              break;
-            }
-          }
-          if (shutter_used) {
-            WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-              (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (idx % 2) ? "▲" : "▼",
-              "");
-            continue;
-          }
+        int32_t ShutterWebButton;
+        if (ShutterWebButton = IsShutterWebButton(idx)) {
+          WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
+            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (ShutterWebButton>0) ? "▲" : "▼",
+            "");
+          continue;
         }
 #endif  // USE_SHUTTER
         snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx);
@@ -1216,7 +1208,18 @@ bool HandleRootStatusRefresh(void)
       }
     } else {
 #endif  // USE_SONOFF_IFAN
-      ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
+#ifdef USE_SHUTTER
+      int32_t ShutterWebButton;
+      if (ShutterWebButton = IsShutterWebButton(device)) {
+        snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: WebButton %d, %s"), ShutterWebButton, svalue);
+        ExecuteWebCommand(svalue, SRC_WEBGUI);
+      } else {
+#endif  // USE_SHUTTER
+        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
+#ifdef USE_SHUTTER
+      }
+#endif  // USE_SHUTTER
 #ifdef USE_SONOFF_IFAN
     }
 #endif  // USE_SONOFF_IFAN
@@ -1301,6 +1304,22 @@ bool HandleRootStatusRefresh(void)
   return true;
 }
 
+#ifdef USE_SHUTTER
+int32_t IsShutterWebButton(uint32_t idx) {
+  /* 0: Not a shutter, 1..4: shutter up idx, -1..-4: shutter down idx */
+  int32_t ShutterWebButton = 0;
+  if (Settings.flag3.shutter_mode) {  // SetOption80 - Enable shutter support
+    for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+      if (Settings.shutter_startrelay[i] && ((Settings.shutter_startrelay[i] == idx) || (Settings.shutter_startrelay[i] == (idx-1)))) {
+        ShutterWebButton = (Settings.shutter_startrelay[i] == idx) ? (i+1): (-1-i);
+        break;
+      }
+    }
+  }
+  return ShutterWebButton;
+}
+#endif // USE_SHUTTER
+
 /*-------------------------------------------------------------------------------------------*/
 
 #ifndef FIRMWARE_MINIMAL
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index ec272487b..b849df526 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -667,15 +667,15 @@ void CmndShutterPosition(void)
     // value 0 with data_len > 0 can mean Open
     if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
       //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN)) {
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
         CmndShutterOpen();
         return;
       }
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE)) {
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
         CmndShutterClose();
         return;
       }
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP)) {
+      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
         XdrvMailbox.payload = -99;
         CmndShutterStop();
         return;

From 3675388148ad5bbf68dac9d46db2c7895c075611 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 9 Jan 2020 10:35:27 +0100
Subject: [PATCH 107/403] Add MQTT field to short shutterButton command syntax

Align code to latest command doc suggestion
---
 tasmota/xdrv_27_shutter.ino | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index ec272487b..87bcd3dd1 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -809,7 +809,7 @@ void CmndShutterButton(void)
     // (setting>> 0)&(0x03) : shutter_index
     if (XdrvMailbox.data_len > 0) {
         uint32_t i = 0, button_index = 0;
-        bool done = false;
+        bool done = false, isShortCommand = false;
         char *str_ptr;
         char* version_dup = strdup(XdrvMailbox.data);  // Duplicate the version_str as strtok_r will modify it.
         // Loop through the version string, splitting on ' ' seperators.
@@ -830,19 +830,26 @@ void CmndShutterButton(void)
             break;
             case 1:
               if (!strcmp_P(str, PSTR("up"))) {
-                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20) | (0x18<<26);
-                done = true;
+                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20);
+                isShortCommand = true;
                 break;
               } else if (!strcmp_P(str, PSTR("down"))) {
-                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20) | (0x18<<26);
-                done = true;
+                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20);
+                isShortCommand = true;
                 break;
               } else if (!strcmp_P(str, PSTR("updown"))) {
                 setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
-                done = true;
+                isShortCommand = true;
                 break;
               }
             case 2:
+              if (isShortCommand) {
+                if ((field==1) && (setting & (0x3F<<(2+6*3))))
+                  // if short command up or down then also enable MQTT broadcast
+                  setting |= (0x3<<29);
+                done = true;
+                break;
+              }
             case 3:
             case 4:
               if ((field >= -1) && (field<=100))

From a6dcf467717eef659667f4a4ac15e208a68fcfd1 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 9 Jan 2020 11:35:01 +0100
Subject: [PATCH 108/403] Move heap to stack

---
 tasmota/my_user_config.h    |  2 +-
 tasmota/support.ino         |  8 ++---
 tasmota/xdrv_27_shutter.ino | 66 ++++++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 06e444658..e9e8f390c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -345,7 +345,7 @@
 #define USE_SONOFF_IFAN                          // Add support for Sonoff iFan02 and iFan03 (+2k code)
 #define USE_BUZZER                               // Add support for a buzzer (+0k6 code)
 #define USE_ARILUX_RF                            // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0))
-//#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+6k code)
+//#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+11k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 9e23c1423..6ae6898e4 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -499,17 +499,14 @@ bool NewerVersion(char* version_str)
   uint32_t version = 0;
   uint32_t i = 0;
   char *str_ptr;
-  char* version_dup = strdup(version_str);  // Duplicate the version_str as strtok_r will modify it.
 
-  if (!version_dup) {
-    return false;  // Bail if we can't duplicate. Assume bad.
-  }
+  char version_dup[strlen(version_str) +1];
+  strncpy(version_dup, version_str, sizeof(version_dup));  // Duplicate the version_str as strtok_r will modify it.
   // Loop through the version string, splitting on '.' seperators.
   for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) {
     int field = atoi(str);
     // The fields in a version string can only range from 0-255.
     if ((field < 0) || (field > 255)) {
-      free(version_dup);
       return false;
     }
     // Shuffle the accumulated bytes across, and add the new byte.
@@ -521,7 +518,6 @@ bool NewerVersion(char* version_str)
       i++;
     }
   }
-  free(version_dup);  // We no longer need this.
   // A version string should have 2-4 fields. e.g. 1.2, 1.2.3, or 1.2.3a (= 1.2.3.1).
   // If not, then don't consider it a valid version string.
   if ((i < 2) || (i > sizeof(VERSION))) {
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index e4fdc1479..057e159fb 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -808,18 +808,22 @@ void CmndShutterButton(void)
     // (setting>> 2)&(0x3f) : shutter_position single press 0 disabled, 1..101 == 0..100%
     // (setting>> 0)&(0x03) : shutter_index
     if (XdrvMailbox.data_len > 0) {
-        uint32_t i = 0, button_index = 0;
-        bool done = false, isShortCommand = false;
+        uint32_t i = 0;
+        uint32_t button_index = 0;
+        bool done = false;
+        bool isShortCommand = false;
         char *str_ptr;
-        char* version_dup = strdup(XdrvMailbox.data);  // Duplicate the version_str as strtok_r will modify it.
-        // Loop through the version string, splitting on ' ' seperators.
-        for (char *str = strtok_r(version_dup, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
-          int field;
-          if (str[0] == '-')
-            field = -1;
-          else
-            field = atoi(str);
 
+        char data_copy[strlen(XdrvMailbox.data) +1];
+        strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));  // Duplicate data as strtok_r will modify it.
+        // Loop through the data string, splitting on ' ' seperators.
+        for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
+          int field;
+          if (str[0] == '-') {
+            field = -1;
+          } else {
+            field = atoi(str);
+          }
           switch (i) {
             case 0:
               if ((field >= -1) && (field<=4)) {
@@ -866,7 +870,6 @@ void CmndShutterButton(void)
           }
           if (done) break;
         }
-        free(version_dup);
 
         if (button_index) {
           if (button_index==-1) {
@@ -957,30 +960,31 @@ void CmndShutterInvert(void)
   }
 }
 
-void CmndShutterCalibration(void)  // ????
+void CmndShutterCalibration(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
     if (XdrvMailbox.data_len > 0) {
-        uint32_t i = 0;
-        char *str_ptr;
-        char* version_dup = strdup(XdrvMailbox.data);  // Duplicate the version_str as strtok_r will modify it.
-        // Loop through the version string, splitting on '.' seperators.
-        for (char *str = strtok_r(version_dup, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
-          int field = atoi(str);
-          // The fields in a version string can only range from 1-30000.
-          // and following value must be higher than previous one
-          if ((field <= 0) || (field > 30000) ||  ( (i>0) && (field <= messwerte[i-1]) ) ) {
-            break;
-          }
-          messwerte[i] = field;
+      uint32_t i = 0;
+      char *str_ptr;
+
+      char data_copy[strlen(XdrvMailbox.data) +1];
+      strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));  // Duplicate data as strtok_r will modify it.
+      // Loop through the data string, splitting on ' ' seperators.
+      for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
+        int field = atoi(str);
+        // The fields in a data string can only range from 1-30000.
+        // and following value must be higher than previous one
+        if ((field <= 0) || (field > 30000) || ( (i>0) && (field <= messwerte[i-1]) ) ) {
+          break;
         }
-        free(version_dup);
-        for (i=0 ; i < 5 ; i++) {
-          Settings.shuttercoeff[i][XdrvMailbox.index -1] = (uint32_t)messwerte[i] * 1000 / messwerte[4];
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
-        }
-        ShutterInit();
-        ResponseCmndIdxChar(XdrvMailbox.data);
+        messwerte[i] = field;
+      }
+      for (i = 0; i < 5; i++) {
+        Settings.shuttercoeff[i][XdrvMailbox.index -1] = (uint32_t)messwerte[i] * 1000 / messwerte[4];
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
+      }
+      ShutterInit();
+      ResponseCmndIdxChar(XdrvMailbox.data);
     } else {
       char setting_chr[30] = "0";
       snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);

From d0774995ded142f1400a8e26a2959082ec5aee30 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 9 Jan 2020 14:19:19 +0100
Subject: [PATCH 109/403] Allow duplicate names but different channel in wifi
 scan

Allow duplicate names but different channel in wifi scan
---
 tasmota/xdrv_01_webserver.ino | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 00adbd73e..73127a06f 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1675,8 +1675,9 @@ void HandleWifiConfiguration(void)
         for (uint32_t i = 0; i < n; i++) {
           if (-1 == indices[i]) { continue; }
           cssid = WiFi.SSID(indices[i]);
+          uint32_t cschn = WiFi.channel(indices[i]);
           for (uint32_t j = i + 1; j < n; j++) {
-            if (cssid == WiFi.SSID(indices[j])) {
+            if ((cssid == WiFi.SSID(indices[j])) && (cschn == WiFi.channel(indices[j]))) {
               DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
               indices[j] = -1;  // set dup aps to index -1
             }

From 250e3f3dc4ea90aa3bb803817194609a762916df Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 9 Jan 2020 14:35:03 +0100
Subject: [PATCH 110/403] Fix display of wifi scan signal strength

Fix display of wifi scan signal strength
---
 tasmota/xdrv_01_webserver.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 73127a06f..eff136c7d 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1696,7 +1696,7 @@ void HandleWifiConfiguration(void)
             HtmlEscape(WiFi.SSID(indices[i])).c_str(),
             WiFi.channel(indices[i]),
             GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
-            quality, WiFi.RSSI()
+            quality, WiFi.RSSI(indices[i])
           );
           delay(0);
 

From a1ccd0131d58240963a19ad8726afd53f9054d1e Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 9 Jan 2020 14:48:23 +0100
Subject: [PATCH 111/403] Enable WIFI setup, restart and reset via
 ShutterButtons

When no button restriction is given and ALL shutter buttons are pressed simultaneously more than 5 times or hold simultaneously follow Tasmota's basic button behavior.
---
 tasmota/xdrv_27_shutter.ino | 61 ++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index e4fdc1479..133e5e5ca 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -34,7 +34,7 @@ uint16_t messwerte[5] = {30,50,70,90,100};
 uint16_t last_execute_step;
 
 enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
-enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
 
 const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
@@ -497,6 +497,16 @@ void ShutterRelayChanged(void)
 	}
 }
 
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index) {
+  // check for simultaneous shutter button hold
+  uint32 min_shutterbutton_hold_timer = -1;
+  for (uint32_t i = 0; i < MAX_KEYS; i++) {
+    if ((Settings.shutter_button[i] & (1<<31)) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
+      min_shutterbutton_hold_timer = Button.hold_timer[i];
+  }
+  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
+}
+
 void ShutterButtonHandler(void)
 {
   uint8_t buttonState = SHT_NOT_PRESSED;
@@ -534,11 +544,31 @@ void ShutterButtonHandler(void)
           Button.press_counter[button_index] = 0;      // Discard button press to disable functionality
         }
       }
-      if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {  // SetOption32 (40) - Button hold
+      if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {  // press still valid && SetOption32 (40) - Button hold
+        if (!Settings.flag.button_restrict) { // no SetOption1 (0)
+          // check for simultaneous shutter button hold
+          if (ShutterButtonIsSimultaneousHold(button_index)) {
+            // simultaneous shutter button hold detected
+            for (uint32_t i = 0; i < MAX_KEYS; i++)
+              if (Settings.shutter_button[i] & (1<<31))
+                Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
+          }
+        }
         if (Button.press_counter[button_index]<99)
           buttonState = SHT_PRESSED_HOLD;
         Button.press_counter[button_index] = 0;
       }
+      if ((!Settings.flag.button_restrict) && (Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {  // no SetOption1 (0) && SetOption32 (40) - Button held for factor times longer
+        // check for simultaneous shutter button extend hold
+        if (ShutterButtonIsSimultaneousHold(button_index)) {
+          // simultaneous shutter button extend hold detected
+          char scmnd[20];
+          buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
+          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+          ExecuteCommand(scmnd, SRC_BUTTON);
+          return;
+        }
+      }
     }
   }
 
@@ -548,15 +578,38 @@ void ShutterButtonHandler(void)
     } else {
       if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
         if (Button.press_counter[button_index]<99) {
+          if ((!Settings.flag.button_restrict) && (Button.press_counter[button_index]>=5)) { // no SetOption1 (0) && 5x or more presses
+            // check for simultaneous shutter button press >3
+            uint32 min_shutterbutton_press_counter = -1;
+            for (uint32_t i = 0; i < MAX_KEYS; i++) {
+              if ((Settings.shutter_button[i] & (1<<31)) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+                min_shutterbutton_press_counter = Button.press_counter[i];
+            }
+            if (min_shutterbutton_press_counter >= Button.press_counter[button_index]-2) {
+              char scmnd[20];
+              // simultaneous shutter button press >3 detected
+              press_index = Button.press_counter[button_index];
+              for (uint32_t i = 0; i < MAX_KEYS; i++)
+                if (Settings.shutter_button[i] & (1<<31))
+                  Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
+              buttonState = SHT_SHT_PRESSED_MULTI_SIMULTANEOUS;
+              GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
+              ExecuteCommand(scmnd, SRC_BUTTON);
+              return;
+            }
+          }
           press_index = Button.press_counter[button_index];
-          buttonState = SHT_PRESSED_MULTI;
+          if ((buttonState == SHT_NOT_PRESSED) && (Button.press_counter[button_index]<99)) {
+            // no simultaneous shutter button press >3 detected
+            buttonState = SHT_PRESSED_MULTI;
+          }
         }
         Button.press_counter[button_index] = 0;
       }
     }
   }
 
-  if (buttonState != SHT_NOT_PRESSED) {
+  if ((buttonState != SHT_NOT_PRESSED) && (buttonState != SHT_SHT_PRESSED_MULTI_SIMULTANEOUS) && (buttonState != SHT_PRESSED_EXT_HOLD_SIMULTANEOUS)) {
     if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
       if (press_index>3) press_index=3;
       press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);

From be85d3a0602ac15967a7775e899cf8636cdf9029 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Fri, 10 Jan 2020 20:54:13 +0100
Subject: [PATCH 112/403] Fix ``WakeUp <x>`` ignores provided value (#7473)

---
 tasmota/CHANGELOG.md      | 1 +
 tasmota/xdrv_04_light.ino | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index db1e951e9..e260285e8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Add support for gzipped binaries
 - Update IRremoteESP8266 lib updated to v2.7.2
+- Fix ``WakeUp <x>`` ignores provided value (#7473)
 
 ### 8.1.0.2 20191230
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 5cbcecdfa..9526f8c82 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2325,7 +2325,7 @@ void CmndScheme(void)
 void CmndWakeup(void)
 {
   if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    Settings.light_dimmer = XdrvMailbox.payload;
+    light_controller.changeDimmer(XdrvMailbox.payload);
   }
   Light.wakeup_active = 3;
   Settings.light_scheme = LS_WAKEUP;

From 20c58f5f203cf113d16ab1752ccb9406ffe7c86e Mon Sep 17 00:00:00 2001
From: Roman Lomonosov <r.lomonosov@gmail.ru>
Date: Sat, 11 Jan 2020 10:15:30 +0300
Subject: [PATCH 113/403] Fix typo in gauge metric type (#7216)

---
 tasmota/xsns_91_prometheus.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xsns_91_prometheus.ino b/tasmota/xsns_91_prometheus.ino
index ff18f4e70..ea4c0047a 100644
--- a/tasmota/xsns_91_prometheus.ino
+++ b/tasmota/xsns_91_prometheus.ino
@@ -56,7 +56,7 @@ void HandleMetrics(void)
   dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
   WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
   dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE active_power guage\nactive_power %s\n"), parameter);
+  WSContentSend_P(PSTR("# TYPE active_power gauge\nactive_power %s\n"), parameter);
   dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
   WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
   dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);

From e7b061ce5a688d48aba3d1736d48973d4dadd5e8 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 11 Jan 2020 15:39:56 +0100
Subject: [PATCH 114/403] Fix Tuya PowerOn state

Fix Tuya PowerOn state (#7412)
---
 tasmota/support_tasmota.ino | 54 +++++++++++++++++++++++++++++++++++++
 tasmota/tasmota.ino         | 49 +--------------------------------
 tasmota/xdrv_16_tuyamcu.ino |  2 +-
 3 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index a4ce37d36..d502e64c3 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -276,6 +276,60 @@ void SetAllPower(uint32_t state, uint32_t source)
   }
 }
 
+void SetPowerOnState(void)
+{
+  if (MOTOR == my_module_type) {
+    Settings.poweronstate = POWER_ALL_ON;   // Needs always on else in limbo!
+  }
+  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+    SetDevicePower(1, SRC_RESTART);
+  } else {
+    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
+      switch (Settings.poweronstate) {
+      case POWER_ALL_OFF:
+      case POWER_ALL_OFF_PULSETIME_ON:
+        power = 0;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_ON:  // All on
+        power = (1 << devices_present) -1;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_SAVED_TOGGLE:
+        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
+        if (Settings.flag.save_state) {  // SetOption0 - Save power state and use after restart
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      case POWER_ALL_SAVED:
+        power = Settings.power & ((1 << devices_present) -1);
+        if (Settings.flag.save_state) {  // SetOption0 - Save power state and use after restart
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      }
+    } else {
+      power = Settings.power & ((1 << devices_present) -1);
+      if (Settings.flag.save_state) {    // SetOption0 - Save power state and use after restart
+        SetDevicePower(power, SRC_RESTART);
+      }
+    }
+  }
+
+  // Issue #526 and #909
+  for (uint32_t i = 0; i < devices_present; i++) {
+    if (!Settings.flag3.no_power_feedback) {  // SetOption63 - Don't scan relay power state at restart - #5594 and #5663
+      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
+        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
+      }
+    }
+    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
+      SetPulseTimer(i, Settings.pulse_timer[i]);
+    }
+  }
+  blink_powersave = power;
+}
+
 void SetLedPowerIdx(uint32_t led, uint32_t state)
 {
   if ((99 == pin[GPIO_LEDLNK]) && (0 == led)) {  // Legacy - LED1 is link led only if LED2 is present
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index fe90b1a33..97f2ff797 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -276,54 +276,7 @@ void setup(void)
 
   WifiConnect();
 
-  if (MOTOR == my_module_type) { Settings.poweronstate = POWER_ALL_ON; }  // Needs always on else in limbo!
-  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-    SetDevicePower(1, SRC_RESTART);
-  } else {
-    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
-      switch (Settings.poweronstate) {
-      case POWER_ALL_OFF:
-      case POWER_ALL_OFF_PULSETIME_ON:
-        power = 0;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_ON:  // All on
-        power = (1 << devices_present) -1;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_SAVED_TOGGLE:
-        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
-        if (Settings.flag.save_state) {  // SetOption0 - Save power state and use after restart
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      case POWER_ALL_SAVED:
-        power = Settings.power & ((1 << devices_present) -1);
-        if (Settings.flag.save_state) {  // SetOption0 - Save power state and use after restart
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      }
-    } else {
-      power = Settings.power & ((1 << devices_present) -1);
-      if (Settings.flag.save_state) {    // SetOption0 - Save power state and use after restart
-        SetDevicePower(power, SRC_RESTART);
-      }
-    }
-  }
-
-  // Issue #526 and #909
-  for (uint32_t i = 0; i < devices_present; i++) {
-    if (!Settings.flag3.no_power_feedback) {  // SetOption63 - Don't scan relay power state at restart - #5594 and #5663
-      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
-        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
-      }
-    }
-    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
-      SetPulseTimer(i, Settings.pulse_timer[i]);
-    }
-  }
-  blink_powersave = power;
+  SetPowerOnState();
 
   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE), PROJECT, SettingsText(SET_FRIENDLYNAME1), my_version, my_image);
 #ifdef FIRMWARE_MINIMAL
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index a5f1df326..18a899589 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -794,7 +794,7 @@ bool Xdrv16(uint8_t function)
       case FUNC_MODULE_INIT:
         result = TuyaModuleSelected();
         break;
-      case FUNC_INIT:
+      case FUNC_PRE_INIT:
         TuyaInit();
         break;
       case FUNC_SET_DEVICE_POWER:

From 0e0d8190fa4750c846d794aaad25f2f91b8d8259 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 12 Jan 2020 13:10:21 +0100
Subject: [PATCH 115/403] Change some commands displaying all items

Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
---
 RELEASENOTES.md               |  2 +
 tasmota/CHANGELOG.md          |  1 +
 tasmota/settings.ino          |  2 +-
 tasmota/support_command.ino   | 69 +++++++++++++++++++++++------------
 tasmota/support_tasmota.ino   |  4 +-
 tasmota/support_wifi.ino      |  2 +-
 tasmota/tasmota.h             |  4 ++
 tasmota/xdrv_01_webserver.ino |  6 +--
 tasmota/xdrv_02_mqtt.ino      | 35 +++++++++++-------
 tasmota/xdrv_10_rules.ino     |  6 +--
 10 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 007b99fe2..af4aeeb73 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -55,12 +55,14 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 ### Version 8.1.0.3
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
+- Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
 - Fix Improved fade linearity with gamma correction
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
+- Fix ``WakeUp <x>`` ignores provided value (#7473)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index e260285e8..f9089b818 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 8.1.0.3 20200106
 
+- Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Add support for gzipped binaries
 - Update IRremoteESP8266 lib updated to v2.7.2
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 0e32bc7bd..a059b71e6 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1043,7 +1043,7 @@ void SettingsDefaultSet2(void)
   SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
   SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
   SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
-  for (uint32_t i = 0; i < 3; i++) {
+  for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
     SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
   }
   Settings.latitude = (int)((double)LATITUDE * 1000000);
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index d754e95cc..6812085c6 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -89,6 +89,15 @@ void ResponseCmndIdxChar(const char* value)
   Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
 }
 
+void ResponseCmndAll(uint32_t text_index, uint32_t count)
+{
+  mqtt_data[0] = '\0';
+  for (uint32_t i = 0; i < count; i++) {
+    ResponseAppend_P(PSTR("%c\"%s%d\":\"%s\""), (i) ? ',' : '{', XdrvMailbox.command, i +1, SettingsText(text_index +i));
+  }
+  ResponseJsonEnd();
+}
+
 /********************************************************************************************/
 
 void ExecuteCommand(const char *cmnd, uint32_t source)
@@ -1220,16 +1229,20 @@ void CmndIpAddress(void)
 
 void CmndNtpServer(void)
 {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
-    uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
-    if (XdrvMailbox.data_len > 0) {
-      SettingsUpdateText(ntp_server,
-        (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
-      SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
-//        restart_flag = 2;  // Issue #3890
-      ntp_force_sync = true;
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_NTP_SERVERS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_NTPSERVER1, MAX_NTP_SERVERS);
+    } else {
+      uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(ntp_server,
+          (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
+        SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
+  //        restart_flag = 2;  // Issue #3890
+        ntp_force_sync = true;
+      }
+      ResponseCmndIdxChar(SettingsText(ntp_server));
     }
-    ResponseCmndIdxChar(SettingsText(ntp_server));
   }
 }
 
@@ -1251,14 +1264,18 @@ void CmndAp(void)
 
 void CmndSsid(void)
 {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    if (XdrvMailbox.data_len > 0) {
-      SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
-              (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
-      Settings.sta_active = XdrvMailbox.index -1;
-      restart_flag = 2;
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SSIDS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STASSID1, MAX_SSIDS);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
+                (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
+        Settings.sta_active = XdrvMailbox.index -1;
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
     }
-    ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
   }
 }
 
@@ -1308,16 +1325,20 @@ void CmndWifiConfig(void)
 void CmndFriendlyname(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_FRIENDLYNAMES)) {
-    if (XdrvMailbox.data_len > 0) {
-      char stemp1[TOPSZ];
-      if (1 == XdrvMailbox.index) {
-        snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
-      } else {
-        snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_FRIENDLYNAME1, MAX_FRIENDLYNAMES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        char stemp1[TOPSZ];
+        if (1 == XdrvMailbox.index) {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
+        } else {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
+        }
+        SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
       }
-      SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
+      ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
     }
-    ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
   }
 }
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index d502e64c3..187c116a1 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -107,7 +107,7 @@ char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopi
       fulltopic += F("/");
       fulltopic += FPSTR(MQTT_TOKEN_PREFIX);  // Need prefix for commands to handle mqtt topic loops
     }
-    for (uint32_t i = 0; i < 3; i++) {
+    for (uint32_t i = 0; i < MAX_MQTT_PREFIXES; i++) {
       if (!strlen(SettingsText(SET_MQTTPREFIX1 + i))) {
         char temp[TOPSZ];
         SettingsUpdateText(SET_MQTTPREFIX1 + i, GetTextIndexed(temp, sizeof(temp), i, kPrefixes));
@@ -144,7 +144,7 @@ char* GetFallbackTopic_P(char *stopic, const char* subtopic)
 
 char* GetStateText(uint32_t state)
 {
-  if (state > 3) {
+  if (state >= MAX_STATE_TEXT) {
     state = 1;
   }
   return SettingsText(SET_STATE_TXT1 + state);
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 3989f8c66..954e2fb3c 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -279,7 +279,7 @@ void WifiBeginAfterScan(void)
 
         bool known = false;
         uint32_t j;
-        for (j = 0; j < 2; j++) {
+        for (j = 0; j < MAX_SSIDS; j++) {
           if (ssid_scan == SettingsText(SET_STASSID1 + j)) {  // SSID match
             known = true;
             if (rssi_scan > best_network_db) {      // Best network
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 32a85c80a..f0e747c27 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -73,6 +73,10 @@ const uint8_t MAX_RULE_SETS = 3;            // Max number of rule sets of size 5
 const uint16_t MAX_RULE_SIZE = 512;         // Max number of characters in rules
 
 // Changes to the following MAX_ defines need to be in line with enum SettingsTextIndex
+const uint8_t MAX_MQTT_PREFIXES = 3;        // Max number of MQTT prefixes (cmnd, stat, tele)
+const uint8_t MAX_SSIDS = 2;                // Max number of SSIDs
+const uint8_t MAX_STATE_TEXT = 4;           // Max number of State names (OFF, ON, TOGGLE, HOLD)
+const uint8_t MAX_NTP_SERVERS = 3;          // Max number of NTP servers
 const uint8_t MAX_RULE_MEMS = 16;           // Max number of saved vars
 const uint8_t MAX_FRIENDLYNAMES = 8;        // Max number of Friendly names
 const uint8_t MAX_BUTTON_TEXT = 16;         // Max number of GUI button labels
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index eff136c7d..db0fce2a5 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2906,11 +2906,7 @@ void CmndWebButton(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_BUTTON_TEXT)) {
     if (!XdrvMailbox.usridx) {
-      mqtt_data[0] = '\0';
-      for (uint32_t i = 0; i < MAX_BUTTON_TEXT; i++) {
-        ResponseAppend_P(PSTR("%c\"WebButton%d\":\"%s\""), (i) ? ',' : '{', i +1, SettingsText(SET_BUTTON1 +i));
-      }
-      ResponseJsonEnd();
+      ResponseCmndAll(SET_BUTTON1, MAX_BUTTON_TEXT);
     } else {
       if (XdrvMailbox.data_len > 0) {
         SettingsUpdateText(SET_BUTTON1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 5beac68f0..6096103c4 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -789,14 +789,18 @@ void CmndMqttRetry(void)
 
 void CmndStateText(void)
 {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    if (XdrvMailbox.data_len > 0) {
-      for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
-        if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_STATE_TEXT)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STATE_TXT1, MAX_STATE_TEXT);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
+          if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
+        }
+        SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
       }
-      SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
+      ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
     }
-    ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
   }
 }
 
@@ -828,15 +832,18 @@ void CmndFullTopic(void)
 
 void CmndPrefix(void)
 {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
-
-    if (XdrvMailbox.data_len > 0) {
-      MakeValidMqtt(0, XdrvMailbox.data);
-      SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
-        (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
-      restart_flag = 2;
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_MQTT_PREFIXES)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_MQTTPREFIX1, MAX_MQTT_PREFIXES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        MakeValidMqtt(0, XdrvMailbox.data);
+        SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
+          (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
     }
-    ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
   }
 }
 
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 78cb73e10..dd557a0fd 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -1812,11 +1812,7 @@ void CmndMemory(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_MEMS)) {
     if (!XdrvMailbox.usridx) {
-      mqtt_data[0] = '\0';
-      for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-        ResponseAppend_P(PSTR("%c\"Mem%d\":\"%s\""), (i) ? ',' : '{', i +1, SettingsText(SET_MEM1 +i));
-      }
-      ResponseJsonEnd();
+      ResponseCmndAll(SET_MEM1, MAX_RULE_MEMS);
     } else {
       if (XdrvMailbox.data_len > 0) {
 #ifdef USE_EXPRESSION

From 8cf411a1c3a94e842c98081bed6e343295b8723a Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Sun, 12 Jan 2020 14:18:15 +0100
Subject: [PATCH 116/403] New command ShutterLock

Command shutterlock<x> 1 locks shutter <x> movement. Any ongoing movement is still finished when called. Subsequent calls of shutter commands about movement, web buttons and shutter buttons  are blocked when shutter is locked. shutterlock<x> 0 unlocks shutter <x>.
---
 tasmota/i18n.h                |   1 +
 tasmota/settings.h            |   2 +-
 tasmota/xdrv_01_webserver.ino |   1 -
 tasmota/xdrv_20_hue.ino       |   4 +-
 tasmota/xdrv_27_shutter.ino   | 199 +++++++++++++++++++---------------
 5 files changed, 115 insertions(+), 92 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index e8432bc48..8ec8020da 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -516,6 +516,7 @@
 #define D_CMND_SHUTTER_MOTORDELAY "MotorDelay"
 #define D_CMND_SHUTTER_FREQUENCY "Frequency"
 #define D_CMND_SHUTTER_BUTTON "Button"
+#define D_CMND_SHUTTER_LOCK "Lock"
 
 // Commands xdrv_32_hotplug.ino
 #define D_CMND_HOTPLUG "HotPlug"
diff --git a/tasmota/settings.h b/tasmota/settings.h
index b46c0dd48..684ab18af 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -432,7 +432,7 @@ struct SYSCFG {
   uint16_t      shutter_opentime[MAX_SHUTTERS];      // E40
   uint16_t      shutter_closetime[MAX_SHUTTERS];     // E48
   int16_t       shuttercoeff[5][MAX_SHUTTERS];       // E50
-  uint8_t       shutter_invert[MAX_SHUTTERS];        // E78
+  uint8_t       shutter_options[MAX_SHUTTERS];        // E78
   uint8_t       shutter_set50percent[MAX_SHUTTERS];  // E7C
   uint8_t       shutter_position[MAX_SHUTTERS];      // E80
   uint8_t       shutter_startrelay[MAX_SHUTTERS];    // E84
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index db0fce2a5..927ad564d 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1212,7 +1212,6 @@ bool HandleRootStatusRefresh(void)
       int32_t ShutterWebButton;
       if (ShutterWebButton = IsShutterWebButton(device)) {
         snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: WebButton %d, %s"), ShutterWebButton, svalue);
         ExecuteWebCommand(svalue, SRC_WEBGUI);
       } else {
 #endif  // USE_SHUTTER
diff --git a/tasmota/xdrv_20_hue.ino b/tasmota/xdrv_20_hue.ino
index 37de3a902..87e3b3d71 100644
--- a/tasmota/xdrv_20_hue.ino
+++ b/tasmota/xdrv_20_hue.ino
@@ -279,7 +279,7 @@ void HueLightStatus1(uint8_t device, String *response)
 
 #ifdef USE_SHUTTER
   if (ShutterState(device)) {
-    bri = (float)(Settings.shutter_invert[device-1] ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
+    bri = (float)((Settings.shutter_options[device-1] & 1) ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
   }
 #endif
 
@@ -681,7 +681,7 @@ void HueLights(String *path)
       if (change) {
 #ifdef USE_SHUTTER
         if (ShutterState(device)) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_invert[device-1]);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_options[device-1] & 1);
           ShutterSetPosition(device, bri * 100.0f );
         } else
 #endif
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 8184cca1a..beacc6ea2 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -40,13 +40,13 @@ const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
   D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
   D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
-  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON;
+  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK;
 
 void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
   &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
-  &CmndShutterFrequency, &CmndShutterButton};
+  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock};
 
 const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
 
@@ -233,10 +233,10 @@ void ShutterInit(void)
       dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
       char shutter_close_chr[10];
       dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100 Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, shuttermode %d,motordelay %d"),
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, shuttermode %d, motordelay %d"),
         i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
         Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
-        Shutter.mask, Settings.shutter_invert[i], Shutter.mode, Shutter.motordelay[i]);
+        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
 
     } else {
       // terminate loop at first INVALID shutter.
@@ -259,7 +259,7 @@ void ShutterReportPosition(bool always)
       ShutterLogPos(i);
     }
     if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i]);
   }
   ResponseJsonEnd();
   if (always || (1 == shutter_moving)) {
@@ -371,7 +371,7 @@ void ShutterUpdatePosition(void)
         // sending MQTT result to broker
         snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i+1);
         GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-        Response_P("%d", Settings.shutter_invert[i] ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
+        Response_P("%d", (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
         MqttPublish(stopic, Settings.flag.mqtt_power_retain);  // CMND_POWERRETAIN
 
         Shutter.direction[i] = 0;
@@ -690,22 +690,27 @@ void CmndShutterClose(void)
 void CmndShutterStop(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-      XdrvMailbox.index = XdrvMailbox.payload;
-    }
-    uint32_t i = XdrvMailbox.index -1;
-    if (Shutter.direction[i] != 0) {
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+        XdrvMailbox.index = XdrvMailbox.payload;
+      }
+      uint32_t i = XdrvMailbox.index -1;
+      if (Shutter.direction[i] != 0) {
 
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
-      // set stop position 10 steps ahead (0.5sec to allow normal stop)
-      int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
-      XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
-      //XdrvMailbox.payload = Settings.shuttercoeff[2][i] * 5 > temp_realpos ? temp_realpos / Settings.shuttercoeff[2][i] : (temp_realpos-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
-      last_source = SRC_WEBGUI;
-      CmndShutterPosition();
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
+        // set stop position 10 steps ahead (0.5sec to allow normal stop)
+        int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
+        XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
+        //XdrvMailbox.payload = Settings.shuttercoeff[2][i] * 5 > temp_realpos ? temp_realpos / Settings.shuttercoeff[2][i] : (temp_realpos-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
+        last_source = SRC_WEBGUI;
+        CmndShutterPosition();
+      } else {
+        if (XdrvMailbox.command)
+          ResponseCmndDone();
+      }
     } else {
       if (XdrvMailbox.command)
-        ResponseCmndDone();
+        ResponseCmndIdxChar("Locked");
     }
   }
 }
@@ -713,78 +718,83 @@ void CmndShutterStop(void)
 void CmndShutterPosition(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    uint32_t index = XdrvMailbox.index-1;
-    //limit the payload
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      uint32_t index = XdrvMailbox.index-1;
+      //limit the payload
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
 
-    // value 0 with data_len > 0 can mean Open
-    if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
-      //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
-        CmndShutterOpen();
-        return;
+      // value 0 with data_len > 0 can mean Open
+      if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
+        //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
+          CmndShutterOpen();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
+          CmndShutterClose();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
+          XdrvMailbox.payload = -99;
+          CmndShutterStop();
+          return;
+        }
       }
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
-        CmndShutterClose();
-        return;
-      }
-      if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
-        XdrvMailbox.payload = -99;
-        CmndShutterStop();
-        return;
-      }
-    }
 
-    int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
-    // webgui still send also on inverted shutter the native position.
-    target_pos_percent = (Settings.shutter_invert[index] && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
-    if (XdrvMailbox.payload != -99) {
-      //target_pos_percent = Settings.shutter_invert[index] ? 100 - target_pos_percent : target_pos_percent;
-      Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-      Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
-      //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
-    }
-    if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
-      int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
-      if (Shutter.direction[index] == -new_shutterdirection) {
-        // direction need to be changed. on momentary switches first stop the Shutter
-        if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
-          // code for momentary shutters only small switch on to stop Shutter
-          ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
-          delay(100);
-        } else {
-          if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
-            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
-            ShutterWaitForMotorStop(index);
+      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
+      // webgui still send also on inverted shutter the native position.
+      target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
+      if (XdrvMailbox.payload != -99) {
+        //target_pos_percent = (Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
+        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
+        Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
+        //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
+      }
+      if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
+        int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
+        if (Shutter.direction[index] == -new_shutterdirection) {
+          // direction need to be changed. on momentary switches first stop the Shutter
+          if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
+            // code for momentary shutters only small switch on to stop Shutter
+            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
+            delay(100);
+          } else {
+            if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
+              ShutterWaitForMotorStop(index);
+            }
           }
         }
-      }
-      if (Shutter.direction[index] != new_shutterdirection) {
-        if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
-          //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay5 5s, xdrv %d"), XdrvMailbox.payload);
-          ShutterWaitForMotorStop(index);
-          ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
-          ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-          // Code for shutters with circuit safe configuration, switch the direction Relay
-          ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
-          // power on
-          ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
-        } else {
-          // now start the motor for the right direction, work for momentary and normal shutters.
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
-          ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-          ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
-          //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay6 5s, xdrv %d"), XdrvMailbox.payload);
+        if (Shutter.direction[index] != new_shutterdirection) {
+          if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+            //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay5 5s, xdrv %d"), XdrvMailbox.payload);
+            ShutterWaitForMotorStop(index);
+            ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            // Code for shutters with circuit safe configuration, switch the direction Relay
+            ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
+            // power on
+            ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
+          } else {
+            // now start the motor for the right direction, work for momentary and normal shutters.
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+            //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay6 5s, xdrv %d"), XdrvMailbox.payload);
+          }
+          Shutter.switched_relay = 0;
         }
-        Shutter.switched_relay = 0;
+      } else {
+        target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
       }
+      XdrvMailbox.index = index +1;  // Fix random index for ShutterClose
+      if (XdrvMailbox.command)
+        ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
     } else {
-      target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
+      if (XdrvMailbox.command)
+        ResponseCmndIdxChar("Locked");
     }
-    XdrvMailbox.index = index +1;  // Fix random index for ShutterClose
-    if (XdrvMailbox.command)
-      ResponseCmndIdxNumber(Settings.shutter_invert[index] ? 100 - target_pos_percent : target_pos_percent);
   }
 }
 
@@ -972,10 +982,10 @@ void CmndShutterSetHalfway(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      Settings.shutter_set50percent[XdrvMailbox.index -1] = Settings.shutter_invert[XdrvMailbox.index -1] ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
+      Settings.shutter_set50percent[XdrvMailbox.index -1] = (Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
       ShutterInit();
     }
-  ResponseCmndIdxNumber(Settings.shutter_invert[XdrvMailbox.index -1] ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
+  ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
   }
 }
 
@@ -1006,10 +1016,12 @@ void CmndShutterSetClose(void)
 void CmndShutterInvert(void)
 {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-      Settings.shutter_invert[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(1);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (1);
     }
-    ResponseCmndIdxNumber(Settings.shutter_invert[XdrvMailbox.index -1]);
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 1 : 0);
   }
 }
 
@@ -1046,6 +1058,17 @@ void CmndShutterCalibration(void)
   }
 }
 
+void CmndShutterLock(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(2);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (2);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 2) ? 1 : 0);
+  }
+}
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
@@ -1072,7 +1095,7 @@ bool Xdrv27(uint8_t function)
         break;
       case FUNC_JSON_APPEND:
         for (uint8_t i = 0; i < shutters_present; i++) {
-          uint8_t position =  Settings.shutter_invert[i] ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
+          uint8_t position =  (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
           ResponseAppend_P(",");
           ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
 #ifdef USE_DOMOTICZ

From 80773f74c7c20a6efb21a1777064ce87c61e9d31 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Sun, 12 Jan 2020 15:40:31 +0100
Subject: [PATCH 117/403] initialize shutters when interlock is changed

---
 tasmota/support_command.ino | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 6812085c6..2149bd083 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1394,6 +1394,11 @@ void CmndInterlock(void)
           SetDevicePower(power, SRC_IGNORE);                    // Remove multiple relays if set
         }
       }
+#ifdef USE_SHUTTER
+      if (Settings.flag3.shutter_mode) {  // SetOption80 - Enable shutter support
+        ShutterInit(); // to update shutter mode
+      }
+#endif  // USE_SHUTTER
     }
     Response_P(PSTR("{\"" D_CMND_INTERLOCK "\":\"%s\",\"" D_JSON_GROUPS "\":\""), GetStateText(Settings.flag.interlock));
     uint32_t anygroup = 0;

From 5840f71af9bc095e6f912296eaf01379e13ca160 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 12 Jan 2020 23:31:57 +0100
Subject: [PATCH 118/403] Fix char[] allocation

---
 tasmota/xdrv_05_irremote.ino      | 2 +-
 tasmota/xdrv_05_irremote_full.ino | 4 ++--
 tasmota/xdrv_09_timers.ino        | 2 +-
 tasmota/xdrv_17_rcswitch.ino      | 2 +-
 tasmota/xdrv_23_zigbee_9_impl.ino | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tasmota/xdrv_05_irremote.ino b/tasmota/xdrv_05_irremote.ino
index 3c9479937..6c6e16fdb 100644
--- a/tasmota/xdrv_05_irremote.ino
+++ b/tasmota/xdrv_05_irremote.ino
@@ -181,7 +181,7 @@ uint32_t IrRemoteCmndIrSendJson(void)
   // IRsend { "protocol": "RC5", "bits": 12, "data":"0xC86" }
   // IRsend { "protocol": "SAMSUNG", "bits": 32, "data": 551502015 }
 
-  char dataBufUc[XdrvMailbox.data_len];
+  char dataBufUc[XdrvMailbox.data_len + 1];
   UpperCase(dataBufUc, XdrvMailbox.data);
   RemoveSpace(dataBufUc);
   if (strlen(dataBufUc) < 8) {
diff --git a/tasmota/xdrv_05_irremote_full.ino b/tasmota/xdrv_05_irremote_full.ino
index 77fc3f7cc..14de34cbc 100644
--- a/tasmota/xdrv_05_irremote_full.ino
+++ b/tasmota/xdrv_05_irremote_full.ino
@@ -280,7 +280,7 @@ uint32_t IrRemoteCmndIrHvacJson(void)
   char parm_uc[12];
 
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRHVAC: Received %s"), XdrvMailbox.data);
-  char dataBufUc[XdrvMailbox.data_len];
+  char dataBufUc[XdrvMailbox.data_len + 1];
   UpperCase(dataBufUc, XdrvMailbox.data);
   RemoveSpace(dataBufUc);
   if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
@@ -393,7 +393,7 @@ uint32_t IrRemoteCmndIrSendJson(void)
   // ArduinoJSON entry used to calculate jsonBuf: JSON_OBJECT_SIZE(3) + 40 = 96
   // IRsend { "protocol": "RC5", "bits": 12, "data":"0xC86" }
   // IRsend { "protocol": "SAMSUNG", "bits": 32, "data": 551502015 }
-  char dataBufUc[XdrvMailbox.data_len];
+  char dataBufUc[XdrvMailbox.data_len + 1];
   UpperCase(dataBufUc, XdrvMailbox.data);
   RemoveSpace(dataBufUc);
   if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
diff --git a/tasmota/xdrv_09_timers.ino b/tasmota/xdrv_09_timers.ino
index b31a6a5ef..0804ce286 100644
--- a/tasmota/xdrv_09_timers.ino
+++ b/tasmota/xdrv_09_timers.ino
@@ -364,7 +364,7 @@ void CmndTimer(void)
 #if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
         if (devices_present) {
 #endif
-          char dataBufUc[XdrvMailbox.data_len];
+          char dataBufUc[XdrvMailbox.data_len + 1];
           UpperCase(dataBufUc, XdrvMailbox.data);
           StaticJsonBuffer<256> jsonBuffer;
           JsonObject& root = jsonBuffer.parseObject(dataBufUc);
diff --git a/tasmota/xdrv_17_rcswitch.ino b/tasmota/xdrv_17_rcswitch.ino
index 4462a5e21..9cd2d14d8 100644
--- a/tasmota/xdrv_17_rcswitch.ino
+++ b/tasmota/xdrv_17_rcswitch.ino
@@ -105,7 +105,7 @@ void CmndRfSend(void)
     int repeat = 10;
     int pulse = 350;
 
-    char dataBufUc[XdrvMailbox.data_len];
+    char dataBufUc[XdrvMailbox.data_len + 1];
     UpperCase(dataBufUc, XdrvMailbox.data);
     StaticJsonBuffer<150> jsonBuf;  // ArduinoJSON entry used to calculate jsonBuf: JSON_OBJECT_SIZE(5) + 40 = 134
     JsonObject &root = jsonBuf.parseObject(dataBufUc);
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 70c5659ca..408410f9b 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -548,7 +548,7 @@ void CmndZigbeeSend(void) {
 // Probe a specific device to get its endpoints and supported clusters
 void CmndZigbeeProbe(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  char dataBufUc[XdrvMailbox.data_len];
+  char dataBufUc[XdrvMailbox.data_len + 1];
   UpperCase(dataBufUc, XdrvMailbox.data);
   RemoveSpace(dataBufUc);
   if (strlen(dataBufUc) < 3) { ResponseCmndChar("Invalid destination"); return; }

From d00bea84ece1324e2b550f6740628b1dad584d18 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 13 Jan 2020 09:48:29 +0100
Subject: [PATCH 119/403] Fix target shutter position inaccuracy

Introduced numerical rounding when calculating between "%" and "time" position values
---
 tasmota/xdrv_27_shutter.ino | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index beacc6ea2..79a015eed 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -97,6 +97,8 @@ void ShutterRtc50mS(void)
   }
 }
 
+#define SHT_DIV_ROUND(__A, __B) (((__A) + (__B)/2) / (__B))
+
 int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 {
 	if (Settings.shutter_set50percent[index] != 50) {
@@ -108,21 +110,21 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
       if (0 == Settings.shuttercoeff[j][index]) {
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
         for (uint32_t k = 0; k < 5; k++) {
-          Settings.shuttercoeff[k][index] = messwerte[k] * 1000 / messwerte[4];
+          Settings.shuttercoeff[k][index] = SHT_DIV_ROUND(calibrate_pos[k+1] * 1000, calibrate_pos[5]);
         }
       }
     }
     for (uint32_t i = 0; i < 5; i++) {
       if ((percent * 10) > Settings.shuttercoeff[i][index]) {
-        realpos = Shutter.open_max[index] * calibrate_pos[i+1] / 100;
+        realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP1: %d, %% %d, coeff %d"), realpos, percent, Settings.shuttercoeff[i][index]);
       } else {
         if (0 == i) {
-          realpos =  percent * Shutter.open_max[index] * calibrate_pos[i+1] / Settings.shuttercoeff[i][index] / 10;
+          realpos =  SHT_DIV_ROUND(SHT_DIV_ROUND(percent * Shutter.open_max[index] * calibrate_pos[i+1], Settings.shuttercoeff[i][index]), 10);
         } else {
           //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
           //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP2: %d, %% %d, coeff %d"), addon, (calibrate_pos[i+1] - calibrate_pos[i]), (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]));
-          realpos += ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
+          realpos += SHT_DIV_ROUND(SHT_DIV_ROUND((percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]), Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), 100);
         }
         break;
       }
@@ -134,22 +136,22 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
 {
 	if (Settings.shutter_set50percent[index] != 50) {
-		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
+		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
 	} else {
     uint16_t realpercent;
 
     for (uint32_t i = 0; i < 5; i++) {
       if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
-        realpercent = Settings.shuttercoeff[i][index] /10;
+        realpercent = SHT_DIV_ROUND(Settings.shuttercoeff[i][index], 10);
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP1: %d, %% %d, coeff %d"), realpercent, realpos, Shutter_Open_Max[index] * calibrate_pos[i+1] / 100);
       } else {
         if (0 == i) {
-          realpercent = ( realpos - (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * Settings.shuttercoeff[i][index] / calibrate_pos[i+1] / Shutter.open_max[index];
+          realpercent  = SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * Settings.shuttercoeff[i][index], calibrate_pos[i+1]), Shutter.open_max[index]);
         } else {
           //uint16_t addon = ( realpos - (Shutter_Open_Max[index] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]) / (calibrate_pos[i+1] - calibrate_pos[i])/ Shutter_Open_Max[index];
           //uint16_t addon = ( percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter_Open_Max[index] * (calibrate_pos[i+1] - calibrate_pos[i]) / (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]) / 100;
           //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realpercent TEMP2: %d, delta %d,  %% %d, coeff %d"), addon,( realpos - (Shutter_Open_Max[index] * calibrate_pos[i] / 100) ) , (calibrate_pos[i+1] - calibrate_pos[i])* Shutter_Open_Max[index]/100, (Settings.shuttercoeff[i][index] -Settings.shuttercoeff[i-1][index]));
-          realpercent += ( realpos -  (Shutter.open_max[index] * calibrate_pos[i] / 100) ) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]) / (calibrate_pos[i+1] - calibrate_pos[i]) / Shutter.open_max[index] ;
+          realpercent += SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), (calibrate_pos[i+1] - calibrate_pos[i])), Shutter.open_max[index]) ;
         }
         break;
       }
@@ -1045,7 +1047,7 @@ void CmndShutterCalibration(void)
         messwerte[i] = field;
       }
       for (i = 0; i < 5; i++) {
-        Settings.shuttercoeff[i][XdrvMailbox.index -1] = (uint32_t)messwerte[i] * 1000 / messwerte[4];
+        Settings.shuttercoeff[i][XdrvMailbox.index -1] = SHT_DIV_ROUND((uint32_t)messwerte[i] * 1000, messwerte[4]);
         AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
       }
       ShutterInit();

From 0327d7f4b4541b68b3c0b87632693d71b27009b8 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 13 Jan 2020 12:00:34 +0100
Subject: [PATCH 120/403] New command ShutterEnableEndStopTime

---
 tasmota/i18n.h              |  1 +
 tasmota/xdrv_27_shutter.ino | 38 +++++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 8ec8020da..0dece041a 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -517,6 +517,7 @@
 #define D_CMND_SHUTTER_FREQUENCY "Frequency"
 #define D_CMND_SHUTTER_BUTTON "Button"
 #define D_CMND_SHUTTER_LOCK "Lock"
+#define D_CMND_SHUTTER_ENABLEENDSTOPTIME "EnableEndStopTime"
 
 // Commands xdrv_32_hotplug.ino
 #define D_CMND_HOTPLUG "HotPlug"
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 79a015eed..f79f2de9d 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -40,13 +40,13 @@ const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
   D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
   D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
-  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK;
+  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME;
 
 void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
   &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
-  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock};
+  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
 
 const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
 
@@ -115,7 +115,7 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
       }
     }
     for (uint32_t i = 0; i < 5; i++) {
-      if ((percent * 10) > Settings.shuttercoeff[i][index]) {
+      if ((percent * 10) >= Settings.shuttercoeff[i][index]) {
         realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
         //AddLog_P2(LOG_LEVEL_INFO, PSTR("Realposition TEMP1: %d, %% %d, coeff %d"), realpos, percent, Settings.shuttercoeff[i][index]);
       } else {
@@ -235,10 +235,10 @@ void ShutterInit(void)
       dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
       char shutter_close_chr[10];
       dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, shuttermode %d, motordelay %d"),
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, end stop time enabled %d, shuttermode %d, motordelay %d"),
         i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
         Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
-        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
+        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, (Settings.shutter_options[i]&4) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
 
     } else {
       // terminate loop at first INVALID shutter.
@@ -276,6 +276,13 @@ void ShutterReportPosition(bool always)
   //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
 }
 
+void ShutterLimitRealAndTargetPositions(uint32_t i) {
+  if (Shutter.real_position[i]<0) Shutter.real_position[i] = 0;
+  if (Shutter.real_position[i]>Shutter.open_max[i]) Shutter.real_position[i] = Shutter.open_max[i];
+  if (Shutter.target_position[i]<0) Shutter.target_position[i] = 0;
+  if (Shutter.target_position[i]>Shutter.open_max[i]) Shutter.target_position[i] = Shutter.open_max[i];
+}
+
 void ShutterUpdatePosition(void)
 {
 
@@ -364,6 +371,7 @@ void ShutterUpdatePosition(void)
             }
           break;
         }
+        ShutterLimitRealAndTargetPositions(i);
         Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
 
         ShutterLogPos(i);
@@ -464,6 +472,7 @@ void ShutterRelayChanged(void)
     //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: source: %s, powerstate_local %ld, Shutter.switched_relay %d, manual change %d"), i+1, GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), powerstate_local,Shutter.switched_relay,manual_relays_changed);
     if (manual_relays_changed) {
       //Shutter.skip_relay_change = true;
+      ShutterLimitRealAndTargetPositions(i);
       if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE ||  Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
         ShutterWaitForMotorStop(i);
 				switch (powerstate_local) {
@@ -748,7 +757,13 @@ void CmndShutterPosition(void)
       target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
       if (XdrvMailbox.payload != -99) {
         //target_pos_percent = (Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
-        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
+        if (0 == target_pos_percent) {
+          Shutter.target_position[index] = (Settings.shutter_options[index] & 4) ? (-1 * 2000) : 0;
+        } else if (100 == target_pos_percent) {
+          Shutter.target_position[index] = (Settings.shutter_options[index] & 4) ? (Shutter.open_max[index] + 1 * 2000) : Shutter.open_max[index];
+      	} else {
+          Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
+        }
         Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
         //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
         AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
@@ -1071,6 +1086,17 @@ void CmndShutterLock(void) {
   }
 }
 
+void CmndShutterEnableEndStopTime(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(4);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (4);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 4) ? 1 : 0);
+  }
+}
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/

From bc83aad8bd926f70d69d875fad7f6126c454bbf1 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Tue, 14 Jan 2020 11:00:22 +0100
Subject: [PATCH 121/403] Show webbutton label '-' when shutter is locked

---
 tasmota/xdrv_01_webserver.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 927ad564d..f07ce00d8 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1123,7 +1123,7 @@ void HandleRoot(void)
         int32_t ShutterWebButton;
         if (ShutterWebButton = IsShutterWebButton(idx)) {
           WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (ShutterWebButton>0) ? "▲" : "▼",
+            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((Settings.shutter_options[abs(ShutterWebButton)-1] & 2) /* is locked */ ? "-" : ((ShutterWebButton>0) ? "▲" : "▼")),
             "");
           continue;
         }

From 0db458c77424cb959613268ecccb7ac32b999705 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 12:47:48 +0100
Subject: [PATCH 122/403] Fix exception 9 restart on log message

Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
---
 RELEASENOTES.md             |  2 ++
 tasmota/CHANGELOG.md        |  5 +++--
 tasmota/support.ino         | 10 ++++++++++
 tasmota/support_rtc.ino     |  6 +++---
 tasmota/support_tasmota.ino | 12 +++++-------
 tasmota/tasmota.ino         |  2 +-
 tasmota/xdrv_20_hue.ino     |  3 ++-
 tasmota/xdrv_21_wemo.ino    |  3 ++-
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index af4aeeb73..bd00d25fb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -56,6 +56,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
+- Change IRremoteESP8266 library updated to v2.7.2
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
@@ -63,6 +64,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix LCD line and column positioning (#7387)
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
+- Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index f9089b818..3df11015b 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,9 +3,10 @@
 ### 8.1.0.3 20200106
 
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
-- Add support for gzipped binaries
-- Update IRremoteESP8266 lib updated to v2.7.2
+- Change IRremoteESP8266 library updated to v2.7.2
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
+- Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
+- Add support for gzipped binaries
 
 ### 8.1.0.2 20191230
 
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 6ae6898e4..011fa8ca4 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1678,6 +1678,16 @@ void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2)
   AddLog(loglevel);
 }
 
+void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  prepped_loglevel = loglevel;
+}
+
 void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...)
 {
   va_list arg;
diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino
index 03ebca18d..fe8f12454 100644
--- a/tasmota/support_rtc.ino
+++ b/tasmota/support_rtc.ino
@@ -396,9 +396,9 @@ void RtcSecond(void)
         Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
         Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
 
-        // Do not use AddLog here if syslog is enabled. UDP will force exception 9
-  //      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "(" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
-        ntp_synced_message = true;
+        // Do not use AddLog_P2 here (interrupt routine) if syslog or mqttlog is enabled. UDP/TCP will force exception 9
+        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+          DriftTime(), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
 
         if (Rtc.local_time < START_VALID_TIME) {  // 2016-01-01
           rules_flag.time_init = 1;
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 187c116a1..fd5bf28fa 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -698,13 +698,6 @@ void PerformEverySecond(void)
 {
   uptime++;
 
-  if (ntp_synced_message) {
-    // Moved here to fix syslog UDP exception 9 during RtcSecond
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-      DriftTime(), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
-    ntp_synced_message = false;
-  }
-
   if (POWER_CYCLE_TIME == uptime) {
     UpdateQuickPowerCycle(false);
   }
@@ -782,6 +775,11 @@ void Every100mSeconds(void)
   // As the max amount of sleep = 250 mSec this loop will shift in time...
   power_t power_now;
 
+  if (prepped_loglevel) {
+    AddLog(prepped_loglevel);
+    prepped_loglevel = 0;
+  }
+
   if (latching_relay_pulse) {
     latching_relay_pulse--;
     if (!latching_relay_pulse) SetLatchingRelay(0, 0);
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 97f2ff797..721c2f4ac 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -139,6 +139,7 @@ uint8_t my_module_type;                     // Current copy of Settings.module o
 uint8_t my_adc0;                            // Active copy of Module ADC0
 uint8_t last_source = 0;                    // Last command source
 uint8_t shutters_present = 0;               // Number of actual define shutters
+uint8_t prepped_loglevel = 0;               // Delayed log level message
 //uint8_t mdns_delayed_start = 0;             // mDNS delayed start
 bool serial_local = false;                  // Handle serial locally;
 bool fallback_topic_flag = false;           // Use Topic or FallbackTopic
@@ -152,7 +153,6 @@ bool i2c_flg = false;                       // I2C configured
 bool spi_flg = false;                       // SPI configured
 bool soft_spi_flg = false;                  // Software SPI configured
 bool ntp_force_sync = false;                // Force NTP sync
-bool ntp_synced_message = false;            // NTP synced message flag
 bool is_8285 = false;                       // Hardware device ESP8266EX (0) or ESP8285 (1)
 myio my_module;                             // Active copy of Module GPIOs (17 x 8 bits)
 gpio_flag my_module_flag;                   // Active copy of Template GPIO flags
diff --git a/tasmota/xdrv_20_hue.ino b/tasmota/xdrv_20_hue.ino
index 87e3b3d71..9bd88193c 100644
--- a/tasmota/xdrv_20_hue.ino
+++ b/tasmota/xdrv_20_hue.ino
@@ -100,7 +100,8 @@ void HueRespondToMSearch(void)
   } else {
     snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
   }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
+  // Do not use AddLog_P2 here (interrupt routine) if syslog or mqttlog is enabled. UDP/TCP will force exception 9
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
     message, udp_remote_ip.toString().c_str(), udp_remote_port);
 
   udp_response_mutex = false;
diff --git a/tasmota/xdrv_21_wemo.ino b/tasmota/xdrv_21_wemo.ino
index 6aef27311..85d462876 100644
--- a/tasmota/xdrv_21_wemo.ino
+++ b/tasmota/xdrv_21_wemo.ino
@@ -74,7 +74,8 @@ void WemoRespondToMSearch(int echo_type)
   } else {
     snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
   }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
+  // Do not use AddLog_P2 here (interrupt routine) if syslog or mqttlog is enabled. UDP/TCP will force exception 9
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
     echo_type, message, udp_remote_ip.toString().c_str(), udp_remote_port);
 
   udp_response_mutex = false;

From 64d3d0c075222f0fb5083ff8f5962c1245f2c344 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Tue, 14 Jan 2020 13:32:51 +0100
Subject: [PATCH 123/403] Change MQTT reporting of instantaneous shutter
 position from tele to stat

---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index f79f2de9d..f7a574714 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -265,7 +265,7 @@ void ShutterReportPosition(bool always)
   }
   ResponseJsonEnd();
   if (always || (1 == shutter_moving)) {
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_PRFX_SHUTTER));
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
   }
   if (rules_flag.shutter_moving > shutter_moving) {
     rules_flag.shutter_moved = 1;

From 423b6f251b0c71b0573a326b934fd5eda63517c6 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:33:27 +0100
Subject: [PATCH 124/403] Add user control over vertical console size

Add user control over vertical console size (#7507)
---
 tasmota/xdrv_01_webserver.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index f07ce00d8..ea744f149 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -341,7 +341,7 @@ const char HTTP_HEAD_STYLE1[] PROGMEM =
   "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
   "input[type=range]{width:99%%;}"
   "select{width:100%%;background:#%06x;color:#%06x;}"  // COLOR_INPUT, COLOR_INPUT_TEXT
-  "textarea{resize:none;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
+  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
   "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"  // COLOR_BACKGROUND
   "td{padding:0px;}";
 const char HTTP_HEAD_STYLE2[] PROGMEM =

From 81d58d69b63abc5f39a1923eb417e5287736ed44 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:42:30 +0100
Subject: [PATCH 125/403] Revert "Add user control over vertical console size"

This reverts commit 423b6f251b0c71b0573a326b934fd5eda63517c6.
---
 tasmota/xdrv_01_webserver.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index ea744f149..f07ce00d8 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -341,7 +341,7 @@ const char HTTP_HEAD_STYLE1[] PROGMEM =
   "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
   "input[type=range]{width:99%%;}"
   "select{width:100%%;background:#%06x;color:#%06x;}"  // COLOR_INPUT, COLOR_INPUT_TEXT
-  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
+  "textarea{resize:none;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
   "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"  // COLOR_BACKGROUND
   "td{padding:0px;}";
 const char HTTP_HEAD_STYLE2[] PROGMEM =

From fe17be62ccc3a170f8ba6cacb709b361fea9d7ef Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 15:38:16 +0100
Subject: [PATCH 126/403] Add user control over vertical console size

Add user control over vertical console size (#7507)
---
 tasmota/xdrv_01_webserver.ino | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index f07ce00d8..40628fbb1 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -187,7 +187,8 @@ const char HTTP_SCRIPT_CONSOL[] PROGMEM =
       "c=eb('c1');"
       "o='&c1='+encodeURIComponent(c.value);"
       "c.value='';"
-      "t.scrollTop=sn;"
+      "t.scrollTop=99999;"
+      "sn=t.scrollTop;"
     "}"
     "if(t.scrollTop>=sn){"                // User scrolled back so no updates
       "if(x!=null){x.abort();}"           // Abort if no response within 2 seconds (happens on restart 1)
@@ -341,7 +342,7 @@ const char HTTP_HEAD_STYLE1[] PROGMEM =
   "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
   "input[type=range]{width:99%%;}"
   "select{width:100%%;background:#%06x;color:#%06x;}"  // COLOR_INPUT, COLOR_INPUT_TEXT
-  "textarea{resize:none;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
+  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"  // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
   "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"  // COLOR_BACKGROUND
   "td{padding:0px;}";
 const char HTTP_HEAD_STYLE2[] PROGMEM =

From ceef5634148a8adb920be8a54b83864f865ceee2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 15:58:56 +0100
Subject: [PATCH 127/403] Add simple check for serialreceived JSON

Add simple check for serialreceived JSON (#7506)
---
 tasmota/support_tasmota.ino       | 7 +++++--
 tasmota/xdrv_08_serial_bridge.ino | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index fd5bf28fa..ee3678ee2 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1209,8 +1209,11 @@ void SerialInput(void)
   if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) {  // CMND_SERIALSEND and CMND_SERIALLOG
     serial_in_buffer[serial_in_byte_counter] = 0;                                // Serial data completed
     char hex_char[(serial_in_byte_counter * 2) + 2];
-    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"),
-      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer);
+    bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
+      (assume_json) ? "" : """");
     MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
     XdrvRulesProcess();
     serial_in_byte_counter = 0;
diff --git a/tasmota/xdrv_08_serial_bridge.ino b/tasmota/xdrv_08_serial_bridge.ino
index 3be49f6b2..c4f530a21 100644
--- a/tasmota/xdrv_08_serial_bridge.ino
+++ b/tasmota/xdrv_08_serial_bridge.ino
@@ -71,8 +71,11 @@ void SerialBridgeInput(void)
   if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
     serial_bridge_buffer[serial_bridge_in_byte_counter] = 0;                   // Serial data completed
     char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
-    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":\"%s\"}"),
-      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer);
+    bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
+      (assume_json) ? "" : """");
     MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
     XdrvRulesProcess();
     serial_bridge_in_byte_counter = 0;

From 77191f2fe97a7910386aa87405bf22747a8c394d Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Tue, 14 Jan 2020 16:41:47 +0100
Subject: [PATCH 128/403] Simplified TimeDifference (saves 16 bytes)

---
 tasmota/support.ino | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/tasmota/support.ino b/tasmota/support.ino
index 011fa8ca4..a9a631fd1 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1244,45 +1244,18 @@ void TemplateJson(void)
  * Sleep aware time scheduler functions borrowed from ESPEasy
 \*********************************************************************************************/
 
-long TimeDifference(unsigned long prev, unsigned long next)
-{
-  // Return the time difference as a signed value, taking into account the timers may overflow.
-  // Returned timediff is between -24.9 days and +24.9 days.
-  // Returned value is positive when "next" is after "prev"
-  long signed_diff = 0;
-  // To cast a value to a signed long, the difference may not exceed half 0xffffffffUL (= 4294967294)
-  const unsigned long half_max_unsigned_long = 2147483647u;  // = 2^31 -1
-  if (next >= prev) {
-    const unsigned long diff = next - prev;
-    if (diff <= half_max_unsigned_long) {                    // Normal situation, just return the difference.
-      signed_diff = static_cast<long>(diff);                 // Difference is a positive value.
-    } else {
-      // prev has overflow, return a negative difference value
-      signed_diff = static_cast<long>((0xffffffffUL - next) + prev + 1u);
-      signed_diff = -1 * signed_diff;
-    }
-  } else {
-    // next < prev
-    const unsigned long diff = prev - next;
-    if (diff <= half_max_unsigned_long) {                    // Normal situation, return a negative difference value
-      signed_diff = static_cast<long>(diff);
-      signed_diff = -1 * signed_diff;
-    } else {
-      // next has overflow, return a positive difference value
-      signed_diff = static_cast<long>((0xffffffffUL - prev) + next + 1u);
-    }
-  }
-  return signed_diff;
+inline int32_t TimeDifference(uint32_t prev, uint32_t next) {
+  return ((int32_t) (next - prev));
 }
 
-long TimePassedSince(unsigned long timestamp)
+int32_t TimePassedSince(uint32_t timestamp)
 {
   // Compute the number of milliSeconds passed since timestamp given.
   // Note: value can be negative if the timestamp has not yet been reached.
   return TimeDifference(timestamp, millis());
 }
 
-bool TimeReached(unsigned long timer)
+bool TimeReached(uint32_t timer)
 {
   // Check if a certain timeout has been reached.
   const long passed = TimePassedSince(timer);

From 338499d8e2b7d23a7964a5c667e3155724a030e4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 14 Jan 2020 16:57:55 +0100
Subject: [PATCH 129/403] Fix unknown command topic

---
 tasmota/support_command.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 2149bd083..a1c38cf43 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -237,9 +237,9 @@ void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
 
   if (type == nullptr) {
     blinks = 201;
-    snprintf_P(topicBuf, sizeof(topicBuf), PSTR(D_JSON_COMMAND));
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_COMMAND));
     Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}"));
-    type = (char*)topicBuf;
+    type = (char*)stemp1;
   }
 
   if (mqtt_data[0] != '\0') {

From a2c8ea9d653b1c86f3acf46800cd0141028dc903 Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Wed, 15 Jan 2020 22:14:47 +1100
Subject: [PATCH 130/403] Make the B or brightness part of the HSBColor command
 optional

This makes it easier (possible?) to use the HSBColor with hs_command_topic
in Home-Assistant, which in turn allows completely independent control
of the color part of an RGBW or RGBWW bulb.
---
 tasmota/xdrv_04_light.ino | 42 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 9526f8c82..0fa8838f8 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2249,31 +2249,31 @@ void CmndHsbColor(void)
     bool validHSB = (XdrvMailbox.data_len > 0);
     if (validHSB) {
       uint16_t HSB[3];
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {  // Command with 3 comma separated parameters, Hue (0<H<360), Saturation (0<S<100) AND Brightness (0<B<100)
-        for (uint32_t i = 0; i < 3; i++) {
-          char *substr;
+      uint16_t c_hue;
+      uint8_t  c_sat;
 
-          if (0 == i) {
-            substr = strtok(XdrvMailbox.data, ",");
-          } else {
-            substr = strtok(nullptr, ",");
-          }
-          if (substr != nullptr) {
-            HSB[i] = atoi(substr);
-            if (0 < i) {
-              HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255); // change sat and bri to 0..255
-            }
-          } else {
-            validHSB = false;
+      light_state.getHSB(&c_hue, &c_sat, nullptr);
+      HSB[0] = c_hue;
+      HSB[1] = c_sat;
+      HSB[2] = light_state.getBriRGB();
+
+      char *substr = strstr(XdrvMailbox.data, ",");
+      if (substr != nullptr) { // Command with comma separated parameters, Hue (0<H<360), Saturation (0<S<100) AND optional Brightness (0<B<100)
+        HSB[0] = atoi(XdrvMailbox.data);
+
+        for (uint32_t i = 1; i < 3; i++) {
+          substr++;
+          HSB[i] = atoi(substr);
+          HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255); // change sat and bri to 0..255
+          substr = strstr(substr, ",");
+          if (substr == nullptr) {
+            break;
           }
         }
+        if (substr != nullptr) {
+          validHSB = false;
+        }
       } else {  // Command with only 1 parameter, Hue (0<H<360), Saturation (0<S<100) OR Brightness (0<B<100)
-        uint16_t c_hue;
-        uint8_t  c_sat;
-        light_state.getHSB(&c_hue, &c_sat, nullptr);
-        HSB[0] = c_hue;
-        HSB[1] = c_sat;
-        HSB[2] = light_state.getBri();
 
         if (1 == XdrvMailbox.index) {
           HSB[0] = XdrvMailbox.payload;

From e327236485471a2603b446ca29a7a377b412c281 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Wed, 15 Jan 2020 13:05:00 +0100
Subject: [PATCH 131/403] New switchmodes TOGGLEMULTI, FOLLOWMULTI and
 FOLLOWMULTI_INV

---
 tasmota/my_user_config.h   |  2 +-
 tasmota/support_switch.ino | 48 ++++++++++++++++++++++++++------------
 tasmota/tasmota.h          |  2 +-
 tasmota/xdrv_10_rules.ino  |  2 +-
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index e9e8f390c..801c57acc 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -225,7 +225,7 @@
 #define KEY_DEBOUNCE_TIME      50                // [ButtonDebounce] Number of mSeconds button press debounce time
 #define KEY_HOLD_TIME          40                // [SetOption32] Number of 0.1 seconds to hold Button or external Pushbutton before sending HOLD message
 #define SWITCH_DEBOUNCE_TIME   50                // [SwitchDebounce] Number of mSeconds switch press debounce time
-#define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE (the wall switch state)
+#define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEHOLD, FOLLOWHOLD, FOLLOWHOLD_INV (the wall switch state)
 #define WS2812_LEDS            30                // [Pixels] Number of WS2812 LEDs to start with (max is 512)
 
 #define TEMP_CONVERSION        0                 // [SetOption8] Return temperature in (0 = Celsius or 1 = Fahrenheit)
diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index b8ce8c646..9cc3c336f 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -137,22 +137,36 @@ void SwitchHandler(uint8_t mode)
 
   for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
     if ((pin[GPIO_SWT1 +i] < 99) || (mode)) {
+      uint8_t button = Switch.virtual_state[i];
+      uint8_t switchflag = POWER_TOGGLE +1;
 
       if (Switch.hold_timer[i]) {
         Switch.hold_timer[i]--;
         if (0 == Switch.hold_timer[i]) {
-          SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+
+          switch (Settings.switchmode[i]) {
+            case TOGGLEMULTI:
+              switchflag = POWER_TOGGLE;     // Toggle after hold
+              break;
+            case FOLLOWMULTI:
+              switchflag = button &1;        // Follow wall switch state after hold
+              break;
+            case FOLLOWMULTI_INV:
+              switchflag = ~button &1;       // Follow inverted wall switch state after hold
+              break;
+          default:
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+            break;
+          }
         }
       }
 
-      uint8_t button = Switch.virtual_state[i];
-
-// enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, MAX_SWITCH_OPTION};
+// enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, MAX_SWITCH_OPTION};
 
       if (button != Switch.last_state[i]) {
-        uint8_t switchflag = POWER_TOGGLE +1;
         switch (Settings.switchmode[i]) {
         case TOGGLE:
+        case PUSHBUTTON_TOGGLE:
           switchflag = POWER_TOGGLE;     // Toggle
           break;
         case FOLLOW:
@@ -171,11 +185,6 @@ void SwitchHandler(uint8_t mode)
             switchflag = POWER_TOGGLE;   // Toggle with releasing pushbutton from Gnd
           }
           break;
-        case PUSHBUTTON_TOGGLE:
-          if (button != Switch.last_state[i]) {
-            switchflag = POWER_TOGGLE;   // Toggle with any pushbutton change
-          }
-          break;
         case PUSHBUTTONHOLD:
           if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
@@ -194,16 +203,25 @@ void SwitchHandler(uint8_t mode)
             switchflag = POWER_TOGGLE;   // Toggle with pushbutton to Gnd
           }
           break;
-        }
-
-        if (switchflag <= POWER_TOGGLE) {
-          if (!SendKey(KEY_SWITCH, i +1, switchflag)) {  // Execute command via MQTT
-            ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);  // Execute command internally (if i < devices_present)
+        case TOGGLEMULTI:
+        case FOLLOWMULTI:
+        case FOLLOWMULTI_INV:
+          if (Switch.hold_timer[i]) {
+            Switch.hold_timer[i] = 0;
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+          } else {
+            Switch.hold_timer[i] = loops_per_second / 2;  // 0.5 second multi press window
           }
+          break;
         }
 
         Switch.last_state[i] = button;
       }
+      if (switchflag <= POWER_TOGGLE) {
+        if (!SendKey(KEY_SWITCH, i +1, switchflag)) {  // Execute command via MQTT
+          ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);  // Execute command internally (if i < devices_present)
+        }
+      }
     }
   }
 }
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index f0e747c27..b4b944d80 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -231,7 +231,7 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D
 
 enum WifiConfigOptions {WIFI_RESTART, EX_WIFI_SMARTCONFIG, WIFI_MANAGER, EX_WIFI_WPSCONFIG, WIFI_RETRY, WIFI_WAIT, WIFI_SERIAL, WIFI_MANAGER_RESET_ONLY, MAX_WIFI_OPTION};
 
-enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, MAX_SWITCH_OPTION};
+enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, MAX_SWITCH_OPTION};
 
 enum LedStateOptions {LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT, MAX_LED_OPTION};
 
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index dd557a0fd..13287d009 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -563,7 +563,7 @@ void RulesEvery50ms(void)
 #else
           if (pin[GPIO_SWT1 +i] < 99) {
 #endif  // USE_TM1638
-            bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]));
+            bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]));
             snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (swm ^ SwitchLastState(i)));
             RulesProcessEvent(json_event);
           }

From 6ab5c7432ec44aa8831cb2b688ad8c1b3f63eb32 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Wed, 15 Jan 2020 16:12:55 +0100
Subject: [PATCH 132/403] patch-1

typos
---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 801c57acc..f22023f6a 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -225,7 +225,7 @@
 #define KEY_DEBOUNCE_TIME      50                // [ButtonDebounce] Number of mSeconds button press debounce time
 #define KEY_HOLD_TIME          40                // [SetOption32] Number of 0.1 seconds to hold Button or external Pushbutton before sending HOLD message
 #define SWITCH_DEBOUNCE_TIME   50                // [SwitchDebounce] Number of mSeconds switch press debounce time
-#define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEHOLD, FOLLOWHOLD, FOLLOWHOLD_INV (the wall switch state)
+#define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV (the wall switch state)
 #define WS2812_LEDS            30                // [Pixels] Number of WS2812 LEDs to start with (max is 512)
 
 #define TEMP_CONVERSION        0                 // [SetOption8] Return temperature in (0 = Celsius or 1 = Fahrenheit)

From 5b797a8f4e2900952affa2667fe091ada7392ea7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 16 Jan 2020 10:39:59 +0100
Subject: [PATCH 133/403] Add new SwitchMode options

Add ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
---
 RELEASENOTES.md             | 1 +
 tasmota/CHANGELOG.md        | 1 +
 tasmota/support_tasmota.ino | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bd00d25fb..ea8b0a046 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -68,6 +68,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
+- Add ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 3df11015b..e0f9b7289 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
 - Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
 - Add support for gzipped binaries
+- Add ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
 
 ### 8.1.0.2 20191230
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index ee3678ee2..1bbae6f1b 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -664,7 +664,7 @@ bool MqttShowSensor(void)
 #else
     if (pin[GPIO_SWT1 +i] < 99) {
 #endif  // USE_TM1638
-      bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]));
+      bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]));
       ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(swm ^ SwitchLastState(i)));
     }
   }

From 0755ad488ebeaf77dd7009d6081d7170442f1de8 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 16 Jan 2020 11:35:48 +0100
Subject: [PATCH 134/403] Bump version to 8.1.0.4

---
 RELEASENOTES.md           | 2 +-
 tasmota/CHANGELOG.md      | 4 ++++
 tasmota/tasmota_version.h | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ea8b0a046..277c65ddd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.3
+### Version 8.1.0.4
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index e0f9b7289..a7a88c2f8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.4 20200116
+
+- Bump version
+
 ### 8.1.0.3 20200106
 
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index fab871449..1539def62 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010003;
+const uint32_t VERSION = 0x08010004;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;

From a6e95211cc0b521aaa6cbdd5da1261f6b7f0980c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 16 Jan 2020 14:22:39 +0100
Subject: [PATCH 135/403] Add more web page sliders

Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
---
 RELEASENOTES.md               |  1 +
 tasmota/CHANGELOG.md          |  2 +-
 tasmota/support_command.ino   |  4 ++--
 tasmota/xdrv_01_webserver.ino | 43 +++++++++++++++++++++++++++--------
 tasmota/xdrv_04_light.ino     |  6 ++++-
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 277c65ddd..97d4a34d6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -78,3 +78,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add experimental support for NRF24L01 as BLE-bridge for Mijia Bluetooth sensors by Christian Baars (#7394)
 - Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
 - Add support for gzipped binaries
+- Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index a7a88c2f8..44b9cedb0 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### 8.1.0.4 20200116
 
-- Bump version
+- Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index a1c38cf43..6f70e7359 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -141,8 +141,8 @@ void ExecuteCommand(const char *cmnd, uint32_t source)
 /********************************************************************************************/
 
 // topicBuf:                    /power1  dataBuf: toggle  = Console command
-// topicBuf:         cmnd/tasmota/power1  dataBuf: toggle  = Mqtt command using topic
-// topicBuf:        cmnd/tasmotas/power1  dataBuf: toggle  = Mqtt command using a group topic
+// topicBuf:        cmnd/tasmota/power1  dataBuf: toggle  = Mqtt command using topic
+// topicBuf:       cmnd/tasmotas/power1  dataBuf: toggle  = Mqtt command using a group topic
 // topicBuf: cmnd/DVES_83BB10_fb/power1  dataBuf: toggle  = Mqtt command using fallback topic
 
 void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 40628fbb1..0873cebc5 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -984,6 +984,17 @@ void HandleWifiLogin(void)
   WSContentStop();
 }
 
+void WebSliderColdWarm(void)
+{
+  WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // Cold Warm
+    "a",             // a - Unique HTML id
+    "#fff", "#ff0",  // White to Yellow
+    1,               // sl1
+    153, 500,        // Range color temperature
+    LightGetColorTemp(),
+    't', 0);         // t0 - Value id releated to lc("t0", value) and WebGetArg("t0", tmp, sizeof(tmp));
+}
+
 void HandleRoot(void)
 {
   if (CaptivePortal()) { return; }  // If captive portal redirect instead of displaying the page.
@@ -1033,17 +1044,13 @@ void HandleRoot(void)
     if (light_type) {
       uint8_t light_subtype = light_type &7;
       if (!Settings.flag3.pwm_multi_channels) {  // SetOption68 0 - Enable multi-channels PWM instead of Color PWM
-        if ((LST_COLDWARM == light_subtype) || (LST_RGBCW == light_subtype)) {
+        bool split_white = ((LST_RGBW <= light_subtype) && (devices_present > 1));  // Only on RGBW or RGBCW and SetOption37 128
 
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // Cold Warm
-            "a",             // a - Unique HTML id
-            "#fff", "#ff0",  // White to Yellow
-            1,               // sl1
-            153, 500,        // Range color temperature
-            LightGetColorTemp(),
-            't', 0);         // t0 - Value id releated to lc("t0", value) and WebGetArg("t0", tmp, sizeof(tmp));
+        if ((LST_COLDWARM == light_subtype) || ((LST_RGBCW == light_subtype) && !split_white)) {
+          WebSliderColdWarm();
         }
-        if (light_subtype > 2) {
+
+        if (light_subtype > 2) {  // No W or CW
           uint16_t hue;
           uint8_t sat;
           LightGetHSB(&hue, &sat, nullptr);
@@ -1079,6 +1086,19 @@ void HandleRoot(void)
           Settings.flag3.slider_dimmer_stay_on, 100,  // Range 0/1 to 100%
           Settings.light_dimmer,
           'd', 0);           // d0 - Value id is related to lc("d0", value) and WebGetArg("d0", tmp, sizeof(tmp));
+
+        if (split_white) {   // SetOption37 128
+          if (LST_RGBCW == light_subtype) {
+            WebSliderColdWarm();
+          }
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // White brightness - Black to White
+            "f",             // f - Unique HTML id
+            "#000", "#fff",  // Black to White
+            5,               // sl5 - Unique range HTML id - Not used
+            Settings.flag3.slider_dimmer_stay_on, 100,  // Range 0/1 to 100%
+            LightGetDimmer(2),
+            'w', 0);         // w0 - Value id is related to lc("w0", value) and WebGetArg("w0", tmp, sizeof(tmp));
+        }
       } else {  // Settings.flag3.pwm_multi_channels - SetOption68 1 - Enable multi-channels PWM instead of Color PWM
         uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype;
         stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0';  // d0
@@ -1229,6 +1249,11 @@ bool HandleRootStatusRefresh(void)
     snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
     ExecuteWebCommand(svalue, SRC_WEBGUI);
   }
+  WebGetArg("w0", tmp, sizeof(tmp));  // 0 - 100 White value
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
   uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
   for (uint32_t j = 1; j <= pwm_channels; j++) {
     snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 0fa8838f8..019fced67 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1336,11 +1336,15 @@ void LightUpdateColorMapping(void)
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%d colors: %d %d %d %d %d") ,Settings.param[P_RGB_REMAP], Light.color_remap[0],Light.color_remap[1],Light.color_remap[2],Light.color_remap[3],Light.color_remap[4]);
 }
 
+uint8_t LightGetDimmer(uint8_t dimmer) {
+  return light_state.getDimmer(dimmer);
+}
+
 void LightSetDimmer(uint8_t dimmer) {
   light_controller.changeDimmer(dimmer);
 }
 
-uint32_t LightGetHSB(uint16_t *hue,uint8_t  *sat, uint8_t *bri) {
+void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
   light_state.getHSB(hue, sat, bri);
 }
 

From adb2dbbcbdcb71acab5357888914e260b4b88911 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 16 Jan 2020 14:37:10 +0100
Subject: [PATCH 136/403] Fix ColorTemp brightness

---
 tasmota/xdrv_04_light.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 019fced67..d217b75c7 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2351,7 +2351,7 @@ void CmndColorTemperature(void)
       }
     }
     if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {  // https://developers.meethue.com/documentation/core-concepts
-      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBri());
+      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBriCT());
       LightPreparePower(2);
     } else {
       ResponseCmndNumber(ct);

From 920501fef99d38c3886b26acc6db1bcb6a5fabcf Mon Sep 17 00:00:00 2001
From: Shantur Rathore <shantur.rathore@gmail.com>
Date: Thu, 16 Jan 2020 15:19:57 +0000
Subject: [PATCH 137/403] Implement new Tuya multi dpid protocol. Fixes #7489

---
 tasmota/xdrv_16_tuyamcu.ino | 128 ++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 18a899589..da189c568 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -413,70 +413,77 @@ void TuyaResetWifi(void)
 
 void TuyaProcessStatePacket(void) {
   char scmnd[20];
-  uint8_t fnId = TuyaGetFuncId(Tuya.buffer[6]);
+  uint8_t dpidStart = 6;
+  uint8_t fnId;
+  uint16_t dpDataLen;
 
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[6]);
-  // if (TuyaFuncIdValid(fnId)) {
-    if (Tuya.buffer[5] == 5) {  // on/off packet
+  while (dpidStart + 4 < Tuya.byte_counter) {
+    dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+    fnId = TuyaGetFuncId(Tuya.buffer[dpidStart]);
 
-      if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[10]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
-        if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[10] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
-          ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[10], SRC_SWITCH);  // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
-        }
-      } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[10]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
-        if (Tuya.buffer[10] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
-          ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[10] ^ 1, SRC_SWITCH);  // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
-        }
-      } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[10], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[dpidStart]);
+    // if (TuyaFuncIdValid(fnId)) {
+      if (Tuya.buffer[dpidStart + 1] == 1) {  // Data Type 1
 
-        if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[10]) {
-          SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[10]);
-          SwitchHandler(1);
+        if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
+          if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);  // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
+          if (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4] ^ 1, SRC_SWITCH);  // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[dpidStart + 4], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
+
+          if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[dpidStart + 4]) {
+            SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[dpidStart + 4]);
+            SwitchHandler(1);
+          }
         }
+
       }
+      else if (Tuya.buffer[dpidStart + 1] == 2) {  // Data Type 2
+        bool tuya_energy_enabled = (XNRG_16 == energy_flg);
+        uint16_t packetValue = Tuya.buffer[dpidStart + 6] << 8 | Tuya.buffer[dpidStart + 7];
+        if (fnId == TUYA_MCU_FUNC_DIMMER) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
+          Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
+          if ((power || Settings.flag3.tuya_apply_o20) &&  // SetOption54 - Apply SetOption20 settings to Tuya device
+              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
+            Tuya.ignore_dim = true;
 
-    }
-    else if (Tuya.buffer[5] == 8) {  // Long value packet
-      bool tuya_energy_enabled = (XNRG_16 == energy_flg);
-      uint16_t packetValue = Tuya.buffer[12] << 8 | Tuya.buffer[13];
-      if (fnId == TUYA_MCU_FUNC_DIMMER) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
-        Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
-        if ((power || Settings.flag3.tuya_apply_o20) &&  // SetOption54 - Apply SetOption20 settings to Tuya device
-            (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
-          Tuya.ignore_dim = true;
-
-          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
-          ExecuteCommand(scmnd, SRC_SWITCH);
+            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
+            ExecuteCommand(scmnd, SRC_SWITCH);
+          }
         }
-      }
 
-#ifdef USE_ENERGY_SENSOR
-      else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
-        Energy.voltage[0] = (float)packetValue / 10;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[6], packetValue);
-      } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
-        Energy.current[0] = (float)packetValue / 1000;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[6], packetValue);
-      } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
-        Energy.active_power[0] = (float)packetValue / 10;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[6], packetValue);
+  #ifdef USE_ENERGY_SENSOR
+        else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
+          Energy.voltage[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
+          Energy.current[0] = (float)packetValue / 1000;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
+          Energy.active_power[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[dpidStart], packetValue);
 
-        if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
-          Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
-          EnergyUpdateToday();
+          if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
+            Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
+            EnergyUpdateToday();
+          }
+          Tuya.lastPowerCheckTime = Rtc.utc_time;
         }
-        Tuya.lastPowerCheckTime = Rtc.utc_time;
-      }
-#endif // USE_ENERGY_SENSOR
+  #endif // USE_ENERGY_SENSOR
 
-    }
-  // } else {
-  //   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Unknown FnId=%s for dpId=%s"), fnId, Tuya.buffer[6]);
-  // }
+      }
+    // } else {
+    //   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Unknown FnId=%s for dpId=%s"), fnId, Tuya.buffer[6]);
+    dpidStart += dpDataLen + 4;
+  }
 }
 
 void TuyaLowPowerModePacketProcess(void) {
@@ -671,10 +678,17 @@ void TuyaSerialInput(void)
       if (len > 0) {
         ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
         if (TUYA_CMD_STATE == Tuya.buffer[3]) {
-          uint16_t dpDataLen = Tuya.buffer[8] << 8 | Tuya.buffer[9];
-          ResponseAppend_P(PSTR(",\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[6], Tuya.buffer[7], ToHex_P((unsigned char*)&Tuya.buffer[10], dpDataLen, hex_char, sizeof(hex_char)));
-          if (TUYA_TYPE_STRING == Tuya.buffer[7]) {
-            ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[10]);
+          //55 AA 03 07 00 0D 01 04 00 01 02 02 02 00 04 00 00 00 1A 40
+          // 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19
+          uint8_t dpidStart = 6;
+          while (dpidStart + 4 < Tuya.byte_counter) {
+            uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char)));
+            if (TUYA_TYPE_STRING == Tuya.buffer[dpidStart + 1]) {
+              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[dpidStart + 4]);
+            }
+            ResponseAppend_P(PSTR("}"));
+            dpidStart += dpDataLen + 4;
           }
         }
       }

From 65d1f3aacedb9dfe9b9cb32fde40de762beda4f5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:12:57 +0100
Subject: [PATCH 138/403] Fix PowerDelta calculation

Fix PowerDelta calculation not detecting zero power (#7515)
---
 tasmota/xdrv_03_energy.ino | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 900bb2767..166fd7aa8 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -289,14 +289,19 @@ void EnergyMarginCheck(void)
 
   if (Settings.energy_power_delta) {
     uint16_t delta = abs(Energy.power_history[0] - energy_power_u);
-    uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
-
-    DEBUG_DRIVER_LOG(PSTR("NRG: Delta %d, Power %d"), delta, min_power);
-
-    if ((delta > 0) && (min_power > 0)) {  // Fix divide by 0 exception (#6741)
-      if (((Settings.energy_power_delta < 101) && (((delta * 100) / min_power) > Settings.energy_power_delta)) ||  // 1..100 = Percentage
-          ((Settings.energy_power_delta > 100) && (delta > (Settings.energy_power_delta -100)))) {                 // 101..32000 = Absolute
-        Energy.power_delta = true;
+    if (delta > 0) {
+      if (Settings.energy_power_delta < 101) {  // 1..100 = Percentage
+        uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
+        if (0 == min_power) { min_power++; }    // Fix divide by 0 exception (#6741)
+        if (((delta * 100) / min_power) > Settings.energy_power_delta) {
+          Energy.power_delta = true;
+        }
+      } else {                                  // 101..32000 = Absolute
+        if (delta > (Settings.energy_power_delta -100)) {
+          Energy.power_delta = true;
+        }
+      }
+      if (Energy.power_delta) {
         Energy.power_history[1] = Energy.active_power[0];  // We only want one report so reset history
         Energy.power_history[2] = Energy.active_power[0];
       }

From e8ce1eb64111d7ff061fad7835da2b30f6772d69 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 17 Jan 2020 15:38:03 +0100
Subject: [PATCH 139/403] Fix OTA minimal gzipped detection

Fix OTA minimal gzipped detection regression from 8.1.0.3
---
 RELEASENOTES.md             |  1 +
 tasmota/CHANGELOG.md        |  2 ++
 tasmota/support_tasmota.ino | 17 +++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 97d4a34d6..ce6c4963f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -65,6 +65,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix Display handling of hexadecimal escape characters (#7387)
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
 - Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
+- Fix ``PowerDelta`` zero power detection (#7515)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 44b9cedb0..e1d562772 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### 8.1.0.4 20200116
 
+- Fix ``PowerDelta`` zero power detection (#7515)
+- Fix OTA minimal gzipped detection regression from 8.1.0.3
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
 
 ### 8.1.0.3 20200106
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 1bbae6f1b..2fc83f53d 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -887,14 +887,19 @@ void Every250mSeconds(void)
           if (RtcSettings.ota_loader) {
             char *bch = strrchr(mqtt_data, '/');                           // Only consider filename after last backslash prevent change of urls having "-" in it
             char *pch = strrchr((bch != nullptr) ? bch : mqtt_data, '-');  // Change from filename-DE.bin into filename-minimal.bin
-//            char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');  // Change from filename.bin into filename-minimal.bin
-            char *ech = strchr((bch != nullptr) ? bch : mqtt_data, '.');   // Change from filename.bin into filename-minimal.bin or filename.bin.gz into filename-minimal.bin.gz
-            if (!pch) { pch = ech; }
+            char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');  // Find file type (none, .bin or .bin.gz)
+            if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
+              char *fch = ech;
+              *fch = '\0';
+              ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');      // Find file type .bin.gz
+              *fch = '.';
+            }
+            char ota_url_type[strlen(ech) +1];
+            strncpy(ota_url_type, ech, sizeof(ota_url_type));              // Either nothing, .bin or .bin.gz
+            if (pch == nullptr) { pch = ech; }
             if (pch) {
               mqtt_data[pch - mqtt_data] = '\0';
-//              char *ech = strrchr(SettingsText(SET_OTAURL), '.');          // Change from filename.bin into filename-minimal.bin
-              char *ech = strchr(SettingsText(SET_OTAURL), '.');          // Change from filename.bin into filename-minimal.bin
-              snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ech);  // Minimal filename must be filename-minimal
+              snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);  // Minimal filename must be filename-minimal
             }
           }
 #endif  // FIRMWARE_MINIMAL

From 400d4a0604f254d88f8e5257f075e1e86020251e Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Fri, 17 Jan 2020 16:44:43 +0100
Subject: [PATCH 140/403] add virtual serial port via TCP

---
 tasmota/xsns_60_GPS.ino | 79 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 6 deletions(-)

diff --git a/tasmota/xsns_60_GPS.ino b/tasmota/xsns_60_GPS.ino
index 13cfebdbd..42ef9949b 100644
--- a/tasmota/xsns_60_GPS.ino
+++ b/tasmota/xsns_60_GPS.ino
@@ -23,6 +23,8 @@
   Version Date      Action    Description
   --------------------------------------------------------------------------------------------
 
+  0.9.2.0 20200110  integrate - Added UART-over-TCP/IP-bridge (virtual serial port). Minor tweaks.
+  ---
   0.9.1.0 20191216  integrate - Added pin specifications from Tasmota WEB UI. Minor tweaks.
   ---
   0.9.0.0 20190817  started   - further development by Christian Baars  - https://github.com/Staars/Sonoff-Tasmota
@@ -38,11 +40,11 @@ Driver is tested on a NEO-6m and a Beitian-220. Series 7 should work too. This a
 - can log postion data with timestamp to flash with a small memory footprint of only 12 Bytes per record
 - constructs a GPX-file for download of this data
 - Web-UI
-- simplified NTP-server
+- simplified NTP-server and UART-over-TCP/IP-bridge (virtual serial port)
 - command interface
 
 ## Usage:
-The serial pins are GPX_RX and GPS_TX, no further installation steps needed. To get more debug information compile it with option "DEBUG_TASMOTA_SENSOR".
+The serial pins are GPS_RX and GPS_TX, no further installation steps needed. To get more debug information compile it with option "DEBUG_TASMOTA_SENSOR".
 
 
 ## Commands:
@@ -89,7 +91,11 @@ The serial pins are GPX_RX and GPS_TX, no further installation steps needed. To
 + sensor60 13
   set latitude and longitude in settings
 
++ sensor60 14
+  open virtual serial port over TCP, usable for u-center 
 
++ sensor60 15
+  pause virtual serial port over TCP
 
 ## Rules examples for SSD1306 32x128
 
@@ -119,6 +125,9 @@ const char kUBXTypes[] PROGMEM = "UBX";
 
 #define UBX_LAT_LON_THRESHOLD 1000 // filter out some noise of local drift
 
+#define UBX_SERIAL_BUFFER_SIZE 256
+#define UBX_TCP_PORT           1234
+
 /********************************************************************************************\
 | *globals
 \*********************************************************************************************/
@@ -252,6 +261,7 @@ struct UBX_t {
     uint32_t send_UI_only:1;
     uint32_t runningNTP:1;
     uint32_t forceUTCupdate:1;
+    uint32_t runningVPort:1;
     // TODO: more to come
   } mode;
 
@@ -280,6 +290,9 @@ TasmotaSerial *UBXSerial;
 
 NtpServer timeServer(PortUdp);
 
+WiFiServer vPortServer(UBX_TCP_PORT);
+WiFiClient vPortClient;
+
 /*********************************************************************************************\
  * helper function
 \*********************************************************************************************/
@@ -324,7 +337,7 @@ void UBXDetect(void)
 {
   UBX.mode.init = 0;
   if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
-    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, 96); // 64 byte buffer is NOT enough
+    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, UBX_SERIAL_BUFFER_SIZE); // 64 byte buffer is NOT enough
     if (UBXSerial->begin(9600)) {
       DEBUG_SENSOR_LOG(PSTR("UBX: started serial"));
       if (UBXSerial->hardwareSerial()) {
@@ -575,6 +588,14 @@ void UBXSelectMode(uint16_t mode)
       Settings.latitude = UBX.state.last_lat;
       Settings.longitude = UBX.state.last_lon;
       break;
+    case 14:
+      vPortServer.begin();
+      UBX.mode.runningVPort = 1;
+      break;
+    case 15:
+      // vPortServer.stop(); // seems not to work reliably
+      UBX.mode.runningVPort = 0;
+      break;
     default:
       if (mode>1000 && mode <1066) {
         // UBXSetRate(mode-1000); // min. 1001 = 0.001 Hz, but will be converted to 1/65535 anyway ~0.015 Hz, max. 2000 = 1.000 Hz
@@ -629,7 +650,7 @@ void UBXHandleSTATUS()
 void UBXHandleTIME()
 {
   DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time: %u-%u-%u %u:%u:%u"), UBX.Message.navTime.year, UBX.Message.navTime.month ,UBX.Message.navTime.day,UBX.Message.navTime.hour,UBX.Message.navTime.min,UBX.Message.navTime.sec);
-  if (UBX.Message.navTime.valid.UTC) {
+  if (UBX.Message.navTime.valid.UTC == 1) {
     DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time is valid"));
     if (Rtc.user_time_entry == false || UBX.mode.forceUTCupdate) {
       AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: UTC-Time is valid, set system time"));
@@ -649,6 +670,7 @@ void UBXHandleTIME()
 void UBXHandleOther(void)
 {
   if (UBX.state.non_empty_loops>6) {  // we expect only 4-5 non-empty loops in a row, could change with other sensor speed (Hz)
+    if(UBX.mode.runningVPort) return;
     UBXinitCFG();                     // this should only happen with lots of NMEA-messages, but it is only a guess!!
     AddLog_P(LOG_LEVEL_ERROR, PSTR("UBX: possible device-reset, will re-init"));
     UBXSerial->flush();
@@ -658,8 +680,49 @@ void UBXHandleOther(void)
 
 /********************************************************************************************/
 
+void UBXhandleVPort(){
+  static uint32_t idx = 0;
+  static uint8_t buf[UBX_SERIAL_BUFFER_SIZE];
+  // static uint32_t tBufMax = 0;
+  // static uint32_t sBufMax = 0;
+
+  if(!vPortClient.connected()) {
+    vPortClient = vPortServer.available();
+  }
+
+  while(vPortClient.available()) {
+    buf[idx] = (uint8_t)vPortClient.read();
+    if(idx<sizeof(buf)-1) idx++;
+  }
+  if(idx!=0) {
+    UBXSerial->write(buf, idx);
+    // if(idx>tBufMax) {
+    //   tBufMax = idx;
+    //   AddLog_P2(LOG_LEVEL_INFO, PSTR("VPORT: new max. tcp buffer size: %u"),tBufMax);
+    // }
+  }
+  idx = 0;
+
+  while(UBXSerial->available()) {
+    buf[idx] = (char)UBXSerial->read();
+    if(idx<sizeof(buf)-1) idx++;
+  }
+  if(idx!=0) {
+    vPortClient.write((char*)buf, idx);
+    // if(idx>sBufMax) {
+    //   sBufMax = idx;
+    //   AddLog_P2(LOG_LEVEL_INFO, PSTR("VPORT: new max. serial buffer size: %u"),sBufMax);
+    // }
+  }
+  idx = 0;
+}
+
 void UBXTimeServer()
 {
+  if(UBX.mode.runningVPort){
+      UBXhandleVPort();
+      return;
+    }
   if(UBX.mode.runningNTP){
     timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
   }
@@ -670,6 +733,10 @@ void UBXLoop(void)
   static uint16_t counter; //count up every 100 msec
   static bool new_position;
 
+  if(UBX.mode.runningVPort) {
+    return;
+  }
+
   uint32_t msgType = UBXprocessGPS();
 
   switch(msgType){
@@ -832,7 +899,7 @@ bool Xsns60(uint8_t function)
         }
         break;
       case FUNC_EVERY_50_MSECOND:
-        UBXTimeServer();
+        UBXTimeServer(); // handles virtual serial port too
         break;
       case FUNC_EVERY_100_MSECOND:
 #ifdef USE_FLOG
@@ -865,4 +932,4 @@ bool Xsns60(uint8_t function)
   return result;
 }
 
-#endif  // USE_GPS
+#endif  // USE_GPS
\ No newline at end of file

From 330d41a4f10e28b60710ddd1e1c6889aa96a1d5f Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Fri, 17 Jan 2020 17:09:51 +0100
Subject: [PATCH 141/403] Sync with latest BearSSL

---
 lib/bearssl-esp8266/src/t_bearssl_ec.h  | 2 +-
 lib/bearssl-esp8266/src/t_bearssl_ssl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bearssl-esp8266/src/t_bearssl_ec.h b/lib/bearssl-esp8266/src/t_bearssl_ec.h
index 660bd5186..fbe69cc02 100644
--- a/lib/bearssl-esp8266/src/t_bearssl_ec.h
+++ b/lib/bearssl-esp8266/src/t_bearssl_ec.h
@@ -108,7 +108,7 @@ extern "C" {
  *
  *   - The multipliers (integers) MUST be lower than the subgroup order.
  *     If this property is not met, then the result is indeterminate,
- *     but an error value is not ncessearily returned.
+ *     but an error value is not necessarily returned.
  * 
  *
  * ## ECDSA
diff --git a/lib/bearssl-esp8266/src/t_bearssl_ssl.h b/lib/bearssl-esp8266/src/t_bearssl_ssl.h
index 8cd42d9f4..df0d44f08 100644
--- a/lib/bearssl-esp8266/src/t_bearssl_ssl.h
+++ b/lib/bearssl-esp8266/src/t_bearssl_ssl.h
@@ -2114,7 +2114,7 @@ void br_ssl_engine_sendapp_ack(br_ssl_engine_context *cc, size_t len);
 /**
  * \brief Get buffer for received application data.
  *
- * If the engine has received application data from the peer, hen this
+ * If the engine has received application data from the peer, then this
  * call returns a pointer to the buffer from where such data shall be
  * read, and its length is written in `*len`. Otherwise, `*len` is set
  * to 0 and `NULL` is returned.

From be5c7a43671a2ddad8316bdb7ded1553ba882358 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 17 Jan 2020 17:14:53 +0100
Subject: [PATCH 142/403] Document and add errorchecks to OTA

Document and add errorchecks to OTA
---
 tasmota/support_tasmota.ino | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 2fc83f53d..1cb3aae8b 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -885,22 +885,36 @@ void Every250mSeconds(void)
           strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
 #ifndef FIRMWARE_MINIMAL
           if (RtcSettings.ota_loader) {
-            char *bch = strrchr(mqtt_data, '/');                           // Only consider filename after last backslash prevent change of urls having "-" in it
-            char *pch = strrchr((bch != nullptr) ? bch : mqtt_data, '-');  // Change from filename-DE.bin into filename-minimal.bin
-            char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');  // Find file type (none, .bin or .bin.gz)
+            // OTA File too large so try OTA minimal version
+            // Replace tasmota                                         with tasmota-minimal
+            // Replace tasmota-DE                                      with tasmota-minimal
+            // Replace tasmota.bin                                     with tasmota-minimal.bin
+            // Replace tasmota.xyz                                     with tasmota-minimal.xyz
+            // Replace tasmota.bin.gz                                  with tasmota-minimal.bin.gz
+            // Replace tasmota.xyz.gz                                  with tasmota-minimal.xyz.gz
+            // Replace http://domus1:80/api/arduino/tasmota.bin        with http://domus1:80/api/arduino/tasmota-minimal.bin
+            // Replace http://domus1:80/api/arduino/tasmota.bin.gz     with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
+            // Replace http://domus1:80/api/arduino/tasmota-DE.bin.gz  with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
+            // Replace http://domus1:80/api/ard-uino/tasmota-DE.bin.gz with http://domus1:80/api/ard-uino/tasmota-minimal.bin.gz
+
+            char *bch = strrchr(mqtt_data, '/');                       // Only consider filename after last backslash prevent change of urls having "-" in it
+            if (bch == nullptr) { bch = mqtt_data; }                   // No path found so use filename only
+
+            char *ech = strrchr(bch, '.');                             // Find file type in filename (none, .bin or .gz)
             if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
               char *fch = ech;
               *fch = '\0';
-              ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.');      // Find file type .bin.gz
+              ech = strrchr(bch, '.');                                 // Find file type .bin.gz
               *fch = '.';
             }
+            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
             char ota_url_type[strlen(ech) +1];
-            strncpy(ota_url_type, ech, sizeof(ota_url_type));              // Either nothing, .bin or .bin.gz
-            if (pch == nullptr) { pch = ech; }
-            if (pch) {
-              mqtt_data[pch - mqtt_data] = '\0';
-              snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);  // Minimal filename must be filename-minimal
-            }
+            strncpy(ota_url_type, ech, sizeof(ota_url_type));          // Either empty, .bin or .bin.gz
+
+            char *pch = strrchr(bch, '-');                             // Find last dash (-) and ignore remainder - handles tasmota-DE
+            if (pch == nullptr) { pch = ech; }                         // No dash so ignore filetype
+            *pch = '\0';                                               // mqtt_data = http://domus1:80/api/arduino/tasmota
+            snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);  // Minimal filename must be filename-minimal
           }
 #endif  // FIRMWARE_MINIMAL
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);

From 50a25aeb7c52c9154e4f0f9735d57fe14a38eeb6 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 17 Jan 2020 17:51:27 +0100
Subject: [PATCH 143/403] Experimental DS18x20 for Shelly

Experimental DS18x20 for Shelly (#7469)
---
 tasmota/xsns_05_ds18x20_shelly.ino | 463 +++++++++++++++++++++++++++++
 1 file changed, 463 insertions(+)
 create mode 100644 tasmota/xsns_05_ds18x20_shelly.ino

diff --git a/tasmota/xsns_05_ds18x20_shelly.ino b/tasmota/xsns_05_ds18x20_shelly.ino
new file mode 100644
index 000000000..f8ddcc58d
--- /dev/null
+++ b/tasmota/xsns_05_ds18x20_shelly.ino
@@ -0,0 +1,463 @@
+/*
+  xsns_05_ds18x20.ino - DS18x20 temperature sensor support for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_DS18x20SHELLY
+/*********************************************************************************************\
+ * DS18B20 - Temperature - Multiple sensors
+\*********************************************************************************************/
+
+#define XSNS_05              5
+
+//#define USE_DS18x20_RECONFIGURE    // When sensor is lost keep retrying or re-configure
+
+#define DS18S20_CHIPID       0x10  // +/-0.5C 9-bit
+#define DS1822_CHIPID        0x22  // +/-2C 12-bit
+#define DS18B20_CHIPID       0x28  // +/-0.5C 12-bit
+#define MAX31850_CHIPID      0x3B  // +/-0.25C 14-bit
+
+#define W1_SKIP_ROM          0xCC
+#define W1_CONVERT_TEMP      0x44
+#define W1_WRITE_EEPROM      0x48
+#define W1_WRITE_SCRATCHPAD  0x4E
+#define W1_READ_SCRATCHPAD   0xBE
+
+#define DS18X20_MAX_SENSORS  8
+
+const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
+
+uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
+
+struct DS18X20STRUCT {
+  uint8_t address[8];
+  uint8_t index;
+  uint8_t valid;
+  float   temperature;
+} ds18x20_sensor[DS18X20_MAX_SENSORS];
+uint8_t ds18x20_sensors = 0;
+uint8_t ds18x20_pin_in = 3;    // Shelly GPIO03
+uint8_t ds18x20_pin_out = 0;   // Shelly GPIO02
+char ds18x20_types[12];
+
+/*********************************************************************************************\
+ * Embedded tuned OneWire library
+\*********************************************************************************************/
+
+#define W1_MATCH_ROM         0x55
+#define W1_SEARCH_ROM        0xF0
+
+uint8_t onewire_last_discrepancy = 0;
+uint8_t onewire_last_family_discrepancy = 0;
+bool onewire_last_device_flag = false;
+unsigned char onewire_rom_id[8] = { 0 };
+
+uint8_t OneWireReset(void)
+{
+  uint8_t retries = 125;
+
+  //noInterrupts();
+  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  do {
+    if (--retries == 0) {
+      return 0;
+    }
+    delayMicroseconds(2);
+  } while (!digitalRead(ds18x20_pin_in));
+  pinMode(ds18x20_pin_out, OUTPUT);
+  digitalWrite(ds18x20_pin_out, LOW);
+  delayMicroseconds(480);
+  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  delayMicroseconds(70);
+  uint8_t r = !digitalRead(ds18x20_pin_in);
+  //interrupts();
+  delayMicroseconds(410);
+  return r;
+}
+
+void OneWireWriteBit(uint8_t v)
+{
+  static const uint8_t delay_low[2] = { 65, 10 };
+  static const uint8_t delay_high[2] = { 5, 55 };
+
+  v &= 1;
+  //noInterrupts();
+  digitalWrite(ds18x20_pin_out, LOW);
+  pinMode(ds18x20_pin_out, OUTPUT);
+  delayMicroseconds(delay_low[v]);
+  digitalWrite(ds18x20_pin_out, HIGH);
+  //interrupts();
+  delayMicroseconds(delay_high[v]);
+}
+
+uint8_t OneWireReadBit(void)
+{
+  //noInterrupts();
+  pinMode(ds18x20_pin_out, OUTPUT);
+  digitalWrite(ds18x20_pin_out, LOW);
+  delayMicroseconds(3);
+  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  delayMicroseconds(10);
+  uint8_t r = digitalRead(ds18x20_pin_in);
+  //interrupts();
+  delayMicroseconds(53);
+  return r;
+}
+
+void OneWireWrite(uint8_t v)
+{
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    OneWireWriteBit((bit_mask & v) ? 1 : 0);
+  }
+}
+
+uint8_t OneWireRead(void)
+{
+  uint8_t r = 0;
+
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    if (OneWireReadBit()) {
+      r |= bit_mask;
+    }
+  }
+  return r;
+}
+
+void OneWireSelect(const uint8_t rom[8])
+{
+  OneWireWrite(W1_MATCH_ROM);
+  for (uint32_t i = 0; i < 8; i++) {
+    OneWireWrite(rom[i]);
+  }
+}
+
+void OneWireResetSearch(void)
+{
+  onewire_last_discrepancy = 0;
+  onewire_last_device_flag = false;
+  onewire_last_family_discrepancy = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    onewire_rom_id[i] = 0;
+  }
+}
+
+uint8_t OneWireSearch(uint8_t *newAddr)
+{
+  uint8_t id_bit_number = 1;
+  uint8_t last_zero = 0;
+  uint8_t rom_byte_number = 0;
+  uint8_t search_result = 0;
+  uint8_t id_bit;
+  uint8_t cmp_id_bit;
+  unsigned char rom_byte_mask = 1;
+  unsigned char search_direction;
+
+  if (!onewire_last_device_flag) {
+    if (!OneWireReset()) {
+      onewire_last_discrepancy = 0;
+      onewire_last_device_flag = false;
+      onewire_last_family_discrepancy = 0;
+      return false;
+    }
+    OneWireWrite(W1_SEARCH_ROM);
+    do {
+      id_bit     = OneWireReadBit();
+      cmp_id_bit = OneWireReadBit();
+
+      if ((id_bit == 1) && (cmp_id_bit == 1)) {
+        break;
+      } else {
+        if (id_bit != cmp_id_bit) {
+          search_direction = id_bit;
+        } else {
+          if (id_bit_number < onewire_last_discrepancy) {
+            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
+          } else {
+            search_direction = (id_bit_number == onewire_last_discrepancy);
+          }
+          if (search_direction == 0) {
+            last_zero = id_bit_number;
+            if (last_zero < 9) {
+              onewire_last_family_discrepancy = last_zero;
+            }
+          }
+        }
+        if (search_direction == 1) {
+          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
+        } else {
+          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
+        }
+        OneWireWriteBit(search_direction);
+        id_bit_number++;
+        rom_byte_mask <<= 1;
+        if (rom_byte_mask == 0) {
+          rom_byte_number++;
+          rom_byte_mask = 1;
+        }
+      }
+    } while (rom_byte_number < 8);
+    if (!(id_bit_number < 65)) {
+      onewire_last_discrepancy = last_zero;
+      if (onewire_last_discrepancy == 0) {
+        onewire_last_device_flag = true;
+      }
+      search_result = true;
+    }
+  }
+  if (!search_result || !onewire_rom_id[0]) {
+    onewire_last_discrepancy = 0;
+    onewire_last_device_flag = false;
+    onewire_last_family_discrepancy = 0;
+    search_result = false;
+  }
+  for (uint32_t i = 0; i < 8; i++) {
+    newAddr[i] = onewire_rom_id[i];
+  }
+  return search_result;
+}
+
+bool OneWireCrc8(uint8_t *addr)
+{
+  uint8_t crc = 0;
+  uint8_t len = 8;
+
+  while (len--) {
+    uint8_t inbyte = *addr++;          // from 0 to 7
+    for (uint32_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x01;
+      crc >>= 1;
+      if (mix) {
+        crc ^= 0x8C;
+      }
+      inbyte >>= 1;
+    }
+  }
+  return (crc == *addr);               // addr 8
+}
+
+/********************************************************************************************/
+
+void Ds18x20Init(void)
+{
+  uint64_t ids[DS18X20_MAX_SENSORS];
+
+//  ds18x20_pin = pin[GPIO_DSB];
+
+  OneWireResetSearch();
+
+  ds18x20_sensors = 0;
+  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
+    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
+      break;
+    }
+    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
+       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
+      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
+      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];  // Chip id
+      for (uint32_t j = 6; j > 0; j--) {
+        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
+      }
+      ds18x20_sensors++;
+    }
+  }
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
+      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {  // Sort ascending
+        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
+      }
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
+}
+
+void Ds18x20Convert(void)
+{
+  OneWireReset();
+  OneWireWrite(W1_SKIP_ROM);           // Address all Sensors on Bus
+  OneWireWrite(W1_CONVERT_TEMP);       // start conversion, no parasite power on at the end
+//  delay(750);                          // 750ms should be enough for 12bit conv
+}
+
+bool Ds18x20Read(uint8_t sensor)
+{
+  uint8_t data[9];
+  int8_t sign = 1;
+
+  uint8_t index = ds18x20_sensor[sensor].index;
+  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
+  for (uint32_t retry = 0; retry < 3; retry++) {
+    OneWireReset();
+    OneWireSelect(ds18x20_sensor[index].address);
+    OneWireWrite(W1_READ_SCRATCHPAD);
+    for (uint32_t i = 0; i < 9; i++) {
+      data[i] = OneWireRead();
+    }
+    if (OneWireCrc8(data)) {
+      switch(ds18x20_sensor[index].address[0]) {
+        case DS18S20_CHIPID: {
+          if (data[1] > 0x80) {
+            data[0] = (~data[0]) +1;
+            sign = -1;                     // App-Note fix possible sign error
+          }
+          float temp9 = (float)(data[0] >> 1) * sign;
+          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case DS1822_CHIPID:
+        case DS18B20_CHIPID: {
+          if (data[4] != 0x7F) {
+            data[4] = 0x7F;                 // Set resolution to 12-bit
+            OneWireReset();
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_SCRATCHPAD);
+            OneWireWrite(data[2]);          // Th Register
+            OneWireWrite(data[3]);          // Tl Register
+            OneWireWrite(data[4]);          // Configuration Register
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_EEPROM);  // Save scratchpad to EEPROM
+          }
+          uint16_t temp12 = (data[1] << 8) + data[0];
+          if (temp12 > 2047) {
+            temp12 = (~temp12) +1;
+            sign = -1;
+          }
+          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);  // Divide by 16
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case MAX31850_CHIPID: {
+          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
+          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);  // Divide by 16
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+      }
+    }
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
+  return false;
+}
+
+void Ds18x20Name(uint8_t sensor)
+{
+  uint8_t index = sizeof(ds18x20_chipids);
+  while (index) {
+    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
+      break;
+    }
+    index--;
+  }
+  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
+  if (ds18x20_sensors > 1) {
+    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
+  }
+}
+
+/********************************************************************************************/
+
+void Ds18x20EverySecond(void)
+{
+  if (uptime & 1) {
+    // 2mS
+    Ds18x20Convert();          // Start conversion, takes up to one second
+  } else {
+    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+      // 12mS per device
+      if (!Ds18x20Read(i)) {   // Read temperature
+        Ds18x20Name(i);
+        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
+#ifdef USE_DS18x20_RECONFIGURE
+        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
+          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
+          Ds18x20Init();       // Re-configure
+        }
+#endif  // USE_DS18x20_RECONFIGURE
+      }
+    }
+  }
+}
+
+void Ds18x20Show(bool json)
+{
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    uint8_t index = ds18x20_sensor[i].index;
+
+    if (ds18x20_sensor[index].valid) {   // Check for valid temperature
+      char temperature[33];
+      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
+
+      Ds18x20Name(i);
+
+      if (json) {
+        char address[17];
+        for (uint32_t j = 0; j < 6; j++) {
+          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);  // Skip sensor type and crc
+        }
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == i)) {
+          DomoticzSensor(DZ_TEMP, temperature);
+        }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+        if ((0 == tele_period) && (0 == i)) {
+          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
+        }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
+#endif  // USE_WEBSERVER
+      }
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns05(uint8_t function)
+{
+  bool result = false;
+
+//  if (pin[GPIO_DSB] < 99) {
+    switch (function) {
+      case FUNC_INIT:
+        Ds18x20Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        Ds18x20EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Ds18x20Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ds18x20Show(0);
+        break;
+#endif  // USE_WEBSERVER
+    }
+//  }
+  return result;
+}
+
+#endif  // USE_DS18x20SHELLY

From 18ce64f8137226af843997c6a788ffddf75e83d1 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 18 Jan 2020 00:02:01 +0100
Subject: [PATCH 144/403] Add Zigbee persistence and friendly names

---
 tasmota/CHANGELOG.md                      |   1 +
 tasmota/i18n.h                            |   3 +
 tasmota/settings.h                        |   4 +-
 tasmota/support_static_buffer.ino         |  29 +-
 tasmota/xdrv_02_mqtt.ino                  |   6 +-
 tasmota/xdrv_23_zigbee_3_devices.ino      | 265 ++++++++++++++---
 tasmota/xdrv_23_zigbee_4_persistence.ino  | 332 ++++++++++++++++++++++
 tasmota/xdrv_23_zigbee_5_converters.ino   |   8 +-
 tasmota/xdrv_23_zigbee_7_statemachine.ino |   3 +-
 tasmota/xdrv_23_zigbee_8_parsers.ino      |  24 +-
 tasmota/xdrv_23_zigbee_9_impl.ino         |  92 ++++--
 11 files changed, 704 insertions(+), 63 deletions(-)
 create mode 100644 tasmota/xdrv_23_zigbee_4_persistence.ino

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index e1d562772..ccffecfdc 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix ``PowerDelta`` zero power detection (#7515)
 - Fix OTA minimal gzipped detection regression from 8.1.0.3
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
+- Add Zigbee persistence and friendly names
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 0dece041a..20207bcb4 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -480,7 +480,10 @@
   #define D_JSON_ZIGBEEZCL_RAW_RECEIVED "ZigbeeZCLRawReceived"
   #define D_JSON_ZIGBEE_DEVICE "Device"
   #define D_JSON_ZIGBEE_NAME "Name"
+#define D_CMND_ZIGBEE_NAME "ZigbeeName"
 #define D_CMND_ZIGBEE_PROBE "ZigbeeProbe"
+#define D_CMND_ZIGBEE_FORGET "ZigbeeForget"
+#define D_CMND_ZIGBEE_SAVE "ZigbeeSave"
 #define D_CMND_ZIGBEE_RECEIVED "ZigbeeReceived"
   #define D_CMND_ZIGBEE_LINKQUALITY "LinkQuality"
 #define D_CMND_ZIGBEE_READ "ZigbeeRead"
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 684ab18af..74023ff60 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -101,8 +101,8 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
 typedef union {                            // Restricted by MISRA-C Rule 18.4 but so useful...
   uint32_t data;                           // Allow bit manipulation using SetOption
   struct {                                 // SetOption82 .. SetOption113
-    uint32_t alexa_ct_range : 1;         // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
-    uint32_t spare01 : 1;
+    uint32_t alexa_ct_range : 1;           // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
+    uint32_t zigbee_use_names : 1;         // bit 1 (V8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t spare02 : 1;
     uint32_t spare03 : 1;
     uint32_t spare04 : 1;
diff --git a/tasmota/support_static_buffer.ino b/tasmota/support_static_buffer.ino
index 512ec0db1..bec831cc9 100644
--- a/tasmota/support_static_buffer.ino
+++ b/tasmota/support_static_buffer.ino
@@ -80,7 +80,7 @@ public:
     return _buf->len;
   }
   size_t add32(const uint32_t data) {           // append 32 bits value
-    if (_buf->len < _buf->size - 3) {     // do we have room for 2 bytes
+    if (_buf->len < _buf->size - 3) {     // do we have room for 4 bytes
       _buf->buf[_buf->len++] = data;
       _buf->buf[_buf->len++] = data >> 8;
       _buf->buf[_buf->len++] = data >> 16;
@@ -88,6 +88,19 @@ public:
     }
     return _buf->len;
   }
+  size_t add64(const uint64_t data) {           // append 64 bits value
+    if (_buf->len < _buf->size - 7) {     // do we have room for 8 bytes
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+      _buf->buf[_buf->len++] = data >> 16;
+      _buf->buf[_buf->len++] = data >> 24;
+      _buf->buf[_buf->len++] = data >> 32;
+      _buf->buf[_buf->len++] = data >> 40;
+      _buf->buf[_buf->len++] = data >> 48;
+      _buf->buf[_buf->len++] = data >> 56;
+    }
+    return _buf->len;
+  }
 
   size_t addBuffer(const SBuffer &buf2) {
     if (len() + buf2.len() <= size()) {
@@ -152,6 +165,20 @@ public:
     return 0;
   }
 
+  // if no NULL is found, returns length until the end of the buffer
+  inline size_t strlen(const size_t offset) const {
+    return strnlen((const char*) &_buf->buf[offset], len() - offset);
+  }
+
+  size_t strlen_s(const size_t offset) const {
+    size_t slen = this->strlen(offset);
+    if (slen == len() - offset) {
+      return 0;   // we didn't find a NULL char
+    } else {
+      return slen;
+    }
+  }
+
   SBuffer subBuffer(const size_t start, size_t len) const {
     if (start >= _buf->len) {
       len = 0;
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 6096103c4..799829fe6 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -986,8 +986,10 @@ void CmndSensorRetain(void)
 \*********************************************************************************************/
 #if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
 
-const static uint16_t tls_spi_start_sector = SPIFFS_END + 4;  // 0xXXFF
-const static uint8_t* tls_spi_start    = (uint8_t*) ((tls_spi_start_sector * SPI_FLASH_SEC_SIZE) + 0x40200000);  // 0x40XFF000
+// const static uint16_t tls_spi_start_sector = SPIFFS_END + 4;  // 0xXXFF
+// const static uint8_t* tls_spi_start    = (uint8_t*) ((tls_spi_start_sector * SPI_FLASH_SEC_SIZE) + 0x40200000);  // 0x40XFF000
+const static uint16_t tls_spi_start_sector = 0xFF;  // Force last bank of first MB
+const static uint8_t* tls_spi_start    = (uint8_t*) 0x402FF000;  // 0x402FF000
 const static size_t   tls_spi_len      = 0x1000;  // 4kb blocs
 const static size_t   tls_block_offset = 0x0400;
 const static size_t   tls_block_len    = 0x0400;   // 1kb
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 1d793f730..97c995aaf 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -22,6 +22,10 @@
 #include <vector>
 #include <map>
 
+#ifndef ZIGBEE_SAVE_DELAY_SECONDS
+#define ZIGBEE_SAVE_DELAY_SECONDS 10;               // wait for 10s before saving Zigbee info
+#endif
+const uint16_t kZigbeeSaveDelaySeconds = ZIGBEE_SAVE_DELAY_SECONDS;    // wait for x seconds
 
 typedef int32_t (*Z_DeviceTimer)(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
 
@@ -57,6 +61,16 @@ class Z_Devices {
 public:
   Z_Devices() {};
 
+  // Probe the existence of device keys
+  // Results:
+  // - 0x0000 = not found
+  // - 0xFFFF = bad parameter
+  // - 0x<shortaddr> = the device's short address
+  uint16_t isKnownShortAddr(uint16_t shortaddr) const;
+  uint16_t isKnownLongAddr(uint64_t  longaddr) const;
+  uint16_t isKnownIndex(uint32_t index) const;
+  uint16_t isKnownFriendlyName(const char * name) const;
+
   // Add new device, provide ShortAddr and optional longAddr
   // If it is already registered, update information, otherwise create the entry
   void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
@@ -74,13 +88,14 @@ public:
 
   void setManufId(uint16_t shortaddr, const char * str);
   void setModelId(uint16_t shortaddr, const char * str);
-  void setFriendlyNameId(uint16_t shortaddr, const char * str);
+  void setFriendlyName(uint16_t shortaddr, const char * str);
+  const String * getFriendlyName(uint16_t) const;
 
   // device just seen on the network, update the lastSeen field
   void updateLastSeen(uint16_t shortaddr);
 
   // Dump json
-  String dump(uint32_t dump_mode, int32_t device_num = 0) const;
+  String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
 
   // Timers
   void resetTimer(uint32_t shortaddr);
@@ -89,13 +104,32 @@ public:
 
   // Append or clear attributes Json structure
   void jsonClear(uint16_t shortaddr);
-  void jsonAppend(uint16_t shortaddr, JsonObject &values);
+  void jsonAppend(uint16_t shortaddr, const JsonObject &values);
   const JsonObject *jsonGet(uint16_t shortaddr);
-  const void jsonPublish(uint16_t shortaddr);    // publish the json message and clear buffer
+  void jsonPublishFlush(uint16_t shortaddr);    // publish the json message and clear buffer
   bool jsonIsConflict(uint16_t shortaddr, const JsonObject &values);
+  void jsonPublishNow(uint16_t shortaddr, JsonObject &values);
+
+  // Iterator
+  size_t devicesSize(void) const {
+    return _devices.size();
+  }
+  const Z_Device &devicesAt(size_t i) const {
+    return _devices.at(i);
+  }
+
+  // Remove device from list
+  bool removeDevice(uint16_t shortaddr);
+
+  // Mark data as 'dirty' and requiring to save in Flash
+  void dirty(void);
+
+  // Find device by name, can be short_addr, long_addr, number_in_array or name
+  uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
 
 private:
   std::vector<Z_Device> _devices = {};
+  uint32_t              _saveTimer = 0;   
 
   template < typename T>
   static bool findInVector(const std::vector<T>  & vecOfElements, const T  & element);
@@ -109,8 +143,9 @@ private:
   Z_Device & getShortAddr(uint16_t shortaddr);   // find Device from shortAddr, creates it if does not exist
   Z_Device & getLongAddr(uint64_t longaddr);     // find Device from shortAddr, creates it if does not exist
 
-  int32_t findShortAddr(uint16_t shortaddr);
-  int32_t findLongAddr(uint64_t longaddr);
+  int32_t findShortAddr(uint16_t shortaddr) const;
+  int32_t findLongAddr(uint64_t longaddr) const;
+  int32_t findFriendlyName(const char * name) const;
 
   void _updateLastSeen(Z_Device &device) {
     if (&device != nullptr) {
@@ -187,6 +222,7 @@ Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
                       nullptr, nullptr };
   device.json_buffer = new DynamicJsonBuffer();
   _devices.push_back(device);
+  dirty();
   return _devices.back();
 }
 
@@ -198,7 +234,7 @@ Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
 // Out:
 //    index in _devices of entry, -1 if not found
 //
-int32_t Z_Devices::findShortAddr(uint16_t shortaddr) {
+int32_t Z_Devices::findShortAddr(uint16_t shortaddr) const {
   if (!shortaddr) { return -1; }              // does not make sense to look for 0x0000 shortaddr (localhost)
   int32_t found = 0;
   if (shortaddr) {
@@ -217,7 +253,7 @@ int32_t Z_Devices::findShortAddr(uint16_t shortaddr) {
 // Out:
 //    index in _devices of entry, -1 if not found
 //
-int32_t Z_Devices::findLongAddr(uint64_t longaddr) {
+int32_t Z_Devices::findLongAddr(uint64_t longaddr) const {
   if (!longaddr) { return -1; }
   int32_t found = 0;
   if (longaddr) {
@@ -228,6 +264,66 @@ int32_t Z_Devices::findLongAddr(uint64_t longaddr) {
   }
   return -1;
 }
+//
+// Scan all devices to find a corresponding friendlyNme
+// Looks info device.friendlyName entry
+// In:
+//    friendlyName (null terminated, should not be empty)
+// Out:
+//    index in _devices of entry, -1 if not found
+//
+int32_t Z_Devices::findFriendlyName(const char * name) const {
+  if (!name) { return -1; }              // if pointer is null
+  size_t name_len = strlen(name);
+  int32_t found = 0;
+  if (name_len) {
+    for (auto &elem : _devices) {
+      if (elem.friendlyName == name) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+
+// Probe if device is already known but don't create any entry
+uint16_t Z_Devices::isKnownShortAddr(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return shortaddr;
+  } else {
+    return 0;   // unknown
+  }
+}
+
+uint16_t Z_Devices::isKnownLongAddr(uint64_t longaddr) const {
+  int32_t found = findLongAddr(longaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;    // can be zero, if not yet registered
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownIndex(uint32_t index) const {
+  if (index < devicesSize()) {
+    const Z_Device & device = devicesAt(index);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
+  if ((!name) || (0 == strlen(name))) { return 0xFFFF; }         // Error
+  int32_t found = findFriendlyName(name);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;    // can be zero, if not yet registered
+  } else {
+    return 0;
+  }
+}
 
 //
 // We have a seen a shortaddr on the network, get the corresponding
@@ -252,6 +348,17 @@ Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
   return createDeviceEntry(0, longaddr);
 }
 
+// Remove device from list, return true if it was known, false if it was not recorded
+bool Z_Devices::removeDevice(uint16_t shortaddr) {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    _devices.erase(_devices.begin() + found);
+    dirty();
+    return true;
+  }
+  return false;
+}
+
 //
 // We have just seen a device on the network, update the info based on short/long addr
 // In:
@@ -270,15 +377,18 @@ void Z_Devices::updateDevice(uint16_t shortaddr, uint64_t longaddr) {
       // erase the previous shortaddr
       _devices.erase(_devices.begin() + s_found);
       updateLastSeen(shortaddr);
+      dirty();
     }
   } else if (s_found >= 0) {
     // shortaddr already exists but longaddr not
     // add the longaddr to the entry
     _devices[s_found].longaddr = longaddr;
     updateLastSeen(shortaddr);
+    dirty();
   } else if (l_found >= 0) {
     // longaddr entry exists, update shortaddr
     _devices[l_found].shortaddr = shortaddr;
+    dirty();
   } else {
     // neither short/lonf addr are found.
     if (shortaddr || longaddr) {
@@ -298,6 +408,7 @@ void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
   _updateLastSeen(device);
   if (findEndpointInVector(device.endpoints, ep_profile) < 0) {
     device.endpoints.push_back(ep_profile);
+    dirty();
   }
 }
 
@@ -310,8 +421,12 @@ void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t
   int32_t found = findEndpointInVector(device.endpoints, ep_profile);
   if (found < 0) {
     device.endpoints.push_back(ep_profile);
+    dirty();
   } else {
-    device.endpoints[found] = ep_profile;
+    if (device.endpoints[found] != ep_profile) {
+      device.endpoints[found] = ep_profile;
+      dirty();
+    }
   }
 }
 
@@ -324,10 +439,12 @@ void Z_Devices::addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluste
   if (!out) {
     if (!findInVector(device.clusters_in, ep_cluster)) {
       device.clusters_in.push_back(ep_cluster);
+      dirty();
     }
   } else { // out
     if (!findInVector(device.clusters_out, ep_cluster)) {
       device.clusters_out.push_back(ep_cluster);
+      dirty();
     }
   }
 }
@@ -353,18 +470,32 @@ void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
   device.manufacturerId = str;
+  dirty();
 }
 void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
   device.modelId = str;
+  dirty();
 }
-void Z_Devices::setFriendlyNameId(uint16_t shortaddr, const char * str) {
+void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
   device.friendlyName = str;
+  dirty();
+}
+
+const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    if (device.friendlyName.length() > 0) {
+      return &device.friendlyName;
+    }
+  }
+  return nullptr;
 }
 
 // device just seen on the network, update the lastSeen field
@@ -398,19 +529,22 @@ void Z_Devices::setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster,
 
 // Run timer at each tick
 void Z_Devices::runTimer(void) {
-  uint32_t now = millis();
-
   for (std::vector<Z_Device>::iterator it = _devices.begin(); it != _devices.end(); ++it) {
     Z_Device &device = *it;
     uint16_t shortaddr = device.shortaddr;
 
     uint32_t timer = device.timer;
-    if ((timer) && (timer <= now)) {
+    if ((timer) && TimeReached(timer)) {
       device.timer = 0;       // cancel the timer before calling, so the callback can set another timer
       // trigger the timer
       (*device.func)(device.shortaddr, device.cluster, device.endpoint, device.value);
     }
   }
+  // save timer
+  if ((_saveTimer) && TimeReached(_saveTimer)) {
+    saveZigbeeDevices();
+    _saveTimer = 0;
+  }
 }
 
 void Z_Devices::jsonClear(uint16_t shortaddr) {
@@ -482,7 +616,7 @@ bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
   return false;
 }
 
-void Z_Devices::jsonAppend(uint16_t shortaddr, JsonObject &values) {
+void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   if (&values == nullptr) { return; }
@@ -500,40 +634,103 @@ const JsonObject *Z_Devices::jsonGet(uint16_t shortaddr) {
   return device.json;
 }
 
-const void Z_Devices::jsonPublish(uint16_t shortaddr) {
-  const JsonObject *json = zigbee_devices.jsonGet(shortaddr);
-  if (json == nullptr) { return; }                 // don't crash if not found
+void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }                 // don't crash if not found
+  JsonObject * json = device.json;
+  if (json == nullptr) { return; }                    // abort if nothing in buffer
+
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);    // should we replace shortaddr with friendlyname?
+
+  if (use_fname) {
+    // we need to add the Device short_addr inside the JSON
+    char sa[8];
+    snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
+    json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
+  } else if (fname) {
+    json->set(F(D_JSON_NAME), (char*) fname);
+  }
 
   String msg = "";
   json->printTo(msg);
   zigbee_devices.jsonClear(shortaddr);
-  Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+
+  if (use_fname) {
+    Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+  } else {
+    Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+  }
   MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
   XdrvRulesProcess();
 }
 
+void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
+  jsonPublishFlush(shortaddr);    // flush any previous buffer
+  jsonAppend(shortaddr, values);
+  jsonPublishFlush(shortaddr);    // publish now
+}
+
+void Z_Devices::dirty(void) {
+  _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
+}
+
+// Parse the command parameters for either:
+// - a short address starting with "0x", example: 0x1234
+// - a long address starting with "0x", example: 0x7CB03EBB0A0292DD
+// - a number 0..99, the index number in ZigbeeStatus
+// - a friendly name, between quotes, example: "Room_Temp"
+uint16_t Z_Devices::parseDeviceParam(const char * param, bool short_must_be_known) const {
+  if (nullptr == param) { return 0; }
+  size_t param_len = strlen(param);
+  char dataBuf[param_len + 1];
+  strcpy(dataBuf, param);
+  RemoveSpace(dataBuf);
+  uint16_t shortaddr = 0;
+
+  if (strlen(dataBuf) < 4) {
+    // simple number 0..99
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 99)) {
+      shortaddr = zigbee_devices.isKnownIndex(XdrvMailbox.payload - 1);
+    }
+  } else if ((dataBuf[0] == '0') && (dataBuf[1] == 'x')) {
+    // starts with 0x
+    if (strlen(dataBuf) < 18) {
+      // expect a short address
+      shortaddr = strtoull(dataBuf, nullptr, 0);
+      if (short_must_be_known) {
+        shortaddr = zigbee_devices.isKnownShortAddr(shortaddr);
+      }
+      // else we don't check if it's already registered to force unregistered devices
+    } else {
+      // expect a long address
+      uint64_t longaddr = strtoull(dataBuf, nullptr, 0);
+      shortaddr = zigbee_devices.isKnownLongAddr(longaddr);
+    }
+  } else {
+    // expect a Friendly Name
+    shortaddr = zigbee_devices.isKnownFriendlyName(dataBuf);
+  }
+
+  return shortaddr;
+}
 
 // Dump the internal memory of Zigbee devices
-// Mode = 1: simple dump of devices addresses and names
-// Mode = 2: Mode 1 + also dump the endpoints, profiles and clusters
-String Z_Devices::dump(uint32_t dump_mode, int32_t device_num) const {
+// Mode = 1: simple dump of devices addresses
+// Mode = 2: simple dump of devices addresses and names
+// Mode = 3: Mode 2 + also dump the endpoints, profiles and clusters
+String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
   DynamicJsonBuffer jsonBuffer;
   JsonArray& json = jsonBuffer.createArray();
   JsonArray& devices = json;
-  //JsonArray& devices = json.createNestedArray(F("ZigbeeDevices"));
-
-  // if device_num == 0, then we show all devices.
-  // When no payload, the default is -99. In this case change it to 0.
-  if (device_num < 0) { device_num = 0; }
-
-  uint32_t device_current = 1;
-  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it, ++device_current) {
-    // ignore non-current device, if specified device is non-zero
-    if ((device_num > 0) && (device_num != device_current)) { continue; }
 
+  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it) {
     const Z_Device& device = *it;
     uint16_t shortaddr = device.shortaddr;
-    char hex[20];
+    char hex[22];
+
+    // ignore non-current device, if specified device is non-zero
+    if ((status_shortaddr) && (status_shortaddr != shortaddr)) { continue; }
 
     JsonObject& dev = devices.createNestedObject();
 
@@ -545,7 +742,9 @@ String Z_Devices::dump(uint32_t dump_mode, int32_t device_num) const {
     }
 
     if (2 <= dump_mode) {
-      Uint64toHex(device.longaddr, hex, 64);
+      hex[0] = '0';   // prefix with '0x'
+      hex[1] = 'x';
+      Uint64toHex(device.longaddr, &hex[2], 64);
       dev[F("IEEEAddr")] = hex;
       if (device.modelId.length() > 0) {
         dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
diff --git a/tasmota/xdrv_23_zigbee_4_persistence.ino b/tasmota/xdrv_23_zigbee_4_persistence.ino
new file mode 100644
index 000000000..e4fae384d
--- /dev/null
+++ b/tasmota/xdrv_23_zigbee_4_persistence.ino
@@ -0,0 +1,332 @@
+/*
+  xdrv_23_zigbee.ino - zigbee support for Tasmota
+
+  Copyright (C) 2020  Theo Arends and Stephan Hadinger
+
+  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/>.
+*/
+
+#ifdef USE_ZIGBEE
+
+// Ensure persistence of devices into Flash
+//
+// Structure:
+// (from file info):
+// uint16 - start address in Flash (offset)
+// uint16 - length in bytes (makes sure parsing stops)
+//
+// File structure:
+// uint8 - number of devices, 0=none, 0xFF=invalid entry (probably Flash was erased)
+//
+// [Array of devices]
+// [Offset = 2]
+// uint8  - length of revice record
+// uint16 - short address
+// uint64 - long IEEE address
+// uint8  - number of endpoints
+// [Array of endpoints]
+// uint8  - endpoint number
+// uint16 - profileID of the endpoint
+// Array of uint8 - clusters In  codes, 0xFF end marker
+// Array of uint8 - clusters Out codes, 0xFF end marker
+//
+// str    - ModelID (null terminated C string, 32 chars max)
+// str    - Manuf   (null terminated C string, 32 chars max)
+// reserved for extensions
+
+// Memory footprint
+const static uint16_t z_spi_start_sector = 0xFF;  // Force last bank of first MB
+const static uint8_t* z_spi_start    = (uint8_t*) 0x402FF000;  // 0x402FF000
+const static uint8_t* z_dev_start    = z_spi_start + 0x0800;  // 0x402FF800 - 2KB
+const static size_t   z_spi_len      = 0x1000;  // 4kb blocs
+const static size_t   z_block_offset = 0x0800;
+const static size_t   z_block_len    = 0x0800;   // 2kb
+
+class z_flashdata_t {
+public:
+  uint32_t name;    // simple 4 letters name. Currently 'skey', 'crt ', 'crt1', 'crt2'
+  uint16_t len;     // len of object
+  uint16_t reserved; // align on 4 bytes boundary
+}; 
+
+const static uint32_t ZIGB_NAME = 0x3167697A; // 'zig1' little endian
+const static size_t   Z_MAX_FLASH = z_block_len - sizeof(z_flashdata_t);  // 2040
+
+// encoding for the most commonly 32 clusters, used for binary encoding
+const uint16_t Z_ClusterNumber[] PROGMEM = {
+  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+  0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+  0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+  0x0100, 0x0101, 0x0102,
+  0x0201, 0x0202, 0x0203, 0x0204,
+  0x0300, 0x0301,
+  0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406,
+  0x0500, 0x0501, 0x0502,
+  0x0700, 0x0701, 0x0702,
+  0x0B00, 0x0B01, 0x0B02, 0x0B03, 0x0B04, 0x0B05,
+  0x1000,
+  0xFC0F,
+};
+
+// convert a 1 byte cluster code to the actual cluster number
+uint16_t fromClusterCode(uint8_t c) {
+  if (c >= sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0])) {
+    return 0xFFFF;      // invalid
+  }
+  return pgm_read_word(&Z_ClusterNumber[c]);
+}
+
+// convert a cluster number to 1 byte, or 0xFF if not in table
+uint8_t toClusterCode(uint16_t c) {
+  for (uint32_t i = 0; i < sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0]); i++) {
+    if (c == pgm_read_word(&Z_ClusterNumber[i])) {
+      return i;
+    }
+  }
+  return 0xFF;        // not found
+}
+
+class SBuffer hibernateDevice(const struct Z_Device &device) {
+  SBuffer buf(128);
+
+  buf.add8(0x00);     // overall length, will be updated later
+  buf.add16(device.shortaddr);
+  buf.add64(device.longaddr);
+  uint32_t endpoints = device.endpoints.size();
+  if (endpoints > 254) { endpoints = 254; }
+  buf.add8(endpoints);
+  // iterate on endpoints
+  for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
+    uint32_t ep_profile = *ite;
+    uint8_t endpoint = (ep_profile >> 16) & 0xFF;
+    uint16_t profileId = ep_profile & 0xFFFF;
+
+    buf.add8(endpoint);
+    buf.add16(profileId);
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t  c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);      // end of endpoint marker
+
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t  c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);      // end of endpoint marker
+  }
+
+  // ModelID
+  size_t model_len = device.modelId.length();
+  if (model_len > 32) { model_len = 32; }       // max 32 chars
+  buf.addBuffer(device.modelId.c_str(), model_len);
+  buf.add8(0x00);     // end of string marker
+
+  // ManufID
+  size_t manuf_len = device.manufacturerId.length();
+  if (manuf_len > 32) {manuf_len = 32; }       // max 32 chars
+  buf.addBuffer(device.manufacturerId.c_str(), manuf_len);
+  buf.add8(0x00);     // end of string marker
+
+  // FriendlyName
+  size_t frname_len = device.friendlyName.length();
+  if (frname_len > 32) {frname_len = 32; }       // max 32 chars
+  buf.addBuffer(device.friendlyName.c_str(), frname_len);
+  buf.add8(0x00);     // end of string marker
+
+  // update overall length
+  buf.set8(0, buf.len());
+
+  return buf;
+}
+
+class SBuffer hibernateDevices(void) {
+  SBuffer buf(2048);
+
+  size_t devices_size = zigbee_devices.devicesSize();
+  if (devices_size > 32) { devices_size = 32; }         // arbitrarily limit to 32 devices, for now
+  buf.add8(devices_size);    // number of devices
+
+  for (uint32_t i = 0; i < devices_size; i++) {
+    const Z_Device & device = zigbee_devices.devicesAt(i);
+    const SBuffer buf_device = hibernateDevice(device);
+    buf.addBuffer(buf_device);
+  }
+
+  size_t buf_len = buf.len();
+  if (buf_len > 2040) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Devices list too big to fit in Flash (%d)"), buf_len);
+  }
+
+  // Log
+  char *hex_char = (char*) malloc((buf_len * 2) + 2);
+  if (hex_char) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZigbeeFlashStore %s"),
+                                    ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
+    free(hex_char);
+  }
+
+  return buf;
+}
+
+void hidrateDevices(const SBuffer &buf) {
+  uint32_t buf_len = buf.len();
+  if (buf_len <= 10) { return; }
+
+  uint32_t k = 0;
+  uint32_t num_devices = buf.get8(k++);
+
+  for (uint32_t i = 0; (i < num_devices) && (k < buf_len); i++) {
+    uint32_t dev_record_len = buf.get8(k);
+
+    SBuffer buf_d = buf.subBuffer(k, dev_record_len);
+
+    uint32_t d = 1;   // index in device buffer
+    uint16_t shortaddr = buf_d.get16(d);  d += 2;
+    uint64_t longaddr  = buf_d.get64(d);  d += 8;
+    zigbee_devices.updateDevice(shortaddr, longaddr);   // update device's addresses
+
+    uint32_t endpoints = buf_d.get8(d++);
+    for (uint32_t j = 0; j < endpoints; j++) {
+      uint8_t ep = buf_d.get8(d++);
+      uint16_t ep_profile = buf_d.get16(d);  d += 2;
+      zigbee_devices.addEndointProfile(shortaddr, ep, ep_profile);
+
+      // in clusters
+      while (d < dev_record_len) {      // safe guard against overflow
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }   // end of block
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), false);
+      }
+      // out clusters
+      while (d < dev_record_len) {      // safe guard against overflow
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }   // end of block
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), true);
+      }
+    }
+    
+    // parse 3 strings
+    char empty[] = "";
+
+    // ManufID
+    uint32_t s_len = buf_d.strlen_s(d);
+    char *ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setModelId(shortaddr, ptr);
+    d += s_len + 1;
+
+    // ManufID
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setManufId(shortaddr, ptr);
+    d += s_len + 1;
+
+    // FriendlyName
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setFriendlyName(shortaddr, ptr);
+    d += s_len + 1;
+
+    // next iteration
+    k += dev_record_len;
+  }
+}
+
+void loadZigbeeDevices(void) {
+  z_flashdata_t flashdata;
+  memcpy_P(&flashdata, z_dev_start, sizeof(z_flashdata_t));
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "Zigbee signature in Flash: %08X - %d"), flashdata.name, flashdata.len);
+
+  // Check the signature
+  if ((flashdata.name == ZIGB_NAME) && (flashdata.len > 0)) {
+    uint16_t buf_len = flashdata.len;
+    // parse what seems to be a valid entry
+    SBuffer buf(buf_len);
+    buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
+    hidrateDevices(buf);
+  } else {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
+  }
+}
+
+void saveZigbeeDevices(void) {
+  SBuffer buf = hibernateDevices();
+  size_t buf_len = buf.len();
+  if (buf_len > Z_MAX_FLASH) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Buffer too big to fit in Flash (%d bytes)"), buf_len);
+    return;
+  }
+
+  // first copy SPI buffer into ram
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+  // copy the flash into RAM to make local change, and write back the whole buffer
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+  z_flashdata_t *flashdata = (z_flashdata_t*)(spi_buffer + z_block_offset);
+  flashdata->name = ZIGB_NAME;
+  flashdata->len = buf_len;
+  flashdata->reserved = 0;
+
+  memcpy(spi_buffer + z_block_offset + sizeof(z_flashdata_t), buf.getBuffer(), buf_len);
+
+  // buffer is now ready, write it back
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
+}
+
+// Erase the flash area containing the ZigbeeData
+void eraseZigbeeDevices(void) {
+  // first copy SPI buffer into ram
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+  // copy the flash into RAM to make local change, and write back the whole buffer
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+  // Fill the Zigbee area with 0xFF
+  memset(spi_buffer + z_block_offset, 0xFF, z_block_len);
+ 
+  // buffer is now ready, write it back
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (0x%08X - %d bytes)"), z_dev_start, z_block_len);
+}
+
+#endif // USE_ZIGBEE
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 58b055d2b..af691876e 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -830,10 +830,10 @@ int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject&
 
 // Publish a message for `"Occupancy":0` when the timer expired
 int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  // send Occupancy:false message
-  Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"0x%04X\":{\"" OCCUPANCY "\":0}}}"), shortaddr);
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-  XdrvRulesProcess();
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+  json[F(OCCUPANCY)] = 0;
+  zigbee_devices.jsonPublishNow(shortaddr, json);
 }
 
 // Aqara Cube
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 520dbd232..c32634f6b 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -354,7 +354,7 @@ static const Zigbee_Instruction zb_prog[] PROGMEM = {
     //ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "starting zigbee coordinator")
 ZI_SEND(ZBS_STARTUPFROMAPP)                       // start coordinator
     ZI_WAIT_RECV(2000, ZBR_STARTUPFROMAPP)        // wait for sync ack of command
-    ZI_WAIT_UNTIL(5000, AREQ_STARTUPFROMAPP)      // wait for async message that coordinator started
+    ZI_WAIT_UNTIL(10000, AREQ_STARTUPFROMAPP)      // wait for async message that coordinator started
     ZI_SEND(ZBS_GETDEVICEINFO)                    // GetDeviceInfo
     ZI_WAIT_RECV_FUNC(2000, ZBR_GETDEVICEINFO, &Z_ReceiveDeviceInfo)
     //ZI_WAIT_RECV(2000, ZBR_GETDEVICEINFO)         // memorize info
@@ -386,6 +386,7 @@ ZI_SEND(ZBS_STARTUPFROMAPP)                       // start coordinator
     ZI_MQTT_STATE(ZIGBEE_STATUS_OK, "Started")
     ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "Zigbee started")
     ZI_CALL(&Z_State_Ready, 1)                    // Now accept incoming messages
+    ZI_CALL(&Z_Load_Devices, 0)
   ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
     ZI_WAIT_FOREVER()
     ZI_GOTO(ZIGBEE_LABEL_READY)
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index d396b3fc4..90d272a00 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -403,7 +403,7 @@ int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpo
   // Post-provess for Aqara Presence Senson
   Z_AqaraOccupancy(shortaddr, cluster, endpoint, json);
 
-  zigbee_devices.jsonPublish(shortaddr);
+  zigbee_devices.jsonPublishFlush(shortaddr);
   return 1;
 }
 
@@ -433,8 +433,15 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
 
   DynamicJsonBuffer jsonBuffer;
   JsonObject& json_root = jsonBuffer.createObject();
+
   JsonObject& json1 = json_root.createNestedObject(F(D_CMND_ZIGBEE_RECEIVED));
-  JsonObject& json = json1.createNestedObject(shortaddr);
+
+  const String * fname = zigbee_devices.getFriendlyName(srcaddr);
+  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);    // should we replace shortaddr with friendlyname?
+  JsonObject& json = json1.createNestedObject(use_fname ? fname->c_str() : shortaddr);
+  if (use_fname) {
+    json[F(D_JSON_ZIGBEE_DEVICE)] = shortaddr;
+  }
 
   if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
     zcl_received.parseRawAttributes(json);
@@ -449,6 +456,11 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   json_root.printTo(msg);
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeZCLRawReceived: %s"), msg.c_str());
 
+  // Add friendly name
+  if ((!use_fname) && (fname)) {
+    json[F(D_JSON_ZIGBEE_NAME)] = (char*)fname->c_str();   // (char*) will force a copy of the string
+  }
+
   zcl_received.postProcessAttributes(srcaddr, json);
   // Add linkquality
   json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
@@ -457,7 +469,7 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
     // Prepare for publish
     if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
       // there is conflicting values, force a publish of the previous message now and don't coalesce
-      zigbee_devices.jsonPublish(srcaddr);
+      zigbee_devices.jsonPublishFlush(srcaddr);
     } else {
       zigbee_devices.jsonAppend(srcaddr, json);
       zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
@@ -511,6 +523,12 @@ int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
   }
 }
 
+int32_t Z_Load_Devices(uint8_t value) {
+  // try to hidrate from known devices
+  loadZigbeeDevices();
+  return 0;                              // continue
+}
+
 int32_t Z_State_Ready(uint8_t value) {
   zigbee.init_phase = false;             // initialization phase complete
   return 0;                              // continue
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 408410f9b..4464ab525 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -31,13 +31,15 @@ TasmotaSerial *ZigbeeSerial = nullptr;
 const char kZigbeeCommands[] PROGMEM = "|"
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME
   ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
   &CmndZigbeeZNPSend, &CmndZigbeePermitJoin,
   &CmndZigbeeStatus, &CmndZigbeeReset, &CmndZigbeeSend,
-  &CmndZigbeeProbe, &CmndZigbeeRead, &CmndZigbeeZNPReceive
+  &CmndZigbeeProbe, &CmndZigbeeRead, &CmndZigbeeZNPReceive,
+  &CmndZigbeeForget, &CmndZigbeeSave, &CmndZigbeeName
   };
 
 int32_t ZigbeeProcessInput(class SBuffer &buf) {
@@ -254,6 +256,7 @@ void CmndZigbeeReset(void) {
     switch (XdrvMailbox.payload) {
     case 1:
       ZigbeeZNPSend(ZIGBEE_FACTORY_RESET, sizeof(ZIGBEE_FACTORY_RESET));
+      eraseZigbeeDevices();
       restart_flag = 2;
       ResponseCmndChar(D_JSON_ZIGBEE_CC2530 " " D_JSON_RESET_AND_RESTARTING);
       break;
@@ -263,13 +266,6 @@ void CmndZigbeeReset(void) {
   }
 }
 
-void CmndZigbeeStatus(void) {
-  if (ZigbeeSerial) {
-    String dump = zigbee_devices.dump(XdrvMailbox.index, XdrvMailbox.payload);
-    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
-  }
-}
-
 void CmndZigbeeZNPSendOrReceive(bool send)
 {
   if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
@@ -548,20 +544,68 @@ void CmndZigbeeSend(void) {
 // Probe a specific device to get its endpoints and supported clusters
 void CmndZigbeeProbe(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 3) { ResponseCmndChar("Invalid destination"); return; }
-
-  // TODO, for now ignore friendly names
-  uint16_t shortaddr = strtoull(dataBufUc, nullptr, 0);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CmndZigbeeScan: short addr 0x%04X"), shortaddr);
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
 
   // everything is good, we can send the command
   Z_SendActiveEpReq(shortaddr);
   ResponseCmndDone();
 }
 
+// Specify, read or erase a Friendly Name
+void CmndZigbeeName(void) {
+  // Syntax is:
+  //  ZigbeeName <device_id>,<friendlyname>  - assign a friendly name
+  //  ZigbeeName <device_id>                 - display the current friendly name
+  //  ZigbeeName <device_id>,                - remove friendly name
+  //
+  // Where <device_id> can be: short_addr, long_addr, device_index, friendly_name
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+  // check if parameters contain a comma ','
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+
+  // parse first part, <device_id>
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);  // in case of short_addr, it must be already registered
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+  if (p == nullptr) {
+    const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
+    Response_P(PSTR("{\"0x%04X\":{\"name\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
+  } else {
+    zigbee_devices.setFriendlyName(shortaddr, p);
+    Response_P(PSTR("{\"0x%04X\":{\"name\":\"%s\"}}"), shortaddr, p);
+  }
+}
+
+// Remove an old Zigbee device from the list of known devices, use ZigbeeStatus to know all registered devices
+void CmndZigbeeForget(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+  // everything is good, we can send the command
+  if (zigbee_devices.removeDevice(shortaddr)) {
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Unknown device");
+  }
+}
+
+// Save Zigbee information to flash
+void CmndZigbeeSave(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+  saveZigbeeDevices();
+
+  ResponseCmndDone();
+}
+
 // Send an attribute read command to a device, specifying cluster and list of attributes
 void CmndZigbeeRead(void) {
   // ZigbeeRead {"Device":"0xF289","Cluster":0,"Endpoint":3,"Attr":5}
@@ -633,6 +677,20 @@ void CmndZigbeePermitJoin(void)
   ResponseCmndDone();
 }
 
+void CmndZigbeeStatus(void) {
+  if (ZigbeeSerial) {
+    if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+    uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+    if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+    if (XdrvMailbox.payload > 0) {
+      if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+    }
+    
+    String dump = zigbee_devices.dump(XdrvMailbox.index, shortaddr);
+    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
+  }
+}
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/

From 5716d08de9edbb839ba7651beef2c1a47ccbf29c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 18 Jan 2020 15:34:01 +0100
Subject: [PATCH 145/403] Refactor MQTT Logging and publish

---
 tasmota/support.ino         |  8 +++-
 tasmota/support_tasmota.ino |  6 +--
 tasmota/xdrv_02_mqtt.ino    | 78 +++++++++++++++----------------------
 3 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/tasmota/support.ino b/tasmota/support.ino
index a9a631fd1..9b8f5dc9d 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1631,8 +1631,12 @@ void AddLog(uint32_t loglevel)
     if (!web_log_index) web_log_index++;   // Index 0 is not allowed as it is the end of char string
   }
 #endif  // USE_WEBSERVER
-  if (!global_state.mqtt_down && (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
-  if (!global_state.wifi_down && (loglevel <= syslog_level)) { Syslog(); }
+  if (Settings.flag.mqtt_enabled &&        // SetOption3 - Enable MQTT
+      !global_state.mqtt_down &&
+      (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
+
+  if (!global_state.wifi_down &&
+      (loglevel <= syslog_level)) { Syslog(); }
 }
 
 void AddLog_P(uint32_t loglevel, const char *formatP)
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 1cb3aae8b..551f5b2c6 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -438,9 +438,9 @@ bool SendKey(uint32_t key, uint32_t device, uint32_t state)
 #ifdef USE_DOMOTICZ
     if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) {
 #endif  // USE_DOMOTICZ
-      MqttPublishDirect(stopic, ((key) ? Settings.flag.mqtt_switch_retain                         // CMND_SWITCHRETAIN
-                                       : Settings.flag.mqtt_button_retain) &&                     // CMND_BUTTONRETAIN
-                                       (state != POWER_HOLD || !Settings.flag3.no_hold_retain));  // SetOption62 - Don't use retain flag on HOLD messages
+      MqttPublish(stopic, ((key) ? Settings.flag.mqtt_switch_retain                         // CMND_SWITCHRETAIN
+                                 : Settings.flag.mqtt_button_retain) &&                     // CMND_BUTTONRETAIN
+                                 (state != POWER_HOLD || !Settings.flag3.no_hold_retain));  // SetOption62 - Don't use retain flag on HOLD messages
 #ifdef USE_DOMOTICZ
     }
 #endif  // USE_DOMOTICZ
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 799829fe6..d489606d4 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -221,6 +221,17 @@ void MqttUnsubscribeLib(const char *topic)
 
 bool MqttPublishLib(const char* topic, bool retained)
 {
+  // If Prefix1 equals Prefix2 disable next MQTT subscription to prevent loop
+  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
+    char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
+    if (str == topic) {
+      if (0 == mqtt_cmnd_publish) {
+        mqtt_cmnd_publish += 3;
+      }
+      mqtt_cmnd_publish += 3;
+    }
+  }
+
   bool result = MqttClient.publish(topic, mqtt_data, retained);
   yield();  // #3313
   return result;
@@ -291,43 +302,37 @@ void MqttUnsubscribe(const char *topic)
 
 void MqttPublishLogging(const char *mxtime)
 {
-  if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
-    if (MqttIsConnected()) {
+  if (MqttIsConnected()) {
+    char saved_mqtt_data[MESSZ];
+    memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
 
-      char saved_mqtt_data[MESSZ];
-      memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
-//      ResponseTime_P(PSTR(",\"Log\":{\"%s\"}}"), log_data);  // Will fail as some messages contain JSON
-      Response_P(PSTR("%s%s"), mxtime, log_data);            // No JSON and ugly!!
+//    ResponseTime_P(PSTR(",\"Log\":{\"%s\"}}"), log_data);  // Will fail as some messages contain JSON
+    Response_P(PSTR("%s%s"), mxtime, log_data);            // No JSON and ugly!!
 
-      char romram[33];
-      char stopic[TOPSZ];
-      snprintf_P(romram, sizeof(romram), PSTR("LOGGING"));
-      GetTopic_P(stopic, STAT, mqtt_topic, romram);
+    char stopic[TOPSZ];
+    GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
+    MqttPublishLib(stopic, false);
 
-      char *me;
-      if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-        me = strstr(stopic, SettingsText(SET_MQTTPREFIX1));
-        if (me == stopic) {
-          mqtt_cmnd_publish += 3;
-        }
-      }
-      MqttPublishLib(stopic, false);
-
-      memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
-    }
+    memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
   }
 }
 
-void MqttPublishDirect(const char* topic, bool retained)
+void MqttPublish(const char* topic, bool retained)
 {
-  char sretained[CMDSZ];
-  char slog_type[20];
-
 #ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("MqttPublishDirect"));
+  ShowFreeMem(PSTR("MqttPublish"));
 #endif
 
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  if (retained) {
+//    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("Retained are not supported by AWS IoT, using retained = false."));
+    retained = false;   // AWS IoT does not support retained, it will disconnect if received
+  }
+#endif
+
+  char sretained[CMDSZ];
   sretained[0] = '\0';
+  char slog_type[20];
   snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
 
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
@@ -354,25 +359,6 @@ void MqttPublishDirect(const char* topic, bool retained)
   }
 }
 
-void MqttPublish(const char* topic, bool retained)
-{
-  char *me;
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  if (retained) {
-    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("Retained are not supported by AWS IoT, using retained = false."));
-  }
-  retained = false;   // AWS IoT does not support retained, it will disconnect if received
-#endif
-
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-    me = strstr(topic, SettingsText(SET_MQTTPREFIX1));
-    if (me == topic) {
-      mqtt_cmnd_publish += 3;
-    }
-  }
-  MqttPublishDirect(topic, retained);
-}
-
 void MqttPublish(const char* topic)
 {
   MqttPublish(topic, false);
@@ -860,7 +846,7 @@ void CmndPublish(void)
       } else {
         mqtt_data[0] = '\0';
       }
-      MqttPublishDirect(stemp1, (XdrvMailbox.index == 2));
+      MqttPublish(stemp1, (XdrvMailbox.index == 2));
 //      ResponseCmndDone();
       mqtt_data[0] = '\0';
     }

From 45ed0257b68e485e6f5f9f90f61191a48b78dade Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 18 Jan 2020 16:57:48 +0100
Subject: [PATCH 146/403] Better support for Prefix1 equals Prefix2

---
 tasmota/support_command.ino |  3 ++-
 tasmota/support_tasmota.ino | 19 +++++++++++++------
 tasmota/tasmota.ino         |  3 ++-
 tasmota/xdrv_02_mqtt.ino    | 14 ++++----------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 6f70e7359..24ef2051c 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -338,7 +338,8 @@ void CmndStatus(void)
   char stemp2[TOPSZ];
 
   // Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2)) && (!payload)) { option++; }  // TELE
+  // Commented on 20200118 as it seems to be no longer needed
+//  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2)) && (!payload)) { option++; }  // TELE
 
   if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }  // SetOption3 - Enable MQTT
   if (!energy_flg && (9 == payload)) { payload = 99; }
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 551f5b2c6..9095a09bf 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -692,7 +692,12 @@ void MqttPublishSensor(void)
   }
 }
 
-/********************************************************************************************/
+/*********************************************************************************************\
+ * State loops
+\*********************************************************************************************/
+/*-------------------------------------------------------------------------------------------*\
+ * Every second
+\*-------------------------------------------------------------------------------------------*/
 
 void PerformEverySecond(void)
 {
@@ -715,6 +720,13 @@ void PerformEverySecond(void)
 #endif
   }
 
+  if (mqtt_cmnd_blocked_reset) {
+    mqtt_cmnd_blocked_reset--;
+    if (!mqtt_cmnd_blocked_reset) {
+      mqtt_cmnd_blocked = 0;             // Clean up MQTT cmnd loop block
+    }
+  }
+
   if (seriallog_timer) {
     seriallog_timer--;
     if (!seriallog_timer) {
@@ -763,9 +775,6 @@ void PerformEverySecond(void)
   }
 }
 
-/*********************************************************************************************\
- * State loops
-\*********************************************************************************************/
 /*-------------------------------------------------------------------------------------------*\
  * Every 0.1 second
 \*-------------------------------------------------------------------------------------------*/
@@ -822,8 +831,6 @@ void Every250mSeconds(void)
   state_250mS++;
   state_250mS &= 0x3;
 
-  if (mqtt_cmnd_publish) mqtt_cmnd_publish--;             // Clean up
-
   if (!Settings.flag.global_state) {                      // Problem blinkyblinky enabled - SetOption31 - Control link led blinking
     if (global_state.data) {                              // Any problem
       if (global_state.mqtt_down) { blinkinterval = 7; }  // MQTT problem so blink every 2 seconds (slowest)
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 721c2f4ac..15375e338 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -110,12 +110,13 @@ float global_temperature = 9999;            // Provide a global temperature to b
 float global_humidity = 0;                  // Provide a global humidity to be used by some sensors
 float global_pressure = 0;                  // Provide a global pressure to be used by some sensors
 uint16_t tele_period = 9999;                // Tele period timer
-uint16_t mqtt_cmnd_publish = 0;             // ignore flag for publish command
 uint16_t blink_counter = 0;                 // Number of blink cycles
 uint16_t seriallog_timer = 0;               // Timer to disable Seriallog
 uint16_t syslog_timer = 0;                  // Timer to re-enable syslog_level
 int16_t save_data_counter;                  // Counter and flag for config save to Flash
 RulesBitfield rules_flag;                   // Rule state flags (16 bits)
+uint8_t mqtt_cmnd_blocked = 0;              // Ignore flag for publish command
+uint8_t mqtt_cmnd_blocked_reset = 0;        // Count down to reset if needed
 uint8_t state_250mS = 0;                    // State 250msecond per second flag
 uint8_t latching_relay_pulse = 0;           // Latching relay pulse timer
 uint8_t sleep;                              // Current copy of Settings.sleep
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index d489606d4..a5d90f49a 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -225,10 +225,8 @@ bool MqttPublishLib(const char* topic, bool retained)
   if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
     char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
     if (str == topic) {
-      if (0 == mqtt_cmnd_publish) {
-        mqtt_cmnd_publish += 3;
-      }
-      mqtt_cmnd_publish += 3;
+      mqtt_cmnd_blocked_reset = 4;  // Allow up to four seconds before resetting residual cmnd blocks
+      mqtt_cmnd_blocked++;
     }
   }
 
@@ -249,12 +247,8 @@ void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len
   // Do not execute multiple times if Prefix1 equals Prefix2
   if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
     char *str = strstr(mqtt_topic, SettingsText(SET_MQTTPREFIX1));
-    if ((str == mqtt_topic) && mqtt_cmnd_publish) {
-      if (mqtt_cmnd_publish > 3) {
-        mqtt_cmnd_publish -= 3;
-      } else {
-        mqtt_cmnd_publish = 0;
-      }
+    if ((str == mqtt_topic) && mqtt_cmnd_blocked) {
+      mqtt_cmnd_blocked--;
       return;
     }
   }

From 6c837872102a400c84c017eb4ef30f0305c9f1cb Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 19 Jan 2020 12:22:40 +0100
Subject: [PATCH 147/403] Lower mqttlog stack usage

---
 tasmota/xdrv_02_mqtt.ino | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index a5d90f49a..49d1bf259 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -297,12 +297,11 @@ void MqttUnsubscribe(const char *topic)
 void MqttPublishLogging(const char *mxtime)
 {
   if (MqttIsConnected()) {
-    char saved_mqtt_data[MESSZ];
+    char saved_mqtt_data[strlen(mqtt_data) +1];
     memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
 
 //    ResponseTime_P(PSTR(",\"Log\":{\"%s\"}}"), log_data);  // Will fail as some messages contain JSON
     Response_P(PSTR("%s%s"), mxtime, log_data);            // No JSON and ugly!!
-
     char stopic[TOPSZ];
     GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
     MqttPublishLib(stopic, false);

From 6d5b0ed62237fc32aad8b95e85dd31d574a8d184 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 19 Jan 2020 14:12:25 +0100
Subject: [PATCH 148/403] Remove redundant code

---
 tasmota/xdrv_02_mqtt.ino | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 49d1bf259..38bae9a01 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -296,18 +296,16 @@ void MqttUnsubscribe(const char *topic)
 
 void MqttPublishLogging(const char *mxtime)
 {
-  if (MqttIsConnected()) {
-    char saved_mqtt_data[strlen(mqtt_data) +1];
-    memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
+  char saved_mqtt_data[strlen(mqtt_data) +1];
+  memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
 
 //    ResponseTime_P(PSTR(",\"Log\":{\"%s\"}}"), log_data);  // Will fail as some messages contain JSON
-    Response_P(PSTR("%s%s"), mxtime, log_data);            // No JSON and ugly!!
-    char stopic[TOPSZ];
-    GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
-    MqttPublishLib(stopic, false);
+  Response_P(PSTR("%s%s"), mxtime, log_data);            // No JSON and ugly!!
+  char stopic[TOPSZ];
+  GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
+  MqttPublishLib(stopic, false);
 
-    memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
-  }
+  memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
 }
 
 void MqttPublish(const char* topic, bool retained)
@@ -317,10 +315,10 @@ void MqttPublish(const char* topic, bool retained)
 #endif
 
 #if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  if (retained) {
+//  if (retained) {
 //    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("Retained are not supported by AWS IoT, using retained = false."));
-    retained = false;   // AWS IoT does not support retained, it will disconnect if received
-  }
+//  }
+  retained = false;   // AWS IoT does not support retained, it will disconnect if received
 #endif
 
   char sretained[CMDSZ];
@@ -329,12 +327,10 @@ void MqttPublish(const char* topic, bool retained)
   snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
 
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
-    if (MqttIsConnected()) {
-      if (MqttPublishLib(topic, retained)) {
-        snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
-        if (retained) {
-          snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
-        }
+    if (MqttPublishLib(topic, retained)) {
+      snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
+      if (retained) {
+        snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
       }
     }
   }

From e03a14ce21a75db208cf7c4741699b41ba349c56 Mon Sep 17 00:00:00 2001
From: Leonid Muravjev <asm@asm.pp.ru>
Date: Sun, 19 Jan 2020 16:15:18 +0300
Subject: [PATCH 149/403] i2c: I2cSetDevice wrong behavior

Most drivers do not expect address blocking after calling i2cSetDevice.
I2cSetActive removed from I2cSetDevice. All drivers waiting for this call are fixed.

refs #7556
---
 tasmota/support.ino          | 6 +-----
 tasmota/xdrv_10_scripter.ino | 1 +
 tasmota/xdsp_08_ILI9488.ino  | 1 +
 tasmota/xdsp_10_RA8876.ino   | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tasmota/support.ino b/tasmota/support.ino
index 9b8f5dc9d..94def5a6f 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1521,11 +1521,7 @@ bool I2cSetDevice(uint32_t addr)
     return false;       // If already active report as not present;
   }
   Wire.beginTransmission((uint8_t)addr);
-  bool result = (0 == Wire.endTransmission());
-  if (result) {
-    I2cSetActive(addr, 1);
-  }
-  return result;
+  return (0 == Wire.endTransmission());
 }
 #endif  // USE_I2C
 
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index 17ef36177..09406e810 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -4775,6 +4775,7 @@ bool Xdrv10(uint8_t function)
           glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
 
           glob_script_mem.flags=1;
+          I2cSetActiveFound(EEPROM_ADDRESS, "EEPROM");
         }
       }
 #endif
diff --git a/tasmota/xdsp_08_ILI9488.ino b/tasmota/xdsp_08_ILI9488.ino
index 8b7438c5a..84a493fc6 100644
--- a/tasmota/xdsp_08_ILI9488.ino
+++ b/tasmota/xdsp_08_ILI9488.ino
@@ -116,6 +116,7 @@ void ILI9488_InitDriver()
     if (I2cEnabled(XI2C_38) && I2cSetDevice(FT6236_address)) {
       FT6236begin(FT6236_address);
       FT6236_found=1;
+      I2cSetActiveFound(FT6236_address, "FT6236");
     } else {
       FT6236_found=0;
     }
diff --git a/tasmota/xdsp_10_RA8876.ino b/tasmota/xdsp_10_RA8876.ino
index 139a654ed..88f3ebad2 100644
--- a/tasmota/xdsp_10_RA8876.ino
+++ b/tasmota/xdsp_10_RA8876.ino
@@ -101,6 +101,7 @@ void RA8876_InitDriver()
     if (I2cEnabled(XI2C_39) && I2cSetDevice(FT5316_address)) {
       FT6236begin(FT5316_address);
       FT5316_found=1;
+      I2cSetActiveFound(FT5316_address, "FT5316");
     } else {
       FT5316_found=0;
     }

From 79fdc265b7b6500e30b9905c479b28a5af0b4496 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 19 Jan 2020 22:59:02 +0100
Subject: [PATCH 150/403] Minor fixes to Zigbee friendly names

---
 tasmota/xdrv_23_zigbee_3_devices.ino      | 29 ++++++++++++++++++-----
 tasmota/xdrv_23_zigbee_7_statemachine.ino |  1 -
 tasmota/xdrv_23_zigbee_8_parsers.ino      | 26 ++++----------------
 tasmota/xdrv_23_zigbee_9_impl.ino         |  4 ++--
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 97c995aaf..e034868e6 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -624,6 +624,16 @@ void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
   if (nullptr == device.json) {
     device.json = &(device.json_buffer->createObject());
   }
+  // Prepend Device, will be removed later if redundant
+  char sa[8];
+  snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
+  device.json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
+  // Prepend Friendly Name if it has one
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  if (fname) {
+    device.json->set(F(D_JSON_ZIGBEE_NAME), (char*)fname->c_str());   // (char*) forces ArduinoJson to make a copy of the cstring
+  }
+
   // copy all values from 'values' to 'json'
   CopyJsonObject(*device.json, values);
 }
@@ -643,13 +653,20 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
   const String * fname = zigbee_devices.getFriendlyName(shortaddr);
   bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);    // should we replace shortaddr with friendlyname?
 
+  // if (use_fname) {
+  //   // we need to add the Device short_addr inside the JSON
+  //   char sa[8];
+  //   snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
+  //   json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
+  // } else if (fname) {
+  //   json->set(F(D_JSON_NAME), (char*) fname);
+  // }
+
+  // Remove redundant "Name" or "Device"
   if (use_fname) {
-    // we need to add the Device short_addr inside the JSON
-    char sa[8];
-    snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
-    json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
-  } else if (fname) {
-    json->set(F(D_JSON_NAME), (char*) fname);
+    json->remove(F(D_JSON_ZIGBEE_NAME));
+  } else {
+    json->remove(F(D_JSON_ZIGBEE_DEVICE));
   }
 
   String msg = "";
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index c32634f6b..1e683d059 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -32,7 +32,6 @@ const uint8_t  ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;      // Device announces its
 const uint8_t  ZIGBEE_STATUS_NODE_DESC = 31;            // Node descriptor
 const uint8_t  ZIGBEE_STATUS_ACTIVE_EP = 32;            // Endpoints descriptor
 const uint8_t  ZIGBEE_STATUS_SIMPLE_DESC = 33;          // Simple Descriptor (clusters)
-const uint8_t  ZIGBEE_STATUS_DEVICE_INDICATION = 34;      // Device announces its address
 const uint8_t  ZIGBEE_STATUS_CC_VERSION = 50;           // Status: CC2530 ZNP Version
 const uint8_t  ZIGBEE_STATUS_CC_INFO = 51;              // Status: CC2530 Device Configuration
 const uint8_t  ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;  // Unsupported ZNP version
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 90d272a00..26185fd6c 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -432,16 +432,7 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%04X"), srcaddr);
 
   DynamicJsonBuffer jsonBuffer;
-  JsonObject& json_root = jsonBuffer.createObject();
-
-  JsonObject& json1 = json_root.createNestedObject(F(D_CMND_ZIGBEE_RECEIVED));
-
-  const String * fname = zigbee_devices.getFriendlyName(srcaddr);
-  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);    // should we replace shortaddr with friendlyname?
-  JsonObject& json = json1.createNestedObject(use_fname ? fname->c_str() : shortaddr);
-  if (use_fname) {
-    json[F(D_JSON_ZIGBEE_DEVICE)] = shortaddr;
-  }
+  JsonObject& json = jsonBuffer.createObject();
 
   if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
     zcl_received.parseRawAttributes(json);
@@ -453,13 +444,8 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   }
   String msg("");
   msg.reserve(100);
-  json_root.printTo(msg);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeZCLRawReceived: %s"), msg.c_str());
-
-  // Add friendly name
-  if ((!use_fname) && (fname)) {
-    json[F(D_JSON_ZIGBEE_NAME)] = (char*)fname->c_str();   // (char*) will force a copy of the string
-  }
+  json.printTo(msg);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZigbeeZCLRawReceived: {\"0x%04X\":%s}"), srcaddr, msg.c_str());
 
   zcl_received.postProcessAttributes(srcaddr, json);
   // Add linkquality
@@ -476,11 +462,7 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
     }
   } else {
     // Publish immediately
-    msg = "";
-    json_root.printTo(msg);
-    Response_P(PSTR("%s"), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
+    zigbee_devices.jsonPublishNow(srcaddr, json);
   }
   return -1;
 }
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 4464ab525..da73f9db7 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -575,10 +575,10 @@ void CmndZigbeeName(void) {
 
   if (p == nullptr) {
     const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
-    Response_P(PSTR("{\"0x%04X\":{\"name\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
   } else {
     zigbee_devices.setFriendlyName(shortaddr, p);
-    Response_P(PSTR("{\"0x%04X\":{\"name\":\"%s\"}}"), shortaddr, p);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, p);
   }
 }
 

From 58a50cec8cec731db838cfda81b41410c3cfc6a0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 20 Jan 2020 10:05:12 +0100
Subject: [PATCH 151/403] Fix Zigbee compile error

---
 tasmota/xdrv_23_zigbee_7_statemachine.ino | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 1e683d059..683375bf1 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -32,6 +32,7 @@ const uint8_t  ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;      // Device announces its
 const uint8_t  ZIGBEE_STATUS_NODE_DESC = 31;            // Node descriptor
 const uint8_t  ZIGBEE_STATUS_ACTIVE_EP = 32;            // Endpoints descriptor
 const uint8_t  ZIGBEE_STATUS_SIMPLE_DESC = 33;          // Simple Descriptor (clusters)
+const uint8_t  ZIGBEE_STATUS_DEVICE_INDICATION = 34;    // Device announces its address
 const uint8_t  ZIGBEE_STATUS_CC_VERSION = 50;           // Status: CC2530 ZNP Version
 const uint8_t  ZIGBEE_STATUS_CC_INFO = 51;              // Status: CC2530 Device Configuration
 const uint8_t  ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;  // Unsupported ZNP version

From e01c1b8c458671378867b90571d1269ab6a9dd7c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:49:57 +0100
Subject: [PATCH 152/403] Add compile time control over SetOptions

---
 tasmota/my_user_config.h | 79 ++++++++++++++++++++++++++++++++++------
 tasmota/settings.ino     | 66 +++++++++++++++++++++++++--------
 2 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index f22023f6a..692320333 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -53,7 +53,7 @@
 //#define MODULE                 SONOFF_BASIC      // [Module] Select default model from tasmota_template.h
 
 #define SAVE_DATA              1                 // [SaveData] Save changed parameters to Flash (0 = disable, 1 - 3600 seconds)
-#define SAVE_STATE             1                 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable)
+#define SAVE_STATE             true              // [SetOption0] Save changed power state to Flash (false = disable, true = enable)
 #define BOOT_LOOP_OFFSET       1                 // [SetOption36] Number of boot loops before starting restoring defaults (0 = disable, 1..200 = boot loops offset)
 
 // -- Wifi ----------------------------------------
@@ -69,6 +69,8 @@
 #define WIFI_CONFIG_TOOL       WIFI_RETRY        // [WifiConfig] Default tool if wifi fails to connect (default option: 4 - WIFI_RETRY)
                                                  // (WIFI_RESTART, WIFI_MANAGER, WIFI_RETRY, WIFI_WAIT, WIFI_SERIAL, WIFI_MANAGER_RESET_ONLY)
                                                  // The configuration can be changed after first setup using WifiConfig 0, 2, 4, 5, 6 and 7.
+#define WIFI_SCAN_AT_RESTART   false             // [SetOption56] Scan wifi network at restart for configured AP's
+#define WIFI_SCAN_REGULARLY    false             // [SetOption57] Scan wifi network every 44 minutes for configured AP's
 
 // -- Syslog --------------------------------------
 #define SYS_LOG_HOST           ""                // [LogHost] (Linux) syslog host
@@ -80,9 +82,10 @@
 
 // -- Ota -----------------------------------------
 #define OTA_URL                "http://thehackbox.org/tasmota/release/tasmota.bin"  // [OtaUrl]
+#define OTA_COMPATIBILITY      false             // [SetOption78] Disable OTA compatibility check
 
 // -- MQTT ----------------------------------------
-#define MQTT_USE               1                 // [SetOption3] Select default MQTT use (0 = Off, 1 = On)
+#define MQTT_USE               true              // [SetOption3] Select default MQTT use (false = Off, true = On)
 
 #define MQTT_HOST              ""                // [MqttHost]
 #define MQTT_FINGERPRINT1      "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"  // [MqttFingerprint1]
@@ -91,10 +94,10 @@
 #define MQTT_USER              "DVES_USER"       // [MqttUser] MQTT user
 #define MQTT_PASS              "DVES_PASS"       // [MqttPassword] MQTT password
 
-#define MQTT_BUTTON_RETAIN     0                 // [ButtonRetain] Button may send retain flag (0 = off, 1 = on)
-#define MQTT_POWER_RETAIN      0                 // [PowerRetain] Power status message may send retain flag (0 = off, 1 = on)
-#define MQTT_SWITCH_RETAIN     0                 // [SwitchRetain] Switch may send retain flag (0 = off, 1 = on)
-#define MQTT_BUTTON_SWITCH_FORCE_LOCAL     0     // [SetOption61] Force local operation when button/switch topic is set (0 = off, 1 = on)
+#define MQTT_BUTTON_RETAIN     false             // [ButtonRetain] Button may send retain flag (false = off, true = on)
+#define MQTT_POWER_RETAIN      false             // [PowerRetain] Power status message may send retain flag (false = off, true = on)
+#define MQTT_SWITCH_RETAIN     false             // [SwitchRetain] Switch may send retain flag (false = off, true = on)
+#define MQTT_BUTTON_SWITCH_FORCE_LOCAL   false   // [SetOption61] Force local operation when button/switch topic is set (false = off, true = on)
 
 #define MQTT_STATUS_OFF        "OFF"             // [StateText1] Command or Status result when turned off (needs to be a string like "0" or "Off")
 #define MQTT_STATUS_ON         "ON"              // [StateText2] Command or Status result when turned on (needs to be a string like "1" or "On")
@@ -113,19 +116,30 @@
 // %topic% token options (also ButtonTopic and SwitchTopic)
 #define MQTT_TOPIC             PROJECT           // [Topic] (unique) MQTT device topic, set to 'PROJECT "_%06X"' for unique topic including device MAC address
 #define MQTT_GRPTOPIC          "tasmotas"        // [GroupTopic] MQTT Group topic
+#define MQTT_GROUPTOPIC_FORMAT false             // [SetOption75] GroupTopic replaces %topic% (false) or fixed topic cmnd/grouptopic (true)
 #define MQTT_BUTTON_TOPIC      "0"               // [ButtonTopic] MQTT button topic, "0" = same as MQTT_TOPIC, set to 'PROJECT "_BTN_%06X"' for unique topic including device MAC address
 #define MQTT_SWITCH_TOPIC      "0"               // [SwitchTopic] MQTT button topic, "0" = same as MQTT_TOPIC, set to 'PROJECT "_SW_%06X"' for unique topic including device MAC address
 #define MQTT_CLIENT_ID         "DVES_%06X"       // [MqttClient] Also fall back topic using Chip Id = last 6 characters of MAC address
 
 // -- MQTT - Telemetry ----------------------------
 #define TELE_PERIOD            300               // [TelePeriod] Telemetry (0 = disable, 10 - 3600 seconds)
-#define TELE_ON_POWER          0                 // [SetOption59] send tele/STATE together with stat/RESULT (0 = Disable, 1 = Enable)
+#define TELE_ON_POWER          false             // [SetOption59] send tele/STATE together with stat/RESULT (false = Disable, true = Enable)
 
 // -- MQTT - Domoticz -----------------------------
 #define DOMOTICZ_UPDATE_TIMER  0                 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds)
 
 // -- MQTT - Home Assistant Discovery -------------
-#define HOME_ASSISTANT_DISCOVERY_ENABLE   0      // [SetOption19] Home Assistant Discovery (0 = Disable, 1 = Enable)
+#define HOME_ASSISTANT_DISCOVERY_ENABLE   false  // [SetOption19] Home Assistant Discovery (false = Disable, true = Enable)
+#define HASS_AS_LIGHT          false             // [SetOption30] Enforce HAss autodiscovery as light
+
+// -- MQTT - Options ------------------------------
+#define MQTT_RESULT_COMMAND    false             // [SetOption4]  Switch between MQTT RESULT or COMMAND
+#define MQTT_LWT_MESSAGE       false             // [SetOption10] Switch between MQTT LWT OFFLINE or empty message
+#define MQTT_POWER_FORMAT      false             // [SetOption26] Switch between POWER or POWER1 for single power devices
+#define MQTT_APPEND_TIMEZONE   false             // [SetOption52] Append timezone to JSON time
+#define MQTT_NO_HOLD_RETAIN    false             // [SetOption62] Disable retain flag on HOLD messages
+#define MQTT_INDEX_SEPARATOR   false             // [SetOption64] Enable "_" instead of "-" as sensor index separator
+#define MQTT_TUYA_RECEIVED     false             // [SetOption66] Enable TuyaMcuReceived messages over Mqtt
 
 // -- HTTP ----------------------------------------
 #define WEB_SERVER             2                 // [WebServer] Web server (0 = Off, 1 = Start as User, 2 = Start as Admin)
@@ -134,6 +148,9 @@
 #define EMULATION              EMUL_NONE         // [Emulation] Select Belkin WeMo (single relay/light) or Hue Bridge emulation (multi relay/light) (EMUL_NONE, EMUL_WEMO or EMUL_HUE)
 #define CORS_DOMAIN            ""                // [Cors] CORS Domain for preflight requests
 
+// -- HTTP Options --------------------------------
+#define GUI_SHOW_HOSTNAME      false             // [SetOption53] Show hostname and IP address in GUI main menu
+
 // -- HTTP GUI Colors -----------------------------
 // HTML hex color codes. Only 3 and 6 digit hex string values are supported!! See https://www.w3schools.com/colors/colors_hex.asp
 // Light theme - pre v7
@@ -182,7 +199,7 @@
 #define COLOR_TITLE_TEXT            "#eaeaea"    // [WebColor19] Title text color - Very light gray
 
 // -- mDNS ----------------------------------------
-#define MDNS_ENABLED           0                 // [SetOption55] Use mDNS (0 = Disable, 1 = Enable)
+#define MDNS_ENABLED           false             // [SetOption55] Use mDNS (false = Disable, true = Enable)
 
 // -- Time - Up to three NTP servers in your region
 #define NTP_SERVER1            "pool.ntp.org"       // [NtpServer1] Select first NTP server by name or IP address (129.250.35.250)
@@ -214,28 +231,68 @@
 #define APP_LEDSTATE           LED_POWER         // [LedState] Function of led
                                                  //   (LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT)
 #define APP_LEDMASK            0xFFFF            // [LedMask] Assign Relay to Power led (0xFFFF is default)
+#define APP_ENABLE_LEDLINK     false             // [SetOption31] Enable link led blinking
+
 #define APP_PULSETIME          0                 // [PulseTime] Time in 0.1 Sec to turn off power for relay 1 (0 = disabled)
 #define APP_POWERON_STATE      POWER_ALL_SAVED   // [PowerOnState] Power On Relay state
                                                  //   (POWER_ALL_OFF, POWER_ALL_ON, POWER_ALL_SAVED_TOGGLE, POWER_ALL_SAVED, POWER_ALL_ALWAYS_ON, POWER_ALL_OFF_PULSETIME_ON)
 #define APP_BLINKTIME          10                // [BlinkTime] Time in 0.1 Sec to blink/toggle power for relay 1
 #define APP_BLINKCOUNT         10                // [BlinkCount] Number of blinks (0 = 32000)
+
+#define APP_NORMAL_SLEEP       false             // [SetOption60] Enable normal sleep instead of dynamic sleep
 #define APP_SLEEP              0                 // [Sleep] Sleep time to lower energy consumption (0 = Off, 1 - 250 mSec),
 #define PWM_MAX_SLEEP          10                // Sleep will be lowered to this value when light is on, to avoid flickering
 
 #define KEY_DEBOUNCE_TIME      50                // [ButtonDebounce] Number of mSeconds button press debounce time
 #define KEY_HOLD_TIME          40                // [SetOption32] Number of 0.1 seconds to hold Button or external Pushbutton before sending HOLD message
+#define KEY_DISABLE_MULTIPRESS false             // [SetOption1]  Disable button multipress
+#define KEY_SWAP_DOUBLE_PRESS  false             // [SetOption11] Swap button single and double press functionality
+#define KEY_ONLY_SINGLE_PRESS  false             // [SetOption13] Enable only single press to speed up button press recognition
+
 #define SWITCH_DEBOUNCE_TIME   50                // [SwitchDebounce] Number of mSeconds switch press debounce time
 #define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV (the wall switch state)
 #define WS2812_LEDS            30                // [Pixels] Number of WS2812 LEDs to start with (max is 512)
 
-#define TEMP_CONVERSION        0                 // [SetOption8] Return temperature in (0 = Celsius or 1 = Fahrenheit)
-#define PRESSURE_CONVERSION    0                 // [SetOption24] Return pressure in (0 = hPa or 1 = mmHg)
+#define TEMP_CONVERSION        false             // [SetOption8] Return temperature in (false = Celsius or true = Fahrenheit)
+#define PRESSURE_CONVERSION    false             // [SetOption24] Return pressure in (false = hPa or true = mmHg)
 #define TEMP_RESOLUTION        1                 // [TempRes] Maximum number of decimals (0 - 3) showing sensor Temperature
 #define HUMIDITY_RESOLUTION    1                 // [HumRes] Maximum number of decimals (0 - 3) showing sensor Humidity
 #define PRESSURE_RESOLUTION    1                 // [PressRes] Maximum number of decimals (0 - 3) showing sensor Pressure
 #define ENERGY_RESOLUTION      3                 // [EnergyRes] Maximum number of decimals (0 - 5) showing energy usage in kWh
 #define CALC_RESOLUTION        3                 // [CalcRes] Maximum number of decimals (0 - 7) used in commands ADD, SUB, MULT and SCALE
 
+#define APP_FLASH_CYCLE        false             // [SetOption12] Switch between dynamic or fixed slot flash save location
+#define APP_NO_RELAY_SCAN      false             // [SetOption63] Don't scan relay power state at restart
+#define APP_DISABLE_POWERCYCLE false             // [SetOption65] Disable fast power cycle detection for device reset
+#define DEEPSLEEP_BOOTCOUNT    false            // [SetOption76] Enable incrementing bootcount when deepsleep is enabled
+
+// -- Lights --------------------------------------
+#define LIGHT_MODE             true              // [SetOption15] Switch between commands PWM or COLOR/DIMMER/CT/CHANNEL
+#define LIGHT_CLOCK_DIRECTION  false             // [SetOption16] Switch WS2812 clock between clockwise or counter-clockwise
+#define LIGHT_COLOR_RADIX      false             // [SetOption17] Switch between decimal or hexadecimal color output (false = hexadecimal, true = decimal)
+#define LIGHT_PAIRS_CO2        false             // [SetOption18] Enable Pair light signal with CO2 sensor
+#define LIGHT_POWER_CONTROL    false             // [SetOption20] Enable power control in relation to Dimmer/Color/Ct changes
+#define LIGHT_CHANNEL_MODE     false             // [SetOption68] Enable multi-channels PWM instead of Color PWM
+#define LIGHT_SLIDER_POWER     false             // [SetOption77] Do not power off if slider moved to far left
+#define LIGHT_ALEXA_CT_RANGE   false             // [SetOption82] Reduced CT range for Alexa
+
+// -- Energy --------------------------------------
+#define ENERGY_VOLTAGE_ALWAYS  false             // [SetOption21] Enable show voltage even if powered off
+#define ENERGY_DDS2382_MODE    false             // [SetOption71] Enable DDS2382 different Modbus registers for Active Energy (#6531)
+#define ENERGY_HARDWARE_TOTALS  false             // [SetOption72] Enable hardware energy total counter as reference (#6561)
+
+// -- Other Options -------------------------------
+#define RF_DATA_RADIX          false             // [SetOption28] RF receive data format (false = hexadecimal, true = decimal)
+#define IR_DATA_RADIX          false             // [SetOption29] IR receive data format (false = hexadecimal, true = decimal)
+#define TUYA_SETOPTION_20      false             // [SetOption54] Apply SetOption20 settings to Tuya device
+#define IR_ADD_RAW_DATA        false             // [SetOption58] Add IR Raw data to JSON message
+#define BUZZER_ENABLE          false             // [SetOption67] Enable buzzer when available
+#define DS18X20_PULL_UP        false             // [SetOption74] Enable internal pullup for single DS18x20 sensor
+#define COUNTER_RESET          false             // [SetOption79] Enable resetting of counters after telemetry was sent
+#define SHUTTER_SUPPORT        false             // [SetOption80] Enable shutter support
+#define PCF8574_INVERT_PORTS   false             // [SetOption81] Invert all ports on PCF8574 devices
+#define ZIGBEE_FRIENDLY_NAMES  false             // [SetOption83] Enable Zigbee FriendlyNames instead of ShortAddresses when possible
+
 /*********************************************************************************************\
  * END OF SECTION 1
  *
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index a059b71e6..93c323e32 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -782,8 +782,13 @@ void SettingsDefaultSet2(void)
 {
   memset((char*)&Settings +16, 0x00, sizeof(SYSCFG) -16);
 
-//  Settings.flag.value_units = 0;
-//  Settings.flag.stop_flash_rotate = 0;
+  Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
+  Settings.flag.global_state = APP_ENABLE_LEDLINK;
+  Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
+  Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
+  Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
+  Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
+  Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
   Settings.save_data = SAVE_DATA;
   Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
   Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;  // SetOption36
@@ -824,6 +829,8 @@ void SettingsDefaultSet2(void)
   Settings.seriallog_level = SERIAL_LOG_LEVEL;
 
   // Wifi
+  Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
+  Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
   Settings.wifi_output_power = 170;
   ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
   ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
@@ -844,16 +851,17 @@ void SettingsDefaultSet2(void)
 
   // Webserver
   Settings.flag2.emulation = EMULATION;
+  Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
+  Settings.flag3.mdns_enabled = MDNS_ENABLED;
   Settings.webserver = WEB_SERVER;
   Settings.weblog_level = WEB_LOG_LEVEL;
   SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
-  Settings.flag3.mdns_enabled = MDNS_ENABLED;
   SettingsUpdateText(SET_CORS, CORS_DOMAIN);
 
   // Button
-//  Settings.flag.button_restrict = 0;
-//  Settings.flag.button_swap = 0;
-//  Settings.flag.button_single = 0;
+  Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
+  Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
+  Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
   Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME;  // Default 4 seconds hold time
 
   // Switch
@@ -861,16 +869,19 @@ void SettingsDefaultSet2(void)
 
   // MQTT
   Settings.flag.mqtt_enabled = MQTT_USE;
-//  Settings.flag.mqtt_response = 0;
+  Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
+  Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
   Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
   Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
   Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
-  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
-  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
 //  Settings.flag.mqtt_sensor_retain = 0;
-//  Settings.flag.mqtt_offline = 0;
 //  Settings.flag.mqtt_serial = 0;
-//  Settings.flag.device_index_enable = 0;
+  Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
+  Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
+  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
+  Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
+  Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
+  Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
   SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
   Settings.mqtt_port = MQTT_PORT;
   SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
@@ -904,10 +915,13 @@ void SettingsDefaultSet2(void)
   Settings.mqttlog_level = MQTT_LOG_LEVEL;
 
   // Energy
+  Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
   Settings.flag2.current_resolution = 3;
 //  Settings.flag2.voltage_resolution = 0;
 //  Settings.flag2.wattage_resolution = 0;
   Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
+  Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
+  Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
   Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
 //  Settings.energy_power_delta = 0;
   Settings.energy_power_calibration = HLW_PREF_PULSE;
@@ -937,9 +951,12 @@ void SettingsDefaultSet2(void)
   Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
 
   // IRRemote
+  Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
+  Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
   Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
 
   // RF Bridge
+  Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
 //  for (uint32_t i = 0; i < 17; i++) { Settings.rf_code[i][0] = 0; }
   memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
 
@@ -960,6 +977,8 @@ void SettingsDefaultSet2(void)
   Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
   Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
   Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
+  Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
+  Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
 //  Settings.altitude = 0;
 
   // Rules
@@ -969,18 +988,24 @@ void SettingsDefaultSet2(void)
   Settings.flag2.calc_resolution = CALC_RESOLUTION;
 
   // Home Assistant
+  Settings.flag.hass_light = HASS_AS_LIGHT;
   Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
+  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
 
   // Knx
 //  Settings.flag.knx_enabled = 0;
 //  Settings.flag.knx_enable_enhancement = 0;
 
   // Light
-  Settings.flag.pwm_control = 1;
-  //Settings.flag.ws_clock_reverse = 0;
-  //Settings.flag.light_signal = 0;
-  //Settings.flag.not_power_linked = 0;
-  //Settings.flag.decimal_text = 0;
+  Settings.flag.pwm_control = LIGHT_MODE;
+  Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
+  Settings.flag.light_signal = LIGHT_PAIRS_CO2;
+  Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
+  Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
+  Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
+  Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
+  Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
+
   Settings.pwm_frequency = PWM_FREQ;
   Settings.pwm_range = PWM_RANGE;
   for (uint32_t i = 0; i < MAX_PWMS; i++) {
@@ -1064,6 +1089,15 @@ void SettingsDefaultSet2(void)
 
   memset(&Settings.monitors, 0xFF, 20);  // Enable all possible monitors, displays and sensors
   SettingsEnableAllI2cDrivers();
+
+  // Tuya
+  Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
+  Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
+
+  Settings.flag3.buzzer_enable = BUZZER_ENABLE;
+  Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
+  Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
+  Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
 }
 
 /********************************************************************************************/

From 6d36f366595d9f451cf6962bc506001a47004a34 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Mon, 20 Jan 2020 19:44:55 +0100
Subject: [PATCH 153/403] add support for LYWSD02

---
 tasmota/xsns_61_MI_BLE.ino | 103 +++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_61_MI_BLE.ino b/tasmota/xsns_61_MI_BLE.ino
index 88983e533..c07323684 100644
--- a/tasmota/xsns_61_MI_BLE.ino
+++ b/tasmota/xsns_61_MI_BLE.ino
@@ -21,6 +21,8 @@
   Version yyyymmdd  Action    Description
   --------------------------------------------------------------------------------------------
 
+
+  0.9.1.0 20200117  integrate - Added support for the LYWSD02
   ---
   0.9.0.0 20191127  started - further development by Christian Baars
                     base    - code base from cbm80amiga, floe, Dmitry.GR
@@ -52,7 +54,7 @@
 
 const char MIBLESlaveFlora[] PROGMEM = "Flora";
 const char MIBLESlaveMJ_HT_V1[] PROGMEM = "MJ_HT_V1";
-
+const char MIBLESlaveLYWSD02[] PROGMEM = "LYWSD02";
 
 #pragma pack(1)  // important!!
 struct MJ_HT_V1Header_t {// related to the payload
@@ -148,6 +150,19 @@ union MJ_HT_V1Packet_t {    // related to the whole 32-byte-packet/buffer
   // We do NOT need the isolated T and H packet
 };
 
+union LYWSD02Packet_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } TH;    // mode 04 or 06
+};
+
 struct bleAdvPacket_t { // for nRF24L01 max 32 bytes = 2+6+24
   uint8_t pduType;
   uint8_t payloadSize;
@@ -205,6 +220,7 @@ union FIFO_t{
   bleAdvPacket_t bleAdv;
   floraPacket_t floraPacket;
   MJ_HT_V1Packet_t MJ_HT_V1Packet;
+  LYWSD02Packet_t LYWSD02Packet;
   uint8_t raw[32];
 };
 
@@ -227,7 +243,7 @@ struct {
 } MIBLE;
 
 struct mi_sensor_t{
-  uint8_t type; //flora = 1; MI-HT_V1=2
+  uint8_t type; //flora = 1; MI-HT_V1=2; LYWSD02=3
   uint8_t serial[6];
   uint8_t showedUp;
   union {
@@ -242,6 +258,10 @@ struct mi_sensor_t{
       float hum;
       uint8_t bat;
     } MJ_HT_V1;
+    struct {
+      float temp;
+      float hum;
+    } LYWSD02;
   };
 };
 
@@ -312,6 +332,9 @@ bool MIBLEreceivePacket(void)
       case 2:
       MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x72); // "MJ_HT_V1" mode 0x72
       break;
+      case 3:
+      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x17); // "LYWSD02" mode 0x17
+      break;
     }
     // DEBUG_SENSOR_LOG(PSTR("MIBLE: LSFR:%x"),_lsfr);
     // if (_lsfr>254) _lsfr=0;
@@ -403,6 +426,9 @@ void MIBLEchangePacketModeTo(uint8_t _mode) {
     case 2: // special MJ_HT_V1 packet
       NRF24radio.openReadingPipe(0,0xdbcc0cd3); // 95 fe 50 20 -> MJ_HT_V1, needs lsfr 0x72
     break;
+    case 3: // special LYWSD02 packet
+      NRF24radio.openReadingPipe(0,0xef3b0730); // 95 fe 70 20 -> LYWSD02, needs lfsr 0x17
+    break;
   }
   DEBUG_SENSOR_LOG(PSTR("MIBLE: Change Mode to %u"),_mode);
   MIBLE.timer = 0;
@@ -447,6 +473,10 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
       _newSensor.MJ_HT_V1.hum=-1.0f;
       _newSensor.MJ_HT_V1.bat=0xff;
       break;
+    case 3:
+      _newSensor.LYWSD02.temp=-1000.0f;
+      _newSensor.LYWSD02.hum=-1.0f;
+      break;
     default:
       break;
     }
@@ -544,7 +574,34 @@ void MIBLEhandleMJ_HT_V1Packet(void){
     DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MIBLE.buffer.MJ_HT_V1Packet.B.battery);
     break;
   }
+}
 
+void MIBLEhandleLYWSD02Packet(void){
+  if(MIBLE.buffer.LYWSD02Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected LYWSD02-packet"));
+    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
+    return;
+  }
+  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.LYWSD02Packet.TH.serial, 3); // H would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+
+  static float _tempFloat;
+  switch(MIBLE.buffer.LYWSD02Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 4:
+    _tempFloat=(float)(MIBLE.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).LYWSD02.temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MIBLE.buffer.LYWSD02Packet.TH.data );
+    break;
+    case 6:
+    _tempFloat=(float)(MIBLE.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<101){
+        MIBLEsensors.at(_slot).LYWSD02.hum=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MIBLE.buffer.LYWSD02Packet.TH.data );
+    break;
+  }
 }
 
 void MIBLE_EVERY_100_MSECOND() { // Every 100mseconds, with many sensors 50ms could make sense
@@ -555,7 +612,7 @@ void MIBLE_EVERY_100_MSECOND() { // Every 100mseconds, with many sensors 50ms co
       MIBLEpurgeFakeSensors();
     }
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Change packet mode after 60 seconds, MIBLE.timer: %u"),MIBLE.timer);
-    if (MIBLE.packetMode == 2){
+    if (MIBLE.packetMode == 3){
       MIBLEinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
     }
     else {
@@ -592,7 +649,10 @@ void MIBLE_EVERY_100_MSECOND() { // Every 100mseconds, with many sensors 50ms co
   }
   if (MIBLE.packetMode == 2){ // "MJ_HT_V1" mode
     MIBLEhandleMJ_HT_V1Packet();
-    }
+  }
+  if (MIBLE.packetMode == 3){ // "LYWSD02" mode
+    MIBLEhandleLYWSD02Packet();
+  }
 
     MIBLEhopChannel();
     NRF24radio.startListening();
@@ -666,6 +726,23 @@ void MIBLEShow(bool json)
           }
           ResponseAppend_P(PSTR("}"));
           break;
+        case 3:
+          if(MIBLEsensors.at(i).showedUp < 3){
+            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+            break;
+          }
+          sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveLYWSD02,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+          dtostrfd(MIBLEsensors.at(i).LYWSD02.temp, Settings.flag2.temperature_resolution, temperature);
+          dtostrfd(MIBLEsensors.at(i).LYWSD02.hum, 1, humidity);
+          ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+          if(MIBLEsensors.at(i).LYWSD02.temp!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+          }
+          if(MIBLEsensors.at(i).LYWSD02.hum!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          ResponseAppend_P(PSTR("}"));
+          break;
       }
     }
 #ifdef USE_WEBSERVER
@@ -721,11 +798,27 @@ void MIBLEShow(bool json)
           }
           if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){
             WSContentSend_PD(HTTP_BATTERY, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).MJ_HT_V1.bat);
+          }
+          break;
+        case 3:
+          if(MIBLEsensors.at(i).showedUp < 3){
+            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
+            break;
+          }
+          dtostrfd(MIBLEsensors.at(i).LYWSD02.temp, Settings.flag2.temperature_resolution, temperature);
+          dtostrfd(MIBLEsensors.at(i).LYWSD02.hum, 1, humidity);
+
+          WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveLYWSD02, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+          if(MIBLEsensors.at(i).LYWSD02.temp!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveLYWSD02, temperature, TempUnit());
+          }
+          if(MIBLEsensors.at(i).LYWSD02.hum!=-1.0f){
+            WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveLYWSD02, humidity);
+          }
           break;
         }
       }
     }
-  }
 #endif  // USE_WEBSERVER
 }
 

From 760f4e49ac88c0d26f69a4d694a40138105ae8b3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 21 Jan 2020 12:36:44 +0100
Subject: [PATCH 154/403] Add compile time control over settings

---
 tasmota/my_user_config.h | 12 +++++++++---
 tasmota/settings.ino     |  9 ++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 692320333..ec40b4c8d 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -97,6 +97,7 @@
 #define MQTT_BUTTON_RETAIN     false             // [ButtonRetain] Button may send retain flag (false = off, true = on)
 #define MQTT_POWER_RETAIN      false             // [PowerRetain] Power status message may send retain flag (false = off, true = on)
 #define MQTT_SWITCH_RETAIN     false             // [SwitchRetain] Switch may send retain flag (false = off, true = on)
+#define MQTT_SENSOR_RETAIN     false             // [SensorRetain] Sensor may send retain flag (false = off, true = on)
 #define MQTT_BUTTON_SWITCH_FORCE_LOCAL   false   // [SetOption61] Force local operation when button/switch topic is set (false = off, true = on)
 
 #define MQTT_STATUS_OFF        "OFF"             // [StateText1] Command or Status result when turned off (needs to be a string like "0" or "Off")
@@ -198,6 +199,10 @@
 #define COLOR_TIMER_TAB_BACKGROUND  "#999"       // [WebColor18] Config timer tab background color - Dark gray
 #define COLOR_TITLE_TEXT            "#eaeaea"    // [WebColor19] Title text color - Very light gray
 
+// -- KNX -----------------------------------------
+#define KNX_ENABLED            false             // [Knx_Enabled] Enable KNX protocol
+#define KNX_ENHANCED           false             // [Knx_Enhanced] Enable KNX Enhanced Mode
+
 // -- mDNS ----------------------------------------
 #define MDNS_ENABLED           false             // [SetOption55] Use mDNS (false = Disable, true = Enable)
 
@@ -251,7 +256,6 @@
 
 #define SWITCH_DEBOUNCE_TIME   50                // [SwitchDebounce] Number of mSeconds switch press debounce time
 #define SWITCH_MODE            TOGGLE            // [SwitchMode] TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV (the wall switch state)
-#define WS2812_LEDS            30                // [Pixels] Number of WS2812 LEDs to start with (max is 512)
 
 #define TEMP_CONVERSION        false             // [SetOption8] Return temperature in (false = Celsius or true = Fahrenheit)
 #define PRESSURE_CONVERSION    false             // [SetOption24] Return pressure in (false = hPa or true = mmHg)
@@ -264,9 +268,10 @@
 #define APP_FLASH_CYCLE        false             // [SetOption12] Switch between dynamic or fixed slot flash save location
 #define APP_NO_RELAY_SCAN      false             // [SetOption63] Don't scan relay power state at restart
 #define APP_DISABLE_POWERCYCLE false             // [SetOption65] Disable fast power cycle detection for device reset
-#define DEEPSLEEP_BOOTCOUNT    false            // [SetOption76] Enable incrementing bootcount when deepsleep is enabled
+#define DEEPSLEEP_BOOTCOUNT    false             // [SetOption76] Enable incrementing bootcount when deepsleep is enabled
 
 // -- Lights --------------------------------------
+#define WS2812_LEDS            30                // [Pixels] Number of WS2812 LEDs to start with (max is 512)
 #define LIGHT_MODE             true              // [SetOption15] Switch between commands PWM or COLOR/DIMMER/CT/CHANNEL
 #define LIGHT_CLOCK_DIRECTION  false             // [SetOption16] Switch WS2812 clock between clockwise or counter-clockwise
 #define LIGHT_COLOR_RADIX      false             // [SetOption17] Switch between decimal or hexadecimal color output (false = hexadecimal, true = decimal)
@@ -279,9 +284,10 @@
 // -- Energy --------------------------------------
 #define ENERGY_VOLTAGE_ALWAYS  false             // [SetOption21] Enable show voltage even if powered off
 #define ENERGY_DDS2382_MODE    false             // [SetOption71] Enable DDS2382 different Modbus registers for Active Energy (#6531)
-#define ENERGY_HARDWARE_TOTALS  false             // [SetOption72] Enable hardware energy total counter as reference (#6561)
+#define ENERGY_HARDWARE_TOTALS false             // [SetOption72] Enable hardware energy total counter as reference (#6561)
 
 // -- Other Options -------------------------------
+#define TIMERS_ENABLED         false             // [Timers] Enable Timers
 #define RF_DATA_RADIX          false             // [SetOption28] RF receive data format (false = hexadecimal, true = decimal)
 #define IR_DATA_RADIX          false             // [SetOption29] IR receive data format (false = hexadecimal, true = decimal)
 #define TUYA_SETOPTION_20      false             // [SetOption54] Apply SetOption20 settings to Tuya device
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 93c323e32..363ebbd9f 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -874,7 +874,7 @@ void SettingsDefaultSet2(void)
   Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
   Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
   Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
-//  Settings.flag.mqtt_sensor_retain = 0;
+  Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
 //  Settings.flag.mqtt_serial = 0;
   Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
   Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
@@ -987,14 +987,17 @@ void SettingsDefaultSet2(void)
 //  for (uint32_t i = 1; i < MAX_RULE_SETS; i++) { Settings.rules[i][0] = '\0'; }
   Settings.flag2.calc_resolution = CALC_RESOLUTION;
 
+  // Timer
+  Settings.flag3.timers_enable = TIMERS_ENABLED;
+
   // Home Assistant
   Settings.flag.hass_light = HASS_AS_LIGHT;
   Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
   Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
 
   // Knx
-//  Settings.flag.knx_enabled = 0;
-//  Settings.flag.knx_enable_enhancement = 0;
+  Settings.flag.knx_enabled = KNX_ENABLED;
+  Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
 
   // Light
   Settings.flag.pwm_control = LIGHT_MODE;

From a61c028b6608a02ec54524bcbb0b8c1ccb6b39f1 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 21 Jan 2020 16:38:55 +0100
Subject: [PATCH 155/403] Add SoftwareSerial to CSE7766 driver

Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
---
 RELEASENOTES.md             |   2 +
 tasmota/CHANGELOG.md        |   2 +
 tasmota/xnrg_02_cse7766.ino | 116 +++++++++++++++++++++++-------------
 3 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ce6c4963f..993c285d4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -80,3 +80,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support to BMP driver to enter reset state (sleep enable) when deep sleep is used in Tasmota
 - Add support for gzipped binaries
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
+- Add most SetOptions as defines to my_user_config.h
+- Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ccffecfdc..98f48c7a8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -6,6 +6,8 @@
 - Fix OTA minimal gzipped detection regression from 8.1.0.3
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
 - Add Zigbee persistence and friendly names
+- Add most SetOptions as defines to my_user_config.h
+- Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index 45001b55e..a95505c3b 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -20,7 +20,7 @@
 #ifdef USE_ENERGY_SENSOR
 #ifdef USE_CSE7766
 /*********************************************************************************************\
- * CSE7766 - Energy (Sonoff S31 and Sonoff Pow R2)
+ * CSE7759 and CSE7766 - Energy (Sonoff S31 and Sonoff Pow R2)
  * HLW8032 - Energy (Blitzwolf SHP5)
  *
  * Based on datasheet from http://www.chipsea.com/UploadFiles/2017/08/11144342F01B5662.pdf
@@ -37,6 +37,12 @@
 #define CSE_PREF                    1000
 #define CSE_UREF                    100
 
+#define CSE_BUFFER_SIZE             25
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *CseSerial = nullptr;
+
 struct CSE {
   long voltage_cycle = 0;
   long current_cycle = 0;
@@ -45,6 +51,8 @@ struct CSE {
   long cf_pulses = 0;
   long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
 
+  int byte_counter = 0;
+  uint8_t *rx_buffer = nullptr;
   uint8_t power_invalid = 0;
   bool received = false;
 } Cse;
@@ -57,7 +65,7 @@ void CseReceived(void)
   // 55 5A 02 F7 60 00 03 AB 00 40 10 02 60 5D 51 A6 58 03 E9 EF 71 0B 7A 36 - 55 = Ok, 71 = Ok
   // Hd Id VCal---- Voltage- ICal---- Current- PCal---- Power--- Ad CF--- Ck
 
-  uint8_t header = serial_in_buffer[0];
+  uint8_t header = Cse.rx_buffer[0];
   if ((header & 0xFC) == 0xFC) {
     AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Abnormal hardware"));
     return;
@@ -67,30 +75,30 @@ void CseReceived(void)
   if (HLW_UREF_PULSE == Settings.energy_voltage_calibration) {
     long voltage_coefficient = 191200;  // uSec
     if (CSE_NOT_CALIBRATED != header) {
-      voltage_coefficient = serial_in_buffer[2] << 16 | serial_in_buffer[3] << 8 | serial_in_buffer[4];
+      voltage_coefficient = Cse.rx_buffer[2] << 16 | Cse.rx_buffer[3] << 8 | Cse.rx_buffer[4];
     }
     Settings.energy_voltage_calibration = voltage_coefficient / CSE_UREF;
   }
   if (HLW_IREF_PULSE == Settings.energy_current_calibration) {
     long current_coefficient = 16140;  // uSec
     if (CSE_NOT_CALIBRATED != header) {
-      current_coefficient = serial_in_buffer[8] << 16 | serial_in_buffer[9] << 8 | serial_in_buffer[10];
+      current_coefficient = Cse.rx_buffer[8] << 16 | Cse.rx_buffer[9] << 8 | Cse.rx_buffer[10];
     }
     Settings.energy_current_calibration = current_coefficient;
   }
   if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
     long power_coefficient = 5364000;  // uSec
     if (CSE_NOT_CALIBRATED != header) {
-      power_coefficient = serial_in_buffer[14] << 16 | serial_in_buffer[15] << 8 | serial_in_buffer[16];
+      power_coefficient = Cse.rx_buffer[14] << 16 | Cse.rx_buffer[15] << 8 | Cse.rx_buffer[16];
     }
     Settings.energy_power_calibration = power_coefficient / CSE_PREF;
   }
 
-  uint8_t adjustement = serial_in_buffer[20];
-  Cse.voltage_cycle = serial_in_buffer[5] << 16 | serial_in_buffer[6] << 8 | serial_in_buffer[7];
-  Cse.current_cycle = serial_in_buffer[11] << 16 | serial_in_buffer[12] << 8 | serial_in_buffer[13];
-  Cse.power_cycle = serial_in_buffer[17] << 16 | serial_in_buffer[18] << 8 | serial_in_buffer[19];
-  Cse.cf_pulses = serial_in_buffer[21] << 8 | serial_in_buffer[22];
+  uint8_t adjustement = Cse.rx_buffer[20];
+  Cse.voltage_cycle = Cse.rx_buffer[5] << 16 | Cse.rx_buffer[6] << 8 | Cse.rx_buffer[7];
+  Cse.current_cycle = Cse.rx_buffer[11] << 16 | Cse.rx_buffer[12] << 8 | Cse.rx_buffer[13];
+  Cse.power_cycle = Cse.rx_buffer[17] << 16 | Cse.rx_buffer[18] << 8 | Cse.rx_buffer[19];
+  Cse.cf_pulses = Cse.rx_buffer[21] << 8 | Cse.rx_buffer[22];
 
   if (Energy.power_on) {  // Powered on
     if (adjustement & 0x40) {  // Voltage valid
@@ -134,41 +142,44 @@ void CseReceived(void)
 
 bool CseSerialInput(void)
 {
-  if (Cse.received) {
-    serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-    if (24 == serial_in_byte_counter) {
+  while (CseSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = CseSerial->read();
 
-      AddLogSerial(LOG_LEVEL_DEBUG_MORE);
+    if (Cse.received) {
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
+      if (24 == Cse.byte_counter) {
 
-      uint8_t checksum = 0;
-      for (uint32_t i = 2; i < 23; i++) { checksum += serial_in_buffer[i]; }
-      if (checksum == serial_in_buffer[23]) {
-        Energy.data_valid[0] = 0;
-        CseReceived();
-        Cse.received = false;
-        return true;
-      } else {
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
-        do {  // Sync buffer with data (issue #1907 and #3425)
-          memmove(serial_in_buffer, serial_in_buffer +1, 24);
-          serial_in_byte_counter--;
-        } while ((serial_in_byte_counter > 2) && (0x5A != serial_in_buffer[1]));
-        if (0x5A != serial_in_buffer[1]) {
+        AddLogBuffer(LOG_LEVEL_DEBUG_MORE, Cse.rx_buffer, 24);
+
+        uint8_t checksum = 0;
+        for (uint32_t i = 2; i < 23; i++) { checksum += Cse.rx_buffer[i]; }
+        if (checksum == Cse.rx_buffer[23]) {
+          Energy.data_valid[0] = 0;
+          CseReceived();
           Cse.received = false;
-          serial_in_byte_counter = 0;
+          return true;
+        } else {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
+          do {  // Sync buffer with data (issue #1907 and #3425)
+            memmove(Cse.rx_buffer, Cse.rx_buffer +1, 24);
+            Cse.byte_counter--;
+          } while ((Cse.byte_counter > 2) && (0x5A != Cse.rx_buffer[1]));
+          if (0x5A != Cse.rx_buffer[1]) {
+            Cse.received = false;
+            Cse.byte_counter = 0;
+          }
         }
       }
-    }
-  } else {
-    if ((0x5A == serial_in_byte) && (1 == serial_in_byte_counter)) {  // 0x5A - Packet header 2
-      Cse.received = true;
     } else {
-      serial_in_byte_counter = 0;
+      if ((0x5A == serial_in_byte) && (1 == Cse.byte_counter)) {  // 0x5A - Packet header 2
+        Cse.received = true;
+      } else {
+        Cse.byte_counter = 0;
+      }
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
     }
-    serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
   }
-  serial_in_byte = 0;  // Discard
-  return false;
 }
 
 /********************************************************************************************/
@@ -209,15 +220,31 @@ void CseEverySecond(void)
   }
 }
 
-void CseDrvInit(void)
+void CseSnsInit(void)
 {
-  if ((3 == pin[GPIO_CSE7766_RX]) && (1 == pin[GPIO_CSE7766_TX])) {  // As it uses 8E1 currently only hardware serial is supported
-    SetSerial(4800, TS_SERIAL_8E1);
+  // Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions
+  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], pin[GPIO_CSE7766_TX], 1);
+  if (CseSerial->begin(4800, 2)) {  // Fake Software Serial 8E1 by using two stop bits
+    if (CseSerial->hardwareSerial()) {
+      SetSerial(4800, TS_SERIAL_8E1);
+      ClaimSerial();
+    }
     if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
       Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;  // SetOption39 1..255
     }
     Cse.power_invalid = Settings.param[P_CSE7766_INVALID_POWER];
-    energy_flg = XNRG_02;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void CseDrvInit(void)
+{
+  Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
+  if (Cse.rx_buffer != nullptr) {
+    if ((pin[GPIO_CSE7766_RX] < 99) && (pin[GPIO_CSE7766_TX] < 99)) {
+      energy_flg = XNRG_02;
+    }
   }
 }
 
@@ -254,8 +281,8 @@ bool Xnrg02(uint8_t function)
   bool result = false;
 
   switch (function) {
-    case FUNC_SERIAL:
-      result = CseSerialInput();
+    case FUNC_LOOP:
+      if (CseSerial) { CseSerialInput(); }
       break;
     case FUNC_ENERGY_EVERY_SECOND:
       CseEverySecond();
@@ -263,6 +290,9 @@ bool Xnrg02(uint8_t function)
     case FUNC_COMMAND:
       result = CseCommand();
       break;
+    case FUNC_INIT:
+      CseSnsInit();
+      break;
     case FUNC_PRE_INIT:
       CseDrvInit();
       break;

From 38b344fcea438e793391fea1ceb8130ea0956c2c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 21 Jan 2020 17:10:08 +0100
Subject: [PATCH 156/403] Remove the need for GPIO_CSE7766_TX

---
 tasmota/xnrg_02_cse7766.ino | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/xnrg_02_cse7766.ino b/tasmota/xnrg_02_cse7766.ino
index a95505c3b..d7bb93665 100644
--- a/tasmota/xnrg_02_cse7766.ino
+++ b/tasmota/xnrg_02_cse7766.ino
@@ -223,7 +223,8 @@ void CseEverySecond(void)
 void CseSnsInit(void)
 {
   // Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions
-  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], pin[GPIO_CSE7766_TX], 1);
+//  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], pin[GPIO_CSE7766_TX], 1);
+  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], -1, 1);
   if (CseSerial->begin(4800, 2)) {  // Fake Software Serial 8E1 by using two stop bits
     if (CseSerial->hardwareSerial()) {
       SetSerial(4800, TS_SERIAL_8E1);
@@ -242,7 +243,8 @@ void CseDrvInit(void)
 {
   Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
   if (Cse.rx_buffer != nullptr) {
-    if ((pin[GPIO_CSE7766_RX] < 99) && (pin[GPIO_CSE7766_TX] < 99)) {
+//    if ((pin[GPIO_CSE7766_RX] < 99) && (pin[GPIO_CSE7766_TX] < 99)) {
+    if (pin[GPIO_CSE7766_RX] < 99) {
       energy_flg = XNRG_02;
     }
   }

From fb485dabd3c3c436b327d4b101b508fcd87a8ab7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 22 Jan 2020 11:55:48 +0100
Subject: [PATCH 157/403] Add optional parameter <startcolor> to command
 ``Scheme``

Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
---
 RELEASENOTES.md            |  1 +
 tasmota/CHANGELOG.md       |  1 +
 tasmota/support.ino        | 11 +++++++++++
 tasmota/tasmota_template.h |  2 +-
 tasmota/xdrv_03_energy.ino | 23 ++++++++---------------
 tasmota/xdrv_04_light.ino  | 14 ++++++--------
 tasmota/xdrv_24_buzzer.ino |  7 +------
 7 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 993c285d4..5eef31626 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -82,3 +82,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
+- Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 98f48c7a8..9285bdda1 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add Zigbee persistence and friendly names
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
+- Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 94def5a6f..0a281bc68 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -493,6 +493,17 @@ bool ParseIp(uint32_t* addr, const char* str)
   return (3 == i);
 }
 
+uint32_t ParseParameters(uint32_t count, uint32_t *params)
+{
+  char *p;
+  uint32_t i = 0;
+  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p)) {
+    params[i] = strtoul(str, nullptr, 0);
+    i++;
+  }
+  return i;
+}
+
 // Function to parse & check if version_str is newer than our currently installed version.
 bool NewerVersion(char* version_str)
 {
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 1793902eb..9bb98ce6e 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -169,7 +169,7 @@ enum UserSelectablePins {
   GPIO_SM16716_SEL,    // SM16716 SELECT
   GPIO_DI,             // my92x1 PWM input
   GPIO_DCKI,           // my92x1 CLK input
-  GPIO_CSE7766_TX,     // CSE7766 Serial interface (S31 and Pow R2)
+  GPIO_CSE7766_TX,     // CSE7766 Serial interface (S31 and Pow R2) - Not used anymore 20200121
   GPIO_CSE7766_RX,     // CSE7766 Serial interface (S31 and Pow R2)
   GPIO_ARIRFRCV,       // AriLux RF Receive input
   GPIO_TXD,            // Serial interface
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 166fd7aa8..4573d2406 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -522,26 +522,19 @@ void CmndEnergyReset(void)
     }
   }
   else if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
-    char *p;
-    char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-    int32_t position = -1;
-    uint32_t values[2];
-
-    while ((str != nullptr) && (position < 1)) {
-      uint32_t value = strtoul(str, nullptr, 10);
-      position++;
-      values[position] = value *100;
-      str = strtok_r(nullptr, ", ", &p);
-    }
+    uint32_t values[2] = { 0 };
+    uint32_t position = ParseParameters(2, values);
+    values[0] *= 100;
+    values[1] *= 100;
 
     switch (XdrvMailbox.index)
     {
       case 4:
         // Reset energy_usage.usage totals
-        if (position > -1) {
+        if (position > 0) {
           RtcSettings.energy_usage.usage1_kWhtotal = values[0];
         }
-        if (position > 0) {
+        if (position > 1) {
           RtcSettings.energy_usage.usage2_kWhtotal = values[1];
         }
         Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
@@ -549,10 +542,10 @@ void CmndEnergyReset(void)
         break;
       case 5:
         // Reset energy_usage.return totals
-        if (position > -1) {
+        if (position > 0) {
           RtcSettings.energy_usage.return1_kWhtotal = values[0];
         }
-        if (position > 0) {
+        if (position > 1) {
           RtcSettings.energy_usage.return2_kWhtotal = values[1];
         }
         Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index d217b75c7..48cc2d283 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2311,6 +2311,10 @@ void CmndScheme(void)
       }
     }
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= max_scheme)) {
+      uint32_t parm[2];
+      if (ParseParameters(2, parm) > 1) {
+        Light.wheel = parm[1];
+      }
       Settings.light_scheme = XdrvMailbox.payload;
       if (LS_WAKEUP == Settings.light_scheme) {
         Light.wakeup_active = 3;
@@ -2403,16 +2407,10 @@ void CmndDimmer(void)
 void CmndDimmerRange(void)
 {
   if (XdrvMailbox.data_len > 0) {
-    char *p;
-    uint8_t i = 0;
-    uint16_t parm[2];
+    uint32_t parm[2];
     parm[0] = Settings.dimmer_hw_min;
     parm[1] = Settings.dimmer_hw_max;
-    for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
-      parm[i] = strtoul(str, nullptr, 0);
-      i++;
-    }
-
+    ParseParameters(2, parm);
     if (parm[0] < parm[1]) {
       Settings.dimmer_hw_min = parm[0];
       Settings.dimmer_hw_max = parm[1];
diff --git a/tasmota/xdrv_24_buzzer.ino b/tasmota/xdrv_24_buzzer.ino
index 9cfa7e111..78246f0f6 100644
--- a/tasmota/xdrv_24_buzzer.ino
+++ b/tasmota/xdrv_24_buzzer.ino
@@ -155,13 +155,8 @@ void CmndBuzzer(void)
 
   if (XdrvMailbox.data_len > 0) {
     if (XdrvMailbox.payload > 0) {
-      char *p;
-      uint32_t i = 0;
       uint32_t parm[4] = { 0 };
-      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 4; str = strtok_r(nullptr, ", ", &p)) {
-        parm[i] = strtoul(str, nullptr, 0);
-        i++;
-      }
+      ParseParameters(4, parm);
       for (uint32_t i = 0; i < 3; i++) {
         if (parm[i] < 1) { parm[i] = 1; }  // Default Count, On time, Off time
       }

From 6e812627098c77b533ceb40a891d29a01ead29d4 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Wed, 22 Jan 2020 13:23:59 +0100
Subject: [PATCH 158/403] Shutterbutton to MQTT and rules

---
 tasmota/xdrv_27_shutter.ino | 161 ++++++++++++++++++++----------------
 1 file changed, 89 insertions(+), 72 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index f7a574714..e112416b1 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -34,7 +34,7 @@ uint16_t messwerte[5] = {30,50,70,90,100};
 uint16_t last_execute_step;
 
 enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
-enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
 
 const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
@@ -48,7 +48,8 @@ void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
   &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
 
-const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
+  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
+  const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
 
 #include <Ticker.h>
 
@@ -244,7 +245,7 @@ void ShutterInit(void)
       // terminate loop at first INVALID shutter.
       break;
     }
-
+    ShutterLimitRealAndTargetPositions(i);
     Settings.shutter_accuracy = 1;
   }
 }
@@ -556,28 +557,27 @@ void ShutterButtonHandler(void)
         }
       }
       if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {  // press still valid && SetOption32 (40) - Button hold
-        if (!Settings.flag.button_restrict) { // no SetOption1 (0)
-          // check for simultaneous shutter button hold
-          if (ShutterButtonIsSimultaneousHold(button_index)) {
-            // simultaneous shutter button hold detected
-            for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if (Settings.shutter_button[i] & (1<<31))
-                Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
-          }
+        // check for simultaneous shutter button hold
+        if (ShutterButtonIsSimultaneousHold(button_index)) {
+          // simultaneous shutter button hold detected
+          for (uint32_t i = 0; i < MAX_KEYS; i++)
+            if (Settings.shutter_button[i] & (1<<31))
+              Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
+          press_index = 0;
+          buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
         }
-        if (Button.press_counter[button_index]<99)
+        if (Button.press_counter[button_index]<99) {
+          press_index = 0;
           buttonState = SHT_PRESSED_HOLD;
+        }
         Button.press_counter[button_index] = 0;
       }
-      if ((!Settings.flag.button_restrict) && (Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {  // no SetOption1 (0) && SetOption32 (40) - Button held for factor times longer
+      if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {  // SetOption32 (40) - Button held for factor times longer
         // check for simultaneous shutter button extend hold
         if (ShutterButtonIsSimultaneousHold(button_index)) {
           // simultaneous shutter button extend hold detected
-          char scmnd[20];
+          press_index = 0;
           buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
-          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-          ExecuteCommand(scmnd, SRC_BUTTON);
-          return;
         }
       }
     }
@@ -589,29 +589,23 @@ void ShutterButtonHandler(void)
     } else {
       if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
         if (Button.press_counter[button_index]<99) {
-          if ((!Settings.flag.button_restrict) && (Button.press_counter[button_index]>=5)) { // no SetOption1 (0) && 5x or more presses
-            // check for simultaneous shutter button press >3
-            uint32 min_shutterbutton_press_counter = -1;
-            for (uint32_t i = 0; i < MAX_KEYS; i++) {
-              if ((Settings.shutter_button[i] & (1<<31)) && (Button.press_counter[i] < min_shutterbutton_press_counter))
-                min_shutterbutton_press_counter = Button.press_counter[i];
-            }
-            if (min_shutterbutton_press_counter >= Button.press_counter[button_index]-2) {
-              char scmnd[20];
-              // simultaneous shutter button press >3 detected
-              press_index = Button.press_counter[button_index];
-              for (uint32_t i = 0; i < MAX_KEYS; i++)
-                if (Settings.shutter_button[i] & (1<<31))
-                  Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
-              buttonState = SHT_SHT_PRESSED_MULTI_SIMULTANEOUS;
-              GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
-              ExecuteCommand(scmnd, SRC_BUTTON);
-              return;
-            }
+          // check for simultaneous shutter button press
+          uint32 min_shutterbutton_press_counter = -1;
+          for (uint32_t i = 0; i < MAX_KEYS; i++) {
+            if ((Settings.shutter_button[i] & (1<<31)) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+              min_shutterbutton_press_counter = Button.press_counter[i];
           }
-          press_index = Button.press_counter[button_index];
-          if ((buttonState == SHT_NOT_PRESSED) && (Button.press_counter[button_index]<99)) {
+          if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
+            // simultaneous shutter button press detected
+            press_index = Button.press_counter[button_index];
+            for (uint32_t i = 0; i < MAX_KEYS; i++)
+              if (Settings.shutter_button[i] & (1<<31))
+                Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
+            buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
+          }
+          if ((buttonState != SHT_PRESSED_MULTI_SIMULTANEOUS) && (Button.press_counter[button_index]<99)) {
             // no simultaneous shutter button press >3 detected
+            press_index = Button.press_counter[button_index];
             buttonState = SHT_PRESSED_MULTI;
           }
         }
@@ -620,40 +614,58 @@ void ShutterButtonHandler(void)
     }
   }
 
-  if ((buttonState != SHT_NOT_PRESSED) && (buttonState != SHT_SHT_PRESSED_MULTI_SIMULTANEOUS) && (buttonState != SHT_PRESSED_EXT_HOLD_SIMULTANEOUS)) {
-    if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
-      if (press_index>3) press_index=3;
-      press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, press_index+1);
-      XdrvMailbox.index = shutter_index +1;
-      last_source = SRC_BUTTON;
-      XdrvMailbox.data_len = 0;
-      char databuf[1] = "";
-      XdrvMailbox.data = databuf;
-      XdrvMailbox.command = NULL;
-      if (buttonState == SHT_PRESSED_IMMEDIATE) {
-        XdrvMailbox.payload = XdrvMailbox.index;
-        CmndShutterStop();
-      }
-      else {
-        uint8_t position = (Settings.shutter_button[button_index]>>(6*press_index + 2)) & 0x03f;
-        if (position) {
-          if (Shutter.direction[shutter_index]) {
-            XdrvMailbox.payload = XdrvMailbox.index;
-            CmndShutterStop();
-          } else {
-            XdrvMailbox.payload = position = (position-1)<<1;
-            CmndShutterPosition();
-            if (Settings.shutter_button[button_index] & ((0x01<<26)<<press_index)) {
-              // MQTT broadcast to grouptopic
-              char scommand[CMDSZ];
-              char stopic[TOPSZ];
-              for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-                if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
-                  snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
-                  GetGroupTopic_P(stopic, scommand);
-                  Response_P("%d", position);
-                  MqttPublish(stopic, false);
+ if (buttonState != SHT_NOT_PRESSED) {
+   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
+     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) { // 5x..7x && no SetOption1 (0)
+       // simultaneous shutter button press 5x, 6x, 7x detected
+       char scmnd[20];
+       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
+     // simultaneous shutter button extend hold detected
+     if (!Settings.flag.button_restrict) { // no SetOption1 (0)
+       char scmnd[20];
+       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
+      if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
+        uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
+        if (pos_press_index>3) pos_press_index=3;
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, pos_press_index+1);
+        XdrvMailbox.index = shutter_index +1;
+        last_source = SRC_BUTTON;
+        XdrvMailbox.data_len = 0;
+        char databuf[1] = "";
+        XdrvMailbox.data = databuf;
+        XdrvMailbox.command = NULL;
+        if (buttonState == SHT_PRESSED_IMMEDIATE) {
+          XdrvMailbox.payload = XdrvMailbox.index;
+          CmndShutterStop();
+        }
+        else {
+          uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
+          if (position) {
+            if (Shutter.direction[shutter_index]) {
+              XdrvMailbox.payload = XdrvMailbox.index;
+              CmndShutterStop();
+            } else {
+              XdrvMailbox.payload = position = (position-1)<<1;
+              CmndShutterPosition();
+              if (Settings.shutter_button[button_index] & ((0x01<<26)<<pos_press_index)) {
+                // MQTT broadcast to grouptopic
+                char scommand[CMDSZ];
+                char stopic[TOPSZ];
+                for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+                  if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
+                    snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
+                    GetGroupTopic_P(stopic, scommand);
+                    Response_P("%d", position);
+                    MqttPublish(stopic, false);
+                  }
                 }
               }
             }
@@ -661,6 +673,11 @@ void ShutterButtonHandler(void)
         }
       }
     }
+    Response_P(PSTR("{"));
+    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
   }
 }
 

From 7ea60116cfa2fc4868dc4d9cb28b28c16b30e0ca Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 22 Jan 2020 16:14:03 +0100
Subject: [PATCH 159/403] Document Light commands

---
 tasmota/xdrv_04_light.ino | 123 +++++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 48 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 48cc2d283..3df7b43a0 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2185,6 +2185,13 @@ void CmndSupportColor(void)
 
 void CmndColor(void)
 {
+  // Color  - Show current RGBWW color state
+  // Color1 - Change color to RGBWW
+  // Color2 - Change color to RGBWW but retain brightness (=dimmer)
+  // Color3 - Change color to RGB of WS2812 Clock Second
+  // Color4 - Change color to RGB of WS2812 Clock Minute
+  // Color5 - Change color to RGB of WS2812 Clock Hour
+  // Color6 - Change color to RGB of WS2812 Clock Marker
   if ((Light.subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) {
     CmndSupportColor();
   }
@@ -2192,6 +2199,8 @@ void CmndColor(void)
 
 void CmndWhite(void)
 {
+  // White        - Show current White (=Dimmer2) state
+  // White 0..100 - Set White colors dimmer state
   if (Light.pwm_multi_channels) { return; }
   if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
@@ -2205,6 +2214,10 @@ void CmndWhite(void)
 
 void CmndChannel(void)
 {
+  // Channel<x>        - Show current Channel state
+  // Channel<x> 0..100 - Set Channel dimmer state
+  // Channel<x> +      - Incerement Channel in steps of 10
+  // Channel<x> -      - Decrement Channel in steps of 10
   if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
     uint32_t light_index = XdrvMailbox.index - Light.device;
     power_t coldim = 0;   // bit flag to update
@@ -2249,48 +2262,35 @@ void CmndChannel(void)
 
 void CmndHsbColor(void)
 {
+  // HsbColor             - Show current HSB
+  // HsbColor 360,100,100 - Set Hue, Saturation and Brighthness
+  // HsbColor 360,100     - Set Hue and Saturation
+  // HsbColor 360         - Set Hue
+  // HsbColor1 360        - Set Hue
+  // HsbColor2 100        - Set Saturation
+  // HsbColor3 100        - Set Brightness
   if (Light.subtype >= LST_RGB) {
-    bool validHSB = (XdrvMailbox.data_len > 0);
-    if (validHSB) {
-      uint16_t HSB[3];
+    if (XdrvMailbox.data_len > 0) {
       uint16_t c_hue;
       uint8_t  c_sat;
-
       light_state.getHSB(&c_hue, &c_sat, nullptr);
+      uint32_t HSB[3];
       HSB[0] = c_hue;
       HSB[1] = c_sat;
       HSB[2] = light_state.getBriRGB();
-
-      char *substr = strstr(XdrvMailbox.data, ",");
-      if (substr != nullptr) { // Command with comma separated parameters, Hue (0<H<360), Saturation (0<S<100) AND optional Brightness (0<B<100)
-        HSB[0] = atoi(XdrvMailbox.data);
-
-        for (uint32_t i = 1; i < 3; i++) {
-          substr++;
-          HSB[i] = atoi(substr);
+      if ((2 == XdrvMailbox.index) || (3 == XdrvMailbox.index)) {
+        if ((uint32_t)XdrvMailbox.payload > 100) { XdrvMailbox.payload = 100; }
+        HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
+      } else {
+        uint32_t paramcount = ParseParameters(3, HSB);
+        if (HSB[0] > 360) { HSB[0] = 360; }
+        for (uint32_t i = 1; i < paramcount; i++) {
+          if (HSB[i] > 100) { HSB[i] == 100; }
           HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255); // change sat and bri to 0..255
-          substr = strstr(substr, ",");
-          if (substr == nullptr) {
-            break;
-          }
-        }
-        if (substr != nullptr) {
-          validHSB = false;
-        }
-      } else {  // Command with only 1 parameter, Hue (0<H<360), Saturation (0<S<100) OR Brightness (0<B<100)
-
-        if (1 == XdrvMailbox.index) {
-          HSB[0] = XdrvMailbox.payload;
-        } else if ((XdrvMailbox.index > 1) && (XdrvMailbox.index < 4)) {
-          HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
-        } else {
-          validHSB = false;
         }
       }
-      if (validHSB) {
-        light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
-        LightPreparePower(1);
-      }
+      light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
+      LightPreparePower(1);
     } else {
       LightState(0);
     }
@@ -2299,6 +2299,11 @@ void CmndHsbColor(void)
 
 void CmndScheme(void)
 {
+  // Scheme 0..12  - Select one of schemes 0 to 12
+  // Scheme 2      - Select scheme 2
+  // Scheme 2,0    - Select scheme 2 with color wheel set to 0 (HSB Red)
+  // Scheme +      - Select next scheme
+  // Scheme -      - Select previous scheme
   if (Light.subtype >= LST_RGB) {
     uint32_t max_scheme = Light.max_scheme;
 
@@ -2332,6 +2337,8 @@ void CmndScheme(void)
 
 void CmndWakeup(void)
 {
+  // Wakeup        - Start wakeup light
+  // Wakeup 0..100 - Start wakeup light to dimmer value 0..100
   if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
     light_controller.changeDimmer(XdrvMailbox.payload);
   }
@@ -2343,6 +2350,10 @@ void CmndWakeup(void)
 
 void CmndColorTemperature(void)
 {
+  // CT          - Show current color temperature
+  // CT 153..500 - Set color temperature
+  // CT +        - Incerement color temperature in steps of 34
+  // CT -        - Decrement color temperature in steps of 34
   if (Light.pwm_multi_channels) { return; }
   if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) { // ColorTemp
     uint32_t ct = light_state.getCT();
@@ -2365,6 +2376,12 @@ void CmndColorTemperature(void)
 
 void CmndDimmer(void)
 {
+  // Dimmer         - Show current Dimmer state
+  // Dimmer0 0..100 - Change both RGB and W(W) Dimmers
+  // Dimmer1 0..100 - Change RGB Dimmer
+  // Dimmer2 0..100 - Change W(W) Dimmer
+  // Dimmer<x> +    - Incerement Dimmer in steps of 10
+  // Dimmer<x> -    - Decrement Dimmer in steps of 10
   uint32_t dimmer;
   if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
 
@@ -2406,6 +2423,8 @@ void CmndDimmer(void)
 
 void CmndDimmerRange(void)
 {
+  // DimmerRange       - Show current dimmer range as used by Tuya and PS16DZ Dimmers
+  // DimmerRange 0,100 - Set dimmer hardware range from 0 to 100 and restart
   if (XdrvMailbox.data_len > 0) {
     uint32_t parm[2];
     parm[0] = Settings.dimmer_hw_min;
@@ -2425,6 +2444,10 @@ void CmndDimmerRange(void)
 
 void CmndLedTable(void)
 {
+  // LedTable        - Show current LedTable state
+  // LedTable 0      - Turn LedTable Off
+  // LedTable On     - Turn LedTable On
+  // LedTable Toggle - Toggle LedTable state
   if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
     switch (XdrvMailbox.payload) {
     case 0: // Off
@@ -2442,20 +2465,13 @@ void CmndLedTable(void)
 
 void CmndRgbwwTable(void)
 {
+  // RgbWwTable                     - Show current RGBWW State
+  // RgbWwTable 255,255,255,255,255 - Set RGBWW state to maximum
   if ((XdrvMailbox.data_len > 0)) {
-    if (strstr(XdrvMailbox.data, ",") != nullptr) {  // Command with up to 5 comma separated parameters
-      for (uint32_t i = 0; i < LST_RGBCW; i++) {
-        char *substr;
-
-        if (0 == i) {
-          substr = strtok(XdrvMailbox.data, ",");
-        } else {
-          substr = strtok(nullptr, ",");
-        }
-        if (substr != nullptr) {
-          Settings.rgbwwTable[i] = atoi(substr);
-        }
-      }
+    uint32_t parm[LST_RGBCW -1];
+    uint32_t parmcount = ParseParameters(LST_RGBCW, parm);
+    for (uint32_t i = 0; i < parmcount; i++) {
+      Settings.rgbwwTable[i] = parm[i];
     }
     Light.update = true;
   }
@@ -2464,11 +2480,15 @@ void CmndRgbwwTable(void)
   for (uint32_t i = 0; i < LST_RGBCW; i++) {
     snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
   }
-  ResponseCmndIdxChar(scolor);
+  ResponseCmndChar(scolor);
 }
 
 void CmndFade(void)
 {
+  // Fade        - Show current Fade state
+  // Fade 0      - Turn Fade Off
+  // Fade On     - Turn Fade On
+  // Fade Toggle - Toggle Fade state
   switch (XdrvMailbox.payload) {
   case 0: // Off
   case 1: // On
@@ -2483,7 +2503,11 @@ void CmndFade(void)
 }
 
 void CmndSpeed(void)
-{  // 1 - fast, 40 - very slow
+{
+  // Speed 1  - Fast
+  // Speed 40 - Very slow
+  // Speed +  - Increment Speed
+  // Speed -  - Decrement Speed
   if (1 == XdrvMailbox.data_len) {
     if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
       XdrvMailbox.payload = Settings.light_speed - 1;
@@ -2500,6 +2524,8 @@ void CmndSpeed(void)
 
 void CmndWakeupDuration(void)
 {
+  // WakeUpDuration    - Show current Wake Up duration in seconds
+  // WakeUpDuration 60 - Set Wake Up duration to 60 seconds
   if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3001)) {
     Settings.light_wakeup = XdrvMailbox.payload;
     Light.wakeup_active = 0;
@@ -2508,7 +2534,8 @@ void CmndWakeupDuration(void)
 }
 
 void CmndUndocA(void)
-{  // Theos legacy status
+{
+  // Theos legacy status
   char scolor[LIGHT_COLOR_SIZE];
   LightGetColor(scolor, true);  // force hex whatever Option 17
   scolor[6] = '\0';  // RGB only

From 514f3e7357b8bcbd481c1c1512ce8c1488f1f933 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 22 Jan 2020 21:37:23 +0100
Subject: [PATCH 160/403] Fix ``RGBWWTable`` ignored (#7572)

---
 tasmota/CHANGELOG.md      | 1 +
 tasmota/xdrv_04_light.ino | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 9285bdda1..b35d22064 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
+- Fix ``RGBWWTable`` ignored (#7572)
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 3df7b43a0..2de7432a0 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1799,6 +1799,14 @@ void LightAnimate(void)
         }
       }
 
+      // Apply RGBWWTable only if Settings.rgbwwTable[4] != 0
+      if (0 != Settings.rgbwwTable[4]) {
+        for (uint32_t i = 0; i<Light.subtype; i++) {
+          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
+          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
+        }
+      }
+
       // final adjusments for PMW, post-gamma correction
       for (uint32_t i = 0; i < LST_MAX; i++) {
         // scale from 0..1023 to 0..pwm_range, but keep any non-zero value to at least 1

From b2c0a34979d32aebe5321cdaf0e6e3b4df70ba10 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 22 Jan 2020 22:40:28 +0100
Subject: [PATCH 161/403] Minor Zigbee improvements

---
 tasmota/xdrv_23_zigbee_3_devices.ino     | 16 +++++++++++++---
 tasmota/xdrv_23_zigbee_4_persistence.ino |  2 ++
 tasmota/xdrv_23_zigbee_6_commands.ino    | 10 +++++-----
 tasmota/xdrv_23_zigbee_9_impl.ino        |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index e034868e6..339737b57 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -123,6 +123,7 @@ public:
 
   // Mark data as 'dirty' and requiring to save in Flash
   void dirty(void);
+  void clean(void);   // avoid writing to flash the last changes
 
   // Find device by name, can be short_addr, long_addr, number_in_array or name
   uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
@@ -469,22 +470,28 @@ void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
+  if (!device.manufacturerId.equals(str)) {
+    dirty();
+  }
   device.manufacturerId = str;
-  dirty();
 }
 void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
+  if (!device.modelId.equals(str)) {
+    dirty();
+  }
   device.modelId = str;
-  dirty();
 }
 void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
   Z_Device & device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
+  if (!device.friendlyName.equals(str)) {
+    dirty();
+  }
   device.friendlyName = str;
-  dirty();
 }
 
 const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
@@ -691,6 +698,9 @@ void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
 void Z_Devices::dirty(void) {
   _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
 }
+void Z_Devices::clean(void) {
+  _saveTimer = 0;
+}
 
 // Parse the command parameters for either:
 // - a short address starting with "0x", example: 0x1234
diff --git a/tasmota/xdrv_23_zigbee_4_persistence.ino b/tasmota/xdrv_23_zigbee_4_persistence.ino
index e4fae384d..c3003854f 100644
--- a/tasmota/xdrv_23_zigbee_4_persistence.ino
+++ b/tasmota/xdrv_23_zigbee_4_persistence.ino
@@ -268,6 +268,7 @@ void loadZigbeeDevices(void) {
     buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
     AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
     hidrateDevices(buf);
+    zigbee_devices.clean();   // don't write back to Flash what we just loaded
   } else {
     AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
   }
@@ -308,6 +309,7 @@ void saveZigbeeDevices(void) {
 
 // Erase the flash area containing the ZigbeeData
 void eraseZigbeeDevices(void) {
+  zigbee_devices.clean();     // avoid writing data to flash after erase
   // first copy SPI buffer into ram
   uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
   if (!spi_buffer) {
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 4c9b0672f..073ab8e4c 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -40,11 +40,11 @@ const Z_CommandConverter Z_Commands[] = {
   { "Color",        "0300!07/xxxxyyyy0A00" }, // x, y (uint16)
   { "CT",           "0300!0A/xxxx0A00" },     // Color Temperature Mireds (uint16)
   { "Shutter",      "0102!xx" },
-  { "ShutterOpen",  "0102!00"},
-  { "ShutterClose", "0102!01"},
-  { "ShutterStop",  "0102!02"},
-  { "ShutterLift",  "0102!05xx"},           // Lift percentage, 0%=open, 100%=closed
-  { "ShutterTilt",  "0102!08xx"},           // Tilt percentage
+  { "ShutterOpen",  "0102!00" },
+  { "ShutterClose", "0102!01" },
+  { "ShutterStop",  "0102!02" },
+  { "ShutterLift",  "0102!05xx" },            // Lift percentage, 0%=open, 100%=closed
+  { "ShutterTilt",  "0102!08xx" },            // Tilt percentage
 };
 
 #define ZLE(x) ((x) & 0xFF), ((x) >> 8)     // Little Endian
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index da73f9db7..9b44ce35e 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -463,7 +463,7 @@ void CmndZigbeeSend(void) {
   if (nullptr != &val_device) { device = strToUInt(val_device); }
   const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("endpoint"));
   if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-  const JsonVariant val_cmd = getCaseInsensitive(json, PSTR("Send"));
+  const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
   if (nullptr != &val_cmd) {
     // probe the type of the argument
     // If JSON object, it's high level commands

From 2e89370f1ecd9b4620a4843d2f6fc256158c1e71 Mon Sep 17 00:00:00 2001
From: Patrick Domack <patrickdk@patrickdk.com>
Date: Wed, 22 Jan 2020 16:49:28 -0500
Subject: [PATCH 162/403] Add ability to define more subversions in user
 overrides and remove ram/flash usage to store all versions.

---
 tasmota/tasmota.h      |  1 +
 tasmota/tasmota.ino    |  5 +----
 tasmota/tasmota_post.h | 12 ++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index b4b944d80..4cb435a55 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -31,6 +31,7 @@
 \*********************************************************************************************/
 
 #define CODE_IMAGE 0
+#define CODE_IMAGE_STR "tasmota"
 
 #define USE_LIGHT                           // Enable light control
 #define USE_ENERGY_SENSOR                   // Use energy sensors (+14k code)
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 15375e338..5c20da3ad 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -68,7 +68,7 @@
 // Structs
 #include "settings.h"
 
-const char kCodeImage[] PROGMEM = "tasmota|minimal|sensors|knx|lite|display|ir";
+const char my_image[] PROGMEM = "(" CODE_IMAGE_STR ")";
 
 /*********************************************************************************************\
  * Global variables
@@ -159,7 +159,6 @@ myio my_module;                             // Active copy of Module GPIOs (17 x
 gpio_flag my_module_flag;                   // Active copy of Template GPIO flags
 StateBitfield global_state;                 // Global states (currently Wifi and Mqtt) (8 bits)
 char my_version[33];                        // Composed version string
-char my_image[33];                          // Code image and/or commit
 char my_hostname[33];                       // Composed Wifi hostname
 char mqtt_client[TOPSZ];                    // Composed MQTT Clientname
 char mqtt_topic[TOPSZ];                     // Composed MQTT topic
@@ -200,8 +199,6 @@ void setup(void)
   if (VERSION & 0xff) {  // Development or patched version 6.3.0.10
     snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
   }
-  char code_image[20];
-  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), GetTextIndexed(code_image, sizeof(code_image), CODE_IMAGE, kCodeImage));
 
   SettingsLoad();
   SettingsDelta();
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index af2fe00f7..bef9c567d 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -79,6 +79,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 2
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "sensors"
 
 #undef USE_DISCOVERY                             // Disable mDNS (+8k code or +23.5k code with core 2_5_x, +0.3k mem)
 
@@ -228,6 +230,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 3
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "knx"
 
 #ifndef USE_KNX
 #define USE_KNX                                  // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
@@ -248,6 +252,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 5
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "display"
 
 #undef USE_EMULATION                             // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem)
 #undef USE_EMULATION_HUE                         // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common)
@@ -313,6 +319,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 6
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "ir"
 
 #undef USE_EMULATION
 #undef USE_EMULATION_HUE                         // Disable Hue emulation - only for lights and relays
@@ -406,6 +414,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 4
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "lite"
 
 #undef APP_SLEEP
 #define APP_SLEEP 1                              // Default to sleep = 1 for FIRMWARE_LITE
@@ -511,6 +521,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 
 #undef CODE_IMAGE
 #define CODE_IMAGE 1
+#undef CODE_IMAGE_STR
+#define CODE_IMAGE_STR "minimal"
 
 #undef FIRMWARE_LITE                            // Disable tasmota-lite with no sensors
 #undef FIRMWARE_SENSORS                         // Disable tasmota-sensors with useful sensors enabled

From 405da3ee3f147d056abbac43045c71d8bb9c0085 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 23 Jan 2020 10:33:08 +0100
Subject: [PATCH 163/403] Update tasmota.ino

Keep hackbox commit insert possibility
---
 tasmota/tasmota.ino | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 5c20da3ad..5b47ca581 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -68,8 +68,6 @@
 // Structs
 #include "settings.h"
 
-const char my_image[] PROGMEM = "(" CODE_IMAGE_STR ")";
-
 /*********************************************************************************************\
  * Global variables
 \*********************************************************************************************/
@@ -159,6 +157,7 @@ myio my_module;                             // Active copy of Module GPIOs (17 x
 gpio_flag my_module_flag;                   // Active copy of Template GPIO flags
 StateBitfield global_state;                 // Global states (currently Wifi and Mqtt) (8 bits)
 char my_version[33];                        // Composed version string
+char my_image[33];                          // Code image and/or commit
 char my_hostname[33];                       // Composed Wifi hostname
 char mqtt_client[TOPSZ];                    // Composed MQTT Clientname
 char mqtt_topic[TOPSZ];                     // Composed MQTT topic
@@ -199,7 +198,8 @@ void setup(void)
   if (VERSION & 0xff) {  // Development or patched version 6.3.0.10
     snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
   }
-
+  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
+  
   SettingsLoad();
   SettingsDelta();
 

From ac486f21864d438499f9269f3a936c5ddfd7eab5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 23 Jan 2020 10:57:29 +0100
Subject: [PATCH 164/403] Document my_image

---
 tasmota/tasmota.ino | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 5b47ca581..92ee55fdf 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -198,8 +198,9 @@ void setup(void)
   if (VERSION & 0xff) {  // Development or patched version 6.3.0.10
     snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
   }
-  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
-  
+  // Thehackbox inserts "release" or "commit number" before compiling using sed -i -e 's/PSTR("(%s)")/PSTR("(85cff52-%s)")/g' tasmota.ino
+  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);  // Results in (85cff52-tasmota) or (release-tasmota)
+
   SettingsLoad();
   SettingsDelta();
 

From 9afbf854cfa06c17c6e4d4801c634018f8cd1117 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 23 Jan 2020 13:03:05 +0100
Subject: [PATCH 165/403] Add rule trigger on one level deeper

Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
---
 RELEASENOTES.md           |  2 ++
 tasmota/CHANGELOG.md      |  3 ++-
 tasmota/xdrv_10_rules.ino | 12 +++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5eef31626..ef8df5f8d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -66,6 +66,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix ``WakeUp <x>`` ignores provided value (#7473)
 - Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
 - Fix ``PowerDelta`` zero power detection (#7515)
+- Fix ``RGBWWTable`` ignored (#7572)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
@@ -83,3 +84,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
+- Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b35d22064..5c7073c6e 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,12 +4,13 @@
 
 - Fix ``PowerDelta`` zero power detection (#7515)
 - Fix OTA minimal gzipped detection regression from 8.1.0.3
+- Fix ``RGBWWTable`` ignored (#7572)
 - Add web page sliders when ``SetOption37 128`` is active allowing control of white(s)
 - Add Zigbee persistence and friendly names
 - Add most SetOptions as defines to my_user_config.h
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
-- Fix ``RGBWWTable`` ignored (#7572)
+- Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 13287d009..b750ebcbe 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -259,6 +259,7 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
   JsonObject &root = jsonBuf.parseObject(event);
   if (!root.success()) { return false; }               // No valid JSON data
 
+  String rule_subfield = "";
   const char* str_value;
   if ((pos = rule_name.indexOf("[")) > 0) {            // "CURRENT[1]"
     int rule_name_idx = rule_name.substring(pos +1).toInt();
@@ -267,6 +268,11 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     }
     rule_name = rule_name.substring(0, pos);           // "CURRENT"
     str_value = root[rule_task][rule_name][rule_name_idx -1];  // "ENERGY" and "CURRENT" and 0
+  }
+  else if ((pos = rule_name.indexOf("#")) > 0) {       // "VIBRATION_SENSOR#AQARACUBESIDE"
+    rule_subfield = rule_name.substring(pos +1);       // "AQARACUBESIDE"
+    rule_name = rule_name.substring(0, pos);           // "VIBRATION_SENSOR"
+    str_value = root[rule_task][rule_name][rule_subfield];  // "ZIGBEERECEIVED", "VIBRATION_SENSOR" and "AQARACUBESIDE"
   } else {
     str_value = root[rule_task][rule_name];            // "INA219" and "CURRENT"
   }
@@ -274,7 +280,11 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
 //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Task %s, Name %s, Value |%s|, TrigCnt %d, TrigSt %d, Source %s, Json %s"),
 //  rule_task.c_str(), rule_name.c_str(), rule_svalue, Rules.trigger_count[rule_set], bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set]), event.c_str(), (str_value) ? str_value : "none");
 
-  if (!root[rule_task][rule_name].success()) { return false; }
+  if (rule_subfield.length()) {
+    if (!root[rule_task][rule_name][rule_subfield].success()) { return false; }
+  } else {
+    if (!root[rule_task][rule_name].success()) { return false; }
+  }
   // No value but rule_name is ok
 
   Rules.event_value = str_value;                       // Prepare %value%

From ad083d1675003e20ed5cf9ec16e1cf7e78d0e74c Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Thu, 23 Jan 2020 16:13:25 +0100
Subject: [PATCH 166/403] Some code cleanup and add comments & info

---
 tasmota/my_user_config.h       |  2 +-
 tasmota/xnrg_13_fif_le01mr.ino | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 85d6737e9..8a709c2dd 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -499,7 +499,7 @@
   #define SOLAXX1_SPEED        9600              // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
   #define SOLAXX1_PV2                            // Solax X1 using second PV
 //#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
-  #define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (2400 default)
+  #define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM)
   #define LE01MR_ADDR          1                 // LE-01MR modbus address (0x01 default)
 // -- Low level interface devices -----------------
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)
diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
index 342e8cf17..e99041c9c 100644
--- a/tasmota/xnrg_13_fif_le01mr.ino
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -23,7 +23,7 @@
  *               (and bidirectional energy counting - enabled by RS485).
  * It measure: Active energy imported AE+ [kWh] , Reactive energy imported RE+ [kvarh],
  *             Voltage V [V], Current I [A], Frequency F [Hz], power factor (aka "cos-phi"),
- *             Active power P [kW], Reactive power Q [kvar], Apparent power S [kVA],
+ *             Active power P [kW], Reactive power Q [kVAr], Apparent power S [kVA],
  *             *Active energy exported AE- [kWh] (when meter is switched to bi-directional counting then 
  *                  reactive energy imported register contains value of Active energy exported).
  *
@@ -31,6 +31,12 @@
  *    EN: https://www.fif.com.pl/en/usage-electric-power-meters/517-electricity-consumption-meter-le-01mr.html
  *    PL: https://www.fif.com.pl/pl/liczniki-zuzycia-energii-elektrycznej/517-licznik-zuzycia-energii-le-01mr.html
  * 
+ * Note about communication settings: The meter must be reconfigured to use baudrate 2400 (or 9600) *without* 
+ *                                    parity bit - by default the meter is configured to 9600 8E1 
+ *                                    (Frame format: "EVEN 1") . To make those changes, use LE-Config 
+ *                                    software (can be found in download tab in product page - link above)
+ *                                    and USB-RS485 dongle (those cheap ~2$ from ali works fine)
+ * 
  * Register descriptions (not all, only those that are being read):
  * 
  * /----------------------------------- Register address
@@ -54,6 +60,11 @@
  *                 second register contains lower word of 32bit dword:
  *                   value_32bit = (register+0)<<16 | (register+1); 
  *                   /or/ val32bit = (reg+0)*65536 + (reg+1);
+ * 
+ * Note about MQTT/JSON: In fields "ENERGY.TotalActive" and "ENERGY.TotalReactive" there are 
+ *                        counters values directly from the meter (without Tasmota calculation,
+ *                        energy used calculated by Tasmota is in Total/Today fields ).
+ *                       Filed "ENERGY.Period" is always zero.
 \*********************************************************************************************/
 
 #define XNRG_13             13
@@ -113,7 +124,6 @@ void FifLEEvery250ms(void)
     if (error) {
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
     } else {
-      //if (Le01mr.read_state == 0) 
       Energy.data_valid[0] = 0;
 
       // SA=Slave Address, FC=Function Code, BC=Byte Count, B3..B0=Data byte, Ch Cl = crc16 checksum
@@ -140,9 +150,6 @@ void FifLEEvery250ms(void)
         value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
       }
 
-      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR buff[3..6]: %2x %2x %2x %2x"), buffer[3], buffer[4], buffer[5], buffer[6]);
-      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR reg_count/value_buff: %d / %d"), reg_count,value_buff);
-
       switch(Le01mr.read_state) {
         case 0:
           Energy.frequency[0] = value_buff * 0.01f;  // 5000 => 50.00
@@ -197,7 +204,6 @@ void FifLEEvery250ms(void)
     // some registers are 1reg in size
     if (Le01mr.read_state < 3) reg_count=1;
     // send request
-    //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus req reg %X, count %d"), le01mr_register_addresses[Le01mr.read_state], reg_count);
     FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
   } else {
     Le01mr.send_retry--;

From e26999f3006673933313c669f4dfb8b41cc558c0 Mon Sep 17 00:00:00 2001
From: saper-2 <sapers.2@gmail.com>
Date: Thu, 23 Jan 2020 17:18:44 +0100
Subject: [PATCH 167/403] Updated lang files with new defines + comments

---
 tasmota/language/bg-BG.h |  5 ++++-
 tasmota/language/cs-CZ.h |  5 ++++-
 tasmota/language/de-DE.h |  5 ++++-
 tasmota/language/el-GR.h |  5 ++++-
 tasmota/language/es-ES.h |  5 ++++-
 tasmota/language/fr-FR.h |  5 ++++-
 tasmota/language/he-HE.h |  5 ++++-
 tasmota/language/hu-HU.h |  5 ++++-
 tasmota/language/it-IT.h |  5 ++++-
 tasmota/language/ko-KO.h |  5 ++++-
 tasmota/language/nl-NL.h |  5 ++++-
 tasmota/language/pl-PL.h |  5 ++++-
 tasmota/language/pt-BR.h |  5 ++++-
 tasmota/language/pt-PT.h |  5 ++++-
 tasmota/language/ru-RU.h |  5 ++++-
 tasmota/language/sk-SK.h |  5 ++++-
 tasmota/language/sv-SE.h |  5 ++++-
 tasmota/language/tr-TR.h |  5 ++++-
 tasmota/language/uk-UA.h |  5 ++++-
 tasmota/language/zh-CN.h |  5 ++++-
 tasmota/language/zh-TW.h |  5 ++++-
 tasmota/my_user_config.h |  2 +-
 tasmota/tasmota_post.h   | 10 +++++-----
 23 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 8f1c82bc3..b91a2e6e4 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Фазов ъгъл"
 #define D_IMPORT_ACTIVE   "Входна активна мощност"
 #define D_EXPORT_ACTIVE   "Изходна активна мощност"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Общо реактивна мощност"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "Напрежение на PV1"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 3b11a7ebc..4bf6a8355 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index e09278526..944ce7123 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phasenwinkel"
 #define D_IMPORT_ACTIVE   "Importiere Wirk"
 #define D_EXPORT_ACTIVE   "Exportiere Wirk"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Blind"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Grad"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Spannung"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 070267215..82def9666 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 8ff2b415f..48d0f26e0 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Ángulo de Fase"
 #define D_IMPORT_ACTIVE   "P. Activa Entrante"
 #define D_EXPORT_ACTIVE   "P. Activa Saliente"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "P. Reactiva Total"
 #define D_UNIT_KWARH      "kVArH"
 #define D_UNIT_ANGLE      "Grados"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltaje"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 3829a8681..c5f7dcc38 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET   "Esclave Rst"
 #define D_SENSOR_GPS_TX        "GPS TX"
 #define D_SENSOR_GPS_RX        "GPS RX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Angle de phase"
 #define D_IMPORT_ACTIVE   "Énergie act conso"
 #define D_EXPORT_ACTIVE   "Énergie act fournie"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Énergie réa totale"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "Tension PV1"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index d0c5e364b..491e85192 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index 70f219c98..eb0b6d6b4 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Fázisszög"
 #define D_IMPORT_ACTIVE   "Bejövő aktív"
 #define D_EXPORT_ACTIVE   "Kimenő aktív"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Összes reaktív"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "fok"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index 73830deca..a5255e9ed 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Angolo Fase"
 #define D_IMPORT_ACTIVE   "Potenza Attiva Importata"
 #define D_EXPORT_ACTIVE   "Potenza Attiva Esportata"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Potenza Reattiva Totale"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "°"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltaggio"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 328acc568..036f4adbb 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 3d5ec8b7d..de15f5d05 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Fase hoek"
 #define D_IMPORT_ACTIVE   "Import werkelijk"
 #define D_EXPORT_ACTIVE   "Export werkelijk"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Totaal blind"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 spanning"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 63fe6fcad..ac2da9524 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Przesunięcie faz"
 #define D_IMPORT_ACTIVE   "Czynna pobrana"
 #define D_EXPORT_ACTIVE   "Czynna oddana"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Bierna całkowita"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Całkowita czynna"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "Napięcie PV1"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index da6e8ca1b..6695e144d 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "W/h"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Ângulo de Fase"
 #define D_IMPORT_ACTIVE   "Importar Ativo"
 #define D_EXPORT_ACTIVE   "Exportar Ativo"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Reativo total"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltagem"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 47137b90b..53e31cb5a 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Ângulo de fase"
 #define D_IMPORT_ACTIVE   "Ativo importado"
 #define D_EXPORT_ACTIVE   "Ativo exportado"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Reactivo total"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "Voltagem PV1"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 31c295059..3cf388240 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "А"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "ВтЧ"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Угол фазы"
 #define D_IMPORT_ACTIVE   "Импорт активной мощности"
 #define D_EXPORT_ACTIVE   "Экспорт активной мощности"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Итого реактивная мощность"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Град"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 89f3d7353..b3d007214 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index ddc2307b4..23badaeed 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Fasvinkel"
 #define D_IMPORT_ACTIVE   "Import aktiv"
 #define D_EXPORT_ACTIVE   "Export aktiv"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total reaktiv"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total aktiv"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 38f125d6c..03b49afc1 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "Wh"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index b634935cf..067a50c31 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE                    "А"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR                  "Вт/г"
 #define D_UNIT_WATT_METER_QUADRAT        "Вт/м²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Кут фази"
 #define D_IMPORT_ACTIVE   "Активна вхід"
 #define D_EXPORT_ACTIVE   "Активна вихід"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Всього реактивна"
 #define D_UNIT_KWARH      "кВАр/г"
 #define D_UNIT_ANGLE      "Град"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Напруга"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 97b41a29a..0c9d56922 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "安"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "瓦时"
 #define D_UNIT_WATT_METER_QUADRAT "瓦/平米"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "相位角"
 #define D_IMPORT_ACTIVE   "有功输入"
 #define D_EXPORT_ACTIVE   "有功输出"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "总无功功率"
 #define D_UNIT_KWARH      "千乏时"
 #define D_UNIT_ANGLE      "度"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 1fd30e6e4..6f1033c54 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -634,6 +634,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 
 // Units
 #define D_UNIT_AMPERE "安"
@@ -669,7 +671,7 @@
 #define D_UNIT_WATTHOUR "瓦時"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
-//SDM220
+//SDM220, SDM120, LE01MR
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"
@@ -678,6 +680,7 @@
 #define D_TOTAL_REACTIVE  "Total Reactive"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Active"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltage"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 8a709c2dd..d72e8cce9 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -499,7 +499,7 @@
   #define SOLAXX1_SPEED        9600              // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
   #define SOLAXX1_PV2                            // Solax X1 using second PV
 //#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
-  #define LE01MR_SPEED         2400              // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM)
+  #define LE01MR_SPEED         9600              // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM)
   #define LE01MR_ADDR          1                 // LE-01MR modbus address (0x01 default)
 // -- Low level interface devices -----------------
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 8a16ffead..c1b897920 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -194,7 +194,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_DDS2382                              // Add support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #define USE_DDSU666                              // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 //#define USE_SOLAX_X1                             // Add support for Solax X1 series Modbus log info (+3k1 code)
-//#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
+//#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter (+2k code)
 
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #define USE_MAX31855                             // Add support for MAX31855 K-Type thermocouple sensor using softSPI
@@ -282,7 +282,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
   #undef USE_DDS2382                             // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
   #undef USE_DDSU666                             // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
   #undef USE_SOLAX_X1                            // Disable support for Solax X1 series Modbus log info (+3k1 code)
-  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter
+  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter (+2k code)
 
 #define USE_I2C                                  // I2C using library wire (+10k code, 0k2 mem, 124 iram)
   #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
@@ -364,7 +364,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
   #undef USE_DDS2382                             // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
   #undef USE_DDSU666                             // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
   #undef USE_SOLAX_X1                            // Disable support for Solax X1 series Modbus log info (+3k1 code)
-  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter
+  #undef USE_LE01MR                              // Disable support for F&F LE-01MR Modbus energy meter (+2k code)
 
 //#undef USE_DS18x20                               // Disable support for DS18x20 sensors with id sort, single scan and read retry (+1k3 code)
 
@@ -484,7 +484,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DDS2382                               // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #undef USE_DDSU666                               // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 #undef USE_SOLAX_X1                              // Disable support for Solax X1 series Modbus log info (+3k1 code)
-#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter
+#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter (+2k code)
 
 #undef USE_DHT                                   // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI
@@ -596,7 +596,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DDS2382                               // Disable support for Hiking DDS2382 Modbus energy monitor (+0k6 code)
 #undef USE_DDSU666                               // Disable support for Chint DDSU666 Modbus energy monitor (+0k6 code)
 #undef USE_SOLAX_X1                              // Disable support for Solax X1 series Modbus log info (+3k1 code)
-#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter
+#undef USE_LE01MR                                // Disable support for F&F LE-01MR Modbus energy meter (+2k code)
 
 #undef USE_DHT                                   // Disable support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI

From 3b71173a09931098250e102981f6267e45d00fd5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 23 Jan 2020 18:13:32 +0100
Subject: [PATCH 168/403] Add precision to Moisture sensor

Add precision to Moisture sensor (#7402)
---
 tasmota/settings.h         |  3 ++-
 tasmota/xsns_02_analog.ino | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index 74023ff60..dba74eb7d 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -467,8 +467,9 @@ struct SYSCFG {
   uint8_t       hotplug_scan;              // F03
   uint8_t       reserved1;                 // F04 - reserved for s-hadinger
 
-  uint8_t       free_f05[215];             // F05
+  uint8_t       free_f05[211];             // F05
 
+  int           adc_param4;                // FD8
   uint32_t      shutter_button[MAX_KEYS];  // FDC
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
   uint32_t      cfg_timestamp;             // FF8
diff --git a/tasmota/xsns_02_analog.ino b/tasmota/xsns_02_analog.ino
index f4de98d9a..93df3d5e1 100644
--- a/tasmota/xsns_02_analog.ino
+++ b/tasmota/xsns_02_analog.ino
@@ -71,7 +71,7 @@ struct {
 
 void AdcInit(void)
 {
-  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000) || (Settings.adc_param1 < 100)) {
+  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000)) {
     if (ADC0_TEMP == my_adc0) {
       // Default Shelly 2.5 and 1PM parameters
       Settings.adc_param_type = ADC0_TEMP;
@@ -90,6 +90,7 @@ void AdcInit(void)
       Settings.adc_param1 = 0;
       Settings.adc_param2 = 1023;
       Settings.adc_param3 = 0;
+      Settings.adc_param4 = 100;
     }
     else if (ADC0_CT_POWER == my_adc0) {
       Settings.adc_param_type = ADC0_CT_POWER;
@@ -147,13 +148,10 @@ uint16_t AdcGetLux(void)
 uint16_t AdcGetMoist(void)
 {
   // formula for calibration: value, fromLow, fromHigh, toHigh, toLow
-  // Example: 632, 0, 1023, 100, 0
+  // Example: 632, 0, 1023, 0, 100
   // int( ( ( (<param2> - <analogue-value>) / ( <param2> - <param1> ) ) * ( <param3> - <param4> ) ) + <param4> )
-  // double amoist = ((Settings.adc_param2 - (double)adc) / (Settings.adc_param2 - Settings.adc_param1) * 100;
-  // int((((1023 - <analog-reading>) / ( 1023 - 0 )) * ( 100 - 0 )) + 0 )
   int adc = AdcRead(2);
-  double amoist = ((double)Settings.adc_param2 - (double)adc) / ((double)Settings.adc_param2 - (double)Settings.adc_param1) * 100;
-  //double amoist = ((1023 - (double)adc) / 1023) * 100;
+  double amoist = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
   return (uint16_t)amoist;
 }
 
@@ -348,10 +346,14 @@ void CmndAdcParam(void)
         char sub_string[XdrvMailbox.data_len +1];
         // AdcParam 2, 32000, 10000, 3350
         // AdcParam 3, 10000, 12518931, -1.405
+        // AdcParam 6, 0, 1023, 0, 100
         Settings.adc_param_type = XdrvMailbox.payload;
         Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
         Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
-        if (!ADC0_MOIST == XdrvMailbox.payload) {
+        if (ADC0_MOIST == XdrvMailbox.payload) {
+          Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
+          Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
+        } else {
           Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
         }
         if (ADC0_CT_POWER == XdrvMailbox.payload) {
@@ -373,7 +375,9 @@ void CmndAdcParam(void)
 
   // AdcParam
   Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
-  if (ADC0_MOIST != my_adc0) {
+  if (ADC0_MOIST == my_adc0) {
+    ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
+  } else {
     int value = Settings.adc_param3;
     uint8_t precision;
     for (precision = 4; precision > 0; precision--) {

From b977c2843576132cb372c7c774f7e2f829d5b005 Mon Sep 17 00:00:00 2001
From: Leonid Muravjev <asm@asm.pp.ru>
Date: Thu, 23 Jan 2020 23:28:39 +0300
Subject: [PATCH 169/403] ds1624/ds1621: Stabilization and bug fixes

* ds1621 datasheet is wrong for higher resolution, fixed
* ds1621 sometimes reset on bad (long) i2c bus, added autoreconfigure
* hotplug bug fixes
---
 tasmota/xsns_59_ds1624.ino | 60 ++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
index 9fe34b7d8..be0bcf9e5 100644
--- a/tasmota/xsns_59_ds1624.ino
+++ b/tasmota/xsns_59_ds1624.ino
@@ -38,6 +38,9 @@
 #define DS1621_COUNTER_REGISTER   0xA8 //exists on 1621 and 1624(undocumented)
 #define DS1621_SLOPE_REGISTER     0xA9 //exists on 1624 and 1624(undocumented)
 
+#define DS1621_CFG_1SHOT     (1<<0)
+#define DS1621_CFG_DONE      (1<<7)
+
 enum {
   DS1624_TYPE_DS1624,
   DS1624_TYPE_DS1621
@@ -50,6 +53,8 @@ bool ds1624_init = false;
 struct {
   float   value;
   uint8_t type;
+  int     errcnt;
+  int     misscnt;
   bool    valid;
   char    name[9];
 } ds1624_sns[DS1624_MAX_SENSORS];
@@ -58,6 +63,17 @@ uint32_t DS1624_Idx2Addr(uint32_t idx) {
   return 0x48 + idx;
 }
 
+int DS1624_Restart(uint8_t config, uint32_t idx) {
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if ((config & 1) == 1) {
+    config &= ~(DS1621_CFG_DONE|DS1621_CFG_1SHOT);
+    I2cWrite8(addr, DS1624_CONF_REGISTER, config);  // 1shot off
+    delay(10);                                      // by spec after writing
+    AddLog_P2(LOG_LEVEL_ERROR, "%s addr %x is reset, reconfig: %x", ds1624_sns[idx].name, addr, config);
+  }
+  I2cValidRead(addr, DS1624_START_REGISTER, 1);
+}
+
 void DS1624_HotPlugUp(uint32_t idx)
 {
   uint32_t addr = DS1624_Idx2Addr(idx);
@@ -75,12 +91,9 @@ void DS1624_HotPlugUp(uint32_t idx)
     I2cSetActiveFound(addr, ds1624_sns[idx].name);
 
     ds1624_sns[idx].valid = true;
-    if ((config & 1) == 1) {
-      config &= 0xfe;
-      I2cWrite8(addr, DS1624_CONF_REGISTER, config);  // 1show off
-      delay(10);                                      // by spec after writing
-    }
-    I2cValidRead(addr, DS1624_START_REGISTER, 1);     // FIXME 0 must read, but 0 isn't work for tasmota
+    ds1624_sns[idx].errcnt = 0;
+    ds1624_sns[idx].misscnt = 0;
+    DS1624_Restart(config,idx);
     AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
   }
 }
@@ -98,16 +111,37 @@ bool DS1624GetTemp(float *value, int idx)
 {
   uint32_t addr = DS1624_Idx2Addr(idx);
 
+  uint8_t config;
+  if (!I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    ds1624_sns[idx].misscnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s device missing (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].misscnt);
+    return false;
+  }
+  ds1624_sns[idx].misscnt=0;
+  if (config & (DS1621_CFG_1SHOT|DS1621_CFG_DONE)) {
+    ds1624_sns[idx].errcnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s config error, restart... (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].errcnt);
+    DS1624_Restart(config, idx);
+    return false;
+  }
+
   uint16_t t;
   if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
-  *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
-  if (ds1624_sns[idx].type == DS1624_TYPE_DS1621) {  // Higher resolution
+  if (ds1624_sns[idx].type == DS1624_TYPE_DS1624) {
+    *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
+  } else { //type == DS1624_TYPE_DS1621
+    // Datasheet for ds1621 is wrong for high resolution, real is:
+    *value = ((float)(int8_t)(t>>8));
     uint8_t remain;
     if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
     uint8_t perc;
     if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
-    *value += ((float)perc - (float)remain)/((float)perc) - 0.25;
+    float fix=(float)(perc - remain)/(float)perc;
+    *value+=fix;
   }
+  ds1624_sns[idx].errcnt=0;
+  config &= ~(DS1621_CFG_DONE);
+  I2cWrite8(addr, DS1624_CONF_REGISTER, config);
   return true;
 }
 
@@ -120,9 +154,11 @@ void DS1624HotPlugScan(void)
     if (I2cActive(addr) && !ds1624_sns[idx].valid) {
       continue;  // is busy by another driver
     }
-    if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) {
-      DS1624_HotPlugDown(idx);
-      continue;
+    if (ds1624_sns[idx].valid) {
+      if ((ds1624_sns[idx].misscnt>2)||(ds1624_sns[idx].errcnt>2)) {
+        DS1624_HotPlugDown(idx);
+        continue;
+      }
     }
     DS1624_HotPlugUp(idx);
   }

From 60f54927655027931c115e440859a3ec614117ed Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Thu, 23 Jan 2020 21:55:10 +0100
Subject: [PATCH 170/403] Add Zigbee support for Aqara Cube rotate

---
 tasmota/xdrv_23_zigbee_5_converters.ino | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index af691876e..795b9db1a 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -356,7 +356,12 @@ uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer
 
     // TODO
     case 0x39:      // float
-      i += 4;
+      {
+        uint32_t uint32_val = buf.get32(i);
+        float  * float_val = (float*) &uint32_val;
+        i += 4;
+        json[attrid_str] = *float_val;
+      }
       break;
 
     case 0xE0:      // ToD
@@ -401,7 +406,12 @@ uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer
       i += 2;
       break;
     case 0x3A:      // double precision
-      i += 8;
+      {
+        uint64_t uint64_val = buf.get64(i);
+        double  * double_val = (double*) &uint64_val;
+        i += 8;
+        json[attrid_str] = *double_val;
+      }
       break;
   }
 
@@ -561,7 +571,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   { 0x000C, 0x0041,  "MaxPresentValue",      &Z_Copy },
   { 0x000C, 0x0045,  "MinPresentValue",      &Z_Copy },
   { 0x000C, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x000C, 0x0055,  "PresentValue",         &Z_Copy },
+  { 0x000C, 0x0055,  "AqaraRotate",          &Z_Copy },
   { 0x000C, 0x0057,  "PriorityArray",        &Z_Copy },
   { 0x000C, 0x0067,  "Reliability",          &Z_Copy },
   { 0x000C, 0x0068,  "RelinquishDefault",    &Z_Copy },
@@ -569,6 +579,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   { 0x000C, 0x006F,  "StatusFlags",          &Z_Copy },
   { 0x000C, 0x0075,  "EngineeringUnits",     &Z_Copy },
   { 0x000C, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x000C, 0xFF05,  "Aqara_FF05",           &Z_Copy },
   // Binary Output cluster
   { 0x0010, 0x0004,  "ActiveText",           &Z_Copy },
   { 0x0010, 0x001C,  "Description",          &Z_Copy },

From 6757d9731a58db59609de709980648eec7ede419 Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Thu, 23 Jan 2020 19:17:15 -0300
Subject: [PATCH 171/403] new ADC Range definition

---
 tasmota/language/bg-BG.h | 1 +
 tasmota/language/cs-CZ.h | 1 +
 tasmota/language/de-DE.h | 1 +
 tasmota/language/el-GR.h | 1 +
 tasmota/language/en-GB.h | 1 +
 tasmota/language/es-ES.h | 1 +
 tasmota/language/fr-FR.h | 1 +
 tasmota/language/he-HE.h | 1 +
 tasmota/language/hu-HU.h | 1 +
 tasmota/language/it-IT.h | 1 +
 tasmota/language/ko-KO.h | 1 +
 tasmota/language/nl-NL.h | 1 +
 tasmota/language/pl-PL.h | 1 +
 tasmota/language/pt-BR.h | 1 +
 tasmota/language/pt-PT.h | 1 +
 tasmota/language/ru-RU.h | 1 +
 tasmota/language/sk-SK.h | 1 +
 tasmota/language/sv-SE.h | 1 +
 tasmota/language/tr-TR.h | 1 +
 tasmota/language/uk-UA.h | 1 +
 tasmota/language/zh-CN.h | 1 +
 tasmota/language/zh-TW.h | 1 +
 22 files changed, 22 insertions(+)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 8f1c82bc3..e89903cee 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Размер на програмата"
 #define D_PROJECT "Проект"
 #define D_RAIN "Дъжд"
+#define D_RANGE "Range"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Рестарт"
 #define D_RESTARTING "Рестартиране"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 3b11a7ebc..d7e8e188e 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Velikost programu"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Přijatý"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restartování"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index e09278526..b710e2975 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Ben. Flash Speicher"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Regen"
+#define D_RANGE "Range"
 #define D_RECEIVED "erhalten"
 #define D_RESTART "Neustart"
 #define D_RESTARTING "starte neu"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 070267215..1c76125fa 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Μέγεθος προγράμματος"
 #define D_PROJECT "Έργο"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Ελήφθη"
 #define D_RESTART "Επανεκκίνηση"
 #define D_RESTARTING "Επανεκκινεί"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 5121a7471..b994b0409 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Program Size"
 #define D_PROJECT "Project"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Received"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restarting"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 8ff2b415f..6b8d60d01 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Tamaño Programa"
 #define D_PROJECT "Proyecto"
 #define D_RAIN "Lluvia"
+#define D_RANGE "Range"
 #define D_RECEIVED "Recibido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "Reiniciando"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 3829a8681..4a861bd82 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Taille programme"
 #define D_PROJECT "Projet"
 #define D_RAIN "Pluie"
+#define D_RANGE "Range"
 #define D_RECEIVED "Reçu"
 #define D_RESTART "Redémarrage"
 #define D_RESTARTING "Redémarre"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index d0c5e364b..166c5c735 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "גודל תוכנית"
 #define D_PROJECT "פרויקט"
 #define D_RAIN "גשם"
+#define D_RANGE "Range"
 #define D_RECEIVED "התקבל"
 #define D_RESTART "איתחול"
 #define D_RESTARTING "הפעלה מחדש"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index 70f219c98..e1cec813a 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Program méret"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Eső"
+#define D_RANGE "Range"
 #define D_RECEIVED "Érkezett"
 #define D_RESTART "Újraindítás"
 #define D_RESTARTING "Újraindítás"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index 73830deca..d7ec1e0e5 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Dimensione Programma"
 #define D_PROJECT "Progetto"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Ricevuto"
 #define D_RESTART "Riavvio"
 #define D_RESTARTING "Riavviando"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 328acc568..55b8dba97 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "프로그램 용량"
 #define D_PROJECT "프로젝트"
 #define D_RAIN "비"
+#define D_RANGE "Range"
 #define D_RECEIVED "받음"
 #define D_RESTART "재시작"
 #define D_RESTARTING "재시작 중.."
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 3d5ec8b7d..c0b5a9862 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Programma Grootte"
 #define D_PROJECT "Project"
 #define D_RAIN "Regen"
+#define D_RANGE "Range"
 #define D_RECEIVED "Ontvangen"
 #define D_RESTART "Herstart"
 #define D_RESTARTING "Herstarten"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 63fe6fcad..237bc66f1 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Rozmiar programu"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Deszcz"
+#define D_RANGE "Range"
 #define D_RECEIVED "Otrzymany"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restartowanie"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index da6e8ca1b..c56262b11 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Tamanho do programa"
 #define D_PROJECT "Projeto"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "Reiniciando"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 47137b90b..be9c6d493 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Tamanho do Programa"
 #define D_PROJECT "Projeto"
 #define D_RAIN "Chuva"
+#define D_RANGE "Range"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "A reiniciar"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 31c295059..57dfa40e1 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Размер программы "
 #define D_PROJECT "Проект"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Перезапуск"
 #define D_RESTARTING "Перезапуск"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 89f3d7353..ee7afb49f 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Veľkosť programu"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Dážď"
+#define D_RANGE "Range"
 #define D_RECEIVED "Prijatý"
 #define D_RESTART "Reštart"
 #define D_RESTARTING "Reštartuje sa"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index ddc2307b4..351bf6dbb 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Programstorlek"
 #define D_PROJECT "Projekt"
 #define D_RAIN "Regn"
+#define D_RANGE "Range"
 #define D_RECEIVED "Mottagen"
 #define D_RESTART "Omstart"
 #define D_RESTARTING "Startar om"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 38f125d6c..fced504d3 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Yazılım Boyutu"
 #define D_PROJECT "Proje"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "Alınan"
 #define D_RESTART "Yeniden Başlat"
 #define D_RESTARTING "Yeniden Başlatılıyor"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index b634935cf..81d02a8b3 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "Розмір програми"
 #define D_PROJECT "Проект"
 #define D_RAIN "Дощ"
+#define D_RANGE "Range"
 #define D_RECEIVED "Отримано"
 #define D_RESTART "Перезавантаження"
 #define D_RESTARTING "Перезавантаження"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 97b41a29a..12c368cd3 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "固件大小"
 #define D_PROJECT "项目:"
 #define D_RAIN "降水量"
+#define D_RANGE "Range"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重启"
 #define D_RESTARTING "正在重启"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 1fd30e6e4..7c1b2e3fb 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -137,6 +137,7 @@
 #define D_PROGRAM_SIZE "韌體大小"
 #define D_PROJECT "項目:"
 #define D_RAIN "Rain"
+#define D_RANGE "Range"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重啟"
 #define D_RESTARTING "正在重啟"

From 26755202c7336ac6256646591c4397b3bea93e2b Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Thu, 23 Jan 2020 19:21:49 -0300
Subject: [PATCH 172/403] New ADC Range

---
 tasmota/i18n.h             |  4 ++++
 tasmota/tasmota_template.h |  4 ++--
 tasmota/xsns_02_analog.ino | 32 ++++++++++++++++----------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 20207bcb4..6437bc2dc 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -114,6 +114,7 @@
 #define D_JSON_ACTIVE_POWERUSAGE "ActivePower"
 #define D_JSON_APPARENT_POWERUSAGE "ApparentPower"
 #define D_JSON_REACTIVE_POWERUSAGE "ReactivePower"
+#define D_JSON_RANGE "Range"
 #define D_JSON_PRESSURE "Pressure"
 #define D_JSON_PRESSUREATSEALEVEL "SeaPressure"
 #define D_JSON_PRESSURE_UNIT "PressureUnit"
@@ -605,6 +606,7 @@ const char JSON_SNS_TEMPHUM[] PROGMEM = ",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,
 
 const char JSON_SNS_ILLUMINANCE[] PROGMEM = ",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%d}";
 const char JSON_SNS_MOISTURE[] PROGMEM = ",\"%s\":{\"" D_JSON_MOISTURE "\":%d}";
+const char JSON_SNS_RANGE[] PROGMEM = ",\"%s\":{\"" D_JSON_RANGE "\":%d}";
 
 const char JSON_SNS_GNGPM[] PROGMEM = ",\"%s\":{\"" D_JSON_TOTAL_USAGE "\":%s,\"" D_JSON_FLOWRATE "\":%s}";
 
@@ -636,6 +638,8 @@ const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PE
 const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS " {e}";
 const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN" {e}";
 const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d %%{e}";
+const char HTTP_SNS_RANGE[] PROGMEM = "{s}%s " D_RANGE "{m}%d %%{e}";
+
 
 const char HTTP_SNS_VOLTAGE[] PROGMEM = "{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}";
 const char HTTP_SNS_CURRENT[] PROGMEM = "{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}";
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 9bb98ce6e..f041620c6 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -311,7 +311,7 @@ enum UserSelectableAdc0 {
   ADC0_LIGHT,          // Light sensor
   ADC0_BUTTON,         // Button
   ADC0_BUTTON_INV,
-  ADC0_MOIST,          // Moisture
+  ADC0_RANGE,          // Range
   ADC0_CT_POWER,       // Current
 //  ADC0_SWITCH,         // Switch
 //  ADC0_SWITCH_INV,
@@ -328,7 +328,7 @@ const char kAdc0Names[] PROGMEM =
   D_SENSOR_NONE "|" D_ANALOG_INPUT "|"
   D_TEMPERATURE "|" D_LIGHT "|"
   D_SENSOR_BUTTON "|" D_SENSOR_BUTTON "i|"
-  D_MOISTURE "|"
+  D_RANGE "|"
   D_CT_POWER "|"
 //  D_SENSOR_SWITCH "|" D_SENSOR_SWITCH "i|"
   ;
diff --git a/tasmota/xsns_02_analog.ino b/tasmota/xsns_02_analog.ino
index 93df3d5e1..038da9fa5 100644
--- a/tasmota/xsns_02_analog.ino
+++ b/tasmota/xsns_02_analog.ino
@@ -85,8 +85,8 @@ void AdcInit(void)
       Settings.adc_param2 = ANALOG_LDR_LUX_CALC_SCALAR;
       Settings.adc_param3 = ANALOG_LDR_LUX_CALC_EXPONENT * 10000;
     }
-    else if (ADC0_MOIST == my_adc0) {
-      Settings.adc_param_type = ADC0_MOIST;
+    else if (ADC0_RANGE == my_adc0) {
+      Settings.adc_param_type = ADC0_RANGE;
       Settings.adc_param1 = 0;
       Settings.adc_param2 = 1023;
       Settings.adc_param3 = 0;
@@ -145,14 +145,14 @@ uint16_t AdcGetLux(void)
   return (uint16_t)ldrLux;
 }
 
-uint16_t AdcGetMoist(void)
+uint16_t AdcGetRange(void)
 {
-  // formula for calibration: value, fromLow, fromHigh, toHigh, toLow
-  // Example: 632, 0, 1023, 0, 100
-  // int( ( ( (<param2> - <analogue-value>) / ( <param2> - <param1> ) ) * ( <param3> - <param4> ) ) + <param4> )
+  // formula for calibration: value, fromLow, fromHigh, toLow, toHigh
+  // Example: 514, 632, 236, 0, 100
+  // int( ((<param2> - <analog-value>) / (<param2> - <param1>) ) * (<param3> - <param4>) ) + <param4> )
   int adc = AdcRead(2);
-  double amoist = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
-  return (uint16_t)amoist;
+  double adcrange = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
+  return (uint16_t)adcrange;
 }
 
 void AdcGetCurrentPower(uint8_t factor)
@@ -253,14 +253,14 @@ void AdcShow(bool json)
     }
   }
 
-  else if (ADC0_MOIST == my_adc0) {
-    uint16_t adc_moist = AdcGetMoist();
+  else if (ADC0_RANGE == my_adc0) {
+    uint16_t adc_range = AdcGetRange();
 
     if (json) {
-      ResponseAppend_P(JSON_SNS_MOISTURE, "ANALOG", adc_moist);
+      ResponseAppend_P(JSON_SNS_RANGE, "ANALOG", adc_range);
 #ifdef USE_WEBSERVER
     } else {
-      WSContentSend_PD(HTTP_SNS_MOISTURE, "", adc_moist);
+      WSContentSend_PD(HTTP_SNS_RANGE, "", adc_range);
 #endif  // USE_WEBSERVER
     }
   }
@@ -340,7 +340,7 @@ void CmndAdcParam(void)
   if (XdrvMailbox.data_len) {
     if ((ADC0_TEMP == XdrvMailbox.payload) ||
         (ADC0_LIGHT == XdrvMailbox.payload) ||
-        (ADC0_MOIST == XdrvMailbox.payload) ||
+        (ADC0_RANGE == XdrvMailbox.payload) ||
         (ADC0_CT_POWER == XdrvMailbox.payload)) {
       if (strstr(XdrvMailbox.data, ",") != nullptr) {  // Process parameter entry
         char sub_string[XdrvMailbox.data_len +1];
@@ -350,7 +350,7 @@ void CmndAdcParam(void)
         Settings.adc_param_type = XdrvMailbox.payload;
         Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
         Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
-        if (ADC0_MOIST == XdrvMailbox.payload) {
+        if (ADC0_RANGE == XdrvMailbox.payload) {
           Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
           Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
         } else {
@@ -375,7 +375,7 @@ void CmndAdcParam(void)
 
   // AdcParam
   Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
-  if (ADC0_MOIST == my_adc0) {
+  if (ADC0_RANGE == my_adc0) {
     ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
   } else {
     int value = Settings.adc_param3;
@@ -407,7 +407,7 @@ bool Xsns02(uint8_t function)
       if ((ADC0_INPUT == my_adc0) ||
           (ADC0_TEMP == my_adc0) ||
           (ADC0_LIGHT == my_adc0) ||
-          (ADC0_MOIST == my_adc0) ||
+          (ADC0_RANGE == my_adc0) ||
           (ADC0_CT_POWER == my_adc0)) {
         switch (function) {
 #ifdef USE_RULES

From ddd1f4c379f99ed6892b8120fe693ee93de8c196 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 24 Jan 2020 12:48:50 +0100
Subject: [PATCH 173/403] Return state information when wakeup is complete

Return state information when wakeup is complete (#7583)
---
 tasmota/xdrv_04_light.ino | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 2de7432a0..4ef8b409e 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1723,8 +1723,16 @@ void LightAnimate(void)
               Light.new_color[i] = Light.current_color[i];
             }
           } else {
+/*
             Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\"}"));
             MqttPublishPrefixTopic_P(TELE, PSTR(D_CMND_WAKEUP));
+*/
+            Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\""));
+            LightState(1);
+            ResponseJsonEnd();
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WAKEUP));
+            XdrvRulesProcess();
+
             Light.wakeup_active = 0;
             Settings.light_scheme = LS_POWER;
           }

From 473299ffcd987d93fbe8eee5e1328bbf6bda54b5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 24 Jan 2020 17:13:39 +0100
Subject: [PATCH 174/403] Refactor rules JSON decoding

Refactor rules JSON decoding allowing up to 10 subtypes deep
---
 tasmota/xdrv_10_rules.ino | 53 +++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index b750ebcbe..89fbfebe9 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -255,37 +255,42 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
   }
 
   // Step2: Search rule_task and rule_name
-  StaticJsonBuffer<1024> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(event);
-  if (!root.success()) { return false; }               // No valid JSON data
-
-  String rule_subfield = "";
-  const char* str_value;
-  if ((pos = rule_name.indexOf("[")) > 0) {            // "CURRENT[1]"
-    int rule_name_idx = rule_name.substring(pos +1).toInt();
+  int rule_name_idx = 0;
+  if ((pos = rule_name.indexOf("[")) > 0) {            // "SUBTYPE1#CURRENT[1]"
+    rule_name_idx = rule_name.substring(pos +1).toInt();
     if ((rule_name_idx < 1) || (rule_name_idx > 6)) {  // Allow indexes 1 to 6
       rule_name_idx = 1;
     }
-    rule_name = rule_name.substring(0, pos);           // "CURRENT"
-    str_value = root[rule_task][rule_name][rule_name_idx -1];  // "ENERGY" and "CURRENT" and 0
-  }
-  else if ((pos = rule_name.indexOf("#")) > 0) {       // "VIBRATION_SENSOR#AQARACUBESIDE"
-    rule_subfield = rule_name.substring(pos +1);       // "AQARACUBESIDE"
-    rule_name = rule_name.substring(0, pos);           // "VIBRATION_SENSOR"
-    str_value = root[rule_task][rule_name][rule_subfield];  // "ZIGBEERECEIVED", "VIBRATION_SENSOR" and "AQARACUBESIDE"
-  } else {
-    str_value = root[rule_task][rule_name];            // "INA219" and "CURRENT"
+    rule_name = rule_name.substring(0, pos);           // "SUBTYPE1#CURRENT"
   }
 
-//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Task %s, Name %s, Value |%s|, TrigCnt %d, TrigSt %d, Source %s, Json %s"),
-//  rule_task.c_str(), rule_name.c_str(), rule_svalue, Rules.trigger_count[rule_set], bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set]), event.c_str(), (str_value) ? str_value : "none");
+  StaticJsonBuffer<1024> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(event);
+  if (!root.success()) { return false; }               // No valid JSON data
+  if (!root[rule_task].success()) { return false; }    // No rule_task in JSON data
 
-  if (rule_subfield.length()) {
-    if (!root[rule_task][rule_name][rule_subfield].success()) { return false; }
-  } else {
-    if (!root[rule_task][rule_name].success()) { return false; }
+  JsonObject &obj1 = root[rule_task];
+  JsonObject *obj = &obj1;
+  String subtype;
+  uint32_t i = 0;
+  while ((pos = rule_name.indexOf("#")) > 0) {         // "SUBTYPE1#SUBTYPE2#CURRENT"
+    subtype = rule_name.substring(0, pos);
+    if (!(*obj)[subtype].success()) { return false; }  // No subtype in JSON data
+    JsonObject &obj2 = (*obj)[subtype];
+    obj = &obj2;
+    rule_name = rule_name.substring(pos +1);
+    if (i++ > 10) { return false; }                    // Abandon possible loop
   }
-  // No value but rule_name is ok
+  if (!(*obj)[rule_name].success()) { return false; }  // No name in JSON data
+  const char* str_value;
+  if (rule_name_idx) {
+    str_value = (*obj)[rule_name][rule_name_idx -1];   // "CURRENT[1]"
+  } else {
+    str_value = (*obj)[rule_name];                     // "CURRENT"
+  }
+
+//  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Task %s, Name %s, Value |%s|, TrigCnt %d, TrigSt %d, Source %s, Json %s"),
+//    rule_task.c_str(), rule_name.c_str(), rule_svalue, Rules.trigger_count[rule_set], bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set]), event.c_str(), (str_value) ? str_value : "none");
 
   Rules.event_value = str_value;                       // Prepare %value%
 

From cfbd1cb85d870085276d7592a69c0e238de2237a Mon Sep 17 00:00:00 2001
From: RemiDing <richi.glatthaar@web.de>
Date: Sat, 25 Jan 2020 11:22:28 +0100
Subject: [PATCH 175/403] optimized

---
 tasmota/support_switch.ino | 41 +++++++++++++++++++++++++++++++++++++-
 tasmota/tasmota.h          |  4 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index 9cc3c336f..6df39c5d7 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -154,6 +154,22 @@ void SwitchHandler(uint8_t mode)
             case FOLLOWMULTI_INV:
               switchflag = ~button &1;       // Follow inverted wall switch state after hold
               break;
+            case PUSHHOLDMULTI:
+              if (PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
+              break;                 
+            case PUSHHOLDMULTI_INV:            
+              if (NOT_PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
+              break;              
           default:
             SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
             break;
@@ -213,8 +229,31 @@ void SwitchHandler(uint8_t mode)
             Switch.hold_timer[i] = loops_per_second / 2;  // 0.5 second multi press window
           }
           break;
+        case PUSHHOLDMULTI:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;      
+          }
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;   // Toggle with pushbutton         
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                      
+          }       
+          break;
+        case PUSHHOLDMULTI_INV:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT            
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;   // Toggle with pushbutton
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                                 
+          }
+          break;
         }
-
         Switch.last_state[i] = button;
       }
       if (switchflag <= POWER_TOGGLE) {
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index b4b944d80..d12bb22ef 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -231,7 +231,7 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D
 
 enum WifiConfigOptions {WIFI_RESTART, EX_WIFI_SMARTCONFIG, WIFI_MANAGER, EX_WIFI_WPSCONFIG, WIFI_RETRY, WIFI_WAIT, WIFI_SERIAL, WIFI_MANAGER_RESET_ONLY, MAX_WIFI_OPTION};
 
-enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, MAX_SWITCH_OPTION};
+enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, PUSHHOLDMULTI, PUSHHOLDMULTI_INV, MAX_SWITCH_OPTION};
 
 enum LedStateOptions {LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT, MAX_LED_OPTION};
 
@@ -242,7 +242,7 @@ enum TopicOptions { CMND, STAT, TELE, nu1, RESULT_OR_CMND, RESULT_OR_STAT, RESUL
 enum ExecuteCommandPowerOptions { POWER_OFF, POWER_ON, POWER_TOGGLE, POWER_BLINK, POWER_BLINK_STOP,
                                   POWER_OFF_NO_STATE = 8, POWER_ON_NO_STATE, POWER_TOGGLE_NO_STATE,
                                   POWER_SHOW_STATE = 16 };
-enum SendKeyPowerOptions { POWER_HOLD = 3, CLEAR_RETAIN = 9 };
+enum SendKeyPowerOptions { POWER_HOLD = 3, POWER_INV = 4, POWER_CLEAR = 5, CLEAR_RETAIN = 9 };
 enum SendKeyOptions { KEY_BUTTON, KEY_SWITCH };
 
 enum PowerOnStateOptions { POWER_ALL_OFF, POWER_ALL_ON, POWER_ALL_SAVED_TOGGLE, POWER_ALL_SAVED, POWER_ALL_ALWAYS_ON, POWER_ALL_OFF_PULSETIME_ON };

From febabec3bb70968b500de7bb359c4b84b16b9fe3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 25 Jan 2020 12:17:35 +0100
Subject: [PATCH 176/403] Fix Gui ADC Range unit

---
 tasmota/i18n.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 6437bc2dc..dbee3246c 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -638,8 +638,7 @@ const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PE
 const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS " {e}";
 const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN" {e}";
 const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d %%{e}";
-const char HTTP_SNS_RANGE[] PROGMEM = "{s}%s " D_RANGE "{m}%d %%{e}";
-
+const char HTTP_SNS_RANGE[] PROGMEM = "{s}%s " D_RANGE "{m}%d{e}";
 
 const char HTTP_SNS_VOLTAGE[] PROGMEM = "{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}";
 const char HTTP_SNS_CURRENT[] PROGMEM = "{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}";

From 53e93215df029310d5ab392180902a35aebfd41a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 25 Jan 2020 13:45:26 +0100
Subject: [PATCH 177/403] Fix trigger SYSTEM#BOOT

Fix trigger SYSTEM#BOOT when mdns is disabled an no mqqthost is set (#7552)
---
 tasmota/xdrv_02_mqtt.ino | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 38bae9a01..529b3ce3c 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -667,11 +667,6 @@ void MqttCheck(void)
     if (!MqttIsConnected()) {
       global_state.mqtt_down = 1;
       if (!Mqtt.retry_counter) {
-#ifdef USE_DISCOVERY
-#ifdef MQTT_HOST_DISCOVERY
-        if (!strlen(SettingsText(SET_MQTT_HOST)) && !Wifi.mdns_begun) { return; }
-#endif  // MQTT_HOST_DISCOVERY
-#endif  // USE_DISCOVERY
         MqttReconnect();
       } else {
         Mqtt.retry_counter--;
@@ -681,7 +676,9 @@ void MqttCheck(void)
     }
   } else {
     global_state.mqtt_down = 0;
-    if (Mqtt.initial_connection_state) MqttReconnect();
+    if (Mqtt.initial_connection_state) {
+      MqttReconnect();
+    }
   }
 }
 

From e34cc3cbcc371196fd5e072eca1e212e45541941 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 25 Jan 2020 17:42:53 +0100
Subject: [PATCH 178/403] Change Zigbee commands renamed to ``Zb*``

---
 tasmota/CHANGELOG.md                      |  1 +
 tasmota/i18n.h                            | 39 ++++++++++---------
 tasmota/my_user_config.h                  |  2 +-
 tasmota/xdrv_23_zigbee_3_devices.ino      | 20 ++++++++--
 tasmota/xdrv_23_zigbee_4_persistence.ino  |  2 +-
 tasmota/xdrv_23_zigbee_5_converters.ino   |  2 +-
 tasmota/xdrv_23_zigbee_7_statemachine.ino |  2 +-
 tasmota/xdrv_23_zigbee_8_parsers.ino      |  2 +-
 tasmota/xdrv_23_zigbee_9_impl.ino         | 47 +++++++++++++----------
 9 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 5c7073c6e..a28cf36b4 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
+- Change Zigbee commands renamed to ``Zb*``
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index dbee3246c..fdf07acd6 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -467,29 +467,32 @@
 #define D_JSON_TUYA_MCU_RECEIVED "TuyaReceived"
 
 // Commands xdrv_23_zigbee.ino
+#define D_PRFX_ZB "Zb"
+#define D_PRFX_ZIGBEE "Zigbee"
 #define D_ZIGBEE_NOT_STARTED "Zigbee not started (yet)"
-#define D_CMND_ZIGBEE_PERMITJOIN "ZigbeePermitJoin"
-#define D_CMND_ZIGBEE_STATUS "ZigbeeStatus"
-#define D_CMND_ZIGBEE_RESET "ZigbeeReset"
+#define D_CMND_ZIGBEE_PERMITJOIN "PermitJoin"
+#define D_CMND_ZIGBEE_STATUS "Status"
+#define D_CMND_ZIGBEE_RESET "Reset"
   #define D_JSON_ZIGBEE_CC2530 "CC2530"
-#define D_CMND_ZIGBEEZNPRECEIVE "ZigbeeZNPReceive"      // only for debug
-#define D_CMND_ZIGBEEZNPSEND "ZigbeeZNPSend"
-  #define D_JSON_ZIGBEE_STATE "ZigbeeState"
-  #define D_JSON_ZIGBEEZNPRECEIVED "ZigbeeZNPReceived"
-  #define D_JSON_ZIGBEEZNPSENT "ZigbeeZNPSent"
-  #define D_JSON_ZIGBEEZCL_RECEIVED "ZigbeeZCLReceived"
-  #define D_JSON_ZIGBEEZCL_RAW_RECEIVED "ZigbeeZCLRawReceived"
+#define D_CMND_ZIGBEEZNPRECEIVE "ZNPReceive"      // only for debug
+#define D_CMND_ZIGBEEZNPSEND "ZNPSend"
+  #define D_JSON_ZIGBEE_STATE "ZbState"
+  #define D_JSON_ZIGBEEZNPRECEIVED "ZbZNPReceived"
+  #define D_JSON_ZIGBEEZNPSENT "ZbZNPSent"
+  #define D_JSON_ZIGBEEZCL_RECEIVED "ZbZCLReceived"
+  #define D_JSON_ZIGBEEZCL_RAW_RECEIVED "ZbZCLRawReceived"
   #define D_JSON_ZIGBEE_DEVICE "Device"
   #define D_JSON_ZIGBEE_NAME "Name"
-#define D_CMND_ZIGBEE_NAME "ZigbeeName"
-#define D_CMND_ZIGBEE_PROBE "ZigbeeProbe"
-#define D_CMND_ZIGBEE_FORGET "ZigbeeForget"
-#define D_CMND_ZIGBEE_SAVE "ZigbeeSave"
-#define D_CMND_ZIGBEE_RECEIVED "ZigbeeReceived"
+#define D_CMND_ZIGBEE_NAME "Name"
+#define D_CMND_ZIGBEE_PROBE "Probe"
+#define D_CMND_ZIGBEE_FORGET "Forget"
+#define D_CMND_ZIGBEE_SAVE "Save"
   #define D_CMND_ZIGBEE_LINKQUALITY "LinkQuality"
-#define D_CMND_ZIGBEE_READ "ZigbeeRead"
-#define D_CMND_ZIGBEE_SEND "ZigbeeSend"
-  #define D_JSON_ZIGBEE_ZCL_SENT "ZigbeeZCLSent"
+#define D_CMND_ZIGBEE_READ "Read"
+#define D_CMND_ZIGBEE_SEND "Send"
+  #define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent"
+#define D_JSON_ZIGBEE_RECEIVED "ZbReceived"
+#define D_JSON_ZIGBEE_RECEIVED_LEGACY "ZigbeeReceived"
 
 // Commands xdrv_25_A4988_Stepper.ino
 #define D_CMND_MOTOR "MOTOR"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index ec40b4c8d..8b52aa7a7 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -594,7 +594,7 @@
     #define IR_RCV_MIN_UNKNOWN_SIZE 6            // Set the smallest sized "UNKNOWN" message packets we actually care about (default 6, max 255)
 
 // -- Zigbee interface ----------------------------
-//#define USE_ZIGBEE                                // Enable serial communication with Zigbee CC2530 flashed with ZNP
+//#define USE_ZIGBEE                                // Enable serial communication with Zigbee CC2530 flashed with ZNP (+35k code, +3.2k mem)
   #define USE_ZIGBEE_PANID  0x1A63                // arbitrary PAN ID for Zigbee network, must be unique in the home
   #define USE_ZIGBEE_EXTPANID 0xCCCCCCCCCCCCCCCCL // arbitrary extended PAN ID
   #define USE_ZIGBEE_CHANNEL  11                  // Zigbee Channel (11-26)
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 339737b57..5db3986e4 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -681,12 +681,24 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
   zigbee_devices.jsonClear(shortaddr);
 
   if (use_fname) {
-    Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+    // DEPRECATED TODO
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
   } else {
-    Response_P(PSTR("{\"" D_CMND_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+    // DEPRECATED TODO
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
   }
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-  XdrvRulesProcess();
+  // MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+  // XdrvRulesProcess();
 }
 
 void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
diff --git a/tasmota/xdrv_23_zigbee_4_persistence.ino b/tasmota/xdrv_23_zigbee_4_persistence.ino
index c3003854f..fcf1dcdc3 100644
--- a/tasmota/xdrv_23_zigbee_4_persistence.ino
+++ b/tasmota/xdrv_23_zigbee_4_persistence.ino
@@ -184,7 +184,7 @@ class SBuffer hibernateDevices(void) {
   // Log
   char *hex_char = (char*) malloc((buf_len * 2) + 2);
   if (hex_char) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZigbeeFlashStore %s"),
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZbFlashStore %s"),
                                     ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
     free(hex_char);
   }
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 795b9db1a..0518ec6be 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -483,7 +483,7 @@ void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
   uint32_t len = _payload.len();
 
   char attrid_str[12];
-  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cmd_id, _cluster_id);
+  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cluster_id, _cmd_id);
 
   char hex_char[_payload.len()*2+2];
   ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 683375bf1..5a3d78e85 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -545,7 +545,7 @@ void ZigbeeStateMachine_Run(void) {
     }
 
     // load current instruction details
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Executing instruction pc=%d"), zigbee.pc);
+    //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Executing instruction pc=%d"), zigbee.pc);
     const Zigbee_Instruction *cur_instr_line = &zb_prog[zigbee.pc];
     cur_instr = pgm_read_byte(&cur_instr_line->i.i);
     cur_d8    = pgm_read_byte(&cur_instr_line->i.d8);
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 26185fd6c..74a900f00 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -445,7 +445,7 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   String msg("");
   msg.reserve(100);
   json.printTo(msg);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZigbeeZCLRawReceived: {\"0x%04X\":%s}"), srcaddr, msg.c_str());
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
 
   zcl_received.postProcessAttributes(srcaddr, json);
   // Add linkquality
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 9b44ce35e..2b529c8d6 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -28,12 +28,18 @@ const uint8_t  ZIGBEE_SOF_ALT = 0xFF;
 #include <TasmotaSerial.h>
 TasmotaSerial *ZigbeeSerial = nullptr;
 
-const char kZigbeeCommands[] PROGMEM = "|"
+
+const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"    // prefix
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME
-  ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME ;
+
+const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"    // legacy prefix -- deprecated
+  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
+  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
   &CmndZigbeeZNPSend, &CmndZigbeePermitJoin,
@@ -64,7 +70,7 @@ int32_t ZigbeeProcessInput(class SBuffer &buf) {
       }
     }
 
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZigbeeProcessInput: recv_prefix_match = %d, recv_filter_match = %d"), recv_prefix_match, recv_filter_match);
+    //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: recv_prefix_match = %d, recv_filter_match = %d"), recv_prefix_match, recv_filter_match);
   }
 
   // if there is a recv_callback, call it now
@@ -103,7 +109,7 @@ int32_t ZigbeeProcessInput(class SBuffer &buf) {
       res = (*zigbee.recv_unexpected)(res, buf);
     }
   }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZigbeeProcessInput: res = %d"), res);
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: res = %d"), res);
 
   // change state accordingly
   if (0 == res) {
@@ -136,7 +142,7 @@ void ZigbeeInput(void)
   while (ZigbeeSerial->available()) {
     yield();
     uint8_t zigbee_in_byte = ZigbeeSerial->read();
-		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZigbeeInput byte=%d len=%d"), zigbee_in_byte, zigbee_buffer->len());
+		//AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZbInput byte=%d len=%d"), zigbee_in_byte, zigbee_buffer->len());
 
 		if (0 == zigbee_buffer->len()) {  // make sure all variables are correctly initialized
 			zigbee_frame_len = 5;
@@ -145,14 +151,14 @@ void ZigbeeInput(void)
       // in this case the first bit (lsb) is missed and Tasmota receives 0xFF instead of 0xFE
       // We forgive this mistake, and next bytes are automatically resynchronized
       if (ZIGBEE_SOF_ALT == zigbee_in_byte) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZigbeeInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
         zigbee_in_byte = ZIGBEE_SOF;
       }
 		}
 
     if ((0 == zigbee_buffer->len()) && (ZIGBEE_SOF != zigbee_in_byte)) {
       // waiting for SOF (Start Of Frame) byte, discard anything else
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZigbeeInput discarding byte %02X"), zigbee_in_byte);
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput discarding byte %02X"), zigbee_in_byte);
       continue;     // discard
     }
 
@@ -212,7 +218,7 @@ void ZigbeeInit(void)
 {
   zigbee.active = false;
   if ((pin[GPIO_ZIGBEE_RX] < 99) && (pin[GPIO_ZIGBEE_TX] < 99)) {
-		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("Zigbee: GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
+		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
     // if seriallog_level is 0, we allow GPIO 13/15 to switch to Hardware Serial
     ZigbeeSerial = new TasmotaSerial(pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX], seriallog_level ? 1 : 2, 0, 256);   // set a receive buffer of 256 bytes
     ZigbeeSerial->begin(115200);
@@ -316,17 +322,17 @@ void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
 		uint8_t fcs = data_len;
 
 		ZigbeeSerial->write(ZIGBEE_SOF);		// 0xFE
-		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend SOF %02X"), ZIGBEE_SOF);
+		//AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend SOF %02X"), ZIGBEE_SOF);
 		ZigbeeSerial->write(data_len);
-		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend LEN %02X"), data_len);
+		//AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend LEN %02X"), data_len);
 		for (uint32_t i = 0; i < len; i++) {
 			uint8_t b = pgm_read_byte(msg + i);
 			ZigbeeSerial->write(b);
 			fcs ^= b;
-			AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend byt %02X"), b);
+			//AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend byt %02X"), b);
 		}
 		ZigbeeSerial->write(fcs);			// finally send fcs checksum byte
-		AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend FCS %02X"), fcs);
+		//AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ZNPSend FCS %02X"), fcs);
   }
 	// Now send a MQTT message to report the sent message
 	char hex_char[(len * 2) + 2];
@@ -417,13 +423,13 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
   if (0 == endpoint) {
     // endpoint is not specified, let's try to find it from shortAddr
     endpoint = zigbee_devices.findClusterEndpointIn(dstAddr, cluster);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeSend: guessing endpoint 0x%02X"), endpoint);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
   }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
     dstAddr, cluster, endpoint, cmd, data);
 
   if (0 == endpoint) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZigbeeSend: unspecified endpoint"));
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
     return;
   }
 
@@ -518,9 +524,9 @@ void CmndZigbeeSend(void) {
           }
         }
 
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeSend: command_template = %s"), cmd_str.c_str());
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
         cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);   // fill in parameters
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeSend: command_final    = %s"), cmd_str.c_str());
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
       } else {
         // we have zero command, pass through until last error for missing command
       }
@@ -531,7 +537,7 @@ void CmndZigbeeSend(void) {
       // we have an unsupported command type, just ignore it and fallback to missing command
     }
 
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZigbeeCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
               device, endpoint, cmd_str.c_str());
     zigbeeZCLSendStr(device, endpoint, cmd_str.c_str());
   } else {
@@ -717,7 +723,8 @@ bool Xdrv23(uint8_t function)
         ZigbeeInit();
         break;
       case FUNC_COMMAND:
-        result = DecodeCommand(kZigbeeCommands, ZigbeeCommand);
+        result = DecodeCommand(kZbCommands, ZigbeeCommand);
+        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);   // deprecated
         break;
     }
   }

From 81c6355b8f8068697f3364ab382319388625f5eb Mon Sep 17 00:00:00 2001
From: "CORP\\vdi" <info@velocitydevices.com>
Date: Sat, 25 Jan 2020 11:22:40 -0700
Subject: [PATCH 179/403] Address multiple WiFI connectivity /stability issues.
 1) Reduce the roam threshold to 5dBm to fix issues where a device might
 connect at -80dBM which is marginal operation, but would not roam to a -72dBm
 AP 2) Reduce the scan rate from 44 minutes to 5 minutes to accelerate network
 harmony 3) Arduino SDK was allowed to control re-connections which resulted
 in a de-authentication attack on teh WiFi AP.  Explicitly disable with
 WiFi.setAutoReconnect(false); 4) Reduce WIFI_CHECK_SEC to 5, and
 Wifi.retry_init times to accommodate Tasmota dealing with retransmissions. 5)
 WifiBeginAfterScan:  Save the last BSSID a connection attempt was made on. 
 Should that error, pick the next strongest AP for the next attempt. 
 Addresses situations where an AP has a high RSSI, but poor channel health due
 to it being overloaded. 6) WifiCheckIPAddrStatus: Error cases did not
 properly alternate between AP's, with some error cases geeting hug up where
 they did not initiate a reconnection so the device became non-responsive. 
 Device now starts at Wifi.retry_init, tries to connect, does again at
 Wifi.retry_init/2, and then does a WifiConfig.  Should no IP address be
 received, restart DHCP each second during this time.

Test Environment:
27 Tasmota devices
3 SonicWALL corporate AP's
Highly interfered 801.11n network
---
 tasmota/support_wifi.ino | 105 ++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 40 deletions(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 954e2fb3c..1dab28ff1 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -22,14 +22,19 @@
 \*********************************************************************************************/
 
 #ifndef WIFI_RSSI_THRESHOLD
-#define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
+// decrease the roam threshold to address devices connecting at very low RSSI and being close to inoperative
+//#define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
+#define WIFI_RSSI_THRESHOLD     5          // Difference in dB between current network and scanned network
 #endif
 #ifndef WIFI_RESCAN_MINUTES
-#define WIFI_RESCAN_MINUTES     44         // Number of minutes between wifi network rescan
+// increase rescan interval to 5 minutes to improve ability for devices to reach network harmony
+//#define WIFI_RESCAN_MINUTES     44         // Number of minutes between wifi network rescan
+#define WIFI_RESCAN_MINUTES    5           // Number of minutes between wifi network rescan
 #endif
 
 const uint8_t WIFI_CONFIG_SEC = 180;       // seconds before restart
-const uint8_t WIFI_CHECK_SEC = 20;         // seconds
+// drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK
+const uint8_t WIFI_CHECK_SEC = 5;          // seconds
 const uint8_t WIFI_RETRY_OFFSET_SEC = 20;  // seconds
 
 #include <ESP8266WiFi.h>                   // Wifi, MQTT, Ota, WifiManager
@@ -49,7 +54,8 @@ struct WIFI {
   uint8_t config_counter = 0;
   uint8_t mdns_begun = 0;                  // mDNS active
   uint8_t scan_state;
-  uint8_t bssid[6];
+  uint8_t bssid[6] = {0};
+  uint8_t bssid_last[6] = {0};             // store the last connect bssid
 } Wifi;
 
 int WifiGetRssiAsQuality(int rssi)
@@ -162,6 +168,7 @@ void WiFiSetSleepMode(void)
 void WifiBegin(uint8_t flag, uint8_t channel)
 {
   const char kWifiPhyMode[] = " BGN";
+  char hex_char[18];
 
 #ifdef USE_EMULATION
   UdpDisconnect();
@@ -183,6 +190,9 @@ void WifiBegin(uint8_t flag, uint8_t channel)
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); }  // B/G
   if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
 //  WiFi.setAutoReconnect(true);
+  // handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
+// this needs to be explicitly called as "false" otherwise the default is enabled
+  WiFi.setAutoReconnect(false);
   switch (flag) {
   case 0:  // AP1
   case 1:  // AP2
@@ -200,12 +210,15 @@ void WifiBegin(uint8_t flag, uint8_t channel)
   WiFi.hostname(my_hostname);
   if (channel) {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
+    // add debug output to console to show connected BSSID and channel for multi-AP installations
+	AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s Channel %d BSSId %s " D_IN_MODE " 11%c " D_AS " %s..."),
+      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'),kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
   } else {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
+      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
   }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
-    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
-
+  
 #if LWIP_IPV6
   for (bool configured = false; !configured;) {
     uint16_t cfgcnt = 0;
@@ -259,6 +272,12 @@ void WifiBeginAfterScan(void)
   }
   // Scan done
   if (5 == Wifi.scan_state) {
+    uint32_t number_known = 0;                                              // count the number of known AP's so we can clear the Wifi.bssid_last if there is only one
+    int32_t channel_max = 0;                                                // No scan result
+    int8_t ap_max = 3;                                                      // AP default if not found
+    uint8_t bssid_max[6];                                                   // Save last bssid
+    memcpy((void*) &bssid_max, (void*) &Wifi.bssid, sizeof(bssid_max));     // store the strongest bssid
+
     int32_t channel = 0;                            // No scan result
     int8_t ap = 3;                                  // AP default if not found
     uint8_t last_bssid[6];                          // Save last bssid
@@ -282,12 +301,25 @@ void WifiBeginAfterScan(void)
         for (j = 0; j < MAX_SSIDS; j++) {
           if (ssid_scan == SettingsText(SET_STASSID1 + j)) {  // SSID match
             known = true;
+            number_known++;
             if (rssi_scan > best_network_db) {      // Best network
               if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {  // Check for passphrase if not open wlan
-                best_network_db = (int8_t)rssi_scan;
-                channel = chan_scan;
-                ap = j;                             // AP1 or AP2
-                memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
+                // store the max values in case there is only one AP and we need to try to reconnect
+                memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
+                channel_max = chan_scan;
+                ap_max = j;
+                // if the bssid is not the same as the last failed attempt, force picking the next strongest AP to prevent getting stuck on a strong RSSI, but poor channel health
+                for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
+                  if (bssid_scan[i] != Wifi.bssid_last[i]) {
+                    best_network_db = (int8_t)rssi_scan;
+                    channel = chan_scan;
+                    ap = j;                             // AP1 or AP2
+                    memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
+                    // save the last bssid used
+                    memcpy((void*) &Wifi.bssid_last, (void*) bssid_scan, sizeof(Wifi.bssid_last));
+                   break;
+                  }
+                }
               }
             }
             break;
@@ -307,6 +339,16 @@ void WifiBeginAfterScan(void)
       WiFi.scanDelete();                            // Clean up Ram
       delay(0);
     }
+
+    // reset the last bssid if there is only one AP to allow the reconnect of the same AP on the next cycle
+    if (number_known == 1) {
+      // clear the last value
+      memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
+      memcpy((void*) &Wifi.bssid, (void*) bssid_max, sizeof(Wifi.bssid));
+      channel = channel_max;
+      ap = ap_max;
+    }
+
     Wifi.scan_state = 0;
     // If bssid changed then (re)connect wifi
     for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
@@ -381,17 +423,11 @@ void WifiCheckIp(void)
 #else
   if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
 #endif  // LWIP_IPV6=1
+    // initialize the last connect bssid since we had a successful connection
+    memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
     WifiSetState(1);
     Wifi.counter = WIFI_CHECK_SEC;
     Wifi.retry = Wifi.retry_init;
-    AddLog_P((Wifi.status != WL_CONNECTED) ? LOG_LEVEL_INFO : LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CONNECTED));
-    if (Wifi.status != WL_CONNECTED) {
-//      AddLog_P(LOG_LEVEL_INFO, PSTR("Wifi: Set IP addresses"));
-      Settings.ip_address[1] = (uint32_t)WiFi.gatewayIP();
-      Settings.ip_address[2] = (uint32_t)WiFi.subnetMask();
-      Settings.ip_address[3] = (uint32_t)WiFi.dnsIP();
-    }
-    Wifi.status = WL_CONNECTED;
 #ifdef USE_DISCOVERY
 #ifdef WEBSERVER_ADVERTISE
     if (2 == Wifi.mdns_begun) {
@@ -407,32 +443,18 @@ void WifiCheckIp(void)
     switch (Wifi.status) {
       case WL_CONNECTED:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
-        Wifi.status = 0;
-        Wifi.retry = Wifi.retry_init;
+        // if poor channel health prevents DHCP broadcast from succeeding, restart the request
+        // The code will eventually do a recoonect when the 1/2 interval is hit to try another access point if this remains unsuccessful
+        wifi_station_dhcpc_start();
         break;
       case WL_NO_SSID_AVAIL:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
-        if (WIFI_WAIT == Settings.sta_config) {
-          Wifi.retry = Wifi.retry_init;
-        } else {
-          if (Wifi.retry > (Wifi.retry_init / 2)) {
-            Wifi.retry = Wifi.retry_init / 2;
-          }
-          else if (Wifi.retry) {
-            Wifi.retry = 0;
-          }
-        }
         break;
       case WL_CONNECT_FAILED:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
-        if (Wifi.retry > (Wifi.retry_init / 2)) {
-          Wifi.retry = Wifi.retry_init / 2;
-        }
-        else if (Wifi.retry) {
-          Wifi.retry = 0;
-        }
         break;
       default:  // WL_IDLE_STATUS and WL_DISCONNECTED
+        // log on the 1/2 or full interval
         if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
           AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
         } else {
@@ -444,9 +466,11 @@ void WifiCheckIp(void)
           }
         }
     }
+
     if (Wifi.retry) {
       if (Settings.flag3.use_wifi_scan) {  // SetOption56 - Scan wifi network at restart for configured AP's
-        if (Wifi.retry_init == Wifi.retry) {
+        // check the 1/2 interval as well when rescanning - scan state machine takes 4 seconds
+        if ((Wifi.retry_init == Wifi.retry) || ((Wifi.retry_init / 2) == Wifi.retry)){
           Wifi.scan_state = 1;    // Select scanned SSID
         }
       } else {
@@ -593,7 +617,6 @@ String WifiGetOutputPower(void)
   dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
   return String(stemp1);
 }
-
 void WifiSetOutputPower(void)
 {
   WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
@@ -605,7 +628,9 @@ void WifiConnect(void)
   WifiSetOutputPower();
   WiFi.persistent(false);     // Solve possible wifi init errors
   Wifi.status = 0;
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
+  // lower the rety times now Tasmota control the reconnections, not the Arduino SDK
+  // Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
 }

From a935dda9ac6a78ff694929fb780aa87f171f1cd0 Mon Sep 17 00:00:00 2001
From: jay-wilkinson <49291581+jay-wilkinson@users.noreply.github.com>
Date: Sat, 25 Jan 2020 21:15:56 -0600
Subject: [PATCH 180/403] Update BUILDS.md

If you read enough issues you can finally find a vague reference to "Enable ALL protocols" and tasmota-ir but not in the same issue. Wasted a day on this. Looks like many others have too.
---
 BUILDS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BUILDS.md b/BUILDS.md
index 5cac6108f..aa1834061 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -128,6 +128,7 @@
 |                       |   |   |   |   |   |   |   |
 | USE_IR_REMOTE         | - | - | x | x | x | x | x |
 | USE_IR_RECEIVE        | - | - | x | x | x | x | x |
+| USE_IR_REMOTE_FULL    | - | - | - | - | - | x | - | Enable ALL protocols
 |                       |   |   |   |   |   |   |   |
 | USE_SR04              | - | - | x | x | x | - | x |
 | USE_TM1638            | - | - | - | - | x | - | - |

From 5b0259e7c3bc00b5b02bd5644074e91a1fd50460 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 26 Jan 2020 14:16:44 +0100
Subject: [PATCH 181/403] Keep legacy support

---
 tasmota/settings.ino     | 4 ++++
 tasmota/xdrv_02_mqtt.ino | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 363ebbd9f..33da93562 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -700,7 +700,11 @@ void EspErase(uint32_t start_sector, uint32_t end_sector)
 //    bool result = EsptoolEraseSector(sector);    // Esptool - erases flash completely (slow)
 
     if (serial_output) {
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+      Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
+#else
       Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
+#endif
       delay(10);
     } else {
       yield();
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 529b3ce3c..05072d5c7 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -1118,8 +1118,12 @@ void CmndTlsDump(void) {
   uint32_t start = (uint32_t)tls_spi_start + tls_block_offset;
   uint32_t end   = start + tls_block_len -1;
   for (uint32_t pos = start; pos < end; pos += 0x10) {
-      uint32_t* values = (uint32_t*)(pos);
-      Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+    uint32_t* values = (uint32_t*)(pos);
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+    Serial.printf("%08x:  %08x %08x %08x %08x\n", pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#else
+    Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#endif
   }
 }
 #endif  // DEBUG_DUMP_TLS

From ff01f934e28d117a626310dd2297111a3e5eaec7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 26 Jan 2020 14:20:40 +0100
Subject: [PATCH 182/403] Bump version 8.1.0.5

---
 RELEASENOTES.md           | 3 ++-
 tasmota/CHANGELOG.md      | 6 +++++-
 tasmota/tasmota_version.h | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ef8df5f8d..de6a1930b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,11 +52,12 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.4
+### Version 8.1.0.5
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Change IRremoteESP8266 library updated to v2.7.2
+- Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index a28cf36b4..49fecc225 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,7 +1,12 @@
 ## Unreleased (development)
 
+### 8.1.0.5 20200126
+
+- Bump version
+
 ### 8.1.0.4 20200116
 
+- Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Fix ``PowerDelta`` zero power detection (#7515)
 - Fix OTA minimal gzipped detection regression from 8.1.0.3
 - Fix ``RGBWWTable`` ignored (#7572)
@@ -11,7 +16,6 @@
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
-- Change Zigbee commands renamed to ``Zb*``
 
 ### 8.1.0.3 20200106
 
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 1539def62..e38f4cad0 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010004;
+const uint32_t VERSION = 0x08010005;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;

From 3d00c4f0930d65e2b8ec25454ed44553810b21d5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 26 Jan 2020 14:30:11 +0100
Subject: [PATCH 183/403] Change wifi connectivity stability

Change wifi connectivity stability (#7602)
---
 RELEASENOTES.md          |  1 +
 tasmota/CHANGELOG.md     |  2 +-
 tasmota/support_wifi.ino | 11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index de6a1930b..10e9a8139 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -58,6 +58,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Change IRremoteESP8266 library updated to v2.7.2
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
+- Change wifi connectivity stability (#7602)
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 49fecc225..edf6108e0 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### 8.1.0.5 20200126
 
-- Bump version
+- Change wifi connectivity stability (#7602)
 
 ### 8.1.0.4 20200116
 
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 1dab28ff1..5053d89ce 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -211,14 +211,17 @@ void WifiBegin(uint8_t flag, uint8_t channel)
   if (channel) {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
     // add debug output to console to show connected BSSID and channel for multi-AP installations
-	AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s Channel %d BSSId %s " D_IN_MODE " 11%c " D_AS " %s..."),
-      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'),kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s Channel %d BSSId %s " D_IN_MODE " 11%c " D_AS " %s..."),
+      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active),
+      channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'),
+      kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
   } else {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
     AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
-      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
+      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active),
+      kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
   }
-  
+
 #if LWIP_IPV6
   for (bool configured = false; !configured;) {
     uint16_t cfgcnt = 0;

From 9efe67127d796fadb1e7961c8898b93faf67c8c7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 26 Jan 2020 15:52:26 +0100
Subject: [PATCH 184/403] Refactor wifi code

---
 tasmota/support_wifi.ino | 46 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 5053d89ce..2a3951147 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -22,18 +22,16 @@
 \*********************************************************************************************/
 
 #ifndef WIFI_RSSI_THRESHOLD
-// decrease the roam threshold to address devices connecting at very low RSSI and being close to inoperative
-//#define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
+// Decrease the roam threshold from 10 to 5 to address devices connecting at very low RSSI and being close to inoperative
 #define WIFI_RSSI_THRESHOLD     5          // Difference in dB between current network and scanned network
 #endif
 #ifndef WIFI_RESCAN_MINUTES
-// increase rescan interval to 5 minutes to improve ability for devices to reach network harmony
-//#define WIFI_RESCAN_MINUTES     44         // Number of minutes between wifi network rescan
-#define WIFI_RESCAN_MINUTES    5           // Number of minutes between wifi network rescan
+// Increase rescan interval from 44 to 5 minutes to improve ability for devices to reach network harmony
+#define WIFI_RESCAN_MINUTES     5          // Number of minutes between wifi network rescan
 #endif
 
 const uint8_t WIFI_CONFIG_SEC = 180;       // seconds before restart
-// drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK
+// Drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK
 const uint8_t WIFI_CHECK_SEC = 5;          // seconds
 const uint8_t WIFI_RETRY_OFFSET_SEC = 20;  // seconds
 
@@ -56,6 +54,7 @@ struct WIFI {
   uint8_t scan_state;
   uint8_t bssid[6] = {0};
   uint8_t bssid_last[6] = {0};             // store the last connect bssid
+  int8_t best_network_db;
 } Wifi;
 
 int WifiGetRssiAsQuality(int rssi)
@@ -168,7 +167,6 @@ void WiFiSetSleepMode(void)
 void WifiBegin(uint8_t flag, uint8_t channel)
 {
   const char kWifiPhyMode[] = " BGN";
-  char hex_char[18];
 
 #ifdef USE_EMULATION
   UdpDisconnect();
@@ -189,9 +187,8 @@ void WifiBegin(uint8_t flag, uint8_t channel)
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { WiFi.setPhyMode(WIFI_PHY_MODE_11N); }  // B/G/N
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); }  // B/G
   if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
-//  WiFi.setAutoReconnect(true);
-  // handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
-// this needs to be explicitly called as "false" otherwise the default is enabled
+  // Handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
+  // This needs to be explicitly called as "false" otherwise the default is enabled
   WiFi.setAutoReconnect(false);
   switch (flag) {
   case 0:  // AP1
@@ -208,19 +205,18 @@ void WifiBegin(uint8_t flag, uint8_t channel)
     WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]);  // Set static IP
   }
   WiFi.hostname(my_hostname);
+
+  char stemp[40] = { 0 };
   if (channel) {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
-    // add debug output to console to show connected BSSID and channel for multi-AP installations
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s Channel %d BSSId %s " D_IN_MODE " 11%c " D_AS " %s..."),
-      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active),
-      channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'),
-      kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
+    // Add connected BSSID and channel for multi-AP installations
+    char hex_char[18];
+    snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
   } else {
     WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
-      Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active),
-      kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
   }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
+    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
 
 #if LWIP_IPV6
   for (bool configured = false; !configured;) {
@@ -239,22 +235,22 @@ void WifiBegin(uint8_t flag, uint8_t channel)
 
 void WifiBeginAfterScan(void)
 {
-  static int8_t best_network_db;
-
   // Not active
   if (0 == Wifi.scan_state) { return; }
   // Init scan when not connected
   if (1 == Wifi.scan_state) {
     memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
-    best_network_db = -127;
+    Wifi.best_network_db = -127;
     Wifi.scan_state = 3;
   }
   // Init scan when connected
   if (2 == Wifi.scan_state) {
     uint8_t* bssid = WiFi.BSSID();                  // Get current bssid
     memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
-    best_network_db = WiFi.RSSI();                  // Get current rssi and add threshold
-    if (best_network_db < -WIFI_RSSI_THRESHOLD) { best_network_db += WIFI_RSSI_THRESHOLD; }
+    Wifi.best_network_db = WiFi.RSSI();                  // Get current rssi and add threshold
+    if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
+      Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
+    }
     Wifi.scan_state = 3;
   }
   // Init scan
@@ -305,7 +301,7 @@ void WifiBeginAfterScan(void)
           if (ssid_scan == SettingsText(SET_STASSID1 + j)) {  // SSID match
             known = true;
             number_known++;
-            if (rssi_scan > best_network_db) {      // Best network
+            if (rssi_scan > Wifi.best_network_db) {      // Best network
               if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {  // Check for passphrase if not open wlan
                 // store the max values in case there is only one AP and we need to try to reconnect
                 memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
@@ -314,7 +310,7 @@ void WifiBeginAfterScan(void)
                 // if the bssid is not the same as the last failed attempt, force picking the next strongest AP to prevent getting stuck on a strong RSSI, but poor channel health
                 for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
                   if (bssid_scan[i] != Wifi.bssid_last[i]) {
-                    best_network_db = (int8_t)rssi_scan;
+                    Wifi.best_network_db = (int8_t)rssi_scan;
                     channel = chan_scan;
                     ap = j;                             // AP1 or AP2
                     memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));

From fab03d817356e710fb8de119a76e2cdb9f5d1695 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 26 Jan 2020 23:08:52 +0100
Subject: [PATCH 185/403] Add ``SetOption84 1`` sends AWS IoT device shadow
 updates (alternative to retained)

---
 tasmota/CHANGELOG.md     |  1 +
 tasmota/settings.h       |  4 ++--
 tasmota/xdrv_02_mqtt.ino | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index edf6108e0..b5036467c 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 8.1.0.5 20200126
 
 - Change wifi connectivity stability (#7602)
+- Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
 
 ### 8.1.0.4 20200116
 
diff --git a/tasmota/settings.h b/tasmota/settings.h
index dba74eb7d..cef401a94 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -102,8 +102,8 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
   uint32_t data;                           // Allow bit manipulation using SetOption
   struct {                                 // SetOption82 .. SetOption113
     uint32_t alexa_ct_range : 1;           // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
-    uint32_t zigbee_use_names : 1;         // bit 1 (V8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
-    uint32_t spare02 : 1;
+    uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
+    uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
     uint32_t spare03 : 1;
     uint32_t spare04 : 1;
     uint32_t spare05 : 1;
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 05072d5c7..55b63c4de 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -362,7 +362,7 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retain
  * prefix 5 = stat using subtopic or RESULT
  * prefix 6 = tele using subtopic or RESULT
  */
-  char romram[33];
+  char romram[64];
   char stopic[TOPSZ];
 
   snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic);  // SetOption4 - Switch between MQTT RESULT or COMMAND
@@ -372,6 +372,36 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retain
   prefix &= 3;
   GetTopic_P(stopic, prefix, mqtt_topic, romram);
   MqttPublish(stopic, retained);
+
+#ifdef USE_MQTT_AWS_IOT
+  if ((prefix > 0) && (Settings.flag4.awsiot_shadow)) {    // placeholder for SetOptionXX
+    // compute the target topic
+    char *topic = SettingsText(SET_MQTT_TOPIC);
+    char topic2[strlen(topic)+1];       // save buffer onto stack
+    strcpy(topic2, topic);
+    // replace any '/' with '_'
+    char *s = topic2;
+    while (*s) {
+      if ('/' == *s) {
+        *s = '_';
+      }
+      s++;
+    }
+    // update topic is "$aws/things/<topic>/shadow/update"
+    snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
+    
+    // copy buffer
+    char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
+    if (!mqtt_save) { return; }    // abort
+    strcpy(mqtt_save, mqtt_data);
+    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"state\":{\"reported\":%s}}"), mqtt_save);
+    free(mqtt_save);
+
+    bool result = MqttClient.publish(romram, mqtt_data, false);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
+    yield();  // #3313
+  }
+#endif // USE_MQTT_AWS_IOT
 }
 
 void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)

From 0d03c1682e3973879868793f2ad3891d5d4d5eb5 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 27 Jan 2020 09:46:39 +0100
Subject: [PATCH 186/403] fix position wrap around when shutterendstoptime is
 enabled

---
 tasmota/xdrv_27_shutter.ino | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index e112416b1..fa3cce4e7 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -102,6 +102,8 @@ void ShutterRtc50mS(void)
 
 int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 {
+  if (0 == percent) return 0;
+  if (100 == percent) return Shutter.open_max[index];
 	if (Settings.shutter_set50percent[index] != 50) {
     return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
 	} else {
@@ -136,6 +138,8 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 
 uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
 {
+  if (0 >= realpos) return 0;
+  if (Shutter.open_max[index] <= realpos) return 100;
 	if (Settings.shutter_set50percent[index] != 50) {
 		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
 	} else {
@@ -774,18 +778,16 @@ void CmndShutterPosition(void)
       target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
       if (XdrvMailbox.payload != -99) {
         //target_pos_percent = (Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
-        if (0 == target_pos_percent) {
-          Shutter.target_position[index] = (Settings.shutter_options[index] & 4) ? (-1 * 2000) : 0;
-        } else if (100 == target_pos_percent) {
-          Shutter.target_position[index] = (Settings.shutter_options[index] & 4) ? (Shutter.open_max[index] + 1 * 2000) : Shutter.open_max[index];
-      	} else {
-          Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-        }
+        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
         Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
         //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
         AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
       }
       if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
+        if (Settings.shutter_options[index] & 4) {
+          if (0   == target_pos_percent) Shutter.target_position[index] -= 1 * 2000;
+          if (100 == target_pos_percent) Shutter.target_position[index] += 1 * 2000;
+        }
         int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
         if (Shutter.direction[index] == -new_shutterdirection) {
           // direction need to be changed. on momentary switches first stop the Shutter
@@ -806,26 +808,32 @@ void CmndShutterPosition(void)
             ShutterWaitForMotorStop(index);
             ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
             ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            // Code for shutters with circuit safe configuration, switch the direction Relay
-            ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
-            // power on
-            ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
+            if (Shutter.skip_relay_change == 0) {
+              // Code for shutters with circuit safe configuration, switch the direction Relay
+              ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
+              // power on
+              ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
+            }
           } else {
             // now start the motor for the right direction, work for momentary and normal shutters.
             AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
             ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+            if (Shutter.skip_relay_change == 0) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+            }
             //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Delay6 5s, xdrv %d"), XdrvMailbox.payload);
           }
           Shutter.switched_relay = 0;
         }
       } else {
         target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
+        ShutterReportPosition(true);
       }
       XdrvMailbox.index = index +1;  // Fix random index for ShutterClose
       if (XdrvMailbox.command)
         ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
     } else {
+      ShutterReportPosition(true);
       if (XdrvMailbox.command)
         ResponseCmndIdxChar("Locked");
     }

From 11b13f73b0e026b4a3b0c8e27478368cb204d343 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 27 Jan 2020 11:05:11 +0100
Subject: [PATCH 187/403] fix shutterposition call w/o arguments after boot

---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index fa3cce4e7..0a226c2ea 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -233,7 +233,7 @@ void ShutterInit(void)
 
       Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
       //Shutter.real_position[i] =   Settings.shutter_position[i] <= 5 ?  Settings.shuttercoeff[2][i] * Settings.shutter_position[i] : Settings.shuttercoeff[1][i] * Settings.shutter_position[i] + Settings.shuttercoeff[0,i];
-      Shutter.start_position[i] = Shutter.real_position[i];
+      Shutter.start_position[i] = Shutter.target_position[i] = Shutter.real_position[i];
       Shutter.motordelay[i] = Settings.shutter_motordelay[i];
 
       char shutter_open_chr[10];

From 42461aaaf36952be9d910783ed935d9fb5e6268e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 27 Jan 2020 17:38:32 +0100
Subject: [PATCH 188/403] Fix command Publish payload handling

---
 tasmota/xdrv_02_mqtt.ino | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 55b63c4de..4d574a9f1 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -389,7 +389,7 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retain
     }
     // update topic is "$aws/things/<topic>/shadow/update"
     snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
-    
+
     // copy buffer
     char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
     if (!mqtt_save) { return; }    // abort
@@ -852,13 +852,13 @@ void CmndPrefix(void)
 void CmndPublish(void)
 {
   if (XdrvMailbox.data_len > 0) {
-    char *mqtt_part = strtok(XdrvMailbox.data, " ");
+    char *payload_part;
+    char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
     if (mqtt_part) {
       char stemp1[TOPSZ];
       strlcpy(stemp1, mqtt_part, sizeof(stemp1));
-      mqtt_part = strtok(nullptr, " ");
-      if (mqtt_part) {
-        strlcpy(mqtt_data, mqtt_part, sizeof(mqtt_data));
+      if ((payload_part != nullptr) && strlen(payload_part)) {
+        strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
       } else {
         mqtt_data[0] = '\0';
       }

From 72935bdcc644152dc10ef0710f2a7a3600afee8c Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Tue, 28 Jan 2020 11:22:36 +0100
Subject: [PATCH 189/403] Buzzer extensions

Add infinite mode (count==-1), add follow led mode (count==-2), add count>1 for tune playback
---
 tasmota/support_tasmota.ino |  6 +++++
 tasmota/xdrv_24_buzzer.ino  | 54 ++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 9095a09bf..c69647b18 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -347,6 +347,9 @@ void SetLedPowerIdx(uint32_t led, uint32_t state)
     }
     DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
   }
+  #ifdef USE_BUZZER
+  if (led == 0) { BuzzerSetStateToLed(state); }
+  #endif // USE_BUZZER
 }
 
 void SetLedPower(uint32_t state)
@@ -382,6 +385,9 @@ void SetLedLink(uint32_t state)
     if (state) { state = 1; }
     digitalWrite(led_pin, (led_inv) ? !state : state);
   }
+  #ifdef USE_BUZZER
+  BuzzerSetStateToLed(state);
+  #endif // USE_BUZZER
 }
 
 void SetPulseTimer(uint32_t index, uint32_t time)
diff --git a/tasmota/xdrv_24_buzzer.ino b/tasmota/xdrv_24_buzzer.ino
index 78246f0f6..40af3128c 100644
--- a/tasmota/xdrv_24_buzzer.ino
+++ b/tasmota/xdrv_24_buzzer.ino
@@ -26,10 +26,12 @@
 
 struct BUZZER {
   uint32_t tune = 0;
+  uint32_t tune_reload = 0;
   bool active = true;
   bool enable = false;
   uint8_t inverted = 0;            // Buzzer inverted flag (1 = (0 = On, 1 = Off))
   uint8_t count = 0;               // Number of buzzes
+  uint8_t mode = 0;                // Buzzer mode (0 = (0 = regular, 2 = infinite, 3 = follow LED))
   uint8_t set[2];
   uint8_t duration;
   uint8_t state = 0;
@@ -42,13 +44,15 @@ void BuzzerOff(void)
   DigitalWrite(GPIO_BUZZER, Buzzer.inverted);  // Buzzer Off
 }
 
-//void BuzzerBeep(uint32_t count = 1, uint32_t on = 1, uint32_t off = 1, uint32_t tune = 0);
-void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune)
+//void BuzzerBeep(uint32_t count = 1, uint32_t on = 1, uint32_t off = 1, uint32_t tune = 0, uint32_t mode = 0);
+void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode)
 {
   Buzzer.set[0] = off;         // off duration in 100 mSec steps
   Buzzer.set[1] = on;          // on duration in 100 mSec steps
   Buzzer.duration = 1;         // Start buzzer on first step
-  Buzzer.tune = 0;
+  Buzzer.tune_reload = 0;
+  Buzzer.mode = mode;
+
   if (tune) {
     uint32_t tune1 = tune;
     uint32_t tune2 = tune;
@@ -56,15 +60,14 @@ void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune)
       if (!(tune2 & 0x80000000)) {
         tune2 <<= 1;           // Skip leading silence
       } else {
-        Buzzer.tune <<= 1;     // Add swapped tune
-        Buzzer.tune |= tune1 & 1;
+        Buzzer.tune_reload <<= 1;     // Add swapped tune
+        Buzzer.tune_reload |= tune1 & 1;
         tune1 >>= 1;
       }
     }
-    Buzzer.count = 1;          // Allow tune only once
-  } else {
-    Buzzer.count = count * 2;  // Start buzzer
+    Buzzer.tune = Buzzer.tune_reload;
   }
+  Buzzer.count = count * 2;  // Start buzzer
 
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BUZ: %d(%d),%d,%d,0x%08X(0x%08X)"), count, Buzzer.count, on, off, tune, Buzzer.tune);
 
@@ -74,14 +77,21 @@ void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune)
   }
 }
 
+void BuzzerSetStateToLed(uint32_t state) {
+  if ((Buzzer.enable) && (Buzzer.mode==2)) {
+    Buzzer.state = (state!=0);
+    DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
+  }
+}
+
 void BuzzerBeep(uint32_t count) {
-  BuzzerBeep(count, 1, 1, 0);
+  BuzzerBeep(count, 1, 1, 0, 0);
 }
 
 void BuzzerEnabledBeep(uint32_t count, uint32_t duration)
 {
   if (Settings.flag3.buzzer_enable) {  // SetOption67 - Enable buzzer when available
-    BuzzerBeep(count, duration, 1, 0);
+    BuzzerBeep(count, duration, 1, 0, 0);
   }
 }
 
@@ -109,7 +119,7 @@ void BuzzerInit(void)
 
 void BuzzerEvery100mSec(void)
 {
-  if (Buzzer.enable) {
+  if ((Buzzer.enable) && (Buzzer.mode != 2)) {
     if (Buzzer.count) {
       if (Buzzer.duration) {
         Buzzer.duration--;
@@ -118,8 +128,10 @@ void BuzzerEvery100mSec(void)
             Buzzer.state = Buzzer.tune & 1;
             Buzzer.tune >>= 1;
           } else {
-            Buzzer.count--;
+            Buzzer.tune = Buzzer.tune_reload;
+            Buzzer.count-= (Buzzer.tune_reload) ? 2 : 1;
             Buzzer.state = Buzzer.count & 1;
+            if (Buzzer.mode) { Buzzer.count |= 2; }
           }
           Buzzer.duration = Buzzer.set[Buzzer.state];
         }
@@ -151,16 +163,20 @@ void CmndBuzzer(void)
   // Buzzer 2           = Beep twice with duration 200mS and pause 100mS
   // Buzzer 2,3         = Beep twice with duration 300mS and pause 100mS
   // Buzzer 2,3,4       = Beep twice with duration 300mS and pause 400mS
-  // Buzzer 2,3,4,0xF54 = Beep a sequence once indicated by 0xF54 = 1111 0101 01 with duration 300mS and pause 400mS
+  // Buzzer 2,3,4,0xF54 = Beep a sequence twice indicated by 0xF54 = 1111 0101 01 with duration 300mS and pause 400mS
 
   if (XdrvMailbox.data_len > 0) {
-    if (XdrvMailbox.payload > 0) {
-      uint32_t parm[4] = { 0 };
+    if (XdrvMailbox.payload != 0) {
+      uint32_t parm[4] = { 0 }, mode = 0;
       ParseParameters(4, parm);
-      for (uint32_t i = 0; i < 3; i++) {
-        if (parm[i] < 1) { parm[i] = 1; }  // Default Count, On time, Off time
+      if (XdrvMailbox.payload <= 0) {
+        parm[0] = 1; // Default Count
+        mode = -XdrvMailbox.payload;
       }
-      BuzzerBeep(parm[0], parm[1], parm[2], parm[3]);
+      for (uint32_t i = 1; i < 3; i++) {
+        if (parm[i] < 1) { parm[i] = 1; }  // Default On time, Off time
+      }
+      BuzzerBeep(parm[0], parm[1], parm[2], parm[3], mode);
     } else {
       BuzzerBeep(0);
     }
@@ -197,4 +213,4 @@ bool Xdrv24(uint8_t function)
   return result;
 }
 
-#endif  // USE_BUZZER
\ No newline at end of file
+#endif  // USE_BUZZER

From 7892bad81bb9a68993db21945ff9e5098a0efe9b Mon Sep 17 00:00:00 2001
From: RemiDing <richi.glatthaar@web.de>
Date: Tue, 28 Jan 2020 15:10:23 +0100
Subject: [PATCH 190/403] toggle pressed and not_pressed

---
 tasmota/support_switch.ino | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index 6df39c5d7..0cb88d05d 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -155,17 +155,17 @@ void SwitchHandler(uint8_t mode)
               switchflag = ~button &1;       // Follow inverted wall switch state after hold
               break;
             case PUSHHOLDMULTI:
-              if (PRESSED == button){
+              if (NOT_PRESSED == button){
                 Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);  // Execute command via MQTT
               }
               else
                 SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
               break;                 
             case PUSHHOLDMULTI_INV:            
-              if (NOT_PRESSED == button){
+              if (PRESSED == button){
                 Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);  // Execute command via MQTT
               }
               else
                 SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
@@ -177,7 +177,7 @@ void SwitchHandler(uint8_t mode)
         }
       }
 
-// enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, MAX_SWITCH_OPTION};
+// enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, PUSHHOLDMULTI, PUSHHOLDMULTI_INV, MAX_SWITCH_OPTION};
 
       if (button != Switch.last_state[i]) {
         switch (Settings.switchmode[i]) {
@@ -230,24 +230,24 @@ void SwitchHandler(uint8_t mode)
           }
           break;
         case PUSHHOLDMULTI:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i]!=0)
               SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;      
           }
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
               switchflag = POWER_TOGGLE;   // Toggle with pushbutton         
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                      
           }       
           break;
         case PUSHHOLDMULTI_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i]!=0)
               SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT            
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
           }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
               switchflag = POWER_TOGGLE;   // Toggle with pushbutton
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                                 

From deb8398d0bbb02dc6b097beab8cf67b0c4486f3a Mon Sep 17 00:00:00 2001
From: RemiDing <richi.glatthaar@web.de>
Date: Tue, 28 Jan 2020 15:15:49 +0100
Subject: [PATCH 191/403] maybe needed

---
 tasmota/xdrv_10_rules.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 13287d009..c58fb10a6 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -563,7 +563,7 @@ void RulesEvery50ms(void)
 #else
           if (pin[GPIO_SWT1 +i] < 99) {
 #endif  // USE_TM1638
-            bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]));
+            bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]) || (PUSHHOLDMULTI_INV == Settings.switchmode[i]));
             snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (swm ^ SwitchLastState(i)));
             RulesProcessEvent(json_event);
           }

From 5278a842529e3ef2870ffd7a86e4cfba63a10d28 Mon Sep 17 00:00:00 2001
From: RemiDing <richi.glatthaar@web.de>
Date: Tue, 28 Jan 2020 15:37:18 +0100
Subject: [PATCH 192/403] POWER_INCREMENT added

---
 tasmota/tasmota.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index d12bb22ef..d39ea72a7 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -242,7 +242,7 @@ enum TopicOptions { CMND, STAT, TELE, nu1, RESULT_OR_CMND, RESULT_OR_STAT, RESUL
 enum ExecuteCommandPowerOptions { POWER_OFF, POWER_ON, POWER_TOGGLE, POWER_BLINK, POWER_BLINK_STOP,
                                   POWER_OFF_NO_STATE = 8, POWER_ON_NO_STATE, POWER_TOGGLE_NO_STATE,
                                   POWER_SHOW_STATE = 16 };
-enum SendKeyPowerOptions { POWER_HOLD = 3, POWER_INV = 4, POWER_CLEAR = 5, CLEAR_RETAIN = 9 };
+enum SendKeyPowerOptions { POWER_HOLD = 3, POWER_INCREMENT = 4, POWER_INV = 5, POWER_CLEAR = 6, CLEAR_RETAIN = 9 };
 enum SendKeyOptions { KEY_BUTTON, KEY_SWITCH };
 
 enum PowerOnStateOptions { POWER_ALL_OFF, POWER_ALL_ON, POWER_ALL_SAVED_TOGGLE, POWER_ALL_SAVED, POWER_ALL_ALWAYS_ON, POWER_ALL_OFF_PULSETIME_ON };

From 07df4c1dfb4f1718cc3bea655e1f6ce4e137a2d2 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 30 Jan 2020 08:39:28 +0100
Subject: [PATCH 193/403] start hm-10-driver

---
 tasmota/xsns_92_MI_HM10.ino | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tasmota/xsns_92_MI_HM10.ino

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
new file mode 100644
index 000000000..6defdb76f
--- /dev/null
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -0,0 +1,29 @@
+/*
+  xsns_92_Ml_BLE.ino - MI-BLE-sensors via HM-10 support for Tasmota
+
+  Copyright (C) 2020  Christian Baars and Theo Arends
+
+  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/>.
+
+
+  --------------------------------------------------------------------------------------------
+  Version yyyymmdd  Action    Description
+  --------------------------------------------------------------------------------------------
+
+  ---
+  0.9.0.0 20191127  started - further development by Christian Baars
+                    base    - no real base project
+                    forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
+
+*/

From 15428f59e9004e71b34c35ca6719eba9acabb4c5 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 30 Jan 2020 09:18:21 +0100
Subject: [PATCH 194/403] add some stuff from the mp3-driver

---
 tasmota/xsns_92_MI_HM10.ino | 229 +++++++++++++++++++++++++++++++++++-
 1 file changed, 228 insertions(+), 1 deletion(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 6defdb76f..f86d434b6 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -22,8 +22,235 @@
   --------------------------------------------------------------------------------------------
 
   ---
-  0.9.0.0 20191127  started - further development by Christian Baars
+  0.9.0.0 20200130  started - further development by Christian Baars
                     base    - no real base project
                     forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
 
 */
+
+#define XSNS_92                    92
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *HM10Serial;
+
+#define  HM10_MAX_TASK_NUMBER      12
+uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
+uint8_t  HM10_CURRENT_TASK_DELAY = 0;                // number of 100ms-cycles
+uint8_t  HM10_LAST_COMMAND;                          // task command code 
+
+uint16_t HM10_CURRENT_PAYLOAD    = 0;                // payload of a supported command
+
+#define  HM10_MAX_RX_BUF         512
+char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};  // make a buffer bigger than the usual 10-byte-message
+
+
+
+
+
+/*********************************************************************************************\
+ * constants
+\*********************************************************************************************/
+
+#define D_CMND_HM10 "HM10"
+
+const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
+const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
+const char kHM10_Commands[] PROGMEM             = "Track|Play";
+
+/*********************************************************************************************\
+ * enumerations
+\*********************************************************************************************/
+
+enum HM10_Commands {
+  CMND_HM10_TRACK
+};
+                        
+/*********************************************************************************************\
+ * command defines
+\*********************************************************************************************/
+
+
+
+/*********************************************************************************************\
+ * Task codes defines
+\*********************************************************************************************/
+
+#define TASK_HM10_NOTASK          0                         // nothing to be done
+#define TASK_HM10_FEEDBACK        1                         // check the feedback from the device
+#define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
+
+/*********************************************************************************************\
+ * Helper functions
+\*********************************************************************************************/
+
+void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
+                          HM10_TASK_LIST[slot][0]   = task;
+                          HM10_TASK_LIST[slot][1]   = delay;
+                          HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;           // the tasks must always be launched in ascending order!!
+                          HM10_CURRENT_TASK_DELAY   = HM10_TASK_LIST[0][1];
+}
+
+void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
+                          HM10_LAST_COMMAND         = HM10_TASK_LIST[slot][0];    // save command
+                          HM10_TASK_LIST[slot][0]   = task;  
+}
+
+void HM10_Reset(void) {    HM10_LAST_COMMAND         = TASK_HM10_DONE;             // task command code 
+                          HM10State.activeFolder    = 0;                         // see the line above
+                          HM10_Launchtask(TASK_HM10_DONE,0,10);                   // just wait for some time , equals delay(1000) -> 10 * 100
+                          HM10_Launchtask(TASK_HM10_RESET_DEVICE,   1,0);         // reset Device
+                          HM10_Launchtask(TASK_HM10_Q_VERSION,      2,10);        // read SW Version at startup
+                          }                    // ASAP
+
+
+/*********************************************************************************************\
+ * init serial
+ * define serial rx/tx port fixed with 115200 baud
+\*********************************************************************************************/
+
+void HM10SerialInit(void) {
+  HM10Serial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 1, 0, HM10_MAX_RX_BUF); 
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sstart serial communication fixed to 115200 baud"),S_CONTROL_HM10);
+  if (HM10Serial->begin(115200)) {
+    if (UBXSerial->hardwareSerial()) {
+      ClaimSerial();
+      DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
+    }
+    HM10_Reset();
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_LIST initialized, now return to main loop"),S_CONTROL_HM10);
+  }
+  return;
+}
+
+/*********************************************************************************************\
+ * create the HM10 commands payload, and send it via serial interface to the HM10 player
+ \*********************************************************************************************/
+
+void HM10_CMD(uint8_t _cmd,uint16_t _val) {
+
+  HM10Serial->write(cmd, sizeof(cmd));               /
+  return;
+}
+
+/*********************************************************************************************\
+ * handle the return value from the HM10
+\*********************************************************************************************/
+
+bool HM10SerialHandleFeedback(){
+  bool success    = true;                           // true disables possible repetition of commands, set to false only for debugging
+  uint8_t i       = 0;
+  uint8_t ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
+  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%swaiting for response"),S_CONTROL_HM10);
+  bool receive_data_message = false;                // special response with the format d,a, ...,a,d
+
+  while(HM10Serial->available()) {
+    // delay(0);
+    if(i<HM10_MAX_RX_BUF){
+      ret[i] = HM10Serial->read();
+    }
+    i++;
+  }  
+  return success;
+}
+
+/*********************************************************************************************\
+ * execute the next Task
+\*********************************************************************************************/
+
+void HM10_TaskEvery100ms(){
+  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),S_CONTROL_HM10,HM10_TASK_LIST[0][0]);
+  if (HM10_CURRENT_TASK_DELAY == 0)  {
+    uint8_t i = 0;
+    bool runningTaskLoop = true;
+    while (runningTaskLoop) {                                          // always iterate through the whole task list
+      switch(HM10_TASK_LIST[i][0]) {                                 // handle the kind of task
+        case TASK_HM10_FEEDBACK:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sFeedback"),S_CONTROL_HM10,S_TASK_HM10);
+          if(HM10_RETRIES>0) {
+            if (HM10SerialHandleFeedback()) {
+              HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // mark slot as handled if successful
+              HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // assign the delay of the next slot to the current global delay
+            }
+            else {
+              HM10_TASK_LIST[i][0] = HM10_LAST_COMMAND;           // reinsert unsuccessful task into the current slot
+              HM10_CURRENT_TASK_DELAY++;
+              HM10_RETRIES--;
+            }
+          }
+          else {
+            HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // mark slot as handled even if not successful
+            HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // assign the delay of the next slot to the current global delay
+            HM10_RETRIES = 3;
+          }
+          runningTaskLoop = false;                               // return to main loop
+          break;
+        case TASK_HM10_PLAY:
+          HM10_CMD(HM10_CMD_PLAY, 0);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sPlay"),S_CONTROL_HM10,S_TASK_HM10);
+          HM10State.PlayMode = 1;
+          HM10_TaskReplaceInSlot(TASK_HM10_Q_TRACK,i);
+          runningTaskLoop = false;
+          break;
+        
+        case TASK_HM10_RESET_DEVICE:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sReset Device"),S_CONTROL_HM10,S_TASK_HM10);
+          HM10_CMD(HM10_CMD_RESET, HM10_CMD_RESET_VALUE);
+          HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // set task delay
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
+          runningTaskLoop = false;                             // return to main loop
+          break;
+
+        case TASK_HM10_DONE:                                    // this entry was already handled
+          // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),S_CONTROL_HM10);
+          if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {             // check the next entry and if there is none
+            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sno Tasks left"),S_CONTROL_HM10,S_TASK_HM10);
+            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_DONE current slot %u"),S_CONTROL_HM10, i);
+            for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {   // do a clean-up:
+              // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK cleanup slot %u"),S_CONTROL_HM10, j);
+              HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;                // reset all task entries
+              HM10_TASK_LIST[j][1] = 0;                              // reset all delays
+            }
+            runningTaskLoop = false;                                  // return to main loop
+            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sUpdate GUI via AJAX"),S_CONTROL_HM10);
+            // HM10_GUI_NEEDS_UPDATE = true;
+            break; 
+          }
+      }
+      i++;
+    }
+  }
+  else {
+    HM10_CURRENT_TASK_DELAY--;               // count down every 100 ms
+  }
+}
+
+
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv92(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) { 
+    switch (function) {
+      case FUNC_PRE_INIT:
+        HM10SerialInit();                                    // init and start communication
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        if (HM10_TASK_LIST[0][0] == TASK_HM10_NOTASK) {       // no task running 
+          HM10SerialHandleFeedback();                        // -> sniff for device feedback
+          break;
+        }
+        else {
+          HM10_TaskEvery100ms();                             // something has to be done, we'll check in the next step
+          break;
+        }
+      }
+  }
+  return result;
+}
+

From c6a2854a6ec1925cee7a93fa4bfdf0d0bd2a9f98 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Thu, 30 Jan 2020 14:33:33 +0100
Subject: [PATCH 195/403] simultaneous shutter button press per shutter

detect simultaneous press per shutter and not for whole module
---
 tasmota/xdrv_27_shutter.ino | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 0a226c2ea..c353a1dd4 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -513,11 +513,11 @@ void ShutterRelayChanged(void)
 	}
 }
 
-bool ShutterButtonIsSimultaneousHold(uint32_t button_index) {
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
   // check for simultaneous shutter button hold
   uint32 min_shutterbutton_hold_timer = -1;
   for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if ((Settings.shutter_button[i] & (1<<31)) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
+    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
       min_shutterbutton_hold_timer = Button.hold_timer[i];
   }
   return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
@@ -562,10 +562,10 @@ void ShutterButtonHandler(void)
       }
       if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {  // press still valid && SetOption32 (40) - Button hold
         // check for simultaneous shutter button hold
-        if (ShutterButtonIsSimultaneousHold(button_index)) {
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
           // simultaneous shutter button hold detected
           for (uint32_t i = 0; i < MAX_KEYS; i++)
-            if (Settings.shutter_button[i] & (1<<31))
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
               Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
           press_index = 0;
           buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
@@ -578,7 +578,7 @@ void ShutterButtonHandler(void)
       }
       if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {  // SetOption32 (40) - Button held for factor times longer
         // check for simultaneous shutter button extend hold
-        if (ShutterButtonIsSimultaneousHold(button_index)) {
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
           // simultaneous shutter button extend hold detected
           press_index = 0;
           buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
@@ -596,14 +596,14 @@ void ShutterButtonHandler(void)
           // check for simultaneous shutter button press
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            if ((Settings.shutter_button[i] & (1<<31)) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))
               min_shutterbutton_press_counter = Button.press_counter[i];
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
             press_index = Button.press_counter[button_index];
             for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if (Settings.shutter_button[i] & (1<<31))
+              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
                 Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
             buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
           }

From b9e38153587e2e0adbf182d93bc323a8bc354572 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Fri, 31 Jan 2020 10:12:48 +0100
Subject: [PATCH 196/403] adding stuff

---
 tasmota/xsns_92_MI_HM10.ino | 192 ++++++++++++++++++++++++------------
 1 file changed, 127 insertions(+), 65 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index f86d434b6..51c02ea07 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -30,11 +30,14 @@
 
 #define XSNS_92                    92
 
+#define HM_PIN_RX  5   // D1 Hardcoded while developing
+#define HM_PIN_TX  4   // D2
+
 #include <TasmotaSerial.h>
 
 TasmotaSerial *HM10Serial;
 
-#define  HM10_MAX_TASK_NUMBER      12
+#define  HM10_MAX_TASK_NUMBER      8
 uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
 uint8_t  HM10_CURRENT_TASK_DELAY = 0;                // number of 100ms-cycles
 uint8_t  HM10_LAST_COMMAND;                          // task command code 
@@ -44,8 +47,13 @@ uint16_t HM10_CURRENT_PAYLOAD    = 0;                // payload of a supported c
 #define  HM10_MAX_RX_BUF         512
 char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};  // make a buffer bigger than the usual 10-byte-message
 
-
-
+struct {
+  uint8_t current_task_delay;
+  struct {
+    uint32_t init:1;
+    // TODO: more to come
+  } mode;
+} HM10;
 
 
 /*********************************************************************************************\
@@ -72,12 +80,23 @@ enum HM10_Commands {
 
 
 
+
 /*********************************************************************************************\
  * Task codes defines
 \*********************************************************************************************/
 
 #define TASK_HM10_NOTASK          0                         // nothing to be done
-#define TASK_HM10_FEEDBACK        1                         // check the feedback from the device
+#define TASK_HM10_ROLE1           1                         // change role to 1
+#define TASK_HM10_IMME1           2                         // change imme to 1
+#define TASK_HM10_RENEW           3                         // device factory setting
+#define TASK_HM10_RESET           4                         // device reset
+#define TASK_HM10_DISC            5                         // device discovery scan
+#define TASK_HM10_CONN            6                         // connect to given MAC
+#define TASK_HM10_VERSION         7                         // query FW version
+#define TASK_HM10_NAME            8                         // query device name
+#define TASK_HM10_FEEDBACK        9                         // get device response
+
+
 #define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
 
 /*********************************************************************************************\
@@ -96,12 +115,14 @@ void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
                           HM10_TASK_LIST[slot][0]   = task;  
 }
 
-void HM10_Reset(void) {    HM10_LAST_COMMAND         = TASK_HM10_DONE;             // task command code 
-                          HM10State.activeFolder    = 0;                         // see the line above
-                          HM10_Launchtask(TASK_HM10_DONE,0,10);                   // just wait for some time , equals delay(1000) -> 10 * 100
-                          HM10_Launchtask(TASK_HM10_RESET_DEVICE,   1,0);         // reset Device
-                          HM10_Launchtask(TASK_HM10_Q_VERSION,      2,10);        // read SW Version at startup
-                          }                    // ASAP
+void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_ROLE1,0,10);         // set role to 1
+                          HM10_Launchtask(TASK_HM10_IMME1,1,10);         // set imme to 1
+                          HM10_Launchtask(TASK_HM10_RESET,2,10);         // reset Device
+                          HM10_Launchtask(TASK_HM10_VERSION,3,10);       // read SW Version
+                          HM10_Launchtask(TASK_HM10_NAME,4,10);          // read name
+                          }                    
+
+
 
 
 /*********************************************************************************************\
@@ -110,15 +131,17 @@ void HM10_Reset(void) {    HM10_LAST_COMMAND         = TASK_HM10_DONE;
 \*********************************************************************************************/
 
 void HM10SerialInit(void) {
-  HM10Serial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 1, 0, HM10_MAX_RX_BUF); 
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sstart serial communication fixed to 115200 baud"),S_CONTROL_HM10);
+  HM10.mode.init = false;
+  HM10Serial = new TasmotaSerial(HM_PIN_RX, HM_PIN_TX, 1, 0, HM10_MAX_RX_BUF); 
   if (HM10Serial->begin(115200)) {
-    if (UBXSerial->hardwareSerial()) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sstart serial communication fixed to 115200 baud"),D_CMND_HM10);
+    if (HM10Serial->hardwareSerial()) {
       ClaimSerial();
       DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
     }
     HM10_Reset();
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_LIST initialized, now return to main loop"),S_CONTROL_HM10);
+    HM10.mode.init = true;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
   }
   return;
 }
@@ -127,10 +150,22 @@ void HM10SerialInit(void) {
  * create the HM10 commands payload, and send it via serial interface to the HM10 player
  \*********************************************************************************************/
 
-void HM10_CMD(uint8_t _cmd,uint16_t _val) {
+// void HM10_CMD(uint8_t _cmd,uint16_t _val) {
 
-  HM10Serial->write(cmd, sizeof(cmd));               /
-  return;
+//   HM10Serial->write(cmd, sizeof(cmd));               /
+//   return;
+// }
+
+/*********************************************************************************************\
+ * parse the response
+\*********************************************************************************************/
+void HM10ParseResponse(char *buf) {
+     if (!strncmp(buf,"OK",2)) {
+       DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
+     }
+     else {
+       DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
+     }
 }
 
 /*********************************************************************************************\
@@ -138,19 +173,26 @@ void HM10_CMD(uint8_t _cmd,uint16_t _val) {
 \*********************************************************************************************/
 
 bool HM10SerialHandleFeedback(){
-  bool success    = true;                           // true disables possible repetition of commands, set to false only for debugging
-  uint8_t i       = 0;
-  uint8_t ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
-  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%swaiting for response"),S_CONTROL_HM10);
-  bool receive_data_message = false;                // special response with the format d,a, ...,a,d
-
+  bool success    = false;                           // true disables possible repetition of commands, set to false only for debugging
+  uint32_t i       = 0;
+  char ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
+  
+ 
   while(HM10Serial->available()) {
     // delay(0);
     if(i<HM10_MAX_RX_BUF){
       ret[i] = HM10Serial->read();
     }
     i++;
-  }  
+    success = true;
+  }
+  if(success) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
+    HM10ParseResponse(ret);
+  }
+  else {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s got no response"),D_CMND_HM10);
+  }
   return success;
 }
 
@@ -159,65 +201,82 @@ bool HM10SerialHandleFeedback(){
 \*********************************************************************************************/
 
 void HM10_TaskEvery100ms(){
-  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),S_CONTROL_HM10,HM10_TASK_LIST[0][0]);
+  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),D_CMND_HM10,HM10_TASK_LIST[0][0]);
   if (HM10_CURRENT_TASK_DELAY == 0)  {
     uint8_t i = 0;
     bool runningTaskLoop = true;
     while (runningTaskLoop) {                                          // always iterate through the whole task list
       switch(HM10_TASK_LIST[i][0]) {                                 // handle the kind of task
-        case TASK_HM10_FEEDBACK:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sFeedback"),S_CONTROL_HM10,S_TASK_HM10);
-          if(HM10_RETRIES>0) {
-            if (HM10SerialHandleFeedback()) {
-              HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // mark slot as handled if successful
-              HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // assign the delay of the next slot to the current global delay
-            }
-            else {
-              HM10_TASK_LIST[i][0] = HM10_LAST_COMMAND;           // reinsert unsuccessful task into the current slot
-              HM10_CURRENT_TASK_DELAY++;
-              HM10_RETRIES--;
-            }
-          }
-          else {
-            HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // mark slot as handled even if not successful
-            HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // assign the delay of the next slot to the current global delay
-            HM10_RETRIES = 3;
-          }
-          runningTaskLoop = false;                               // return to main loop
+        case TASK_HM10_ROLE1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
+          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+ROLE1");
           break;
-        case TASK_HM10_PLAY:
-          HM10_CMD(HM10_CMD_PLAY, 0);
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sPlay"),S_CONTROL_HM10,S_TASK_HM10);
-          HM10State.PlayMode = 1;
-          HM10_TaskReplaceInSlot(TASK_HM10_Q_TRACK,i);
+        case TASK_HM10_IMME1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
+          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+IMME1");
+          break;
+        case TASK_HM10_DISC:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
+          HM10_CURRENT_TASK_DELAY = 35;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+DISC?");
+          break;
+        case TASK_HM10_VERSION:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
+          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+VERR?");
+          break;
+        case TASK_HM10_NAME:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
+          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NAME?");
+          break;
+        
+        case TASK_HM10_RESET:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
+          HM10Serial->write("AT+RESET");
+          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           break;
         
-        case TASK_HM10_RESET_DEVICE:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sReset Device"),S_CONTROL_HM10,S_TASK_HM10);
-          HM10_CMD(HM10_CMD_RESET, HM10_CMD_RESET_VALUE);
-          HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];      // set task delay
+        case TASK_HM10_FEEDBACK:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];;     // set task delay
           HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
-          runningTaskLoop = false;                             // return to main loop
+          runningTaskLoop = false;
           break;
 
         case TASK_HM10_DONE:                                    // this entry was already handled
-          // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),S_CONTROL_HM10);
+          // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),D_CMND_HM10);
+          // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%snext slot:%u, i: %u"),D_CMND_HM10, HM10_TASK_LIST[i+1][0],i);
           if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {             // check the next entry and if there is none
-            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s%sno Tasks left"),S_CONTROL_HM10,S_TASK_HM10);
-            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_DONE current slot %u"),S_CONTROL_HM10, i);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sno Tasks left"),D_CMND_HM10);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
             for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {   // do a clean-up:
-              // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK cleanup slot %u"),S_CONTROL_HM10, j);
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
               HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;                // reset all task entries
               HM10_TASK_LIST[j][1] = 0;                              // reset all delays
             }
             runningTaskLoop = false;                                  // return to main loop
-            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sUpdate GUI via AJAX"),S_CONTROL_HM10);
+            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sUpdate GUI via AJAX"),D_CMND_HM10);
             // HM10_GUI_NEEDS_UPDATE = true;
             break; 
           }
       }
-      i++;
+      i++; 
     }
   }
   else {
@@ -231,26 +290,29 @@ void HM10_TaskEvery100ms(){
  * Interface
 \*********************************************************************************************/
 
-bool Xdrv92(uint8_t function)
+bool Xsns92(uint8_t function)
 {
   bool result = false;
 
-  if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) { 
+  // if ((pin[HM_PIN_RX] < 99) && (pin[HM_PIN_TX] < 99)) { 
+  if (true) { 
     switch (function) {
-      case FUNC_PRE_INIT:
+      case FUNC_INIT:
         HM10SerialInit();                                    // init and start communication
         break;
       case FUNC_EVERY_100_MSECOND:
         if (HM10_TASK_LIST[0][0] == TASK_HM10_NOTASK) {       // no task running 
+          // DEBUG_SENSOR_LOG(PSTR("HM10: no TASK in array"));
           HM10SerialHandleFeedback();                        // -> sniff for device feedback
           break;
         }
         else {
+          // DEBUG_SENSOR_LOG(PSTR("HM10: every 100msec"));
           HM10_TaskEvery100ms();                             // something has to be done, we'll check in the next step
           break;
         }
+        break;
       }
   }
   return result;
-}
-
+}
\ No newline at end of file

From a1d7d2baf81a15510ac0c0ae5a7318258d6c4a27 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Fri, 31 Jan 2020 15:28:34 +0100
Subject: [PATCH 197/403] output working

---
 tasmota/xsns_92_MI_HM10.ino | 165 +++++++++++++++++++++++++++++-------
 1 file changed, 136 insertions(+), 29 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 51c02ea07..045392d73 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -37,24 +37,32 @@
 
 TasmotaSerial *HM10Serial;
 
-#define  HM10_MAX_TASK_NUMBER      8
+#define  HM10_MAX_TASK_NUMBER      12
 uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
-uint8_t  HM10_CURRENT_TASK_DELAY = 0;                // number of 100ms-cycles
-uint8_t  HM10_LAST_COMMAND;                          // task command code 
+// uint8_t  HM10.current_task_delay = 0;                // number of 100ms-cycles
+// uint8_t HM10.last_command;
 
-uint16_t HM10_CURRENT_PAYLOAD    = 0;                // payload of a supported command
 
 #define  HM10_MAX_RX_BUF         512
 char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};  // make a buffer bigger than the usual 10-byte-message
 
 struct {
   uint8_t current_task_delay;
+  uint8_t last_command;
+  uint16_t firmware;
   struct {
     uint32_t init:1;
+    uint32_t subscribed:1;
     // TODO: more to come
   } mode;
 } HM10;
 
+#pragma pack(1)
+struct {
+  uint16_t temp;
+  uint8_t hum;
+} LYWSD03;
+#pragma pack(0)
 
 /*********************************************************************************************\
  * constants
@@ -95,7 +103,10 @@ enum HM10_Commands {
 #define TASK_HM10_VERSION         7                         // query FW version
 #define TASK_HM10_NAME            8                         // query device name
 #define TASK_HM10_FEEDBACK        9                         // get device response
-
+#define TASK_HM10_DISCONN         10                        // disconnect
+#define TASK_HM10_SUBSCR          11                        // subscribe to service handle
+#define TASK_HM10_READ            12                        // read from handle
+#define TASK_HM10_FINDALLCHARS    13                        // read all available characteristics
 
 #define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
 
@@ -107,19 +118,26 @@ void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
                           HM10_TASK_LIST[slot][0]   = task;
                           HM10_TASK_LIST[slot][1]   = delay;
                           HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;           // the tasks must always be launched in ascending order!!
-                          HM10_CURRENT_TASK_DELAY   = HM10_TASK_LIST[0][1];
+                          HM10.current_task_delay   = HM10_TASK_LIST[0][1];
 }
 
 void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
-                          HM10_LAST_COMMAND         = HM10_TASK_LIST[slot][0];    // save command
+                          HM10.last_command         = HM10_TASK_LIST[slot][0];    // save command
                           HM10_TASK_LIST[slot][0]   = task;  
 }
 
-void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_ROLE1,0,10);         // set role to 1
-                          HM10_Launchtask(TASK_HM10_IMME1,1,10);         // set imme to 1
-                          HM10_Launchtask(TASK_HM10_RESET,2,10);         // reset Device
+void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_ROLE1,0,1);         // set role to 1
+                          HM10_Launchtask(TASK_HM10_IMME1,1,1);         // set imme to 1
+                          HM10_Launchtask(TASK_HM10_RESET,2,1);         // reset Device
                           HM10_Launchtask(TASK_HM10_VERSION,3,10);       // read SW Version
-                          HM10_Launchtask(TASK_HM10_NAME,4,10);          // read name
+                          HM10_Launchtask(TASK_HM10_DISC,4,1);           // disscovery
+                          HM10_Launchtask(TASK_HM10_CONN,5,5);          // connect
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,6,35);      // get OK+CONN
+                          HM10_Launchtask(TASK_HM10_SUBSCR,7,20);        // subscribe
+                          HM10_Launchtask(TASK_HM10_READ,8,35);          // read
+                          HM10_Launchtask(TASK_HM10_READ,9,35);          // read
+                          HM10_Launchtask(TASK_HM10_READ,10,35);          // read
+                          HM10_Launchtask(TASK_HM10_DISCONN,11,250);          // disconnect
                           }                    
 
 
@@ -134,14 +152,14 @@ void HM10SerialInit(void) {
   HM10.mode.init = false;
   HM10Serial = new TasmotaSerial(HM_PIN_RX, HM_PIN_TX, 1, 0, HM10_MAX_RX_BUF); 
   if (HM10Serial->begin(115200)) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sstart serial communication fixed to 115200 baud"),D_CMND_HM10);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
     if (HM10Serial->hardwareSerial()) {
       ClaimSerial();
       DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
     }
     HM10_Reset();
     HM10.mode.init = true;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
   }
   return;
 }
@@ -160,12 +178,19 @@ void HM10SerialInit(void) {
  * parse the response
 \*********************************************************************************************/
 void HM10ParseResponse(char *buf) {
-     if (!strncmp(buf,"OK",2)) {
+    if (!strncmp(buf,"OK",2)) {
        DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
      }
-     else {
-       DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
+    if (!strncmp(buf,"HMSoft",6)) { //8
+      const char* _fw = "000";
+      memcpy((void *)_fw,(void *)(buf+8),3);
+      HM10.firmware = atoi(_fw);
+      DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
      }
+
+    else {
+      DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
+    }
 }
 
 /*********************************************************************************************\
@@ -186,7 +211,14 @@ bool HM10SerialHandleFeedback(){
     i++;
     success = true;
   }
-  if(success) {
+  if(HM10.mode.subscribed) {
+    DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),ret[0],ret[1],ret[2],ret[3],ret[4],ret[5],ret[6]);
+    if(ret[0] != 0 && ret[1] != 0){
+      memcpy(&LYWSD03,(void *)ret,3);
+      DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
+    }
+  }
+  else if(success) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
     HM10ParseResponse(ret);
   }
@@ -202,59 +234,92 @@ bool HM10SerialHandleFeedback(){
 
 void HM10_TaskEvery100ms(){
   // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),D_CMND_HM10,HM10_TASK_LIST[0][0]);
-  if (HM10_CURRENT_TASK_DELAY == 0)  {
+  if (HM10.current_task_delay == 0)  {
     uint8_t i = 0;
     bool runningTaskLoop = true;
     while (runningTaskLoop) {                                          // always iterate through the whole task list
       switch(HM10_TASK_LIST[i][0]) {                                 // handle the kind of task
         case TASK_HM10_ROLE1:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
-          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+ROLE1");
           break;
         case TASK_HM10_IMME1:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
-          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+IMME1");
           break;
         case TASK_HM10_DISC:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
-          HM10_CURRENT_TASK_DELAY = 35;                    // set task delay
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start discovery"),D_CMND_HM10);
+          HM10.current_task_delay = 35;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+DISC?");
           break;
         case TASK_HM10_VERSION:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
-          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+VERR?");
           break;
         case TASK_HM10_NAME:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
-          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+NAME?");
           break;
-        
+        case TASK_HM10_CONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s connect"),D_CMND_HM10);
+          HM10.current_task_delay = 2;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+CONA4C138ED815A");
+          break;
+        case TASK_HM10_DISCONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
+          HM10.current_task_delay = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT");
+          HM10.mode.subscribed = false;
+          break;
         case TASK_HM10_RESET:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
           HM10Serial->write("AT+RESET");
-          HM10_CURRENT_TASK_DELAY = 5;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           break;
-        
+        case TASK_HM10_SUBSCR:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 15;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON0037");
+          
+        case TASK_HM10_READ:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
+          HM10.current_task_delay = 0;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA0036?");
+          HM10.mode.subscribed = true;
+        case TASK_HM10_FINDALLCHARS:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s find all chars"),D_CMND_HM10);
+          HM10.current_task_delay = 35;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+FINDALLCHARS?");
         case TASK_HM10_FEEDBACK:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
           HM10SerialHandleFeedback();
-          HM10_CURRENT_TASK_DELAY = HM10_TASK_LIST[i+1][1];;     // set task delay
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;     // set task delay
           HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
           runningTaskLoop = false;
           break;
@@ -280,11 +345,45 @@ void HM10_TaskEvery100ms(){
     }
   }
   else {
-    HM10_CURRENT_TASK_DELAY--;               // count down every 100 ms
+    HM10.current_task_delay--;               // count down every 100 ms
   }
 }
 
 
+const char HTTP_HM10[] PROGMEM =
+ "{s}HM10" " Firmware " "{m}%u{e}";
+
+void HM10Show(bool json)
+{
+  if (HM10.firmware>0) {
+    char temperature[33];
+    float _temp = (float)LYWSD03.temp/100.0F;
+    dtostrfd(_temp, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(LYWSD03.hum, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, F("LYWSD03"), temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, _temp);
+        KnxSensor(KNX_HUMIDITY, LYWSD03.hum);
+      }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_HM10, HM10.firmware);
+      WSContentSend_PD(HTTP_SNS_TEMP, F("LYWSD03"), temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, F("LYWSD03"), humidity);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
 
 /*********************************************************************************************\
  * Interface
@@ -312,6 +411,14 @@ bool Xsns92(uint8_t function)
           break;
         }
         break;
+      case FUNC_JSON_APPEND:
+        HM10Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HM10Show(0);
+        break;
+#endif  // USE_WEBSERVER
       }
   }
   return result;

From f6a93a8d60ce876cacd494ff157606576a522841 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Fri, 31 Jan 2020 18:50:11 +0100
Subject: [PATCH 198/403] unify codebase

---
 tasmota/xsns_92_MI_HM10.ino | 131 +++++++++++++++++++++++++++++-------
 1 file changed, 107 insertions(+), 24 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 045392d73..a384d446a 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -34,20 +34,20 @@
 #define HM_PIN_TX  4   // D2
 
 #include <TasmotaSerial.h>
+#include <vector>
 
 TasmotaSerial *HM10Serial;
 
 #define  HM10_MAX_TASK_NUMBER      12
 uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
-// uint8_t  HM10.current_task_delay = 0;                // number of 100ms-cycles
-// uint8_t HM10.last_command;
+
 
 
 #define  HM10_MAX_RX_BUF         512
-char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};  // make a buffer bigger than the usual 10-byte-message
+char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};
 
 struct {
-  uint8_t current_task_delay;
+  uint8_t current_task_delay;                // number of 100ms-cycles
   uint8_t last_command;
   uint16_t firmware;
   struct {
@@ -64,6 +64,32 @@ struct {
 } LYWSD03;
 #pragma pack(0)
 
+struct mi_sensor_t{
+  uint8_t type; //flora = 1; MI-HT_V1=2; LYWSD02=3; LYWSD03=4
+  uint8_t serial[6];
+  uint8_t showedUp;
+  union {
+    struct {
+      float temp;
+      float moisture;
+      float fertility;
+      uint16_t lux;
+    } Flora;
+    struct {
+      float temp;
+      float hum;
+      uint8_t bat;
+    } MJ_HT_V1;
+    struct {
+      float temp;
+      float hum;
+      uint8_t bat;
+    } LYWSD0x; // LYWSD02 and LYWSD03
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
 /*********************************************************************************************\
  * constants
 \*********************************************************************************************/
@@ -140,7 +166,56 @@ void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_ROLE1,0,1);         // set r
                           HM10_Launchtask(TASK_HM10_DISCONN,11,250);          // disconnect
                           }                    
 
-
+/**
+ * @brief Return the slot number of a known sensor or return create new sensor slot
+ *
+ * @param _serial     BLE address of the sensor
+ * @param _type       Type number of the sensor
+ * @return uint32_t   Known or new slot in the sensors-vector
+ */
+uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){ // if we got an intact packet, the sensor should show up several times
+        MIBLEsensors.at(i).showedUp++;     // count up to the above number ... now we are pretty sure
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.Flora.temp =-1000.0f;
+      _newSensor.Flora.moisture =-1000.0f;
+      _newSensor.Flora.fertility =-1000.0f;
+      _newSensor.Flora.lux = 0xffff;
+      break;
+    case 2:
+      _newSensor.MJ_HT_V1.temp=-1000.0f;
+      _newSensor.MJ_HT_V1.hum=-1.0f;
+      _newSensor.MJ_HT_V1.bat=0xff;
+      break;
+    case 3: case 4:
+      _newSensor.LYWSD0x.temp=-1000.0f;
+      _newSensor.LYWSD0x.hum=-1.0f;
+      _newSensor.LYWSD0x.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
 
 
 /*********************************************************************************************\
@@ -216,6 +291,19 @@ bool HM10SerialHandleFeedback(){
     if(ret[0] != 0 && ret[1] != 0){
       memcpy(&LYWSD03,(void *)ret,3);
       DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
+      uint8_t _serial[6] = {0};
+      uint32_t _slot = MIBLEgetSensorSlot(_serial, 4);
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+      static float _tempFloat;
+      _tempFloat=(float)(LYWSD03.temp)/100.0f;
+      if(_tempFloat<60){
+          MIBLEsensors.at(_slot).LYWSD0x.temp=_tempFloat;
+      }
+      _tempFloat=(float)LYWSD03.hum;
+      if(_tempFloat<100){
+        MIBLEsensors.at(_slot).LYWSD0x.hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
+      }
     }
   }
   else if(success) {
@@ -355,34 +443,29 @@ const char HTTP_HM10[] PROGMEM =
 
 void HM10Show(bool json)
 {
-  if (HM10.firmware>0) {
-    char temperature[33];
-    float _temp = (float)LYWSD03.temp/100.0F;
-    dtostrfd(_temp, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(LYWSD03.hum, Settings.flag2.humidity_resolution, humidity);
-
     if (json) {
+      if (MIBLEsensors.size()==0) return;
+
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(0).LYWSD0x.temp, Settings.flag2.temperature_resolution, temperature);
+      char humidity[33];
+      dtostrfd(MIBLEsensors.at(0).LYWSD0x.hum, Settings.flag2.humidity_resolution, humidity);
+
       ResponseAppend_P(JSON_SNS_TEMPHUM, F("LYWSD03"), temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif  // USE_DOMOTICZ
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, _temp);
-        KnxSensor(KNX_HUMIDITY, LYWSD03.hum);
-      }
-#endif  // USE_KNX
 #ifdef USE_WEBSERVER
     } else {
       WSContentSend_PD(HTTP_HM10, HM10.firmware);
+      if (MIBLEsensors.size()==0) return;
+
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(0).LYWSD0x.temp, Settings.flag2.temperature_resolution, temperature);
+      char humidity[33];
+      dtostrfd(MIBLEsensors.at(0).LYWSD0x.hum, Settings.flag2.humidity_resolution, humidity);
+
       WSContentSend_PD(HTTP_SNS_TEMP, F("LYWSD03"), temperature, TempUnit());
       WSContentSend_PD(HTTP_SNS_HUM, F("LYWSD03"), humidity);
 #endif  // USE_WEBSERVER
     }
-  }
 }
 
 /*********************************************************************************************\

From 3b61d7768083054c367193406d8f202c92b2200f Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 1 Feb 2020 14:23:13 +0100
Subject: [PATCH 199/403] Fix wrong CT channel for Module 48

---
 tasmota/xdrv_04_light.ino | 62 ++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 4ef8b409e..a45a5499d 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2030,38 +2030,40 @@ void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
 
 void calcGammaBulbs(uint16_t cur_col_10[5]) {
   // Apply gamma correction for 8 and 10 bits resolutions, if needed
-  if (Settings.light_correction) {
-    // First apply combined correction to the overall white power
-    if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-      // channels for white are always the last two channels
-      uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
-      uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
-      uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];   // cumulated brightness
-      uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;    // max 1023
 
-      if (PHILIPS == my_module_type) {   // channel 1 is the color tone, mapped to cold channel (0..255)
-        // Xiaomi Philips bulbs follow a different scheme:
-        cur_col_10[cw1] = light_state.getCT10bits();
-        // channel 0=intensity, channel1=temperature
-        if (Settings.light_correction) { // gamma correction
-          cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);    // 10 bits gamma correction
-        } else {
-          cur_col_10[cw0] = white_bri10_1023;  // no gamma, extend to 10 bits
-        }
+  // First apply combined correction to the overall white power
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+    // channels for white are always the last two channels
+    uint32_t cw1 = Light.subtype - 1;       // address for the ColorTone PWM
+    uint32_t cw0 = Light.subtype - 2;       // address for the White Brightness PWM
+    uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];   // cumulated brightness
+    uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;    // max 1023
+
+    if (PHILIPS == my_module_type) {   // channel 1 is the color tone, mapped to cold channel (0..255)
+      // Xiaomi Philips bulbs follow a different scheme:
+      cur_col_10[cw1] = light_state.getCT10bits();
+      // channel 0=intensity, channel1=temperature
+      if (Settings.light_correction) { // gamma correction
+        cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);    // 10 bits gamma correction
       } else {
-        // if sum of both channels is > 255, then channels are probably uncorrelated
-        if (white_bri10 <= 1031) {      // take a margin of 8 above 1023 to account for rounding errors
-          // we calculate the gamma corrected sum of CW + WW
-          uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
-          // then we split the total energy among the cold and warm leds
-          cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
-          cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
-        } else {
-          cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
-          cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
-        }
+        cur_col_10[cw0] = white_bri10_1023;  // no gamma, extend to 10 bits
+      }
+    } else if (Settings.light_correction) {
+      // if sum of both channels is > 255, then channels are probably uncorrelated
+      if (white_bri10 <= 1031) {      // take a margin of 8 above 1023 to account for rounding errors
+        // we calculate the gamma corrected sum of CW + WW
+        uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
+        // then we split the total energy among the cold and warm leds
+        cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
+        cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
+      } else {
+        cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
+        cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
       }
     }
+  }
+
+  if (Settings.light_correction) {
     // then apply gamma correction to RGB channels
     if (LST_RGB <= Light.subtype) {
       for (uint32_t i = 0; i < 3; i++) {
@@ -2069,8 +2071,8 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
       }
     }
     // If RGBW or Single channel, also adjust White channel
-    if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
-      cur_col_10[3] = ledGamma10_10(cur_col_10[3]);
+    if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
+      cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
     }
   }
 }

From cb067237ad1d56be59697454b1043a850977b95c Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sat, 1 Feb 2020 16:17:20 +0100
Subject: [PATCH 200/403] stabilize readings

---
 tasmota/xsns_92_MI_HM10.ino | 184 ++++++++++++++++++++++++++----------
 1 file changed, 136 insertions(+), 48 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index a384d446a..b91d75d31 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -47,14 +47,19 @@ uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of ta
 char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};
 
 struct {
-  uint8_t current_task_delay;                // number of 100ms-cycles
+  uint8_t current_task_delay;  // number of 100ms-cycles
   uint8_t last_command;
   uint16_t firmware;
   struct {
     uint32_t init:1;
     uint32_t subscribed:1;
+    uint32_t pending_task:1;
     // TODO: more to come
   } mode;
+  struct {
+    uint8_t   sensor;           // points to to the number 0...255
+    // TODO: more to come
+  } state;
 } HM10;
 
 #pragma pack(1)
@@ -96,17 +101,32 @@ std::vector<mi_sensor_t> MIBLEsensors;
 
 #define D_CMND_HM10 "HM10"
 
-const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
-const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
-const char kHM10_Commands[] PROGMEM             = "Track|Play";
+// const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
+// const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
+// const char kHM10_Commands[] PROGMEM             = "Track|Play";
+
+const char kHM10SlaveID0[] PROGMEM = "";
+const char kHM10SlaveID1[] PROGMEM = "";
+const char kHM10SlaveID2[] PROGMEM = "";
+const char kHM10SlaveID3[] PROGMEM = "";
+const char kHM10SlaveID4[] PROGMEM = "A4C138";
+const char * kHM10SlaveID[] PROGMEM = {kHM10SlaveID0,kHM10SlaveID1,kHM10SlaveID2,kHM10SlaveID3,kHM10SlaveID4};
+
+
+// const char kHM10Mac0[] PROGMEM = "A4C138ED815A";
+// const char kHM10Mac1[] PROGMEM = "A4C1382AC8B3";
+// const char * kHM10Mac[] PROGMEM ={kHM10Mac0, kHM10Mac1};
+
+uint8_t HM10Mac[2][6]={0xA4,0xC1,0x38,0xED,0x81,0x5A, 
+                       0xA4,0xC1,0x38,0x2A,0xC8,0xB3};
 
 /*********************************************************************************************\
  * enumerations
 \*********************************************************************************************/
 
-enum HM10_Commands {
-  CMND_HM10_TRACK
-};
+// enum HM10_Commands {
+//   CMND_HM10_TRACK
+// };
                         
 /*********************************************************************************************\
  * command defines
@@ -130,9 +150,11 @@ enum HM10_Commands {
 #define TASK_HM10_NAME            8                         // query device name
 #define TASK_HM10_FEEDBACK        9                         // get device response
 #define TASK_HM10_DISCONN         10                        // disconnect
-#define TASK_HM10_SUBSCR          11                        // subscribe to service handle
-#define TASK_HM10_READ            12                        // read from handle
+#define TASK_HM10_SUBSCR          11                        // subscribe to service handle 37
+#define TASK_HM10_READ            12                        // read from handle 36
 #define TASK_HM10_FINDALLCHARS    13                        // read all available characteristics
+#define TASK_HM10_UNSUBSCR        14                        // subscribe  service handle 37
+#define TASK_HM10_DELAY_SUB       15                        // start reading from subscription delayed
 
 #define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
 
@@ -152,19 +174,33 @@ void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
                           HM10_TASK_LIST[slot][0]   = task;  
 }
 
-void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_ROLE1,0,1);         // set role to 1
-                          HM10_Launchtask(TASK_HM10_IMME1,1,1);         // set imme to 1
-                          HM10_Launchtask(TASK_HM10_RESET,2,1);         // reset Device
-                          HM10_Launchtask(TASK_HM10_VERSION,3,10);       // read SW Version
-                          HM10_Launchtask(TASK_HM10_DISC,4,1);           // disscovery
-                          HM10_Launchtask(TASK_HM10_CONN,5,5);          // connect
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,6,35);      // get OK+CONN
-                          HM10_Launchtask(TASK_HM10_SUBSCR,7,20);        // subscribe
-                          HM10_Launchtask(TASK_HM10_READ,8,35);          // read
-                          HM10_Launchtask(TASK_HM10_READ,9,35);          // read
-                          HM10_Launchtask(TASK_HM10_READ,10,35);          // read
-                          HM10_Launchtask(TASK_HM10_DISCONN,11,250);          // disconnect
-                          }                    
+void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);      // disconnect
+                          HM10_Launchtask(TASK_HM10_ROLE1,1,1);         // set role to 1
+                          HM10_Launchtask(TASK_HM10_IMME1,2,1);         // set imme to 1
+                          HM10_Launchtask(TASK_HM10_RESET,3,1);         // reset Device
+                          HM10_Launchtask(TASK_HM10_VERSION,4,10);       // read SW Version
+                          HM10_Launchtask(TASK_HM10_DISC,5,1);           // disscovery
+                          }
+
+void HM10_Read_Sensor(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
+                          HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
+                          HM10_Launchtask(TASK_HM10_READ,3,15);          // read
+                          HM10_Launchtask(TASK_HM10_READ,4,15);          // read
+                          HM10_Launchtask(TASK_HM10_READ,5,15);          // read
+                          HM10_Launchtask(TASK_HM10_UNSUBSCR,6,10);      // unsubscribe
+                          HM10_Launchtask(TASK_HM10_DISCONN,7,0);        // disconnect
+                          }
+                          
+void HM10_Read_Sensor1(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
+                          HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
+                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,60);      // unsubscribe
+                          HM10_Launchtask(TASK_HM10_DISCONN,4,0);        // disconnect
+                          }
+
 
 /**
  * @brief Return the slot number of a known sensor or return create new sensor slot
@@ -233,7 +269,8 @@ void HM10SerialInit(void) {
       DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
     }
     HM10_Reset();
-    HM10.mode.init = true;
+    HM10.mode.pending_task = 1;
+    HM10.mode.init = 1;
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
   }
   return;
@@ -268,12 +305,33 @@ void HM10ParseResponse(char *buf) {
     }
 }
 
+void HM10readTempHum(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0 && _buf[1] != 0){
+    memcpy(&LYWSD03,(void *)_buf,3);
+    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
+    // uint8_t _serial[6] = {0};
+    uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    static float _tempFloat;
+    _tempFloat=(float)(LYWSD03.temp)/100.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).LYWSD0x.temp=_tempFloat;
+    }
+    _tempFloat=(float)LYWSD03.hum;
+    if(_tempFloat<100){
+      MIBLEsensors.at(_slot).LYWSD0x.hum = _tempFloat;
+      DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
+    }
+  }
+}
+
 /*********************************************************************************************\
  * handle the return value from the HM10
 \*********************************************************************************************/
 
 bool HM10SerialHandleFeedback(){
-  bool success    = false;                           // true disables possible repetition of commands, set to false only for debugging
+  bool success    = false;                        // true disables possible repetition of commands, set to false only for debugging
   uint32_t i       = 0;
   char ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
   
@@ -287,31 +345,14 @@ bool HM10SerialHandleFeedback(){
     success = true;
   }
   if(HM10.mode.subscribed) {
-    DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),ret[0],ret[1],ret[2],ret[3],ret[4],ret[5],ret[6]);
-    if(ret[0] != 0 && ret[1] != 0){
-      memcpy(&LYWSD03,(void *)ret,3);
-      DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
-      uint8_t _serial[6] = {0};
-      uint32_t _slot = MIBLEgetSensorSlot(_serial, 4);
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-      static float _tempFloat;
-      _tempFloat=(float)(LYWSD03.temp)/100.0f;
-      if(_tempFloat<60){
-          MIBLEsensors.at(_slot).LYWSD0x.temp=_tempFloat;
-      }
-      _tempFloat=(float)LYWSD03.hum;
-      if(_tempFloat<100){
-        MIBLEsensors.at(_slot).LYWSD0x.hum = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
-      }
-    }
+    HM10readTempHum(ret);
   }
   else if(success) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
     HM10ParseResponse(ret);
   }
   else {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s got no response"),D_CMND_HM10);
+    // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s got no response"),D_CMND_HM10);
   }
   return success;
 }
@@ -321,6 +362,7 @@ bool HM10SerialHandleFeedback(){
 \*********************************************************************************************/
 
 void HM10_TaskEvery100ms(){
+  HM10SerialHandleFeedback();
   // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),D_CMND_HM10,HM10_TASK_LIST[0][0]);
   if (HM10.current_task_delay == 0)  {
     uint8_t i = 0;
@@ -367,7 +409,11 @@ void HM10_TaskEvery100ms(){
           HM10.current_task_delay = 2;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
-          HM10Serial->write("AT+CONA4C138ED815A");
+          // HM10Serial->write("AT+CONA4C138ED815A");
+          char _con[20];
+          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",HM10Mac[HM10.state.sensor][0],HM10Mac[HM10.state.sensor][1],HM10Mac[HM10.state.sensor][2],HM10Mac[HM10.state.sensor][3],HM10Mac[HM10.state.sensor][4],HM10Mac[HM10.state.sensor][5]);
+          HM10Serial->write(_con);
+          // HM10Serial->write(kHM10Mac[HM10.state.sensor]);
           break;
         case TASK_HM10_DISCONN:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
@@ -375,7 +421,6 @@ void HM10_TaskEvery100ms(){
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT");
-          HM10.mode.subscribed = false;
           break;
         case TASK_HM10_RESET:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
@@ -386,11 +431,19 @@ void HM10_TaskEvery100ms(){
           break;
         case TASK_HM10_SUBSCR:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 15;                    // set task delay
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          HM10.current_task_delay = 25;                   // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+NOTIFY_ON0037");
-          
+          break;
+        case TASK_HM10_UNSUBSCR:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.subscribed = false;
+          HM10Serial->write("AT+NOTIFYOFF0037");
+          break;
         case TASK_HM10_READ:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
           HM10.current_task_delay = 0;                    // set task delay
@@ -398,12 +451,14 @@ void HM10_TaskEvery100ms(){
           runningTaskLoop = false;
           HM10Serial->write("AT+READDATA0036?");
           HM10.mode.subscribed = true;
+          break;
         case TASK_HM10_FINDALLCHARS:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s find all chars"),D_CMND_HM10);
           HM10.current_task_delay = 35;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+FINDALLCHARS?");
+          break;
         case TASK_HM10_FEEDBACK:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
           HM10SerialHandleFeedback();
@@ -411,6 +466,14 @@ void HM10_TaskEvery100ms(){
           HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
           runningTaskLoop = false;
           break;
+        case TASK_HM10_DELAY_SUB:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start reading"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;     // set task delay
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
+          HM10.mode.subscribed = true;
+          runningTaskLoop = false;
+          break;
 
         case TASK_HM10_DONE:                                    // this entry was already handled
           // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),D_CMND_HM10);
@@ -426,6 +489,7 @@ void HM10_TaskEvery100ms(){
             runningTaskLoop = false;                                  // return to main loop
             // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sUpdate GUI via AJAX"),D_CMND_HM10);
             // HM10_GUI_NEEDS_UPDATE = true;
+            HM10.mode.pending_task = 0;
             break; 
           }
       }
@@ -437,6 +501,26 @@ void HM10_TaskEvery100ms(){
   }
 }
 
+void HM10EverySecond(){
+  if(HM10.firmware == 0) return;
+  if(HM10.mode.pending_task == 1) return;
+  static uint32_t _counter = 0;
+  if(_counter == 0) {
+    HM10_Read_Sensor1();
+    HM10.mode.pending_task == 1;
+    _counter = 60;
+    HM10.state.sensor++;
+    if (HM10.state.sensor>1) {
+      HM10.state.sensor=0;
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
+  }
+  _counter--;
+}
+
+/*********************************************************************************************\
+ * Presentation
+\*********************************************************************************************/
 
 const char HTTP_HM10[] PROGMEM =
  "{s}HM10" " Firmware " "{m}%u{e}";
@@ -494,6 +578,10 @@ bool Xsns92(uint8_t function)
           break;
         }
         break;
+      case FUNC_EVERY_SECOND:
+        HM10EverySecond();
+        DEBUG_SENSOR_LOG(PSTR("HM10: every second"));
+        break;
       case FUNC_JSON_APPEND:
         HM10Show(1);
         break;

From ed455df7604837d12caa2acb55aec49c293a7548 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 2 Feb 2020 13:13:44 +0100
Subject: [PATCH 201/403] Fix PWM flickering at low levels (#7415)

---
 tasmota/CHANGELOG.md              |   1 +
 tasmota/core_esp8266_waveform.cpp | 317 ++++++++++++++++++++++++++++++
 2 files changed, 318 insertions(+)
 create mode 100644 tasmota/core_esp8266_waveform.cpp

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b5036467c..e82a7c082 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Change wifi connectivity stability (#7602)
 - Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
+- Fix PWM flickering at low levels (#7415)
 
 ### 8.1.0.4 20200116
 
diff --git a/tasmota/core_esp8266_waveform.cpp b/tasmota/core_esp8266_waveform.cpp
new file mode 100644
index 000000000..14cec9789
--- /dev/null
+++ b/tasmota/core_esp8266_waveform.cpp
@@ -0,0 +1,317 @@
+/*
+  esp8266_waveform - General purpose waveform generation and control,
+                     supporting outputs on all pins in parallel.
+
+  Copyright (c) 2018 Earle F. Philhower, III.  All rights reserved.
+
+  The core idea is to have a programmable waveform generator with a unique
+  high and low period (defined in microseconds).  TIMER1 is set to 1-shot
+  mode and is always loaded with the time until the next edge of any live
+  waveforms.
+
+  Up to one waveform generator per pin supported.
+
+  Each waveform generator is synchronized to the ESP cycle counter, not the
+  timer.  This allows for removing interrupt jitter and delay as the counter
+  always increments once per 80MHz clock.  Changes to a waveform are
+  contiguous and only take effect on the next waveform transition,
+  allowing for smooth transitions.
+
+  This replaces older tone(), analogWrite(), and the Servo classes.
+
+  Everywhere in the code where "cycles" is used, it means ESP.getCycleTime()
+  cycles, not TIMER1 cycles (which may be 2 CPU clocks @ 160MHz).
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+// Use PWM from core 2.4.0 as all versions below 2.5.0-beta3 produce LED flickering when settings are saved to flash
+#include <core_version.h>
+#if defined(ARDUINO_ESP8266_RELEASE_2_6_1) || defined(ARDUINO_ESP8266_RELEASE_2_6_2) || defined(ARDUINO_ESP8266_RELEASE_2_6_3)
+#warning **** Tasmota is using a patched PWM Arduino version as planned ****
+
+
+#include <Arduino.h>
+#include "ets_sys.h"
+#include "core_esp8266_waveform.h"
+
+extern "C" {
+
+// Maximum delay between IRQs
+#define MAXIRQUS (10000)
+
+// Set/clear GPIO 0-15 by bitmask
+#define SetGPIO(a) do { GPOS = a; } while (0)
+#define ClearGPIO(a) do { GPOC = a; } while (0)
+
+// Waveform generator can create tones, PWM, and servos
+typedef struct {
+  uint32_t nextServiceCycle;   // ESP cycle timer when a transition required
+  uint32_t expiryCycle;        // For time-limited waveform, the cycle when this waveform must stop
+  uint32_t nextTimeHighCycles; // Copy over low->high to keep smooth waveform
+  uint32_t nextTimeLowCycles;  // Copy over high->low to keep smooth waveform
+} Waveform;
+
+static Waveform waveform[17];        // State of all possible pins
+static volatile uint32_t waveformState = 0;   // Is the pin high or low, updated in NMI so no access outside the NMI code
+static volatile uint32_t waveformEnabled = 0; // Is it actively running, updated in NMI so no access outside the NMI code
+
+// Enable lock-free by only allowing updates to waveformState and waveformEnabled from IRQ service routine
+static volatile uint32_t waveformToEnable = 0;  // Message to the NMI handler to start a waveform on a inactive pin
+static volatile uint32_t waveformToDisable = 0; // Message to the NMI handler to disable a pin from waveform generation
+
+static uint32_t (*timer1CB)() = NULL;
+
+
+// Non-speed critical bits
+#pragma GCC optimize ("Os")
+
+static inline ICACHE_RAM_ATTR uint32_t GetCycleCount() {
+  uint32_t ccount;
+  __asm__ __volatile__("esync; rsr %0,ccount":"=a"(ccount));
+  return ccount;
+}
+
+// Interrupt on/off control
+static ICACHE_RAM_ATTR void timer1Interrupt();
+static bool timerRunning = false;
+
+static void initTimer() {
+  timer1_disable();
+  ETS_FRC_TIMER1_INTR_ATTACH(NULL, NULL);
+  ETS_FRC_TIMER1_NMI_INTR_ATTACH(timer1Interrupt);
+  timer1_enable(TIM_DIV1, TIM_EDGE, TIM_SINGLE);
+  timerRunning = true;
+}
+
+static void ICACHE_RAM_ATTR deinitTimer() {
+  ETS_FRC_TIMER1_NMI_INTR_ATTACH(NULL);
+  timer1_disable();
+  timer1_isr_init();
+  timerRunning = false;
+}
+
+// Set a callback.  Pass in NULL to stop it
+void setTimer1Callback(uint32_t (*fn)()) {
+  timer1CB = fn;
+  if (!timerRunning && fn) {
+    initTimer();
+    timer1_write(microsecondsToClockCycles(1)); // Cause an interrupt post-haste
+  } else if (timerRunning && !fn && !waveformEnabled) {
+    deinitTimer();
+  }
+}
+
+// Start up a waveform on a pin, or change the current one.  Will change to the new
+// waveform smoothly on next low->high transition.  For immediate change, stopWaveform()
+// first, then it will immediately begin.
+int startWaveform(uint8_t pin, uint32_t timeHighUS, uint32_t timeLowUS, uint32_t runTimeUS) {
+  if ((pin > 16) || isFlashInterfacePin(pin)) {
+    return false;
+  }
+  Waveform *wave = &waveform[pin];
+  // Adjust to shave off some of the IRQ time, approximately
+  wave->nextTimeHighCycles = microsecondsToClockCycles(timeHighUS);
+  wave->nextTimeLowCycles = microsecondsToClockCycles(timeLowUS);
+  wave->expiryCycle = runTimeUS ? GetCycleCount() + microsecondsToClockCycles(runTimeUS) : 0;
+  if (runTimeUS && !wave->expiryCycle) {
+    wave->expiryCycle = 1; // expiryCycle==0 means no timeout, so avoid setting it
+  }
+
+  uint32_t mask = 1<<pin;
+  if (!(waveformEnabled & mask)) {
+    // Actually set the pin high or low in the IRQ service to guarantee times
+    wave->nextServiceCycle = GetCycleCount() + microsecondsToClockCycles(1);
+    waveformToEnable |= mask;
+    if (!timerRunning) {
+      initTimer();
+      timer1_write(microsecondsToClockCycles(10));
+    } else {
+      // Ensure timely service....
+      if (T1L > microsecondsToClockCycles(10)) {
+        timer1_write(microsecondsToClockCycles(10));
+      }
+    }
+    while (waveformToEnable) {
+      delay(0); // Wait for waveform to update
+    }
+  }
+
+  return true;
+}
+
+// Speed critical bits
+#pragma GCC optimize ("O2")
+// Normally would not want two copies like this, but due to different
+// optimization levels the inline attribute gets lost if we try the
+// other version.
+
+static inline ICACHE_RAM_ATTR uint32_t GetCycleCountIRQ() {
+  uint32_t ccount;
+  __asm__ __volatile__("rsr %0,ccount":"=a"(ccount));
+  return ccount;
+}
+
+static inline ICACHE_RAM_ATTR uint32_t min_u32(uint32_t a, uint32_t b) {
+  if (a < b) {
+    return a;
+  }
+  return b;
+}
+
+// Stops a waveform on a pin
+int ICACHE_RAM_ATTR stopWaveform(uint8_t pin) {
+  // Can't possibly need to stop anything if there is no timer active
+  if (!timerRunning) {
+    return false;
+  }
+  // If user sends in a pin >16 but <32, this will always point to a 0 bit
+  // If they send >=32, then the shift will result in 0 and it will also return false
+  uint32_t mask = 1<<pin;
+  if (!(waveformEnabled & mask)) {
+    return false; // It's not running, nothing to do here
+  }
+  waveformToDisable |= mask;
+  // Ensure timely service....
+  if (T1L > microsecondsToClockCycles(10)) {
+    timer1_write(microsecondsToClockCycles(10));
+  }
+  while (waveformToDisable) {
+    /* no-op */ // Can't delay() since stopWaveform may be called from an IRQ
+  }
+  if (!waveformEnabled && !timer1CB) {
+    deinitTimer();
+  }
+  return true;
+}
+
+// The SDK and hardware take some time to actually get to our NMI code, so
+// decrement the next IRQ's timer value by a bit so we can actually catch the
+// real CPU cycle counter we want for the waveforms.
+#if F_CPU == 80000000
+  #define DELTAIRQ (microsecondsToClockCycles(3))
+#else
+  #define DELTAIRQ (microsecondsToClockCycles(2))
+#endif
+
+
+static ICACHE_RAM_ATTR void timer1Interrupt() {
+  // Optimize the NMI inner loop by keeping track of the min and max GPIO that we
+  // are generating.  In the common case (1 PWM) these may be the same pin and
+  // we can avoid looking at the other pins.
+  static int startPin = 0;
+  static int endPin = 0;
+
+  uint32_t nextEventCycles = microsecondsToClockCycles(MAXIRQUS);
+  uint32_t timeoutCycle = GetCycleCountIRQ() + microsecondsToClockCycles(14);
+
+  if (waveformToEnable || waveformToDisable) {
+    // Handle enable/disable requests from main app.
+    waveformEnabled = (waveformEnabled & ~waveformToDisable) | waveformToEnable; // Set the requested waveforms on/off
+    waveformState &= ~waveformToEnable;  // And clear the state of any just started
+    waveformToEnable = 0;
+    waveformToDisable = 0;
+    // Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t)
+    startPin = __builtin_ffs(waveformEnabled) - 1;
+    // Find the last bit by subtracting off GCC's count-leading-zeros (no offset in this one)
+    endPin = 32 - __builtin_clz(waveformEnabled);
+  }
+
+  bool done = false;
+  if (waveformEnabled) {
+    do {
+      nextEventCycles = microsecondsToClockCycles(MAXIRQUS);
+      for (int i = startPin; i <= endPin; i++) {
+        uint32_t mask = 1<<i;
+
+        // If it's not on, ignore!
+        if (!(waveformEnabled & mask)) {
+          continue;
+        }
+
+        Waveform *wave = &waveform[i];
+        uint32_t now = GetCycleCountIRQ();
+
+        // Disable any waveforms that are done
+        if (wave->expiryCycle) {
+          int32_t expiryToGo = wave->expiryCycle - now;
+          if (expiryToGo < 0) {
+              // Done, remove!
+              waveformEnabled &= ~mask;
+              if (i == 16) {
+                GP16O &= ~1;
+              } else {
+                ClearGPIO(mask);
+              }
+              continue;
+            }
+        }
+
+        // Check for toggles
+        int32_t cyclesToGo = wave->nextServiceCycle - now;
+        if (cyclesToGo < 0) {
+          waveformState ^= mask;
+          if (waveformState & mask) {
+            if (i == 16) {
+              GP16O |= 1; // GPIO16 write slow as it's RMW
+            } else {
+              SetGPIO(mask);
+            }
+            wave->nextServiceCycle = now + wave->nextTimeHighCycles + cyclesToGo;
+            nextEventCycles = min_u32(nextEventCycles, min_u32(wave->nextTimeHighCycles + cyclesToGo, 1));
+          } else {
+            if (i == 16) {
+              GP16O &= ~1; // GPIO16 write slow as it's RMW
+            } else {
+              ClearGPIO(mask);
+            }
+            wave->nextServiceCycle = now + wave->nextTimeLowCycles + cyclesToGo;
+            nextEventCycles = min_u32(nextEventCycles, min_u32(wave->nextTimeLowCycles + cyclesToGo, 1));
+          }
+        } else {
+          uint32_t deltaCycles = wave->nextServiceCycle - now;
+          nextEventCycles = min_u32(nextEventCycles, deltaCycles);
+        }
+      }
+
+      // Exit the loop if we've hit the fixed runtime limit or the next event is known to be after that timeout would occur
+      uint32_t now = GetCycleCountIRQ();
+      int32_t cycleDeltaNextEvent = timeoutCycle - (now + nextEventCycles);
+      int32_t cyclesLeftTimeout = timeoutCycle - now;
+      done = (cycleDeltaNextEvent < 0) || (cyclesLeftTimeout < 0);
+    } while (!done);
+  } // if (waveformEnabled)
+
+  if (timer1CB) {
+    nextEventCycles = min_u32(nextEventCycles, timer1CB());
+  }
+
+  if (nextEventCycles < microsecondsToClockCycles(10)) {
+    nextEventCycles = microsecondsToClockCycles(10);
+  }
+  nextEventCycles -= DELTAIRQ;
+
+  // Do it here instead of global function to save time and because we know it's edge-IRQ
+#if F_CPU == 160000000
+  T1L = nextEventCycles >> 1; // Already know we're in range by MAXIRQUS
+#else
+  T1L = nextEventCycles; // Already know we're in range by MAXIRQUS
+#endif
+  TEIE |= TEIE1; // Edge int enable
+}
+
+};
+
+#endif  // ARDUINO_ESP8266_RELEASE
\ No newline at end of file

From b64abc9757e2ec211a4adedf5d6227e90a015bc6 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 2 Feb 2020 17:44:26 +0100
Subject: [PATCH 202/403] dynamic sensor discovery

---
 tasmota/xsns_92_MI_HM10.ino | 204 +++++++++++++++++++++++-------------
 1 file changed, 130 insertions(+), 74 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index b91d75d31..8e1b1e699 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -70,26 +70,20 @@ struct {
 #pragma pack(0)
 
 struct mi_sensor_t{
-  uint8_t type; //flora = 1; MI-HT_V1=2; LYWSD02=3; LYWSD03=4
+  uint8_t type; //Flora = 1; MI-HT_V1=2; LYWSD02=3; LYWSD03=4
   uint8_t serial[6];
   uint8_t showedUp;
+  float temp; //Flora, MJ_HT_V1, LYWSD0x
   union {
     struct {
-      float temp;
       float moisture;
       float fertility;
       uint16_t lux;
-    } Flora;
+    }; // Flora
     struct {
-      float temp;
       float hum;
       uint8_t bat;
-    } MJ_HT_V1;
-    struct {
-      float temp;
-      float hum;
-      uint8_t bat;
-    } LYWSD0x; // LYWSD02 and LYWSD03
+    }; // MJ_HT_V1, LYWSD0x
   };
 };
 
@@ -101,24 +95,21 @@ std::vector<mi_sensor_t> MIBLEsensors;
 
 #define D_CMND_HM10 "HM10"
 
-// const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
-// const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
-// const char kHM10_Commands[] PROGMEM             = "Track|Play";
+uint8_t kHM10SlaveID[4][3]  = { 0xC4,0x7C,0x8D, // Flora
+                                0x58,0x2D,0x34, // MJ_HT_V1
+                                0xE7,0x2E,0x00, // LYWSD02
+                                0xA4,0xC1,0x38, // LYWSD03
+                                };
 
-const char kHM10SlaveID0[] PROGMEM = "";
-const char kHM10SlaveID1[] PROGMEM = "";
-const char kHM10SlaveID2[] PROGMEM = "";
-const char kHM10SlaveID3[] PROGMEM = "";
-const char kHM10SlaveID4[] PROGMEM = "A4C138";
-const char * kHM10SlaveID[] PROGMEM = {kHM10SlaveID0,kHM10SlaveID1,kHM10SlaveID2,kHM10SlaveID3,kHM10SlaveID4};
+const char kHM10SlaveType1[] PROGMEM = "Flora";
+const char kHM10SlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
+const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
+const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
 
 
-// const char kHM10Mac0[] PROGMEM = "A4C138ED815A";
-// const char kHM10Mac1[] PROGMEM = "A4C1382AC8B3";
-// const char * kHM10Mac[] PROGMEM ={kHM10Mac0, kHM10Mac1};
-
-uint8_t HM10Mac[2][6]={0xA4,0xC1,0x38,0xED,0x81,0x5A, 
-                       0xA4,0xC1,0x38,0x2A,0xC8,0xB3};
+// uint8_t HM10Mac[2][6]={0xA4,0xC1,0x38,0xED,0x81,0x5A, 
+//                        0xA4,0xC1,0x38,0x2A,0xC8,0xB3};
 
 /*********************************************************************************************\
  * enumerations
@@ -174,12 +165,12 @@ void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
                           HM10_TASK_LIST[slot][0]   = task;  
 }
 
-void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);      // disconnect
+void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disconnect
                           HM10_Launchtask(TASK_HM10_ROLE1,1,1);         // set role to 1
                           HM10_Launchtask(TASK_HM10_IMME1,2,1);         // set imme to 1
                           HM10_Launchtask(TASK_HM10_RESET,3,1);         // reset Device
-                          HM10_Launchtask(TASK_HM10_VERSION,4,10);       // read SW Version
-                          HM10_Launchtask(TASK_HM10_DISC,5,1);           // disscovery
+                          HM10_Launchtask(TASK_HM10_VERSION,4,10);      // read SW Version
+                          HM10_Launchtask(TASK_HM10_DISC,5,50);         // discovery
                           }
 
 void HM10_Read_Sensor(void) {
@@ -206,10 +197,24 @@ void HM10_Read_Sensor1(void) {
  * @brief Return the slot number of a known sensor or return create new sensor slot
  *
  * @param _serial     BLE address of the sensor
- * @param _type       Type number of the sensor
+ * @param _type       Type number of the sensor, 0xff for Auto-type
  * @return uint32_t   Known or new slot in the sensors-vector
  */
 uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  if(_type==0xff){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: will test MAC-type"));
+    for (uint32_t i=0;i<4;i++){
+      if(memcmp(_serial,kHM10SlaveID+i,3)==0){
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC is type %u"), i);
+        _type = i+1;
+      }
+      else {
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC-type is unknown"));
+      }
+    }
+  }
+  if(_type==0xff) return _type; // error
+
   DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
   for(uint32_t i=0; i<MIBLEsensors.size(); i++){
     if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
@@ -227,23 +232,17 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
   memcpy(_newSensor.serial,_serial, sizeof(_serial));
   _newSensor.type = _type;
   _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
   switch (_type)
     {
     case 1:
-      _newSensor.Flora.temp =-1000.0f;
-      _newSensor.Flora.moisture =-1000.0f;
-      _newSensor.Flora.fertility =-1000.0f;
-      _newSensor.Flora.lux = 0xffff;
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0xffff;
       break;
-    case 2:
-      _newSensor.MJ_HT_V1.temp=-1000.0f;
-      _newSensor.MJ_HT_V1.hum=-1.0f;
-      _newSensor.MJ_HT_V1.bat=0xff;
-      break;
-    case 3: case 4:
-      _newSensor.LYWSD0x.temp=-1000.0f;
-      _newSensor.LYWSD0x.hum=-1.0f;
-      _newSensor.LYWSD0x.bat=0xff;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
       break;
     default:
       break;
@@ -286,6 +285,26 @@ void HM10SerialInit(void) {
 //   return;
 // }
 
+void HM10datahex(const char* string, uint8_t _mac[]) {
+    uint32_t slength = 12;
+    // uint8_t _mac[6] = {0};
+    uint32_t index = 0;
+    DEBUG_SENSOR_LOG(PSTR("HM10: mac-string %s"), string);
+    while (index < slength) {
+        char c = string[index];
+        uint32_t value = 0;
+        if(c >= '0' && c <= '9')
+          value = (c - '0');
+        else if (c >= 'A' && c <= 'F') 
+          value = (10 + (c - 'A'));
+        _mac[(index/2)] += value << (((index + 1) % 2) * 4);
+        // DEBUG_SENSOR_LOG(PSTR("HM10:  Char: %c, Value: %x, Index/2: %u, valueadded: %x, MAC-index: %x"), c, value,(index/2),value << (((index + 1) % 2) * 4), _mac[index/2]);
+        index++;
+    }
+    DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_mac[0],_mac[1],_mac[2],_mac[3],_mac[4],_mac[5]);
+}
+
+
 /*********************************************************************************************\
  * parse the response
 \*********************************************************************************************/
@@ -298,8 +317,18 @@ void HM10ParseResponse(char *buf) {
       memcpy((void *)_fw,(void *)(buf+8),3);
       HM10.firmware = atoi(_fw);
       DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
+      return;
      }
-
+    char * _pos = strstr(buf, "IS0:");
+    if(_pos) {
+      const char* _mac = "000000000000";
+      memcpy((void *)_mac,(void *)(_pos+4),12);
+      DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
+      uint8_t _newMacArray[6] = {0};
+      HM10datahex(_mac, _newMacArray);
+      DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
+      MIBLEgetSensorSlot(_newMacArray, 0xff);
+    } 
     else {
       DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
     }
@@ -311,16 +340,18 @@ void HM10readTempHum(char *_buf){
     memcpy(&LYWSD03,(void *)_buf,3);
     DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
     // uint8_t _serial[6] = {0};
-    uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
+    // uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
+    uint32_t _slot = HM10.state.sensor;
+
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
     static float _tempFloat;
     _tempFloat=(float)(LYWSD03.temp)/100.0f;
     if(_tempFloat<60){
-        MIBLEsensors.at(_slot).LYWSD0x.temp=_tempFloat;
+        MIBLEsensors.at(_slot).temp=_tempFloat;
     }
     _tempFloat=(float)LYWSD03.hum;
     if(_tempFloat<100){
-      MIBLEsensors.at(_slot).LYWSD0x.hum = _tempFloat;
+      MIBLEsensors.at(_slot).hum = _tempFloat;
       DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
     }
   }
@@ -411,7 +442,7 @@ void HM10_TaskEvery100ms(){
           runningTaskLoop = false;
           // HM10Serial->write("AT+CONA4C138ED815A");
           char _con[20];
-          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",HM10Mac[HM10.state.sensor][0],HM10Mac[HM10.state.sensor][1],HM10Mac[HM10.state.sensor][2],HM10Mac[HM10.state.sensor][3],HM10Mac[HM10.state.sensor][4],HM10Mac[HM10.state.sensor][5]);
+          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
           HM10Serial->write(_con);
           // HM10Serial->write(kHM10Mac[HM10.state.sensor]);
           break;
@@ -505,17 +536,31 @@ void HM10EverySecond(){
   if(HM10.firmware == 0) return;
   if(HM10.mode.pending_task == 1) return;
   static uint32_t _counter = 0;
-  if(_counter == 0) {
-    HM10_Read_Sensor1();
-    HM10.mode.pending_task == 1;
-    _counter = 60;
-    HM10.state.sensor++;
-    if (HM10.state.sensor>1) {
+  if(_counter==0 && HM10.mode.pending_task==0) {
+    if (MIBLEsensors.size()>0) {
+      if(MIBLEsensors.at(HM10.state.sensor).type==3) {
+        HM10.mode.pending_task = 1;
+        HM10_Read_Sensor1();
+        }
+      else {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor not type 3: %u"),D_CMND_HM10, HM10.state.sensor);
+      }
+    }
+    else {
+      HM10.mode.pending_task = 1;
+      HM10_Launchtask(TASK_HM10_DISC,0,1); // start new discovery
+      return;
+    }
+    if (HM10.state.sensor==MIBLEsensors.size()-1) {
       HM10.state.sensor=0;
+      _counter = 60;
+    }
+    else {
+      HM10.state.sensor++;
     }
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
-  _counter--;
+  if(_counter>0) _counter--;
 }
 
 /*********************************************************************************************\
@@ -525,29 +570,37 @@ void HM10EverySecond(){
 const char HTTP_HM10[] PROGMEM =
  "{s}HM10" " Firmware " "{m}%u{e}";
 
+const char HTTP_HM10_SERIAL[] PROGMEM =
+ "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+
 void HM10Show(bool json)
 {
-    if (json) {
-      if (MIBLEsensors.size()==0) return;
-
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(0).LYWSD0x.temp, Settings.flag2.temperature_resolution, temperature);
-      char humidity[33];
-      dtostrfd(MIBLEsensors.at(0).LYWSD0x.hum, Settings.flag2.humidity_resolution, humidity);
-
-      ResponseAppend_P(JSON_SNS_TEMPHUM, F("LYWSD03"), temperature, humidity);
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      // char slave[33];
+      // sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveFlora,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+      char temperature[33]; // all sensors have temperature
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+      if (MIBLEsensors.at(i).type>1){
+        char humidity[33];
+        dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+        ResponseAppend_P(JSON_SNS_TEMPHUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, humidity);
+      }
+    }
 #ifdef USE_WEBSERVER
     } else {
       WSContentSend_PD(HTTP_HM10, HM10.firmware);
-      if (MIBLEsensors.size()==0) return;
-
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(0).LYWSD0x.temp, Settings.flag2.temperature_resolution, temperature);
-      char humidity[33];
-      dtostrfd(MIBLEsensors.at(0).LYWSD0x.hum, Settings.flag2.humidity_resolution, humidity);
-
-      WSContentSend_PD(HTTP_SNS_TEMP, F("LYWSD03"), temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, F("LYWSD03"), humidity);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]); 
+        char temperature[33];
+        dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+        WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        if (MIBLEsensors.at(i).type>1){ // everything "above" Flora
+        char humidity[33];
+        dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+        WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
+        }
+      }
 #endif  // USE_WEBSERVER
     }
 }
@@ -566,10 +619,13 @@ bool Xsns92(uint8_t function)
       case FUNC_INIT:
         HM10SerialInit();                                    // init and start communication
         break;
+      case FUNC_EVERY_50_MSECOND:
+        HM10SerialHandleFeedback();                        // -> sniff for device feedback
+       break;
       case FUNC_EVERY_100_MSECOND:
         if (HM10_TASK_LIST[0][0] == TASK_HM10_NOTASK) {       // no task running 
           // DEBUG_SENSOR_LOG(PSTR("HM10: no TASK in array"));
-          HM10SerialHandleFeedback();                        // -> sniff for device feedback
+          // HM10SerialHandleFeedback();                        // -> sniff for device feedback
           break;
         }
         else {
@@ -580,7 +636,7 @@ bool Xsns92(uint8_t function)
         break;
       case FUNC_EVERY_SECOND:
         HM10EverySecond();
-        DEBUG_SENSOR_LOG(PSTR("HM10: every second"));
+        // DEBUG_SENSOR_LOG(PSTR("HM10: every second"));
         break;
       case FUNC_JSON_APPEND:
         HM10Show(1);

From 02df35b6b5d9173e76fd3a5589c0672a1a7da441 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 2 Feb 2020 18:02:31 +0100
Subject: [PATCH 203/403] Safeguard if delay is too high

---
 tasmota/core_esp8266_waveform.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasmota/core_esp8266_waveform.cpp b/tasmota/core_esp8266_waveform.cpp
index 14cec9789..8ee2d9eba 100644
--- a/tasmota/core_esp8266_waveform.cpp
+++ b/tasmota/core_esp8266_waveform.cpp
@@ -262,6 +262,7 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
         // Check for toggles
         int32_t cyclesToGo = wave->nextServiceCycle - now;
         if (cyclesToGo < 0) {
+          cyclesToGo = -((-cyclesToGo) % (wave->nextTimeHighCycles + wave->nextTimeLowCycles));
           waveformState ^= mask;
           if (waveformState & mask) {
             if (i == 16) {

From 9ce92d7df8135f39a802a3e647a1c35488fcba06 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 2 Feb 2020 18:38:27 +0100
Subject: [PATCH 204/403] Fixed comment

---
 tasmota/core_esp8266_waveform.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasmota/core_esp8266_waveform.cpp b/tasmota/core_esp8266_waveform.cpp
index 8ee2d9eba..a17b63a9b 100644
--- a/tasmota/core_esp8266_waveform.cpp
+++ b/tasmota/core_esp8266_waveform.cpp
@@ -37,7 +37,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-// Use PWM from core 2.4.0 as all versions below 2.5.0-beta3 produce LED flickering when settings are saved to flash
 #include <core_version.h>
 #if defined(ARDUINO_ESP8266_RELEASE_2_6_1) || defined(ARDUINO_ESP8266_RELEASE_2_6_2) || defined(ARDUINO_ESP8266_RELEASE_2_6_3)
 #warning **** Tasmota is using a patched PWM Arduino version as planned ****

From 46e06a6fcb832f46cfa99fbd09213a4f473ad2bf Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 2 Feb 2020 19:07:31 +0100
Subject: [PATCH 205/403] error fixes

---
 tasmota/xsns_92_MI_HM10.ino | 112 ++++++++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 31 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 8e1b1e699..18c101101 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -41,8 +41,6 @@ TasmotaSerial *HM10Serial;
 #define  HM10_MAX_TASK_NUMBER      12
 uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
 
-
-
 #define  HM10_MAX_RX_BUF         512
 char     HM10_RX_STRING[HM10_MAX_RX_BUF]      = {0};
 
@@ -535,29 +533,27 @@ void HM10_TaskEvery100ms(){
 void HM10EverySecond(){
   if(HM10.firmware == 0) return;
   if(HM10.mode.pending_task == 1) return;
-  static uint32_t _counter = 0;
-  if(_counter==0 && HM10.mode.pending_task==0) {
-    if (MIBLEsensors.size()>0) {
-      if(MIBLEsensors.at(HM10.state.sensor).type==3) {
-        HM10.mode.pending_task = 1;
-        HM10_Read_Sensor1();
-        }
-      else {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor not type 3: %u"),D_CMND_HM10, HM10.state.sensor);
-      }
-    }
-    else {
+  if (MIBLEsensors.size()==0) {
       HM10.mode.pending_task = 1;
       HM10_Launchtask(TASK_HM10_DISC,0,1); // start new discovery
       return;
+  }
+  static uint32_t _counter = 0;
+  static uint32_t _nextSensorSlot = 0;
+  if(_counter==0) {
+      HM10.state.sensor = _nextSensorSlot;
+      _nextSensorSlot++;
+    if(MIBLEsensors.at(HM10.state.sensor).type==4) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_Sensor1();
+      }
+    else {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor not type 3: %u"),D_CMND_HM10, HM10.state.sensor);
     }
     if (HM10.state.sensor==MIBLEsensors.size()-1) {
-      HM10.state.sensor=0;
+      _nextSensorSlot= 0;
       _counter = 60;
     }
-    else {
-      HM10.state.sensor++;
-    }
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
   if(_counter>0) _counter--;
@@ -573,32 +569,86 @@ const char HTTP_HM10[] PROGMEM =
 const char HTTP_HM10_SERIAL[] PROGMEM =
  "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
 
+const char HTTP_BATTERY[] PROGMEM =
+ "{s}%s" " Battery" "{m}%u%%{e}";
+
+const char HTTP_HM10_FLORA_DATA[] PROGMEM =
+  "{s}%s" " Fertility" "{m}%sus/cm{e}";
+
 void HM10Show(bool json)
 {
   if (json) {
     for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      // char slave[33];
-      // sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveFlora,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
       char temperature[33]; // all sensors have temperature
       dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-      if (MIBLEsensors.at(i).type>1){
-        char humidity[33];
-        dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-        ResponseAppend_P(JSON_SNS_TEMPHUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, humidity);
-      }
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){ // this is the error code -> no temperature
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==1){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>1){ 
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no temperature
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
     }
 #ifdef USE_WEBSERVER
     } else {
       WSContentSend_PD(HTTP_HM10, HM10.firmware);
       for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
         WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]); 
-        char temperature[33];
-        dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-        WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==1){
+          if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no temperature
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no temperature
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
         if (MIBLEsensors.at(i).type>1){ // everything "above" Flora
-        char humidity[33];
-        dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-        WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no humidity
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
         }
       }
 #endif  // USE_WEBSERVER

From 49ebd870ca256febaf74f7dbd33310cad2d4991e Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 2 Feb 2020 20:53:49 +0100
Subject: [PATCH 206/403] Add ``ZbBind`` (experimental) and bug fixes

---
 tasmota/CHANGELOG.md                    |   1 +
 tasmota/i18n.h                          |   1 +
 tasmota/xdrv_23_zigbee_3_devices.ino    |  22 ++++-
 tasmota/xdrv_23_zigbee_5_converters.ino |  19 ++--
 tasmota/xdrv_23_zigbee_8_parsers.ino    |   3 +
 tasmota/xdrv_23_zigbee_9_impl.ino       | 125 ++++++++++++++++++------
 6 files changed, 134 insertions(+), 37 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b5036467c..4d2834a4e 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Change wifi connectivity stability (#7602)
 - Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
+- Add ``ZbBind`` (experimental) and bug fixes
 
 ### 8.1.0.4 20200116
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index fdf07acd6..d44030569 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -493,6 +493,7 @@
   #define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent"
 #define D_JSON_ZIGBEE_RECEIVED "ZbReceived"
 #define D_JSON_ZIGBEE_RECEIVED_LEGACY "ZigbeeReceived"
+#define D_CMND_ZIGBEE_BIND "Bind"
 
 // Commands xdrv_25_A4988_Stepper.ino
 #define D_CMND_MOTOR "MOTOR"
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 5db3986e4..984842380 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -71,6 +71,8 @@ public:
   uint16_t isKnownIndex(uint32_t index) const;
   uint16_t isKnownFriendlyName(const char * name) const;
 
+  uint64_t getDeviceLongAddr(uint16_t shortaddr) const;
+
   // Add new device, provide ShortAddr and optional longAddr
   // If it is already registered, update information, otherwise create the entry
   void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
@@ -142,6 +144,7 @@ private:
   static int32_t findClusterEndpoint(const std::vector<uint32_t>  & vecOfElements, uint16_t element);
 
   Z_Device & getShortAddr(uint16_t shortaddr);   // find Device from shortAddr, creates it if does not exist
+  const Z_Device & getShortAddrConst(uint16_t shortaddr) const ;   // find Device from shortAddr, creates it if does not exist
   Z_Device & getLongAddr(uint64_t longaddr);     // find Device from shortAddr, creates it if does not exist
 
   int32_t findShortAddr(uint16_t shortaddr) const;
@@ -160,6 +163,9 @@ private:
 
 Z_Devices zigbee_devices = Z_Devices();
 
+// Local coordinator information
+uint64_t localIEEEAddr = 0;
+
 // https://thispointer.com/c-how-to-find-an-element-in-vector-and-get-its-index/
 template < typename T>
 bool Z_Devices::findInVector(const std::vector<T>  & vecOfElements, const T  & element) {
@@ -326,6 +332,11 @@ uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
   }
 }
 
+uint64_t Z_Devices::getDeviceLongAddr(uint16_t shortaddr) const {
+  const Z_Device & device = getShortAddrConst(shortaddr);
+  return device.longaddr;
+}
+
 //
 // We have a seen a shortaddr on the network, get the corresponding
 //
@@ -335,9 +346,18 @@ Z_Device & Z_Devices::getShortAddr(uint16_t shortaddr) {
   if (found >= 0) {
     return _devices[found];
   }
-//Serial.printf("Device entry created for shortaddr = 0x%02X, found = %d\n", shortaddr, found);
+  //Serial.printf("Device entry created for shortaddr = 0x%02X, found = %d\n", shortaddr, found);
   return createDeviceEntry(shortaddr, 0);
 }
+// Same version but Const
+const Z_Device & Z_Devices::getShortAddrConst(uint16_t shortaddr) const {
+  if (!shortaddr) { return *(Z_Device*) nullptr; }   // this is not legal
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return _devices[found];
+  }
+  return *((Z_Device*)nullptr);
+}
 
 // find the Device object by its longaddr (unique key if not null)
 Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 0518ec6be..fa79a0796 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -39,10 +39,10 @@ class ZCLFrame {
 public:
 
   ZCLFrame(uint8_t frame_control, uint16_t manuf_code, uint8_t transact_seq, uint8_t cmd_id,
-    const char *buf, size_t buf_len, uint16_t clusterid = 0, uint16_t groupid = 0,
-    uint16_t srcaddr = 0, uint8_t srcendpoint = 0, uint8_t dstendpoint = 0, uint8_t wasbroadcast = 0,
-    uint8_t linkquality = 0, uint8_t securityuse = 0, uint8_t seqnumber = 0,
-    uint32_t timestamp = 0):
+    const char *buf, size_t buf_len, uint16_t clusterid, uint16_t groupid,
+    uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+    uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+    uint32_t timestamp):
     _cmd_id(cmd_id), _manuf_code(manuf_code), _transact_seq(transact_seq),
     _payload(buf_len ? buf_len : 250),      // allocate the data frame from source or preallocate big enough
     _cluster_id(clusterid), _group_id(groupid),
@@ -74,9 +74,9 @@ public:
   }
 
   static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
-                                uint16_t srcaddr = 0, uint8_t srcendpoint = 0, uint8_t dstendpoint = 0, uint8_t wasbroadcast = 0,
-                                uint8_t linkquality = 0, uint8_t securityuse = 0, uint8_t seqnumber = 0,
-                                uint32_t timestamp = 0) { // parse a raw frame and build the ZCL frame object
+                                uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+                                uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+                                uint32_t timestamp) { // parse a raw frame and build the ZCL frame object
     uint32_t i = offset;
     ZCLHeaderFrameControl_t frame_control;
     uint16_t manuf_code = 0;
@@ -92,7 +92,10 @@ public:
     cmd_id = buf.get8(i++);
     ZCLFrame zcl_frame(frame_control.d8, manuf_code, transact_seq, cmd_id,
                        (const char *)(buf.buf() + i), len + offset - i,
-                       clusterid, groupid);
+                       clusterid, groupid,
+                       srcaddr, srcendpoint, dstendpoint, wasbroadcast,
+                       linkquality, securityuse, seqnumber,
+                       timestamp);
     return zcl_frame;
   }
 
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 74a900f00..668f85471 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -33,6 +33,9 @@ int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
   uint8_t device_state = buf.get8(14);
   uint8_t device_associated = buf.get8(15);
 
+  // keep track of the local IEEE address
+  localIEEEAddr = long_adr;
+
   char hex[20];
   Uint64toHex(long_adr, hex, 64);
   Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 2b529c8d6..43f7a2ef4 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -33,19 +33,19 @@ const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"    // prefix
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
 
 const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"    // legacy prefix -- deprecated
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
-  &CmndZigbeeZNPSend, &CmndZigbeePermitJoin,
-  &CmndZigbeeStatus, &CmndZigbeeReset, &CmndZigbeeSend,
-  &CmndZigbeeProbe, &CmndZigbeeRead, &CmndZigbeeZNPReceive,
-  &CmndZigbeeForget, &CmndZigbeeSave, &CmndZigbeeName
+  &CmndZbZNPSend, &CmndZbPermitJoin,
+  &CmndZbStatus, &CmndZbReset, &CmndZbSend,
+  &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
+  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind
   };
 
 int32_t ZigbeeProcessInput(class SBuffer &buf) {
@@ -257,7 +257,7 @@ const unsigned char ZIGBEE_FACTORY_RESET[] PROGMEM =
   { Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 /* len */, 0x01 /* STARTOPT_CLEAR_CONFIG */};
 //"2605030101";  // Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 len, 0x01 STARTOPT_CLEAR_CONFIG
 // Do a factory reset of the CC2530
-void CmndZigbeeReset(void) {
+void CmndZbReset(void) {
   if (ZigbeeSerial) {
     switch (XdrvMailbox.payload) {
     case 1:
@@ -272,7 +272,7 @@ void CmndZigbeeReset(void) {
   }
 }
 
-void CmndZigbeeZNPSendOrReceive(bool send)
+void CmndZbZNPSendOrReceive(bool send)
 {
   if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
     uint8_t code;
@@ -300,14 +300,14 @@ void CmndZigbeeZNPSendOrReceive(bool send)
 }
 
 // For debug purposes only, simulates a message received
-void CmndZigbeeZNPReceive(void)
+void CmndZbZNPReceive(void)
 {
-  CmndZigbeeZNPSendOrReceive(false);
+  CmndZbZNPSendOrReceive(false);
 }
 
-void CmndZigbeeZNPSend(void)
+void CmndZbZNPSend(void)
 {
-  CmndZigbeeZNPSendOrReceive(true);
+  CmndZbZNPSendOrReceive(true);
 }
 
 void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
@@ -442,7 +442,7 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
   ResponseCmndDone();
 }
 
-void CmndZigbeeSend(void) {
+void CmndZbSend(void) {
   // ZigbeeSend { "device":"0x1234", "endpoint":"0x03", "send":{"Power":1} }
   // ZigbeeSend { "device":"0x1234", "endpoint":"0x03", "send":{"Power":"3"} }
   // ZigbeeSend { "device":"0x1234", "endpoint":"0x03", "send":{"Power":"0xFF"} }
@@ -465,9 +465,14 @@ void CmndZigbeeSend(void) {
   uint8_t  endpoint = 0x00;       // 0x00 is invalid for the dst endpoint
   String   cmd_str = "";          // the actual low-level command, either specified or computed
 
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("device"));
-  if (nullptr != &val_device) { device = strToUInt(val_device); }
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("endpoint"));
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
   if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
   const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
   if (nullptr != &val_cmd) {
@@ -547,8 +552,64 @@ void CmndZigbeeSend(void) {
 
 }
 
+ZBM(ZBS_BIND_REQ, Z_SREQ | Z_ZDO, ZDO_BIND_REQ,
+      0,0,                // dstAddr - 16 bits, device to send the bind to
+      0,0,0,0,0,0,0,0,    // srcAddr - 64 bits, IEEE binding source
+      0x00,               // source endpoint
+      0x00, 0x00,         // cluster
+      0x03,               // DstAddrMode - 0x03 = ADDRESS_64_BIT
+      0,0,0,0,0,0,0,0,    // dstAddr - 64 bits, IEEE binding destination, i.e. coordinator
+      0x01                // dstEndpoint - 0x01 for coordinator
+)
+
+void CmndZbBind(void) {
+  // ZbBind { "device":"0x1234", "endpoint":1, "cluster":6 }
+
+  // local endpoint is always 1, IEEE addresses are calculated
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+  // params
+  // static char delim[] = ", ";    // delimiters for parameters
+  uint16_t device = 0xFFFF;         // 0xFFFF is broadcast, so considered valid
+  uint8_t  endpoint = 0x00;         // 0x00 is invalid for the dst endpoint
+  uint16_t cluster  = 0;            // 0xFFFF is invalid
+  uint32_t group = 0xFFFFFFFF;      // 16 bits values, otherwise 0xFFFFFFFF is unspecified
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
+
+  // TODO compute endpoint from cluster
+
+  SBuffer buf(sizeof(ZBS_BIND_REQ));
+  buf.add8(Z_SREQ | Z_ZDO);
+  buf.add8(ZDO_BIND_REQ);
+  buf.add16(device);
+  buf.add64(zigbee_devices.getDeviceLongAddr(device));
+  buf.add8(endpoint);
+  buf.add16(cluster);
+  buf.add8(0x03);             // DstAddrMode - 0x03 = ADDRESS_64_BIT
+  buf.add64(localIEEEAddr);   // coordinatore IEEE address
+  buf.add8(0x01);             // local endpoint = 1
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+
+  ResponseCmndDone();
+}
+
 // Probe a specific device to get its endpoints and supported clusters
-void CmndZigbeeProbe(void) {
+void CmndZbProbe(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
   uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
   if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
@@ -560,7 +621,7 @@ void CmndZigbeeProbe(void) {
 }
 
 // Specify, read or erase a Friendly Name
-void CmndZigbeeName(void) {
+void CmndZbName(void) {
   // Syntax is:
   //  ZigbeeName <device_id>,<friendlyname>  - assign a friendly name
   //  ZigbeeName <device_id>                 - display the current friendly name
@@ -589,7 +650,7 @@ void CmndZigbeeName(void) {
 }
 
 // Remove an old Zigbee device from the list of known devices, use ZigbeeStatus to know all registered devices
-void CmndZigbeeForget(void) {
+void CmndZbForget(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
   uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
   if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
@@ -604,7 +665,7 @@ void CmndZigbeeForget(void) {
 }
 
 // Save Zigbee information to flash
-void CmndZigbeeSave(void) {
+void CmndZbSave(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
 
   saveZigbeeDevices();
@@ -613,7 +674,7 @@ void CmndZigbeeSave(void) {
 }
 
 // Send an attribute read command to a device, specifying cluster and list of attributes
-void CmndZigbeeRead(void) {
+void CmndZbRead(void) {
   // ZigbeeRead {"Device":"0xF289","Cluster":0,"Endpoint":3,"Attr":5}
   // ZigbeeRead {"Device":"0xF289","Cluster":"0x0000","Endpoint":"0x0003","Attr":"0x0005"}
   // ZigbeeRead {"Device":"0xF289","Cluster":0,"Endpoint":3,"Attr":[5,6,7,4]}
@@ -629,10 +690,14 @@ void CmndZigbeeRead(void) {
   size_t   attrs_len = 0;
   uint8_t* attrs = nullptr;       // empty string is valid
 
-
   const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) { device = strToUInt(val_device); }
-  const JsonVariant val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
   if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
   const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
   if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
@@ -659,14 +724,18 @@ void CmndZigbeeRead(void) {
     }
   }
 
-  ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+  if ((0 != endpoint) && (attrs_len > 0)) {
+    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Missing parameters");
+  }
 
   if (attrs) { delete[] attrs; }
-  ResponseCmndDone();
 }
 
 // Allow or Deny pairing of new Zigbee devices
-void CmndZigbeePermitJoin(void)
+void CmndZbPermitJoin(void)
 {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
   uint32_t payload = XdrvMailbox.payload;
@@ -683,7 +752,7 @@ void CmndZigbeePermitJoin(void)
   ResponseCmndDone();
 }
 
-void CmndZigbeeStatus(void) {
+void CmndZbStatus(void) {
   if (ZigbeeSerial) {
     if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
     uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);

From cf8cd47126cd051aa834abc1e316168d8f50dd43 Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Mon, 3 Feb 2020 15:02:09 +1100
Subject: [PATCH 207/403] Add a key to the TuyaReceived to help when writing
 boilerplate rules.

The key is in the form Cmnd<msgtype>DpId<ID>DpType<DpIdType> with a
value that is the hex encoding of the DpIdData. This allows Rules to be
written that target status updates from a specific DpId and of a specific
message type. For example, an Anko HEGSM40 fan reports the speed the fan
is operating at via STAT message on DpId 4 of type Enum. To publish the
speed to MQTT as it's reported from the MCU, I can use the following rule:

  on TuyaReceived#Cmnd7DpId3DpType4 do Publish stat/%topic%/SPEED %value% endon

This appears "on the wire" as:

  stat/tasmota/SPEED 01
---
 tasmota/xdrv_16_tuyamcu.ino | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index da189c568..4fc45e913 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -683,7 +683,9 @@ void TuyaSerialInput(void)
           uint8_t dpidStart = 6;
           while (dpidStart + 4 < Tuya.byte_counter) {
             uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char)));
+            const char *dpData = ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char));
+            ResponseAppend_P(PSTR(",\"Cmnd%dDpId%dDpType%d\":\"%s\""), Tuya.buffer[3], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], dpData);
+            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], dpData);
             if (TUYA_TYPE_STRING == Tuya.buffer[dpidStart + 1]) {
               ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[dpidStart + 4]);
             }

From d651e5c4a21577c9d72ae69dfb3753a36d705113 Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Mon, 3 Feb 2020 21:41:46 +1100
Subject: [PATCH 208/403] print rxed mcu data so it can be printed in a more
 natural way.

basically it tries to use %d to print things when it can instead of
hex strings.
---
 tasmota/xdrv_16_tuyamcu.ino | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 4fc45e913..c9a5aa6ca 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -682,12 +682,29 @@ void TuyaSerialInput(void)
           // 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19
           uint8_t dpidStart = 6;
           while (dpidStart + 4 < Tuya.byte_counter) {
+            uint8_t dpId = Tuya.buffer[dpidStart];
+            uint8_t dpDataType = Tuya.buffer[dpidStart + 1];
             uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-            const char *dpData = ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char));
-            ResponseAppend_P(PSTR(",\"Cmnd%dDpId%dDpType%d\":\"%s\""), Tuya.buffer[3], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], dpData);
-            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], dpData);
-            if (TUYA_TYPE_STRING == Tuya.buffer[dpidStart + 1]) {
-              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[dpidStart + 4]);
+            const unsigned char *dpData = (unsigned char*)&Tuya.buffer[dpidStart + 4];
+            const char *dpHexData = ToHex_P(dpData, dpDataLen, hex_char, sizeof(hex_char));
+
+            ResponseAppend_P(PSTR(",\"Cmnd%dDpId%dDpType%d\":"), Tuya.buffer[3], dpId, dpDataType);
+            if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
+              ResponseAppend_P(PSTR("\"%d\""), dpData[0]);
+            } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
+              uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
+              ResponseAppend_P(PSTR("\"%u\""), dpValue);
+            } else if (TUYA_TYPE_STRING == dpDataType) {
+              ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
+            } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
+              ResponseAppend_P(PSTR("\"%d\""), dpData[0]);
+            } else {
+              ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
+            }
+
+            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), dpId, dpId, dpDataType, dpHexData);
+            if (TUYA_TYPE_STRING == dpDataType) {
+              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, dpData);
             }
             ResponseAppend_P(PSTR("}"));
             dpidStart += dpDataLen + 4;

From 97f49246397c73883d902f8ccafb67f74f5e672f Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Mon, 3 Feb 2020 19:41:35 +0100
Subject: [PATCH 209/403] Change update IRRemoteESP8266 v2.7.3

---
 .../CPPLINT.cfg                               |   0
 .../LICENSE.txt                               |   0
 .../README.md                                 |   4 +-
 .../README_fr.md                              |   4 +-
 .../ReleaseNotes.md                           |  17 +
 .../SupportedProtocols.md                     |  29 +-
 .../CommonAcControl/CommonAcControl.ino       |   0
 .../examples/CommonAcControl/platformio.ini   |   0
 .../ControlSamsungAC/ControlSamsungAC.ino     |   0
 .../examples/ControlSamsungAC/platformio.ini  |   0
 .../DumbIRRepeater/DumbIRRepeater.ino         |   3 +
 .../examples/DumbIRRepeater/platformio.ini    |   0
 .../examples/IRGCSendDemo/IRGCSendDemo.ino    |   0
 .../examples/IRGCSendDemo/platformio.ini      |   0
 .../examples/IRGCTCPServer/IRGCTCPServer.ino  |   0
 .../examples/IRGCTCPServer/platformio.ini     |   0
 .../examples/IRMQTTServer/IRMQTTServer.h      |   1 +
 .../examples/IRMQTTServer/IRMQTTServer.ino    |   2 +-
 .../examples/IRMQTTServer/platformio.ini      |   0
 .../examples/IRServer/IRServer.ino            |   0
 .../examples/IRServer/platformio.ini          |   0
 .../examples/IRrecvDemo/IRrecvDemo.ino        |   1 +
 .../examples/IRrecvDemo/platformio.ini        |   0
 .../examples/IRrecvDump/IRrecvDump.ino        |   0
 .../examples/IRrecvDump/platformio.ini        |   0
 .../examples/IRrecvDumpV2/IRrecvDumpV2.ino    |   1 +
 .../examples/IRrecvDumpV2/platformio.ini      |   0
 .../examples/IRsendDemo/IRsendDemo.ino        |   0
 .../examples/IRsendDemo/platformio.ini        |   0
 .../IRsendProntoDemo/IRsendProntoDemo.ino     |   0
 .../examples/IRsendProntoDemo/platformio.ini  |   0
 .../JVCPanasonicSendDemo.ino                  |   0
 .../JVCPanasonicSendDemo/platformio.ini       |   0
 .../examples/LGACSend/LGACSend.ino            |   0
 .../examples/LGACSend/platformio.ini          |   0
 .../SmartIRRepeater/SmartIRRepeater.ino       |   3 +
 .../examples/SmartIRRepeater/platformio.ini   |   0
 .../examples/TurnOnArgoAC/TurnOnArgoAC.ino    |   0
 .../examples/TurnOnArgoAC/platformio.ini      |   0
 .../TurnOnDaikinAC/TurnOnDaikinAC.ino         |   0
 .../examples/TurnOnDaikinAC/platformio.ini    |   0
 .../TurnOnFujitsuAC/TurnOnFujitsuAC.ino       |   0
 .../examples/TurnOnFujitsuAC/platformio.ini   |   0
 .../TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino |   0
 .../TurnOnKelvinatorAC/platformio.ini         |   0
 .../TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino |   0
 .../TurnOnMitsubishiAC/platformio.ini         |   0
 .../TurnOnMitsubishiHeavyAc.ino               |   0
 .../TurnOnMitsubishiHeavyAc/platformio.ini    |   0
 .../TurnOnPanasonicAC/TurnOnPanasonicAC.ino   |   0
 .../examples/TurnOnPanasonicAC/platformio.ini |   0
 .../TurnOnToshibaAC/TurnOnToshibaAC.ino       |   0
 .../examples/TurnOnToshibaAC/platformio.ini   |   0
 .../TurnOnTrotecAC/TurnOnTrotecAC.ino         |   0
 .../examples/TurnOnTrotecAC/platformio.ini    |   0
 .../examples/Web-AC-control/README.md         |   0
 .../Web-AC-control/Web-AC-control.ino         |   0
 .../examples/Web-AC-control/platformio.ini    |   0
 .../examples/Web-AC-control/printscreen.png   | Bin
 .../Web-AC-control/upload/favicon.ico         | Bin
 .../Web-AC-control/upload/level_1_off.svg     |   0
 .../Web-AC-control/upload/level_1_on.svg      |   0
 .../Web-AC-control/upload/level_2_off.svg     |   0
 .../Web-AC-control/upload/level_2_on.svg      |   0
 .../Web-AC-control/upload/level_3_off.svg     |   0
 .../Web-AC-control/upload/level_3_on.svg      |   0
 .../Web-AC-control/upload/level_4_off.svg     |   0
 .../Web-AC-control/upload/level_4_on.svg      |   0
 .../examples/Web-AC-control/upload/ui.html    |   0
 .../examples/Web-AC-control/upload/ui.js      |   0
 .../keywords.txt                              |   7 +
 .../library.json                              |   2 +-
 .../library.properties                        |   2 +-
 .../pylintrc                                  |   0
 .../src/CPPLINT.cfg                           |   0
 .../src/IRac.cpp                              |   8 +-
 .../src/IRac.h                                |   3 +-
 .../src/IRrecv.cpp                            |   0
 .../src/IRrecv.h                              |   0
 .../src/IRremoteESP8266.h                     | 915 ++++++++++--------
 .../src/IRsend.cpp                            |   6 +
 .../src/IRsend.h                              |   8 +-
 .../src/IRtext.cpp                            |   0
 .../src/IRtext.h                              |   0
 .../src/IRtimer.cpp                           |   0
 .../src/IRtimer.h                             |   0
 .../src/IRutils.cpp                           |   5 +
 .../src/IRutils.h                             |   0
 .../src/i18n.h                                |   0
 .../src/ir_Aiwa.cpp                           |   0
 .../src/ir_Amcor.cpp                          |   0
 .../src/ir_Amcor.h                            |   0
 .../src/ir_Argo.cpp                           |   0
 .../src/ir_Argo.h                             |   0
 .../src/ir_Carrier.cpp                        |   0
 .../src/ir_Coolix.cpp                         |  19 +-
 .../src/ir_Coolix.h                           |   0
 .../src/ir_Daikin.cpp                         |   0
 .../src/ir_Daikin.h                           |   0
 .../src/ir_Denon.cpp                          |   0
 .../src/ir_Dish.cpp                           |   0
 .../src/ir_Electra.cpp                        |   0
 .../src/ir_Electra.h                          |   2 +
 .../src/ir_Fujitsu.cpp                        |   0
 .../src/ir_Fujitsu.h                          |   0
 .../src/ir_GICable.cpp                        |   0
 .../src/ir_GlobalCache.cpp                    |   0
 .../src/ir_Goodweather.cpp                    |   0
 .../src/ir_Goodweather.h                      |   0
 .../src/ir_Gree.cpp                           |   0
 .../src/ir_Gree.h                             |   0
 .../src/ir_Haier.cpp                          |   0
 .../src/ir_Haier.h                            |   0
 .../src/ir_Hitachi.cpp                        |   0
 .../src/ir_Hitachi.h                          |   0
 .../src/ir_Inax.cpp                           |   0
 .../src/ir_JVC.cpp                            |   0
 .../src/ir_Kelvinator.cpp                     |   0
 .../src/ir_Kelvinator.h                       |   0
 .../src/ir_LG.cpp                             |   0
 .../src/ir_LG.h                               |   0
 .../src/ir_Lasertag.cpp                       |   0
 .../src/ir_Lego.cpp                           |   0
 .../src/ir_Lutron.cpp                         |   0
 .../src/ir_MWM.cpp                            |   0
 .../src/ir_Magiquest.cpp                      |   0
 .../src/ir_Magiquest.h                        |   0
 .../src/ir_Midea.cpp                          |   0
 .../src/ir_Midea.h                            |   0
 .../src/ir_Mitsubishi.cpp                     |   0
 .../src/ir_Mitsubishi.h                       |   0
 .../src/ir_MitsubishiHeavy.cpp                |   0
 .../src/ir_MitsubishiHeavy.h                  |   0
 .../src/ir_NEC.cpp                            |   0
 .../src/ir_NEC.h                              |   7 +-
 .../src/ir_Neoclima.cpp                       |   0
 .../src/ir_Neoclima.h                         |   0
 .../src/ir_Nikai.cpp                          |   0
 .../src/ir_Panasonic.cpp                      |  32 +-
 .../src/ir_Panasonic.h                        |  18 +-
 .../src/ir_Pioneer.cpp                        |   0
 .../src/ir_Pronto.cpp                         |   0
 .../src/ir_RC5_RC6.cpp                        |   0
 .../src/ir_RCMM.cpp                           |   0
 .../src/ir_Samsung.cpp                        |   0
 .../src/ir_Samsung.h                          |   0
 .../src/ir_Sanyo.cpp                          |   0
 .../src/ir_Sharp.cpp                          |   0
 .../src/ir_Sharp.h                            |   0
 .../src/ir_Sherwood.cpp                       |   0
 .../src/ir_Sony.cpp                           |  52 +-
 .../src/ir_Tcl.cpp                            |   0
 .../src/ir_Tcl.h                              |   0
 .../src/ir_Teco.cpp                           |   0
 .../src/ir_Teco.h                             |   0
 .../src/ir_Toshiba.cpp                        |   0
 .../src/ir_Toshiba.h                          |   0
 .../src/ir_Trotec.cpp                         |   0
 .../src/ir_Trotec.h                           |   0
 .../src/ir_Vestel.cpp                         |   0
 .../src/ir_Vestel.h                           |   0
 .../src/ir_Whirlpool.cpp                      |   0
 .../src/ir_Whirlpool.h                        |   0
 .../src/ir_Whynter.cpp                        |   0
 .../src/locale/README.md                      |   0
 .../src/locale/de-CH.h                        |   0
 .../src/locale/de-DE.h                        |   0
 .../src/locale/defaults.h                     |   0
 .../src/locale/en-AU.h                        |   0
 .../src/locale/en-IE.h                        |   0
 .../src/locale/en-UK.h                        |   0
 .../src/locale/en-US.h                        |   0
 .../src/locale/es-ES.h                        |   0
 .../src/locale/fr-FR.h                        |   0
 .../test/IRac_test.cpp                        | 103 +-
 .../test/IRrecv_test.cpp                      |  72 +-
 .../test/IRrecv_test.h                        |   0
 .../test/IRsend_test.cpp                      |   0
 .../test/IRsend_test.h                        |   0
 .../test/IRutils_test.cpp                     |   0
 .../test/Makefile                             |   0
 .../test/ir_Aiwa_test.cpp                     |   0
 .../test/ir_Amcor_test.cpp                    |   0
 .../test/ir_Argo_test.cpp                     |   0
 .../test/ir_Carrier_test.cpp                  |   0
 .../test/ir_Coolix_test.cpp                   | 292 +++---
 .../test/ir_Daikin_test.cpp                   |   0
 .../test/ir_Denon_test.cpp                    |   0
 .../test/ir_Dish_test.cpp                     |   0
 .../test/ir_Electra_test.cpp                  |   0
 .../test/ir_Fujitsu_test.cpp                  |   0
 .../test/ir_GICable_test.cpp                  |   0
 .../test/ir_GlobalCache_test.cpp              |   0
 .../test/ir_Goodweather_test.cpp              |   0
 .../test/ir_Gree_test.cpp                     |   0
 .../test/ir_Haier_test.cpp                    |   0
 .../test/ir_Hitachi_test.cpp                  |   0
 .../test/ir_Inax_test.cpp                     |   0
 .../test/ir_JVC_test.cpp                      |   0
 .../test/ir_Kelvinator_test.cpp               |   0
 .../test/ir_LG_test.cpp                       |   0
 .../test/ir_Lasertag_test.cpp                 |   0
 .../test/ir_Lego_test.cpp                     |   0
 .../test/ir_Lutron_test.cpp                   |   0
 .../test/ir_MWM_test.cpp                      |   0
 .../test/ir_Magiquest_test.cpp                |   0
 .../test/ir_Midea_test.cpp                    |   0
 .../test/ir_MitsubishiHeavy_test.cpp          |   0
 .../test/ir_Mitsubishi_test.cpp               |   0
 .../test/ir_NEC_test.cpp                      |   0
 .../test/ir_Neoclima_test.cpp                 |   0
 .../test/ir_Nikai_test.cpp                    |   0
 .../test/ir_Panasonic_test.cpp                |  57 +-
 .../test/ir_Pioneer_test.cpp                  |   0
 .../test/ir_Pronto_test.cpp                   |   0
 .../test/ir_RC5_RC6_test.cpp                  |   0
 .../test/ir_RCMM_test.cpp                     |   0
 .../test/ir_Samsung_test.cpp                  |   0
 .../test/ir_Sanyo_test.cpp                    |   0
 .../test/ir_Sharp_test.cpp                    |   0
 .../test/ir_Sherwood_test.cpp                 |   0
 .../test/ir_Sony_test.cpp                     | 225 +++++
 .../test/ir_Tcl_test.cpp                      |   0
 .../test/ir_Teco_test.cpp                     |   0
 .../test/ir_Toshiba_test.cpp                  |   0
 .../test/ir_Trotec_test.cpp                   |   0
 .../test/ir_Vestel_test.cpp                   |   0
 .../test/ir_Whirlpool_test.cpp                |   0
 .../test/ir_Whynter_test.cpp                  |   0
 .../tools/Makefile                            |   0
 .../tools/RawToGlobalCache.sh                 |   0
 .../tools/auto_analyse_raw_data.py            |  26 +-
 .../tools/auto_analyse_raw_data_test.py       | 218 +++++
 .../tools/gc_decode.cpp                       |   0
 .../tools/generate_irtext_h.sh                |   0
 .../tools/mkkeywords                          |   0
 .../tools/mode2_decode.cpp                    |   0
 .../tools/scrape_supported_devices.py         |  76 +-
 platformio.ini                                |   9 +
 platformio_tasmota_env.ini                    |   4 +-
 tasmota/CHANGELOG.md                          |   1 +
 241 files changed, 1504 insertions(+), 730 deletions(-)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/LICENSE.txt (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/README.md (98%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/README_fr.md (98%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/ReleaseNotes.md (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/SupportedProtocols.md (91%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/CommonAcControl/CommonAcControl.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/CommonAcControl/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/ControlSamsungAC/ControlSamsungAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/ControlSamsungAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/DumbIRRepeater/DumbIRRepeater.ino (96%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/DumbIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRGCSendDemo/IRGCSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRGCSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRGCTCPServer/IRGCTCPServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRGCTCPServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRMQTTServer/IRMQTTServer.h (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRMQTTServer/IRMQTTServer.ino (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRMQTTServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRServer/IRServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDemo/IRrecvDemo.ino (95%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDump/IRrecvDump.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDump/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDumpV2/IRrecvDumpV2.ino (98%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRrecvDumpV2/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRsendDemo/IRsendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRsendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRsendProntoDemo/IRsendProntoDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/IRsendProntoDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/JVCPanasonicSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/LGACSend/LGACSend.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/LGACSend/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/SmartIRRepeater/SmartIRRepeater.ino (96%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/SmartIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnArgoAC/TurnOnArgoAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnArgoAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnDaikinAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnFujitsuAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnKelvinatorAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnMitsubishiAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnMitsubishiHeavyAc/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnPanasonicAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnToshibaAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/TurnOnTrotecAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/Web-AC-control.ino (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/printscreen.png (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/favicon.ico (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_1_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_1_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_2_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_2_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_3_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_3_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_4_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/level_4_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/ui.html (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/examples/Web-AC-control/upload/ui.js (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/keywords.txt (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/library.json (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/library.properties (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/pylintrc (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRac.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRac.h (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRrecv.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRrecv.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRremoteESP8266.h (54%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRsend.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRsend.h (98%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRtext.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRtext.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRtimer.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRtimer.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRutils.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/IRutils.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/i18n.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Aiwa.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Amcor.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Amcor.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Argo.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Argo.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Carrier.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Coolix.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Coolix.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Daikin.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Daikin.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Denon.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Dish.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Electra.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Electra.h (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Fujitsu.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Fujitsu.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_GICable.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_GlobalCache.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Goodweather.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Goodweather.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Gree.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Gree.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Haier.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Haier.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Hitachi.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Hitachi.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Inax.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_JVC.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Kelvinator.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Kelvinator.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_LG.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_LG.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Lasertag.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Lego.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Lutron.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_MWM.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Magiquest.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Magiquest.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Midea.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Midea.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Mitsubishi.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Mitsubishi.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_MitsubishiHeavy.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_MitsubishiHeavy.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_NEC.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_NEC.h (93%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Neoclima.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Neoclima.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Nikai.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Panasonic.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Panasonic.h (94%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Pioneer.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Pronto.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_RC5_RC6.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_RCMM.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Samsung.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Samsung.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Sanyo.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Sharp.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Sharp.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Sherwood.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Sony.cpp (74%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Tcl.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Tcl.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Teco.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Teco.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Toshiba.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Toshiba.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Trotec.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Trotec.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Vestel.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Vestel.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Whirlpool.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Whirlpool.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/ir_Whynter.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/de-CH.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/de-DE.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/defaults.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/en-AU.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/en-IE.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/en-UK.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/en-US.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/es-ES.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/src/locale/fr-FR.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRac_test.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRrecv_test.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRrecv_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRsend_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRsend_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/IRutils_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/Makefile (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Aiwa_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Amcor_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Argo_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Carrier_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Coolix_test.cpp (69%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Daikin_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Denon_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Dish_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Electra_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Fujitsu_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_GICable_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_GlobalCache_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Goodweather_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Gree_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Haier_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Hitachi_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Inax_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_JVC_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Kelvinator_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_LG_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Lasertag_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Lego_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Lutron_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_MWM_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Magiquest_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Midea_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_MitsubishiHeavy_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Mitsubishi_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_NEC_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Neoclima_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Nikai_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Panasonic_test.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Pioneer_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Pronto_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_RC5_RC6_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_RCMM_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Samsung_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Sanyo_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Sharp_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Sherwood_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Sony_test.cpp (61%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Tcl_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Teco_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Toshiba_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Trotec_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Vestel_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Whirlpool_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/test/ir_Whynter_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/Makefile (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/RawToGlobalCache.sh (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/auto_analyse_raw_data.py (97%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/auto_analyse_raw_data_test.py (84%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/gc_decode.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/generate_irtext_h.sh (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/mkkeywords (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/mode2_decode.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.2 => IRremoteESP8266-2.7.3}/tools/scrape_supported_devices.py (76%)

diff --git a/lib/IRremoteESP8266-2.7.2/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.3/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.3/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.2/LICENSE.txt b/lib/IRremoteESP8266-2.7.3/LICENSE.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/LICENSE.txt
rename to lib/IRremoteESP8266-2.7.3/LICENSE.txt
diff --git a/lib/IRremoteESP8266-2.7.2/README.md b/lib/IRremoteESP8266-2.7.3/README.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.2/README.md
rename to lib/IRremoteESP8266-2.7.3/README.md
index 18066c612..9ca606af8 100644
--- a/lib/IRremoteESP8266-2.7.2/README.md
+++ b/lib/IRremoteESP8266-2.7.3/README.md
@@ -9,8 +9,8 @@
 This library enables you to **send _and_ receive** infra-red signals on an [ESP8266](https://github.com/esp8266/Arduino) or an
 [ESP32](https://github.com/espressif/arduino-esp32) using the [Arduino framework](https://www.arduino.cc/) using common 940nm IR LEDs and common IR receiver modules. e.g. TSOP{17,22,24,36,38,44,48}* demodulators etc.
 
-## v2.7.2 Now Available
-Version 2.7.2 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
+## v2.7.3 Now Available
+Version 2.7.3 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
 
 #### Upgrading from pre-v2.0
 Usage of the library has been slightly changed in v2.0. You will need to change your usage to work with v2.0 and beyond. You can read more about the changes required on our [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.2/README_fr.md b/lib/IRremoteESP8266-2.7.3/README_fr.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.2/README_fr.md
rename to lib/IRremoteESP8266-2.7.3/README_fr.md
index 8dad47961..ca31b3b7b 100644
--- a/lib/IRremoteESP8266-2.7.2/README_fr.md
+++ b/lib/IRremoteESP8266-2.7.3/README_fr.md
@@ -9,8 +9,8 @@
 Cette librairie vous permetra de **recevoir et d'envoyer des signaux** infrarouge sur le protocole [ESP8266](https://github.com/esp8266/Arduino) ou sur le protocole
 [ESP32](https://github.com/espressif/arduino-esp32) en utilisant le [Arduino framework](https://www.arduino.cc/) qui utilise la norme 940nm IR LEDs et le module basique de reception d'onde IR. Exemple : TSOP{17,22,24,36,38,44,48}* modules etc.
 
-## v2.7.2 disponible
-Version 2.7.2 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
+## v2.7.3 disponible
+Version 2.7.3 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
 
 #### mise à jour depuis pre-v2.0
 L'utilisation de la librairie à un peu changer depuis la version in v2.0. Si vous voulez l'utiliser vous devrez changer votre utilisation aussi. Vous pouvez vous renseigner sur les précondition d'utilisation ici : [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.2/ReleaseNotes.md b/lib/IRremoteESP8266-2.7.3/ReleaseNotes.md
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/ReleaseNotes.md
rename to lib/IRremoteESP8266-2.7.3/ReleaseNotes.md
index 04dee7b81..a7218fc07 100644
--- a/lib/IRremoteESP8266-2.7.2/ReleaseNotes.md
+++ b/lib/IRremoteESP8266-2.7.3/ReleaseNotes.md
@@ -1,5 +1,22 @@
 # Release Notes
 
+## _v2.7.3 (20200130)_
+
+**[Features]**
+- Allow protocols to be enabled or disabled with compiler flags. (#1013, #1012)
+- Panasonic AC: Add Ion Filter support for DKE models. (#1025, #1024)
+- Add support for sending Sony at 38Khz (#1029, #1018, #1019)
+- auto_analyse_raw_data.py: Handle analysing messages with no headers. (#1017)
+
+**[Misc]**
+- Fix Coolix unit test errors when using Apple c++ compiler. (#1030, #1028)
+- Fix Apple clang c++ compiler error in unit tests. (#1027, #1026)
+- Improve/fix scraping of supported devices (#1022)
+- Panasonic PKR series A/C uses DKE protocol. (#1020, #1021)
+- Update NEC supported devices. (#1018)
+- Add note to avoid GPIO16 on the ESP8266 for receiving. (#1016, #1015)
+
+
 ## _v2.7.2 (20200106)_
 
 **[Bug Fixes]**
diff --git a/lib/IRremoteESP8266-2.7.2/SupportedProtocols.md b/lib/IRremoteESP8266-2.7.3/SupportedProtocols.md
similarity index 91%
rename from lib/IRremoteESP8266-2.7.2/SupportedProtocols.md
rename to lib/IRremoteESP8266-2.7.3/SupportedProtocols.md
index 440fe8e20..c9b2f85c7 100644
--- a/lib/IRremoteESP8266-2.7.2/SupportedProtocols.md
+++ b/lib/IRremoteESP8266-2.7.3/SupportedProtocols.md
@@ -1,6 +1,6 @@
 <!--- WARNING: Do NOT edit this file directly.
       It is generated by './tools/scrape_supported_devices.py'.
-      Last generated: Sun Jan  5 15:53:26 2020 --->
+      Last generated: Thu Jan 30 20:05:33 2020 --->
 # IR Protocols supported by this library
 
 | Protocol | Brand | Model | A/C Model | Detailed A/C Support |
@@ -11,20 +11,20 @@
 | [Carrier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Carrier.cpp) | **Carrier/Surrey** | 42QG5A55970 remote<BR>53NGK009/012 Inverter<BR>619EGX0090E0 A/C<BR>619EGX0120E0 A/C<BR>619EGX0180E0 A/C<BR>619EGX0220E0 A/C |  | - |
 | [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Beko](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | BINR 070/071 split-type A/C<BR>BINR 070/071 split-type A/C<BR>RG57K7(B)/BGEF Remote<BR>RG57K7(B)/BGEF Remote |  | Yes |
 | [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | MS12FU-10HRDN1-QRD0GW(B) A/C<BR>MS12FU-10HRDN1-QRD0GW(B) A/C<BR>MSABAU-07HRFN1-QRD0GW A/C (circa 2016)<BR>MSABAU-07HRFN1-QRD0GW A/C (circa 2016)<BR>RG52D/BGE Remote<BR>RG52D/BGE Remote |  | Yes |
-| [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Tokio](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | AATOEMF17-12CHR1SW split-type RG51|50/BGE Remote<BR>AATOEMF17-12CHR1SW split-type RG51|50/BGE Remote |  | Yes |
+| [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Tokio](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | AATOEMF17-12CHR1SW split-type RG51\|50/BGE Remote<BR>AATOEMF17-12CHR1SW split-type RG51\|50/BGE Remote |  | Yes |
 | [Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.cpp) | **[Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.h)** | 17 Series A/C (DAIKIN128)<BR>ARC423A5 remote<BR>ARC433** remote<BR>ARC433B69 remote<BR>ARC477A1 remote<BR>ARC480A5 remote (DAIKIN152)<BR>BRC4C153 remote<BR>BRC52B63 remote (DAIKIN128)<BR>FTE12HV2S A/C<BR>FTXB09AXVJU A/C (DAIKIN128)<BR>FTXB12AXVJU A/C (DAIKIN128)<BR>FTXZ25NV1B A/C<BR>FTXZ35NV1B A/C<BR>FTXZ50NV1B A/C |  | Yes |
 | [Denon](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Denon.cpp) | **Unknown** |  |  | - |
 | [Dish](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Dish.cpp) | **DISH NETWORK** | echostar 301 |  | - |
 | [Electra](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.cpp) | **[AUX](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.h)** | KFR-35GW/BpNFW=3 A/C<BR>YKR-T/011 remote |  | Yes |
-| [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AGTV14LAC A/C<BR>AR-DB1 remote<BR>AR-DL10 remote<BR>AR-RAC1E remote<BR>AR-RAE1E remote<BR>AR-RAH2E remote<BR>AR-REB1E remote<BR>AR-RY4 remote<BR>AST9RSGCW A/C<BR>ASTB09LBC A/C<BR>ASU30C1 A/C<BR>ASYG30LFCA A/C<BR>ASYG7LMCA A/C |  | Yes |
-| [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu General](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AR-JW2 remote |  | Yes |
+| [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AGTV14LAC A/C<BR>AR-DB1 remote<BR>AR-DL10 remote<BR>AR-RAC1E remote<BR>AR-RAE1E remote<BR>AR-RAH2E remote<BR>AR-REB1E remote<BR>AR-RY4 remote<BR>AST9RSGCW A/C<BR>ASTB09LBC A/C<BR>ASU30C1 A/C<BR>ASYG30LFCA A/C<BR>ASYG7LMCA A/C | ARDB1<BR>ARJW2<BR>ARRAH2E<BR>ARREB1E<BR>ARRY4 | Yes |
+| [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu General](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AR-JW2 remote | ARDB1<BR>ARJW2<BR>ARRAH2E<BR>ARREB1E<BR>ARRY4 | Yes |
 | [GICable](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_GICable.cpp) | **Unknown** |  |  | - |
 | [GlobalCache](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_GlobalCache.cpp) | **Unknown** |  |  | - |
 | [Goodweather](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Goodweather.cpp) | **[Goodweather](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Goodweather.h)** | ZH/JT-03 remote |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[EKOKAI](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | A/C |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Green](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | YBOFB remote<BR>YBOFB2 remote |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[RusClimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | EACS/I-09HAR_X/N3 A/C<BR>YAW1F remote |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Ultimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | Heat Pump |  | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[EKOKAI](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | A/C | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Green](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | YBOFB remote<BR>YBOFB2 remote | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[RusClimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | EACS/I-09HAR_X/N3 A/C<BR>YAW1F remote | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Ultimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | Heat Pump | YAW1F<BR>YBOFB | Yes |
 | [Haier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Haier.cpp) | **[Haier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Haier.h)** | HSU-09HMC203 A/C<BR>HSU07-HEA03 remote<BR>YR-W02 remote |  | Yes |
 | [Hitachi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Hitachi.cpp) | **[Hitachi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Hitachi.h)** | LT0541-HTA remote<BR>RAR-8P2 remote<BR>RAS-35THA6 remote<BR>RAS-AJ25H A/C<BR>Series VI A/C (Circa 2007) |  | Yes |
 | [Inax](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Inax.cpp) | **Lixil** | Inax DT-BA283 Toilet |  | - |
@@ -45,10 +45,11 @@
 | [Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.cpp) | **[Mitsubishi Electric](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.h)** | 001CP T7WE10714 remote<BR>KPOA remote<BR>MSH-A24WV / MUH-A24WV A/C<BR>PEAD-RP71JAA Ducted A/C |  | Yes |
 | [MitsubishiHeavy](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.cpp) | **[Mitsubishi Heavy Industries](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.h)** | RKX502A001C remote<BR>RLA502A700B remote<BR>SRKxxZJ-S A/C<BR>SRKxxZM-S A/C<BR>SRKxxZMXA-S A/C |  | Yes |
 | [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Aloka](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | SleepyLights LED Lamp |  | - |
+| [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Toshiba](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | 42TL838 LCD TV |  | - |
 | [NEC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.cpp) | **[Yamaha](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_NEC.h)** | RAV561 remote<BR>RXV585B A/V Receiver |  | - |
 | [Neoclima](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Neoclima.cpp) | **[Neoclima](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Neoclima.h)** | NS-09AHTI A/C<BR>NS-09AHTI A/C<BR>ZH/TY-01 remote<BR>ZH/TY-01 remote |  | Yes |
 | [Nikai](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Nikai.cpp) | **Unknown** |  |  | - |
-| [Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.cpp) | **[Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.h)** | A75C2311 remote (CKP)<BR>A75C3704 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>A75C3747 remote<BR>CKP series A/C<BR>CS-ME10CKPG A/C<BR>CS-ME12CKPG A/C<BR>CS-ME14CKPG A/C<BR>CS-YW9MKD A/C<BR>CS-Z9RKR A/C<BR>DKE series A/C<BR>JKE series A/C<BR>NKE series A/C<BR>RKR series A/C<BR>TV |  | Yes |
+| [Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.cpp) | **[Panasonic](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Panasonic.h)** | A75C2311 remote (CKP)<BR>A75C2616-1 remote (DKE)<BR>A75C3704 remote<BR>A75C3747 remote<BR>CKP series A/C<BR>CS-E7PKR A/C (DKE)<BR>CS-ME10CKPG A/C<BR>CS-ME12CKPG A/C<BR>CS-ME14CKPG A/C<BR>CS-YW9MKD A/C<BR>CS-Z9RKR A/C<BR>DKE series A/C<BR>DKW series A/C (DKE)<BR>JKE series A/C<BR>NKE series A/C<BR>PKR series A/C (DKE)<BR>RKR series A/C<BR>TV | CKP<BR>DKE<BR>JKE<BR>LKE<BR>NKE<BR>RKR | Yes |
 | [Pioneer](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Pioneer.cpp) | **Unknown** |  |  | - |
 | [Pronto](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Pronto.cpp) | **Unknown** |  |  | - |
 | [RC5_RC6](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_RC5_RC6.cpp) | **Unknown** |  |  | - |
@@ -57,24 +58,23 @@
 | [Sanyo](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sanyo.cpp) | **Unknown** |  |  | - |
 | [Sharp](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sharp.cpp) | **[Sharp](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sharp.h)** | AY-ZP40KR A/C<BR>LC-52D62U TV |  | Yes |
 | [Sherwood](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sherwood.cpp) | **Sherwood** | RC-138 remote<BR>RD6505(B) Receiver |  | - |
-| [Sony](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sony.cpp) | **Unknown** |  |  | - |
+| [Sony](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sony.cpp) | **Sony** | HT-CT380 Soundbar (Uses 38kHz & 3 repeats) |  | - |
 | [Tcl](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Tcl.cpp) | **[Leberg](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Tcl.h)** | LBS-TOR07 A/C |  | Yes |
 | [Teco](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Teco.cpp) | **[Alaska](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Teco.h)** | SAC9010QC A/C<BR>SAC9010QC remote |  | Yes |
 | [Toshiba](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Toshiba.cpp) | **[Toshiba](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Toshiba.h)** | Akita EVO II<BR>RAS 18SKP-ES<BR>RAS-B13N3KV2<BR>RAS-B13N3KVP-E<BR>WC-L03SE<BR>WH-TA04NE |  | Yes |
 | [Trotec](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Trotec.cpp) | **[Unknown](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Trotec.h)** |  |  | Yes |
 | [Vestel](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Vestel.cpp) | **[Vestel](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Vestel.h)** | BIOX CXP-9 A/C (9K BTU) |  | Yes |
-| [Whirlpool](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Whirlpool.cpp) | **[Whirlpool](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Whirlpool.h)** | DG11J1-04 remote<BR>DG11J1-3A remote<BR>DG11J1-91 remote<BR>SPIS409L A/C<BR>SPIS412L A/C<BR>SPIW409L A/C<BR>SPIW412L A/C<BR>SPIW418L A/C |  | Yes |
+| [Whirlpool](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Whirlpool.cpp) | **[Whirlpool](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Whirlpool.h)** | DG11J1-04 remote<BR>DG11J1-3A remote<BR>DG11J1-91 remote<BR>SPIS409L A/C<BR>SPIS412L A/C<BR>SPIW409L A/C<BR>SPIW412L A/C<BR>SPIW418L A/C | DG11J13A<BR>DG11J191 | Yes |
 | [Whynter](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Whynter.cpp) | **Whynter** | ARC-110WD A/C |  | - |
 
 
 ## Send only protocols:
 
 - GLOBALCACHE
-- MITSUBISHI112
 - PRONTO
 - RAW
 - SHERWOOD
-- TCL112AC
+- SONY_38K
 
 
 ## Send & decodable protocols:
@@ -115,6 +115,7 @@
 - MAGIQUEST
 - MIDEA
 - MITSUBISHI
+- MITSUBISHI112
 - MITSUBISHI136
 - MITSUBISHI2
 - MITSUBISHI_AC
@@ -140,10 +141,10 @@
 - SHARP
 - SHARP_AC
 - SONY
+- TCL112AC
 - TECO
 - TOSHIBA_AC
 - TROTEC
 - VESTEL_AC
 - WHIRLPOOL_AC
 - WHYNTER
-- typeguess
diff --git a/lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/CommonAcControl.ino b/lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/CommonAcControl.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/CommonAcControl.ino
rename to lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/CommonAcControl.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/CommonAcControl/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/ControlSamsungAC.ino b/lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/ControlSamsungAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/ControlSamsungAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/ControlSamsungAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/ControlSamsungAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/DumbIRRepeater.ino b/lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/DumbIRRepeater.ino
similarity index 96%
rename from lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/DumbIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/DumbIRRepeater.ino
index 80f5ce64a..d3ddbdb6a 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/DumbIRRepeater.ino
+++ b/lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/DumbIRRepeater.ino
@@ -37,6 +37,8 @@
  *     * Pin 0/D3: Can interfere with the boot/program mode & support circuits.
  *     * Pin 1/TX/TXD0: Any serial transmissions from the ESP will interfere.
  *     * Pin 3/RX/RXD0: Any serial transmissions to the ESP will interfere.
+ *     * Pin 16/D0: Has no interrupts on the ESP8266, so can't be used for IR
+ *       receiving with this library.
  *   * ESP-01 modules are tricky. We suggest you use a module with more GPIOs
  *     for your first time. e.g. ESP-12 etc.
  *
@@ -54,6 +56,7 @@
 // ==================== start of TUNEABLE PARAMETERS ====================
 
 // The GPIO an IR detector/demodulator is connected to. Recommended: 14 (D5)
+// Note: GPIO 16 won't work on the ESP8266 as it does not have interrupts.
 const uint16_t kRecvPin = 14;
 
 // GPIO to use to control the IR LED circuit. Recommended: 4 (D2).
diff --git a/lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/DumbIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRGCSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRGCTCPServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.h b/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.h
rename to lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h
index c9d4898b9..0693a4908 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.h
+++ b/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h
@@ -47,6 +47,7 @@ const int8_t kDefaultIrLed = 4;  // <=- CHANGE_ME (optional)
 const bool kInvertTxOutput = false;
 
 // Default GPIO the IR demodulator is connected to/controlled by. GPIO 14 = D5.
+// Note: GPIO 16 won't work on the ESP8266 as it does not have interrupts.
 const int8_t kDefaultIrRx = 14;  // <=- CHANGE_ME (optional)
 
 // Enable/disable receiving/decoding IR messages entirely.
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.ino b/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino
index dfb1aa044..1824c660a 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/IRMQTTServer.ino
+++ b/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino
@@ -271,7 +271,7 @@
  *
  * #### Home Assistant MQTT Discovery
  *   There is an option for this: 'Send MQTT Discovery' under the 'Admin' menu.
- *   It will produce a single MQTT Cliamte Discovery message for Home Assistant
+ *   It will produce a single MQTT Climate Discovery message for Home Assistant
  *   provided you have everything configured correctly here and in HA.
  *   This message has MQTT RETAIN set on it, so it only ever needs to be sent
  *   once or if the config details change etc.
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRMQTTServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266-2.7.3/examples/IRServer/IRServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRServer/IRServer.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRServer/IRServer.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRServer/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 95%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/IRrecvDemo.ino
index 5fd03f4b4..945f94055 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/IRrecvDemo.ino
+++ b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/IRrecvDemo.ino
@@ -23,6 +23,7 @@
 
 // An IR detector/demodulator is connected to GPIO pin 14(D5 on a NodeMCU
 // board).
+// Note: GPIO 16 won't work on the ESP8266 as it does not have interrupts.
 const uint16_t kRecvPin = 14;
 
 IRrecv irrecv(kRecvPin);
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/IRrecvDump.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/IRrecvDump.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDump/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 98%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino
index fc61f9b84..beed6c746 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/IRrecvDumpV2.ino
+++ b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino
@@ -34,6 +34,7 @@
 // ==================== start of TUNEABLE PARAMETERS ====================
 // An IR detector/demodulator is connected to GPIO pin 14
 // e.g. D5 on a NodeMCU board.
+// Note: GPIO 16 won't work on the ESP8266 as it does not have interrupts.
 const uint16_t kRecvPin = 14;
 
 // The Serial connection baud rate.
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRrecvDumpV2/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/IRsendDemo.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/IRsendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRsendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/IRsendProntoDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266-2.7.3/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/LGACSend/LGACSend.ino
rename to lib/IRremoteESP8266-2.7.3/examples/LGACSend/LGACSend.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/LGACSend/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/LGACSend/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/LGACSend/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/SmartIRRepeater.ino
similarity index 96%
rename from lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/SmartIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/SmartIRRepeater.ino
index 8dd202382..576abb516 100644
--- a/lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/SmartIRRepeater.ino
+++ b/lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/SmartIRRepeater.ino
@@ -40,6 +40,8 @@
  *     * Pin 0/D3: Can interfere with the boot/program mode & support circuits.
  *     * Pin 1/TX/TXD0: Any serial transmissions from the ESP will interfere.
  *     * Pin 3/RX/RXD0: Any serial transmissions to the ESP will interfere.
+ *     * Pin 16/D0: Has no interrupts on the ESP8266, so can't be used for IR
+ *       receiving with this library.
  *   * ESP-01 modules are tricky. We suggest you use a module with more GPIOs
  *     for your first time. e.g. ESP-12 etc.
  *
@@ -57,6 +59,7 @@
 // ==================== start of TUNEABLE PARAMETERS ====================
 
 // The GPIO an IR detector/demodulator is connected to. Recommended: 14 (D5)
+// Note: GPIO 16 won't work on the ESP8266 as it does not have interrupts.
 const uint16_t kRecvPin = 14;
 
 // GPIO to use to control the IR LED circuit. Recommended: 4 (D2).
diff --git a/lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/SmartIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnArgoAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnDaikinAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnMitsubishiHeavyAc/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnPanasonicAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnToshibaAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/TurnOnTrotecAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/README.md b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/README.md
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/README.md
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/Web-AC-control.ino b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/Web-AC-control.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/Web-AC-control.ino
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/Web-AC-control.ino
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/platformio.ini b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/platformio.ini
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/printscreen.png b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/printscreen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/printscreen.png
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/printscreen.png
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/favicon.ico b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/favicon.ico
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/favicon.ico
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/favicon.ico
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_off.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_off.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_off.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_on.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_1_on.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_on.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_off.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_off.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_off.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_on.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_2_on.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_on.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_off.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_off.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_off.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_on.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_3_on.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_on.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_off.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_off.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_off.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_on.svg b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/level_4_on.svg
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_on.svg
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.html b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.html
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.html
diff --git a/lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.js b/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/examples/Web-AC-control/upload/ui.js
rename to lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.js
diff --git a/lib/IRremoteESP8266-2.7.2/keywords.txt b/lib/IRremoteESP8266-2.7.3/keywords.txt
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/keywords.txt
rename to lib/IRremoteESP8266-2.7.3/keywords.txt
index 2c8018ea6..65b0d8b2e 100644
--- a/lib/IRremoteESP8266-2.7.2/keywords.txt
+++ b/lib/IRremoteESP8266-2.7.3/keywords.txt
@@ -84,6 +84,7 @@ _delayMicroseconds	KEYWORD2
 _getTime	KEYWORD2
 _getTimer	KEYWORD2
 _matchGeneric	KEYWORD2
+_sendSony	KEYWORD2
 _setMode	KEYWORD2
 _setTemp	KEYWORD2
 _setTime	KEYWORD2
@@ -459,6 +460,7 @@ sendSharpAc	KEYWORD2
 sendSharpRaw	KEYWORD2
 sendSherwood	KEYWORD2
 sendSony	KEYWORD2
+sendSony38	KEYWORD2
 sendTcl112Ac	KEYWORD2
 sendTeco	KEYWORD2
 sendToshibaAC	KEYWORD2
@@ -1024,6 +1026,7 @@ SONY	LITERAL1
 SONY_12_BITS	LITERAL1
 SONY_15_BITS	LITERAL1
 SONY_20_BITS	LITERAL1
+SONY_38K	LITERAL1
 TCL112AC	LITERAL1
 TECO	LITERAL1
 TIMEOUT_MS	LITERAL1
@@ -2606,6 +2609,8 @@ kPanasonicAcFanMed	LITERAL1
 kPanasonicAcFanMin	LITERAL1
 kPanasonicAcFanModeTemp	LITERAL1
 kPanasonicAcHeat	LITERAL1
+kPanasonicAcIonFilterByte	LITERAL1
+kPanasonicAcIonFilterOffset	LITERAL1
 kPanasonicAcMaxTemp	LITERAL1
 kPanasonicAcMessageGap	LITERAL1
 kPanasonicAcMinTemp	LITERAL1
@@ -2896,6 +2901,7 @@ kSlowStr	LITERAL1
 kSony12Bits	LITERAL1
 kSony15Bits	LITERAL1
 kSony20Bits	LITERAL1
+kSonyAltFreq	LITERAL1
 kSonyHdrMark	LITERAL1
 kSonyHdrMarkTicks	LITERAL1
 kSonyMinBits	LITERAL1
@@ -2908,6 +2914,7 @@ kSonyRptLength	LITERAL1
 kSonyRptLengthTicks	LITERAL1
 kSonySpace	LITERAL1
 kSonySpaceTicks	LITERAL1
+kSonyStdFreq	LITERAL1
 kSonyTick	LITERAL1
 kSonyZeroMark	LITERAL1
 kSonyZeroMarkTicks	LITERAL1
diff --git a/lib/IRremoteESP8266-2.7.2/library.json b/lib/IRremoteESP8266-2.7.3/library.json
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/library.json
rename to lib/IRremoteESP8266-2.7.3/library.json
index 4ade0fa6b..b28b1b218 100644
--- a/lib/IRremoteESP8266-2.7.2/library.json
+++ b/lib/IRremoteESP8266-2.7.3/library.json
@@ -1,6 +1,6 @@
 {
   "name": "IRremoteESP8266",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "keywords": "infrared, ir, remote, esp8266, esp32",
   "description": "Send and receive infrared signals with multiple protocols (ESP8266/ESP32)",
   "repository":
diff --git a/lib/IRremoteESP8266-2.7.2/library.properties b/lib/IRremoteESP8266-2.7.3/library.properties
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/library.properties
rename to lib/IRremoteESP8266-2.7.3/library.properties
index b5d866c3d..b22e7f8cc 100644
--- a/lib/IRremoteESP8266-2.7.2/library.properties
+++ b/lib/IRremoteESP8266-2.7.3/library.properties
@@ -1,5 +1,5 @@
 name=IRremoteESP8266
-version=2.7.2
+version=2.7.3
 author=David Conran, Sebastien Warin, Mark Szabo, Ken Shirriff
 maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto
 sentence=Send and receive infrared signals with multiple protocols (ESP8266/ESP32)
diff --git a/lib/IRremoteESP8266-2.7.2/pylintrc b/lib/IRremoteESP8266-2.7.3/pylintrc
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/pylintrc
rename to lib/IRremoteESP8266-2.7.3/pylintrc
diff --git a/lib/IRremoteESP8266-2.7.2/src/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.3/src/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.3/src/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRac.cpp b/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/src/IRac.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRac.cpp
index 5cb56b974..7b8b0f378 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRac.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
@@ -940,7 +940,8 @@ void IRac::panasonic(IRPanasonicAc *ac, const panasonic_ac_remote_model_t model,
                      const bool on, const stdAc::opmode_t mode,
                      const float degrees, const stdAc::fanspeed_t fan,
                      const stdAc::swingv_t swingv, const stdAc::swingh_t swingh,
-                     const bool quiet, const bool turbo, const int16_t clock) {
+                     const bool quiet, const bool turbo, const bool filter,
+                     const int16_t clock) {
   ac->begin();
   ac->setModel(model);
   ac->setPower(on);
@@ -951,9 +952,9 @@ void IRac::panasonic(IRPanasonicAc *ac, const panasonic_ac_remote_model_t model,
   ac->setSwingHorizontal(ac->convertSwingH(swingh));
   ac->setQuiet(quiet);
   ac->setPowerful(turbo);
+  ac->setIon(filter);
   // No Light setting available.
   // No Econo setting available.
-  // No Filter setting available.
   // No Clean setting available.
   // No Beep setting available.
   // No Sleep setting available.
@@ -1799,7 +1800,8 @@ int16_t IRac::strToModel(const char *str, const int16_t def) {
     return panasonic_ac_remote_model_t::kPanasonicLke;
   } else if (!strcasecmp(str, "NKE") || !strcasecmp(str, "PANASONICNKE")) {
     return panasonic_ac_remote_model_t::kPanasonicNke;
-  } else if (!strcasecmp(str, "DKE") || !strcasecmp(str, "PANASONICDKE")) {
+  } else if (!strcasecmp(str, "DKE") || !strcasecmp(str, "PANASONICDKE") ||
+             !strcasecmp(str, "PKR") || !strcasecmp(str, "PANASONICPKR")) {
     return panasonic_ac_remote_model_t::kPanasonicDke;
   } else if (!strcasecmp(str, "JKE") || !strcasecmp(str, "PANASONICJKE")) {
     return panasonic_ac_remote_model_t::kPanasonicJke;
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRac.h b/lib/IRremoteESP8266-2.7.3/src/IRac.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/src/IRac.h
rename to lib/IRremoteESP8266-2.7.3/src/IRac.h
index 0f49943e4..4945bfac9 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRac.h
+++ b/lib/IRremoteESP8266-2.7.3/src/IRac.h
@@ -292,7 +292,8 @@ void electra(IRElectraAc *ac,
                  const bool on, const stdAc::opmode_t mode, const float degrees,
                  const stdAc::fanspeed_t fan,
                  const stdAc::swingv_t swingv, const stdAc::swingh_t swingh,
-                 const bool quiet, const bool turbo, const int16_t clock = -1);
+                 const bool quiet, const bool turbo, const bool filter,
+                 const int16_t clock = -1);
 #endif  // SEND_PANASONIC_AC
 #if SEND_SAMSUNG_AC
   void samsung(IRSamsungAc *ac,
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRrecv.cpp b/lib/IRremoteESP8266-2.7.3/src/IRrecv.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRrecv.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRrecv.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRrecv.h b/lib/IRremoteESP8266-2.7.3/src/IRrecv.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRrecv.h
rename to lib/IRremoteESP8266-2.7.3/src/IRrecv.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h b/lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h
similarity index 54%
rename from lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h
rename to lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h
index 856ec880a..eb8a67f5c 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRremoteESP8266.h
+++ b/lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h
@@ -52,428 +52,518 @@
 #endif  // UNIT_TEST
 
 // Library Version
-#define _IRREMOTEESP8266_VERSION_ "2.7.2"
+#define _IRREMOTEESP8266_VERSION_ "2.7.3"
 
 // Set the language & locale for the library. See the `locale` dir for options.
 #ifndef _IR_LOCALE_
 #define _IR_LOCALE_ en-AU
 #endif  // _IR_LOCALE_
 
+// Do we enable all the protocols by default (true), or disable them (false)?
+// This allows users of the library to disable or enable all protocols at
+// compile-time with `-D_IR_ENABLE_DEFAULT_=true` or
+// `-D_IR_ENABLE_DEFAULT_=false` compiler flags respectively.
+// Everything is included by default.
+// e.g. If you only want to enable use of he NEC protocol to save program space,
+//      you would use something like:
+//        `-D_IR_ENABLE_DEFAULT_=false -DDECODE_NEC=true -DSEND_NEC=true`
+//
+//      or alter your 'platform.ini' file accordingly:
+//        ```
+//        build_flags = -D_IR_ENABLE_DEFAULT_=false
+//                      -DDECODE_NEC=true
+//                      -DSEND_NEC=true
+//        ```
+//      If you want to enable support for every protocol *except* _decoding_ the
+//      Kelvinator protocol, you would use:
+//        `-DDECODE_KELVINATOR=false`
+#ifndef _IR_ENABLE_DEFAULT_
+#define _IR_ENABLE_DEFAULT_ true  // Unless set externally, the default is on.
+#endif  // _IR_ENABLE_DEFAULT_
+
 // Supported IR protocols
 // Each protocol you include costs memory and, during decode, costs time
 // Disable (set to false) all the protocols you do not need/want!
 // The Air Conditioner protocols are the most expensive memory-wise.
 //
 
-#ifdef USE_IR_REMOTE_FULL   // full IR protocols
-#define DECODE_HASH            true  // Semi-unique code for unknown messages
-
-#define SEND_RAW               true
-
-#define DECODE_NEC             true
-#define SEND_NEC               true
-
-#define DECODE_SHERWOOD        true  // Doesn't exist. Actually is DECODE_NEC
-#define SEND_SHERWOOD          true
-
-#define DECODE_RC5             true
-#define SEND_RC5               true
-
-#define DECODE_RC6             true
-#define SEND_RC6               true
-
-#define DECODE_RCMM            true
-#define SEND_RCMM              true
-
-#define DECODE_SONY            true
-#define SEND_SONY              true
-
-#define DECODE_PANASONIC       true
-#define SEND_PANASONIC         true
-
-#define DECODE_JVC             true
-#define SEND_JVC               true
-
-#define DECODE_SAMSUNG         true
-#define SEND_SAMSUNG           true
-
-#define DECODE_SAMSUNG36       true
-#define SEND_SAMSUNG36         true
-
-#define DECODE_SAMSUNG_AC      true
-#define SEND_SAMSUNG_AC        true
-
-#define DECODE_WHYNTER         true
-#define SEND_WHYNTER           true
-
-#define DECODE_AIWA_RC_T501    true
-#define SEND_AIWA_RC_T501      true
-
-#define DECODE_LG              true
-#define SEND_LG                true
-
-#define DECODE_SANYO           true
-#define SEND_SANYO             true
-
-#define DECODE_MITSUBISHI      true
-#define SEND_MITSUBISHI        true
-
-#define DECODE_MITSUBISHI2     true
-#define SEND_MITSUBISHI2       true
-
-#define DECODE_DISH            true
-#define SEND_DISH              true
-
-#define DECODE_SHARP           true
-#define SEND_SHARP             true
-
-#define DECODE_SHARP_AC        true
-#define SEND_SHARP_AC          true
-
-#define DECODE_DENON           true
-#define SEND_DENON             true
-
-#define DECODE_KELVINATOR      true
-#define SEND_KELVINATOR        true
-
-#define DECODE_MITSUBISHI_AC   true  // Beta.
-#define SEND_MITSUBISHI_AC     true
-
-#define DECODE_MITSUBISHI136   true
-#define SEND_MITSUBISHI136     true
-
-#define DECODE_MITSUBISHI112   true
-#define SEND_MITSUBISHI112     true
-
-#define DECODE_FUJITSU_AC      true
-#define SEND_FUJITSU_AC        true
-
-#define DECODE_INAX            true
-#define SEND_INAX              true
-
-#define DECODE_DAIKIN          true
-#define SEND_DAIKIN            true
-
-#define DECODE_COOLIX          true
-#define SEND_COOLIX            true
-
-#define DECODE_GLOBALCACHE     false  // Not written.
-#define SEND_GLOBALCACHE       true
-
-#define DECODE_GOODWEATHER     true
-#define SEND_GOODWEATHER       true
-
-#define DECODE_GREE            true
-#define SEND_GREE              true
-
-#define DECODE_PRONTO          false  // Not written.
-#define SEND_PRONTO            true
-
-#define DECODE_ARGO            true  // Experimental
-#define SEND_ARGO              true
-
-#define DECODE_TROTEC          true
-#define SEND_TROTEC            true
-
-#define DECODE_NIKAI           true
-#define SEND_NIKAI             true
-
-#define DECODE_TOSHIBA_AC      true
-#define SEND_TOSHIBA_AC        true
-
-#define DECODE_MAGIQUEST       true
-#define SEND_MAGIQUEST         true
-
-#define DECODE_MIDEA           true
-#define SEND_MIDEA             true
-
-#define DECODE_LASERTAG        true
-#define SEND_LASERTAG          true
-
-#define DECODE_CARRIER_AC      true
-#define SEND_CARRIER_AC        true
-
-#define DECODE_HAIER_AC        true
-#define SEND_HAIER_AC          true
-
-#define DECODE_HITACHI_AC      true
-#define SEND_HITACHI_AC        true
-
-#define DECODE_HITACHI_AC1     true
-#define SEND_HITACHI_AC1       true
-
-#define DECODE_HITACHI_AC2     true
-#define SEND_HITACHI_AC2       true
-
-#define DECODE_GICABLE         true
-#define SEND_GICABLE           true
-
-#define DECODE_HAIER_AC_YRW02  true
-#define SEND_HAIER_AC_YRW02    true
-
-#define DECODE_WHIRLPOOL_AC    true
-#define SEND_WHIRLPOOL_AC      true
-
-#define DECODE_LUTRON          true
-#define SEND_LUTRON            true
-
-#define DECODE_ELECTRA_AC      true
-#define SEND_ELECTRA_AC        true
-
-#define DECODE_PANASONIC_AC    true
-#define SEND_PANASONIC_AC      true
-
-#define DECODE_MWM             true
-#define SEND_MWM               true
-
-#define DECODE_PIONEER         true
-#define SEND_PIONEER           true
-
-#define DECODE_DAIKIN2         true
-#define SEND_DAIKIN2           true
-
-#define DECODE_VESTEL_AC       true
-#define SEND_VESTEL_AC         true
-
-#define DECODE_TECO            true
-#define SEND_TECO              true
-
-#define DECODE_TCL112AC        true
-#define SEND_TCL112AC          true
-
-#define DECODE_LEGOPF          true
-#define SEND_LEGOPF            true
-
-#define DECODE_MITSUBISHIHEAVY true
-#define SEND_MITSUBISHIHEAVY   true
-
-#define DECODE_DAIKIN216       true
-#define SEND_DAIKIN216         true
-
-#define DECODE_DAIKIN160       true
-#define SEND_DAIKIN160         true
-
-#define DECODE_NEOCLIMA        true
-#define SEND_NEOCLIMA          true
-
-#define DECODE_DAIKIN176       true
-#define SEND_DAIKIN176         true
-
-#define DECODE_DAIKIN128       true
-#define SEND_DAIKIN128         true
-
-#define DECODE_AMCOR           true
-#define SEND_AMCOR             true
-
-#define DECODE_DAIKIN152       true
-#define SEND_DAIKIN152         true
-
-#define DECODE_HITACHI_AC424   true
-#define SEND_HITACHI_AC424     true
-
-#else // defined(FIRMWARE_IR) || defined(FIRMWARE_IR_CUSTOM)   // full IR protocols
-
-// Tasmota supported protocols (less protocols is less code size)
-#define DECODE_HASH            true  // Semi-unique code for unknown messages
-
-#define SEND_RAW               false
-
-#define DECODE_NEC             true
-#define SEND_NEC               true
-
-#define DECODE_SHERWOOD        false  // Doesn't exist. Actually is DECODE_NEC
-#define SEND_SHERWOOD          false
-
-#define DECODE_RC5             true
-#define SEND_RC5               true
-
-#define DECODE_RC6             true
-#define SEND_RC6               true
-
-#define DECODE_RCMM            false
-#define SEND_RCMM              false
-
-#define DECODE_SONY            false
-#define SEND_SONY              false
-
-#define DECODE_PANASONIC       false
-#define SEND_PANASONIC         false
-
-#define DECODE_JVC             false
-#define SEND_JVC               false
-
-#define DECODE_SAMSUNG         false
-#define SEND_SAMSUNG           false
-
-#define DECODE_SAMSUNG36       false
-#define SEND_SAMSUNG36         false
-
-#define DECODE_SAMSUNG_AC      false
-#define SEND_SAMSUNG_AC        false
-
-#define DECODE_WHYNTER         false
-#define SEND_WHYNTER           false
-
-#define DECODE_AIWA_RC_T501    false
-#define SEND_AIWA_RC_T501      false
-
-#define DECODE_LG              false
-#define SEND_LG                false
-
-#define DECODE_SANYO           false
-#define SEND_SANYO             false
-
-#define DECODE_MITSUBISHI      false
-#define SEND_MITSUBISHI        false
-
-#define DECODE_MITSUBISHI2     false
-#define SEND_MITSUBISHI2       false
-
-#define DECODE_DISH            false
-#define SEND_DISH              false
-
-#define DECODE_SHARP           false
-#define SEND_SHARP             false
-
-#define DECODE_SHARP_AC        false
-#define SEND_SHARP_AC          false
-
-#define DECODE_DENON           false
-#define SEND_DENON             false
-
-#define DECODE_KELVINATOR      false
-#define SEND_KELVINATOR        false
-
-#define DECODE_MITSUBISHI_AC   false  // Beta.
-#define SEND_MITSUBISHI_AC     false
-
-#define DECODE_FUJITSU_AC      false
-#define SEND_FUJITSU_AC        false
-
-#define DECODE_INAX            false
-#define SEND_INAX              false
-
-#define DECODE_DAIKIN          false
-#define SEND_DAIKIN            false
-
-#define DECODE_COOLIX          false
-#define SEND_COOLIX            false
-
-#define DECODE_GLOBALCACHE     false  // Not written.
-#define SEND_GLOBALCACHE       false
-
-#define DECODE_GOODWEATHER     false
-#define SEND_GOODWEATHER       false
-
-#define DECODE_GREE            false
-#define SEND_GREE              false
-
-#define DECODE_PRONTO          false  // Not written.
-#define SEND_PRONTO            false
-
-#define DECODE_ARGO            false  // Experimental
-#define SEND_ARGO              false
-
-#define DECODE_TROTEC          false
-#define SEND_TROTEC            false
-
-#define DECODE_NIKAI           false
-#define SEND_NIKAI             false
-
-#define DECODE_TOSHIBA_AC      false
-#define SEND_TOSHIBA_AC        false
-
-#define DECODE_MAGIQUEST       false
-#define SEND_MAGIQUEST         false
-
-#define DECODE_MIDEA           false
-#define SEND_MIDEA             false
-
-#define DECODE_LASERTAG        false
-#define SEND_LASERTAG          false
-
-#define DECODE_CARRIER_AC      false
-#define SEND_CARRIER_AC        false
-
-#define DECODE_HAIER_AC        false
-#define SEND_HAIER_AC          false
-
-#define DECODE_HITACHI_AC      false
-#define SEND_HITACHI_AC        false
-
-#define DECODE_HITACHI_AC1     false
-#define SEND_HITACHI_AC1       false
-
-#define DECODE_HITACHI_AC2     false
-#define SEND_HITACHI_AC2       false
-
-#define DECODE_GICABLE         false
-#define SEND_GICABLE           false
-
-#define DECODE_HAIER_AC_YRW02  false
-#define SEND_HAIER_AC_YRW02    false
-
-#define DECODE_WHIRLPOOL_AC    false
-#define SEND_WHIRLPOOL_AC      false
-
-#define DECODE_LUTRON          false
-#define SEND_LUTRON            false
-
-#define DECODE_ELECTRA_AC      false
-#define SEND_ELECTRA_AC        false
-
-#define DECODE_PANASONIC_AC    false
-#define SEND_PANASONIC_AC      false
-
-#define DECODE_MWM             false
-#define SEND_MWM               false
-
-#define DECODE_PIONEER         false
-#define SEND_PIONEER           false
-
-#define DECODE_DAIKIN2         false
-#define SEND_DAIKIN2           false
-
-#define DECODE_VESTEL_AC       false
-#define SEND_VESTEL_AC         false
-
-#define DECODE_TECO            false
-#define SEND_TECO              false
-
-#define DECODE_TCL112AC        false
-#define SEND_TCL112AC          false
-
-#define DECODE_LEGOPF          false
-#define SEND_LEGOPF            false
-
-#define DECODE_MITSUBISHIHEAVY false
-#define SEND_MITSUBISHIHEAVY   false
-
-#define DECODE_DAIKIN216       false
-#define SEND_DAIKIN216         false
-
-#define DECODE_DAIKIN160       false
-#define SEND_DAIKIN160         false
-
-#define DECODE_NEOCLIMA        false
-#define SEND_NEOCLIMA          false
-
-#define DECODE_DAIKIN176       false
-#define SEND_DAIKIN176         false
-
-#define DECODE_DAIKIN128       false
-#define SEND_DAIKIN128         false
-
-#define DECODE_AMCOR           false
-#define SEND_AMCOR             false
-
-#define DECODE_DAIKIN152       false
-#define SEND_DAIKIN152         false
-
-#define DECODE_HITACHI_AC424   false
-#define SEND_HITACHI_AC424     false
-
-#endif  // defined(FIRMWARE_IR) || defined(FIRMWARE_IR_CUSTOM)   // full IR protocols
+// Semi-unique code for unknown messages
+#ifndef DECODE_HASH
+#define DECODE_HASH            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HASH
+
+#ifndef SEND_RAW
+#define SEND_RAW               _IR_ENABLE_DEFAULT_
+#endif  // SEND_RAW
+
+#ifndef DECODE_NEC
+#define DECODE_NEC             _IR_ENABLE_DEFAULT_
+#endif  // DECODE_NEC
+#ifndef SEND_NEC
+#define SEND_NEC               _IR_ENABLE_DEFAULT_
+#endif  // SEND_NEC
+
+#ifndef DECODE_SHERWOOD
+#define DECODE_SHERWOOD        false  // Not applicable. Actually is DECODE_NEC
+#endif  // DECODE_SHERWOOD
+#ifndef SEND_SHERWOOD
+#define SEND_SHERWOOD          _IR_ENABLE_DEFAULT_
+#endif  // SEND_SHERWOOD
+
+#ifndef DECODE_RC5
+#define DECODE_RC5             _IR_ENABLE_DEFAULT_
+#endif  // DECODE_RC5
+#ifndef SEND_RC5
+#define SEND_RC5               _IR_ENABLE_DEFAULT_
+#endif  // SEND_RC5
+
+#ifndef DECODE_RC6
+#define DECODE_RC6             _IR_ENABLE_DEFAULT_
+#endif  // DECODE_RC6
+#ifndef SEND_RC6
+#define SEND_RC6               _IR_ENABLE_DEFAULT_
+#endif  // SEND_RC6
+
+#ifndef DECODE_RCMM
+#define DECODE_RCMM            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_RCMM
+#ifndef SEND_RCMM
+#define SEND_RCMM              _IR_ENABLE_DEFAULT_
+#endif  // SEND_RCMM
+
+#ifndef DECODE_SONY
+#define DECODE_SONY            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SONY
+#ifndef SEND_SONY
+#define SEND_SONY              _IR_ENABLE_DEFAULT_
+#endif  // SEND_SONY
+
+#ifndef DECODE_PANASONIC
+#define DECODE_PANASONIC       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_PANASONIC
+#ifndef SEND_PANASONIC
+#define SEND_PANASONIC         _IR_ENABLE_DEFAULT_
+#endif  // SEND_PANASONIC
+
+#ifndef DECODE_JVC
+#define DECODE_JVC             _IR_ENABLE_DEFAULT_
+#endif  // DECODE_JVC
+#ifndef SEND_JVC
+#define SEND_JVC               _IR_ENABLE_DEFAULT_
+#endif  // SEND_JVC
+
+#ifndef DECODE_SAMSUNG
+#define DECODE_SAMSUNG         _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SAMSUNG
+#ifndef SEND_SAMSUNG
+#define SEND_SAMSUNG           _IR_ENABLE_DEFAULT_
+#endif  // SEND_SAMSUNG
+
+#ifndef DECODE_SAMSUNG36
+#define DECODE_SAMSUNG36       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SAMSUNG36
+#ifndef SEND_SAMSUNG36
+#define SEND_SAMSUNG36         _IR_ENABLE_DEFAULT_
+#endif  // SEND_SAMSUNG36
+
+#ifndef DECODE_SAMSUNG_AC
+#define DECODE_SAMSUNG_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SAMSUNG_AC
+#ifndef SEND_SAMSUNG_AC
+#define SEND_SAMSUNG_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_SAMSUNG_AC
+
+#ifndef DECODE_WHYNTER
+#define DECODE_WHYNTER         _IR_ENABLE_DEFAULT_
+#endif  // DECODE_WHYNTER
+#ifndef SEND_WHYNTER
+#define SEND_WHYNTER           _IR_ENABLE_DEFAULT_
+#endif  // SEND_WHYNTER
+
+#ifndef DECODE_AIWA_RC_T501
+#define DECODE_AIWA_RC_T501    _IR_ENABLE_DEFAULT_
+#endif  // DECODE_AIWA_RC_T501
+#ifndef SEND_AIWA_RC_T501
+#define SEND_AIWA_RC_T501      _IR_ENABLE_DEFAULT_
+#endif  // SEND_AIWA_RC_T501
+
+#ifndef DECODE_LG
+#define DECODE_LG              _IR_ENABLE_DEFAULT_
+#endif  // DECODE_LG
+#ifndef SEND_LG
+#define SEND_LG                _IR_ENABLE_DEFAULT_
+#endif  // SEND_LG
+
+#ifndef DECODE_SANYO
+#define DECODE_SANYO           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SANYO
+#ifndef SEND_SANYO
+#define SEND_SANYO             _IR_ENABLE_DEFAULT_
+#endif  // SEND_SANYO
+
+#ifndef DECODE_MITSUBISHI
+#define DECODE_MITSUBISHI      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHI
+#ifndef SEND_MITSUBISHI
+#define SEND_MITSUBISHI        _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHI
+
+#ifndef DECODE_MITSUBISHI2
+#define DECODE_MITSUBISHI2     _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHI2
+#ifndef SEND_MITSUBISHI2
+#define SEND_MITSUBISHI2       _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHI2
+
+#ifndef DECODE_DISH
+#define DECODE_DISH            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DISH
+#ifndef SEND_DISH
+#define SEND_DISH              _IR_ENABLE_DEFAULT_
+#endif  // SEND_DISH
+
+#ifndef DECODE_SHARP
+#define DECODE_SHARP           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SHARP
+#ifndef SEND_SHARP
+#define SEND_SHARP             _IR_ENABLE_DEFAULT_
+#endif  // SEND_SHARP
+
+#ifndef DECODE_SHARP_AC
+#define DECODE_SHARP_AC        _IR_ENABLE_DEFAULT_
+#endif  // DECODE_SHARP_AC
+#ifndef SEND_SHARP_AC
+#define SEND_SHARP_AC          _IR_ENABLE_DEFAULT_
+#endif  // SEND_SHARP_AC
+
+#ifndef DECODE_DENON
+#define DECODE_DENON           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DENON
+#ifndef SEND_DENON
+#define SEND_DENON             _IR_ENABLE_DEFAULT_
+#endif  // SEND_DENON
+
+#ifndef DECODE_KELVINATOR
+#define DECODE_KELVINATOR      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_KELVINATOR
+#ifndef SEND_KELVINATOR
+#define SEND_KELVINATOR        _IR_ENABLE_DEFAULT_
+#endif  // SEND_KELVINATOR
+
+#ifndef DECODE_MITSUBISHI_AC
+#define DECODE_MITSUBISHI_AC   _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHI_AC
+#ifndef SEND_MITSUBISHI_AC
+#define SEND_MITSUBISHI_AC     _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHI_AC
+
+#ifndef DECODE_MITSUBISHI136
+#define DECODE_MITSUBISHI136   _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHI136
+#ifndef SEND_MITSUBISHI136
+#define SEND_MITSUBISHI136     _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHI136
+
+#ifndef DECODE_MITSUBISHI112
+#define DECODE_MITSUBISHI112   _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHI112
+#ifndef SEND_MITSUBISHI112
+#define SEND_MITSUBISHI112     _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHI112
+
+#ifndef DECODE_FUJITSU_AC
+#define DECODE_FUJITSU_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_FUJITSU_AC
+#ifndef SEND_FUJITSU_AC
+#define SEND_FUJITSU_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_FUJITSU_AC
+
+#ifndef DECODE_INAX
+#define DECODE_INAX            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_INAX
+#ifndef SEND_INAX
+#define SEND_INAX              _IR_ENABLE_DEFAULT_
+#endif  // SEND_INAX
+
+#ifndef DECODE_DAIKIN
+#define DECODE_DAIKIN          _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN
+#ifndef SEND_DAIKIN
+#define SEND_DAIKIN            _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN
+
+#ifndef DECODE_COOLIX
+#define DECODE_COOLIX          _IR_ENABLE_DEFAULT_
+#endif  // DECODE_COOLIX
+#ifndef SEND_COOLIX
+#define SEND_COOLIX            _IR_ENABLE_DEFAULT_
+#endif  // SEND_COOLIX
+
+#ifndef DECODE_GLOBALCACHE
+#define DECODE_GLOBALCACHE     false  // Not applicable.
+#endif  // DECODE_GLOBALCACHE
+#ifndef SEND_GLOBALCACHE
+#define SEND_GLOBALCACHE       _IR_ENABLE_DEFAULT_
+#endif  // SEND_GLOBALCACHE
+
+#ifndef DECODE_GOODWEATHER
+#define DECODE_GOODWEATHER     _IR_ENABLE_DEFAULT_
+#endif  // DECODE_GOODWEATHER
+#ifndef SEND_GOODWEATHER
+#define SEND_GOODWEATHER       _IR_ENABLE_DEFAULT_
+#endif  // SEND_GOODWEATHER
+
+#ifndef DECODE_GREE
+#define DECODE_GREE            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_GREE
+#ifndef SEND_GREE
+#define SEND_GREE              _IR_ENABLE_DEFAULT_
+#endif  // SEND_GREE
+
+#ifndef DECODE_PRONTO
+#define DECODE_PRONTO          false  // Not applicable.
+#endif  // DECODE_PRONTO
+#ifndef SEND_PRONTO
+#define SEND_PRONTO            _IR_ENABLE_DEFAULT_
+#endif  // SEND_PRONTO
+
+#ifndef DECODE_ARGO
+#define DECODE_ARGO            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_ARGO
+#ifndef SEND_ARGO
+#define SEND_ARGO              _IR_ENABLE_DEFAULT_
+#endif  // SEND_ARGO
+
+#ifndef DECODE_TROTEC
+#define DECODE_TROTEC          _IR_ENABLE_DEFAULT_
+#endif  // DECODE_TROTEC
+#ifndef SEND_TROTEC
+#define SEND_TROTEC            _IR_ENABLE_DEFAULT_
+#endif  // SEND_TROTEC
+
+#ifndef DECODE_NIKAI
+#define DECODE_NIKAI           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_NIKAI
+#ifndef SEND_NIKAI
+#define SEND_NIKAI             _IR_ENABLE_DEFAULT_
+#endif  // SEND_NIKAI
+
+#ifndef DECODE_TOSHIBA_AC
+#define DECODE_TOSHIBA_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_TOSHIBA_AC
+#ifndef SEND_TOSHIBA_AC
+#define SEND_TOSHIBA_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_TOSHIBA_AC
+
+#ifndef DECODE_MAGIQUEST
+#define DECODE_MAGIQUEST       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MAGIQUEST
+#ifndef SEND_MAGIQUEST
+#define SEND_MAGIQUEST         _IR_ENABLE_DEFAULT_
+#endif  // SEND_MAGIQUEST
+
+#ifndef DECODE_MIDEA
+#define DECODE_MIDEA           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MIDEA
+#ifndef SEND_MIDEA
+#define SEND_MIDEA             _IR_ENABLE_DEFAULT_
+#endif  // SEND_MIDEA
+
+#ifndef DECODE_LASERTAG
+#define DECODE_LASERTAG        _IR_ENABLE_DEFAULT_
+#endif  // DECODE_LASERTAG
+#ifndef SEND_LASERTAG
+#define SEND_LASERTAG          _IR_ENABLE_DEFAULT_
+#endif  // SEND_LASERTAG
+
+#ifndef DECODE_CARRIER_AC
+#define DECODE_CARRIER_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_CARRIER_AC
+#ifndef SEND_CARRIER_AC
+#define SEND_CARRIER_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_CARRIER_AC
+
+#ifndef DECODE_HAIER_AC
+#define DECODE_HAIER_AC        _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HAIER_AC
+#ifndef SEND_HAIER_AC
+#define SEND_HAIER_AC          _IR_ENABLE_DEFAULT_
+#endif  // SEND_HAIER_AC
+
+#ifndef DECODE_HITACHI_AC
+#define DECODE_HITACHI_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HITACHI_AC
+#ifndef SEND_HITACHI_AC
+#define SEND_HITACHI_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_HITACHI_AC
+
+#ifndef DECODE_HITACHI_AC1
+#define DECODE_HITACHI_AC1     _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HITACHI_AC1
+#ifndef SEND_HITACHI_AC1
+#define SEND_HITACHI_AC1       _IR_ENABLE_DEFAULT_
+#endif  // SEND_HITACHI_AC1
+
+#ifndef DECODE_HITACHI_AC2
+#define DECODE_HITACHI_AC2     _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HITACHI_AC2
+#ifndef SEND_HITACHI_AC2
+#define SEND_HITACHI_AC2       _IR_ENABLE_DEFAULT_
+#endif  // SEND_HITACHI_AC2
+
+#ifndef DECODE_GICABLE
+#define DECODE_GICABLE         _IR_ENABLE_DEFAULT_
+#endif  // DECODE_GICABLE
+#ifndef SEND_GICABLE
+#define SEND_GICABLE           _IR_ENABLE_DEFAULT_
+#endif  // SEND_GICABLE
+
+#ifndef DECODE_HAIER_AC_YRW02
+#define DECODE_HAIER_AC_YRW02  _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HAIER_AC_YRW02
+#ifndef SEND_HAIER_AC_YRW02
+#define SEND_HAIER_AC_YRW02    _IR_ENABLE_DEFAULT_
+#endif  // SEND_HAIER_AC_YRW02
+
+#ifndef DECODE_WHIRLPOOL_AC
+#define DECODE_WHIRLPOOL_AC    _IR_ENABLE_DEFAULT_
+#endif  // DECODE_WHIRLPOOL_AC
+#ifndef SEND_WHIRLPOOL_AC
+#define SEND_WHIRLPOOL_AC      _IR_ENABLE_DEFAULT_
+#endif  // SEND_WHIRLPOOL_AC
+
+#ifndef DECODE_LUTRON
+#define DECODE_LUTRON          _IR_ENABLE_DEFAULT_
+#endif  // DECODE_LUTRON
+#ifndef SEND_LUTRON
+#define SEND_LUTRON            _IR_ENABLE_DEFAULT_
+#endif  // SEND_LUTRON
+
+#ifndef DECODE_ELECTRA_AC
+#define DECODE_ELECTRA_AC      _IR_ENABLE_DEFAULT_
+#endif  // DECODE_ELECTRA_AC
+#ifndef SEND_ELECTRA_AC
+#define SEND_ELECTRA_AC        _IR_ENABLE_DEFAULT_
+#endif  // SEND_ELECTRA_AC
+
+#ifndef DECODE_PANASONIC_AC
+#define DECODE_PANASONIC_AC    _IR_ENABLE_DEFAULT_
+#endif  // DECODE_PANASONIC_AC
+#ifndef SEND_PANASONIC_AC
+#define SEND_PANASONIC_AC      _IR_ENABLE_DEFAULT_
+#endif  // SEND_PANASONIC_AC
+
+#ifndef DECODE_MWM
+#define DECODE_MWM             _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MWM
+#ifndef SEND_MWM
+#define SEND_MWM               _IR_ENABLE_DEFAULT_
+#endif  // SEND_MWM
+
+#ifndef DECODE_PIONEER
+#define DECODE_PIONEER         _IR_ENABLE_DEFAULT_
+#endif  // DECODE_PIONEER
+#ifndef SEND_PIONEER
+#define SEND_PIONEER           _IR_ENABLE_DEFAULT_
+#endif  // SEND_PIONEER
+
+#ifndef DECODE_DAIKIN2
+#define DECODE_DAIKIN2         _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN2
+#ifndef SEND_DAIKIN2
+#define SEND_DAIKIN2           _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN2
+
+#ifndef DECODE_VESTEL_AC
+#define DECODE_VESTEL_AC       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_VESTEL_AC
+#ifndef SEND_VESTEL_AC
+#define SEND_VESTEL_AC         _IR_ENABLE_DEFAULT_
+#endif  // SEND_VESTEL_AC
+
+#ifndef DECODE_TECO
+#define DECODE_TECO            _IR_ENABLE_DEFAULT_
+#endif  // DECODE_TECO
+#ifndef SEND_TECO
+#define SEND_TECO              _IR_ENABLE_DEFAULT_
+#endif  // SEND_TECO
+
+#ifndef DECODE_TCL112AC
+#define DECODE_TCL112AC        _IR_ENABLE_DEFAULT_
+#endif  // DECODE_TCL112AC
+#ifndef SEND_TCL112AC
+#define SEND_TCL112AC          _IR_ENABLE_DEFAULT_
+#endif  // SEND_TCL112AC
+
+#ifndef DECODE_LEGOPF
+#define DECODE_LEGOPF          _IR_ENABLE_DEFAULT_
+#endif  // DECODE_LEGOPF
+#ifndef SEND_LEGOPF
+#define SEND_LEGOPF            _IR_ENABLE_DEFAULT_
+#endif  // SEND_LEGOPF
+
+#ifndef DECODE_MITSUBISHIHEAVY
+#define DECODE_MITSUBISHIHEAVY _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MITSUBISHIHEAVY
+#ifndef SEND_MITSUBISHIHEAVY
+#define SEND_MITSUBISHIHEAVY   _IR_ENABLE_DEFAULT_
+#endif  // SEND_MITSUBISHIHEAVY
+
+#ifndef DECODE_DAIKIN216
+#define DECODE_DAIKIN216       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN216
+#ifndef SEND_DAIKIN216
+#define SEND_DAIKIN216         _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN216
+
+#ifndef DECODE_DAIKIN160
+#define DECODE_DAIKIN160       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN160
+#ifndef SEND_DAIKIN160
+#define SEND_DAIKIN160         _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN160
+
+#ifndef DECODE_NEOCLIMA
+#define DECODE_NEOCLIMA        _IR_ENABLE_DEFAULT_
+#endif  // DECODE_NEOCLIMA
+#ifndef SEND_NEOCLIMA
+#define SEND_NEOCLIMA          _IR_ENABLE_DEFAULT_
+#endif  // SEND_NEOCLIMA
+
+#ifndef DECODE_DAIKIN176
+#define DECODE_DAIKIN176       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN176
+#ifndef SEND_DAIKIN176
+#define SEND_DAIKIN176         _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN176
+
+#ifndef DECODE_DAIKIN128
+#define DECODE_DAIKIN128       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN128
+#ifndef SEND_DAIKIN128
+#define SEND_DAIKIN128         _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN128
+
+#ifndef DECODE_AMCOR
+#define DECODE_AMCOR           _IR_ENABLE_DEFAULT_
+#endif  // DECODE_AMCOR
+#ifndef SEND_AMCOR
+#define SEND_AMCOR             _IR_ENABLE_DEFAULT_
+#endif  // SEND_AMCOR
+
+#ifndef DECODE_DAIKIN152
+#define DECODE_DAIKIN152       _IR_ENABLE_DEFAULT_
+#endif  // DECODE_DAIKIN152
+#ifndef SEND_DAIKIN152
+#define SEND_DAIKIN152         _IR_ENABLE_DEFAULT_
+#endif  // SEND_DAIKIN152
+
+#ifndef DECODE_HITACHI_AC424
+#define DECODE_HITACHI_AC424   _IR_ENABLE_DEFAULT_
+#endif  // DECODE_HITACHI_AC424
+#ifndef SEND_HITACHI_AC424
+#define SEND_HITACHI_AC424     _IR_ENABLE_DEFAULT_
+#endif  // SEND_HITACHI_AC424
 
 #if (DECODE_ARGO || DECODE_DAIKIN || DECODE_FUJITSU_AC || DECODE_GREE || \
      DECODE_KELVINATOR || DECODE_MITSUBISHI_AC || DECODE_TOSHIBA_AC || \
@@ -495,7 +585,9 @@
 // Note: If you plan to send IR messages in the callbacks of the AsyncWebserver
 //       library, you need to set ALLOW_DELAY_CALLS to false.
 //       Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/430
+#ifndef ALLOW_DELAY_CALLS
 #define ALLOW_DELAY_CALLS true
+#endif  // ALLOW_DELAY_CALLS
 
 /*
  * Always add to the end of the list and should never remove entries
@@ -578,8 +670,9 @@ enum decode_type_t {
   MITSUBISHI136,
   MITSUBISHI112,
   HITACHI_AC424,
+  SONY_38K,
   // Add new entries before this one, and update it to point to the last entry.
-  kLastDecodeType = HITACHI_AC424,
+  kLastDecodeType = SONY_38K,
 };
 
 // Message lengths & required repeat values
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRsend.cpp b/lib/IRremoteESP8266-2.7.3/src/IRsend.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/src/IRsend.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRsend.cpp
index 18e2eb559..4bc16a75c 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRsend.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/IRsend.cpp
@@ -515,6 +515,8 @@ uint16_t IRsend::minRepeats(const decode_type_t protocol) {
       return kDishMinRepeat;
     case SONY:
       return kSonyMinRepeat;
+    case SONY_38K:
+      return kSonyMinRepeat + 1;
     default:
       return kNoRepeat;
   }
@@ -545,6 +547,7 @@ uint16_t IRsend::defaultBits(const decode_type_t protocol) {
       return 16;
     case RC6:
     case SONY:
+    case SONY_38K:
       return 20;
     case COOLIX:
     case INAX:
@@ -818,6 +821,9 @@ bool IRsend::send(const decode_type_t type, const uint64_t data,
     case SONY:
       sendSony(data, nbits, min_repeat);
       break;
+    case SONY_38K:
+      sendSony38(data, nbits, min_repeat);
+      break;
 #endif
 #if SEND_TECO
     case TECO:
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRsend.h b/lib/IRremoteESP8266-2.7.3/src/IRsend.h
similarity index 98%
rename from lib/IRremoteESP8266-2.7.2/src/IRsend.h
rename to lib/IRremoteESP8266-2.7.3/src/IRsend.h
index e86f4e7de..ff801210d 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRsend.h
+++ b/lib/IRremoteESP8266-2.7.3/src/IRsend.h
@@ -130,7 +130,7 @@ enum panasonic_ac_remote_model_t {
   kPanasonicUnknown = 0,
   kPanasonicLke = 1,
   kPanasonicNke = 2,
-  kPanasonicDke = 3,
+  kPanasonicDke = 3,  // PKR too.
   kPanasonicJke = 4,
   kPanasonicCkp = 5,
   kPanasonicRkr = 6,
@@ -203,6 +203,8 @@ class IRsend {
   // a Sony command that will be accepted be a device.
   void sendSony(uint64_t data, uint16_t nbits = kSony20Bits,
                 uint16_t repeat = kSonyMinRepeat);
+  void sendSony38(uint64_t data, uint16_t nbits = kSony20Bits,
+                  uint16_t repeat = kSonyMinRepeat + 1);
   uint32_t encodeSony(uint16_t nbits, uint16_t command, uint16_t address,
                       uint16_t extended = 0);
 #endif
@@ -561,6 +563,10 @@ class IRsend {
   uint8_t _dutycycle;
   bool modulation;
   uint32_t calcUSecPeriod(uint32_t hz, bool use_offset = true);
+#if SEND_SONY
+  void _sendSony(uint64_t data, uint16_t nbits,
+                 uint16_t repeat, uint16_t freq);
+#endif
 };
 
 #endif  // IRSEND_H_
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRtext.cpp b/lib/IRremoteESP8266-2.7.3/src/IRtext.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRtext.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRtext.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRtext.h b/lib/IRremoteESP8266-2.7.3/src/IRtext.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRtext.h
rename to lib/IRremoteESP8266-2.7.3/src/IRtext.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRtimer.cpp b/lib/IRremoteESP8266-2.7.3/src/IRtimer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRtimer.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRtimer.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRtimer.h b/lib/IRremoteESP8266-2.7.3/src/IRtimer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRtimer.h
rename to lib/IRremoteESP8266-2.7.3/src/IRtimer.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRutils.cpp b/lib/IRremoteESP8266-2.7.3/src/IRutils.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.2/src/IRutils.cpp
rename to lib/IRremoteESP8266-2.7.3/src/IRutils.cpp
index e785f625d..bbb9ed491 100644
--- a/lib/IRremoteESP8266-2.7.2/src/IRutils.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/IRutils.cpp
@@ -228,6 +228,8 @@ decode_type_t strToDecodeType(const char * const str) {
     return decode_type_t::SHERWOOD;
   else if (!strcasecmp(str, "SONY"))
     return decode_type_t::SONY;
+  else if (!strcasecmp(str, "SONY_38K"))
+    return decode_type_t::SONY_38K;
   else if (!strcasecmp(str, "TCL112AC"))
     return decode_type_t::TCL112AC;
   else if (!strcasecmp(str, "TECO"))
@@ -461,6 +463,9 @@ String typeToString(const decode_type_t protocol, const bool isRepeat) {
     case SONY:
       result = F("SONY");
       break;
+    case SONY_38K:
+      result = F("SONY_38K");
+      break;
     case TCL112AC:
       result = F("TCL112AC");
       break;
diff --git a/lib/IRremoteESP8266-2.7.2/src/IRutils.h b/lib/IRremoteESP8266-2.7.3/src/IRutils.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/IRutils.h
rename to lib/IRremoteESP8266-2.7.3/src/IRutils.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/i18n.h b/lib/IRremoteESP8266-2.7.3/src/i18n.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/i18n.h
rename to lib/IRremoteESP8266-2.7.3/src/i18n.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Aiwa.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Aiwa.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Aiwa.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Aiwa.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Amcor.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Amcor.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Amcor.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Amcor.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Amcor.h b/lib/IRremoteESP8266-2.7.3/src/ir_Amcor.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Amcor.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Amcor.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Argo.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Argo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Argo.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Argo.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Argo.h b/lib/IRremoteESP8266-2.7.3/src/ir_Argo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Argo.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Argo.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Carrier.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Carrier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Carrier.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Carrier.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Coolix.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Coolix.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp
index 0dbd68d63..8b184bf9f 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_Coolix.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp
@@ -27,16 +27,16 @@
 // Pulse parms are *50-100 for the Mark and *50+100 for the space
 // First MARK is the one after the long gap
 // pulse parameters in usec
-const uint16_t kCoolixTick = 560;  // Approximately 21 cycles at 38kHz
-const uint16_t kCoolixBitMarkTicks = 1;
+const uint16_t kCoolixTick = 276;  // Approximately 10.5 cycles at 38kHz
+const uint16_t kCoolixBitMarkTicks = 2;
 const uint16_t kCoolixBitMark = kCoolixBitMarkTicks * kCoolixTick;
-const uint16_t kCoolixOneSpaceTicks = 3;
+const uint16_t kCoolixOneSpaceTicks = 6;
 const uint16_t kCoolixOneSpace = kCoolixOneSpaceTicks * kCoolixTick;
-const uint16_t kCoolixZeroSpaceTicks = 1;
+const uint16_t kCoolixZeroSpaceTicks = 2;
 const uint16_t kCoolixZeroSpace = kCoolixZeroSpaceTicks * kCoolixTick;
-const uint16_t kCoolixHdrMarkTicks = 8;
+const uint16_t kCoolixHdrMarkTicks = 17;
 const uint16_t kCoolixHdrMark = kCoolixHdrMarkTicks * kCoolixTick;
-const uint16_t kCoolixHdrSpaceTicks = 8;
+const uint16_t kCoolixHdrSpaceTicks = 16;
 const uint16_t kCoolixHdrSpace = kCoolixHdrSpaceTicks * kCoolixTick;
 const uint16_t kCoolixMinGapTicks = kCoolixHdrMarkTicks + kCoolixZeroSpaceTicks;
 const uint16_t kCoolixMinGap = kCoolixMinGapTicks * kCoolixTick;
@@ -57,11 +57,10 @@ using irutils::setBits;
 //   nbits:  Nr. of bits of data to be sent. Typically kCoolixBits.
 //   repeat: Nr. of additional times the message is to be sent.
 //
-// Status: BETA / Probably works.
+// Status: STABLE / Confirmed Working.
 //
 // Ref:
 //   https://github.com/z3t0/Arduino-IRremote/blob/master/ir_COOLIX.cpp
-// TODO(anyone): Verify repeat functionality against a real unit.
 void IRsend::sendCOOLIX(uint64_t data, uint16_t nbits, uint16_t repeat) {
   if (nbits % 8 != 0) return;  // nbits is required to be a multiple of 8.
 
@@ -443,7 +442,11 @@ stdAc::state_t IRCoolixAC::toCommon(const stdAc::state_t *prev) {
   } else {
     // Set defaults for non-zero values that are not implicitly set for when
     // there is no previous state.
+    // e.g. Any setting that toggles should probably go here.
     result.swingv = stdAc::swingv_t::kOff;
+    result.turbo = false;
+    result.clean = false;
+    result.light = false;
     result.sleep = -1;
   }
   // Not supported.
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Coolix.h b/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Coolix.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Coolix.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Daikin.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Daikin.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Daikin.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Daikin.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Daikin.h b/lib/IRremoteESP8266-2.7.3/src/ir_Daikin.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Daikin.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Daikin.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Denon.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Denon.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Denon.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Denon.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Dish.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Dish.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Dish.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Dish.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Electra.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Electra.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Electra.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Electra.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Electra.h b/lib/IRremoteESP8266-2.7.3/src/ir_Electra.h
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Electra.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Electra.h
index ef28b44cf..a120bcd28 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_Electra.h
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_Electra.h
@@ -19,6 +19,8 @@
 // Supports:
 //   Brand: AUX,  Model: KFR-35GW/BpNFW=3 A/C
 //   Brand: AUX,  Model: YKR-T/011 remote
+//   Brand: Electra,  Model: Classic INV 17 / AXW12DCS A/C
+//   Brand: Electra,  Model: YKR-M/003E remote
 
 // Ref:
 //  https://github.com/ToniA/arduino-heatpumpir/blob/master/AUXHeatpumpIR.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.h b/lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Fujitsu.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_GICable.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_GICable.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_GICable.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_GICable.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_GlobalCache.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_GlobalCache.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_GlobalCache.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_GlobalCache.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.h b/lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Goodweather.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Gree.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Gree.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Gree.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Gree.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Gree.h b/lib/IRremoteESP8266-2.7.3/src/ir_Gree.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Gree.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Gree.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Haier.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Haier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Haier.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Haier.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Haier.h b/lib/IRremoteESP8266-2.7.3/src/ir_Haier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Haier.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Haier.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.h b/lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Hitachi.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Inax.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Inax.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Inax.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Inax.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_JVC.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_JVC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_JVC.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_JVC.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.h b/lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Kelvinator.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_LG.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_LG.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_LG.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_LG.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_LG.h b/lib/IRremoteESP8266-2.7.3/src/ir_LG.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_LG.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_LG.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Lasertag.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Lasertag.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Lasertag.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Lasertag.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Lego.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Lego.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Lego.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Lego.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Lutron.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Lutron.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Lutron.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Lutron.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_MWM.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_MWM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_MWM.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_MWM.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.h b/lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Magiquest.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Midea.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Midea.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Midea.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Midea.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Midea.h b/lib/IRremoteESP8266-2.7.3/src/ir_Midea.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Midea.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Midea.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.h b/lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Mitsubishi.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.h b/lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_MitsubishiHeavy.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_NEC.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_NEC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_NEC.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_NEC.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_NEC.h b/lib/IRremoteESP8266-2.7.3/src/ir_NEC.h
similarity index 93%
rename from lib/IRremoteESP8266-2.7.2/src/ir_NEC.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_NEC.h
index 6319d32dc..cf6191100 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_NEC.h
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_NEC.h
@@ -10,9 +10,10 @@
 #include "IRremoteESP8266.h"
 
 // Supports:
-//   Brand: Yamaha,  Model: RAV561 remote
-//   Brand: Yamaha,  Model: RXV585B A/V Receiver
-//   Brand: Aloka,   Model: SleepyLights LED Lamp
+//   Brand: Yamaha,   Model: RAV561 remote
+//   Brand: Yamaha,   Model: RXV585B A/V Receiver
+//   Brand: Aloka,    Model: SleepyLights LED Lamp
+//   Brand: Toshiba,  Model: 42TL838 LCD TV
 
 // Constants
 // Ref:
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.h b/lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Neoclima.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Nikai.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Nikai.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Nikai.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Nikai.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp
index a25f4cb02..511986a11 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp
@@ -25,8 +25,8 @@
 //   Code by crankyoldgit
 // Panasonic A/C models supported:
 //   A/C Series/models:
-//     JKE, LKE, DKE, CKP, RKR, & NKE series. (In theory)
-//     CS-YW9MKD, CS-Z9RKR (confirmed)
+//     JKE, LKE, DKE, CKP, PKR, RKR, & NKE series. (In theory)
+//     CS-YW9MKD, CS-Z9RKR, CS-E7PKR (confirmed)
 //     CS-ME14CKPG / CS-ME12CKPG / CS-ME10CKPG
 //   A/C Remotes:
 //     A75C3747 (confirmed)
@@ -202,8 +202,9 @@ bool IRrecv::decodePanasonic(decode_results *results, const uint16_t nbits,
 //:
 // Panasonic A/C models supported:
 //   A/C Series/models:
-//     JKE, LKE, DKE, CKP, RKR, & NKE series.
+//     JKE, LKE, DKE, CKP, PKR, RKR, & NKE series.
 //     CS-YW9MKD
+//     CS-E7PKR
 //   A/C Remotes:
 //     A75C3747
 //     A75C3704
@@ -310,6 +311,8 @@ void IRPanasonicAc::setModel(const panasonic_ac_remote_model_t model) {
     default:
       break;
   }
+  // Reset the Ion filter.
+  setIon(getIon());
 }
 
 panasonic_ac_remote_model_t IRPanasonicAc::getModel(void) {
@@ -588,6 +591,22 @@ bool IRPanasonicAc::isOffTimerEnabled(void) {
   return GETBIT8(remote_state[13], kPanasonicAcOffTimerOffset);
 }
 
+bool IRPanasonicAc::getIon(void) {
+  switch (this->getModel()) {
+    case kPanasonicDke:
+      return GETBIT8(remote_state[kPanasonicAcIonFilterByte],
+                     kPanasonicAcIonFilterOffset);
+    default:
+      return false;
+  }
+}
+
+void IRPanasonicAc::setIon(const bool on) {
+  if (this->getModel() == kPanasonicDke)
+    setBit(&remote_state[kPanasonicAcIonFilterByte],
+           kPanasonicAcIonFilterOffset, on);
+}
+
 // Convert a standard A/C mode into its native mode.
 uint8_t IRPanasonicAc::convertMode(const stdAc::opmode_t mode) {
   switch (mode) {
@@ -692,10 +711,10 @@ stdAc::state_t IRPanasonicAc::toCommon(void) {
   result.swingh = this->toCommonSwingH(this->getSwingHorizontal());
   result.quiet = this->getQuiet();
   result.turbo = this->getPowerful();
+  result.filter = this->getIon();
   // Not supported.
   result.econo = false;
   result.clean = false;
-  result.filter = false;
   result.light = false;
   result.beep = false;
   result.sleep = -1;
@@ -774,6 +793,8 @@ String IRPanasonicAc::toString(void) {
   }
   result += addBoolToString(getQuiet(), kQuietStr);
   result += addBoolToString(getPowerful(), kPowerfulStr);
+  if (getModel() == kPanasonicDke)
+    result += addBoolToString(getIon(), kIonStr);
   result += addLabeledString(minsToString(getClock()), kClockStr);
   result += addLabeledString(
       isOnTimerEnabled() ? minsToString(getOnTimer()) : kOffStr,
@@ -798,8 +819,9 @@ String IRPanasonicAc::toString(void) {
 //
 // Panasonic A/C models supported:
 //   A/C Series/models:
-//     JKE, LKE, DKE, & NKE series.
+//     JKE, LKE, DKE, PKR, & NKE series.
 //     CS-YW9MKD
+//     CS-E7PKR
 //   A/C Remotes:
 //     A75C3747 (Confirmed)
 //     A75C3704
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.h b/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.h
similarity index 94%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.h
index 89c2e5395..42e771fb3 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_Panasonic.h
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.h
@@ -4,19 +4,20 @@
 //   Brand: Panasonic,  Model: TV
 //   Brand: Panasonic,  Model: JKE series A/C
 //   Brand: Panasonic,  Model: DKE series A/C
+//   Brand: Panasonic,  Model: DKW series A/C (DKE)
+//   Brand: Panasonic,  Model: PKR series A/C (DKE)
 //   Brand: Panasonic,  Model: CKP series A/C
+//   Brand: Panasonic,  Model: NKE series A/C
+//   Brand: Panasonic,  Model: RKR series A/C
 //   Brand: Panasonic,  Model: CS-ME10CKPG A/C
 //   Brand: Panasonic,  Model: CS-ME12CKPG A/C
 //   Brand: Panasonic,  Model: CS-ME14CKPG A/C
-//   Brand: Panasonic,  Model: RKR series A/C
+//   Brand: Panasonic,  Model: CS-E7PKR A/C (DKE)
 //   Brand: Panasonic,  Model: CS-Z9RKR A/C
-//   Brand: Panasonic,  Model: NKE series A/C
 //   Brand: Panasonic,  Model: CS-YW9MKD A/C
-//   Brand: Panasonic,  Model: A75C3747 remote
-//   Brand: Panasonic,  Model: A75C3704 remote
 //   Brand: Panasonic,  Model: A75C2311 remote (CKP)
-//   Brand: Panasonic,  Model: A75C3747 remote
-//   Brand: Panasonic,  Model: A75C3747 remote
+//   Brand: Panasonic,  Model: A75C2616-1 remote (DKE)
+//   Brand: Panasonic,  Model: A75C3704 remote
 //   Brand: Panasonic,  Model: A75C3747 remote
 
 #ifndef IR_PANASONIC_H_
@@ -84,6 +85,9 @@ const uint8_t kPanasonicAcTimeOverflowSize = 3;  // Bits
 const uint16_t kPanasonicAcTimeMax = 23 * 60 + 59;  // Mins since midnight.
 const uint16_t kPanasonicAcTimeSpecial = 0x600;
 
+const uint8_t kPanasonicAcIonFilterByte = 22;  // Byte
+const uint8_t kPanasonicAcIonFilterOffset = 0;  // Bit
+
 const uint8_t kPanasonicKnownGoodState[kPanasonicAcStateLength] = {
     0x02, 0x20, 0xE0, 0x04, 0x00, 0x00, 0x00, 0x06, 0x02,
     0x20, 0xE0, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
@@ -121,6 +125,8 @@ class IRPanasonicAc {
   bool getQuiet(void);
   void setPowerful(const bool on);
   bool getPowerful(void);
+  void setIon(const bool on);
+  bool getIon(void);
   void setModel(const panasonic_ac_remote_model_t model);
   panasonic_ac_remote_model_t getModel(void);
   void setSwingVertical(const uint8_t elevation);
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Pioneer.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Pioneer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Pioneer.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Pioneer.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Pronto.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Pronto.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Pronto.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Pronto.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_RC5_RC6.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_RC5_RC6.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_RC5_RC6.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_RC5_RC6.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_RCMM.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_RCMM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_RCMM.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_RCMM.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Samsung.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Samsung.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Samsung.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Samsung.h b/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Samsung.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Samsung.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Sanyo.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Sanyo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Sanyo.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Sanyo.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Sharp.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Sharp.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Sharp.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Sharp.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Sharp.h b/lib/IRremoteESP8266-2.7.3/src/ir_Sharp.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Sharp.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Sharp.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Sherwood.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Sherwood.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Sherwood.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Sherwood.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Sony.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp
similarity index 74%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Sony.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp
index 6fc39b7b5..d0f4b3c7a 100644
--- a/lib/IRremoteESP8266-2.7.2/src/ir_Sony.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp
@@ -1,9 +1,12 @@
 // Copyright 2009 Ken Shirriff
 // Copyright 2016 marcosamarinho
-// Copyright 2017 David Conran
+// Copyright 2017,2020 David Conran
 
 // Sony Remote Emulation
 
+// Supports:
+//   Brand: Sony,  Model: HT-CT380 Soundbar (Uses 38kHz & 3 repeats)
+
 #include <algorithm>
 #include "IRrecv.h"
 #include "IRsend.h"
@@ -28,9 +31,11 @@ const uint16_t kSonyRptLengthTicks = 225;
 const uint16_t kSonyRptLength = kSonyRptLengthTicks * kSonyTick;
 const uint16_t kSonyMinGapTicks = 50;
 const uint16_t kSonyMinGap = kSonyMinGapTicks * kSonyTick;
+const uint16_t kSonyStdFreq = 40000;  // kHz
+const uint16_t kSonyAltFreq = 38000;  // kHz
 
 #if SEND_SONY
-// Send a Sony/SIRC(Serial Infra-Red Control) message.
+// Send a standard Sony/SIRC(Serial Infra-Red Control) message. (40kHz)
 //
 // Args:
 //   data: message to be sent.
@@ -46,10 +51,50 @@ const uint16_t kSonyMinGap = kSonyMinGapTicks * kSonyTick;
 // Ref:
 //   http://www.sbprojects.com/knowledge/ir/sirc.php
 void IRsend::sendSony(uint64_t data, uint16_t nbits, uint16_t repeat) {
+  _sendSony(data, nbits, repeat, kSonyStdFreq);
+}
+
+// Send an alternative 38kHz Sony/SIRC(Serial Infra-Red Control) message.
+//
+// Args:
+//   data: message to be sent.
+//   nbits: Nr. of bits of the message to be sent.
+//   repeat: Nr. of additional times the message is to be sent. (Default: 3)
+//
+// Status: STABLE / Known working.
+//
+// Notes:
+//   - `sendSony38()`` should typically be called with repeat=3 as these Sony
+//      devices expect the message to be sent at least 4 times.
+//   - Messages send via this method will be detected by this library as just
+//     `SONY`, not `SONY_38K` as the library has no way to determine the
+//     modulation frequency used. Hence, there is no `decodeSony38()`.
+//
+// Ref:
+//   http://www.sbprojects.com/knowledge/ir/sirc.php
+//   https://github.com/crankyoldgit/IRremoteESP8266/issues/1018
+void IRsend::sendSony38(uint64_t data, uint16_t nbits, uint16_t repeat) {
+  _sendSony(data, nbits, repeat, kSonyAltFreq);
+}
+
+// Internal procedure to generate a Sony/SIRC(Serial Infra-Red Control) message.
+//
+// Args:
+//   data: message to be sent.
+//   nbits: Nr. of bits of the message to be sent.
+//   repeat: Nr. of additional times the message is to be sent.
+//   freq: Frequency of the modulation to transmit at. (Hz or kHz)
+//
+// Status: STABLE / Known working.
+//
+// Ref:
+//   http://www.sbprojects.com/knowledge/ir/sirc.php
+void IRsend::_sendSony(uint64_t data, uint16_t nbits, uint16_t repeat,
+                      uint16_t freq) {
   sendGeneric(kSonyHdrMark, kSonySpace, kSonyOneMark, kSonySpace, kSonyZeroMark,
               kSonySpace,
               0,  // No Footer mark.
-              kSonyMinGap, kSonyRptLength, data, nbits, 40, true, repeat, 33);
+              kSonyMinGap, kSonyRptLength, data, nbits, freq, true, repeat, 33);
 }
 
 // Convert Sony/SIRC command, address, & extended bits into sendSony format.
@@ -149,6 +194,7 @@ bool IRrecv::decodeSony(decode_results *results, uint16_t nbits, bool strict) {
   // Success
   results->bits = actualBits;
   results->value = data;
+  // We can't detect SONY_38K messages so always assume it is just `SONY` 40kHz.
   results->decode_type = SONY;
   // Message comes in LSB first. Convert ot MSB first.
   data = reverseBits(data, actualBits);
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Tcl.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Tcl.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Tcl.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Tcl.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Tcl.h b/lib/IRremoteESP8266-2.7.3/src/ir_Tcl.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Tcl.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Tcl.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Teco.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Teco.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Teco.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Teco.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Teco.h b/lib/IRremoteESP8266-2.7.3/src/ir_Teco.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Teco.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Teco.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.h b/lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Toshiba.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Trotec.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Trotec.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Trotec.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Trotec.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Trotec.h b/lib/IRremoteESP8266-2.7.3/src/ir_Trotec.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Trotec.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Trotec.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Vestel.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Vestel.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Vestel.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Vestel.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Vestel.h b/lib/IRremoteESP8266-2.7.3/src/ir_Vestel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Vestel.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Vestel.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.h b/lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Whirlpool.h
rename to lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/ir_Whynter.cpp b/lib/IRremoteESP8266-2.7.3/src/ir_Whynter.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/ir_Whynter.cpp
rename to lib/IRremoteESP8266-2.7.3/src/ir_Whynter.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/README.md b/lib/IRremoteESP8266-2.7.3/src/locale/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/README.md
rename to lib/IRremoteESP8266-2.7.3/src/locale/README.md
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/de-CH.h b/lib/IRremoteESP8266-2.7.3/src/locale/de-CH.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/de-CH.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/de-CH.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/de-DE.h b/lib/IRremoteESP8266-2.7.3/src/locale/de-DE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/de-DE.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/de-DE.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/defaults.h b/lib/IRremoteESP8266-2.7.3/src/locale/defaults.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/defaults.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/defaults.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/en-AU.h b/lib/IRremoteESP8266-2.7.3/src/locale/en-AU.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/en-AU.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/en-AU.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/en-IE.h b/lib/IRremoteESP8266-2.7.3/src/locale/en-IE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/en-IE.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/en-IE.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/en-UK.h b/lib/IRremoteESP8266-2.7.3/src/locale/en-UK.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/en-UK.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/en-UK.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/en-US.h b/lib/IRremoteESP8266-2.7.3/src/locale/en-US.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/en-US.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/en-US.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/es-ES.h b/lib/IRremoteESP8266-2.7.3/src/locale/es-ES.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/es-ES.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/es-ES.h
diff --git a/lib/IRremoteESP8266-2.7.2/src/locale/fr-FR.h b/lib/IRremoteESP8266-2.7.3/src/locale/fr-FR.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/src/locale/fr-FR.h
rename to lib/IRremoteESP8266-2.7.3/src/locale/fr-FR.h
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp b/lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp
index 2c17e2a92..875485eee 100644
--- a/lib/IRremoteESP8266-2.7.2/test/IRac_test.cpp
+++ b/lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp
@@ -108,29 +108,29 @@ TEST(TestIRac, Coolix) {
       "f38000d50"  // 38kHz Frequency and 50% duty-cycle.
       // Start of message #1 (i.e. Repeat '0')
       // Header
-      "m4480s4480"
+      "m4692s4416"
       // Data
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s560m560s560"
-      "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s1680m560s1680"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s1656m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s552m552s552"
+      "m552s1656m552s552m552s552m552s1656m552s552m552s552m552s1656m552s1656"
       // Footer
-      "m560s5040"
+      "m552s5244"
       // End of message #1 (i.e. Repeat '0')
       // Start of message #2 (i.e. Repeat '1')
       // Header
-      "m4480s4480"
+      "m4692s4416"
       // Data
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s560m560s560"
-      "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s1680m560s1680"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s1656m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s552m552s552"
+      "m552s1656m552s552m552s552m552s1656m552s552m552s552m552s1656m552s1656"
       // Footer
-      "m560s105040",
+      "m552s105244",
       // End of message #2 (i.e. Repeat '1')
       // Note: the two messages (#1 & #2) are identical.
       ac._irsend.outputStr());
@@ -851,6 +851,7 @@ TEST(TestIRac, Panasonic) {
                  stdAc::swingh_t::kLeft,      // Horizontal swing
                  true,                        // Quiet
                  false,                       // Turbo
+                 false,                       // Filter
                  19 * 60 + 17);               // Clock
   ASSERT_EQ(expected_nke, ac.toString());
   ac._irsend.makeDecodeResult();
@@ -862,7 +863,8 @@ TEST(TestIRac, Panasonic) {
   char expected_dke[] =
       "Model: 3 (DKE), Power: On, Mode: 3 (Cool), Temp: 18C, Fan: 4 (High), "
       "Swing(V): 2 (High), Swing(H): 6 (Middle), "
-      "Quiet: Off, Powerful: On, Clock: 19:17, On Timer: Off, Off Timer: Off";
+      "Quiet: Off, Powerful: On, Ion: On, "
+      "Clock: 19:17, On Timer: Off, Off Timer: Off";
   ac._irsend.reset();
   irac.panasonic(&ac,
                kPanasonicDke,               // Model
@@ -874,6 +876,7 @@ TEST(TestIRac, Panasonic) {
                stdAc::swingh_t::kMiddle,    // Horizontal swing
                false,                       // Quiet
                true,                        // Turbo
+               true,                        // Filter
                19 * 60 + 17);               // Clock
   ASSERT_EQ(expected_dke, ac.toString());
   ac._irsend.makeDecodeResult();
@@ -1475,39 +1478,39 @@ TEST(TestIRac, Issue821) {
   ASSERT_EQ("Power: On, Light: Toggle",
             IRAcUtils::resultAcToString(&ac._irsend.capture));
   EXPECT_EQ(
-      "f38000d50m"
-      "4480s4480"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560"
-      "m560s105040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560"
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680"
-      "m560s105040",
+      "f38000d50"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s552m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s552"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s552m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s552"
+      "m552s105244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s552m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s1656m552s1656m552s552m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s552m552s552m552s552"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s552m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s1656m552s1656m552s552m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s552m552s552m552s552"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s1656"
+      "m552s105244",
       ac._irsend.outputStr());
 }
 
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRrecv_test.cpp b/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.2/test/IRrecv_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp
index cda7b747f..9dff78c75 100644
--- a/lib/IRremoteESP8266-2.7.2/test/IRrecv_test.cpp
+++ b/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp
@@ -565,8 +565,8 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t good_entries_trailing_space = 12;
-  uint16_t good_trailing_space_data[good_entries_trailing_space] = {
+  const uint16_t kgood_entries_trailing_space = 12;
+  uint16_t good_trailing_space_data[kgood_entries_trailing_space] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -576,8 +576,8 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
       3000,  // Footer mark
       15000};  // Footer space
 
-  uint16_t good_entries_no_trailing_space = 11;
-  uint16_t good_no_trailing_space_data[good_entries_no_trailing_space] = {
+  const uint16_t kgood_entries_no_trailing_space = 11;
+  uint16_t good_no_trailing_space_data[kgood_entries_no_trailing_space] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -588,7 +588,7 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(good_trailing_space_data, good_entries_trailing_space, 38000);
+  irsend.sendRaw(good_trailing_space_data, kgood_entries_trailing_space, 38000);
   irsend.makeDecodeResult();
   uint64_t result_data = 0;
   uint16_t entries_used = 0;
@@ -607,7 +607,7 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(good_entries_trailing_space, entries_used);
+  EXPECT_EQ(kgood_entries_trailing_space, entries_used);
 
   // Same again but with a footer space mis-match, which should fail.
   result_data = 0;
@@ -628,7 +628,7 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
   // Same again as first part but with no footer space data as the last entry.
   irsend.reset();
   result_data = 0;
-  irsend.sendRaw(good_no_trailing_space_data, good_entries_no_trailing_space,
+  irsend.sendRaw(good_no_trailing_space_data, kgood_entries_no_trailing_space,
                  38000);
   irsend.makeDecodeResult();
   entries_used = irrecv.matchGeneric(
@@ -646,7 +646,7 @@ TEST(TestMatchGeneric, NormalWithNoAtleast) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(good_entries_no_trailing_space, entries_used);
+  EXPECT_EQ(kgood_entries_no_trailing_space, entries_used);
 }
 
 
@@ -655,8 +655,8 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t good_entries_trailing_space = 12;
-  uint16_t good_trailing_space_data[good_entries_trailing_space] = {
+  const uint16_t kgood_entries_trailing_space = 12;
+  uint16_t good_trailing_space_data[kgood_entries_trailing_space] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -666,8 +666,8 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
       3000,  // Footer mark
       15000};  // Footer space
 
-  uint16_t good_entries_no_trailing_space = 11;
-  uint16_t good_no_trailing_space_data[good_entries_no_trailing_space] = {
+  const uint16_t kgood_entries_no_trailing_space = 11;
+  uint16_t good_no_trailing_space_data[kgood_entries_no_trailing_space] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -678,7 +678,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(good_trailing_space_data, good_entries_trailing_space, 38000);
+  irsend.sendRaw(good_trailing_space_data, kgood_entries_trailing_space, 38000);
   irsend.makeDecodeResult();
   uint64_t result_data = 0;
   uint16_t entries_used = 0;
@@ -697,7 +697,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(good_entries_trailing_space, entries_used);
+  EXPECT_EQ(kgood_entries_trailing_space, entries_used);
 
   // Same again but with a footer space under-match.
   result_data = 0;
@@ -716,7 +716,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(good_entries_trailing_space, entries_used);
+  EXPECT_EQ(kgood_entries_trailing_space, entries_used);
 
   // Same again but with a footer space under-match using less bits so the
   // atleast footer isn't the last entry in the buffer.
@@ -737,7 +737,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   EXPECT_EQ(0b101, result_data);
   // -2 because we reduced nbits by 1.
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset - 2, entries_used);
-  EXPECT_EQ(good_entries_trailing_space - 2, entries_used);
+  EXPECT_EQ(kgood_entries_trailing_space - 2, entries_used);
 
   // Same again but with a footer space over-match, which should fail.
   result_data = 0;
@@ -758,7 +758,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   // Same as first part but with no footer space data as the last entry.
   irsend.reset();
   result_data = 0;
-  irsend.sendRaw(good_no_trailing_space_data, good_entries_no_trailing_space,
+  irsend.sendRaw(good_no_trailing_space_data, kgood_entries_no_trailing_space,
                  38000);
   irsend.makeDecodeResult();
   entries_used = irrecv.matchGeneric(
@@ -776,7 +776,7 @@ TEST(TestMatchGeneric, NormalWithAtleast) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(good_entries_no_trailing_space, entries_used);
+  EXPECT_EQ(kgood_entries_no_trailing_space, entries_used);
 }
 
 TEST(TestMatchGeneric, FailureCases) {
@@ -784,8 +784,8 @@ TEST(TestMatchGeneric, FailureCases) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t entries = 11;
-  uint16_t data[entries] = {
+  const uint16_t kentries = 11;
+  uint16_t data[kentries] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -796,7 +796,7 @@ TEST(TestMatchGeneric, FailureCases) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(data, entries, 38000);
+  irsend.sendRaw(data, kentries, 38000);
   irsend.makeDecodeResult();
   uint16_t entries_used = 0;
 
@@ -942,8 +942,8 @@ TEST(TestMatchGeneric, MissingHeaderFooter) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t entries = 11;
-  uint16_t data[entries] = {
+  const uint16_t kentries = 11;
+  uint16_t data[kentries] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -954,7 +954,7 @@ TEST(TestMatchGeneric, MissingHeaderFooter) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(data, entries, 38000);
+  irsend.sendRaw(data, kentries, 38000);
   irsend.makeDecodeResult();
   uint16_t entries_used = 0;
 
@@ -976,7 +976,7 @@ TEST(TestMatchGeneric, MissingHeaderFooter) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset - 1, entries_used);
-  EXPECT_EQ(entries - 1, entries_used);
+  EXPECT_EQ(kentries - 1, entries_used);
 
   // No header match (should fail)
   entries_used = irrecv.matchGeneric(
@@ -1010,7 +1010,7 @@ TEST(TestMatchGeneric, MissingHeaderFooter) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - offset, entries_used);
-  EXPECT_EQ(entries - 2, entries_used);
+  EXPECT_EQ(kentries - 2, entries_used);
 }
 
 TEST(TestMatchGeneric, BitOrdering) {
@@ -1018,8 +1018,8 @@ TEST(TestMatchGeneric, BitOrdering) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t entries = 11;
-  uint16_t data[entries] = {
+  const uint16_t kentries = 11;
+  uint16_t data[kentries] = {
       8000,  // Header mark
       4000,  // Header space
       500, 2000,  // Bit #0 (1)
@@ -1030,7 +1030,7 @@ TEST(TestMatchGeneric, BitOrdering) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(data, entries, 38000);
+  irsend.sendRaw(data, kentries, 38000);
   irsend.makeDecodeResult();
   uint16_t entries_used = 0;
 
@@ -1052,7 +1052,7 @@ TEST(TestMatchGeneric, BitOrdering) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b1010, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(entries, entries_used);
+  EXPECT_EQ(kentries, entries_used);
 
   // LSB order
   entries_used = irrecv.matchGeneric(
@@ -1070,7 +1070,7 @@ TEST(TestMatchGeneric, BitOrdering) {
   ASSERT_NE(0, entries_used);
   EXPECT_EQ(0b0101, result_data);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(entries, entries_used);
+  EXPECT_EQ(kentries, entries_used);
 }
 
 TEST(TestMatchGeneric, UsingBytes) {
@@ -1078,8 +1078,8 @@ TEST(TestMatchGeneric, UsingBytes) {
   IRrecv irrecv(1);
   irsend.begin();
 
-  uint16_t entries = 32;
-  uint16_t data[entries] = {
+  const uint16_t kentries = 32;
+  uint16_t data[kentries] = {
       // No header
       500, 2000,   // Byte #0 Bit #0 (1)
       500, 1000,   // Byte #0 Bit #1 (0)
@@ -1100,7 +1100,7 @@ TEST(TestMatchGeneric, UsingBytes) {
 
   uint16_t offset = kStartOffset;
   irsend.reset();
-  irsend.sendRaw(data, entries, 38000);
+  irsend.sendRaw(data, kentries, 38000);
   irsend.makeDecodeResult();
   uint16_t entries_used = 0;
 
@@ -1123,7 +1123,7 @@ TEST(TestMatchGeneric, UsingBytes) {
   EXPECT_EQ(0b10101010, result_data[0]);
   EXPECT_EQ(0b11110000, result_data[1]);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(entries, entries_used);
+  EXPECT_EQ(kentries, entries_used);
 
   // LSB order
   entries_used = irrecv.matchGeneric(
@@ -1142,7 +1142,7 @@ TEST(TestMatchGeneric, UsingBytes) {
   EXPECT_EQ(0b01010101, result_data[0]);
   EXPECT_EQ(0b00001111, result_data[1]);
   EXPECT_EQ(irsend.capture.rawlen - kStartOffset, entries_used);
-  EXPECT_EQ(entries, entries_used);
+  EXPECT_EQ(kentries, entries_used);
 
   // Asking for too much.
   entries_used = irrecv.matchGeneric(
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRrecv_test.h b/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/IRrecv_test.h
rename to lib/IRremoteESP8266-2.7.3/test/IRrecv_test.h
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRsend_test.cpp b/lib/IRremoteESP8266-2.7.3/test/IRsend_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/IRsend_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/IRsend_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRsend_test.h b/lib/IRremoteESP8266-2.7.3/test/IRsend_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/IRsend_test.h
rename to lib/IRremoteESP8266-2.7.3/test/IRsend_test.h
diff --git a/lib/IRremoteESP8266-2.7.2/test/IRutils_test.cpp b/lib/IRremoteESP8266-2.7.3/test/IRutils_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/IRutils_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/IRutils_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/Makefile b/lib/IRremoteESP8266-2.7.3/test/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/Makefile
rename to lib/IRremoteESP8266-2.7.3/test/Makefile
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Aiwa_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Aiwa_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Aiwa_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Aiwa_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Amcor_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Amcor_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Amcor_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Amcor_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Argo_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Argo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Argo_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Argo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Carrier_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Carrier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Carrier_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Carrier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Coolix_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp
similarity index 69%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Coolix_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp
index 514e16dba..226e1aa68 100644
--- a/lib/IRremoteESP8266-2.7.2/test/ir_Coolix_test.cpp
+++ b/lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp
@@ -17,66 +17,66 @@ TEST(TestSendCoolix, SendDataOnly) {
   irsend.sendCOOLIX(0x0);
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s105040",
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s105244",
       irsend.outputStr());
 
   irsend.reset();
   irsend.sendCOOLIX(0xAA55AA);
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s105040",
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s105244",
       irsend.outputStr());
 
   irsend.reset();
   irsend.sendCOOLIX(0xFFFFFF);
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s105040",
+      "m4692s4416"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s105244",
       irsend.outputStr());
 }
 
@@ -89,50 +89,50 @@ TEST(TestSendCoolix, SendWithRepeats) {
   irsend.sendCOOLIX(0xAA55AA, kCoolixBits, 1);  // 1 repeat.
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s105040",
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s105244",
       irsend.outputStr());
   irsend.sendCOOLIX(0xAA55AA, kCoolixBits, 2);  // 2 repeats.
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s105040",
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656"
+      "m552s105244",
       irsend.outputStr());
 }
 
@@ -145,56 +145,56 @@ TEST(TestSendCoolix, SendUnusualSize) {
   irsend.sendCOOLIX(0x0, 8);
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s5040"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s105040",
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s5244"
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s552m552s552m552s552m552s552m552s552"
+      "m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
+      "m552s105244",
       irsend.outputStr());
 
   irsend.reset();
   irsend.sendCOOLIX(0x1234567890ABCDEF, 64);
   EXPECT_EQ(
       "f38000d50"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s560"
-      "m560s1680m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s560m560s1680"
-      "m560s560m560s1680m560s1680m560s1680m560s1680m560s560m560s560m560s560"
-      "m560s1680m560s560m560s560m560s560m560s560m560s1680m560s1680m560s1680"
-      "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s560"
-      "m560s1680m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s1680m560s560m560s560m560s560m560s560"
-      "m560s5040"
-      "m4480s4480"
-      "m560s560m560s560m560s560m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s560"
-      "m560s1680m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s1680m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s560m560s1680"
-      "m560s560m560s1680m560s1680m560s1680m560s1680m560s560m560s560m560s560"
-      "m560s1680m560s560m560s560m560s560m560s560m560s1680m560s1680m560s1680"
-      "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560m560s560"
-      "m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680m560s1680"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s560"
-      "m560s1680m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
-      "m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s1680m560s560m560s560m560s560m560s560"
-      "m560s105040",
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s552m552s1656m552s552m552s552"
+      "m552s1656m552s1656m552s552m552s552m552s1656m552s552m552s1656m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s552m552s1656"
+      "m552s552m552s1656m552s1656m552s1656m552s1656m552s552m552s552m552s552"
+      "m552s1656m552s552m552s552m552s552m552s552m552s1656m552s1656m552s1656"
+      "m552s1656m552s552m552s552m552s1656m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s552"
+      "m552s1656m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s552m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s1656m552s552m552s552m552s552m552s552"
+      "m552s5244"
+      "m4692s4416"
+      "m552s552m552s552m552s552m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s552m552s1656m552s552m552s552"
+      "m552s1656m552s1656m552s552m552s552m552s1656m552s552m552s1656m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s1656m552s552"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s552m552s1656"
+      "m552s552m552s1656m552s1656m552s1656m552s1656m552s552m552s552m552s552"
+      "m552s1656m552s552m552s552m552s552m552s552m552s1656m552s1656m552s1656"
+      "m552s1656m552s552m552s552m552s1656m552s552m552s552m552s552m552s552"
+      "m552s552m552s1656m552s1656m552s552m552s1656m552s1656m552s1656m552s1656"
+      "m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s1656"
+      "m552s552m552s1656m552s552m552s1656m552s552m552s1656m552s552m552s552"
+      "m552s1656m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
+      "m552s552m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
+      "m552s1656m552s1656m552s1656m552s552m552s1656m552s1656m552s1656m552s1656"
+      "m552s552m552s552m552s552m552s1656m552s552m552s552m552s552m552s552"
+      "m552s105244",
       irsend.outputStr());
 
   // Bit sizes must be a multiple of 8.
@@ -719,33 +719,33 @@ TEST(TestCoolixACClass, Issue722) {
       // Raw data supplied by @mariusmotea
       "f38000d50"
       // 4434,4376,
-      "m4480s4480"
+      "m4692s4416"
       // 566,1614,592,504,566,1618,566,1616,568,528,564,532,564,1616,568,532,
-      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
+      "m552s1656m552s552m552s1656m552s1656m552s552m552s552m552s1656m552s552"
       // 566,530,566,1620,568,528,566,530,566,1618,564,1618,566,530,564,1624,
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s552m552s1656"
       // 538,560,566,530,564,1620,566,1618,566,1618,566,1616,566,1616,566,1620,
-      "m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
+      "m552s552m552s552m552s1656m552s1656m552s1656m552s1656m552s1656m552s1656"
       // 568,1620,566,1616,566,530,566,530,564,530,562,532,564,530,566,530,
-      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s560"
+      "m552s1656m552s1656m552s552m552s552m552s552m552s552m552s552m552s552"
       // 566,1622,566,1616,540,1642,566,528,566,530,566,1616,566,530,566,532,
-      "m560s1680m560s1680m560s1680m560s560m560s560m560s1680m560s560m560s560"
+      "m552s1656m552s1656m552s1656m552s552m552s552m552s1656m552s552m552s552"
       // 564,532,564,530,566,530,566,1614,566,1616,562,532,564,1620,566,1618,
-      "m560s560m560s560m560s560m560s1680m560s1680m560s560m560s1680m560s1680"
+      "m552s552m552s552m552s552m552s1656m552s1656m552s552m552s1656m552s1656"
       // 538,5254,4432,4364,566,1616,568,530,564,1620,568,1616,564,532,564,530,
-      "m560s5040m4480s4480m560s1680m560s560m560s1680m560s1680m560s560m560s560"
+      "m552s5244m4692s4416m552s1656m552s552m552s1656m552s1656m552s552m552s552"
       // 566,1616,566,532,564,532,566,1620,568,528,566,530,566,1616,564,1618,
-      "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s1680m560s1680"
+      "m552s1656m552s552m552s552m552s1656m552s552m552s552m552s1656m552s1656"
       // 566,530,566,1622,566,532,566,528,566,1620,568,1614,566,1618,566,1618,
-      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s1680m560s1680"
+      "m552s552m552s1656m552s552m552s552m552s1656m552s1656m552s1656m552s1656"
       // 566,1614,568,1618,566,1622,568,1616,566,530,564,530,566,530,566,528,
-      "m560s1680m560s1680m560s1680m560s1680m560s560m560s560m560s560m560s560"
+      "m552s1656m552s1656m552s1656m552s1656m552s552m552s552m552s552m552s552"
       // 564,530,566,532,566,1622,564,1616,566,1616,564,532,564,530,564,1616,
-      "m560s560m560s560m560s1680m560s1680m560s1680m560s560m560s560m560s1680"
+      "m552s552m552s552m552s1656m552s1656m552s1656m552s552m552s552m552s1656"
       // 564,530,564,532,566,530,564,530,566,528,564,1618,564,1618,564,532,
-      "m560s560m560s560m560s560m560s560m560s560m560s1680m560s1680m560s560"
+      "m552s552m552s552m552s552m552s552m552s552m552s1656m552s1656m552s552"
       // 564,1620,566,1618,562  // Raw data matches what is expected.
-      "m560s1680m560s1680m560s105040", ac._irsend.outputStr());
+      "m552s1656m552s1656m552s105244", ac._irsend.outputStr());
 }
 
 TEST(TestCoolixACClass, Issue985) {
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Daikin_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Daikin_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Daikin_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Daikin_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Denon_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Denon_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Denon_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Denon_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Dish_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Dish_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Dish_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Dish_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Electra_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Electra_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Electra_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Electra_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Fujitsu_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Fujitsu_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Fujitsu_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_GICable_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_GICable_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_GICable_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_GICable_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_GlobalCache_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_GlobalCache_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_GlobalCache_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Goodweather_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Goodweather_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Goodweather_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Goodweather_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Gree_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Gree_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Gree_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Gree_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Haier_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Haier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Haier_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Haier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Hitachi_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Hitachi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Hitachi_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Hitachi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Inax_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Inax_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Inax_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Inax_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_JVC_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_JVC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_JVC_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_JVC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Kelvinator_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Kelvinator_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Kelvinator_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_LG_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_LG_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_LG_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_LG_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Lasertag_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Lasertag_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Lasertag_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Lasertag_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Lego_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Lego_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Lego_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Lego_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Lutron_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Lutron_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Lutron_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Lutron_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_MWM_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_MWM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_MWM_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_MWM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Magiquest_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Magiquest_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Magiquest_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Magiquest_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Midea_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Midea_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Midea_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Midea_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_MitsubishiHeavy_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_MitsubishiHeavy_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_MitsubishiHeavy_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_MitsubishiHeavy_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Mitsubishi_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Mitsubishi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Mitsubishi_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Mitsubishi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_NEC_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_NEC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_NEC_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_NEC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Neoclima_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Neoclima_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Neoclima_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Neoclima_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Nikai_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Nikai_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Nikai_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Nikai_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Panasonic_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Panasonic_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp
index 471a324c8..97f9bbb28 100644
--- a/lib/IRremoteESP8266-2.7.2/test/ir_Panasonic_test.cpp
+++ b/lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp
@@ -736,6 +736,26 @@ TEST(TestIRPanasonicAcClass, QuietAndPowerful) {
   EXPECT_FALSE(pana.getPowerful());
 }
 
+TEST(TestIRPanasonicAcClass, SetAndGetIon) {
+  IRPanasonicAc ac(0);
+  // Ion Filter only works for DKE.
+  ac.setModel(kPanasonicDke);
+  ac.setIon(true);
+  EXPECT_TRUE(ac.getIon());
+  ac.setIon(false);
+  EXPECT_FALSE(ac.getIon());
+  ac.setIon(true);
+  EXPECT_TRUE(ac.getIon());
+
+  // Now try a different (a guess at unsupported) model.
+  ac.setModel(kPanasonicRkr);
+  EXPECT_FALSE(ac.getIon());
+  ac.setIon(true);
+  EXPECT_FALSE(ac.getIon());
+  ac.setIon(false);
+  EXPECT_FALSE(ac.getIon());
+}
+
 TEST(TestIRPanasonicAcClass, HumanReadable) {
   IRPanasonicAc pana(0);
   EXPECT_EQ(
@@ -767,7 +787,7 @@ TEST(TestIRPanasonicAcClass, HumanReadable) {
   EXPECT_EQ(
       "Model: 3 (DKE), Power: Off, Mode: 4 (Heat), Temp: 30C, "
       "Fan: 4 (High), Swing(V): 15 (Auto), "
-      "Swing(H): 11 (Right), Quiet: On, Powerful: Off, "
+      "Swing(H): 11 (Right), Quiet: On, Powerful: Off, Ion: Off, "
       "Clock: 00:00, On Timer: Off, Off Timer: Off",
       pana.toString());
 }
@@ -1180,3 +1200,38 @@ TEST(TestIRPanasonicAcClass, toCommon) {
   ASSERT_EQ(kPanasonicAcSwingVMiddle,
             IRPanasonicAc::convertSwingV(stdAc::swingv_t::kMiddle));
 }
+
+//
+// Test for DKE/DKW model / see issue #1024
+TEST(TestDecodePanasonicAC, DkeIonRealMessages) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  irsend.begin();
+
+  // Data from Issue #1024
+  // 0x0220E004000000060220E004004F3280AF0D000660000001000630
+  uint8_t dkeIonOff[kPanasonicAcStateLength] = {
+      0x02, 0x20, 0xE0, 0x04, 0x00, 0x00, 0x00, 0x06, 0x02,
+      0x20, 0xE0, 0x04, 0x00, 0x4F, 0x32, 0x80, 0xAF, 0x0D,
+      0x00, 0x06, 0x60, 0x00, 0x00, 0x01, 0x00, 0x06, 0x30};
+
+  // 0x0220E004000000060220E004004F3280AF0D000660000101000631
+  uint8_t dkeIonOn[kPanasonicAcStateLength] = {
+      0x02, 0x20, 0xE0, 0x04, 0x00, 0x00, 0x00, 0x06, 0x02,
+      0x20, 0xE0, 0x04, 0x00, 0x4F, 0x32, 0x80, 0xAF, 0x0D,
+      0x00, 0x06, 0x60, 0x00, 0x01, 0x01, 0x00, 0x06, 0x31};
+
+  IRPanasonicAc ac(0);
+  ac.setRaw(dkeIonOff);
+  EXPECT_EQ(
+      "Model: 3 (DKE), Power: On, Mode: 4 (Heat), Temp: 25C, Fan: 7 (Auto), "
+      "Swing(V): 15 (Auto), Swing(H): 13 (Auto), Quiet: Off, Powerful: Off, "
+      "Ion: Off, Clock: 00:00, On Timer: 00:00, Off Timer: 00:00",
+      ac.toString());
+  ac.setRaw(dkeIonOn);
+  EXPECT_EQ(
+      "Model: 3 (DKE), Power: On, Mode: 4 (Heat), Temp: 25C, Fan: 7 (Auto), "
+      "Swing(V): 15 (Auto), Swing(H): 13 (Auto), Quiet: Off, Powerful: Off, "
+      "Ion: On, Clock: 00:00, On Timer: 00:00, Off Timer: 00:00",
+      ac.toString());
+}
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Pioneer_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Pioneer_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Pioneer_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Pioneer_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Pronto_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Pronto_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Pronto_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Pronto_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_RC5_RC6_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_RC5_RC6_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_RC5_RC6_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_RC5_RC6_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_RCMM_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_RCMM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_RCMM_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_RCMM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Samsung_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Samsung_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Samsung_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Samsung_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Sanyo_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Sanyo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Sanyo_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Sanyo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Sharp_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Sharp_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Sharp_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Sharp_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Sherwood_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Sherwood_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Sherwood_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Sherwood_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Sony_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp
similarity index 61%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Sony_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp
index 51bacbd6d..18fc58334 100644
--- a/lib/IRremoteESP8266-2.7.2/test/ir_Sony_test.cpp
+++ b/lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp
@@ -360,3 +360,228 @@ TEST(TestEncodeSony, Issue476) {
   EXPECT_EQ(0xE2, (0x7156 >> 7) & 0xFF);      // extended (top 8 of 15 bits)
   EXPECT_EQ(0x6AB47, irsend.encodeSony(20, 0x56, 0x1A, 0xE2));
 }
+
+// Encoding & Decode 15 bit Sony messages. Issue #1018
+TEST(TestEncodeSony, Issue1018) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  irsend.begin();
+
+  irsend.reset();
+  irsend.sendSony(0x240C, 15);
+  irsend.makeDecodeResult();
+
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(SONY, irsend.capture.decode_type);
+  EXPECT_EQ(15, irsend.capture.bits);
+  EXPECT_EQ(0x240C, irsend.capture.value);   // 15 bits
+  EXPECT_EQ(0x30, irsend.capture.address);
+  EXPECT_EQ(0x12, irsend.capture.command);
+  EXPECT_EQ(
+      "f40000d33"
+      "m2400s600"  // Message
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600"  // Repeat #1
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600"  // Repeat #2
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200",
+      irsend.outputStr());
+
+  irsend.reset();
+  uint16_t rawData[127] = {
+      2448, 550,
+      648, 544, 1250, 546, 648, 548, 648, 550, 1272, 524, 648, 550, 644, 550,
+      674, 524, 648, 550, 648, 544, 674, 524, 1270, 524, 1246, 550, 674, 524,
+      648, 22404,
+      2474, 524,
+      674, 520, 1250, 548, 648, 544, 674, 524, 1270, 524, 648, 550, 648, 546,
+      674, 524, 648, 546, 652, 546, 674, 524, 1270, 524, 1272, 522, 674, 520,
+      648, 22404,
+      2452, 544,
+      674, 524, 1270, 524, 674, 518, 674, 522, 1246, 550, 674, 524, 648, 544,
+      674, 524, 648, 546, 674, 524, 674, 518, 1276, 518, 1276, 524, 648, 546,
+      674, 22380,
+      2474, 520,
+      674, 524, 1250, 544, 674, 524, 674, 518, 1276, 520, 674, 522, 674, 524,
+      674, 520, 674, 524, 674, 524, 674, 518, 1276, 518, 1276, 524, 672, 524,
+      648};  // SONY 240C
+
+  irsend.sendRaw(rawData, 127, 40);
+  irsend.makeDecodeResult();
+
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(SONY, irsend.capture.decode_type);
+  EXPECT_EQ(15, irsend.capture.bits);
+  EXPECT_EQ(0x240C, irsend.capture.value);   // 15 bits
+  EXPECT_EQ(0x30, irsend.capture.address);
+  EXPECT_EQ(0x12, irsend.capture.command);
+  EXPECT_EQ(
+      "f40000d50"
+      "m2448s550"  // Message
+      "m648s544m1250s546m648s548m648s550m1272s524m648s550m644s550"
+      "m674s524m648s550m648s544m674s524m1270s524m1246s550m674s524"
+      "m648s22404"
+      "m2474s524"  // Repeat #1
+      "m674s520m1250s548m648s544m674s524m1270s524m648s550m648s546"
+      "m674s524m648s546m652s546m674s524m1270s524m1272s522m674s520"
+      "m648s22404"
+      "m2452s544"  // Repeat #2
+      "m674s524m1270s524m674s518m674s522m1246s550m674s524m648s544"
+      "m674s524m648s546m674s524m674s518m1276s518m1276s524m648s546"
+      "m674s22380"
+      "m2474s520"  // Repeat #3
+      "m674s524m1250s544m674s524m674s518m1276s520m674s522m674s524"
+      "m674s520m674s524m674s524m674s518m1276s518m1276s524m672s524"
+      "m648",
+      irsend.outputStr());
+
+  // Now see if we can reproduce it with `sendSony`
+  irsend.reset();
+  irsend.sendSony(0x240C, 15, 3);
+  irsend.makeDecodeResult();
+
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(SONY, irsend.capture.decode_type);
+  EXPECT_EQ(15, irsend.capture.bits);
+  EXPECT_EQ(0x240C, irsend.capture.value);   // 15 bits
+  EXPECT_EQ(0x30, irsend.capture.address);
+  EXPECT_EQ(0x12, irsend.capture.command);
+
+  // Compare expected result with real `rawData` result.
+  // Comparison notes:
+  //   * Seems visually the same. i.e. '1' where '1's should be etc.
+  //   * Timings are *roughly* the same. They should be within device
+  //     tollerance.
+  // TL;DR: Looks fine/the same/as expected.
+  EXPECT_EQ(
+      "f40000d33"
+      "m2400s600"  // Message
+  //  "m2448s550"  (Commented out data is from `rawData` sample above.)
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+  //  "m648s544m1250s546m648s548m648s550m1272s524m648s550m644s550"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+  //  "m674s524m648s550m648s544m674s524m1270s524m1246s550m674s524"
+      "m600s22200"
+  //  "m648s22404"
+      "m2400s600"  // Repeat #1
+  //  "m2474s524"
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+  //  "m674s520m1250s548m648s544m674s524m1270s524m648s550m648s546"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+  //  "m674s524m648s546m652s546m674s524m1270s524m1272s522m674s520"
+      "m600s22200"
+  //  "m648s22404"
+      "m2400s600"  // Repeat #2
+  //  "m2452s544"
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+  //  "m674s524m1270s524m674s518m674s522m1246s550m674s524m648s544"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+  //  "m674s524m648s546m674s524m674s518m1276s518m1276s524m648s546"
+      "m600s22200"
+  //  "m674s22380"
+      "m2400s600"  // Repeat #3
+  //  "m2474s520"
+      "m600s600m1200s600m600s600m600s600m1200s600m600s600m600s600"
+  //  "m674s524m1250s544m674s524m674s518m1276s520m674s522m674s524"
+      "m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+  //  "m674s520m674s524m674s524m674s518m1276s518m1276s524m672s524"
+      "m600s22200",
+  //  "m648"  // (Trailing space is ignored in real captures.)
+      irsend.outputStr());
+
+  // Now see if we can reproduce it with `sendSony38`
+  irsend.reset();
+  irsend.sendSony38(0x240C, 15);
+  irsend.makeDecodeResult();
+
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(SONY, irsend.capture.decode_type);
+  EXPECT_EQ(15, irsend.capture.bits);
+  EXPECT_EQ(0x240C, irsend.capture.value);   // 15 bits
+  EXPECT_EQ(0x30, irsend.capture.address);
+  EXPECT_EQ(0x12, irsend.capture.command);
+}
+
+// Test sending typical data only.
+TEST(TestSendSony38, SendDataOnly) {
+  IRsendTest irsend(0);
+  irsend.begin();
+
+  irsend.reset();
+  irsend.sendSony38(0);
+  // We expect three 20-bit commands to be sent.
+  EXPECT_EQ(
+      "f38000d33"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600",
+      irsend.outputStr());
+
+  irsend.reset();
+  irsend.sendSony38(0x240C, kSony20Bits);
+  // We expect three 20-bit commands to be sent.
+  EXPECT_EQ(
+      "f38000d33"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200",
+      irsend.outputStr());
+
+  irsend.reset();
+  irsend.sendSony38(0x240C, kSony15Bits);
+  // We expect three 15-bit commands to be sent.
+  EXPECT_EQ(
+      "f38000d33"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200",
+      irsend.outputStr());
+
+  irsend.reset();
+  irsend.sendSony38(0xA90, kSony12Bits);
+  // We expect three 15-bit commands to be sent.
+  EXPECT_EQ(
+      "f38000d33"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800",
+      irsend.outputStr());
+}
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Tcl_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Tcl_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Tcl_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Tcl_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Teco_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Teco_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Teco_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Teco_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Toshiba_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Toshiba_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Toshiba_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Toshiba_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Trotec_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Trotec_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Trotec_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Trotec_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Vestel_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Vestel_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Vestel_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Vestel_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Whirlpool_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Whirlpool_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Whirlpool_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/test/ir_Whynter_test.cpp b/lib/IRremoteESP8266-2.7.3/test/ir_Whynter_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/test/ir_Whynter_test.cpp
rename to lib/IRremoteESP8266-2.7.3/test/ir_Whynter_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/tools/Makefile b/lib/IRremoteESP8266-2.7.3/tools/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/Makefile
rename to lib/IRremoteESP8266-2.7.3/tools/Makefile
diff --git a/lib/IRremoteESP8266-2.7.2/tools/RawToGlobalCache.sh b/lib/IRremoteESP8266-2.7.3/tools/RawToGlobalCache.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/RawToGlobalCache.sh
rename to lib/IRremoteESP8266-2.7.3/tools/RawToGlobalCache.sh
diff --git a/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data.py b/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data.py
similarity index 97%
rename from lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data.py
rename to lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data.py
index d673d52d4..5bea3926a 100755
--- a/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data.py
+++ b/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data.py
@@ -65,6 +65,8 @@ class RawIRMessage():
   def _usec_compare(self, seen, expected):
     """Compare two usec values and see if they match within a
        subtractive margin."""
+    if expected is None:
+      return False
     return expected - self.margin < seen <= expected
 
   def _usec_compares(self, usecs, expecteds):
@@ -214,19 +216,25 @@ class RawIRMessage():
     if len(self.marks) > 2:  # Possible leader mark?
       self.ldr_mark = self.marks[0]
       self.hdr_mark = self.marks[1]
-    else:
+    elif len(self.marks) > 1:  # At least two marks
       # Largest mark is likely the kHdrMark
       self.hdr_mark = self.marks[0]
+    else:
+      # Probably no header mark.
+      self.hdr_mark = 0
 
-    if self.is_space_encoded() and len(self.spaces) >= 3:
+    if self.is_space_encoded() and len(self.spaces) >= 2:
       if self.verbose and len(self.marks) > 2:
         self.output.write("DANGER: Unusual number of mark timings!")
       # We should have 3 space candidates at least.
       # They should be: zero_space (smallest), one_space, & hdr_space (largest)
       spaces = list(self.spaces)
-      self.zero_space = spaces.pop()
-      self.one_space = spaces.pop()
-      self.hdr_space = spaces.pop()
+      if spaces:
+        self.zero_space = spaces.pop()
+      if spaces:
+        self.one_space = spaces.pop()
+      if spaces:
+        self.hdr_space = spaces.pop()
       # Rest are probably message gaps
       self.gaps = spaces
 
@@ -302,11 +310,15 @@ def convert_rawdata(data_str):
 def dump_constants(message, defines, name="", output=sys.stdout):
   """Dump the key constants and generate the C++ #defines."""
   ldr_mark = None
+  hdr_mark = 0
+  hdr_space = 0
   if message.ldr_mark is not None:
     ldr_mark = avg_list(message.mark_buckets[message.ldr_mark])
-  hdr_mark = avg_list(message.mark_buckets[message.hdr_mark])
+  if message.hdr_mark != 0:
+    hdr_mark = avg_list(message.mark_buckets[message.hdr_mark])
   bit_mark = avg_list(message.mark_buckets[message.bit_mark])
-  hdr_space = avg_list(message.space_buckets[message.hdr_space])
+  if message.hdr_space is not None:
+    hdr_space = avg_list(message.space_buckets[message.hdr_space])
   one_space = avg_list(message.space_buckets[message.one_space])
   zero_space = avg_list(message.space_buckets[message.zero_space])
 
diff --git a/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data_test.py b/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data_test.py
similarity index 84%
rename from lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data_test.py
rename to lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data_test.py
index c2fd7ba64..fa3a87933 100755
--- a/lib/IRremoteESP8266-2.7.2/tools/auto_analyse_raw_data_test.py
+++ b/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data_test.py
@@ -1165,6 +1165,224 @@ class TestAutoAnalyseRawData(unittest.TestCase):
         '}\n'
         '#endif  // DECODE_FOO\n')
 
+  def test_no_headers(self):
+    """Tests for no space or mark headers in parse_and_report() function."""
+
+    # Tests for mark or space headers. (Issue #1014)
+    output = StringIO()
+    input_str = """
+      uint16_t rawData[257] = {472, 1016, 490, 536, 446, 1038, 464, 544, 490,
+        516, 492, 1008, 418, 592, 462, 1042, 476, 532, 444, 1062, 474, 532, 470,
+        1014, 492, 1010, 446, 562, 460, 1046, 474, 532, 472, 534, 416, 590, 458,
+        548, 486, 520, 490, 516, 490, 534, 470, 534, 470, 534, 470, 536, 416,
+        590, 460, 546, 488, 518, 490, 536, 468, 536, 470, 534, 470, 536, 442,
+        564, 414, 1092, 470, 536, 468, 536, 416, 590, 414, 592, 486, 520, 490,
+        536, 470, 534, 470, 534, 468, 536, 416, 590, 432, 574, 486, 520, 490,
+        536, 470, 534, 468, 536, 468, 536, 468, 538, 420, 590, 454, 546, 488,
+        518, 488, 536, 468, 536, 468, 536, 468, 536, 440, 566, 414, 592, 462,
+        546, 490, 536, 468, 536, 468, 538, 468, 536, 468, 538, 414, 592, 460,
+        546, 488, 518, 490, 536, 468, 536, 470, 536, 468, 536, 442, 564, 414,
+        592, 462, 546, 490, 518, 488, 536, 470, 534, 470, 536, 470, 536, 416,
+        590, 460, 548, 488, 518, 490, 536, 470, 534, 470, 534, 470, 536, 468,
+        536, 414, 592, 462, 546, 490, 518, 488, 534, 470, 536, 468, 536, 468,
+        536, 414, 590, 462, 546, 488, 518, 466, 560, 444, 560, 446, 560, 446,
+        560, 444, 562, 416, 592, 462, 546, 464, 542, 464, 560, 444, 560, 446,
+        560, 446, 560, 416, 590, 460, 546, 464, 544, 464, 562, 444, 560, 446,
+        560, 446, 560, 444, 560, 416, 592, 462, 1042, 446, 560, 444, 560, 416,
+        592, 462, 544, 488, 520, 466, 558, 446, 560, 446};"""
+    analyse.parse_and_report(input_str, 200, True, "", output)
+    self.assertEqual(
+        output.getvalue(), 'Found 257 timing entries.\n'
+        'Potential Mark Candidates:\n'
+        '[492]\n'
+        'Potential Space Candidates:\n'
+        '[1092, 592]\n'
+        '\n'
+        'Guessing encoding type:\n'
+        'Looks like it uses space encoding. Yay!\n'
+        '\n'
+        'Guessing key value:\n'
+        'kHdrMark   = 0\n'
+        'kHdrSpace  = 0\n'
+        'kBitMark   = 460\n'
+        'kOneSpace  = 1037\n'
+        'kZeroSpace = 547\n'
+        '\n'
+        'Decoding protocol based on analysis so far:\n'
+        '\n'
+        'kBitMark(UNEXPECTED)10100101010110100000000000000000010000000000000000'
+        '0000000000000000000000000000000000000000000000000000000000000000000000'
+        '10000000\n'
+        '  Bits: 128\n'
+        '  Hex:  0xA55A0000400000000000000000000080 (MSB first)\n'
+        '        0x01000000000000000000000200005AA5 (LSB first)\n'
+        '  Dec:  219789926041586294144261994014272651392 (MSB first)\n'
+        '        1329227995784915872903807068870302373 (LSB first)\n'
+        '  Bin:  0b101001010101101000000000000000000100000000000000000000000000'
+        '00000000000000000000000000000000000000000000000000000000000010000000'
+        ' (MSB first)\n'
+        '        0b000000010000000000000000000000000000000000000000000000000000'
+        '00000000000000000000000000000000001000000000000000000101101010100101'
+        ' (LSB first)\n'
+        '\n'
+        'Total Nr. of suspected bits: 128\n'
+        '\n'
+        'Generating a VERY rough code outline:\n'
+        '\n'
+        '// Copyright 2019 David Conran (crankyoldgit)\n'
+        '// Support for TBD protocol\n'
+        '\n'
+        '#include "IRrecv.h"\n'
+        '#include "IRsend.h"\n'
+        '#include "IRutils.h"\n'
+        '\n'
+        "// WARNING: This probably isn't directly usable. It's a guide only.\n"
+        '\n'
+        '// See https://github.com/crankyoldgit/IRremoteESP8266/wiki/'
+        'Adding-support-for-a-new-IR-protocol\n'
+        '// for details of how to include this in the library.\n'
+        'const uint16_t kHdrMark = 0;\n'
+        'const uint16_t kBitMark = 460;\n'
+        'const uint16_t kHdrSpace = 0;\n'
+        'const uint16_t kOneSpace = 1037;\n'
+        'const uint16_t kZeroSpace = 547;\n'
+        'const uint16_t kFreq = 38000;  // Hz. (Guessing the most common'
+        ' frequency.)\n'
+        'const uint16_t kBits = 128;  // Move to IRremoteESP8266.h\n'
+        'const uint16_t kStateLength = 16;  // Move to IRremoteESP8266.h\n'
+        'const uint16_t kOverhead = 1;\n'
+        "// DANGER: More than 64 bits detected. A uint64_t for 'data' won't"
+        ' work!\n'
+        '#if SEND_TBD\n'
+        '// Function should be safe up to 64 bits.\n'
+        'void IRsend::sendTBD(const uint64_t data, const uint16_t nbits, const'
+        ' uint16_t repeat) {\n'
+        '  enableIROut(kFreq);\n'
+        '  for (uint16_t r = 0; r <= repeat; r++) {\n'
+        '    uint64_t send_data = data;\n'
+        '    // Data Section #1\n'
+        '    // e.g. data = 0xA55A0000400000000000000000000080, nbits = 128\n'
+        '    sendData(kBitMark, kOneSpace, kBitMark, kZeroSpace, send_data,'
+        ' 128, true);\n'
+        '    send_data >>= 128;\n'
+        '    // Footer\n'
+        '    mark(kBitMark);\n'
+        '    space(kDefaultMessageGap);  // A 100% made up guess of the gap'
+        ' between messages.\n'
+        '  }\n'
+        '}\n'
+        '#endif  // SEND_TBD\n'
+        '\n'
+        '#if SEND_TBD\n'
+        '// Alternative >64bit function to send TBD messages\n'
+        '// Where data is:\n'
+        '//   uint8_t data[kStateLength] = {0xA5, 0x5A, 0x00, 0x00, 0x40, 0x00,'
+        ' 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80};\n'
+        '//\n'
+        '// Args:\n'
+        '//   data: An array of bytes containing the IR command.\n'
+        '//         It is assumed to be in MSB order for this code.\n'
+        '//   nbytes: Nr. of bytes of data in the array. (>=kStateLength)\n'
+        '//   repeat: Nr. of times the message is to be repeated.\n'
+        '//\n'
+        '// Status: ALPHA / Untested.\n'
+        'void IRsend::sendTBD(const uint8_t data[], const uint16_t nbytes,'
+        ' const uint16_t repeat) {\n'
+        '  for (uint16_t r = 0; r <= repeat; r++) {\n'
+        '    uint16_t pos = 0;\n'
+        '    // Data Section #1\n'
+        '    // e.g.\n'
+        '    //   bits = 128; bytes = 16;\n'
+        '    //   *(data + pos) = {0xA5, 0x5A, 0x00, 0x00, 0x40, 0x00, 0x00,'
+        ' 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80};\n'
+        '    sendGeneric(0, 0,\n'
+        '                kBitMark, kOneSpace,\n'
+        '                kBitMark, kZeroSpace,\n'
+        '                kBitMark, kDefaultMessageGap,\n'
+        '                data + pos, 16,  // Bytes\n'
+        '                kFreq, true, kNoRepeat, kDutyDefault);\n'
+        '    pos += 16;  // Adjust by how many bytes of data we sent\n'
+        '  }\n'
+        '}\n'
+        '#endif  // SEND_TBD\n'
+        '\n'
+        "// DANGER: More than 64 bits detected. A uint64_t for 'data' won't"
+        ' work!\n'
+        '#if DECODE_TBD\n'
+        '// Function should be safe up to 64 bits.\n'
+        'bool IRrecv::decodeTBD(decode_results *results, const uint16_t nbits,'
+        ' const bool strict) {\n'
+        '  if (results->rawlen < 2 * nbits + kOverhead)\n'
+        '    return false;  // Too short a message to match.\n'
+        '  if (strict && nbits != kBits)\n'
+        '    return false;\n'
+        '\n'
+        '  uint16_t offset = kStartOffset;\n'
+        '  uint64_t data = 0;\n'
+        '  match_result_t data_result;\n'
+        '\n'
+        '  // Data Section #1\n'
+        '  // e.g. data_result.data = 0xA55A0000400000000000000000000080, nbits'
+        ' = 128\n'
+        '  data_result = matchData(&(results->rawbuf[offset]), 128,\n'
+        '                          kBitMark, kOneSpace,\n'
+        '                          kBitMark, kZeroSpace);\n'
+        '  offset += data_result.used;\n'
+        '  if (data_result.success == false) return false;  // Fail\n'
+        '  data <<= 128;  // Make room for the new bits of data.\n'
+        '  data |= data_result.data;\n'
+        '\n'
+        '  // Footer\n'
+        '  if (!matchMark(results->rawbuf[offset++], kBitMark))\n'
+        '    return false;\n'
+        '\n'
+        '  // Success\n'
+        '  results->decode_type = decode_type_t::TBD;\n'
+        '  results->bits = nbits;\n'
+        '  results->value = data;\n'
+        '  results->command = 0;\n'
+        '  results->address = 0;\n'
+        '  return true;\n'
+        '}\n'
+        '#endif  // DECODE_TBD\n'
+        '\n'
+        '// Note: This should be 64+ bit safe.\n'
+        '#if DECODE_TBD\n'
+        '// Function should be safe over 64 bits.\n'
+        'bool IRrecv::decodeTBD(decode_results *results, const uint16_t nbits,'
+        ' const bool strict) {\n'
+        '  if (results->rawlen < 2 * nbits + kOverhead)\n'
+        '    return false;  // Too short a message to match.\n'
+        '  if (strict && nbits != kBits)\n'
+        '    return false;\n'
+        '\n'
+        '  uint16_t offset = kStartOffset;\n'
+        '  uint16_t pos = 0;\n'
+        '  uint16_t used = 0;\n'
+        '\n'
+        '  // Data Section #1\n'
+        '  // e.g.\n'
+        '  //   bits = 128; bytes = 16;\n'
+        '  //   *(results->state + pos) = {0xA5, 0x5A, 0x00, 0x00, 0x40, 0x00,'
+        ' 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80};\n'
+        '  used = matchGeneric(results->rawbuf + offset, results->state + pos,'
+        '\n'
+        '                      results->rawlen - offset, 128,\n'
+        '                      0, 0,\n'
+        '                      kBitMark, kOneSpace,\n'
+        '                      kBitMark, kZeroSpace,\n'
+        '                      kBitMark, kDefaultMessageGap, true);\n'
+        '  if (used == 0) return false;  // We failed to find any data.\n'
+        '  offset += used;  // Adjust for how much of the message we read.\n'
+        '  pos += 16;  // Adjust by how many bytes of data we read\n'
+        '\n'
+        '  // Success\n'
+        '  results->decode_type = decode_type_t::TBD;\n'
+        '  results->bits = nbits;\n'
+        '  return true;\n'
+        '}\n'
+        '#endif  // DECODE_TBD\n')
+
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)
diff --git a/lib/IRremoteESP8266-2.7.2/tools/gc_decode.cpp b/lib/IRremoteESP8266-2.7.3/tools/gc_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/gc_decode.cpp
rename to lib/IRremoteESP8266-2.7.3/tools/gc_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/tools/generate_irtext_h.sh b/lib/IRremoteESP8266-2.7.3/tools/generate_irtext_h.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/generate_irtext_h.sh
rename to lib/IRremoteESP8266-2.7.3/tools/generate_irtext_h.sh
diff --git a/lib/IRremoteESP8266-2.7.2/tools/mkkeywords b/lib/IRremoteESP8266-2.7.3/tools/mkkeywords
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/mkkeywords
rename to lib/IRremoteESP8266-2.7.3/tools/mkkeywords
diff --git a/lib/IRremoteESP8266-2.7.2/tools/mode2_decode.cpp b/lib/IRremoteESP8266-2.7.3/tools/mode2_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.2/tools/mode2_decode.cpp
rename to lib/IRremoteESP8266-2.7.3/tools/mode2_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py b/lib/IRremoteESP8266-2.7.3/tools/scrape_supported_devices.py
similarity index 76%
rename from lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py
rename to lib/IRremoteESP8266-2.7.3/tools/scrape_supported_devices.py
index a0efd0774..c859bbf06 100755
--- a/lib/IRremoteESP8266-2.7.2/tools/scrape_supported_devices.py
+++ b/lib/IRremoteESP8266-2.7.3/tools/scrape_supported_devices.py
@@ -9,14 +9,16 @@ import time
 CODE_URL = "https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_"
 
 BRAND_MODEL = re.compile(r"Brand: *(?P<brand>.+), *Model: *(?P<model>.+)")
-ENUMS = re.compile(r"enum \w+ {(.+?)};", re.DOTALL)
+ENUMS = re.compile(r"enum (\w+) {(.+?)};", re.DOTALL)
 ENUM_ENTRY = re.compile(r"^\s+(\w+)", re.MULTILINE)
-DECODED_PROTOCOLS = re.compile(r".*results->decode_type *=.*?(\w+);")
+DECODED_PROTOCOLS = re.compile(r".*(?:results->decode_type *=.*?|"
+                               r"typeguess\s*=\s*decode_type_t::)(\w+);")
 AC_FN = re.compile(r"ir_(.+)\.h")
-
+AC_MODEL_ENUM_RE = re.compile(r"(.+)_ac_remote_model_t")
+IRSEND_FN_RE = re.compile(r"IRsend\.h")
 ALL_FN = re.compile(r"ir_(.+)\.(h|cpp)")
 
-EXCLUDED_PROTOCOLS = ["UNKNOWN", "UNUSED", "kLastDecodeType"]
+EXCLUDED_PROTOCOLS = ["UNKNOWN", "UNUSED", "kLastDecodeType", "typeguess"]
 EXCLUDED_ACS = ["Magiquest", "NEC"]
 
 MARKDOWN_HEADER = """<!--- WARNING: Do NOT edit this file directly.
@@ -28,7 +30,7 @@ def getallprotocols():
   """Return all protocls configured in IRremoteESP8266.h
   """
   irremote = ARGS.directory / "IRremoteESP8266.h"
-  enums = getenums(irremote)
+  enums = getenums(irremote)["decode_type_t"]
   if not enums:
     errorexit("Error getting ENUMS from IRremoteESP8266.h")
   return enums
@@ -53,17 +55,34 @@ def getallacs():
   ret = {}
   for path in ARGS.directory.iterdir():
     match = AC_FN.match(path.name)
-    if not match:
-      continue
-    acprotocol = match.group(1)
-    rawmodels = getenums(path)
-    models = set()
-    for model in rawmodels:
-      model = model.upper()
-      model = model.replace("K{}".format(acprotocol.upper()), "")
-      if model and model not in EXCLUDED_PROTOCOLS:
-        models.add(model)
-    ret[acprotocol] = models
+    if match:
+      acprotocol = match.group(1)
+      rawmodels = getenums(path)
+      models = set()
+      for model in rawmodels:
+        model = model.upper()
+        model = model.replace("K{}".format(acprotocol.upper()), "")
+        if model and model not in EXCLUDED_PROTOCOLS:
+          models.add(model)
+      if acprotocol in ret:
+        ret[acprotocol].update(models)
+      else:
+        ret[acprotocol] = models
+    # Parse IRsend.h's enums
+    match = IRSEND_FN_RE.match(path.name)
+    if match:
+      rawmodels = getenums(path)
+      for acprotocol in rawmodels:
+        models = set()
+        for model in rawmodels[acprotocol]:
+          model = model.upper()
+          model = model.replace("K{}".format(acprotocol.upper()), "")
+          if model and model not in EXCLUDED_PROTOCOLS:
+            models.add(model)
+        if acprotocol in ret:
+          ret[acprotocol].update(models)
+        else:
+          ret[acprotocol] = models
   return ret
 
 
@@ -95,15 +114,20 @@ def getalldevices():
 def getenums(path):
   """Returns the keys for the first enum type in path
     """
-  enums = ENUMS.search(path.open().read())
-  ret = set()
-  if not enums:
-    return ret
-  for enum in ENUM_ENTRY.finditer(enums.group(1)):
-    enum = enum.group(1)
-    if enum in EXCLUDED_PROTOCOLS:
-      continue
-    ret.add(enum)
+  ret = {}
+  for enums in ENUMS.finditer(path.open().read()):
+    if enums:
+      enum_name = AC_MODEL_ENUM_RE.search(enums.group(1))
+      if enum_name:
+        enum_name = enum_name.group(1).capitalize()
+      else:
+        enum_name = enums.group(1)
+      ret[enum_name] = set()
+      for enum in ENUM_ENTRY.finditer(enums.group(2)):
+        enum = enum.group(1)
+        if enum in EXCLUDED_PROTOCOLS:
+          continue
+        ret[enum_name].add(enum)
   return ret
 
 
@@ -233,7 +257,7 @@ def main():
     fout.write("| {} | **{}** | {} | {} | {} |\n".format(
         makeurl(protocol, protocol + ".cpp"),
         brand,
-        "<BR>".join(codes),
+        "<BR>".join(codes).replace("|", "\\|"),
         "<BR>".join(acmodels),
         acsupport,
     ))
diff --git a/platformio.ini b/platformio.ini
index 6e73715d4..13c83eeca 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -87,6 +87,15 @@ extra_scripts             = pio/strip-floats.py
 build_flags               = -D NDEBUG
                             -mtarget-align
                             -Wl,-Map,firmware.map
+; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
+                            -D_IR_ENABLE_DEFAULT_=false
+                            -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
+                            -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
+
+[irremoteesp8266_full]
+build_flags               = -DUSE_IR_REMOTE_FULL
+                            -U_IR_ENABLE_DEFAULT_                       ; use default, i.e. enable all protocols
+                            -DDECODE_PRONTO=false -DSEND_PRONTO=false   ; except PRONTO
 
 [core_active]
 platform                  = ${core_2_6_1.platform}
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index f2b46c131..2a26ba4d2 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -31,10 +31,10 @@ build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
 build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
 
 [env:tasmota-ir]
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
+build_flags = ${common.build_flags} ${irremoteesp8266_full.build_flags} -DFIRMWARE_IR
 
 [env:tasmota-ircustom]
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL
+build_flags = ${common.build_flags} ${irremoteesp8266_full.build_flags}
 
 [env:tasmota-BG]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b5036467c..077f1eaf6 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Change wifi connectivity stability (#7602)
 - Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
+- Change update IRRemoteESP8266 v2.7.3
 
 ### 8.1.0.4 20200116
 

From e26a9fc0747d0aafab3c000709555c9ba8df529e Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Mon, 3 Feb 2020 21:26:46 +0100
Subject: [PATCH 210/403] Quick fix for Coolix_AC decoding #7660

---
 lib/IRremoteESP8266-2.7.3/src/IRac.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/IRremoteESP8266-2.7.3/src/IRac.cpp b/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
index 7b8b0f378..b2dc6f63e 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
+++ b/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
@@ -2232,6 +2232,7 @@ namespace IRAcUtils {
 #if DECODE_COOLIX
       case decode_type_t::COOLIX: {
         IRCoolixAC ac(kGpioUnused);
+        ac.on();
         ac.setRaw(decode->value);  // Uses value instead of state.
         *result = ac.toCommon(prev);
         break;

From fc92896ef5e4adf30d6b3118b68f3437a94548d5 Mon Sep 17 00:00:00 2001
From: gemu2015 <gmutz2010@googlemail.com>
Date: Tue, 4 Feb 2020 07:07:56 +0100
Subject: [PATCH 211/403] sml dynamic baud and transmit support

---
 tasmota/xdrv_10_scripter.ino | 24 ++++++++++++++++++++
 tasmota/xsns_53_sml.ino      | 44 ++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index 09406e810..c874ab85c 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -1714,6 +1714,30 @@ chknext:
           len=0;
           goto exit;
         }
+#endif
+#ifdef USE_SML_SCRIPT_CMD
+        if (!strncmp(vname,"sml(",4)) {
+          lp+=4;
+          float fvar1;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          SCRIPT_SKIP_SPACES
+          if (fvar2==0) {
+            float fvar3;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
+            fvar=SML_SetBaud(fvar1,fvar3);
+          } else {
+            char str[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,str,0);
+            fvar=SML_Write(fvar1,str);
+          }
+          lp++;
+          fvar=0;
+          len=0;
+          goto exit;
+        }
 #endif
         break;
       case 't':
diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index 1af1f526c..ebc534113 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -2109,6 +2109,50 @@ init10:
 }
 
 
+#ifdef USE_SML_SCRIPT_CMD
+uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+  if (meter_ss[meter]->begin(br)) {
+    meter_ss[meter]->flush();
+  }
+  if (meter_ss[meter]->hardwareSerial()) {
+    if (meter_desc_p[meter].type=='M') {
+      Serial.begin(br, SERIAL_8E1);
+    }
+  }
+  return 1;
+}
+
+uint32_t SML_Write(uint32_t meter,char *hstr) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+
+  SML_Send_Seq(meter,hstr);
+
+  /*
+
+  uint8_t sbuff[32];
+  uint8_t *ucp=sbuff,slen=0;
+  char *cp=hstr;
+  while (*cp) {
+    if (!*cp || !*(cp+1)) break;
+    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
+    cp+=2;
+    *ucp++=iob;
+    slen++;
+    if (slen>=sizeof(sbuff)) break;
+  }
+  meter_ss[meter]->write(sbuff,slen);
+  return slen;
+  */
+  return 1;
+}
+#endif
+
+
 void SetDBGLed(uint8_t srcpin, uint8_t ledpin) {
     pinMode(ledpin, OUTPUT);
     if (digitalRead(srcpin)) {

From 79261c75129ad6e17e99a6dd5bce8c94f586fe4c Mon Sep 17 00:00:00 2001
From: gemu2015 <gmutz2010@googlemail.com>
Date: Tue, 4 Feb 2020 07:09:29 +0100
Subject: [PATCH 212/403] Update xsns_53_sml.ino

---
 tasmota/xsns_53_sml.ino | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index ebc534113..aeb57d0d8 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -2129,25 +2129,7 @@ uint32_t SML_Write(uint32_t meter,char *hstr) {
   if (meter<1 || meter>meters_used) return 0;
   meter--;
   if (!meter_ss[meter]) return 0;
-
   SML_Send_Seq(meter,hstr);
-
-  /*
-
-  uint8_t sbuff[32];
-  uint8_t *ucp=sbuff,slen=0;
-  char *cp=hstr;
-  while (*cp) {
-    if (!*cp || !*(cp+1)) break;
-    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
-    cp+=2;
-    *ucp++=iob;
-    slen++;
-    if (slen>=sizeof(sbuff)) break;
-  }
-  meter_ss[meter]->write(sbuff,slen);
-  return slen;
-  */
   return 1;
 }
 #endif

From 0b8040c3c070ca42a4aea24036936d9454165b63 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Tue, 4 Feb 2020 08:13:09 +0100
Subject: [PATCH 213/403] add battery, some fixes

---
 tasmota/xsns_92_MI_HM10.ino | 85 +++++++++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 23 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 18c101101..185e498a2 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -50,8 +50,10 @@ struct {
   uint16_t firmware;
   struct {
     uint32_t init:1;
-    uint32_t subscribed:1;
     uint32_t pending_task:1;
+    uint32_t subscribed:1;
+    uint32_t awaitingHT:1;
+    uint32_t awaitingB:1;
     // TODO: more to come
   } mode;
   struct {
@@ -93,6 +95,11 @@ std::vector<mi_sensor_t> MIBLEsensors;
 
 #define D_CMND_HM10 "HM10"
 
+#define FLORA       1
+#define MJ_HT_V1    2
+#define LYWSD02     3
+#define LYWSD03MMC  4
+
 uint8_t kHM10SlaveID[4][3]  = { 0xC4,0x7C,0x8D, // Flora
                                 0x58,0x2D,0x34, // MJ_HT_V1
                                 0xE7,0x2E,0x00, // LYWSD02
@@ -140,10 +147,11 @@ const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10Sl
 #define TASK_HM10_FEEDBACK        9                         // get device response
 #define TASK_HM10_DISCONN         10                        // disconnect
 #define TASK_HM10_SUBSCR          11                        // subscribe to service handle 37
-#define TASK_HM10_READ            12                        // read from handle 36
+#define TASK_HM10_READ_HT         12                        // read from handle 36 -> Hum & Temp
 #define TASK_HM10_FINDALLCHARS    13                        // read all available characteristics
 #define TASK_HM10_UNSUBSCR        14                        // subscribe  service handle 37
 #define TASK_HM10_DELAY_SUB       15                        // start reading from subscription delayed
+#define TASK_HM10_READ_BT         16                        // read from handle 3A -> Battery
 
 #define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
 
@@ -175,9 +183,9 @@ void HM10_Read_Sensor(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
                           HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_READ,3,15);          // read
-                          HM10_Launchtask(TASK_HM10_READ,4,15);          // read
-                          HM10_Launchtask(TASK_HM10_READ,5,15);          // read
+                          HM10_Launchtask(TASK_HM10_READ_HT,3,15);          // read
+                          HM10_Launchtask(TASK_HM10_READ_HT,4,15);          // read
+                          HM10_Launchtask(TASK_HM10_READ_HT,5,15);          // read
                           HM10_Launchtask(TASK_HM10_UNSUBSCR,6,10);      // unsubscribe
                           HM10_Launchtask(TASK_HM10_DISCONN,7,0);        // disconnect
                           }
@@ -186,8 +194,9 @@ void HM10_Read_Sensor1(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
                           HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,60);      // unsubscribe
-                          HM10_Launchtask(TASK_HM10_DISCONN,4,0);        // disconnect
+                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,40);      // unsubscribe
+                          HM10_Launchtask(TASK_HM10_READ_BT,4,5);       // read Battery
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
                           }
 
 
@@ -222,14 +231,14 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
       }
       return i;
     }
-    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[0], _serial[1], _serial[2],_serial[3],_serial[4],_serial[5]);
   }
   DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
   mi_sensor_t _newSensor;
   memcpy(_newSensor.serial,_serial, sizeof(_serial));
   _newSensor.type = _type;
-  _newSensor.showedUp = 1;
+  _newSensor.showedUp = 1; // does not matter for HM-10
   _newSensor.temp =-1000.0f;
   switch (_type)
     {
@@ -355,6 +364,21 @@ void HM10readTempHum(char *_buf){
   }
 }
 
+void HM10readBat(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0){
+    DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
+    // uint8_t _serial[6] = {0};
+    // uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
+    uint32_t _slot = HM10.state.sensor;
+
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    if(_buf[0]<101){
+        MIBLEsensors.at(_slot).bat=_buf[0];
+    }
+  }
+}
+
 /*********************************************************************************************\
  * handle the return value from the HM10
 \*********************************************************************************************/
@@ -373,8 +397,15 @@ bool HM10SerialHandleFeedback(){
     i++;
     success = true;
   }
-  if(HM10.mode.subscribed) {
+  if(HM10.mode.awaitingHT) {
     HM10readTempHum(ret);
+    HM10.mode.awaitingHT = false;
+    HM10.current_task_delay = 0;
+  }
+  else if(HM10.mode.awaitingB) {
+    HM10readBat(ret);
+    HM10.mode.awaitingB = false;
+    HM10.current_task_delay = 0;
   }
   else if(success) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
@@ -442,7 +473,7 @@ void HM10_TaskEvery100ms(){
           char _con[20];
           sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
           HM10Serial->write(_con);
-          // HM10Serial->write(kHM10Mac[HM10.state.sensor]);
+          HM10.mode.awaitingB = false;
           break;
         case TASK_HM10_DISCONN:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
@@ -470,20 +501,28 @@ void HM10_TaskEvery100ms(){
           HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
-          HM10.mode.subscribed = false;
+          HM10.mode.awaitingHT = false;
           HM10Serial->write("AT+NOTIFYOFF0037");
           break;
-        case TASK_HM10_READ:
+        case TASK_HM10_READ_HT:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
           HM10.current_task_delay = 0;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+READDATA0036?");
-          HM10.mode.subscribed = true;
+          HM10.mode.awaitingHT = true;
+          break;
+        case TASK_HM10_READ_BT:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
+          HM10.current_task_delay = 0;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA003A?");
+          HM10.mode.awaitingB = true;
           break;
         case TASK_HM10_FINDALLCHARS:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s find all chars"),D_CMND_HM10);
-          HM10.current_task_delay = 35;                    // set task delay
+          HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+FINDALLCHARS?");
@@ -500,7 +539,7 @@ void HM10_TaskEvery100ms(){
           HM10SerialHandleFeedback();
           HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;     // set task delay
           HM10_TASK_LIST[i][0] = TASK_HM10_DONE;                 // no feedback for reset
-          HM10.mode.subscribed = true;
+          HM10.mode.awaitingHT = true;
           runningTaskLoop = false;
           break;
 
@@ -580,7 +619,7 @@ void HM10Show(bool json)
   if (json) {
     for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
       char slave[33];
-      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
       char temperature[33]; // all sensors have temperature
       dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
 
@@ -588,7 +627,7 @@ void HM10Show(bool json)
         if(MIBLEsensors.at(i).temp!=-1000.0f){ // this is the error code -> no temperature
           ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
         }
-        if (MIBLEsensors.at(i).type==1){
+        if (MIBLEsensors.at(i).type==FLORA){
           char lux[33];
           char moisture[33];
           char fertility[33];
@@ -605,7 +644,7 @@ void HM10Show(bool json)
             ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
           }
         }
-        if (MIBLEsensors.at(i).type>1){ 
+        if (MIBLEsensors.at(i).type>FLORA){ 
           char humidity[33];
           dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
           if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no temperature
@@ -621,13 +660,13 @@ void HM10Show(bool json)
     } else {
       WSContentSend_PD(HTTP_HM10, HM10.firmware);
       for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]); 
+        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]); 
         if(MIBLEsensors.at(i).temp!=-1000.0f){
           char temperature[33];
           dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
           WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
         }
-        if (MIBLEsensors.at(i).type==1){
+        if (MIBLEsensors.at(i).type==FLORA){
           if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
             WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
           }
@@ -640,7 +679,7 @@ void HM10Show(bool json)
             WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
           }
         }
-        if (MIBLEsensors.at(i).type>1){ // everything "above" Flora
+        if (MIBLEsensors.at(i).type>FLORA){ // everything "above" Flora
           if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no humidity
             char humidity[33];
             dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);

From f3c6627ec667d3771b28a88efbb07e13e0c50696 Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Tue, 4 Feb 2020 21:30:30 +1100
Subject: [PATCH 214/403] Tweak the key/value for the type+id so it's only
 printed for STAT

---
 tasmota/xdrv_16_tuyamcu.ino | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index c9a5aa6ca..4a49c8ee0 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -688,18 +688,20 @@ void TuyaSerialInput(void)
             const unsigned char *dpData = (unsigned char*)&Tuya.buffer[dpidStart + 4];
             const char *dpHexData = ToHex_P(dpData, dpDataLen, hex_char, sizeof(hex_char));
 
-            ResponseAppend_P(PSTR(",\"Cmnd%dDpId%dDpType%d\":"), Tuya.buffer[3], dpId, dpDataType);
-            if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
-              ResponseAppend_P(PSTR("\"%d\""), dpData[0]);
-            } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
-              uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
-              ResponseAppend_P(PSTR("\"%u\""), dpValue);
-            } else if (TUYA_TYPE_STRING == dpDataType) {
-              ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
-            } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
-              ResponseAppend_P(PSTR("\"%d\""), dpData[0]);
-            } else {
-              ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
+            if (TUYA_CMD_STATE == Tuya.buffer[3]) {
+              ResponseAppend_P(PSTR(",\"DpType%uId%u\":"), dpDataType, dpId);
+              if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
+                ResponseAppend_P(PSTR("\"%u\""), dpData[0]);
+              } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
+                uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
+                ResponseAppend_P(PSTR("\"%u\""), dpValue);
+              } else if (TUYA_TYPE_STRING == dpDataType) {
+                ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
+              } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
+                ResponseAppend_P(PSTR("\"%u\""), dpData[0]);
+              } else {
+                ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
+              }
             }
 
             ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), dpId, dpId, dpDataType, dpHexData);

From e1973fbfffc3d99d48139002f6cb1ef646798967 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Tue, 4 Feb 2020 14:12:46 +0100
Subject: [PATCH 215/403] fix regression: no temp/hum-read

---
 tasmota/xsns_92_MI_HM10.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 185e498a2..6065a6c7f 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -355,6 +355,8 @@ void HM10readTempHum(char *_buf){
     _tempFloat=(float)(LYWSD03.temp)/100.0f;
     if(_tempFloat<60){
         MIBLEsensors.at(_slot).temp=_tempFloat;
+        HM10.mode.awaitingHT = false;
+        HM10.current_task_delay = 0;
     }
     _tempFloat=(float)LYWSD03.hum;
     if(_tempFloat<100){
@@ -399,8 +401,6 @@ bool HM10SerialHandleFeedback(){
   }
   if(HM10.mode.awaitingHT) {
     HM10readTempHum(ret);
-    HM10.mode.awaitingHT = false;
-    HM10.current_task_delay = 0;
   }
   else if(HM10.mode.awaitingB) {
     HM10readBat(ret);

From c4d92d6368277f1091f80966f2bebac697472ae3 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Tue, 4 Feb 2020 15:02:47 +0100
Subject: [PATCH 216/403] add command interface: HM10SCAN and HM10PERIOD

---
 tasmota/xsns_92_MI_HM10.ino | 69 +++++++++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 6065a6c7f..2464bfc55 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -48,6 +48,7 @@ struct {
   uint8_t current_task_delay;  // number of 100ms-cycles
   uint8_t last_command;
   uint16_t firmware;
+  uint32_t period;             // set manually in addition to TELE-period
   struct {
     uint32_t init:1;
     uint32_t pending_task:1;
@@ -95,6 +96,10 @@ std::vector<mi_sensor_t> MIBLEsensors;
 
 #define D_CMND_HM10 "HM10"
 
+const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
+const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
+const char kHM10_Commands[] PROGMEM             = "Scan|Period";
+
 #define FLORA       1
 #define MJ_HT_V1    2
 #define LYWSD02     3
@@ -120,9 +125,11 @@ const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10Sl
  * enumerations
 \*********************************************************************************************/
 
-// enum HM10_Commands {
-//   CMND_HM10_TRACK
-// };
+enum HM10_Commands {                                 // commands useable in console or rules
+  CMND_HM10_DISC_SCAN,
+  CMND_HM10_PERIOD
+  };                                   // set dac, 1=off, 0=on, DAC is turned on (0) by default
+
                         
 /*********************************************************************************************\
  * command defines
@@ -130,7 +137,6 @@ const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10Sl
 
 
 
-
 /*********************************************************************************************\
  * Task codes defines
 \*********************************************************************************************/
@@ -179,22 +185,16 @@ void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disco
                           HM10_Launchtask(TASK_HM10_DISC,5,50);         // discovery
                           }
 
-void HM10_Read_Sensor(void) {
-                          HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
-                          HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_READ_HT,3,15);          // read
-                          HM10_Launchtask(TASK_HM10_READ_HT,4,15);          // read
-                          HM10_Launchtask(TASK_HM10_READ_HT,5,15);          // read
-                          HM10_Launchtask(TASK_HM10_UNSUBSCR,6,10);      // unsubscribe
-                          HM10_Launchtask(TASK_HM10_DISCONN,7,0);        // disconnect
+void HM10_Discovery_Scan(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disconnect
+                          HM10_Launchtask(TASK_HM10_DISC,1,1);         // discovery
                           }
                           
 void HM10_Read_Sensor1(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
                           HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,40);      // unsubscribe
+                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,60);      // unsubscribe
                           HM10_Launchtask(TASK_HM10_READ_BT,4,5);       // read Battery
                           HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
                           }
@@ -277,6 +277,7 @@ void HM10SerialInit(void) {
     HM10_Reset();
     HM10.mode.pending_task = 1;
     HM10.mode.init = 1;
+    HM10.period = Settings.tele_period;
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
   }
   return;
@@ -569,6 +570,10 @@ void HM10_TaskEvery100ms(){
   }
 }
 
+/*
+|*  Loops
+\*                       */
+
 void HM10EverySecond(){
   if(HM10.firmware == 0) return;
   if(HM10.mode.pending_task == 1) return;
@@ -591,13 +596,44 @@ void HM10EverySecond(){
     }
     if (HM10.state.sensor==MIBLEsensors.size()-1) {
       _nextSensorSlot= 0;
-      _counter = 60;
+      _counter = HM10.period;
     }
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
   if(_counter>0) _counter--;
 }
 
+bool HM10Cmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_HM10);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_HM10), disp_len)) {  // prefix
+    uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kHM10_Commands);
+    switch (command_code) {
+      case CMND_HM10_PERIOD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_PERIOD)    { HM10.period = XdrvMailbox.payload; }
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_DISC_SCAN:
+        if (command_code == CMND_HM10_DISC_SCAN)     { HM10_Discovery_Scan(); }
+
+        Response_P(S_JSON_HM10_COMMAND, command, XdrvMailbox.payload);
+        break;
+      default:
+    	  // else for Unknown command
+    	  serviced = false;
+    	break;
+    }
+  } else {
+    return false;
+  }
+  return serviced;
+}
+
+
 /*********************************************************************************************\
  * Presentation
 \*********************************************************************************************/
@@ -727,6 +763,9 @@ bool Xsns92(uint8_t function)
         HM10EverySecond();
         // DEBUG_SENSOR_LOG(PSTR("HM10: every second"));
         break;
+      case FUNC_COMMAND:
+        result = HM10Cmd();
+        break;
       case FUNC_JSON_APPEND:
         HM10Show(1);
         break;

From cb58ae95aef89a4ca7bcacadf819a5df0f4a1eba Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 4 Feb 2020 16:50:02 +0100
Subject: [PATCH 217/403] Freezed Arduino feature stage for Tasmota....

for supporting gzip firmware upgrades
---
 platformio_override_sample.ini | 65 ++++++++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index ade3a4564..02e56e878 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -71,10 +71,16 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 [core_active]
 ; Select one core set for platform and build_flags
-platform                  = ${core_2_6_1.platform}
-build_flags               = ${core_2_6_1.build_flags}
-;platform                  = ${core_2_6_2.platform}
-;build_flags               = ${core_2_6_2.build_flags}
+;platform                  = ${core_2_6_1.platform}
+;build_flags               = ${core_2_6_1.build_flags}
+
+;platform                  = ${core_2_6_3.platform}
+;build_flags               = ${core_2_6_3.build_flags}
+
+platform                  = ${tasmota_core_stage.platform}
+platform_packages         = ${tasmota_core_stage.platform_packages}
+build_flags               = ${tasmota_core_stage.build_flags}
+
 ;platform                  = ${core_stage.platform}
 ;platform_packages         = ${core_stage.platform_packages}
 ;build_flags               = ${core_stage.build_flags}
@@ -124,9 +130,9 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -fexceptions
 ;                           -lstdc++-exc
 
-[core_2_6_2]
-; *** Esp8266 core for Arduino version 2.6.2
-platform                  = espressif8266@2.3.1
+[core_2_6_3]
+; *** Esp8266 core for Arduino version 2.6.3
+platform                  = espressif8266@2.3.2
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
@@ -168,6 +174,51 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -fexceptions
 ;                           -lstdc++-exc
 
+[tasmota_core_stage]
+; *** Esp8266 core for Arduino version stable beta
+platform                  = espressif8266@2.3.2
+platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf
+build_flags               = ${esp82xx_defaults.build_flags}
+                            -Wl,-Teagle.flash.1m.ld
+                            -DBEARSSL_SSL_BASIC
+; NONOSDK221
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
+; NONOSDK22x_190313
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
+; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
+                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
+; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
+; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105
+; NONOSDK22x_191122 = 2.2.1+119-dev(a58da79)
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122
+; NONOSDK3V0 (known issues)
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
+; lwIP 1.4
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+; lwIP 2 - Low Memory
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+; lwIP 2 - Higher Bandwidth
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+; lwIP 2 - Higher Bandwidth Low Memory no Features
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
+; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
+                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+; VTABLES in Flash (Tasmota default)
+                            -DVTABLES_IN_FLASH
+; VTABLES in Heap
+;                            -DVTABLES_IN_DRAM
+; VTABLES in IRAM
+;                            -DVTABLES_IN_IRAM
+; enable one option set -> No exception recommended
+; No exception code in firmware
+                            -fno-exceptions
+                            -lstdc++
+; Exception code in firmware /needs much space! 90k
+;                           -fexceptions
+;                           -lstdc++-exc
+
 [core_stage]
 ; *** Esp8266 core for Arduino version latest beta
 platform                  = espressif8266@2.3.1

From 09ba4d15fcbc18724b3f2908be0a2ce5be51c5e4 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Tue, 4 Feb 2020 17:55:48 +0100
Subject: [PATCH 218/403] cleanup and refactoring, HM10PERIOD now shows value

---
 tasmota/xsns_92_MI_HM10.ino | 89 +++++++++++--------------------------
 1 file changed, 26 insertions(+), 63 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 2464bfc55..ef9a0c9c1 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -117,25 +117,14 @@ const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
 const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
 const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
 
-
-// uint8_t HM10Mac[2][6]={0xA4,0xC1,0x38,0xED,0x81,0x5A, 
-//                        0xA4,0xC1,0x38,0x2A,0xC8,0xB3};
-
 /*********************************************************************************************\
  * enumerations
 \*********************************************************************************************/
 
-enum HM10_Commands {                                 // commands useable in console or rules
-  CMND_HM10_DISC_SCAN,
-  CMND_HM10_PERIOD
-  };                                   // set dac, 1=off, 0=on, DAC is turned on (0) by default
-
-                        
-/*********************************************************************************************\
- * command defines
-\*********************************************************************************************/
-
-
+enum HM10_Commands {          // commands useable in console or rules
+  CMND_HM10_DISC_SCAN,        // re-scan for sensors
+  CMND_HM10_PERIOD            // set period like TELE-period in seconds between read-cycles
+  };
 
 /*********************************************************************************************\
  * Task codes defines
@@ -278,21 +267,15 @@ void HM10SerialInit(void) {
     HM10.mode.pending_task = 1;
     HM10.mode.init = 1;
     HM10.period = Settings.tele_period;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
+    DEBUG_SENSOR_LOG(PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
   }
   return;
 }
 
 /*********************************************************************************************\
- * create the HM10 commands payload, and send it via serial interface to the HM10 player
+ * create the HM10 commands payload, and send it via serial interface to the HM10 module
  \*********************************************************************************************/
 
-// void HM10_CMD(uint8_t _cmd,uint16_t _val) {
-
-//   HM10Serial->write(cmd, sizeof(cmd));               /
-//   return;
-// }
-
 void HM10datahex(const char* string, uint8_t _mac[]) {
     uint32_t slength = 12;
     // uint8_t _mac[6] = {0};
@@ -371,10 +354,7 @@ void HM10readBat(char *_buf){
   DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
   if(_buf[0] != 0){
     DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
-    // uint8_t _serial[6] = {0};
-    // uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
     uint32_t _slot = HM10.state.sensor;
-
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
     if(_buf[0]<101){
         MIBLEsensors.at(_slot).bat=_buf[0];
@@ -386,7 +366,7 @@ void HM10readBat(char *_buf){
  * handle the return value from the HM10
 \*********************************************************************************************/
 
-bool HM10SerialHandleFeedback(){
+bool HM10SerialHandleFeedback(){                  // every 50 milliseconds
   bool success    = false;                        // true disables possible repetition of commands, set to false only for debugging
   uint32_t i       = 0;
   char ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
@@ -413,7 +393,7 @@ bool HM10SerialHandleFeedback(){
     HM10ParseResponse(ret);
   }
   else {
-    // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s got no response"),D_CMND_HM10);
+    // DEBUG_SENSOR_LOG(PSTR("%s got no response"),D_CMND_HM10);
   }
   return success;
 }
@@ -423,8 +403,7 @@ bool HM10SerialHandleFeedback(){
 \*********************************************************************************************/
 
 void HM10_TaskEvery100ms(){
-  HM10SerialHandleFeedback();
-  // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK to be done %u"),D_CMND_HM10,HM10_TASK_LIST[0][0]);
+  // HM10SerialHandleFeedback();
   if (HM10.current_task_delay == 0)  {
     uint8_t i = 0;
     bool runningTaskLoop = true;
@@ -470,7 +449,6 @@ void HM10_TaskEvery100ms(){
           HM10.current_task_delay = 2;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
-          // HM10Serial->write("AT+CONA4C138ED815A");
           char _con[20];
           sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
           HM10Serial->write(_con);
@@ -548,10 +526,10 @@ void HM10_TaskEvery100ms(){
           // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),D_CMND_HM10);
           // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%snext slot:%u, i: %u"),D_CMND_HM10, HM10_TASK_LIST[i+1][0],i);
           if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {             // check the next entry and if there is none
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sno Tasks left"),D_CMND_HM10);
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
+            DEBUG_SENSOR_LOG(PSTR("%sno Tasks left"),D_CMND_HM10);
+            DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
             for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {   // do a clean-up:
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
+              DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
               HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;                // reset all task entries
               HM10_TASK_LIST[j][1] = 0;                              // reset all delays
             }
@@ -579,26 +557,23 @@ void HM10EverySecond(){
   if(HM10.mode.pending_task == 1) return;
   if (MIBLEsensors.size()==0) {
       HM10.mode.pending_task = 1;
-      HM10_Launchtask(TASK_HM10_DISC,0,1); // start new discovery
+      HM10_Launchtask(TASK_HM10_DISC,0,50); // start new discovery
       return;
   }
   static uint32_t _counter = 0;
   static uint32_t _nextSensorSlot = 0;
   if(_counter==0) {
-      HM10.state.sensor = _nextSensorSlot;
-      _nextSensorSlot++;
-    if(MIBLEsensors.at(HM10.state.sensor).type==4) {
+    HM10.state.sensor = _nextSensorSlot;
+    _nextSensorSlot++;
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) { // only this sensor for now
       HM10.mode.pending_task = 1;
       HM10_Read_Sensor1();
-      }
-    else {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor not type 3: %u"),D_CMND_HM10, HM10.state.sensor);
     }
     if (HM10.state.sensor==MIBLEsensors.size()-1) {
       _nextSensorSlot= 0;
       _counter = HM10.period;
     }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
+    DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
   if(_counter>0) _counter--;
 }
@@ -615,6 +590,9 @@ bool HM10Cmd(void) {
         if (XdrvMailbox.data_len > 0) {
           if (command_code == CMND_HM10_PERIOD)    { HM10.period = XdrvMailbox.payload; }
         }
+        else {
+          if (command_code == CMND_HM10_PERIOD) XdrvMailbox.payload = HM10.period;
+        }
         Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
         break;
       case CMND_HM10_DISC_SCAN:
@@ -638,17 +616,10 @@ bool HM10Cmd(void) {
  * Presentation
 \*********************************************************************************************/
 
-const char HTTP_HM10[] PROGMEM =
- "{s}HM10" " Firmware " "{m}%u{e}";
-
-const char HTTP_HM10_SERIAL[] PROGMEM =
- "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-
-const char HTTP_BATTERY[] PROGMEM =
- "{s}%s" " Battery" "{m}%u%%{e}";
-
-const char HTTP_HM10_FLORA_DATA[] PROGMEM =
-  "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
+const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
 
 void HM10Show(bool json)
 {
@@ -745,23 +716,15 @@ bool Xsns92(uint8_t function)
         HM10SerialInit();                                    // init and start communication
         break;
       case FUNC_EVERY_50_MSECOND:
-        HM10SerialHandleFeedback();                        // -> sniff for device feedback
+        HM10SerialHandleFeedback();                        // -> sniff for device feedback very often
        break;
       case FUNC_EVERY_100_MSECOND:
-        if (HM10_TASK_LIST[0][0] == TASK_HM10_NOTASK) {       // no task running 
-          // DEBUG_SENSOR_LOG(PSTR("HM10: no TASK in array"));
-          // HM10SerialHandleFeedback();                        // -> sniff for device feedback
-          break;
-        }
-        else {
-          // DEBUG_SENSOR_LOG(PSTR("HM10: every 100msec"));
+        if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
           HM10_TaskEvery100ms();                             // something has to be done, we'll check in the next step
-          break;
         }
         break;
       case FUNC_EVERY_SECOND:
         HM10EverySecond();
-        // DEBUG_SENSOR_LOG(PSTR("HM10: every second"));
         break;
       case FUNC_COMMAND:
         result = HM10Cmd();

From 47ead336cb8cf3beee8082375ba032f4370fcdb2 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Tue, 4 Feb 2020 19:30:41 +0100
Subject: [PATCH 219/403] adding HM10AT and HM10BAUD, HM10PERIOD now
 immediately takes effect

---
 tasmota/xsns_92_MI_HM10.ino | 61 +++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index ef9a0c9c1..316d1886d 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -22,8 +22,7 @@
   --------------------------------------------------------------------------------------------
 
   ---
-  0.9.0.0 20200130  started - further development by Christian Baars
-                    base    - no real base project
+  0.9.0.0 20200130  started - initial development by Christian Baars
                     forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
 
 */
@@ -37,6 +36,7 @@
 #include <vector>
 
 TasmotaSerial *HM10Serial;
+#define HM10_BAUDRATE              115200  // default with FW>700 is 115200
 
 #define  HM10_MAX_TASK_NUMBER      12
 uint8_t  HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];   // first value: kind of task - second value: delay in x * 100ms
@@ -49,6 +49,7 @@ struct {
   uint8_t last_command;
   uint16_t firmware;
   uint32_t period;             // set manually in addition to TELE-period
+  uint32_t serialSpeed;
   struct {
     uint32_t init:1;
     uint32_t pending_task:1;
@@ -97,8 +98,8 @@ std::vector<mi_sensor_t> MIBLEsensors;
 #define D_CMND_HM10 "HM10"
 
 const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
-const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s\"}";
-const char kHM10_Commands[] PROGMEM             = "Scan|Period";
+const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s%s\"}";
+const char kHM10_Commands[] PROGMEM             = "Scan|AT|Period|Baud";
 
 #define FLORA       1
 #define MJ_HT_V1    2
@@ -123,7 +124,9 @@ const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10Sl
 
 enum HM10_Commands {          // commands useable in console or rules
   CMND_HM10_DISC_SCAN,        // re-scan for sensors
-  CMND_HM10_PERIOD            // set period like TELE-period in seconds between read-cycles
+  CMND_HM10_AT,               // send AT-command for debugging and special configuration
+  CMND_HM10_PERIOD,            // set period like TELE-period in seconds between read-cycles
+  CMND_HM10_BAUD              // serial speed of ESP8266 (<-> HM10), does not change baud rate of HM10
   };
 
 /*********************************************************************************************\
@@ -179,11 +182,11 @@ void HM10_Discovery_Scan(void) {
                           HM10_Launchtask(TASK_HM10_DISC,1,1);         // discovery
                           }
                           
-void HM10_Read_Sensor1(void) {
+void HM10_Read_Sensor(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
                           HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,60);      // unsubscribe
+                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,80);      // unsubscribe
                           HM10_Launchtask(TASK_HM10_READ_BT,4,5);       // read Battery
                           HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
                           }
@@ -256,8 +259,9 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
 
 void HM10SerialInit(void) {
   HM10.mode.init = false;
+  HM10.serialSpeed = HM10_BAUDRATE;
   HM10Serial = new TasmotaSerial(HM_PIN_RX, HM_PIN_TX, 1, 0, HM10_MAX_RX_BUF); 
-  if (HM10Serial->begin(115200)) {
+  if (HM10Serial->begin(HM10.serialSpeed)) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
     if (HM10Serial->hardwareSerial()) {
       ClaimSerial();
@@ -555,11 +559,8 @@ void HM10_TaskEvery100ms(){
 void HM10EverySecond(){
   if(HM10.firmware == 0) return;
   if(HM10.mode.pending_task == 1) return;
-  if (MIBLEsensors.size()==0) {
-      HM10.mode.pending_task = 1;
-      HM10_Launchtask(TASK_HM10_DISC,0,50); // start new discovery
-      return;
-  }
+  if (MIBLEsensors.size()==0) return;
+
   static uint32_t _counter = 0;
   static uint32_t _nextSensorSlot = 0;
   if(_counter==0) {
@@ -567,15 +568,17 @@ void HM10EverySecond(){
     _nextSensorSlot++;
     if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) { // only this sensor for now
       HM10.mode.pending_task = 1;
-      HM10_Read_Sensor1();
+      HM10_Read_Sensor();
     }
     if (HM10.state.sensor==MIBLEsensors.size()-1) {
       _nextSensorSlot= 0;
-      _counter = HM10.period;
+      _counter++;
     }
+    
     DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
-  if(_counter>0) _counter--;
+  else _counter++;
+  if (_counter>HM10.period) _counter = 0;
 }
 
 bool HM10Cmd(void) {
@@ -595,10 +598,30 @@ bool HM10Cmd(void) {
         }
         Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
         break;
+      case CMND_HM10_BAUD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_BAUD) {
+            HM10.serialSpeed = XdrvMailbox.payload;
+            HM10Serial->begin(HM10.serialSpeed);
+            }
+        }
+        else {
+          if (command_code == CMND_HM10_BAUD) XdrvMailbox.payload = HM10.serialSpeed;
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_AT:
+        HM10Serial->write("AT");               // without an argument this will disconnect
+        if (strlen(XdrvMailbox.data)!=0) {
+          HM10Serial->write("+");
+          HM10Serial->write(XdrvMailbox.data); // pass everything without checks
+          Response_P(S_JSON_HM10_COMMAND, ":AT+",XdrvMailbox.data);
+        }
+        else Response_P(S_JSON_HM10_COMMAND, ":AT",XdrvMailbox.data);
+        break;
       case CMND_HM10_DISC_SCAN:
-        if (command_code == CMND_HM10_DISC_SCAN)     { HM10_Discovery_Scan(); }
-
-        Response_P(S_JSON_HM10_COMMAND, command, XdrvMailbox.payload);
+        if (command_code == CMND_HM10_DISC_SCAN) { HM10_Discovery_Scan(); }
+        Response_P(S_JSON_HM10_COMMAND, command, "");
         break;
       default:
     	  // else for Unknown command

From fcac1619fd02f5d5e5e12142653c879cda975f53 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Tue, 4 Feb 2020 22:19:29 +0100
Subject: [PATCH 220/403] Extend to Stage

---
 tasmota/core_esp8266_waveform.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/core_esp8266_waveform.cpp b/tasmota/core_esp8266_waveform.cpp
index a17b63a9b..2a0e8415b 100644
--- a/tasmota/core_esp8266_waveform.cpp
+++ b/tasmota/core_esp8266_waveform.cpp
@@ -38,7 +38,7 @@
 */
 
 #include <core_version.h>
-#if defined(ARDUINO_ESP8266_RELEASE_2_6_1) || defined(ARDUINO_ESP8266_RELEASE_2_6_2) || defined(ARDUINO_ESP8266_RELEASE_2_6_3)
+#if defined(ARDUINO_ESP8266_RELEASE_2_6_1) || defined(ARDUINO_ESP8266_RELEASE_2_6_2) || defined(ARDUINO_ESP8266_RELEASE_2_6_3) || !defined(ARDUINO_ESP8266_RELEASE)
 #warning **** Tasmota is using a patched PWM Arduino version as planned ****
 
 
@@ -261,7 +261,6 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
         // Check for toggles
         int32_t cyclesToGo = wave->nextServiceCycle - now;
         if (cyclesToGo < 0) {
-          cyclesToGo = -((-cyclesToGo) % (wave->nextTimeHighCycles + wave->nextTimeLowCycles));
           waveformState ^= mask;
           if (waveformState & mask) {
             if (i == 16) {

From 186d3fcb4de1a84e9cc15860c2fb10ad74dc6624 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 5 Feb 2020 16:28:56 +0100
Subject: [PATCH 221/403] Add support for Shelly Add-On adapter

Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter
---
 RELEASENOTES.md                    |   5 +-
 tasmota/CHANGELOG.md               |  10 +-
 tasmota/tasmota_template.h         |  11 +-
 tasmota/tasmota_version.h          |   2 +-
 tasmota/xsns_05_ds18x20.ino        |  83 ++++--
 tasmota/xsns_05_ds18x20_shelly.ino | 463 -----------------------------
 6 files changed, 76 insertions(+), 498 deletions(-)
 delete mode 100644 tasmota/xsns_05_ds18x20_shelly.ino

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 10e9a8139..2b31dbd3c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -56,7 +56,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
-- Change IRremoteESP8266 library updated to v2.7.2
+- Change IRremoteESP8266 library updated to v2.7.3
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Change wifi connectivity stability (#7602)
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
@@ -69,8 +69,10 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix exception 9 restart on log message in Ticker interrupt service routines NTP, Wemos and Hue emulation (#7496)
 - Fix ``PowerDelta`` zero power detection (#7515)
 - Fix ``RGBWWTable`` ignored (#7572)
+- Fix PWM flickering at low levels (#7415)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
+- Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
 - Add ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
 - Add SerialConfig to ``Status 1``
@@ -87,3 +89,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
+- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ca93421c8..e44f698b0 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,12 +1,16 @@
 ## Unreleased (development)
 
+### 8.1.0.6 20200205
+
+- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter
+
 ### 8.1.0.5 20200126
 
 - Change wifi connectivity stability (#7602)
-- Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
-- Change update IRRemoteESP8266 v2.7.3
-- Add ``ZbBind`` (experimental) and bug fixes
+- Change IRremoteESP8266 library updated to v2.7.3
 - Fix PWM flickering at low levels (#7415)
+- Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
+- Add ``ZbBind`` (experimental) and bug fixes
 
 ### 8.1.0.4 20200116
 
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index f041620c6..0067b628f 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -216,6 +216,7 @@ enum UserSelectablePins {
   GPIO_HPMA_TX,        // Honeywell HPMA115S0 Serial interface
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
+  GPIO_DSB_OUT,        // Pseudo Single wire DS18B20 or DS18S20
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -296,7 +297,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_DEEPSLEEP "|" D_SENSOR_EXS_ENABLE "|"
   D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|"
   D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|"
-  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX
+  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|"
+  D_SENSOR_DS18X20 "o|"
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -562,6 +564,7 @@ const uint8_t kGpioNiceList[] PROGMEM = {
 #endif
 #ifdef USE_DS18x20
   GPIO_DSB,            // Single wire DS18B20 or DS18S20
+  GPIO_DSB_OUT,        // Pseudo Single wire DS18B20 or DS18S20
 #endif
 
 // Light
@@ -1682,10 +1685,10 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      0, 0
   },
   { "Shelly 1",        // SHELLY1 - Shelly1 Open Source (ESP8266 - 2MB) - https://shelly.cloud/shelly1-open-source/
-     0,                // GPIO00 - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
-     0,                // GPIO01 Serial RXD - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
+     GPIO_USER,        // GPIO00 - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
+     GPIO_USER,        // GPIO01 Serial RXD - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
      0,
-     0,                // GPIO03 Serial TXD - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
+     GPIO_USER,        // GPIO03 Serial TXD - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
      GPIO_REL1,        // GPIO04 Relay (0 = Off, 1 = On)
      GPIO_SWT1_NP,     // GPIO05 SW pin
                        // GPIO06 (SD_CLK   Flash)
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index e38f4cad0..dcdbfe922 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010005;
+const uint32_t VERSION = 0x08010006;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;
diff --git a/tasmota/xsns_05_ds18x20.ino b/tasmota/xsns_05_ds18x20.ino
index 4168eaa32..ba87e3a5d 100644
--- a/tasmota/xsns_05_ds18x20.ino
+++ b/tasmota/xsns_05_ds18x20.ino
@@ -50,7 +50,9 @@ struct DS18X20STRUCT {
   float   temperature;
 } ds18x20_sensor[DS18X20_MAX_SENSORS];
 uint8_t ds18x20_sensors = 0;
-uint8_t ds18x20_pin = 0;
+uint8_t ds18x20_pin = 0;           // Shelly GPIO3 input only
+uint8_t ds18x20_pin_out = 0;       // Shelly GPIO00 output only
+bool ds18x20_dual_mode = false;    // Single pin mode
 char ds18x20_types[12];
 #ifdef W1_PARASITE_POWER
 uint8_t ds18x20_sensor_curr = 0;
@@ -69,25 +71,38 @@ uint8_t onewire_last_family_discrepancy = 0;
 bool onewire_last_device_flag = false;
 unsigned char onewire_rom_id[8] = { 0 };
 
+/*------------------------------------------------------------------------------------------*/
+
 uint8_t OneWireReset(void)
 {
   uint8_t retries = 125;
 
-  //noInterrupts();
-  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
-  do {
-    if (--retries == 0) {
-      return 0;
-    }
-    delayMicroseconds(2);
-  } while (!digitalRead(ds18x20_pin));
-  pinMode(ds18x20_pin, OUTPUT);
-  digitalWrite(ds18x20_pin, LOW);
-  delayMicroseconds(480);
-  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  if (!ds18x20_dual_mode) {
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    pinMode(ds18x20_pin, OUTPUT);
+    digitalWrite(ds18x20_pin, LOW);
+    delayMicroseconds(480);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  } else {
+    digitalWrite(ds18x20_pin_out, HIGH);
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(480);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
   delayMicroseconds(70);
   uint8_t r = !digitalRead(ds18x20_pin);
-  //interrupts();
   delayMicroseconds(410);
   return r;
 }
@@ -98,29 +113,39 @@ void OneWireWriteBit(uint8_t v)
   static const uint8_t delay_high[2] = { 5, 55 };
 
   v &= 1;
-  //noInterrupts();
-  digitalWrite(ds18x20_pin, LOW);
-  pinMode(ds18x20_pin, OUTPUT);
-  delayMicroseconds(delay_low[v]);
-  digitalWrite(ds18x20_pin, HIGH);
-  //interrupts();
+  if (!ds18x20_dual_mode) {
+    digitalWrite(ds18x20_pin, LOW);
+    pinMode(ds18x20_pin, OUTPUT);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin, HIGH);
+  } else {
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
   delayMicroseconds(delay_high[v]);
 }
 
 uint8_t OneWireReadBit(void)
 {
-  //noInterrupts();
-  pinMode(ds18x20_pin, OUTPUT);
-  digitalWrite(ds18x20_pin, LOW);
-  delayMicroseconds(3);
-  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  if (!ds18x20_dual_mode) {
+    pinMode(ds18x20_pin, OUTPUT);
+    digitalWrite(ds18x20_pin, LOW);
+    delayMicroseconds(3);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  } else {
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(3);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
   delayMicroseconds(10);
   uint8_t r = digitalRead(ds18x20_pin);
-  //interrupts();
   delayMicroseconds(53);
   return r;
 }
 
+/*------------------------------------------------------------------------------------------*/
+
 void OneWireWrite(uint8_t v)
 {
   for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
@@ -259,6 +284,12 @@ void Ds18x20Init(void)
   uint64_t ids[DS18X20_MAX_SENSORS];
 
   ds18x20_pin = pin[GPIO_DSB];
+  if (pin[GPIO_DSB_OUT] < 99) {
+    ds18x20_pin_out = pin[GPIO_DSB_OUT];
+    ds18x20_dual_mode = true;    // Dual pins mode as used by Shelly
+    pinMode(ds18x20_pin_out, OUTPUT);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+  }
 
   OneWireResetSearch();
 
diff --git a/tasmota/xsns_05_ds18x20_shelly.ino b/tasmota/xsns_05_ds18x20_shelly.ino
deleted file mode 100644
index f8ddcc58d..000000000
--- a/tasmota/xsns_05_ds18x20_shelly.ino
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-  xsns_05_ds18x20.ino - DS18x20 temperature sensor support for Tasmota
-
-  Copyright (C) 2020  Theo Arends
-
-  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/>.
-*/
-
-#ifdef USE_DS18x20SHELLY
-/*********************************************************************************************\
- * DS18B20 - Temperature - Multiple sensors
-\*********************************************************************************************/
-
-#define XSNS_05              5
-
-//#define USE_DS18x20_RECONFIGURE    // When sensor is lost keep retrying or re-configure
-
-#define DS18S20_CHIPID       0x10  // +/-0.5C 9-bit
-#define DS1822_CHIPID        0x22  // +/-2C 12-bit
-#define DS18B20_CHIPID       0x28  // +/-0.5C 12-bit
-#define MAX31850_CHIPID      0x3B  // +/-0.25C 14-bit
-
-#define W1_SKIP_ROM          0xCC
-#define W1_CONVERT_TEMP      0x44
-#define W1_WRITE_EEPROM      0x48
-#define W1_WRITE_SCRATCHPAD  0x4E
-#define W1_READ_SCRATCHPAD   0xBE
-
-#define DS18X20_MAX_SENSORS  8
-
-const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
-
-uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
-
-struct DS18X20STRUCT {
-  uint8_t address[8];
-  uint8_t index;
-  uint8_t valid;
-  float   temperature;
-} ds18x20_sensor[DS18X20_MAX_SENSORS];
-uint8_t ds18x20_sensors = 0;
-uint8_t ds18x20_pin_in = 3;    // Shelly GPIO03
-uint8_t ds18x20_pin_out = 0;   // Shelly GPIO02
-char ds18x20_types[12];
-
-/*********************************************************************************************\
- * Embedded tuned OneWire library
-\*********************************************************************************************/
-
-#define W1_MATCH_ROM         0x55
-#define W1_SEARCH_ROM        0xF0
-
-uint8_t onewire_last_discrepancy = 0;
-uint8_t onewire_last_family_discrepancy = 0;
-bool onewire_last_device_flag = false;
-unsigned char onewire_rom_id[8] = { 0 };
-
-uint8_t OneWireReset(void)
-{
-  uint8_t retries = 125;
-
-  //noInterrupts();
-  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
-  do {
-    if (--retries == 0) {
-      return 0;
-    }
-    delayMicroseconds(2);
-  } while (!digitalRead(ds18x20_pin_in));
-  pinMode(ds18x20_pin_out, OUTPUT);
-  digitalWrite(ds18x20_pin_out, LOW);
-  delayMicroseconds(480);
-  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
-  delayMicroseconds(70);
-  uint8_t r = !digitalRead(ds18x20_pin_in);
-  //interrupts();
-  delayMicroseconds(410);
-  return r;
-}
-
-void OneWireWriteBit(uint8_t v)
-{
-  static const uint8_t delay_low[2] = { 65, 10 };
-  static const uint8_t delay_high[2] = { 5, 55 };
-
-  v &= 1;
-  //noInterrupts();
-  digitalWrite(ds18x20_pin_out, LOW);
-  pinMode(ds18x20_pin_out, OUTPUT);
-  delayMicroseconds(delay_low[v]);
-  digitalWrite(ds18x20_pin_out, HIGH);
-  //interrupts();
-  delayMicroseconds(delay_high[v]);
-}
-
-uint8_t OneWireReadBit(void)
-{
-  //noInterrupts();
-  pinMode(ds18x20_pin_out, OUTPUT);
-  digitalWrite(ds18x20_pin_out, LOW);
-  delayMicroseconds(3);
-  pinMode(ds18x20_pin_in, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
-  delayMicroseconds(10);
-  uint8_t r = digitalRead(ds18x20_pin_in);
-  //interrupts();
-  delayMicroseconds(53);
-  return r;
-}
-
-void OneWireWrite(uint8_t v)
-{
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    OneWireWriteBit((bit_mask & v) ? 1 : 0);
-  }
-}
-
-uint8_t OneWireRead(void)
-{
-  uint8_t r = 0;
-
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    if (OneWireReadBit()) {
-      r |= bit_mask;
-    }
-  }
-  return r;
-}
-
-void OneWireSelect(const uint8_t rom[8])
-{
-  OneWireWrite(W1_MATCH_ROM);
-  for (uint32_t i = 0; i < 8; i++) {
-    OneWireWrite(rom[i]);
-  }
-}
-
-void OneWireResetSearch(void)
-{
-  onewire_last_discrepancy = 0;
-  onewire_last_device_flag = false;
-  onewire_last_family_discrepancy = 0;
-  for (uint32_t i = 0; i < 8; i++) {
-    onewire_rom_id[i] = 0;
-  }
-}
-
-uint8_t OneWireSearch(uint8_t *newAddr)
-{
-  uint8_t id_bit_number = 1;
-  uint8_t last_zero = 0;
-  uint8_t rom_byte_number = 0;
-  uint8_t search_result = 0;
-  uint8_t id_bit;
-  uint8_t cmp_id_bit;
-  unsigned char rom_byte_mask = 1;
-  unsigned char search_direction;
-
-  if (!onewire_last_device_flag) {
-    if (!OneWireReset()) {
-      onewire_last_discrepancy = 0;
-      onewire_last_device_flag = false;
-      onewire_last_family_discrepancy = 0;
-      return false;
-    }
-    OneWireWrite(W1_SEARCH_ROM);
-    do {
-      id_bit     = OneWireReadBit();
-      cmp_id_bit = OneWireReadBit();
-
-      if ((id_bit == 1) && (cmp_id_bit == 1)) {
-        break;
-      } else {
-        if (id_bit != cmp_id_bit) {
-          search_direction = id_bit;
-        } else {
-          if (id_bit_number < onewire_last_discrepancy) {
-            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
-          } else {
-            search_direction = (id_bit_number == onewire_last_discrepancy);
-          }
-          if (search_direction == 0) {
-            last_zero = id_bit_number;
-            if (last_zero < 9) {
-              onewire_last_family_discrepancy = last_zero;
-            }
-          }
-        }
-        if (search_direction == 1) {
-          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
-        } else {
-          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
-        }
-        OneWireWriteBit(search_direction);
-        id_bit_number++;
-        rom_byte_mask <<= 1;
-        if (rom_byte_mask == 0) {
-          rom_byte_number++;
-          rom_byte_mask = 1;
-        }
-      }
-    } while (rom_byte_number < 8);
-    if (!(id_bit_number < 65)) {
-      onewire_last_discrepancy = last_zero;
-      if (onewire_last_discrepancy == 0) {
-        onewire_last_device_flag = true;
-      }
-      search_result = true;
-    }
-  }
-  if (!search_result || !onewire_rom_id[0]) {
-    onewire_last_discrepancy = 0;
-    onewire_last_device_flag = false;
-    onewire_last_family_discrepancy = 0;
-    search_result = false;
-  }
-  for (uint32_t i = 0; i < 8; i++) {
-    newAddr[i] = onewire_rom_id[i];
-  }
-  return search_result;
-}
-
-bool OneWireCrc8(uint8_t *addr)
-{
-  uint8_t crc = 0;
-  uint8_t len = 8;
-
-  while (len--) {
-    uint8_t inbyte = *addr++;          // from 0 to 7
-    for (uint32_t i = 8; i; i--) {
-      uint8_t mix = (crc ^ inbyte) & 0x01;
-      crc >>= 1;
-      if (mix) {
-        crc ^= 0x8C;
-      }
-      inbyte >>= 1;
-    }
-  }
-  return (crc == *addr);               // addr 8
-}
-
-/********************************************************************************************/
-
-void Ds18x20Init(void)
-{
-  uint64_t ids[DS18X20_MAX_SENSORS];
-
-//  ds18x20_pin = pin[GPIO_DSB];
-
-  OneWireResetSearch();
-
-  ds18x20_sensors = 0;
-  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
-    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
-      break;
-    }
-    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
-       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
-      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
-      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];  // Chip id
-      for (uint32_t j = 6; j > 0; j--) {
-        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
-      }
-      ds18x20_sensors++;
-    }
-  }
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
-      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {  // Sort ascending
-        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
-      }
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
-}
-
-void Ds18x20Convert(void)
-{
-  OneWireReset();
-  OneWireWrite(W1_SKIP_ROM);           // Address all Sensors on Bus
-  OneWireWrite(W1_CONVERT_TEMP);       // start conversion, no parasite power on at the end
-//  delay(750);                          // 750ms should be enough for 12bit conv
-}
-
-bool Ds18x20Read(uint8_t sensor)
-{
-  uint8_t data[9];
-  int8_t sign = 1;
-
-  uint8_t index = ds18x20_sensor[sensor].index;
-  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
-  for (uint32_t retry = 0; retry < 3; retry++) {
-    OneWireReset();
-    OneWireSelect(ds18x20_sensor[index].address);
-    OneWireWrite(W1_READ_SCRATCHPAD);
-    for (uint32_t i = 0; i < 9; i++) {
-      data[i] = OneWireRead();
-    }
-    if (OneWireCrc8(data)) {
-      switch(ds18x20_sensor[index].address[0]) {
-        case DS18S20_CHIPID: {
-          if (data[1] > 0x80) {
-            data[0] = (~data[0]) +1;
-            sign = -1;                     // App-Note fix possible sign error
-          }
-          float temp9 = (float)(data[0] >> 1) * sign;
-          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case DS1822_CHIPID:
-        case DS18B20_CHIPID: {
-          if (data[4] != 0x7F) {
-            data[4] = 0x7F;                 // Set resolution to 12-bit
-            OneWireReset();
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_SCRATCHPAD);
-            OneWireWrite(data[2]);          // Th Register
-            OneWireWrite(data[3]);          // Tl Register
-            OneWireWrite(data[4]);          // Configuration Register
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_EEPROM);  // Save scratchpad to EEPROM
-          }
-          uint16_t temp12 = (data[1] << 8) + data[0];
-          if (temp12 > 2047) {
-            temp12 = (~temp12) +1;
-            sign = -1;
-          }
-          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);  // Divide by 16
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case MAX31850_CHIPID: {
-          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
-          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);  // Divide by 16
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-      }
-    }
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
-  return false;
-}
-
-void Ds18x20Name(uint8_t sensor)
-{
-  uint8_t index = sizeof(ds18x20_chipids);
-  while (index) {
-    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
-      break;
-    }
-    index--;
-  }
-  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
-  if (ds18x20_sensors > 1) {
-    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
-  }
-}
-
-/********************************************************************************************/
-
-void Ds18x20EverySecond(void)
-{
-  if (uptime & 1) {
-    // 2mS
-    Ds18x20Convert();          // Start conversion, takes up to one second
-  } else {
-    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-      // 12mS per device
-      if (!Ds18x20Read(i)) {   // Read temperature
-        Ds18x20Name(i);
-        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
-#ifdef USE_DS18x20_RECONFIGURE
-        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
-          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
-          Ds18x20Init();       // Re-configure
-        }
-#endif  // USE_DS18x20_RECONFIGURE
-      }
-    }
-  }
-}
-
-void Ds18x20Show(bool json)
-{
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    uint8_t index = ds18x20_sensor[i].index;
-
-    if (ds18x20_sensor[index].valid) {   // Check for valid temperature
-      char temperature[33];
-      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
-
-      Ds18x20Name(i);
-
-      if (json) {
-        char address[17];
-        for (uint32_t j = 0; j < 6; j++) {
-          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);  // Skip sensor type and crc
-        }
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == i)) {
-          DomoticzSensor(DZ_TEMP, temperature);
-        }
-#endif  // USE_DOMOTICZ
-#ifdef USE_KNX
-        if ((0 == tele_period) && (0 == i)) {
-          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
-        }
-#endif  // USE_KNX
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
-#endif  // USE_WEBSERVER
-      }
-    }
-  }
-}
-
-/*********************************************************************************************\
- * Interface
-\*********************************************************************************************/
-
-bool Xsns05(uint8_t function)
-{
-  bool result = false;
-
-//  if (pin[GPIO_DSB] < 99) {
-    switch (function) {
-      case FUNC_INIT:
-        Ds18x20Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        Ds18x20EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Ds18x20Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ds18x20Show(0);
-        break;
-#endif  // USE_WEBSERVER
-    }
-//  }
-  return result;
-}
-
-#endif  // USE_DS18x20SHELLY

From e8f8b48c7786264773d55f53358e4a9da06696a3 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Wed, 5 Feb 2020 16:56:41 +0100
Subject: [PATCH 222/403] clean ups, hopefully no real code changes

---
 tasmota/xsns_92_MI_HM10.ino | 68 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index 316d1886d..b9dd74db5 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -48,7 +48,7 @@ struct {
   uint8_t current_task_delay;  // number of 100ms-cycles
   uint8_t last_command;
   uint16_t firmware;
-  uint32_t period;             // set manually in addition to TELE-period
+  uint32_t period;             // set manually in addition to TELE-period, is set to TELE-period after start
   uint32_t serialSpeed;
   struct {
     uint32_t init:1;
@@ -59,7 +59,7 @@ struct {
     // TODO: more to come
   } mode;
   struct {
-    uint8_t   sensor;           // points to to the number 0...255
+    uint8_t sensor;           // points to to the number 0...255
     // TODO: more to come
   } state;
 } HM10;
@@ -68,7 +68,7 @@ struct {
 struct {
   uint16_t temp;
   uint8_t hum;
-} LYWSD03;
+} LYWSD03_HT;
 #pragma pack(0)
 
 struct mi_sensor_t{
@@ -125,7 +125,7 @@ const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10Sl
 enum HM10_Commands {          // commands useable in console or rules
   CMND_HM10_DISC_SCAN,        // re-scan for sensors
   CMND_HM10_AT,               // send AT-command for debugging and special configuration
-  CMND_HM10_PERIOD,            // set period like TELE-period in seconds between read-cycles
+  CMND_HM10_PERIOD,           // set period like TELE-period in seconds between read-cycles
   CMND_HM10_BAUD              // serial speed of ESP8266 (<-> HM10), does not change baud rate of HM10
   };
 
@@ -169,6 +169,10 @@ void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
                           HM10_TASK_LIST[slot][0]   = task;  
 }
 
+/*********************************************************************************************\
+ * chained tasks
+\*********************************************************************************************/
+
 void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disconnect
                           HM10_Launchtask(TASK_HM10_ROLE1,1,1);         // set role to 1
                           HM10_Launchtask(TASK_HM10_IMME1,2,1);         // set imme to 1
@@ -179,19 +183,18 @@ void HM10_Reset(void) {   HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disco
 
 void HM10_Discovery_Scan(void) {
                           HM10_Launchtask(TASK_HM10_DISCONN,0,1);       // disconnect
-                          HM10_Launchtask(TASK_HM10_DISC,1,1);         // discovery
+                          HM10_Launchtask(TASK_HM10_DISC,1,1);          // discovery
                           }
-                          
+
 void HM10_Read_Sensor(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
                           HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
                           HM10_Launchtask(TASK_HM10_UNSUBSCR,3,80);      // unsubscribe
-                          HM10_Launchtask(TASK_HM10_READ_BT,4,5);       // read Battery
+                          HM10_Launchtask(TASK_HM10_READ_BT,4,5);        // read Battery
                           HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
                           }
 
-
 /**
  * @brief Return the slot number of a known sensor or return create new sensor slot
  *
@@ -276,16 +279,16 @@ void HM10SerialInit(void) {
   return;
 }
 
-/*********************************************************************************************\
- * create the HM10 commands payload, and send it via serial interface to the HM10 module
- \*********************************************************************************************/
+/**
+ * @brief convert Mac-String to byte array
+ * 
+ * @param string Hex-string, must contain 12 chars (no error checking)
+ * @param _mac Must be a uint8_t[6], filled with zeros
+ */
 
-void HM10datahex(const char* string, uint8_t _mac[]) {
-    uint32_t slength = 12;
-    // uint8_t _mac[6] = {0};
+void HM10MACStringToBytes(const char* string, uint8_t _mac[]) {
     uint32_t index = 0;
-    DEBUG_SENSOR_LOG(PSTR("HM10: mac-string %s"), string);
-    while (index < slength) {
+    while (index < 12) {
         char c = string[index];
         uint32_t value = 0;
         if(c >= '0' && c <= '9')
@@ -303,6 +306,7 @@ void HM10datahex(const char* string, uint8_t _mac[]) {
 /*********************************************************************************************\
  * parse the response
 \*********************************************************************************************/
+
 void HM10ParseResponse(char *buf) {
     if (!strncmp(buf,"OK",2)) {
        DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
@@ -320,7 +324,7 @@ void HM10ParseResponse(char *buf) {
       memcpy((void *)_mac,(void *)(_pos+4),12);
       DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
       uint8_t _newMacArray[6] = {0};
-      HM10datahex(_mac, _newMacArray);
+      HM10MACStringToBytes(_mac, _newMacArray);
       DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
       MIBLEgetSensorSlot(_newMacArray, 0xff);
     } 
@@ -332,21 +336,19 @@ void HM10ParseResponse(char *buf) {
 void HM10readTempHum(char *_buf){
   DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
   if(_buf[0] != 0 && _buf[1] != 0){
-    memcpy(&LYWSD03,(void *)_buf,3);
-    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03.temp,LYWSD03.hum);
-    // uint8_t _serial[6] = {0};
-    // uint32_t _slot = MIBLEgetSensorSlot(HM10Mac[HM10.state.sensor], 4);
+    memcpy(&LYWSD03_HT,(void *)_buf,3);
+    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03_HT.temp,LYWSD03_HT.hum);
     uint32_t _slot = HM10.state.sensor;
 
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
     static float _tempFloat;
-    _tempFloat=(float)(LYWSD03.temp)/100.0f;
+    _tempFloat=(float)(LYWSD03_HT.temp)/100.0f;
     if(_tempFloat<60){
         MIBLEsensors.at(_slot).temp=_tempFloat;
         HM10.mode.awaitingHT = false;
         HM10.current_task_delay = 0;
     }
-    _tempFloat=(float)LYWSD03.hum;
+    _tempFloat=(float)LYWSD03_HT.hum;
     if(_tempFloat<100){
       MIBLEsensors.at(_slot).hum = _tempFloat;
       DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
@@ -371,7 +373,7 @@ void HM10readBat(char *_buf){
 \*********************************************************************************************/
 
 bool HM10SerialHandleFeedback(){                  // every 50 milliseconds
-  bool success    = false;                        // true disables possible repetition of commands, set to false only for debugging
+  bool success    = false;
   uint32_t i       = 0;
   char ret[HM10_MAX_RX_BUF] = {0};                // reset array with zeros
   
@@ -407,7 +409,6 @@ bool HM10SerialHandleFeedback(){                  // every 50 milliseconds
 \*********************************************************************************************/
 
 void HM10_TaskEvery100ms(){
-  // HM10SerialHandleFeedback();
   if (HM10.current_task_delay == 0)  {
     uint8_t i = 0;
     bool runningTaskLoop = true;
@@ -525,7 +526,6 @@ void HM10_TaskEvery100ms(){
           HM10.mode.awaitingHT = true;
           runningTaskLoop = false;
           break;
-
         case TASK_HM10_DONE:                                    // this entry was already handled
           // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sFound done HM10_TASK"),D_CMND_HM10);
           // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%snext slot:%u, i: %u"),D_CMND_HM10, HM10_TASK_LIST[i+1][0],i);
@@ -538,9 +538,7 @@ void HM10_TaskEvery100ms(){
               HM10_TASK_LIST[j][1] = 0;                              // reset all delays
             }
             runningTaskLoop = false;                                  // return to main loop
-            // AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%sUpdate GUI via AJAX"),D_CMND_HM10);
-            // HM10_GUI_NEEDS_UPDATE = true;
-            HM10.mode.pending_task = 0;
+            HM10.mode.pending_task = 0;                               // back to main loop control
             break; 
           }
       }
@@ -552,9 +550,10 @@ void HM10_TaskEvery100ms(){
   }
 }
 
-/*
-|*  Loops
-\*                       */
+/**
+ * @brief Main loop of the driver, "high level"-loop
+ * 
+ */
 
 void HM10EverySecond(){
   if(HM10.firmware == 0) return;
@@ -574,7 +573,6 @@ void HM10EverySecond(){
       _nextSensorSlot= 0;
       _counter++;
     }
-    
     DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
   }
   else _counter++;
@@ -736,14 +734,14 @@ bool Xsns92(uint8_t function)
   if (true) { 
     switch (function) {
       case FUNC_INIT:
-        HM10SerialInit();                                    // init and start communication
+        HM10SerialInit();                                  // init and start communication
         break;
       case FUNC_EVERY_50_MSECOND:
         HM10SerialHandleFeedback();                        // -> sniff for device feedback very often
        break;
       case FUNC_EVERY_100_MSECOND:
         if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
-          HM10_TaskEvery100ms();                             // something has to be done, we'll check in the next step
+          HM10_TaskEvery100ms();                           // something has to be done, we'll check in the next step
         }
         break;
       case FUNC_EVERY_SECOND:

From df35a54824462ceacc890b623f16fad2df6ee9b5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 5 Feb 2020 16:57:19 +0100
Subject: [PATCH 223/403] Add link to issue 7469

Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
---
 RELEASENOTES.md      | 2 +-
 tasmota/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2b31dbd3c..381bea521 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -89,4 +89,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
-- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter
+- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index e44f698b0..008a8460c 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### 8.1.0.6 20200205
 
-- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter
+- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 
 ### 8.1.0.5 20200126
 

From a4e613a99255cb2b8db52b426ff2fa5a29bf6274 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Wed, 5 Feb 2020 20:34:38 +0100
Subject: [PATCH 224/403] use MAC, small WEB-UI changes

---
 tasmota/xsns_92_MI_HM10.ino | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_92_MI_HM10.ino
index b9dd74db5..0c253f5fc 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_92_MI_HM10.ino
@@ -638,9 +638,10 @@ bool HM10Cmd(void) {
 \*********************************************************************************************/
 
 const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
-const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
 const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
 const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_HM10_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
 
 void HM10Show(bool json)
 {
@@ -688,20 +689,21 @@ void HM10Show(bool json)
     } else {
       WSContentSend_PD(HTTP_HM10, HM10.firmware);
       for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]); 
+        WSContentSend_PD(HTTP_HM10_HL);
+        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]); 
         if(MIBLEsensors.at(i).temp!=-1000.0f){
           char temperature[33];
           dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
           WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
         }
         if (MIBLEsensors.at(i).type==FLORA){
-          if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no valid value
             WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
           }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no valid value
             WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
           }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no valid value
             char fertility[33];
             dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
             WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);

From 0c046d7e7c2cbefeb1b064da009611d4ad317768 Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Wed, 5 Feb 2020 23:29:44 -0300
Subject: [PATCH 225/403] Update xdrv_12_home_assistant.ino

---
 tasmota/xdrv_12_home_assistant.ino | 591 ++++++++++++++---------------
 1 file changed, 293 insertions(+), 298 deletions(-)

diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 5babe4abb..f6c83c69a 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -19,176 +19,134 @@
 
 #ifdef USE_HOME_ASSISTANT
 
-#define XDRV_12             12
+#define XDRV_12 12
 
-const char HASS_DISCOVER_RELAY[] PROGMEM =
-  "{\"name\":\"%s\","                              // dualr2 1
-  "\"cmd_t\":\"%s\","                              // cmnd/dualr2/POWER2
-  "\"stat_t\":\"%s\","                             // stat/dualr2/RESULT  (implies "\"optimistic\":\"false\",")
-  "\"val_tpl\":\"{{value_json.%s}}\","             // POWER2
-  "\"pl_off\":\"%s\","                             // OFF
-  "\"pl_on\":\"%s\","                              // ON
-  "\"avty_t\":\"%s\","                             // tele/dualr2/LWT
-  "\"pl_avail\":\"" D_ONLINE "\","                 // Online
-  "\"pl_not_avail\":\"" D_OFFLINE "\"";            // Offline
-
-const char HASS_DISCOVER_BUTTON_SWITCH[] PROGMEM =
-  "{\"name\":\"%s\","                              // dualr2 1 BTN
-  "\"stat_t\":\"%s\","                             // dualr2/stat/BUTTON1/ (implies "\"optimistic\":\"false\",")
-  "\"avty_t\":\"%s\","                             // tele/dualr2/LWT
-  "\"pl_avail\":\"" D_ONLINE "\","                 // Online
-  "\"pl_not_avail\":\"" D_OFFLINE "\"";            // Offline
-
-const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
-  ",\"value_template\":\"{{value_json.%s}}\","      // STATE
-  "\"pl_on\":\"%s\","                              // TOGGLE
-  "\"off_delay\":1";                              // Hass has no support for TOGGLE, fake it by resetting to OFF after 1s
-
-const char HASS_DISCOVER_SWITCH_TOGGLE[] PROGMEM =
-  ",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"";      // A switch must maintain his state until the next update
-
-const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
-  ",\"value_template\":\"{{value_json.%s}}\","      // STATE
-  "\"frc_upd\":true,"                             // In ON/OFF case, enable force_update to make automations work
-  "\"pl_on\":\"%s\","                              // ON
-  "\"pl_off\":\"%s\"";                             // OFF
-
-const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
-  ",\"bri_cmd_t\":\"%s\","                         // cmnd/led2/Dimmer
-  "\"bri_stat_t\":\"%s\","                         // stat/led2/RESULT
-  "\"bri_scl\":100,"                               // 100%
-  "\"on_cmd_type\":\"%s\","                        // power on (first), power on (last), no power on (brightness)
-  "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
-
-const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
-  ",\"rgb_cmd_t\":\"%s2\","                        // cmnd/led2/Color2
-  "\"rgb_stat_t\":\"%s\","                         // stat/led2/RESULT
-  "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
-
-const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
-  ",\"whit_val_cmd_t\":\"%s\","                    // cmnd/led2/White
-  "\"whit_val_stat_t\":\"%s\","                    // stat/led2/RESULT
-  "\"white_value_scale\":100,"                     // (No abbreviation defined)
-  "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
-
-const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
-  ",\"clr_temp_cmd_t\":\"%s\","                    // cmnd/led2/CT
-  "\"clr_temp_stat_t\":\"%s\","                    // stat/led2/RESULT
-  "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
-
-const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
-  ",\"fx_cmd_t\":\"%s\","                          // cmnd/led2/Scheme
-  "\"fx_stat_t\":\"%s\","                          // stat/led2/RESULT
-  "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
-  "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]";   // string list with reference to scheme parameter.
+// List of sensors ready for discovery
+const char kHassJsonSensorTypes[] PROGMEM =
+  D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
+  D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
+  D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
+  D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
+const char kHassJsonSensorUnits[] PROGMEM =
+  "|||"
+  "W|%|A|Cm|Hz|%|LX|"
+  "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
+  "W|KWh|KWh|V|Kg|KWh";
+const char kHassJsonSensorDevCla[] PROGMEM =
+  "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
+  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
+  "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
+  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
+  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
 
 const char HASS_DISCOVER_SENSOR[] PROGMEM =
-  "{\"name\":\"%s\","                                 // dualr2 1 BTN
-  "\"stat_t\":\"%s\","                                // cmnd/dualr2/POWER  (implies "\"optimistic\":\"false\",")
-  "\"avty_t\":\"%s\","                                // tele/dualr2/LWT
-  "\"frc_upd\":true,"                                 // force update for better graph representation
-  "\"pl_avail\":\"" D_ONLINE "\","                    // Online
-  "\"pl_not_avail\":\"" D_OFFLINE "\"";               // Offline
+    ",\"unit_of_meas\":\"%s\",\"%s\","           // unit of measure and class (or icon)
+    "\"frc_upd\":true,"                          // force update for better graph representation
+    "\"val_tpl\":\"{{value_json['%s']['%s']";    // "COUNTER":{"C1":0} -> {{ value_json['COUNTER'].['C1']
 
-const char HASS_DISCOVER_SENSOR_TEMP[] PROGMEM =
-  ",\"unit_of_meas\":\"°%c\","                        // °C / °F
-  "\"val_tpl\":\"{{value_json['%s'].Temperature}}\"," // "SI7021-14":{"Temperature":null,"Humidity":null} -> {{ value_json['SI7021-14'].Temperature }}
-  "\"dev_cla\":\"temperature\"";                      // temperature
+const char HASS_DISCOVER_BASE[] PROGMEM =
+    "{\"name\":\"%s\","                          // dualr2 1
+    "\"stat_t\":\"%s\","                         // stat/dualr2/RESULT  (implies "\"optimistic\":\"false\",")
+    "\"avty_t\":\"%s\","                         // tele/dualr2/LWT
+    "\"pl_avail\":\"" D_ONLINE "\","             // Online
+    "\"pl_not_avail\":\"" D_OFFLINE "\"";        // Offline
 
-const char HASS_DISCOVER_SENSOR_HUM[] PROGMEM =
-  ",\"unit_of_meas\":\"%%\","                         // %
-  "\"val_tpl\":\"{{value_json['%s'].Humidity}}\","    // "SI7021-14":{"Temperature":null,"Humidity":null} -> {{ value_json['SI7021-14'].Humidity }}
-  "\"dev_cla\":\"humidity\"";                         // humidity
+const char HASS_DISCOVER_RELAY[] PROGMEM =
+    ",\"cmd_t\":\"%s\","                         // cmnd/dualr2/POWER2
+    "\"val_tpl\":\"{{value_json.%s}}\","         // POWER2
+    "\"pl_off\":\"%s\","                         // OFF
+    "\"pl_on\":\"%s\"";                          // ON
 
-const char HASS_DISCOVER_SENSOR_MOIST[] PROGMEM =
-  ",\"unit_of_meas\":\"%%\","                         // %
-  "\"val_tpl\":\"{{value_json['%s'].Moisture}}\","    // "ANALOG":{"Moisture":78} -> {{ value_json['ANALOG'].Moisture }}
-  "\"dev_cla\":\"humidity\","                         // humidity
-  "\"ic\":\"mdi:cup-water\"";                         // cup-water icon
+const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
+    ",\"value_template\":\"{{value_json.%s}}\"," // STATE
+    "\"pl_on\":\"%s\","                          // TOGGLE
+    "\"off_delay\":1";                           // Hass has no support for TOGGLE, fake it by resetting to OFF after 1s
 
-const char HASS_DISCOVER_SENSOR_PRESS[] PROGMEM =
-  ",\"unit_of_meas\":\"%s\","                         // PressureUnit() setting
-  "\"val_tpl\":\"{{value_json['%s'].%s}}\","          // "BME280":{"Temperature":19.7,"Humidity":27.8,"Pressure":990.1} -> {{ value_json['BME280'].Pressure }}
-  "\"dev_cla\":\"pressure\"";                         // pressure
+const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
+    ",\"value_template\":\"{{value_json.%s}}\"," // STATE
+    "\"frc_upd\":true,"                          // In ON/OFF case, enable force_update to make automations work
+    "\"pl_on\":\"%s\","                          // ON
+    "\"pl_off\":\"%s\"";                         // OFF
 
-//ENERGY
-const char HASS_DISCOVER_SENSOR_KWH[] PROGMEM =
-  ",\"unit_of_meas\":\"kWh\","                 // kWh
-  "\"val_tpl\":\"{{value_json['%s'].%s}}\","  // "ENERGY":{"TotalStartTime":null,"Total":null,"Yesterday":null,"Today":null,"Power":null,"ApparentPower":null,"ReactivePower":null,"Factor":null,"Voltage":null,"Current":null} -> {{ value_json['ENERGY'].Total/Yesterday/Today }}
-  "\"dev_cla\":\"power\"";                    // power
+const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
+    ",\"bri_cmd_t\":\"%s\","                     // cmnd/led2/Dimmer
+    "\"bri_stat_t\":\"%s\","                     // stat/led2/RESULT
+    "\"bri_scl\":100,"                           // 100%
+    "\"on_cmd_type\":\"%s\","                    // power on (first), power on (last), no power on (brightness)
+    "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
 
-const char HASS_DISCOVER_SENSOR_WATT[] PROGMEM =
-  ",\"unit_of_meas\":\"W\","                          // W
-  "\"val_tpl\":\"{{value_json['%s'].%s}}\"," // "ENERGY":{"TotalStartTime":null,"Total":null,"Yesterday":null,"Today":null,"Power":null,"ApparentPower":null,"ReactivePower":null,"Factor":null,"Voltage":null,"Current":null} -> {{ value_json['ENERGY'].POWER }}
-  "\"dev_cla\":\"power\"";
+const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
+    ",\"rgb_cmd_t\":\"%s2\","                    // cmnd/led2/Color2
+    "\"rgb_stat_t\":\"%s\","                     // stat/led2/RESULT
+    "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
 
-const char HASS_DISCOVER_SENSOR_VOLTAGE[] PROGMEM =
-  ",\"unit_of_meas\":\"V\","                          // V
-  "\"val_tpl\":\"{{value_json['%s'].%s}}\"," // "ENERGY":{"TotalStartTime":null,"Total":null,"Yesterday":null,"Today":null,"Power":null,"ApparentPower":null,"ReactivePower":null,"Factor":null,"Voltage":null,"Current":null} -> {{ value_json['ENERGY'].Voltage }}
-  "\"dev_cla\":\"power\"";
+const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
+    ",\"whit_val_cmd_t\":\"%s\","               // cmnd/led2/White
+    "\"whit_val_stat_t\":\"%s\","               // stat/led2/RESULT
+    "\"white_value_scale\":100,"                // (No abbreviation defined)
+    "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
 
-const char HASS_DISCOVER_SENSOR_AMPERE[] PROGMEM =
-  ",\"unit_of_meas\":\"A\","                          // A
-  "\"val_tpl\":\"{{value_json['%s'].%s}}\"," // "ENERGY":{"TotalStartTime":null,"Total":null,"Yesterday":null,"Today":null,"Power":null,"ApparentPower":null,"ReactivePower":null,"Factor":null,"Voltage":null,"Current":null} -> {{ value_json['ENERGY'].Current }}
-  "\"dev_cla\":\"power\"";
+const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
+    ",\"clr_temp_cmd_t\":\"%s\","               // cmnd/led2/CT
+    "\"clr_temp_stat_t\":\"%s\","               // stat/led2/RESULT
+    "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
 
-//ILLUMINANCE
-const char HASS_DISCOVER_SENSOR_ILLUMINANCE[] PROGMEM =
-  ",\"unit_of_meas\":\"LX\","                          // LX by default
-  "\"val_tpl\":\"{{value_json['%s'].Illuminance}}\","  // "ANALOG":{"Illuminance":34}}
-  "\"dev_cla\":\"illuminance\"";                       // illuminance
-
-const char HASS_DISCOVER_SENSOR_ANY[] PROGMEM =
-  ",\"val_tpl\":\"{{value_json['%s'].%s}}\"";          // "COUNTER":{"C1":0} -> {{ value_json['COUNTER'].C1 }}
+const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
+    ",\"fx_cmd_t\":\"%s\","                     // cmnd/led2/Scheme
+    "\"fx_stat_t\":\"%s\","                     // stat/led2/RESULT
+    "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
+    "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]"; // string list with reference to scheme parameter.
 
 const char HASS_DISCOVER_SENSOR_HASS_STATUS[] PROGMEM =
-  ",\"json_attributes_topic\":\"%s\","
-  "\"unit_of_meas\":\" \","                            // " " As unit of measurement to get a value graph in Hass
-  "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\"," // "COUNTER":{"C1":0} -> {{ value_json['COUNTER'].C1 }}
-  "\"ic\":\"mdi:information-outline\"";
+    ",\"json_attributes_topic\":\"%s\","
+    "\"unit_of_meas\":\" \","                     // " " As unit of measurement to get a value graph in HAss
+    "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\","
+    "\"ic\":\"mdi:information-outline\"";
 
 const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
-  ",\"uniq_id\":\"%s\","
-  "\"device\":{\"identifiers\":[\"%06X\"],"
-  "\"connections\":[[\"mac\",\"%s\"]],"
-  "\"name\":\"%s\","
-  "\"model\":\"%s\","
-  "\"sw_version\":\"%s%s\","
-  "\"manufacturer\":\"Tasmota\"}";
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]],"
+    "\"name\":\"%s\","
+    "\"model\":\"%s\","
+    "\"sw_version\":\"%s%s\","
+    "\"manufacturer\":\"Tasmota\"}";
 
 const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
-  ",\"uniq_id\":\"%s\","
-  "\"device\":{\"identifiers\":[\"%06X\"],"
-  "\"connections\":[[\"mac\",\"%s\"]]}";
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]]}";
 
 const char HASS_DISCOVER_TOPIC_PREFIX[] PROGMEM =
-  ",\"~\":\"%s\"";
+    ",\"~\":\"%s\"";
 
 uint8_t hass_init_step = 0;
 uint8_t hass_mode = 0;
 int hass_tele_period = 0;
 
-static void FindPrefix(char* s1, char* s2, char* out)
+static void FindPrefix(char *s1, char *s2, char *out)
 {
   int prefixlen = 0;
 
-  while (s1[prefixlen] != '\0' && s2[prefixlen] != '\0' && s1[prefixlen] == s2[prefixlen]) {
+  while (s1[prefixlen] != '\0' && s2[prefixlen] != '\0' && s1[prefixlen] == s2[prefixlen])
+  {
     prefixlen++;
   }
-  strlcpy(out, s1, prefixlen+1);
+  strlcpy(out, s1, prefixlen + 1);
 }
 
-static void Shorten(char** s, char *prefix)
+static void Shorten(char **s, char *prefix)
 {
   size_t len = strlen(*s);
   size_t prefixlen = strlen(prefix);
-  if (len > prefixlen && prefixlen != 0 && !strncmp(*s, prefix, prefixlen)) {
-    *s += prefixlen-1;
+  if (len > prefixlen && prefixlen != 0 && !strncmp(*s, prefix, prefixlen))
+  {
+    *s += prefixlen - 1;
     *s[0] = '~';
   }
 }
 
-void TryResponseAppend_P(const char *format, ... )
+void TryResponseAppend_P(const char *format, ...)
 {
   va_list args;
   va_start(args, format);
@@ -196,14 +154,18 @@ void TryResponseAppend_P(const char *format, ... )
   int dlen = vsnprintf_P(dummy, 1, format, args);
 
   int mlen = strlen(mqtt_data);
-  int slen = sizeof(mqtt_data) -1 -mlen;
-  if (dlen >= slen) {
+  int slen = sizeof(mqtt_data) - 1 - mlen;
+  if (dlen >= slen)
+  {
     AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: MQTT discovery failed due to too long topic or friendly name. "
-                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"), dlen, slen);
+                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"),
+              dlen, slen);
     va_start(args, format);
     vsnprintf_P(log_data, sizeof(log_data), format, args);
     AddLog(LOG_LEVEL_ERROR);
-  } else {
+  }
+  else
+  {
     va_start(args, format);
     vsnprintf_P(mqtt_data + mlen, slen, format, args);
   }
@@ -220,11 +182,12 @@ void HAssAnnounceRelayLight(void)
   bool is_light = false;
   bool is_topic_light = false;
 
-  for (uint32_t i = 1; i <= MAX_RELAYS; i++) {
+  for (uint32_t i = 1; i <= MAX_RELAYS; i++)
+  {
     is_light = ((i == devices_present) && (light_type));
-    is_topic_light = Settings.flag.hass_light || is_light;  // SetOption30 - Enforce HAss autodiscovery as light
+    is_topic_light = Settings.flag.hass_light || is_light; // SetOption30 - Enforce HAss autodiscovery as light
 
-    mqtt_data[0] = '\0';  // Clear retained message
+    mqtt_data[0] = '\0'; // Clear retained message
 
     // Clear "other" topic first in case the device has been reconfigured from light to switch or vice versa
     snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "RL" : "LI", i);
@@ -236,20 +199,24 @@ void HAssAnnounceRelayLight(void)
     snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
                (is_topic_light) ? "light" : "switch", unique_id);
 
-    if (Settings.flag.hass_discovery && (i <= devices_present)) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-      char name[33+2]; // friendlyname(33) + " " + index
+    if (Settings.flag.hass_discovery && (i <= devices_present))
+    {                    // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+      char name[33 + 2]; // friendlyname(33) + " " + index
       char value_template[33];
       char prefix[TOPSZ];
       char *command_topic = stemp1;
       char *state_topic = stemp2;
       char *availability_topic = stemp3;
 
-      if (i > MAX_FRIENDLYNAMES) {
+      if (i > MAX_FRIENDLYNAMES)
+      {
         snprintf_P(name, sizeof(name), PSTR("%s %d"), SettingsText(SET_FRIENDLYNAME1), i);
-      } else {
-        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 +i -1));
       }
-      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable);  // SetOption26 - Switch between POWER or POWER1
+      else
+      {
+        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 + i - 1));
+      }
+      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable); // SetOption26 - Switch between POWER or POWER1
       GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
       //GetTopic_P(state_topic, STAT, mqtt_topic, S_RSLT_RESULT);
       GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
@@ -259,20 +226,22 @@ void HAssAnnounceRelayLight(void)
       Shorten(&state_topic, prefix);
       Shorten(&availability_topic, prefix);
 
-      Response_P(HASS_DISCOVER_RELAY, name, command_topic, state_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2), availability_topic);
+      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic, HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
       TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
       TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
 
 #ifdef USE_LIGHT
-      if (is_light) {
+      if (is_light)
+      {
         char *brightness_command_topic = stemp1;
 
         GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
         Shorten(&brightness_command_topic, prefix);
-        strncpy_P(stemp3, Settings.flag.not_power_linked?PSTR("last"):PSTR("brightness"), sizeof(stemp3));  // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
+        strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3)); // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
         TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
 
-        if (Light.subtype >= LST_RGB) {
+        if (Light.subtype >= LST_RGB)
+        {
           char *rgb_command_topic = stemp1;
 
           GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
@@ -283,16 +252,17 @@ void HAssAnnounceRelayLight(void)
           GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
           Shorten(&effect_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
-
         }
-        if (LST_RGBW == Light.subtype) {
+        if (LST_RGBW == Light.subtype)
+        {
           char *white_temp_command_topic = stemp1;
 
           GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
           Shorten(&white_temp_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
         }
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
+        {
           char *color_temp_command_topic = stemp1;
 
           GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
@@ -300,39 +270,40 @@ void HAssAnnounceRelayLight(void)
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
         }
       }
-#endif  // USE_LIGHT
+#endif // USE_LIGHT
       TryResponseAppend_P(PSTR("}"));
     }
     MqttPublish(stopic, true);
   }
 }
 
-void HAssAnnounceButtonSwitch(uint8_t device, char* topic, uint8_t present, uint8_t key, uint8_t toggle)
+void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle)
 {
-// key 0 = button
-// key 1 = switch
+  // key 0 = button
+  // key 1 = switch
   char stopic[TOPSZ];
   char stemp1[TOPSZ];
   char stemp2[TOPSZ];
   char unique_id[30];
 
-  mqtt_data[0] = '\0';  // Clear retained message
+  mqtt_data[0] = '\0'; // Clear retained message
 
   // Clear or Set topic
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key?"SW":"BTN", device+1);
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key ? "SW" : "BTN", device + 1);
   snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
 
-  if (Settings.flag.hass_discovery && present) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-    char name[33+6]; // friendlyname(33) + " " + "BTN" + " " + index
+  if (Settings.flag.hass_discovery && present)
+  {                    // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+    char name[33 + 6]; // friendlyname(33) + " " + "BTN" + " " + index
     char value_template[33];
     char prefix[TOPSZ];
     char *state_topic = stemp1;
     char *availability_topic = stemp2;
     char jsoname[8];
 
-    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key?"Switch":"Button", device+1);
-    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key?"SWITCH":"BUTTON", device+1);
-    GetPowerDevice(value_template, device+1, sizeof(value_template),
+    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key ? "Switch" : "Button", device + 1);
+    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
+    GetPowerDevice(value_template, device + 1, sizeof(value_template),
                    key + Settings.flag.device_index_enable); // Force index for Switch 1, Index on Button1 is controlled by SetOption26 - Switch between POWER or POWER1
     //GetTopic_P(state_topic, CMND, topic, value_template); // State of button is sent as CMND TOGGLE, state of switch is sent as ON/OFF
     GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
@@ -341,16 +312,19 @@ void HAssAnnounceButtonSwitch(uint8_t device, char* topic, uint8_t present, uint
 
     Shorten(&state_topic, prefix);
     Shorten(&availability_topic, prefix);
-    Response_P(HASS_DISCOVER_BUTTON_SWITCH, name, state_topic, availability_topic);
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-    if (strlen(prefix) > 0 ) TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
+    if (strlen(prefix) > 0)
+      TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
     if (toggle) {
       if (!key) {
-        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT3));
-      } else {TryResponseAppend_P(HASS_DISCOVER_SWITCH_TOGGLE);}
+        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2));
+      } else { // A switch must maintain his state until the next update
+        TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
     }
-    else TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
-
     TryResponseAppend_P(PSTR("}"));
   }
   MqttPublish(stopic, true);
@@ -363,18 +337,21 @@ void HAssAnnounceSwitches(void)
   // Send info about buttons
   char *tmp = SettingsText(SET_MQTT_SWITCH_TOPIC);
   Format(sw_topic, tmp, sizeof(sw_topic));
-  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0 ) {
-    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++) {
+  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0)
+  {
+    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++)
+    {
       uint8_t switch_present = 0;
       uint8_t toggle = 1;
 
-      if (pin[GPIO_SWT1 + switch_index] < 99) {
+      if (pin[GPIO_SWT1 + switch_index] < 99)
+      {
         switch_present = 1;
       }
 
       // Check if MQTT message will be ON/OFF or TOGGLE
       if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
-          Settings.flag3.button_switch_force_local ||   // SetOption61 - Force local operation when button/switch topic is set
+          Settings.flag3.button_switch_force_local || // SetOption61 - Force local operation when button/switch topic is set
           !strcmp(mqtt_topic, sw_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), sw_topic))
       {
         toggle = 0; // MQTT message will be ON/OFF
@@ -392,21 +369,27 @@ void HAssAnnounceButtons(void)
   // Send info about buttons
   char *tmp = SettingsText(SET_MQTT_BUTTON_TOPIC);
   Format(key_topic, tmp, sizeof(key_topic));
-  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0 ) {
-    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
+  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0)
+  {
+    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++)
+    {
       uint8_t button_present = 0;
       uint8_t toggle = 1;
 
-      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type))) {
+      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)))
+      {
         button_present = 1;
-      } else {
-        if (pin[GPIO_KEY1 + button_index] < 99) {
+      }
+      else
+      {
+        if (pin[GPIO_KEY1 + button_index] < 99)
+        {
           button_present = 1;
         }
       }
 
       // Check if MQTT message will be ON/OFF or TOGGLE
-      if (Settings.flag3.button_switch_force_local ||  // SetOption61 - Force local operation when button/switch topic is set
+      if (Settings.flag3.button_switch_force_local || // SetOption61 - Force local operation when button/switch topic is set
           !strcmp(mqtt_topic, key_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic))
       {
         toggle = 0; // MQTT message will be ON/OFF
@@ -417,77 +400,61 @@ void HAssAnnounceButtons(void)
   }
 }
 
-void HAssAnnounceSensor(const char* sensorname, const char* subsensortype)
+void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx)
 {
   char stopic[TOPSZ];
   char stemp1[TOPSZ];
   char stemp2[TOPSZ];
   char unique_id[30];
-  bool is_sensor = true;
-
-  // Announce sensor, special handling of temperature and humidity sensors
-  mqtt_data[0] = '\0';  // Clear retained message
 
+  mqtt_data[0] = '\0'; // Clear retained message
   // Clear or Set topic
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subsensortype);
-  if (!strncmp_P(sensorname, "MPR121", 6)) {    // Add more exceptions here. Perhaps MCP230XX?
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
-    is_sensor = false;
-  } else {
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-  }
-  if (Settings.flag.hass_discovery) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-    char name[33+42]; // friendlyname(33) + " " + sensorname(20?) + " " + sensortype(20?)
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, MultiSubName);
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
+
+  if (Settings.flag.hass_discovery)
+  {                     // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+    char name[33 + 42]; // friendlyname(33) + " " + sensorname(20?) + " " + sensortype(20?)
     char prefix[TOPSZ];
     char *state_topic = stemp1;
     char *availability_topic = stemp2;
 
-    // sensor or binary_sensor? //
-    if (!is_sensor) {
-      snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
-      GetTopic_P(state_topic, STAT, mqtt_topic, PSTR(D_RSLT_RESULT));
-    } else {
-      snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-      GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
-    }
-
-    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, subsensortype);
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
+    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
+    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
     GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
     FindPrefix(state_topic, availability_topic, prefix);
     Shorten(&state_topic, prefix);
     Shorten(&availability_topic, prefix);
 
-    Response_P(HASS_DISCOVER_SENSOR, name, state_topic, availability_topic);
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
     TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
-    if (!strcmp_P(subsensortype, PSTR(D_JSON_TEMPERATURE))) {
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_TEMP, TempUnit(), sensorname);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_HUMIDITY))) {
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_HUM, sensorname);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_PRESSURE))
-               || !strcmp_P(subsensortype, PSTR(D_JSON_PRESSUREATSEALEVEL))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_PRESS, PressureUnit().c_str(), sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_TOTAL))
-               || !strcmp_P(subsensortype, PSTR(D_JSON_TODAY))
-               || !strcmp_P(subsensortype, PSTR(D_JSON_YESTERDAY))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_KWH, sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_POWERUSAGE))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_WATT, sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_VOLTAGE))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_VOLTAGE, sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_CURRENT))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_AMPERE, sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_ILLUMINANCE))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_ILLUMINANCE, sensorname, subsensortype);
-    } else if (!strcmp_P(subsensortype, PSTR(D_JSON_MOISTURE))){
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_MOIST, sensorname, subsensortype);
-    } else {
-        if (is_sensor){
-        TryResponseAppend_P(PSTR(",\"unit_of_meas\":\" \""));   // " " As unit of measurement to get a value graph (not available for binary sensors)
+
+    char jname[32];
+    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHassJsonSensorTypes);
+    if (sensor_index > -1) {
+      char param1[20];
+      GetTextIndexed(param1, sizeof(param1), sensor_index, kHassJsonSensorUnits);
+      switch (sensor_index) {
+        case 0:   // Temperature
+          snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit()); // C or F
+          break;
+        case 1:
+        case 2:
+          snprintf_P(param1, sizeof(param1), PSTR("%s"), PressureUnit().c_str());
+          break;
       }
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR_ANY, sensorname, subsensortype);
+      char param2[50];
+      GetTextIndexed(param2, sizeof(param2), sensor_index, kHassJsonSensorDevCla);
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
+      if (subidx) {
+        TryResponseAppend_P(PSTR("[%d]"), subqty -1);
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, " ", "ic\":\"mdi:eye", sensorname, subsensortype);
     }
-    TryResponseAppend_P(PSTR("}"));
+    TryResponseAppend_P(PSTR("}}\"}"));
   }
   MqttPublish(stopic, true);
 }
@@ -495,40 +462,55 @@ void HAssAnnounceSensor(const char* sensorname, const char* subsensortype)
 void HAssAnnounceSensors(void)
 {
   uint8_t hass_xsns_index = 0;
-
-  do {
+  bool is_sensor = true;
+  uint8_t subqty = 0;
+  do
+  {
     mqtt_data[0] = '\0';
     int tele_period_save = tele_period;
-    tele_period = 2;                                  // Do not allow HA updates during next function call
-    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index);  // ,"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}
+    tele_period = 2;                                 // Do not allow HA updates during next function call
+    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index); // ,"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}
     tele_period = tele_period_save;
 
-    char sensordata[512];                             // Copy because we need to write to mqtt_data
+    char sensordata[512]; // Copy because we need to write to mqtt_data
     strlcpy(sensordata, mqtt_data, sizeof(sensordata));
 
-    if (strlen(sensordata)) {
-      sensordata[0] = '{';                             // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}
-      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);  // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
+    if (strlen(sensordata))
+    {
+      sensordata[0] = '{';
+      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata); // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
+      // USE THE FOLLOWING LINE TO TEST JSON
+      //snprintf_P(sensordata, sizeof(sensordata), PSTR("{\"HX711\":{\"Weight\":[22,34,1023.4], \"Battery\":25}}"));
+      //snprintf_P(sensordata, sizeof(sensordata), (PSTR("{\"PMS5003\":{\"PB0.3\":1,\"PB0.5\":2.3,\"PB1\":2,\"PB2.5\":1,\"PB5\":0,\"PB10\":1,\"CF1\":1,\"CF2.5\":0,\"CF10\":0,\"PM1\":0,\"PM2.5\":0,\"PM10\":0}}")));
 
-      // JsonBuffer size calculation (https://arduinojson.org/v5/assistant/)
-      // 383 = {"MCP230XX":{"D0":0,"D1":0,"D2":0,"D3":0,"D4":0,"D5":0,"D6":0,"D7":0,"D8":0,"D9":0,"D10":0,"D11":0,"D12":0,"D13":0,"D14":0,"D15":0}}
-      // 381 = {"MPR121A":{"Button0":0,"Button1":0,"Button2":0,"Button3":0,"Button4":0,"Button5":0,"Button6":0,"Button7":0,"Button8":0,"Button9":0,"Button10":0,"Button11":0,"Button12":0}}
-      // 420 = {"ENERGY":{"TotalStartTime":"2018-10-30T17:09:47","Total":2.684,"Yesterday":0.020,"Today":0.006,"Period":0.04,"Power":0.49,"ApparentPower":4.71,"ReactivePower":4.70,"Factor":0.10,"Frequency":50.04,"Voltage":226.3,"Current":0.021}}
       StaticJsonBuffer<500> jsonBuffer;
-      JsonObject& root = jsonBuffer.parseObject(sensordata);
-      if (!root.success()) {
+      JsonObject &root = jsonBuffer.parseObject(sensordata);
+      if (!root.success())
+      {
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: jsonBuffer failed to parse '%s'"), sensordata);
         continue;
       }
-      for (auto sensor : root) {
-        const char* sensorname = sensor.key;
-        JsonObject& sensors = sensor.value.as<JsonObject>();
-        if (!sensors.success()) {
+      for (auto sensor : root)
+      {
+        const char *sensorname = sensor.key;
+        JsonObject &sensors = sensor.value.as<JsonObject>();
+        if (!sensors.success())
+        {
           AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: JsonObject failed to parse '%s'"), sensordata);
           continue;
         }
-        for (auto subsensor : sensors) {
-          HAssAnnounceSensor(sensorname, subsensor.key);
+        for (auto subsensor : sensors)
+        {
+          // If there is more than a value on sensor data, 'n' entitites will be created
+          if (subsensor.value.is<JsonArray&>()) {
+            JsonArray& subsensors = subsensor.value.as<JsonArray&>();
+            subqty = subsensors.size();
+            char MultiSubName[20];
+            for (int i = 1; i <= subqty; i++) {
+              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s_%d"), subsensor.key, i);
+              HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
+            }
+          } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}
         }
       }
     }
@@ -544,14 +526,15 @@ void HAssAnnounceStatusSensor(void)
   char unique_id[30];
 
   // Announce sensor
-  mqtt_data[0] = '\0';  // Clear retained message
+  mqtt_data[0] = '\0'; // Clear retained message
 
   // Clear or Set topic
   snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_status"), ESP.getChipId());
   snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
 
-  if (Settings.flag.hass_discovery) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-    char name[33+7]; // friendlyname(33) + " " + "status"
+  if (Settings.flag.hass_discovery)
+  {                    // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+    char name[33 + 7]; // friendlyname(33) + " " + "status"
     char prefix[TOPSZ];
     char *state_topic = stemp1;
     char *availability_topic = stemp2;
@@ -563,10 +546,10 @@ void HAssAnnounceStatusSensor(void)
     Shorten(&state_topic, prefix);
     Shorten(&availability_topic, prefix);
 
-    Response_P(HASS_DISCOVER_SENSOR, name, state_topic, availability_topic);
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
-               SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
+                        SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
     TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
     TryResponseAppend_P(PSTR("}"));
   }
@@ -576,11 +559,11 @@ void HAssAnnounceStatusSensor(void)
 void HAssPublishStatus(void)
 {
   Response_P(PSTR("{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\","
-             "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
-             "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
-             "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
-             "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
-             "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
+                  "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
+                  "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
+                  "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
+                  "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
+                  "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
              my_version, my_image, GetBuildDateAndTime().c_str(), ESP.getSdkVersion(), ModuleName().c_str(),
              GetResetReason().c_str(), GetUptime().c_str(), WifiLinkCount(), WifiDowntime().c_str(), MqttConnectCount(),
              Settings.bootcount, Settings.save_flag, WiFi.localIP().toString().c_str(),
@@ -591,19 +574,21 @@ void HAssPublishStatus(void)
 void HAssDiscovery(void)
 {
   // Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible
-  if (Settings.flag.hass_discovery) {        // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-    Settings.flag.mqtt_response = 0;         // SetOption4  - Switch between MQTT RESULT or COMMAND - Response always as RESULT and not as uppercase command
-    Settings.flag.decimal_text = 1;          // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
-    Settings.flag3.hass_tele_on_power = 1;   // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
-//    Settings.light_scheme = 0;             // To just control color it needs to be Scheme 0
-    if (strcmp_P(SettingsText(SET_MQTT_FULLTOPIC), PSTR("%topic%/%prefix%/"))) {
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, "%topic%/%prefix%/");
-      restart_flag = 2;
-      return;                                // As full topic has changed do restart first before sending discovery data
-    }
+  if (Settings.flag.hass_discovery)
+  {                                        // SetOption19 - Control Home Assistant automatic discovery (See SetOption59)
+    Settings.flag.mqtt_response = 0;       // SetOption4  - Switch between MQTT RESULT or COMMAND - Response always as RESULT and not as uppercase command
+    Settings.flag.decimal_text = 1;        // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
+    Settings.flag3.hass_tele_on_power = 1; // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
+                                           //    Settings.light_scheme = 0;             // To just control color it needs to be Scheme 0
+                                           //    if (strcmp_P(SettingsText(SET_MQTT_FULLTOPIC), PSTR("%topic%/%prefix%/"))) {
+                                           //      SettingsUpdateText(SET_MQTT_FULLTOPIC, "%topic%/%prefix%/");
+                                           //      restart_flag = 2;
+                                           //      return;                                // As full topic has changed do restart first before sending discovery data
+                                           //    }
   }
 
-  if (Settings.flag.hass_discovery || (1 == hass_mode)) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+  if (Settings.flag.hass_discovery || (1 == hass_mode))
+  { // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
     // Send info about relays and lights
     HAssAnnounceRelayLight();
 
@@ -623,13 +608,16 @@ void HAssDiscovery(void)
 
 void HAssDiscover(void)
 {
-  hass_mode = 1;                             // Force discovery
-  hass_init_step = 1;                        // Delayed discovery
+  hass_mode = 1;      // Force discovery
+  hass_init_step = 1; // Delayed discovery
 }
 
 void HAssAnyKey(void)
 {
-  if (!Settings.flag.hass_discovery) { return; }  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+  if (!Settings.flag.hass_discovery)
+  {
+    return;
+  } // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
 
   uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
   uint32_t device = XdrvMailbox.payload & 0xFF;
@@ -653,34 +641,41 @@ bool Xdrv12(uint8_t function)
 {
   bool result = false;
 
-  if (Settings.flag.mqtt_enabled) {          // SetOption3 - Enable MQTT
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        if (hass_init_step) {
-          hass_init_step--;
-          if (!hass_init_step) {
-            HAssDiscovery();                 // Scheduled discovery using available resources
-          }
-        } else if (Settings.flag.hass_discovery && Settings.tele_period) {  // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
-          hass_tele_period++;
-          if (hass_tele_period >= Settings.tele_period) {
-            hass_tele_period = 0;
-
-            mqtt_data[0] = '\0';
-            HAssPublishStatus();
-          }
+  if (Settings.flag.mqtt_enabled)
+  { // SetOption3 - Enable MQTT
+    switch (function)
+    {
+    case FUNC_EVERY_SECOND:
+      if (hass_init_step)
+      {
+        hass_init_step--;
+        if (!hass_init_step)
+        {
+          HAssDiscovery(); // Scheduled discovery using available resources
         }
-        break;
-      case FUNC_ANY_KEY:
-        HAssAnyKey();
-        break;
-      case FUNC_MQTT_INIT:
-        hass_mode = 0;                       // Discovery only if Settings.flag.hass_discovery is set
-        hass_init_step = 2;                  // Delayed discovery
-        break;
+      }
+      else if (Settings.flag.hass_discovery && Settings.tele_period)
+      { // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
+        hass_tele_period++;
+        if (hass_tele_period >= Settings.tele_period)
+        {
+          hass_tele_period = 0;
+
+          mqtt_data[0] = '\0';
+          HAssPublishStatus();
+        }
+      }
+      break;
+    case FUNC_ANY_KEY:
+      HAssAnyKey();
+      break;
+    case FUNC_MQTT_INIT:
+      hass_mode = 0;      // Discovery only if Settings.flag.hass_discovery is set
+      hass_init_step = 2; // Delayed discovery
+      break;
     }
   }
   return result;
 }
 
-#endif  // USE_HOME_ASSISTANT
+#endif // USE_HOME_ASSISTANT

From 12f603cc59fb94c121d91a63b36f7e781e7b8d90 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 6 Feb 2020 12:42:31 +0100
Subject: [PATCH 226/403] Add support for sensor DHT family using Shelly Add-On

- Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
- Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
---
 RELEASENOTES.md            |  2 ++
 tasmota/CHANGELOG.md       |  2 ++
 tasmota/tasmota_template.h |  4 +++-
 tasmota/xsns_06_dht.ino    | 42 +++++++++++++++++++++++++++++++-------
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 381bea521..f4a02d9f0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -70,6 +70,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix ``PowerDelta`` zero power detection (#7515)
 - Fix ``RGBWWTable`` ignored (#7572)
 - Fix PWM flickering at low levels (#7415)
+- Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
@@ -90,3 +91,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 008a8460c..3ea8c832c 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ### 8.1.0.6 20200205
 
+- Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 0067b628f..59c09e177 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -217,6 +217,7 @@ enum UserSelectablePins {
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
   GPIO_DSB_OUT,        // Pseudo Single wire DS18B20 or DS18S20
+  GPIO_DHT11_OUT,      // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -298,7 +299,7 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|"
   D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|"
   D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|"
-  D_SENSOR_DS18X20 "o|"
+  D_SENSOR_DS18X20 "o|" D_SENSOR_DHT11 "o|"
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -561,6 +562,7 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_DHT11,          // DHT11
   GPIO_DHT22,          // DHT21, DHT22, AM2301, AM2302, AM2321
   GPIO_SI7021,         // iTead SI7021
+  GPIO_DHT11_OUT,      // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321
 #endif
 #ifdef USE_DS18x20
   GPIO_DSB,            // Single wire DS18B20 or DS18S20
diff --git a/tasmota/xsns_06_dht.ino b/tasmota/xsns_06_dht.ino
index 1c45a550e..c8c3dccd7 100644
--- a/tasmota/xsns_06_dht.ino
+++ b/tasmota/xsns_06_dht.ino
@@ -34,7 +34,9 @@
 uint32_t dht_max_cycles;
 uint8_t dht_data[5];
 uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;                      // Shelly GPIO00 output only
 bool dht_active = true;                       // DHT configured
+bool dht_dual_mode = false;                   // Single pin mode
 
 struct DHTSTRUCT {
   uint8_t     pin;
@@ -49,7 +51,11 @@ struct DHTSTRUCT {
 void DhtReadPrep(void)
 {
   for (uint32_t i = 0; i < dht_sensors; i++) {
-    digitalWrite(Dht[i].pin, HIGH);
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
   }
 }
 
@@ -77,11 +83,19 @@ bool DhtRead(uint8_t sensor)
 
   if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
     Dht[sensor].lastresult = 0;
-    digitalWrite(Dht[sensor].pin, HIGH);  // Retry read prep
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);  // Retry read prep
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
     delay(250);
   }
-  pinMode(Dht[sensor].pin, OUTPUT);
-  digitalWrite(Dht[sensor].pin, LOW);
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
 
   if (GPIO_SI7021 == Dht[sensor].type) {
     delayMicroseconds(500);
@@ -90,9 +104,14 @@ bool DhtRead(uint8_t sensor)
   }
 
   noInterrupts();
-  digitalWrite(Dht[sensor].pin, HIGH);
-  delayMicroseconds(40);
-  pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  if (!dht_dual_mode) {
+    digitalWrite(Dht[sensor].pin, HIGH);
+    delayMicroseconds(40);
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+    delayMicroseconds(40);
+  }
   delayMicroseconds(10);
   if (-1 == DhtExpectPulse(sensor, LOW)) {
     AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
@@ -109,6 +128,7 @@ bool DhtRead(uint8_t sensor)
     }
   }
   interrupts();
+
   if (error) { return false; }
 
   for (uint32_t i = 0; i < 40; ++i) {
@@ -187,6 +207,13 @@ void DhtInit(void)
   if (dht_sensors) {
     dht_max_cycles = microsecondsToClockCycles(1000);  // 1 millisecond timeout for reading pulses from DHT sensor.
 
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;    // Dual pins mode as used by Shelly
+      dht_sensors = 1;         // We only support one sensor in pseudo mode
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
     for (uint32_t i = 0; i < dht_sensors; i++) {
       pinMode(Dht[i].pin, INPUT_PULLUP);
       Dht[i].lastreadtime = 0;
@@ -196,6 +223,7 @@ void DhtInit(void)
         snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
       }
     }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
   } else {
     dht_active = false;
   }

From f2e1ef476399a3df5dff39ab99d8e11aeb765622 Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Thu, 6 Feb 2020 10:23:45 -0300
Subject: [PATCH 227/403] Update xdrv_12_home_assistant.ino

---
 tasmota/xdrv_12_home_assistant.ino | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index f6c83c69a..ed8df3434 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -51,11 +51,16 @@ const char HASS_DISCOVER_BASE[] PROGMEM =
     "\"pl_avail\":\"" D_ONLINE "\","             // Online
     "\"pl_not_avail\":\"" D_OFFLINE "\"";        // Offline
 
-const char HASS_DISCOVER_RELAY[] PROGMEM =
-    ",\"cmd_t\":\"%s\","                         // cmnd/dualr2/POWER2
-    "\"val_tpl\":\"{{value_json.%s}}\","         // POWER2
-    "\"pl_off\":\"%s\","                         // OFF
-    "\"pl_on\":\"%s\"";                          // ON
+const char HASS_DISCOVER_RELAY[] PROGMEM =	
+  "{\"name\":\"%s\","                             // dualr2 1	                            
+  "\"cmd_t\":\"%s\","                             // cmnd/dualr2/POWER2	            
+  "\"stat_t\":\"%s\","                            // stat/dualr2/RESULT                            
+  "\"val_tpl\":\"{{value_json.%s}}\","            // POWER2	   
+  "\"pl_off\":\"%s\","                            // OFF	
+  "\"pl_on\":\"%s\","                             // ON	
+  "\"avty_t\":\"%s\","                            // tele/dualr2/LWT	
+  "\"pl_avail\":\"" D_ONLINE "\","                // Online	
+  "\"pl_not_avail\":\"" D_OFFLINE "\"";           // Offline
 
 const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
     ",\"value_template\":\"{{value_json.%s}}\"," // STATE
@@ -579,12 +584,12 @@ void HAssDiscovery(void)
     Settings.flag.mqtt_response = 0;       // SetOption4  - Switch between MQTT RESULT or COMMAND - Response always as RESULT and not as uppercase command
     Settings.flag.decimal_text = 1;        // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
     Settings.flag3.hass_tele_on_power = 1; // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
-                                           //    Settings.light_scheme = 0;             // To just control color it needs to be Scheme 0
-                                           //    if (strcmp_P(SettingsText(SET_MQTT_FULLTOPIC), PSTR("%topic%/%prefix%/"))) {
-                                           //      SettingsUpdateText(SET_MQTT_FULLTOPIC, "%topic%/%prefix%/");
-                                           //      restart_flag = 2;
-                                           //      return;                                // As full topic has changed do restart first before sending discovery data
-                                           //    }
+    Settings.light_scheme = 0;             // To just control color it needs to be Scheme 0
+    if (strcmp_P(SettingsText(SET_MQTT_FULLTOPIC), PSTR("%topic%/%prefix%/"))) {
+      SettingsUpdateText(SET_MQTT_FULLTOPIC, "%topic%/%prefix%/");
+      restart_flag = 2;
+      return;                                // As full topic has changed do restart first before sending discovery data
+    }
   }
 
   if (Settings.flag.hass_discovery || (1 == hass_mode))

From d779a2b9b496c5b1a5f64801aef3f41669d816a5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 6 Feb 2020 14:53:35 +0100
Subject: [PATCH 228/403] Add switch modes 11 and 12

Add switch modes 11 (PUSHHOLDMULTI) and 12 (PUSHHOLDMULTI_INV) (#7603)
---
 RELEASENOTES.md              |  1 +
 tasmota/CHANGELOG.md         |  1 +
 tasmota/support_switch.ino   | 43 ++++++++++++++++++++++--------------
 tasmota/support_tasmota.ino  |  3 +--
 tasmota/tasmota.h            |  3 ++-
 tasmota/xdrv_10_rules.ino    |  3 +--
 tasmota/xdrv_10_scripter.ino |  2 +-
 7 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f4a02d9f0..97aaa5ea7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -92,3 +92,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add switch modes 11 (PUSHHOLDMULTI) and 12 (PUSHHOLDMULTI_INV) (#7603)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 3ea8c832c..1ec4c144d 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add switch modes 11 (PUSHHOLDMULTI) and 12 (PUSHHOLDMULTI_INV) (#7603)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index 0cb88d05d..24470ff93 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -48,21 +48,32 @@ void SwitchPullupFlag(uint16 switch_bit)
   bitSet(Switch.no_pullup_mask, switch_bit);
 }
 
-uint8_t SwitchLastState(uint8_t index)
-{
-  return Switch.last_state[index];
-}
-
-void SwitchSetVirtual(uint8_t index, uint8_t state)
+void SwitchSetVirtual(uint32_t index, uint8_t state)
 {
   Switch.virtual_state[index] = state;
 }
 
-uint8_t SwitchGetVirtual(uint8_t index)
+uint8_t SwitchGetVirtual(uint32_t index)
 {
   return Switch.virtual_state[index];
 }
 
+uint8_t SwitchLastState(uint32_t index)
+{
+  return Switch.last_state[index];
+}
+
+bool SwitchState(uint32_t index)
+{
+  uint32_t switchmode = Settings.switchmode[index];
+  return ((FOLLOW_INV == switchmode) ||
+          (PUSHBUTTON_INV == switchmode) ||
+          (PUSHBUTTONHOLD_INV == switchmode) ||
+          (FOLLOWMULTI_INV == switchmode) ||
+          (PUSHHOLDMULTI_INV == switchmode)
+         ) ^ Switch.last_state[index];
+}
+
 /*********************************************************************************************/
 
 void SwitchProbe(void)
@@ -161,15 +172,15 @@ void SwitchHandler(uint8_t mode)
               }
               else
                 SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
-              break;                 
-            case PUSHHOLDMULTI_INV:            
+              break;
+            case PUSHHOLDMULTI_INV:
               if (PRESSED == button){
                 Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
                 SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);  // Execute command via MQTT
               }
               else
                 SendKey(KEY_SWITCH, i +1, POWER_CLEAR);  // Execute command via MQTT
-              break;              
+              break;
           default:
             SendKey(KEY_SWITCH, i +1, POWER_HOLD);  // Execute command via MQTT
             break;
@@ -233,24 +244,24 @@ void SwitchHandler(uint8_t mode)
           if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i]!=0)
               SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;      
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
           }
           if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
-              switchflag = POWER_TOGGLE;   // Toggle with pushbutton         
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                      
-          }       
+              switchflag = POWER_TOGGLE;   // Toggle with pushbutton
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
           break;
         case PUSHHOLDMULTI_INV:
           if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i]!=0)
-              SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT            
+              SendKey(KEY_SWITCH, i +1, POWER_INV);  // Execute command via MQTT
             Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
           }
           if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
             if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
               switchflag = POWER_TOGGLE;   // Toggle with pushbutton
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;                                 
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
           }
           break;
         }
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 9095a09bf..0103430d4 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -664,8 +664,7 @@ bool MqttShowSensor(void)
 #else
     if (pin[GPIO_SWT1 +i] < 99) {
 #endif  // USE_TM1638
-      bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]));
-      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(swm ^ SwitchLastState(i)));
+      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(SwitchState(i)));
     }
   }
   XsnsCall(FUNC_JSON_APPEND);
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 2c6a70fa5..8da6354d9 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -232,7 +232,8 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D
 
 enum WifiConfigOptions {WIFI_RESTART, EX_WIFI_SMARTCONFIG, WIFI_MANAGER, EX_WIFI_WPSCONFIG, WIFI_RETRY, WIFI_WAIT, WIFI_SERIAL, WIFI_MANAGER_RESET_ONLY, MAX_WIFI_OPTION};
 
-enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI, FOLLOWMULTI, FOLLOWMULTI_INV, PUSHHOLDMULTI, PUSHHOLDMULTI_INV, MAX_SWITCH_OPTION};
+enum SwitchModeOptions {TOGGLE, FOLLOW, FOLLOW_INV, PUSHBUTTON, PUSHBUTTON_INV, PUSHBUTTONHOLD, PUSHBUTTONHOLD_INV, PUSHBUTTON_TOGGLE, TOGGLEMULTI,
+                        FOLLOWMULTI, FOLLOWMULTI_INV, PUSHHOLDMULTI, PUSHHOLDMULTI_INV, MAX_SWITCH_OPTION};
 
 enum LedStateOptions {LED_OFF, LED_POWER, LED_MQTTSUB, LED_POWER_MQTTSUB, LED_MQTTPUB, LED_POWER_MQTTPUB, LED_MQTT, LED_POWER_MQTT, MAX_LED_OPTION};
 
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 067745f29..27c7787e0 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -578,8 +578,7 @@ void RulesEvery50ms(void)
 #else
           if (pin[GPIO_SWT1 +i] < 99) {
 #endif  // USE_TM1638
-            bool swm = ((FOLLOW_INV == Settings.switchmode[i]) || (PUSHBUTTON_INV == Settings.switchmode[i]) || (PUSHBUTTONHOLD_INV == Settings.switchmode[i]) || (FOLLOWMULTI_INV == Settings.switchmode[i]) || (PUSHHOLDMULTI_INV == Settings.switchmode[i]));
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (swm ^ SwitchLastState(i)));
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (SwitchState(i)));
             RulesProcessEvent(json_event);
           }
         }
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index c874ab85c..d850dfaea 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -1588,7 +1588,7 @@ chknext:
         if (!strncmp(vname,"sw[",3)) {
           // tasmota switch state
           GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          fvar=SwitchLastState((uint8_t)fvar);
+          fvar=SwitchLastState((uint32_t)fvar);
           // skip ] bracket
           len++;
           goto exit;

From 48d70bc7bb28bee8adf8a060c7c2fc5bdf7ad764 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 6 Feb 2020 16:25:37 +0100
Subject: [PATCH 229/403] Add Buzzer commands

Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
---
 RELEASENOTES.md             |  5 +++--
 tasmota/CHANGELOG.md        |  3 ++-
 tasmota/support_tasmota.ino | 12 +++++++-----
 tasmota/xdrv_24_buzzer.ino  | 29 ++++++++++++++++++-----------
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 97aaa5ea7..67bdbfc8f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -75,7 +75,9 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
-- Add ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
+- Add commands ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
+- Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
+- Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
 - Add SerialConfig to ``Status 1``
 - Add WifiPower to ``Status 5``
 - Add support for DS1624, DS1621 Temperature sensor by Leonid Myravjev
@@ -92,4 +94,3 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
-- Add switch modes 11 (PUSHHOLDMULTI) and 12 (PUSHHOLDMULTI_INV) (#7603)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 1ec4c144d..f1706f118 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,7 +5,8 @@
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
 - Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
-- Add switch modes 11 (PUSHHOLDMULTI) and 12 (PUSHHOLDMULTI_INV) (#7603)
+- Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
+- Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 55672ac87..984d93d1e 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -347,9 +347,11 @@ void SetLedPowerIdx(uint32_t led, uint32_t state)
     }
     DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
   }
-  #ifdef USE_BUZZER
-  if (led == 0) { BuzzerSetStateToLed(state); }
-  #endif // USE_BUZZER
+#ifdef USE_BUZZER
+  if (led == 0) {
+    BuzzerSetStateToLed(state);
+  }
+#endif // USE_BUZZER
 }
 
 void SetLedPower(uint32_t state)
@@ -385,9 +387,9 @@ void SetLedLink(uint32_t state)
     if (state) { state = 1; }
     digitalWrite(led_pin, (led_inv) ? !state : state);
   }
-  #ifdef USE_BUZZER
+#ifdef USE_BUZZER
   BuzzerSetStateToLed(state);
-  #endif // USE_BUZZER
+#endif // USE_BUZZER
 }
 
 void SetPulseTimer(uint32_t index, uint32_t time)
diff --git a/tasmota/xdrv_24_buzzer.ino b/tasmota/xdrv_24_buzzer.ino
index 40af3128c..5e582d7db 100644
--- a/tasmota/xdrv_24_buzzer.ino
+++ b/tasmota/xdrv_24_buzzer.ino
@@ -31,7 +31,7 @@ struct BUZZER {
   bool enable = false;
   uint8_t inverted = 0;            // Buzzer inverted flag (1 = (0 = On, 1 = Off))
   uint8_t count = 0;               // Number of buzzes
-  uint8_t mode = 0;                // Buzzer mode (0 = (0 = regular, 2 = infinite, 3 = follow LED))
+  uint8_t mode = 0;                // Buzzer mode (0 = regular, 1 = infinite, 2 = follow LED)
   uint8_t set[2];
   uint8_t duration;
   uint8_t state = 0;
@@ -77,14 +77,16 @@ void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32
   }
 }
 
-void BuzzerSetStateToLed(uint32_t state) {
-  if ((Buzzer.enable) && (Buzzer.mode==2)) {
-    Buzzer.state = (state!=0);
+void BuzzerSetStateToLed(uint32_t state)
+{
+  if (Buzzer.enable && (2 == Buzzer.mode)) {
+    Buzzer.state = (state != 0);
     DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
   }
 }
 
-void BuzzerBeep(uint32_t count) {
+void BuzzerBeep(uint32_t count)
+{
   BuzzerBeep(count, 1, 1, 0, 0);
 }
 
@@ -119,7 +121,7 @@ void BuzzerInit(void)
 
 void BuzzerEvery100mSec(void)
 {
-  if ((Buzzer.enable) && (Buzzer.mode != 2)) {
+  if (Buzzer.enable && (Buzzer.mode != 2)) {
     if (Buzzer.count) {
       if (Buzzer.duration) {
         Buzzer.duration--;
@@ -129,9 +131,11 @@ void BuzzerEvery100mSec(void)
             Buzzer.tune >>= 1;
           } else {
             Buzzer.tune = Buzzer.tune_reload;
-            Buzzer.count-= (Buzzer.tune_reload) ? 2 : 1;
+            Buzzer.count -= (Buzzer.tune_reload) ? 2 : 1;
             Buzzer.state = Buzzer.count & 1;
-            if (Buzzer.mode) { Buzzer.count |= 2; }
+            if (Buzzer.mode) {
+              Buzzer.count |= 2;
+            }
           }
           Buzzer.duration = Buzzer.set[Buzzer.state];
         }
@@ -164,14 +168,17 @@ void CmndBuzzer(void)
   // Buzzer 2,3         = Beep twice with duration 300mS and pause 100mS
   // Buzzer 2,3,4       = Beep twice with duration 300mS and pause 400mS
   // Buzzer 2,3,4,0xF54 = Beep a sequence twice indicated by 0xF54 = 1111 0101 01 with duration 300mS and pause 400mS
+  // Buzzer -1          = Beep infinite
+  // Buzzer -2          = Beep following link led
 
   if (XdrvMailbox.data_len > 0) {
     if (XdrvMailbox.payload != 0) {
-      uint32_t parm[4] = { 0 }, mode = 0;
+      uint32_t parm[4] = { 0 };
+      uint32_t mode = 0;
       ParseParameters(4, parm);
       if (XdrvMailbox.payload <= 0) {
-        parm[0] = 1; // Default Count
-        mode = -XdrvMailbox.payload;
+        parm[0] = 1;                       // Default Count
+        mode = -XdrvMailbox.payload;       // 0, 1 or 2
       }
       for (uint32_t i = 1; i < 3; i++) {
         if (parm[i] < 1) { parm[i] = 1; }  // Default On time, Off time

From 8d48cf3731d615f48e90b872fa9d6b564af294d9 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 6 Feb 2020 17:05:37 +0100
Subject: [PATCH 230/403] pin configs and renames to prepare PR

---
 tasmota/language/bg-BG.h                      |  2 ++
 tasmota/language/cs-CZ.h                      |  2 ++
 tasmota/language/de-DE.h                      |  2 ++
 tasmota/language/el-GR.h                      |  2 ++
 tasmota/language/en-GB.h                      |  2 ++
 tasmota/language/es-ES.h                      |  2 ++
 tasmota/language/fr-FR.h                      |  2 ++
 tasmota/language/he-HE.h                      |  2 ++
 tasmota/language/hu-HU.h                      |  2 ++
 tasmota/language/it-IT.h                      |  2 ++
 tasmota/language/ko-KO.h                      |  2 ++
 tasmota/language/nl-NL.h                      |  2 ++
 tasmota/language/pl-PL.h                      |  2 ++
 tasmota/language/pt-BR.h                      |  2 ++
 tasmota/language/pt-PT.h                      |  2 ++
 tasmota/language/ru-RU.h                      |  2 ++
 tasmota/language/sk-SK.h                      |  2 ++
 tasmota/language/sv-SE.h                      |  2 ++
 tasmota/language/tr-TR.h                      |  2 ++
 tasmota/language/uk-UA.h                      |  2 ++
 tasmota/language/zh-CN.h                      |  2 ++
 tasmota/language/zh-TW.h                      |  2 ++
 tasmota/my_user_config.h                      |  1 +
 tasmota/tasmota_template.h                    |  8 +++++++-
 ...sns_92_MI_HM10.ino => xsns_62_MI_HM10.ino} | 20 +++++++++----------
 25 files changed, 61 insertions(+), 12 deletions(-)
 rename tasmota/{xsns_92_MI_HM10.ino => xsns_62_MI_HM10.ino} (98%)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index e89903cee..1189620b8 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index d7e8e188e..aeff6b45a 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index b710e2975..ff6cfc2e4 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 1c76125fa..e82e3dc53 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index b994b0409..df4fb86da 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 6b8d60d01..89e8bb849 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 4a861bd82..847e831ef 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET   "Esclave Rst"
 #define D_SENSOR_GPS_TX        "GPS TX"
 #define D_SENSOR_GPS_RX        "GPS RX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index 166c5c735..abf6a640b 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index e1cec813a..8c3b63402 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index d7ec1e0e5..54c0a03d8 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 55b8dba97..cc0b0443a 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index c0b5a9862..7362b3b76 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 237bc66f1..403ac0908 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index c56262b11..2d60d1352 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index be9c6d493..b171eb997 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 57dfa40e1..ccbe91c36 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "А"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index ee7afb49f..860082464 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 351bf6dbb..d05bfd179 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index fced504d3..88e8bfe54 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 81d02a8b3..f88ef9cb8 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET   "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE                    "А"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 12c368cd3..f14dc7ec9 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 7c1b2e3fb..afb92d25c 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -635,6 +635,8 @@
 #define D_SENSOR_SLAVE_RESET "Slave RST"
 #define D_SENSOR_GPS_RX        "GPS RX"
 #define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 8b52aa7a7..0e01ffb8c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -542,6 +542,7 @@
 //#define USE_IBEACON                              // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 //  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+ 2.9kb flash, +8 bytes RAM)
+#define USE_HM10                                   // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+... code)
 
 // -- Power monitoring sensors --------------------
 #define USE_ENERGY_MARGIN_DETECTION              // Add support for Energy Margin detection (+1k6 code)
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index f041620c6..ba7c7c318 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -216,6 +216,8 @@ enum UserSelectablePins {
   GPIO_HPMA_TX,        // Honeywell HPMA115S0 Serial interface
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
+  GPIO_HM10_RX,        // HM10-BLE-Mijia-bridge serial interface
+  GPIO_HM10_TX,        // HM10-BLE-Mijia-bridge serial interface
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -296,7 +298,7 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_DEEPSLEEP "|" D_SENSOR_EXS_ENABLE "|"
   D_SENSOR_SLAVE_TX "|" D_SENSOR_SLAVE_RX "|" D_SENSOR_SLAVE_RESET "|" D_SENSOR_SLAVE_RESET "i|"
   D_SENSOR_HPMA_RX "|" D_SENSOR_HPMA_TX "|"
-  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX
+  D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|" D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -737,6 +739,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
 #endif
+#ifdef USE_HM10
+  GPIO_HM10_RX,         // GPS serial interface
+  GPIO_HM10_TX,         // GPS serial interface
+#endif
 
 #ifdef USE_MGC3130
   GPIO_MGC3130_XFER,
diff --git a/tasmota/xsns_92_MI_HM10.ino b/tasmota/xsns_62_MI_HM10.ino
similarity index 98%
rename from tasmota/xsns_92_MI_HM10.ino
rename to tasmota/xsns_62_MI_HM10.ino
index 0c253f5fc..6255da01f 100644
--- a/tasmota/xsns_92_MI_HM10.ino
+++ b/tasmota/xsns_62_MI_HM10.ino
@@ -22,15 +22,13 @@
   --------------------------------------------------------------------------------------------
 
   ---
-  0.9.0.0 20200130  started - initial development by Christian Baars
+  0.9.0.0 20200130  started - initial development by Christian Baars (support LYWSD03 only)
                     forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
 
 */
+#ifdef USE_HM10
 
-#define XSNS_92                    92
-
-#define HM_PIN_RX  5   // D1 Hardcoded while developing
-#define HM_PIN_TX  4   // D2
+#define XSNS_62                    62
 
 #include <TasmotaSerial.h>
 #include <vector>
@@ -263,7 +261,7 @@ uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
 void HM10SerialInit(void) {
   HM10.mode.init = false;
   HM10.serialSpeed = HM10_BAUDRATE;
-  HM10Serial = new TasmotaSerial(HM_PIN_RX, HM_PIN_TX, 1, 0, HM10_MAX_RX_BUF); 
+  HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
   if (HM10Serial->begin(HM10.serialSpeed)) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
     if (HM10Serial->hardwareSerial()) {
@@ -728,18 +726,17 @@ void HM10Show(bool json)
  * Interface
 \*********************************************************************************************/
 
-bool Xsns92(uint8_t function)
+bool Xsns62(uint8_t function)
 {
   bool result = false;
 
-  // if ((pin[HM_PIN_RX] < 99) && (pin[HM_PIN_TX] < 99)) { 
-  if (true) { 
+  if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) { 
     switch (function) {
       case FUNC_INIT:
         HM10SerialInit();                                  // init and start communication
         break;
       case FUNC_EVERY_50_MSECOND:
-        HM10SerialHandleFeedback();                        // -> sniff for device feedback very often
+        HM10SerialHandleFeedback();                        // check for device feedback very often
        break;
       case FUNC_EVERY_100_MSECOND:
         if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
@@ -763,4 +760,5 @@ bool Xsns92(uint8_t function)
       }
   }
   return result;
-}
\ No newline at end of file
+}
+#endif //USE_HM10
\ No newline at end of file

From 757baf436a490353c1a9403459cabe72abb4e3bc Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Thu, 6 Feb 2020 13:32:54 -0300
Subject: [PATCH 231/403] Update xdrv_12_home_assistant.ino

---
 tasmota/xdrv_12_home_assistant.ino | 101 ++++++-----------------------
 1 file changed, 21 insertions(+), 80 deletions(-)

diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index ed8df3434..6ec695098 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -22,22 +22,23 @@
 #define XDRV_12 12
 
 // List of sensors ready for discovery
-const char kHassJsonSensorTypes[] PROGMEM =
+const char kHAssJsonSensorTypes[] PROGMEM =
   D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
   D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
   D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
   D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
-const char kHassJsonSensorUnits[] PROGMEM =
+const char kHAssJsonSensorUnits[] PROGMEM =
   "|||"
   "W|%|A|Cm|Hz|%|LX|"
   "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
   "W|KWh|KWh|V|Kg|KWh";
-const char kHassJsonSensorDevCla[] PROGMEM =
+const char kHAssJsonSensorDevCla[] PROGMEM =
   "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
   "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
   "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
   "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
   "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
+// List of sensors ready for discovery
 
 const char HASS_DISCOVER_SENSOR[] PROGMEM =
     ",\"unit_of_meas\":\"%s\",\"%s\","           // unit of measure and class (or icon)
@@ -51,21 +52,15 @@ const char HASS_DISCOVER_BASE[] PROGMEM =
     "\"pl_avail\":\"" D_ONLINE "\","             // Online
     "\"pl_not_avail\":\"" D_OFFLINE "\"";        // Offline
 
-const char HASS_DISCOVER_RELAY[] PROGMEM =	
-  "{\"name\":\"%s\","                             // dualr2 1	                            
-  "\"cmd_t\":\"%s\","                             // cmnd/dualr2/POWER2	            
-  "\"stat_t\":\"%s\","                            // stat/dualr2/RESULT                            
-  "\"val_tpl\":\"{{value_json.%s}}\","            // POWER2	   
-  "\"pl_off\":\"%s\","                            // OFF	
-  "\"pl_on\":\"%s\","                             // ON	
-  "\"avty_t\":\"%s\","                            // tele/dualr2/LWT	
-  "\"pl_avail\":\"" D_ONLINE "\","                // Online	
-  "\"pl_not_avail\":\"" D_OFFLINE "\"";           // Offline
+const char HASS_DISCOVER_RELAY[] PROGMEM =
+    ",\"cmd_t\":\"%s\","                         // cmnd/dualr2/POWER2	                           
+    "\"val_tpl\":\"{{value_json.%s}}\","         // POWER2	  
+    "\"pl_off\":\"%s\","                         // OFF	  
+    "\"pl_on\":\"%s\"";                          // ON
 
 const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
-    ",\"value_template\":\"{{value_json.%s}}\"," // STATE
-    "\"pl_on\":\"%s\","                          // TOGGLE
-    "\"off_delay\":1";                           // Hass has no support for TOGGLE, fake it by resetting to OFF after 1s
+    ",\"value_template\":\"{%%if is_state(entity_id,\\\"off\\\")-%%}ON{%%-endif%%}\"," // STATE
+    "\"off_delay\":1";                           // HAss has no support for TOGGLE, fake it by resetting to OFF after 1s
 
 const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
     ",\"value_template\":\"{{value_json.%s}}\"," // STATE
@@ -122,35 +117,10 @@ const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
     "\"device\":{\"identifiers\":[\"%06X\"],"
     "\"connections\":[[\"mac\",\"%s\"]]}";
 
-const char HASS_DISCOVER_TOPIC_PREFIX[] PROGMEM =
-    ",\"~\":\"%s\"";
-
 uint8_t hass_init_step = 0;
 uint8_t hass_mode = 0;
 int hass_tele_period = 0;
 
-static void FindPrefix(char *s1, char *s2, char *out)
-{
-  int prefixlen = 0;
-
-  while (s1[prefixlen] != '\0' && s2[prefixlen] != '\0' && s1[prefixlen] == s2[prefixlen])
-  {
-    prefixlen++;
-  }
-  strlcpy(out, s1, prefixlen + 1);
-}
-
-static void Shorten(char **s, char *prefix)
-{
-  size_t len = strlen(*s);
-  size_t prefixlen = strlen(prefix);
-  if (len > prefixlen && prefixlen != 0 && !strncmp(*s, prefix, prefixlen))
-  {
-    *s += prefixlen - 1;
-    *s[0] = '~';
-  }
-}
-
 void TryResponseAppend_P(const char *format, ...)
 {
   va_list args;
@@ -223,17 +193,12 @@ void HAssAnnounceRelayLight(void)
       }
       GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable); // SetOption26 - Switch between POWER or POWER1
       GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
-      //GetTopic_P(state_topic, STAT, mqtt_topic, S_RSLT_RESULT);
       GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
       GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-      FindPrefix(command_topic, state_topic, prefix);
-      Shorten(&command_topic, prefix);
-      Shorten(&state_topic, prefix);
-      Shorten(&availability_topic, prefix);
 
-      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic, HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
+      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+      TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
       TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-      TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
 
 #ifdef USE_LIGHT
       if (is_light)
@@ -241,7 +206,6 @@ void HAssAnnounceRelayLight(void)
         char *brightness_command_topic = stemp1;
 
         GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
-        Shorten(&brightness_command_topic, prefix);
         strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3)); // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
         TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
 
@@ -250,12 +214,10 @@ void HAssAnnounceRelayLight(void)
           char *rgb_command_topic = stemp1;
 
           GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
-          Shorten(&rgb_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_COLOR, rgb_command_topic, state_topic);
 
           char *effect_command_topic = stemp1;
           GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
-          Shorten(&effect_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
         }
         if (LST_RGBW == Light.subtype)
@@ -263,7 +225,6 @@ void HAssAnnounceRelayLight(void)
           char *white_temp_command_topic = stemp1;
 
           GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
-          Shorten(&white_temp_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
         }
         if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
@@ -271,7 +232,6 @@ void HAssAnnounceRelayLight(void)
           char *color_temp_command_topic = stemp1;
 
           GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
-          Shorten(&color_temp_command_topic, prefix);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
         }
       }
@@ -310,20 +270,15 @@ void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint
     snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
     GetPowerDevice(value_template, device + 1, sizeof(value_template),
                    key + Settings.flag.device_index_enable); // Force index for Switch 1, Index on Button1 is controlled by SetOption26 - Switch between POWER or POWER1
-    //GetTopic_P(state_topic, CMND, topic, value_template); // State of button is sent as CMND TOGGLE, state of switch is sent as ON/OFF
     GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
     GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-    FindPrefix(state_topic, availability_topic, prefix);
 
-    Shorten(&state_topic, prefix);
-    Shorten(&availability_topic, prefix);
     Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-    if (strlen(prefix) > 0)
-      TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
+
     if (toggle) {
       if (!key) {
-        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2));
+        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE);
       } else { // A switch must maintain his state until the next update
         TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
       }
@@ -361,7 +316,6 @@ void HAssAnnounceSwitches(void)
       {
         toggle = 0; // MQTT message will be ON/OFF
       }
-
       HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 1, toggle);
     }
   }
@@ -399,7 +353,6 @@ void HAssAnnounceButtons(void)
       {
         toggle = 0; // MQTT message will be ON/OFF
       }
-
       HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 0, toggle);
     }
   }
@@ -428,19 +381,16 @@ void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const
     GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
     snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
     GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-    FindPrefix(state_topic, availability_topic, prefix);
-    Shorten(&state_topic, prefix);
-    Shorten(&availability_topic, prefix);
 
     Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-    TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
+
 
     char jname[32];
-    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHassJsonSensorTypes);
+    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
     if (sensor_index > -1) {
       char param1[20];
-      GetTextIndexed(param1, sizeof(param1), sensor_index, kHassJsonSensorUnits);
+      GetTextIndexed(param1, sizeof(param1), sensor_index, kHAssJsonSensorUnits);
       switch (sensor_index) {
         case 0:   // Temperature
           snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit()); // C or F
@@ -451,7 +401,7 @@ void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const
           break;
       }
       char param2[50];
-      GetTextIndexed(param2, sizeof(param2), sensor_index, kHassJsonSensorDevCla);
+      GetTextIndexed(param2, sizeof(param2), sensor_index, kHAssJsonSensorDevCla);
       TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
       if (subidx) {
         TryResponseAppend_P(PSTR("[%d]"), subqty -1);
@@ -547,15 +497,12 @@ void HAssAnnounceStatusSensor(void)
     snprintf_P(name, sizeof(name), PSTR("%s status"), SettingsText(SET_FRIENDLYNAME1));
     GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
     GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-    FindPrefix(state_topic, availability_topic, prefix);
-    Shorten(&state_topic, prefix);
-    Shorten(&availability_topic, prefix);
 
     Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
                         SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
-    TryResponseAppend_P(HASS_DISCOVER_TOPIC_PREFIX, prefix);
+  
     TryResponseAppend_P(PSTR("}"));
   }
   MqttPublish(stopic, true);
@@ -585,11 +532,6 @@ void HAssDiscovery(void)
     Settings.flag.decimal_text = 1;        // SetOption17 - Switch between decimal or hexadecimal output - Respond with decimal color values
     Settings.flag3.hass_tele_on_power = 1; // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT - send tele/STATE message as stat/RESULT
     Settings.light_scheme = 0;             // To just control color it needs to be Scheme 0
-    if (strcmp_P(SettingsText(SET_MQTT_FULLTOPIC), PSTR("%topic%/%prefix%/"))) {
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, "%topic%/%prefix%/");
-      restart_flag = 2;
-      return;                                // As full topic has changed do restart first before sending discovery data
-    }
   }
 
   if (Settings.flag.hass_discovery || (1 == hass_mode))
@@ -631,8 +573,7 @@ void HAssAnyKey(void)
   char scommand[CMDSZ];
   snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);
   char stopic[TOPSZ];
-  //GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);  // SetOption4 - Switch between MQTT RESULT or COMMAND
-  //Response_P(S_JSON_COMMAND_SVALUE, scommand, GetStateText(state));
+
   GetTopic_P(stopic, STAT, mqtt_topic, scommand);
   Response_P(S_JSON_COMMAND_SVALUE, PSTR(D_RSLT_STATE), GetStateText(state));
   MqttPublish(stopic);

From a95c5b4f6a05055511271bd3be42404204cff45f Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 6 Feb 2020 19:06:09 +0100
Subject: [PATCH 232/403] resolve conflict

---
 tasmota/tasmota_template.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index ba7c7c318..347ca4a4f 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -216,6 +216,8 @@ enum UserSelectablePins {
   GPIO_HPMA_TX,        // Honeywell HPMA115S0 Serial interface
   GPIO_GPS_RX,         // GPS serial interface
   GPIO_GPS_TX,         // GPS serial interface
+  GPIO_DSB_OUT,        // Pseudo Single wire DS18B20 or DS18S20
+  GPIO_DHT11_OUT,      // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321
   GPIO_HM10_RX,        // HM10-BLE-Mijia-bridge serial interface
   GPIO_HM10_TX,        // HM10-BLE-Mijia-bridge serial interface
   GPIO_SENSOR_END };

From a33ae3cc40a34c093b35038ae3f5c138522c7849 Mon Sep 17 00:00:00 2001
From: ako <arndt.kopp@web.de>
Date: Thu, 6 Feb 2020 22:45:39 +0100
Subject: [PATCH 233/403] PCF8574 - skip detection if i2c address is defined in
 USE_MCP230xx_ADDR Currently the PCF8574 address selection detects the
 MCP230xx which is using an address in the range 0x20 - 0x26. This fix skips
 the address defined in #define USE_MCP230xx_ADDR

---
 tasmota/xdrv_28_pcf8574.ino | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tasmota/xdrv_28_pcf8574.ino b/tasmota/xdrv_28_pcf8574.ino
index ecbde786c..26ae9f65a 100644
--- a/tasmota/xdrv_28_pcf8574.ino
+++ b/tasmota/xdrv_28_pcf8574.ino
@@ -93,6 +93,12 @@ void Pcf8574Init(void)
     }
 
     pcf8574_address++;
+#ifdef USE_MCP230xx_ADDR
+    if (USE_MCP230xx_ADDR == pcf8574_address) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
+      pcf8574_address++;
+    }
+#endif
     if ((PCF8574_ADDR1 +7) == pcf8574_address) {  // Support I2C addresses 0x20 to 0x26 and 0x39 to 0x3F
       pcf8574_address = PCF8574_ADDR2 +1;
     }

From 8ef5ad0204b5bc11a0bd834ab5764a31d4d78cd8 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 7 Feb 2020 10:41:38 +0100
Subject: [PATCH 234/403] Disable HM-10 by default

---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0e01ffb8c..58bd6e7a5 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -542,7 +542,7 @@
 //#define USE_IBEACON                              // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 //  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+ 2.9kb flash, +8 bytes RAM)
-#define USE_HM10                                   // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+... code)
+//#define USE_HM10                                   // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+... code)
 
 // -- Power monitoring sensors --------------------
 #define USE_ENERGY_MARGIN_DETECTION              // Add support for Energy Margin detection (+1k6 code)

From 15df54bb07b379426bd5fd12909d006e1e45f995 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 7 Feb 2020 10:50:06 +0100
Subject: [PATCH 235/403] Add support for HM-10

Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
---
 RELEASENOTES.md              |  4 ++--
 tasmota/CHANGELOG.md         |  4 ++--
 tasmota/my_user_config.h     |  6 +++---
 tasmota/support_features.ino | 24 +++++++++++++++---------
 tasmota/tasmota_post.h       |  4 ++++
 tools/decode-status.py       |  9 ++++++---
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 67bdbfc8f..48c9abc90 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -92,5 +92,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add SoftwareSerial to CSE7766 driver allowing different GPIOs (#7563)
 - Add optional parameter <startcolor> to command ``Scheme <scheme>, <startcolor>`` to control initial start color
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
-- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
-- Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add support for sensors DS18x20 and DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index f1706f118..fd14db3d5 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,10 +3,10 @@
 ### 8.1.0.6 20200205
 
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
-- Add support for sensor DS18x20 on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
-- Add support for sensor DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
+- Add support for sensors DS18x20 and DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
 - Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
+- Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 58bd6e7a5..ab3d55969 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -540,9 +540,9 @@
 //  #define USE_PN532_DATA_RAW                     // Allow DATA block to be used by non-alpha-numberic data (+ 80 bytes code, 48 bytes ram)
 //#define USE_RDM6300                              // Add support for RDM6300 125kHz RFID Reader (+0k8)
 //#define USE_IBEACON                              // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
-//#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
-//  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+ 2.9kb flash, +8 bytes RAM)
-//#define USE_HM10                                   // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+... code)
+//#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+3k1 code, +132 bytes RAM)
+//  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+2k9 code, +8 bytes RAM)
+//#define USE_HM10                                 // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
 
 // -- Power monitoring sensors --------------------
 #define USE_ENERGY_MARGIN_DETECTION              // Add support for Energy Margin detection (+1k6 code)
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index d86bf11bb..376a5a8b2 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -484,27 +484,33 @@ void GetFeatures(void)
   feature5 |= 0x00020000;  // xsns_55_hih_series.ino
 #endif
 #ifdef USE_HPMA
-  feature5 |= 0x00040000;
+  feature5 |= 0x00040000;  // xsns_56_hpma.ino
 #endif
 #ifdef USE_TSL2591
-  feature5 |= 0x00080000;
+  feature5 |= 0x00080000;  // xsns_57_tsl2591.ino
 #endif
 #ifdef USE_DHT12
-  feature5 |= 0x00100000;
+  feature5 |= 0x00100000;  // xsns_58_dht12.ino
 #endif
 #ifdef USE_DS1624
-  feature5 |= 0x00200000;
+  feature5 |= 0x00200000;  // xsns_59_ds1624.ino
 #endif
 #ifdef USE_GPS
-  feature5 |= 0x00400000;
+  feature5 |= 0x00400000;  // xsns_60_GPS.ino
 #endif
 #ifdef USE_HOTPLUG
-  feature5 |= 0x00800000;
+  feature5 |= 0x00800000;  // xdrv_32_hotplug.ino
+#endif
+#ifdef USE_NRF24
+  feature5 |= 0x01000000;  // xsns_33_nrf24l01.ino
+#endif
+#ifdef USE_MIBLE
+  feature5 |= 0x02000000;  // xsns_61_MI_BLE.ino
+#endif
+#ifdef USE_HM10
+  feature5 |= 0x04000000;  // xsns_62_MI_HM10.ino
 #endif
 
-//  feature5 |= 0x01000000;
-//  feature5 |= 0x02000000;
-//  feature5 |= 0x04000000;
 //  feature5 |= 0x08000000;
 
 //  feature5 |= 0x10000000;
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index bef9c567d..b0ef04b06 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -185,6 +185,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_RDM6300                              // Add support for RDM6300 125kHz RFID Reader (+0k8)
 #define USE_IBEACON                              // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
+#define USE_HM10                                 // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
 
 #define USE_ENERGY_SENSOR                        // Add energy sensors (-14k code)
 #define USE_PZEM004T                             // Add support for PZEM004T Energy monitor (+2k code)
@@ -388,6 +389,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_RDM6300                               // Disable support for RDM6300 125kHz RFID Reader (+0k8)
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
+#undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
 
 //#define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI
@@ -480,6 +482,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_RDM6300                               // Disable support for RDM6300 125kHz RFID Reader (+0k8)
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
+#undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
 
 //#undef USE_ENERGY_SENSOR                         // Disable energy sensors
 #undef USE_PZEM004T                              // Disable PZEM004T energy sensor
@@ -593,6 +596,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_RDM6300                               // Disable support for RDM6300 125kHz RFID Reader (+0k8)
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
+#undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors
 #undef USE_PZEM004T                              // Disable PZEM004T energy sensor
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 01319d9e4..2acee4923 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -136,7 +136,10 @@ a_setoption = [[
     "Enable shutter support",
     "Invert PCF8574 ports"
     ],[
-    "","","","",
+    "Reduced CT range for Alexa",
+    "Use FriendlyNames instead of ShortAddresses when possible",
+    "(AWS IoT) publish MQTT state to a device shadow",
+    "",
     "","","","",
     "","","","",
     "","","","",
@@ -189,7 +192,7 @@ a_features = [[
     "USE_SONOFF_SC","USE_SONOFF_RF","USE_SONOFF_L1","USE_EXS_DIMMER",
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
-    "","","","",
+    "USE_NRF24","USE_MIBLE","USE_HM10","",
     "","","",""
     ]]
 
@@ -224,7 +227,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20190819 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200207 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 1a074da0b50c5615ad5a04848ed6cf6e06c35f1c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 7 Feb 2020 12:38:10 +0100
Subject: [PATCH 236/403] Add BootCount Reset Time to Status

Add BootCount Reset Time as BCResetTime to ``Status 1``
---
 RELEASENOTES.md             |  1 +
 tasmota/CHANGELOG.md        |  1 +
 tasmota/settings.h          |  3 ++-
 tasmota/support_command.ino |  5 +++--
 tasmota/support_rtc.ino     | 10 +++++++++-
 tasmota/tasmota.h           |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 48c9abc90..f632ea78d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -94,3 +94,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add rule trigger on one level deeper using syntax with two ``#`` like ``on zigbeereceived#vibration_sensor#aqaracubeside=0 do ...``
 - Add support for sensors DS18x20 and DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
+- Add BootCount Reset Time as BCResetTime to ``Status 1``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index fd14db3d5..3609e1310 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
 - Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
+- Add BootCount Reset Time as BCResetTime to ``Status 1``
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/settings.h b/tasmota/settings.h
index cef401a94..b1afca3ea 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -467,8 +467,9 @@ struct SYSCFG {
   uint8_t       hotplug_scan;              // F03
   uint8_t       reserved1;                 // F04 - reserved for s-hadinger
 
-  uint8_t       free_f05[211];             // F05
+  uint8_t       free_f05[207];             // F05
 
+  uint32_t      bootcount_reset_time;      // FD4
   int           adc_param4;                // FD8
   uint32_t      shutter_button[MAX_KEYS];  // FDC
   uint32_t      i2c_drivers[3];            // FEC I2cDriver
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 24ef2051c..28e725930 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -378,10 +378,10 @@ void CmndStatus(void)
   if ((0 == payload) || (1 == payload)) {
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
                           D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
-                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
+                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"BCResetTime\":\"%s\",\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
                           Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
                           GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
-                          Settings.cfg_holder, Settings.bootcount, Settings.save_flag, GetSettingsAddress());
+                          Settings.cfg_holder, Settings.bootcount, GetDateAndTime(DT_BOOTCOUNT).c_str(), Settings.save_flag, GetSettingsAddress());
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
   }
 
@@ -1453,6 +1453,7 @@ void CmndReset(void)
     break;
   case 99:
     Settings.bootcount = 0;
+    Settings.bootcount_reset_time = 0;
     ResponseCmndDone();
     break;
   default:
diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino
index fe8f12454..f8fb25779 100644
--- a/tasmota/support_rtc.ino
+++ b/tasmota/support_rtc.ino
@@ -184,6 +184,9 @@ String GetDateAndTime(uint8_t time_type)
   uint32_t time = Rtc.local_time;
 
   switch (time_type) {
+    case DT_BOOTCOUNT:
+      time = Settings.bootcount_reset_time;
+      break;
     case DT_ENERGY:
       time = Settings.energy_kWhtotal_time;
       break;
@@ -438,7 +441,12 @@ void RtcSecond(void)
     }
     Rtc.local_time += Rtc.time_timezone;
     Rtc.time_timezone /= 60;
-    if (!Settings.energy_kWhtotal_time) { Settings.energy_kWhtotal_time = Rtc.local_time; }
+    if (!Settings.energy_kWhtotal_time) {
+      Settings.energy_kWhtotal_time = Rtc.local_time;
+    }
+    if (Settings.bootcount_reset_time < START_VALID_TIME) {
+      Settings.bootcount_reset_time = Rtc.local_time;
+    }
   }
 
   BreakTime(Rtc.local_time, RtcTime);
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 8da6354d9..11a530f32 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -226,7 +226,7 @@ enum WeekInMonthOptions {Last, First, Second, Third, Fourth};
 enum DayOfTheWeekOptions {Sun=1, Mon, Tue, Wed, Thu, Fri, Sat};
 enum MonthNamesOptions {Jan=1, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec};
 enum HemisphereOptions {North, South};
-enum GetDateAndTimeOptions { DT_LOCAL, DT_UTC, DT_RESTART, DT_ENERGY };
+enum GetDateAndTimeOptions { DT_LOCAL, DT_UTC, DT_RESTART, DT_ENERGY, DT_BOOTCOUNT };
 
 enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE};
 

From fe1919098d31bab1c8acaa2ad150d3f9e8b6d76b Mon Sep 17 00:00:00 2001
From: Federico Leoni <effelle@gmail.com>
Date: Fri, 7 Feb 2020 12:11:29 -0300
Subject: [PATCH 237/403] Update xdrv_12_home_assistant.ino

---
 tasmota/xdrv_12_home_assistant.ino | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 6ec695098..7396694af 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -366,8 +366,10 @@ void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const
   char unique_id[30];
 
   mqtt_data[0] = '\0'; // Clear retained message
-  // Clear or Set topic
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, MultiSubName);
+  // Clear or Set topic  
+  char subname[20];
+  NoAlNumToUnderscore(subname, MultiSubName); //Replace all non alphaumeric characters to '_' to avoid topic name issues
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
   snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
 
   if (Settings.flag.hass_discovery)
@@ -385,7 +387,6 @@ void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const
     Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
 
-
     char jname[32];
     int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
     if (sensor_index > -1) {
@@ -436,7 +437,6 @@ void HAssAnnounceSensors(void)
       snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata); // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
       // USE THE FOLLOWING LINE TO TEST JSON
       //snprintf_P(sensordata, sizeof(sensordata), PSTR("{\"HX711\":{\"Weight\":[22,34,1023.4], \"Battery\":25}}"));
-      //snprintf_P(sensordata, sizeof(sensordata), (PSTR("{\"PMS5003\":{\"PB0.3\":1,\"PB0.5\":2.3,\"PB1\":2,\"PB2.5\":1,\"PB5\":0,\"PB10\":1,\"CF1\":1,\"CF2.5\":0,\"CF10\":0,\"PM1\":0,\"PM2.5\":0,\"PM10\":0}}")));
 
       StaticJsonBuffer<500> jsonBuffer;
       JsonObject &root = jsonBuffer.parseObject(sensordata);
@@ -462,7 +462,7 @@ void HAssAnnounceSensors(void)
             subqty = subsensors.size();
             char MultiSubName[20];
             for (int i = 1; i <= subqty; i++) {
-              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s_%d"), subsensor.key, i);
+              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s %d"), subsensor.key, i);
               HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
             }
           } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}

From 2acc0e3a8fd34b74fc06c2938f5a12d90fa84198 Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Fri, 7 Feb 2020 22:48:34 +0100
Subject: [PATCH 238/403] Remove trailing comments

---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 13c83eeca..6e9f1ebc9 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,8 +94,8 @@ build_flags               = -D NDEBUG
 
 [irremoteesp8266_full]
 build_flags               = -DUSE_IR_REMOTE_FULL
-                            -U_IR_ENABLE_DEFAULT_                       ; use default, i.e. enable all protocols
-                            -DDECODE_PRONTO=false -DSEND_PRONTO=false   ; except PRONTO
+                            -U_IR_ENABLE_DEFAULT_
+                            -DDECODE_PRONTO=false -DSEND_PRONTO=false
 
 [core_active]
 platform                  = ${core_2_6_1.platform}

From 52609a41d883e08de948c96be28a769d490991c2 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 7 Feb 2020 23:15:34 +0100
Subject: [PATCH 239/403] Remove comment...

since the option activated does not work reliable on all platforms when it is there!
---
 platformio_override_sample.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 02e56e878..4f30c6286 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -17,7 +17,7 @@ default_envs =
 ; *** Uncomment the line(s) below to select version(s)
                 tasmota
 ;                tasmota-debug
-;                tasmota-ircustom     ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big
+;                tasmota-ircustom
 ;                tasmota-minimal
 ;                tasmota-lite
 ;                tasmota-knx

From 4d9f67b5ad325a8e0a09721274d6b9d35663d9a3 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 8 Feb 2020 14:16:39 +0100
Subject: [PATCH 240/403] Add ``ZbZNPReceived``and ``ZbZCLReceived``are
 published to MQTT when ``SetOption66 1``

---
 tasmota/CHANGELOG.md                    |  1 +
 tasmota/xdrv_23_zigbee_5_converters.ino |  8 +++++++-
 tasmota/xdrv_23_zigbee_9_impl.ino       | 10 +++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 3609e1310..8470fc930 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
+- Add ``ZbZNPReceived``and ``ZbZCLReceived``are published to MQTT when ``SetOption66 1``
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index fa79a0796..d97e5e7d4 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -58,7 +58,7 @@ public:
   void log(void) {
     char hex_char[_payload.len()*2+2];
 		ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
+    Response_P(PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
                     "\"groupid\":%d," "\"clusterid\":%d," "\"srcaddr\":\"0x%04X\","
                     "\"srcendpoint\":%d," "\"dstendpoint\":%d," "\"wasbroadcast\":%d,"
                     "\"" D_CMND_ZIGBEE_LINKQUALITY "\":%d," "\"securityuse\":%d," "\"seqnumber\":%d,"
@@ -71,6 +71,12 @@ public:
                     _timestamp,
                     _frame_control, _manuf_code, _transact_seq, _cmd_id,
                     hex_char);
+    if (Settings.flag3.tuya_serial_mqtt_publish) {
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+      XdrvRulesProcess();
+    } else {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+    }
   }
 
   static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 43f7a2ef4..6ea08c4ac 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -202,9 +202,13 @@ void ZigbeeInput(void)
 			SBuffer znp_buffer = zigbee_buffer->subBuffer(2, zigbee_frame_len - 3);	// remove SOF, LEN and FCS
 
 			ToHex_P((unsigned char*)znp_buffer.getBuffer(), znp_buffer.len(), hex_char, sizeof(hex_char));
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZNPRECEIVED " %s"),
-                                 hex_char);
-
+      Response_P(PSTR("{\"" D_JSON_ZIGBEEZNPRECEIVED "\":\"%s\"}"), hex_char);
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+        XdrvRulesProcess();
+      } else {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+      }
 			// now process the message
       ZigbeeProcessInput(znp_buffer);
 		}

From f4bc0721b543ad716f7b9fd2beb6993475273e52 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sat, 8 Feb 2020 18:09:17 +0100
Subject: [PATCH 241/403] add LYWSD02-support

---
 tasmota/xsns_62_MI_HM10.ino | 146 ++++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 30 deletions(-)

diff --git a/tasmota/xsns_62_MI_HM10.ino b/tasmota/xsns_62_MI_HM10.ino
index 6255da01f..4ea0d11e7 100644
--- a/tasmota/xsns_62_MI_HM10.ino
+++ b/tasmota/xsns_62_MI_HM10.ino
@@ -1,5 +1,5 @@
 /*
-  xsns_92_Ml_BLE.ino - MI-BLE-sensors via HM-10 support for Tasmota
+  xsns_62_MI_HM10.ino - MI-BLE-sensors via HM-10 support for Tasmota
 
   Copyright (C) 2020  Christian Baars and Theo Arends
 
@@ -21,6 +21,7 @@
   Version yyyymmdd  Action    Description
   --------------------------------------------------------------------------------------------
 
+  0.9.1.0 20200130  added   - LYWSD02-support, including setting the time
   ---
   0.9.0.0 20200130  started - initial development by Christian Baars (support LYWSD03 only)
                     forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
@@ -48,9 +49,14 @@ struct {
   uint16_t firmware;
   uint32_t period;             // set manually in addition to TELE-period, is set to TELE-period after start
   uint32_t serialSpeed;
+  union {
+    uint32_t time;
+    uint8_t timebuf[4];
+  };
   struct {
     uint32_t init:1;
     uint32_t pending_task:1;
+    uint32_t connected:1;
     uint32_t subscribed:1;
     uint32_t awaitingHT:1;
     uint32_t awaitingB:1;
@@ -66,7 +72,7 @@ struct {
 struct {
   uint16_t temp;
   uint8_t hum;
-} LYWSD03_HT;
+} LYWSD0x_HT;
 #pragma pack(0)
 
 struct mi_sensor_t{
@@ -97,7 +103,7 @@ std::vector<mi_sensor_t> MIBLEsensors;
 
 const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
 const char S_JSON_HM10_COMMAND[] PROGMEM        = "{\"" D_CMND_HM10 "%s%s\"}";
-const char kHM10_Commands[] PROGMEM             = "Scan|AT|Period|Baud";
+const char kHM10_Commands[] PROGMEM             = "Scan|AT|Period|Baud|Time";
 
 #define FLORA       1
 #define MJ_HT_V1    2
@@ -124,7 +130,8 @@ enum HM10_Commands {          // commands useable in console or rules
   CMND_HM10_DISC_SCAN,        // re-scan for sensors
   CMND_HM10_AT,               // send AT-command for debugging and special configuration
   CMND_HM10_PERIOD,           // set period like TELE-period in seconds between read-cycles
-  CMND_HM10_BAUD              // serial speed of ESP8266 (<-> HM10), does not change baud rate of HM10
+  CMND_HM10_BAUD,             // serial speed of ESP8266 (<-> HM10), does not change baud rate of HM10
+  CMND_HM10_TIME              // set LYWSD02-Time from ESP8266-time 
   };
 
 /*********************************************************************************************\
@@ -142,12 +149,16 @@ enum HM10_Commands {          // commands useable in console or rules
 #define TASK_HM10_NAME            8                         // query device name
 #define TASK_HM10_FEEDBACK        9                         // get device response
 #define TASK_HM10_DISCONN         10                        // disconnect
-#define TASK_HM10_SUBSCR          11                        // subscribe to service handle 37
+#define TASK_HM10_SUB_L3          11                        // subscribe to service handle 37
 #define TASK_HM10_READ_HT         12                        // read from handle 36 -> Hum & Temp
 #define TASK_HM10_FINDALLCHARS    13                        // read all available characteristics
-#define TASK_HM10_UNSUBSCR        14                        // subscribe  service handle 37
+#define TASK_HM10_UN_L3           14                        // subscribe  service handle 37
 #define TASK_HM10_DELAY_SUB       15                        // start reading from subscription delayed
-#define TASK_HM10_READ_BT         16                        // read from handle 3A -> Battery
+#define TASK_HM10_READ_BT_L3      16                        // read from handle 3A -> Battery
+#define TASK_HM10_SUB_L2          17                        // subscribe to service handle 3C
+#define TASK_HM10_UN_L2           18                        // subscribe  service handle 3C
+#define TASK_HM10_READ_BT_L2      19                        // read from handle 43 -> Battery
+#define TASK_HM10_TIME_L2         20                        // set time of LYWSD02 to system time
 
 #define TASK_HM10_DONE            99                        // used, if there was a task in the slot or just to wait
 
@@ -184,15 +195,32 @@ void HM10_Discovery_Scan(void) {
                           HM10_Launchtask(TASK_HM10_DISC,1,1);          // discovery
                           }
 
-void HM10_Read_Sensor(void) {
+void HM10_Read_LYWSD03(void) {
                           HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
-                          HM10_Launchtask(TASK_HM10_SUBSCR,2,10);        // subscribe
-                          HM10_Launchtask(TASK_HM10_UNSUBSCR,3,80);      // unsubscribe
-                          HM10_Launchtask(TASK_HM10_READ_BT,4,5);        // read Battery
+                          HM10_Launchtask(TASK_HM10_SUB_L3,2,20);        // subscribe
+                          HM10_Launchtask(TASK_HM10_UN_L3,3,80);         // unsubscribe
+                          HM10_Launchtask(TASK_HM10_READ_BT_L3,4,5);     // read Battery
                           HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
                           }
 
+void HM10_Read_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);           // connect
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);      // get OK+CONN
+                          HM10_Launchtask(TASK_HM10_SUB_L2,2,20);        // subscribe
+                          HM10_Launchtask(TASK_HM10_UN_L2,3,80);         // unsubscribe
+                          HM10_Launchtask(TASK_HM10_READ_BT_L2,4,5);     // read Battery
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);        // disconnect
+                          }
+
+void HM10_Time_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,0);        // disconnect
+                          HM10_Launchtask(TASK_HM10_CONN,1,5);           // connect
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);      // get OK+CONN
+                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);        // subscribe
+                          HM10_Launchtask(TASK_HM10_DISCONN,4,5);        // disconnect
+                          }
+
 /**
  * @brief Return the slot number of a known sensor or return create new sensor slot
  *
@@ -325,7 +353,10 @@ void HM10ParseResponse(char *buf) {
       HM10MACStringToBytes(_mac, _newMacArray);
       DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
       MIBLEgetSensorSlot(_newMacArray, 0xff);
-    } 
+    }
+    if (strstr(buf, "LOST")){
+      HM10.mode.connected = false;
+    }
     else {
       DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
     }
@@ -334,19 +365,19 @@ void HM10ParseResponse(char *buf) {
 void HM10readTempHum(char *_buf){
   DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
   if(_buf[0] != 0 && _buf[1] != 0){
-    memcpy(&LYWSD03_HT,(void *)_buf,3);
-    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD03_HT.temp,LYWSD03_HT.hum);
+    memcpy(&LYWSD0x_HT,(void *)_buf,3);
+    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD0x_HT.temp,LYWSD0x_HT.hum);
     uint32_t _slot = HM10.state.sensor;
 
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
     static float _tempFloat;
-    _tempFloat=(float)(LYWSD03_HT.temp)/100.0f;
+    _tempFloat=(float)(LYWSD0x_HT.temp)/100.0f;
     if(_tempFloat<60){
         MIBLEsensors.at(_slot).temp=_tempFloat;
         HM10.mode.awaitingHT = false;
         HM10.current_task_delay = 0;
     }
-    _tempFloat=(float)LYWSD03_HT.hum;
+    _tempFloat=(float)LYWSD0x_HT.hum;
     if(_tempFloat<100){
       MIBLEsensors.at(_slot).hum = _tempFloat;
       DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
@@ -354,7 +385,7 @@ void HM10readTempHum(char *_buf){
   }
 }
 
-void HM10readBat(char *_buf){
+bool HM10readBat(char *_buf){
   DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
   if(_buf[0] != 0){
     DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
@@ -362,8 +393,10 @@ void HM10readBat(char *_buf){
     DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
     if(_buf[0]<101){
         MIBLEsensors.at(_slot).bat=_buf[0];
+        return true;
     }
   }
+  return false;
 }
 
 /*********************************************************************************************\
@@ -385,12 +418,15 @@ bool HM10SerialHandleFeedback(){                  // every 50 milliseconds
     success = true;
   }
   if(HM10.mode.awaitingHT) {
-    HM10readTempHum(ret);
+    if (HM10.mode.connected) HM10readTempHum(ret);
   }
   else if(HM10.mode.awaitingB) {
-    HM10readBat(ret);
-    HM10.mode.awaitingB = false;
-    HM10.current_task_delay = 0;
+    if (HM10.mode.connected) {
+      if (HM10readBat(ret)){
+        HM10.mode.awaitingB = false;
+        HM10.current_task_delay = 0;
+      }
+    }
   }
   else if(success) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
@@ -456,6 +492,7 @@ void HM10_TaskEvery100ms(){
           sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
           HM10Serial->write(_con);
           HM10.mode.awaitingB = false;
+          HM10.mode.connected = true;
           break;
         case TASK_HM10_DISCONN:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
@@ -471,14 +508,14 @@ void HM10_TaskEvery100ms(){
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           break;
-        case TASK_HM10_SUBSCR:
+        case TASK_HM10_SUB_L3:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
           HM10.current_task_delay = 25;                   // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+NOTIFY_ON0037");
           break;
-        case TASK_HM10_UNSUBSCR:
+        case TASK_HM10_UN_L3:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
           HM10.current_task_delay = 5;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
@@ -486,6 +523,32 @@ void HM10_TaskEvery100ms(){
           HM10.mode.awaitingHT = false;
           HM10Serial->write("AT+NOTIFYOFF0037");
           break;
+        case TASK_HM10_SUB_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 25;                   // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON003C");
+          break;
+        case TASK_HM10_UN_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.awaitingHT = false;
+          HM10Serial->write("AT+NOTIFYOFF003C");
+          break;
+        case TASK_HM10_TIME_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set time"),D_CMND_HM10);
+          HM10.current_task_delay = 5;                    // set task delay
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.time = Rtc.utc_time;
+          HM10Serial->write("AT+SEND_DATAWR002F");
+          HM10Serial->write(HM10.timebuf,4);
+          HM10Serial->write(Rtc.time_timezone / 60);
+          AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s Time-string: %x%x%x%x%x"),D_CMND_HM10, HM10.timebuf[0],HM10.timebuf[1],HM10.timebuf[2],HM10.timebuf[3],(Rtc.time_timezone /60));
+          break;
         case TASK_HM10_READ_HT:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
           HM10.current_task_delay = 0;                    // set task delay
@@ -494,21 +557,29 @@ void HM10_TaskEvery100ms(){
           HM10Serial->write("AT+READDATA0036?");
           HM10.mode.awaitingHT = true;
           break;
-        case TASK_HM10_READ_BT:
+        case TASK_HM10_READ_BT_L3:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
-          HM10.current_task_delay = 0;                    // set task delay
+          HM10.current_task_delay = 2;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
           HM10Serial->write("AT+READDATA003A?");
           HM10.mode.awaitingB = true;
           break;
-        case TASK_HM10_FINDALLCHARS:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s find all chars"),D_CMND_HM10);
-          HM10.current_task_delay = 5;                    // set task delay
+        case TASK_HM10_READ_BT_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0043"),D_CMND_HM10);
+          HM10.current_task_delay = 2;                    // set task delay
           HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
           runningTaskLoop = false;
-          HM10Serial->write("AT+FINDALLCHARS?");
+          HM10Serial->write("AT+READDATA0043?");
+          HM10.mode.awaitingB = true;
           break;
+        // case TASK_HM10_FINDALLCHARS:
+        //   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s find all chars"),D_CMND_HM10);
+        //   HM10.current_task_delay = 5;                    // set task delay
+        //   HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+        //   runningTaskLoop = false;
+        //   HM10Serial->write("AT+FINDALLCHARS?");
+        //   break;
         case TASK_HM10_FEEDBACK:
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
           HM10SerialHandleFeedback();
@@ -565,7 +636,11 @@ void HM10EverySecond(){
     _nextSensorSlot++;
     if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) { // only this sensor for now
       HM10.mode.pending_task = 1;
-      HM10_Read_Sensor();
+      HM10_Read_LYWSD03();
+    }
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD02) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_LYWSD02();
     }
     if (HM10.state.sensor==MIBLEsensors.size()-1) {
       _nextSensorSlot= 0;
@@ -606,6 +681,17 @@ bool HM10Cmd(void) {
         }
         Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
         break;
+      case CMND_HM10_TIME:
+        if (XdrvMailbox.data_len > 0) {
+          if(MIBLEsensors.size()>XdrvMailbox.payload){
+            if(MIBLEsensors.at(XdrvMailbox.payload).type == LYWSD02){
+              HM10.state.sensor = XdrvMailbox.payload;
+              HM10_Time_LYWSD02();
+              }
+            }
+          }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
       case CMND_HM10_AT:
         HM10Serial->write("AT");               // without an argument this will disconnect
         if (strlen(XdrvMailbox.data)!=0) {

From 25034c153ae8e777a498f1f1a43b33c02366bd6b Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Sun, 9 Feb 2020 18:44:05 +1100
Subject: [PATCH 242/403] use TuyaSend0 to send a TUYA_CMD_QUERY_STATE command.

---
 tasmota/xdrv_16_tuyamcu.ino | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 4a49c8ee0..11b134489 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -114,6 +114,7 @@ void (* const TuyaCommand[])(void) PROGMEM = {
 
 TuyaSend<x> dpId,data
 
+TuyaSend0 -> Sends TUYA_CMD_QUERY_STATE
 TuyaSend1 11,1 -> Sends boolean (Type 1) data 0/1 to dpId 11 (Max data length 1 byte)
 TuyaSend2 11,100 -> Sends integer (Type 2) data 100 to dpId 11 (Max data length 4 bytes)
 TuyaSend2 11,0xAABBCCDD -> Sends 4 bytes (Type 2) data to dpId 11 (Max data length 4 bytes)
@@ -124,9 +125,13 @@ TuyaSend4 11,1 -> Sends enum (Type 4) data 0/1/2/3/4/5 to dpId 11 (Max data leng
 
 
 void CmndTuyaSend(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+  if (XdrvMailbox.index > 4) {
+    return;
+  }
+  if (XdrvMailbox.index == 0) {
+    TuyaRequestState();
+  } else {
     if (XdrvMailbox.data_len > 0) {
-
       char *p;
       char *data;
       uint8_t i = 0;
@@ -150,8 +155,8 @@ void CmndTuyaSend(void) {
         TuyaSendEnum(dpId, strtoul(data, nullptr, 0));
       }
     }
-    ResponseCmndDone();
   }
+  ResponseCmndDone();
 }
 
 /*

From 829b36868b49e8f39ced353ca455f94cc51d0580 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 9 Feb 2020 15:32:45 +0100
Subject: [PATCH 243/403] small cleanups

---
 tasmota/xsns_62_MI_HM10.ino | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasmota/xsns_62_MI_HM10.ino b/tasmota/xsns_62_MI_HM10.ino
index 4ea0d11e7..17cc094ad 100644
--- a/tasmota/xsns_62_MI_HM10.ino
+++ b/tasmota/xsns_62_MI_HM10.ino
@@ -21,7 +21,7 @@
   Version yyyymmdd  Action    Description
   --------------------------------------------------------------------------------------------
 
-  0.9.1.0 20200130  added   - LYWSD02-support, including setting the time
+  0.9.1.0 20200209  added   - LYWSD02-support, including setting the time
   ---
   0.9.0.0 20200130  started - initial development by Christian Baars (support LYWSD03 only)
                     forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
@@ -217,7 +217,7 @@ void HM10_Time_LYWSD02(void) {
                           HM10_Launchtask(TASK_HM10_DISCONN,0,0);        // disconnect
                           HM10_Launchtask(TASK_HM10_CONN,1,5);           // connect
                           HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);      // get OK+CONN
-                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);        // subscribe
+                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);       // subscribe
                           HM10_Launchtask(TASK_HM10_DISCONN,4,5);        // disconnect
                           }
 
@@ -634,7 +634,7 @@ void HM10EverySecond(){
   if(_counter==0) {
     HM10.state.sensor = _nextSensorSlot;
     _nextSensorSlot++;
-    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) { // only this sensor for now
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) {
       HM10.mode.pending_task = 1;
       HM10_Read_LYWSD03();
     }
@@ -750,20 +750,20 @@ void HM10Show(bool json)
           if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
             ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
           }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no moisture
             ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
           }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no fertility
             ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
           }
         }
         if (MIBLEsensors.at(i).type>FLORA){ 
           char humidity[33];
           dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no humidity
               ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
           }
-          if(MIBLEsensors.at(i).bat!=0xff){ // this is the error code -> no temperature
+          if(MIBLEsensors.at(i).bat!=0xff){ // this is the error code -> no battery
             ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
           }
         }

From 504570d5d5bd406ba0bd755e2e03f5bbddf83ede Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 9 Feb 2020 16:21:48 +0100
Subject: [PATCH 244/403] Fix MaxPower functionality

Fix MaxPower functionality (#7647)
---
 RELEASENOTES.md             | 2 ++
 tasmota/CHANGELOG.md        | 3 ++-
 tasmota/support_tasmota.ino | 3 ++-
 tasmota/xdrv_03_energy.ino  | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f632ea78d..8162ae9f2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -71,6 +71,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix ``RGBWWTable`` ignored (#7572)
 - Fix PWM flickering at low levels (#7415)
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
+- Fix MaxPower functionality (#7647)
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
@@ -95,3 +96,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for sensors DS18x20 and DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
+- Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 8470fc930..4a490d2df 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,12 +3,13 @@
 ### 8.1.0.6 20200205
 
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
+- Fix MaxPower functionality (#7647)
 - Add support for sensors DS18x20 and DHT family on Shelly 1 and Shelly 1PM using Shelly Add-On adapter (#7469)
 - Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
 - Add command ``Buzzer -1`` for infinite mode and command ``Buzzer -2`` for following led mode (#7623)
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
-- Add ``ZbZNPReceived``and ``ZbZCLReceived``are published to MQTT when ``SetOption66 1``
+- Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 984d93d1e..888893fea 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -235,7 +235,8 @@ void SetDevicePower(power_t rpower, uint32_t source)
 void RestorePower(bool publish_power, uint32_t source)
 {
   if (power != last_power) {
-    SetDevicePower(last_power, source);
+    power = last_power;
+    SetDevicePower(power, source);
     if (publish_power) {
       MqttPublishAllPowerState();
     }
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 4573d2406..bb74b991d 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -365,7 +365,7 @@ void EnergyMarginCheck(void)
           EnergyMqttShow();
           SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
           if (!Energy.mplr_counter) {
-            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;
+            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;  // SetOption33 - Max Power Retry count
           }
           Energy.mplw_counter = Settings.energy_max_power_limit_window;
         }
@@ -390,6 +390,7 @@ void EnergyMarginCheck(void)
             ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
             MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
             EnergyMqttShow();
+            SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
           }
         }
       }

From e6e5157ccb27aad169f50f7a145f8ecbc08de9cc Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 9 Feb 2020 17:22:14 +0100
Subject: [PATCH 245/403] Disable Display support for Tasmota-IR

because compiling fails if enabled
---
 tasmota/tasmota_post.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index b0ef04b06..ae0362247 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -377,6 +377,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_I2C                                   // Disable all I2C sensors
 #undef USE_SPI                                   // Disable all SPI devices
 
+#undef USE_DISPLAY                               // Disable support for displays
+
 #undef USE_MHZ19                                 // Disable support for MH-Z19 CO2 sensor
 #undef USE_SENSEAIR                              // Disable support for SenseAir K30, K70 and S8 CO2 sensor
 #undef USE_PMS5003                               // Disable support for PMS5003 and PMS7003 particle concentration sensor

From 47862e3c591e55252bf09ff6640882dcfe1e803b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 9 Feb 2020 19:38:46 +0100
Subject: [PATCH 246/403] unique topic for every device by default

---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index ab3d55969..5b5e5de8d 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -115,7 +115,7 @@
 #define PUB_PREFIX2            "tele"            // [Prefix3] Tasmota devices publish telemetry data to %prefix%/%topic% being PUB_PREFIX2/MQTT_TOPIC/UPTIME, POWER and TIME
                                                  //   May be named the same as PUB_PREFIX
 // %topic% token options (also ButtonTopic and SwitchTopic)
-#define MQTT_TOPIC             PROJECT           // [Topic] (unique) MQTT device topic, set to 'PROJECT "_%06X"' for unique topic including device MAC address
+#define MQTT_TOPIC             PROJECT "_%06X"   // [Topic] unique MQTT device topic including device MAC address
 #define MQTT_GRPTOPIC          "tasmotas"        // [GroupTopic] MQTT Group topic
 #define MQTT_GROUPTOPIC_FORMAT false             // [SetOption75] GroupTopic replaces %topic% (false) or fixed topic cmnd/grouptopic (true)
 #define MQTT_BUTTON_TOPIC      "0"               // [ButtonTopic] MQTT button topic, "0" = same as MQTT_TOPIC, set to 'PROJECT "_BTN_%06X"' for unique topic including device MAC address

From 3de74e885026cf925add7a78425b595edc362b1b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 10 Feb 2020 13:54:27 +0100
Subject: [PATCH 247/403] Add optional Wifi AccessPoint passphrase

Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
---
 RELEASENOTES.md               | 1 +
 tasmota/CHANGELOG.md          | 1 +
 tasmota/my_user_config.h      | 1 +
 tasmota/xdrv_01_webserver.ino | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8162ae9f2..f994be9c0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -97,3 +97,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
 - Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
+- Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 4a490d2df..ceef0a771 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Add support for MI-BLE sensors using HM-10 Bluetooth 4.0 module by Christian Staars (#7683)
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
 - Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
+- Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 5b5e5de8d..4287daf5a 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -66,6 +66,7 @@
 #define STA_PASS1              ""                // [Password1] Wifi password
 #define STA_SSID2              ""                // [Ssid2] Optional alternate AP Wifi SSID
 #define STA_PASS2              ""                // [Password2] Optional alternate AP Wifi password
+#define WIFI_AP_PASSPHRASE     ""                // AccessPoint passphrase. For WPA2 min 8 char, for open use "" (max 63 char).
 #define WIFI_CONFIG_TOOL       WIFI_RETRY        // [WifiConfig] Default tool if wifi fails to connect (default option: 4 - WIFI_RETRY)
                                                  // (WIFI_RESTART, WIFI_MANAGER, WIFI_RETRY, WIFI_WAIT, WIFI_SERIAL, WIFI_MANAGER_RESET_ONLY)
                                                  // The configuration can be changed after first setup using WifiConfig 0, 2, 4, 5, 6 and 7.
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 0873cebc5..5945436bc 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -640,7 +640,8 @@ void WifiManagerBegin(bool reset_only)
 
   int channel = WIFI_SOFT_AP_CHANNEL;
   if ((channel < 1) || (channel > 13)) { channel = 1; }
-  WiFi.softAP(my_hostname, nullptr, channel);
+  // bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0, int max_connection = 4);
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, false, 1);
 
   delay(500); // Without delay I've seen the IP address blank
   /* Setup the DNS server redirecting all the domains to the apIP */

From f0272b339cb4e1036cb8072d29cc1ff1b465476a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 10 Feb 2020 14:24:53 +0100
Subject: [PATCH 248/403] Fix compile error

---
 tasmota/xdrv_01_webserver.ino | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 5945436bc..132c6a426 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -640,8 +640,14 @@ void WifiManagerBegin(bool reset_only)
 
   int channel = WIFI_SOFT_AP_CHANNEL;
   if ((channel < 1) || (channel > 13)) { channel = 1; }
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  // bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0);
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0);
+#else
   // bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0, int max_connection = 4);
-  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, false, 1);
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0, 1);
+#endif
 
   delay(500); // Without delay I've seen the IP address blank
   /* Setup the DNS server redirecting all the domains to the apIP */

From 40dedd46b67fed3489d210b848e4001a578e80ad Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 10 Feb 2020 15:06:43 +0100
Subject: [PATCH 249/403] Update de-DE.h

---
 tasmota/language/de-DE.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 84925842f..615020f33 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -683,7 +683,7 @@
 #define D_TOTAL_REACTIVE  "Total Blind"
 #define D_UNIT_KWARH      "kVArh"
 #define D_UNIT_ANGLE      "Grad"
-#define D_TOTAL_ACTIVE    "Total Active"
+#define D_TOTAL_ACTIVE    "Total Wirk"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Spannung"

From af63bb363dc4c49427b49f5b7bbbb9b863977cb7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 10 Feb 2020 15:18:11 +0100
Subject: [PATCH 250/403] Add support for FiF LE-01MR energy meter

Add support for FiF LE-01MR energy meter by saper-2 (#7584)
---
 RELEASENOTES.md                |  1 +
 tasmota/CHANGELOG.md           |  1 +
 tasmota/my_user_config.h       |  7 +++---
 tasmota/support_command.ino    |  4 ++--
 tasmota/support_features.ino   | 44 ++++++++++++++++++++++++++++++++++
 tasmota/tasmota.ino            |  1 +
 tasmota/xnrg_13_fif_le01mr.ino | 40 +++++++++++++++----------------
 tools/decode-status.py         | 13 ++++++++--
 8 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f994be9c0..fd1d7e6b9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -98,3 +98,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
 - Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
 - Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
+- Add support for FiF LE-01MR energy meter by saper-2 (#7584)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ceef0a771..9108fe47d 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add BootCount Reset Time as BCResetTime to ``Status 1``
 - Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
 - Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
+- Add support for FiF LE-01MR energy meter by saper-2 (#7584)
 
 ### 8.1.0.5 20200126
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 2ab81c4ee..753766839 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -563,9 +563,10 @@
 //#define USE_SOLAX_X1                             // Add support for Solax X1 series Modbus log info (+3k1 code)
   #define SOLAXX1_SPEED        9600              // Solax X1 Modbus RS485 serial speed (default: 9600 baud)
   #define SOLAXX1_PV2                            // Solax X1 using second PV
-//#define USE_LE01MR                               // Add support for F&F LE-01MR modbus energy meter
-  #define LE01MR_SPEED         9600              // LE-01MR modbus baudrate (9600 default) (+2k code, +36 RAM)
-  #define LE01MR_ADDR          1                 // LE-01MR modbus address (0x01 default)
+//#define USE_LE01MR                               // Add support for F&F LE-01MR Modbus energy monitor (+1k code)
+  #define LE01MR_SPEED         9600              // LE-01MR modbus baudrate (default: 9600)
+  #define LE01MR_ADDR          1                 // LE-01MR modbus address (default: 0x01)
+
 // -- Low level interface devices -----------------
 #define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor (1k6 code)
 
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 28e725930..df5abda86 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -411,10 +411,10 @@ void CmndStatus(void)
   if ((0 == payload) || (4 == payload)) {
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS4_MEMORY "\":{\"" D_JSON_PROGRAMSIZE "\":%d,\"" D_JSON_FREEMEMORY "\":%d,\"" D_JSON_HEAPSIZE "\":%d,\""
                           D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d,\"" D_JSON_FLASHCHIPID "\":\"%06X\",\"" D_JSON_FLASHMODE "\":%d,\""
-                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
+                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
                           ESP.getSketchSize()/1024, ESP.getFreeSketchSpace()/1024, ESP.getFreeHeap()/1024,
                           ESP.getFlashChipSize()/1024, ESP.getFlashChipRealSize()/1024, ESP.getFlashChipId(), ESP.getFlashChipMode(),
-                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5);
+                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5, feature6);
     XsnsDriverState();
     ResponseAppend_P(PSTR(",\"Sensors\":"));
     XsnsSensorState();
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index e69615773..2dc25b8e5 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -519,4 +519,48 @@ void GetFeatures(void)
 //  feature5 |= 0x40000000;
 //  feature5 |= 0x80000000;
 
+/*********************************************************************************************/
+
+  feature6 = 0x00000000;
+
+//  feature6 |= 0x00000001;
+//  feature6 |= 0x00000002;
+//  feature6 |= 0x00000004;
+//  feature6 |= 0x00000008;
+
+//  feature6 |= 0x00000010;
+//  feature6 |= 0x00000020;
+//  feature6 |= 0x00000040;
+//  feature6 |= 0x00000080;
+
+//  feature6 |= 0x00000100;
+//  feature6 |= 0x00000200;
+//  feature6 |= 0x00000400;
+//  feature6 |= 0x00000800;
+
+//  feature6 |= 0x00001000;
+//  feature6 |= 0x00002000;
+//  feature6 |= 0x00004000;
+//  feature6 |= 0x00008000;
+
+//  feature6 |= 0x00010000;
+//  feature6 |= 0x00020000;
+//  feature6 |= 0x00040000;
+//  feature6 |= 0x00080000;
+
+//  feature6 |= 0x00100000;
+//  feature6 |= 0x00200000;
+//  feature6 |= 0x00400000;
+//  feature6 |= 0x00800000;
+
+//  feature6 |= 0x01000000;
+//  feature6 |= 0x02000000;
+//  feature6 |= 0x04000000;
+//  feature6 |= 0x08000000;
+
+//  feature6 |= 0x10000000;
+//  feature6 |= 0x20000000;
+//  feature6 |= 0x40000000;
+//  feature6 |= 0x80000000;
+
 }
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 92ee55fdf..9383e0e8b 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -79,6 +79,7 @@ unsigned long feature_drv2;                 // Compiled driver feature map
 unsigned long feature_sns1;                 // Compiled sensor feature map
 unsigned long feature_sns2;                 // Compiled sensor feature map
 unsigned long feature5;                     // Compiled feature map
+unsigned long feature6;                     // Compiled feature map
 unsigned long serial_polling_window = 0;    // Serial polling window
 unsigned long state_second = 0;             // State second timer
 unsigned long state_50msecond = 0;          // State 50msecond timer
diff --git a/tasmota/xnrg_13_fif_le01mr.ino b/tasmota/xnrg_13_fif_le01mr.ino
index e99041c9c..18f45065c 100644
--- a/tasmota/xnrg_13_fif_le01mr.ino
+++ b/tasmota/xnrg_13_fif_le01mr.ino
@@ -16,29 +16,30 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #ifdef USE_ENERGY_SENSOR
 #ifdef USE_LE01MR
 /*********************************************************************************************\
- * F&F LE-01MR - This is a single phase energy meter with rs485 modbus interface 
+ * F&F LE-01MR - This is a single phase energy meter with rs485 modbus interface
  *               (and bidirectional energy counting - enabled by RS485).
  * It measure: Active energy imported AE+ [kWh] , Reactive energy imported RE+ [kvarh],
  *             Voltage V [V], Current I [A], Frequency F [Hz], power factor (aka "cos-phi"),
  *             Active power P [kW], Reactive power Q [kVAr], Apparent power S [kVA],
- *             *Active energy exported AE- [kWh] (when meter is switched to bi-directional counting then 
+ *             *Active energy exported AE- [kWh] (when meter is switched to bi-directional counting then
  *                  reactive energy imported register contains value of Active energy exported).
  *
  * Meter descriptions at manufacturer page (english version have some description errors):
  *    EN: https://www.fif.com.pl/en/usage-electric-power-meters/517-electricity-consumption-meter-le-01mr.html
  *    PL: https://www.fif.com.pl/pl/liczniki-zuzycia-energii-elektrycznej/517-licznik-zuzycia-energii-le-01mr.html
- * 
- * Note about communication settings: The meter must be reconfigured to use baudrate 2400 (or 9600) *without* 
- *                                    parity bit - by default the meter is configured to 9600 8E1 
- *                                    (Frame format: "EVEN 1") . To make those changes, use LE-Config 
+ *
+ * Note about communication settings: The meter must be reconfigured to use baudrate 2400 (or 9600) *without*
+ *                                    parity bit - by default the meter is configured to 9600 8E1
+ *                                    (Frame format: "EVEN 1") . To make those changes, use LE-Config
  *                                    software (can be found in download tab in product page - link above)
  *                                    and USB-RS485 dongle (those cheap ~2$ from ali works fine)
- * 
+ *
  * Register descriptions (not all, only those that are being read):
- * 
+ *
  * /----------------------------------- Register address
  * |        /-------------------------- Registers count
  * |        |   /---------------------- Datatype and size
@@ -54,14 +55,14 @@
  * 0x0158   1   S16  0.001  -     Power factor
  * 0xA000   2   U32  0.01   kWh   Active energy imported
  * 0xA01E   2   U32  0.01   kvarh Reactive energy imported
- * 
- * Datatype: S = signed int, U = unsigend int, 
- *           U32 - the first (lower) register contains high word, 
+ *
+ * Datatype: S = signed int, U = unsigend int,
+ *           U32 - the first (lower) register contains high word,
  *                 second register contains lower word of 32bit dword:
- *                   value_32bit = (register+0)<<16 | (register+1); 
+ *                   value_32bit = (register+0)<<16 | (register+1);
  *                   /or/ val32bit = (reg+0)*65536 + (reg+1);
- * 
- * Note about MQTT/JSON: In fields "ENERGY.TotalActive" and "ENERGY.TotalReactive" there are 
+ *
+ * Note about MQTT/JSON: In fields "ENERGY.TotalActive" and "ENERGY.TotalReactive" there are
  *                        counters values directly from the meter (without Tasmota calculation,
  *                        energy used calculated by Tasmota is in Total/Today fields ).
  *                       Filed "ENERGY.Period" is always zero.
@@ -87,7 +88,7 @@ const uint16_t le01mr_register_addresses[] {
             // IDX                               (reg count/datatype)    [unit]
   0x0130,   // 00 . LE01MR_FREQUENCY             (1/U16)    [Hz]
   0x0131,   // 01 . LE01MR_VOLTAGE               (1/U16)    [V]
-  0x0158,   // 02 . LE01MR_POWER_FACTOR          (1/S16)      
+  0x0158,   // 02 . LE01MR_POWER_FACTOR          (1/S16)
   0x0139,   // 03 . LE01MR_CURRENT               (2/U32)    [A]
   0x0140,   // 04 . LE01MR_ACTIVE_POWER          (2/U32)    [kW]
   0x0148,   // 05 . LE01MR_REACTIVE_POWER        (2/U32)    [kvar]
@@ -143,8 +144,8 @@ void FifLEEvery250ms(void)
       // S16 -  int16_t
       // everything drop into uint32 value, but depending on register ther will be 2 or 4 bytes
       uint32_t value_buff = 0;
-      // for register table items 0..2 use 2 bytes (U16) 
-      if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) { // 
+      // for register table items 0..2 use 2 bytes (U16)
+      if (Le01mr.read_state >= 0 &&  Le01mr.read_state < 3) { //
         value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
       } else {
         value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
@@ -166,7 +167,7 @@ void FifLEEvery250ms(void)
         case 3:
           Energy.current[0] = value_buff * 0.001f; // 114 => 0.114 A
           break;
-        
+
         case 4:
           Energy.active_power[0] = value_buff * 1.0f; // P [W]
           break;
@@ -247,7 +248,6 @@ void FifLEShow(bool json)
   dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
   char total_active_chr[FLOATSZ];
   dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
-  
 
   if (json) {
     ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
@@ -270,7 +270,7 @@ bool Xnrg13(uint8_t function)
   switch (function) {
     case FUNC_EVERY_250_MSECOND:
       if (uptime > 4) {
-          FifLEEvery250ms(); 
+          FifLEEvery250ms();
       }
       break;
     case FUNC_JSON_APPEND:
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 2acee4923..f4d00833a 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -192,7 +192,16 @@ a_features = [[
     "USE_SONOFF_SC","USE_SONOFF_RF","USE_SONOFF_L1","USE_EXS_DIMMER",
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
-    "USE_NRF24","USE_MIBLE","USE_HM10","",
+    "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
+    "","","",""
+    ],[
+    "","","","",
+    "","","","",
+    "","","","",
+    "","","","",
+    "","","","",
+    "","","","",
+    "","","","",
     "","","",""
     ]]
 
@@ -227,7 +236,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200207 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200210 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From edadaa284f689aa1dd49671e1e830dbf2e3c5ea4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 10 Feb 2020 15:20:38 +0100
Subject: [PATCH 251/403] Bump version to 8.1.0.7

---
 RELEASENOTES.md           | 2 +-
 tasmota/CHANGELOG.md      | 4 ++++
 tasmota/tasmota_version.h | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index fd1d7e6b9..aae00f3b4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.5
+### Version 8.1.0.7
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 9108fe47d..bc6ed2e3b 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.7 20200210
+
+- Bump version
+
 ### 8.1.0.6 20200205
 
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index dcdbfe922..4d464db82 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010006;
+const uint32_t VERSION = 0x08010007;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;

From 7d0577eb311f15e90bb071707d92df4272d391a3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:29:17 +0100
Subject: [PATCH 252/403] Add new DHT driver

Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
---
 RELEASENOTES.md             |   1 +
 tasmota/CHANGELOG.md        |   2 +-
 tasmota/xsns_06_dht.ino     |  89 ++++++++---
 tasmota/xsns_06_dht_old.ino | 307 ++++++++++++++++++++++++++++++++++++
 4 files changed, 379 insertions(+), 20 deletions(-)
 create mode 100644 tasmota/xsns_06_dht_old.ino

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index aae00f3b4..09658515c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -99,3 +99,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add ``ZbZNPReceived``and ``ZbZCLReceived`` being published to MQTT when ``SetOption66 1``
 - Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
 - Add support for FiF LE-01MR energy meter by saper-2 (#7584)
+- Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index bc6ed2e3b..91fbca0c2 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### 8.1.0.7 20200210
 
-- Bump version
+- Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
 
 ### 8.1.0.6 20200205
 
diff --git a/tasmota/xsns_06_dht.ino b/tasmota/xsns_06_dht.ino
index c8c3dccd7..44fbfe576 100644
--- a/tasmota/xsns_06_dht.ino
+++ b/tasmota/xsns_06_dht.ino
@@ -78,9 +78,6 @@ bool DhtRead(uint8_t sensor)
 
   dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
 
-//  digitalWrite(Dht[sensor].pin, HIGH);
-//  delay(250);
-
   if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
     Dht[sensor].lastresult = 0;
     if (!dht_dual_mode) {
@@ -90,6 +87,9 @@ bool DhtRead(uint8_t sensor)
     }
     delay(250);
   }
+
+  // Activate sensor using its protocol
+  noInterrupts();
   if (!dht_dual_mode) {
     pinMode(Dht[sensor].pin, OUTPUT);
     digitalWrite(Dht[sensor].pin, LOW);
@@ -97,22 +97,72 @@ bool DhtRead(uint8_t sensor)
     digitalWrite(dht_pin_out, LOW);
   }
 
-  if (GPIO_SI7021 == Dht[sensor].type) {
-    delayMicroseconds(500);
-  } else {
-    delay(20);
+  switch (Dht[sensor].type) {
+    case GPIO_SI7021: // Start protocol for iTead SI7021
+      /*
+      Protocol:
+      Reverse-engineered on https://github.com/arendst/Tasmota/issues/735#issuecomment-348718383:
+      1. MCU PULLS LOW data bus for at 500us to activate sensor
+      2. MCU PULLS UP data bus for ~40us to ask sensor for response
+      3. SENSOR starts sending data (LOW 40us then HIGH ~25us for "0" or ~75us for "1")
+      4. SENSOR sends "1" start bit as a response
+      5. SENSOR sends 16 bits (2 bytes) of a humidity with one decimal (i.e. 35.6% is sent as 356)
+      6. SENSOR sends 16 bits (2 bytes) of a temperature with one decimal (i.e. 23.4C is sent as 234)
+      7. SENSOR sends 8 bits (1 byte) checksum of 4 data bytes
+      */
+//      digitalWrite(Dht[sensor].pin, LOW);
+      delayMicroseconds(500);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(40);
+      break;
+
+    case GPIO_DHT22: // Start protocol for DHT21, DHT22, AM2301, AM2302, AM2321
+      /*
+      Protocol:
+      1. MCU PULLS LOW data bus for 1 to 10ms to activate sensor
+      2. MCU PULLS UP data bus for 20-40us to ask sensor for response
+      3. SENSOR PULLS LOW data bus for 80us as a response
+      4. SENSOR PULLS UP data bus for 80us for data sending preparation
+      5. SENSOR starts sending data (LOW 50us then HIGH 26-28us for "0" or 70us for "1")
+      */
+//      digitalWrite(Dht[sensor].pin, LOW);
+      delayMicroseconds(1100); // data sheet says "at least 1ms to 10ms"
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30); // data sheet says "20 to 40us"
+      break;
+
+    case GPIO_DHT11: // Start protocol for DHT11
+      /*
+        Protocol:
+        1. MCU PULLS LOW data bus for at least 18ms to activate sensor
+        2. MCU PULLS UP data bus for 20-40us to ask sensor for response
+        3. SENSOR PULLS LOW data bus for 80us as a response
+        4. SENSOR PULLS UP data bus for 80us for data sending preparation
+        5. SENSOR starts sending data (LOW 50us then HIGH 26-28us for "0" or 70 us for "1")
+      */
+    default:
+//      digitalWrite(Dht[sensor].pin, LOW);
+      delay(20); // data sheet says at least 18ms, 20ms just to be safe
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30); // data sheet says "20 to 40us"
+      break;
   }
 
-  noInterrupts();
-  if (!dht_dual_mode) {
-    digitalWrite(Dht[sensor].pin, HIGH);
-    delayMicroseconds(40);
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-    delayMicroseconds(40);
-  }
-  delayMicroseconds(10);
+  // Listen to the sensor response
+  pinMode(Dht[sensor].pin, INPUT_PULLUP);
+
   if (-1 == DhtExpectPulse(sensor, LOW)) {
     AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
     error = 1;
@@ -128,9 +178,9 @@ bool DhtRead(uint8_t sensor)
     }
   }
   interrupts();
-
   if (error) { return false; }
 
+  // Decode response
   for (uint32_t i = 0; i < 40; ++i) {
     int32_t lowCycles  = cycles[2*i];
     int32_t highCycles = cycles[2*i+1];
@@ -144,6 +194,7 @@ bool DhtRead(uint8_t sensor)
     }
   }
 
+  // Check response
   uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
   if (dht_data[4] != checksum) {
     char hex_char[15];
@@ -304,4 +355,4 @@ bool Xsns06(uint8_t function)
   return result;
 }
 
-#endif  // USE_DHT
+#endif  // USE_DHT
\ No newline at end of file
diff --git a/tasmota/xsns_06_dht_old.ino b/tasmota/xsns_06_dht_old.ino
new file mode 100644
index 000000000..b38f01236
--- /dev/null
+++ b/tasmota/xsns_06_dht_old.ino
@@ -0,0 +1,307 @@
+/*
+  xsns_06_dht.ino - DHTxx, AM23xx and SI7021 temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_DHT_OLD
+/*********************************************************************************************\
+ * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
+ *
+ * Reading temperature or humidity takes about 250 milliseconds!
+ * Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
+ * Source: Adafruit Industries https://github.com/adafruit/DHT-sensor-library
+\*********************************************************************************************/
+
+#define XSNS_06          6
+
+#define DHT_MAX_SENSORS  4
+#define DHT_MAX_RETRY    8
+
+uint32_t dht_max_cycles;
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;                      // Shelly GPIO00 output only
+bool dht_active = true;                       // DHT configured
+bool dht_dual_mode = false;                   // Single pin mode
+
+struct DHTSTRUCT {
+  uint8_t     pin;
+  uint8_t     type;
+  char     stype[12];
+  uint32_t lastreadtime;
+  uint8_t  lastresult;
+  float    t = NAN;
+  float    h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+void DhtReadPrep(void)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+  }
+}
+
+int32_t DhtExpectPulse(uint8_t sensor, bool level)
+{
+  int32_t count = 0;
+
+  while (digitalRead(Dht[sensor].pin) == level) {
+    if (count++ >= (int32_t)dht_max_cycles) {
+      return -1;  // Timeout
+    }
+  }
+  return count;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  int32_t cycles[80];
+  uint8_t error = 0;
+
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+//  digitalWrite(Dht[sensor].pin, HIGH);
+//  delay(250);
+
+  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+    Dht[sensor].lastresult = 0;
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);  // Retry read prep
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+    delay(250);
+  }
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  if (GPIO_SI7021 == Dht[sensor].type) {
+    delayMicroseconds(500);
+  } else {
+    delay(20);
+  }
+
+  noInterrupts();
+  if (!dht_dual_mode) {
+    digitalWrite(Dht[sensor].pin, HIGH);
+    delayMicroseconds(40);
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+    delayMicroseconds(40);
+  }
+  delayMicroseconds(10);
+  if (-1 == DhtExpectPulse(sensor, LOW)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    error = 1;
+  }
+  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    error = 1;
+  }
+  else {
+    for (uint32_t i = 0; i < 80; i += 2) {
+      cycles[i]   = DhtExpectPulse(sensor, LOW);
+      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
+    }
+  }
+  interrupts();
+
+  if (error) { return false; }
+
+  for (uint32_t i = 0; i < 40; ++i) {
+    int32_t lowCycles  = cycles[2*i];
+    int32_t highCycles = cycles[2*i+1];
+    if ((-1 == lowCycles) || (-1 == highCycles)) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      return false;
+    }
+    dht_data[i/8] <<= 1;
+    if (highCycles > lowCycles) {
+      dht_data[i / 8] |= 1;
+    }
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {  // Reset after 8 misses
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);  // Issue #3164
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+/********************************************************************************************/
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    dht_max_cycles = microsecondsToClockCycles(1000);  // 1 millisecond timeout for reading pulses from DHT sensor.
+
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;    // Dual pins mode as used by Shelly
+      dht_sensors = 1;         // We only support one sensor in pseudo mode
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+    // <1mS
+    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif  // USE_WEBSERVER
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_DHT

From 7339b56279fce8915c6b96ef47644abedce945ec Mon Sep 17 00:00:00 2001
From: Adrian Scillato <39969427+ascillato2@users.noreply.github.com>
Date: Mon, 10 Feb 2020 13:29:42 -0300
Subject: [PATCH 253/403] Updated Spanish Translation

---
 tasmota/language/es-ES.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index a2c46c763..9b0b08888 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -683,13 +683,13 @@
 #define D_TOTAL_REACTIVE  "P. Reactiva Total"
 #define D_UNIT_KWARH      "kVArH"
 #define D_UNIT_ANGLE      "Grados"
-#define D_TOTAL_ACTIVE    "Total Active"
+#define D_TOTAL_ACTIVE    "P. Total Activa"
 
 //SOLAXX1
 #define D_PV1_VOLTAGE     "PV1 Voltaje"
 #define D_PV1_CURRENT     "PV1 Corriente"
 #define D_PV1_POWER       "PV1 Potencia"
-#define D_PV2_VOLTAGE     "PV2 Voltaee"
+#define D_PV2_VOLTAGE     "PV2 Voltaje"
 #define D_PV2_CURRENT     "PV2 Corriente"
 #define D_PV2_POWER       "PV2 Potencia"
 #define D_SOLAR_POWER     "Potencia Solar"

From a904da2a2e9e0a10a912c9729ab2efa1f8cd2f85 Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:57:42 -0300
Subject: [PATCH 254/403] Fix Deep-Sleep-Wake timming

https://github.com/arendst/Tasmota/issues/7621
---
 tasmota/support_wifi.ino | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 2a3951147..d53b14f71 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -189,7 +189,13 @@ void WifiBegin(uint8_t flag, uint8_t channel)
   if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
   // Handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
   // This needs to be explicitly called as "false" otherwise the default is enabled
-  WiFi.setAutoReconnect(false);
+#ifdef USE_DEEPSLEEP 
+  if (!(DeepSleepEnabled())) { // #7621
+#endif
+    WiFi.setAutoReconnect(false);
+#ifdef USE_DEEPSLEEP
+  }
+#endif
   switch (flag) {
   case 0:  // AP1
   case 1:  // AP2

From ba345625dee72a14e18bcc62f00ddd425a43ea3a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 12 Feb 2020 16:55:39 +0100
Subject: [PATCH 255/403] Fix wifi connection issues

Fix wifi connection issues since 7602 (#7621)
---
 tasmota/support_wifi.ino | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index d53b14f71..f261738b6 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -187,15 +187,11 @@ void WifiBegin(uint8_t flag, uint8_t channel)
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { WiFi.setPhyMode(WIFI_PHY_MODE_11N); }  // B/G/N
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); }  // B/G
   if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
+
   // Handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
   // This needs to be explicitly called as "false" otherwise the default is enabled
-#ifdef USE_DEEPSLEEP 
-  if (!(DeepSleepEnabled())) { // #7621
-#endif
-    WiFi.setAutoReconnect(false);
-#ifdef USE_DEEPSLEEP
-  }
-#endif
+//    WiFi.setAutoReconnect(false);  // See #7621
+
   switch (flag) {
   case 0:  // AP1
   case 1:  // AP2

From 8079ee9749f277c17f58f82e25f0b75816826cea Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 12 Feb 2020 18:00:53 +0100
Subject: [PATCH 256/403] Change MQTT message size

Change MQTT message size with additional 200 characters
---
 RELEASENOTES.md                                    | 3 ++-
 lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h | 3 ++-
 tasmota/CHANGELOG.md                               | 4 ++++
 tasmota/tasmota.h                                  | 2 +-
 tasmota/tasmota.ino                                | 2 +-
 tasmota/tasmota_post.h                             | 4 ++--
 tasmota/tasmota_version.h                          | 2 +-
 tasmota/xdrv_02_mqtt.ino                           | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 09658515c..9104a5bb1 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,13 +52,14 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.7
+### Version 8.1.0.8
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Change IRremoteESP8266 library updated to v2.7.3
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Change wifi connectivity stability (#7602)
+- Change MQTT message size with additional 200 characters
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
diff --git a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
index 593077e8c..612029665 100644
--- a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
+++ b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
@@ -24,7 +24,8 @@
 // MQTT_MAX_PACKET_SIZE : Maximum packet size
 #ifndef MQTT_MAX_PACKET_SIZE
 //#define MQTT_MAX_PACKET_SIZE 128
-#define MQTT_MAX_PACKET_SIZE 1000   // Tasmota v5.11.1c
+//#define MQTT_MAX_PACKET_SIZE 1000   // Tasmota v5.11.1c
+#define MQTT_MAX_PACKET_SIZE 1200   // Tasmota v8.1.0.8
 #endif
 
 // MQTT_KEEPALIVE : keepAlive interval in Seconds
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 91fbca0c2..3a12aff9b 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.8 20200212
+
+- Change MQTT message size with additional 200 characters
+
 ### 8.1.0.7 20200210
 
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 11a530f32..2aa441878 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -128,7 +128,7 @@ const uint16_t FLOATSZ = 16;                // Max number of characters in float
 const uint16_t CMDSZ = 24;                  // Max number of characters in command
 const uint16_t TOPSZ = 151;                 // Max number of characters in topic string
 const uint16_t LOGSZ = 700;                 // Max number of characters in log
-const uint16_t MIN_MESSZ = 893;             // Min number of characters in MQTT message
+const uint16_t MIN_MESSZ = 1040;            // Min number of characters in MQTT message (1000 - TOPSZ - 9 header bytes)
 
 const uint8_t SENSOR_MAX_MISS = 5;          // Max number of missed sensor reads before deciding it's offline
 
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 9383e0e8b..2ed7976e1 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -19,7 +19,7 @@
 /*====================================================
   Prerequisites:
     - Change libraries/PubSubClient/src/PubSubClient.h
-        #define MQTT_MAX_PACKET_SIZE 1000
+        #define MQTT_MAX_PACKET_SIZE 1200
 
     - Select IDE Tools - Flash Mode: "DOUT"
     - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 42ee97254..615ff8919 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -666,7 +666,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #endif
 
 #ifndef MQTT_MAX_PACKET_SIZE
-#define MQTT_MAX_PACKET_SIZE   1000              // Bytes
+#define MQTT_MAX_PACKET_SIZE   1200              // Bytes
 #endif
 #ifndef MQTT_KEEPALIVE
 #define MQTT_KEEPALIVE         30                // Seconds
@@ -679,7 +679,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #endif
 
 #ifndef MESSZ
-//#define MESSZ                  893               // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1000)
+//#define MESSZ                  1040              // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)
 #define MESSZ                  (MQTT_MAX_PACKET_SIZE -TOPSZ -7)  // Max number of characters in JSON message string
 #endif
 
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 4d464db82..d0db39f4b 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010007;
+const uint32_t VERSION = 0x08010008;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 4d574a9f1..770170aa3 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -164,7 +164,7 @@ void MqttDiscoverServer(void)
 
 // Max message size calculated by PubSubClient is (MQTT_MAX_PACKET_SIZE < 5 + 2 + strlen(topic) + plength)
 #if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MIN_MESSZ  // If the max message size is too small, throw an error at compile time. See PubSubClient.cpp line 359
-  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1000"
+  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1200"
 #endif
 
 #ifdef USE_MQTT_TLS

From 4f0ee274d1c7919b76b2970bb97cafdb11ad4c17 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 12 Feb 2020 19:54:14 +0100
Subject: [PATCH 257/403] Update platformio.ini

---
 platformio.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 6e9f1ebc9..2e97a5a3f 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -58,6 +58,7 @@ board                     = esp01_1m
 board_build.flash_mode    = dout
 
 platform                  = ${core_active.platform}
+platform_packages         = ${core_active.platform_packages}
 build_flags               = ${core_active.build_flags}
 
 ; *********************************************************************
@@ -104,6 +105,7 @@ build_flags               = ${core_2_6_1.build_flags}
 [core_2_6_1]
 ; *** Esp8266 core for Arduino version 2.6.1
 platform                  = espressif8266@2.3.0
+platform_packages         =
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC

From 0faea08bc5753fc4a25da0c7e88f4005e74d90e0 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 12 Feb 2020 19:56:54 +0100
Subject: [PATCH 258/403] Update platformio.ini

---
 platformio.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio.ini b/platformio.ini
index 2e97a5a3f..16553f0d6 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -100,6 +100,7 @@ build_flags               = -DUSE_IR_REMOTE_FULL
 
 [core_active]
 platform                  = ${core_2_6_1.platform}
+platform_packages         = ${core_2_6_1.platform_packages}
 build_flags               = ${core_2_6_1.build_flags}
 
 [core_2_6_1]

From 7f180fa6bc8c3b4379e449d2203a751cab913e07 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 12 Feb 2020 20:22:21 +0100
Subject: [PATCH 259/403] Statisfy Platformio v.4.2 syntax

---
 platformio_override_sample.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 4f30c6286..47965f59d 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -72,9 +72,11 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 [core_active]
 ; Select one core set for platform and build_flags
 ;platform                  = ${core_2_6_1.platform}
+;platform_packages         = ${core_2_6_1.platform_packages}
 ;build_flags               = ${core_2_6_1.build_flags}
 
 ;platform                  = ${core_2_6_3.platform}
+;platform_packages         = ${core_2_6_3.platform_packages}
 ;build_flags               = ${core_2_6_3.build_flags}
 
 platform                  = ${tasmota_core_stage.platform}
@@ -89,6 +91,7 @@ build_flags               = ${tasmota_core_stage.build_flags}
 [core_2_6_1]
 ; *** Esp8266 core for Arduino version 2.6.1
 platform                  = espressif8266@2.3.0
+platform_packages         =
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
@@ -133,6 +136,7 @@ build_flags               = ${esp82xx_defaults.build_flags}
 [core_2_6_3]
 ; *** Esp8266 core for Arduino version 2.6.3
 platform                  = espressif8266@2.3.2
+platform_packages         =
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC

From a50a7d486f16caf5147a84140f47f5c1c0db7949 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 12 Feb 2020 22:38:17 +0100
Subject: [PATCH 260/403] Fix wrong encoding of Zigbee persistent data

---
 tasmota/CHANGELOG.md                     |  1 +
 tasmota/xdrv_23_zigbee_3_devices.ino     | 10 +++++-----
 tasmota/xdrv_23_zigbee_4_persistence.ino |  3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 3a12aff9b..667c5b69c 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### 8.1.0.7 20200210
 
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
+- Fix wrong encoding of Zigbee persistent data
 
 ### 8.1.0.6 20200205
 
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 984842380..4814bdb8a 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -138,7 +138,7 @@ private:
   static bool findInVector(const std::vector<T>  & vecOfElements, const T  & element);
 
   template < typename T>
-  static int32_t findEndpointInVector(const std::vector<T>  & vecOfElements, const T  & element);
+  static int32_t findEndpointInVector(const std::vector<T>  & vecOfElements, uint8_t element);
 
   // find the first endpoint match for a cluster
   static int32_t findClusterEndpoint(const std::vector<uint32_t>  & vecOfElements, uint16_t element);
@@ -180,12 +180,12 @@ bool Z_Devices::findInVector(const std::vector<T>  & vecOfElements, const T  & e
 }
 
 template < typename T>
-int32_t Z_Devices::findEndpointInVector(const std::vector<T>  & vecOfElements, const T  & element) {
+int32_t Z_Devices::findEndpointInVector(const std::vector<T>  & vecOfElements, uint8_t element) {
 	// Find given element in vector
 
   int32_t found = 0;
   for (auto &elem : vecOfElements) {
-    if ((elem >> 16) & 0xFF == element) { return found; }
+    if ( ((elem >> 16) & 0xFF) == element) { return found; }
     found++;
   }
 
@@ -427,7 +427,7 @@ void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
   Z_Device &device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
-  if (findEndpointInVector(device.endpoints, ep_profile) < 0) {
+  if (findEndpointInVector(device.endpoints, endpoint) < 0) {
     device.endpoints.push_back(ep_profile);
     dirty();
   }
@@ -439,7 +439,7 @@ void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t
   Z_Device &device = getShortAddr(shortaddr);
   if (&device == nullptr) { return; }                 // don't crash if not found
   _updateLastSeen(device);
-  int32_t found = findEndpointInVector(device.endpoints, ep_profile);
+  int32_t found = findEndpointInVector(device.endpoints, endpoint);
   if (found < 0) {
     device.endpoints.push_back(ep_profile);
     dirty();
diff --git a/tasmota/xdrv_23_zigbee_4_persistence.ino b/tasmota/xdrv_23_zigbee_4_persistence.ino
index fcf1dcdc3..a45ce6709 100644
--- a/tasmota/xdrv_23_zigbee_4_persistence.ino
+++ b/tasmota/xdrv_23_zigbee_4_persistence.ino
@@ -31,7 +31,7 @@
 //
 // [Array of devices]
 // [Offset = 2]
-// uint8  - length of revice record
+// uint8  - length of device record
 // uint16 - short address
 // uint64 - long IEEE address
 // uint8  - number of endpoints
@@ -43,6 +43,7 @@
 //
 // str    - ModelID (null terminated C string, 32 chars max)
 // str    - Manuf   (null terminated C string, 32 chars max)
+// str    - FriendlyName   (null terminated C string, 32 chars max)
 // reserved for extensions
 
 // Memory footprint

From 51211dfd55d7ad537e4a19dc567cec7e875eaf0b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 13 Feb 2020 12:46:06 +0100
Subject: [PATCH 261/403] Attempt to fix slow wifi connection caused by #7602

Attempt to fix slow wifi connection caused by #7602
---
 tasmota/support_wifi.ino | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index f261738b6..376e7c6b1 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -429,6 +429,10 @@ void WifiCheckIp(void)
     WifiSetState(1);
     Wifi.counter = WIFI_CHECK_SEC;
     Wifi.retry = Wifi.retry_init;
+    if (Wifi.status != WL_CONNECTED) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
+    }
+    Wifi.status = WL_CONNECTED;
 #ifdef USE_DISCOVERY
 #ifdef WEBSERVER_ADVERTISE
     if (2 == Wifi.mdns_begun) {
@@ -450,9 +454,29 @@ void WifiCheckIp(void)
         break;
       case WL_NO_SSID_AVAIL:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
+
+        if (WIFI_WAIT == Settings.sta_config) {
+          Wifi.retry = Wifi.retry_init;
+        } else {
+          if (Wifi.retry > (Wifi.retry_init / 2)) {
+            Wifi.retry = Wifi.retry_init / 2;
+          }
+          else if (Wifi.retry) {
+            Wifi.retry = 0;
+          }
+        }
+
         break;
       case WL_CONNECT_FAILED:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
+
+        if (Wifi.retry > (Wifi.retry_init / 2)) {
+          Wifi.retry = Wifi.retry_init / 2;
+        }
+        else if (Wifi.retry) {
+          Wifi.retry = 0;
+        }
+
         break;
       default:  // WL_IDLE_STATUS and WL_DISCONNECTED
         // log on the 1/2 or full interval

From a7c85a673e9b7cb7f6583bf5a3eadf4e12e71a45 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 13 Feb 2020 17:19:02 +0200
Subject: [PATCH 262/403] Use dev version of PlatormIO Core

I would be thankful if you use the development version of PIO Core. It's very stable and you should not have any problems with it.
This should help us to be informed about any critical changes in PIO Core which can affect this project. Please report us any issues if they are related to PIO Core.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ffd47f546..88e971a06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
 sudo: false
 install:
   - pip install -U platformio
-  - platformio upgrade
+  - platformio upgrade --dev
   - platformio update
 
 cache: false

From 7cc783a53261b07365c154bc3893c9b3ed8212fe Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:02:07 +0100
Subject: [PATCH 263/403] Add another new DHT driver based on ESPEasy

Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
---
 RELEASENOTES.md                               |   2 +
 tasmota/CHANGELOG.md                          |   2 +
 tasmota/xdrv_01_webserver.ino                 |   2 +-
 .../{xsns_06_dht.ino => xsns_06_dht_v2.ino}   |   4 +-
 tasmota/xsns_06_dht_v3.ino                    | 304 ++++++++++++++++++
 5 files changed, 311 insertions(+), 3 deletions(-)
 rename tasmota/{xsns_06_dht.ino => xsns_06_dht_v2.ino} (99%)
 create mode 100644 tasmota/xsns_06_dht_v3.ino

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9104a5bb1..0962f6617 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -59,6 +59,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change IRremoteESP8266 library updated to v2.7.3
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Change wifi connectivity stability (#7602)
+- Change some wifi code to attempt faster connection (#7621)
 - Change MQTT message size with additional 200 characters
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
@@ -101,3 +102,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add optional Wifi AccessPoint passphrase define WIFI_AP_PASSPHRASE in my_user_config.h (#7690)
 - Add support for FiF LE-01MR energy meter by saper-2 (#7584)
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
+- Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 667c5b69c..0366cfb7f 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### 8.1.0.8 20200212
 
 - Change MQTT message size with additional 200 characters
+- Change some wifi code to attempt faster connection (#7621)
+- Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
 
 ### 8.1.0.7 20200210
 
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 132c6a426..fc143f73a 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -31,7 +31,7 @@
 #define WIFI_SOFT_AP_CHANNEL                  1          // Soft Access Point Channel number between 1 and 11 as used by WifiManager web GUI
 #endif
 
-const uint16_t CHUNKED_BUFFER_SIZE = 400;                // Chunk buffer size (should be smaller than half mqtt_date size)
+const uint16_t CHUNKED_BUFFER_SIZE = 400;                // Chunk buffer size (should be smaller than half mqtt_date size = MESSZ)
 
 const uint16_t HTTP_REFRESH_TIME = 2345;                 // milliseconds
 #define HTTP_RESTART_RECONNECT_TIME           9000       // milliseconds
diff --git a/tasmota/xsns_06_dht.ino b/tasmota/xsns_06_dht_v2.ino
similarity index 99%
rename from tasmota/xsns_06_dht.ino
rename to tasmota/xsns_06_dht_v2.ino
index 44fbfe576..3b692f224 100644
--- a/tasmota/xsns_06_dht.ino
+++ b/tasmota/xsns_06_dht_v2.ino
@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef USE_DHT
+#ifdef USE_DHT_V2
 /*********************************************************************************************\
  * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
  *
@@ -274,7 +274,7 @@ void DhtInit(void)
         snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
       }
     }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v2) " D_SENSORS_FOUND " %d"), dht_sensors);
   } else {
     dht_active = false;
   }
diff --git a/tasmota/xsns_06_dht_v3.ino b/tasmota/xsns_06_dht_v3.ino
new file mode 100644
index 000000000..c777f732e
--- /dev/null
+++ b/tasmota/xsns_06_dht_v3.ino
@@ -0,0 +1,304 @@
+/*
+  xsns_06_dht.ino - DHTxx, AM23xx and SI7021 temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_DHT
+/*********************************************************************************************\
+ * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
+ *
+ * Reading temperature or humidity takes about 250 milliseconds!
+ * Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
+ *
+ * This version is based on ESPEasy _P005_DHT.ino 20191201
+\*********************************************************************************************/
+
+#define XSNS_06          6
+
+#define DHT_MAX_SENSORS  4
+#define DHT_MAX_RETRY    8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;                      // Shelly GPIO00 output only
+bool dht_active = true;                       // DHT configured
+bool dht_dual_mode = false;                   // Single pin mode
+
+struct DHTSTRUCT {
+  uint8_t     pin;
+  uint8_t     type;
+  char     stype[12];
+  uint32_t lastreadtime;
+  uint8_t  lastresult;
+  float    t = NAN;
+  float    h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint8_t sensor, int level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+int DhtReadDat(uint8_t sensor)
+{
+  uint8_t result = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    if (!DhtExpectPulse(sensor, HIGH)) { return -1; }
+
+    delayMicroseconds(35); // was 30
+    if (digitalRead(Dht[sensor].pin)) {
+      result |= (1 << (7 - i));
+    }
+
+    if (!DhtExpectPulse(sensor, LOW)) { return -1; }
+  }
+  return result;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);  // minimum 18ms
+      break;
+    case GPIO_DHT22:
+      delay(2);   // minimum 1ms
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+      // See: https://github.com/letscontrolit/ESPEasy/issues/1798
+      delayMicroseconds(20);
+      break;
+  }
+
+  noInterrupts();
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, HIGH)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+
+  int data = 0;
+  for (uint32_t i = 0; i < 5; i++) {
+    data = DhtReadDat(sensor);
+    if (-1 == data) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      break;
+    }
+    dht_data[i] = data;
+  }
+  interrupts();
+  if (-1 == data) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {  // Reset after 8 misses
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);  // Issue #3164
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+/********************************************************************************************/
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;    // Dual pins mode as used by Shelly
+      dht_sensors = 1;         // We only support one sensor in pseudo mode
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v3) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+    // <1mS
+//    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif  // USE_WEBSERVER
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_DHT

From 509a79e5f6baf859db281511133e5e9ffa553a69 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 13 Feb 2020 17:16:32 +0100
Subject: [PATCH 264/403] more lsfr-LUT-entries and PDU-types

---
 tasmota/xsns_61_MI_NRF24.ino | 859 +++++++++++++++++++++++++++++++++++
 1 file changed, 859 insertions(+)
 create mode 100644 tasmota/xsns_61_MI_NRF24.ino

diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
new file mode 100644
index 000000000..8527c9749
--- /dev/null
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -0,0 +1,859 @@
+/*
+  xsns_61_MI_NRF24.ino - MI-BLE-sensors via nrf24l01 support for Tasmota
+
+  Copyright (C) 2020  Christian Baars and Theo Arends
+
+  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/>.
+
+
+  --------------------------------------------------------------------------------------------
+  Version yyyymmdd  Action    Description
+  --------------------------------------------------------------------------------------------
+
+  0.9.2.0 20200212  integrate - "backports" from MI-HM10, change reading pattern, 
+                                add missing PDU-types, renaming driver
+  ---
+  0.9.1.0 20200117  integrate - Added support for the LYWSD02
+  ---
+  0.9.0.0 20191127  started - further development by Christian Baars
+                    base    - code base from cbm80amiga, floe, Dmitry.GR
+                    forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
+
+*/
+
+#ifdef USE_SPI
+#ifdef USE_NRF24
+#ifdef USE_MIBLE
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  #define MINRF_LOG_BUFFER(x) MINRFshowBuffer(x);
+#else
+  #define MINRF_LOG_BUFFER(x)
+#endif
+
+
+/*********************************************************************************************\
+* MINRF
+* BLE-Sniffer/Bridge for MIJIA/XIAOMI Temperatur/Humidity-Sensor, Mi Flora, LYWSD02
+*
+* Usage: Configure NRF24
+\*********************************************************************************************/
+
+#define XSNS_61             61
+
+#include <vector>
+
+#define FLORA       1
+#define MJ_HT_V1    2
+#define LYWSD02     3
+#define LYWSD03     4
+
+uint8_t kMINRFSlaveID[4][3]  = { 0xC4,0x7C,0x8D, // Flora
+                                0x58,0x2D,0x34, // MJ_HT_V1
+                                0xE7,0x2E,0x00, // LYWSD02
+                                0xA4,0xC1,0x38, // LYWSD03
+                                };
+
+const char kMINRFSlaveType1[] PROGMEM = "Flora";
+const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
+const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
+const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4};
+
+// PDU's or different channels 37-39
+const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
+const uint32_t kMINRFMJPDU[3]  = {0x4760cd66,0xdbcc0cd3,0x33048df5};
+const uint32_t kMINRFL2PDU[3]  = {0x3eaa057d,0xef3b0730,0x71da7646}; // 1 and 3 unsure
+// const uint32_t kMINRFL3PDU[3]  = {0x4760dd78,0xdbcc1ccd,0xffffffff}; //encrypted - 58 58
+const uint32_t kMINRFL3PDU[3]  = {0x4760cb78,0xdbcc0acd,0x33048beb}; //unencrypted  - 30 58
+
+// start-LSFR for different channels 37-39
+const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};  // Flora, LYWSD02
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03
+
+
+#pragma pack(1)  // important!!
+struct MJ_HT_V1Header_t {// related to the payload
+  uint8_t padding[3];
+  uint8_t mesSize;       // 3
+  uint8_t padding2;
+  uint16_t uuid;         // 5,6 -> 0xFE95
+  uint16_t type;         //  7,8 -> 0x2050 MI-TH-V1
+  uint8_t padding3[2];
+  uint8_t counter;       // 11 - counts up with every sent record
+  uint8_t serial[6];     // 12 - 17
+  uint8_t mode;          // 18
+  uint8_t padding5;
+  uint8_t effectiveDataLength;
+  };
+
+struct FlowerHeader_t {        // related to the payload
+  uint8_t padding[4];
+  uint8_t padding2;
+  uint16_t uuid;         // 5,6 -> 0xFE95
+  uint8_t mesSize;
+  uint8_t padding22;
+  uint16_t uuid2;        // 9,10 -> 0xFE95
+  uint16_t type;         //  11,12 -> 0x7120 Flowercare
+  uint8_t padding3[2];
+  uint8_t counter;       // 15 - counts up with every sent record
+  uint8_t serial[6];     // 16 - 21
+  uint8_t padding4;      //22
+  uint8_t mode;          // 23
+  };
+
+union floraPacket_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint16_t data;
+  } T;    // mode 04
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 3
+      uint32_t data:24; //  it is probably a real uint24_t
+  } L;    // mode 07
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint8_t data;
+  } M;    // mode 08
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 2
+      uint16_t data;
+  } F;    // mode 09
+};
+
+union MJ_HT_V1Packet_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 4
+      uint16_t temp;
+      uint16_t hum;
+  } TH;   // mode 0d
+      struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength; // 1
+      uint8_t battery;
+  } B;    // mode 0a
+  // We do NOT need the isolated T and H packet
+};
+
+union LYWSD02Packet_t {    // related to the whole 32-byte-packet/buffer
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } TH;    // mode 04 or 06
+};
+
+struct bleAdvPacket_t { // for nRF24L01 max 32 bytes = 2+6+24
+  uint8_t pduType;
+  uint8_t payloadSize;
+  uint8_t mac[6];
+  union {
+    uint8_t payload[24];
+    MJ_HT_V1Header_t header;
+    FlowerHeader_t flowerHeader;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+        uint8_t hum_lb; // the high byte does not fit into the RX_buffer
+    } TH;   // mode 0d
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+    } T;    // mode 04
+    struct {
+        uint8_t padding[21];
+        uint16_t hum;
+    } H;    // mode 06
+    struct {
+        uint8_t padding[21];
+        uint8_t battery;
+    } B;    // mode 0a
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 2
+        uint16_t data;
+    } F_T;    // mode 04
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 3
+        uint16_t data;
+        uint8_t data2; // unknown meaning, maybe it is a real uint24_t (data with data2)
+    } F_L;    // mode 07
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 1
+        uint8_t data;
+    } F_M;    // mode 08
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size; // 2
+        uint16_t data;
+    } F_F;    // mode 09
+  };
+};
+
+union FIFO_t{
+  bleAdvPacket_t bleAdv;
+  floraPacket_t floraPacket;
+  MJ_HT_V1Packet_t MJ_HT_V1Packet;
+  LYWSD02Packet_t LYWSD02Packet;
+  uint8_t raw[32];
+};
+
+#pragma pack(0)
+
+struct {
+  const uint8_t channel[3]   = {37,38,39};  // BLE advertisement channel number
+  const uint8_t frequency[3] = { 2,26,80};  // real frequency (2400+x MHz)
+
+  uint16_t timer;
+  uint8_t currentChan=0;
+  FIFO_t buffer;
+  uint8_t packetMode; // 0 - normal BLE-advertisements, 1 - special "flora"-packet, 2 - special "MJ_HT_V1"-packet
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  uint8_t streamBuffer[sizeof(buffer)]; //  raw data stream bytes
+  uint8_t lsfrBuffer[sizeof(buffer)];   //  correpsonding lfsr-bytes for the buffer, probably only useful for a BLE-packet
+#endif //  DEBUG_TASMOTA_SENSOR
+
+} MINRF;
+
+struct mi_sensor_t{
+  uint8_t type; //Flora = 1; MJ_HT_V1=2; LYWSD02=3; LYWSD03=4
+  uint8_t serial[6];
+  uint8_t showedUp;
+  float temp; //Flora, MJ_HT_V1, LYWSD0x
+  union {
+    struct {
+      float moisture;
+      float fertility;
+      uint32_t lux;
+    }; // Flora
+    struct {
+      float hum;
+      uint8_t bat;
+    }; // MJ_HT_V1, LYWSD0x
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+/********************************************************************************************/
+
+
+bool MINRFinitBLE(uint8_t _mode)
+{
+  if (MINRF.timer%1000 == 0){ // only re-init every 20 seconds
+    NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+    NRF24radio.setAutoAck(false);
+    NRF24radio.setDataRate(RF24_1MBPS);
+    NRF24radio.disableCRC();
+    NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+    NRF24radio.setRetries(0,0);
+    NRF24radio.setPALevel(RF24_PA_MIN); // we only receive
+    NRF24radio.setAddressWidth(4);
+    // NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
+    // NRF24radio.openWritingPipe(  0x6B7D9171); // not used ATM
+    NRF24radio.powerUp();
+  }
+  if(NRF24radio.isChipConnected()){
+    // DEBUG_SENSOR_LOG(PSTR("MINRF chip connected"));
+    MINRFchangePacketModeTo(_mode);
+    return true;
+  }
+  // DEBUG_SENSOR_LOG(PSTR("MINRF chip NOT !!!! connected"));
+  return false;
+}
+
+void MINRFhopChannel()
+{
+  MINRF.currentChan++;
+  if(MINRF.currentChan >= sizeof(MINRF.channel)) {
+    MINRF.currentChan = 0;
+  }
+  NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+}
+
+/**
+ * @brief Read out FIFO-buffer, swap buffer and whiten
+ *
+ * @return true - If something is in the buffer
+ * @return false - Nothing is in the buffer
+ */
+bool MINRFreceivePacket(void)
+{
+  if(!NRF24radio.available()) {
+    return false;
+  }
+  while(NRF24radio.available()) {
+    // static uint8_t _lsfr = 0; //-> for testing out suitable lsfr-start-values for yet unknown packets
+    // _lsfr++;
+    NRF24radio.read( &MINRF.buffer, sizeof(MINRF.buffer) );
+#ifdef DEBUG_TASMOTA_SENSOR
+    memcpy(&MINRF.streamBuffer, &MINRF.buffer, sizeof(MINRF.buffer));
+#endif // DEBUG_TASMOTA_SENSOR
+    MINRFswapbuf( sizeof(MINRF.buffer) );
+    // MINRF_LOG_BUFFER();
+
+    // AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: _lsfrlist: %x, chan: %u, mode: %u"),_lsfrlist[MINRF.currentChan],MINRF.currentChan, MINRF.packetMode);
+    switch (MINRF.packetMode) {
+      case 0:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  MINRF.channel[MINRF.currentChan] | 0x40);
+      break;
+      case 1:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_A[MINRF.currentChan]); // "flora" mode
+      break;
+      case 2:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "MJ_HT_V1" mode
+      break;
+      case 3:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_A[MINRF.currentChan]); // "LYWSD02" mode
+      break;
+      case 4:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "LYWSD03" mode
+      break;
+    }
+    // DEBUG_SENSOR_LOG(PSTR("MINRF: LSFR:%x"),_lsfr);
+    // if (_lsfr>254) _lsfr=0;
+  }
+  // DEBUG_SENSOR_LOG(PSTR("MINRF: did read FIFO"));
+  return true;
+}
+
+#ifdef DEBUG_TASMOTA_SENSOR
+void MINRFshowBuffer(uint8_t (&buf)[32]){ // we use this only for the 32-byte-FIFO-buffer, so 32 is hardcoded
+  // DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c"
+  //                                       " %c %c %c %c %c %c %c %c")
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
+  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
+  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
+  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
+  );
+}
+#endif // DEBUG_TASMOTA_SENSOR
+
+/**
+ * @brief change lsfrBuffer content to "wire bit order"
+ *
+ * @param len Buffer lenght (could be hardcoded to 32)
+ */
+void MINRFswapbuf(uint8_t len)
+{
+  uint8_t* buf = (uint8_t*)&MINRF.buffer;
+  while(len--) {
+    uint8_t a = *buf;
+    uint8_t v = 0;
+    if (a & 0x80) v |= 0x01;
+    if (a & 0x40) v |= 0x02;
+    if (a & 0x20) v |= 0x04;
+    if (a & 0x10) v |= 0x08;
+    if (a & 0x08) v |= 0x10;
+    if (a & 0x04) v |= 0x20;
+    if (a & 0x02) v |= 0x40;
+    if (a & 0x01) v |= 0x80;
+    *(buf++) = v;
+  }
+}
+
+/**
+ * @brief Whiten the packet buffer
+ *
+ * @param buf   The packet buffer
+ * @param len   Lenght of the packet buffer
+ * @param lfsr  Start lsfr-byte
+ */
+void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
+{
+  while(len--) {
+    uint8_t res = 0;
+    // LFSR in "wire bit order"
+    for (uint8_t i = 1; i; i <<= 1) {
+      if (lfsr & 0x01) {
+        lfsr ^= 0x88;
+        res |= i;
+      }
+      lfsr >>= 1;
+    }
+    *(buf++) ^= res;
+#ifdef DEBUG_TASMOTA_SENSOR
+    MINRF.lsfrBuffer[31-len] = lfsr;
+#endif //DEBUG_TASMOTA_SENSOR
+  }
+}
+
+void MINRFreverseMAC(uint8_t _mac[]){
+  uint8_t _reversedMAC[6];
+  for (uint8_t i=0; i<6; i++){
+    _reversedMAC[5-i] = _mac[i];
+  }
+  memcpy(_mac,_reversedMAC, sizeof(_reversedMAC));
+}
+
+/**
+ * @brief Set packet mode and fitting PDU-type of the NRF24L01
+ *
+ * @param _mode The internal packet mode number
+ */
+void MINRFchangePacketModeTo(uint8_t _mode) {
+  uint32_t (_nextchannel) = MINRF.currentChan+1;
+  if (_nextchannel>2) _nextchannel=0;
+
+  switch(_mode){
+    case 0: // normal BLE advertisement
+      NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
+    break;
+    case 1: // special flora packet
+      NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]); // 95 fe 71 20 -> flora
+    break;
+    case 2: // special MJ_HT_V1 packet
+      NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]); // 95 fe 50 20 -> MJ_HT_V1
+    break;
+    case 3: // special LYWSD02 packet
+      NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);// 95 fe 70 20 -> LYWSD02
+    break;
+    case 4: // special LYWSD03 packet
+      if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
+      NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);// 95 fe 58 30 -> LYWSD03 (= no data message)
+    break;
+  }
+  // DEBUG_SENSOR_LOG(PSTR("MINRF: Change Mode to %u"),_mode);
+  MINRF.packetMode = _mode;
+}
+
+/**
+ * @brief Return the slot number of a known sensor or return create new sensor slot
+ *
+ * @param _serial     BLE address of the sensor
+ * @param _type       Type number of the sensor, 0xff for Auto-type
+ * @return uint32_t   Known or new slot in the sensors-vector
+ */
+uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  if(_type==0xff){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: will test MAC-type"));
+    for (uint32_t i=0;i<4;i++){
+      if(memcmp(_serial,kMINRFSlaveID+i,3)==0){
+        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC is type %u"), i);
+        _type = i+1;
+      }
+      else {
+        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-type is unknown"));
+      }
+    }
+  }
+  if(_type==0xff) return _type; // error
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){ // if we got an intact packet, the sensor should show up several times
+        MIBLEsensors.at(i).showedUp++;     // count up to the above number ... now we are pretty sure
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MINRF i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MINRF n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MINRF: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0x00ffffff;
+      break;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+/**
+ * @brief Remove "zombie" sensors after a certain amount of time.
+ *        If they showed up less than 3 times, they are probably
+ *        a product of data corruption.
+ */
+void MINRFpurgeFakeSensors(void){
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(MIBLEsensors.at(i).showedUp<3){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: remove FAKE sensor at slot: %u"), i);
+      MIBLEsensors.erase(MIBLEsensors.begin()+i);
+    }
+  }
+}
+
+
+void MINRFhandleFloraPacket(void){
+  if(MINRF.buffer.floraPacket.T.idWord!=0x9800 && MINRF.buffer.floraPacket.T.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, 0xff); // T is not specific, any struct would be possible to use
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.floraPacket.L.mode) { // we can use any struct with a mode, they are all same at this point
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.T.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MINRF.buffer.floraPacket.T.data );
+    break;
+    case 7:
+    if(true){
+        MIBLEsensors.at(_slot).lux=MINRF.buffer.floraPacket.L.data;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U24: %x Lux"), MINRF.buffer.floraPacket.L.data);
+    break;
+    case 8:
+    _tempFloat =(float)MINRF.buffer.floraPacket.M.data;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).moisture=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MINRF.buffer.floraPacket.M.data);
+    break;
+    case 9:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.F.data);
+    if(_tempFloat<65535){ // ???
+        MIBLEsensors.at(_slot).fertility=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MINRF.buffer.floraPacket.F.data);
+    break;
+  }
+}
+
+void MINRFhandleMJ_HT_V1Packet(void){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, 0xff); // B would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp,  MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
+void MINRFhandleLYWSD02Packet(void){
+  if(MINRF.buffer.LYWSD02Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected LYWSD02-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff); // H would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+    if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.LYWSD02Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+    case 6:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<101){
+        MIBLEsensors.at(_slot).hum=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+  }
+}
+
+void MINRFhandleLYWSD03Packet(void){
+  // not much to do ATM, just show the sensor without data
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial); //the beginning is equal to the LYWSD02-packet
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+    if(_slot==0xff) return;
+
+  MINRF_LOG_BUFFER(MINRF.streamBuffer);
+  MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+  MINRF_LOG_BUFFER(MINRF.buffer.raw);
+}
+
+void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
+  
+  if(MINRF.timer>6000){ // happens every 6000/20 = 300 seconds
+    DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
+    MINRFpurgeFakeSensors();
+    MINRF.timer=0;
+  }
+  MINRF.timer++;
+
+  if (!MINRFreceivePacket()){
+    // DEBUG_SENSOR_LOG(PSTR("MINRF: nothing received"));  
+  }
+
+  else if(MINRF.buffer.bleAdv.header.uuid==0xfe95){ // XIAOMI-BLE-Packet
+    MINRF_LOG_BUFFER(MINRF.streamBuffer);
+    MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    DEBUG_SENSOR_LOG(PSTR("MINRF: Type: %x"), MINRF.buffer.bleAdv.header.type);
+    switch(MINRF.buffer.bleAdv.header.type){
+      case 0x2050:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: MJ_HT_V1 Packet"));
+      break;
+      case 0x1613:case 0x1614:case 0x1615:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: Flora Packet"));
+      break;
+      default:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: unknown Packet"));
+      break;
+    }
+  }
+  else if (MINRF.packetMode == FLORA){
+    MINRFhandleFloraPacket();
+  }
+  else if (MINRF.packetMode == MJ_HT_V1){
+    MINRFhandleMJ_HT_V1Packet();
+  }
+  else if (MINRF.packetMode == LYWSD02){
+    MINRFhandleLYWSD02Packet();
+  }
+  else if (MINRF.packetMode == LYWSD03){
+    MINRFhandleLYWSD03Packet();
+  }
+  
+  // DEBUG_SENSOR_LOG(PSTR("MINRF: Change packet mode every 50 msec"));
+  if (MINRF.packetMode == LYWSD03){
+    MINRFinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
+  }
+  else {
+    MINRFinitBLE(++MINRF.packetMode);
+  }
+  
+  MINRFhopChannel();
+  NRF24radio.startListening();
+}
+/*********************************************************************************************\
+ * Presentation
+\*********************************************************************************************/
+
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_MINRF_FLORA_DATA[] PROGMEM =  "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_MINRF_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
+
+void MINRFShow(bool json)
+{
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      if(MIBLEsensors.at(i).showedUp < 3){
+        DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+        break;
+        }
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kMINRFSlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+      char temperature[33]; // all sensors have temperature
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){ // this is the error code -> no temperature
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){ // this is the error code -> no temperature
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no moisture
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no fertility
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){ 
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no humidity
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){ // this is the error code -> no battery
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
+    }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        if(MIBLEsensors.at(i).showedUp < 3){
+          DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+          break;
+          }
+        WSContentSend_PD(HTTP_MINRF_HL);
+        WSContentSend_PD(HTTP_MINRF_MAC, kMINRFSlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]); 
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kMINRFSlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          if(MIBLEsensors.at(i).lux!=0x00ffffff){ // this is the error code -> no valid value
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){ // this is the error code -> no valid value
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){ // this is the error code -> no valid value
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_MINRF_FLORA_DATA, kMINRFSlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){ // everything "above" Flora
+          if(MIBLEsensors.at(i).hum!=-1.0f){ // this is the error code -> no humidity
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kMINRFSlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
+        }
+      }
+#endif  // USE_WEBSERVER
+    }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns61(uint8_t function)
+{
+  bool result = false;
+
+  if (NRF24.chipType) {
+    switch (function) {
+      case FUNC_INIT:
+        MINRFinitBLE(1);
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: started"));
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        MINRF_EVERY_50_MSECOND();
+        break;
+      case FUNC_JSON_APPEND:
+        MINRFShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MINRFShow(0);
+        break;
+#endif  // USE_WEBSERVER
+    }
+  }
+  return result;
+}
+
+#endif  // USE_MIBLE
+#endif  // USE_NRF24
+#endif  // USE_SPI
+
+

From e9f0c5b6d6554cf423192402a20215be028597a0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:12:27 +0100
Subject: [PATCH 265/403] Add a stripped down Add a stripped DHT driver based
 on ESPEasy (#7717)

Add a stripped DHT driver based on ESPEasy (#7717)
---
 tasmota/xsns_06_dht_v3.ino |   2 +-
 tasmota/xsns_06_dht_v4.ino | 291 +++++++++++++++++++++++++++++++++++++
 2 files changed, 292 insertions(+), 1 deletion(-)
 create mode 100644 tasmota/xsns_06_dht_v4.ino

diff --git a/tasmota/xsns_06_dht_v3.ino b/tasmota/xsns_06_dht_v3.ino
index c777f732e..8b30cee7f 100644
--- a/tasmota/xsns_06_dht_v3.ino
+++ b/tasmota/xsns_06_dht_v3.ino
@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef USE_DHT
+#ifdef USE_DHT_V3
 /*********************************************************************************************\
  * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
  *
diff --git a/tasmota/xsns_06_dht_v4.ino b/tasmota/xsns_06_dht_v4.ino
new file mode 100644
index 000000000..d69d1e20f
--- /dev/null
+++ b/tasmota/xsns_06_dht_v4.ino
@@ -0,0 +1,291 @@
+/*
+  xsns_06_dht.ino - DHTxx, AM23xx and SI7021 temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_DHT
+/*********************************************************************************************\
+ * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
+ *
+ * Reading temperature or humidity takes about 250 milliseconds!
+ * Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
+ *
+ * This version is based on ESPEasy _P005_DHT.ino 20191201 and stripped
+\*********************************************************************************************/
+
+#define XSNS_06          6
+
+#define DHT_MAX_SENSORS  4
+#define DHT_MAX_RETRY    8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;                      // Shelly GPIO00 output only
+bool dht_active = true;                       // DHT configured
+bool dht_dual_mode = false;                   // Single pin mode
+
+struct DHTSTRUCT {
+  uint8_t     pin;
+  uint8_t     type;
+  char     stype[12];
+  uint32_t lastreadtime;
+  uint8_t  lastresult;
+  float    t = NAN;
+  float    h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:                                    // DHT11
+      delay(19);  // minimum 18ms
+      break;
+    case GPIO_DHT22:                                    // DHT21, DHT22, AM2301, AM2302, AM2321
+      delay(2);   // minimum 1ms
+      break;
+    case GPIO_SI7021:                                   // iTead SI7021
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:                                    // DHT11
+    case GPIO_DHT22:                                    // DHT21, DHT22, AM2301, AM2302, AM2321
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:                                   // iTead SI7021
+      delayMicroseconds(20);                            // See: https://github.com/letscontrolit/ESPEasy/issues/1798
+      break;
+  }
+
+  uint32_t level = 9;
+  noInterrupts();
+  for (uint32_t i = 0; i < 3; i++) {
+    level = i &1;
+    if (!DhtExpectPulse(sensor, level)) { break; }      // Expect LOW, HIGH, LOW
+    level = 9;
+  }
+  if (9 == level) {
+    int data = 0;
+    for (uint32_t i = 0; i < 5; i++) {
+      data = 0;
+      for (uint32_t j = 0; j < 8; j++) {
+        level = 1;
+        if (!DhtExpectPulse(sensor, level)) { break; }  // Expect HIGH
+
+        delayMicroseconds(35);                          // Was 30
+        if (digitalRead(Dht[sensor].pin)) {
+          data |= (1 << (7 - j));
+        }
+
+        level = 0;
+        if (!DhtExpectPulse(sensor, level)) { break; }  // Expect LOW
+        level = 9;
+      }
+      if (level < 2) { break; }
+
+      dht_data[i] = data;
+    }
+  }
+  interrupts();
+  if (level < 2) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE), (0 == level) ? D_START_SIGNAL_LOW : D_START_SIGNAL_HIGH);
+    return false;
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint32_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {  // Reset after 8 misses
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);  // Issue #3164
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+/********************************************************************************************/
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;    // Dual pins mode as used by Shelly
+      dht_sensors = 1;         // We only support one sensor in pseudo mode
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v4) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif  // USE_WEBSERVER
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_DHT

From 39d100e1d199f4d0d660aa60a7322f1c7117f15f Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Thu, 13 Feb 2020 19:48:38 +0100
Subject: [PATCH 266/403] rename driver

---
 tasmota/xsns_61_MI_BLE.ino | 858 -------------------------------------
 1 file changed, 858 deletions(-)
 delete mode 100644 tasmota/xsns_61_MI_BLE.ino

diff --git a/tasmota/xsns_61_MI_BLE.ino b/tasmota/xsns_61_MI_BLE.ino
deleted file mode 100644
index c07323684..000000000
--- a/tasmota/xsns_61_MI_BLE.ino
+++ /dev/null
@@ -1,858 +0,0 @@
-/*
-  xsns_61_Ml_BLE.ino - MI-BLE-sensors via nrf24l01 support for Tasmota
-
-  Copyright (C) 2020  Christian Baars and Theo Arends
-
-  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/>.
-
-
-  --------------------------------------------------------------------------------------------
-  Version yyyymmdd  Action    Description
-  --------------------------------------------------------------------------------------------
-
-
-  0.9.1.0 20200117  integrate - Added support for the LYWSD02
-  ---
-  0.9.0.0 20191127  started - further development by Christian Baars
-                    base    - code base from cbm80amiga, floe, Dmitry.GR
-                    forked  - from arendst/tasmota            - https://github.com/arendst/Tasmota
-
-*/
-
-#ifdef USE_SPI
-#ifdef USE_NRF24
-#ifdef USE_MIBLE
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  #define MIBLE_LOG_BUFFER(x) MIBLEshowBuffer(x);
-#else
-  #define MIBLE_LOG_BUFFER(x)
-#endif
-
-
-/*********************************************************************************************\
-* MIBLE
-* BLE-Sniffer/Bridge for MIJIA/XIAOMI Temperatur/Humidity-Sensor, Mi Flora
-*
-* Usage: Configure NRF24
-\*********************************************************************************************/
-
-#define XSNS_61             61
-
-#include <vector>
-
-const char MIBLESlaveFlora[] PROGMEM = "Flora";
-const char MIBLESlaveMJ_HT_V1[] PROGMEM = "MJ_HT_V1";
-const char MIBLESlaveLYWSD02[] PROGMEM = "LYWSD02";
-
-#pragma pack(1)  // important!!
-struct MJ_HT_V1Header_t {// related to the payload
-  uint8_t padding[3];
-  uint8_t mesSize;       // 3
-  uint8_t padding2;
-  uint16_t uuid;         // 5,6 -> 0xFE95
-  uint16_t type;         //  7,8 -> 0x2050 MI-TH-V1
-  uint8_t padding3[2];
-  uint8_t counter;       // 11 - counts up with every sent record
-  uint8_t serial[6];     // 12 - 17
-  uint8_t mode;          // 18
-  uint8_t padding5;
-  uint8_t effectiveDataLength;
-  };
-
-struct FlowerHeader_t {        // related to the payload
-  uint8_t padding[4];
-  uint8_t padding2;
-  uint16_t uuid;         // 5,6 -> 0xFE95
-  uint8_t mesSize;
-  uint8_t padding22;
-  uint16_t uuid2;        // 9,10 -> 0xFE95
-  uint16_t type;         //  11,12 -> 0x7120 Flowercare
-  uint8_t padding3[2];
-  uint8_t counter;       // 15 - counts up with every sent record
-  uint8_t serial[6];     // 16 - 21
-  uint8_t padding4;      //22
-  uint8_t mode;          // 23
-  };
-
-union floraPacket_t {    // related to the whole 32-byte-packet/buffer
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 1
-      uint16_t data;
-  } T;    // mode 04
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 3
-      uint16_t data;
-      uint8_t data2; // unknown meaning, maybe it is a real uint24_t (data with data2)
-  } L;    // mode 07
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 1
-      uint8_t data;
-  } M;    // mode 08
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 2
-      uint16_t data;
-  } F;    // mode 09
-};
-
-union MJ_HT_V1Packet_t {    // related to the whole 32-byte-packet/buffer
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 4
-      uint16_t temp;
-      uint16_t hum;
-  } TH;   // mode 0d
-      struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength; // 1
-      uint8_t battery;
-  } B;    // mode 0a
-  // We do NOT need the isolated T and H packet
-};
-
-union LYWSD02Packet_t {    // related to the whole 32-byte-packet/buffer
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } TH;    // mode 04 or 06
-};
-
-struct bleAdvPacket_t { // for nRF24L01 max 32 bytes = 2+6+24
-  uint8_t pduType;
-  uint8_t payloadSize;
-  uint8_t mac[6];
-  union {
-    uint8_t payload[24];
-    MJ_HT_V1Header_t header;
-    FlowerHeader_t flowerHeader;
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-        uint8_t hum_lb; // the high byte does not fit into the RX_buffer
-    } TH;   // mode 0d
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-    } T;    // mode 04
-    struct {
-        uint8_t padding[21];
-        uint16_t hum;
-    } H;    // mode 06
-    struct {
-        uint8_t padding[21];
-        uint8_t battery;
-    } B;    // mode 0a
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size; // 2
-        uint16_t data;
-    } F_T;    // mode 04
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size; // 3
-        uint16_t data;
-        uint8_t data2; // unknown meaning, maybe it is a real uint24_t (data with data2)
-    } F_L;    // mode 07
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size; // 1
-        uint8_t data;
-    } F_M;    // mode 08
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size; // 2
-        uint16_t data;
-    } F_F;    // mode 09
-  };
-};
-
-union FIFO_t{
-  bleAdvPacket_t bleAdv;
-  floraPacket_t floraPacket;
-  MJ_HT_V1Packet_t MJ_HT_V1Packet;
-  LYWSD02Packet_t LYWSD02Packet;
-  uint8_t raw[32];
-};
-
-#pragma pack(0)
-
-struct {
-  const uint8_t channel[3]   = {37,38,39};  // BLE advertisement channel number
-  const uint8_t frequency[3] = { 2,26,80};  // real frequency (2400+x MHz)
-
-  uint16_t timer;
-  uint8_t currentChan=0;
-  FIFO_t buffer;
-  uint8_t packetMode; // 0 - normal BLE-advertisements, 1 - special "flora"-packet, 2 - special "MJ_HT_V1"-packet
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  uint8_t streamBuffer[sizeof(buffer)]; //  raw data stream bytes
-  uint8_t lsfrBuffer[sizeof(buffer)];   //  correpsonding lfsr-bytes for the buffer, probably only useful for a BLE-packet
-#endif //  DEBUG_TASMOTA_SENSOR
-
-} MIBLE;
-
-struct mi_sensor_t{
-  uint8_t type; //flora = 1; MI-HT_V1=2; LYWSD02=3
-  uint8_t serial[6];
-  uint8_t showedUp;
-  union {
-    struct {
-      float temp;
-      float moisture;
-      float fertility;
-      uint16_t lux;
-    } Flora;
-    struct {
-      float temp;
-      float hum;
-      uint8_t bat;
-    } MJ_HT_V1;
-    struct {
-      float temp;
-      float hum;
-    } LYWSD02;
-  };
-};
-
-std::vector<mi_sensor_t> MIBLEsensors;
-
-/********************************************************************************************/
-
-
-bool MIBLEinitBLE(uint8_t _mode)
-{
-  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
-  NRF24radio.setAutoAck(false);
-  NRF24radio.setDataRate(RF24_1MBPS);
-  NRF24radio.disableCRC();
-  NRF24radio.setChannel( MIBLE.frequency[MIBLE.currentChan] );
-  NRF24radio.setRetries(0,0);
-  NRF24radio.setPALevel(RF24_PA_MIN); // we only receive
-  NRF24radio.setAddressWidth(4);
-  // NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
-  // NRF24radio.openWritingPipe(  0x6B7D9171); // not used ATM
-  NRF24radio.powerUp();
-
-  if(NRF24radio.isChipConnected()){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE chip connected"));
-    MIBLEchangePacketModeTo(_mode);
-    return true;
-  }
-  DEBUG_SENSOR_LOG(PSTR("MIBLE chip NOT !!!! connected"));
-  return false;
-}
-
-void MIBLEhopChannel()
-{
-  MIBLE.currentChan++;
-  if(MIBLE.currentChan >= sizeof(MIBLE.channel)) {
-    MIBLE.currentChan = 0;
-  }
-  NRF24radio.setChannel( MIBLE.frequency[MIBLE.currentChan] );
-}
-
-/**
- * @brief Read out FIFO-buffer, swap buffer and whiten
- *
- * @return true - If something is in the buffer
- * @return false - Nothing is in the buffer
- */
-bool MIBLEreceivePacket(void)
-{
-  if(!NRF24radio.available()) {
-    return false;
-  }
-  while(NRF24radio.available()) {
-    // static uint8_t _lsfr = 0; //-> for testing out suitable lsfr-start-values for yet unknown packets
-    // _lsfr++;
-    NRF24radio.read( &MIBLE.buffer, sizeof(MIBLE.buffer) );
-#ifdef DEBUG_TASMOTA_SENSOR
-    memcpy(&MIBLE.streamBuffer, &MIBLE.buffer, sizeof(MIBLE.buffer));
-#endif // DEBUG_TASMOTA_SENSOR
-    MIBLEswapbuf( sizeof(MIBLE.buffer) );
-    // MIBLE_LOG_BUFFER();
-    switch (MIBLE.packetMode) {
-      case 0:
-      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  MIBLE.channel[MIBLE.currentChan] | 0x40);
-      break;
-      case 1:
-      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x17); // "flora" mode 0x17
-      break;
-      case 2:
-      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x72); // "MJ_HT_V1" mode 0x72
-      break;
-      case 3:
-      MIBLEwhiten((uint8_t *)&MIBLE.buffer, sizeof(MIBLE.buffer),  0x17); // "LYWSD02" mode 0x17
-      break;
-    }
-    // DEBUG_SENSOR_LOG(PSTR("MIBLE: LSFR:%x"),_lsfr);
-    // if (_lsfr>254) _lsfr=0;
-  }
-  // DEBUG_SENSOR_LOG(PSTR("MIBLE: did read FIFO"));
-  return true;
-}
-
-#ifdef DEBUG_TASMOTA_SENSOR
-void MIBLEshowBuffer(uint8_t (&buf)[32]){ // we use this only for the 32-byte-FIFO-buffer, so 32 is hardcoded
-  // DEBUG_SENSOR_LOG(PSTR("MIBLE: Buffer: %c %c %c %c %c %c %c %c"
-  //                                       " %c %c %c %c %c %c %c %c"
-  //                                       " %c %c %c %c %c %c %c %c"
-  //                                       " %c %c %c %c %c %c %c %c")
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
-  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
-  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
-  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
-  );
-}
-#endif // DEBUG_TASMOTA_SENSOR
-
-/**
- * @brief change lsfrBuffer content to "wire bit order"
- *
- * @param len Buffer lenght (could be hardcoded to 32)
- */
-void MIBLEswapbuf(uint8_t len)
-{
-  uint8_t* buf = (uint8_t*)&MIBLE.buffer;
-  while(len--) {
-    uint8_t a = *buf;
-    uint8_t v = 0;
-    if (a & 0x80) v |= 0x01;
-    if (a & 0x40) v |= 0x02;
-    if (a & 0x20) v |= 0x04;
-    if (a & 0x10) v |= 0x08;
-    if (a & 0x08) v |= 0x10;
-    if (a & 0x04) v |= 0x20;
-    if (a & 0x02) v |= 0x40;
-    if (a & 0x01) v |= 0x80;
-    *(buf++) = v;
-  }
-}
-
-/**
- * @brief Whiten the packet buffer
- *
- * @param buf   The packet buffer
- * @param len   Lenght of the packet buffer
- * @param lfsr  Start lsfr-byte
- */
-void MIBLEwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
-{
-  while(len--) {
-    uint8_t res = 0;
-    // LFSR in "wire bit order"
-    for (uint8_t i = 1; i; i <<= 1) {
-      if (lfsr & 0x01) {
-        lfsr ^= 0x88;
-        res |= i;
-      }
-      lfsr >>= 1;
-    }
-    *(buf++) ^= res;
-#ifdef DEBUG_TASMOTA_SENSOR
-    MIBLE.lsfrBuffer[31-len] = lfsr;
-#endif //DEBUG_TASMOTA_SENSOR
-  }
-}
-
-
-/**
- * @brief Set packet mode and fitting PDU-type of the NRF24L01
- *
- * @param _mode The internal packet mode number
- */
-void MIBLEchangePacketModeTo(uint8_t _mode) {
-  switch(_mode){
-    case 0: // normal BLE advertisement
-      NRF24radio.openReadingPipe(0,0x6B7D9171); // advertisement address: 0x8E89BED6 (bit-reversed -> 0x6B7D9171)
-    break;
-    case 1: // special flora packet
-      NRF24radio.openReadingPipe(0,0xef3b8730); // 95 fe 71 20 -> flora, needs lfsr 0x17
-    break;
-    case 2: // special MJ_HT_V1 packet
-      NRF24radio.openReadingPipe(0,0xdbcc0cd3); // 95 fe 50 20 -> MJ_HT_V1, needs lsfr 0x72
-    break;
-    case 3: // special LYWSD02 packet
-      NRF24radio.openReadingPipe(0,0xef3b0730); // 95 fe 70 20 -> LYWSD02, needs lfsr 0x17
-    break;
-  }
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: Change Mode to %u"),_mode);
-  MIBLE.timer = 0;
-  MIBLE.packetMode = _mode;
-}
-
-/**
- * @brief Return the slot number of a known sensor or return create new sensor slot
- *
- * @param _serial     BLE address of the sensor
- * @param _type       Type number of the sensor
- * @return uint32_t   Known or new slot in the sensors-vector
- */
-uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
-      if(MIBLEsensors.at(i).showedUp < 3){ // if we got an intact packet, the sensor should show up several times
-        MIBLEsensors.at(i).showedUp++;     // count up to the above number ... now we are pretty sure
-      }
-      return i;
-    }
-    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
-  }
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
-  mi_sensor_t _newSensor;
-  memcpy(_newSensor.serial,_serial, sizeof(_serial));
-  _newSensor.type = _type;
-  _newSensor.showedUp = 1;
-  switch (_type)
-    {
-    case 1:
-      _newSensor.Flora.temp =-1000.0f;
-      _newSensor.Flora.moisture =-1000.0f;
-      _newSensor.Flora.fertility =-1000.0f;
-      _newSensor.Flora.lux = 0xffff;
-      break;
-    case 2:
-      _newSensor.MJ_HT_V1.temp=-1000.0f;
-      _newSensor.MJ_HT_V1.hum=-1.0f;
-      _newSensor.MJ_HT_V1.bat=0xff;
-      break;
-    case 3:
-      _newSensor.LYWSD02.temp=-1000.0f;
-      _newSensor.LYWSD02.hum=-1.0f;
-      break;
-    default:
-      break;
-    }
-  MIBLEsensors.push_back(_newSensor);
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
-  return MIBLEsensors.size()-1;
-};
-
-/**
- * @brief Remove "zombie" sensors after a certain amount of time.
- *        If they showed up less than 3 times, they are probably
- *        a product of data corruption.
- */
-void MIBLEpurgeFakeSensors(void){
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(MIBLEsensors.at(i).showedUp<3){
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: remove FAKE sensor at slot: %u"), i);
-      MIBLEsensors.erase(MIBLEsensors.begin()+i);
-    }
-  }
-}
-
-
-void MIBLEhandleFloraPacket(void){
-  if(MIBLE.buffer.floraPacket.T.idWord!=0x9800 && MIBLE.buffer.floraPacket.T.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected Flora packet"));
-    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
-    return;
-  }
-  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.floraPacket.T.serial, 1); // T is not specific, any struct would be possible to use
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-
-  static float _tempFloat;
-  switch(MIBLE.buffer.floraPacket.L.mode) { // we can use any struct with a mode, they are all same at this point
-    case 4:
-    _tempFloat=(float)(MIBLE.buffer.floraPacket.T.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).Flora.temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MIBLE.buffer.floraPacket.T.data );
-    break;
-    case 7:
-    _tempFloat=MIBLE.buffer.floraPacket.L.data;
-    if(_tempFloat<65535){
-        MIBLEsensors.at(_slot).Flora.lux=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U8: %x  U16: %x Lux"), MIBLE.buffer.floraPacket.L.data, MIBLE.buffer.floraPacket.L.data);
-    break;
-    case 8:
-    _tempFloat =(float)MIBLE.buffer.floraPacket.M.data;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).Flora.moisture=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MIBLE.buffer.floraPacket.M.data);
-    break;
-    case 9:
-    _tempFloat=(float)(MIBLE.buffer.floraPacket.F.data);
-    if(_tempFloat<65535){ // ???
-        MIBLEsensors.at(_slot).Flora.fertility=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MIBLE.buffer.floraPacket.F.data);
-    break;
-  }
-}
-
-void MIBLEhandleMJ_HT_V1Packet(void){
-  if(MIBLE.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MIBLE.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected MJ_HT_V1-packet"));
-    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
-    return;
-  }
-  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.MJ_HT_V1Packet.TH.serial, 2); // B would be possible too
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-
-  static float _tempFloat;
-  switch(MIBLE.buffer.MJ_HT_V1Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
-    case 0x0d:
-    _tempFloat=(float)(MIBLE.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).MJ_HT_V1.temp = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
-    }
-    _tempFloat=(float)(MIBLE.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).MJ_HT_V1.hum = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MIBLE.buffer.MJ_HT_V1Packet.TH.temp,  MIBLE.buffer.MJ_HT_V1Packet.TH.hum);
-    break;
-    case 0x0a:
-    if(MIBLE.buffer.MJ_HT_V1Packet.B.battery<101){
-        MIBLEsensors.at(_slot).MJ_HT_V1.bat = MIBLE.buffer.MJ_HT_V1Packet.B.battery;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MIBLE.buffer.MJ_HT_V1Packet.B.battery);
-    break;
-  }
-}
-
-void MIBLEhandleLYWSD02Packet(void){
-  if(MIBLE.buffer.LYWSD02Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: unexpected LYWSD02-packet"));
-    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
-    return;
-  }
-  uint32_t _slot = MIBLEgetSensorSlot(MIBLE.buffer.LYWSD02Packet.TH.serial, 3); // H would be possible too
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-
-  static float _tempFloat;
-  switch(MIBLE.buffer.LYWSD02Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
-    case 4:
-    _tempFloat=(float)(MIBLE.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).LYWSD02.temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MIBLE.buffer.LYWSD02Packet.TH.data );
-    break;
-    case 6:
-    _tempFloat=(float)(MIBLE.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<101){
-        MIBLEsensors.at(_slot).LYWSD02.hum=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MIBLE.buffer.LYWSD02Packet.TH.data );
-    break;
-  }
-}
-
-void MIBLE_EVERY_100_MSECOND() { // Every 100mseconds, with many sensors 50ms could make sense
-  static uint32_t _purgeCounter = 0;
-  if (MIBLE.timer>600){ // Change read mode every n/10 seconds
-    if(++_purgeCounter>8){ // happens every 8 x 600 = 4800 seconds
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: check for FAKE sensors"));
-      MIBLEpurgeFakeSensors();
-    }
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Change packet mode after 60 seconds, MIBLE.timer: %u"),MIBLE.timer);
-    if (MIBLE.packetMode == 3){
-      MIBLEinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
-    }
-    else {
-      MIBLEinitBLE(MIBLE.packetMode + 1);
-    }
-  }
-  MIBLE.timer++;
-
-  if (!MIBLEreceivePacket()){
-    MIBLEhopChannel();
-    NRF24radio.startListening();
-    return;
-  }
-
-  if(MIBLE.buffer.bleAdv.header.uuid==0xfe95){ // XIAOMI-BLE-Packet
-    MIBLE_LOG_BUFFER(MIBLE.streamBuffer);
-    MIBLE_LOG_BUFFER(MIBLE.lsfrBuffer);
-    MIBLE_LOG_BUFFER(MIBLE.buffer.raw);
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Type: %x"), MIBLE.buffer.bleAdv.header.type);
-    switch(MIBLE.buffer.bleAdv.header.type){
-      case 0x2050:
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: MJ_HT_V1 Packet"));
-      break;
-      case 0x1613:case 0x1614:case 0x1615:
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: Flora Packet"));
-      break;
-      default:
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: unknown Packet"));
-      break;
-    }
-  }
-  if (MIBLE.packetMode == 1){ // "flora" mode
-    MIBLEhandleFloraPacket();
-  }
-  if (MIBLE.packetMode == 2){ // "MJ_HT_V1" mode
-    MIBLEhandleMJ_HT_V1Packet();
-  }
-  if (MIBLE.packetMode == 3){ // "LYWSD02" mode
-    MIBLEhandleLYWSD02Packet();
-  }
-
-    MIBLEhopChannel();
-    NRF24radio.startListening();
-}
-
-const char HTTP_MIBLE_SERIAL[] PROGMEM =
- "{s}%s" " Address" "{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-const char HTTP_BATTERY[] PROGMEM =
- "{s}%s" " Battery" "{m}%u%%{e}";
-
-const char HTTP_MIBLE_FLORA_DATA[] PROGMEM =
-  "{s}%s" " Fertility" "{m}%sus/cm{e}";
-
-
-void MIBLEShow(bool json)
-{
-  if (json) {
-    if (!MIBLEsensors.size()) { return; }
-
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      char slave[33];
-      switch(MIBLEsensors.at(i).type){
-        case 1:
-            if(MIBLEsensors.at(i).showedUp < 3){
-              DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-              break;
-            }
-            sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveFlora,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-            char temperature_flora[33];
-            dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
-            char lux_flora[33];
-            dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
-            char moisture_flora[33];
-            dtostrfd(MIBLEsensors.at(i).Flora.moisture, 0, moisture_flora);
-            char fertility_flora[33];
-            dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
-            ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-            if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
-              ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature_flora);
-            }
-            if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
-              ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux_flora);
-            }
-            if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
-              ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture_flora);
-            }
-            if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
-              ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility_flora);
-            }
-            ResponseAppend_P(PSTR("}"));
-          break;
-        case 2:
-          if(MIBLEsensors.at(i).showedUp < 3){
-            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-            break;
-          }
-          sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveMJ_HT_V1,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
-          ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-          if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){ // this is the error code -> no temperature
-            ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-          }
-          if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1000.0f){ // this is the error code -> no temperature
-            ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){ // this is the error code -> no temperature
-            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).MJ_HT_V1.bat);
-          }
-          ResponseAppend_P(PSTR("}"));
-          break;
-        case 3:
-          if(MIBLEsensors.at(i).showedUp < 3){
-            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-            break;
-          }
-          sprintf_P(slave,"%s-%02x%02x%02x",MIBLESlaveLYWSD02,MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-          dtostrfd(MIBLEsensors.at(i).LYWSD02.temp, Settings.flag2.temperature_resolution, temperature);
-          dtostrfd(MIBLEsensors.at(i).LYWSD02.hum, 1, humidity);
-          ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-          if(MIBLEsensors.at(i).LYWSD02.temp!=-1000.0f){ // this is the error code -> no temperature
-            ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-          }
-          if(MIBLEsensors.at(i).LYWSD02.hum!=-1000.0f){ // this is the error code -> no temperature
-            ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          ResponseAppend_P(PSTR("}"));
-          break;
-      }
-    }
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
-
-    if (!MIBLEsensors.size()) { return; }
-
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      switch(MIBLEsensors.at(i).type){
-        case 1:
-          if(MIBLEsensors.at(i).showedUp < 3){
-            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-            break;
-          }
-          char temperature_flora[33];
-          dtostrfd(MIBLEsensors.at(i).Flora.temp, Settings.flag2.temperature_resolution, temperature_flora);
-          char lux_flora[33];
-          dtostrfd((float)MIBLEsensors.at(i).Flora.lux, 0, lux_flora);
-          char fertility_flora[33];
-          dtostrfd(MIBLEsensors.at(i).Flora.fertility, 0, fertility_flora);
-
-          WSContentSend_PD(HTTP_MIBLE_SERIAL, F("Flora "), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-          if(MIBLEsensors.at(i).Flora.temp!=-1000.0f){ // this is the error code -> no temperature
-            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveFlora, temperature_flora, TempUnit());
-          }
-          if(MIBLEsensors.at(i).Flora.lux!=0xffff){ // this is the error code -> no temperature
-            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.lux);
-          }
-          if(MIBLEsensors.at(i).Flora.moisture!=-1000.0f){ // this is the error code -> no temperature
-            WSContentSend_PD(HTTP_SNS_MOISTURE, MIBLESlaveFlora, MIBLEsensors.at(i).Flora.moisture);
-          }
-          if(MIBLEsensors.at(i).Flora.fertility!=-1000.0f){ // this is the error code -> no temperature
-            WSContentSend_PD(HTTP_MIBLE_FLORA_DATA, MIBLESlaveFlora, fertility_flora);
-          }
-          break;
-        case 2:
-          if(MIBLEsensors.at(i).showedUp < 3){
-            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-            break;
-          }
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.temp, Settings.flag2.temperature_resolution, temperature);
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).MJ_HT_V1.hum, 1, humidity);
-
-          WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-          if(MIBLEsensors.at(i).MJ_HT_V1.temp!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveMJ_HT_V1, temperature, TempUnit());
-          }
-          if(MIBLEsensors.at(i).MJ_HT_V1.hum!=-1.0f){
-            WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveMJ_HT_V1, humidity);
-          }
-          if(MIBLEsensors.at(i).MJ_HT_V1.bat!=0xff){
-            WSContentSend_PD(HTTP_BATTERY, MIBLESlaveMJ_HT_V1, MIBLEsensors.at(i).MJ_HT_V1.bat);
-          }
-          break;
-        case 3:
-          if(MIBLEsensors.at(i).showedUp < 3){
-            DEBUG_SENSOR_LOG(PSTR("MIBLE: sensor not fully registered yet"));
-            break;
-          }
-          dtostrfd(MIBLEsensors.at(i).LYWSD02.temp, Settings.flag2.temperature_resolution, temperature);
-          dtostrfd(MIBLEsensors.at(i).LYWSD02.hum, 1, humidity);
-
-          WSContentSend_PD(HTTP_MIBLE_SERIAL, MIBLESlaveLYWSD02, MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-          if(MIBLEsensors.at(i).LYWSD02.temp!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_TEMP, MIBLESlaveLYWSD02, temperature, TempUnit());
-          }
-          if(MIBLEsensors.at(i).LYWSD02.hum!=-1.0f){
-            WSContentSend_PD(HTTP_SNS_HUM, MIBLESlaveLYWSD02, humidity);
-          }
-          break;
-        }
-      }
-    }
-#endif  // USE_WEBSERVER
-}
-
-/*********************************************************************************************\
- * Interface
-\*********************************************************************************************/
-
-bool Xsns61(uint8_t function)
-{
-  bool result = false;
-
-  if (NRF24.chipType) {
-    switch (function) {
-      case FUNC_INIT:
-        MIBLEinitBLE(1);
-        AddLog_P2(LOG_LEVEL_INFO,PSTR("MIBLE: started"));
-        break;
-      case FUNC_EVERY_100_MSECOND:
-        MIBLE_EVERY_100_MSECOND();
-        break;
-      case FUNC_JSON_APPEND:
-        MIBLEShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MIBLEShow(0);
-        break;
-#endif  // USE_WEBSERVER
-    }
-  }
-  return result;
-}
-
-#endif  // USE_MIBLE
-#endif  // USE_NRF24
-#endif  // USE_SPI
-

From 5f80febcf4de2cb534c6462e4eb4e7d6185367b7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:57:23 +0100
Subject: [PATCH 267/403] Another DHT driver with humidity range check

Another DHT driver with humidity range check, usec overflow check and NAN debug info (#7717)
---
 tasmota/support.ino        |  18 ++-
 tasmota/xsns_06_dht_v4.ino |   4 +-
 tasmota/xsns_06_dht_v5.ino | 288 +++++++++++++++++++++++++++++++++++++
 3 files changed, 306 insertions(+), 4 deletions(-)
 create mode 100644 tasmota/xsns_06_dht_v5.ino

diff --git a/tasmota/support.ino b/tasmota/support.ino
index 0a281bc68..336774105 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -497,9 +497,8 @@ uint32_t ParseParameters(uint32_t count, uint32_t *params)
 {
   char *p;
   uint32_t i = 0;
-  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p)) {
+  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p), i++) {
     params[i] = strtoul(str, nullptr, 0);
-    i++;
   }
   return i;
 }
@@ -1255,7 +1254,8 @@ void TemplateJson(void)
  * Sleep aware time scheduler functions borrowed from ESPEasy
 \*********************************************************************************************/
 
-inline int32_t TimeDifference(uint32_t prev, uint32_t next) {
+inline int32_t TimeDifference(uint32_t prev, uint32_t next)
+{
   return ((int32_t) (next - prev));
 }
 
@@ -1287,6 +1287,18 @@ void SetNextTimeInterval(unsigned long& timer, const unsigned long step)
   timer = millis() + (step - passed);
 }
 
+int32_t TimePassedSinceUsec(uint32_t timestamp)
+{
+  return TimeDifference(timestamp, micros());
+}
+
+bool TimeReachedUsec(uint32_t timer)
+{
+  // Check if a certain timeout has been reached.
+  const long passed = TimePassedSinceUsec(timer);
+  return (passed >= 0);
+}
+
 /*********************************************************************************************\
  * Basic I2C routines
 \*********************************************************************************************/
diff --git a/tasmota/xsns_06_dht_v4.ino b/tasmota/xsns_06_dht_v4.ino
index d69d1e20f..488919554 100644
--- a/tasmota/xsns_06_dht_v4.ino
+++ b/tasmota/xsns_06_dht_v4.ino
@@ -17,7 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef USE_DHT
+#ifdef USE_DHT_V4
 /*********************************************************************************************\
  * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
  *
@@ -165,6 +165,8 @@ void DhtReadTempHum(uint32_t sensor)
       break;
     }
     Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    if (Dht[sensor].h > 100) { Dht[sensor].h = 100.0; }
+    if (Dht[sensor].h < 0) { Dht[sensor].h = 0.0; }
     Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
     Dht[sensor].lastresult = 0;
   } else {
diff --git a/tasmota/xsns_06_dht_v5.ino b/tasmota/xsns_06_dht_v5.ino
new file mode 100644
index 000000000..ad8f8c5d5
--- /dev/null
+++ b/tasmota/xsns_06_dht_v5.ino
@@ -0,0 +1,288 @@
+/*
+  xsns_06_dht.ino - DHTxx, AM23xx and SI7021 temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_DHT
+/*********************************************************************************************\
+ * DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 - Temperature and Humidy
+ *
+ * Reading temperature or humidity takes about 250 milliseconds!
+ * Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
+ *
+ * This version is based on ESPEasy _P005_DHT.ino 20191201
+\*********************************************************************************************/
+
+#define XSNS_06          6
+
+#define DHT_MAX_SENSORS  4
+#define DHT_MAX_RETRY    8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;                      // Shelly GPIO00 output only
+bool dht_active = true;                       // DHT configured
+bool dht_dual_mode = false;                   // Single pin mode
+
+struct DHTSTRUCT {
+  uint8_t  pin;
+  uint8_t  type;
+  uint8_t  lastresult;
+  char     stype[12];
+  float    t = NAN;
+  float    h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtWaitState(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (TimeReachedUsec(timeout)) {
+      PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE),
+        (level) ? D_START_SIGNAL_HIGH : D_START_SIGNAL_LOW);
+      return false;
+    }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:                                    // DHT11
+      delay(19);  // minimum 18ms
+      break;
+    case GPIO_DHT22:                                    // DHT21, DHT22, AM2301, AM2302, AM2321
+      delay(2);   // minimum 1ms
+      break;
+    case GPIO_SI7021:                                   // iTead SI7021
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:                                    // DHT11
+    case GPIO_DHT22:                                    // DHT21, DHT22, AM2301, AM2302, AM2321
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:                                   // iTead SI7021
+      delayMicroseconds(20);                            // See: https://github.com/letscontrolit/ESPEasy/issues/1798
+      break;
+  }
+
+  bool error = false;
+  noInterrupts();
+  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
+    for (uint32_t i = 0; i < 5; i++) {
+      int data = 0;
+      for (uint32_t j = 0; j < 8; j++) {
+        if (!DhtWaitState(sensor, 1)) {
+          error = true;
+          break;
+        }
+        delayMicroseconds(35);                          // Was 30
+        if (digitalRead(Dht[sensor].pin)) {
+          data |= (1 << (7 - j));
+        }
+        if (!DhtWaitState(sensor, 0)) {
+          error = true;
+          break;
+        }
+      }
+      if (error) { break; }
+      dht_data[i] = data;
+    }
+  } else {
+    error = true;
+  }
+  interrupts();
+  if (error) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  float temperature = NAN;
+  float humidity = NAN;
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      humidity = dht_data[0];
+      temperature = dht_data[2] + ((float)dht_data[3] * 0.1f);  // Issue #3164
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      humidity = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      temperature = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        temperature *= -1;
+      }
+      break;
+  }
+  if (temperature == NAN || humidity == NAN) {
+    Dht[sensor].lastresult++;
+    if (Dht[sensor].lastresult > DHT_MAX_RETRY) {  // Reset after 8 misses
+      Dht[sensor].t = NAN;
+      Dht[sensor].h = NAN;
+    }
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
+    return false;
+  }
+
+  if (humidity > 100) { humidity = 100.0; }
+  if (humidity < 0) { humidity = 0.1; }
+  Dht[sensor].h = ConvertHumidity(humidity);
+  Dht[sensor].t = ConvertTemp(temperature);
+  Dht[sensor].lastresult = 0;
+
+  return true;
+}
+
+/********************************************************************************************/
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;    // Dual pins mode as used by Shelly
+      dht_sensors = 1;         // We only support one sensor in pseudo mode
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v5) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
+      DhtRead(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif  // USE_DOMOTICZ
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif  // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif  // USE_WEBSERVER
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_DHT

From f54dbe7bdc2fe8513f90052f9b70cdcdc748b998 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 16 Feb 2020 08:36:51 +0100
Subject: [PATCH 268/403] virtual port improvement, bugfix

---
 tasmota/xsns_60_GPS.ino | 77 +++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 50 deletions(-)

diff --git a/tasmota/xsns_60_GPS.ino b/tasmota/xsns_60_GPS.ino
index 42ef9949b..b0ee69fae 100644
--- a/tasmota/xsns_60_GPS.ino
+++ b/tasmota/xsns_60_GPS.ino
@@ -23,6 +23,8 @@
   Version Date      Action    Description
   --------------------------------------------------------------------------------------------
 
+  0.9.3.0 20200214  integrate - fix set lat/lon via commandd 13, V-Port now works parallel
+  ---
   0.9.2.0 20200110  integrate - Added UART-over-TCP/IP-bridge (virtual serial port). Minor tweaks.
   ---
   0.9.1.0 20191216  integrate - Added pin specifications from Tasmota WEB UI. Minor tweaks.
@@ -244,8 +246,6 @@ struct UBX_t {
 
   struct {
     uint32_t last_iTOW;
-    int32_t last_lat;
-    int32_t last_lon;
     int32_t last_alt;
     uint32_t last_hAcc;
     uint32_t last_vAcc;
@@ -273,6 +273,8 @@ struct UBX_t {
     CFG_RATE cfgRate;
     } Message;
 
+  uint8_t TCPbuf[UBX_SERIAL_BUFFER_SIZE];
+  size_t TCPbufSize;
 } UBX;
 
 enum UBXMsgType {
@@ -377,6 +379,10 @@ uint32_t UBXprocessGPS()
   while ( UBXSerial->available() ) {
     data_bytes++;
     byte c = UBXSerial->read();
+    if (UBX.mode.runningVPort){
+      UBX.TCPbuf[data_bytes-1] = c; // immediately copy byte to TCP-buf
+      UBX.TCPbufSize = data_bytes;
+    }
     if ( fpos < 2 ) {
       // For the first two bytes we are simply looking for a match with the UBX header bytes (0xB5,0x62)
       if ( c == UBX.UBX_HEADER[fpos] ) {
@@ -585,8 +591,8 @@ void UBXSelectMode(uint16_t mode)
       UBX.mode.forceUTCupdate = false;
       break;
     case 13:
-      Settings.latitude = UBX.state.last_lat;
-      Settings.longitude = UBX.state.last_lon;
+      Settings.latitude = UBX.rec_buffer.values.lat/10;
+      Settings.longitude = UBX.rec_buffer.values.lon/10;
       break;
     case 14:
       vPortServer.begin();
@@ -680,49 +686,24 @@ void UBXHandleOther(void)
 
 /********************************************************************************************/
 
-void UBXhandleVPort(){
-  static uint32_t idx = 0;
-  static uint8_t buf[UBX_SERIAL_BUFFER_SIZE];
-  // static uint32_t tBufMax = 0;
-  // static uint32_t sBufMax = 0;
-
-  if(!vPortClient.connected()) {
-    vPortClient = vPortServer.available();
-  }
-
-  while(vPortClient.available()) {
-    buf[idx] = (uint8_t)vPortClient.read();
-    if(idx<sizeof(buf)-1) idx++;
-  }
-  if(idx!=0) {
-    UBXSerial->write(buf, idx);
-    // if(idx>tBufMax) {
-    //   tBufMax = idx;
-    //   AddLog_P2(LOG_LEVEL_INFO, PSTR("VPORT: new max. tcp buffer size: %u"),tBufMax);
-    // }
-  }
-  idx = 0;
-
-  while(UBXSerial->available()) {
-    buf[idx] = (char)UBXSerial->read();
-    if(idx<sizeof(buf)-1) idx++;
-  }
-  if(idx!=0) {
-    vPortClient.write((char*)buf, idx);
-    // if(idx>sBufMax) {
-    //   sBufMax = idx;
-    //   AddLog_P2(LOG_LEVEL_INFO, PSTR("VPORT: new max. serial buffer size: %u"),sBufMax);
-    // }
-  }
-  idx = 0;
-}
-
-void UBXTimeServer()
+void UBXLoop50msec(void)
 {
-  if(UBX.mode.runningVPort){
-      UBXhandleVPort();
-      return;
+  // handle virtual serial port
+  if (UBX.mode.runningVPort){
+    if(!vPortClient.connected()) {
+      vPortClient = vPortServer.available();
     }
+    while(vPortClient.available()) {
+      byte _newByte = vPortClient.read();
+      UBXSerial->write(_newByte);
+    }
+
+    if (UBX.TCPbufSize!=0){
+      vPortClient.write((char*)UBX.TCPbuf, UBX.TCPbufSize);
+      UBX.TCPbufSize = 0;
+    }
+  }
+  // handle NTP-server
   if(UBX.mode.runningNTP){
     timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
   }
@@ -733,10 +714,6 @@ void UBXLoop(void)
   static uint16_t counter; //count up every 100 msec
   static bool new_position;
 
-  if(UBX.mode.runningVPort) {
-    return;
-  }
-
   uint32_t msgType = UBXprocessGPS();
 
   switch(msgType){
@@ -899,7 +876,7 @@ bool Xsns60(uint8_t function)
         }
         break;
       case FUNC_EVERY_50_MSECOND:
-        UBXTimeServer(); // handles virtual serial port too
+        UBXLoop50msec(); // handles virtual serial port and NTP server
         break;
       case FUNC_EVERY_100_MSECOND:
 #ifdef USE_FLOG

From aaa00045e20c9eaf8042dcd8611a18d3cd47b217 Mon Sep 17 00:00:00 2001
From: denisfrench <denis.french@gmail.com>
Date: Sun, 16 Feb 2020 09:31:19 +0000
Subject: [PATCH 269/403] MQTT_NO_RETAIN option for brokers that will drop
 connection otherwise

---
 tasmota/my_user_config.h | 5 +++--
 tasmota/xdrv_02_mqtt.ino | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 753766839..67ab1cf1c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -99,7 +99,8 @@
 #define MQTT_POWER_RETAIN      false             // [PowerRetain] Power status message may send retain flag (false = off, true = on)
 #define MQTT_SWITCH_RETAIN     false             // [SwitchRetain] Switch may send retain flag (false = off, true = on)
 #define MQTT_SENSOR_RETAIN     false             // [SensorRetain] Sensor may send retain flag (false = off, true = on)
-#define MQTT_BUTTON_SWITCH_FORCE_LOCAL   false   // [SetOption61] Force local operation when button/switch topic is set (false = off, true = on)
+#define MQTT_NO_HOLD_RETAIN    false             // [SetOption62] Disable retain flag on HOLD messages
+//#define MQTT_NO_RETAIN                         // Disable all retain flags (including LWT!) if unsupported by broker (eg Losant)
 
 #define MQTT_STATUS_OFF        "OFF"             // [StateText1] Command or Status result when turned off (needs to be a string like "0" or "Off")
 #define MQTT_STATUS_ON         "ON"              // [StateText2] Command or Status result when turned on (needs to be a string like "1" or "On")
@@ -139,7 +140,7 @@
 #define MQTT_LWT_MESSAGE       false             // [SetOption10] Switch between MQTT LWT OFFLINE or empty message
 #define MQTT_POWER_FORMAT      false             // [SetOption26] Switch between POWER or POWER1 for single power devices
 #define MQTT_APPEND_TIMEZONE   false             // [SetOption52] Append timezone to JSON time
-#define MQTT_NO_HOLD_RETAIN    false             // [SetOption62] Disable retain flag on HOLD messages
+#define MQTT_BUTTON_SWITCH_FORCE_LOCAL   false   // [SetOption61] Force local operation when button/switch topic is set (false = off, true = on)
 #define MQTT_INDEX_SEPARATOR   false             // [SetOption64] Enable "_" instead of "-" as sensor index separator
 #define MQTT_TUYA_RECEIVED     false             // [SetOption66] Enable TuyaMcuReceived messages over Mqtt
 
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index 770170aa3..aadf44f71 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -314,7 +314,7 @@ void MqttPublish(const char* topic, bool retained)
   ShowFreeMem(PSTR("MqttPublish"));
 #endif
 
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT) || defined(MQTT_NO_RETAIN)
 //  if (retained) {
 //    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("Retained are not supported by AWS IoT, using retained = false."));
 //  }

From e7d5a5f540fd0da1f007289f76a050a689750dd6 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 16 Feb 2020 12:33:18 +0100
Subject: [PATCH 270/403] Fix latest DHT driver retries

Fix latest DHT driver retries (#7717)
---
 tasmota/xsns_06_dht_v5.ino | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tasmota/xsns_06_dht_v5.ino b/tasmota/xsns_06_dht_v5.ino
index ad8f8c5d5..f08286b43 100644
--- a/tasmota/xsns_06_dht_v5.ino
+++ b/tasmota/xsns_06_dht_v5.ino
@@ -152,12 +152,7 @@ bool DhtRead(uint32_t sensor)
       }
       break;
   }
-  if (temperature == NAN || humidity == NAN) {
-    Dht[sensor].lastresult++;
-    if (Dht[sensor].lastresult > DHT_MAX_RETRY) {  // Reset after 8 misses
-      Dht[sensor].t = NAN;
-      Dht[sensor].h = NAN;
-    }
+  if (isnan(temperature) || isnan(humidity)) {
     AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
     return false;
   }
@@ -201,6 +196,7 @@ void DhtInit(void)
 
     for (uint32_t i = 0; i < dht_sensors; i++) {
       pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastresult = DHT_MAX_RETRY;  // Start with NAN
       GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
       if (dht_sensors > 1) {
         snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
@@ -214,11 +210,16 @@ void DhtInit(void)
 
 void DhtEverySecond(void)
 {
-  if (uptime &1) {
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
+  if (uptime &1) {  // Every 2 seconds
+    for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
       // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
-      DhtRead(i);
+      if (!DhtRead(sensor)) {
+        Dht[sensor].lastresult++;
+        if (Dht[sensor].lastresult > DHT_MAX_RETRY) {  // Reset after 8 misses
+          Dht[sensor].t = NAN;
+          Dht[sensor].h = NAN;
+        }
+      }
     }
   }
 }

From 643d3d0b698e6142b2c67159a19d7246a8be8b4a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 16 Feb 2020 15:30:50 +0100
Subject: [PATCH 271/403] Add -DNOPRINTFLOAT for future need solving dtostrf

Add -DNOPRINTFLOAT for future need solving dtostrf
---
 platformio_override_sample.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 47965f59d..383e7f04b 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -185,6 +185,7 @@ platform_packages         = framework-arduinoespressif8266 @ https://github.com/
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
+                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
@@ -230,6 +231,7 @@ platform_packages         = framework-arduinoespressif8266 @ https://github.com/
 build_flags               = ${esp82xx_defaults.build_flags}
                             -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
+                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313

From b0378c3d99fcedcf873a0cd006866d280822753a Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:11:31 +0100
Subject: [PATCH 272/403] initial AHT10 support

test
---
 tasmota/my_user_config.h     |   1 +
 tasmota/support_features.ino |   4 +-
 tasmota/xsns_64_aht10.ino    | 184 +++++++++++++++++++++++++++++++++++
 3 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 tasmota/xsns_64_aht10.ino

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 67ab1cf1c..0652f6ebb 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -486,6 +486,7 @@
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 //  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
+//  #define USE_AHT10                              // [I2cDriver43] Enable AHT10 humidity and temperature sensor (I2C address 0x58) (+0k8 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 2dc25b8e5..4fa9dcae8 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -513,7 +513,9 @@ void GetFeatures(void)
 #ifdef USE_LE01MR
   feature5 |= 0x08000000;  // xnrg_13_fif_le01mr.ino
 #endif
-
+#ifdef USE_AHT10
+  feature5 |= 0x10000000;  // xsns_64_dht12.ino
+#endif
 //  feature5 |= 0x10000000;
 //  feature5 |= 0x20000000;
 //  feature5 |= 0x40000000;
diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_64_aht10.ino
new file mode 100644
index 000000000..15dbbb5c1
--- /dev/null
+++ b/tasmota/xsns_64_aht10.ino
@@ -0,0 +1,184 @@
+/*
+  xsns_64_AHT10.ino - AHT10 I2C temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2020  M. Wagner
+
+  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/>.
+*/
+
+#ifdef USE_I2C
+#ifdef USE_AHT10
+/*********************************************************************************************\
+ * AHT10 - Temperature and Humidity
+ *
+ * I2C Address: 0x38
+\*********************************************************************************************/
+
+#define XSNS_64              64
+#define XI2C_43              43  // See I2CDEVICES.md
+
+#define AHT10_ADDR           0x38
+
+unsigned char eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
+unsigned char eSensorNormalCmd[3]    = {0xA8, 0x00, 0x00};
+unsigned char eSensorMeasureCmd[3]   = {0xAC, 0x33, 0x00};
+unsigned char eSensorResetCmd        = 0xBA;
+
+struct AHT10 {
+  float   humidity = NAN;
+  float   temperature = NAN;
+  uint8_t valid = 0;
+  uint8_t count = 0;
+  char    name[6] = "AHT10";
+} AHT10;
+
+bool begin()
+{
+    Wire.begin(AHT10_ADDR);
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorCalibrateCmd, 3);
+    Wire.endTransmission();
+    delay(500);
+
+    if((readStatus() & 0x68) == 0x08)
+        return true;
+    else
+    {
+        return false;
+    }   
+}
+
+bool AHT10Read(void)
+{
+  unsigned long result, temp[6];
+
+  if (AHT10.valid) { AHT10.valid--; }
+
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorMeasureCmd, 3);
+    Wire.endTransmission();
+    delay(100);
+    
+    Wire.requestFrom(AHT10_ADDR, 6);  
+    for(unsigned char i = 0; Wire.available() > 0; i++)
+    {
+        temp[i] = Wire.read();
+    }   
+
+  AHT10.humidity = (((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4)* 100 / 1048576;
+  AHT10.temperature  =  ((200 * (((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5])) / 1048576) - 50;
+
+  if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
+
+  AHT10.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+/********************************************************************************************/
+unsigned char readStatus(void)
+{
+    unsigned char result = 0;
+
+    Wire.requestFrom(AHT10_ADDR, 1);
+    result = Wire.read();
+    return result;
+}
+
+void AHT10Detect(void)
+{
+  if (I2cActive(AHT10_ADDR)) 
+  { 
+  return; 
+  }
+
+  if (begin()) 
+  {
+    I2cSetActiveFound(AHT10_ADDR, AHT10.name);
+    AHT10.count = 1;
+  }
+}
+
+void AHT10EverySecond(void)
+{
+  if (uptime &1) {
+    // AHT10: 55mS
+    if (!AHT10Read()) {
+      AddLogMissed(AHT10.name, AHT10.valid);
+    }
+  }
+}
+
+void AHT10Show(bool json)
+{
+  if (AHT10.valid) {
+    char temperature[33];
+    dtostrfd(AHT10.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(AHT10.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, AHT10.name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif // USE_DOMOTICZ
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, AHT10.temperature);
+        KnxSensor(KNX_HUMIDITY, AHT10.humidity);
+      }
+#endif // USE_KNX
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, AHT10.name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, AHT10.name, humidity);
+#endif // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns64(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_43)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    AHT10Detect();
+  }
+  else if (AHT10.count) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      AHT10EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      AHT10Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      AHT10Show(0);
+      break;
+#endif  // USE_WEBSERVER
+    }
+  }
+  return result;
+}
+
+#endif  // USE_AHT10
+#endif  // USE_I2C

From 583f08672e077e6e434dfc86d42eaef0cfd03ebb Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:14:40 +0100
Subject: [PATCH 273/403] Update I2CDEVICES.md

---
 I2CDEVICES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/I2CDEVICES.md b/I2CDEVICES.md
index c7b42108f..be92d03dc 100644
--- a/I2CDEVICES.md
+++ b/I2CDEVICES.md
@@ -64,4 +64,4 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
   42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
   42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
-
+  43  | USE_AHT10           | xsns_64 | AHT10    | 0x38        | Temperature and humidity sensor

From fcc59df10f54ccc30d71d389866d6bf565a13388 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:18:45 +0100
Subject: [PATCH 274/403] Update support_features.ino

---
 tasmota/support_features.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 4fa9dcae8..933db0960 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -514,7 +514,7 @@ void GetFeatures(void)
   feature5 |= 0x08000000;  // xnrg_13_fif_le01mr.ino
 #endif
 #ifdef USE_AHT10
-  feature5 |= 0x10000000;  // xsns_64_dht12.ino
+  feature5 |= 0x10000000;  // xsns_64_aht10.ino
 #endif
 //  feature5 |= 0x10000000;
 //  feature5 |= 0x20000000;

From 01fbe69824d549e59422e66e6de5de2c74d8643b Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:22:39 +0100
Subject: [PATCH 275/403] test1

test1
---
 tasmota/my_user_config.h |     2 +-
 tasmota/tasmota.ino.cpp  | 77284 +++++++++++++++++++++++++++++++++++++
 2 files changed, 77285 insertions(+), 1 deletion(-)
 create mode 100644 tasmota/tasmota.ino.cpp

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0652f6ebb..04395065a 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -486,7 +486,7 @@
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 //  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
-//  #define USE_AHT10                              // [I2cDriver43] Enable AHT10 humidity and temperature sensor (I2C address 0x58) (+0k8 code)
+  #define USE_AHT10                              // [I2cDriver43] Enable AHT10 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/tasmota.ino.cpp b/tasmota/tasmota.ino.cpp
new file mode 100644
index 000000000..ddd9b7b19
--- /dev/null
+++ b/tasmota/tasmota.ino.cpp
@@ -0,0 +1,77284 @@
+# 1 "C:\\Users\\martin\\AppData\\Local\\Temp\\tmpeqetuoko"
+#include <Arduino.h>
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
+# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
+#include <core_version.h>
+#include "tasmota_version.h"
+#include "tasmota.h"
+#include "my_user_config.h"
+#ifdef USE_MQTT_TLS
+  #include <t_bearssl.h>
+#endif
+#include "tasmota_post.h"
+#include "i18n.h"
+#include "tasmota_template.h"
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_4_0
+#include "lwip/init.h"
+#if LWIP_VERSION_MAJOR != 1
+  #error Please use stable lwIP v1.4
+#endif
+#endif
+
+
+#include <ESP8266HTTPClient.h>
+#include <ESP8266httpUpdate.h>
+#include <StreamString.h>
+#include <ArduinoJson.h>
+#ifdef USE_ARDUINO_OTA
+  #include <ArduinoOTA.h>
+  #ifndef USE_DISCOVERY
+  #define USE_DISCOVERY
+  #endif
+#endif
+#ifdef USE_DISCOVERY
+  #include <ESP8266mDNS.h>
+#endif
+#ifdef USE_I2C
+  #include <Wire.h>
+#endif
+#ifdef USE_SPI
+  #include <SPI.h>
+#endif
+
+
+#include "settings.h"
+
+
+
+
+
+WiFiUDP PortUdp;
+
+unsigned long feature_drv1;
+unsigned long feature_drv2;
+unsigned long feature_sns1;
+unsigned long feature_sns2;
+unsigned long feature5;
+unsigned long feature6;
+unsigned long serial_polling_window = 0;
+unsigned long state_second = 0;
+unsigned long state_50msecond = 0;
+unsigned long state_100msecond = 0;
+unsigned long state_250msecond = 0;
+unsigned long pulse_timer[MAX_PULSETIMERS] = { 0 };
+unsigned long blink_timer = 0;
+unsigned long backlog_delay = 0;
+power_t power = 0;
+power_t last_power = 0;
+power_t blink_power;
+power_t blink_mask = 0;
+power_t blink_powersave;
+power_t latching_power = 0;
+power_t rel_inverted = 0;
+int serial_in_byte_counter = 0;
+int ota_state_flag = 0;
+int ota_result = 0;
+int restart_flag = 0;
+int wifi_state_flag = WIFI_RESTART;
+int blinks = 201;
+uint32_t uptime = 0;
+uint32_t loop_load_avg = 0;
+uint32_t global_update = 0;
+uint32_t web_log_index = 1;
+float global_temperature = 9999;
+float global_humidity = 0;
+float global_pressure = 0;
+uint16_t tele_period = 9999;
+uint16_t blink_counter = 0;
+uint16_t seriallog_timer = 0;
+uint16_t syslog_timer = 0;
+int16_t save_data_counter;
+RulesBitfield rules_flag;
+uint8_t mqtt_cmnd_blocked = 0;
+uint8_t mqtt_cmnd_blocked_reset = 0;
+uint8_t state_250mS = 0;
+uint8_t latching_relay_pulse = 0;
+uint8_t sleep;
+uint8_t blinkspeed = 1;
+uint8_t pin[GPIO_MAX];
+uint8_t active_device = 1;
+uint8_t leds_present = 0;
+uint8_t led_inverted = 0;
+uint8_t led_power = 0;
+uint8_t ledlnk_inverted = 0;
+uint8_t pwm_inverted = 0;
+uint8_t energy_flg = 0;
+uint8_t light_flg = 0;
+uint8_t light_type = 0;
+uint8_t serial_in_byte;
+uint8_t ota_retry_counter = OTA_ATTEMPTS;
+uint8_t devices_present = 0;
+uint8_t seriallog_level;
+uint8_t syslog_level;
+uint8_t my_module_type;
+uint8_t my_adc0;
+uint8_t last_source = 0;
+uint8_t shutters_present = 0;
+uint8_t prepped_loglevel = 0;
+
+bool serial_local = false;
+bool fallback_topic_flag = false;
+bool backlog_mutex = false;
+bool interlock_mutex = false;
+bool stop_flash_rotate = false;
+bool blinkstate = false;
+
+bool pwm_present = false;
+bool i2c_flg = false;
+bool spi_flg = false;
+bool soft_spi_flg = false;
+bool ntp_force_sync = false;
+bool is_8285 = false;
+myio my_module;
+gpio_flag my_module_flag;
+StateBitfield global_state;
+char my_version[33];
+char my_image[33];
+char my_hostname[33];
+char mqtt_client[TOPSZ];
+char mqtt_topic[TOPSZ];
+char serial_in_buffer[INPUT_BUFFER_SIZE];
+char mqtt_data[MESSZ];
+char log_data[LOGSZ];
+char web_log[WEB_LOG_SIZE] = {'\0'};
+#ifdef SUPPORT_IF_STATEMENT
+  #include <LinkedList.h>
+  LinkedList<String> backlog;
+  #define BACKLOG_EMPTY (backlog.size() == 0)
+#else
+  uint8_t backlog_index = 0;
+  uint8_t backlog_pointer = 0;
+  String backlog[MAX_BACKLOG];
+  #define BACKLOG_EMPTY (backlog_pointer == backlog_index)
+#endif
+void setup(void);
+void BacklogLoop(void);
+void loop(void);
+uint16_t SendMail(char *buffer);
+uint32_t GetRtcSettingsCrc(void);
+void RtcSettingsSave(void);
+void RtcSettingsLoad(void);
+bool RtcSettingsValid(void);
+uint32_t GetRtcRebootCrc(void);
+void RtcRebootSave(void);
+void RtcRebootReset(void);
+void RtcRebootLoad(void);
+bool RtcRebootValid(void);
+void SetFlashModeDout(void);
+bool VersionCompatible(void);
+void SettingsBufferFree(void);
+bool SettingsBufferAlloc(void);
+uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size);
+uint16_t GetSettingsCrc(void);
+uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size);
+uint32_t GetSettingsCrc32(void);
+void SettingsSaveAll(void);
+void UpdateQuickPowerCycle(bool update);
+uint32_t GetSettingsTextLen(void);
+bool SettingsUpdateText(uint32_t index, const char* replace_me);
+char* SettingsText(uint32_t index);
+uint32_t GetSettingsAddress(void);
+void SettingsSave(uint8_t rotate);
+void SettingsLoad(void);
+void EspErase(uint32_t start_sector, uint32_t end_sector);
+void SettingsErase(uint8_t type);
+void SettingsSdkErase(void);
+void SettingsDefault(void);
+void SettingsDefaultSet1(void);
+void SettingsDefaultSet2(void);
+void SettingsResetStd(void);
+void SettingsResetDst(void);
+void SettingsDefaultWebColor(void);
+void SettingsEnableAllI2cDrivers(void);
+void SettingsDelta(void);
+void OsWatchTicker(void);
+void OsWatchInit(void);
+void OsWatchLoop(void);
+bool OsWatchBlockedLoop(void);
+uint32_t ResetReason(void);
+String GetResetReason(void);
+size_t strchrspn(const char *str1, int character);
+char* subStr(char* dest, char* str, const char *delim, int index);
+float CharToFloat(const char *str);
+int TextToInt(char *str);
+char* ulltoa(unsigned long long value, char *str, int radix);
+char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween);
+char* Uint64toHex(uint64_t value, char *str, uint16_t bits);
+char* dtostrfd(double number, unsigned char prec, char *s);
+char* Unescape(char* buffer, uint32_t* size);
+char* RemoveSpace(char* p);
+char* ReplaceCommaWithDot(char* p);
+char* LowerCase(char* dest, const char* source);
+char* UpperCase(char* dest, const char* source);
+char* UpperCase_P(char* dest, const char* source);
+char* Trim(char* p);
+char* RemoveAllSpaces(char* p);
+char* NoAlNumToUnderscore(char* dest, const char* source);
+char IndexSeparator(void);
+void SetShortcutDefault(void);
+uint8_t Shortcut(void);
+bool ValidIpAddress(const char* str);
+bool ParseIp(uint32_t* addr, const char* str);
+uint32_t ParseParameters(uint32_t count, uint32_t *params);
+bool NewerVersion(char* version_str);
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option);
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size);
+void GetEspHardwareType(void);
+String GetDeviceHardware(void);
+float ConvertTemp(float c);
+float ConvertTempToCelsius(float c);
+char TempUnit(void);
+float ConvertHumidity(float h);
+float ConvertPressure(float p);
+String PressureUnit(void);
+void ResetGlobalValues(void);
+uint32_t SqrtInt(uint32_t num);
+uint32_t RoundSqrtInt(uint32_t num);
+char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack);
+int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack);
+int GetStateNumber(char *state_text);
+String GetSerialConfig(void);
+void SetSerialBegin();
+void SetSerialConfig(uint32_t serial_config);
+void SetSerialBaudrate(uint32_t baudrate);
+void SetSerial(uint32_t baudrate, uint32_t serial_config);
+void ClaimSerial(void);
+void SerialSendRaw(char *codes);
+uint32_t GetHash(const char *buffer, size_t size);
+void ShowSource(uint32_t source);
+void WebHexCode(uint32_t i, const char* code);
+uint32_t WebColor(uint32_t i);
+char* ResponseGetTime(uint32_t format, char* time_str);
+int Response_P(const char* format, ...);
+int ResponseTime_P(const char* format, ...);
+int ResponseAppend_P(const char* format, ...);
+int ResponseAppendTimeFormat(uint32_t format);
+int ResponseAppendTime(void);
+int ResponseJsonEnd(void);
+int ResponseJsonEndEnd(void);
+void DigitalWrite(uint32_t gpio_pin, uint32_t state);
+uint8_t ModuleNr(void);
+bool ValidTemplateModule(uint32_t index);
+bool ValidModule(uint32_t index);
+String AnyModuleName(uint32_t index);
+String ModuleName(void);
+void ModuleGpios(myio *gp);
+gpio_flag ModuleFlag(void);
+void ModuleDefault(uint32_t module);
+void SetModuleType(void);
+bool FlashPin(uint32_t pin);
+uint8_t ValidPin(uint32_t pin, uint32_t gpio);
+bool ValidGPIO(uint32_t pin, uint32_t gpio);
+bool ValidAdc(void);
+bool GetUsedInModule(uint32_t val, uint8_t *arr);
+bool JsonTemplate(const char* dataBuf);
+void TemplateJson(void);
+inline int32_t TimeDifference(uint32_t prev, uint32_t next);
+int32_t TimePassedSince(uint32_t timestamp);
+bool TimeReached(uint32_t timer);
+void SetNextTimeInterval(unsigned long& timer, const unsigned long step);
+int32_t TimePassedSinceUsec(uint32_t timestamp);
+bool TimeReachedUsec(uint32_t timer);
+bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size);
+bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg);
+uint8_t I2cRead8(uint8_t addr, uint8_t reg);
+uint16_t I2cRead16(uint8_t addr, uint8_t reg);
+int16_t I2cReadS16(uint8_t addr, uint8_t reg);
+uint16_t I2cRead16LE(uint8_t addr, uint8_t reg);
+int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg);
+int32_t I2cRead24(uint8_t addr, uint8_t reg);
+bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size);
+bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val);
+bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val);
+int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
+int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
+void I2cScan(char *devs, unsigned int devs_len);
+void I2cSetActiveFound(uint32_t addr, const char *types);
+bool I2cActive(uint32_t addr);
+bool I2cSetDevice(uint32_t addr);
+void SetSeriallog(uint32_t loglevel);
+void SetSyslog(uint32_t loglevel);
+void GetLog(uint32_t idx, char** entry_pp, size_t* len_p);
+void Syslog(void);
+void AddLog(uint32_t loglevel);
+void AddLog_P(uint32_t loglevel, const char *formatP);
+void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2);
+void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...);
+void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...);
+void AddLog_Debug(PGM_P formatP, ...);
+void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count);
+void AddLogSerial(uint32_t loglevel);
+void AddLogMissed(char *sensor, uint32_t misses);
+void ButtonPullupFlag(uint8 button_bit);
+void ButtonInvertFlag(uint8 button_bit);
+void ButtonInit(void);
+uint8_t ButtonSerial(uint8_t serial_in_byte);
+void ButtonHandler(void);
+void ButtonLoop(void);
+void ResponseCmndNumber(int value);
+void ResponseCmndFloat(float value, uint32_t decimals);
+void ResponseCmndIdxNumber(int value);
+void ResponseCmndChar(const char* value);
+void ResponseCmndStateText(uint32_t value);
+void ResponseCmndDone(void);
+void ResponseCmndIdxChar(const char* value);
+void ResponseCmndAll(uint32_t text_index, uint32_t count);
+void ExecuteCommand(const char *cmnd, uint32_t source);
+void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len);
+void CmndBacklog(void);
+void CmndDelay(void);
+void CmndPower(void);
+void CmndStatus(void);
+void CmndState(void);
+void CmndTempOffset(void);
+void CmndSleep(void);
+void CmndUpgrade(void);
+void CmndOtaUrl(void);
+void CmndSeriallog(void);
+void CmndRestart(void);
+void CmndPowerOnState(void);
+void CmndPulsetime(void);
+void CmndBlinktime(void);
+void CmndBlinkcount(void);
+void CmndSavedata(void);
+void CmndSetoption(void);
+void CmndTemperatureResolution(void);
+void CmndHumidityResolution(void);
+void CmndPressureResolution(void);
+void CmndPowerResolution(void);
+void CmndVoltageResolution(void);
+void CmndFrequencyResolution(void);
+void CmndCurrentResolution(void);
+void CmndEnergyResolution(void);
+void CmndWeightResolution(void);
+void CmndModule(void);
+void CmndModules(void);
+void CmndGpio(void);
+void CmndGpios(void);
+void CmndTemplate(void);
+void CmndPwm(void);
+void CmndPwmfrequency(void);
+void CmndPwmrange(void);
+void CmndButtonDebounce(void);
+void CmndSwitchDebounce(void);
+void CmndBaudrate(void);
+void CmndSerialConfig(void);
+void CmndSerialSend(void);
+void CmndSerialDelimiter(void);
+void CmndSyslog(void);
+void CmndLoghost(void);
+void CmndLogport(void);
+void CmndIpAddress(void);
+void CmndNtpServer(void);
+void CmndAp(void);
+void CmndSsid(void);
+void CmndPassword(void);
+void CmndHostname(void);
+void CmndWifiConfig(void);
+void CmndFriendlyname(void);
+void CmndSwitchMode(void);
+void CmndInterlock(void);
+void CmndTeleperiod(void);
+void CmndReset(void);
+void CmndTime(void);
+void CmndTimezone(void);
+void CmndTimeStdDst(uint32_t ts);
+void CmndTimeStd(void);
+void CmndTimeDst(void);
+void CmndAltitude(void);
+void CmndLedPower(void);
+void CmndLedState(void);
+void CmndLedMask(void);
+void CmndWifiPower(void);
+void CmndI2cScan(void);
+void CmndI2cDriver(void);
+void CmndSensor(void);
+void CmndDriver(void);
+void CmndCrash(void);
+void CmndWDT(void);
+void CmndBlockedLoop(void);
+void CrashDumpClear(void);
+bool CrashFlag(void);
+void CrashDump(void);
+static bool spiflash_is_ready(void);
+static void spi_write_enable(void);
+bool EsptoolEraseSector(uint32_t sector);
+void EsptoolErase(uint32_t start_sector, uint32_t end_sector);
+void GetFeatures(void);
+float fmodf(float x, float y);
+double FastPrecisePow(double a, double b);
+float FastPrecisePowf(const float x, const float y);
+double TaylorLog(double x);
+inline float sinf(float x);
+inline float cosf(float x);
+inline float tanf(float x);
+inline float atanf(float x);
+inline float asinf(float x);
+inline float acosf(float x);
+inline float sqrtf(float x);
+inline float powf(float x, float y);
+float cos_52s(float x);
+float cos_52(float x);
+float sin_52(float x);
+float tan_56s(float x);
+float tan_56(float x);
+float atan_66s(float x);
+float atan_66(float x);
+float asinf1(float x);
+float acosf1(float x);
+float sqrt1(const float x);
+uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
+                                       uint16_t ito_min, uint16_t ito_max);
+void* memchr(const void* ptr, int value, size_t num);
+size_t strcspn(const char *str1, const char *str2);
+char* strpbrk(const char *s1, const char *s2);
+void* memmove_P(void *dest, const void *src, size_t n);
+void update_rotary(void);
+bool RotaryButtonPressed(void);
+void RotaryInit(void);
+void RotaryHandler(void);
+void RotaryLoop(void);
+uint32_t UtcTime(void);
+uint32_t LocalTime(void);
+int32_t DriftTime(void);
+uint32_t Midnight(void);
+bool MidnightNow(void);
+bool IsDst(void);
+String GetBuildDateAndTime(void);
+String GetMinuteTime(uint32_t minutes);
+String GetTimeZone(void);
+String GetDuration(uint32_t time);
+String GetDT(uint32_t time);
+String GetDateAndTime(uint8_t time_type);
+String GetTime(int type);
+uint32_t UpTime(void);
+uint32_t MinutesUptime(void);
+String GetUptime(void);
+uint32_t MinutesPastMidnight(void);
+void BreakTime(uint32_t time_input, TIME_T &tm);
+uint32_t MakeTime(TIME_T &tm);
+uint32_t RuleToTime(TimeRule r, int yr);
+void RtcSecond(void);
+void RtcSetTime(uint32_t epoch);
+void RtcInit(void);
+String GetStatistics(void);
+String GetStatistics(void);
+void SwitchPullupFlag(uint16 switch_bit);
+void SwitchSetVirtual(uint32_t index, uint8_t state);
+uint8_t SwitchGetVirtual(uint32_t index);
+uint8_t SwitchLastState(uint32_t index);
+bool SwitchState(uint32_t index);
+void SwitchProbe(void);
+void SwitchInit(void);
+void SwitchHandler(uint8_t mode);
+void SwitchLoop(void);
+char* Format(char* output, const char* input, int size);
+char* GetOtaUrl(char *otaurl, size_t otaurl_size);
+char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic);
+char* GetGroupTopic_P(char *stopic, const char* subtopic);
+char* GetFallbackTopic_P(char *stopic, const char* subtopic);
+char* GetStateText(uint32_t state);
+void SetLatchingRelay(power_t lpower, uint32_t state);
+void SetDevicePower(power_t rpower, uint32_t source);
+void RestorePower(bool publish_power, uint32_t source);
+void SetAllPower(uint32_t state, uint32_t source);
+void SetPowerOnState(void);
+void SetLedPowerIdx(uint32_t led, uint32_t state);
+void SetLedPower(uint32_t state);
+void SetLedPowerAll(uint32_t state);
+void SetLedLink(uint32_t state);
+void SetPulseTimer(uint32_t index, uint32_t time);
+uint32_t GetPulseTimer(uint32_t index);
+bool SendKey(uint32_t key, uint32_t device, uint32_t state);
+void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source);
+void StopAllPowerBlink(void);
+void MqttShowPWMState(void);
+void MqttShowState(void);
+void MqttPublishTeleState(void);
+bool MqttShowSensor(void);
+void MqttPublishSensor(void);
+void PerformEverySecond(void);
+void Every100mSeconds(void);
+void Every250mSeconds(void);
+void ArduinoOTAInit(void);
+void ArduinoOtaLoop(void);
+void SerialInput(void);
+void GpioInit(void);
+bool UdpDisconnect(void);
+bool UdpConnect(void);
+void PollUdp(void);
+int WifiGetRssiAsQuality(int rssi);
+bool WifiConfigCounter(void);
+void WifiConfig(uint8_t type);
+void WifiSetMode(WiFiMode_t wifi_mode);
+void WiFiSetSleepMode(void);
+void WifiBegin(uint8_t flag, uint8_t channel);
+void WifiBeginAfterScan(void);
+uint16_t WifiLinkCount(void);
+String WifiDowntime(void);
+void WifiSetState(uint8_t state);
+bool WifiCheckIPv6(void);
+String WifiGetIPv6(void);
+bool WifiCheckIPAddrStatus(void);
+void WifiCheckIp(void);
+void WifiCheck(uint8_t param);
+int WifiState(void);
+String WifiGetOutputPower(void);
+void WifiSetOutputPower(void);
+void WifiConnect(void);
+void WifiDisconnect(void);
+void WifiShutdown(void);
+void EspRestart(void);
+static void WebGetArg(const char* arg, char* out, size_t max);
+static bool WifiIsInManagerMode();
+void ShowWebSource(uint32_t source);
+void ExecuteWebCommand(char* svalue, uint32_t source);
+void StartWebserver(int type, IPAddress ipweb);
+void StopWebserver(void);
+void WifiManagerBegin(bool reset_only);
+void PollDnsWebserver(void);
+bool WebAuthenticate(void);
+void HttpHeaderCors(void);
+void WSHeaderSend(void);
+void WSSend(int code, int ctype, const String& content);
+void WSContentBegin(int code, int ctype);
+void _WSContentSend(const String& content);
+void WSContentFlush(void);
+void _WSContentSendBuffer(void);
+void WSContentSend_P(const char* formatP, ...);
+void WSContentSend_PD(const char* formatP, ...);
+void WSContentStart_P(const char* title, bool auth);
+void WSContentStart_P(const char* title);
+void WSContentSendStyle_P(const char* formatP, ...);
+void WSContentSendStyle(void);
+void WSContentButton(uint32_t title_index);
+void WSContentSpaceButton(uint32_t title_index);
+void WSContentEnd(void);
+void WSContentStop(void);
+void WebRestart(uint32_t type);
+void HandleWifiLogin(void);
+void WebSliderColdWarm(void);
+void HandleRoot(void);
+bool HandleRootStatusRefresh(void);
+int32_t IsShutterWebButton(uint32_t idx);
+void HandleConfiguration(void);
+void HandleTemplateConfiguration(void);
+void TemplateSaveSettings(void);
+void HandleModuleConfiguration(void);
+void ModuleSaveSettings(void);
+String HtmlEscape(const String unescaped);
+void HandleWifiConfiguration(void);
+void WifiSaveSettings(void);
+void HandleLoggingConfiguration(void);
+void LoggingSaveSettings(void);
+void HandleOtherConfiguration(void);
+void OtherSaveSettings(void);
+void HandleBackupConfiguration(void);
+void HandleResetConfiguration(void);
+void HandleRestoreConfiguration(void);
+void HandleInformation(void);
+void HandleUpgradeFirmware(void);
+void HandleUpgradeFirmwareStart(void);
+void HandleUploadDone(void);
+void HandleUploadLoop(void);
+void HandlePreflightRequest(void);
+void HandleHttpCommand(void);
+void HandleConsole(void);
+void HandleConsoleRefresh(void);
+void HandleNotFound(void);
+bool CaptivePortal(void);
+String UrlEncode(const String& text);
+int WebSend(char *buffer);
+bool JsonWebColor(const char* dataBuf);
+void CmndEmulation(void);
+void CmndSendmail(void);
+void CmndWebServer(void);
+void CmndWebPassword(void);
+void CmndWeblog(void);
+void CmndWebRefresh(void);
+void CmndWebSend(void);
+void CmndWebColor(void);
+void CmndWebSensor(void);
+void CmndWebButton(void);
+void CmndCors(void);
+bool Xdrv01(uint8_t function);
+bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value);
+void MakeValidMqtt(uint32_t option, char* str);
+void MqttDiscoverServer(void);
+void MqttInit(void);
+bool MqttIsConnected(void);
+void MqttDisconnect(void);
+void MqttSubscribeLib(const char *topic);
+void MqttUnsubscribeLib(const char *topic);
+bool MqttPublishLib(const char* topic, bool retained);
+void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len);
+void MqttRetryCounter(uint8_t value);
+void MqttSubscribe(const char *topic);
+void MqttUnsubscribe(const char *topic);
+void MqttPublishLogging(const char *mxtime);
+void MqttPublish(const char* topic, bool retained);
+void MqttPublish(const char* topic);
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained);
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic);
+void MqttPublishTeleSensor(void);
+void MqttPublishPowerState(uint32_t device);
+void MqttPublishAllPowerState(void);
+void MqttPublishPowerBlinkState(uint32_t device);
+uint16_t MqttConnectCount(void);
+void MqttDisconnected(int state);
+void MqttConnected(void);
+void MqttReconnect(void);
+void MqttCheck(void);
+void CmndMqttFingerprint(void);
+void CmndMqttUser(void);
+void CmndMqttPassword(void);
+void CmndMqttlog(void);
+void CmndMqttHost(void);
+void CmndMqttPort(void);
+void CmndMqttRetry(void);
+void CmndStateText(void);
+void CmndMqttClient(void);
+void CmndFullTopic(void);
+void CmndPrefix(void);
+void CmndPublish(void);
+void CmndGroupTopic(void);
+void CmndTopic(void);
+void CmndButtonTopic(void);
+void CmndSwitchTopic(void);
+void CmndButtonRetain(void);
+void CmndSwitchRetain(void);
+void CmndPowerRetain(void);
+void CmndSensorRetain(void);
+inline void TlsEraseBuffer(uint8_t *buffer);
+void loadTlsDir(void);
+void CmndTlsKey(void);
+uint32_t bswap32(uint32_t x);
+void CmndTlsDump(void);
+void HandleMqttConfiguration(void);
+void MqttSaveSettings(void);
+bool Xdrv02(uint8_t function);
+bool EnergyTariff1Active();
+void EnergyUpdateToday(void);
+void EnergyUpdateTotal(float value, bool kwh);
+void Energy200ms(void);
+void EnergySaveState(void);
+bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag);
+void EnergyMarginCheck(void);
+void EnergyMqttShow(void);
+void EnergyEverySecond(void);
+void EnergyCommandCalResponse(uint32_t nvalue);
+void CmndEnergyReset(void);
+void CmndTariff(void);
+void CmndPowerCal(void);
+void CmndVoltageCal(void);
+void CmndCurrentCal(void);
+void CmndPowerSet(void);
+void CmndVoltageSet(void);
+void CmndCurrentSet(void);
+void CmndFrequencySet(void);
+void CmndModuleAddress(void);
+void CmndPowerDelta(void);
+void CmndPowerLow(void);
+void CmndPowerHigh(void);
+void CmndVoltageLow(void);
+void CmndVoltageHigh(void);
+void CmndCurrentLow(void);
+void CmndCurrentHigh(void);
+void CmndMaxPower(void);
+void CmndMaxPowerHold(void);
+void CmndMaxPowerWindow(void);
+void CmndSafePower(void);
+void CmndSafePowerHold(void);
+void CmndSafePowerWindow(void);
+void CmndMaxEnergy(void);
+void CmndMaxEnergyStart(void);
+void EnergySnsInit(void);
+void EnergyShow(bool json);
+bool Xdrv03(uint8_t function);
+bool Xsns03(uint8_t function);
+power_t LightPower(void);
+power_t LightPowerIRAM(void);
+uint8_t LightDevice(void);
+static uint32_t min3(uint32_t a, uint32_t b, uint32_t c);
+uint16_t change8to10(uint8_t v);
+uint8_t change10to8(uint16_t v);
+uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr);
+uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr);
+uint16_t ledGamma10_10(uint16_t v);
+uint16_t ledGamma10(uint8_t v);
+uint8_t ledGamma(uint8_t v);
+void LightPwmOffset(uint32_t offset);
+bool LightModuleInit(void);
+void LightInit(void);
+void LightUpdateColorMapping(void);
+uint8_t LightGetDimmer(uint8_t dimmer);
+void LightSetDimmer(uint8_t dimmer);
+void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri);
+void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
+uint8_t LightGetBri(uint8_t device);
+void LightSetBri(uint8_t device, uint8_t bri);
+void LightSetColorTemp(uint16_t ct);
+uint16_t LightGetColorTemp(void);
+void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value);
+void LightPowerOn(void);
+void LightState(uint8_t append);
+void LightCycleColor(int8_t direction);
+void LightSetPower(void);
+void LightAnimate(void);
+bool isChannelGammaCorrected(uint32_t channel);
+uint16_t fadeGamma(uint32_t channel, uint16_t v);
+uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg);
+bool LightApplyFade(void);
+void LightApplyPower(uint8_t new_color[LST_MAX], power_t power);
+void LightSetOutputs(const uint16_t *cur_col_10);
+void calcGammaMultiChannels(uint16_t cur_col_10[5]);
+void calcGammaBulbs(uint16_t cur_col_10[5]);
+bool LightColorEntry(char *buffer, uint32_t buffer_length);
+void CmndSupportColor(void);
+void CmndColor(void);
+void CmndWhite(void);
+void CmndChannel(void);
+void CmndHsbColor(void);
+void CmndScheme(void);
+void CmndWakeup(void);
+void CmndColorTemperature(void);
+void CmndDimmer(void);
+void CmndDimmerRange(void);
+void CmndLedTable(void);
+void CmndRgbwwTable(void);
+void CmndFade(void);
+void CmndSpeed(void);
+void CmndWakeupDuration(void);
+void CmndUndocA(void);
+bool Xdrv04(uint8_t function);
+void IrSendInit(void);
+void IrReceiveUpdateThreshold(void);
+void IrReceiveInit(void);
+void IrReceiveCheck(void);
+uint32_t IrRemoteCmndIrSendJson(void);
+void CmndIrSend(void);
+void IrRemoteCmndResponse(uint32_t error);
+bool Xdrv05(uint8_t function);
+void IrSendInit(void);
+uint8_t reverseBitsInByte(uint8_t b);
+uint64_t reverseBitsInBytes64(uint64_t b);
+void IrReceiveUpdateThreshold(void);
+void IrReceiveInit(void);
+String sendIRJsonState(const struct decode_results &results);
+void IrReceiveCheck(void);
+String listSupportedProtocols(bool hvac);
+uint32_t IrRemoteCmndIrHvacJson(void);
+void CmndIrHvac(void);
+uint32_t IrRemoteCmndIrSendJson(void);
+uint32_t IrRemoteCmndIrSendRaw(void);
+void CmndIrSend(void);
+void IrRemoteCmndResponse(uint32_t error);
+bool Xdrv05(uint8_t function);
+ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size);
+ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size);
+ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len);
+ssize_t rf_decode_and_write(uint8_t *record, size_t size);
+ssize_t rf_search_and_write(uint8_t *buf, size_t size);
+uint8_t rf_erase_flash(void);
+uint8_t SnfBrUpdateInit(void);
+void SonoffBridgeReceivedRaw(void);
+void SonoffBridgeLearnFailed(void);
+void SonoffBridgeReceived(void);
+bool SonoffBridgeSerialInput(void);
+void SonoffBridgeSendCommand(uint8_t code);
+void SonoffBridgeSendAck(void);
+void SonoffBridgeSendCode(uint32_t code);
+void SonoffBridgeSend(uint8_t idx, uint8_t key);
+void SonoffBridgeLearn(uint8_t key);
+void CmndRfBridge(void);
+void CmndRfKey(void);
+void CmndRfRaw(void);
+bool Xdrv06(uint8_t function);
+int DomoticzBatteryQuality(void);
+int DomoticzRssiQuality(void);
+void MqttPublishDomoticzFanState(void);
+void DomoticzUpdateFanState(void);
+void MqttPublishDomoticzPowerState(uint8_t device);
+void DomoticzUpdatePowerState(uint8_t device);
+void DomoticzMqttUpdate(void);
+void DomoticzMqttSubscribe(void);
+bool DomoticzMqttData(void);
+bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg);
+uint8_t DomoticzHumidityState(char *hum);
+void DomoticzSensor(uint8_t idx, char *data);
+void DomoticzSensor(uint8_t idx, uint32_t value);
+void DomoticzTempHumSensor(char *temp, char *hum);
+void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro);
+void DomoticzSensorPowerEnergy(int power, char *energy);
+void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power);
+void CmndDomoticzIdx(void);
+void CmndDomoticzKeyIdx(void);
+void CmndDomoticzSwitchIdx(void);
+void CmndDomoticzSensorIdx(void);
+void CmndDomoticzUpdateTimer(void);
+void HandleDomoticzConfiguration(void);
+void DomoticzSaveSettings(void);
+bool Xdrv07(uint8_t function);
+void SerialBridgeInput(void);
+void SerialBridgeInit(void);
+void CmndSSerialSend(void);
+void CmndSBaudrate(void);
+bool Xdrv08(uint8_t function);
+float JulianischesDatum(void);
+float InPi(float x);
+float eps(float T);
+float BerechneZeitgleichung(float *DK,float T);
+void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down);
+void ApplyTimerOffsets(Timer *duskdawn);
+String GetSun(uint32_t dawn);
+uint16_t SunMinutes(uint32_t dawn);
+void TimerSetRandomWindow(uint32_t index);
+void TimerSetRandomWindows(void);
+void TimerEverySecond(void);
+void PrepShowTimer(uint32_t index);
+void CmndTimer(void);
+void CmndTimers(void);
+void CmndLongitude(void);
+void CmndLatitude(void);
+void HandleTimerConfiguration(void);
+void TimerSaveSettings(void);
+bool Xdrv09(uint8_t function);
+bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule);
+int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr);
+void RulesVarReplace(String &commands, const String &sfind, const String &replace);
+bool RuleSetProcess(uint8_t rule_set, String &event_saved);
+bool RulesProcessEvent(char *json_event);
+bool RulesProcess(void);
+void RulesInit(void);
+void RulesEvery50ms(void);
+void RulesEvery100ms(void);
+void RulesEverySecond(void);
+void RulesSaveBeforeRestart(void);
+void RulesSetPower(void);
+void RulesTeleperiod(void);
+bool RulesMqttData(void);
+void CmndSubscribe(void);
+void CmndUnsubscribe(void);
+bool findNextNumber(char * &pNumber, float &value);
+bool findNextVariableValue(char * &pVarname, float &value);
+bool findNextObjectValue(char * &pointer, float &value);
+bool findNextOperator(char * &pointer, int8_t &op);
+float calculateTwoValues(float v1, float v2, uint8_t op);
+float evaluateExpression(const char * expression, unsigned int len);
+void CmndIf(void);
+bool evaluateComparisonExpression(const char *expression, int len);
+bool findNextLogicOperator(char * &pointer, int8_t &op);
+bool findNextLogicObjectValue(char * &pointer, bool &value);
+bool evaluateLogicalExpression(const char * expression, int len);
+int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type);
+void ExecuteCommandBlock(const char * commands, int len);
+void ProcessIfStatement(const char* statements);
+void RulesPreprocessCommand(char *pCommands);
+void CmndRule(void);
+void CmndRuleTimer(void);
+void CmndEvent(void);
+void CmndVariable(void);
+void CmndMemory(void);
+void CmndCalcResolution(void);
+void CmndAddition(void);
+void CmndSubtract(void);
+void CmndMultiply(void);
+void CmndScale(void);
+float map_double(float x, float in_min, float in_max, float out_min, float out_max);
+bool Xdrv10(uint8_t function);
+void ScriptEverySecond(void);
+void RulesTeleperiod(void);
+int16_t Init_Scripter(void);
+void ws2812_set_array(float *array ,uint8_t len);
+float median_array(float *array,uint8_t len);
+float Get_MFVal(uint8_t index,uint8_t bind);
+void Set_MFVal(uint8_t index,uint8_t bind,float val);
+float Get_MFilter(uint8_t index);
+void Set_MFilter(uint8_t index, float invar);
+float DoMedian5(uint8_t index, float in);
+uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value);
+uint16_t GetStack(void);
+uint16_t GetStack(void);
+void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize);
+void toLog(const char *str);
+void toLogN(const char *cp,uint8_t len);
+void toLogEOL(const char *s1,const char *str);
+void toSLog(const char *str);
+int16_t Run_Scripter(const char *type, int8_t tlen, char *js);
+void ScripterEvery100ms(void);
+void Scripter_save_pvars(void);
+void ListDir(char *path, uint8_t depth);
+void Script_FileUploadConfiguration(void);
+void ScriptFileUploadSuccess(void);
+void script_upload(void);
+uint8_t DownloadFile(char *file);
+void HandleScriptTextareaConfiguration(void);
+void HandleScriptConfiguration(void);
+void ScriptSaveSettings(void);
+void Script_HueStatus(String *response, uint16_t hue_devs);
+void Script_Check_Hue(String *response);
+void Script_Handle_Hue(String *path);
+bool Script_SubCmd(void);
+void execute_script(char *script);
+bool ScriptCommand(void);
+uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day);
+uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second);
+void dateTime(uint16_t* date, uint16_t* time);
+bool ScriptMqttData(void);
+String ScriptSubscribe(const char *data, int data_len);
+String ScriptUnsubscribe(const char * data, int data_len);
+void Script_Check_HTML_Setvars(void);
+void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen);
+void ScriptWebShow(void);
+void ScriptJsonAppend(void);
+bool Xdrv10(uint8_t function);
+void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF );
+void KNX_DEL_GA( uint8_t GAnum );
+void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF );
+void KNX_DEL_CB( uint8_t CBnum );
+bool KNX_CONFIG_NOT_MATCH(void);
+void KNXStart(void);
+void KNX_INIT(void);
+void KNX_CB_Action(message_t const &msg, void *arg);
+void KnxUpdatePowerState(uint8_t device, power_t state);
+void KnxSendButtonPower(void);
+void KnxSensor(uint8_t sensor_type, float value);
+void HandleKNXConfiguration(void);
+void KNX_Save_Settings(void);
+void CmndKnxTxCmnd(void);
+void CmndKnxTxVal(void);
+void CmndKnxEnabled(void);
+void CmndKnxEnhanced(void);
+void CmndKnxPa(void);
+void CmndKnxGa(void);
+void CmndKnxCb(void);
+bool Xdrv11(uint8_t function);
+void TryResponseAppend_P(const char *format, ...);
+void HAssAnnounceRelayLight(void);
+void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle);
+void HAssAnnounceSwitches(void);
+void HAssAnnounceButtons(void);
+void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx);
+void HAssAnnounceSensors(void);
+void HAssAnnounceStatusSensor(void);
+void HAssPublishStatus(void);
+void HAssDiscovery(void);
+void HAssDiscover(void);
+void HAssAnyKey(void);
+bool Xdrv12(uint8_t function);
+void DisplayInit(uint8_t mode);
+void DisplayClear(void);
+void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
+void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
+void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
+void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
+void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawFrame(void);
+void DisplaySetSize(uint8_t size);
+void DisplaySetFont(uint8_t font);
+void DisplaySetRotation(uint8_t rotation);
+void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void DisplayOnOff(uint8_t on);
+uint8_t fatoiv(char *cp,float *res);
+uint8_t atoiv(char *cp, int16_t *res);
+uint8_t atoiV(char *cp, uint16_t *res);
+void alignright(char *string);
+uint32_t decode_te(char *line);
+void DisplayText(void);
+void DisplayClearScreenBuffer(void);
+void DisplayFreeScreenBuffer(void);
+void DisplayAllocScreenBuffer(void);
+void DisplayReAllocScreenBuffer(void);
+void DisplayFillScreen(uint32_t line);
+void DisplayClearLogBuffer(void);
+void DisplayFreeLogBuffer(void);
+void DisplayAllocLogBuffer(void);
+void DisplayReAllocLogBuffer(void);
+void DisplayLogBufferAdd(char* txt);
+char* DisplayLogBuffer(char temp_code);
+void DisplayLogBufferInit(void);
+void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value);
+void DisplayAnalyzeJson(char *topic, char *json);
+void DisplayMqttSubscribe(void);
+bool DisplayMqttData(void);
+void DisplayLocalSensor(void);
+void DisplayInitDriver(void);
+void DisplaySetPower(void);
+void CmndDisplay(void);
+void CmndDisplayModel(void);
+void CmndDisplayWidth(void);
+void CmndDisplayHeight(void);
+void CmndDisplayMode(void);
+void CmndDisplayDimmer(void);
+void CmndDisplaySize(void);
+void CmndDisplayFont(void);
+void CmndDisplayRotate(void);
+void CmndDisplayText(void);
+void CmndDisplayAddress(void);
+void CmndDisplayRefresh(void);
+void CmndDisplayColumns(void);
+void CmndDisplayRows(void);
+void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp);
+void DrawAClock(uint16_t rad);
+void ClrGraph(uint16_t num);
+void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol);
+void DisplayCheckGraph();
+void Save_graph(uint8_t num, char *path);
+void Restore_graph(uint8_t num, char *path);
+void RedrawGraph(uint8_t num, uint8_t flags);
+void AddGraph(uint8_t num,uint8_t val);
+void AddValue(uint8_t num,float fval);
+bool Xdrv13(uint8_t function);
+uint16_t MP3_Checksum(uint8_t *array);
+void MP3PlayerInit(void);
+void MP3_CMD(uint8_t mp3cmd,uint16_t val);
+bool MP3PlayerCmd(void);
+bool Xdrv14(uint8_t function);
+void PCA9685_Detect(void);
+void PCA9685_Reset(void);
+void PCA9685_SetPWMfreq(double freq);
+void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off);
+void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted);
+bool PCA9685_Command(void);
+void PCA9685_OutputTelemetry(bool telemetry);
+bool Xdrv15(uint8_t function);
+void CmndTuyaSend(void);
+void CmndTuyaMcu(void);
+void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId);
+void UpdateDevices();
+inline bool TuyaFuncIdValid(uint8_t fnId);
+uint8_t TuyaGetFuncId(uint8_t dpid);
+uint8_t TuyaGetDpId(uint8_t fnId);
+void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value);
+void TuyaSendBool(uint8_t id, bool value);
+void TuyaSendValue(uint8_t id, uint32_t value);
+void TuyaSendEnum(uint8_t id, uint32_t value);
+void TuyaSendString(uint8_t id, char data[]);
+bool TuyaSetPower(void);
+bool TuyaSetChannels(void);
+void LightSerialDuty(uint16_t duty);
+void TuyaRequestState(void);
+void TuyaResetWifi(void);
+void TuyaProcessStatePacket(void);
+void TuyaLowPowerModePacketProcess(void);
+void TuyaHandleProductInfoPacket(void);
+void TuyaSendLowPowerSuccessIfNeeded(void);
+void TuyaNormalPowerModePacketProcess(void);
+bool TuyaModuleSelected(void);
+void TuyaInit(void);
+void TuyaSerialInput(void);
+bool TuyaButtonPressed(void);
+uint8_t TuyaGetTuyaWifiState(void);
+void TuyaSetWifiLed(void);
+bool Xnrg16(uint8_t function);
+bool Xdrv16(uint8_t function);
+void RfReceiveCheck(void);
+void RfInit(void);
+void CmndRfSend(void);
+bool Xdrv17(uint8_t function);
+bool ArmtronixSetChannels(void);
+void LightSerial2Duty(uint8_t duty1, uint8_t duty2);
+void ArmtronixRequestState(void);
+bool ArmtronixModuleSelected(void);
+void ArmtronixInit(void);
+void ArmtronixSerialInput(void);
+void ArmtronixSetWifiLed(void);
+bool Xdrv18(uint8_t function);
+void PS16DZSerialSend(const char *tx_buffer);
+void PS16DZSerialSendOk(void);
+void PS16DZSerialSendUpdateCommand(void);
+void PS16DZSerialInput(void);
+bool PS16DZSerialSendUpdateCommandIfRequired(void);
+void PS16DZInit(void);
+bool PS16DZModuleSelected(void);
+bool Xdrv19(uint8_t function);
+String HueBridgeId(void);
+String HueSerialnumber(void);
+String HueUuid(void);
+void HueRespondToMSearch(void);
+String GetHueDeviceId(uint8_t id);
+String GetHueUserId(void);
+void HandleUpnpSetupHue(void);
+void HueNotImplemented(String *path);
+void HueConfigResponse(String *response);
+void HueConfig(String *path);
+uint8_t getLocalLightSubtype(uint8_t device);
+void HueLightStatus1(uint8_t device, String *response);
+bool HueActive(uint8_t device);
+void HueLightStatus2(uint8_t device, String *response);
+uint32_t EncodeLightId(uint8_t relay_id);
+uint32_t DecodeLightId(uint32_t hue_id);
+uint32_t findEchoGeneration(void);
+void HueGlobalConfig(String *path);
+void HueAuthentication(String *path);
+void HueLights(String *path);
+void HueGroups(String *path);
+void HandleHueApi(String *path);
+bool Xdrv20(uint8_t function);
+String WemoSerialnumber(void);
+String WemoUuid(void);
+void WemoRespondToMSearch(int echo_type);
+void HandleUpnpEvent(void);
+void HandleUpnpService(void);
+void HandleUpnpMetaService(void);
+void HandleUpnpSetupWemo(void);
+bool Xdrv21(uint8_t function);
+bool IsModuleIfan(void);
+uint8_t MaxFanspeed(void);
+uint8_t GetFanspeed(void);
+void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence);
+void SonoffIfanReceived(void);
+bool SonoffIfanSerialInput(void);
+void CmndFanspeed(void);
+bool SonoffIfanInit(void);
+void SonoffIfanUpdate(void);
+bool Xdrv22(uint8_t function);
+void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val);
+void CopyJsonArray(JsonArray &to, const JsonArray &arr);
+void CopyJsonObject(JsonObject &to, const JsonObject &from);
+uint16_t fromClusterCode(uint8_t c);
+uint8_t toClusterCode(uint16_t c);
+class SBuffer hibernateDevice(const struct Z_Device &device);
+class SBuffer hibernateDevices(void);
+void hidrateDevices(const SBuffer &buf);
+void loadZigbeeDevices(void);
+void saveZigbeeDevices(void);
+void eraseZigbeeDevices(void);
+uint8_t toPercentageCR2032(uint32_t voltage);
+uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
+                              uint32_t offset, uint32_t len);
+int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint);
+const __FlashStringHelper* zigbeeFindCommand(const char *command);
+inline bool isXYZ(char c);
+inline char hexDigit(uint32_t h);
+String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z);
+uint32_t ZigbeeAliasOrNumber(const char *state_text);
+uint8_t ZigbeeGetInstructionSize(uint8_t instr);
+void ZigbeeGotoLabel(uint8_t label);
+void ZigbeeStateMachine_Run(void);
+int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf);
+int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf);
+int32_t Z_Reboot(int32_t res, class SBuffer &buf);
+int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf);
+bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match);
+int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf);
+void Z_SendActiveEpReq(uint16_t shortaddr);
+void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint);
+int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf);
+void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid);
+int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf);
+void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json);
+int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf);
+int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf);
+int32_t Z_Load_Devices(uint8_t value);
+int32_t Z_State_Ready(uint8_t value);
+int32_t ZigbeeProcessInput(class SBuffer &buf);
+void ZigbeeInput(void);
+void ZigbeeInit(void);
+uint32_t strToUInt(const JsonVariant &val);
+void CmndZbReset(void);
+void CmndZbZNPSendOrReceive(bool send);
+void CmndZbZNPReceive(void);
+void CmndZbZNPSend(void);
+void ZigbeeZNPSend(const uint8_t *msg, size_t len);
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId);
+inline int8_t hexValue(char c);
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data);
+void CmndZbSend(void);
+void CmndZbBind(void);
+void CmndZbProbe(void);
+void CmndZbName(void);
+void CmndZbForget(void);
+void CmndZbSave(void);
+void CmndZbRead(void);
+void CmndZbPermitJoin(void);
+void CmndZbStatus(void);
+bool Xdrv23(uint8_t function);
+void BuzzerOff(void);
+void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode);
+void BuzzerSetStateToLed(uint32_t state);
+void BuzzerBeep(uint32_t count);
+void BuzzerEnabledBeep(uint32_t count, uint32_t duration);
+bool BuzzerPinState(void);
+void BuzzerInit(void);
+void BuzzerEvery100mSec(void);
+void CmndBuzzer(void);
+bool Xdrv24(uint8_t function);
+void A4988Init(void);
+void CmndDoMove(void);
+void CmndDoRotate(void);
+void CmndDoTurn(void);
+void CmndSetMIS(void);
+void CmndSetSPR(void);
+void CmndSetRPM(void);
+bool Xdrv25(uint8_t function);
+void AriluxRfInterrupt(void);
+void AriluxRfHandler(void);
+void AriluxRfInit(void);
+void AriluxRfDisable(void);
+bool Xdrv26(uint8_t function);
+void ShutterLogPos(uint32_t i);
+void ShutterRtc50mS(void);
+int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index);
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index);
+void ShutterInit(void);
+void ShutterReportPosition(bool always);
+void ShutterLimitRealAndTargetPositions(uint32_t i);
+void ShutterUpdatePosition(void);
+bool ShutterState(uint32_t device);
+void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos);
+void ShutterWaitForMotorStop(uint32_t i);
+int32_t ShutterCounterBasedPosition(uint32_t i);
+void ShutterRelayChanged(void);
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index);
+void ShutterButtonHandler(void);
+void ShutterSetPosition(uint32_t device, uint32_t position);
+void CmndShutterOpen(void);
+void CmndShutterClose(void);
+void CmndShutterStop(void);
+void CmndShutterPosition(void);
+void CmndShutterOpenTime(void);
+void CmndShutterCloseTime(void);
+void CmndShutterMotorDelay(void);
+void CmndShutterRelay(void);
+void CmndShutterButton(void);
+void CmndShutterSetHalfway(void);
+void CmndShutterFrequency(void);
+void CmndShutterSetClose(void);
+void CmndShutterInvert(void);
+void CmndShutterCalibration(void);
+void CmndShutterLock(void);
+void CmndShutterEnableEndStopTime(void);
+bool Xdrv27(uint8_t function);
+void Pcf8574SwitchRelay(void);
+void Pcf8574Init(void);
+void HandlePcf8574(void);
+void Pcf8574SaveSettings(void);
+bool Xdrv28(uint8_t function);
+bool DeepSleepEnabled(void);
+void DeepSleepReInit(void);
+void DeepSleepPrepare(void);
+void DeepSleepStart(void);
+void DeepSleepEverySecond(void);
+void CmndDeepsleepTime(void);
+bool Xdrv29(uint8_t function);
+uint8_t crc8(const uint8_t *p, uint8_t len);
+void ExsSendCmd(uint8_t cmd, uint8_t value);
+uint8_t ExsSetPower(uint8_t device, uint8_t power);
+uint8_t ExsSetBri(uint8_t device, uint8_t bri);
+uint8_t ExsSyncState(uint8_t device);
+bool ExsSyncState();
+void ExsDebugState();
+void ExsPacketProcess(void);
+bool ExsModuleSelected(void);
+bool ExsSetChannels(void);
+bool ExsSetPower(void);
+void EsxMcuStart(void);
+void ExsInit(void);
+void ExsSerialInput(void);
+void CmndExsDimm(void);
+void CmndExsDimmTbl(void);
+void CmndExsDimmVal(void);
+void CmndExsDimms(void);
+void CmndExsChLock(void);
+void CmndExsState(void);
+bool Xdrv30(uint8_t function);
+uint32_t TasmotaSlave_FlashStart(void);
+uint8_t TasmotaSlave_UpdateInit(void);
+void TasmotaSlave_Reset(void);
+uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout);
+uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count);
+uint8_t TasmotaSlave_execCmd(uint8_t cmd);
+uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count);
+uint8_t TasmotaSlave_exitProgMode(void);
+uint8_t TasmotaSlave_SetupFlash(void);
+uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo);
+void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data);
+void TasmotaSlave_Flash(void);
+void TasmotaSlave_SetFlagFlashing(bool value);
+bool TasmotaSlave_GetFlagFlashing(void);
+void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size);
+void TasmotaSlave_Init(void);
+void TasmotaSlave_Show(void);
+void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param);
+void CmndTasmotaSlaveReset(void);
+void CmndTasmotaSlaveSend(void);
+void TasmotaSlave_ProcessIn(void);
+bool Xdrv31(uint8_t function);
+void HotPlugInit(void);
+void HotPlugEverySecond(void);
+void CmndHotPlugTime(void);
+bool Xdrv32(uint8_t function);
+bool NRF24initRadio();
+bool NRF24Detect(void);
+bool Xdrv33(uint8_t function);
+void ExceptionTest(uint8_t type);
+void CpuLoadLoop(void);
+void DebugFreeMem(void);
+void DebugFreeMem(void);
+void DebugRtcDump(char* parms);
+void DebugCfgDump(char* parms);
+void DebugCfgPeek(char* parms);
+void DebugCfgPoke(char* parms);
+void SetFlashMode(uint8_t mode);
+void CmndHelp(void);
+void CmndRtcDump(void);
+void CmndCfgDump(void);
+void CmndCfgPeek(void);
+void CmndCfgPoke(void);
+void CmndCfgXor(void);
+void CmndException(void);
+void CmndCpuCheck(void);
+void CmndFreemem(void);
+void CmndSetSensor(void);
+void CmndFlashMode(void);
+uint32_t DebugSwap32(uint32_t x);
+void CmndFlashDump(void);
+void CmndI2cWrite(void);
+void CmndI2cRead(void);
+void CmndI2cStretch(void);
+void CmndI2cClock(void);
+bool Xdrv99(uint8_t function);
+void XsnsDriverState(void);
+bool XdrvRulesProcess(void);
+void ShowFreeMem(const char *where);
+bool XdrvCallDriver(uint32_t driver, uint8_t Function);
+bool XdrvCall(uint8_t Function);
+void LcdInitMode(void);
+void LcdInit(uint8_t mode);
+void LcdInitDriver(void);
+void LcdDrawStringAt(void);
+void LcdDisplayOnOff(uint8_t on);
+void LcdCenter(uint8_t row, char* txt);
+bool LcdPrintLog(void);
+void LcdTime(void);
+void LcdRefresh(void);
+bool Xdsp01(uint8_t function);
+void SSD1306InitDriver(void);
+void Ssd1306PrintLog(void);
+void Ssd1306Time(void);
+void Ssd1306Refresh(void);
+bool Xdsp02(byte function);
+void MatrixWrite(void);
+void MatrixClear(void);
+void MatrixFixed(char* txt);
+void MatrixCenter(char* txt);
+void MatrixScrollLeft(char* txt, int loop);
+void MatrixScrollUp(char* txt, int loop);
+void MatrixInitMode(void);
+void MatrixInit(uint8_t mode);
+void MatrixInitDriver(void);
+void MatrixOnOff(void);
+void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void MatrixPrintLog(uint8_t direction);
+void MatrixRefresh(void);
+bool Xdsp03(uint8_t function);
+void Ili9341InitMode(void);
+void Ili9341Init(uint8_t mode);
+void Ili9341InitDriver(void);
+void Ili9341Clear(void);
+void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void Ili9341DisplayOnOff(uint8_t on);
+void Ili9341OnOff(void);
+void Ili9341PrintLog(void);
+void Ili9341Refresh(void);
+bool Xdsp04(uint8_t function);
+void EpdInitDriver29();
+void EpdPrintLog29(void);
+void EpdRefresh29(void);
+bool Xdsp05(uint8_t function);
+void EpdInitDriver42();
+void EpdRefresh42();
+bool Xdsp06(uint8_t function);
+void SH1106InitDriver();
+void SH1106PrintLog(void);
+void SH1106Time(void);
+void SH1106Refresh(void);
+bool Xdsp07(uint8_t function);
+void ILI9488_InitDriver();
+void ILI9488_MQTT(uint8_t count,const char *cp);
+void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr);
+void FT6236Check();
+bool Xdsp08(uint8_t function);
+void SSD1351_InitDriver();
+void SSD1351PrintLog(void);
+void SSD1351Time(void);
+void SSD1351Refresh(void);
+bool Xdsp09(uint8_t function);
+void RA8876_InitDriver();
+void RA8876_MQTT(uint8_t count,const char *cp);
+void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr);
+void FT5316Check();
+bool Xdsp10(uint8_t function);
+uint8_t XdspPresent(void);
+bool XdspCall(uint8_t Function);
+void Ws2812StripShow(void);
+int mod(int a, int b);
+void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset);
+void Ws2812UpdateHand(int position, uint32_t index);
+void Ws2812Clock(void);
+void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i);
+void Ws2812Gradient(uint32_t schemenr);
+void Ws2812Bars(uint32_t schemenr);
+void Ws2812Clear(void);
+void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
+char* Ws2812GetColor(uint32_t led, char* scolor);
+void Ws2812ForceSuspend (void);
+void Ws2812ForceUpdate (void);
+bool Ws2812SetChannels(void);
+void Ws2812ShowScheme(void);
+void Ws2812ModuleSelected(void);
+void CmndLed(void);
+void CmndPixels(void);
+void CmndRotation(void);
+void CmndWidth(void);
+bool Xlgt01(uint8_t function);
+void LightDiPulse(uint8_t times);
+void LightDckiPulse(uint8_t times);
+void LightMy92x1Write(uint8_t data);
+void LightMy92x1Init(void);
+void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c);
+bool My92x1SetChannels(void);
+void My92x1ModuleSelected(void);
+bool Xlgt02(uint8_t function);
+void SM16716_SendBit(uint8_t v);
+void SM16716_SendByte(uint8_t v);
+void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b);
+void SM16716_Init(void);
+bool Sm16716SetChannels(void);
+void Sm16716ModuleSelected(void);
+bool Xlgt03(uint8_t function);
+uint8_t Sm2135Write(uint8_t data);
+void Sm2135Send(uint8_t *buffer, uint8_t size);
+bool Sm2135SetChannels(void);
+void Sm2135ModuleSelected(void);
+bool Xlgt04(uint8_t function);
+void SnfL1Send(const char *buffer);
+void SnfL1SerialSendOk(void);
+bool SnfL1SerialInput(void);
+bool SnfL1SetChannels(void);
+void SnfL1ModuleSelected(void);
+bool Xlgt05(uint8_t function);
+bool XlgtCall(uint8_t function);
+void HlwCfInterrupt(void);
+void HlwCf1Interrupt(void);
+void HlwEvery200ms(void);
+void HlwEverySecond(void);
+void HlwSnsInit(void);
+void HlwDrvInit(void);
+bool HlwCommand(void);
+bool Xnrg01(uint8_t function);
+void CseReceived(void);
+bool CseSerialInput(void);
+void CseEverySecond(void);
+void CseSnsInit(void);
+void CseDrvInit(void);
+bool CseCommand(void);
+bool Xnrg02(uint8_t function);
+uint8_t PzemCrc(uint8_t *data);
+void PzemSend(uint8_t cmd);
+bool PzemReceiveReady(void);
+bool PzemRecieve(uint8_t resp, float *data);
+void PzemEvery250ms(void);
+void PzemSnsInit(void);
+void PzemDrvInit(void);
+bool PzemCommand(void);
+bool Xnrg03(uint8_t function);
+uint8_t McpChecksum(uint8_t *data);
+unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size);
+void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size);
+void McpSend(uint8_t *data);
+void McpGetAddress(void);
+void McpAddressReceive(void);
+void McpGetCalibration(void);
+void McpParseCalibration(void);
+bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift);
+void McpSetCalibration(struct mcp_cal_registers_type *cal_registers);
+void McpSetSystemConfiguration(uint16 interval);
+void McpGetFrequency(void);
+void McpParseFrequency(void);
+void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency);
+void McpGetData(void);
+void McpParseData(void);
+void McpSerialInput(void);
+void McpEverySecond(void);
+void McpSnsInit(void);
+void McpDrvInit(void);
+bool McpCommand(void);
+bool Xnrg04(uint8_t function);
+void PzemAcEverySecond(void);
+void PzemAcSnsInit(void);
+void PzemAcDrvInit(void);
+bool PzemAcCommand(void);
+bool Xnrg05(uint8_t function);
+void PzemDcEverySecond(void);
+void PzemDcSnsInit(void);
+void PzemDcDrvInit(void);
+bool PzemDcCommand(void);
+bool Xnrg06(uint8_t function);
+int Ade7953RegSize(uint16_t reg);
+void Ade7953Write(uint16_t reg, uint32_t val);
+int32_t Ade7953Read(uint16_t reg);
+void Ade7953Init(void);
+void Ade7953GetData(void);
+void Ade7953EnergyEverySecond(void);
+void Ade7953DrvInit(void);
+bool Ade7953Command(void);
+bool Xnrg07(uint8_t function);
+void SDM120Every250ms(void);
+void Sdm120SnsInit(void);
+void Sdm120DrvInit(void);
+void Sdm220Reset(void);
+void Sdm220Show(bool json);
+bool Xnrg08(uint8_t function);
+void Dds2382EverySecond(void);
+void Dds2382SnsInit(void);
+void Dds2382DrvInit(void);
+bool Xnrg09(uint8_t function);
+void SDM630Every250ms(void);
+void Sdm630SnsInit(void);
+void Sdm630DrvInit(void);
+bool Xnrg10(uint8_t function);
+void DDSU666Every250ms(void);
+void Ddsu666SnsInit(void);
+void Ddsu666DrvInit(void);
+bool Xnrg11(uint8_t function);
+bool solaxX1_RS485ReceiveReady(void);
+void solaxX1_RS485Send(uint16_t msgLen);
+uint8_t solaxX1_RS485Receive(uint8_t *value);
+uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen);
+void solaxX1_SendInverterAddress(void);
+void solaxX1_QueryLiveData(void);
+uint8_t solaxX1_ParseErrorCode(uint32_t code);
+void solaxX1250MSecond(void);
+void solaxX1SnsInit(void);
+void solaxX1DrvInit(void);
+void solaxX1Show(bool json);
+bool Xnrg12(uint8_t function);
+void FifLEEvery250ms(void);
+void FifLESnsInit(void);
+void FifLEDrvInit(void);
+void FifLEReset(void);
+void FifLEShow(bool json);
+bool Xnrg13(uint8_t function);
+bool XnrgCall(uint8_t function);
+void CounterUpdate(uint8_t index);
+void CounterUpdate1(void);
+void CounterUpdate2(void);
+void CounterUpdate3(void);
+void CounterUpdate4(void);
+bool CounterPinState(void);
+void CounterInit(void);
+void CounterEverySecond(void);
+void CounterSaveState(void);
+void CounterShow(bool json);
+void CmndCounter(void);
+void CmndCounterType(void);
+void CmndCounterDebounce(void);
+bool Xsns01(uint8_t function);
+void AdcInit(void);
+uint16_t AdcRead(uint8_t factor);
+void AdcEvery250ms(void);
+uint16_t AdcGetLux(void);
+uint16_t AdcGetRange(void);
+void AdcGetCurrentPower(uint8_t factor);
+void AdcEverySecond(void);
+void AdcShow(bool json);
+void CmndAdc(void);
+void CmndAdcs(void);
+void CmndAdcParam(void);
+bool Xsns02(uint8_t function);
+void SonoffScSend(const char *data);
+void SonoffScInit(void);
+void SonoffScSerialInput(char *rcvstat);
+void SonoffScShow(bool json);
+bool Xsns04(uint8_t function);
+uint8_t OneWireReset(void);
+void OneWireWriteBit(uint8_t v);
+uint8_t OneWireReadBit(void);
+void OneWireWrite(uint8_t v);
+uint8_t OneWireRead(void);
+void OneWireSelect(const uint8_t rom[8]);
+void OneWireResetSearch(void);
+uint8_t OneWireSearch(uint8_t *newAddr);
+bool OneWireCrc8(uint8_t *addr);
+void Ds18x20Init(void);
+void Ds18x20Convert(void);
+bool Ds18x20Read(uint8_t sensor);
+void Ds18x20Name(uint8_t sensor);
+void Ds18x20EverySecond(void);
+void Ds18x20Show(bool json);
+bool Xsns05(uint8_t function);
+void DhtReadPrep(void);
+int32_t DhtExpectPulse(uint8_t sensor, bool level);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+void DhtReadPrep(void);
+int32_t DhtExpectPulse(uint8_t sensor, bool level);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtExpectPulse(uint8_t sensor, int level);
+int DhtReadDat(uint8_t sensor);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtExpectPulse(uint32_t sensor, uint32_t level);
+bool DhtRead(uint32_t sensor);
+void DhtReadTempHum(uint32_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtWaitState(uint32_t sensor, uint32_t level);
+bool DhtRead(uint32_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool ShtReset(void);
+bool ShtSendCommand(const uint8_t cmd);
+bool ShtAwaitResult(void);
+int ShtReadData(void);
+bool ShtRead(void);
+void ShtDetect(void);
+void ShtEverySecond(void);
+void ShtShow(bool json);
+bool Xsns07(uint8_t function);
+uint8_t HtuCheckCrc8(uint16_t data);
+uint8_t HtuReadDeviceId(void);
+void HtuSetResolution(uint8_t resolution);
+void HtuReset(void);
+void HtuHeater(uint8_t heater);
+void HtuInit(void);
+bool HtuRead(void);
+void HtuDetect(void);
+void HtuEverySecond(void);
+void HtuShow(bool json);
+bool Xsns08(uint8_t function);
+bool Bmp180Calibration(uint8_t bmp_idx);
+void Bmp180Read(uint8_t bmp_idx);
+bool Bmx280Calibrate(uint8_t bmp_idx);
+void Bme280Read(uint8_t bmp_idx);
+static void BmeDelayMs(uint32_t ms);
+bool Bme680Init(uint8_t bmp_idx);
+void Bme680Read(uint8_t bmp_idx);
+void BmpDetect(void);
+void BmpRead(void);
+void BmpShow(bool json);
+void BMP_EnterSleep(void);
+bool Xsns09(uint8_t function);
+bool Bh1750Read(void);
+void Bh1750Detect(void);
+void Bh1750EverySecond(void);
+void Bh1750Show(bool json);
+bool Xsns10(uint8_t function);
+void Veml6070Detect(void);
+void Veml6070UvTableInit(void);
+void Veml6070EverySecond(void);
+void Veml6070ModeCmd(bool mode_cmd);
+uint16_t Veml6070ReadUv(void);
+double Veml6070UvRiskLevel(uint16_t uv_level);
+double Veml6070UvPower(double uvrisk);
+void Veml6070Show(bool json);
+bool Xsns11(uint8_t function);
+void Ads1115StartComparator(uint8_t channel, uint16_t mode);
+int16_t Ads1115GetConversion(uint8_t channel);
+void Ads1115Detect(void);
+void Ads1115Show(bool json);
+bool Xsns12(uint8_t function);
+bool Ina219SetCalibration(uint8_t mode, uint16_t addr);
+float Ina219GetShuntVoltage_mV(uint16_t addr);
+float Ina219GetBusVoltage_V(uint16_t addr);
+float Ina219GetCurrent_mA(uint16_t addr);
+bool Ina219Read(void);
+bool Ina219CommandSensor(void);
+void Ina219Detect(void);
+void Ina219EverySecond(void);
+void Ina219Show(bool json);
+bool Xsns13(uint8_t function);
+bool Sht3xRead(float &t, float &h, uint8_t sht3x_address);
+void Sht3xDetect(void);
+void Sht3xShow(bool json);
+bool Xsns14(uint8_t function);
+uint8_t MhzCalculateChecksum(uint8_t *array);
+size_t MhzSendCmd(uint8_t command_id);
+bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s);
+void MhzEverySecond(void);
+bool MhzCommandSensor(void);
+void MhzInit(void);
+void MhzShow(bool json);
+bool Xsns15(uint8_t function);
+bool Tsl2561Read(void);
+void Tsl2561Detect(void);
+void Tsl2561EverySecond(void);
+void Tsl2561Show(bool json);
+bool Xsns16(uint8_t function);
+void Senseair250ms(void);
+void SenseairInit(void);
+void SenseairShow(bool json);
+bool Xsns17(uint8_t function);
+bool PmsReadData(void);
+void PmsSecond(void);
+void PmsInit(void);
+void PmsShow(bool json);
+bool Xsns18(uint8_t function);
+void MGSInit(void);
+void MGSPrepare(void);
+char* measure_gas(int gas_type, char* buffer);
+void MGSShow(bool json);
+bool Xsns19(uint8_t function);
+bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer);
+void NovaSdsSetWorkPeriod(void);
+bool NovaSdsReadData(void);
+void NovaSdsSecond(void);
+bool NovaSdsCommandSensor(void);
+void NovaSdsInit(void);
+void NovaSdsShow(bool json);
+bool Xsns20(uint8_t function);
+void sgp30_Init(void);
+float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit);
+void Sgp30Update(void);
+void Sgp30Show(bool json);
+bool Xsns21(uint8_t function);
+uint8_t Sr04TModeDetect(void);
+uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third);
+uint16_t Sr04TMode3Distance();
+uint16_t Sr04TMode2Distance(void);
+void Sr04TReading(void);
+void Sr04Show(bool json);
+bool Xsns22(uint8_t function);
+uint8_t Si1145ReadByte(uint8_t reg);
+uint16_t Si1145ReadHalfWord(uint8_t reg);
+bool Si1145WriteByte(uint8_t reg, uint16_t val);
+uint8_t Si1145WriteParamData(uint8_t p, uint8_t v);
+bool Si1145Present(void);
+void Si1145Reset(void);
+void Si1145DeInit(void);
+bool Si1145Begin(void);
+uint16_t Si1145ReadUV(void);
+uint16_t Si1145ReadVisible(void);
+uint16_t Si1145ReadIR(void);
+bool Si1145Read(void);
+void Si1145Detect(void);
+void Si1145Update(void);
+void Si1145Show(bool json);
+bool Xsns24(uint8_t function);
+void LM75ADDetect(void);
+float LM75ADGetTemp(void);
+void LM75ADShow(bool json);
+bool Xsns26(uint8_t function);
+int8_t wireReadDataBlock( uint8_t reg,
+                                        uint8_t *val,
+                                        uint16_t len);
+void calculateColorTemperature(void);
+bool APDS9960_init(void);
+uint8_t getMode(void);
+void setMode(uint8_t mode, uint8_t enable);
+void enableLightSensor(void);
+void disableLightSensor(void);
+void enableProximitySensor(void);
+void disableProximitySensor(void);
+void enableGestureSensor(void);
+void disableGestureSensor(void);
+bool isGestureAvailable(void);
+int16_t readGesture(void);
+void enablePower(void);
+void disablePower(void);
+void readAllColorAndProximityData(void);
+void resetGestureParameters(void);
+bool processGestureData(void);
+bool decodeGesture(void);
+void handleGesture(void);
+void APDS9960_adjustATime(void);
+void APDS9960_loop(void);
+void APDS9960_detect(void);
+void APDS9960_show(bool json);
+bool APDS9960CommandSensor(void);
+bool Xsns27(uint8_t function);
+void Tm16XXSend(uint8_t data);
+void Tm16XXSendCommand(uint8_t cmd);
+void TM16XXSendData(uint8_t address, uint8_t data);
+uint8_t Tm16XXReceive(void);
+void Tm16XXClearDisplay(void);
+void Tm1638SetLED(uint8_t color, uint8_t pos);
+void Tm1638SetLEDs(word leds);
+uint8_t Tm1638GetButtons(void);
+void TmInit(void);
+void TmLoop(void);
+bool Xsns28(uint8_t function);
+void MCP230xx_CheckForIntCounter(void);
+void MCP230xx_CheckForIntRetainer(void);
+const char* IntModeTxt(uint8_t intmo);
+uint8_t MCP230xx_readGPIO(uint8_t port);
+void MCP230xx_ApplySettings(void);
+void MCP230xx_Detect(void);
+void MCP230xx_CheckForInterrupt(void);
+void MCP230xx_Show(bool json);
+void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate);
+void MCP230xx_Reset(uint8_t pinmode);
+bool MCP230xx_Command(void);
+void MCP230xx_UpdateWebData(void);
+void MCP230xx_OutputTelemetry(void);
+void MCP230xx_Interrupt_Counter_Report(void);
+void MCP230xx_Interrupt_Retain_Report(void);
+bool Xsns29(uint8_t function);
+void Mpr121Init(struct mpr121 *pS, bool initial);
+void Mpr121Show(struct mpr121 *pS, uint8_t function);
+bool Xsns30(uint8_t function);
+void CCS811Detect(void);
+void CCS811Update(void);
+void CCS811Show(bool json);
+bool Xsns31(uint8_t function);
+void MPU_6050PerformReading(void);
+void MPU_6050Detect(void);
+void MPU_6050Show(bool json);
+bool Xsns32(uint8_t function);
+void DS3231Detect(void);
+uint8_t bcd2dec(uint8_t n);
+uint8_t dec2bcd(uint8_t n);
+uint32_t ReadFromDS3231(void);
+void SetDS3231Time (uint32_t epoch_time);
+void DS3231EverySecond(void);
+bool Xsns33(uint8_t function);
+bool HxIsReady(uint16_t timeout);
+long HxRead(void);
+void HxResetPart(void);
+void HxReset(void);
+void HxCalibrationStateTextJson(uint8_t msg_id);
+void SetWeightDelta();
+bool HxCommand(void);
+long HxWeight(void);
+void HxInit(void);
+void HxEvery100mSecond(void);
+void HxSaveBeforeRestart(void);
+void HxShow(bool json);
+void HandleHxAction(void);
+void HxSaveSettings(void);
+void HxLogUpdates(void);
+bool Xsns34(uint8_t function);
+void Tx20StartRead(void);
+void Tx20Read(void);
+void Tx20Init(void);
+void Tx20Show(bool json);
+bool Xsns35(uint8_t function);
+void MGC3130_handleSensorData();
+void MGC3130_sendMessage(uint8_t data[], uint8_t length);
+void MGC3130_handleGesture();
+bool MGC3130_handleTouch();
+void MGC3130_handleAirWheel();
+void MGC3130_handleSystemStatus();
+bool MGC3130_receiveMessage();
+bool MGC3130_readData();
+void MGC3130_nextMode();
+void MGC3130_loop();
+void MGC3130_detect(void);
+void MGC3130_show(bool json);
+bool MGC3130CommandSensor();
+bool Xsns36(uint8_t function);
+bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal);
+void RfSnsInitTheoV2(void);
+void RfSnsAnalyzeTheov2(void);
+void RfSnsTheoV2Show(bool json);
+void RfSnsInitAlectoV2(void);
+void RfSnsAnalyzeAlectov2();
+void RfSnsAlectoResetRain(void);
+uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len);
+void RfSnsAlectoV2Show(bool json);
+void RfSnsInit(void);
+void RfSnsAnalyzeRawSignal(void);
+void RfSnsEverySecond(void);
+void RfSnsShow(bool json);
+bool Xsns37(uint8_t function);
+void AzEverySecond(void);
+void AzInit(void);
+void AzShow(bool json);
+bool Xsns38(uint8_t function);
+void MAX31855_Init(void);
+void MAX31855_GetResult(void);
+float MAX31855_GetProbeTemperature(int32_t RawData);
+float MAX31855_GetReferenceTemperature(int32_t RawData);
+int32_t MAX31855_ShiftIn(uint8_t Length);
+void MAX31855_Show(bool Json);
+bool Xsns39(uint8_t function);
+void PN532_Init(void);
+int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout);
+int8_t PN532_readAckFrame(void);
+uint32_t PN532_getFirmwareVersion(void);
+void PN532_wakeup(void);
+bool PN532_setPassiveActivationRetries(uint8_t maxRetries);
+bool PN532_SAMConfig(void);
+uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData);
+uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data);
+uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data);
+void PN532_ScanForTag(void);
+bool PN532_Command(void);
+bool Xsns40(uint8_t function);
+bool Max4409Read_lum(void);
+void Max4409Detect(void);
+void Max4409EverySecond(void);
+void Max4409Show(bool json);
+bool Xsns41(uint8_t function);
+void Scd30Detect(void);
+void Scd30Update(void);
+int Scd30GetCommand(int command_code, uint16_t *pvalue);
+int Scd30SetCommand(int command_code, uint16_t value);
+bool Scd30CommandSensor();
+void Scd30Show(bool json);
+bool Xsns42(byte function);
+int hreReadBit();
+char hreReadChar(int &parity_errors);
+void hreInit(void);
+void hreEvery50ms(void);
+void hreShow(boolean json);
+bool Xsns43(byte function);
+uint8_t sps30_calc_CRC(uint8_t *data);
+void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen);
+void sps30_cmd(uint16_t cmd);
+void SPS30_Detect(void);
+void SPS30_Every_Second();
+void SPS30_Show(bool json);
+bool SPS30_cmd(void);
+bool Xsns44(byte function);
+void Vl53l0Detect(void);
+void Vl53l0Every_250MSecond(void);
+void Vl53l0Show(boolean json);
+bool Xsns45(byte function);
+void MLX90614_Init(void);
+void MLX90614_Every_Second(void);
+void MLX90614_Show(uint8_t json);
+bool Xsns46(byte function);
+void MAX31865_Init(void);
+void MAX31865_GetResult(void);
+void MAX31865_Show(bool Json);
+bool Xsns47(uint8_t function);
+void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg);
+uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr);
+void ChirpReset(uint8_t addr);
+void ChirpResetAll(void);
+void ChirpClockSet();
+void ChirpSleep(uint8_t addr);
+void ChirpSelect(uint8_t sensor);
+uint8_t ChirpReadVersion(uint8_t addr);
+bool ChirpSet(uint8_t addr);
+bool ChirpScan();
+void ChirpDetect(void);
+void ChirpServiceAllSensors(uint8_t job);
+void ChirpEvery100MSecond(void);
+void ChirpShow(bool json);
+bool ChirpCmd(void);
+bool Xsns48(uint8_t function);
+void PAJ7620SelectBank(uint8_t bank);
+void PAJ7620DecodeGesture(void);
+void PAJ7620ReadGesture(void);
+void PAJ7620Detect(void);
+void PAJ7620Init(void);
+void PAJ7620Loop(void);
+void PAJ7620Show(bool json);
+bool PAJ7620CommandSensor(void);
+bool Xsns50(uint8_t function);
+void RDM6300_Init();
+void RDM6300_ScanForTag();
+uint8_t rm6300_hexnibble(char chr);
+void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[]);
+void RDM6300_Show(void);
+bool Xsns51(byte function);
+void IBEACON_Init();
+void hm17_every_second(void);
+void hm17_sbclr(void);
+void hm17_sendcmd(uint8_t cmd);
+uint32_t ibeacon_add(struct IBEACON *ib);
+void hm17_decode(void);
+void IBEACON_loop();
+void IBEACON_Show(void);
+bool xsns52_cmd(void);
+bool ibeacon_cmd(void);
+void ib_sendbeep(void);
+void ibeacon_mqtt(const char *mac,const char *rssi);
+bool Xsns52(byte function);
+double sml_median_array(double *array,uint8_t len);
+double sml_median(struct SML_MEDIAN_FILTER* mf, double in);
+void ADS1115_init(void);
+bool Serial_available();
+uint8_t Serial_read();
+uint8_t Serial_peek();
+void Dump2log(void);
+double sml_getvalue(unsigned char *cp,uint8_t index);
+uint8_t hexnibble(char chr);
+double CharToDouble(const char *str);
+void ebus_esc(uint8_t *ebus_buffer, unsigned char len);
+uint8_t ebus_crc8(uint8_t data, uint8_t crc_init);
+uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen );
+void sml_empty_receiver(uint32_t meters);
+void sml_shift_in(uint32_t meters,uint32_t shard);
+void SML_Poll(void);
+void SML_Decode(uint8_t index);
+void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex);
+void SML_Show(boolean json);
+void SML_CounterUpd(uint8_t index);
+void SML_CounterUpd1(void);
+void SML_CounterUpd2(void);
+void SML_CounterUpd3(void);
+void SML_CounterUpd4(void);
+bool Gpio_used(uint8_t gpiopin);
+void SML_Init(void);
+uint32_t SML_SetBaud(uint32_t meter, uint32_t br);
+uint32_t SML_Write(uint32_t meter,char *hstr);
+void SetDBGLed(uint8_t srcpin, uint8_t ledpin);
+void SML_Counter_Poll(void);
+void SML_Check_Send(void);
+uint8_t sml_hexnibble(char chr);
+void SML_Send_Seq(uint32_t meter,char *seq);
+uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num);
+uint8_t SML_PzemCrc(uint8_t *data, uint8_t len);
+uint8_t CalcEvenParity(uint8_t data);
+bool XSNS_53_cmd(void);
+void InjektCounterValue(uint8_t meter,uint32_t counter);
+void SML_CounterSaveState(void);
+bool Xsns53(byte function);
+static uint32_t _expand_r_shunt(uint16_t compact_r_shunt);
+void Ina226SetCalibration(uint8_t slaveIndex);
+bool Ina226TestPresence(uint8_t device);
+void Ina226ResetActive(void);
+void Ina226Init();
+float Ina226ReadBus_v(uint8_t device);
+float Ina226ReadShunt_i(uint8_t device);
+float Ina226ReadPower_w(uint8_t device);
+void Ina226Read(uint8_t device);
+void Ina226EverySecond();
+bool Ina226CommandSensor();
+void Ina226Show(bool json);
+bool Xsns54(byte callback_id);
+bool Hih6Read(void);
+void Hih6Detect(void);
+void Hih6EverySecond(void);
+void Hih6Show(bool json);
+bool Xsns55(uint8_t function);
+void HpmaSecond(void);
+void HpmaInit(void);
+void HpmaShow(bool json);
+bool Xsns56(uint8_t function);
+void Tsl2591Init(void);
+bool Tsl2591Read(void);
+void Tsl2591EverySecond(void);
+void Tsl2591Show(bool json);
+bool Xsns57(uint8_t function);
+bool Dht12Read(void);
+void Dht12Detect(void);
+void Dht12EverySecond(void);
+void Dht12Show(bool json);
+bool Xsns58(uint8_t function);
+uint32_t DS1624_Idx2Addr(uint32_t idx);
+int DS1624_Restart(uint8_t config, uint32_t idx);
+void DS1624_HotPlugUp(uint32_t idx);
+void DS1624_HotPlugDown(int idx);
+bool DS1624GetTemp(float *value, int idx);
+void DS1624HotPlugScan(void);
+void DS1624EverySecond(void);
+void DS1624Show(bool json);
+bool Xsns59(uint8_t function);
+void UBXcalcChecksum(char* CK, size_t msgSize);
+bool UBXcompareMsgHeader(const char* msgHeader);
+void UBXinitCFG(void);
+void UBXTriggerTele(void);
+void UBXDetect(void);
+uint32_t UBXprocessGPS();
+void UBXsendHeader(void);
+void UBXsendRecord(uint8_t *buf);
+void UBXsendFooter(void);
+void UBXsendFile(void);
+void UBXSetRate(uint16_t interval);
+void UBXSelectMode(uint16_t mode);
+bool UBXHandlePOSLLH();
+void UBXHandleSTATUS();
+void UBXHandleTIME();
+void UBXHandleOther(void);
+void UBXLoop50msec(void);
+void UBXLoop(void);
+void UBXShow(bool json);
+bool UBXCmd(void);
+bool Xsns60(uint8_t function);
+bool MINRFinitBLE(uint8_t _mode);
+void MINRFhopChannel();
+bool MINRFreceivePacket(void);
+void MINRFswapbuf(uint8_t len);
+void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr);
+void MINRFreverseMAC(uint8_t _mac[]);
+void MINRFchangePacketModeTo(uint8_t _mode);
+void MINRFpurgeFakeSensors(void);
+void MINRFhandleFloraPacket(void);
+void MINRFhandleMJ_HT_V1Packet(void);
+void MINRFhandleLYWSD02Packet(void);
+void MINRFhandleLYWSD03Packet(void);
+void MINRF_EVERY_50_MSECOND();
+void MINRFShow(bool json);
+bool Xsns61(uint8_t function);
+void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay);
+void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot);
+void HM10_Reset(void);
+void HM10_Discovery_Scan(void);
+void HM10_Read_LYWSD03(void);
+void HM10_Read_LYWSD02(void);
+void HM10_Time_LYWSD02(void);
+void HM10SerialInit(void);
+void HM10MACStringToBytes(const char* string, uint8_t _mac[]);
+void HM10ParseResponse(char *buf);
+void HM10readTempHum(char *_buf);
+bool HM10readBat(char *_buf);
+bool HM10SerialHandleFeedback();
+void HM10_TaskEvery100ms();
+void HM10EverySecond();
+bool HM10Cmd(void);
+void HM10Show(bool json);
+bool Xsns62(uint8_t function);
+bool begin();
+bool AHT10Read(void);
+unsigned char readStatus(void);
+void AHT10Detect(void);
+void AHT10EverySecond(void);
+void AHT10Show(bool json);
+bool Xsns64(uint8_t function);
+void HandleMetrics(void);
+bool Xsns91(uint8_t function);
+bool XsnsEnabled(uint32_t sns_index);
+void XsnsSensorState(void);
+bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index);
+bool XsnsCall(uint8_t Function);
+bool I2cEnabled(uint32_t i2c_index);
+void I2cDriverState(void);
+#line 184 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
+void setup(void)
+{
+  global_state.data = 3;
+
+  RtcRebootLoad();
+  if (!RtcRebootValid()) {
+    RtcReboot.fast_reboot_count = 0;
+  }
+  RtcReboot.fast_reboot_count++;
+  RtcRebootSave();
+
+  Serial.begin(APP_BAUDRATE);
+  seriallog_level = LOG_LEVEL_INFO;
+
+  snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);
+  if (VERSION & 0xff) {
+    snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
+  }
+
+  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
+
+  SettingsLoad();
+  SettingsDelta();
+
+  OsWatchInit();
+
+  GetFeatures();
+
+  if (1 == RtcReboot.fast_reboot_count) {
+    UpdateQuickPowerCycle(true);
+    XdrvCall(FUNC_SETTINGS_OVERRIDE);
+  }
+
+
+  seriallog_level = Settings.seriallog_level;
+  seriallog_timer = SERIALLOG_TIMER;
+  syslog_level = Settings.syslog_level;
+  stop_flash_rotate = Settings.flag.stop_flash_rotate;
+  save_data_counter = Settings.save_data;
+  sleep = Settings.sleep;
+#ifndef USE_EMULATION
+  Settings.flag2.emulation = 0;
+#else
+#ifndef USE_EMULATION_WEMO
+  if (EMUL_WEMO == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
+#endif
+#ifndef USE_EMULATION_HUE
+  if (EMUL_HUE == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
+#endif
+#endif
+
+  if (Settings.param[P_BOOT_LOOP_OFFSET]) {
+
+    if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET]) {
+      Settings.flag3.user_esp8285_enable = 0;
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +1) {
+        for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+          if (bitRead(Settings.rule_stop, i)) {
+            bitWrite(Settings.rule_enabled, i, 0);
+          }
+        }
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +2) {
+        Settings.rule_enabled = 0;
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +3) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          Settings.my_gp.io[i] = GPIO_NONE;
+        }
+        Settings.my_adc0 = ADC0_NONE;
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +4) {
+        Settings.module = SONOFF_BASIC;
+
+      }
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
+    }
+  }
+
+  Format(mqtt_client, SettingsText(SET_MQTT_CLIENT), sizeof(mqtt_client));
+  Format(mqtt_topic, SettingsText(SET_MQTT_TOPIC), sizeof(mqtt_topic));
+  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME), mqtt_topic, ESP.getChipId() & 0x1FFF);
+  } else {
+    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME));
+  }
+
+  GetEspHardwareType();
+  GpioInit();
+
+
+
+  WifiConnect();
+
+  SetPowerOnState();
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE), PROJECT, SettingsText(SET_FRIENDLYNAME1), my_version, my_image);
+#ifdef FIRMWARE_MINIMAL
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_WARNING_MINIMAL_VERSION));
+#endif
+
+  memcpy_P(log_data, VERSION_MARKER, 1);
+
+  RtcInit();
+
+#ifdef USE_ARDUINO_OTA
+  ArduinoOTAInit();
+#endif
+
+  XdrvCall(FUNC_INIT);
+  XsnsCall(FUNC_INIT);
+}
+
+void BacklogLoop(void)
+{
+  if (TimeReached(backlog_delay)) {
+    if (!BACKLOG_EMPTY && !backlog_mutex) {
+#ifdef SUPPORT_IF_STATEMENT
+      backlog_mutex = true;
+      String cmd = backlog.shift();
+      backlog_mutex = false;
+      ExecuteCommand((char*)cmd.c_str(), SRC_BACKLOG);
+#else
+      backlog_mutex = true;
+      ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
+      backlog_pointer++;
+      if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
+      backlog_mutex = false;
+#endif
+    }
+  }
+}
+
+void loop(void)
+{
+  uint32_t my_sleep = millis();
+
+  XdrvCall(FUNC_LOOP);
+  XsnsCall(FUNC_LOOP);
+
+  OsWatchLoop();
+
+  ButtonLoop();
+  SwitchLoop();
+#ifdef ROTARY_V1
+  RotaryLoop();
+#endif
+  BacklogLoop();
+
+  if (TimeReached(state_50msecond)) {
+    SetNextTimeInterval(state_50msecond, 50);
+    XdrvCall(FUNC_EVERY_50_MSECOND);
+    XsnsCall(FUNC_EVERY_50_MSECOND);
+  }
+  if (TimeReached(state_100msecond)) {
+    SetNextTimeInterval(state_100msecond, 100);
+    Every100mSeconds();
+    XdrvCall(FUNC_EVERY_100_MSECOND);
+    XsnsCall(FUNC_EVERY_100_MSECOND);
+  }
+  if (TimeReached(state_250msecond)) {
+    SetNextTimeInterval(state_250msecond, 250);
+    Every250mSeconds();
+    XdrvCall(FUNC_EVERY_250_MSECOND);
+    XsnsCall(FUNC_EVERY_250_MSECOND);
+  }
+  if (TimeReached(state_second)) {
+    SetNextTimeInterval(state_second, 1000);
+    PerformEverySecond();
+    XdrvCall(FUNC_EVERY_SECOND);
+    XsnsCall(FUNC_EVERY_SECOND);
+  }
+
+  if (!serial_local) { SerialInput(); }
+
+#ifdef USE_ARDUINO_OTA
+  ArduinoOtaLoop();
+#endif
+
+  uint32_t my_activity = millis() - my_sleep;
+
+  if (Settings.flag3.sleep_normal) {
+
+    delay(sleep);
+  } else {
+    if (my_activity < (uint32_t)sleep) {
+      delay((uint32_t)sleep - my_activity);
+    } else {
+      if (global_state.wifi_down) {
+        delay(my_activity /2);
+      }
+    }
+  }
+
+  if (!my_activity) { my_activity++; }
+  uint32_t loop_delay = sleep;
+  if (!loop_delay) { loop_delay++; }
+  uint32_t loops_per_second = 1000 / loop_delay;
+  uint32_t this_cycle_ratio = 100 * my_activity / loop_delay;
+  loop_load_avg = loop_load_avg - (loop_load_avg / loops_per_second) + (this_cycle_ratio / loops_per_second);
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/sendemail.ino"
+#ifdef USE_SENDMAIL
+
+#include "sendemail.h"
+# 25 "C:/shared/sonoff/Git/Tasmota/tasmota/sendemail.ino"
+#ifndef SEND_MAIL_MINRAM
+#define SEND_MAIL_MINRAM 12*1024
+#endif
+
+#define xPSTR(a) a
+
+uint16_t SendMail(char *buffer) {
+  char *params,*oparams;
+  const char *mserv;
+  uint16_t port;
+  const char *user;
+  const char *pstr;
+  const char *passwd;
+  const char *from;
+  const char *to;
+  const char *subject;
+  const char *cmd;
+  char auth=0;
+  uint16_t status=1;
+  SendEmail *mail=0;
+  uint16_t blen;
+  char *endcmd;
+
+
+
+  uint16_t mem=ESP.getFreeHeap();
+  if (mem<SEND_MAIL_MINRAM) {
+    return 4;
+  }
+
+  while (*buffer==' ') buffer++;
+
+  if (*buffer!='[') {
+      goto exit;
+  }
+
+  buffer++;
+
+  endcmd=strchr(buffer,']');
+  if (!endcmd) {
+    goto exit;
+  }
+
+
+  blen=(uint32_t)endcmd-(uint32_t)buffer;
+  oparams=(char*)calloc(blen+2,1);
+  if (!oparams) return 4;
+  params=oparams;
+  strncpy(oparams,buffer,blen+2);
+  oparams[blen]=0;
+
+  cmd=endcmd+1;
+
+  #ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("mailsize: %d"),blen);
+  #endif
+
+  mserv=strtok(params,":");
+  if (!mserv) {
+      goto exit;
+  }
+
+
+  pstr=strtok(NULL,":");
+  if (!pstr) {
+      goto exit;
+  }
+
+#ifdef EMAIL_PORT
+  if (*pstr=='*') {
+    port=EMAIL_PORT;
+  } else {
+    port=atoi(pstr);
+  }
+#else
+  port=atoi(pstr);
+#endif
+
+  user=strtok(NULL,":");
+  if (!user) {
+      goto exit;
+  }
+
+  passwd=strtok(NULL,":");
+  if (!passwd) {
+      goto exit;
+  }
+
+  from=strtok(NULL,":");
+  if (!from) {
+      goto exit;
+  }
+
+  to=strtok(NULL,":");
+  if (!to) {
+      goto exit;
+  }
+
+  subject=strtok(NULL,"]");
+  if (!subject) {
+      goto exit;
+  }
+
+
+#ifdef EMAIL_USER
+  if (*user=='*') {
+    user=xPSTR(EMAIL_USER);
+  }
+#endif
+#ifdef EMAIL_PASSWORD
+  if (*passwd=='*') {
+    passwd=xPSTR(EMAIL_PASSWORD);
+  }
+#endif
+#ifdef EMAIL_SERVER
+  if (*mserv=='*') {
+    mserv=xPSTR(EMAIL_SERVER);
+  }
+#endif
+
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %d - %s - %s"),mserv,port,user,passwd);
+#endif
+
+
+#ifndef MAIL_TIMEOUT
+  #define MAIL_TIMEOUT 2000
+#endif
+  mail = new SendEmail(mserv,port,user,passwd, MAIL_TIMEOUT, auth);
+
+#ifdef EMAIL_FROM
+  if (*from=='*') {
+    from=xPSTR(EMAIL_FROM);
+  }
+#endif
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %s - %s - %s"),from,to,subject,cmd);
+#endif
+
+  if (mail) {
+    bool result=mail->send(from,to,subject,cmd);
+    delete mail;
+    if (result==true) status=0;
+  }
+
+exit:
+  if (oparams) free(oparams);
+  return status;
+}
+
+void script_send_email_body(BearSSL::WiFiClientSecure_light *client);
+
+
+SendEmail::SendEmail(const String& host, const int port, const String& user, const String& passwd, const int timeout, const int auth_used) :
+    host(host), port(port), user(user), passwd(passwd), timeout(timeout), ssl(ssl), auth_used(auth_used), client(new BearSSL::WiFiClientSecure_light(1024,1024)) {
+}
+
+String SendEmail::readClient() {
+  delay(0);
+  String r = client->readStringUntil('\n');
+
+  r.trim();
+  while (client->available()) {
+    delay(0);
+    r += client->readString();
+  }
+  return r;
+}
+
+bool SendEmail::send(const String& from, const String& to, const String& subject, const char *msg) {
+bool status=false;
+String buffer;
+
+  if (!host.length()) {
+    return status;
+  }
+
+  client->setTimeout(timeout);
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("Connecting: %s on port %d"),host.c_str(),port);
+#endif
+
+  if (!client->connect(host.c_str(), port)) {
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P(LOG_LEVEL_INFO, PSTR("Connection failed"));
+#endif
+    goto exit;
+  }
+
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("220"))) {
+    goto exit;
+  }
+
+  buffer = F("EHLO ");
+  buffer += client->localIP().toString();
+
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+  if (user.length()>0 && passwd.length()>0 ) {
+
+    buffer = F("AUTH LOGIN");
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("334")))
+    {
+      goto exit;
+    }
+    base64 b;
+    buffer = b.encode(user);
+
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("334"))) {
+      goto exit;
+    }
+    buffer = b.encode(passwd);
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("235"))) {
+      goto exit;
+    }
+  }
+
+
+  buffer = F("MAIL FROM:");
+  buffer += from;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+  buffer = F("RCPT TO:");
+  buffer += to;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+
+  buffer = F("DATA");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("354"))) {
+    goto exit;
+  }
+  buffer = F("From: ");
+  buffer += from;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = F("To: ");
+  buffer += to;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = F("Subject: ");
+  buffer += subject;
+  buffer += F("\r\n");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+#ifdef USE_SCRIPT
+  if (*msg=='*' && *(msg+1)==0) {
+    script_send_email_body(client);
+  } else {
+    client->println(msg);
+  }
+#else
+  client->println(msg);
+#endif
+  client->println('.');
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+  buffer = F("QUIT");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+  status=true;
+exit:
+
+  return status;
+}
+
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+#ifndef DOMOTICZ_UPDATE_TIMER
+#define DOMOTICZ_UPDATE_TIMER 0
+#endif
+
+#ifndef EMULATION
+#define EMULATION EMUL_NONE
+#endif
+
+#ifndef MTX_ADDRESS1
+#define MTX_ADDRESS1 0
+#endif
+#ifndef MTX_ADDRESS2
+#define MTX_ADDRESS2 0
+#endif
+#ifndef MTX_ADDRESS3
+#define MTX_ADDRESS3 0
+#endif
+#ifndef MTX_ADDRESS4
+#define MTX_ADDRESS4 0
+#endif
+#ifndef MTX_ADDRESS5
+#define MTX_ADDRESS5 0
+#endif
+#ifndef MTX_ADDRESS6
+#define MTX_ADDRESS6 0
+#endif
+#ifndef MTX_ADDRESS7
+#define MTX_ADDRESS7 0
+#endif
+#ifndef MTX_ADDRESS8
+#define MTX_ADDRESS8 0
+#endif
+
+#ifndef HOME_ASSISTANT_DISCOVERY_ENABLE
+#define HOME_ASSISTANT_DISCOVERY_ENABLE 0
+#endif
+
+#ifndef LATITUDE
+#define LATITUDE 48.858360
+#endif
+#ifndef LONGITUDE
+#define LONGITUDE 2.294442
+#endif
+
+#ifndef WORKING_PERIOD
+#define WORKING_PERIOD 5
+#endif
+
+#ifndef COLOR_TEXT
+#define COLOR_TEXT "#000"
+#endif
+#ifndef COLOR_BACKGROUND
+#define COLOR_BACKGROUND "#fff"
+#endif
+#ifndef COLOR_FORM
+#define COLOR_FORM "#f2f2f2"
+#endif
+#ifndef COLOR_INPUT_TEXT
+#define COLOR_INPUT_TEXT "#000"
+#endif
+#ifndef COLOR_INPUT
+#define COLOR_INPUT "#fff"
+#endif
+#ifndef COLOR_CONSOLE_TEXT
+#define COLOR_CONSOLE_TEXT "#000"
+#endif
+#ifndef COLOR_CONSOLE
+#define COLOR_CONSOLE "#fff"
+#endif
+#ifndef COLOR_TEXT_WARNING
+#define COLOR_TEXT_WARNING "#f00"
+#endif
+#ifndef COLOR_TEXT_SUCCESS
+#define COLOR_TEXT_SUCCESS "#008000"
+#endif
+#ifndef COLOR_BUTTON_TEXT
+#define COLOR_BUTTON_TEXT "#fff"
+#endif
+#ifndef COLOR_BUTTON
+#define COLOR_BUTTON "#1fa3ec"
+#endif
+#ifndef COLOR_BUTTON_HOVER
+#define COLOR_BUTTON_HOVER "#0e70a4"
+#endif
+#ifndef COLOR_BUTTON_RESET
+#define COLOR_BUTTON_RESET "#d43535"
+#endif
+#ifndef COLOR_BUTTON_RESET_HOVER
+#define COLOR_BUTTON_RESET_HOVER "#931f1f"
+#endif
+#ifndef COLOR_BUTTON_SAVE
+#define COLOR_BUTTON_SAVE "#47c266"
+#endif
+#ifndef COLOR_BUTTON_SAVE_HOVER
+#define COLOR_BUTTON_SAVE_HOVER "#5aaf6f"
+#endif
+#ifndef COLOR_TIMER_TAB_TEXT
+#define COLOR_TIMER_TAB_TEXT "#fff"
+#endif
+#ifndef COLOR_TIMER_TAB_BACKGROUND
+#define COLOR_TIMER_TAB_BACKGROUND "#999"
+#endif
+#ifndef COLOR_TITLE_TEXT
+#define COLOR_TITLE_TEXT COLOR_TEXT
+#endif
+#ifndef IR_RCV_MIN_UNKNOWN_SIZE
+#define IR_RCV_MIN_UNKNOWN_SIZE 6
+#endif
+#ifndef ENERGY_OVERTEMP
+#define ENERGY_OVERTEMP 90
+#endif
+#ifndef DEFAULT_DIMMER_MAX
+#define DEFAULT_DIMMER_MAX 100
+#endif
+#ifndef DEFAULT_DIMMER_MIN
+#define DEFAULT_DIMMER_MIN 0
+#endif
+#ifndef DEFAULT_LIGHT_DIMMER
+#define DEFAULT_LIGHT_DIMMER 10
+#endif
+#ifndef DEFAULT_LIGHT_COMPONENT
+#define DEFAULT_LIGHT_COMPONENT 255
+#endif
+#ifndef CORS_ENABLED_ALL
+#define CORS_ENABLED_ALL "*"
+#endif
+
+
+enum WebColors {
+  COL_TEXT, COL_BACKGROUND, COL_FORM,
+  COL_INPUT_TEXT, COL_INPUT, COL_CONSOLE_TEXT, COL_CONSOLE,
+  COL_TEXT_WARNING, COL_TEXT_SUCCESS,
+  COL_BUTTON_TEXT, COL_BUTTON, COL_BUTTON_HOVER, COL_BUTTON_RESET, COL_BUTTON_RESET_HOVER, COL_BUTTON_SAVE, COL_BUTTON_SAVE_HOVER,
+  COL_TIMER_TAB_TEXT, COL_TIMER_TAB_BACKGROUND, COL_TITLE,
+  COL_LAST };
+
+const char kWebColors[] PROGMEM =
+  COLOR_TEXT "|" COLOR_BACKGROUND "|" COLOR_FORM "|"
+  COLOR_INPUT_TEXT "|" COLOR_INPUT "|" COLOR_CONSOLE_TEXT "|" COLOR_CONSOLE "|"
+  COLOR_TEXT_WARNING "|" COLOR_TEXT_SUCCESS "|"
+  COLOR_BUTTON_TEXT "|" COLOR_BUTTON "|" COLOR_BUTTON_HOVER "|" COLOR_BUTTON_RESET "|" COLOR_BUTTON_RESET_HOVER "|" COLOR_BUTTON_SAVE "|" COLOR_BUTTON_SAVE_HOVER "|"
+  COLOR_TIMER_TAB_TEXT "|" COLOR_TIMER_TAB_BACKGROUND "|" COLOR_TITLE_TEXT;
+
+enum TasmotaSerialConfig {
+  TS_SERIAL_5N1, TS_SERIAL_6N1, TS_SERIAL_7N1, TS_SERIAL_8N1,
+  TS_SERIAL_5N2, TS_SERIAL_6N2, TS_SERIAL_7N2, TS_SERIAL_8N2,
+  TS_SERIAL_5E1, TS_SERIAL_6E1, TS_SERIAL_7E1, TS_SERIAL_8E1,
+  TS_SERIAL_5E2, TS_SERIAL_6E2, TS_SERIAL_7E2, TS_SERIAL_8E2,
+  TS_SERIAL_5O1, TS_SERIAL_6O1, TS_SERIAL_7O1, TS_SERIAL_8O1,
+  TS_SERIAL_5O2, TS_SERIAL_6O2, TS_SERIAL_7O2, TS_SERIAL_8O2 };
+
+const uint8_t kTasmotaSerialConfig[] PROGMEM = {
+  SERIAL_5N1, SERIAL_6N1, SERIAL_7N1, SERIAL_8N1,
+  SERIAL_5N2, SERIAL_6N2, SERIAL_7N2, SERIAL_8N2,
+  SERIAL_5E1, SERIAL_6E1, SERIAL_7E1, SERIAL_8E1,
+  SERIAL_5E2, SERIAL_6E2, SERIAL_7E2, SERIAL_8E2,
+  SERIAL_5O1, SERIAL_6O1, SERIAL_7O1, SERIAL_8O1,
+  SERIAL_5O2, SERIAL_6O2, SERIAL_7O2, SERIAL_8O2
+};
+
+
+
+
+
+const uint16_t RTC_MEM_VALID = 0xA55A;
+
+uint32_t rtc_settings_crc = 0;
+
+uint32_t GetRtcSettingsCrc(void)
+{
+  uint32_t crc = 0;
+  uint8_t *bytes = (uint8_t*)&RtcSettings;
+
+  for (uint32_t i = 0; i < sizeof(RTCMEM); i++) {
+    crc += bytes[i]*(i+1);
+  }
+  return crc;
+}
+
+void RtcSettingsSave(void)
+{
+  if (GetRtcSettingsCrc() != rtc_settings_crc) {
+    RtcSettings.valid = RTC_MEM_VALID;
+    ESP.rtcUserMemoryWrite(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
+    rtc_settings_crc = GetRtcSettingsCrc();
+  }
+}
+
+void RtcSettingsLoad(void)
+{
+  ESP.rtcUserMemoryRead(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
+  if (RtcSettings.valid != RTC_MEM_VALID) {
+    memset(&RtcSettings, 0, sizeof(RTCMEM));
+    RtcSettings.valid = RTC_MEM_VALID;
+    RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
+    RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
+    RtcSettings.energy_usage = Settings.energy_usage;
+    for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+      RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
+    }
+    RtcSettings.power = Settings.power;
+    RtcSettingsSave();
+  }
+  rtc_settings_crc = GetRtcSettingsCrc();
+}
+
+bool RtcSettingsValid(void)
+{
+  return (RTC_MEM_VALID == RtcSettings.valid);
+}
+
+
+
+uint32_t rtc_reboot_crc = 0;
+
+uint32_t GetRtcRebootCrc(void)
+{
+  uint32_t crc = 0;
+  uint8_t *bytes = (uint8_t*)&RtcReboot;
+
+  for (uint32_t i = 0; i < sizeof(RTCRBT); i++) {
+    crc += bytes[i]*(i+1);
+  }
+  return crc;
+}
+
+void RtcRebootSave(void)
+{
+  if (GetRtcRebootCrc() != rtc_reboot_crc) {
+    RtcReboot.valid = RTC_MEM_VALID;
+    ESP.rtcUserMemoryWrite(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
+    rtc_reboot_crc = GetRtcRebootCrc();
+  }
+}
+
+void RtcRebootReset(void)
+{
+  RtcReboot.fast_reboot_count = 0;
+  RtcRebootSave();
+}
+
+void RtcRebootLoad(void)
+{
+  ESP.rtcUserMemoryRead(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
+  if (RtcReboot.valid != RTC_MEM_VALID) {
+    memset(&RtcReboot, 0, sizeof(RTCRBT));
+    RtcReboot.valid = RTC_MEM_VALID;
+
+    RtcRebootSave();
+  }
+  rtc_reboot_crc = GetRtcRebootCrc();
+}
+
+bool RtcRebootValid(void)
+{
+  return (RTC_MEM_VALID == RtcReboot.valid);
+}
+
+
+
+
+
+extern "C" {
+#include "spi_flash.h"
+}
+#include "eboot_command.h"
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+
+extern "C" uint32_t _SPIFFS_end;
+
+const uint32_t SPIFFS_END = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#else
+
+#if AUTOFLASHSIZE
+
+#include "flash_hal.h"
+
+
+const uint32_t SPIFFS_END = (FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#else
+
+extern "C" uint32_t _FS_end;
+
+const uint32_t SPIFFS_END = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#endif
+
+#endif
+
+
+const uint32_t SETTINGS_LOCATION = SPIFFS_END;
+
+const uint8_t CFG_ROTATES = 8;
+
+uint32_t settings_location = SETTINGS_LOCATION;
+uint32_t settings_crc32 = 0;
+uint8_t *settings_buffer = nullptr;
+
+
+
+
+
+void SetFlashModeDout(void)
+{
+  uint8_t *_buffer;
+  uint32_t address;
+
+  eboot_command ebcmd;
+  eboot_command_read(&ebcmd);
+  address = ebcmd.args[0];
+  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
+
+  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
+    if (_buffer[2] != 3) {
+      _buffer[2] = 3;
+      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
+        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
+      }
+    }
+  }
+  delete[] _buffer;
+}
+
+bool VersionCompatible(void)
+{
+  if (Settings.flag3.compatibility_check) {
+    return true;
+  }
+
+  eboot_command ebcmd;
+  eboot_command_read(&ebcmd);
+  uint32_t start_address = ebcmd.args[0];
+  uint32_t end_address = start_address + (ebcmd.args[2] & 0xFFFFF000) + FLASH_SECTOR_SIZE;
+  uint32_t* buffer = new uint32_t[FLASH_SECTOR_SIZE / 4];
+
+  uint32_t version[3] = { 0 };
+  bool found = false;
+  for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
+    ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
+    if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
+      version[1] = 0xFFFFFFFF;
+      found = true;
+    } else {
+      for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
+        version[0] = version[1];
+        version[1] = version[2];
+        version[2] = buffer[i];
+        if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
+          found = true;
+          break;
+        }
+      }
+    }
+    if (found) { break; }
+  }
+  delete[] buffer;
+
+  if (!found) { version[1] = 0; }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
+
+  if (version[1] < VERSION_COMPATIBLE) {
+    uint32_t eboot_magic = 0;
+    ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
+    return false;
+  }
+
+  return true;
+}
+
+void SettingsBufferFree(void)
+{
+  if (settings_buffer != nullptr) {
+    free(settings_buffer);
+    settings_buffer = nullptr;
+  }
+}
+
+bool SettingsBufferAlloc(void)
+{
+  SettingsBufferFree();
+  if (!(settings_buffer = (uint8_t *)malloc(sizeof(Settings)))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_UPLOAD_ERR_2));
+    return false;
+  }
+  return true;
+}
+
+uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size)
+{
+  uint16_t crc = 0;
+
+  for (uint32_t i = 0; i < size; i++) {
+    if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); }
+  }
+  return crc;
+}
+
+uint16_t GetSettingsCrc(void)
+{
+
+  uint32_t size = ((Settings.version < 0x06060007) || (Settings.version > 0x0606000A)) ? 3584 : sizeof(SYSCFG);
+  return GetCfgCrc16((uint8_t*)&Settings, size);
+}
+
+uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size)
+{
+
+  uint32_t crc = 0;
+
+  while (size--) {
+    crc ^= *bytes++;
+    for (uint32_t j = 0; j < 8; j++) {
+      crc = (crc >> 1) ^ (-int(crc & 1) & 0xEDB88320);
+    }
+  }
+  return ~crc;
+}
+
+uint32_t GetSettingsCrc32(void)
+{
+  return GetCfgCrc32((uint8_t*)&Settings, sizeof(SYSCFG) -4);
+}
+
+void SettingsSaveAll(void)
+{
+  if (Settings.flag.save_state) {
+    Settings.power = power;
+  } else {
+    Settings.power = 0;
+  }
+  XsnsCall(FUNC_SAVE_BEFORE_RESTART);
+  XdrvCall(FUNC_SAVE_BEFORE_RESTART);
+  SettingsSave(0);
+}
+
+
+
+
+
+void UpdateQuickPowerCycle(bool update)
+{
+  if (Settings.flag3.fast_power_cycle_disable) { return; }
+
+  uint32_t pc_register;
+  uint32_t pc_location = SETTINGS_LOCATION - CFG_ROTATES;
+
+  ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+  if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
+    uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
+    if (0 == counter) {
+      SettingsErase(3);
+      EspRestart();
+    } else {
+      pc_register = 0xFFA55AB0 | counter;
+      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
+    }
+  }
+  else if (pc_register != 0xFFA55ABF) {
+    pc_register = 0xFFA55ABF;
+
+    if (ESP.flashEraseSector(pc_location)) {
+      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
+  }
+}
+
+
+
+
+
+uint32_t GetSettingsTextLen(void)
+{
+  char* position = Settings.text_pool;
+  for (uint32_t size = 0; size < SET_MAX; size++) {
+    while (*position++ != '\0') { }
+  }
+  return position - Settings.text_pool;
+}
+
+bool SettingsUpdateText(uint32_t index, const char* replace_me)
+{
+  if (index >= SET_MAX) {
+    return false;
+  }
+
+
+  uint32_t replace_len = strlen(replace_me);
+  char replace[replace_len +1];
+  memcpy(replace, replace_me, sizeof(replace));
+
+  uint32_t start_pos = 0;
+  uint32_t end_pos = 0;
+  char* position = Settings.text_pool;
+  for (uint32_t size = 0; size < SET_MAX; size++) {
+    while (*position++ != '\0') { }
+    if (1 == index) {
+      start_pos = position - Settings.text_pool;
+    }
+    else if (0 == index) {
+      end_pos = position - Settings.text_pool -1;
+    }
+    index--;
+  }
+  uint32_t char_len = position - Settings.text_pool;
+
+  uint32_t current_len = end_pos - start_pos;
+  int diff = replace_len - current_len;
+
+
+
+
+  int too_long = (char_len + diff) - settings_text_size;
+  if (too_long > 0) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_CONFIG "Text overflow by %d char(s)"), too_long);
+    return false;
+  }
+
+  if (diff != 0) {
+
+    memmove_P(Settings.text_pool + start_pos + replace_len, Settings.text_pool + end_pos, char_len - end_pos);
+  }
+
+  memmove_P(Settings.text_pool + start_pos, replace, replace_len);
+
+  memset(Settings.text_pool + char_len + diff, 0x00, settings_text_size - char_len - diff);
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "CR %d/%d"), GetSettingsTextLen(), settings_text_size);
+
+  return true;
+}
+
+char* SettingsText(uint32_t index)
+{
+  char* position = Settings.text_pool;
+
+  if (index >= SET_MAX) {
+    position += settings_text_size -1;
+  } else {
+    for (;index > 0; index--) {
+      while (*position++ != '\0') { }
+    }
+  }
+  return position;
+}
+
+
+
+
+
+uint32_t GetSettingsAddress(void)
+{
+  return settings_location * SPI_FLASH_SEC_SIZE;
+}
+
+void SettingsSave(uint8_t rotate)
+{
+# 590 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+#ifndef FIRMWARE_MINIMAL
+  if ((GetSettingsCrc32() != settings_crc32) || rotate) {
+    if (1 == rotate) {
+      stop_flash_rotate = 1;
+    }
+    if (2 == rotate) {
+      settings_location = SETTINGS_LOCATION +1;
+    }
+    if (stop_flash_rotate) {
+      settings_location = SETTINGS_LOCATION;
+    } else {
+      settings_location--;
+      if (settings_location <= (SETTINGS_LOCATION - CFG_ROTATES)) {
+        settings_location = SETTINGS_LOCATION;
+      }
+    }
+
+    Settings.save_flag++;
+    if (UtcTime() > START_VALID_TIME) {
+      Settings.cfg_timestamp = UtcTime();
+    } else {
+      Settings.cfg_timestamp++;
+    }
+    Settings.cfg_size = sizeof(SYSCFG);
+    Settings.cfg_crc = GetSettingsCrc();
+    Settings.cfg_crc32 = GetSettingsCrc32();
+
+    if (ESP.flashEraseSector(settings_location)) {
+      ESP.flashWrite(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+    }
+
+    if (!stop_flash_rotate && rotate) {
+      for (uint32_t i = 1; i < CFG_ROTATES; i++) {
+        ESP.flashEraseSector(settings_location -i);
+        delay(1);
+      }
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG D_SAVED_TO_FLASH_AT " %X, " D_COUNT " %d, " D_BYTES " %d"), settings_location, Settings.save_flag, sizeof(SYSCFG));
+
+    settings_crc32 = Settings.cfg_crc32;
+  }
+#endif
+  RtcSettingsSave();
+}
+
+void SettingsLoad(void)
+{
+
+  struct SYSCFGH {
+    uint16_t cfg_holder;
+    uint16_t cfg_size;
+    unsigned long save_flag;
+  } _SettingsH;
+  unsigned long save_flag = 0;
+
+  settings_location = 0;
+  uint32_t flash_location = SETTINGS_LOCATION +1;
+  uint16_t cfg_holder = 0;
+  for (uint32_t i = 0; i < CFG_ROTATES; i++) {
+    flash_location--;
+    ESP.flashRead(flash_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+
+    bool valid = false;
+    if (Settings.version > 0x06000000) {
+      bool almost_valid = (Settings.cfg_crc32 == GetSettingsCrc32());
+      if (Settings.version < 0x0606000B) {
+        almost_valid = (Settings.cfg_crc == GetSettingsCrc());
+      }
+
+      if (almost_valid && (0 == cfg_holder)) { cfg_holder = Settings.cfg_holder; }
+      valid = (cfg_holder == Settings.cfg_holder);
+    } else {
+      ESP.flashRead((flash_location -1) * SPI_FLASH_SEC_SIZE, (uint32*)&_SettingsH, sizeof(SYSCFGH));
+      valid = (Settings.cfg_holder == _SettingsH.cfg_holder);
+    }
+    if (valid) {
+      if (Settings.save_flag > save_flag) {
+        save_flag = Settings.save_flag;
+        settings_location = flash_location;
+        if (Settings.flag.stop_flash_rotate && (0 == i)) {
+          break;
+        }
+      }
+    }
+
+    delay(1);
+  }
+  if (settings_location > 0) {
+    ESP.flashRead(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+    AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %lu"), settings_location, Settings.save_flag);
+  }
+
+#ifndef FIRMWARE_MINIMAL
+  if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) {
+    SettingsDefault();
+  }
+  settings_crc32 = GetSettingsCrc32();
+#endif
+
+  RtcSettingsLoad();
+}
+
+void EspErase(uint32_t start_sector, uint32_t end_sector)
+{
+  bool serial_output = (LOG_LEVEL_DEBUG_MORE <= seriallog_level);
+  for (uint32_t sector = start_sector; sector < end_sector; sector++) {
+
+    bool result = ESP.flashEraseSector(sector);
+
+
+
+    if (serial_output) {
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+      Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
+#else
+      Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
+#endif
+      delay(10);
+    } else {
+      yield();
+    }
+    OsWatchLoop();
+  }
+}
+
+void SettingsErase(uint8_t type)
+{
+# 733 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+#ifndef FIRMWARE_MINIMAL
+  uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
+  uint32_t _sectorEnd = ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE;
+  if (1 == type) {
+
+    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;
+  }
+  else if (2 == type) {
+    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
+    _sectorEnd = SETTINGS_LOCATION +1;
+  }
+  else if (3 == type) {
+    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
+    _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " %d " D_UNIT_SECTORS), _sectorEnd - _sectorStart);
+
+
+  EsptoolErase(_sectorStart, _sectorEnd);
+#endif
+}
+
+void SettingsSdkErase(void)
+{
+  WiFi.disconnect(true);
+  SettingsErase(1);
+  delay(1000);
+}
+
+
+
+void SettingsDefault(void)
+{
+  AddLog_P(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_USE_DEFAULTS));
+  SettingsDefaultSet1();
+  SettingsDefaultSet2();
+  SettingsSave(2);
+}
+
+void SettingsDefaultSet1(void)
+{
+  memset(&Settings, 0x00, sizeof(SYSCFG));
+
+  Settings.cfg_holder = (uint16_t)CFG_HOLDER;
+  Settings.cfg_size = sizeof(SYSCFG);
+
+  Settings.version = VERSION;
+
+
+}
+
+void SettingsDefaultSet2(void)
+{
+  memset((char*)&Settings +16, 0x00, sizeof(SYSCFG) -16);
+
+  Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
+  Settings.flag.global_state = APP_ENABLE_LEDLINK;
+  Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
+  Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
+  Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
+  Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
+  Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
+  Settings.save_data = SAVE_DATA;
+  Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
+  Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+  Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
+  Settings.sleep = APP_SLEEP;
+  if (Settings.sleep < 50) {
+    Settings.sleep = 50;
+  }
+
+
+
+  Settings.interlock[0] = 0xFF;
+  Settings.module = MODULE;
+  ModuleDefault(WEMOS);
+
+  SettingsUpdateText(SET_FRIENDLYNAME1, FRIENDLY_NAME);
+  SettingsUpdateText(SET_FRIENDLYNAME2, FRIENDLY_NAME"2");
+  SettingsUpdateText(SET_FRIENDLYNAME3, FRIENDLY_NAME"3");
+  SettingsUpdateText(SET_FRIENDLYNAME4, FRIENDLY_NAME"4");
+  SettingsUpdateText(SET_OTAURL, OTA_URL);
+
+
+  Settings.flag.save_state = SAVE_STATE;
+  Settings.power = APP_POWER;
+  Settings.poweronstate = APP_POWERON_STATE;
+  Settings.blinktime = APP_BLINKTIME;
+  Settings.blinkcount = APP_BLINKCOUNT;
+  Settings.ledstate = APP_LEDSTATE;
+  Settings.ledmask = APP_LEDMASK;
+  Settings.pulse_timer[0] = APP_PULSETIME;
+
+
+
+  Settings.serial_config = TS_SERIAL_8N1;
+  Settings.baudrate = APP_BAUDRATE / 300;
+  Settings.sbaudrate = SOFT_BAUDRATE / 300;
+  Settings.serial_delimiter = 0xff;
+  Settings.seriallog_level = SERIAL_LOG_LEVEL;
+
+
+  Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
+  Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
+  Settings.wifi_output_power = 170;
+  ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
+  ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
+  ParseIp(&Settings.ip_address[2], WIFI_SUBNETMASK);
+  ParseIp(&Settings.ip_address[3], WIFI_DNS);
+  Settings.sta_config = WIFI_CONFIG_TOOL;
+
+  SettingsUpdateText(SET_STASSID1, STA_SSID1);
+  SettingsUpdateText(SET_STASSID2, STA_SSID2);
+  SettingsUpdateText(SET_STAPWD1, STA_PASS1);
+  SettingsUpdateText(SET_STAPWD2, STA_PASS2);
+  SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+
+
+  SettingsUpdateText(SET_SYSLOG_HOST, SYS_LOG_HOST);
+  Settings.syslog_port = SYS_LOG_PORT;
+  Settings.syslog_level = SYS_LOG_LEVEL;
+
+
+  Settings.flag2.emulation = EMULATION;
+  Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
+  Settings.flag3.mdns_enabled = MDNS_ENABLED;
+  Settings.webserver = WEB_SERVER;
+  Settings.weblog_level = WEB_LOG_LEVEL;
+  SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
+  SettingsUpdateText(SET_CORS, CORS_DOMAIN);
+
+
+  Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
+  Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
+  Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
+  Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME;
+
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) { Settings.switchmode[i] = SWITCH_MODE; }
+
+
+  Settings.flag.mqtt_enabled = MQTT_USE;
+  Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
+  Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
+  Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
+  Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
+  Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
+  Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
+
+  Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
+  Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
+  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
+  Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
+  Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
+  Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
+  SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
+  Settings.mqtt_port = MQTT_PORT;
+  SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
+  SettingsUpdateText(SET_MQTT_USER, MQTT_USER);
+  SettingsUpdateText(SET_MQTT_PWD, MQTT_PASS);
+  SettingsUpdateText(SET_MQTT_TOPIC, MQTT_TOPIC);
+  SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC);
+  SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC);
+  SettingsUpdateText(SET_MQTT_GRP_TOPIC, MQTT_GRPTOPIC);
+  SettingsUpdateText(SET_MQTT_FULLTOPIC, MQTT_FULLTOPIC);
+  Settings.mqtt_retry = MQTT_RETRY_SECS;
+  SettingsUpdateText(SET_MQTTPREFIX1, SUB_PREFIX);
+  SettingsUpdateText(SET_MQTTPREFIX2, PUB_PREFIX);
+  SettingsUpdateText(SET_MQTTPREFIX3, PUB_PREFIX2);
+  SettingsUpdateText(SET_STATE_TXT1, MQTT_STATUS_OFF);
+  SettingsUpdateText(SET_STATE_TXT2, MQTT_STATUS_ON);
+  SettingsUpdateText(SET_STATE_TXT3, MQTT_CMND_TOGGLE);
+  SettingsUpdateText(SET_STATE_TXT4, MQTT_CMND_HOLD);
+  char fingerprint[60];
+  strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint));
+  char *p = fingerprint;
+  for (uint32_t i = 0; i < 20; i++) {
+    Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
+  }
+  strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint));
+  p = fingerprint;
+  for (uint32_t i = 0; i < 20; i++) {
+    Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16);
+  }
+  Settings.tele_period = TELE_PERIOD;
+  Settings.mqttlog_level = MQTT_LOG_LEVEL;
+
+
+  Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
+  Settings.flag2.current_resolution = 3;
+
+
+  Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
+  Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
+  Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
+  Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
+
+  Settings.energy_power_calibration = HLW_PREF_PULSE;
+  Settings.energy_voltage_calibration = HLW_UREF_PULSE;
+  Settings.energy_current_calibration = HLW_IREF_PULSE;
+# 944 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+  Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
+  Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
+
+  Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
+  Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
+
+
+
+  RtcSettings.energy_kWhtotal = 0;
+
+  memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
+  Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
+
+
+  Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
+  Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
+  Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
+
+
+  Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
+
+  memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
+
+
+  Settings.domoticz_update_timer = DOMOTICZ_UPDATE_TIMER;
+# 979 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+  Settings.flag.temperature_conversion = TEMP_CONVERSION;
+  Settings.flag.pressure_conversion = PRESSURE_CONVERSION;
+  Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
+  Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
+  Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
+  Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
+  Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
+
+
+
+
+
+
+  Settings.flag2.calc_resolution = CALC_RESOLUTION;
+
+
+  Settings.flag3.timers_enable = TIMERS_ENABLED;
+
+
+  Settings.flag.hass_light = HASS_AS_LIGHT;
+  Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
+  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
+
+
+  Settings.flag.knx_enabled = KNX_ENABLED;
+  Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
+
+
+  Settings.flag.pwm_control = LIGHT_MODE;
+  Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
+  Settings.flag.light_signal = LIGHT_PAIRS_CO2;
+  Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
+  Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
+  Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
+  Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
+  Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
+
+  Settings.pwm_frequency = PWM_FREQ;
+  Settings.pwm_range = PWM_RANGE;
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    Settings.light_color[i] = DEFAULT_LIGHT_COMPONENT;
+
+  }
+  Settings.light_correction = 1;
+  Settings.light_dimmer = DEFAULT_LIGHT_DIMMER;
+
+  Settings.light_speed = 1;
+
+  Settings.light_width = 1;
+
+  Settings.light_pixels = WS2812_LEDS;
+
+  Settings.ws_width[WS_SECOND] = 1;
+  Settings.ws_color[WS_SECOND][WS_RED] = 255;
+
+  Settings.ws_color[WS_SECOND][WS_BLUE] = 255;
+  Settings.ws_width[WS_MINUTE] = 3;
+
+  Settings.ws_color[WS_MINUTE][WS_GREEN] = 255;
+
+  Settings.ws_width[WS_HOUR] = 5;
+  Settings.ws_color[WS_HOUR][WS_RED] = 255;
+
+
+
+  Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
+  Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
+
+
+
+  Settings.display_mode = 1;
+  Settings.display_refresh = 2;
+  Settings.display_rows = 2;
+  Settings.display_cols[0] = 16;
+  Settings.display_cols[1] = 8;
+  Settings.display_dimmer = 1;
+  Settings.display_size = 1;
+  Settings.display_font = 1;
+
+  Settings.display_address[0] = MTX_ADDRESS1;
+  Settings.display_address[1] = MTX_ADDRESS2;
+  Settings.display_address[2] = MTX_ADDRESS3;
+  Settings.display_address[3] = MTX_ADDRESS4;
+  Settings.display_address[4] = MTX_ADDRESS5;
+  Settings.display_address[5] = MTX_ADDRESS6;
+  Settings.display_address[6] = MTX_ADDRESS7;
+  Settings.display_address[7] = MTX_ADDRESS8;
+
+
+  if (((APP_TIMEZONE > -14) && (APP_TIMEZONE < 15)) || (99 == APP_TIMEZONE)) {
+    Settings.timezone = APP_TIMEZONE;
+    Settings.timezone_minutes = 0;
+  } else {
+    Settings.timezone = APP_TIMEZONE / 60;
+    Settings.timezone_minutes = abs(APP_TIMEZONE % 60);
+  }
+  SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
+  SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
+  SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
+  for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
+    SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
+  }
+  Settings.latitude = (int)((double)LATITUDE * 1000000);
+  Settings.longitude = (int)((double)LONGITUDE * 1000000);
+  SettingsResetStd();
+  SettingsResetDst();
+
+  Settings.button_debounce = KEY_DEBOUNCE_TIME;
+  Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
+
+  for (uint32_t j = 0; j < 5; j++) {
+    Settings.rgbwwTable[j] = 255;
+  }
+
+  Settings.novasds_startingoffset = STARTING_OFFSET;
+
+  SettingsDefaultWebColor();
+
+  memset(&Settings.monitors, 0xFF, 20);
+  SettingsEnableAllI2cDrivers();
+
+
+  Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
+  Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
+
+  Settings.flag3.buzzer_enable = BUZZER_ENABLE;
+  Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
+  Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
+  Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
+}
+
+
+
+void SettingsResetStd(void)
+{
+  Settings.tflag[0].hemis = TIME_STD_HEMISPHERE;
+  Settings.tflag[0].week = TIME_STD_WEEK;
+  Settings.tflag[0].dow = TIME_STD_DAY;
+  Settings.tflag[0].month = TIME_STD_MONTH;
+  Settings.tflag[0].hour = TIME_STD_HOUR;
+  Settings.toffset[0] = TIME_STD_OFFSET;
+}
+
+void SettingsResetDst(void)
+{
+  Settings.tflag[1].hemis = TIME_DST_HEMISPHERE;
+  Settings.tflag[1].week = TIME_DST_WEEK;
+  Settings.tflag[1].dow = TIME_DST_DAY;
+  Settings.tflag[1].month = TIME_DST_MONTH;
+  Settings.tflag[1].hour = TIME_DST_HOUR;
+  Settings.toffset[1] = TIME_DST_OFFSET;
+}
+
+void SettingsDefaultWebColor(void)
+{
+  char scolor[10];
+  for (uint32_t i = 0; i < COL_LAST; i++) {
+    WebHexCode(i, GetTextIndexed(scolor, sizeof(scolor), i, kWebColors));
+  }
+}
+
+void SettingsEnableAllI2cDrivers(void)
+{
+  Settings.i2c_drivers[0] = 0xFFFFFFFF;
+  Settings.i2c_drivers[1] = 0xFFFFFFFF;
+  Settings.i2c_drivers[2] = 0xFFFFFFFF;
+}
+
+
+
+void SettingsDelta(void)
+{
+  if (Settings.version != VERSION) {
+    if (Settings.version < 0x06000000) {
+      Settings.cfg_size = sizeof(SYSCFG);
+      Settings.cfg_crc = GetSettingsCrc();
+    }
+    if (Settings.version < 0x06000002) {
+      for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+        if (i < 4) {
+          Settings.switchmode[i] = Settings.interlock[i];
+        } else {
+          Settings.switchmode[i] = SWITCH_MODE;
+        }
+      }
+      for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+        if (Settings.my_gp.io[i] >= GPIO_SWT5) {
+          Settings.my_gp.io[i] += 4;
+        }
+      }
+    }
+    if (Settings.version < 0x06000003) {
+      Settings.flag.mqtt_serial_raw = 0;
+      Settings.flag.pressure_conversion = 0;
+      Settings.flag3.data = 0;
+    }
+    if (Settings.version < 0x06010103) {
+      Settings.flag3.timers_enable = 1;
+    }
+    if (Settings.version < 0x0601010C) {
+      Settings.button_debounce = KEY_DEBOUNCE_TIME;
+      Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
+    }
+    if (Settings.version < 0x0602010A) {
+      for (uint32_t j = 0; j < 5; j++) {
+        Settings.rgbwwTable[j] = 255;
+      }
+    }
+    if (Settings.version < 0x06030002) {
+      Settings.timezone_minutes = 0;
+    }
+    if (Settings.version < 0x06030004) {
+      memset(&Settings.monitors, 0xFF, 20);
+    }
+    if (Settings.version < 0x0603000E) {
+      Settings.flag2.calc_resolution = CALC_RESOLUTION;
+    }
+    if (Settings.version < 0x0603000F) {
+      if (Settings.sleep < 50) {
+        Settings.sleep = 50;
+      }
+    }
+    if (Settings.version < 0x06040105) {
+      Settings.flag3.mdns_enabled = MDNS_ENABLED;
+      Settings.param[P_MDNS_DELAYED_START] = 0;
+    }
+    if (Settings.version < 0x0604010B) {
+      Settings.interlock[0] = 0xFF;
+      for (uint32_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
+    }
+    if (Settings.version < 0x0604010D) {
+      Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+    }
+    if (Settings.version < 0x06040110) {
+      ModuleDefault(WEMOS);
+    }
+    if (Settings.version < 0x06040113) {
+      Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
+    }
+    if (Settings.version < 0x06050003) {
+      Settings.novasds_startingoffset = STARTING_OFFSET;
+    }
+    if (Settings.version < 0x06050006) {
+      SettingsDefaultWebColor();
+    }
+    if (Settings.version < 0x06050007) {
+      Settings.ledmask = APP_LEDMASK;
+    }
+    if (Settings.version < 0x0605000A) {
+      Settings.my_adc0 = ADC0_NONE;
+    }
+    if (Settings.version < 0x0605000D) {
+      Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
+    }
+    if (Settings.version < 0x06060001) {
+      Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
+    }
+    if (Settings.version < 0x06060007) {
+      memset((char*)&Settings +0xE00, 0x00, sizeof(SYSCFG) -0xE00);
+    }
+    if (Settings.version < 0x06060008) {
+
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        Settings.param[P_ex_DIMMER_MAX] = 100;
+      } else {
+        Settings.param[P_ex_DIMMER_MAX] = 255;
+      }
+    }
+    if (Settings.version < 0x06060009) {
+      Settings.baudrate = APP_BAUDRATE / 300;
+      Settings.sbaudrate = SOFT_BAUDRATE / 300;
+    }
+    if (Settings.version < 0x0606000A) {
+      uint8_t tuyaindex = 0;
+      if (Settings.param[P_BACKLOG_DELAY] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 21;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_BACKLOG_DELAY];
+        tuyaindex++;
+      } else if (Settings.flag3.fast_power_cycle_disable == 1) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 11;
+        Settings.tuya_fnid_map[tuyaindex].dpid = 1;
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_RELAYS] > 0) {
+        for (uint8_t i = 0 ; i < Settings.param[P_ex_TUYA_RELAYS]; i++) {
+          Settings.tuya_fnid_map[tuyaindex].fnid = 12 + i;
+          Settings.tuya_fnid_map[tuyaindex].dpid = i + 2;
+          tuyaindex++;
+        }
+      }
+      if (Settings.param[P_ex_TUYA_POWER_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 31;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_POWER_ID];
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_VOLTAGE_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 33;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_VOLTAGE_ID];
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_CURRENT_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 32;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_CURRENT_ID];
+      }
+    }
+    if (Settings.version < 0x0606000C) {
+      memset((char*)&Settings +0x1D6, 0x00, 16);
+    }
+    if (Settings.version < 0x0606000F) {
+      Settings.ex_shutter_accuracy = 0;
+      Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
+    }
+    if (Settings.version < 0x06060011) {
+      Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
+    }
+    if (Settings.version < 0x06060012) {
+      Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
+      Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
+      if (TUYA_DIMMER == Settings.module) {
+        if (Settings.flag3.ex_tuya_dimmer_min_limit) {
+          Settings.dimmer_hw_min = 25;
+        } else {
+          Settings.dimmer_hw_min = 1;
+        }
+        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
+      }
+      else if (PS_16_DZ == Settings.module) {
+        Settings.dimmer_hw_min = 10;
+        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
+      }
+    }
+    if (Settings.version < 0x06060014) {
+# 1323 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
+      Settings.flag3.fast_power_cycle_disable = 0;
+      Settings.energy_power_delta = Settings.ex_energy_power_delta;
+      Settings.ex_energy_power_delta = 0;
+    }
+    if (Settings.version < 0x06060015) {
+      if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
+        Settings.ex_sta_config = WIFI_MANAGER;
+      }
+    }
+
+    if (Settings.version < 0x07000002) {
+      Settings.web_color2[0][0] = Settings.web_color[0][0];
+      Settings.web_color2[0][1] = Settings.web_color[0][1];
+      Settings.web_color2[0][2] = Settings.web_color[0][2];
+    }
+    if (Settings.version < 0x07000003) {
+      SettingsEnableAllI2cDrivers();
+    }
+    if (Settings.version < 0x07000004) {
+      Settings.ex_wifi_output_power = 170;
+    }
+    if (Settings.version < 0x07010202) {
+      Settings.ex_serial_config = TS_SERIAL_8N1;
+    }
+    if (Settings.version < 0x07010204) {
+      if (Settings.flag3.ex_cors_enabled == 1) {
+        strlcpy(Settings.ex_cors_domain, CORS_ENABLED_ALL, sizeof(Settings.ex_cors_domain));
+      } else {
+        Settings.ex_cors_domain[0] = 0;
+      }
+    }
+    if (Settings.version < 0x07010205) {
+      Settings.seriallog_level = Settings.ex_seriallog_level;
+      Settings.sta_config = Settings.ex_sta_config;
+      Settings.sta_active = Settings.ex_sta_active;
+      memcpy((char*)&Settings.rule_stop, (char*)&Settings.ex_rule_stop, 47);
+    }
+    if (Settings.version < 0x07010206) {
+      Settings.flag4 = Settings.ex_flag4;
+      Settings.mqtt_port = Settings.ex_mqtt_port;
+      memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);
+    }
+
+    if (Settings.version < 0x08000000) {
+      char temp[strlen(Settings.text_pool) +1]; strncpy(temp, Settings.text_pool, sizeof(temp));
+      char temp21[strlen(Settings.ex_mqtt_prefix[0]) +1]; strncpy(temp21, Settings.ex_mqtt_prefix[0], sizeof(temp21));
+      char temp22[strlen(Settings.ex_mqtt_prefix[1]) +1]; strncpy(temp22, Settings.ex_mqtt_prefix[1], sizeof(temp22));
+      char temp23[strlen(Settings.ex_mqtt_prefix[2]) +1]; strncpy(temp23, Settings.ex_mqtt_prefix[2], sizeof(temp23));
+      char temp31[strlen(Settings.ex_sta_ssid[0]) +1]; strncpy(temp31, Settings.ex_sta_ssid[0], sizeof(temp31));
+      char temp32[strlen(Settings.ex_sta_ssid[1]) +1]; strncpy(temp32, Settings.ex_sta_ssid[1], sizeof(temp32));
+      char temp41[strlen(Settings.ex_sta_pwd[0]) +1]; strncpy(temp41, Settings.ex_sta_pwd[0], sizeof(temp41));
+      char temp42[strlen(Settings.ex_sta_pwd[1]) +1]; strncpy(temp42, Settings.ex_sta_pwd[1], sizeof(temp42));
+      char temp5[strlen(Settings.ex_hostname) +1]; strncpy(temp5, Settings.ex_hostname, sizeof(temp5));
+      char temp6[strlen(Settings.ex_syslog_host) +1]; strncpy(temp6, Settings.ex_syslog_host, sizeof(temp6));
+      char temp7[strlen(Settings.ex_mqtt_host) +1]; strncpy(temp7, Settings.ex_mqtt_host, sizeof(temp7));
+      char temp8[strlen(Settings.ex_mqtt_client) +1]; strncpy(temp8, Settings.ex_mqtt_client, sizeof(temp8));
+      char temp9[strlen(Settings.ex_mqtt_user) +1]; strncpy(temp9, Settings.ex_mqtt_user, sizeof(temp9));
+      char temp10[strlen(Settings.ex_mqtt_pwd) +1]; strncpy(temp10, Settings.ex_mqtt_pwd, sizeof(temp10));
+      char temp11[strlen(Settings.ex_mqtt_topic) +1]; strncpy(temp11, Settings.ex_mqtt_topic, sizeof(temp11));
+      char temp12[strlen(Settings.ex_button_topic) +1]; strncpy(temp12, Settings.ex_button_topic, sizeof(temp12));
+      char temp13[strlen(Settings.ex_mqtt_grptopic) +1]; strncpy(temp13, Settings.ex_mqtt_grptopic, sizeof(temp13));
+
+      memset(Settings.text_pool, 0x00, settings_text_size);
+      SettingsUpdateText(SET_OTAURL, temp);
+      SettingsUpdateText(SET_MQTTPREFIX1, temp21);
+      SettingsUpdateText(SET_MQTTPREFIX2, temp22);
+      SettingsUpdateText(SET_MQTTPREFIX3, temp23);
+      SettingsUpdateText(SET_STASSID1, temp31);
+      SettingsUpdateText(SET_STASSID2, temp32);
+      SettingsUpdateText(SET_STAPWD1, temp41);
+      SettingsUpdateText(SET_STAPWD2, temp42);
+      SettingsUpdateText(SET_HOSTNAME, temp5);
+      SettingsUpdateText(SET_SYSLOG_HOST, temp6);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+      if (!strlen(Settings.ex_mqtt_user)) {
+        SettingsUpdateText(SET_MQTT_HOST, temp7);
+        SettingsUpdateText(SET_MQTT_USER, temp9);
+      } else {
+        char aws_mqtt_host[66];
+        snprintf_P(aws_mqtt_host, sizeof(aws_mqtt_host), PSTR("%s%s"), temp9, temp7);
+        SettingsUpdateText(SET_MQTT_HOST, aws_mqtt_host);
+        SettingsUpdateText(SET_MQTT_USER, "");
+      }
+#else
+      SettingsUpdateText(SET_MQTT_HOST, temp7);
+      SettingsUpdateText(SET_MQTT_USER, temp9);
+#endif
+      SettingsUpdateText(SET_MQTT_CLIENT, temp8);
+      SettingsUpdateText(SET_MQTT_PWD, temp10);
+      SettingsUpdateText(SET_MQTT_TOPIC, temp11);
+      SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, temp12);
+      SettingsUpdateText(SET_MQTT_GRP_TOPIC, temp13);
+
+      SettingsUpdateText(SET_WEBPWD, Settings.ex_web_password);
+      SettingsUpdateText(SET_CORS, Settings.ex_cors_domain);
+      SettingsUpdateText(SET_MQTT_FULLTOPIC, Settings.ex_mqtt_fulltopic);
+      SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, Settings.ex_switch_topic);
+      SettingsUpdateText(SET_STATE_TXT1, Settings.ex_state_text[0]);
+      SettingsUpdateText(SET_STATE_TXT2, Settings.ex_state_text[1]);
+      SettingsUpdateText(SET_STATE_TXT3, Settings.ex_state_text[2]);
+      SettingsUpdateText(SET_STATE_TXT4, Settings.ex_state_text[3]);
+      SettingsUpdateText(SET_NTPSERVER1, Settings.ex_ntp_server[0]);
+      SettingsUpdateText(SET_NTPSERVER2, Settings.ex_ntp_server[1]);
+      SettingsUpdateText(SET_NTPSERVER3, Settings.ex_ntp_server[2]);
+      SettingsUpdateText(SET_MEM1, Settings.script_pram[0]);
+      SettingsUpdateText(SET_MEM2, Settings.script_pram[1]);
+      SettingsUpdateText(SET_MEM3, Settings.script_pram[2]);
+      SettingsUpdateText(SET_MEM4, Settings.script_pram[3]);
+      SettingsUpdateText(SET_MEM5, Settings.script_pram[4]);
+      SettingsUpdateText(SET_FRIENDLYNAME1, Settings.ex_friendlyname[0]);
+      SettingsUpdateText(SET_FRIENDLYNAME2, Settings.ex_friendlyname[1]);
+      SettingsUpdateText(SET_FRIENDLYNAME3, Settings.ex_friendlyname[2]);
+      SettingsUpdateText(SET_FRIENDLYNAME4, Settings.ex_friendlyname[3]);
+    }
+
+    Settings.version = VERSION;
+    SettingsSave(1);
+  }
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+IPAddress syslog_host_addr;
+uint32_t syslog_host_hash = 0;
+
+extern "C" {
+extern struct rst_info resetInfo;
+}
+
+
+
+
+
+#include <Ticker.h>
+
+Ticker tickerOSWatch;
+
+const uint32_t OSWATCH_RESET_TIME = 120;
+
+static unsigned long oswatch_last_loop_time;
+uint8_t oswatch_blocked_loop = 0;
+
+#ifndef USE_WS2812_DMA
+
+#endif
+
+#ifdef USE_KNX
+bool knx_started = false;
+#endif
+
+void OsWatchTicker(void)
+{
+  uint32_t t = millis();
+  uint32_t last_run = abs(t - oswatch_last_loop_time);
+
+#ifdef DEBUG_THEO
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), last_run);
+#endif
+  if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
+
+    RtcSettings.oswatch_blocked_loop = 1;
+    RtcSettingsSave();
+
+
+
+
+
+    volatile uint32_t dummy;
+    dummy = *((uint32_t*) 0x00000000);
+  }
+}
+
+void OsWatchInit(void)
+{
+  oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
+  RtcSettings.oswatch_blocked_loop = 0;
+  oswatch_last_loop_time = millis();
+  tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
+}
+
+void OsWatchLoop(void)
+{
+  oswatch_last_loop_time = millis();
+
+}
+
+bool OsWatchBlockedLoop(void)
+{
+  return oswatch_blocked_loop;
+}
+
+uint32_t ResetReason(void)
+{
+# 101 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+  return resetInfo.reason;
+}
+
+String GetResetReason(void)
+{
+  if (oswatch_blocked_loop) {
+    char buff[32];
+    strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
+    return String(buff);
+  } else {
+    return ESP.getResetReason();
+  }
+}
+
+
+
+
+
+
+size_t strchrspn(const char *str1, int character)
+{
+  size_t ret = 0;
+  char *start = (char*)str1;
+  char *end = strchr(str1, character);
+  if (end) ret = end - start;
+  return ret;
+}
+
+
+char* subStr(char* dest, char* str, const char *delim, int index)
+{
+  char *act;
+  char *sub = nullptr;
+  char *ptr;
+  int i;
+
+
+  strncpy(dest, str, strlen(str)+1);
+  for (i = 1, act = dest; i <= index; i++, act = nullptr) {
+    sub = strtok_r(act, delim, &ptr);
+    if (sub == nullptr) break;
+  }
+  sub = Trim(sub);
+  return sub;
+}
+
+float CharToFloat(const char *str)
+{
+
+  char strbuf[24];
+
+  strlcpy(strbuf, str, sizeof(strbuf));
+  char *pt = strbuf;
+  while ((*pt != '\0') && isblank(*pt)) { pt++; }
+
+  signed char sign = 1;
+  if (*pt == '-') { sign = -1; }
+  if (*pt == '-' || *pt=='+') { pt++; }
+
+  float left = 0;
+  if (*pt != '.') {
+    left = atoi(pt);
+    while (isdigit(*pt)) { pt++; }
+  }
+
+  float right = 0;
+  if (*pt == '.') {
+    pt++;
+    right = atoi(pt);
+    while (isdigit(*pt)) {
+      pt++;
+      right /= 10.0f;
+    }
+  }
+
+  float result = left + right;
+  if (sign < 0) {
+    return -result;
+  }
+  return result;
+}
+
+int TextToInt(char *str)
+{
+  char *p;
+  uint8_t radix = 10;
+  if ('#' == str[0]) {
+    radix = 16;
+    str++;
+  }
+  return strtol(str, &p, radix);
+}
+
+char* ulltoa(unsigned long long value, char *str, int radix)
+{
+  char digits[64];
+  char *dst = str;
+  int i = 0;
+
+
+
+  do {
+    int n = value % radix;
+    digits[i++] = (n < 10) ? (char)n+'0' : (char)n-10+'A';
+    value /= radix;
+  } while (value != 0);
+
+  while (i > 0) { *dst++ = digits[--i]; }
+
+  *dst = 0;
+  return str;
+}
+
+
+
+char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween)
+{
+
+
+
+  static const char * hex = "0123456789ABCDEF";
+  int between = (inbetween) ? 3 : 2;
+  const unsigned char * pin = in;
+  char * pout = out;
+  for (; pin < in+insz; pout += between, pin++) {
+    pout[0] = hex[(pgm_read_byte(pin)>>4) & 0xF];
+    pout[1] = hex[ pgm_read_byte(pin) & 0xF];
+    if (inbetween) { pout[2] = inbetween; }
+    if (pout + 3 - out > outsz) { break; }
+  }
+  pout[(inbetween && insz) ? -1 : 0] = 0;
+  return out;
+}
+
+char* Uint64toHex(uint64_t value, char *str, uint16_t bits)
+{
+  ulltoa(value, str, 16);
+
+  int fill = 8;
+  if ((bits > 3) && (bits < 65)) {
+    fill = bits / 4;
+    if (bits % 4) { fill++; }
+  }
+  int len = strlen(str);
+  fill -= len;
+  if (fill > 0) {
+    memmove(str + fill, str, len +1);
+    memset(str, '0', fill);
+  }
+  return str;
+}
+
+char* dtostrfd(double number, unsigned char prec, char *s)
+{
+  if ((isnan(number)) || (isinf(number))) {
+    strcpy(s, "null");
+    return s;
+  } else {
+    return dtostrf(number, 1, prec, s);
+  }
+}
+
+char* Unescape(char* buffer, uint32_t* size)
+{
+  uint8_t* read = (uint8_t*)buffer;
+  uint8_t* write = (uint8_t*)buffer;
+  int32_t start_size = *size;
+  int32_t end_size = *size;
+  uint8_t che = 0;
+
+
+
+  while (start_size > 0) {
+    uint8_t ch = *read++;
+    start_size--;
+    if (ch != '\\') {
+      *write++ = ch;
+    } else {
+      if (start_size > 0) {
+        uint8_t chi = *read++;
+        start_size--;
+        end_size--;
+        switch (chi) {
+          case '\\': che = '\\'; break;
+          case 'a': che = '\a'; break;
+          case 'b': che = '\b'; break;
+          case 'e': che = '\e'; break;
+          case 'f': che = '\f'; break;
+          case 'n': che = '\n'; break;
+          case 'r': che = '\r'; break;
+          case 's': che = ' '; break;
+          case 't': che = '\t'; break;
+          case 'v': che = '\v'; break;
+          case 'x': {
+            uint8_t* start = read;
+            che = (uint8_t)strtol((const char*)read, (char**)&read, 16);
+            start_size -= (uint16_t)(read - start);
+            end_size -= (uint16_t)(read - start);
+            break;
+          }
+          case '"': che = '\"'; break;
+
+          default : {
+            che = chi;
+            *write++ = ch;
+            end_size++;
+          }
+        }
+        *write++ = che;
+      }
+    }
+  }
+  *size = end_size;
+  *write++ = 0;
+
+
+  return buffer;
+}
+
+char* RemoveSpace(char* p)
+{
+  char* write = p;
+  char* read = p;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    if (!isspace(ch)) {
+      *write++ = ch;
+    }
+  }
+
+  return p;
+}
+
+char* ReplaceCommaWithDot(char* p)
+{
+  char* write = (char*)p;
+  char* read = (char*)p;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    if (ch == ',') {
+      ch = '.';
+    }
+    *write++ = ch;
+  }
+  return p;
+}
+
+char* LowerCase(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = tolower(ch);
+  }
+  return dest;
+}
+
+char* UpperCase(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = toupper(ch);
+  }
+  return dest;
+}
+
+char* UpperCase_P(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = pgm_read_byte(read++);
+    *write++ = toupper(ch);
+  }
+  return dest;
+}
+
+char* Trim(char* p)
+{
+  while ((*p != '\0') && isblank(*p)) { p++; }
+  char* q = p + strlen(p) -1;
+  while ((q >= p) && isblank(*q)) { q--; }
+  q++;
+  *q = '\0';
+  return p;
+}
+
+char* RemoveAllSpaces(char* p)
+{
+
+  char *cursor = p;
+  uint32_t offset = 0;
+  while (1) {
+    *cursor = *(cursor + offset);
+    if ((' ' == *cursor) || ('\t' == *cursor) || ('\n' == *cursor)) {
+      offset++;
+    } else {
+      if (0 == *cursor) { break; }
+      cursor++;
+    }
+  }
+  return p;
+}
+
+char* NoAlNumToUnderscore(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_';
+  }
+  return dest;
+}
+
+char IndexSeparator(void)
+{
+
+
+
+
+
+
+  if (Settings.flag3.use_underscore) {
+    return '_';
+  } else {
+    return '-';
+  }
+}
+
+void SetShortcutDefault(void)
+{
+  if ('\0' != XdrvMailbox.data[0]) {
+    XdrvMailbox.data[0] = '0' + SC_DEFAULT;
+    XdrvMailbox.data[1] = '\0';
+  }
+}
+
+uint8_t Shortcut(void)
+{
+  uint8_t result = 10;
+
+  if ('\0' == XdrvMailbox.data[1]) {
+    if (('"' == XdrvMailbox.data[0]) || ('0' == XdrvMailbox.data[0])) {
+      result = SC_CLEAR;
+    } else {
+      result = atoi(XdrvMailbox.data);
+      if (0 == result) {
+        result = 10;
+      }
+    }
+  }
+  return result;
+}
+
+bool ValidIpAddress(const char* str)
+{
+  const char* p = str;
+
+  while (*p && ((*p == '.') || ((*p >= '0') && (*p <= '9')))) { p++; }
+  return (*p == '\0');
+}
+
+bool ParseIp(uint32_t* addr, const char* str)
+{
+  uint8_t *part = (uint8_t*)addr;
+  uint8_t i;
+
+  *addr = 0;
+  for (i = 0; i < 4; i++) {
+    part[i] = strtoul(str, nullptr, 10);
+    str = strchr(str, '.');
+    if (str == nullptr || *str == '\0') {
+      break;
+    }
+    str++;
+  }
+  return (3 == i);
+}
+
+uint32_t ParseParameters(uint32_t count, uint32_t *params)
+{
+  char *p;
+  uint32_t i = 0;
+  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p), i++) {
+    params[i] = strtoul(str, nullptr, 0);
+  }
+  return i;
+}
+
+
+bool NewerVersion(char* version_str)
+{
+  uint32_t version = 0;
+  uint32_t i = 0;
+  char *str_ptr;
+
+  char version_dup[strlen(version_str) +1];
+  strncpy(version_dup, version_str, sizeof(version_dup));
+
+  for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) {
+    int field = atoi(str);
+
+    if ((field < 0) || (field > 255)) {
+      return false;
+    }
+
+    version = (version << 8) + field;
+
+    if ((2 == i) && isalpha(str[strlen(str)-1])) {
+      field = str[strlen(str)-1] & 0x1f;
+      version = (version << 8) + field;
+      i++;
+    }
+  }
+
+
+  if ((i < 2) || (i > sizeof(VERSION))) {
+    return false;
+  }
+
+
+  while (i < sizeof(VERSION)) {
+    version <<= 8;
+    i++;
+  }
+
+  return (version > VERSION);
+}
+
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option)
+{
+  strncpy_P(dest, S_RSLT_POWER, size);
+  if ((devices_present + option) > 1) {
+    char sidx[8];
+    snprintf_P(sidx, sizeof(sidx), PSTR("%d"), idx);
+    strncat(dest, sidx, size - strlen(dest) -1);
+  }
+  return dest;
+}
+
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size)
+{
+  return GetPowerDevice(dest, idx, size, 0);
+}
+
+void GetEspHardwareType(void)
+{
+
+  uint32_t efuse1 = *(uint32_t*)(0x3FF00050);
+  uint32_t efuse2 = *(uint32_t*)(0x3FF00054);
+
+
+
+  is_8285 = ( (efuse1 & (1 << 4)) || (efuse2 & (1 << 16)) );
+  if (is_8285 && (ESP.getFlashChipRealSize() > 1048576)) {
+    is_8285 = false;
+  }
+}
+
+String GetDeviceHardware(void)
+{
+  char buff[10];
+  if (is_8285) {
+    strcpy_P(buff, PSTR("ESP8285"));
+  } else {
+    strcpy_P(buff, PSTR("ESP8266EX"));
+  }
+  return String(buff);
+}
+
+float ConvertTemp(float c)
+{
+  float result = c;
+
+  global_update = uptime;
+  global_temperature = c;
+
+  if (!isnan(c) && Settings.flag.temperature_conversion) {
+    result = c * 1.8 + 32;
+  }
+  result = result + (0.1 * Settings.temp_comp);
+  return result;
+}
+
+float ConvertTempToCelsius(float c)
+{
+  float result = c;
+
+  if (!isnan(c) && Settings.flag.temperature_conversion) {
+    result = (c - 32) / 1.8;
+  }
+  result = result + (0.1 * Settings.temp_comp);
+  return result;
+}
+
+char TempUnit(void)
+{
+  return (Settings.flag.temperature_conversion) ? 'F' : 'C';
+}
+
+float ConvertHumidity(float h)
+{
+  global_update = uptime;
+  global_humidity = h;
+
+  return h;
+}
+
+float ConvertPressure(float p)
+{
+  float result = p;
+
+  global_update = uptime;
+  global_pressure = p;
+
+  if (!isnan(p) && Settings.flag.pressure_conversion) {
+    result = p * 0.75006375541921;
+  }
+  return result;
+}
+
+String PressureUnit(void)
+{
+  return (Settings.flag.pressure_conversion) ? String(D_UNIT_MILLIMETER_MERCURY) : String(D_UNIT_PRESSURE);
+}
+
+void ResetGlobalValues(void)
+{
+  if ((uptime - global_update) > GLOBAL_VALUES_VALID) {
+    global_update = 0;
+    global_temperature = 9999;
+    global_humidity = 0;
+    global_pressure = 0;
+  }
+}
+
+uint32_t SqrtInt(uint32_t num)
+{
+  if (num <= 1) {
+    return num;
+  }
+
+  uint32_t x = num / 2;
+  uint32_t y;
+  do {
+    y = (x + num / x) / 2;
+    if (y >= x) {
+      return x;
+    }
+    x = y;
+  } while (true);
+}
+
+uint32_t RoundSqrtInt(uint32_t num)
+{
+  uint32_t s = SqrtInt(4 * num);
+  if (s & 1) {
+    s++;
+  }
+  return s / 2;
+}
+
+char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack)
+{
+
+
+  char* write = destination;
+  const char* read = haystack;
+
+  index++;
+  while (index--) {
+    size_t size = destination_size -1;
+    write = destination;
+    char ch = '.';
+    while ((ch != '\0') && (ch != '|')) {
+      ch = pgm_read_byte(read++);
+      if (size && (ch != '|')) {
+        *write++ = ch;
+        size--;
+      }
+    }
+    if (0 == ch) {
+      if (index) {
+        write = destination;
+      }
+      break;
+    }
+  }
+  *write = '\0';
+  return destination;
+}
+
+int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack)
+{
+
+
+  int result = -1;
+  const char* read = haystack;
+  char* write = destination;
+
+  while (true) {
+    result++;
+    size_t size = destination_size -1;
+    write = destination;
+    char ch = '.';
+    while ((ch != '\0') && (ch != '|')) {
+      ch = pgm_read_byte(read++);
+      if (size && (ch != '|')) {
+        *write++ = ch;
+        size--;
+      }
+    }
+    *write = '\0';
+    if (!strcasecmp(needle, destination)) {
+      break;
+    }
+    if (0 == ch) {
+      result = -1;
+      break;
+    }
+  }
+  return result;
+}
+
+bool DecodeCommand(const char* haystack, void (* const MyCommand[])(void))
+{
+  GetTextIndexed(XdrvMailbox.command, CMDSZ, 0, haystack);
+  int prefix_length = strlen(XdrvMailbox.command);
+  if (prefix_length) {
+    char prefix[prefix_length +1];
+    snprintf_P(prefix, sizeof(prefix), XdrvMailbox.topic);
+    if (strcasecmp(prefix, XdrvMailbox.command)) {
+      return false;
+    }
+  }
+  int command_code = GetCommandCode(XdrvMailbox.command + prefix_length, CMDSZ, XdrvMailbox.topic + prefix_length, haystack);
+  if (command_code > 0) {
+    XdrvMailbox.command_code = command_code -1;
+    MyCommand[XdrvMailbox.command_code]();
+    return true;
+  }
+  return false;
+}
+
+const char kOptions[] PROGMEM = "OFF|" D_OFF "|FALSE|" D_FALSE "|STOP|" D_STOP "|" D_CELSIUS "|"
+                                "ON|" D_ON "|TRUE|" D_TRUE "|START|" D_START "|" D_FAHRENHEIT "|" D_USER "|"
+                                "TOGGLE|" D_TOGGLE "|" D_ADMIN "|"
+                                "BLINK|" D_BLINK "|"
+                                "BLINKOFF|" D_BLINKOFF "|"
+                                "ALL" ;
+
+const uint8_t sNumbers[] PROGMEM = { 0,0,0,0,0,0,0,
+                                     1,1,1,1,1,1,1,1,
+                                     2,2,2,
+                                     3,3,
+                                     4,4,
+                                     255 };
+
+int GetStateNumber(char *state_text)
+{
+  char command[CMDSZ];
+  int state_number = GetCommandCode(command, sizeof(command), state_text, kOptions);
+  if (state_number >= 0) {
+    state_number = pgm_read_byte(sNumbers + state_number);
+  }
+  return state_number;
+}
+
+String GetSerialConfig(void)
+{
+
+
+
+
+
+  const char kParity[] = "NEOI";
+
+  char config[4];
+  config[0] = '5' + (Settings.serial_config & 0x3);
+  config[1] = kParity[(Settings.serial_config >> 3) & 0x3];
+  config[2] = '1' + ((Settings.serial_config >> 2) & 0x1);
+  config[3] = '\0';
+  return String(config);
+}
+
+void SetSerialBegin()
+{
+  uint32_t baudrate = Settings.baudrate * 300;
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
+  Serial.flush();
+  Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
+}
+
+void SetSerialConfig(uint32_t serial_config)
+{
+  if (serial_config > TS_SERIAL_8O2) {
+    serial_config = TS_SERIAL_8N1;
+  }
+  if (serial_config != Settings.serial_config) {
+    Settings.serial_config = serial_config;
+    SetSerialBegin();
+  }
+}
+
+void SetSerialBaudrate(uint32_t baudrate)
+{
+  Settings.baudrate = baudrate / 300;
+  if (Serial.baudRate() != baudrate) {
+    SetSerialBegin();
+  }
+}
+
+void SetSerial(uint32_t baudrate, uint32_t serial_config)
+{
+  Settings.flag.mqtt_serial = 0;
+  Settings.serial_config = serial_config;
+  Settings.baudrate = baudrate / 300;
+  SetSeriallog(LOG_LEVEL_NONE);
+  SetSerialBegin();
+}
+
+void ClaimSerial(void)
+{
+  serial_local = true;
+  AddLog_P(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial"));
+  SetSeriallog(LOG_LEVEL_NONE);
+  Settings.baudrate = Serial.baudRate() / 300;
+}
+
+void SerialSendRaw(char *codes)
+{
+  char *p;
+  char stemp[3];
+  uint8_t code;
+
+  int size = strlen(codes);
+
+  while (size > 1) {
+    strlcpy(stemp, codes, sizeof(stemp));
+    code = strtol(stemp, &p, 16);
+    Serial.write(code);
+    size -= 2;
+    codes += 2;
+  }
+}
+
+uint32_t GetHash(const char *buffer, size_t size)
+{
+  uint32_t hash = 0;
+  for (uint32_t i = 0; i <= size; i++) {
+    hash += (uint8_t)*buffer++ * (i +1);
+  }
+  return hash;
+}
+
+void ShowSource(uint32_t source)
+{
+  if ((source > 0) && (source < SRC_MAX)) {
+    char stemp1[20];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource));
+  }
+}
+
+void WebHexCode(uint32_t i, const char* code)
+{
+  char scolor[10];
+
+  strlcpy(scolor, code, sizeof(scolor));
+  char* p = scolor;
+  if ('#' == p[0]) { p++; }
+
+  if (3 == strlen(p)) {
+    p[6] = p[3];
+    p[5] = p[2];
+    p[4] = p[2];
+    p[3] = p[1];
+    p[2] = p[1];
+    p[1] = p[0];
+  }
+
+  uint32_t color = strtol(p, nullptr, 16);
+
+
+
+
+
+
+  uint32_t j = sizeof(Settings.web_color) / 3;
+# 916 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+  if (i >= j) {
+
+    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
+  }
+  Settings.web_color[i][0] = (color >> 16) & 0xFF;
+  Settings.web_color[i][1] = (color >> 8) & 0xFF;
+  Settings.web_color[i][2] = color & 0xFF;
+}
+
+uint32_t WebColor(uint32_t i)
+{
+  uint32_t j = sizeof(Settings.web_color) / 3;
+
+
+
+
+  if (i >= j) {
+
+    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
+  }
+  uint32_t tcolor = (Settings.web_color[i][0] << 16) | (Settings.web_color[i][1] << 8) | Settings.web_color[i][2];
+
+  return tcolor;
+}
+
+
+
+
+
+const uint16_t TIMESZ = 100;
+
+char* ResponseGetTime(uint32_t format, char* time_str)
+{
+  switch (format) {
+  case 1:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%u"), GetDateAndTime(DT_LOCAL).c_str(), UtcTime());
+    break;
+  case 2:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":%u"), UtcTime());
+    break;
+  default:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
+  }
+  return time_str;
+}
+
+int Response_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), format, args);
+  va_end(args);
+  return len;
+}
+
+int ResponseTime_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+
+  ResponseGetTime(Settings.flag2.time_format, mqtt_data);
+
+  int mlen = strlen(mqtt_data);
+  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
+  va_end(args);
+  return len + mlen;
+}
+
+int ResponseAppend_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+  int mlen = strlen(mqtt_data);
+  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
+  va_end(args);
+  return len + mlen;
+}
+
+int ResponseAppendTimeFormat(uint32_t format)
+{
+  char time_str[TIMESZ];
+  return ResponseAppend_P(ResponseGetTime(format, time_str));
+}
+
+int ResponseAppendTime(void)
+{
+  return ResponseAppendTimeFormat(Settings.flag2.time_format);
+}
+
+int ResponseJsonEnd(void)
+{
+  return ResponseAppend_P(PSTR("}"));
+}
+
+int ResponseJsonEndEnd(void)
+{
+  return ResponseAppend_P(PSTR("}}"));
+}
+
+
+
+
+
+void DigitalWrite(uint32_t gpio_pin, uint32_t state)
+{
+  if (pin[gpio_pin] < 99) {
+    digitalWrite(pin[gpio_pin], state &1);
+  }
+}
+
+uint8_t ModuleNr(void)
+{
+
+
+  return (USER_MODULE == Settings.module) ? 0 : Settings.module +1;
+}
+
+bool ValidTemplateModule(uint32_t index)
+{
+  for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
+    if (index == pgm_read_byte(kModuleNiceList + i)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool ValidModule(uint32_t index)
+{
+  if (index == USER_MODULE) { return true; }
+  return ValidTemplateModule(index);
+}
+
+String AnyModuleName(uint32_t index)
+{
+  if (USER_MODULE == index) {
+    return String(Settings.user_template.name);
+  } else {
+    return FPSTR(kModules[index].name);
+  }
+}
+
+String ModuleName(void)
+{
+  return AnyModuleName(Settings.module);
+}
+
+void ModuleGpios(myio *gp)
+{
+  uint8_t *dest = (uint8_t *)gp;
+  memset(dest, GPIO_NONE, sizeof(myio));
+
+  uint8_t src[sizeof(mycfgio)];
+  if (USER_MODULE == Settings.module) {
+    memcpy(&src, &Settings.user_template.gp, sizeof(mycfgio));
+  } else {
+    memcpy_P(&src, &kModules[Settings.module].gp, sizeof(mycfgio));
+  }
+
+
+
+
+  uint32_t j = 0;
+  for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+    if (6 == i) { j = 9; }
+    if (8 == i) { j = 12; }
+    dest[j] = src[i];
+    j++;
+  }
+
+
+
+}
+
+gpio_flag ModuleFlag(void)
+{
+  gpio_flag flag;
+
+  if (USER_MODULE == Settings.module) {
+    flag = Settings.user_template.flag;
+  } else {
+    memcpy_P(&flag, &kModules[Settings.module].flag, sizeof(gpio_flag));
+  }
+
+  return flag;
+}
+
+void ModuleDefault(uint32_t module)
+{
+  if (USER_MODULE == module) { module = WEMOS; }
+  Settings.user_template_base = module;
+  memcpy_P(&Settings.user_template, &kModules[module], sizeof(mytmplt));
+}
+
+void SetModuleType(void)
+{
+  my_module_type = (USER_MODULE == Settings.module) ? Settings.user_template_base : Settings.module;
+}
+
+bool FlashPin(uint32_t pin)
+{
+  return (((pin > 5) && (pin < 9)) || (11 == pin));
+}
+
+uint8_t ValidPin(uint32_t pin, uint32_t gpio)
+{
+  if (FlashPin(pin)) {
+    return GPIO_NONE;
+  }
+
+
+  if ((WEMOS == Settings.module) && !Settings.flag3.user_esp8285_enable) {
+    if ((pin == 9) || (pin == 10)) {
+      return GPIO_NONE;
+    }
+  }
+
+  return gpio;
+}
+
+bool ValidGPIO(uint32_t pin, uint32_t gpio)
+{
+  return (GPIO_USER == ValidPin(pin, gpio));
+}
+
+bool ValidAdc(void)
+{
+  gpio_flag flag = ModuleFlag();
+  uint32_t template_adc0 = flag.data &15;
+  return (ADC0_USER == template_adc0);
+}
+
+bool GetUsedInModule(uint32_t val, uint8_t *arr)
+{
+  int offset = 0;
+
+  if (!val) { return false; }
+
+  if ((val >= GPIO_KEY1) && (val < GPIO_KEY1 + MAX_KEYS)) {
+    offset = (GPIO_KEY1_NP - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_NP) && (val < GPIO_KEY1_NP + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_NP - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_INV) && (val < GPIO_KEY1_INV + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_INV - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_INV_NP) && (val < GPIO_KEY1_INV_NP + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_INV_NP - GPIO_KEY1);
+  }
+
+  if ((val >= GPIO_SWT1) && (val < GPIO_SWT1 + MAX_SWITCHES)) {
+    offset = (GPIO_SWT1_NP - GPIO_SWT1);
+  }
+  if ((val >= GPIO_SWT1_NP) && (val < GPIO_SWT1_NP + MAX_SWITCHES)) {
+    offset = -(GPIO_SWT1_NP - GPIO_SWT1);
+  }
+
+  if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
+    offset = (GPIO_REL1_INV - GPIO_REL1);
+  }
+  if ((val >= GPIO_REL1_INV) && (val < GPIO_REL1_INV + MAX_RELAYS)) {
+    offset = -(GPIO_REL1_INV - GPIO_REL1);
+  }
+
+  if ((val >= GPIO_LED1) && (val < GPIO_LED1 + MAX_LEDS)) {
+    offset = (GPIO_LED1_INV - GPIO_LED1);
+  }
+  if ((val >= GPIO_LED1_INV) && (val < GPIO_LED1_INV + MAX_LEDS)) {
+    offset = -(GPIO_LED1_INV - GPIO_LED1);
+  }
+
+  if ((val >= GPIO_PWM1) && (val < GPIO_PWM1 + MAX_PWMS)) {
+    offset = (GPIO_PWM1_INV - GPIO_PWM1);
+  }
+  if ((val >= GPIO_PWM1_INV) && (val < GPIO_PWM1_INV + MAX_PWMS)) {
+    offset = -(GPIO_PWM1_INV - GPIO_PWM1);
+  }
+
+  if ((val >= GPIO_CNTR1) && (val < GPIO_CNTR1 + MAX_COUNTERS)) {
+    offset = (GPIO_CNTR1_NP - GPIO_CNTR1);
+  }
+  if ((val >= GPIO_CNTR1_NP) && (val < GPIO_CNTR1_NP + MAX_COUNTERS)) {
+    offset = -(GPIO_CNTR1_NP - GPIO_CNTR1);
+  }
+
+  for (uint32_t i = 0; i < MAX_GPIO_PIN; i++) {
+    if (arr[i] == val) { return true; }
+    if (arr[i] == val + offset) { return true; }
+  }
+  return false;
+}
+
+bool JsonTemplate(const char* dataBuf)
+{
+
+
+  if (strlen(dataBuf) < 9) { return false; }
+
+  StaticJsonBuffer<350> jb;
+  JsonObject& obj = jb.parseObject(dataBuf);
+  if (!obj.success()) { return false; }
+
+
+  const char* name = obj[D_JSON_NAME];
+  if (name != nullptr) {
+    strlcpy(Settings.user_template.name, name, sizeof(Settings.user_template.name));
+  }
+  if (obj[D_JSON_GPIO].success()) {
+    for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+      Settings.user_template.gp.io[i] = obj[D_JSON_GPIO][i] | 0;
+    }
+  }
+  if (obj[D_JSON_FLAG].success()) {
+    uint8_t flag = obj[D_JSON_FLAG] | 0;
+    memcpy(&Settings.user_template.flag, &flag, sizeof(gpio_flag));
+  }
+  if (obj[D_JSON_BASE].success()) {
+    uint8_t base = obj[D_JSON_BASE];
+    if ((0 == base) || !ValidTemplateModule(base -1)) { base = 18; }
+    Settings.user_template_base = base -1;
+  }
+  return true;
+}
+
+void TemplateJson(void)
+{
+  Response_P(PSTR("{\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), Settings.user_template.name);
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    ResponseAppend_P(PSTR("%s%d"), (i>0)?",":"", Settings.user_template.gp.io[i]);
+  }
+  ResponseAppend_P(PSTR("],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), Settings.user_template.flag, Settings.user_template_base +1);
+}
+
+
+
+
+
+inline int32_t TimeDifference(uint32_t prev, uint32_t next)
+{
+  return ((int32_t) (next - prev));
+}
+
+int32_t TimePassedSince(uint32_t timestamp)
+{
+
+
+  return TimeDifference(timestamp, millis());
+}
+
+bool TimeReached(uint32_t timer)
+{
+
+  const long passed = TimePassedSince(timer);
+  return (passed >= 0);
+}
+
+void SetNextTimeInterval(unsigned long& timer, const unsigned long step)
+{
+  timer += step;
+  const long passed = TimePassedSince(timer);
+  if (passed < 0) { return; }
+  if (static_cast<unsigned long>(passed) > step) {
+
+    timer = millis() + step;
+    return;
+  }
+
+  timer = millis() + (step - passed);
+}
+
+int32_t TimePassedSinceUsec(uint32_t timestamp)
+{
+  return TimeDifference(timestamp, micros());
+}
+
+bool TimeReachedUsec(uint32_t timer)
+{
+
+  const long passed = TimePassedSinceUsec(timer);
+  return (passed >= 0);
+}
+
+
+
+
+
+#ifdef USE_I2C
+const uint8_t I2C_RETRY_COUNTER = 3;
+
+uint32_t i2c_active[4] = { 0 };
+uint32_t i2c_buffer = 0;
+
+bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size)
+{
+  uint8_t retry = I2C_RETRY_COUNTER;
+  bool status = false;
+
+  i2c_buffer = 0;
+  while (!status && retry) {
+    Wire.beginTransmission(addr);
+    Wire.write(reg);
+    if (0 == Wire.endTransmission(false)) {
+      Wire.requestFrom((int)addr, (int)size);
+      if (Wire.available() == size) {
+        for (uint32_t i = 0; i < size; i++) {
+          i2c_buffer = i2c_buffer << 8 | Wire.read();
+        }
+        status = true;
+      }
+    }
+    retry--;
+  }
+  return status;
+}
+
+bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 1);
+  *data = (uint8_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 2);
+  *data = (uint16_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 2);
+  *data = (int16_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg)
+{
+  uint16_t ldata;
+  bool status = I2cValidRead16(&ldata, addr, reg);
+  *data = (ldata >> 8) | (ldata << 8);
+  return status;
+}
+
+bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg)
+{
+  uint16_t ldata;
+  bool status = I2cValidRead16LE(&ldata, addr, reg);
+  *data = (int16_t)ldata;
+  return status;
+}
+
+bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 3);
+  *data = i2c_buffer;
+  return status;
+}
+
+uint8_t I2cRead8(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 1);
+  return (uint8_t)i2c_buffer;
+}
+
+uint16_t I2cRead16(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  return (uint16_t)i2c_buffer;
+}
+
+int16_t I2cReadS16(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  return (int16_t)i2c_buffer;
+}
+
+uint16_t I2cRead16LE(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  uint16_t temp = (uint16_t)i2c_buffer;
+  return (temp >> 8) | (temp << 8);
+}
+
+int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg)
+{
+  return (int16_t)I2cRead16LE(addr, reg);
+}
+
+int32_t I2cRead24(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 3);
+  return i2c_buffer;
+}
+
+bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size)
+{
+  uint8_t x = I2C_RETRY_COUNTER;
+
+  do {
+    Wire.beginTransmission((uint8_t)addr);
+    Wire.write(reg);
+    uint8_t bytes = size;
+    while (bytes--) {
+      Wire.write((val >> (8 * bytes)) & 0xFF);
+    }
+    x--;
+  } while (Wire.endTransmission(true) != 0 && x != 0);
+  return (x);
+}
+
+bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val)
+{
+   return I2cWrite(addr, reg, val, 1);
+}
+
+bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val)
+{
+   return I2cWrite(addr, reg, val, 2);
+}
+
+int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
+{
+  Wire.beginTransmission((uint8_t)addr);
+  Wire.write((uint8_t)reg);
+  Wire.endTransmission();
+  if (len != Wire.requestFrom((uint8_t)addr, (uint8_t)len)) {
+    return 1;
+  }
+  while (len--) {
+    *reg_data = (uint8_t)Wire.read();
+    reg_data++;
+  }
+  return 0;
+}
+
+int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
+{
+  Wire.beginTransmission((uint8_t)addr);
+  Wire.write((uint8_t)reg);
+  while (len--) {
+    Wire.write(*reg_data);
+    reg_data++;
+  }
+  Wire.endTransmission();
+  return 0;
+}
+
+void I2cScan(char *devs, unsigned int devs_len)
+{
+
+
+
+
+
+
+
+  uint8_t error = 0;
+  uint8_t address = 0;
+  uint8_t any = 0;
+
+  snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_DEVICES_FOUND_AT));
+  for (address = 1; address <= 127; address++) {
+    Wire.beginTransmission(address);
+    error = Wire.endTransmission();
+    if (0 == error) {
+      any = 1;
+      snprintf_P(devs, devs_len, PSTR("%s 0x%02x"), devs, address);
+    }
+    else if (error != 2) {
+      any = 2;
+      snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"Error %d at 0x%02x"), error, address);
+      break;
+    }
+  }
+  if (any) {
+    strncat(devs, "\"}", devs_len - strlen(devs) -1);
+  }
+  else {
+    snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_NO_DEVICES_FOUND "\"}"));
+  }
+}
+
+void I2cResetActive(uint32_t addr, uint32_t count = 1)
+{
+  addr &= 0x7F;
+  count &= 0x7F;
+  while (count-- && (addr < 128)) {
+    i2c_active[addr / 32] &= ~(1 << (addr % 32));
+    addr++;
+  }
+
+}
+
+void I2cSetActive(uint32_t addr, uint32_t count = 1)
+{
+  addr &= 0x7F;
+  count &= 0x7F;
+  while (count-- && (addr < 128)) {
+    i2c_active[addr / 32] |= (1 << (addr % 32));
+    addr++;
+  }
+
+}
+
+void I2cSetActiveFound(uint32_t addr, const char *types)
+{
+  I2cSetActive(addr);
+  AddLog_P2(LOG_LEVEL_INFO, S_LOG_I2C_FOUND_AT, types, addr);
+}
+
+bool I2cActive(uint32_t addr)
+{
+  addr &= 0x7F;
+  if (i2c_active[addr / 32] & (1 << (addr % 32))) {
+    return true;
+  }
+  return false;
+}
+
+bool I2cSetDevice(uint32_t addr)
+{
+  addr &= 0x7F;
+  if (I2cActive(addr)) {
+    return false;
+  }
+  Wire.beginTransmission((uint8_t)addr);
+  return (0 == Wire.endTransmission());
+}
+#endif
+# 1559 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+void SetSeriallog(uint32_t loglevel)
+{
+  Settings.seriallog_level = loglevel;
+  seriallog_level = loglevel;
+  seriallog_timer = 0;
+}
+
+void SetSyslog(uint32_t loglevel)
+{
+  Settings.syslog_level = loglevel;
+  syslog_level = loglevel;
+  syslog_timer = 0;
+}
+
+#ifdef USE_WEBSERVER
+void GetLog(uint32_t idx, char** entry_pp, size_t* len_p)
+{
+  char* entry_p = nullptr;
+  size_t len = 0;
+
+  if (idx) {
+    char* it = web_log;
+    do {
+      uint32_t cur_idx = *it;
+      it++;
+      size_t tmp = strchrspn(it, '\1');
+      tmp++;
+      if (cur_idx == idx) {
+        len = tmp;
+        entry_p = it;
+        break;
+      }
+      it += tmp;
+    } while (it < web_log + WEB_LOG_SIZE && *it != '\0');
+  }
+  *entry_pp = entry_p;
+  *len_p = len;
+}
+#endif
+
+void Syslog(void)
+{
+
+
+  uint32_t current_hash = GetHash(SettingsText(SET_SYSLOG_HOST), strlen(SettingsText(SET_SYSLOG_HOST)));
+  if (syslog_host_hash != current_hash) {
+    syslog_host_hash = current_hash;
+    WiFi.hostByName(SettingsText(SET_SYSLOG_HOST), syslog_host_addr);
+  }
+  if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
+    char syslog_preamble[64];
+    snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);
+    memmove(log_data + strlen(syslog_preamble), log_data, sizeof(log_data) - strlen(syslog_preamble));
+    log_data[sizeof(log_data) -1] = '\0';
+    memcpy(log_data, syslog_preamble, strlen(syslog_preamble));
+    PortUdp.write(log_data, strlen(log_data));
+    PortUdp.endPacket();
+    delay(1);
+  } else {
+    syslog_level = 0;
+    syslog_timer = SYSLOG_TIMER;
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_HOST_NOT_FOUND ". " D_RETRY_IN " %d " D_UNIT_SECOND), SYSLOG_TIMER);
+  }
+}
+
+void AddLog(uint32_t loglevel)
+{
+  char mxtime[10];
+
+  snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
+
+  if (loglevel <= seriallog_level) {
+    Serial.printf("%s%s\r\n", mxtime, log_data);
+  }
+#ifdef USE_WEBSERVER
+  if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
+
+
+    web_log_index &= 0xFF;
+    if (!web_log_index) web_log_index++;
+    while (web_log_index == web_log[0] ||
+           strlen(web_log) + strlen(log_data) + 13 > WEB_LOG_SIZE)
+    {
+      char* it = web_log;
+      it++;
+      it += strchrspn(it, '\1');
+      it++;
+      memmove(web_log, it, WEB_LOG_SIZE -(it-web_log));
+    }
+    snprintf_P(web_log, sizeof(web_log), PSTR("%s%c%s%s\1"), web_log, web_log_index++, mxtime, log_data);
+    web_log_index &= 0xFF;
+    if (!web_log_index) web_log_index++;
+  }
+#endif
+  if (Settings.flag.mqtt_enabled &&
+      !global_state.mqtt_down &&
+      (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
+
+  if (!global_state.wifi_down &&
+      (loglevel <= syslog_level)) { Syslog(); }
+}
+
+void AddLog_P(uint32_t loglevel, const char *formatP)
+{
+  snprintf_P(log_data, sizeof(log_data), formatP);
+  AddLog(loglevel);
+}
+
+void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2)
+{
+  char message[sizeof(log_data)];
+
+  snprintf_P(log_data, sizeof(log_data), formatP);
+  snprintf_P(message, sizeof(message), formatP2);
+  strncat(log_data, message, sizeof(log_data) - strlen(log_data) -1);
+  AddLog(loglevel);
+}
+
+void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  prepped_loglevel = loglevel;
+}
+
+void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  AddLog(loglevel);
+}
+
+void AddLog_Debug(PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  AddLog(LOG_LEVEL_DEBUG);
+}
+
+void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count)
+{
+# 1721 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
+  char hex_char[(count * 3) + 2];
+  AddLog_P2(loglevel, PSTR("DMP: %s"), ToHex_P(buffer, count, hex_char, sizeof(hex_char), ' '));
+}
+
+void AddLogSerial(uint32_t loglevel)
+{
+  AddLogBuffer(loglevel, (uint8_t*)serial_in_buffer, serial_in_byte_counter);
+}
+
+void AddLogMissed(char *sensor, uint32_t misses)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SNS: %s missed %d"), sensor, SENSOR_MAX_MISS - misses);
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
+#define BUTTON_V1 
+#ifdef BUTTON_V1
+
+
+
+
+#define MAX_BUTTON_COMMANDS 5
+const char kCommands[] PROGMEM =
+  D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_RESTART " 1|" D_CMND_UPGRADE " 1";
+
+struct BUTTON {
+  unsigned long debounce = 0;
+  uint16_t hold_timer[MAX_KEYS] = { 0 };
+  uint16_t dual_code = 0;
+
+  uint8_t last_state[MAX_KEYS] = { NOT_PRESSED, NOT_PRESSED, NOT_PRESSED, NOT_PRESSED };
+  uint8_t window_timer[MAX_KEYS] = { 0 };
+  uint8_t press_counter[MAX_KEYS] = { 0 };
+
+  uint8_t dual_receive_count = 0;
+  uint8_t no_pullup_mask = 0;
+  uint8_t inverted_mask = 0;
+  uint8_t present = 0;
+  uint8_t adc = 99;
+} Button;
+
+
+
+void ButtonPullupFlag(uint8 button_bit)
+{
+  bitSet(Button.no_pullup_mask, button_bit);
+}
+
+void ButtonInvertFlag(uint8 button_bit)
+{
+  bitSet(Button.inverted_mask, button_bit);
+}
+
+void ButtonInit(void)
+{
+  Button.present = 0;
+  for (uint32_t i = 0; i < MAX_KEYS; i++) {
+    if (pin[GPIO_KEY1 +i] < 99) {
+      Button.present++;
+      pinMode(pin[GPIO_KEY1 +i], bitRead(Button.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_KEY1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
+    }
+#ifndef USE_ADC_VCC
+    else if ((99 == Button.adc) && ((ADC0_BUTTON == my_adc0) || (ADC0_BUTTON_INV == my_adc0))) {
+      Button.present++;
+      Button.adc = i;
+    }
+#endif
+  }
+}
+
+uint8_t ButtonSerial(uint8_t serial_in_byte)
+{
+  if (Button.dual_receive_count) {
+    Button.dual_receive_count--;
+    if (Button.dual_receive_count) {
+      Button.dual_code = (Button.dual_code << 8) | serial_in_byte;
+      serial_in_byte = 0;
+    } else {
+      if (serial_in_byte != 0xA1) {
+        Button.dual_code = 0;
+      }
+    }
+  }
+  if (0xA0 == serial_in_byte) {
+    serial_in_byte = 0;
+    Button.dual_code = 0;
+    Button.dual_receive_count = 3;
+  }
+
+  return serial_in_byte;
+}
+# 108 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
+void ButtonHandler(void)
+{
+  if (uptime < 4) { return; }
+
+  uint8_t hold_time_extent = IMMINENT_RESET_FACTOR;
+  uint16_t loops_per_second = 1000 / Settings.button_debounce;
+  char scmnd[20];
+
+
+
+  for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
+    uint8_t button = NOT_PRESSED;
+    uint8_t button_present = 0;
+
+    if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type))) {
+      button_present = 1;
+      if (Button.dual_code) {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON " " D_CODE " %04X"), Button.dual_code);
+        button = PRESSED;
+        if (0xF500 == Button.dual_code) {
+          Button.hold_timer[button_index] = (loops_per_second * Settings.param[P_HOLD_TIME] / 10) -1;
+          hold_time_extent = 1;
+        }
+        Button.dual_code = 0;
+      }
+    }
+    else if (pin[GPIO_KEY1 +button_index] < 99) {
+      button_present = 1;
+      button = (digitalRead(pin[GPIO_KEY1 +button_index]) != bitRead(Button.inverted_mask, button_index));
+    }
+#ifndef USE_ADC_VCC
+    if (Button.adc == button_index) {
+      button_present = 1;
+      if (ADC0_BUTTON_INV == my_adc0) {
+        button = (AdcRead(1) < 128);
+      }
+      else if (ADC0_BUTTON == my_adc0) {
+        button = (AdcRead(1) > 128);
+      }
+    }
+#endif
+
+    if (button_present) {
+      XdrvMailbox.index = button_index;
+      XdrvMailbox.payload = button;
+      if (XdrvCall(FUNC_BUTTON_PRESSED)) {
+
+      }
+      else if (SONOFF_4CHPRO == my_module_type) {
+        if (Button.hold_timer[button_index]) { Button.hold_timer[button_index]--; }
+
+        bool button_pressed = false;
+        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_10), button_index +1);
+          Button.hold_timer[button_index] = loops_per_second;
+          button_pressed = true;
+        }
+        if ((NOT_PRESSED == button) && (PRESSED == Button.last_state[button_index])) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_01), button_index +1);
+          if (!Button.hold_timer[button_index]) { button_pressed = true; }
+        }
+        if (button_pressed) {
+          if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
+            ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
+          }
+        }
+      }
+      else {
+        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+          if (Settings.flag.button_single) {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1);
+            if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
+              ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
+            }
+          } else {
+            Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_MULTI_PRESS " %d"), button_index +1, Button.press_counter[button_index]);
+            Button.window_timer[button_index] = loops_per_second / 2;
+          }
+          blinks = 201;
+        }
+
+        if (NOT_PRESSED == button) {
+          Button.hold_timer[button_index] = 0;
+        } else {
+          Button.hold_timer[button_index]++;
+          if (Settings.flag.button_single) {
+            if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
+
+              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "13 0"));
+              ExecuteCommand(scmnd, SRC_BUTTON);
+            }
+          } else {
+            if (Settings.flag.button_restrict) {
+              if (Settings.param[P_HOLD_IGNORE] > 0) {
+                if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+                  Button.hold_timer[button_index] = 0;
+                  Button.press_counter[button_index] = 0;
+                  DEBUG_CORE_LOG(PSTR("BTN: " D_BUTTON "%d cancel by " D_CMND_SETOPTION "40 %d"), button_index +1, Settings.param[P_HOLD_IGNORE]);
+                }
+              }
+              if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {
+                Button.press_counter[button_index] = 0;
+                SendKey(KEY_BUTTON, button_index +1, POWER_HOLD);
+              }
+            } else {
+              if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
+                Button.press_counter[button_index] = 0;
+                snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+                ExecuteCommand(scmnd, SRC_BUTTON);
+              }
+            }
+          }
+        }
+
+        if (!Settings.flag.button_single) {
+          if (Button.window_timer[button_index]) {
+            Button.window_timer[button_index]--;
+          } else {
+            if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0) && (Button.press_counter[button_index] < MAX_BUTTON_COMMANDS +3)) {
+              bool single_press = false;
+              if (Button.press_counter[button_index] < 3) {
+                if ((SONOFF_DUAL_R2 == my_module_type) || (SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+                  single_press = true;
+                } else {
+                  single_press = (Settings.flag.button_swap +1 == Button.press_counter[button_index]);
+                  if ((1 == Button.present) && (2 == devices_present)) {
+                    if (Settings.flag.button_swap) {
+                      Button.press_counter[button_index] = (single_press) ? 1 : 2;
+                    }
+                  } else {
+                    Button.press_counter[button_index] = 1;
+                  }
+                }
+              }
+#if defined(USE_LIGHT) && defined(ROTARY_V1)
+              if (!((0 == button_index) && RotaryButtonPressed())) {
+#endif
+                if (single_press && SendKey(KEY_BUTTON, button_index + Button.press_counter[button_index], POWER_TOGGLE)) {
+
+                } else {
+                  if (Button.press_counter[button_index] < 3) {
+                    if (WifiState() > WIFI_RESTART) {
+                      restart_flag = 1;
+                    } else {
+                      ExecuteCommandPower(button_index + Button.press_counter[button_index], POWER_TOGGLE, SRC_BUTTON);
+                    }
+                  } else {
+                    if (!Settings.flag.button_restrict) {
+                      GetTextIndexed(scmnd, sizeof(scmnd), Button.press_counter[button_index] -3, kCommands);
+                      ExecuteCommand(scmnd, SRC_BUTTON);
+                    }
+                  }
+                }
+#if defined(USE_LIGHT) && defined(ROTARY_V1)
+              }
+#endif
+              Button.press_counter[button_index] = 0;
+            }
+          }
+        }
+      }
+    }
+    Button.last_state[button_index] = button;
+  }
+}
+
+void ButtonLoop(void)
+{
+  if (Button.present) {
+    if (TimeReached(Button.debounce)) {
+      SetNextTimeInterval(Button.debounce, Settings.button_debounce);
+      ButtonHandler();
+    }
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
+const char kTasmotaCommands[] PROGMEM = "|"
+  D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|"
+  D_CMND_SERIALLOG "|" D_CMND_RESTART "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SAVEDATA "|"
+  D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" D_CMND_PRESSURE_RESOLUTION "|" D_CMND_POWER_RESOLUTION "|"
+  D_CMND_VOLTAGE_RESOLUTION "|" D_CMND_FREQUENCY_RESOLUTION "|" D_CMND_CURRENT_RESOLUTION "|" D_CMND_ENERGY_RESOLUTION "|" D_CMND_WEIGHT_RESOLUTION "|"
+  D_CMND_MODULE "|" D_CMND_MODULES "|" D_CMND_GPIO "|" D_CMND_GPIOS "|" D_CMND_TEMPLATE "|" D_CMND_PWM "|" D_CMND_PWMFREQUENCY "|" D_CMND_PWMRANGE "|"
+  D_CMND_BUTTONDEBOUNCE "|" D_CMND_SWITCHDEBOUNCE "|" D_CMND_SYSLOG "|" D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALCONFIG "|"
+  D_CMND_SERIALDELIMITER "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|"
+  D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_INTERLOCK "|" D_CMND_TELEPERIOD "|" D_CMND_RESET "|" D_CMND_TIME "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|"
+  D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_LEDMASK "|" D_CMND_WIFIPOWER "|" D_CMND_TEMPOFFSET "|"
+#ifdef USE_I2C
+  D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
+#endif
+  D_CMND_SENSOR "|" D_CMND_DRIVER;
+
+void (* const TasmotaCommand[])(void) PROGMEM = {
+  &CmndBacklog, &CmndDelay, &CmndPower, &CmndStatus, &CmndState, &CmndSleep, &CmndUpgrade, &CmndUpgrade, &CmndOtaUrl,
+  &CmndSeriallog, &CmndRestart, &CmndPowerOnState, &CmndPulsetime, &CmndBlinktime, &CmndBlinkcount, &CmndSavedata,
+  &CmndSetoption, &CmndTemperatureResolution, &CmndHumidityResolution, &CmndPressureResolution, &CmndPowerResolution,
+  &CmndVoltageResolution, &CmndFrequencyResolution, &CmndCurrentResolution, &CmndEnergyResolution, &CmndWeightResolution,
+  &CmndModule, &CmndModules, &CmndGpio, &CmndGpios, &CmndTemplate, &CmndPwm, &CmndPwmfrequency, &CmndPwmrange,
+  &CmndButtonDebounce, &CmndSwitchDebounce, &CmndSyslog, &CmndLoghost, &CmndLogport, &CmndSerialSend, &CmndBaudrate, &CmndSerialConfig,
+  &CmndSerialDelimiter, &CmndIpAddress, &CmndNtpServer, &CmndAp, &CmndSsid, &CmndPassword, &CmndHostname, &CmndWifiConfig,
+  &CmndFriendlyname, &CmndSwitchMode, &CmndInterlock, &CmndTeleperiod, &CmndReset, &CmndTime, &CmndTimezone, &CmndTimeStd,
+  &CmndTimeDst, &CmndAltitude, &CmndLedPower, &CmndLedState, &CmndLedMask, &CmndWifiPower, &CmndTempOffset,
+#ifdef USE_I2C
+  &CmndI2cScan, CmndI2cDriver,
+#endif
+  &CmndSensor, &CmndDriver };
+
+const char kWifiConfig[] PROGMEM =
+  D_WCFG_0_RESTART "||" D_WCFG_2_WIFIMANAGER "||" D_WCFG_4_RETRY "|" D_WCFG_5_WAIT "|" D_WCFG_6_SERIAL "|" D_WCFG_7_WIFIMANAGER_RESET_ONLY;
+
+
+
+void ResponseCmndNumber(int value)
+{
+  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, value);
+}
+
+void ResponseCmndFloat(float value, uint32_t decimals)
+{
+  char stemp1[TOPSZ];
+  dtostrfd(value, decimals, stemp1);
+  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp1);
+}
+
+void ResponseCmndIdxNumber(int value)
+{
+  Response_P(S_JSON_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
+}
+
+void ResponseCmndChar(const char* value)
+{
+  Response_P(S_JSON_COMMAND_SVALUE, XdrvMailbox.command, value);
+}
+
+void ResponseCmndStateText(uint32_t value)
+{
+  ResponseCmndChar(GetStateText(value));
+}
+
+void ResponseCmndDone(void)
+{
+  ResponseCmndChar(D_JSON_DONE);
+}
+
+void ResponseCmndIdxChar(const char* value)
+{
+  Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
+}
+
+void ResponseCmndAll(uint32_t text_index, uint32_t count)
+{
+  mqtt_data[0] = '\0';
+  for (uint32_t i = 0; i < count; i++) {
+    ResponseAppend_P(PSTR("%c\"%s%d\":\"%s\""), (i) ? ',' : '{', XdrvMailbox.command, i +1, SettingsText(text_index +i));
+  }
+  ResponseJsonEnd();
+}
+
+
+
+void ExecuteCommand(const char *cmnd, uint32_t source)
+{
+
+
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("ExecuteCommand"));
+#endif
+  ShowSource(source);
+
+  const char *pos = cmnd;
+  while (*pos && isspace(*pos)) {
+    pos++;
+  }
+
+  const char *start = pos;
+
+  while (*pos && (isalpha(*pos) || isdigit(*pos) || '_' == *pos || '/' == *pos)) {
+    if ('/' == *pos) {
+      start = pos + 1;
+    }
+    pos++;
+  }
+  if ('\0' == *start || pos <= start) {
+    return;
+  }
+
+  uint32_t size = pos - start;
+  char stopic[size + 2];
+  stopic[0] = '/';
+  memcpy(stopic+1, start, size);
+  stopic[size+1] = '\0';
+
+  char svalue[strlen(pos) +1];
+  strlcpy(svalue, pos, sizeof(svalue));
+  CommandHandler(stopic, svalue, strlen(svalue));
+}
+# 148 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
+void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("CommandHandler"));
+#endif
+
+  while (*dataBuf && isspace(*dataBuf)) {
+    dataBuf++;
+    data_len--;
+  }
+
+  bool grpflg = (strstr(topicBuf, SettingsText(SET_MQTT_GRP_TOPIC)) != nullptr);
+
+  char stemp1[TOPSZ];
+  GetFallbackTopic_P(stemp1, "");
+  fallback_topic_flag = (!strncmp(topicBuf, stemp1, strlen(stemp1)));
+
+  char *type = strrchr(topicBuf, '/');
+
+  uint32_t index = 1;
+  bool user_index = false;
+  if (type != nullptr) {
+    type++;
+    uint32_t i;
+    for (i = 0; i < strlen(type); i++) {
+      type[i] = toupper(type[i]);
+    }
+    while (isdigit(type[i-1])) {
+      i--;
+    }
+    if (i < strlen(type)) {
+      index = atoi(type +i);
+      user_index = true;
+    }
+    type[i] = '\0';
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CMD: " D_GROUP " %d, " D_INDEX " %d, " D_COMMAND " \"%s\", " D_DATA " \"%s\""), grpflg, index, type, dataBuf);
+
+  if (type != nullptr) {
+    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_ERROR "\"}"));
+
+    if (Settings.ledstate &0x02) { blinks++; }
+
+    if (!strcmp(dataBuf,"?")) { data_len = 0; }
+
+    char *p;
+    int32_t payload = strtol(dataBuf, &p, 0);
+    if (p == dataBuf) { payload = -99; }
+    int temp_payload = GetStateNumber(dataBuf);
+    if (temp_payload > -1) { payload = temp_payload; }
+
+    DEBUG_CORE_LOG(PSTR("CMD: Payload %d"), payload);
+
+
+    backlog_delay = millis() + Settings.param[P_BACKLOG_DELAY];
+
+    char command[CMDSZ] = { 0 };
+    XdrvMailbox.command = command;
+    XdrvMailbox.index = index;
+    XdrvMailbox.data_len = data_len;
+    XdrvMailbox.payload = payload;
+    XdrvMailbox.grpflg = grpflg;
+    XdrvMailbox.usridx = user_index;
+    XdrvMailbox.topic = type;
+    XdrvMailbox.data = dataBuf;
+
+#ifdef USE_SCRIPT_SUB_COMMAND
+
+    if (!Script_SubCmd()) {
+      if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
+        if (!XdrvCall(FUNC_COMMAND)) {
+          if (!XsnsCall(FUNC_COMMAND)) {
+            type = nullptr;
+          }
+        }
+      }
+    }
+#else
+    if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
+      if (!XdrvCall(FUNC_COMMAND)) {
+        if (!XsnsCall(FUNC_COMMAND)) {
+          type = nullptr;
+        }
+      }
+    }
+#endif
+
+  }
+
+  if (type == nullptr) {
+    blinks = 201;
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_COMMAND));
+    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}"));
+    type = (char*)stemp1;
+  }
+
+  if (mqtt_data[0] != '\0') {
+     MqttPublishPrefixTopic_P(RESULT_OR_STAT, type);
+     XdrvRulesProcess();
+  }
+  fallback_topic_flag = false;
+}
+
+
+
+void CmndBacklog(void)
+{
+  if (XdrvMailbox.data_len) {
+
+#ifdef SUPPORT_IF_STATEMENT
+    char *blcommand = strtok(XdrvMailbox.data, ";");
+    while ((blcommand != nullptr) && (backlog.size() < MAX_BACKLOG))
+#else
+    uint32_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer;
+    bl_pointer--;
+    char *blcommand = strtok(XdrvMailbox.data, ";");
+    while ((blcommand != nullptr) && (backlog_index != bl_pointer))
+#endif
+    {
+      while(true) {
+        blcommand = Trim(blcommand);
+        if (!strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) {
+          blcommand += strlen(D_CMND_BACKLOG);
+        } else {
+          break;
+        }
+      }
+      if (*blcommand != '\0') {
+#ifdef SUPPORT_IF_STATEMENT
+        if (backlog.size() < MAX_BACKLOG) {
+          backlog.add(blcommand);
+        }
+#else
+        backlog[backlog_index] = String(blcommand);
+        backlog_index++;
+        if (backlog_index >= MAX_BACKLOG) backlog_index = 0;
+#endif
+      }
+      blcommand = strtok(nullptr, ";");
+    }
+
+    mqtt_data[0] = '\0';
+  } else {
+    bool blflag = BACKLOG_EMPTY;
+#ifdef SUPPORT_IF_STATEMENT
+    backlog.clear();
+#else
+    backlog_pointer = backlog_index;
+#endif
+    ResponseCmndChar(blflag ? D_JSON_EMPTY : D_JSON_ABORTED);
+  }
+}
+
+void CmndDelay(void)
+{
+  if ((XdrvMailbox.payload >= (MIN_BACKLOG_DELAY / 100)) && (XdrvMailbox.payload <= 3600)) {
+    backlog_delay = millis() + (100 * XdrvMailbox.payload);
+  }
+  uint32_t bl_delay = 0;
+  long bl_delta = TimePassedSince(backlog_delay);
+  if (bl_delta < 0) { bl_delay = (bl_delta *-1) / 100; }
+  ResponseCmndNumber(bl_delay);
+}
+
+void CmndPower(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= devices_present)) {
+    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_BLINK_STOP)) {
+      XdrvMailbox.payload = POWER_SHOW_STATE;
+    }
+
+    ExecuteCommandPower(XdrvMailbox.index, XdrvMailbox.payload, SRC_IGNORE);
+    mqtt_data[0] = '\0';
+  }
+  else if (0 == XdrvMailbox.index) {
+    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_TOGGLE)) {
+      XdrvMailbox.payload = POWER_SHOW_STATE;
+    }
+    SetAllPower(XdrvMailbox.payload, SRC_IGNORE);
+    mqtt_data[0] = '\0';
+  }
+}
+
+void CmndStatus(void)
+{
+  uint32_t payload = ((XdrvMailbox.payload < 0) || (XdrvMailbox.payload > MAX_STATUS)) ? 99 : XdrvMailbox.payload;
+
+  uint32_t option = STAT;
+  char stemp[200];
+  char stemp2[TOPSZ];
+
+
+
+
+
+  if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }
+  if (!energy_flg && (9 == payload)) { payload = 99; }
+  if (!CrashFlag() && (12 == payload)) { payload = 99; }
+
+  if ((0 == payload) || (99 == payload)) {
+    uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) { maxfn = 1; }
+#endif
+    stemp[0] = '\0';
+    for (uint32_t i = 0; i < maxfn; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), SettingsText(SET_FRIENDLYNAME1 +i));
+    }
+    stemp2[0] = '\0';
+    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+      snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%s%d" ), stemp2, (i > 0 ? "," : ""), Settings.switchmode[i]);
+    }
+    Response_P(PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":[%s],\"" D_CMND_TOPIC "\":\"%s\",\""
+                          D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\""
+                          D_CMND_LEDMASK "\":\"%04X\",\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_SWITCHTOPIC "\":\"%s\",\""
+                          D_CMND_SWITCHMODE "\":[%s],\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_SWITCHRETAIN "\":%d,\"" D_CMND_SENSORRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"),
+                          ModuleNr(), stemp, mqtt_topic,
+                          SettingsText(SET_MQTT_BUTTON_TOPIC), power, Settings.poweronstate, Settings.ledstate,
+                          Settings.ledmask, Settings.save_data,
+                          Settings.flag.save_state,
+                          SettingsText(SET_MQTT_SWITCH_TOPIC),
+                          stemp2,
+                          Settings.flag.mqtt_button_retain,
+                          Settings.flag.mqtt_switch_retain,
+                          Settings.flag.mqtt_sensor_retain,
+                          Settings.flag.mqtt_power_retain);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS));
+  }
+
+  if ((0 == payload) || (1 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
+                          D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
+                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"BCResetTime\":\"%s\",\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
+                          Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
+                          GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
+                          Settings.cfg_holder, Settings.bootcount, GetDateAndTime(DT_BOOTCOUNT).c_str(), Settings.save_flag, GetSettingsAddress());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
+  }
+
+  if ((0 == payload) || (2 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\""
+                          D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
+                          "\"Hardware\":\"%s\""
+                          "%s}}"),
+                          my_version, my_image, GetBuildDateAndTime().c_str(),
+                          ESP.getBootVersion(), ESP.getSdkVersion(),
+                          GetDeviceHardware().c_str(),
+                          GetStatistics().c_str());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "2"));
+  }
+
+  if ((0 == payload) || (3 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_MQTTLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\""
+                          D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\""
+                          D_JSON_RESOLUTION "\":\"%08X\",\"" D_CMND_SETOPTION "\":[\"%08X\",\"%s\",\"%08X\",\"%08X\"]}}"),
+                          Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level,
+                          SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), Settings.tele_period,
+                          Settings.flag2.data, Settings.flag.data, ToHex_P((unsigned char*)Settings.param, PARAM8_SIZE, stemp2, sizeof(stemp2)),
+                          Settings.flag3.data, Settings.flag4.data);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
+  }
+
+  if ((0 == payload) || (4 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS4_MEMORY "\":{\"" D_JSON_PROGRAMSIZE "\":%d,\"" D_JSON_FREEMEMORY "\":%d,\"" D_JSON_HEAPSIZE "\":%d,\""
+                          D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d,\"" D_JSON_FLASHCHIPID "\":\"%06X\",\"" D_JSON_FLASHMODE "\":%d,\""
+                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
+                          ESP.getSketchSize()/1024, ESP.getFreeSketchSpace()/1024, ESP.getFreeHeap()/1024,
+                          ESP.getFlashChipSize()/1024, ESP.getFlashChipRealSize()/1024, ESP.getFlashChipId(), ESP.getFlashChipMode(),
+                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5, feature6);
+    XsnsDriverState();
+    ResponseAppend_P(PSTR(",\"Sensors\":"));
+    XsnsSensorState();
+    ResponseJsonEndEnd();
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "4"));
+  }
+
+  if ((0 == payload) || (5 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"" D_JSON_GATEWAY "\":\"%s\",\""
+                          D_JSON_SUBNETMASK "\":\"%s\",\"" D_JSON_DNSSERVER "\":\"%s\",\"" D_JSON_MAC "\":\"%s\",\""
+                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"),
+                          my_hostname, WiFi.localIP().toString().c_str(), IPAddress(Settings.ip_address[1]).toString().c_str(),
+                          IPAddress(Settings.ip_address[2]).toString().c_str(), IPAddress(Settings.ip_address[3]).toString().c_str(), WiFi.macAddress().c_str(),
+                          Settings.webserver, Settings.sta_config, WifiGetOutputPower().c_str());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "5"));
+  }
+
+  if (((0 == payload) || (6 == payload)) && Settings.flag.mqtt_enabled) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\""
+                          D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"),
+                          SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT),
+                          mqtt_client, SettingsText(SET_MQTT_USER), MqttConnectCount(), MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "6"));
+  }
+
+  if ((0 == payload) || (7 == payload)) {
+    if (99 == Settings.timezone) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%d" ), Settings.timezone);
+    } else {
+      snprintf_P(stemp, sizeof(stemp), PSTR("\"%s\"" ), GetTimeZone().c_str());
+    }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
+                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"),
+                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
+                          GetTime(3).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
+#else
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
+                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s}}"),
+                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
+                          GetTime(3).c_str(), stemp);
+#endif
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7"));
+  }
+
+#if defined(USE_ENERGY_SENSOR) && defined(USE_ENERGY_MARGIN_DETECTION)
+  if (energy_flg) {
+    if ((0 == payload) || (9 == payload)) {
+      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERDELTA "\":%d,\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\""
+                            D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"),
+                            Settings.energy_power_delta, Settings.energy_min_power, Settings.energy_max_power,
+                            Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current);
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "9"));
+    }
+  }
+#endif
+
+  if ((0 == payload) || (8 == payload) || (10 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS10_SENSOR "\":"));
+    MqttShowSensor();
+    ResponseJsonEnd();
+    if (8 == payload) {
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "8"));
+    } else {
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "10"));
+    }
+  }
+
+  if ((0 == payload) || (11 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS11_STATUS "\":"));
+    MqttShowState();
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "11"));
+  }
+
+  if (CrashFlag()) {
+    if ((0 == payload) || (12 == payload)) {
+      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":"));
+      CrashDump();
+      ResponseJsonEnd();
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "12"));
+    }
+  }
+
+#ifdef USE_SCRIPT_STATUS
+  if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">U",2,mqtt_data);
+#endif
+  mqtt_data[0] = '\0';
+}
+
+void CmndState(void)
+{
+  mqtt_data[0] = '\0';
+  MqttShowState();
+  if (Settings.flag3.hass_tele_on_power) {
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
+  }
+#ifdef USE_HOME_ASSISTANT
+  if (Settings.flag.hass_discovery) {
+    HAssPublishStatus();
+  }
+#endif
+}
+
+void CmndTempOffset(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    int value = (int)(CharToFloat(XdrvMailbox.data) * 10);
+    if ((value > -127) && (value < 127)) {
+      Settings.temp_comp = value;
+    }
+  }
+  ResponseCmndFloat((float)(Settings.temp_comp) / 10, 1);
+}
+
+void CmndSleep(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 251)) {
+    Settings.sleep = XdrvMailbox.payload;
+    sleep = XdrvMailbox.payload;
+    WiFiSetSleepMode();
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.sleep, sleep);
+
+}
+
+void CmndUpgrade(void)
+{
+
+
+
+
+  if (((1 == XdrvMailbox.data_len) && (1 == XdrvMailbox.payload)) || ((XdrvMailbox.data_len >= 3) && NewerVersion(XdrvMailbox.data))) {
+    ota_state_flag = 3;
+    char stemp1[TOPSZ];
+    Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, my_version, GetOtaUrl(stemp1, sizeof(stemp1)));
+  } else {
+    Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, my_version);
+  }
+}
+
+void CmndOtaUrl(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_OTAURL, (SC_DEFAULT == Shortcut()) ? OTA_URL : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_OTAURL));
+}
+
+void CmndSeriallog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.flag.mqtt_serial = 0;
+    SetSeriallog(XdrvMailbox.payload);
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, seriallog_level);
+}
+
+void CmndRestart(void)
+{
+  switch (XdrvMailbox.payload) {
+  case 1:
+    restart_flag = 2;
+    ResponseCmndChar(D_JSON_RESTARTING);
+    break;
+  case -1:
+    CmndCrash();
+    break;
+  case -2:
+    CmndWDT();
+    break;
+  case -3:
+    CmndBlockedLoop();
+    break;
+  case 99:
+    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
+    EspRestart();
+    break;
+  default:
+    ResponseCmndChar(D_JSON_ONE_TO_RESTART);
+  }
+}
+
+void CmndPowerOnState(void)
+{
+  if (my_module_type != MOTOR) {
+
+
+
+
+
+
+
+    if ((XdrvMailbox.payload >= POWER_ALL_OFF) && (XdrvMailbox.payload <= POWER_ALL_OFF_PULSETIME_ON)) {
+      Settings.poweronstate = XdrvMailbox.payload;
+      if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+        for (uint32_t i = 1; i <= devices_present; i++) {
+          ExecuteCommandPower(i, POWER_ON, SRC_IGNORE);
+        }
+      }
+    }
+    ResponseCmndNumber(Settings.poweronstate);
+  }
+}
+
+void CmndPulsetime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PULSETIMERS)) {
+    uint32_t items = 1;
+    if (!XdrvMailbox.usridx && !XdrvMailbox.data_len) {
+      items = MAX_PULSETIMERS;
+    } else {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
+        Settings.pulse_timer[XdrvMailbox.index -1] = XdrvMailbox.payload;
+        SetPulseTimer(XdrvMailbox.index -1, XdrvMailbox.payload);
+      }
+    }
+    mqtt_data[0] = '\0';
+    for (uint32_t i = 0; i < items; i++) {
+      uint32_t index = (1 == items) ? XdrvMailbox.index : i +1;
+      ResponseAppend_P(PSTR("%c\"%s%d\":{\"" D_JSON_SET "\":%d,\"" D_JSON_REMAINING "\":%d}"),
+        (i) ? ',' : '{',
+        XdrvMailbox.command, index,
+        Settings.pulse_timer[index -1], GetPulseTimer(index -1));
+    }
+    ResponseJsonEnd();
+  }
+}
+
+void CmndBlinktime(void)
+{
+  if ((XdrvMailbox.payload > 1) && (XdrvMailbox.payload <= 3600)) {
+    Settings.blinktime = XdrvMailbox.payload;
+    if (blink_timer > 0) { blink_timer = millis() + (100 * XdrvMailbox.payload); }
+  }
+  ResponseCmndNumber(Settings.blinktime);
+}
+
+void CmndBlinkcount(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.blinkcount = XdrvMailbox.payload;
+    if (blink_counter) { blink_counter = Settings.blinkcount *2; }
+  }
+  ResponseCmndNumber(Settings.blinkcount);
+}
+
+void CmndSavedata(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3600)) {
+    Settings.save_data = XdrvMailbox.payload;
+    save_data_counter = Settings.save_data;
+  }
+  SettingsSaveAll();
+  char stemp1[TOPSZ];
+  if (Settings.save_data > 1) {
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_EVERY " %d " D_UNIT_SECOND), Settings.save_data);
+  }
+  ResponseCmndChar((Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data));
+}
+
+void CmndSetoption(void)
+{
+  if (XdrvMailbox.index < 114) {
+    uint32_t ptype;
+    uint32_t pindex;
+    if (XdrvMailbox.index <= 31) {
+      ptype = 2;
+      pindex = XdrvMailbox.index;
+    }
+    else if (XdrvMailbox.index <= 49) {
+      ptype = 1;
+      pindex = XdrvMailbox.index -32;
+    }
+    else if (XdrvMailbox.index <= 81) {
+      ptype = 3;
+      pindex = XdrvMailbox.index -50;
+    }
+    else {
+      ptype = 4;
+      pindex = XdrvMailbox.index -82;
+    }
+
+    if (XdrvMailbox.payload >= 0) {
+      if (1 == ptype) {
+        uint32_t param_low = 0;
+        uint32_t param_high = 255;
+        switch (pindex) {
+          case P_HOLD_TIME:
+          case P_MAX_POWER_RETRY:
+            param_low = 1;
+            param_high = 250;
+            break;
+        }
+        if ((XdrvMailbox.payload >= param_low) && (XdrvMailbox.payload <= param_high)) {
+          Settings.param[pindex] = XdrvMailbox.payload;
+#ifdef USE_LIGHT
+          if (P_RGB_REMAP == pindex) {
+            LightUpdateColorMapping();
+            restart_flag = 2;
+          }
+#endif
+#if (defined(USE_IR_REMOTE) && defined(USE_IR_RECEIVE)) || defined(USE_IR_REMOTE_FULL)
+          if (P_IR_UNKNOW_THRESHOLD == pindex) {
+            IrReceiveUpdateThreshold();
+          }
+#endif
+        } else {
+          ptype = 99;
+        }
+      } else {
+        if (XdrvMailbox.payload <= 1) {
+          if (2 == ptype) {
+            switch (pindex) {
+              case 5:
+              case 6:
+              case 7:
+              case 9:
+              case 14:
+              case 22:
+              case 23:
+              case 25:
+              case 27:
+                ptype = 99;
+                break;
+              case 3:
+              case 15:
+                restart_flag = 2;
+              default:
+                bitWrite(Settings.flag.data, pindex, XdrvMailbox.payload);
+            }
+            if (12 == pindex) {
+              stop_flash_rotate = XdrvMailbox.payload;
+              SettingsSave(2);
+            }
+  #ifdef USE_HOME_ASSISTANT
+            if ((19 == pindex) || (30 == pindex)) {
+              HAssDiscover();
+            }
+  #endif
+          }
+          else if (3 == ptype) {
+            bitWrite(Settings.flag3.data, pindex, XdrvMailbox.payload);
+            switch (pindex) {
+              case 5:
+                if (0 == XdrvMailbox.payload) {
+                  restart_flag = 2;
+                }
+                break;
+              case 10:
+                WiFiSetSleepMode();
+                break;
+              case 18:
+              case 25:
+                restart_flag = 2;
+                break;
+            }
+          }
+          else if (4 == ptype) {
+            bitWrite(Settings.flag4.data, pindex, XdrvMailbox.payload);
+          }
+        } else {
+          ptype = 99;
+        }
+      }
+    }
+
+    if (ptype < 99) {
+      if (1 == ptype) {
+        ResponseCmndIdxNumber(Settings.param[pindex]);
+      } else {
+        uint32_t flag = Settings.flag.data;
+        if (3 == ptype) {
+          flag = Settings.flag3.data;
+        }
+        else if (4 == ptype) {
+          flag = Settings.flag4.data;
+        }
+        ResponseCmndIdxChar(GetStateText(bitRead(flag, pindex)));
+      }
+    }
+  }
+}
+
+void CmndTemperatureResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.temperature_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.temperature_resolution);
+}
+
+void CmndHumidityResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.humidity_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.humidity_resolution);
+}
+
+void CmndPressureResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.pressure_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.pressure_resolution);
+}
+
+void CmndPowerResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.wattage_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.wattage_resolution);
+}
+
+void CmndVoltageResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.voltage_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.voltage_resolution);
+}
+
+void CmndFrequencyResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.frequency_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.frequency_resolution);
+}
+
+void CmndCurrentResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.current_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.current_resolution);
+}
+
+void CmndEnergyResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    Settings.flag2.energy_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.energy_resolution);
+}
+
+void CmndWeightResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.weight_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.weight_resolution);
+}
+
+void CmndModule(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAXMODULE)) {
+    bool present = false;
+    if (0 == XdrvMailbox.payload) {
+      XdrvMailbox.payload = USER_MODULE;
+      present = true;
+    } else {
+      XdrvMailbox.payload--;
+      present = ValidTemplateModule(XdrvMailbox.payload);
+    }
+    if (present) {
+      Settings.last_module = Settings.module;
+      Settings.module = XdrvMailbox.payload;
+      SetModuleType();
+      if (Settings.last_module != XdrvMailbox.payload) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          Settings.my_gp.io[i] = GPIO_NONE;
+        }
+      }
+      restart_flag = 2;
+    }
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, ModuleNr(), ModuleName().c_str());
+}
+
+void CmndModules(void)
+{
+  uint32_t midx = USER_MODULE;
+  uint32_t lines = 1;
+  bool jsflg = false;
+  for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
+    if (i > 0) { midx = pgm_read_byte(kModuleNiceList + i -1); }
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_MODULES "%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    uint32_t j = i ? midx +1 : 0;
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), j, AnyModuleName(midx).c_str()) > (LOGSZ - TOPSZ)) || (i == sizeof(kModuleNiceList))) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
+      jsflg = false;
+      lines++;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+void CmndGpio(void)
+{
+  if (XdrvMailbox.index < sizeof(Settings.my_gp)) {
+    myio cmodule;
+    ModuleGpios(&cmodule);
+    if (ValidGPIO(XdrvMailbox.index, cmodule.io[XdrvMailbox.index]) && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < GPIO_SENSOR_END)) {
+      bool present = false;
+      for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+        uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+        if (midx == XdrvMailbox.payload) { present = true; }
+      }
+      if (present) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          if (ValidGPIO(i, cmodule.io[i]) && (Settings.my_gp.io[i] == XdrvMailbox.payload)) {
+            Settings.my_gp.io[i] = GPIO_NONE;
+          }
+        }
+        Settings.my_gp.io[XdrvMailbox.index] = XdrvMailbox.payload;
+        restart_flag = 2;
+      }
+    }
+    Response_P(PSTR("{"));
+    bool jsflg = false;
+    for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+      if (ValidGPIO(i, cmodule.io[i]) || ((GPIO_USER == XdrvMailbox.payload) && !FlashPin(i))) {
+        if (jsflg) { ResponseAppend_P(PSTR(",")); }
+        jsflg = true;
+        uint8_t sensor_type = Settings.my_gp.io[i];
+        if (!ValidGPIO(i, cmodule.io[i])) {
+          sensor_type = cmodule.io[i];
+          if (GPIO_USER == sensor_type) {
+            sensor_type = GPIO_NONE;
+          }
+        }
+        uint8_t sensor_name_idx = sensor_type;
+        const char *sensor_names = kSensorNames;
+        if (sensor_type > GPIO_FIX_START) {
+          sensor_name_idx = sensor_type - GPIO_FIX_START -1;
+          sensor_names = kSensorNamesFixed;
+        }
+        char stemp1[TOPSZ];
+        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s\"}"),
+          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names));
+      }
+    }
+    if (jsflg) {
+      ResponseJsonEnd();
+    } else {
+      ResponseCmndChar(D_JSON_NOT_SUPPORTED);
+    }
+  }
+}
+
+void CmndGpios(void)
+{
+  myio cmodule;
+  ModuleGpios(&cmodule);
+  uint32_t lines = 1;
+  bool jsflg = false;
+  for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+    uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+    if ((XdrvMailbox.payload != 255) && GetUsedInModule(midx, cmodule.io)) { continue; }
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_GPIOS "%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    char stemp1[TOPSZ];
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), midx, GetTextIndexed(stemp1, sizeof(stemp1), midx, kSensorNames)) > (LOGSZ - TOPSZ)) || (i == sizeof(kGpioNiceList) -1)) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
+      jsflg = false;
+      lines++;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+void CmndTemplate(void)
+{
+
+  bool error = false;
+
+  if (strstr(XdrvMailbox.data, "{") == nullptr) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= MAXMODULE)) {
+      XdrvMailbox.payload--;
+      if (ValidTemplateModule(XdrvMailbox.payload)) {
+        ModuleDefault(XdrvMailbox.payload);
+        if (USER_MODULE == Settings.module) { restart_flag = 2; }
+      }
+    }
+    else if (0 == XdrvMailbox.payload) {
+      if (Settings.module != USER_MODULE) {
+        ModuleDefault(Settings.module);
+      }
+    }
+    else if (255 == XdrvMailbox.payload) {
+      if (Settings.module != USER_MODULE) {
+        ModuleDefault(Settings.module);
+      }
+      snprintf_P(Settings.user_template.name, sizeof(Settings.user_template.name), PSTR("Merged"));
+      uint32_t j = 0;
+      for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+        if (6 == i) { j = 9; }
+        if (8 == i) { j = 12; }
+        if (my_module.io[j] > GPIO_NONE) {
+          Settings.user_template.gp.io[i] = my_module.io[j];
+        }
+        j++;
+      }
+    }
+  }
+  else {
+    if (JsonTemplate(XdrvMailbox.data)) {
+      if (USER_MODULE == Settings.module) { restart_flag = 2; }
+    } else {
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      error = true;
+    }
+  }
+  if (!error) { TemplateJson(); }
+}
+
+void CmndPwm(void)
+{
+  if (pwm_present && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PWMS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= Settings.pwm_range) && (pin[GPIO_PWM1 + XdrvMailbox.index -1] < 99)) {
+      Settings.pwm_value[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      analogWrite(pin[GPIO_PWM1 + XdrvMailbox.index -1], bitRead(pwm_inverted, XdrvMailbox.index -1) ? Settings.pwm_range - XdrvMailbox.payload : XdrvMailbox.payload);
+    }
+    Response_P(PSTR("{"));
+    MqttShowPWMState();
+    ResponseJsonEnd();
+  }
+}
+
+void CmndPwmfrequency(void)
+{
+  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload >= PWM_MIN) && (XdrvMailbox.payload <= PWM_MAX))) {
+    Settings.pwm_frequency = (1 == XdrvMailbox.payload) ? PWM_FREQ : XdrvMailbox.payload;
+    analogWriteFreq(Settings.pwm_frequency);
+  }
+  ResponseCmndNumber(Settings.pwm_frequency);
+}
+
+void CmndPwmrange(void)
+{
+  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload > 254) && (XdrvMailbox.payload < 1024))) {
+    Settings.pwm_range = (1 == XdrvMailbox.payload) ? PWM_RANGE : XdrvMailbox.payload;
+    for (uint32_t i = 0; i < MAX_PWMS; i++) {
+      if (Settings.pwm_value[i] > Settings.pwm_range) {
+        Settings.pwm_value[i] = Settings.pwm_range;
+      }
+    }
+    analogWriteRange(Settings.pwm_range);
+  }
+  ResponseCmndNumber(Settings.pwm_range);
+}
+
+void CmndButtonDebounce(void)
+{
+  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
+    Settings.button_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.button_debounce);
+}
+
+void CmndSwitchDebounce(void)
+{
+  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
+    Settings.switch_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.switch_debounce);
+}
+
+void CmndBaudrate(void)
+{
+  if (XdrvMailbox.payload >= 300) {
+    XdrvMailbox.payload /= 300;
+    uint32_t baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
+    SetSerialBaudrate(baudrate);
+  }
+  ResponseCmndNumber(Settings.baudrate * 300);
+}
+
+void CmndSerialConfig(void)
+{
+
+
+
+
+  if (XdrvMailbox.data_len > 0) {
+    if (XdrvMailbox.data_len < 3) {
+      if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2)) {
+        SetSerialConfig(XdrvMailbox.payload);
+      }
+    }
+    else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8)) {
+      uint8_t serial_config = XdrvMailbox.payload -5;
+
+      bool valid = true;
+      char parity = (XdrvMailbox.data[1] & 0xdf);
+      if ('E' == parity) {
+        serial_config += 0x08;
+      }
+      else if ('O' == parity) {
+        serial_config += 0x10;
+      }
+      else if ('N' != parity) {
+        valid = false;
+      }
+
+      if ('2' == XdrvMailbox.data[2]) {
+        serial_config += 0x04;
+      }
+      else if ('1' != XdrvMailbox.data[2]) {
+        valid = false;
+      }
+
+      if (valid) {
+        SetSerialConfig(serial_config);
+      }
+    }
+  }
+  ResponseCmndChar(GetSerialConfig().c_str());
+}
+
+void CmndSerialSend(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
+    SetSeriallog(LOG_LEVEL_NONE);
+    Settings.flag.mqtt_serial = 1;
+    Settings.flag.mqtt_serial_raw = (XdrvMailbox.index > 3) ? 1 : 0;
+    if (XdrvMailbox.data_len > 0) {
+      if (1 == XdrvMailbox.index) {
+        Serial.printf("%s\n", XdrvMailbox.data);
+      }
+      else if (2 == XdrvMailbox.index || 4 == XdrvMailbox.index) {
+        for (uint32_t i = 0; i < XdrvMailbox.data_len; i++) {
+          Serial.write(XdrvMailbox.data[i]);
+        }
+      }
+      else if (3 == XdrvMailbox.index) {
+        uint32_t dat_len = XdrvMailbox.data_len;
+        Serial.printf("%s", Unescape(XdrvMailbox.data, &dat_len));
+      }
+      else if (5 == XdrvMailbox.index) {
+        SerialSendRaw(RemoveSpace(XdrvMailbox.data));
+      }
+      ResponseCmndDone();
+    }
+  }
+}
+
+void CmndSerialDelimiter(void)
+{
+  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload < 256)) {
+    if (XdrvMailbox.payload > 0) {
+      Settings.serial_delimiter = XdrvMailbox.payload;
+    } else {
+      uint32_t dat_len = XdrvMailbox.data_len;
+      Unescape(XdrvMailbox.data, &dat_len);
+      Settings.serial_delimiter = XdrvMailbox.data[0];
+    }
+  }
+  ResponseCmndNumber(Settings.serial_delimiter);
+}
+
+void CmndSyslog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    SetSyslog(XdrvMailbox.payload);
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.syslog_level, syslog_level);
+}
+
+void CmndLoghost(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_SYSLOG_HOST, (SC_DEFAULT == Shortcut()) ? SYS_LOG_HOST : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_SYSLOG_HOST));
+}
+
+void CmndLogport(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.syslog_port = (1 == XdrvMailbox.payload) ? SYS_LOG_PORT : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.syslog_port);
+}
+
+void CmndIpAddress(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+    uint32_t address;
+    if (ParseIp(&address, XdrvMailbox.data)) {
+      Settings.ip_address[XdrvMailbox.index -1] = address;
+
+    }
+    char stemp1[TOPSZ];
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(" (%s)"), WiFi.localIP().toString().c_str());
+    Response_P(S_JSON_COMMAND_INDEX_SVALUE_SVALUE, XdrvMailbox.command, XdrvMailbox.index, IPAddress(Settings.ip_address[XdrvMailbox.index -1]).toString().c_str(), (1 == XdrvMailbox.index) ? stemp1:"");
+  }
+}
+
+void CmndNtpServer(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_NTP_SERVERS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_NTPSERVER1, MAX_NTP_SERVERS);
+    } else {
+      uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(ntp_server,
+          (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
+        SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
+
+        ntp_force_sync = true;
+      }
+      ResponseCmndIdxChar(SettingsText(ntp_server));
+    }
+  }
+}
+
+void CmndAp(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    switch (XdrvMailbox.payload) {
+    case 0:
+      Settings.sta_active ^= 1;
+      break;
+    case 1:
+    case 2:
+      Settings.sta_active = XdrvMailbox.payload -1;
+    }
+    restart_flag = 2;
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active));
+}
+
+void CmndSsid(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SSIDS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STASSID1, MAX_SSIDS);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
+                (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
+        Settings.sta_active = XdrvMailbox.index -1;
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndPassword(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    if ((XdrvMailbox.data_len > 4) || (SC_CLEAR == Shortcut()) || (SC_DEFAULT == Shortcut())) {
+      SettingsUpdateText(SET_STAPWD1 + XdrvMailbox.index -1,
+              (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_PASS1 : STA_PASS2 : XdrvMailbox.data);
+      Settings.sta_active = XdrvMailbox.index -1;
+      restart_flag = 2;
+      ResponseCmndIdxChar(SettingsText(SET_STAPWD1 + XdrvMailbox.index -1));
+    } else {
+      Response_P(S_JSON_COMMAND_INDEX_ASTERISK, XdrvMailbox.command, XdrvMailbox.index);
+    }
+  }
+}
+
+void CmndHostname(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    SettingsUpdateText(SET_HOSTNAME, (SC_DEFAULT == Shortcut()) ? WIFI_HOSTNAME : XdrvMailbox.data);
+    if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+      SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+    }
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_HOSTNAME));
+}
+
+void CmndWifiConfig(void)
+{
+  if ((XdrvMailbox.payload >= WIFI_RESTART) && (XdrvMailbox.payload < MAX_WIFI_OPTION)) {
+    if ((EX_WIFI_SMARTCONFIG == XdrvMailbox.payload) || (EX_WIFI_WPSCONFIG == XdrvMailbox.payload)) {
+      XdrvMailbox.payload = WIFI_MANAGER;
+    }
+    Settings.sta_config = XdrvMailbox.payload;
+    wifi_state_flag = Settings.sta_config;
+    if (WifiState() > WIFI_RESTART) {
+      restart_flag = 2;
+    }
+  }
+  char stemp1[TOPSZ];
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_config, GetTextIndexed(stemp1, sizeof(stemp1), Settings.sta_config, kWifiConfig));
+}
+
+void CmndFriendlyname(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_FRIENDLYNAMES)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_FRIENDLYNAME1, MAX_FRIENDLYNAMES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        char stemp1[TOPSZ];
+        if (1 == XdrvMailbox.index) {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
+        } else {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
+        }
+        SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndSwitchMode(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SWITCHES)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_SWITCH_OPTION)) {
+      Settings.switchmode[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.switchmode[XdrvMailbox.index-1]);
+  }
+}
+
+void CmndInterlock(void)
+{
+
+  uint32_t max_relays = devices_present;
+  if (light_type) { max_relays--; }
+  if (max_relays > sizeof(Settings.interlock[0]) * 8) { max_relays = sizeof(Settings.interlock[0]) * 8; }
+  if (max_relays > 1) {
+    if (XdrvMailbox.data_len > 0) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
+        char *group;
+        char *q;
+        uint32_t group_index = 0;
+        power_t relay_mask = 0;
+        for (group = strtok_r(XdrvMailbox.data, " ", &q); group && group_index < MAX_INTERLOCKS; group = strtok_r(nullptr, " ", &q)) {
+          char *str;
+          char *p;
+          for (str = strtok_r(group, ",", &p); str; str = strtok_r(nullptr, ",", &p)) {
+            int pbit = atoi(str);
+            if ((pbit > 0) && (pbit <= max_relays)) {
+              pbit--;
+              if (!bitRead(relay_mask, pbit)) {
+                bitSet(relay_mask, pbit);
+                bitSet(Settings.interlock[group_index], pbit);
+              }
+            }
+          }
+          group_index++;
+        }
+        for (uint32_t i = 0; i < group_index; i++) {
+          uint32_t minimal_bits = 0;
+          for (uint32_t j = 0; j < max_relays; j++) {
+            if (bitRead(Settings.interlock[i], j)) { minimal_bits++; }
+          }
+          if (minimal_bits < 2) { Settings.interlock[i] = 0; }
+        }
+      } else {
+        Settings.flag.interlock = XdrvMailbox.payload &1;
+        if (Settings.flag.interlock) {
+          SetDevicePower(power, SRC_IGNORE);
+        }
+      }
+#ifdef USE_SHUTTER
+      if (Settings.flag3.shutter_mode) {
+        ShutterInit();
+      }
+#endif
+    }
+    Response_P(PSTR("{\"" D_CMND_INTERLOCK "\":\"%s\",\"" D_JSON_GROUPS "\":\""), GetStateText(Settings.flag.interlock));
+    uint32_t anygroup = 0;
+    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+      if (Settings.interlock[i]) {
+        anygroup++;
+        ResponseAppend_P(PSTR("%s"), (anygroup > 1) ? " " : "");
+        uint32_t anybit = 0;
+        power_t mask = 1;
+        for (uint32_t j = 0; j < max_relays; j++) {
+          if (Settings.interlock[i] & mask) {
+            anybit++;
+            ResponseAppend_P(PSTR("%s%d"), (anybit > 1) ? "," : "", j +1);
+          }
+          mask <<= 1;
+        }
+      }
+    }
+    if (!anygroup) {
+      for (uint32_t j = 1; j <= max_relays; j++) {
+        ResponseAppend_P(PSTR("%s%d"), (j > 1) ? "," : "", j);
+      }
+    }
+    ResponseAppend_P(PSTR("\"}"));
+  } else {
+    Settings.flag.interlock = 0;
+    ResponseCmndStateText(Settings.flag.interlock);
+  }
+}
+
+void CmndTeleperiod(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.tele_period = (1 == XdrvMailbox.payload) ? TELE_PERIOD : XdrvMailbox.payload;
+    if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) Settings.tele_period = 10;
+    tele_period = Settings.tele_period;
+  }
+  ResponseCmndNumber(Settings.tele_period);
+}
+
+void CmndReset(void)
+{
+  switch (XdrvMailbox.payload) {
+  case 1:
+    restart_flag = 211;
+    ResponseCmndChar(D_JSON_RESET_AND_RESTARTING);
+    break;
+  case 2 ... 6:
+    restart_flag = 210 + XdrvMailbox.payload;
+    Response_P(PSTR("{\"" D_CMND_RESET "\":\"" D_JSON_ERASE ", " D_JSON_RESET_AND_RESTARTING "\"}"));
+    break;
+  case 99:
+    Settings.bootcount = 0;
+    Settings.bootcount_reset_time = 0;
+    ResponseCmndDone();
+    break;
+  default:
+    ResponseCmndChar(D_JSON_ONE_TO_RESET);
+  }
+}
+
+void CmndTime(void)
+{
+
+
+
+
+
+
+
+  uint32_t format = Settings.flag2.time_format;
+  if (XdrvMailbox.data_len > 0) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
+      Settings.flag2.time_format = XdrvMailbox.payload -1;
+      format = Settings.flag2.time_format;
+    } else {
+      format = 1;
+      RtcSetTime(XdrvMailbox.payload);
+    }
+  }
+  mqtt_data[0] = '\0';
+  ResponseAppendTimeFormat(format);
+  ResponseJsonEnd();
+}
+
+void CmndTimezone(void)
+{
+  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload >= -13)) {
+    Settings.timezone = XdrvMailbox.payload;
+    Settings.timezone_minutes = 0;
+    if (XdrvMailbox.payload < 15) {
+      char *p = strtok (XdrvMailbox.data, ":");
+      if (p) {
+        p = strtok (nullptr, ":");
+        if (p) {
+          Settings.timezone_minutes = strtol(p, nullptr, 10);
+          if (Settings.timezone_minutes > 59) { Settings.timezone_minutes = 59; }
+        }
+      }
+    } else {
+      Settings.timezone = 99;
+    }
+    ntp_force_sync = true;
+  }
+  if (99 == Settings.timezone) {
+    ResponseCmndNumber(Settings.timezone);
+  } else {
+    char stemp1[TOPSZ];
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("%+03d:%02d"), Settings.timezone, Settings.timezone_minutes);
+    ResponseCmndChar(stemp1);
+  }
+}
+
+void CmndTimeStdDst(uint32_t ts)
+{
+
+  if (XdrvMailbox.data_len > 0) {
+    if (strstr(XdrvMailbox.data, ",") != nullptr) {
+      uint32_t tpos = 0;
+      int value = 0;
+      char *p = XdrvMailbox.data;
+      char *q = p;
+      while (p && (tpos < 7)) {
+        if (p > q) {
+          if (1 == tpos) { Settings.tflag[ts].hemis = value &1; }
+          if (2 == tpos) { Settings.tflag[ts].week = (value < 0) ? 0 : (value > 4) ? 4 : value; }
+          if (3 == tpos) { Settings.tflag[ts].month = (value < 1) ? 1 : (value > 12) ? 12 : value; }
+          if (4 == tpos) { Settings.tflag[ts].dow = (value < 1) ? 1 : (value > 7) ? 7 : value; }
+          if (5 == tpos) { Settings.tflag[ts].hour = (value < 0) ? 0 : (value > 23) ? 23 : value; }
+          if (6 == tpos) { Settings.toffset[ts] = (value < -900) ? -900 : (value > 900) ? 900 : value; }
+        }
+        p = Trim(p);
+        if (tpos && (*p == ',')) { p++; }
+        p = Trim(p);
+        q = p;
+        value = strtol(p, &p, 10);
+        tpos++;
+      }
+      ntp_force_sync = true;
+    } else {
+      if (0 == XdrvMailbox.payload) {
+        if (0 == ts) {
+          SettingsResetStd();
+        } else {
+          SettingsResetDst();
+        }
+      }
+      ntp_force_sync = true;
+    }
+  }
+  Response_P(PSTR("{\"%s\":{\"Hemisphere\":%d,\"Week\":%d,\"Month\":%d,\"Day\":%d,\"Hour\":%d,\"Offset\":%d}}"),
+    XdrvMailbox.command, Settings.tflag[ts].hemis, Settings.tflag[ts].week, Settings.tflag[ts].month, Settings.tflag[ts].dow, Settings.tflag[ts].hour, Settings.toffset[ts]);
+}
+
+void CmndTimeStd(void)
+{
+  CmndTimeStdDst(0);
+}
+
+void CmndTimeDst(void)
+{
+  CmndTimeStdDst(1);
+}
+
+void CmndAltitude(void)
+{
+  if ((XdrvMailbox.data_len > 0) && ((XdrvMailbox.payload >= -30000) && (XdrvMailbox.payload <= 30000))) {
+    Settings.altitude = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.altitude);
+}
+
+void CmndLedPower(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_LEDS)) {
+    if (99 == pin[GPIO_LEDLNK]) { XdrvMailbox.index = 1; }
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+      Settings.ledstate &= 8;
+      uint32_t mask = 1 << (XdrvMailbox.index -1);
+      switch (XdrvMailbox.payload) {
+      case 0:
+        led_power &= (0xFF ^ mask);
+        Settings.ledstate = 0;
+        break;
+      case 1:
+        led_power |= mask;
+        Settings.ledstate = 8;
+        break;
+      case 2:
+        led_power ^= mask;
+        Settings.ledstate ^= 8;
+        break;
+      }
+      blinks = 0;
+      if (99 == pin[GPIO_LEDLNK]) {
+        SetLedPower(Settings.ledstate &8);
+      } else {
+        SetLedPowerIdx(XdrvMailbox.index -1, (led_power & mask));
+      }
+    }
+    bool state = bitRead(led_power, XdrvMailbox.index -1);
+    if (99 == pin[GPIO_LEDLNK]) {
+      state = bitRead(Settings.ledstate, 3);
+    }
+    ResponseCmndIdxChar(GetStateText(state));
+  }
+}
+
+void CmndLedState(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_LED_OPTION)) {
+    Settings.ledstate = XdrvMailbox.payload;
+    if (!Settings.ledstate) {
+      SetLedPowerAll(0);
+      SetLedLink(0);
+    }
+  }
+  ResponseCmndNumber(Settings.ledstate);
+}
+
+void CmndLedMask(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Settings.ledmask = XdrvMailbox.payload;
+  }
+  char stemp1[TOPSZ];
+  snprintf_P(stemp1, sizeof(stemp1), PSTR("%d (0x%04X)"), Settings.ledmask, Settings.ledmask);
+  ResponseCmndChar(stemp1);
+}
+
+void CmndWifiPower(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Settings.wifi_output_power = (uint8_t)(CharToFloat(XdrvMailbox.data) * 10);
+    if (Settings.wifi_output_power > 205) {
+      Settings.wifi_output_power = 205;
+    }
+    WifiSetOutputPower();
+  }
+  ResponseCmndChar(WifiGetOutputPower().c_str());
+}
+
+#ifdef USE_I2C
+void CmndI2cScan(void)
+{
+  if (i2c_flg) {
+    I2cScan(mqtt_data, sizeof(mqtt_data));
+  }
+}
+
+void CmndI2cDriver(void)
+{
+  if (XdrvMailbox.index < MAX_I2C_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.i2c_drivers[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+      restart_flag = 2;
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_I2CDRIVER "\":"));
+  I2cDriverState();
+  ResponseJsonEnd();
+}
+#endif
+
+void CmndSensor(void)
+{
+  XsnsCall(FUNC_COMMAND_SENSOR);
+}
+
+void CmndDriver(void)
+{
+  XdrvCall(FUNC_COMMAND_DRIVER);
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_crash_recorder.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_crash_recorder.ino"
+const uint32_t crash_magic = 0x53415400;
+const uint32_t crash_rtc_offset = 32;
+const uint32_t crash_dump_max_len = 31;
+
+
+
+
+
+
+extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack, uint32_t stack_end )
+{
+  uint32_t addr_written = 0;
+  uint32_t value;
+
+  for (uint32_t i = stack; i < stack_end; i += 4) {
+    value = *((uint32_t*) i);
+    if ((value >= 0x40000000) && (value < 0x40300000)) {
+      ESP.rtcUserMemoryWrite(crash_rtc_offset + addr_written, (uint32_t*)&value, sizeof(value));
+      addr_written++;
+      if (addr_written >= crash_dump_max_len) { break; }
+    }
+  }
+  value = crash_magic + addr_written;
+  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+}
+
+
+void CmndCrash(void)
+{
+  volatile uint32_t dummy;
+  dummy = *((uint32_t*) 0x00000000);
+}
+
+
+void CmndWDT(void)
+{
+  volatile uint32_t dummy = 0;
+  while (1) {
+    dummy++;
+  }
+}
+
+
+void CmndBlockedLoop(void)
+{
+  while (1) {
+    delay(1000);
+  }
+}
+
+
+void CrashDumpClear(void)
+{
+  uint32_t value = 0;
+  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+}
+
+
+
+
+
+bool CrashFlag(void)
+{
+  return ((ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST) || oswatch_blocked_loop);
+}
+
+void CrashDump(void)
+{
+  ResponseAppend_P(PSTR("{\"Exception\":%d,\"Reason\":\"%s\",\"EPC\":[\"%08x\",\"%08x\",\"%08x\"],\"EXCVADDR\":\"%08x\",\"DEPC\":\"%08x\""),
+    resetInfo.exccause,
+    GetResetReason().c_str(),
+    resetInfo.epc1,
+    resetInfo.epc2,
+    resetInfo.epc3,
+    resetInfo.excvaddr,
+    resetInfo.depc);
+
+  uint32_t value;
+  ESP.rtcUserMemoryRead(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+  if (crash_magic == (value & 0xFFFFFF00)) {
+    ResponseAppend_P(PSTR(",\"CallChain\":["));
+    uint32_t count = value & 0x3F;
+    for (uint32_t i = 0; i < count; i++) {
+      ESP.rtcUserMemoryRead(crash_rtc_offset +i, (uint32_t*)&value, sizeof(value));
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"%08x\""), value);
+    }
+    ResponseAppend_P(PSTR("]"));
+  }
+
+  ResponseJsonEnd();
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_esptool.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_esptool.ino"
+#define USE_ESPTOOL 
+#ifdef USE_ESPTOOL
+
+
+
+
+
+
+
+#define READ_REG(REG) (*((volatile uint32_t *)(REG)))
+#define WRITE_REG(REG,VAL) *((volatile uint32_t *)(REG)) = (VAL)
+#define REG_SET_MASK(reg,mask) WRITE_REG((reg), (READ_REG(reg)|(mask)))
+
+#define SPI_BASE_REG 0x60000200
+
+#define SPI_CMD_REG (SPI_BASE_REG + 0x00)
+#define SPI_FLASH_RDSR (1<<27)
+#define SPI_FLASH_SE (1<<24)
+#define SPI_FLASH_BE (1<<23)
+#define SPI_FLASH_WREN (1<<30)
+
+#define SPI_ADDR_REG (SPI_BASE_REG + 0x04)
+#define SPI_CTRL_REG (SPI_BASE_REG + 0x08)
+#define SPI_RD_STATUS_REG (SPI_BASE_REG + 0x10)
+#define SPI_W0_REG (SPI_BASE_REG + 0x40)
+#define SPI_EXT2_REG (SPI_BASE_REG + 0xF8)
+
+#define SPI_ST 0x7
+
+
+#define SECTORS_PER_BLOCK (FLASH_BLOCK_SIZE / SPI_FLASH_SEC_SIZE)
+
+
+static const uint32_t STATUS_WIP_BIT = (1 << 0);
+
+
+inline static void spi_wait_ready(void)
+{
+  while((READ_REG(SPI_EXT2_REG) & SPI_ST)) { }
+}
+
+
+
+static bool spiflash_is_ready(void)
+{
+  spi_wait_ready();
+  WRITE_REG(SPI_RD_STATUS_REG, 0);
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_RDSR);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+  uint32_t status_value = READ_REG(SPI_RD_STATUS_REG);
+  return (status_value & STATUS_WIP_BIT) == 0;
+}
+
+static void spi_write_enable(void)
+{
+  while(!spiflash_is_ready()) { }
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_WREN);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+}
+
+bool EsptoolEraseSector(uint32_t sector)
+{
+  spi_write_enable();
+  spi_wait_ready();
+
+  WRITE_REG(SPI_ADDR_REG, (sector * SPI_FLASH_SEC_SIZE) & 0xffffff);
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_SE);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+  while(!spiflash_is_ready()) { }
+
+  return true;
+}
+
+void EsptoolErase(uint32_t start_sector, uint32_t end_sector)
+{
+  int next_erase_sector = start_sector;
+  int remaining_erase_sector = end_sector - start_sector;
+
+  while (remaining_erase_sector > 0) {
+    spi_write_enable();
+
+    uint32_t command = SPI_FLASH_SE;
+    uint32_t sectors_to_erase = 1;
+    if (remaining_erase_sector >= SECTORS_PER_BLOCK &&
+        next_erase_sector % SECTORS_PER_BLOCK == 0) {
+      command = SPI_FLASH_BE;
+      sectors_to_erase = SECTORS_PER_BLOCK;
+    }
+    uint32_t addr = next_erase_sector * SPI_FLASH_SEC_SIZE;
+
+    spi_wait_ready();
+    WRITE_REG(SPI_ADDR_REG, addr & 0xffffff);
+    WRITE_REG(SPI_CMD_REG, command);
+    while(READ_REG(SPI_CMD_REG) != 0) { }
+    remaining_erase_sector -= sectors_to_erase;
+    next_erase_sector += sectors_to_erase;
+
+    while (!spiflash_is_ready()) { }
+    yield();
+    OsWatchLoop();
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
+# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
+void GetFeatures(void)
+{
+  feature_drv1 = 0x00000000;
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  feature_drv1 |= 0x00000001;
+#endif
+#ifdef USE_LIGHT
+  feature_drv1 |= 0x00000002;
+#endif
+#ifdef USE_I2C
+  feature_drv1 |= 0x00000004;
+#endif
+#ifdef USE_SPI
+  feature_drv1 |= 0x00000008;
+#endif
+#ifdef USE_DISCOVERY
+  feature_drv1 |= 0x00000010;
+#endif
+#ifdef USE_ARDUINO_OTA
+  feature_drv1 |= 0x00000020;
+#endif
+#ifdef USE_MQTT_TLS
+  feature_drv1 |= 0x00000040;
+#endif
+#ifdef USE_WEBSERVER
+  feature_drv1 |= 0x00000080;
+#endif
+#ifdef WEBSERVER_ADVERTISE
+  feature_drv1 |= 0x00000100;
+#endif
+#ifdef USE_EMULATION_HUE
+  feature_drv1 |= 0x00000200;
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
+  feature_drv1 |= 0x00000400;
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
+
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)
+
+#endif
+#ifdef MQTT_HOST_DISCOVERY
+  feature_drv1 |= 0x00002000;
+#endif
+#ifdef USE_ARILUX_RF
+  feature_drv1 |= 0x00004000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_WS2812)
+  feature_drv1 |= 0x00008000;
+#endif
+#ifdef USE_WS2812_DMA
+  feature_drv1 |= 0x00010000;
+#endif
+#if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL)
+  feature_drv1 |= 0x00020000;
+#endif
+#ifdef USE_IR_HVAC
+  feature_drv1 |= 0x00040000;
+#endif
+#ifdef USE_IR_RECEIVE
+  feature_drv1 |= 0x00080000;
+#endif
+#ifdef USE_DOMOTICZ
+  feature_drv1 |= 0x00100000;
+#endif
+#ifdef USE_DISPLAY
+  feature_drv1 |= 0x00200000;
+#endif
+#ifdef USE_HOME_ASSISTANT
+  feature_drv1 |= 0x00400000;
+#endif
+#ifdef USE_SERIAL_BRIDGE
+  feature_drv1 |= 0x00800000;
+#endif
+#ifdef USE_TIMERS
+  feature_drv1 |= 0x01000000;
+#endif
+#ifdef USE_SUNRISE
+  feature_drv1 |= 0x02000000;
+#endif
+#ifdef USE_TIMERS_WEB
+  feature_drv1 |= 0x04000000;
+#endif
+#ifdef USE_RULES
+  feature_drv1 |= 0x08000000;
+#endif
+#ifdef USE_KNX
+  feature_drv1 |= 0x10000000;
+#endif
+#ifdef USE_WPS
+  feature_drv1 |= 0x20000000;
+#endif
+#ifdef USE_SMARTCONFIG
+  feature_drv1 |= 0x40000000;
+#endif
+#ifdef USE_ENERGY_POWER_LIMIT
+  feature_drv1 |= 0x80000000;
+#endif
+
+
+
+  feature_drv2 = 0x00000000;
+
+#ifdef USE_CONFIG_OVERRIDE
+  feature_drv2 |= 0x00000001;
+#endif
+#ifdef FIRMWARE_MINIMAL
+  feature_drv2 |= 0x00000002;
+#endif
+#ifdef FIRMWARE_SENSORS
+  feature_drv2 |= 0x00000004;
+#endif
+#ifdef FIRMWARE_CLASSIC
+  feature_drv2 |= 0x00000008;
+#endif
+#ifdef FIRMWARE_KNX_NO_EMULATION
+  feature_drv2 |= 0x00000010;
+#endif
+#ifdef USE_DISPLAY_MODES1TO5
+  feature_drv2 |= 0x00000020;
+#endif
+#ifdef USE_DISPLAY_GRAPH
+  feature_drv2 |= 0x00000040;
+#endif
+#ifdef USE_DISPLAY_LCD
+  feature_drv2 |= 0x00000080;
+#endif
+#ifdef USE_DISPLAY_SSD1306
+  feature_drv2 |= 0x00000100;
+#endif
+#ifdef USE_DISPLAY_MATRIX
+  feature_drv2 |= 0x00000200;
+#endif
+#ifdef USE_DISPLAY_ILI9341
+  feature_drv2 |= 0x00000400;
+#endif
+#ifdef USE_DISPLAY_EPAPER_29
+  feature_drv2 |= 0x00000800;
+#endif
+#ifdef USE_DISPLAY_SH1106
+  feature_drv2 |= 0x00001000;
+#endif
+#ifdef USE_MP3_PLAYER
+  feature_drv2 |= 0x00002000;
+#endif
+#ifdef USE_PCA9685
+  feature_drv2 |= 0x00004000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_TUYA_MCU)
+  feature_drv2 |= 0x00008000;
+#endif
+#ifdef USE_RC_SWITCH
+  feature_drv2 |= 0x00010000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_ARMTRONIX_DIMMERS)
+  feature_drv2 |= 0x00020000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_SM16716)
+  feature_drv2 |= 0x00040000;
+#endif
+#ifdef USE_SCRIPT
+  feature_drv2 |= 0x00080000;
+#endif
+#ifdef USE_EMULATION_WEMO
+  feature_drv2 |= 0x00100000;
+#endif
+#ifdef USE_SONOFF_IFAN
+  feature_drv2 |= 0x00200000;
+#endif
+#ifdef USE_ZIGBEE
+  feature_drv2 |= 0x00400000;
+#endif
+#ifdef NO_EXTRA_4K_HEAP
+  feature_drv2 |= 0x00800000;
+#endif
+#ifdef VTABLES_IN_IRAM
+  feature_drv2 |= 0x01000000;
+#endif
+#ifdef VTABLES_IN_DRAM
+  feature_drv2 |= 0x02000000;
+#endif
+#ifdef VTABLES_IN_FLASH
+  feature_drv2 |= 0x04000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+  feature_drv2 |= 0x08000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+  feature_drv2 |= 0x10000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+  feature_drv2 |= 0x20000000;
+#endif
+#ifdef DEBUG_THEO
+  feature_drv2 |= 0x40000000;
+#endif
+#ifdef USE_DEBUG_DRIVER
+  feature_drv2 |= 0x80000000;
+#endif
+
+
+
+  feature_sns1 = 0x00000000;
+
+#ifdef USE_COUNTER
+  feature_sns1 |= 0x00000001;
+#endif
+#ifdef USE_ADC_VCC
+  feature_sns1 |= 0x00000002;
+#endif
+#ifdef USE_ENERGY_SENSOR
+  feature_sns1 |= 0x00000004;
+#endif
+#ifdef USE_PZEM004T
+  feature_sns1 |= 0x00000008;
+#endif
+#ifdef USE_DS18B20
+  feature_sns1 |= 0x00000010;
+#endif
+#ifdef USE_DS18x20_LEGACY
+  feature_sns1 |= 0x00000020;
+#endif
+#ifdef USE_DS18x20
+  feature_sns1 |= 0x00000040;
+#endif
+#ifdef USE_DHT
+  feature_sns1 |= 0x00000080;
+#endif
+#ifdef USE_SHT
+  feature_sns1 |= 0x00000100;
+#endif
+#ifdef USE_HTU
+  feature_sns1 |= 0x00000200;
+#endif
+#ifdef USE_BMP
+  feature_sns1 |= 0x00000400;
+#endif
+#ifdef USE_BME680
+  feature_sns1 |= 0x00000800;
+#endif
+#ifdef USE_BH1750
+  feature_sns1 |= 0x00001000;
+#endif
+#ifdef USE_VEML6070
+  feature_sns1 |= 0x00002000;
+#endif
+#ifdef USE_ADS1115_I2CDEV
+  feature_sns1 |= 0x00004000;
+#endif
+#ifdef USE_ADS1115
+  feature_sns1 |= 0x00008000;
+#endif
+#ifdef USE_INA219
+  feature_sns1 |= 0x00010000;
+#endif
+#ifdef USE_SHT3X
+  feature_sns1 |= 0x00020000;
+#endif
+#ifdef USE_MHZ19
+  feature_sns1 |= 0x00040000;
+#endif
+#ifdef USE_TSL2561
+  feature_sns1 |= 0x00080000;
+#endif
+#ifdef USE_SENSEAIR
+  feature_sns1 |= 0x00100000;
+#endif
+#ifdef USE_PMS5003
+  feature_sns1 |= 0x00200000;
+#endif
+#ifdef USE_MGS
+  feature_sns1 |= 0x00400000;
+#endif
+#ifdef USE_NOVA_SDS
+  feature_sns1 |= 0x00800000;
+#endif
+#ifdef USE_SGP30
+  feature_sns1 |= 0x01000000;
+#endif
+#ifdef USE_SR04
+  feature_sns1 |= 0x02000000;
+#endif
+#ifdef USE_SDM120
+  feature_sns1 |= 0x04000000;
+#endif
+#ifdef USE_SI1145
+  feature_sns1 |= 0x08000000;
+#endif
+#ifdef USE_SDM630
+  feature_sns1 |= 0x10000000;
+#endif
+#ifdef USE_LM75AD
+  feature_sns1 |= 0x20000000;
+#endif
+#ifdef USE_APDS9960
+  feature_sns1 |= 0x40000000;
+#endif
+#ifdef USE_TM1638
+  feature_sns1 |= 0x80000000;
+#endif
+
+
+
+  feature_sns2 = 0x00000000;
+
+#ifdef USE_MCP230xx
+  feature_sns2 |= 0x00000001;
+#endif
+#ifdef USE_MPR121
+  feature_sns2 |= 0x00000002;
+#endif
+#ifdef USE_CCS811
+  feature_sns2 |= 0x00000004;
+#endif
+#ifdef USE_MPU6050
+  feature_sns2 |= 0x00000008;
+#endif
+#ifdef USE_MCP230xx_OUTPUT
+  feature_sns2 |= 0x00000010;
+#endif
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+  feature_sns2 |= 0x00000020;
+#endif
+#ifdef USE_HLW8012
+  feature_sns2 |= 0x00000040;
+#endif
+#ifdef USE_CSE7766
+  feature_sns2 |= 0x00000080;
+#endif
+#ifdef USE_MCP39F501
+  feature_sns2 |= 0x00000100;
+#endif
+#ifdef USE_PZEM_AC
+  feature_sns2 |= 0x00000200;
+#endif
+#ifdef USE_DS3231
+  feature_sns2 |= 0x00000400;
+#endif
+#ifdef USE_HX711
+  feature_sns2 |= 0x00000800;
+#endif
+#ifdef USE_PZEM_DC
+  feature_sns2 |= 0x00001000;
+#endif
+#ifdef USE_TX20_WIND_SENSOR
+  feature_sns2 |= 0x00002000;
+#endif
+#ifdef USE_MGC3130
+  feature_sns2 |= 0x00004000;
+#endif
+#ifdef USE_RF_SENSOR
+  feature_sns2 |= 0x00008000;
+#endif
+#ifdef USE_THEO_V2
+  feature_sns2 |= 0x00010000;
+#endif
+#ifdef USE_ALECTO_V2
+  feature_sns2 |= 0x00020000;
+#endif
+#ifdef USE_AZ7798
+  feature_sns2 |= 0x00040000;
+#endif
+#ifdef USE_MAX31855
+  feature_sns2 |= 0x00080000;
+#endif
+#ifdef USE_PN532_HSU
+  feature_sns2 |= 0x00100000;
+#endif
+#ifdef USE_MAX44009
+  feature_sns2 |= 0x00200000;
+#endif
+#ifdef USE_SCD30
+  feature_sns2 |= 0x00400000;
+#endif
+#ifdef USE_HRE
+  feature_sns2 |= 0x00800000;
+#endif
+#ifdef USE_ADE7953
+  feature_sns2 |= 0x01000000;
+#endif
+#ifdef USE_SPS30
+  feature_sns2 |= 0x02000000;
+#endif
+#ifdef USE_VL53L0X
+  feature_sns2 |= 0x04000000;
+#endif
+#ifdef USE_MLX90614
+  feature_sns2 |= 0x08000000;
+#endif
+#ifdef USE_MAX31865
+  feature_sns2 |= 0x10000000;
+#endif
+#ifdef USE_CHIRP
+  feature_sns2 |= 0x20000000;
+#endif
+#ifdef USE_SOLAX_X1
+  feature_sns2 |= 0x40000000;
+#endif
+#ifdef USE_PAJ7620
+  feature_sns2 |= 0x80000000;
+#endif
+
+
+
+  feature5 = 0x00000000;
+
+#ifdef USE_BUZZER
+  feature5 |= 0x00000001;
+#endif
+#ifdef USE_RDM6300
+  feature5 |= 0x00000002;
+#endif
+#ifdef USE_IBEACON
+  feature5 |= 0x00000004;
+#endif
+#ifdef USE_SML_M
+  feature5 |= 0x00000008;
+#endif
+#ifdef USE_INA226
+  feature5 |= 0x00000010;
+#endif
+#ifdef USE_A4988_STEPPER
+  feature5 |= 0x00000020;
+#endif
+#ifdef USE_DDS2382
+  feature5 |= 0x00000040;
+#endif
+#ifdef USE_SM2135
+  feature5 |= 0x00000080;
+#endif
+#ifdef USE_SHUTTER
+  feature5 |= 0x00000100;
+#endif
+#ifdef USE_PCF8574
+  feature5 |= 0x00000200;
+#endif
+#ifdef USE_DDSU666
+  feature5 |= 0x00000400;
+#endif
+#ifdef USE_DEEPSLEEP
+  feature5 |= 0x00000800;
+#endif
+#ifdef USE_SONOFF_SC
+  feature5 |= 0x00001000;
+#endif
+#ifdef USE_SONOFF_RF
+  feature5 |= 0x00002000;
+#endif
+#ifdef USE_SONOFF_L1
+  feature5 |= 0x00004000;
+#endif
+#ifdef USE_EXS_DIMMER
+  feature5 |= 0x00008000;
+#endif
+#ifdef USE_ARDUINO_SLAVE
+  feature5 |= 0x00010000;
+#endif
+#ifdef USE_HIH6
+  feature5 |= 0x00020000;
+#endif
+#ifdef USE_HPMA
+  feature5 |= 0x00040000;
+#endif
+#ifdef USE_TSL2591
+  feature5 |= 0x00080000;
+#endif
+#ifdef USE_DHT12
+  feature5 |= 0x00100000;
+#endif
+#ifdef USE_DS1624
+  feature5 |= 0x00200000;
+#endif
+#ifdef USE_GPS
+  feature5 |= 0x00400000;
+#endif
+#ifdef USE_HOTPLUG
+  feature5 |= 0x00800000;
+#endif
+#ifdef USE_NRF24
+  feature5 |= 0x01000000;
+#endif
+#ifdef USE_MIBLE
+  feature5 |= 0x02000000;
+#endif
+#ifdef USE_HM10
+  feature5 |= 0x04000000;
+#endif
+#ifdef USE_LE01MR
+  feature5 |= 0x08000000;
+#endif
+#ifdef USE_AHT10
+  feature5 |= 0x10000000;
+#endif
+
+
+
+
+
+
+
+  feature6 = 0x00000000;
+# 568 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
+# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
+#ifdef USE_FLOG
+
+class FLOG
+
+#define MAGIC_WORD_FL 0x464c
+
+{
+
+struct header_t{
+    uint16_t magic_word;
+    uint16_t padding;
+    uint32_t physical_start_sector:10;
+    uint32_t number:10;
+    uint32_t buf_pointer:12;
+    };
+
+private:
+void _readSector(uint8_t one_sector);
+void _eraseSector(uint8_t one_sector);
+void _writeSector(uint8_t one_sector);
+void _clearBuffer(void);
+void _searchSaves(void);
+void _findFirstErasedSector(void);
+void _showBuffer(void);
+void _initBuffer(void);
+void _saveBufferToSector(void);
+header_t _saved_header;
+
+public:
+  uint32_t size;
+  uint32_t start;
+  uint32_t end;
+  uint16_t num_sectors;
+
+  uint16_t first_erased_sector;
+  uint16_t current_sector;
+
+  uint16_t bytes_left;
+  uint16_t sectors_left;
+
+  uint8_t mode = 0;
+  bool found_saved_data = false;
+  bool ready = false;
+  bool running_download = false;
+  bool recording = false;
+
+  union sector_t{
+  uint32_t dword_buffer[FLASH_SECTOR_SIZE/4];
+  uint8_t byte_buffer[FLASH_SECTOR_SIZE];
+  header_t header;
+  } sector;
+
+  void init(void);
+  void addToBuffer(uint8_t src[], uint32_t size);
+  void startRecording(bool append);
+  void stopRecording(void);
+
+  typedef void (*CallbackNoArgs) ();
+  typedef void (*CallbackWithArgs) (uint8_t *_record);
+
+  void startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter);
+};
+
+extern "C" uint32_t _SPIFFS_start;
+extern "C" uint32_t _FS_start;
+
+
+
+
+void FLOG::init(void)
+{
+DEBUG_SENSOR_LOG(PSTR("FLOG: init ..."));
+size = ESP.getSketchSize();
+
+start = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+end = (uint32_t)&_SPIFFS_start - 0x40200000;
+#else
+end = (uint32_t)&_FS_start - 0x40200000;
+#endif
+num_sectors = (end - start)/FLASH_SECTOR_SIZE;
+DEBUG_SENSOR_LOG(PSTR("FLOG: size: 0x%lx, start: 0x%lx, end: 0x%lx, num_sectors(dec): %lu"), size, start, end, num_sectors );
+_findFirstErasedSector();
+if(first_erased_sector == 0xffff){
+    _eraseSector(0);
+    first_erased_sector = 0;
+}
+_searchSaves();
+_initBuffer();
+ready = true;
+}
+# 142 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
+void FLOG::_readSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);
+  ESP.flashRead(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
+}
+
+
+
+
+
+void FLOG::_eraseSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);
+  ESP.flashEraseSector((start/FLASH_SECTOR_SIZE)+one_sector);
+}
+
+
+
+
+
+void FLOG::_writeSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);
+  ESP.flashWrite(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
+}
+
+
+
+
+void FLOG::_clearBuffer(){
+  for (uint32_t i = sizeof(sector.header)/4; i<(sizeof(sector.dword_buffer)/4); i++){
+      sector.dword_buffer[i] = 0;
+  }
+  sector.header.buf_pointer = sizeof(sector.header);
+
+}
+
+
+
+
+void FLOG::_saveBufferToSector(){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to current sector: %u" ),current_sector);
+  _writeSector(current_sector);
+  if(current_sector == num_sectors){
+    current_sector = 0;
+  }
+  else{
+    current_sector++;
+  }
+  _eraseSector(current_sector);
+  _clearBuffer();
+  sector.header.number++;
+  DEBUG_SENSOR_LOG(PSTR("FLOG: new sector header number: %u" ),sector.header.number);
+}
+
+
+
+
+
+void FLOG::_findFirstErasedSector(){
+  for (uint32_t i = 0; i<num_sectors; i++){
+    bool success = true;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: read sector: %u"), i);
+    _readSector(i);
+    for (uint32_t j = 0; j<(sizeof(sector.dword_buffer)/4); j++){
+      if(sector.dword_buffer[j]!=0xffffffff){
+
+        success = false;
+      }
+    }
+    if(success){
+      first_erased_sector = i;
+      sector.header.physical_start_sector = i;
+      current_sector = i;
+      DEBUG_SENSOR_LOG(PSTR("FLOG: first erased sector: %u, now init ..."), first_erased_sector);
+      return;
+    }
+  }
+  DEBUG_SENSOR_LOG(PSTR("FLOG: no erased sector found"));
+  first_erased_sector = 0xffff;
+}
+
+
+
+
+void FLOG::_searchSaves(void){
+
+  found_saved_data = false;
+  uint32_t s;
+  if(first_erased_sector==0){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: sector 0 was erased before, examine sector: %u"), num_sectors);
+    s = num_sectors;
+  }
+  else{
+    s = first_erased_sector-1;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: examine sector: %u"), s);
+  }
+  _readSector(s);
+  if(sector.header.magic_word!=MAGIC_WORD_FL){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
+    return;
+  }
+  sectors_left = sector.header.number + 1;
+  _saved_header = sector.header;
+  s = sector.header.physical_start_sector;
+  DEBUG_SENSOR_LOG(PSTR("FLOG: will check pysical start sector: %u"), s);
+  _readSector(s);
+  _showBuffer();
+  if(sector.header.magic_word!=MAGIC_WORD_FL){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
+    sectors_left = 0;
+    return;
+  }
+  if(sector.header.number==0){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: possible saved data found"));
+    found_saved_data = true;
+  }
+  else{
+    DEBUG_SENSOR_LOG(PSTR("FLOG: number: %u should be 0"), sector.header.number);
+    sectors_left = 0;
+  }
+}
+
+
+
+
+void FLOG::_initBuffer(void){
+  if(!found_saved_data){
+    sector.header.physical_start_sector = (uint16_t)first_erased_sector;
+  }
+  DEBUG_SENSOR_LOG(PSTR("FLOG: init header"));
+  sector.header.magic_word = MAGIC_WORD_FL;
+  sector.header.number = 0;
+  sector.header.buf_pointer = (uint16_t)sizeof(sector.header);
+  current_sector = first_erased_sector;
+  ready = true;
+  _clearBuffer();
+}
+
+
+
+
+void FLOG::_showBuffer(void){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: Header: %c %c"), sector.byte_buffer[0],sector.byte_buffer[1]);
+  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer);
+  uint32_t j = 0;
+  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){
+
+      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
+      j++;
+      if(j>3){
+        break;
+      }
+  }
+}
+
+
+
+
+
+
+
+void FLOG::addToBuffer(uint8_t src[], uint32_t size){
+    if(mode == 0){
+      if(sector.header.number == num_sectors && !ready){
+        return;
+      }
+    }
+  if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
+
+
+
+    memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
+    sector.header.buf_pointer+=size;
+
+  }
+  else{
+    DEBUG_SENSOR_LOG(PSTR("FLOG: save buffer to flash sector: %u"), current_sector);
+    DEBUG_SENSOR_LOG(PSTR("FLOG: current buf_pointer: %u"), sector.header.buf_pointer);
+    _saveBufferToSector();
+    sectors_left++;
+
+    if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
+      memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
+      sector.header.buf_pointer+=size;
+    }
+  }
+}
+
+
+
+
+
+
+void FLOG::startRecording(bool append){
+    if(recording){
+        DEBUG_SENSOR_LOG(PSTR("FLOG: already recording"));
+        return;
+    }
+    recording = true;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: start recording"));
+    _initBuffer();
+    if(!found_saved_data) {
+      append = false;
+    }
+    if(append){
+        sector.header.number = _saved_header.number+1;
+        sector.header.physical_start_sector = _saved_header.physical_start_sector;
+    }
+    else{
+        sector.header.physical_start_sector = (uint16_t)first_erased_sector;
+        found_saved_data = false;
+        sectors_left = 0;
+    }
+  }
+
+
+
+
+
+void FLOG::stopRecording(void){
+      _saveBufferToSector();
+      _findFirstErasedSector();
+      _searchSaves();
+      _initBuffer();
+      recording = false;
+      found_saved_data = true;
+  }
+# 381 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
+  void FLOG::startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter){
+
+  _readSector(sector.header.physical_start_sector);
+  uint32_t next_sector = sector.header.physical_start_sector;
+  bytes_left = sector.header.buf_pointer - sizeof(sector.header);
+  DEBUG_SENSOR_LOG(PSTR("FLOG: create file for download, will process %u bytes"), bytes_left);
+  running_download = true;
+
+  sendHeader();
+
+  while(sectors_left){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: next sector: %u"), next_sector);
+
+    uint32_t k = sizeof(sector.header);
+    while(bytes_left){
+
+      uint8_t *_record_start = (uint8_t*)&sector.byte_buffer[k];
+
+      sendRecord(_record_start);
+      if(k%128 == 0){
+
+        OsWatchLoop();
+        delay(sleep);
+        }
+      k+=size;
+      if(bytes_left>7){
+        bytes_left-=size;
+      }
+      else{
+        bytes_left = 0;
+        DEBUG_SENSOR_LOG(PSTR("FLOG: Flog->bytes_left not dividable by 8 ??????"));
+        }
+      }
+    next_sector++;
+    if(next_sector>num_sectors){
+      next_sector = 0;
+    }
+    sectors_left--;
+    _readSector(next_sector);
+    bytes_left = sector.header.buf_pointer - sizeof(sector.header);
+    OsWatchLoop();
+    delay(sleep);
+  }
+  running_download = false;
+
+  sendFooter();
+
+  _searchSaves();
+  _initBuffer();
+  }
+
+ #endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+# 23 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+float fmodf(float x, float y)
+{
+
+  union {float f; uint32_t i;} ux = {x}, uy = {y};
+  int ex = ux.i>>23 & 0xff;
+  int ey = uy.i>>23 & 0xff;
+  uint32_t sx = ux.i & 0x80000000;
+  uint32_t i;
+  uint32_t uxi = ux.i;
+
+  if (uy.i<<1 == 0 || isnan(y) || ex == 0xff)
+    return (x*y)/(x*y);
+  if (uxi<<1 <= uy.i<<1) {
+    if (uxi<<1 == uy.i<<1)
+      return 0*x;
+    return x;
+  }
+
+
+  if (!ex) {
+    for (i = uxi<<9; i>>31 == 0; ex--, i <<= 1);
+    uxi <<= -ex + 1;
+  } else {
+    uxi &= -1U >> 9;
+    uxi |= 1U << 23;
+  }
+  if (!ey) {
+    for (i = uy.i<<9; i>>31 == 0; ey--, i <<= 1);
+    uy.i <<= -ey + 1;
+  } else {
+    uy.i &= -1U >> 9;
+    uy.i |= 1U << 23;
+  }
+
+
+  for (; ex > ey; ex--) {
+    i = uxi - uy.i;
+    if (i >> 31 == 0) {
+      if (i == 0)
+        return 0*x;
+      uxi = i;
+    }
+    uxi <<= 1;
+  }
+  i = uxi - uy.i;
+  if (i >> 31 == 0) {
+    if (i == 0)
+      return 0*x;
+    uxi = i;
+  }
+  for (; uxi>>23 == 0; uxi <<= 1, ex--);
+
+
+  if (ex > 0) {
+    uxi -= 1U << 23;
+    uxi |= (uint32_t)ex << 23;
+  } else {
+    uxi >>= -ex + 1;
+  }
+  uxi |= sx;
+  ux.i = uxi;
+  return ux.f;
+}
+
+
+double FastPrecisePow(double a, double b)
+{
+
+
+  int e = abs((int)b);
+  union {
+    double d;
+    int x[2];
+  } u = { a };
+  u.x[1] = (int)((b - e) * (u.x[1] - 1072632447) + 1072632447);
+  u.x[0] = 0;
+
+
+  double r = 1.0;
+  while (e) {
+    if (e & 1) {
+      r *= a;
+    }
+    a *= a;
+    e >>= 1;
+  }
+  return r * u.d;
+}
+
+float FastPrecisePowf(const float x, const float y)
+{
+
+  return (float)FastPrecisePow(x, y);
+}
+
+double TaylorLog(double x)
+{
+
+
+  if (x <= 0.0) { return NAN; }
+  double z = (x + 1) / (x - 1);
+  double step = ((x - 1) * (x - 1)) / ((x + 1) * (x + 1));
+  double totalValue = 0;
+  double powe = 1;
+  for (uint32_t count = 0; count < 10; count++) {
+    z *= step;
+    double y = (1 / powe) * z;
+    totalValue = totalValue + y;
+    powe = powe + 2;
+  }
+  totalValue *= 2;
+# 144 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+  return totalValue;
+}
+# 154 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+inline float sinf(float x) { return sin_52(x); }
+inline float cosf(float x) { return cos_52(x); }
+inline float tanf(float x) { return tan_56(x); }
+inline float atanf(float x) { return atan_66(x); }
+inline float asinf(float x) { return asinf1(x); }
+inline float acosf(float x) { return acosf1(x); }
+inline float sqrtf(float x) { return sqrt1(x); }
+inline float powf(float x, float y) { return FastPrecisePow(x, y); }
+
+
+double const f_pi = 3.1415926535897932384626433;
+double const f_twopi = 2.0 * f_pi;
+double const f_two_over_pi = 2.0 / f_pi;
+double const f_halfpi = f_pi / 2.0;
+double const f_threehalfpi = 3.0 * f_pi / 2.0;
+double const f_four_over_pi = 4.0 / f_pi;
+double const f_qtrpi = f_pi / 4.0;
+double const f_sixthpi = f_pi / 6.0;
+double const f_tansixthpi = tan(f_sixthpi);
+double const f_twelfthpi = f_pi / 12.0;
+double const f_tantwelfthpi = tan(f_twelfthpi);
+float const f_180pi = 180 / f_pi;
+# 194 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+float cos_52s(float x)
+{
+  const float c1 = 0.9999932946;
+  const float c2 = -0.4999124376;
+  const float c3 = 0.0414877472;
+  const float c4 = -0.0012712095;
+
+  float x2 = x * x;
+  return (c1 + x2 * (c2 + x2 * (c3 + c4 * x2)));
+}
+
+
+
+
+
+
+float cos_52(float x)
+{
+  x = fmodf(x, f_twopi);
+  if (x < 0) { x = -x; }
+  int quad = int(x * (float)f_two_over_pi);
+  switch (quad) {
+    case 0: return cos_52s(x);
+    case 1: return -cos_52s((float)f_pi - x);
+    case 2: return -cos_52s(x-(float)f_pi);
+    case 3: return cos_52s((float)f_twopi - x);
+  }
+}
+
+
+
+
+float sin_52(float x)
+{
+  return cos_52((float)f_halfpi - x);
+}
+# 247 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+float tan_56s(float x)
+{
+  const float c1 = -3.16783027;
+  const float c2 = 0.134516124;
+  const float c3 = -4.033321984;
+
+  float x2 = x * x;
+  return (x * (c1 + c2 * x2) / (c3 + x2));
+}
+# 267 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+float tan_56(float x)
+{
+  x = fmodf(x, (float)f_twopi);
+  int octant = int(x * (float)f_four_over_pi);
+  switch (octant){
+    case 0: return tan_56s(x * (float)f_four_over_pi);
+    case 1: return 1.0f / tan_56s(((float)f_halfpi - x) * (float)f_four_over_pi);
+    case 2: return -1.0f / tan_56s((x-(float)f_halfpi) * (float)f_four_over_pi);
+    case 3: return - tan_56s(((float)f_pi - x) * (float)f_four_over_pi);
+    case 4: return tan_56s((x-(float)f_pi) * (float)f_four_over_pi);
+    case 5: return 1.0f / tan_56s(((float)f_threehalfpi - x) * (float)f_four_over_pi);
+    case 6: return -1.0f / tan_56s((x-(float)f_threehalfpi) * (float)f_four_over_pi);
+    case 7: return - tan_56s(((float)f_twopi - x) * (float)f_four_over_pi);
+  }
+}
+# 296 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+float atan_66s(float x)
+{
+  const float c1 = 1.6867629106;
+  const float c2 = 0.4378497304;
+  const float c3 = 1.6867633134;
+
+  float x2 = x * x;
+  return (x * (c1 + x2 * c2) / (c3 + x2));
+}
+
+
+
+
+
+float atan_66(float x)
+{
+  float y;
+  bool complement= false;
+  bool region= false;
+  bool sign= false;
+
+  if (x < 0) {
+    x = -x;
+    sign = true;
+  }
+  if (x > 1.0) {
+    x = 1.0 / x;
+    complement = true;
+  }
+  if (x > (float)f_tantwelfthpi) {
+    x = (x - (float)f_tansixthpi) / (1 + (float)f_tansixthpi * x);
+    region = true;
+  }
+
+  y = atan_66s(x);
+  if (region) { y += (float)f_sixthpi; }
+  if (complement) { y = (float)f_halfpi-y; }
+  if (sign) { y = -y; }
+  return (y);
+}
+
+float asinf1(float x)
+{
+  float d = 1.0f - x * x;
+  if (d < 0.0f) { return NAN; }
+  return 2 * atan_66(x / (1 + sqrt1(d)));
+}
+
+float acosf1(float x)
+{
+  float d = 1.0f - x * x;
+  if (d < 0.0f) { return NAN; }
+  float y = asinf1(sqrt1(d));
+  if (x >= 0.0f) {
+    return y;
+  } else {
+    return (float)f_pi - y;
+  }
+}
+
+
+float sqrt1(const float x)
+{
+  union {
+    int i;
+    float x;
+  } u;
+  u.x = x;
+  u.i = (1 << 29) + (u.i >> 1) - (1 << 22);
+
+
+
+
+  u.x = u.x + x / u.x;
+  u.x = 0.25f * u.x + x / u.x;
+
+  return u.x;
+}
+# 387 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
+uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
+                                       uint16_t ito_min, uint16_t ito_max) {
+
+  if (ifrom_min >= ifrom_max) {
+    if (ito_min > ito_max) {
+      return ito_max;
+    } else {
+      return ito_min;
+    }
+  }
+
+  uint32_t num = inum;
+  uint32_t from_min = ifrom_min;
+  uint32_t from_max = ifrom_max;
+  uint32_t to_min = ito_min;
+  uint32_t to_max = ito_max;
+
+
+  num = (num > from_max ? from_max : (num < from_min ? from_min : num));
+
+
+  if (to_min > to_max) {
+
+    num = (from_max - num) + from_min;
+    to_min = ito_max;
+    to_max = ito_min;
+  }
+
+  uint32_t numerator = (num - from_min) * (to_max - to_min);
+  uint32_t result;
+  if (numerator >= 0x80000000L) {
+
+    result = numerator / (from_max - from_min) + to_min;
+  } else {
+    result = (((numerator * 2) / (from_max - from_min)) + 1) / 2 + to_min;
+  }
+  return (uint32_t) (result > to_max ? to_max : (result < to_min ? to_min : result));
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_legacy_cores.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_legacy_cores.ino"
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+
+
+
+
+
+void* memchr(const void* ptr, int value, size_t num)
+{
+  unsigned char *p = (unsigned char*)ptr;
+  while (num--) {
+    if (*p != (unsigned char)value) {
+      p++;
+    } else {
+      return p;
+    }
+  }
+  return 0;
+}
+
+
+
+size_t strcspn(const char *str1, const char *str2)
+{
+  size_t ret = 0;
+  while (*str1) {
+    if (strchr(str2, *str1)) {
+      return ret;
+    } else {
+      str1++;
+      ret++;
+    }
+  }
+  return ret;
+}
+
+
+
+char* strpbrk(const char *s1, const char *s2)
+{
+  while(*s1) {
+    if (strchr(s2, *s1++)) {
+      return (char*)--s1;
+    }
+  }
+  return 0;
+}
+
+
+
+#ifndef __LONG_LONG_MAX__
+#define __LONG_LONG_MAX__ 9223372036854775807LL
+#endif
+#ifndef ULLONG_MAX
+#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
+#endif
+
+unsigned long long strtoull(const char *__restrict nptr, char **__restrict endptr, int base)
+{
+  const char *s = nptr;
+  char c;
+  do { c = *s++; } while (isspace((unsigned char)c));
+
+  int neg = 0;
+  if (c == '-') {
+    neg = 1;
+    c = *s++;
+  } else {
+    if (c == '+') {
+      c = *s++;
+    }
+  }
+
+  if ((base == 0 || base == 16) && (c == '0') && (*s == 'x' || *s == 'X')) {
+    c = s[1];
+    s += 2;
+    base = 16;
+  }
+  if (base == 0) { base = (c == '0') ? 8 : 10; }
+
+  unsigned long long acc = 0;
+  int any = 0;
+  if (base > 1 && base < 37) {
+    unsigned long long cutoff = ULLONG_MAX / base;
+    int cutlim = ULLONG_MAX % base;
+    for ( ; ; c = *s++) {
+      if (c >= '0' && c <= '9')
+        c -= '0';
+      else if (c >= 'A' && c <= 'Z')
+        c -= 'A' - 10;
+      else if (c >= 'a' && c <= 'z')
+        c -= 'a' - 10;
+      else
+        break;
+
+      if (c >= base)
+        break;
+
+      if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+        any = -1;
+      else {
+        any = 1;
+        acc *= base;
+        acc += c;
+      }
+    }
+    if (any < 0) {
+      acc = ULLONG_MAX;
+    }
+    else if (any && neg) {
+      acc = -acc;
+    }
+  }
+
+  if (endptr != nullptr) { *endptr = (char *)(any ? s - 1 : nptr); }
+
+  return acc;
+}
+
+#endif
+
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+
+
+
+
+
+void* memmove_P(void *dest, const void *src, size_t n)
+{
+  if (src > (void*)0x40000000) {
+    return memcpy_P(dest, src, n);
+  } else {
+    return memmove(dest, src, n);
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rotary.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rotary.ino"
+#ifdef USE_LIGHT
+
+#ifdef ROTARY_V1
+
+
+
+
+struct ROTARY {
+  unsigned long debounce = 0;
+  uint8_t present = 0;
+  uint8_t state = 0;
+  uint8_t position = 128;
+  uint8_t last_position = 128;
+  uint8_t interrupts_in_use_count = 0;
+  uint8_t changed = 0;
+} Rotary;
+
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void update_rotary(void) ICACHE_RAM_ATTR;
+#endif
+
+void update_rotary(void)
+{
+  if (MI_DESK_LAMP == my_module_type) {
+    if (LightPowerIRAM()) {
+
+
+
+
+      uint8_t s = Rotary.state & 3;
+      if (digitalRead(pin[GPIO_ROT1A])) { s |= 4; }
+      if (digitalRead(pin[GPIO_ROT1B])) { s |= 8; }
+      switch (s) {
+        case 0: case 5: case 10: case 15:
+          break;
+        case 1: case 7: case 8: case 14:
+          Rotary.position++; break;
+        case 2: case 4: case 11: case 13:
+          Rotary.position--; break;
+        case 3: case 12:
+          Rotary.position = Rotary.position + 2; break;
+        default:
+          Rotary.position = Rotary.position - 2; break;
+      }
+      Rotary.state = (s >> 2);
+    }
+  }
+}
+
+bool RotaryButtonPressed(void)
+{
+  if ((MI_DESK_LAMP == my_module_type) && (Rotary.changed) && LightPower()) {
+    Rotary.changed = 0;
+    return true;
+  }
+  return false;
+}
+
+void RotaryInit(void)
+{
+  Rotary.present = 0;
+  if ((pin[GPIO_ROT1A] < 99) && (pin[GPIO_ROT1B] < 99)) {
+    Rotary.present++;
+    pinMode(pin[GPIO_ROT1A], INPUT_PULLUP);
+    pinMode(pin[GPIO_ROT1B], INPUT_PULLUP);
+
+
+
+
+    if ((pin[GPIO_ROT1A] < 6) || (pin[GPIO_ROT1A] > 11)) {
+      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1A]), update_rotary, CHANGE);
+      Rotary.interrupts_in_use_count++;
+    }
+    if ((pin[GPIO_ROT1B] < 6) || (pin[GPIO_ROT1B] > 11)) {
+      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1B]), update_rotary, CHANGE);
+      Rotary.interrupts_in_use_count++;
+    }
+  }
+}
+
+
+
+
+
+void RotaryHandler(void)
+{
+  if (Rotary.interrupts_in_use_count < 2) {
+    noInterrupts();
+    update_rotary();
+  } else {
+    noInterrupts();
+  }
+  if (Rotary.last_position != Rotary.position) {
+    if (MI_DESK_LAMP == my_module_type) {
+      if (Button.hold_timer[0]) {
+        Rotary.changed = 1;
+
+        int16_t t = LightGetColorTemp();
+        t = t + (Rotary.position - Rotary.last_position);
+        if (t < 153) {
+          t = 153;
+        }
+        if (t > 500) {
+          t = 500;
+        }
+        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), Rotary.position - Rotary.last_position);
+        LightSetColorTemp((uint16_t)t);
+      } else {
+        int8_t d = Settings.light_dimmer;
+        d = d + (Rotary.position - Rotary.last_position);
+        if (d < 1) {
+          d = 1;
+        }
+        if (d > 100) {
+          d = 100;
+        }
+        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), Rotary.position - Rotary.last_position);
+
+        LightSetDimmer((uint8_t)d);
+        Settings.light_dimmer = d;
+      }
+    }
+    Rotary.last_position = 128;
+    Rotary.position = 128;
+  }
+  interrupts();
+}
+
+void RotaryLoop(void)
+{
+  if (Rotary.present) {
+    if (TimeReached(Rotary.debounce)) {
+      SetNextTimeInterval(Rotary.debounce, Settings.button_debounce);
+      RotaryHandler();
+    }
+  }
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
+# 25 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
+const uint32_t SECS_PER_MIN = 60UL;
+const uint32_t SECS_PER_HOUR = 3600UL;
+const uint32_t SECS_PER_DAY = SECS_PER_HOUR * 24UL;
+const uint32_t MINS_PER_HOUR = 60UL;
+
+#define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
+
+extern "C" {
+#include "sntp.h"
+}
+#include <Ticker.h>
+
+Ticker TickerRtc;
+
+static const uint8_t kDaysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static const char kMonthNamesEnglish[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
+
+struct RTC {
+  uint32_t utc_time = 0;
+  uint32_t local_time = 0;
+  uint32_t daylight_saving_time = 0;
+  uint32_t standard_time = 0;
+  uint32_t ntp_time = 0;
+  uint32_t midnight = 0;
+  uint32_t restart_time = 0;
+  int32_t drift_time = 0;
+  int32_t time_timezone = 0;
+  uint8_t ntp_sync_minute = 0;
+  bool midnight_now = false;
+  bool user_time_entry = false;
+} Rtc;
+
+uint32_t UtcTime(void)
+{
+  return Rtc.utc_time;
+}
+
+uint32_t LocalTime(void)
+{
+  return Rtc.local_time;
+}
+
+int32_t DriftTime(void)
+{
+  return Rtc.drift_time;
+}
+
+uint32_t Midnight(void)
+{
+  return Rtc.midnight;
+}
+
+bool MidnightNow(void)
+{
+  if (Rtc.midnight_now) {
+    Rtc.midnight_now = false;
+    return true;
+  }
+  return false;
+}
+
+bool IsDst(void)
+{
+  if (Rtc.time_timezone == Settings.toffset[1]) {
+    return true;
+  }
+  return false;
+}
+
+String GetBuildDateAndTime(void)
+{
+
+  char bdt[21];
+  char *p;
+  char mdate[] = __DATE__;
+  char *smonth = mdate;
+  int day = 0;
+  int year = 0;
+
+
+  uint8_t i = 0;
+  for (char *str = strtok_r(mdate, " ", &p); str && i < 3; str = strtok_r(nullptr, " ", &p)) {
+    switch (i++) {
+    case 0:
+      smonth = str;
+      break;
+    case 1:
+      day = atoi(str);
+      break;
+    case 2:
+      year = atoi(str);
+    }
+  }
+  int month = (strstr(kMonthNamesEnglish, smonth) -kMonthNamesEnglish) /3 +1;
+  snprintf_P(bdt, sizeof(bdt), PSTR("%d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%s"), year, month, day, __TIME__);
+  return String(bdt);
+}
+
+String GetMinuteTime(uint32_t minutes)
+{
+  char tm[6];
+  snprintf_P(tm, sizeof(tm), PSTR("%02d:%02d"), minutes / 60, minutes % 60);
+
+  return String(tm);
+}
+
+String GetTimeZone(void)
+{
+  char tz[7];
+  snprintf_P(tz, sizeof(tz), PSTR("%+03d:%02d"), Rtc.time_timezone / 60, abs(Rtc.time_timezone % 60));
+
+  return String(tz);
+}
+
+String GetDuration(uint32_t time)
+{
+  char dt[16];
+
+  TIME_T ut;
+  BreakTime(time, ut);
+
+
+
+
+
+
+  snprintf_P(dt, sizeof(dt), PSTR("%dT%02d:%02d:%02d"), ut.days, ut.hour, ut.minute, ut.second);
+
+  return String(dt);
+}
+
+String GetDT(uint32_t time)
+{
+
+
+  char dt[20];
+  TIME_T tmpTime;
+
+  BreakTime(time, tmpTime);
+  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
+    tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
+
+  return String(dt);
+}
+# 181 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
+String GetDateAndTime(uint8_t time_type)
+{
+
+  uint32_t time = Rtc.local_time;
+
+  switch (time_type) {
+    case DT_BOOTCOUNT:
+      time = Settings.bootcount_reset_time;
+      break;
+    case DT_ENERGY:
+      time = Settings.energy_kWhtotal_time;
+      break;
+    case DT_UTC:
+      time = Rtc.utc_time;
+      break;
+    case DT_RESTART:
+      if (Rtc.restart_time == 0) {
+        return "";
+      }
+      time = Rtc.restart_time;
+      break;
+  }
+  String dt = GetDT(time);
+  if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {
+    dt += GetTimeZone();
+  }
+  return dt;
+}
+
+String GetTime(int type)
+{
+
+
+
+
+  char stime[25];
+
+  uint32_t time = Rtc.utc_time;
+  if (1 == type) time = Rtc.local_time;
+  if (2 == type) time = Rtc.daylight_saving_time;
+  if (3 == type) time = Rtc.standard_time;
+  snprintf_P(stime, sizeof(stime), sntp_get_real_time(time));
+
+  return String(stime);
+}
+
+uint32_t UpTime(void)
+{
+  if (Rtc.restart_time) {
+    return Rtc.utc_time - Rtc.restart_time;
+  } else {
+    return uptime;
+  }
+}
+
+uint32_t MinutesUptime(void)
+{
+  return (UpTime() / 60);
+}
+
+String GetUptime(void)
+{
+  return GetDuration(UpTime());
+}
+
+uint32_t MinutesPastMidnight(void)
+{
+  uint32_t minutes = 0;
+
+  if (RtcTime.valid) {
+    minutes = (RtcTime.hour *60) + RtcTime.minute;
+  }
+  return minutes;
+}
+
+void BreakTime(uint32_t time_input, TIME_T &tm)
+{
+
+
+
+
+  uint8_t year;
+  uint8_t month;
+  uint8_t month_length;
+  uint32_t time;
+  unsigned long days;
+
+  time = time_input;
+  tm.second = time % 60;
+  time /= 60;
+  tm.minute = time % 60;
+  time /= 60;
+  tm.hour = time % 24;
+  time /= 24;
+  tm.days = time;
+  tm.day_of_week = ((time + 4) % 7) + 1;
+
+  year = 0;
+  days = 0;
+  while((unsigned)(days += (LEAP_YEAR(year) ? 366 : 365)) <= time) {
+    year++;
+  }
+  tm.year = year;
+
+  days -= LEAP_YEAR(year) ? 366 : 365;
+  time -= days;
+  tm.day_of_year = time;
+
+  for (month = 0; month < 12; month++) {
+    if (1 == month) {
+      if (LEAP_YEAR(year)) {
+        month_length = 29;
+      } else {
+        month_length = 28;
+      }
+    } else {
+      month_length = kDaysInMonth[month];
+    }
+
+    if (time >= month_length) {
+      time -= month_length;
+    } else {
+      break;
+    }
+  }
+  strlcpy(tm.name_of_month, kMonthNames + (month *3), 4);
+  tm.month = month + 1;
+  tm.day_of_month = time + 1;
+  tm.valid = (time_input > START_VALID_TIME);
+}
+
+uint32_t MakeTime(TIME_T &tm)
+{
+
+
+
+  int i;
+  uint32_t seconds;
+
+
+  seconds = tm.year * (SECS_PER_DAY * 365);
+  for (i = 0; i < tm.year; i++) {
+    if (LEAP_YEAR(i)) {
+      seconds += SECS_PER_DAY;
+    }
+  }
+
+
+  for (i = 1; i < tm.month; i++) {
+    if ((2 == i) && LEAP_YEAR(tm.year)) {
+      seconds += SECS_PER_DAY * 29;
+    } else {
+      seconds += SECS_PER_DAY * kDaysInMonth[i-1];
+    }
+  }
+  seconds+= (tm.day_of_month - 1) * SECS_PER_DAY;
+  seconds+= tm.hour * SECS_PER_HOUR;
+  seconds+= tm.minute * SECS_PER_MIN;
+  seconds+= tm.second;
+  return seconds;
+}
+
+uint32_t RuleToTime(TimeRule r, int yr)
+{
+  TIME_T tm;
+  uint32_t t;
+  uint8_t m;
+  uint8_t w;
+
+  m = r.month;
+  w = r.week;
+  if (0 == w) {
+    if (++m > 12) {
+      m = 1;
+      yr++;
+    }
+    w = 1;
+  }
+
+  tm.hour = r.hour;
+  tm.minute = 0;
+  tm.second = 0;
+  tm.day_of_month = 1;
+  tm.month = m;
+  tm.year = yr - 1970;
+  t = MakeTime(tm);
+  BreakTime(t, tm);
+  t += (7 * (w - 1) + (r.dow - tm.day_of_week + 7) % 7) * SECS_PER_DAY;
+  if (0 == r.week) {
+    t -= 7 * SECS_PER_DAY;
+  }
+  return t;
+}
+
+void RtcSecond(void)
+{
+  TIME_T tmpTime;
+
+  if (!Rtc.user_time_entry && !global_state.wifi_down) {
+    uint8_t uptime_minute = (uptime / 60) % 60;
+    if ((Rtc.ntp_sync_minute > 59) && (uptime_minute > 2)) {
+      Rtc.ntp_sync_minute = 1;
+    }
+    uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ;
+    if ( (((offset == RtcTime.second) && ( (RtcTime.year < 2016) ||
+                                           (Rtc.ntp_sync_minute == uptime_minute))) ||
+                                            ntp_force_sync ) ) {
+      Rtc.ntp_time = sntp_get_current_timestamp();
+      if (Rtc.ntp_time > START_VALID_TIME) {
+        ntp_force_sync = false;
+        if (Rtc.utc_time > START_VALID_TIME) { Rtc.drift_time = Rtc.ntp_time - Rtc.utc_time; }
+        Rtc.utc_time = Rtc.ntp_time;
+        Rtc.ntp_sync_minute = 60;
+        if (Rtc.restart_time == 0) {
+          Rtc.restart_time = Rtc.utc_time - uptime;
+        }
+        BreakTime(Rtc.utc_time, tmpTime);
+        RtcTime.year = tmpTime.year + 1970;
+        Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
+        Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
+
+
+        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+          DriftTime(), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+
+        if (Rtc.local_time < START_VALID_TIME) {
+          rules_flag.time_init = 1;
+        } else {
+          rules_flag.time_set = 1;
+        }
+      } else {
+        Rtc.ntp_sync_minute++;
+      }
+    }
+  }
+
+  Rtc.utc_time++;
+  Rtc.local_time = Rtc.utc_time;
+  if (Rtc.local_time > START_VALID_TIME) {
+    int16_t timezone_minutes = Settings.timezone_minutes;
+    if (Settings.timezone < 0) { timezone_minutes *= -1; }
+    Rtc.time_timezone = (Settings.timezone * SECS_PER_HOUR) + (timezone_minutes * SECS_PER_MIN);
+    if (99 == Settings.timezone) {
+      int32_t dstoffset = Settings.toffset[1] * SECS_PER_MIN;
+      int32_t stdoffset = Settings.toffset[0] * SECS_PER_MIN;
+      if (Settings.tflag[1].hemis) {
+
+        if ((Rtc.utc_time >= (Rtc.standard_time - dstoffset)) && (Rtc.utc_time < (Rtc.daylight_saving_time - stdoffset))) {
+          Rtc.time_timezone = stdoffset;
+        } else {
+          Rtc.time_timezone = dstoffset;
+        }
+      } else {
+
+        if ((Rtc.utc_time >= (Rtc.daylight_saving_time - stdoffset)) && (Rtc.utc_time < (Rtc.standard_time - dstoffset))) {
+          Rtc.time_timezone = dstoffset;
+        } else {
+          Rtc.time_timezone = stdoffset;
+        }
+      }
+    }
+    Rtc.local_time += Rtc.time_timezone;
+    Rtc.time_timezone /= 60;
+    if (!Settings.energy_kWhtotal_time) {
+      Settings.energy_kWhtotal_time = Rtc.local_time;
+    }
+    if (Settings.bootcount_reset_time < START_VALID_TIME) {
+      Settings.bootcount_reset_time = Rtc.local_time;
+    }
+  }
+
+  BreakTime(Rtc.local_time, RtcTime);
+  if (RtcTime.valid) {
+    if (!Rtc.midnight) {
+      Rtc.midnight = Rtc.local_time - (RtcTime.hour * 3600) - (RtcTime.minute * 60) - RtcTime.second;
+    }
+    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) {
+      Rtc.midnight = Rtc.local_time;
+      Rtc.midnight_now = true;
+    }
+  }
+
+  RtcTime.year += 1970;
+}
+
+void RtcSetTime(uint32_t epoch)
+{
+  if (epoch < START_VALID_TIME) {
+    Rtc.user_time_entry = false;
+    ntp_force_sync = true;
+    sntp_init();
+  } else {
+    sntp_stop();
+    Rtc.user_time_entry = true;
+    Rtc.utc_time = epoch -1;
+  }
+  RtcSecond();
+}
+
+void RtcInit(void)
+{
+  sntp_setservername(0, SettingsText(SET_NTPSERVER1));
+  sntp_setservername(1, SettingsText(SET_NTPSERVER2));
+  sntp_setservername(2, SettingsText(SET_NTPSERVER3));
+  sntp_stop();
+  sntp_set_timezone(0);
+  sntp_init();
+  Rtc.utc_time = 0;
+  BreakTime(Rtc.utc_time, RtcTime);
+  TickerRtc.attach(1, RtcSecond);
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_static_buffer.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_static_buffer.ino"
+typedef struct SBuffer_impl {
+  uint16_t size;
+  uint16_t len;
+  uint8_t buf[];
+} SBuffer_impl;
+
+
+
+typedef class SBuffer {
+
+protected:
+  SBuffer(void) {
+
+  }
+
+public:
+  SBuffer(const size_t size) {
+    _buf = (SBuffer_impl*) new char[size+4];
+    _buf->size = size;
+    _buf->len = 0;
+
+  }
+
+  inline size_t getSize(void) const { return _buf->size; }
+  inline size_t size(void) const { return _buf->size; }
+  inline size_t getLen(void) const { return _buf->len; }
+  inline size_t len(void) const { return _buf->len; }
+  inline uint8_t *getBuffer(void) const { return _buf->buf; }
+  inline uint8_t *buf(size_t i = 0) const { return &_buf->buf[i]; }
+  inline char *charptr(size_t i = 0) const { return (char*) &_buf->buf[i]; }
+
+  virtual ~SBuffer(void) {
+    delete[] _buf;
+  }
+
+  inline void setLen(const size_t len) {
+    uint16_t old_len = _buf->len;
+    _buf->len = (len <= _buf->size) ? len : _buf->size;
+    if (old_len < _buf->len) {
+      memset((void*) &_buf->buf[old_len], 0, _buf->len - old_len);
+    }
+  }
+
+  void set8(const size_t offset, const uint8_t data) {
+    if (offset < _buf->len) {
+      _buf->buf[offset] = data;
+    }
+  }
+
+  size_t add8(const uint8_t data) {
+    if (_buf->len < _buf->size) {
+      _buf->buf[_buf->len++] = data;
+    }
+    return _buf->len;
+  }
+  size_t add16(const uint16_t data) {
+    if (_buf->len < _buf->size - 1) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+    }
+    return _buf->len;
+  }
+  size_t add32(const uint32_t data) {
+    if (_buf->len < _buf->size - 3) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+      _buf->buf[_buf->len++] = data >> 16;
+      _buf->buf[_buf->len++] = data >> 24;
+    }
+    return _buf->len;
+  }
+  size_t add64(const uint64_t data) {
+    if (_buf->len < _buf->size - 7) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+      _buf->buf[_buf->len++] = data >> 16;
+      _buf->buf[_buf->len++] = data >> 24;
+      _buf->buf[_buf->len++] = data >> 32;
+      _buf->buf[_buf->len++] = data >> 40;
+      _buf->buf[_buf->len++] = data >> 48;
+      _buf->buf[_buf->len++] = data >> 56;
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const SBuffer &buf2) {
+    if (len() + buf2.len() <= size()) {
+      for (uint32_t i = 0; i < buf2.len(); i++) {
+        _buf->buf[_buf->len++] = buf2.buf()[i];
+      }
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const uint8_t *buf2, size_t len2) {
+    if (len() + len2 <= size()) {
+      for (uint32_t i = 0; i < len2; i++) {
+        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
+      }
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const char *buf2, size_t len2) {
+    if (len() + len2 <= size()) {
+      for (uint32_t i = 0; i < len2; i++) {
+        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
+      }
+    }
+    return _buf->len;
+  }
+
+  uint8_t get8(size_t offset) const {
+    if (offset < _buf->len) {
+      return _buf->buf[offset];
+    } else {
+      return 0;
+    }
+  }
+  uint8_t read8(const size_t offset) const {
+    if (offset < len()) {
+      return _buf->buf[offset];
+    }
+    return 0;
+  }
+  uint16_t get16(const size_t offset) const {
+    if (offset < len() - 1) {
+      return _buf->buf[offset] | (_buf->buf[offset+1] << 8);
+    }
+    return 0;
+  }
+  uint32_t get32(const size_t offset) const {
+    if (offset < len() - 3) {
+      return _buf->buf[offset] | (_buf->buf[offset+1] << 8) |
+            (_buf->buf[offset+2] << 16) | (_buf->buf[offset+3] << 24);
+    }
+    return 0;
+  }
+  uint64_t get64(const size_t offset) const {
+    if (offset < len() - 7) {
+      return (uint64_t)_buf->buf[offset] | ((uint64_t)_buf->buf[offset+1] << 8) |
+            ((uint64_t)_buf->buf[offset+2] << 16) | ((uint64_t)_buf->buf[offset+3] << 24) |
+            ((uint64_t)_buf->buf[offset+4] << 32) | ((uint64_t)_buf->buf[offset+5] << 40) |
+            ((uint64_t)_buf->buf[offset+6] << 48) | ((uint64_t)_buf->buf[offset+7] << 56);
+    }
+    return 0;
+  }
+
+
+  inline size_t strlen(const size_t offset) const {
+    return strnlen((const char*) &_buf->buf[offset], len() - offset);
+  }
+
+  size_t strlen_s(const size_t offset) const {
+    size_t slen = this->strlen(offset);
+    if (slen == len() - offset) {
+      return 0;
+    } else {
+      return slen;
+    }
+  }
+
+  SBuffer subBuffer(const size_t start, size_t len) const {
+    if (start >= _buf->len) {
+      len = 0;
+    } else if (start + len > _buf->len) {
+      len = _buf->len - start;
+    }
+
+    SBuffer buf2(len);
+    memcpy(buf2.buf(), buf()+start, len);
+    buf2._buf->len = len;
+    return buf2;
+  }
+
+  static SBuffer SBufferFromHex(const char *hex, size_t len) {
+    size_t buf_len = (len + 3) / 2;
+    SBuffer buf2(buf_len);
+    uint8_t val;
+
+    for (; len > 1; len -= 2) {
+      val = asc2byte(*hex++) << 4;
+      val |= asc2byte(*hex++);
+      buf2.add8(val);
+    }
+    return buf2;
+  }
+
+protected:
+
+  static uint8_t asc2byte(char chr) {
+    uint8_t rVal = 0;
+    if (isdigit(chr)) { rVal = chr - '0'; }
+    else if (chr >= 'A' && chr <= 'F') { rVal = chr + 10 - 'A'; }
+    else if (chr >= 'a' && chr <= 'f') { rVal = chr + 10 - 'a'; }
+    return rVal;
+  }
+
+  static void unHex(const char* in, uint8_t *out, size_t len) {
+  }
+
+protected:
+  SBuffer_impl * _buf;
+
+} SBuffer;
+
+typedef class PreAllocatedSBuffer : public SBuffer {
+
+public:
+  PreAllocatedSBuffer(const size_t size, void * buffer) {
+    _buf = (SBuffer_impl*) buffer;
+    _buf->size = size - 4;
+    _buf->len = 0;
+  }
+
+  ~PreAllocatedSBuffer(void) {
+
+    _buf = nullptr;
+  }
+} PreAllocatedSBuffer;
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_statistics.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_statistics.ino"
+#define USE_STATS_CODE 
+
+#ifdef USE_STATS_CODE
+
+
+
+
+String GetStatistics(void)
+{
+  char data[40];
+  snprintf_P(data, sizeof(data), PSTR(",\"CR\":\"%d/%d\""), GetSettingsTextLen(), settings_text_size);
+  return String(data);
+}
+
+#else
+
+String GetStatistics(void)
+{
+  return String("");
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_switch.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_switch.ino"
+#define SWITCH_V2 
+#ifdef SWITCH_V2
+
+
+
+
+
+
+const uint8_t SWITCH_PROBE_INTERVAL = 10;
+
+#include <Ticker.h>
+
+Ticker TickerSwitch;
+
+struct SWITCH {
+  unsigned long debounce = 0;
+  uint16_t no_pullup_mask = 0;
+  uint8_t state[MAX_SWITCHES] = { 0 };
+  uint8_t last_state[MAX_SWITCHES];
+  uint8_t hold_timer[MAX_SWITCHES] = { 0 };
+  uint8_t virtual_state[MAX_SWITCHES];
+  uint8_t present = 0;
+} Switch;
+
+
+
+void SwitchPullupFlag(uint16 switch_bit)
+{
+  bitSet(Switch.no_pullup_mask, switch_bit);
+}
+
+void SwitchSetVirtual(uint32_t index, uint8_t state)
+{
+  Switch.virtual_state[index] = state;
+}
+
+uint8_t SwitchGetVirtual(uint32_t index)
+{
+  return Switch.virtual_state[index];
+}
+
+uint8_t SwitchLastState(uint32_t index)
+{
+  return Switch.last_state[index];
+}
+
+bool SwitchState(uint32_t index)
+{
+  uint32_t switchmode = Settings.switchmode[index];
+  return ((FOLLOW_INV == switchmode) ||
+          (PUSHBUTTON_INV == switchmode) ||
+          (PUSHBUTTONHOLD_INV == switchmode) ||
+          (FOLLOWMULTI_INV == switchmode) ||
+          (PUSHHOLDMULTI_INV == switchmode)
+         ) ^ Switch.last_state[index];
+}
+
+
+
+void SwitchProbe(void)
+{
+  if (uptime < 4) { return; }
+
+  uint8_t state_filter = Settings.switch_debounce / SWITCH_PROBE_INTERVAL;
+  uint8_t force_high = (Settings.switch_debounce % 50) &1;
+  uint8_t force_low = (Settings.switch_debounce % 50) &2;
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    if (pin[GPIO_SWT1 +i] < 99) {
+
+      if (1 == digitalRead(pin[GPIO_SWT1 +i])) {
+
+        if (force_high) {
+          if (1 == Switch.virtual_state[i]) {
+            Switch.state[i] = state_filter;
+          }
+        }
+
+        if (Switch.state[i] < state_filter) {
+          Switch.state[i]++;
+          if (state_filter == Switch.state[i]) {
+            Switch.virtual_state[i] = 1;
+          }
+        }
+      } else {
+
+        if (force_low) {
+          if (0 == Switch.virtual_state[i]) {
+            Switch.state[i] = 0;
+          }
+        }
+
+        if (Switch.state[i] > 0) {
+          Switch.state[i]--;
+          if (0 == Switch.state[i]) {
+            Switch.virtual_state[i] = 0;
+          }
+        }
+      }
+    }
+  }
+  TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe);
+}
+
+void SwitchInit(void)
+{
+  Switch.present = 0;
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    Switch.last_state[i] = 1;
+    if (pin[GPIO_SWT1 +i] < 99) {
+      Switch.present++;
+      pinMode(pin[GPIO_SWT1 +i], bitRead(Switch.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_SWT1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
+      Switch.last_state[i] = digitalRead(pin[GPIO_SWT1 +i]);
+    }
+    Switch.virtual_state[i] = Switch.last_state[i];
+  }
+  if (Switch.present) { TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe); }
+}
+
+
+
+
+
+void SwitchHandler(uint8_t mode)
+{
+  if (uptime < 4) { return; }
+
+  uint16_t loops_per_second = 1000 / Settings.switch_debounce;
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    if ((pin[GPIO_SWT1 +i] < 99) || (mode)) {
+      uint8_t button = Switch.virtual_state[i];
+      uint8_t switchflag = POWER_TOGGLE +1;
+
+      if (Switch.hold_timer[i]) {
+        Switch.hold_timer[i]--;
+        if (0 == Switch.hold_timer[i]) {
+
+          switch (Settings.switchmode[i]) {
+            case TOGGLEMULTI:
+              switchflag = POWER_TOGGLE;
+              break;
+            case FOLLOWMULTI:
+              switchflag = button &1;
+              break;
+            case FOLLOWMULTI_INV:
+              switchflag = ~button &1;
+              break;
+            case PUSHHOLDMULTI:
+              if (NOT_PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
+              break;
+            case PUSHHOLDMULTI_INV:
+              if (PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
+              break;
+          default:
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
+            break;
+          }
+        }
+      }
+
+
+
+      if (button != Switch.last_state[i]) {
+        switch (Settings.switchmode[i]) {
+        case TOGGLE:
+        case PUSHBUTTON_TOGGLE:
+          switchflag = POWER_TOGGLE;
+          break;
+        case FOLLOW:
+          switchflag = button &1;
+          break;
+        case FOLLOW_INV:
+          switchflag = ~button &1;
+          break;
+        case PUSHBUTTON:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTON_INV:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTONHOLD:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
+            Switch.hold_timer[i] = 0;
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTONHOLD_INV:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
+            Switch.hold_timer[i] = 0;
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case TOGGLEMULTI:
+        case FOLLOWMULTI:
+        case FOLLOWMULTI_INV:
+          if (Switch.hold_timer[i]) {
+            Switch.hold_timer[i] = 0;
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
+          } else {
+            Switch.hold_timer[i] = loops_per_second / 2;
+          }
+          break;
+        case PUSHHOLDMULTI:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          break;
+        case PUSHHOLDMULTI_INV:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          break;
+        }
+        Switch.last_state[i] = button;
+      }
+      if (switchflag <= POWER_TOGGLE) {
+        if (!SendKey(KEY_SWITCH, i +1, switchflag)) {
+          ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);
+        }
+      }
+    }
+  }
+}
+
+void SwitchLoop(void)
+{
+  if (Switch.present) {
+    if (TimeReached(Switch.debounce)) {
+      SetNextTimeInterval(Switch.debounce, Settings.switch_debounce);
+      SwitchHandler(0);
+    }
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+const char kSleepMode[] PROGMEM = "Dynamic|Normal";
+const char kPrefixes[] PROGMEM = D_CMND "|" D_STAT "|" D_TELE;
+
+char* Format(char* output, const char* input, int size)
+{
+  char *token;
+  uint32_t digits = 0;
+
+  if (strstr(input, "%") != nullptr) {
+    strlcpy(output, input, size);
+    token = strtok(output, "%");
+    if (strstr(input, "%") == input) {
+      output[0] = '\0';
+    } else {
+      token = strtok(nullptr, "");
+    }
+    if (token != nullptr) {
+      digits = atoi(token);
+      if (digits) {
+        char tmp[size];
+        if (strchr(token, 'd')) {
+          snprintf_P(tmp, size, PSTR("%s%c0%dd"), output, '%', digits);
+          snprintf_P(output, size, tmp, ESP.getChipId() & 0x1fff);
+        } else {
+          snprintf_P(tmp, size, PSTR("%s%c0%dX"), output, '%', digits);
+          snprintf_P(output, size, tmp, ESP.getChipId());
+        }
+      } else {
+        if (strchr(token, 'd')) {
+          snprintf_P(output, size, PSTR("%s%d"), output, ESP.getChipId());
+          digits = 8;
+        }
+      }
+    }
+  }
+  if (!digits) {
+    strlcpy(output, input, size);
+  }
+  return output;
+}
+
+char* GetOtaUrl(char *otaurl, size_t otaurl_size)
+{
+  if (strstr(SettingsText(SET_OTAURL), "%04d") != nullptr) {
+    snprintf(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId() & 0x1fff);
+  }
+  else if (strstr(SettingsText(SET_OTAURL), "%d") != nullptr) {
+    snprintf_P(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId());
+  }
+  else {
+    strlcpy(otaurl, SettingsText(SET_OTAURL), otaurl_size);
+  }
+
+  return otaurl;
+}
+
+char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic)
+{
+# 88 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+  char romram[CMDSZ];
+  String fulltopic;
+
+  snprintf_P(romram, sizeof(romram), subtopic);
+  if (fallback_topic_flag || (prefix > 3)) {
+    bool fallback = (prefix < 8);
+    prefix &= 3;
+    char stemp[11];
+    fulltopic = GetTextIndexed(stemp, sizeof(stemp), prefix, kPrefixes);
+    fulltopic += F("/");
+    if (fallback) {
+      fulltopic += mqtt_client;
+      fulltopic += F("_fb");
+    } else {
+      fulltopic += topic;
+    }
+  } else {
+    fulltopic = SettingsText(SET_MQTT_FULLTOPIC);
+    if ((0 == prefix) && (-1 == fulltopic.indexOf(FPSTR(MQTT_TOKEN_PREFIX)))) {
+      fulltopic += F("/");
+      fulltopic += FPSTR(MQTT_TOKEN_PREFIX);
+    }
+    for (uint32_t i = 0; i < MAX_MQTT_PREFIXES; i++) {
+      if (!strlen(SettingsText(SET_MQTTPREFIX1 + i))) {
+        char temp[TOPSZ];
+        SettingsUpdateText(SET_MQTTPREFIX1 + i, GetTextIndexed(temp, sizeof(temp), i, kPrefixes));
+      }
+    }
+    fulltopic.replace(FPSTR(MQTT_TOKEN_PREFIX), SettingsText(SET_MQTTPREFIX1 + prefix));
+
+    fulltopic.replace(FPSTR(MQTT_TOKEN_TOPIC), topic);
+    fulltopic.replace(F("%hostname%"), my_hostname);
+    String token_id = WiFi.macAddress();
+    token_id.replace(":", "");
+    fulltopic.replace(F("%id%"), token_id);
+  }
+  fulltopic.replace(F("#"), "");
+  fulltopic.replace(F("//"), "/");
+  if (!fulltopic.endsWith("/")) {
+    fulltopic += "/";
+  }
+  snprintf_P(stopic, TOPSZ, PSTR("%s%s"), fulltopic.c_str(), romram);
+  return stopic;
+}
+
+char* GetGroupTopic_P(char *stopic, const char* subtopic)
+{
+
+
+  return GetTopic_P(stopic, (Settings.flag3.grouptopic_mode) ? CMND +8 : CMND, SettingsText(SET_MQTT_GRP_TOPIC), subtopic);
+}
+
+char* GetFallbackTopic_P(char *stopic, const char* subtopic)
+{
+  return GetTopic_P(stopic, CMND +4, nullptr, subtopic);
+}
+
+char* GetStateText(uint32_t state)
+{
+  if (state >= MAX_STATE_TEXT) {
+    state = 1;
+  }
+  return SettingsText(SET_STATE_TXT1 + state);
+}
+
+
+
+void SetLatchingRelay(power_t lpower, uint32_t state)
+{
+
+
+
+
+
+  if (state && !latching_relay_pulse) {
+    latching_power = lpower;
+    latching_relay_pulse = 2;
+  }
+
+  for (uint32_t i = 0; i < devices_present; i++) {
+    uint32_t port = (i << 1) + ((latching_power >> i) &1);
+    DigitalWrite(GPIO_REL1 +port, bitRead(rel_inverted, port) ? !state : state);
+  }
+}
+
+void SetDevicePower(power_t rpower, uint32_t source)
+{
+  ShowSource(source);
+  last_source = source;
+
+  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+    power = (1 << devices_present) -1;
+    rpower = power;
+  }
+
+  if (Settings.flag.interlock) {
+    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+      power_t mask = 1;
+      uint32_t count = 0;
+      for (uint32_t j = 0; j < devices_present; j++) {
+        if ((Settings.interlock[i] & mask) && (rpower & mask)) {
+          count++;
+        }
+        mask <<= 1;
+      }
+      if (count > 1) {
+        mask = ~Settings.interlock[i];
+        power &= mask;
+        rpower &= mask;
+      }
+    }
+  }
+
+  if (rpower) {
+    last_power = rpower;
+  }
+
+  XdrvMailbox.index = rpower;
+  XdrvCall(FUNC_SET_POWER);
+
+  XdrvMailbox.index = rpower;
+  XdrvMailbox.payload = source;
+  if (XdrvCall(FUNC_SET_DEVICE_POWER)) {
+
+  }
+  else if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+    Serial.write(0xA0);
+    Serial.write(0x04);
+    Serial.write(rpower &0xFF);
+    Serial.write(0xA1);
+    Serial.write('\n');
+    Serial.flush();
+  }
+  else if (EXS_RELAY == my_module_type) {
+    SetLatchingRelay(rpower, 1);
+  }
+  else {
+    for (uint32_t i = 0; i < devices_present; i++) {
+      power_t state = rpower &1;
+      if (i < MAX_RELAYS) {
+        DigitalWrite(GPIO_REL1 +i, bitRead(rel_inverted, i) ? !state : state);
+      }
+      rpower >>= 1;
+    }
+  }
+}
+
+void RestorePower(bool publish_power, uint32_t source)
+{
+  if (power != last_power) {
+    power = last_power;
+    SetDevicePower(power, source);
+    if (publish_power) {
+      MqttPublishAllPowerState();
+    }
+  }
+}
+
+void SetAllPower(uint32_t state, uint32_t source)
+{
+# 256 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+  bool publish_power = true;
+  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
+    state &= 3;
+    publish_power = false;
+  }
+  if ((state >= POWER_OFF) && (state <= POWER_TOGGLE)) {
+    power_t all_on = (1 << devices_present) -1;
+    switch (state) {
+    case POWER_OFF:
+      power = 0;
+      break;
+    case POWER_ON:
+      power = all_on;
+      break;
+    case POWER_TOGGLE:
+      power ^= all_on;
+    }
+    SetDevicePower(power, source);
+  }
+  if (publish_power) {
+    MqttPublishAllPowerState();
+  }
+}
+
+void SetPowerOnState(void)
+{
+  if (MOTOR == my_module_type) {
+    Settings.poweronstate = POWER_ALL_ON;
+  }
+  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+    SetDevicePower(1, SRC_RESTART);
+  } else {
+    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
+      switch (Settings.poweronstate) {
+      case POWER_ALL_OFF:
+      case POWER_ALL_OFF_PULSETIME_ON:
+        power = 0;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_ON:
+        power = (1 << devices_present) -1;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_SAVED_TOGGLE:
+        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
+        if (Settings.flag.save_state) {
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      case POWER_ALL_SAVED:
+        power = Settings.power & ((1 << devices_present) -1);
+        if (Settings.flag.save_state) {
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      }
+    } else {
+      power = Settings.power & ((1 << devices_present) -1);
+      if (Settings.flag.save_state) {
+        SetDevicePower(power, SRC_RESTART);
+      }
+    }
+  }
+
+
+  for (uint32_t i = 0; i < devices_present; i++) {
+    if (!Settings.flag3.no_power_feedback) {
+      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
+        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
+      }
+    }
+    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
+      SetPulseTimer(i, Settings.pulse_timer[i]);
+    }
+  }
+  blink_powersave = power;
+}
+
+void SetLedPowerIdx(uint32_t led, uint32_t state)
+{
+  if ((99 == pin[GPIO_LEDLNK]) && (0 == led)) {
+    if (pin[GPIO_LED2] < 99) {
+      led = 1;
+    }
+  }
+  if (pin[GPIO_LED1 + led] < 99) {
+    uint32_t mask = 1 << led;
+    if (state) {
+      state = 1;
+      led_power |= mask;
+    } else {
+      led_power &= (0xFF ^ mask);
+    }
+    DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
+  }
+#ifdef USE_BUZZER
+  if (led == 0) {
+    BuzzerSetStateToLed(state);
+  }
+#endif
+}
+
+void SetLedPower(uint32_t state)
+{
+  if (99 == pin[GPIO_LEDLNK]) {
+    SetLedPowerIdx(0, state);
+  } else {
+    power_t mask = 1;
+    for (uint32_t i = 0; i < leds_present; i++) {
+      bool tstate = (power & mask);
+      SetLedPowerIdx(i, tstate);
+      mask <<= 1;
+    }
+  }
+}
+
+void SetLedPowerAll(uint32_t state)
+{
+  for (uint32_t i = 0; i < leds_present; i++) {
+    SetLedPowerIdx(i, state);
+  }
+}
+
+void SetLedLink(uint32_t state)
+{
+  uint32_t led_pin = pin[GPIO_LEDLNK];
+  uint32_t led_inv = ledlnk_inverted;
+  if (99 == led_pin) {
+    led_pin = pin[GPIO_LED1];
+    led_inv = bitRead(led_inverted, 0);
+  }
+  if (led_pin < 99) {
+    if (state) { state = 1; }
+    digitalWrite(led_pin, (led_inv) ? !state : state);
+  }
+#ifdef USE_BUZZER
+  BuzzerSetStateToLed(state);
+#endif
+}
+
+void SetPulseTimer(uint32_t index, uint32_t time)
+{
+  pulse_timer[index] = (time > 111) ? millis() + (1000 * (time - 100)) : (time > 0) ? millis() + (100 * time) : 0L;
+}
+
+uint32_t GetPulseTimer(uint32_t index)
+{
+  long time = TimePassedSince(pulse_timer[index]);
+  if (time < 0) {
+    time *= -1;
+    return (time > 11100) ? (time / 1000) + 100 : (time > 0) ? time / 100 : 0;
+  }
+  return 0;
+}
+
+
+
+bool SendKey(uint32_t key, uint32_t device, uint32_t state)
+{
+# 423 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+  char stopic[TOPSZ];
+  char scommand[CMDSZ];
+  char key_topic[TOPSZ];
+  bool result = false;
+
+  char *tmp = (key) ? SettingsText(SET_MQTT_SWITCH_TOPIC) : SettingsText(SET_MQTT_BUTTON_TOPIC);
+  Format(key_topic, tmp, sizeof(key_topic));
+  if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) {
+    if (!key && (device > devices_present)) {
+      device = 1;
+    }
+    GetTopic_P(stopic, CMND, key_topic,
+               GetPowerDevice(scommand, device, sizeof(scommand), (key + Settings.flag.device_index_enable)));
+    if (CLEAR_RETAIN == state) {
+      mqtt_data[0] = '\0';
+    } else {
+      if ((Settings.flag3.button_switch_force_local ||
+           !strcmp(mqtt_topic, key_topic) ||
+           !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic)) &&
+          (POWER_TOGGLE == state)) {
+        state = ~(power >> (device -1)) &1;
+      }
+      snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(state));
+    }
+#ifdef USE_DOMOTICZ
+    if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) {
+#endif
+      MqttPublish(stopic, ((key) ? Settings.flag.mqtt_switch_retain
+                                 : Settings.flag.mqtt_button_retain) &&
+                                 (state != POWER_HOLD || !Settings.flag3.no_hold_retain));
+#ifdef USE_DOMOTICZ
+    }
+#endif
+    result = !Settings.flag3.button_switch_force_local;
+  } else {
+    Response_P(PSTR("{\"%s%d\":{\"State\":%d}}"), (key) ? "Switch" : "Button", device, state);
+    result = XdrvRulesProcess();
+  }
+  int32_t payload_save = XdrvMailbox.payload;
+  XdrvMailbox.payload = key << 16 | state << 8 | device;
+  XdrvCall(FUNC_ANY_KEY);
+  XdrvMailbox.payload = payload_save;
+  return result;
+}
+
+void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source)
+{
+# 483 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) {
+    blink_mask &= 1;
+    Settings.flag.interlock = 0;
+    Settings.pulse_timer[1] = 0;
+    Settings.pulse_timer[2] = 0;
+    Settings.pulse_timer[3] = 0;
+  }
+#endif
+
+  bool publish_power = true;
+  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
+    state &= 3;
+    publish_power = false;
+  }
+
+  if ((device < 1) || (device > devices_present)) {
+    device = 1;
+  }
+  active_device = device;
+
+  if (device <= MAX_PULSETIMERS) {
+    SetPulseTimer(device -1, 0);
+  }
+  power_t mask = 1 << (device -1);
+  if (state <= POWER_TOGGLE) {
+    if ((blink_mask & mask)) {
+      blink_mask &= (POWER_MASK ^ mask);
+      MqttPublishPowerBlinkState(device);
+    }
+
+    if (Settings.flag.interlock &&
+        !interlock_mutex &&
+        ((POWER_ON == state) || ((POWER_TOGGLE == state) && !(power & mask)))
+       ) {
+      interlock_mutex = true;
+      for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+        if (Settings.interlock[i] & mask) {
+          for (uint32_t j = 0; j < devices_present; j++) {
+            power_t imask = 1 << j;
+            if ((Settings.interlock[i] & imask) && (power & imask) && (mask != imask)) {
+              ExecuteCommandPower(j +1, POWER_OFF, SRC_IGNORE);
+              delay(50);
+            }
+          }
+          break;
+        }
+      }
+      interlock_mutex = false;
+    }
+
+    switch (state) {
+    case POWER_OFF: {
+      power &= (POWER_MASK ^ mask);
+      break; }
+    case POWER_ON:
+      power |= mask;
+      break;
+    case POWER_TOGGLE:
+      power ^= mask;
+    }
+    SetDevicePower(power, source);
+#ifdef USE_DOMOTICZ
+    DomoticzUpdatePowerState(device);
+#endif
+#ifdef USE_KNX
+    KnxUpdatePowerState(device, power);
+#endif
+    if (publish_power && Settings.flag3.hass_tele_on_power) {
+      MqttPublishTeleState();
+    }
+    if (device <= MAX_PULSETIMERS) {
+      SetPulseTimer(device -1, (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[device -1] : 0);
+    }
+  }
+  else if (POWER_BLINK == state) {
+    if (!(blink_mask & mask)) {
+      blink_powersave = (blink_powersave & (POWER_MASK ^ mask)) | (power & mask);
+      blink_power = (power >> (device -1))&1;
+    }
+    blink_timer = millis() + 100;
+    blink_counter = ((!Settings.blinkcount) ? 64000 : (Settings.blinkcount *2)) +1;
+    blink_mask |= mask;
+    MqttPublishPowerBlinkState(device);
+    return;
+  }
+  else if (POWER_BLINK_STOP == state) {
+    bool flag = (blink_mask & mask);
+    blink_mask &= (POWER_MASK ^ mask);
+    MqttPublishPowerBlinkState(device);
+    if (flag) {
+      ExecuteCommandPower(device, (blink_powersave >> (device -1))&1, SRC_IGNORE);
+    }
+    return;
+  }
+  if (publish_power) {
+    MqttPublishPowerState(device);
+  }
+}
+
+void StopAllPowerBlink(void)
+{
+  power_t mask;
+
+  for (uint32_t i = 1; i <= devices_present; i++) {
+    mask = 1 << (i -1);
+    if (blink_mask & mask) {
+      blink_mask &= (POWER_MASK ^ mask);
+      MqttPublishPowerBlinkState(i);
+      ExecuteCommandPower(i, (blink_powersave >> (i -1))&1, SRC_IGNORE);
+    }
+  }
+}
+
+void MqttShowPWMState(void)
+{
+  ResponseAppend_P(PSTR("\"" D_CMND_PWM "\":{"));
+  bool first = true;
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    if (pin[GPIO_PWM1 + i] < 99) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_PWM "%d\":%d"), first ? "" : ",", i+1, Settings.pwm_value[i]);
+      first = false;
+    }
+  }
+  ResponseJsonEnd();
+}
+
+void MqttShowState(void)
+{
+  char stemp1[TOPSZ];
+
+  ResponseAppendTime();
+  ResponseAppend_P(PSTR(",\"" D_JSON_UPTIME "\":\"%s\",\"UptimeSec\":%u"), GetUptime().c_str(), UpTime());
+
+#ifdef USE_ADC_VCC
+  dtostrfd((double)ESP.getVcc()/1000, 3, stemp1);
+  ResponseAppend_P(PSTR(",\"" D_JSON_VCC "\":%s"), stemp1);
+#endif
+
+  ResponseAppend_P(PSTR(",\"" D_JSON_HEAPSIZE "\":%d,\"SleepMode\":\"%s\",\"Sleep\":%u,\"LoadAvg\":%u,\"MqttCount\":%u"),
+    ESP.getFreeHeap()/1024, GetTextIndexed(stemp1, sizeof(stemp1), Settings.flag3.sleep_normal, kSleepMode),
+    sleep, loop_load_avg, MqttConnectCount());
+
+  for (uint32_t i = 1; i <= devices_present; i++) {
+#ifdef USE_LIGHT
+    if ((LightDevice()) && (i >= LightDevice())) {
+      if (i == LightDevice()) { LightState(1); }
+    } else {
+#endif
+      ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable),
+                                               GetStateText(bitRead(power, i-1)));
+#ifdef USE_SONOFF_IFAN
+      if (IsModuleIfan()) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_FANSPEED "\":%d"), GetFanspeed());
+        break;
+      }
+#endif
+#ifdef USE_LIGHT
+    }
+#endif
+  }
+
+  if (pwm_present) {
+    ResponseAppend_P(PSTR(","));
+    MqttShowPWMState();
+  }
+
+  ResponseAppend_P(PSTR(",\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_BSSID "\":\"%s\",\"" D_JSON_CHANNEL "\":%d,\"" D_JSON_RSSI "\":%d,\"" D_JSON_SIGNAL "\":%d,\"" D_JSON_LINK_COUNT "\":%d,\"" D_JSON_DOWNTIME "\":\"%s\"}}"),
+    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WiFi.BSSIDstr().c_str(), WiFi.channel(),
+    WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), WifiLinkCount(), WifiDowntime().c_str());
+}
+
+void MqttPublishTeleState(void)
+{
+  mqtt_data[0] = '\0';
+  MqttShowState();
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+  RulesTeleperiod();
+#endif
+}
+
+bool MqttShowSensor(void)
+{
+  ResponseAppendTime();
+
+  int json_data_start = strlen(mqtt_data);
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+#ifdef USE_TM1638
+    if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
+#else
+    if (pin[GPIO_SWT1 +i] < 99) {
+#endif
+      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(SwitchState(i)));
+    }
+  }
+  XsnsCall(FUNC_JSON_APPEND);
+  XdrvCall(FUNC_JSON_APPEND);
+
+  bool json_data_available = (strlen(mqtt_data) - json_data_start);
+  if (strstr_P(mqtt_data, PSTR(D_JSON_PRESSURE)) != nullptr) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
+  }
+  if (strstr_P(mqtt_data, PSTR(D_JSON_TEMPERATURE)) != nullptr) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
+  }
+  ResponseJsonEnd();
+
+  if (json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }
+  return json_data_available;
+}
+
+void MqttPublishSensor(void)
+{
+  mqtt_data[0] = '\0';
+  if (MqttShowSensor()) {
+    MqttPublishTeleSensor();
+  }
+}
+# 710 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+void PerformEverySecond(void)
+{
+  uptime++;
+
+  if (POWER_CYCLE_TIME == uptime) {
+    UpdateQuickPowerCycle(false);
+  }
+
+  if (BOOT_LOOP_TIME == uptime) {
+    RtcRebootReset();
+
+#ifdef USE_DEEPSLEEP
+    if (!(DeepSleepEnabled() && !Settings.flag3.bootcount_update)) {
+#endif
+      Settings.bootcount++;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BOOT_COUNT " %d"), Settings.bootcount);
+#ifdef USE_DEEPSLEEP
+    }
+#endif
+  }
+
+  if (mqtt_cmnd_blocked_reset) {
+    mqtt_cmnd_blocked_reset--;
+    if (!mqtt_cmnd_blocked_reset) {
+      mqtt_cmnd_blocked = 0;
+    }
+  }
+
+  if (seriallog_timer) {
+    seriallog_timer--;
+    if (!seriallog_timer) {
+      if (seriallog_level) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SERIAL_LOGGING_DISABLED));
+      }
+      seriallog_level = 0;
+    }
+  }
+
+  if (syslog_timer) {
+    syslog_timer--;
+    if (!syslog_timer) {
+      syslog_level = Settings.syslog_level;
+      if (Settings.syslog_level) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_LOGGING_REENABLED));
+      }
+    }
+  }
+
+  ResetGlobalValues();
+
+  if (Settings.tele_period) {
+    if (tele_period >= 9999) {
+      if (!global_state.wifi_down) {
+        tele_period = 0;
+      }
+    } else {
+      tele_period++;
+      if (tele_period >= Settings.tele_period) {
+        tele_period = 0;
+
+        MqttPublishTeleState();
+
+        mqtt_data[0] = '\0';
+        if (MqttShowSensor()) {
+          MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+          RulesTeleperiod();
+#endif
+        }
+
+        XdrvCall(FUNC_AFTER_TELEPERIOD);
+      }
+    }
+  }
+}
+
+
+
+
+
+void Every100mSeconds(void)
+{
+
+  power_t power_now;
+
+  if (prepped_loglevel) {
+    AddLog(prepped_loglevel);
+    prepped_loglevel = 0;
+  }
+
+  if (latching_relay_pulse) {
+    latching_relay_pulse--;
+    if (!latching_relay_pulse) SetLatchingRelay(0, 0);
+  }
+
+  for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
+    if (pulse_timer[i] != 0L) {
+      if (TimeReached(pulse_timer[i])) {
+        pulse_timer[i] = 0L;
+        ExecuteCommandPower(i +1, (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? POWER_ON : POWER_OFF, SRC_PULSETIMER);
+      }
+    }
+  }
+
+  if (blink_mask) {
+    if (TimeReached(blink_timer)) {
+      SetNextTimeInterval(blink_timer, 100 * Settings.blinktime);
+      blink_counter--;
+      if (!blink_counter) {
+        StopAllPowerBlink();
+      } else {
+        blink_power ^= 1;
+        power_now = (power & (POWER_MASK ^ blink_mask)) | ((blink_power) ? blink_mask : 0);
+        SetDevicePower(power_now, SRC_IGNORE);
+      }
+    }
+  }
+}
+
+
+
+
+
+void Every250mSeconds(void)
+{
+
+
+  uint32_t blinkinterval = 1;
+
+  state_250mS++;
+  state_250mS &= 0x3;
+
+  if (!Settings.flag.global_state) {
+    if (global_state.data) {
+      if (global_state.mqtt_down) { blinkinterval = 7; }
+      if (global_state.wifi_down) { blinkinterval = 3; }
+      blinks = 201;
+    }
+  }
+  if (blinks || restart_flag || ota_state_flag) {
+    if (restart_flag || ota_state_flag) {
+      blinkstate = true;
+    } else {
+      blinkspeed--;
+      if (!blinkspeed) {
+        blinkspeed = blinkinterval;
+        blinkstate ^= 1;
+      }
+    }
+    if ((!(Settings.ledstate &0x08)) && ((Settings.ledstate &0x06) || (blinks > 200) || (blinkstate))) {
+      SetLedLink(blinkstate);
+    }
+    if (!blinkstate) {
+      blinks--;
+      if (200 == blinks) blinks = 0;
+    }
+  }
+  if (Settings.ledstate &1 && (pin[GPIO_LEDLNK] < 99 || !(blinks || restart_flag || ota_state_flag)) ) {
+    bool tstate = power & Settings.ledmask;
+    if ((SONOFF_TOUCH == my_module_type) || (SONOFF_T11 == my_module_type) || (SONOFF_T12 == my_module_type) || (SONOFF_T13 == my_module_type)) {
+      tstate = (!power) ? 1 : 0;
+    }
+    SetLedPower(tstate);
+  }
+
+
+
+
+
+  switch (state_250mS) {
+  case 0:
+    if (ota_state_flag && BACKLOG_EMPTY) {
+      ota_state_flag--;
+      if (2 == ota_state_flag) {
+        RtcSettings.ota_loader = 0;
+        ota_retry_counter = OTA_ATTEMPTS;
+        ESPhttpUpdate.rebootOnUpdate(false);
+        SettingsSave(1);
+      }
+      if (ota_state_flag <= 0) {
+#ifdef USE_WEBSERVER
+        if (Settings.webserver) StopWebserver();
+#endif
+#ifdef USE_ARILUX_RF
+        AriluxRfDisable();
+#endif
+        ota_state_flag = 92;
+        ota_result = 0;
+        ota_retry_counter--;
+        if (ota_retry_counter) {
+          strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
+#ifndef FIRMWARE_MINIMAL
+          if (RtcSettings.ota_loader) {
+# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
+            char *bch = strrchr(mqtt_data, '/');
+            if (bch == nullptr) { bch = mqtt_data; }
+
+            char *ech = strrchr(bch, '.');
+            if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
+              char *fch = ech;
+              *fch = '\0';
+              ech = strrchr(bch, '.');
+              *fch = '.';
+            }
+            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
+            char ota_url_type[strlen(ech) +1];
+            strncpy(ota_url_type, ech, sizeof(ota_url_type));
+
+            char *pch = strrchr(bch, '-');
+            if (pch == nullptr) { pch = ech; }
+            *pch = '\0';
+            snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);
+          }
+#endif
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(mqtt_data));
+#else
+
+          WiFiClient OTAclient;
+          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, mqtt_data));
+#endif
+          if (!ota_result) {
+#ifndef FIRMWARE_MINIMAL
+            int ota_error = ESPhttpUpdate.getLastError();
+            DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error);
+            if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
+              RtcSettings.ota_loader = 1;
+            }
+#endif
+            ota_state_flag = 2;
+          }
+        }
+      }
+      if (90 == ota_state_flag) {
+        ota_state_flag = 0;
+        Response_P(PSTR("{\"" D_CMND_UPGRADE "\":\""));
+        if (ota_result) {
+
+          if (!VersionCompatible()) {
+            ResponseAppend_P(PSTR(D_JSON_FAILED " " D_UPLOAD_ERR_14));
+          } else {
+            ResponseAppend_P(PSTR(D_JSON_SUCCESSFUL ". " D_JSON_RESTARTING));
+            restart_flag = 2;
+          }
+        } else {
+          ResponseAppend_P(PSTR(D_JSON_FAILED " %s"), ESPhttpUpdate.getLastErrorString().c_str());
+        }
+        ResponseAppend_P(PSTR("\"}"));
+
+        MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_UPGRADE));
+      }
+    }
+    break;
+  case 1:
+    if (MidnightNow()) {
+      XsnsCall(FUNC_SAVE_AT_MIDNIGHT);
+    }
+    if (save_data_counter && BACKLOG_EMPTY) {
+      save_data_counter--;
+      if (save_data_counter <= 0) {
+        if (Settings.flag.save_state) {
+          power_t mask = POWER_MASK;
+          for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
+            if ((Settings.pulse_timer[i] > 0) && (Settings.pulse_timer[i] < 30)) {
+              mask &= ~(1 << i);
+            }
+          }
+          if (!((Settings.power &mask) == (power &mask))) {
+            Settings.power = power;
+          }
+        } else {
+          Settings.power = 0;
+        }
+        SettingsSave(0);
+        save_data_counter = Settings.save_data;
+      }
+    }
+    if (restart_flag && BACKLOG_EMPTY) {
+      if ((214 == restart_flag) || (215 == restart_flag) || (216 == restart_flag)) {
+
+        char storage_ssid1[strlen(SettingsText(SET_STASSID1)) +1];
+        strncpy(storage_ssid1, SettingsText(SET_STASSID1), sizeof(storage_ssid1));
+        char storage_ssid2[strlen(SettingsText(SET_STASSID2)) +1];
+        strncpy(storage_ssid2, SettingsText(SET_STASSID2), sizeof(storage_ssid2));
+        char storage_pass1[strlen(SettingsText(SET_STAPWD1)) +1];
+        strncpy(storage_pass1, SettingsText(SET_STAPWD1), sizeof(storage_pass1));
+        char storage_pass2[strlen(SettingsText(SET_STAPWD2)) +1];
+        strncpy(storage_pass2, SettingsText(SET_STAPWD2), sizeof(storage_pass2));
+
+        char storage_mqtthost[strlen(SettingsText(SET_MQTT_HOST)) +1];
+        strncpy(storage_mqtthost, SettingsText(SET_MQTT_HOST), sizeof(storage_mqtthost));
+        char storage_mqttuser[strlen(SettingsText(SET_MQTT_USER)) +1];
+        strncpy(storage_mqttuser, SettingsText(SET_MQTT_USER), sizeof(storage_mqttuser));
+        char storage_mqttpwd[strlen(SettingsText(SET_MQTT_PWD)) +1];
+        strncpy(storage_mqttpwd, SettingsText(SET_MQTT_PWD), sizeof(storage_mqttpwd));
+        char storage_mqtttopic[strlen(SettingsText(SET_MQTT_TOPIC)) +1];
+        strncpy(storage_mqtttopic, SettingsText(SET_MQTT_TOPIC), sizeof(storage_mqtttopic));
+        uint16_t mqtt_port = Settings.mqtt_port;
+
+
+
+
+        if ((215 == restart_flag) || (216 == restart_flag)) {
+          SettingsErase(0);
+        }
+        SettingsDefault();
+
+        SettingsUpdateText(SET_STASSID1, storage_ssid1);
+        SettingsUpdateText(SET_STASSID2, storage_ssid2);
+        SettingsUpdateText(SET_STAPWD1, storage_pass1);
+        SettingsUpdateText(SET_STAPWD2, storage_pass2);
+        if (216 == restart_flag) {
+
+          SettingsUpdateText(SET_MQTT_HOST, storage_mqtthost);
+          SettingsUpdateText(SET_MQTT_USER, storage_mqttuser);
+          SettingsUpdateText(SET_MQTT_PWD, storage_mqttpwd);
+          SettingsUpdateText(SET_MQTT_TOPIC, storage_mqtttopic);
+          Settings.mqtt_port = mqtt_port;
+        }
+        restart_flag = 2;
+      }
+      else if (213 == restart_flag) {
+        SettingsSdkErase();
+        restart_flag = 2;
+      }
+      else if (212 == restart_flag) {
+        SettingsErase(0);
+        restart_flag = 211;
+      }
+      if (211 == restart_flag) {
+        SettingsDefault();
+        restart_flag = 2;
+      }
+      if (2 == restart_flag) {
+        SettingsSaveAll();
+      }
+      restart_flag--;
+      if (restart_flag <= 0) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
+        EspRestart();
+      }
+    }
+    break;
+  case 2:
+    WifiCheck(wifi_state_flag);
+    wifi_state_flag = WIFI_RESTART;
+    break;
+  case 3:
+    if (!global_state.wifi_down) { MqttCheck(); }
+    break;
+  }
+}
+
+#ifdef USE_ARDUINO_OTA
+
+
+
+
+
+
+
+bool arduino_ota_triggered = false;
+uint16_t arduino_ota_progress_dot_count = 0;
+
+void ArduinoOTAInit(void)
+{
+  ArduinoOTA.setPort(8266);
+  ArduinoOTA.setHostname(my_hostname);
+  if (strlen(SettingsText(SET_WEBPWD))) {
+    ArduinoOTA.setPassword(SettingsText(SET_WEBPWD));
+  }
+
+  ArduinoOTA.onStart([]()
+  {
+    SettingsSave(1);
+#ifdef USE_WEBSERVER
+    if (Settings.webserver) { StopWebserver(); }
+#endif
+#ifdef USE_ARILUX_RF
+    AriluxRfDisable();
+#endif
+    if (Settings.flag.mqtt_enabled) {
+      MqttDisconnect();
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_UPLOAD_STARTED));
+    arduino_ota_triggered = true;
+    arduino_ota_progress_dot_count = 0;
+    delay(100);
+  });
+
+  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
+  {
+    if ((LOG_LEVEL_DEBUG <= seriallog_level)) {
+      arduino_ota_progress_dot_count++;
+      Serial.printf(".");
+      if (!(arduino_ota_progress_dot_count % 80)) { Serial.println(); }
+    }
+  });
+
+  ArduinoOTA.onError([](ota_error_t error)
+  {
+
+
+
+
+    char error_str[100];
+
+    if ((LOG_LEVEL_DEBUG <= seriallog_level) && arduino_ota_progress_dot_count) { Serial.println(); }
+    switch (error) {
+      case OTA_BEGIN_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_2), sizeof(error_str)); break;
+      case OTA_RECEIVE_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_5), sizeof(error_str)); break;
+      case OTA_END_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_7), sizeof(error_str)); break;
+      default:
+        snprintf_P(error_str, sizeof(error_str), PSTR(D_UPLOAD_ERROR_CODE " %d"), error);
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA  %s. " D_RESTARTING), error_str);
+    EspRestart();
+  });
+
+  ArduinoOTA.onEnd([]()
+  {
+    if ((LOG_LEVEL_DEBUG <= seriallog_level)) { Serial.println(); }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_SUCCESSFUL ". " D_RESTARTING));
+    EspRestart();
+ });
+
+  ArduinoOTA.begin();
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266"));
+}
+
+void ArduinoOtaLoop(void)
+{
+  MDNS.update();
+  ArduinoOTA.handle();
+
+  while (arduino_ota_triggered) { ArduinoOTA.handle(); }
+}
+#endif
+
+
+
+void SerialInput(void)
+{
+  while (Serial.available()) {
+
+    delay(0);
+    serial_in_byte = Serial.read();
+
+
+
+
+    if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+      serial_in_byte = ButtonSerial(serial_in_byte);
+    }
+
+
+
+    if (XdrvCall(FUNC_SERIAL)) {
+      serial_in_byte_counter = 0;
+      Serial.flush();
+      return;
+    }
+
+
+
+    if (serial_in_byte > 127 && !Settings.flag.mqtt_serial_raw) {
+      serial_in_byte_counter = 0;
+      Serial.flush();
+      return;
+    }
+    if (!Settings.flag.mqtt_serial) {
+      if (isprint(serial_in_byte)) {
+        if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) {
+          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+        } else {
+          serial_in_byte_counter = 0;
+        }
+      }
+    } else {
+      if (serial_in_byte || Settings.flag.mqtt_serial_raw) {
+        if ((serial_in_byte_counter < INPUT_BUFFER_SIZE -1) &&
+            ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
+            ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
+              Settings.flag.mqtt_serial_raw)) {
+          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+          serial_polling_window = millis();
+        } else {
+          serial_polling_window = 0;
+          break;
+        }
+      }
+    }
+
+#ifdef USE_SONOFF_SC
+
+
+
+    if (SONOFF_SC == my_module_type) {
+      if (serial_in_byte == '\x1B') {
+        serial_in_buffer[serial_in_byte_counter] = 0;
+        SonoffScSerialInput(serial_in_buffer);
+        serial_in_byte_counter = 0;
+        Serial.flush();
+        return;
+      }
+    } else
+#endif
+
+
+    if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) {
+      serial_in_buffer[serial_in_byte_counter] = 0;
+      seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (uint8_t)LOG_LEVEL_INFO : Settings.seriallog_level;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), serial_in_buffer);
+      ExecuteCommand(serial_in_buffer, SRC_SERIAL);
+      serial_in_byte_counter = 0;
+      serial_polling_window = 0;
+      Serial.flush();
+      return;
+    }
+  }
+
+  if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) {
+    serial_in_buffer[serial_in_byte_counter] = 0;
+    char hex_char[(serial_in_byte_counter * 2) + 2];
+    bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
+      (assume_json) ? "" : """");
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
+    XdrvRulesProcess();
+    serial_in_byte_counter = 0;
+  }
+}
+
+
+
+void GpioInit(void)
+{
+  uint32_t mpin;
+
+  if (!ValidModule(Settings.module)) {
+    uint32_t module = MODULE;
+    if (!ValidModule(MODULE)) { module = SONOFF_BASIC; }
+    Settings.module = module;
+    Settings.last_module = module;
+  }
+  SetModuleType();
+
+  if (Settings.module != Settings.last_module) {
+    Settings.baudrate = APP_BAUDRATE / 300;
+    Settings.serial_config = TS_SERIAL_8N1;
+  }
+
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    if ((Settings.user_template.gp.io[i] >= GPIO_SENSOR_END) && (Settings.user_template.gp.io[i] < GPIO_USER)) {
+      Settings.user_template.gp.io[i] = GPIO_USER;
+    }
+  }
+
+  myio def_gp;
+  ModuleGpios(&def_gp);
+  for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+    if ((Settings.my_gp.io[i] >= GPIO_SENSOR_END) && (Settings.my_gp.io[i] < GPIO_USER)) {
+      Settings.my_gp.io[i] = GPIO_NONE;
+    }
+    else if (Settings.my_gp.io[i] > GPIO_NONE) {
+      my_module.io[i] = Settings.my_gp.io[i];
+    }
+    if ((def_gp.io[i] > GPIO_NONE) && (def_gp.io[i] < GPIO_USER)) {
+      my_module.io[i] = def_gp.io[i];
+    }
+  }
+  if ((Settings.my_adc0 >= ADC0_END) && (Settings.my_adc0 < ADC0_USER)) {
+    Settings.my_adc0 = ADC0_NONE;
+  }
+  else if (Settings.my_adc0 > ADC0_NONE) {
+    my_adc0 = Settings.my_adc0;
+  }
+  my_module_flag = ModuleFlag();
+  uint32_t template_adc0 = my_module_flag.data &15;
+  if ((template_adc0 > ADC0_NONE) && (template_adc0 < ADC0_USER)) {
+    my_adc0 = template_adc0;
+  }
+
+  for (uint32_t i = 0; i < GPIO_MAX; i++) {
+    pin[i] = 99;
+  }
+  for (uint32_t i = 0; i < sizeof(my_module.io); i++) {
+    mpin = ValidPin(i, my_module.io[i]);
+
+    DEBUG_CORE_LOG(PSTR("INI: gpio pin %d, mpin %d"), i, mpin);
+
+    if (mpin) {
+      XdrvMailbox.index = mpin;
+      XdrvMailbox.payload = i;
+
+      if ((mpin >= GPIO_SWT1_NP) && (mpin < (GPIO_SWT1_NP + MAX_SWITCHES))) {
+        SwitchPullupFlag(mpin - GPIO_SWT1_NP);
+        mpin -= (GPIO_SWT1_NP - GPIO_SWT1);
+      }
+      else if ((mpin >= GPIO_KEY1_NP) && (mpin < (GPIO_KEY1_NP + MAX_KEYS))) {
+        ButtonPullupFlag(mpin - GPIO_KEY1_NP);
+        mpin -= (GPIO_KEY1_NP - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_KEY1_INV) && (mpin < (GPIO_KEY1_INV + MAX_KEYS))) {
+        ButtonInvertFlag(mpin - GPIO_KEY1_INV);
+        mpin -= (GPIO_KEY1_INV - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_KEY1_INV_NP) && (mpin < (GPIO_KEY1_INV_NP + MAX_KEYS))) {
+        ButtonPullupFlag(mpin - GPIO_KEY1_INV_NP);
+        ButtonInvertFlag(mpin - GPIO_KEY1_INV_NP);
+        mpin -= (GPIO_KEY1_INV_NP - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_REL1_INV) && (mpin < (GPIO_REL1_INV + MAX_RELAYS))) {
+        bitSet(rel_inverted, mpin - GPIO_REL1_INV);
+        mpin -= (GPIO_REL1_INV - GPIO_REL1);
+      }
+      else if ((mpin >= GPIO_LED1_INV) && (mpin < (GPIO_LED1_INV + MAX_LEDS))) {
+        bitSet(led_inverted, mpin - GPIO_LED1_INV);
+        mpin -= (GPIO_LED1_INV - GPIO_LED1);
+      }
+      else if (mpin == GPIO_LEDLNK_INV) {
+        ledlnk_inverted = 1;
+        mpin -= (GPIO_LEDLNK_INV - GPIO_LEDLNK);
+      }
+      else if ((mpin >= GPIO_PWM1_INV) && (mpin < (GPIO_PWM1_INV + MAX_PWMS))) {
+        bitSet(pwm_inverted, mpin - GPIO_PWM1_INV);
+        mpin -= (GPIO_PWM1_INV - GPIO_PWM1);
+      }
+      else if (XdrvCall(FUNC_PIN_STATE)) {
+        mpin = XdrvMailbox.index;
+      }
+      else if (XsnsCall(FUNC_PIN_STATE)) {
+        mpin = XdrvMailbox.index;
+      };
+    }
+    if (mpin) pin[mpin] = i;
+  }
+
+  if ((2 == pin[GPIO_TXD]) || (H801 == my_module_type)) { Serial.set_tx(2); }
+
+  analogWriteRange(Settings.pwm_range);
+  analogWriteFreq(Settings.pwm_frequency);
+
+#ifdef USE_SPI
+  spi_flg = ((((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CS] > 14)) || (pin[GPIO_SPI_CS] < 12)) || (((pin[GPIO_SPI_DC] < 99) && (pin[GPIO_SPI_DC] > 14)) || (pin[GPIO_SPI_DC] < 12)));
+  if (spi_flg) {
+    for (uint32_t i = 0; i < GPIO_MAX; i++) {
+      if ((pin[i] >= 12) && (pin[i] <=14)) pin[i] = 99;
+    }
+    my_module.io[12] = GPIO_SPI_MISO;
+    pin[GPIO_SPI_MISO] = 12;
+    my_module.io[13] = GPIO_SPI_MOSI;
+    pin[GPIO_SPI_MOSI] = 13;
+    my_module.io[14] = GPIO_SPI_CLK;
+    pin[GPIO_SPI_CLK] = 14;
+  }
+  soft_spi_flg = ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && ((pin[GPIO_SSPI_MOSI] < 99) || (pin[GPIO_SSPI_MOSI] < 99)));
+#endif
+
+#ifdef USE_I2C
+  i2c_flg = ((pin[GPIO_I2C_SCL] < 99) && (pin[GPIO_I2C_SDA] < 99));
+  if (i2c_flg) {
+    Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]);
+  }
+#endif
+
+  devices_present = 0;
+  light_type = LT_BASIC;
+  if (XdrvCall(FUNC_MODULE_INIT)) {
+
+  }
+  else if (YTF_IR_BRIDGE == my_module_type) {
+    ClaimSerial();
+
+  }
+  else if (SONOFF_DUAL == my_module_type) {
+    devices_present = 2;
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+  else if (CH4 == my_module_type) {
+    devices_present = 4;
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+#ifdef USE_SONOFF_SC
+  else if (SONOFF_SC == my_module_type) {
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+#endif
+
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    if (pin[GPIO_PWM1 +i] < 99) {
+      pinMode(pin[GPIO_PWM1 +i], OUTPUT);
+      if (light_type) {
+
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range : 0);
+      } else {
+        pwm_present = true;
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - Settings.pwm_value[i] : Settings.pwm_value[i]);
+      }
+    }
+  }
+
+  for (uint32_t i = 0; i < MAX_RELAYS; i++) {
+    if (pin[GPIO_REL1 +i] < 99) {
+      pinMode(pin[GPIO_REL1 +i], OUTPUT);
+      devices_present++;
+      if (EXS_RELAY == my_module_type) {
+        digitalWrite(pin[GPIO_REL1 +i], bitRead(rel_inverted, i) ? 1 : 0);
+        if (i &1) { devices_present--; }
+      }
+    }
+  }
+
+  for (uint32_t i = 0; i < MAX_LEDS; i++) {
+    if (pin[GPIO_LED1 +i] < 99) {
+#ifdef USE_ARILUX_RF
+      if ((3 == i) && (leds_present < 2) && (99 == pin[GPIO_ARIRFSEL])) {
+        pin[GPIO_ARIRFSEL] = pin[GPIO_LED4];
+        pin[GPIO_LED4] = 99;
+      } else {
+#endif
+        pinMode(pin[GPIO_LED1 +i], OUTPUT);
+        leds_present++;
+        digitalWrite(pin[GPIO_LED1 +i], bitRead(led_inverted, i));
+#ifdef USE_ARILUX_RF
+      }
+#endif
+    }
+  }
+  if (pin[GPIO_LEDLNK] < 99) {
+    pinMode(pin[GPIO_LEDLNK], OUTPUT);
+    digitalWrite(pin[GPIO_LEDLNK], ledlnk_inverted);
+  }
+
+  ButtonInit();
+  SwitchInit();
+#ifdef ROTARY_V1
+  RotaryInit();
+#endif
+
+  SetLedPower(Settings.ledstate &8);
+  SetLedLink(Settings.ledstate &8);
+
+  XdrvCall(FUNC_PRE_INIT);
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_udp.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_udp.ino"
+#ifdef USE_EMULATION
+
+#define UDP_BUFFER_SIZE 200
+#define UDP_MSEARCH_SEND_DELAY 1500
+
+#include <Ticker.h>
+Ticker TickerMSearch;
+
+IPAddress udp_remote_ip;
+uint16_t udp_remote_port;
+
+bool udp_connected = false;
+bool udp_response_mutex = false;
+
+
+
+
+
+const char URN_BELKIN_DEVICE[] PROGMEM = "urn:belkin:device:**";
+const char URN_BELKIN_DEVICE_CAP[] PROGMEM = "urn:Belkin:device:**";
+const char UPNP_ROOTDEVICE[] PROGMEM = "upnp:rootdevice";
+const char SSDPSEARCH_ALL[] PROGMEM = "ssdpsearch:all";
+const char SSDP_ALL[] PROGMEM = "ssdp:all";
+
+
+
+
+
+bool UdpDisconnect(void)
+{
+  if (udp_connected) {
+    PortUdp.flush();
+    WiFiUDP::stopAll();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_MULTICAST_DISABLED));
+    udp_connected = false;
+  }
+  return udp_connected;
+}
+
+bool UdpConnect(void)
+{
+  if (!udp_connected) {
+
+    if (PortUdp.beginMulticast(WiFi.localIP(), IPAddress(239,255,255,250), 1900)) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_REJOINED));
+      udp_response_mutex = false;
+      udp_connected = true;
+    } else {
+      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_JOIN_FAILED));
+      udp_connected = false;
+    }
+  }
+  return udp_connected;
+}
+
+void PollUdp(void)
+{
+  if (udp_connected) {
+    while (PortUdp.parsePacket()) {
+      char packet_buffer[UDP_BUFFER_SIZE];
+
+      int len = PortUdp.read(packet_buffer, UDP_BUFFER_SIZE -1);
+      packet_buffer[len] = 0;
+
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("UDP: Packet (%d)"), len);
+
+
+
+#ifdef USE_SCRIPT_HUE
+      if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+#else
+      if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+#endif
+        udp_response_mutex = true;
+
+        udp_remote_ip = PortUdp.remoteIP();
+        udp_remote_port = PortUdp.remotePort();
+
+
+
+
+        uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);
+
+        LowerCase(packet_buffer, packet_buffer);
+        RemoveSpace(packet_buffer);
+
+#ifdef USE_EMULATION_WEMO
+        if (EMUL_WEMO == Settings.flag2.emulation) {
+          if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {
+            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
+            return;
+          }
+          else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
+                   (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+                   (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
+            return;
+          }
+        }
+#endif
+
+#ifdef USE_EMULATION_HUE
+        if (EMUL_HUE == Settings.flag2.emulation) {
+          if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
+              (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
+              (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+              (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+            TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
+            return;
+          }
+        }
+#endif
+
+        udp_response_mutex = false;
+      }
+
+    }
+    optimistic_yield(100);
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
+# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
+#ifndef WIFI_RSSI_THRESHOLD
+
+#define WIFI_RSSI_THRESHOLD 5
+#endif
+#ifndef WIFI_RESCAN_MINUTES
+
+#define WIFI_RESCAN_MINUTES 5
+#endif
+
+const uint8_t WIFI_CONFIG_SEC = 180;
+
+const uint8_t WIFI_CHECK_SEC = 5;
+const uint8_t WIFI_RETRY_OFFSET_SEC = 20;
+
+#include <ESP8266WiFi.h>
+#if LWIP_IPV6
+#include <AddrList.h>
+#endif
+
+struct WIFI {
+  uint32_t last_event = 0;
+  uint32_t downtime = 0;
+  uint16_t link_count = 0;
+  uint8_t counter;
+  uint8_t retry_init;
+  uint8_t retry;
+  uint8_t status;
+  uint8_t config_type = 0;
+  uint8_t config_counter = 0;
+  uint8_t mdns_begun = 0;
+  uint8_t scan_state;
+  uint8_t bssid[6] = {0};
+  uint8_t bssid_last[6] = {0};
+  int8_t best_network_db;
+} Wifi;
+
+int WifiGetRssiAsQuality(int rssi)
+{
+  int quality = 0;
+
+  if (rssi <= -100) {
+    quality = 0;
+  } else if (rssi >= -50) {
+    quality = 100;
+  } else {
+    quality = 2 * (rssi + 100);
+  }
+  return quality;
+}
+
+bool WifiConfigCounter(void)
+{
+  if (Wifi.config_counter) {
+    Wifi.config_counter = WIFI_CONFIG_SEC;
+  }
+  return (Wifi.config_counter);
+}
+
+void WifiConfig(uint8_t type)
+{
+  if (!Wifi.config_type) {
+    if ((WIFI_RETRY == type) || (WIFI_WAIT == type)) { return; }
+#ifdef USE_EMULATION
+    UdpDisconnect();
+#endif
+    WiFi.disconnect();
+    Wifi.config_type = type;
+
+#ifndef USE_WEBSERVER
+    if (WIFI_MANAGER == Wifi.config_type) {
+      Wifi.config_type = WIFI_SERIAL;
+    }
+#endif
+
+    Wifi.config_counter = WIFI_CONFIG_SEC;
+    Wifi.counter = Wifi.config_counter +5;
+    blinks = 1999;
+    if (WIFI_RESTART == Wifi.config_type) {
+      restart_flag = 2;
+    }
+    else if (WIFI_SERIAL == Wifi.config_type) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_6_SERIAL " " D_ACTIVE_FOR_3_MINUTES));
+    }
+#ifdef USE_WEBSERVER
+    else if (WIFI_MANAGER == Wifi.config_type || WIFI_MANAGER_RESET_ONLY == Wifi.config_type) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_2_WIFIMANAGER " " D_ACTIVE_FOR_3_MINUTES));
+      WifiManagerBegin(WIFI_MANAGER_RESET_ONLY == Wifi.config_type);
+    }
+#endif
+  }
+}
+
+void WifiSetMode(WiFiMode_t wifi_mode)
+{
+  if (WiFi.getMode() == wifi_mode) { return; }
+
+  if (wifi_mode != WIFI_OFF) {
+
+    WiFi.forceSleepWake();
+    delay(100);
+  }
+
+  uint32_t retry = 2;
+  while (!WiFi.mode(wifi_mode) && retry--) {
+    AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR("Retry set Mode..."));
+    delay(100);
+  }
+
+  if (wifi_mode == WIFI_OFF) {
+    delay(1000);
+    WiFi.forceSleepBegin();
+    delay(1);
+  } else {
+    delay(30);
+  }
+}
+
+void WiFiSetSleepMode(void)
+{
+# 156 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
+#if defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+#else
+  if (sleep && Settings.flag3.sleep_normal) {
+    WiFi.setSleepMode(WIFI_LIGHT_SLEEP);
+  } else {
+    WiFi.setSleepMode(WIFI_MODEM_SLEEP);
+  }
+#endif
+  WifiSetOutputPower();
+}
+
+void WifiBegin(uint8_t flag, uint8_t channel)
+{
+  const char kWifiPhyMode[] = " BGN";
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_PATCH_ISSUE_2186));
+
+  WifiSetMode(WIFI_OFF);
+#endif
+
+  WiFi.persistent(false);
+  WiFi.disconnect(true);
+  delay(200);
+
+  WifiSetMode(WIFI_STA);
+  WiFiSetSleepMode();
+
+
+  if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
+
+
+
+
+
+  switch (flag) {
+  case 0:
+  case 1:
+    Settings.sta_active = flag;
+    break;
+  case 2:
+    Settings.sta_active ^= 1;
+  }
+  if (!strlen(SettingsText(SET_STASSID1 + Settings.sta_active))) {
+    Settings.sta_active ^= 1;
+  }
+  if (Settings.ip_address[0]) {
+    WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]);
+  }
+  WiFi.hostname(my_hostname);
+
+  char stemp[40] = { 0 };
+  if (channel) {
+    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
+
+    char hex_char[18];
+    snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
+  } else {
+    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
+    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
+
+#if LWIP_IPV6
+  for (bool configured = false; !configured;) {
+    uint16_t cfgcnt = 0;
+    for (auto addr : addrList) {
+      if ((configured = !addr.isLocal() && addr.isV6()) || cfgcnt==30) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI "Got IPv6 global address %s"), addr.toString().c_str());
+        break;
+      }
+      delay(500);
+      cfgcnt++;
+    }
+  }
+#endif
+}
+
+void WifiBeginAfterScan(void)
+{
+
+  if (0 == Wifi.scan_state) { return; }
+
+  if (1 == Wifi.scan_state) {
+    memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
+    Wifi.best_network_db = -127;
+    Wifi.scan_state = 3;
+  }
+
+  if (2 == Wifi.scan_state) {
+    uint8_t* bssid = WiFi.BSSID();
+    memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
+    Wifi.best_network_db = WiFi.RSSI();
+    if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
+      Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
+    }
+    Wifi.scan_state = 3;
+  }
+
+  if (3 == Wifi.scan_state) {
+    if (WiFi.scanComplete() != WIFI_SCAN_RUNNING) {
+      WiFi.scanNetworks(true);
+      Wifi.scan_state++;
+      AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR("Network (re)scan started..."));
+      return;
+    }
+  }
+  int8_t wifi_scan_result = WiFi.scanComplete();
+
+  if (4 == Wifi.scan_state) {
+    if (wifi_scan_result != WIFI_SCAN_RUNNING) {
+      Wifi.scan_state++;
+    }
+  }
+
+  if (5 == Wifi.scan_state) {
+    uint32_t number_known = 0;
+    int32_t channel_max = 0;
+    int8_t ap_max = 3;
+    uint8_t bssid_max[6];
+    memcpy((void*) &bssid_max, (void*) &Wifi.bssid, sizeof(bssid_max));
+
+    int32_t channel = 0;
+    int8_t ap = 3;
+    uint8_t last_bssid[6];
+    memcpy((void*) &last_bssid, (void*) &Wifi.bssid, sizeof(last_bssid));
+
+    if (wifi_scan_result > 0) {
+
+      for (uint32_t i = 0; i < wifi_scan_result; ++i) {
+
+        String ssid_scan;
+        int32_t rssi_scan;
+        uint8_t sec_scan;
+        uint8_t* bssid_scan;
+        int32_t chan_scan;
+        bool hidden_scan;
+
+        WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, bssid_scan, chan_scan, hidden_scan);
+
+        bool known = false;
+        uint32_t j;
+        for (j = 0; j < MAX_SSIDS; j++) {
+          if (ssid_scan == SettingsText(SET_STASSID1 + j)) {
+            known = true;
+            number_known++;
+            if (rssi_scan > Wifi.best_network_db) {
+              if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {
+
+                memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
+                channel_max = chan_scan;
+                ap_max = j;
+
+                for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
+                  if (bssid_scan[i] != Wifi.bssid_last[i]) {
+                    Wifi.best_network_db = (int8_t)rssi_scan;
+                    channel = chan_scan;
+                    ap = j;
+                    memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
+
+                    memcpy((void*) &Wifi.bssid_last, (void*) bssid_scan, sizeof(Wifi.bssid_last));
+                   break;
+                  }
+                }
+              }
+            }
+            break;
+          }
+        }
+        char hex_char[18];
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Network %d, AP%c, SSId %s, Channel %d, BSSId %s, RSSI %d, Encryption %d"),
+          i,
+          (known) ? (j) ? '2' : '1' : '-',
+          ssid_scan.c_str(),
+          chan_scan,
+          ToHex_P((unsigned char*)bssid_scan, 6, hex_char, sizeof(hex_char), ':'),
+          rssi_scan,
+          (sec_scan == ENC_TYPE_NONE) ? 0 : 1);
+        delay(0);
+      }
+      WiFi.scanDelete();
+      delay(0);
+    }
+
+
+    if (number_known == 1) {
+
+      memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
+      memcpy((void*) &Wifi.bssid, (void*) bssid_max, sizeof(Wifi.bssid));
+      channel = channel_max;
+      ap = ap_max;
+    }
+
+    Wifi.scan_state = 0;
+
+    for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
+      if (last_bssid[i] != Wifi.bssid[i]) {
+        WifiBegin(ap, channel);
+        break;
+      }
+    }
+  }
+}
+
+uint16_t WifiLinkCount(void)
+{
+  return Wifi.link_count;
+}
+
+String WifiDowntime(void)
+{
+  return GetDuration(Wifi.downtime);
+}
+
+void WifiSetState(uint8_t state)
+{
+  if (state == global_state.wifi_down) {
+    if (state) {
+      rules_flag.wifi_connected = 1;
+      Wifi.link_count++;
+      Wifi.downtime += UpTime() - Wifi.last_event;
+    } else {
+      rules_flag.wifi_disconnected = 1;
+      Wifi.last_event = UpTime();
+    }
+  }
+  global_state.wifi_down = state ^1;
+}
+
+#if LWIP_IPV6
+bool WifiCheckIPv6(void)
+{
+  bool ipv6_global=false;
+
+  for (auto a : addrList) {
+    if(!a.isLocal() && a.isV6()) ipv6_global=true;
+  }
+  return ipv6_global;
+}
+
+String WifiGetIPv6(void)
+{
+  for (auto a : addrList) {
+    if(!a.isLocal() && a.isV6()) return a.toString();
+  }
+  return "";
+}
+
+bool WifiCheckIPAddrStatus(void)
+{
+  bool ip_global=false;
+
+  for (auto a : addrList) {
+    if(!a.isLocal()) ip_global=true;
+  }
+  return ip_global;
+}
+#endif
+
+void WifiCheckIp(void)
+{
+#if LWIP_IPV6
+  if(WifiCheckIPAddrStatus()) {
+    Wifi.status = WL_CONNECTED;
+#else
+  if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
+#endif
+
+    memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
+    WifiSetState(1);
+    Wifi.counter = WIFI_CHECK_SEC;
+    Wifi.retry = Wifi.retry_init;
+    if (Wifi.status != WL_CONNECTED) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
+    }
+    Wifi.status = WL_CONNECTED;
+#ifdef USE_DISCOVERY
+#ifdef WEBSERVER_ADVERTISE
+    if (2 == Wifi.mdns_begun) {
+      MDNS.update();
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, D_LOG_MDNS, "MDNS.update");
+    }
+#endif
+#endif
+  } else {
+    WifiSetState(0);
+    uint8_t wifi_config_tool = Settings.sta_config;
+    Wifi.status = WiFi.status();
+    switch (Wifi.status) {
+      case WL_CONNECTED:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
+
+
+        wifi_station_dhcpc_start();
+        break;
+      case WL_NO_SSID_AVAIL:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
+
+        if (WIFI_WAIT == Settings.sta_config) {
+          Wifi.retry = Wifi.retry_init;
+        } else {
+          if (Wifi.retry > (Wifi.retry_init / 2)) {
+            Wifi.retry = Wifi.retry_init / 2;
+          }
+          else if (Wifi.retry) {
+            Wifi.retry = 0;
+          }
+        }
+
+        break;
+      case WL_CONNECT_FAILED:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
+
+        if (Wifi.retry > (Wifi.retry_init / 2)) {
+          Wifi.retry = Wifi.retry_init / 2;
+        }
+        else if (Wifi.retry) {
+          Wifi.retry = 0;
+        }
+
+        break;
+      default:
+
+        if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
+          AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
+        } else {
+          if (!strlen(SettingsText(SET_STASSID1)) && !strlen(SettingsText(SET_STASSID2))) {
+            wifi_config_tool = WIFI_MANAGER;
+            Wifi.retry = 0;
+          } else {
+            AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION));
+          }
+        }
+    }
+
+    if (Wifi.retry) {
+      if (Settings.flag3.use_wifi_scan) {
+
+        if ((Wifi.retry_init == Wifi.retry) || ((Wifi.retry_init / 2) == Wifi.retry)){
+          Wifi.scan_state = 1;
+        }
+      } else {
+        if (Wifi.retry_init == Wifi.retry) {
+          WifiBegin(3, 0);
+        }
+        if ((Settings.sta_config != WIFI_WAIT) && ((Wifi.retry_init / 2) == Wifi.retry)) {
+          WifiBegin(2, 0);
+        }
+      }
+      Wifi.counter = 1;
+      Wifi.retry--;
+    } else {
+      WifiConfig(wifi_config_tool);
+      Wifi.counter = 1;
+      Wifi.retry = Wifi.retry_init;
+    }
+  }
+}
+
+void WifiCheck(uint8_t param)
+{
+  Wifi.counter--;
+  switch (param) {
+  case WIFI_SERIAL:
+  case WIFI_MANAGER:
+    WifiConfig(param);
+    break;
+  default:
+    if (Wifi.config_counter) {
+      Wifi.config_counter--;
+      Wifi.counter = Wifi.config_counter +5;
+      if (Wifi.config_counter) {
+        if (!Wifi.config_counter) {
+          if (strlen(WiFi.SSID().c_str())) {
+            SettingsUpdateText(SET_STASSID1, WiFi.SSID().c_str());
+          }
+          if (strlen(WiFi.psk().c_str())) {
+            SettingsUpdateText(SET_STAPWD1, WiFi.psk().c_str());
+          }
+          Settings.sta_active = 0;
+          AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_WCFG_2_WIFIMANAGER D_CMND_SSID "1 %s"), SettingsText(SET_STASSID1));
+        }
+      }
+      if (!Wifi.config_counter) {
+
+        restart_flag = 2;
+      }
+    } else {
+      if (Wifi.scan_state) { WifiBeginAfterScan(); }
+
+      if (Wifi.counter <= 0) {
+        AddLog_P(LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CHECKING_CONNECTION));
+        Wifi.counter = WIFI_CHECK_SEC;
+        WifiCheckIp();
+      }
+#if LWIP_IPV6
+      if (WifiCheckIPAddrStatus()) {
+#else
+      if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0) && !Wifi.config_type) {
+#endif
+        WifiSetState(1);
+
+        if (Settings.flag3.use_wifi_rescan) {
+          if (!(uptime % (60 * WIFI_RESCAN_MINUTES))) {
+            Wifi.scan_state = 2;
+          }
+        }
+
+#ifdef FIRMWARE_MINIMAL
+        if (1 == RtcSettings.ota_loader) {
+          RtcSettings.ota_loader = 0;
+          ota_state_flag = 3;
+        }
+#endif
+
+#ifdef USE_DISCOVERY
+        if (Settings.flag3.mdns_enabled) {
+          if (!Wifi.mdns_begun) {
+
+
+
+
+
+              Wifi.mdns_begun = (uint8_t)MDNS.begin(my_hostname);
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s"), (Wifi.mdns_begun) ? D_INITIALIZED : D_FAILED);
+
+          }
+        }
+#endif
+
+#ifdef USE_WEBSERVER
+        if (Settings.webserver) {
+          StartWebserver(Settings.webserver, WiFi.localIP());
+#ifdef USE_DISCOVERY
+#ifdef WEBSERVER_ADVERTISE
+          if (1 == Wifi.mdns_begun) {
+            Wifi.mdns_begun = 2;
+            MDNS.addService("http", "tcp", WEB_PORT);
+          }
+#endif
+#endif
+        } else {
+          StopWebserver();
+        }
+#ifdef USE_EMULATION
+        if (Settings.flag2.emulation) { UdpConnect(); }
+#endif
+#endif
+
+#ifdef USE_KNX
+        if (!knx_started && Settings.flag.knx_enabled) {
+          KNXStart();
+          knx_started = true;
+        }
+#endif
+
+      } else {
+        WifiSetState(0);
+#ifdef USE_EMULATION
+        UdpDisconnect();
+#endif
+        Wifi.mdns_begun = 0;
+#ifdef USE_KNX
+        knx_started = false;
+#endif
+      }
+    }
+  }
+}
+
+int WifiState(void)
+{
+  int state = -1;
+
+  if (!global_state.wifi_down) { state = WIFI_RESTART; }
+  if (Wifi.config_type) { state = Wifi.config_type; }
+  return state;
+}
+
+String WifiGetOutputPower(void)
+{
+  char stemp1[TOPSZ];
+  dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
+  return String(stemp1);
+}
+void WifiSetOutputPower(void)
+{
+  WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
+}
+
+void WifiConnect(void)
+{
+  WifiSetState(0);
+  WifiSetOutputPower();
+  WiFi.persistent(false);
+  Wifi.status = 0;
+
+
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);
+  Wifi.retry = Wifi.retry_init;
+  Wifi.counter = 1;
+}
+
+
+
+void WifiDisconnect(void)
+{
+
+  WiFi.persistent(true);
+  ETS_UART_INTR_DISABLE();
+  wifi_station_disconnect();
+  ETS_UART_INTR_ENABLE();
+  WiFi.persistent(false);
+}
+
+void WifiShutdown(void)
+{
+  delay(100);
+  if (Settings.flag.mqtt_enabled) {
+    MqttDisconnect();
+  }
+  WifiDisconnect();
+}
+
+void EspRestart(void)
+{
+  WifiShutdown();
+  CrashDumpClear();
+
+  ESP.reset();
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
+# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
+#ifdef USE_MQTT_TLS_CA_CERT
+
+#ifndef USE_MQTT_AWS_IOT
+# 38 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
+static const unsigned char PROGMEM TA0_DN[] = {
+ 0x30, 0x4A, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+ 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0A,
+ 0x13, 0x0D, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
+ 0x79, 0x70, 0x74, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03,
+ 0x13, 0x1A, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
+ 0x79, 0x70, 0x74, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74,
+ 0x79, 0x20, 0x58, 0x33
+};
+
+static const unsigned char PROGMEM TA0_RSA_N[] = {
+ 0x9C, 0xD3, 0x0C, 0xF0, 0x5A, 0xE5, 0x2E, 0x47, 0xB7, 0x72, 0x5D, 0x37,
+ 0x83, 0xB3, 0x68, 0x63, 0x30, 0xEA, 0xD7, 0x35, 0x26, 0x19, 0x25, 0xE1,
+ 0xBD, 0xBE, 0x35, 0xF1, 0x70, 0x92, 0x2F, 0xB7, 0xB8, 0x4B, 0x41, 0x05,
+ 0xAB, 0xA9, 0x9E, 0x35, 0x08, 0x58, 0xEC, 0xB1, 0x2A, 0xC4, 0x68, 0x87,
+ 0x0B, 0xA3, 0xE3, 0x75, 0xE4, 0xE6, 0xF3, 0xA7, 0x62, 0x71, 0xBA, 0x79,
+ 0x81, 0x60, 0x1F, 0xD7, 0x91, 0x9A, 0x9F, 0xF3, 0xD0, 0x78, 0x67, 0x71,
+ 0xC8, 0x69, 0x0E, 0x95, 0x91, 0xCF, 0xFE, 0xE6, 0x99, 0xE9, 0x60, 0x3C,
+ 0x48, 0xCC, 0x7E, 0xCA, 0x4D, 0x77, 0x12, 0x24, 0x9D, 0x47, 0x1B, 0x5A,
+ 0xEB, 0xB9, 0xEC, 0x1E, 0x37, 0x00, 0x1C, 0x9C, 0xAC, 0x7B, 0xA7, 0x05,
+ 0xEA, 0xCE, 0x4A, 0xEB, 0xBD, 0x41, 0xE5, 0x36, 0x98, 0xB9, 0xCB, 0xFD,
+ 0x6D, 0x3C, 0x96, 0x68, 0xDF, 0x23, 0x2A, 0x42, 0x90, 0x0C, 0x86, 0x74,
+ 0x67, 0xC8, 0x7F, 0xA5, 0x9A, 0xB8, 0x52, 0x61, 0x14, 0x13, 0x3F, 0x65,
+ 0xE9, 0x82, 0x87, 0xCB, 0xDB, 0xFA, 0x0E, 0x56, 0xF6, 0x86, 0x89, 0xF3,
+ 0x85, 0x3F, 0x97, 0x86, 0xAF, 0xB0, 0xDC, 0x1A, 0xEF, 0x6B, 0x0D, 0x95,
+ 0x16, 0x7D, 0xC4, 0x2B, 0xA0, 0x65, 0xB2, 0x99, 0x04, 0x36, 0x75, 0x80,
+ 0x6B, 0xAC, 0x4A, 0xF3, 0x1B, 0x90, 0x49, 0x78, 0x2F, 0xA2, 0x96, 0x4F,
+ 0x2A, 0x20, 0x25, 0x29, 0x04, 0xC6, 0x74, 0xC0, 0xD0, 0x31, 0xCD, 0x8F,
+ 0x31, 0x38, 0x95, 0x16, 0xBA, 0xA8, 0x33, 0xB8, 0x43, 0xF1, 0xB1, 0x1F,
+ 0xC3, 0x30, 0x7F, 0xA2, 0x79, 0x31, 0x13, 0x3D, 0x2D, 0x36, 0xF8, 0xE3,
+ 0xFC, 0xF2, 0x33, 0x6A, 0xB9, 0x39, 0x31, 0xC5, 0xAF, 0xC4, 0x8D, 0x0D,
+ 0x1D, 0x64, 0x16, 0x33, 0xAA, 0xFA, 0x84, 0x29, 0xB6, 0xD4, 0x0B, 0xC0,
+ 0xD8, 0x7D, 0xC3, 0x93
+};
+
+static const unsigned char TA0_RSA_E[] = {
+ 0x01, 0x00, 0x01
+};
+
+static const br_x509_trust_anchor PROGMEM LetsEncryptX3CrossSigned_TA = {
+ { (unsigned char *)TA0_DN, sizeof TA0_DN },
+ BR_X509_TA_CA,
+ {
+  BR_KEYTYPE_RSA,
+  { .rsa = {
+   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
+   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
+  } }
+ }
+};
+
+#define TAs_NUM 1
+
+#endif
+
+#ifdef USE_MQTT_AWS_IOT
+# 106 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
+const unsigned char PROGMEM TA0_DN[] = {
+ 0x30, 0x39, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+ 0x02, 0x55, 0x53, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x0A,
+ 0x13, 0x06, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17,
+ 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
+ 0x6E, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x41, 0x20, 0x31
+};
+
+const unsigned char PROGMEM TA0_RSA_N[] = {
+ 0xB2, 0x78, 0x80, 0x71, 0xCA, 0x78, 0xD5, 0xE3, 0x71, 0xAF, 0x47, 0x80,
+ 0x50, 0x74, 0x7D, 0x6E, 0xD8, 0xD7, 0x88, 0x76, 0xF4, 0x99, 0x68, 0xF7,
+ 0x58, 0x21, 0x60, 0xF9, 0x74, 0x84, 0x01, 0x2F, 0xAC, 0x02, 0x2D, 0x86,
+ 0xD3, 0xA0, 0x43, 0x7A, 0x4E, 0xB2, 0xA4, 0xD0, 0x36, 0xBA, 0x01, 0xBE,
+ 0x8D, 0xDB, 0x48, 0xC8, 0x07, 0x17, 0x36, 0x4C, 0xF4, 0xEE, 0x88, 0x23,
+ 0xC7, 0x3E, 0xEB, 0x37, 0xF5, 0xB5, 0x19, 0xF8, 0x49, 0x68, 0xB0, 0xDE,
+ 0xD7, 0xB9, 0x76, 0x38, 0x1D, 0x61, 0x9E, 0xA4, 0xFE, 0x82, 0x36, 0xA5,
+ 0xE5, 0x4A, 0x56, 0xE4, 0x45, 0xE1, 0xF9, 0xFD, 0xB4, 0x16, 0xFA, 0x74,
+ 0xDA, 0x9C, 0x9B, 0x35, 0x39, 0x2F, 0xFA, 0xB0, 0x20, 0x50, 0x06, 0x6C,
+ 0x7A, 0xD0, 0x80, 0xB2, 0xA6, 0xF9, 0xAF, 0xEC, 0x47, 0x19, 0x8F, 0x50,
+ 0x38, 0x07, 0xDC, 0xA2, 0x87, 0x39, 0x58, 0xF8, 0xBA, 0xD5, 0xA9, 0xF9,
+ 0x48, 0x67, 0x30, 0x96, 0xEE, 0x94, 0x78, 0x5E, 0x6F, 0x89, 0xA3, 0x51,
+ 0xC0, 0x30, 0x86, 0x66, 0xA1, 0x45, 0x66, 0xBA, 0x54, 0xEB, 0xA3, 0xC3,
+ 0x91, 0xF9, 0x48, 0xDC, 0xFF, 0xD1, 0xE8, 0x30, 0x2D, 0x7D, 0x2D, 0x74,
+ 0x70, 0x35, 0xD7, 0x88, 0x24, 0xF7, 0x9E, 0xC4, 0x59, 0x6E, 0xBB, 0x73,
+ 0x87, 0x17, 0xF2, 0x32, 0x46, 0x28, 0xB8, 0x43, 0xFA, 0xB7, 0x1D, 0xAA,
+ 0xCA, 0xB4, 0xF2, 0x9F, 0x24, 0x0E, 0x2D, 0x4B, 0xF7, 0x71, 0x5C, 0x5E,
+ 0x69, 0xFF, 0xEA, 0x95, 0x02, 0xCB, 0x38, 0x8A, 0xAE, 0x50, 0x38, 0x6F,
+ 0xDB, 0xFB, 0x2D, 0x62, 0x1B, 0xC5, 0xC7, 0x1E, 0x54, 0xE1, 0x77, 0xE0,
+ 0x67, 0xC8, 0x0F, 0x9C, 0x87, 0x23, 0xD6, 0x3F, 0x40, 0x20, 0x7F, 0x20,
+ 0x80, 0xC4, 0x80, 0x4C, 0x3E, 0x3B, 0x24, 0x26, 0x8E, 0x04, 0xAE, 0x6C,
+ 0x9A, 0xC8, 0xAA, 0x0D
+};
+
+static const unsigned char PROGMEM TA0_RSA_E[] = {
+ 0x01, 0x00, 0x01
+};
+
+const br_x509_trust_anchor PROGMEM AmazonRootCA1_TA = {
+ { (unsigned char *)TA0_DN, sizeof TA0_DN },
+ BR_X509_TA_CA,
+ {
+  BR_KEYTYPE_RSA,
+  { .rsa = {
+   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
+   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
+  } }
+ }
+};
+
+#define TAs_NUM 1
+
+#endif
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
+#ifdef USE_WEBSERVER
+
+
+
+
+
+
+
+#define XDRV_01 1
+
+#ifndef WIFI_SOFT_AP_CHANNEL
+#define WIFI_SOFT_AP_CHANNEL 1
+#endif
+
+const uint16_t CHUNKED_BUFFER_SIZE = 400;
+
+const uint16_t HTTP_REFRESH_TIME = 2345;
+#define HTTP_RESTART_RECONNECT_TIME 9000
+#define HTTP_OTA_RESTART_RECONNECT_TIME 20000
+
+#include <ESP8266WebServer.h>
+#include <DNSServer.h>
+
+#ifdef USE_RF_FLASH
+uint8_t *efm8bb1_update = nullptr;
+#endif
+
+enum UploadTypes { UPL_TASMOTA, UPL_SETTINGS, UPL_EFM8BB1, UPL_TASMOTASLAVE };
+
+static const char * HEADER_KEYS[] = { "User-Agent", };
+
+const char HTTP_HEADER[] PROGMEM =
+  "<!DOCTYPE html><html lang=\"" D_HTML_LANGUAGE "\" class=\"\">"
+  "<head>"
+  "<meta charset='utf-8'>"
+  "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1,user-scalable=no\"/>"
+  "<title>%s - %s</title>"
+
+  "<script>"
+  "var x=null,lt,to,tp,pc='';"
+
+#ifdef USE_JAVASCRIPT_ES6
+
+  "eb=s=>document.getElementById(s);"
+  "qs=s=>document.querySelector(s);"
+  "sp=i=>eb(i).type=(eb(i).type==='text'?'password':'text');"
+  "wl=f=>window.addEventListener('load',f);"
+  ;
+#else
+  "function eb(s){"
+    "return document.getElementById(s);"
+  "}"
+  "function qs(s){"
+    "return document.querySelector(s);"
+  "}"
+  "function sp(i){"
+    "eb(i).type=(eb(i).type==='text'?'password':'text');"
+  "}"
+  "function wl(f){"
+    "window.addEventListener('load',f);"
+  "}";
+#endif
+
+const char HTTP_SCRIPT_COUNTER[] PROGMEM =
+  "var cn=180;"
+  "function u(){"
+    "if(cn>=0){"
+      "eb('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';"
+      "cn--;"
+      "setTimeout(u,1000);"
+    "}"
+  "}"
+  "wl(u);";
+
+const char HTTP_SCRIPT_ROOT[] PROGMEM =
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  "var rfsh=1;"
+  "function la(p){"
+    "var a='';"
+    "if(la.arguments.length==1){"
+      "a=p;"
+      "clearTimeout(lt);"
+    "}"
+    "if(x!=null){x.abort();}"
+    "x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(x.readyState==4&&x.status==200){"
+        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
+        "eb('l1').innerHTML=s;"
+      "}"
+    "};"
+    "if (rfsh) {"
+      "x.open('GET','.?m=1'+a,true);"
+      "x.send();"
+      "lt=setTimeout(la,%d);"
+    "}"
+  "}"
+  "function seva(par,ivar){"
+    "la('&sv='+ivar+'_'+par);"
+  "}"
+  "function siva(par,ivar){"
+    "rfsh=1;"
+    "la('&sv='+ivar+'_'+par);"
+    "rfsh=0;"
+  "}"
+  "function pr(f){"
+    "if (f) {"
+      "lt=setTimeout(la,%d);"
+      "rfsh=1;"
+    "} else {"
+      "clearTimeout(lt);"
+      "rfsh=0;"
+    "}"
+  "}";
+#else
+  "function la(p){"
+    "var a='';"
+    "if(la.arguments.length==1){"
+      "a=p;"
+      "clearTimeout(lt);"
+    "}"
+    "if(x!=null){x.abort();}"
+    "x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(x.readyState==4&&x.status==200){"
+        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
+        "eb('l1').innerHTML=s;"
+      "}"
+    "};"
+    "x.open('GET','.?m=1'+a,true);"
+    "x.send();"
+    "lt=setTimeout(la,%d);"
+  "}";
+#endif
+
+const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM =
+  "function lc(v,i,p){"
+    "if(eb('s')){"
+      "if(v=='h'||v=='d'){"
+        "var sl=eb('sl4').value;"
+        "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';"
+      "}"
+    "}"
+    "la('&'+v+i+'='+p);"
+  "}"
+  "wl(la);";
+
+const char HTTP_SCRIPT_WIFI[] PROGMEM =
+  "function c(l){"
+    "eb('s1').value=l.innerText||l.textContent;"
+    "eb('p1').focus();"
+  "}";
+
+const char HTTP_SCRIPT_RELOAD[] PROGMEM =
+  "setTimeout(function(){location.href='.';}," STR(HTTP_RESTART_RECONNECT_TIME) ");";
+
+
+const char HTTP_SCRIPT_RELOAD_OTA[] PROGMEM =
+  "setTimeout(function(){location.href='.';}," STR(HTTP_OTA_RESTART_RECONNECT_TIME) ");";
+
+const char HTTP_SCRIPT_CONSOL[] PROGMEM =
+  "var sn=0,id=0;"
+  "function l(p){"
+    "var c,o='',t;"
+    "clearTimeout(lt);"
+    "t=eb('t1');"
+    "if(p==1){"
+      "c=eb('c1');"
+      "o='&c1='+encodeURIComponent(c.value);"
+      "c.value='';"
+      "t.scrollTop=99999;"
+      "sn=t.scrollTop;"
+    "}"
+    "if(t.scrollTop>=sn){"
+      "if(x!=null){x.abort();}"
+      "x=new XMLHttpRequest();"
+      "x.onreadystatechange=function(){"
+        "if(x.readyState==4&&x.status==200){"
+          "var z,d;"
+          "d=x.responseText.split(/}1/);"
+          "id=d.shift();"
+          "if(d.shift()==0){t.value='';}"
+          "z=d.shift();"
+          "if(z.length>0){t.value+=z;}"
+          "t.scrollTop=99999;"
+          "sn=t.scrollTop;"
+        "}"
+      "};"
+      "x.open('GET','cs?c2='+id+o,true);"
+      "x.send();"
+    "}"
+    "lt=setTimeout(l,%d);"
+    "return false;"
+  "}"
+  "wl(l);";
+
+const char HTTP_MODULE_TEMPLATE_REPLACE[] PROGMEM =
+  "}2%d'>%s (%d}3";
+
+const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
+  "var os;"
+  "function sk(s,g){"
+    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
+    "eb('g'+g).innerHTML=o;"
+    "eb('g'+g).value=s;"
+  "}"
+  "function ld(u,f){"
+    "var x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(this.readyState==4&&this.status==200){"
+        "f(this);"
+      "}"
+    "};"
+    "x.open('GET',u,true);"
+    "x.send();"
+  "}";
+
+const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
+  "var c;"
+  "function x1(b){"
+    "var i,j,g,k,o;"
+    "o=b.responseText.split(/}1/);"
+    "k=o.shift();"
+    "if(eb('s1').value==''){"
+      "eb('s1').value=k;"
+    "}"
+    "os=o.shift();"
+    "as=o.shift();"
+    "g=o.shift().split(',');"
+    "j=0;"
+    "for(i=0;i<13;i++){"
+      "if(6==i){j=9;}"
+      "if(8==i){j=12;}"
+      "sk(g[i],j);"
+      "j++;"
+    "}"
+    "g=o.shift();"
+    "os=as;"
+    "sk(g&15,17);"
+    "g>>=4;"
+    "for(i=0;i<" STR(GPIO_FLAG_USED) ";i++){"
+      "p=(g>>i)&1;"
+      "eb('c'+i).checked=p;"
+    "}"
+    "if(" STR(USER_MODULE) "==c){"
+      "g=o.shift();"
+      "eb('g99').value=g;"
+    "}"
+  "}"
+  "function st(t){"
+    "c=t;"
+    "var a='tp?t='+t;"
+    "ld(a,x1);"
+  "}"
+
+  "function x2(a){"
+    "os=a.responseText;"
+    "sk(17,99);"
+    "st(" STR(USER_MODULE) ");"
+  "}"
+
+#ifdef USE_JAVASCRIPT_ES6
+  "sl=()=>ld('tp?m=1',x2);"
+#else
+  "function sl(){"
+    "ld('tp?m=1',x2);"
+  "}"
+#endif
+
+  "wl(sl);";
+
+const char HTTP_SCRIPT_MODULE1[] PROGMEM =
+  "function x1(a){"
+    "os=a.responseText;"
+    "sk(%d,99);"
+  "}"
+  "function x2(b){"
+    "os=b.responseText;";
+const char HTTP_SCRIPT_MODULE2[] PROGMEM =
+  "}"
+  "function x3(a){"
+    "os=a.responseText;"
+    "sk(%d,17);"
+  "}"
+  "function sl(){"
+    "ld('md?m=1',x1);"
+    "ld('md?g=1',x2);"
+    "if(eb('g17')){"
+      "ld('md?a=1',x3);"
+    "}"
+  "}"
+  "wl(sl);";
+
+const char HTTP_SCRIPT_INFO_BEGIN[] PROGMEM =
+  "function i(){"
+    "var s,o=\"";
+const char HTTP_SCRIPT_INFO_END[] PROGMEM =
+    "\";"
+    "s=o.replace(/}1/g,\"</td></tr><tr><th>\").replace(/}2/g,\"</th><td>\");"
+    "eb('i').innerHTML=s;"
+  "}"
+  "wl(i);";
+
+const char HTTP_HEAD_LAST_SCRIPT[] PROGMEM =
+  "function jd(){"
+    "var t=0,i=document.querySelectorAll('input,button,textarea,select');"
+    "while(i.length>=t){"
+      "if(i[t]){"
+        "i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];"
+      "}"
+      "t++;"
+    "}"
+  "}"
+  "wl(jd);"
+  "</script>";
+
+const char HTTP_HEAD_STYLE1[] PROGMEM =
+  "<style>"
+  "div,fieldset,input,select{padding:5px;font-size:1em;}"
+  "fieldset{background:#%06x;}"
+  "p{margin:0.5em 0;}"
+  "input{width:100%%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#%06x;color:#%06x;}"
+  "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
+  "input[type=range]{width:99%%;}"
+  "select{width:100%%;background:#%06x;color:#%06x;}"
+  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"
+  "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"
+  "td{padding:0px;}";
+const char HTTP_HEAD_STYLE2[] PROGMEM =
+  "button{border:0;border-radius:0.3rem;background:#%06x;color:#%06x;line-height:2.4rem;font-size:1.2rem;width:100%%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}"
+  "button:hover{background:#%06x;}"
+  ".bred{background:#%06x;}"
+  ".bred:hover{background:#%06x;}"
+  ".bgrn{background:#%06x;}"
+  ".bgrn:hover{background:#%06x;}"
+  "a{color:#%06x;text-decoration:none;}"
+  ".p{float:left;text-align:left;}"
+  ".q{float:right;text-align:right;}"
+  ".r{border-radius:0.3em;padding:2px;margin:6px 2px;}";
+const char HTTP_HEAD_STYLE3[] PROGMEM =
+  "</style>"
+
+  "</head>"
+  "<body>"
+  "<div style='text-align:left;display:inline-block;color:#%06x;min-width:340px;'>"
+#ifdef FIRMWARE_MINIMAL
+  "<div style='text-align:center;color:#%06x;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
+#endif
+  "<div style='text-align:center;color:#%06x;'><noscript>" D_NOSCRIPT "<br></noscript>"
+#ifdef LANGUAGE_MODULE_NAME
+  "<h3>" D_MODULE " %s</h3>"
+#else
+  "<h3>%s " D_MODULE "</h3>"
+#endif
+  "<h2>%s</h2>";
+
+const char HTTP_MSG_SLIDER_GRADIENT[] PROGMEM =
+  "<div id='%s' class='r' style='background-image:linear-gradient(to right,%s,%s);'>"
+  "<input id='sl%d' type='range' min='%d' max='%d' value='%d' onchange='lc(\"%c\",%d,value)'>"
+  "</div>";
+const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
+  "<div><span class='p'>" D_CLOSE "</span><span class='q'>" D_OPEN "</span></div>"
+  "<div><input type='range' min='0' max='100' value='%d' onchange='lc(\"u\",%d,value)'></div>";
+
+const char HTTP_MSG_RSTRT[] PROGMEM =
+  "<br><div style='text-align:center;'>" D_DEVICE_WILL_RESTART "</div><br>";
+
+const char HTTP_FORM_LOGIN[] PROGMEM =
+  "<fieldset>"
+  "<form method='post' action='/'>"
+  "<p><b>" D_USER "</b><br><input name='USER1' placeholder='" D_USER "'></p>"
+  "<p><b>" D_PASSWORD "</b><br><input name='PASS1' type='password' placeholder='" D_PASSWORD "'></p>"
+  "<br>"
+  "<button>" D_OK "</button>"
+  "</form></fieldset>";
+
+const char HTTP_FORM_TEMPLATE[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='tp'>";
+const char HTTP_FORM_TEMPLATE_FLAG[] PROGMEM =
+  "<p></p>"
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_FLAGS "&nbsp;</b></legend><p>"
+
+  "</p></fieldset>";
+
+const char HTTP_FORM_MODULE[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='md'>"
+  "<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99'></select><br>"
+  "<br><table>";
+
+const char HTTP_FORM_WIFI[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_WIFI_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='wi'>"
+  "<p><b>" D_AP1_SSID "</b> (" STA_SSID1 ")<br><input id='s1' placeholder='" STA_SSID1 "' value='%s'></p>"
+  "<p><b>" D_AP1_PASSWORD "</b><input type='checkbox' onclick='sp(\"p1\")'><br><input id='p1' type='password' placeholder='" D_AP1_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_AP2_SSID "</b> (" STA_SSID2 ")<br><input id='s2' placeholder='" STA_SSID2 "' value='%s'></p>"
+  "<p><b>" D_AP2_PASSWORD "</b><input type='checkbox' onclick='sp(\"p2\")'><br><input id='p2' type='password' placeholder='" D_AP2_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_HOSTNAME "</b> (%s)<br><input id='h' placeholder='%s' value='%s'></p>"
+  "<p><b>" D_CORS_DOMAIN "</b><input id='c' placeholder='" CORS_DOMAIN "' value='%s'></p>";
+
+const char HTTP_FORM_LOG1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_LOGGING_PARAMETERS "&nbsp;</b>"
+  "</legend><form method='get' action='lg'>";
+const char HTTP_FORM_LOG2[] PROGMEM =
+  "<p><b>" D_SYSLOG_HOST "</b> (" SYS_LOG_HOST ")<br><input id='lh' placeholder='" SYS_LOG_HOST "' value='%s'></p>"
+  "<p><b>" D_SYSLOG_PORT "</b> (" STR(SYS_LOG_PORT) ")<br><input id='lp' placeholder='" STR(SYS_LOG_PORT) "' value='%d'></p>"
+  "<p><b>" D_TELEMETRY_PERIOD "</b> (" STR(TELE_PERIOD) ")<br><input id='lt' placeholder='" STR(TELE_PERIOD) "' value='%d'></p>";
+
+const char HTTP_FORM_OTHER[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_OTHER_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='co'>"
+  "<p></p>"
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE "&nbsp;</b></legend>"
+  "<p><input id='t1' placeholder='" D_TEMPLATE "' value='%s'></p>"
+  "<p><input id='t2' type='checkbox'%s><b>" D_ACTIVATE "</b></p>"
+  "</fieldset>"
+  "<br>"
+  "<b>" D_WEB_ADMIN_PASSWORD "</b><input type='checkbox' onclick='sp(\"wp\")'><br><input id='wp' type='password' placeholder='" D_WEB_ADMIN_PASSWORD "' value='" D_ASTERISK_PWD "'><br>"
+  "<br>"
+  "<input id='b1' type='checkbox'%s><b>" D_MQTT_ENABLE "</b><br>"
+  "<br>";
+
+const char HTTP_FORM_END[] PROGMEM =
+  "<br>"
+  "<button name='save' type='submit' class='button bgrn'>" D_SAVE "</button>"
+  "</form></fieldset>";
+
+const char HTTP_FORM_RST[] PROGMEM =
+  "<div id='f1' style='display:block;'>"
+  "<fieldset><legend><b>&nbsp;" D_RESTORE_CONFIGURATION "&nbsp;</b></legend>";
+const char HTTP_FORM_UPG[] PROGMEM =
+  "<div id='f1' style='display:block;'>"
+  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_WEBSERVER "&nbsp;</b></legend>"
+  "<form method='get' action='u1'>"
+  "<br><b>" D_OTA_URL "</b><br><input id='o' placeholder='OTA_URL' value='%s'><br>"
+  "<br><button type='submit'>" D_START_UPGRADE "</button></form>"
+  "</fieldset><br><br>"
+  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_FILE_UPLOAD "&nbsp;</b></legend>";
+const char HTTP_FORM_RST_UPG[] PROGMEM =
+  "<form method='post' action='u2' enctype='multipart/form-data'>"
+  "<br><input type='file' name='u2'><br>"
+  "<br><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>"
+  "</fieldset>"
+  "</div>"
+  "<div id='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
+
+const char HTTP_FORM_CMND[] PROGMEM =
+  "<br><textarea readonly id='t1' cols='340' wrap='off'></textarea><br><br>"
+  "<form method='get' onsubmit='return l(1);'>"
+  "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
+
+  "</form>";
+
+const char HTTP_TABLE100[] PROGMEM =
+  "<table style='width:100%%'>";
+
+const char HTTP_COUNTER[] PROGMEM =
+  "<br><div id='t' style='text-align:center;'></div>";
+
+const char HTTP_END[] PROGMEM =
+  "<div style='text-align:right;font-size:11px;'><hr/><a href='https://bit.ly/tasmota' target='_blank' style='color:#aaa;'>Tasmota %s " D_BY " Theo Arends</a></div>"
+  "</div>"
+  "</body>"
+  "</html>";
+
+const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button onclick='la(\"&o=%d\");'>%s%s</button></td>";
+const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";
+
+enum ButtonTitle {
+  BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
+  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_CONSOLE,
+  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE };
+const char kButtonTitle[] PROGMEM =
+  D_RESTART "|" D_RESET_CONFIGURATION "|"
+  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_CONSOLE "|"
+  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION;
+const char kButtonAction[] PROGMEM =
+  ".|rt|"
+  ".|cn|in|up|cs|"
+  "md|wi|lg|co|tp|dl|rs";
+const char kButtonConfirm[] PROGMEM = D_CONFIRM_RESTART "|" D_CONFIRM_RESET_CONFIGURATION;
+
+enum CTypes { CT_HTML, CT_PLAIN, CT_XML, CT_JSON, CT_STREAM };
+const char kContentTypes[] PROGMEM = "text/html|text/plain|text/xml|application/json|application/octet-stream";
+
+const char kLoggingOptions[] PROGMEM = D_SERIAL_LOG_LEVEL "|" D_WEB_LOG_LEVEL "|" D_MQTT_LOG_LEVEL "|" D_SYS_LOG_LEVEL;
+const char kLoggingLevels[] PROGMEM = D_NONE "|" D_ERROR "|" D_INFO "|" D_DEBUG "|" D_MORE_DEBUG;
+
+const char kEmulationOptions[] PROGMEM = D_NONE "|" D_BELKIN_WEMO "|" D_HUE_BRIDGE;
+
+const char kUploadErrors[] PROGMEM =
+  D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9
+#ifdef USE_RF_FLASH
+  "|" D_UPLOAD_ERR_10 "|" D_UPLOAD_ERR_11 "|" D_UPLOAD_ERR_12 "|" D_UPLOAD_ERR_13
+#endif
+  "|" D_UPLOAD_ERR_14
+  ;
+
+const uint16_t DNS_PORT = 53;
+enum HttpOptions {HTTP_OFF, HTTP_USER, HTTP_ADMIN, HTTP_MANAGER, HTTP_MANAGER_RESET_ONLY};
+
+DNSServer *DnsServer;
+ESP8266WebServer *WebServer;
+
+struct WEB {
+  String chunk_buffer = "";
+  bool reset_web_log_flag = false;
+  uint8_t state = HTTP_OFF;
+  uint8_t upload_error = 0;
+  uint8_t upload_file_type;
+  uint8_t upload_progress_dot_count;
+  uint8_t config_block_count = 0;
+  uint8_t config_xor_on = 0;
+  uint8_t config_xor_on_set = CONFIG_FILE_XOR;
+} Web;
+
+
+static void WebGetArg(const char* arg, char* out, size_t max)
+{
+  String s = WebServer->arg(arg);
+  strlcpy(out, s.c_str(), max);
+
+}
+
+static bool WifiIsInManagerMode(){
+  return (HTTP_MANAGER == Web.state || HTTP_MANAGER_RESET_ONLY == Web.state);
+}
+
+void ShowWebSource(uint32_t source)
+{
+  if ((source > 0) && (source < SRC_MAX)) {
+    char stemp1[20];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s from %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource), WebServer->client().remoteIP().toString().c_str());
+  }
+}
+
+void ExecuteWebCommand(char* svalue, uint32_t source)
+{
+  ShowWebSource(source);
+  last_source = source;
+  ExecuteCommand(svalue, SRC_IGNORE);
+}
+
+void StartWebserver(int type, IPAddress ipweb)
+{
+  if (!Settings.web_refresh) { Settings.web_refresh = HTTP_REFRESH_TIME; }
+  if (!Web.state) {
+    if (!WebServer) {
+      WebServer = new ESP8266WebServer((HTTP_MANAGER == type || HTTP_MANAGER_RESET_ONLY == type) ? 80 : WEB_PORT);
+      WebServer->on("/", HandleRoot);
+      WebServer->onNotFound(HandleNotFound);
+      WebServer->on("/up", HandleUpgradeFirmware);
+      WebServer->on("/u1", HandleUpgradeFirmwareStart);
+      WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop);
+      WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
+      WebServer->on("/cs", HTTP_GET, HandleConsole);
+      WebServer->on("/cs", HTTP_OPTIONS, HandlePreflightRequest);
+      WebServer->on("/cm", HandleHttpCommand);
+#ifndef FIRMWARE_MINIMAL
+      WebServer->on("/cn", HandleConfiguration);
+      WebServer->on("/md", HandleModuleConfiguration);
+      WebServer->on("/wi", HandleWifiConfiguration);
+      WebServer->on("/lg", HandleLoggingConfiguration);
+      WebServer->on("/tp", HandleTemplateConfiguration);
+      WebServer->on("/co", HandleOtherConfiguration);
+      WebServer->on("/dl", HandleBackupConfiguration);
+      WebServer->on("/rs", HandleRestoreConfiguration);
+      WebServer->on("/rt", HandleResetConfiguration);
+      WebServer->on("/in", HandleInformation);
+      XdrvCall(FUNC_WEB_ADD_HANDLER);
+      XsnsCall(FUNC_WEB_ADD_HANDLER);
+#endif
+    }
+    Web.reset_web_log_flag = false;
+
+
+
+    WebServer->collectHeaders(HEADER_KEYS, sizeof(HEADER_KEYS)/sizeof(char*));
+
+    WebServer->begin();
+  }
+  if (Web.state != type) {
+#if LWIP_IPV6
+    String ipv6_addr = WifiGetIPv6();
+    if(ipv6_addr!="") AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s and IPv6 global address %s "), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str(),ipv6_addr.c_str());
+    else AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
+#else
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
+#endif
+    rules_flag.http_init = 1;
+  }
+  if (type) { Web.state = type; }
+}
+
+void StopWebserver(void)
+{
+  if (Web.state) {
+    WebServer->close();
+    Web.state = HTTP_OFF;
+    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_STOPPED));
+  }
+}
+
+void WifiManagerBegin(bool reset_only)
+{
+
+  if (!global_state.wifi_down) {
+
+    WifiSetMode(WIFI_AP_STA);
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION));
+  } else {
+
+    WifiSetMode(WIFI_AP);
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT));
+  }
+
+  StopWebserver();
+
+  DnsServer = new DNSServer();
+
+  int channel = WIFI_SOFT_AP_CHANNEL;
+  if ((channel < 1) || (channel > 13)) { channel = 1; }
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0);
+#else
+
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0, 1);
+#endif
+
+  delay(500);
+
+  DnsServer->setErrorReplyCode(DNSReplyCode::NoError);
+  DnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
+
+  StartWebserver((reset_only ? HTTP_MANAGER_RESET_ONLY : HTTP_MANAGER), WiFi.softAPIP());
+}
+
+void PollDnsWebserver(void)
+{
+  if (DnsServer) { DnsServer->processNextRequest(); }
+  if (WebServer) { WebServer->handleClient(); }
+}
+
+
+
+bool WebAuthenticate(void)
+{
+  if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) {
+    return WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD));
+  } else {
+    return true;
+  }
+}
+
+bool HttpCheckPriviledgedAccess(bool autorequestauth = true)
+{
+  if (HTTP_USER == Web.state) {
+    HandleRoot();
+    return false;
+  }
+  if (autorequestauth && !WebAuthenticate()) {
+    WebServer->requestAuthentication();
+    return false;
+  }
+  return true;
+}
+
+void HttpHeaderCors(void)
+{
+  if (strlen(SettingsText(SET_CORS))) {
+    WebServer->sendHeader(F("Access-Control-Allow-Origin"), SettingsText(SET_CORS));
+  }
+}
+
+void WSHeaderSend(void)
+{
+  WebServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
+  WebServer->sendHeader(F("Pragma"), F("no-cache"));
+  WebServer->sendHeader(F("Expires"), F("-1"));
+  HttpHeaderCors();
+}
+
+
+
+
+
+void WSSend(int code, int ctype, const String& content)
+{
+  char ct[25];
+  WebServer->send(code, GetTextIndexed(ct, sizeof(ct), ctype, kContentTypes), content);
+}
+
+
+
+
+
+void WSContentBegin(int code, int ctype)
+{
+  WebServer->client().flush();
+  WSHeaderSend();
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  WebServer->sendHeader(F("Accept-Ranges"),F("none"));
+  WebServer->sendHeader(F("Transfer-Encoding"),F("chunked"));
+#endif
+  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+  WSSend(code, ctype, "");
+  Web.chunk_buffer = "";
+}
+
+void _WSContentSend(const String& content)
+{
+  size_t len = content.length();
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  const char * footer = "\r\n";
+  char chunk_size[11];
+  sprintf(chunk_size, "%x\r\n", len);
+  WebServer->sendContent(String() + chunk_size + content + footer);
+#else
+  WebServer->sendContent(content);
+#endif
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("WSContentSend"));
+#endif
+  DEBUG_CORE_LOG(PSTR("WEB: Chunk size %d"), len);
+}
+
+void WSContentFlush(void)
+{
+  if (Web.chunk_buffer.length() > 0) {
+    _WSContentSend(Web.chunk_buffer);
+    Web.chunk_buffer = "";
+  }
+}
+
+void _WSContentSendBuffer(void)
+{
+  int len = strlen(mqtt_data);
+
+  if (0 == len) {
+    return;
+  }
+  else if (len == sizeof(mqtt_data)) {
+    AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: Content too large"));
+  }
+  else if (len < CHUNKED_BUFFER_SIZE) {
+    Web.chunk_buffer += mqtt_data;
+    len = Web.chunk_buffer.length();
+  }
+
+  if (len >= CHUNKED_BUFFER_SIZE) {
+    WSContentFlush();
+  }
+  if (strlen(mqtt_data) >= CHUNKED_BUFFER_SIZE) {
+    _WSContentSend(mqtt_data);
+  }
+}
+
+void WSContentSend_P(const char* formatP, ...)
+{
+
+  va_list arg;
+  va_start(arg, formatP);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+  va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+  _WSContentSendBuffer();
+}
+
+void WSContentSend_PD(const char* formatP, ...)
+{
+
+  va_list arg;
+  va_start(arg, formatP);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+  va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+  if (D_DECIMAL_SEPARATOR[0] != '.') {
+    for (uint32_t i = 0; i < len; i++) {
+      if ('.' == mqtt_data[i]) {
+        mqtt_data[i] = D_DECIMAL_SEPARATOR[0];
+      }
+    }
+  }
+
+  _WSContentSendBuffer();
+}
+
+void WSContentStart_P(const char* title, bool auth)
+{
+  if (auth && strlen(SettingsText(SET_WEBPWD)) && !WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD))) {
+    return WebServer->requestAuthentication();
+  }
+
+  WSContentBegin(200, CT_HTML);
+
+  if (title != nullptr) {
+    char ctitle[strlen_P(title) +1];
+    strcpy_P(ctitle, title);
+    WSContentSend_P(HTTP_HEADER, SettingsText(SET_FRIENDLYNAME1), ctitle);
+  }
+}
+
+void WSContentStart_P(const char* title)
+{
+  WSContentStart_P(title, true);
+}
+
+void WSContentSendStyle_P(const char* formatP, ...)
+{
+  if (WifiIsInManagerMode()) {
+    if (WifiConfigCounter()) {
+      WSContentSend_P(HTTP_SCRIPT_COUNTER);
+    }
+  }
+  WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
+
+  WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
+                  WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
+  WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
+                  WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
+                  WebColor(COL_BUTTON));
+  if (formatP != nullptr) {
+
+    va_list arg;
+    va_start(arg, formatP);
+    int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+    va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+    _WSContentSendBuffer();
+  }
+  WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT),
+#ifdef FIRMWARE_MINIMAL
+    WebColor(COL_TEXT_WARNING),
+#endif
+    WebColor(COL_TITLE),
+    ModuleName().c_str(), SettingsText(SET_FRIENDLYNAME1));
+  if (Settings.flag3.gui_hostname_ip) {
+    bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0);
+    bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0);
+    WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"),
+      my_hostname,
+      (Wifi.mdns_begun) ? ".local" : "",
+      (lip) ? WiFi.localIP().toString().c_str() : "",
+      (lip && sip) ? ", " : "",
+      (sip) ? WiFi.softAPIP().toString().c_str() : "");
+  }
+  WSContentSend_P(PSTR("</div>"));
+}
+
+void WSContentSendStyle(void)
+{
+  WSContentSendStyle_P(nullptr);
+}
+
+void WSContentButton(uint32_t title_index)
+{
+  char action[4];
+  char title[100];
+
+  if (title_index <= BUTTON_RESET_CONFIGURATION) {
+    char confirm[100];
+    WSContentSend_P(PSTR("<p><form action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
+      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
+      GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),
+      (!title_index) ? "rst" : "non",
+      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
+  } else {
+    WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),
+      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
+      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
+  }
+}
+
+void WSContentSpaceButton(uint32_t title_index)
+{
+  WSContentSend_P(PSTR("<div></div>"));
+  WSContentButton(title_index);
+}
+
+void WSContentEnd(void)
+{
+  WSContentFlush();
+  _WSContentSend("");
+  WebServer->client().stop();
+}
+
+void WSContentStop(void)
+{
+  if (WifiIsInManagerMode()) {
+    if (WifiConfigCounter()) {
+      WSContentSend_P(HTTP_COUNTER);
+    }
+  }
+  WSContentSend_P(HTTP_END, my_version);
+  WSContentEnd();
+}
+
+
+
+void WebRestart(uint32_t type)
+{
+
+
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
+
+  bool reset_only = (HTTP_MANAGER_RESET_ONLY == Web.state);
+
+  WSContentStart_P((type) ? S_SAVE_CONFIGURATION : S_RESTART, !reset_only);
+  WSContentSend_P(HTTP_SCRIPT_RELOAD);
+  WSContentSendStyle();
+  if (type) {
+    WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_CONFIGURATION_SAVED "</b><br>"));
+    if (2 == type) {
+      WSContentSend_P(PSTR("<br>" D_TRYING_TO_CONNECT "<br>"));
+    }
+    WSContentSend_P(PSTR("</div>"));
+  }
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  if (HTTP_MANAGER == Web.state || reset_only) {
+    Web.state = HTTP_ADMIN;
+  } else {
+    WSContentSpaceButton(BUTTON_MAIN);
+  }
+  WSContentStop();
+
+  ShowWebSource(SRC_WEBGUI);
+  restart_flag = 2;
+}
+
+
+
+void HandleWifiLogin(void)
+{
+  WSContentStart_P(S_CONFIGURE_WIFI, false);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_LOGIN);
+
+  if (HTTP_MANAGER_RESET_ONLY == Web.state) {
+    WSContentSpaceButton(BUTTON_RESTART);
+#ifndef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
+#endif
+  }
+
+  WSContentStop();
+}
+
+void WebSliderColdWarm(void)
+{
+  WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+    "a",
+    "#fff", "#ff0",
+    1,
+    153, 500,
+    LightGetColorTemp(),
+    't', 0);
+}
+
+void HandleRoot(void)
+{
+  if (CaptivePortal()) { return; }
+
+  if (WebServer->hasArg("rst")) {
+    WebRestart(0);
+    return;
+  }
+
+  if (WifiIsInManagerMode()) {
+#ifndef FIRMWARE_MINIMAL
+    if (strlen(SettingsText(SET_WEBPWD)) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1")) && HTTP_MANAGER_RESET_ONLY != Web.state) {
+      HandleWifiLogin();
+    } else {
+      if (!strlen(SettingsText(SET_WEBPWD)) || (((WebServer->arg("USER1") == WEB_USERNAME ) && (WebServer->arg("PASS1") == SettingsText(SET_WEBPWD) )) || HTTP_MANAGER_RESET_ONLY == Web.state)) {
+        HandleWifiConfiguration();
+      } else {
+
+        HandleWifiLogin();
+      }
+    }
+#endif
+    return;
+  }
+
+  if (HandleRootStatusRefresh()) {
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU);
+
+  char stemp[33];
+
+  WSContentStart_P(S_MAIN_MENU);
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh, Settings.web_refresh);
+#else
+  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh);
+#endif
+  WSContentSend_P(HTTP_SCRIPT_ROOT_PART2);
+
+  WSContentSendStyle();
+
+  WSContentSend_P(PSTR("<div id='l1' name='l1'></div>"));
+  if (devices_present) {
+#ifdef USE_LIGHT
+    if (light_type) {
+      uint8_t light_subtype = light_type &7;
+      if (!Settings.flag3.pwm_multi_channels) {
+        bool split_white = ((LST_RGBW <= light_subtype) && (devices_present > 1));
+
+        if ((LST_COLDWARM == light_subtype) || ((LST_RGBCW == light_subtype) && !split_white)) {
+          WebSliderColdWarm();
+        }
+
+        if (light_subtype > 2) {
+          uint16_t hue;
+          uint8_t sat;
+          LightGetHSB(&hue, &sat, nullptr);
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "b",
+            "#800", "#f00 5%,#ff0 20%,#0f0 35%,#0ff 50%,#00f 65%,#f0f 80%,#f00 95%,#800",
+            2,
+            1, 359,
+            hue,
+            'h', 0);
+
+          uint8_t dcolor = changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255);
+          char scolor[8];
+          snprintf_P(scolor, sizeof(scolor), PSTR("#%02X%02X%02X"), dcolor, dcolor, dcolor);
+          uint8_t red, green, blue;
+          LightHsToRgb(hue, 255, &red, &green, &blue);
+          snprintf_P(stemp, sizeof(stemp), PSTR("#%02X%02X%02X"), red, green, blue);
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "s",
+            scolor, stemp,
+            3,
+            0, 100,
+            changeUIntScale(sat, 0, 255, 0, 100),
+            'n', 0);
+        }
+
+        WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+          "c",
+          "#000", "#fff",
+          4,
+          Settings.flag3.slider_dimmer_stay_on, 100,
+          Settings.light_dimmer,
+          'd', 0);
+
+        if (split_white) {
+          if (LST_RGBCW == light_subtype) {
+            WebSliderColdWarm();
+          }
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "f",
+            "#000", "#fff",
+            5,
+            Settings.flag3.slider_dimmer_stay_on, 100,
+            LightGetDimmer(2),
+            'w', 0);
+        }
+      } else {
+        uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype;
+        stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0';
+        for (uint32_t i = 0; i < pwm_channels; i++) {
+          stemp[1]++;
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            stemp,
+            "#000", "#fff",
+            i+1,
+            1, 100,
+            changeUIntScale(Settings.light_color[i], 0, 255, 0, 100),
+            'e', i+1);
+        }
+      }
+    }
+#endif
+#ifdef USE_SHUTTER
+    if (Settings.flag3.shutter_mode) {
+      for (uint32_t i = 0; i < shutters_present; i++) {
+        WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, Settings.shutter_position[i], i+1);
+      }
+    }
+#endif
+    WSContentSend_P(HTTP_TABLE100);
+    WSContentSend_P(PSTR("<tr>"));
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      WSContentSend_P(HTTP_DEVICE_CONTROL, 36, 1,
+        (strlen(SettingsText(SET_BUTTON1))) ? SettingsText(SET_BUTTON1) : D_BUTTON_TOGGLE,
+        "");
+      for (uint32_t i = 0; i < MaxFanspeed(); i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i);
+        WSContentSend_P(HTTP_DEVICE_CONTROL, 16, i +2,
+          (strlen(SettingsText(SET_BUTTON2 + i))) ? SettingsText(SET_BUTTON2 + i) : stemp,
+          "");
+      }
+    } else {
+#endif
+      for (uint32_t idx = 1; idx <= devices_present; idx++) {
+        bool set_button = ((idx <= MAX_BUTTON_TEXT) && strlen(SettingsText(SET_BUTTON1 + idx -1)));
+#ifdef USE_SHUTTER
+        int32_t ShutterWebButton;
+        if (ShutterWebButton = IsShutterWebButton(idx)) {
+          WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
+            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((Settings.shutter_options[abs(ShutterWebButton)-1] & 2) ? "-" : ((ShutterWebButton>0) ? "▲" : "▼")),
+            "");
+          continue;
+        }
+#endif
+        snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx);
+        WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
+          (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (devices_present < 5) ? D_BUTTON_TOGGLE : "",
+          (set_button) ? "" : (devices_present > 1) ? stemp : "");
+      }
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+#ifdef USE_SONOFF_RF
+  if (SONOFF_BRIDGE == my_module_type) {
+    WSContentSend_P(HTTP_TABLE100);
+    WSContentSend_P(PSTR("<tr>"));
+    uint32_t idx = 0;
+    for (uint32_t i = 0; i < 4; i++) {
+      if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
+      for (uint32_t j = 0; j < 4; j++) {
+        idx++;
+        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), idx);
+        WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,
+          (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : stemp);
+      }
+    }
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+#endif
+
+#ifndef FIRMWARE_MINIMAL
+  XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
+  XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
+#endif
+
+  if (HTTP_ADMIN == Web.state) {
+#ifdef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_FIRMWARE_UPGRADE);
+#else
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentButton(BUTTON_INFORMATION);
+    WSContentButton(BUTTON_FIRMWARE_UPGRADE);
+#endif
+    WSContentButton(BUTTON_CONSOLE);
+    WSContentButton(BUTTON_RESTART);
+  }
+  WSContentStop();
+}
+
+bool HandleRootStatusRefresh(void)
+{
+  if (!WebAuthenticate()) {
+    WebServer->requestAuthentication();
+    return true;
+  }
+
+  if (!WebServer->hasArg("m")) {
+    return false;
+  }
+
+  #ifdef USE_SCRIPT_WEB_DISPLAY
+    Script_Check_HTML_Setvars();
+  #endif
+
+  char tmp[8];
+  char svalue[32];
+  char webindex[5];
+
+  WebGetArg("o", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    ShowWebSource(SRC_WEBGUI);
+    uint32_t device = atoi(tmp);
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      if (device < 2) {
+        ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE);
+      } else {
+        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), device -2);
+        ExecuteCommand(svalue, SRC_WEBGUI);
+      }
+    } else {
+#endif
+#ifdef USE_SHUTTER
+      int32_t ShutterWebButton;
+      if (ShutterWebButton = IsShutterWebButton(device)) {
+        snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
+        ExecuteWebCommand(svalue, SRC_WEBGUI);
+      } else {
+#endif
+        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
+#ifdef USE_SHUTTER
+      }
+#endif
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+  }
+  WebGetArg("d0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("w0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+  for (uint32_t j = 1; j <= pwm_channels; j++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    if (strlen(tmp)) {
+      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp);
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+  }
+  WebGetArg("t0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_COLORTEMPERATURE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("h0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "1 %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("n0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "2 %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+#ifdef USE_SHUTTER
+  for (uint32_t j = 1; j <= shutters_present; j++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    if (strlen(tmp)) {
+      snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), j, tmp);
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+  }
+#endif
+#ifdef USE_SONOFF_RF
+  WebGetArg("k", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_RFKEY "%s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+#endif
+  WSContentBegin(200, CT_HTML);
+  WSContentSend_P(PSTR("{t}"));
+  XsnsCall(FUNC_WEB_SENSOR);
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  XdrvCall(FUNC_WEB_SENSOR);
+#endif
+
+  WSContentSend_P(PSTR("</table>"));
+
+  if (devices_present) {
+    WSContentSend_P(PSTR("{t}<tr>"));
+    uint32_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32;
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      WSContentSend_P(HTTP_DEVICE_STATE, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
+      uint32_t fanspeed = GetFanspeed();
+      snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fanspeed);
+      WSContentSend_P(HTTP_DEVICE_STATE, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
+    } else {
+#endif
+      for (uint32_t idx = 1; idx <= devices_present; idx++) {
+        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1));
+        WSContentSend_P(HTTP_DEVICE_STATE, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
+      }
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+  WSContentEnd();
+
+  return true;
+}
+
+#ifdef USE_SHUTTER
+int32_t IsShutterWebButton(uint32_t idx) {
+
+  int32_t ShutterWebButton = 0;
+  if (Settings.flag3.shutter_mode) {
+    for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+      if (Settings.shutter_startrelay[i] && ((Settings.shutter_startrelay[i] == idx) || (Settings.shutter_startrelay[i] == (idx-1)))) {
+        ShutterWebButton = (Settings.shutter_startrelay[i] == idx) ? (i+1): (-1-i);
+        break;
+      }
+    }
+  }
+  return ShutterWebButton;
+}
+#endif
+
+
+
+#ifndef FIRMWARE_MINIMAL
+
+void HandleConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION);
+
+  WSContentStart_P(S_CONFIGURATION);
+  WSContentSendStyle();
+
+  WSContentButton(BUTTON_MODULE);
+  WSContentButton(BUTTON_WIFI);
+
+  XdrvCall(FUNC_WEB_ADD_BUTTON);
+  XsnsCall(FUNC_WEB_ADD_BUTTON);
+
+  WSContentButton(BUTTON_LOGGING);
+  WSContentButton(BUTTON_OTHER);
+  WSContentButton(BUTTON_TEMPLATE);
+
+  WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
+  WSContentButton(BUTTON_BACKUP);
+  WSContentButton(BUTTON_RESTORE);
+
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+
+
+
+void HandleTemplateConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    TemplateSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[30];
+
+  if (WebServer->hasArg("m")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
+      uint32_t midx = pgm_read_byte(kModuleNiceList + i);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
+    }
+    WSContentEnd();
+    return;
+  }
+
+  WebGetArg("t", stemp, sizeof(stemp));
+  if (strlen(stemp)) {
+    uint32_t module = atoi(stemp);
+    uint32_t module_save = Settings.module;
+    Settings.module = module;
+    myio cmodule;
+    ModuleGpios(&cmodule);
+    gpio_flag flag = ModuleFlag();
+    Settings.module = module_save;
+
+    WSContentBegin(200, CT_PLAIN);
+    WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str());
+    for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+      if (1 == i) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);
+      }
+      uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+    }
+    WSContentSend_P(PSTR("}1"));
+
+    for (uint32_t i = 0; i < ADC0_END; i++) {
+      if (1 == i) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ADC0_USER, D_SENSOR_USER, ADC0_USER);
+      }
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, i, GetTextIndexed(stemp, sizeof(stemp), i, kAdc0Names), i);
+    }
+    WSContentSend_P(PSTR("}1"));
+
+    for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+      if ((i < 6) || ((i > 8) && (i != 11))) {
+        WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", cmodule.io[i]);
+      }
+    }
+    WSContentSend_P(PSTR("}1%d}1%d"), flag, Settings.user_template_base);
+    WSContentEnd();
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TEMPLATE);
+
+  WSContentStart_P(S_CONFIGURE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_TEMPLATE);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_TEMPLATE);
+  WSContentSend_P(HTTP_TABLE100);
+  WSContentSend_P(PSTR("<tr><td><b>" D_TEMPLATE_NAME "</b></td><td style='width:200px'><input id='s1' placeholder='" D_TEMPLATE_NAME "'></td></tr>"
+                       "<tr><td><b>" D_BASE_TYPE "</b></td><td><select id='g99' onchange='st(this.value)'></select></td></tr>"
+                       "</table>"
+                       "<hr/>"));
+  WSContentSend_P(HTTP_TABLE100);
+  for (uint32_t i = 0; i < 17; i++) {
+    if ((i < 6) || ((i > 8) && (i != 11))) {
+      WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_GPIO "%d</font></b></td><td%s><select id='g%d'></select></td></tr>"),
+        ((9==i)||(10==i)) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? " style='width:200px'" : "", i);
+    }
+  }
+  WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_ADC "0</font></b></td><td><select id='g17'></select></td></tr>"), WebColor(COL_TEXT));
+  WSContentSend_P(PSTR("</table>"));
+  gpio_flag flag = ModuleFlag();
+  if (flag.data > ADC0_USER) {
+    WSContentSend_P(HTTP_FORM_TEMPLATE_FLAG);
+  }
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void TemplateSaveSettings(void)
+{
+  char tmp[sizeof(Settings.user_template.name)];
+  char webindex[5];
+  char svalue[128];
+
+  WebGetArg("s1", tmp, sizeof(tmp));
+  snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " {\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), tmp);
+
+  uint32_t j = 0;
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    if (6 == i) { j = 9; }
+    if (8 == i) { j = 12; }
+    snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    uint8_t gpio = atoi(tmp);
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s%d"), svalue, (i>0)?",":"", gpio);
+    j++;
+  }
+
+  WebGetArg("g17", tmp, sizeof(tmp));
+  uint32_t flag = atoi(tmp);
+  for (uint32_t i = 0; i < GPIO_FLAG_USED; i++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("c%d"), i);
+    uint32_t state = WebServer->hasArg(webindex) << i +4;
+    flag += state;
+  }
+  WebGetArg("g99", tmp, sizeof(tmp));
+  uint32_t base = atoi(tmp) +1;
+
+  snprintf_P(svalue, sizeof(svalue), PSTR("%s],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), svalue, flag, base);
+  ExecuteWebCommand(svalue, SRC_WEBGUI);
+}
+
+
+
+void HandleModuleConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    ModuleSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[30];
+  uint32_t midx;
+  myio cmodule;
+  ModuleGpios(&cmodule);
+
+  if (WebServer->hasArg("m")) {
+    WSContentBegin(200, CT_PLAIN);
+    uint32_t vidx = 0;
+    for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
+      if (0 == i) {
+        midx = USER_MODULE;
+        vidx = 0;
+      } else {
+        midx = pgm_read_byte(kModuleNiceList + i -1);
+        vidx = midx +1;
+      }
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
+    }
+    WSContentEnd();
+    return;
+  }
+
+  if (WebServer->hasArg("g")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t j = 0; j < sizeof(kGpioNiceList); j++) {
+      midx = pgm_read_byte(kGpioNiceList + j);
+      if (!GetUsedInModule(midx, cmodule.io)) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+      }
+    }
+    WSContentEnd();
+    return;
+  }
+
+#ifndef USE_ADC_VCC
+  if (WebServer->hasArg("a")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t j = 0; j < ADC0_END; j++) {
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, j, GetTextIndexed(stemp, sizeof(stemp), j, kAdc0Names), j);
+    }
+    WSContentEnd();
+    return;
+  }
+#endif
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MODULE);
+
+  WSContentStart_P(S_CONFIGURE_MODULE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE1, Settings.module);
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (ValidGPIO(i, cmodule.io[i])) {
+      WSContentSend_P(PSTR("sk(%d,%d);"), my_module.io[i], i);
+    }
+  }
+  WSContentSend_P(HTTP_SCRIPT_MODULE2, Settings.my_adc0);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_MODULE, AnyModuleName(MODULE).c_str());
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (ValidGPIO(i, cmodule.io[i])) {
+      snprintf_P(stemp, 3, PINS_WEMOS +i*2);
+      char sesp8285[40];
+      snprintf_P(sesp8285, sizeof(sesp8285), PSTR("<font color='#%06x'>ESP8285</font>"), WebColor(COL_TEXT_WARNING));
+      WSContentSend_P(PSTR("<tr><td style='width:190px'>%s <b>" D_GPIO "%d</b> %s</td><td style='width:176px'><select id='g%d'></select></td></tr>"),
+        (WEMOS==my_module_type)?stemp:"", i, (0==i)? D_SENSOR_BUTTON "1":(1==i)? D_SERIAL_OUT :(3==i)? D_SERIAL_IN :((9==i)||(10==i))? sesp8285 :(12==i)? D_SENSOR_RELAY "1":(13==i)? D_SENSOR_LED "1i":(14==i)? D_SENSOR :"", i);
+    }
+  }
+#ifndef USE_ADC_VCC
+  if (ValidAdc()) {
+    WSContentSend_P(PSTR("<tr><td>%s <b>" D_ADC "0</b></td><td style='width:176px'><select id='g17'></select></td></tr>"), (WEMOS==my_module_type)?"A0":"");
+  }
+#endif
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void ModuleSaveSettings(void)
+{
+  char tmp[8];
+  char webindex[5];
+
+  WebGetArg("g99", tmp, sizeof(tmp));
+  uint32_t new_module = (!strlen(tmp)) ? MODULE : atoi(tmp);
+  Settings.last_module = Settings.module;
+  Settings.module = new_module;
+  SetModuleType();
+  myio cmodule;
+  ModuleGpios(&cmodule);
+  String gpios = "";
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (Settings.last_module != new_module) {
+      Settings.my_gp.io[i] = GPIO_NONE;
+    } else {
+      if (ValidGPIO(i, cmodule.io[i])) {
+        snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), i);
+        WebGetArg(webindex, tmp, sizeof(tmp));
+        Settings.my_gp.io[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+        gpios += F(", " D_GPIO ); gpios += String(i); gpios += F(" "); gpios += String(Settings.my_gp.io[i]);
+      }
+    }
+  }
+#ifndef USE_ADC_VCC
+  WebGetArg("g17", tmp, sizeof(tmp));
+  Settings.my_adc0 = (!strlen(tmp)) ? 0 : atoi(tmp);
+  gpios += F(", " D_ADC "0 "); gpios += String(Settings.my_adc0);
+#endif
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MODULE "%s " D_CMND_MODULE "%s"), ModuleName().c_str(), gpios.c_str());
+}
+
+
+
+const char kUnescapeCode[] = "&><\"\'";
+const char kEscapeCode[] PROGMEM = "&amp;|&gt;|&lt;|&quot;|&apos;";
+
+String HtmlEscape(const String unescaped) {
+  char escaped[10];
+  size_t ulen = unescaped.length();
+  String result = "";
+  for (size_t i = 0; i < ulen; i++) {
+    char c = unescaped[i];
+    char *p = strchr(kUnescapeCode, c);
+    if (p != nullptr) {
+      result += GetTextIndexed(escaped, sizeof(escaped), p - kUnescapeCode, kEscapeCode);
+    } else {
+      result += c;
+    }
+  }
+  return result;
+}
+
+
+const char kEncryptionType[] PROGMEM = "|||" D_WPA_PSK "||" D_WPA2_PSK "|" D_WEP "||" D_NONE "|" D_AUTO;
+
+void HandleWifiConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI);
+
+  if (WebServer->hasArg("save") && HTTP_MANAGER_RESET_ONLY != Web.state) {
+    WifiSaveSettings();
+    WebRestart(2);
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_WIFI, !WifiIsInManagerMode());
+  WSContentSend_P(HTTP_SCRIPT_WIFI);
+  WSContentSendStyle();
+
+  if (HTTP_MANAGER_RESET_ONLY != Web.state) {
+    if (WebServer->hasArg("scan")) {
+#ifdef USE_EMULATION
+      UdpDisconnect();
+#endif
+      int n = WiFi.scanNetworks();
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_SCAN_DONE));
+
+      if (0 == n) {
+        AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, S_NO_NETWORKS_FOUND);
+        WSContentSend_P(S_NO_NETWORKS_FOUND);
+        WSContentSend_P(PSTR(". " D_REFRESH_TO_SCAN_AGAIN "."));
+      } else {
+
+        int indices[n];
+        for (uint32_t i = 0; i < n; i++) {
+          indices[i] = i;
+        }
+
+
+        for (uint32_t i = 0; i < n; i++) {
+          for (uint32_t j = i + 1; j < n; j++) {
+            if (WiFi.RSSI(indices[j]) > WiFi.RSSI(indices[i])) {
+              std::swap(indices[i], indices[j]);
+            }
+          }
+        }
+
+
+        String cssid;
+        for (uint32_t i = 0; i < n; i++) {
+          if (-1 == indices[i]) { continue; }
+          cssid = WiFi.SSID(indices[i]);
+          uint32_t cschn = WiFi.channel(indices[i]);
+          for (uint32_t j = i + 1; j < n; j++) {
+            if ((cssid == WiFi.SSID(indices[j])) && (cschn == WiFi.channel(indices[j]))) {
+              DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
+              indices[j] = -1;
+            }
+          }
+        }
+
+
+        for (uint32_t i = 0; i < n; i++) {
+          if (-1 == indices[i]) { continue; }
+          DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"),
+            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), WiFi.RSSI(indices[i]));
+          int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i]));
+          int auth = WiFi.encryptionType(indices[i]);
+          char encryption[20];
+          WSContentSend_P(PSTR("<div><a href='#p' onclick='c(this)'>%s</a>&nbsp;(%d)&nbsp<span class='q'>%s %d%% (%d dBm)</span></div>"),
+            HtmlEscape(WiFi.SSID(indices[i])).c_str(),
+            WiFi.channel(indices[i]),
+            GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
+            quality, WiFi.RSSI(indices[i])
+          );
+          delay(0);
+
+        }
+        WSContentSend_P(PSTR("<br>"));
+      }
+    } else {
+      WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br>"));
+    }
+
+
+    WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
+    WSContentSend_P(HTTP_FORM_END);
+  }
+
+  if (WifiIsInManagerMode()) {
+#ifndef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESTORE);
+    WSContentButton(BUTTON_RESET_CONFIGURATION);
+#endif
+    WSContentSpaceButton(BUTTON_RESTART);
+  } else {
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+  }
+  WSContentStop();
+}
+
+void WifiSaveSettings(void)
+{
+  char tmp[TOPSZ];
+
+  WebGetArg("h", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_HOSTNAME, (!strlen(tmp)) ? WIFI_HOSTNAME : tmp);
+  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+  }
+  WebGetArg("c", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_CORS, (!strlen(tmp)) ? CORS_DOMAIN : tmp);
+  WebGetArg("s1", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STASSID1, (!strlen(tmp)) ? STA_SSID1 : tmp);
+  WebGetArg("s2", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STASSID2, (!strlen(tmp)) ? STA_SSID2 : tmp);
+  WebGetArg("p1", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STAPWD1, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD1) : tmp);
+  WebGetArg("p2", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STAPWD2, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD2) : tmp);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_SSID "2 %s, " D_CMND_CORS " %s"),
+    SettingsText(SET_HOSTNAME), SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), SettingsText(SET_CORS));
+}
+
+
+
+void HandleLoggingConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING);
+
+  if (WebServer->hasArg("save")) {
+    LoggingSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_LOGGING);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_LOG1);
+  char stemp1[45];
+  char stemp2[32];
+  uint8_t dlevel[4] = { LOG_LEVEL_INFO, LOG_LEVEL_INFO, LOG_LEVEL_NONE, LOG_LEVEL_NONE };
+  for (uint32_t idx = 0; idx < 4; idx++) {
+    if ((2==idx) && !Settings.flag.mqtt_enabled) { continue; }
+    uint32_t llevel = (0==idx)?Settings.seriallog_level:(1==idx)?Settings.weblog_level:(2==idx)?Settings.mqttlog_level:Settings.syslog_level;
+    WSContentSend_P(PSTR("<p><b>%s</b> (%s)<br><select id='l%d'>"),
+      GetTextIndexed(stemp1, sizeof(stemp1), idx, kLoggingOptions),
+      GetTextIndexed(stemp2, sizeof(stemp2), dlevel[idx], kLoggingLevels),
+      idx);
+    for (uint32_t i = LOG_LEVEL_NONE; i <= LOG_LEVEL_DEBUG_MORE; i++) {
+      WSContentSend_P(PSTR("<option%s value='%d'>%d %s</option>"),
+        (i == llevel) ? " selected" : "", i, i,
+        GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
+    }
+    WSContentSend_P(PSTR("</select></p>"));
+  }
+  WSContentSend_P(HTTP_FORM_LOG2, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void LoggingSaveSettings(void)
+{
+  char tmp[TOPSZ];
+
+  WebGetArg("l0", tmp, sizeof(tmp));
+  SetSeriallog((!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp));
+  WebGetArg("l1", tmp, sizeof(tmp));
+  Settings.weblog_level = (!strlen(tmp)) ? WEB_LOG_LEVEL : atoi(tmp);
+  WebGetArg("l2", tmp, sizeof(tmp));
+  Settings.mqttlog_level = (!strlen(tmp)) ? MQTT_LOG_LEVEL : atoi(tmp);
+  WebGetArg("l3", tmp, sizeof(tmp));
+  SetSyslog((!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp));
+  WebGetArg("lh", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_SYSLOG_HOST, (!strlen(tmp)) ? SYS_LOG_HOST : tmp);
+  WebGetArg("lp", tmp, sizeof(tmp));
+  Settings.syslog_port = (!strlen(tmp)) ? SYS_LOG_PORT : atoi(tmp);
+  WebGetArg("lt", tmp, sizeof(tmp));
+  Settings.tele_period = (!strlen(tmp)) ? TELE_PERIOD : atoi(tmp);
+  if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) {
+    Settings.tele_period = 10;
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG D_CMND_SERIALLOG " %d, " D_CMND_WEBLOG " %d, " D_CMND_MQTTLOG " %d, " D_CMND_SYSLOG " %d, " D_CMND_LOGHOST " %s, " D_CMND_LOGPORT " %d, " D_CMND_TELEPERIOD " %d"),
+    Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
+}
+
+
+
+void HandleOtherConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER);
+
+  if (WebServer->hasArg("save")) {
+    OtherSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_OTHER);
+  WSContentSendStyle();
+
+  TemplateJson();
+  char stemp[strlen(mqtt_data) +1];
+  strlcpy(stemp, mqtt_data, sizeof(stemp));
+  WSContentSend_P(HTTP_FORM_OTHER, stemp, (USER_MODULE == Settings.module) ? " checked disabled" : "", (Settings.flag.mqtt_enabled) ? " checked" : "");
+
+  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) { maxfn = 1; }
+#endif
+  for (uint32_t i = 0; i < maxfn; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i +1);
+    WSContentSend_P(PSTR("<b>" D_FRIENDLY_NAME " %d</b> (" FRIENDLY_NAME "%s)<br><input id='a%d' placeholder='" FRIENDLY_NAME "%s' value='%s'><p></p>"),
+      i +1,
+      (i) ? stemp : "",
+      i,
+      (i) ? stemp : "",
+      SettingsText(SET_FRIENDLYNAME1 + i));
+  }
+
+#ifdef USE_EMULATION
+  WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));
+  for (uint32_t i = 0; i < EMUL_MAX; i++) {
+#ifndef USE_EMULATION_WEMO
+    if (i == EMUL_WEMO) { i++; }
+#endif
+#ifndef USE_EMULATION_HUE
+    if (i == EMUL_HUE) { i++; }
+#endif
+    if (i < EMUL_MAX) {
+      WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br>"),
+        i, i,
+        (i == Settings.flag2.emulation) ? " checked" : "",
+        GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
+        (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
+    }
+  }
+  WSContentSend_P(PSTR("</p></fieldset>"));
+#endif
+
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void OtherSaveSettings(void)
+{
+  char tmp[TOPSZ];
+  char webindex[5];
+  char friendlyname[TOPSZ];
+  char message[LOGSZ];
+
+  WebGetArg("wp", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
+  Settings.flag.mqtt_enabled = WebServer->hasArg("b1");
+#ifdef USE_EMULATION
+  WebGetArg("b2", tmp, sizeof(tmp));
+  Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
+#endif
+
+  snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);
+  for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("a%d"), i);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    snprintf_P(friendlyname, sizeof(friendlyname), PSTR(FRIENDLY_NAME"%d"), i +1);
+    SettingsUpdateText(SET_FRIENDLYNAME1 +i, (!strlen(tmp)) ? (i) ? friendlyname : FRIENDLY_NAME : tmp);
+    snprintf_P(message, sizeof(message), PSTR("%s%s %s"), message, (i) ? "," : "", SettingsText(SET_FRIENDLYNAME1 +i));
+  }
+  AddLog_P(LOG_LEVEL_INFO, message);
+
+  WebGetArg("t1", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    char svalue[128];
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+
+    if (WebServer->hasArg("t2")) {
+      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0"));
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+
+  }
+}
+
+
+
+void HandleBackupConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION));
+
+  if (!SettingsBufferAlloc()) { return; }
+
+  WiFiClient myClient = WebServer->client();
+  WebServer->setContentLength(sizeof(Settings));
+
+  char attachment[TOPSZ];
+
+
+
+
+  char hostname[sizeof(my_hostname)];
+  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(hostname, my_hostname), my_version);
+
+  WebServer->sendHeader(F("Content-Disposition"), attachment);
+
+  WSSend(200, CT_STREAM, "");
+
+  uint32_t cfg_crc32 = Settings.cfg_crc32;
+  Settings.cfg_crc32 = GetSettingsCrc32();
+
+  memcpy(settings_buffer, &Settings, sizeof(Settings));
+  if (Web.config_xor_on_set) {
+    for (uint32_t i = 2; i < sizeof(Settings); i++) {
+      settings_buffer[i] ^= (Web.config_xor_on_set +i);
+    }
+  }
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  size_t written = myClient.write((const char*)settings_buffer, sizeof(Settings));
+  if (written < sizeof(Settings)) {
+    myClient.write((const char*)settings_buffer +written, sizeof(Settings) -written);
+  }
+#else
+  myClient.write((const char*)settings_buffer, sizeof(Settings));
+#endif
+
+  SettingsBufferFree();
+
+  Settings.cfg_crc32 = cfg_crc32;
+}
+
+
+
+void HandleResetConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESET_CONFIGURATION);
+
+  WSContentStart_P(S_RESET_CONFIGURATION, !WifiIsInManagerMode());
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'>" D_CONFIGURATION_RESET "</div>"));
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  char command[CMDSZ];
+  snprintf_P(command, sizeof(command), PSTR(D_CMND_RESET " 1"));
+  ExecuteWebCommand(command, SRC_WEBGUI);
+}
+
+void HandleRestoreConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION);
+
+  WSContentStart_P(S_RESTORE_CONFIGURATION);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_RST);
+  WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
+  if (WifiIsInManagerMode()) {
+    WSContentSpaceButton(BUTTON_MAIN);
+  } else {
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+  }
+  WSContentStop();
+
+  Web.upload_error = 0;
+  Web.upload_file_type = UPL_SETTINGS;
+}
+
+
+
+void HandleInformation(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION);
+
+  char stopic[TOPSZ];
+
+  int freeMem = ESP.getFreeHeap();
+
+  WSContentStart_P(S_INFORMATION);
+
+
+
+  WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN);
+  WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>"));
+  WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s%s"), my_version, my_image);
+  WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str());
+  WSContentSend_P(PSTR("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/%s"), ESP.getSdkVersion());
+  WSContentSend_P(PSTR("}1" D_UPTIME "}2%s"), GetUptime().c_str());
+  WSContentSend_P(PSTR("}1" D_FLASH_WRITE_COUNT "}2%d at 0x%X"), Settings.save_flag, GetSettingsAddress());
+  WSContentSend_P(PSTR("}1" D_BOOT_COUNT "}2%d"), Settings.bootcount);
+  WSContentSend_P(PSTR("}1" D_RESTART_REASON "}2%s"), GetResetReason().c_str());
+  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present;
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) { maxfn = 1; }
+#endif
+  for (uint32_t i = 0; i < maxfn; i++) {
+    WSContentSend_P(PSTR("}1" D_FRIENDLY_NAME " %d}2%s"), i +1, SettingsText(SET_FRIENDLYNAME1 +i));
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI());
+  WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "");
+#if LWIP_IPV6
+    String ipv6_addr = WifiGetIPv6();
+    if(ipv6_addr != ""){
+      WSContentSend_P(PSTR("}1 IPv6 Address }2%s"), ipv6_addr.c_str());
+    }
+#endif
+  if (static_cast<uint32_t>(WiFi.localIP()) != 0) {
+    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.localIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), IPAddress(Settings.ip_address[1]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_SUBNET_MASK "}2%s"), IPAddress(Settings.ip_address[2]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_DNS_SERVER "}2%s"), IPAddress(Settings.ip_address[3]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.macAddress().c_str());
+  }
+  if (static_cast<uint32_t>(WiFi.softAPIP()) != 0) {
+    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.softAPIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), WiFi.softAPIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.softAPmacAddress().c_str());
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  if (Settings.flag.mqtt_enabled) {
+    WSContentSend_P(PSTR("}1" D_MQTT_HOST "}2%s"), SettingsText(SET_MQTT_HOST));
+    WSContentSend_P(PSTR("}1" D_MQTT_PORT "}2%d"), Settings.mqtt_port);
+    WSContentSend_P(PSTR("}1" D_MQTT_USER "}2%s"), SettingsText(SET_MQTT_USER));
+    WSContentSend_P(PSTR("}1" D_MQTT_CLIENT "}2%s"), mqtt_client);
+    WSContentSend_P(PSTR("}1" D_MQTT_TOPIC "}2%s"), SettingsText(SET_MQTT_TOPIC));
+
+    WSContentSend_P(PSTR("}1" D_MQTT_GROUP_TOPIC "}2%s"), GetGroupTopic_P(stopic, ""));
+    WSContentSend_P(PSTR("}1" D_MQTT_FULL_TOPIC "}2%s"), GetTopic_P(stopic, CMND, mqtt_topic, ""));
+    WSContentSend_P(PSTR("}1" D_MQTT " " D_FALLBACK_TOPIC "}2%s"), GetFallbackTopic_P(stopic, ""));
+  } else {
+    WSContentSend_P(PSTR("}1" D_MQTT "}2" D_DISABLED));
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+
+#ifdef USE_EMULATION
+  WSContentSend_P(PSTR("}1" D_EMULATION "}2%s"), GetTextIndexed(stopic, sizeof(stopic), Settings.flag2.emulation, kEmulationOptions));
+#else
+  WSContentSend_P(PSTR("}1" D_EMULATION "}2" D_DISABLED));
+#endif
+
+#ifdef USE_DISCOVERY
+  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2%s"), (Settings.flag3.mdns_enabled) ? D_ENABLED : D_DISABLED);
+  if (Settings.flag3.mdns_enabled) {
+#ifdef WEBSERVER_ADVERTISE
+    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_WEB_SERVER));
+#else
+    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_DISABLED));
+#endif
+  }
+#else
+  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2" D_DISABLED));
+#endif
+
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  WSContentSend_P(PSTR("}1" D_ESP_CHIP_ID "}2%d"), ESP.getChipId());
+  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_ID "}20x%06X"), ESP.getFlashChipId());
+  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_SIZE "}2%dkB"), ESP.getFlashChipRealSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_PROGRAM_FLASH_SIZE "}2%dkB"), ESP.getFlashChipSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_PROGRAM_SIZE "}2%dkB"), ESP.getSketchSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_FREE_PROGRAM_SPACE "}2%dkB"), ESP.getFreeSketchSpace() / 1024);
+  WSContentSend_P(PSTR("}1" D_FREE_MEMORY "}2%dkB"), freeMem / 1024);
+  WSContentSend_P(PSTR("</td></tr></table>"));
+
+  WSContentSend_P(HTTP_SCRIPT_INFO_END);
+  WSContentSendStyle();
+
+  WSContentSend_P(PSTR("<style>td{padding:0px 5px;}</style>"
+                       "<div id='i' name='i'></div>"));
+
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+#endif
+
+
+
+void HandleUpgradeFirmware(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE);
+
+  WSContentStart_P(S_FIRMWARE_UPGRADE);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_UPG, SettingsText(SET_OTAURL));
+  WSContentSend_P(HTTP_FORM_RST_UPG, D_UPGRADE);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  Web.upload_error = 0;
+  Web.upload_file_type = UPL_TASMOTA;
+}
+
+void HandleUpgradeFirmwareStart(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  char command[TOPSZ + 10];
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED));
+  WifiConfigCounter();
+
+  char otaurl[TOPSZ];
+  WebGetArg("o", otaurl, sizeof(otaurl));
+  if (strlen(otaurl)) {
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_OTAURL " %s"), otaurl);
+    ExecuteWebCommand(command, SRC_WEBGUI);
+  }
+
+  WSContentStart_P(S_INFORMATION);
+  WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPGRADE_STARTED " ...</b></div>"));
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  snprintf_P(command, sizeof(command), PSTR(D_CMND_UPGRADE " 1"));
+  ExecuteWebCommand(command, SRC_WEBGUI);
+}
+
+void HandleUploadDone(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE));
+
+  char error[100];
+
+  WifiConfigCounter();
+  restart_flag = 0;
+  MqttRetryCounter(0);
+
+  WSContentStart_P(S_INFORMATION);
+  if (!Web.upload_error) {
+    WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
+  }
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
+  if (Web.upload_error) {
+    WSContentSend_P(PSTR("%06x'>" D_FAILED "</font></b><br><br>"), WebColor(COL_TEXT_WARNING));
+#ifdef USE_RF_FLASH
+    if (Web.upload_error < 15) {
+#else
+    if ((Web.upload_error < 10) || (14 == Web.upload_error)) {
+      if (14 == Web.upload_error) { Web.upload_error = 10; }
+#endif
+      GetTextIndexed(error, sizeof(error), Web.upload_error -1, kUploadErrors);
+    } else {
+      snprintf_P(error, sizeof(error), PSTR(D_UPLOAD_ERROR_CODE " %d"), Web.upload_error);
+    }
+    WSContentSend_P(error);
+    DEBUG_CORE_LOG(PSTR("UPL: %s"), error);
+    stop_flash_rotate = Settings.flag.stop_flash_rotate;
+  } else {
+    WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br>"), WebColor(COL_TEXT_SUCCESS));
+    WSContentSend_P(HTTP_MSG_RSTRT);
+    ShowWebSource(SRC_WEBGUI);
+#ifdef USE_TASMOTA_SLAVE
+    if (TasmotaSlave_GetFlagFlashing()) {
+      restart_flag = 0;
+    } else {
+      restart_flag = 2;
+    }
+#else
+    restart_flag = 2;
+#endif
+  }
+  SettingsBufferFree();
+  WSContentSend_P(PSTR("</div><br>"));
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+#ifdef USE_TASMOTA_SLAVE
+  if (TasmotaSlave_GetFlagFlashing()) {
+    TasmotaSlave_Flash();
+  }
+#endif
+}
+
+void HandleUploadLoop(void)
+{
+
+  bool _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level);
+
+  if (HTTP_USER == Web.state) { return; }
+  if (Web.upload_error) {
+    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
+    return;
+  }
+
+  HTTPUpload& upload = WebServer->upload();
+
+  if (UPLOAD_FILE_START == upload.status) {
+    restart_flag = 60;
+    if (0 == upload.filename.c_str()[0]) {
+      Web.upload_error = 1;
+      return;
+    }
+    SettingsSave(1);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s ..."), upload.filename.c_str());
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (!SettingsBufferAlloc()) {
+        Web.upload_error = 2;
+        return;
+      }
+    } else {
+      MqttRetryCounter(60);
+#ifdef USE_EMULATION
+      UdpDisconnect();
+#endif
+#ifdef USE_ARILUX_RF
+      AriluxRfDisable();
+#endif
+      if (Settings.flag.mqtt_enabled) {
+        MqttDisconnect();
+      }
+      uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+      if (!Update.begin(maxSketchSpace)) {
+
+
+
+
+
+
+        Web.upload_error = 2;
+        return;
+      }
+    }
+    Web.upload_progress_dot_count = 0;
+  } else if (!Web.upload_error && (UPLOAD_FILE_WRITE == upload.status)) {
+    if (0 == upload.totalSize) {
+      if (UPL_SETTINGS == Web.upload_file_type) {
+        Web.config_block_count = 0;
+      }
+      else {
+#ifdef USE_RF_FLASH
+        if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) {
+          Update.end();
+          Web.upload_file_type = UPL_EFM8BB1;
+
+          Web.upload_error = SnfBrUpdateInit();
+          if (Web.upload_error != 0) { return; }
+        } else
+#endif
+#ifdef USE_TASMOTA_SLAVE
+        if ((WEMOS == my_module_type) && (upload.buf[0] == ':')) {
+          Update.end();
+          Web.upload_file_type = UPL_TASMOTASLAVE;
+          Web.upload_error = TasmotaSlave_UpdateInit();
+          if (Web.upload_error != 0) { return; }
+        } else
+#endif
+        {
+          if ((upload.buf[0] != 0xE9) && (upload.buf[0] != 0x1F)) {
+            Web.upload_error = 3;
+            return;
+          }
+          if (0xE9 == upload.buf[0]) {
+            uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
+            if (bin_flash_size > ESP.getFlashChipRealSize()) {
+              Web.upload_error = 4;
+              return;
+            }
+
+          }
+        }
+      }
+    }
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (!Web.upload_error) {
+        if (upload.currentSize > (sizeof(Settings) - (Web.config_block_count * HTTP_UPLOAD_BUFLEN))) {
+          Web.upload_error = 9;
+          return;
+        }
+        memcpy(settings_buffer + (Web.config_block_count * HTTP_UPLOAD_BUFLEN), upload.buf, upload.currentSize);
+        Web.config_block_count++;
+      }
+    }
+#ifdef USE_RF_FLASH
+    else if (UPL_EFM8BB1 == Web.upload_file_type) {
+      if (efm8bb1_update != nullptr) {
+        ssize_t result = rf_glue_remnant_with_new_data_and_write(efm8bb1_update, upload.buf, upload.currentSize);
+        free(efm8bb1_update);
+        efm8bb1_update = nullptr;
+        if (result != 0) {
+          Web.upload_error = abs(result);
+          return;
+        }
+      }
+      ssize_t result = rf_search_and_write(upload.buf, upload.currentSize);
+      if (result < 0) {
+        Web.upload_error = abs(result);
+        return;
+      } else if (result > 0) {
+        if ((size_t)result > upload.currentSize) {
+
+          Web.upload_error = 9;
+          return;
+        }
+
+        size_t remnant_sz = upload.currentSize - result;
+        efm8bb1_update = (uint8_t *) malloc(remnant_sz + 1);
+        if (efm8bb1_update == nullptr) {
+          Web.upload_error = 2;
+          return;
+        }
+        memcpy(efm8bb1_update, upload.buf + result, remnant_sz);
+
+        efm8bb1_update[remnant_sz] = '\0';
+      }
+    }
+#endif
+#ifdef USE_TASMOTA_SLAVE
+    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
+      TasmotaSlave_WriteBuffer(upload.buf, upload.currentSize);
+    }
+#endif
+    else {
+      if (!Web.upload_error && (Update.write(upload.buf, upload.currentSize) != upload.currentSize)) {
+        Web.upload_error = 5;
+        return;
+      }
+      if (_serialoutput) {
+        Serial.printf(".");
+        Web.upload_progress_dot_count++;
+        if (!(Web.upload_progress_dot_count % 80)) { Serial.println(); }
+      }
+    }
+  } else if(!Web.upload_error && (UPLOAD_FILE_END == upload.status)) {
+    if (_serialoutput && (Web.upload_progress_dot_count % 80)) {
+      Serial.println();
+    }
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (Web.config_xor_on_set) {
+        for (uint32_t i = 2; i < sizeof(Settings); i++) {
+          settings_buffer[i] ^= (Web.config_xor_on_set +i);
+        }
+      }
+      bool valid_settings = false;
+      unsigned long buffer_version = settings_buffer[11] << 24 | settings_buffer[10] << 16 | settings_buffer[9] << 8 | settings_buffer[8];
+      if (buffer_version > 0x06000000) {
+        uint32_t buffer_size = settings_buffer[3] << 8 | settings_buffer[2];
+        if (buffer_version > 0x0606000A) {
+          uint32_t buffer_crc32 = settings_buffer[4095] << 24 | settings_buffer[4094] << 16 | settings_buffer[4093] << 8 | settings_buffer[4092];
+          valid_settings = (GetCfgCrc32(settings_buffer, buffer_size -4) == buffer_crc32);
+        } else {
+          uint16_t buffer_crc16 = settings_buffer[15] << 8 | settings_buffer[14];
+          valid_settings = (GetCfgCrc16(settings_buffer, buffer_size) == buffer_crc16);
+        }
+      } else {
+        valid_settings = (settings_buffer[0] == CONFIG_FILE_SIGN);
+      }
+      if (valid_settings) {
+        SettingsDefaultSet2();
+        memcpy((char*)&Settings +16, settings_buffer +16, sizeof(Settings) -16);
+        Settings.version = buffer_version;
+        SettingsBufferFree();
+      } else {
+        Web.upload_error = 8;
+        return;
+      }
+    }
+#ifdef USE_RF_FLASH
+    else if (UPL_EFM8BB1 == Web.upload_file_type) {
+
+      Web.upload_file_type = UPL_TASMOTA;
+    }
+#endif
+#ifdef USE_TASMOTA_SLAVE
+    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
+
+      TasmotaSlave_SetFlagFlashing(true);
+      Web.upload_file_type = UPL_TASMOTA;
+    }
+#endif
+    else {
+      if (!Update.end(true)) {
+        if (_serialoutput) { Update.printError(Serial); }
+        Web.upload_error = 6;
+        return;
+      }
+      if (!VersionCompatible()) {
+        Web.upload_error = 14;
+        return;
+      }
+    }
+    if (!Web.upload_error) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_SUCCESSFUL " %u bytes. " D_RESTARTING), upload.totalSize);
+    }
+  } else if (UPLOAD_FILE_ABORTED == upload.status) {
+    restart_flag = 0;
+    MqttRetryCounter(0);
+    Web.upload_error = 7;
+    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
+  }
+  delay(0);
+}
+
+
+
+void HandlePreflightRequest(void)
+{
+  HttpHeaderCors();
+  WebServer->sendHeader(F("Access-Control-Allow-Methods"), F("GET, POST"));
+  WebServer->sendHeader(F("Access-Control-Allow-Headers"), F("authorization"));
+  WSSend(200, CT_HTML, "");
+}
+
+
+
+void HandleHttpCommand(void)
+{
+  if (!HttpCheckPriviledgedAccess(false)) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND));
+
+  bool valid = true;
+  if (strlen(SettingsText(SET_WEBPWD))) {
+    char tmp1[33];
+    WebGetArg("user", tmp1, sizeof(tmp1));
+    char tmp2[strlen(SettingsText(SET_WEBPWD)) +1];
+    WebGetArg("password", tmp2, sizeof(tmp2));
+    if (!(!strcmp(tmp1, WEB_USERNAME) && !strcmp(tmp2, SettingsText(SET_WEBPWD)))) { valid = false; }
+  }
+
+  WSContentBegin(200, CT_JSON);
+  if (valid) {
+    uint32_t curridx = web_log_index;
+    String svalue = WebServer->arg("cmnd");
+    if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
+      ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCOMMAND);
+      if (web_log_index != curridx) {
+        uint32_t counter = curridx;
+        WSContentSend_P(PSTR("{"));
+        bool cflg = false;
+        do {
+          char* tmp;
+          size_t len;
+          GetLog(counter, &tmp, &len);
+          if (len) {
+
+            char* JSON = (char*)memchr(tmp, '{', len);
+            if (JSON) {
+              size_t JSONlen = len - (JSON - tmp);
+              if (JSONlen > sizeof(mqtt_data)) { JSONlen = sizeof(mqtt_data); }
+              char stemp[JSONlen];
+              strlcpy(stemp, JSON +1, JSONlen -2);
+              WSContentSend_P(PSTR("%s%s"), (cflg) ? "," : "", stemp);
+              cflg = true;
+            }
+          }
+          counter++;
+          counter &= 0xFF;
+          if (!counter) counter++;
+        } while (counter != web_log_index);
+        WSContentSend_P(PSTR("}"));
+      } else {
+        WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENABLE_WEBLOG_FOR_RESPONSE "\"}"));
+      }
+    } else {
+      WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENTER_COMMAND " cmnd=\"}"));
+    }
+  } else {
+    WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_NEED_USER_AND_PASSWORD "\"}"));
+  }
+  WSContentEnd();
+}
+
+
+
+void HandleConsole(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("c2")) {
+    HandleConsoleRefresh();
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE);
+
+  WSContentStart_P(S_CONSOLE);
+  WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings.web_refresh);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_CMND);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+
+void HandleConsoleRefresh(void)
+{
+  bool cflg = true;
+  uint32_t counter = 0;
+
+  String svalue = WebServer->arg("c1");
+  if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), svalue.c_str());
+    ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCONSOLE);
+  }
+
+  char stmp[8];
+  WebGetArg("c2", stmp, sizeof(stmp));
+  if (strlen(stmp)) { counter = atoi(stmp); }
+
+  WSContentBegin(200, CT_PLAIN);
+  WSContentSend_P(PSTR("%d}1%d}1"), web_log_index, Web.reset_web_log_flag);
+  if (!Web.reset_web_log_flag) {
+    counter = 0;
+    Web.reset_web_log_flag = true;
+  }
+  if (counter != web_log_index) {
+    if (!counter) {
+      counter = web_log_index;
+      cflg = false;
+    }
+    do {
+      char* tmp;
+      size_t len;
+      GetLog(counter, &tmp, &len);
+      if (len) {
+        if (len > sizeof(mqtt_data) -2) { len = sizeof(mqtt_data); }
+        char stemp[len +1];
+        strlcpy(stemp, tmp, len);
+        WSContentSend_P(PSTR("%s%s"), (cflg) ? "\n" : "", stemp);
+        cflg = true;
+      }
+      counter++;
+      counter &= 0xFF;
+      if (!counter) { counter++; }
+    } while (counter != web_log_index);
+  }
+  WSContentSend_P(PSTR("}1"));
+  WSContentEnd();
+}
+
+
+
+void HandleNotFound(void)
+{
+
+
+  if (CaptivePortal()) { return; }
+
+#ifdef USE_EMULATION
+#ifdef USE_EMULATION_HUE
+  String path = WebServer->uri();
+  if ((EMUL_HUE == Settings.flag2.emulation) && (path.startsWith("/api"))) {
+    HandleHueApi(&path);
+  } else
+#endif
+#endif
+  {
+    WSContentBegin(404, CT_PLAIN);
+    WSContentSend_P(PSTR(D_FILE_NOT_FOUND "\n\nURI: %s\nMethod: %s\nArguments: %d\n"), WebServer->uri().c_str(), (WebServer->method() == HTTP_GET) ? "GET" : "POST", WebServer->args());
+    for (uint32_t i = 0; i < WebServer->args(); i++) {
+      WSContentSend_P(PSTR(" %s: %s\n"), WebServer->argName(i).c_str(), WebServer->arg(i).c_str());
+    }
+    WSContentEnd();
+  }
+}
+
+
+bool CaptivePortal(void)
+{
+
+  if ((WifiIsInManagerMode()) && !ValidIpAddress(WebServer->hostHeader().c_str())) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_REDIRECTED));
+
+    WebServer->sendHeader(F("Location"), String("http://") + WebServer->client().localIP().toString(), true);
+    WSSend(302, CT_PLAIN, "");
+    WebServer->client().stop();
+    return true;
+  }
+  return false;
+}
+
+
+
+String UrlEncode(const String& text)
+{
+  const char hex[] = "0123456789ABCDEF";
+
+ String encoded = "";
+ int len = text.length();
+ int i = 0;
+ while (i < len) {
+  char decodedChar = text.charAt(i++);
+# 2672 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
+    if ((' ' == decodedChar) || ('+' == decodedChar)) {
+      encoded += '%';
+   encoded += hex[decodedChar >> 4];
+   encoded += hex[decodedChar & 0xF];
+    } else {
+      encoded += decodedChar;
+    }
+
+ }
+ return encoded;
+}
+
+int WebSend(char *buffer)
+{
+
+
+
+
+
+  char *host;
+  char *user;
+  char *password;
+  char *command;
+  int status = 1;
+
+
+  host = strtok_r(buffer, "]", &command);
+  if (host && command) {
+    RemoveSpace(host);
+    host++;
+    host = strtok_r(host, ",", &user);
+    String url = F("http://");
+    url += host;
+
+    command = Trim(command);
+    if (command[0] != '/') {
+      url += F("/cm?");
+      if (user) {
+        user = strtok_r(user, ":", &password);
+        if (user && password) {
+          char userpass[200];
+          snprintf_P(userpass, sizeof(userpass), PSTR("user=%s&password=%s&"), user, password);
+          url += userpass;
+        }
+      }
+      url += F("cmnd=");
+    }
+    url += command;
+
+    DEBUG_CORE_LOG(PSTR("WEB: Uri |%s|"), url.c_str());
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+    HTTPClient http;
+    if (http.begin(UrlEncode(url))) {
+#else
+    WiFiClient http_client;
+    HTTPClient http;
+    if (http.begin(http_client, UrlEncode(url))) {
+#endif
+      int http_code = http.GET();
+      if (http_code > 0) {
+        if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) {
+#ifdef USE_WEBSEND_RESPONSE
+
+          const char* read = http.getString().c_str();
+          uint32_t j = 0;
+          char text = '.';
+          while (text != '\0') {
+            text = *read++;
+            if (text > 31) {
+              mqtt_data[j++] = text;
+              if (j == sizeof(mqtt_data) -2) { break; }
+            }
+          }
+          mqtt_data[j] = '\0';
+          MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WEBSEND));
+#ifdef USE_SCRIPT
+extern uint8_t tasm_cmd_activ;
+
+          tasm_cmd_activ=0;
+          XdrvRulesProcess();
+#endif
+#endif
+        }
+        status = 0;
+      } else {
+        status = 2;
+      }
+      http.end();
+    } else {
+      status = 3;
+    }
+  }
+  return status;
+}
+
+bool JsonWebColor(const char* dataBuf)
+{
+
+
+
+
+
+  char dataBufLc[strlen(dataBuf) +1];
+  LowerCase(dataBufLc, dataBuf);
+  RemoveSpace(dataBufLc);
+  if (strlen(dataBufLc) < 9) { return false; }
+
+  StaticJsonBuffer<450> jb;
+  JsonObject& obj = jb.parseObject(dataBufLc);
+  if (!obj.success()) { return false; }
+
+  char parm_lc[10];
+  if (obj[LowerCase(parm_lc, D_CMND_WEBCOLOR)].success()) {
+    for (uint32_t i = 0; i < COL_LAST; i++) {
+      const char* color = obj[parm_lc][i];
+      if (color != nullptr) {
+        WebHexCode(i, color);
+      }
+    }
+  }
+  return true;
+}
+
+const char kWebSendStatus[] PROGMEM = D_JSON_DONE "|" D_JSON_WRONG_PARAMETERS "|" D_JSON_CONNECT_FAILED "|" D_JSON_HOST_NOT_FOUND "|" D_JSON_MEMORY_ERROR;
+
+const char kWebCommands[] PROGMEM = "|"
+#ifdef USE_EMULATION
+  D_CMND_EMULATION "|"
+#endif
+#ifdef USE_SENDMAIL
+  D_CMND_SENDMAIL "|"
+#endif
+  D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_WEBREFRESH "|" D_CMND_WEBSEND "|" D_CMND_WEBCOLOR "|"
+  D_CMND_WEBSENSOR "|" D_CMND_WEBBUTTON "|" D_CMND_CORS;
+
+void (* const WebCommand[])(void) PROGMEM = {
+#ifdef USE_EMULATION
+  &CmndEmulation,
+#endif
+#ifdef USE_SENDMAIL
+  &CmndSendmail,
+#endif
+  &CmndWebServer, &CmndWebPassword, &CmndWeblog, &CmndWebRefresh, &CmndWebSend, &CmndWebColor,
+  &CmndWebSensor, &CmndWebButton, &CmndCors };
+
+
+
+
+
+#ifdef USE_EMULATION
+void CmndEmulation(void)
+{
+#if defined(USE_EMULATION_WEMO) && defined(USE_EMULATION_HUE)
+  if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
+#else
+#ifndef USE_EMULATION_WEMO
+  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_HUE == XdrvMailbox.payload)) {
+#endif
+#ifndef USE_EMULATION_HUE
+  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_WEMO == XdrvMailbox.payload)) {
+#endif
+#endif
+    Settings.flag2.emulation = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  ResponseCmndNumber(Settings.flag2.emulation);
+}
+#endif
+
+#ifdef USE_SENDMAIL
+void CmndSendmail(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    uint8_t result = SendMail(XdrvMailbox.data);
+    char stemp1[20];
+    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
+  }
+}
+#endif
+
+
+void CmndWebServer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    Settings.webserver = XdrvMailbox.payload;
+  }
+  if (Settings.webserver) {
+    Response_P(PSTR("{\"" D_CMND_WEBSERVER "\":\"" D_JSON_ACTIVE_FOR " %s " D_JSON_ON_DEVICE " %s " D_JSON_WITH_IP_ADDRESS " %s\"}"),
+      (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
+  } else {
+    ResponseCmndStateText(0);
+  }
+}
+
+void CmndWebPassword(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_WEBPWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
+    ResponseCmndChar(SettingsText(SET_WEBPWD));
+  } else {
+    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
+  }
+}
+
+void CmndWeblog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.weblog_level = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.weblog_level);
+}
+
+void CmndWebRefresh(void)
+{
+  if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload <= 10000)) {
+    Settings.web_refresh = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.web_refresh);
+}
+
+void CmndWebSend(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    uint32_t result = WebSend(XdrvMailbox.data);
+    char stemp1[20];
+    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
+  }
+}
+
+void CmndWebColor(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      if ((XdrvMailbox.data_len > 3) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= COL_LAST)) {
+        WebHexCode(XdrvMailbox.index -1, XdrvMailbox.data);
+      }
+      else if (0 == XdrvMailbox.payload) {
+        SettingsDefaultWebColor();
+      }
+    }
+    else {
+      JsonWebColor(XdrvMailbox.data);
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_WEBCOLOR "\":["));
+  for (uint32_t i = 0; i < COL_LAST; i++) {
+    if (i) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(PSTR("\"#%06x\""), WebColor(i));
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+void CmndWebSensor(void)
+{
+  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_WEBSENSOR "\":"));
+  XsnsSensorState();
+  ResponseJsonEnd();
+}
+
+void CmndWebButton(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_BUTTON_TEXT)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_BUTTON1, MAX_BUTTON_TEXT);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(SET_BUTTON1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_BUTTON1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndCors(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_CORS, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_CORS));
+}
+
+
+
+
+
+bool Xdrv01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      PollDnsWebserver();
+#ifdef USE_EMULATION
+      if (Settings.flag2.emulation) { PollUdp(); }
+#endif
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kWebCommands, WebCommand);
+      break;
+  }
+  return result;
+}
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
+#define XDRV_02 2
+
+
+
+#ifdef USE_MQTT_TLS
+  #include "WiFiClientSecureLightBearSSL.h"
+  BearSSL::WiFiClientSecure_light *tlsClient;
+#else
+  WiFiClient EspClient;
+#endif
+
+const char kMqttCommands[] PROGMEM = "|"
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  D_CMND_MQTTFINGERPRINT "|"
+#endif
+  D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|"
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  D_CMND_TLSKEY "|"
+#endif
+  D_CMND_MQTTHOST "|" D_CMND_MQTTPORT "|" D_CMND_MQTTRETRY "|" D_CMND_STATETEXT "|" D_CMND_MQTTCLIENT "|"
+  D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|"
+  D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ;
+
+void (* const MqttCommand[])(void) PROGMEM = {
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  &CmndMqttFingerprint,
+#endif
+  &CmndMqttUser, &CmndMqttPassword,
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  &CmndTlsKey,
+#endif
+  &CmndMqttHost, &CmndMqttPort, &CmndMqttRetry, &CmndStateText, &CmndMqttClient,
+  &CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog,
+  &CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain, &CmndSensorRetain };
+
+struct MQTT {
+  uint16_t connect_count = 0;
+  uint16_t retry_counter = 1;
+  uint8_t initial_connection_state = 2;
+  bool connected = false;
+  bool allowed = false;
+} Mqtt;
+
+#ifdef USE_MQTT_TLS
+
+#ifdef USE_MQTT_AWS_IOT
+#include <base64.hpp>
+
+const br_ec_private_key *AWS_IoT_Private_Key = nullptr;
+const br_x509_certificate *AWS_IoT_Client_Certificate = nullptr;
+
+class tls_entry_t {
+public:
+  uint32_t name;
+  uint16_t start;
+  uint16_t len;
+};
+
+const static uint32_t TLS_NAME_SKEY = 0x2079656B;
+const static uint32_t TLS_NAME_CRT = 0x20747263;
+
+class tls_dir_t {
+public:
+  tls_entry_t entry[4];
+};
+
+tls_dir_t tls_dir;
+
+#endif
+
+
+
+
+bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value) {
+ for (uint32_t i = 0; i<20; i++) {
+  if (finger[i] != value) {
+   return false;
+  }
+ }
+ return true;
+}
+#endif
+
+void MakeValidMqtt(uint32_t option, char* str)
+{
+
+
+  uint32_t i = 0;
+  while (str[i] > 0) {
+
+    if ((str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
+      if (option) {
+        uint32_t j = i;
+        while (str[j] > 0) {
+          str[j] = str[j +1];
+          j++;
+        }
+        i--;
+      } else {
+        str[i] = '_';
+      }
+    }
+    i++;
+  }
+}
+
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+void MqttDiscoverServer(void)
+{
+  if (!Wifi.mdns_begun) { return; }
+
+  int n = MDNS.queryService("mqtt", "tcp");
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
+
+  if (n > 0) {
+    uint32_t i = 0;
+#ifdef MDNS_HOSTNAME
+    for (i = n; i > 0; i--) {
+      if (!strcmp(MDNS.hostname(i).c_str(), MDNS_HOSTNAME)) {
+        break;
+      }
+    }
+#endif
+    SettingsUpdateText(SET_MQTT_HOST, MDNS.IP(i).toString().c_str());
+    Settings.mqtt_port = MDNS.port(i);
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"), MDNS.hostname(i).c_str(), SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
+  }
+}
+#endif
+#endif
+# 163 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
+#include <PubSubClient.h>
+
+
+#if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MIN_MESSZ
+  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1200"
+#endif
+
+#ifdef USE_MQTT_TLS
+PubSubClient MqttClient;
+#else
+PubSubClient MqttClient(EspClient);
+#endif
+
+void MqttInit(void)
+{
+#ifdef USE_MQTT_TLS
+  tlsClient = new BearSSL::WiFiClientSecure_light(1024,1024);
+
+#ifdef USE_MQTT_AWS_IOT
+  loadTlsDir();
+  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
+                             AWS_IoT_Private_Key,
+                             0xFFFF , 0);
+#endif
+
+#ifdef USE_MQTT_TLS_CA_CERT
+#ifdef USE_MQTT_AWS_IOT
+  tlsClient->setTrustAnchor(&AmazonRootCA1_TA);
+#else
+  tlsClient->setTrustAnchor(&LetsEncryptX3CrossSigned_TA);
+#endif
+#endif
+
+  MqttClient.setClient(*tlsClient);
+#endif
+}
+
+bool MqttIsConnected(void)
+{
+  return MqttClient.connected();
+}
+
+void MqttDisconnect(void)
+{
+  MqttClient.disconnect();
+}
+
+void MqttSubscribeLib(const char *topic)
+{
+  MqttClient.subscribe(topic);
+  MqttClient.loop();
+}
+
+void MqttUnsubscribeLib(const char *topic)
+{
+  MqttClient.unsubscribe(topic);
+  MqttClient.loop();
+}
+
+bool MqttPublishLib(const char* topic, bool retained)
+{
+
+  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
+    char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
+    if (str == topic) {
+      mqtt_cmnd_blocked_reset = 4;
+      mqtt_cmnd_blocked++;
+    }
+  }
+
+  bool result = MqttClient.publish(topic, mqtt_data, retained);
+  yield();
+  return result;
+}
+
+void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("MqttDataHandler"));
+#endif
+
+
+  if (data_len >= MQTT_MAX_PACKET_SIZE) { return; }
+
+
+  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
+    char *str = strstr(mqtt_topic, SettingsText(SET_MQTTPREFIX1));
+    if ((str == mqtt_topic) && mqtt_cmnd_blocked) {
+      mqtt_cmnd_blocked--;
+      return;
+    }
+  }
+
+
+  char topic[TOPSZ];
+  strlcpy(topic, mqtt_topic, sizeof(topic));
+  mqtt_data[data_len] = 0;
+  char data[data_len +1];
+  memcpy(data, mqtt_data, sizeof(data));
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_MQTT D_RECEIVED_TOPIC " \"%s\", " D_DATA_SIZE " %d, " D_DATA " \"%s\""), topic, data_len, data);
+
+
+
+  XdrvMailbox.index = strlen(topic);
+  XdrvMailbox.data_len = data_len;
+  XdrvMailbox.topic = topic;
+  XdrvMailbox.data = (char*)data;
+  if (XdrvCall(FUNC_MQTT_DATA)) { return; }
+
+  ShowSource(SRC_MQTT);
+
+  CommandHandler(topic, data, data_len);
+}
+
+
+
+void MqttRetryCounter(uint8_t value)
+{
+  Mqtt.retry_counter = value;
+}
+
+void MqttSubscribe(const char *topic)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_SUBSCRIBE_TO " %s"), topic);
+  MqttSubscribeLib(topic);
+}
+
+void MqttUnsubscribe(const char *topic)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_UNSUBSCRIBE_FROM " %s"), topic);
+  MqttUnsubscribeLib(topic);
+}
+
+void MqttPublishLogging(const char *mxtime)
+{
+  char saved_mqtt_data[strlen(mqtt_data) +1];
+  memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
+
+
+  Response_P(PSTR("%s%s"), mxtime, log_data);
+  char stopic[TOPSZ];
+  GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
+  MqttPublishLib(stopic, false);
+
+  memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
+}
+
+void MqttPublish(const char* topic, bool retained)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("MqttPublish"));
+#endif
+
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT) || defined(MQTT_NO_RETAIN)
+
+
+
+  retained = false;
+#endif
+
+  char sretained[CMDSZ];
+  sretained[0] = '\0';
+  char slog_type[20];
+  snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
+
+  if (Settings.flag.mqtt_enabled) {
+    if (MqttPublishLib(topic, retained)) {
+      snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
+      if (retained) {
+        snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
+      }
+    }
+  }
+
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s = %s"), slog_type, (Settings.flag.mqtt_enabled) ? topic : strrchr(topic,'/')+1, mqtt_data);
+  if (strlen(log_data) >= (sizeof(log_data) - strlen(sretained) -1)) {
+    log_data[sizeof(log_data) - strlen(sretained) -5] = '\0';
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s ..."), log_data);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s"), log_data, sretained);
+  AddLog(LOG_LEVEL_INFO);
+
+  if (Settings.ledstate &0x04) {
+    blinks++;
+  }
+}
+
+void MqttPublish(const char* topic)
+{
+  MqttPublish(topic, false);
+}
+
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained)
+{
+
+
+
+
+
+
+
+  char romram[64];
+  char stopic[TOPSZ];
+
+  snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic);
+  for (uint32_t i = 0; i < strlen(romram); i++) {
+    romram[i] = toupper(romram[i]);
+  }
+  prefix &= 3;
+  GetTopic_P(stopic, prefix, mqtt_topic, romram);
+  MqttPublish(stopic, retained);
+
+#ifdef USE_MQTT_AWS_IOT
+  if ((prefix > 0) && (Settings.flag4.awsiot_shadow)) {
+
+    char *topic = SettingsText(SET_MQTT_TOPIC);
+    char topic2[strlen(topic)+1];
+    strcpy(topic2, topic);
+
+    char *s = topic2;
+    while (*s) {
+      if ('/' == *s) {
+        *s = '_';
+      }
+      s++;
+    }
+
+    snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
+
+
+    char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
+    if (!mqtt_save) { return; }
+    strcpy(mqtt_save, mqtt_data);
+    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"state\":{\"reported\":%s}}"), mqtt_save);
+    free(mqtt_save);
+
+    bool result = MqttClient.publish(romram, mqtt_data, false);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
+    yield();
+  }
+#endif
+}
+
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)
+{
+  MqttPublishPrefixTopic_P(prefix, subtopic, false);
+}
+
+void MqttPublishTeleSensor(void)
+{
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+  XdrvRulesProcess();
+}
+
+void MqttPublishPowerState(uint32_t device)
+{
+  char stopic[TOPSZ];
+  char scommand[33];
+
+  if ((device < 1) || (device > devices_present)) { device = 1; }
+
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan() && (device > 1)) {
+    if (GetFanspeed() < MaxFanspeed()) {
+#ifdef USE_DOMOTICZ
+      DomoticzUpdateFanState();
+#endif
+      snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED));
+      GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
+      Response_P(S_JSON_COMMAND_NVALUE, scommand, GetFanspeed());
+      MqttPublish(stopic);
+    }
+  } else {
+#endif
+    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable);
+    GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
+    Response_P(S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1)));
+    MqttPublish(stopic);
+
+    GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+    Response_P(GetStateText(bitRead(power, device -1)));
+    MqttPublish(stopic, Settings.flag.mqtt_power_retain);
+#ifdef USE_SONOFF_IFAN
+  }
+#endif
+}
+
+void MqttPublishAllPowerState(void)
+{
+  for (uint32_t i = 1; i <= devices_present; i++) {
+    MqttPublishPowerState(i);
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) { break; }
+#endif
+  }
+}
+
+void MqttPublishPowerBlinkState(uint32_t device)
+{
+  char scommand[33];
+
+  if ((device < 1) || (device > devices_present)) {
+    device = 1;
+  }
+  Response_P(PSTR("{\"%s\":\"" D_JSON_BLINK " %s\"}"),
+    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable), GetStateText(bitRead(blink_mask, device -1)));
+
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, S_RSLT_POWER);
+}
+
+
+
+uint16_t MqttConnectCount(void)
+{
+  return Mqtt.connect_count;
+}
+
+void MqttDisconnected(int state)
+{
+  Mqtt.connected = false;
+  Mqtt.retry_counter = Settings.mqtt_retry;
+
+  MqttClient.disconnect();
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), SettingsText(SET_MQTT_HOST), Settings.mqtt_port, state, Mqtt.retry_counter);
+  rules_flag.mqtt_disconnected = 1;
+}
+
+void MqttConnected(void)
+{
+  char stopic[TOPSZ];
+
+  if (Mqtt.allowed) {
+    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED));
+    Mqtt.connected = true;
+    Mqtt.retry_counter = 0;
+    Mqtt.connect_count++;
+
+    GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
+    Response_P(PSTR(D_ONLINE));
+    MqttPublish(stopic, true);
+
+
+    mqtt_data[0] = '\0';
+    MqttPublishPrefixTopic_P(CMND, S_RSLT_POWER);
+
+    GetTopic_P(stopic, CMND, mqtt_topic, PSTR("#"));
+    MqttSubscribe(stopic);
+    if (strstr_P(SettingsText(SET_MQTT_FULLTOPIC), MQTT_TOKEN_TOPIC) != nullptr) {
+      GetGroupTopic_P(stopic, PSTR("#"));
+      MqttSubscribe(stopic);
+      GetFallbackTopic_P(stopic, PSTR("#"));
+      MqttSubscribe(stopic);
+    }
+
+    XdrvCall(FUNC_MQTT_SUBSCRIBE);
+  }
+
+  if (Mqtt.initial_connection_state) {
+    char stopic2[TOPSZ];
+    Response_P(PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"),
+      ModuleName().c_str(), my_version, my_image, GetFallbackTopic_P(stopic, ""), GetGroupTopic_P(stopic2, ""));
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "1"));
+#ifdef USE_WEBSERVER
+    if (Settings.webserver) {
+#if LWIP_IPV6
+      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"IPv6Address\":\"%s\"}"),
+        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str(),WifiGetIPv6().c_str());
+#else
+      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\"}"),
+        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
+#endif
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "2"));
+    }
+#endif
+    Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":"));
+    if (CrashFlag()) {
+      CrashDump();
+    } else {
+      ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str());
+    }
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "3"));
+    MqttPublishAllPowerState();
+    if (Settings.tele_period) {
+      tele_period = Settings.tele_period -5;
+    }
+    rules_flag.system_boot = 1;
+    XdrvCall(FUNC_MQTT_INIT);
+  }
+  Mqtt.initial_connection_state = 0;
+
+  global_state.mqtt_down = 0;
+  if (Settings.flag.mqtt_enabled) {
+    rules_flag.mqtt_connected = 1;
+  }
+}
+
+void MqttReconnect(void)
+{
+  char stopic[TOPSZ];
+
+  Mqtt.allowed = Settings.flag.mqtt_enabled;
+  if (Mqtt.allowed) {
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+    MqttDiscoverServer();
+#endif
+#endif
+    if (!strlen(SettingsText(SET_MQTT_HOST)) || !Settings.mqtt_port) {
+      Mqtt.allowed = false;
+    }
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+    if (!AWS_IoT_Private_Key || !AWS_IoT_Client_Certificate) {
+      Mqtt.allowed = false;
+    }
+#endif
+  }
+  if (!Mqtt.allowed) {
+    MqttConnected();
+    return;
+  }
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif
+
+  AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_ATTEMPTING_CONNECTION));
+
+  Mqtt.connected = false;
+  Mqtt.retry_counter = Settings.mqtt_retry;
+  global_state.mqtt_down = 1;
+
+  char *mqtt_user = nullptr;
+  char *mqtt_pwd = nullptr;
+  if (strlen(SettingsText(SET_MQTT_USER))) {
+    mqtt_user = SettingsText(SET_MQTT_USER);
+  }
+  if (strlen(SettingsText(SET_MQTT_PWD))) {
+    mqtt_pwd = SettingsText(SET_MQTT_PWD);
+  }
+
+  GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
+  Response_P(S_OFFLINE);
+
+  if (MqttClient.connected()) { MqttClient.disconnect(); }
+#ifdef USE_MQTT_TLS
+  tlsClient->stop();
+#else
+  EspClient = WiFiClient();
+  MqttClient.setClient(EspClient);
+#endif
+
+  if (2 == Mqtt.initial_connection_state) {
+    Mqtt.initial_connection_state = 1;
+  }
+
+  MqttClient.setCallback(MqttDataHandler);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
+                             AWS_IoT_Private_Key,
+                             0xFFFF , 0);
+#endif
+  MqttClient.setServer(SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
+
+  uint32_t mqtt_connect_time = millis();
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  bool allow_all_fingerprints = false;
+  bool learn_fingerprint1 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0x00);
+  bool learn_fingerprint2 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0x00);
+  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0xff);
+  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0xff);
+  allow_all_fingerprints |= learn_fingerprint1;
+  allow_all_fingerprints |= learn_fingerprint2;
+  tlsClient->setPubKeyFingerprint(Settings.mqtt_fingerprint[0], Settings.mqtt_fingerprint[1], allow_all_fingerprints);
+#endif
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "AWS IoT endpoint: %s"), SettingsText(SET_MQTT_HOST));
+  if (MqttClient.connect(mqtt_client, nullptr, nullptr, stopic, 1, false, mqtt_data, MQTT_CLEAN_SESSION)) {
+#else
+  if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data, MQTT_CLEAN_SESSION)) {
+#endif
+#ifdef USE_MQTT_TLS
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connected in %d ms, max ThunkStack used %d"),
+      millis() - mqtt_connect_time, tlsClient->getMaxThunkStackUse());
+    if (!tlsClient->getMFLNStatus()) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("MFLN not supported by TLS server"));
+    }
+#ifndef USE_MQTT_TLS_CA_CERT
+
+    char buf_fingerprint[64];
+    ToHex_P((unsigned char *)tlsClient->getRecvPubKeyFingerprint(), 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
+
+    if (learn_fingerprint1 || learn_fingerprint2) {
+
+      bool fingerprint_matched = false;
+      const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
+      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[0], 20)) {
+        fingerprint_matched = true;
+      }
+      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[1], 20)) {
+        fingerprint_matched = true;
+      }
+      if (!fingerprint_matched) {
+
+        if (learn_fingerprint1) {
+          memcpy(Settings.mqtt_fingerprint[0], recv_fingerprint, 20);
+        }
+        if (learn_fingerprint2) {
+          memcpy(Settings.mqtt_fingerprint[1], recv_fingerprint, 20);
+        }
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
+
+        SettingsSaveAll();
+      }
+    }
+#endif
+#endif
+    MqttConnected();
+  } else {
+#ifdef USE_MQTT_TLS
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connection error: %d"), tlsClient->getLastError());
+#endif
+    MqttDisconnected(MqttClient.state());
+  }
+}
+
+void MqttCheck(void)
+{
+  if (Settings.flag.mqtt_enabled) {
+    if (!MqttIsConnected()) {
+      global_state.mqtt_down = 1;
+      if (!Mqtt.retry_counter) {
+        MqttReconnect();
+      } else {
+        Mqtt.retry_counter--;
+      }
+    } else {
+      global_state.mqtt_down = 0;
+    }
+  } else {
+    global_state.mqtt_down = 0;
+    if (Mqtt.initial_connection_state) {
+      MqttReconnect();
+    }
+  }
+}
+
+
+
+
+
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+void CmndMqttFingerprint(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    char fingerprint[60];
+    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(fingerprint))) {
+      strlcpy(fingerprint, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? MQTT_FINGERPRINT1 : MQTT_FINGERPRINT2 : XdrvMailbox.data, sizeof(fingerprint));
+      char *p = fingerprint;
+      for (uint32_t i = 0; i < 20; i++) {
+        Settings.mqtt_fingerprint[XdrvMailbox.index -1][i] = strtol(p, &p, 16);
+      }
+      restart_flag = 2;
+    }
+    ResponseCmndIdxChar(ToHex_P((unsigned char *)Settings.mqtt_fingerprint[XdrvMailbox.index -1], 20, fingerprint, sizeof(fingerprint), ' '));
+  }
+}
+#endif
+
+void CmndMqttUser(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_USER, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_USER : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_USER));
+}
+
+void CmndMqttPassword(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_PWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_PASS : XdrvMailbox.data);
+    ResponseCmndChar(SettingsText(SET_MQTT_PWD));
+    restart_flag = 2;
+  } else {
+    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
+  }
+}
+
+void CmndMqttlog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.mqttlog_level = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.mqttlog_level);
+}
+
+void CmndMqttHost(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_HOST, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_HOST : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_HOST));
+}
+
+void CmndMqttPort(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.mqtt_port = (1 == XdrvMailbox.payload) ? MQTT_PORT : XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  ResponseCmndNumber(Settings.mqtt_port);
+}
+
+void CmndMqttRetry(void)
+{
+  if ((XdrvMailbox.payload >= MQTT_RETRY_SECS) && (XdrvMailbox.payload < 32001)) {
+    Settings.mqtt_retry = XdrvMailbox.payload;
+    Mqtt.retry_counter = Settings.mqtt_retry;
+  }
+  ResponseCmndNumber(Settings.mqtt_retry);
+}
+
+void CmndStateText(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_STATE_TEXT)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STATE_TXT1, MAX_STATE_TEXT);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
+          if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
+        }
+        SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndMqttClient(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    SettingsUpdateText(SET_MQTT_CLIENT, (SC_DEFAULT == Shortcut()) ? MQTT_CLIENT_ID : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_CLIENT));
+}
+
+void CmndFullTopic(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    MakeValidMqtt(1, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    char stemp1[TOPSZ];
+    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1));
+    if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) {
+      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
+      SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp1);
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_FULLTOPIC));
+}
+
+void CmndPrefix(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_MQTT_PREFIXES)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_MQTTPREFIX1, MAX_MQTT_PREFIXES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        MakeValidMqtt(0, XdrvMailbox.data);
+        SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
+          (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndPublish(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    char *payload_part;
+    char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
+    if (mqtt_part) {
+      char stemp1[TOPSZ];
+      strlcpy(stemp1, mqtt_part, sizeof(stemp1));
+      if ((payload_part != nullptr) && strlen(payload_part)) {
+        strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
+      } else {
+        mqtt_data[0] = '\0';
+      }
+      MqttPublish(stemp1, (XdrvMailbox.index == 2));
+
+      mqtt_data[0] = '\0';
+    }
+  }
+}
+
+void CmndGroupTopic(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    SettingsUpdateText(SET_MQTT_GRP_TOPIC, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
+}
+
+void CmndTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    char stemp1[TOPSZ];
+    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1));
+    if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) {
+      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
+      SettingsUpdateText(SET_MQTT_TOPIC, stemp1);
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_TOPIC));
+}
+
+void CmndButtonTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    switch (Shortcut()) {
+      case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break;
+      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, mqtt_topic); break;
+      case SC_USER: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC); break;
+      default: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, XdrvMailbox.data);
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_BUTTON_TOPIC));
+}
+
+void CmndSwitchTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    switch (Shortcut()) {
+      case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break;
+      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, mqtt_topic); break;
+      case SC_USER: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC); break;
+      default: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, XdrvMailbox.data);
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_SWITCH_TOPIC));
+}
+
+void CmndButtonRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      for (uint32_t i = 1; i <= MAX_KEYS; i++) {
+        SendKey(KEY_BUTTON, i, CLEAR_RETAIN);
+      }
+    }
+    Settings.flag.mqtt_button_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_button_retain);
+}
+
+void CmndSwitchRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      for (uint32_t i = 1; i <= MAX_SWITCHES; i++) {
+        SendKey(KEY_SWITCH, i, CLEAR_RETAIN);
+      }
+    }
+    Settings.flag.mqtt_switch_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_switch_retain);
+}
+
+void CmndPowerRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      char stemp1[TOPSZ];
+      char scommand[CMDSZ];
+      for (uint32_t i = 1; i <= devices_present; i++) {
+        GetTopic_P(stemp1, STAT, mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings.flag.device_index_enable));
+        mqtt_data[0] = '\0';
+        MqttPublish(stemp1, Settings.flag.mqtt_power_retain);
+      }
+    }
+    Settings.flag.mqtt_power_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_power_retain);
+}
+
+void CmndSensorRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      mqtt_data[0] = '\0';
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain);
+    }
+    Settings.flag.mqtt_sensor_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_sensor_retain);
+}
+
+
+
+
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+
+
+const static uint16_t tls_spi_start_sector = 0xFF;
+const static uint8_t* tls_spi_start = (uint8_t*) 0x402FF000;
+const static size_t tls_spi_len = 0x1000;
+const static size_t tls_block_offset = 0x0400;
+const static size_t tls_block_len = 0x0400;
+const static size_t tls_obj_store_offset = tls_block_offset + sizeof(tls_dir_t);
+
+
+inline void TlsEraseBuffer(uint8_t *buffer) {
+  memset(buffer + tls_block_offset, 0xFF, tls_block_len);
+}
+
+
+
+static br_ec_private_key EC = {
+ 23,
+ nullptr, 0
+};
+
+static br_x509_certificate CHAIN[] = {
+ { nullptr, 0 }
+};
+
+
+
+void loadTlsDir(void) {
+  memcpy_P(&tls_dir, tls_spi_start + tls_block_offset, sizeof(tls_dir));
+
+
+  if ((TLS_NAME_SKEY == tls_dir.entry[0].name) && (tls_dir.entry[0].len > 0)) {
+    EC.x = (unsigned char *)(tls_spi_start + tls_obj_store_offset + tls_dir.entry[0].start);
+    EC.xlen = tls_dir.entry[0].len;
+    AWS_IoT_Private_Key = &EC;
+  } else {
+    AWS_IoT_Private_Key = nullptr;
+  }
+  if ((TLS_NAME_CRT == tls_dir.entry[1].name) && (tls_dir.entry[1].len > 0)) {
+    CHAIN[0].data = (unsigned char *) (tls_spi_start + tls_obj_store_offset + tls_dir.entry[1].start);
+    CHAIN[0].data_len = tls_dir.entry[1].len;
+    AWS_IoT_Client_Certificate = CHAIN;
+  } else {
+    AWS_IoT_Client_Certificate = nullptr;
+  }
+
+}
+
+const char ALLOCATE_ERROR[] PROGMEM = "TLSKey " D_JSON_ERROR ": cannot allocate buffer.";
+
+void CmndTlsKey(void) {
+#ifdef DEBUG_DUMP_TLS
+  if (0 == XdrvMailbox.index){
+    CmndTlsDump();
+  }
+#endif
+  if ((XdrvMailbox.index >= 1) && (XdrvMailbox.index <= 2)) {
+    tls_dir_t *tls_dir_write;
+
+    if (XdrvMailbox.data_len > 0) {
+
+      uint8_t *spi_buffer = (uint8_t*) malloc(tls_spi_len);
+      if (!spi_buffer) {
+        AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
+        return;
+      }
+      memcpy_P(spi_buffer, tls_spi_start, tls_spi_len);
+
+
+      RemoveAllSpaces(XdrvMailbox.data);
+
+
+      uint32_t bin_len = decode_base64_length((unsigned char*)XdrvMailbox.data);
+      uint8_t *bin_buf = nullptr;
+      if (bin_len > 0) {
+        bin_buf = (uint8_t*) malloc(bin_len + 4);
+        if (!bin_buf) {
+          AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
+          free(spi_buffer);
+          return;
+        }
+      }
+
+
+      if (bin_len > 0) {
+        decode_base64((unsigned char*)XdrvMailbox.data, bin_buf);
+      }
+
+
+      tls_dir_write = (tls_dir_t*) (spi_buffer + tls_block_offset);
+
+      if (1 == XdrvMailbox.index) {
+
+
+        TlsEraseBuffer(spi_buffer);
+        if (bin_len > 0) {
+          if (bin_len != 32) {
+
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate must be 32 bytes: %d."), bin_len);
+            free(spi_buffer);
+            free(bin_buf);
+            return;
+          }
+          tls_entry_t *entry = &tls_dir_write->entry[0];
+          entry->name = TLS_NAME_SKEY;
+          entry->start = 0;
+          entry->len = bin_len;
+          memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
+        } else {
+
+        }
+      } else if (2 == XdrvMailbox.index) {
+
+        if (TLS_NAME_SKEY != tls_dir.entry[0].name) {
+
+          AddLog_P(LOG_LEVEL_INFO, PSTR("TLSKey: cannot store Cert if no Key previously stored."));
+          free(spi_buffer);
+          free(bin_buf);
+          return;
+        }
+        if (bin_len <= 256) {
+
+          AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate length too short: %d."), bin_len);
+          free(spi_buffer);
+          free(bin_buf);
+          return;
+        }
+        tls_entry_t *entry = &tls_dir_write->entry[1];
+        entry->name = TLS_NAME_CRT;
+        entry->start = (tls_dir_write->entry[0].start + tls_dir_write->entry[0].len + 3) & ~0x03;
+        entry->len = bin_len;
+        memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
+      }
+
+      if (ESP.flashEraseSector(tls_spi_start_sector)) {
+        ESP.flashWrite(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+      }
+      free(spi_buffer);
+      free(bin_buf);
+    }
+
+    loadTlsDir();
+    Response_P(PSTR("{\"%s1\":%d,\"%s2\":%d}"),
+      XdrvMailbox.command, AWS_IoT_Private_Key ? tls_dir.entry[0].len : -1,
+      XdrvMailbox.command, AWS_IoT_Client_Certificate ? tls_dir.entry[1].len : -1);
+  }
+}
+
+#ifdef DEBUG_DUMP_TLS
+
+uint32_t bswap32(uint32_t x) {
+ return ((x << 24) & 0xff000000 ) |
+  ((x << 8) & 0x00ff0000 ) |
+  ((x >> 8) & 0x0000ff00 ) |
+  ((x >> 24) & 0x000000ff );
+}
+void CmndTlsDump(void) {
+  uint32_t start = (uint32_t)tls_spi_start + tls_block_offset;
+  uint32_t end = start + tls_block_len -1;
+  for (uint32_t pos = start; pos < end; pos += 0x10) {
+    uint32_t* values = (uint32_t*)(pos);
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+    Serial.printf("%08x:  %08x %08x %08x %08x\n", pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#else
+    Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#endif
+  }
+}
+#endif
+#endif
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_MQTT "mq"
+
+const char S_CONFIGURE_MQTT[] PROGMEM = D_CONFIGURE_MQTT;
+
+const char HTTP_BTN_MENU_MQTT[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_MQTT "' method='get'><button>" D_CONFIGURE_MQTT "</button></form></p>";
+
+const char HTTP_FORM_MQTT1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_MQTT_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='" WEB_HANDLE_MQTT "'>"
+  "<p><b>" D_HOST "</b> (" MQTT_HOST ")<br><input id='mh' placeholder='" MQTT_HOST" ' value='%s'></p>"
+  "<p><b>" D_PORT "</b> (" STR(MQTT_PORT) ")<br><input id='ml' placeholder='" STR(MQTT_PORT) "' value='%d'></p>"
+  "<p><b>" D_CLIENT "</b> (%s)<br><input id='mc' placeholder='%s' value='%s'></p>";
+const char HTTP_FORM_MQTT2[] PROGMEM =
+  "<p><b>" D_USER "</b> (" MQTT_USER ")<br><input id='mu' placeholder='" MQTT_USER "' value='%s'></p>"
+  "<p><b>" D_PASSWORD "</b><input type='checkbox' onclick='sp(\"mp\")'><br><input id='mp' type='password' placeholder='" D_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_TOPIC "</b> = %%topic%% (%s)<br><input id='mt' placeholder='%s' value='%s'></p>"
+  "<p><b>" D_FULL_TOPIC "</b> (%s)<br><input id='mf' placeholder='%s' value='%s'></p>";
+
+void HandleMqttConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT);
+
+  if (WebServer->hasArg("save")) {
+    MqttSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char str[TOPSZ];
+
+  WSContentStart_P(S_CONFIGURE_MQTT);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_MQTT1,
+    SettingsText(SET_MQTT_HOST),
+    Settings.mqtt_port,
+    Format(str, MQTT_CLIENT_ID, sizeof(str)), MQTT_CLIENT_ID, SettingsText(SET_MQTT_CLIENT));
+  WSContentSend_P(HTTP_FORM_MQTT2,
+    (!strlen(SettingsText(SET_MQTT_USER))) ? "0" : SettingsText(SET_MQTT_USER),
+    Format(str, MQTT_TOPIC, sizeof(str)), MQTT_TOPIC, SettingsText(SET_MQTT_TOPIC),
+    MQTT_FULLTOPIC, MQTT_FULLTOPIC, SettingsText(SET_MQTT_FULLTOPIC));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void MqttSaveSettings(void)
+{
+  char tmp[TOPSZ];
+  char stemp[TOPSZ];
+  char stemp2[TOPSZ];
+
+  WebGetArg("mt", tmp, sizeof(tmp));
+  strlcpy(stemp, (!strlen(tmp)) ? MQTT_TOPIC : tmp, sizeof(stemp));
+  MakeValidMqtt(0, stemp);
+  WebGetArg("mf", tmp, sizeof(tmp));
+  strlcpy(stemp2, (!strlen(tmp)) ? MQTT_FULLTOPIC : tmp, sizeof(stemp2));
+  MakeValidMqtt(1, stemp2);
+  if ((strcmp(stemp, SettingsText(SET_MQTT_TOPIC))) || (strcmp(stemp2, SettingsText(SET_MQTT_FULLTOPIC)))) {
+    Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+    MqttPublishPrefixTopic_P(TELE, S_LWT, true);
+  }
+  SettingsUpdateText(SET_MQTT_TOPIC, stemp);
+  SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp2);
+  WebGetArg("mh", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_HOST, (!strlen(tmp)) ? MQTT_HOST : (!strcmp(tmp,"0")) ? "" : tmp);
+  WebGetArg("ml", tmp, sizeof(tmp));
+  Settings.mqtt_port = (!strlen(tmp)) ? MQTT_PORT : atoi(tmp);
+  WebGetArg("mc", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_CLIENT, (!strlen(tmp)) ? MQTT_CLIENT_ID : tmp);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
+    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
+#else
+  WebGetArg("mu", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_USER, (!strlen(tmp)) ? MQTT_USER : (!strcmp(tmp,"0")) ? "" : tmp);
+  WebGetArg("mp", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_PWD, (!strlen(tmp)) ? "" : (!strcmp(tmp, D_ASTERISK_PWD)) ? SettingsText(SET_MQTT_PWD) : tmp);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_MQTTUSER " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
+    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_USER), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
+#endif
+}
+#endif
+
+
+
+
+
+bool Xdrv02(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        MqttInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        MqttClient.loop();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_MQTT);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_MQTT, HandleMqttConfiguration);
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kMqttCommands, MqttCommand);
+        break;
+    }
+  }
+  return result;
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_03_energy.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_03_energy.ino"
+#ifdef USE_ENERGY_SENSOR
+
+
+
+
+#define XDRV_03 3
+#define XSNS_03 3
+
+
+
+
+#define ENERGY_NONE 0
+#define ENERGY_WATCHDOG 4
+
+#include <Ticker.h>
+
+#define D_CMND_POWERCAL "PowerCal"
+#define D_CMND_VOLTAGECAL "VoltageCal"
+#define D_CMND_CURRENTCAL "CurrentCal"
+#define D_CMND_TARIFF "Tariff"
+#define D_CMND_MODULEADDRESS "ModuleAddress"
+
+enum EnergyCommands {
+  CMND_POWERCAL, CMND_VOLTAGECAL, CMND_CURRENTCAL,
+  CMND_POWERSET, CMND_VOLTAGESET, CMND_CURRENTSET, CMND_FREQUENCYSET, CMND_MODULEADDRESS };
+
+const char kEnergyCommands[] PROGMEM = "|"
+  D_CMND_POWERCAL "|" D_CMND_VOLTAGECAL "|" D_CMND_CURRENTCAL "|"
+  D_CMND_POWERSET "|" D_CMND_VOLTAGESET "|" D_CMND_CURRENTSET "|" D_CMND_FREQUENCYSET "|" D_CMND_MODULEADDRESS "|"
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|"
+#ifdef USE_ENERGY_POWER_LIMIT
+  D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|"
+  D_CMND_MAXPOWER "|" D_CMND_MAXPOWERHOLD "|" D_CMND_MAXPOWERWINDOW "|"
+  D_CMND_SAFEPOWER "|" D_CMND_SAFEPOWERHOLD "|" D_CMND_SAFEPOWERWINDOW "|"
+#endif
+#endif
+  D_CMND_ENERGYRESET "|" D_CMND_TARIFF ;
+
+void (* const EnergyCommand[])(void) PROGMEM = {
+  &CmndPowerCal, &CmndVoltageCal, &CmndCurrentCal,
+  &CmndPowerSet, &CmndVoltageSet, &CmndCurrentSet, &CmndFrequencySet, &CmndModuleAddress,
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  &CmndPowerDelta, &CmndPowerLow, &CmndPowerHigh, &CmndVoltageLow, &CmndVoltageHigh, &CmndCurrentLow, &CmndCurrentHigh,
+#ifdef USE_ENERGY_POWER_LIMIT
+  &CmndMaxEnergy, &CmndMaxEnergyStart,
+  &CmndMaxPower, &CmndMaxPowerHold, &CmndMaxPowerWindow,
+  &CmndSafePower, &CmndSafePowerHold, &CmndSafePowerWindow,
+#endif
+#endif
+  &CmndEnergyReset, &CmndTariff };
+
+const char kEnergyPhases[] PROGMEM = "|%s / %s|%s / %s / %s||[%s,%s]|[%s,%s,%s]";
+
+struct ENERGY {
+  float voltage[3] = { 0, 0, 0 };
+  float current[3] = { 0, 0, 0 };
+  float active_power[3] = { 0, 0, 0 };
+  float apparent_power[3] = { NAN, NAN, NAN };
+  float reactive_power[3] = { NAN, NAN, NAN };
+  float power_factor[3] = { NAN, NAN, NAN };
+  float frequency[3] = { NAN, NAN, NAN };
+
+  float start_energy = 0;
+  float daily = 0;
+  float total = 0;
+  float export_active = NAN;
+
+  unsigned long kWhtoday_delta = 0;
+  unsigned long kWhtoday_offset = 0;
+  unsigned long kWhtoday;
+  unsigned long period = 0;
+
+  uint8_t fifth_second = 0;
+  uint8_t command_code = 0;
+  uint8_t data_valid[3] = { 0, 0, 0 };
+
+  uint8_t phase_count = 1;
+  bool voltage_common = false;
+
+  bool voltage_available = true;
+  bool current_available = true;
+
+  bool type_dc = false;
+  bool power_on = true;
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  uint16_t power_history[3] = { 0 };
+  uint8_t power_steady_counter = 8;
+  bool power_delta = false;
+  bool min_power_flag = false;
+  bool max_power_flag = false;
+  bool min_voltage_flag = false;
+  bool max_voltage_flag = false;
+  bool min_current_flag = false;
+  bool max_current_flag = false;
+
+#ifdef USE_ENERGY_POWER_LIMIT
+  uint16_t mplh_counter = 0;
+  uint16_t mplw_counter = 0;
+  uint8_t mplr_counter = 0;
+  uint8_t max_energy_state = 0;
+#endif
+#endif
+} Energy;
+
+Ticker ticker_energy;
+
+
+
+bool EnergyTariff1Active()
+{
+  uint8_t dst = 0;
+  if (IsDst() && (Settings.tariff[0][1] != Settings.tariff[1][1])) {
+    dst = 1;
+  }
+  if (Settings.tariff[0][dst] != Settings.tariff[1][dst]) {
+    if (Settings.flag3.energy_weekend && ((RtcTime.day_of_week == 1) ||
+                                          (RtcTime.day_of_week == 7))) {
+      return true;
+    }
+    uint32_t minutes = MinutesPastMidnight();
+    if (Settings.tariff[0][dst] > Settings.tariff[1][dst]) {
+
+      return ((minutes >= Settings.tariff[0][dst]) || (minutes < Settings.tariff[1][dst]));
+    } else {
+
+      return ((minutes >= Settings.tariff[0][dst]) && (minutes < Settings.tariff[1][dst]));
+    }
+  } else {
+    return false;
+  }
+}
+
+void EnergyUpdateToday(void)
+{
+  if (Energy.kWhtoday_delta > 1000) {
+    unsigned long delta = Energy.kWhtoday_delta / 1000;
+    Energy.kWhtoday_delta -= (delta * 1000);
+    Energy.kWhtoday += delta;
+  }
+
+  RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset + Energy.kWhtoday;
+  Energy.daily = (float)(RtcSettings.energy_kWhtoday) / 100000;
+  Energy.total = (float)(RtcSettings.energy_kWhtotal + RtcSettings.energy_kWhtoday) / 100000;
+
+  if (RtcTime.valid){
+
+    uint32_t energy_diff = (uint32_t)(Energy.total * 100000) - RtcSettings.energy_usage.last_usage_kWhtotal;
+    RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 100000);
+
+    uint32_t return_diff = 0;
+    if (!isnan(Energy.export_active)) {
+      return_diff = (uint32_t)(Energy.export_active * 100000) - RtcSettings.energy_usage.last_return_kWhtotal;
+      RtcSettings.energy_usage.last_return_kWhtotal = (uint32_t)(Energy.export_active * 100000);
+    }
+
+    if (EnergyTariff1Active()) {
+      RtcSettings.energy_usage.usage1_kWhtotal += energy_diff;
+      RtcSettings.energy_usage.return1_kWhtotal += return_diff;
+    } else {
+      RtcSettings.energy_usage.usage2_kWhtotal += energy_diff;
+      RtcSettings.energy_usage.return2_kWhtotal += return_diff;
+    }
+  }
+}
+
+void EnergyUpdateTotal(float value, bool kwh)
+{
+
+
+
+
+  uint32_t multiplier = (kwh) ? 100000 : 100;
+
+  if (0 == Energy.start_energy || (value < Energy.start_energy)) {
+    Energy.start_energy = value;
+  }
+  else if (value != Energy.start_energy) {
+    Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier);
+  }
+
+  if ((Energy.total < (value - 0.01)) &&
+      Settings.flag3.hardware_energy_total) {
+    RtcSettings.energy_kWhtotal = (unsigned long)((value * multiplier) - Energy.kWhtoday_offset - Energy.kWhtoday);
+    Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+    Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
+    Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
+
+  }
+  EnergyUpdateToday();
+}
+
+
+
+void Energy200ms(void)
+{
+  Energy.power_on = (power != 0) | Settings.flag.no_power_on_check;
+
+  Energy.fifth_second++;
+  if (5 == Energy.fifth_second) {
+    Energy.fifth_second = 0;
+
+    XnrgCall(FUNC_ENERGY_EVERY_SECOND);
+
+    if (RtcTime.valid) {
+      if (LocalTime() == Midnight()) {
+        Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday;
+
+        RtcSettings.energy_kWhtotal += RtcSettings.energy_kWhtoday;
+        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+        Energy.kWhtoday = 0;
+        Energy.kWhtoday_offset = 0;
+        RtcSettings.energy_kWhtoday = 0;
+        Energy.start_energy = 0;
+
+        Energy.kWhtoday_delta = 0;
+        Energy.period = Energy.kWhtoday;
+        EnergyUpdateToday();
+#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
+        Energy.max_energy_state = 3;
+#endif
+      }
+#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
+      if ((RtcTime.hour == Settings.energy_max_energy_start) && (3 == Energy.max_energy_state )) {
+        Energy.max_energy_state = 0;
+      }
+#endif
+
+    }
+  }
+
+  XnrgCall(FUNC_EVERY_200_MSECOND);
+}
+
+void EnergySaveState(void)
+{
+  Settings.energy_kWhdoy = (RtcTime.valid) ? RtcTime.day_of_year : 0;
+
+  Settings.energy_kWhtoday = RtcSettings.energy_kWhtoday;
+  Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+
+  Settings.energy_usage = RtcSettings.energy_usage;
+}
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag)
+{
+  bool change;
+
+  if (!margin) return false;
+  change = save_flag;
+  if (type) {
+    flag = (value > margin);
+  } else {
+    flag = (value < margin);
+  }
+  save_flag = flag;
+  return (change != save_flag);
+}
+
+void EnergyMarginCheck(void)
+{
+  if (Energy.power_steady_counter) {
+    Energy.power_steady_counter--;
+    return;
+  }
+
+  uint16_t energy_power_u = (uint16_t)(Energy.active_power[0]);
+
+  if (Settings.energy_power_delta) {
+    uint16_t delta = abs(Energy.power_history[0] - energy_power_u);
+    if (delta > 0) {
+      if (Settings.energy_power_delta < 101) {
+        uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
+        if (0 == min_power) { min_power++; }
+        if (((delta * 100) / min_power) > Settings.energy_power_delta) {
+          Energy.power_delta = true;
+        }
+      } else {
+        if (delta > (Settings.energy_power_delta -100)) {
+          Energy.power_delta = true;
+        }
+      }
+      if (Energy.power_delta) {
+        Energy.power_history[1] = Energy.active_power[0];
+        Energy.power_history[2] = Energy.active_power[0];
+      }
+    }
+  }
+  Energy.power_history[0] = Energy.power_history[1];
+  Energy.power_history[1] = Energy.power_history[2];
+  Energy.power_history[2] = energy_power_u;
+
+  if (Energy.power_on && (Settings.energy_min_power || Settings.energy_max_power || Settings.energy_min_voltage || Settings.energy_max_voltage || Settings.energy_min_current || Settings.energy_max_current)) {
+    uint16_t energy_voltage_u = (uint16_t)(Energy.voltage[0]);
+    uint16_t energy_current_u = (uint16_t)(Energy.current[0] * 1000);
+
+    DEBUG_DRIVER_LOG(PSTR("NRG: W %d, U %d, I %d"), energy_power_u, energy_voltage_u, energy_current_u);
+
+    Response_P(PSTR("{"));
+    bool flag;
+    bool jsonflg = false;
+    if (EnergyMargin(false, Settings.energy_min_power, energy_power_u, flag, Energy.min_power_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_power, energy_power_u, flag, Energy.max_power_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(false, Settings.energy_min_voltage, energy_voltage_u, flag, Energy.min_voltage_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGELOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_voltage, energy_voltage_u, flag, Energy.max_voltage_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGEHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(false, Settings.energy_min_current, energy_current_u, flag, Energy.min_current_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_current, energy_current_u, flag, Energy.max_current_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (jsonflg) {
+      ResponseJsonEnd();
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN);
+      EnergyMqttShow();
+    }
+  }
+
+#ifdef USE_ENERGY_POWER_LIMIT
+
+  if (Settings.energy_max_power_limit) {
+    if (Energy.active_power[0] > Settings.energy_max_power_limit) {
+      if (!Energy.mplh_counter) {
+        Energy.mplh_counter = Settings.energy_max_power_limit_hold;
+      } else {
+        Energy.mplh_counter--;
+        if (!Energy.mplh_counter) {
+          ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
+          MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+          EnergyMqttShow();
+          SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
+          if (!Energy.mplr_counter) {
+            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;
+          }
+          Energy.mplw_counter = Settings.energy_max_power_limit_window;
+        }
+      }
+    }
+    else if (power && (energy_power_u <= Settings.energy_max_power_limit)) {
+      Energy.mplh_counter = 0;
+      Energy.mplr_counter = 0;
+      Energy.mplw_counter = 0;
+    }
+    if (!power) {
+      if (Energy.mplw_counter) {
+        Energy.mplw_counter--;
+      } else {
+        if (Energy.mplr_counter) {
+          Energy.mplr_counter--;
+          if (Energy.mplr_counter) {
+            ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1));
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
+            RestorePower(true, SRC_MAXPOWER);
+          } else {
+            ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
+            MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+            EnergyMqttShow();
+            SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
+          }
+        }
+      }
+    }
+  }
+
+
+  if (Settings.energy_max_energy) {
+    uint16_t energy_daily_u = (uint16_t)(Energy.daily * 1000);
+    if (!Energy.max_energy_state && (RtcTime.hour == Settings.energy_max_energy_start)) {
+      Energy.max_energy_state = 1;
+      ResponseTime_P(PSTR(",\"" D_JSON_ENERGYMONITOR "\":\"%s\"}"), GetStateText(1));
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_ENERGYMONITOR));
+      RestorePower(true, SRC_MAXENERGY);
+    }
+    else if ((1 == Energy.max_energy_state ) && (energy_daily_u >= Settings.energy_max_energy)) {
+      Energy.max_energy_state = 2;
+      char stemp[FLOATSZ];
+      dtostrfd(Energy.daily, 3, stemp);
+      ResponseTime_P(PSTR(",\"" D_JSON_MAXENERGYREACHED "\":%s}"), stemp);
+      MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+      EnergyMqttShow();
+      SetAllPower(POWER_ALL_OFF, SRC_MAXENERGY);
+    }
+  }
+#endif
+
+  if (Energy.power_delta) { EnergyMqttShow(); }
+}
+
+void EnergyMqttShow(void)
+{
+
+  int tele_period_save = tele_period;
+  tele_period = 2;
+  mqtt_data[0] = '\0';
+  ResponseAppendTime();
+  EnergyShow(true);
+  tele_period = tele_period_save;
+  ResponseJsonEnd();
+  MqttPublishTeleSensor();
+  Energy.power_delta = false;
+}
+#endif
+
+void EnergyEverySecond(void)
+{
+
+  if (global_update) {
+    if (power && (global_temperature != 9999) && (global_temperature > Settings.param[P_OVER_TEMP])) {
+      SetAllPower(POWER_ALL_OFF, SRC_OVERTEMP);
+    }
+  }
+
+
+  uint32_t data_valid = Energy.phase_count;
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    if (Energy.data_valid[i] <= ENERGY_WATCHDOG) {
+      Energy.data_valid[i]++;
+      if (Energy.data_valid[i] > ENERGY_WATCHDOG) {
+
+        Energy.voltage[i] = 0;
+        Energy.current[i] = 0;
+        Energy.active_power[i] = 0;
+        if (!isnan(Energy.apparent_power[i])) { Energy.apparent_power[i] = 0; }
+        if (!isnan(Energy.reactive_power[i])) { Energy.reactive_power[i] = 0; }
+        if (!isnan(Energy.frequency[i])) { Energy.frequency[i] = 0; }
+        if (!isnan(Energy.power_factor[i])) { Energy.power_factor[i] = 0; }
+
+        data_valid--;
+      }
+    }
+  }
+  if (!data_valid) {
+    if (!isnan(Energy.export_active)) { Energy.export_active = 0; }
+    Energy.start_energy = 0;
+
+    XnrgCall(FUNC_ENERGY_RESET);
+  }
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  EnergyMarginCheck();
+#endif
+}
+
+
+
+
+
+void EnergyCommandCalResponse(uint32_t nvalue)
+{
+  snprintf_P(XdrvMailbox.command, CMDSZ, PSTR("%sCal"), XdrvMailbox.command);
+  ResponseCmndNumber(nvalue);
+}
+
+void CmndEnergyReset(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
+    char *p;
+    unsigned long lnum = strtoul(XdrvMailbox.data, &p, 10);
+    if (p != XdrvMailbox.data) {
+      switch (XdrvMailbox.index) {
+      case 1:
+
+        Energy.kWhtoday_offset = lnum *100;
+        Energy.kWhtoday = 0;
+        Energy.kWhtoday_delta = 0;
+        Energy.start_energy = 0;
+        Energy.period = Energy.kWhtoday_offset;
+        Settings.energy_kWhtoday = Energy.kWhtoday_offset;
+        RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset;
+        Energy.daily = (float)Energy.kWhtoday_offset / 100000;
+        if (!RtcSettings.energy_kWhtotal && !Energy.kWhtoday_offset) {
+          Settings.energy_kWhtotal_time = LocalTime();
+        }
+        break;
+      case 2:
+
+        Settings.energy_kWhyesterday = lnum *100;
+        break;
+      case 3:
+
+        RtcSettings.energy_kWhtotal = lnum *100;
+        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+
+        Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
+        RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 1000);
+        break;
+      }
+    }
+  }
+  else if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
+    uint32_t values[2] = { 0 };
+    uint32_t position = ParseParameters(2, values);
+    values[0] *= 100;
+    values[1] *= 100;
+
+    switch (XdrvMailbox.index)
+    {
+      case 4:
+
+        if (position > 0) {
+          RtcSettings.energy_usage.usage1_kWhtotal = values[0];
+        }
+        if (position > 1) {
+          RtcSettings.energy_usage.usage2_kWhtotal = values[1];
+        }
+        Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
+        Settings.energy_usage.usage2_kWhtotal = RtcSettings.energy_usage.usage2_kWhtotal;
+        break;
+      case 5:
+
+        if (position > 0) {
+          RtcSettings.energy_usage.return1_kWhtotal = values[0];
+        }
+        if (position > 1) {
+          RtcSettings.energy_usage.return2_kWhtotal = values[1];
+        }
+        Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
+        Settings.energy_usage.return2_kWhtotal = RtcSettings.energy_usage.return2_kWhtotal;
+        break;
+      }
+  }
+
+  Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
+
+  char energy_total_chr[FLOATSZ];
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr);
+  char energy_daily_chr[FLOATSZ];
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
+  char energy_yesterday_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
+
+  char energy_usage1_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage1_chr);
+  char energy_usage2_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage2_chr);
+  char energy_return1_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return1_chr);
+  char energy_return2_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return2_chr);
+
+  Response_P(PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s,\"" D_JSON_USAGE "\":[%s,%s],\"" D_JSON_EXPORT "\":[%s,%s]}}"),
+    XdrvMailbox.command, energy_total_chr, energy_yesterday_chr, energy_daily_chr, energy_usage1_chr, energy_usage2_chr, energy_return1_chr, energy_return2_chr);
+}
+
+void CmndTariff(void)
+{
+
+
+
+
+
+
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    uint32_t tariff = XdrvMailbox.index -1;
+    uint32_t time_type = 0;
+    char *p;
+    char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+    while ((str != nullptr) && (time_type < 2)) {
+      char *q;
+      uint32_t value = strtol(str, &q, 10);
+      Settings.tariff[tariff][time_type] = value;
+      if (value < 24) {
+        Settings.tariff[tariff][time_type] *= 60;
+        char *minute = strtok_r(nullptr, ":", &q);
+        if (minute) {
+          value = strtol(minute, nullptr, 10);
+          if (value > 59) {
+            value = 59;
+          }
+          Settings.tariff[tariff][time_type] += value;
+        }
+      }
+      if (Settings.tariff[tariff][time_type] > 1439) {
+        Settings.tariff[tariff][time_type] = 1439;
+      }
+      str = strtok_r(nullptr, ", ", &p);
+      time_type++;
+    }
+  }
+  else if (XdrvMailbox.index == 9) {
+    Settings.flag3.energy_weekend = XdrvMailbox.payload & 1;
+  }
+  Response_P(PSTR("{\"%s\":{\"Off-Peak\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Standard\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Weekend\":\"%s\"}}"),
+    XdrvMailbox.command,
+    GetMinuteTime(Settings.tariff[0][0]).c_str(),GetMinuteTime(Settings.tariff[0][1]).c_str(),
+    GetMinuteTime(Settings.tariff[1][0]).c_str(),GetMinuteTime(Settings.tariff[1][1]).c_str(),
+    GetStateText(Settings.flag3.energy_weekend));
+}
+
+void CmndPowerCal(void)
+{
+  Energy.command_code = CMND_POWERCAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_power_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_power_calibration);
+  }
+}
+
+void CmndVoltageCal(void)
+{
+  Energy.command_code = CMND_VOLTAGECAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_voltage_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_voltage_calibration);
+  }
+}
+
+void CmndCurrentCal(void)
+{
+  Energy.command_code = CMND_CURRENTCAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_current_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_current_calibration);
+  }
+}
+
+void CmndPowerSet(void)
+{
+  Energy.command_code = CMND_POWERSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_power_calibration);
+  }
+}
+
+void CmndVoltageSet(void)
+{
+  Energy.command_code = CMND_VOLTAGESET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_voltage_calibration);
+  }
+}
+
+void CmndCurrentSet(void)
+{
+  Energy.command_code = CMND_CURRENTSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_current_calibration);
+  }
+}
+
+void CmndFrequencySet(void)
+{
+  Energy.command_code = CMND_FREQUENCYSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_frequency_calibration);
+  }
+}
+
+void CmndModuleAddress(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4) && (1 == Energy.phase_count)) {
+    Energy.command_code = CMND_MODULEADDRESS;
+    if (XnrgCall(FUNC_COMMAND)) {
+      ResponseCmndDone();
+    }
+  }
+}
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+void CmndPowerDelta(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32000)) {
+    Settings.energy_power_delta = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_power_delta);
+}
+
+void CmndPowerLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_min_power = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_power);
+}
+
+void CmndPowerHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power);
+}
+
+void CmndVoltageLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
+    Settings.energy_min_voltage = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_voltage);
+}
+
+void CmndVoltageHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
+    Settings.energy_max_voltage = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_voltage);
+}
+
+void CmndCurrentLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
+    Settings.energy_min_current = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_current);
+}
+
+void CmndCurrentHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
+    Settings.energy_max_current = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_current);
+}
+
+#ifdef USE_ENERGY_POWER_LIMIT
+void CmndMaxPower(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit);
+}
+
+void CmndMaxPowerHold(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit_hold = (1 == XdrvMailbox.payload) ? MAX_POWER_HOLD : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit_hold);
+}
+
+void CmndMaxPowerWindow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit_window = (1 == XdrvMailbox.payload) ? MAX_POWER_WINDOW : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit_window);
+}
+
+void CmndSafePower(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_safe_limit = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit);
+}
+
+void CmndSafePowerHold(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_safe_limit_hold = (1 == XdrvMailbox.payload) ? SAFE_POWER_HOLD : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit_hold);
+}
+
+void CmndSafePowerWindow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 1440)) {
+    Settings.energy_max_power_safe_limit_window = (1 == XdrvMailbox.payload) ? SAFE_POWER_WINDOW : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit_window);
+}
+
+void CmndMaxEnergy(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_energy = XdrvMailbox.payload;
+    Energy.max_energy_state = 3;
+  }
+  ResponseCmndNumber(Settings.energy_max_energy);
+}
+
+void CmndMaxEnergyStart(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 24)) {
+    Settings.energy_max_energy_start = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_energy_start);
+}
+#endif
+#endif
+
+void EnergySnsInit(void)
+{
+  XnrgCall(FUNC_INIT);
+
+  if (energy_flg) {
+    if (RtcSettingsValid()) {
+      Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday;
+    }
+    else if (RtcTime.day_of_year == Settings.energy_kWhdoy) {
+      Energy.kWhtoday_offset = Settings.energy_kWhtoday;
+    }
+    else {
+      Energy.kWhtoday_offset = 0;
+    }
+    Energy.kWhtoday = 0;
+    Energy.kWhtoday_delta = 0;
+    Energy.period = Energy.kWhtoday_offset;
+    EnergyUpdateToday();
+    ticker_energy.attach_ms(200, Energy200ms);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_SNS1[] PROGMEM =
+  "{s}" D_POWERUSAGE_APPARENT "{m}%s " D_UNIT_VA "{e}"
+  "{s}" D_POWERUSAGE_REACTIVE "{m}%s " D_UNIT_VAR "{e}"
+  "{s}" D_POWER_FACTOR "{m}%s{e}";
+
+const char HTTP_ENERGY_SNS2[] PROGMEM =
+  "{s}" D_ENERGY_TODAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_YESTERDAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_TOTAL "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
+
+const char HTTP_ENERGY_SNS3[] PROGMEM =
+  "{s}" D_EXPORT_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
+#endif
+
+char* EnergyFormatIndex(char* result, char* input, bool json, uint32_t index, bool single = false)
+{
+  char layout[16];
+  GetTextIndexed(layout, sizeof(layout), (index -1) + (3 * json), kEnergyPhases);
+  switch (index) {
+    case 2:
+      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ);
+      break;
+    case 3:
+      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ, input + FLOATSZ + FLOATSZ);
+      break;
+    default:
+      snprintf_P(result, FLOATSZ *3, input);
+  }
+  return result;
+}
+
+char* EnergyFormat(char* result, char* input, bool json, bool single = false)
+{
+  uint8_t index = (single) ? 1 : Energy.phase_count;
+  return EnergyFormatIndex(result, input, json, index, single);
+}
+
+void EnergyShow(bool json)
+{
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    if (Energy.voltage_common) {
+      Energy.voltage[i] = Energy.voltage[0];
+    }
+  }
+
+  float power_factor_knx = Energy.power_factor[0];
+
+  char apparent_power_chr[Energy.phase_count][FLOATSZ];
+  char reactive_power_chr[Energy.phase_count][FLOATSZ];
+  char power_factor_chr[Energy.phase_count][FLOATSZ];
+  char frequency_chr[Energy.phase_count][FLOATSZ];
+  if (!Energy.type_dc) {
+    if (Energy.current_available && Energy.voltage_available) {
+      for (uint32_t i = 0; i < Energy.phase_count; i++) {
+        float apparent_power = Energy.apparent_power[i];
+        if (isnan(apparent_power)) {
+          apparent_power = Energy.voltage[i] * Energy.current[i];
+        }
+        if (apparent_power < Energy.active_power[i]) {
+          Energy.active_power[i] = apparent_power;
+        }
+
+        float power_factor = Energy.power_factor[i];
+        if (isnan(power_factor)) {
+          power_factor = (Energy.active_power[i] && apparent_power) ? Energy.active_power[i] / apparent_power : 0;
+          if (power_factor > 1) {
+            power_factor = 1;
+          }
+        }
+        if (0 == i) { power_factor_knx = power_factor; }
+
+        float reactive_power = Energy.reactive_power[i];
+        if (isnan(reactive_power)) {
+          reactive_power = 0;
+          uint32_t difference = ((uint32_t)(apparent_power * 100) - (uint32_t)(Energy.active_power[i] * 100)) / 10;
+          if ((Energy.current[i] > 0.005) && ((difference > 15) || (difference > (uint32_t)(apparent_power * 100 / 1000)))) {
+
+
+            reactive_power = (float)(RoundSqrtInt((uint32_t)(apparent_power * apparent_power * 100) - (uint32_t)(Energy.active_power[i] * Energy.active_power[i] * 100))) / 10;
+          }
+        }
+
+        dtostrfd(apparent_power, Settings.flag2.wattage_resolution, apparent_power_chr[i]);
+        dtostrfd(reactive_power, Settings.flag2.wattage_resolution, reactive_power_chr[i]);
+        dtostrfd(power_factor, 2, power_factor_chr[i]);
+      }
+    }
+    for (uint32_t i = 0; i < Energy.phase_count; i++) {
+      float frequency = Energy.frequency[i];
+      if (isnan(Energy.frequency[i])) {
+        frequency = 0;
+      }
+      dtostrfd(frequency, Settings.flag2.frequency_resolution, frequency_chr[i]);
+    }
+  }
+
+  char voltage_chr[Energy.phase_count][FLOATSZ];
+  char current_chr[Energy.phase_count][FLOATSZ];
+  char active_power_chr[Energy.phase_count][FLOATSZ];
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    dtostrfd(Energy.voltage[i], Settings.flag2.voltage_resolution, voltage_chr[i]);
+    dtostrfd(Energy.current[i], Settings.flag2.current_resolution, current_chr[i]);
+    dtostrfd(Energy.active_power[i], Settings.flag2.wattage_resolution, active_power_chr[i]);
+  }
+
+  char energy_daily_chr[FLOATSZ];
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
+  char energy_yesterday_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
+
+  char energy_total_chr[3][FLOATSZ];
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr[0]);
+  char export_active_chr[3][FLOATSZ];
+  dtostrfd(Energy.export_active, Settings.flag2.energy_resolution, export_active_chr[0]);
+  uint8_t energy_total_fields = 1;
+
+  if (Settings.tariff[0][0] != Settings.tariff[1][0]) {
+    dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[1]);
+    dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[2]);
+    dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[1]);
+    dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[2]);
+    energy_total_fields = 3;
+  }
+
+  char value_chr[FLOATSZ *3];
+  char value2_chr[FLOATSZ *3];
+  char value3_chr[FLOATSZ *3];
+
+  if (json) {
+    bool show_energy_period = (0 == tele_period);
+
+    ResponseAppend_P(PSTR(",\"" D_RSLT_ENERGY "\":{\"" D_JSON_TOTAL_START_TIME "\":\"%s\",\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s"),
+      GetDateAndTime(DT_ENERGY).c_str(),
+      EnergyFormatIndex(value_chr, energy_total_chr[0], json, energy_total_fields),
+      energy_yesterday_chr,
+      energy_daily_chr);
+
+    if (!isnan(Energy.export_active)) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_EXPORT_ACTIVE "\":%s"),
+        EnergyFormatIndex(value_chr, export_active_chr[0], json, energy_total_fields));
+    }
+
+    if (show_energy_period) {
+      float energy = 0;
+      if (Energy.period) {
+        energy = (float)(RtcSettings.energy_kWhtoday - Energy.period) / 100;
+      }
+      Energy.period = RtcSettings.energy_kWhtoday;
+      char energy_period_chr[FLOATSZ];
+      dtostrfd(energy, Settings.flag2.wattage_resolution, energy_period_chr);
+      ResponseAppend_P(PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr);
+    }
+    ResponseAppend_P(PSTR(",\"" D_JSON_POWERUSAGE "\":%s"),
+      EnergyFormat(value_chr, active_power_chr[0], json));
+    if (!Energy.type_dc) {
+      if (Energy.current_available && Energy.voltage_available) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_APPARENT_POWERUSAGE "\":%s,\"" D_JSON_REACTIVE_POWERUSAGE "\":%s,\"" D_JSON_POWERFACTOR "\":%s"),
+          EnergyFormat(value_chr, apparent_power_chr[0], json),
+          EnergyFormat(value2_chr, reactive_power_chr[0], json),
+          EnergyFormat(value3_chr, power_factor_chr[0], json));
+      }
+      if (!isnan(Energy.frequency[0])) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_FREQUENCY "\":%s"),
+          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
+      }
+    }
+    if (Energy.voltage_available) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_VOLTAGE "\":%s"),
+        EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
+    }
+    if (Energy.current_available) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_CURRENT "\":%s"),
+        EnergyFormat(value_chr, current_chr[0], json));
+    }
+    XnrgCall(FUNC_JSON_APPEND);
+    ResponseJsonEnd();
+
+#ifdef USE_DOMOTICZ
+    if (show_energy_period) {
+      dtostrfd(Energy.total * 1000, 1, energy_total_chr[0]);
+      DomoticzSensorPowerEnergy((int)Energy.active_power[0], energy_total_chr[0]);
+
+      dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100, 1, energy_total_chr[1]);
+      dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100, 1, energy_total_chr[2]);
+      dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100, 1, export_active_chr[1]);
+      dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100, 1, export_active_chr[2]);
+      DomoticzSensorP1SmartMeter(energy_total_chr[1], energy_total_chr[2], export_active_chr[1], export_active_chr[2], (int)Energy.active_power[0]);
+
+      if (Energy.voltage_available) {
+        DomoticzSensor(DZ_VOLTAGE, voltage_chr[0]);
+      }
+      if (Energy.current_available) {
+        DomoticzSensor(DZ_CURRENT, current_chr[0]);
+      }
+    }
+#endif
+#ifdef USE_KNX
+    if (show_energy_period) {
+      if (Energy.voltage_available) {
+        KnxSensor(KNX_ENERGY_VOLTAGE, Energy.voltage[0]);
+      }
+      if (Energy.current_available) {
+        KnxSensor(KNX_ENERGY_CURRENT, Energy.current[0]);
+      }
+      KnxSensor(KNX_ENERGY_POWER, Energy.active_power[0]);
+      if (!Energy.type_dc) {
+        KnxSensor(KNX_ENERGY_POWERFACTOR, power_factor_knx);
+      }
+      KnxSensor(KNX_ENERGY_DAILY, Energy.daily);
+      KnxSensor(KNX_ENERGY_TOTAL, Energy.total);
+      KnxSensor(KNX_ENERGY_START, Energy.start_energy);
+    }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    if (Energy.voltage_available) {
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
+    }
+    if (Energy.current_available) {
+      WSContentSend_PD(HTTP_SNS_CURRENT, EnergyFormat(value_chr, current_chr[0], json));
+    }
+    WSContentSend_PD(HTTP_SNS_POWER, EnergyFormat(value_chr, active_power_chr[0], json));
+    if (!Energy.type_dc) {
+      if (Energy.current_available && Energy.voltage_available) {
+        WSContentSend_PD(HTTP_ENERGY_SNS1, EnergyFormat(value_chr, apparent_power_chr[0], json),
+                                           EnergyFormat(value2_chr, reactive_power_chr[0], json),
+                                           EnergyFormat(value3_chr, power_factor_chr[0], json));
+      }
+      if (!isnan(Energy.frequency[0])) {
+        WSContentSend_PD(PSTR("{s}" D_FREQUENCY "{m}%s " D_UNIT_HERTZ "{e}"),
+          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
+      }
+    }
+    WSContentSend_PD(HTTP_ENERGY_SNS2, energy_daily_chr, energy_yesterday_chr, energy_total_chr[0]);
+    if (!isnan(Energy.export_active)) {
+      WSContentSend_PD(HTTP_ENERGY_SNS3, export_active_chr[0]);
+    }
+
+    XnrgCall(FUNC_WEB_SENSOR);
+#endif
+  }
+}
+
+
+
+
+
+bool Xdrv03(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_PRE_INIT == function) {
+    energy_flg = ENERGY_NONE;
+    XnrgCall(FUNC_PRE_INIT);
+  }
+  else if (energy_flg) {
+    switch (function) {
+      case FUNC_LOOP:
+        XnrgCall(FUNC_LOOP);
+        break;
+      case FUNC_EVERY_250_MSECOND:
+        XnrgCall(FUNC_EVERY_250_MSECOND);
+        break;
+      case FUNC_SERIAL:
+        result = XnrgCall(FUNC_SERIAL);
+        break;
+#ifdef USE_ENERGY_MARGIN_DETECTION
+      case FUNC_SET_POWER:
+        Energy.power_steady_counter = 2;
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kEnergyCommands, EnergyCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+bool Xsns03(uint8_t function)
+{
+  bool result = false;
+
+  if (energy_flg) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        EnergyEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        EnergyShow(true);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        EnergyShow(false);
+        break;
+#endif
+      case FUNC_SAVE_BEFORE_RESTART:
+        EnergySaveState();
+        break;
+      case FUNC_INIT:
+        EnergySnsInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+#ifdef USE_LIGHT
+# 124 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+#define XDRV_04 4
+
+
+enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX };
+
+const uint8_t LIGHT_COLOR_SIZE = 25;
+
+const char kLightCommands[] PROGMEM = "|"
+  D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|"
+  D_CMND_RGBWWTABLE "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|"
+  D_CMND_WHITE "|" D_CMND_CHANNEL "|" D_CMND_HSBCOLOR "|UNDOCA" ;
+
+void (* const LightCommand[])(void) PROGMEM = {
+  &CmndColor, &CmndColorTemperature, &CmndDimmer, &CmndDimmerRange, &CmndLedTable, &CmndFade,
+  &CmndRgbwwTable, &CmndScheme, &CmndSpeed, &CmndWakeup, &CmndWakeupDuration,
+  &CmndWhite, &CmndChannel, &CmndHsbColor, &CmndUndocA };
+
+
+enum LightColorModes {
+  LCM_RGB = 1, LCM_CT = 2, LCM_BOTH = 3 };
+
+struct LRgbColor {
+  uint8_t R, G, B;
+};
+const uint8_t MAX_FIXED_COLOR = 12;
+const LRgbColor kFixedColor[MAX_FIXED_COLOR] PROGMEM =
+  { 255,0,0, 0,255,0, 0,0,255, 228,32,0, 0,228,32, 0,32,228, 188,64,0, 0,160,96, 160,32,240, 255,255,0, 255,0,170, 255,255,255 };
+
+struct LWColor {
+  uint8_t W;
+};
+const uint8_t MAX_FIXED_WHITE = 4;
+const LWColor kFixedWhite[MAX_FIXED_WHITE] PROGMEM = { 0, 255, 128, 32 };
+
+struct LCwColor {
+  uint8_t C, W;
+};
+const uint8_t MAX_FIXED_COLD_WARM = 4;
+const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
+
+
+const uint16_t CT_MIN = 153;
+const uint16_t CT_MAX = 500;
+
+const uint16_t CT_MIN_ALEXA = 200;
+const uint16_t CT_MAX_ALEXA = 380;
+
+
+
+
+
+
+typedef struct gamma_table_t {
+  uint16_t to_src;
+  uint16_t to_gamma;
+} gamma_table_t;
+
+const gamma_table_t gamma_table[] = {
+  { 1, 1 },
+  { 4, 1 },
+  { 209, 13 },
+  { 312, 41 },
+  { 457, 106 },
+  { 626, 261 },
+  { 762, 450 },
+  { 895, 703 },
+  { 1023, 1023 },
+  { 0xFFFF, 0xFFFF }
+};
+
+
+const gamma_table_t gamma_table_fast[] = {
+  { 384, 192 },
+  { 768, 576 },
+  { 1023, 1023 },
+  { 0xFFFF, 0xFFFF }
+};
+# 248 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+struct LIGHT {
+  uint32_t strip_timer_counter = 0;
+  power_t power = 0;
+
+  uint16_t wakeup_counter = 0;
+
+  uint8_t entry_color[LST_MAX];
+  uint8_t current_color[LST_MAX];
+  uint8_t new_color[LST_MAX];
+  uint8_t last_color[LST_MAX];
+  uint8_t color_remap[LST_MAX];
+
+  uint8_t wheel = 0;
+  uint8_t random = 0;
+  uint8_t subtype = 0;
+  uint8_t device = 0;
+  uint8_t old_power = 1;
+  uint8_t wakeup_active = 0;
+  uint8_t wakeup_dimmer = 0;
+  uint8_t fixed_color_index = 1;
+  uint8_t pwm_offset = 0;
+  uint8_t max_scheme = LS_MAX -1;
+
+  bool update = true;
+  bool pwm_multi_channels = false;
+
+  bool fade_initialized = false;
+  bool fade_running = false;
+  uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
+  uint16_t fade_cur_10[LST_MAX];
+  uint16_t fade_end_10[LST_MAX];
+  uint16_t fade_duration = 0;
+  uint32_t fade_start = 0;
+} Light;
+
+power_t LightPower(void)
+{
+  return Light.power;
+}
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+power_t LightPowerIRAM(void) ICACHE_RAM_ATTR;
+#endif
+
+power_t LightPowerIRAM(void)
+{
+  return Light.power;
+}
+
+uint8_t LightDevice(void)
+{
+  return Light.device;
+}
+
+static uint32_t min3(uint32_t a, uint32_t b, uint32_t c) {
+  return (a < b && a < c) ? a : (b < c) ? b : c;
+}
+# 344 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+class LightStateClass {
+  private:
+    uint16_t _hue = 0;
+    uint8_t _sat = 255;
+    uint8_t _briRGB = 255;
+
+    uint8_t _r = 255;
+    uint8_t _g = 255;
+    uint8_t _b = 255;
+
+    uint8_t _subtype = 0;
+    uint16_t _ct = CT_MIN;
+    uint8_t _wc = 255;
+    uint8_t _ww = 0;
+    uint8_t _briCT = 255;
+
+    uint8_t _color_mode = LCM_RGB;
+
+
+
+
+
+    uint16_t _ct_min_range = CT_MIN;
+    uint16_t _ct_max_range = CT_MAX;
+
+  public:
+    LightStateClass() {
+
+    }
+
+    void setSubType(uint8_t sub_type) {
+      _subtype = sub_type;
+    }
+# 386 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+    uint8_t setColorMode(uint8_t cm) {
+      uint8_t prev_cm = _color_mode;
+      if (cm < LCM_RGB) { cm = LCM_RGB; }
+      if (cm > LCM_BOTH) { cm = LCM_BOTH; }
+      uint8_t maxbri = (_briRGB >= _briCT) ? _briRGB : _briCT;
+
+      switch (_subtype) {
+        case LST_COLDWARM:
+          _color_mode = LCM_CT;
+          break;
+
+        case LST_NONE:
+        case LST_SINGLE:
+        case LST_RGB:
+        default:
+          _color_mode = LCM_RGB;
+          break;
+
+        case LST_RGBW:
+        case LST_RGBCW:
+          _color_mode = cm;
+          break;
+      }
+      if (LCM_RGB == _color_mode) {
+        _briCT = 0;
+        if (0 == _briRGB) { _briRGB = maxbri; }
+      }
+      if (LCM_CT == _color_mode) {
+        _briRGB = 0;
+        if (0 == _briCT) { _briCT = maxbri; }
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setColorMode prev_cm (%d) req_cm (%d) new_cm (%d)", prev_cm, cm, _color_mode);
+#endif
+      return prev_cm;
+    }
+
+    inline uint8_t getColorMode() {
+      return _color_mode;
+    }
+
+    void addRGBMode() {
+      setColorMode(_color_mode | LCM_RGB);
+    }
+    void addCTMode() {
+      setColorMode(_color_mode | LCM_CT);
+    }
+
+
+    void getRGB(uint8_t *r, uint8_t *g, uint8_t *b) {
+      if (r) { *r = _r; }
+      if (g) { *g = _g; }
+      if (b) { *b = _b; }
+    }
+
+
+
+    void getCW(uint8_t *rc, uint8_t *rw) {
+      if (rc) { *rc = _wc; }
+      if (rw) { *rw = _ww; }
+    }
+
+
+    void getActualRGBCW(uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *c, uint8_t *w) {
+      bool rgb_channels_on = _color_mode & LCM_RGB;
+      bool ct_channels_on = _color_mode & LCM_CT;
+
+      if (r) { *r = rgb_channels_on ? changeUIntScale(_r, 0, 255, 0, _briRGB) : 0; }
+      if (g) { *g = rgb_channels_on ? changeUIntScale(_g, 0, 255, 0, _briRGB) : 0; }
+      if (b) { *b = rgb_channels_on ? changeUIntScale(_b, 0, 255, 0, _briRGB) : 0; }
+
+      if (c) { *c = ct_channels_on ? changeUIntScale(_wc, 0, 255, 0, _briCT) : 0; }
+      if (w) { *w = ct_channels_on ? changeUIntScale(_ww, 0, 255, 0, _briCT) : 0; }
+    }
+
+    uint8_t getChannels(uint8_t *channels) {
+      getActualRGBCW(&channels[0], &channels[1], &channels[2], &channels[3], &channels[4]);
+    }
+
+    void getChannelsRaw(uint8_t *channels) {
+      channels[0] = _r;
+      channels[1] = _g;
+      channels[2] = _b;
+      channels[3] = _wc;
+      channels[4] = _ww;
+    }
+
+    void getHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
+      if (hue) { *hue = _hue; }
+      if (sat) { *sat = _sat; }
+      if (bri) { *bri = _briRGB; }
+    }
+
+
+    uint8_t getBri(void) {
+
+      return (_briRGB >= _briCT) ? _briRGB : _briCT;
+    }
+
+
+    inline uint8_t getBriCT() {
+      return _briCT;
+    }
+
+    static inline uint8_t DimmerToBri(uint8_t dimmer) {
+      return changeUIntScale(dimmer, 0, 100, 0, 255);
+    }
+    static uint8_t BriToDimmer(uint8_t bri) {
+      uint8_t dimmer = changeUIntScale(bri, 0, 255, 0, 100);
+
+      if ((dimmer == 0) && (bri > 0)) { dimmer = 1; }
+      return dimmer;
+    }
+
+    uint8_t getDimmer(uint32_t mode = 0) {
+      uint8_t bri;
+      switch (mode) {
+        case 1:
+          bri = getBriRGB();
+          break;
+        case 2:
+          bri = getBriCT();
+          break;
+        default:
+          bri = getBri();
+          break;
+      }
+      return BriToDimmer(bri);
+    }
+
+    inline uint16_t getCT() const {
+      return _ct;
+    }
+
+
+    uint16_t getCT10bits() const {
+      return changeUIntScale(_ct, _ct_min_range, _ct_max_range, 0, 1023);
+    }
+
+    inline void setCTRange(uint16_t ct_min_range, uint16_t ct_max_range) {
+      _ct_min_range = ct_min_range;
+      _ct_max_range = ct_max_range;
+    }
+
+    inline void getCTRange(uint16_t *ct_min_range, uint16_t *ct_max_range) const {
+      if (ct_min_range) { *ct_min_range = _ct_min_range; }
+      if (ct_max_range) { *ct_max_range = _ct_max_range; }
+    }
+
+
+    void getXY(float *x, float *y) {
+      RgbToXy(_r, _g, _b, x, y);
+    }
+
+
+
+    void setBri(uint8_t bri) {
+      setBriRGB(_color_mode & LCM_RGB ? bri : 0);
+      setBriCT(_color_mode & LCM_CT ? bri : 0);
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setBri RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+    }
+
+
+    uint8_t setBriRGB(uint8_t bri_rgb) {
+      uint8_t prev_bri = _briRGB;
+      _briRGB = bri_rgb;
+      if (bri_rgb > 0) { addRGBMode(); }
+      return prev_bri;
+    }
+
+
+    uint8_t setBriCT(uint8_t bri_ct) {
+      uint8_t prev_bri = _briCT;
+      _briCT = bri_ct;
+      if (bri_ct > 0) { addCTMode(); }
+      return prev_bri;
+    }
+
+    inline uint8_t getBriRGB() {
+      return _briRGB;
+    }
+
+    void setDimmer(uint8_t dimmer) {
+      setBri(DimmerToBri(dimmer));
+    }
+
+    void setCT(uint16_t ct) {
+      if (0 == ct) {
+
+        setColorMode(LCM_RGB);
+      } else {
+        ct = (ct < CT_MIN ? CT_MIN : (ct > CT_MAX ? CT_MAX : ct));
+        _ww = changeUIntScale(ct, _ct_min_range, _ct_max_range, 0, 255);
+        _wc = 255 - _ww;
+        _ct = ct;
+        addCTMode();
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCT RGB raw (%d %d %d) HS (%d %d) briRGB (%d) briCT (%d) CT (%d)", _r, _g, _b, _hue, _sat, _briRGB, _briCT, _ct);
+#endif
+    }
+# 604 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+    void setCW(uint8_t c, uint8_t w, bool free_range = false) {
+      uint16_t max = (w > c) ? w : c;
+      uint16_t sum = c + w;
+
+      if (0 == max) {
+        _briCT = 0;
+        setColorMode(LCM_RGB);
+      } else {
+        if (!free_range) {
+
+          _ww = changeUIntScale(w, 0, sum, 0, 255);
+          _wc = 255 - _ww;
+        } else {
+          _ww = changeUIntScale(w, 0, max, 0, 255);
+          _wc = changeUIntScale(c, 0, max, 0, 255);
+        }
+        _ct = changeUIntScale(w, 0, sum, _ct_min_range, _ct_max_range);
+        addCTMode();
+        if (_color_mode & LCM_CT) { _briCT = free_range ? max : (sum > 255 ? 255 : sum); }
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCW CW (%d %d) CT (%d) briCT (%d)", c, w, _ct, _briCT);
+#endif
+    }
+
+
+    uint8_t setRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
+      uint16_t hue;
+      uint8_t sat;
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB input (%d %d %d)", r, g, b);
+#endif
+
+      uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
+
+      if (0 == max) {
+        r = g = b = 255;
+        setColorMode(LCM_CT);
+      } else {
+        if (255 > max) {
+
+          r = changeUIntScale(r, 0, max, 0, 255);
+          g = changeUIntScale(g, 0, max, 0, 255);
+          b = changeUIntScale(b, 0, max, 0, 255);
+        }
+        addRGBMode();
+      }
+      if (!keep_bri) {
+        _briRGB = (_color_mode & LCM_RGB) ? max : 0;
+      }
+
+      RgbToHsb(r, g, b, &hue, &sat, nullptr);
+      _r = r;
+      _g = g;
+      _b = b;
+      _hue = hue;
+      _sat = sat;
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+      return max;
+    }
+
+    void setHS(uint16_t hue, uint8_t sat) {
+      uint8_t r, g, b;
+      HsToRgb(hue, sat, &r, &g, &b);
+      _r = r;
+      _g = g;
+      _b = b;
+      _hue = hue;
+      _sat = sat;
+      addRGBMode();
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS HS (%d %d) rgb (%d %d %d)", hue, sat, r, g, b);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+  }
+
+
+
+  void setChannelsRaw(uint8_t *channels) {
+    _r = channels[0];
+    _g = channels[1];
+    _b = channels[2];
+    _wc = channels[3];
+    _ww = channels[4];
+}
+
+
+
+
+  void setChannels(uint8_t *channels) {
+    setRGB(channels[0], channels[1], channels[2]);
+    setCW(channels[3], channels[4], true);
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels (%d %d %d %d %d)",
+      channels[0], channels[1], channels[2], channels[3], channels[4]);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels CT (%d) briRGB (%d) briCT (%d)", _ct, _briRGB, _briCT);
+#endif
+  }
+
+
+    static void RgbToHsb(uint8_t r, uint8_t g, uint8_t b, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri);
+    static void HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
+    static void RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y);
+    static void XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb);
+
+};
+# 720 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
+void LightStateClass::RgbToHsb(uint8_t ir, uint8_t ig, uint8_t ib, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri) {
+  uint32_t r = ir;
+  uint32_t g = ig;
+  uint32_t b = ib;
+  uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
+  uint32_t min = (r < g && r < b) ? r : (g < b) ? g : b;
+  uint32_t d = max - min;
+
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = max;
+
+  if (d != 0) {
+    sat = changeUIntScale(d, 0, max, 0, 255);
+    if (r == max) {
+      hue = (g > b) ? changeUIntScale(g-b,0,d,0,60) : 360 - changeUIntScale(b-g,0,d,0,60);
+    } else if (g == max) {
+      hue = (b > r) ? 120 + changeUIntScale(b-r,0,d,0,60) : 120 - changeUIntScale(r-b,0,d,0,60);
+    } else {
+      hue = (r > g) ? 240 + changeUIntScale(r-g,0,d,0,60) : 240 - changeUIntScale(g-r,0,d,0,60);
+    }
+    hue = hue % 360;
+  }
+
+  if (r_hue) *r_hue = hue;
+  if (r_sat) *r_sat = sat;
+  if (r_bri) *r_bri = bri;
+
+}
+
+void LightStateClass::HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
+  uint32_t r = 255;
+  uint32_t g = 255;
+  uint32_t b = 255;
+
+  hue = hue % 360;
+
+  if (sat > 0) {
+    uint32_t i = hue / 60;
+    uint32_t f = hue % 60;
+    uint32_t q = 255 - changeUIntScale(f, 0, 60, 0, sat);
+    uint32_t p = 255 - sat;
+    uint32_t t = 255 - changeUIntScale(60 - f, 0, 60, 0, sat);
+
+    switch (i) {
+      case 0:
+
+        g = t;
+        b = p;
+        break;
+      case 1:
+        r = q;
+
+        b = p;
+        break;
+      case 2:
+        r = p;
+
+        b = t;
+        break;
+      case 3:
+        r = p;
+        g = q;
+
+        break;
+      case 4:
+        r = t;
+        g = p;
+
+        break;
+      default:
+
+        g = p;
+        b = q;
+        break;
+      }
+    }
+  if (r_r) *r_r = r;
+  if (r_g) *r_g = g;
+  if (r_b) *r_b = b;
+}
+
+#define POW FastPrecisePowf
+
+void LightStateClass::RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y) {
+  float x = 0.31271f;
+  float y = 0.32902f;
+
+  if (i_r + i_b + i_g > 0) {
+    float r = (float)i_r / 255.0f;
+    float g = (float)i_g / 255.0f;
+    float b = (float)i_b / 255.0f;
+
+
+    r = (r > 0.04045f) ? POW((r + 0.055f) / (1.0f + 0.055f), 2.4f) : (r / 12.92f);
+    g = (g > 0.04045f) ? POW((g + 0.055f) / (1.0f + 0.055f), 2.4f) : (g / 12.92f);
+    b = (b > 0.04045f) ? POW((b + 0.055f) / (1.0f + 0.055f), 2.4f) : (b / 12.92f);
+
+
+
+    float X = r * 0.649926f + g * 0.103455f + b * 0.197109f;
+    float Y = r * 0.234327f + g * 0.743075f + b * 0.022598f;
+    float Z = r * 0.000000f + g * 0.053077f + b * 1.035763f;
+
+    x = X / (X + Y + Z);
+    y = Y / (X + Y + Z);
+
+  }
+  if (r_x) *r_x = x;
+  if (r_y) *r_y = y;
+}
+
+void LightStateClass::XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb)
+{
+  x = (x > 0.99f ? 0.99f : (x < 0.01f ? 0.01f : x));
+  y = (y > 0.99f ? 0.99f : (y < 0.01f ? 0.01f : y));
+  float z = 1.0f - x - y;
+
+  float X = x / y;
+  float Z = z / y;
+
+
+
+  float r = X * 3.2406f - 1.5372f - Z * 0.4986f;
+  float g = -X * 0.9689f + 1.8758f + Z * 0.0415f;
+  float b = X * 0.0557f - 0.2040f + Z * 1.0570f;
+  float max = (r > g && r > b) ? r : (g > b) ? g : b;
+  r = r / max;
+  g = g / max;
+  b = b / max;
+  r = (r <= 0.0031308f) ? 12.92f * r : 1.055f * POW(r, (1.0f / 2.4f)) - 0.055f;
+  g = (g <= 0.0031308f) ? 12.92f * g : 1.055f * POW(g, (1.0f / 2.4f)) - 0.055f;
+  b = (b <= 0.0031308f) ? 12.92f * b : 1.055f * POW(b, (1.0f / 2.4f)) - 0.055f;
+
+
+
+
+
+  int32_t ir = r * 255.0f + 0.5f;
+  int32_t ig = g * 255.0f + 0.5f;
+  int32_t ib = b * 255.0f + 0.5f;
+  if (rr) { *rr = (ir > 255 ? 255: (ir < 0 ? 0 : ir)); }
+  if (rg) { *rg = (ig > 255 ? 255: (ig < 0 ? 0 : ig)); }
+  if (rb) { *rb = (ib > 255 ? 255: (ib < 0 ? 0 : ib)); }
+}
+
+class LightControllerClass {
+private:
+  LightStateClass *_state;
+
+
+  bool _ct_rgb_linked = true;
+  bool _pwm_multi_channels = false;
+
+public:
+  LightControllerClass(LightStateClass& state) {
+    _state = &state;
+  }
+
+  void setSubType(uint8_t sub_type) {
+    _state->setSubType(sub_type);
+  }
+
+  inline bool setCTRGBLinked(bool ct_rgb_linked) {
+    bool prev = _ct_rgb_linked;
+    if (_pwm_multi_channels) {
+      _ct_rgb_linked = false;
+    } else {
+      _ct_rgb_linked = ct_rgb_linked;
+    }
+    return prev;
+  }
+
+  void setAlexaCTRange(bool alexa_ct_range) {
+
+    if (alexa_ct_range) {
+      _state->setCTRange(CT_MIN_ALEXA, CT_MAX_ALEXA);
+    } else {
+      _state->setCTRange(CT_MIN, CT_MAX);
+    }
+  }
+
+  inline bool isCTRGBLinked() {
+    return _ct_rgb_linked;
+  }
+
+  inline bool setPWMMultiChannel(bool pwm_multi_channels) {
+    bool prev = _pwm_multi_channels;
+    _pwm_multi_channels = pwm_multi_channels;
+    if (pwm_multi_channels) setCTRGBLinked(false);
+    return prev;
+  }
+
+  inline bool isPWMMultiChannel(void) {
+    return _pwm_multi_channels;
+  }
+
+#ifdef DEBUG_LIGHT
+  void debugLogs() {
+    uint8_t r,g,b,c,w;
+    _state->getActualRGBCW(&r,&g,&b,&c,&w);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs rgb (%d %d %d) cw (%d %d)",
+      r, g, b, c, w);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs lightCurrent (%d %d %d %d %d)",
+      Light.current_color[0], Light.current_color[1], Light.current_color[2],
+      Light.current_color[3], Light.current_color[4]);
+  }
+#endif
+
+  void loadSettings() {
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings Settings.light_color (%d %d %d %d %d - %d)",
+      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
+      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings light_type/sub (%d %d)",
+      light_type, Light.subtype);
+#endif
+    if (_pwm_multi_channels) {
+      _state->setChannelsRaw(Settings.light_color);
+    } else {
+
+      _state->setCW(Settings.light_color[3], Settings.light_color[4], true);
+      _state->setRGB(Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]);
+
+
+
+      uint8_t bri = _state->DimmerToBri(Settings.light_dimmer);
+      if (Settings.light_color[0] + Settings.light_color[1] + Settings.light_color[2] > 0) {
+
+
+        if ( (DEFAULT_LIGHT_COMPONENT == Settings.light_color[0]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[1]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[2]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[3]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[4]) &&
+             (DEFAULT_LIGHT_DIMMER == Settings.light_dimmer) ) {
+          _state->setColorMode(LCM_RGB);
+        }
+        _state->setBriRGB(bri);
+      } else {
+        _state->setBriCT(bri);
+      }
+    }
+  }
+
+  void changeCTB(uint16_t new_ct, uint8_t briCT) {
+
+
+
+
+
+
+    if ((LST_COLDWARM != Light.subtype) && (LST_RGBW > Light.subtype)) {
+      return;
+    }
+    _state->setCT(new_ct);
+    _state->setBriCT(briCT);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
+    saveSettings();
+    calcLevels();
+
+  }
+
+  void changeDimmer(uint8_t dimmer, uint32_t mode = 0) {
+    uint8_t bri = changeUIntScale(dimmer, 0, 100, 0, 255);
+    switch (mode) {
+      case 1:
+        changeBriRGB(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+        break;
+      case 2:
+        changeBriCT(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
+        break;
+      default:
+        changeBri(bri);
+        break;
+    }
+  }
+
+  void changeBri(uint8_t bri) {
+    _state->setBri(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeBriRGB(uint8_t bri) {
+    _state->setBriRGB(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeBriCT(uint8_t bri) {
+    _state->setBriCT(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
+    _state->setRGB(r, g, b, keep_bri);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+    saveSettings();
+    calcLevels();
+  }
+
+
+
+  void calcLevels(uint8_t *current_color = nullptr) {
+    uint8_t r,g,b,c,w,briRGB,briCT;
+    if (current_color == nullptr) { current_color = Light.current_color; }
+
+    if (_pwm_multi_channels) {
+      _state->getChannelsRaw(current_color);
+      return;
+    }
+
+    _state->getActualRGBCW(&r,&g,&b,&c,&w);
+    briRGB = _state->getBriRGB();
+    briCT = _state->getBriCT();
+
+    current_color[0] = current_color[1] = current_color[2] = 0;
+    current_color[3] = current_color[4] = 0;
+    switch (Light.subtype) {
+      case LST_NONE:
+        current_color[0] = 255;
+        break;
+      case LST_SINGLE:
+        current_color[0] = briRGB;
+        break;
+      case LST_COLDWARM:
+        current_color[0] = c;
+        current_color[1] = w;
+        break;
+      case LST_RGBW:
+      case LST_RGBCW:
+        if (LST_RGBCW == Light.subtype) {
+          current_color[3] = c;
+          current_color[4] = w;
+        } else {
+          current_color[3] = briCT;
+        }
+
+      case LST_RGB:
+        current_color[0] = r;
+        current_color[1] = g;
+        current_color[2] = b;
+        break;
+    }
+  }
+
+  void changeHSB(uint16_t hue, uint8_t sat, uint8_t briRGB) {
+    _state->setHS(hue, sat);
+    _state->setBriRGB(briRGB);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+    saveSettings();
+    calcLevels();
+  }
+
+
+  void saveSettings() {
+    if (Light.pwm_multi_channels) {
+
+      _state->getChannelsRaw(Settings.light_color);
+      Settings.light_dimmer = 100;
+    } else {
+      uint8_t cm = _state->getColorMode();
+
+      memset(&Settings.light_color[0], 0, sizeof(Settings.light_color));
+      if (LCM_RGB & cm) {
+        _state->getRGB(&Settings.light_color[0], &Settings.light_color[1], &Settings.light_color[2]);
+        Settings.light_dimmer = _state->BriToDimmer(_state->getBriRGB());
+
+        if (LCM_BOTH == cm) {
+
+          _state->getActualRGBCW(nullptr, nullptr, nullptr, &Settings.light_color[3], &Settings.light_color[4]);
+        }
+      } else if (LCM_CT == cm) {
+        _state->getCW(&Settings.light_color[3], &Settings.light_color[4]);
+        Settings.light_dimmer = _state->BriToDimmer(_state->getBriCT());
+      }
+    }
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::saveSettings Settings.light_color (%d %d %d %d %d - %d)",
+      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
+      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
+#endif
+  }
+
+
+
+
+  void changeChannels(uint8_t *channels) {
+    if (Light.pwm_multi_channels) {
+      _state->setChannelsRaw(channels);
+    } else if (LST_COLDWARM == Light.subtype) {
+
+      uint8_t remapped_channels[5] = {0,0,0,channels[0],channels[1]};
+      _state->setChannels(remapped_channels);
+    } else {
+      _state->setChannels(channels);
+    }
+
+    saveSettings();
+    calcLevels();
+  }
+};
+
+
+
+LightStateClass light_state = LightStateClass();
+LightControllerClass light_controller = LightControllerClass(light_state);
+
+
+
+
+
+uint16_t change8to10(uint8_t v) {
+  return changeUIntScale(v, 0, 255, 0, 1023);
+}
+
+uint8_t change10to8(uint16_t v) {
+  return (0 == v) ? 0 : changeUIntScale(v, 4, 1023, 1, 255);
+}
+
+
+
+
+
+uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (v <= to_src) {
+      return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
+    }
+    from_src = to_src;
+    from_gamma = to_gamma;
+  }
+}
+
+uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (vg <= to_gamma) {
+      return changeUIntScale(vg, from_gamma, to_gamma, from_src, to_src);
+    }
+    from_src = to_src;
+    from_gamma = to_gamma;
+  }
+}
+
+
+uint16_t ledGamma10_10(uint16_t v) {
+  return ledGamma_internal(v, gamma_table);
+}
+
+uint16_t ledGamma10(uint8_t v) {
+  return ledGamma10_10(change8to10(v));
+}
+
+
+uint8_t ledGamma(uint8_t v) {
+  return change10to8(ledGamma10(v));
+}
+
+
+
+void LightPwmOffset(uint32_t offset)
+{
+  Light.pwm_offset = offset;
+}
+
+bool LightModuleInit(void)
+{
+  light_type = LT_BASIC;
+
+  if (Settings.flag.pwm_control) {
+    for (uint32_t i = 0; i < MAX_PWMS; i++) {
+      if (pin[GPIO_PWM1 +i] < 99) { light_type++; }
+    }
+  }
+
+  light_flg = 0;
+  if (XlgtCall(FUNC_MODULE_INIT)) {
+
+  }
+  else if (SONOFF_BN == my_module_type) {
+    light_type = LT_PWM1;
+  }
+  else if (SONOFF_LED == my_module_type) {
+    if (!my_module.io[4]) {
+      pinMode(4, OUTPUT);
+      digitalWrite(4, LOW);
+    }
+    if (!my_module.io[5]) {
+      pinMode(5, OUTPUT);
+      digitalWrite(5, LOW);
+    }
+    if (!my_module.io[14]) {
+      pinMode(14, OUTPUT);
+      digitalWrite(14, LOW);
+    }
+    light_type = LT_PWM2;
+  }
+
+  if (light_type > LT_BASIC) {
+    devices_present++;
+  }
+
+
+  if (Settings.flag3.pwm_multi_channels) {
+    uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+    if (0 == pwm_channels) { pwm_channels = 1; }
+    devices_present += pwm_channels - 1;
+  } else if ((Settings.param[P_RGB_REMAP] & 128) && (LST_RGBW <= (light_type & 7))) {
+
+    devices_present++;
+  }
+
+  return (light_type > LT_BASIC);
+}
+
+void LightInit(void)
+{
+  Light.device = devices_present;
+  Light.subtype = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+  Light.pwm_multi_channels = Settings.flag3.pwm_multi_channels;
+
+  if (LST_RGBW <= Light.subtype) {
+
+
+    bool ct_rgb_linked = !(Settings.param[P_RGB_REMAP] & 128);
+    light_controller.setCTRGBLinked(ct_rgb_linked);
+  }
+
+  if ((LST_SINGLE <= Light.subtype) && Light.pwm_multi_channels) {
+
+    light_controller.setPWMMultiChannel(true);
+    Light.device = devices_present - Light.subtype + 1;
+  } else if (!light_controller.isCTRGBLinked()) {
+
+    Light.device--;
+  }
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightInit Light.pwm_multi_channels=%d Light.subtype=%d Light.device=%d devices_present=%d",
+    Light.pwm_multi_channels, Light.subtype, Light.device, devices_present);
+#endif
+
+  light_controller.setSubType(Light.subtype);
+  light_controller.loadSettings();
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
+
+  if (LST_SINGLE == Light.subtype) {
+    Settings.light_color[0] = 255;
+  }
+  if (light_type < LT_PWM6) {
+    for (uint32_t i = 0; i < light_type; i++) {
+      Settings.pwm_value[i] = 0;
+      if (pin[GPIO_PWM1 +i] < 99) {
+        pinMode(pin[GPIO_PWM1 +i], OUTPUT);
+      }
+    }
+    if (pin[GPIO_ARIRFRCV] < 99) {
+      if (pin[GPIO_ARIRFSEL] < 99) {
+        pinMode(pin[GPIO_ARIRFSEL], OUTPUT);
+        digitalWrite(pin[GPIO_ARIRFSEL], 1);
+      }
+    }
+  }
+
+  uint32_t max_scheme = Light.max_scheme;
+  if (Light.subtype < LST_RGB) {
+    max_scheme = LS_POWER;
+  }
+  if ((LS_WAKEUP == Settings.light_scheme) || (Settings.light_scheme > max_scheme)) {
+    Settings.light_scheme = LS_POWER;
+  }
+  Light.power = 0;
+  Light.update = true;
+  Light.wakeup_active = 0;
+
+  LightUpdateColorMapping();
+}
+
+void LightUpdateColorMapping(void)
+{
+  uint8_t param = Settings.param[P_RGB_REMAP] & 127;
+  if (param > 119){ param = 0; }
+
+  uint8_t tmp[] = {0,1,2,3,4};
+  Light.color_remap[0] = tmp[param / 24];
+  for (uint32_t i = param / 24; i<4; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 24;
+  Light.color_remap[1] = tmp[(param / 6)];
+  for (uint32_t i = param / 6; i<3; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 6;
+  Light.color_remap[2] = tmp[(param / 2)];
+  for (uint32_t i = param / 2; i<2; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 2;
+  Light.color_remap[3] = tmp[param];
+  Light.color_remap[4] = tmp[1-param];
+
+  Light.update = true;
+
+}
+
+uint8_t LightGetDimmer(uint8_t dimmer) {
+  return light_state.getDimmer(dimmer);
+}
+
+void LightSetDimmer(uint8_t dimmer) {
+  light_controller.changeDimmer(dimmer);
+}
+
+void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
+  light_state.getHSB(hue, sat, bri);
+}
+
+void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
+  light_state.HsToRgb(hue, sat, r_r, r_g, r_b);
+}
+
+
+uint8_t LightGetBri(uint8_t device) {
+  uint8_t bri = 254;
+  if (Light.pwm_multi_channels) {
+    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
+      bri = Light.current_color[device - Light.device];
+    }
+  } else if (light_controller.isCTRGBLinked()) {
+    if (device == Light.device) {
+      bri = light_state.getBri();
+    }
+  } else {
+    if (device == Light.device) {
+      bri = light_state.getBriRGB();
+    } else if (device == Light.device + 1) {
+      bri = light_state.getBriCT();
+    }
+  }
+  return bri;
+}
+
+
+void LightSetBri(uint8_t device, uint8_t bri) {
+  if (Light.pwm_multi_channels) {
+    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
+      Light.current_color[device - Light.device] = bri;
+      light_controller.changeChannels(Light.current_color);
+    }
+  } else if (light_controller.isCTRGBLinked()) {
+    if (device == Light.device) {
+      light_controller.changeBri(bri);
+    }
+  } else {
+    if (device == Light.device) {
+      light_controller.changeBriRGB(bri);
+    } else if (device == Light.device + 1) {
+      light_controller.changeBriCT(bri);
+    }
+  }
+}
+
+void LightSetColorTemp(uint16_t ct)
+{
+
+
+
+
+
+
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
+    return;
+  }
+  light_controller.changeCTB(ct, light_state.getBriCT());
+}
+
+uint16_t LightGetColorTemp(void)
+{
+
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
+    return 0;
+  }
+  return (light_state.getColorMode() & LCM_CT) ? light_state.getCT() : 0;
+}
+
+void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value)
+{
+
+
+
+  if (Settings.flag.light_signal) {
+    uint16_t signal = changeUIntScale(value, lo, hi, 0, 255);
+
+    light_controller.changeRGB(signal, 255 - signal, 0, true);
+    Settings.light_scheme = 0;
+    if (0 == light_state.getBri()) {
+      light_controller.changeBri(50);
+    }
+  }
+}
+
+
+char* LightGetColor(char* scolor, boolean force_hex = false)
+{
+  light_controller.calcLevels();
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < Light.subtype; i++) {
+    if (!force_hex && Settings.flag.decimal_text) {
+      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Light.current_color[i]);
+    } else {
+      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%02X"), scolor, Light.current_color[i]);
+    }
+  }
+  return scolor;
+}
+
+void LightPowerOn(void)
+{
+  if (light_state.getBri() && !(Light.power)) {
+    ExecuteCommandPower(Light.device, POWER_ON, SRC_LIGHT);
+  }
+}
+
+void LightState(uint8_t append)
+{
+  char scolor[LIGHT_COLOR_SIZE];
+  char scommand[33];
+  bool unlinked = !light_controller.isCTRGBLinked() && (Light.subtype >= LST_RGBW);
+
+  if (append) {
+    ResponseAppend_P(PSTR(","));
+  } else {
+    Response_P(PSTR("{"));
+  }
+  if (!Light.pwm_multi_channels) {
+    if (unlinked) {
+
+      ResponseAppend_P(PSTR("\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"
+                           ",\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"),
+                            Light.device, GetStateText(Light.power & 1), Light.device, light_state.getDimmer(1),
+                            Light.device + 1, GetStateText(Light.power & 2 ? 1 : 0), Light.device + 1, light_state.getDimmer(2));
+    } else {
+      GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable);
+      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power & 1),
+                      light_state.getDimmer());
+    }
+
+
+    if (Light.subtype > LST_SINGLE) {
+      ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
+      if (LST_RGB <= Light.subtype) {
+        uint16_t hue;
+        uint8_t sat, bri;
+        light_state.getHSB(&hue, &sat, &bri);
+        sat = changeUIntScale(sat, 0, 255, 0, 100);
+        bri = changeUIntScale(bri, 0, 255, 0, 100);
+
+        ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
+      }
+
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
+      }
+
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
+      }
+
+      ResponseAppend_P(PSTR(",\"" D_CMND_CHANNEL "\":[" ));
+      for (uint32_t i = 0; i < Light.subtype; i++) {
+        uint8_t channel_raw = Light.current_color[i];
+        uint8_t channel = changeUIntScale(channel_raw,0,255,0,100);
+
+        if ((0 == channel) && (channel_raw > 0)) { channel = 1; }
+        ResponseAppend_P(PSTR("%s%d" ), (i > 0 ? "," : ""), channel);
+      }
+      ResponseAppend_P(PSTR("]"));
+    }
+
+    if (append) {
+      if (Light.subtype >= LST_RGB) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_SCHEME "\":%d"), Settings.light_scheme);
+      }
+      if (Light.max_scheme > LS_MAX) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_WIDTH "\":%d"), Settings.light_width);
+      }
+      ResponseAppend_P(PSTR(",\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d,\"" D_CMND_LEDTABLE "\":\"%s\""),
+        GetStateText(Settings.light_fade), Settings.light_speed, GetStateText(Settings.light_correction));
+    }
+  } else {
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      GetPowerDevice(scommand, Light.device + i, sizeof(scommand), 1);
+      uint32_t light_power_masked = Light.power & (1 << i);
+      light_power_masked = light_power_masked ? 1 : 0;
+      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_CHANNEL "%d\":%d,"), scommand, GetStateText(light_power_masked), Light.device + i,
+        changeUIntScale(Light.current_color[i], 0, 255, 0, 100));
+    }
+    ResponseAppend_P(PSTR("\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
+  }
+
+  if (!append) {
+    ResponseJsonEnd();
+  }
+}
+
+void LightPreparePower(power_t channels = 0xFFFFFFFF) {
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power);
+#endif
+
+  if (Light.pwm_multi_channels) {
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      if (bitRead(channels, i)) {
+
+        if ((Light.current_color[i]) && (!bitRead(Light.power, i))) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device + i, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else {
+
+          if ((0 == Light.current_color[i]) && bitRead(Light.power, i)) {
+            ExecuteCommandPower(Light.device + i, POWER_OFF_NO_STATE, SRC_LIGHT);
+          }
+        }
+  #ifdef USE_DOMOTICZ
+        DomoticzUpdatePowerState(Light.device + i);
+  #endif
+      }
+    }
+  } else {
+    if (light_controller.isCTRGBLinked()) {
+      if (light_state.getBri() && !(Light.power)) {
+        if (!Settings.flag.not_power_linked) {
+          ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
+        }
+      } else if (!light_state.getBri() && Light.power) {
+        ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
+      }
+    } else {
+
+      if (channels & 1) {
+        if (light_state.getBriRGB() && !(Light.power & 1)) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else if (!light_state.getBriRGB() && (Light.power & 1)) {
+          ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
+        }
+      }
+
+      if (channels & 2) {
+        if (light_state.getBriCT() && !(Light.power & 2)) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else if (!light_state.getBriCT() && (Light.power & 2)) {
+          ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
+        }
+      }
+    }
+#ifdef USE_DOMOTICZ
+    DomoticzUpdatePowerState(Light.device);
+#endif
+  }
+
+  if (Settings.flag3.hass_tele_on_power) {
+    MqttPublishTeleState();
+  }
+
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower End power=%d Light.power=%d", power, Light.power);
+#endif
+  Light.power = power >> (Light.device - 1);
+  LightState(0);
+}
+
+void LightCycleColor(int8_t direction)
+{
+  if (Light.strip_timer_counter % (Settings.light_speed * 2)) {
+    return;
+  }
+
+  if (0 == direction) {
+    if (Light.random == Light.wheel) {
+      Light.random = random(255);
+
+      uint8_t my_dir = (Light.random < Light.wheel -128) ? 1 :
+                       (Light.random < Light.wheel ) ? 0 :
+                       (Light.random > Light.wheel +128) ? 0 : 1;
+      Light.random = (Light.random & 0xFE) | my_dir;
+
+
+    }
+
+    direction = (Light.random &0x01) ? 1 : -1;
+  }
+  Light.wheel += direction;
+  uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);
+
+
+
+  uint8_t sat;
+  light_state.getHSB(nullptr, &sat, nullptr);
+  light_state.setHS(hue, sat);
+  light_controller.calcLevels(Light.new_color);
+}
+
+void LightSetPower(void)
+{
+
+  Light.old_power = Light.power;
+
+  uint32_t mask = 1;
+  if (Light.pwm_multi_channels) {
+    mask = (1 << Light.subtype) - 1;
+  } else if (!light_controller.isCTRGBLinked()) {
+    mask = 3;
+  }
+  uint32_t shift = Light.device - 1;
+
+
+
+
+
+  Light.power = (XdrvMailbox.index & (mask << shift)) >> shift;
+  if (Light.wakeup_active) {
+    Light.wakeup_active--;
+  }
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightSetPower XdrvMailbox.index=%d Light.old_power=%d Light.power=%d mask=%d shift=%d",
+    XdrvMailbox.index, Light.old_power, Light.power, mask, shift);
+#endif
+  if (Light.power != Light.old_power) {
+    Light.update = true;
+  }
+  LightAnimate();
+}
+
+
+
+
+void LightAnimate(void)
+{
+  uint16_t light_still_on = 0;
+  bool power_off = false;
+
+
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
+  Light.strip_timer_counter++;
+
+
+
+  if (Light.power || Light.fade_running) {
+    if (Settings.sleep > PWM_MAX_SLEEP) {
+      sleep = PWM_MAX_SLEEP;
+    } else {
+      sleep = Settings.sleep;
+    }
+  } else {
+    sleep = Settings.sleep;
+  }
+
+  if (!Light.power) {
+    Light.strip_timer_counter = 0;
+    if (Settings.light_scheme >= LS_MAX) {
+      power_off = true;
+    }
+  } else {
+    switch (Settings.light_scheme) {
+      case LS_POWER:
+        light_controller.calcLevels(Light.new_color);
+        break;
+      case LS_WAKEUP:
+        if (2 == Light.wakeup_active) {
+          Light.wakeup_active = 1;
+          for (uint32_t i = 0; i < Light.subtype; i++) {
+            Light.new_color[i] = 0;
+          }
+          Light.wakeup_counter = 0;
+          Light.wakeup_dimmer = 0;
+        }
+        Light.wakeup_counter++;
+        if (Light.wakeup_counter > ((Settings.light_wakeup * STATES) / Settings.light_dimmer)) {
+          Light.wakeup_counter = 0;
+          Light.wakeup_dimmer++;
+          if (Light.wakeup_dimmer <= Settings.light_dimmer) {
+            light_state.setDimmer(Light.wakeup_dimmer);
+            light_controller.calcLevels();
+            for (uint32_t i = 0; i < Light.subtype; i++) {
+              Light.new_color[i] = Light.current_color[i];
+            }
+          } else {
+
+
+
+
+            Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\""));
+            LightState(1);
+            ResponseJsonEnd();
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WAKEUP));
+            XdrvRulesProcess();
+
+            Light.wakeup_active = 0;
+            Settings.light_scheme = LS_POWER;
+          }
+        }
+        break;
+      case LS_CYCLEUP:
+        LightCycleColor(1);
+        break;
+      case LS_CYCLEDN:
+        LightCycleColor(-1);
+        break;
+      case LS_RANDOM:
+        LightCycleColor(0);
+        break;
+      default:
+        XlgtCall(FUNC_SET_SCHEME);
+    }
+  }
+
+  if ((Settings.light_scheme < LS_MAX) || power_off) {
+
+
+    LightApplyPower(Light.new_color, Light.power);
+
+
+
+
+
+
+
+    if (memcmp(Light.last_color, Light.new_color, Light.subtype)) {
+      Light.update = true;
+    }
+    if (Light.update) {
+      uint16_t cur_col_10[LST_MAX];
+      Light.update = false;
+
+
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        Light.last_color[i] = Light.new_color[i];
+
+        cur_col_10[i] = change8to10(Light.new_color[i]);
+      }
+
+      if (Light.pwm_multi_channels) {
+        calcGammaMultiChannels(cur_col_10);
+      } else {
+        calcGammaBulbs(cur_col_10);
+
+
+
+        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
+          uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
+          for (uint32_t i=0; i<3; i++) {
+
+            uint32_t adjust10 = change8to10(Settings.rgbwwTable[i]);
+            cur_col_10[i] = changeUIntScale(cur_col_10[i] - min_rgb_10, 0, 1023, 0, adjust10);
+          }
+
+
+          uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
+          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);
+          if (LST_RGBW == Light.subtype) {
+
+            cur_col_10[3] = white_10;
+          } else {
+
+            uint32_t ct = light_state.getCT10bits();
+            cur_col_10[4] = changeUIntScale(ct, 0, 1023, 0, white_10);
+            cur_col_10[3] = white_10 - cur_col_10[4];
+          }
+        }
+      }
+
+
+      if (0 != Settings.rgbwwTable[4]) {
+        for (uint32_t i = 0; i<Light.subtype; i++) {
+          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
+          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
+        }
+      }
+
+
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+
+        cur_col_10[i] = (cur_col_10[i] > 0) ? changeUIntScale(cur_col_10[i], 1, 1023, 1, Settings.pwm_range) : 0;
+      }
+
+
+      uint16_t orig_col_10bits[LST_MAX];
+      memcpy(orig_col_10bits, cur_col_10, sizeof(orig_col_10bits));
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
+      }
+
+      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) {
+
+        memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
+
+        LightSetOutputs(cur_col_10);
+        Light.fade_initialized = true;
+      } else {
+        if (Light.fade_running) {
+
+          memcpy(Light.fade_start_10, Light.fade_cur_10, sizeof(Light.fade_start_10));
+        }
+        memcpy(Light.fade_end_10, cur_col_10, sizeof(Light.fade_start_10));
+        Light.fade_running = true;
+        Light.fade_duration = 0;
+        Light.fade_start = 0;
+
+      }
+    }
+    if (Light.fade_running) {
+      if (LightApplyFade()) {
+
+
+
+        LightSetOutputs(Light.fade_cur_10);
+      }
+    }
+  }
+}
+
+bool isChannelGammaCorrected(uint32_t channel) {
+  if (!Settings.light_correction) { return false; }
+  if (channel >= Light.subtype) { return false; }
+
+  if (PHILIPS == my_module_type) {
+    if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }
+    if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }
+  }
+  return true;
+}
+
+
+uint16_t fadeGamma(uint32_t channel, uint16_t v) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGamma_internal(v, gamma_table_fast);
+  } else {
+    return v;
+  }
+}
+uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGammaReverse_internal(vg, gamma_table_fast);
+  } else {
+    return vg;
+  }
+}
+
+bool LightApplyFade(void) {
+  static uint32_t last_millis = 0;
+  uint32_t now = millis();
+
+  if ((now - last_millis) <= 5) {
+    return false;
+  }
+  last_millis = now;
+
+
+  if (0 == Light.fade_duration) {
+    Light.fade_start = now;
+
+    uint32_t distance = 0;
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      int32_t channel_distance = fadeGammaReverse(i, Light.fade_end_10[i]) - fadeGammaReverse(i, Light.fade_start_10[i]);
+      if (channel_distance < 0) { channel_distance = - channel_distance; }
+      if (channel_distance > distance) { distance = channel_distance; }
+    }
+    if (distance > 0) {
+
+
+
+      Light.fade_duration = (distance * Settings.light_speed * 500) / 1023;
+      if (Settings.save_data) {
+
+        uint32_t delay_seconds = 1 + (Light.fade_duration + 999) / 1000;
+
+        if (save_data_counter < delay_seconds) {
+          save_data_counter = delay_seconds;
+        }
+      }
+    } else {
+
+      Light.fade_running = false;
+    }
+  }
+
+  uint16_t fade_current = now - Light.fade_start;
+  if (fade_current <= Light.fade_duration) {
+
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      Light.fade_cur_10[i] = fadeGamma(i,
+                                changeUIntScale(fadeGammaReverse(i, fade_current),
+                                             0, Light.fade_duration,
+                                             fadeGammaReverse(i, Light.fade_start_10[i]),
+                                             fadeGammaReverse(i, Light.fade_end_10[i])));
+
+
+
+    }
+  } else {
+
+
+    Light.fade_running = false;
+    Light.fade_start = 0;
+    Light.fade_duration = 0;
+
+    memcpy(Light.fade_cur_10, Light.fade_end_10, sizeof(Light.fade_end_10));
+
+    memcpy(Light.fade_start_10, Light.fade_end_10, sizeof(Light.fade_start_10));
+  }
+  return true;
+}
+
+
+
+void LightApplyPower(uint8_t new_color[LST_MAX], power_t power) {
+
+  if (Light.pwm_multi_channels) {
+
+    for (uint32_t i = 0; i < LST_MAX; i++) {
+      if (0 == bitRead(power,i)) {
+        new_color[i] = 0;
+      }
+    }
+
+
+
+
+
+  } else {
+    if (!light_controller.isCTRGBLinked()) {
+
+      if (0 == (power & 1)) {
+        new_color[0] = new_color[1] = new_color[2] = 0;
+      }
+      if (0 == (power & 2)) {
+        new_color[3] = new_color[4] = 0;
+      }
+    } else if (!power) {
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        new_color[i] = 0;
+      }
+    }
+  }
+}
+
+void LightSetOutputs(const uint16_t *cur_col_10) {
+
+  if (light_type < LT_PWM6) {
+    for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) {
+      if (pin[GPIO_PWM1 +i] < 99) {
+
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10[(i + Light.pwm_offset)] : cur_col_10[(i + Light.pwm_offset)]);
+      }
+    }
+  }
+
+
+
+
+  uint8_t cur_col[LST_MAX];
+  for (uint32_t i = 0; i < LST_MAX; i++) {
+    cur_col[i] = change10to8(cur_col_10[i]);
+  }
+
+
+  uint8_t scale_col[3];
+  uint32_t max = (cur_col[0] > cur_col[1] && cur_col[0] > cur_col[2]) ? cur_col[0] : (cur_col[1] > cur_col[2]) ? cur_col[1] : cur_col[2];
+  for (uint32_t i = 0; i < 3; i++) {
+    scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
+  }
+
+  char *tmp_data = XdrvMailbox.data;
+  char *tmp_topic = XdrvMailbox.topic;
+  XdrvMailbox.data = (char*)cur_col;
+  XdrvMailbox.topic = (char*)scale_col;
+  if (XlgtCall(FUNC_SET_CHANNELS)) { }
+  else if (XdrvCall(FUNC_SET_CHANNELS)) { }
+  XdrvMailbox.data = tmp_data;
+  XdrvMailbox.topic = tmp_topic;
+}
+
+
+void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
+
+  if (Settings.light_correction) {
+    for (uint32_t i = 0; i < LST_MAX; i++) {
+      cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
+    }
+  }
+}
+
+void calcGammaBulbs(uint16_t cur_col_10[5]) {
+
+
+
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+
+    uint32_t cw1 = Light.subtype - 1;
+    uint32_t cw0 = Light.subtype - 2;
+    uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];
+    uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;
+
+    if (PHILIPS == my_module_type) {
+
+      cur_col_10[cw1] = light_state.getCT10bits();
+
+      if (Settings.light_correction) {
+        cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);
+      } else {
+        cur_col_10[cw0] = white_bri10_1023;
+      }
+    } else if (Settings.light_correction) {
+
+      if (white_bri10 <= 1031) {
+
+        uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
+
+        cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
+        cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
+      } else {
+        cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
+        cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
+      }
+    }
+  }
+
+  if (Settings.light_correction) {
+
+    if (LST_RGB <= Light.subtype) {
+      for (uint32_t i = 0; i < 3; i++) {
+        cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
+      }
+    }
+
+    if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
+      cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
+    }
+  }
+}
+
+
+
+
+
+bool LightColorEntry(char *buffer, uint32_t buffer_length)
+{
+  char scolor[10];
+  char *p;
+  char *str;
+  uint32_t entry_type = 0;
+  uint8_t value = Light.fixed_color_index;
+
+  if (buffer[0] == '#') {
+    buffer++;
+    buffer_length--;
+  }
+
+  if (Light.subtype >= LST_RGB) {
+    char option = (1 == buffer_length) ? buffer[0] : '\0';
+    if (('+' == option) && (Light.fixed_color_index < MAX_FIXED_COLOR)) {
+      value++;
+    }
+    else if (('-' == option) && (Light.fixed_color_index > 1)) {
+      value--;
+    } else {
+      value = atoi(buffer);
+    }
+  }
+
+  memset(&Light.entry_color, 0x00, sizeof(Light.entry_color));
+
+  while ((buffer_length > 0) && ('=' == buffer[buffer_length - 1])) {
+    buffer_length--;
+    memcpy(&Light.entry_color, &Light.current_color, sizeof(Light.entry_color));
+  }
+  if (strstr(buffer, ",") != nullptr) {
+    int8_t i = 0;
+    for (str = strtok_r(buffer, ",", &p); str && i < 6; str = strtok_r(nullptr, ",", &p)) {
+      if (i < LST_MAX) {
+        Light.entry_color[i++] = atoi(str);
+      }
+    }
+    entry_type = 2;
+  }
+  else if (((2 * Light.subtype) == buffer_length) || (buffer_length > 3)) {
+    for (uint32_t i = 0; i < tmin((uint)(buffer_length / 2), sizeof(Light.entry_color)); i++) {
+      strlcpy(scolor, buffer + (i *2), 3);
+      Light.entry_color[i] = (uint8_t)strtol(scolor, &p, 16);
+    }
+    entry_type = 1;
+  }
+  else if ((Light.subtype >= LST_RGB) && (value > 0) && (value <= MAX_FIXED_COLOR)) {
+    Light.fixed_color_index = value;
+    memcpy_P(&Light.entry_color, &kFixedColor[value -1], 3);
+    entry_type = 1;
+  }
+  else if ((value > 199) && (value <= 199 + MAX_FIXED_COLD_WARM)) {
+    if (LST_RGBW == Light.subtype) {
+      memcpy_P(&Light.entry_color[3], &kFixedWhite[value -200], 1);
+      entry_type = 1;
+    }
+    else if (LST_COLDWARM == Light.subtype) {
+      memcpy_P(&Light.entry_color, &kFixedColdWarm[value -200], 2);
+      entry_type = 1;
+    }
+    else if (LST_RGBCW == Light.subtype) {
+      memcpy_P(&Light.entry_color[3], &kFixedColdWarm[value -200], 2);
+      entry_type = 1;
+    }
+  }
+  if (entry_type) {
+    Settings.flag.decimal_text = entry_type -1;
+  }
+  return (entry_type);
+}
+
+
+
+void CmndSupportColor(void)
+{
+  bool valid_entry = false;
+  bool coldim = false;
+
+  if (XdrvMailbox.data_len > 0) {
+    valid_entry = LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len);
+    if (valid_entry) {
+      if (XdrvMailbox.index <= 2) {
+        uint32_t old_bri = light_state.getBri();
+
+        light_controller.changeChannels(Light.entry_color);
+        if (2 == XdrvMailbox.index) {
+
+          light_controller.changeBri(old_bri);
+        }
+
+        Settings.light_scheme = 0;
+        coldim = true;
+      } else {
+        for (uint32_t i = 0; i < LST_RGB; i++) {
+          Settings.ws_color[XdrvMailbox.index -3][i] = Light.entry_color[i];
+        }
+      }
+    }
+  }
+  char scolor[LIGHT_COLOR_SIZE];
+  if (!valid_entry && (XdrvMailbox.index <= 2)) {
+    ResponseCmndChar(LightGetColor(scolor));
+  }
+  if (XdrvMailbox.index >= 3) {
+    scolor[0] = '\0';
+    for (uint32_t i = 0; i < LST_RGB; i++) {
+      if (Settings.flag.decimal_text) {
+        snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.ws_color[XdrvMailbox.index -3][i]);
+      } else {
+        snprintf_P(scolor, sizeof(scolor), PSTR("%s%02X"), scolor, Settings.ws_color[XdrvMailbox.index -3][i]);
+      }
+    }
+    ResponseCmndIdxChar(scolor);
+  }
+  if (coldim) {
+    LightPreparePower();
+  }
+}
+
+void CmndColor(void)
+{
+
+
+
+
+
+
+
+  if ((Light.subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) {
+    CmndSupportColor();
+  }
+}
+
+void CmndWhite(void)
+{
+
+
+  if (Light.pwm_multi_channels) { return; }
+  if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      light_controller.changeDimmer(XdrvMailbox.payload, 2);
+      LightPreparePower(2);
+    } else {
+      ResponseCmndNumber(light_state.getDimmer(2));
+    }
+  }
+}
+
+void CmndChannel(void)
+{
+
+
+
+
+  if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
+    uint32_t light_index = XdrvMailbox.index - Light.device;
+    power_t coldim = 0;
+
+
+    if (1 == XdrvMailbox.data_len) {
+      uint8_t channel = changeUIntScale(Light.current_color[light_index],0,255,0,100);
+      if ('+' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10;
+      } else if ('-' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (channel < 11) ? 1 : channel - 10;
+      }
+    }
+
+
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      Light.current_color[light_index] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
+      if (Light.pwm_multi_channels) {
+        coldim = 1 << light_index;
+      } else {
+        if (light_controller.isCTRGBLinked()) {
+
+          if ((light_index < 3) && (light_controller.isCTRGBLinked())) {
+            Light.current_color[3] = Light.current_color[4] = 0;
+          } else {
+            Light.current_color[0] = Light.current_color[1] = Light.current_color[2] = 0;
+          }
+          coldim = 1;
+        } else {
+          if (light_index < 3) { coldim = 1; }
+          else { coldim = 2; }
+        }
+      }
+      light_controller.changeChannels(Light.current_color);
+    }
+    ResponseCmndIdxNumber(changeUIntScale(Light.current_color[light_index],0,255,0,100));
+    if (coldim) {
+      LightPreparePower(coldim);
+    }
+  }
+}
+
+void CmndHsbColor(void)
+{
+
+
+
+
+
+
+
+  if (Light.subtype >= LST_RGB) {
+    if (XdrvMailbox.data_len > 0) {
+      uint16_t c_hue;
+      uint8_t c_sat;
+      light_state.getHSB(&c_hue, &c_sat, nullptr);
+      uint32_t HSB[3];
+      HSB[0] = c_hue;
+      HSB[1] = c_sat;
+      HSB[2] = light_state.getBriRGB();
+      if ((2 == XdrvMailbox.index) || (3 == XdrvMailbox.index)) {
+        if ((uint32_t)XdrvMailbox.payload > 100) { XdrvMailbox.payload = 100; }
+        HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
+      } else {
+        uint32_t paramcount = ParseParameters(3, HSB);
+        if (HSB[0] > 360) { HSB[0] = 360; }
+        for (uint32_t i = 1; i < paramcount; i++) {
+          if (HSB[i] > 100) { HSB[i] == 100; }
+          HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255);
+        }
+      }
+      light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
+      LightPreparePower(1);
+    } else {
+      LightState(0);
+    }
+  }
+}
+
+void CmndScheme(void)
+{
+
+
+
+
+
+  if (Light.subtype >= LST_RGB) {
+    uint32_t max_scheme = Light.max_scheme;
+
+    if (1 == XdrvMailbox.data_len) {
+      if (('+' == XdrvMailbox.data[0]) && (Settings.light_scheme < max_scheme)) {
+        XdrvMailbox.payload = Settings.light_scheme + ((0 == Settings.light_scheme) ? 2 : 1);
+      }
+      else if (('-' == XdrvMailbox.data[0]) && (Settings.light_scheme > 0)) {
+        XdrvMailbox.payload = Settings.light_scheme - ((2 == Settings.light_scheme) ? 2 : 1);
+      }
+    }
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= max_scheme)) {
+      uint32_t parm[2];
+      if (ParseParameters(2, parm) > 1) {
+        Light.wheel = parm[1];
+      }
+      Settings.light_scheme = XdrvMailbox.payload;
+      if (LS_WAKEUP == Settings.light_scheme) {
+        Light.wakeup_active = 3;
+      }
+      LightPowerOn();
+      Light.strip_timer_counter = 0;
+
+      if (Settings.flag3.hass_tele_on_power) {
+        MqttPublishTeleState();
+      }
+    }
+    ResponseCmndNumber(Settings.light_scheme);
+  }
+}
+
+void CmndWakeup(void)
+{
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    light_controller.changeDimmer(XdrvMailbox.payload);
+  }
+  Light.wakeup_active = 3;
+  Settings.light_scheme = LS_WAKEUP;
+  LightPowerOn();
+  ResponseCmndChar(D_JSON_STARTED);
+}
+
+void CmndColorTemperature(void)
+{
+
+
+
+
+  if (Light.pwm_multi_channels) { return; }
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+    uint32_t ct = light_state.getCT();
+    if (1 == XdrvMailbox.data_len) {
+      if ('+' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (ct > (CT_MAX-34)) ? CT_MAX : ct + 34;
+      }
+      else if ('-' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (ct < (CT_MIN+34)) ? CT_MIN : ct - 34;
+      }
+    }
+    if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {
+      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBriCT());
+      LightPreparePower(2);
+    } else {
+      ResponseCmndNumber(ct);
+    }
+  }
+}
+
+void CmndDimmer(void)
+{
+
+
+
+
+
+
+  uint32_t dimmer;
+  if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
+
+  if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
+    dimmer = light_state.getDimmer();
+  } else {
+    dimmer = light_state.getDimmer(XdrvMailbox.index);
+  }
+
+  if (1 == XdrvMailbox.data_len) {
+    if ('+' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (dimmer > 89) ? 100 : dimmer + 10;
+    } else if ('-' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (dimmer < 11) ? 1 : dimmer - 10;
+    }
+  }
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    if (light_controller.isCTRGBLinked()) {
+
+      light_controller.changeDimmer(XdrvMailbox.payload);
+      LightPreparePower();
+    } else {
+      if (0 != XdrvMailbox.index) {
+        light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
+        LightPreparePower(1 << (XdrvMailbox.index - 1));
+      } else {
+
+        light_controller.changeDimmer(XdrvMailbox.payload, 1);
+        light_controller.changeDimmer(XdrvMailbox.payload, 2);
+        LightPreparePower();
+      }
+    }
+    Light.update = true;
+  } else {
+    ResponseCmndNumber(dimmer);
+  }
+}
+
+void CmndDimmerRange(void)
+{
+
+
+  if (XdrvMailbox.data_len > 0) {
+    uint32_t parm[2];
+    parm[0] = Settings.dimmer_hw_min;
+    parm[1] = Settings.dimmer_hw_max;
+    ParseParameters(2, parm);
+    if (parm[0] < parm[1]) {
+      Settings.dimmer_hw_min = parm[0];
+      Settings.dimmer_hw_max = parm[1];
+    } else {
+      Settings.dimmer_hw_min = parm[1];
+      Settings.dimmer_hw_max = parm[0];
+    }
+    restart_flag = 2;
+  }
+  Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
+}
+
+void CmndLedTable(void)
+{
+
+
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    switch (XdrvMailbox.payload) {
+    case 0:
+    case 1:
+      Settings.light_correction = XdrvMailbox.payload;
+      break;
+    case 2:
+      Settings.light_correction ^= 1;
+      break;
+    }
+    Light.update = true;
+  }
+  ResponseCmndStateText(Settings.light_correction);
+}
+
+void CmndRgbwwTable(void)
+{
+
+
+  if ((XdrvMailbox.data_len > 0)) {
+    uint32_t parm[LST_RGBCW -1];
+    uint32_t parmcount = ParseParameters(LST_RGBCW, parm);
+    for (uint32_t i = 0; i < parmcount; i++) {
+      Settings.rgbwwTable[i] = parm[i];
+    }
+    Light.update = true;
+  }
+  char scolor[LIGHT_COLOR_SIZE];
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < LST_RGBCW; i++) {
+    snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
+  }
+  ResponseCmndChar(scolor);
+}
+
+void CmndFade(void)
+{
+
+
+
+
+  switch (XdrvMailbox.payload) {
+  case 0:
+  case 1:
+    Settings.light_fade = XdrvMailbox.payload;
+    break;
+  case 2:
+    Settings.light_fade ^= 1;
+    break;
+  }
+  if (!Settings.light_fade) { Light.fade_running = false; }
+  ResponseCmndStateText(Settings.light_fade);
+}
+
+void CmndSpeed(void)
+{
+
+
+
+
+  if (1 == XdrvMailbox.data_len) {
+    if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
+      XdrvMailbox.payload = Settings.light_speed - 1;
+    }
+    else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) {
+      XdrvMailbox.payload = Settings.light_speed + 1;
+    }
+  }
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
+    Settings.light_speed = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.light_speed);
+}
+
+void CmndWakeupDuration(void)
+{
+
+
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3001)) {
+    Settings.light_wakeup = XdrvMailbox.payload;
+    Light.wakeup_active = 0;
+  }
+  ResponseCmndNumber(Settings.light_wakeup);
+}
+
+void CmndUndocA(void)
+{
+
+  char scolor[LIGHT_COLOR_SIZE];
+  LightGetColor(scolor, true);
+  scolor[6] = '\0';
+  Response_P(PSTR("%s,%d,%d,%d,%d,%d"), scolor, Settings.light_fade, Settings.light_correction, Settings.light_scheme, Settings.light_speed, Settings.light_width);
+  MqttPublishPrefixTopic_P(STAT, XdrvMailbox.topic);
+  mqtt_data[0] = '\0';
+}
+
+
+
+
+
+bool Xdrv04(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_MODULE_INIT == function) {
+    return LightModuleInit();
+  }
+  else if (light_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = XlgtCall(FUNC_SERIAL);
+        break;
+      case FUNC_LOOP:
+        if (Light.fade_running) {
+          if (LightApplyFade()) {
+            LightSetOutputs(Light.fade_cur_10);
+          }
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        LightAnimate();
+        break;
+      case FUNC_SET_POWER:
+        LightSetPower();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kLightCommands, LightCommand);
+        if (!result) {
+          result = XlgtCall(FUNC_COMMAND);
+        }
+        break;
+      case FUNC_PRE_INIT:
+        LightInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote.ino"
+#if defined(USE_IR_REMOTE) && !defined(USE_IR_REMOTE_FULL)
+
+
+
+
+#define XDRV_05 5
+
+#include <IRremoteESP8266.h>
+
+enum IrErrors { IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND };
+
+const char kIrRemoteCommands[] PROGMEM = "|" D_CMND_IRSEND ;
+
+
+void (* const IrRemoteCommand[])(void) PROGMEM = {
+  &CmndIrSend };
+
+
+static const uint8_t MAX_STANDARD_IR = NEC;
+const char kIrRemoteProtocols[] PROGMEM = "UNKNOWN|RC5|RC6|NEC";
+
+
+
+
+
+#include <IRsend.h>
+
+IRsend *irsend = nullptr;
+bool irsend_active = false;
+
+void IrSendInit(void)
+{
+  irsend = new IRsend(pin[GPIO_IRSEND]);
+  irsend->begin();
+}
+
+#ifdef USE_IR_RECEIVE
+
+
+
+
+const bool IR_RCV_SAVE_BUFFER = false;
+const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
+
+#include <IRrecv.h>
+
+IRrecv *irrecv = nullptr;
+
+unsigned long ir_lasttime = 0;
+
+void IrReceiveUpdateThreshold(void)
+{
+  if (irrecv != nullptr) {
+    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
+    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  }
+}
+
+void IrReceiveInit(void)
+{
+
+  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_RCV_BUFFER_SIZE, IR_RCV_TIMEOUT, IR_RCV_SAVE_BUFFER);
+  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  irrecv->enableIRIn();
+
+
+}
+
+void IrReceiveCheck(void)
+{
+  char sirtype[8];
+  int8_t iridx = 0;
+
+  decode_results results;
+
+  if (irrecv->decode(&results)) {
+    char hvalue[65];
+
+    iridx = results.decode_type;
+    if ((iridx < 0) || (iridx > MAX_STANDARD_IR)) { iridx = 0; }
+
+    if (iridx) {
+      if (results.bits > 64) {
+
+        uint32_t digits2 = results.bits / 8;
+        if (results.bits % 8) { digits2++; }
+        ToHex_P((unsigned char*)results.state, digits2, hvalue, sizeof(hvalue));
+      } else {
+        Uint64toHex(results.value, hvalue, results.bits);
+      }
+    } else {
+      Uint64toHex(results.value, hvalue, 32);
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_IRR "Echo %d, RawLen %d, Overflow %d, Bits %d, Value 0x%s, Decode %d"),
+              irsend_active, results.rawlen, results.overflow, results.bits, hvalue, results.decode_type);
+
+    unsigned long now = millis();
+
+    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
+      ir_lasttime = now;
+
+      char svalue[64];
+      if (Settings.flag.ir_receive_decimal) {
+        ulltoa(results.value, svalue, 10);
+      } else {
+        snprintf_P(svalue, sizeof(svalue), PSTR("\"0x%s\""), hvalue);
+      }
+      ResponseTime_P(PSTR(",\"" D_JSON_IRRECEIVED "\":{\"" D_JSON_IR_PROTOCOL "\":\"%s\",\"" D_JSON_IR_BITS "\":%d"),
+        GetTextIndexed(sirtype, sizeof(sirtype), iridx, kIrRemoteProtocols), results.bits);
+      if (iridx) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_DATA "\":%s"), svalue);
+      } else {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_HASH "\":%s"), svalue);
+      }
+
+      if (Settings.flag3.receive_raw) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
+        uint16_t i;
+        for (i = 1; i < results.rawlen; i++) {
+          if (i > 1) { ResponseAppend_P(PSTR(",")); }
+          uint32_t usecs;
+          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
+            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
+          }
+          ResponseAppend_P(PSTR("%d"), usecs);
+          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
+        }
+        uint16_t extended_length = results.rawlen - 1;
+        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
+          uint32_t usecs = results.rawbuf[j] * kRawTick;
+
+          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
+        }
+        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
+      }
+
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
+
+      XdrvRulesProcess();
+#ifdef USE_DOMOTICZ
+      if (iridx) {
+        unsigned long value = results.value | (iridx << 28);
+        DomoticzSensor(DZ_COUNT, value);
+      }
+#endif
+    }
+
+    irrecv->resume();
+  }
+}
+#endif
+
+
+
+
+
+uint32_t IrRemoteCmndIrSendJson(void)
+{
+
+
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) {
+    return IE_INVALID_JSON;
+  }
+
+  StaticJsonBuffer<140> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(dataBufUc);
+  if (!root.success()) {
+    return IE_INVALID_JSON;
+  }
+
+
+
+  char parm_uc[10];
+  const char *protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_PROTOCOL))];
+  uint16_t bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS))];
+  uint64_t data = strtoull(root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA))], nullptr, 0);
+  uint16_t repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT))];
+
+  if (XdrvMailbox.index > repeat + 1) {
+    repeat = XdrvMailbox.index - 1;
+  }
+  if (!(protocol && bits)) {
+    return IE_SYNTAX_IRSEND;
+  }
+
+  char protocol_text[20];
+  int protocol_code = GetCommandCode(protocol_text, sizeof(protocol_text), protocol, kIrRemoteProtocols);
+
+  char dvalue[64];
+  char hvalue[20];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %s (0x%s), repeat %d, protocol_code %d"),
+    protocol_text, protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat, protocol_code);
+
+  irsend_active = true;
+  switch (protocol_code) {
+#ifdef USE_IR_SEND_RC5
+    case RC5:
+      irsend->sendRC5(data, bits, repeat); break;
+#endif
+#ifdef USE_IR_SEND_RC6
+    case RC6:
+      irsend->sendRC6(data, bits, repeat); break;
+#endif
+#ifdef USE_IR_SEND_NEC
+    case NEC:
+      irsend->sendNEC(data, (bits > NEC_BITS) ? NEC_BITS : bits, repeat); break;
+#endif
+    default:
+      irsend_active = false;
+      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
+  }
+
+  return IE_NO_ERROR;
+}
+
+void CmndIrSend(void)
+{
+  uint8_t error = IE_SYNTAX_IRSEND;
+
+  if (XdrvMailbox.data_len) {
+
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      error = IE_INVALID_JSON;
+    } else {
+      error = IrRemoteCmndIrSendJson();
+    }
+  }
+  IrRemoteCmndResponse(error);
+}
+
+void IrRemoteCmndResponse(uint32_t error)
+{
+  switch (error) {
+    case IE_INVALID_RAWDATA:
+      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
+      break;
+    case IE_INVALID_JSON:
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      break;
+    case IE_SYNTAX_IRSEND:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_PROTOCOL ", " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
+      break;
+    default:
+      ResponseCmndDone();
+  }
+}
+
+
+
+
+
+bool Xdrv05(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        if (pin[GPIO_IRSEND] < 99) {
+          IrSendInit();
+        }
+#ifdef USE_IR_RECEIVE
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveInit();
+        }
+#endif
+        break;
+      case FUNC_EVERY_50_MSECOND:
+#ifdef USE_IR_RECEIVE
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveCheck();
+        }
+#endif
+        irsend_active = false;
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_IRSEND] < 99) {
+          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote_full.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote_full.ino"
+#ifdef USE_IR_REMOTE_FULL
+
+
+
+
+#define XDRV_05 5
+
+#include <IRremoteESP8266.h>
+#include <IRsend.h>
+#include <IRrecv.h>
+#include <IRutils.h>
+#include <IRac.h>
+
+enum IrErrors { IE_RESPONSE_PROVIDED, IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND, IE_SYNTAX_IRHVAC,
+                IE_UNSUPPORTED_HVAC, IE_UNSUPPORTED_PROTOCOL };
+
+const char kIrRemoteCommands[] PROGMEM = "|"
+  D_CMND_IRHVAC "|" D_CMND_IRSEND ;
+
+void (* const IrRemoteCommand[])(void) PROGMEM = {
+  &CmndIrHvac, &CmndIrSend };
+
+
+
+
+
+IRsend *irsend = nullptr;
+bool irsend_active = false;
+
+void IrSendInit(void)
+{
+  irsend = new IRsend(pin[GPIO_IRSEND]);
+  irsend->begin();
+}
+
+
+
+uint8_t reverseBitsInByte(uint8_t b) {
+   b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+   b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+   b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+   return b;
+}
+
+
+uint64_t reverseBitsInBytes64(uint64_t b) {
+  union {
+    uint8_t b[8];
+    uint64_t i;
+  } a;
+  a.i = b;
+  for (uint32_t i=0; i<8; i++) {
+    a.b[i] = reverseBitsInByte(a.b[i]);
+  }
+  return a.i;
+}
+
+
+
+
+
+const bool IR_FULL_RCV_SAVE_BUFFER = false;
+const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
+
+
+
+
+const uint16_t IR_FULL_BUFFER_SIZE = 1024;
+
+
+
+const uint8_t IR__FULL_RCV_TIMEOUT = 50;
+
+IRrecv *irrecv = nullptr;
+
+unsigned long ir_lasttime = 0;
+
+void IrReceiveUpdateThreshold(void)
+{
+  if (irrecv != nullptr) {
+    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
+    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  }
+}
+
+void IrReceiveInit(void)
+{
+
+  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_FULL_BUFFER_SIZE, IR__FULL_RCV_TIMEOUT, IR_FULL_RCV_SAVE_BUFFER);
+  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  irrecv->enableIRIn();
+}
+
+String sendACJsonState(const stdAc::state_t &state) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+  json[D_JSON_IRHVAC_VENDOR] = typeToString(state.protocol);
+  json[D_JSON_IRHVAC_MODEL] = state.model;
+  json[D_JSON_IRHVAC_POWER] = IRac::boolToString(state.power);
+  json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(state.mode);
+
+  if (state.mode == stdAc::opmode_t::kOff || !state.power) {
+    json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(stdAc::opmode_t::kOff);
+    json[D_JSON_IRHVAC_POWER] = IRac::boolToString(false);
+  }
+  json[D_JSON_IRHVAC_CELSIUS] = IRac::boolToString(state.celsius);
+  if (floorf(state.degrees) == state.degrees) {
+    json[D_JSON_IRHVAC_TEMP] = floorf(state.degrees);
+  } else {
+    json[D_JSON_IRHVAC_TEMP] = RawJson(String(state.degrees, 1));
+  }
+  json[D_JSON_IRHVAC_FANSPEED] = IRac::fanspeedToString(state.fanspeed);
+  json[D_JSON_IRHVAC_SWINGV] = IRac::swingvToString(state.swingv);
+  json[D_JSON_IRHVAC_SWINGH] = IRac::swinghToString(state.swingh);
+  json[D_JSON_IRHVAC_QUIET] = IRac::boolToString(state.quiet);
+  json[D_JSON_IRHVAC_TURBO] = IRac::boolToString(state.turbo);
+  json[D_JSON_IRHVAC_ECONO] = IRac::boolToString(state.econo);
+  json[D_JSON_IRHVAC_LIGHT] = IRac::boolToString(state.light);
+  json[D_JSON_IRHVAC_FILTER] = IRac::boolToString(state.filter);
+  json[D_JSON_IRHVAC_CLEAN] = IRac::boolToString(state.clean);
+  json[D_JSON_IRHVAC_BEEP] = IRac::boolToString(state.beep);
+  json[D_JSON_IRHVAC_SLEEP] = state.sleep;
+
+  String payload = "";
+  payload.reserve(200);
+  json.printTo(payload);
+  return payload;
+}
+
+String sendIRJsonState(const struct decode_results &results) {
+  String json("{");
+  json += "\"" D_JSON_IR_PROTOCOL "\":\"";
+  json += typeToString(results.decode_type);
+  json += "\",\"" D_JSON_IR_BITS "\":";
+  json += results.bits;
+
+  if (hasACState(results.decode_type)) {
+    json += ",\"" D_JSON_IR_DATA "\":\"0x";
+    json += resultToHexidecimal(&results);
+    json += "\"";
+  } else {
+    if (UNKNOWN != results.decode_type) {
+      json += ",\"" D_JSON_IR_DATA "\":";
+    } else {
+      json += ",\"" D_JSON_IR_HASH "\":";
+    }
+    if (Settings.flag.ir_receive_decimal) {
+      char svalue[32];
+      ulltoa(results.value, svalue, 10);
+      json += svalue;
+    } else {
+      char hvalue[64];
+      if (UNKNOWN != results.decode_type) {
+        Uint64toHex(results.value, hvalue, results.bits);
+        json += "\"0x";
+        json += hvalue;
+        json += "\",\"" D_JSON_IR_DATALSB "\":\"0x";
+        Uint64toHex(reverseBitsInBytes64(results.value), hvalue, results.bits);
+        json += hvalue;
+        json += "\"";
+      } else {
+        Uint64toHex(results.value, hvalue, 32);
+        json += "\"0x";
+        json += hvalue;
+        json += "\"";
+      }
+    }
+  }
+  json += ",\"" D_JSON_IR_REPEAT "\":";
+  json += results.repeat;
+
+  stdAc::state_t ac_result;
+  if (IRAcUtils::decodeToState(&results, &ac_result, nullptr)) {
+
+    json += ",\"" D_CMND_IRHVAC "\":";
+    json += sendACJsonState(ac_result);
+  }
+
+  return json;
+}
+
+void IrReceiveCheck(void)
+{
+  decode_results results;
+
+  if (irrecv->decode(&results)) {
+    uint32_t now = millis();
+
+
+    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
+      ir_lasttime = now;
+      Response_P(PSTR("{\"" D_JSON_IRRECEIVED "\":%s"), sendIRJsonState(results).c_str());
+
+      if (Settings.flag3.receive_raw) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
+        uint16_t i;
+        for (i = 1; i < results.rawlen; i++) {
+          if (i > 1) { ResponseAppend_P(PSTR(",")); }
+          uint32_t usecs;
+          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
+            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
+          }
+          ResponseAppend_P(PSTR("%d"), usecs);
+          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
+        }
+        uint16_t extended_length = results.rawlen - 1;
+        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
+          uint32_t usecs = results.rawbuf[j] * kRawTick;
+
+          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
+        }
+        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
+      }
+
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
+
+      XdrvRulesProcess();
+    }
+
+    irrecv->resume();
+  }
+}
+
+
+
+
+
+
+
+String listSupportedProtocols(bool hvac) {
+  String l("");
+  bool first = true;
+  for (uint32_t i = UNUSED + 1; i <= kLastDecodeType; i++) {
+    bool found = false;
+    if (hvac) {
+      found = IRac::isProtocolSupported((decode_type_t)i);
+    } else {
+      found = (IRsend::defaultBits((decode_type_t)i) > 0) && (!IRac::isProtocolSupported((decode_type_t)i));
+    }
+    if (found) {
+      if (first) {
+        first = false;
+      } else {
+        l += "|";
+      }
+      l += typeToString((decode_type_t)i);
+    }
+  }
+  return l;
+}
+
+
+const stdAc::fanspeed_t IrHvacFanSpeed[] PROGMEM = { stdAc::fanspeed_t::kAuto,
+                      stdAc::fanspeed_t::kMin, stdAc::fanspeed_t::kLow,stdAc::fanspeed_t::kMedium,
+                      stdAc::fanspeed_t::kHigh, stdAc::fanspeed_t::kMax };
+
+uint32_t IrRemoteCmndIrHvacJson(void)
+{
+  stdAc::state_t state, prev;
+  char parm_uc[12];
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
+
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(dataBufUc);
+  if (!json.success()) { return IE_INVALID_JSON; }
+
+
+  state.protocol = decode_type_t::UNKNOWN;
+  state.model = 1;
+  state.mode = stdAc::opmode_t::kAuto;
+  state.power = false;
+  state.celsius = true;
+  state.degrees = 21.0f;
+  state.fanspeed = stdAc::fanspeed_t::kMedium;
+  state.swingv = stdAc::swingv_t::kOff;
+  state.swingh = stdAc::swingh_t::kOff;
+  state.light = false;
+  state.beep = false;
+  state.econo = false;
+  state.filter = false;
+  state.turbo = false;
+  state.quiet = false;
+  state.sleep = -1;
+  state.clean = false;
+  state.clock = -1;
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
+  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
+  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
+  if (decode_type_t::UNKNOWN == state.protocol) { return IE_UNSUPPORTED_HVAC; }
+  if (!IRac::isProtocolSupported(state.protocol)) { return IE_UNSUPPORTED_HVAC; }
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FANSPEED));
+  if (json.containsKey(parm_uc)) {
+    uint32_t fan_speed = json[parm_uc];
+    if ((fan_speed >= 1) && (fan_speed <= 5)) {
+      state.fanspeed = (stdAc::fanspeed_t) pgm_read_byte(&IrHvacFanSpeed[fan_speed]);
+    } else {
+      state.fanspeed = IRac::strToFanspeed(json[parm_uc]);
+    }
+  }
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODEL));
+  if (json.containsKey(parm_uc)) { state.model = IRac::strToModel(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODE));
+  if (json.containsKey(parm_uc)) { state.mode = IRac::strToOpmode(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGV));
+  if (json.containsKey(parm_uc)) { state.swingv = IRac::strToSwingV(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGH));
+  if (json.containsKey(parm_uc)) { state.swingh = IRac::strToSwingH(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TEMP));
+  if (json.containsKey(parm_uc)) { state.degrees = json[parm_uc]; }
+
+
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_POWER));
+  if (json.containsKey(parm_uc)) { state.power = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CELSIUS));
+  if (json.containsKey(parm_uc)) { state.celsius = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_LIGHT));
+  if (json.containsKey(parm_uc)) { state.light = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_BEEP));
+  if (json.containsKey(parm_uc)) { state.beep = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_ECONO));
+  if (json.containsKey(parm_uc)) { state.econo = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FILTER));
+  if (json.containsKey(parm_uc)) { state.filter = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TURBO));
+  if (json.containsKey(parm_uc)) { state.turbo = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_QUIET));
+  if (json.containsKey(parm_uc)) { state.quiet = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CLEAN));
+  if (json.containsKey(parm_uc)) { state.clean = IRac::strToBool(json[parm_uc]); }
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SLEEP));
+  if (json[parm_uc]) { state.sleep = json[parm_uc]; }
+
+
+  IRac ac(pin[GPIO_IRSEND]);
+  bool success = ac.sendAc(state, &prev);
+  if (!success) { return IE_SYNTAX_IRHVAC; }
+
+  Response_P(PSTR("{\"" D_CMND_IRHVAC "\":%s}"), sendACJsonState(state).c_str());
+  return IE_RESPONSE_PROVIDED;
+}
+
+void CmndIrHvac(void)
+{
+  uint8_t error = IE_SYNTAX_IRHVAC;
+
+  if (XdrvMailbox.data_len) {
+    error = IrRemoteCmndIrHvacJson();
+  }
+  if (error != IE_RESPONSE_PROVIDED) { IrRemoteCmndResponse(error); }
+}
+
+
+
+
+
+uint32_t IrRemoteCmndIrSendJson(void)
+{
+  char parm_uc[12];
+
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
+
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(dataBufUc);
+  if (!json.success()) { return IE_INVALID_JSON; }
+
+
+
+  decode_type_t protocol = decode_type_t::UNKNOWN;
+  uint16_t bits = 0;
+  uint64_t data;
+  uint8_t repeat = 0;
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
+  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
+  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
+  if (decode_type_t::UNKNOWN == protocol) { return IE_UNSUPPORTED_PROTOCOL; }
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS));
+  if (json.containsKey(parm_uc)) { bits = json[parm_uc]; }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT));
+  if (json.containsKey(parm_uc)) { repeat = json[parm_uc]; }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATALSB));
+  if (json.containsKey(parm_uc)) { data = reverseBitsInBytes64(strtoull(json[parm_uc], nullptr, 0)); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA));
+  if (json.containsKey(parm_uc)) { data = strtoull(json[parm_uc], nullptr, 0); }
+  if (0 == bits) { return IE_SYNTAX_IRSEND; }
+
+
+  if (XdrvMailbox.index > repeat + 1) { repeat = XdrvMailbox.index - 1; }
+
+  char dvalue[32];
+  char hvalue[32];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol %d, bits %d, data 0x%s (%s), repeat %d"),
+    protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat);
+
+  irsend_active = true;
+  bool success = irsend->send(protocol, data, bits, repeat);
+
+  if (!success) {
+      irsend_active = false;
+      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
+  }
+  return IE_NO_ERROR;
+}
+
+uint32_t IrRemoteCmndIrSendRaw(void)
+{
+
+
+
+
+
+
+
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+  if (p == nullptr) {
+    return IE_INVALID_RAWDATA;
+  }
+
+
+  uint16_t repeat = XdrvMailbox.index > 0 ? XdrvMailbox.index - 1 : 0;
+
+  uint16_t freq = atoi(str);
+  if (!freq && (*str != '0')) {
+    uint16_t count = 0;
+    char *q = p;
+    for (; *q; count += (*q++ == ','));
+    if (count < 2) {
+      return IE_INVALID_RAWDATA;
+    }
+
+    uint16_t parm[count];
+    for (uint32_t i = 0; i < count; i++) {
+      parm[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      if (!parm[i]) {
+        if (!i) {
+          parm[0] = 38000;
+        } else {
+          return IE_INVALID_RAWDATA;
+        }
+      }
+    }
+
+    uint16_t i = 0;
+    if (count < 4) {
+
+      uint16_t mark = parm[1] *2;
+      if (3 == count) {
+        if (parm[2] < parm[1]) {
+
+          mark = parm[1] * parm[2];
+        } else {
+
+          mark = parm[2];
+        }
+      }
+      uint16_t raw_array[strlen(p)];
+      for (; *p; *p++) {
+        if (*p == '0') {
+          raw_array[i++] = parm[1];
+        }
+        else if (*p == '1') {
+          raw_array[i++] = mark;
+        }
+      }
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, i, parm[0]);
+        if (r < repeat) {
+          irsend->space(40000);
+        }
+      }
+    }
+    else if (6 == count) {
+
+      uint16_t raw_array[strlen(p)*2+3];
+      raw_array[i++] = parm[1];
+      raw_array[i++] = parm[2];
+      uint32_t inter_message_32 = (parm[1] + parm[2]) * 3;
+      uint16_t inter_message = (inter_message_32 > 65000) ? 65000 : inter_message_32;
+      for (; *p; *p++) {
+        if (*p == '0') {
+          raw_array[i++] = parm[3];
+          raw_array[i++] = parm[4];
+        }
+        else if (*p == '1') {
+          raw_array[i++] = parm[3];
+          raw_array[i++] = parm[5];
+        }
+      }
+      raw_array[i++] = parm[3];
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, i, parm[0]);
+        if (r < repeat) {
+          irsend->space(inter_message);
+        }
+      }
+    }
+    else {
+      return IE_INVALID_RAWDATA;
+    }
+  } else {
+    if (!freq) { freq = 38000; }
+    uint16_t count = 0;
+    char *q = p;
+    for (; *q; count += (*q++ == ','));
+    if (0 == count) {
+      return IE_INVALID_RAWDATA;
+    }
+
+
+    count++;
+    if (count < 200) {
+      uint16_t raw_array[count];
+      for (uint32_t i = 0; i < count; i++) {
+        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      }
+
+
+
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, count, freq);
+      }
+    } else {
+      uint16_t *raw_array = reinterpret_cast<uint16_t*>(malloc(count * sizeof(uint16_t)));
+      if (raw_array == nullptr) {
+        return IE_INVALID_RAWDATA;
+      }
+
+      for (uint32_t i = 0; i < count; i++) {
+        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      }
+
+
+
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, count, freq);
+      }
+      free(raw_array);
+    }
+  }
+
+  return IE_NO_ERROR;
+}
+
+void CmndIrSend(void)
+{
+  uint8_t error = IE_SYNTAX_IRSEND;
+
+  if (XdrvMailbox.data_len) {
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      error = IrRemoteCmndIrSendRaw();
+    } else {
+      error = IrRemoteCmndIrSendJson();
+    }
+  }
+  IrRemoteCmndResponse(error);
+}
+
+void IrRemoteCmndResponse(uint32_t error)
+{
+  switch (error) {
+    case IE_INVALID_RAWDATA:
+      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
+      break;
+    case IE_INVALID_JSON:
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      break;
+    case IE_SYNTAX_IRSEND:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
+      break;
+    case IE_SYNTAX_IRHVAC:
+      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR ", " D_JSON_IRHVAC_MODE " " D_JSON_OR " " D_JSON_IRHVAC_FANSPEED "\"}"));
+      break;
+    case IE_UNSUPPORTED_HVAC:
+      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR " (%s)\"}"), listSupportedProtocols(true).c_str());
+      break;
+    case IE_UNSUPPORTED_PROTOCOL:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_PROTOCOL " (%s)\"}"), listSupportedProtocols(false).c_str());
+      break;
+    default:
+      ResponseCmndDone();
+  }
+}
+
+
+
+
+
+bool Xdrv05(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        if (pin[GPIO_IRSEND] < 99) {
+          IrSendInit();
+        }
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveInit();
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveCheck();
+        }
+        irsend_active = false;
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_IRSEND] < 99) {
+          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_06_snfbridge.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_06_snfbridge.ino"
+#ifdef USE_SONOFF_RF
+
+
+
+
+#define XDRV_06 6
+
+const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000;
+
+enum SonoffBridgeCommands {
+  CMND_RFSYNC, CMND_RFLOW, CMND_RFHIGH, CMND_RFHOST, CMND_RFCODE };
+
+const char kSonoffBridgeCommands[] PROGMEM = "|"
+  D_CMND_RFSYNC "|" D_CMND_RFLOW "|" D_CMND_RFHIGH "|" D_CMND_RFHOST "|" D_CMND_RFCODE "|" D_CMND_RFKEY "|" D_CMND_RFRAW;
+
+void (* const SonoffBridgeCommand[])(void) PROGMEM = {
+  &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfKey, &CmndRfRaw };
+
+struct SONOFFBRIDGE {
+  uint32_t last_received_id = 0;
+  uint32_t last_send_code = 0;
+  uint32_t last_time = 0;
+  uint32_t last_learn_time = 0;
+  uint8_t receive_flag = 0;
+  uint8_t receive_raw_flag = 0;
+  uint8_t learn_key = 1;
+  uint8_t learn_active = 0;
+  uint8_t expected_bytes = 0;
+} SnfBridge;
+
+#ifdef USE_RF_FLASH
+
+
+
+
+
+
+
+#include "ihx.h"
+#include "c2.h"
+
+const ssize_t RF_RECORD_NO_START_FOUND = -1;
+const ssize_t RF_RECORD_NO_END_FOUND = -2;
+
+ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size)
+{
+  for (size_t i = 0; i < size; i++) {
+    if (buf[i] == ':') {
+      return i;
+    }
+  }
+  return RF_RECORD_NO_START_FOUND;
+}
+
+ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size)
+{
+  for (size_t i = 0; i < size; i++) {
+    if (buf[i] == '\n') {
+      return i;
+    }
+  }
+  return RF_RECORD_NO_END_FOUND;
+}
+
+ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len)
+{
+  ssize_t record_start;
+  ssize_t record_end;
+  ssize_t glue_record_sz;
+  uint8_t *glue_buf;
+  ssize_t result;
+
+  if (remnant_data[0] != ':') { return -8; }
+
+
+  record_end = rf_find_hex_record_end(new_data, new_data_len);
+  record_start = rf_find_hex_record_start(new_data, new_data_len);
+
+
+
+
+  if ((record_start != RF_RECORD_NO_START_FOUND) && (record_start < record_end)) {
+    return -8;
+  }
+
+  glue_record_sz = strlen((const char *) remnant_data) + record_end;
+
+  glue_buf = (uint8_t *) malloc(glue_record_sz);
+  if (glue_buf == nullptr) { return -2; }
+
+
+  memcpy(glue_buf, remnant_data, strlen((const char *) remnant_data));
+  memcpy(glue_buf + strlen((const char *) remnant_data), new_data, record_end);
+
+  result = rf_decode_and_write(glue_buf, glue_record_sz);
+  free(glue_buf);
+  return result;
+}
+
+ssize_t rf_decode_and_write(uint8_t *record, size_t size)
+{
+  uint8_t err = ihx_decode(record, size);
+  if (err != IHX_SUCCESS) { return -13; }
+
+  ihx_t *h = (ihx_t *) record;
+  if (h->record_type == IHX_RT_DATA) {
+    int retries = 5;
+    uint16_t address = h->address_high * 0x100 + h->address_low;
+
+    do {
+      err = c2_programming_init();
+      err = c2_block_write(address, h->data, h->len);
+    } while (err != C2_SUCCESS && retries--);
+  } else if (h->record_type == IHX_RT_END_OF_FILE) {
+
+    err = c2_reset();
+  }
+
+  if (err != C2_SUCCESS) { return -12; }
+
+  return 0;
+}
+
+ssize_t rf_search_and_write(uint8_t *buf, size_t size)
+{
+
+  ssize_t rec_end;
+  ssize_t rec_start;
+  ssize_t err;
+
+  for (size_t i = 0; i < size; i++) {
+
+    rec_start = rf_find_hex_record_start(buf + i, size - i);
+    if (rec_start == RF_RECORD_NO_START_FOUND) {
+
+      return -8;
+    }
+
+
+    rec_start += i;
+    rec_end = rf_find_hex_record_end(buf + rec_start, size - rec_start);
+    if (rec_end == RF_RECORD_NO_END_FOUND) {
+
+      return rec_start;
+    }
+
+
+    rec_end += rec_start;
+
+    err = rf_decode_and_write(buf + rec_start, rec_end - rec_start);
+    if (err < 0) { return err; }
+    i = rec_end;
+  }
+
+  return 0;
+}
+
+uint8_t rf_erase_flash(void)
+{
+  uint8_t err;
+
+  for (uint32_t i = 0; i < 4; i++) {
+    err = c2_programming_init();
+    if (err != C2_SUCCESS) {
+      return 10;
+    }
+    err = c2_device_erase();
+    if (err != C2_SUCCESS) {
+      if (i < 3) {
+        c2_reset();
+      } else {
+        return 11;
+      }
+    } else {
+      break;
+    }
+  }
+  return 0;
+}
+
+uint8_t SnfBrUpdateInit(void)
+{
+  pinMode(PIN_C2CK, OUTPUT);
+  pinMode(PIN_C2D, INPUT);
+
+  return rf_erase_flash();
+}
+#endif
+
+
+
+void SonoffBridgeReceivedRaw(void)
+{
+
+  uint8_t buckets = 0;
+
+  if (0xB1 == serial_in_buffer[1]) { buckets = serial_in_buffer[2] << 1; }
+
+  ResponseTime_P(PSTR(",\"" D_CMND_RFRAW "\":{\"" D_JSON_DATA "\":\""));
+  for (uint32_t i = 0; i < serial_in_byte_counter; i++) {
+    ResponseAppend_P(PSTR("%02X"), serial_in_buffer[i]);
+    if (0xB1 == serial_in_buffer[1]) {
+      if ((i > 3) && buckets) { buckets--; }
+      if ((i < 3) || (buckets % 2) || (i == serial_in_byte_counter -2)) {
+        ResponseAppend_P(PSTR(" "));
+      }
+    }
+  }
+  ResponseAppend_P(PSTR("\"}}"));
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_CMND_RFRAW));
+
+  XdrvRulesProcess();
+}
+
+
+
+void SonoffBridgeLearnFailed(void)
+{
+  SnfBridge.learn_active = 0;
+  Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARN_FAILED);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
+}
+
+void SonoffBridgeReceived(void)
+{
+  uint16_t sync_time = 0;
+  uint16_t low_time = 0;
+  uint16_t high_time = 0;
+  uint32_t received_id = 0;
+  char rfkey[8];
+  char stemp[16];
+
+  AddLogSerial(LOG_LEVEL_DEBUG);
+
+  if (0xA2 == serial_in_buffer[0]) {
+    SonoffBridgeLearnFailed();
+  }
+  else if (0xA3 == serial_in_buffer[0]) {
+    SnfBridge.learn_active = 0;
+    low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
+    high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
+    if (low_time && high_time) {
+      for (uint32_t i = 0; i < 9; i++) {
+        Settings.rf_code[SnfBridge.learn_key][i] = serial_in_buffer[i +1];
+      }
+      Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARNED);
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
+    } else {
+      SonoffBridgeLearnFailed();
+    }
+  }
+  else if (0xA4 == serial_in_buffer[0]) {
+    if (SnfBridge.learn_active) {
+      SonoffBridgeLearnFailed();
+    } else {
+      sync_time = serial_in_buffer[1] << 8 | serial_in_buffer[2];
+      low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
+      high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
+      received_id = serial_in_buffer[7] << 16 | serial_in_buffer[8] << 8 | serial_in_buffer[9];
+
+      unsigned long now = millis();
+      if (!((received_id == SnfBridge.last_received_id) && (now - SnfBridge.last_time < SFB_TIME_AVOID_DUPLICATE))) {
+        SnfBridge.last_received_id = received_id;
+        SnfBridge.last_time = now;
+        strncpy_P(rfkey, PSTR("\"" D_JSON_NONE "\""), sizeof(rfkey));
+        for (uint32_t i = 1; i <= 16; i++) {
+          if (Settings.rf_code[i][0]) {
+            uint32_t send_id = Settings.rf_code[i][6] << 16 | Settings.rf_code[i][7] << 8 | Settings.rf_code[i][8];
+            if (send_id == received_id) {
+              snprintf_P(rfkey, sizeof(rfkey), PSTR("%d"), i);
+              break;
+            }
+          }
+        }
+        if (Settings.flag.rf_receive_decimal) {
+          snprintf_P(stemp, sizeof(stemp), PSTR("%u"), received_id);
+        } else {
+          snprintf_P(stemp, sizeof(stemp), PSTR("\"%06X\""), received_id);
+        }
+        ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":%s,\"" D_CMND_RFKEY "\":%s}}"),
+          sync_time, low_time, high_time, stemp, rfkey);
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
+        XdrvRulesProcess();
+  #ifdef USE_DOMOTICZ
+        DomoticzSensor(DZ_COUNT, received_id);
+  #endif
+      }
+    }
+  }
+}
+
+bool SonoffBridgeSerialInput(void)
+{
+
+  static int8_t receive_len = 0;
+
+  if (SnfBridge.receive_flag) {
+    if (SnfBridge.receive_raw_flag) {
+      if (!serial_in_byte_counter) {
+        serial_in_buffer[serial_in_byte_counter++] = 0xAA;
+      }
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if (serial_in_byte_counter == 3) {
+        if ((0xA6 == serial_in_buffer[1]) || (0xAB == serial_in_buffer[1])) {
+          receive_len = serial_in_buffer[2] + 4;
+        }
+      }
+      if ((!receive_len && (0x55 == serial_in_byte)) || (receive_len && (serial_in_byte_counter == receive_len))) {
+        SonoffBridgeReceivedRaw();
+        SnfBridge.receive_flag = 0;
+        return 1;
+      }
+    }
+    else if (!((0 == serial_in_byte_counter) && (0 == serial_in_byte))) {
+      if (0 == serial_in_byte_counter) {
+        SnfBridge.expected_bytes = 2;
+        if (serial_in_byte >= 0xA3) {
+          SnfBridge.expected_bytes = 11;
+        }
+        if (serial_in_byte == 0xA6) {
+          SnfBridge.expected_bytes = 0;
+          serial_in_buffer[serial_in_byte_counter++] = 0xAA;
+          SnfBridge.receive_raw_flag = 1;
+        }
+      }
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if ((SnfBridge.expected_bytes == serial_in_byte_counter) && (0x55 == serial_in_byte)) {
+        SonoffBridgeReceived();
+        SnfBridge.receive_flag = 0;
+        return 1;
+      }
+    }
+    serial_in_byte = 0;
+  }
+  if (0xAA == serial_in_byte) {
+    serial_in_byte_counter = 0;
+    serial_in_byte = 0;
+    SnfBridge.receive_flag = 1;
+    receive_len = 0;
+  }
+  return 0;
+}
+
+void SonoffBridgeSendCommand(uint8_t code)
+{
+  Serial.write(0xAA);
+  Serial.write(code);
+  Serial.write(0x55);
+}
+
+void SonoffBridgeSendAck(void)
+{
+  Serial.write(0xAA);
+  Serial.write(0xA0);
+  Serial.write(0x55);
+}
+
+void SonoffBridgeSendCode(uint32_t code)
+{
+  Serial.write(0xAA);
+  Serial.write(0xA5);
+  for (uint32_t i = 0; i < 6; i++) {
+    Serial.write(Settings.rf_code[0][i]);
+  }
+  Serial.write((code >> 16) & 0xff);
+  Serial.write((code >> 8) & 0xff);
+  Serial.write(code & 0xff);
+  Serial.write(0x55);
+  Serial.flush();
+}
+
+void SonoffBridgeSend(uint8_t idx, uint8_t key)
+{
+  uint8_t code;
+
+  key--;
+  Serial.write(0xAA);
+  Serial.write(0xA5);
+  for (uint32_t i = 0; i < 8; i++) {
+    Serial.write(Settings.rf_code[idx][i]);
+  }
+  if (0 == idx) {
+    code = (0x10 << (key >> 2)) | (1 << (key & 3));
+  } else {
+    code = Settings.rf_code[idx][8];
+  }
+  Serial.write(code);
+  Serial.write(0x55);
+  Serial.flush();
+#ifdef USE_DOMOTICZ
+
+
+#endif
+}
+
+void SonoffBridgeLearn(uint8_t key)
+{
+  SnfBridge.learn_key = key;
+  SnfBridge.learn_active = 1;
+  SnfBridge.last_learn_time = millis();
+  Serial.write(0xAA);
+  Serial.write(0xA1);
+  Serial.write(0x55);
+}
+
+
+
+
+
+void CmndRfBridge(void)
+{
+  char *p;
+  char stemp [10];
+  uint32_t code = 0;
+  uint8_t radix = 10;
+
+  uint32_t set_index = XdrvMailbox.command_code *2;
+
+  if (XdrvMailbox.data[0] == '#') {
+    XdrvMailbox.data++;
+    XdrvMailbox.data_len--;
+    radix = 16;
+  }
+
+  if (XdrvMailbox.data_len) {
+    code = strtol(XdrvMailbox.data, &p, radix);
+    if (code) {
+      if (CMND_RFCODE == XdrvMailbox.command_code) {
+        SnfBridge.last_send_code = code;
+        SonoffBridgeSendCode(code);
+      } else {
+        if (1 == XdrvMailbox.payload) {
+          code = pgm_read_byte(kDefaultRfCode + set_index) << 8 | pgm_read_byte(kDefaultRfCode + set_index +1);
+        }
+        uint8_t msb = code >> 8;
+        uint8_t lsb = code & 0xFF;
+        if ((code > 0) && (code < 0x7FFF) && (msb != 0x55) && (lsb != 0x55)) {
+          Settings.rf_code[0][set_index] = msb;
+          Settings.rf_code[0][set_index +1] = lsb;
+        }
+      }
+    }
+  }
+  if (CMND_RFCODE == XdrvMailbox.command_code) {
+    code = SnfBridge.last_send_code;
+  } else {
+    code = Settings.rf_code[0][set_index] << 8 | Settings.rf_code[0][set_index +1];
+  }
+  if (10 == radix) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), code);
+  } else {
+    snprintf_P(stemp, sizeof(stemp), PSTR("\"#%06X\""), code);
+  }
+  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp);
+}
+
+void CmndRfKey(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 16)) {
+    unsigned long now = millis();
+    if ((!SnfBridge.learn_active) || (now - SnfBridge.last_learn_time > 60100)) {
+      SnfBridge.learn_active = 0;
+      if (2 == XdrvMailbox.payload) {
+        SonoffBridgeLearn(XdrvMailbox.index);
+        ResponseCmndIdxChar(D_JSON_START_LEARNING);
+      }
+      else if (3 == XdrvMailbox.payload) {
+        Settings.rf_code[XdrvMailbox.index][0] = 0;
+        ResponseCmndIdxChar(D_JSON_SET_TO_DEFAULT);
+      }
+      else if (4 == XdrvMailbox.payload) {
+        for (uint32_t i = 0; i < 6; i++) {
+          Settings.rf_code[XdrvMailbox.index][i] = Settings.rf_code[0][i];
+        }
+        Settings.rf_code[XdrvMailbox.index][6] = (SnfBridge.last_send_code >> 16) & 0xff;
+        Settings.rf_code[XdrvMailbox.index][7] = (SnfBridge.last_send_code >> 8) & 0xff;
+        Settings.rf_code[XdrvMailbox.index][8] = SnfBridge.last_send_code & 0xff;
+        ResponseCmndIdxChar(D_JSON_SAVED);
+      } else if (5 == XdrvMailbox.payload) {
+        uint8_t key = XdrvMailbox.index;
+        uint8_t index = (0 == Settings.rf_code[key][0]) ? 0 : key;
+        uint16_t sync_time = (Settings.rf_code[index][0] << 8) | Settings.rf_code[index][1];
+        uint16_t low_time = (Settings.rf_code[index][2] << 8) | Settings.rf_code[index][3];
+        uint16_t high_time = (Settings.rf_code[index][4] << 8) | Settings.rf_code[index][5];
+        uint32_t code = (Settings.rf_code[index][6] << 16) | (Settings.rf_code[index][7] << 8);
+        if (0 == index) {
+          key--;
+          code |= (uint8_t)((0x10 << (key >> 2)) | (1 << (key & 3)));
+        } else {
+          code |= Settings.rf_code[index][8];
+        }
+        Response_P(PSTR("{\"%s%d\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":\"%06X\"}}"),
+                   XdrvMailbox.command, XdrvMailbox.index, sync_time, low_time, high_time, code);
+      } else {
+        if ((1 == XdrvMailbox.payload) || (0 == Settings.rf_code[XdrvMailbox.index][0])) {
+          SonoffBridgeSend(0, XdrvMailbox.index);
+          ResponseCmndIdxChar(D_JSON_DEFAULT_SENT);
+        } else {
+          SonoffBridgeSend(XdrvMailbox.index, 0);
+          ResponseCmndIdxChar(D_JSON_LEARNED_SENT);
+        }
+      }
+    } else {
+      Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, SnfBridge.learn_key, D_JSON_LEARNING_ACTIVE);
+    }
+  }
+}
+
+void CmndRfRaw(void)
+{
+  if (XdrvMailbox.data_len) {
+    if (XdrvMailbox.data_len < 6) {
+      switch (XdrvMailbox.payload) {
+      case 0:
+        SonoffBridgeSendCommand(0xA7);
+      case 1:
+        SnfBridge.receive_raw_flag = XdrvMailbox.payload;
+        break;
+      case 166:
+      case 167:
+      case 169:
+      case 176:
+      case 177:
+      case 255:
+        SonoffBridgeSendCommand(XdrvMailbox.payload);
+        SnfBridge.receive_raw_flag = 1;
+        break;
+      case 192:
+        char beep[] = "AAC000C055\0";
+        SerialSendRaw(beep);
+        break;
+      }
+    } else {
+      SerialSendRaw(RemoveSpace(XdrvMailbox.data));
+      SnfBridge.receive_raw_flag = 1;
+    }
+  }
+  ResponseCmndStateText(SnfBridge.receive_raw_flag);
+}
+
+
+
+
+
+bool Xdrv06(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_BRIDGE == my_module_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = SonoffBridgeSerialInput();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSonoffBridgeCommands, SonoffBridgeCommand);
+        break;
+      case FUNC_INIT:
+        SnfBridge.receive_raw_flag = 0;
+        SonoffBridgeSendCommand(0xA7);
+        break;
+      case FUNC_PRE_INIT:
+        SetSerial(19200, TS_SERIAL_8N1);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
+#ifdef USE_DOMOTICZ
+
+#define XDRV_07 7
+
+#define D_PRFX_DOMOTICZ "Domoticz"
+#define D_CMND_IDX "Idx"
+#define D_CMND_KEYIDX "KeyIdx"
+#define D_CMND_SWITCHIDX "SwitchIdx"
+#define D_CMND_SENSORIDX "SensorIdx"
+#define D_CMND_UPDATETIMER "UpdateTimer"
+
+const char kDomoticzCommands[] PROGMEM = D_PRFX_DOMOTICZ "|"
+  D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
+
+void (* const DomoticzCommand[])(void) PROGMEM = {
+  &CmndDomoticzIdx, &CmndDomoticzKeyIdx, &CmndDomoticzSwitchIdx, &CmndDomoticzSensorIdx, &CmndDomoticzUpdateTimer };
+
+const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}";
+
+#if MAX_DOMOTICZ_SNS_IDX < DZ_MAX_SENSORS
+  #error "Domoticz: Too many sensors or change settings.h layout"
+#endif
+
+const char kDomoticzSensors[] PROGMEM =
+  D_DOMOTICZ_TEMP "|" D_DOMOTICZ_TEMP_HUM "|" D_DOMOTICZ_TEMP_HUM_BARO "|" D_DOMOTICZ_POWER_ENERGY "|" D_DOMOTICZ_ILLUMINANCE "|"
+  D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY "|" D_DOMOTICZ_P1_SMART_METER "|" D_DOMOTICZ_SHUTTER ;
+
+char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC;
+
+int domoticz_update_timer = 0;
+uint32_t domoticz_fan_debounce = 0;
+bool domoticz_subscribe = false;
+bool domoticz_update_flag = true;
+
+#ifdef USE_SHUTTER
+bool domoticz_is_shutter = false;
+#endif
+
+int DomoticzBatteryQuality(void)
+{
+
+
+
+
+  int quality = 100;
+
+#ifdef USE_ADC_VCC
+  uint16_t voltage = ESP.getVcc();
+  if (voltage <= 2600) {
+    quality = 0;
+  } else if (voltage >= 4600) {
+    quality = 200;
+  } else {
+    quality = (voltage - 2600) / 10;
+  }
+#endif
+  return quality;
+}
+
+int DomoticzRssiQuality(void)
+{
+
+
+  return WifiGetRssiAsQuality(WiFi.RSSI()) / 10;
+}
+
+#ifdef USE_SONOFF_IFAN
+void MqttPublishDomoticzFanState(void)
+{
+  if (Settings.flag.mqtt_enabled && Settings.domoticz_relay_idx[1]) {
+    char svalue[8];
+
+    int fan_speed = GetFanspeed();
+    snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fan_speed * 10);
+    Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[1], (0 == fan_speed) ? 0 : 2, svalue, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    MqttPublish(domoticz_in_topic);
+
+    domoticz_fan_debounce = millis();
+  }
+}
+
+void DomoticzUpdateFanState(void)
+{
+  if (domoticz_update_flag) {
+    MqttPublishDomoticzFanState();
+  }
+  domoticz_update_flag = true;
+}
+#endif
+
+void MqttPublishDomoticzPowerState(uint8_t device)
+{
+  if (Settings.flag.mqtt_enabled) {
+    if ((device < 1) || (device > devices_present)) { device = 1; }
+    if (Settings.domoticz_relay_idx[device -1]) {
+#ifdef USE_SHUTTER
+      if (domoticz_is_shutter) {
+
+      } else {
+#endif
+#ifdef USE_SONOFF_IFAN
+      if (IsModuleIfan() && (device > 1)) {
+
+      } else {
+#endif
+        char svalue[8];
+
+        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), Settings.light_dimmer);
+        Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? svalue : "", DomoticzBatteryQuality(), DomoticzRssiQuality());
+        MqttPublish(domoticz_in_topic);
+#ifdef USE_SONOFF_IFAN
+      }
+#endif
+#ifdef USE_SHUTTER
+      }
+#endif
+    }
+  }
+}
+
+void DomoticzUpdatePowerState(uint8_t device)
+{
+  if (domoticz_update_flag) {
+    MqttPublishDomoticzPowerState(device);
+  }
+  domoticz_update_flag = true;
+}
+
+void DomoticzMqttUpdate(void)
+{
+  if (domoticz_subscribe && (Settings.domoticz_update_timer || domoticz_update_timer)) {
+    domoticz_update_timer--;
+    if (domoticz_update_timer <= 0) {
+      domoticz_update_timer = Settings.domoticz_update_timer;
+      for (uint32_t i = 1; i <= devices_present; i++) {
+#ifdef USE_SHUTTER
+        if (domoticz_is_shutter)
+        {
+
+            break;
+        }
+#endif
+#ifdef USE_SONOFF_IFAN
+        if (IsModuleIfan() && (i > 1)) {
+          MqttPublishDomoticzFanState();
+          break;
+        } else {
+#endif
+          MqttPublishDomoticzPowerState(i);
+#ifdef USE_SONOFF_IFAN
+        }
+#endif
+      }
+    }
+  }
+}
+
+void DomoticzMqttSubscribe(void)
+{
+  uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
+  for (uint32_t i = 0; i < maxdev; i++) {
+    if (Settings.domoticz_relay_idx[i]) {
+      domoticz_subscribe = true;
+    }
+  }
+
+  if (domoticz_subscribe) {
+    char stopic[TOPSZ];
+    snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#"));
+    MqttSubscribe(stopic);
+  }
+}
+# 219 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
+bool DomoticzMqttData(void)
+{
+  domoticz_update_flag = true;
+
+  if (strncasecmp_P(XdrvMailbox.topic, PSTR(DOMOTICZ_OUT_TOPIC), strlen(DOMOTICZ_OUT_TOPIC)) != 0) {
+    return false;
+  }
+
+
+  if (XdrvMailbox.data_len < 20) {
+    return true;
+  }
+  StaticJsonBuffer<400> jsonBuf;
+  JsonObject& domoticz = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!domoticz.success()) {
+    return true;
+  }
+
+
+
+  uint32_t idx = domoticz["idx"];
+  int16_t nvalue = -1;
+  if (domoticz.containsKey("nvalue")) {
+    nvalue = domoticz["nvalue"];
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ "idx %d, nvalue %d"), idx, nvalue);
+
+  bool found = false;
+  if ((idx > 0) && (nvalue >= 0) && (nvalue <= 15)) {
+    uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
+    for (uint32_t i = 0; i < maxdev; i++) {
+      if (idx == Settings.domoticz_relay_idx[i]) {
+        bool iscolordimmer = strcmp_P(domoticz["dtype"],PSTR("Color Switch")) == 0;
+        bool isShutter = strcmp_P(domoticz["dtype"],PSTR("Light/Switch")) == 0 & strncmp_P(domoticz["switchType"],PSTR("Blinds"), 6) == 0;
+
+        char stemp1[10];
+        snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), i +1);
+#ifdef USE_SONOFF_IFAN
+        if (IsModuleIfan() && (1 == i)) {
+          uint8_t svalue = 0;
+          if (domoticz.containsKey("svalue1")) {
+            svalue = domoticz["svalue1"];
+          } else {
+            return true;
+          }
+          svalue = (nvalue == 2) ? svalue / 10 : 0;
+          if (GetFanspeed() == svalue) {
+            return true;
+          }
+          if (TimePassedSince(domoticz_fan_debounce) < 1000) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_FANSPEED));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), svalue);
+          found = true;
+        } else
+#endif
+#ifdef USE_SHUTTER
+        if (isShutter)
+        {
+          if (domoticz.containsKey("nvalue")) {
+            nvalue = domoticz["nvalue"];
+          }
+
+          uint8_t position = 0;
+          if (domoticz.containsKey("svalue1")) {
+            position = domoticz["svalue1"];
+          }
+          if (nvalue != 2) {
+            position = nvalue == 0 ? 0 : 100;
+          }
+
+          snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), position);
+          XdrvMailbox.data_len = position > 99 ? 3 : (position > 9 ? 2 : 1);
+
+          found = true;
+        } else
+#endif
+        if (iscolordimmer && 10 == nvalue) {
+
+          JsonObject& color = domoticz["Color"];
+          uint16_t level = nvalue = domoticz["svalue1"];
+          uint16_t r = color["r"]; r = r * level / 100;
+          uint16_t g = color["g"]; g = g * level / 100;
+          uint16_t b = color["b"]; b = b * level / 100;
+          uint16_t cw = color["cw"]; cw = cw * level / 100;
+          uint16_t ww = color["ww"]; ww = ww * level / 100;
+          uint16_t m = 0;
+          uint16_t t = 0;
+          if (color.containsKey("m")) {
+            m = color["m"];
+            t = color["t"];
+          }
+          if (2 == m) {
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_BACKLOG));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR(D_CMND_COLORTEMPERATURE " %d;" D_CMND_DIMMER " %d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX), level);
+          } else {
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
+          }
+          found = true;
+        }
+        else if ((!iscolordimmer && 2 == nvalue) ||
+                  (iscolordimmer && 15 == nvalue)) {
+          if (domoticz.containsKey("svalue1")) {
+            nvalue = domoticz["svalue1"];
+          } else {
+            return true;
+          }
+          if (light_type && (Settings.light_dimmer == nvalue) && ((power >> i) &1)) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
+          found = true;
+        }
+        else if (1 == nvalue || 0 == nvalue) {
+          if (((power >> i) &1) == (power_t)nvalue) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_POWER "%s"), (devices_present > 1) ? stemp1 : "");
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
+          found = true;
+        }
+        break;
+      }
+    }
+  }
+  if (!found) { return true; }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ D_RECEIVED_TOPIC " %s, " D_DATA " %s"), XdrvMailbox.topic, XdrvMailbox.data);
+
+  domoticz_update_flag = false;
+  return false;
+}
+
+
+
+bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg)
+{
+  bool result = false;
+
+  if (device <= MAX_DOMOTICZ_IDX) {
+    if ((Settings.domoticz_key_idx[device -1] || Settings.domoticz_switch_idx[device -1]) && (svalflg)) {
+      Response_P(PSTR("{\"command\":\"switchlight\",\"idx\":%d,\"switchcmd\":\"%s\"}"),
+        (key) ? Settings.domoticz_switch_idx[device -1] : Settings.domoticz_key_idx[device -1], (state) ? (POWER_TOGGLE == state) ? "Toggle" : "On" : "Off");
+      MqttPublish(domoticz_in_topic);
+      result = true;
+    }
+  }
+  return result;
+}
+# 391 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
+uint8_t DomoticzHumidityState(char *hum)
+{
+  uint8_t h = atoi(hum);
+  return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
+}
+
+void DomoticzSensor(uint8_t idx, char *data)
+{
+  if (Settings.domoticz_sensor_idx[idx]) {
+    char dmess[128];
+
+    memcpy(dmess, mqtt_data, sizeof(dmess));
+    if (DZ_AIRQUALITY == idx) {
+      Response_P(PSTR("{\"idx\":%d,\"nvalue\":%s,\"Battery\":%d,\"RSSI\":%d}"),
+        Settings.domoticz_sensor_idx[idx], data, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    } else {
+      uint8_t nvalue = 0;
+#ifdef USE_SHUTTER
+      if (DZ_SHUTTER == idx) {
+        uint8_t position = atoi(data);
+        nvalue = position < 2 ? 0 : (position == 100 ? 1 : 2);
+      }
+#endif
+      Response_P(DOMOTICZ_MESSAGE,
+        Settings.domoticz_sensor_idx[idx], nvalue, data, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    }
+    MqttPublish(domoticz_in_topic);
+    memcpy(mqtt_data, dmess, sizeof(dmess));
+  }
+}
+
+void DomoticzSensor(uint8_t idx, uint32_t value)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%d"), value);
+  DomoticzSensor(idx, data);
+}
+
+void DomoticzTempHumSensor(char *temp, char *hum)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d"), temp, hum, DomoticzHumidityState(hum));
+  DomoticzSensor(DZ_TEMP_HUM, data);
+}
+
+void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro)
+{
+  char data[32];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d;%s;5"), temp, hum, DomoticzHumidityState(hum), baro);
+  DomoticzSensor(DZ_TEMP_HUM_BARO, data);
+}
+
+void DomoticzSensorPowerEnergy(int power, char *energy)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%d;%s"), power, energy);
+  DomoticzSensor(DZ_POWER_ENERGY, data);
+}
+
+void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power)
+{
+
+
+
+
+
+  int consumed = power;
+  int produced = 0;
+  if (power < 0) {
+    consumed = 0;
+    produced = -power;
+  }
+  char data[64];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%s;%s;%d;%d"), usage1, usage2, return1, return2, consumed, produced);
+  DomoticzSensor(DZ_P1_SMART_METER, data);
+}
+
+
+
+
+
+void CmndDomoticzIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzKeyIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_key_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSwitchIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSensorIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzUpdateTimer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.domoticz_update_timer = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.domoticz_update_timer);
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_DOMOTICZ "dm"
+
+const char S_CONFIGURE_DOMOTICZ[] PROGMEM = D_CONFIGURE_DOMOTICZ;
+
+const char HTTP_BTN_MENU_DOMOTICZ[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_DOMOTICZ "' method='get'><button>" D_CONFIGURE_DOMOTICZ "</button></form></p>";
+
+const char HTTP_FORM_DOMOTICZ[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_DOMOTICZ_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>"
+  "<table>";
+const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' placeholder='0' value='%d'></td></tr>"
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'></td></tr>";
+
+void HandleDomoticzConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_DOMOTICZ);
+
+  if (WebServer->hasArg("save")) {
+    DomoticzSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[40];
+
+  WSContentStart_P(S_CONFIGURE_DOMOTICZ);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_DOMOTICZ);
+  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
+    if (i < devices_present) {
+      WSContentSend_P(HTTP_FORM_DOMOTICZ_RELAY,
+        i +1, i, Settings.domoticz_relay_idx[i],
+        i +1, i, Settings.domoticz_key_idx[i]);
+    }
+    if (pin[GPIO_SWT1 +i] < 99) {
+      WSContentSend_P(HTTP_FORM_DOMOTICZ_SWITCH,
+        i +1, i, Settings.domoticz_switch_idx[i]);
+    }
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan() && (1 == i)) { break; }
+#endif
+  }
+  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
+    WSContentSend_P(HTTP_FORM_DOMOTICZ_SENSOR,
+      i +1, GetTextIndexed(stemp, sizeof(stemp), i, kDomoticzSensors), i, Settings.domoticz_sensor_idx[i]);
+  }
+  WSContentSend_P(HTTP_FORM_DOMOTICZ_TIMER, Settings.domoticz_update_timer);
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void DomoticzSaveSettings(void)
+{
+  char stemp[20];
+  char ssensor_indices[6 * MAX_DOMOTICZ_SNS_IDX];
+  char tmp[100];
+
+  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("r%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_relay_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(stemp, sizeof(stemp), PSTR("k%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_key_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(stemp, sizeof(stemp), PSTR("s%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_switch_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+  }
+  ssensor_indices[0] = '\0';
+  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("l%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_sensor_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(ssensor_indices, sizeof(ssensor_indices), PSTR("%s%s%d"), ssensor_indices, (strlen(ssensor_indices)) ? "," : "", Settings.domoticz_sensor_idx[i]);
+  }
+  WebGetArg("ut", tmp, sizeof(tmp));
+  Settings.domoticz_update_timer = (!strlen(tmp)) ? DOMOTICZ_UPDATE_TIMER : atoi(tmp);
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_DOMOTICZ D_CMND_IDX " %d,%d,%d,%d, " D_CMND_KEYIDX " %d,%d,%d,%d, " D_CMND_SWITCHIDX " %d,%d,%d,%d, " D_CMND_SENSORIDX " %s, " D_CMND_UPDATETIMER " %d"),
+    Settings.domoticz_relay_idx[0], Settings.domoticz_relay_idx[1], Settings.domoticz_relay_idx[2], Settings.domoticz_relay_idx[3],
+    Settings.domoticz_key_idx[0], Settings.domoticz_key_idx[1], Settings.domoticz_key_idx[2], Settings.domoticz_key_idx[3],
+    Settings.domoticz_switch_idx[0], Settings.domoticz_switch_idx[1], Settings.domoticz_switch_idx[2], Settings.domoticz_switch_idx[3],
+    ssensor_indices, Settings.domoticz_update_timer);
+}
+#endif
+
+
+
+
+
+bool Xdrv07(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DomoticzMqttUpdate();
+        break;
+      case FUNC_MQTT_DATA:
+        result = DomoticzMqttData();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_DOMOTICZ);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_DOMOTICZ, HandleDomoticzConfiguration);
+        break;
+#endif
+      case FUNC_MQTT_SUBSCRIBE:
+        DomoticzMqttSubscribe();
+#ifdef USE_SHUTTER
+        if (Settings.domoticz_sensor_idx[DZ_SHUTTER]) { domoticz_is_shutter = true; }
+#endif
+        break;
+      case FUNC_MQTT_INIT:
+        domoticz_update_timer = 2;
+        break;
+      case FUNC_SHOW_SENSOR:
+
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kDomoticzCommands, DomoticzCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
+#ifdef USE_SERIAL_BRIDGE
+
+
+
+
+#define XDRV_08 8
+
+const uint8_t SERIAL_BRIDGE_BUFFER_SIZE = 130;
+
+const char kSerialBridgeCommands[] PROGMEM = "|"
+  D_CMND_SSERIALSEND "|" D_CMND_SBAUDRATE;
+
+void (* const SerialBridgeCommand[])(void) PROGMEM = {
+  &CmndSSerialSend, &CmndSBaudrate };
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *SerialBridgeSerial = nullptr;
+
+unsigned long serial_bridge_polling_window = 0;
+char *serial_bridge_buffer = nullptr;
+int serial_bridge_in_byte_counter = 0;
+bool serial_bridge_active = true;
+bool serial_bridge_raw = false;
+
+void SerialBridgeInput(void)
+{
+  while (SerialBridgeSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = SerialBridgeSerial->read();
+
+    if ((serial_in_byte > 127) && !serial_bridge_raw) {
+      serial_bridge_in_byte_counter = 0;
+      SerialBridgeSerial->flush();
+      return;
+    }
+    if (serial_in_byte || serial_bridge_raw) {
+
+      if ((serial_bridge_in_byte_counter < SERIAL_BRIDGE_BUFFER_SIZE -1) &&
+          ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
+          ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
+            serial_bridge_raw)) {
+        serial_bridge_buffer[serial_bridge_in_byte_counter++] = serial_in_byte;
+        serial_bridge_polling_window = millis();
+      } else {
+        serial_bridge_polling_window = 0;
+        break;
+      }
+    }
+  }
+
+  if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
+    serial_bridge_buffer[serial_bridge_in_byte_counter] = 0;
+    char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
+    bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
+      (assume_json) ? "" : """");
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
+    XdrvRulesProcess();
+    serial_bridge_in_byte_counter = 0;
+  }
+}
+
+
+
+void SerialBridgeInit(void)
+{
+  serial_bridge_active = false;
+  if ((pin[GPIO_SBR_RX] < 99) && (pin[GPIO_SBR_TX] < 99)) {
+    SerialBridgeSerial = new TasmotaSerial(pin[GPIO_SBR_RX], pin[GPIO_SBR_TX]);
+    if (SerialBridgeSerial->begin(Settings.sbaudrate * 300)) {
+      if (SerialBridgeSerial->hardwareSerial()) {
+        ClaimSerial();
+        serial_bridge_buffer = serial_in_buffer;
+      } else {
+        serial_bridge_buffer = (char*)(malloc(SERIAL_BRIDGE_BUFFER_SIZE));
+      }
+      serial_bridge_active = true;
+      SerialBridgeSerial->flush();
+    }
+  }
+}
+
+
+
+
+
+void CmndSSerialSend(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
+    serial_bridge_raw = (XdrvMailbox.index > 3);
+    if (XdrvMailbox.data_len > 0) {
+      if (1 == XdrvMailbox.index) {
+        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
+        SerialBridgeSerial->write("\n");
+      }
+      else if ((2 == XdrvMailbox.index) || (4 == XdrvMailbox.index)) {
+        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
+      }
+      else if (3 == XdrvMailbox.index) {
+        SerialBridgeSerial->write(Unescape(XdrvMailbox.data, &XdrvMailbox.data_len), XdrvMailbox.data_len);
+      }
+      else if (5 == XdrvMailbox.index) {
+        char *p;
+        char stemp[3];
+        uint8_t code;
+
+        char *codes = RemoveSpace(XdrvMailbox.data);
+        int size = strlen(XdrvMailbox.data);
+
+        while (size > 1) {
+          strlcpy(stemp, codes, sizeof(stemp));
+          code = strtol(stemp, &p, 16);
+          SerialBridgeSerial->write(code);
+          size -= 2;
+          codes += 2;
+        }
+      }
+      ResponseCmndDone();
+    }
+  }
+}
+
+void CmndSBaudrate(void)
+{
+  if (XdrvMailbox.payload >= 300) {
+    XdrvMailbox.payload /= 300;
+    Settings.sbaudrate = XdrvMailbox.payload;
+    SerialBridgeSerial->begin(Settings.sbaudrate * 300);
+  }
+  ResponseCmndNumber(Settings.sbaudrate * 300);
+}
+
+
+
+
+
+bool Xdrv08(uint8_t function)
+{
+  bool result = false;
+
+  if (serial_bridge_active) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (SerialBridgeSerial) { SerialBridgeInput(); }
+        break;
+      case FUNC_PRE_INIT:
+        SerialBridgeInit();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSerialBridgeCommands, SerialBridgeCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
+#ifdef USE_TIMERS
+# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
+#define XDRV_09 9
+
+const char kTimerCommands[] PROGMEM = "|"
+  D_CMND_TIMER "|" D_CMND_TIMERS
+#ifdef USE_SUNRISE
+  "|" D_CMND_LATITUDE "|" D_CMND_LONGITUDE
+#endif
+  ;
+
+void (* const TimerCommand[])(void) PROGMEM = {
+  &CmndTimer, &CmndTimers
+#ifdef USE_SUNRISE
+  , &CmndLatitude, &CmndLongitude
+#endif
+  };
+
+uint16_t timer_last_minute = 60;
+int8_t timer_window[MAX_TIMERS] = { 0 };
+
+#ifdef USE_SUNRISE
+# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
+const float pi2 = TWO_PI;
+const float pi = PI;
+const float RAD = DEG_TO_RAD;
+
+float JulianischesDatum(void)
+{
+
+  int Gregor;
+  int Jahr = RtcTime.year;
+  int Monat = RtcTime.month;
+  int Tag = RtcTime.day_of_month;
+
+  if (Monat <= 2) {
+    Monat += 12;
+    Jahr -= 1;
+  }
+  Gregor = (Jahr / 400) - (Jahr / 100) + (Jahr / 4);
+  return 2400000.5f + 365.0f*Jahr - 679004.0f + Gregor + (int)(30.6001f * (Monat +1)) + Tag + 0.5f;
+}
+
+float InPi(float x)
+{
+  int n = (int)(x / pi2);
+  x = x - n*pi2;
+  if (x < 0) x += pi2;
+  return x;
+}
+
+float eps(float T)
+{
+
+  return RAD * (23.43929111f + (-46.8150f*T - 0.00059f*T*T + 0.001813f*T*T*T)/3600.0f);
+}
+
+float BerechneZeitgleichung(float *DK,float T)
+{
+  float RA_Mittel = 18.71506921f + 2400.0513369f*T +(2.5862e-5f - 1.72e-9f*T)*T*T;
+  float M = InPi(pi2 * (0.993133f + 99.997361f*T));
+  float L = InPi(pi2 * (0.7859453f + M/pi2 + (6893.0f*sinf(M)+72.0f*sinf(2.0f*M)+6191.2f*T) / 1296.0e3f));
+  float e = eps(T);
+  float RA = atanf(tanf(L)*cosf(e));
+  if (RA < 0.0) RA += pi;
+  if (L > pi) RA += pi;
+  RA = 24.0*RA/pi2;
+  *DK = asinf(sinf(e)*sinf(L));
+
+  RA_Mittel = 24.0f * InPi(pi2*RA_Mittel/24.0f)/pi2;
+  float dRA = RA_Mittel - RA;
+  if (dRA < -12.0f) dRA += 24.0f;
+  if (dRA > 12.0f) dRA -= 24.0f;
+  dRA = dRA * 1.0027379f;
+  return dRA;
+}
+
+void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down)
+{
+  float JD2000 = 2451545.0f;
+  float JD = JulianischesDatum();
+  float T = (JD - JD2000) / 36525.0f;
+  float DK;
+
+
+
+
+
+
+
+  float h = SUNRISE_DAWN_ANGLE *RAD;
+  float B = (((float)Settings.latitude)/1000000) * RAD;
+  float GeographischeLaenge = ((float)Settings.longitude)/1000000;
+
+
+
+  float Zeitzone = ((float)Rtc.time_timezone) / 60;
+  float Zeitgleichung = BerechneZeitgleichung(&DK, T);
+  float Zeitdifferenz = 12.0f*acosf((sinf(h) - sinf(B)*sinf(DK)) / (cosf(B)*cosf(DK)))/pi;
+  float AufgangOrtszeit = 12.0f - Zeitdifferenz - Zeitgleichung;
+  float UntergangOrtszeit = 12.0f + Zeitdifferenz - Zeitgleichung;
+  float AufgangWeltzeit = AufgangOrtszeit - GeographischeLaenge / 15.0f;
+  float UntergangWeltzeit = UntergangOrtszeit - GeographischeLaenge / 15.0f;
+  float Aufgang = AufgangWeltzeit + Zeitzone;
+  if (Aufgang < 0.0f) {
+    Aufgang += 24.0f;
+  } else {
+    if (Aufgang >= 24.0f) Aufgang -= 24.0f;
+  }
+  float Untergang = UntergangWeltzeit + Zeitzone;
+  if (Untergang < 0.0f) {
+    Untergang += 24.0f;
+  } else {
+    if (Untergang >= 24.0f) Untergang -= 24.0f;
+  }
+  int AufgangMinuten = (int)(60.0f*(Aufgang - (int)Aufgang)+0.5f);
+  int AufgangStunden = (int)Aufgang;
+  if (AufgangMinuten >= 60.0f) {
+    AufgangMinuten -= 60.0f;
+    AufgangStunden++;
+  } else {
+    if (AufgangMinuten < 0.0f) {
+      AufgangMinuten += 60.0f;
+      AufgangStunden--;
+      if (AufgangStunden < 0.0f) AufgangStunden += 24.0f;
+    }
+  }
+  int UntergangMinuten = (int)(60.0f*(Untergang - (int)Untergang)+0.5f);
+  int UntergangStunden = (int)Untergang;
+  if (UntergangMinuten >= 60.0f) {
+    UntergangMinuten -= 60.0f;
+    UntergangStunden++;
+  } else {
+    if (UntergangMinuten<0) {
+      UntergangMinuten += 60.0f;
+      UntergangStunden--;
+      if (UntergangStunden < 0.0f) UntergangStunden += 24.0f;
+    }
+  }
+  *hour_up = AufgangStunden;
+  *minute_up = AufgangMinuten;
+  *hour_down = UntergangStunden;
+  *minute_down = UntergangMinuten;
+}
+
+void ApplyTimerOffsets(Timer *duskdawn)
+{
+  uint8_t hour[2];
+  uint8_t minute[2];
+  Timer stored = (Timer)*duskdawn;
+
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  uint8_t mode = (duskdawn->mode -1) &1;
+  duskdawn->time = (hour[mode] *60) + minute[mode];
+
+
+  uint16_t timeBuffer;
+  if ((uint16_t)stored.time > 719) {
+
+    timeBuffer = (uint16_t)stored.time - 720;
+
+    if (timeBuffer > (uint16_t)duskdawn->time) {
+      timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time);
+      duskdawn->days = duskdawn->days >> 1;
+      duskdawn->days |= (stored.days << 6);
+    } else {
+      timeBuffer = (uint16_t)duskdawn->time - timeBuffer;
+    }
+  } else {
+
+    timeBuffer = (uint16_t)duskdawn->time + (uint16_t)stored.time;
+
+    if (timeBuffer > 1440) {
+      timeBuffer -= 1440;
+      duskdawn->days = duskdawn->days << 1;
+      duskdawn->days |= (stored.days >> 6);
+    }
+  }
+  duskdawn->time = timeBuffer;
+}
+
+String GetSun(uint32_t dawn)
+{
+  char stime[6];
+
+  uint8_t hour[2];
+  uint8_t minute[2];
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  dawn &= 1;
+  snprintf_P(stime, sizeof(stime), PSTR("%02d:%02d"), hour[dawn], minute[dawn]);
+  return String(stime);
+}
+
+uint16_t SunMinutes(uint32_t dawn)
+{
+  uint8_t hour[2];
+  uint8_t minute[2];
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  dawn &= 1;
+  return (hour[dawn] *60) + minute[dawn];
+}
+
+#endif
+
+
+
+void TimerSetRandomWindow(uint32_t index)
+{
+  timer_window[index] = 0;
+  if (Settings.timer[index].window) {
+    timer_window[index] = (random(0, (Settings.timer[index].window << 1) +1)) - Settings.timer[index].window;
+  }
+}
+
+void TimerSetRandomWindows(void)
+{
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) { TimerSetRandomWindow(i); }
+}
+
+void TimerEverySecond(void)
+{
+  if (RtcTime.valid) {
+    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); }
+    if (Settings.flag3.timers_enable &&
+        (uptime > 60) && (RtcTime.minute != timer_last_minute)) {
+      timer_last_minute = RtcTime.minute;
+      int32_t time = (RtcTime.hour *60) + RtcTime.minute;
+      uint8_t days = 1 << (RtcTime.day_of_week -1);
+
+      for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+
+        Timer xtimer = Settings.timer[i];
+#ifdef USE_SUNRISE
+        if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
+          ApplyTimerOffsets(&xtimer);
+        }
+#endif
+        if (xtimer.arm) {
+          int32_t set_time = xtimer.time + timer_window[i];
+          if (set_time < 0) {
+            set_time = abs(timer_window[i]);
+          }
+          if (set_time > 1439) {
+            set_time = xtimer.time - abs(timer_window[i]);
+          }
+          if (set_time > 1439) { set_time = 1439; }
+
+          DEBUG_DRIVER_LOG(PSTR("TIM: Timer %d, Time %d, Window %d, SetTime %d"), i +1, xtimer.time, timer_window[i], set_time);
+
+          if (time == set_time) {
+            if (xtimer.days & days) {
+              Settings.timer[i].arm = xtimer.repeat;
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+              if (POWER_BLINK == xtimer.power) {
+                Response_P(PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1);
+                XdrvRulesProcess();
+              } else
+#endif
+                if (devices_present) { ExecuteCommandPower(xtimer.device +1, xtimer.power, SRC_TIMER); }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void PrepShowTimer(uint32_t index)
+{
+  Timer xtimer = Settings.timer[index -1];
+
+  char days[8] = { 0 };
+  for (uint32_t i = 0; i < 7; i++) {
+    uint8_t mask = 1 << i;
+    snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0));
+  }
+
+  char soutput[80];
+  soutput[0] = '\0';
+  if (devices_present) {
+    snprintf_P(soutput, sizeof(soutput), PSTR(",\"" D_JSON_TIMER_OUTPUT "\":%d"), xtimer.device +1);
+  }
+#ifdef USE_SUNRISE
+  char sign[2] = { 0 };
+  int16_t hour = xtimer.time / 60;
+  if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
+    if (hour > 11) {
+      hour -= 12;
+      sign[0] = '-';
+    }
+  }
+  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%s%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
+    index, xtimer.arm, xtimer.mode, sign, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
+#else
+  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
+    index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
+#endif
+}
+
+
+
+
+
+void CmndTimer(void)
+{
+  uint32_t index = XdrvMailbox.index;
+  if ((index > 0) && (index <= MAX_TIMERS)) {
+    uint32_t error = 0;
+    if (XdrvMailbox.data_len) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_TIMERS)) {
+        if (XdrvMailbox.payload == 0) {
+          Settings.timer[index -1].data = 0;
+        } else {
+          Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data;
+        }
+      } else {
+
+#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
+        if (devices_present) {
+#endif
+          char dataBufUc[XdrvMailbox.data_len + 1];
+          UpperCase(dataBufUc, XdrvMailbox.data);
+          StaticJsonBuffer<256> jsonBuffer;
+          JsonObject& root = jsonBuffer.parseObject(dataBufUc);
+          if (!root.success()) {
+            Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index);
+            error = 1;
+          }
+          else {
+            char parm_uc[10];
+            index--;
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) {
+              Settings.timer[index].arm = (root[parm_uc] != 0);
+            }
+#ifdef USE_SUNRISE
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_MODE))].success()) {
+              Settings.timer[index].mode = (uint8_t)root[parm_uc] & 0x03;
+            }
+#endif
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) {
+              uint16_t itime = 0;
+              int8_t value = 0;
+              uint8_t sign = 0;
+              char time_str[10];
+
+              strlcpy(time_str, root[parm_uc], sizeof(time_str));
+              const char *substr = strtok(time_str, ":");
+              if (substr != nullptr) {
+                if (strchr(substr, '-')) {
+                  sign = 1;
+                  substr++;
+                }
+                value = atoi(substr);
+                if (sign) { value += 12; }
+                if (value > 23) { value = 23; }
+                itime = value * 60;
+                substr = strtok(nullptr, ":");
+                if (substr != nullptr) {
+                  value = atoi(substr);
+                  if (value < 0) { value = 0; }
+                  if (value > 59) { value = 59; }
+                  itime += value;
+                }
+              }
+              Settings.timer[index].time = itime;
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_WINDOW))].success()) {
+              Settings.timer[index].window = (uint8_t)root[parm_uc] & 0x0F;
+              TimerSetRandomWindow(index);
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) {
+
+              Settings.timer[index].days = 0;
+              const char *tday = root[parm_uc];
+              uint8_t i = 0;
+              char ch = *tday++;
+              while ((ch != '\0') && (i < 7)) {
+                if (ch == '-') { ch = '0'; }
+                uint8_t mask = 1 << i++;
+                Settings.timer[index].days |= (ch == '0') ? 0 : mask;
+                ch = *tday++;
+              }
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) {
+              Settings.timer[index].repeat = (root[parm_uc] != 0);
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) {
+              uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F;
+              Settings.timer[index].device = (device < devices_present) ? device : 0;
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) {
+              uint8_t action = (uint8_t)root[parm_uc] & 0x03;
+              Settings.timer[index].power = (devices_present) ? action : 3;
+            }
+
+            index++;
+          }
+
+#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
+        } else {
+          Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index);
+          error = 1;
+        }
+#endif
+      }
+    }
+    if (!error) {
+      Response_P(PSTR("{"));
+      PrepShowTimer(index);
+      ResponseJsonEnd();
+    }
+  }
+}
+
+void CmndTimers(void)
+{
+  if (XdrvMailbox.data_len) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+      Settings.flag3.timers_enable = XdrvMailbox.payload;
+    }
+    if (XdrvMailbox.payload == 2) {
+      Settings.flag3.timers_enable = !Settings.flag3.timers_enable;
+    }
+  }
+
+  ResponseCmndStateText(Settings.flag3.timers_enable);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
+
+  uint32_t jsflg = 0;
+  uint32_t lines = 1;
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_TIMERS "%d\":{"), lines++);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg++;
+    PrepShowTimer(i +1);
+    if (jsflg > 3) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS));
+      jsflg = 0;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+#ifdef USE_SUNRISE
+void CmndLongitude(void)
+{
+  if (XdrvMailbox.data_len) {
+    Settings.longitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
+  }
+  ResponseCmndFloat((float)(Settings.longitude) /1000000, 6);
+}
+
+void CmndLatitude(void)
+{
+  if (XdrvMailbox.data_len) {
+    Settings.latitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
+  }
+  ResponseCmndFloat((float)(Settings.latitude) /1000000, 6);
+}
+#endif
+
+
+
+
+
+#ifdef USE_WEBSERVER
+#ifdef USE_TIMERS_WEB
+
+#define WEB_HANDLE_TIMER "tm"
+
+const char S_CONFIGURE_TIMER[] PROGMEM = D_CONFIGURE_TIMER;
+
+const char HTTP_BTN_MENU_TIMER[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_TIMER "' method='get'><button>" D_CONFIGURE_TIMER "</button></form></p>";
+
+const char HTTP_TIMER_SCRIPT1[] PROGMEM =
+  "var pt=[],ct=99;"
+  "function ce(i,q){"
+    "var o=document.createElement('option');"
+    "o.textContent=i;"
+    "q.appendChild(o);"
+  "}";
+#ifdef USE_SUNRISE
+const char HTTP_TIMER_SCRIPT2[] PROGMEM =
+  "function gt(){"
+    "var m,p,q;"
+    "m=qs('input[name=\"rd\"]:checked').value;"
+    "p=pt[ct]&0x7FF;"
+    "if(m==0){"
+      "so(0);"
+      "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
+      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+    "}"
+    "if((m==1)||(m==2)){"
+      "so(1);"
+      "q=Math.floor(p/60);"
+      "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}"
+        "else{qs('#dr').selectedIndex=0;}"
+      "if(q<10){q='0'+q;}qs('#ho').value=q;"
+      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+    "}"
+  "}"
+  "function so(b){"
+    "o=qs('#ho');"
+    "e=o.childElementCount;"
+    "if(b==1){"
+      "qs('#dr').style.visibility='';"
+      "if(e>12){for(i=12;i<=23;i++){o.removeChild(o.lastElementChild);}}"
+    "}else{"
+      "qs('#dr').style.visibility='hidden';"
+      "if(e<23){for(i=12;i<=23;i++){ce(i,o);}}"
+    "}"
+  "}";
+#endif
+const char HTTP_TIMER_SCRIPT3[] PROGMEM =
+  "function st(){"
+    "var i,l,m,n,p,s;"
+    "m=0;s=0;"
+    "n=1<<31;if(eb('a0').checked){s|=n;}"
+    "n=1<<15;if(eb('r0').checked){s|=n;}"
+    "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}"
+#ifdef USE_SUNRISE
+    "m=qs('input[name=\"rd\"]:checked').value;"
+    "s|=(qs('input[name=\"rd\"]:checked').value<<29);"
+#endif
+    "if(%d>0){"
+      "i=qs('#d1').selectedIndex;if(i>=0){s|=(i<<23);}"
+      "s|=(qs('#p1').selectedIndex<<27);"
+    "}else{"
+      "s|=3<<27;"
+    "}"
+    "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;"
+    "if(m==0){s|=l;}"
+#ifdef USE_SUNRISE
+    "if((m==1)||(m==2)){"
+      "if(qs('#dr').selectedIndex>0){if(l>0){l+=720;}}"
+      "s|=l&0x7FF;"
+    "}"
+#endif
+    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"
+    "pt[ct]=s;"
+    "eb('t0').value=pt.join();"
+  "}";
+const char HTTP_TIMER_SCRIPT4[] PROGMEM =
+  "function ot(t,e){"
+    "var i,n,o,p,q,s;"
+    "if(ct<99){st();}"
+    "ct=t;"
+    "o=document.getElementsByClassName('tl');"
+    "for(i=0;i<o.length;i++){o[i].style.cssText=\"background:#%06x;color:#%06x;font-weight:normal;\"}"
+    "e.style.cssText=\"background:#%06x;color:#%06x;font-weight:bold;\";"
+    "s=pt[ct];"
+#ifdef USE_SUNRISE
+    "p=(s>>29)&3;eb('b'+p).checked=1;"
+    "gt();"
+#else
+    "p=s&0x7FF;"
+    "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
+    "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+#endif
+    "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;"
+    "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}"
+    "if(%d>0){"
+      "p=(s>>23)&0xF;qs('#d1').value=p+1;"
+      "p=(s>>27)&3;qs('#p1').selectedIndex=p;"
+    "}"
+    "p=(s>>15)&1;eb('r0').checked=p;"
+    "p=(s>>31)&1;eb('a0').checked=p;"
+  "}";
+const char HTTP_TIMER_SCRIPT5[] PROGMEM =
+  "function it(){"
+    "var b,i,o,s;"
+    "pt=eb('t0').value.split(',').map(Number);"
+    "s='';"
+    "for(i=0;i<%d;i++){"
+      "b='';"
+      "if(0==i){b=\" id='dP'\";}"
+      "s+=\"<button type='button' class='tl' onclick='ot(\"+i+\",this)'\"+b+\">\"+(i+1)+\"</button>\""
+    "}"
+    "eb('bt').innerHTML=s;"
+    "if(%d>0){"
+      "eb('oa').innerHTML=\"<b>" D_TIMER_OUTPUT "</b>&nbsp;<span><select style='width:60px;' id='d1'></select></span>&emsp;<b>" D_TIMER_ACTION "</b>&nbsp;<select style='width:99px;' id='p1'></select>\";"
+      "o=qs('#p1');ce('" D_OFF "',o);ce('" D_ON "',o);ce('" D_TOGGLE "',o);"
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+      "ce('" D_RULE "',o);"
+#else
+      "ce('" D_BLINK "',o);"
+#endif
+    "}else{"
+      "eb('oa').innerHTML=\"<b>" D_TIMER_ACTION "</b> " D_RULE "\";"
+    "}";
+const char HTTP_TIMER_SCRIPT6[] PROGMEM =
+#ifdef USE_SUNRISE
+    "o=qs('#dr');ce('+',o);ce('-',o);"
+#endif
+    "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#d1');for(i=0;i<%d;i++){ce(i+1,o);}"
+    "var a='" D_DAY3LIST "';"
+    "s='';for(i=0;i<7;i++){s+=\"<input id='w\"+i+\"' type='checkbox'><b>\"+a.substring(i*3,(i*3)+3)+\"</b> \"}"
+    "eb('ds').innerHTML=s;"
+    "eb('dP').click();"
+  "}"
+  "wl(it);";
+const char HTTP_TIMER_STYLE[] PROGMEM =
+  ".tl{float:left;border-radius:0;border:1px solid #%06x;padding:1px;width:6.25%%;}";
+const char HTTP_FORM_TIMER1[] PROGMEM =
+  "<fieldset style='min-width:470px;text-align:center;'>"
+  "<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>"
+  "<br><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br><br><hr>"
+  "<input id='t0' value='";
+const char HTTP_FORM_TIMER2[] PROGMEM =
+  "' hidden><div id='bt'></div><br><br><br>"
+  "<div id='oa' name='oa'></div><br>"
+  "<div>"
+  "<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;"
+  "<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>"
+  "</div><br>"
+  "<div>";
+#ifdef USE_SUNRISE
+const char HTTP_FORM_TIMER3[] PROGMEM =
+  "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
+  "<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br>"
+  "<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br>"
+  "<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br>"
+  "</fieldset>"
+  "<p></p>"
+  "<span><select style='width:46px;' id='dr'></select></span>"
+  "&nbsp;";
+#else
+const char HTTP_FORM_TIMER3[] PROGMEM =
+  "<b>" D_TIMER_TIME "</b>&nbsp;";
+#endif
+const char HTTP_FORM_TIMER4[] PROGMEM =
+  "<span><select style='width:60px;' id='ho'></select></span>"
+  "&nbsp;" D_HOUR_MINUTE_SEPARATOR "&nbsp;"
+  "<span><select style='width:60px;' id='mi'></select></span>"
+  "&emsp;<b>+/-</b>&nbsp;"
+  "<span><select style='width:60px;' id='mw'></select></span>"
+  "</div><br>"
+  "<div id='ds' name='ds'></div>";
+
+void HandleTimerConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TIMER);
+
+  if (WebServer->hasArg("save")) {
+    TimerSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_TIMER);
+  WSContentSend_P(HTTP_TIMER_SCRIPT1);
+#ifdef USE_SUNRISE
+  WSContentSend_P(HTTP_TIMER_SCRIPT2);
+#endif
+  WSContentSend_P(HTTP_TIMER_SCRIPT3, devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT4, WebColor(COL_TIMER_TAB_BACKGROUND), WebColor(COL_TIMER_TAB_TEXT), WebColor(COL_FORM), WebColor(COL_TEXT), devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT5, MAX_TIMERS, devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT6, devices_present);
+  WSContentSendStyle_P(HTTP_TIMER_STYLE, WebColor(COL_FORM));
+  WSContentSend_P(HTTP_FORM_TIMER1, (Settings.flag3.timers_enable) ? " checked" : "");
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    WSContentSend_P(PSTR("%s%u"), (i > 0) ? "," : "", Settings.timer[i].data);
+  }
+  WSContentSend_P(HTTP_FORM_TIMER2);
+#ifdef USE_SUNRISE
+  WSContentSend_P(HTTP_FORM_TIMER3, 100 + (strlen(D_SUNSET) *12), GetSun(0).c_str(), GetSun(1).c_str());
+#else
+  WSContentSend_P(HTTP_FORM_TIMER3);
+#endif
+  WSContentSend_P(HTTP_FORM_TIMER4);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void TimerSaveSettings(void)
+{
+  char tmp[MAX_TIMERS *12];
+  char message[LOGSZ];
+  Timer timer;
+
+  Settings.flag3.timers_enable = WebServer->hasArg("e0");
+  WebGetArg("t0", tmp, sizeof(tmp));
+  char *p = tmp;
+  snprintf_P(message, sizeof(message), PSTR(D_LOG_MQTT D_CMND_TIMERS " %d"), Settings.flag3.timers_enable);
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    timer.data = strtol(p, &p, 10);
+    p++;
+    if (timer.time < 1440) {
+      bool flag = (timer.window != Settings.timer[i].window);
+      Settings.timer[i].data = timer.data;
+      if (flag) TimerSetRandomWindow(i);
+    }
+    snprintf_P(message, sizeof(message), PSTR("%s,0x%08X"), message, Settings.timer[i].data);
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, message);
+}
+#endif
+#endif
+
+
+
+
+
+bool Xdrv09(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_PRE_INIT:
+      TimerSetRandomWindows();
+      break;
+#ifdef USE_WEBSERVER
+#ifdef USE_TIMERS_WEB
+    case FUNC_WEB_ADD_BUTTON:
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+      WSContentSend_P(HTTP_BTN_MENU_TIMER);
+#else
+      if (devices_present) { WSContentSend_P(HTTP_BTN_MENU_TIMER); }
+#endif
+      break;
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/" WEB_HANDLE_TIMER, HandleTimerConfiguration);
+      break;
+#endif
+#endif
+    case FUNC_EVERY_SECOND:
+      TimerEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kTimerCommands, TimerCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+#ifdef USE_RULES
+#ifndef USE_SCRIPT
+# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+#define XDRV_10 10
+
+#define D_CMND_RULE "Rule"
+#define D_CMND_RULETIMER "RuleTimer"
+#define D_CMND_EVENT "Event"
+#define D_CMND_VAR "Var"
+#define D_CMND_MEM "Mem"
+#define D_CMND_ADD "Add"
+#define D_CMND_SUB "Sub"
+#define D_CMND_MULT "Mult"
+#define D_CMND_SCALE "Scale"
+#define D_CMND_CALC_RESOLUTION "CalcRes"
+#define D_CMND_SUBSCRIBE "Subscribe"
+#define D_CMND_UNSUBSCRIBE "Unsubscribe"
+#define D_CMND_IF "If"
+
+#define D_JSON_INITIATED "Initiated"
+
+#define COMPARE_OPERATOR_NONE -1
+#define COMPARE_OPERATOR_EQUAL 0
+#define COMPARE_OPERATOR_BIGGER 1
+#define COMPARE_OPERATOR_SMALLER 2
+#define COMPARE_OPERATOR_EXACT_DIVISION 3
+#define COMPARE_OPERATOR_NUMBER_EQUAL 4
+#define COMPARE_OPERATOR_NOT_EQUAL 5
+#define COMPARE_OPERATOR_BIGGER_EQUAL 6
+#define COMPARE_OPERATOR_SMALLER_EQUAL 7
+#define MAXIMUM_COMPARE_OPERATOR COMPARE_OPERATOR_SMALLER_EQUAL
+const char kCompareOperators[] PROGMEM = "=\0>\0<\0|\0==!=>=<=";
+
+#ifdef USE_EXPRESSION
+  #include <LinkedList.h>
+
+  const char kExpressionOperators[] PROGMEM = "+-*/%^\0";
+  #define EXPRESSION_OPERATOR_ADD 0
+  #define EXPRESSION_OPERATOR_SUBTRACT 1
+  #define EXPRESSION_OPERATOR_MULTIPLY 2
+  #define EXPRESSION_OPERATOR_DIVIDEDBY 3
+  #define EXPRESSION_OPERATOR_MODULO 4
+  #define EXPRESSION_OPERATOR_POWER 5
+
+  const uint8_t kExpressionOperatorsPriorities[] PROGMEM = {1, 1, 2, 2, 3, 4};
+  #define MAX_EXPRESSION_OPERATOR_PRIORITY 4
+
+
+  #define LOGIC_OPERATOR_AND 1
+  #define LOGIC_OPERATOR_OR 2
+
+  #define IF_BLOCK_INVALID -1
+  #define IF_BLOCK_ANY 0
+  #define IF_BLOCK_ELSEIF 1
+  #define IF_BLOCK_ELSE 2
+  #define IF_BLOCK_ENDIF 3
+#endif
+
+const char kRulesCommands[] PROGMEM = "|"
+  D_CMND_RULE "|" D_CMND_RULETIMER "|" D_CMND_EVENT "|" D_CMND_VAR "|" D_CMND_MEM "|"
+  D_CMND_ADD "|" D_CMND_SUB "|" D_CMND_MULT "|" D_CMND_SCALE "|" D_CMND_CALC_RESOLUTION
+#ifdef SUPPORT_MQTT_EVENT
+  "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE
+#endif
+#ifdef SUPPORT_IF_STATEMENT
+  "|" D_CMND_IF
+#endif
+  ;
+
+void (* const RulesCommand[])(void) PROGMEM = {
+  &CmndRule, &CmndRuleTimer, &CmndEvent, &CmndVariable, &CmndMemory,
+  &CmndAddition, &CmndSubtract, &CmndMultiply, &CmndScale, &CmndCalcResolution
+#ifdef SUPPORT_MQTT_EVENT
+  , &CmndSubscribe, &CmndUnsubscribe
+#endif
+#ifdef SUPPORT_IF_STATEMENT
+  , &CmndIf
+#endif
+  };
+
+#ifdef SUPPORT_MQTT_EVENT
+  #include <LinkedList.h>
+  typedef struct {
+    String Event;
+    String Topic;
+    String Key;
+  } MQTT_Subscription;
+  LinkedList<MQTT_Subscription> subscriptions;
+#endif
+
+struct RULES {
+  String event_value;
+  unsigned long timer[MAX_RULE_TIMERS] = { 0 };
+  uint32_t triggers[MAX_RULE_SETS] = { 0 };
+  uint8_t trigger_count[MAX_RULE_SETS] = { 0 };
+
+  long new_power = -1;
+  long old_power = -1;
+  long old_dimm = -1;
+
+  uint16_t last_minute = 60;
+  uint16_t vars_event = 0;
+  uint8_t mems_event = 0;
+  bool teleperiod = false;
+
+  char event_data[100];
+} Rules;
+
+char rules_vars[MAX_RULE_VARS][33] = {{ 0 }};
+
+#if (MAX_RULE_VARS>16)
+#error MAX_RULE_VARS is bigger than 16
+#endif
+#if (MAX_RULE_MEMS>16)
+#error MAX_RULE_MEMS is bigger than 16
+#endif
+
+
+
+bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
+{
+
+
+
+
+  bool match = false;
+  char stemp[10];
+
+
+  int pos = rule.indexOf('#');
+  if (pos == -1) { return false; }
+
+  String rule_task = rule.substring(0, pos);
+  if (Rules.teleperiod) {
+    int ppos = rule_task.indexOf("TELE-");
+    if (ppos == -1) { return false; }
+    rule_task = rule.substring(5, pos);
+  }
+
+  String rule_expr = rule.substring(pos +1);
+  String rule_name, rule_param;
+  int8_t compareOperator = parseCompareExpression(rule_expr, rule_name, rule_param);
+
+  char rule_svalue[80] = { 0 };
+  float rule_value = 0;
+  if (compareOperator != COMPARE_OPERATOR_NONE) {
+    for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
+      if (rule_param.startsWith(stemp)) {
+        rule_param = rules_vars[i];
+        break;
+      }
+    }
+    for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
+      if (rule_param.startsWith(stemp)) {
+        rule_param = SettingsText(SET_MEM1 + i);
+        break;
+      }
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIME%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(MinutesPastMidnight());
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%UPTIME%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(MinutesUptime());
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMESTAMP%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = GetDateAndTime(DT_LOCAL).c_str();
+    }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNRISE%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(SunMinutes(0));
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNSET%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(SunMinutes(1));
+    }
+#endif
+    rule_param.toUpperCase();
+    strlcpy(rule_svalue, rule_param.c_str(), sizeof(rule_svalue));
+
+    int temp_value = GetStateNumber(rule_svalue);
+    if (temp_value > -1) {
+      rule_value = temp_value;
+    } else {
+      rule_value = CharToFloat((char*)rule_svalue);
+    }
+  }
+
+
+  int rule_name_idx = 0;
+  if ((pos = rule_name.indexOf("[")) > 0) {
+    rule_name_idx = rule_name.substring(pos +1).toInt();
+    if ((rule_name_idx < 1) || (rule_name_idx > 6)) {
+      rule_name_idx = 1;
+    }
+    rule_name = rule_name.substring(0, pos);
+  }
+
+  StaticJsonBuffer<1024> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(event);
+  if (!root.success()) { return false; }
+  if (!root[rule_task].success()) { return false; }
+
+  JsonObject &obj1 = root[rule_task];
+  JsonObject *obj = &obj1;
+  String subtype;
+  uint32_t i = 0;
+  while ((pos = rule_name.indexOf("#")) > 0) {
+    subtype = rule_name.substring(0, pos);
+    if (!(*obj)[subtype].success()) { return false; }
+    JsonObject &obj2 = (*obj)[subtype];
+    obj = &obj2;
+    rule_name = rule_name.substring(pos +1);
+    if (i++ > 10) { return false; }
+  }
+  if (!(*obj)[rule_name].success()) { return false; }
+  const char* str_value;
+  if (rule_name_idx) {
+    str_value = (*obj)[rule_name][rule_name_idx -1];
+  } else {
+    str_value = (*obj)[rule_name];
+  }
+
+
+
+
+  Rules.event_value = str_value;
+
+
+  float value = 0;
+  if (str_value) {
+    value = CharToFloat((char*)str_value);
+    int int_value = int(value);
+    int int_rule_value = int(rule_value);
+    switch (compareOperator) {
+      case COMPARE_OPERATOR_EXACT_DIVISION:
+        match = (int_rule_value && (int_value % int_rule_value) == 0);
+        break;
+      case COMPARE_OPERATOR_EQUAL:
+        match = (!strcasecmp(str_value, rule_svalue));
+        break;
+      case COMPARE_OPERATOR_BIGGER:
+        match = (value > rule_value);
+        break;
+      case COMPARE_OPERATOR_SMALLER:
+        match = (value < rule_value);
+        break;
+      case COMPARE_OPERATOR_NUMBER_EQUAL:
+        match = (value == rule_value);
+        break;
+      case COMPARE_OPERATOR_NOT_EQUAL:
+        match = (value != rule_value);
+        break;
+      case COMPARE_OPERATOR_BIGGER_EQUAL:
+        match = (value >= rule_value);
+        break;
+      case COMPARE_OPERATOR_SMALLER_EQUAL:
+        match = (value <= rule_value);
+        break;
+      default:
+        match = true;
+    }
+  } else match = true;
+
+  if (bitRead(Settings.rule_once, rule_set)) {
+    if (match) {
+      if (!bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set])) {
+        bitSet(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
+      } else {
+        match = false;
+      }
+    } else {
+      bitClear(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
+    }
+  }
+
+  return match;
+}
+# 363 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr)
+{
+  char compare_operator[3];
+  int8_t compare = COMPARE_OPERATOR_NONE;
+  leftExpr = expr;
+  int position;
+  for (int8_t i = MAXIMUM_COMPARE_OPERATOR; i >= 0; i--) {
+    snprintf_P(compare_operator, sizeof(compare_operator), kCompareOperators + (i *2));
+    if ((position = expr.indexOf(compare_operator)) > 0) {
+      compare = i;
+      leftExpr = expr.substring(0, position);
+      leftExpr.trim();
+      rightExpr = expr.substring(position + strlen(compare_operator));
+      rightExpr.trim();
+      break;
+    }
+  }
+  return compare;
+}
+
+void RulesVarReplace(String &commands, const String &sfind, const String &replace)
+{
+
+
+
+  char *find = (char*)sfind.c_str();
+  uint32_t flen = strlen(find);
+
+  String ucommand = commands;
+  ucommand.toUpperCase();
+  char *read_from = (char*)ucommand.c_str();
+  char *write_to = (char*)commands.c_str();
+  char *found_at;
+  while ((found_at = strstr(read_from, find)) != nullptr) {
+    write_to += (found_at - read_from);
+    memmove_P(write_to, find, flen);
+    write_to += flen;
+    read_from = found_at + flen;
+  }
+
+  commands.replace(find, replace);
+}
+
+
+
+bool RuleSetProcess(uint8_t rule_set, String &event_saved)
+{
+  bool serviced = false;
+  char stemp[10];
+
+  delay(0);
+
+
+
+  String rules = Settings.rules[rule_set];
+
+  Rules.trigger_count[rule_set] = 0;
+  int plen = 0;
+  int plen2 = 0;
+  bool stop_all_rules = false;
+  while (true) {
+    rules = rules.substring(plen);
+    rules.trim();
+    if (!rules.length()) { return serviced; }
+
+    String rule = rules;
+    rule.toUpperCase();
+    if (!rule.startsWith("ON ")) { return serviced; }
+
+    int pevt = rule.indexOf(" DO ");
+    if (pevt == -1) { return serviced; }
+    String event_trigger = rule.substring(3, pevt);
+
+    plen = rule.indexOf(" ENDON");
+    plen2 = rule.indexOf(" BREAK");
+    if ((plen == -1) && (plen2 == -1)) { return serviced; }
+
+    if (plen == -1) { plen = 9999; }
+    if (plen2 == -1) { plen2 = 9999; }
+    plen = tmin(plen, plen2);
+
+    String commands = rules.substring(pevt +4, plen);
+    Rules.event_value = "";
+    String event = event_saved;
+
+
+
+    if (RulesRuleMatch(rule_set, event, event_trigger)) {
+      if (plen == plen2) { stop_all_rules = true; }
+      commands.trim();
+      String ucommand = commands;
+      ucommand.toUpperCase();
+
+
+
+      if ((ucommand.indexOf("IF ") == -1) &&
+          (ucommand.indexOf("EVENT ") != -1) &&
+          (ucommand.indexOf("BACKLOG ") == -1)) {
+        commands = "backlog " + commands;
+      }
+
+      RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);
+      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
+        RulesVarReplace(commands, stemp, rules_vars[i]);
+      }
+      for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
+        RulesVarReplace(commands, stemp, SettingsText(SET_MEM1 +i));
+      }
+      RulesVarReplace(commands, F("%TIME%"), String(MinutesPastMidnight()));
+      RulesVarReplace(commands, F("%UPTIME%"), String(MinutesUptime()));
+      RulesVarReplace(commands, F("%TIMESTAMP%"), GetDateAndTime(DT_LOCAL));
+      RulesVarReplace(commands, F("%TOPIC%"), SettingsText(SET_MQTT_TOPIC));
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+      RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
+      RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));
+#endif
+
+      char command[commands.length() +1];
+      strlcpy(command, commands.c_str(), sizeof(command));
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command);
+
+
+
+#ifdef SUPPORT_IF_STATEMENT
+      char *pCmd = command;
+      RulesPreprocessCommand(pCmd);
+#endif
+      ExecuteCommand(command, SRC_RULE);
+      serviced = true;
+      if (stop_all_rules) { return serviced; }
+    }
+    plen += 6;
+    Rules.trigger_count[rule_set]++;
+  }
+  return serviced;
+}
+
+
+
+bool RulesProcessEvent(char *json_event)
+{
+  bool serviced = false;
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("RulesProcessEvent"));
+#endif
+
+  String event_saved = json_event;
+
+
+
+  char *p = strchr(json_event, ':');
+  if ((p != NULL) && !(strchr(++p, ':'))) {
+    event_saved.replace(F(":"), F(":{\"Data\":"));
+    event_saved += F("}");
+
+  }
+  event_saved.toUpperCase();
+
+
+
+  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+    if (strlen(Settings.rules[i]) && bitRead(Settings.rule_enabled, i)) {
+      if (RuleSetProcess(i, event_saved)) { serviced = true; }
+    }
+  }
+  return serviced;
+}
+
+bool RulesProcess(void)
+{
+  return RulesProcessEvent(mqtt_data);
+}
+
+void RulesInit(void)
+{
+  rules_flag.data = 0;
+  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+    if (Settings.rules[i][0] == '\0') {
+      bitWrite(Settings.rule_enabled, i, 0);
+      bitWrite(Settings.rule_once, i, 0);
+    }
+  }
+  Rules.teleperiod = false;
+}
+
+void RulesEvery50ms(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[120];
+
+    if (-1 == Rules.new_power) { Rules.new_power = power; }
+    if (Rules.new_power != Rules.old_power) {
+      if (Rules.old_power != -1) {
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint8_t new_state = (Rules.new_power >> i) &1;
+          if (new_state != ((Rules.old_power >> i) &1)) {
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"State\":%d}}"), i +1, new_state);
+            RulesProcessEvent(json_event);
+          }
+        }
+      } else {
+
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint8_t new_state = (Rules.new_power >> i) &1;
+          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"Boot\":%d}}"), i +1, new_state);
+          RulesProcessEvent(json_event);
+        }
+
+        for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+#ifdef USE_TM1638
+          if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
+#else
+          if (pin[GPIO_SWT1 +i] < 99) {
+#endif
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (SwitchState(i)));
+            RulesProcessEvent(json_event);
+          }
+        }
+      }
+      Rules.old_power = Rules.new_power;
+    }
+    else if (Rules.old_dimm != Settings.light_dimmer) {
+      if (Rules.old_dimm != -1) {
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"State\":%d}}"), Settings.light_dimmer);
+      } else {
+
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"Boot\":%d}}"), Settings.light_dimmer);
+      }
+      RulesProcessEvent(json_event);
+      Rules.old_dimm = Settings.light_dimmer;
+    }
+    else if (Rules.event_data[0]) {
+      char *event;
+      char *parameter;
+      event = strtok_r(Rules.event_data, "=", &parameter);
+      if (event) {
+        event = Trim(event);
+        if (parameter) {
+          parameter = Trim(parameter);
+        } else {
+          parameter = event + strlen(event);
+        }
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Event\":{\"%s\":\"%s\"}}"), event, parameter);
+        Rules.event_data[0] ='\0';
+        RulesProcessEvent(json_event);
+      } else {
+        Rules.event_data[0] ='\0';
+      }
+    }
+    else if (Rules.vars_event || Rules.mems_event){
+      if (Rules.vars_event) {
+        for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+          if (bitRead(Rules.vars_event, i)) {
+            bitClear(Rules.vars_event, i);
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Var%d\":{\"State\":%s}}"), i+1, rules_vars[i]);
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+      }
+      if (Rules.mems_event) {
+        for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+          if (bitRead(Rules.mems_event, i)) {
+            bitClear(Rules.mems_event, i);
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Mem%d\":{\"State\":%s}}"), i+1, SettingsText(SET_MEM1 +i));
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+      }
+    }
+    else if (rules_flag.data) {
+      uint16_t mask = 1;
+      for (uint32_t i = 0; i < MAX_RULES_FLAG; i++) {
+        if (rules_flag.data & mask) {
+          rules_flag.data ^= mask;
+          json_event[0] = '\0';
+          switch (i) {
+            case 0: strncpy_P(json_event, PSTR("{\"System\":{\"Boot\":1}}"), sizeof(json_event)); break;
+            case 1: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Initialized\":%d}}"), MinutesPastMidnight()); break;
+            case 2: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Set\":%d}}"), MinutesPastMidnight()); break;
+            case 3: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Connected\":1}}"), sizeof(json_event)); break;
+            case 4: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
+            case 5: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Connected\":1}}"), sizeof(json_event)); break;
+            case 6: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
+            case 7: strncpy_P(json_event, PSTR("{\"HTTP\":{\"Initialized\":1}}"), sizeof(json_event)); break;
+#ifdef USE_SHUTTER
+            case 8: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moved\":1}}"), sizeof(json_event)); break;
+            case 9: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moving\":1}}"), sizeof(json_event)); break;
+#endif
+          }
+          if (json_event[0]) {
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+        mask <<= 1;
+      }
+    }
+  }
+}
+
+uint8_t rules_xsns_index = 0;
+
+void RulesEvery100ms(void)
+{
+  if (Settings.rule_enabled && (uptime > 4)) {
+    mqtt_data[0] = '\0';
+    int tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, rules_xsns_index);
+    tele_period = tele_period_save;
+    if (strlen(mqtt_data)) {
+      mqtt_data[0] = '{';
+      ResponseJsonEnd();
+      RulesProcess();
+    }
+  }
+}
+
+void RulesEverySecond(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[120];
+
+    if (RtcTime.valid) {
+      if ((uptime > 60) && (RtcTime.minute != Rules.last_minute)) {
+        Rules.last_minute = RtcTime.minute;
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Minute\":%d}}"), MinutesPastMidnight());
+        RulesProcessEvent(json_event);
+      }
+    }
+    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
+      if (Rules.timer[i] != 0L) {
+        if (TimeReached(Rules.timer[i])) {
+          Rules.timer[i] = 0L;
+          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1);
+          RulesProcessEvent(json_event);
+        }
+      }
+    }
+  }
+}
+
+void RulesSaveBeforeRestart(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[32];
+
+    strncpy_P(json_event, PSTR("{\"System\":{\"Save\":1}}"), sizeof(json_event));
+    RulesProcessEvent(json_event);
+  }
+}
+
+void RulesSetPower(void)
+{
+  Rules.new_power = XdrvMailbox.index;
+}
+
+void RulesTeleperiod(void)
+{
+  Rules.teleperiod = true;
+  RulesProcess();
+  Rules.teleperiod = false;
+}
+
+#ifdef SUPPORT_MQTT_EVENT
+# 744 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool RulesMqttData(void)
+{
+  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
+    return false;
+  }
+  bool serviced = false;
+  String sTopic = XdrvMailbox.topic;
+  String sData = XdrvMailbox.data;
+
+  MQTT_Subscription event_item;
+
+  for (uint32_t index = 0; index < subscriptions.size(); index++) {
+    event_item = subscriptions.get(index);
+
+
+    if (sTopic.startsWith(event_item.Topic)) {
+
+      serviced = true;
+      String value;
+      if (event_item.Key.length() == 0) {
+        value = sData;
+      } else {
+        StaticJsonBuffer<500> jsonBuf;
+        JsonObject& jsonData = jsonBuf.parseObject(sData);
+        String key1 = event_item.Key;
+        String key2;
+        if (!jsonData.success()) break;
+        int dot;
+        if ((dot = key1.indexOf('.')) > 0) {
+          key2 = key1.substring(dot+1);
+          key1 = key1.substring(0, dot);
+          if (!jsonData[key1][key2].success()) break;
+          value = (const char *)jsonData[key1][key2];
+        } else {
+          if (!jsonData[key1].success()) break;
+          value = (const char *)jsonData[key1];
+        }
+      }
+      value.trim();
+
+      snprintf_P(Rules.event_data, sizeof(Rules.event_data), PSTR("%s=%s"), event_item.Event.c_str(), value.c_str());
+    }
+  }
+  return serviced;
+}
+# 806 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+void CmndSubscribe(void)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (XdrvMailbox.data_len > 0) {
+    char parameters[XdrvMailbox.data_len+1];
+    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
+    parameters[XdrvMailbox.data_len] = '\0';
+    String event_name, topic, key;
+
+    char * pos = strtok(parameters, ",");
+    if (pos) {
+      event_name = Trim(pos);
+      pos = strtok(nullptr, ",");
+      if (pos) {
+        topic = Trim(pos);
+        pos = strtok(nullptr, ",");
+        if (pos) {
+          key = Trim(pos);
+        }
+      }
+    }
+
+    event_name.toUpperCase();
+    if (event_name.length() > 0 && topic.length() > 0) {
+
+      for (uint32_t index=0; index < subscriptions.size(); index++) {
+        if (subscriptions.get(index).Event.equals(event_name)) {
+
+          String stopic = subscriptions.get(index).Topic + "/#";
+          MqttUnsubscribe(stopic.c_str());
+          subscriptions.remove(index);
+          break;
+        }
+      }
+
+      if (!topic.endsWith("#")) {
+        if (topic.endsWith("/")) {
+          topic.concat("#");
+        } else {
+          topic.concat("/#");
+        }
+      }
+
+
+      subscription_item.Event = event_name;
+      subscription_item.Topic = topic.substring(0, topic.length() - 2);
+      subscription_item.Key = key;
+      subscriptions.add(subscription_item);
+
+      MqttSubscribe(topic.c_str());
+      events.concat(event_name + "," + topic
+        + (key.length()>0 ? "," : "")
+        + key);
+    } else {
+      events = D_JSON_WRONG_PARAMETERS;
+    }
+  } else {
+
+    for (uint32_t index=0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      events.concat(subscription_item.Event + "," + subscription_item.Topic
+        + (subscription_item.Key.length()>0 ? "," : "")
+        + subscription_item.Key + "; ");
+    }
+  }
+  ResponseCmndChar(events.c_str());
+}
+# 886 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+void CmndUnsubscribe(void)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (XdrvMailbox.data_len > 0) {
+    for (uint32_t index = 0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      if (subscription_item.Event.equalsIgnoreCase(XdrvMailbox.data)) {
+        String stopic = subscription_item.Topic + "/#";
+        MqttUnsubscribe(stopic.c_str());
+        events = subscription_item.Event;
+        subscriptions.remove(index);
+        break;
+      }
+    }
+  } else {
+
+    String stopic;
+    while (subscriptions.size() > 0) {
+      events.concat(subscriptions.get(0).Event + "; ");
+      stopic = subscriptions.get(0).Topic + "/#";
+      MqttUnsubscribe(stopic.c_str());
+      subscriptions.remove(0);
+    }
+  }
+  ResponseCmndChar(events.c_str());
+}
+
+#endif
+
+#ifdef USE_EXPRESSION
+# 928 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+char * findClosureBracket(char * pStart)
+{
+  char * pointer = pStart + 1;
+
+  bool bFindClosures = false;
+  uint8_t matchClosures = 1;
+  while (*pointer)
+  {
+    if (*pointer == ')') {
+      matchClosures--;
+      if (matchClosures == 0) {
+        bFindClosures = true;
+        break;
+      }
+    } else if (*pointer == '(') {
+      matchClosures++;
+    }
+    pointer++;
+  }
+  if (bFindClosures) {
+    return pointer;
+  } else {
+    return nullptr;
+  }
+}
+# 967 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextNumber(char * &pNumber, float &value)
+{
+  bool bSucceed = false;
+  String sNumber = "";
+  if (*pNumber == '-') {
+    sNumber = "-";
+    pNumber++;
+  }
+  while (*pNumber) {
+    if (isdigit(*pNumber) || (*pNumber == '.')) {
+      sNumber += *pNumber;
+      pNumber++;
+    } else {
+      break;
+    }
+  }
+  if (sNumber.length() > 0) {
+    value = CharToFloat(sNumber.c_str());
+    bSucceed = true;
+  }
+  return bSucceed;
+}
+# 1003 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextVariableValue(char * &pVarname, float &value)
+{
+  bool succeed = true;
+  value = 0;
+  String sVarName = "";
+  while (*pVarname) {
+    if (isalpha(*pVarname) || isdigit(*pVarname)) {
+      sVarName.concat(*pVarname);
+      pVarname++;
+    } else {
+      break;
+    }
+  }
+  sVarName.toUpperCase();
+  if (sVarName.startsWith(F("VAR"))) {
+    int index = sVarName.substring(3).toInt();
+    if (index > 0 && index <= MAX_RULE_VARS) {
+      value = CharToFloat(rules_vars[index -1]);
+    }
+  } else if (sVarName.startsWith(F("MEM"))) {
+    int index = sVarName.substring(3).toInt();
+    if (index > 0 && index <= MAX_RULE_MEMS) {
+      value = CharToFloat(SettingsText(SET_MEM1 + index -1));
+    }
+  } else if (sVarName.equals(F("TIME"))) {
+    value = MinutesPastMidnight();
+  } else if (sVarName.equals(F("UPTIME"))) {
+    value = MinutesUptime();
+  } else if (sVarName.equals(F("UTCTIME"))) {
+    value = UtcTime();
+  } else if (sVarName.equals(F("LOCALTIME"))) {
+    value = LocalTime();
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+  } else if (sVarName.equals(F("SUNRISE"))) {
+    value = SunMinutes(0);
+  } else if (sVarName.equals(F("SUNSET"))) {
+    value = SunMinutes(1);
+#endif
+  } else {
+    succeed = false;
+  }
+
+  return succeed;
+}
+# 1065 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextObjectValue(char * &pointer, float &value)
+{
+  bool bSucceed = false;
+  while (*pointer)
+  {
+    if (isspace(*pointer)) {
+      pointer++;
+      continue;
+    }
+    if (isdigit(*pointer) || (*pointer) == '-') {
+      bSucceed = findNextNumber(pointer, value);
+      break;
+    } else if (isalpha(*pointer)) {
+      bSucceed = findNextVariableValue(pointer, value);
+      break;
+    } else if (*pointer == '(') {
+      char * closureBracket = findClosureBracket(pointer);
+      if (closureBracket != nullptr) {
+        value = evaluateExpression(pointer+1, closureBracket - pointer - 1);
+        pointer = closureBracket + 1;
+        bSucceed = true;
+      }
+      break;
+    } else {
+      break;
+    }
+  }
+  return bSucceed;
+}
+# 1109 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextOperator(char * &pointer, int8_t &op)
+{
+  bool bSucceed = false;
+  while (*pointer)
+  {
+    if (isspace(*pointer)) {
+      pointer++;
+      continue;
+    }
+    op = EXPRESSION_OPERATOR_ADD;
+    const char *pch = kExpressionOperators;
+    char ch;
+    while ((ch = pgm_read_byte(pch++)) != '\0') {
+      if (ch == *pointer) {
+        bSucceed = true;
+        pointer++;
+        break;
+      }
+      op++;
+    }
+    break;
+  }
+  return bSucceed;
+}
+# 1146 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+float calculateTwoValues(float v1, float v2, uint8_t op)
+{
+  switch (op)
+  {
+    case EXPRESSION_OPERATOR_ADD:
+      return v1 + v2;
+    case EXPRESSION_OPERATOR_SUBTRACT:
+      return v1 - v2;
+    case EXPRESSION_OPERATOR_MULTIPLY:
+      return v1 * v2;
+    case EXPRESSION_OPERATOR_DIVIDEDBY:
+      return (0 == v2) ? 0 : (v1 / v2);
+    case EXPRESSION_OPERATOR_MODULO:
+      return (0 == v2) ? 0 : (int(v1) % int(v2));
+    case EXPRESSION_OPERATOR_POWER:
+      return FastPrecisePow(v1, v2);
+  }
+  return 0;
+}
+# 1199 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+float evaluateExpression(const char * expression, unsigned int len)
+{
+  char expbuf[len + 1];
+  memcpy(expbuf, expression, len);
+  expbuf[len] = '\0';
+  char * scan_pointer = expbuf;
+
+  LinkedList<float> object_values;
+  LinkedList<int8_t> operators;
+  int8_t op;
+  float va;
+
+  if (findNextObjectValue(scan_pointer, va)) {
+    object_values.add(va);
+  } else {
+    return 0;
+  }
+  while (*scan_pointer)
+  {
+    if (findNextOperator(scan_pointer, op)
+        && *scan_pointer
+        && findNextObjectValue(scan_pointer, va))
+    {
+      operators.add(op);
+      object_values.add(va);
+    } else {
+
+      break;
+    }
+  }
+
+
+
+  for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) {
+    int index = 0;
+    while (index < operators.size()) {
+      if (priority == pgm_read_byte(kExpressionOperatorsPriorities + operators.get(index))) {
+
+        va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index));
+
+        object_values.set(index, va);
+      } else {
+        index++;
+      }
+    }
+  }
+  return object_values.get(0);
+}
+#endif
+
+#ifdef SUPPORT_IF_STATEMENT
+void CmndIf(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    char parameters[XdrvMailbox.data_len+1];
+    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
+    parameters[XdrvMailbox.data_len] = '\0';
+    ProcessIfStatement(parameters);
+  }
+  ResponseCmndDone();
+}
+# 1273 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool evaluateComparisonExpression(const char *expression, int len)
+{
+  bool bResult = true;
+  char expbuf[len + 1];
+  memcpy(expbuf, expression, len);
+  expbuf[len] = '\0';
+  String compare_expression = expbuf;
+  String leftExpr, rightExpr;
+  int8_t compareOp = parseCompareExpression(compare_expression, leftExpr, rightExpr);
+
+  double leftValue = evaluateExpression(leftExpr.c_str(), leftExpr.length());
+  double rightValue = evaluateExpression(rightExpr.c_str(), rightExpr.length());
+  switch (compareOp) {
+    case COMPARE_OPERATOR_EXACT_DIVISION:
+      bResult = (rightValue != 0 && leftValue == int(leftValue)
+          && rightValue == int(rightValue) && (int(leftValue) % int(rightValue)) == 0);
+      break;
+    case COMPARE_OPERATOR_EQUAL:
+      bResult = leftExpr.equalsIgnoreCase(rightExpr);
+      break;
+    case COMPARE_OPERATOR_BIGGER:
+      bResult = (leftValue > rightValue);
+      break;
+    case COMPARE_OPERATOR_SMALLER:
+      bResult = (leftValue < rightValue);
+      break;
+    case COMPARE_OPERATOR_NUMBER_EQUAL:
+      bResult = (leftValue == rightValue);
+      break;
+    case COMPARE_OPERATOR_NOT_EQUAL:
+      bResult = (leftValue != rightValue);
+      break;
+    case COMPARE_OPERATOR_BIGGER_EQUAL:
+      bResult = (leftValue >= rightValue);
+      break;
+    case COMPARE_OPERATOR_SMALLER_EQUAL:
+      bResult = (leftValue <= rightValue);
+      break;
+  }
+  return bResult;
+}
+# 1329 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextLogicOperator(char * &pointer, int8_t &op)
+{
+  bool bSucceed = false;
+  while (*pointer && isspace(*pointer)) {
+
+    pointer++;
+  }
+  if (*pointer) {
+    if (strncasecmp_P(pointer, PSTR("AND "), 4) == 0) {
+      op = LOGIC_OPERATOR_AND;
+      pointer += 4;
+      bSucceed = true;
+    } else if (strncasecmp_P(pointer, PSTR("OR "), 3) == 0) {
+      op = LOGIC_OPERATOR_OR;
+      pointer += 3;
+      bSucceed = true;
+    }
+  }
+  return bSucceed;
+}
+# 1366 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextLogicObjectValue(char * &pointer, bool &value)
+{
+  bool bSucceed = false;
+  while (*pointer && isspace(*pointer)) {
+
+    pointer++;
+  }
+  char * pExpr = pointer;
+  while (*pointer) {
+    if (isalpha(*pointer)
+       && (strncasecmp_P(pointer, PSTR("AND "), 4) == 0
+       || strncasecmp_P(pointer, PSTR("OR "), 3) == 0))
+    {
+      value = evaluateComparisonExpression(pExpr, pointer - pExpr);
+      bSucceed = true;
+      break;
+    } else if (*pointer == '(') {
+      char * closureBracket = findClosureBracket(pointer);
+      if (closureBracket != nullptr) {
+        value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 1);
+        pointer = closureBracket + 1;
+        bSucceed = true;
+      }
+      break;
+    }
+    pointer++;
+  }
+  if (!bSucceed && pointer > pExpr) {
+
+    value = evaluateComparisonExpression(pExpr, pointer - pExpr);
+    bSucceed = true;
+  }
+  return bSucceed;
+}
+# 1415 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+bool evaluateLogicalExpression(const char * expression, int len)
+{
+  bool bResult = false;
+
+  char expbuff[len + 1];
+  memcpy(expbuff, expression, len);
+  expbuff[len] = '\0';
+
+
+  char * pointer = expbuff;
+  LinkedList<bool> values;
+  LinkedList<int8_t> logicOperators;
+
+  bool bValue;
+  if (findNextLogicObjectValue(pointer, bValue)) {
+    values.add(bValue);
+  } else {
+    return false;
+  }
+  int8_t op;
+  while (*pointer) {
+    if (findNextLogicOperator(pointer, op)
+      && (*pointer) && findNextLogicObjectValue(pointer, bValue))
+    {
+      logicOperators.add(op);
+      values.add(bValue);
+    } else {
+      break;
+    }
+  }
+
+  int index = 0;
+  while (index < logicOperators.size()) {
+    if (logicOperators.get(index) == LOGIC_OPERATOR_AND) {
+      values.set(index, values.get(index) && values.get(index+1));
+      values.remove(index + 1);
+      logicOperators.remove(index);
+    } else {
+      index++;
+    }
+  }
+
+  index = 0;
+  while (index < logicOperators.size()) {
+    if (logicOperators.get(index) == LOGIC_OPERATOR_OR) {
+      values.set(index, values.get(index) || values.get(index+1));
+      values.remove(index + 1);
+      logicOperators.remove(index);
+    } else {
+      index++;
+    }
+  }
+  return values.get(0);
+}
+# 1486 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type)
+{
+  int8_t foundBlock = IF_BLOCK_INVALID;
+
+  const char * word;
+  while (*pointer) {
+    if (!isalpha(*pointer)) {
+      pointer++;
+      continue;
+    }
+    word = pointer;
+    while (*pointer && isalpha(*pointer)) {
+      pointer++;
+    }
+    lenWord = pointer - word;
+
+    if (2 == lenWord && 0 == strncasecmp_P(word, PSTR("IF"), 2)) {
+
+
+      if (findIfBlock(pointer, lenWord, IF_BLOCK_ENDIF) != IF_BLOCK_ENDIF) {
+
+        break;
+      }
+    } else if ( (IF_BLOCK_ENDIF == block_type || IF_BLOCK_ANY == block_type)
+      && (5 == lenWord) && (0 == strncasecmp_P(word, PSTR("ENDIF"), 5)))
+    {
+
+      foundBlock = IF_BLOCK_ENDIF;
+      break;
+    } else if ( (IF_BLOCK_ELSEIF == block_type || IF_BLOCK_ANY == block_type)
+      && (6 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSEIF"), 6)))
+    {
+
+      foundBlock = IF_BLOCK_ELSEIF;
+      break;
+    } else if ( (IF_BLOCK_ELSE == block_type || IF_BLOCK_ANY == block_type)
+      && (4 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSE"), 4)))
+    {
+
+      foundBlock = IF_BLOCK_ELSE;
+      break;
+    }
+  }
+  return foundBlock;
+}
+# 1543 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+void ExecuteCommandBlock(const char * commands, int len)
+{
+  char cmdbuff[len + 1];
+  memcpy(cmdbuff, commands, len);
+  cmdbuff[len] = '\0';
+
+
+  char oneCommand[len + 1];
+  int insertPosition = 0;
+  char * pos = cmdbuff;
+  int lenEndBlock = 0;
+  while (*pos) {
+    if (isspace(*pos) || '\x1e' == *pos || ';' == *pos) {
+      pos++;
+      continue;
+    }
+    if (strncasecmp_P(pos, PSTR("BACKLOG "), 8) == 0) {
+
+      pos += 8;
+      continue;
+    }
+    if (strncasecmp_P(pos, PSTR("IF "), 3) == 0) {
+
+
+      char *pEndif = pos + 3;
+      if (IF_BLOCK_ENDIF != findIfBlock(pEndif, lenEndBlock, IF_BLOCK_ENDIF)) {
+
+        break;
+      }
+
+      memcpy(oneCommand, pos, pEndif - pos);
+      oneCommand[pEndif - pos] = '\0';
+      pos = pEndif;
+    } else {
+
+      char *pEndOfCommand = strpbrk(pos, "\x1e;");
+      if (NULL == pEndOfCommand) {
+        pEndOfCommand = pos + strlen(pos);
+      }
+      memcpy(oneCommand, pos, pEndOfCommand - pos);
+      oneCommand[pEndOfCommand - pos] = '\0';
+      pos = pEndOfCommand;
+    }
+
+
+    String sCurrentCommand = oneCommand;
+    sCurrentCommand.trim();
+    if (sCurrentCommand.length() > 0
+      && backlog.size() < MAX_BACKLOG && !backlog_mutex)
+    {
+
+      backlog_mutex = true;
+      backlog.add(insertPosition, sCurrentCommand);
+      backlog_mutex = false;
+      insertPosition++;
+    }
+  }
+  return;
+}
+# 1613 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+void ProcessIfStatement(const char* statements)
+{
+  String conditionExpression;
+  int len = strlen(statements);
+  char statbuff[len + 1];
+  memcpy(statbuff, statements, len + 1);
+  char *pos = statbuff;
+  int lenEndBlock = 0;
+  while (true) {
+
+
+    while (*pos && *pos != '(') {
+      pos++;
+    }
+    if (0 == *pos) { break; }
+    char * posEnd = findClosureBracket(pos);
+
+    if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) {
+
+      char * cmdBlockStart = posEnd + 1;
+      char * cmdBlockEnd = cmdBlockStart;
+      int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ANY);
+      if (IF_BLOCK_INVALID == nextBlock) {
+
+        break;
+      }
+      ExecuteCommandBlock(cmdBlockStart, cmdBlockEnd - cmdBlockStart - lenEndBlock);
+      pos = cmdBlockEnd;
+      break;
+    } else {
+      pos = posEnd + 1;
+      int8_t nextBlock = findIfBlock(pos, lenEndBlock, IF_BLOCK_ANY);
+      if (IF_BLOCK_ELSEIF == nextBlock) {
+
+        continue;
+      } else if (IF_BLOCK_ELSE == nextBlock) {
+
+        char * cmdBlockEnd = pos;
+        int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ENDIF);
+        if (IF_BLOCK_ENDIF != nextBlock) {
+
+          break;
+        }
+        ExecuteCommandBlock(pos, cmdBlockEnd - pos - lenEndBlock);
+        break;
+      } else {
+
+        break;
+      }
+    }
+  }
+}
+# 1677 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
+void RulesPreprocessCommand(char *pCommands)
+{
+  char * cmd = pCommands;
+  int lenEndBlock = 0;
+  while (*cmd) {
+
+    if (';' == *cmd || isspace(*cmd)) {
+      cmd++;
+    }
+    else if (strncasecmp_P(cmd, PSTR("IF "), 3) == 0) {
+
+      char * pIfStart = cmd;
+      char * pIfEnd = pIfStart + 3;
+
+      if (IF_BLOCK_ENDIF == findIfBlock(pIfEnd, lenEndBlock, IF_BLOCK_ENDIF)) {
+
+        cmd = pIfEnd;
+
+
+        while (pIfStart < pIfEnd) {
+          if (';' == *pIfStart)
+            *pIfStart = '\x1e';
+          pIfStart++;
+        }
+      }
+      else {
+        break;
+      }
+    }
+    else {
+      while (*cmd && ';' != *cmd) {
+        cmd++;
+      }
+    }
+  }
+  return;
+}
+#endif
+
+
+
+
+
+void CmndRule(void)
+{
+  uint8_t index = XdrvMailbox.index;
+  if ((index > 0) && (index <= MAX_RULE_SETS)) {
+    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(Settings.rules[index -1]))) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 10)) {
+        switch (XdrvMailbox.payload) {
+        case 0:
+        case 1:
+          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
+          break;
+        case 2:
+          bitWrite(Settings.rule_enabled, index -1, bitRead(Settings.rule_enabled, index -1) ^1);
+          break;
+        case 4:
+        case 5:
+          bitWrite(Settings.rule_once, index -1, XdrvMailbox.payload &1);
+          break;
+        case 6:
+          bitWrite(Settings.rule_once, index -1, bitRead(Settings.rule_once, index -1) ^1);
+          break;
+        case 8:
+        case 9:
+          bitWrite(Settings.rule_stop, index -1, XdrvMailbox.payload &1);
+          break;
+        case 10:
+          bitWrite(Settings.rule_stop, index -1, bitRead(Settings.rule_stop, index -1) ^1);
+          break;
+        }
+      } else {
+        int offset = 0;
+        if ('+' == XdrvMailbox.data[0]) {
+          offset = strlen(Settings.rules[index -1]);
+          if (XdrvMailbox.data_len < (sizeof(Settings.rules[index -1]) - offset -1)) {
+            XdrvMailbox.data[0] = ' ';
+          } else {
+            offset = -1;
+          }
+        }
+        if (offset != -1) {
+          strlcpy(Settings.rules[index -1] + offset, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(Settings.rules[index -1]));
+        }
+      }
+      Rules.triggers[index -1] = 0;
+    }
+    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s%d\":\"%s\",\"Once\":\"%s\",\"StopOnError\":\"%s\",\"Free\":%d,\"Rules\":\"%s\"}"),
+      XdrvMailbox.command, index, GetStateText(bitRead(Settings.rule_enabled, index -1)), GetStateText(bitRead(Settings.rule_once, index -1)),
+      GetStateText(bitRead(Settings.rule_stop, index -1)), sizeof(Settings.rules[index -1]) - strlen(Settings.rules[index -1]) -1, Settings.rules[index -1]);
+  }
+}
+
+void CmndRuleTimer(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_TIMERS)) {
+    if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+      float timer_set = evaluateExpression(XdrvMailbox.data, XdrvMailbox.data_len);
+      Rules.timer[XdrvMailbox.index -1] = (timer_set > 0) ? millis() + (1000 * timer_set) : 0;
+#else
+      Rules.timer[XdrvMailbox.index -1] = (XdrvMailbox.payload > 0) ? millis() + (1000 * XdrvMailbox.payload) : 0;
+#endif
+    }
+    mqtt_data[0] = '\0';
+    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
+      ResponseAppend_P(PSTR("%c\"T%d\":%d"), (i) ? ',' : '{', i +1, (Rules.timer[i]) ? (Rules.timer[i] - millis()) / 1000 : 0);
+    }
+    ResponseJsonEnd();
+  }
+}
+
+void CmndEvent(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    strlcpy(Rules.event_data, XdrvMailbox.data, sizeof(Rules.event_data));
+  }
+  ResponseCmndDone();
+}
+
+void CmndVariable(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (!XdrvMailbox.usridx) {
+      mqtt_data[0] = '\0';
+      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+        ResponseAppend_P(PSTR("%c\"Var%d\":\"%s\""), (i) ? ',' : '{', i +1, rules_vars[i]);
+      }
+      ResponseJsonEnd();
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+        if (XdrvMailbox.data[0] == '=') {
+          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+        } else {
+          strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
+        }
+#else
+        strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
+#endif
+        bitSet(Rules.vars_event, XdrvMailbox.index -1);
+      }
+      ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+    }
+  }
+}
+
+void CmndMemory(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_MEMS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_MEM1, MAX_RULE_MEMS);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+        if (XdrvMailbox.data[0] == '=') {
+          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, SettingsText(SET_MEM1 + XdrvMailbox.index -1));
+        } else {
+          SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+        }
+#else
+        SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+#endif
+        bitSet(Rules.mems_event, XdrvMailbox.index -1);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_MEM1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndCalcResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
+    Settings.flag2.calc_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.calc_resolution);
+}
+
+void CmndAddition(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) + CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndSubtract(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) - CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndMultiply(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) * CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndScale(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len +1];
+
+        float valueIN = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        float fromLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        float fromHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        float toLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4));
+        float toHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 5));
+        float value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
+        dtostrfd(value, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+        bitSet(Rules.vars_event, XdrvMailbox.index -1);
+      }
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+float map_double(float x, float in_min, float in_max, float out_min, float out_max)
+{
+  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+
+
+
+
+bool Xdrv10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_50_MSECOND:
+      RulesEvery50ms();
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      RulesEvery100ms();
+      break;
+    case FUNC_EVERY_SECOND:
+      RulesEverySecond();
+      break;
+    case FUNC_SET_POWER:
+      RulesSetPower();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kRulesCommands, RulesCommand);
+      break;
+    case FUNC_RULES_PROCESS:
+      result = RulesProcess();
+      break;
+    case FUNC_SAVE_BEFORE_RESTART:
+      RulesSaveBeforeRestart();
+      break;
+#ifdef SUPPORT_MQTT_EVENT
+    case FUNC_MQTT_DATA:
+      result = RulesMqttData();
+      break;
+#endif
+    case FUNC_PRE_INIT:
+      RulesInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+#ifdef USE_SCRIPT
+#ifndef USE_RULES
+# 40 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+#define XDRV_10 10
+#define XI2C_37 37
+
+#define SCRIPT_DEBUG 0
+
+
+#ifndef MAXVARS
+#define MAXVARS 50
+#endif
+#ifndef MAXSVARS
+#define MAXSVARS 5
+#endif
+#define MAXNVARS MAXVARS-MAXSVARS
+
+#define MAXFILT 5
+#define SCRIPT_SVARSIZE 20
+#define SCRIPT_MAXSSIZE 48
+#define SCRIPT_EOL '\n'
+#define SCRIPT_FLOAT_PRECISION 2
+#define PMEM_SIZE sizeof(Settings.script_pram)
+#define SCRIPT_MAXPERM (PMEM_SIZE)-4/sizeof(float)
+#define MAX_SCRIPT_SIZE MAX_RULE_SIZE*MAX_RULE_SETS
+
+
+#define EPOCH_OFFSET 1546300800
+
+enum {OPER_EQU=1,OPER_PLS,OPER_MIN,OPER_MUL,OPER_DIV,OPER_PLSEQU,OPER_MINEQU,OPER_MULEQU,OPER_DIVEQU,OPER_EQUEQU,OPER_NOTEQU,OPER_GRTEQU,OPER_LOWEQU,OPER_GRT,OPER_LOW,OPER_PERC,OPER_XOR,OPER_AND,OPER_OR,OPER_ANDEQU,OPER_OREQU,OPER_XOREQU,OPER_PERCEQU};
+enum {SCRIPT_LOGLEVEL=1,SCRIPT_TELEPERIOD};
+
+#ifdef USE_SCRIPT_FATFS
+#include <SPI.h>
+#include <SD.h>
+#ifndef FAT_SCRIPT_SIZE
+#define FAT_SCRIPT_SIZE 4096
+#endif
+#define FAT_SCRIPT_NAME "script.txt"
+#if USE_LONG_FILE_NAMES==1
+#warning ("FATFS long filenames not supported");
+#endif
+#if USE_STANDARD_SPI_LIBRARY==0
+#warning ("FATFS standard spi should be used");
+#endif
+#endif
+
+#ifdef SUPPORT_MQTT_EVENT
+  #include <LinkedList.h>
+  typedef struct {
+    String Event;
+    String Topic;
+    String Key;
+  } MQTT_Subscription;
+  LinkedList<MQTT_Subscription> subscriptions;
+#endif
+
+#ifdef USE_DISPLAY
+#ifdef USE_TOUCH_BUTTONS
+#include <renderer.h>
+extern VButton *buttons[MAXBUTTONS];
+#endif
+#endif
+
+typedef union {
+  uint8_t data;
+  struct {
+    uint8_t is_string : 1;
+    uint8_t is_permanent : 1;
+    uint8_t is_timer : 1;
+    uint8_t is_autoinc : 1;
+    uint8_t changed : 1;
+    uint8_t settable : 1;
+    uint8_t is_filter : 1;
+    uint8_t constant : 1;
+  };
+} SCRIPT_TYPE;
+
+struct T_INDEX {
+  uint8_t index;
+  SCRIPT_TYPE bits;
+};
+
+struct M_FILT {
+  uint8_t numvals;
+  uint8_t index;
+  float maccu;
+  float rbuff[1];
+};
+
+typedef union {
+  uint8_t data;
+  struct {
+      uint8_t nutu8 : 1;
+      uint8_t nutu7 : 1;
+      uint8_t nutu6 : 1;
+      uint8_t nutu5 : 1;
+      uint8_t nutu4 : 1;
+      uint8_t nutu3 : 1;
+      uint8_t is_dir : 1;
+      uint8_t is_open : 1;
+  };
+} FILE_FLAGS;
+
+#define SFS_MAX 4
+
+struct SCRIPT_MEM {
+    float *fvars;
+    float *s_fvars;
+    struct T_INDEX *type;
+    struct M_FILT *mfilt;
+    char *glob_vnp;
+    uint8_t *vnp_offset;
+    char *glob_snp;
+    char *scriptptr;
+    char *section_ptr;
+    char *scriptptr_bu;
+    char *script_ram;
+    uint16_t script_size;
+    uint8_t *script_pram;
+    uint16_t script_pram_size;
+    uint8_t numvars;
+    void *script_mem;
+    uint16_t script_mem_size;
+    uint8_t script_dprec;
+    uint8_t var_not_found;
+    uint8_t glob_error;
+    uint8_t max_ssize;
+    uint8_t script_loglevel;
+    uint8_t flags;
+#ifdef USE_SCRIPT_FATFS
+    File files[SFS_MAX];
+    FILE_FLAGS file_flags[SFS_MAX];
+    uint8_t script_sd_found;
+    char flink[2][14];
+#endif
+} glob_script_mem;
+
+
+int16_t last_findex;
+uint8_t tasm_cmd_activ=0;
+uint8_t fast_script=0;
+uint32_t script_lastmillis;
+
+
+#ifdef USE_BUTTON_EVENT
+int8_t script_button[MAX_KEYS];
+#endif
+
+char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo);
+char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo);
+char *ForceStringVar(char *lp,char *dstr);
+void send_download(void);
+uint8_t reject(char *name);
+
+void ScriptEverySecond(void) {
+
+  if (bitRead(Settings.rule_enabled, 0)) {
+    struct T_INDEX *vtp=glob_script_mem.type;
+    float delta=(millis()-script_lastmillis)/1000;
+    script_lastmillis=millis();
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_timer) {
+
+        float *fp=&glob_script_mem.fvars[vtp[count].index];
+        if (*fp>0) {
+
+          *fp-=delta;
+          if (*fp<0) *fp=0;
+        }
+      }
+      if (vtp[count].bits.is_autoinc) {
+
+        float *fp=&glob_script_mem.fvars[vtp[count].index];
+        if (*fp>=0) {
+          *fp+=delta;
+        }
+      }
+    }
+    Run_Scripter(">S",2,0);
+  }
+}
+
+void RulesTeleperiod(void) {
+  if (bitRead(Settings.rule_enabled, 0) && mqtt_data[0]) Run_Scripter(">T",2, mqtt_data);
+}
+
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+
+#include <Eeprom24C128_256.h>
+#define EEPROM_ADDRESS 0x50
+
+#ifndef EEP_SCRIPT_SIZE
+#define EEP_SCRIPT_SIZE 4095
+#endif
+
+
+static Eeprom24C128_256 eeprom(EEPROM_ADDRESS);
+
+#define EEP_WRITE(A,B,C) eeprom.writeBytes(A,B,(uint8_t*)C);
+
+#define EEP_READ(A,B,C) eeprom.readBytes(A,B,(uint8_t*)C);
+#endif
+#endif
+
+#define SCRIPT_SKIP_SPACES while (*lp==' ' || *lp=='\t') lp++;
+#define SCRIPT_SKIP_EOL while (*lp==SCRIPT_EOL) lp++;
+
+
+int16_t Init_Scripter(void) {
+char *script;
+
+    script=glob_script_mem.script_ram;
+
+
+    uint16_t lines=0,nvars=0,svars=0,vars=0;
+    char *lp=script;
+    char vnames[MAXVARS*10];
+    char *vnames_p=vnames;
+    char *vnp[MAXVARS];
+    char **vnp_p=vnp;
+    char strings[MAXSVARS*SCRIPT_MAXSSIZE];
+    struct M_FILT mfilt[MAXFILT];
+
+    char *strings_p=strings;
+    char *snp[MAXSVARS];
+    char **snp_p=snp;
+    uint8_t numperm=0,numflt=0,count;
+
+    glob_script_mem.max_ssize=SCRIPT_SVARSIZE;
+    glob_script_mem.scriptptr=0;
+
+    if (!*script) return -999;
+
+    float fvalues[MAXVARS];
+    struct T_INDEX vtypes[MAXVARS];
+    char init=0;
+    while (1) {
+
+
+        SCRIPT_SKIP_SPACES
+
+        if (*lp=='\n' || *lp=='\r') goto next_line;
+
+        if (*lp==';') goto next_line;
+        if (init) {
+
+            if (*lp=='>') {
+                init=0;
+                break;
+            }
+            char *op=strchr(lp,'=');
+            if (op) {
+                vtypes[vars].bits.data=0;
+
+                if (*lp=='p' && *(lp+1)==':') {
+                    lp+=2;
+                    if (numperm<SCRIPT_MAXPERM) {
+                      vtypes[vars].bits.is_permanent=1;
+                      numperm++;
+                    }
+                } else {
+                    vtypes[vars].bits.is_permanent=0;
+                }
+                if (*lp=='t' && *(lp+1)==':') {
+                    lp+=2;
+                    vtypes[vars].bits.is_timer=1;
+                } else {
+                    vtypes[vars].bits.is_timer=0;
+                }
+                if (*lp=='i' && *(lp+1)==':') {
+                    lp+=2;
+                    vtypes[vars].bits.is_autoinc=1;
+                } else {
+                    vtypes[vars].bits.is_autoinc=0;
+                }
+                if ((*lp=='m' || *lp=='M') && *(lp+1)==':') {
+                    uint8_t flg=*lp;
+                    lp+=2;
+                    if (flg=='M') mfilt[numflt].numvals=8;
+                    else mfilt[numflt].numvals=5;
+                    vtypes[vars].bits.is_filter=1;
+                    mfilt[numflt].index=0;
+                    if (flg=='M') {
+                      mfilt[numflt].numvals|=0x80;
+                    }
+                    vtypes[vars].index=numflt;
+                    numflt++;
+                    if (numflt>MAXFILT) {
+                      return -6;
+                    }
+                } else {
+                    vtypes[vars].bits.is_filter=0;
+                }
+                *vnp_p++=vnames_p;
+                while (lp<op) {
+                    *vnames_p++=*lp++;
+                }
+                *vnames_p++=0;
+
+                op++;
+                if (*op!='"') {
+                    float fv;
+                    if (*op=='0' && *(op+1)=='x') {
+                      op+=2;
+                      fv=strtol(op,&op,16);
+                    } else {
+                      fv=CharToFloat(op);
+                    }
+                    fvalues[nvars]=fv;
+                    vtypes[vars].bits.is_string=0;
+                    if (!vtypes[vars].bits.is_filter) vtypes[vars].index=nvars;
+                    nvars++;
+                    if (nvars>MAXNVARS) {
+                      return -1;
+                    }
+                    if (vtypes[vars].bits.is_filter) {
+                      while (isdigit(*op) || *op=='.' || *op=='-') {
+                        op++;
+                      }
+                      while (*op==' ') op++;
+                      if (isdigit(*op)) {
+
+                        uint8_t flen=atoi(op);
+                        mfilt[numflt-1].numvals&=0x80;
+                        mfilt[numflt-1].numvals|=flen&0x7f;
+                      }
+                    }
+
+                } else {
+
+                    op++;
+                    *snp_p++=strings_p;
+                    while (*op!='\"') {
+                      if (*op==SCRIPT_EOL) break;
+                      *strings_p++=*op++;
+                    }
+                    *strings_p++=0;
+                    vtypes[vars].bits.is_string=1;
+                    vtypes[vars].index=svars;
+                    svars++;
+                    if (svars>MAXSVARS) {
+                      return -2;
+                    }
+                }
+                vars++;
+                if (vars>MAXVARS) {
+                  return -3;
+                }
+            }
+        } else {
+            if (!strncmp(lp,">D",2)) {
+              lp+=2;
+              SCRIPT_SKIP_SPACES
+              if (isdigit(*lp)) {
+                uint8_t ssize=atoi(lp)+1;
+                if (ssize<10 || ssize>SCRIPT_MAXSSIZE) ssize=SCRIPT_MAXSSIZE;
+                glob_script_mem.max_ssize=ssize;
+              }
+              init=1;
+            }
+        }
+
+    next_line:
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+    }
+
+    uint16_t fsize=0;
+    for (count=0; count<numflt; count++) {
+      fsize+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
+    }
+
+
+    uint16_t script_mem_size=
+
+    (sizeof(float)*nvars)+
+    (sizeof(float)*nvars)+
+
+    (vnames_p-vnames)+
+
+    (sizeof(uint8_t)*vars)+
+
+    (glob_script_mem.max_ssize*svars)+
+
+    (sizeof(struct T_INDEX)*vars)+
+    fsize;
+
+    script_mem_size+=16;
+    uint8_t *script_mem;
+    script_mem=(uint8_t*)calloc(script_mem_size,1);
+    if (!script_mem) {
+      return -4;
+    }
+    glob_script_mem.script_mem=script_mem;
+    glob_script_mem.script_mem_size=script_mem_size;
+
+
+
+    glob_script_mem.fvars=(float*)script_mem;
+    uint16_t size=sizeof(float)*nvars;
+    memcpy(script_mem,fvalues,size);
+    script_mem+=size;
+    glob_script_mem.s_fvars=(float*)script_mem;
+    size=sizeof(float)*nvars;
+    memcpy(script_mem,fvalues,size);
+    script_mem+=size;
+
+    glob_script_mem.mfilt=(struct M_FILT*)script_mem;
+    script_mem+=fsize;
+
+
+    glob_script_mem.type=(struct T_INDEX*)script_mem;
+    size=sizeof(struct T_INDEX)*vars;
+    memcpy(script_mem,vtypes,size);
+    script_mem+=size;
+
+
+    char *namep=(char*)script_mem;
+    glob_script_mem.glob_vnp=(char*)script_mem;
+    size=vnames_p-vnames;
+    memcpy(script_mem,vnames,size);
+    script_mem+=size;
+
+    glob_script_mem.vnp_offset=(uint8_t*)script_mem;
+    size=vars*sizeof(uint8_t);
+    script_mem+=size;
+
+
+    char *snamep=(char*)script_mem;
+    glob_script_mem.glob_snp=(char*)script_mem;
+    size=glob_script_mem.max_ssize*svars;
+
+    script_mem+=size;
+
+
+    uint16_t index=0;
+    uint8_t *cp=glob_script_mem.vnp_offset;
+    for (count=0;count<vars;count++) {
+        *cp++=index;
+        while (*namep) {
+            index++;
+            namep++;
+        }
+        namep++;
+        index++;
+        if (index>255) {
+          free(glob_script_mem.script_mem);
+          return -5;
+        }
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Script: nv=%d, tv=%d, vns=%d, ram=%d"), nvars, svars, index, glob_script_mem.script_mem_size);
+
+
+    char *cp1=glob_script_mem.glob_snp;
+    char *sp=strings;
+    for (count=0; count<svars;count++) {
+        strcpy(cp1,sp);
+        sp+=strlen(sp)+1;
+        cp1+=glob_script_mem.max_ssize;
+    }
+
+
+    uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+    for (count=0; count<numflt; count++) {
+      struct M_FILT *mflp=(struct M_FILT*)mp;
+      mflp->numvals=mfilt[count].numvals;
+      mp+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
+    }
+
+    glob_script_mem.numvars=vars;
+    glob_script_mem.script_dprec=SCRIPT_FLOAT_PRECISION;
+    glob_script_mem.script_loglevel=LOG_LEVEL_INFO;
+
+
+#if SCRIPT_DEBUG>2
+    struct T_INDEX *dvtp=glob_script_mem.type;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (dvtp[count].bits.is_string) {
+
+      } else {
+        char string[32];
+        dtostrfd(glob_script_mem.fvars[dvtp[count].index],glob_script_mem.script_dprec,string);
+        toLog(string);
+      }
+    }
+#endif
+
+
+    float *fp=(float*)glob_script_mem.script_pram;
+    struct T_INDEX *vtp=glob_script_mem.type;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
+        uint8_t index=vtp[count].index;
+        if (!isnan(*fp)) {
+          glob_script_mem.fvars[index]=*fp;
+        } else {
+          *fp=glob_script_mem.fvars[index];
+        }
+        fp++;
+      }
+    }
+    sp=(char*)fp;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
+        uint8_t index=vtp[count].index;
+        char *dp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
+        uint8_t slen=strlen(sp);
+        strlcpy(dp,sp,glob_script_mem.max_ssize);
+        sp+=slen+1;
+      }
+    }
+
+
+#ifdef USE_SCRIPT_FATFS
+    if (!glob_script_mem.script_sd_found) {
+      if (SD.begin(USE_SCRIPT_FATFS)) {
+        glob_script_mem.script_sd_found=1;
+      } else {
+        glob_script_mem.script_sd_found=0;
+      }
+    }
+    for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
+      glob_script_mem.file_flags[cnt].is_open=0;
+    }
+#endif
+
+#if SCRIPT_DEBUG>0
+    ClaimSerial();
+    SetSerialBaudrate(9600);
+#endif
+
+
+    glob_script_mem.scriptptr=lp-1;
+    glob_script_mem.scriptptr_bu=glob_script_mem.scriptptr;
+    return 0;
+
+}
+
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+void ws2812_set_array(float *array ,uint8_t len) {
+
+  Ws2812ForceSuspend();
+  for (uint8_t cnt=0;cnt<len;cnt++) {
+    if (cnt>Settings.light_pixels) break;
+    uint32_t col=array[cnt];
+    Ws2812SetColor(cnt+1,col>>16,col>>8,col,0);
+  }
+  Ws2812ForceUpdate();
+}
+#endif
+#endif
+
+#define NUM_RES 0xfe
+#define STR_RES 0xfd
+#define VAR_NV 0xff
+
+#define NTYPE 0
+#define STYPE 0x80
+
+#ifndef FLT_MAX
+#define FLT_MAX 99999999
+#endif
+
+float median_array(float *array,uint8_t len) {
+    uint8_t ind[len];
+    uint8_t mind=0,index=0,flg;
+    float min=FLT_MAX;
+
+    for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
+        for (uint8_t mcnt=0; mcnt<len; mcnt++) {
+            flg=0;
+            for (uint8_t icnt=0; icnt<index; icnt++) {
+                if (ind[icnt]==mcnt) {
+                    flg=1;
+                }
+            }
+            if (!flg) {
+                if (array[mcnt]<min) {
+                    min=array[mcnt];
+                    mind=mcnt;
+                }
+            }
+        }
+        ind[index]=mind;
+        index++;
+        min=FLT_MAX;
+    }
+    return array[ind[len/2]];
+}
+
+
+float *Get_MFAddr(uint8_t index,uint8_t *len) {
+  *len=0;
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        *len=mflp->numvals&0x7f;
+        return mflp->rbuff;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+
+float Get_MFVal(uint8_t index,uint8_t bind) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        uint8_t maxind=mflp->numvals&0x7f;
+        if (!bind) {
+          return mflp->index;
+        }
+        if (bind<1 || bind>maxind) bind=maxind;
+        return mflp->rbuff[bind-1];
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+void Set_MFVal(uint8_t index,uint8_t bind,float val) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        uint8_t maxind=mflp->numvals&0x7f;
+        if (!bind) {
+          mflp->index=val;
+        } else {
+          if (bind<1 || bind>maxind) bind=maxind;
+          mflp->rbuff[bind-1]=val;
+        }
+        return;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+}
+
+
+float Get_MFilter(uint8_t index) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+      if (mflp->numvals&0x80) {
+
+        return mflp->maccu/(mflp->numvals&0x7f);
+      } else {
+
+        return median_array(mflp->rbuff,mflp->numvals);
+      }
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+void Set_MFilter(uint8_t index, float invar) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+      if (mflp->numvals&0x80) {
+
+        mflp->maccu-=mflp->rbuff[mflp->index];
+        mflp->maccu+=invar;
+        mflp->rbuff[mflp->index]=invar;
+        mflp->index++;
+        if (mflp->index>=(mflp->numvals&0x7f)) mflp->index=0;
+      } else {
+
+        mflp->rbuff[mflp->index]=invar;
+        mflp->index++;
+        if (mflp->index>=mflp->numvals) mflp->index=0;
+      }
+      break;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+}
+
+#define MEDIAN_SIZE 5
+#define MEDIAN_FILTER_NUM 2
+
+struct MEDIAN_FILTER {
+float buffer[MEDIAN_SIZE];
+int8_t index;
+} script_mf[MEDIAN_FILTER_NUM];
+
+float DoMedian5(uint8_t index, float in) {
+
+  if (index>=MEDIAN_FILTER_NUM) index=0;
+
+  struct MEDIAN_FILTER* mf=&script_mf[index];
+  mf->buffer[mf->index]=in;
+  mf->index++;
+  if (mf->index>=MEDIAN_SIZE) mf->index=0;
+  return median_array(mf->buffer,MEDIAN_SIZE);
+}
+
+#ifdef USE_LIGHT
+
+uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
+float r = 0, g = 0, b = 0;
+struct HSV {
+ float H;
+ float S;
+ float V;
+} hsv;
+
+hsv.H=hue;
+hsv.S=(float)saturation/100.0;
+hsv.V=(float)value/100.0;
+
+if (hsv.S == 0) {
+  r = hsv.V;
+  g = hsv.V;
+  b = hsv.V;
+ } else {
+  int i;
+  float f, p, q, t;
+
+  if (hsv.H == 360)
+   hsv.H = 0;
+  else
+   hsv.H = hsv.H / 60;
+
+  i = (int)trunc(hsv.H);
+  f = hsv.H - i;
+
+  p = hsv.V * (1.0 - hsv.S);
+  q = hsv.V * (1.0 - (hsv.S * f));
+  t = hsv.V * (1.0 - (hsv.S * (1.0 - f)));
+
+  switch (i)
+  {
+  case 0:
+   r = hsv.V;
+   g = t;
+   b = p;
+   break;
+
+  case 1:
+   r = q;
+   g = hsv.V;
+   b = p;
+   break;
+
+  case 2:
+   r = p;
+   g = hsv.V;
+   b = t;
+   break;
+
+  case 3:
+   r = p;
+   g = q;
+   b = hsv.V;
+   break;
+
+  case 4:
+   r = t;
+   g = p;
+   b = hsv.V;
+   break;
+
+  default:
+   r = hsv.V;
+   g = p;
+   b = q;
+   break;
+  }
+
+ }
+
+  uint8_t ir,ig,ib;
+  ir=r*255;
+  ig=g*255;
+  ib=b*255;
+
+ uint32_t rgb=(ir<<16)|(ig<<8)|ib;
+ return rgb;
+}
+#endif
+
+
+
+
+char *isvar(char *lp, uint8_t *vtype,struct T_INDEX *tind,float *fp,char *sp,JsonObject *jo) {
+    uint16_t count,len=0;
+    uint8_t nres=0;
+    char vname[32];
+    float fvar=0;
+    tind->index=0;
+    tind->bits.data=0;
+
+    if (isdigit(*lp) || (*lp=='-' && isdigit(*(lp+1))) || *lp=='.') {
+
+        if (fp) {
+          if (*lp=='0' && *(lp+1)=='x') {
+            lp+=2;
+            *fp=strtol(lp,0,16);
+          } else {
+            *fp=CharToFloat(lp);
+          }
+        }
+        if (*lp=='-') lp++;
+        while (isdigit(*lp) || *lp=='.') {
+          if (*lp==0 || *lp==SCRIPT_EOL) break;
+          lp++;
+        }
+        tind->bits.constant=1;
+        tind->bits.is_string=0;
+        *vtype=NUM_RES;
+        return lp;
+    }
+    if (*lp=='"') {
+      lp++;
+      while (*lp!='"') {
+        if (*lp==0 || *lp==SCRIPT_EOL) break;
+        uint8_t iob=*lp;
+        if (iob=='\\') {
+          lp++;
+          if (*lp=='t') {
+            iob='\t';
+          } else if (*lp=='n') {
+            iob='\n';
+          } else if (*lp=='r') {
+            iob='\r';
+          } else if (*lp=='\\') {
+            iob='\\';
+          } else {
+            lp--;
+          }
+          if (sp) *sp++=iob;
+        } else {
+          if (sp) *sp++=iob;
+        }
+        lp++;
+      }
+      if (sp) *sp=0;
+      *vtype=STR_RES;
+      tind->bits.constant=1;
+      tind->bits.is_string=1;
+      return lp+1;
+    }
+
+    if (*lp=='-') {
+
+      nres=1;
+      lp++;
+    }
+
+    const char *term="\n\r ])=+-/*%><!^&|}";
+    for (count=0; count<sizeof(vname); count++) {
+        char iob=lp[count];
+        if (!iob || strchr(term,iob)) {
+            vname[count]=0;
+            break;
+        }
+        vname[count]=iob;
+        len+=1;
+    }
+
+    if (!vname[0]) {
+
+      *vtype=VAR_NV;
+      tind->index=VAR_NV;
+      glob_script_mem.var_not_found=1;
+      return lp;
+    }
+
+    struct T_INDEX *vtp=glob_script_mem.type;
+    char dvnam[32];
+    strcpy (dvnam,vname);
+    uint8_t olen=len;
+    last_findex=-1;
+    char *ja=strchr(dvnam,'[');
+    if (ja) {
+      *ja=0;
+      ja++;
+      olen=strlen(dvnam);
+    }
+    for (count=0; count<glob_script_mem.numvars; count++) {
+        char *cp=glob_script_mem.glob_vnp+glob_script_mem.vnp_offset[count];
+        uint8_t slen=strlen(cp);
+        if (slen==olen && *cp==dvnam[0]) {
+            if (!strncmp(cp,dvnam,olen)) {
+                uint8_t index=vtp[count].index;
+                *tind=vtp[count];
+                tind->index=count;
+                if (vtp[count].bits.is_string==0) {
+                    *vtype=NTYPE|index;
+                    if (vtp[count].bits.is_filter) {
+                      if (ja) {
+                        lp+=olen+1;
+                        lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+                        last_findex=fvar;
+                        fvar=Get_MFVal(index,fvar);
+                        len=1;
+                      } else {
+                        fvar=Get_MFilter(index);
+                      }
+                    } else {
+                      fvar=glob_script_mem.fvars[index];
+                    }
+                    if (nres) fvar=-fvar;
+                    if (fp) *fp=fvar;
+                } else {
+                    *vtype=STYPE|index;
+                    if (sp) strlcpy(sp,glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize),SCRIPT_MAXSSIZE);
+                }
+                return lp+len;
+            }
+        }
+    }
+
+    if (jo) {
+
+      const char* str_value;
+      uint8_t aindex;
+      String vn;
+      char *ja=strchr(vname,'[');
+      if (ja) {
+
+        *ja=0;
+        ja++;
+
+        float fvar;
+        GetNumericResult(ja,OPER_EQU,&fvar,0);
+        aindex=fvar;
+        if (aindex<1 || aindex>6) aindex=1;
+        aindex--;
+      }
+      if (jo->success()) {
+        char *subtype=strchr(vname,'#');
+        char *subtype2;
+        if (subtype) {
+          *subtype=0;
+          subtype++;
+          subtype2=strchr(subtype,'#');
+          if (subtype2) {
+            *subtype2=0;
+            *subtype2++;
+          }
+        }
+        vn=vname;
+        str_value = (*jo)[vn];
+        if ((*jo)[vn].success()) {
+          if (subtype) {
+            JsonObject &jobj1=(*jo)[vn];
+            if (jobj1.success()) {
+              vn=subtype;
+              jo=&jobj1;
+              str_value = (*jo)[vn];
+              if ((*jo)[vn].success()) {
+
+                if (subtype2) {
+                  JsonObject &jobj2=(*jo)[vn];
+                  if ((*jo)[vn].success()) {
+                    vn=subtype2;
+                    jo=&jobj2;
+                    str_value = (*jo)[vn];
+                    if ((*jo)[vn].success()) {
+                      goto skip;
+                    } else {
+                      goto chknext;
+                    }
+                  } else {
+                    goto chknext;
+                  }
+                }
+
+                goto skip;
+              }
+            } else {
+              goto chknext;
+            }
+          }
+          skip:
+          if (ja) {
+
+            str_value = (*jo)[vn][aindex];
+          }
+          if (str_value && *str_value) {
+            if ((*jo).is<char*>(vn)) {
+              if (!strncmp(str_value,"ON",2)) {
+                if (fp) *fp=1;
+                goto nexit;
+              } else if (!strncmp(str_value,"OFF",3)) {
+                if (fp) *fp=0;
+                goto nexit;
+              } else {
+                *vtype=STR_RES;
+                tind->bits.constant=1;
+                tind->bits.is_string=1;
+                if (sp) strlcpy(sp,str_value,SCRIPT_MAXSSIZE);
+                return lp+len;
+              }
+
+            } else {
+              if (fp) {
+                if (!strncmp(vn.c_str(),"Epoch",5)) {
+                  *fp=atoi(str_value)-(uint32_t)EPOCH_OFFSET;
+                } else {
+                  *fp=CharToFloat((char*)str_value);
+                }
+              }
+              nexit:
+              *vtype=NUM_RES;
+              tind->bits.constant=1;
+              tind->bits.is_string=0;
+              return lp+len;
+            }
+          }
+        }
+      }
+    }
+
+chknext:
+    switch (vname[0]) {
+      case 'a':
+#ifdef USE_ANGLE_FUNC
+        if (!strncmp(vname,"acos(",5)) {
+            lp+=5;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+            fvar=acosf(fvar);
+            lp++;
+            len=0;
+            goto exit;
+        }
+#endif
+        break;
+
+      case 'b':
+        if (!strncmp(vname,"boot",4)) {
+          if (rules_flag.system_boot) {
+            rules_flag.system_boot=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+#ifdef USE_BUTTON_EVENT
+        if (!strncmp(vname,"bt[",3)) {
+
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint32_t index=fvar;
+          if (index<1 || index>MAX_KEYS) index=1;
+          fvar=script_button[index-1];
+          script_button[index-1]|=0x80;
+          len++;
+          goto exit;
+        }
+#endif
+        break;
+      case 'c':
+        if (!strncmp(vname,"chg[",4)) {
+
+          struct T_INDEX ind;
+          uint8_t vtype;
+          isvar(vname+4,&vtype,&ind,0,0,0);
+          if (!ind.bits.constant) {
+            uint8_t index=glob_script_mem.type[ind.index].index;
+            if (glob_script_mem.fvars[index]!=glob_script_mem.s_fvars[index]) {
+
+              glob_script_mem.s_fvars[index]=glob_script_mem.fvars[index];
+              fvar=1;
+              len++;
+              goto exit;
+            } else {
+              fvar=0;
+              len++;
+              goto exit;
+            }
+          }
+        }
+        break;
+      case 'd':
+        if (!strncmp(vname,"day",3)) {
+          fvar=RtcTime.day_of_month;
+          goto exit;
+        }
+        break;
+      case 'e':
+        if (!strncmp(vname,"epoch",5)) {
+          fvar=UtcTime()-(uint32_t)EPOCH_OFFSET;
+          goto exit;
+        }
+        break;
+#ifdef USE_SCRIPT_FATFS
+      case 'f':
+        if (!strncmp(vname,"fo(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t mode=fvar;
+          fvar=-1;
+          for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
+            if (!glob_script_mem.file_flags[cnt].is_open) {
+              if (mode==0) {
+                glob_script_mem.files[cnt]=SD.open(str,FILE_READ);
+                if (glob_script_mem.files[cnt].isDirectory()) {
+                  glob_script_mem.files[cnt].rewindDirectory();
+                  glob_script_mem.file_flags[cnt].is_dir=1;
+                } else {
+                  glob_script_mem.file_flags[cnt].is_dir=0;
+                }
+              }
+              else glob_script_mem.files[cnt]=SD.open(str,FILE_WRITE);
+              if (glob_script_mem.files[cnt]) {
+                fvar=cnt;
+                glob_script_mem.file_flags[cnt].is_open=1;
+              } else {
+                AddLog_P(LOG_LEVEL_INFO,PSTR("file open failed"));
+              }
+              break;
+            }
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fc(",3)) {
+          lp+=3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          glob_script_mem.files[ind].close();
+          glob_script_mem.file_flags[ind].is_open=0;
+          fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"ff(",3)) {
+          lp+=3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          glob_script_mem.files[ind].flush();
+          fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fw(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=ForceStringVar(lp,str);
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar=glob_script_mem.files[ind].print(str);
+          } else {
+            fvar=0;
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fr(",3)) {
+          lp+=3;
+          struct T_INDEX ind;
+          uint8_t vtype;
+          uint8_t sindex=0;
+          lp=isvar(lp,&vtype,&ind,0,0,0);
+          if (vtype!=VAR_NV) {
+
+            if ((vtype&STYPE)==0) {
+
+                  fvar=0;
+                  goto exit;
+            } else {
+
+              sindex=glob_script_mem.type[ind.index].index;
+            }
+          } else {
+
+              fvar=0;
+              goto exit;
+          }
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t find=fvar;
+          if (find>=SFS_MAX) find=SFS_MAX-1;
+          uint8_t index=0;
+          char str[glob_script_mem.max_ssize+1];
+          char *cp=str;
+          if (glob_script_mem.file_flags[find].is_open) {
+            if (glob_script_mem.file_flags[find].is_dir) {
+              while (true) {
+                File entry=glob_script_mem.files[find].openNextFile();
+                if (entry) {
+                  if (!reject((char*)entry.name())) {
+                    strcpy(str,entry.name());
+                    entry.close();
+                    break;
+                  }
+                } else {
+                  *cp=0;
+                  break;
+                }
+                entry.close();
+              }
+              index=strlen(str);
+            } else {
+              while (glob_script_mem.files[find].available()) {
+                uint8_t buf[1];
+                glob_script_mem.files[find].read(buf,1);
+                if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
+                  break;
+                } else {
+                  *cp++=buf[0];
+                  index++;
+                  if (index>=glob_script_mem.max_ssize-1) break;
+                }
+              }
+              *cp=0;
+            }
+          } else {
+            strcpy(str,"file error");
+          }
+          lp++;
+          strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+          fvar=index;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fd(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          SD.remove(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+#ifdef USE_SCRIPT_FATFS_EXT
+        if (!strncmp(vname,"fe(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+
+          File ef=SD.open(str);
+          if (ef) {
+            uint16_t fsiz=ef.size();
+            if (fsiz<2048) {
+              char *script=(char*)calloc(fsiz+16,1);
+              if (script) {
+                ef.read((uint8_t*)script,fsiz);
+                execute_script(script);
+                free(script);
+                fvar=1;
+              }
+            }
+            ef.close();
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fmd(",4)) {
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          fvar=SD.mkdir(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"frd(",4)) {
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          fvar=SD.rmdir(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fx(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          if (SD.exists(str)) fvar=1;
+          else fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+#endif
+        if (!strncmp(vname,"fl1(",4) || !strncmp(vname,"fl2(",4) ) {
+          uint8_t lknum=*(lp+2)&3;
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          if (lknum<1 || lknum>2) lknum=1;
+          strlcpy(glob_script_mem.flink[lknum-1],str,14);
+          lp++;
+          fvar=0;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fsm",3)) {
+          fvar=glob_script_mem.script_sd_found;
+
+          goto exit;
+        }
+        break;
+
+#endif
+      case 'g':
+        if (!strncmp(vname,"gtmp",4)) {
+          fvar=global_temperature;
+          goto exit;
+        }
+        if (!strncmp(vname,"ghum",4)) {
+          fvar=global_humidity;
+          goto exit;
+        }
+        if (!strncmp(vname,"gprs",4)) {
+          fvar=global_pressure;
+          goto exit;
+        }
+        if (!strncmp(vname,"gtopic",6)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTT_GRP_TOPIC),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        break;
+      case 'h':
+        if (!strncmp(vname,"hours",5)) {
+          fvar=RtcTime.hour;
+          goto exit;
+        }
+        if (!strncmp(vname,"heap",4)) {
+          fvar=ESP.getFreeHeap();
+          goto exit;
+        }
+        if (!strncmp(vname,"hn(",3)) {
+          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
+          if (fvar<0 || fvar>255) fvar=0;
+          lp++;
+          len=0;
+          if (sp) {
+            sprintf(sp,"%02x",(uint8_t)fvar);
+          }
+          goto strexit;
+        }
+        if (!strncmp(vname,"hx(",3)) {
+          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
+          lp++;
+          len=0;
+          if (sp) {
+            sprintf(sp,"%08x",(uint32_t)fvar);
+          }
+          goto strexit;
+        }
+#ifdef USE_LIGHT
+
+        if (!strncmp(vname,"hsvrgb(",7)) {
+          lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0);
+          if (fvar<0 || fvar>360) fvar=0;
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          if (fvar2<0 || fvar2>100) fvar2=0;
+          SCRIPT_SKIP_SPACES
+
+          float fvar3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
+          if (fvar3<0 || fvar3>100) fvar3=0;
+
+          fvar=HSVToRGB(fvar,fvar2,fvar3);
+
+          lp++;
+          len=0;
+          goto exit;
+        }
+
+#endif
+        break;
+      case 'i':
+        if (!strncmp(vname,"int(",4)) {
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar,0);
+          fvar=floor(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        break;
+      case 'l':
+        if (!strncmp(vname,"loglvl",6)) {
+          fvar=glob_script_mem.script_loglevel;
+          tind->index=SCRIPT_LOGLEVEL;
+  exit_settable:
+          if (fp) *fp=fvar;
+          *vtype=NTYPE;
+          tind->bits.settable=1;
+          tind->bits.is_string=0;
+          return lp+len;
+        }
+        break;
+      case 'm':
+        if (!strncmp(vname,"med(",4)) {
+          float fvar1;
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          fvar=DoMedian5(fvar1,fvar2);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"micros",6)) {
+          fvar=micros();
+          goto exit;
+        }
+        if (!strncmp(vname,"millis",6)) {
+          fvar=millis();
+          goto exit;
+        }
+        if (!strncmp(vname,"mins",4)) {
+          fvar=RtcTime.minute;
+          goto exit;
+        }
+        if (!strncmp(vname,"month",5)) {
+          fvar=RtcTime.month;
+          goto exit;
+        }
+        if (!strncmp(vname,"mqttc",5)) {
+          if (rules_flag.mqtt_connected) {
+            rules_flag.mqtt_connected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"mqttd",5)) {
+          if (rules_flag.mqtt_disconnected) {
+            rules_flag.mqtt_disconnected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"mqtts",5)) {
+          fvar=!global_state.mqtt_down;
+          goto exit;
+        }
+        break;
+      case 'p':
+        if (!strncmp(vname,"pin[",4)) {
+
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          fvar=digitalRead((uint8_t)fvar);
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"pn[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          fvar=pin[(uint8_t)fvar];
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"pd[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint8_t gpiopin=fvar;
+          for (uint8_t i=0;i<GPIO_SENSOR_END;i++) {
+            if (pin[i]==gpiopin) {
+              fvar=i;
+
+              len++;
+              goto exit;
+            }
+          }
+          fvar=999;
+          goto exit;
+        }
+        if (!strncmp(vname,"prefix1",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX1),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"prefix2",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX2),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"prefix3",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX3),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"pow(",4)) {
+
+          float fvar1;
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          lp++;
+
+          fvar=FastPrecisePow(fvar1,fvar2);
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"pwr[",4)) {
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<=devices_present) {
+            fvar=bitRead(power,index-1);
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+        if (!strncmp(vname,"pc[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<1 || index>MAX_COUNTERS) index=1;
+          fvar=RtcSettings.pulse_counter[index-1];
+          len+=1;
+          goto exit;
+        }
+        break;
+
+      case 'r':
+        if (!strncmp(vname,"ram",3)) {
+          fvar=glob_script_mem.script_mem_size+(glob_script_mem.script_size)+(PMEM_SIZE);
+          goto exit;
+        }
+        break;
+      case 's':
+        if (!strncmp(vname,"secs",4)) {
+          fvar=RtcTime.second;
+          goto exit;
+        }
+        if (!strncmp(vname,"sw[",3)) {
+
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          fvar=SwitchLastState((uint32_t)fvar);
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"stack",5)) {
+          fvar=GetStack();
+          goto exit;
+        }
+        if (!strncmp(vname,"slen",4)) {
+          fvar=strlen(glob_script_mem.script_ram);
+          goto exit;
+        }
+        if (!strncmp(vname,"sl(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          lp++;
+          len=0;
+          fvar=strlen(str);
+          goto exit;
+        }
+        if (!strncmp(vname,"sb(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          SCRIPT_SKIP_SPACES
+          float fvar1;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          lp++;
+          len=0;
+          if (fvar1<0) {
+            fvar1=strlen(str)+fvar1;
+          }
+          memcpy(sp,&str[(uint8_t)fvar1],(uint8_t)fvar2);
+          sp[(uint8_t)fvar2] = '\0';
+          goto strexit;
+        }
+        if (!strncmp(vname,"st(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          while (*lp==' ') lp++;
+          char token[2];
+          token[0]=*lp++;
+          token[1]=0;
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+
+          lp++;
+          len=0;
+          if (sp) {
+
+            char *st=strtok(str,token);
+            if (!st) {
+              *sp=0;
+            } else {
+              for (uint8_t cnt=1; cnt<=fvar; cnt++) {
+                if (cnt==fvar) {
+                  strcpy(sp,st);
+                  break;
+                }
+                st=strtok(NULL,token);
+                if (!st) {
+                  *sp=0;
+                  break;
+                }
+              }
+            }
+          }
+          goto strexit;
+        }
+        if (!strncmp(vname,"s(",2)) {
+          lp+=2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          char str[glob_script_mem.max_ssize+1];
+          dtostrfd(fvar,glob_script_mem.script_dprec,str);
+          if (sp) strlcpy(sp,str,glob_script_mem.max_ssize);
+          lp++;
+          len=0;
+          goto strexit;
+        }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+        if (!strncmp(vname,"sunrise",7)) {
+          fvar=SunMinutes(0);
+          goto exit;
+        }
+        if (!strncmp(vname,"sunset",6)) {
+          fvar=SunMinutes(1);
+          goto exit;
+        }
+#endif
+
+#ifdef USE_SHUTTER
+        if (!strncmp(vname,"sht[",4)) {
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<=shutters_present) {
+            fvar=Settings.shutter_position[index-1];
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+#endif
+#ifdef USE_ANGLE_FUNC
+        if (!strncmp(vname,"sin(",4)) {
+          lp+=4;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          fvar=sinf(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"sqrt(",5)) {
+          lp+=5;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          fvar=sqrtf(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+#endif
+#ifdef USE_SML_SCRIPT_CMD
+        if (!strncmp(vname,"sml(",4)) {
+          lp+=4;
+          float fvar1;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          SCRIPT_SKIP_SPACES
+          if (fvar2==0) {
+            float fvar3;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
+            fvar=SML_SetBaud(fvar1,fvar3);
+          } else {
+            char str[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,str,0);
+            fvar=SML_Write(fvar1,str);
+          }
+          lp++;
+          fvar=0;
+          len=0;
+          goto exit;
+        }
+#endif
+        break;
+      case 't':
+        if (!strncmp(vname,"time",4)) {
+          fvar=MinutesPastMidnight();
+          goto exit;
+        }
+        if (!strncmp(vname,"tper",4)) {
+          fvar=Settings.tele_period;
+          tind->index=SCRIPT_TELEPERIOD;
+          goto exit_settable;
+        }
+        if (!strncmp(vname,"tinit",5)) {
+          if (rules_flag.time_init) {
+            rules_flag.time_init=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"tset",4)) {
+          if (rules_flag.time_set) {
+            rules_flag.time_set=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"tstamp",6)) {
+          if (sp) strlcpy(sp,GetDateAndTime(DT_LOCAL).c_str(),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"topic",5)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTT_TOPIC),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+#ifdef USE_DISPLAY
+#ifdef USE_TOUCH_BUTTONS
+        if (!strncmp(vname,"tbut[",5)) {
+          GetNumericResult(vname+5,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<1 || index>MAXBUTTONS) index=1;
+          index--;
+          if (buttons[index]) {
+            fvar=buttons[index]->vpower&0x80;
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+
+#endif
+#endif
+        break;
+      case 'u':
+        if (!strncmp(vname,"uptime",6)) {
+          fvar=MinutesUptime();
+          goto exit;
+        }
+        if (!strncmp(vname,"upsecs",6)) {
+          fvar=uptime;
+          goto exit;
+        }
+        if (!strncmp(vname,"upd[",4)) {
+
+          struct T_INDEX ind;
+          uint8_t vtype;
+          isvar(vname+4,&vtype,&ind,0,0,0);
+          if (!ind.bits.constant) {
+            if (!ind.bits.changed) {
+              fvar=0;
+              len++;
+              goto exit;
+            } else {
+              glob_script_mem.type[ind.index].bits.changed=0;
+              fvar=1;
+              len++;
+              goto exit;
+            }
+          }
+          goto notfound;
+        }
+        break;
+
+      case 'w':
+        if (!strncmp(vname,"wday",4)) {
+          fvar=RtcTime.day_of_week;
+          goto exit;
+        }
+        if (!strncmp(vname,"wific",5)) {
+          if (rules_flag.wifi_connected) {
+            rules_flag.wifi_connected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"wifid",5)) {
+          if (rules_flag.wifi_disconnected) {
+            rules_flag.wifi_disconnected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"wifis",5)) {
+          fvar=!global_state.wifi_down;
+          goto exit;
+        }
+        break;
+      case 'y':
+        if (!strncmp(vname,"year",4)) {
+          fvar=RtcTime.year;
+          goto exit;
+        }
+        break;
+      default:
+        break;
+    }
+
+notfound:
+    if (fp) *fp=0;
+    *vtype=VAR_NV;
+    tind->index=VAR_NV;
+    glob_script_mem.var_not_found=1;
+    return lp;
+
+exit:
+    if (fp) *fp=fvar;
+    *vtype=NUM_RES;
+    tind->bits.constant=1;
+    tind->bits.is_string=0;
+    return lp+len;
+
+strexit:
+    *vtype=STYPE;
+    tind->bits.constant=1;
+    tind->bits.is_string=1;
+    return lp+len;
+}
+
+
+
+char *getop(char *lp, uint8_t *operand) {
+    switch (*lp) {
+        case '=':
+            if (*(lp+1)=='=') {
+                *operand=OPER_EQUEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_EQU;
+                return lp+1;
+            }
+            break;
+        case '+':
+            if (*(lp+1)=='=') {
+                *operand=OPER_PLSEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_PLS;
+                return lp+1;
+            }
+            break;
+        case '-':
+            if (*(lp+1)=='=') {
+                *operand=OPER_MINEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_MIN;
+                return lp+1;
+            }
+            break;
+        case '*':
+            if (*(lp+1)=='=') {
+                *operand=OPER_MULEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_MUL;
+                return lp+1;
+            }
+            break;
+        case '/':
+            if (*(lp+1)=='=') {
+                *operand=OPER_DIVEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_DIV;
+                return lp+1;
+            }
+            break;
+        case '!':
+            if (*(lp+1)=='=') {
+                *operand=OPER_NOTEQU;
+                return lp+2;
+            }
+            break;
+        case '>':
+            if (*(lp+1)=='=') {
+                *operand=OPER_GRTEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_GRT;
+                return lp+1;
+
+            }
+            break;
+        case '<':
+            if (*(lp+1)=='=') {
+                *operand=OPER_LOWEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_LOW;
+                return lp+1;
+            }
+            break;
+        case '%':
+            if (*(lp+1)=='=') {
+                *operand=OPER_PERCEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_PERC;
+                return lp+1;
+            }
+            break;
+        case '^':
+            if (*(lp+1)=='=') {
+                *operand=OPER_XOREQU;
+                return lp+2;
+            } else {
+                *operand=OPER_XOR;
+                return lp+1;
+            }
+            break;
+        case '&':
+            if (*(lp+1)=='=') {
+                *operand=OPER_ANDEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_AND;
+                return lp+1;
+            }
+            break;
+        case '|':
+            if (*(lp+1)=='=') {
+                *operand=OPER_OREQU;
+                return lp+2;
+            } else {
+                *operand=OPER_OR;
+                return lp+1;
+            }
+            break;
+    }
+    *operand=0;
+    return lp;
+}
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t g_cont;
+}
+uint16_t GetStack(void) {
+  register uint32_t *sp asm("a1");
+  return (4 * (sp - g_cont.stack));
+}
+
+#else
+extern "C" {
+#include <cont.h>
+  extern cont_t* g_pcont;
+}
+uint16_t GetStack(void) {
+  register uint32_t *sp asm("a1");
+  return (4 * (sp - g_pcont->stack));
+}
+#endif
+
+char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
+  uint8_t operand=0;
+  uint8_t vtype;
+  char *slp;
+  struct T_INDEX ind;
+  char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
+  while (1) {
+    lp=isvar(lp,&vtype,&ind,0,str1,jo);
+    if (vtype!=STR_RES && !(vtype&STYPE)) {
+
+      glob_script_mem.glob_error=1;
+      return lp;
+    }
+    switch (lastop) {
+        case OPER_EQU:
+          strlcpy(str,str1,sizeof(str));
+          break;
+        case OPER_PLS:
+          strncat(str,str1,sizeof(str));
+          break;
+    }
+    slp=lp;
+    lp=getop(lp,&operand);
+    switch (operand) {
+      case OPER_EQUEQU:
+      case OPER_NOTEQU:
+      case OPER_LOW:
+      case OPER_LOWEQU:
+      case OPER_GRT:
+      case OPER_GRTEQU:
+          lp=slp;
+          strcpy(cp,str);
+          return lp;
+          break;
+      default:
+          break;
+    }
+    lastop=operand;
+    if (!operand) {
+      strcpy(cp,str);
+      return lp;
+    }
+  }
+}
+
+char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo) {
+uint8_t operand=0;
+float fvar1,fvar;
+char *slp;
+uint8_t vtype;
+struct T_INDEX ind;
+    while (1) {
+
+        if (*lp=='(') {
+            lp++;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
+            lp++;
+
+        } else {
+            lp=isvar(lp,&vtype,&ind,&fvar1,0,jo);
+            if (vtype!=NUM_RES && vtype&STYPE) {
+
+              glob_script_mem.glob_error=1;
+            }
+        }
+        switch (lastop) {
+            case OPER_EQU:
+                fvar=fvar1;
+                break;
+            case OPER_PLS:
+                fvar+=fvar1;
+                break;
+            case OPER_MIN:
+                fvar-=fvar1;
+                break;
+            case OPER_MUL:
+                fvar*=fvar1;
+                break;
+            case OPER_DIV:
+                fvar/=fvar1;
+                break;
+            case OPER_PERC:
+                fvar=fmodf(fvar,fvar1);
+                break;
+            case OPER_XOR:
+                fvar=(uint32_t)fvar^(uint32_t)fvar1;
+                break;
+            case OPER_AND:
+                fvar=(uint32_t)fvar&(uint32_t)fvar1;
+                break;
+            case OPER_OR:
+                fvar=(uint32_t)fvar|(uint32_t)fvar1;
+                break;
+            default:
+                break;
+
+        }
+        slp=lp;
+        lp=getop(lp,&operand);
+        switch (operand) {
+            case OPER_EQUEQU:
+            case OPER_NOTEQU:
+            case OPER_LOW:
+            case OPER_LOWEQU:
+            case OPER_GRT:
+            case OPER_GRTEQU:
+                lp=slp;
+                *fp=fvar;
+                return lp;
+                break;
+            default:
+                break;
+        }
+        lastop=operand;
+        if (!operand) {
+            *fp=fvar;
+            return lp;
+        }
+    }
+}
+
+
+char *ForceStringVar(char *lp,char *dstr) {
+  float fvar;
+  char *slp=lp;
+  glob_script_mem.glob_error=0;
+  lp=GetStringResult(lp,OPER_EQU,dstr,0);
+  if (glob_script_mem.glob_error) {
+
+    lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
+    dtostrfd(fvar,6,dstr);
+    glob_script_mem.glob_error=0;
+  }
+  return lp;
+}
+
+
+void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
+    char *cp;
+    uint16_t count;
+    uint8_t vtype;
+    uint8_t dprec=glob_script_mem.script_dprec;
+    float fvar;
+    cp=srcbuf;
+    struct T_INDEX ind;
+    char string[SCRIPT_MAXSSIZE];
+    dstsize-=2;
+    for (count=0;count<dstsize;count++) {
+        if (*cp=='%') {
+            cp++;
+            if (*cp=='%') {
+              dstbuf[count]=*cp++;
+            } else {
+              if (isdigit(*cp)) {
+                dprec=*cp&0xf;
+                cp++;
+              } else {
+                dprec=glob_script_mem.script_dprec;
+              }
+              cp=isvar(cp,&vtype,&ind,&fvar,string,0);
+              if (vtype!=VAR_NV) {
+
+                if (vtype==NUM_RES || (vtype&STYPE)==0) {
+
+                    dtostrfd(fvar,dprec,string);
+                } else {
+
+                }
+                uint8_t slen=strlen(string);
+                if (count+slen<dstsize-1) {
+                  strcpy(&dstbuf[count],string);
+                  count+=slen-1;
+                }
+                cp++;
+              } else {
+                strcpy(&dstbuf[count],"???");
+                count+=2;
+                while (*cp!='%') {
+                  if (*cp==0 || *cp==SCRIPT_EOL) {
+                    dstbuf[count+1]=0;
+                    return;
+                  }
+                  cp++;
+                }
+                cp++;
+              }
+            }
+        } else {
+            if (*cp=='\\') {
+              cp++;
+              if (*cp=='n') {
+                dstbuf[count]='\n';
+              } else if (*cp=='r') {
+                dstbuf[count]='\r';
+              } else if (*cp=='\\') {
+                dstbuf[count]='\\';
+              } else {
+                dstbuf[count]=*cp;
+              }
+            } else {
+              dstbuf[count]=*cp;
+            }
+            if (*cp==0) {
+                break;
+            }
+            cp++;
+        }
+    }
+    dstbuf[count]=0;
+}
+
+void toLog(const char *str) {
+  if (!str) return;
+  AddLog_P(LOG_LEVEL_INFO, str);
+}
+
+
+void toLogN(const char *cp,uint8_t len) {
+  if (!cp) return;
+  char str[32];
+  if (len>=sizeof(str)) len=len>=sizeof(str);
+  strlcpy(str,cp,len);
+  toSLog(str);
+}
+
+void toLogEOL(const char *s1,const char *str) {
+  if (!str) return;
+  uint8_t index=0;
+  char *cp=log_data;
+  strcpy(cp,s1);
+  cp+=strlen(s1);
+  while (*str) {
+    if (*str==SCRIPT_EOL) break;
+    *cp++=*str++;
+  }
+  *cp=0;
+  AddLog(LOG_LEVEL_INFO);
+}
+
+
+void toSLog(const char *str) {
+  if (!str) return;
+#if SCRIPT_DEBUG>0
+  while (*str) {
+    Serial.write(*str);
+    str++;
+  }
+#endif
+}
+
+char *Evaluate_expression(char *lp,uint8_t and_or, uint8_t *result,JsonObject *jo) {
+  float fvar,*dfvar,fvar1;
+  uint8_t numeric;
+  struct T_INDEX ind;
+  uint8_t vtype=0,lastop;
+  uint8_t res=0;
+  char *llp=lp;
+  char *slp;
+
+  SCRIPT_SKIP_SPACES
+  if (*lp=='(') {
+    uint8_t res=0;
+    uint8_t xand_or=0;
+    lp++;
+
+loop:
+    SCRIPT_SKIP_SPACES
+    lp=Evaluate_expression(lp,xand_or,&res,jo);
+    if (*lp==')') {
+      lp++;
+      goto exit0;
+    }
+
+    SCRIPT_SKIP_SPACES
+    if (!strncmp(lp,"or",2)) {
+      lp+=2;
+      xand_or=1;
+      goto loop;
+    } else if (!strncmp(lp,"and",3)) {
+      lp+=3;
+      xand_or=2;
+      goto loop;
+    }
+exit0:
+    if (!and_or) {
+      *result=res;
+    } else if (and_or==1) {
+      *result|=res;
+    } else {
+      *result&=res;
+    }
+    goto exit10;
+  }
+
+  llp=lp;
+
+  dfvar=&fvar;
+  glob_script_mem.glob_error=0;
+  slp=lp;
+  numeric=1;
+  lp=GetNumericResult(lp,OPER_EQU,dfvar,0);
+  if (glob_script_mem.glob_error==1) {
+
+   char cmpstr[SCRIPT_MAXSSIZE];
+    lp=slp;
+    numeric=0;
+
+    lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
+   lp=getop(lp,&lastop);
+
+    char str[SCRIPT_MAXSSIZE];
+    lp=GetStringResult(lp,OPER_EQU,str,jo);
+    if (lastop==OPER_EQUEQU || lastop==OPER_NOTEQU) {
+      res=strcmp(cmpstr,str);
+      if (lastop==OPER_EQUEQU) res=!res;
+      goto exit;
+    }
+
+  } else {
+
+
+    lp=getop(lp,&lastop);
+    lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
+    switch (lastop) {
+      case OPER_EQUEQU:
+          res=(*dfvar==fvar1);
+          break;
+      case OPER_NOTEQU:
+          res=(*dfvar!=fvar1);
+          break;
+      case OPER_LOW:
+          res=(*dfvar<fvar1);
+          break;
+      case OPER_LOWEQU:
+          res=(*dfvar<=fvar1);
+          break;
+      case OPER_GRT:
+          res=(*dfvar>fvar1);
+          break;
+      case OPER_GRTEQU:
+          res=(*dfvar>=fvar1);
+          break;
+      default:
+
+          break;
+    }
+
+exit:
+    if (!and_or) {
+      *result=res;
+    } else if (and_or==1) {
+      *result|=res;
+    } else {
+      *result&=res;
+    }
+  }
+
+
+exit10:
+#if SCRIPT_DEBUG>0
+  char tbuff[128];
+  sprintf(tbuff,"p1=%d,p2=%d,cmpres=%d,and_or=%d line: ",(int32_t)*dfvar,(int32_t)fvar1,*result,and_or);
+  toLogEOL(tbuff,llp);
+#endif
+  return lp;
+}
+
+
+
+#define IF_NEST 8
+
+int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
+
+    if (tasm_cmd_activ && tlen>0) return 0;
+
+    uint8_t vtype=0,sindex,xflg,floop=0,globvindex,fromscriptcmd=0;
+    int8_t globaindex;
+    struct T_INDEX ind;
+    uint8_t operand,lastop,numeric=1,if_state[IF_NEST],if_exe[IF_NEST],if_result[IF_NEST],and_or,ifstck=0;
+    if_state[ifstck]=0;
+    if_result[ifstck]=0;
+    if_exe[ifstck]=1;
+    char cmpstr[SCRIPT_MAXSSIZE];
+    uint8_t check=0;
+    if (tlen<0) {
+      tlen=abs(tlen);
+      check=1;
+    }
+
+    float *dfvar,*cv_count,cv_max,cv_inc;
+    char *cv_ptr;
+    float fvar=0,fvar1,sysvar,swvar;
+    uint8_t section=0,sysv_type=0,swflg=0;
+
+    if (!glob_script_mem.scriptptr) {
+      return -99;
+    }
+
+    DynamicJsonBuffer jsonBuffer;
+    JsonObject &jobj=jsonBuffer.parseObject(js);
+    JsonObject *jo;
+    if (js) jo=&jobj;
+    else jo=0;
+
+    char *lp=glob_script_mem.scriptptr;
+
+    while (1) {
+
+
+        startline:
+        SCRIPT_SKIP_SPACES
+
+        SCRIPT_SKIP_EOL
+
+        if (*lp==';') goto next_line;
+        if (!*lp) break;
+
+        if (section) {
+
+            if (*lp=='>') {
+                return 0;
+            }
+            if (*lp=='#') {
+                return 0;
+            }
+            glob_script_mem.var_not_found=0;
+
+
+#ifdef IFTHEN_DEBUG
+            char tbuff[128];
+            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
+            toLogEOL(tbuff,lp);
+#endif
+
+
+
+
+            if (!strncmp(lp,"if",2)) {
+                lp+=2;
+                if (ifstck<IF_NEST-1) ifstck++;
+                if_state[ifstck]=1;
+                if_result[ifstck]=0;
+                if (ifstck==1) if_exe[ifstck]=1;
+                else if_exe[ifstck]=if_exe[ifstck-1];
+                and_or=0;
+            } else if (!strncmp(lp,"then",4) && if_state[ifstck]==1) {
+                lp+=4;
+                if_state[ifstck]=2;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+            } else if (!strncmp(lp,"else",4) && if_state[ifstck]==2) {
+                lp+=4;
+                if_state[ifstck]=3;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
+            } else if (!strncmp(lp,"endif",5) && if_state[ifstck]>=2) {
+                lp+=5;
+                if (ifstck>0) {
+                  if_state[ifstck]=0;
+                  ifstck--;
+                }
+                goto next_line;
+            } else if (!strncmp(lp,"or",2) && if_state[ifstck]==1) {
+                lp+=2;
+                and_or=1;
+            } else if (!strncmp(lp,"and",3) && if_state[ifstck]==1) {
+                lp+=3;
+                and_or=2;
+            }
+
+            if (*lp=='{' && if_state[ifstck]==1) {
+              lp+=1;
+              if_state[ifstck]=2;
+              if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+            } else if (*lp=='{' && if_state[ifstck]==3) {
+              lp+=1;
+
+            } else if (*lp=='}' && if_state[ifstck]>=2) {
+              lp++;
+              char *slp=lp;
+              uint8_t iselse=0;
+              for (uint8_t count=0; count<8;count++) {
+                if (*lp=='}') {
+
+                  break;
+                }
+                if (!strncmp(lp,"else",4)) {
+
+                  if_state[ifstck]=3;
+                  if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
+                  lp+=4;
+                  iselse=1;
+                  SCRIPT_SKIP_SPACES
+                  if (*lp=='{') lp++;
+                  break;
+                }
+                lp++;
+              }
+              if (!iselse) {
+                lp=slp;
+
+                if (ifstck>0) {
+                  if_state[ifstck]=0;
+                  ifstck--;
+                }
+                goto next_line;
+              }
+            }
+
+            if (!strncmp(lp,"for",3)) {
+
+
+              lp+=3;
+              SCRIPT_SKIP_SPACES
+              lp=isvar(lp,&vtype,&ind,0,0,0);
+              if ((vtype!=VAR_NV) && (vtype&STYPE)==0) {
+
+                  uint8_t index=glob_script_mem.type[ind.index].index;
+                  cv_count=&glob_script_mem.fvars[index];
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,cv_count,0);
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,&cv_max,0);
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,&cv_inc,0);
+
+                  cv_ptr=lp;
+                  floop=1;
+              } else {
+
+                  toLogEOL("for error",lp);
+              }
+            } else if (!strncmp(lp,"next",4) && floop>0) {
+
+              *cv_count+=cv_inc;
+              if (*cv_count<=cv_max) {
+                lp=cv_ptr;
+              } else {
+                lp+=4;
+                floop=0;
+              }
+            }
+
+            if (!strncmp(lp,"switch",6)) {
+              lp+=6;
+              SCRIPT_SKIP_SPACES
+              char *slp=lp;
+              lp=GetNumericResult(lp,OPER_EQU,&swvar,0);
+              if (glob_script_mem.glob_error==1) {
+
+                lp=slp;
+
+                lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
+                swflg=0x81;
+              } else {
+                swflg=1;
+              }
+            } else if (!strncmp(lp,"case",4) && swflg>0) {
+              lp+=4;
+              SCRIPT_SKIP_SPACES
+              float cvar;
+              if (!(swflg&0x80)) {
+                lp=GetNumericResult(lp,OPER_EQU,&cvar,0);
+                if (swvar!=cvar) {
+                  swflg=2;
+                } else {
+                  swflg=1;
+                }
+              } else {
+                char str[SCRIPT_MAXSSIZE];
+                lp=GetStringResult(lp,OPER_EQU,str,0);
+                if (!strcmp(cmpstr,str)) {
+                    swflg=0x81;
+                } else {
+                  swflg=0x82;
+                }
+              }
+            } else if (!strncmp(lp,"ends",4) && swflg>0) {
+              lp+=4;
+              swflg=0;
+            }
+            if ((swflg&3)==2) goto next_line;
+
+            SCRIPT_SKIP_SPACES
+
+            if (*lp==SCRIPT_EOL) {
+             goto next_line;
+            }
+
+
+            if (!if_exe[ifstck] && if_state[ifstck]!=1) goto next_line;
+
+#ifdef IFTHEN_DEBUG
+            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d execute line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
+            toLogEOL(tbuff,lp);
+#endif
+
+            if (!strncmp(lp,"break",5)) {
+              if (floop) {
+
+                floop=0;
+              } else {
+                section=0;
+              }
+              break;
+            } else if (!strncmp(lp,"dp",2) && isdigit(*(lp+2))) {
+              lp+=2;
+
+              glob_script_mem.script_dprec=atoi(lp);
+              goto next_line;
+            } else if (!strncmp(lp,"delay(",6)) {
+              lp+=5;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              delay(fvar);
+              goto next_line;
+            } else if (!strncmp(lp,"spinm(",6)) {
+              lp+=6;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t pinnr=fvar;
+              SCRIPT_SKIP_SPACES
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t mode=fvar;
+              pinMode(pinnr,mode&3);
+              goto next_line;
+            } else if (!strncmp(lp,"spin(",5)) {
+              lp+=5;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t pinnr=fvar;
+              SCRIPT_SKIP_SPACES
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t mode=fvar;
+              digitalWrite(pinnr,mode&1);
+              goto next_line;
+            } else if (!strncmp(lp,"svars(",5)) {
+              lp+=5;
+
+              Scripter_save_pvars();
+              goto next_line;
+            }
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+            else if (!strncmp(lp,"ws2812(",7)) {
+              lp+=7;
+              lp=isvar(lp,&vtype,&ind,0,0,0);
+              if (vtype!=VAR_NV) {
+
+                uint8_t index=glob_script_mem.type[ind.index].index;
+                if ((vtype&STYPE)==0) {
+
+                  if (glob_script_mem.type[index].bits.is_filter) {
+                    uint8_t len=0;
+                    float *fa=Get_MFAddr(index,&len);
+
+                    if (fa && len) ws2812_set_array(fa,len);
+                  }
+                }
+              }
+              goto next_line;
+            }
+#endif
+#endif
+
+            else if (!strncmp(lp,"=>",2) || !strncmp(lp,"->",2) || !strncmp(lp,"+>",2) || !strncmp(lp,"print",5)) {
+
+                uint8_t sflag=0,pflg=0,svmqtt,swll;
+                if (*lp=='p') {
+                 pflg=1;
+                 lp+=5;
+                }
+                else {
+                  if (*lp=='-') sflag=1;
+                  if (*lp=='+') sflag=2;
+                  lp+=2;
+                }
+                char *slp=lp;
+                SCRIPT_SKIP_SPACES
+                #define SCRIPT_CMDMEM 512
+                char *cmdmem=(char*)malloc(SCRIPT_CMDMEM);
+                if (cmdmem) {
+                  char *cmd=cmdmem;
+                  uint16_t count;
+                  for (count=0; count<SCRIPT_CMDMEM/2-2; count++) {
+
+                    if (!*lp || *lp=='\r' || *lp=='\n') {
+                        cmd[count]=0;
+                        break;
+                    }
+                    cmd[count]=*lp++;
+                  }
+
+
+                  char *tmp=cmdmem+SCRIPT_CMDMEM/2;
+                  Replace_Cmd_Vars(cmd,tmp,SCRIPT_CMDMEM/2);
+
+
+                  if (!strncmp(tmp,"print",5) || pflg) {
+                    if (pflg) toLog(tmp);
+                    else toLog(&tmp[5]);
+                  } else {
+                    if (!sflag) {
+                      tasm_cmd_activ=1;
+                      AddLog_P2(glob_script_mem.script_loglevel&0x7f, PSTR("Script: performs \"%s\""), tmp);
+                    } else if (sflag==2) {
+
+                    } else {
+                      tasm_cmd_activ=1;
+                      svmqtt=Settings.flag.mqtt_enabled;
+                      swll=Settings.weblog_level;
+                      Settings.flag.mqtt_enabled=0;
+                      Settings.weblog_level=0;
+                    }
+                    ExecuteCommand((char*)tmp, SRC_RULE);
+                    tasm_cmd_activ=0;
+                    if (sflag==1) {
+                      Settings.flag.mqtt_enabled=svmqtt;
+                      Settings.weblog_level=swll;
+                    }
+                  }
+                  if (cmdmem) free(cmdmem);
+                }
+                lp=slp;
+                goto next_line;
+            } else if (!strncmp(lp,"=#",2)) {
+
+                lp+=1;
+                char *slp=lp;
+                uint8_t plen=0;
+                while (*lp) {
+                  if (*lp=='\n'|| *lp=='\r'|| *lp=='(') {
+                    break;
+                  }
+                  lp++;
+                  plen++;
+                }
+                if (fromscriptcmd) {
+                  char *sp=glob_script_mem.scriptptr;
+                  glob_script_mem.scriptptr=glob_script_mem.scriptptr_bu;
+                  Run_Scripter(slp,plen,0);
+                  glob_script_mem.scriptptr=sp;
+                } else {
+                  Run_Scripter(slp,plen,0);
+                }
+                lp=slp;
+                goto next_line;
+            } else if (!strncmp(lp,"=(",2)) {
+                lp+=2;
+                char str[128];
+                str[0]='>';
+                lp=GetStringResult(lp,OPER_EQU,&str[1],0);
+                lp++;
+                execute_script(str);
+            }
+
+
+            if (if_state[ifstck]==1) {
+
+              lp=Evaluate_expression(lp,and_or,&if_result[ifstck],jo);
+              SCRIPT_SKIP_SPACES
+              if (*lp=='{' && if_state[ifstck]==1) {
+                lp+=1;
+                if_state[ifstck]=2;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+              }
+              goto next_line;
+            } else {
+              lp=isvar(lp,&vtype,&ind,&sysvar,0,0);
+              if (vtype!=VAR_NV) {
+
+                  globvindex=ind.index;
+                  globaindex=last_findex;
+                  uint8_t index=glob_script_mem.type[ind.index].index;
+                  if ((vtype&STYPE)==0) {
+
+                      if (ind.bits.settable || ind.bits.is_filter) {
+                        dfvar=&sysvar;
+                        if (ind.bits.settable) {
+                          sysv_type=ind.index;
+                        } else {
+                          sysv_type=0;
+                        }
+
+                      } else {
+                        dfvar=&glob_script_mem.fvars[index];
+                        sysv_type=0;
+                      }
+                      numeric=1;
+                      lp=getop(lp,&lastop);
+                      char *slp=lp;
+                      glob_script_mem.glob_error=0;
+                      lp=GetNumericResult(lp,OPER_EQU,&fvar,jo);
+                      if (glob_script_mem.glob_error==1) {
+
+
+                        lp=isvar(slp,&vtype,&ind,0,cmpstr,jo);
+                        fvar=CharToFloat(cmpstr);
+                      }
+                      switch (lastop) {
+                          case OPER_EQU:
+                              if (glob_script_mem.var_not_found) {
+                                if (!js) toLogEOL("var not found: ",lp);
+                                goto next_line;
+                              }
+                              *dfvar=fvar;
+                              break;
+                          case OPER_PLSEQU:
+                              *dfvar+=fvar;
+                              break;
+                          case OPER_MINEQU:
+                              *dfvar-=fvar;
+                              break;
+                          case OPER_MULEQU:
+                              *dfvar*=fvar;
+                              break;
+                          case OPER_DIVEQU:
+                              *dfvar/=fvar;
+                              break;
+                          case OPER_PERCEQU:
+                              *dfvar=fmodf(*dfvar,fvar);
+                              break;
+                          case OPER_ANDEQU:
+                              *dfvar=(uint32_t)*dfvar&(uint32_t)fvar;
+                              break;
+                          case OPER_OREQU:
+                              *dfvar=(uint32_t)*dfvar|(uint32_t)fvar;
+                              break;
+                          case OPER_XOREQU:
+                              *dfvar=(uint32_t)*dfvar^(uint32_t)fvar;
+                              break;
+                          default:
+
+                              break;
+                      }
+
+                      glob_script_mem.type[globvindex].bits.changed=1;
+                      if (glob_script_mem.type[globvindex].bits.is_filter) {
+                        if (globaindex>=0) {
+                          Set_MFVal(glob_script_mem.type[globvindex].index,globaindex,*dfvar);
+                        } else {
+                          Set_MFilter(glob_script_mem.type[globvindex].index,*dfvar);
+                        }
+                      }
+
+                      if (sysv_type) {
+                        switch (sysv_type) {
+                          case SCRIPT_LOGLEVEL:
+                            glob_script_mem.script_loglevel=*dfvar;
+                            break;
+                          case SCRIPT_TELEPERIOD:
+                            if (*dfvar<10) *dfvar=10;
+                            if (*dfvar>300) *dfvar=300;
+                            Settings.tele_period=*dfvar;
+                            break;
+                        }
+                        sysv_type=0;
+                      }
+                  } else {
+
+                    numeric=0;
+                    sindex=index;
+
+                    char str[SCRIPT_MAXSSIZE];
+                    lp=getop(lp,&lastop);
+                    char *slp=lp;
+                    glob_script_mem.glob_error=0;
+                    lp=GetStringResult(lp,OPER_EQU,str,jo);
+                    if (!js && glob_script_mem.glob_error) {
+
+                      lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
+                      dtostrfd(fvar,6,str);
+                      glob_script_mem.glob_error=0;
+                    }
+
+                    if (!glob_script_mem.var_not_found) {
+
+                      glob_script_mem.type[globvindex].bits.changed=1;
+                      if (lastop==OPER_EQU) {
+                        strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+                      } else if (lastop==OPER_PLSEQU) {
+                        strncat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+                      }
+                    }
+                  }
+
+            }
+            SCRIPT_SKIP_SPACES
+            if (*lp=='{' && if_state[ifstck]==3) {
+              lp+=1;
+
+            }
+            goto next_line;
+          }
+        } else {
+
+            if (*lp=='>' && tlen==1) {
+
+              lp++;
+              section=1;
+              fromscriptcmd=1;
+              goto startline;
+            }
+            if (!strncmp(lp,type,tlen)) {
+
+                section=1;
+                glob_script_mem.section_ptr=lp;
+                if (check) {
+                  return 99;
+                }
+
+                char *ctype=(char*)type;
+                if (*ctype=='#') {
+
+                  ctype+=tlen;
+                  if (*ctype=='(' && *(lp+tlen)=='(') {
+                    float fparam;
+                    numeric=1;
+                    glob_script_mem.glob_error=0;
+                    GetNumericResult((char*)ctype,OPER_EQU,&fparam,0);
+                    if (glob_script_mem.glob_error==1) {
+
+                      numeric=0;
+
+                      GetStringResult((char*)ctype+1,OPER_EQU,cmpstr,0);
+                    }
+                    lp+=tlen;
+                    if (*lp=='(') {
+
+                      lp++;
+                      lp=isvar(lp,&vtype,&ind,0,0,0);
+                      if (vtype!=VAR_NV) {
+
+                        uint8_t index=glob_script_mem.type[ind.index].index;
+                        if ((vtype&STYPE)==0) {
+
+                            dfvar=&glob_script_mem.fvars[index];
+                            if (numeric) {
+                              *dfvar=fparam;
+                            } else {
+
+                              *dfvar=CharToFloat(cmpstr);
+                            }
+                        } else {
+
+                            sindex=index;
+                            if (!numeric) {
+                              strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),cmpstr,glob_script_mem.max_ssize);
+                            } else {
+
+                              dtostrfd(fparam,6,glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize));
+                            }
+                        }
+                      }
+                    }
+                  } else {
+                    lp+=tlen;
+                    if (*ctype=='(' || (*lp!=SCRIPT_EOL && *lp!='?')) {
+
+                      section=0;
+                    }
+                  }
+                }
+            }
+        }
+
+    next_line:
+        if (*lp==SCRIPT_EOL) {
+          lp++;
+        } else {
+          lp = strchr(lp, SCRIPT_EOL);
+          if (!lp) {
+            if (section) {
+              return 0;
+            } else {
+              return -1;
+            }
+          }
+          lp++;
+        }
+    }
+    return -1;
+}
+
+uint8_t script_xsns_index = 0;
+
+
+void ScripterEvery100ms(void) {
+
+  if (Settings.rule_enabled && (uptime > 4)) {
+    mqtt_data[0] = '\0';
+    uint16_t script_tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, script_xsns_index);
+    tele_period = script_tele_period_save;
+    if (strlen(mqtt_data)) {
+      mqtt_data[0] = '{';
+      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data);
+      Run_Scripter(">T",2, mqtt_data);
+    }
+  }
+  if (fast_script==99) Run_Scripter(">F",2,0);
+}
+
+
+
+
+void Scripter_save_pvars(void) {
+  int16_t mlen=0;
+  float *fp=(float*)glob_script_mem.script_pram;
+  mlen+=sizeof(float);
+  struct T_INDEX *vtp=glob_script_mem.type;
+  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+    if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
+      uint8_t index=vtp[count].index;
+      mlen+=sizeof(float);
+      if (mlen>PMEM_SIZE) {
+        vtp[count].bits.is_permanent=0;
+        return;
+      }
+      *fp++=glob_script_mem.fvars[index];
+    }
+  }
+  char *cp=(char*)fp;
+  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+    if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
+      uint8_t index=vtp[count].index;
+      char *sp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
+      uint8_t slen=strlen(sp);
+      mlen+=slen+1;
+      if (mlen>PMEM_SIZE) {
+        vtp[count].bits.is_permanent=0;
+        return;
+      }
+      strcpy(cp,sp);
+      cp+=slen+1;
+    }
+  }
+}
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_SCRIPT "s10"
+
+const char S_CONFIGURE_SCRIPT[] PROGMEM = D_CONFIGURE_SCRIPT;
+
+const char HTTP_BTN_MENU_RULES[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form></p>";
+
+
+const char HTTP_FORM_SCRIPT[] PROGMEM =
+    "<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>"
+    "<form method='post' action='" WEB_HANDLE_SCRIPT "'>";
+
+const char HTTP_FORM_SCRIPT1[] PROGMEM =
+    "<div style='text-align:right' id='charNum'> </div>"
+    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>" D_SCRIPT_ENABLE "</b><br/>"
+    "<br><textarea  id='t1' name='t1' rows='8' cols='80' maxlength='%d' style='font-size: 12pt' >";
+
+const char HTTP_FORM_SCRIPT1b[] PROGMEM =
+    "</textarea>"
+    "<script type='text/javascript'>"
+    "eb('charNum').innerHTML='-';"
+    "var ta=eb('t1');"
+    "ta.addEventListener('keydown',function(e){"
+    "e = e || window.event;"
+    "var ml=this.getAttribute('maxlength');"
+    "var cl=this.value.length;"
+    "if(cl>=ml){"
+    "eb('charNum').innerHTML='" D_SCRIPT_CHARS_NO_MORE "';"
+    "}else{"
+    "eb('charNum').innerHTML=ml-cl+' " D_SCRIPT_CHARS_LEFT "';"
+    "}"
+
+#if 0
+
+    "if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.which === 86) {"
+
+      "var paste = window.clipboardData.getData('Text');"
+
+
+      "var out=\"\";"
+      "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
+      "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
+      "allLines.forEach((line) => {"
+        "if(line.length>0) {"
+          "if(line.charAt(0)!=';'){"
+            "out+=line+'\\n';"
+          "}"
+        "}"
+      "});"
+      "alert(out);"
+    "}"
+#endif
+
+    "return true;"
+    "});"
+
+
+
+#ifdef SCRIPT_STRIP_COMMENTS
+    "ta.addEventListener('paste',function(e){"
+      "let paste = (e.clipboardData || window.clipboardData).getData('text');"
+      "var ml=this.getAttribute('maxlength');"
+      "if(paste.length>=ml){"
+        "var out=\"\";"
+        "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
+        "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
+        "allLines.forEach((line) => {"
+          "if(line.length>0) {"
+            "if(line.charAt(0)!=';'){"
+              "out+=line+'\\n';"
+            "}"
+          "}"
+        "});"
+        "event.preventDefault();"
+        "eb('t1').textContent=out;"
+      "}"
+# 3145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+    "});"
+
+
+#endif
+
+    "</script>";
+
+const char HTTP_SCRIPT_FORM_END[] PROGMEM =
+      "<br/>"
+      "<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ta' class='button bgrn'>" D_SAVE "</button>"
+      "</form></fieldset>";
+
+#ifdef USE_SCRIPT_FATFS
+const char HTTP_FORM_SCRIPT1c[] PROGMEM =
+    "<button name='d%d' type='submit' class='button bgrn'>" D_SCRIPT_DOWNLOAD " '%s'</button>";
+#ifdef SDCARD_DIR
+const char HTTP_FORM_SCRIPT1d[] PROGMEM =
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SDCARD_DIR "</button>";
+#else
+const char HTTP_FORM_SCRIPT1d[] PROGMEM =
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SCRIPT_UPLOAD_FILES "</button>";
+#endif
+
+#ifdef SDCARD_DIR
+const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_DIR;
+#else
+const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_UPLOAD;
+#endif
+
+const char HTTP_FORM_FILE_UPLOAD[] PROGMEM =
+"<div id='f1' name='f1' style='display:block;'>"
+"<fieldset><legend><b>&nbsp;%s" "&nbsp;</b></legend>";
+const char HTTP_FORM_FILE_UPG[] PROGMEM =
+"<form method='post' action='u3' enctype='multipart/form-data'>"
+"<br/><input type='file' name='u3'><br/>"
+"<br/><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>";
+
+const char HTTP_FORM_FILE_UPGb[] PROGMEM =
+"</fieldset>"
+"</div>"
+"<div id='f2' name='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
+
+const char HTTP_FORM_SDC_DIRa[] PROGMEM =
+"<div style='text-align:left'>";
+const char HTTP_FORM_SDC_DIRb[] PROGMEM =
+ "<pre><a href='%s' file='%s'>%s</a>    %d</pre>";
+const char HTTP_FORM_SDC_DIRd[] PROGMEM =
+"<pre><a href='%s' file='%s'>%s</a></pre>";
+const char HTTP_FORM_SDC_DIRc[] PROGMEM =
+"</div>";
+const char HTTP_FORM_SDC_HREF[] PROGMEM =
+"http://%s/upl?download=%s/%s";
+#endif
+
+
+
+#ifdef USE_SCRIPT_FATFS
+
+#if USE_LONG_FILE_NAMES>0
+#undef REJCMPL
+#define REJCMPL 6
+#else
+#undef REJCMPL
+#define REJCMPL 8
+#endif
+
+uint8_t reject(char *name) {
+
+  if (*name=='_') return 1;
+  if (*name=='.') return 1;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+  if (!strncasecmp(name,"SPOTLI~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"TRASHE~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"FSEVEN~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"SYSTEM~1",REJCMPL)) return 1;
+#else
+  if (!strcasecmp(name,"SPOTLI~1")) return 1;
+  if (!strcasecmp(name,"TRASHE~1")) return 1;
+  if (!strcasecmp(name,"FSEVEN~1")) return 1;
+  if (!strcasecmp(name,"SYSTEM~1")) return 1;
+#endif
+  return 0;
+}
+
+void ListDir(char *path, uint8_t depth) {
+  char name[32];
+  char npath[128];
+  char format[12];
+  sprintf(format,"%%-%ds",24-depth);
+
+  File dir=SD.open(path);
+  if (dir) {
+    dir.rewindDirectory();
+    if (strlen(path)>1) {
+      snprintf_P(npath,sizeof(npath),PSTR("http://%s/upl?download=%s"),WiFi.localIP().toString().c_str(),path);
+      for (uint8_t cnt=strlen(npath)-1;cnt>0;cnt--) {
+        if (npath[cnt]=='/') {
+          if (npath[cnt-1]=='=') npath[cnt+1]=0;
+          else npath[cnt]=0;
+          break;
+        }
+      }
+      WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,path,"..");
+    }
+    while (true) {
+      File entry=dir.openNextFile();
+      if (!entry) {
+        break;
+      }
+      char *pp=path;
+      if (!*(pp+1)) pp++;
+      char *cp=name;
+
+      if (reject((char*)entry.name())) goto fclose;
+
+      for (uint8_t cnt=0;cnt<depth;cnt++) {
+        *cp++='-';
+      }
+
+      sprintf(cp,format,entry.name());
+      if (entry.isDirectory()) {
+        snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
+        WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,entry.name(),name);
+        uint8_t plen=strlen(path);
+        if (plen>1) {
+          strcat(path,"/");
+        }
+        strcat(path,entry.name());
+        ListDir(path,depth+4);
+        path[plen]=0;
+      } else {
+          snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
+          WSContentSend_P(HTTP_FORM_SDC_DIRb,npath,entry.name(),name,entry.size());
+      }
+      fclose:
+      entry.close();
+    }
+    dir.close();
+  }
+}
+
+char path[48];
+
+void Script_FileUploadConfiguration(void)
+{
+  uint8_t depth=0;
+  strcpy(path,"/");
+
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("download")) {
+    String stmp = WebServer->arg("download");
+    char *cp=(char*)stmp.c_str();
+    if (DownloadFile(cp)) {
+
+      strcpy(path,cp);
+    }
+  }
+
+  WSContentStart_P(S_SCRIPT_FILE_UPLOAD);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
+  WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
+#ifdef SDCARD_DIR
+  WSContentSend_P(HTTP_FORM_SDC_DIRa);
+  if (glob_script_mem.script_sd_found) {
+    ListDir(path,depth);
+  }
+  WSContentSend_P(HTTP_FORM_SDC_DIRc);
+#endif
+  WSContentSend_P(HTTP_FORM_FILE_UPGb);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+  Web.upload_error = 0;
+}
+
+File upload_file;
+
+void ScriptFileUploadSuccess(void) {
+  WSContentStart_P(S_INFORMATION);
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
+  WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br/>"), WebColor(COL_TEXT_SUCCESS));
+  WSContentSend_P(PSTR("</div><br/>"));
+  WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),"/upl",D_UPL_DONE);
+
+  WSContentStop();
+}
+
+
+
+void script_upload(void) {
+
+
+
+  HTTPUpload& upload = WebServer->upload();
+  if (upload.status == UPLOAD_FILE_START) {
+    char npath[48];
+    sprintf(npath,"%s/%s",path,upload.filename.c_str());
+    SD.remove(npath);
+    upload_file=SD.open(npath,FILE_WRITE);
+    if (!upload_file) Web.upload_error=1;
+  } else if(upload.status == UPLOAD_FILE_WRITE) {
+    if (upload_file) upload_file.write(upload.buf,upload.currentSize);
+  } else if(upload.status == UPLOAD_FILE_END) {
+    if (upload_file) upload_file.close();
+    if (Web.upload_error) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: upload error"));
+    }
+  } else {
+    Web.upload_error=1;
+    WebServer->send(500, "text/plain", "500: couldn't create file");
+  }
+}
+
+uint8_t DownloadFile(char *file) {
+  File download_file;
+  WiFiClient download_Client;
+
+    if (!SD.exists(file)) {
+      AddLog_P(LOG_LEVEL_INFO,PSTR("file not found"));
+      return 0;
+    }
+
+    download_file=SD.open(file,FILE_READ);
+    if (!download_file) {
+      AddLog_P(LOG_LEVEL_INFO,PSTR("could not open file"));
+      return 0;
+    }
+
+    if (download_file.isDirectory()) {
+      download_file.close();
+      return 1;
+    }
+
+    uint32_t flen=download_file.size();
+
+    download_Client = WebServer->client();
+    WebServer->setContentLength(flen);
+
+    char attachment[100];
+    char *cp;
+    for (uint8_t cnt=strlen(file); cnt>=0; cnt--) {
+      if (file[cnt]=='/') {
+        cp=&file[cnt+1];
+        break;
+      }
+    }
+    snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=%s"),cp);
+    WebServer->sendHeader(F("Content-Disposition"), attachment);
+    WSSend(200, CT_STREAM, "");
+
+    uint8_t buff[512];
+    uint16_t bread;
+
+
+    uint8_t cnt=0;
+    while (download_file.available()) {
+      bread=download_file.read(buff,sizeof(buff));
+      uint16_t bw=download_Client.write((const char*)buff,bread);
+      if (!bw) break;
+      cnt++;
+      if (cnt>7) {
+        cnt=0;
+        if (glob_script_mem.script_loglevel&0x80) {
+
+          loop();
+        }
+      }
+    }
+    download_file.close();
+    download_Client.stop();
+    return 0;
+}
+
+#endif
+
+
+void HandleScriptTextareaConfiguration(void) {
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    ScriptSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+}
+
+void HandleScriptConfiguration(void) {
+
+    if (!HttpCheckPriviledgedAccess()) { return; }
+
+    AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_SCRIPT);
+
+#ifdef USE_SCRIPT_FATFS
+    if (WebServer->hasArg("d1")) {
+      DownloadFile(glob_script_mem.flink[0]);
+    }
+    if (WebServer->hasArg("d2")) {
+      DownloadFile(glob_script_mem.flink[1]);
+    }
+    if (WebServer->hasArg("upl")) {
+      Script_FileUploadConfiguration();
+    }
+#endif
+
+    WSContentStart_P(S_CONFIGURE_SCRIPT);
+    WSContentSendStyle();
+    WSContentSend_P(HTTP_FORM_SCRIPT);
+
+
+#ifdef xSCRIPT_STRIP_COMMENTS
+    uint16_t ssize=glob_script_mem.script_size;
+    if (bitRead(Settings.rule_enabled, 1)) ssize*=2;
+    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",ssize);
+#else
+    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",glob_script_mem.script_size);
+#endif
+
+
+    if (glob_script_mem.script_ram[0]) {
+      _WSContentSend(glob_script_mem.script_ram);
+    }
+    WSContentSend_P(HTTP_FORM_SCRIPT1b);
+
+#ifdef USE_SCRIPT_FATFS
+    if (glob_script_mem.script_sd_found) {
+      WSContentSend_P(HTTP_FORM_SCRIPT1d);
+      if (glob_script_mem.flink[0][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,1,glob_script_mem.flink[0]);
+      if (glob_script_mem.flink[1][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,2,glob_script_mem.flink[1]);
+    }
+#endif
+
+    WSContentSend_P(HTTP_SCRIPT_FORM_END);
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentStop();
+  }
+
+
+void ScriptSaveSettings(void) {
+
+  if (WebServer->hasArg("c1")) {
+    bitWrite(Settings.rule_enabled,0,1);
+  } else {
+    bitWrite(Settings.rule_enabled,0,0);
+  }
+
+
+  String str = WebServer->arg("t1");
+
+  if (*str.c_str()) {
+
+    str.replace("\r\n","\n");
+    str.replace("\r","\n");
+
+#ifdef xSCRIPT_STRIP_COMMENTS
+    if (bitRead(Settings.rule_enabled, 1)) {
+      char *sp=(char*)str.c_str();
+      char *sp1=sp;
+      char *dp=sp;
+      uint8_t flg=0;
+      while (*sp) {
+        while (*sp==' ') sp++;
+        sp1=sp;
+        sp=strchr(sp,'\n');
+        if (!sp) {
+          flg=1;
+        } else {
+          *sp=0;
+        }
+        if (*sp1!=';') {
+          uint8_t slen=strlen(sp1);
+          if (slen) {
+            strcpy(dp,sp1);
+            dp+=slen;
+            *dp++='\n';
+          }
+        }
+        if (flg) {
+          *dp=0;
+          break;
+        }
+        sp++;
+      }
+    }
+#endif
+
+    strlcpy(glob_script_mem.script_ram,str.c_str(), glob_script_mem.script_size);
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+    if (glob_script_mem.flags&1) {
+      EEP_WRITE(0,EEP_SCRIPT_SIZE,glob_script_mem.script_ram);
+    }
+#endif
+#endif
+
+#ifdef USE_SCRIPT_FATFS
+    if (glob_script_mem.flags&1) {
+      SD.remove(FAT_SCRIPT_NAME);
+      File file=SD.open(FAT_SCRIPT_NAME,FILE_WRITE);
+      file.write(glob_script_mem.script_ram,FAT_SCRIPT_SIZE);
+      file.close();
+    }
+#endif
+
+  }
+
+  if (glob_script_mem.script_mem) {
+    Scripter_save_pvars();
+    free(glob_script_mem.script_mem);
+    glob_script_mem.script_mem=0;
+    glob_script_mem.script_mem_size=0;
+  }
+
+  if (bitRead(Settings.rule_enabled, 0)) {
+    int16_t res=Init_Scripter();
+    if (res) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
+      return;
+    }
+    Run_Scripter(">B",2,0);
+    fast_script=Run_Scripter(">F",-2,0);
+  }
+}
+
+#endif
+
+
+#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+
+
+#define HUE_DEV_MVNUM 5
+#define HUE_DEV_NSIZE 16
+struct HUE_SCRIPT {
+  char name[HUE_DEV_NSIZE];
+  uint8_t type;
+  uint8_t index[HUE_DEV_MVNUM];
+  uint8_t vindex[HUE_DEV_MVNUM];
+} hue_script[32];
+
+
+const char SCRIPT_HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
+  "{\"state\":"
+  "{\"on\":{state},"
+  "{light_status}"
+  "\"alert\":\"none\","
+  "\"effect\":\"none\","
+  "\"reachable\":true}"
+  ",\"type\":\"{type}\","
+  "\"name\":\"{j1\","
+  "\"modelid\":\"{m1}\","
+  "\"uniqueid\":\"{j2\","
+  "\"swversion\":\"5.50.1.19085\"}";
+# 3624 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+const char SCRIPT_HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
+"{\"state\":{"
+"\"presence\":{state},"
+"\"lastupdated\":\"2017-10-01T12:37:30\""
+"},"
+"\"swupdate\":{"
+"\"state\":\"noupdates\","
+"\"lastinstall\": null"
+"},"
+"\"config\":{"
+"\"on\":true,"
+"\"battery\":100,"
+"\"reachable\":true,"
+"\"alert\":\"none\","
+"\"ledindication\":false,"
+"\"usertest\":false,"
+"\"sensitivity\":2,"
+"\"sensitivitymax\":2,"
+"\"pending\":[]"
+"},"
+"\"name\":\"{j1\","
+"\"type\":\"ZLLPresence\","
+"\"modelid\":\"SML001\","
+"\"manufacturername\":\"Philips\","
+"\"swversion\":\"6.1.0.18912\","
+"\"uniqueid\":\"{j2\""
+"}";
+# 3705 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+void Script_HueStatus(String *response, uint16_t hue_devs) {
+
+  if (hue_script[hue_devs].type=='p') {
+    *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2);
+    response->replace("{j1",hue_script[hue_devs].name);
+    response->replace("{j2", GetHueDeviceId(hue_devs));
+    uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
+    response->replace("{state}", (pwr ? "true" : "false"));
+    return;
+  }
+
+  *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON1);
+  uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
+  response->replace("{state}", (pwr ? "true" : "false"));
+  String light_status = "";
+  if (hue_script[hue_devs].index[1]>0) {
+
+    light_status += "\"bri\":";
+    uint32_t bri=glob_script_mem.fvars[hue_script[hue_devs].index[1]-1];
+    if (bri > 254) bri = 254;
+    if (bri < 1) bri = 1;
+    light_status += String(bri);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[2]>0) {
+
+    uint32_t hue=glob_script_mem.fvars[hue_script[hue_devs].index[2]-1];
+
+    light_status += "\"hue\":";
+    light_status += String(hue);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[3]>0) {
+
+    uint32_t sat=glob_script_mem.fvars[hue_script[hue_devs].index[3]-1] ;
+    if (sat > 254) sat = 254;
+    if (sat < 1) sat = 1;
+    light_status += "\"sat\":";
+    light_status += String(sat);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[4]>0) {
+
+    uint32_t ct=glob_script_mem.fvars[hue_script[hue_devs].index[4]-1];
+    light_status += "\"ct\":";
+    light_status += String(ct);
+    light_status += ",";
+  }
+
+  float temp;
+  switch (hue_script[hue_devs].type) {
+    case 'C':
+      response->replace("{type}","Color Ligh");
+      response->replace("{m1","LST001");
+      break;
+    case 'D':
+      response->replace("{type}","Dimmable Light");
+      response->replace("{m1","LWB004");
+      break;
+    case 'T':
+      response->replace("{type}","Color Temperature Light");
+      response->replace("{m1","LTW011");
+      break;
+    case 'E':
+      response->replace("{type}","Extended color light");
+      response->replace("{m1","LCT007");
+      break;
+    case 'S':
+      response->replace("{type}","On/Off light");
+      response->replace("{m1","LCT007");
+      break;
+    default:
+      response->replace("{type}","color light");
+      response->replace("{m1","LST001");
+      break;
+  }
+
+  response->replace("{light_status}", light_status);
+  response->replace("{j1",hue_script[hue_devs].name);
+  response->replace("{j2", GetHueDeviceId(hue_devs));
+
+}
+
+void Script_Check_Hue(String *response) {
+  if (!bitRead(Settings.rule_enabled, 0)) return;
+
+  uint8_t hue_script_found=Run_Scripter(">H",-2,0);
+  if (hue_script_found!=99) return;
+
+  char line[128];
+  char tmp[128];
+  uint8_t hue_devs=0;
+  uint8_t vindex=0;
+  char *cp;
+  char *lp=glob_script_mem.section_ptr+2;
+  while (lp) {
+    SCRIPT_SKIP_SPACES
+    while (*lp==SCRIPT_EOL) {
+     lp++;
+    }
+    if (!*lp || *lp=='#' || *lp=='>') {
+        break;
+    }
+    if (*lp!=';') {
+
+      memcpy(line,lp,sizeof(line));
+      line[sizeof(line)-1]=0;
+      cp=line;
+      for (uint32_t i=0; i<sizeof(line); i++) {
+        if (!*cp || *cp=='\n' || *cp=='\r') {
+          *cp=0;
+          break;
+        }
+        cp++;
+      }
+      Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+
+
+      cp=tmp;
+      cp=strchr(cp,',');
+      if (!cp) break;
+      *cp=0;
+
+      strlcpy(hue_script[hue_devs].name,tmp,HUE_DEV_NSIZE);
+      cp++;
+      while (*cp==' ') cp++;
+
+      hue_script[hue_devs].type=*cp;
+
+      for (vindex=0;vindex<HUE_DEV_MVNUM;vindex++) {
+        hue_script[hue_devs].index[vindex]=0;
+      }
+      vindex=0;
+      while (1) {
+        cp=strchr(cp,',');
+        if (!cp) break;
+
+        cp++;
+        while (*cp==' ') cp++;
+
+        vindex==0xff;
+        if (!strncmp(cp,"on=",3)) {
+          cp+=3;
+          vindex=0;
+        } else if (!strncmp(cp,"bri=",4)) {
+          cp+=4;
+          vindex=1;
+        } else if (!strncmp(cp,"hue=",4)) {
+          cp+=4;
+          vindex=2;
+        } else if (!strncmp(cp,"sat=",4)) {
+          cp+=4;
+          vindex=3;
+        } else if (!strncmp(cp,"ct=",3)) {
+          cp+=3;
+          vindex=4;
+        } else {
+
+          vindex==0xff;
+          break;
+        }
+        if (vindex!=0xff) {
+          struct T_INDEX ind;
+          uint8_t vtype;
+          char vname[16];
+          for (uint32_t cnt=0;cnt<sizeof(vname)-1;cnt++) {
+            if (*cp==',' || *cp==0) {
+              vname[cnt]=0;
+              break;
+            }
+            vname[cnt]=*cp++;
+          }
+          isvar(vname,&vtype,&ind,0,0,0);
+          if (vtype!=VAR_NV) {
+
+            if (vtype==NUM_RES || (vtype&STYPE)==0) {
+              hue_script[hue_devs].vindex[vindex]=ind.index;
+              hue_script[hue_devs].index[vindex]=glob_script_mem.type[ind.index].index+1;
+            } else {
+
+            }
+          }
+        }
+      }
+
+      if (response) {
+        if (devices_present) {
+          *response+=",\"";
+        }
+        else {
+          if (hue_devs>0) *response+=",\"";
+        }
+        *response+=String(EncodeLightId(hue_devs+devices_present+1))+"\":";
+        Script_HueStatus(response,hue_devs);
+      }
+
+      hue_devs++;
+    }
+    if (*lp==SCRIPT_EOL) {
+      lp++;
+    } else {
+      lp = strchr(lp, SCRIPT_EOL);
+      if (!lp) break;
+      lp++;
+    }
+  }
+#if 0
+  if (response) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Hue: %d"), hue_devs);
+    toLog(">>>>");
+    toLog(response->c_str());
+    toLog(response->c_str()+LOGSZ);
+  }
+#endif
+}
+
+const char sHUE_LIGHT_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+
+const char sHUE_SENSOR_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+
+const char sHUE_ERROR_JSON[] PROGMEM =
+  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
+
+
+
+void Script_Handle_Hue(String *path) {
+  String response;
+  int code = 200;
+  uint16_t tmp = 0;
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint16_t ct = 0;
+  bool resp = false;
+
+  uint8_t device = DecodeLightId(atoi(path->c_str()));
+  uint8_t index = device-devices_present-1;
+
+  if (WebServer->args()) {
+    response = "[";
+
+    StaticJsonBuffer<400> jsonBuffer;
+    JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
+    if (hue_json.containsKey("on")) {
+
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "on");
+
+      bool on = hue_json["on"];
+      switch(on)
+      {
+        case false : glob_script_mem.fvars[hue_script[index].index[0]-1]=0;
+                     response.replace("{re", "false");
+                     break;
+        case true : glob_script_mem.fvars[hue_script[index].index[0]-1]=1;
+                     response.replace("{re", "true");
+                     break;
+      }
+      glob_script_mem.type[hue_script[index].vindex[0]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("bri")) {
+      tmp = hue_json["bri"];
+      bri=tmp;
+      if (254 <= bri) { bri = 255; }
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "bri");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[1]-1]=bri;
+      glob_script_mem.type[hue_script[index].vindex[1]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("xy")) {
+      float x, y;
+      x = hue_json["xy"][0];
+      y = hue_json["xy"][1];
+      const String &x_str = hue_json["xy"][0];
+      const String &y_str = hue_json["xy"][1];
+      uint8_t rr,gg,bb;
+      LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
+      LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(device));
+      response.replace("{cm", "xy");
+      response.replace("{re", "[" + x_str + "," + y_str + "]");
+      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
+      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
+      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
+      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
+      resp = true;
+    }
+
+    if (hue_json.containsKey("hue")) {
+      tmp = hue_json["hue"];
+
+
+      hue=tmp;
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "hue");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
+      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("sat")) {
+      tmp = hue_json["sat"];
+      sat=tmp;
+      if (254 <= sat) { sat = 255; }
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "sat");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
+      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("ct")) {
+      ct = hue_json["ct"];
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "ct");
+      response.replace("{re", String(ct));
+      glob_script_mem.fvars[hue_script[index].index[4]-1]=ct;
+      glob_script_mem.type[hue_script[index].vindex[4]].bits.changed=1;
+      resp = true;
+    }
+    response += "]";
+
+  } else {
+    response = FPSTR(sHUE_ERROR_JSON);
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
+  WSSend(code, CT_JSON, response);
+  if (resp) {
+    Run_Scripter(">E",2,0);
+  }
+}
+#endif
+
+
+#ifdef USE_SCRIPT_SUB_COMMAND
+bool Script_SubCmd(void) {
+  if (!bitRead(Settings.rule_enabled, 0)) return false;
+
+  if (tasm_cmd_activ) return false;
+
+  char command[CMDSZ];
+  strlcpy(command,XdrvMailbox.topic,CMDSZ);
+  uint32_t pl=XdrvMailbox.payload;
+  char pld[64];
+  strlcpy(pld,XdrvMailbox.data,sizeof(pld));
+
+  char cmdbuff[128];
+  char *cp=cmdbuff;
+  *cp++='#';
+  strcpy(cp,XdrvMailbox.topic);
+  uint8_t tlen=strlen(XdrvMailbox.topic);
+  cp+=tlen;
+  if (XdrvMailbox.index > 0) {
+    *cp++=XdrvMailbox.index|0x30;
+    tlen++;
+  }
+  if ((XdrvMailbox.payload>0) || (XdrvMailbox.data_len>0)) {
+    *cp++='(';
+    strncpy(cp,XdrvMailbox.data,XdrvMailbox.data_len);
+    cp+=XdrvMailbox.data_len;
+    *cp++=')';
+    *cp=0;
+  }
+
+  uint32_t res=Run_Scripter(cmdbuff,tlen+1,0);
+
+  if (res) return false;
+  else {
+    if (pl>=0) {
+      Response_P(S_JSON_COMMAND_NVALUE, command, pl);
+    } else {
+      Response_P(S_JSON_COMMAND_SVALUE, command, pld);
+    }
+  }
+  return true;
+}
+#endif
+
+void execute_script(char *script) {
+  char *svd_sp=glob_script_mem.scriptptr;
+  strcat(script,"\n#");
+  glob_script_mem.scriptptr=script;
+  Run_Scripter(">",1,0);
+  glob_script_mem.scriptptr=svd_sp;
+}
+#define D_CMND_SCRIPT "Script"
+#define D_CMND_SUBSCRIBE "Subscribe"
+#define D_CMND_UNSUBSCRIBE "Unsubscribe"
+
+enum ScriptCommands { CMND_SCRIPT,CMND_SUBSCRIBE, CMND_UNSUBSCRIBE };
+const char kScriptCommands[] PROGMEM = D_CMND_SCRIPT "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE;
+
+bool ScriptCommand(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t index = XdrvMailbox.index;
+
+  if (tasm_cmd_activ) return false;
+
+  int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kScriptCommands);
+  if (-1 == command_code) {
+    serviced = false;
+  }
+  else if ((CMND_SCRIPT == command_code) && (index > 0)) {
+
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
+      switch (XdrvMailbox.payload) {
+        case 0:
+        case 1:
+          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
+          break;
+#ifdef xSCRIPT_STRIP_COMMENTS
+        case 2:
+          bitWrite(Settings.rule_enabled, 1,0);
+          break;
+        case 3:
+          bitWrite(Settings.rule_enabled, 1,1);
+          break;
+#endif
+      }
+    } else {
+      if ('>' == XdrvMailbox.data[0]) {
+
+        snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\"}"),command,XdrvMailbox.data);
+        if (bitRead(Settings.rule_enabled, 0)) {
+          for (uint8_t count=0; count<XdrvMailbox.data_len; count++) {
+            if (XdrvMailbox.data[count]==';') XdrvMailbox.data[count]='\n';
+          }
+          execute_script(XdrvMailbox.data);
+        }
+      }
+      return serviced;
+    }
+    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Free\":%d}"),command, GetStateText(bitRead(Settings.rule_enabled,0)),glob_script_mem.script_size-strlen(glob_script_mem.script_ram));
+#ifdef SUPPORT_MQTT_EVENT
+  } else if (CMND_SUBSCRIBE == command_code) {
+      String result = ScriptSubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
+      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
+    } else if (CMND_UNSUBSCRIBE == command_code) {
+      String result = ScriptUnsubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
+      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
+#endif
+  }
+  return serviced;
+}
+
+
+#ifdef USE_SCRIPT_FATFS
+
+uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
+  return (year - 1980) << 9 | month << 5 | day;
+}
+uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
+  return hour << 11 | minute << 5 | second >> 1;
+}
+
+void dateTime(uint16_t* date, uint16_t* time) {
+
+  *date = xFAT_DATE(RtcTime.year,RtcTime.month, RtcTime.day_of_month);
+
+  *time = xFAT_TIME(RtcTime.hour,RtcTime.minute,RtcTime.second);
+}
+
+#endif
+
+
+
+#ifdef SUPPORT_MQTT_EVENT
+# 4199 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+bool ScriptMqttData(void)
+{
+  bool serviced = false;
+
+  toLog(XdrvMailbox.data);
+  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
+    return false;
+  }
+  String sTopic = XdrvMailbox.topic;
+  String sData = XdrvMailbox.data;
+
+  MQTT_Subscription event_item;
+
+  for (uint32_t index = 0; index < subscriptions.size(); index++) {
+    event_item = subscriptions.get(index);
+
+
+    if (sTopic.startsWith(event_item.Topic)) {
+
+      serviced = true;
+      String value;
+      String lkey;
+      if (event_item.Key.length() == 0) {
+        value = sData;
+      } else {
+        StaticJsonBuffer<400> jsonBuf;
+        JsonObject& jsonData = jsonBuf.parseObject(sData);
+        String key1 = event_item.Key;
+        String key2;
+        if (!jsonData.success()) break;
+        int dot;
+        if ((dot = key1.indexOf('.')) > 0) {
+          key2 = key1.substring(dot+1);
+          key1 = key1.substring(0, dot);
+          lkey=key2;
+          if (!jsonData[key1][key2].success()) break;
+          value = (const char *)jsonData[key1][key2];
+        } else {
+          if (!jsonData[key1].success()) break;
+          value = (const char *)jsonData[key1];
+          lkey=key1;
+        }
+      }
+      value.trim();
+      char sbuffer[128];
+
+      if (!strncmp(lkey.c_str(),"Epoch",5)) {
+        uint32_t ep=atoi(value.c_str())-(uint32_t)EPOCH_OFFSET;
+        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(),ep);
+      } else {
+        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str());
+      }
+
+      execute_script(sbuffer);
+    }
+  }
+  return serviced;
+}
+# 4274 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+String ScriptSubscribe(const char *data, int data_len)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (data_len > 0) {
+    char parameters[data_len+1];
+    memcpy(parameters, data, data_len);
+    parameters[data_len] = '\0';
+    String event_name, topic, key;
+
+    char * pos = strtok(parameters, ",");
+    if (pos) {
+      event_name = Trim(pos);
+      pos = strtok(nullptr, ",");
+      if (pos) {
+        topic = Trim(pos);
+        pos = strtok(nullptr, ",");
+        if (pos) {
+          key = Trim(pos);
+        }
+      }
+    }
+
+
+    if (event_name.length() > 0 && topic.length() > 0) {
+
+      for (uint32_t index=0; index < subscriptions.size(); index++) {
+        if (subscriptions.get(index).Event.equals(event_name)) {
+
+          String stopic = subscriptions.get(index).Topic + "/#";
+          MqttUnsubscribe(stopic.c_str());
+          subscriptions.remove(index);
+          break;
+        }
+      }
+
+      if (!topic.endsWith("#")) {
+        if (topic.endsWith("/")) {
+          topic.concat("#");
+        } else {
+          topic.concat("/#");
+        }
+      }
+
+
+      subscription_item.Event = event_name;
+      subscription_item.Topic = topic.substring(0, topic.length() - 2);
+      subscription_item.Key = key;
+      subscriptions.add(subscription_item);
+
+      MqttSubscribe(topic.c_str());
+      events.concat(event_name + "," + topic
+        + (key.length()>0 ? "," : "")
+        + key);
+    } else {
+      events = D_JSON_WRONG_PARAMETERS;
+    }
+  } else {
+
+    for (uint32_t index=0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      events.concat(subscription_item.Event + "," + subscription_item.Topic
+        + (subscription_item.Key.length()>0 ? "," : "")
+        + subscription_item.Key + "; ");
+    }
+  }
+  return events;
+}
+# 4354 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
+String ScriptUnsubscribe(const char * data, int data_len)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (data_len > 0) {
+    for (uint32_t index = 0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      if (subscription_item.Event.equalsIgnoreCase(data)) {
+        String stopic = subscription_item.Topic + "/#";
+        MqttUnsubscribe(stopic.c_str());
+        events = subscription_item.Event;
+        subscriptions.remove(index);
+        break;
+      }
+    }
+  } else {
+
+    String stopic;
+    while (subscriptions.size() > 0) {
+      events.concat(subscriptions.get(0).Event + "; ");
+      stopic = subscriptions.get(0).Topic + "/#";
+      MqttUnsubscribe(stopic.c_str());
+      subscriptions.remove(0);
+    }
+  }
+  return events;
+}
+#endif
+
+
+
+#ifdef USE_SCRIPT_WEB_DISPLAY
+
+void Script_Check_HTML_Setvars(void) {
+
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("sv")) {
+    String stmp = WebServer->arg("sv");
+    char cmdbuf[64];
+    memset(cmdbuf,0,sizeof(cmdbuf));
+    char *cp=cmdbuf;
+    *cp++='>';
+    strncpy(cp,stmp.c_str(),sizeof(cmdbuf)-1);
+    char *cp1=strchr(cp,'_');
+    if (!cp1) return;
+    *cp1=0;
+    char vname[32];
+    strncpy(vname,cp,sizeof(vname));
+    *cp1='=';
+    cp1++;
+
+    struct T_INDEX ind;
+    uint8_t vtype;
+    isvar(vname,&vtype,&ind,0,0,0);
+    if (vtype!=NUM_RES && vtype&STYPE) {
+
+      uint8_t tlen=strlen(cp1);
+      memmove(cp1+1,cp1,tlen);
+      *cp1='\"';
+      *(cp1+tlen+1)='\"';
+    }
+
+
+    execute_script(cmdbuf);
+    Run_Scripter(">E",2,0);
+  }
+}
+
+
+const char SCRIPT_MSG_BUTTONa[] PROGMEM =
+  "<button type='submit' style=\"width:%d%%\" onclick='seva(%d,\"%s\")'>%s</button>";
+
+const char SCRIPT_MSG_BUTTONa_TBL[] PROGMEM =
+  "<td style=\"width:%d%%\"><button type='submit' onclick='seva(%d,\"%s\")'>%s</button></td>";
+
+const char SCRIPT_MSG_BUTTONb[] PROGMEM =
+  "<img width=\"%d%%\"></img>";
+
+const char SCRIPT_MSG_BUT_START[] PROGMEM =
+  "<div>";
+const char SCRIPT_MSG_BUT_START_TBL[] PROGMEM =
+  "<table style='width:100%%'><tr>";
+
+const char SCRIPT_MSG_BUT_STOP[] PROGMEM =
+  "</div>";
+const char SCRIPT_MSG_BUT_STOP_TBL[] PROGMEM =
+  "</tr></table>";
+
+const char SCRIPT_MSG_SLIDER[] PROGMEM =
+  "<div><span class='p'>%s</span><center><b>%s</b><span class='q'>%s</span></div>"
+  "<div><input type='range' min='%d' max='%d' value='%d' onchange='seva(value,\"%s\")'></div>";
+
+const char SCRIPT_MSG_CHKBOX[] PROGMEM =
+  "<div><center><label><b>%s</b><input type='checkbox' %s onchange='seva(%d,\"%s\")'></label></div>";
+
+const char SCRIPT_MSG_TEXTINP[] PROGMEM =
+  "<div><center><label><b>%s</b><input type='text'  value='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
+
+const char SCRIPT_MSG_NUMINP[] PROGMEM =
+  "<div><center><label><b>%s</b><input  min='%s' max='%s' step='%s' value='%s' type='number' style='width:200px' onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
+
+
+void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen) {
+uint32_t cnt;
+  for (cnt=0;cnt<blen-1;cnt++) {
+    if (*sp==' ' || *sp==')') {
+      break;
+    }
+    nbuf[cnt]=*sp++;
+  }
+  nbuf[cnt]=0;
+}
+
+void ScriptWebShow(void) {
+  uint8_t web_script=Run_Scripter(">W",-2,0);
+  if (web_script==99) {
+    char line[128];
+    char tmp[128];
+    uint8_t optflg=0;
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        char *lin=line;
+        if (*lin=='@') {
+          lin++;
+          optflg=1;
+        } else {
+          optflg=0;
+        }
+
+        if (!strncmp(lin,"sl(",3)) {
+
+          char *lp=lin;
+          float min;
+          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
+          SCRIPT_SKIP_SPACES
+
+          float max;
+          lp=GetNumericResult(lp,OPER_EQU,&max,0);
+          SCRIPT_SKIP_SPACES
+          float val;
+          char *slp=lp;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char left[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,left,0);
+          SCRIPT_SKIP_SPACES
+          char mid[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,mid,0);
+          SCRIPT_SKIP_SPACES
+          char right[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,right,0);
+          SCRIPT_SKIP_SPACES
+
+          WSContentSend_PD(SCRIPT_MSG_SLIDER,left,mid,right,(uint32_t)min,(uint32_t)max,(uint32_t)val,vname);
+
+
+        } else if (!strncmp(lin,"ck(",3)) {
+          char *lp=lin+3;
+          char *slp=lp;
+          float val;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+          const char *cp;
+          uint8_t uval;
+          if (val>0) {
+            cp="checked='checked'";
+            uval=0;
+          } else {
+            cp="";
+            uval=1;
+          }
+          WSContentSend_PD(SCRIPT_MSG_CHKBOX,label,(char*)cp,uval,vname);
+
+        } else if (!strncmp(lin,"bu(",3)) {
+          char *lp=lin+3;
+          uint8_t bcnt=0;
+          char *found=lin;
+          while (bcnt<4) {
+            found=strstr(found,"bu(");
+            if (!found) break;
+            found+=3;
+            bcnt++;
+          }
+          uint8_t proz=100/bcnt;
+          if (!optflg && bcnt>1) proz-=2;
+          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_START_TBL);
+          else WSContentSend_PD(SCRIPT_MSG_BUT_START);
+          for (uint32_t cnt=0;cnt<bcnt;cnt++) {
+            float val;
+            char *slp=lp;
+            lp=GetNumericResult(lp,OPER_EQU,&val,0);
+            SCRIPT_SKIP_SPACES
+
+            char vname[16];
+            ScriptGetVarname(vname,slp,sizeof(vname));
+
+            SCRIPT_SKIP_SPACES
+            char ontxt[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,ontxt,0);
+            SCRIPT_SKIP_SPACES
+            char offtxt[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,offtxt,0);
+
+            char *cp;
+            uint8_t uval;
+            if (val>0) {
+              cp=ontxt;
+              uval=0;
+            } else {
+              cp=offtxt;
+              uval=1;
+            }
+            if (bcnt>1 && cnt==bcnt-1) {
+              if (!optflg) proz+=2;
+            }
+            if (!optflg) {
+              WSContentSend_PD(SCRIPT_MSG_BUTTONa,proz,uval,vname,cp);
+            } else {
+              WSContentSend_PD(SCRIPT_MSG_BUTTONa_TBL,proz,uval,vname,cp);
+            }
+            if (bcnt>1 && cnt<bcnt-1) {
+              if (!optflg) WSContentSend_PD(SCRIPT_MSG_BUTTONb,2);
+            }
+            lp+=4;
+          }
+          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_STOP_TBL);
+          else WSContentSend_PD(SCRIPT_MSG_BUT_STOP);
+        } else if (!strncmp(lin,"tx(",3)) {
+          char *lp=lin+3;
+          char *slp=lp;
+          char str[SCRIPT_MAXSSIZE];
+          lp=ForceStringVar(lp,str);
+          SCRIPT_SKIP_SPACES
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          WSContentSend_PD(SCRIPT_MSG_TEXTINP,label,str,vname);
+
+        } else if (!strncmp(lin,"nm(",3)) {
+          char *lp=lin;
+          float min;
+          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
+          SCRIPT_SKIP_SPACES
+          float max;
+          lp=GetNumericResult(lp,OPER_EQU,&max,0);
+          SCRIPT_SKIP_SPACES
+          float step;
+          lp=GetNumericResult(lp,OPER_EQU,&step,0);
+          SCRIPT_SKIP_SPACES
+          float val;
+          char *slp=lp;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+
+          char vstr[16],minstr[16],maxstr[16],stepstr[16];
+          dtostrfd(val,4,vstr);
+          dtostrfd(min,4,minstr);
+          dtostrfd(max,4,maxstr);
+          dtostrfd(step,4,stepstr);
+          WSContentSend_PD(SCRIPT_MSG_NUMINP,label,minstr,maxstr,stepstr,vstr,vname);
+
+        } else {
+          Replace_Cmd_Vars(lin,tmp,sizeof(tmp));
+          if (optflg) {
+            WSContentSend_PD(PSTR("<div>%s</div>"),tmp);
+          } else {
+            WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
+          }
+        }
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  }
+}
+#endif
+
+
+#ifdef USE_SENDMAIL
+void script_send_email_body(BearSSL::WiFiClientSecure_light *client) {
+uint8_t msect=Run_Scripter(">m",-2,0);
+  if (msect==99) {
+    char line[128];
+    char tmp[128];
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+        client->println(tmp);
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  } else {
+    client->println("*");
+  }
+}
+#endif
+
+#ifdef USE_SCRIPT_JSON_EXPORT
+void ScriptJsonAppend(void) {
+  uint8_t web_script=Run_Scripter(">J",-2,0);
+  if (web_script==99) {
+    char line[128];
+    char tmp[128];
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+        ResponseAppend_P(PSTR("%s"),tmp);
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  }
+}
+#endif
+
+
+
+
+
+
+bool Xdrv10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_PRE_INIT:
+
+      glob_script_mem.script_ram=Settings.rules[0];
+      glob_script_mem.script_size=MAX_SCRIPT_SIZE;
+      glob_script_mem.flags=0;
+      glob_script_mem.script_pram=(uint8_t*)Settings.script_pram[0];
+      glob_script_mem.script_pram_size=PMEM_SIZE;
+
+#ifdef USE_BUTTON_EVENT
+      for (uint32_t cnt=0;cnt<MAX_KEYS;cnt++) {
+        script_button[cnt]=-1;
+      }
+#endif
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+   if (I2cEnabled(XI2C_37)) {
+     if (I2cSetDevice(EEPROM_ADDRESS)) {
+
+          char *script;
+          script=(char*)calloc(EEP_SCRIPT_SIZE+4,1);
+          if (!script) break;
+          glob_script_mem.script_ram=script;
+          glob_script_mem.script_size=EEP_SCRIPT_SIZE;
+          EEP_READ(0,EEP_SCRIPT_SIZE,script);
+          if (*script==0xff) {
+            memset(script,EEP_SCRIPT_SIZE,0);
+          }
+          script[EEP_SCRIPT_SIZE-1]=0;
+
+          glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
+          glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
+
+          glob_script_mem.flags=1;
+          I2cSetActiveFound(EEPROM_ADDRESS, "EEPROM");
+        }
+      }
+#endif
+#endif
+
+#ifdef USE_SCRIPT_FATFS
+      if (SD.begin(USE_SCRIPT_FATFS)) {
+        glob_script_mem.script_sd_found=1;
+        char *script;
+        script=(char*)calloc(FAT_SCRIPT_SIZE+4,1);
+        if (!script) break;
+        glob_script_mem.script_ram=script;
+        glob_script_mem.script_size=FAT_SCRIPT_SIZE;
+        if (SD.exists(FAT_SCRIPT_NAME)) {
+          File file=SD.open(FAT_SCRIPT_NAME,FILE_READ);
+          file.read((uint8_t*)script,FAT_SCRIPT_SIZE);
+          file.close();
+        }
+        script[FAT_SCRIPT_SIZE-1]=0;
+
+        glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
+        glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
+
+        glob_script_mem.flags=1;
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+
+        SdFile::dateTimeCallback(dateTime);
+#endif
+
+      } else {
+        glob_script_mem.script_sd_found=0;
+      }
+#endif
+
+
+      { uint32_t ptr=(uint32_t)glob_script_mem.script_pram;
+      ptr&=0xfffffffc;
+      ptr+=4;
+      glob_script_mem.script_pram=(uint8_t*)ptr;
+      glob_script_mem.script_pram_size-=4;
+      }
+
+      if (bitRead(Settings.rule_enabled, 0)) Init_Scripter();
+      break;
+    case FUNC_INIT:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        Run_Scripter(">B",2,0);
+        fast_script=Run_Scripter(">F",-2,0);
+#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+        Script_Check_Hue(0);
+#endif
+      }
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      ScripterEvery100ms();
+      break;
+    case FUNC_EVERY_SECOND:
+      ScriptEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = ScriptCommand();
+      break;
+    case FUNC_SET_POWER:
+#ifdef SCRIPT_POWER_SECTION
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">P",2,0);
+#else
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,0);
+#endif
+      break;
+    case FUNC_RULES_PROCESS:
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,mqtt_data);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_ADD_BUTTON:
+      WSContentSend_P(HTTP_BTN_MENU_RULES);
+      break;
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/" WEB_HANDLE_SCRIPT, HandleScriptConfiguration);
+      WebServer->on("/ta",HTTP_POST, HandleScriptTextareaConfiguration);
+
+#ifdef USE_SCRIPT_FATFS
+      WebServer->on("/u3", HTTP_POST,[]() { WebServer->sendHeader("Location","/u3");WebServer->send(303);},script_upload);
+      WebServer->on("/u3", HTTP_GET,ScriptFileUploadSuccess);
+      WebServer->on("/upl", HTTP_GET,Script_FileUploadConfiguration);
+#endif
+      break;
+#endif
+    case FUNC_SAVE_BEFORE_RESTART:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        Run_Scripter(">R",2,0);
+        Scripter_save_pvars();
+      }
+      break;
+#ifdef SUPPORT_MQTT_EVENT
+    case FUNC_MQTT_DATA:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        result = ScriptMqttData();
+      }
+      break;
+#endif
+#ifdef USE_SCRIPT_WEB_DISPLAY
+    case FUNC_WEB_SENSOR:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        ScriptWebShow();
+      }
+      break;
+#endif
+
+#ifdef USE_SCRIPT_JSON_EXPORT
+    case FUNC_JSON_APPEND:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        ScriptJsonAppend();
+      }
+      break;
+#endif
+
+#ifdef USE_BUTTON_EVENT
+    case FUNC_BUTTON_PRESSED:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        if ((script_button[XdrvMailbox.index]&1)!=(XdrvMailbox.payload&1)) {
+          script_button[XdrvMailbox.index]=XdrvMailbox.payload;
+          Run_Scripter(">b",2,0);
+        }
+      }
+      break;
+#endif
+
+  }
+  return result;
+}
+
+
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
+#ifdef USE_KNX
+# 51 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
+#define XDRV_11 11
+
+#include <esp-knx-ip.h>
+
+address_t KNX_physs_addr;
+address_t KNX_addr;
+
+#define KNX_Empty 255
+
+#define TOGGLE_INHIBIT_TIME 15
+
+float last_temp;
+float last_hum;
+uint8_t toggle_inhibit;
+
+typedef struct __device_parameters
+{
+  uint8_t type;
+
+
+
+
+  bool show;
+
+  bool last_state;
+
+  callback_id_t CB_id;
+
+
+
+
+
+} device_parameters_t;
+
+
+device_parameters_t device_param[] = {
+  { 1, false, false, KNX_Empty },
+  { 2, false, false, KNX_Empty },
+  { 3, false, false, KNX_Empty },
+  { 4, false, false, KNX_Empty },
+  { 5, false, false, KNX_Empty },
+  { 6, false, false, KNX_Empty },
+  { 7, false, false, KNX_Empty },
+  { 8, false, false, KNX_Empty },
+  { 9, false, false, KNX_Empty },
+  { 10, false, false, KNX_Empty },
+  { 11, false, false, KNX_Empty },
+  { 12, false, false, KNX_Empty },
+  { 13, false, false, KNX_Empty },
+  { 14, false, false, KNX_Empty },
+  { 15, false, false, KNX_Empty },
+  { 16, false, false, KNX_Empty },
+  { KNX_TEMPERATURE, false, false, KNX_Empty },
+  { KNX_HUMIDITY , false, false, KNX_Empty },
+  { KNX_ENERGY_VOLTAGE , false, false, KNX_Empty },
+  { KNX_ENERGY_CURRENT , false, false, KNX_Empty },
+  { KNX_ENERGY_POWER , false, false, KNX_Empty },
+  { KNX_ENERGY_POWERFACTOR , false, false, KNX_Empty },
+  { KNX_ENERGY_DAILY , false, false, KNX_Empty },
+  { KNX_ENERGY_START , false, false, KNX_Empty },
+  { KNX_ENERGY_TOTAL , false, false, KNX_Empty },
+  { KNX_SLOT1 , false, false, KNX_Empty },
+  { KNX_SLOT2 , false, false, KNX_Empty },
+  { KNX_SLOT3 , false, false, KNX_Empty },
+  { KNX_SLOT4 , false, false, KNX_Empty },
+  { KNX_SLOT5 , false, false, KNX_Empty },
+  { KNX_Empty, false, false, KNX_Empty}
+};
+
+
+const char * device_param_ga[] = {
+  D_TIMER_OUTPUT " 1",
+  D_TIMER_OUTPUT " 2",
+  D_TIMER_OUTPUT " 3",
+  D_TIMER_OUTPUT " 4",
+  D_TIMER_OUTPUT " 5",
+  D_TIMER_OUTPUT " 6",
+  D_TIMER_OUTPUT " 7",
+  D_TIMER_OUTPUT " 8",
+  D_SENSOR_BUTTON " 1",
+  D_SENSOR_BUTTON " 2",
+  D_SENSOR_BUTTON " 3",
+  D_SENSOR_BUTTON " 4",
+  D_SENSOR_BUTTON " 5",
+  D_SENSOR_BUTTON " 6",
+  D_SENSOR_BUTTON " 7",
+  D_SENSOR_BUTTON " 8",
+  D_TEMPERATURE ,
+  D_HUMIDITY ,
+  D_VOLTAGE ,
+  D_CURRENT ,
+  D_POWERUSAGE ,
+  D_POWER_FACTOR ,
+  D_ENERGY_TODAY ,
+  D_ENERGY_YESTERDAY ,
+  D_ENERGY_TOTAL ,
+  D_KNX_TX_SLOT " 1",
+  D_KNX_TX_SLOT " 2",
+  D_KNX_TX_SLOT " 3",
+  D_KNX_TX_SLOT " 4",
+  D_KNX_TX_SLOT " 5",
+  nullptr
+};
+
+
+const char *device_param_cb[] = {
+  D_TIMER_OUTPUT " 1",
+  D_TIMER_OUTPUT " 2",
+  D_TIMER_OUTPUT " 3",
+  D_TIMER_OUTPUT " 4",
+  D_TIMER_OUTPUT " 5",
+  D_TIMER_OUTPUT " 6",
+  D_TIMER_OUTPUT " 7",
+  D_TIMER_OUTPUT " 8",
+  D_TIMER_OUTPUT " 1 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 2 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 3 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 4 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 5 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 6 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 7 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 8 " D_BUTTON_TOGGLE,
+  D_REPLY " " D_TEMPERATURE,
+  D_REPLY " " D_HUMIDITY,
+  D_REPLY " " D_VOLTAGE ,
+  D_REPLY " " D_CURRENT ,
+  D_REPLY " " D_POWERUSAGE ,
+  D_REPLY " " D_POWER_FACTOR ,
+  D_REPLY " " D_ENERGY_TODAY ,
+  D_REPLY " " D_ENERGY_YESTERDAY ,
+  D_REPLY " " D_ENERGY_TOTAL ,
+  D_KNX_RX_SLOT " 1",
+  D_KNX_RX_SLOT " 2",
+  D_KNX_RX_SLOT " 3",
+  D_KNX_RX_SLOT " 4",
+  D_KNX_RX_SLOT " 5",
+  nullptr
+};
+
+
+#define D_PRFX_KNX "Knx"
+#define D_CMND_KNXTXCMND "Tx_Cmnd"
+#define D_CMND_KNXTXVAL "Tx_Val"
+#define D_CMND_KNX_ENABLED "_Enabled"
+#define D_CMND_KNX_ENHANCED "_Enhanced"
+#define D_CMND_KNX_PA "_PA"
+#define D_CMND_KNX_GA "_GA"
+#define D_CMND_KNX_CB "_CB"
+
+const char kKnxCommands[] PROGMEM = D_PRFX_KNX "|"
+  D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB ;
+
+void (* const KnxCommand[])(void) PROGMEM = {
+  &CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb };
+
+uint8_t KNX_GA_Search( uint8_t param, uint8_t start = 0 )
+{
+  for (uint32_t i = start; i < Settings.knx_GA_registered; ++i)
+  {
+    if ( Settings.knx_GA_param[i] == param )
+    {
+      if ( Settings.knx_GA_addr[i] != 0 )
+      {
+         if ( i >= start ) { return i; }
+      }
+    }
+  }
+  return KNX_Empty;
+}
+
+
+uint8_t KNX_CB_Search( uint8_t param, uint8_t start = 0 )
+{
+  for (uint32_t i = start; i < Settings.knx_CB_registered; ++i)
+  {
+    if ( Settings.knx_CB_param[i] == param )
+    {
+      if ( Settings.knx_CB_addr[i] != 0 )
+      {
+         if ( i >= start ) { return i; }
+      }
+    }
+  }
+  return KNX_Empty;
+}
+
+
+void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF )
+{
+
+  if ( Settings.knx_GA_registered >= MAX_KNX_GA ) { return; }
+  if ( GA_FNUM == 0 && GA_AREA == 0 && GA_FDEF == 0 ) { return; }
+
+
+  Settings.knx_GA_param[Settings.knx_GA_registered] = GAop;
+  KNX_addr.ga.area = GA_FNUM;
+  KNX_addr.ga.line = GA_AREA;
+  KNX_addr.ga.member = GA_FDEF;
+  Settings.knx_GA_addr[Settings.knx_GA_registered] = KNX_addr.value;
+
+  Settings.knx_GA_registered++;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " GA #%d: %s " D_TO " %d/%d/%d"),
+   Settings.knx_GA_registered,
+   device_param_ga[GAop-1],
+   GA_FNUM, GA_AREA, GA_FDEF );
+}
+
+
+void KNX_DEL_GA( uint8_t GAnum )
+{
+
+  uint8_t dest_offset = 0;
+  uint8_t src_offset = 0;
+  uint8_t len = 0;
+
+
+  Settings.knx_GA_param[GAnum-1] = 0;
+
+  if (GAnum == 1)
+  {
+
+    src_offset = 1;
+
+
+
+    len = (Settings.knx_GA_registered - 1);
+  }
+  else if (GAnum == Settings.knx_GA_registered)
+  {
+
+  }
+  else
+  {
+
+
+
+
+    dest_offset = GAnum -1 ;
+    src_offset = dest_offset + 1;
+    len = (Settings.knx_GA_registered - GAnum);
+  }
+
+  if (len > 0)
+  {
+    memmove(Settings.knx_GA_param + dest_offset, Settings.knx_GA_param + src_offset, len * sizeof(uint8_t));
+    memmove(Settings.knx_GA_addr + dest_offset, Settings.knx_GA_addr + src_offset, len * sizeof(uint16_t));
+  }
+
+  Settings.knx_GA_registered--;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " GA #%d"),
+    GAnum );
+}
+
+
+void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF )
+{
+
+  if ( Settings.knx_CB_registered >= MAX_KNX_CB ) { return; }
+  if ( CB_FNUM == 0 && CB_AREA == 0 && CB_FDEF == 0 ) { return; }
+
+
+  if ( device_param[CBop-1].CB_id == KNX_Empty )
+  {
+
+    device_param[CBop-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[CBop-1]);
+
+
+
+
+  }
+
+  Settings.knx_CB_param[Settings.knx_CB_registered] = CBop;
+  KNX_addr.ga.area = CB_FNUM;
+  KNX_addr.ga.line = CB_AREA;
+  KNX_addr.ga.member = CB_FDEF;
+  Settings.knx_CB_addr[Settings.knx_CB_registered] = KNX_addr.value;
+
+  knx.callback_assign( device_param[CBop-1].CB_id, KNX_addr );
+
+  Settings.knx_CB_registered++;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " CB #%d: %d/%d/%d " D_TO " %s"),
+   Settings.knx_CB_registered,
+   CB_FNUM, CB_AREA, CB_FDEF,
+   device_param_cb[CBop-1] );
+}
+
+
+void KNX_DEL_CB( uint8_t CBnum )
+{
+  uint8_t oldparam = Settings.knx_CB_param[CBnum-1];
+  uint8_t dest_offset = 0;
+  uint8_t src_offset = 0;
+  uint8_t len = 0;
+
+
+  knx.callback_unassign(CBnum-1);
+  Settings.knx_CB_param[CBnum-1] = 0;
+
+  if (CBnum == 1)
+  {
+
+    src_offset = 1;
+
+
+
+    len = (Settings.knx_CB_registered - 1);
+  }
+  else if (CBnum == Settings.knx_CB_registered)
+  {
+
+  }
+  else
+  {
+
+
+
+
+    dest_offset = CBnum -1 ;
+    src_offset = dest_offset + 1;
+    len = (Settings.knx_CB_registered - CBnum);
+  }
+
+  if (len > 0)
+  {
+    memmove(Settings.knx_CB_param + dest_offset, Settings.knx_CB_param + src_offset, len * sizeof(uint8_t));
+    memmove(Settings.knx_CB_addr + dest_offset, Settings.knx_CB_addr + src_offset, len * sizeof(uint16_t));
+  }
+
+  Settings.knx_CB_registered--;
+
+
+  if ( KNX_CB_Search( oldparam ) == KNX_Empty ) {
+    knx.callback_deregister( device_param[oldparam-1].CB_id );
+    device_param[oldparam-1].CB_id = KNX_Empty;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " CB #%d"), CBnum );
+}
+
+
+bool KNX_CONFIG_NOT_MATCH(void)
+{
+
+  for (uint32_t i = 0; i < KNX_MAX_device_param; ++i)
+  {
+    if ( !device_param[i].show ) {
+
+
+
+      if ( KNX_GA_Search(i+1) != KNX_Empty ) { return true; }
+
+      if ( i < 8 )
+      {
+        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
+        if ( KNX_CB_Search(i+9) != KNX_Empty ) { return true; }
+      }
+
+      if ( i > 15 )
+      {
+        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
+      }
+    }
+  }
+
+
+  for (uint32_t i = 0; i < Settings.knx_GA_registered; ++i)
+  {
+    if ( Settings.knx_GA_param[i] != 0 )
+    {
+      if ( Settings.knx_GA_addr[i] == 0 )
+      {
+         return true;
+      }
+    }
+  }
+  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
+  {
+    if ( Settings.knx_CB_param[i] != 0 )
+    {
+      if ( Settings.knx_CB_addr[i] == 0 )
+      {
+         return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+
+void KNXStart(void)
+{
+  knx.start(nullptr);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_START));
+}
+
+
+void KNX_INIT(void)
+{
+
+  if (Settings.knx_GA_registered > MAX_KNX_GA) { Settings.knx_GA_registered = MAX_KNX_GA; }
+  if (Settings.knx_CB_registered > MAX_KNX_CB) { Settings.knx_CB_registered = MAX_KNX_CB; }
+
+
+  KNX_physs_addr.value = Settings.knx_physsical_addr;
+  knx.physical_address_set( KNX_physs_addr );
+# 472 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
+  for (uint32_t i = 0; i < devices_present; ++i)
+  {
+    device_param[i].show = true;
+  }
+  for (uint32_t i = GPIO_SWT1; i < GPIO_SWT4 + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1 + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_KEY1; i < GPIO_KEY4 + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1 + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_SWT1_NP; i < GPIO_SWT4_NP + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1_NP + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_KEY1_NP; i < GPIO_KEY4_NP + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1_NP + 8].show = true; }
+  }
+  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+#ifdef USE_DS18x20
+  if (GetUsedInModule(GPIO_DSB, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+#endif
+  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+
+#if defined(USE_ENERGY_SENSOR)
+
+  if ( energy_flg != ENERGY_NONE ) {
+    device_param[KNX_ENERGY_POWER-1].show = true;
+    device_param[KNX_ENERGY_DAILY-1].show = true;
+    device_param[KNX_ENERGY_START-1].show = true;
+    device_param[KNX_ENERGY_TOTAL-1].show = true;
+    device_param[KNX_ENERGY_VOLTAGE-1].show = true;
+    device_param[KNX_ENERGY_CURRENT-1].show = true;
+    device_param[KNX_ENERGY_POWERFACTOR-1].show = true;
+  }
+#endif
+
+#ifdef USE_RULES
+  device_param[KNX_SLOT1-1].show = true;
+  device_param[KNX_SLOT2-1].show = true;
+  device_param[KNX_SLOT3-1].show = true;
+  device_param[KNX_SLOT4-1].show = true;
+  device_param[KNX_SLOT5-1].show = true;
+#endif
+
+
+  if (KNX_CONFIG_NOT_MATCH()) {
+    Settings.knx_GA_registered = 0;
+    Settings.knx_CB_registered = 0;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " " D_KNX_PARAMETERS));
+  }
+
+
+
+
+  uint8_t j;
+  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
+  {
+    j = Settings.knx_CB_param[i];
+    if ( j > 0 )
+    {
+      device_param[j-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[j-1]);
+
+
+
+      KNX_addr.value = Settings.knx_CB_addr[i];
+      knx.callback_assign( device_param[j-1].CB_id, KNX_addr );
+    }
+  }
+}
+
+
+void KNX_CB_Action(message_t const &msg, void *arg)
+{
+  device_parameters_t *chan = (device_parameters_t *)arg;
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  char tempchar[33];
+
+  if (msg.data_len == 1) {
+
+    tempchar[0] = msg.data[0];
+    tempchar[1] = '\0';
+  } else {
+
+    float tempvar = knx.data_to_2byte_float(msg.data);
+    dtostrfd(tempvar,2,tempchar);
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX D_RECEIVED_FROM " %d.%d.%d " D_COMMAND " %s: %s " D_TO " %s"),
+   msg.received_on.ga.area, msg.received_on.ga.line, msg.received_on.ga.member,
+   (msg.ct == KNX_CT_WRITE) ? D_KNX_COMMAND_WRITE : (msg.ct == KNX_CT_READ) ? D_KNX_COMMAND_READ : D_KNX_COMMAND_OTHER,
+   tempchar,
+   device_param_cb[(chan->type)-1]);
+
+  switch (msg.ct)
+  {
+    case KNX_CT_WRITE:
+      if (chan->type < 9)
+      {
+        ExecuteCommandPower(chan->type, msg.data[0], SRC_KNX);
+      }
+      else if (chan->type < 17)
+      {
+        if (!toggle_inhibit) {
+          ExecuteCommandPower((chan->type) -8, POWER_TOGGLE, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#ifdef USE_RULES
+      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
+      {
+        if (!toggle_inhibit) {
+          char command[25];
+          if (msg.data_len == 1) {
+
+            snprintf_P(command, sizeof(command), PSTR("event KNXRX_CMND%d=%d"), ((chan->type) - KNX_SLOT1 + 1 ), msg.data[0]);
+          } else {
+
+            snprintf_P(command, sizeof(command), PSTR("event KNXRX_VAL%d=%s"), ((chan->type) - KNX_SLOT1 + 1 ), tempchar);
+          }
+          ExecuteCommand(command, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#endif
+      break;
+
+    case KNX_CT_READ:
+      if (chan->type < 9)
+      {
+        knx.answer_1bit(msg.received_on, chan->last_state);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_1bit(msg.received_on, chan->last_state);
+          knx.answer_1bit(msg.received_on, chan->last_state);
+        }
+      }
+      else if (chan->type == KNX_TEMPERATURE)
+      {
+        knx.answer_2byte_float(msg.received_on, last_temp);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_2byte_float(msg.received_on, last_temp);
+          knx.answer_2byte_float(msg.received_on, last_temp);
+        }
+      }
+      else if (chan->type == KNX_HUMIDITY)
+      {
+        knx.answer_2byte_float(msg.received_on, last_hum);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_2byte_float(msg.received_on, last_hum);
+          knx.answer_2byte_float(msg.received_on, last_hum);
+        }
+      }
+#ifdef USE_RULES
+      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
+      {
+        if (!toggle_inhibit) {
+          char command[25];
+          snprintf_P(command, sizeof(command), PSTR("event KNXRX_REQ%d"), ((chan->type) - KNX_SLOT1 + 1 ) );
+          ExecuteCommand(command, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#endif
+      break;
+  }
+}
+
+
+void KnxUpdatePowerState(uint8_t device, power_t state)
+{
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  device_param[device -1].last_state = bitRead(state, device -1);
+
+
+  uint8_t i = KNX_GA_Search(device);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+     device_param_ga[device -1], device_param[device -1].last_state,
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(device, i + 1);
+  }
+}
+
+
+void KnxSendButtonPower(void)
+{
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
+  uint32_t device = XdrvMailbox.payload & 0xFF;
+  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
+# 693 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
+  uint8_t i = KNX_GA_Search(device + 8);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_1bit(KNX_addr, !(state == 0));
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_1bit(KNX_addr, !(state == 0));
+      knx.write_1bit(KNX_addr, !(state == 0));
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+     device_param_ga[device + 7], !(state == 0),
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(device + 8, i + 1);
+  }
+
+}
+
+
+void KnxSensor(uint8_t sensor_type, float value)
+{
+  if (sensor_type == KNX_TEMPERATURE)
+  {
+    last_temp = value;
+  } else if (sensor_type == KNX_HUMIDITY)
+  {
+    last_hum = value;
+  }
+
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  uint8_t i = KNX_GA_Search(sensor_type);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_2byte_float(KNX_addr, value);
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_2byte_float(KNX_addr, value);
+      knx.write_2byte_float(KNX_addr, value);
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "),
+     device_param_ga[sensor_type -1],
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(sensor_type, i+1);
+  }
+}
+
+
+
+
+
+
+#ifdef USE_WEBSERVER
+#ifdef USE_KNX_WEB_MENU
+const char S_CONFIGURE_KNX[] PROGMEM = D_CONFIGURE_KNX;
+
+const char HTTP_BTN_MENU_KNX[] PROGMEM =
+  "<p><form action='kn' method='get'><button>" D_CONFIGURE_KNX "</button></form></p>";
+
+const char HTTP_FORM_KNX[] PROGMEM =
+  "<fieldset style='min-width:530px;'>"
+  "<legend style='text-align:left;'><b>&nbsp;" D_KNX_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='kn'>"
+  "<br><center>"
+  "<b>" D_KNX_PHYSICAL_ADDRESS " </b>"
+  "<input style='width:12%%;' type='number' name='area' min='0' max='15' value='%d'> . "
+  "<input style='width:12%%;' type='number' name='line' min='0' max='15' value='%d'> . "
+  "<input style='width:12%%;' type='number' name='member' min='0' max='255' value='%d'>"
+  "<br><br>" D_KNX_PHYSICAL_ADDRESS_NOTE "<br><br>"
+  "<input id='b1' type='checkbox'";
+
+const char HTTP_FORM_KNX1[] PROGMEM =
+  "><b>" D_KNX_ENABLE "</b>&emsp;<input id='b2' type='checkbox'";
+
+const char HTTP_FORM_KNX2[] PROGMEM =
+  "><b>" D_KNX_ENHANCEMENT "</b><br></center><br>"
+
+  "<fieldset><center>"
+  "<b>" D_KNX_GROUP_ADDRESS_TO_WRITE "</b><hr>"
+
+  "<select name='GAop' style='width:25%%;'>";
+
+const char HTTP_FORM_KNX_OPT[] PROGMEM =
+  "<option value='%d'>%s</option>";
+
+const char HTTP_FORM_KNX_GA[] PROGMEM =
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='31' value='0'> / "
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='7' value='0'> / "
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='255' value='0'> ";
+
+const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM =
+  "<button type='submit' onclick='%s()' %s name='btn_add' value='%d' style='width:18%%;'>" D_ADD "</button><br><br>"
+  "<table style='width:80%%; font-size: 14px;'><col width='250'><col width='30'>";
+
+const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM =
+  "<tr><td><b>%s -> %d / %d / %d </b></td>"
+  "<td><button type='submit' name='btn_del_ga' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
+
+const char HTTP_FORM_KNX3[] PROGMEM =
+  "</table></center></fieldset><br>"
+  "<fieldset><form method='post' action='kn'><center>"
+  "<b>" D_KNX_GROUP_ADDRESS_TO_READ "</b><hr>";
+
+const char HTTP_FORM_KNX4[] PROGMEM =
+  "-> <select name='CBop' style='width:25%%;'>";
+
+const char HTTP_FORM_KNX_ADD_TABLE_ROW2[] PROGMEM =
+  "<tr><td><b>%d / %d / %d -> %s</b></td>"
+  "<td><button type='submit' name='btn_del_cb' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
+
+void HandleKNXConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_KNX);
+
+  char tmp[100];
+  String stmp;
+
+  if ( WebServer->hasArg("save") ) {
+    KNX_Save_Settings();
+    HandleConfiguration();
+  }
+  else
+  {
+    if ( WebServer->hasArg("btn_add") ) {
+      if ( WebServer->arg("btn_add") == "1" ) {
+
+        stmp = WebServer->arg("GAop");
+        uint8_t GAop = stmp.toInt();
+        stmp = WebServer->arg("GA_FNUM");
+        uint8_t GA_FNUM = stmp.toInt();
+        stmp = WebServer->arg("GA_AREA");
+        uint8_t GA_AREA = stmp.toInt();
+        stmp = WebServer->arg("GA_FDEF");
+        uint8_t GA_FDEF = stmp.toInt();
+
+        if (GAop) {
+          KNX_ADD_GA( GAop, GA_FNUM, GA_AREA, GA_FDEF );
+        }
+      }
+      else
+      {
+
+        stmp = WebServer->arg("CBop");
+        uint8_t CBop = stmp.toInt();
+        stmp = WebServer->arg("CB_FNUM");
+        uint8_t CB_FNUM = stmp.toInt();
+        stmp = WebServer->arg("CB_AREA");
+        uint8_t CB_AREA = stmp.toInt();
+        stmp = WebServer->arg("CB_FDEF");
+        uint8_t CB_FDEF = stmp.toInt();
+
+        if (CBop) {
+          KNX_ADD_CB( CBop, CB_FNUM, CB_AREA, CB_FDEF );
+        }
+      }
+    }
+    else if ( WebServer->hasArg("btn_del_ga") )
+    {
+
+      stmp = WebServer->arg("btn_del_ga");
+      uint8_t GA_NUM = stmp.toInt();
+
+      KNX_DEL_GA(GA_NUM);
+
+    }
+    else if ( WebServer->hasArg("btn_del_cb") )
+    {
+
+      stmp = WebServer->arg("btn_del_cb");
+      uint8_t CB_NUM = stmp.toInt();
+
+      KNX_DEL_CB(CB_NUM);
+
+    }
+
+    WSContentStart_P(S_CONFIGURE_KNX);
+    WSContentSend_P(
+      PSTR("function GAwarning()"
+          "{"
+            "var GA_FNUM=eb('GA_FNUM');"
+            "var GA_AREA=eb('GA_AREA');"
+            "var GA_FDEF=eb('GA_FDEF');"
+            "if(GA_FNUM!=null&&GA_FNUM.value=='0'&&GA_AREA.value=='0'&&GA_FDEF.value=='0'){"
+              "alert('" D_KNX_WARNING "');"
+            "}"
+          "}"
+          "function CBwarning()"
+          "{"
+            "var CB_FNUM=eb('CB_FNUM');"
+            "var CB_AREA=eb('CB_AREA');"
+            "var CB_FDEF=eb('CB_FDEF');"
+            "if(CB_FNUM!=null&&CB_FNUM.value=='0'&&CB_AREA.value=='0'&&CB_FDEF.value=='0'){"
+              "alert('" D_KNX_WARNING "');"
+            "}"
+          "}"));
+    WSContentSendStyle();
+    KNX_physs_addr.value = Settings.knx_physsical_addr;
+    WSContentSend_P(HTTP_FORM_KNX, KNX_physs_addr.pa.area, KNX_physs_addr.pa.line, KNX_physs_addr.pa.member);
+    if ( Settings.flag.knx_enabled ) { WSContentSend_P(PSTR(" checked")); }
+    WSContentSend_P(HTTP_FORM_KNX1);
+    if ( Settings.flag.knx_enable_enhancement ) { WSContentSend_P(PSTR(" checked")); }
+
+    WSContentSend_P(HTTP_FORM_KNX2);
+    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
+    {
+      if ( device_param[i].show )
+      {
+        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_ga[i]);
+      }
+    }
+    WSContentSend_P(PSTR("</select> -> "));
+    WSContentSend_P(HTTP_FORM_KNX_GA, "GA_FNUM", "GA_AREA", "GA_FDEF");
+    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "GAwarning", (Settings.knx_GA_registered < MAX_KNX_GA) ? "" : "disabled", 1);
+    for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
+    {
+      if ( Settings.knx_GA_param[i] )
+      {
+        KNX_addr.value = Settings.knx_GA_addr[i];
+        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW, device_param_ga[Settings.knx_GA_param[i]-1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, i +1);
+      }
+    }
+
+    WSContentSend_P(HTTP_FORM_KNX3);
+    WSContentSend_P(HTTP_FORM_KNX_GA, "CB_FNUM", "CB_AREA", "CB_FDEF");
+    WSContentSend_P(HTTP_FORM_KNX4);
+
+    uint8_t j;
+    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
+    {
+
+      if ( (i > 8) && (i < 16) ) { j=i-8; } else { j=i; }
+      if ( i == 8 ) { j = 0; }
+      if ( device_param[j].show )
+      {
+        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_cb[i]);
+      }
+    }
+    WSContentSend_P(PSTR("</select> "));
+    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "CBwarning", (Settings.knx_CB_registered < MAX_KNX_CB) ? "" : "disabled", 2);
+
+    for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
+    {
+      if ( Settings.knx_CB_param[i] )
+      {
+        KNX_addr.value = Settings.knx_CB_addr[i];
+        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW2, KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, device_param_cb[Settings.knx_CB_param[i]-1], i +1);
+      }
+    }
+    WSContentSend_P(PSTR("</table></center></fieldset>"));
+    WSContentSend_P(HTTP_FORM_END);
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentStop();
+  }
+
+}
+
+
+void KNX_Save_Settings(void)
+{
+  String stmp;
+  address_t KNX_addr;
+
+  Settings.flag.knx_enabled = WebServer->hasArg("b1");
+  Settings.flag.knx_enable_enhancement = WebServer->hasArg("b2");
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ENABLED ": %d, " D_KNX_ENHANCEMENT ": %d"),
+   Settings.flag.knx_enabled, Settings.flag.knx_enable_enhancement );
+
+  stmp = WebServer->arg("area");
+  KNX_addr.pa.area = stmp.toInt();
+  stmp = WebServer->arg("line");
+  KNX_addr.pa.line = stmp.toInt();
+  stmp = WebServer->arg("member");
+  KNX_addr.pa.member = stmp.toInt();
+  Settings.knx_physsical_addr = KNX_addr.value;
+  knx.physical_address_set( KNX_addr );
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_KNX_PHYSICAL_ADDRESS ": %d.%d.%d "),
+   KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA: %d"),
+   Settings.knx_GA_registered );
+  for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
+  {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"),
+     i+1, device_param_ga[Settings.knx_GA_param[i]-1],
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB: %d"),
+   Settings.knx_CB_registered );
+  for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
+  {
+    KNX_addr.value = Settings.knx_CB_addr[i];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"),
+     i+1,
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member,
+     device_param_cb[Settings.knx_CB_param[i]-1] );
+  }
+}
+
+#endif
+#endif
+
+
+
+
+
+void CmndKnxTxCmnd(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
+
+
+
+    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
+    while ( i != KNX_Empty ) {
+      KNX_addr.value = Settings.knx_GA_addr[i];
+      knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+      if (Settings.flag.knx_enable_enhancement) {
+        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+      }
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], !(XdrvMailbox.payload == 0),
+       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
+    }
+    ResponseCmndIdxChar (XdrvMailbox.data );
+  }
+}
+
+void CmndKnxTxVal(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
+
+
+
+    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
+    while ( i != KNX_Empty ) {
+      KNX_addr.value = Settings.knx_GA_addr[i];
+
+      float tempvar = CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar,2,XdrvMailbox.data);
+
+      knx.write_2byte_float(KNX_addr, tempvar);
+      if (Settings.flag.knx_enable_enhancement) {
+        knx.write_2byte_float(KNX_addr, tempvar);
+        knx.write_2byte_float(KNX_addr, tempvar);
+      }
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d.%d.%d"),
+       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
+       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
+    }
+    ResponseCmndIdxChar (XdrvMailbox.data );
+  }
+}
+
+void CmndKnxEnabled(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    Settings.flag.knx_enabled = XdrvMailbox.payload;
+  }
+  ResponseCmndChar (GetStateText(Settings.flag.knx_enabled) );
+}
+
+void CmndKnxEnhanced(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    Settings.flag.knx_enable_enhancement = XdrvMailbox.payload;
+  }
+  ResponseCmndChar (GetStateText(Settings.flag.knx_enable_enhancement) );
+}
+
+void CmndKnxPa(void)
+{
+  if (XdrvMailbox.data_len) {
+    if (strstr(XdrvMailbox.data, ".") != nullptr) {
+      char sub_string[XdrvMailbox.data_len];
+
+      int pa_area = atoi(subStr(sub_string, XdrvMailbox.data, ".", 1));
+      int pa_line = atoi(subStr(sub_string, XdrvMailbox.data, ".", 2));
+      int pa_member = atoi(subStr(sub_string, XdrvMailbox.data, ".", 3));
+
+      if ( ((pa_area == 0) && (pa_line == 0) && (pa_member == 0))
+            || (pa_area > 15) || (pa_line > 15) || (pa_member > 255) ) {
+              Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+              return;
+      }
+
+      KNX_addr.pa.area = pa_area;
+      KNX_addr.pa.line = pa_line;
+      KNX_addr.pa.member = pa_member;
+      Settings.knx_physsical_addr = KNX_addr.value;
+    }
+  }
+  KNX_addr.value = Settings.knx_physsical_addr;
+  Response_P (PSTR("{\"%s\":\"%d.%d.%d\"}"),
+    XdrvMailbox.command, KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
+}
+
+void CmndKnxGa(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_GA)) {
+    if (XdrvMailbox.data_len) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len];
+
+        int ga_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        int ga_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        int ga_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        int ga_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+
+        if ( ((ga_area == 0) && (ga_line == 0) && (ga_member == 0))
+          || (ga_area > 31) || (ga_line > 7) || (ga_member > 255)
+          || (ga_option < 0) || ((ga_option > KNX_MAX_device_param ) && (ga_option != KNX_Empty))
+          || (!device_param[ga_option-1].show) ) {
+               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+               return;
+        }
+
+        KNX_addr.ga.area = ga_area;
+        KNX_addr.ga.line = ga_line;
+        KNX_addr.ga.member = ga_member;
+
+        if ( XdrvMailbox.index > Settings.knx_GA_registered ) {
+          Settings.knx_GA_registered ++;
+          XdrvMailbox.index = Settings.knx_GA_registered;
+        }
+
+        Settings.knx_GA_addr[XdrvMailbox.index -1] = KNX_addr.value;
+        Settings.knx_GA_param[XdrvMailbox.index -1] = ga_option;
+      } else {
+        if ( (XdrvMailbox.payload <= Settings.knx_GA_registered) && (XdrvMailbox.payload > 0) ) {
+          XdrvMailbox.index = XdrvMailbox.payload;
+        } else {
+          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+          return;
+        }
+      }
+      if ( XdrvMailbox.index <= Settings.knx_GA_registered ) {
+        KNX_addr.value = Settings.knx_GA_addr[XdrvMailbox.index -1];
+        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
+          XdrvMailbox.command, XdrvMailbox.index, device_param_ga[Settings.knx_GA_param[XdrvMailbox.index-1]-1],
+          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+      }
+    } else {
+      ResponseCmndNumber (Settings.knx_GA_registered );
+    }
+  }
+}
+
+void CmndKnxCb(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_CB)) {
+    if (XdrvMailbox.data_len) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len];
+
+        int cb_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        int cb_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        int cb_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        int cb_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+
+        if ( ((cb_area == 0) && (cb_line == 0) && (cb_member == 0))
+          || (cb_area > 31) || (cb_line > 7) || (cb_member > 255)
+          || (cb_option < 0) || ((cb_option > KNX_MAX_device_param ) && (cb_option != KNX_Empty))
+          || (!device_param[cb_option-1].show) ) {
+               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+               return;
+        }
+
+        KNX_addr.ga.area = cb_area;
+        KNX_addr.ga.line = cb_line;
+        KNX_addr.ga.member = cb_member;
+
+        if ( XdrvMailbox.index > Settings.knx_CB_registered ) {
+          Settings.knx_CB_registered ++;
+          XdrvMailbox.index = Settings.knx_CB_registered;
+        }
+
+        Settings.knx_CB_addr[XdrvMailbox.index -1] = KNX_addr.value;
+        Settings.knx_CB_param[XdrvMailbox.index -1] = cb_option;
+      } else {
+        if ( (XdrvMailbox.payload <= Settings.knx_CB_registered) && (XdrvMailbox.payload > 0) ) {
+          XdrvMailbox.index = XdrvMailbox.payload;
+        } else {
+          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+          return;
+        }
+      }
+      if ( XdrvMailbox.index <= Settings.knx_CB_registered ) {
+        KNX_addr.value = Settings.knx_CB_addr[XdrvMailbox.index -1];
+        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
+          XdrvMailbox.command, XdrvMailbox.index, device_param_cb[Settings.knx_CB_param[XdrvMailbox.index-1]-1],
+          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+      }
+    } else {
+      ResponseCmndNumber (Settings.knx_CB_registered );
+    }
+  }
+}
+
+
+
+
+
+bool Xdrv11(uint8_t function)
+{
+  bool result = false;
+    switch (function) {
+      case FUNC_LOOP:
+        if (!global_state.wifi_down) { knx.loop(); }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (toggle_inhibit) {
+          toggle_inhibit--;
+        }
+        break;
+      case FUNC_ANY_KEY:
+        KnxSendButtonPower();
+        break;
+#ifdef USE_WEBSERVER
+#ifdef USE_KNX_WEB_MENU
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_KNX);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/kn", HandleKNXConfiguration);
+        break;
+#endif
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kKnxCommands, KnxCommand);
+        break;
+      case FUNC_PRE_INIT:
+        KNX_INIT();
+        break;
+
+
+    }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_12_home_assistant.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_12_home_assistant.ino"
+#ifdef USE_HOME_ASSISTANT
+
+#define XDRV_12 12
+
+
+const char kHAssJsonSensorTypes[] PROGMEM =
+  D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
+  D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
+  D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
+  D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
+const char kHAssJsonSensorUnits[] PROGMEM =
+  "|||"
+  "W|%|A|Cm|Hz|%|LX|"
+  "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
+  "W|KWh|KWh|V|Kg|KWh";
+const char kHAssJsonSensorDevCla[] PROGMEM =
+  "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
+  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
+  "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
+  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
+  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
+
+
+const char HASS_DISCOVER_SENSOR[] PROGMEM =
+    ",\"unit_of_meas\":\"%s\",\"%s\","
+    "\"frc_upd\":true,"
+    "\"val_tpl\":\"{{value_json['%s']['%s']";
+
+const char HASS_DISCOVER_BASE[] PROGMEM =
+    "{\"name\":\"%s\","
+    "\"stat_t\":\"%s\","
+    "\"avty_t\":\"%s\","
+    "\"pl_avail\":\"" D_ONLINE "\","
+    "\"pl_not_avail\":\"" D_OFFLINE "\"";
+
+const char HASS_DISCOVER_RELAY[] PROGMEM =
+    ",\"cmd_t\":\"%s\","
+    "\"val_tpl\":\"{{value_json.%s}}\","
+    "\"pl_off\":\"%s\","
+    "\"pl_on\":\"%s\"";
+
+const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
+    ",\"value_template\":\"{%%if is_state(entity_id,\\\"off\\\")-%%}ON{%%-endif%%}\","
+    "\"off_delay\":1";
+
+const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
+    ",\"value_template\":\"{{value_json.%s}}\","
+    "\"frc_upd\":true,"
+    "\"pl_on\":\"%s\","
+    "\"pl_off\":\"%s\"";
+
+const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
+    ",\"bri_cmd_t\":\"%s\","
+    "\"bri_stat_t\":\"%s\","
+    "\"bri_scl\":100,"
+    "\"on_cmd_type\":\"%s\","
+    "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
+
+const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
+    ",\"rgb_cmd_t\":\"%s2\","
+    "\"rgb_stat_t\":\"%s\","
+    "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
+
+const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
+    ",\"whit_val_cmd_t\":\"%s\","
+    "\"whit_val_stat_t\":\"%s\","
+    "\"white_value_scale\":100,"
+    "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
+
+const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
+    ",\"clr_temp_cmd_t\":\"%s\","
+    "\"clr_temp_stat_t\":\"%s\","
+    "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
+
+const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
+    ",\"fx_cmd_t\":\"%s\","
+    "\"fx_stat_t\":\"%s\","
+    "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
+    "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]";
+
+const char HASS_DISCOVER_SENSOR_HASS_STATUS[] PROGMEM =
+    ",\"json_attributes_topic\":\"%s\","
+    "\"unit_of_meas\":\" \","
+    "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\","
+    "\"ic\":\"mdi:information-outline\"";
+
+const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]],"
+    "\"name\":\"%s\","
+    "\"model\":\"%s\","
+    "\"sw_version\":\"%s%s\","
+    "\"manufacturer\":\"Tasmota\"}";
+
+const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]]}";
+
+uint8_t hass_init_step = 0;
+uint8_t hass_mode = 0;
+int hass_tele_period = 0;
+
+void TryResponseAppend_P(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  char dummy[2];
+  int dlen = vsnprintf_P(dummy, 1, format, args);
+
+  int mlen = strlen(mqtt_data);
+  int slen = sizeof(mqtt_data) - 1 - mlen;
+  if (dlen >= slen)
+  {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: MQTT discovery failed due to too long topic or friendly name. "
+                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"),
+              dlen, slen);
+    va_start(args, format);
+    vsnprintf_P(log_data, sizeof(log_data), format, args);
+    AddLog(LOG_LEVEL_ERROR);
+  }
+  else
+  {
+    va_start(args, format);
+    vsnprintf_P(mqtt_data + mlen, slen, format, args);
+  }
+  va_end(args);
+}
+
+void HAssAnnounceRelayLight(void)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char stemp3[TOPSZ];
+  char unique_id[30];
+  bool is_light = false;
+  bool is_topic_light = false;
+
+  for (uint32_t i = 1; i <= MAX_RELAYS; i++)
+  {
+    is_light = ((i == devices_present) && (light_type));
+    is_topic_light = Settings.flag.hass_light || is_light;
+
+    mqtt_data[0] = '\0';
+
+
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "RL" : "LI", i);
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
+               (is_topic_light) ? "switch" : "light", unique_id);
+    MqttPublish(stopic, true);
+
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "LI" : "RL", i);
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
+               (is_topic_light) ? "light" : "switch", unique_id);
+
+    if (Settings.flag.hass_discovery && (i <= devices_present))
+    {
+      char name[33 + 2];
+      char value_template[33];
+      char prefix[TOPSZ];
+      char *command_topic = stemp1;
+      char *state_topic = stemp2;
+      char *availability_topic = stemp3;
+
+      if (i > MAX_FRIENDLYNAMES)
+      {
+        snprintf_P(name, sizeof(name), PSTR("%s %d"), SettingsText(SET_FRIENDLYNAME1), i);
+      }
+      else
+      {
+        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 + i - 1));
+      }
+      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable);
+      GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
+      GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
+      GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+      TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
+      TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+#ifdef USE_LIGHT
+      if (is_light)
+      {
+        char *brightness_command_topic = stemp1;
+
+        GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
+        strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3));
+        TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
+
+        if (Light.subtype >= LST_RGB)
+        {
+          char *rgb_command_topic = stemp1;
+
+          GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_COLOR, rgb_command_topic, state_topic);
+
+          char *effect_command_topic = stemp1;
+          GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
+        }
+        if (LST_RGBW == Light.subtype)
+        {
+          char *white_temp_command_topic = stemp1;
+
+          GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
+        }
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
+        {
+          char *color_temp_command_topic = stemp1;
+
+          GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
+        }
+      }
+#endif
+      TryResponseAppend_P(PSTR("}"));
+    }
+    MqttPublish(stopic, true);
+  }
+}
+
+void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle)
+{
+
+
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+  mqtt_data[0] = '\0';
+
+
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key ? "SW" : "BTN", device + 1);
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
+
+  if (Settings.flag.hass_discovery && present)
+  {
+    char name[33 + 6];
+    char value_template[33];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+    char jsoname[8];
+
+    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key ? "Switch" : "Button", device + 1);
+    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
+    GetPowerDevice(value_template, device + 1, sizeof(value_template),
+                   key + Settings.flag.device_index_enable);
+    GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+    if (toggle) {
+      if (!key) {
+        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE);
+      } else {
+        TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
+    }
+    TryResponseAppend_P(PSTR("}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssAnnounceSwitches(void)
+{
+  char sw_topic[TOPSZ];
+
+
+  char *tmp = SettingsText(SET_MQTT_SWITCH_TOPIC);
+  Format(sw_topic, tmp, sizeof(sw_topic));
+  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0)
+  {
+    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++)
+    {
+      uint8_t switch_present = 0;
+      uint8_t toggle = 1;
+
+      if (pin[GPIO_SWT1 + switch_index] < 99)
+      {
+        switch_present = 1;
+      }
+
+
+      if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
+          Settings.flag3.button_switch_force_local ||
+          !strcmp(mqtt_topic, sw_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), sw_topic))
+      {
+        toggle = 0;
+      }
+      HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 1, toggle);
+    }
+  }
+}
+
+void HAssAnnounceButtons(void)
+{
+  char key_topic[TOPSZ];
+
+
+  char *tmp = SettingsText(SET_MQTT_BUTTON_TOPIC);
+  Format(key_topic, tmp, sizeof(key_topic));
+  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0)
+  {
+    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++)
+    {
+      uint8_t button_present = 0;
+      uint8_t toggle = 1;
+
+      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)))
+      {
+        button_present = 1;
+      }
+      else
+      {
+        if (pin[GPIO_KEY1 + button_index] < 99)
+        {
+          button_present = 1;
+        }
+      }
+
+
+      if (Settings.flag3.button_switch_force_local ||
+          !strcmp(mqtt_topic, key_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic))
+      {
+        toggle = 0;
+      }
+      HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 0, toggle);
+    }
+  }
+}
+
+void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+  mqtt_data[0] = '\0';
+
+  char subname[20];
+  NoAlNumToUnderscore(subname, MultiSubName);
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
+
+  if (Settings.flag.hass_discovery)
+  {
+    char name[33 + 42];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
+    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
+    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+    char jname[32];
+    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
+    if (sensor_index > -1) {
+      char param1[20];
+      GetTextIndexed(param1, sizeof(param1), sensor_index, kHAssJsonSensorUnits);
+      switch (sensor_index) {
+        case 0:
+          snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit());
+          break;
+        case 1:
+        case 2:
+          snprintf_P(param1, sizeof(param1), PSTR("%s"), PressureUnit().c_str());
+          break;
+      }
+      char param2[50];
+      GetTextIndexed(param2, sizeof(param2), sensor_index, kHAssJsonSensorDevCla);
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
+      if (subidx) {
+        TryResponseAppend_P(PSTR("[%d]"), subqty -1);
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, " ", "ic\":\"mdi:eye", sensorname, subsensortype);
+    }
+    TryResponseAppend_P(PSTR("}}\"}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssAnnounceSensors(void)
+{
+  uint8_t hass_xsns_index = 0;
+  bool is_sensor = true;
+  uint8_t subqty = 0;
+  do
+  {
+    mqtt_data[0] = '\0';
+    int tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index);
+    tele_period = tele_period_save;
+
+    char sensordata[512];
+    strlcpy(sensordata, mqtt_data, sizeof(sensordata));
+
+    if (strlen(sensordata))
+    {
+      sensordata[0] = '{';
+      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);
+
+
+
+      StaticJsonBuffer<500> jsonBuffer;
+      JsonObject &root = jsonBuffer.parseObject(sensordata);
+      if (!root.success())
+      {
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: jsonBuffer failed to parse '%s'"), sensordata);
+        continue;
+      }
+      for (auto sensor : root)
+      {
+        const char *sensorname = sensor.key;
+        JsonObject &sensors = sensor.value.as<JsonObject>();
+        if (!sensors.success())
+        {
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: JsonObject failed to parse '%s'"), sensordata);
+          continue;
+        }
+        for (auto subsensor : sensors)
+        {
+
+          if (subsensor.value.is<JsonArray&>()) {
+            JsonArray& subsensors = subsensor.value.as<JsonArray&>();
+            subqty = subsensors.size();
+            char MultiSubName[20];
+            for (int i = 1; i <= subqty; i++) {
+              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s %d"), subsensor.key, i);
+              HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
+            }
+          } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}
+        }
+      }
+    }
+    yield();
+  } while (hass_xsns_index != 0);
+}
+
+void HAssAnnounceStatusSensor(void)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+
+  mqtt_data[0] = '\0';
+
+
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_status"), ESP.getChipId());
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
+
+  if (Settings.flag.hass_discovery)
+  {
+    char name[33 + 7];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+
+    snprintf_P(name, sizeof(name), PSTR("%s status"), SettingsText(SET_FRIENDLYNAME1));
+    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
+                        SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
+
+    TryResponseAppend_P(PSTR("}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssPublishStatus(void)
+{
+  Response_P(PSTR("{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\","
+                  "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
+                  "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
+                  "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
+                  "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
+                  "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
+             my_version, my_image, GetBuildDateAndTime().c_str(), ESP.getSdkVersion(), ModuleName().c_str(),
+             GetResetReason().c_str(), GetUptime().c_str(), WifiLinkCount(), WifiDowntime().c_str(), MqttConnectCount(),
+             Settings.bootcount, Settings.save_flag, WiFi.localIP().toString().c_str(),
+             WifiGetRssiAsQuality(WiFi.RSSI()), loop_load_avg);
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_HASS_STATE));
+}
+
+void HAssDiscovery(void)
+{
+
+  if (Settings.flag.hass_discovery)
+  {
+    Settings.flag.mqtt_response = 0;
+    Settings.flag.decimal_text = 1;
+    Settings.flag3.hass_tele_on_power = 1;
+    Settings.light_scheme = 0;
+  }
+
+  if (Settings.flag.hass_discovery || (1 == hass_mode))
+  {
+
+    HAssAnnounceRelayLight();
+
+
+    HAssAnnounceButtons();
+
+
+    HAssAnnounceSwitches();
+
+
+    HAssAnnounceSensors();
+
+
+    HAssAnnounceStatusSensor();
+  }
+}
+
+void HAssDiscover(void)
+{
+  hass_mode = 1;
+  hass_init_step = 1;
+}
+
+void HAssAnyKey(void)
+{
+  if (!Settings.flag.hass_discovery)
+  {
+    return;
+  }
+
+  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
+  uint32_t device = XdrvMailbox.payload & 0xFF;
+  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
+
+  char scommand[CMDSZ];
+  snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);
+  char stopic[TOPSZ];
+
+  GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+  Response_P(S_JSON_COMMAND_SVALUE, PSTR(D_RSLT_STATE), GetStateText(state));
+  MqttPublish(stopic);
+}
+
+
+
+
+
+bool Xdrv12(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled)
+  {
+    switch (function)
+    {
+    case FUNC_EVERY_SECOND:
+      if (hass_init_step)
+      {
+        hass_init_step--;
+        if (!hass_init_step)
+        {
+          HAssDiscovery();
+        }
+      }
+      else if (Settings.flag.hass_discovery && Settings.tele_period)
+      {
+        hass_tele_period++;
+        if (hass_tele_period >= Settings.tele_period)
+        {
+          hass_tele_period = 0;
+
+          mqtt_data[0] = '\0';
+          HAssPublishStatus();
+        }
+      }
+      break;
+    case FUNC_ANY_KEY:
+      HAssAnyKey();
+      break;
+    case FUNC_MQTT_INIT:
+      hass_mode = 0;
+      hass_init_step = 2;
+      break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
+#if defined(USE_I2C) || defined(USE_SPI)
+#ifdef USE_DISPLAY
+
+#define XDRV_13 13
+
+#include <renderer.h>
+#include <FT6236.h>
+
+Renderer *renderer;
+
+enum ColorType { COLOR_BW, COLOR_COLOR };
+
+#ifndef MAXBUTTONS
+#define MAXBUTTONS 16
+#endif
+
+#ifdef USE_TOUCH_BUTTONS
+VButton *buttons[MAXBUTTONS];
+#endif
+
+
+
+uint16_t fg_color = 1;
+uint16_t bg_color = 0;
+uint8_t color_type = COLOR_BW;
+uint8_t auto_draw=1;
+
+const uint8_t DISPLAY_MAX_DRIVERS = 16;
+const uint8_t DISPLAY_MAX_COLS = 44;
+const uint8_t DISPLAY_MAX_ROWS = 32;
+
+const uint8_t DISPLAY_LOG_ROWS = 32;
+
+#define D_PRFX_DISPLAY "Display"
+#define D_CMND_DISP_ADDRESS "Address"
+#define D_CMND_DISP_COLS "Cols"
+#define D_CMND_DISP_DIMMER "Dimmer"
+#define D_CMND_DISP_MODE "Mode"
+#define D_CMND_DISP_MODEL "Model"
+#define D_CMND_DISP_REFRESH "Refresh"
+#define D_CMND_DISP_ROWS "Rows"
+#define D_CMND_DISP_SIZE "Size"
+#define D_CMND_DISP_FONT "Font"
+#define D_CMND_DISP_ROTATE "Rotate"
+#define D_CMND_DISP_TEXT "Text"
+#define D_CMND_DISP_WIDTH "Width"
+#define D_CMND_DISP_HEIGHT "Height"
+
+enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_EVERY_50_MSECOND, FUNC_DISPLAY_EVERY_SECOND,
+                     FUNC_DISPLAY_MODEL, FUNC_DISPLAY_MODE, FUNC_DISPLAY_POWER,
+                     FUNC_DISPLAY_CLEAR, FUNC_DISPLAY_DRAW_FRAME,
+                     FUNC_DISPLAY_DRAW_HLINE, FUNC_DISPLAY_DRAW_VLINE, FUNC_DISPLAY_DRAW_LINE,
+                     FUNC_DISPLAY_DRAW_CIRCLE, FUNC_DISPLAY_FILL_CIRCLE,
+                     FUNC_DISPLAY_DRAW_RECTANGLE, FUNC_DISPLAY_FILL_RECTANGLE,
+                     FUNC_DISPLAY_TEXT_SIZE, FUNC_DISPLAY_FONT_SIZE, FUNC_DISPLAY_ROTATION, FUNC_DISPLAY_DRAW_STRING, FUNC_DISPLAY_ONOFF };
+
+enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
+
+const char kDisplayCommands[] PROGMEM = D_PRFX_DISPLAY "|"
+  "|" D_CMND_DISP_MODEL "|" D_CMND_DISP_WIDTH "|" D_CMND_DISP_HEIGHT "|" D_CMND_DISP_MODE "|" D_CMND_DISP_REFRESH "|"
+  D_CMND_DISP_DIMMER "|" D_CMND_DISP_COLS "|" D_CMND_DISP_ROWS "|" D_CMND_DISP_SIZE "|" D_CMND_DISP_FONT "|"
+  D_CMND_DISP_ROTATE "|" D_CMND_DISP_TEXT "|" D_CMND_DISP_ADDRESS ;
+
+void (* const DisplayCommand[])(void) PROGMEM = {
+  &CmndDisplay, &CmndDisplayModel, &CmndDisplayWidth, &CmndDisplayHeight, &CmndDisplayMode, &CmndDisplayRefresh,
+  &CmndDisplayDimmer, &CmndDisplayColumns, &CmndDisplayRows, &CmndDisplaySize, &CmndDisplayFont,
+  &CmndDisplayRotate, &CmndDisplayText, &CmndDisplayAddress };
+
+char *dsp_str;
+
+uint16_t dsp_x;
+uint16_t dsp_y;
+uint16_t dsp_x2;
+uint16_t dsp_y2;
+uint16_t dsp_rad;
+uint16_t dsp_color;
+int16_t dsp_len;
+int16_t disp_xpos = 0;
+int16_t disp_ypos = 0;
+
+uint8_t disp_power = 0;
+uint8_t disp_device = 0;
+uint8_t disp_refresh = 1;
+uint8_t disp_autodraw = 1;
+uint8_t dsp_init;
+uint8_t dsp_font;
+uint8_t dsp_flag;
+uint8_t dsp_on;
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+char **disp_log_buffer;
+char **disp_screen_buffer;
+char disp_temp[2];
+char disp_pres[5];
+
+uint8_t disp_log_buffer_cols = 0;
+uint8_t disp_log_buffer_idx = 0;
+uint8_t disp_log_buffer_ptr = 0;
+uint8_t disp_screen_buffer_cols = 0;
+uint8_t disp_screen_buffer_rows = 0;
+bool disp_subscribed = false;
+
+#endif
+
+
+
+void DisplayInit(uint8_t mode)
+{
+  if (renderer) {
+    renderer->DisplayInit(mode, Settings.display_size, Settings.display_rotate, Settings.display_font);
+  }
+  else {
+    dsp_init = mode;
+    XdspCall(FUNC_DISPLAY_INIT);
+  }
+}
+
+void DisplayClear(void)
+{
+  XdspCall(FUNC_DISPLAY_CLEAR);
+}
+
+void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_len = len;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_HLINE);
+}
+
+void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_len = len;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_VLINE);
+}
+
+void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_LINE);
+}
+
+void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_rad = rad;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_CIRCLE);
+}
+
+void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_rad = rad;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_FILL_CIRCLE);
+}
+
+void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_RECTANGLE);
+}
+
+void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_FILL_RECTANGLE);
+}
+
+void DisplayDrawFrame(void)
+{
+  XdspCall(FUNC_DISPLAY_DRAW_FRAME);
+}
+
+void DisplaySetSize(uint8_t size)
+{
+  Settings.display_size = size &3;
+  XdspCall(FUNC_DISPLAY_TEXT_SIZE);
+}
+
+void DisplaySetFont(uint8_t font)
+{
+  Settings.display_font = font &3;
+  XdspCall(FUNC_DISPLAY_FONT_SIZE);
+}
+
+void DisplaySetRotation(uint8_t rotation)
+{
+  Settings.display_rotate = rotation &3;
+  XdspCall(FUNC_DISPLAY_ROTATION);
+}
+
+void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_str = str;
+  dsp_color = color;
+  dsp_flag = flag;
+  XdspCall(FUNC_DISPLAY_DRAW_STRING);
+}
+
+void DisplayOnOff(uint8_t on)
+{
+  dsp_on = on;
+  XdspCall(FUNC_DISPLAY_ONOFF);
+}
+
+
+
+
+uint8_t fatoiv(char *cp,float *res) {
+  uint8_t index=0;
+  *res=CharToFloat(cp);
+  while (*cp) {
+    if ((*cp>='0' && *cp<='9') || (*cp=='-') || (*cp=='.')) {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+uint8_t atoiv(char *cp, int16_t *res)
+{
+  uint8_t index = 0;
+  *res = atoi(cp);
+  while (*cp) {
+    if ((*cp>='0' && *cp<='9') || (*cp=='-')) {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+uint8_t atoiV(char *cp, uint16_t *res)
+{
+  uint8_t index = 0;
+  *res = atoi(cp);
+  while (*cp) {
+    if (*cp>='0' && *cp<='9') {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+void alignright(char *string) {
+  uint16_t slen=strlen(string);
+  uint16_t len=slen;
+  while (len) {
+
+    if (string[len-1]!=' ') {
+      break;
+    }
+    len--;
+  }
+  uint16_t diff=slen-len;
+  if (diff>0) {
+
+    memmove(&string[diff],string,len);
+    memset(string,' ',diff);
+  }
+}
+
+char *get_string(char *buff,uint8_t len,char *cp) {
+uint8_t index=0;
+  while (*cp!=':') {
+    buff[index]=*cp++;
+    index++;
+    if (index>=len) break;
+  }
+  buff[index]=0;
+  cp++;
+  return cp;
+}
+
+#define ESCAPE_CHAR '~'
+
+
+uint32_t decode_te(char *line) {
+  uint32_t skip = 0;
+  char sbuf[3],*cp;
+  while (*line) {
+    if (*line==ESCAPE_CHAR) {
+      cp=line+1;
+      if (*cp!=0 && *cp==ESCAPE_CHAR) {
+
+        memmove(cp,cp+1,strlen(cp));
+        skip++;
+      } else {
+
+        if (strlen(cp)<2) {
+
+          return skip;
+        }
+
+        sbuf[0]=*(cp);
+        sbuf[1]=*(cp+1);
+        sbuf[2]=0;
+        *line=strtol(sbuf,0,16);
+
+        memmove(cp,cp+2,strlen(cp)-1);
+        skip += 2;
+      }
+    }
+    line++;
+  }
+  return skip;
+}
+
+
+
+#define DISPLAY_BUFFER_COLS 128
+
+void DisplayText(void)
+{
+  uint8_t lpos;
+  uint8_t escape = 0;
+  uint8_t var;
+  int16_t lin = 0;
+  int16_t col = 0;
+  int16_t fill = 0;
+  int16_t temp;
+  int16_t temp1;
+  float ftemp;
+
+  char linebuf[DISPLAY_BUFFER_COLS];
+  char *dp = linebuf;
+  char *cp = XdrvMailbox.data;
+
+  memset(linebuf, ' ', sizeof(linebuf));
+  linebuf[sizeof(linebuf)-1] = 0;
+  *dp = 0;
+
+  while (*cp) {
+    if (!escape) {
+
+      if (*cp == '[') {
+        escape = 1;
+        cp++;
+
+        if ((uint32_t)dp - (uint32_t)linebuf) {
+          if (!fill) { *dp = 0; }
+          if (col > 0 && lin > 0) {
+
+            if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
+            else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
+          } else {
+
+            if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+            else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+          }
+          memset(linebuf, ' ', sizeof(linebuf));
+          linebuf[sizeof(linebuf)-1] = 0;
+          dp = linebuf;
+        }
+      } else {
+
+        if (dp < (linebuf + DISPLAY_BUFFER_COLS)) { *dp++ = *cp++; }
+      }
+    } else {
+
+      if (*cp == ']') {
+        escape = 0;
+        cp++;
+      } else {
+
+        switch (*cp++) {
+          case 'z':
+
+            if (!renderer) DisplayClear();
+            else renderer->fillScreen(bg_color);
+            disp_xpos = 0;
+            disp_ypos = 0;
+            col = 0;
+            lin = 0;
+            break;
+          case 'i':
+
+            DisplayInit(DISPLAY_INIT_PARTIAL);
+            break;
+          case 'I':
+
+            DisplayInit(DISPLAY_INIT_FULL);
+            break;
+          case 'o':
+            if (!renderer) {
+              DisplayOnOff(0);
+            } else {
+              renderer->DisplayOnff(0);
+            }
+            break;
+          case 'O':
+            if (!renderer) {
+              DisplayOnOff(1);
+            } else {
+              renderer->DisplayOnff(1);
+            }
+            break;
+          case 'x':
+
+            var = atoiv(cp, &disp_xpos);
+            cp += var;
+            break;
+          case 'y':
+
+            var = atoiv(cp, &disp_ypos);
+            cp += var;
+            break;
+          case 'l':
+
+            var = atoiv(cp, &lin);
+            cp += var;
+
+            break;
+          case 'c':
+
+            var = atoiv(cp, &col);
+            cp += var;
+
+            break;
+          case 'C':
+
+            if (*cp=='i') {
+
+              cp++;
+              var = atoiv(cp, &temp);
+              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
+            } else {
+
+              var = fatoiv(cp,&ftemp);
+            }
+            fg_color=ftemp;
+            cp += var;
+            if (renderer) renderer->setTextColor(fg_color,bg_color);
+            break;
+          case 'B':
+
+            if (*cp=='i') {
+
+              cp++;
+              var = atoiv(cp, &temp);
+              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
+            } else {
+              var = fatoiv(cp,&ftemp);
+            }
+            bg_color=ftemp;
+            cp += var;
+            if (renderer) renderer->setTextColor(fg_color,bg_color);
+            break;
+          case 'p':
+
+            var = atoiv(cp, &fill);
+            cp += var;
+            linebuf[fill] = 0;
+            break;
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+          case 'P':
+            { char *ep=strchr(cp,':');
+             if (ep) {
+               *ep=0;
+               ep++;
+               Draw_RGB_Bitmap(cp,disp_xpos,disp_ypos);
+               cp=ep;
+             }
+            }
+            break;
+#endif
+          case 'h':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (temp < 0) {
+              if (renderer) renderer->writeFastHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
+              else DisplayDrawHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
+            } else {
+              if (renderer) renderer->writeFastHLine(disp_xpos, disp_ypos, temp, fg_color);
+              else DisplayDrawHLine(disp_xpos, disp_ypos, temp, fg_color);
+            }
+            disp_xpos += temp;
+            break;
+          case 'v':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (temp < 0) {
+              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
+              else DisplayDrawVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
+            } else {
+              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos, temp, fg_color);
+              else DisplayDrawVLine(disp_xpos, disp_ypos, temp, fg_color);
+            }
+            disp_ypos += temp;
+            break;
+          case 'L':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->writeLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            disp_xpos += temp;
+            disp_ypos += temp1;
+            break;
+          case 'k':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (renderer) renderer->drawCircle(disp_xpos, disp_ypos, temp, fg_color);
+            else DisplayDrawCircle(disp_xpos, disp_ypos, temp, fg_color);
+            break;
+          case 'K':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color);
+            else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color);
+            break;
+          case 'r':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->drawRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            break;
+          case 'R':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->fillRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawFilledRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            break;
+          case 'u':
+
+            { int16_t rad;
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &rad);
+            cp += var;
+            if (renderer) renderer->drawRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
+
+            }
+            break;
+          case 'U':
+
+            { int16_t rad;
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &rad);
+            cp += var;
+            if (renderer) renderer->fillRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
+
+            }
+            break;
+
+          case 't':
+            if (*cp=='S') {
+              cp++;
+              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
+                snprintf_P(dp, 9, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+                dp += 8;
+              }
+            } else {
+              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -5) {
+                snprintf_P(dp, 6, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute);
+                dp += 5;
+              }
+            }
+            break;
+          case 'T':
+            if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
+              snprintf_P(dp, 9, PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year%2000);
+              dp += 8;
+            }
+            break;
+          case 'd':
+
+            if (renderer) renderer->Updateframe();
+            else DisplayDrawFrame();
+            break;
+          case 'D':
+
+            auto_draw=*cp&3;
+            if (renderer) renderer->setDrawMode(auto_draw>>1);
+            cp += 1;
+            break;
+          case 's':
+
+            if (renderer) renderer->setTextSize(*cp&7);
+            else DisplaySetSize(*cp&3);
+            cp += 1;
+            break;
+          case 'f':
+
+            if (renderer) renderer->setTextFont(*cp&7);
+            else DisplaySetFont(*cp&7);
+            cp += 1;
+            break;
+          case 'a':
+
+            if (renderer) renderer->setRotation(*cp&3);
+            else DisplaySetRotation(*cp&3);
+            cp+=1;
+            break;
+
+#ifdef USE_GRAPH
+          case 'G':
+
+            if (*cp=='d') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&temp1);
+              cp+=var;
+              RedrawGraph(temp,temp1);
+              break;
+            }
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+            if (*cp=='s') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+
+              char bbuff[128];
+              cp=get_string(bbuff,sizeof(bbuff),cp);
+              Save_graph(temp,bbuff);
+              break;
+            }
+            if (*cp=='r') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+
+              char bbuff[128];
+              cp=get_string(bbuff,sizeof(bbuff),cp);
+              Restore_graph(temp,bbuff);
+              break;
+            }
+#endif
+            { int16_t num,gxp,gyp,gxs,gys,dec,icol;
+              float ymin,ymax;
+              var=atoiv(cp,&num);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gxp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gyp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gxs);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gys);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&dec);
+              cp+=var;
+              cp++;
+              var=fatoiv(cp,&ymin);
+              cp+=var;
+              cp++;
+              var=fatoiv(cp,&ymax);
+              cp+=var;
+              if (color_type==COLOR_COLOR) {
+
+                cp++;
+                var=atoiv(cp,&icol);
+                cp+=var;
+              } else {
+                icol=0;
+              }
+              DefineGraph(num,gxp,gyp,gxs,gys,dec,ymin,ymax,icol);
+            }
+            break;
+          case 'g':
+              { float temp;
+                int16_t num;
+                var=atoiv(cp,&num);
+                cp+=var;
+                cp++;
+                var=fatoiv(cp,&temp);
+                cp+=var;
+                AddValue(num,temp);
+              }
+            break;
+#endif
+
+#ifdef USE_AWATCH
+          case 'w':
+              var = atoiv(cp, &temp);
+              cp += var;
+              DrawAClock(temp);
+              break;
+#endif
+
+#ifdef USE_TOUCH_BUTTONS
+          case 'b':
+          { int16_t num,gxp,gyp,gxs,gys,outline,fill,textcolor,textsize;
+            var=atoiv(cp,&num);
+            cp+=var;
+            cp++;
+            uint8_t bflags=num>>8;
+            num=num%MAXBUTTONS;
+            var=atoiv(cp,&gxp);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gyp);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gxs);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gys);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&outline);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&fill);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&textcolor);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&textsize);
+            cp+=var;
+            cp++;
+
+            char bbuff[32];
+            cp=get_string(bbuff,sizeof(bbuff),cp);
+
+            if (buttons[num]) {
+              delete buttons[num];
+            }
+            if (renderer) {
+              buttons[num]= new VButton();
+              if (buttons[num]) {
+                buttons[num]->vpower=bflags;
+                buttons[num]->initButtonUL(renderer,gxp,gyp,gxs,gys,renderer->GetColorFromIndex(outline),\
+                renderer->GetColorFromIndex(fill),renderer->GetColorFromIndex(textcolor),bbuff,textsize);
+                if (!bflags) {
+
+                  buttons[num]->xdrawButton(bitRead(power,num));
+                } else {
+
+                  buttons[num]->vpower&=0x7f;
+                  buttons[num]->xdrawButton(buttons[num]->vpower&0x80);
+                }
+              }
+            }
+          }
+          break;
+#endif
+          default:
+
+            Response_P(PSTR("Unknown Escape"));
+            goto exit;
+            break;
+        }
+      }
+    }
+  }
+  exit:
+
+    dp -= decode_te(linebuf);
+    if ((uint32_t)dp - (uint32_t)linebuf) {
+      if (!fill) {
+        *dp = 0;
+      } else {
+        linebuf[abs(fill)] = 0;
+      }
+      if (fill<0) {
+
+        alignright(linebuf);
+      }
+      if (col > 0 && lin > 0) {
+
+        if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
+        else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
+      } else {
+
+        if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+        else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+      }
+    }
+
+    if (auto_draw&1) {
+      if (renderer) renderer->Updateframe();
+      else DisplayDrawFrame();
+    }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void DisplayClearScreenBuffer(void)
+{
+  if (disp_screen_buffer_cols) {
+    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+      memset(disp_screen_buffer[i], 0, disp_screen_buffer_cols);
+    }
+  }
+}
+
+void DisplayFreeScreenBuffer(void)
+{
+  if (disp_screen_buffer != nullptr) {
+    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+      if (disp_screen_buffer[i] != nullptr) { free(disp_screen_buffer[i]); }
+    }
+    free(disp_screen_buffer);
+    disp_screen_buffer_cols = 0;
+    disp_screen_buffer_rows = 0;
+  }
+}
+
+void DisplayAllocScreenBuffer(void)
+{
+  if (!disp_screen_buffer_cols) {
+    disp_screen_buffer_rows = Settings.display_rows;
+    disp_screen_buffer = (char**)malloc(sizeof(*disp_screen_buffer) * disp_screen_buffer_rows);
+    if (disp_screen_buffer != nullptr) {
+      for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+        disp_screen_buffer[i] = (char*)malloc(sizeof(*disp_screen_buffer[i]) * (Settings.display_cols[0] +1));
+        if (disp_screen_buffer[i] == nullptr) {
+          DisplayFreeScreenBuffer();
+          break;
+        }
+      }
+    }
+    if (disp_screen_buffer != nullptr) {
+      disp_screen_buffer_cols = Settings.display_cols[0] +1;
+      DisplayClearScreenBuffer();
+    }
+  }
+}
+
+void DisplayReAllocScreenBuffer(void)
+{
+  DisplayFreeScreenBuffer();
+  DisplayAllocScreenBuffer();
+}
+
+void DisplayFillScreen(uint32_t line)
+{
+  uint32_t len = disp_screen_buffer_cols - strlen(disp_screen_buffer[line]);
+  if (len) {
+    memset(disp_screen_buffer[line] + strlen(disp_screen_buffer[line]), 0x20, len);
+    disp_screen_buffer[line][disp_screen_buffer_cols -1] = 0;
+  }
+}
+
+
+
+void DisplayClearLogBuffer(void)
+{
+  if (disp_log_buffer_cols) {
+    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+      memset(disp_log_buffer[i], 0, disp_log_buffer_cols);
+    }
+  }
+}
+
+void DisplayFreeLogBuffer(void)
+{
+  if (disp_log_buffer != nullptr) {
+    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+      if (disp_log_buffer[i] != nullptr) { free(disp_log_buffer[i]); }
+    }
+    free(disp_log_buffer);
+    disp_log_buffer_cols = 0;
+  }
+}
+
+void DisplayAllocLogBuffer(void)
+{
+  if (!disp_log_buffer_cols) {
+    disp_log_buffer = (char**)malloc(sizeof(*disp_log_buffer) * DISPLAY_LOG_ROWS);
+    if (disp_log_buffer != nullptr) {
+      for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+        disp_log_buffer[i] = (char*)malloc(sizeof(*disp_log_buffer[i]) * (Settings.display_cols[0] +1));
+        if (disp_log_buffer[i] == nullptr) {
+          DisplayFreeLogBuffer();
+          break;
+        }
+      }
+    }
+    if (disp_log_buffer != nullptr) {
+      disp_log_buffer_cols = Settings.display_cols[0] +1;
+      DisplayClearLogBuffer();
+    }
+  }
+}
+
+void DisplayReAllocLogBuffer(void)
+{
+  DisplayFreeLogBuffer();
+  DisplayAllocLogBuffer();
+}
+
+void DisplayLogBufferAdd(char* txt)
+{
+  if (disp_log_buffer_cols) {
+    strlcpy(disp_log_buffer[disp_log_buffer_idx], txt, disp_log_buffer_cols);
+    disp_log_buffer_idx++;
+    if (DISPLAY_LOG_ROWS == disp_log_buffer_idx) { disp_log_buffer_idx = 0; }
+  }
+}
+
+char* DisplayLogBuffer(char temp_code)
+{
+  char* result = nullptr;
+  if (disp_log_buffer_cols) {
+    if (disp_log_buffer_idx != disp_log_buffer_ptr) {
+      result = disp_log_buffer[disp_log_buffer_ptr];
+      disp_log_buffer_ptr++;
+      if (DISPLAY_LOG_ROWS == disp_log_buffer_ptr) { disp_log_buffer_ptr = 0; }
+
+      char *pch = strchr(result, '~');
+      if (pch != nullptr) { result[pch - result] = temp_code; }
+    }
+  }
+  return result;
+}
+
+void DisplayLogBufferInit(void)
+{
+  if (Settings.display_mode) {
+    disp_log_buffer_idx = 0;
+    disp_log_buffer_ptr = 0;
+    disp_refresh = Settings.display_refresh;
+
+    snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%c"), TempUnit());
+    snprintf_P(disp_pres, sizeof(disp_pres), PressureUnit().c_str());
+
+    DisplayReAllocLogBuffer();
+
+    char buffer[40];
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_VERSION " %s%s"), my_version, my_image);
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR("Display mode %d"), Settings.display_mode);
+    DisplayLogBufferAdd(buffer);
+
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_CMND_HOSTNAME " %s"), my_hostname);
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_SSID " %s"), SettingsText(SET_STASSID1 + Settings.sta_active));
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_MAC " %s"), WiFi.macAddress().c_str());
+    DisplayLogBufferAdd(buffer);
+    if (!global_state.wifi_down) {
+      snprintf_P(buffer, sizeof(buffer), PSTR("IP %s"), WiFi.localIP().toString().c_str());
+      DisplayLogBufferAdd(buffer);
+      snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_RSSI " %d%%"), WifiGetRssiAsQuality(WiFi.RSSI()));
+      DisplayLogBufferAdd(buffer);
+    }
+  }
+}
+
+
+
+
+
+enum SensorQuantity {
+  JSON_TEMPERATURE,
+  JSON_HUMIDITY, JSON_LIGHT, JSON_NOISE, JSON_AIRQUALITY,
+  JSON_PRESSURE, JSON_PRESSUREATSEALEVEL,
+  JSON_ILLUMINANCE,
+  JSON_GAS,
+  JSON_YESTERDAY, JSON_TOTAL, JSON_TODAY,
+  JSON_PERIOD,
+  JSON_POWERFACTOR, JSON_COUNTER, JSON_ANALOG_INPUT, JSON_UV_LEVEL,
+  JSON_CURRENT,
+  JSON_VOLTAGE,
+  JSON_POWERUSAGE,
+  JSON_CO2,
+  JSON_FREQUENCY };
+const char kSensorQuantity[] PROGMEM =
+  D_JSON_TEMPERATURE "|"
+  D_JSON_HUMIDITY "|" D_JSON_LIGHT "|" D_JSON_NOISE "|" D_JSON_AIRQUALITY "|"
+  D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
+  D_JSON_ILLUMINANCE "|"
+  D_JSON_GAS "|"
+  D_JSON_YESTERDAY "|" D_JSON_TOTAL "|" D_JSON_TODAY "|"
+  D_JSON_PERIOD "|"
+  D_JSON_POWERFACTOR "|" D_JSON_COUNTER "|" D_JSON_ANALOG_INPUT "|" D_JSON_UV_LEVEL "|"
+  D_JSON_CURRENT "|"
+  D_JSON_VOLTAGE "|"
+  D_JSON_POWERUSAGE "|"
+  D_JSON_CO2 "|"
+  D_JSON_FREQUENCY ;
+
+void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value)
+{
+  char quantity[TOPSZ];
+  char buffer[Settings.display_cols[0] +1];
+  char spaces[Settings.display_cols[0]];
+  char source[Settings.display_cols[0] - Settings.display_cols[1]];
+  char svalue[Settings.display_cols[1] +1];
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("DisplayJsonValue"));
+#endif
+
+  memset(spaces, 0x20, sizeof(spaces));
+  spaces[sizeof(spaces) -1] = '\0';
+  snprintf_P(source, sizeof(source), PSTR("%s%s%s%s"), topic, (strlen(topic))?"/":"", mkey, spaces);
+
+  int quantity_code = GetCommandCode(quantity, sizeof(quantity), mkey, kSensorQuantity);
+  if ((-1 == quantity_code) || !strcmp_P(mkey, S_RSLT_POWER)) {
+    return;
+  }
+  if (JSON_TEMPERATURE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s~%s"), value, disp_temp);
+  }
+  else if ((quantity_code >= JSON_HUMIDITY) && (quantity_code <= JSON_AIRQUALITY)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%%"), value);
+  }
+  else if ((quantity_code >= JSON_PRESSURE) && (quantity_code <= JSON_PRESSUREATSEALEVEL)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s"), value, disp_pres);
+  }
+  else if (JSON_ILLUMINANCE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_LUX), value);
+  }
+  else if (JSON_GAS == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOOHM), value);
+  }
+  else if ((quantity_code >= JSON_YESTERDAY) && (quantity_code <= JSON_TODAY)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOWATTHOUR), value);
+  }
+  else if (JSON_PERIOD == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATTHOUR), value);
+  }
+  else if ((quantity_code >= JSON_POWERFACTOR) && (quantity_code <= JSON_UV_LEVEL)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), value);
+  }
+  else if (JSON_CURRENT == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_AMPERE), value);
+  }
+  else if (JSON_VOLTAGE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_VOLT), value);
+  }
+  else if (JSON_POWERUSAGE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATT), value);
+  }
+  else if (JSON_CO2 == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_PARTS_PER_MILLION), value);
+  }
+  else if (JSON_FREQUENCY == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_HERTZ), value);
+  }
+  snprintf_P(buffer, sizeof(buffer), PSTR("%s %s"), source, svalue);
+
+
+
+  DisplayLogBufferAdd(buffer);
+}
+
+void DisplayAnalyzeJson(char *topic, char *json)
+{
+# 1145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
+  String jsonStr = json;
+
+  StaticJsonBuffer<1024> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(jsonStr);
+  if (root.success()) {
+
+    const char *unit;
+    unit = root[D_JSON_TEMPERATURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), unit);
+    }
+    unit = root[D_JSON_PRESSURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_pres, sizeof(disp_pres), PSTR("%s"), unit);
+    }
+
+    for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) {
+      JsonVariant value = it->value;
+      if (value.is<JsonObject>()) {
+        JsonObject& Object2 = value;
+        for (JsonObject::iterator it2 = Object2.begin(); it2 != Object2.end(); ++it2) {
+          JsonVariant value2 = it2->value;
+          if (value2.is<JsonObject>()) {
+            JsonObject& Object3 = value2;
+            for (JsonObject::iterator it3 = Object3.begin(); it3 != Object3.end(); ++it3) {
+              const char* value = it3->value;
+              if (value != nullptr) {
+                DisplayJsonValue(topic, it->key, it3->key, value);
+              }
+            }
+          } else {
+            const char* value = it2->value;
+            if (value != nullptr) {
+              DisplayJsonValue(topic, it->key, it2->key, value);
+            }
+          }
+        }
+      } else {
+        const char* value = it->value;
+        if (value != nullptr) {
+          DisplayJsonValue(topic, it->key, it->key, value);
+        }
+      }
+    }
+  }
+}
+
+void DisplayMqttSubscribe(void)
+{
+
+
+
+
+
+
+  if (Settings.display_model && (Settings.display_mode &0x04)) {
+
+    char stopic[TOPSZ];
+    char ntopic[TOPSZ];
+
+    ntopic[0] = '\0';
+    strlcpy(stopic, SettingsText(SET_MQTT_FULLTOPIC), sizeof(stopic));
+    char *tp = strtok(stopic, "/");
+    while (tp != nullptr) {
+      if (!strcmp_P(tp, MQTT_TOKEN_PREFIX)) {
+        break;
+      }
+      strncat_P(ntopic, PSTR("+/"), sizeof(ntopic) - strlen(ntopic) -1);
+      tp = strtok(nullptr, "/");
+    }
+    strncat(ntopic, SettingsText(SET_MQTTPREFIX3), sizeof(ntopic) - strlen(ntopic) -1);
+    strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1);
+    MqttSubscribe(ntopic);
+    disp_subscribed = true;
+  } else {
+    disp_subscribed = false;
+  }
+}
+
+bool DisplayMqttData(void)
+{
+  if (disp_subscribed) {
+    char stopic[TOPSZ];
+
+    snprintf_P(stopic, sizeof(stopic) , PSTR("%s/"), SettingsText(SET_MQTTPREFIX3));
+    char *tp = strstr(XdrvMailbox.topic, stopic);
+    if (tp) {
+      if (Settings.display_mode &0x04) {
+        tp = tp + strlen(stopic);
+        char *topic = strtok(tp, "/");
+        DisplayAnalyzeJson(topic, XdrvMailbox.data);
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+void DisplayLocalSensor(void)
+{
+  if ((Settings.display_mode &0x02) && (0 == tele_period)) {
+    char no_topic[1] = { 0 };
+
+    DisplayAnalyzeJson(no_topic, mqtt_data);
+  }
+}
+
+#endif
+
+
+
+
+
+void DisplayInitDriver(void)
+{
+  XdspCall(FUNC_DISPLAY_INIT_DRIVER);
+
+  if (renderer) {
+    renderer->setTextFont(Settings.display_font);
+    renderer->setTextSize(Settings.display_size);
+  }
+
+
+
+
+  if (Settings.display_model) {
+    devices_present++;
+    disp_device = devices_present;
+
+#ifndef USE_DISPLAY_MODES1TO5
+    Settings.display_mode = 0;
+#else
+    DisplayLogBufferInit();
+#endif
+  }
+}
+
+void DisplaySetPower(void)
+{
+  disp_power = bitRead(XdrvMailbox.index, disp_device -1);
+
+
+
+  if (Settings.display_model) {
+    if (!renderer) {
+      XdspCall(FUNC_DISPLAY_POWER);
+    } else {
+      renderer->DisplayOnff(disp_power);
+    }
+  }
+}
+
+
+
+
+
+void CmndDisplay(void)
+{
+  Response_P(PSTR("{\"" D_PRFX_DISPLAY "\":{\"" D_CMND_DISP_MODEL "\":%d,\"" D_CMND_DISP_WIDTH "\":%d,\"" D_CMND_DISP_HEIGHT "\":%d,\""
+    D_CMND_DISP_MODE "\":%d,\"" D_CMND_DISP_DIMMER "\":%d,\"" D_CMND_DISP_SIZE "\":%d,\"" D_CMND_DISP_FONT "\":%d,\""
+    D_CMND_DISP_ROTATE "\":%d,\"" D_CMND_DISP_REFRESH "\":%d,\"" D_CMND_DISP_COLS "\":[%d,%d],\"" D_CMND_DISP_ROWS "\":%d}}"),
+    Settings.display_model, Settings.display_width, Settings.display_height,
+    Settings.display_mode, Settings.display_dimmer, Settings.display_size, Settings.display_font,
+    Settings.display_rotate, Settings.display_refresh, Settings.display_cols[0], Settings.display_cols[1], Settings.display_rows);
+}
+
+void CmndDisplayModel(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < DISPLAY_MAX_DRIVERS)) {
+    uint32_t last_display_model = Settings.display_model;
+    Settings.display_model = XdrvMailbox.payload;
+    if (XdspCall(FUNC_DISPLAY_MODEL)) {
+      restart_flag = 2;
+    } else {
+      Settings.display_model = last_display_model;
+    }
+  }
+  ResponseCmndNumber(Settings.display_model);
+}
+
+void CmndDisplayWidth(void)
+{
+  if (XdrvMailbox.payload > 0) {
+    if (XdrvMailbox.payload != Settings.display_width) {
+      Settings.display_width = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndNumber(Settings.display_width);
+}
+
+void CmndDisplayHeight(void)
+{
+  if (XdrvMailbox.payload > 0) {
+    if (XdrvMailbox.payload != Settings.display_height) {
+      Settings.display_height = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndNumber(Settings.display_height);
+}
+
+void CmndDisplayMode(void)
+{
+#ifdef USE_DISPLAY_MODES1TO5
+
+
+
+
+
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    uint32_t last_display_mode = Settings.display_mode;
+    Settings.display_mode = XdrvMailbox.payload;
+
+    if (disp_subscribed != (Settings.display_mode &0x04)) {
+      restart_flag = 2;
+    } else {
+      if (last_display_mode && !Settings.display_mode) {
+        DisplayInit(DISPLAY_INIT_MODE);
+        if (renderer) renderer->fillScreen(bg_color);
+        else DisplayClear();
+      } else {
+        DisplayLogBufferInit();
+        DisplayInit(DISPLAY_INIT_MODE);
+      }
+    }
+  }
+#endif
+  ResponseCmndNumber(Settings.display_mode);
+}
+
+void CmndDisplayDimmer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    Settings.display_dimmer = ((XdrvMailbox.payload +1) * 100) / 666;
+    if (Settings.display_dimmer && !(disp_power)) {
+      ExecuteCommandPower(disp_device, POWER_ON, SRC_DISPLAY);
+    }
+    else if (!Settings.display_dimmer && disp_power) {
+      ExecuteCommandPower(disp_device, POWER_OFF, SRC_DISPLAY);
+    }
+    if (renderer) renderer->dim(Settings.display_dimmer);
+  }
+  ResponseCmndNumber(Settings.display_dimmer);
+}
+
+void CmndDisplaySize(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 4)) {
+    Settings.display_size = XdrvMailbox.payload;
+    if (renderer) renderer->setTextSize(Settings.display_size);
+    else DisplaySetSize(Settings.display_size);
+  }
+  ResponseCmndNumber(Settings.display_size);
+}
+
+void CmndDisplayFont(void)
+{
+  if ((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 4)) {
+    Settings.display_font = XdrvMailbox.payload;
+    if (renderer) renderer->setTextFont(Settings.display_font);
+    else DisplaySetFont(Settings.display_font);
+  }
+  ResponseCmndNumber(Settings.display_font);
+}
+
+void CmndDisplayRotate(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
+    if (Settings.display_rotate != XdrvMailbox.payload) {
+# 1428 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
+      Settings.display_rotate = XdrvMailbox.payload;
+      DisplayInit(DISPLAY_INIT_MODE);
+#ifdef USE_DISPLAY_MODES1TO5
+      DisplayLogBufferInit();
+#endif
+    }
+  }
+  ResponseCmndNumber(Settings.display_rotate);
+}
+
+void CmndDisplayText(void)
+{
+  if (disp_device && XdrvMailbox.data_len > 0) {
+#ifndef USE_DISPLAY_MODES1TO5
+    DisplayText();
+#else
+    if (!Settings.display_mode) {
+      DisplayText();
+    } else {
+      DisplayLogBufferAdd(XdrvMailbox.data);
+    }
+#endif
+    ResponseCmndChar(XdrvMailbox.data);
+  }
+}
+
+void CmndDisplayAddress(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 8)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
+      Settings.display_address[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.display_address[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDisplayRefresh(void)
+{
+  if ((XdrvMailbox.payload >= 1) && (XdrvMailbox.payload <= 7)) {
+    Settings.display_refresh = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.display_refresh);
+}
+
+void CmndDisplayColumns(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_COLS)) {
+      Settings.display_cols[XdrvMailbox.index -1] = XdrvMailbox.payload;
+#ifdef USE_DISPLAY_MODES1TO5
+      if (1 == XdrvMailbox.index) {
+        DisplayLogBufferInit();
+        DisplayReAllocScreenBuffer();
+      }
+#endif
+    }
+    ResponseCmndIdxNumber(Settings.display_cols[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDisplayRows(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_ROWS)) {
+    Settings.display_rows = XdrvMailbox.payload;
+#ifdef USE_DISPLAY_MODES1TO5
+    DisplayLogBufferInit();
+    DisplayReAllocScreenBuffer();
+#endif
+  }
+  ResponseCmndNumber(Settings.display_rows);
+}
+
+
+
+
+
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp) {
+  if (!renderer) return;
+
+
+  File fp;
+  fp=SD.open(file,FILE_READ);
+  if (!fp) return;
+  uint16_t xsize;
+  fp.read((uint8_t*)&xsize,2);
+  uint16_t ysize;
+  fp.read((uint8_t*)&ysize,2);
+
+#if 1
+#define XBUFF 128
+  uint16_t xdiv=xsize/XBUFF;
+  renderer->setAddrWindow(xp,yp,xp+xsize,yp+ysize);
+  for(int16_t j=0; j<ysize; j++) {
+    for(int16_t i=0; i<xsize; i+=XBUFF) {
+      uint16_t rgb[XBUFF];
+      uint16_t len=fp.read((uint8_t*)rgb,XBUFF*2);
+      if (len>=2) renderer->pushColors(rgb,len/2,true);
+    }
+    OsWatchLoop();
+  }
+  renderer->setAddrWindow(0,0,0,0);
+#else
+  for(int16_t j=0; j<ysize; j++) {
+    for(int16_t i=0; i<xsize; i++ ) {
+      uint16_t rgb;
+      uint8_t res=fp.read((uint8_t*)&rgb,2);
+      if (!res) break;
+      renderer->writePixel(xp+i,yp,rgb);
+    }
+    delay(0);
+    OsWatchLoop();
+    yp++;
+  }
+#endif
+  fp.close();
+}
+#endif
+
+#ifdef USE_AWATCH
+#define MINUTE_REDUCT 4
+
+#ifndef pi
+#define pi 3.14159265359
+#endif
+
+
+void DrawAClock(uint16_t rad) {
+    if (!renderer) return;
+    float frad=rad;
+    uint16_t hred=frad/3.0;
+    renderer->fillCircle(disp_xpos, disp_ypos, rad, bg_color);
+    renderer->drawCircle(disp_xpos, disp_ypos, rad, fg_color);
+    renderer->fillCircle(disp_xpos, disp_ypos, 4, fg_color);
+    for (uint8_t count=0; count<60; count+=5) {
+      float p1=((float)count*(pi/30)-(pi/2));
+      uint8_t len;
+      if ((count%15)==0) {
+        len=4;
+      } else {
+        len=2;
+      }
+      renderer->writeLine(disp_xpos+((float)(rad-len)*cosf(p1)), disp_ypos+((float)(rad-len)*sinf(p1)), disp_xpos+(frad*cosf(p1)), disp_ypos+(frad*sinf(p1)), fg_color);
+    }
+
+
+    float hour=((float)RtcTime.hour*60.0+(float)RtcTime.minute)/60.0;
+    float temp=(hour*(pi/6.0)-(pi/2.0));
+    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-hred)*cosf(temp),disp_ypos+(frad-hred)*sinf(temp), fg_color);
+
+
+    temp=((float)RtcTime.minute*(pi/30.0)-(pi/2.0));
+    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-MINUTE_REDUCT)*cosf(temp),disp_ypos+(frad-MINUTE_REDUCT)*sinf(temp), fg_color);
+}
+#endif
+
+
+#ifdef USE_GRAPH
+
+typedef union {
+  uint8_t data;
+  struct {
+      uint8_t overlay : 1;
+      uint8_t draw : 1;
+      uint8_t nu3 : 1;
+      uint8_t nu4 : 1;
+      uint8_t nu5 : 1;
+      uint8_t nu6 : 1;
+      uint8_t nu7 : 1;
+      uint8_t nu8 : 1;
+  };
+} GFLAGS;
+
+struct GRAPH {
+  uint16_t xp;
+  uint16_t yp;
+  uint16_t xs;
+  uint16_t ys;
+  float ymin;
+  float ymax;
+  float range;
+  uint32_t x_time;
+  uint32_t last_ms;
+  uint32_t last_ms_redrawn;
+  int16_t decimation;
+  uint16_t dcnt;
+  uint32_t summ;
+  uint16_t xcnt;
+  uint8_t *values;
+  uint8_t xticks;
+  uint8_t yticks;
+  uint8_t last_val;
+  uint8_t color_index;
+  GFLAGS flags;
+};
+
+
+struct GRAPH *graph[NUM_GRAPHS];
+
+#define TICKLEN 4
+void ClrGraph(uint16_t num) {
+  struct GRAPH *gp=graph[num];
+
+  uint16_t xticks=gp->xticks;
+  uint16_t yticks=gp->yticks;
+  uint16_t count;
+
+
+  if (gp->flags.overlay) return;
+
+  renderer->fillRect(gp->xp+1,gp->yp+1,gp->xs-2,gp->ys-2,bg_color);
+
+  if (xticks) {
+    float cxp=gp->xp,xd=(float)gp->xs/(float)xticks;
+    for (count=0; count<xticks; count++) {
+      renderer->writeFastVLine(cxp,gp->yp+gp->ys-TICKLEN,TICKLEN,fg_color);
+      cxp+=xd;
+    }
+  }
+  if (yticks) {
+    if (gp->ymin<0 && gp->ymax>0) {
+
+      float cxp=0;
+      float czp=gp->yp+(gp->ymax/gp->range);
+      while (cxp<gp->xs) {
+        renderer->writeFastHLine(gp->xp+cxp,czp,2,fg_color);
+        cxp+=6.0;
+      }
+
+      float cyp=0,yd=gp->ys/yticks;
+      for (count=0; count<yticks; count++) {
+        if ((czp-cyp)>gp->yp) {
+          renderer->writeFastHLine(gp->xp,czp-cyp,TICKLEN,fg_color);
+          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp-cyp,TICKLEN,fg_color);
+        }
+        if ((czp+cyp)<(gp->yp+gp->ys)) {
+          renderer->writeFastHLine(gp->xp,czp+cyp,TICKLEN,fg_color);
+          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp+cyp,TICKLEN,fg_color);
+        }
+        cyp+=yd;
+      }
+    } else {
+      float cyp=gp->yp,yd=gp->ys/yticks;
+      for (count=0; count<yticks; count++) {
+        renderer->writeFastHLine(gp->xp,cyp,TICKLEN,fg_color);
+        renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,cyp,TICKLEN,fg_color);
+        cyp+=yd;
+      }
+    }
+  }
+}
+
+
+void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol) {
+  if (!renderer) return;
+  uint8_t rflg=0;
+  if (xs<0) {
+    rflg=1;
+    xs=abs(xs);
+  }
+  struct GRAPH *gp;
+  uint16_t count;
+  uint16_t index=num%NUM_GRAPHS;
+  if (!graph[index]) {
+    gp=(struct GRAPH*)calloc(sizeof(struct GRAPH),1);
+    if (!gp) return;
+    graph[index]=gp;
+  } else {
+    gp=graph[index];
+    if (rflg) {
+      RedrawGraph(index,1);
+      return;
+    }
+  }
+
+
+  gp->xticks=(num>>4)&0x3f;
+  gp->yticks=(num>>10)&0x3f;
+  gp->xp=xp;
+  gp->yp=yp;
+  gp->xs=xs;
+  gp->ys=ys;
+  if (!dec) dec=1;
+  gp->decimation=dec;
+  if (dec>0) {
+
+    gp->x_time=((float)dec*60000.0)/(float)xs;
+    gp->last_ms=millis()+gp->x_time;
+  }
+  gp->ymin=ymin;
+  gp->ymax=ymax;
+  gp->range=(ymax-ymin)/ys;
+  gp->xcnt=0;
+  gp->dcnt=0;
+  gp->summ=0;
+  if (gp->values) free(gp->values);
+  gp->values=(uint8_t*) calloc(1,xs+2);
+  if (!gp->values) {
+    free(gp);
+    graph[index]=0;
+    return;
+  }
+
+  gp->values[0]=0;
+
+  gp->last_ms_redrawn=millis();
+
+  if (!icol) icol=1;
+  gp->color_index=icol;
+  gp->flags.overlay=0;
+  gp->flags.draw=1;
+
+
+  if (index>0) {
+    for (uint8_t count=0; count<index; count++) {
+      if (graph[count]) {
+
+
+        struct GRAPH *gp1=graph[count];
+        if ((gp->xp==gp1->xp) && (gp->yp==gp1->yp)) {
+          gp->flags.overlay=1;
+          break;
+        }
+      }
+    }
+  }
+
+
+  renderer->drawRect(xp,yp,xs,ys,fg_color);
+
+  ClrGraph(index);
+
+}
+
+
+void DisplayCheckGraph() {
+  int16_t count;
+  struct GRAPH *gp;
+  for (count=0;count<NUM_GRAPHS;count++) {
+    gp=graph[count];
+    if (gp) {
+      if (gp->decimation>0) {
+
+        while (millis()>gp->last_ms) {
+          gp->last_ms+=gp->x_time;
+          uint8_t val;
+          if (gp->dcnt) {
+            val=gp->summ/gp->dcnt;
+            gp->dcnt=0;
+            gp->summ=0;
+            gp->last_val=val;
+          } else {
+            val=gp->last_val;
+          }
+          AddGraph(count,val);
+        }
+      }
+    }
+  }
+}
+
+
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+#include <SD.h>
+
+void Save_graph(uint8_t num, char *path) {
+  if (!renderer) return;
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  File fp;
+  SD.remove(path);
+  fp=SD.open(path,FILE_WRITE);
+  if (!fp) return;
+  char str[32];
+  sprintf_P(str,PSTR("%d\t%d\t%d\t"),gp->xcnt,gp->xs,gp->ys);
+  fp.print(str);
+  dtostrfd(gp->ymin,2,str);
+  fp.print(str);
+  fp.print("\t");
+  dtostrfd(gp->ymax,2,str);
+  fp.print(str);
+  fp.print("\t");
+  for (uint32_t count=0;count<gp->xs;count++) {
+    dtostrfd(gp->values[count],0,str);
+    fp.print(str);
+    fp.print("\t");
+  }
+  fp.print("\n");
+  fp.close();
+}
+void Restore_graph(uint8_t num, char *path) {
+  if (!renderer) return;
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  File fp;
+  fp=SD.open(path,FILE_READ);
+  if (!fp) return;
+  char vbuff[32];
+  char *cp=vbuff;
+  uint8_t buf[2];
+  uint8_t findex=0;
+
+  for (uint32_t count=0;count<=gp->xs+4;count++) {
+    cp=vbuff;
+    findex=0;
+    while (fp.available()) {
+      fp.read(buf,1);
+      if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
+        break;
+      } else {
+        *cp++=buf[0];
+        findex++;
+        if (findex>=sizeof(vbuff)-1) break;
+      }
+    }
+    *cp=0;
+    if (count<=4) {
+      if (count==0) gp->xcnt=atoi(vbuff);
+    } else {
+      gp->values[count-5]=atoi(vbuff);
+    }
+  }
+  fp.close();
+  RedrawGraph(num,1);
+}
+#endif
+
+void RedrawGraph(uint8_t num, uint8_t flags) {
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  if (!flags) {
+    gp->flags.draw=0;
+    return;
+  }
+  if (!renderer) return;
+
+  gp->flags.draw=1;
+  uint16_t linecol=fg_color;
+
+  if (color_type==COLOR_COLOR) {
+    linecol=renderer->GetColorFromIndex(gp->color_index);
+  }
+
+  if (!gp->flags.overlay) {
+
+    renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
+
+    ClrGraph(index);
+  }
+
+  for (uint16_t count=0;count<gp->xs-1;count++) {
+    renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
+  }
+}
+
+
+void AddGraph(uint8_t num,uint8_t val) {
+  struct GRAPH *gp=graph[num];
+  if (!renderer) return;
+
+  uint16_t linecol=fg_color;
+  if (color_type==COLOR_COLOR) {
+    linecol=renderer->GetColorFromIndex(gp->color_index);
+  }
+  gp->xcnt++;
+  if (gp->xcnt>gp->xs) {
+    gp->xcnt=gp->xs;
+    int16_t count;
+
+    for (count=0;count<gp->xs-1;count++) {
+      gp->values[count]=gp->values[count+1];
+    }
+    gp->values[gp->xcnt-1]=val;
+
+    if (!gp->flags.draw) return;
+
+
+    if (millis()-gp->last_ms_redrawn>1000) {
+      gp->last_ms_redrawn=millis();
+
+      if (!gp->flags.overlay) {
+
+        renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
+
+        ClrGraph(num);
+      }
+
+      for (count=0;count<gp->xs-1;count++) {
+        renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
+      }
+    }
+  } else {
+
+    gp->values[gp->xcnt]=val;
+    if (!gp->flags.draw) return;
+    renderer->writeLine(gp->xp+gp->xcnt-1,gp->yp+gp->ys-gp->values[gp->xcnt-1]-1,gp->xp+gp->xcnt,gp->yp+gp->ys-gp->values[gp->xcnt]-1,linecol);
+  }
+}
+
+
+
+void AddValue(uint8_t num,float fval) {
+
+  num=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[num];
+  if (!gp) return;
+
+  if (fval>gp->ymax) fval=gp->ymax;
+  if (fval<gp->ymin) fval=gp->ymin;
+
+  int16_t val;
+  val=(fval-gp->ymin)/gp->range;
+
+  if (val>gp->ys-1) val=gp->ys-1;
+  if (val<0) val=0;
+
+
+  gp->summ+=val;
+  gp->dcnt++;
+
+
+  if (gp->decimation<0) {
+    if (gp->dcnt>=-gp->decimation) {
+      gp->dcnt=0;
+
+      val=gp->summ/-gp->decimation;
+      gp->summ=0;
+
+      AddGraph(num,val);
+    }
+  }
+}
+#endif
+
+
+
+
+
+bool Xdrv13(uint8_t function)
+{
+  bool result = false;
+
+  if ((i2c_flg || spi_flg || soft_spi_flg) && XdspPresent()) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        DisplayInitDriver();
+#ifdef USE_GRAPH
+        for (uint8_t count=0;count<NUM_GRAPHS;count++) {
+          graph[count]=0;
+        }
+#endif
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (Settings.display_model) { XdspCall(FUNC_DISPLAY_EVERY_50_MSECOND); }
+        break;
+      case FUNC_SET_POWER:
+        DisplaySetPower();
+        break;
+      case FUNC_EVERY_SECOND:
+#ifdef USE_GRAPH
+        DisplayCheckGraph();
+#endif
+
+#ifdef USE_DISPLAY_MODES1TO5
+        if (Settings.display_model && Settings.display_mode) { XdspCall(FUNC_DISPLAY_EVERY_SECOND); }
+#endif
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_MQTT_SUBSCRIBE:
+        DisplayMqttSubscribe();
+        break;
+      case FUNC_MQTT_DATA:
+        result = DisplayMqttData();
+        break;
+      case FUNC_SHOW_SENSOR:
+        DisplayLocalSensor();
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kDisplayCommands, DisplayCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
+# 64 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
+#ifdef USE_MP3_PLAYER
+
+
+
+
+
+#define XDRV_14 14
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *MP3Player;
+
+
+
+
+
+#define D_CMND_MP3 "MP3"
+
+const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}";
+const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}";
+const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC";
+
+
+
+
+
+enum MP3_Commands {
+  CMND_MP3_TRACK,
+  CMND_MP3_PLAY,
+  CMND_MP3_PAUSE,
+  CMND_MP3_STOP,
+  CMND_MP3_VOLUME,
+  CMND_MP3_EQ,
+  CMND_MP3_DEVICE,
+  CMND_MP3_RESET,
+  CMND_MP3_DAC };
+
+
+
+
+
+
+#define MP3_CMD_RESET_VALUE 0
+
+#define MP3_CMD_TRACK 0x03
+#define MP3_CMD_PLAY 0x0d
+#define MP3_CMD_PAUSE 0x0e
+#define MP3_CMD_STOP 0x16
+#define MP3_CMD_VOLUME 0x06
+#define MP3_CMD_EQ 0x07
+#define MP3_CMD_DEVICE 0x09
+#define MP3_CMD_RESET 0x0C
+#define MP3_CMD_DAC 0x1A
+
+
+
+
+
+
+uint16_t MP3_Checksum(uint8_t *array)
+{
+  uint16_t checksum = 0;
+  for (uint32_t i = 0; i < 6; i++) {
+    checksum += array[i];
+  }
+  checksum = checksum^0xffff;
+  return (checksum+1);
+}
+
+
+
+
+
+
+void MP3PlayerInit(void) {
+  MP3Player = new TasmotaSerial(-1, pin[GPIO_MP3_DFR562]);
+
+  if (MP3Player->begin(9600)) {
+    MP3Player->flush();
+    delay(1000);
+    MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE);
+    delay(3000);
+    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
+  }
+  return;
+}
+# 159 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
+void MP3_CMD(uint8_t mp3cmd,uint16_t val) {
+  uint8_t i = 0;
+  uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef};
+  cmd[3] = mp3cmd;
+  cmd[4] = 0;
+  cmd[5] = val>>8;
+  cmd[6] = val;
+  uint16_t chks = MP3_Checksum(&cmd[1]);
+  cmd[7] = chks>>8;
+  cmd[8] = chks;
+  MP3Player->write(cmd, sizeof(cmd));
+  delay(1000);
+  if (mp3cmd == MP3_CMD_RESET) {
+    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
+  }
+  return;
+}
+
+
+
+
+
+bool MP3PlayerCmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_MP3);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands);
+
+    switch (command_code) {
+      case CMND_MP3_TRACK:
+      case CMND_MP3_VOLUME:
+      case CMND_MP3_EQ:
+      case CMND_MP3_DEVICE:
+      case CMND_MP3_DAC:
+
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); }
+          if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_DAC) { MP3_CMD(MP3_CMD_DAC, XdrvMailbox.payload); }
+        }
+        Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_MP3_PLAY:
+      case CMND_MP3_PAUSE:
+      case CMND_MP3_STOP:
+      case CMND_MP3_RESET:
+
+        if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); }
+        if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); }
+        if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); }
+        if (command_code == CMND_MP3_RESET) { MP3_CMD(MP3_CMD_RESET, 0); }
+        Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload);
+        break;
+      default:
+
+       serviced = false;
+     break;
+    }
+  } else {
+    return false;
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xdrv14(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_MP3_DFR562] < 99) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        MP3PlayerInit();
+        break;
+      case FUNC_COMMAND:
+        result = MP3PlayerCmd();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_15_pca9685.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_15_pca9685.ino"
+#ifdef USE_I2C
+#ifdef USE_PCA9685
+
+
+
+
+
+
+#define XDRV_15 15
+#define XI2C_01 1
+
+#define PCA9685_REG_MODE1 0x00
+#define PCA9685_REG_LED0_ON_L 0x06
+#define PCA9685_REG_PRE_SCALE 0xFE
+
+#ifndef USE_PCA9685_ADDR
+  #define USE_PCA9685_ADDR 0x40
+#endif
+#ifndef USE_PCA9685_FREQ
+  #define USE_PCA9685_FREQ 50
+#endif
+
+bool pca9685_detected = false;
+uint16_t pca9685_freq = USE_PCA9685_FREQ;
+uint16_t pca9685_pin_pwm_value[16];
+
+void PCA9685_Detect(void)
+{
+  if (I2cActive(USE_PCA9685_ADDR)) { return; }
+
+  uint8_t buffer;
+  if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
+    I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x20);
+    if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
+      if (0x20 == buffer) {
+        pca9685_detected = true;
+        I2cSetActiveFound(USE_PCA9685_ADDR, "PCA9685");
+        PCA9685_Reset();
+      }
+    }
+  }
+}
+
+void PCA9685_Reset(void)
+{
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x80);
+  PCA9685_SetPWMfreq(USE_PCA9685_FREQ);
+  for (uint32_t pin=0;pin<16;pin++) {
+    PCA9685_SetPWM(pin,0,false);
+    pca9685_pin_pwm_value[pin] = 0;
+  }
+  Response_P(PSTR("{\"PCA9685\":{\"RESET\":\"OK\"}}"));
+}
+
+void PCA9685_SetPWMfreq(double freq) {
+
+
+
+
+  if (freq > 23 && freq < 1527) {
+   pca9685_freq=freq;
+  } else {
+   pca9685_freq=50;
+  }
+  uint8_t pre_scale_osc = round(25000000/(4096*pca9685_freq))-1;
+  if (1526 == pca9685_freq) pre_scale_osc=0xFF;
+  uint8_t current_mode1 = I2cRead8(USE_PCA9685_ADDR, PCA9685_REG_MODE1);
+  uint8_t sleep_mode1 = (current_mode1&0x7F) | 0x10;
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, sleep_mode1);
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_PRE_SCALE, pre_scale_osc);
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, current_mode1 | 0xA0);
+}
+
+void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off) {
+  uint8_t led_reg = PCA9685_REG_LED0_ON_L + 4 * pin;
+  uint32_t led_data = 0;
+  I2cWrite8(USE_PCA9685_ADDR, led_reg, on);
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+1, (on >> 8));
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+2, off);
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+3, (off >> 8));
+}
+
+void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted) {
+  if (4096 == pwm) {
+    PCA9685_SetPWM_Reg(pin, 4096, 0);
+  } else {
+    PCA9685_SetPWM_Reg(pin, 0, pwm);
+  }
+  pca9685_pin_pwm_value[pin] = pwm;
+}
+
+bool PCA9685_Command(void)
+{
+  bool serviced = true;
+  bool validpin = false;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"STATUS")) { PCA9685_OutputTelemetry(false); return serviced; }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) {
+    if (paramcount > 1) {
+      uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((new_freq >= 24) && (new_freq <= 1526)) {
+        PCA9685_SetPWMfreq(new_freq);
+        Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i, \"Result\":\"OK\"}}"),new_freq);
+        return serviced;
+      }
+    } else {
+      Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i}}"),pca9685_freq);
+      return serviced;
+    }
+  }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWM")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (paramcount > 2) {
+        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "ON")) {
+          PCA9685_SetPWM(pin, 4096, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,4096);
+          serviced = true;
+          return serviced;
+        }
+        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "OFF")) {
+          PCA9685_SetPWM(pin, 0, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,0);
+          serviced = true;
+          return serviced;
+        }
+        uint16_t pwm = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        if ((pin >= 0 && pin <= 15) && (pwm >= 0 && pwm <= 4096)) {
+          PCA9685_SetPWM(pin, pwm, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,pwm);
+          serviced = true;
+          return serviced;
+        }
+      }
+    }
+  }
+  return serviced;
+}
+
+void PCA9685_OutputTelemetry(bool telemetry)
+{
+  ResponseTime_P(PSTR(",\"PCA9685\":{\"PWM_FREQ\":%i,"),pca9685_freq);
+  for (uint32_t pin=0;pin<16;pin++) {
+    ResponseAppend_P(PSTR("\"PWM%i\":%i,"),pin,pca9685_pin_pwm_value[pin]);
+  }
+  ResponseAppend_P(PSTR("\"END\":1}}"));
+  if (telemetry) {
+    MqttPublishTeleSensor();
+  }
+}
+
+bool Xdrv15(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_01)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    PCA9685_Detect();
+  }
+  else if (pca9685_detected) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        if (tele_period == 0) {
+          PCA9685_OutputTelemetry(true);
+        }
+        break;
+      case FUNC_COMMAND_DRIVER:
+        if (XDRV_15 == XdrvMailbox.index) {
+          result = PCA9685_Command();
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+#ifdef USE_LIGHT
+#ifdef USE_TUYA_MCU
+
+#define XDRV_16 16
+#define XNRG_16 16
+
+#ifndef TUYA_DIMMER_ID
+#define TUYA_DIMMER_ID 0
+#endif
+
+#define TUYA_CMD_HEARTBEAT 0x00
+#define TUYA_CMD_QUERY_PRODUCT 0x01
+#define TUYA_CMD_MCU_CONF 0x02
+#define TUYA_CMD_WIFI_STATE 0x03
+#define TUYA_CMD_WIFI_RESET 0x04
+#define TUYA_CMD_WIFI_SELECT 0x05
+#define TUYA_CMD_SET_DP 0x06
+#define TUYA_CMD_STATE 0x07
+#define TUYA_CMD_QUERY_STATE 0x08
+
+#define TUYA_LOW_POWER_CMD_WIFI_STATE 0x02
+#define TUYA_LOW_POWER_CMD_WIFI_RESET 0x03
+#define TUYA_LOW_POWER_CMD_WIFI_CONFIG 0x04
+#define TUYA_LOW_POWER_CMD_STATE 0x05
+
+#define TUYA_TYPE_BOOL 0x01
+#define TUYA_TYPE_VALUE 0x02
+#define TUYA_TYPE_STRING 0x03
+#define TUYA_TYPE_ENUM 0x04
+
+#define TUYA_BUFFER_SIZE 256
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *TuyaSerial = nullptr;
+
+struct TUYA {
+  uint16_t new_dim = 0;
+  bool ignore_dim = false;
+  uint8_t cmd_status = 0;
+  uint8_t cmd_checksum = 0;
+  uint8_t data_len = 0;
+  uint8_t wifi_state = -2;
+  uint8_t heartbeat_timer = 0;
+#ifdef USE_ENERGY_SENSOR
+  uint32_t lastPowerCheckTime = 0;
+#endif
+  char *buffer = nullptr;
+  int byte_counter = 0;
+  bool low_power_mode = false;
+  bool send_success_next_second = false;
+} Tuya;
+
+
+enum TuyaSupportedFunctions {
+  TUYA_MCU_FUNC_NONE,
+  TUYA_MCU_FUNC_SWT1 = 1,
+  TUYA_MCU_FUNC_SWT2,
+  TUYA_MCU_FUNC_SWT3,
+  TUYA_MCU_FUNC_SWT4,
+  TUYA_MCU_FUNC_REL1 = 11,
+  TUYA_MCU_FUNC_REL2,
+  TUYA_MCU_FUNC_REL3,
+  TUYA_MCU_FUNC_REL4,
+  TUYA_MCU_FUNC_REL5,
+  TUYA_MCU_FUNC_REL6,
+  TUYA_MCU_FUNC_REL7,
+  TUYA_MCU_FUNC_REL8,
+  TUYA_MCU_FUNC_DIMMER = 21,
+  TUYA_MCU_FUNC_POWER = 31,
+  TUYA_MCU_FUNC_CURRENT,
+  TUYA_MCU_FUNC_VOLTAGE,
+  TUYA_MCU_FUNC_BATTERY_STATE,
+  TUYA_MCU_FUNC_BATTERY_PERCENTAGE,
+  TUYA_MCU_FUNC_REL1_INV = 41,
+  TUYA_MCU_FUNC_REL2_INV,
+  TUYA_MCU_FUNC_REL3_INV,
+  TUYA_MCU_FUNC_REL4_INV,
+  TUYA_MCU_FUNC_REL5_INV,
+  TUYA_MCU_FUNC_REL6_INV,
+  TUYA_MCU_FUNC_REL7_INV,
+  TUYA_MCU_FUNC_REL8_INV,
+  TUYA_MCU_FUNC_LOWPOWER_MODE = 51,
+  TUYA_MCU_FUNC_LAST = 255
+};
+
+const char kTuyaCommand[] PROGMEM = "|"
+  D_CMND_TUYA_MCU "|" D_CMND_TUYA_MCU_SEND_STATE;
+
+void (* const TuyaCommand[])(void) PROGMEM = {
+  &CmndTuyaMcu, &CmndTuyaSend
+};
+# 126 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+void CmndTuyaSend(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+    if (XdrvMailbox.data_len > 0) {
+
+      char *p;
+      char *data;
+      uint8_t i = 0;
+      uint8_t dpId = 0;
+      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
+        if ( i == 0) {
+          dpId = strtoul(str, nullptr, 0);
+        } else {
+          data = str;
+        }
+        i++;
+      }
+
+      if (1 == XdrvMailbox.index) {
+        TuyaSendBool(dpId, strtoul(data, nullptr, 0));
+      } else if (2 == XdrvMailbox.index) {
+        TuyaSendValue(dpId, strtoull(data, nullptr, 0));
+      } else if (3 == XdrvMailbox.index) {
+        TuyaSendString(dpId, data);
+      } else if (4 == XdrvMailbox.index) {
+        TuyaSendEnum(dpId, strtoul(data, nullptr, 0));
+      }
+    }
+    ResponseCmndDone();
+  }
+}
+
+
+
+
+
+
+
+void CmndTuyaMcu(void) {
+  if (XdrvMailbox.data_len > 0) {
+    char *p;
+    uint8_t i = 0;
+    uint8_t parm[3] = { 0 };
+    for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
+      parm[i] = strtoul(str, nullptr, 0);
+      i++;
+    }
+
+    if (TuyaFuncIdValid(parm[0])) {
+      TuyaAddMcuFunc(parm[0], parm[1]);
+      restart_flag = 2;
+    } else {
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR("TYA: TuyaMcu Invalid function id=%d"), parm[0]);
+    }
+
+  }
+
+  Response_P(PSTR("{\"" D_CMND_TUYA_MCU "\":["));
+  bool added = false;
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].fnid != 0) {
+      if (added) {
+        ResponseAppend_P(PSTR(","));
+      }
+      ResponseAppend_P(PSTR("{\"fnId\":%d,\"dpId\":%d}" ), Settings.tuya_fnid_map[i].fnid, Settings.tuya_fnid_map[i].dpid);
+      added = true;
+    }
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+
+
+
+
+void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId) {
+  bool added = false;
+
+  if (fnId == 0 || dpId == 0) {
+    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+      if ((dpId > 0 && Settings.tuya_fnid_map[i].dpid == dpId) || (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].fnid == fnId)) {
+        Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
+        Settings.tuya_fnid_map[i].dpid = 0;
+        break;
+      }
+    }
+  } else {
+    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+      if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].dpid == 0 || Settings.tuya_fnid_map[i].fnid == fnId || Settings.tuya_fnid_map[i].fnid == 0) {
+        if (!added) {
+          Settings.tuya_fnid_map[i].fnid = fnId;
+          Settings.tuya_fnid_map[i].dpid = dpId;
+          added = true;
+        } else if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].fnid == fnId) {
+          Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
+          Settings.tuya_fnid_map[i].dpid = 0;
+        }
+      }
+    }
+  }
+  UpdateDevices();
+}
+
+void UpdateDevices() {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    uint8_t fnId = Settings.tuya_fnid_map[i].fnid;
+    if (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].dpid > 0) {
+
+      if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
+        bitClear(rel_inverted, fnId - TUYA_MCU_FUNC_REL1);
+      } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
+        bitSet(rel_inverted, fnId - TUYA_MCU_FUNC_REL1_INV);
+      }
+
+    }
+  }
+}
+
+inline bool TuyaFuncIdValid(uint8_t fnId) {
+  return (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) ||
+  (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) ||
+    fnId == TUYA_MCU_FUNC_DIMMER ||
+    (fnId >= TUYA_MCU_FUNC_POWER && fnId <= TUYA_MCU_FUNC_VOLTAGE) ||
+    (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) ||
+    (fnId == TUYA_MCU_FUNC_LOWPOWER_MODE);
+}
+
+uint8_t TuyaGetFuncId(uint8_t dpid) {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].dpid == dpid) {
+      return Settings.tuya_fnid_map[i].fnid;
+    }
+  }
+  return TUYA_MCU_FUNC_NONE;
+}
+
+uint8_t TuyaGetDpId(uint8_t fnId) {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].fnid == fnId) {
+      return Settings.tuya_fnid_map[i].dpid;
+    }
+  }
+  return 0;
+}
+
+void TuyaSendCmd(uint8_t cmd, uint8_t payload[] = nullptr, uint16_t payload_len = 0)
+{
+  uint8_t checksum = (0xFF + cmd + (payload_len >> 8) + (payload_len & 0xFF));
+  TuyaSerial->write(0x55);
+  TuyaSerial->write(0xAA);
+  TuyaSerial->write((uint8_t)0x00);
+  TuyaSerial->write(cmd);
+  TuyaSerial->write(payload_len >> 8);
+  TuyaSerial->write(payload_len & 0xFF);
+  snprintf_P(log_data, sizeof(log_data), PSTR("TYA: Send \"55aa00%02x%02x%02x"), cmd, payload_len >> 8, payload_len & 0xFF);
+  for (uint32_t i = 0; i < payload_len; ++i) {
+    TuyaSerial->write(payload[i]);
+    checksum += payload[i];
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, payload[i]);
+  }
+  TuyaSerial->write(checksum);
+  TuyaSerial->flush();
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x\""), log_data, checksum);
+  AddLog(LOG_LEVEL_DEBUG);
+}
+
+void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value)
+{
+  uint16_t payload_len = 4;
+  uint8_t payload_buffer[8];
+  payload_buffer[0] = id;
+  payload_buffer[1] = type;
+  switch (type) {
+    case TUYA_TYPE_BOOL:
+    case TUYA_TYPE_ENUM:
+      payload_len += 1;
+      payload_buffer[2] = 0x00;
+      payload_buffer[3] = 0x01;
+      payload_buffer[4] = value[0];
+      break;
+    case TUYA_TYPE_VALUE:
+      payload_len += 4;
+      payload_buffer[2] = 0x00;
+      payload_buffer[3] = 0x04;
+      payload_buffer[4] = value[3];
+      payload_buffer[5] = value[2];
+      payload_buffer[6] = value[1];
+      payload_buffer[7] = value[0];
+      break;
+
+  }
+
+  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
+}
+
+void TuyaSendBool(uint8_t id, bool value)
+{
+  TuyaSendState(id, TUYA_TYPE_BOOL, (uint8_t*)&value);
+}
+
+void TuyaSendValue(uint8_t id, uint32_t value)
+{
+  TuyaSendState(id, TUYA_TYPE_VALUE, (uint8_t*)(&value));
+}
+
+void TuyaSendEnum(uint8_t id, uint32_t value)
+{
+  TuyaSendState(id, TUYA_TYPE_ENUM, (uint8_t*)(&value));
+}
+
+void TuyaSendString(uint8_t id, char data[]) {
+
+  uint16_t len = strlen(data);
+  uint16_t payload_len = 4 + len;
+  uint8_t payload_buffer[payload_len];
+  payload_buffer[0] = id;
+  payload_buffer[1] = TUYA_TYPE_STRING;
+  payload_buffer[2] = len >> 8;
+  payload_buffer[3] = len & 0xFF;
+
+  for (uint16_t i = 0; i < len; i++) {
+    payload_buffer[4+i] = data[i];
+  }
+
+  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
+}
+
+bool TuyaSetPower(void)
+{
+  bool status = false;
+
+  uint8_t rpower = XdrvMailbox.index;
+  int16_t source = XdrvMailbox.payload;
+
+  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1 + active_device - 1);
+  if (dpid == 0) dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1_INV + active_device - 1);
+
+  if (source != SRC_SWITCH && TuyaSerial) {
+    TuyaSendBool(dpid, bitRead(rpower, active_device-1) ^ bitRead(rel_inverted, active_device-1));
+    status = true;
+  }
+  return status;
+}
+
+bool TuyaSetChannels(void)
+{
+  LightSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
+  delay(20);
+  return true;
+}
+
+void LightSerialDuty(uint16_t duty)
+{
+  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_DIMMER);
+  if (duty > 0 && !Tuya.ignore_dim && TuyaSerial && dpid > 0) {
+    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
+    if (duty < Settings.dimmer_hw_min) { duty = Settings.dimmer_hw_min; }
+    if (Tuya.new_dim != duty) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim value=%d (id=%d)"), duty, dpid);
+      TuyaSendValue(dpid, duty);
+    }
+  } else if (dpid > 0) {
+    Tuya.ignore_dim = false;
+    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim skipped value=%d"), duty);
+  } else {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Cannot set dimmer. Dimmer Id unknown"));
+  }
+}
+
+void TuyaRequestState(void)
+{
+  if (TuyaSerial) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Read MCU state"));
+
+    TuyaSendCmd(TUYA_CMD_QUERY_STATE);
+  }
+}
+
+void TuyaResetWifi(void)
+{
+  if (!Settings.flag.button_restrict) {
+    char scmnd[20];
+    snprintf_P(scmnd, sizeof(scmnd), D_CMND_WIFICONFIG " %d", 2);
+    ExecuteCommand(scmnd, SRC_BUTTON);
+  }
+}
+
+void TuyaProcessStatePacket(void) {
+  char scmnd[20];
+  uint8_t dpidStart = 6;
+  uint8_t fnId;
+  uint16_t dpDataLen;
+
+  while (dpidStart + 4 < Tuya.byte_counter) {
+    dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+    fnId = TuyaGetFuncId(Tuya.buffer[dpidStart]);
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[dpidStart]);
+
+      if (Tuya.buffer[dpidStart + 1] == 1) {
+
+        if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
+          if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
+          if (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4] ^ 1, SRC_SWITCH);
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[dpidStart + 4], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
+
+          if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[dpidStart + 4]) {
+            SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[dpidStart + 4]);
+            SwitchHandler(1);
+          }
+        }
+
+      }
+      else if (Tuya.buffer[dpidStart + 1] == 2) {
+        bool tuya_energy_enabled = (XNRG_16 == energy_flg);
+        uint16_t packetValue = Tuya.buffer[dpidStart + 6] << 8 | Tuya.buffer[dpidStart + 7];
+        if (fnId == TUYA_MCU_FUNC_DIMMER) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
+          Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
+          if ((power || Settings.flag3.tuya_apply_o20) &&
+              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
+            Tuya.ignore_dim = true;
+
+            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
+            ExecuteCommand(scmnd, SRC_SWITCH);
+          }
+        }
+
+  #ifdef USE_ENERGY_SENSOR
+        else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
+          Energy.voltage[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
+          Energy.current[0] = (float)packetValue / 1000;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
+          Energy.active_power[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[dpidStart], packetValue);
+
+          if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
+            Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
+            EnergyUpdateToday();
+          }
+          Tuya.lastPowerCheckTime = Rtc.utc_time;
+        }
+  #endif
+
+      }
+
+
+    dpidStart += dpDataLen + 4;
+  }
+}
+
+void TuyaLowPowerModePacketProcess(void) {
+  switch (Tuya.buffer[3]) {
+    case TUYA_CMD_QUERY_PRODUCT:
+      TuyaHandleProductInfoPacket();
+      TuyaSetWifiLed();
+      break;
+
+    case TUYA_LOW_POWER_CMD_STATE:
+      TuyaProcessStatePacket();
+      Tuya.send_success_next_second = true;
+      break;
+  }
+
+}
+
+void TuyaHandleProductInfoPacket(void) {
+  uint16_t dataLength = Tuya.buffer[4] << 8 | Tuya.buffer[5];
+  char *data = &Tuya.buffer[6];
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("TYA: MCU Product ID: %.*s"), dataLength, data);
+}
+
+void TuyaSendLowPowerSuccessIfNeeded(void) {
+  uint8_t success = 1;
+
+  if (Tuya.send_success_next_second) {
+    TuyaSendCmd(TUYA_LOW_POWER_CMD_STATE, &success, 1);
+    Tuya.send_success_next_second = false;
+  }
+}
+
+void TuyaNormalPowerModePacketProcess(void)
+{
+  switch (Tuya.buffer[3]) {
+    case TUYA_CMD_QUERY_PRODUCT:
+      TuyaHandleProductInfoPacket();
+      TuyaSendCmd(TUYA_CMD_MCU_CONF);
+      break;
+
+    case TUYA_CMD_HEARTBEAT:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Heartbeat"));
+      if (Tuya.buffer[6] == 0) {
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Detected MCU restart"));
+        Tuya.wifi_state = -2;
+      }
+      break;
+
+    case TUYA_CMD_STATE:
+      TuyaProcessStatePacket();
+      break;
+
+    case TUYA_CMD_WIFI_RESET:
+    case TUYA_CMD_WIFI_SELECT:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi Reset"));
+      TuyaResetWifi();
+      break;
+
+    case TUYA_CMD_WIFI_STATE:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi LED set ACK"));
+      Tuya.wifi_state = TuyaGetTuyaWifiState();
+      break;
+
+    case TUYA_CMD_MCU_CONF:
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX MCU configuration Mode=%d"), Tuya.buffer[5]);
+
+      if (Tuya.buffer[5] == 2) {
+        uint8_t led1_gpio = Tuya.buffer[6];
+        uint8_t key1_gpio = Tuya.buffer[7];
+        bool key1_set = false;
+        bool led1_set = false;
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          if (Settings.my_gp.io[i] == GPIO_LED1) led1_set = true;
+          else if (Settings.my_gp.io[i] == GPIO_KEY1) key1_set = true;
+        }
+        if (!Settings.my_gp.io[led1_gpio] && !led1_set) {
+          Settings.my_gp.io[led1_gpio] = GPIO_LED1;
+          restart_flag = 2;
+        }
+        if (!Settings.my_gp.io[key1_gpio] && !key1_set) {
+          Settings.my_gp.io[key1_gpio] = GPIO_KEY1;
+          restart_flag = 2;
+        }
+      }
+      TuyaRequestState();
+      break;
+
+    default:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX unknown command"));
+  }
+}
+
+
+
+
+
+bool TuyaModuleSelected(void)
+{
+  if (!(pin[GPIO_TUYA_RX] < 99) || !(pin[GPIO_TUYA_TX] < 99)) {
+    pin[GPIO_TUYA_TX] = 1;
+    pin[GPIO_TUYA_RX] = 3;
+    Settings.my_gp.io[1] = GPIO_TUYA_TX;
+    Settings.my_gp.io[3] = GPIO_TUYA_RX;
+    restart_flag = 2;
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) == 0 && TUYA_DIMMER_ID > 0) {
+    TuyaAddMcuFunc(TUYA_MCU_FUNC_DIMMER, TUYA_DIMMER_ID);
+  }
+
+  bool relaySet = false;
+
+  for (uint8_t i = 0 ; i < MAX_TUYA_FUNCTIONS; i++) {
+    if ((Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
+    (Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
+      relaySet = true;
+      devices_present++;
+    }
+  }
+
+  if (!relaySet) {
+    TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
+    devices_present++;
+    SettingsSaveAll();
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) != 0) {
+    light_type = LT_SERIAL1;
+  } else {
+    light_type = LT_BASIC;
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_LOWPOWER_MODE) != 0) {
+    Tuya.low_power_mode = true;
+    Settings.flag3.fast_power_cycle_disable = true;
+  }
+
+  UpdateDevices();
+  return true;
+}
+
+void TuyaInit(void)
+{
+  Tuya.buffer = (char*)(malloc(TUYA_BUFFER_SIZE));
+  if (Tuya.buffer != nullptr) {
+    TuyaSerial = new TasmotaSerial(pin[GPIO_TUYA_RX], pin[GPIO_TUYA_TX], 2);
+    if (TuyaSerial->begin(9600)) {
+      if (TuyaSerial->hardwareSerial()) { ClaimSerial(); }
+
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Request MCU configuration"));
+
+      TuyaSendCmd(TUYA_CMD_QUERY_PRODUCT);
+    }
+  }
+  Tuya.heartbeat_timer = 0;
+}
+
+void TuyaSerialInput(void)
+{
+  while (TuyaSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = TuyaSerial->read();
+
+    if (serial_in_byte == 0x55) {
+      Tuya.cmd_status = 1;
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+      Tuya.cmd_checksum += serial_in_byte;
+    }
+    else if (Tuya.cmd_status == 1 && serial_in_byte == 0xAA) {
+      Tuya.cmd_status = 2;
+
+      Tuya.byte_counter = 0;
+      Tuya.buffer[Tuya.byte_counter++] = 0x55;
+      Tuya.buffer[Tuya.byte_counter++] = 0xAA;
+      Tuya.cmd_checksum = 0xFF;
+    }
+    else if (Tuya.cmd_status == 2) {
+      if (Tuya.byte_counter == 5) {
+        Tuya.cmd_status = 3;
+        Tuya.data_len = serial_in_byte;
+      }
+      Tuya.cmd_checksum += serial_in_byte;
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+    }
+    else if ((Tuya.cmd_status == 3) && (Tuya.byte_counter == (6 + Tuya.data_len)) && (Tuya.cmd_checksum == serial_in_byte)) {
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+
+      char hex_char[(Tuya.byte_counter * 2) + 2];
+      uint16_t len = Tuya.buffer[4] << 8 | Tuya.buffer[5];
+      Response_P(PSTR("{\"" D_JSON_TUYA_MCU_RECEIVED "\":{\"Data\":\"%s\",\"Cmnd\":%d"), ToHex_P((unsigned char*)Tuya.buffer, Tuya.byte_counter, hex_char, sizeof(hex_char)), Tuya.buffer[3]);
+
+      if (len > 0) {
+        ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
+        if (TUYA_CMD_STATE == Tuya.buffer[3]) {
+
+
+          uint8_t dpidStart = 6;
+          while (dpidStart + 4 < Tuya.byte_counter) {
+            uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char)));
+            if (TUYA_TYPE_STRING == Tuya.buffer[dpidStart + 1]) {
+              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[dpidStart + 4]);
+            }
+            ResponseAppend_P(PSTR("}"));
+            dpidStart += dpDataLen + 4;
+          }
+        }
+      }
+
+      ResponseAppend_P(PSTR("}}"));
+
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_TUYA_MCU_RECEIVED));
+      } else {
+        AddLog_P(LOG_LEVEL_DEBUG, mqtt_data);
+      }
+      XdrvRulesProcess();
+
+      if (!Tuya.low_power_mode) {
+        TuyaNormalPowerModePacketProcess();
+      } else {
+        TuyaLowPowerModePacketProcess();
+      }
+
+      Tuya.byte_counter = 0;
+      Tuya.cmd_status = 0;
+      Tuya.cmd_checksum = 0;
+      Tuya.data_len = 0;
+    }
+    else if (Tuya.byte_counter < TUYA_BUFFER_SIZE -1) {
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+      Tuya.cmd_checksum += serial_in_byte;
+    } else {
+      Tuya.byte_counter = 0;
+      Tuya.cmd_status = 0;
+      Tuya.cmd_checksum = 0;
+      Tuya.data_len = 0;
+    }
+  }
+}
+
+bool TuyaButtonPressed(void)
+{
+  if (!XdrvMailbox.index && ((PRESSED == XdrvMailbox.payload) && (NOT_PRESSED == Button.last_state[XdrvMailbox.index]))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Reset GPIO triggered"));
+    TuyaResetWifi();
+    return true;
+  }
+  return false;
+}
+
+uint8_t TuyaGetTuyaWifiState(void) {
+
+  uint8_t wifi_state = 0x02;
+  switch(WifiState()){
+    case WIFI_MANAGER:
+      wifi_state = 0x01;
+      break;
+    case WIFI_RESTART:
+      wifi_state = 0x03;
+      break;
+  }
+
+  if (MqttIsConnected()) {
+    wifi_state = 0x04;
+  }
+
+  return wifi_state;
+}
+
+void TuyaSetWifiLed(void)
+{
+  Tuya.wifi_state = TuyaGetTuyaWifiState();
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Set WiFi LED %d (%d)"), Tuya.wifi_state, WifiState());
+
+  if (Tuya.low_power_mode) {
+    TuyaSendCmd(TUYA_LOW_POWER_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
+  } else {
+    TuyaSendCmd(TUYA_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
+  }
+}
+
+#ifdef USE_ENERGY_SENSOR
+
+
+
+
+bool Xnrg16(uint8_t function)
+{
+  bool result = false;
+
+  if (TUYA_DIMMER == my_module_type) {
+    if (FUNC_PRE_INIT == function) {
+      if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0) {
+        if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0) {
+          Energy.current_available = false;
+        }
+        if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0) {
+          Energy.voltage_available = false;
+        }
+        energy_flg = XNRG_16;
+      }
+    }
+  }
+  return result;
+}
+#endif
+
+
+
+
+
+bool Xdrv16(uint8_t function)
+{
+  bool result = false;
+
+  if (TUYA_DIMMER == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (TuyaSerial) { TuyaSerialInput(); }
+        break;
+      case FUNC_MODULE_INIT:
+        result = TuyaModuleSelected();
+        break;
+      case FUNC_PRE_INIT:
+        TuyaInit();
+        break;
+      case FUNC_SET_DEVICE_POWER:
+        result = TuyaSetPower();
+        break;
+      case FUNC_BUTTON_PRESSED:
+        result = TuyaButtonPressed();
+        break;
+      case FUNC_EVERY_SECOND:
+        if (TuyaSerial && Tuya.wifi_state != TuyaGetTuyaWifiState()) { TuyaSetWifiLed(); }
+        if (!Tuya.low_power_mode) {
+          Tuya.heartbeat_timer++;
+          if (Tuya.heartbeat_timer > 10) {
+            Tuya.heartbeat_timer = 0;
+            TuyaSendCmd(TUYA_CMD_HEARTBEAT);
+          }
+        } else {
+            TuyaSendLowPowerSuccessIfNeeded();
+        }
+        break;
+      case FUNC_SET_CHANNELS:
+        result = TuyaSetChannels();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kTuyaCommand, TuyaCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_17_rcswitch.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_17_rcswitch.ino"
+#ifdef USE_RC_SWITCH
+
+
+
+
+#define XDRV_17 17
+
+#define D_JSON_RF_PROTOCOL "Protocol"
+#define D_JSON_RF_BITS "Bits"
+#define D_JSON_RF_DATA "Data"
+
+#define D_CMND_RFSEND "RFSend"
+#define D_JSON_RF_PULSE "Pulse"
+#define D_JSON_RF_REPEAT "Repeat"
+
+const char kRfSendCommands[] PROGMEM = "|"
+  D_CMND_RFSEND;
+
+void (* const RfSendCommand[])(void) PROGMEM = {
+  &CmndRfSend };
+
+#include <RCSwitch.h>
+
+RCSwitch mySwitch = RCSwitch();
+
+#define RF_TIME_AVOID_DUPLICATE 1000
+
+uint32_t rf_lasttime = 0;
+
+void RfReceiveCheck(void)
+{
+  if (mySwitch.available()) {
+
+    unsigned long data = mySwitch.getReceivedValue();
+    unsigned int bits = mySwitch.getReceivedBitlength();
+    int protocol = mySwitch.getReceivedProtocol();
+    int delay = mySwitch.getReceivedDelay();
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFR: Data 0x%lX (%u), Bits %d, Protocol %d, Delay %d"), data, data, bits, protocol, delay);
+
+    uint32_t now = millis();
+    if ((now - rf_lasttime > RF_TIME_AVOID_DUPLICATE) && (data > 0)) {
+      rf_lasttime = now;
+
+      char stemp[16];
+      if (Settings.flag.rf_receive_decimal) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%u"), (uint32_t)data);
+      } else {
+        snprintf_P(stemp, sizeof(stemp), PSTR("\"0x%lX\""), (uint32_t)data);
+      }
+      ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_RF_DATA "\":%s,\"" D_JSON_RF_BITS "\":%d,\"" D_JSON_RF_PROTOCOL "\":%d,\"" D_JSON_RF_PULSE "\":%d}}"),
+        stemp, bits, protocol, delay);
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
+      XdrvRulesProcess();
+#ifdef USE_DOMOTICZ
+      DomoticzSensor(DZ_COUNT, data);
+#endif
+    }
+    mySwitch.resetAvailable();
+  }
+}
+
+void RfInit(void)
+{
+  if (pin[GPIO_RFSEND] < 99) {
+    mySwitch.enableTransmit(pin[GPIO_RFSEND]);
+  }
+  if (pin[GPIO_RFRECV] < 99) {
+    pinMode( pin[GPIO_RFRECV], INPUT);
+    mySwitch.enableReceive(pin[GPIO_RFRECV]);
+  }
+}
+
+
+
+
+
+void CmndRfSend(void)
+{
+  bool error = false;
+
+  if (XdrvMailbox.data_len) {
+    unsigned long data = 0;
+    unsigned int bits = 24;
+    int protocol = 1;
+    int repeat = 10;
+    int pulse = 350;
+
+    char dataBufUc[XdrvMailbox.data_len + 1];
+    UpperCase(dataBufUc, XdrvMailbox.data);
+    StaticJsonBuffer<150> jsonBuf;
+    JsonObject &root = jsonBuf.parseObject(dataBufUc);
+    if (root.success()) {
+
+      char parm_uc[10];
+      data = strtoul(root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_DATA))], nullptr, 0);
+      bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_BITS))];
+      protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PROTOCOL))];
+      repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_REPEAT))];
+      pulse = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PULSE))];
+    } else {
+
+      char *p;
+      uint8_t i = 0;
+      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 5; str = strtok_r(nullptr, ", ", &p)) {
+        switch (i++) {
+        case 0:
+          data = strtoul(str, nullptr, 0);
+          break;
+        case 1:
+          bits = atoi(str);
+          break;
+        case 2:
+          protocol = atoi(str);
+          break;
+        case 3:
+          repeat = atoi(str);
+          break;
+        case 4:
+          pulse = atoi(str);
+        }
+      }
+    }
+
+    if (!protocol) { protocol = 1; }
+    mySwitch.setProtocol(protocol);
+    if (!pulse) { pulse = 350; }
+    mySwitch.setPulseLength(pulse);
+    if (!repeat) { repeat = 10; }
+    mySwitch.setRepeatTransmit(repeat);
+    if (!bits) { bits = 24; }
+    if (data) {
+      mySwitch.send(data, bits);
+      ResponseCmndDone();
+    } else {
+      error = true;
+    }
+  } else {
+    error = true;
+  }
+  if (error) {
+    Response_P(PSTR("{\"" D_CMND_RFSEND "\":\"" D_JSON_NO " " D_JSON_RF_DATA ", " D_JSON_RF_BITS ", " D_JSON_RF_PROTOCOL ", " D_JSON_RF_REPEAT " " D_JSON_OR " " D_JSON_RF_PULSE "\"}"));
+  }
+}
+
+
+
+
+
+bool Xdrv17(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_RFSEND] < 99) || (pin[GPIO_RFRECV] < 99)) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (pin[GPIO_RFRECV] < 99) {
+          RfReceiveCheck();
+        }
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_RFSEND] < 99) {
+          result = DecodeCommand(kRfSendCommands, RfSendCommand);
+        }
+        break;
+      case FUNC_INIT:
+        RfInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
+#ifdef USE_LIGHT
+#ifdef USE_ARMTRONIX_DIMMERS
+
+
+
+
+
+
+
+#define XDRV_18 18
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *ArmtronixSerial = nullptr;
+
+struct ARMTRONIX {
+  bool ignore_dim = false;
+  int8_t wifi_state = -2;
+  int8_t dim_state[2];
+  int8_t knob_state[2];
+} Armtronix;
+
+
+
+
+
+bool ArmtronixSetChannels(void)
+{
+  LightSerial2Duty(((uint8_t*)XdrvMailbox.data)[0], ((uint8_t*)XdrvMailbox.data)[1]);
+  return true;
+}
+
+void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
+{
+  if (ArmtronixSerial && !Armtronix.ignore_dim) {
+    duty1 = ((float)duty1)/2.575757;
+    duty2 = ((float)duty2)/2.575757;
+    Armtronix.dim_state[0] = duty1;
+    Armtronix.dim_state[1] = duty2;
+    ArmtronixSerial->print("Dimmer1:");
+    ArmtronixSerial->print(duty1);
+    ArmtronixSerial->print("\nDimmer2:");
+    ArmtronixSerial->println(duty2);
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Serial Packet Dim Values=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
+
+  } else {
+    Armtronix.ignore_dim = false;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Dim Level skipped due to already set. Value=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
+
+  }
+}
+
+void ArmtronixRequestState(void)
+{
+  if (ArmtronixSerial) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("ARM: Request MCU state"));
+    ArmtronixSerial->println("Status");
+
+  }
+}
+
+
+
+
+
+bool ArmtronixModuleSelected(void)
+{
+  devices_present++;
+  light_type = LT_SERIAL2;
+  return true;
+}
+
+void ArmtronixInit(void)
+{
+  Armtronix.dim_state[0] = -1;
+  Armtronix.dim_state[1] = -1;
+  Armtronix.knob_state[0] = -1;
+  Armtronix.knob_state[1] = -1;
+  ArmtronixSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+  if (ArmtronixSerial->begin(115200)) {
+    if (ArmtronixSerial->hardwareSerial()) { ClaimSerial(); }
+    ArmtronixSerial->println("Status");
+  }
+}
+
+void ArmtronixSerialInput(void)
+{
+  String answer;
+  int8_t newDimState[2];
+  uint8_t temp;
+  int commaIndex;
+  char scmnd[20];
+  if (ArmtronixSerial->available()) {
+    yield();
+    answer = ArmtronixSerial->readStringUntil('\n');
+    if (answer.substring(0,7) == "Status:") {
+      commaIndex = 6;
+      for (uint32_t i =0; i<2; i++) {
+        newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+        if (newDimState[i] != Armtronix.dim_state[i]) {
+          temp = ((float)newDimState[i])*1.01010101010101;
+          Armtronix.dim_state[i] = newDimState[i];
+          Armtronix.ignore_dim = true;
+          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_CHANNEL "%d %d"),i+1, temp);
+          ExecuteCommand(scmnd,SRC_SWITCH);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd );
+        }
+        commaIndex = answer.indexOf(',',commaIndex+1);
+      }
+      Armtronix.knob_state[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+      commaIndex = answer.indexOf(',',commaIndex+1);
+      Armtronix.knob_state[1] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+    }
+  }
+}
+
+void ArmtronixSetWifiLed(void)
+{
+  uint8_t wifi_state = 0x02;
+
+  switch (WifiState()) {
+    case WIFI_MANAGER:
+      wifi_state = 0x01;
+      break;
+    case WIFI_RESTART:
+      wifi_state = 0x03;
+      break;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Set WiFi LED to state %d (%d)"), wifi_state, WifiState());
+
+  char state = '0' + ((wifi_state & 1) > 0);
+  ArmtronixSerial->print("Setled:");
+  ArmtronixSerial->write(state);
+  ArmtronixSerial->write(',');
+  state = '0' + ((wifi_state & 2) > 0);
+  ArmtronixSerial->write(state);
+  ArmtronixSerial->write(10);
+  Armtronix.wifi_state = WifiState();
+}
+
+
+
+
+
+bool Xdrv18(uint8_t function)
+{
+  bool result = false;
+
+  if (ARMTRONIX_DIMMERS == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (ArmtronixSerial) { ArmtronixSerialInput(); }
+        break;
+      case FUNC_MODULE_INIT:
+        result = ArmtronixModuleSelected();
+        break;
+      case FUNC_INIT:
+        ArmtronixInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        if (ArmtronixSerial) {
+          if (Armtronix.wifi_state!=WifiState()) { ArmtronixSetWifiLed(); }
+          if (uptime &1) {
+            ArmtronixSerial->println("Status");
+          }
+        }
+        break;
+      case FUNC_SET_CHANNELS:
+        result = ArmtronixSetChannels();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
+#ifdef USE_LIGHT
+#ifdef USE_PS_16_DZ
+
+
+
+
+#define XDRV_19 19
+
+#define PS16DZ_BUFFER_SIZE 80
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PS16DZSerial = nullptr;
+
+struct PS16DZ {
+  char *rx_buffer = nullptr;
+  int byte_counter = 0;
+  uint8_t dimmer = 0;
+} Ps16dz;
+
+
+
+
+
+void PS16DZSerialSend(const char *tx_buffer)
+{
+
+
+  PS16DZSerial->print(tx_buffer);
+  PS16DZSerial->write(0x1B);
+  PS16DZSerial->flush();
+}
+
+void PS16DZSerialSendOk(void)
+{
+  char tx_buffer[16];
+  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+SEND=ok"));
+  PS16DZSerialSend(tx_buffer);
+}
+
+
+
+
+void PS16DZSerialSendUpdateCommand(void)
+{
+  uint8_t light_state_dimmer = light_state.getDimmer();
+
+  light_state_dimmer = (light_state_dimmer < Settings.dimmer_hw_min) ? Settings.dimmer_hw_min : light_state_dimmer;
+  light_state_dimmer = (light_state_dimmer > Settings.dimmer_hw_max) ? Settings.dimmer_hw_max : light_state_dimmer;
+
+  char tx_buffer[80];
+  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"bright\":%d"),
+    LocalTime(), millis()%1000, power?"on":"off", light_state_dimmer);
+
+  PS16DZSerialSend(tx_buffer);
+}
+
+
+
+
+
+void PS16DZSerialInput(void)
+{
+  char scmnd[20];
+  while (PS16DZSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = PS16DZSerial->read();
+    if (serial_in_byte != 0x1B) {
+      if (Ps16dz.byte_counter >= PS16DZ_BUFFER_SIZE - 1) {
+        memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
+        Ps16dz.byte_counter = 0;
+      }
+      if (Ps16dz.byte_counter || (!Ps16dz.byte_counter && ('A' == serial_in_byte))) {
+        Ps16dz.rx_buffer[Ps16dz.byte_counter++] = serial_in_byte;
+      }
+    } else {
+      Ps16dz.rx_buffer[Ps16dz.byte_counter++] = 0x00;
+
+
+
+
+      if (!strncmp(Ps16dz.rx_buffer+3, "RESULT", 6)) {
+
+      }
+      else if (!strncmp(Ps16dz.rx_buffer+3, "UPDATE", 6)) {
+
+        char *end_str;
+        char *string = Ps16dz.rx_buffer+10;
+        char *token = strtok_r(string, ",", &end_str);
+
+        bool is_switch_change = false;
+        bool is_brightness_change = false;
+
+        while (token != nullptr) {
+          char* end_token;
+          char* token2 = strtok_r(token, ":", &end_token);
+          char* token3 = strtok_r(nullptr, ":", &end_token);
+
+          if (!strncmp(token2, "\"switch\"", 8)) {
+            bool switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
+
+
+
+            is_switch_change = (switch_state != power);
+            if (is_switch_change) {
+              ExecuteCommandPower(1, switch_state, SRC_SWITCH);
+            }
+          }
+          else if (!strncmp(token2, "\"bright\"", 8)) {
+            Ps16dz.dimmer = atoi(token3);
+
+
+
+            is_brightness_change = Ps16dz.dimmer != Settings.light_dimmer;
+            if (power && (Ps16dz.dimmer > 0) && is_brightness_change) {
+              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Ps16dz.dimmer);
+              ExecuteCommand(scmnd, SRC_SWITCH);
+            }
+          }
+          else if (!strncmp(token2, "\"sequence\"", 10)) {
+
+
+
+          }
+          token = strtok_r(nullptr, ",", &end_str);
+        }
+
+        if (!is_brightness_change) {
+
+
+
+          PS16DZSerialSendOk();
+        }
+      }
+      else if (!strncmp(Ps16dz.rx_buffer+3, "SETTING", 7)) {
+
+
+        if (!Settings.flag.button_restrict) {
+          int state = WIFI_MANAGER;
+          if (!strncmp(Ps16dz.rx_buffer+10, "=exit", 5)) { state = WIFI_RETRY; }
+          if (state != Settings.sta_config) {
+            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " %d"), state);
+            ExecuteCommand(scmnd, SRC_BUTTON);
+          }
+        }
+      }
+      memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
+      Ps16dz.byte_counter = 0;
+    }
+  }
+}
+
+bool PS16DZSerialSendUpdateCommandIfRequired(void)
+{
+  if (!PS16DZSerial) { return true; }
+
+  bool is_switch_change = (XdrvMailbox.payload != SRC_SWITCH);
+  bool is_brightness_change = (light_state.getDimmer() != Ps16dz.dimmer);
+
+  if (is_switch_change || is_brightness_change) {
+    PS16DZSerialSendUpdateCommand();
+  }
+
+  return true;
+}
+
+void PS16DZInit(void)
+{
+  Ps16dz.rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
+  if (Ps16dz.rx_buffer != nullptr) {
+    PS16DZSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+    if (PS16DZSerial->begin(19200)) {
+      if (PS16DZSerial->hardwareSerial()) { ClaimSerial(); }
+    }
+  }
+}
+
+bool PS16DZModuleSelected(void)
+{
+  devices_present++;
+  light_type = LT_SERIAL1;
+
+  return true;
+}
+
+
+
+
+
+bool Xdrv19(uint8_t function)
+{
+  bool result = false;
+
+  if (PS_16_DZ == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (PS16DZSerial) { PS16DZSerialInput(); }
+        break;
+      case FUNC_SET_DEVICE_POWER:
+      case FUNC_SET_CHANNELS:
+        result = PS16DZSerialSendUpdateCommandIfRequired();
+        break;
+      case FUNC_INIT:
+        PS16DZInit();
+        break;
+      case FUNC_MODULE_INIT:
+        result = PS16DZModuleSelected();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
+#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
+#define XDRV_20 20
+
+const char HUE_RESPONSE[] PROGMEM =
+  "HTTP/1.1 200 OK\r\n"
+  "HOST: 239.255.255.250:1900\r\n"
+  "CACHE-CONTROL: max-age=100\r\n"
+  "EXT:\r\n"
+  "LOCATION: http://%s:80/description.xml\r\n"
+  "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.24.0\r\n"
+  "hue-bridgeid: %s\r\n";
+const char HUE_ST1[] PROGMEM =
+  "ST: upnp:rootdevice\r\n"
+  "USN: uuid:%s::upnp:rootdevice\r\n"
+  "\r\n";
+const char HUE_ST2[] PROGMEM =
+  "ST: uuid:%s\r\n"
+  "USN: uuid:%s\r\n"
+  "\r\n";
+const char HUE_ST3[] PROGMEM =
+  "ST: urn:schemas-upnp-org:device:basic:1\r\n"
+  "USN: uuid:%s\r\n"
+  "\r\n";
+
+String HueBridgeId(void)
+{
+  String temp = WiFi.macAddress();
+  temp.replace(":", "");
+  String bridgeid = temp.substring(0, 6) + "FFFE" + temp.substring(6);
+  return bridgeid;
+}
+
+String HueSerialnumber(void)
+{
+  String serial = WiFi.macAddress();
+  serial.replace(":", "");
+  serial.toLowerCase();
+  return serial;
+}
+
+String HueUuid(void)
+{
+  String uuid = F("f6543a06-da50-11ba-8d8f-");
+  uuid += HueSerialnumber();
+  return uuid;
+}
+
+void HueRespondToMSearch(void)
+{
+  char message[TOPSZ];
+
+  TickerMSearch.detach();
+  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
+    char response[320];
+    snprintf_P(response, sizeof(response), HUE_RESPONSE, WiFi.localIP().toString().c_str(), HueBridgeId().c_str());
+    int len = strlen(response);
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST1, HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST2, HueUuid().c_str(), HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST3, HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(message, sizeof(message), PSTR(D_3_RESPONSE_PACKETS_SENT));
+  } else {
+    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
+  }
+
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
+    message, udp_remote_ip.toString().c_str(), udp_remote_port);
+
+  udp_response_mutex = false;
+}
+
+
+
+
+
+const char HUE_DESCRIPTION_XML[] PROGMEM =
+  "<?xml version=\"1.0\"?>"
+  "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">"
+  "<specVersion>"
+    "<major>1</major>"
+    "<minor>0</minor>"
+  "</specVersion>"
+
+  "<URLBase>http://{x1:80/</URLBase>"
+  "<device>"
+    "<deviceType>urn:schemas-upnp-org:device:Basic:1</deviceType>"
+    "<friendlyName>Amazon-Echo-HA-Bridge ({x1)</friendlyName>"
+
+    "<manufacturer>Royal Philips Electronics</manufacturer>"
+    "<manufacturerURL>http://www.philips.com</manufacturerURL>"
+    "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
+    "<modelName>Philips hue bridge 2012</modelName>"
+    "<modelNumber>929000226503</modelNumber>"
+    "<serialNumber>{x3</serialNumber>"
+    "<UDN>uuid:{x2</UDN>"
+  "</device>"
+  "</root>\r\n"
+  "\r\n";
+const char HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
+  "{\"on\":{state},"
+  "{light_status}"
+  "\"alert\":\"none\","
+  "\"effect\":\"none\","
+  "\"reachable\":true}";
+const char HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
+  ",\"type\":\"Extended color light\","
+  "\"name\":\"{j1\","
+  "\"modelid\":\"LCT007\","
+  "\"uniqueid\":\"{j2\","
+  "\"swversion\":\"5.50.1.19085\"}";
+const char HUE_GROUP0_STATUS_JSON[] PROGMEM =
+  "{\"name\":\"Group 0\","
+   "\"lights\":[{l1],"
+   "\"type\":\"LightGroup\","
+   "\"action\":";
+
+const char HueConfigResponse_JSON[] PROGMEM =
+  "{\"name\":\"Philips hue\","
+   "\"mac\":\"{ma\","
+   "\"dhcp\":true,"
+   "\"ipaddress\":\"{ip\","
+   "\"netmask\":\"{ms\","
+   "\"gateway\":\"{gw\","
+   "\"proxyaddress\":\"none\","
+   "\"proxyport\":0,"
+   "\"bridgeid\":\"{br\","
+   "\"UTC\":\"{dt\","
+   "\"whitelist\":{\"{id\":{"
+     "\"last use date\":\"{dt\","
+     "\"create date\":\"{dt\","
+     "\"name\":\"Remote\"}},"
+   "\"swversion\":\"01041302\","
+   "\"apiversion\":\"1.17.0\","
+   "\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
+   "\"linkbutton\":false,"
+   "\"portalservices\":false"
+  "}";
+const char HUE_LIGHT_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+const char HUE_ERROR_JSON[] PROGMEM =
+  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
+
+
+
+String GetHueDeviceId(uint8_t id)
+{
+  String deviceid = WiFi.macAddress() + F(":00:11-") + String(id);
+  deviceid.toLowerCase();
+  return deviceid;
+}
+
+String GetHueUserId(void)
+{
+  char userid[7];
+
+  snprintf_P(userid, sizeof(userid), PSTR("%03x"), ESP.getChipId());
+  return String(userid);
+}
+
+void HandleUpnpSetupHue(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_HUE_BRIDGE_SETUP));
+  String description_xml = FPSTR(HUE_DESCRIPTION_XML);
+  description_xml.replace("{x1", WiFi.localIP().toString());
+  description_xml.replace("{x2", HueUuid());
+  description_xml.replace("{x3", HueSerialnumber());
+  WSSend(200, CT_XML, description_xml);
+}
+
+void HueNotImplemented(String *path)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API_NOT_IMPLEMENTED " (%s)"), path->c_str());
+
+  WSSend(200, CT_JSON, "{}");
+}
+
+void HueConfigResponse(String *response)
+{
+  *response += FPSTR(HueConfigResponse_JSON);
+  response->replace("{ma", WiFi.macAddress());
+  response->replace("{ip", WiFi.localIP().toString());
+  response->replace("{ms", WiFi.subnetMask().toString());
+  response->replace("{gw", WiFi.gatewayIP().toString());
+  response->replace("{br", HueBridgeId());
+  response->replace("{dt", GetDateAndTime(DT_UTC));
+  response->replace("{id", GetHueUserId());
+}
+
+void HueConfig(String *path)
+{
+  String response = "";
+  HueConfigResponse(&response);
+  WSSend(200, CT_JSON, response);
+}
+
+
+
+bool g_gotct = false;
+
+
+
+
+uint16_t prev_hue = 0;
+uint8_t prev_sat = 0;
+uint8_t prev_bri = 254;
+uint16_t prev_ct = 254;
+char prev_x_str[24] = "\0";
+char prev_y_str[24] = "\0";
+
+uint8_t getLocalLightSubtype(uint8_t device) {
+  if (light_type) {
+    if (device >= Light.device) {
+      if (Settings.flag3.pwm_multi_channels) {
+        return LST_SINGLE;
+      } else {
+        return Light.subtype;
+      }
+    } else {
+      return LST_NONE;
+    }
+  } else {
+    return LST_NONE;
+  }
+}
+
+void HueLightStatus1(uint8_t device, String *response)
+{
+  uint16_t ct = 0;
+  uint8_t color_mode;
+  String light_status = "";
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint32_t echo_gen = findEchoGeneration();
+
+
+  uint8_t local_light_subtype = getLocalLightSubtype(device);
+
+  bri = LightGetBri(device);
+  if (bri > 254) bri = 254;
+  if (bri < 1) bri = 1;
+
+#ifdef USE_SHUTTER
+  if (ShutterState(device)) {
+    bri = (float)((Settings.shutter_options[device-1] & 1) ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
+  }
+#endif
+
+  if (light_type) {
+    light_state.getHSB(&hue, &sat, nullptr);
+
+    if ((bri > prev_bri ? bri - prev_bri : prev_bri - bri) < 1)
+      bri = prev_bri;
+
+    if (sat > 254) sat = 254;
+    if ((sat > prev_sat ? sat - prev_sat : prev_sat - sat) < 1) {
+      sat = prev_sat;
+    } else {
+      prev_x_str[0] = prev_y_str[0] = 0;
+    }
+
+    hue = changeUIntScale(hue, 0, 359, 0, 65535);
+    if ((hue > prev_hue ? hue - prev_hue : prev_hue - hue) < 400) {
+      hue = prev_hue;
+    } else {
+      prev_x_str[0] = prev_y_str[0] = 0;
+    }
+
+    color_mode = light_state.getColorMode();
+    ct = light_state.getCT();
+    if (LCM_RGB == color_mode) { g_gotct = false; }
+    if (LCM_CT == color_mode) { g_gotct = true; }
+
+
+
+    if ((ct > prev_ct ? ct - prev_ct : prev_ct - ct) < 1)
+      ct = prev_ct;
+
+
+
+  }
+
+  *response += FPSTR(HUE_LIGHTS_STATUS_JSON1);
+  response->replace("{state}", (power & (1 << (device-1))) ? "true" : "false");
+
+  if ((1 == echo_gen) || (LST_SINGLE <= local_light_subtype)) {
+    light_status += "\"bri\":";
+    light_status += String(bri);
+    light_status += ",";
+  }
+  if (LST_COLDWARM <= local_light_subtype) {
+    light_status += F("\"colormode\":\"");
+    light_status += (g_gotct ? "ct" : "hs");
+    light_status += "\",";
+  }
+  if (LST_RGB <= local_light_subtype) {
+    if (prev_x_str[0] && prev_y_str[0]) {
+      light_status += "\"xy\":[";
+      light_status += prev_x_str;
+      light_status += ",";
+      light_status += prev_y_str;
+      light_status += "],";
+    } else {
+      float x, y;
+        light_state.getXY(&x, &y);
+      light_status += "\"xy\":[";
+      light_status += String(x, 5);
+      light_status += ",";
+      light_status += String(y, 5);
+      light_status += "],";
+    }
+    light_status += "\"hue\":";
+    light_status += String(hue);
+    light_status += ",";
+
+    light_status += "\"sat\":";
+    light_status += String(sat);
+    light_status += ",";
+  }
+  if (LST_COLDWARM == local_light_subtype || LST_RGBW <= local_light_subtype) {
+    light_status += "\"ct\":";
+    light_status += String(ct > 0 ? ct : 284);
+    light_status += ",";
+  }
+  response->replace("{light_status}", light_status);
+}
+
+
+
+bool HueActive(uint8_t device) {
+  if (device > MAX_FRIENDLYNAMES) { device = MAX_FRIENDLYNAMES; }
+  return '$' != *SettingsText(SET_FRIENDLYNAME1 +device -1);
+}
+
+void HueLightStatus2(uint8_t device, String *response)
+{
+  *response += FPSTR(HUE_LIGHTS_STATUS_JSON2);
+  if (device <= MAX_FRIENDLYNAMES) {
+    response->replace("{j1", SettingsText(SET_FRIENDLYNAME1 +device -1));
+  } else {
+    char fname[33];
+    strcpy(fname, SettingsText(SET_FRIENDLYNAME1 + MAX_FRIENDLYNAMES -1));
+    uint32_t fname_len = strlen(fname);
+    if (fname_len > 30) { fname_len = 30; }
+    fname[fname_len++] = '-';
+    if (device - MAX_FRIENDLYNAMES < 10) {
+      fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
+    } else {
+      fname[fname_len++] = 'A' + device - MAX_FRIENDLYNAMES - 10;
+    }
+    fname[fname_len] = 0x00;
+
+    response->replace("{j1", fname);
+  }
+  response->replace("{j2", GetHueDeviceId(device));
+}
+
+
+
+
+uint32_t EncodeLightId(uint8_t relay_id)
+{
+  uint8_t mac[6];
+  WiFi.macAddress(mac);
+  uint32_t id = 0;
+
+  if (relay_id >= 32) {
+    relay_id = 0;
+  }
+  if (relay_id > 15) {
+    id = (1 << 28);
+  }
+
+  id |= (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (relay_id & 0xF);
+  return id;
+}
+
+
+
+uint32_t DecodeLightId(uint32_t hue_id) {
+  uint8_t relay_id = hue_id & 0xF;
+  if (hue_id & (1 << 28)) {
+    relay_id += 16;
+  }
+  if (0 == relay_id) {
+    relay_id = 32;
+  }
+  return relay_id;
+}
+
+static const char * FIRST_GEN_UA[] = {
+  "AEOBC",
+};
+
+
+uint32_t findEchoGeneration(void) {
+
+  String user_agent = WebServer->header("User-Agent");
+  uint32_t gen = 2;
+
+  for (uint32_t i = 0; i < sizeof(FIRST_GEN_UA)/sizeof(char*); i++) {
+    if (user_agent.indexOf(FIRST_GEN_UA[i]) >= 0) {
+      gen = 1;
+      break;
+    }
+  }
+  if (0 == user_agent.length()) {
+    gen = 1;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, D_LOG_HTTP D_HUE " User-Agent: %s, gen=%d", user_agent.c_str(), gen);
+
+  return gen;
+}
+
+void HueGlobalConfig(String *path) {
+  String response;
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  path->remove(0,1);
+  response = F("{\"lights\":{");
+  bool appending = false;
+  for (uint32_t i = 1; i <= maxhue; i++) {
+    if (HueActive(i)) {
+      if (appending) { response += ","; }
+      response += "\"";
+      response += EncodeLightId(i);
+      response += F("\":{\"state\":");
+      HueLightStatus1(i, &response);
+      HueLightStatus2(i, &response);
+      appending = true;
+    }
+  }
+  response += F("},\"groups\":{},\"schedules\":{},\"config\":");
+  HueConfigResponse(&response);
+  response += "}";
+  WSSend(200, CT_JSON, response);
+}
+
+void HueAuthentication(String *path)
+{
+  char response[38];
+
+  snprintf_P(response, sizeof(response), PSTR("[{\"success\":{\"username\":\"%s\"}}]"), GetHueUserId().c_str());
+  WSSend(200, CT_JSON, response);
+}
+
+void HueLights(String *path)
+{
+
+
+
+  String response;
+  int code = 200;
+  uint16_t tmp = 0;
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint16_t ct = 0;
+  bool resp = false;
+  bool on = false;
+  bool change = false;
+  uint8_t device = 1;
+  uint8_t local_light_subtype = Light.subtype;
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  path->remove(0,path->indexOf("/lights"));
+  if (path->endsWith("/lights")) {
+    response = "{";
+    bool appending = false;
+    for (uint32_t i = 1; i <= maxhue; i++) {
+      if (HueActive(i)) {
+        if (appending) { response += ","; }
+        response += "\"";
+        response += EncodeLightId(i);
+        response += F("\":{\"state\":");
+        HueLightStatus1(i, &response);
+        HueLightStatus2(i, &response);
+        appending = true;
+      }
+    }
+#ifdef USE_SCRIPT_HUE
+    Script_Check_Hue(&response);
+#endif
+    response += "}";
+  }
+  else if (path->endsWith("/state")) {
+    path->remove(0,8);
+    path->remove(path->indexOf("/state"));
+    device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT_HUE
+    if (device>devices_present) {
+      return Script_Handle_Hue(path);
+    }
+#endif
+
+    if ((device < 1) || (device > maxhue)) {
+      device = 1;
+    }
+    local_light_subtype = getLocalLightSubtype(device);
+
+    if (WebServer->args()) {
+      response = "[";
+
+      StaticJsonBuffer<400> jsonBuffer;
+      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
+      if (hue_json.containsKey("on")) {
+
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(EncodeLightId(device)));
+        response.replace("{cm", "on");
+
+#ifdef USE_SHUTTER
+        if (ShutterState(device)) {
+          if (!change) {
+            on = hue_json["on"];
+            bri = on ? 1.0f : 0.0f;
+            change = true;
+          }
+          response.replace("{re", on ? "true" : "false");
+        } else {
+#endif
+          on = hue_json["on"];
+          switch(on)
+          {
+            case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
+                        response.replace("{re", "false");
+                        break;
+            case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
+                        response.replace("{re", "true");
+                        break;
+            default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
+                        break;
+          }
+          resp = true;
+#ifdef USE_SHUTTER
+        }
+#endif
+      }
+
+      if (light_type && (local_light_subtype >= LST_SINGLE)) {
+        if (!Settings.flag3.pwm_multi_channels) {
+          light_state.getHSB(&hue, &sat, nullptr);
+          bri = light_state.getBri();
+          ct = light_state.getCT();
+          uint8_t color_mode = light_state.getColorMode();
+          if (LCM_RGB == color_mode) { g_gotct = false; }
+          if (LCM_CT == color_mode) { g_gotct = true; }
+
+        } else {
+          bri = LightGetBri(device);
+        }
+      }
+      prev_x_str[0] = prev_y_str[0] = 0;
+
+      if (hue_json.containsKey("bri")) {
+        tmp = hue_json["bri"];
+        prev_bri = bri = tmp;
+
+        if (254 <= bri) { bri = 255; }
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "bri");
+        response.replace("{re", String(tmp));
+        if (LST_SINGLE <= Light.subtype) {
+          change = true;
+        }
+        resp = true;
+      }
+
+
+      if (hue_json.containsKey("xy")) {
+        float x, y;
+        x = hue_json["xy"][0];
+        y = hue_json["xy"][1];
+        const String &x_str = hue_json["xy"][0];
+        const String &y_str = hue_json["xy"][1];
+        x_str.toCharArray(prev_x_str, sizeof(prev_x_str));
+        y_str.toCharArray(prev_y_str, sizeof(prev_y_str));
+
+        uint8_t rr,gg,bb;
+        LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
+        LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
+        prev_hue = changeUIntScale(hue, 0, 359, 0, 65535);
+        prev_sat = (sat > 254 ? 254 : sat);
+
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "xy");
+        response.replace("{re", "[" + x_str + "," + y_str + "]");
+        g_gotct = false;
+        resp = true;
+        change = true;
+      }
+      if (hue_json.containsKey("hue")) {
+        tmp = hue_json["hue"];
+        prev_hue = tmp;
+
+        hue = changeUIntScale(tmp, 0, 65535, 0, 359);
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "hue");
+        response.replace("{re", String(tmp));
+        if (LST_RGB <= Light.subtype) {
+          g_gotct = false;
+          change = true;
+        }
+        resp = true;
+      }
+      if (hue_json.containsKey("sat")) {
+        tmp = hue_json["sat"];
+        prev_sat = sat = tmp;
+
+        if (254 <= sat) { sat = 255; }
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "sat");
+        response.replace("{re", String(tmp));
+        if (LST_RGB <= Light.subtype) {
+          g_gotct = false;
+          change = true;
+        }
+        resp = true;
+      }
+      if (hue_json.containsKey("ct")) {
+        ct = hue_json["ct"];
+        prev_ct = ct;
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "ct");
+        response.replace("{re", String(ct));
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
+          g_gotct = true;
+          change = true;
+        }
+        resp = true;
+      }
+      if (change) {
+#ifdef USE_SHUTTER
+        if (ShutterState(device)) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_options[device-1] & 1);
+          ShutterSetPosition(device, bri * 100.0f );
+        } else
+#endif
+        if (light_type && (local_light_subtype > LST_NONE)) {
+          if (!Settings.flag3.pwm_multi_channels) {
+            if (g_gotct) {
+              light_controller.changeCTB(ct, bri);
+            } else {
+              light_controller.changeHSB(hue, sat, bri);
+            }
+            LightPreparePower();
+          } else {
+            LightSetBri(device, bri);
+          }
+          if (LST_COLDWARM <= local_light_subtype) {
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
+          } else {
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_DIMMER));
+          }
+          XdrvRulesProcess();
+        }
+        change = false;
+      }
+      response += "]";
+      if (2 == response.length()) {
+        response = FPSTR(HUE_ERROR_JSON);
+      }
+    }
+    else {
+      response = FPSTR(HUE_ERROR_JSON);
+    }
+  }
+  else if(path->indexOf("/lights/") >= 0) {
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "/lights path=%s", path->c_str());
+    path->remove(0,8);
+    device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT_HUE
+    if (device>devices_present) {
+      Script_HueStatus(&response,device-devices_present-1);
+      goto exit;
+}
+#endif
+
+    if ((device < 1) || (device > maxhue)) {
+      device = 1;
+    }
+    response += F("{\"state\":");
+    HueLightStatus1(device, &response);
+    HueLightStatus2(device, &response);
+  }
+  else {
+    response = "{}";
+    code = 406;
+  }
+  exit:
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
+  WSSend(code, CT_JSON, response);
+}
+
+void HueGroups(String *path)
+{
+
+
+
+  String response = "{}";
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  if (path->endsWith("/0")) {
+    response = FPSTR(HUE_GROUP0_STATUS_JSON);
+    String lights = F("\"1\"");
+    for (uint32_t i = 2; i <= maxhue; i++) {
+      lights += ",\"";
+      lights += EncodeLightId(i);
+      lights += "\"";
+    }
+    response.replace("{l1", lights);
+    HueLightStatus1(1, &response);
+    response += F("}");
+  }
+
+  WSSend(200, CT_JSON, response);
+}
+
+void HandleHueApi(String *path)
+{
+# 784 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
+  uint8_t args = 0;
+
+  path->remove(0, 4);
+  uint16_t apilen = path->length();
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API " (%s)"), path->c_str());
+  for (args = 0; args < WebServer->args(); args++) {
+    String json = WebServer->arg(args);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_POST_ARGS " (%s)"), json.c_str());
+  }
+
+  if (path->endsWith("/invalid/")) {}
+  else if (!apilen) HueAuthentication(path);
+  else if (path->endsWith("/")) HueAuthentication(path);
+  else if (path->endsWith("/config")) HueConfig(path);
+  else if (path->indexOf("/lights") >= 0) HueLights(path);
+  else if (path->indexOf("/groups") >= 0) HueGroups(path);
+  else if (path->endsWith("/schedules")) HueNotImplemented(path);
+  else if (path->endsWith("/sensors")) HueNotImplemented(path);
+  else if (path->endsWith("/scenes")) HueNotImplemented(path);
+  else if (path->endsWith("/rules")) HueNotImplemented(path);
+  else if (path->endsWith("/resourcelinks")) HueNotImplemented(path);
+  else HueGlobalConfig(path);
+}
+
+
+
+
+
+bool Xdrv20(uint8_t function)
+{
+  bool result = false;
+
+#ifdef USE_SCRIPT_HUE
+  if ((EMUL_HUE == Settings.flag2.emulation)) {
+#else
+  if (devices_present && (EMUL_HUE == Settings.flag2.emulation)) {
+#endif
+    switch (function) {
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/description.xml", HandleUpnpSetupHue);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_21_wemo.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_21_wemo.ino"
+#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined (USE_EMULATION_WEMO)
+
+
+
+
+#define XDRV_21 21
+
+const char WEMO_MSEARCH[] PROGMEM =
+  "HTTP/1.1 200 OK\r\n"
+  "CACHE-CONTROL: max-age=86400\r\n"
+  "DATE: Fri, 15 Apr 2016 04:56:29 GMT\r\n"
+  "EXT:\r\n"
+  "LOCATION: http://%s:80/setup.xml\r\n"
+  "OPT: \"http://schemas.upnp.org/upnp/1/0/\"; ns=01\r\n"
+  "01-NLS: b9200ebb-736d-4b93-bf03-835149d13983\r\n"
+  "SERVER: Unspecified, UPnP/1.0, Unspecified\r\n"
+  "ST: %s\r\n"
+  "USN: uuid:%s::%s\r\n"
+  "X-User-Agent: redsonic\r\n"
+  "\r\n";
+
+String WemoSerialnumber(void)
+{
+  char serial[16];
+
+  snprintf_P(serial, sizeof(serial), PSTR("201612K%08X"), ESP.getChipId());
+  return String(serial);
+}
+
+String WemoUuid(void)
+{
+  char uuid[27];
+
+  snprintf_P(uuid, sizeof(uuid), PSTR("Socket-1_0-%s"), WemoSerialnumber().c_str());
+  return String(uuid);
+}
+
+void WemoRespondToMSearch(int echo_type)
+{
+  char message[TOPSZ];
+
+  TickerMSearch.detach();
+  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
+    char type[24];
+    if (1 == echo_type) {
+      strcpy_P(type, URN_BELKIN_DEVICE_CAP);
+    } else {
+      strcpy_P(type, UPNP_ROOTDEVICE);
+    }
+    char response[400];
+    snprintf_P(response, sizeof(response), WEMO_MSEARCH, WiFi.localIP().toString().c_str(), type, WemoUuid().c_str(), type);
+    PortUdp.write(response);
+    PortUdp.endPacket();
+    snprintf_P(message, sizeof(message), PSTR(D_RESPONSE_SENT));
+  } else {
+    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
+  }
+
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
+    echo_type, message, udp_remote_ip.toString().c_str(), udp_remote_port);
+
+  udp_response_mutex = false;
+}
+
+
+
+
+
+const char WEMO_EVENTSERVICE_XML[] PROGMEM =
+  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
+    "<actionList>"
+      "<action>"
+        "<name>SetBinaryState</name>"
+        "<argumentList>"
+          "<argument>"
+            "<retval/>"
+            "<name>BinaryState</name>"
+            "<relatedStateVariable>BinaryState</relatedStateVariable>"
+            "<direction>in</direction>"
+          "</argument>"
+        "</argumentList>"
+      "</action>"
+      "<action>"
+        "<name>GetBinaryState</name>"
+        "<argumentList>"
+          "<argument>"
+            "<retval/>"
+            "<name>BinaryState</name>"
+            "<relatedStateVariable>BinaryState</relatedStateVariable>"
+            "<direction>out</direction>"
+          "</argument>"
+        "</argumentList>"
+      "</action>"
+    "</actionList>"
+    "<serviceStateTable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>BinaryState</name>"
+        "<dataType>bool</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>level</name>"
+        "<dataType>string</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+    "</serviceStateTable>"
+  "</scpd>\r\n\r\n";
+
+const char WEMO_METASERVICE_XML[] PROGMEM =
+  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
+    "<specVersion>"
+      "<major>1</major>"
+      "<minor>0</minor>"
+    "</specVersion>"
+    "<actionList>"
+      "<action>"
+        "<name>GetMetaInfo</name>"
+        "<argumentList>"
+          "<retval />"
+          "<name>GetMetaInfo</name>"
+          "<relatedStateVariable>MetaInfo</relatedStateVariable>"
+          "<direction>in</direction>"
+        "</argumentList>"
+      "</action>"
+    "</actionList>"
+    "<serviceStateTable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>MetaInfo</name>"
+        "<dataType>string</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+    "</serviceStateTable>"
+  "</scpd>\r\n\r\n";
+
+const char WEMO_RESPONSE_STATE_SOAP[] PROGMEM =
+  "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+    "<s:Body>"
+      "<u:%cetBinaryStateResponse xmlns:u=\"urn:Belkin:service:basicevent:1\">"
+        "<BinaryState>%d</BinaryState>"
+      "</u:%cetBinaryStateResponse>"
+    "</s:Body>"
+  "</s:Envelope>\r\n";
+
+const char WEMO_SETUP_XML[] PROGMEM =
+  "<?xml version=\"1.0\"?>"
+  "<root xmlns=\"urn:Belkin:device-1-0\">"
+    "<device>"
+      "<deviceType>urn:Belkin:device:controllee:1</deviceType>"
+      "<friendlyName>{x1</friendlyName>"
+      "<manufacturer>Belkin International Inc.</manufacturer>"
+      "<modelName>Socket</modelName>"
+      "<modelNumber>3.1415</modelNumber>"
+      "<UDN>uuid:{x2</UDN>"
+      "<serialNumber>{x3</serialNumber>"
+      "<binaryState>0</binaryState>"
+      "<serviceList>"
+        "<service>"
+          "<serviceType>urn:Belkin:service:basicevent:1</serviceType>"
+          "<serviceId>urn:Belkin:serviceId:basicevent1</serviceId>"
+          "<controlURL>/upnp/control/basicevent1</controlURL>"
+          "<eventSubURL>/upnp/event/basicevent1</eventSubURL>"
+          "<SCPDURL>/eventservice.xml</SCPDURL>"
+        "</service>"
+        "<service>"
+          "<serviceType>urn:Belkin:service:metainfo:1</serviceType>"
+          "<serviceId>urn:Belkin:serviceId:metainfo1</serviceId>"
+          "<controlURL>/upnp/control/metainfo1</controlURL>"
+          "<eventSubURL>/upnp/event/metainfo1</eventSubURL>"
+          "<SCPDURL>/metainfoservice.xml</SCPDURL>"
+        "</service>"
+      "</serviceList>"
+    "</device>"
+  "</root>\r\n";
+
+
+
+void HandleUpnpEvent(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_BASIC_EVENT));
+
+  char event[500];
+  strlcpy(event, WebServer->arg(0).c_str(), sizeof(event));
+
+
+
+
+  char state = 'G';
+  if (strstr_P(event, PSTR("SetBinaryState")) != nullptr) {
+    state = 'S';
+    uint8_t power = POWER_TOGGLE;
+    if (strstr_P(event, PSTR("State>1</Binary")) != nullptr) {
+      power = POWER_ON;
+    }
+    else if (strstr_P(event, PSTR("State>0</Binary")) != nullptr) {
+      power = POWER_OFF;
+    }
+    if (power != POWER_TOGGLE) {
+      uint8_t device = (light_type) ? devices_present : 1;
+      ExecuteCommandPower(device, power, SRC_WEMO);
+    }
+  }
+
+  snprintf_P(event, sizeof(event), WEMO_RESPONSE_STATE_SOAP, state, bitRead(power, devices_present -1), state);
+  WSSend(200, CT_XML, event);
+}
+
+void HandleUpnpService(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_EVENT_SERVICE));
+
+  WSSend(200, CT_PLAIN, FPSTR(WEMO_EVENTSERVICE_XML));
+}
+
+void HandleUpnpMetaService(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_META_SERVICE));
+
+  WSSend(200, CT_PLAIN, FPSTR(WEMO_METASERVICE_XML));
+}
+
+void HandleUpnpSetupWemo(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_SETUP));
+
+  String setup_xml = FPSTR(WEMO_SETUP_XML);
+  setup_xml.replace("{x1", SettingsText(SET_FRIENDLYNAME1));
+  setup_xml.replace("{x2", WemoUuid());
+  setup_xml.replace("{x3", WemoSerialnumber());
+  WSSend(200, CT_XML, setup_xml);
+}
+
+
+
+
+
+bool Xdrv21(uint8_t function)
+{
+  bool result = false;
+
+  if (devices_present && (EMUL_WEMO == Settings.flag2.emulation)) {
+    switch (function) {
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/upnp/control/basicevent1", HTTP_POST, HandleUpnpEvent);
+        WebServer->on("/eventservice.xml", HandleUpnpService);
+        WebServer->on("/metainfoservice.xml", HandleUpnpMetaService);
+        WebServer->on("/setup.xml", HandleUpnpSetupWemo);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+#ifdef USE_SONOFF_IFAN
+
+
+
+
+#define XDRV_22 22
+
+const uint8_t MAX_FAN_SPEED = 4;
+
+const uint8_t kIFan02Speed[MAX_FAN_SPEED] = { 0x00, 0x01, 0x03, 0x05 };
+const uint8_t kIFan03Speed[MAX_FAN_SPEED +2] = { 0x00, 0x01, 0x03, 0x04, 0x05, 0x06 };
+const uint8_t kIFan03Sequence[MAX_FAN_SPEED][MAX_FAN_SPEED] = {{0, 2, 2, 2}, {0, 1, 2, 4}, {1, 1, 2, 5}, {4, 4, 5, 3}};
+
+const char kSonoffIfanCommands[] PROGMEM = "|"
+  D_CMND_FANSPEED;
+
+void (* const SonoffIfanCommand[])(void) PROGMEM = {
+  &CmndFanspeed };
+
+uint8_t ifan_fanspeed_timer = 0;
+uint8_t ifan_fanspeed_goal = 0;
+bool ifan_receive_flag = false;
+bool ifan_restart_flag = true;
+
+
+
+bool IsModuleIfan(void)
+{
+  return ((SONOFF_IFAN02 == my_module_type) || (SONOFF_IFAN03 == my_module_type));
+}
+
+uint8_t MaxFanspeed(void)
+{
+  return MAX_FAN_SPEED;
+}
+
+uint8_t GetFanspeed(void)
+{
+  if (ifan_fanspeed_timer) {
+    return ifan_fanspeed_goal;
+  } else {
+
+
+
+
+
+
+    uint8_t fanspeed = (uint8_t)(power &0xF) >> 1;
+    if (fanspeed) { fanspeed = (fanspeed >> 1) +1; }
+    return fanspeed;
+  }
+}
+
+
+
+void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence)
+{
+  ifan_fanspeed_timer = 0;
+  ifan_fanspeed_goal = fanspeed;
+
+  uint8_t fanspeed_now = GetFanspeed();
+
+  if (fanspeed == fanspeed_now) { return; }
+
+  uint8_t fans = kIFan02Speed[fanspeed];
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (sequence) {
+      fanspeed = kIFan03Sequence[fanspeed_now][ifan_fanspeed_goal];
+      if (fanspeed != ifan_fanspeed_goal) {
+        if (0 == fanspeed_now) {
+          ifan_fanspeed_timer = 20;
+        } else {
+          ifan_fanspeed_timer = 2;
+        }
+      }
+    }
+    fans = kIFan03Speed[fanspeed];
+  }
+  for (uint32_t i = 2; i < 5; i++) {
+    uint8_t state = (fans &1) + POWER_OFF_NO_STATE;
+    ExecuteCommandPower(i, state, SRC_IGNORE);
+    fans >>= 1;
+  }
+
+#ifdef USE_DOMOTICZ
+  if (sequence) { DomoticzUpdateFanState(); }
+#endif
+}
+
+
+
+void SonoffIfanReceived(void)
+{
+  char svalue[32];
+
+  uint8_t mode = serial_in_buffer[3];
+  uint8_t action = serial_in_buffer[6];
+
+  if (4 == mode) {
+    if (action < 4) {
+
+
+
+
+      if (action != GetFanspeed()) {
+        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), action);
+        ExecuteCommand(svalue, SRC_REMOTE);
+#ifdef USE_BUZZER
+        BuzzerEnabledBeep((action) ? action : 1, (action) ? 1 : 4);
+#endif
+      }
+    } else {
+
+      ExecuteCommandPower(1, POWER_TOGGLE, SRC_REMOTE);
+    }
+  }
+  if (6 == mode) {
+
+    Settings.flag3.buzzer_enable = !Settings.flag3.buzzer_enable;
+  }
+  if (7 == mode) {
+
+#ifdef USE_BUZZER
+    BuzzerEnabledBeep(4, 1);
+#endif
+  }
+
+
+
+  serial_in_buffer[5] = 0;
+  serial_in_buffer[6] = 0;
+  for (uint32_t i = 0; i < 7; i++) {
+    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+}
+
+bool SonoffIfanSerialInput(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (0xAA == serial_in_byte) {
+      serial_in_byte_counter = 0;
+      ifan_receive_flag = true;
+    }
+    if (ifan_receive_flag) {
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if (serial_in_byte_counter == 8) {
+# 176 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+        AddLogSerial(LOG_LEVEL_DEBUG);
+        uint8_t crc = 0;
+        for (uint32_t i = 2; i < 7; i++) {
+          crc += serial_in_buffer[i];
+        }
+        if (crc == serial_in_buffer[7]) {
+          SonoffIfanReceived();
+          ifan_receive_flag = false;
+          return true;
+        }
+      }
+      serial_in_byte = 0;
+    }
+    return false;
+  }
+}
+
+
+
+
+
+void CmndFanspeed(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    if ('-' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (int16_t)GetFanspeed() -1;
+      if (XdrvMailbox.payload < 0) { XdrvMailbox.payload = MAX_FAN_SPEED -1; }
+    }
+    else if ('+' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = GetFanspeed() +1;
+      if (XdrvMailbox.payload > MAX_FAN_SPEED -1) { XdrvMailbox.payload = 0; }
+    }
+  }
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_FAN_SPEED)) {
+    SonoffIFanSetFanspeed(XdrvMailbox.payload, true);
+  }
+  ResponseCmndNumber(GetFanspeed());
+}
+
+
+
+bool SonoffIfanInit(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    SetSerial(9600, TS_SERIAL_8N1);
+  }
+  return false;
+}
+
+void SonoffIfanUpdate(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (ifan_fanspeed_timer) {
+      ifan_fanspeed_timer--;
+      if (!ifan_fanspeed_timer) {
+        SonoffIFanSetFanspeed(ifan_fanspeed_goal, false);
+      }
+    }
+  }
+
+  if (ifan_restart_flag && (4 == uptime) && (SONOFF_IFAN02 == my_module_type)) {
+    ifan_restart_flag = false;
+    SetDevicePower(1, SRC_RETRY);
+    SetDevicePower(power, SRC_RETRY);
+  }
+}
+
+
+
+
+
+bool Xdrv22(uint8_t function)
+{
+  bool result = false;
+
+  if (IsModuleIfan()) {
+    switch (function) {
+      case FUNC_EVERY_250_MSECOND:
+        SonoffIfanUpdate();
+        break;
+      case FUNC_SERIAL:
+        result = SonoffIfanSerialInput();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSonoffIfanCommands, SonoffIfanCommand);
+        break;
+      case FUNC_MODULE_INIT:
+        result = SonoffIfanInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+#ifdef USE_ZIGBEE
+
+#define OCCUPANCY "Occupancy"
+
+typedef uint64_t Z_IEEEAddress;
+typedef uint16_t Z_ShortAddress;
+
+enum ZnpCommandType {
+  Z_POLL = 0x00,
+  Z_SREQ = 0x20,
+  Z_AREQ = 0x40,
+  Z_SRSP = 0x60
+};
+
+enum ZnpSubsystem {
+  Z_RPC_Error = 0x00,
+  Z_SYS = 0x01,
+  Z_MAC = 0x02,
+  Z_NWK = 0x03,
+  Z_AF = 0x04,
+  Z_ZDO = 0x05,
+  Z_SAPI = 0x06,
+  Z_UTIL = 0x07,
+  Z_DEBUG = 0x08,
+  Z_APP = 0x09
+};
+
+
+enum SysCommand {
+  SYS_RESET = 0x00,
+  SYS_PING = 0x01,
+  SYS_VERSION = 0x02,
+  SYS_SET_EXTADDR = 0x03,
+  SYS_GET_EXTADDR = 0x04,
+  SYS_RAM_READ = 0x05,
+  SYS_RAM_WRITE = 0x06,
+  SYS_OSAL_NV_ITEM_INIT = 0x07,
+  SYS_OSAL_NV_READ = 0x08,
+  SYS_OSAL_NV_WRITE = 0x09,
+  SYS_OSAL_START_TIMER = 0x0A,
+  SYS_OSAL_STOP_TIMER = 0x0B,
+  SYS_RANDOM = 0x0C,
+  SYS_ADC_READ = 0x0D,
+  SYS_GPIO = 0x0E,
+  SYS_STACK_TUNE = 0x0F,
+  SYS_SET_TIME = 0x10,
+  SYS_GET_TIME = 0x11,
+  SYS_OSAL_NV_DELETE = 0x12,
+  SYS_OSAL_NV_LENGTH = 0x13,
+  SYS_TEST_RF = 0x40,
+  SYS_TEST_LOOPBACK = 0x41,
+  SYS_RESET_IND = 0x80,
+  SYS_OSAL_TIMER_EXPIRED = 0x81,
+};
+
+enum SapiCommand {
+  SAPI_START_REQUEST = 0x00,
+  SAPI_BIND_DEVICE = 0x01,
+  SAPI_ALLOW_BIND = 0x02,
+  SAPI_SEND_DATA_REQUEST = 0x03,
+  SAPI_READ_CONFIGURATION = 0x04,
+  SAPI_WRITE_CONFIGURATION = 0x05,
+  SAPI_GET_DEVICE_INFO = 0x06,
+  SAPI_FIND_DEVICE_REQUEST = 0x07,
+  SAPI_PERMIT_JOINING_REQUEST = 0x08,
+  SAPI_SYSTEM_RESET = 0x09,
+  SAPI_START_CONFIRM = 0x80,
+  SAPI_BIND_CONFIRM = 0x81,
+  SAPI_ALLOW_BIND_CONFIRM = 0x82,
+  SAPI_SEND_DATA_CONFIRM = 0x83,
+  SAPI_FIND_DEVICE_CONFIRM = 0x85,
+  SAPI_RECEIVE_DATA_INDICATION = 0x87,
+};
+enum Z_configuration {
+  CONF_EXTADDR = 0x01,
+  CONF_BOOTCOUNTER = 0x02,
+  CONF_STARTUP_OPTION = 0x03,
+  CONF_START_DELAY = 0x04,
+  CONF_NIB = 0x21,
+  CONF_DEVICE_LIST = 0x22,
+  CONF_ADDRMGR = 0x23,
+  CONF_POLL_RATE = 0x24,
+  CONF_QUEUED_POLL_RATE = 0x25,
+  CONF_RESPONSE_POLL_RATE = 0x26,
+  CONF_REJOIN_POLL_RATE = 0x27,
+  CONF_DATA_RETRIES = 0x28,
+  CONF_POLL_FAILURE_RETRIES = 0x29,
+  CONF_STACK_PROFILE = 0x2A,
+  CONF_INDIRECT_MSG_TIMEOUT = 0x2B,
+  CONF_ROUTE_EXPIRY_TIME = 0x2C,
+  CONF_EXTENDED_PAN_ID = 0x2D,
+  CONF_BCAST_RETRIES = 0x2E,
+  CONF_PASSIVE_ACK_TIMEOUT = 0x2F,
+  CONF_BCAST_DELIVERY_TIME = 0x30,
+  CONF_NWK_MODE = 0x31,
+  CONF_CONCENTRATOR_ENABLE = 0x32,
+  CONF_CONCENTRATOR_DISCOVERY = 0x33,
+  CONF_CONCENTRATOR_RADIUS = 0x34,
+  CONF_CONCENTRATOR_RC = 0x36,
+  CONF_NWK_MGR_MODE = 0x37,
+  CONF_SRC_RTG_EXPIRY_TIME = 0x38,
+  CONF_ROUTE_DISCOVERY_TIME = 0x39,
+  CONF_NWK_ACTIVE_KEY_INFO = 0x3A,
+  CONF_NWK_ALTERN_KEY_INFO = 0x3B,
+  CONF_ROUTER_OFF_ASSOC_CLEANUP = 0x3C,
+  CONF_NWK_LEAVE_REQ_ALLOWED = 0x3D,
+  CONF_NWK_CHILD_AGE_ENABLE = 0x3E,
+  CONF_DEVICE_LIST_KA_TIMEOUT = 0x3F,
+  CONF_BINDING_TABLE = 0x41,
+  CONF_GROUP_TABLE = 0x42,
+  CONF_APS_FRAME_RETRIES = 0x43,
+  CONF_APS_ACK_WAIT_DURATION = 0x44,
+  CONF_APS_ACK_WAIT_MULTIPLIER = 0x45,
+  CONF_BINDING_TIME = 0x46,
+  CONF_APS_USE_EXT_PANID = 0x47,
+  CONF_APS_USE_INSECURE_JOIN = 0x48,
+  CONF_COMMISSIONED_NWK_ADDR = 0x49,
+  CONF_APS_NONMEMBER_RADIUS = 0x4B,
+  CONF_APS_LINK_KEY_TABLE = 0x4C,
+  CONF_APS_DUPREJ_TIMEOUT_INC = 0x4D,
+  CONF_APS_DUPREJ_TIMEOUT_COUNT = 0x4E,
+  CONF_APS_DUPREJ_TABLE_SIZE = 0x4F,
+  CONF_DIAGNOSTIC_STATS = 0x50,
+  CONF_SECURITY_LEVEL = 0x61,
+  CONF_PRECFGKEY = 0x62,
+  CONF_PRECFGKEYS_ENABLE = 0x63,
+  CONF_SECURITY_MODE = 0x64,
+  CONF_SECURE_PERMIT_JOIN = 0x65,
+  CONF_APS_LINK_KEY_TYPE = 0x66,
+  CONF_APS_ALLOW_R19_SECURITY = 0x67,
+  CONF_IMPLICIT_CERTIFICATE = 0x69,
+  CONF_DEVICE_PRIVATE_KEY = 0x6A,
+  CONF_CA_PUBLIC_KEY = 0x6B,
+  CONF_KE_MAX_DEVICES = 0x6C,
+  CONF_USE_DEFAULT_TCLK = 0x6D,
+  CONF_RNG_COUNTER = 0x6F,
+  CONF_RANDOM_SEED = 0x70,
+  CONF_TRUSTCENTER_ADDR = 0x71,
+  CONF_USERDESC = 0x81,
+  CONF_NWKKEY = 0x82,
+  CONF_PANID = 0x83,
+  CONF_CHANLIST = 0x84,
+  CONF_LEAVE_CTRL = 0x85,
+  CONF_SCAN_DURATION = 0x86,
+  CONF_LOGICAL_TYPE = 0x87,
+  CONF_NWKMGR_MIN_TX = 0x88,
+  CONF_NWKMGR_ADDR = 0x89,
+  CONF_ZDO_DIRECT_CB = 0x8F,
+  CONF_TCLK_TABLE_START = 0x0101,
+  ZNP_HAS_CONFIGURED = 0xF00
+};
+# 210 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+enum Z_Status {
+  Z_Success = 0x00,
+  Z_Failure = 0x01,
+  Z_InvalidParameter = 0x02,
+  Z_MemError = 0x03,
+  Z_Created = 0x09,
+  Z_BufferFull = 0x11
+};
+
+enum Z_App_Profiles {
+  Z_PROF_IPM = 0x0101,
+  Z_PROF_HA = 0x0104,
+  Z_PROF_CBA = 0x0105,
+  Z_PROF_TA = 0x0107,
+  Z_PROF_PHHC = 0x0108,
+  Z_PROF_AMI = 0x0109,
+};
+
+enum Z_Device_Ids {
+  Z_DEVID_CONF_TOOL = 0x0005,
+# 262 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+};
+# 275 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+enum AfCommand : uint8_t {
+  AF_REGISTER = 0x00,
+  AF_DATA_REQUEST = 0x01,
+  AF_DATA_REQUEST_EXT = 0x02,
+  AF_DATA_REQUEST_SRC_RTG = 0x03,
+  AF_INTER_PAN_CTL = 0x10,
+  AF_DATA_STORE = 0x11,
+  AF_DATA_RETRIEVE = 0x12,
+  AF_APSF_CONFIG_SET = 0x13,
+  AF_DATA_CONFIRM = 0x80,
+  AF_REFLECT_ERROR = 0x83,
+  AF_INCOMING_MSG = 0x81,
+  AF_INCOMING_MSG_EXT = 0x82
+};
+
+
+enum : uint8_t {
+  ZDO_NWK_ADDR_REQ = 0x00,
+  ZDO_IEEE_ADDR_REQ = 0x01,
+  ZDO_NODE_DESC_REQ = 0x02,
+  ZDO_POWER_DESC_REQ = 0x03,
+  ZDO_SIMPLE_DESC_REQ = 0x04,
+  ZDO_ACTIVE_EP_REQ = 0x05,
+  ZDO_MATCH_DESC_REQ = 0x06,
+  ZDO_COMPLEX_DESC_REQ = 0x07,
+  ZDO_USER_DESC_REQ = 0x08,
+  ZDO_DEVICE_ANNCE = 0x0A,
+  ZDO_USER_DESC_SET = 0x0B,
+  ZDO_SERVER_DISC_REQ = 0x0C,
+  ZDO_END_DEVICE_BIND_REQ = 0x20,
+  ZDO_BIND_REQ = 0x21,
+  ZDO_UNBIND_REQ = 0x22,
+  ZDO_SET_LINK_KEY = 0x23,
+  ZDO_REMOVE_LINK_KEY = 0x24,
+  ZDO_GET_LINK_KEY = 0x25,
+  ZDO_MGMT_NWK_DISC_REQ = 0x30,
+  ZDO_MGMT_LQI_REQ = 0x31,
+  ZDO_MGMT_RTQ_REQ = 0x32,
+  ZDO_MGMT_BIND_REQ = 0x33,
+  ZDO_MGMT_LEAVE_REQ = 0x34,
+  ZDO_MGMT_DIRECT_JOIN_REQ = 0x35,
+  ZDO_MGMT_PERMIT_JOIN_REQ = 0x36,
+  ZDO_MGMT_NWK_UPDATE_REQ = 0x37,
+  ZDO_MSG_CB_REGISTER = 0x3E,
+  ZDO_MGS_CB_REMOVE = 0x3F,
+  ZDO_STARTUP_FROM_APP = 0x40,
+  ZDO_AUTO_FIND_DESTINATION = 0x41,
+  ZDO_EXT_REMOVE_GROUP = 0x47,
+  ZDO_EXT_REMOVE_ALL_GROUP = 0x48,
+  ZDO_EXT_FIND_ALL_GROUPS_ENDPOINT = 0x49,
+  ZDO_EXT_FIND_GROUP = 0x4A,
+  ZDO_EXT_ADD_GROUP = 0x4B,
+  ZDO_EXT_COUNT_ALL_GROUPS = 0x4C,
+  ZDO_NWK_ADDR_RSP = 0x80,
+  ZDO_IEEE_ADDR_RSP = 0x81,
+  ZDO_NODE_DESC_RSP = 0x82,
+  ZDO_POWER_DESC_RSP = 0x83,
+  ZDO_SIMPLE_DESC_RSP = 0x84,
+  ZDO_ACTIVE_EP_RSP = 0x85,
+  ZDO_MATCH_DESC_RSP = 0x86,
+  ZDO_COMPLEX_DESC_RSP = 0x87,
+  ZDO_USER_DESC_RSP = 0x88,
+  ZDO_USER_DESC_CONF = 0x89,
+  ZDO_SERVER_DISC_RSP = 0x8A,
+  ZDO_END_DEVICE_BIND_RSP = 0xA0,
+  ZDO_BIND_RSP = 0xA1,
+  ZDO_UNBIND_RSP = 0xA2,
+  ZDO_MGMT_NWK_DISC_RSP = 0xB0,
+  ZDO_MGMT_LQI_RSP = 0xB1,
+  ZDO_MGMT_RTG_RSP = 0xB2,
+  ZDO_MGMT_BIND_RSP = 0xB3,
+  ZDO_MGMT_LEAVE_RSP = 0xB4,
+  ZDO_MGMT_DIRECT_JOIN_RSP = 0xB5,
+  ZDO_MGMT_PERMIT_JOIN_RSP = 0xB6,
+  ZDO_STATE_CHANGE_IND = 0xC0,
+  ZDO_END_DEVICE_ANNCE_IND = 0xC1,
+  ZDO_MATCH_DESC_RSP_SENT = 0xC2,
+  ZDO_STATUS_ERROR_RSP = 0xC3,
+  ZDO_SRC_RTG_IND = 0xC4,
+  ZDO_LEAVE_IND = 0xC9,
+  ZDO_TC_DEV_IND = 0xCA,
+  ZDO_PERMIT_JOIN_IND = 0xCB,
+  ZDO_MSG_CB_INCOMING = 0xFF
+};
+
+
+enum ZdoStates {
+  ZDO_DEV_HOLD = 0x00,
+  ZDO_DEV_INIT = 0x01,
+  ZDO_DEV_NWK_DISC = 0x02,
+  ZDO_DEV_NWK_JOINING = 0x03,
+  ZDO_DEV_NWK_REJOIN = 0x04,
+  ZDO_DEV_END_DEVICE_UNAUTH = 0x05,
+  ZDO_DEV_END_DEVICE = 0x06,
+  ZDO_DEV_ROUTER = 0x07,
+  ZDO_DEV_COORD_STARTING = 0x08,
+  ZDO_DEV_ZB_COORD = 0x09,
+  ZDO_DEV_NWK_ORPHAN = 0x0A,
+};
+
+
+enum Z_Util {
+  Z_UTIL_GET_DEVICE_INFO = 0x00,
+  Z_UTIL_GET_NV_INFO = 0x01,
+  Z_UTIL_SET_PANID = 0x02,
+  Z_UTIL_SET_CHANNELS = 0x03,
+  Z_UTIL_SET_SECLEVEL = 0x04,
+  Z_UTIL_SET_PRECFGKEY = 0x05,
+  Z_UTIL_CALLBACK_SUB_CMD = 0x06,
+  Z_UTIL_KEY_EVENT = 0x07,
+  Z_UTIL_TIME_ALIVE = 0x09,
+  Z_UTIL_LED_CONTROL = 0x0A,
+  Z_UTIL_TEST_LOOPBACK = 0x10,
+  Z_UTIL_DATA_REQ = 0x11,
+  Z_UTIL_SRC_MATCH_ENABLE = 0x20,
+  Z_UTIL_SRC_MATCH_ADD_ENTRY = 0x21,
+  Z_UTIL_SRC_MATCH_DEL_ENTRY = 0x22,
+  Z_UTIL_SRC_MATCH_CHECK_SRC_ADDR = 0x23,
+  Z_UTIL_SRC_MATCH_ACK_ALL_PENDING = 0x24,
+  Z_UTIL_SRC_MATCH_CHECK_ALL_PENDING = 0x25,
+  Z_UTIL_ADDRMGR_EXT_ADDR_LOOKUP = 0x40,
+  Z_UTIL_ADDRMGR_NWK_ADDR_LOOKUP = 0x41,
+  Z_UTIL_APSME_LINK_KEY_DATA_GET = 0x44,
+  Z_UTIL_APSME_LINK_KEY_NV_ID_GET = 0x45,
+  Z_UTIL_ASSOC_COUNT = 0x48,
+  Z_UTIL_ASSOC_FIND_DEVICE = 0x49,
+  Z_UTIL_ASSOC_GET_WITH_ADDRESS = 0x4A,
+  Z_UTIL_APSME_REQUEST_KEY_CMD = 0x4B,
+  Z_UTIL_ZCL_KEY_EST_INIT_EST = 0x80,
+  Z_UTIL_ZCL_KEY_EST_SIGN = 0x81,
+  Z_UTIL_UTIL_SYNC_REQ = 0xE0,
+  Z_UTIL_ZCL_KEY_ESTABLISH_IND = 0xE1
+};
+
+enum ZCL_Global_Commands {
+  ZCL_READ_ATTRIBUTES = 0x00,
+  ZCL_READ_ATTRIBUTES_RESPONSE = 0x01,
+  ZCL_WRITE_ATTRIBUTES = 0x02,
+  ZCL_WRITE_ATTRIBUTES_UNDIVIDED = 0x03,
+  ZCL_WRITE_ATTRIBUTES_RESPONSE = 0x04,
+  ZCL_WRITE_ATTRIBUTES_NORESPONSE = 0x05,
+  ZCL_CONFIGURE_REPORTING = 0x06,
+  ZCL_CONFIGURE_REPORTING_RESPONSE = 0x07,
+  ZCL_READ_REPORTING_CONFIGURATION = 0x08,
+  ZCL_READ_REPORTING_CONFIGURATION_RESPONSE = 0x09,
+  ZCL_REPORT_ATTRIBUTES = 0x0a,
+  ZCL_DEFAULT_RESPONSE = 0x0b,
+  ZCL_DISCOVER_ATTRIBUTES = 0x0c,
+  ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d
+
+};
+
+const uint16_t Z_ProfileIds[] PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
+const char Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
+#ifdef USE_ZIGBEE
+
+
+
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp = true, uint8_t transacId = 1);
+
+
+
+JsonVariant &getCaseInsensitive(const JsonObject &json, const char *needle) {
+
+  if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle))) {
+    return *(JsonVariant*)nullptr;
+  }
+
+  for (auto kv : json) {
+    const char *key = kv.key;
+    JsonVariant &value = kv.value;
+
+    if (0 == strcasecmp_P(key, needle)) {
+      return value;
+    }
+  }
+
+  return *(JsonVariant*)nullptr;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+#ifdef USE_ZIGBEE
+
+#include <vector>
+#include <map>
+
+#ifndef ZIGBEE_SAVE_DELAY_SECONDS
+#define ZIGBEE_SAVE_DELAY_SECONDS 10;
+#endif
+const uint16_t kZigbeeSaveDelaySeconds = ZIGBEE_SAVE_DELAY_SECONDS;
+
+typedef int32_t (*Z_DeviceTimer)(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+
+typedef struct Z_Device {
+  uint16_t shortaddr;
+  uint64_t longaddr;
+  uint32_t firstSeen;
+  uint32_t lastSeen;
+  String manufacturerId;
+  String modelId;
+  String friendlyName;
+  std::vector<uint32_t> endpoints;
+  std::vector<uint32_t> clusters_in;
+  std::vector<uint32_t> clusters_out;
+
+  uint32_t timer;
+  uint16_t cluster;
+  uint16_t endpoint;
+  uint32_t value;
+  Z_DeviceTimer func;
+
+  DynamicJsonBuffer *json_buffer;
+  JsonObject *json;
+} Z_Device;
+
+
+
+
+
+
+
+class Z_Devices {
+public:
+  Z_Devices() {};
+
+
+
+
+
+
+  uint16_t isKnownShortAddr(uint16_t shortaddr) const;
+  uint16_t isKnownLongAddr(uint64_t longaddr) const;
+  uint16_t isKnownIndex(uint32_t index) const;
+  uint16_t isKnownFriendlyName(const char * name) const;
+
+  uint64_t getDeviceLongAddr(uint16_t shortaddr) const;
+
+
+
+  void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
+
+
+  void addEndoint(uint16_t shortaddr, uint8_t endpoint);
+
+
+  void addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId);
+
+
+  void addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out);
+
+  uint8_t findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster);
+
+  void setManufId(uint16_t shortaddr, const char * str);
+  void setModelId(uint16_t shortaddr, const char * str);
+  void setFriendlyName(uint16_t shortaddr, const char * str);
+  const String * getFriendlyName(uint16_t) const;
+
+
+  void updateLastSeen(uint16_t shortaddr);
+
+
+  String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
+
+
+  void resetTimer(uint32_t shortaddr);
+  void setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func);
+  void runTimer(void);
+
+
+  void jsonClear(uint16_t shortaddr);
+  void jsonAppend(uint16_t shortaddr, const JsonObject &values);
+  const JsonObject *jsonGet(uint16_t shortaddr);
+  void jsonPublishFlush(uint16_t shortaddr);
+  bool jsonIsConflict(uint16_t shortaddr, const JsonObject &values);
+  void jsonPublishNow(uint16_t shortaddr, JsonObject &values);
+
+
+  size_t devicesSize(void) const {
+    return _devices.size();
+  }
+  const Z_Device &devicesAt(size_t i) const {
+    return _devices.at(i);
+  }
+
+
+  bool removeDevice(uint16_t shortaddr);
+
+
+  void dirty(void);
+  void clean(void);
+
+
+  uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
+
+private:
+  std::vector<Z_Device> _devices = {};
+  uint32_t _saveTimer = 0;
+
+  template < typename T>
+  static bool findInVector(const std::vector<T> & vecOfElements, const T & element);
+
+  template < typename T>
+  static int32_t findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element);
+
+
+  static int32_t findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t element);
+
+  Z_Device & getShortAddr(uint16_t shortaddr);
+  const Z_Device & getShortAddrConst(uint16_t shortaddr) const ;
+  Z_Device & getLongAddr(uint64_t longaddr);
+
+  int32_t findShortAddr(uint16_t shortaddr) const;
+  int32_t findLongAddr(uint64_t longaddr) const;
+  int32_t findFriendlyName(const char * name) const;
+
+  void _updateLastSeen(Z_Device &device) {
+    if (&device != nullptr) {
+      device.lastSeen = Rtc.utc_time;
+    }
+  };
+
+
+  Z_Device & createDeviceEntry(uint16_t shortaddr, uint64_t longaddr = 0);
+};
+
+Z_Devices zigbee_devices = Z_Devices();
+
+
+uint64_t localIEEEAddr = 0;
+
+
+template < typename T>
+bool Z_Devices::findInVector(const std::vector<T> & vecOfElements, const T & element) {
+
+ auto it = std::find(vecOfElements.begin(), vecOfElements.end(), element);
+
+ if (it != vecOfElements.end()) {
+  return true;
+ } else {
+  return false;
+ }
+}
+
+template < typename T>
+int32_t Z_Devices::findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element) {
+
+
+  int32_t found = 0;
+  for (auto &elem : vecOfElements) {
+    if ( ((elem >> 16) & 0xFF) == element) { return found; }
+    found++;
+  }
+
+  return -1;
+}
+# 204 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t cluster) {
+  int32_t found = 0;
+  for (auto &elem : vecOfElements) {
+    if ((elem & 0xFFFF) == cluster) { return found; }
+    found++;
+  }
+  return -1;
+}
+
+
+
+
+
+Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
+  if (!shortaddr && !longaddr) { return *(Z_Device*) nullptr; }
+  Z_Device device = { shortaddr, longaddr,
+                      Rtc.utc_time, Rtc.utc_time,
+                      String(),
+                      String(),
+                      String(),
+                      std::vector<uint32_t>(),
+                      std::vector<uint32_t>(),
+                      std::vector<uint32_t>(),
+                      0,0,0,0,
+                      nullptr,
+                      nullptr, nullptr };
+  device.json_buffer = new DynamicJsonBuffer();
+  _devices.push_back(device);
+  dirty();
+  return _devices.back();
+}
+# 244 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findShortAddr(uint16_t shortaddr) const {
+  if (!shortaddr) { return -1; }
+  int32_t found = 0;
+  if (shortaddr) {
+    for (auto &elem : _devices) {
+      if (elem.shortaddr == shortaddr) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+# 263 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findLongAddr(uint64_t longaddr) const {
+  if (!longaddr) { return -1; }
+  int32_t found = 0;
+  if (longaddr) {
+    for (auto &elem : _devices) {
+      if (elem.longaddr == longaddr) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+# 282 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findFriendlyName(const char * name) const {
+  if (!name) { return -1; }
+  size_t name_len = strlen(name);
+  int32_t found = 0;
+  if (name_len) {
+    for (auto &elem : _devices) {
+      if (elem.friendlyName == name) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+
+
+uint16_t Z_Devices::isKnownShortAddr(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownLongAddr(uint64_t longaddr) const {
+  int32_t found = findLongAddr(longaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownIndex(uint32_t index) const {
+  if (index < devicesSize()) {
+    const Z_Device & device = devicesAt(index);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
+  if ((!name) || (0 == strlen(name))) { return 0xFFFF; }
+  int32_t found = findFriendlyName(name);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint64_t Z_Devices::getDeviceLongAddr(uint16_t shortaddr) const {
+  const Z_Device & device = getShortAddrConst(shortaddr);
+  return device.longaddr;
+}
+
+
+
+
+Z_Device & Z_Devices::getShortAddr(uint16_t shortaddr) {
+  if (!shortaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return _devices[found];
+  }
+
+  return createDeviceEntry(shortaddr, 0);
+}
+
+const Z_Device & Z_Devices::getShortAddrConst(uint16_t shortaddr) const {
+  if (!shortaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return _devices[found];
+  }
+  return *((Z_Device*)nullptr);
+}
+
+
+Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
+  if (!longaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findLongAddr(longaddr);
+  if (found > 0) {
+    return _devices[found];
+  }
+  return createDeviceEntry(0, longaddr);
+}
+
+
+bool Z_Devices::removeDevice(uint16_t shortaddr) {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    _devices.erase(_devices.begin() + found);
+    dirty();
+    return true;
+  }
+  return false;
+}
+
+
+
+
+
+
+void Z_Devices::updateDevice(uint16_t shortaddr, uint64_t longaddr) {
+  int32_t s_found = findShortAddr(shortaddr);
+  int32_t l_found = findLongAddr(longaddr);
+
+  if ((s_found >= 0) && (l_found >= 0)) {
+    if (s_found == l_found) {
+      updateLastSeen(shortaddr);
+    } else {
+
+      _devices[l_found].shortaddr = shortaddr;
+
+      _devices.erase(_devices.begin() + s_found);
+      updateLastSeen(shortaddr);
+      dirty();
+    }
+  } else if (s_found >= 0) {
+
+
+    _devices[s_found].longaddr = longaddr;
+    updateLastSeen(shortaddr);
+    dirty();
+  } else if (l_found >= 0) {
+
+    _devices[l_found].shortaddr = shortaddr;
+    dirty();
+  } else {
+
+    if (shortaddr || longaddr) {
+      createDeviceEntry(shortaddr, longaddr);
+    }
+  }
+}
+
+
+
+
+void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
+  if (!shortaddr) { return; }
+  uint32_t ep_profile = (endpoint << 16);
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (findEndpointInVector(device.endpoints, endpoint) < 0) {
+    device.endpoints.push_back(ep_profile);
+    dirty();
+  }
+}
+
+void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId) {
+  if (!shortaddr) { return; }
+  uint32_t ep_profile = (endpoint << 16) | profileId;
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  int32_t found = findEndpointInVector(device.endpoints, endpoint);
+  if (found < 0) {
+    device.endpoints.push_back(ep_profile);
+    dirty();
+  } else {
+    if (device.endpoints[found] != ep_profile) {
+      device.endpoints[found] = ep_profile;
+      dirty();
+    }
+  }
+}
+
+void Z_Devices::addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out) {
+  if (!shortaddr) { return; }
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  uint32_t ep_cluster = (endpoint << 16) | cluster;
+  if (!out) {
+    if (!findInVector(device.clusters_in, ep_cluster)) {
+      device.clusters_in.push_back(ep_cluster);
+      dirty();
+    }
+  } else {
+    if (!findInVector(device.clusters_out, ep_cluster)) {
+      device.clusters_out.push_back(ep_cluster);
+      dirty();
+    }
+  }
+}
+
+
+
+uint8_t Z_Devices::findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster){
+  int32_t short_found = findShortAddr(shortaddr);
+  if (short_found < 0) return 0;
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return 0; }
+  int32_t found = findClusterEndpoint(device.clusters_in, cluster);
+  if (found >= 0) {
+    return (device.clusters_in[found] >> 16) & 0xFF;
+  } else {
+    return 0;
+  }
+}
+
+
+void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.manufacturerId.equals(str)) {
+    dirty();
+  }
+  device.manufacturerId = str;
+}
+void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.modelId.equals(str)) {
+    dirty();
+  }
+  device.modelId = str;
+}
+void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.friendlyName.equals(str)) {
+    dirty();
+  }
+  device.friendlyName = str;
+}
+
+const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    if (device.friendlyName.length() > 0) {
+      return &device.friendlyName;
+    }
+  }
+  return nullptr;
+}
+
+
+void Z_Devices::updateLastSeen(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+}
+
+
+
+
+void Z_Devices::resetTimer(uint32_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  device.timer = 0;
+  device.func = nullptr;
+}
+
+
+void Z_Devices::setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+
+  device.cluster = cluster;
+  device.endpoint = endpoint;
+  device.value = value;
+  device.func = func;
+  device.timer = wait_ms + millis();
+}
+
+
+void Z_Devices::runTimer(void) {
+  for (std::vector<Z_Device>::iterator it = _devices.begin(); it != _devices.end(); ++it) {
+    Z_Device &device = *it;
+    uint16_t shortaddr = device.shortaddr;
+
+    uint32_t timer = device.timer;
+    if ((timer) && TimeReached(timer)) {
+      device.timer = 0;
+
+      (*device.func)(device.shortaddr, device.cluster, device.endpoint, device.value);
+    }
+  }
+
+  if ((_saveTimer) && TimeReached(_saveTimer)) {
+    saveZigbeeDevices();
+    _saveTimer = 0;
+  }
+}
+
+void Z_Devices::jsonClear(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+
+  device.json = nullptr;
+  device.json_buffer->clear();
+}
+
+void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val) {
+  to.remove(key);
+
+  if (val.is<char*>()) {
+    String sval = val.as<String>();
+    to.set(key, sval);
+  } else if (val.is<JsonArray>()) {
+    JsonArray &nested_arr = to.createNestedArray(key);
+    CopyJsonArray(nested_arr, val.as<JsonArray>());
+  } else if (val.is<JsonObject>()) {
+    JsonObject &nested_obj = to.createNestedObject(key);
+    CopyJsonObject(nested_obj, val.as<JsonObject>());
+  } else {
+    to.set(key, val);
+  }
+}
+
+void CopyJsonArray(JsonArray &to, const JsonArray &arr) {
+  for (auto v : arr) {
+    if (v.is<char*>()) {
+      String sval = v.as<String>();
+      to.add(sval);
+    } else if (v.is<JsonArray>()) {
+    } else if (v.is<JsonObject>()) {
+    } else {
+      to.add(v);
+    }
+  }
+}
+
+void CopyJsonObject(JsonObject &to, const JsonObject &from) {
+  for (auto kv : from) {
+    String key_string = kv.key;
+    JsonVariant &val = kv.value;
+
+    CopyJsonVariant(to, key_string, val);
+  }
+}
+
+
+bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return false; }
+  if (&values == nullptr) { return false; }
+
+  if (nullptr == device.json) {
+    return false;
+  }
+
+  for (auto kv : values) {
+    String key_string = kv.key;
+
+    if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {
+      if (device.json->containsKey(kv.key)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  if (&values == nullptr) { return; }
+
+  if (nullptr == device.json) {
+    device.json = &(device.json_buffer->createObject());
+  }
+
+  char sa[8];
+  snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
+  device.json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
+
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  if (fname) {
+    device.json->set(F(D_JSON_ZIGBEE_NAME), (char*)fname->c_str());
+  }
+
+
+  CopyJsonObject(*device.json, values);
+}
+
+const JsonObject *Z_Devices::jsonGet(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return nullptr; }
+  return device.json;
+}
+
+void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  JsonObject * json = device.json;
+  if (json == nullptr) { return; }
+
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);
+# 693 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+  if (use_fname) {
+    json->remove(F(D_JSON_ZIGBEE_NAME));
+  } else {
+    json->remove(F(D_JSON_ZIGBEE_DEVICE));
+  }
+
+  String msg = "";
+  json->printTo(msg);
+  zigbee_devices.jsonClear(shortaddr);
+
+  if (use_fname) {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+  } else {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+  }
+
+
+}
+
+void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
+  jsonPublishFlush(shortaddr);
+  jsonAppend(shortaddr, values);
+  jsonPublishFlush(shortaddr);
+}
+
+void Z_Devices::dirty(void) {
+  _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
+}
+void Z_Devices::clean(void) {
+  _saveTimer = 0;
+}
+
+
+
+
+
+
+uint16_t Z_Devices::parseDeviceParam(const char * param, bool short_must_be_known) const {
+  if (nullptr == param) { return 0; }
+  size_t param_len = strlen(param);
+  char dataBuf[param_len + 1];
+  strcpy(dataBuf, param);
+  RemoveSpace(dataBuf);
+  uint16_t shortaddr = 0;
+
+  if (strlen(dataBuf) < 4) {
+
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 99)) {
+      shortaddr = zigbee_devices.isKnownIndex(XdrvMailbox.payload - 1);
+    }
+  } else if ((dataBuf[0] == '0') && (dataBuf[1] == 'x')) {
+
+    if (strlen(dataBuf) < 18) {
+
+      shortaddr = strtoull(dataBuf, nullptr, 0);
+      if (short_must_be_known) {
+        shortaddr = zigbee_devices.isKnownShortAddr(shortaddr);
+      }
+
+    } else {
+
+      uint64_t longaddr = strtoull(dataBuf, nullptr, 0);
+      shortaddr = zigbee_devices.isKnownLongAddr(longaddr);
+    }
+  } else {
+
+    shortaddr = zigbee_devices.isKnownFriendlyName(dataBuf);
+  }
+
+  return shortaddr;
+}
+
+
+
+
+
+String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
+  DynamicJsonBuffer jsonBuffer;
+  JsonArray& json = jsonBuffer.createArray();
+  JsonArray& devices = json;
+
+  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it) {
+    const Z_Device& device = *it;
+    uint16_t shortaddr = device.shortaddr;
+    char hex[22];
+
+
+    if ((status_shortaddr) && (status_shortaddr != shortaddr)) { continue; }
+
+    JsonObject& dev = devices.createNestedObject();
+
+    snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), shortaddr);
+    dev[F(D_JSON_ZIGBEE_DEVICE)] = hex;
+
+    if (device.friendlyName.length() > 0) {
+      dev[F(D_JSON_ZIGBEE_NAME)] = device.friendlyName;
+    }
+
+    if (2 <= dump_mode) {
+      hex[0] = '0';
+      hex[1] = 'x';
+      Uint64toHex(device.longaddr, &hex[2], 64);
+      dev[F("IEEEAddr")] = hex;
+      if (device.modelId.length() > 0) {
+        dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
+      }
+      if (device.manufacturerId.length() > 0) {
+        dev[F("Manufacturer")] = device.manufacturerId;
+      }
+    }
+
+
+    if (3 <= dump_mode) {
+      JsonObject& dev_endpoints = dev.createNestedObject(F("Endpoints"));
+      for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
+        uint32_t ep_profile = *ite;
+        uint8_t endpoint = (ep_profile >> 16) & 0xFF;
+        uint16_t profileId = ep_profile & 0xFFFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonObject& ep = dev_endpoints.createNestedObject(hex);
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), profileId);
+        ep[F("ProfileId")] = hex;
+
+        int32_t found = -1;
+        for (uint32_t i = 0; i < sizeof(Z_ProfileIds) / sizeof(Z_ProfileIds[0]); i++) {
+          if (pgm_read_word(&Z_ProfileIds[i]) == profileId) {
+            found = i;
+            break;
+          }
+        }
+        if (found > 0) {
+          GetTextIndexed(hex, sizeof(hex), found, Z_ProfileNames);
+          ep[F("ProfileIdName")] = hex;
+        }
+
+        ep.createNestedArray(F("ClustersIn"));
+        ep.createNestedArray(F("ClustersOut"));
+      }
+
+      for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
+        uint16_t cluster = *itc & 0xFFFF;
+        uint8_t endpoint = (*itc >> 16) & 0xFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersIn")];
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
+        cluster_arr.add(hex);
+      }
+
+      for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
+        uint16_t cluster = *itc & 0xFFFF;
+        uint8_t endpoint = (*itc >> 16) & 0xFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersOut")];
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
+        cluster_arr.add(hex);
+      }
+    }
+  }
+  String payload = "";
+  payload.reserve(200);
+  json.printTo(payload);
+  return payload;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+#ifdef USE_ZIGBEE
+# 50 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+const static uint16_t z_spi_start_sector = 0xFF;
+const static uint8_t* z_spi_start = (uint8_t*) 0x402FF000;
+const static uint8_t* z_dev_start = z_spi_start + 0x0800;
+const static size_t z_spi_len = 0x1000;
+const static size_t z_block_offset = 0x0800;
+const static size_t z_block_len = 0x0800;
+
+class z_flashdata_t {
+public:
+  uint32_t name;
+  uint16_t len;
+  uint16_t reserved;
+};
+
+const static uint32_t ZIGB_NAME = 0x3167697A;
+const static size_t Z_MAX_FLASH = z_block_len - sizeof(z_flashdata_t);
+
+
+const uint16_t Z_ClusterNumber[] PROGMEM = {
+  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+  0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+  0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+  0x0100, 0x0101, 0x0102,
+  0x0201, 0x0202, 0x0203, 0x0204,
+  0x0300, 0x0301,
+  0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406,
+  0x0500, 0x0501, 0x0502,
+  0x0700, 0x0701, 0x0702,
+  0x0B00, 0x0B01, 0x0B02, 0x0B03, 0x0B04, 0x0B05,
+  0x1000,
+  0xFC0F,
+};
+
+
+uint16_t fromClusterCode(uint8_t c) {
+  if (c >= sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0])) {
+    return 0xFFFF;
+  }
+  return pgm_read_word(&Z_ClusterNumber[c]);
+}
+
+
+uint8_t toClusterCode(uint16_t c) {
+  for (uint32_t i = 0; i < sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0]); i++) {
+    if (c == pgm_read_word(&Z_ClusterNumber[i])) {
+      return i;
+    }
+  }
+  return 0xFF;
+}
+
+class SBuffer hibernateDevice(const struct Z_Device &device) {
+  SBuffer buf(128);
+
+  buf.add8(0x00);
+  buf.add16(device.shortaddr);
+  buf.add64(device.longaddr);
+  uint32_t endpoints = device.endpoints.size();
+  if (endpoints > 254) { endpoints = 254; }
+  buf.add8(endpoints);
+
+  for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
+    uint32_t ep_profile = *ite;
+    uint8_t endpoint = (ep_profile >> 16) & 0xFF;
+    uint16_t profileId = ep_profile & 0xFFFF;
+
+    buf.add8(endpoint);
+    buf.add16(profileId);
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);
+
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);
+  }
+
+
+  size_t model_len = device.modelId.length();
+  if (model_len > 32) { model_len = 32; }
+  buf.addBuffer(device.modelId.c_str(), model_len);
+  buf.add8(0x00);
+
+
+  size_t manuf_len = device.manufacturerId.length();
+  if (manuf_len > 32) {manuf_len = 32; }
+  buf.addBuffer(device.manufacturerId.c_str(), manuf_len);
+  buf.add8(0x00);
+
+
+  size_t frname_len = device.friendlyName.length();
+  if (frname_len > 32) {frname_len = 32; }
+  buf.addBuffer(device.friendlyName.c_str(), frname_len);
+  buf.add8(0x00);
+
+
+  buf.set8(0, buf.len());
+
+  return buf;
+}
+
+class SBuffer hibernateDevices(void) {
+  SBuffer buf(2048);
+
+  size_t devices_size = zigbee_devices.devicesSize();
+  if (devices_size > 32) { devices_size = 32; }
+  buf.add8(devices_size);
+
+  for (uint32_t i = 0; i < devices_size; i++) {
+    const Z_Device & device = zigbee_devices.devicesAt(i);
+    const SBuffer buf_device = hibernateDevice(device);
+    buf.addBuffer(buf_device);
+  }
+
+  size_t buf_len = buf.len();
+  if (buf_len > 2040) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Devices list too big to fit in Flash (%d)"), buf_len);
+  }
+
+
+  char *hex_char = (char*) malloc((buf_len * 2) + 2);
+  if (hex_char) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZbFlashStore %s"),
+                                    ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
+    free(hex_char);
+  }
+
+  return buf;
+}
+
+void hidrateDevices(const SBuffer &buf) {
+  uint32_t buf_len = buf.len();
+  if (buf_len <= 10) { return; }
+
+  uint32_t k = 0;
+  uint32_t num_devices = buf.get8(k++);
+
+  for (uint32_t i = 0; (i < num_devices) && (k < buf_len); i++) {
+    uint32_t dev_record_len = buf.get8(k);
+
+    SBuffer buf_d = buf.subBuffer(k, dev_record_len);
+
+    uint32_t d = 1;
+    uint16_t shortaddr = buf_d.get16(d); d += 2;
+    uint64_t longaddr = buf_d.get64(d); d += 8;
+    zigbee_devices.updateDevice(shortaddr, longaddr);
+
+    uint32_t endpoints = buf_d.get8(d++);
+    for (uint32_t j = 0; j < endpoints; j++) {
+      uint8_t ep = buf_d.get8(d++);
+      uint16_t ep_profile = buf_d.get16(d); d += 2;
+      zigbee_devices.addEndointProfile(shortaddr, ep, ep_profile);
+
+
+      while (d < dev_record_len) {
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), false);
+      }
+
+      while (d < dev_record_len) {
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), true);
+      }
+    }
+
+
+    char empty[] = "";
+
+
+    uint32_t s_len = buf_d.strlen_s(d);
+    char *ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setModelId(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setManufId(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setFriendlyName(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    k += dev_record_len;
+  }
+}
+
+void loadZigbeeDevices(void) {
+  z_flashdata_t flashdata;
+  memcpy_P(&flashdata, z_dev_start, sizeof(z_flashdata_t));
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "Zigbee signature in Flash: %08X - %d"), flashdata.name, flashdata.len);
+
+
+  if ((flashdata.name == ZIGB_NAME) && (flashdata.len > 0)) {
+    uint16_t buf_len = flashdata.len;
+
+    SBuffer buf(buf_len);
+    buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
+    hidrateDevices(buf);
+    zigbee_devices.clean();
+  } else {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
+  }
+}
+
+void saveZigbeeDevices(void) {
+  SBuffer buf = hibernateDevices();
+  size_t buf_len = buf.len();
+  if (buf_len > Z_MAX_FLASH) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Buffer too big to fit in Flash (%d bytes)"), buf_len);
+    return;
+  }
+
+
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+  z_flashdata_t *flashdata = (z_flashdata_t*)(spi_buffer + z_block_offset);
+  flashdata->name = ZIGB_NAME;
+  flashdata->len = buf_len;
+  flashdata->reserved = 0;
+
+  memcpy(spi_buffer + z_block_offset + sizeof(z_flashdata_t), buf.getBuffer(), buf_len);
+
+
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
+}
+
+
+void eraseZigbeeDevices(void) {
+  zigbee_devices.clean();
+
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+
+  memset(spi_buffer + z_block_offset, 0xFF, z_block_len);
+
+
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (0x%08X - %d bytes)"), z_dev_start, z_block_len);
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+#ifdef USE_ZIGBEE
+
+
+
+
+
+typedef union ZCLHeaderFrameControl_t {
+  struct {
+    uint8_t frame_type : 2;
+    uint8_t manuf_specific : 1;
+    uint8_t direction : 1;
+    uint8_t disable_def_resp : 1;
+    uint8_t reserved : 3;
+  } b;
+  uint32_t d8;
+} ZCLHeaderFrameControl_t;
+
+
+class ZCLFrame {
+public:
+
+  ZCLFrame(uint8_t frame_control, uint16_t manuf_code, uint8_t transact_seq, uint8_t cmd_id,
+    const char *buf, size_t buf_len, uint16_t clusterid, uint16_t groupid,
+    uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+    uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+    uint32_t timestamp):
+    _cmd_id(cmd_id), _manuf_code(manuf_code), _transact_seq(transact_seq),
+    _payload(buf_len ? buf_len : 250),
+    _cluster_id(clusterid), _group_id(groupid),
+    _srcaddr(srcaddr), _srcendpoint(srcendpoint), _dstendpoint(dstendpoint), _wasbroadcast(wasbroadcast),
+    _linkquality(linkquality), _securityuse(securityuse), _seqnumber(seqnumber),
+    _timestamp(timestamp)
+    {
+      _frame_control.d8 = frame_control;
+      _payload.addBuffer(buf, buf_len);
+    };
+
+
+  void log(void) {
+    char hex_char[_payload.len()*2+2];
+  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
+    Response_P(PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
+                    "\"groupid\":%d," "\"clusterid\":%d," "\"srcaddr\":\"0x%04X\","
+                    "\"srcendpoint\":%d," "\"dstendpoint\":%d," "\"wasbroadcast\":%d,"
+                    "\"" D_CMND_ZIGBEE_LINKQUALITY "\":%d," "\"securityuse\":%d," "\"seqnumber\":%d,"
+                    "\"timestamp\":%d,"
+                    "\"fc\":\"0x%02X\",\"manuf\":\"0x%04X\",\"transact\":%d,"
+                    "\"cmdid\":\"0x%02X\",\"payload\":\"%s\"}}"),
+                    _group_id, _cluster_id, _srcaddr,
+                    _srcendpoint, _dstendpoint, _wasbroadcast,
+                    _linkquality, _securityuse, _seqnumber,
+                    _timestamp,
+                    _frame_control, _manuf_code, _transact_seq, _cmd_id,
+                    hex_char);
+    if (Settings.flag3.tuya_serial_mqtt_publish) {
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+      XdrvRulesProcess();
+    } else {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+    }
+  }
+
+  static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
+                                uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+                                uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+                                uint32_t timestamp) {
+    uint32_t i = offset;
+    ZCLHeaderFrameControl_t frame_control;
+    uint16_t manuf_code = 0;
+    uint8_t transact_seq;
+    uint8_t cmd_id;
+
+    frame_control.d8 = buf.get8(i++);
+    if (frame_control.b.manuf_specific) {
+      manuf_code = buf.get16(i);
+      i += 2;
+    }
+    transact_seq = buf.get8(i++);
+    cmd_id = buf.get8(i++);
+    ZCLFrame zcl_frame(frame_control.d8, manuf_code, transact_seq, cmd_id,
+                       (const char *)(buf.buf() + i), len + offset - i,
+                       clusterid, groupid,
+                       srcaddr, srcendpoint, dstendpoint, wasbroadcast,
+                       linkquality, securityuse, seqnumber,
+                       timestamp);
+    return zcl_frame;
+  }
+
+  bool isClusterSpecificCommand(void) {
+    return _frame_control.b.frame_type & 1;
+  }
+
+  static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
+  void parseRawAttributes(JsonObject& json, uint8_t offset = 0);
+  void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
+  void parseClusterSpecificCommand(JsonObject& json, uint8_t offset = 0);
+  void postProcessAttributes(uint16_t shortaddr, JsonObject& json);
+
+  inline void setGroupId(uint16_t groupid) {
+    _group_id = groupid;
+  }
+
+  inline void setClusterId(uint16_t clusterid) {
+    _cluster_id = clusterid;
+  }
+
+  inline uint8_t getCmdId(void) const {
+    return _cmd_id;
+  }
+
+  inline uint16_t getClusterId(void) const {
+    return _cluster_id;
+  }
+
+  inline uint16_t getSrcEndpoint(void) const {
+    return _srcendpoint;
+  }
+
+  const SBuffer &getPayload(void) const {
+    return _payload;
+  }
+
+  uint16_t getManufCode(void) const {
+    return _manuf_code;
+  }
+
+private:
+  ZCLHeaderFrameControl_t _frame_control = { .d8 = 0 };
+  uint16_t _manuf_code = 0;
+  uint8_t _transact_seq = 0;
+  uint8_t _cmd_id = 0;
+  uint16_t _cluster_id = 0;
+  uint16_t _group_id = 0;
+  SBuffer _payload;
+
+  uint16_t _srcaddr;
+  uint8_t _srcendpoint;
+  uint8_t _dstendpoint;
+  uint8_t _wasbroadcast;
+  uint8_t _linkquality;
+  uint8_t _securityuse;
+  uint8_t _seqnumber;
+  uint32_t _timestamp;
+};
+
+
+
+
+
+
+uint8_t toPercentageCR2032(uint32_t voltage) {
+  uint32_t percentage;
+  if (voltage < 2100) {
+      percentage = 0;
+  } else if (voltage < 2440) {
+      percentage = 6 - ((2440 - voltage) * 6) / 340;
+  } else if (voltage < 2740) {
+      percentage = 18 - ((2740 - voltage) * 12) / 300;
+  } else if (voltage < 2900) {
+      percentage = 42 - ((2900 - voltage) * 24) / 160;
+  } else if (voltage < 3000) {
+      percentage = 100 - ((3000 - voltage) * 58) / 100;
+  } else if (voltage >= 3000) {
+      percentage = 100;
+  }
+  return percentage;
+}
+
+
+uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
+                              uint32_t offset, uint32_t len) {
+
+  uint32_t i = offset;
+  uint32_t attrtype = buf.get8(i++);
+
+
+  json[attrid_str] = (char*) nullptr;
+
+
+  switch (attrtype) {
+    case 0x00:
+    case 0xFF:
+      break;
+    case 0x10:
+      {
+        uint8_t val_bool = buf.get8(i++);
+        if (0xFF != val_bool) {
+          json[attrid_str] = (bool) (val_bool ? true : false);
+        }
+      }
+      break;
+    case 0x20:
+      {
+        uint8_t uint8_val = buf.get8(i);
+        i += 1;
+        if (0xFF != uint8_val) {
+          json[attrid_str] = uint8_val;
+        }
+      }
+      break;
+    case 0x21:
+      {
+        uint16_t uint16_val = buf.get16(i);
+        i += 2;
+        if (0xFFFF != uint16_val) {
+          json[attrid_str] = uint16_val;
+        }
+      }
+      break;
+    case 0x23:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        i += 4;
+        if (0xFFFFFFFF != uint32_val) {
+          json[attrid_str] = uint32_val;
+        }
+      }
+      break;
+
+    case 0x24:
+    case 0x25:
+    case 0x26:
+    case 0x27:
+      {
+        uint8_t len = attrtype - 0x1F;
+
+        char hex[2*len+1];
+        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+        json[attrid_str] = hex;
+        i += len;
+      }
+      break;
+    case 0x28:
+      {
+        int8_t int8_val = buf.get8(i);
+        i += 1;
+        if (0x80 != int8_val) {
+          json[attrid_str] = int8_val;
+        }
+      }
+      break;
+    case 0x29:
+      {
+        int16_t int16_val = buf.get16(i);
+        i += 2;
+        if (0x8000 != int16_val) {
+          json[attrid_str] = int16_val;
+        }
+      }
+      break;
+    case 0x2B:
+      {
+        int32_t int32_val = buf.get32(i);
+        i += 4;
+        if (0x80000000 != int32_val) {
+          json[attrid_str] = int32_val;
+        }
+      }
+      break;
+
+    case 0x2C:
+    case 0x2D:
+    case 0x2E:
+    case 0x2F:
+      {
+        uint8_t len = attrtype - 0x27;
+
+        char hex[2*len+1];
+        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+        json[attrid_str] = hex;
+        i += len;
+      }
+      break;
+
+    case 0x41:
+    case 0x42:
+    case 0x43:
+    case 0x44:
+
+      {
+        bool parse_as_string = true;
+        uint32_t len = (attrtype <= 0x42) ? buf.get8(i) : buf.get16(i);
+        i += (attrtype <= 0x42) ? 1 : 2;
+        if (i + len > buf.len()) {
+          len = buf.len() - i;
+        }
+
+
+        if ((0x41 == attrtype) || (0x43 == attrtype)) { parse_as_string = false; }
+# 318 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+        if (parse_as_string) {
+          char str[len+1];
+          strncpy(str, buf.charptr(i), len);
+          str[len] = 0x00;
+          json[attrid_str] = str;
+        } else {
+
+          char hex[2*len+1];
+          ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+          json[attrid_str] = hex;
+        }
+
+        i += len;
+        break;
+      }
+      i += buf.get8(i) + 1;
+      break;
+
+    case 0x08:
+    case 0x18:
+      {
+        uint8_t uint8_val = buf.get8(i);
+        i += 1;
+        json[attrid_str] = uint8_val;
+      }
+      break;
+    case 0x09:
+    case 0x19:
+      {
+        uint16_t uint16_val = buf.get16(i);
+        i += 2;
+        json[attrid_str] = uint16_val;
+      }
+      break;
+    case 0x0B:
+    case 0x1B:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        i += 4;
+        json[attrid_str] = uint32_val;
+      }
+      break;
+
+    case 0x30:
+    case 0x31:
+      i += attrtype - 0x2F;
+      break;
+
+
+    case 0x39:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        float * float_val = (float*) &uint32_val;
+        i += 4;
+        json[attrid_str] = *float_val;
+      }
+      break;
+
+    case 0xE0:
+    case 0xE1:
+    case 0xE2:
+      i += 4;
+      break;
+
+    case 0xE8:
+    case 0xE9:
+      i += 2;
+      break;
+    case 0xEA:
+      i += 4;
+      break;
+
+    case 0xF0:
+      i += 8;
+      break;
+    case 0xF1:
+      i += 16;
+      break;
+
+
+    case 0x0A:
+    case 0x0C:
+    case 0x0D:
+    case 0x0E:
+    case 0x0F:
+      i += attrtype - 0x07;
+      break;
+
+    case 0x1A:
+    case 0x1C:
+    case 0x1D:
+    case 0x1E:
+    case 0x1F:
+      i += attrtype - 0x17;
+      break;
+
+    case 0x38:
+      i += 2;
+      break;
+    case 0x3A:
+      {
+        uint64_t uint64_val = buf.get64(i);
+        double * double_val = (double*) &uint64_val;
+        i += 8;
+        json[attrid_str] = *double_val;
+      }
+      break;
+  }
+
+
+
+
+
+
+  return i - offset;
+}
+
+
+void ZCLFrame::generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len) {
+  uint32_t suffix = 1;
+
+  snprintf_P(key, key_len, PSTR("%04X/%04X"), cluster, attr);
+  while (json.containsKey(key)) {
+    suffix++;
+    snprintf_P(key, key_len, PSTR("%04X/%04X+%d"), cluster, attr, suffix);
+  }
+}
+
+
+void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
+  uint32_t i = offset;
+  uint32_t len = _payload.len();
+
+  while (len >= i + 3) {
+    uint16_t attrid = _payload.get16(i);
+    i += 2;
+
+    char key[16];
+    generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
+
+
+    if ((0x0000 == _cluster_id) && (0xFF01 == attrid)) {
+      if (0x42 == _payload.get8(i)) {
+        _payload.set8(i, 0x41);
+      }
+    }
+    i += parseSingleAttribute(json, key, _payload, i, len);
+  }
+}
+
+
+void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
+  uint32_t i = offset;
+  uint32_t len = _payload.len();
+
+  while (len - i >= 4) {
+    uint16_t attrid = _payload.get16(i);
+    i += 2;
+    uint8_t status = _payload.get8(i++);
+
+    if (0 == status) {
+      char key[16];
+      generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
+
+      i += parseSingleAttribute(json, key, _payload, i, len);
+    }
+  }
+}
+
+
+
+
+void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
+  uint32_t i = offset;
+  uint32_t len = _payload.len();
+
+  char attrid_str[12];
+  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cluster_id, _cmd_id);
+
+  char hex_char[_payload.len()*2+2];
+  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
+
+  json[attrid_str] = hex_char;
+}
+
+
+
+
+typedef int32_t (*Z_AttrConverter)(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+typedef struct Z_AttributeConverter {
+  uint16_t cluster;
+  uint16_t attribute;
+  const char * name;
+  Z_AttrConverter func;
+} Z_AttributeConverter;
+
+
+const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
+  { 0x0000, 0x0000, "ZCLVersion", &Z_Copy },
+  { 0x0000, 0x0001, "AppVersion", &Z_Copy },
+  { 0x0000, 0x0002, "StackVersion", &Z_Copy },
+  { 0x0000, 0x0003, "HWVersion", &Z_Copy },
+  { 0x0000, 0x0004, "Manufacturer", &Z_ManufKeep },
+  { 0x0000, 0x0005, D_JSON_MODEL D_JSON_ID, &Z_ModelKeep },
+  { 0x0000, 0x0006, "DateCode", &Z_Copy },
+  { 0x0000, 0x0007, "PowerSource", &Z_Copy },
+  { 0x0000, 0x4000, "SWBuildID", &Z_Copy },
+  { 0x0000, 0xFFFF, nullptr, &Z_Remove },
+
+  { 0x0000, 0xFF01, nullptr, &Z_AqaraSensor },
+
+
+  { 0x0001, 0x0000, "MainsVoltage", &Z_Copy },
+  { 0x0001, 0x0001, "MainsFrequency", &Z_Copy },
+  { 0x0001, 0x0020, "BatteryVoltage", &Z_Copy },
+  { 0x0001, 0x0021, "BatteryPercentageRemaining",&Z_Copy },
+
+
+  { 0x0002, 0x0000, "CurrentTemperature", &Z_Copy },
+  { 0x0002, 0x0001, "MinTempExperienced", &Z_Copy },
+  { 0x0002, 0x0002, "MaxTempExperienced", &Z_Copy },
+  { 0x0002, 0x0003, "OverTempTotalDwell", &Z_Copy },
+
+
+  { 0x0006, 0x0000, "Power", &Z_Copy },
+  { 0x0006, 0x8000, "Power", &Z_Copy },
+
+
+  { 0x0007, 0x0000, "SwitchType", &Z_Copy },
+
+
+  { 0x0008, 0x0000, "Dimmer", &Z_Copy },
+# 558 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+  { 0x0009, 0x0000, "AlarmCount", &Z_Copy },
+
+  { 0x000A, 0x0000, "Time", &Z_Copy },
+  { 0x000A, 0x0001, "TimeStatus", &Z_Copy },
+  { 0x000A, 0x0002, "TimeZone", &Z_Copy },
+  { 0x000A, 0x0003, "DstStart", &Z_Copy },
+  { 0x000A, 0x0004, "DstStart", &Z_Copy },
+  { 0x000A, 0x0005, "DstShift", &Z_Copy },
+  { 0x000A, 0x0006, "StandardTime", &Z_Copy },
+  { 0x000A, 0x0007, "LocalTime", &Z_Copy },
+  { 0x000A, 0x0008, "LastSetTime", &Z_Copy },
+  { 0x000A, 0x0009, "ValidUntilTime", &Z_Copy },
+
+  { 0x000B, 0x0000, "LocationType", &Z_Copy },
+  { 0x000B, 0x0000, "LocationMethod", &Z_Copy },
+  { 0x000B, 0x0000, "LocationAge", &Z_Copy },
+  { 0x000B, 0x0000, "QualityMeasure", &Z_Copy },
+  { 0x000B, 0x0000, "NumberOfDevices", &Z_Copy },
+
+  { 0x000C, 0x0004, "ActiveText", &Z_Copy },
+  { 0x000C, 0x001C, "Description", &Z_Copy },
+  { 0x000C, 0x002E, "InactiveText", &Z_Copy },
+  { 0x000C, 0x0041, "MaxPresentValue", &Z_Copy },
+  { 0x000C, 0x0045, "MinPresentValue", &Z_Copy },
+  { 0x000C, 0x0051, "OutOfService", &Z_Copy },
+  { 0x000C, 0x0055, "AqaraRotate", &Z_Copy },
+  { 0x000C, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x000C, 0x0067, "Reliability", &Z_Copy },
+  { 0x000C, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x000C, 0x006A, "Resolution", &Z_Copy },
+  { 0x000C, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x000C, 0x0075, "EngineeringUnits", &Z_Copy },
+  { 0x000C, 0x0100, "ApplicationType", &Z_Copy },
+  { 0x000C, 0xFF05, "Aqara_FF05", &Z_Copy },
+
+  { 0x0010, 0x0004, "ActiveText", &Z_Copy },
+  { 0x0010, 0x001C, "Description", &Z_Copy },
+  { 0x0010, 0x002E, "InactiveText", &Z_Copy },
+  { 0x0010, 0x0042, "MinimumOffTime", &Z_Copy },
+  { 0x0010, 0x0043, "MinimumOnTime", &Z_Copy },
+  { 0x0010, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0010, 0x0054, "Polarity", &Z_Copy },
+  { 0x0010, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0010, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0010, 0x0067, "Reliability", &Z_Copy },
+  { 0x0010, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0010, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0010, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0011, 0x0004, "ActiveText", &Z_Copy },
+  { 0x0011, 0x001C, "Description", &Z_Copy },
+  { 0x0011, 0x002E, "InactiveText", &Z_Copy },
+  { 0x0011, 0x0042, "MinimumOffTime", &Z_Copy },
+  { 0x0011, 0x0043, "MinimumOnTime", &Z_Copy },
+  { 0x0011, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0011, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0011, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0011, 0x0067, "Reliability", &Z_Copy },
+  { 0x0011, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0011, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0011, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0012, 0x000E, "StateText", &Z_Copy },
+  { 0x0012, 0x001C, "Description", &Z_Copy },
+  { 0x0012, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0012, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0012, 0x0055, "PresentValue", &Z_AqaraCube },
+  { 0x0012, 0x0067, "Reliability", &Z_Copy },
+  { 0x0012, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0012, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0013, 0x000E, "StateText", &Z_Copy },
+  { 0x0013, 0x001C, "Description", &Z_Copy },
+  { 0x0013, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0013, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0013, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0013, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0013, 0x0067, "Reliability", &Z_Copy },
+  { 0x0013, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0013, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0013, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0014, 0x000E, "StateText", &Z_Copy },
+  { 0x0014, 0x001C, "Description", &Z_Copy },
+  { 0x0014, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0014, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0014, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0014, 0x0067, "Reliability", &Z_Copy },
+  { 0x0014, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0014, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0014, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x001A, 0x0000, "TotalProfileNum", &Z_Copy },
+  { 0x001A, 0x0001, "MultipleScheduling", &Z_Copy },
+  { 0x001A, 0x0002, "EnergyFormatting", &Z_Copy },
+  { 0x001A, 0x0003, "EnergyRemote", &Z_Copy },
+  { 0x001A, 0x0004, "ScheduleMode", &Z_Copy },
+
+  { 0x0020, 0x0000, "CheckinInterval", &Z_Copy },
+  { 0x0020, 0x0001, "LongPollInterval", &Z_Copy },
+  { 0x0020, 0x0002, "ShortPollInterval", &Z_Copy },
+  { 0x0020, 0x0003, "FastPollTimeout", &Z_Copy },
+  { 0x0020, 0x0004, "CheckinIntervalMin", &Z_Copy },
+  { 0x0020, 0x0005, "LongPollIntervalMin", &Z_Copy },
+  { 0x0020, 0x0006, "FastPollTimeoutMax", &Z_Copy },
+
+  { 0x0100, 0x0000, "PhysicalClosedLimit", &Z_Copy },
+  { 0x0100, 0x0001, "MotorStepSize", &Z_Copy },
+  { 0x0100, 0x0002, "Status", &Z_Copy },
+  { 0x0100, 0x0010, "ClosedLimit", &Z_Copy },
+  { 0x0100, 0x0011, "Mode", &Z_Copy },
+
+  { 0x0101, 0x0000, "LockState", &Z_Copy },
+  { 0x0101, 0x0001, "LockType", &Z_Copy },
+  { 0x0101, 0x0002, "ActuatorEnabled", &Z_Copy },
+  { 0x0101, 0x0003, "DoorState", &Z_Copy },
+  { 0x0101, 0x0004, "DoorOpenEvents", &Z_Copy },
+  { 0x0101, 0x0005, "DoorClosedEvents", &Z_Copy },
+  { 0x0101, 0x0006, "OpenPeriod", &Z_Copy },
+
+  { 0x0101, 0x0055, "AqaraVibrationMode", &Z_AqaraVibration },
+  { 0x0101, 0x0503, "AqaraVibrationsOrAngle", &Z_Copy },
+  { 0x0101, 0x0505, "AqaraVibration505", &Z_Copy },
+  { 0x0101, 0x0508, "AqaraAccelerometer", &Z_AqaraVibration },
+
+  { 0x0102, 0x0000, "WindowCoveringType", &Z_Copy },
+  { 0x0102, 0x0001, "PhysicalClosedLimitLift",&Z_Copy },
+  { 0x0102, 0x0002, "PhysicalClosedLimitTilt",&Z_Copy },
+  { 0x0102, 0x0003, "CurrentPositionLift", &Z_Copy },
+  { 0x0102, 0x0004, "CurrentPositionTilt", &Z_Copy },
+  { 0x0102, 0x0005, "NumberofActuationsLift",&Z_Copy },
+  { 0x0102, 0x0006, "NumberofActuationsTilt",&Z_Copy },
+  { 0x0102, 0x0007, "ConfigStatus", &Z_Copy },
+  { 0x0102, 0x0008, "CurrentPositionLiftPercentage",&Z_Copy },
+  { 0x0102, 0x0009, "CurrentPositionTiltPercentage",&Z_Copy },
+  { 0x0102, 0x0010, "InstalledOpenLimitLift",&Z_Copy },
+  { 0x0102, 0x0011, "InstalledClosedLimitLift",&Z_Copy },
+  { 0x0102, 0x0012, "InstalledOpenLimitTilt", &Z_Copy },
+  { 0x0102, 0x0013, "InstalledClosedLimitTilt", &Z_Copy },
+  { 0x0102, 0x0014, "VelocityLift",&Z_Copy },
+  { 0x0102, 0x0015, "AccelerationTimeLift",&Z_Copy },
+  { 0x0102, 0x0016, "DecelerationTimeLift", &Z_Copy },
+  { 0x0102, 0x0017, "Mode",&Z_Copy },
+  { 0x0102, 0x0018, "IntermediateSetpointsLift",&Z_Copy },
+  { 0x0102, 0x0019, "IntermediateSetpointsTilt",&Z_Copy },
+
+
+  { 0x0300, 0x0000, "Hue", &Z_Copy },
+  { 0x0300, 0x0001, "Sat", &Z_Copy },
+  { 0x0300, 0x0002, "RemainingTime", &Z_Copy },
+  { 0x0300, 0x0003, "X", &Z_Copy },
+  { 0x0300, 0x0004, "Y", &Z_Copy },
+  { 0x0300, 0x0005, "DriftCompensation", &Z_Copy },
+  { 0x0300, 0x0006, "CompensationText", &Z_Copy },
+  { 0x0300, 0x0007, "CT", &Z_Copy },
+  { 0x0300, 0x0008, "ColorMode", &Z_Copy },
+  { 0x0300, 0x0010, "NumberOfPrimaries", &Z_Copy },
+  { 0x0300, 0x0011, "Primary1X", &Z_Copy },
+  { 0x0300, 0x0012, "Primary1Y", &Z_Copy },
+  { 0x0300, 0x0013, "Primary1Intensity", &Z_Copy },
+  { 0x0300, 0x0015, "Primary2X", &Z_Copy },
+  { 0x0300, 0x0016, "Primary2Y", &Z_Copy },
+  { 0x0300, 0x0017, "Primary2Intensity", &Z_Copy },
+  { 0x0300, 0x0019, "Primary3X", &Z_Copy },
+  { 0x0300, 0x001A, "Primary3Y", &Z_Copy },
+  { 0x0300, 0x001B, "Primary3Intensity", &Z_Copy },
+  { 0x0300, 0x0030, "WhitePointX", &Z_Copy },
+  { 0x0300, 0x0031, "WhitePointY", &Z_Copy },
+  { 0x0300, 0x0032, "ColorPointRX", &Z_Copy },
+  { 0x0300, 0x0033, "ColorPointRY", &Z_Copy },
+  { 0x0300, 0x0034, "ColorPointRIntensity", &Z_Copy },
+  { 0x0300, 0x0036, "ColorPointGX", &Z_Copy },
+  { 0x0300, 0x0037, "ColorPointGY", &Z_Copy },
+  { 0x0300, 0x0038, "ColorPointGIntensity", &Z_Copy },
+  { 0x0300, 0x003A, "ColorPointBX", &Z_Copy },
+  { 0x0300, 0x003B, "ColorPointBY", &Z_Copy },
+  { 0x0300, 0x003C, "ColorPointBIntensity", &Z_Copy },
+
+
+  { 0x0400, 0x0000, D_JSON_ILLUMINANCE, &Z_Copy },
+  { 0x0400, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0400, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0400, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0400, 0x0004, "LightSensorType", &Z_Copy },
+  { 0x0400, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0401, 0x0000, "LevelStatus", &Z_Copy },
+  { 0x0401, 0x0001, "LightSensorType", &Z_Copy },
+  { 0x0401, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0402, 0x0000, D_JSON_TEMPERATURE, &Z_FloatDiv100 },
+  { 0x0402, 0x0001, "MinMeasuredValue", &Z_FloatDiv100 },
+  { 0x0402, 0x0002, "MaxMeasuredValue", &Z_FloatDiv100 },
+  { 0x0402, 0x0003, "Tolerance", &Z_FloatDiv100 },
+  { 0x0402, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0403, 0x0000, D_JSON_PRESSURE_UNIT, &Z_AddPressureUnit },
+  { 0x0403, 0x0000, D_JSON_PRESSURE, &Z_Copy },
+  { 0x0403, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0403, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0403, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0403, 0x0010, "ScaledValue", &Z_Copy },
+  { 0x0403, 0x0011, "MinScaledValue", &Z_Copy },
+  { 0x0403, 0x0012, "MaxScaledValue", &Z_Copy },
+  { 0x0403, 0x0013, "ScaledTolerance", &Z_Copy },
+  { 0x0403, 0x0014, "Scale", &Z_Copy },
+  { 0x0403, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0404, 0x0000, D_JSON_FLOWRATE, &Z_FloatDiv10 },
+  { 0x0404, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0404, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0404, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0404, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0405, 0x0000, D_JSON_HUMIDITY, &Z_FloatDiv100 },
+  { 0x0405, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0405, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0405, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0405, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0406, 0x0000, OCCUPANCY, &Z_Copy },
+  { 0x0406, 0x0001, "OccupancySensorType", &Z_Copy },
+  { 0x0406, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0B01, 0x0000, "CompanyName", &Z_Copy },
+  { 0x0B01, 0x0001, "MeterTypeID", &Z_Copy },
+  { 0x0B01, 0x0004, "DataQualityID", &Z_Copy },
+  { 0x0B01, 0x0005, "CustomerName", &Z_Copy },
+  { 0x0B01, 0x0006, "Model", &Z_Copy },
+  { 0x0B01, 0x0007, "PartNumber", &Z_Copy },
+  { 0x0B01, 0x000A, "SoftwareRevision", &Z_Copy },
+  { 0x0B01, 0x000C, "POD", &Z_Copy },
+  { 0x0B01, 0x000D, "AvailablePower", &Z_Copy },
+  { 0x0B01, 0x000E, "PowerThreshold", &Z_Copy },
+
+
+  { 0x0B05, 0x0000, "NumberOfResets", &Z_Copy },
+  { 0x0B05, 0x0001, "PersistentMemoryWrites",&Z_Copy },
+  { 0x0B05, 0x011C, "LastMessageLQI", &Z_Copy },
+  { 0x0B05, 0x011D, "LastMessageRSSI", &Z_Copy },
+
+};
+
+
+
+int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  zigbee_devices.setManufId(shortaddr, value.as<const char*>());
+  return 1;
+}
+
+int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  zigbee_devices.setModelId(shortaddr, value.as<const char*>());
+  return 1;
+}
+
+
+
+int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  return 1;
+}
+
+
+int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  return 1;
+}
+
+
+int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = F(D_UNIT_PRESSURE);
+  return 0;
+}
+
+
+int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = ((float)value) / 100.0f;
+  return 1;
+}
+
+int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = ((float)value) / 10.0f;
+  return 1;
+}
+
+
+int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+  json[F(OCCUPANCY)] = 0;
+  zigbee_devices.jsonPublishNow(shortaddr, json);
+}
+
+
+int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  int32_t val = value;
+  const __FlashStringHelper *aqara_cube = F("AqaraCube");
+  const __FlashStringHelper *aqara_cube_side = F("AqaraCubeSide");
+  const __FlashStringHelper *aqara_cube_from_side = F("AqaraCubeFromSide");
+
+  switch (val) {
+    case 0:
+      json[aqara_cube] = F("shake");
+      break;
+    case 2:
+      json[aqara_cube] = F("wakeup");
+      break;
+    case 3:
+      json[aqara_cube] = F("fall");
+      break;
+    case 64 ... 127:
+      json[aqara_cube] = F("flip90");
+      json[aqara_cube_side] = val % 8;
+      json[aqara_cube_from_side] = (val - 64) / 8;
+      break;
+    case 128 ... 132:
+      json[aqara_cube] = F("flip180");
+      json[aqara_cube_side] = val - 128;
+      break;
+    case 256 ... 261:
+      json[aqara_cube] = F("slide");
+      json[aqara_cube_side] = val - 256;
+      break;
+    case 512 ... 517:
+      json[aqara_cube] = F("tap");
+      json[aqara_cube_side] = val - 512;
+      break;
+  }
+# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+  return 1;
+}
+
+
+int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+
+  switch (attr) {
+    case 0x0055:
+      {
+        int32_t ivalue = value;
+        const __FlashStringHelper * svalue;
+        switch (ivalue) {
+          case 1: svalue = F("vibrate"); break;
+          case 2: svalue = F("tilt"); break;
+          case 3: svalue = F("drop"); break;
+          default: svalue = F("unknown"); break;
+        }
+        json[new_name] = svalue;
+      }
+      break;
+
+
+
+
+    case 0x0508:
+      {
+
+
+        String hex = value;
+        SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+        int16_t x, y, z;
+        z = buf2.get16(0);
+        y = buf2.get16(2);
+        x = buf2.get16(4);
+        JsonArray& xyz = json.createNestedArray(new_name);
+        xyz.add(x);
+        xyz.add(y);
+        xyz.add(z);
+
+        float X = x;
+        float Y = y;
+        float Z = z;
+        int32_t Angle_X = 0.5f + atanf(X/sqrtf(z*z+y*y)) * f_180pi;
+        int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(x*x+z*z)) * f_180pi;
+        int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(x*x+y*y)) * f_180pi;
+
+
+
+        JsonArray& angles = json.createNestedArray(F("AqaraAngles"));
+        angles.add(Angle_X);
+        angles.add(Angle_Y);
+        angles.add(Angle_Z);
+      }
+      break;
+  }
+  return 1;
+}
+
+int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  String hex = value;
+  SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+  uint32_t i = 0;
+  uint32_t len = buf2.len();
+  char tmp[] = "tmp";
+
+  JsonVariant sub_value;
+
+  while (len - i >= 2) {
+    uint8_t attrid = buf2.get8(i++);
+
+    i += parseSingleAttribute(json, tmp, buf2, i, len);
+    float val = json[tmp];
+    json.remove(tmp);
+    if (0x01 == attrid) {
+      json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
+      json[F("Battery")] = toPercentageCR2032(val);
+    } else if (0 == zcl->getManufCode()) {
+
+      if (0x64 == attrid) {
+        json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
+      } else if (0x65 == attrid) {
+        json[F(D_JSON_HUMIDITY)] = val / 100.0f;
+      } else if (0x66 == attrid) {
+        json[F(D_JSON_PRESSURE)] = val / 100.0f;
+        json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);
+      } else if (0x01 == attrid) {
+        json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
+        json[F("Battery")] = toPercentageCR2032(val);
+      }
+    } else if (0x115F == zcl->getManufCode()) {
+
+      json[F("AqaraUnknown")] = val;
+    }
+  }
+  return 1;
+}
+
+
+void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
+
+  for (auto kv : json) {
+    String key_string = kv.key;
+    const char * key = key_string.c_str();
+    JsonVariant& value = kv.value;
+
+    char * delimiter = strchr(key, '/');
+    char * delimiter2 = strchr(key, '+');
+    if (delimiter) {
+      uint16_t attribute;
+      uint16_t suffix = 1;
+      uint16_t cluster = strtoul(key, &delimiter, 16);
+      if (!delimiter2) {
+        attribute = strtoul(delimiter+1, nullptr, 16);
+      } else {
+        attribute = strtoul(delimiter+1, &delimiter2, 16);
+        suffix = strtoul(delimiter2+1, nullptr, 10);
+      }
+
+
+      for (uint32_t i = 0; i < sizeof(Z_PostProcess) / sizeof(Z_PostProcess[0]); i++) {
+        const Z_AttributeConverter *converter = &Z_PostProcess[i];
+        uint16_t conv_cluster = pgm_read_word(&converter->cluster);
+        uint16_t conv_attribute = pgm_read_word(&converter->attribute);
+
+        if ((conv_cluster == cluster) &&
+            ((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) {
+          String new_name_str = converter->name;
+          if (suffix > 1) { new_name_str += suffix; }
+          int32_t drop = (*converter->func)(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute);
+          if (drop) {
+            json.remove(key);
+          }
+
+        }
+      }
+    }
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
+#ifdef USE_ZIGBEE
+
+
+typedef struct Z_CommandConverter {
+  const char * tasmota_cmd;
+  const char * zcl_cmd;
+} Z_CommandConverter;
+
+
+const Z_CommandConverter Z_Commands[] = {
+  { "Power", "0006!xx" },
+  { "Dimmer", "0008!04/xx0A00" },
+  { "Dimmer+", "0008!06/001902" },
+  { "Dimmer-", "0008!06/011902" },
+  { "DimmerStop", "0008!03" },
+  { "ResetAlarm", "0009!00/xxyyyy" },
+  { "ResetAllAlarms","0009!01" },
+  { "Hue", "0300!00/xx000A00" },
+  { "Sat", "0300!03/xx0A00" },
+  { "HueSat", "0300!06/xxyy0A00" },
+  { "Color", "0300!07/xxxxyyyy0A00" },
+  { "CT", "0300!0A/xxxx0A00" },
+  { "Shutter", "0102!xx" },
+  { "ShutterOpen", "0102!00" },
+  { "ShutterClose", "0102!01" },
+  { "ShutterStop", "0102!02" },
+  { "ShutterLift", "0102!05xx" },
+  { "ShutterTilt", "0102!08xx" },
+};
+
+#define ZLE(x) ((x) & 0xFF), ((x) >> 8)
+
+
+const uint8_t CLUSTER_0006[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };
+
+int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  size_t attrs_len = 0;
+  const uint8_t* attrs = nullptr;
+
+  switch (cluster) {
+    case 0x0006:
+      attrs = CLUSTER_0006;
+      attrs_len = sizeof(CLUSTER_0006);
+      break;
+    case 0x0008:
+      attrs = CLUSTER_0008;
+      attrs_len = sizeof(CLUSTER_0008);
+      break;
+    case 0x0009:
+      attrs = CLUSTER_0009;
+      attrs_len = sizeof(CLUSTER_0009);
+      break;
+    case 0x0300:
+      attrs = CLUSTER_0300;
+      attrs_len = sizeof(CLUSTER_0300);
+      break;
+  }
+  if (attrs) {
+    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false );
+  }
+}
+
+
+
+void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
+  uint32_t wait_ms = 0;
+
+  switch (cluster) {
+    case 0x0006:
+    case 0x0009:
+      wait_ms = 200;
+      break;
+    case 0x0008:
+    case 0x0300:
+      wait_ms = 1050;
+      break;
+    case 0x0102:
+      wait_ms = 10000;
+      break;
+  }
+  if (wait_ms) {
+    zigbee_devices.setTimer(shortaddr, wait_ms, cluster, endpoint, 0 , &Z_ReadAttrCallback);
+  }
+}
+
+const __FlashStringHelper* zigbeeFindCommand(const char *command) {
+  char parm_uc[16];
+  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
+    const Z_CommandConverter *conv = &Z_Commands[i];
+    if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
+      return (const __FlashStringHelper*) conv->zcl_cmd;
+    }
+  }
+
+  return nullptr;
+}
+
+inline bool isXYZ(char c) {
+  return (c >= 'x') && (c <= 'z');
+}
+
+
+inline char hexDigit(uint32_t h) {
+  uint32_t nybble = h & 0x0F;
+  return (nybble > 9) ? 'A' - 10 + nybble : '0' + nybble;
+}
+
+
+String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z) {
+  size_t len = strlen_P(zcl_cmd_P);
+  char zcl_cmd[len+1];
+  strcpy_P(zcl_cmd, zcl_cmd_P);
+
+  char *p = zcl_cmd;
+  while (*p) {
+    if (isXYZ(*p) && (*p == *(p+1))) {
+      uint8_t val;
+      switch (*p) {
+        case 'x':
+          val = x & 0xFF;
+          x = x >> 8;
+          break;
+        case 'y':
+          val = y & 0xFF;
+          y = y >> 8;
+          break;
+        case 'z':
+          val = z & 0xFF;
+          z = z >> 8;
+          break;
+      }
+      *p = hexDigit(val >> 4);
+      *(p+1) = hexDigit(val);
+      p++;
+    }
+    p++;
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SendZCLCommand_P: zcl_cmd = %s"), zcl_cmd);
+
+  return String(zcl_cmd);
+}
+
+const char kZ_Alias[] PROGMEM = "OFF|" D_OFF "|" D_FALSE "|" D_STOP "|" "OPEN" "|"
+                                "ON|" D_ON "|" D_TRUE "|" D_START "|" "CLOSE" "|"
+                                "TOGGLE|" D_TOGGLE "|"
+                                "ALL" ;
+
+const uint8_t kZ_Numbers[] PROGMEM = { 0,0,0,0,0,
+                                       1,1,1,1,1,
+                                       2,2,
+                                       255 };
+
+
+uint32_t ZigbeeAliasOrNumber(const char *state_text) {
+  char command[16];
+  int state_number = GetCommandCode(command, sizeof(command), state_text, kZ_Alias);
+  if (state_number >= 0) {
+
+    return pgm_read_byte(kZ_Numbers + state_number);
+  } else {
+
+    return strtoul(state_text, nullptr, 0);
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+#ifdef USE_ZIGBEE
+
+
+
+const uint8_t ZIGBEE_STATUS_OK = 0;
+const uint8_t ZIGBEE_STATUS_BOOT = 1;
+const uint8_t ZIGBEE_STATUS_RESET_CONF = 2;
+const uint8_t ZIGBEE_STATUS_STARTING = 3;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_CLOSE = 20;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_60 = 21;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_XX = 22;
+const uint8_t ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;
+const uint8_t ZIGBEE_STATUS_NODE_DESC = 31;
+const uint8_t ZIGBEE_STATUS_ACTIVE_EP = 32;
+const uint8_t ZIGBEE_STATUS_SIMPLE_DESC = 33;
+const uint8_t ZIGBEE_STATUS_DEVICE_INDICATION = 34;
+const uint8_t ZIGBEE_STATUS_CC_VERSION = 50;
+const uint8_t ZIGBEE_STATUS_CC_INFO = 51;
+const uint8_t ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;
+const uint8_t ZIGBEE_STATUS_ABORT = 99;
+
+typedef int32_t (*ZB_Func)(uint8_t value);
+typedef int32_t (*ZB_RecvMsgFunc)(int32_t res, const class SBuffer &buf);
+
+typedef union Zigbee_Instruction {
+  struct {
+    uint8_t i;
+    uint8_t d8;
+    uint16_t d16;
+  } i;
+  const void *p;
+
+
+
+} Zigbee_Instruction;
+
+
+
+
+typedef struct Zigbee_Instruction_Type {
+  uint8_t instr;
+  uint8_t data;
+} Zigbee_Instruction_Type;
+
+enum Zigbee_StateMachine_Instruction_Set {
+
+  ZGB_INSTR_4_BYTES = 0,
+  ZGB_INSTR_NOOP = 0,
+  ZGB_INSTR_LABEL,
+  ZGB_INSTR_GOTO,
+  ZGB_INSTR_ON_ERROR_GOTO,
+  ZGB_INSTR_ON_TIMEOUT_GOTO,
+  ZGB_INSTR_WAIT,
+  ZGB_INSTR_WAIT_FOREVER,
+  ZGB_INSTR_STOP,
+
+
+  ZGB_INSTR_8_BYTES = 0x80,
+  ZGB_INSTR_CALL = 0x80,
+  ZGB_INSTR_LOG,
+  ZGB_INSTR_MQTT_STATE,
+  ZGB_INSTR_SEND,
+  ZGB_INSTR_WAIT_UNTIL,
+  ZGB_INSTR_WAIT_RECV,
+  ZGB_ON_RECV_UNEXPECTED,
+
+
+  ZGB_INSTR_12_BYTES = 0xF0,
+  ZGB_INSTR_WAIT_RECV_CALL,
+};
+
+#define ZI_NOOP() { .i = { ZGB_INSTR_NOOP, 0x00, 0x0000} },
+#define ZI_LABEL(x) { .i = { ZGB_INSTR_LABEL, (x), 0x0000} },
+#define ZI_GOTO(x) { .i = { ZGB_INSTR_GOTO, (x), 0x0000} },
+#define ZI_ON_ERROR_GOTO(x) { .i = { ZGB_INSTR_ON_ERROR_GOTO, (x), 0x0000} },
+#define ZI_ON_TIMEOUT_GOTO(x) { .i = { ZGB_INSTR_ON_TIMEOUT_GOTO, (x), 0x0000} },
+#define ZI_WAIT(x) { .i = { ZGB_INSTR_WAIT, 0x00, (x)} },
+#define ZI_WAIT_FOREVER() { .i = { ZGB_INSTR_WAIT_FOREVER, 0x00, 0x0000} },
+#define ZI_STOP(x) { .i = { ZGB_INSTR_STOP, (x), 0x0000} },
+
+#define ZI_CALL(f,x) { .i = { ZGB_INSTR_CALL, (x), 0x0000} }, { .p = (const void*)(f) },
+#define ZI_LOG(x,m) { .i = { ZGB_INSTR_LOG, (x), 0x0000 } }, { .p = ((const void*)(m)) },
+#define ZI_MQTT_STATE(x,m) { .i = { ZGB_INSTR_MQTT_STATE, (x), 0x0000 } }, { .p = ((const void*)(m)) },
+#define ZI_ON_RECV_UNEXPECTED(f) { .i = { ZGB_ON_RECV_UNEXPECTED, 0x00, 0x0000} }, { .p = (const void*)(f) },
+#define ZI_SEND(m) { .i = { ZGB_INSTR_SEND, sizeof(m), 0x0000} }, { .p = (const void*)(m) },
+#define ZI_WAIT_RECV(x,m) { .i = { ZGB_INSTR_WAIT_RECV, sizeof(m), (x)} }, { .p = (const void*)(m) },
+#define ZI_WAIT_UNTIL(x,m) { .i = { ZGB_INSTR_WAIT_UNTIL, sizeof(m), (x)} }, { .p = (const void*)(m) },
+#define ZI_WAIT_RECV_FUNC(x,m,f) { .i = { ZGB_INSTR_WAIT_RECV_CALL, sizeof(m), (x)} }, { .p = (const void*)(m) }, { .p = (const void*)(f) },
+
+
+const uint8_t ZIGBEE_LABEL_START = 10;
+const uint8_t ZIGBEE_LABEL_READY = 20;
+const uint8_t ZIGBEE_LABEL_MAIN_LOOP = 21;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_CLOSE = 30;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60 = 31;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX = 32;
+
+const uint8_t ZIGBEE_LABEL_ABORT = 99;
+const uint8_t ZIGBEE_LABEL_UNSUPPORTED_VERSION = 98;
+
+struct ZigbeeStatus {
+  bool active = true;
+  bool state_machine = false;
+  bool state_waiting = false;
+  bool state_no_timeout = false;
+  bool ready = false;
+  uint8_t on_error_goto = ZIGBEE_LABEL_ABORT;
+  uint8_t on_timeout_goto = ZIGBEE_LABEL_ABORT;
+  int16_t pc = 0;
+  uint32_t next_timeout = 0;
+
+  uint8_t *recv_filter = nullptr;
+  bool recv_until = false;
+  size_t recv_filter_len = 0;
+  ZB_RecvMsgFunc recv_func = nullptr;
+  ZB_RecvMsgFunc recv_unexpected = nullptr;
+
+  bool init_phase = true;
+};
+struct ZigbeeStatus zigbee;
+
+SBuffer *zigbee_buffer = nullptr;
+
+
+
+
+
+#define Z_B0(a) (uint8_t)( ((a) ) & 0xFF )
+#define Z_B1(a) (uint8_t)( ((a) >> 8) & 0xFF )
+#define Z_B2(a) (uint8_t)( ((a) >> 16) & 0xFF )
+#define Z_B3(a) (uint8_t)( ((a) >> 24) & 0xFF )
+#define Z_B4(a) (uint8_t)( ((a) >> 32) & 0xFF )
+#define Z_B5(a) (uint8_t)( ((a) >> 40) & 0xFF )
+#define Z_B6(a) (uint8_t)( ((a) >> 48) & 0xFF )
+#define Z_B7(a) (uint8_t)( ((a) >> 56) & 0xFF )
+
+#define ZBM(n,x...) const uint8_t n[] PROGMEM = { x };
+
+#define USE_ZIGBEE_CHANNEL_MASK (1 << (USE_ZIGBEE_CHANNEL))
+
+
+
+ZBM(ZBS_RESET, Z_AREQ | Z_SYS, SYS_RESET, 0x00 )
+ZBM(ZBR_RESET, Z_AREQ | Z_SYS, SYS_RESET_IND )
+
+ZBM(ZBS_VERSION, Z_SREQ | Z_SYS, SYS_VERSION )
+ZBM(ZBR_VERSION, Z_SRSP | Z_SYS, SYS_VERSION )
+
+
+ZBM(ZBS_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_READ, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8, 0x00 )
+ZBM(ZBR_ZNPHC, Z_SRSP | Z_SYS, SYS_OSAL_NV_READ, Z_Success, 0x01 , 0x55)
+
+
+ZBM(ZBS_PAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PANID )
+ZBM(ZBR_PAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PANID, 0x02 ,
+              Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
+
+ZBM(ZBS_EXTPAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_EXTENDED_PAN_ID )
+ZBM(ZBR_EXTPAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_EXTENDED_PAN_ID,
+                0x08 ,
+                Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
+                Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID),
+                )
+
+ZBM(ZBS_CHANN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_CHANLIST )
+ZBM(ZBR_CHANN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_CHANLIST,
+               0x04 ,
+               Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
+               )
+
+ZBM(ZBS_PFGK, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEY )
+ZBM(ZBR_PFGK, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEY,
+              0x10 ,
+              Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
+              Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
+              Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
+              Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
+
+                                                               )
+
+ZBM(ZBS_PFGKEN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEYS_ENABLE )
+ZBM(ZBR_PFGKEN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEYS_ENABLE,
+                0x01 , 0x00 )
+
+
+
+ZBM(ZBR_W_OK, Z_SRSP | Z_SAPI, SAPI_WRITE_CONFIGURATION, Z_Success )
+ZBM(ZBR_WNV_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_WRITE, Z_Success )
+
+
+ZBM(ZBS_FACTRES, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x02 )
+
+ZBM(ZBS_W_PAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PANID, 0x02 , Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
+
+ZBM(ZBS_W_EXTPAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_EXTENDED_PAN_ID, 0x08 ,
+                  Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
+                  Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID)
+                  )
+
+ZBM(ZBS_W_CHANN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_CHANLIST, 0x04 ,
+                Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
+                                           )
+
+ZBM(ZBS_W_LOGTYP, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_LOGICAL_TYPE, 0x01 , 0x00 )
+
+ZBM(ZBS_W_PFGK, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEY,
+                0x10 ,
+                Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
+                Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
+                Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
+                Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
+
+                                                                 )
+
+ZBM(ZBS_W_PFGKEN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEYS_ENABLE, 0x01 , 0x00 )
+
+ZBM(ZBS_WNV_SECMODE, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(CONF_TCLK_TABLE_START), Z_B1(CONF_TCLK_TABLE_START),
+                      0x00 , 0x20 ,
+                      0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                      0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c,
+                      0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39,
+                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+
+ZBM(ZBS_W_ZDODCB, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_ZDO_DIRECT_CB, 0x01 , 0x01 )
+
+ZBM(ZBS_WNV_INITZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_ITEM_INIT, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8,
+                       0x01, 0x00 , 0x01 , 0x00 )
+
+
+ZBM(ZBR_WNV_INIT_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_ITEM_INIT )
+
+
+ZBM(ZBS_WNV_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(ZNP_HAS_CONFIGURED), Z_B1(ZNP_HAS_CONFIGURED),
+                   0x00 , 0x01 , 0x55 )
+
+ZBM(ZBS_STARTUPFROMAPP, Z_SREQ | Z_ZDO, ZDO_STARTUP_FROM_APP, 100, 0 )
+ZBM(ZBR_STARTUPFROMAPP, Z_SRSP | Z_ZDO, ZDO_STARTUP_FROM_APP )
+ZBM(AREQ_STARTUPFROMAPP, Z_AREQ | Z_ZDO, ZDO_STATE_CHANGE_IND, ZDO_DEV_ZB_COORD )
+
+ZBM(ZBS_GETDEVICEINFO, Z_SREQ | Z_UTIL, Z_UTIL_GET_DEVICE_INFO )
+ZBM(ZBR_GETDEVICEINFO, Z_SRSP | Z_UTIL, Z_UTIL_GET_DEVICE_INFO, Z_Success )
+# 271 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+ZBM(ZBS_ZDO_NODEDESCREQ, Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ, 0x00, 0x00 , 0x00, 0x00 )
+ZBM(ZBR_ZDO_NODEDESCREQ, Z_SRSP | Z_ZDO, ZDO_NODE_DESC_REQ, Z_Success )
+
+ZBM(AREQ_ZDO_NODEDESCRSP, Z_AREQ | Z_ZDO, ZDO_NODE_DESC_RSP)
+# 289 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+ZBM(ZBS_ZDO_ACTIVEEPREQ, Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ, 0x00, 0x00, 0x00, 0x00)
+ZBM(ZBR_ZDO_ACTIVEEPREQ, Z_SRSP | Z_ZDO, ZDO_ACTIVE_EP_REQ, Z_Success)
+ZBM(ZBR_ZDO_ACTIVEEPRSP_NONE, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
+    0x00, 0x00 , 0x00 )
+ZBM(ZBR_ZDO_ACTIVEEPRSP_OK, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
+    0x00, 0x00 , 0x02 , 0x0B, 0x01 )
+
+
+ZBM(ZBS_AF_REGISTER01, Z_SREQ | Z_AF, AF_REGISTER, 0x01 , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
+                        0x05, 0x00 , 0x00 , 0x00 ,
+                        0x00 , 0x00 )
+ZBM(ZBR_AF_REGISTER, Z_SRSP | Z_AF, AF_REGISTER, Z_Success)
+ZBM(ZBS_AF_REGISTER0B, Z_SREQ | Z_AF, AF_REGISTER, 0x0B , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
+                        0x05, 0x00 , 0x00 , 0x00 ,
+                        0x00 , 0x00 )
+
+ZBM(ZBS_PERMITJOINREQ_CLOSE, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x02 ,
+                              0x00, 0x00 , 0x00 , 0x00 )
+ZBM(ZBS_PERMITJOINREQ_OPEN_60, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
+                              0xFC, 0xFF , 60 , 0x00 )
+ZBM(ZBS_PERMITJOINREQ_OPEN_XX, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
+                              0xFC, 0xFF , 0xFF , 0x00 )
+ZBM(ZBR_PERMITJOINREQ, Z_SRSP | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, Z_Success)
+ZBM(ZBR_PERMITJOIN_AREQ_CLOSE, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0x00 )
+ZBM(ZBR_PERMITJOIN_AREQ_OPEN_60, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 60 )
+ZBM(ZBR_PERMITJOIN_AREQ_OPEN_FF, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0xFF )
+ZBM(ZBR_PERMITJOIN_AREQ_RSP, Z_AREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_RSP, 0x00, 0x00 , Z_Success )
+
+static const Zigbee_Instruction zb_prog[] PROGMEM = {
+  ZI_LABEL(0)
+    ZI_NOOP()
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_ON_TIMEOUT_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_ON_RECV_UNEXPECTED(&Z_Recv_Default)
+    ZI_WAIT(10500)
+    ZI_ON_ERROR_GOTO(50)
+
+
+
+    ZI_SEND(ZBS_RESET)
+    ZI_WAIT_RECV_FUNC(5000, ZBR_RESET, &Z_Reboot)
+    ZI_WAIT(100)
+    ZI_LOG(LOG_LEVEL_DEBUG, D_LOG_ZIGBEE "checking device configuration")
+    ZI_SEND(ZBS_ZNPHC)
+    ZI_WAIT_RECV(2000, ZBR_ZNPHC)
+    ZI_SEND(ZBS_VERSION)
+    ZI_WAIT_RECV_FUNC(2000, ZBR_VERSION, &Z_ReceiveCheckVersion)
+    ZI_SEND(ZBS_PAN)
+    ZI_WAIT_RECV(1000, ZBR_PAN)
+    ZI_SEND(ZBS_EXTPAN)
+    ZI_WAIT_RECV(1000, ZBR_EXTPAN)
+    ZI_SEND(ZBS_CHANN)
+    ZI_WAIT_RECV(1000, ZBR_CHANN)
+    ZI_SEND(ZBS_PFGK)
+    ZI_WAIT_RECV(1000, ZBR_PFGK)
+    ZI_SEND(ZBS_PFGKEN)
+    ZI_WAIT_RECV(1000, ZBR_PFGKEN)
+
+
+
+  ZI_LABEL(ZIGBEE_LABEL_START)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_STARTING, "Configured, starting coordinator")
+
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+
+
+ZI_SEND(ZBS_STARTUPFROMAPP)
+    ZI_WAIT_RECV(2000, ZBR_STARTUPFROMAPP)
+    ZI_WAIT_UNTIL(10000, AREQ_STARTUPFROMAPP)
+    ZI_SEND(ZBS_GETDEVICEINFO)
+    ZI_WAIT_RECV_FUNC(2000, ZBR_GETDEVICEINFO, &Z_ReceiveDeviceInfo)
+
+    ZI_SEND(ZBS_ZDO_NODEDESCREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_NODEDESCREQ)
+    ZI_WAIT_UNTIL(5000, AREQ_ZDO_NODEDESCRSP)
+    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_NONE)
+    ZI_SEND(ZBS_AF_REGISTER01)
+    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
+    ZI_SEND(ZBS_AF_REGISTER0B)
+    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
+
+
+    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_OK)
+    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_PERMITJOIN_AREQ_RSP)
+
+
+
+
+
+
+  ZI_LABEL(ZIGBEE_LABEL_READY)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_OK, "Started")
+    ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "Zigbee started")
+    ZI_CALL(&Z_State_Ready, 1)
+    ZI_CALL(&Z_Load_Devices, 0)
+  ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
+    ZI_WAIT_FOREVER()
+    ZI_GOTO(ZIGBEE_LABEL_READY)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_60)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_XX)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(50)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_RESET_CONF, "Reseting configuration")
+
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_SEND(ZBS_FACTRES)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_RESET)
+    ZI_WAIT_RECV(5000, ZBR_RESET)
+    ZI_SEND(ZBS_W_PAN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_EXTPAN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_CHANN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_LOGTYP)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_PFGK)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_PFGKEN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_WNV_SECMODE)
+    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
+    ZI_SEND(ZBS_W_ZDODCB)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+
+    ZI_SEND(ZBS_WNV_INITZNPHC)
+    ZI_WAIT_RECV_FUNC(1000, ZBR_WNV_INIT_OK, &Z_CheckNVWrite)
+    ZI_SEND(ZBS_WNV_ZNPHC)
+    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_START)
+
+  ZI_LABEL(ZIGBEE_LABEL_UNSUPPORTED_VERSION)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_UNSUPPORTED_VERSION, "Only ZNP 1.2 is currently supported")
+    ZI_GOTO(ZIGBEE_LABEL_ABORT)
+
+  ZI_LABEL(ZIGBEE_LABEL_ABORT)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_ABORT, "Abort")
+    ZI_LOG(LOG_LEVEL_ERROR, D_LOG_ZIGBEE "Abort")
+    ZI_STOP(ZIGBEE_LABEL_ABORT)
+};
+
+uint8_t ZigbeeGetInstructionSize(uint8_t instr) {
+  if (instr >= ZGB_INSTR_12_BYTES) {
+    return 3;
+  } else if (instr >= ZGB_INSTR_8_BYTES) {
+    return 2;
+  } else {
+    return 1;
+  }
+}
+
+void ZigbeeGotoLabel(uint8_t label) {
+
+  uint16_t goto_pc = 0xFFFF;
+  uint8_t cur_instr = 0;
+  uint8_t cur_d8 = 0;
+  uint8_t cur_instr_len = 1;
+
+  for (uint32_t i = 0; i < sizeof(zb_prog)/sizeof(zb_prog[0]); i += cur_instr_len) {
+    const Zigbee_Instruction *cur_instr_line = &zb_prog[i];
+    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
+    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
+
+
+    if (ZGB_INSTR_LABEL == cur_instr) {
+
+      if (label == cur_d8) {
+
+        zigbee.pc = i;
+        zigbee.state_machine = true;
+        zigbee.state_waiting = false;
+        return;
+      }
+    }
+
+    cur_instr_len = ZigbeeGetInstructionSize(cur_instr);
+  }
+
+
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Goto label not found, label=%d pc=%d"), label, zigbee.pc);
+  if (ZIGBEE_LABEL_ABORT != label) {
+
+    ZigbeeGotoLabel(ZIGBEE_LABEL_ABORT);
+  } else {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Label Abort (%d) not present, aborting Zigbee"), ZIGBEE_LABEL_ABORT);
+    zigbee.state_machine = false;
+    zigbee.active = false;
+  }
+}
+
+void ZigbeeStateMachine_Run(void) {
+  uint8_t cur_instr = 0;
+  uint8_t cur_d8 = 0;
+  uint16_t cur_d16 = 0;
+  const void* cur_ptr1 = nullptr;
+  const void* cur_ptr2 = nullptr;
+  uint32_t now = millis();
+
+  if (zigbee.state_waiting) {
+
+    if ((zigbee.next_timeout) && (now > zigbee.next_timeout)) {
+
+      if (!zigbee.state_no_timeout) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "timeout, goto label %d"), zigbee.on_timeout_goto);
+        ZigbeeGotoLabel(zigbee.on_timeout_goto);
+      } else {
+        zigbee.state_waiting = false;
+      }
+    }
+  }
+
+  while ((zigbee.state_machine) && (!zigbee.state_waiting)) {
+
+    zigbee.recv_filter = nullptr;
+    zigbee.recv_func = nullptr;
+    zigbee.recv_until = false;
+    zigbee.state_no_timeout = false;
+
+    if (zigbee.pc > (sizeof(zb_prog)/sizeof(zb_prog[0]))) {
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Invalid pc: %d, aborting"), zigbee.pc);
+      zigbee.pc = -1;
+    }
+    if (zigbee.pc < 0) {
+      zigbee.state_machine = false;
+      return;
+    }
+
+
+
+    const Zigbee_Instruction *cur_instr_line = &zb_prog[zigbee.pc];
+    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
+    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
+    cur_d16 = pgm_read_word(&cur_instr_line->i.d16);
+    if (cur_instr >= ZGB_INSTR_8_BYTES) {
+      cur_instr_line++;
+      cur_ptr1 = cur_instr_line->p;
+    }
+    if (cur_instr >= ZGB_INSTR_12_BYTES) {
+      cur_instr_line++;
+      cur_ptr2 = cur_instr_line->p;
+    }
+
+    zigbee.pc += ZigbeeGetInstructionSize(cur_instr);
+
+    switch (cur_instr) {
+      case ZGB_INSTR_NOOP:
+      case ZGB_INSTR_LABEL:
+        break;
+      case ZGB_INSTR_GOTO:
+        ZigbeeGotoLabel(cur_d8);
+        break;
+      case ZGB_INSTR_ON_ERROR_GOTO:
+        zigbee.on_error_goto = cur_d8;
+        break;
+      case ZGB_INSTR_ON_TIMEOUT_GOTO:
+        zigbee.on_timeout_goto = cur_d8;
+        break;
+      case ZGB_INSTR_WAIT:
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        zigbee.state_no_timeout = true;
+        break;
+      case ZGB_INSTR_WAIT_FOREVER:
+        zigbee.next_timeout = 0;
+        zigbee.state_waiting = true;
+
+        break;
+      case ZGB_INSTR_STOP:
+        zigbee.state_machine = false;
+        if (cur_d8) {
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Stopping (%d)"), cur_d8);
+        }
+        break;
+      case ZGB_INSTR_CALL:
+        if (cur_ptr1) {
+          uint32_t res;
+          res = (*((ZB_Func)cur_ptr1))(cur_d8);
+          if (res > 0) {
+            ZigbeeGotoLabel(res);
+            continue;
+          } else if (res == 0) {
+
+          } else if (res == -1) {
+
+          } else {
+            ZigbeeGotoLabel(zigbee.on_error_goto);
+            continue;
+          }
+        }
+        break;
+      case ZGB_INSTR_LOG:
+        AddLog_P(cur_d8, (char*) cur_ptr1);
+        break;
+      case ZGB_INSTR_MQTT_STATE:
+        Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{\"Status\":%d,\"Message\":\"%s\"}}"),
+                          cur_d8, (char*) cur_ptr1);
+       MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+       XdrvRulesProcess();
+        break;
+      case ZGB_INSTR_SEND:
+        ZigbeeZNPSend((uint8_t*) cur_ptr1, cur_d8 );
+        break;
+      case ZGB_INSTR_WAIT_UNTIL:
+        zigbee.recv_until = true;
+      case ZGB_INSTR_WAIT_RECV:
+        zigbee.recv_filter = (uint8_t *) cur_ptr1;
+        zigbee.recv_filter_len = cur_d8;
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        break;
+      case ZGB_ON_RECV_UNEXPECTED:
+        zigbee.recv_unexpected = (ZB_RecvMsgFunc) cur_ptr1;
+        break;
+      case ZGB_INSTR_WAIT_RECV_CALL:
+        zigbee.recv_filter = (uint8_t *) cur_ptr1;
+        zigbee.recv_filter_len = cur_d8;
+        zigbee.recv_func = (ZB_RecvMsgFunc) cur_ptr2;
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        break;
+    }
+  }
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+#ifdef USE_ZIGBEE
+
+int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
+
+
+
+
+
+
+
+  Z_IEEEAddress long_adr = buf.get64(3);
+  Z_ShortAddress short_adr = buf.get16(11);
+  uint8_t device_type = buf.get8(13);
+  uint8_t device_state = buf.get8(14);
+  uint8_t device_associated = buf.get8(15);
+
+
+  localIEEEAddr = long_adr;
+
+  char hex[20];
+  Uint64toHex(long_adr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"DeviceType\":%d,\"DeviceState\":%d"
+                  ",\"NumAssocDevices\":%d"),
+                  ZIGBEE_STATUS_CC_INFO, hex, short_adr, device_type, device_state,
+                  device_associated);
+
+  if (device_associated > 0) {
+    uint idx = 16;
+    ResponseAppend_P(PSTR(",\"AssocDevicesList\":["));
+    for (uint32_t i = 0; i < device_associated; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(idx));
+      idx += 2;
+    }
+    ResponseAppend_P(PSTR("]"));
+  }
+
+  ResponseJsonEnd();
+  ResponseJsonEnd();
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  return res;
+}
+
+int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf) {
+
+
+
+  uint8_t status = buf.get8(2);
+  if ((0x00 == status) || (0x09 == status)) {
+    return 0;
+  } else {
+    return -2;
+  }
+}
+
+const char Z_RebootReason[] PROGMEM = "Power-up|External|Watchdog";
+
+int32_t Z_Reboot(int32_t res, class SBuffer &buf) {
+
+
+
+  uint8_t reason = buf.get8(2);
+  uint8_t transport_rev = buf.get8(3);
+  uint8_t product_id = buf.get8(4);
+  uint8_t major_rel = buf.get8(5);
+  uint8_t minor_rel = buf.get8(6);
+  uint8_t hw_rev = buf.get8(7);
+  char reason_str[12];
+
+  if (reason > 3) { reason = 3; }
+  GetTextIndexed(reason_str, sizeof(reason_str), reason, Z_RebootReason);
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"Message\":\"%s\",\"RestartReason\":\"%s\""
+                  ",\"MajorRel\":%d,\"MinorRel\":%d}}"),
+                  ZIGBEE_STATUS_BOOT, "CC2530 booted", reason_str,
+                  major_rel, minor_rel);
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
+   return 0;
+  } else {
+    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
+  }
+}
+
+int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf) {
+# 122 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+  uint8_t major_rel = buf.get8(4);
+  uint8_t minor_rel = buf.get8(5);
+  uint8_t maint_rel = buf.get8(6);
+  uint32_t revision = buf.get32(7);
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"MajorRel\":%d,\"MinorRel\":%d"
+                  ",\"MaintRel\":%d,\"Revision\":%d}}"),
+                  ZIGBEE_STATUS_CC_VERSION, major_rel, minor_rel,
+                  maint_rel, revision);
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
+   return 0;
+  } else {
+    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
+  }
+}
+
+bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match) {
+  if ( (pgm_read_byte(&match[0]) == buf.get8(0)) &&
+       (pgm_read_byte(&match[1]) == buf.get8(1)) ) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
+
+  uint8_t duration = buf.get8(2);
+  uint8_t status_code;
+  const char* message;
+
+  if (0xFF == duration) {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_XX;
+    message = PSTR("Enable Pairing mode until next boot");
+  } else if (duration > 0) {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_60;
+    message = PSTR("Enable Pairing mode for %d seconds");
+  } else {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_CLOSE;
+    message = PSTR("Disable Pairing mode");
+  }
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"Message\":\""),
+                  status_code);
+  ResponseAppend_P(message, duration);
+  ResponseAppend_P(PSTR("\"}}"));
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+  return -1;
+}
+
+
+void Z_SendActiveEpReq(uint16_t shortaddr) {
+  uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
+
+  uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
+
+  ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
+
+}
+
+
+void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint) {
+  uint8_t SimpleDescReq[] = { Z_SREQ | Z_ZDO, ZDO_SIMPLE_DESC_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr),
+              endpoint };
+
+  ZigbeeZNPSend(SimpleDescReq, sizeof(SimpleDescReq));
+}
+
+const char* Z_DeviceType[] = { "Coordinator", "Router", "End Device", "Unknown" };
+int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t logicalType = buf.get8(7);
+  uint8_t apsFlags = buf.get8(8);
+  uint8_t MACCapabilityFlags = buf.get8(9);
+  uint16_t manufacturerCapabilities = buf.get16(10);
+  uint8_t maxBufferSize = buf.get8(12);
+  uint16_t maxInTransferSize = buf.get16(13);
+  uint16_t serverMask = buf.get16(15);
+  uint16_t maxOutTransferSize = buf.get16(17);
+  uint8_t descriptorCapabilities = buf.get8(19);
+
+  if (0 == status) {
+    zigbee_devices.updateLastSeen(nwkAddr);
+
+    uint8_t deviceType = logicalType & 0x7;
+    if (deviceType > 3) { deviceType = 3; }
+    bool complexDescriptorAvailable = (logicalType & 0x08) ? 1 : 0;
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"NodeType\":\"%s\",\"ComplexDesc\":%s}}"),
+                    ZIGBEE_STATUS_NODE_DESC, Z_DeviceType[deviceType],
+                    complexDescriptorAvailable ? "true" : "false"
+                    );
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+  }
+
+  return -1;
+}
+
+int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t activeEpCount = buf.get8(7);
+  uint8_t* activeEpList = (uint8_t*) buf.charptr(8);
+
+
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    zigbee_devices.addEndoint(nwkAddr, activeEpList[i]);
+  }
+
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    Z_SendSimpleDescReq(nwkAddr, activeEpList[i]);
+  }
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"ActiveEndpoints\":["),
+                  ZIGBEE_STATUS_ACTIVE_EP);
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    if (i > 0) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(PSTR("\"0x%02X\""), activeEpList[i]);
+  }
+  ResponseAppend_P(PSTR("]}}"));
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+  return -1;
+}
+
+void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid) {
+  SBuffer buf(100);
+  buf.add8(Z_SREQ | Z_AF);
+  buf.add8(AF_DATA_REQUEST);
+  buf.add16(shortaddr);
+  buf.add8(endpoint);
+  buf.add8(0x01);
+  buf.add16(clusterid);
+  buf.add8(transacid);
+  buf.add8(0x30);
+  buf.add8(0x1E);
+
+  buf.add8(3 + 2*sizeof(uint16_t));
+  buf.add8(0x00);
+  buf.add8(transacid);
+  buf.add8(ZCL_READ_ATTRIBUTES);
+  buf.add16(0x0004);
+  buf.add16(0x0005);
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+}
+
+
+int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t lenDescriptor = buf.get8(7);
+  uint8_t endpoint = buf.get8(8);
+  uint16_t profileId = buf.get16(9);
+  uint16_t deviceId = buf.get16(11);
+  uint8_t deviceVersion = buf.get8(13);
+  uint8_t numInCluster = buf.get8(14);
+  uint8_t numOutCluster = buf.get8(15 + numInCluster*2);
+
+  if (0 == status) {
+    zigbee_devices.addEndointProfile(nwkAddr, endpoint, profileId);
+    for (uint32_t i = 0; i < numInCluster; i++) {
+      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(15 + i*2), false);
+    }
+    for (uint32_t i = 0; i < numOutCluster; i++) {
+      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(16 + numInCluster*2 + i*2), true);
+    }
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"Endpoint\":\"0x%02X\""
+                    ",\"ProfileId\":\"0x%04X\",\"DeviceId\":\"0x%04X\",\"DeviceVersion\":%d"
+                    "\"InClusters\":["),
+                    ZIGBEE_STATUS_SIMPLE_DESC, endpoint,
+                    profileId, deviceId, deviceVersion);
+    for (uint32_t i = 0; i < numInCluster; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(15 + i*2));
+    }
+    ResponseAppend_P(PSTR("],\"OutClusters\":["));
+    for (uint32_t i = 0; i < numOutCluster; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(16 + numInCluster*2 + i*2));
+    }
+    ResponseAppend_P(PSTR("]}}"));
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+
+    uint8_t cluster = zigbee_devices.findClusterEndpointIn(nwkAddr, 0x0000);
+    if (cluster) {
+      Z_SendAFInfoRequest(nwkAddr, cluster, 0x0000, 0x01);
+    }
+  }
+  return -1;
+}
+
+int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
+  Z_ShortAddress srcAddr = buf.get16(2);
+  Z_ShortAddress nwkAddr = buf.get16(4);
+  Z_IEEEAddress ieeeAddr = buf.get64(6);
+  uint8_t capabilities = buf.get8(14);
+
+  zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
+
+  char hex[20];
+  Uint64toHex(ieeeAddr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"PowerSource\":%s,\"ReceiveWhenIdle\":%s,\"Security\":%s}}"),
+                  ZIGBEE_STATUS_DEVICE_ANNOUNCE, hex, nwkAddr,
+                  (capabilities & 0x04) ? "true" : "false",
+                  (capabilities & 0x08) ? "true" : "false",
+                  (capabilities & 0x40) ? "true" : "false"
+                  );
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+  Z_SendActiveEpReq(nwkAddr);
+  return -1;
+}
+
+
+int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf) {
+  Z_ShortAddress srcAddr = buf.get16(2);
+  Z_IEEEAddress ieeeAddr = buf.get64(4);
+  Z_ShortAddress parentNw = buf.get16(12);
+
+  zigbee_devices.updateDevice(srcAddr, ieeeAddr);
+
+  char hex[20];
+  Uint64toHex(ieeeAddr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"ParentNetwork\":\"0x%04X\"}}"),
+                  ZIGBEE_STATUS_DEVICE_INDICATION, hex, srcAddr, parentNw
+                  );
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+
+  return -1;
+}
+
+
+
+const uint32_t OCCUPANCY_TIMEOUT = 90 * 1000;
+
+void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json) {
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(*json, PSTR(OCCUPANCY));
+  if (nullptr != &val_endpoint) {
+    uint32_t occupancy = strToUInt(val_endpoint);
+
+    if (occupancy) {
+      zigbee_devices.setTimer(shortaddr, OCCUPANCY_TIMEOUT, cluster, endpoint, 0, &Z_OccupancyCallback);
+    }
+  }
+}
+
+
+
+int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  const JsonObject *json = zigbee_devices.jsonGet(shortaddr);
+  if (json == nullptr) { return 0; }
+
+  Z_AqaraOccupancy(shortaddr, cluster, endpoint, json);
+
+  zigbee_devices.jsonPublishFlush(shortaddr);
+  return 1;
+}
+
+int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
+  uint16_t groupid = buf.get16(2);
+  uint16_t clusterid = buf.get16(4);
+  Z_ShortAddress srcaddr = buf.get16(6);
+  uint8_t srcendpoint = buf.get8(8);
+  uint8_t dstendpoint = buf.get8(9);
+  uint8_t wasbroadcast = buf.get8(10);
+  uint8_t linkquality = buf.get8(11);
+  uint8_t securityuse = buf.get8(12);
+  uint32_t timestamp = buf.get32(13);
+  uint8_t seqnumber = buf.get8(17);
+
+  bool defer_attributes = false;
+
+  zigbee_devices.updateLastSeen(srcaddr);
+  ZCLFrame zcl_received = ZCLFrame::parseRawFrame(buf, 19, buf.get8(18), clusterid, groupid,
+                              srcaddr,
+                              srcendpoint, dstendpoint, wasbroadcast,
+                              linkquality, securityuse, seqnumber,
+                              timestamp);
+  zcl_received.log();
+  char shortaddr[8];
+  snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%04X"), srcaddr);
+
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+
+  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
+    zcl_received.parseRawAttributes(json);
+    if (clusterid) { defer_attributes = true; }
+  } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
+    zcl_received.parseReadAttributes(json);
+  } else if (zcl_received.isClusterSpecificCommand()) {
+    zcl_received.parseClusterSpecificCommand(json);
+  }
+  String msg("");
+  msg.reserve(100);
+  json.printTo(msg);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
+
+  zcl_received.postProcessAttributes(srcaddr, json);
+
+  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
+
+  if (defer_attributes) {
+
+    if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
+
+      zigbee_devices.jsonPublishFlush(srcaddr);
+    } else {
+      zigbee_devices.jsonAppend(srcaddr, json);
+      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
+    }
+  } else {
+
+    zigbee_devices.jsonPublishNow(srcaddr, json);
+  }
+  return -1;
+}
+
+typedef struct Z_Dispatcher {
+  const uint8_t* match;
+  ZB_RecvMsgFunc func;
+} Z_Dispatcher;
+
+
+ZBM(AREQ_AF_INCOMING_MESSAGE, Z_AREQ | Z_AF, AF_INCOMING_MSG)
+ZBM(AREQ_END_DEVICE_ANNCE_IND, Z_AREQ | Z_ZDO, ZDO_END_DEVICE_ANNCE_IND)
+ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)
+ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )
+ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)
+ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)
+
+const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
+  { AREQ_AF_INCOMING_MESSAGE, &Z_ReceiveAfIncomingMessage },
+  { AREQ_END_DEVICE_ANNCE_IND, &Z_ReceiveEndDeviceAnnonce },
+  { AREQ_END_DEVICE_TC_DEV_IND, &Z_ReceiveTCDevInd },
+  { AREQ_PERMITJOIN_OPEN_XX, &Z_ReceivePermitJoinStatus },
+  { AREQ_ZDO_NODEDESCRSP, &Z_ReceiveNodeDesc },
+  { AREQ_ZDO_ACTIVEEPRSP, &Z_ReceiveActiveEp },
+  { AREQ_ZDO_SIMPLEDESCRSP, &Z_ReceiveSimpleDesc },
+};
+
+int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
+
+  if (zigbee.init_phase) {
+
+   return -1;
+  } else {
+    for (uint32_t i = 0; i < sizeof(Z_DispatchTable)/sizeof(Z_Dispatcher); i++) {
+      if (Z_ReceiveMatchPrefix(buf, Z_DispatchTable[i].match)) {
+        (*Z_DispatchTable[i].func)(res, buf);
+      }
+    }
+    return -1;
+  }
+}
+
+int32_t Z_Load_Devices(uint8_t value) {
+
+  loadZigbeeDevices();
+  return 0;
+}
+
+int32_t Z_State_Ready(uint8_t value) {
+  zigbee.init_phase = false;
+  return 0;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+#ifdef USE_ZIGBEE
+
+#define XDRV_23 23
+
+const uint32_t ZIGBEE_BUFFER_SIZE = 256;
+const uint8_t ZIGBEE_SOF = 0xFE;
+const uint8_t ZIGBEE_SOF_ALT = 0xFF;
+
+#include <TasmotaSerial.h>
+TasmotaSerial *ZigbeeSerial = nullptr;
+
+
+const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"
+  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
+  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+
+const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"
+  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
+  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+
+void (* const ZigbeeCommand[])(void) PROGMEM = {
+  &CmndZbZNPSend, &CmndZbPermitJoin,
+  &CmndZbStatus, &CmndZbReset, &CmndZbSend,
+  &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
+  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind
+  };
+
+int32_t ZigbeeProcessInput(class SBuffer &buf) {
+  if (!zigbee.state_machine) { return -1; }
+
+
+  bool recv_filter_match = true;
+  bool recv_prefix_match = false;
+  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
+    if (zigbee.recv_filter_len >= 2) {
+      recv_prefix_match = false;
+      if ( (pgm_read_byte(&zigbee.recv_filter[0]) == buf.get8(0)) &&
+           (pgm_read_byte(&zigbee.recv_filter[1]) == buf.get8(1)) ) {
+        recv_prefix_match = true;
+      }
+    }
+
+    for (uint32_t i = 0; i < zigbee.recv_filter_len; i++) {
+      if (pgm_read_byte(&zigbee.recv_filter[i]) != buf.get8(i)) {
+        recv_filter_match = false;
+        break;
+      }
+    }
+
+
+  }
+
+
+  int32_t res = -1;
+
+
+
+
+
+  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
+    if (!recv_prefix_match) {
+      res = -1;
+    } else {
+      if (recv_filter_match) {
+        res = 0;
+      } else {
+        if (zigbee.recv_until) {
+          res = -1;
+        } else {
+          res = -2;
+        }
+      }
+    }
+  } else {
+    res = -1;
+  }
+
+  if (recv_prefix_match) {
+    if (zigbee.recv_func) {
+      res = (*zigbee.recv_func)(res, buf);
+    }
+  }
+  if (-1 == res) {
+
+    if (zigbee.recv_unexpected) {
+      res = (*zigbee.recv_unexpected)(res, buf);
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: res = %d"), res);
+
+
+  if (0 == res) {
+
+    zigbee.state_waiting = false;
+  } else if (res > 0) {
+    ZigbeeGotoLabel(res);
+  } else if (-1 == res) {
+
+
+  } else {
+
+    ZigbeeGotoLabel(zigbee.on_error_goto);
+  }
+}
+
+void ZigbeeInput(void)
+{
+ static uint32_t zigbee_polling_window = 0;
+ static uint8_t fcs = ZIGBEE_SOF;
+ static uint32_t zigbee_frame_len = 5;
+# 142 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+  while (ZigbeeSerial->available()) {
+    yield();
+    uint8_t zigbee_in_byte = ZigbeeSerial->read();
+
+
+  if (0 == zigbee_buffer->len()) {
+   zigbee_frame_len = 5;
+   fcs = ZIGBEE_SOF;
+
+
+
+      if (ZIGBEE_SOF_ALT == zigbee_in_byte) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
+        zigbee_in_byte = ZIGBEE_SOF;
+      }
+  }
+
+    if ((0 == zigbee_buffer->len()) && (ZIGBEE_SOF != zigbee_in_byte)) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput discarding byte %02X"), zigbee_in_byte);
+      continue;
+    }
+
+    if (zigbee_buffer->len() < zigbee_frame_len) {
+   zigbee_buffer->add8(zigbee_in_byte);
+      zigbee_polling_window = millis();
+   fcs ^= zigbee_in_byte;
+    }
+
+  if (zigbee_buffer->len() >= zigbee_frame_len) {
+      zigbee_polling_window = 0;
+      break;
+    }
+
+
+    if (02 == zigbee_buffer->len()) {
+
+      uint8_t len_byte = zigbee_buffer->get8(1);
+      if (len_byte > 250) len_byte = 250;
+
+      zigbee_frame_len = len_byte + 5;
+    }
+  }
+
+  if (zigbee_buffer->len() && (millis() > (zigbee_polling_window + ZIGBEE_POLLING))) {
+    char hex_char[(zigbee_buffer->len() * 2) + 2];
+  ToHex_P((unsigned char*)zigbee_buffer->getBuffer(), zigbee_buffer->len(), hex_char, sizeof(hex_char));
+
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Bytes follow_read_metric = %0d"), ZigbeeSerial->getLoopReadMetric());
+
+  if (zigbee_buffer->len() != zigbee_frame_len) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received frame of wrong size %s, len %d, expected %d"), hex_char, zigbee_buffer->len(), zigbee_frame_len);
+  } else if (0x00 != fcs) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received bad FCS frame %s, %d"), hex_char, fcs);
+  } else {
+
+
+
+   SBuffer znp_buffer = zigbee_buffer->subBuffer(2, zigbee_frame_len - 3);
+
+   ToHex_P((unsigned char*)znp_buffer.getBuffer(), znp_buffer.len(), hex_char, sizeof(hex_char));
+      Response_P(PSTR("{\"" D_JSON_ZIGBEEZNPRECEIVED "\":\"%s\"}"), hex_char);
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+        XdrvRulesProcess();
+      } else {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+      }
+
+      ZigbeeProcessInput(znp_buffer);
+  }
+  zigbee_buffer->setLen(0);
+  }
+}
+
+
+
+void ZigbeeInit(void)
+{
+  zigbee.active = false;
+  if ((pin[GPIO_ZIGBEE_RX] < 99) && (pin[GPIO_ZIGBEE_TX] < 99)) {
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
+
+    ZigbeeSerial = new TasmotaSerial(pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX], seriallog_level ? 1 : 2, 0, 256);
+    ZigbeeSerial->begin(115200);
+    if (ZigbeeSerial->hardwareSerial()) {
+      ClaimSerial();
+      uint32_t aligned_buffer = ((uint32_t)serial_in_buffer + 3) & ~3;
+   zigbee_buffer = new PreAllocatedSBuffer(sizeof(serial_in_buffer) - 3, (char*) aligned_buffer);
+  } else {
+   zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
+  }
+    zigbee.active = true;
+  zigbee.init_phase = true;
+    zigbee.state_machine = true;
+    ZigbeeSerial->flush();
+  }
+}
+
+
+
+
+
+uint32_t strToUInt(const JsonVariant &val) {
+
+  if (val.is<unsigned int>()) {
+    return val.as<unsigned int>();
+  } else {
+    if (val.is<const char*>()) {
+      String sval = val.as<String>();
+      return strtoull(sval.c_str(), nullptr, 0);
+    }
+  }
+  return 0;
+}
+
+const unsigned char ZIGBEE_FACTORY_RESET[] PROGMEM =
+  { Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x01 };
+
+
+void CmndZbReset(void) {
+  if (ZigbeeSerial) {
+    switch (XdrvMailbox.payload) {
+    case 1:
+      ZigbeeZNPSend(ZIGBEE_FACTORY_RESET, sizeof(ZIGBEE_FACTORY_RESET));
+      eraseZigbeeDevices();
+      restart_flag = 2;
+      ResponseCmndChar(D_JSON_ZIGBEE_CC2530 " " D_JSON_RESET_AND_RESTARTING);
+      break;
+    default:
+      ResponseCmndChar(D_JSON_ONE_TO_RESET);
+    }
+  }
+}
+
+void CmndZbZNPSendOrReceive(bool send)
+{
+  if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
+    uint8_t code;
+
+    char *codes = RemoveSpace(XdrvMailbox.data);
+    int32_t size = strlen(XdrvMailbox.data);
+
+  SBuffer buf((size+1)/2);
+
+    while (size > 1) {
+      char stemp[3];
+      strlcpy(stemp, codes, sizeof(stemp));
+      code = strtol(stemp, nullptr, 16);
+   buf.add8(code);
+      size -= 2;
+      codes += 2;
+    }
+    if (send) {
+      ZigbeeZNPSend(buf.getBuffer(), buf.len());
+    } else {
+      ZigbeeProcessInput(buf);
+    }
+  }
+  ResponseCmndDone();
+}
+
+
+void CmndZbZNPReceive(void)
+{
+  CmndZbZNPSendOrReceive(false);
+}
+
+void CmndZbZNPSend(void)
+{
+  CmndZbZNPSendOrReceive(true);
+}
+
+void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
+ if ((len < 2) || (len > 252)) {
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_JSON_ZIGBEEZNPSENT ": bad message len %d"), len);
+  return;
+ }
+ uint8_t data_len = len - 2;
+
+  if (ZigbeeSerial) {
+  uint8_t fcs = data_len;
+
+  ZigbeeSerial->write(ZIGBEE_SOF);
+
+  ZigbeeSerial->write(data_len);
+
+  for (uint32_t i = 0; i < len; i++) {
+   uint8_t b = pgm_read_byte(msg + i);
+   ZigbeeSerial->write(b);
+   fcs ^= b;
+
+  }
+  ZigbeeSerial->write(fcs);
+
+  }
+
+ char hex_char[(len * 2) + 2];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZNPSENT " %s"),
+                                 ToHex_P(msg, len, hex_char, sizeof(hex_char)));
+}
+
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId) {
+  SBuffer buf(25+len);
+  buf.add8(Z_SREQ | Z_AF);
+  buf.add8(AF_DATA_REQUEST);
+  buf.add16(dtsAddr);
+  buf.add8(endpoint);
+  buf.add8(0x01);
+  buf.add16(clusterId);
+  buf.add8(transacId);
+  buf.add8(0x30);
+  buf.add8(0x1E);
+
+  buf.add8(3 + len);
+  buf.add8((disableDefResp ? 0x10 : 0x00) | (clusterSpecific ? 0x01 : 0x00));
+  buf.add8(transacId);
+  buf.add8(cmdId);
+  if (len > 0) {
+    buf.addBuffer(msg, len);
+  }
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+}
+
+inline int8_t hexValue(char c) {
+  if ((c >= '0') && (c <= '9')) {
+    return c - '0';
+  }
+  if ((c >= 'A') && (c <= 'F')) {
+    return 10 + c - 'A';
+  }
+  if ((c >= 'a') && (c <= 'f')) {
+    return 10 + c - 'a';
+  }
+  return -1;
+}
+
+uint32_t parseHex(const char **data, size_t max_len = 8) {
+  uint32_t ret = 0;
+  for (uint32_t i = 0; i < max_len; i++) {
+    int8_t v = hexValue(**data);
+    if (v < 0) { break; }
+    ret = (ret << 4) | v;
+    *data += 1;
+  }
+  return ret;
+}
+
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
+
+  uint16_t cluster = 0x0000;
+  uint8_t cmd = ZCL_READ_ATTRIBUTES;
+  bool clusterSpecific = false;
+
+
+
+  cluster = parseHex(&data, 4);
+
+
+  if (('_' == *data) || ('!' == *data)) {
+    if ('!' == *data) { clusterSpecific = true; }
+    data++;
+  } else {
+    ResponseCmndChar("Wrong delimiter for payload");
+    return;
+  }
+
+  cmd = parseHex(&data, 2);
+
+
+
+  if ('/' == *data) { data++; }
+
+  size_t size = strlen(data);
+  SBuffer buf((size+2)/2);
+
+  while (*data) {
+    uint8_t code = parseHex(&data, 2);
+    buf.add8(code);
+  }
+
+  if (0 == endpoint) {
+
+    endpoint = zigbee_devices.findClusterEndpointIn(dstAddr, cluster);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
+    dstAddr, cluster, endpoint, cmd, data);
+
+  if (0 == endpoint) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
+    return;
+  }
+
+
+  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len());
+
+  if (clusterSpecific) {
+    zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
+  }
+  ResponseCmndDone();
+}
+
+void CmndZbSend(void) {
+# 461 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+  static char delim[] = ", ";
+  uint16_t device = 0xFFFF;
+  uint8_t endpoint = 0x00;
+  String cmd_str = "";
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
+  if (nullptr != &val_cmd) {
+
+
+
+    if (val_cmd.is<JsonObject>()) {
+
+      JsonObject &cmd_obj = val_cmd.as<JsonObject&>();
+      int32_t cmd_size = cmd_obj.size();
+      if (cmd_size > 1) {
+        Response_P(PSTR("Only 1 command allowed (%d)"), cmd_size);
+        return;
+      } else if (1 == cmd_size) {
+
+        JsonObject::iterator it = cmd_obj.begin();
+        String key = it->key;
+        JsonVariant& value = it->value;
+        uint32_t x = 0, y = 0, z = 0;
+
+        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str());
+        if (tasmota_cmd) {
+          cmd_str = tasmota_cmd;
+        } else {
+          Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str());
+          return;
+        }
+
+
+        if (value.is<bool>()) {
+          x = value.as<bool>() ? 1 : 0;
+        } else if (value.is<unsigned int>()) {
+          x = value.as<unsigned int>();
+        } else {
+
+          const char *s_const = value.as<const char*>();
+          if (s_const != nullptr) {
+            char s[strlen(s_const)+1];
+            strcpy(s, s_const);
+            if ((nullptr != s) && (0x00 != *s)) {
+              char *sval = strtok(s, delim);
+              if (sval) {
+                x = ZigbeeAliasOrNumber(sval);
+                sval = strtok(nullptr, delim);
+                if (sval) {
+                  y = ZigbeeAliasOrNumber(sval);
+                  sval = strtok(nullptr, delim);
+                  if (sval) {
+                    z = ZigbeeAliasOrNumber(sval);
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
+        cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
+      } else {
+
+      }
+    } else if (val_cmd.is<char*>()) {
+
+      cmd_str = val_cmd.as<String>();
+    } else {
+
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
+              device, endpoint, cmd_str.c_str());
+    zigbeeZCLSendStr(device, endpoint, cmd_str.c_str());
+  } else {
+    Response_P(PSTR("Missing zigbee 'Send'"));
+    return;
+  }
+
+}
+
+ZBM(ZBS_BIND_REQ, Z_SREQ | Z_ZDO, ZDO_BIND_REQ,
+      0,0,
+      0,0,0,0,0,0,0,0,
+      0x00,
+      0x00, 0x00,
+      0x03,
+      0,0,0,0,0,0,0,0,
+      0x01
+)
+
+void CmndZbBind(void) {
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+
+  uint16_t device = 0xFFFF;
+  uint8_t endpoint = 0x00;
+  uint16_t cluster = 0;
+  uint32_t group = 0xFFFFFFFF;
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
+
+
+
+  SBuffer buf(sizeof(ZBS_BIND_REQ));
+  buf.add8(Z_SREQ | Z_ZDO);
+  buf.add8(ZDO_BIND_REQ);
+  buf.add16(device);
+  buf.add64(zigbee_devices.getDeviceLongAddr(device));
+  buf.add8(endpoint);
+  buf.add16(cluster);
+  buf.add8(0x03);
+  buf.add64(localIEEEAddr);
+  buf.add8(0x01);
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+
+  ResponseCmndDone();
+}
+
+
+void CmndZbProbe(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+
+  Z_SendActiveEpReq(shortaddr);
+  ResponseCmndDone();
+}
+
+
+void CmndZbName(void) {
+
+
+
+
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+
+
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+  if (p == nullptr) {
+    const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
+  } else {
+    zigbee_devices.setFriendlyName(shortaddr, p);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, p);
+  }
+}
+
+
+void CmndZbForget(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+
+  if (zigbee_devices.removeDevice(shortaddr)) {
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Unknown device");
+  }
+}
+
+
+void CmndZbSave(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+  saveZigbeeDevices();
+
+  ResponseCmndDone();
+}
+
+
+void CmndZbRead(void) {
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+  uint16_t device = 0xFFFF;
+  uint16_t cluster = 0x0000;
+  uint8_t endpoint = 0x00;
+  size_t attrs_len = 0;
+  uint8_t* attrs = nullptr;
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+
+  const JsonVariant &val_attr = getCaseInsensitive(json, PSTR("Read"));
+  if (nullptr != &val_attr) {
+    uint16_t val = strToUInt(val_attr);
+    if (val_attr.is<JsonArray>()) {
+      JsonArray& attr_arr = val_attr;
+      attrs_len = attr_arr.size() * 2;
+      attrs = new uint8_t[attrs_len];
+
+      uint32_t i = 0;
+      for (auto value : attr_arr) {
+        uint16_t val = strToUInt(value);
+        attrs[i++] = val & 0xFF;
+        attrs[i++] = val >> 8;
+      }
+    } else {
+      attrs_len = 2;
+      attrs = new uint8_t[attrs_len];
+      attrs[0] = val & 0xFF;
+      attrs[1] = val >> 8;
+    }
+  }
+
+  if ((0 != endpoint) && (attrs_len > 0)) {
+    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false );
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Missing parameters");
+  }
+
+  if (attrs) { delete[] attrs; }
+}
+
+
+void CmndZbPermitJoin(void)
+{
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint32_t payload = XdrvMailbox.payload;
+  if (payload < 0) { payload = 0; }
+  if ((99 != payload) && (payload > 1)) { payload = 1; }
+
+  if (1 == payload) {
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60);
+  } else if (99 == payload){
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX);
+  } else {
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE);
+  }
+  ResponseCmndDone();
+}
+
+void CmndZbStatus(void) {
+  if (ZigbeeSerial) {
+    if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+    uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+    if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+    if (XdrvMailbox.payload > 0) {
+      if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+    }
+
+    String dump = zigbee_devices.dump(XdrvMailbox.index, shortaddr);
+    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
+  }
+}
+
+
+
+
+
+bool Xdrv23(uint8_t function)
+{
+  bool result = false;
+
+  if (zigbee.active) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (!zigbee.init_phase) {
+          zigbee_devices.runTimer();
+        }
+        break;
+      case FUNC_LOOP:
+        if (ZigbeeSerial) { ZigbeeInput(); }
+    if (zigbee.state_machine) {
+
+          ZigbeeStateMachine_Run();
+    }
+        break;
+      case FUNC_PRE_INIT:
+        ZigbeeInit();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kZbCommands, ZigbeeCommand);
+        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
+#ifdef USE_BUZZER
+
+
+
+
+#define XDRV_24 24
+
+struct BUZZER {
+  uint32_t tune = 0;
+  uint32_t tune_reload = 0;
+  bool active = true;
+  bool enable = false;
+  uint8_t inverted = 0;
+  uint8_t count = 0;
+  uint8_t mode = 0;
+  uint8_t set[2];
+  uint8_t duration;
+  uint8_t state = 0;
+} Buzzer;
+
+
+
+void BuzzerOff(void)
+{
+  DigitalWrite(GPIO_BUZZER, Buzzer.inverted);
+}
+
+
+void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode)
+{
+  Buzzer.set[0] = off;
+  Buzzer.set[1] = on;
+  Buzzer.duration = 1;
+  Buzzer.tune_reload = 0;
+  Buzzer.mode = mode;
+
+  if (tune) {
+    uint32_t tune1 = tune;
+    uint32_t tune2 = tune;
+    for (uint32_t i = 0; i < 32; i++) {
+      if (!(tune2 & 0x80000000)) {
+        tune2 <<= 1;
+      } else {
+        Buzzer.tune_reload <<= 1;
+        Buzzer.tune_reload |= tune1 & 1;
+        tune1 >>= 1;
+      }
+    }
+    Buzzer.tune = Buzzer.tune_reload;
+  }
+  Buzzer.count = count * 2;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BUZ: %d(%d),%d,%d,0x%08X(0x%08X)"), count, Buzzer.count, on, off, tune, Buzzer.tune);
+
+  Buzzer.enable = (Buzzer.count > 0);
+  if (!Buzzer.enable) {
+    BuzzerOff();
+  }
+}
+
+void BuzzerSetStateToLed(uint32_t state)
+{
+  if (Buzzer.enable && (2 == Buzzer.mode)) {
+    Buzzer.state = (state != 0);
+    DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
+  }
+}
+
+void BuzzerBeep(uint32_t count)
+{
+  BuzzerBeep(count, 1, 1, 0, 0);
+}
+
+void BuzzerEnabledBeep(uint32_t count, uint32_t duration)
+{
+  if (Settings.flag3.buzzer_enable) {
+    BuzzerBeep(count, duration, 1, 0, 0);
+  }
+}
+
+
+
+bool BuzzerPinState(void)
+{
+  if (XdrvMailbox.index == GPIO_BUZZER_INV) {
+    Buzzer.inverted = 1;
+    XdrvMailbox.index -= (GPIO_BUZZER_INV - GPIO_BUZZER);
+    return true;
+  }
+  return false;
+}
+
+void BuzzerInit(void)
+{
+  if (pin[GPIO_BUZZER] < 99) {
+    pinMode(pin[GPIO_BUZZER], OUTPUT);
+    BuzzerOff();
+  } else {
+    Buzzer.active = false;
+  }
+}
+
+void BuzzerEvery100mSec(void)
+{
+  if (Buzzer.enable && (Buzzer.mode != 2)) {
+    if (Buzzer.count) {
+      if (Buzzer.duration) {
+        Buzzer.duration--;
+        if (!Buzzer.duration) {
+          if (Buzzer.tune) {
+            Buzzer.state = Buzzer.tune & 1;
+            Buzzer.tune >>= 1;
+          } else {
+            Buzzer.tune = Buzzer.tune_reload;
+            Buzzer.count -= (Buzzer.tune_reload) ? 2 : 1;
+            Buzzer.state = Buzzer.count & 1;
+            if (Buzzer.mode) {
+              Buzzer.count |= 2;
+            }
+          }
+          Buzzer.duration = Buzzer.set[Buzzer.state];
+        }
+      }
+      DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
+    } else {
+      Buzzer.enable = false;
+    }
+  }
+}
+
+
+
+
+
+const char kBuzzerCommands[] PROGMEM = "|"
+  "Buzzer" ;
+
+void (* const BuzzerCommand[])(void) PROGMEM = {
+  &CmndBuzzer };
+
+void CmndBuzzer(void)
+{
+# 174 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
+  if (XdrvMailbox.data_len > 0) {
+    if (XdrvMailbox.payload != 0) {
+      uint32_t parm[4] = { 0 };
+      uint32_t mode = 0;
+      ParseParameters(4, parm);
+      if (XdrvMailbox.payload <= 0) {
+        parm[0] = 1;
+        mode = -XdrvMailbox.payload;
+      }
+      for (uint32_t i = 1; i < 3; i++) {
+        if (parm[i] < 1) { parm[i] = 1; }
+      }
+      BuzzerBeep(parm[0], parm[1], parm[2], parm[3], mode);
+    } else {
+      BuzzerBeep(0);
+    }
+  } else {
+    BuzzerBeep(1);
+  }
+  ResponseCmndDone();
+}
+
+
+
+
+
+bool Xdrv24(uint8_t function)
+{
+  bool result = false;
+
+  if (Buzzer.active) {
+    switch (function) {
+      case FUNC_EVERY_100_MSECOND:
+        BuzzerEvery100mSec();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kBuzzerCommands, BuzzerCommand);
+        break;
+      case FUNC_PRE_INIT:
+        BuzzerInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = BuzzerPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
+# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
+#ifdef USE_A4988_STEPPER
+
+
+
+
+#define XDRV_25 25
+
+#include <A4988_Stepper.h>
+
+short A4988_dir_pin = pin[GPIO_MAX];
+short A4988_stp_pin = pin[GPIO_MAX];
+short A4988_ms1_pin = pin[GPIO_MAX];
+short A4988_ms2_pin = pin[GPIO_MAX];
+short A4988_ms3_pin = pin[GPIO_MAX];
+short A4988_ena_pin = pin[GPIO_MAX];
+int A4988_spr = 0;
+float A4988_rpm = 0;
+short A4988_mis = 0;
+
+A4988_Stepper* myA4988 = nullptr;
+
+void A4988Init(void)
+{
+  A4988_dir_pin = pin[GPIO_A4988_DIR];
+  A4988_stp_pin = pin[GPIO_A4988_STP];
+  A4988_ena_pin = pin[GPIO_A4988_ENA];
+  A4988_ms1_pin = pin[GPIO_A4988_MS1];
+  A4988_ms2_pin = pin[GPIO_A4988_MS2];
+  A4988_ms3_pin = pin[GPIO_A4988_MS3];
+  A4988_spr = 200;
+  A4988_rpm = 30;
+  A4988_mis = 1;
+
+  myA4988 = new A4988_Stepper( A4988_spr
+                            , A4988_rpm
+                            , A4988_mis
+                            , A4988_dir_pin
+                            , A4988_stp_pin
+                            , A4988_ena_pin
+                            , A4988_ms1_pin
+                            , A4988_ms2_pin
+                            , A4988_ms3_pin );
+}
+
+const char kA4988Commands[] PROGMEM = "Motor|"
+  "Move|Rotate|Turn|MIS|SPR|RPM";
+
+void (* const A4988Command[])(void) PROGMEM = {
+  &CmndDoMove,&CmndDoRotate,&CmndDoTurn,&CmndSetMIS,&CmndSetSPR,&CmndSetRPM};
+
+void CmndDoMove(void) {
+  if (XdrvMailbox.data_len > 0) {
+    long stepsPlease = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->doMove(stepsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndDoRotate(void) {
+  if (XdrvMailbox.data_len > 0) {
+    long degrsPlease = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->doRotate(degrsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndDoTurn(void) {
+  if (XdrvMailbox.data_len > 0) {
+    float turnsPlease = strtod(XdrvMailbox.data,nullptr);
+    myA4988->doTurn(turnsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetMIS(void) {
+  if ((pin[GPIO_A4988_MS1] < 99) && (pin[GPIO_A4988_MS2] < 99) && (pin[GPIO_A4988_MS3] < 99) && (XdrvMailbox.data_len > 0)) {
+    short newMIS = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setMIS(newMIS);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetSPR(void) {
+  if (XdrvMailbox.data_len > 0) {
+    int newSPR = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setSPR(newSPR);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetRPM(void) {
+  if (XdrvMailbox.data_len > 0) {
+    short newRPM = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setRPM(newRPM);
+    ResponseCmndDone();
+  }
+}
+
+
+
+
+bool Xdrv25(uint8_t function)
+{
+  bool result = false;
+  if ((pin[GPIO_A4988_DIR] < 99) && (pin[GPIO_A4988_STP] < 99)) {
+    switch (function) {
+      case FUNC_INIT:
+        A4988Init();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kA4988Commands, A4988Command);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
+#ifdef USE_LIGHT
+#ifdef USE_ARILUX_RF
+
+
+
+
+#define XDRV_26 26
+
+const uint32_t ARILUX_RF_TIME_AVOID_DUPLICATE = 1000;
+
+const uint8_t ARILUX_RF_MAX_CHANGES = 51;
+const uint32_t ARILUX_RF_SEPARATION_LIMIT = 4300;
+const uint32_t ARILUX_RF_RECEIVE_TOLERANCE = 60;
+
+struct ARILUX {
+  unsigned int rf_timings[ARILUX_RF_MAX_CHANGES];
+
+  unsigned long rf_received_value = 0;
+  unsigned long rf_last_received_value = 0;
+  unsigned long rf_last_time = 0;
+  unsigned long rf_lasttime = 0;
+
+  unsigned int rf_change_count = 0;
+  unsigned int rf_repeat_count = 0;
+
+  uint8_t rf_toggle = 0;
+} Arilux;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+#ifndef USE_WS2812_DMA
+void AriluxRfInterrupt(void) ICACHE_RAM_ATTR;
+#endif
+#endif
+
+void AriluxRfInterrupt(void)
+{
+  unsigned long time = micros();
+  unsigned int duration = time - Arilux.rf_lasttime;
+
+  if (duration > ARILUX_RF_SEPARATION_LIMIT) {
+    if (abs(duration - Arilux.rf_timings[0]) < 200) {
+      Arilux.rf_repeat_count++;
+      if (Arilux.rf_repeat_count == 2) {
+        unsigned long code = 0;
+        const unsigned int delay = Arilux.rf_timings[0] / 31;
+        const unsigned int delayTolerance = delay * ARILUX_RF_RECEIVE_TOLERANCE / 100;
+        for (unsigned int i = 1; i < Arilux.rf_change_count -1; i += 2) {
+          code <<= 1;
+          if (abs(Arilux.rf_timings[i] - (delay *3)) < delayTolerance && abs(Arilux.rf_timings[i +1] - delay) < delayTolerance) {
+            code |= 1;
+          }
+        }
+        if (Arilux.rf_change_count > 49) {
+          Arilux.rf_received_value = code;
+        }
+        Arilux.rf_repeat_count = 0;
+      }
+    }
+    Arilux.rf_change_count = 0;
+  }
+  if (Arilux.rf_change_count >= ARILUX_RF_MAX_CHANGES) {
+    Arilux.rf_change_count = 0;
+    Arilux.rf_repeat_count = 0;
+  }
+  Arilux.rf_timings[Arilux.rf_change_count++] = duration;
+  Arilux.rf_lasttime = time;
+}
+
+void AriluxRfHandler(void)
+{
+  unsigned long now = millis();
+  if (Arilux.rf_received_value && !((Arilux.rf_received_value == Arilux.rf_last_received_value) && (now - Arilux.rf_last_time < ARILUX_RF_TIME_AVOID_DUPLICATE))) {
+    Arilux.rf_last_received_value = Arilux.rf_received_value;
+    Arilux.rf_last_time = now;
+
+    uint16_t hostcode = Arilux.rf_received_value >> 8 & 0xFFFF;
+    if (Settings.rf_code[1][6] == Settings.rf_code[1][7]) {
+      Settings.rf_code[1][6] = hostcode >> 8 & 0xFF;
+      Settings.rf_code[1][7] = hostcode & 0xFF;
+    }
+    uint16_t stored_hostcode = Settings.rf_code[1][6] << 8 | Settings.rf_code[1][7];
+
+    DEBUG_DRIVER_LOG(PSTR(D_LOG_RFR D_HOST D_CODE " 0x%04X, " D_RECEIVED " 0x%06X"), stored_hostcode, Arilux.rf_received_value);
+
+    if (hostcode == stored_hostcode) {
+      char command[33];
+      char value = '-';
+      command[0] = '\0';
+      uint8_t keycode = Arilux.rf_received_value & 0xFF;
+      switch (keycode) {
+        case 1:
+        case 3:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_POWER " %d"), (1 == keycode) ? 1 : 0);
+          break;
+        case 2:
+          Arilux.rf_toggle++;
+          Arilux.rf_toggle &= 0x3;
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), 200 + Arilux.rf_toggle);
+          break;
+        case 4:
+          value = '+';
+        case 7:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_SPEED " %c"), value);
+          break;
+        case 5:
+          value = '+';
+        case 8:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_SCHEME " %c"), value);
+          break;
+        case 6:
+          value = '+';
+        case 9:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %c"), value);
+          break;
+        default: {
+          if ((keycode >= 10) && (keycode <= 21)) {
+            snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), keycode -9);
+          }
+        }
+      }
+      if (strlen(command)) {
+        ExecuteCommand(command, SRC_LIGHT);
+      }
+    }
+  }
+  Arilux.rf_received_value = 0;
+}
+
+void AriluxRfInit(void)
+{
+  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
+    if (Settings.last_module != Settings.module) {
+      Settings.rf_code[1][6] = 0;
+      Settings.rf_code[1][7] = 0;
+      Settings.last_module = Settings.module;
+    }
+    Arilux.rf_received_value = 0;
+
+    digitalWrite(pin[GPIO_ARIRFSEL], 0);
+    attachInterrupt(pin[GPIO_ARIRFRCV], AriluxRfInterrupt, CHANGE);
+  }
+}
+
+void AriluxRfDisable(void)
+{
+  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
+    detachInterrupt(pin[GPIO_ARIRFRCV]);
+    digitalWrite(pin[GPIO_ARIRFSEL], 1);
+  }
+}
+
+
+
+
+
+bool Xdrv26(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_50_MSECOND:
+      if (pin[GPIO_ARIRFRCV] < 99) { AriluxRfHandler(); }
+      break;
+    case FUNC_EVERY_SECOND:
+      if (10 == uptime) { AriluxRfInit(); }
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
+#ifdef USE_SHUTTER
+
+
+
+
+#define XDRV_27 27
+
+#define D_SHUTTER "SHUTTER"
+
+const uint16_t MOTOR_STOP_TIME = 500;
+const uint8_t steps_per_second = 20;
+
+uint8_t calibrate_pos[6] = {0,30,50,70,90,100};
+uint16_t messwerte[5] = {30,50,70,90,100};
+uint16_t last_execute_step;
+
+enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
+
+const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
+  D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION "|"
+  D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
+  D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
+  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME;
+
+void (* const ShutterCommand[])(void) PROGMEM = {
+  &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
+  &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
+  &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
+  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
+
+  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
+  const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
+
+#include <Ticker.h>
+
+Ticker TickerShutter;
+
+struct SHUTTER {
+  power_t mask = 0;
+  power_t old_power = 0;
+  power_t switched_relay = 0;
+  uint32_t time[MAX_SHUTTERS];
+  int32_t open_max[MAX_SHUTTERS];
+  int32_t target_position[MAX_SHUTTERS];
+  int32_t start_position[MAX_SHUTTERS];
+  int32_t real_position[MAX_SHUTTERS];
+  uint16_t open_time[MAX_SHUTTERS];
+  uint16_t close_time[MAX_SHUTTERS];
+  uint16_t close_velocity[MAX_SHUTTERS];
+  int8_t direction[MAX_SHUTTERS];
+  uint8_t mode = 0;
+  int16_t motordelay[MAX_SHUTTERS];
+  int16_t pwm_frequency;
+  uint16_t max_pwm_frequency = 1000;
+  uint16_t max_close_pwm_frequency[MAX_SHUTTERS];
+  uint8_t skip_relay_change;
+  int32_t accelerator[MAX_SHUTTERS];
+} Shutter;
+
+void ShutterLogPos(uint32_t i)
+{
+  char stemp2[10];
+  dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
+    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency);
+}
+
+void ShutterRtc50mS(void)
+{
+  for (uint32_t i = 0; i < shutters_present; i++) {
+    Shutter.time[i]++;
+    if (Shutter.accelerator[i]) {
+      Shutter.pwm_frequency += Shutter.accelerator[i];
+      Shutter.pwm_frequency = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency));
+      analogWriteFreq(Shutter.pwm_frequency);
+      analogWrite(pin[GPIO_PWM1+i], 50);
+    }
+  }
+}
+
+#define SHT_DIV_ROUND(__A,__B) (((__A) + (__B)/2) / (__B))
+
+int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
+{
+  if (0 == percent) return 0;
+  if (100 == percent) return Shutter.open_max[index];
+ if (Settings.shutter_set50percent[index] != 50) {
+    return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
+ } else {
+    uint32_t realpos;
+
+    for (uint32_t j = 0; j < 5; j++) {
+      if (0 == Settings.shuttercoeff[j][index]) {
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
+        for (uint32_t k = 0; k < 5; k++) {
+          Settings.shuttercoeff[k][index] = SHT_DIV_ROUND(calibrate_pos[k+1] * 1000, calibrate_pos[5]);
+        }
+      }
+    }
+    for (uint32_t i = 0; i < 5; i++) {
+      if ((percent * 10) >= Settings.shuttercoeff[i][index]) {
+        realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
+
+      } else {
+        if (0 == i) {
+          realpos = SHT_DIV_ROUND(SHT_DIV_ROUND(percent * Shutter.open_max[index] * calibrate_pos[i+1], Settings.shuttercoeff[i][index]), 10);
+        } else {
+
+
+          realpos += SHT_DIV_ROUND(SHT_DIV_ROUND((percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]), Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), 100);
+        }
+        break;
+      }
+    }
+  return realpos;
+ }
+}
+
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
+{
+  if (0 >= realpos) return 0;
+  if (Shutter.open_max[index] <= realpos) return 100;
+ if (Settings.shutter_set50percent[index] != 50) {
+  return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
+ } else {
+    uint16_t realpercent;
+
+    for (uint32_t i = 0; i < 5; i++) {
+      if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
+        realpercent = SHT_DIV_ROUND(Settings.shuttercoeff[i][index], 10);
+
+      } else {
+        if (0 == i) {
+          realpercent = SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * Settings.shuttercoeff[i][index], calibrate_pos[i+1]), Shutter.open_max[index]);
+        } else {
+
+
+
+          realpercent += SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), (calibrate_pos[i+1] - calibrate_pos[i])), Shutter.open_max[index]) ;
+        }
+        break;
+      }
+    }
+    return realpercent;
+  }
+}
+
+void ShutterInit(void)
+{
+  shutters_present = 0;
+  Shutter.mask = 0;
+
+  Shutter.old_power = power;
+  bool relay_in_interlock = false;
+
+
+  if (Settings.shutter_startrelay[MAX_SHUTTERS] == 0) {
+     Shutter.max_pwm_frequency = Settings.shuttercoeff[4][3] > 0 ? Settings.shuttercoeff[4][3] : Shutter.max_pwm_frequency;
+  }
+  for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+
+    Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i == 0? 1 : Settings.shutter_startrelay[i]);
+    if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
+      shutters_present++;
+
+
+      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1) ;
+
+      for (uint32_t j = 0; j < MAX_INTERLOCKS * Settings.flag.interlock; j++) {
+
+        if (Settings.interlock[j] && (Settings.interlock[j] & Shutter.mask)) {
+
+          relay_in_interlock = true;
+        }
+      }
+      if (relay_in_interlock) {
+        if (Settings.pulse_timer[i] > 0) {
+          Shutter.mode = SHT_PULSE_OPEN__PULSE_CLOSE;
+        } else {
+          Shutter.mode = SHT_OFF_OPEN__OFF_CLOSE;
+        }
+      } else {
+        Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
+        if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
+          Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
+          Shutter.pwm_frequency = 0;
+          analogWriteFreq(Shutter.pwm_frequency);
+          analogWrite(pin[GPIO_PWM1+i], 50);
+        }
+      }
+
+      TickerShutter.attach_ms(50, ShutterRtc50mS );
+
+      Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] > 0) ? Settings.shutter_set50percent[i] : 50;
+
+
+      Shutter.open_time[i] = (Settings.shutter_opentime[i] > 0) ? Settings.shutter_opentime[i] : 100;
+      Shutter.close_time[i] = (Settings.shutter_closetime[i] > 0) ? Settings.shutter_closetime[i] : 100;
+
+
+      Shutter.open_max[i] = 200 * Shutter.open_time[i];
+      Shutter.close_velocity[i] = Shutter.open_max[i] / Shutter.close_time[i] / 2 ;
+      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i] / Shutter.close_time[i];
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d Closefreq: %d"),i, Shutter.max_close_pwm_frequency[i]);
+
+
+      if (Settings.shutter_set50percent[i] != 50) {
+       Settings.shuttercoeff[1][i] = Shutter.open_max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
+       Settings.shuttercoeff[0][i] = Shutter.open_max[i] - (Settings.shuttercoeff[1][i] * 100);
+       Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
+      }
+      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1);
+
+      Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
+
+      Shutter.start_position[i] = Shutter.target_position[i] = Shutter.real_position[i];
+      Shutter.motordelay[i] = Settings.shutter_motordelay[i];
+
+      char shutter_open_chr[10];
+      dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
+      char shutter_close_chr[10];
+      dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, end stop time enabled %d, shuttermode %d, motordelay %d"),
+        i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
+        Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
+        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, (Settings.shutter_options[i]&4) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
+
+    } else {
+
+      break;
+    }
+    ShutterLimitRealAndTargetPositions(i);
+    Settings.shutter_accuracy = 1;
+  }
+}
+
+void ShutterReportPosition(bool always)
+{
+  uint32_t shutter_moving = 0;
+  Response_P(PSTR("{"));
+  for (uint32_t i = 0; i < shutters_present; i++) {
+
+    uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
+    if (Shutter.direction[i] != 0) {
+      shutter_moving = 1;
+      ShutterLogPos(i);
+    }
+    if (i) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i]);
+  }
+  ResponseJsonEnd();
+  if (always || (1 == shutter_moving)) {
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+  }
+  if (rules_flag.shutter_moving > shutter_moving) {
+    rules_flag.shutter_moved = 1;
+  } else {
+    rules_flag.shutter_moved = 0;
+  }
+  rules_flag.shutter_moving = shutter_moving;
+
+}
+
+void ShutterLimitRealAndTargetPositions(uint32_t i) {
+  if (Shutter.real_position[i]<0) Shutter.real_position[i] = 0;
+  if (Shutter.real_position[i]>Shutter.open_max[i]) Shutter.real_position[i] = Shutter.open_max[i];
+  if (Shutter.target_position[i]<0) Shutter.target_position[i] = 0;
+  if (Shutter.target_position[i]>Shutter.open_max[i]) Shutter.target_position[i] = Shutter.open_max[i];
+}
+
+void ShutterUpdatePosition(void)
+{
+
+  char scommand[CMDSZ];
+  char stopic[TOPSZ];
+
+  for (uint32_t i = 0; i < shutters_present; i++) {
+    if (Shutter.direction[i] != 0) {
+      int32_t stop_position_delta = 20;
+      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+
+
+        Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+
+        int32_t max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
+        int32_t max_freq_change_per_sec = Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
+        int32_t min_runtime_ms = Shutter.pwm_frequency*1000 / max_freq_change_per_sec;
+        int32_t velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
+        int32_t minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency / max_frequency * Shutter.direction[i] ;
+
+        int32_t next_possible_stop = Shutter.real_position[i] + minstopway ;
+        stop_position_delta =200 * Shutter.pwm_frequency/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+
+
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
+                                      Shutter.pwm_frequency,max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
+
+        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
+
+            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop) ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
+
+        } else if ( Shutter.accelerator[i] > 0 && Shutter.pwm_frequency == max_frequency) {
+          Shutter.accelerator[i] = 0;
+        }
+      } else {
+        Shutter.real_position[i] = Shutter.start_position[i] + ( (Shutter.time[i] - Shutter.motordelay[i]) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
+      }
+      if ( Shutter.real_position[i] * Shutter.direction[i] + stop_position_delta >= Shutter.target_position[i] * Shutter.direction[i] ) {
+
+
+        uint8_t cur_relay = Settings.shutter_startrelay[i] + (Shutter.direction[i] == 1 ? 0 : 1) ;
+        int16_t missing_steps;
+
+        switch (Shutter.mode) {
+          case SHT_PULSE_OPEN__PULSE_CLOSE:
+
+            if (SRC_PULSETIMER == last_source || SRC_SHUTTER == last_source || SRC_WEBGUI == last_source) {
+              ExecuteCommandPower(cur_relay, 1, SRC_SHUTTER);
+            } else {
+              last_source = SRC_SHUTTER;
+            }
+          break;
+          case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
+            missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
+
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency);
+            Shutter.accelerator[i] = 0;
+            Shutter.pwm_frequency = Shutter.pwm_frequency > 250 ? 250 : Shutter.pwm_frequency;
+            analogWriteFreq(Shutter.pwm_frequency);
+            analogWrite(pin[GPIO_PWM1+i], 50);
+            Shutter.pwm_frequency = 0;
+            analogWriteFreq(Shutter.pwm_frequency);
+            while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
+              delay(1);
+            }
+            analogWrite(pin[GPIO_PWM1+i], 0);
+            Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
+
+            if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
+              ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+              ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
+            }
+          break;
+          case SHT_OFF_ON__OPEN_CLOSE:
+          if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
+            ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+            ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
+          }
+          break;
+          case SHT_OFF_OPEN__OFF_CLOSE:
+
+            if ((1 << (cur_relay-1)) & power) {
+
+              ExecuteCommandPower(cur_relay, 0, SRC_SHUTTER);
+            }
+          break;
+        }
+        ShutterLimitRealAndTargetPositions(i);
+        Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
+
+        ShutterLogPos(i);
+
+        Shutter.start_position[i] = Shutter.real_position[i];
+
+
+        snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i+1);
+        GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+        Response_P("%d", (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
+        MqttPublish(stopic, Settings.flag.mqtt_power_retain);
+
+        Shutter.direction[i] = 0;
+        ShutterReportPosition(true);
+        XdrvRulesProcess();
+      }
+    }
+  }
+}
+
+bool ShutterState(uint32_t device)
+{
+  device--;
+  device &= 3;
+  return (Settings.flag3.shutter_mode &&
+          (Shutter.mask & (1 << (Settings.shutter_startrelay[device]-1))) );
+}
+
+void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
+{
+
+  if ( ( (1 == direction) && ((Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2) )
+     || ( (-1 == direction) && (Shutter.real_position[i] / Shutter.close_velocity[i] <= 2)) ) {
+    Shutter.skip_relay_change = 1;
+  } else {
+    if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+      Shutter.pwm_frequency = 0;
+      analogWriteFreq(Shutter.pwm_frequency);
+      analogWrite(pin[GPIO_PWM1+i], 0);
+
+      if (pin[GPIO_CNTR1+i] < 99) {
+        RtcSettings.pulse_counter[i] = 0;
+      }
+      Shutter.accelerator[i] = Shutter.max_pwm_frequency / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Ramp up: %d"), Shutter.accelerator[i]);
+    }
+    Shutter.target_position[i] = target_pos;
+    Shutter.start_position[i] = Shutter.real_position[i];
+    Shutter.time[i] = 0;
+    Shutter.skip_relay_change = 0;
+    Shutter.direction[i] = direction;
+
+  }
+
+}
+
+void ShutterWaitForMotorStop(uint32_t i)
+{
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
+  if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+    if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
+
+      while (Shutter.pwm_frequency > 0) {
+        Shutter.accelerator[i] = 0;
+        Shutter.pwm_frequency = tmax(Shutter.pwm_frequency-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
+        analogWriteFreq(Shutter.pwm_frequency);
+        analogWrite(pin[GPIO_PWM1+i], 50);
+        delay(50);
+      }
+      analogWrite(pin[GPIO_PWM1+i], 0);
+      Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+    } else {
+      ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+      delay(MOTOR_STOP_TIME);
+    }
+  } else {
+    delay(MOTOR_STOP_TIME);
+  }
+}
+
+int32_t ShutterCounterBasedPosition(uint32_t i)
+{
+  return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
+}
+
+void ShutterRelayChanged(void)
+{
+
+
+
+
+  char stemp1[10];
+
+ for (uint32_t i = 0; i < shutters_present; i++) {
+  power_t powerstate_local = (power >> (Settings.shutter_startrelay[i] -1)) & 3;
+
+    uint8 manual_relays_changed = ((Shutter.switched_relay >> (Settings.shutter_startrelay[i] -1)) & 3) && SRC_SHUTTER != last_source && SRC_PULSETIMER != last_source ;
+
+    if (manual_relays_changed) {
+
+      ShutterLimitRealAndTargetPositions(i);
+      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+        ShutterWaitForMotorStop(i);
+    switch (powerstate_local) {
+     case 1:
+            ShutterStartInit(i, 1, Shutter.open_max[i]);
+       break;
+     case 3:
+       ShutterStartInit(i, -1, 0);
+       break;
+     default:
+
+       Shutter.target_position[i] = Shutter.real_position[i];
+      }
+   } else {
+        if (Shutter.direction[i] != 0 && (!powerstate_local || (powerstate_local && Shutter.mode == SHT_PULSE_OPEN__PULSE_CLOSE))) {
+     Shutter.target_position[i] = Shutter.real_position[i];
+     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Switch OFF motor. Target: %ld, source: %s, powerstate_local %ld, Shutter.switched_relay %d, manual change %d"), i+1, Shutter.target_position[i], GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), powerstate_local,Shutter.switched_relay,manual_relays_changed);
+    } else {
+     last_source = SRC_SHUTTER;
+     if (powerstate_local == 2) {
+
+            ShutterWaitForMotorStop(i);
+       ShutterStartInit(i, -1, 0);
+     } else {
+
+            ShutterWaitForMotorStop(i);
+       ShutterStartInit(i, 1, Shutter.open_max[i]);
+     }
+    }
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Target: %ld, powerstatelocal %d"), i+1, Shutter.target_position[i], powerstate_local);
+   }
+  }
+ }
+}
+
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
+
+  uint32 min_shutterbutton_hold_timer = -1;
+  for (uint32_t i = 0; i < MAX_KEYS; i++) {
+    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
+      min_shutterbutton_hold_timer = Button.hold_timer[i];
+  }
+  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
+}
+
+void ShutterButtonHandler(void)
+{
+  uint8_t buttonState = SHT_NOT_PRESSED;
+  uint8_t button = XdrvMailbox.payload;
+  uint8_t press_index;
+  uint32_t button_index = XdrvMailbox.index;
+  uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
+
+  uint16_t loops_per_second = 1000 / Settings.button_debounce;
+
+  if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+    if (Settings.flag.button_single) {
+        buttonState = SHT_PRESSED_MULTI;
+        press_index = 1;
+    } else {
+      if ((Shutter.direction[shutter_index]) && (Button.press_counter[button_index]==0)) {
+        buttonState = SHT_PRESSED_IMMEDIATE;
+        press_index = 1;
+        Button.press_counter[button_index] = 99;
+      } else
+        Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+      Button.window_timer[button_index] = loops_per_second / 2;
+    }
+    blinks = 201;
+  }
+
+  if (NOT_PRESSED == button) {
+    Button.hold_timer[button_index] = 0;
+  } else {
+    Button.hold_timer[button_index]++;
+    if (!Settings.flag.button_single) {
+      if (Settings.param[P_HOLD_IGNORE] > 0) {
+        if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+          Button.hold_timer[button_index] = 0;
+          Button.press_counter[button_index] = 0;
+        }
+      }
+      if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {
+
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
+
+          for (uint32_t i = 0; i < MAX_KEYS; i++)
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
+              Button.press_counter[i] = 99;
+          press_index = 0;
+          buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
+        }
+        if (Button.press_counter[button_index]<99) {
+          press_index = 0;
+          buttonState = SHT_PRESSED_HOLD;
+        }
+        Button.press_counter[button_index] = 0;
+      }
+      if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {
+
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
+
+          press_index = 0;
+          buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
+        }
+      }
+    }
+  }
+
+  if (!Settings.flag.button_single) {
+    if (Button.window_timer[button_index]) {
+      Button.window_timer[button_index]--;
+    } else {
+      if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
+        if (Button.press_counter[button_index]<99) {
+
+          uint32 min_shutterbutton_press_counter = -1;
+          for (uint32_t i = 0; i < MAX_KEYS; i++) {
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+              min_shutterbutton_press_counter = Button.press_counter[i];
+          }
+          if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
+
+            press_index = Button.press_counter[button_index];
+            for (uint32_t i = 0; i < MAX_KEYS; i++)
+              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
+                Button.press_counter[i] = 99;
+            buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
+          }
+          if ((buttonState != SHT_PRESSED_MULTI_SIMULTANEOUS) && (Button.press_counter[button_index]<99)) {
+
+            press_index = Button.press_counter[button_index];
+            buttonState = SHT_PRESSED_MULTI;
+          }
+        }
+        Button.press_counter[button_index] = 0;
+      }
+    }
+  }
+
+ if (buttonState != SHT_NOT_PRESSED) {
+   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
+     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) {
+
+       char scmnd[20];
+       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
+
+     if (!Settings.flag.button_restrict) {
+       char scmnd[20];
+       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
+      if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
+        uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
+        if (pos_press_index>3) pos_press_index=3;
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, pos_press_index+1);
+        XdrvMailbox.index = shutter_index +1;
+        last_source = SRC_BUTTON;
+        XdrvMailbox.data_len = 0;
+        char databuf[1] = "";
+        XdrvMailbox.data = databuf;
+        XdrvMailbox.command = NULL;
+        if (buttonState == SHT_PRESSED_IMMEDIATE) {
+          XdrvMailbox.payload = XdrvMailbox.index;
+          CmndShutterStop();
+        }
+        else {
+          uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
+          if (position) {
+            if (Shutter.direction[shutter_index]) {
+              XdrvMailbox.payload = XdrvMailbox.index;
+              CmndShutterStop();
+            } else {
+              XdrvMailbox.payload = position = (position-1)<<1;
+              CmndShutterPosition();
+              if (Settings.shutter_button[button_index] & ((0x01<<26)<<pos_press_index)) {
+
+                char scommand[CMDSZ];
+                char stopic[TOPSZ];
+                for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+                  if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
+                    snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
+                    GetGroupTopic_P(stopic, scommand);
+                    Response_P("%d", position);
+                    MqttPublish(stopic, false);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    Response_P(PSTR("{"));
+    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
+  }
+}
+
+void ShutterSetPosition(uint32_t device, uint32_t position)
+{
+  char svalue[32];
+  snprintf_P(svalue, sizeof(svalue), PSTR(D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION "%d %d"), device, position);
+  ExecuteCommand(svalue, SRC_IGNORE);
+}
+
+
+
+
+
+void CmndShutterOpen(void)
+{
+
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+    XdrvMailbox.index = XdrvMailbox.payload;
+  }
+  XdrvMailbox.payload = 100;
+  last_source = SRC_WEBGUI;
+  CmndShutterPosition();
+}
+
+void CmndShutterClose(void)
+{
+
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+    XdrvMailbox.index = XdrvMailbox.payload;
+  }
+  XdrvMailbox.payload = 0;
+  XdrvMailbox.data_len = 0;
+  last_source = SRC_WEBGUI;
+  CmndShutterPosition();
+}
+
+void CmndShutterStop(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+        XdrvMailbox.index = XdrvMailbox.payload;
+      }
+      uint32_t i = XdrvMailbox.index -1;
+      if (Shutter.direction[i] != 0) {
+
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
+
+        int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
+        XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
+
+        last_source = SRC_WEBGUI;
+        CmndShutterPosition();
+      } else {
+        if (XdrvMailbox.command)
+          ResponseCmndDone();
+      }
+    } else {
+      if (XdrvMailbox.command)
+        ResponseCmndIdxChar("Locked");
+    }
+  }
+}
+
+void CmndShutterPosition(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      uint32_t index = XdrvMailbox.index-1;
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
+
+
+      if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
+
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
+          CmndShutterOpen();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
+          CmndShutterClose();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
+          XdrvMailbox.payload = -99;
+          CmndShutterStop();
+          return;
+        }
+      }
+
+      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
+
+      target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
+      if (XdrvMailbox.payload != -99) {
+
+        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
+        Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
+
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
+      }
+      if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
+        if (Settings.shutter_options[index] & 4) {
+          if (0 == target_pos_percent) Shutter.target_position[index] -= 1 * 2000;
+          if (100 == target_pos_percent) Shutter.target_position[index] += 1 * 2000;
+        }
+        int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
+        if (Shutter.direction[index] == -new_shutterdirection) {
+
+          if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
+
+            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
+            delay(100);
+          } else {
+            if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
+              ShutterWaitForMotorStop(index);
+            }
+          }
+        }
+        if (Shutter.direction[index] != new_shutterdirection) {
+          if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+
+            ShutterWaitForMotorStop(index);
+            ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            if (Shutter.skip_relay_change == 0) {
+
+              ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
+
+              ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
+            }
+          } else {
+
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            if (Shutter.skip_relay_change == 0) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+            }
+
+          }
+          Shutter.switched_relay = 0;
+        }
+      } else {
+        target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
+        ShutterReportPosition(true);
+      }
+      XdrvMailbox.index = index +1;
+      if (XdrvMailbox.command)
+        ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
+    } else {
+      ShutterReportPosition(true);
+      if (XdrvMailbox.command)
+        ResponseCmndIdxChar("Locked");
+    }
+  }
+}
+
+void CmndShutterOpenTime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_opentime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_opentime[XdrvMailbox.index -1]) / 10, 1, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterCloseTime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_closetime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_closetime[XdrvMailbox.index -1]) / 10, 1, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterMotorDelay(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_motordelay[XdrvMailbox.index -1] = (uint16_t)(steps_per_second * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_motordelay[XdrvMailbox.index -1]) / steps_per_second, 2, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterRelay(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 64)) {
+      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      if (XdrvMailbox.payload > 0) {
+        Shutter.mask |= 3 << (XdrvMailbox.payload - 1);
+      } else {
+        Shutter.mask ^= 3 << (Settings.shutter_startrelay[XdrvMailbox.index -1] - 1);
+      }
+      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      ShutterInit();
+
+    }
+    ResponseCmndIdxNumber(Settings.shutter_startrelay[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndShutterButton(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
+    uint32_t setting = 0;
+# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
+    if (XdrvMailbox.data_len > 0) {
+        uint32_t i = 0;
+        uint32_t button_index = 0;
+        bool done = false;
+        bool isShortCommand = false;
+        char *str_ptr;
+
+        char data_copy[strlen(XdrvMailbox.data) +1];
+        strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
+
+        for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
+          int field;
+          if (str[0] == '-') {
+            field = -1;
+          } else {
+            field = atoi(str);
+          }
+          switch (i) {
+            case 0:
+              if ((field >= -1) && (field<=4)) {
+                button_index = (field<=0)?(-1):field;
+                done = (button_index==-1);
+              } else
+                done = true;
+            break;
+            case 1:
+              if (!strcmp_P(str, PSTR("up"))) {
+                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20);
+                isShortCommand = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("down"))) {
+                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20);
+                isShortCommand = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("updown"))) {
+                setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
+                isShortCommand = true;
+                break;
+              }
+            case 2:
+              if (isShortCommand) {
+                if ((field==1) && (setting & (0x3F<<(2+6*3))))
+
+                  setting |= (0x3<<29);
+                done = true;
+                break;
+              }
+            case 3:
+            case 4:
+              if ((field >= -1) && (field<=100))
+                setting |= (((field>>1)+1)<<(i*6 + (2-6)));
+            break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+              if (field==1)
+                setting |= (1<<(i + (26-5)));
+            break;
+          }
+          if (done) break;
+        }
+
+        if (button_index) {
+          if (button_index==-1) {
+
+            for (uint32_t i=0 ; i < MAX_KEYS ; i++)
+              if ((Settings.shutter_button[i]&0x3) == (XdrvMailbox.index-1))
+                Settings.shutter_button[i] = 0;
+          } else {
+            if (setting) {
+
+              setting |= (1<<31);
+              setting |= (XdrvMailbox.index-1) & 0x3;
+            }
+            Settings.shutter_button[button_index-1] = setting;
+          }
+        }
+      }
+      char setting_chr[30*MAX_KEYS] = "-", *setting_chr_ptr = setting_chr;
+      for (uint32_t i=0 ; i < MAX_KEYS ; i++) {
+        setting = Settings.shutter_button[i];
+        if ((setting&(1<<31)) && ((setting&0x3) == (XdrvMailbox.index-1))) {
+          if (*setting_chr_ptr == 0)
+            setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|"));
+          setting_chr_ptr += snprintf_P(setting_chr_ptr, 2, PSTR("%d"), i+1);
+
+          for (uint32_t j=0 ; j < 4 ; j++) {
+            int8_t pos = (((setting>> (2+6*j))&(0x3f))-1)<<1;
+            if (pos>=0)
+              setting_chr_ptr += snprintf_P(setting_chr_ptr, 5, PSTR(" %d"), pos);
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+          for (uint32_t j=0 ; j < 5 ; j++) {
+            bool mqtt = ((setting>>(26+j))&(0x01)!=0);
+            if (mqtt)
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" 1"));
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+        }
+      }
+      ResponseCmndIdxChar(setting_chr);
+   }
+}
+
+void CmndShutterSetHalfway(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      Settings.shutter_set50percent[XdrvMailbox.index -1] = (Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
+      ShutterInit();
+    }
+  ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndShutterFrequency(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) {
+    Shutter.max_pwm_frequency = XdrvMailbox.payload;
+    if (shutters_present < 4) {
+      Settings.shuttercoeff[4][3] = Shutter.max_pwm_frequency;
+    }
+    ShutterInit();
+    ResponseCmndNumber(XdrvMailbox.payload);
+  } else {
+    ResponseCmndNumber(Shutter.max_pwm_frequency);
+  }
+}
+
+void CmndShutterSetClose(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    Shutter.real_position[XdrvMailbox.index -1] = 0;
+    ShutterStartInit(XdrvMailbox.index -1, 0, 0);
+    Settings.shutter_position[XdrvMailbox.index -1] = 0;
+    ResponseCmndIdxChar(D_CONFIGURATION_RESET);
+  }
+}
+
+void CmndShutterInvert(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(1);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (1);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 1 : 0);
+  }
+}
+
+void CmndShutterCalibration(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      uint32_t i = 0;
+      char *str_ptr;
+
+      char data_copy[strlen(XdrvMailbox.data) +1];
+      strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
+
+      for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
+        int field = atoi(str);
+
+
+        if ((field <= 0) || (field > 30000) || ( (i>0) && (field <= messwerte[i-1]) ) ) {
+          break;
+        }
+        messwerte[i] = field;
+      }
+      for (i = 0; i < 5; i++) {
+        Settings.shuttercoeff[i][XdrvMailbox.index -1] = SHT_DIV_ROUND((uint32_t)messwerte[i] * 1000, messwerte[4]);
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
+      }
+      ShutterInit();
+      ResponseCmndIdxChar(XdrvMailbox.data);
+    } else {
+      char setting_chr[30] = "0";
+      snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);
+      ResponseCmndIdxChar(setting_chr);
+    }
+  }
+}
+
+void CmndShutterLock(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(2);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (2);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 2) ? 1 : 0);
+  }
+}
+
+void CmndShutterEnableEndStopTime(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(4);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (4);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 4) ? 1 : 0);
+  }
+}
+
+
+
+
+
+bool Xdrv27(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag3.shutter_mode) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        ShutterInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        ShutterUpdatePosition();
+        break;
+      case FUNC_EVERY_SECOND:
+
+        ShutterReportPosition(false);
+        break;
+
+      case FUNC_COMMAND:
+        result = DecodeCommand(kShutterCommands, ShutterCommand);
+        break;
+      case FUNC_JSON_APPEND:
+        for (uint8_t i = 0; i < shutters_present; i++) {
+          uint8_t position = (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
+          ResponseAppend_P(",");
+          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
+#ifdef USE_DOMOTICZ
+          if ((0 == tele_period) && (0 == i)) {
+             DomoticzSensor(DZ_SHUTTER, position);
+          }
+#endif
+        }
+        break;
+      case FUNC_SET_POWER:
+        char stemp1[10];
+
+        Shutter.switched_relay = XdrvMailbox.index ^ Shutter.old_power;
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Switched relay: %d by %s"), Shutter.switched_relay,GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource));
+        ShutterRelayChanged();
+        Shutter.old_power = XdrvMailbox.index;
+      break;
+      case FUNC_SET_DEVICE_POWER:
+        if (Shutter.skip_relay_change ) {
+          uint8_t i;
+          for (i = 0; i < devices_present; i++) {
+            if (Shutter.switched_relay &1) {
+              break;
+            }
+            Shutter.switched_relay >>= 1;
+          }
+
+          result = true;
+          Shutter.skip_relay_change = 0;
+          AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Skipping switch off relay %d"),i);
+          ExecuteCommandPower(i+1, 0, SRC_SHUTTER);
+        }
+      break;
+      case FUNC_BUTTON_PRESSED:
+        if (Settings.shutter_button[XdrvMailbox.index] & (1<<31)) {
+          ShutterButtonHandler();
+          result = true;
+        }
+      break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_28_pcf8574.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_28_pcf8574.ino"
+#ifdef USE_I2C
+#ifdef USE_PCF8574
+
+
+
+
+
+
+
+#define XDRV_28 28
+#define XI2C_02 2
+
+#define PCF8574_ADDR1 0x20
+#define PCF8574_ADDR2 0x38
+
+struct PCF8574 {
+  int error;
+  uint8_t pin[64];
+  uint8_t address[MAX_PCF8574];
+  uint8_t pin_mask[MAX_PCF8574] = { 0 };
+  uint8_t max_connected_ports = 0;
+  uint8_t max_devices = 0;
+  char stype[9];
+  bool type = false;
+} Pcf8574;
+
+void Pcf8574SwitchRelay(void)
+{
+  for (uint32_t i = 0; i < devices_present; i++) {
+    uint8_t relay_state = bitRead(XdrvMailbox.index, i);
+
+
+
+    if (Pcf8574.max_devices > 0 && Pcf8574.pin[i] < 99) {
+      uint8_t board = Pcf8574.pin[i]>>3;
+      uint8_t oldpinmask = Pcf8574.pin_mask[board];
+      uint8_t _val = bitRead(rel_inverted, i) ? !relay_state : relay_state;
+
+
+
+      if (_val) {
+        Pcf8574.pin_mask[board] |= _val << (Pcf8574.pin[i]&0x7);
+      } else {
+        Pcf8574.pin_mask[board] &= ~(1 << (Pcf8574.pin[i]&0x7));
+      }
+      if (oldpinmask != Pcf8574.pin_mask[board]) {
+        Wire.beginTransmission(Pcf8574.address[board]);
+        Wire.write(Pcf8574.pin_mask[board]);
+        Pcf8574.error = Wire.endTransmission();
+      }
+
+    }
+  }
+}
+
+void Pcf8574Init(void)
+{
+  uint8_t pcf8574_address = PCF8574_ADDR1;
+  while ((Pcf8574.max_devices < MAX_PCF8574) && (pcf8574_address < PCF8574_ADDR2 +8)) {
+
+
+
+    if (I2cSetDevice(pcf8574_address)) {
+      Pcf8574.type = true;
+
+      Pcf8574.address[Pcf8574.max_devices] = pcf8574_address;
+      Pcf8574.max_devices++;
+
+      strcpy(Pcf8574.stype, "PCF8574");
+      if (pcf8574_address >= PCF8574_ADDR2) {
+        strcpy(Pcf8574.stype, "PCF8574A");
+      }
+      I2cSetActiveFound(pcf8574_address, Pcf8574.stype);
+    }
+
+    pcf8574_address++;
+#ifdef USE_MCP230xx_ADDR
+    if (USE_MCP230xx_ADDR == pcf8574_address) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
+      pcf8574_address++;
+    }
+#endif
+    if ((PCF8574_ADDR1 +7) == pcf8574_address) {
+      pcf8574_address = PCF8574_ADDR2 +1;
+    }
+  }
+  if (Pcf8574.type) {
+    for (uint32_t i = 0; i < sizeof(Pcf8574.pin); i++) {
+      Pcf8574.pin[i] = 99;
+    }
+    devices_present = devices_present - Pcf8574.max_connected_ports;
+    Pcf8574.max_connected_ports = 0;
+    for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PCF: Device %d config 0x%02x"), idx +1, Settings.pcf8574_config[idx]);
+
+      for (uint32_t i = 0; i < 8; i++) {
+        uint8_t _result = Settings.pcf8574_config[idx] >> i &1;
+
+        if (_result > 0) {
+          Pcf8574.pin[devices_present] = i + 8 * idx;
+          bitWrite(rel_inverted, devices_present, Settings.flag3.pcf8574_ports_inverted);
+          devices_present++;
+          Pcf8574.max_connected_ports++;
+        }
+      }
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Total devices %d, PCF8574 output ports %d"), Pcf8574.max_devices, Pcf8574.max_connected_ports);
+  }
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_PCF8574 "pcf"
+
+const char HTTP_BTN_MENU_PCF8574[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_PCF8574 "' method='get'><button>" D_CONFIGURE_PCF8574 "</button></form></p>";
+
+const char HTTP_FORM_I2C_PCF8574_1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_PCF8574_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='" WEB_HANDLE_PCF8574 "'>"
+  "<p><input id='b1' name='b1' type='checkbox'%s><b>" D_INVERT_PORTS "</b></p><hr/>";
+
+const char HTTP_FORM_I2C_PCF8574_2[] PROGMEM =
+  "<tr><td><b>" D_DEVICE " %d " D_PORT " %d</b></td><td style='width:100px'><select id='i2cs%d' name='i2cs%d'>"
+  "<option%s value='0'>" D_DEVICE_INPUT "</option>"
+  "<option%s value='1'>" D_DEVICE_OUTPUT "</option>"
+  "</select></td></tr>";
+
+void HandlePcf8574(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_CONFIGURE_PCF8574));
+
+  if (WebServer->hasArg("save")) {
+    Pcf8574SaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  WSContentStart_P(D_CONFIGURE_PCF8574);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_I2C_PCF8574_1, (Settings.flag3.pcf8574_ports_inverted) ? " checked" : "");
+  WSContentSend_P(HTTP_TABLE100);
+  for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
+    for (uint32_t idx2 = 0; idx2 < 8; idx2++) {
+      uint8_t helper = 1 << idx2;
+      WSContentSend_P(HTTP_FORM_I2C_PCF8574_2,
+        idx +1, idx2,
+        idx2 + 8*idx,
+        idx2 + 8*idx,
+        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 0) ? " selected " : " ",
+        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 1) ? " selected " : " "
+      );
+    }
+  }
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void Pcf8574SaveSettings(void)
+{
+  char stemp[7];
+  char tmp[100];
+
+
+
+  Settings.flag3.pcf8574_ports_inverted = WebServer->hasArg("b1");
+  for (byte idx = 0; idx < Pcf8574.max_devices; idx++) {
+    byte count=0;
+    byte n = Settings.pcf8574_config[idx];
+    while(n!=0) {
+      n = n&(n-1);
+      count++;
+    }
+    if (count <= devices_present) {
+      devices_present = devices_present - count;
+    }
+    for (byte i = 0; i < 8; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("i2cs%d"), i+8*idx);
+      WebGetArg(stemp, tmp, sizeof(tmp));
+      byte _value = (!strlen(tmp)) ? 0 : atoi(tmp);
+      if (_value) {
+        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] | 1 << i;
+        devices_present++;
+        Pcf8574.max_connected_ports++;
+      } else {
+        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] & ~(1 << i );
+      }
+    }
+
+
+
+  }
+}
+#endif
+
+
+
+
+
+bool Xdrv28(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_02)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_PRE_INIT == function) {
+    Pcf8574Init();
+  }
+  else if (Pcf8574.type) {
+    switch (function) {
+      case FUNC_SET_POWER:
+        Pcf8574SwitchRelay();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_PCF8574);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_PCF8574, HandlePcf8574);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+#ifdef USE_DEEPSLEEP
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+#define XDRV_29 29
+
+#define D_PRFX_DEEPSLEEP "DeepSleep"
+#define D_CMND_DEEPSLEEP_TIME "Time"
+
+const uint32_t DEEPSLEEP_MAX = 10 * 366 * 24 * 60 * 60;
+const uint32_t DEEPSLEEP_MAX_CYCLE = 60 * 60;
+const uint32_t DEEPSLEEP_MIN_TIME = 5;
+const uint32_t DEEPSLEEP_START_COUNTDOWN = 4;
+
+const char kDeepsleepCommands[] PROGMEM = D_PRFX_DEEPSLEEP "|"
+  D_CMND_DEEPSLEEP_TIME ;
+
+void (* const DeepsleepCommand[])(void) PROGMEM = {
+  &CmndDeepsleepTime };
+
+uint32_t deepsleep_sleeptime = 0;
+uint8_t deepsleep_flag = 0;
+
+bool DeepSleepEnabled(void)
+{
+  if ((Settings.deepsleep < 10) || (Settings.deepsleep > DEEPSLEEP_MAX)) {
+    Settings.deepsleep = 0;
+    return false;
+  }
+
+  if (pin[GPIO_DEEPSLEEP] < 99) {
+    pinMode(pin[GPIO_DEEPSLEEP], INPUT_PULLUP);
+    return (digitalRead(pin[GPIO_DEEPSLEEP]));
+  }
+
+  return true;
+}
+
+void DeepSleepReInit(void)
+{
+  if ((ResetReason() == REASON_DEEP_SLEEP_AWAKE) && DeepSleepEnabled()) {
+    if ((RtcSettings.ultradeepsleep > DEEPSLEEP_MAX_CYCLE) && (RtcSettings.ultradeepsleep < 1700000000)) {
+
+      RtcSettings.ultradeepsleep = RtcSettings.ultradeepsleep - DEEPSLEEP_MAX_CYCLE;
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Remain DeepSleep %d"), RtcSettings.ultradeepsleep);
+      RtcSettingsSave();
+      RtcRebootReset();
+      ESP.deepSleep(100 * RtcSettings.deepsleep_slip * (DEEPSLEEP_MAX_CYCLE < RtcSettings.ultradeepsleep ? DEEPSLEEP_MAX_CYCLE : RtcSettings.ultradeepsleep), WAKE_RF_DEFAULT);
+      yield();
+
+    }
+  }
+
+  RtcSettings.ultradeepsleep = 0;
+}
+
+void DeepSleepPrepare(void)
+{
+
+
+
+
+  if ((RtcSettings.nextwakeup == 0) ||
+      (RtcSettings.deepsleep_slip < 9000) ||
+      (RtcSettings.deepsleep_slip > 11000) ||
+      (RtcSettings.nextwakeup > (UtcTime() + Settings.deepsleep))) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Reset wrong settings wakeup: %ld, slip %ld"), RtcSettings.nextwakeup, RtcSettings.deepsleep_slip );
+    RtcSettings.nextwakeup = 0;
+    RtcSettings.deepsleep_slip = 10000;
+  }
+
+
+
+  int16_t timeslip = (int16_t)(RtcSettings.nextwakeup + millis() / 1000 - UtcTime()) * 10;
+
+
+
+  timeslip = (timeslip < -(int32_t)Settings.deepsleep) ? 0 : (timeslip > (int32_t)Settings.deepsleep) ? 0 : 1;
+  if (timeslip) {
+    RtcSettings.deepsleep_slip = (Settings.deepsleep + RtcSettings.nextwakeup - UtcTime()) * RtcSettings.deepsleep_slip / tmax((Settings.deepsleep - (millis() / 1000)),5);
+
+    RtcSettings.deepsleep_slip = tmin(tmax(RtcSettings.deepsleep_slip, 9000), 11000);
+    RtcSettings.nextwakeup += Settings.deepsleep;
+  }
+
+
+
+  if (RtcSettings.nextwakeup <= (UtcTime() - DEEPSLEEP_MIN_TIME)) {
+
+    RtcSettings.nextwakeup += (((UtcTime() + DEEPSLEEP_MIN_TIME - RtcSettings.nextwakeup) / Settings.deepsleep) + 1) * Settings.deepsleep;
+  }
+
+  String dt = GetDT(RtcSettings.nextwakeup + LocalTime() - UtcTime());
+
+
+  deepsleep_sleeptime = tmin((uint32_t)DEEPSLEEP_MAX_CYCLE ,RtcSettings.nextwakeup - UtcTime());
+
+
+  Response_P(PSTR("{\"" D_PRFX_DEEPSLEEP "\":{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%d}}"), (char*)dt.c_str(), RtcSettings.nextwakeup);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_STATUS));
+
+
+
+}
+
+void DeepSleepStart(void)
+{
+  AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Sleeping"));
+
+  WifiShutdown();
+  RtcSettings.ultradeepsleep = RtcSettings.nextwakeup - UtcTime();
+  RtcSettingsSave();
+
+  ESP.deepSleep(100 * RtcSettings.deepsleep_slip * deepsleep_sleeptime);
+  yield();
+}
+
+void DeepSleepEverySecond(void)
+{
+  if (!deepsleep_flag) { return; }
+
+  if (DeepSleepEnabled()) {
+    if (DEEPSLEEP_START_COUNTDOWN == deepsleep_flag) {
+      SettingsSaveAll();
+      DeepSleepPrepare();
+    }
+    deepsleep_flag--;
+    if (deepsleep_flag <= 0) {
+      DeepSleepStart();
+    }
+  } else {
+    deepsleep_flag = 0;
+  }
+}
+
+
+
+
+
+void CmndDeepsleepTime(void)
+{
+  if ((0 == XdrvMailbox.payload) ||
+     ((XdrvMailbox.payload > 10) && (XdrvMailbox.payload < DEEPSLEEP_MAX))) {
+    Settings.deepsleep = XdrvMailbox.payload;
+    RtcSettings.nextwakeup = 0;
+    deepsleep_flag = (0 == XdrvMailbox.payload) ? 0 : DEEPSLEEP_START_COUNTDOWN;
+    if (deepsleep_flag) {
+      if (!Settings.tele_period) {
+        Settings.tele_period = TELE_PERIOD;
+      }
+    }
+  }
+  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.deepsleep);
+}
+
+
+
+
+
+bool Xdrv29(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_SECOND:
+      DeepSleepEverySecond();
+      break;
+    case FUNC_AFTER_TELEPERIOD:
+        if (DeepSleepEnabled() && !deepsleep_flag && (Settings.tele_period == 10 || Settings.tele_period == 300 || UpTime() > Settings.tele_period)) {
+        deepsleep_flag = DEEPSLEEP_START_COUNTDOWN;
+      }
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kDeepsleepCommands, DeepsleepCommand);
+      break;
+    case FUNC_PRE_INIT:
+      DeepSleepReInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+#ifdef USE_LIGHT
+#ifdef USE_EXS_DIMMER
+
+
+
+
+
+
+
+#define XDRV_30 30
+
+#define EXS_GATE_1_ON 0x20
+#define EXS_GATE_1_OFF 0x21
+#define EXS_DIMM_1_ON 0x22
+#define EXS_DIMM_1_OFF 0x23
+#define EXS_DIMM_1_TBL 0x24
+#define EXS_DIMM_1_VAL 0x25
+#define EXS_GATE_2_ON 0x30
+#define EXS_GATE_2_OFF 0x31
+#define EXS_DIMM_2_ON 0x32
+#define EXS_DIMM_2_OFF 0x33
+#define EXS_DIMM_2_TBL 0x34
+#define EXS_DIMM_2_VAL 0x35
+#define EXS_GATES_ON 0x40
+#define EXS_GATES_OFF 0x41
+#define EXS_DIMMS_ON 0x50
+#define EXS_DIMMS_OFF 0x51
+#define EXS_CH_LOCK 0x60
+#define EXS_GET_VALUES 0xFA
+#define EXS_WRITE_EE 0xFC
+#define EXS_READ_EE 0xFD
+#define EXS_GET_VERSION 0xFE
+#define EXS_RESET 0xFF
+
+#define EXS_BUFFER_SIZE 256
+#define EXS_ACK_TIMEOUT 200
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *ExsSerial = nullptr;
+
+typedef struct
+{
+  uint8_t on = 0;
+  uint8_t bright_tbl = 0;
+  uint8_t dimm = 0;
+  uint8_t impuls_start = 0;
+  uint32_t impuls_len = 0;
+} CHANNEL;
+
+typedef struct
+{
+  uint8_t version_major = 0;
+  uint8_t version_minor = 0;
+  CHANNEL channel[2];
+  uint8_t gate_lock = 0;
+} DIMMER;
+
+struct EXS
+{
+  uint8_t *buffer = nullptr;
+  int byte_counter = 0;
+  int cmd_status = 0;
+  uint8_t power = 0;
+  uint8_t dimm[2] = {0, 0};
+  DIMMER dimmer;
+} Exs;
+
+
+
+
+
+uint8_t crc8(const uint8_t *p, uint8_t len)
+{
+  const uint8_t table[] = {
+      0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
+      0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D};
+
+  const uint8_t table_rev[] = {
+      0x00, 0x70, 0xE0, 0x90, 0xC1, 0xB1, 0x21, 0x51,
+      0x83, 0xF3, 0x63, 0x13, 0x42, 0x32, 0xA2, 0xD2};
+
+  uint8_t offset;
+  uint8_t temp, crc8_temp;
+  uint8_t crc8 = 0;
+
+  for (int i = 0; i < len; i++)
+  {
+    temp = *(p + i);
+    offset = temp ^ crc8;
+    offset >>= 4;
+    crc8_temp = crc8 & 0x0f;
+    crc8 = crc8_temp ^ table_rev[offset];
+    offset = crc8 ^ temp;
+    offset &= 0x0f;
+    crc8_temp = crc8 & 0xf0;
+    crc8 = crc8_temp ^ table[offset];
+  }
+  return crc8 ^ 0x55;
+}
+
+void ExsSerialSend(const uint8_t data[] = nullptr, uint16_t len = 0)
+{
+  int retries = 3;
+  char rc;
+
+#ifdef EXS_DEBUG
+  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: Tx Packet: \""));
+  for (uint32_t i = 0; i < len; i++)
+  {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, data[i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
+  AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+  while (retries)
+  {
+    retries--;
+
+    ExsSerial->write(data, len);
+    ExsSerial->flush();
+
+
+    uint32_t snd_time = millis();
+    while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
+           (!ExsSerial->available()))
+      ;
+
+    if (!ExsSerial->available())
+    {
+
+#ifdef EXS_DEBUG
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("ESX: serial send timeout"));
+#endif
+      continue;
+    }
+
+    rc = ExsSerial->read();
+    if (rc == 0xFF)
+      break;
+  }
+}
+
+void ExsSendCmd(uint8_t cmd, uint8_t value)
+{
+  uint8_t buffer[8];
+  uint16_t len;
+
+  buffer[0] = 0x7b;
+  buffer[3] = cmd;
+
+  switch (cmd)
+  {
+  case EXS_GATE_1_ON:
+  case EXS_GATE_1_OFF:
+  case EXS_DIMM_1_ON:
+  case EXS_DIMM_1_OFF:
+  case EXS_GATE_2_ON:
+  case EXS_GATE_2_OFF:
+  case EXS_DIMM_2_ON:
+  case EXS_DIMM_2_OFF:
+  case EXS_GATES_ON:
+  case EXS_GATES_OFF:
+  case EXS_DIMMS_ON:
+  case EXS_DIMMS_OFF:
+  case EXS_GET_VALUES:
+  case EXS_GET_VERSION:
+  case EXS_RESET:
+    buffer[2] = 1;
+    len = 4;
+    break;
+
+  case EXS_CH_LOCK:
+  case EXS_DIMM_1_TBL:
+  case EXS_DIMM_1_VAL:
+  case EXS_DIMM_2_TBL:
+  case EXS_DIMM_2_VAL:
+    buffer[2] = 2;
+    buffer[4] = value;
+    len = 5;
+    break;
+  }
+  buffer[1] = crc8(&buffer[3], buffer[2]);
+
+  ExsSerialSend(buffer, len);
+}
+
+uint8_t ExsSetPower(uint8_t device, uint8_t power)
+{
+  Exs.dimmer.channel[device].dimm = power;
+  ExsSendCmd(EXS_DIMM_1_ON + 0x10 * device + power ^ 1, 0);
+}
+
+uint8_t ExsSetBri(uint8_t device, uint8_t bri)
+{
+  Exs.dimmer.channel[device].bright_tbl = bri;
+  ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * device, bri);
+}
+
+uint8_t ExsSyncState(uint8_t device)
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Channel %d Power Want %d, Is %d"),
+            device, bitRead(Exs.power, device), Exs.dimmer.channel[device].dimm);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Set Channel %d Brightness Want %d, Is %d"),
+            device, Exs.dimm[device], Exs.dimmer.channel[device].bright_tbl);
+#endif
+
+  if (bitRead(Exs.power, device) &&
+      Exs.dimm[device] != Exs.dimmer.channel[device].bright_tbl) {
+    ExsSetBri(device, Exs.dimm[device]);
+  }
+
+  if (!Exs.dimm[device]) {
+    Exs.dimmer.channel[device].dimm = 0;
+  } else if (Exs.dimmer.channel[device].dimm != bitRead(Exs.power, device)) {
+    ExsSetPower(device, bitRead(Exs.power, device));
+  }
+}
+
+bool ExsSyncState()
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Serial %p, Cmd %d"), ExsSerial, Exs.cmd_status);
+#endif
+
+  if (!ExsSerial || Exs.cmd_status != 0)
+    return false;
+
+  ExsSyncState(0);
+  ExsSyncState(1);
+}
+
+void ExsDebugState()
+{
+#ifdef EXS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: MCU v%d.%d, c0: On:%d,Dim:%d,Tbl:%d(%d%%), c1: On:%d,Dim:%d,Tbl:%d(%d%%), ChLock: %d"),
+              Exs.dimmer.version_major, Exs.dimmer.version_minor,
+              Exs.dimmer.channel[0].on, Exs.dimmer.channel[0].dimm,
+              Exs.dimmer.channel[0].bright_tbl,
+              changeUIntScale(Exs.dimmer.channel[0].bright_tbl, 0, 255, 0, 100),
+              Exs.dimmer.channel[1].on, Exs.dimmer.channel[1].dimm,
+              Exs.dimmer.channel[1].bright_tbl,
+              changeUIntScale(Exs.dimmer.channel[1].bright_tbl, 0, 255, 0, 100),
+              Exs.dimmer.gate_lock);
+#endif
+}
+
+void ExsPacketProcess(void)
+{
+  uint8_t len = Exs.buffer[1];
+  uint8_t cmd = Exs.buffer[2];
+
+  switch (cmd)
+  {
+  case EXS_GET_VALUES:
+# 294 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+    if (len > 9)
+    {
+      Exs.dimmer.version_major = Exs.buffer[3];
+      Exs.dimmer.version_minor = Exs.buffer[4];
+
+
+      Exs.dimmer.channel[0].on = Exs.buffer[6];
+      Exs.dimmer.channel[0].dimm = Exs.buffer[6];
+      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[7];
+
+
+      Exs.dimmer.channel[1].on = Exs.buffer[9];
+      Exs.dimmer.channel[1].dimm = Exs.buffer[9];
+      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[10];
+
+      Exs.dimmer.gate_lock = Exs.buffer[11];
+    }
+    else
+# 327 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+    {
+      Exs.dimmer.version_major = 1;
+      Exs.dimmer.version_minor = 0;
+
+
+      Exs.dimmer.channel[0].on = Exs.buffer[4] - 48;
+      Exs.dimmer.channel[0].dimm = Exs.buffer[4] - 48;
+      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[5] - 48;
+
+
+      Exs.dimmer.channel[1].on = Exs.buffer[7] - 48;
+      Exs.dimmer.channel[1].dimm = Exs.buffer[7] - 48;
+      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[8] - 48;
+
+      Exs.dimmer.gate_lock = Exs.buffer[9] - 48;
+    }
+
+    ExsDebugState();
+    ExsSyncState();
+    ExsDebugState();
+    break;
+  default:
+    break;
+  }
+}
+
+
+
+bool ExsModuleSelected(void)
+{
+  Settings.light_correction = 0;
+  Settings.flag.mqtt_serial = 0;
+  Settings.flag3.pwm_multi_channels = 1;
+  SetSeriallog(LOG_LEVEL_NONE);
+
+  devices_present = +2;
+  light_type = LT_SERIAL2;
+  return true;
+}
+
+bool ExsSetChannels(void)
+{
+#ifdef EXS_DEBUG
+  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: SetChannels: \""));
+  for (int i = 0; i < XdrvMailbox.data_len; i++)
+  {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, ((uint8_t *)XdrvMailbox.data)[i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
+  AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+  Exs.dimm[0] = ((uint8_t *)XdrvMailbox.data)[0];
+  Exs.dimm[1] = ((uint8_t *)XdrvMailbox.data)[1];
+  return ExsSyncState();
+}
+
+bool ExsSetPower(void)
+{
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Set Power, Device %d, Power 0x%02x"),
+            active_device, XdrvMailbox.index);
+
+  Exs.power = XdrvMailbox.index;
+  return ExsSyncState();
+}
+
+void EsxMcuStart(void)
+{
+  int retries = 3;
+
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Request MCU configuration, PIN %d to Low"), pin[GPIO_EXS_ENABLE]);
+#endif
+
+  pinMode(pin[GPIO_EXS_ENABLE], OUTPUT);
+  digitalWrite(pin[GPIO_EXS_ENABLE], LOW);
+
+  delay(1);
+
+  while (ExsSerial->available())
+  {
+
+    ExsSerial->read();
+  }
+}
+
+void ExsInit(void)
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Starting Tx %d Rx %d"), pin[GPIO_TXD], pin[GPIO_RXD]);
+#endif
+
+  Exs.buffer = (uint8_t *)malloc(EXS_BUFFER_SIZE);
+  if (Exs.buffer != nullptr)
+  {
+    ExsSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+    if (ExsSerial->begin(9600))
+    {
+      if (ExsSerial->hardwareSerial())
+      {
+        ClaimSerial();
+      }
+      ExsSerial->flush();
+      EsxMcuStart();
+      ExsSendCmd(EXS_CH_LOCK, 0);
+      ExsSendCmd(EXS_GET_VALUES, 0);
+   }
+  }
+}
+
+void ExsSerialInput(void)
+{
+  while (ExsSerial->available())
+  {
+    yield();
+    uint8_t serial_in_byte = ExsSerial->read();
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Serial In Byte 0x%02x"), serial_in_byte);
+
+    if (Exs.cmd_status == 0 &&
+        serial_in_byte == 0x7B)
+    {
+      Exs.cmd_status = 1;
+      Exs.byte_counter = 0;
+    }
+    else if (Exs.byte_counter >= EXS_BUFFER_SIZE)
+    {
+      Exs.cmd_status = 0;
+    }
+    else if (Exs.cmd_status == 1)
+    {
+      Exs.buffer[Exs.byte_counter++] = serial_in_byte;
+
+      if (Exs.byte_counter > 2 && Exs.byte_counter == Exs.buffer[1] + 2)
+      {
+        uint8_t crc = crc8(&Exs.buffer[2], Exs.buffer[1]);
+
+
+        Exs.cmd_status = 0;
+
+#ifdef EXS_DEBUG
+        snprintf_P(log_data, sizeof(log_data), PSTR("EXS: RX Packet: \""));
+        for (uint32_t i = 0; i < Exs.byte_counter; i++)
+        {
+          snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, Exs.buffer[i]);
+        }
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s\", CRC: 0x%02x"), log_data, crc);
+        AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+        if (Exs.buffer[0] == crc)
+        {
+          ExsSerial->write(0xFF);
+          ExsPacketProcess();
+        }
+        else
+        {
+          ExsSerial->write(0x00);
+        }
+
+      }
+    }
+  }
+}
+
+
+
+
+
+#ifdef EXS_MCU_CMNDS
+
+#define D_PRFX_EXS "Exs"
+#define D_CMND_EXS_DIMM "Dimm"
+#define D_CMND_EXS_DIMM_TBL "DimmTbl"
+#define D_CMND_EXS_DIMM_VAL "DimmVal"
+#define D_CMND_EXS_DIMMS "Dimms"
+#define D_CMND_EXS_CH_LOCK "ChLock"
+#define D_CMND_EXS_STATE "State"
+
+const char kExsCommands[] PROGMEM = D_PRFX_EXS "|"
+  D_CMND_EXS_DIMM "|" D_CMND_EXS_DIMM_TBL "|" D_CMND_EXS_DIMM_VAL "|"
+  D_CMND_EXS_DIMMS "|" D_CMND_EXS_CH_LOCK "|"
+  D_CMND_EXS_STATE;
+
+void (* const ExsCommand[])(void) PROGMEM = {
+  &CmndExsDimm, &CmndExsDimmTbl, &CmndExsDimmVal,
+  &CmndExsDimms, &CmndExsChLock,
+  &CmndExsState };
+
+void CmndExsDimm(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1)) {
+    ExsSendCmd(EXS_DIMM_1_ON + 0x10 * (XdrvMailbox.index - 1) +
+               XdrvMailbox.payload ^ 1, 0);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimmTbl(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
+    ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * (XdrvMailbox.index - 1),
+               XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimmVal(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
+    ExsSendCmd(EXS_DIMM_1_VAL + 0x10 * (XdrvMailbox.index - 1),
+               XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimms(void)
+{
+  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
+    ExsSendCmd(EXS_DIMMS_ON + XdrvMailbox.payload ^ 1, 0);
+  }
+  CmndExsState();
+}
+
+void CmndExsChLock(void)
+{
+  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
+    ExsSendCmd(EXS_CH_LOCK, XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsState(void)
+{
+  ExsSendCmd(EXS_GET_VALUES, 0);
+
+
+  uint32_t snd_time = millis();
+  while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
+         (!ExsSerial->available()))
+    ;
+  ExsSerialInput();
+
+  Response_P(PSTR("{\"" D_CMND_EXS_STATE "\":{"));
+  ResponseAppend_P(PSTR("\"McuVersion\":\"%d.%d\","
+                        "\"Channels\":["),
+                   Exs.dimmer.version_major, Exs.dimmer.version_minor);
+
+  for (uint32_t i = 0; i < 2; i++) {
+    if (i != 0) {
+      ResponseAppend_P(PSTR(","));
+    }
+    ResponseAppend_P(PSTR("{\"On\":\"%d\","
+                          "\"BrightProz\":\"%d\","
+                          "\"BrightTab\":\"%d\","
+                          "\"Dimm\":\"%d\"}"),
+                     Exs.dimmer.channel[i].on,
+                     changeUIntScale(Exs.dimmer.channel[i].bright_tbl, 0, 255, 0, 100),
+                     Exs.dimmer.channel[i].bright_tbl,
+                     Exs.dimmer.channel[i].dimm);
+  }
+  ResponseAppend_P(PSTR("],"));
+  ResponseAppend_P(PSTR("\"GateLock\":\"%d\""), Exs.dimmer.gate_lock);
+  ResponseJsonEndEnd();
+}
+
+#endif
+
+
+
+
+
+bool Xdrv30(uint8_t function)
+{
+  bool result = false;
+
+  if (EXS_DIMMER == my_module_type)
+  {
+    switch (function)
+    {
+    case FUNC_LOOP:
+      if (ExsSerial)
+        ExsSerialInput();
+      break;
+    case FUNC_MODULE_INIT:
+      result = ExsModuleSelected();
+      break;
+    case FUNC_INIT:
+      ExsInit();
+      break;
+    case FUNC_SET_DEVICE_POWER:
+      result = ExsSetPower();
+      break;
+    case FUNC_SET_CHANNELS:
+      result = ExsSetChannels();
+      break;
+#ifdef EXS_MCU_CMNDS
+    case FUNC_COMMAND:
+      result = DecodeCommand(kExsCommands, ExsCommand);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
+#ifdef USE_TASMOTA_SLAVE
+
+
+
+
+#define XDRV_31 31
+
+#define CONST_STK_CRC_EOP 0x20
+
+#define CMND_STK_GET_SYNC 0x30
+#define CMND_STK_SET_DEVICE 0x42
+#define CMND_STK_SET_DEVICE_EXT 0x45
+#define CMND_STK_ENTER_PROGMODE 0x50
+#define CMND_STK_LEAVE_PROGMODE 0x51
+#define CMND_STK_LOAD_ADDRESS 0x55
+#define CMND_STK_PROG_PAGE 0x64
+
+
+
+
+
+#define CMND_START 0xFC
+#define CMND_END 0xFD
+
+#define CMND_FEATURES 0x01
+#define CMND_JSON 0x02
+#define CMND_FUNC_EVERY_SECOND 0x03
+#define CMND_FUNC_EVERY_100_MSECOND 0x04
+#define CMND_SLAVE_SEND 0x05
+#define CMND_PUBLISH_TELE 0x06
+#define CMND_EXECUTE_CMND 0x07
+
+#define PARAM_DATA_START 0xFE
+#define PARAM_DATA_END 0xFF
+
+#include <TasmotaSerial.h>
+
+
+
+
+
+class SimpleHexParse {
+  public:
+   SimpleHexParse(void);
+   uint8_t parseLine(char *hexline);
+   uint8_t ptr_l = 0;
+   uint8_t ptr_h = 0;
+   bool PageIsReady = false;
+   bool firstrun = true;
+   bool EndOfFile = false;
+   uint8_t FlashPage[128];
+   uint8_t FlashPageIdx = 0;
+   uint8_t layoverBuffer[16];
+   uint8_t layoverIdx = 0;
+   uint8_t getByte(char *hexline, uint8_t idx);
+};
+
+SimpleHexParse::SimpleHexParse(void)
+{
+
+}
+
+uint8_t SimpleHexParse::parseLine(char *hexline)
+{
+  if (layoverIdx) {
+    memcpy(&FlashPage[0], &layoverBuffer[0], layoverIdx);
+    FlashPageIdx = layoverIdx;
+    layoverIdx = 0;
+  }
+  uint8_t len = getByte(hexline, 1);
+  uint8_t addr_h = getByte(hexline, 2);
+  uint8_t addr_l = getByte(hexline, 3);
+  uint8_t rectype = getByte(hexline, 4);
+  for (uint8_t idx = 0; idx < len; idx++) {
+       if (FlashPageIdx < 128) {
+         FlashPage[FlashPageIdx] = getByte(hexline, idx+5);
+         FlashPageIdx++;
+       } else {
+         layoverBuffer[layoverIdx] = getByte(hexline, idx+5);
+         layoverIdx++;
+       }
+  }
+  if (1 == rectype) {
+    EndOfFile = true;
+    while (FlashPageIdx < 128) {
+      FlashPage[FlashPageIdx] = 0xFF;
+      FlashPageIdx++;
+    }
+  }
+  if (FlashPageIdx == 128) {
+    if (firstrun) {
+      firstrun = false;
+    } else {
+      ptr_l += 0x40;
+      if (ptr_l == 0) {
+        ptr_l = 0;
+        ptr_h++;
+      }
+    }
+    firstrun = false;
+    PageIsReady = true;
+  }
+  return 0;
+}
+
+uint8_t SimpleHexParse::getByte(char* hexline, uint8_t idx)
+{
+ char buff[3];
+ buff[3] = '\0';
+ memcpy(&buff, &hexline[(idx*2)-1], 2);
+ return strtol(buff, 0, 16);
+}
+
+
+
+
+
+struct TSLAVE {
+  uint32_t spi_hex_size = 0;
+  uint32_t spi_sector_counter = 0;
+  uint8_t spi_sector_cursor = 0;
+  uint8_t inverted = LOW;
+  bool type = false;
+  bool flashing = false;
+  bool SerialEnabled = false;
+  uint8_t waitstate = 0;
+  bool unsupported = false;
+} TSlave;
+
+typedef union {
+  uint32_t data;
+  struct {
+    uint32_t func_json_append : 1;
+    uint32_t func_every_second : 1;
+    uint32_t func_every_100_msecond : 1;
+    uint32_t func_slave_send : 1;
+    uint32_t spare4 : 1;
+    uint32_t spare5 : 1;
+    uint32_t spare6 : 1;
+    uint32_t spare7 : 1;
+    uint32_t spare8 : 1;
+    uint32_t spare9 : 1;
+    uint32_t spare10 : 1;
+    uint32_t spare11 : 1;
+    uint32_t spare12 : 1;
+    uint32_t spare13 : 1;
+    uint32_t spare14 : 1;
+    uint32_t spare15 : 1;
+    uint32_t spare16 : 1;
+    uint32_t spare17 : 1;
+    uint32_t spare18 : 1;
+    uint32_t spare19 : 1;
+    uint32_t spare20 : 1;
+    uint32_t spare21 : 1;
+    uint32_t spare22 : 1;
+    uint32_t spare23 : 1;
+    uint32_t spare24 : 1;
+    uint32_t spare25 : 1;
+    uint32_t spare26 : 1;
+    uint32_t spare27 : 1;
+    uint32_t spare28 : 1;
+    uint32_t spare29 : 1;
+    uint32_t spare30 : 1;
+    uint32_t spare31 : 1;
+  };
+} TSlaveFeatureCfg;
+
+
+
+
+
+
+struct TSLAVE_FEATURES {
+  uint32_t features_version;
+  TSlaveFeatureCfg features;
+} TSlaveSettings;
+
+struct TSLAVE_COMMAND {
+  uint8_t command;
+  uint8_t parameter;
+  uint8_t unused2;
+  uint8_t unused3;
+} TSlaveCommand;
+
+TasmotaSerial *TasmotaSlave_Serial;
+
+uint32_t TasmotaSlave_FlashStart(void)
+{
+  return (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 2;
+}
+
+uint8_t TasmotaSlave_UpdateInit(void)
+{
+  TSlave.spi_hex_size = 0;
+  TSlave.spi_sector_counter = TasmotaSlave_FlashStart();
+  TSlave.spi_sector_cursor = 0;
+  return 0;
+}
+
+void TasmotaSlave_Reset(void)
+{
+  if (TSlave.SerialEnabled) {
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
+    delay(1);
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], TSlave.inverted);
+    delay(1);
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
+    delay(5);
+  }
+}
+
+uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout)
+{
+  int timer = 0;
+  while (timer < timeout) {
+    if (TasmotaSlave_Serial->available() >= dataCount) {
+      return 1;
+    }
+    delay(1);
+    timer++;
+  }
+  return 0;
+}
+
+uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count)
+{
+  TasmotaSlave_Serial->write(bytes, count);
+  TasmotaSlave_waitForSerialData(2, 250);
+  uint8_t sync = TasmotaSlave_Serial->read();
+  uint8_t ok = TasmotaSlave_Serial->read();
+  if ((sync == 0x14) && (ok == 0x10)) {
+    return 1;
+  }
+  return 0;
+}
+
+uint8_t TasmotaSlave_execCmd(uint8_t cmd)
+{
+  uint8_t bytes[] = { cmd, CONST_STK_CRC_EOP };
+  return TasmotaSlave_sendBytes(bytes, 2);
+}
+
+uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count)
+{
+  uint8_t bytes[32];
+  bytes[0] = cmd;
+  int i = 0;
+  while (i < count) {
+    bytes[i + 1] = params[i];
+    i++;
+  }
+  bytes[i + 1] = CONST_STK_CRC_EOP;
+  return TasmotaSlave_sendBytes(bytes, i + 2);
+}
+
+uint8_t TasmotaSlave_exitProgMode(void)
+{
+  return TasmotaSlave_execCmd(CMND_STK_LEAVE_PROGMODE);
+}
+
+uint8_t TasmotaSlave_SetupFlash(void)
+{
+  uint8_t ProgParams[] = {0x86, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00};
+  uint8_t ExtProgParams[] = {0x05, 0x04, 0xd7, 0xc2, 0x00};
+  TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_FLASH_SPEED);
+  if (TasmotaSlave_Serial->hardwareSerial()) {
+    ClaimSerial();
+  }
+
+  TasmotaSlave_Reset();
+
+  uint8_t timeout = 0;
+  uint8_t no_error = 0;
+  while (50 > timeout) {
+    if (TasmotaSlave_execCmd(CMND_STK_GET_SYNC)) {
+      timeout = 200;
+      no_error = 1;
+    }
+    timeout++;
+    delay(1);
+  }
+  if (no_error) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Found bootloader"));
+  } else {
+    no_error = 0;
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Bootloader could not be found"));
+  }
+  if (no_error) {
+    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE, ProgParams, sizeof(ProgParams))) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (1)"));
+    }
+  }
+  if (no_error) {
+    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE_EXT, ExtProgParams, sizeof(ExtProgParams))) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (2)"));
+    }
+  }
+  if (no_error) {
+    if (TasmotaSlave_execCmd(CMND_STK_ENTER_PROGMODE)) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Failed to put bootloader into programming mode"));
+    }
+  }
+  return no_error;
+}
+
+uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo)
+{
+  uint8_t params[] = { adrLo, adrHi };
+  return TasmotaSlave_execParam(CMND_STK_LOAD_ADDRESS, params, sizeof(params));
+}
+
+void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data)
+{
+  uint8_t Header[] = {CMND_STK_PROG_PAGE, 0x00, 0x80, 0x46};
+  TasmotaSlave_loadAddress(addr_h, addr_l);
+  TasmotaSlave_Serial->write(Header, 4);
+  for (int i = 0; i < 128; i++) {
+    TasmotaSlave_Serial->write(data[i]);
+  }
+  TasmotaSlave_Serial->write(CONST_STK_CRC_EOP);
+  TasmotaSlave_waitForSerialData(2, 250);
+  TasmotaSlave_Serial->read();
+  TasmotaSlave_Serial->read();
+}
+
+void TasmotaSlave_Flash(void)
+{
+  bool reading = true;
+  uint32_t read = 0;
+  uint32_t processed = 0;
+  char thishexline[50];
+  uint8_t position = 0;
+  char* flash_buffer;
+
+  SimpleHexParse hexParse = SimpleHexParse();
+
+  if (!TasmotaSlave_SetupFlash()) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flashing aborted!"));
+    TSlave.flashing = false;
+    restart_flag = 2;
+    return;
+  }
+
+  flash_buffer = new char[SPI_FLASH_SEC_SIZE];
+  uint32_t flash_start = TasmotaSlave_FlashStart() * SPI_FLASH_SEC_SIZE;
+  while (reading) {
+    ESP.flashRead(flash_start + read, (uint32_t*)flash_buffer, SPI_FLASH_SEC_SIZE);
+    read = read + SPI_FLASH_SEC_SIZE;
+    if (read >= TSlave.spi_hex_size) {
+      reading = false;
+    }
+    for (uint32_t ca = 0; ca < SPI_FLASH_SEC_SIZE; ca++) {
+      processed++;
+      if ((processed <= TSlave.spi_hex_size) && (!hexParse.EndOfFile)) {
+        if (':' == flash_buffer[ca]) {
+          position = 0;
+        }
+        if (0x0D == flash_buffer[ca]) {
+          thishexline[position] = 0;
+          hexParse.parseLine(thishexline);
+          if (hexParse.PageIsReady) {
+            TasmotaSlave_FlashPage(hexParse.ptr_h, hexParse.ptr_l, hexParse.FlashPage);
+            hexParse.PageIsReady = false;
+            hexParse.FlashPageIdx = 0;
+          }
+        } else {
+          if (0x0A != flash_buffer[ca]) {
+            thishexline[position] = flash_buffer[ca];
+            position++;
+          }
+        }
+      }
+    }
+  }
+  TasmotaSlave_exitProgMode();
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flash done!"));
+  TSlave.flashing = false;
+  restart_flag = 2;
+}
+
+void TasmotaSlave_SetFlagFlashing(bool value)
+{
+  TSlave.flashing = value;
+}
+
+bool TasmotaSlave_GetFlagFlashing(void)
+{
+  return TSlave.flashing;
+}
+
+void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size)
+{
+  if (0 == TSlave.spi_sector_cursor) {
+    ESP.flashEraseSector(TSlave.spi_sector_counter);
+  }
+  TSlave.spi_sector_cursor++;
+  ESP.flashWrite((TSlave.spi_sector_counter * SPI_FLASH_SEC_SIZE) + ((TSlave.spi_sector_cursor-1)*2048), (uint32_t*)buf, size);
+  TSlave.spi_hex_size = TSlave.spi_hex_size + size;
+  if (2 == TSlave.spi_sector_cursor) {
+    TSlave.spi_sector_cursor = 0;
+    TSlave.spi_sector_counter++;
+  }
+}
+
+void TasmotaSlave_Init(void)
+{
+  if (TSlave.type) {
+    return;
+  }
+  if (10 > TSlave.waitstate) {
+    TSlave.waitstate++;
+    return;
+  }
+  if (!TSlave.SerialEnabled) {
+    if ((pin[GPIO_TASMOTASLAVE_RXD] < 99) && (pin[GPIO_TASMOTASLAVE_TXD] < 99) &&
+        ((pin[GPIO_TASMOTASLAVE_RST] < 99) || (pin[GPIO_TASMOTASLAVE_RST_INV] < 99))) {
+      TasmotaSlave_Serial = new TasmotaSerial(pin[GPIO_TASMOTASLAVE_RXD], pin[GPIO_TASMOTASLAVE_TXD], 1, 0, 200);
+      if (TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_SERIAL_SPEED)) {
+        if (TasmotaSlave_Serial->hardwareSerial()) {
+          ClaimSerial();
+        }
+        TasmotaSlave_Serial->setTimeout(50);
+        if (pin[GPIO_TASMOTASLAVE_RST_INV] < 99) {
+          pin[GPIO_TASMOTASLAVE_RST] = pin[GPIO_TASMOTASLAVE_RST_INV];
+          pin[GPIO_TASMOTASLAVE_RST_INV] = 99;
+          TSlave.inverted = HIGH;
+        }
+        pinMode(pin[GPIO_TASMOTASLAVE_RST], OUTPUT);
+        TSlave.SerialEnabled = true;
+        TasmotaSlave_Reset();
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Enabled"));
+      }
+    }
+  }
+  if (TSlave.SerialEnabled) {
+    TasmotaSlave_sendCmnd(CMND_FEATURES, 0);
+    char buffer[32];
+    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer));
+    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer));
+    memcpy(&TSlaveSettings, &buffer, sizeof(TSlaveSettings));
+    if (20191129 == TSlaveSettings.features_version) {
+      TSlave.type = true;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u"), TSlaveSettings.features_version);
+    } else {
+      if ((!TSlave.unsupported) && (TSlaveSettings.features_version > 0)) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u not supported!"), TSlaveSettings.features_version);
+        TSlave.unsupported = true;
+      }
+    }
+  }
+}
+
+void TasmotaSlave_Show(void)
+{
+  if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
+    char buffer[100];
+    TasmotaSlave_sendCmnd(CMND_JSON, 0);
+    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer)-1);
+    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer)-1);
+    buffer[len] = '\0';
+    ResponseAppend_P(PSTR(",\"TasmotaSlave\":%s"), buffer);
+  }
+}
+
+void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param)
+{
+  TSlaveCommand.command = cmnd;
+  TSlaveCommand.parameter = param;
+  char buffer[sizeof(TSlaveCommand)+2];
+  buffer[0] = CMND_START;
+  memcpy(&buffer[1], &TSlaveCommand, sizeof(TSlaveCommand));
+  buffer[sizeof(TSlaveCommand)+1] = CMND_END;
+  for (uint8_t ca = 0; ca < sizeof(buffer); ca++) {
+    TasmotaSlave_Serial->write(buffer[ca]);
+  }
+}
+
+#define D_PRFX_SLAVE "Slave"
+#define D_CMND_SLAVE_RESET "Reset"
+#define D_CMND_SLAVE_SEND "Send"
+
+const char kTasmotaSlaveCommands[] PROGMEM = D_PRFX_SLAVE "|"
+  D_CMND_SLAVE_RESET "|" D_CMND_SLAVE_SEND;
+
+void (* const TasmotaSlaveCommand[])(void) PROGMEM = {
+  &CmndTasmotaSlaveReset, &CmndTasmotaSlaveSend };
+
+void CmndTasmotaSlaveReset(void)
+{
+  TasmotaSlave_Reset();
+  TSlave.type = false;
+  TSlave.waitstate = 7;
+  TSlave.unsupported = false;
+  ResponseCmndDone();
+}
+
+void CmndTasmotaSlaveSend(void)
+{
+  if (0 < XdrvMailbox.data_len) {
+    TasmotaSlave_sendCmnd(CMND_SLAVE_SEND, XdrvMailbox.data_len);
+    TasmotaSlave_Serial->write(char(PARAM_DATA_START));
+    for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
+      TasmotaSlave_Serial->write(XdrvMailbox.data[idx]);
+    }
+    TasmotaSlave_Serial->write(char(PARAM_DATA_END));
+  }
+  ResponseCmndDone();
+}
+
+void TasmotaSlave_ProcessIn(void)
+{
+  uint8_t cmnd = TasmotaSlave_Serial->read();
+  switch (cmnd) {
+    case CMND_START:
+      TasmotaSlave_waitForSerialData(sizeof(TSlaveCommand),50);
+      uint8_t buffer[sizeof(TSlaveCommand)];
+      for (uint8_t idx = 0; idx < sizeof(TSlaveCommand); idx++) {
+        buffer[idx] = TasmotaSlave_Serial->read();
+      }
+      TasmotaSlave_Serial->read();
+      memcpy(&TSlaveCommand, &buffer, sizeof(TSlaveCommand));
+      char inbuf[TSlaveCommand.parameter+1];
+      TasmotaSlave_waitForSerialData(TSlaveCommand.parameter, 50);
+      TasmotaSlave_Serial->read();
+      for (uint8_t idx = 0; idx < TSlaveCommand.parameter; idx++) {
+        inbuf[idx] = TasmotaSlave_Serial->read();
+      }
+      TasmotaSlave_Serial->read();
+      inbuf[TSlaveCommand.parameter] = '\0';
+
+      if (CMND_PUBLISH_TELE == TSlaveCommand.command) {
+        Response_P(PSTR("{\"TasmotaSlave\":"));
+        ResponseAppend_P("%s", inbuf);
+        ResponseJsonEnd();
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+        XdrvRulesProcess();
+      }
+      if (CMND_EXECUTE_CMND == TSlaveCommand.command) {
+        ExecuteCommand(inbuf, SRC_IGNORE);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+
+
+
+
+
+bool Xdrv31(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_100_MSECOND:
+      if (TSlave.type) {
+        if (TasmotaSlave_Serial->available()) {
+          TasmotaSlave_ProcessIn();
+        }
+        if (TSlaveSettings.features.func_every_100_msecond) {
+          TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_100_MSECOND, 0);
+        }
+      }
+      break;
+    case FUNC_EVERY_SECOND:
+      if ((TSlave.type) && (TSlaveSettings.features.func_every_second)) {
+        TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_SECOND, 0);
+      }
+      TasmotaSlave_Init();
+      break;
+    case FUNC_JSON_APPEND:
+      if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
+        TasmotaSlave_Show();
+      }
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kTasmotaSlaveCommands, TasmotaSlaveCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_32_hotplug.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_32_hotplug.ino"
+#ifdef USE_HOTPLUG
+
+
+
+
+
+
+
+#define XDRV_32 32
+
+const uint32_t HOTPLUG_MAX = 254;
+
+const char kHotPlugCommands[] PROGMEM = "|"
+  D_CMND_HOTPLUG;
+
+void (* const HotPlugCommand[])(void) PROGMEM = {
+  &CmndHotPlugTime };
+
+struct {
+
+  bool enabled = false;
+  uint8_t timeout = 0;
+} Hotplug;
+
+void HotPlugInit(void)
+{
+
+  if (Settings.hotplug_scan == 0xFF) { Settings.hotplug_scan = 0; }
+  if (Settings.hotplug_scan != 0) {
+    Hotplug.enabled = true;
+    Hotplug.timeout = 1;
+  } else
+    Hotplug.enabled = false;
+}
+
+void HotPlugEverySecond(void)
+{
+  if (Hotplug.enabled) {
+    if (Hotplug.timeout == 0) {
+      XsnsCall(FUNC_HOTPLUG_SCAN);
+      Hotplug.timeout = Settings.hotplug_scan;
+    }
+    Hotplug.timeout--;
+  }
+}
+
+
+
+
+
+void CmndHotPlugTime(void)
+{
+  if (XdrvMailbox.payload <= HOTPLUG_MAX) {
+    Settings.hotplug_scan = XdrvMailbox.payload;
+    HotPlugInit();
+  }
+  ResponseCmndNumber(Settings.hotplug_scan);
+}
+
+
+
+
+
+bool Xdrv32(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_SECOND:
+      HotPlugEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kHotPlugCommands, HotPlugCommand);
+      break;
+    case FUNC_PRE_INIT:
+      HotPlugInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
+#ifdef USE_SPI
+#ifdef USE_NRF24
+
+
+
+
+
+
+
+#define XDRV_33 33
+
+#define MOSI 13
+#define MISO 12
+#define SCK 14
+
+#include <SPI.h>
+#include <RF24.h>
+
+const char NRF24type[] PROGMEM = "NRF24";
+
+const char HTTP_NRF24[] PROGMEM =
+ "{s}%sL01%c: " "{m}started{e}";
+
+struct {
+  uint8_t chipType = 0;
+} NRF24;
+
+
+
+RF24 NRF24radio;
+
+bool NRF24initRadio()
+{
+  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+  NRF24radio.powerUp();
+
+  if(NRF24radio.isChipConnected()){
+    DEBUG_DRIVER_LOG(PSTR("NRF24 chip connected"));
+    return true;
+  }
+  DEBUG_DRIVER_LOG(PSTR("NRF24 chip NOT !!!! connected"));
+  return false;
+}
+
+bool NRF24Detect(void)
+{
+  if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
+    SPI.pins(SCK,MOSI,MISO,-1);
+    if(NRF24initRadio()){
+      NRF24.chipType = 32;
+     AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01 initialized"));
+      if(NRF24radio.isPVariant()){
+        NRF24.chipType = 43;
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01+ detected"));
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool Xdrv33(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    result = NRF24Detect();
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
+# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
+#ifdef DEBUG_THEO
+#ifndef USE_DEBUG_DRIVER
+#define USE_DEBUG_DRIVER 
+#endif
+#endif
+
+#ifdef USE_DEBUG_DRIVER
+
+
+
+
+
+
+#define XDRV_99 99
+
+#ifndef CPU_LOAD_CHECK
+#define CPU_LOAD_CHECK 1
+#endif
+
+
+
+
+
+#define D_CMND_CFGDUMP "CfgDump"
+#define D_CMND_CFGPEEK "CfgPeek"
+#define D_CMND_CFGPOKE "CfgPoke"
+#define D_CMND_CFGSHOW "CfgShow"
+#define D_CMND_CFGXOR "CfgXor"
+#define D_CMND_CPUCHECK "CpuChk"
+#define D_CMND_EXCEPTION "Exception"
+#define D_CMND_FLASHDUMP "FlashDump"
+#define D_CMND_FLASHMODE "FlashMode"
+#define D_CMND_FREEMEM "FreeMem"
+#define D_CMND_HELP "Help"
+#define D_CMND_RTCDUMP "RtcDump"
+#define D_CMND_SETSENSOR "SetSensor"
+#define D_CMND_I2CWRITE "I2CWrite"
+#define D_CMND_I2CREAD "I2CRead"
+#define D_CMND_I2CSTRETCH "I2CStretch"
+#define D_CMND_I2CCLOCK "I2CClock"
+
+const char kDebugCommands[] PROGMEM = "|"
+  D_CMND_CFGDUMP "|" D_CMND_CFGPEEK "|" D_CMND_CFGPOKE "|"
+#ifdef USE_WEBSERVER
+  D_CMND_CFGXOR "|"
+#endif
+  D_CMND_CPUCHECK "|"
+#ifdef DEBUG_THEO
+  D_CMND_EXCEPTION "|"
+#endif
+  D_CMND_FLASHDUMP "|" D_CMND_FLASHMODE "|" D_CMND_FREEMEM"|" D_CMND_HELP "|" D_CMND_RTCDUMP "|" D_CMND_SETSENSOR "|"
+#ifdef USE_I2C
+  D_CMND_I2CWRITE "|" D_CMND_I2CREAD "|" D_CMND_I2CSTRETCH "|" D_CMND_I2CCLOCK
+#endif
+  ;
+
+void (* const DebugCommand[])(void) PROGMEM = {
+  &CmndCfgDump, &CmndCfgPeek, &CmndCfgPoke,
+#ifdef USE_WEBSERVER
+  &CmndCfgXor,
+#endif
+  &CmndCpuCheck,
+#ifdef DEBUG_THEO
+  &CmndException,
+#endif
+  &CmndFlashDump, &CmndFlashMode, &CmndFreemem, &CmndHelp, &CmndRtcDump, &CmndSetSensor,
+#ifdef USE_I2C
+  &CmndI2cWrite, &CmndI2cRead, &CmndI2cStretch, &CmndI2cClock
+#endif
+  };
+
+uint32_t CPU_loops = 0;
+uint32_t CPU_last_millis = 0;
+uint32_t CPU_last_loop_time = 0;
+uint8_t CPU_load_check = 0;
+uint8_t CPU_show_freemem = 0;
+
+
+
+#ifdef DEBUG_THEO
+void ExceptionTest(uint8_t type)
+{
+# 145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
+  if (1 == type) {
+    char svalue[10];
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7);
+  }
+# 159 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
+  if (2 == type) {
+    while(1) delay(1000);
+  }
+}
+
+#endif
+
+
+
+void CpuLoadLoop(void)
+{
+  CPU_last_loop_time = millis();
+  if (CPU_load_check && CPU_last_millis) {
+    CPU_loops ++;
+    if ((CPU_last_millis + (CPU_load_check *1000)) <= CPU_last_loop_time) {
+#if defined(F_CPU) && (F_CPU == 160000000L)
+      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *800) );
+      CPU_loops = CPU_loops / CPU_load_check;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(160MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
+#else
+      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *400) );
+      CPU_loops = CPU_loops / CPU_load_check;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(80MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
+#endif
+      CPU_last_millis = CPU_last_loop_time;
+      CPU_loops = 0;
+    }
+  }
+}
+
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
+
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t g_cont;
+}
+
+void DebugFreeMem(void)
+{
+  register uint32_t *sp asm("a1");
+
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_cont.stack), XdrvMailbox.data);
+}
+
+#else
+
+
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t* g_pcont;
+}
+
+void DebugFreeMem(void)
+{
+  register uint32_t *sp asm("a1");
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_pcont->stack), XdrvMailbox.data);
+}
+
+#endif
+
+
+
+void DebugRtcDump(char* parms)
+{
+  #define CFG_COLS 16
+
+  uint16_t idx;
+  uint16_t maxrow;
+  uint16_t row;
+  uint16_t col;
+  char *p;
+# 246 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
+  uint8_t buffer[768];
+
+  system_rtc_mem_read(0, (uint32_t*)&buffer, sizeof(buffer));
+
+  maxrow = ((sizeof(buffer)+CFG_COLS)/CFG_COLS);
+
+  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
+  uint16_t mrow = strtol(p, &p, 10);
+
+
+
+  if (0 == mrow) {
+    mrow = 8;
+  }
+  if (srow > maxrow) {
+    srow = maxrow - mrow;
+  }
+  if (mrow < (maxrow - srow)) {
+    maxrow = srow + mrow;
+  }
+
+  for (row = srow; row < maxrow; row++) {
+    idx = row * CFG_COLS;
+    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
+    for (col = 0; col < CFG_COLS; col++) {
+      if (!(col%4)) {
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
+      }
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+    for (col = 0; col < CFG_COLS; col++) {
+
+
+
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
+    AddLog(LOG_LEVEL_INFO);
+  }
+}
+
+
+
+void DebugCfgDump(char* parms)
+{
+  #define CFG_COLS 16
+
+  uint16_t idx;
+  uint16_t maxrow;
+  uint16_t row;
+  uint16_t col;
+  char *p;
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  maxrow = ((sizeof(SYSCFG)+CFG_COLS)/CFG_COLS);
+
+  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
+  uint16_t mrow = strtol(p, &p, 10);
+
+
+
+  if (0 == mrow) {
+    mrow = 8;
+  }
+  if (srow > maxrow) {
+    srow = maxrow - mrow;
+  }
+  if (mrow < (maxrow - srow)) {
+    maxrow = srow + mrow;
+  }
+
+  for (row = srow; row < maxrow; row++) {
+    idx = row * CFG_COLS;
+    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
+    for (col = 0; col < CFG_COLS; col++) {
+      if (!(col%4)) {
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
+      }
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+    for (col = 0; col < CFG_COLS; col++) {
+
+
+
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
+    AddLog(LOG_LEVEL_INFO);
+    delay(1);
+  }
+}
+
+void DebugCfgPeek(char* parms)
+{
+  char *p;
+
+  uint16_t address = strtol(parms, &p, 16);
+  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
+  address = (address >> 2) << 2;
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  uint8_t data8 = buffer[address];
+  uint16_t data16 = (buffer[address +1] << 8) + buffer[address];
+  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + data16;
+
+  snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), address);
+  for (uint32_t i = 0; i < 4; i++) {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[address +i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+  for (uint32_t i = 0; i < 4; i++) {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[address +i] > 0x20) && (buffer[address +i] < 0x7F)) ? (char)buffer[address +i] : ' ');
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s| 0x%02X (%d), 0x%04X (%d), 0x%0LX (%lu)"), log_data, data8, data8, data16, data16, data32, data32);
+  AddLog(LOG_LEVEL_INFO);
+}
+
+void DebugCfgPoke(char* parms)
+{
+  char *p;
+
+  uint16_t address = strtol(parms, &p, 16);
+  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
+  address = (address >> 2) << 2;
+
+  uint32_t data = strtol(p, &p, 16);
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
+
+  uint8_t *nbuffer = (uint8_t *) &data;
+  for (uint32_t i = 0; i < 4; i++) { buffer[address +i] = nbuffer[+i]; }
+
+  uint32_t ndata32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%03X: 0x%0LX (%lu) poked to 0x%0LX (%lu)"), address, data32, data32, ndata32, ndata32);
+}
+
+void SetFlashMode(uint8_t mode)
+{
+  uint8_t *_buffer;
+  uint32_t address;
+
+  address = 0;
+  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
+
+  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
+    if (_buffer[2] != mode) {
+      _buffer[2] = mode;
+      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
+        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
+      }
+    }
+  }
+  delete[] _buffer;
+}
+
+
+
+
+
+void CmndHelp(void)
+{
+  AddLog_P(LOG_LEVEL_INFO, PSTR("HLP: "), kDebugCommands);
+  ResponseCmndDone();
+}
+
+void CmndRtcDump(void)
+{
+  DebugRtcDump(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgDump(void)
+{
+  DebugCfgDump(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgPeek(void)
+{
+  DebugCfgPeek(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgPoke(void)
+{
+  DebugCfgPoke(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+#ifdef USE_WEBSERVER
+void CmndCfgXor(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Web.config_xor_on_set = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Web.config_xor_on_set);
+}
+#endif
+
+#ifdef DEBUG_THEO
+void CmndException(void)
+{
+  if (XdrvMailbox.data_len > 0) { ExceptionTest(XdrvMailbox.payload); }
+  ResponseCmndDone();
+}
+#endif
+
+void CmndCpuCheck(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    CPU_load_check = XdrvMailbox.payload;
+    CPU_last_millis = CPU_last_loop_time;
+  }
+  ResponseCmndNumber(CPU_load_check);
+}
+
+void CmndFreemem(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    CPU_show_freemem = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(CPU_show_freemem);
+}
+
+void CmndSetSensor(void)
+{
+  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+      if (1 == XdrvMailbox.payload) {
+        restart_flag = 2;
+      }
+    }
+    Response_P(PSTR("{\"" D_CMND_SETSENSOR "\":"));
+    XsnsSensorState();
+    ResponseJsonEnd();
+  }
+}
+
+void CmndFlashMode(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    SetFlashMode(XdrvMailbox.payload);
+  }
+  ResponseCmndNumber(ESP.getFlashChipMode());
+}
+
+uint32_t DebugSwap32(uint32_t x) {
+ return ((x << 24) & 0xff000000 ) |
+  ((x << 8) & 0x00ff0000 ) |
+  ((x >> 8) & 0x0000ff00 ) |
+  ((x >> 24) & 0x000000ff );
+}
+
+void CmndFlashDump(void)
+{
+
+
+
+  const uint32_t flash_start = 0x40200000;
+  const uint8_t bytes_per_cols = 0x20;
+  const uint32_t max = (SPIFFS_END + 5) * SPI_FLASH_SEC_SIZE;
+
+  uint32_t start = flash_start;
+  uint32_t rows = 8;
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= (max - bytes_per_cols))) {
+    start += (XdrvMailbox.payload &0x7FFFFFFC);
+
+    char *p;
+    uint32_t is_payload = strtol(XdrvMailbox.data, &p, 16);
+    rows = strtol(p, &p, 10);
+    if (0 == rows) { rows = 8; }
+  }
+  uint32_t end = start + (rows * bytes_per_cols);
+  if ((end - flash_start) > max) {
+    end = flash_start + max;
+  }
+
+  for (uint32_t pos = start; pos < end; pos += bytes_per_cols) {
+    uint32_t* values = (uint32_t*)(pos);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%06X:  %08X %08X %08X %08X  %08X %08X %08X %08X"), pos - flash_start,
+      DebugSwap32(values[0]), DebugSwap32(values[1]), DebugSwap32(values[2]), DebugSwap32(values[3]),
+      DebugSwap32(values[4]), DebugSwap32(values[5]), DebugSwap32(values[6]), DebugSwap32(values[7]));
+  }
+  ResponseCmndDone();
+}
+
+#ifdef USE_I2C
+void CmndI2cWrite(void)
+{
+
+  if (i2c_flg) {
+    char* parms = XdrvMailbox.data;
+    uint8_t buffer[100];
+    uint32_t index = 0;
+
+    char *p;
+    char *data = strtok_r(parms, " ,", &p);
+    while (data != NULL && index < sizeof(buffer)) {
+      buffer[index++] = strtol(data, nullptr, 16);
+      data = strtok_r(nullptr, " ,", &p);
+    }
+
+    if (index > 1) {
+      AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
+
+      Wire.beginTransmission(buffer[0]);
+      for (uint32_t i = 1; i < index; i++) {
+        Wire.write(buffer[i]);
+      }
+      int result = Wire.endTransmission();
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("I2C: Result %d"), result);
+    }
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cRead(void)
+{
+
+  if (i2c_flg) {
+    char* parms = XdrvMailbox.data;
+    uint8_t buffer[100];
+    uint32_t index = 0;
+
+    char *p;
+    char *data = strtok_r(parms, " ,", &p);
+    while (data != NULL && index < sizeof(buffer)) {
+      buffer[index++] = strtol(data, nullptr, 16);
+      data = strtok_r(nullptr, " ,", &p);
+    }
+
+    if (index > 0) {
+      uint8_t size = 1;
+      if (index > 1) {
+        size = buffer[1];
+      }
+      Wire.requestFrom(buffer[0], size);
+      index = 0;
+      while (Wire.available() && index < sizeof(buffer)) {
+        buffer[index++] = Wire.read();
+      }
+      if (index > 0) {
+        AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
+      }
+    }
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cStretch(void)
+{
+  if (i2c_flg && (XdrvMailbox.payload > 0)) {
+    Wire.setClockStretchLimit(XdrvMailbox.payload);
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cClock(void)
+{
+  if (i2c_flg && (XdrvMailbox.payload > 0)) {
+    Wire.setClock(XdrvMailbox.payload);
+  }
+  ResponseCmndDone();
+}
+#endif
+
+
+
+
+
+bool Xdrv99(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      CpuLoadLoop();
+      break;
+    case FUNC_FREE_MEM:
+      if (CPU_show_freemem) { DebugFreeMem(); }
+      break;
+    case FUNC_PRE_INIT:
+      CPU_last_millis = millis();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kDebugCommands, DebugCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_interface.ino"
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xdrv_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xdrv_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XDRV_01
+  &Xdrv01,
+#endif
+
+#ifdef XDRV_02
+  &Xdrv02,
+#endif
+
+#ifdef XDRV_03
+  &Xdrv03,
+#endif
+
+#ifdef XDRV_04
+  &Xdrv04,
+#endif
+
+#ifdef XDRV_05
+  &Xdrv05,
+#endif
+
+#ifdef XDRV_06
+  &Xdrv06,
+#endif
+
+#ifdef XDRV_07
+  &Xdrv07,
+#endif
+
+#ifdef XDRV_08
+  &Xdrv08,
+#endif
+
+#ifdef XDRV_09
+  &Xdrv09,
+#endif
+
+#ifdef XDRV_10
+  &Xdrv10,
+#endif
+
+#ifdef XDRV_11
+  &Xdrv11,
+#endif
+
+#ifdef XDRV_12
+  &Xdrv12,
+#endif
+
+#ifdef XDRV_13
+  &Xdrv13,
+#endif
+
+#ifdef XDRV_14
+  &Xdrv14,
+#endif
+
+#ifdef XDRV_15
+  &Xdrv15,
+#endif
+
+#ifdef XDRV_16
+  &Xdrv16,
+#endif
+
+#ifdef XDRV_17
+  &Xdrv17,
+#endif
+
+#ifdef XDRV_18
+  &Xdrv18,
+#endif
+
+#ifdef XDRV_19
+  &Xdrv19,
+#endif
+
+#ifdef XDRV_20
+  &Xdrv20,
+#endif
+
+#ifdef XDRV_21
+  &Xdrv21,
+#endif
+
+#ifdef XDRV_22
+  &Xdrv22,
+#endif
+
+#ifdef XDRV_23
+  &Xdrv23,
+#endif
+
+#ifdef XDRV_24
+  &Xdrv24,
+#endif
+
+#ifdef XDRV_25
+  &Xdrv25,
+#endif
+
+#ifdef XDRV_26
+  &Xdrv26,
+#endif
+
+#ifdef XDRV_27
+  &Xdrv27,
+#endif
+
+#ifdef XDRV_28
+  &Xdrv28,
+#endif
+
+#ifdef XDRV_29
+  &Xdrv29,
+#endif
+
+#ifdef XDRV_30
+  &Xdrv30,
+#endif
+
+#ifdef XDRV_31
+  &Xdrv31,
+#endif
+
+#ifdef XDRV_32
+  &Xdrv32,
+#endif
+
+#ifdef XDRV_33
+  &Xdrv33,
+#endif
+
+#ifdef XDRV_34
+  &Xdrv34,
+#endif
+
+#ifdef XDRV_35
+  &Xdrv35,
+#endif
+
+#ifdef XDRV_36
+  &Xdrv36,
+#endif
+
+#ifdef XDRV_37
+  &Xdrv37,
+#endif
+
+#ifdef XDRV_38
+  &Xdrv38,
+#endif
+
+#ifdef XDRV_39
+  &Xdrv39,
+#endif
+
+#ifdef XDRV_40
+  &Xdrv40,
+#endif
+
+#ifdef XDRV_41
+  &Xdrv41,
+#endif
+
+#ifdef XDRV_42
+  &Xdrv42,
+#endif
+
+#ifdef XDRV_43
+  &Xdrv43,
+#endif
+
+#ifdef XDRV_44
+  &Xdrv44,
+#endif
+
+#ifdef XDRV_45
+  &Xdrv45,
+#endif
+
+#ifdef XDRV_46
+  &Xdrv46,
+#endif
+
+#ifdef XDRV_47
+  &Xdrv47,
+#endif
+
+#ifdef XDRV_48
+  &Xdrv48,
+#endif
+
+#ifdef XDRV_49
+  &Xdrv49,
+#endif
+
+#ifdef XDRV_50
+  &Xdrv50,
+#endif
+
+#ifdef XDRV_51
+  &Xdrv51,
+#endif
+
+#ifdef XDRV_52
+  &Xdrv52,
+#endif
+
+#ifdef XDRV_53
+  &Xdrv53,
+#endif
+
+#ifdef XDRV_54
+  &Xdrv54,
+#endif
+
+#ifdef XDRV_55
+  &Xdrv55,
+#endif
+
+#ifdef XDRV_56
+  &Xdrv56,
+#endif
+
+#ifdef XDRV_57
+  &Xdrv57,
+#endif
+
+#ifdef XDRV_58
+  &Xdrv58,
+#endif
+
+#ifdef XDRV_59
+  &Xdrv59,
+#endif
+
+#ifdef XDRV_60
+  &Xdrv60,
+#endif
+
+#ifdef XDRV_61
+  &Xdrv61,
+#endif
+
+#ifdef XDRV_62
+  &Xdrv62,
+#endif
+
+#ifdef XDRV_63
+  &Xdrv63,
+#endif
+
+#ifdef XDRV_64
+  &Xdrv64,
+#endif
+
+#ifdef XDRV_65
+  &Xdrv65,
+#endif
+
+#ifdef XDRV_66
+  &Xdrv66,
+#endif
+
+#ifdef XDRV_67
+  &Xdrv67,
+#endif
+
+#ifdef XDRV_68
+  &Xdrv68,
+#endif
+
+#ifdef XDRV_69
+  &Xdrv69,
+#endif
+
+#ifdef XDRV_70
+  &Xdrv70,
+#endif
+
+#ifdef XDRV_71
+  &Xdrv71,
+#endif
+
+#ifdef XDRV_72
+  &Xdrv72,
+#endif
+
+#ifdef XDRV_73
+  &Xdrv73,
+#endif
+
+#ifdef XDRV_74
+  &Xdrv74,
+#endif
+
+#ifdef XDRV_75
+  &Xdrv75,
+#endif
+
+#ifdef XDRV_76
+  &Xdrv76,
+#endif
+
+#ifdef XDRV_77
+  &Xdrv77,
+#endif
+
+#ifdef XDRV_78
+  &Xdrv78,
+#endif
+
+#ifdef XDRV_79
+  &Xdrv79,
+#endif
+
+#ifdef XDRV_80
+  &Xdrv80,
+#endif
+
+#ifdef XDRV_81
+  &Xdrv81,
+#endif
+
+#ifdef XDRV_82
+  &Xdrv82,
+#endif
+
+#ifdef XDRV_83
+  &Xdrv83,
+#endif
+
+#ifdef XDRV_84
+  &Xdrv84,
+#endif
+
+#ifdef XDRV_85
+  &Xdrv85,
+#endif
+
+#ifdef XDRV_86
+  &Xdrv86,
+#endif
+
+#ifdef XDRV_87
+  &Xdrv87,
+#endif
+
+#ifdef XDRV_88
+  &Xdrv88,
+#endif
+
+#ifdef XDRV_89
+  &Xdrv89,
+#endif
+
+#ifdef XDRV_90
+  &Xdrv90,
+#endif
+
+#ifdef XDRV_91
+  &Xdrv91,
+#endif
+
+#ifdef XDRV_92
+  &Xdrv92,
+#endif
+
+#ifdef XDRV_93
+  &Xdrv93,
+#endif
+
+#ifdef XDRV_94
+  &Xdrv94,
+#endif
+
+#ifdef XDRV_95
+  &Xdrv95,
+#endif
+
+#ifdef XDRV_96
+  &Xdrv96,
+#endif
+
+#ifdef XDRV_97
+  &Xdrv97,
+#endif
+
+#ifdef XDRV_98
+  &Xdrv98,
+#endif
+
+#ifdef XDRV_99
+  &Xdrv99
+#endif
+};
+
+const uint8_t xdrv_present = sizeof(xdrv_func_ptr) / sizeof(xdrv_func_ptr[0]);
+
+
+
+
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kXdrvList[] PROGMEM = {
+#else
+const uint8_t kXdrvList[] = {
+#endif
+
+#ifdef XDRV_01
+  XDRV_01,
+#endif
+
+#ifdef XDRV_02
+  XDRV_02,
+#endif
+
+#ifdef XDRV_03
+  XDRV_03,
+#endif
+
+#ifdef XDRV_04
+  XDRV_04,
+#endif
+
+#ifdef XDRV_05
+  XDRV_05,
+#endif
+
+#ifdef XDRV_06
+  XDRV_06,
+#endif
+
+#ifdef XDRV_07
+  XDRV_07,
+#endif
+
+#ifdef XDRV_08
+  XDRV_08,
+#endif
+
+#ifdef XDRV_09
+  XDRV_09,
+#endif
+
+#ifdef XDRV_10
+  XDRV_10,
+#endif
+
+#ifdef XDRV_11
+  XDRV_11,
+#endif
+
+#ifdef XDRV_12
+  XDRV_12,
+#endif
+
+#ifdef XDRV_13
+  XDRV_13,
+#endif
+
+#ifdef XDRV_14
+  XDRV_14,
+#endif
+
+#ifdef XDRV_15
+  XDRV_15,
+#endif
+
+#ifdef XDRV_16
+  XDRV_16,
+#endif
+
+#ifdef XDRV_17
+  XDRV_17,
+#endif
+
+#ifdef XDRV_18
+  XDRV_18,
+#endif
+
+#ifdef XDRV_19
+  XDRV_19,
+#endif
+
+#ifdef XDRV_20
+  XDRV_20,
+#endif
+
+#ifdef XDRV_21
+  XDRV_21,
+#endif
+
+#ifdef XDRV_22
+  XDRV_22,
+#endif
+
+#ifdef XDRV_23
+  XDRV_23,
+#endif
+
+#ifdef XDRV_24
+  XDRV_24,
+#endif
+
+#ifdef XDRV_25
+  XDRV_25,
+#endif
+
+#ifdef XDRV_26
+  XDRV_26,
+#endif
+
+#ifdef XDRV_27
+  XDRV_27,
+#endif
+
+#ifdef XDRV_28
+  XDRV_28,
+#endif
+
+#ifdef XDRV_29
+  XDRV_29,
+#endif
+
+#ifdef XDRV_30
+  XDRV_30,
+#endif
+
+#ifdef XDRV_31
+  XDRV_31,
+#endif
+
+#ifdef XDRV_32
+  XDRV_32,
+#endif
+
+#ifdef XDRV_33
+  XDRV_33,
+#endif
+
+#ifdef XDRV_34
+  XDRV_34,
+#endif
+
+#ifdef XDRV_35
+  XDRV_35,
+#endif
+
+#ifdef XDRV_36
+  XDRV_36,
+#endif
+
+#ifdef XDRV_37
+  XDRV_37,
+#endif
+
+#ifdef XDRV_38
+  XDRV_38,
+#endif
+
+#ifdef XDRV_39
+  XDRV_39,
+#endif
+
+#ifdef XDRV_40
+  XDRV_40,
+#endif
+
+#ifdef XDRV_41
+  XDRV_41,
+#endif
+
+#ifdef XDRV_42
+  XDRV_42,
+#endif
+
+#ifdef XDRV_43
+  XDRV_43,
+#endif
+
+#ifdef XDRV_44
+  XDRV_44,
+#endif
+
+#ifdef XDRV_45
+  XDRV_45,
+#endif
+
+#ifdef XDRV_46
+  XDRV_46,
+#endif
+
+#ifdef XDRV_47
+  XDRV_47,
+#endif
+
+#ifdef XDRV_48
+  XDRV_48,
+#endif
+
+#ifdef XDRV_49
+  XDRV_49,
+#endif
+
+#ifdef XDRV_50
+  XDRV_50,
+#endif
+
+#ifdef XDRV_51
+  XDRV_51,
+#endif
+
+#ifdef XDRV_52
+  XDRV_52,
+#endif
+
+#ifdef XDRV_53
+  XDRV_53,
+#endif
+
+#ifdef XDRV_54
+  XDRV_54,
+#endif
+
+#ifdef XDRV_55
+  XDRV_55,
+#endif
+
+#ifdef XDRV_56
+  XDRV_56,
+#endif
+
+#ifdef XDRV_57
+  XDRV_57,
+#endif
+
+#ifdef XDRV_58
+  XDRV_58,
+#endif
+
+#ifdef XDRV_59
+  XDRV_59,
+#endif
+
+#ifdef XDRV_60
+  XDRV_60,
+#endif
+
+#ifdef XDRV_61
+  XDRV_61,
+#endif
+
+#ifdef XDRV_62
+  XDRV_62,
+#endif
+
+#ifdef XDRV_63
+  XDRV_63,
+#endif
+
+#ifdef XDRV_64
+  XDRV_64,
+#endif
+
+#ifdef XDRV_65
+  XDRV_65,
+#endif
+
+#ifdef XDRV_66
+  XDRV_66,
+#endif
+
+#ifdef XDRV_67
+  XDRV_67,
+#endif
+
+#ifdef XDRV_68
+  XDRV_68,
+#endif
+
+#ifdef XDRV_69
+  XDRV_69,
+#endif
+
+#ifdef XDRV_70
+  XDRV_70,
+#endif
+
+#ifdef XDRV_71
+  XDRV_71,
+#endif
+
+#ifdef XDRV_72
+  XDRV_72,
+#endif
+
+#ifdef XDRV_73
+  XDRV_73,
+#endif
+
+#ifdef XDRV_74
+  XDRV_74,
+#endif
+
+#ifdef XDRV_75
+  XDRV_75,
+#endif
+
+#ifdef XDRV_76
+  XDRV_76,
+#endif
+
+#ifdef XDRV_77
+  XDRV_77,
+#endif
+
+#ifdef XDRV_78
+  XDRV_78,
+#endif
+
+#ifdef XDRV_79
+  XDRV_79,
+#endif
+
+#ifdef XDRV_80
+  XDRV_80,
+#endif
+
+#ifdef XDRV_81
+  XDRV_81,
+#endif
+
+#ifdef XDRV_82
+  XDRV_82,
+#endif
+
+#ifdef XDRV_83
+  XDRV_83,
+#endif
+
+#ifdef XDRV_84
+  XDRV_84,
+#endif
+
+#ifdef XDRV_85
+  XDRV_85,
+#endif
+
+#ifdef XDRV_86
+  XDRV_86,
+#endif
+
+#ifdef XDRV_87
+  XDRV_87,
+#endif
+
+#ifdef XDRV_88
+  XDRV_88,
+#endif
+
+#ifdef XDRV_89
+  XDRV_89,
+#endif
+
+#ifdef XDRV_90
+  XDRV_90,
+#endif
+
+#ifdef XDRV_91
+  XDRV_91,
+#endif
+
+#ifdef XDRV_92
+  XDRV_92,
+#endif
+
+#ifdef XDRV_93
+  XDRV_93,
+#endif
+
+#ifdef XDRV_94
+  XDRV_94,
+#endif
+
+#ifdef XDRV_95
+  XDRV_95,
+#endif
+
+#ifdef XDRV_96
+  XDRV_96,
+#endif
+
+#ifdef XDRV_97
+  XDRV_97,
+#endif
+
+#ifdef XDRV_98
+  XDRV_98,
+#endif
+
+#ifdef XDRV_99
+  XDRV_99
+#endif
+};
+
+
+
+void XsnsDriverState(void)
+{
+  ResponseAppend_P(PSTR(",\"Drivers\":\""));
+  for (uint32_t i = 0; i < sizeof(kXdrvList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t driverid = pgm_read_byte(kXdrvList + i);
+#else
+    uint32_t driverid = kXdrvList[i];
+#endif
+    ResponseAppend_P(PSTR("%s%d"), (i) ? "," : "", driverid);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+
+
+bool XdrvRulesProcess(void)
+{
+  return XdrvCallDriver(10, FUNC_RULES_PROCESS);
+}
+
+#ifdef USE_DEBUG_DRIVER
+void ShowFreeMem(const char *where)
+{
+  char stemp[30];
+  snprintf_P(stemp, sizeof(stemp), where);
+  XdrvMailbox.data = stemp;
+  XdrvCall(FUNC_FREE_MEM);
+}
+#endif
+
+
+
+
+
+bool XdrvCallDriver(uint32_t driver, uint8_t Function)
+{
+  for (uint32_t x = 0; x < xdrv_present; x++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t listed = pgm_read_byte(kXdrvList + x);
+#else
+    uint32_t listed = kXdrvList[x];
+#endif
+    if (driver == listed) {
+      return xdrv_func_ptr[x](Function);
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool XdrvCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
+
+  for (uint32_t x = 0; x < xdrv_present; x++) {
+    result = xdrv_func_ptr[x](Function);
+
+    if (result && ((FUNC_COMMAND == Function) ||
+                   (FUNC_COMMAND_DRIVER == Function) ||
+                   (FUNC_MQTT_DATA == Function) ||
+                   (FUNC_RULES_PROCESS == Function) ||
+                   (FUNC_BUTTON_PRESSED == Function) ||
+                   (FUNC_SERIAL == Function) ||
+                   (FUNC_MODULE_INIT == Function) ||
+                   (FUNC_SET_CHANNELS == Function) ||
+                   (FUNC_PIN_STATE == Function) ||
+                   (FUNC_SET_DEVICE_POWER == Function)
+                  )) {
+      break;
+    }
+  }
+
+  return result;
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_LCD
+
+#define XDSP_01 1
+#define XI2C_03 3
+
+#define LCD_ADDRESS1 0x27
+#define LCD_ADDRESS2 0x3F
+
+#include <Wire.h>
+#include <LiquidCrystal_I2C.h>
+
+LiquidCrystal_I2C *lcd;
+
+
+
+void LcdInitMode(void)
+{
+  lcd->init();
+  lcd->clear();
+}
+
+void LcdInit(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      LcdInitMode();
+#ifdef USE_DISPLAY_MODES1TO5
+      DisplayClearScreenBuffer();
+#endif
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void LcdInitDriver(void)
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(LCD_ADDRESS1)) {
+      Settings.display_address[0] = LCD_ADDRESS1;
+      Settings.display_model = XDSP_01;
+    }
+    else if (I2cSetDevice(LCD_ADDRESS2)) {
+      Settings.display_address[0] = LCD_ADDRESS2;
+      Settings.display_model = XDSP_01;
+    }
+  }
+
+  if (XDSP_01 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "LCD");
+
+    Settings.display_width = Settings.display_cols[0];
+    Settings.display_height = Settings.display_rows;
+    lcd = new LiquidCrystal_I2C(Settings.display_address[0], Settings.display_cols[0], Settings.display_rows);
+
+#ifdef USE_DISPLAY_MODES1TO5
+    DisplayAllocScreenBuffer();
+#endif
+
+    LcdInitMode();
+  }
+}
+
+void LcdDrawStringAt(void)
+{
+  if (dsp_flag) {
+    dsp_x--;
+    dsp_y--;
+  }
+  lcd->setCursor(dsp_x, dsp_y);
+  lcd->print(dsp_str);
+}
+
+void LcdDisplayOnOff(uint8_t on)
+{
+  if (on) {
+    lcd->backlight();
+  } else {
+    lcd->noBacklight();
+  }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void LcdCenter(uint8_t row, char* txt)
+{
+  char line[Settings.display_cols[0] +2];
+
+  int len = strlen(txt);
+  int offset = 0;
+  if (len >= Settings.display_cols[0]) {
+    len = Settings.display_cols[0];
+  } else {
+    offset = (Settings.display_cols[0] - len) / 2;
+  }
+  memset(line, 0x20, Settings.display_cols[0]);
+  line[Settings.display_cols[0]] = 0;
+  for (uint32_t i = 0; i < len; i++) {
+    line[offset +i] = txt[i];
+  }
+  lcd->setCursor(0, row);
+  lcd->print(line);
+}
+
+bool LcdPrintLog(void)
+{
+  bool result = false;
+
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\337');
+    if (txt != nullptr) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      for (uint32_t i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        lcd->setCursor(0, i);
+        lcd->print(disp_screen_buffer[i +1]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      lcd->setCursor(0, last_row);
+      lcd->print(disp_screen_buffer[last_row]);
+
+      result = true;
+    }
+  }
+  return result;
+}
+
+void LcdTime(void)
+{
+  char line[Settings.display_cols[0] +1];
+
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  LcdCenter(0, line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  LcdCenter(1, line);
+}
+
+void LcdRefresh(void)
+{
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        LcdTime();
+        break;
+      case 2:
+      case 4:
+        LcdPrintLog();
+        break;
+      case 3:
+      case 5: {
+        if (!LcdPrintLog()) { LcdTime(); }
+        break;
+      }
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp01(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_03)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    LcdInitDriver();
+  }
+  else if (XDSP_01 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_INIT:
+        LcdInit(dsp_init);
+        break;
+      case FUNC_DISPLAY_POWER:
+        LcdDisplayOnOff(disp_power);
+        break;
+      case FUNC_DISPLAY_CLEAR:
+        lcd->clear();
+        break;
+# 238 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
+      case FUNC_DISPLAY_DRAW_STRING:
+        LcdDrawStringAt();
+        break;
+      case FUNC_DISPLAY_ONOFF:
+        LcdDisplayOnOff(dsp_on);
+        break;
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        LcdRefresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_02_ssd1306.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_02_ssd1306.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SSD1306
+
+#define XDSP_02 2
+#define XI2C_04 4
+
+#define OLED_RESET 4
+
+#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
+
+#define OLED_ADDRESS1 0x3C
+#define OLED_ADDRESS2 0x3D
+
+#define OLED_BUFFER_COLS 40
+#define OLED_BUFFER_ROWS 16
+
+#define OLED_FONT_WIDTH 6
+#define OLED_FONT_HEIGTH 8
+
+#include <Wire.h>
+#include <renderer.h>
+#include <Adafruit_SSD1306.h>
+
+Adafruit_SSD1306 *oled1306;
+
+extern uint8_t *buffer;
+
+
+
+void SSD1306InitDriver(void)
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(OLED_ADDRESS1)) {
+      Settings.display_address[0] = OLED_ADDRESS1;
+      Settings.display_model = XDSP_02;
+    }
+    else if (I2cSetDevice(OLED_ADDRESS2)) {
+      Settings.display_address[0] = OLED_ADDRESS2;
+      Settings.display_model = XDSP_02;
+    }
+  }
+
+  if (XDSP_02 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "SSD1306");
+
+    if ((Settings.display_width != 64) && (Settings.display_width != 96) && (Settings.display_width != 128)) {
+      Settings.display_width = 128;
+    }
+    if ((Settings.display_height != 16) && (Settings.display_height != 32) && (Settings.display_height != 48) && (Settings.display_height != 64)) {
+      Settings.display_height = 64;
+    }
+
+    uint8_t reset_pin = -1;
+    if (pin[GPIO_OLED_RESET] < 99) {
+      reset_pin = pin[GPIO_OLED_RESET];
+    }
+
+
+    if (buffer) { free(buffer); }
+    buffer = (unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1);
+    if (!buffer) { return; }
+
+
+
+    oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin);
+    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], reset_pin >= 0);
+    renderer = oled1306;
+    renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+    renderer->setTextFont(0);
+    renderer->setTextSize(2);
+    renderer->setCursor(20,20);
+    renderer->println(F("SSD1306"));
+    renderer->Updateframe();
+    renderer->DisplayOnff(1);
+#endif
+
+  }
+}
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void Ssd1306PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void Ssd1306Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(Settings.display_size);
+  renderer->setTextFont(Settings.display_font);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void Ssd1306Refresh(void)
+{
+  if (!renderer) return;
+
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        Ssd1306Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        Ssd1306PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp02(byte function)
+{
+  if (!I2cEnabled(XI2C_04)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    SSD1306InitDriver();
+  }
+  else if (XDSP_02 == Settings.display_model) {
+    switch (function) {
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        Ssd1306Refresh();
+        break;
+#endif
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_03_matrix.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_03_matrix.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_MATRIX
+
+#define XDSP_03 3
+#define XI2C_05 5
+
+#define MTX_MAX_SCREEN_BUFFER 80
+
+#include <Wire.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_LEDBackpack.h>
+
+Adafruit_8x8matrix *matrix[8];
+uint8_t mtx_matrices = 0;
+uint8_t mtx_state = 0;
+uint8_t mtx_counter = 0;
+int16_t mtx_x = 0;
+int16_t mtx_y = 0;
+
+
+char *mtx_buffer = nullptr;
+
+uint8_t mtx_mode = 0;
+uint8_t mtx_loop = 0;
+uint8_t mtx_done = 0;
+
+
+
+void MatrixWrite(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->writeDisplay();
+  }
+}
+
+void MatrixClear(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+  }
+  MatrixWrite();
+}
+
+void MatrixFixed(char* txt)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+    matrix[i]->setCursor(-i *8, 0);
+    matrix[i]->print(txt);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+  }
+  MatrixWrite();
+}
+
+void MatrixCenter(char* txt)
+{
+  int offset;
+
+  int len = strlen(txt);
+  offset = (len < 8) ? offset = ((mtx_matrices *8) - (len *6)) / 2 : 0;
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+    matrix[i]->setCursor(-(i *8)+offset, 0);
+    matrix[i]->print(txt);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+  }
+  MatrixWrite();
+}
+
+void MatrixScrollLeft(char* txt, int loop)
+{
+  switch (mtx_state) {
+  case 1:
+    mtx_state = 2;
+
+    mtx_x = 8 * mtx_matrices;
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), txt);
+
+    disp_refresh = Settings.display_refresh;
+  case 2:
+  disp_refresh--;
+    if (!disp_refresh) {
+      disp_refresh = Settings.display_refresh;
+      for (uint32_t i = 0; i < mtx_matrices; i++) {
+        matrix[i]->clear();
+        matrix[i]->setCursor(mtx_x - i *8, 0);
+        matrix[i]->print(txt);
+        matrix[i]->setBrightness(Settings.display_dimmer);
+      }
+      MatrixWrite();
+
+      mtx_x--;
+      int16_t len = strlen(txt);
+      if (mtx_x < -(len *6)) { mtx_state = loop; }
+    }
+    break;
+  }
+}
+
+void MatrixScrollUp(char* txt, int loop)
+{
+  int wordcounter = 0;
+  char tmpbuf[200];
+  char *words[100];
+
+
+
+  char separators[] = " /";
+
+  switch (mtx_state) {
+  case 1:
+    mtx_state = 2;
+
+    mtx_y = 8;
+    mtx_counter = 0;
+    disp_refresh = Settings.display_refresh;
+  case 2:
+    disp_refresh--;
+    if (!disp_refresh) {
+      disp_refresh = Settings.display_refresh;
+      strlcpy(tmpbuf, txt, sizeof(tmpbuf));
+      char *p = strtok(tmpbuf, separators);
+      while (p != nullptr && wordcounter < 40) {
+        words[wordcounter++] = p;
+        p = strtok(nullptr, separators);
+      }
+      for (uint32_t i = 0; i < mtx_matrices; i++) {
+        matrix[i]->clear();
+        for (uint32_t j = 0; j < wordcounter; j++) {
+          matrix[i]->setCursor(-i *8, mtx_y + (j *8));
+          matrix[i]->println(words[j]);
+        }
+        matrix[i]->setBrightness(Settings.display_dimmer);
+      }
+      MatrixWrite();
+      if (((mtx_y %8) == 0) && mtx_counter) {
+        mtx_counter--;
+      } else {
+        mtx_y--;
+        mtx_counter = STATES * 1;
+      }
+      if (mtx_y < -(wordcounter *8)) { mtx_state = loop; }
+    }
+    break;
+  }
+}
+
+
+
+void MatrixInitMode(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->setRotation(Settings.display_rotate);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+    matrix[i]->blinkRate(0);
+    matrix[i]->setTextWrap(false);
+
+
+    matrix[i]->cp437(true);
+  }
+  MatrixClear();
+}
+
+void MatrixInit(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      MatrixInitMode();
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void MatrixInitDriver(void)
+{
+  mtx_buffer = (char*)(malloc(MTX_MAX_SCREEN_BUFFER));
+  if (mtx_buffer != nullptr) {
+    if (!Settings.display_model) {
+      if (I2cSetDevice(Settings.display_address[1])) {
+        Settings.display_model = XDSP_03;
+      }
+    }
+
+    if (XDSP_03 == Settings.display_model) {
+      mtx_state = 1;
+      for (mtx_matrices = 0; mtx_matrices < 8; mtx_matrices++) {
+        if (Settings.display_address[mtx_matrices]) {
+          I2cSetActiveFound(Settings.display_address[mtx_matrices], "8x8Matrix");
+          matrix[mtx_matrices] = new Adafruit_8x8matrix();
+          matrix[mtx_matrices]->begin(Settings.display_address[mtx_matrices]);
+        } else {
+          break;
+        }
+      }
+
+      Settings.display_width = mtx_matrices * 8;
+      Settings.display_height = 8;
+
+      MatrixInitMode();
+    }
+  }
+}
+
+void MatrixOnOff(void)
+{
+  if (!disp_power) { MatrixClear(); }
+}
+
+void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  strlcpy(mtx_buffer, str, MTX_MAX_SCREEN_BUFFER);
+  mtx_mode = x &1;
+  mtx_loop = y &1;
+  if (!mtx_state) { mtx_state = 1; }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void MatrixPrintLog(uint8_t direction)
+{
+  char* txt = (!mtx_done) ? DisplayLogBuffer('\370') : mtx_buffer;
+  if (txt != nullptr) {
+    if (!mtx_state) { mtx_state = 1; }
+
+    if (!mtx_done) {
+
+      uint8_t space = 0;
+      uint8_t max_cols = (disp_log_buffer_cols < MTX_MAX_SCREEN_BUFFER) ? disp_log_buffer_cols : MTX_MAX_SCREEN_BUFFER;
+      mtx_buffer[0] = '\0';
+      uint8_t i = 0;
+      while ((txt[i] != '\0') && (i < max_cols)) {
+        if (txt[i] == ' ') {
+          space++;
+        } else {
+          space = 0;
+        }
+        if (space < 2) {
+          strncat(mtx_buffer, (const char*)txt +i, (strlen(mtx_buffer) < MTX_MAX_SCREEN_BUFFER -1) ? 1 : 0);
+        }
+        i++;
+      }
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), mtx_buffer);
+
+      mtx_done = 1;
+    }
+
+    if (direction) {
+      MatrixScrollUp(mtx_buffer, 0);
+    } else {
+      MatrixScrollLeft(mtx_buffer, 0);
+    }
+    if (!mtx_state) { mtx_done = 0; }
+  } else {
+    char disp_time[9];
+
+    snprintf_P(disp_time, sizeof(disp_time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+    MatrixFixed(disp_time);
+  }
+}
+
+#endif
+
+void MatrixRefresh(void)
+{
+  if (disp_power) {
+    switch (Settings.display_mode) {
+      case 0: {
+        switch (mtx_mode) {
+          case 0:
+            MatrixScrollLeft(mtx_buffer, mtx_loop);
+            break;
+          case 1:
+            MatrixScrollUp(mtx_buffer, mtx_loop);
+            break;
+        }
+        break;
+      }
+#ifdef USE_DISPLAY_MODES1TO5
+      case 2: {
+        char disp_date[9];
+        snprintf_P(disp_date, sizeof(disp_date), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year -2000);
+        MatrixFixed(disp_date);
+        break;
+      }
+      case 3: {
+        char disp_day[10];
+        snprintf_P(disp_day, sizeof(disp_day), PSTR("%d %s"), RtcTime.day_of_month, RtcTime.name_of_month);
+        MatrixCenter(disp_day);
+        break;
+      }
+      case 4:
+        MatrixPrintLog(0);
+        break;
+      case 1:
+      case 5:
+        MatrixPrintLog(1);
+        break;
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xdsp03(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_05)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    MatrixInitDriver();
+  }
+  else if (XDSP_03 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_INIT:
+        MatrixInit(dsp_init);
+        break;
+      case FUNC_DISPLAY_EVERY_50_MSECOND:
+        MatrixRefresh();
+        break;
+      case FUNC_DISPLAY_POWER:
+        MatrixOnOff();
+        break;
+      case FUNC_DISPLAY_DRAW_STRING:
+        MatrixDrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_04_ili9341.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_04_ili9341.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_ILI9341
+
+#define XDSP_04 4
+
+#define TFT_TOP 16
+#define TFT_BOTTOM 16
+#define TFT_FONT_WIDTH 6
+#define TFT_FONT_HEIGTH 8
+
+#include <SPI.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_ILI9341.h>
+
+Adafruit_ILI9341 *tft;
+
+uint16_t tft_scroll;
+
+
+
+void Ili9341InitMode(void)
+{
+  tft->setRotation(Settings.display_rotate);
+  tft->invertDisplay(0);
+  tft->fillScreen(ILI9341_BLACK);
+  tft->setTextWrap(false);
+  tft->cp437(true);
+  if (!Settings.display_mode) {
+    tft->setCursor(0, 0);
+    tft->setTextColor(ILI9341_WHITE, ILI9341_BLACK);
+    tft->setTextSize(1);
+  } else {
+    tft->setScrollMargins(TFT_TOP, TFT_BOTTOM);
+    tft->setCursor(0, 0);
+    tft->setTextColor(ILI9341_YELLOW, ILI9341_BLACK);
+    tft->setTextSize(2);
+
+
+    tft_scroll = TFT_TOP;
+  }
+}
+
+void Ili9341Init(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      Ili9341InitMode();
+#ifdef USE_DISPLAY_MODES1TO5
+      if (Settings.display_rotate) {
+        DisplayClearScreenBuffer();
+      }
+#endif
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void Ili9341InitDriver(void)
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_04;
+  }
+
+  if (XDSP_04 == Settings.display_model) {
+    if (Settings.display_width != ILI9341_TFTWIDTH) {
+      Settings.display_width = ILI9341_TFTWIDTH;
+    }
+    if (Settings.display_height != ILI9341_TFTHEIGHT) {
+      Settings.display_height = ILI9341_TFTHEIGHT;
+    }
+    tft = new Adafruit_ILI9341(pin[GPIO_SPI_CS], pin[GPIO_SPI_DC]);
+    tft->begin();
+
+#ifdef USE_DISPLAY_MODES1TO5
+    if (Settings.display_rotate) {
+      DisplayAllocScreenBuffer();
+    }
+#endif
+
+    Ili9341InitMode();
+  }
+}
+
+void Ili9341Clear(void)
+{
+  tft->fillScreen(ILI9341_BLACK);
+  tft->setCursor(0, 0);
+}
+
+void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  uint16_t active_color = ILI9341_WHITE;
+
+  tft->setTextSize(Settings.display_size);
+  if (!flag) {
+    tft->setCursor(x, y);
+  } else {
+    tft->setCursor((x-1) * TFT_FONT_WIDTH * Settings.display_size, (y-1) * TFT_FONT_HEIGTH * Settings.display_size);
+  }
+  if (color) { active_color = color; }
+  tft->setTextColor(active_color, ILI9341_BLACK);
+  tft->println(str);
+}
+
+void Ili9341DisplayOnOff(uint8_t on)
+{
+
+
+  if (pin[GPIO_BACKLIGHT] < 99) {
+    pinMode(pin[GPIO_BACKLIGHT], OUTPUT);
+    digitalWrite(pin[GPIO_BACKLIGHT], on);
+  }
+}
+
+void Ili9341OnOff(void)
+{
+  Ili9341DisplayOnOff(disp_power);
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void Ili9341PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (Settings.display_rotate) {
+      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+    }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != nullptr) {
+      uint8_t size = Settings.display_size;
+      uint16_t theight = size * TFT_FONT_HEIGTH;
+
+      tft->setTextSize(size);
+      tft->setTextColor(ILI9341_CYAN, ILI9341_BLACK);
+      if (!Settings.display_rotate) {
+        tft->setCursor(0, tft_scroll);
+        tft->fillRect(0, tft_scroll, tft->width(), theight, ILI9341_BLACK);
+        tft->print(txt);
+        tft_scroll += theight;
+        if (tft_scroll >= (tft->height() - TFT_BOTTOM)) {
+          tft_scroll = TFT_TOP;
+        }
+        tft->scrollTo(tft_scroll);
+      } else {
+        uint8_t last_row = Settings.display_rows -1;
+
+        tft_scroll = theight;
+        tft->setCursor(0, tft_scroll);
+        for (uint32_t i = 0; i < last_row; i++) {
+          strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+
+          tft->print(disp_screen_buffer[i]);
+          tft_scroll += theight;
+          tft->setCursor(0, tft_scroll);
+          delay(1);
+        }
+        strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+        DisplayFillScreen(last_row);
+        tft->print(disp_screen_buffer[last_row]);
+      }
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
+    }
+  }
+}
+
+void Ili9341Refresh(void)
+{
+  if (Settings.display_mode) {
+    char tftdt[Settings.display_cols[0] +1];
+    char date4[11];
+    char space[Settings.display_cols[0] - 17];
+    char time[9];
+
+    tft->setTextSize(2);
+    tft->setTextColor(ILI9341_YELLOW, ILI9341_RED);
+    tft->setCursor(0, 0);
+
+    snprintf_P(date4, sizeof(date4), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+    memset(space, 0x20, sizeof(space));
+    space[sizeof(space) -1] = '\0';
+    snprintf_P(time, sizeof(time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+    snprintf_P(tftdt, sizeof(tftdt), PSTR("%s%s%s"), date4, space, time);
+
+    tft->print(tftdt);
+
+    switch (Settings.display_mode) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        Ili9341PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp04(uint8_t function)
+{
+  bool result = false;
+
+  if (spi_flg) {
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      Ili9341InitDriver();
+    }
+    else if (XDSP_04 == Settings.display_model) {
+
+      if (!dsp_color) { dsp_color = ILI9341_WHITE; }
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+        case FUNC_DISPLAY_INIT:
+          Ili9341Init(dsp_init);
+          break;
+        case FUNC_DISPLAY_POWER:
+          Ili9341OnOff();
+          break;
+        case FUNC_DISPLAY_CLEAR:
+          Ili9341Clear();
+          break;
+        case FUNC_DISPLAY_DRAW_HLINE:
+          tft->writeFastHLine(dsp_x, dsp_y, dsp_len, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_VLINE:
+          tft->writeFastVLine(dsp_x, dsp_y, dsp_len, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_LINE:
+          tft->writeLine(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_CIRCLE:
+          tft->drawCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
+          break;
+        case FUNC_DISPLAY_FILL_CIRCLE:
+          tft->fillCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_RECTANGLE:
+          tft->drawRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+        case FUNC_DISPLAY_FILL_RECTANGLE:
+          tft->fillRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+
+
+
+        case FUNC_DISPLAY_TEXT_SIZE:
+          tft->setTextSize(Settings.display_size);
+          break;
+        case FUNC_DISPLAY_FONT_SIZE:
+
+          break;
+        case FUNC_DISPLAY_DRAW_STRING:
+          Ili9341DrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
+          break;
+        case FUNC_DISPLAY_ONOFF:
+          Ili9341DisplayOnOff(dsp_on);
+          break;
+        case FUNC_DISPLAY_ROTATION:
+          tft->setRotation(Settings.display_rotate);
+          break;
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          Ili9341Refresh();
+          break;
+#endif
+      }
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_EPAPER_29
+
+#define XDSP_05 5
+
+#define EPD_TOP 12
+#define EPD_FONT_HEIGTH 12
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+
+#define USE_TINY_FONT 
+
+#include <epd2in9.h>
+#include <epdpaint.h>
+
+
+extern uint8_t *buffer;
+uint16_t epd_scroll;
+
+Epd *epd;
+
+
+
+void EpdInitDriver29()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_05;
+  }
+
+  if (XDSP_05 == Settings.display_model) {
+    if (Settings.display_width != EPD_WIDTH) {
+      Settings.display_width = EPD_WIDTH;
+    }
+    if (Settings.display_height != EPD_HEIGHT) {
+      Settings.display_height = EPD_HEIGHT;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((EPD_WIDTH * EPD_HEIGHT) / 8,1);
+    if (!buffer) return;
+
+
+    epd = new Epd(EPD_WIDTH,EPD_HEIGHT);
+
+
+    if ((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CLK] < 99) && (pin[GPIO_SPI_MOSI] < 99)) {
+      epd->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: HardSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SPI_CS], pin[GPIO_SPI_CLK], pin[GPIO_SPI_MOSI]);
+    }
+    else if ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_MOSI] < 99)) {
+      epd->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: SoftSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SSPI_CS], pin[GPIO_SSPI_SCLK], pin[GPIO_SSPI_MOSI]);
+    } else {
+      free(buffer);
+      return;
+    }
+
+    renderer = epd;
+    epd->Init(DISPLAY_INIT_FULL);
+    epd->Init(DISPLAY_INIT_PARTIAL);
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(1);
+    renderer->DrawStringAt(50, 50, "Waveshare E-Paper Display!", COLORED,0);
+    renderer->Updateframe();
+    delay(1000);
+    renderer->fillScreen(0);
+#endif
+
+  }
+}
+
+
+
+
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+#define EPD_FONT_HEIGTH 12
+void EpdPrintLog29(void)
+{
+
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+
+      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+
+    char* txt = DisplayLogBuffer('\040');
+    if (txt != nullptr) {
+      uint8_t size = Settings.display_size;
+      uint16_t theight = size * EPD_FONT_HEIGTH;
+
+      renderer->setTextFont(size);
+      uint8_t last_row = Settings.display_rows -1;
+
+
+      epd_scroll = 0;
+      for (uint32_t i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[i], COLORED, 0);
+        epd_scroll += theight;
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+      renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[last_row], COLORED, 0);
+
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
+    }
+  }
+}
+
+void EpdRefresh29(void)
+{
+  if (Settings.display_mode) {
+
+    if (!renderer) return;
+# 165 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+    switch (Settings.display_mode) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        EpdPrintLog29();
+        renderer->Updateframe();
+        break;
+    }
+
+
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp05(uint8_t function)
+{
+  bool result = false;
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      EpdInitDriver29();
+    }
+    else if (XDSP_05 == Settings.display_model) {
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          EpdRefresh29();
+          break;
+#endif
+      }
+    }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_06_epaper_42.ino"
+# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_06_epaper_42.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_EPAPER_42
+
+#define XDSP_06 6
+
+#define COLORED42 1
+#define UNCOLORED42 0
+
+
+
+#define USE_TINY_FONT 
+
+#include <epd4in2.h>
+#include <epdpaint.h>
+
+extern uint8_t *buffer;
+
+Epd42 *epd42;
+
+
+
+
+void EpdInitDriver42()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_06;
+  }
+
+  if (XDSP_06 == Settings.display_model) {
+
+    if (Settings.display_width != EPD_WIDTH42) {
+      Settings.display_width = EPD_WIDTH42;
+    }
+    if (Settings.display_height != EPD_HEIGHT42) {
+      Settings.display_height = EPD_HEIGHT42;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((EPD_WIDTH42 * EPD_HEIGHT42) / 8,1);
+    if (!buffer) return;
+
+
+    epd42 = new Epd42(EPD_WIDTH42,EPD_HEIGHT42);
+
+    #ifdef USE_SPI
+        if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)) {
+          epd42->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+        } else {
+          free(buffer);
+          return;
+        }
+    #else
+        if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
+          epd42->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+        } else {
+          free(buffer);
+          return;
+        }
+    #endif
+
+    renderer = epd42;
+
+    epd42->Init();
+
+    renderer->fillScreen(0);
+
+
+    epd42->Init(DISPLAY_INIT_FULL);
+
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+    epd42->ClearFrame();
+    renderer->Updateframe();
+    delay(3000);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->DrawStringAt(50, 140, "Waveshare E-Paper!", COLORED42,0);
+    renderer->Updateframe();
+    delay(350);
+    renderer->fillScreen(0);
+#endif
+
+  }
+}
+
+
+
+
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void EpdRefresh42()
+{
+  if (Settings.display_mode) {
+
+  }
+}
+
+#endif
+
+
+
+
+
+
+bool Xdsp06(uint8_t function)
+{
+  bool result = false;
+
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      EpdInitDriver42();
+    }
+    else if (XDSP_06 == Settings.display_model) {
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          EpdRefresh42();
+          break;
+#endif
+      }
+    }
+  return result;
+}
+
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_07_sh1106.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_07_sh1106.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SH1106
+
+#define OLED_RESET 4
+
+#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
+
+extern uint8_t *buffer;
+
+#define XDSP_07 7
+#define XI2C_06 6
+
+#define OLED_ADDRESS1 0x3C
+#define OLED_ADDRESS2 0x3D
+
+#define OLED_BUFFER_COLS 40
+#define OLED_BUFFER_ROWS 16
+
+#define OLED_FONT_WIDTH 6
+#define OLED_FONT_HEIGTH 8
+
+#include <Wire.h>
+#include <renderer.h>
+#include <Adafruit_SH1106.h>
+
+Adafruit_SH1106 *oled1106;
+
+
+
+
+void SH1106InitDriver()
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(OLED_ADDRESS1)) {
+      Settings.display_address[0] = OLED_ADDRESS1;
+      Settings.display_model = XDSP_07;
+    }
+    else if (I2cSetDevice(OLED_ADDRESS2)) {
+      Settings.display_address[0] = OLED_ADDRESS2;
+      Settings.display_model = XDSP_07;
+    }
+  }
+
+  if (XDSP_07 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "SH1106");
+
+    if (Settings.display_width != SH1106_LCDWIDTH) {
+      Settings.display_width = SH1106_LCDWIDTH;
+    }
+    if (Settings.display_height != SH1106_LCDHEIGHT) {
+      Settings.display_height = SH1106_LCDHEIGHT;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((SH1106_LCDWIDTH * SH1106_LCDHEIGHT) / 8,1);
+    if (!buffer) return;
+
+
+    oled1106 = new Adafruit_SH1106(SH1106_LCDWIDTH,SH1106_LCDHEIGHT);
+    renderer=oled1106;
+    renderer->Begin(SH1106_SWITCHCAPVCC, Settings.display_address[0],0);
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+    renderer->setTextFont(0);
+    renderer->setTextSize(2);
+    renderer->setCursor(20,20);
+    renderer->println(F("SH1106"));
+    renderer->Updateframe();
+    renderer->DisplayOnff(1);
+#endif
+  }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void SH1106PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void SH1106Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(Settings.display_size);
+  renderer->setTextFont(Settings.display_font);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void SH1106Refresh(void)
+{
+  if (!renderer) return;
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        SH1106Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        SH1106PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_06)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    SH1106InitDriver();
+  }
+  else if (XDSP_07 == Settings.display_model) {
+
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        SH1106Refresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_08_ILI9488.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_08_ILI9488.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_ILI9488
+
+#define XDSP_08 8
+#define XI2C_38 38
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+#define FT6236_address 0x38
+
+
+
+#define USE_TINY_FONT 
+
+
+#include <ILI9488.h>
+#include <FT6236.h>
+
+TouchLocation ili9488_pLoc;
+uint8_t ili9488_ctouch_counter = 0;
+
+
+#define BACKPLANE_PIN 2
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+ILI9488 *ili9488;
+
+#ifdef USE_TOUCH_BUTTONS
+extern VButton *buttons[];
+#endif
+
+extern const uint16_t picture[];
+uint8_t FT6236_found;
+
+
+
+void ILI9488_InitDriver()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_08;
+  }
+
+  if (XDSP_08 == Settings.display_model) {
+
+    if (Settings.display_width != ILI9488_TFTWIDTH) {
+      Settings.display_width = ILI9488_TFTWIDTH;
+    }
+    if (Settings.display_height != ILI9488_TFTHEIGHT) {
+      Settings.display_height = ILI9488_TFTHEIGHT;
+    }
+
+
+    buffer=NULL;
+
+
+    fg_color = ILI9488_WHITE;
+    bg_color = ILI9488_BLACK;
+
+    uint8_t bppin=BACKPLANE_PIN;
+    if (pin[GPIO_BACKLIGHT]<99) {
+      bppin=pin[GPIO_BACKLIGHT];
+    }
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
+      ili9488 = new ILI9488(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK],bppin);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
+        ili9488 = new ILI9488(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK],bppin);
+      } else {
+        return;
+      }
+    }
+
+    SPI.begin();
+    ili9488->begin();
+    renderer = ili9488;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(ILI9488_WHITE,ILI9488_BLACK);
+    renderer->DrawStringAt(50, 50, "ILI9488 TFT Display!", ILI9488_WHITE,0);
+    delay(1000);
+
+
+#endif
+
+    color_type = COLOR_COLOR;
+
+
+    if (I2cEnabled(XI2C_38) && I2cSetDevice(FT6236_address)) {
+      FT6236begin(FT6236_address);
+      FT6236_found=1;
+      I2cSetActiveFound(FT6236_address, "FT6236");
+    } else {
+      FT6236_found=0;
+    }
+
+  }
+}
+
+#ifdef USE_TOUCH_BUTTONS
+void ILI9488_MQTT(uint8_t count,const char *cp) {
+  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
+  MqttPublishTeleSensor();
+}
+
+void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) {
+  buttons[count]->xdrawButton(pwr);
+  if (pwr) buttons[count]->vpower|=0x80;
+  else buttons[count]->vpower&=0x7f;
+}
+
+void FT6236Check() {
+uint16_t temp;
+uint8_t rbutt=0,vbutt=0;
+ili9488_ctouch_counter++;
+if (2 == ili9488_ctouch_counter) {
+
+  ili9488_ctouch_counter=0;
+  if (FT6236readTouchLocation(&ili9488_pLoc,1)) {
+
+    if (renderer) {
+      uint8_t rot=renderer->getRotation();
+      switch (rot) {
+        case 0:
+          temp=ili9488_pLoc.y;
+          ili9488_pLoc.y=renderer->height()-ili9488_pLoc.x;
+          ili9488_pLoc.x=temp;
+          break;
+        case 1:
+          break;
+        case 2:
+          break;
+        case 3:
+          temp=ili9488_pLoc.y;
+          ili9488_pLoc.y=ili9488_pLoc.x;
+          ili9488_pLoc.x=renderer->width()-temp;
+          break;
+      }
+
+      for (uint8_t count=0; count<MAXBUTTONS; count++) {
+        if (buttons[count]) {
+            uint8_t bflags=buttons[count]->vpower&0x7f;
+            if (buttons[count]->contains(ili9488_pLoc.x,ili9488_pLoc.y)) {
+
+                buttons[count]->press(true);
+                if (buttons[count]->justPressed()) {
+                  if (!bflags) {
+                    uint8_t pwr=bitRead(power,rbutt);
+                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
+                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
+                      ILI9488_RDW_BUTT(count,!pwr);
+                    }
+                  } else {
+
+                    const char *cp;
+                    if (bflags==1) {
+
+                      buttons[count]->vpower^=0x80;
+                      cp="TBT";
+                    } else {
+
+                      buttons[count]->vpower|=0x80;
+                      cp="PBT";
+                    }
+                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+                    ILI9488_MQTT(count,cp);
+                  }
+                }
+            }
+            if (!bflags) {
+              rbutt++;
+            } else {
+              vbutt++;
+            }
+        }
+      }
+    }
+  } else {
+
+    for (uint8_t count=0; count<MAXBUTTONS; count++) {
+      if (buttons[count]) {
+        uint8_t bflags=buttons[count]->vpower&0x7f;
+        buttons[count]->press(false);
+        if (buttons[count]->justReleased()) {
+          uint8_t bflags=buttons[count]->vpower&0x7f;
+          if (bflags>0) {
+            if (bflags>1) {
+
+              buttons[count]->vpower&=0x7f;
+              ILI9488_MQTT(count,"PBT");
+            }
+            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+          }
+        }
+        if (!bflags) {
+
+          uint8_t pwr=bitRead(power,rbutt);
+          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
+          if (pwr!=vpwr) {
+            ILI9488_RDW_BUTT(count,pwr);
+          }
+          rbutt++;
+        }
+      }
+    }
+    ili9488_pLoc.x=0;
+    ili9488_pLoc.y=0;
+  }
+}
+}
+#endif
+
+
+
+
+bool Xdsp08(uint8_t function)
+{
+  bool result = false;
+
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      ILI9488_InitDriver();
+    }
+    else if (XDSP_08 == Settings.display_model) {
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+        case FUNC_DISPLAY_EVERY_50_MSECOND:
+#ifdef USE_TOUCH_BUTTONS
+          if (FT6236_found) FT6236Check();
+#endif
+          break;
+      }
+    }
+
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_09_SSD1351.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_09_SSD1351.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SSD1351
+
+#define XDSP_09 9
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+
+
+#define USE_TINY_FONT 
+
+#include <SSD1351.h>
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+SSD1351 *ssd1351;
+
+
+
+void SSD1351_InitDriver() {
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_09;
+  }
+
+  if (XDSP_09 == Settings.display_model) {
+
+    if (Settings.display_width != SSD1351_WIDTH) {
+      Settings.display_width = SSD1351_WIDTH;
+    }
+    if (Settings.display_height != SSD1351_HEIGHT) {
+      Settings.display_height = SSD1351_HEIGHT;
+    }
+
+    buffer=0;
+
+
+    fg_color = SSD1351_WHITE;
+    bg_color = SSD1351_BLACK;
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
+      ssd1351 = new SSD1351(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)){
+        ssd1351 = new SSD1351(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+      } else {
+        return;
+      }
+    }
+
+    delay(100);
+    SPI.begin();
+    ssd1351->begin();
+    renderer = ssd1351;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->dim(Settings.display_dimmer);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(SSD1351_WHITE,SSD1351_BLACK);
+    renderer->DrawStringAt(10, 60, "SSD1351", SSD1351_RED,0);
+    delay(1000);
+
+#endif
+    color_type = COLOR_COLOR;
+  }
+}
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void SSD1351PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void SSD1351Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(2);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void SSD1351Refresh(void)
+{
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        SSD1351Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        SSD1351PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+bool Xdsp09(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      SSD1351_InitDriver();
+  }
+  else if (XDSP_09 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        SSD1351Refresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_RA8876
+
+#define XDSP_10 10
+#define XI2C_39 39
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+#define FT5316_address 0x38
+
+
+
+#define USE_TINY_FONT 
+
+#include <RA8876.h>
+#include <FT6236.h>
+
+TouchLocation ra8876_pLoc;
+uint8_t ra8876_ctouch_counter = 0;
+
+#ifdef USE_TOUCH_BUTTONS
+extern VButton *buttons[];
+#endif
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+RA8876 *ra8876;
+
+uint8_t FT5316_found;
+
+
+void RA8876_InitDriver()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_10;
+  }
+
+  if (XDSP_10 == Settings.display_model) {
+
+    if (Settings.display_width != RA8876_TFTWIDTH) {
+      Settings.display_width = RA8876_TFTWIDTH;
+    }
+    if (Settings.display_height != RA8876_TFTHEIGHT) {
+      Settings.display_height = RA8876_TFTHEIGHT;
+    }
+    buffer=0;
+
+
+    fg_color = RA8876_WHITE;
+    bg_color = RA8876_BLACK;
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]==13) && (pin[GPIO_SSPI_MISO]==12) && (pin[GPIO_SSPI_SCLK]==14)) {
+      ra8876 = new RA8876(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_MISO],pin[GPIO_SSPI_SCLK],pin[GPIO_BACKLIGHT]);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]==13) && (pin[GPIO_SPI_MISO]==12) && (pin[GPIO_SPI_CLK]==14)) {
+        ra8876 = new RA8876(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_MISO],pin[GPIO_SPI_CLK],pin[GPIO_BACKLIGHT]);
+      } else {
+        return;
+      }
+    }
+
+    ra8876->begin();
+    renderer = ra8876;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->dim(Settings.display_dimmer);
+
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(RA8876_WHITE,RA8876_BLACK);
+    renderer->DrawStringAt(600, 300, "RA8876", RA8876_RED,0);
+    delay(1000);
+
+#endif
+    color_type = COLOR_COLOR;
+
+    if (I2cEnabled(XI2C_39) && I2cSetDevice(FT5316_address)) {
+      FT6236begin(FT5316_address);
+      FT5316_found=1;
+      I2cSetActiveFound(FT5316_address, "FT5316");
+    } else {
+      FT5316_found=0;
+    }
+
+  }
+}
+
+#ifdef USE_TOUCH_BUTTONS
+void RA8876_MQTT(uint8_t count,const char *cp) {
+  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
+  MqttPublishTeleSensor();
+}
+
+void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) {
+  buttons[count]->xdrawButton(pwr);
+  if (pwr) buttons[count]->vpower|=0x80;
+  else buttons[count]->vpower&=0x7f;
+}
+
+
+void FT5316Check() {
+uint16_t temp;
+uint8_t rbutt=0,vbutt=0;
+ra8876_ctouch_counter++;
+if (2 == ra8876_ctouch_counter) {
+
+  ra8876_ctouch_counter=0;
+
+  if (FT6236readTouchLocation(&ra8876_pLoc,1)) {
+    ra8876_pLoc.x=ra8876_pLoc.x*RA8876_TFTWIDTH/800;
+    ra8876_pLoc.y=ra8876_pLoc.y*RA8876_TFTHEIGHT/480;
+
+
+    if (renderer) {
+
+
+      ra8876_pLoc.x=RA8876_TFTWIDTH-ra8876_pLoc.x;
+      ra8876_pLoc.y=RA8876_TFTHEIGHT-ra8876_pLoc.y;
+# 170 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
+      for (uint8_t count=0; count<MAXBUTTONS; count++) {
+        if (buttons[count]) {
+            uint8_t bflags=buttons[count]->vpower&0x7f;
+            if (buttons[count]->contains(ra8876_pLoc.x,ra8876_pLoc.y)) {
+
+                buttons[count]->press(true);
+                if (buttons[count]->justPressed()) {
+                  if (!bflags) {
+
+                    uint8_t pwr=bitRead(power,rbutt);
+                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
+                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
+                      RA8876_RDW_BUTT(count,!pwr);
+                    }
+                  } else {
+
+                    const char *cp;
+                    if (bflags==1) {
+
+                      buttons[count]->vpower^=0x80;
+                      cp="TBT";
+                    } else {
+
+                      buttons[count]->vpower|=0x80;
+                      cp="PBT";
+                    }
+                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+                    RA8876_MQTT(count,cp);
+                  }
+                }
+            }
+            if (!bflags) {
+              rbutt++;
+            } else {
+              vbutt++;
+            }
+        }
+      }
+    }
+  } else {
+
+    for (uint8_t count=0; count<MAXBUTTONS; count++) {
+      if (buttons[count]) {
+        uint8_t bflags=buttons[count]->vpower&0x7f;
+        buttons[count]->press(false);
+        if (buttons[count]->justReleased()) {
+          if (bflags>0) {
+            if (bflags>1) {
+
+              buttons[count]->vpower&=0x7f;
+              RA8876_MQTT(count,"PBT");
+            }
+            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+          }
+        }
+        if (!bflags) {
+
+          uint8_t pwr=bitRead(power,rbutt);
+          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
+          if (pwr!=vpwr) {
+            RA8876_RDW_BUTT(count,pwr);
+          }
+          rbutt++;
+        }
+      }
+    }
+    ra8876_pLoc.x=0;
+    ra8876_pLoc.y=0;
+  }
+}
+}
+#endif
+# 426 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
+bool Xdsp10(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      RA8876_InitDriver();
+  }
+  else if (XDSP_10 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_EVERY_50_MSECOND:
+#ifdef USE_TOUCH_BUTTONS
+        if (FT5316_found) FT5316Check();
+#endif
+        break;
+    }
+  }
+  return result;
+}
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
+#ifdef USE_DISPLAY
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xdsp_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xdsp_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XDSP_01
+  &Xdsp01,
+#endif
+
+#ifdef XDSP_02
+  &Xdsp02,
+#endif
+
+#ifdef XDSP_03
+  &Xdsp03,
+#endif
+
+#ifdef XDSP_04
+  &Xdsp04,
+#endif
+
+#ifdef XDSP_05
+  &Xdsp05,
+#endif
+
+#ifdef XDSP_06
+  &Xdsp06,
+#endif
+
+#ifdef XDSP_07
+  &Xdsp07,
+#endif
+
+#ifdef XDSP_08
+  &Xdsp08,
+#endif
+
+#ifdef XDSP_09
+  &Xdsp09,
+#endif
+
+#ifdef XDSP_10
+  &Xdsp10,
+#endif
+
+#ifdef XDSP_11
+  &Xdsp11,
+#endif
+
+#ifdef XDSP_12
+  &Xdsp12,
+#endif
+
+#ifdef XDSP_13
+  &Xdsp13,
+#endif
+
+#ifdef XDSP_14
+  &Xdsp14,
+#endif
+
+#ifdef XDSP_15
+  &Xdsp15,
+#endif
+
+#ifdef XDSP_16
+  &Xdsp16
+#endif
+};
+
+const uint8_t xdsp_present = sizeof(xdsp_func_ptr) / sizeof(xdsp_func_ptr[0]);
+# 117 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
+uint8_t XdspPresent(void)
+{
+  return xdsp_present;
+}
+
+bool XdspCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("DSP: %d"), Function);
+
+  for (uint32_t x = 0; x < xdsp_present; x++) {
+    result = xdsp_func_ptr[x](Function);
+
+    if (result && (FUNC_DISPLAY_MODEL == Function)) {
+      break;
+    }
+  }
+
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+# 38 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
+#define XLGT_01 1
+
+const uint8_t WS2812_SCHEMES = 8;
+
+const char kWs2812Commands[] PROGMEM = "|"
+  D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH ;
+
+void (* const Ws2812Command[])(void) PROGMEM = {
+  &CmndLed, &CmndPixels, &CmndRotation, &CmndWidth };
+
+#include <NeoPixelBus.h>
+
+#if (USE_WS2812_CTYPE == NEO_GRB)
+  typedef NeoGrbFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_BRG)
+  typedef NeoBrgFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_RBG)
+  typedef NeoRbgFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_RGBW)
+  typedef NeoRgbwFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_GRBW)
+  typedef NeoGrbwFeature selectedNeoFeatureType;
+#else
+  typedef NeoRgbFeature selectedNeoFeatureType;
+#endif
+
+#ifdef USE_WS2812_DMA
+
+
+#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
+  typedef NeoEsp8266DmaWs2812xMethod selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
+  typedef NeoEsp8266DmaSk6812Method selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_APA106)
+  typedef NeoEsp8266DmaApa106Method selectedNeoSpeedType;
+#else
+  typedef NeoEsp8266Dma800KbpsMethod selectedNeoSpeedType;
+#endif
+
+#else
+
+
+#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
+  typedef NeoEsp8266BitBangWs2812xMethod selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
+  typedef NeoEsp8266BitBangSk6812Method selectedNeoSpeedType;
+#else
+  typedef NeoEsp8266BitBang800KbpsMethod selectedNeoSpeedType;
+#endif
+
+#endif
+
+NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType> *strip = nullptr;
+
+struct WsColor {
+  uint8_t red, green, blue;
+};
+
+struct ColorScheme {
+  WsColor* colors;
+  uint8_t count;
+};
+
+WsColor kIncandescent[2] = { 255,140,20, 0,0,0 };
+WsColor kRgb[3] = { 255,0,0, 0,255,0, 0,0,255 };
+WsColor kChristmas[2] = { 255,0,0, 0,255,0 };
+WsColor kHanukkah[2] = { 0,0,255, 255,255,255 };
+WsColor kwanzaa[3] = { 255,0,0, 0,0,0, 0,255,0 };
+WsColor kRainbow[7] = { 255,0,0, 255,128,0, 255,255,0, 0,255,0, 0,0,255, 128,0,255, 255,0,255 };
+WsColor kFire[3] = { 255,0,0, 255,102,0, 255,192,0 };
+ColorScheme kSchemes[WS2812_SCHEMES -1] = {
+  kIncandescent, 2,
+  kRgb, 3,
+  kChristmas, 2,
+  kHanukkah, 2,
+  kwanzaa, 3,
+  kRainbow, 7,
+  kFire, 3 };
+
+uint8_t kWidth[5] = {
+    1,
+    2,
+    4,
+    8,
+  255 };
+uint8_t kWsRepeat[5] = {
+    8,
+    6,
+    4,
+    2,
+    1 };
+
+struct WS2812 {
+  uint8_t show_next = 1;
+  uint8_t scheme_offset = 0;
+  bool suspend_update = false;
+} Ws2812;
+
+
+
+void Ws2812StripShow(void)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+#else
+  RgbColor c;
+#endif
+
+  if (Settings.light_correction) {
+    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+      c = strip->GetPixelColor(i);
+      c.R = ledGamma(c.R);
+      c.G = ledGamma(c.G);
+      c.B = ledGamma(c.B);
+#if (USE_WS2812_CTYPE > NEO_3LED)
+      c.W = ledGamma(c.W);
+#endif
+      strip->SetPixelColor(i, c);
+    }
+  }
+  strip->Show();
+}
+
+int mod(int a, int b)
+{
+   int ret = a % b;
+   if (ret < 0) ret += b;
+   return ret;
+}
+
+void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor color;
+#else
+  RgbColor color;
+#endif
+
+  uint32_t mod_position = mod(position, (int)Settings.light_pixels);
+
+  color = strip->GetPixelColor(mod_position);
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  color.R = tmin(color.R + ((hand_color.red / dimmer) * offset), 255);
+  color.G = tmin(color.G + ((hand_color.green / dimmer) * offset), 255);
+  color.B = tmin(color.B + ((hand_color.blue / dimmer) * offset), 255);
+  strip->SetPixelColor(mod_position, color);
+}
+
+void Ws2812UpdateHand(int position, uint32_t index)
+{
+  uint32_t width = Settings.light_width;
+  if (index < WS_MARKER) { width = Settings.ws_width[index]; }
+  if (!width) { return; }
+
+  position = (position + Settings.light_rotation) % Settings.light_pixels;
+
+  if (Settings.flag.ws_clock_reverse) {
+    position = Settings.light_pixels -position;
+  }
+  WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] };
+
+  Ws2812UpdatePixelColor(position, hand_color, 1);
+
+  uint32_t range = ((width -1) / 2) +1;
+  for (uint32_t h = 1; h < range; h++) {
+    float offset = (float)(range - h) / (float)range;
+    Ws2812UpdatePixelColor(position -h, hand_color, offset);
+    Ws2812UpdatePixelColor(position +h, hand_color, offset);
+  }
+}
+
+void Ws2812Clock(void)
+{
+  strip->ClearTo(0);
+  int clksize = 60000 / (int)Settings.light_pixels;
+
+  Ws2812UpdateHand((RtcTime.second * 1000) / clksize, WS_SECOND);
+  Ws2812UpdateHand((RtcTime.minute * 1000) / clksize, WS_MINUTE);
+  Ws2812UpdateHand((((RtcTime.hour % 12) * 5000) + ((RtcTime.minute * 1000) / 12 )) / clksize, WS_HOUR);
+  if (Settings.ws_color[WS_MARKER][WS_RED] + Settings.ws_color[WS_MARKER][WS_GREEN] + Settings.ws_color[WS_MARKER][WS_BLUE]) {
+    for (uint32_t i = 0; i < 12; i++) {
+      Ws2812UpdateHand((i * 5000) / clksize, WS_MARKER);
+    }
+  }
+
+  Ws2812StripShow();
+}
+
+void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i)
+{
+
+
+
+
+  ColorScheme scheme = kSchemes[schemenr];
+  uint32_t curRange = i / range;
+  uint32_t rangeIndex = i % range;
+  uint32_t colorIndex = rangeIndex / gradRange;
+  uint32_t start = colorIndex;
+  uint32_t end = colorIndex +1;
+  if (curRange % 2 != 0) {
+    start = (scheme.count -1) - start;
+    end = (scheme.count -1) - end;
+  }
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  float fmyRed = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].red, scheme.colors[end].red) / dimmer;
+  float fmyGrn = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].green, scheme.colors[end].green) / dimmer;
+  float fmyBlu = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].blue, scheme.colors[end].blue) / dimmer;
+  mColor->red = (uint8_t)fmyRed;
+  mColor->green = (uint8_t)fmyGrn;
+  mColor->blue = (uint8_t)fmyBlu;
+}
+
+void Ws2812Gradient(uint32_t schemenr)
+{
+
+
+
+
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+  c.W = 0;
+#else
+  RgbColor c;
+#endif
+
+  ColorScheme scheme = kSchemes[schemenr];
+  if (scheme.count < 2) { return; }
+
+  uint32_t repeat = kWsRepeat[Settings.light_width];
+  uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat);
+  uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1));
+  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
+  uint32_t offset = speed > 0 ? Light.strip_timer_counter / speed : 0;
+
+  WsColor oldColor, currentColor;
+  Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset);
+  currentColor = oldColor;
+  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+    if (kWsRepeat[Settings.light_width] > 1) {
+      Ws2812GradientColor(schemenr, &currentColor, range, gradRange, i +offset);
+    }
+    if (Settings.light_speed > 0) {
+
+      c.R = map(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red);
+      c.G = map(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green);
+      c.B = map(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue);
+    }
+    else {
+
+      c.R = currentColor.red;
+      c.G = currentColor.green;
+      c.B = currentColor.blue;
+    }
+    strip->SetPixelColor(i, c);
+    oldColor = currentColor;
+  }
+  Ws2812StripShow();
+}
+
+void Ws2812Bars(uint32_t schemenr)
+{
+
+
+
+
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+  c.W = 0;
+#else
+  RgbColor c;
+#endif
+
+  ColorScheme scheme = kSchemes[schemenr];
+
+  uint32_t maxSize = Settings.light_pixels / scheme.count;
+  if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; }
+
+  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
+  uint32_t offset = (speed > 0) ? Light.strip_timer_counter / speed : 0;
+
+  WsColor mcolor[scheme.count];
+  memcpy(mcolor, scheme.colors, sizeof(mcolor));
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  for (uint32_t i = 0; i < scheme.count; i++) {
+    float fmyRed = (float)mcolor[i].red / dimmer;
+    float fmyGrn = (float)mcolor[i].green / dimmer;
+    float fmyBlu = (float)mcolor[i].blue / dimmer;
+    mcolor[i].red = (uint8_t)fmyRed;
+    mcolor[i].green = (uint8_t)fmyGrn;
+    mcolor[i].blue = (uint8_t)fmyBlu;
+  }
+  uint32_t colorIndex = offset % scheme.count;
+  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+    if (maxSize) { colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; }
+    c.R = mcolor[colorIndex].red;
+    c.G = mcolor[colorIndex].green;
+    c.B = mcolor[colorIndex].blue;
+    strip->SetPixelColor(i, c);
+  }
+  Ws2812StripShow();
+}
+
+void Ws2812Clear(void)
+{
+  strip->ClearTo(0);
+  strip->Show();
+  Ws2812.show_next = 1;
+}
+
+void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor lcolor;
+  lcolor.W = white;
+#else
+  RgbColor lcolor;
+#endif
+
+  lcolor.R = red;
+  lcolor.G = green;
+  lcolor.B = blue;
+  if (led) {
+    strip->SetPixelColor(led -1, lcolor);
+  } else {
+
+    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+      strip->SetPixelColor(i, lcolor);
+    }
+  }
+
+  if (!Ws2812.suspend_update) {
+    strip->Show();
+    Ws2812.show_next = 1;
+  }
+}
+
+char* Ws2812GetColor(uint32_t led, char* scolor)
+{
+  uint8_t sl_ledcolor[4];
+
+ #if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor lcolor = strip->GetPixelColor(led -1);
+  sl_ledcolor[3] = lcolor.W;
+ #else
+  RgbColor lcolor = strip->GetPixelColor(led -1);
+ #endif
+  sl_ledcolor[0] = lcolor.R;
+  sl_ledcolor[1] = lcolor.G;
+  sl_ledcolor[2] = lcolor.B;
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < Light.subtype; i++) {
+    if (Settings.flag.decimal_text) {
+      snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
+    } else {
+      snprintf_P(scolor, 25, PSTR("%s%02X"), scolor, sl_ledcolor[i]);
+    }
+  }
+  return scolor;
+}
+
+
+
+
+
+void Ws2812ForceSuspend (void)
+{
+  Ws2812.suspend_update = true;
+}
+
+void Ws2812ForceUpdate (void)
+{
+  Ws2812.suspend_update = false;
+  strip->Show();
+  Ws2812.show_next = 1;
+}
+
+
+
+bool Ws2812SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2], cur_col[3]);
+
+  return true;
+}
+
+void Ws2812ShowScheme(void)
+{
+  uint32_t scheme = Settings.light_scheme - Ws2812.scheme_offset;
+
+  switch (scheme) {
+    case 0:
+      if ((1 == state_250mS) || (Ws2812.show_next)) {
+        Ws2812Clock();
+        Ws2812.show_next = 0;
+      }
+      break;
+    default:
+      if (1 == Settings.light_fade) {
+        Ws2812Gradient(scheme -1);
+      } else {
+        Ws2812Bars(scheme -1);
+      }
+      Ws2812.show_next = 1;
+      break;
+  }
+}
+
+void Ws2812ModuleSelected(void)
+{
+  if (pin[GPIO_WS2812] < 99) {
+
+
+    strip = new NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
+    strip->Begin();
+
+    Ws2812Clear();
+
+    Ws2812.scheme_offset = Light.max_scheme +1;
+    Light.max_scheme += WS2812_SCHEMES;
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+    light_type = LT_RGBW;
+#else
+    light_type = LT_RGB;
+#endif
+    light_flg = XLGT_01;
+  }
+}
+
+
+
+void CmndLed(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) {
+    if (XdrvMailbox.data_len > 0) {
+      char *p;
+      uint16_t idx = XdrvMailbox.index;
+      Ws2812ForceSuspend();
+      for (char *color = strtok_r(XdrvMailbox.data, " ", &p); color; color = strtok_r(nullptr, " ", &p)) {
+        if (LightColorEntry(color, strlen(color))) {
+          Ws2812SetColor(idx, Light.entry_color[0], Light.entry_color[1], Light.entry_color[2], Light.entry_color[3]);
+          idx++;
+          if (idx > Settings.light_pixels) { break; }
+        } else {
+          break;
+        }
+      }
+      Ws2812ForceUpdate();
+    }
+    char scolor[LIGHT_COLOR_SIZE];
+    ResponseCmndIdxChar(Ws2812GetColor(XdrvMailbox.index, scolor));
+  }
+}
+
+void CmndPixels(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= WS2812_MAX_LEDS)) {
+    Settings.light_pixels = XdrvMailbox.payload;
+    Settings.light_rotation = 0;
+    Ws2812Clear();
+    Light.update = true;
+  }
+  ResponseCmndNumber(Settings.light_pixels);
+}
+
+void CmndRotation(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < Settings.light_pixels)) {
+    Settings.light_rotation = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.light_rotation);
+}
+
+void CmndWidth(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+    if (1 == XdrvMailbox.index) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) {
+        Settings.light_width = XdrvMailbox.payload;
+      }
+      ResponseCmndNumber(Settings.light_width);
+    } else {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32)) {
+        Settings.ws_width[XdrvMailbox.index -2] = XdrvMailbox.payload;
+      }
+      ResponseCmndIdxNumber(Settings.ws_width[XdrvMailbox.index -2]);
+    }
+  }
+}
+
+
+
+
+
+bool Xlgt01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Ws2812SetChannels();
+      break;
+    case FUNC_SET_SCHEME:
+      Ws2812ShowScheme();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kWs2812Commands, Ws2812Command);
+      break;
+    case FUNC_MODULE_INIT:
+      Ws2812ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_02_my92x1.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_02_my92x1.ino"
+#ifdef USE_LIGHT
+#ifdef USE_MY92X1
+
+
+
+
+#define XLGT_02 2
+
+struct MY92X1 {
+  uint8_t pdi_pin = 0;
+  uint8_t pdcki_pin = 0;
+  uint8_t model = 0;
+} My92x1;
+
+extern "C" {
+  void os_delay_us(unsigned int);
+}
+
+void LightDiPulse(uint8_t times)
+{
+  for (uint32_t i = 0; i < times; i++) {
+    digitalWrite(My92x1.pdi_pin, HIGH);
+    digitalWrite(My92x1.pdi_pin, LOW);
+  }
+}
+
+void LightDckiPulse(uint8_t times)
+{
+  for (uint32_t i = 0; i < times; i++) {
+    digitalWrite(My92x1.pdcki_pin, HIGH);
+    digitalWrite(My92x1.pdcki_pin, LOW);
+  }
+}
+
+void LightMy92x1Write(uint8_t data)
+{
+  for (uint32_t i = 0; i < 4; i++) {
+    digitalWrite(My92x1.pdcki_pin, LOW);
+    digitalWrite(My92x1.pdi_pin, (data & 0x80));
+    digitalWrite(My92x1.pdcki_pin, HIGH);
+    data = data << 1;
+    digitalWrite(My92x1.pdi_pin, (data & 0x80));
+    digitalWrite(My92x1.pdcki_pin, LOW);
+    digitalWrite(My92x1.pdi_pin, LOW);
+    data = data << 1;
+  }
+}
+
+void LightMy92x1Init(void)
+{
+  uint8_t chips[3] = { 1, 2, 2 };
+
+  LightDckiPulse(chips[My92x1.model] * 32);
+  os_delay_us(12);
+
+
+  LightDiPulse(12);
+  os_delay_us(12);
+  for (uint32_t n = 0; n < chips[My92x1.model]; n++) {
+    LightMy92x1Write(0x18);
+  }
+  os_delay_us(12);
+
+
+  LightDiPulse(16);
+  os_delay_us(12);
+}
+
+void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c)
+{
+  uint8_t channels[3] = { 4, 6, 6 };
+
+  uint8_t duty[3][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 },
+                        { duty_w, duty_c, 0, duty_g, duty_r, duty_b },
+                        { duty_r, duty_g, duty_b, duty_w, duty_w, duty_w }};
+
+  os_delay_us(12);
+  for (uint32_t channel = 0; channel < channels[My92x1.model]; channel++) {
+    LightMy92x1Write(duty[My92x1.model][channel]);
+  }
+  os_delay_us(12);
+  LightDiPulse(8);
+  os_delay_us(12);
+}
+
+
+
+bool My92x1SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
+
+  return true;
+}
+
+void My92x1ModuleSelected(void)
+{
+  if ((pin[GPIO_DCKI] < 99) && (pin[GPIO_DI] < 99)) {
+    My92x1.pdi_pin = pin[GPIO_DI];
+    My92x1.pdcki_pin = pin[GPIO_DCKI];
+
+    pinMode(My92x1.pdi_pin, OUTPUT);
+    pinMode(My92x1.pdcki_pin, OUTPUT);
+    digitalWrite(My92x1.pdi_pin, LOW);
+    digitalWrite(My92x1.pdcki_pin, LOW);
+
+    My92x1.model = 2;
+    light_type = LT_RGBW;
+    if (AILIGHT == my_module_type) {
+      My92x1.model = 0;
+
+    }
+    else if (SONOFF_B1 == my_module_type) {
+      My92x1.model = 1;
+      light_type = LT_RGBWC;
+    }
+
+    LightMy92x1Init();
+
+    light_flg = XLGT_02;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: MY29x1 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = My92x1SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      My92x1ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SM16716
+
+
+
+
+
+
+
+#define XLGT_03 3
+
+#define D_LOG_SM16716 "SM16716: "
+
+struct SM16716 {
+  uint8_t pin_clk = 0;
+  uint8_t pin_dat = 0;
+  uint8_t pin_sel = 0;
+  bool enabled = false;
+} Sm16716;
+
+void SM16716_SendBit(uint8_t v)
+{
+
+
+
+
+
+  digitalWrite(Sm16716.pin_dat, (v != 0) ? HIGH : LOW);
+
+  digitalWrite(Sm16716.pin_clk, HIGH);
+
+  digitalWrite(Sm16716.pin_clk, LOW);
+}
+
+void SM16716_SendByte(uint8_t v)
+{
+  uint8_t mask;
+
+  for (mask = 0x80; mask; mask >>= 1) {
+    SM16716_SendBit(v & mask);
+  }
+}
+
+void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
+{
+  if (Sm16716.pin_sel < 99) {
+    bool should_enable = (duty_r | duty_g | duty_b);
+    if (!Sm16716.enabled && should_enable) {
+      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color on"));
+      Sm16716.enabled = true;
+      digitalWrite(Sm16716.pin_sel, HIGH);
+
+
+      delayMicroseconds(1000);
+      SM16716_Init();
+    }
+    else if (Sm16716.enabled && !should_enable) {
+      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color off"));
+      Sm16716.enabled = false;
+      digitalWrite(Sm16716.pin_sel, LOW);
+    }
+  }
+  DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "Update; rgb=%02x%02x%02x"), duty_r, duty_g, duty_b);
+
+
+  SM16716_SendBit(1);
+  SM16716_SendByte(duty_r);
+  SM16716_SendByte(duty_g);
+  SM16716_SendByte(duty_b);
+
+
+
+
+
+  SM16716_SendBit(0);
+  SM16716_SendByte(0);
+  SM16716_SendByte(0);
+  SM16716_SendByte(0);
+}
+# 111 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
+void SM16716_Init(void)
+{
+  for (uint32_t t_init = 0; t_init < 50; ++t_init) {
+    SM16716_SendBit(0);
+  }
+}
+
+
+
+bool Sm16716SetChannels(void)
+{
+# 132 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  SM16716_Update(cur_col[0], cur_col[1], cur_col[2]);
+
+  return true;
+}
+
+void Sm16716ModuleSelected(void)
+{
+  if ((pin[GPIO_SM16716_CLK] < 99) && (pin[GPIO_SM16716_DAT] < 99)) {
+    Sm16716.pin_clk = pin[GPIO_SM16716_CLK];
+    Sm16716.pin_dat = pin[GPIO_SM16716_DAT];
+    Sm16716.pin_sel = pin[GPIO_SM16716_SEL];
+# 157 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
+    pinMode(Sm16716.pin_clk, OUTPUT);
+    digitalWrite(Sm16716.pin_clk, LOW);
+
+    pinMode(Sm16716.pin_dat, OUTPUT);
+    digitalWrite(Sm16716.pin_dat, LOW);
+
+    if (Sm16716.pin_sel < 99) {
+      pinMode(Sm16716.pin_sel, OUTPUT);
+      digitalWrite(Sm16716.pin_sel, LOW);
+
+    } else {
+
+      SM16716_Init();
+    }
+
+    LightPwmOffset(LST_RGB);
+    light_type += LST_RGB;
+    light_flg = XLGT_03;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM16716 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt03(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Sm16716SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      Sm16716ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SM2135
+
+
+
+
+
+
+#define XLGT_04 4
+
+#define SM2135_ADDR_MC 0xC0
+#define SM2135_ADDR_CH 0xC1
+#define SM2135_ADDR_R 0xC2
+#define SM2135_ADDR_G 0xC3
+#define SM2135_ADDR_B 0xC4
+#define SM2135_ADDR_C 0xC5
+#define SM2135_ADDR_W 0xC6
+
+#define SM2135_RGB 0x00
+#define SM2135_CW 0x80
+
+#define SM2135_10MA 0x00
+#define SM2135_15MA 0x01
+#define SM2135_20MA 0x02
+#define SM2135_25MA 0x03
+#define SM2135_30MA 0x04
+#define SM2135_35MA 0x05
+#define SM2135_40MA 0x06
+#define SM2135_45MA 0x07
+#define SM2135_50MA 0x08
+#define SM2135_55MA 0x09
+#define SM2135_60MA 0x0A
+
+
+const uint8_t SM2135_CURRENT = (SM2135_20MA << 4) | SM2135_15MA;
+
+struct SM2135 {
+  uint8_t clk = 0;
+  uint8_t data = 0;
+} Sm2135;
+
+uint8_t Sm2135Write(uint8_t data)
+{
+  for (uint32_t i = 0; i < 8; i++) {
+    digitalWrite(Sm2135.clk, LOW);
+    digitalWrite(Sm2135.data, (data & 0x80));
+    digitalWrite(Sm2135.clk, HIGH);
+    data = data << 1;
+  }
+  digitalWrite(Sm2135.clk, LOW);
+  digitalWrite(Sm2135.data, HIGH);
+  pinMode(Sm2135.data, INPUT);
+  digitalWrite(Sm2135.clk, HIGH);
+  uint8_t ack = digitalRead(Sm2135.data);
+  pinMode(Sm2135.data, OUTPUT);
+  return ack;
+}
+
+void Sm2135Send(uint8_t *buffer, uint8_t size)
+{
+  digitalWrite(Sm2135.data, LOW);
+  for (uint32_t i = 0; i < size; i++) {
+    Sm2135Write(buffer[i]);
+  }
+  digitalWrite(Sm2135.clk, LOW);
+  digitalWrite(Sm2135.clk, HIGH);
+  digitalWrite(Sm2135.data, HIGH);
+}
+
+
+
+bool Sm2135SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+  uint8_t data[6];
+
+  if ((0 == cur_col[0]) && (0 == cur_col[1]) && (0 == cur_col[2])) {
+# 106 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
+    data[0] = SM2135_ADDR_MC;
+    data[1] = SM2135_CURRENT;
+    data[2] = SM2135_CW;
+    Sm2135Send(data, 3);
+    delay(1);
+    data[0] = SM2135_ADDR_C;
+    data[1] = cur_col[4];
+    data[2] = cur_col[3];
+    Sm2135Send(data, 3);
+  } else {
+
+
+
+
+
+
+
+    data[0] = SM2135_ADDR_MC;
+    data[1] = SM2135_CURRENT;
+    data[2] = SM2135_RGB;
+    data[3] = cur_col[1];
+    data[4] = cur_col[0];
+    data[5] = cur_col[2];
+    Sm2135Send(data, 6);
+  }
+
+  return true;
+}
+
+void Sm2135ModuleSelected(void)
+{
+  if ((pin[GPIO_SM2135_CLK] < 99) && (pin[GPIO_SM2135_DAT] < 99)) {
+    Sm2135.clk = pin[GPIO_SM2135_CLK];
+    Sm2135.data = pin[GPIO_SM2135_DAT];
+
+    pinMode(Sm2135.data, OUTPUT);
+    digitalWrite(Sm2135.data, HIGH);
+    pinMode(Sm2135.clk, OUTPUT);
+    digitalWrite(Sm2135.clk, HIGH);
+
+    light_type = LT_RGBWC;
+    light_flg = XLGT_04;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM2135 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt04(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Sm2135SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      Sm2135ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SONOFF_L1
+
+
+
+
+#define XLGT_05 5
+
+#define SONOFF_L1_BUFFER_SIZE 140
+
+#define SONOFF_L1_MODE_COLORFUL 1
+#define SONOFF_L1_MODE_COLORFUL_GRADIENT 2
+#define SONOFF_L1_MODE_COLORFUL_BREATH 3
+#define SONOFF_L1_MODE_DIY_GRADIENT 4
+#define SONOFF_L1_MODE_DIY_PULSE 5
+#define SONOFF_L1_MODE_DIY_BREATH 6
+#define SONOFF_L1_MODE_DIY_STROBE 7
+#define SONOFF_L1_MODE_RGB_GRADIENT 8
+#define SONOFF_L1_MODE_RGB_PULSE 9
+#define SONOFF_L1_MODE_RGB_BREATH 10
+#define SONOFF_L1_MODE_RGB_STROBE 11
+#define SONOFF_L1_MODE_SYNC_TO_MUSIC 12
+
+struct SNFL1 {
+  uint32_t unlock = 0;
+  bool receive_ready = true;
+} Snfl1;
+
+
+
+void SnfL1Send(const char *buffer)
+{
+
+
+  Serial.print(buffer);
+  Serial.write(0x1B);
+  Serial.flush();
+}
+
+void SnfL1SerialSendOk(void)
+{
+  char buffer[16];
+  snprintf_P(buffer, sizeof(buffer), PSTR("AT+SEND=ok"));
+
+  SnfL1Send(buffer);
+}
+
+bool SnfL1SerialInput(void)
+{
+  if (serial_in_byte != 0x1B) {
+    if (serial_in_byte_counter >= 140) {
+      serial_in_byte_counter = 0;
+    }
+    if (serial_in_byte_counter || (!serial_in_byte_counter && ('A' == serial_in_byte))) {
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+    }
+  } else {
+    serial_in_buffer[serial_in_byte_counter++] = 0x00;
+
+
+
+
+
+
+    if (!strncmp(serial_in_buffer +3, "RESULT", 6)) {
+      Snfl1.receive_ready = true;
+    }
+    else if (!strncmp(serial_in_buffer +3, "UPDATE", 6)) {
+      char cmnd_dimmer[20];
+      char cmnd_color[20];
+      char *end_str;
+      char *string = serial_in_buffer +10;
+      char *token = strtok_r(string, ",", &end_str);
+
+      bool color_updated[3] = { false, false, false };
+      uint8_t current_color[3];
+      memcpy(current_color, Settings.light_color, 3);
+
+      bool switch_state = false;
+      bool is_power_change = false;
+      bool is_color_change = false;
+      bool is_brightness_change = false;
+
+      while (token != nullptr) {
+        char* end_token;
+        char* token2 = strtok_r(token, ":", &end_token);
+        char* token3 = strtok_r(nullptr, ":", &end_token);
+
+        if (!strncmp(token2, "\"sequence\"", 10)) {
+
+
+
+          token = nullptr;
+        }
+
+        else if (!strncmp(token2, "\"switch\"", 8)) {
+          switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
+
+
+
+          is_power_change = (switch_state != Light.power);
+        }
+
+        else if (!strncmp(token2, "\"color", 6)) {
+          char color_channel_name = token2[6];
+          int color_index;
+          switch(color_channel_name)
+          {
+            case 'R': color_index = 0;
+              break;
+            case 'G': color_index = 1;
+              break;
+            case 'B': color_index = 2;
+              break;
+          }
+          int color_value = atoi(token3);
+          current_color[color_index] = color_value;
+          color_updated[color_index] = true;
+
+          bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
+          if (all_color_channels_updated) {
+
+
+
+
+
+            is_color_change = (Light.power && (memcmp(current_color, Settings.light_color, 3) != 0));
+          }
+          snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), current_color[0], current_color[1], current_color[2]);
+        }
+
+        else if (!strncmp(token2, "\"bright\"", 8)) {
+          uint8_t dimmer = atoi(token3);
+
+
+
+          is_brightness_change = (Light.power && (dimmer > 0) && (dimmer != Settings.light_dimmer));
+          snprintf_P(cmnd_dimmer, sizeof(cmnd_dimmer), PSTR(D_CMND_DIMMER " %d"), dimmer);
+        }
+
+        token = strtok_r(nullptr, ",", &end_str);
+      }
+
+      if (is_power_change) {
+        if (Settings.light_scheme > 0) {
+          if (!switch_state) {
+            char cmnd_scheme[20];
+            snprintf_P(cmnd_scheme, sizeof(cmnd_scheme), PSTR(D_CMND_SCHEME " 0"));
+            ExecuteCommand(cmnd_scheme, SRC_SWITCH);
+          }
+        } else {
+          ExecuteCommandPower(1, switch_state, SRC_SWITCH);
+        }
+      }
+      else if (is_brightness_change) {
+        ExecuteCommand(cmnd_dimmer, SRC_SWITCH);
+      }
+      else if (Light.power && is_color_change) {
+        if (0 == Settings.light_scheme) {
+          if (Settings.light_fade) {
+            char cmnd_fade[20];
+            snprintf_P(cmnd_fade, sizeof(cmnd_fade), PSTR(D_CMND_FADE " 0"));
+            ExecuteCommand(cmnd_fade, SRC_SWITCH);
+          }
+          ExecuteCommand(cmnd_color, SRC_SWITCH);
+        }
+      }
+    }
+
+    SnfL1SerialSendOk();
+
+    return true;
+  }
+  serial_in_byte = 0;
+  return false;
+}
+
+
+
+bool SnfL1SetChannels(void)
+{
+  if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) {
+
+    uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
+
+    char buffer[140];
+    snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"),
+      LocalTime(), millis()%1000,
+      Light.power ? "on" : "off",
+      scale_col[0], scale_col[1], scale_col[2],
+      light_state.getDimmer(),
+      SONOFF_L1_MODE_COLORFUL);
+
+    SnfL1Send(buffer);
+
+    Snfl1.unlock = millis() + 500;
+    Snfl1.receive_ready = false;
+  }
+  return true;
+}
+
+void SnfL1ModuleSelected(void)
+{
+  if (SONOFF_L1 == my_module_type) {
+    if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
+      SetSerial(19200, TS_SERIAL_8N1);
+
+      light_type = LT_RGB;
+      light_flg = XLGT_05;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Sonoff L1 Found"));
+    }
+  }
+}
+
+
+
+
+
+bool Xlgt05(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SERIAL:
+      result = SnfL1SerialInput();
+      break;
+    case FUNC_SET_CHANNELS:
+      result = SnfL1SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      SnfL1ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_interface.ino"
+#ifdef USE_LIGHT
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xlgt_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xlgt_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XLGT_01
+  &Xlgt01,
+#endif
+
+#ifdef XLGT_02
+  &Xlgt02,
+#endif
+
+#ifdef XLGT_03
+  &Xlgt03,
+#endif
+
+#ifdef XLGT_04
+  &Xlgt04,
+#endif
+
+#ifdef XLGT_05
+  &Xlgt05,
+#endif
+
+#ifdef XLGT_06
+  &Xlgt06,
+#endif
+
+#ifdef XLGT_07
+  &Xlgt07,
+#endif
+
+#ifdef XLGT_08
+  &Xlgt08,
+#endif
+
+#ifdef XLGT_09
+  &Xlgt09,
+#endif
+
+#ifdef XLGT_10
+  &Xlgt10,
+#endif
+
+#ifdef XLGT_11
+  &Xlgt11,
+#endif
+
+#ifdef XLGT_12
+  &Xlgt12,
+#endif
+
+#ifdef XLGT_13
+  &Xlgt13,
+#endif
+
+#ifdef XLGT_14
+  &Xlgt14,
+#endif
+
+#ifdef XLGT_15
+  &Xlgt15,
+#endif
+
+#ifdef XLGT_16
+  &Xlgt16
+#endif
+};
+
+const uint8_t xlgt_present = sizeof(xlgt_func_ptr) / sizeof(xlgt_func_ptr[0]);
+
+uint8_t xlgt_active = 0;
+
+bool XlgtCall(uint8_t function)
+{
+  DEBUG_TRACE_LOG(PSTR("LGT: %d"), function);
+
+  if (FUNC_MODULE_INIT == function) {
+    for (uint32_t x = 0; x < xlgt_present; x++) {
+      xlgt_func_ptr[x](function);
+      if (light_flg) {
+        xlgt_active = x;
+        return true;
+      }
+    }
+  }
+  else if (light_flg) {
+    return xlgt_func_ptr[xlgt_active](function);
+  }
+  return false;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_01_hlw8012.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_01_hlw8012.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_HLW8012
+
+
+
+
+
+
+#define XNRG_01 1
+
+
+#define HLW_PREF 10000
+#define HLW_UREF 2200
+#define HLW_IREF 4545
+
+
+#define HJL_PREF 1362
+#define HJL_UREF 822
+#define HJL_IREF 3300
+
+#define HLW_POWER_PROBE_TIME 10
+#define HLW_SAMPLE_COUNT 10
+
+
+
+struct HLW {
+#ifdef HLW_DEBUG
+  unsigned long debug[HLW_SAMPLE_COUNT];
+#endif
+  unsigned long cf_pulse_length = 0;
+  unsigned long cf_pulse_last_time = 0;
+  unsigned long cf_power_pulse_length = 0;
+
+  unsigned long cf1_pulse_length = 0;
+  unsigned long cf1_pulse_last_time = 0;
+  unsigned long cf1_summed_pulse_length = 0;
+  unsigned long cf1_pulse_counter = 0;
+  unsigned long cf1_voltage_pulse_length = 0;
+  unsigned long cf1_current_pulse_length = 0;
+
+  unsigned long energy_period_counter = 0;
+
+  unsigned long power_ratio = 0;
+  unsigned long voltage_ratio = 0;
+  unsigned long current_ratio = 0;
+
+  uint8_t model_type = 0;
+  uint8_t cf1_timer = 0;
+  uint8_t power_retry = 0;
+  bool select_ui_flag = false;
+  bool ui_flag = true;
+  bool load_off = true;
+} Hlw;
+
+
+#ifndef USE_WS2812_DMA
+void HlwCfInterrupt(void) ICACHE_RAM_ATTR;
+void HlwCf1Interrupt(void) ICACHE_RAM_ATTR;
+#endif
+
+void HlwCfInterrupt(void)
+{
+  unsigned long us = micros();
+
+  if (Hlw.load_off) {
+    Hlw.cf_pulse_last_time = us;
+    Hlw.load_off = false;
+  } else {
+    Hlw.cf_pulse_length = us - Hlw.cf_pulse_last_time;
+    Hlw.cf_pulse_last_time = us;
+    Hlw.energy_period_counter++;
+  }
+  Energy.data_valid[0] = 0;
+}
+
+void HlwCf1Interrupt(void)
+{
+  unsigned long us = micros();
+
+  Hlw.cf1_pulse_length = us - Hlw.cf1_pulse_last_time;
+  Hlw.cf1_pulse_last_time = us;
+  if ((Hlw.cf1_timer > 2) && (Hlw.cf1_timer < 8)) {
+    Hlw.cf1_summed_pulse_length += Hlw.cf1_pulse_length;
+#ifdef HLW_DEBUG
+    Hlw.debug[Hlw.cf1_pulse_counter] = Hlw.cf1_pulse_length;
+#endif
+    Hlw.cf1_pulse_counter++;
+    if (HLW_SAMPLE_COUNT == Hlw.cf1_pulse_counter) {
+      Hlw.cf1_timer = 8;
+    }
+  }
+  Energy.data_valid[0] = 0;
+}
+
+
+
+void HlwEvery200ms(void)
+{
+  unsigned long cf1_pulse_length = 0;
+  unsigned long hlw_w = 0;
+  unsigned long hlw_u = 0;
+  unsigned long hlw_i = 0;
+
+  if (micros() - Hlw.cf_pulse_last_time > (HLW_POWER_PROBE_TIME * 1000000)) {
+    Hlw.cf_pulse_length = 0;
+    Hlw.load_off = true;
+  }
+  Hlw.cf_power_pulse_length = Hlw.cf_pulse_length;
+
+  if (Hlw.cf_power_pulse_length && Energy.power_on && !Hlw.load_off) {
+    hlw_w = (Hlw.power_ratio * Settings.energy_power_calibration) / Hlw.cf_power_pulse_length ;
+    Energy.active_power[0] = (float)hlw_w / 10;
+    Hlw.power_retry = 1;
+  } else {
+    if (Hlw.power_retry) {
+      Hlw.power_retry--;
+    } else {
+      Energy.active_power[0] = 0;
+    }
+  }
+
+  if (pin[GPIO_NRG_CF1] < 99) {
+    Hlw.cf1_timer++;
+    if (Hlw.cf1_timer >= 8) {
+      Hlw.cf1_timer = 0;
+      Hlw.select_ui_flag = (Hlw.select_ui_flag) ? false : true;
+      DigitalWrite(GPIO_NRG_SEL, Hlw.select_ui_flag);
+
+      if (Hlw.cf1_pulse_counter) {
+        cf1_pulse_length = Hlw.cf1_summed_pulse_length / Hlw.cf1_pulse_counter;
+      }
+
+#ifdef HLW_DEBUG
+
+      char stemp[100];
+      stemp[0] = '\0';
+      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%s %d"), stemp, Hlw.debug[i]);
+      }
+      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
+        for (uint32_t j = i + 1; j < Hlw.cf1_pulse_counter; j++) {
+          if (Hlw.debug[i] > Hlw.debug[j]) {
+            std::swap(Hlw.debug[i], Hlw.debug[j]);
+          }
+        }
+      }
+      unsigned long median = Hlw.debug[(Hlw.cf1_pulse_counter +1) / 2];
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("NRG: power %d, ui %d, cnt %d, smpl%s, sum %d, mean %d, median %d"),
+        Hlw.cf_power_pulse_length , Hlw.select_ui_flag, Hlw.cf1_pulse_counter, stemp, Hlw.cf1_summed_pulse_length, cf1_pulse_length, median);
+#endif
+
+      if (Hlw.select_ui_flag == Hlw.ui_flag) {
+        Hlw.cf1_voltage_pulse_length = cf1_pulse_length;
+
+        if (Hlw.cf1_voltage_pulse_length && Energy.power_on) {
+          hlw_u = (Hlw.voltage_ratio * Settings.energy_voltage_calibration) / Hlw.cf1_voltage_pulse_length ;
+          Energy.voltage[0] = (float)hlw_u / 10;
+        } else {
+          Energy.voltage[0] = 0;
+        }
+
+      } else {
+        Hlw.cf1_current_pulse_length = cf1_pulse_length;
+
+        if (Hlw.cf1_current_pulse_length && Energy.active_power[0]) {
+          hlw_i = (Hlw.current_ratio * Settings.energy_current_calibration) / Hlw.cf1_current_pulse_length;
+          Energy.current[0] = (float)hlw_i / 1000;
+        } else {
+          Energy.current[0] = 0;
+        }
+
+      }
+      Hlw.cf1_summed_pulse_length = 0;
+      Hlw.cf1_pulse_counter = 0;
+    }
+  }
+}
+
+void HlwEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    Hlw.cf1_voltage_pulse_length = 0;
+    Hlw.cf1_current_pulse_length = 0;
+    Hlw.cf_power_pulse_length = 0;
+  } else {
+    unsigned long hlw_len;
+
+    if (Hlw.energy_period_counter) {
+      hlw_len = 10000 / Hlw.energy_period_counter;
+      Hlw.energy_period_counter = 0;
+      if (hlw_len) {
+        Energy.kWhtoday_delta += ((Hlw.power_ratio * Settings.energy_power_calibration) / hlw_len) / 36;
+        EnergyUpdateToday();
+      }
+    }
+  }
+}
+
+void HlwSnsInit(void)
+{
+  if (!Settings.energy_power_calibration || (4975 == Settings.energy_power_calibration)) {
+    Settings.energy_power_calibration = HLW_PREF_PULSE;
+    Settings.energy_voltage_calibration = HLW_UREF_PULSE;
+    Settings.energy_current_calibration = HLW_IREF_PULSE;
+  }
+
+  if (Hlw.model_type) {
+    Hlw.power_ratio = HJL_PREF;
+    Hlw.voltage_ratio = HJL_UREF;
+    Hlw.current_ratio = HJL_IREF;
+  } else {
+    Hlw.power_ratio = HLW_PREF;
+    Hlw.voltage_ratio = HLW_UREF;
+    Hlw.current_ratio = HLW_IREF;
+  }
+
+  if (pin[GPIO_NRG_SEL] < 99) {
+    pinMode(pin[GPIO_NRG_SEL], OUTPUT);
+    digitalWrite(pin[GPIO_NRG_SEL], Hlw.select_ui_flag);
+  }
+  if (pin[GPIO_NRG_CF1] < 99) {
+    pinMode(pin[GPIO_NRG_CF1], INPUT_PULLUP);
+    attachInterrupt(pin[GPIO_NRG_CF1], HlwCf1Interrupt, FALLING);
+  }
+  pinMode(pin[GPIO_HLW_CF], INPUT_PULLUP);
+  attachInterrupt(pin[GPIO_HLW_CF], HlwCfInterrupt, FALLING);
+}
+
+void HlwDrvInit(void)
+{
+  Hlw.model_type = 0;
+  if (pin[GPIO_HJL_CF] < 99) {
+    pin[GPIO_HLW_CF] = pin[GPIO_HJL_CF];
+    pin[GPIO_HJL_CF] = 99;
+    Hlw.model_type = 1;
+  }
+
+  if (pin[GPIO_HLW_CF] < 99) {
+
+    Hlw.ui_flag = true;
+    if (pin[GPIO_NRG_SEL_INV] < 99) {
+      pin[GPIO_NRG_SEL] = pin[GPIO_NRG_SEL_INV];
+      pin[GPIO_NRG_SEL_INV] = 99;
+      Hlw.ui_flag = false;
+    }
+
+    if (pin[GPIO_NRG_CF1] < 99) {
+      if (99 == pin[GPIO_NRG_SEL]) {
+        Energy.current_available = false;
+      }
+    } else {
+      Energy.current_available = false;
+      Energy.voltage_available = false;
+    }
+
+    energy_flg = XNRG_01;
+  }
+}
+
+bool HlwCommand(void)
+{
+  bool serviced = true;
+
+  if ((CMND_POWERCAL == Energy.command_code) || (CMND_VOLTAGECAL == Energy.command_code) || (CMND_CURRENTCAL == Energy.command_code)) {
+
+  }
+  else if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf_power_pulse_length ) {
+      Settings.energy_power_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf_power_pulse_length ) / Hlw.power_ratio;
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf1_voltage_pulse_length ) {
+      Settings.energy_voltage_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf1_voltage_pulse_length ) / Hlw.voltage_ratio;
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf1_current_pulse_length) {
+      Settings.energy_current_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data)) * Hlw.cf1_current_pulse_length) / Hlw.current_ratio;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_200_MSECOND:
+      HlwEvery200ms();
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      HlwEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = HlwCommand();
+      break;
+    case FUNC_INIT:
+      HlwSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      HlwDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_02_cse7766.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_02_cse7766.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_CSE7766
+
+
+
+
+
+
+
+#define XNRG_02 2
+
+#define CSE_MAX_INVALID_POWER 128
+
+#define CSE_NOT_CALIBRATED 0xAA
+
+#define CSE_PULSES_NOT_INITIALIZED -1
+
+#define CSE_PREF 1000
+#define CSE_UREF 100
+
+#define CSE_BUFFER_SIZE 25
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *CseSerial = nullptr;
+
+struct CSE {
+  long voltage_cycle = 0;
+  long current_cycle = 0;
+  long power_cycle = 0;
+  long power_cycle_first = 0;
+  long cf_pulses = 0;
+  long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
+
+  int byte_counter = 0;
+  uint8_t *rx_buffer = nullptr;
+  uint8_t power_invalid = 0;
+  bool received = false;
+} Cse;
+
+void CseReceived(void)
+{
+
+
+
+
+
+
+  uint8_t header = Cse.rx_buffer[0];
+  if ((header & 0xFC) == 0xFC) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Abnormal hardware"));
+    return;
+  }
+
+
+  if (HLW_UREF_PULSE == Settings.energy_voltage_calibration) {
+    long voltage_coefficient = 191200;
+    if (CSE_NOT_CALIBRATED != header) {
+      voltage_coefficient = Cse.rx_buffer[2] << 16 | Cse.rx_buffer[3] << 8 | Cse.rx_buffer[4];
+    }
+    Settings.energy_voltage_calibration = voltage_coefficient / CSE_UREF;
+  }
+  if (HLW_IREF_PULSE == Settings.energy_current_calibration) {
+    long current_coefficient = 16140;
+    if (CSE_NOT_CALIBRATED != header) {
+      current_coefficient = Cse.rx_buffer[8] << 16 | Cse.rx_buffer[9] << 8 | Cse.rx_buffer[10];
+    }
+    Settings.energy_current_calibration = current_coefficient;
+  }
+  if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
+    long power_coefficient = 5364000;
+    if (CSE_NOT_CALIBRATED != header) {
+      power_coefficient = Cse.rx_buffer[14] << 16 | Cse.rx_buffer[15] << 8 | Cse.rx_buffer[16];
+    }
+    Settings.energy_power_calibration = power_coefficient / CSE_PREF;
+  }
+
+  uint8_t adjustement = Cse.rx_buffer[20];
+  Cse.voltage_cycle = Cse.rx_buffer[5] << 16 | Cse.rx_buffer[6] << 8 | Cse.rx_buffer[7];
+  Cse.current_cycle = Cse.rx_buffer[11] << 16 | Cse.rx_buffer[12] << 8 | Cse.rx_buffer[13];
+  Cse.power_cycle = Cse.rx_buffer[17] << 16 | Cse.rx_buffer[18] << 8 | Cse.rx_buffer[19];
+  Cse.cf_pulses = Cse.rx_buffer[21] << 8 | Cse.rx_buffer[22];
+
+  if (Energy.power_on) {
+    if (adjustement & 0x40) {
+      Energy.voltage[0] = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)Cse.voltage_cycle;
+    }
+    if (adjustement & 0x10) {
+      Cse.power_invalid = 0;
+      if ((header & 0xF2) == 0xF2) {
+        Energy.active_power[0] = 0;
+      } else {
+        if (0 == Cse.power_cycle_first) { Cse.power_cycle_first = Cse.power_cycle; }
+        if (Cse.power_cycle_first != Cse.power_cycle) {
+          Cse.power_cycle_first = -1;
+          Energy.active_power[0] = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)Cse.power_cycle;
+        } else {
+          Energy.active_power[0] = 0;
+        }
+      }
+    } else {
+      if (Cse.power_invalid < Settings.param[P_CSE7766_INVALID_POWER]) {
+        Cse.power_invalid++;
+      } else {
+        Cse.power_cycle_first = 0;
+        Energy.active_power[0] = 0;
+      }
+    }
+    if (adjustement & 0x20) {
+      if (0 == Energy.active_power[0]) {
+        Energy.current[0] = 0;
+      } else {
+        Energy.current[0] = (float)Settings.energy_current_calibration / (float)Cse.current_cycle;
+      }
+    }
+  } else {
+    Cse.power_cycle_first = 0;
+    Energy.voltage[0] = 0;
+    Energy.active_power[0] = 0;
+    Energy.current[0] = 0;
+  }
+}
+
+bool CseSerialInput(void)
+{
+  while (CseSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = CseSerial->read();
+
+    if (Cse.received) {
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
+      if (24 == Cse.byte_counter) {
+
+        AddLogBuffer(LOG_LEVEL_DEBUG_MORE, Cse.rx_buffer, 24);
+
+        uint8_t checksum = 0;
+        for (uint32_t i = 2; i < 23; i++) { checksum += Cse.rx_buffer[i]; }
+        if (checksum == Cse.rx_buffer[23]) {
+          Energy.data_valid[0] = 0;
+          CseReceived();
+          Cse.received = false;
+          return true;
+        } else {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
+          do {
+            memmove(Cse.rx_buffer, Cse.rx_buffer +1, 24);
+            Cse.byte_counter--;
+          } while ((Cse.byte_counter > 2) && (0x5A != Cse.rx_buffer[1]));
+          if (0x5A != Cse.rx_buffer[1]) {
+            Cse.received = false;
+            Cse.byte_counter = 0;
+          }
+        }
+      }
+    } else {
+      if ((0x5A == serial_in_byte) && (1 == Cse.byte_counter)) {
+        Cse.received = true;
+      } else {
+        Cse.byte_counter = 0;
+      }
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
+    }
+  }
+}
+
+
+
+void CseEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    Cse.voltage_cycle = 0;
+    Cse.current_cycle = 0;
+    Cse.power_cycle = 0;
+  } else {
+    long cf_frequency = 0;
+
+    if (CSE_PULSES_NOT_INITIALIZED == Cse.cf_pulses_last_time) {
+      Cse.cf_pulses_last_time = Cse.cf_pulses;
+    } else {
+      if (Cse.cf_pulses < Cse.cf_pulses_last_time) {
+        cf_frequency = (65536 - Cse.cf_pulses_last_time) + Cse.cf_pulses;
+      } else {
+        cf_frequency = Cse.cf_pulses - Cse.cf_pulses_last_time;
+      }
+      if (cf_frequency && Energy.active_power[0]) {
+        unsigned long delta = (cf_frequency * Settings.energy_power_calibration) / 36;
+
+
+
+        if (delta <= (4000*100/36) * 10 ) {
+          Cse.cf_pulses_last_time = Cse.cf_pulses;
+          Energy.kWhtoday_delta += delta;
+        }
+        else {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Load overflow"));
+          Cse.cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
+        }
+        EnergyUpdateToday();
+      }
+    }
+  }
+}
+
+void CseSnsInit(void)
+{
+
+
+  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], -1, 1);
+  if (CseSerial->begin(4800, 2)) {
+    if (CseSerial->hardwareSerial()) {
+      SetSerial(4800, TS_SERIAL_8E1);
+      ClaimSerial();
+    }
+    if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
+      Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;
+    }
+    Cse.power_invalid = Settings.param[P_CSE7766_INVALID_POWER];
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void CseDrvInit(void)
+{
+  Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
+  if (Cse.rx_buffer != nullptr) {
+
+    if (pin[GPIO_CSE7766_RX] < 99) {
+      energy_flg = XNRG_02;
+    }
+  }
+}
+
+bool CseCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.power_cycle) {
+      Settings.energy_power_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.power_cycle) / CSE_PREF;
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.voltage_cycle) {
+      Settings.energy_voltage_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.voltage_cycle) / CSE_UREF;
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.current_cycle) {
+      Settings.energy_current_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.current_cycle) / 1000;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      if (CseSerial) { CseSerialInput(); }
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      CseEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = CseCommand();
+      break;
+    case FUNC_INIT:
+      CseSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      CseDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM004T
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+#define XNRG_03 3
+
+const uint32_t PZEM_STABILIZE = 30;
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PzemSerial = nullptr;
+
+#define PZEM_VOLTAGE (uint8_t)0xB0
+#define RESP_VOLTAGE (uint8_t)0xA0
+
+#define PZEM_CURRENT (uint8_t)0xB1
+#define RESP_CURRENT (uint8_t)0xA1
+
+#define PZEM_POWER (uint8_t)0xB2
+#define RESP_POWER (uint8_t)0xA2
+
+#define PZEM_ENERGY (uint8_t)0xB3
+#define RESP_ENERGY (uint8_t)0xA3
+
+#define PZEM_SET_ADDRESS (uint8_t)0xB4
+#define RESP_SET_ADDRESS (uint8_t)0xA4
+
+#define PZEM_POWER_ALARM (uint8_t)0xB5
+#define RESP_POWER_ALARM (uint8_t)0xA5
+
+#define PZEM_DEFAULT_READ_TIMEOUT 500
+
+
+
+struct PZEM {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t read_state = 0;
+  uint8_t phase = 0;
+  uint8_t address = 0;
+} Pzem;
+
+struct PZEMCommand {
+  uint8_t command;
+  uint8_t addr[4];
+  uint8_t data;
+  uint8_t crc;
+};
+
+uint8_t PzemCrc(uint8_t *data)
+{
+  uint16_t crc = 0;
+  for (uint32_t i = 0; i < sizeof(PZEMCommand) -1; i++) {
+    crc += *data++;
+  }
+  return (uint8_t)(crc & 0xFF);
+}
+
+void PzemSend(uint8_t cmd)
+{
+  PZEMCommand pzem;
+
+  pzem.command = cmd;
+  pzem.addr[0] = 192;
+  pzem.addr[1] = 168;
+  pzem.addr[2] = 1;
+  pzem.addr[3] = ((PZEM_SET_ADDRESS == cmd) && Pzem.address) ? Pzem.address : 1 + Pzem.phase;
+  pzem.data = 0;
+
+  uint8_t *bytes = (uint8_t*)&pzem;
+  pzem.crc = PzemCrc(bytes);
+
+  PzemSerial->flush();
+  PzemSerial->write(bytes, sizeof(pzem));
+
+  Pzem.address = 0;
+}
+
+bool PzemReceiveReady(void)
+{
+  return PzemSerial->available() >= (int)sizeof(PZEMCommand);
+}
+
+bool PzemRecieve(uint8_t resp, float *data)
+{
+# 124 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+  uint8_t buffer[sizeof(PZEMCommand)] = { 0 };
+
+  unsigned long start = millis();
+  uint8_t len = 0;
+  while ((len < sizeof(PZEMCommand)) && (millis() - start < PZEM_DEFAULT_READ_TIMEOUT)) {
+    if (PzemSerial->available() > 0) {
+      uint8_t c = (uint8_t)PzemSerial->read();
+      if (!len && ((c & 0xF8) != 0xA0)) {
+        continue;
+      }
+      buffer[len++] = c;
+    }
+  }
+
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, len);
+
+  if (len != sizeof(PZEMCommand)) {
+
+    return false;
+  }
+  if (buffer[6] != PzemCrc(buffer)) {
+
+    return false;
+  }
+  if (buffer[0] != resp) {
+
+    return false;
+  }
+
+  switch (resp) {
+    case RESP_VOLTAGE:
+      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 10.0);
+      break;
+    case RESP_CURRENT:
+      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 100.0);
+      break;
+    case RESP_POWER:
+      *data = (float)(buffer[1] << 8) + buffer[2];
+      break;
+    case RESP_ENERGY:
+      *data = (float)((uint32_t)buffer[1] << 16) + ((uint16_t)buffer[2] << 8) + buffer[3];
+      break;
+  }
+  return true;
+}
+
+
+
+const uint8_t pzem_commands[] { PZEM_SET_ADDRESS, PZEM_VOLTAGE, PZEM_CURRENT, PZEM_POWER, PZEM_ENERGY };
+const uint8_t pzem_responses[] { RESP_SET_ADDRESS, RESP_VOLTAGE, RESP_CURRENT, RESP_POWER, RESP_ENERGY };
+
+void PzemEvery250ms(void)
+{
+  bool data_ready = PzemReceiveReady();
+
+  if (data_ready) {
+    float value = 0;
+    if (PzemRecieve(pzem_responses[Pzem.read_state], &value)) {
+      Energy.data_valid[Pzem.phase] = 0;
+      switch (Pzem.read_state) {
+        case 1:
+          Energy.voltage[Pzem.phase] = value;
+          break;
+        case 2:
+          Energy.current[Pzem.phase] = value;
+          break;
+        case 3:
+          Energy.active_power[Pzem.phase] = value;
+          break;
+        case 4:
+          Pzem.energy += value;
+          if (Pzem.phase == Energy.phase_count -1) {
+            if (Pzem.energy > Pzem.last_energy) {
+              if (uptime > PZEM_STABILIZE) {
+                EnergyUpdateTotal(Pzem.energy, false);
+              }
+              Pzem.last_energy = Pzem.energy;
+            }
+            Pzem.energy = 0;
+          }
+          break;
+      }
+      Pzem.read_state++;
+      if (5 == Pzem.read_state) {
+        Pzem.read_state = 1;
+      }
+
+
+    }
+  }
+
+  if (0 == Pzem.send_retry || data_ready) {
+    if (1 == Pzem.read_state) {
+      if (0 == Pzem.phase) {
+        Pzem.phase = Energy.phase_count -1;
+      } else {
+        Pzem.phase--;
+      }
+
+
+    }
+
+    if (Pzem.address) {
+      Pzem.read_state = 0;
+    }
+
+    Pzem.send_retry = 5;
+    PzemSend(pzem_commands[Pzem.read_state]);
+  }
+  else {
+    Pzem.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == Pzem.send_retry) && (uptime < PZEM_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemSnsInit(void)
+{
+
+  PzemSerial = new TasmotaSerial(pin[GPIO_PZEM004_RX], pin[GPIO_PZEM0XX_TX], 1);
+  if (PzemSerial->begin(9600)) {
+    if (PzemSerial->hardwareSerial()) {
+      ClaimSerial();
+    }
+    Energy.phase_count = 3;
+    Pzem.phase = 0;
+    Pzem.read_state = 1;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemDrvInit(void)
+{
+  if ((pin[GPIO_PZEM004_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_03;
+  }
+}
+
+bool PzemCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
+      Pzem.address = XdrvMailbox.payload;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg03(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (PzemSerial && (uptime > 4)) { PzemEvery250ms(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemCommand();
+      break;
+    case FUNC_INIT:
+      PzemSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_MCP39F501
+
+
+
+
+
+
+
+#define XNRG_04 4
+
+#define MCP_BAUDRATE 4800
+#define MCP_TIMEOUT 4
+#define MCP_CALIBRATION_TIMEOUT 2
+
+#define MCP_CALIBRATE_POWER 0x001
+#define MCP_CALIBRATE_VOLTAGE 0x002
+#define MCP_CALIBRATE_CURRENT 0x004
+#define MCP_CALIBRATE_FREQUENCY 0x008
+#define MCP_SINGLE_WIRE_FLAG 0x100
+
+#define MCP_START_FRAME 0xA5
+#define MCP_ACK_FRAME 0x06
+#define MCP_ERROR_NAK 0x15
+#define MCP_ERROR_CRC 0x51
+
+#define MCP_SINGLE_WIRE 0xAB
+
+#define MCP_SET_ADDRESS 0x41
+
+#define MCP_READ 0x4E
+#define MCP_READ_16 0x52
+#define MCP_READ_32 0x44
+
+#define MCP_WRITE 0x4D
+#define MCP_WRITE_16 0x57
+#define MCP_WRITE_32 0x45
+
+#define MCP_SAVE_REGISTERS 0x53
+
+#define MCP_CALIBRATION_BASE 0x0028
+#define MCP_CALIBRATION_LEN 52
+
+#define MCP_FREQUENCY_REF_BASE 0x0094
+#define MCP_FREQUENCY_GAIN_BASE 0x00AE
+#define MCP_FREQUENCY_LEN 4
+
+#define MCP_BUFFER_SIZE 60
+
+#include <TasmotaSerial.h>
+TasmotaSerial *McpSerial = nullptr;
+
+typedef struct mcp_cal_registers_type {
+  uint16_t gain_current_rms;
+  uint16_t gain_voltage_rms;
+  uint16_t gain_active_power;
+  uint16_t gain_reactive_power;
+  sint32_t offset_current_rms;
+  sint32_t offset_active_power;
+  sint32_t offset_reactive_power;
+  sint16_t dc_offset_current;
+  sint16_t phase_compensation;
+  uint16_t apparent_power_divisor;
+
+  uint32_t system_configuration;
+  uint16_t dio_configuration;
+  uint32_t range;
+
+  uint32_t calibration_current;
+  uint16_t calibration_voltage;
+  uint32_t calibration_active_power;
+  uint32_t calibration_reactive_power;
+  uint16_t accumulation_interval;
+} mcp_cal_registers_type;
+
+char *mcp_buffer = nullptr;
+unsigned long mcp_window = 0;
+unsigned long mcp_kWhcounter = 0;
+uint32_t mcp_system_configuration = 0x03000000;
+uint32_t mcp_active_power;
+
+
+uint32_t mcp_current_rms;
+uint16_t mcp_voltage_rms;
+uint16_t mcp_line_frequency;
+
+uint8_t mcp_address = 0;
+uint8_t mcp_calibration_active = 0;
+uint8_t mcp_init = 0;
+uint8_t mcp_timeout = 0;
+uint8_t mcp_calibrate = 0;
+uint8_t mcp_byte_counter = 0;
+
+
+
+
+
+
+uint8_t McpChecksum(uint8_t *data)
+{
+  uint8_t checksum = 0;
+  uint8_t offset = 0;
+  uint8_t len = data[1] -1;
+
+  for (uint32_t i = offset; i < len; i++) { checksum += data[i]; }
+  return checksum;
+}
+
+unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size)
+{
+ unsigned long result = 0;
+ unsigned long pow = 1;
+
+ for (uint32_t i = 0; i < size; i++) {
+  result = result + (uint8_t)data[offset + i] * pow;
+  pow = pow * 256;
+ }
+ return result;
+}
+
+void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size)
+{
+ for (uint32_t i = 0; i < size; i++) {
+  data[offset + i] = ((value >> (i * 8)) & 0xFF);
+ }
+}
+
+void McpSend(uint8_t *data)
+{
+  if (mcp_timeout) { return; }
+  mcp_timeout = MCP_TIMEOUT;
+
+  data[0] = MCP_START_FRAME;
+  data[data[1] -1] = McpChecksum(data);
+
+
+
+  for (uint32_t i = 0; i < data[1]; i++) {
+    McpSerial->write(data[i]);
+  }
+}
+
+
+
+void McpGetAddress(void)
+{
+  uint8_t data[] = { MCP_START_FRAME, 7, MCP_SET_ADDRESS, 0x00, 0x26, MCP_READ_16, 0x00 };
+
+  McpSend(data);
+}
+
+void McpAddressReceive(void)
+{
+
+  mcp_address = mcp_buffer[3];
+}
+
+
+
+void McpGetCalibration(void)
+{
+  if (mcp_calibration_active) { return; }
+  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
+
+  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, (MCP_CALIBRATION_BASE >> 8) & 0xFF, MCP_CALIBRATION_BASE & 0xFF, MCP_READ, MCP_CALIBRATION_LEN, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseCalibration(void)
+{
+  bool action = false;
+  mcp_cal_registers_type cal_registers;
+
+
+  cal_registers.gain_current_rms = McpExtractInt(mcp_buffer, 2, 2);
+  cal_registers.gain_voltage_rms = McpExtractInt(mcp_buffer, 4, 2);
+  cal_registers.gain_active_power = McpExtractInt(mcp_buffer, 6, 2);
+  cal_registers.gain_reactive_power = McpExtractInt(mcp_buffer, 8, 2);
+  cal_registers.offset_current_rms = McpExtractInt(mcp_buffer, 10, 4);
+  cal_registers.offset_active_power = McpExtractInt(mcp_buffer, 14, 4);
+  cal_registers.offset_reactive_power = McpExtractInt(mcp_buffer, 18, 4);
+  cal_registers.dc_offset_current = McpExtractInt(mcp_buffer, 22, 2);
+  cal_registers.phase_compensation = McpExtractInt(mcp_buffer, 24, 2);
+  cal_registers.apparent_power_divisor = McpExtractInt(mcp_buffer, 26, 2);
+
+  cal_registers.system_configuration = McpExtractInt(mcp_buffer, 28, 4);
+  cal_registers.dio_configuration = McpExtractInt(mcp_buffer, 32, 2);
+  cal_registers.range = McpExtractInt(mcp_buffer, 34, 4);
+
+  cal_registers.calibration_current = McpExtractInt(mcp_buffer, 38, 4);
+  cal_registers.calibration_voltage = McpExtractInt(mcp_buffer, 42, 2);
+  cal_registers.calibration_active_power = McpExtractInt(mcp_buffer, 44, 4);
+  cal_registers.calibration_reactive_power = McpExtractInt(mcp_buffer, 48, 4);
+  cal_registers.accumulation_interval = McpExtractInt(mcp_buffer, 52, 2);
+
+  if (mcp_calibrate & MCP_CALIBRATE_POWER) {
+    cal_registers.calibration_active_power = Settings.energy_power_calibration;
+    if (McpCalibrationCalc(&cal_registers, 16)) { action = true; }
+  }
+  if (mcp_calibrate & MCP_CALIBRATE_VOLTAGE) {
+    cal_registers.calibration_voltage = Settings.energy_voltage_calibration;
+    if (McpCalibrationCalc(&cal_registers, 0)) { action = true; }
+  }
+  if (mcp_calibrate & MCP_CALIBRATE_CURRENT) {
+    cal_registers.calibration_current = Settings.energy_current_calibration;
+    if (McpCalibrationCalc(&cal_registers, 8)) { action = true; }
+  }
+  mcp_timeout = 0;
+  if (action) { McpSetCalibration(&cal_registers); }
+
+  mcp_calibrate = 0;
+
+  Settings.energy_power_calibration = cal_registers.calibration_active_power;
+  Settings.energy_voltage_calibration = cal_registers.calibration_voltage;
+  Settings.energy_current_calibration = cal_registers.calibration_current;
+
+  mcp_system_configuration = cal_registers.system_configuration;
+
+  if (mcp_system_configuration & MCP_SINGLE_WIRE_FLAG) {
+    mcp_system_configuration &= ~MCP_SINGLE_WIRE_FLAG;
+   McpSetSystemConfiguration(2);
+  }
+}
+
+bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift)
+{
+  uint32_t measured;
+  uint32_t expected;
+  uint16_t *gain;
+  uint32_t new_gain;
+
+  if (range_shift == 0) {
+    measured = mcp_voltage_rms;
+    expected = cal_registers->calibration_voltage;
+    gain = &(cal_registers->gain_voltage_rms);
+  } else if (range_shift == 8) {
+    measured = mcp_current_rms;
+    expected = cal_registers->calibration_current;
+    gain = &(cal_registers->gain_current_rms);
+  } else if (range_shift == 16) {
+    measured = mcp_active_power;
+    expected = cal_registers->calibration_active_power;
+    gain = &(cal_registers->gain_active_power);
+  } else {
+    return false;
+  }
+
+  if (measured == 0) {
+    return false;
+  }
+
+  uint32_t range = (cal_registers->range >> range_shift) & 0xFF;
+
+calc:
+  new_gain = (*gain) * expected / measured;
+
+  if (new_gain < 25000) {
+    range++;
+    if (measured > 6) {
+      measured = measured / 2;
+      goto calc;
+    }
+  }
+
+  if (new_gain > 55000) {
+    range--;
+    measured = measured * 2;
+    goto calc;
+  }
+
+  *gain = new_gain;
+  uint32_t old_range = (cal_registers->range >> range_shift) & 0xFF;
+  cal_registers->range = cal_registers->range ^ (old_range << range_shift);
+  cal_registers->range = cal_registers->range | (range << range_shift);
+
+  return true;
+}
+
+
+
+
+
+
+void McpSetCalibration(struct mcp_cal_registers_type *cal_registers)
+{
+  uint8_t data[7 + MCP_CALIBRATION_LEN + 2 + 1];
+
+  data[1] = sizeof(data);
+  data[2] = MCP_SET_ADDRESS;
+  data[3] = (MCP_CALIBRATION_BASE >> 8) & 0xFF;
+  data[4] = (MCP_CALIBRATION_BASE >> 0) & 0xFF;
+
+  data[5] = MCP_WRITE;
+  data[6] = MCP_CALIBRATION_LEN;
+
+  McpSetInt(cal_registers->gain_current_rms, data, 0+7, 2);
+  McpSetInt(cal_registers->gain_voltage_rms, data, 2+7, 2);
+  McpSetInt(cal_registers->gain_active_power, data, 4+7, 2);
+  McpSetInt(cal_registers->gain_reactive_power, data, 6+7, 2);
+  McpSetInt(cal_registers->offset_current_rms, data, 8+7, 4);
+  McpSetInt(cal_registers->offset_active_power, data, 12+7, 4);
+  McpSetInt(cal_registers->offset_reactive_power, data, 16+7, 4);
+  McpSetInt(cal_registers->dc_offset_current, data, 20+7, 2);
+  McpSetInt(cal_registers->phase_compensation, data, 22+7, 2);
+  McpSetInt(cal_registers->apparent_power_divisor, data, 24+7, 2);
+
+  McpSetInt(cal_registers->system_configuration, data, 26+7, 4);
+  McpSetInt(cal_registers->dio_configuration, data, 30+7, 2);
+  McpSetInt(cal_registers->range, data, 32+7, 4);
+
+  McpSetInt(cal_registers->calibration_current, data, 36+7, 4);
+  McpSetInt(cal_registers->calibration_voltage, data, 40+7, 2);
+  McpSetInt(cal_registers->calibration_active_power, data, 42+7, 4);
+  McpSetInt(cal_registers->calibration_reactive_power, data, 46+7, 4);
+  McpSetInt(cal_registers->accumulation_interval, data, 50+7, 2);
+
+  data[MCP_CALIBRATION_LEN+7] = MCP_SAVE_REGISTERS;
+  data[MCP_CALIBRATION_LEN+8] = mcp_address;
+
+  McpSend(data);
+}
+
+
+
+void McpSetSystemConfiguration(uint16 interval)
+{
+
+  uint8_t data[17];
+
+  data[ 1] = sizeof(data);
+  data[ 2] = MCP_SET_ADDRESS;
+  data[ 3] = 0x00;
+  data[ 4] = 0x42;
+  data[ 5] = MCP_WRITE_32;
+  data[ 6] = (mcp_system_configuration >> 24) & 0xFF;
+  data[ 7] = (mcp_system_configuration >> 16) & 0xFF;
+  data[ 8] = (mcp_system_configuration >> 8) & 0xFF;
+  data[ 9] = (mcp_system_configuration >> 0) & 0xFF;
+  data[10] = MCP_SET_ADDRESS;
+  data[11] = 0x00;
+  data[12] = 0x5A;
+  data[13] = MCP_WRITE_16;
+  data[14] = (interval >> 8) & 0xFF;
+  data[15] = (interval >> 0) & 0xFF;
+
+  McpSend(data);
+}
+
+
+
+void McpGetFrequency(void)
+{
+  if (mcp_calibration_active) { return; }
+  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
+
+  uint8_t data[] = { MCP_START_FRAME, 11, MCP_SET_ADDRESS, (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF, MCP_FREQUENCY_REF_BASE & 0xFF, MCP_READ_16,
+                                          MCP_SET_ADDRESS, (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF, MCP_FREQUENCY_GAIN_BASE & 0xFF, MCP_READ_16, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseFrequency(void)
+{
+
+  uint16_t line_frequency_ref = mcp_buffer[2] * 256 + mcp_buffer[3];
+  uint16_t gain_line_frequency = mcp_buffer[4] * 256 + mcp_buffer[5];
+
+  if (mcp_calibrate & MCP_CALIBRATE_FREQUENCY) {
+    line_frequency_ref = Settings.energy_frequency_calibration;
+
+    if ((0xFFFF == mcp_line_frequency) || (0 == gain_line_frequency)) {
+      mcp_line_frequency = 50000;
+      gain_line_frequency = 0x8000;
+    }
+    gain_line_frequency = gain_line_frequency * line_frequency_ref / mcp_line_frequency;
+
+    mcp_timeout = 0;
+    McpSetFrequency(line_frequency_ref, gain_line_frequency);
+  }
+
+  Settings.energy_frequency_calibration = line_frequency_ref;
+
+  mcp_calibrate = 0;
+}
+
+void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency)
+{
+
+  uint8_t data[17];
+
+  data[ 1] = sizeof(data);
+  data[ 2] = MCP_SET_ADDRESS;
+  data[ 3] = (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF;
+  data[ 4] = (MCP_FREQUENCY_REF_BASE >> 0) & 0xFF;
+
+  data[ 5] = MCP_WRITE_16;
+  data[ 6] = (line_frequency_ref >> 8) & 0xFF;
+  data[ 7] = (line_frequency_ref >> 0) & 0xFF;
+
+  data[ 8] = MCP_SET_ADDRESS;
+  data[ 9] = (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF;
+  data[10] = (MCP_FREQUENCY_GAIN_BASE >> 0) & 0xFF;
+
+  data[11] = MCP_WRITE_16;
+  data[12] = (gain_line_frequency >> 8) & 0xFF;
+  data[13] = (gain_line_frequency >> 0) & 0xFF;
+
+  data[14] = MCP_SAVE_REGISTERS;
+  data[15] = mcp_address;
+
+  McpSend(data);
+}
+
+
+
+void McpGetData(void)
+{
+  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, 0x00, 0x04, MCP_READ, 22, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseData(void)
+{
+
+
+
+
+
+  mcp_current_rms = McpExtractInt(mcp_buffer, 2, 4);
+  mcp_voltage_rms = McpExtractInt(mcp_buffer, 6, 2);
+  mcp_active_power = McpExtractInt(mcp_buffer, 8, 4);
+
+
+  mcp_line_frequency = McpExtractInt(mcp_buffer, 22, 2);
+
+  if (Energy.power_on) {
+    Energy.data_valid[0] = 0;
+    Energy.frequency[0] = (float)mcp_line_frequency / 1000;
+    Energy.voltage[0] = (float)mcp_voltage_rms / 10;
+    Energy.active_power[0] = (float)mcp_active_power / 100;
+    if (0 == Energy.active_power[0]) {
+      Energy.current[0] = 0;
+    } else {
+      Energy.current[0] = (float)mcp_current_rms / 10000;
+    }
+  } else {
+    Energy.data_valid[0] = ENERGY_WATCHDOG;
+  }
+}
+
+
+
+void McpSerialInput(void)
+{
+  while ((McpSerial->available()) && (mcp_byte_counter < MCP_BUFFER_SIZE)) {
+    yield();
+    mcp_buffer[mcp_byte_counter++] = McpSerial->read();
+    mcp_window = millis();
+  }
+
+
+  if ((mcp_byte_counter) && (millis() - mcp_window > (24000 / MCP_BAUDRATE) +1)) {
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, (uint8_t*)mcp_buffer, mcp_byte_counter);
+
+    if (MCP_BUFFER_SIZE == mcp_byte_counter) {
+
+    }
+    else if (1 == mcp_byte_counter) {
+      if (MCP_ERROR_CRC == mcp_buffer[0]) {
+
+        mcp_timeout = 0;
+      }
+      else if (MCP_ERROR_NAK == mcp_buffer[0]) {
+
+        mcp_timeout = 0;
+      }
+    }
+    else if (MCP_ACK_FRAME == mcp_buffer[0]) {
+      if (mcp_byte_counter == mcp_buffer[1]) {
+
+        if (McpChecksum((uint8_t *)mcp_buffer) != mcp_buffer[mcp_byte_counter -1]) {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("MCP: " D_CHECKSUM_FAILURE));
+        } else {
+          if (5 == mcp_buffer[1]) { McpAddressReceive(); }
+          if (25 == mcp_buffer[1]) { McpParseData(); }
+          if (MCP_CALIBRATION_LEN + 3 == mcp_buffer[1]) { McpParseCalibration(); }
+          if (MCP_FREQUENCY_LEN + 3 == mcp_buffer[1]) { McpParseFrequency(); }
+        }
+
+      }
+      mcp_timeout = 0;
+    }
+    else if (MCP_SINGLE_WIRE == mcp_buffer[0]) {
+      mcp_timeout = 0;
+    }
+
+    mcp_byte_counter = 0;
+    McpSerial->flush();
+  }
+}
+
+
+
+void McpEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    mcp_voltage_rms = 0;
+    mcp_current_rms = 0;
+    mcp_active_power = 0;
+    mcp_line_frequency = 0;
+  }
+
+  if (mcp_active_power) {
+    Energy.kWhtoday_delta += ((mcp_active_power * 10) / 36);
+    EnergyUpdateToday();
+  }
+
+  if (mcp_timeout) {
+    mcp_timeout--;
+  }
+  else if (mcp_calibration_active) {
+    mcp_calibration_active--;
+  }
+  else if (mcp_init) {
+    if (2 == mcp_init) {
+      McpGetCalibration();
+    }
+    else if (1 == mcp_init) {
+      McpGetFrequency();
+    }
+    mcp_init--;
+  }
+  else if (!mcp_address) {
+    McpGetAddress();
+  }
+  else {
+    McpGetData();
+  }
+}
+
+void McpSnsInit(void)
+{
+
+  McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1);
+  if (McpSerial->begin(MCP_BAUDRATE)) {
+    if (McpSerial->hardwareSerial()) {
+      ClaimSerial();
+      mcp_buffer = serial_in_buffer;
+    } else {
+      mcp_buffer = (char*)(malloc(MCP_BUFFER_SIZE));
+    }
+    DigitalWrite(GPIO_MCP39F5_RST, 1);
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void McpDrvInit(void)
+{
+  if ((pin[GPIO_MCP39F5_RX] < 99) && (pin[GPIO_MCP39F5_TX] < 99)) {
+    if (pin[GPIO_MCP39F5_RST] < 99) {
+      pinMode(pin[GPIO_MCP39F5_RST], OUTPUT);
+      digitalWrite(pin[GPIO_MCP39F5_RST], 0);
+    }
+    mcp_calibrate = 0;
+    mcp_timeout = 2;
+    mcp_init = 2;
+    energy_flg = XNRG_04;
+  }
+}
+
+bool McpCommand(void)
+{
+  bool serviced = true;
+  unsigned long value = 0;
+
+  if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_active_power) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 100);
+      if ((value > 100) && (value < 200000)) {
+        Settings.energy_power_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_POWER;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_voltage_rms) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
+      if ((value > 1000) && (value < 2600)) {
+        Settings.energy_voltage_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_VOLTAGE;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_current_rms) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
+      if ((value > 100) && (value < 80000)) {
+        Settings.energy_current_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_CURRENT;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_FREQUENCYSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_line_frequency) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 1000);
+      if ((value > 45000) && (value < 65000)) {
+        Settings.energy_frequency_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_FREQUENCY;
+        McpGetFrequency();
+      }
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg04(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      if (McpSerial) { McpSerialInput(); }
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (McpSerial) { McpEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = McpCommand();
+      break;
+    case FUNC_INIT:
+      McpSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      McpDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM_AC
+# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+#define XNRG_05 5
+
+const uint8_t PZEM_AC_DEVICE_ADDRESS = 0x01;
+const uint32_t PZEM_AC_STABILIZE = 30;
+
+#include <TasmotaModbus.h>
+TasmotaModbus *PzemAcModbus;
+
+struct PZEMAC {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t phase = 0;
+  uint8_t address = 0;
+  uint8_t address_step = ADDR_IDLE;
+} PzemAc;
+
+void PzemAcEverySecond(void)
+{
+  bool data_ready = PzemAcModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[30];
+
+    uint8_t registers = 10;
+    if (ADDR_RECEIVE == PzemAc.address_step) {
+      registers = 2;
+      PzemAc.address_step--;
+    }
+    uint8_t error = PzemAcModbus->ReceiveBuffer(buffer, registers);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemAcModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAC: PzemAc %d error %d"), PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, error);
+    } else {
+      Energy.data_valid[PzemAc.phase] = 0;
+      if (10 == registers) {
+
+
+
+
+
+        Energy.voltage[PzemAc.phase] = (float)((buffer[3] << 8) + buffer[4]) / 10.0;
+        Energy.current[PzemAc.phase] = (float)((buffer[7] << 24) + (buffer[8] << 16) + (buffer[5] << 8) + buffer[6]) / 1000.0;
+        Energy.active_power[PzemAc.phase] = (float)((buffer[11] << 24) + (buffer[12] << 16) + (buffer[9] << 8) + buffer[10]) / 10.0;
+        Energy.frequency[PzemAc.phase] = (float)((buffer[17] << 8) + buffer[18]) / 10.0;
+        Energy.power_factor[PzemAc.phase] = (float)((buffer[19] << 8) + buffer[20]) / 100.0;
+
+        PzemAc.energy += (float)((buffer[15] << 24) + (buffer[16] << 16) + (buffer[13] << 8) + buffer[14]);
+        if (PzemAc.phase == Energy.phase_count -1) {
+          if (PzemAc.energy > PzemAc.last_energy) {
+            if (uptime > PZEM_AC_STABILIZE) {
+              EnergyUpdateTotal(PzemAc.energy, false);
+            }
+            PzemAc.last_energy = PzemAc.energy;
+          }
+          PzemAc.energy = 0;
+        }
+
+      }
+    }
+  }
+
+  if (0 == PzemAc.send_retry || data_ready) {
+    if (0 == PzemAc.phase) {
+      PzemAc.phase = Energy.phase_count -1;
+    } else {
+      PzemAc.phase--;
+    }
+    PzemAc.send_retry = ENERGY_WATCHDOG;
+    if (ADDR_SEND == PzemAc.address_step) {
+      PzemAcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemAc.address);
+      PzemAc.address_step--;
+    } else {
+      PzemAcModbus->Send(PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, 0x04, 0, 10);
+    }
+  }
+  else {
+    PzemAc.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == PzemAc.send_retry) && (uptime < PZEM_AC_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemAcSnsInit(void)
+{
+  PzemAcModbus = new TasmotaModbus(pin[GPIO_PZEM016_RX], pin[GPIO_PZEM0XX_TX]);
+  uint8_t result = PzemAcModbus->Begin(9600);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.phase_count = 3;
+    PzemAc.phase = 0;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemAcDrvInit(void)
+{
+  if ((pin[GPIO_PZEM016_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_05;
+  }
+}
+
+bool PzemAcCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    PzemAc.address = XdrvMailbox.payload;
+    PzemAc.address_step = ADDR_SEND;
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg05(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { PzemAcEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemAcCommand();
+      break;
+    case FUNC_INIT:
+      PzemAcSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemAcDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM_DC
+# 32 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+#define XNRG_06 6
+
+const uint8_t PZEM_DC_DEVICE_ADDRESS = 0x01;
+const uint32_t PZEM_DC_STABILIZE = 30;
+
+#include <TasmotaModbus.h>
+TasmotaModbus *PzemDcModbus;
+
+struct PZEMDC {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t channel = 0;
+  uint8_t address = 0;
+  uint8_t address_step = ADDR_IDLE;
+} PzemDc;
+
+void PzemDcEverySecond(void)
+{
+  bool data_ready = PzemDcModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[26];
+
+    uint8_t registers = 8;
+    if (ADDR_RECEIVE == PzemDc.address_step) {
+      registers = 2;
+      PzemDc.address_step--;
+    }
+    uint8_t error = PzemDcModbus->ReceiveBuffer(buffer, registers);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemDcModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PDC: PzemDc %d error %d"), PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, error);
+    } else {
+      Energy.data_valid[PzemDc.channel] = 0;
+      if (8 == registers) {
+
+
+
+
+
+        Energy.voltage[PzemDc.channel] = (float)((buffer[3] << 8) + buffer[4]) / 100.0;
+        Energy.current[PzemDc.channel] = (float)((buffer[5] << 8) + buffer[6]) / 100.0;
+        Energy.active_power[PzemDc.channel] = (float)((buffer[9] << 24) + (buffer[10] << 16) + (buffer[7] << 8) + buffer[8]) / 10.0;
+
+        PzemDc.energy += (float)((buffer[13] << 24) + (buffer[14] << 16) + (buffer[11] << 8) + buffer[12]);
+        if (PzemDc.channel == Energy.phase_count -1) {
+          if (PzemDc.energy > PzemDc.last_energy) {
+            if (uptime > PZEM_DC_STABILIZE) {
+              EnergyUpdateTotal(PzemDc.energy, false);
+            }
+            PzemDc.last_energy = PzemDc.energy;
+          }
+          PzemDc.energy = 0;
+        }
+      }
+    }
+  }
+
+  if (0 == PzemDc.send_retry || data_ready) {
+    if (0 == PzemDc.channel) {
+      PzemDc.channel = Energy.phase_count -1;
+    } else {
+      PzemDc.channel--;
+    }
+    PzemDc.send_retry = ENERGY_WATCHDOG;
+    if (ADDR_SEND == PzemDc.address_step) {
+      PzemDcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemDc.address);
+      PzemDc.address_step--;
+    } else {
+      PzemDcModbus->Send(PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, 0x04, 0, 8);
+    }
+  }
+  else {
+    PzemDc.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == PzemDc.send_retry) && (uptime < PZEM_DC_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemDcSnsInit(void)
+{
+  PzemDcModbus = new TasmotaModbus(pin[GPIO_PZEM017_RX], pin[GPIO_PZEM0XX_TX]);
+  uint8_t result = PzemDcModbus->Begin(9600, 2);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.type_dc = true;
+    Energy.phase_count = 3;
+    PzemDc.channel = 0;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemDcDrvInit(void)
+{
+  if ((pin[GPIO_PZEM017_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_06;
+  }
+}
+
+bool PzemDcCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    PzemDc.address = XdrvMailbox.payload;
+    PzemDc.address_step = ADDR_SEND;
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg06(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { PzemDcEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemDcCommand();
+      break;
+    case FUNC_INIT:
+      PzemDcSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemDcDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
+#ifdef USE_I2C
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_ADE7953
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
+#define XNRG_07 7
+#define XI2C_07 7
+
+#define ADE7953_PREF 1540
+#define ADE7953_UREF 26000
+#define ADE7953_IREF 10000
+
+#define ADE7953_ADDR 0x38
+
+const uint16_t Ade7953Registers[] {
+  0x31B,
+  0x313,
+  0x311,
+  0x315,
+  0x31A,
+  0x312,
+  0x310,
+  0x314,
+  0x31C,
+  0x10E
+};
+
+struct Ade7953 {
+  uint32_t voltage_rms = 0;
+  uint32_t period = 0;
+  uint32_t current_rms[2] = { 0, 0 };
+  uint32_t active_power[2] = { 0, 0 };
+  uint8_t init_step = 0;
+} Ade7953;
+
+int Ade7953RegSize(uint16_t reg)
+{
+  int size = 0;
+  switch ((reg >> 8) & 0x0F) {
+    case 0x03:
+      size++;
+    case 0x02:
+      size++;
+    case 0x01:
+      size++;
+    case 0x00:
+    case 0x07:
+    case 0x08:
+      size++;
+  }
+  return size;
+}
+
+void Ade7953Write(uint16_t reg, uint32_t val)
+{
+  int size = Ade7953RegSize(reg);
+  if (size) {
+    Wire.beginTransmission(ADE7953_ADDR);
+    Wire.write((reg >> 8) & 0xFF);
+    Wire.write(reg & 0xFF);
+    while (size--) {
+      Wire.write((val >> (8 * size)) & 0xFF);
+    }
+    Wire.endTransmission();
+    delayMicroseconds(5);
+  }
+}
+
+int32_t Ade7953Read(uint16_t reg)
+{
+ uint32_t response = 0;
+
+  int size = Ade7953RegSize(reg);
+  if (size) {
+    Wire.beginTransmission(ADE7953_ADDR);
+    Wire.write((reg >> 8) & 0xFF);
+    Wire.write(reg & 0xFF);
+    Wire.endTransmission(0);
+    Wire.requestFrom(ADE7953_ADDR, size);
+    if (size <= Wire.available()) {
+      for (uint32_t i = 0; i < size; i++) {
+        response = response << 8 | Wire.read();
+      }
+    }
+  }
+ return response;
+}
+
+void Ade7953Init(void)
+{
+  Ade7953Write(0x102, 0x0004);
+  Ade7953Write(0x0FE, 0x00AD);
+  Ade7953Write(0x120, 0x0030);
+}
+
+void Ade7953GetData(void)
+{
+  int32_t reg[2][4];
+  for (uint32_t i = 0; i < sizeof(Ade7953Registers)/sizeof(uint16_t); i++) {
+    int32_t value = Ade7953Read(Ade7953Registers[i]);
+    if (8 == i) {
+      Ade7953.voltage_rms = value;
+    } else if (9 == i) {
+      Ade7953.period = value;
+    } else {
+      reg[i >> 2][i &3] = value;
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: %d, %d, [%d, %d, %d, %d], [%d, %d, %d, %d]"),
+    Ade7953.voltage_rms, Ade7953.period,
+    reg[0][0], reg[0][1], reg[0][2], reg[0][3],
+    reg[1][0], reg[1][1], reg[1][2], reg[1][3]);
+
+  uint32_t apparent_power[2] = { 0, 0 };
+  uint32_t reactive_power[2] = { 0, 0 };
+
+  for (uint32_t channel = 0; channel < 2; channel++) {
+    Ade7953.current_rms[channel] = reg[channel][0];
+    if (Ade7953.current_rms[channel] < 2000) {
+      Ade7953.current_rms[channel] = 0;
+      Ade7953.active_power[channel] = 0;
+    } else {
+      Ade7953.active_power[channel] = abs(reg[channel][1]);
+      apparent_power[channel] = abs(reg[channel][2]);
+      reactive_power[channel] = abs(reg[channel][3]);
+    }
+  }
+
+  uint32_t current_rms_sum = Ade7953.current_rms[0] + Ade7953.current_rms[1];
+  uint32_t active_power_sum = Ade7953.active_power[0] + Ade7953.active_power[1];
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ADE: U %d, C %d, I %d + %d = %d, P %d + %d = %d"),
+    Ade7953.voltage_rms, Ade7953.period,
+    Ade7953.current_rms[0], Ade7953.current_rms[1], current_rms_sum,
+    Ade7953.active_power[0], Ade7953.active_power[1], active_power_sum);
+
+  if (Energy.power_on) {
+    Energy.voltage[0] = (float)Ade7953.voltage_rms / Settings.energy_voltage_calibration;
+    Energy.frequency[0] = 223750.0f / ( (float)Ade7953.period + 1);
+
+    for (uint32_t channel = 0; channel < 2; channel++) {
+      Energy.data_valid[channel] = 0;
+      Energy.active_power[channel] = (float)Ade7953.active_power[channel] / (Settings.energy_power_calibration / 10);
+      Energy.reactive_power[channel] = (float)reactive_power[channel] / (Settings.energy_power_calibration / 10);
+      Energy.apparent_power[channel] = (float)apparent_power[channel] / (Settings.energy_power_calibration / 10);
+      if (0 == Energy.active_power[channel]) {
+        Energy.current[channel] = 0;
+      } else {
+        Energy.current[channel] = (float)Ade7953.current_rms[channel] / (Settings.energy_current_calibration * 10);
+      }
+    }
+  } else {
+    Energy.data_valid[0] = ENERGY_WATCHDOG;
+    Energy.data_valid[1] = ENERGY_WATCHDOG;
+  }
+
+  if (active_power_sum) {
+    Energy.kWhtoday_delta += ((active_power_sum * (100000 / (Settings.energy_power_calibration / 10))) / 3600);
+    EnergyUpdateToday();
+  }
+}
+
+void Ade7953EnergyEverySecond(void)
+{
+ if (Ade7953.init_step) {
+    if (1 == Ade7953.init_step) {
+      Ade7953Init();
+   }
+    Ade7953.init_step--;
+ } else {
+  Ade7953GetData();
+ }
+}
+
+void Ade7953DrvInit(void)
+{
+  if (pin[GPIO_ADE7953_IRQ] < 99) {
+    delay(100);
+    if (I2cSetDevice(ADE7953_ADDR)) {
+      if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
+        Settings.energy_power_calibration = ADE7953_PREF;
+        Settings.energy_voltage_calibration = ADE7953_UREF;
+        Settings.energy_current_calibration = ADE7953_IREF;
+      }
+      I2cSetActiveFound(ADE7953_ADDR, "ADE7953");
+      Ade7953.init_step = 2;
+
+      Energy.phase_count = 2;
+      Energy.voltage_common = true;
+
+      energy_flg = XNRG_07;
+    }
+  }
+}
+
+bool Ade7953Command(void)
+{
+  bool serviced = true;
+
+  uint32_t channel = (2 == XdrvMailbox.index) ? 1 : 0;
+  uint32_t value = (uint32_t)(CharToFloat(XdrvMailbox.data) * 100);
+
+  if (CMND_POWERCAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_PREF; }
+
+  }
+  else if (CMND_VOLTAGECAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_UREF; }
+
+  }
+  else if (CMND_CURRENTCAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_IREF; }
+
+  }
+  else if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.active_power[channel]) {
+      if ((value > 100) && (value < 200000)) {
+        Settings.energy_power_calibration = (Ade7953.active_power[channel] * 1000) / value;
+      }
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.voltage_rms) {
+      if ((value > 10000) && (value < 26000)) {
+        Settings.energy_voltage_calibration = (Ade7953.voltage_rms * 100) / value;
+      }
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.current_rms[channel]) {
+      if ((value > 2000) && (value < 1000000)) {
+        Settings.energy_current_calibration = ((Ade7953.current_rms[channel] * 100) / value) * 100;
+      }
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_07)) { return false; }
+
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      Ade7953EnergyEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = Ade7953Command();
+      break;
+    case FUNC_PRE_INIT:
+      Ade7953DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_08_sdm120.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_08_sdm120.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SDM120
+
+
+
+
+
+
+#define XNRG_08 8
+
+
+#ifndef SDM120_SPEED
+  #define SDM120_SPEED 2400
+#endif
+
+#ifndef SDM120_ADDR
+  #define SDM120_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Sdm120Modbus;
+
+const uint8_t sdm120_table = 8;
+const uint8_t sdm220_table = 13;
+
+const uint16_t sdm120_start_addresses[] {
+  0x0000,
+  0x0006,
+  0x000C,
+  0x0012,
+  0x0018,
+  0x001E,
+  0x0046,
+  0x0156,
+
+  0X0048,
+  0X004A,
+  0X004C,
+  0X004E,
+  0X0024
+};
+
+struct SDM120 {
+  float total_active = 0;
+  float import_active = NAN;
+  float import_reactive = 0;
+  float export_reactive = 0;
+  float phase_angle = 0;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+  uint8_t start_address_count = sdm220_table;
+} Sdm120;
+
+
+
+void SDM120Every250ms(void)
+{
+  bool data_ready = Sdm120Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Sdm120Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm120Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM120 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Sdm120.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.current[0] = value;
+          break;
+
+        case 2:
+          Energy.active_power[0] = value;
+          break;
+
+        case 3:
+          Energy.apparent_power[0] = value;
+          break;
+
+        case 4:
+          Energy.reactive_power[0] = value;
+          break;
+
+        case 5:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 6:
+          Energy.frequency[0] = value;
+          break;
+
+        case 7:
+          Sdm120.total_active = value;
+          break;
+
+        case 8:
+          Sdm120.import_active = value;
+          break;
+
+        case 9:
+          Energy.export_active = value;
+          break;
+
+        case 10:
+          Sdm120.import_reactive = value;
+          break;
+
+        case 11:
+          Sdm120.export_reactive = value;
+          break;
+
+        case 12:
+          Sdm120.phase_angle = value;
+          break;
+      }
+
+      Sdm120.read_state++;
+      if (Sdm120.read_state == Sdm120.start_address_count) {
+        Sdm120.read_state = 0;
+
+        if (Sdm120.start_address_count > sdm120_table) {
+          if (!isnan(Sdm120.import_active)) {
+            Sdm120.total_active = Sdm120.import_active;
+          } else {
+            Sdm120.start_address_count = sdm120_table;
+          }
+        }
+        EnergyUpdateTotal(Sdm120.total_active, true);
+      }
+    }
+  }
+
+  if (0 == Sdm120.send_retry || data_ready) {
+    Sdm120.send_retry = 5;
+    Sdm120Modbus->Send(SDM120_ADDR, 0x04, sdm120_start_addresses[Sdm120.read_state], 2);
+  } else {
+    Sdm120.send_retry--;
+  }
+}
+
+void Sdm120SnsInit(void)
+{
+  Sdm120Modbus = new TasmotaModbus(pin[GPIO_SDM120_RX], pin[GPIO_SDM120_TX]);
+  uint8_t result = Sdm120Modbus->Begin(SDM120_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Sdm120DrvInit(void)
+{
+  if ((pin[GPIO_SDM120_RX] < 99) && (pin[GPIO_SDM120_TX] < 99)) {
+    energy_flg = XNRG_08;
+  }
+}
+
+void Sdm220Reset(void)
+{
+  if (isnan(Sdm120.import_active)) { return; }
+
+  Sdm120.import_active = 0;
+  Sdm120.import_reactive = 0;
+  Sdm120.export_reactive = 0;
+  Sdm120.phase_angle = 0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_SDM220[] PROGMEM =
+  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  "{s}" D_EXPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  "{s}" D_PHASE_ANGLE "{m}%s " D_UNIT_ANGLE "{e}";
+#endif
+
+void Sdm220Show(bool json)
+{
+  if (isnan(Sdm120.import_active)) { return; }
+
+  char import_active_chr[FLOATSZ];
+  dtostrfd(Sdm120.import_active, Settings.flag2.energy_resolution, import_active_chr);
+  char import_reactive_chr[FLOATSZ];
+  dtostrfd(Sdm120.import_reactive, Settings.flag2.energy_resolution, import_reactive_chr);
+  char export_reactive_chr[FLOATSZ];
+  dtostrfd(Sdm120.export_reactive, Settings.flag2.energy_resolution, export_reactive_chr);
+  char phase_angle_chr[FLOATSZ];
+  dtostrfd(Sdm120.phase_angle, 2, phase_angle_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_ACTIVE "\":%s,\"" D_JSON_IMPORT_REACTIVE "\":%s,\"" D_JSON_EXPORT_REACTIVE "\":%s,\"" D_JSON_PHASE_ANGLE "\":%s"),
+      import_active_chr, import_reactive_chr, export_reactive_chr, phase_angle_chr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_ENERGY_SDM220, import_reactive_chr, export_reactive_chr, phase_angle_chr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg08(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { SDM120Every250ms(); }
+      break;
+    case FUNC_JSON_APPEND:
+      Sdm220Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Sdm220Show(0);
+      break;
+#endif
+    case FUNC_ENERGY_RESET:
+      Sdm220Reset();
+      break;
+    case FUNC_INIT:
+      Sdm120SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Sdm120DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_DDS2382
+
+
+
+
+
+
+#define XNRG_09 9
+
+#ifndef DDS2382_SPEED
+#define DDS2382_SPEED 9600
+#endif
+#ifndef DDS2382_ADDR
+#define DDS2382_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Dds2382Modbus;
+
+uint8_t Dds2382_send_retry = 0;
+
+void Dds2382EverySecond(void)
+{
+  bool data_ready = Dds2382Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[46];
+
+    uint32_t error = Dds2382Modbus->ReceiveBuffer(buffer, 18);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Dds2382Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "DDS2382 response error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
+      Energy.voltage[0] = (float)((buffer[27] << 8) + buffer[28]) / 10.0;
+      Energy.current[0] = (float)((buffer[29] << 8) + buffer[30]) / 100.0;
+      Energy.active_power[0] = (float)((buffer[31] << 8) + buffer[32]);
+      Energy.reactive_power[0] = (float)((buffer[33] << 8) + buffer[34]);
+      Energy.power_factor[0] = (float)((buffer[35] << 8) + buffer[36]) / 1000.0;
+      Energy.frequency[0] = (float)((buffer[37] << 8) + buffer[38]) / 100.0;
+      uint8_t offset = 11;
+      if (Settings.flag3.dds2382_model) {
+        offset = 19;
+      }
+      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;
+      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;
+
+      EnergyUpdateTotal(import_active, true);
+    }
+  }
+
+  if (0 == Dds2382_send_retry || data_ready) {
+    Dds2382_send_retry = 5;
+    Dds2382Modbus->Send(DDS2382_ADDR, 0x03, 0, 18);
+  } else {
+    Dds2382_send_retry--;
+  }
+}
+
+void Dds2382SnsInit(void)
+{
+  Dds2382Modbus = new TasmotaModbus(pin[GPIO_DDS2382_RX], pin[GPIO_DDS2382_TX]);
+  uint8_t result = Dds2382Modbus->Begin(DDS2382_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Dds2382DrvInit(void)
+{
+  if ((pin[GPIO_DDS2382_RX] < 99) && (pin[GPIO_DDS2382_TX] < 99)) {
+    energy_flg = XNRG_09;
+  }
+}
+
+
+
+
+
+bool Xnrg09(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { Dds2382EverySecond(); }
+      break;
+    case FUNC_INIT:
+      Dds2382SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Dds2382DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_10_sdm630.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_10_sdm630.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SDM630
+
+
+
+
+
+
+#define XNRG_10 10
+
+
+#ifndef SDM630_SPEED
+  #define SDM630_SPEED 9600
+#endif
+
+#ifndef SDM630_ADDR
+  #define SDM630_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Sdm630Modbus;
+
+const uint16_t sdm630_start_addresses[] {
+  0x0000,
+  0x0002,
+  0x0004,
+  0x0006,
+  0x0008,
+  0x000A,
+  0x000C,
+  0x000E,
+  0x0010,
+  0x0018,
+  0x001A,
+  0x001C,
+  0x001E,
+  0x0020,
+  0x0022,
+  0x0156
+};
+
+struct SDM630 {
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+} Sdm630;
+
+
+
+void SDM630Every250ms(void)
+{
+  bool data_ready = Sdm630Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Sdm630Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm630Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM630 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+      Energy.data_valid[1] = 0;
+      Energy.data_valid[2] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Sdm630.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.voltage[1] = value;
+          break;
+
+        case 2:
+          Energy.voltage[2] = value;
+          break;
+
+        case 3:
+          Energy.current[0] = value;
+          break;
+
+        case 4:
+          Energy.current[1] = value;
+          break;
+
+        case 5:
+          Energy.current[2] = value;
+          break;
+
+        case 6:
+          Energy.active_power[0] = value;
+          break;
+
+        case 7:
+          Energy.active_power[1] = value;
+          break;
+
+        case 8:
+          Energy.active_power[2] = value;
+          break;
+
+        case 9:
+          Energy.reactive_power[0] = value;
+          break;
+
+        case 10:
+          Energy.reactive_power[1] = value;
+          break;
+
+        case 11:
+          Energy.reactive_power[2] = value;
+          break;
+
+        case 12:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 13:
+          Energy.power_factor[1] = value;
+          break;
+
+        case 14:
+          Energy.power_factor[2] = value;
+          break;
+
+        case 15:
+          EnergyUpdateTotal(value, true);
+          break;
+      }
+
+      Sdm630.read_state++;
+      if (sizeof(sdm630_start_addresses)/2 == Sdm630.read_state) {
+        Sdm630.read_state = 0;
+      }
+    }
+  }
+
+  if (0 == Sdm630.send_retry || data_ready) {
+    Sdm630.send_retry = 5;
+    Sdm630Modbus->Send(SDM630_ADDR, 0x04, sdm630_start_addresses[Sdm630.read_state], 2);
+  } else {
+    Sdm630.send_retry--;
+  }
+}
+
+void Sdm630SnsInit(void)
+{
+  Sdm630Modbus = new TasmotaModbus(pin[GPIO_SDM630_RX], pin[GPIO_SDM630_TX]);
+  uint8_t result = Sdm630Modbus->Begin(SDM630_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.phase_count = 3;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Sdm630DrvInit(void)
+{
+  if ((pin[GPIO_SDM630_RX] < 99) && (pin[GPIO_SDM630_TX] < 99)) {
+    energy_flg = XNRG_10;
+  }
+}
+
+
+
+
+
+bool Xnrg10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { SDM630Every250ms(); }
+      break;
+    case FUNC_INIT:
+      Sdm630SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Sdm630DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_11_ddsu666.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_11_ddsu666.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_DDSU666
+
+
+
+
+#define XNRG_11 11
+
+
+#ifndef DDSU666_SPEED
+  #define DDSU666_SPEED 9600
+#endif
+
+#ifndef DDSU666_ADDR
+  #define DDSU666_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Ddsu666Modbus;
+
+const uint16_t Ddsu666_start_addresses[] {
+  0x2000,
+  0x2002,
+  0x2004,
+  0x2006,
+  0x200A,
+  0x200E,
+  0X4000,
+  0X400A,
+};
+
+struct DDSU666 {
+  float import_active = NAN;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+} Ddsu666;
+
+
+
+void DDSU666Every250ms(void)
+{
+  bool data_ready = Ddsu666Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Ddsu666Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Ddsu666Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: Ddsu666 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Ddsu666.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.current[0] = value;
+          break;
+
+        case 2:
+          Energy.active_power[0] = value * 1000;
+          break;
+
+        case 3:
+          Energy.reactive_power[0] = value * 1000;
+          break;
+
+        case 4:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 5:
+          Energy.frequency[0] = value;
+          break;
+
+        case 6:
+          Ddsu666.import_active = value;
+          break;
+
+        case 7:
+          Energy.export_active = value;
+          break;
+      }
+
+      Ddsu666.read_state++;
+
+      if (Ddsu666.read_state == 8) {
+        Ddsu666.read_state = 0;
+        EnergyUpdateTotal(Ddsu666.import_active, true);
+      }
+    }
+  }
+
+  if (0 == Ddsu666.send_retry || data_ready) {
+    Ddsu666.send_retry = 5;
+    Ddsu666Modbus->Send(DDSU666_ADDR, 0x04, Ddsu666_start_addresses[Ddsu666.read_state], 2);
+  } else {
+    Ddsu666.send_retry--;
+  }
+}
+
+void Ddsu666SnsInit(void)
+{
+  Ddsu666Modbus = new TasmotaModbus(pin[GPIO_DDSU666_RX], pin[GPIO_DDSU666_TX]);
+  uint8_t result = Ddsu666Modbus->Begin(DDSU666_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Ddsu666DrvInit(void)
+{
+  if ((pin[GPIO_DDSU666_RX] < 99) && (pin[GPIO_DDSU666_TX] < 99)) {
+    energy_flg = XNRG_11;
+  }
+}
+
+
+
+
+
+bool Xnrg11(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { DDSU666Every250ms(); }
+      break;
+    case FUNC_INIT:
+      Ddsu666SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Ddsu666DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_12_solaxX1.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_12_solaxX1.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SOLAX_X1
+
+
+
+
+#define XNRG_12 12
+
+#ifndef SOLAXX1_SPEED
+#define SOLAXX1_SPEED 9600
+#endif
+
+#define INVERTER_ADDRESS 0x0A
+
+#define D_SOLAX_X1 "SolaxX1"
+
+#include <TasmotaSerial.h>
+
+enum solaxX1_Error
+{
+  solaxX1_ERR_NO_ERROR,
+  solaxX1_ERR_CRC_ERROR
+};
+
+union {
+  uint32_t ErrMessage;
+  struct {
+
+    uint8_t TzProtectFault:1;
+    uint8_t MainsLostFault:1;
+    uint8_t GridVoltFault:1;
+    uint8_t GridFreqFault:1;
+    uint8_t PLLLostFault:1;
+    uint8_t BusVoltFault:1;
+    uint8_t ErrBit06:1;
+    uint8_t OciFault:1;
+
+    uint8_t Dci_OCP_Fault:1;
+    uint8_t ResidualCurrentFault:1;
+    uint8_t PvVoltFault:1;
+    uint8_t Ac10Mins_Voltage_Fault:1;
+    uint8_t IsolationFault:1;
+    uint8_t TemperatureOverFault:1;
+    uint8_t FanFault:1;
+    uint8_t ErrBit15:1;
+
+    uint8_t SpiCommsFault:1;
+    uint8_t SciCommsFault:1;
+    uint8_t ErrBit18:1;
+    uint8_t InputConfigFault:1;
+    uint8_t EepromFault:1;
+    uint8_t RelayFault:1;
+    uint8_t SampleConsistenceFault:1;
+    uint8_t ResidualCurrent_DeviceFault:1;
+
+    uint8_t ErrBit24:1;
+    uint8_t ErrBit25:1;
+    uint8_t ErrBit26:1;
+    uint8_t ErrBit27:1;
+    uint8_t ErrBit28:1;
+    uint8_t DCI_DeviceFault:1;
+    uint8_t OtherDeviceFault:1;
+    uint8_t ErrBit31:1;
+  };
+} ErrCode;
+
+const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE;
+
+const char kSolaxError[] PROGMEM =
+  D_SOLAX_ERROR_0 "|" D_SOLAX_ERROR_1 "|" D_SOLAX_ERROR_2 "|" D_SOLAX_ERROR_3 "|" D_SOLAX_ERROR_4 "|" D_SOLAX_ERROR_5 "|"
+  D_SOLAX_ERROR_6 "|" D_SOLAX_ERROR_7 "|" D_SOLAX_ERROR_8;
+
+
+
+TasmotaSerial *solaxX1Serial;
+
+uint8_t solaxX1_Init = 1;
+
+struct SOLAXX1 {
+  float temperature = 0;
+  float energy_today = 0;
+  float dc1_voltage = 0;
+  float dc2_voltage = 0;
+  float dc1_current = 0;
+  float dc2_current = 0;
+  float energy_total = 0;
+  float runtime_total = 0;
+  float dc1_power = 0;
+  float dc2_power = 0;
+
+  uint8_t status = 0;
+  uint32_t errorCode = 0;
+} solaxX1;
+
+union {
+  uint8_t status;
+  struct {
+    uint8_t freeBit7:1;
+    uint8_t freeBit6:1;
+    uint8_t freeBit5:1;
+    uint8_t queryOffline:1;
+    uint8_t queryOfflineSend:1;
+    uint8_t hasAddress:1;
+    uint8_t inverterAddressSend:1;
+    uint8_t inverterSnReceived:1;
+  };
+} protocolStatus;
+
+uint8_t header[2] = {0xAA, 0x55};
+uint8_t source[2] = {0x00, 0x00};
+uint8_t destination[2] = {0x00, 0x00};
+uint8_t controlCode[1] = {0x00};
+uint8_t functionCode[1] = {0x00};
+uint8_t dataLength[1] = {0x00};
+uint8_t data[16] = {0};
+
+uint8_t message[30];
+
+
+
+bool solaxX1_RS485ReceiveReady(void)
+{
+  return (solaxX1Serial->available() > 1);
+}
+
+void solaxX1_RS485Send(uint16_t msgLen)
+{
+  memcpy(message, header, 2);
+  memcpy(message + 2, source, 2);
+  memcpy(message + 4, destination, 2);
+  memcpy(message + 6, controlCode, 1);
+  memcpy(message + 7, functionCode, 1);
+  memcpy(message + 8, dataLength, 1);
+  memcpy(message + 9, data, sizeof(data));
+  uint16_t crc = solaxX1_calculateCRC(message, msgLen);
+
+  while (solaxX1Serial->available() > 0)
+  {
+    solaxX1Serial->read();
+  }
+
+  solaxX1Serial->flush();
+  solaxX1Serial->write(message, msgLen);
+  solaxX1Serial->write(highByte(crc));
+  solaxX1Serial->write(lowByte(crc));
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, message, msgLen);
+}
+
+uint8_t solaxX1_RS485Receive(uint8_t *value)
+{
+  uint8_t len = 0;
+
+  while (solaxX1Serial->available() > 0)
+  {
+    value[len++] = (uint8_t)solaxX1Serial->read();
+  }
+
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, value, len);
+
+  uint16_t crc = solaxX1_calculateCRC(value, len - 2);
+
+  if (value[len - 1] == lowByte(crc) && value[len - 2] == highByte(crc))
+  {
+    return solaxX1_ERR_NO_ERROR;
+  }
+  else
+  {
+    return solaxX1_ERR_CRC_ERROR;
+  }
+}
+
+uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen)
+{
+  uint8_t i;
+  uint16_t wChkSum;
+  wChkSum = 0;
+
+  for (i = 0; i < bLen; i++)
+  {
+    wChkSum = wChkSum + bExternTxPackage[i];
+  }
+  return wChkSum;
+}
+
+void solaxX1_SendInverterAddress(void)
+{
+  source[0] = 0x00;
+  destination[0] = 0x00;
+  destination[1] = 0x00;
+  controlCode[0] = 0x10;
+  functionCode[0] = 0x01;
+  dataLength[0] = 0x0F;
+  data[14] = INVERTER_ADDRESS;
+  solaxX1_RS485Send(24);
+}
+
+void solaxX1_QueryLiveData(void)
+{
+  source[0] = 0x01;
+  destination[0] = 0x00;
+  destination[1] = INVERTER_ADDRESS;
+  controlCode[0] = 0x11;
+  functionCode[0] = 0x02;
+  dataLength[0] = 0x00;
+  solaxX1_RS485Send(9);
+}
+
+uint8_t solaxX1_ParseErrorCode(uint32_t code){
+  ErrCode.ErrMessage = code;
+
+  if (code == 0) return 0;
+  if (ErrCode.MainsLostFault) return 1;
+  if (ErrCode.GridVoltFault) return 2;
+  if (ErrCode.GridFreqFault) return 3;
+  if (ErrCode.PvVoltFault) return 4;
+  if (ErrCode.IsolationFault) return 5;
+  if (ErrCode.TemperatureOverFault) return 6;
+  if (ErrCode.FanFault) return 7;
+  if (ErrCode.OtherDeviceFault) return 8;
+}
+
+
+
+uint8_t solaxX1_send_retry = 0;
+uint8_t solaxX1_nodata_count = 0;
+
+void solaxX1250MSecond(void)
+{
+  uint8_t value[61] = {0};
+  bool data_ready = solaxX1_RS485ReceiveReady();
+
+  if (protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
+  {
+    if (data_ready)
+    {
+      uint8_t error = solaxX1_RS485Receive(value);
+      if (error)
+      {
+        DEBUG_SENSOR_LOG(PSTR("SX1: Data response CRC error"));
+      }
+      else
+      {
+        solaxX1_nodata_count = 0;
+        solaxX1_send_retry = 12;
+        Energy.data_valid[0] = 0;
+
+        solaxX1.temperature = (float)((value[9] << 8) | value[10]);
+        solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f;
+        solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f;
+        solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f;
+        solaxX1.dc1_current = (float)((value[17] << 8) | value[18]) * 0.1f;
+        solaxX1.dc2_current = (float)((value[19] << 8) | value[20]) * 0.1f;
+        Energy.current[0] = (float)((value[21] << 8) | value[22]) * 0.1f;
+        Energy.voltage[0] = (float)((value[23] << 8) | value[24]) * 0.1f;
+        Energy.frequency[0] = (float)((value[25] << 8) | value[26]) * 0.01f;
+        Energy.active_power[0] = (float)((value[27] << 8) | value[28]);
+
+        solaxX1.energy_total = (float)((value[31] << 8) | (value[32] << 8) | (value[33] << 8) | value[34]) * 0.1f;
+        solaxX1.runtime_total = (float)((value[35] << 8) | (value[36] << 8) | (value[37] << 8) | value[38]);
+        solaxX1.status = (uint8_t)((value[39] << 8) | value[40]);
+
+
+
+
+
+
+
+        solaxX1.errorCode = (uint32_t)((value[58] << 8) | (value[57] << 8) | (value[56] << 8) | value[55]);
+
+        solaxX1.dc1_power = solaxX1.dc1_voltage * solaxX1.dc1_current;
+        solaxX1.dc2_power = solaxX1.dc2_voltage * solaxX1.dc2_current;
+
+        solaxX1_QueryLiveData();
+        EnergyUpdateTotal(solaxX1.energy_total, true);
+      }
+    }
+
+    if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) {
+      solaxX1_send_retry = 12;
+      solaxX1_QueryLiveData();
+    }
+
+
+
+    if (255 == solaxX1_nodata_count) {
+      solaxX1_nodata_count = 0;
+      solaxX1_send_retry = 12;
+    }
+  }
+  else
+  {
+    if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); }
+    if (solaxX1_nodata_count < 10 * 4)
+    {
+      solaxX1_nodata_count++;
+    }
+    else if (255 != solaxX1_nodata_count)
+    {
+
+      solaxX1_nodata_count = 255;
+      solaxX1_send_retry = 12;
+      protocolStatus.status = 0b00001000;
+      Energy.data_valid[0] = ENERGY_WATCHDOG;
+
+      solaxX1.temperature = solaxX1.dc1_voltage = solaxX1.dc2_voltage = solaxX1.dc1_current = solaxX1.dc2_current = solaxX1.dc1_power = 0;
+      solaxX1.dc2_power = solaxX1.status = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0;
+
+    }
+  }
+
+  if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
+  {
+    if (data_ready)
+    {
+
+      if (protocolStatus.inverterAddressSend)
+      {
+        uint8_t error = solaxX1_RS485Receive(value);
+        if (error)
+        {
+          DEBUG_SENSOR_LOG(PSTR("SX1: Address confirmation response CRC error"));
+        }
+        else
+        {
+          if (value[6] == 0x10 && value[7] == 0x81 && value[9] == 0x06)
+          {
+            DEBUG_SENSOR_LOG(PSTR("SX1: Set hasAddress"));
+            protocolStatus.status = 0b00100000;
+          }
+        }
+      }
+
+
+      if (protocolStatus.queryOfflineSend)
+      {
+        uint8_t error = solaxX1_RS485Receive(value);
+        if (error)
+        {
+          DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline response CRC error"));
+        }
+        else
+        {
+
+          if (value[6] == 0x10 && value[7] == 0x80 && protocolStatus.inverterSnReceived == false)
+          {
+            for (uint8_t i = 9; i <= 22; i++)
+            {
+              data[i - 9] = value[i];
+            }
+            solaxX1_SendInverterAddress();
+            protocolStatus.status = 0b1100000;
+            DEBUG_SENSOR_LOG(PSTR("SX1: Set inverterSnReceived and inverterAddressSend"));
+          }
+        }
+      }
+    }
+
+    if (solaxX1_send_retry == 0)
+    {
+      if (protocolStatus.queryOfflineSend)
+      {
+        protocolStatus.status = 0b00001000;
+        DEBUG_SENSOR_LOG(PSTR("SX1: Set Query Offline"));
+      }
+      solaxX1_send_retry = 12;
+    }
+
+
+    if (protocolStatus.queryOffline)
+    {
+
+      source[0] = 0x01;
+      destination[1] = 0x00;
+      controlCode[0] = 0x10;
+      functionCode[0] = 0x00;
+      dataLength[0] = 0x00;
+      solaxX1_RS485Send(9);
+      protocolStatus.status = 0b00010000;
+      DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline Send"));
+    }
+  }
+
+  if (!data_ready)
+    solaxX1_send_retry--;
+}
+
+void solaxX1SnsInit(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init"));
+  DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]);
+  protocolStatus.status = 0b00100000;
+
+  solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1);
+  if (solaxX1Serial->begin(SOLAXX1_SPEED)) {
+    if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void solaxX1DrvInit(void)
+{
+  if ((pin[GPIO_SOLAXX1_RX] < 99) && (pin[GPIO_SOLAXX1_TX] < 99)) {
+    energy_flg = XNRG_12;
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_solaxX1_DATA1[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_SOLAR_POWER "{m}%s " D_UNIT_WATT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_POWER "{m}%s " D_UNIT_WATT "{e}";
+#ifdef SOLAXX1_PV2
+const char HTTP_SNS_solaxX1_DATA2[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_PV2_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV2_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV2_POWER "{m}%s " D_UNIT_WATT "{e}";
+#endif
+const char HTTP_SNS_solaxX1_DATA3[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_UPTIME "{m}%s " D_UNIT_HOUR "{e}"
+    "{s}" D_SOLAX_X1 " " D_STATUS "{m}%s"
+    "{s}" D_SOLAX_X1 " " D_ERROR "{m}%s";
+#endif
+
+void solaxX1Show(bool json)
+{
+  char solar_power[33];
+  dtostrfd(solaxX1.dc1_power + solaxX1.dc2_power, Settings.flag2.wattage_resolution, solar_power);
+  char pv1_voltage[33];
+  dtostrfd(solaxX1.dc1_voltage, Settings.flag2.voltage_resolution, pv1_voltage);
+  char pv1_current[33];
+  dtostrfd(solaxX1.dc1_current, Settings.flag2.current_resolution, pv1_current);
+  char pv1_power[33];
+  dtostrfd(solaxX1.dc1_power, Settings.flag2.wattage_resolution, pv1_power);
+#ifdef SOLAXX1_PV2
+  char pv2_voltage[33];
+  dtostrfd(solaxX1.dc2_voltage, Settings.flag2.voltage_resolution, pv2_voltage);
+  char pv2_current[33];
+  dtostrfd(solaxX1.dc2_current, Settings.flag2.current_resolution, pv2_current);
+  char pv2_power[33];
+  dtostrfd(solaxX1.dc2_power, Settings.flag2.wattage_resolution, pv2_power);
+#endif
+  char temperature[33];
+  dtostrfd(solaxX1.temperature, Settings.flag2.temperature_resolution, temperature);
+  char runtime[33];
+  dtostrfd(solaxX1.runtime_total, 0, runtime);
+  char status[33];
+  GetTextIndexed(status, sizeof(status), solaxX1.status, kSolaxMode);
+
+  if (json)
+  {
+    ResponseAppend_P(PSTR(",\"" D_JSON_SOLAR_POWER "\":%s,\"" D_JSON_PV1_VOLTAGE "\":%s,\"" D_JSON_PV1_CURRENT "\":%s,\"" D_JSON_PV1_POWER "\":%s"),
+                                solar_power, pv1_voltage, pv1_current, pv1_power);
+#ifdef SOLAXX1_PV2
+    ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"),
+                                pv2_voltage, pv2_current, pv2_power);
+#endif
+    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"),
+                                temperature, runtime, status, solaxX1.errorCode);
+
+#ifdef USE_WEBSERVER
+  }
+  else
+  {
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA1, solar_power, pv1_voltage, pv1_current, pv1_power);
+#ifdef SOLAXX1_PV2
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA2, pv2_voltage, pv2_current, pv2_power);
+#endif
+    WSContentSend_PD(HTTP_SNS_TEMP, D_SOLAX_X1, temperature, TempUnit());
+    char errorCodeString[33];
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA3, runtime, status,
+      GetTextIndexed(errorCodeString, sizeof(errorCodeString), solaxX1_ParseErrorCode(solaxX1.errorCode), kSolaxError));
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg12(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { solaxX1250MSecond(); }
+      break;
+    case FUNC_JSON_APPEND:
+      solaxX1Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      solaxX1Show(0);
+      break;
+#endif
+    case FUNC_INIT:
+      solaxX1SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      solaxX1DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_LE01MR
+# 71 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+#define XNRG_13 13
+
+
+#ifndef LE01MR_SPEED
+  #define LE01MR_SPEED 2400
+#endif
+
+#ifndef LE01MR_ADDR
+  #define LE01MR_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *FifLEModbus;
+
+const uint8_t le01mr_table_sz = 9;
+
+const uint16_t le01mr_register_addresses[] {
+
+  0x0130,
+  0x0131,
+  0x0158,
+  0x0139,
+  0x0140,
+  0x0148,
+  0x0150,
+  0xA000,
+  0xA01E
+};
+
+struct LE01MR {
+  float total_active = 0;
+  float total_reactive = 0;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+  uint8_t start_address_count = le01mr_table_sz;
+} Le01mr;
+
+
+
+void FifLEEvery250ms(void)
+{
+  bool data_ready = FifLEModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+    uint8_t reg_count = 2;
+    if (Le01mr.read_state < 3) {
+      reg_count=1;
+    }
+
+    uint32_t error = FifLEModbus->ReceiveBuffer(buffer, reg_count);
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, FifLEModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+# 146 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+      uint32_t value_buff = 0;
+
+      if (Le01mr.read_state >= 0 && Le01mr.read_state < 3) {
+        value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
+      } else {
+        value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
+      }
+
+      switch(Le01mr.read_state) {
+        case 0:
+          Energy.frequency[0] = value_buff * 0.01f;
+          break;
+
+        case 1:
+          Energy.voltage[0] = value_buff * 0.01f;
+          break;
+
+        case 2:
+          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f;
+          break;
+
+        case 3:
+          Energy.current[0] = value_buff * 0.001f;
+          break;
+
+        case 4:
+          Energy.active_power[0] = value_buff * 1.0f;
+          break;
+
+        case 5:
+          Energy.reactive_power[0] = value_buff * 1.0f;
+          break;
+
+        case 6:
+          Energy.apparent_power[0] = value_buff * 1.0f;
+          break;
+
+        case 7:
+          Le01mr.total_active = value_buff * 0.01f;
+          break;
+
+        case 8:
+          Le01mr.total_reactive = value_buff * 0.01f;
+          break;
+      }
+
+      Le01mr.read_state++;
+      if (Le01mr.read_state == Le01mr.start_address_count) {
+        Le01mr.read_state = 0;
+
+        EnergyUpdateTotal(Le01mr.total_active, true);
+      }
+    }
+  }
+
+  if (0 == Le01mr.send_retry || data_ready) {
+    uint8_t reg_count = 2;
+
+    Le01mr.send_retry = 5;
+
+    if (Le01mr.read_state < 3) reg_count=1;
+
+    FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
+  } else {
+    Le01mr.send_retry--;
+  }
+}
+
+void FifLESnsInit(void)
+{
+  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_TX]);
+  uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void FifLEDrvInit(void)
+{
+  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_TX] < 99)) {
+    energy_flg = XNRG_13;
+  }
+}
+
+void FifLEReset(void)
+{
+  Le01mr.total_active = 0;
+  Le01mr.total_reactive = 0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_LE01MR[] PROGMEM =
+  "{s}" D_TOTAL_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_TOTAL_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  ;
+#endif
+
+void FifLEShow(bool json)
+{
+  char total_reactive_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
+  char total_active_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
+      total_active_chr, total_reactive_chr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_active_chr, total_reactive_chr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg13(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) {
+          FifLEEvery250ms();
+      }
+      break;
+    case FUNC_JSON_APPEND:
+      FifLEShow(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      FifLEShow(0);
+      break;
+#endif
+    case FUNC_ENERGY_RESET:
+      FifLEReset();
+      break;
+    case FUNC_INIT:
+      FifLESnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      FifLEDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_interface.ino"
+#ifdef USE_ENERGY_SENSOR
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xnrg_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XNRG_01
+  &Xnrg01,
+#endif
+
+#ifdef XNRG_02
+  &Xnrg02,
+#endif
+
+#ifdef XNRG_03
+  &Xnrg03,
+#endif
+
+#ifdef XNRG_04
+  &Xnrg04,
+#endif
+
+#ifdef XNRG_05
+  &Xnrg05,
+#endif
+
+#ifdef XNRG_06
+  &Xnrg06,
+#endif
+
+#ifdef XNRG_07
+  &Xnrg07,
+#endif
+
+#ifdef XNRG_08
+  &Xnrg08,
+#endif
+
+#ifdef XNRG_09
+  &Xnrg09,
+#endif
+
+#ifdef XNRG_10
+  &Xnrg10,
+#endif
+
+#ifdef XNRG_11
+  &Xnrg11,
+#endif
+
+#ifdef XNRG_12
+  &Xnrg12,
+#endif
+
+#ifdef XNRG_13
+  &Xnrg13,
+#endif
+
+#ifdef XNRG_14
+  &Xnrg14,
+#endif
+
+#ifdef XNRG_15
+  &Xnrg15,
+#endif
+
+#ifdef XNRG_16
+  &Xnrg16
+#endif
+};
+
+const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]);
+
+uint8_t xnrg_active = 0;
+
+bool XnrgCall(uint8_t function)
+{
+  DEBUG_TRACE_LOG(PSTR("NRG: %d"), function);
+
+  if (FUNC_PRE_INIT == function) {
+    for (uint32_t x = 0; x < xnrg_present; x++) {
+      xnrg_func_ptr[x](function);
+      if (energy_flg) {
+        xnrg_active = x;
+        return true;
+      }
+    }
+  }
+  else if (energy_flg) {
+    return xnrg_func_ptr[xnrg_active](function);
+  }
+  return false;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_01_counter.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_01_counter.ino"
+#ifdef USE_COUNTER
+
+
+
+
+#define XSNS_01 1
+
+#define D_PRFX_COUNTER "Counter"
+#define D_CMND_COUNTERTYPE "Type"
+#define D_CMND_COUNTERDEBOUNCE "Debounce"
+
+const char kCounterCommands[] PROGMEM = D_PRFX_COUNTER "|"
+  "|" D_CMND_COUNTERTYPE "|" D_CMND_COUNTERDEBOUNCE ;
+
+void (* const CounterCommand[])(void) PROGMEM = {
+  &CmndCounter, &CmndCounterType, &CmndCounterDebounce };
+
+struct COUNTER {
+  uint32_t timer[MAX_COUNTERS];
+  uint8_t no_pullup = 0;
+  bool any_counter = false;
+} Counter;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void CounterUpdate(uint8_t index) ICACHE_RAM_ATTR;
+void CounterUpdate1(void) ICACHE_RAM_ATTR;
+void CounterUpdate2(void) ICACHE_RAM_ATTR;
+void CounterUpdate3(void) ICACHE_RAM_ATTR;
+void CounterUpdate4(void) ICACHE_RAM_ATTR;
+#endif
+
+void CounterUpdate(uint8_t index)
+{
+  uint32_t time = micros();
+  uint32_t debounce_time = time - Counter.timer[index];
+  if (debounce_time > Settings.pulse_counter_debounce * 1000) {
+    Counter.timer[index] = time;
+    if (bitRead(Settings.pulse_counter_type, index)) {
+      RtcSettings.pulse_counter[index] = debounce_time;
+    } else {
+      RtcSettings.pulse_counter[index]++;
+    }
+  }
+}
+
+void CounterUpdate1(void)
+{
+  CounterUpdate(0);
+}
+
+void CounterUpdate2(void)
+{
+  CounterUpdate(1);
+}
+
+void CounterUpdate3(void)
+{
+  CounterUpdate(2);
+}
+
+void CounterUpdate4(void)
+{
+  CounterUpdate(3);
+}
+
+
+
+bool CounterPinState(void)
+{
+  if ((XdrvMailbox.index >= GPIO_CNTR1_NP) && (XdrvMailbox.index < (GPIO_CNTR1_NP + MAX_COUNTERS))) {
+    bitSet(Counter.no_pullup, XdrvMailbox.index - GPIO_CNTR1_NP);
+    XdrvMailbox.index -= (GPIO_CNTR1_NP - GPIO_CNTR1);
+    return true;
+  }
+  return false;
+}
+
+void CounterInit(void)
+{
+  typedef void (*function) () ;
+  function counter_callbacks[] = { CounterUpdate1, CounterUpdate2, CounterUpdate3, CounterUpdate4 };
+
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      Counter.any_counter = true;
+      pinMode(pin[GPIO_CNTR1 +i], bitRead(Counter.no_pullup, i) ? INPUT : INPUT_PULLUP);
+      attachInterrupt(pin[GPIO_CNTR1 +i], counter_callbacks[i], FALLING);
+    }
+  }
+}
+
+void CounterEverySecond(void)
+{
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      if (bitRead(Settings.pulse_counter_type, i)) {
+        uint32_t time = micros() - Counter.timer[i];
+        if (time > 4200000000) {
+          RtcSettings.pulse_counter[i] = 4200000000;
+        }
+      }
+    }
+  }
+}
+
+void CounterSaveState(void)
+{
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
+    }
+  }
+}
+
+void CounterShow(bool json)
+{
+  bool header = false;
+  uint8_t dsxflg = 0;
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      char counter[33];
+      if (bitRead(Settings.pulse_counter_type, i)) {
+        dtostrfd((double)RtcSettings.pulse_counter[i] / 1000000, 6, counter);
+      } else {
+        dsxflg++;
+        snprintf_P(counter, sizeof(counter), PSTR("%lu"), RtcSettings.pulse_counter[i]);
+      }
+
+      if (json) {
+        if (!header) {
+          ResponseAppend_P(PSTR(",\"COUNTER\":{"));
+        }
+        ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
+        header = true;
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (1 == dsxflg)) {
+          DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]);
+          dsxflg++;
+        }
+#endif
+        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
+          RtcSettings.pulse_counter[i] = 0;
+        }
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),
+          i +1, counter, (bitRead(Settings.pulse_counter_type, i)) ? " " D_UNIT_SECOND : "");
+#endif
+      }
+    }
+  }
+  if (header) {
+    ResponseJsonEnd();
+  }
+}
+
+
+
+
+
+void CmndCounter(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
+    if ((XdrvMailbox.data_len > 0) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
+      if ((XdrvMailbox.data[0] == '-') || (XdrvMailbox.data[0] == '+')) {
+        RtcSettings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
+        Settings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
+      } else {
+        RtcSettings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
+        Settings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      }
+    }
+    ResponseCmndIdxNumber(RtcSettings.pulse_counter[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndCounterType(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
+      bitWrite(Settings.pulse_counter_type, XdrvMailbox.index -1, XdrvMailbox.payload &1);
+      RtcSettings.pulse_counter[XdrvMailbox.index -1] = 0;
+      Settings.pulse_counter[XdrvMailbox.index -1] = 0;
+    }
+    ResponseCmndIdxNumber(bitRead(Settings.pulse_counter_type, XdrvMailbox.index -1));
+  }
+}
+
+void CmndCounterDebounce(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
+    Settings.pulse_counter_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.pulse_counter_debounce);
+}
+
+
+
+
+
+bool Xsns01(uint8_t function)
+{
+  bool result = false;
+
+  if (Counter.any_counter) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        CounterEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        CounterShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        CounterShow(0);
+        break;
+#endif
+      case FUNC_SAVE_BEFORE_RESTART:
+      case FUNC_SAVE_AT_MIDNIGHT:
+        CounterSaveState();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kCounterCommands, CounterCommand);
+        break;
+    }
+  } else {
+    switch (function) {
+      case FUNC_INIT:
+        CounterInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = CounterPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
+#ifndef USE_ADC_VCC
+
+
+
+
+#define XSNS_02 2
+
+#define TO_CELSIUS(x) ((x) - 273.15)
+#define TO_KELVIN(x) ((x) + 273.15)
+
+
+#define ANALOG_V33 3.3
+#define ANALOG_T0 TO_KELVIN(25.0)
+
+
+
+
+
+#define ANALOG_NTC_BRIDGE_RESISTANCE 32000
+#define ANALOG_NTC_RESISTANCE 10000
+#define ANALOG_NTC_B_COEFFICIENT 3350
+
+
+
+
+
+#define ANALOG_LDR_BRIDGE_RESISTANCE 10000
+#define ANALOG_LDR_LUX_CALC_SCALAR 12518931
+#define ANALOG_LDR_LUX_CALC_EXPONENT -1.4050
+# 58 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
+#define ANALOG_CT_FLAGS 0
+#define ANALOG_CT_MULTIPLIER 2146
+#define ANALOG_CT_VOLTAGE 2300
+
+#define CT_FLAG_ENERGY_RESET (1 << 0)
+
+struct {
+  float temperature = 0;
+  float current = 0;
+  float energy = 0;
+  uint32_t previous_millis = 0;
+  uint16_t last_value = 0;
+} Adc;
+
+void AdcInit(void)
+{
+  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000)) {
+    if (ADC0_TEMP == my_adc0) {
+
+      Settings.adc_param_type = ADC0_TEMP;
+      Settings.adc_param1 = ANALOG_NTC_BRIDGE_RESISTANCE;
+      Settings.adc_param2 = ANALOG_NTC_RESISTANCE;
+      Settings.adc_param3 = ANALOG_NTC_B_COEFFICIENT * 10000;
+    }
+    else if (ADC0_LIGHT == my_adc0) {
+      Settings.adc_param_type = ADC0_LIGHT;
+      Settings.adc_param1 = ANALOG_LDR_BRIDGE_RESISTANCE;
+      Settings.adc_param2 = ANALOG_LDR_LUX_CALC_SCALAR;
+      Settings.adc_param3 = ANALOG_LDR_LUX_CALC_EXPONENT * 10000;
+    }
+    else if (ADC0_RANGE == my_adc0) {
+      Settings.adc_param_type = ADC0_RANGE;
+      Settings.adc_param1 = 0;
+      Settings.adc_param2 = 1023;
+      Settings.adc_param3 = 0;
+      Settings.adc_param4 = 100;
+    }
+    else if (ADC0_CT_POWER == my_adc0) {
+      Settings.adc_param_type = ADC0_CT_POWER;
+      Settings.adc_param1 = ANALOG_CT_FLAGS;
+      Settings.adc_param2 = ANALOG_CT_MULTIPLIER;
+      Settings.adc_param3 = ANALOG_CT_VOLTAGE;
+    }
+  }
+}
+
+uint16_t AdcRead(uint8_t factor)
+{
+
+
+
+
+
+  uint8_t samples = 1 << factor;
+  uint16_t analog = 0;
+  for (uint32_t i = 0; i < samples; i++) {
+    analog += analogRead(A0);
+    delay(1);
+  }
+  analog >>= factor;
+  return analog;
+}
+
+#ifdef USE_RULES
+void AdcEvery250ms(void)
+{
+  if (ADC0_INPUT == my_adc0) {
+    uint16_t new_value = AdcRead(5);
+    if ((new_value < Adc.last_value -10) || (new_value > Adc.last_value +10)) {
+      Adc.last_value = new_value;
+      uint16_t value = Adc.last_value / 10;
+      Response_P(PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value);
+      XdrvRulesProcess();
+    }
+  }
+}
+#endif
+
+uint16_t AdcGetLux(void)
+{
+  int adc = AdcRead(2);
+
+  double resistorVoltage = ((double)adc / 1023) * ANALOG_V33;
+  double ldrVoltage = ANALOG_V33 - resistorVoltage;
+  double ldrResistance = ldrVoltage / resistorVoltage * (double)Settings.adc_param1;
+  double ldrLux = (double)Settings.adc_param2 * FastPrecisePow(ldrResistance, (double)Settings.adc_param3 / 10000);
+
+  return (uint16_t)ldrLux;
+}
+
+uint16_t AdcGetRange(void)
+{
+
+
+
+  int adc = AdcRead(2);
+  double adcrange = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
+  return (uint16_t)adcrange;
+}
+
+void AdcGetCurrentPower(uint8_t factor)
+{
+
+
+
+
+
+  uint8_t samples = 1 << factor;
+  uint16_t analog = 0;
+  uint16_t analog_min = 1023;
+  uint16_t analog_max = 0;
+  for (uint32_t i = 0; i < samples; i++) {
+    analog = analogRead(A0);
+    if (analog < analog_min) {
+      analog_min = analog;
+    }
+    if (analog > analog_max) {
+      analog_max = analog;
+    }
+    delay(1);
+  }
+
+  Adc.current = (float)(analog_max-analog_min) * ((float)(Settings.adc_param2) / 100000);
+  float power = Adc.current * (float)(Settings.adc_param3) / 10;
+  uint32_t current_millis = millis();
+  Adc.energy = Adc.energy + ((power * (current_millis - Adc.previous_millis)) / 3600000000);
+  Adc.previous_millis = current_millis;
+}
+
+void AdcEverySecond(void)
+{
+  if (ADC0_TEMP == my_adc0) {
+    int adc = AdcRead(2);
+
+    double Rt = (adc * Settings.adc_param1) / (1024.0 * ANALOG_V33 - (double)adc);
+    double BC = (double)Settings.adc_param3 / 10000;
+    double T = BC / (BC / ANALOG_T0 + TaylorLog(Rt / (double)Settings.adc_param2));
+    Adc.temperature = ConvertTemp(TO_CELSIUS(T));
+  }
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
+  }
+}
+
+void AdcShow(bool json)
+{
+  if (ADC0_INPUT == my_adc0) {
+    uint16_t analog = AdcRead(5);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"ANALOG\":{\"A0\":%d}"), analog);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ANALOG, "", 0, analog);
+#endif
+    }
+  }
+
+  else if (ADC0_TEMP == my_adc0) {
+    char temperature[33];
+    dtostrfd(Adc.temperature, Settings.flag2.temperature_resolution, temperature);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMP, "ANALOG", temperature);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_TEMP, temperature);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Adc.temperature);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
+#endif
+    }
+  }
+
+  else if (ADC0_LIGHT == my_adc0) {
+    uint16_t adc_light = AdcGetLux();
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_ILLUMINANCE, "ANALOG", adc_light);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, adc_light);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, "", adc_light);
+#endif
+    }
+  }
+
+  else if (ADC0_RANGE == my_adc0) {
+    uint16_t adc_range = AdcGetRange();
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_RANGE, "ANALOG", adc_range);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_RANGE, "", adc_range);
+#endif
+    }
+  }
+
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
+
+    float voltage = (float)(Settings.adc_param3) / 10;
+    char voltage_chr[FLOATSZ];
+    dtostrfd(voltage, Settings.flag2.voltage_resolution, voltage_chr);
+    char current_chr[FLOATSZ];
+    dtostrfd(Adc.current, Settings.flag2.current_resolution, current_chr);
+    char power_chr[FLOATSZ];
+    dtostrfd(voltage * Adc.current, Settings.flag2.wattage_resolution, power_chr);
+    char energy_chr[FLOATSZ];
+    dtostrfd(Adc.energy, Settings.flag2.energy_resolution, energy_chr);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"ANALOG\":{\"" D_JSON_ENERGY "\":%s,\"" D_JSON_POWERUSAGE "\":%s,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s}"),
+        energy_chr, power_chr, voltage_chr, current_chr);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_POWER_ENERGY, power_chr);
+        DomoticzSensor(DZ_VOLTAGE, voltage_chr);
+        DomoticzSensor(DZ_CURRENT, current_chr);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, voltage_chr);
+      WSContentSend_PD(HTTP_SNS_CURRENT, current_chr);
+      WSContentSend_PD(HTTP_SNS_POWER, power_chr);
+      WSContentSend_PD(HTTP_SNS_ENERGY_TOTAL, energy_chr);
+#endif
+    }
+  }
+
+}
+
+
+
+
+
+const char kAdcCommands[] PROGMEM = "|"
+  D_CMND_ADC "|" D_CMND_ADCS "|" D_CMND_ADCPARAM;
+
+void (* const AdcCommand[])(void) PROGMEM = {
+  &CmndAdc, &CmndAdcs, &CmndAdcParam };
+
+void CmndAdc(void)
+{
+  if (ValidAdc() && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < ADC0_END)) {
+    Settings.my_adc0 = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  char stemp1[TOPSZ];
+  Response_P(PSTR("{\"" D_CMND_ADC "0\":{\"%d\":\"%s\"}}"), Settings.my_adc0, GetTextIndexed(stemp1, sizeof(stemp1), Settings.my_adc0, kAdc0Names));
+}
+
+void CmndAdcs(void)
+{
+  Response_P(PSTR("{\"" D_CMND_ADCS "\":{"));
+  bool jsflg = false;
+  char stemp1[TOPSZ];
+  for (uint32_t i = 0; i < ADC0_END; i++) {
+    if (jsflg) {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    ResponseAppend_P(PSTR("\"%d\":\"%s\""), i, GetTextIndexed(stemp1, sizeof(stemp1), i, kAdc0Names));
+  }
+  ResponseJsonEndEnd();
+}
+
+void CmndAdcParam(void)
+{
+  if (XdrvMailbox.data_len) {
+    if ((ADC0_TEMP == XdrvMailbox.payload) ||
+        (ADC0_LIGHT == XdrvMailbox.payload) ||
+        (ADC0_RANGE == XdrvMailbox.payload) ||
+        (ADC0_CT_POWER == XdrvMailbox.payload)) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len +1];
+
+
+
+        Settings.adc_param_type = XdrvMailbox.payload;
+        Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+        Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
+        if (ADC0_RANGE == XdrvMailbox.payload) {
+          Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
+          Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
+        } else {
+          Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
+        }
+        if (ADC0_CT_POWER == XdrvMailbox.payload) {
+          if ((Settings.adc_param1 & CT_FLAG_ENERGY_RESET) > 0) {
+            Adc.energy = 0;
+            Settings.adc_param1 ^= CT_FLAG_ENERGY_RESET;
+          }
+        }
+      } else {
+
+
+
+
+        Settings.adc_param_type = 0;
+        AdcInit();
+      }
+    }
+  }
+
+
+  Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
+  if (ADC0_RANGE == my_adc0) {
+    ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
+  } else {
+    int value = Settings.adc_param3;
+    uint8_t precision;
+    for (precision = 4; precision > 0; precision--) {
+      if (value % 10) { break; }
+      value /= 10;
+    }
+    char param3[33];
+    dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
+    ResponseAppend_P(PSTR(",%s"), param3);
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+
+
+
+
+bool Xsns02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_COMMAND:
+      result = DecodeCommand(kAdcCommands, AdcCommand);
+      break;
+    default:
+      if ((ADC0_INPUT == my_adc0) ||
+          (ADC0_TEMP == my_adc0) ||
+          (ADC0_LIGHT == my_adc0) ||
+          (ADC0_RANGE == my_adc0) ||
+          (ADC0_CT_POWER == my_adc0)) {
+        switch (function) {
+#ifdef USE_RULES
+          case FUNC_EVERY_250_MSECOND:
+            AdcEvery250ms();
+            break;
+#endif
+          case FUNC_EVERY_SECOND:
+            AdcEverySecond();
+            break;
+          case FUNC_INIT:
+            AdcInit();
+            break;
+          case FUNC_JSON_APPEND:
+            AdcShow(1);
+            break;
+#ifdef USE_WEBSERVER
+          case FUNC_WEB_SENSOR:
+            AdcShow(0);
+            break;
+#endif
+        }
+      }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
+#ifdef USE_SONOFF_SC
+# 57 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
+#define XSNS_04 4
+
+uint16_t sc_value[5] = { 0 };
+
+void SonoffScSend(const char *data)
+{
+  Serial.write(data);
+  Serial.write('\x1B');
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_TRANSMIT " %s"), data);
+}
+
+void SonoffScInit(void)
+{
+
+  SonoffScSend("AT+START");
+
+}
+
+void SonoffScSerialInput(char *rcvstat)
+{
+  char *p;
+  char *str;
+  uint16_t value[5] = { 0 };
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_RECEIVED " %s"), rcvstat);
+
+  if (!strncasecmp_P(rcvstat, PSTR("AT+UPDATE="), 10)) {
+    int8_t i = -1;
+    for (str = strtok_r(rcvstat, ":", &p); str && i < 5; str = strtok_r(nullptr, ":", &p)) {
+      value[i++] = atoi(str);
+    }
+    if (value[0] > 0) {
+      for (uint32_t i = 0; i < 5; i++) {
+        sc_value[i] = value[i];
+      }
+      sc_value[2] = (11 - sc_value[2]) * 10;
+      sc_value[3] *= 10;
+      sc_value[4] = (11 - sc_value[4]) * 10;
+      SonoffScSend("AT+SEND=ok");
+    } else {
+      SonoffScSend("AT+SEND=fail");
+    }
+  }
+  else if (!strcasecmp_P(rcvstat, PSTR("AT+STATUS?"))) {
+    SonoffScSend("AT+STATUS=4");
+  }
+}
+
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SCPLUS[] PROGMEM =
+  "{s}" D_LIGHT "{m}%d%%{e}{s}" D_NOISE "{m}%d%%{e}{s}" D_AIR_QUALITY "{m}%d%%{e}";
+#endif
+
+void SonoffScShow(bool json)
+{
+  if (sc_value[0] > 0) {
+    float t = ConvertTemp(sc_value[1]);
+    float h = ConvertHumidity(sc_value[0]);
+
+    char temperature[33];
+    dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SonoffSC\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_LIGHT "\":%d,\"" D_JSON_NOISE "\":%d,\"" D_JSON_AIRQUALITY "\":%d}"),
+        temperature, humidity, sc_value[2], sc_value[3], sc_value[4]);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+        DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]);
+        DomoticzSensor(DZ_COUNT, sc_value[3]);
+        DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20));
+      }
+#endif
+
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, t);
+        KnxSensor(KNX_HUMIDITY, h);
+      }
+#endif
+
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, "", humidity);
+      WSContentSend_PD(HTTP_SNS_SCPLUS, sc_value[2], sc_value[3], sc_value[4]);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns04(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_SC == my_module_type) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        SonoffScShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SonoffScShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        SonoffScInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_05_ds18x20.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_05_ds18x20.ino"
+#ifdef USE_DS18x20
+
+
+
+
+#define XSNS_05 5
+
+
+
+#define DS18S20_CHIPID 0x10
+#define DS1822_CHIPID 0x22
+#define DS18B20_CHIPID 0x28
+#define MAX31850_CHIPID 0x3B
+
+#define W1_SKIP_ROM 0xCC
+#define W1_CONVERT_TEMP 0x44
+#define W1_WRITE_EEPROM 0x48
+#define W1_WRITE_SCRATCHPAD 0x4E
+#define W1_READ_SCRATCHPAD 0xBE
+
+#define DS18X20_MAX_SENSORS 8
+
+const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
+
+uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
+
+struct DS18X20STRUCT {
+  uint8_t address[8];
+  uint8_t index;
+  uint8_t valid;
+  float temperature;
+} ds18x20_sensor[DS18X20_MAX_SENSORS];
+uint8_t ds18x20_sensors = 0;
+uint8_t ds18x20_pin = 0;
+uint8_t ds18x20_pin_out = 0;
+bool ds18x20_dual_mode = false;
+char ds18x20_types[12];
+#ifdef W1_PARASITE_POWER
+uint8_t ds18x20_sensor_curr = 0;
+unsigned long w1_power_until = 0;
+#endif
+
+
+
+
+
+#define W1_MATCH_ROM 0x55
+#define W1_SEARCH_ROM 0xF0
+
+uint8_t onewire_last_discrepancy = 0;
+uint8_t onewire_last_family_discrepancy = 0;
+bool onewire_last_device_flag = false;
+unsigned char onewire_rom_id[8] = { 0 };
+
+
+
+uint8_t OneWireReset(void)
+{
+  uint8_t retries = 125;
+
+  if (!ds18x20_dual_mode) {
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    pinMode(ds18x20_pin, OUTPUT);
+    digitalWrite(ds18x20_pin, LOW);
+    delayMicroseconds(480);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+  } else {
+    digitalWrite(ds18x20_pin_out, HIGH);
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(480);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
+  delayMicroseconds(70);
+  uint8_t r = !digitalRead(ds18x20_pin);
+  delayMicroseconds(410);
+  return r;
+}
+
+void OneWireWriteBit(uint8_t v)
+{
+  static const uint8_t delay_low[2] = { 65, 10 };
+  static const uint8_t delay_high[2] = { 5, 55 };
+
+  v &= 1;
+  if (!ds18x20_dual_mode) {
+    digitalWrite(ds18x20_pin, LOW);
+    pinMode(ds18x20_pin, OUTPUT);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin, HIGH);
+  } else {
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
+  delayMicroseconds(delay_high[v]);
+}
+
+uint8_t OneWireReadBit(void)
+{
+  if (!ds18x20_dual_mode) {
+    pinMode(ds18x20_pin, OUTPUT);
+    digitalWrite(ds18x20_pin, LOW);
+    delayMicroseconds(3);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+  } else {
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(3);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
+  delayMicroseconds(10);
+  uint8_t r = digitalRead(ds18x20_pin);
+  delayMicroseconds(53);
+  return r;
+}
+
+
+
+void OneWireWrite(uint8_t v)
+{
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    OneWireWriteBit((bit_mask & v) ? 1 : 0);
+  }
+}
+
+uint8_t OneWireRead(void)
+{
+  uint8_t r = 0;
+
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    if (OneWireReadBit()) {
+      r |= bit_mask;
+    }
+  }
+  return r;
+}
+
+void OneWireSelect(const uint8_t rom[8])
+{
+  OneWireWrite(W1_MATCH_ROM);
+  for (uint32_t i = 0; i < 8; i++) {
+    OneWireWrite(rom[i]);
+  }
+}
+
+void OneWireResetSearch(void)
+{
+  onewire_last_discrepancy = 0;
+  onewire_last_device_flag = false;
+  onewire_last_family_discrepancy = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    onewire_rom_id[i] = 0;
+  }
+}
+
+uint8_t OneWireSearch(uint8_t *newAddr)
+{
+  uint8_t id_bit_number = 1;
+  uint8_t last_zero = 0;
+  uint8_t rom_byte_number = 0;
+  uint8_t search_result = 0;
+  uint8_t id_bit;
+  uint8_t cmp_id_bit;
+  unsigned char rom_byte_mask = 1;
+  unsigned char search_direction;
+
+  if (!onewire_last_device_flag) {
+    if (!OneWireReset()) {
+      onewire_last_discrepancy = 0;
+      onewire_last_device_flag = false;
+      onewire_last_family_discrepancy = 0;
+      return false;
+    }
+    OneWireWrite(W1_SEARCH_ROM);
+    do {
+      id_bit = OneWireReadBit();
+      cmp_id_bit = OneWireReadBit();
+
+      if ((id_bit == 1) && (cmp_id_bit == 1)) {
+        break;
+      } else {
+        if (id_bit != cmp_id_bit) {
+          search_direction = id_bit;
+        } else {
+          if (id_bit_number < onewire_last_discrepancy) {
+            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
+          } else {
+            search_direction = (id_bit_number == onewire_last_discrepancy);
+          }
+          if (search_direction == 0) {
+            last_zero = id_bit_number;
+            if (last_zero < 9) {
+              onewire_last_family_discrepancy = last_zero;
+            }
+          }
+        }
+        if (search_direction == 1) {
+          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
+        } else {
+          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
+        }
+        OneWireWriteBit(search_direction);
+        id_bit_number++;
+        rom_byte_mask <<= 1;
+        if (rom_byte_mask == 0) {
+          rom_byte_number++;
+          rom_byte_mask = 1;
+        }
+      }
+    } while (rom_byte_number < 8);
+    if (!(id_bit_number < 65)) {
+      onewire_last_discrepancy = last_zero;
+      if (onewire_last_discrepancy == 0) {
+        onewire_last_device_flag = true;
+      }
+      search_result = true;
+    }
+  }
+  if (!search_result || !onewire_rom_id[0]) {
+    onewire_last_discrepancy = 0;
+    onewire_last_device_flag = false;
+    onewire_last_family_discrepancy = 0;
+    search_result = false;
+  }
+  for (uint32_t i = 0; i < 8; i++) {
+    newAddr[i] = onewire_rom_id[i];
+  }
+  return search_result;
+}
+
+bool OneWireCrc8(uint8_t *addr)
+{
+  uint8_t crc = 0;
+  uint8_t len = 8;
+
+  while (len--) {
+    uint8_t inbyte = *addr++;
+    for (uint32_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x01;
+      crc >>= 1;
+      if (mix) {
+        crc ^= 0x8C;
+      }
+      inbyte >>= 1;
+    }
+  }
+  return (crc == *addr);
+}
+
+
+
+void Ds18x20Init(void)
+{
+  uint64_t ids[DS18X20_MAX_SENSORS];
+
+  ds18x20_pin = pin[GPIO_DSB];
+  if (pin[GPIO_DSB_OUT] < 99) {
+    ds18x20_pin_out = pin[GPIO_DSB_OUT];
+    ds18x20_dual_mode = true;
+    pinMode(ds18x20_pin_out, OUTPUT);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+  }
+
+  OneWireResetSearch();
+
+  ds18x20_sensors = 0;
+  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
+    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
+      break;
+    }
+    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
+       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
+      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
+      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];
+      for (uint32_t j = 6; j > 0; j--) {
+        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
+      }
+      ds18x20_sensors++;
+    }
+  }
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
+      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {
+        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
+      }
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
+}
+
+void Ds18x20Convert(void)
+{
+  OneWireReset();
+#ifdef W1_PARASITE_POWER
+
+  if (++ds18x20_sensor_curr >= ds18x20_sensors)
+    ds18x20_sensor_curr = 0;
+  OneWireSelect(ds18x20_sensor[ds18x20_sensor_curr].address);
+#else
+  OneWireWrite(W1_SKIP_ROM);
+#endif
+  OneWireWrite(W1_CONVERT_TEMP);
+
+}
+
+bool Ds18x20Read(uint8_t sensor)
+{
+  uint8_t data[9];
+  int8_t sign = 1;
+
+  uint8_t index = ds18x20_sensor[sensor].index;
+  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
+  for (uint32_t retry = 0; retry < 3; retry++) {
+    OneWireReset();
+    OneWireSelect(ds18x20_sensor[index].address);
+    OneWireWrite(W1_READ_SCRATCHPAD);
+    for (uint32_t i = 0; i < 9; i++) {
+      data[i] = OneWireRead();
+    }
+    if (OneWireCrc8(data)) {
+      switch(ds18x20_sensor[index].address[0]) {
+        case DS18S20_CHIPID: {
+          if (data[1] > 0x80) {
+            data[0] = (~data[0]) +1;
+            sign = -1;
+          }
+          float temp9 = (float)(data[0] >> 1) * sign;
+          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case DS1822_CHIPID:
+        case DS18B20_CHIPID: {
+          if (data[4] != 0x7F) {
+            data[4] = 0x7F;
+            OneWireReset();
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_SCRATCHPAD);
+            OneWireWrite(data[2]);
+            OneWireWrite(data[3]);
+            OneWireWrite(data[4]);
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_EEPROM);
+#ifdef W1_PARASITE_POWER
+            w1_power_until = millis() + 10;
+#endif
+          }
+          uint16_t temp12 = (data[1] << 8) + data[0];
+          if (temp12 > 2047) {
+            temp12 = (~temp12) +1;
+            sign = -1;
+          }
+          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case MAX31850_CHIPID: {
+          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
+          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+      }
+    }
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
+  return false;
+}
+
+void Ds18x20Name(uint8_t sensor)
+{
+  uint8_t index = sizeof(ds18x20_chipids);
+  while (index) {
+    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
+      break;
+    }
+    index--;
+  }
+  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
+  if (ds18x20_sensors > 1) {
+    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
+  }
+}
+
+
+
+void Ds18x20EverySecond(void)
+{
+#ifdef W1_PARASITE_POWER
+
+  unsigned long now = millis();
+  if (now < w1_power_until)
+    return;
+#endif
+  if (uptime & 1
+#ifdef W1_PARASITE_POWER
+
+      || ds18x20_sensors >= 2
+#endif
+  ) {
+
+    Ds18x20Convert();
+  } else {
+    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+
+      if (!Ds18x20Read(i)) {
+        Ds18x20Name(i);
+        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
+#ifdef USE_DS18x20_RECONFIGURE
+        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
+          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
+          Ds18x20Init();
+        }
+#endif
+      }
+    }
+  }
+}
+
+void Ds18x20Show(bool json)
+{
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    uint8_t index = ds18x20_sensor[i].index;
+
+    if (ds18x20_sensor[index].valid) {
+      char temperature[33];
+      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
+
+      Ds18x20Name(i);
+
+      if (json) {
+        char address[17];
+        for (uint32_t j = 0; j < 6; j++) {
+          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);
+        }
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == i)) {
+          DomoticzSensor(DZ_TEMP, temperature);
+        }
+#endif
+#ifdef USE_KNX
+        if ((0 == tele_period) && (0 == i)) {
+          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
+        }
+#endif
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
+#endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool Xsns05(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_DSB] < 99) {
+    switch (function) {
+      case FUNC_INIT:
+        Ds18x20Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        Ds18x20EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Ds18x20Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ds18x20Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
+#ifdef USE_DHT_OLD
+# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint32_t dht_max_cycles;
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+void DhtReadPrep(void)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+  }
+}
+
+int32_t DhtExpectPulse(uint8_t sensor, bool level)
+{
+  int32_t count = 0;
+
+  while (digitalRead(Dht[sensor].pin) == level) {
+    if (count++ >= (int32_t)dht_max_cycles) {
+      return -1;
+    }
+  }
+  return count;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  int32_t cycles[80];
+  uint8_t error = 0;
+
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+
+
+
+  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+    Dht[sensor].lastresult = 0;
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+    delay(250);
+  }
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  if (GPIO_SI7021 == Dht[sensor].type) {
+    delayMicroseconds(500);
+  } else {
+    delay(20);
+  }
+
+  noInterrupts();
+  if (!dht_dual_mode) {
+    digitalWrite(Dht[sensor].pin, HIGH);
+    delayMicroseconds(40);
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+    delayMicroseconds(40);
+  }
+  delayMicroseconds(10);
+  if (-1 == DhtExpectPulse(sensor, LOW)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    error = 1;
+  }
+  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    error = 1;
+  }
+  else {
+    for (uint32_t i = 0; i < 80; i += 2) {
+      cycles[i] = DhtExpectPulse(sensor, LOW);
+      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
+    }
+  }
+  interrupts();
+
+  if (error) { return false; }
+
+  for (uint32_t i = 0; i < 40; ++i) {
+    int32_t lowCycles = cycles[2*i];
+    int32_t highCycles = cycles[2*i+1];
+    if ((-1 == lowCycles) || (-1 == highCycles)) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      return false;
+    }
+    dht_data[i/8] <<= 1;
+    if (highCycles > lowCycles) {
+      dht_data[i / 8] |= 1;
+    }
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    dht_max_cycles = microsecondsToClockCycles(1000);
+
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+#ifdef USE_DHT_V2
+# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint32_t dht_max_cycles;
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+void DhtReadPrep(void)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+  }
+}
+
+int32_t DhtExpectPulse(uint8_t sensor, bool level)
+{
+  int32_t count = 0;
+
+  while (digitalRead(Dht[sensor].pin) == level) {
+    if (count++ >= (int32_t)dht_max_cycles) {
+      return -1;
+    }
+  }
+  return count;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  int32_t cycles[80];
+  uint8_t error = 0;
+
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+    Dht[sensor].lastresult = 0;
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+    delay(250);
+  }
+
+
+  noInterrupts();
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_SI7021:
+# 114 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+      delayMicroseconds(500);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(40);
+      break;
+
+    case GPIO_DHT22:
+# 133 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+      delayMicroseconds(1100);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30);
+      break;
+
+    case GPIO_DHT11:
+# 151 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
+    default:
+
+      delay(20);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30);
+      break;
+  }
+
+
+  pinMode(Dht[sensor].pin, INPUT_PULLUP);
+
+  if (-1 == DhtExpectPulse(sensor, LOW)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    error = 1;
+  }
+  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    error = 1;
+  }
+  else {
+    for (uint32_t i = 0; i < 80; i += 2) {
+      cycles[i] = DhtExpectPulse(sensor, LOW);
+      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
+    }
+  }
+  interrupts();
+  if (error) { return false; }
+
+
+  for (uint32_t i = 0; i < 40; ++i) {
+    int32_t lowCycles = cycles[2*i];
+    int32_t highCycles = cycles[2*i+1];
+    if ((-1 == lowCycles) || (-1 == highCycles)) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      return false;
+    }
+    dht_data[i/8] <<= 1;
+    if (highCycles > lowCycles) {
+      dht_data[i / 8] |= 1;
+    }
+  }
+
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    dht_max_cycles = microsecondsToClockCycles(1000);
+
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v2) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
+#ifdef USE_DHT_V3
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint8_t sensor, int level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+int DhtReadDat(uint8_t sensor)
+{
+  uint8_t result = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    if (!DhtExpectPulse(sensor, HIGH)) { return -1; }
+
+    delayMicroseconds(35);
+    if (digitalRead(Dht[sensor].pin)) {
+      result |= (1 << (7 - i));
+    }
+
+    if (!DhtExpectPulse(sensor, LOW)) { return -1; }
+  }
+  return result;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+
+      delayMicroseconds(20);
+      break;
+  }
+
+  noInterrupts();
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, HIGH)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+
+  int data = 0;
+  for (uint32_t i = 0; i < 5; i++) {
+    data = DhtReadDat(sensor);
+    if (-1 == data) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      break;
+    }
+    dht_data[i] = data;
+  }
+  interrupts();
+  if (-1 == data) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v3) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
+#ifdef USE_DHT_V4
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(20);
+      break;
+  }
+
+  uint32_t level = 9;
+  noInterrupts();
+  for (uint32_t i = 0; i < 3; i++) {
+    level = i &1;
+    if (!DhtExpectPulse(sensor, level)) { break; }
+    level = 9;
+  }
+  if (9 == level) {
+    int data = 0;
+    for (uint32_t i = 0; i < 5; i++) {
+      data = 0;
+      for (uint32_t j = 0; j < 8; j++) {
+        level = 1;
+        if (!DhtExpectPulse(sensor, level)) { break; }
+
+        delayMicroseconds(35);
+        if (digitalRead(Dht[sensor].pin)) {
+          data |= (1 << (7 - j));
+        }
+
+        level = 0;
+        if (!DhtExpectPulse(sensor, level)) { break; }
+        level = 9;
+      }
+      if (level < 2) { break; }
+
+      dht_data[i] = data;
+    }
+  }
+  interrupts();
+  if (level < 2) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE), (0 == level) ? D_START_SIGNAL_LOW : D_START_SIGNAL_HIGH);
+    return false;
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint32_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    if (Dht[sensor].h > 100) { Dht[sensor].h = 100.0; }
+    if (Dht[sensor].h < 0) { Dht[sensor].h = 0.0; }
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v4) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
+#ifdef USE_DHT
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  uint8_t lastresult;
+  char stype[12];
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtWaitState(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (TimeReachedUsec(timeout)) {
+      PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE),
+        (level) ? D_START_SIGNAL_HIGH : D_START_SIGNAL_LOW);
+      return false;
+    }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(20);
+      break;
+  }
+
+  bool error = false;
+  noInterrupts();
+  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
+    for (uint32_t i = 0; i < 5; i++) {
+      int data = 0;
+      for (uint32_t j = 0; j < 8; j++) {
+        if (!DhtWaitState(sensor, 1)) {
+          error = true;
+          break;
+        }
+        delayMicroseconds(35);
+        if (digitalRead(Dht[sensor].pin)) {
+          data |= (1 << (7 - j));
+        }
+        if (!DhtWaitState(sensor, 0)) {
+          error = true;
+          break;
+        }
+      }
+      if (error) { break; }
+      dht_data[i] = data;
+    }
+  } else {
+    error = true;
+  }
+  interrupts();
+  if (error) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  float temperature = NAN;
+  float humidity = NAN;
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      humidity = dht_data[0];
+      temperature = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      humidity = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      temperature = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        temperature *= -1;
+      }
+      break;
+  }
+  if (isnan(temperature) || isnan(humidity)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
+    return false;
+  }
+
+  if (humidity > 100) { humidity = 100.0; }
+  if (humidity < 0) { humidity = 0.1; }
+  Dht[sensor].h = ConvertHumidity(humidity);
+  Dht[sensor].t = ConvertTemp(temperature);
+  Dht[sensor].lastresult = 0;
+
+  return true;
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastresult = DHT_MAX_RETRY;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v5) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+    for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
+
+      if (!DhtRead(sensor)) {
+        Dht[sensor].lastresult++;
+        if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+          Dht[sensor].t = NAN;
+          Dht[sensor].h = NAN;
+        }
+      }
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
+#ifdef USE_I2C
+#ifdef USE_SHT
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
+#define XSNS_07 7
+#define XI2C_08 8
+
+enum {
+  SHT1X_CMD_MEASURE_TEMP = B00000011,
+  SHT1X_CMD_MEASURE_RH = B00000101,
+  SHT1X_CMD_SOFT_RESET = B00011110
+};
+
+uint8_t sht_sda_pin;
+uint8_t sht_scl_pin;
+uint8_t sht_type = 0;
+char sht_types[] = "SHT1X";
+uint8_t sht_valid = 0;
+float sht_temperature = 0;
+float sht_humidity = 0;
+
+bool ShtReset(void)
+{
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+  pinMode(sht_scl_pin, OUTPUT);
+  delay(11);
+  for (uint32_t i = 0; i < 9; i++) {
+    digitalWrite(sht_scl_pin, HIGH);
+    digitalWrite(sht_scl_pin, LOW);
+  }
+  bool success = ShtSendCommand(SHT1X_CMD_SOFT_RESET);
+  delay(11);
+  return success;
+}
+
+bool ShtSendCommand(const uint8_t cmd)
+{
+  pinMode(sht_sda_pin, OUTPUT);
+
+  digitalWrite(sht_sda_pin, HIGH);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_sda_pin, LOW);
+  digitalWrite(sht_scl_pin, LOW);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_sda_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+
+  shiftOut(sht_sda_pin, sht_scl_pin, MSBFIRST, cmd);
+
+  bool ackerror = false;
+  digitalWrite(sht_scl_pin, HIGH);
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+  if (digitalRead(sht_sda_pin) != LOW) {
+    ackerror = true;
+  }
+  digitalWrite(sht_scl_pin, LOW);
+  delayMicroseconds(1);
+  if (digitalRead(sht_sda_pin) != HIGH) {
+    ackerror = true;
+  }
+  if (ackerror) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_DID_NOT_ACK_COMMAND));
+  }
+  return (!ackerror);
+}
+
+bool ShtAwaitResult(void)
+{
+
+  for (uint32_t i = 0; i < 16; i++) {
+    if (LOW == digitalRead(sht_sda_pin)) {
+      return true;
+    }
+    delay(20);
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_BUSY));
+
+  return false;
+}
+
+int ShtReadData(void)
+{
+  int val = 0;
+
+
+  val = shiftIn(sht_sda_pin, sht_scl_pin, 8);
+  val <<= 8;
+
+  pinMode(sht_sda_pin, OUTPUT);
+  digitalWrite(sht_sda_pin, LOW);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+
+  val |= shiftIn(sht_sda_pin, sht_scl_pin, 8);
+
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+  return val;
+}
+
+bool ShtRead(void)
+{
+  if (sht_valid) { sht_valid--; }
+  if (!ShtReset()) { return false; }
+  if (!ShtSendCommand(SHT1X_CMD_MEASURE_TEMP)) { return false; }
+  if (!ShtAwaitResult()) { return false; }
+  float tempRaw = ShtReadData();
+  if (!ShtSendCommand(SHT1X_CMD_MEASURE_RH)) { return false; }
+  if (!ShtAwaitResult()) { return false; }
+  float humRaw = ShtReadData();
+
+
+  const float d1 = -39.7;
+  const float d2 = 0.01;
+  sht_temperature = d1 + (tempRaw * d2);
+  const float c1 = -2.0468;
+  const float c2 = 0.0367;
+  const float c3 = -1.5955E-6;
+  const float t1 = 0.01;
+  const float t2 = 0.00008;
+  float rhLinear = c1 + c2 * humRaw + c3 * humRaw * humRaw;
+  sht_humidity = (sht_temperature - 25) * (t1 + t2 * humRaw) + rhLinear;
+  sht_temperature = ConvertTemp(sht_temperature);
+  ConvertHumidity(sht_humidity);
+
+  sht_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void ShtDetect(void)
+{
+  sht_sda_pin = pin[GPIO_I2C_SDA];
+  sht_scl_pin = pin[GPIO_I2C_SCL];
+  if (ShtRead()) {
+    sht_type = 1;
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C D_SHT1X_FOUND));
+  } else {
+    Wire.begin(sht_sda_pin, sht_scl_pin);
+    sht_type = 0;
+  }
+}
+
+void ShtEverySecond(void)
+{
+  if (!(uptime %4)) {
+
+    if (!ShtRead()) {
+      AddLogMissed(sht_types, sht_valid);
+    }
+  }
+}
+
+void ShtShow(bool json)
+{
+  if (sht_valid) {
+    char temperature[33];
+    dtostrfd(sht_temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(sht_humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, sht_types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, sht_temperature);
+        KnxSensor(KNX_HUMIDITY, sht_humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, sht_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, sht_types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_08)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    ShtDetect();
+  }
+  else if (sht_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        ShtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        ShtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        ShtShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
+#ifdef USE_I2C
+#ifdef USE_HTU
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
+#define XSNS_08 8
+#define XI2C_09 9
+
+#define HTU21_ADDR 0x40
+
+#define SI7013_CHIPID 0x0D
+#define SI7020_CHIPID 0x14
+#define SI7021_CHIPID 0x15
+#define HTU21_CHIPID 0x32
+
+#define HTU21_READTEMP 0xE3
+#define HTU21_READHUM 0xE5
+#define HTU21_WRITEREG 0xE6
+#define HTU21_READREG 0xE7
+#define HTU21_RESET 0xFE
+#define HTU21_HEATER_WRITE 0x51
+#define HTU21_HEATER_READ 0x11
+#define HTU21_SERIAL2_READ1 0xFC
+#define HTU21_SERIAL2_READ2 0xC9
+
+#define HTU21_HEATER_ON 0x04
+#define HTU21_HEATER_OFF 0xFB
+
+#define HTU21_RES_RH12_T14 0x00
+#define HTU21_RES_RH8_T12 0x01
+#define HTU21_RES_RH10_T13 0x80
+#define HTU21_RES_RH11_T11 0x81
+
+#define HTU21_CRC8_POLYNOM 0x13100
+
+const char kHtuTypes[] PROGMEM = "HTU21|SI7013|SI7020|SI7021|T/RH?";
+
+uint8_t htu_address;
+uint8_t htu_type = 0;
+uint8_t htu_delay_temp;
+uint8_t htu_delay_humidity = 50;
+uint8_t htu_valid = 0;
+float htu_temperature = 0;
+float htu_humidity = 0;
+char htu_types[7];
+
+uint8_t HtuCheckCrc8(uint16_t data)
+{
+  for (uint32_t bit = 0; bit < 16; bit++) {
+    if (data & 0x8000) {
+      data = (data << 1) ^ HTU21_CRC8_POLYNOM;
+    } else {
+      data <<= 1;
+    }
+  }
+  return data >>= 8;
+}
+
+uint8_t HtuReadDeviceId(void)
+{
+  uint16_t deviceID = 0;
+  uint8_t checksum = 0;
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_SERIAL2_READ1);
+  Wire.write(HTU21_SERIAL2_READ2);
+  Wire.endTransmission();
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  deviceID = Wire.read() << 8;
+  deviceID |= Wire.read();
+  checksum = Wire.read();
+  if (HtuCheckCrc8(deviceID) == checksum) {
+    deviceID = deviceID >> 8;
+  } else {
+    deviceID = 0;
+  }
+  return (uint8_t)deviceID;
+}
+
+void HtuSetResolution(uint8_t resolution)
+{
+  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
+  current &= 0x7E;
+  current |= resolution;
+  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
+}
+
+void HtuReset(void)
+{
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_RESET);
+  Wire.endTransmission();
+  delay(15);
+}
+
+void HtuHeater(uint8_t heater)
+{
+  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
+
+  switch(heater)
+  {
+    case HTU21_HEATER_ON : current |= heater;
+                            break;
+    case HTU21_HEATER_OFF : current &= heater;
+                            break;
+    default : current &= heater;
+                            break;
+  }
+  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
+}
+
+void HtuInit(void)
+{
+  HtuReset();
+  HtuHeater(HTU21_HEATER_OFF);
+  HtuSetResolution(HTU21_RES_RH12_T14);
+}
+
+bool HtuRead(void)
+{
+  uint8_t checksum = 0;
+  uint16_t sensorval = 0;
+
+  if (htu_valid) { htu_valid--; }
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_READTEMP);
+  if (Wire.endTransmission() != 0) { return false; }
+  delay(htu_delay_temp);
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  if (3 == Wire.available()) {
+    sensorval = Wire.read() << 8;
+    sensorval |= Wire.read();
+    checksum = Wire.read();
+  }
+  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
+
+  htu_temperature = ConvertTemp(0.002681 * (float)sensorval - 46.85);
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_READHUM);
+  if (Wire.endTransmission() != 0) { return false; }
+  delay(htu_delay_humidity);
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  if (3 <= Wire.available()) {
+    sensorval = Wire.read() << 8;
+    sensorval |= Wire.read();
+    checksum = Wire.read();
+  }
+  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
+
+  sensorval ^= 0x02;
+  htu_humidity = 0.001907 * (float)sensorval - 6;
+  if (htu_humidity > 100) { htu_humidity = 100.0; }
+  if (htu_humidity < 0) { htu_humidity = 0.01; }
+
+  if ((0.00 == htu_humidity) && (0.00 == htu_temperature)) {
+    htu_humidity = 0.0;
+  }
+  if ((htu_temperature > 0.00) && (htu_temperature < 80.00)) {
+    htu_humidity = (-0.15) * (25 - htu_temperature) + htu_humidity;
+  }
+  ConvertHumidity(htu_humidity);
+
+  htu_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void HtuDetect(void)
+{
+  htu_address = HTU21_ADDR;
+  if (I2cActive(htu_address)) { return; }
+
+  htu_type = HtuReadDeviceId();
+  if (htu_type) {
+    uint8_t index = 0;
+    HtuInit();
+    switch (htu_type) {
+      case HTU21_CHIPID:
+        htu_delay_temp = 50;
+        htu_delay_humidity = 16;
+        break;
+      case SI7021_CHIPID:
+        index++;
+      case SI7020_CHIPID:
+        index++;
+      case SI7013_CHIPID:
+        index++;
+        htu_delay_temp = 12;
+        htu_delay_humidity = 23;
+        break;
+      default:
+        index = 4;
+        htu_delay_temp = 50;
+        htu_delay_humidity = 23;
+    }
+    GetTextIndexed(htu_types, sizeof(htu_types), index, kHtuTypes);
+    I2cSetActiveFound(htu_address, htu_types);
+  }
+}
+
+void HtuEverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!HtuRead()) {
+      AddLogMissed(htu_types, htu_valid);
+    }
+  }
+}
+
+void HtuShow(bool json)
+{
+  if (htu_valid) {
+    char temperature[33];
+    dtostrfd(htu_temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(htu_humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, htu_types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, htu_temperature);
+        KnxSensor(KNX_HUMIDITY, htu_humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, htu_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, htu_types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns08(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_09)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    HtuDetect();
+  }
+  else if (htu_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        HtuEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        HtuShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HtuShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
+#ifdef USE_I2C
+#ifdef USE_BMP
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
+#define XSNS_09 9
+#define XI2C_10 10
+
+#define BMP_ADDR1 0x76
+#define BMP_ADDR2 0x77
+
+#define BMP180_CHIPID 0x55
+#define BMP280_CHIPID 0x58
+#define BME280_CHIPID 0x60
+#define BME680_CHIPID 0x61
+
+#define BMP_REGISTER_CHIPID 0xD0
+
+#define BMP_REGISTER_RESET 0xE0
+
+#define BMP_CMND_RESET 0xB6
+
+#define BMP_MAX_SENSORS 2
+
+const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
+
+typedef struct {
+  uint8_t bmp_address;
+  char bmp_name[7];
+  uint8_t bmp_type;
+  uint8_t bmp_model;
+#ifdef USE_BME680
+  uint8_t bme680_state;
+  float bmp_gas_resistance;
+#endif
+  float bmp_temperature;
+  float bmp_pressure;
+  float bmp_humidity;
+} bmp_sensors_t;
+
+uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 };
+uint8_t bmp_count = 0;
+uint8_t bmp_once = 1;
+
+bmp_sensors_t *bmp_sensors = nullptr;
+
+
+
+
+
+#define BMP180_REG_CONTROL 0xF4
+#define BMP180_REG_RESULT 0xF6
+#define BMP180_TEMPERATURE 0x2E
+#define BMP180_PRESSURE3 0xF4
+
+#define BMP180_AC1 0xAA
+#define BMP180_AC2 0xAC
+#define BMP180_AC3 0xAE
+#define BMP180_AC4 0xB0
+#define BMP180_AC5 0xB2
+#define BMP180_AC6 0xB4
+#define BMP180_VB1 0xB6
+#define BMP180_VB2 0xB8
+#define BMP180_MB 0xBA
+#define BMP180_MC 0xBC
+#define BMP180_MD 0xBE
+
+#define BMP180_OSS 3
+
+typedef struct {
+  int16_t cal_ac1;
+  int16_t cal_ac2;
+  int16_t cal_ac3;
+  int16_t cal_b1;
+  int16_t cal_b2;
+  int16_t cal_mc;
+  int16_t cal_md;
+  uint16_t cal_ac4;
+  uint16_t cal_ac5;
+  uint16_t cal_ac6;
+} bmp180_cal_data_t;
+
+bmp180_cal_data_t *bmp180_cal_data = nullptr;
+
+bool Bmp180Calibration(uint8_t bmp_idx)
+{
+  if (!bmp180_cal_data) {
+    bmp180_cal_data = (bmp180_cal_data_t*)malloc(BMP_MAX_SENSORS * sizeof(bmp180_cal_data_t));
+  }
+  if (!bmp180_cal_data) { return false; }
+
+  bmp180_cal_data[bmp_idx].cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
+  bmp180_cal_data[bmp_idx].cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
+  bmp180_cal_data[bmp_idx].cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
+  bmp180_cal_data[bmp_idx].cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
+  bmp180_cal_data[bmp_idx].cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
+  bmp180_cal_data[bmp_idx].cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
+  bmp180_cal_data[bmp_idx].cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
+  bmp180_cal_data[bmp_idx].cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
+  bmp180_cal_data[bmp_idx].cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
+  bmp180_cal_data[bmp_idx].cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
+
+
+  if (!bmp180_cal_data[bmp_idx].cal_ac1 |
+      !bmp180_cal_data[bmp_idx].cal_ac2 |
+      !bmp180_cal_data[bmp_idx].cal_ac3 |
+      !bmp180_cal_data[bmp_idx].cal_ac4 |
+      !bmp180_cal_data[bmp_idx].cal_ac5 |
+      !bmp180_cal_data[bmp_idx].cal_ac6 |
+      !bmp180_cal_data[bmp_idx].cal_b1 |
+      !bmp180_cal_data[bmp_idx].cal_b2 |
+      !bmp180_cal_data[bmp_idx].cal_mc |
+      !bmp180_cal_data[bmp_idx].cal_md) {
+    return false;
+  }
+
+  if ((bmp180_cal_data[bmp_idx].cal_ac1 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac2 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac3 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac4 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac5 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac6 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_b1 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_b2 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_mc == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_md == (int16_t)0xFFFF)) {
+    return false;
+  }
+  return true;
+}
+
+void Bmp180Read(uint8_t bmp_idx)
+{
+  if (!bmp180_cal_data) { return; }
+
+  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_TEMPERATURE);
+  delay(5);
+  int ut = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
+  int32_t xt1 = (ut - (int32_t)bmp180_cal_data[bmp_idx].cal_ac6) * ((int32_t)bmp180_cal_data[bmp_idx].cal_ac5) >> 15;
+  int32_t xt2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_mc << 11) / (xt1 + (int32_t)bmp180_cal_data[bmp_idx].cal_md);
+  int32_t bmp180_b5 = xt1 + xt2;
+  bmp_sensors[bmp_idx].bmp_temperature = ((bmp180_b5 + 8) >> 4) / 10.0;
+
+  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_PRESSURE3);
+  delay(2 + (4 << BMP180_OSS));
+  uint32_t up = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
+  up >>= (8 - BMP180_OSS);
+
+  int32_t b6 = bmp180_b5 - 4000;
+  int32_t x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b2 * ((b6 * b6) >> 12)) >> 11;
+  int32_t x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac2 * b6) >> 11;
+  int32_t x3 = x1 + x2;
+  int32_t b3 = ((((int32_t)bmp180_cal_data[bmp_idx].cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
+
+  x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac3 * b6) >> 13;
+  x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b1 * ((b6 * b6) >> 12)) >> 16;
+  x3 = ((x1 + x2) + 2) >> 2;
+  uint32_t b4 = ((uint32_t)bmp180_cal_data[bmp_idx].cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
+  uint32_t b7 = ((uint32_t)up - b3) * (uint32_t)(50000UL >> BMP180_OSS);
+
+  int32_t p;
+  if (b7 < 0x80000000) {
+    p = (b7 * 2) / b4;
+  }
+  else {
+    p = (b7 / b4) * 2;
+  }
+  x1 = (p >> 8) * (p >> 8);
+  x1 = (x1 * 3038) >> 16;
+  x2 = (-7357 * p) >> 16;
+  p += ((x1 + x2 + (int32_t)3791) >> 4);
+  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 100.0;
+}
+
+
+
+
+
+
+
+#define BME280_REGISTER_CONTROLHUMID 0xF2
+#define BME280_REGISTER_CONTROL 0xF4
+#define BME280_REGISTER_CONFIG 0xF5
+#define BME280_REGISTER_PRESSUREDATA 0xF7
+#define BME280_REGISTER_TEMPDATA 0xFA
+#define BME280_REGISTER_HUMIDDATA 0xFD
+
+#define BME280_REGISTER_DIG_T1 0x88
+#define BME280_REGISTER_DIG_T2 0x8A
+#define BME280_REGISTER_DIG_T3 0x8C
+#define BME280_REGISTER_DIG_P1 0x8E
+#define BME280_REGISTER_DIG_P2 0x90
+#define BME280_REGISTER_DIG_P3 0x92
+#define BME280_REGISTER_DIG_P4 0x94
+#define BME280_REGISTER_DIG_P5 0x96
+#define BME280_REGISTER_DIG_P6 0x98
+#define BME280_REGISTER_DIG_P7 0x9A
+#define BME280_REGISTER_DIG_P8 0x9C
+#define BME280_REGISTER_DIG_P9 0x9E
+#define BME280_REGISTER_DIG_H1 0xA1
+#define BME280_REGISTER_DIG_H2 0xE1
+#define BME280_REGISTER_DIG_H3 0xE3
+#define BME280_REGISTER_DIG_H4 0xE4
+#define BME280_REGISTER_DIG_H5 0xE5
+#define BME280_REGISTER_DIG_H6 0xE7
+
+typedef struct {
+  uint16_t dig_T1;
+  int16_t dig_T2;
+  int16_t dig_T3;
+  uint16_t dig_P1;
+  int16_t dig_P2;
+  int16_t dig_P3;
+  int16_t dig_P4;
+  int16_t dig_P5;
+  int16_t dig_P6;
+  int16_t dig_P7;
+  int16_t dig_P8;
+  int16_t dig_P9;
+  int16_t dig_H2;
+  int16_t dig_H4;
+  int16_t dig_H5;
+  uint8_t dig_H1;
+  uint8_t dig_H3;
+  int8_t dig_H6;
+} Bme280CalibrationData_t;
+
+Bme280CalibrationData_t *Bme280CalibrationData = nullptr;
+
+bool Bmx280Calibrate(uint8_t bmp_idx)
+{
+
+
+  if (!Bme280CalibrationData) {
+    Bme280CalibrationData = (Bme280CalibrationData_t*)malloc(BMP_MAX_SENSORS * sizeof(Bme280CalibrationData_t));
+  }
+  if (!Bme280CalibrationData) { return false; }
+
+  Bme280CalibrationData[bmp_idx].dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
+  Bme280CalibrationData[bmp_idx].dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
+  Bme280CalibrationData[bmp_idx].dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
+  Bme280CalibrationData[bmp_idx].dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
+  Bme280CalibrationData[bmp_idx].dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
+  Bme280CalibrationData[bmp_idx].dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
+  Bme280CalibrationData[bmp_idx].dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
+  Bme280CalibrationData[bmp_idx].dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
+  Bme280CalibrationData[bmp_idx].dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
+  Bme280CalibrationData[bmp_idx].dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
+  Bme280CalibrationData[bmp_idx].dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
+  Bme280CalibrationData[bmp_idx].dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
+  if (BME280_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
+    Bme280CalibrationData[bmp_idx].dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
+    Bme280CalibrationData[bmp_idx].dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
+    Bme280CalibrationData[bmp_idx].dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
+    Bme280CalibrationData[bmp_idx].dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
+    Bme280CalibrationData[bmp_idx].dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
+    Bme280CalibrationData[bmp_idx].dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x00);
+
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROLHUMID, 0x01);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONFIG, 0xA0);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x27);
+  } else {
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0xB7);
+  }
+
+  return true;
+}
+
+void Bme280Read(uint8_t bmp_idx)
+{
+  if (!Bme280CalibrationData) { return; }
+
+  int32_t adc_T = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_TEMPDATA);
+  adc_T >>= 4;
+
+  int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1 << 1))) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_T2)) >> 11;
+  int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1))) >> 12) *
+    ((int32_t)Bme280CalibrationData[bmp_idx].dig_T3)) >> 14;
+  int32_t t_fine = vart1 + vart2;
+  float T = (t_fine * 5 + 128) >> 8;
+  bmp_sensors[bmp_idx].bmp_temperature = T / 100.0;
+
+  int32_t adc_P = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_PRESSUREDATA);
+  adc_P >>= 4;
+
+  int64_t var1 = ((int64_t)t_fine) - 128000;
+  int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P6;
+  var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P5) << 17);
+  var2 = var2 + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P4) << 35);
+  var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P2) << 12);
+  var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData[bmp_idx].dig_P1) >> 33;
+  if (0 == var1) {
+    return;
+  }
+  int64_t p = 1048576 - adc_P;
+  p = (((p << 31) - var2) * 3125) / var1;
+  var1 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P9) * (p >> 13) * (p >> 13)) >> 25;
+  var2 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P8) * p) >> 19;
+  p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P7) << 4);
+  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 25600.0;
+
+  if (BMP280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { return; }
+
+  int32_t adc_H = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_HUMIDDATA);
+
+  int32_t v_x1_u32r = (t_fine - ((int32_t)76800));
+  v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData[bmp_idx].dig_H4) << 20) -
+    (((int32_t)Bme280CalibrationData[bmp_idx].dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
+    (((((((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H6)) >> 10) *
+    (((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
+    ((int32_t)2097152)) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H2) + 8192) >> 14));
+  v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) *
+    ((int32_t)Bme280CalibrationData[bmp_idx].dig_H1)) >> 4));
+  v_x1_u32r = (v_x1_u32r < 0) ? 0 : v_x1_u32r;
+  v_x1_u32r = (v_x1_u32r > 419430400) ? 419430400 : v_x1_u32r;
+  float h = (v_x1_u32r >> 12);
+  bmp_sensors[bmp_idx].bmp_humidity = h / 1024.0;
+}
+
+#ifdef USE_BME680
+
+
+
+
+#include <bme680.h>
+
+struct bme680_dev *gas_sensor = nullptr;
+
+static void BmeDelayMs(uint32_t ms)
+{
+  delay(ms);
+}
+
+bool Bme680Init(uint8_t bmp_idx)
+{
+  if (!gas_sensor) {
+    gas_sensor = (bme680_dev*)malloc(BMP_MAX_SENSORS * sizeof(bme680_dev));
+  }
+  if (!gas_sensor) { return false; }
+
+  gas_sensor[bmp_idx].dev_id = bmp_sensors[bmp_idx].bmp_address;
+  gas_sensor[bmp_idx].intf = BME680_I2C_INTF;
+  gas_sensor[bmp_idx].read = &I2cReadBuffer;
+  gas_sensor[bmp_idx].write = &I2cWriteBuffer;
+  gas_sensor[bmp_idx].delay_ms = BmeDelayMs;
+
+
+
+  gas_sensor[bmp_idx].amb_temp = 25;
+
+  int8_t rslt = BME680_OK;
+  rslt = bme680_init(&gas_sensor[bmp_idx]);
+  if (rslt != BME680_OK) { return false; }
+
+
+  gas_sensor[bmp_idx].tph_sett.os_hum = BME680_OS_2X;
+  gas_sensor[bmp_idx].tph_sett.os_pres = BME680_OS_4X;
+  gas_sensor[bmp_idx].tph_sett.os_temp = BME680_OS_8X;
+  gas_sensor[bmp_idx].tph_sett.filter = BME680_FILTER_SIZE_3;
+
+
+  gas_sensor[bmp_idx].gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
+
+  gas_sensor[bmp_idx].gas_sett.heatr_temp = 320;
+  gas_sensor[bmp_idx].gas_sett.heatr_dur = 150;
+
+
+
+  gas_sensor[bmp_idx].power_mode = BME680_FORCED_MODE;
+
+
+  uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
+
+
+  rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor[bmp_idx]);
+  if (rslt != BME680_OK) { return false; }
+
+  bmp_sensors[bmp_idx].bme680_state = 0;
+
+  return true;
+}
+
+void Bme680Read(uint8_t bmp_idx)
+{
+  if (!gas_sensor) { return; }
+
+  int8_t rslt = BME680_OK;
+
+  if (BME680_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
+    if (0 == bmp_sensors[bmp_idx].bme680_state) {
+
+      rslt = bme680_set_sensor_mode(&gas_sensor[bmp_idx]);
+      if (rslt != BME680_OK) { return; }
+
+
+
+
+
+
+
+      bmp_sensors[bmp_idx].bme680_state = 1;
+    } else {
+      bmp_sensors[bmp_idx].bme680_state = 0;
+
+      struct bme680_field_data data;
+      rslt = bme680_get_sensor_data(&data, &gas_sensor[bmp_idx]);
+      if (rslt != BME680_OK) { return; }
+
+      bmp_sensors[bmp_idx].bmp_temperature = data.temperature / 100.0;
+      bmp_sensors[bmp_idx].bmp_humidity = data.humidity / 1000.0;
+      bmp_sensors[bmp_idx].bmp_pressure = data.pressure / 100.0;
+
+      if (data.status & BME680_GASM_VALID_MSK) {
+        bmp_sensors[bmp_idx].bmp_gas_resistance = data.gas_resistance / 1000.0;
+      } else {
+        bmp_sensors[bmp_idx].bmp_gas_resistance = 0;
+      }
+    }
+  }
+  return;
+}
+
+#endif
+
+
+
+void BmpDetect(void)
+{
+  int bmp_sensor_size = BMP_MAX_SENSORS * sizeof(bmp_sensors_t);
+  if (!bmp_sensors) {
+    bmp_sensors = (bmp_sensors_t*)malloc(bmp_sensor_size);
+  }
+  if (!bmp_sensors) { return; }
+  memset(bmp_sensors, 0, bmp_sensor_size);
+
+  for (uint32_t i = 0; i < BMP_MAX_SENSORS; i++) {
+    if (I2cActive(bmp_addresses[i])) { continue; }
+    uint8_t bmp_type = I2cRead8(bmp_addresses[i], BMP_REGISTER_CHIPID);
+    if (bmp_type) {
+      bmp_sensors[bmp_count].bmp_address = bmp_addresses[i];
+      bmp_sensors[bmp_count].bmp_type = bmp_type;
+      bmp_sensors[bmp_count].bmp_model = 0;
+
+      bool success = false;
+      switch (bmp_type) {
+        case BMP180_CHIPID:
+          success = Bmp180Calibration(bmp_count);
+          break;
+        case BME280_CHIPID:
+          bmp_sensors[bmp_count].bmp_model++;
+        case BMP280_CHIPID:
+          bmp_sensors[bmp_count].bmp_model++;
+          success = Bmx280Calibrate(bmp_count);
+          break;
+#ifdef USE_BME680
+        case BME680_CHIPID:
+          bmp_sensors[bmp_count].bmp_model = 3;
+          success = Bme680Init(bmp_count);
+          break;
+#endif
+      }
+      if (success) {
+        GetTextIndexed(bmp_sensors[bmp_count].bmp_name, sizeof(bmp_sensors[bmp_count].bmp_name), bmp_sensors[bmp_count].bmp_model, kBmpTypes);
+        I2cSetActiveFound(bmp_sensors[bmp_count].bmp_address, bmp_sensors[bmp_count].bmp_name);
+        bmp_count++;
+      }
+    }
+  }
+}
+
+void BmpRead(void)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    switch (bmp_sensors[bmp_idx].bmp_type) {
+      case BMP180_CHIPID:
+        Bmp180Read(bmp_idx);
+        break;
+      case BMP280_CHIPID:
+      case BME280_CHIPID:
+        Bme280Read(bmp_idx);
+        break;
+#ifdef USE_BME680
+      case BME680_CHIPID:
+        Bme680Read(bmp_idx);
+        break;
+#endif
+    }
+  }
+  ConvertTemp(bmp_sensors[0].bmp_temperature);
+  ConvertHumidity(bmp_sensors[0].bmp_humidity);
+}
+
+void BmpShow(bool json)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    if (bmp_sensors[bmp_idx].bmp_type) {
+      float bmp_sealevel = 0.0;
+      if (bmp_sensors[bmp_idx].bmp_pressure != 0.0) {
+        bmp_sealevel = (bmp_sensors[bmp_idx].bmp_pressure / FastPrecisePow(1.0 - ((float)Settings.altitude / 44330.0), 5.255)) - 21.6;
+        bmp_sealevel = ConvertPressure(bmp_sealevel);
+      }
+      float bmp_temperature = ConvertTemp(bmp_sensors[bmp_idx].bmp_temperature);
+      float bmp_pressure = ConvertPressure(bmp_sensors[bmp_idx].bmp_pressure);
+
+      char name[10];
+      strlcpy(name, bmp_sensors[bmp_idx].bmp_name, sizeof(name));
+      if (bmp_count > 1) {
+        snprintf_P(name, sizeof(name), PSTR("%s%c%02X"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_address);
+      }
+
+      char temperature[33];
+      dtostrfd(bmp_temperature, Settings.flag2.temperature_resolution, temperature);
+      char pressure[33];
+      dtostrfd(bmp_pressure, Settings.flag2.pressure_resolution, pressure);
+      char sea_pressure[33];
+      dtostrfd(bmp_sealevel, Settings.flag2.pressure_resolution, sea_pressure);
+      char humidity[33];
+      dtostrfd(bmp_sensors[bmp_idx].bmp_humidity, Settings.flag2.humidity_resolution, humidity);
+#ifdef USE_BME680
+      char gas_resistance[33];
+      dtostrfd(bmp_sensors[bmp_idx].bmp_gas_resistance, 2, gas_resistance);
+#endif
+
+      if (json) {
+        char json_humidity[40];
+        snprintf_P(json_humidity, sizeof(json_humidity), PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+        char json_sealevel[40];
+        snprintf_P(json_sealevel, sizeof(json_sealevel), PSTR(",\"" D_JSON_PRESSUREATSEALEVEL "\":%s"), sea_pressure);
+#ifdef USE_BME680
+        char json_gas[40];
+        snprintf_P(json_gas, sizeof(json_gas), PSTR(",\"" D_JSON_GAS "\":%s"), gas_resistance);
+
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s%s}"),
+          name,
+          temperature,
+          (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "",
+          pressure,
+          (Settings.altitude != 0) ? json_sealevel : "",
+          (bmp_sensors[bmp_idx].bmp_model >= 3) ? json_gas : "");
+#else
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s}"),
+          name, temperature, (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : "");
+#endif
+
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == bmp_idx)) {
+          DomoticzTempHumPressureSensor(temperature, humidity, pressure);
+#ifdef USE_BME680
+          if (bmp_sensors[bmp_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp_sensors[bmp_idx].bmp_gas_resistance); }
+#endif
+        }
+#endif
+
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, bmp_temperature);
+          KnxSensor(KNX_HUMIDITY, bmp_sensors[bmp_idx].bmp_humidity);
+        }
+#endif
+
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, name, temperature, TempUnit());
+        if (bmp_sensors[bmp_idx].bmp_model >= 2) {
+          WSContentSend_PD(HTTP_SNS_HUM, name, humidity);
+        }
+        WSContentSend_PD(HTTP_SNS_PRESSURE, name, pressure, PressureUnit().c_str());
+        if (Settings.altitude != 0) {
+          WSContentSend_PD(HTTP_SNS_SEAPRESSURE, name, sea_pressure, PressureUnit().c_str());
+        }
+#ifdef USE_BME680
+        if (bmp_sensors[bmp_idx].bmp_model >= 3) {
+          WSContentSend_PD(PSTR("{s}%s " D_GAS "{m}%s " D_UNIT_KILOOHM "{e}"), name, gas_resistance);
+        }
+#endif
+
+#endif
+      }
+    }
+  }
+}
+
+#ifdef USE_DEEPSLEEP
+
+void BMP_EnterSleep(void)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    switch (bmp_sensors[bmp_idx].bmp_type) {
+      case BMP180_CHIPID:
+      case BMP280_CHIPID:
+      case BME280_CHIPID:
+        I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP_REGISTER_RESET, BMP_CMND_RESET);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xsns09(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_10)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    BmpDetect();
+  }
+  else if (bmp_count) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        BmpRead();
+        break;
+      case FUNC_JSON_APPEND:
+        BmpShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        BmpShow(0);
+        break;
+#endif
+#ifdef USE_DEEPSLEEP
+      case FUNC_SAVE_BEFORE_RESTART:
+        BMP_EnterSleep();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_10_bh1750.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_10_bh1750.ino"
+#ifdef USE_I2C
+#ifdef USE_BH1750
+
+
+
+
+
+
+#define XSNS_10 10
+#define XI2C_11 11
+
+#define BH1750_ADDR1 0x23
+#define BH1750_ADDR2 0x5C
+
+#define BH1750_CONTINUOUS_HIGH_RES_MODE 0x10
+
+uint8_t bh1750_address;
+uint8_t bh1750_addresses[] = { BH1750_ADDR1, BH1750_ADDR2 };
+uint8_t bh1750_type = 0;
+uint8_t bh1750_valid = 0;
+uint16_t bh1750_illuminance = 0;
+char bh1750_types[] = "BH1750";
+
+bool Bh1750Read(void)
+{
+  if (bh1750_valid) { bh1750_valid--; }
+
+  if (2 != Wire.requestFrom(bh1750_address, (uint8_t)2)) { return false; }
+  uint8_t msb = Wire.read();
+  uint8_t lsb = Wire.read();
+  bh1750_illuminance = ((msb << 8) | lsb) / 1.2;
+  bh1750_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Bh1750Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(bh1750_addresses); i++) {
+    bh1750_address = bh1750_addresses[i];
+    if (I2cActive(bh1750_address)) { continue; }
+    Wire.beginTransmission(bh1750_address);
+    Wire.write(BH1750_CONTINUOUS_HIGH_RES_MODE);
+    if (!Wire.endTransmission()) {
+      I2cSetActiveFound(bh1750_address, bh1750_types);
+      bh1750_type = 1;
+      break;
+    }
+  }
+}
+
+void Bh1750EverySecond(void)
+{
+
+  if (!Bh1750Read()) {
+    AddLogMissed(bh1750_types, bh1750_valid);
+  }
+}
+
+void Bh1750Show(bool json)
+{
+  if (bh1750_valid) {
+    if (json) {
+      ResponseAppend_P(JSON_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, bh1750_illuminance);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns10(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_11)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Bh1750Detect();
+  }
+  else if (bh1750_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Bh1750EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Bh1750Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Bh1750Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_11_veml6070.ino"
+# 89 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_11_veml6070.ino"
+#ifdef USE_I2C
+#ifdef USE_VEML6070
+
+
+
+
+
+
+#define XSNS_11 11
+#define XI2C_12 12
+
+#define VEML6070_ADDR_H 0x39
+#define VEML6070_ADDR_L 0x38
+#define VEML6070_INTEGRATION_TIME 3
+#define VEML6070_ENABLE 1
+#define VEML6070_DISABLE 0
+#define VEML6070_RSET_DEFAULT 270000
+#define VEML6070_UV_MAX_INDEX 15
+#define VEML6070_UV_MAX_DEFAULT 11
+#define VEML6070_POWER_COEFFCIENT 0.025
+#define VEML6070_TABLE_COEFFCIENT 32.86270591
+
+
+
+
+
+const char kVemlTypes[] PROGMEM = "VEML6070";
+double uv_risk_map[VEML6070_UV_MAX_INDEX] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+double uvrisk = 0;
+double uvpower = 0;
+uint16_t uvlevel = 0;
+uint8_t veml6070_addr_low = VEML6070_ADDR_L;
+uint8_t veml6070_addr_high = VEML6070_ADDR_H;
+uint8_t itime = VEML6070_INTEGRATION_TIME;
+uint8_t veml6070_type = 0;
+char veml6070_name[9];
+char str_uvrisk_text[10];
+
+
+
+void Veml6070Detect(void)
+{
+  if (I2cActive(VEML6070_ADDR_L)) { return; }
+
+
+  Wire.beginTransmission(VEML6070_ADDR_L);
+  Wire.write((itime << 2) | 0x02);
+  uint8_t status = Wire.endTransmission();
+
+  if (!status) {
+    veml6070_type = 1;
+    Veml6070UvTableInit();
+    uint8_t veml_model = 0;
+    GetTextIndexed(veml6070_name, sizeof(veml6070_name), veml_model, kVemlTypes);
+    I2cSetActiveFound(VEML6070_ADDR_L, veml6070_name);
+  }
+}
+
+
+
+void Veml6070UvTableInit(void)
+{
+
+  for (uint32_t i = 0; i < VEML6070_UV_MAX_INDEX; i++) {
+#ifdef USE_VEML6070_RSET
+    if ( (USE_VEML6070_RSET >= 220000) && (USE_VEML6070_RSET <= 1000000) ) {
+      uv_risk_map[i] = ( (USE_VEML6070_RSET / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+    } else {
+      uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor error %d"), USE_VEML6070_RSET);
+    }
+#else
+    uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor default used %d"), VEML6070_RSET_DEFAULT);
+#endif
+  }
+}
+
+
+
+void Veml6070EverySecond(void)
+{
+
+  Veml6070ModeCmd(1);
+  uvlevel = Veml6070ReadUv();
+  uvrisk = Veml6070UvRiskLevel(uvlevel);
+  uvpower = Veml6070UvPower(uvrisk);
+  Veml6070ModeCmd(0);
+}
+
+
+
+void Veml6070ModeCmd(bool mode_cmd)
+{
+
+
+  Wire.beginTransmission(VEML6070_ADDR_L);
+  Wire.write((mode_cmd << 0) | 0x02 | (itime << 2));
+  uint8_t status = Wire.endTransmission();
+
+  if (!status) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 mode_cmd"));
+  }
+}
+
+
+
+uint16_t Veml6070ReadUv(void)
+{
+  uint16_t uv_raw = 0;
+
+  if (Wire.requestFrom(VEML6070_ADDR_H, 1) != 1) {
+    return -1;
+  }
+  uv_raw = Wire.read();
+  uv_raw <<= 8;
+
+  if (Wire.requestFrom(VEML6070_ADDR_L, 1) != 1) {
+    return -1;
+  }
+  uv_raw |= Wire.read();
+
+  return uv_raw;
+}
+
+
+
+double Veml6070UvRiskLevel(uint16_t uv_level)
+{
+  double risk = 0;
+  if (uv_level < uv_risk_map[VEML6070_UV_MAX_INDEX-1]) {
+    risk = (double)uv_level / uv_risk_map[0];
+
+    if ( (risk >= 0) && (risk <= 2.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_1); }
+    else if ( (risk >= 3.0) && (risk <= 5.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_2); }
+    else if ( (risk >= 6.0) && (risk <= 7.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_3); }
+    else if ( (risk >= 8.0) && (risk <= 10.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_4); }
+    else if ( (risk >= 11.0) && (risk <= 12.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_5); }
+    else if ( (risk >= 13.0) && (risk <= 25.0) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_6); }
+    else { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7); }
+    return risk;
+  } else {
+
+    snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7);
+    return ( risk = 99 );
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 out of range %d"), risk);
+  }
+}
+
+
+
+double Veml6070UvPower(double uvrisk)
+{
+
+  double power = 0;
+  return ( power = VEML6070_POWER_COEFFCIENT * uvrisk );
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#ifdef USE_VEML6070_SHOW_RAW
+  const char HTTP_SNS_UV_LEVEL[] PROGMEM = "{s}VEML6070 " D_UV_LEVEL "{m}%s " D_UNIT_INCREMENTS "{e}";
+#endif
+
+  const char HTTP_SNS_UV_INDEX[] PROGMEM = "{s}VEML6070 " D_UV_INDEX "{m}%s %s{e}";
+  const char HTTP_SNS_UV_POWER[] PROGMEM = "{s}VEML6070 " D_UV_POWER "{m}%s " D_UNIT_WATT_METER_QUADRAT "{e}";
+#endif
+
+
+
+void Veml6070Show(bool json)
+{
+
+  char str_uvlevel[33];
+  dtostrfd((double)uvlevel, 0, str_uvlevel);
+  char str_uvrisk[33];
+  dtostrfd(uvrisk, 2, str_uvrisk);
+  char str_uvpower[33];
+  dtostrfd(uvpower, 3, str_uvpower);
+  if (json) {
+#ifdef USE_VEML6070_SHOW_RAW
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_LEVEL "\":%s,\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
+      veml6070_name, str_uvlevel, str_uvrisk, str_uvrisk_text, str_uvpower);
+#else
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
+      veml6070_name, str_uvrisk, str_uvrisk_text, str_uvpower);
+#endif
+#ifdef USE_DOMOTICZ
+  if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, uvlevel); }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+#ifdef USE_VEML6070_SHOW_RAW
+    WSContentSend_PD(HTTP_SNS_UV_LEVEL, str_uvlevel);
+#endif
+    WSContentSend_PD(HTTP_SNS_UV_INDEX, str_uvrisk, str_uvrisk_text);
+    WSContentSend_PD(HTTP_SNS_UV_POWER, str_uvpower);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns11(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_12)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Veml6070Detect();
+  }
+  else if (veml6070_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Veml6070EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Veml6070Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Veml6070Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
+#ifdef USE_I2C
+#ifdef USE_ADS1115
+# 43 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
+#define XSNS_12 12
+#define XI2C_13 13
+
+#define ADS1115_ADDRESS_ADDR_GND 0x48
+#define ADS1115_ADDRESS_ADDR_VDD 0x49
+#define ADS1115_ADDRESS_ADDR_SDA 0x4A
+#define ADS1115_ADDRESS_ADDR_SCL 0x4B
+
+#define ADS1115_CONVERSIONDELAY (8)
+
+
+
+
+#define ADS1115_REG_POINTER_MASK (0x03)
+#define ADS1115_REG_POINTER_CONVERT (0x00)
+#define ADS1115_REG_POINTER_CONFIG (0x01)
+#define ADS1115_REG_POINTER_LOWTHRESH (0x02)
+#define ADS1115_REG_POINTER_HITHRESH (0x03)
+
+
+
+
+#define ADS1115_REG_CONFIG_OS_MASK (0x8000)
+#define ADS1115_REG_CONFIG_OS_SINGLE (0x8000)
+#define ADS1115_REG_CONFIG_OS_BUSY (0x0000)
+#define ADS1115_REG_CONFIG_OS_NOTBUSY (0x8000)
+
+#define ADS1115_REG_CONFIG_MUX_MASK (0x7000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_0_1 (0x0000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_0_3 (0x1000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_1_3 (0x2000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_2_3 (0x3000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_0 (0x4000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_1 (0x5000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_2 (0x6000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_3 (0x7000)
+
+#define ADS1115_REG_CONFIG_PGA_MASK (0x0E00)
+#define ADS1115_REG_CONFIG_PGA_6_144V (0x0000)
+#define ADS1115_REG_CONFIG_PGA_4_096V (0x0200)
+#define ADS1115_REG_CONFIG_PGA_2_048V (0x0400)
+#define ADS1115_REG_CONFIG_PGA_1_024V (0x0600)
+#define ADS1115_REG_CONFIG_PGA_0_512V (0x0800)
+#define ADS1115_REG_CONFIG_PGA_0_256V (0x0A00)
+
+#define ADS1115_REG_CONFIG_MODE_MASK (0x0100)
+#define ADS1115_REG_CONFIG_MODE_CONTIN (0x0000)
+#define ADS1115_REG_CONFIG_MODE_SINGLE (0x0100)
+
+#define ADS1115_REG_CONFIG_DR_MASK (0x00E0)
+#define ADS1115_REG_CONFIG_DR_128SPS (0x0000)
+#define ADS1115_REG_CONFIG_DR_250SPS (0x0020)
+#define ADS1115_REG_CONFIG_DR_490SPS (0x0040)
+#define ADS1115_REG_CONFIG_DR_920SPS (0x0060)
+#define ADS1115_REG_CONFIG_DR_1600SPS (0x0080)
+#define ADS1115_REG_CONFIG_DR_2400SPS (0x00A0)
+#define ADS1115_REG_CONFIG_DR_3300SPS (0x00C0)
+#define ADS1115_REG_CONFIG_DR_6000SPS (0x00E0)
+
+#define ADS1115_REG_CONFIG_CMODE_MASK (0x0010)
+#define ADS1115_REG_CONFIG_CMODE_TRAD (0x0000)
+#define ADS1115_REG_CONFIG_CMODE_WINDOW (0x0010)
+
+#define ADS1115_REG_CONFIG_CPOL_MASK (0x0008)
+#define ADS1115_REG_CONFIG_CPOL_ACTVLOW (0x0000)
+#define ADS1115_REG_CONFIG_CPOL_ACTVHI (0x0008)
+
+#define ADS1115_REG_CONFIG_CLAT_MASK (0x0004)
+#define ADS1115_REG_CONFIG_CLAT_NONLAT (0x0000)
+#define ADS1115_REG_CONFIG_CLAT_LATCH (0x0004)
+
+#define ADS1115_REG_CONFIG_CQUE_MASK (0x0003)
+#define ADS1115_REG_CONFIG_CQUE_1CONV (0x0000)
+#define ADS1115_REG_CONFIG_CQUE_2CONV (0x0001)
+#define ADS1115_REG_CONFIG_CQUE_4CONV (0x0002)
+#define ADS1115_REG_CONFIG_CQUE_NONE (0x0003)
+
+struct ADS1115 {
+  uint8_t count = 0;
+  uint8_t address;
+  uint8_t addresses[4] = { ADS1115_ADDRESS_ADDR_GND, ADS1115_ADDRESS_ADDR_VDD, ADS1115_ADDRESS_ADDR_SDA, ADS1115_ADDRESS_ADDR_SCL };
+  uint8_t found[4] = {false,false,false,false};
+} Ads1115;
+
+
+
+void Ads1115StartComparator(uint8_t channel, uint16_t mode)
+{
+
+  uint16_t config = mode |
+                    ADS1115_REG_CONFIG_CQUE_NONE |
+                    ADS1115_REG_CONFIG_CLAT_NONLAT |
+                    ADS1115_REG_CONFIG_PGA_6_144V |
+                    ADS1115_REG_CONFIG_CPOL_ACTVLOW |
+                    ADS1115_REG_CONFIG_CMODE_TRAD |
+                    ADS1115_REG_CONFIG_DR_6000SPS;
+
+
+  config |= (ADS1115_REG_CONFIG_MUX_SINGLE_0 + (0x1000 * channel));
+
+
+  I2cWrite16(Ads1115.address, ADS1115_REG_POINTER_CONFIG, config);
+}
+
+int16_t Ads1115GetConversion(uint8_t channel)
+{
+  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_SINGLE);
+
+  delay(ADS1115_CONVERSIONDELAY);
+
+  I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
+
+  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_CONTIN);
+  delay(ADS1115_CONVERSIONDELAY);
+
+  uint16_t res = I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
+  return (int16_t)res;
+}
+
+
+
+void Ads1115Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(Ads1115.addresses); i++) {
+    if (!Ads1115.found[i]) {
+      Ads1115.address = Ads1115.addresses[i];
+      if (I2cActive(Ads1115.address)) { continue; }
+      uint16_t buffer;
+      if (I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONVERT) &&
+          I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONFIG)) {
+        Ads1115StartComparator(i, ADS1115_REG_CONFIG_MODE_CONTIN);
+        I2cSetActiveFound(Ads1115.address, "ADS1115");
+        Ads1115.found[i] = 1;
+        Ads1115.count++;
+      }
+    }
+  }
+}
+
+void Ads1115Show(bool json)
+{
+  int16_t values[4];
+
+  for (uint32_t t = 0; t < sizeof(Ads1115.addresses); t++) {
+
+    if (Ads1115.found[t]) {
+
+      uint8_t old_address = Ads1115.address;
+      Ads1115.address = Ads1115.addresses[t];
+      for (uint32_t i = 0; i < 4; i++) {
+        values[i] = Ads1115GetConversion(i);
+
+      }
+      Ads1115.address = old_address;
+
+      char label[15];
+      if (1 == Ads1115.count) {
+
+        snprintf_P(label, sizeof(label), PSTR("ADS1115"));
+      } else {
+
+        snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
+      }
+
+      if (json) {
+        ResponseAppend_P(PSTR(",\"%s\":{"), label);
+        for (uint32_t i = 0; i < 4; i++) {
+          ResponseAppend_P(PSTR("%s\"A%d\":%d"), (0 == i) ? "" : ",", i, values[i]);
+        }
+        ResponseJsonEnd();
+      }
+#ifdef USE_WEBSERVER
+      else {
+        for (uint32_t i = 0; i < 4; i++) {
+          WSContentSend_PD(HTTP_SNS_ANALOG, label, i, values[i]);
+        }
+      }
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns12(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_13)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Ads1115Detect();
+  }
+  else if (Ads1115.count) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        Ads1115Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ads1115Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
+#ifdef USE_I2C
+#ifdef USE_INA219
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
+#define XSNS_13 13
+#define XI2C_14 14
+
+#define INA219_ADDRESS1 (0x40)
+#define INA219_ADDRESS2 (0x41)
+#define INA219_ADDRESS3 (0x44)
+#define INA219_ADDRESS4 (0x45)
+
+#define INA219_READ (0x01)
+#define INA219_REG_CONFIG (0x00)
+
+#define INA219_CONFIG_RESET (0x8000)
+
+#define INA219_CONFIG_BVOLTAGERANGE_MASK (0x2000)
+#define INA219_CONFIG_BVOLTAGERANGE_16V (0x0000)
+#define INA219_CONFIG_BVOLTAGERANGE_32V (0x2000)
+
+#define INA219_CONFIG_GAIN_MASK (0x1800)
+#define INA219_CONFIG_GAIN_1_40MV (0x0000)
+#define INA219_CONFIG_GAIN_2_80MV (0x0800)
+#define INA219_CONFIG_GAIN_4_160MV (0x1000)
+#define INA219_CONFIG_GAIN_8_320MV (0x1800)
+
+#define INA219_CONFIG_BADCRES_MASK (0x0780)
+#define INA219_CONFIG_BADCRES_9BIT (0x0080)
+#define INA219_CONFIG_BADCRES_10BIT (0x0100)
+#define INA219_CONFIG_BADCRES_11BIT (0x0200)
+#define INA219_CONFIG_BADCRES_12BIT (0x0400)
+
+#define INA219_CONFIG_SADCRES_MASK (0x0078)
+#define INA219_CONFIG_SADCRES_9BIT_1S_84US (0x0000)
+#define INA219_CONFIG_SADCRES_10BIT_1S_148US (0x0008)
+#define INA219_CONFIG_SADCRES_11BIT_1S_276US (0x0010)
+#define INA219_CONFIG_SADCRES_12BIT_1S_532US (0x0018)
+#define INA219_CONFIG_SADCRES_12BIT_2S_1060US (0x0048)
+#define INA219_CONFIG_SADCRES_12BIT_4S_2130US (0x0050)
+#define INA219_CONFIG_SADCRES_12BIT_8S_4260US (0x0058)
+#define INA219_CONFIG_SADCRES_12BIT_16S_8510US (0x0060)
+#define INA219_CONFIG_SADCRES_12BIT_32S_17MS (0x0068)
+#define INA219_CONFIG_SADCRES_12BIT_64S_34MS (0x0070)
+#define INA219_CONFIG_SADCRES_12BIT_128S_69MS (0x0078)
+
+#define INA219_CONFIG_MODE_MASK (0x0007)
+#define INA219_CONFIG_MODE_POWERDOWN (0x0000)
+#define INA219_CONFIG_MODE_SVOLT_TRIGGERED (0x0001)
+#define INA219_CONFIG_MODE_BVOLT_TRIGGERED (0x0002)
+#define INA219_CONFIG_MODE_SANDBVOLT_TRIGGERED (0x0003)
+#define INA219_CONFIG_MODE_ADCOFF (0x0004)
+#define INA219_CONFIG_MODE_SVOLT_CONTINUOUS (0x0005)
+#define INA219_CONFIG_MODE_BVOLT_CONTINUOUS (0x0006)
+#define INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS (0x0007)
+
+#define INA219_REG_SHUNTVOLTAGE (0x01)
+#define INA219_REG_BUSVOLTAGE (0x02)
+#define INA219_REG_POWER (0x03)
+#define INA219_REG_CURRENT (0x04)
+#define INA219_REG_CALIBRATION (0x05)
+
+uint8_t ina219_type[4] = {0,0,0,0};
+uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
+
+uint32_t ina219_cal_value = 0;
+
+uint32_t ina219_current_divider_ma = 0;
+
+uint8_t ina219_valid[4] = {0,0,0,0};
+float ina219_voltage[4] = {0,0,0,0};
+float ina219_current[4] = {0,0,0,0};
+char ina219_types[] = "INA219";
+uint8_t ina219_count = 0;
+
+bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
+{
+  uint16_t config = 0;
+
+  switch (mode &3) {
+    case 0:
+    case 3:
+      ina219_cal_value = 4096;
+      ina219_current_divider_ma = 10;
+      config = INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+    case 1:
+      ina219_cal_value = 10240;
+      ina219_current_divider_ma = 25;
+      config |= INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+    case 2:
+      ina219_cal_value = 8192;
+      ina219_current_divider_ma = 20;
+      config |= INA219_CONFIG_BVOLTAGERANGE_16V | INA219_CONFIG_GAIN_1_40MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+  }
+
+  bool success = I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
+  if (success) {
+
+    I2cWrite16(addr, INA219_REG_CONFIG, config);
+  }
+  return success;
+}
+
+float Ina219GetShuntVoltage_mV(uint16_t addr)
+{
+
+  int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
+
+  return value * 0.01;
+}
+
+float Ina219GetBusVoltage_V(uint16_t addr)
+{
+
+
+  int16_t value = (int16_t)(((uint16_t)I2cReadS16(addr, INA219_REG_BUSVOLTAGE) >> 3) * 4);
+
+  return value * 0.001;
+}
+
+float Ina219GetCurrent_mA(uint16_t addr)
+{
+
+
+
+  I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
+
+
+  float value = I2cReadS16(addr, INA219_REG_CURRENT);
+  value /= ina219_current_divider_ma;
+
+  return value;
+}
+
+bool Ina219Read(void)
+{
+  for (int i=0; i<sizeof(ina219_type); i++) {
+    if (!ina219_type[i]) { continue; }
+    uint16_t addr = ina219_addresses[i];
+    ina219_voltage[i] = Ina219GetBusVoltage_V(addr) + (Ina219GetShuntVoltage_mV(addr) / 1000);
+    ina219_current[i] = Ina219GetCurrent_mA(addr) / 1000;
+    ina219_valid[i] = SENSOR_MAX_MISS;
+
+  }
+  return true;
+}
+# 184 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
+bool Ina219CommandSensor(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    Settings.ina219_mode = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_13, Settings.ina219_mode);
+
+  return true;
+}
+
+
+
+void Ina219Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(ina219_type); i++) {
+    uint16_t addr = ina219_addresses[i];
+    if (I2cActive(addr)) { continue; }
+    if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
+      I2cSetActiveFound(addr, ina219_types);
+      ina219_type[i] = 1;
+      ina219_count++;
+    }
+  }
+}
+
+void Ina219EverySecond(void)
+{
+
+  Ina219Read();
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_INA219_DATA[] PROGMEM =
+  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
+#endif
+
+void Ina219Show(bool json)
+{
+  int num_found=0;
+  for (int i=0; i<sizeof(ina219_type); i++)
+    if (ina219_type[i] && ina219_valid[i])
+      num_found++;
+
+  int sensor_num = 0;
+  for (int i=0; i<sizeof(ina219_type); i++) {
+    if (!ina219_type[i] || !ina219_valid[i])
+      continue;
+    sensor_num++;
+
+    char voltage[16];
+    dtostrfd(ina219_voltage[i], Settings.flag2.voltage_resolution, voltage);
+    char current[16];
+    dtostrfd(ina219_current[i], Settings.flag2.current_resolution, current);
+    char power[16];
+    dtostrfd(ina219_voltage[i] * ina219_current[i], Settings.flag2.wattage_resolution, power);
+    char name[16];
+    if (num_found>1)
+      snprintf_P(name, sizeof(name), PSTR("%s%c%d"), ina219_types, IndexSeparator(), sensor_num);
+    else
+      snprintf_P(name, sizeof(name), PSTR("%s"), ina219_types);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%02x,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
+                       name, ina219_addresses[i], voltage, current, power);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, voltage);
+        DomoticzSensor(DZ_CURRENT, current);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_INA219_DATA, name, voltage, name, current, name, power);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns13(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_14)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Ina219Detect();
+  }
+  else if (ina219_count) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_13 == XdrvMailbox.index) {
+          result = Ina219CommandSensor();
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        Ina219EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Ina219Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ina219Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_14_sht3x.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_14_sht3x.ino"
+#ifdef USE_I2C
+#ifdef USE_SHT3X
+
+
+
+
+
+
+#define XSNS_14 14
+#define XI2C_15 15
+
+#define SHT3X_ADDR_GND 0x44
+#define SHT3X_ADDR_VDD 0x45
+#define SHTC3_ADDR 0x70
+
+#define SHT3X_MAX_SENSORS 3
+
+const char kShtTypes[] PROGMEM = "SHT3X|SHT3X|SHTC3";
+uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD, SHTC3_ADDR };
+
+uint8_t sht3x_count = 0;
+struct SHT3XSTRUCT {
+  uint8_t address;
+  char types[6];
+} sht3x_sensors[SHT3X_MAX_SENSORS];
+
+bool Sht3xRead(float &t, float &h, uint8_t sht3x_address)
+{
+  unsigned int data[6];
+
+  t = NAN;
+  h = NAN;
+
+  Wire.beginTransmission(sht3x_address);
+  if (SHTC3_ADDR == sht3x_address) {
+    Wire.write(0x35);
+    Wire.write(0x17);
+    Wire.endTransmission();
+    Wire.beginTransmission(sht3x_address);
+    Wire.write(0x78);
+    Wire.write(0x66);
+  } else {
+    Wire.write(0x2C);
+    Wire.write(0x06);
+  }
+  if (Wire.endTransmission() != 0) {
+    return false;
+  }
+  delay(30);
+  Wire.requestFrom(sht3x_address, (uint8_t)6);
+  for (uint32_t i = 0; i < 6; i++) {
+    data[i] = Wire.read();
+  };
+  t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45);
+  h = ConvertHumidity((float)((((data[3] << 8) | data[4]) * 100) / 65535.0));
+  return (!isnan(t) && !isnan(h) && (h != 0));
+}
+
+
+
+void Sht3xDetect(void)
+{
+  for (uint32_t i = 0; i < SHT3X_MAX_SENSORS; i++) {
+    if (I2cActive(sht3x_addresses[i])) { continue; }
+    float t;
+    float h;
+    if (Sht3xRead(t, h, sht3x_addresses[i])) {
+      sht3x_sensors[sht3x_count].address = sht3x_addresses[i];
+      GetTextIndexed(sht3x_sensors[sht3x_count].types, sizeof(sht3x_sensors[sht3x_count].types), i, kShtTypes);
+      I2cSetActiveFound(sht3x_sensors[sht3x_count].address, sht3x_sensors[sht3x_count].types);
+      sht3x_count++;
+    }
+  }
+}
+
+void Sht3xShow(bool json)
+{
+  for (uint32_t i = 0; i < sht3x_count; i++) {
+    float t;
+    float h;
+    if (Sht3xRead(t, h, sht3x_sensors[i].address)) {
+      char temperature[33];
+      dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+      char humidity[33];
+      dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
+      char types[11];
+      snprintf_P(types, sizeof(types), PSTR("%s%c0x%02X"), sht3x_sensors[i].types, IndexSeparator(), sht3x_sensors[i].address);
+
+      if (json) {
+        ResponseAppend_P(JSON_SNS_TEMPHUM, types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == i)) {
+          DomoticzTempHumSensor(temperature, humidity);
+        }
+#endif
+
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, t);
+        KnxSensor(KNX_HUMIDITY, h);
+      }
+#endif
+
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
+        WSContentSend_PD(HTTP_SNS_HUM, types, humidity);
+#endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool Xsns14(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_15)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Sht3xDetect();
+  }
+  else if (sht3x_count) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        Sht3xShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sht3xShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+#ifdef USE_MHZ19
+# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+#define XSNS_15 15
+
+enum MhzFilterOptions {MHZ19_FILTER_OFF, MHZ19_FILTER_OFF_ALLSAMPLES, MHZ19_FILTER_FAST, MHZ19_FILTER_MEDIUM, MHZ19_FILTER_SLOW};
+
+#define MHZ19_FILTER_OPTION MHZ19_FILTER_FAST
+# 58 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+#include <TasmotaSerial.h>
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#define MHZ19_READ_TIMEOUT 400
+#define MHZ19_RETRY_COUNT 8
+
+TasmotaSerial *MhzSerial;
+
+const char kMhzModels[] PROGMEM = "|B";
+
+const char ABC_ENABLED[] = "ABC is Enabled";
+const char ABC_DISABLED[] = "ABC is Disabled";
+
+enum MhzCommands { MHZ_CMND_READPPM, MHZ_CMND_ABCENABLE, MHZ_CMND_ABCDISABLE, MHZ_CMND_ZEROPOINT, MHZ_CMND_RESET, MHZ_CMND_RANGE_1000, MHZ_CMND_RANGE_2000, MHZ_CMND_RANGE_3000, MHZ_CMND_RANGE_5000 };
+const uint8_t kMhzCommands[][4] PROGMEM = {
+
+  {0x86,0x00,0x00,0x00},
+  {0x79,0xA0,0x00,0x00},
+  {0x79,0x00,0x00,0x00},
+  {0x87,0x00,0x00,0x00},
+  {0x8D,0x00,0x00,0x00},
+  {0x99,0x00,0x03,0xE8},
+  {0x99,0x00,0x07,0xD0},
+  {0x99,0x00,0x0B,0xB8},
+  {0x99,0x00,0x13,0x88}};
+
+uint8_t mhz_type = 1;
+uint16_t mhz_last_ppm = 0;
+uint8_t mhz_filter = MHZ19_FILTER_OPTION;
+bool mhz_abc_must_apply = false;
+
+float mhz_temperature = 0;
+uint8_t mhz_retry = MHZ19_RETRY_COUNT;
+uint8_t mhz_received = 0;
+uint8_t mhz_state = 0;
+
+
+
+uint8_t MhzCalculateChecksum(uint8_t *array)
+{
+  uint8_t checksum = 0;
+  for (uint32_t i = 1; i < 8; i++) {
+    checksum += array[i];
+  }
+  checksum = 255 - checksum;
+  return (checksum +1);
+}
+
+size_t MhzSendCmd(uint8_t command_id)
+{
+  uint8_t mhz_send[9] = { 0 };
+
+  mhz_send[0] = 0xFF;
+  mhz_send[1] = 0x01;
+  memcpy_P(&mhz_send[2], kMhzCommands[command_id], sizeof(uint16_t));
+
+
+
+
+  memcpy_P(&mhz_send[6], kMhzCommands[command_id] + sizeof(uint16_t), sizeof(uint16_t));
+  mhz_send[8] = MhzCalculateChecksum(mhz_send);
+
+
+
+  return MhzSerial->write(mhz_send, sizeof(mhz_send));
+}
+
+
+
+bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s)
+{
+  if (1 == s) {
+    return false;
+  }
+  if (mhz_last_ppm < 400 || mhz_last_ppm > 5000) {
+
+
+    mhz_last_ppm = ppm;
+    return true;
+  }
+  int32_t difference = ppm - mhz_last_ppm;
+  if (s > 0 && s < 64 && mhz_filter != MHZ19_FILTER_OFF) {
+# 154 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+    difference *= s;
+    difference /= 64;
+  }
+  if (MHZ19_FILTER_OFF == mhz_filter) {
+    if (s != 0 && s != 64) {
+      return false;
+    }
+  } else {
+    difference >>= (mhz_filter -1);
+  }
+  mhz_last_ppm = static_cast<uint16_t>(mhz_last_ppm + difference);
+  return true;
+}
+
+void MhzEverySecond(void)
+{
+  mhz_state++;
+  if (8 == mhz_state) {
+    mhz_state = 0;
+
+    if (mhz_retry) {
+      mhz_retry--;
+      if (!mhz_retry) {
+        mhz_last_ppm = 0;
+        mhz_temperature = 0;
+      }
+    }
+
+    MhzSerial->flush();
+    MhzSendCmd(MHZ_CMND_READPPM);
+    mhz_received = 0;
+  }
+
+  if ((mhz_state > 2) && !mhz_received) {
+    uint8_t mhz_response[9];
+
+    unsigned long start = millis();
+    uint8_t counter = 0;
+    while (((millis() - start) < MHZ19_READ_TIMEOUT) && (counter < 9)) {
+      if (MhzSerial->available() > 0) {
+        mhz_response[counter++] = MhzSerial->read();
+      } else {
+        delay(5);
+      }
+    }
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, mhz_response, counter);
+
+    if (counter < 9) {
+
+      return;
+    }
+
+    uint8_t crc = MhzCalculateChecksum(mhz_response);
+    if (mhz_response[8] != crc) {
+
+      return;
+    }
+    if (0xFF != mhz_response[0] || 0x86 != mhz_response[1]) {
+
+      return;
+    }
+
+    mhz_received = 1;
+
+    uint16_t u = (mhz_response[6] << 8) | mhz_response[7];
+    if (15000 == u) {
+      if (Settings.SensorBits1.mhz19b_abc_disable) {
+
+
+        mhz_abc_must_apply = true;
+      }
+    } else {
+      uint16_t ppm = (mhz_response[2] << 8) | mhz_response[3];
+      mhz_temperature = ConvertTemp((float)mhz_response[4] - 40);
+      uint8_t s = mhz_response[5];
+      mhz_type = (s) ? 1 : 2;
+      if (MhzCheckAndApplyFilter(ppm, s)) {
+        mhz_retry = MHZ19_RETRY_COUNT;
+        LightSetSignal(CO2_LOW, CO2_HIGH, mhz_last_ppm);
+
+        if (0 == s || 64 == s) {
+          if (mhz_abc_must_apply) {
+            mhz_abc_must_apply = false;
+            if (!Settings.SensorBits1.mhz19b_abc_disable) {
+              MhzSendCmd(MHZ_CMND_ABCENABLE);
+            } else {
+              MhzSendCmd(MHZ_CMND_ABCDISABLE);
+            }
+          }
+        }
+
+      }
+    }
+
+  }
+}
+# 266 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
+#define D_JSON_RANGE_1000 "1000 ppm range"
+#define D_JSON_RANGE_2000 "2000 ppm range"
+#define D_JSON_RANGE_3000 "3000 ppm range"
+#define D_JSON_RANGE_5000 "5000 ppm range"
+
+bool MhzCommandSensor(void)
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      Settings.SensorBits1.mhz19b_abc_disable = true;
+      MhzSendCmd(MHZ_CMND_ABCDISABLE);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
+      break;
+    case 1:
+      Settings.SensorBits1.mhz19b_abc_disable = false;
+      MhzSendCmd(MHZ_CMND_ABCENABLE);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
+      break;
+    case 2:
+      MhzSendCmd(MHZ_CMND_ZEROPOINT);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_ZERO_POINT_CALIBRATION);
+      break;
+    case 9:
+      MhzSendCmd(MHZ_CMND_RESET);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RESET);
+      break;
+    case 1000:
+      MhzSendCmd(MHZ_CMND_RANGE_1000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_1000);
+      break;
+    case 2000:
+      MhzSendCmd(MHZ_CMND_RANGE_2000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_2000);
+      break;
+    case 3000:
+      MhzSendCmd(MHZ_CMND_RANGE_3000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_3000);
+      break;
+    case 5000:
+      MhzSendCmd(MHZ_CMND_RANGE_5000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_5000);
+      break;
+    default:
+      if (!Settings.SensorBits1.mhz19b_abc_disable) {
+        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
+      } else {
+        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
+      }
+  }
+
+  return serviced;
+}
+
+
+
+void MhzInit(void)
+{
+  mhz_type = 0;
+  if ((pin[GPIO_MHZ_RXD] < 99) && (pin[GPIO_MHZ_TXD] < 99)) {
+    MhzSerial = new TasmotaSerial(pin[GPIO_MHZ_RXD], pin[GPIO_MHZ_TXD], 1);
+    if (MhzSerial->begin(9600)) {
+      if (MhzSerial->hardwareSerial()) { ClaimSerial(); }
+      mhz_type = 1;
+    }
+
+  }
+}
+
+void MhzShow(bool json)
+{
+  char types[7] = "MHZ19B";
+  char temperature[33];
+  dtostrfd(mhz_temperature, Settings.flag2.temperature_resolution, temperature);
+  char model[3];
+  GetTextIndexed(model, sizeof(model), mhz_type -1, kMhzModels);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_MODEL "\":\"%s\",\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s}"), types, model, mhz_last_ppm, temperature);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) {
+      DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm);
+      DomoticzSensor(DZ_TEMP, temperature);
+    }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, types, mhz_last_ppm);
+    WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns15(uint8_t function)
+{
+  bool result = false;
+
+  if (mhz_type) {
+    switch (function) {
+      case FUNC_INIT:
+        MhzInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        MhzEverySecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_15 == XdrvMailbox.index) {
+          result = MhzCommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MhzShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MhzShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
+#ifdef USE_I2C
+#ifdef USE_TSL2561
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
+#define XSNS_16 16
+#define XI2C_16 16
+
+#include <Tsl2561Util.h>
+
+Tsl2561 Tsl(Wire);
+
+uint8_t tsl2561_type = 0;
+uint8_t tsl2561_valid = 0;
+uint32_t tsl2561_milliLux = 0;
+char tsl2561_types[] = "TSL2561";
+
+bool Tsl2561Read(void)
+{
+  if (tsl2561_valid) { tsl2561_valid--; }
+
+  uint8_t id;
+  bool gain;
+  Tsl2561::exposure_t exposure;
+  uint16_t scaledFull, scaledIr;
+  uint32_t full, ir;
+
+    if (Tsl.on()) {
+      if (Tsl.id(id)
+        && Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr)
+        && Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr)
+        && Tsl2561Util::milliLux(full, ir, tsl2561_milliLux, Tsl2561::packageCS(id))) {
+      } else{
+        tsl2561_milliLux = 0;
+      }
+    }
+  tsl2561_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+void Tsl2561Detect(void)
+{
+  if (I2cSetDevice(0x29) || I2cSetDevice(0x39) || I2cSetDevice(0x49)) {
+    uint8_t id;
+    Tsl.begin();
+    if (!Tsl.id(id)) return;
+    if (Tsl.on()) {
+      tsl2561_type = 1;
+      I2cSetActiveFound(Tsl.address(), tsl2561_types);
+    }
+  }
+}
+
+void Tsl2561EverySecond(void)
+{
+  if (!(uptime %2)) {
+
+    if (!Tsl2561Read()) {
+      AddLogMissed(tsl2561_types, tsl2561_valid);
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TSL2561[] PROGMEM =
+  "{s}TSL2561 " D_ILLUMINANCE "{m}%u.%03u " D_UNIT_LUX "{e}";
+#endif
+
+void Tsl2561Show(bool json)
+{
+  if (tsl2561_valid) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"),
+        tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, (tsl2561_milliLux + 500) / 1000); }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TSL2561, tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns16(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_16)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Tsl2561Detect();
+  }
+  else if (tsl2561_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Tsl2561EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Tsl2561Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tsl2561Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
+#ifdef USE_SENSEAIR
+# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
+#define XSNS_17 17
+
+#define SENSEAIR_MODBUS_SPEED 9600
+#define SENSEAIR_DEVICE_ADDRESS 0xFE
+#define SENSEAIR_READ_REGISTER 0x04
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *SenseairModbus;
+
+const char kSenseairTypes[] PROGMEM = "Kx0|S8";
+
+uint8_t senseair_type = 1;
+char senseair_types[7];
+
+uint16_t senseair_co2 = 0;
+float senseair_temperature = 0;
+float senseair_humidity = 0;
+
+
+
+const uint8_t start_addresses[] { 0x1A, 0x00, 0x03, 0x04, 0x05, 0x1C, 0x0A };
+
+uint8_t senseair_read_state = 0;
+uint8_t senseair_send_retry = 0;
+
+void Senseair250ms(void)
+{
+
+
+
+
+    uint16_t value = 0;
+    bool data_ready = SenseairModbus->ReceiveReady();
+
+    if (data_ready) {
+      uint8_t error = SenseairModbus->Receive16BitRegister(&value);
+      if (error) {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir response error %d"), error);
+      } else {
+        switch(senseair_read_state) {
+          case 0:
+            senseair_type = 2;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir type id low %04X"), value);
+            break;
+          case 1:
+            if (value) {
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir error %04X"), value);
+            }
+            break;
+          case 2:
+            senseair_co2 = value;
+            LightSetSignal(CO2_LOW, CO2_HIGH, senseair_co2);
+            break;
+          case 3:
+            senseair_temperature = ConvertTemp((float)value / 100);
+            break;
+          case 4:
+            senseair_humidity = ConvertHumidity((float)value / 100);
+            break;
+          case 5:
+          {
+            bool relay_state = value >> 8 & 1;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir relay state %d"), relay_state);
+            break;
+          }
+          case 6:
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir temp adjustment %d"), value);
+            break;
+        }
+      }
+      senseair_read_state++;
+      if (2 == senseair_type) {
+        if (3 == senseair_read_state) {
+          senseair_read_state = 1;
+        }
+      } else {
+        if (sizeof(start_addresses) == senseair_read_state) {
+          senseair_read_state = 1;
+        }
+      }
+    }
+
+    if (0 == senseair_send_retry || data_ready) {
+      senseair_send_retry = 5;
+      SenseairModbus->Send(SENSEAIR_DEVICE_ADDRESS, SENSEAIR_READ_REGISTER, (uint16_t)start_addresses[senseair_read_state], 1);
+    } else {
+      senseair_send_retry--;
+    }
+
+
+}
+
+
+
+void SenseairInit(void)
+{
+  senseair_type = 0;
+  if ((pin[GPIO_SAIR_RX] < 99) && (pin[GPIO_SAIR_TX] < 99)) {
+    SenseairModbus = new TasmotaModbus(pin[GPIO_SAIR_RX], pin[GPIO_SAIR_TX]);
+    uint8_t result = SenseairModbus->Begin(SENSEAIR_MODBUS_SPEED);
+    if (result) {
+      if (2 == result) { ClaimSerial(); }
+      senseair_type = 1;
+    }
+  }
+}
+
+void SenseairShow(bool json)
+{
+  char temperature[33];
+  dtostrfd(senseair_temperature, Settings.flag2.temperature_resolution, temperature);
+  char humidity[33];
+  dtostrfd(senseair_humidity, Settings.flag2.temperature_resolution, humidity);
+  GetTextIndexed(senseair_types, sizeof(senseair_types), senseair_type -1, kSenseairTypes);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d"), senseair_types, senseair_co2);
+    if (senseair_type != 2) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s"), temperature, humidity);
+    }
+    ResponseJsonEnd();
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, senseair_co2);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, senseair_types, senseair_co2);
+    if (senseair_type != 2) {
+      WSContentSend_PD(HTTP_SNS_TEMP, senseair_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, senseair_types, humidity);
+    }
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns17(uint8_t function)
+{
+  bool result = false;
+
+  if (senseair_type) {
+    switch (function) {
+      case FUNC_INIT:
+        SenseairInit();
+        break;
+      case FUNC_EVERY_250_MSECOND:
+        Senseair250ms();
+        break;
+      case FUNC_JSON_APPEND:
+        SenseairShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SenseairShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
+#ifdef USE_PMS5003
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
+#define XSNS_18 18
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PmsSerial;
+
+uint8_t pms_type = 1;
+uint8_t pms_valid = 0;
+
+struct pmsX003data {
+  uint16_t framelen;
+  uint16_t pm10_standard, pm25_standard, pm100_standard;
+  uint16_t pm10_env, pm25_env, pm100_env;
+#ifdef PMS_MODEL_PMS3003
+  uint16_t reserved1, reserved2, reserved3;
+#else
+  uint16_t particles_03um, particles_05um, particles_10um, particles_25um, particles_50um, particles_100um;
+  uint16_t unused;
+#endif
+  uint16_t checksum;
+} pms_data;
+
+
+
+bool PmsReadData(void)
+{
+  if (! PmsSerial->available()) {
+    return false;
+  }
+  while ((PmsSerial->peek() != 0x42) && PmsSerial->available()) {
+    PmsSerial->read();
+  }
+#ifdef PMS_MODEL_PMS3003
+  if (PmsSerial->available() < 22) {
+#else
+  if (PmsSerial->available() < 32) {
+#endif
+    return false;
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  uint8_t buffer[22];
+  PmsSerial->readBytes(buffer, 22);
+#else
+  uint8_t buffer[32];
+  PmsSerial->readBytes(buffer, 32);
+#endif
+  uint16_t sum = 0;
+  PmsSerial->flush();
+
+#ifdef PMS_MODEL_PMS3003
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 22);
+#else
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 32);
+#endif
+
+
+#ifdef PMS_MODEL_PMS3003
+  for (uint32_t i = 0; i < 20; i++) {
+#else
+  for (uint32_t i = 0; i < 30; i++) {
+#endif
+    sum += buffer[i];
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  uint16_t buffer_u16[10];
+  for (uint32_t i = 0; i < 10; i++) {
+#else
+  uint16_t buffer_u16[15];
+  for (uint32_t i = 0; i < 15; i++) {
+#endif
+    buffer_u16[i] = buffer[2 + i*2 + 1];
+    buffer_u16[i] += (buffer[2 + i*2] << 8);
+  }
+#ifdef PMS_MODEL_PMS3003
+  if (sum != buffer_u16[9]) {
+#else
+  if (sum != buffer_u16[14]) {
+#endif
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("PMS: " D_CHECKSUM_FAILURE));
+    return false;
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  memcpy((void *)&pms_data, (void *)buffer_u16, 20);
+#else
+  memcpy((void *)&pms_data, (void *)buffer_u16, 30);
+#endif
+  pms_valid = 10;
+
+  return true;
+}
+
+
+
+void PmsSecond(void)
+{
+  if (PmsReadData()) {
+    pms_valid = 10;
+  } else {
+    if (pms_valid) {
+      pms_valid--;
+    }
+  }
+}
+
+
+
+void PmsInit(void)
+{
+  pms_type = 0;
+  if (pin[GPIO_PMS5003] < 99) {
+    PmsSerial = new TasmotaSerial(pin[GPIO_PMS5003], -1, 1);
+    if (PmsSerial->begin(9600)) {
+      if (PmsSerial->hardwareSerial()) { ClaimSerial(); }
+      pms_type = 1;
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+#ifdef PMS_MODEL_PMS3003
+const char HTTP_PMS3003_SNS[] PROGMEM =
+
+
+
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#else
+const char HTTP_PMS5003_SNS[] PROGMEM =
+
+
+
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.3 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}";
+#endif
+#endif
+
+void PmsShow(bool json)
+{
+  if (pms_valid) {
+    if (json) {
+#ifdef PMS_MODEL_PMS3003
+      ResponseAppend_P(PSTR(",\"PMS3003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d}"),
+        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
+#else
+      ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"),
+        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
+        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
+#endif
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_COUNT, pms_data.pm10_env);
+        DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env);
+        DomoticzSensor(DZ_CURRENT, pms_data.pm100_env);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+
+#ifdef PMS_MODEL_PMS3003
+        WSContentSend_PD(HTTP_PMS3003_SNS,
+
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
+#else
+        WSContentSend_PD(HTTP_PMS5003_SNS,
+
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
+        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
+#endif
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns18(uint8_t function)
+{
+  bool result = false;
+
+  if (pms_type) {
+    switch (function) {
+      case FUNC_INIT:
+        PmsInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        PmsSecond();
+        break;
+      case FUNC_JSON_APPEND:
+        PmsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        PmsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_19_mgs.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_19_mgs.ino"
+#ifdef USE_I2C
+#ifdef USE_MGS
+
+
+
+
+
+
+
+#define XSNS_19 19
+#define XI2C_17 17
+
+#ifndef MGS_SENSOR_ADDR
+#define MGS_SENSOR_ADDR 0x04
+#endif
+
+#include "MutichannelGasSensor.h"
+
+bool mgs_detected = false;
+
+void MGSInit(void) {
+  gas.begin(MGS_SENSOR_ADDR);
+}
+
+void MGSPrepare(void)
+{
+  if (I2cActive(MGS_SENSOR_ADDR)) { return; }
+
+  gas.begin(MGS_SENSOR_ADDR);
+  if (!gas.isError()) {
+    I2cSetActiveFound(MGS_SENSOR_ADDR, "MultiGas");
+    mgs_detected = true;
+  }
+}
+
+char* measure_gas(int gas_type, char* buffer)
+{
+  float f = gas.calcGas(gas_type);
+  dtostrfd(f, 2, buffer);
+  return buffer;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_MGS_GAS[] PROGMEM = "{s}MGS %s{m}%s " D_UNIT_PARTS_PER_MILLION "{e}";
+#endif
+
+void MGSShow(bool json)
+{
+  char buffer[33];
+  if (json) {
+    ResponseAppend_P(PSTR(",\"MGS\":{\"NH3\":%s"), measure_gas(NH3, buffer));
+    ResponseAppend_P(PSTR(",\"CO\":%s"), measure_gas(CO, buffer));
+    ResponseAppend_P(PSTR(",\"NO2\":%s"), measure_gas(NO2, buffer));
+    ResponseAppend_P(PSTR(",\"C3H8\":%s"), measure_gas(C3H8, buffer));
+    ResponseAppend_P(PSTR(",\"C4H10\":%s"), measure_gas(C4H10, buffer));
+    ResponseAppend_P(PSTR(",\"CH4\":%s"), measure_gas(GAS_CH4, buffer));
+    ResponseAppend_P(PSTR(",\"H2\":%s"), measure_gas(H2, buffer));
+    ResponseAppend_P(PSTR(",\"C2H5OH\":%s}"), measure_gas(C2H5OH, buffer));
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_MGS_GAS, "NH3", measure_gas(NH3, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "CO", measure_gas(CO, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "NO2", measure_gas(NO2, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C3H8", measure_gas(C3H8, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C4H10", measure_gas(C4H10, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "CH4", measure_gas(GAS_CH4, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "H2", measure_gas(H2, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C2H5OH", measure_gas(C2H5OH, buffer));
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns19(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_17)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MGSPrepare();
+  }
+  else if (mgs_detected) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        MGSShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MGSShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
+#ifdef USE_NOVA_SDS
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
+#define XSNS_20 20
+
+#include <TasmotaSerial.h>
+
+#ifndef STARTING_OFFSET
+#define STARTING_OFFSET 30
+#endif
+#if STARTING_OFFSET < 10
+#error "Please set STARTING_OFFSET >= 10"
+#endif
+#ifndef NOVA_SDS_RECDATA_TIMEOUT
+#define NOVA_SDS_RECDATA_TIMEOUT 150
+#endif
+#ifndef NOVA_SDS_DEVICE_ID
+#define NOVA_SDS_DEVICE_ID 0xFFFF
+#endif
+
+TasmotaSerial *NovaSdsSerial;
+
+uint8_t novasds_type = 1;
+uint8_t novasds_valid = 0;
+uint8_t cont_mode = 1;
+
+struct sds011data {
+  uint16_t pm100;
+  uint16_t pm25;
+} novasds_data;
+uint16_t pm100_sum;
+uint16_t pm25_sum;
+
+
+#define NOVA_SDS_REPORTING_MODE 2
+#define NOVA_SDS_QUERY_DATA 4
+#define NOVA_SDS_SET_DEVICE_ID 5
+#define NOVA_SDS_SLEEP_AND_WORK 6
+#define NOVA_SDS_WORKING_PERIOD 8
+#define NOVA_SDS_CHECK_FIRMWARE_VER 7
+  #define NOVA_SDS_QUERY_MODE 0
+  #define NOVA_SDS_SET_MODE 1
+  #define NOVA_SDS_REPORT_ACTIVE 0
+  #define NOVA_SDS_REPORT_QUERY 1
+  #define NOVA_SDS_SLEEP 0
+  #define NOVA_SDS_WORK 1
+
+
+bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer)
+{
+  uint8_t novasds_cmnd[19] = {0xAA, 0xB4, byte1, byte2, byte3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (uint8_t)(sensorid & 0xFF), (uint8_t)((sensorid>>8) & 0xFF), 0x00, 0xAB};
+
+
+  for (uint32_t i = 2; i < 17; i++) {
+    novasds_cmnd[17] += novasds_cmnd[i];
+  }
+
+
+
+
+
+  NovaSdsSerial->write(novasds_cmnd, sizeof(novasds_cmnd));
+  NovaSdsSerial->flush();
+
+
+  unsigned long cmndtime = millis();
+  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( ! NovaSdsSerial->available() ) );
+  if ( ! NovaSdsSerial->available() ) {
+
+    return false;
+  }
+  uint8_t recbuf[10];
+  memset(recbuf, 0, sizeof(recbuf));
+
+  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( NovaSdsSerial->available() > 0) && (0xAA != (recbuf[0] = NovaSdsSerial->read())) );
+  if ( 0xAA != recbuf[0] ) {
+
+    return false;
+  }
+
+
+  NovaSdsSerial->readBytes(&recbuf[1], 9);
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, recbuf, sizeof(recbuf));
+
+  if ( nullptr != buffer ) {
+
+    memcpy(buffer, recbuf, sizeof(recbuf));
+  }
+
+
+  if ((0xAB != recbuf[9] ) || (recbuf[8] != ((recbuf[2] + recbuf[3] + recbuf[4] + recbuf[5] + recbuf[6] + recbuf[7]) & 0xFF))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("SDS: " D_CHECKSUM_FAILURE));
+    return false;
+  }
+
+  return true;
+}
+
+void NovaSdsSetWorkPeriod(void)
+{
+
+    NovaSdsCommand(NOVA_SDS_WORKING_PERIOD, NOVA_SDS_SET_MODE, 0, NOVA_SDS_DEVICE_ID, nullptr);
+
+    NovaSdsCommand(NOVA_SDS_REPORTING_MODE, NOVA_SDS_SET_MODE, NOVA_SDS_REPORT_QUERY, NOVA_SDS_DEVICE_ID, nullptr);
+}
+
+bool NovaSdsReadData(void)
+{
+  uint8_t d[10];
+  if ( ! NovaSdsCommand(NOVA_SDS_QUERY_DATA, 0, 0, NOVA_SDS_DEVICE_ID, d) ) {
+    return false;
+  }
+  novasds_data.pm25 = (d[2] + 256 * d[3]);
+  novasds_data.pm100 = (d[4] + 256 * d[5]);
+
+  return true;
+}
+
+
+
+void NovaSdsSecond(void)
+{
+  if (!novasds_valid)
+  {
+    NovaSdsSetWorkPeriod();
+    novasds_valid=1;
+  }
+  if((Settings.tele_period - Settings.novasds_startingoffset <= 0))
+  {
+    if(!cont_mode)
+    {
+      cont_mode = 1;
+      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
+    }
+  }
+  else
+    cont_mode = 0;
+
+  if(tele_period == Settings.tele_period - Settings.novasds_startingoffset && !cont_mode)
+  {
+    NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
+  }
+  if(tele_period >= Settings.tele_period-5 && tele_period <= Settings.tele_period-2)
+  {
+    if(!(NovaSdsReadData())) novasds_valid=0;
+    pm100_sum += novasds_data.pm100;
+    pm25_sum += novasds_data.pm25;
+  }
+  if(tele_period == Settings.tele_period-1)
+  {
+    novasds_data.pm100 = pm100_sum >> 2;
+    novasds_data.pm25 = pm25_sum >> 2;
+    if(!cont_mode)
+      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_SLEEP, NOVA_SDS_DEVICE_ID, nullptr);
+    pm100_sum = pm25_sum = 0;
+  }
+}
+
+
+
+
+
+
+
+bool NovaSdsCommandSensor(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 256)) {
+    if( XdrvMailbox.payload < 10 ) Settings.novasds_startingoffset = 10;
+    else Settings.novasds_startingoffset = XdrvMailbox.payload;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_20, Settings.novasds_startingoffset);
+
+  return true;
+}
+
+void NovaSdsInit(void)
+{
+  novasds_type = 0;
+  if (pin[GPIO_SDS0X1_RX] < 99 && pin[GPIO_SDS0X1_TX] < 99) {
+    NovaSdsSerial = new TasmotaSerial(pin[GPIO_SDS0X1_RX], pin[GPIO_SDS0X1_TX], 1);
+    if (NovaSdsSerial->begin(9600)) {
+      if (NovaSdsSerial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      novasds_type = 1;
+      NovaSdsSetWorkPeriod();
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SDS0X1_SNS[] PROGMEM =
+  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#endif
+
+void NovaSdsShow(bool json)
+{
+  if (novasds_valid) {
+    float pm10f = (float)(novasds_data.pm100) / 10.0f;
+    float pm2_5f = (float)(novasds_data.pm25) / 10.0f;
+    char pm10[33];
+    dtostrfd(pm10f, 1, pm10);
+    char pm2_5[33];
+    dtostrfd(pm2_5f, 1, pm2_5);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), pm2_5, pm10);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, pm2_5);
+        DomoticzSensor(DZ_CURRENT, pm10);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SDS0X1_SNS, pm2_5, pm10);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns20(uint8_t function)
+{
+  bool result = false;
+
+  if (novasds_type) {
+    switch (function) {
+      case FUNC_INIT:
+        NovaSdsInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        NovaSdsSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_20 == XdrvMailbox.index) {
+          result = NovaSdsCommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        NovaSdsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        NovaSdsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
+#ifdef USE_I2C
+#ifdef USE_SGP30
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
+#define XSNS_21 21
+#define XI2C_18 18
+
+#define SGP30_ADDRESS 0x58
+
+#include "Adafruit_SGP30.h"
+Adafruit_SGP30 sgp;
+
+bool sgp30_type = false;
+bool sgp30_ready = false;
+float sgp30_abshum;
+
+
+
+void sgp30_Init(void)
+{
+  if (I2cActive(SGP30_ADDRESS)) { return; }
+
+  if (sgp.begin()) {
+    sgp30_type = true;
+
+    I2cSetActiveFound(SGP30_ADDRESS, "SGP30");
+  }
+}
+
+
+#define POW_FUNC FastPrecisePow
+
+float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit) {
+
+
+
+
+
+  float temp = NAN;
+  const float mw = 18.01534;
+  const float r = 8.31447215;
+
+  if (isnan(temperature) || isnan(humidity) ) {
+    return NAN;
+  }
+
+  if (tempUnit != 'C') {
+    temperature = (temperature - 32.0) * (5.0 / 9.0);
+  }
+
+  temp = POW_FUNC(2.718281828, (17.67 * temperature) / (temperature + 243.5));
+
+
+  return (6.112 * temp * humidity * mw) / ((273.15 + temperature) * r);
+}
+
+#define SAVE_PERIOD 30
+
+void Sgp30Update(void)
+{
+  sgp30_ready = false;
+  if (!sgp.IAQmeasure()) {
+    return;
+  }
+  if (global_update && (global_humidity > 0) && (global_temperature != 9999)) {
+
+    sgp30_abshum=sgp30_AbsoluteHumidity(global_temperature,global_humidity,TempUnit());
+    sgp.setHumidity(sgp30_abshum*1000);
+  }
+  sgp30_ready = true;
+
+
+  if (!(uptime%SAVE_PERIOD)) {
+
+    uint16_t TVOC_base;
+    uint16_t eCO2_base;
+
+    if (!sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) return;
+
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SGP30[] PROGMEM =
+  "{s}SGP30 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
+  "{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
+const char HTTP_SNS_AHUM[] PROGMEM = "{s}SGP30 Abs Humidity{m}%s g/m3{e}";
+#endif
+
+#define D_JSON_AHUM "aHumidity"
+
+void Sgp30Show(bool json)
+{
+  if (sgp30_ready) {
+    char abs_hum[33];
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC);
+      if (global_update && global_humidity>0 && global_temperature!=9999) {
+
+        dtostrfd(sgp30_abshum,4,abs_hum);
+        ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum);
+      }
+      ResponseJsonEnd();
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC);
+      if (global_update) {
+        WSContentSend_PD(HTTP_SNS_AHUM, abs_hum);
+      }
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns21(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_18)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    sgp30_Init();
+  }
+  else if (sgp30_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Sgp30Update();
+        break;
+      case FUNC_JSON_APPEND:
+        Sgp30Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sgp30Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
+#ifdef USE_SR04
+
+#include <NewPing.h>
+#include <TasmotaSerial.h>
+# 32 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
+#define XSNS_22 22
+
+uint8_t sr04_type = 1;
+int sr04_echo_pin = 0;
+int sr04_trig_pin = 0;
+real64_t distance;
+
+NewPing* sonar = nullptr;
+TasmotaSerial* sonar_serial = nullptr;
+
+
+
+uint8_t Sr04TModeDetect(void)
+{
+  sr04_type = 0;
+  if (pin[GPIO_SR04_ECHO]>=99) return sr04_type;
+
+  sr04_echo_pin = pin[GPIO_SR04_ECHO];
+  sr04_trig_pin = (pin[GPIO_SR04_TRIG] < 99) ? pin[GPIO_SR04_TRIG] : -1;
+  sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
+
+  if (sonar_serial->begin(9600,1)) {
+    DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode"));
+
+    if (sr04_trig_pin!=-1) {
+        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;
+    } else {
+        sr04_type = 2;
+    }
+  } else {
+    sr04_type = 1;
+  }
+
+  if (sr04_type < 2) {
+      delete sonar_serial;
+      sonar_serial = nullptr;
+      sonar = new NewPing(sr04_trig_pin, sr04_echo_pin, 300);
+  } else {
+    if (sonar_serial->hardwareSerial()) {
+      ClaimSerial();
+    }
+  }
+
+  AddLog_P2(LOG_LEVEL_INFO,PSTR("SR04: Mode %d"), sr04_type);
+  return sr04_type;
+}
+
+uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third)
+{
+  uint16_t ret = first;
+  if (first > second) {
+    first = second;
+    second = ret;
+  }
+
+  if (third < first) {
+    return first;
+  } else if (third > second) {
+    return second;
+  } else {
+    return third;
+  }
+}
+
+uint16_t Sr04TMode3Distance() {
+
+    sonar_serial->write(0x55);
+    sonar_serial->flush();
+
+    return Sr04TMode2Distance();
+}
+
+uint16_t Sr04TMode2Distance(void)
+{
+  sonar_serial->setTimeout(300);
+  const char startByte = 0xff;
+
+  if (!sonar_serial->find(startByte)) {
+
+      return NO_ECHO;
+  }
+
+  delay(5);
+
+  uint8_t crc = sonar_serial->read();
+
+  uint16_t distance = ((uint16_t)crc) << 8;
+
+
+  distance += sonar_serial->read();
+  crc += distance & 0x00ff;
+  crc += 0x00FF;
+
+
+  if (crc != sonar_serial->read()) {
+    AddLog_P2(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error."));
+    return NO_ECHO;
+  }
+
+  return distance;
+}
+
+void Sr04TReading(void) {
+
+  if (sonar_serial==nullptr && sonar==nullptr) {
+    Sr04TModeDetect();
+  }
+
+  switch (sr04_type) {
+      case 3:
+        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10;
+        break;
+      case 2:
+
+        while(sonar_serial->available()) sonar_serial->read();
+        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode2Distance(),Sr04TMode2Distance(),Sr04TMode2Distance()))/10;
+        break;
+      case 1:
+        distance = (real64_t)(sonar->ping_median(5))/ US_ROUNDTRIP_CM;
+        break;
+      default:
+        distance = NO_ECHO;
+  }
+
+  return;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_DISTANCE[] PROGMEM =
+  "{s}SR04 " D_DISTANCE "{m}%s" D_UNIT_CENTIMETER "{e}";
+#endif
+
+void Sr04Show(bool json)
+{
+
+  if (distance != 0) {
+    char distance_chr[33];
+    dtostrfd(distance, 3, distance_chr);
+
+    if(json) {
+      ResponseAppend_P(PSTR(",\"SR04\":{\"" D_JSON_DISTANCE "\":%s}"), distance_chr);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_COUNT, distance_chr);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_DISTANCE, distance_chr);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns22(uint8_t function)
+{
+  bool result = false;
+
+  if (sr04_type) {
+    switch (function) {
+      case FUNC_INIT:
+        result = (pin[GPIO_SR04_ECHO]<99);
+        break;
+      case FUNC_EVERY_SECOND:
+        Sr04TReading();
+        result = true;
+        break;
+      case FUNC_JSON_APPEND:
+        Sr04Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sr04Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
+#ifdef USE_I2C
+#ifdef USE_SI1145
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
+#define XSNS_24 24
+#define XI2C_19 19
+
+#define SI114X_ADDR 0X60
+
+
+
+#define SI114X_QUERY 0X80
+#define SI114X_SET 0XA0
+#define SI114X_NOP 0X00
+#define SI114X_RESET 0X01
+#define SI114X_BUSADDR 0X02
+#define SI114X_PS_FORCE 0X05
+#define SI114X_GET_CAL 0X12
+#define SI114X_ALS_FORCE 0X06
+#define SI114X_PSALS_FORCE 0X07
+#define SI114X_PS_PAUSE 0X09
+#define SI114X_ALS_PAUSE 0X0A
+#define SI114X_PSALS_PAUSE 0X0B
+#define SI114X_PS_AUTO 0X0D
+#define SI114X_ALS_AUTO 0X0E
+#define SI114X_PSALS_AUTO 0X0F
+
+
+
+#define SI114X_PART_ID 0X00
+#define SI114X_REV_ID 0X01
+#define SI114X_SEQ_ID 0X02
+#define SI114X_INT_CFG 0X03
+#define SI114X_IRQ_ENABLE 0X04
+#define SI114X_IRQ_MODE1 0x05
+#define SI114X_IRQ_MODE2 0x06
+#define SI114X_HW_KEY 0X07
+#define SI114X_MEAS_RATE0 0X08
+#define SI114X_MEAS_RATE1 0X09
+#define SI114X_PS_RATE 0X0A
+#define SI114X_PS_LED21 0X0F
+#define SI114X_PS_LED3 0X10
+#define SI114X_UCOEFF0 0X13
+#define SI114X_UCOEFF1 0X14
+#define SI114X_UCOEFF2 0X15
+#define SI114X_UCOEFF3 0X16
+#define SI114X_WR 0X17
+#define SI114X_COMMAND 0X18
+#define SI114X_RESPONSE 0X20
+#define SI114X_IRQ_STATUS 0X21
+#define SI114X_ALS_VIS_DATA0 0X22
+#define SI114X_ALS_VIS_DATA1 0X23
+#define SI114X_ALS_IR_DATA0 0X24
+#define SI114X_ALS_IR_DATA1 0X25
+#define SI114X_PS1_DATA0 0X26
+#define SI114X_PS1_DATA1 0X27
+#define SI114X_PS2_DATA0 0X28
+#define SI114X_PS2_DATA1 0X29
+#define SI114X_PS3_DATA0 0X2A
+#define SI114X_PS3_DATA1 0X2B
+#define SI114X_AUX_DATA0_UVINDEX0 0X2C
+#define SI114X_AUX_DATA1_UVINDEX1 0X2D
+#define SI114X_RD 0X2E
+#define SI114X_CHIP_STAT 0X30
+
+
+
+#define SI114X_CHLIST 0X01
+#define SI114X_CHLIST_ENUV 0x80
+#define SI114X_CHLIST_ENAUX 0x40
+#define SI114X_CHLIST_ENALSIR 0x20
+#define SI114X_CHLIST_ENALSVIS 0x10
+#define SI114X_CHLIST_ENPS1 0x01
+#define SI114X_CHLIST_ENPS2 0x02
+#define SI114X_CHLIST_ENPS3 0x04
+
+#define SI114X_PSLED12_SELECT 0X02
+#define SI114X_PSLED3_SELECT 0X03
+
+#define SI114X_PS_ENCODE 0X05
+#define SI114X_ALS_ENCODE 0X06
+
+#define SI114X_PS1_ADCMUX 0X07
+#define SI114X_PS2_ADCMUX 0X08
+#define SI114X_PS3_ADCMUX 0X09
+
+#define SI114X_PS_ADC_COUNTER 0X0A
+#define SI114X_PS_ADC_GAIN 0X0B
+#define SI114X_PS_ADC_MISC 0X0C
+
+#define SI114X_ALS_IR_ADC_MUX 0X0E
+#define SI114X_AUX_ADC_MUX 0X0F
+
+#define SI114X_ALS_VIS_ADC_COUNTER 0X10
+#define SI114X_ALS_VIS_ADC_GAIN 0X11
+#define SI114X_ALS_VIS_ADC_MISC 0X12
+
+#define SI114X_LED_REC 0X1C
+
+#define SI114X_ALS_IR_ADC_COUNTER 0X1D
+#define SI114X_ALS_IR_ADC_GAIN 0X1E
+#define SI114X_ALS_IR_ADC_MISC 0X1F
+
+
+
+
+#define SI114X_ADCMUX_SMALL_IR 0x00
+#define SI114X_ADCMUX_VISIABLE 0x02
+#define SI114X_ADCMUX_LARGE_IR 0x03
+#define SI114X_ADCMUX_NO 0x06
+#define SI114X_ADCMUX_GND 0x25
+#define SI114X_ADCMUX_TEMPERATURE 0x65
+#define SI114X_ADCMUX_VDD 0x75
+
+#define SI114X_PSLED12_SELECT_PS1_NONE 0x00
+#define SI114X_PSLED12_SELECT_PS1_LED1 0x01
+#define SI114X_PSLED12_SELECT_PS1_LED2 0x02
+#define SI114X_PSLED12_SELECT_PS1_LED3 0x04
+#define SI114X_PSLED12_SELECT_PS2_NONE 0x00
+#define SI114X_PSLED12_SELECT_PS2_LED1 0x10
+#define SI114X_PSLED12_SELECT_PS2_LED2 0x20
+#define SI114X_PSLED12_SELECT_PS2_LED3 0x40
+#define SI114X_PSLED3_SELECT_PS2_NONE 0x00
+#define SI114X_PSLED3_SELECT_PS2_LED1 0x10
+#define SI114X_PSLED3_SELECT_PS2_LED2 0x20
+#define SI114X_PSLED3_SELECT_PS2_LED3 0x40
+
+#define SI114X_ADC_GAIN_DIV1 0X00
+#define SI114X_ADC_GAIN_DIV2 0X01
+#define SI114X_ADC_GAIN_DIV4 0X02
+#define SI114X_ADC_GAIN_DIV8 0X03
+#define SI114X_ADC_GAIN_DIV16 0X04
+#define SI114X_ADC_GAIN_DIV32 0X05
+
+#define SI114X_LED_CURRENT_5MA 0X01
+#define SI114X_LED_CURRENT_11MA 0X02
+#define SI114X_LED_CURRENT_22MA 0X03
+#define SI114X_LED_CURRENT_45MA 0X04
+
+#define SI114X_ADC_COUNTER_1ADCCLK 0X00
+#define SI114X_ADC_COUNTER_7ADCCLK 0X01
+#define SI114X_ADC_COUNTER_15ADCCLK 0X02
+#define SI114X_ADC_COUNTER_31ADCCLK 0X03
+#define SI114X_ADC_COUNTER_63ADCCLK 0X04
+#define SI114X_ADC_COUNTER_127ADCCLK 0X05
+#define SI114X_ADC_COUNTER_255ADCCLK 0X06
+#define SI114X_ADC_COUNTER_511ADCCLK 0X07
+
+#define SI114X_ADC_MISC_LOWRANGE 0X00
+#define SI114X_ADC_MISC_HIGHRANGE 0X20
+#define SI114X_ADC_MISC_ADC_NORMALPROXIMITY 0X00
+#define SI114X_ADC_MISC_ADC_RAWADC 0X04
+
+#define SI114X_INT_CFG_INTOE 0X01
+
+#define SI114X_IRQEN_ALS 0x01
+#define SI114X_IRQEN_PS1 0x04
+#define SI114X_IRQEN_PS2 0x08
+#define SI114X_IRQEN_PS3 0x10
+
+uint16_t si1145_visible;
+uint16_t si1145_infrared;
+uint16_t si1145_uvindex;
+
+bool si1145_type = false;
+uint8_t si1145_valid = 0;
+
+
+
+uint8_t Si1145ReadByte(uint8_t reg)
+{
+  return I2cRead8(SI114X_ADDR, reg);
+}
+
+uint16_t Si1145ReadHalfWord(uint8_t reg)
+{
+  return I2cRead16LE(SI114X_ADDR, reg);
+}
+
+bool Si1145WriteByte(uint8_t reg, uint16_t val)
+{
+  I2cWrite8(SI114X_ADDR, reg, val);
+}
+
+uint8_t Si1145WriteParamData(uint8_t p, uint8_t v)
+{
+  Si1145WriteByte(SI114X_WR, v);
+  Si1145WriteByte(SI114X_COMMAND, p | SI114X_SET);
+  return Si1145ReadByte(SI114X_RD);
+}
+
+
+
+bool Si1145Present(void)
+{
+  return (Si1145ReadByte(SI114X_PART_ID) == 0X45);
+}
+
+void Si1145Reset(void)
+{
+  Si1145WriteByte(SI114X_MEAS_RATE0, 0);
+  Si1145WriteByte(SI114X_MEAS_RATE1, 0);
+  Si1145WriteByte(SI114X_IRQ_ENABLE, 0);
+  Si1145WriteByte(SI114X_IRQ_MODE1, 0);
+  Si1145WriteByte(SI114X_IRQ_MODE2, 0);
+  Si1145WriteByte(SI114X_INT_CFG, 0);
+  Si1145WriteByte(SI114X_IRQ_STATUS, 0xFF);
+
+  Si1145WriteByte(SI114X_COMMAND, SI114X_RESET);
+  delay(10);
+  Si1145WriteByte(SI114X_HW_KEY, 0x17);
+  delay(10);
+}
+
+void Si1145DeInit(void)
+{
+
+
+  Si1145WriteByte(SI114X_UCOEFF0, 0x29);
+  Si1145WriteByte(SI114X_UCOEFF1, 0x89);
+  Si1145WriteByte(SI114X_UCOEFF2, 0x02);
+  Si1145WriteByte(SI114X_UCOEFF3, 0x00);
+  Si1145WriteParamData(SI114X_CHLIST, SI114X_CHLIST_ENUV | SI114X_CHLIST_ENALSIR | SI114X_CHLIST_ENALSVIS | SI114X_CHLIST_ENPS1);
+
+
+
+  Si1145WriteParamData(SI114X_PS1_ADCMUX, SI114X_ADCMUX_LARGE_IR);
+  Si1145WriteByte(SI114X_PS_LED21, SI114X_LED_CURRENT_22MA);
+  Si1145WriteParamData(SI114X_PSLED12_SELECT, SI114X_PSLED12_SELECT_PS1_LED1);
+
+
+
+  Si1145WriteParamData(SI114X_PS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_PS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_PS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE | SI114X_ADC_MISC_ADC_RAWADC);
+
+
+
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
+
+
+
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
+
+
+
+  Si1145WriteByte(SI114X_INT_CFG, SI114X_INT_CFG_INTOE);
+  Si1145WriteByte(SI114X_IRQ_ENABLE, SI114X_IRQEN_ALS);
+
+
+
+  Si1145WriteByte(SI114X_MEAS_RATE0, 0xFF);
+  Si1145WriteByte(SI114X_COMMAND, SI114X_PSALS_AUTO);
+}
+
+bool Si1145Begin(void)
+{
+  if (!Si1145Present()) { return false; }
+
+  Si1145Reset();
+  Si1145DeInit();
+  return true;
+}
+
+
+uint16_t Si1145ReadUV(void)
+{
+  return Si1145ReadHalfWord(SI114X_AUX_DATA0_UVINDEX0);
+}
+
+
+uint16_t Si1145ReadVisible(void)
+{
+  return Si1145ReadHalfWord(SI114X_ALS_VIS_DATA0);
+}
+
+
+uint16_t Si1145ReadIR(void)
+{
+  return Si1145ReadHalfWord(SI114X_ALS_IR_DATA0);
+}
+
+
+
+bool Si1145Read(void)
+{
+  if (si1145_valid) { si1145_valid--; }
+
+  if (!Si1145Present()) { return false; }
+
+  si1145_visible = Si1145ReadVisible();
+  si1145_infrared = Si1145ReadIR();
+  si1145_uvindex = Si1145ReadUV();
+  si1145_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+void Si1145Detect(void)
+{
+  if (I2cActive(SI114X_ADDR)) { return; }
+
+  if (Si1145Begin()) {
+    si1145_type = true;
+    I2cSetActiveFound(SI114X_ADDR, "SI1145");
+  }
+}
+
+void Si1145Update(void)
+{
+  if (!Si1145Read()) {
+    AddLogMissed("SI1145", si1145_valid);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SI1145[] PROGMEM =
+  "{s}SI1145 " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}"
+  "{s}SI1145 " D_INFRARED "{m}%d " D_UNIT_LUX "{e}"
+  "{s}SI1145 " D_UV_INDEX "{m}%d.%d{e}";
+#endif
+
+void Si1145Show(bool json)
+{
+  if (si1145_valid) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SI1145\":{\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_INFRARED "\":%d,\"" D_JSON_UV_INDEX "\":%d.%d}"),
+        si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, si1145_visible);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_SI1145, si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns24(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_19)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Si1145Detect();
+  }
+  else if (si1145_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Si1145Update();
+        break;
+      case FUNC_JSON_APPEND:
+        Si1145Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Si1145Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
+#ifdef USE_I2C
+#ifdef USE_LM75AD
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
+#define XSNS_26 26
+#define XI2C_20 20
+
+#define LM75AD_ADDRESS1 0x48
+#define LM75AD_ADDRESS2 0x49
+#define LM75AD_ADDRESS3 0x4A
+#define LM75AD_ADDRESS4 0x4B
+#define LM75AD_ADDRESS5 0x4C
+#define LM75AD_ADDRESS6 0x4D
+#define LM75AD_ADDRESS7 0x4E
+#define LM75AD_ADDRESS8 0x4F
+
+#define LM75_TEMP_REGISTER 0x00
+#define LM75_CONF_REGISTER 0x01
+#define LM75_THYST_REGISTER 0x02
+#define LM75_TOS_REGISTER 0x03
+
+bool lm75ad_type = false;
+uint8_t lm75ad_address;
+uint8_t lm75ad_addresses[] = { LM75AD_ADDRESS1, LM75AD_ADDRESS2, LM75AD_ADDRESS3, LM75AD_ADDRESS4, LM75AD_ADDRESS5, LM75AD_ADDRESS6, LM75AD_ADDRESS7, LM75AD_ADDRESS8 };
+
+void LM75ADDetect(void)
+{
+  for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
+    lm75ad_address = lm75ad_addresses[i];
+    if (I2cActive(lm75ad_address)) {
+      continue; }
+    if (!I2cSetDevice(lm75ad_address)) {
+      break;
+    }
+    uint16_t buffer;
+    if (I2cValidRead16(&buffer, lm75ad_address, LM75_THYST_REGISTER)) {
+      if (buffer == 0x4B00) {
+        lm75ad_type = true;
+        I2cSetActiveFound(lm75ad_address, "LM75AD");
+        break;
+      }
+    }
+  }
+}
+
+float LM75ADGetTemp(void)
+{
+  int16_t sign = 1;
+
+  uint16_t t = I2cRead16(lm75ad_address, LM75_TEMP_REGISTER);
+  if (t & 0x8000) {
+    t = (~t) +0x20;
+    sign = -1;
+  }
+  t = t >> 5;
+  return ConvertTemp(sign * t * 0.125);
+}
+
+void LM75ADShow(bool json)
+{
+  float t = LM75ADGetTemp();
+  char temperature[33];
+  dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"LM75AD\":{\"" D_JSON_TEMPERATURE "\":%s}"), temperature);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TEMP, "LM75AD", temperature, TempUnit());
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns26(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_20)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    LM75ADDetect();
+  }
+  else if (lm75ad_type) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        LM75ADShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        LM75ADShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+# 28 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+#ifdef USE_I2C
+#ifdef USE_APDS9960
+# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+#define XSNS_27 27
+#define XI2C_21 21
+
+#if defined(USE_SHT) || defined(USE_VEML6070) || defined(USE_TSL2561)
+  #warning **** Turned off conflicting drivers SHT and VEML6070 ****
+  #ifdef USE_SHT
+  #undef USE_SHT
+  #endif
+  #ifdef USE_VEML6070
+  #undef USE_VEML6070
+  #endif
+  #ifdef USE_TSL2561
+  #undef USE_TSL2561
+  #endif
+#endif
+
+#define APDS9960_I2C_ADDR 0x39
+
+#define APDS9960_CHIPID_1 0xAB
+#define APDS9960_CHIPID_2 0x9C
+
+#define APDS9930_CHIPID_1 0x12
+#define APDS9930_CHIPID_2 0x39
+
+
+#define GESTURE_THRESHOLD_OUT 10
+#define GESTURE_SENSITIVITY_1 50
+#define GESTURE_SENSITIVITY_2 20
+
+uint8_t APDS9960addr;
+uint8_t APDS9960type = 0;
+char APDS9960stype[] = "APDS9960";
+char currentGesture[6];
+uint8_t gesture_mode = 1;
+
+
+volatile uint8_t recovery_loop_counter = 0;
+#define APDS9960_LONG_RECOVERY 50
+#define APDS9960_MAX_GESTURE_CYCLES 50
+bool APDS9960_overload = false;
+
+#ifdef USE_WEBSERVER
+const char HTTP_APDS_9960_SNS[] PROGMEM =
+  "{s}" "Red" "{m}%s{e}"
+  "{s}" "Green" "{m}%s{e}"
+  "{s}" "Blue" "{m}%s{e}"
+  "{s}" "Ambient" "{m}%s " D_UNIT_LUX "{e}"
+  "{s}" "CCT" "{m}%s " "K" "{e}"
+  "{s}" "Proximity" "{m}%s{e}";
+#endif
+# 97 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+#define FIFO_PAUSE_TIME 30
+
+
+#define APDS9960_ENABLE 0x80
+#define APDS9960_ATIME 0x81
+#define APDS9960_WTIME 0x83
+#define APDS9960_AILTL 0x84
+#define APDS9960_AILTH 0x85
+#define APDS9960_AIHTL 0x86
+#define APDS9960_AIHTH 0x87
+#define APDS9960_PILT 0x89
+#define APDS9960_PIHT 0x8B
+#define APDS9960_PERS 0x8C
+#define APDS9960_CONFIG1 0x8D
+#define APDS9960_PPULSE 0x8E
+#define APDS9960_CONTROL 0x8F
+#define APDS9960_CONFIG2 0x90
+#define APDS9960_ID 0x92
+#define APDS9960_STATUS 0x93
+#define APDS9960_CDATAL 0x94
+#define APDS9960_CDATAH 0x95
+#define APDS9960_RDATAL 0x96
+#define APDS9960_RDATAH 0x97
+#define APDS9960_GDATAL 0x98
+#define APDS9960_GDATAH 0x99
+#define APDS9960_BDATAL 0x9A
+#define APDS9960_BDATAH 0x9B
+#define APDS9960_PDATA 0x9C
+#define APDS9960_POFFSET_UR 0x9D
+#define APDS9960_POFFSET_DL 0x9E
+#define APDS9960_CONFIG3 0x9F
+#define APDS9960_GPENTH 0xA0
+#define APDS9960_GEXTH 0xA1
+#define APDS9960_GCONF1 0xA2
+#define APDS9960_GCONF2 0xA3
+#define APDS9960_GOFFSET_U 0xA4
+#define APDS9960_GOFFSET_D 0xA5
+#define APDS9960_GOFFSET_L 0xA7
+#define APDS9960_GOFFSET_R 0xA9
+#define APDS9960_GPULSE 0xA6
+#define APDS9960_GCONF3 0xAA
+#define APDS9960_GCONF4 0xAB
+#define APDS9960_GFLVL 0xAE
+#define APDS9960_GSTATUS 0xAF
+#define APDS9960_IFORCE 0xE4
+#define APDS9960_PICLEAR 0xE5
+#define APDS9960_CICLEAR 0xE6
+#define APDS9960_AICLEAR 0xE7
+#define APDS9960_GFIFO_U 0xFC
+#define APDS9960_GFIFO_D 0xFD
+#define APDS9960_GFIFO_L 0xFE
+#define APDS9960_GFIFO_R 0xFF
+
+
+#define APDS9960_PON 0b00000001
+#define APDS9960_AEN 0b00000010
+#define APDS9960_PEN 0b00000100
+#define APDS9960_WEN 0b00001000
+#define APSD9960_AIEN 0b00010000
+#define APDS9960_PIEN 0b00100000
+#define APDS9960_GEN 0b01000000
+#define APDS9960_GVALID 0b00000001
+
+
+#define OFF 0
+#define ON 1
+
+
+#define POWER 0
+#define AMBIENT_LIGHT 1
+#define PROXIMITY 2
+#define WAIT 3
+#define AMBIENT_LIGHT_INT 4
+#define PROXIMITY_INT 5
+#define GESTURE 6
+#define ALL 7
+
+
+#define LED_DRIVE_100MA 0
+#define LED_DRIVE_50MA 1
+#define LED_DRIVE_25MA 2
+#define LED_DRIVE_12_5MA 3
+
+
+#define PGAIN_1X 0
+#define PGAIN_2X 1
+#define PGAIN_4X 2
+#define PGAIN_8X 3
+
+
+#define AGAIN_1X 0
+#define AGAIN_4X 1
+#define AGAIN_16X 2
+#define AGAIN_64X 3
+
+
+#define GGAIN_1X 0
+#define GGAIN_2X 1
+#define GGAIN_4X 2
+#define GGAIN_8X 3
+
+
+#define LED_BOOST_100 0
+#define LED_BOOST_150 1
+#define LED_BOOST_200 2
+#define LED_BOOST_300 3
+
+
+#define GWTIME_0MS 0
+#define GWTIME_2_8MS 1
+#define GWTIME_5_6MS 2
+#define GWTIME_8_4MS 3
+#define GWTIME_14_0MS 4
+#define GWTIME_22_4MS 5
+#define GWTIME_30_8MS 6
+#define GWTIME_39_2MS 7
+
+
+#define DEFAULT_ATIME 0xdb
+#define DEFAULT_WTIME 246
+#define DEFAULT_PROX_PPULSE 0x87
+#define DEFAULT_GESTURE_PPULSE 0x89
+#define DEFAULT_POFFSET_UR 0
+#define DEFAULT_POFFSET_DL 0
+#define DEFAULT_CONFIG1 0x60
+#define DEFAULT_LDRIVE LED_DRIVE_100MA
+#define DEFAULT_PGAIN PGAIN_4X
+#define DEFAULT_AGAIN AGAIN_4X
+#define DEFAULT_PILT 0
+#define DEFAULT_PIHT 50
+#define DEFAULT_AILT 0xFFFF
+#define DEFAULT_AIHT 0
+#define DEFAULT_PERS 0x11
+#define DEFAULT_CONFIG2 0x01
+#define DEFAULT_CONFIG3 0
+#define DEFAULT_GPENTH 40
+#define DEFAULT_GEXTH 30
+#define DEFAULT_GCONF1 0x40
+#define DEFAULT_GGAIN GGAIN_4X
+#define DEFAULT_GLDRIVE LED_DRIVE_100MA
+#define DEFAULT_GWTIME GWTIME_2_8MS
+#define DEFAULT_GOFFSET 0
+#define DEFAULT_GPULSE 0xC9
+#define DEFAULT_GCONF3 0
+#define DEFAULT_GIEN 0
+
+#define ERROR 0xFF
+
+
+enum {
+  DIR_NONE,
+  DIR_LEFT,
+  DIR_RIGHT,
+  DIR_UP,
+  DIR_DOWN,
+  DIR_ALL
+};
+
+
+enum {
+  APDS9960_NA_STATE,
+  APDS9960_ALL_STATE
+};
+
+
+typedef struct gesture_data_type {
+    uint8_t u_data[32];
+    uint8_t d_data[32];
+    uint8_t l_data[32];
+    uint8_t r_data[32];
+    uint8_t index;
+    uint8_t total_gestures;
+    uint8_t in_threshold;
+    uint8_t out_threshold;
+} gesture_data_type;
+
+
+ gesture_data_type gesture_data_;
+ int16_t gesture_ud_delta_ = 0;
+ int16_t gesture_lr_delta_ = 0;
+ int16_t gesture_ud_count_ = 0;
+ int16_t gesture_lr_count_ = 0;
+ int16_t gesture_state_ = 0;
+ int16_t gesture_motion_ = DIR_NONE;
+
+ typedef struct color_data_type {
+    uint16_t a;
+    uint16_t r;
+    uint16_t g;
+    uint16_t b;
+    uint8_t p;
+    uint16_t cct;
+    uint16_t lux;
+ } color_data_type;
+
+ color_data_type color_data;
+ uint8_t APDS9960_aTime = DEFAULT_ATIME;
+# 306 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ bool wireWriteByte(uint8_t val)
+ {
+     Wire.beginTransmission(APDS9960_I2C_ADDR);
+     Wire.write(val);
+     if( Wire.endTransmission() != 0 ) {
+         return false;
+     }
+
+     return true;
+ }
+# 325 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+int8_t wireReadDataBlock( uint8_t reg,
+                                        uint8_t *val,
+                                        uint16_t len)
+{
+    unsigned char i = 0;
+
+
+    if (!wireWriteByte(reg)) {
+        return -1;
+    }
+
+
+    Wire.requestFrom(APDS9960_I2C_ADDR, len);
+    while (Wire.available()) {
+        if (i >= len) {
+            return -1;
+        }
+        val[i] = Wire.read();
+        i++;
+    }
+
+    return i;
+}
+
+
+
+
+
+
+
+void calculateColorTemperature(void)
+{
+  float X, Y, Z;
+  float xc, yc;
+  float n;
+  float cct;
+
+
+
+
+
+  X = (-0.14282F * color_data.r) + (1.54924F * color_data.g) + (-0.95641F * color_data.b);
+  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b);
+  Z = (-0.68202F * color_data.r) + (0.77073F * color_data.g) + ( 0.56332F * color_data.b);
+
+
+  xc = (X) / (X + Y + Z);
+  yc = (Y) / (X + Y + Z);
+
+
+  n = (xc - 0.3320F) / (0.1858F - yc);
+
+
+  color_data.cct = (449.0F * FastPrecisePowf(n, 3)) + (3525.0F * FastPrecisePowf(n, 2)) + (6823.3F * n) + 5520.33F;
+
+  return;
+}
+# 392 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProxIntLowThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT) ;
+     return val;
+ }
+
+
+
+
+
+
+  void setProxIntLowThresh(uint8_t threshold)
+  {
+        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold);
+  }
+
+
+
+
+
+
+ uint8_t getProxIntHighThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
+     return val;
+ }
+
+
+
+
+
+
+
+ void setProxIntHighThresh(uint8_t threshold)
+   {
+         I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold);
+   }
+# 448 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getLEDDrive(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
+
+     val = (val >> 6) & 0b00000011;
+
+     return val;
+ }
+# 471 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setLEDDrive(uint8_t drive)
+  {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+      drive &= 0b00000011;
+      drive = drive << 6;
+      val &= 0b00111111;
+      val |= drive;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+  }
+# 500 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProximityGain(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
+
+     val = (val >> 2) & 0b00000011;
+
+     return val;
+ }
+# 523 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setProximityGain(uint8_t drive)
+ {
+     uint8_t val;
+
+
+   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+     drive &= 0b00000011;
+     drive = drive << 2;
+     val &= 0b11110011;
+     val |= drive;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+ }
+# 564 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setAmbientLightGain(uint8_t drive)
+  {
+      uint8_t val;
+
+
+      val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+      drive &= 0b00000011;
+      val &= 0b11111100;
+      val |= drive;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+  }
+# 591 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getLEDBoost(void)
+ {
+     uint8_t val;
+
+
+   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
+
+
+     val = (val >> 4) & 0b00000011;
+
+     return val;
+ }
+# 615 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setLEDBoost(uint8_t boost)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
+
+     boost &= 0b00000011;
+     boost = boost << 4;
+     val &= 0b11001111;
+     val |= boost;
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getProxGainCompEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     val = (val >> 5) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+  void setProxGainCompEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 5;
+     val &= 0b11011111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
+ }
+# 683 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProxPhotoMask(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     val &= 0b00001111;
+
+     return val;
+ }
+# 708 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setProxPhotoMask(uint8_t mask)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     mask &= 0b00001111;
+     val &= 0b11110000;
+     val |= mask;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getGestureEnterThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GPENTH) ;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureEnterThresh(uint8_t threshold)
+ {
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPENTH, threshold) ;
+
+ }
+
+
+
+
+
+
+ uint8_t getGestureExitThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GEXTH) ;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureExitThresh(uint8_t threshold)
+ {
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GEXTH, threshold) ;
+ }
+# 786 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureGain(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val = (val >> 5) & 0b00000011;
+
+     return val;
+ }
+# 810 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureGain(uint8_t gain)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     gain &= 0b00000011;
+     gain = gain << 5;
+     val &= 0b10011111;
+     val |= gain;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+# 838 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureLEDDrive(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val = (val >> 3) & 0b00000011;
+
+     return val;
+ }
+# 862 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureLEDDrive(uint8_t drive)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     drive &= 0b00000011;
+     drive = drive << 3;
+     val &= 0b11100111;
+     val |= drive;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+# 894 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureWaitTime(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val &= 0b00000111;
+
+     return val;
+ }
+# 922 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureWaitTime(uint8_t time)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     time &= 0b00000111;
+     val &= 0b11111000;
+     val |= time;
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+
+
+
+
+
+
+ void getLightIntLowThreshold(uint16_t &threshold)
+ {
+     uint8_t val_byte;
+     threshold = 0;
+
+
+     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AILTL) ;
+     threshold = val_byte;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_byte) ;
+     threshold = threshold + ((uint16_t)val_byte << 8);
+ }
+
+
+
+
+
+
+
+   void setLightIntLowThreshold(uint16_t threshold)
+   {
+       uint8_t val_low;
+       uint8_t val_high;
+
+
+       val_low = threshold & 0x00FF;
+       val_high = (threshold & 0xFF00) >> 8;
+
+
+       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTL, val_low) ;
+
+
+       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_high) ;
+
+   }
+
+
+
+
+
+
+
+ void getLightIntHighThreshold(uint16_t &threshold)
+ {
+     uint8_t val_byte;
+     threshold = 0;
+
+
+     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AIHTL);
+     threshold = val_byte;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_byte) ;
+     threshold = threshold + ((uint16_t)val_byte << 8);
+ }
+
+
+
+
+
+
+  void setLightIntHighThreshold(uint16_t threshold)
+  {
+      uint8_t val_low;
+      uint8_t val_high;
+
+
+      val_low = threshold & 0x00FF;
+      val_high = (threshold & 0xFF00) >> 8;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTL, val_low);
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_high) ;
+  }
+
+
+
+
+
+
+
+ void getProximityIntLowThreshold(uint8_t &threshold)
+ {
+     threshold = 0;
+
+
+     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT);
+
+ }
+
+
+
+
+
+
+ void setProximityIntLowThreshold(uint8_t threshold)
+ {
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold) ;
+ }
+# 1055 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void getProximityIntHighThreshold(uint8_t &threshold)
+ {
+     threshold = 0;
+
+
+     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
+
+ }
+
+
+
+
+
+
+ void setProximityIntHighThreshold(uint8_t threshold)
+ {
+
+
+   I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold) ;
+ }
+
+
+
+
+
+
+ uint8_t getAmbientLightIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     val = (val >> 4) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setAmbientLightIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE);
+
+
+     enable &= 0b00000001;
+     enable = enable << 4;
+     val &= 0b11101111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getProximityIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     val = (val >> 5) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setProximityIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 5;
+     val &= 0b11011111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getGestureIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     val = (val >> 1) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 1;
+     val &= 0b11111101;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
+ }
+
+
+
+
+
+ void clearAmbientLightInt(void)
+ {
+     uint8_t throwaway;
+     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AICLEAR);
+ }
+
+
+
+
+
+ void clearProximityInt(void)
+ {
+     uint8_t throwaway;
+     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PICLEAR) ;
+
+ }
+
+
+
+
+
+
+ uint8_t getGestureMode(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     val &= 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureMode(uint8_t mode)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     mode &= 0b00000001;
+     val &= 0b11111110;
+     val |= mode;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
+ }
+
+
+bool APDS9960_init(void)
+{
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, DEFAULT_ATIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, DEFAULT_WTIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_PROX_PPULSE) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_UR, DEFAULT_POFFSET_UR) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_DL, DEFAULT_POFFSET_DL) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG1, DEFAULT_CONFIG1) ;
+
+    setLEDDrive(DEFAULT_LDRIVE);
+
+    setProximityGain(DEFAULT_PGAIN);
+
+    setAmbientLightGain(DEFAULT_AGAIN);
+
+    setProxIntLowThresh(DEFAULT_PILT) ;
+
+    setProxIntHighThresh(DEFAULT_PIHT);
+
+    setLightIntLowThreshold(DEFAULT_AILT) ;
+
+    setLightIntHighThreshold(DEFAULT_AIHT) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PERS, DEFAULT_PERS) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, DEFAULT_CONFIG2) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, DEFAULT_CONFIG3) ;
+
+
+    setGestureEnterThresh(DEFAULT_GPENTH);
+
+    setGestureExitThresh(DEFAULT_GEXTH) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF1, DEFAULT_GCONF1) ;
+
+    setGestureGain(DEFAULT_GGAIN) ;
+
+    setGestureLEDDrive(DEFAULT_GLDRIVE) ;
+
+    setGestureWaitTime(DEFAULT_GWTIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_U, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_D, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_L, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_R, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPULSE, DEFAULT_GPULSE) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF3, DEFAULT_GCONF3) ;
+
+    setGestureIntEnable(DEFAULT_GIEN);
+
+    disablePower();
+
+    return true;
+}
+# 1333 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+uint8_t getMode(void)
+{
+    uint8_t enable_value;
+
+
+     enable_value = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+    return enable_value;
+}
+
+
+
+
+
+
+
+void setMode(uint8_t mode, uint8_t enable)
+{
+    uint8_t reg_val;
+
+
+    reg_val = getMode();
+
+
+
+    enable = enable & 0x01;
+    if( mode >= 0 && mode <= 6 ) {
+        if (enable) {
+            reg_val |= (1 << mode);
+        } else {
+            reg_val &= ~(1 << mode);
+        }
+    } else if( mode == ALL ) {
+        if (enable) {
+            reg_val = 0x7F;
+        } else {
+            reg_val = 0x00;
+        }
+    }
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, reg_val) ;
+}
+
+
+
+
+
+
+void enableLightSensor(void)
+{
+
+    setAmbientLightGain(DEFAULT_AGAIN);
+    setAmbientLightIntEnable(0);
+    enablePower() ;
+    setMode(AMBIENT_LIGHT, 1) ;
+}
+
+
+
+
+
+void disableLightSensor(void)
+{
+    setAmbientLightIntEnable(0) ;
+    setMode(AMBIENT_LIGHT, 0) ;
+}
+
+
+
+
+
+
+void enableProximitySensor(void)
+{
+
+    setProximityGain(DEFAULT_PGAIN);
+    setLEDDrive(DEFAULT_LDRIVE) ;
+    setProximityIntEnable(0) ;
+    enablePower();
+    setMode(PROXIMITY, 1) ;
+}
+
+
+
+
+
+void disableProximitySensor(void)
+{
+ setProximityIntEnable(0) ;
+  setMode(PROXIMITY, 0) ;
+}
+
+
+
+
+
+
+void enableGestureSensor(void)
+{
+
+
+
+
+
+
+
+    resetGestureParameters();
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, 0xFF) ;
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_GESTURE_PPULSE) ;
+    setLEDBoost(LED_BOOST_100);
+    setGestureIntEnable(0) ;
+    setGestureMode(1);
+    enablePower() ;
+    setMode(WAIT, 1) ;
+    setMode(PROXIMITY, 1) ;
+    setMode(GESTURE, 1);
+}
+
+
+
+
+
+void disableGestureSensor(void)
+{
+    resetGestureParameters();
+    setGestureIntEnable(0) ;
+    setGestureMode(0) ;
+    setMode(GESTURE, 0) ;
+}
+
+
+
+
+
+
+bool isGestureAvailable(void)
+{
+    uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS) ;
+
+
+    val &= APDS9960_GVALID;
+
+
+    if( val == 1) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+
+
+
+
+int16_t readGesture(void)
+{
+    uint8_t fifo_level = 0;
+    uint8_t bytes_read = 0;
+    uint8_t fifo_data[128];
+    uint8_t gstatus;
+    uint16_t motion;
+    uint16_t i;
+    uint8_t gesture_loop_counter = 0;
+
+
+    if( !isGestureAvailable() || !(getMode() & 0b01000001) ) {
+        return DIR_NONE;
+    }
+
+
+    while(1) {
+        if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){
+          disableGestureSensor();
+          APDS9960_overload = true;
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("Sensor overload"));
+        }
+        gesture_loop_counter += 1;
+
+        delay(FIFO_PAUSE_TIME);
+
+
+       gstatus = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS);
+
+
+        if( (gstatus & APDS9960_GVALID) == APDS9960_GVALID ) {
+
+
+            fifo_level = I2cRead8(APDS9960_I2C_ADDR,APDS9960_GFLVL) ;
+
+
+            if( fifo_level > 0) {
+                bytes_read = wireReadDataBlock( APDS9960_GFIFO_U,
+                                                (uint8_t*)fifo_data,
+                                                (fifo_level * 4) );
+                if( bytes_read == -1 ) {
+                    return ERROR;
+                }
+
+
+                if( bytes_read >= 4 ) {
+                    for( i = 0; i < bytes_read; i += 4 ) {
+                        gesture_data_.u_data[gesture_data_.index] = \
+                                                            fifo_data[i + 0];
+                        gesture_data_.d_data[gesture_data_.index] = \
+                                                            fifo_data[i + 1];
+                        gesture_data_.l_data[gesture_data_.index] = \
+                                                            fifo_data[i + 2];
+                        gesture_data_.r_data[gesture_data_.index] = \
+                                                            fifo_data[i + 3];
+                        gesture_data_.index++;
+                        gesture_data_.total_gestures++;
+                    }
+
+                    if( processGestureData() ) {
+                        if( decodeGesture() ) {
+
+                        }
+                    }
+
+                    gesture_data_.index = 0;
+                    gesture_data_.total_gestures = 0;
+                }
+            }
+        } else {
+
+
+            delay(FIFO_PAUSE_TIME);
+            decodeGesture();
+            motion = gesture_motion_;
+            resetGestureParameters();
+            return motion;
+        }
+    }
+}
+
+
+
+
+
+void enablePower(void)
+{
+    setMode(POWER, 1) ;
+}
+
+
+
+
+
+void disablePower(void)
+{
+    setMode(POWER, 0) ;
+}
+# 1600 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+void readAllColorAndProximityData(void)
+{
+  if (I2cReadBuffer(APDS9960_I2C_ADDR, APDS9960_CDATAL, (uint8_t *) &color_data, (uint16_t)9))
+  {
+
+
+  }
+}
+# 1616 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+void resetGestureParameters(void)
+{
+    gesture_data_.index = 0;
+    gesture_data_.total_gestures = 0;
+
+    gesture_ud_delta_ = 0;
+    gesture_lr_delta_ = 0;
+
+    gesture_ud_count_ = 0;
+    gesture_lr_count_ = 0;
+
+    gesture_state_ = 0;
+    gesture_motion_ = DIR_NONE;
+}
+
+
+
+
+
+
+bool processGestureData(void)
+{
+    uint8_t u_first = 0;
+    uint8_t d_first = 0;
+    uint8_t l_first = 0;
+    uint8_t r_first = 0;
+    uint8_t u_last = 0;
+    uint8_t d_last = 0;
+    uint8_t l_last = 0;
+    uint8_t r_last = 0;
+    uint16_t ud_ratio_first;
+    uint16_t lr_ratio_first;
+    uint16_t ud_ratio_last;
+    uint16_t lr_ratio_last;
+    uint16_t ud_delta;
+    uint16_t lr_delta;
+    uint16_t i;
+
+
+    if( gesture_data_.total_gestures <= 4 ) {
+        return false;
+    }
+
+
+    if( (gesture_data_.total_gestures <= 32) && \
+        (gesture_data_.total_gestures > 0) ) {
+
+
+        for( i = 0; i < gesture_data_.total_gestures; i++ ) {
+            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
+
+                u_first = gesture_data_.u_data[i];
+                d_first = gesture_data_.d_data[i];
+                l_first = gesture_data_.l_data[i];
+                r_first = gesture_data_.r_data[i];
+                break;
+            }
+        }
+
+
+        if( (u_first == 0) || (d_first == 0) || \
+            (l_first == 0) || (r_first == 0) ) {
+
+            return false;
+        }
+
+        for( i = gesture_data_.total_gestures - 1; i >= 0; i-- ) {
+
+            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
+
+                u_last = gesture_data_.u_data[i];
+                d_last = gesture_data_.d_data[i];
+                l_last = gesture_data_.l_data[i];
+                r_last = gesture_data_.r_data[i];
+                break;
+            }
+        }
+    }
+
+
+    ud_ratio_first = ((u_first - d_first) * 100) / (u_first + d_first);
+    lr_ratio_first = ((l_first - r_first) * 100) / (l_first + r_first);
+    ud_ratio_last = ((u_last - d_last) * 100) / (u_last + d_last);
+    lr_ratio_last = ((l_last - r_last) * 100) / (l_last + r_last);
+
+
+    ud_delta = ud_ratio_last - ud_ratio_first;
+    lr_delta = lr_ratio_last - lr_ratio_first;
+
+
+    gesture_ud_delta_ += ud_delta;
+    gesture_lr_delta_ += lr_delta;
+
+
+    if( gesture_ud_delta_ >= GESTURE_SENSITIVITY_1 ) {
+        gesture_ud_count_ = 1;
+    } else if( gesture_ud_delta_ <= -GESTURE_SENSITIVITY_1 ) {
+        gesture_ud_count_ = -1;
+    } else {
+        gesture_ud_count_ = 0;
+    }
+
+
+    if( gesture_lr_delta_ >= GESTURE_SENSITIVITY_1 ) {
+        gesture_lr_count_ = 1;
+    } else if( gesture_lr_delta_ <= -GESTURE_SENSITIVITY_1 ) {
+        gesture_lr_count_ = -1;
+    } else {
+        gesture_lr_count_ = 0;
+    }
+    return false;
+}
+
+
+
+
+
+
+bool decodeGesture(void)
+{
+
+
+    if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 0) ) {
+        gesture_motion_ = DIR_UP;
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 0) ) {
+        gesture_motion_ = DIR_DOWN;
+    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == 1) ) {
+        gesture_motion_ = DIR_RIGHT;
+    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == -1) ) {
+        gesture_motion_ = DIR_LEFT;
+    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_UP;
+        } else {
+            gesture_motion_ = DIR_RIGHT;
+        }
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == -1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_DOWN;
+        } else {
+            gesture_motion_ = DIR_LEFT;
+        }
+    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == -1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_UP;
+        } else {
+            gesture_motion_ = DIR_LEFT;
+        }
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_DOWN;
+        } else {
+            gesture_motion_ = DIR_RIGHT;
+        }
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+void handleGesture(void) {
+    if (isGestureAvailable() ) {
+    switch (readGesture()) {
+      case DIR_UP:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("UP"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up"));
+        break;
+      case DIR_DOWN:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("DOWN"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down"));
+        break;
+      case DIR_LEFT:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LEFT"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
+        break;
+      case DIR_RIGHT:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("RIGHT"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
+        break;
+      default:
+      if(APDS9960_overload)
+      {
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LONG"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
+      }
+      else{
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("NONE"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
+      }
+    }
+    MqttPublishSensor();
+  }
+}
+
+void APDS9960_adjustATime(void)
+{
+
+  I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);
+
+
+  if (color_data.a < (uint16_t)20){
+    APDS9960_aTime = 0x40;
+  }
+  else if (color_data.a < (uint16_t)40){
+    APDS9960_aTime = 0x80;
+  }
+  else if (color_data.a < (uint16_t)50){
+    APDS9960_aTime = DEFAULT_ATIME;
+  }
+  else if (color_data.a < (uint16_t)70){
+    APDS9960_aTime = 0xc0;
+  }
+  if (color_data.a < 200){
+    APDS9960_aTime = 0xe9;
+  }
+
+
+
+  else{
+    APDS9960_aTime = 0xff;
+  }
+
+
+  I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, APDS9960_aTime);
+  enablePower();
+  enableLightSensor();
+  delay(20);
+}
+
+
+void APDS9960_loop(void)
+{
+  if (recovery_loop_counter > 0){
+    recovery_loop_counter -= 1;
+  }
+  if (recovery_loop_counter == 1 && APDS9960_overload){
+    enableGestureSensor();
+    APDS9960_overload = false;
+    Response_P(PSTR("{\"Gesture\":\"On\"}"));
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+    gesture_mode = 1;
+  }
+
+  if (gesture_mode) {
+      if (recovery_loop_counter == 0){
+      handleGesture();
+
+        if (APDS9960_overload)
+        {
+        disableGestureSensor();
+        recovery_loop_counter = APDS9960_LONG_RECOVERY;
+        Response_P(PSTR("{\"Gesture\":\"Off\"}"));
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+        gesture_mode = 0;
+        }
+      }
+  }
+}
+
+void APDS9960_detect(void)
+{
+  if (APDS9960type || I2cActive(APDS9960_I2C_ADDR)) { return; }
+
+  APDS9960type = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ID);
+  if (APDS9960type == APDS9960_CHIPID_1 || APDS9960type == APDS9960_CHIPID_2) {
+    if (APDS9960_init()) {
+      I2cSetActiveFound(APDS9960_I2C_ADDR, APDS9960stype);
+
+      enableProximitySensor();
+      enableGestureSensor();
+    } else {
+      APDS9960type = 0;
+    }
+  } else {
+    APDS9960type = 0;
+  }
+  currentGesture[0] = '\0';
+}
+
+
+
+
+
+void APDS9960_show(bool json)
+{
+  if (!APDS9960type) { return; }
+
+  if (!gesture_mode && !APDS9960_overload) {
+    char red_chr[10];
+    char green_chr[10];
+    char blue_chr[10];
+    char ambient_chr[10];
+    char cct_chr[10];
+    char prox_chr[10];
+
+    readAllColorAndProximityData();
+
+    sprintf (ambient_chr, "%u", color_data.a/4);
+    sprintf (red_chr, "%u", color_data.r);
+    sprintf (green_chr, "%u", color_data.g);
+    sprintf (blue_chr, "%u", color_data.b );
+    sprintf (prox_chr, "%u", color_data.p );
+
+
+
+
+
+    calculateColorTemperature();
+    sprintf (cct_chr, "%u", color_data.cct);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"CCT\":%s,\"Proximity\":%s}"),
+        APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_APDS_9960_SNS, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr );
+#endif
+    }
+  }
+  else {
+    if (json && (currentGesture[0] != '\0' )) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":1}"), APDS9960stype, currentGesture);
+      currentGesture[0] = '\0';
+    }
+  }
+}
+# 1961 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
+bool APDS9960CommandSensor(void)
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      disableGestureSensor();
+      gesture_mode = 0;
+      enableLightSensor();
+      APDS9960_overload = false;
+      break;
+    case 1:
+      if (APDS9960type) {
+        setGestureGain(DEFAULT_GGAIN);
+        setProximityGain(DEFAULT_PGAIN);
+        disableLightSensor();
+        enableGestureSensor();
+        gesture_mode = 1;
+      }
+      break;
+    case 2:
+      if (APDS9960type) {
+        setGestureGain(GGAIN_2X);
+        setProximityGain(PGAIN_2X);
+        disableLightSensor();
+        enableGestureSensor();
+        gesture_mode = 1;
+      }
+      break;
+    default:
+      int temp_aTime = (uint8_t)XdrvMailbox.payload;
+      if (temp_aTime > 2 && temp_aTime < 256){
+        disablePower();
+        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, temp_aTime);
+        enablePower();
+        enableLightSensor();
+      }
+    break;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_27, GetStateText(gesture_mode));
+
+  return serviced;
+}
+
+
+
+
+
+bool Xsns27(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_21)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    APDS9960_detect();
+  }
+  else if (APDS9960type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+          APDS9960_loop();
+          break;
+      case FUNC_COMMAND_SENSOR:
+          if (XSNS_27 == XdrvMailbox.index) {
+          result = APDS9960CommandSensor();
+          }
+          break;
+      case FUNC_JSON_APPEND:
+          APDS9960_show(1);
+          break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        APDS9960_show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
+#ifdef USE_TM1638
+
+
+
+
+
+
+#define XSNS_28 28
+
+#define TM1638_COLOR_NONE 0
+#define TM1638_COLOR_RED 1
+#define TM1638_COLOR_GREEN 2
+
+#define TM1638_CLOCK_DELAY 1
+
+uint8_t tm1638_type = 1;
+uint8_t tm1638_clock_pin = 0;
+uint8_t tm1638_data_pin = 0;
+uint8_t tm1638_strobe_pin = 0;
+uint8_t tm1638_displays = 8;
+uint8_t tm1638_active_display = 1;
+uint8_t tm1638_intensity = 0;
+uint8_t tm1638_state = 0;
+
+
+
+
+
+
+void Tm16XXSend(uint8_t data)
+{
+ for (uint32_t i = 0; i < 8; i++) {
+    digitalWrite(tm1638_data_pin, !!(data & (1 << i)));
+    digitalWrite(tm1638_clock_pin, LOW);
+    delayMicroseconds(TM1638_CLOCK_DELAY);
+    digitalWrite(tm1638_clock_pin, HIGH);
+  }
+}
+
+void Tm16XXSendCommand(uint8_t cmd)
+{
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(cmd);
+  digitalWrite(tm1638_strobe_pin, HIGH);
+}
+
+void TM16XXSendData(uint8_t address, uint8_t data)
+{
+  Tm16XXSendCommand(0x44);
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(0xC0 | address);
+  Tm16XXSend(data);
+  digitalWrite(tm1638_strobe_pin, HIGH);
+}
+
+uint8_t Tm16XXReceive(void)
+{
+  uint8_t temp = 0;
+
+
+  pinMode(tm1638_data_pin, INPUT);
+  digitalWrite(tm1638_data_pin, HIGH);
+
+  for (uint32_t i = 0; i < 8; ++i) {
+    digitalWrite(tm1638_clock_pin, LOW);
+    delayMicroseconds(TM1638_CLOCK_DELAY);
+    temp |= digitalRead(tm1638_data_pin) << i;
+    digitalWrite(tm1638_clock_pin, HIGH);
+  }
+
+
+  pinMode(tm1638_data_pin, OUTPUT);
+  digitalWrite(tm1638_data_pin, LOW);
+
+  return temp;
+}
+
+
+
+void Tm16XXClearDisplay(void)
+{
+  for (uint32_t i = 0; i < tm1638_displays; i++) {
+    TM16XXSendData(i << 1, 0);
+  }
+}
+
+void Tm1638SetLED(uint8_t color, uint8_t pos)
+{
+  TM16XXSendData((pos << 1) + 1, color);
+}
+
+void Tm1638SetLEDs(word leds)
+{
+  for (uint32_t i = 0; i < tm1638_displays; i++) {
+    uint8_t color = 0;
+
+    if ((leds & (1 << i)) != 0) {
+      color |= TM1638_COLOR_RED;
+    }
+
+    if ((leds & (1 << (i + 8))) != 0) {
+      color |= TM1638_COLOR_GREEN;
+    }
+
+    Tm1638SetLED(color, i);
+  }
+}
+
+uint8_t Tm1638GetButtons(void)
+{
+  uint8_t keys = 0;
+
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(0x42);
+  for (uint32_t i = 0; i < 4; i++) {
+    keys |= Tm16XXReceive() << i;
+  }
+  digitalWrite(tm1638_strobe_pin, HIGH);
+
+  return keys;
+}
+
+
+
+void TmInit(void)
+{
+  tm1638_type = 0;
+  if ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99)) {
+    tm1638_clock_pin = pin[GPIO_TM16CLK];
+    tm1638_data_pin = pin[GPIO_TM16DIO];
+    tm1638_strobe_pin = pin[GPIO_TM16STB];
+
+    pinMode(tm1638_data_pin, OUTPUT);
+    pinMode(tm1638_clock_pin, OUTPUT);
+    pinMode(tm1638_strobe_pin, OUTPUT);
+
+    digitalWrite(tm1638_strobe_pin, HIGH);
+    digitalWrite(tm1638_clock_pin, HIGH);
+
+    Tm16XXSendCommand(0x40);
+    Tm16XXSendCommand(0x80 | (tm1638_active_display ? 8 : 0) | tmin(7, tm1638_intensity));
+
+    digitalWrite(tm1638_strobe_pin, LOW);
+    Tm16XXSend(0xC0);
+    for (uint32_t i = 0; i < 16; i++) {
+      Tm16XXSend(0x00);
+    }
+    digitalWrite(tm1638_strobe_pin, HIGH);
+
+    tm1638_type = 1;
+    tm1638_state = 1;
+  }
+}
+
+void TmLoop(void)
+{
+  if (tm1638_state) {
+    uint8_t buttons = Tm1638GetButtons();
+    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+      SwitchSetVirtual(i, (buttons &1) ^1);
+      uint8_t color = (SwitchGetVirtual(i)) ? TM1638_COLOR_NONE : TM1638_COLOR_RED;
+      Tm1638SetLED(color, i);
+      buttons >>= 1;
+    }
+    SwitchHandler(1);
+  }
+}
+# 201 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
+bool Xsns28(uint8_t function)
+{
+  bool result = false;
+
+  if (tm1638_type) {
+    switch (function) {
+      case FUNC_INIT:
+        TmInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        TmLoop();
+        break;
+# 223 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+#ifdef USE_I2C
+#ifdef USE_MCP230xx
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+#define XSNS_29 29
+#define XI2C_22 22
+
+
+
+
+
+uint8_t MCP230xx_IODIR = 0x00;
+uint8_t MCP230xx_GPINTEN = 0x02;
+uint8_t MCP230xx_IOCON = 0x05;
+uint8_t MCP230xx_GPPU = 0x06;
+uint8_t MCP230xx_INTF = 0x07;
+uint8_t MCP230xx_INTCAP = 0x08;
+uint8_t MCP230xx_GPIO = 0x09;
+
+uint8_t mcp230xx_type = 0;
+uint8_t mcp230xx_pincount = 0;
+uint8_t mcp230xx_int_en = 0;
+uint8_t mcp230xx_int_prio_counter = 0;
+uint8_t mcp230xx_int_counter_en = 0;
+uint8_t mcp230xx_int_retainer_en = 0;
+uint8_t mcp230xx_int_sec_counter = 0;
+
+uint8_t mcp230xx_int_report_defer_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+uint16_t mcp230xx_int_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+uint8_t mcp230xx_int_retainer[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+unsigned long int_millis[16];
+
+const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL_UP\":\"%s\",\"INT_MODE\":\"%s\",\"STATE\":\"%s\"}}";
+
+const char MCP230XX_INTCFG_RESPONSE[] PROGMEM = "{\"MCP230xx_INT%s\":{\"D_%i\":%i}}";
+
+#ifdef USE_MCP230xx_OUTPUT
+const char MCP230XX_CMND_RESPONSE[] PROGMEM = "{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"}}";
+#endif
+
+void MCP230xx_CheckForIntCounter(void) {
+  uint8_t en = 0;
+  for (uint32_t ca=0;ca<16;ca++) {
+    if (Settings.mcp230xx_config[ca].int_count_en) {
+      en=1;
+    }
+  }
+  if (!Settings.mcp230xx_int_timer) en=0;
+  mcp230xx_int_counter_en=en;
+  if (!mcp230xx_int_counter_en) {
+    for (uint32_t ca=0;ca<16;ca++) {
+      mcp230xx_int_counter[ca] = 0;
+    }
+  }
+}
+
+void MCP230xx_CheckForIntRetainer(void) {
+  uint8_t en = 0;
+  for (uint32_t ca=0;ca<16;ca++) {
+    if (Settings.mcp230xx_config[ca].int_retain_flag) {
+      en=1;
+    }
+  }
+  mcp230xx_int_retainer_en=en;
+  if (!mcp230xx_int_retainer_en) {
+    for (uint32_t ca=0;ca<16;ca++) {
+      mcp230xx_int_retainer[ca] = 0;
+    }
+  }
+}
+
+const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) {
+#ifdef USE_MCP230xx_OUTPUT
+if ((6 == pinmod) && (statu < 2)) { statu = abs(statu-1); }
+#endif
+  switch (statu) {
+    case 0:
+      return "OFF";
+      break;
+    case 1:
+      return "ON";
+      break;
+#ifdef USE_MCP230xx_OUTPUT
+    case 2:
+      return "TOGGLE";
+      break;
+#endif
+  }
+  return "";
+}
+
+const char* IntModeTxt(uint8_t intmo) {
+  switch (intmo) {
+    case 0:
+      return "ALL";
+      break;
+    case 1:
+      return "EVENT";
+      break;
+    case 2:
+      return "TELE";
+      break;
+    case 3:
+      return "DISABLED";
+      break;
+  }
+  return "";
+}
+
+uint8_t MCP230xx_readGPIO(uint8_t port) {
+  return I2cRead8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port);
+}
+
+void MCP230xx_ApplySettings(void)
+{
+  uint8_t int_en = 0;
+  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
+    uint8_t reg_gppu = 0;
+    uint8_t reg_gpinten = 0;
+    uint8_t reg_iodir = 0xFF;
+#ifdef USE_MCP230xx_OUTPUT
+    uint8_t reg_portpins = 0x00;
+#endif
+    for (uint32_t idx = 0; idx < 8; idx++) {
+      switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) {
+        case 0 ... 1:
+          reg_iodir |= (1 << idx);
+          break;
+        case 2 ... 4:
+          reg_iodir |= (1 << idx);
+          reg_gpinten |= (1 << idx);
+          int_en = 1;
+          break;
+#ifdef USE_MCP230xx_OUTPUT
+        case 5 ... 6:
+          reg_iodir &= ~(1 << idx);
+          if (Settings.flag.save_state) {
+            reg_portpins |= (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].saved_state << idx);
+          } else {
+            if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
+              reg_portpins |= (1 << idx);
+            }
+          }
+          break;
+#endif
+        default:
+          break;
+      }
+#ifdef USE_MCP230xx_OUTPUT
+      if ((Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) {
+        reg_gppu |= (1 << idx);
+      }
+#else
+      if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
+        reg_gppu |= (1 << idx);
+      }
+#endif
+    }
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPPU+mcp230xx_port, reg_gppu);
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten);
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IODIR+mcp230xx_port, reg_iodir);
+#ifdef USE_MCP230xx_OUTPUT
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO+mcp230xx_port, reg_portpins);
+#endif
+  }
+  for (uint32_t idx=0;idx<mcp230xx_pincount;idx++) {
+    int_millis[idx]=millis();
+  }
+  mcp230xx_int_en = int_en;
+  MCP230xx_CheckForIntCounter();
+  MCP230xx_CheckForIntRetainer();
+}
+
+void MCP230xx_Detect(void)
+{
+  if (I2cActive(USE_MCP230xx_ADDR)) { return; }
+
+  uint8_t buffer;
+
+  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x80);
+  if (I2cValidRead8(&buffer, USE_MCP230xx_ADDR, MCP230xx_IOCON)) {
+    if (0x00 == buffer) {
+      mcp230xx_type = 1;
+      I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23008");
+      mcp230xx_pincount = 8;
+      MCP230xx_ApplySettings();
+    } else {
+      if (0x80 == buffer) {
+        mcp230xx_type = 2;
+        I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23017");
+        mcp230xx_pincount = 16;
+
+        I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x00);
+
+        MCP230xx_GPINTEN = 0x04;
+        MCP230xx_GPPU = 0x0C;
+        MCP230xx_INTF = 0x0E;
+        MCP230xx_INTCAP = 0x10;
+        MCP230xx_GPIO = 0x12;
+        MCP230xx_ApplySettings();
+      }
+    }
+  }
+}
+
+void MCP230xx_CheckForInterrupt(void) {
+  uint8_t intf;
+  uint8_t mcp230xx_intcap = 0;
+  uint8_t report_int;
+  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
+    if (I2cValidRead8(&intf,USE_MCP230xx_ADDR,MCP230xx_INTF+mcp230xx_port)) {
+      if (intf > 0) {
+        if (I2cValidRead8(&mcp230xx_intcap, USE_MCP230xx_ADDR, MCP230xx_INTCAP+mcp230xx_port)) {
+          for (uint32_t intp = 0; intp < 8; intp++) {
+            if ((intf >> intp) & 0x01) {
+              report_int = 0;
+              if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode > 1) {
+                switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode) {
+                  case 2:
+                    report_int = 1;
+                    break;
+                  case 3:
+                    if (((mcp230xx_intcap >> intp) & 0x01) == 0) report_int = 1;
+                    break;
+                  case 4:
+                    if (((mcp230xx_intcap >> intp) & 0x01) == 1) report_int = 1;
+                    break;
+                  default:
+                    break;
+                }
+
+                if ((mcp230xx_int_counter_en) && (report_int)) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
+                    mcp230xx_int_counter[intp+(mcp230xx_port*8)]++;
+                  }
+                }
+
+                if (report_int) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
+                    mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]++;
+                    if (mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)] >= Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
+                      mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]=0;
+                    } else {
+                      report_int = 0;
+                    }
+                  }
+                }
+
+                if (report_int) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_retain_flag) {
+                    mcp230xx_int_retainer[intp+(mcp230xx_port*8)] = 1;
+                    report_int = 0;
+                  }
+                }
+                if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
+                  report_int = 0;
+                }
+                if (report_int) {
+                  bool int_tele = false;
+                  bool int_event = false;
+                  unsigned long millis_now = millis();
+                  unsigned long millis_since_last_int = millis_now - int_millis[intp+(mcp230xx_port*8)];
+                  int_millis[intp+(mcp230xx_port*8)]=millis_now;
+                  switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_mode) {
+                    case 0:
+                      int_tele=true;
+                      int_event=true;
+                      break;
+                    case 1:
+                      int_event=true;
+                      break;
+                    case 2:
+                      int_tele=true;
+                      break;
+                  }
+                  if (int_tele) {
+                    ResponseTime_P(PSTR(",\"MCP230XX_INT\":{\"D%i\":%i,\"MS\":%lu}}"),
+                      intp+(mcp230xx_port*8), ((mcp230xx_intcap >> intp) & 0x01),millis_since_last_int);
+                    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("MCP230XX_INT"));
+                  }
+                  if (int_event) {
+                    char command[19];
+                    sprintf(command,"event MCPINT_D%i=%i",intp+(mcp230xx_port*8),((mcp230xx_intcap >> intp) & 0x01));
+                    ExecuteCommand(command, SRC_RULE);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void MCP230xx_Show(bool json)
+{
+  if (json) {
+    uint8_t gpio = MCP230xx_readGPIO(0);
+    ResponseAppend_P(PSTR(",\"MCP230XX\":{\"D0\":%i,\"D1\":%i,\"D2\":%i,\"D3\":%i,\"D4\":%i,\"D5\":%i,\"D6\":%i,\"D7\":%i"),
+                (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
+    if (2 == mcp230xx_type) {
+      gpio = MCP230xx_readGPIO(1);
+      ResponseAppend_P(PSTR(",\"D8\":%i,\"D9\":%i,\"D10\":%i,\"D11\":%i,\"D12\":%i,\"D13\":%i,\"D14\":%i,\"D15\":%i"),
+                  (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
+    }
+    ResponseJsonEnd();
+  }
+}
+
+#ifdef USE_MCP230xx_OUTPUT
+
+void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
+  uint8_t portpins;
+  uint8_t port = 0;
+  uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode;
+  uint8_t interlock = Settings.flag.interlock;
+  int pinadd = (pin % 2)+1-(3*(pin % 2));
+  char cmnd[7], stt[4];
+  if (pin > 7) { port = 1; }
+  portpins = MCP230xx_readGPIO(port);
+  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
+    if (pinstate < 2) {
+      if (6 == pinmo) {
+        if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins |= (1 << (pin+pinadd-(port*8))),portpins &= ~(1 << (pin-(port*8)));
+      } else {
+        if (pinstate) portpins &= ~(1 << (pin+pinadd-(port*8))),portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
+      }
+    } else {
+      if (6 == pinmo) {
+      portpins |= (1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
+      } else {
+      portpins &= ~(1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
+      }
+    }
+  } else {
+    if (pinstate < 2) {
+      if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
+    } else {
+      portpins ^= (1 << (pin-(port*8)));
+    }
+  }
+  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port, portpins);
+  if (Settings.flag.save_state) {
+    Settings.mcp230xx_config[pin].saved_state=portpins>>(pin-(port*8))&1;
+    Settings.mcp230xx_config[pin+pinadd].saved_state=portpins>>(pin+pinadd-(port*8))&1;
+  }
+  sprintf(cmnd,ConvertNumTxt(pinstate, pinmo));
+  sprintf(stt,ConvertNumTxt((portpins >> (pin-(port*8))&1), pinmo));
+  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
+    char stt1[4];
+    sprintf(stt1,ConvertNumTxt((portpins >> (pin+pinadd-(port*8))&1), pinmo));
+    Response_P(PSTR("{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"},\"S29cmnd_D%i\":{\"STATE\":\"%s\"}}"),pin, cmnd, stt, pin+pinadd, stt1);
+  } else {
+    Response_P(MCP230XX_CMND_RESPONSE, pin, cmnd, stt);
+  }
+}
+
+#endif
+
+void MCP230xx_Reset(uint8_t pinmode) {
+  uint8_t pullup = 0;
+  if ((pinmode > 1) && (pinmode < 5)) { pullup=1; }
+  for (uint32_t pinx=0;pinx<16;pinx++) {
+    Settings.mcp230xx_config[pinx].pinmode=pinmode;
+    Settings.mcp230xx_config[pinx].pullup=pullup;
+    Settings.mcp230xx_config[pinx].saved_state=0;
+    if ((pinmode > 1) && (pinmode < 5)) {
+      Settings.mcp230xx_config[pinx].int_report_mode=0;
+    } else {
+      Settings.mcp230xx_config[pinx].int_report_mode=3;
+    }
+    Settings.mcp230xx_config[pinx].int_report_defer=0;
+    Settings.mcp230xx_config[pinx].int_count_en=0;
+    Settings.mcp230xx_config[pinx].int_retain_flag=0;
+    Settings.mcp230xx_config[pinx].spare13=0;
+    Settings.mcp230xx_config[pinx].spare14=0;
+    Settings.mcp230xx_config[pinx].spare15=0;
+  }
+  Settings.mcp230xx_int_prio = 0;
+  Settings.mcp230xx_int_timer = 0;
+  MCP230xx_ApplySettings();
+  char pulluptxt[7];
+  char intmodetxt[9];
+  sprintf(pulluptxt,ConvertNumTxt(pullup));
+  uint8_t intmode = 3;
+  if ((pinmode > 1) && (pinmode < 5)) { intmode = 0; }
+  sprintf(intmodetxt,IntModeTxt(intmode));
+  Response_P(MCP230XX_SENSOR_RESPONSE,99,pinmode,pulluptxt,intmodetxt,"");
+}
+
+bool MCP230xx_Command(void)
+{
+  bool serviced = true;
+  bool validpin = false;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { MCP230xx_Reset(1); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET1")) { MCP230xx_Reset(1); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET2")) { MCP230xx_Reset(2); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET3")) { MCP230xx_Reset(3); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET4")) { MCP230xx_Reset(4); return serviced; }
+#ifdef USE_MCP230xx_OUTPUT
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET5")) { MCP230xx_Reset(5); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET6")) { MCP230xx_Reset(6); return serviced; }
+#endif
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTPRI")) {
+    if (paramcount > 1) {
+      uint8_t intpri = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((intpri >= 0) && (intpri <= 20)) {
+        Settings.mcp230xx_int_prio = intpri;
+        Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
+        return serviced;
+      }
+    } else {
+      Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTTIMER")) {
+    if (paramcount > 1) {
+      uint8_t inttim = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((inttim >= 0) && (inttim <= 3600)) {
+        Settings.mcp230xx_int_timer = inttim;
+        MCP230xx_CheckForIntCounter();
+        Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
+        return serviced;
+      }
+    } else {
+      Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTDEF")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t intdef = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((intdef >= 0) && (intdef <= 15)) {
+            Settings.mcp230xx_config[pin].int_report_defer=intdef;
+            if (Settings.mcp230xx_config[pin].int_count_en) {
+              Settings.mcp230xx_config[pin].int_count_en=0;
+              MCP230xx_CheckForIntCounter();
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTCNT for pin D%i"),pin);
+            }
+            Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTCNT")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t intcnt = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((intcnt >= 0) && (intcnt <= 1)) {
+            Settings.mcp230xx_config[pin].int_count_en=intcnt;
+            if (Settings.mcp230xx_config[pin].int_report_defer) {
+              Settings.mcp230xx_config[pin].int_report_defer=0;
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTDEF for pin D%i"),pin);
+            }
+            if (Settings.mcp230xx_config[pin].int_report_mode < 3) {
+              Settings.mcp230xx_config[pin].int_report_mode=3;
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled immediate interrupt/telemetry reporting for pin D%i"),pin);
+            }
+            if ((Settings.mcp230xx_config[pin].int_count_en) && (!Settings.mcp230xx_int_timer)) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - INTCNT enabled for pin D%i but global INTTIMER is disabled!"),pin);
+            }
+            MCP230xx_CheckForIntCounter();
+            Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTRETAIN")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t int_retain = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((int_retain >= 0) && (int_retain <= 1)) {
+            Settings.mcp230xx_config[pin].int_retain_flag=int_retain;
+            Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
+            MCP230xx_CheckForIntRetainer();
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+
+  if (pin < mcp230xx_pincount) {
+    if (0 == pin) {
+      if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1), "0")) validpin=true;
+    } else {
+      validpin=true;
+    }
+  }
+  if (validpin && (paramcount > 1)) {
+    if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "?")) {
+      uint8_t port = 0;
+      if (pin > 7) { port = 1; }
+      uint8_t portdata = MCP230xx_readGPIO(port);
+      char pulluptxtr[7],pinstatustxtr[7];
+      char intmodetxt[9];
+      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
+      sprintf(pulluptxtr,ConvertNumTxt(Settings.mcp230xx_config[pin].pullup));
+#ifdef USE_MCP230xx_OUTPUT
+      uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode;
+      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod));
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,intmodetxt,pinstatustxtr);
+#else
+      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1));
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,intmodetxt,pinstatustxtr);
+#endif
+      return serviced;
+    }
+#ifdef USE_MCP230xx_OUTPUT
+    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
+      uint8_t pincmd = Settings.mcp230xx_config[pin].pinmode - 5;
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "ON")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "1"))) {
+        MCP230xx_SetOutPin(pin,abs(pincmd-1));
+        return serviced;
+      }
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "OFF")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0"))) {
+        MCP230xx_SetOutPin(pin,pincmd);
+        return serviced;
+      }
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "T")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "2"))) {
+        MCP230xx_SetOutPin(pin,2);
+        return serviced;
+      }
+    }
+#endif
+    uint8_t pinmode = 0;
+    uint8_t pullup = 0;
+    uint8_t intmode = 0;
+    if (paramcount > 1) {
+      pinmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+    }
+    if (paramcount > 2) {
+      pullup = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+    }
+    if (paramcount > 3) {
+      intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+    }
+#ifdef USE_MCP230xx_OUTPUT
+    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2) && (paramcount > 2)) {
+#else
+    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2) && (paramcount > 2)) {
+#endif
+      Settings.mcp230xx_config[pin].pinmode=pinmode;
+      Settings.mcp230xx_config[pin].pullup=pullup;
+      if ((pinmode > 1) && (pinmode < 5)) {
+        if ((intmode >= 0) && (intmode <= 3)) {
+          Settings.mcp230xx_config[pin].int_report_mode=intmode;
+        }
+      } else {
+        Settings.mcp230xx_config[pin].int_report_mode=3;
+      }
+      MCP230xx_ApplySettings();
+      uint8_t port = 0;
+      if (pin > 7) { port = 1; }
+      uint8_t portdata = MCP230xx_readGPIO(port);
+      char pulluptxtc[7], pinstatustxtc[7];
+      char intmodetxt[9];
+      sprintf(pulluptxtc,ConvertNumTxt(pullup));
+      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
+#ifdef USE_MCP230xx_OUTPUT
+      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1,Settings.mcp230xx_config[pin].pinmode));
+#else
+      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1));
+#endif
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmode,pulluptxtc,intmodetxt,pinstatustxtc);
+      return serviced;
+    }
+  } else {
+    serviced=false;
+    return serviced;
+  }
+  return serviced;
+}
+
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+
+const char HTTP_SNS_MCP230xx_OUTPUT[] PROGMEM = "{s}MCP230XX D%d{m}%s{e}";
+
+void MCP230xx_UpdateWebData(void)
+{
+  uint8_t gpio1 = MCP230xx_readGPIO(0);
+  uint8_t gpio2 = 0;
+  if (2 == mcp230xx_type) {
+    gpio2 = MCP230xx_readGPIO(1);
+  }
+  uint16_t gpio = (gpio2 << 8) + gpio1;
+  for (uint32_t pin = 0; pin < mcp230xx_pincount; pin++) {
+    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
+      char stt[7];
+      sprintf(stt,ConvertNumTxt((gpio>>pin)&1,Settings.mcp230xx_config[pin].pinmode));
+      WSContentSend_PD(HTTP_SNS_MCP230xx_OUTPUT, pin, stt);
+    }
+  }
+}
+
+#endif
+
+#ifdef USE_MCP230xx_OUTPUT
+
+void MCP230xx_OutputTelemetry(void)
+{
+  uint8_t outputcount = 0;
+  uint16_t gpiototal = 0;
+  uint8_t gpioa = 0;
+  uint8_t gpiob = 0;
+  gpioa=MCP230xx_readGPIO(0);
+  if (2 == mcp230xx_type) { gpiob=MCP230xx_readGPIO(1); }
+  gpiototal=((uint16_t)gpiob << 8) | gpioa;
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].pinmode >= 5) outputcount++;
+  }
+  if (outputcount) {
+    char stt[7];
+    ResponseTime_P(PSTR(",\"MCP230_OUT\":{"));
+    for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+      if (Settings.mcp230xx_config[pinx].pinmode >= 5) {
+        sprintf(stt,ConvertNumTxt(((gpiototal>>pinx)&1),Settings.mcp230xx_config[pinx].pinmode));
+        ResponseAppend_P(PSTR("\"OUT_D%i\":\"%s\","),pinx,stt);
+      }
+    }
+    ResponseAppend_P(PSTR("\"END\":1}}"));
+    MqttPublishTeleSensor();
+  }
+}
+
+#endif
+
+void MCP230xx_Interrupt_Counter_Report(void) {
+  ResponseTime_P(PSTR(",\"MCP230_INTTIMER\":{"));
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].int_count_en) {
+      ResponseAppend_P(PSTR("\"INTCNT_D%i\":%i,"),pinx,mcp230xx_int_counter[pinx]);
+      mcp230xx_int_counter[pinx]=0;
+    }
+  }
+  ResponseAppend_P(PSTR("\"END\":1}}"));
+  MqttPublishTeleSensor();
+  mcp230xx_int_sec_counter = 0;
+}
+
+void MCP230xx_Interrupt_Retain_Report(void) {
+  uint16_t retainresult = 0;
+  ResponseTime_P(PSTR(",\"MCP_INTRETAIN\":{"));
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].int_retain_flag) {
+      ResponseAppend_P(PSTR("\"D%i\":%i,"),pinx,mcp230xx_int_retainer[pinx]);
+      retainresult |= (((mcp230xx_int_retainer[pinx])&1) << pinx);
+      mcp230xx_int_retainer[pinx]=0;
+    }
+  }
+  ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult);
+  MqttPublishTeleSensor();
+}
+
+
+
+
+
+bool Xsns29(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_22)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+      MCP230xx_Detect();
+  }
+  else if (mcp230xx_type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (mcp230xx_int_en) {
+          mcp230xx_int_prio_counter++;
+          if ((mcp230xx_int_prio_counter) >= (Settings.mcp230xx_int_prio)) {
+            MCP230xx_CheckForInterrupt();
+            mcp230xx_int_prio_counter=0;
+          }
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        if (mcp230xx_int_counter_en) {
+          mcp230xx_int_sec_counter++;
+          if (mcp230xx_int_sec_counter >= Settings.mcp230xx_int_timer) {
+            MCP230xx_Interrupt_Counter_Report();
+          }
+        }
+        if (tele_period == 0) {
+          if (mcp230xx_int_retainer_en) {
+            MCP230xx_Interrupt_Retain_Report();
+          }
+#ifdef USE_MCP230xx_OUTPUT
+          MCP230xx_OutputTelemetry();
+#endif
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MCP230xx_Show(1);
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_29 == XdrvMailbox.index) {
+          result = MCP230xx_Command();
+        }
+        break;
+#ifdef USE_WEBSERVER
+#ifdef USE_MCP230xx_OUTPUT
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+      case FUNC_WEB_SENSOR:
+        MCP230xx_UpdateWebData();
+        break;
+#endif
+#endif
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+# 46 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+#ifdef USE_I2C
+#ifdef USE_MPR121
+
+
+
+
+
+#define XSNS_30 30
+#define XI2C_23 23
+
+
+
+
+
+
+
+#define MPR121_ELEX_REG 0x00
+
+
+#define MPR121_MHDR_REG 0x2B
+
+
+#define MPR121_MHDR_VAL 0x01
+
+
+#define MPR121_NHDR_REG 0x2C
+
+
+#define MPR121_NHDR_VAL 0x01
+
+
+#define MPR121_NCLR_REG 0x2D
+
+
+#define MPR121_NCLR_VAL 0x0E
+
+
+#define MPR121_MHDF_REG 0x2F
+
+
+#define MPR121_MHDF_VAL 0x01
+
+
+#define MPR121_NHDF_REG 0x30
+
+
+#define MPR121_NHDF_VAL 0x05
+
+
+#define MPR121_NCLF_REG 0x31
+
+
+#define MPR121_NCLF_VAL 0x01
+
+
+#define MPR121_MHDPROXR_REG 0x36
+
+
+#define MPR121_MHDPROXR_VAL 0x3F
+
+
+#define MPR121_NHDPROXR_REG 0x37
+
+
+#define MPR121_NHDPROXR_VAL 0x5F
+
+
+#define MPR121_NCLPROXR_REG 0x38
+
+
+#define MPR121_NCLPROXR_VAL 0x04
+
+
+#define MPR121_FDLPROXR_REG 0x39
+
+
+#define MPR121_FDLPROXR_VAL 0x00
+
+
+#define MPR121_MHDPROXF_REG 0x3A
+
+
+#define MPR121_MHDPROXF_VAL 0x01
+
+
+#define MPR121_NHDPROXF_REG 0x3B
+
+
+#define MPR121_NHDPROXF_VAL 0x01
+
+
+#define MPR121_NCLPROXF_REG 0x3C
+
+
+#define MPR121_NCLPROXF_VAL 0x1F
+
+
+#define MPR121_FDLPROXF_REG 0x3D
+
+
+#define MPR121_FDLPROXF_VAL 0x04
+
+
+#define MPR121_E0TTH_REG 0x41
+
+
+#define MPR121_E0TTH_VAL 12
+
+
+#define MPR121_E0RTH_REG 0x42
+
+
+#define MPR121_E0RTH_VAL 6
+
+
+#define MPR121_CDT_REG 0x5D
+
+
+#define MPR121_CDT_VAL 0x20
+
+
+#define MPR121_ECR_REG 0x5E
+
+
+#define MPR121_ECR_VAL 0x8F
+
+
+
+#define MPR121_SRST_REG 0x80
+
+
+#define MPR121_SRST_VAL 0x63
+
+
+#define BITC(sensor,position) ((pS->current[sensor] >> position) & 1)
+
+
+#define BITP(sensor,position) ((pS->previous[sensor] >> position) & 1)
+# 195 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+typedef struct mpr121 mpr121;
+struct mpr121 {
+ const uint8_t i2c_addr[4] = { 0x5A, 0x5B, 0x5C, 0x5D };
+ const char id[4] = { 'A', 'B', 'C', 'D' };
+ bool connected[4] = { false, false, false, false };
+ bool running[4] = { false, false, false, false };
+ uint16_t current[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
+ uint16_t previous[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
+};
+
+bool mpr21_found = false;
+# 217 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+void Mpr121Init(struct mpr121 *pS, bool initial)
+{
+
+ for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
+
+    if (initial && I2cActive(pS->i2c_addr[i])) { continue; }
+
+
+  pS->connected[i] = (I2cWrite8(pS->i2c_addr[i], MPR121_SRST_REG, MPR121_SRST_VAL)
+        && (0x24 == I2cRead8(pS->i2c_addr[i], 0x5D)));
+  if (pS->connected[i]) {
+
+
+      mpr21_found = true;
+   char device_name[16];
+   snprintf_P(device_name, sizeof(device_name), PSTR("MPR121(%c)"), pS->id[i]);
+      I2cSetActiveFound(pS->i2c_addr[i], device_name);
+
+
+   for (uint32_t j = 0; j < 13; j++) {
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_E0TTH_REG + 2 * j, MPR121_E0TTH_VAL);
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_E0RTH_REG + 2 * j, MPR121_E0RTH_VAL);
+   }
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDR_REG, MPR121_MHDR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDR_REG, MPR121_NHDR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLR_REG, MPR121_NCLR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDF_REG, MPR121_MHDF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDF_REG, MPR121_NHDF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLF_REG, MPR121_NCLF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXR_REG, MPR121_MHDPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXR_REG, MPR121_NHDPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXR_REG, MPR121_NCLPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXR_REG, MPR121_FDLPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXF_REG, MPR121_MHDPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXF_REG, MPR121_NHDPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXF_REG, MPR121_NCLPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXF_REG, MPR121_FDLPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_CDT_REG, MPR121_CDT_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_ECR_REG, MPR121_ECR_VAL);
+
+
+   pS->running[i] = (0x00 != I2cRead8(pS->i2c_addr[i], MPR121_ECR_REG));
+
+   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_I2C "MPR121%c: %sRunning"), pS->id[i], (pS->running[i]) ? "" : "NOT");
+
+  } else {
+
+
+   pS->running[i] = false;
+  }
+ }
+
+
+ if (!(pS->connected[0] || pS->connected[1] || pS->connected[2]
+       || pS->connected[3])) {
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C "MPR121: No sensors found"));
+ }
+}
+# 326 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+void Mpr121Show(struct mpr121 *pS, uint8_t function)
+{
+
+
+ for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
+
+
+  if (pS->connected[i]) {
+
+
+   if (!I2cValidRead16LE(&pS->current[i], pS->i2c_addr[i], MPR121_ELEX_REG)) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Cannot read data!"), pS->id[i]);
+    Mpr121Init(pS, false);
+    return;
+   }
+
+   if (BITC(i, 15)) {
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_ELEX_REG, 0x00);
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Excess current detected! Fix circuits if it happens repeatedly! Soft-resetting MPR121 ..."), pS->id[i]);
+    Mpr121Init(pS, false);
+    return;
+   }
+  }
+
+  if (pS->running[i]) {
+
+
+   if (FUNC_JSON_APPEND == function) {
+    ResponseAppend_P(PSTR(",\"MPR121%c\":{"), pS->id[i]);
+   }
+
+   for (uint32_t j = 0; j < 13; j++) {
+
+
+    if ((FUNC_EVERY_50_MSECOND == function)
+        && (BITC(i, j) != BITP(i, j))) {
+     Response_P(PSTR("{\"MPR121%c\":{\"Button%i\":%i}}"), pS->id[i], j, BITC(i, j));
+     MqttPublishPrefixTopic_P(RESULT_OR_STAT, mqtt_data);
+    }
+
+#ifdef USE_WEBSERVER
+    if (FUNC_WEB_SENSOR == function) {
+     WSContentSend_PD(PSTR("{s}MPR121%c Button%d{m}%d{e}"), pS->id[i], j, BITC(i, j));
+    }
+#endif
+
+
+    if (FUNC_JSON_APPEND == function) {
+     ResponseAppend_P(PSTR("%s\"Button%i\":%i"), (j > 0 ? "," : ""), j, BITC(i, j));
+    }
+   }
+
+
+   pS->previous[i] = pS->current[i];
+
+
+   if (FUNC_JSON_APPEND == function) {
+        ResponseJsonEnd();
+   }
+  }
+ }
+}
+# 410 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
+bool Xsns30(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_23)) { return false; }
+
+ bool result = false;
+
+
+ static struct mpr121 mpr121;
+
+  if (FUNC_INIT == function) {
+
+  Mpr121Init(&mpr121, true);
+  }
+  else if (mpr21_found) {
+
+  switch (function) {
+
+
+  case FUNC_EVERY_50_MSECOND:
+   Mpr121Show(&mpr121, FUNC_EVERY_50_MSECOND);
+   break;
+
+
+  case FUNC_JSON_APPEND:
+   Mpr121Show(&mpr121, FUNC_JSON_APPEND);
+   break;
+
+#ifdef USE_WEBSERVER
+
+  case FUNC_WEB_SENSOR:
+   Mpr121Show(&mpr121, FUNC_WEB_SENSOR);
+   break;
+#endif
+  }
+ }
+
+ return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
+#ifdef USE_I2C
+#ifdef USE_CCS811
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
+#define XSNS_31 31
+#define XI2C_24 24
+
+#define EVERYNSECONDS 5
+
+#include "Adafruit_CCS811.h"
+
+Adafruit_CCS811 ccs;
+uint8_t CCS811_ready = 0;
+uint8_t CCS811_type = 0;;
+uint16_t eCO2;
+uint16_t TVOC;
+uint8_t tcnt = 0;
+uint8_t ecnt = 0;
+
+
+
+void CCS811Detect(void)
+{
+  if (I2cActive(CCS811_ADDRESS)) { return; }
+
+  if (!ccs.begin(CCS811_ADDRESS)) {
+    CCS811_type = 1;
+    I2cSetActiveFound(CCS811_ADDRESS, "CCS811");
+  }
+}
+
+void CCS811Update(void)
+{
+  tcnt++;
+  if (tcnt >= EVERYNSECONDS) {
+    tcnt = 0;
+    CCS811_ready = 0;
+    if (ccs.available()) {
+      if (!ccs.readData()){
+        TVOC = ccs.getTVOC();
+        eCO2 = ccs.geteCO2();
+        CCS811_ready = 1;
+        if (global_update && global_humidity>0 && global_temperature!=9999) { ccs.setEnvironmentalData((uint8_t)global_humidity, global_temperature); }
+        ecnt = 0;
+      }
+    } else {
+
+      ecnt++;
+      if (ecnt > 6) {
+
+        ccs.begin(CCS811_ADDRESS);
+      }
+    }
+  }
+}
+
+const char HTTP_SNS_CCS811[] PROGMEM =
+  "{s}CCS811 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
+  "{s}CCS811 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
+
+void CCS811Show(bool json)
+{
+  if (CCS811_ready) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"CCS811\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), eCO2,TVOC);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, eCO2);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_CCS811, eCO2, TVOC);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns31(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_24)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    CCS811Detect();
+  }
+  else if (CCS811_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        CCS811Update();
+        break;
+      case FUNC_JSON_APPEND:
+        CCS811Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        CCS811Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
+#ifdef USE_I2C
+#ifdef USE_MPU6050
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
+#define XSNS_32 32
+#define XI2C_25 25
+
+#define D_SENSOR_MPU6050 "MPU6050"
+
+#define MPU_6050_ADDR_AD0_LOW 0x68
+#define MPU_6050_ADDR_AD0_HIGH 0x69
+
+uint8_t MPU_6050_address;
+uint8_t MPU_6050_addresses[] = { MPU_6050_ADDR_AD0_LOW, MPU_6050_ADDR_AD0_HIGH };
+uint8_t MPU_6050_found;
+
+int16_t MPU_6050_ax = 0, MPU_6050_ay = 0, MPU_6050_az = 0;
+int16_t MPU_6050_gx = 0, MPU_6050_gy = 0, MPU_6050_gz = 0;
+int16_t MPU_6050_temperature = 0;
+
+#ifdef USE_MPU6050_DMP
+  #include "MPU6050_6Axis_MotionApps20.h"
+  #include "I2Cdev.h"
+  #include <helper_3dmath.h>
+  typedef struct MPU6050_DMP{
+  uint8_t devStatus;
+  uint16_t packetSize;
+  uint16_t fifoCount;
+  uint8_t fifoBuffer[64];
+  Quaternion q;
+  VectorInt16 aa;
+  VectorInt16 aaReal;
+  VectorFloat gravity;
+  float euler[3];
+  float yawPitchRoll[3];
+  } MPU6050_DMP;
+
+  MPU6050_DMP MPU6050_dmp;
+#else
+  #include <MPU6050.h>
+#endif
+MPU6050 mpu6050;
+
+void MPU_6050PerformReading(void)
+{
+#ifdef USE_MPU6050_DMP
+    mpu6050.resetFIFO();
+    MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
+    while (MPU6050_dmp.fifoCount < MPU6050_dmp.packetSize) MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
+    mpu6050.getFIFOBytes(MPU6050_dmp.fifoBuffer, MPU6050_dmp.packetSize);
+    MPU6050_dmp.fifoCount -= MPU6050_dmp.packetSize;
+
+    mpu6050.dmpGetQuaternion(&MPU6050_dmp.q, MPU6050_dmp.fifoBuffer);
+    mpu6050.dmpGetEuler(MPU6050_dmp.euler, &MPU6050_dmp.q);
+    mpu6050.dmpGetAccel(&MPU6050_dmp.aa, MPU6050_dmp.fifoBuffer);
+    mpu6050.dmpGetGravity(&MPU6050_dmp.gravity, &MPU6050_dmp.q);
+    mpu6050.dmpGetLinearAccel(&MPU6050_dmp.aaReal, &MPU6050_dmp.aa, &MPU6050_dmp.gravity);
+    mpu6050.dmpGetYawPitchRoll(MPU6050_dmp.yawPitchRoll, &MPU6050_dmp.q, &MPU6050_dmp.gravity);
+    MPU_6050_gx = MPU6050_dmp.euler[0] * 180/M_PI;
+    MPU_6050_gy = MPU6050_dmp.euler[1] * 180/M_PI;
+    MPU_6050_gz = MPU6050_dmp.euler[2] * 180/M_PI;
+    MPU_6050_ax = MPU6050_dmp.aaReal.x;
+    MPU_6050_ay = MPU6050_dmp.aaReal.y;
+    MPU_6050_az = MPU6050_dmp.aaReal.z;
+#else
+  mpu6050.getMotion6(
+    &MPU_6050_ax,
+    &MPU_6050_ay,
+    &MPU_6050_az,
+    &MPU_6050_gx,
+    &MPU_6050_gy,
+    &MPU_6050_gz
+  );
+#endif
+  MPU_6050_temperature = mpu6050.getTemperature();
+}
+# 119 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
+void MPU_6050Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(MPU_6050_addresses); i++)
+  {
+    MPU_6050_address = MPU_6050_addresses[i];
+    if (!I2cSetDevice(MPU_6050_address)) { break; }
+    mpu6050.setAddr(MPU_6050_addresses[i]);
+
+#ifdef USE_MPU6050_DMP
+    MPU6050_dmp.devStatus = mpu6050.dmpInitialize();
+    mpu6050.setXGyroOffset(220);
+    mpu6050.setYGyroOffset(76);
+    mpu6050.setZGyroOffset(-85);
+    mpu6050.setZAccelOffset(1788);
+    if (MPU6050_dmp.devStatus == 0) {
+      mpu6050.setDMPEnabled(true);
+      MPU6050_dmp.packetSize = mpu6050.dmpGetFIFOPacketSize();
+      MPU_6050_found = true;
+    }
+#else
+    mpu6050.initialize();
+    MPU_6050_found = mpu6050.testConnection();
+#endif
+    Settings.flag2.axis_resolution = 2;
+  }
+
+  if (MPU_6050_found) {
+    I2cSetActiveFound(MPU_6050_address, D_SENSOR_MPU6050);
+  }
+}
+
+#define D_YAW "Yaw"
+#define D_PITCH "Pitch"
+#define D_ROLL "Roll"
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_AXIS[] PROGMEM =
+  "{s}" D_SENSOR_MPU6050 " " D_AX_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_AY_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_AZ_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GX_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GY_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GZ_AXIS "{m}%s{e}";
+#ifdef USE_MPU6050_DMP
+const char HTTP_SNS_YPR[] PROGMEM =
+  "{s}" D_SENSOR_MPU6050 " " D_YAW "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_PITCH "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_ROLL "{m}%s{e}";
+#endif
+#endif
+
+#define D_JSON_AXIS_AX "AccelXAxis"
+#define D_JSON_AXIS_AY "AccelYAxis"
+#define D_JSON_AXIS_AZ "AccelZAxis"
+#define D_JSON_AXIS_GX "GyroXAxis"
+#define D_JSON_AXIS_GY "GyroYAxis"
+#define D_JSON_AXIS_GZ "GyroZAxis"
+#define D_JSON_YAW "Yaw"
+#define D_JSON_PITCH "Pitch"
+#define D_JSON_ROLL "Roll"
+
+void MPU_6050Show(bool json)
+{
+  MPU_6050PerformReading();
+
+  double tempConv = (MPU_6050_temperature / 340.0 + 35.53);
+  char temperature[33];
+  dtostrfd(tempConv, Settings.flag2.temperature_resolution, temperature);
+  char axis_ax[33];
+  dtostrfd(MPU_6050_ax, Settings.flag2.axis_resolution, axis_ax);
+  char axis_ay[33];
+  dtostrfd(MPU_6050_ay, Settings.flag2.axis_resolution, axis_ay);
+  char axis_az[33];
+  dtostrfd(MPU_6050_az, Settings.flag2.axis_resolution, axis_az);
+  char axis_gx[33];
+  dtostrfd(MPU_6050_gx, Settings.flag2.axis_resolution, axis_gx);
+  char axis_gy[33];
+  dtostrfd(MPU_6050_gy, Settings.flag2.axis_resolution, axis_gy);
+  char axis_gz[33];
+  dtostrfd(MPU_6050_gz, Settings.flag2.axis_resolution, axis_gz);
+#ifdef USE_MPU6050_DMP
+  char axis_yaw[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[0] / PI * 180.0, Settings.flag2.axis_resolution, axis_yaw);
+  char axis_pitch[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[1] / PI * 180.0, Settings.flag2.axis_resolution, axis_pitch);
+  char axis_roll[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[2] / PI * 180.0, Settings.flag2.axis_resolution, axis_roll);
+#endif
+
+  if (json) {
+    char json_axis_ax[25];
+    snprintf_P(json_axis_ax, sizeof(json_axis_ax), PSTR(",\"" D_JSON_AXIS_AX "\":%s"), axis_ax);
+    char json_axis_ay[25];
+    snprintf_P(json_axis_ay, sizeof(json_axis_ay), PSTR(",\"" D_JSON_AXIS_AY "\":%s"), axis_ay);
+    char json_axis_az[25];
+    snprintf_P(json_axis_az, sizeof(json_axis_az), PSTR(",\"" D_JSON_AXIS_AZ "\":%s"), axis_az);
+    char json_axis_gx[25];
+    snprintf_P(json_axis_gx, sizeof(json_axis_gx), PSTR(",\"" D_JSON_AXIS_GX "\":%s"), axis_gx);
+    char json_axis_gy[25];
+    snprintf_P(json_axis_gy, sizeof(json_axis_gy), PSTR(",\"" D_JSON_AXIS_GY "\":%s"), axis_gy);
+    char json_axis_gz[25];
+    snprintf_P(json_axis_gz, sizeof(json_axis_gz), PSTR(",\"" D_JSON_AXIS_GZ "\":%s"), axis_gz);
+#ifdef USE_MPU6050_DMP
+    char json_ypr_y[25];
+    snprintf_P(json_ypr_y, sizeof(json_ypr_y), PSTR(",\"" D_JSON_YAW "\":%s"), axis_yaw);
+    char json_ypr_p[25];
+    snprintf_P(json_ypr_p, sizeof(json_ypr_p), PSTR(",\"" D_JSON_PITCH "\":%s"), axis_pitch);
+    char json_ypr_r[25];
+    snprintf_P(json_ypr_r, sizeof(json_ypr_r), PSTR(",\"" D_JSON_ROLL "\":%s"), axis_roll);
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s%s%s%s}"),
+      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz,
+      json_ypr_y, json_ypr_p, json_ypr_r);
+#else
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s}"),
+      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz);
+#endif
+#ifdef USE_DOMOTICZ
+    DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TEMP, D_SENSOR_MPU6050, temperature, TempUnit());
+    WSContentSend_PD(HTTP_SNS_AXIS, axis_ax, axis_ay, axis_az, axis_gx, axis_gy, axis_gz);
+#ifdef USE_MPU6050_DMP
+    WSContentSend_PD(HTTP_SNS_YPR, axis_yaw, axis_pitch, axis_roll);
+#endif
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns32(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_25)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MPU_6050Detect();
+  }
+  else if (MPU_6050_found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        if (tele_period == Settings.tele_period -3) {
+          MPU_6050PerformReading();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MPU_6050Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MPU_6050Show(0);
+        MPU_6050PerformReading();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
+#ifdef USE_I2C
+#ifdef USE_DS3231
+# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
+#define XSNS_33 33
+#define XI2C_26 26
+
+
+#ifndef USE_RTC_ADDR
+#define USE_RTC_ADDR 0x68
+#endif
+
+
+#define RTC_SECONDS 0x00
+#define RTC_MINUTES 0x01
+#define RTC_HOURS 0x02
+#define RTC_DAY 0x03
+#define RTC_DATE 0x04
+#define RTC_MONTH 0x05
+#define RTC_YEAR 0x06
+#define RTC_CONTROL 0x0E
+#define RTC_STATUS 0x0F
+
+#define OSF 7
+#define EOSC 7
+#define BBSQW 6
+#define CONV 5
+#define RS2 4
+#define RS1 3
+#define INTCN 2
+
+
+#define HR1224 6
+#define CENTURY 7
+#define DYDT 6
+bool ds3231ReadStatus = false;
+bool ds3231WriteStatus = false;
+bool DS3231chipDetected = false;
+
+
+
+
+void DS3231Detect(void)
+{
+  if (I2cActive(USE_RTC_ADDR)) { return; }
+
+  if (I2cValidRead(USE_RTC_ADDR, RTC_STATUS, 1)) {
+    I2cSetActiveFound(USE_RTC_ADDR, "DS3231");
+    DS3231chipDetected = true;
+  }
+}
+
+
+
+
+uint8_t bcd2dec(uint8_t n)
+{
+  return n - 6 * (n >> 4);
+}
+
+
+
+
+uint8_t dec2bcd(uint8_t n)
+{
+  return n + 6 * (n / 10);
+}
+
+
+
+
+uint32_t ReadFromDS3231(void)
+{
+  TIME_T tm;
+  tm.second = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_SECONDS));
+  tm.minute = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MINUTES));
+  tm.hour = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_HOURS) & ~_BV(HR1224));
+  tm.day_of_week = I2cRead8(USE_RTC_ADDR, RTC_DAY);
+  tm.day_of_month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_DATE));
+  tm.month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MONTH) & ~_BV(CENTURY));
+  tm.year = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_YEAR));
+  return MakeTime(tm);
+}
+
+
+
+void SetDS3231Time (uint32_t epoch_time) {
+  TIME_T tm;
+  BreakTime(epoch_time, tm);
+  I2cWrite8(USE_RTC_ADDR, RTC_SECONDS, dec2bcd(tm.second));
+  I2cWrite8(USE_RTC_ADDR, RTC_MINUTES, dec2bcd(tm.minute));
+  I2cWrite8(USE_RTC_ADDR, RTC_HOURS, dec2bcd(tm.hour));
+  I2cWrite8(USE_RTC_ADDR, RTC_DAY, tm.day_of_week);
+  I2cWrite8(USE_RTC_ADDR, RTC_DATE, dec2bcd(tm.day_of_month));
+  I2cWrite8(USE_RTC_ADDR, RTC_MONTH, dec2bcd(tm.month));
+  I2cWrite8(USE_RTC_ADDR, RTC_YEAR, dec2bcd(tm.year));
+  I2cWrite8(USE_RTC_ADDR, RTC_STATUS, I2cRead8(USE_RTC_ADDR, RTC_STATUS) & ~_BV(OSF));
+}
+
+void DS3231EverySecond(void)
+{
+  TIME_T tmpTime;
+  if (!ds3231ReadStatus && Rtc.utc_time < START_VALID_TIME ) {
+    ntp_force_sync = true;
+    Rtc.utc_time = ReadFromDS3231();
+
+
+    BreakTime(Rtc.utc_time, tmpTime);
+    if (Rtc.utc_time < START_VALID_TIME ) {
+      ds3231ReadStatus = true;
+    }
+    RtcTime.year = tmpTime.year + 1970;
+    Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
+    Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Set time from DS3231 to RTC (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+    if (Rtc.local_time < START_VALID_TIME) {
+      rules_flag.time_init = 1;
+    } else {
+      rules_flag.time_set = 1;
+    }
+  }
+  else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs(Rtc.utc_time - ReadFromDS3231()) > 60) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+    SetDS3231Time (Rtc.utc_time);
+    ds3231WriteStatus = true;
+  }
+}
+
+
+
+
+
+bool Xsns33(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_26)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    DS3231Detect();
+  }
+  else if (DS3231chipDetected) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DS3231EverySecond();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
+#ifdef USE_HX711
+# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
+#define XSNS_34 34
+
+#ifndef HX_MAX_WEIGHT
+#define HX_MAX_WEIGHT 20000
+#endif
+#ifndef HX_REFERENCE
+#define HX_REFERENCE 250
+#endif
+#ifndef HX_SCALE
+#define HX_SCALE 120
+#endif
+
+#define HX_TIMEOUT 120
+#define HX_SAMPLES 10
+#define HX_CAL_TIMEOUT 15
+
+#define HX_GAIN_128 1
+#define HX_GAIN_32 2
+#define HX_GAIN_64 3
+
+#define D_JSON_WEIGHT_REF "WeightRef"
+#define D_JSON_WEIGHT_CAL "WeightCal"
+#define D_JSON_WEIGHT_MAX "WeightMax"
+#define D_JSON_WEIGHT_ITEM "WeightItem"
+#define D_JSON_WEIGHT_CHANGE "WeightChange"
+#define D_JSON_WEIGHT_RAW "WeightRaw"
+#define D_JSON_WEIGHT_DELTA "WeightDelta"
+
+enum HxCalibrationSteps { HX_CAL_END, HX_CAL_LIMBO, HX_CAL_FINISH, HX_CAL_FAIL, HX_CAL_DONE, HX_CAL_FIRST, HX_CAL_RESET, HX_CAL_START };
+
+const char kHxCalibrationStates[] PROGMEM = D_HX_CAL_FAIL "|" D_HX_CAL_DONE "|" D_HX_CAL_REFERENCE "|" D_HX_CAL_REMOVE;
+
+struct HX {
+  long weight = 0;
+  long raw = 0;
+  long last_weight = 0;
+  long sum_weight = 0;
+  long sum_raw = 0;
+  long offset = 0;
+  long scale = 1;
+  long weight_diff = 0;
+  uint8_t type = 1;
+  uint8_t sample_count = 0;
+  uint8_t calibrate_step = HX_CAL_END;
+  uint8_t calibrate_timer = 0;
+  uint8_t calibrate_msg = 0;
+  uint8_t pin_sck;
+  uint8_t pin_dout;
+  bool tare_flg = false;
+  bool weight_changed = false;
+  uint16_t weight_delta = 4;
+} Hx;
+
+
+
+bool HxIsReady(uint16_t timeout)
+{
+
+  uint32_t start = millis();
+  while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) { yield(); }
+  return (digitalRead(Hx.pin_dout) == LOW);
+}
+
+long HxRead(void)
+{
+  if (!HxIsReady(HX_TIMEOUT)) { return -1; }
+
+  uint8_t data[3] = { 0 };
+  uint8_t filler = 0x00;
+
+
+  data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+  data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+  data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+
+
+  for (unsigned int i = 0; i < HX_GAIN_128; i++) {
+    digitalWrite(Hx.pin_sck, HIGH);
+    digitalWrite(Hx.pin_sck, LOW);
+  }
+
+
+  if (data[2] & 0x80) { filler = 0xFF; }
+
+
+  unsigned long value = ( static_cast<unsigned long>(filler) << 24
+                        | static_cast<unsigned long>(data[2]) << 16
+                        | static_cast<unsigned long>(data[1]) << 8
+                        | static_cast<unsigned long>(data[0]) );
+
+  return static_cast<long>(value);
+}
+
+
+
+void HxResetPart(void)
+{
+  Hx.tare_flg = true;
+  Hx.sum_weight = 0;
+  Hx.sample_count = 0;
+  Hx.last_weight = 0;
+}
+
+void HxReset(void)
+{
+  HxResetPart();
+  Settings.energy_frequency_calibration = 0;
+}
+
+void HxCalibrationStateTextJson(uint8_t msg_id)
+{
+  char cal_text[30];
+
+  Hx.calibrate_msg = msg_id;
+  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
+
+  if (msg_id < 3) { MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("Sensor34")); }
+}
+
+void SetWeightDelta()
+{
+
+  if (Settings.weight_change == 0) {
+    Hx.weight_delta = 4;
+    return;
+  }
+
+
+  if (Settings.weight_change > 100) {
+    Hx.weight_delta = (Settings.weight_change - 100) * 10 + 100;
+    return;
+  }
+
+
+  Hx.weight_delta = Settings.weight_change - 1;
+}
+# 192 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
+bool HxCommand(void)
+{
+  bool serviced = true;
+  bool show_parms = false;
+  char sub_string[XdrvMailbox.data_len +1];
+
+  for (uint32_t ca = 0; ca < XdrvMailbox.data_len; ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+  }
+
+  switch (XdrvMailbox.payload) {
+    case 1:
+      HxReset();
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, "Reset");
+      break;
+    case 2:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+      }
+      Hx.scale = 1;
+      HxReset();
+      Hx.calibrate_step = HX_CAL_START;
+      Hx.calibrate_timer = 1;
+      HxCalibrationStateTextJson(3);
+      break;
+    case 3:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+      }
+      show_parms = true;
+      break;
+    case 4:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_calibration = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+        Hx.scale = Settings.weight_calibration;
+      }
+      show_parms = true;
+      break;
+    case 5:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_max = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) / 1000;
+      }
+      show_parms = true;
+      break;
+    case 6:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_item = (unsigned long)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 10);
+      }
+      show_parms = true;
+      break;
+    case 7:
+      Settings.energy_frequency_calibration = Hx.weight;
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, D_JSON_DONE);
+      break;
+    case 8:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.SensorBits1.hx711_json_weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) & 1;
+      }
+      show_parms = true;
+      break;
+    case 9:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+ Settings.weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+ SetWeightDelta();
+      }
+      show_parms = true;
+      break;
+    default:
+      show_parms = true;
+  }
+
+  if (show_parms) {
+    char item[33];
+    dtostrfd((float)Settings.weight_item / 10, 1, item);
+    Response_P(PSTR("{\"Sensor34\":{\"" D_JSON_WEIGHT_REF "\":%d,\"" D_JSON_WEIGHT_CAL "\":%d,\"" D_JSON_WEIGHT_MAX "\":%d,\""
+      D_JSON_WEIGHT_ITEM "\":%s,\"" D_JSON_WEIGHT_CHANGE "\":%s,\"" D_JSON_WEIGHT_DELTA "\":%d}}"),
+        Settings.weight_reference, Settings.weight_calibration, Settings.weight_max * 1000,
+        item, GetStateText(Settings.SensorBits1.hx711_json_weight_change), Settings.weight_change);
+  }
+
+  return serviced;
+}
+
+
+
+long HxWeight(void)
+{
+  return (Hx.calibrate_step < HX_CAL_FAIL) ? Hx.weight : 0;
+}
+
+void HxInit(void)
+{
+  Hx.type = 0;
+  if ((pin[GPIO_HX711_DAT] < 99) && (pin[GPIO_HX711_SCK] < 99)) {
+    Hx.pin_sck = pin[GPIO_HX711_SCK];
+    Hx.pin_dout = pin[GPIO_HX711_DAT];
+
+    pinMode(Hx.pin_sck, OUTPUT);
+    pinMode(Hx.pin_dout, INPUT);
+
+    digitalWrite(Hx.pin_sck, LOW);
+
+    SetWeightDelta();
+
+    if (HxIsReady(8 * HX_TIMEOUT)) {
+      if (!Settings.weight_max) { Settings.weight_max = HX_MAX_WEIGHT / 1000; }
+      if (!Settings.weight_calibration) { Settings.weight_calibration = HX_SCALE; }
+      if (!Settings.weight_reference) { Settings.weight_reference = HX_REFERENCE; }
+      Hx.scale = Settings.weight_calibration;
+      HxRead();
+      HxResetPart();
+      Hx.type = 1;
+    }
+  }
+}
+
+void HxEvery100mSecond(void)
+{
+  long raw = HxRead();
+  Hx.sum_raw += raw;
+  Hx.sum_weight += raw;
+
+  Hx.sample_count++;
+  if (HX_SAMPLES == Hx.sample_count) {
+    long average = Hx.sum_weight / Hx.sample_count;
+    long raw_average = Hx.sum_raw / Hx.sample_count;
+    long value = average - Hx.offset;
+    Hx.weight = value / Hx.scale;
+    Hx.raw = raw_average / Hx.scale;
+    if (Hx.weight < 0) {
+      if (Settings.energy_frequency_calibration) {
+        long difference = Settings.energy_frequency_calibration + Hx.weight;
+        Hx.last_weight = difference;
+        if (difference < 0) { HxReset(); }
+      }
+      Hx.weight = 0;
+    } else {
+      Hx.last_weight = Settings.energy_frequency_calibration;
+    }
+
+    if (Hx.tare_flg) {
+      Hx.tare_flg = false;
+      Hx.offset = average;
+    }
+
+    if (Hx.calibrate_step) {
+      Hx.calibrate_timer--;
+
+      if (HX_CAL_START == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
+      }
+      else if (HX_CAL_RESET == Hx.calibrate_step) {
+        if (Hx.calibrate_timer) {
+          if (Hx.weight < (long)Settings.weight_reference) {
+            Hx.calibrate_step--;
+            Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
+            HxCalibrationStateTextJson(2);
+          }
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+      else if (HX_CAL_FIRST == Hx.calibrate_step) {
+        if (Hx.calibrate_timer) {
+          if (Hx.weight > (long)Settings.weight_reference) {
+            Hx.calibrate_step--;
+          }
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+      else if (HX_CAL_DONE == Hx.calibrate_step) {
+        if (Hx.weight > (long)Settings.weight_reference) {
+          Hx.calibrate_step = HX_CAL_FINISH;
+          Settings.weight_calibration = Hx.weight / Settings.weight_reference;
+          Hx.weight = 0;
+          HxCalibrationStateTextJson(1);
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+
+      if (HX_CAL_FAIL == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.tare_flg = true;
+        HxCalibrationStateTextJson(0);
+      }
+      if (HX_CAL_FINISH == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.calibrate_timer = 3 * (10 / HX_SAMPLES);
+        Hx.scale = Settings.weight_calibration;
+      }
+
+      if (!Hx.calibrate_timer) {
+        Hx.calibrate_step = HX_CAL_END;
+      }
+    } else {
+      Hx.weight += Hx.last_weight;
+
+      if (Settings.SensorBits1.hx711_json_weight_change) {
+        if (abs(Hx.weight - Hx.weight_diff) > Hx.weight_delta) {
+          Hx.weight_diff = Hx.weight;
+          Hx.weight_changed = true;
+        }
+        else if (Hx.weight_changed && (Hx.weight == Hx.weight_diff)) {
+          mqtt_data[0] = '\0';
+          ResponseAppendTime();
+          HxShow(true);
+          ResponseJsonEnd();
+          MqttPublishTeleSensor();
+          Hx.weight_changed = false;
+        }
+      }
+    }
+
+    Hx.sum_weight = 0;
+    Hx.sum_raw = 0;
+    Hx.sample_count = 0;
+  }
+}
+
+void HxSaveBeforeRestart(void)
+{
+  Settings.energy_frequency_calibration = Hx.weight;
+  Hx.sample_count = HX_SAMPLES +1;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_HX711_WEIGHT[] PROGMEM =
+  "{s}HX711 " D_WEIGHT "{m}%s " D_UNIT_KILOGRAM "{e}";
+const char HTTP_HX711_COUNT[] PROGMEM =
+  "{s}HX711 " D_COUNT "{m}%d{e}";
+const char HTTP_HX711_CAL[] PROGMEM =
+  "{s}HX711 %s{m}{e}";
+#endif
+
+void HxShow(bool json)
+{
+  char scount[30] = { 0 };
+
+  uint16_t count = 0;
+  float weight = 0;
+  if (Hx.calibrate_step < HX_CAL_FAIL) {
+    if (Hx.weight && Settings.weight_item) {
+      count = (Hx.weight * 10) / Settings.weight_item;
+      if (count > 1) {
+        snprintf_P(scount, sizeof(scount), PSTR(",\"" D_JSON_COUNT "\":%d"), count);
+      }
+    }
+    weight = (float)Hx.weight / 1000;
+  }
+  char weight_chr[33];
+  dtostrfd(weight, Settings.flag2.weight_resolution, weight_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"HX711\":{\"" D_JSON_WEIGHT "\":%s%s, \"" D_JSON_WEIGHT_RAW "\":%d}"), weight_chr, scount, Hx.raw);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_HX711_WEIGHT, weight_chr);
+    if (count > 1) {
+      WSContentSend_PD(HTTP_HX711_COUNT, count);
+    }
+    if (Hx.calibrate_step) {
+      char cal_text[30];
+      WSContentSend_PD(HTTP_HX711_CAL, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
+    }
+#endif
+  }
+}
+
+#ifdef USE_WEBSERVER
+#ifdef USE_HX711_GUI
+
+
+
+
+#define WEB_HANDLE_HX711 "s34"
+
+const char S_CONFIGURE_HX711[] PROGMEM = D_CONFIGURE_HX711;
+
+const char HTTP_BTN_MENU_MAIN_HX711[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button name='reset'>" D_RESET_HX711 "</button></form></p>";
+
+const char HTTP_BTN_MENU_HX711[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button>" D_CONFIGURE_HX711 "</button></form></p>";
+
+const char HTTP_FORM_HX711[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_CALIBRATION "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
+  "<p><b>" D_REFERENCE_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' step='0.001' id='p1' placeholder='0' value='%s'></p>"
+  "<br><button name='calibrate' type='submit'>" D_CALIBRATE "</button>"
+  "</form>"
+  "</fieldset><br><br>"
+
+  "<fieldset><legend><b>&nbsp;" D_HX711_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
+  "<p><b>" D_ITEM_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' max='6.5535' step='0.0001' id='p2' placeholder='0.0' value='%s'></p>";
+
+void HandleHxAction(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_HX711);
+
+  if (WebServer->hasArg("save")) {
+    HxSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  char stemp1[20];
+
+  if (WebServer->hasArg("reset")) {
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 1"));
+    ExecuteWebCommand(stemp1, SRC_WEBGUI);
+
+    HandleRoot();
+    return;
+  }
+
+  if (WebServer->hasArg("calibrate")) {
+    WebGetArg("p1", stemp1, sizeof(stemp1));
+    Settings.weight_reference = (!strlen(stemp1)) ? 0 : (unsigned long)(CharToFloat(stemp1) * 1000);
+
+    HxLogUpdates();
+
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 2"));
+    ExecuteWebCommand(stemp1, SRC_WEBGUI);
+
+    HandleRoot();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_HX711);
+  WSContentSendStyle();
+  dtostrfd((float)Settings.weight_reference / 1000, 3, stemp1);
+  char stemp2[20];
+  dtostrfd((float)Settings.weight_item / 10000, 4, stemp2);
+  WSContentSend_P(HTTP_FORM_HX711, stemp1, stemp2);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void HxSaveSettings(void)
+{
+  char tmp[100];
+
+  WebGetArg("p2", tmp, sizeof(tmp));
+  Settings.weight_item = (!strlen(tmp)) ? 0 : (unsigned long)(CharToFloat(tmp) * 10000);
+
+  HxLogUpdates();
+}
+
+void HxLogUpdates(void)
+{
+  char weigth_ref_chr[33];
+  dtostrfd((float)Settings.weight_reference / 1000, Settings.flag2.weight_resolution, weigth_ref_chr);
+  char weigth_item_chr[33];
+  dtostrfd((float)Settings.weight_item / 10000, 4, weigth_item_chr);
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_JSON_WEIGHT_REF " %s, " D_JSON_WEIGHT_ITEM " %s"), weigth_ref_chr, weigth_item_chr);
+}
+
+#endif
+#endif
+
+
+
+
+
+bool Xsns34(uint8_t function)
+{
+  bool result = false;
+
+  if (Hx.type) {
+    switch (function) {
+      case FUNC_EVERY_100_MSECOND:
+        HxEvery100mSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_34 == XdrvMailbox.index) {
+          result = HxCommand();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        HxShow(1);
+        break;
+      case FUNC_SAVE_BEFORE_RESTART:
+        HxSaveBeforeRestart();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HxShow(0);
+        break;
+#ifdef USE_HX711_GUI
+      case FUNC_WEB_ADD_MAIN_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_MAIN_HX711);
+        break;
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_HX711);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_HX711, HandleHxAction);
+        break;
+#endif
+#endif
+      case FUNC_INIT:
+        HxInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
+#ifdef USE_TX20_WIND_SENSOR
+# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
+#define XSNS_35 35
+
+#define TX20_BIT_TIME 1220
+#define TX20_RESET_VALUES 60
+
+
+
+extern "C" {
+#include "gpio.h"
+}
+
+#ifdef USE_WEBSERVER
+
+const char HTTP_SNS_TX20[] PROGMEM =
+   "{s}TX20 " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}TX20 " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}TX20 " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}TX20 " D_TX20_WIND_DIRECTION "{m}%s{e}";
+
+#endif
+
+const char kTx20Directions[] PROGMEM = D_TX20_NORTH "|"
+                                       D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_EAST "|"
+                                       D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH "|"
+                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_WEST "|"
+                                       D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
+                                       D_TX20_NORTH D_TX20_WEST "|"
+                                       D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
+
+uint8_t tx20_sa = 0;
+uint8_t tx20_sb = 0;
+uint8_t tx20_sd = 0;
+uint8_t tx20_se = 0;
+uint16_t tx20_sc = 0;
+uint16_t tx20_sf = 0;
+
+float tx20_wind_speed_kmh = 0;
+float tx20_wind_speed_max = 0;
+float tx20_wind_speed_avg = 0;
+float tx20_wind_sum = 0;
+int tx20_count = 0;
+uint8_t tx20_wind_direction = 0;
+
+bool tx20_available = false;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void Tx20StartRead(void) ICACHE_RAM_ATTR;
+#endif
+
+void Tx20StartRead(void)
+{
+# 101 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
+  tx20_available = false;
+
+  tx20_sa = 0;
+  tx20_sb = 0;
+  tx20_sd = 0;
+  tx20_se = 0;
+  tx20_sc = 0;
+  tx20_sf = 0;
+
+  delayMicroseconds(TX20_BIT_TIME / 2);
+
+  for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
+    uint8_t dpin = (digitalRead(pin[GPIO_TX20_TXD_BLACK]));
+    if (bitcount > 41 - 5) {
+
+      tx20_sa = (tx20_sa << 1) | (dpin ^ 1);
+    } else if (bitcount > 41 - 5 - 4) {
+
+      tx20_sb = tx20_sb >> 1 | ((dpin ^ 1) << 3);
+    } else if (bitcount > 41 - 5 - 4 - 12) {
+
+      tx20_sc = tx20_sc >> 1 | ((dpin ^ 1) << 11);
+    } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
+
+      tx20_sd = tx20_sd >> 1 | ((dpin ^ 1) << 3);
+    } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
+
+      tx20_se = tx20_se >> 1 | (dpin << 3);
+    } else {
+
+      tx20_sf = tx20_sf >> 1 | (dpin << 11);
+    }
+
+    delayMicroseconds(TX20_BIT_TIME);
+  }
+
+  uint8_t chk = (tx20_sb + (tx20_sc & 0xf) + ((tx20_sc >> 4) & 0xf) + ((tx20_sc >> 8) & 0xf));
+  chk &= 0xf;
+
+  if ((chk == tx20_sd) && (tx20_sc < 400)) {
+    tx20_available = true;
+  }
+
+
+
+
+
+
+
+  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX20_TXD_BLACK]);
+}
+
+void Tx20Read(void)
+{
+  if (!(uptime % TX20_RESET_VALUES)) {
+    tx20_count = 0;
+    tx20_wind_sum = 0;
+    tx20_wind_speed_max = 0;
+  }
+  else if (tx20_available) {
+    tx20_wind_speed_kmh = float(tx20_sc) * 0.36;
+    if (tx20_wind_speed_kmh > tx20_wind_speed_max) {
+      tx20_wind_speed_max = tx20_wind_speed_kmh;
+    }
+    tx20_count++;
+    tx20_wind_sum += tx20_wind_speed_kmh;
+    tx20_wind_speed_avg = tx20_wind_sum / tx20_count;
+    tx20_wind_direction = tx20_sb;
+  }
+}
+
+void Tx20Init(void) {
+  pinMode(pin[GPIO_TX20_TXD_BLACK], INPUT);
+  attachInterrupt(pin[GPIO_TX20_TXD_BLACK], Tx20StartRead, RISING);
+}
+
+void Tx20Show(bool json)
+{
+  char wind_speed_string[33];
+  dtostrfd(tx20_wind_speed_kmh, 2, wind_speed_string);
+  char wind_speed_max_string[33];
+  dtostrfd(tx20_wind_speed_max, 2, wind_speed_max_string);
+  char wind_speed_avg_string[33];
+  dtostrfd(tx20_wind_speed_avg, 2, wind_speed_avg_string);
+  char wind_direction_string[4];
+  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx20_wind_direction, kTx20Directions);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"TX20\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\"}"),
+      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TX20, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns35(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_TX20_TXD_BLACK] < 99) {
+    switch (function) {
+      case FUNC_INIT:
+        Tx20Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        Tx20Read();
+        break;
+      case FUNC_JSON_APPEND:
+        Tx20Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tx20Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
+# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
+#ifdef USE_I2C
+#ifdef USE_MGC3130
+# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
+#define XSNS_36 36
+#define XI2C_27 27
+
+#warning **** MGC3130: It is recommended to disable all unneeded I2C-drivers ****
+
+#define MGC3130_I2C_ADDR 0x42
+
+#define MGC3130_xfer pin[GPIO_MGC3130_XFER]
+#define MGC3130_reset pin[GPIO_MGC3130_RESET]
+
+
+bool MGC3130_type = false;
+char MGC3130stype[] = "MGC3130";
+
+
+#define MGC3130_SYSTEM_STATUS 0x15
+#define MGC3130_REQUEST_MSG 0x06
+#define MGC3130_FW_VERSION 0x83
+#define MGC3130_SET_RUNTIME 0xA2
+#define MGC3130_SENSOR_DATA 0x91
+
+
+#define MGC3130_GESTURE_GARBAGE 1
+#define MGC3130_FLICK_WEST_EAST 2
+#define MGC3130_FLICK_EAST_WEST 3
+#define MGC3130_FLICK_SOUTH_NORTH 4
+#define MGC3130_FLICK_NORTH_SOUTH 5
+#define MGC3130_CIRCLE_CLOCKWISE 6
+#define MGC3130_CIRCLE_CCLOCKWISE 7
+
+#define MGC3130_MIN_ROTVALUE 0
+#define MGC3130_MAX_ROTVALUE 1023
+#define MGC3130_MIN_ZVALUE 32768
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_MGC_3130_SNS[] PROGMEM =
+  "{s}" "%s" "{m}%s{e}"
+  "{s}" "HwRev" "{m}%u.%u{e}"
+  "{s}" "loaderVer" "{m}%u.%u{e}"
+  "{s}" "platVer" "{m}%u{e}";
+#endif
+
+
+
+
+
+
+
+#pragma pack(1)
+union MGC3130_Union{
+  uint8_t buffer[132];
+  struct
+  {
+
+    uint8_t msgSize;
+    uint8_t flag;
+    uint8_t counter;
+    uint8_t id;
+
+    struct {
+        uint8_t DSPStatus:1;
+        uint8_t gestureInfo:1;
+        uint8_t touchInfo:1;
+        uint8_t airWheelInfo:1;
+        uint8_t xyzPosition:1;
+        uint8_t noisePower:1;
+        uint8_t reserved:2;
+        uint8_t electrodeConfiguration:3;
+        uint8_t CICData:1;
+        uint8_t SDData:1;
+        uint16_t reserved2:3;
+    } outputConfigMask;
+    uint8_t timestamp;
+    struct {
+        uint8_t positionValid:1;
+        uint8_t airWheelValid:1;
+        uint8_t rawDataValid:1;
+        uint8_t noisePowerValid:1;
+        uint8_t environmentalNoise:1;
+        uint8_t clipping:1;
+        uint8_t reserved:1;
+        uint8_t DSPRunning:1;
+    } systemInfo;
+    uint16_t dspInfo;
+    struct {
+        uint8_t gestureCode:8;
+        uint8_t reserved:4;
+        uint8_t gestureType:4;
+        uint8_t edgeFlick:1;
+        uint16_t reserved2:14;
+        uint8_t gestureInProgress:1;
+    } gestureInfo;
+    struct {
+        uint8_t touchSouth:1;
+        uint8_t touchWest:1;
+        uint8_t touchNorth:1;
+        uint8_t touchEast:1;
+        uint8_t touchCentre:1;
+        uint8_t tapSouth:1;
+        uint8_t tapWest:1;
+        uint8_t tapNorth:1;
+        uint8_t tapEast :1;
+        uint8_t tapCentre:1;
+        uint8_t doubleTapSouth:1;
+        uint8_t doubleTapWest:1;
+        uint8_t doubleTapNorth:1;
+        uint8_t doubleTapEast:1;
+        uint8_t doubleTapCentre:1;
+        uint8_t reserved:1;
+        uint8_t touchCounter;
+        uint8_t reserved2;
+    } touchInfo;
+    int8_t airWheel;
+    uint8_t reserved;
+    uint16_t x;
+    uint16_t y;
+    uint16_t z;
+    float noisePower;
+    float CICData[4];
+    float SDData[4];
+  } out;
+  struct {
+    uint8_t header[3];
+
+    uint8_t valid;
+    uint8_t hwRev[2];
+    uint8_t parameterStartAddr;
+    uint8_t loaderVersion[2];
+    uint8_t loaderPlatform;
+    uint8_t fwStartAddr;
+    char fwVersion[120];
+  } fw;
+  struct{
+    uint8_t id;
+    uint8_t size;
+    uint16_t error;
+    uint32_t reserved;
+    uint32_t reserved1;
+  } status;
+} MGC_data;
+#pragma pack()
+
+char MGC3130_currentGesture[12];
+
+int8_t MGC3130_delta, MGC3130_lastrotation = 0;
+int16_t MGC3130_rotValue, MGC3130_lastSentRotValue = 0;
+
+uint16_t MGC3130_lastSentX, MGC3130_lastSentY, MGC3130_lastSentZ = 0;
+
+uint8_t hwRev[2], loaderVersion[2], loaderPlatform = 0;
+char MGC3130_firmwareInfo[20];
+
+uint8_t MGC3130_touchTimeout = 0;
+uint16_t MGC3130_touchCounter = 1;
+uint32_t MGC3130_touchTimeStamp = millis();
+bool MGC3130_triggeredByTouch = false;
+
+uint8_t MGC3130_mode = 1;
+
+
+
+uint8_t MGC3130autoCal[] = {0x10, 0x00, 0x00, 0xA2, 0x80, 0x00 , 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF};
+uint8_t MGC3130disableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
+uint8_t MGC3130enableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
+
+void MGC3130_handleSensorData(){
+      if ( MGC_data.out.outputConfigMask.touchInfo && MGC3130_touchTimeout == 0){
+        if (MGC3130_handleTouch()){
+            MGC3130_triggeredByTouch = true;
+            MqttPublishSensor();
+        }
+      }
+
+      if(MGC3130_mode == 1){
+        if( MGC_data.out.outputConfigMask.gestureInfo && MGC_data.out.gestureInfo.gestureCode > 0){
+          MGC3130_handleGesture();
+          MqttPublishSensor();
+        }
+      }
+      if(MGC3130_mode == 2){
+        if(MGC_data.out.outputConfigMask.airWheelInfo && MGC_data.out.systemInfo.airWheelValid){
+          MGC3130_handleAirWheel();
+          MqttPublishSensor();
+        }
+      }
+      if(MGC3130_mode == 3){
+        if(MGC_data.out.systemInfo.positionValid && (MGC_data.out.z > MGC3130_MIN_ZVALUE)){
+          MqttPublishSensor();
+        }
+      }
+}
+
+void MGC3130_sendMessage(uint8_t data[], uint8_t length){
+   Wire.beginTransmission(MGC3130_I2C_ADDR);
+    Wire.write(data,length);
+   Wire.endTransmission();
+    delay(2);
+    MGC3130_receiveMessage();
+}
+
+
+void MGC3130_handleGesture(){
+
+  char edge[5];
+  if (MGC_data.out.gestureInfo.edgeFlick){
+    snprintf_P(edge, sizeof(edge), PSTR("ED_"));
+  }
+  else{
+    snprintf_P(edge, sizeof(edge), PSTR(""));
+  }
+  switch(MGC_data.out.gestureInfo.gestureCode){
+    case MGC3130_GESTURE_GARBAGE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("NONE"));
+    break;
+    case MGC3130_FLICK_WEST_EAST:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_WE"), edge);
+    break;
+    case MGC3130_FLICK_EAST_WEST:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_EW"), edge);
+    break;
+    case MGC3130_FLICK_SOUTH_NORTH:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_SN"), edge);
+    break;
+    case MGC3130_FLICK_NORTH_SOUTH:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_NS"), edge);
+    break;
+    case MGC3130_CIRCLE_CLOCKWISE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CW"));
+    break;
+    case MGC3130_CIRCLE_CCLOCKWISE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CCW"));
+    break;
+  }
+
+}
+
+bool MGC3130_handleTouch(){
+
+  bool success = false;
+    if (MGC_data.out.touchInfo.doubleTapCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_C"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_E"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_N"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_W"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_S"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    if (MGC_data.out.touchInfo.tapCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_C"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_E"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_N"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_W"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_S"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.touchCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_C"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_E"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_N"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_W"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_S"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+
+  return success;
+}
+
+void MGC3130_handleAirWheel(){
+  MGC3130_delta = MGC_data.out.airWheel - MGC3130_lastrotation;
+  MGC3130_lastrotation = MGC_data.out.airWheel;
+
+      MGC3130_rotValue = MGC3130_rotValue + MGC3130_delta;
+      if(MGC3130_rotValue < MGC3130_MIN_ROTVALUE){
+        MGC3130_rotValue = MGC3130_MIN_ROTVALUE;
+      }
+      if(MGC3130_rotValue > MGC3130_MAX_ROTVALUE){
+        MGC3130_rotValue = MGC3130_MAX_ROTVALUE;
+      }
+}
+
+void MGC3130_handleSystemStatus(){
+
+}
+
+bool MGC3130_receiveMessage(){
+  if(MGC3130_readData()){
+      switch(MGC_data.out.id){
+        case MGC3130_SENSOR_DATA:
+          MGC3130_handleSensorData();
+          break;
+        case MGC3130_SYSTEM_STATUS:
+          MGC3130_handleSystemStatus();
+          break;
+        case MGC3130_FW_VERSION:
+          hwRev[0] = MGC_data.fw.hwRev[1];
+          hwRev[1] = MGC_data.fw.hwRev[0];
+          loaderVersion[0] = MGC_data.fw.loaderVersion[0];
+          loaderVersion[1] = MGC_data.fw.loaderVersion[1];
+          loaderPlatform = MGC_data.fw.loaderPlatform;
+          snprintf_P(MGC3130_firmwareInfo, sizeof(MGC3130_firmwareInfo), PSTR("FW: %s"), MGC_data.fw.fwVersion);
+          MGC3130_firmwareInfo[20] = '\0';
+
+          break;
+      }
+    return true;
+  }
+  return false;
+}
+
+bool MGC3130_readData()
+{
+  bool success = false;
+  if (!digitalRead(MGC3130_xfer)){
+    pinMode(MGC3130_xfer, OUTPUT);
+    digitalWrite(MGC3130_xfer, LOW);
+    Wire.requestFrom(MGC3130_I2C_ADDR, (uint16_t)32);
+
+    MGC_data.buffer[0] = 4;
+    unsigned char i = 0;
+    while(Wire.available() && (i < MGC_data.buffer[0])){
+      MGC_data.buffer[i] = Wire.read();
+      i++;
+      }
+    digitalWrite(MGC3130_xfer, HIGH);
+    pinMode(MGC3130_xfer, INPUT);
+    success = true;
+  }
+  return success;
+}
+
+void MGC3130_nextMode(){
+  if (MGC3130_mode < 3){
+    MGC3130_mode++;
+  }
+  else{
+    MGC3130_mode = 1;
+  }
+  switch(MGC3130_mode){
+    case 1:
+    MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+    case 2:
+    MGC3130_sendMessage(MGC3130enableAirwheel,16);
+    break;
+    case 3:
+    MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+  }
+}
+
+void MGC3130_loop()
+{
+  if(MGC3130_touchTimeout > 0){
+    MGC3130_touchTimeout--;
+  }
+  MGC3130_receiveMessage();
+}
+
+void MGC3130_detect(void)
+{
+  if (MGC3130_type || I2cActive(MGC3130_I2C_ADDR)) { return; }
+
+  pinMode(MGC3130_xfer, INPUT_PULLUP);
+  pinMode(MGC3130_reset, OUTPUT);
+  digitalWrite(MGC3130_reset, LOW);
+  delay(10);
+  digitalWrite(MGC3130_reset, HIGH);
+  delay(50);
+
+  if (MGC3130_receiveMessage()) {
+    I2cSetActiveFound(MGC3130_I2C_ADDR, MGC3130stype);
+    MGC3130_currentGesture[0] = '\0';
+    MGC3130_type = true;
+  }
+}
+
+
+
+
+
+void MGC3130_show(bool json)
+{
+  if (!MGC3130_type) { return; }
+
+  char status_chr[2];
+  if (MGC_data.out.systemInfo.DSPRunning) {
+    sprintf (status_chr, "1");
+  }
+  else{
+    sprintf (status_chr, "0");
+  }
+
+  if (json) {
+    if (MGC3130_mode == 3 && !MGC3130_triggeredByTouch) {
+      if (MGC_data.out.systemInfo.positionValid && !(MGC_data.out.x == MGC3130_lastSentX && MGC_data.out.y == MGC3130_lastSentY && MGC_data.out.z == MGC3130_lastSentZ)) {
+        ResponseAppend_P(PSTR(",\"%s\":{\"X\":%u,\"Y\":%u,\"Z\":%u}"),
+          MGC3130stype, MGC_data.out.x/64, MGC_data.out.y/64, (MGC_data.out.z-(uint16_t)MGC3130_MIN_ZVALUE)/64);
+        MGC3130_lastSentX = MGC_data.out.x;
+        MGC3130_lastSentY = MGC_data.out.y;
+        MGC3130_lastSentZ = MGC_data.out.z;
+      }
+    }
+    MGC3130_triggeredByTouch = false;
+
+    if (MGC3130_mode == 2) {
+      if (MGC_data.out.systemInfo.airWheelValid && (MGC3130_rotValue != MGC3130_lastSentRotValue)) {
+        ResponseAppend_P(PSTR(",\"%s\":{\"AW\":%i}"), MGC3130stype, MGC3130_rotValue);
+        MGC3130_lastSentRotValue = MGC3130_rotValue;
+      }
+    }
+
+    if (MGC3130_currentGesture[0] != '\0') {
+      if (millis() - MGC3130_touchTimeStamp > 220 ) {
+        MGC3130_touchCounter = 1;
+      }
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), MGC3130stype, MGC3130_currentGesture, MGC3130_touchCounter);
+      MGC3130_currentGesture[0] = '\0';
+      MGC3130_touchTimeStamp = millis();
+    }
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_MGC_3130_SNS, MGC3130stype, status_chr, hwRev[0], hwRev[1], loaderVersion[0], loaderVersion[1], loaderPlatform );
+#endif
+  }
+}
+# 557 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
+bool MGC3130CommandSensor()
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      MGC3130_nextMode();
+      break;
+    case 1:
+      MGC3130_mode = 1;
+      MGC3130_sendMessage(MGC3130disableAirwheel,16);
+      break;
+    case 2:
+      MGC3130_mode = 2;
+      MGC3130_sendMessage(MGC3130enableAirwheel,16);
+      break;
+    case 3:
+      MGC3130_mode = 3;
+      MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns36(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_27)) { return false; }
+
+  bool result = false;
+
+  if ((FUNC_INIT == function) && (pin[GPIO_MGC3130_XFER] < 99) && (pin[GPIO_MGC3130_RESET] < 99)) {
+    MGC3130_detect();
+  }
+  else if (MGC3130_type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        MGC3130_loop();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_36 == XdrvMailbox.index) {
+          result = MGC3130CommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MGC3130_show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MGC3130_show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#ifdef USE_RF_SENSOR
+# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define XSNS_37 37
+
+
+
+
+#define RFSNS_VALID_WINDOW 1800
+
+#define RFSNS_LOOPS_PER_MILLI 1900
+#define RFSNS_RAW_BUFFER_SIZE 180
+#define RFSNS_MIN_RAW_PULSES 112
+
+#define RFSNS_MIN_PULSE_LENGTH 300
+#define RFSNS_RAWSIGNAL_SAMPLE 50
+#define RFSNS_SIGNAL_TIMEOUT 10
+#define RFSNS_SIGNAL_REPEAT_TIME 500
+
+typedef struct RawSignalStruct
+{
+  int Number;
+  uint8_t Repeats;
+  uint8_t Multiply;
+  unsigned long Time;
+  uint8_t Pulses[RFSNS_RAW_BUFFER_SIZE+2];
+
+} raw_signal_t;
+
+raw_signal_t *rfsns_raw_signal = nullptr;
+uint8_t rfsns_rf_bit;
+uint8_t rfsns_rf_port;
+uint8_t rfsns_any_sensor = 0;
+
+
+
+
+
+bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal)
+{
+  uint8_t Fbit = digitalPinToBitMask(DataPin);
+  uint8_t Fport = digitalPinToPort(DataPin);
+  uint8_t FstateMask = (StateSignal ? Fbit : 0);
+
+  if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
+    const unsigned long LoopsPerMilli = RFSNS_LOOPS_PER_MILLI;
+
+
+
+
+
+
+    unsigned long PulseLength = 0;
+    if (rfsns_raw_signal->Time) {
+      if (rfsns_raw_signal->Repeats && (rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) {
+        PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
+        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && (PulseLength > micros())) {
+          if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
+            PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
+          }
+        }
+        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && ((*portInputRegister(Fport) & Fbit) != FstateMask));
+      }
+    }
+
+    int RawCodeLength = 1;
+    bool Ftoggle = false;
+    unsigned long numloops = 0;
+    unsigned long maxloops = RFSNS_SIGNAL_TIMEOUT * LoopsPerMilli;
+    rfsns_raw_signal->Multiply = RFSNS_RAWSIGNAL_SAMPLE;
+    do {
+      numloops = 0;
+      while(((*portInputRegister(Fport) & Fbit) == FstateMask) ^ Ftoggle) {
+        if (numloops++ == maxloops) { break; }
+      }
+      PulseLength = (numloops *1000) / LoopsPerMilli;
+      if (PulseLength < RFSNS_MIN_PULSE_LENGTH) { break; }
+      Ftoggle = !Ftoggle;
+      rfsns_raw_signal->Pulses[RawCodeLength++] = PulseLength / (unsigned long)rfsns_raw_signal->Multiply;
+    }
+    while(RawCodeLength < RFSNS_RAW_BUFFER_SIZE && numloops <= maxloops);
+
+    if ((RawCodeLength >= RFSNS_MIN_RAW_PULSES) && (RawCodeLength < RFSNS_RAW_BUFFER_SIZE -1)) {
+      rfsns_raw_signal->Repeats = 0;
+      rfsns_raw_signal->Number = RawCodeLength -1;
+      rfsns_raw_signal->Pulses[rfsns_raw_signal->Number] = 0;
+      rfsns_raw_signal->Time = millis();
+      return true;
+    }
+    else
+      rfsns_raw_signal->Number = 0;
+  }
+
+  return false;
+}
+
+#ifdef USE_THEO_V2
+# 149 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define RFSNS_THEOV2_MAX_CHANNEL 2
+
+#define RFSNS_THEOV2_PULSECOUNT 114
+#define RFSNS_THEOV2_RF_PULSE_MID 1000
+
+typedef struct {
+  uint32_t time;
+  int16_t temp;
+  uint16_t lux;
+  uint8_t volt;
+} theo_v2_t1_t;
+
+typedef struct {
+  uint32_t time;
+  int16_t temp;
+  uint16_t hum;
+  uint8_t volt;
+} theo_v2_t2_t;
+
+theo_v2_t1_t *rfsns_theo_v2_t1 = nullptr;
+theo_v2_t2_t *rfsns_theo_v2_t2 = nullptr;
+
+void RfSnsInitTheoV2(void)
+{
+  rfsns_theo_v2_t1 = (theo_v2_t1_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t1_t));
+  rfsns_theo_v2_t2 = (theo_v2_t2_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t2_t));
+  rfsns_any_sensor++;
+}
+
+void RfSnsAnalyzeTheov2(void)
+{
+  if (rfsns_raw_signal->Number != RFSNS_THEOV2_PULSECOUNT) { return; }
+
+  uint8_t Checksum;
+  uint8_t Channel;
+  uint8_t Type;
+  uint8_t Voltage;
+  int Payload1;
+  int Payload2;
+
+  uint8_t b, bytes, bits, id;
+
+  uint8_t idx = 3;
+  uint8_t chksum = 0;
+  for (bytes = 0; bytes < 7; bytes++) {
+    b = 0;
+    for (bits = 0; bits <= 7; bits++)
+    {
+      if ((rfsns_raw_signal->Pulses[idx] * rfsns_raw_signal->Multiply) > RFSNS_THEOV2_RF_PULSE_MID) {
+        b |= 1 << bits;
+      }
+      idx += 2;
+    }
+    if (bytes > 0) { chksum += b; }
+
+    switch (bytes) {
+    case 0:
+      Checksum = b;
+      break;
+    case 1:
+      id = b;
+      Channel = b & 0x7;
+      Type = (b >> 3) & 0x1f;
+      break;
+    case 2:
+      Voltage = b;
+      break;
+    case 3:
+      Payload1 = b;
+      break;
+    case 4:
+      Payload1 = (b << 8) | Payload1;
+      break;
+    case 5:
+      Payload2 = b;
+      break;
+    case 6:
+      Payload2 = (b << 8) | Payload2;
+      break;
+    }
+  }
+
+  if (Checksum != chksum) { return; }
+  if ((Channel == 0) || (Channel > RFSNS_THEOV2_MAX_CHANNEL)) { return; }
+  Channel--;
+
+  rfsns_raw_signal->Repeats = 1;
+
+  int Payload3 = Voltage & 0x3f;
+
+  switch (Type) {
+  case 1:
+    rfsns_theo_v2_t1[Channel].time = LocalTime();
+    rfsns_theo_v2_t1[Channel].volt = Payload3;
+    rfsns_theo_v2_t1[Channel].temp = Payload1;
+    rfsns_theo_v2_t1[Channel].lux = Payload2;
+    break;
+  case 2:
+    rfsns_theo_v2_t2[Channel].time = LocalTime();
+    rfsns_theo_v2_t2[Channel].volt = Payload3;
+    rfsns_theo_v2_t2[Channel].temp = Payload1;
+    rfsns_theo_v2_t2[Channel].hum = Payload2;
+    break;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: TheoV2, ChkCalc %d, Chksum %d, id %d, Type %d, Ch %d, Volt %d, BattLo %d, Pld1 %d, Pld2 %d"),
+    chksum, Checksum, id, Type, Channel +1, Payload3, (Voltage & 0x80) >> 7, Payload1, Payload2);
+}
+
+void RfSnsTheoV2Show(bool json)
+{
+  bool sensor_once = false;
+
+  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
+    if (rfsns_theo_v2_t1[i].time) {
+      char sensor[10];
+      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T1C%d"), i +1);
+      char voltage[33];
+      dtostrfd((float)rfsns_theo_v2_t1[i].volt / 10, 1, voltage);
+
+      if (rfsns_theo_v2_t1[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED "\":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, GetDT(rfsns_theo_v2_t1[i].time).c_str(), voltage);
+        }
+      } else {
+        char temperature[33];
+        dtostrfd(ConvertTemp((float)rfsns_theo_v2_t1[i].temp / 100), Settings.flag2.temperature_resolution, temperature);
+
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, temperature, rfsns_theo_v2_t1[i].lux, voltage);
+#ifdef USE_DOMOTICZ
+          if ((0 == tele_period) && !sensor_once) {
+            DomoticzSensor(DZ_TEMP, temperature);
+            DomoticzSensor(DZ_ILLUMINANCE, rfsns_theo_v2_t1[i].lux);
+            sensor_once = true;
+          }
+#endif
+#ifdef USE_WEBSERVER
+        } else {
+          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
+          WSContentSend_PD(HTTP_SNS_ILLUMINANCE, sensor, rfsns_theo_v2_t1[i].lux);
+#endif
+        }
+      }
+    }
+  }
+
+  sensor_once = false;
+  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
+    if (rfsns_theo_v2_t2[i].time) {
+      char sensor[10];
+      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T2C%d"), i +1);
+      char voltage[33];
+      dtostrfd((float)rfsns_theo_v2_t2[i].volt / 10, 1, voltage);
+
+      if (rfsns_theo_v2_t2[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED" \":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, GetDT(rfsns_theo_v2_t2[i].time).c_str(), voltage);
+        }
+      } else {
+        float temp = ConvertTemp((float)rfsns_theo_v2_t2[i].temp / 100);
+        float humi = ConvertHumidity((float)rfsns_theo_v2_t2[i].hum / 100);
+        char temperature[33];
+        dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
+        char humidity[33];
+        dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
+
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, temperature, humidity, voltage);
+          if ((0 == tele_period) && !sensor_once) {
+#ifdef USE_DOMOTICZ
+            DomoticzTempHumSensor(temperature, humidity);
+#endif
+#ifdef USE_KNX
+            KnxSensor(KNX_TEMPERATURE, temp);
+            KnxSensor(KNX_HUMIDITY, humi);
+#endif
+            sensor_once = true;
+          }
+#ifdef USE_WEBSERVER
+        } else {
+          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
+          WSContentSend_PD(HTTP_SNS_HUM, sensor, humidity);
+#endif
+        }
+      }
+    }
+  }
+}
+
+#endif
+
+#ifdef USE_ALECTO_V2
+# 392 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define RFSNS_DKW2012_PULSECOUNT 176
+#define RFSNS_ACH2010_MIN_PULSECOUNT 160
+#define RFSNS_ACH2010_MAX_PULSECOUNT 160
+
+#define D_ALECTOV2 "AlectoV2"
+
+const char kAlectoV2Directions[] PROGMEM = D_TX20_NORTH "|"
+                                           D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_EAST "|"
+                                           D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH "|"
+                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_WEST "|"
+                                           D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
+                                           D_TX20_NORTH D_TX20_WEST "|"
+                                           D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
+
+typedef struct {
+  uint32_t time;
+  float temp;
+  float rain;
+  float wind;
+  float gust;
+  uint8_t type;
+  uint8_t humi;
+  uint8_t wdir;
+} alecto_v2_t;
+
+alecto_v2_t *rfsns_alecto_v2 = nullptr;
+uint16_t rfsns_alecto_rain_base = 0;
+
+void RfSnsInitAlectoV2(void)
+{
+  rfsns_alecto_v2 = (alecto_v2_t*)malloc(sizeof(alecto_v2_t));
+  rfsns_any_sensor++;
+}
+
+void RfSnsAnalyzeAlectov2()
+{
+  if (!(((rfsns_raw_signal->Number >= RFSNS_ACH2010_MIN_PULSECOUNT) &&
+         (rfsns_raw_signal->Number <= RFSNS_ACH2010_MAX_PULSECOUNT)) || (rfsns_raw_signal->Number == RFSNS_DKW2012_PULSECOUNT))) { return; }
+
+  uint8_t c = 0;
+  uint8_t rfbit;
+  uint8_t data[9] = { 0 };
+  uint8_t msgtype = 0;
+  uint8_t rc = 0;
+  int temp;
+  uint8_t checksum = 0;
+  uint8_t checksumcalc = 0;
+  uint8_t maxidx = 8;
+  unsigned long atime;
+  float factor;
+  char buf1[16];
+
+  if (rfsns_raw_signal->Number > RFSNS_ACH2010_MAX_PULSECOUNT) { maxidx = 9; }
+
+  uint8_t idx = maxidx;
+  for (uint32_t x = rfsns_raw_signal->Number; x > 0; x = x-2) {
+    if (rfsns_raw_signal->Pulses[x-1] * rfsns_raw_signal->Multiply < 0x300) {
+      rfbit = 0x80;
+    } else {
+      rfbit = 0;
+    }
+    data[idx] = (data[idx] >> 1) | rfbit;
+    c++;
+    if (c == 8) {
+      if (idx == 0) { break; }
+      c = 0;
+      idx--;
+    }
+  }
+
+  checksum = data[maxidx];
+  checksumcalc = RfSnsAlectoCRC8(data, maxidx);
+
+  msgtype = (data[0] >> 4) & 0xf;
+  rc = (data[0] << 4) | (data[1] >> 4);
+
+  if (checksum != checksumcalc) { return; }
+  if ((msgtype != 10) && (msgtype != 5)) { return; }
+
+  rfsns_raw_signal->Repeats = 1;
+
+
+
+
+
+  factor = 1.22;
+
+
+
+
+
+  rfsns_alecto_v2->time = LocalTime();
+  rfsns_alecto_v2->type = (RFSNS_DKW2012_PULSECOUNT == rfsns_raw_signal->Number);
+  rfsns_alecto_v2->temp = (float)(((data[1] & 0x3) * 256 + data[2]) - 400) / 10;
+  rfsns_alecto_v2->humi = data[3];
+  uint16_t rain = (data[6] * 256) + data[7];
+
+  if (rain < rfsns_alecto_rain_base) { rfsns_alecto_rain_base = rain; }
+  if (rfsns_alecto_rain_base > 0) {
+    rfsns_alecto_v2->rain += ((float)rain - rfsns_alecto_rain_base) * 0.30;
+  }
+  rfsns_alecto_rain_base = rain;
+  rfsns_alecto_v2->wind = (float)data[4] * factor;
+  rfsns_alecto_v2->gust = (float)data[5] * factor;
+  if (rfsns_alecto_v2->type) {
+    rfsns_alecto_v2->wdir = data[8] & 0xf;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: " D_ALECTOV2 ", ChkCalc %d, Chksum %d, rc %d, Temp %d, Hum %d, Rain %d, Wind %d, Gust %d, Dir %d, Factor %s"),
+    checksumcalc, checksum, rc, ((data[1] & 0x3) * 256 + data[2]) - 400, data[3], (data[6] * 256) + data[7], data[4], data[5], data[8] & 0xf, dtostrfd(factor, 3, buf1));
+}
+
+void RfSnsAlectoResetRain(void)
+{
+  if ((RtcTime.hour == 0) && (RtcTime.minute == 0) && (RtcTime.second == 5)) {
+    rfsns_alecto_v2->rain = 0;
+  }
+}
+
+
+
+
+
+
+
+uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len)
+{
+  uint8_t crc = 0;
+  while (len--) {
+    uint8_t inbyte = *addr++;
+    for (uint32_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x80;
+      crc <<= 1;
+      if (mix) { crc ^= 0x31; }
+      inbyte <<= 1;
+    }
+  }
+  return crc;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_ALECTOV2[] PROGMEM =
+  "{s}" D_ALECTOV2 " " D_RAIN "{m}%s " D_UNIT_MILLIMETER "{e}"
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}";
+const char HTTP_SNS_ALECTOV2_WDIR[] PROGMEM =
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_DIRECTION "{m}%s{e}";
+#endif
+
+void RfSnsAlectoV2Show(bool json)
+{
+  if (rfsns_alecto_v2->time) {
+    if (rfsns_alecto_v2->time < LocalTime() - RFSNS_VALID_WINDOW) {
+      if (json) {
+        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_RFRECEIVED "\":\"%s\"}"), GetDT(rfsns_alecto_v2->time).c_str());
+      }
+    } else {
+      float temp = ConvertTemp(rfsns_alecto_v2->temp);
+      char temperature[33];
+      dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
+      float humi = ConvertHumidity((float)rfsns_alecto_v2->humi);
+      char humidity[33];
+      dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
+      char rain[33];
+      dtostrfd(rfsns_alecto_v2->rain, 2, rain);
+      char wind[33];
+      dtostrfd(rfsns_alecto_v2->wind, 2, wind);
+      char gust[33];
+      dtostrfd(rfsns_alecto_v2->gust, 2, gust);
+      char wdir[4];
+      char direction[20];
+      if (rfsns_alecto_v2->type) {
+        GetTextIndexed(wdir, sizeof(wdir), rfsns_alecto_v2->wdir, kAlectoV2Directions);
+        snprintf_P(direction, sizeof(direction), PSTR(",\"Direction\":\"%s\""), wdir);
+      }
+
+      if (json) {
+        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"Rain\":%s,\"Wind\":%s,\"Gust\":%s%s}"),
+          temperature, humidity, rain, wind, gust, (rfsns_alecto_v2->type) ? direction : "");
+        if (0 == tele_period) {
+#ifdef USE_DOMOTICZ
+
+
+
+
+#endif
+        }
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, D_ALECTOV2, temperature, TempUnit());
+        WSContentSend_PD(HTTP_SNS_HUM, D_ALECTOV2, humidity);
+        WSContentSend_PD(HTTP_SNS_ALECTOV2, rain, wind, gust);
+        if (rfsns_alecto_v2->type) {
+          WSContentSend_PD(HTTP_SNS_ALECTOV2_WDIR, wdir);
+        }
+#endif
+      }
+    }
+  }
+}
+#endif
+
+void RfSnsInit(void)
+{
+  rfsns_raw_signal = (raw_signal_t*)(malloc(sizeof(raw_signal_t)));
+  if (rfsns_raw_signal) {
+    memset(rfsns_raw_signal, 0, sizeof(raw_signal_t));
+#ifdef USE_THEO_V2
+    RfSnsInitTheoV2();
+#endif
+#ifdef USE_ALECTO_V2
+    RfSnsInitAlectoV2();
+#endif
+    if (rfsns_any_sensor) {
+      rfsns_rf_bit = digitalPinToBitMask(pin[GPIO_RF_SENSOR]);
+      rfsns_rf_port = digitalPinToPort(pin[GPIO_RF_SENSOR]);
+      pinMode(pin[GPIO_RF_SENSOR], INPUT);
+    } else {
+      free(rfsns_raw_signal);
+      rfsns_raw_signal = nullptr;
+    }
+  }
+}
+
+void RfSnsAnalyzeRawSignal(void)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: Pulses %d"), (int)rfsns_raw_signal->Number);
+
+#ifdef USE_THEO_V2
+    RfSnsAnalyzeTheov2();
+#endif
+#ifdef USE_ALECTO_V2
+    RfSnsAnalyzeAlectov2();
+#endif
+}
+
+void RfSnsEverySecond(void)
+{
+#ifdef USE_ALECTO_V2
+  RfSnsAlectoResetRain();
+#endif
+}
+
+void RfSnsShow(bool json)
+{
+#ifdef USE_THEO_V2
+  RfSnsTheoV2Show(json);
+#endif
+#ifdef USE_ALECTO_V2
+  RfSnsAlectoV2Show(json);
+#endif
+}
+
+
+
+
+
+bool Xsns37(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_RF_SENSOR] < 99) && (FUNC_INIT == function)) {
+    RfSnsInit();
+  }
+  else if (rfsns_raw_signal) {
+    switch (function) {
+      case FUNC_LOOP:
+        if ((*portInputRegister(rfsns_rf_port) &rfsns_rf_bit) == rfsns_rf_bit) {
+          if (RfSnsFetchSignal(pin[GPIO_RF_SENSOR], HIGH)) {
+            RfSnsAnalyzeRawSignal();
+          }
+        }
+        sleep = 0;
+        break;
+      case FUNC_EVERY_SECOND:
+        RfSnsEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        RfSnsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        RfSnsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
+#ifdef USE_AZ7798
+
+#define XSNS_38 38
+# 112 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
+#include <TasmotaSerial.h>
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#define AZ_READ_TIMEOUT 400
+
+#define AZ_CLOCK_UPDATE_INTERVAL (24UL * 60 * 60)
+#define AZ_EPOCH (946684800UL)
+
+TasmotaSerial *AzSerial;
+
+const char ktype[] = "AZ7798";
+uint8_t az_type = 1;
+uint16_t az_co2 = 0;
+double az_temperature = 0;
+double az_humidity = 0;
+uint8_t az_received = 0;
+uint8_t az_state = 0;
+unsigned long az_clock_update = 10;
+
+
+
+void AzEverySecond(void)
+{
+  unsigned long start = millis();
+
+  az_state++;
+  if (5 == az_state) {
+    az_state = 0;
+
+    AzSerial->flush();
+    AzSerial->write(":\r", 2);
+    az_received = 0;
+
+    uint8_t az_response[32];
+    uint8_t counter = 0;
+    uint8_t i, j;
+    uint8_t response_substr[16];
+
+    do {
+      if (AzSerial->available() > 0) {
+        az_response[counter] = AzSerial->read();
+        if(az_response[counter] == 0x0d) { az_received = 1; }
+        counter++;
+      } else {
+        delay(5);
+      }
+    } while(((millis() - start) < AZ_READ_TIMEOUT) && (counter < sizeof(az_response)) && !az_received);
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, az_response, counter);
+
+    if (!az_received) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 comms timeout"));
+      return;
+    }
+
+    i = 0;
+    while((az_response[i] != 'T') && (i < counter)) {i++;}
+    if(az_response[i] != 'T') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find start of response"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != 'C') && (az_response[i] != 'F') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if((az_response[i] != 'C') && (az_response[i] != 'F')){
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of temperature"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_temperature = CharToFloat((char*)response_substr);
+    if(az_response[i] == 'C') {
+      az_temperature = ConvertTemp((float)az_temperature);
+    } else {
+      az_temperature = ConvertTemp((az_temperature - 32) / 1.8);
+    }
+    i++;
+    if(az_response[i] != ':') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error first delimiter"));
+      return;
+    }
+    i++;
+    if(az_response[i] != 'C') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of CO2"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != 'p') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if(az_response[i] != 'p') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of CO2"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_co2 = atoi((char*)response_substr);
+    LightSetSignal(CO2_LOW, CO2_HIGH, az_co2);
+    i += 3;
+    if(az_response[i] != ':') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error second delimiter"));
+      return;
+    }
+    i++;
+    if(az_response[i] != 'H') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of humidity"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != '%') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if(az_response[i] != '%') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of humidity"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_humidity = ConvertHumidity(CharToFloat((char*)response_substr));
+  }
+
+
+  if ((az_clock_update == 0) && (LocalTime() > AZ_EPOCH)) {
+    char tmpString[16];
+    sprintf(tmpString, "C %d\r", (int)(LocalTime() - AZ_EPOCH));
+    AzSerial->write(tmpString);
+
+    do {
+      if (AzSerial->available() > 0) {
+        if(AzSerial->read() == 0x0d) { break; }
+      } else {
+        delay(5);
+      }
+    } while(((millis() - start) < AZ_READ_TIMEOUT));
+    az_clock_update = AZ_CLOCK_UPDATE_INTERVAL;
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 clock updated"));
+  } else {
+    az_clock_update--;
+  }
+}
+
+
+
+void AzInit(void)
+{
+  az_type = 0;
+  if ((pin[GPIO_AZ_RXD] < 99) && (pin[GPIO_AZ_TXD] < 99)) {
+    AzSerial = new TasmotaSerial(pin[GPIO_AZ_RXD], pin[GPIO_AZ_TXD], 1);
+    if (AzSerial->begin(9600)) {
+      if (AzSerial->hardwareSerial()) { ClaimSerial(); }
+      az_type = 1;
+    }
+  }
+}
+
+void AzShow(bool json)
+{
+  char temperature[33];
+  dtostrfd(az_temperature, Settings.flag2.temperature_resolution, temperature);
+  char humidity[33];
+  dtostrfd(az_humidity, Settings.flag2.humidity_resolution, humidity);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"), ktype, az_co2, temperature, humidity);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, az_co2);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, ktype, az_co2);
+    WSContentSend_PD(HTTP_SNS_TEMP, ktype, temperature, TempUnit());
+    WSContentSend_PD(HTTP_SNS_HUM, ktype, humidity);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns38(uint8_t function)
+{
+  bool result = false;
+
+  if(az_type){
+    switch (function) {
+      case FUNC_INIT:
+        AzInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        AzEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        AzShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        AzShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_39_max31855.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_39_max31855.ino"
+#ifdef USE_MAX31855
+
+#define XSNS_39 39
+
+bool initialized = false;
+
+struct MAX31855_ResultStruct{
+    uint8_t ErrorCode;
+    float ProbeTemperature;
+    float ReferenceTemperature;
+} MAX31855_Result;
+
+void MAX31855_Init(void){
+    if(initialized)
+        return;
+
+
+    pinMode(pin[GPIO_MAX31855CS], OUTPUT);
+    pinMode(pin[GPIO_MAX31855CLK], OUTPUT);
+    pinMode(pin[GPIO_MAX31855DO], INPUT);
+
+
+    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
+    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+
+    initialized = true;
+}
+
+
+
+
+
+void MAX31855_GetResult(void){
+    int32_t RawData = MAX31855_ShiftIn(32);
+    uint8_t probeerror = RawData & 0x7;
+
+    MAX31855_Result.ErrorCode = probeerror;
+    MAX31855_Result.ReferenceTemperature = MAX31855_GetReferenceTemperature(RawData);
+    if(probeerror)
+        MAX31855_Result.ProbeTemperature = NAN;
+    else
+        MAX31855_Result.ProbeTemperature = MAX31855_GetProbeTemperature(RawData);
+}
+
+
+
+
+
+
+float MAX31855_GetProbeTemperature(int32_t RawData){
+    if(RawData & 0x80000000)
+        RawData = (RawData >> 18) | 0xFFFFC000;
+    else
+        RawData >>= 18;
+
+    float result = (RawData * 0.25);
+
+    return ConvertTemp(result);
+}
+
+
+
+
+
+float MAX31855_GetReferenceTemperature(int32_t RawData){
+    if(RawData & 0x8000)
+        RawData = (RawData >> 4) | 0xFFFFF000;
+    else
+        RawData = (RawData >> 4) & 0x00000FFF;
+
+    float result = (RawData * 0.0625);
+
+    return ConvertTemp(result);
+}
+
+
+
+
+
+int32_t MAX31855_ShiftIn(uint8_t Length){
+    int32_t dataIn = 0;
+
+    digitalWrite(pin[GPIO_MAX31855CS], LOW);
+    delayMicroseconds(1);
+
+    for (uint32_t i = 0; i < Length; i++)
+    {
+        digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+        delayMicroseconds(1);
+        dataIn <<= 1;
+        if(digitalRead(pin[GPIO_MAX31855DO]))
+            dataIn |= 1;
+        digitalWrite(pin[GPIO_MAX31855CLK], HIGH);
+        delayMicroseconds(1);
+    }
+
+    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
+    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+    return dataIn;
+}
+
+void MAX31855_Show(bool Json){
+    char probetemp[33];
+    char referencetemp[33];
+    dtostrfd(MAX31855_Result.ProbeTemperature, Settings.flag2.temperature_resolution, probetemp);
+    dtostrfd(MAX31855_Result.ReferenceTemperature, Settings.flag2.temperature_resolution, referencetemp);
+
+    if(Json){
+        ResponseAppend_P(PSTR(",\"MAX31855\":{\"" D_JSON_PROBETEMPERATURE "\":%s,\"" D_JSON_REFERENCETEMPERATURE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
+          probetemp, referencetemp, MAX31855_Result.ErrorCode);
+#ifdef USE_DOMOTICZ
+        if (0 == tele_period) {
+          DomoticzSensor(DZ_TEMP, probetemp);
+        }
+#endif
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, MAX31855_Result.ProbeTemperature);
+        }
+#endif
+    } else {
+#ifdef USE_WEBSERVER
+        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31855", probetemp, TempUnit());
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns39(uint8_t function)
+{
+  bool result = false;
+  if((pin[GPIO_MAX31855CS] < 99) && (pin[GPIO_MAX31855CLK] < 99) && (pin[GPIO_MAX31855DO] < 99)){
+
+    switch (function) {
+      case FUNC_INIT:
+        MAX31855_Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        MAX31855_GetResult();
+        break;
+      case FUNC_JSON_APPEND:
+        MAX31855_Show(true);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MAX31855_Show(false);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
+#ifdef USE_PN532_HSU
+
+#define XSNS_40 40
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PN532_Serial;
+
+#define PN532_INVALID_ACK -1
+#define PN532_TIMEOUT -2
+#define PN532_INVALID_FRAME -3
+#define PN532_NO_SPACE -4
+
+#define PN532_PREAMBLE 0x00
+#define PN532_STARTCODE1 0x00
+#define PN532_STARTCODE2 0xFF
+#define PN532_POSTAMBLE 0x00
+
+#define PN532_HOSTTOPN532 0xD4
+#define PN532_PN532TOHOST 0xD5
+
+#define PN532_ACK_WAIT_TIME 0x0A
+
+#define PN532_COMMAND_GETFIRMWAREVERSION 0x02
+#define PN532_COMMAND_SAMCONFIGURATION 0x14
+#define PN532_COMMAND_RFCONFIGURATION 0x32
+#define PN532_COMMAND_INDATAEXCHANGE 0x40
+#define PN532_COMMAND_INLISTPASSIVETARGET 0x4A
+
+#define PN532_MIFARE_ISO14443A 0x00
+#define MIFARE_CMD_READ 0x30
+#define MIFARE_CMD_AUTH_A 0x60
+#define MIFARE_CMD_AUTH_B 0x61
+#define MIFARE_CMD_WRITE 0xA0
+
+uint8_t pn532_model = 0;
+uint8_t pn532_command = 0;
+uint8_t pn532_scantimer = 0;
+
+uint8_t pn532_packetbuffer[64];
+
+#ifdef USE_PN532_DATA_FUNCTION
+uint8_t pn532_function = 0;
+uint8_t pn532_newdata[16];
+uint8_t pn532_newdata_len = 0;
+#endif
+
+void PN532_Init(void)
+{
+  if ((pin[GPIO_PN532_RXD] < 99) && (pin[GPIO_PN532_TXD] < 99)) {
+    PN532_Serial = new TasmotaSerial(pin[GPIO_PN532_RXD], pin[GPIO_PN532_TXD], 1);
+    if (PN532_Serial->begin(115200)) {
+      if (PN532_Serial->hardwareSerial()) { ClaimSerial(); }
+      PN532_wakeup();
+      uint32_t ver = PN532_getFirmwareVersion();
+      if (ver) {
+        PN532_setPassiveActivationRetries(0xFF);
+        PN532_SAMConfig();
+        pn532_model = 1;
+        AddLog_P2(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected (V%u.%u)",(ver>>16) & 0xFF, (ver>>8) & 0xFF);
+      }
+    }
+  }
+}
+
+int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout)
+{
+  int read_bytes = 0;
+  int ret;
+  unsigned long start_millis;
+  while (read_bytes < len) {
+    start_millis = millis();
+    do {
+      ret = PN532_Serial->read();
+      if (ret >= 0) {
+        break;
+      }
+    } while((timeout == 0) || ((millis()- start_millis ) < timeout));
+
+    if (ret < 0) {
+      if (read_bytes) {
+        return read_bytes;
+      } else {
+        return PN532_TIMEOUT;
+      }
+    }
+    buf[read_bytes] = (uint8_t)ret;
+    read_bytes++;
+  }
+  return read_bytes;
+}
+
+int8_t PN532_readAckFrame(void)
+{
+  const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
+  uint8_t ackBuf[sizeof(PN532_ACK)];
+
+  if (PN532_receive(ackBuf, sizeof(PN532_ACK), PN532_ACK_WAIT_TIME) <= 0) {
+    return PN532_TIMEOUT;
+  }
+
+  if (memcmp(&ackBuf, &PN532_ACK, sizeof(PN532_ACK))) {
+    return PN532_INVALID_ACK;
+  }
+  return 0;
+}
+
+int8_t PN532_writeCommand(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0)
+{
+
+  PN532_Serial->flush();
+
+  pn532_command = header[0];
+  PN532_Serial->write((uint8_t)PN532_PREAMBLE);
+  PN532_Serial->write((uint8_t)PN532_STARTCODE1);
+  PN532_Serial->write(PN532_STARTCODE2);
+
+  uint8_t length = hlen + blen + 1;
+  PN532_Serial->write(length);
+  PN532_Serial->write(~length + 1);
+
+  PN532_Serial->write(PN532_HOSTTOPN532);
+  uint8_t sum = PN532_HOSTTOPN532;
+
+  PN532_Serial->write(header, hlen);
+  for (uint32_t i = 0; i < hlen; i++) {
+    sum += header[i];
+  }
+
+  PN532_Serial->write(body, blen);
+  for (uint32_t i = 0; i < blen; i++) {
+    sum += body[i];
+  }
+
+  uint8_t checksum = ~sum + 1;
+  PN532_Serial->write(checksum);
+  PN532_Serial->write((uint8_t)PN532_POSTAMBLE);
+
+  return PN532_readAckFrame();
+}
+
+int16_t PN532_readResponse(uint8_t buf[], uint8_t len, uint16_t timeout = 50)
+{
+  uint8_t tmp[3];
+
+
+  if (PN532_receive(tmp, 3, timeout)<=0) {
+    return PN532_TIMEOUT;
+  }
+  if (0 != tmp[0] || 0!= tmp[1] || 0xFF != tmp[2]) {
+    return PN532_INVALID_FRAME;
+  }
+
+
+  uint8_t length[2];
+  if (PN532_receive(length, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+
+  if (0 != (uint8_t)(length[0] + length[1])) {
+    return PN532_INVALID_FRAME;
+  }
+  length[0] -= 2;
+  if (length[0] > len) {
+    return PN532_NO_SPACE;
+  }
+
+
+  uint8_t cmd = pn532_command + 1;
+  if (PN532_receive(tmp, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+  if (PN532_PN532TOHOST != tmp[0] || cmd != tmp[1]) {
+    return PN532_INVALID_FRAME;
+  }
+
+  if (PN532_receive(buf, length[0], timeout) != length[0]) {
+    return PN532_TIMEOUT;
+  }
+
+  uint8_t sum = PN532_PN532TOHOST + cmd;
+  for (uint32_t i=0; i<length[0]; i++) {
+    sum += buf[i];
+  }
+
+
+  if (PN532_receive(tmp, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+  if (0 != (uint8_t)(sum + tmp[0]) || 0 != tmp[1]) {
+    return PN532_INVALID_FRAME;
+  }
+
+  return length[0];
+}
+
+uint32_t PN532_getFirmwareVersion(void)
+{
+  uint32_t response;
+
+  pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
+
+  if (PN532_writeCommand(pn532_packetbuffer, 1)) {
+    return 0;
+  }
+
+
+  int16_t status = PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+  if (0 > status) {
+    return 0;
+  }
+
+  response = pn532_packetbuffer[0];
+  response <<= 8;
+  response |= pn532_packetbuffer[1];
+  response <<= 8;
+  response |= pn532_packetbuffer[2];
+  response <<= 8;
+  response |= pn532_packetbuffer[3];
+
+  return response;
+}
+
+void PN532_wakeup(void)
+{
+  uint8_t wakeup[5] = {0x55, 0x55, 0, 0, 0 };
+  PN532_Serial->write(wakeup,sizeof(wakeup));
+
+
+  PN532_Serial->flush();
+}
+
+bool PN532_readPassiveTargetID(uint8_t cardbaudrate, uint8_t *uid, uint8_t *uidLength, uint16_t timeout = 50)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
+  pn532_packetbuffer[1] = 1;
+  pn532_packetbuffer[2] = cardbaudrate;
+  if (PN532_writeCommand(pn532_packetbuffer, 3)) {
+    return 0x0;
+  }
+
+  if (PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer), timeout) < 0) {
+    return 0x0;
+  }
+# 274 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
+  if (pn532_packetbuffer[0] != 1) {
+    return 0;
+  }
+
+  uint16_t sens_res = pn532_packetbuffer[2];
+  sens_res <<= 8;
+  sens_res |= pn532_packetbuffer[3];
+
+
+  *uidLength = pn532_packetbuffer[5];
+
+  for (uint32_t i = 0; i < pn532_packetbuffer[5]; i++) {
+    uid[i] = pn532_packetbuffer[6 + i];
+  }
+
+  return 1;
+}
+
+bool PN532_setPassiveActivationRetries(uint8_t maxRetries)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
+  pn532_packetbuffer[1] = 5;
+  pn532_packetbuffer[2] = 0xFF;
+  pn532_packetbuffer[3] = 0x01;
+  pn532_packetbuffer[4] = maxRetries;
+  if (PN532_writeCommand(pn532_packetbuffer, 5)) {
+    return 0;
+  }
+  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+bool PN532_SAMConfig(void)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
+  pn532_packetbuffer[1] = 0x01;
+  pn532_packetbuffer[2] = 0x14;
+  pn532_packetbuffer[3] = 0x00;
+  if (PN532_writeCommand(pn532_packetbuffer, 4)) {
+    return false;
+  }
+  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+#ifdef USE_PN532_DATA_FUNCTION
+
+uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData)
+{
+    uint8_t i;
+    uint8_t _key[6];
+    uint8_t _uid[7];
+    uint8_t _uidLen;
+
+
+    memcpy(&_key, keyData, 6);
+    memcpy(&_uid, uid, uidLen);
+    _uidLen = uidLen;
+
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
+    pn532_packetbuffer[3] = blockNumber;
+    memcpy(&pn532_packetbuffer[4], &_key, 6);
+    for (i = 0; i < _uidLen; i++) {
+        pn532_packetbuffer[10 + i] = _uid[i];
+    }
+
+    if (PN532_writeCommand(pn532_packetbuffer, 10 + _uidLen)) { return 0; }
+
+
+    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+
+
+
+    if (pn532_packetbuffer[0] != 0x00) {
+
+        return 0;
+    }
+
+    return 1;
+}
+
+uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data)
+{
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = MIFARE_CMD_READ;
+    pn532_packetbuffer[3] = blockNumber;
+
+
+    if (PN532_writeCommand(pn532_packetbuffer, 4)) {
+        return 0;
+    }
+
+
+    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+
+    if (pn532_packetbuffer[0] != 0x00) {
+        return 0;
+    }
+
+
+
+    memcpy (data, &pn532_packetbuffer[1], 16);
+
+    return 1;
+}
+
+uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data)
+{
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = MIFARE_CMD_WRITE;
+    pn532_packetbuffer[3] = blockNumber;
+    memcpy(&pn532_packetbuffer[4], data, 16);
+
+
+    if (PN532_writeCommand(pn532_packetbuffer, 20)) {
+        return 0;
+    }
+
+
+    return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+#endif
+
+void PN532_ScanForTag(void)
+{
+  if (!pn532_model) { return; }
+  uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
+  uint8_t uid_len = 0;
+  uint8_t card_data[16];
+  bool erase_success = false;
+  bool set_success = false;
+  if (PN532_readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uid_len)) {
+      char uids[15];
+
+#ifdef USE_PN532_DATA_FUNCTION
+      char card_datas[34];
+#endif
+
+      ToHex_P((unsigned char*)uid, uid_len, uids, sizeof(uids));
+
+#ifdef USE_PN532_DATA_FUNCTION
+      if (uid_len == 4) {
+        uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+        if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) {
+          if (mifareclassic_ReadDataBlock(1, card_data)) {
+#ifdef USE_PN532_DATA_RAW
+            memcpy(&card_datas,&card_data,sizeof(card_data));
+#else
+            for (uint32_t i = 0;i < sizeof(card_data);i++) {
+              if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) {
+                card_datas[i] = char(card_data[i]);
+              } else {
+                card_datas[i] = '\0';
+              }
+            }
+#endif
+          }
+          if (pn532_function == 1) {
+            for (uint32_t i = 0;i<16;i++) {
+              card_data[i] = 0x00;
+            }
+            if (mifareclassic_WriteDataBlock(1, card_data)) {
+              erase_success = true;
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase success"));
+              memcpy(&card_datas,&card_data,sizeof(card_data));
+            }
+          }
+          if (pn532_function == 2) {
+#ifdef USE_PN532_DATA_RAW
+            memcpy(&card_data,&pn532_newdata,sizeof(card_data));
+            if (mifareclassic_WriteDataBlock(1, card_data)) {
+              set_success = true;
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
+              memcpy(&card_datas,&card_data,sizeof(card_data));
+            }
+#else
+            bool IsAlphaNumeric = true;
+            for (uint32_t i = 0;i < pn532_newdata_len;i++) {
+              if ((!isalpha(pn532_newdata[i])) && (!isdigit(pn532_newdata[i]))) {
+                IsAlphaNumeric = false;
+              }
+            }
+            if (IsAlphaNumeric) {
+              memcpy(&card_data,&pn532_newdata,pn532_newdata_len);
+              card_data[pn532_newdata_len] = '\0';
+              if (mifareclassic_WriteDataBlock(1, card_data)) {
+                set_success = true;
+                AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
+                memcpy(&card_datas,&card_data,sizeof(card_data));
+              }
+            } else {
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data must be alphanumeric"));
+            }
+#endif
+          }
+        } else {
+          sprintf(card_datas,"AUTHFAIL");
+        }
+      }
+      switch (pn532_function) {
+        case 0x01:
+          if (!erase_success) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase fail - exiting erase mode"));
+          }
+          break;
+        case 0x02:
+          if (!set_success) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Write failed - exiting set mode"));
+          }
+        default:
+          break;
+      }
+      pn532_function = 0;
+#endif
+
+#ifdef USE_PN532_DATA_FUNCTION
+      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\", \"DATA\":\"%s\"}}"), uids, card_datas);
+#else
+      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids);
+#endif
+
+      MqttPublishTeleSensor();
+
+#ifdef USE_PN532_CAUSE_EVENTS
+
+      char command[71];
+#ifdef USE_PN532_DATA_FUNCTION
+      sprintf(command,"backlog event PN532_UID=%s;event PN532_DATA=%s",uids,card_datas);
+#else
+      sprintf(command,"event PN532_UID=%s",uids);
+#endif
+      ExecuteCommand(command, SRC_RULE);
+#endif
+
+      pn532_scantimer = 7;
+  }
+}
+
+#ifdef USE_PN532_DATA_FUNCTION
+
+bool PN532_Command(void)
+{
+  bool serviced = true;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  char sub_string_tmp[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"E")) {
+    pn532_function = 1;
+    AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be erased"));
+    ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"E\"}}"));
+    return serviced;
+  }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"S")) {
+    if (paramcount > 1) {
+      if (XdrvMailbox.data[XdrvMailbox.data_len-1] == ',') {
+        serviced = false;
+        return serviced;
+      }
+      sprintf(sub_string_tmp,subStr(sub_string, XdrvMailbox.data, ",", 2));
+      pn532_newdata_len = strlen(sub_string_tmp);
+      if (pn532_newdata_len > 15) { pn532_newdata_len = 15; }
+      memcpy(&pn532_newdata,&sub_string_tmp,pn532_newdata_len);
+      pn532_newdata[pn532_newdata_len] = 0x00;
+      pn532_function = 2;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be set to '%s'"), pn532_newdata);
+      ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"S\"}}"));
+      return serviced;
+    }
+  }
+}
+
+#endif
+
+bool Xsns40(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_INIT:
+      PN532_Init();
+      result = true;
+      break;
+    case FUNC_EVERY_50_MSECOND:
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      break;
+    case FUNC_EVERY_250_MSECOND:
+      if (pn532_scantimer > 0) {
+        pn532_scantimer--;
+      } else {
+        PN532_ScanForTag();
+      }
+      break;
+    case FUNC_EVERY_SECOND:
+      break;
+#ifdef USE_PN532_DATA_FUNCTION
+    case FUNC_COMMAND_SENSOR:
+      if (XSNS_40 == XdrvMailbox.index) {
+        result = PN532_Command();
+      }
+      break;
+#endif
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_41_max44009.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_41_max44009.ino"
+#ifdef USE_I2C
+#ifdef USE_MAX44009
+
+
+
+
+
+
+#define XSNS_41 41
+#define XI2C_28 28
+
+#define MAX44009_ADDR1 0x4A
+#define MAX44009_ADDR2 0x4B
+#define MAX44009_NO_REGISTERS 8
+#define REG_CONFIG 0x02
+#define REG_LUMINANCE 0x03
+#define REG_LOWER_THRESHOLD 0x06
+#define REG_THRESHOLD_TIMER 0x07
+
+#define MAX44009_CONTINUOUS_AUTO_MODE 0x80
+
+uint8_t max44009_address;
+uint8_t max44009_addresses[] = { MAX44009_ADDR1, MAX44009_ADDR2, 0 };
+uint8_t max44009_found = 0;
+uint8_t max44009_valid = 0;
+float max44009_illuminance = 0;
+char max44009_types[] = "MAX44009";
+
+bool Max4409Read_lum(void)
+{
+  max44009_valid = 0;
+  uint8_t regdata[2];
+
+
+  if (I2cValidRead16((uint16_t *)&regdata, max44009_address, REG_LUMINANCE)) {
+    int exponent = (regdata[0] & 0xF0) >> 4;
+    int mantissa = ((regdata[0] & 0x0F) << 4) | (regdata[1] & 0x0F);
+    max44009_illuminance = (float)(((0x00000001 << exponent) * (float)mantissa) * 0.045);
+    max44009_valid = 1;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+
+
+void Max4409Detect(void)
+{
+  uint8_t buffer1;
+  uint8_t buffer2;
+  for (uint32_t i = 0; 0 != max44009_addresses[i]; i++) {
+
+    max44009_address = max44009_addresses[i];
+    if (I2cActive(max44009_address)) { continue; }
+
+    if ((I2cValidRead8(&buffer1, max44009_address, REG_LOWER_THRESHOLD)) &&
+        (I2cValidRead8(&buffer2, max44009_address, REG_THRESHOLD_TIMER))) {
+
+      if ((0x00 == buffer1) &&
+          (0xFF == buffer2)) {
+
+
+
+        Wire.beginTransmission(max44009_address);
+
+
+        Wire.write(REG_CONFIG);
+        Wire.write(MAX44009_CONTINUOUS_AUTO_MODE);
+        if (0 == Wire.endTransmission()) {
+          I2cSetActiveFound(max44009_address, max44009_types);
+          max44009_found = 1;
+          break;
+        }
+      }
+    }
+  }
+}
+
+void Max4409EverySecond(void)
+{
+  Max4409Read_lum();
+}
+
+void Max4409Show(bool json)
+{
+  char illum_str[8];
+
+  if (max44009_valid) {
+
+
+
+    uint8_t prec = 0;
+    if (10 > max44009_illuminance ) {
+      prec = 3;
+    } else if (100 > max44009_illuminance) {
+      prec = 2;
+    } else if (1000 > max44009_illuminance) {
+      prec = 1;
+    }
+    dtostrf(max44009_illuminance, sizeof(illum_str) -1, prec, illum_str);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%s}"), max44009_types, illum_str);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, illum_str);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, max44009_types, (int)max44009_illuminance);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns41(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_28)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Max4409Detect();
+  }
+  else if (max44009_found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Max4409EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Max4409Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Max4409Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_42_scd30.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_42_scd30.ino"
+#ifdef USE_I2C
+#ifdef USE_SCD30
+
+#define XSNS_42 42
+#define XI2C_29 29
+
+
+
+#define SCD30_ADDRESS 0x61
+
+#define SCD30_MAX_MISSED_READS 3
+#define SCD30_STATE_NO_ERROR 0
+#define SCD30_STATE_ERROR_DATA_CRC 1
+#define SCD30_STATE_ERROR_READ_MEAS 2
+#define SCD30_STATE_ERROR_SOFT_RESET 3
+#define SCD30_STATE_ERROR_I2C_RESET 4
+#define SCD30_STATE_ERROR_UNKNOWN 5
+
+#include "Arduino.h"
+#include <FrogmoreScd30.h>
+
+#define D_CMND_SCD30 "SCD30"
+
+const char S_JSON_SCD30_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d}";
+const char S_JSON_SCD30_COMMAND_NFW_VALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d.%d}";
+const char S_JSON_SCD30_COMMAND[] PROGMEM = "{\"" D_CMND_SCD30 "%s\"}";
+const char kSCD30_Commands[] PROGMEM = "Alt|Auto|Cal|FW|Int|Pres|TOff";
+
+
+
+
+
+enum SCD30_Commands {
+  CMND_SCD30_ALTITUDE,
+  CMND_SCD30_AUTOMODE,
+  CMND_SCD30_CALIBRATE,
+  CMND_SCD30_FW,
+  CMND_SCD30_INTERVAL,
+  CMND_SCD30_PRESSURE,
+  CMND_SCD30_TEMPOFFSET
+};
+
+FrogmoreScd30 scd30;
+
+bool scd30Found = false;
+bool scd30IsDataValid = false;
+int scd30ErrorState = SCD30_STATE_NO_ERROR;
+uint16_t scd30Interval_sec;
+int scd30Loop_count = 0;
+int scd30DataNotAvailable_count = 0;
+int scd30GoodMeas_count = 0;
+int scd30Reset_count = 0;
+int scd30CrcError_count = 0;
+int scd30Co2Zero_count = 0;
+int i2cReset_count = 0;
+uint16_t scd30_CO2 = 0;
+uint16_t scd30_CO2EAvg = 0;
+float scd30_Humid = 0.0;
+float scd30_Temp = 0.0;
+
+void Scd30Detect(void)
+{
+  if (I2cActive(SCD30_ADDRESS)) { return; }
+
+  scd30.begin();
+
+  uint8_t major = 0;
+  uint8_t minor = 0;
+  if (scd30.getFirmwareVersion(&major, &minor)) { return; }
+  uint16_t interval_sec;
+  if (scd30.getMeasurementInterval(&scd30Interval_sec)) { return; }
+  if (scd30.beginMeasuring()) { return; }
+
+  I2cSetActiveFound(SCD30_ADDRESS, "SCD30");
+  scd30Found = true;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SCD: FW v%d.%d"), major, minor);
+}
+
+
+void Scd30Update(void)
+{
+  scd30Loop_count++;
+  if (scd30Loop_count > (scd30Interval_sec - 1)) {
+    int error = 0;
+    switch (scd30ErrorState) {
+      case SCD30_STATE_NO_ERROR: {
+        error = scd30.readMeasurement(&scd30_CO2, &scd30_CO2EAvg, &scd30_Temp, &scd30_Humid);
+        switch (error) {
+          case ERROR_SCD30_NO_ERROR:
+            scd30Loop_count = 0;
+            scd30IsDataValid = true;
+            scd30GoodMeas_count++;
+            break;
+
+          case ERROR_SCD30_NO_DATA:
+            scd30DataNotAvailable_count++;
+            break;
+
+          case ERROR_SCD30_CRC_ERROR:
+            scd30ErrorState = SCD30_STATE_ERROR_DATA_CRC;
+            scd30CrcError_count++;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CRC error, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
+              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+#endif
+            break;
+
+          case ERROR_SCD30_CO2_ZERO:
+            scd30Co2Zero_count++;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CO2 zero, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
+              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+#endif
+            break;
+
+          default: {
+            scd30ErrorState = SCD30_STATE_ERROR_READ_MEAS;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: Update: ReadMeasurement error: 0x%lX, counter: %ld"), error, scd30Loop_count);
+#endif
+             return;
+          }
+          break;
+        }
+      }
+      break;
+
+      case SCD30_STATE_ERROR_DATA_CRC: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: got CRC error, try again, counter: %ld"), scd30Loop_count);
+#endif
+        scd30ErrorState = ERROR_SCD30_NO_ERROR;
+      }
+      break;
+
+      case SCD30_STATE_ERROR_READ_MEAS: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: not answering, sending soft reset, counter: %ld"), scd30Loop_count);
+#endif
+        scd30Reset_count++;
+        error = scd30.softReset();
+        if (error) {
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: resetting got error: 0x%lX"), error);
+#endif
+          error >>= 8;
+          if (error == 4) {
+            scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
+          } else {
+            scd30ErrorState = SCD30_STATE_ERROR_UNKNOWN;
+          }
+        } else {
+          scd30ErrorState = ERROR_SCD30_NO_ERROR;
+        }
+      }
+      break;
+
+      case SCD30_STATE_ERROR_SOFT_RESET: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P(LOG_LEVEL_ERROR, PSTR("SCD30: clearing i2c bus"));
+#endif
+        i2cReset_count++;
+        error = scd30.clearI2CBus();
+        if (error) {
+          scd30ErrorState = SCD30_STATE_ERROR_I2C_RESET;
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error clearing i2c bus: 0x%lX"), error);
+#endif
+        } else {
+          scd30ErrorState = ERROR_SCD30_NO_ERROR;
+        }
+      }
+      break;
+
+      default: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: unknown error state: 0x%lX"), scd30ErrorState);
+#endif
+        scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
+      }
+    }
+
+    if (scd30Loop_count > (SCD30_MAX_MISSED_READS * scd30Interval_sec)) {
+      scd30IsDataValid = false;
+    }
+  }
+}
+
+
+int Scd30GetCommand(int command_code, uint16_t *pvalue)
+{
+  switch (command_code)
+  {
+    case CMND_SCD30_ALTITUDE:
+      return scd30.getAltitudeCompensation(pvalue);
+      break;
+
+    case CMND_SCD30_AUTOMODE:
+      return scd30.getCalibrationType(pvalue);
+      break;
+
+    case CMND_SCD30_CALIBRATE:
+      return scd30.getForcedRecalibrationFactor(pvalue);
+      break;
+
+    case CMND_SCD30_INTERVAL:
+      return scd30.getMeasurementInterval(pvalue);
+      break;
+
+    case CMND_SCD30_PRESSURE:
+      return scd30.getAmbientPressure(pvalue);
+      break;
+
+    case CMND_SCD30_TEMPOFFSET:
+      return scd30.getTemperatureOffset(pvalue);
+      break;
+
+      default:
+
+      break;
+  }
+}
+
+int Scd30SetCommand(int command_code, uint16_t value)
+{
+  switch (command_code)
+  {
+    case CMND_SCD30_ALTITUDE:
+      return scd30.setAltitudeCompensation(value);
+      break;
+
+    case CMND_SCD30_AUTOMODE:
+      return scd30.setCalibrationType(value);
+      break;
+
+    case CMND_SCD30_CALIBRATE:
+      return scd30.setForcedRecalibrationFactor(value);
+      break;
+
+    case CMND_SCD30_INTERVAL:
+    {
+      int error = scd30.setMeasurementInterval(value);
+      if (!error)
+      {
+        scd30Interval_sec = value;
+      }
+
+      return error;
+    }
+      break;
+
+    case CMND_SCD30_PRESSURE:
+      return scd30.setAmbientPressure(value);
+      break;
+
+    case CMND_SCD30_TEMPOFFSET:
+      return scd30.setTemperatureOffset(value);
+      break;
+
+      default:
+
+      break;
+  }
+}
+
+
+
+
+
+bool Scd30CommandSensor()
+{
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t prefix_len = strlen(D_CMND_SCD30);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_SCD30), prefix_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + prefix_len, kSCD30_Commands);
+
+    switch (command_code) {
+      case CMND_SCD30_ALTITUDE:
+      case CMND_SCD30_AUTOMODE:
+      case CMND_SCD30_CALIBRATE:
+      case CMND_SCD30_INTERVAL:
+      case CMND_SCD30_PRESSURE:
+      case CMND_SCD30_TEMPOFFSET:
+      {
+        uint16_t value = 0;
+        if (XdrvMailbox.data_len > 0)
+        {
+          value = XdrvMailbox.payload;
+          Scd30SetCommand(command_code, value);
+        }
+        else
+        {
+          Scd30GetCommand(command_code, &value);
+        }
+
+        Response_P(S_JSON_SCD30_COMMAND_NVALUE, command, value);
+      }
+        break;
+
+      case CMND_SCD30_FW:
+      {
+        uint8_t major = 0;
+        uint8_t minor = 0;
+        int error;
+        error = scd30.getFirmwareVersion(&major, &minor);
+        if (error)
+        {
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error getting FW version: 0x%lX"), error);
+#endif
+          serviced = false;
+        }
+        else
+        {
+          Response_P(S_JSON_SCD30_COMMAND_NFW_VALUE, command, major, minor);
+        }
+      }
+        break;
+
+      default:
+
+        serviced = false;
+      break;
+    }
+  }
+  return serviced;
+}
+
+void Scd30Show(bool json)
+{
+  if (scd30IsDataValid)
+  {
+    char humidity[10];
+    dtostrfd(ConvertHumidity(scd30_Humid), Settings.flag2.humidity_resolution, humidity);
+    char temperature[10];
+    dtostrfd(ConvertTemp(scd30_Temp), Settings.flag2.temperature_resolution, temperature);
+
+    if (json) {
+
+      ResponseAppend_P(PSTR(",\"SCD30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"),
+        scd30_CO2, scd30_CO2EAvg, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period)
+      {
+        DomoticzSensor(DZ_AIRQUALITY, scd30_CO2);
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_CO2EAVG, "SCD30", scd30_CO2EAvg);
+      WSContentSend_PD(HTTP_SNS_CO2, "SCD30", scd30_CO2);
+      WSContentSend_PD(HTTP_SNS_TEMP, "SCD30", temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, "SCD30", humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns42(byte function)
+{
+  if (!I2cEnabled(XI2C_29)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Scd30Detect();
+  }
+  else if (scd30Found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Scd30Update();
+        break;
+      case FUNC_COMMAND:
+        result = Scd30CommandSensor();
+        break;
+      case FUNC_JSON_APPEND:
+        Scd30Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Scd30Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
+#ifdef USE_HRE
+# 49 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
+#define XSNS_43 43
+
+enum hre_states {
+   hre_idle,
+   hre_sync,
+   hre_syncing,
+   hre_read,
+   hre_reading,
+   hre_sleep,
+   hre_sleeping
+};
+
+hre_states hre_state = hre_idle;
+
+float hre_usage = 0;
+float hre_rate = 0;
+uint32_t hre_usage_time = 0;
+
+int hre_read_errors = 0;
+bool hre_good = false;
+
+
+
+int hreReadBit()
+{
+   digitalWrite(pin[GPIO_HRE_CLOCK], HIGH);
+   delay(1);
+   int bit = digitalRead(pin[GPIO_HRE_DATA]);
+   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
+   delay(1);
+   return bit;
+}
+
+
+
+char hreReadChar(int &parity_errors)
+{
+
+   hreReadBit();
+
+   unsigned ch=0;
+   int sum=0;
+   for (uint32_t i=0; i<7; i++)
+   {
+      int b = hreReadBit();
+      ch |= b << i;
+      sum += b;
+   }
+
+
+   if ( (sum & 0x1) != hreReadBit())
+      parity_errors++;
+
+
+   hreReadBit();
+
+   return ch;
+}
+
+void hreInit(void)
+{
+   hre_read_errors = 0;
+   hre_good = false;
+
+   pinMode(pin[GPIO_HRE_CLOCK], OUTPUT);
+   pinMode(pin[GPIO_HRE_DATA], INPUT);
+
+
+
+   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
+
+   hre_state = hre_sync;
+}
+
+
+void hreEvery50ms(void)
+{
+   static int sync_counter = 0;
+   static int sync_run = 0;
+
+   static uint32_t curr_start = 0;
+   static int read_counter = 0;
+   static int parity_errors = 0;
+   static char buff[46];
+
+   static char ch;
+   static size_t i;
+
+   switch (hre_state)
+   {
+      case hre_sync:
+         if (uptime < 10)
+            break;
+         sync_run = 0;
+         sync_counter = 0;
+         hre_state = hre_syncing;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_syncing"));
+         break;
+
+      case hre_syncing:
+
+
+         for (uint32_t i=0; i<20; i++)
+         {
+            if (hreReadBit())
+               sync_run++;
+            else
+               sync_run = 0;
+            if (sync_run == 62)
+            {
+               hre_state = hre_read;
+               break;
+            }
+            sync_counter++;
+         }
+
+         if (sync_counter > 1000)
+         {
+            hre_state = hre_sleep;
+            AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE D_ERROR));
+         }
+         break;
+
+
+      case hre_read:
+         AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "sync_run:%d, sync_counter:%d"), sync_run, sync_counter);
+         read_counter = 0;
+         parity_errors = 0;
+         curr_start = uptime;
+         memset(buff, 0, sizeof(buff));
+         hre_state = hre_reading;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_reading"));
+
+
+
+
+
+      case hre_reading:
+
+         buff[read_counter++] = hreReadChar(parity_errors);
+         buff[read_counter++] = hreReadChar(parity_errors);
+
+         if (read_counter == 46)
+         {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "pe:%d, re:%d, buff:%s"),
+                      parity_errors, hre_read_errors, buff);
+            if (parity_errors == 0)
+            {
+               float curr_usage;
+               curr_usage = 0.01 * atol(buff+24);
+               if (hre_usage_time)
+               {
+                  double dt = 1.666e-2 * (curr_start - hre_usage_time);
+                  hre_rate = (curr_usage - hre_usage)/dt;
+               }
+               hre_usage = curr_usage;
+               hre_usage_time = curr_start;
+               hre_good = true;
+
+               hre_state = hre_sleep;
+            }
+            else
+            {
+               hre_read_errors++;
+               hre_state = hre_sleep;
+            }
+         }
+         break;
+
+      case hre_sleep:
+         hre_usage_time = curr_start;
+         hre_state = hre_sleeping;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_sleeping"));
+
+      case hre_sleeping:
+
+
+         if (uptime - hre_usage_time >= 27)
+            hre_state = hre_sync;
+   }
+}
+
+void hreShow(boolean json)
+{
+   if (!hre_good)
+      return;
+
+   const char *id = "HRE";
+
+   char usage[16];
+   char rate[16];
+   dtostrfd(hre_usage, 2, usage);
+   dtostrfd(hre_rate, 3, rate);
+
+   if (json)
+   {
+      ResponseAppend_P(JSON_SNS_GNGPM, id, usage, rate);
+#ifdef USE_WEBSERVER
+   }
+   else
+   {
+      WSContentSend_PD(HTTP_SNS_GALLONS, id, usage);
+      WSContentSend_PD(HTTP_SNS_GPM, id, rate);
+#endif
+   }
+}
+
+
+
+
+
+bool Xsns43(byte function)
+{
+
+   if (pin[GPIO_HRE_CLOCK] >= 99 || pin[GPIO_HRE_DATA] >= 99)
+      return false;
+
+   switch (function)
+   {
+      case FUNC_INIT:
+         hreInit();
+         break;
+      case FUNC_EVERY_50_MSECOND:
+         hreEvery50ms();
+         break;
+      case FUNC_EVERY_SECOND:
+         break;
+      case FUNC_JSON_APPEND:
+         hreShow(1);
+         break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+         hreShow(0);
+         break;
+#endif
+   }
+   return false;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_44_sps30.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_44_sps30.ino"
+#ifdef USE_I2C
+#ifdef USE_SPS30
+
+#define XSNS_44 44
+#define XI2C_30 30
+
+#define SPS30_ADDR 0x69
+
+#include <Wire.h>
+#include <twi.h>
+
+uint8_t sps30_ready = 0;
+uint8_t sps30_running;
+
+struct SPS30 {
+  float PM1_0;
+  float PM2_5;
+  float PM4_0;
+  float PM10;
+  float NCPM0_5;
+  float NCPM1_0;
+  float NCPM2_5;
+  float NCPM4_0;
+  float NCPM10;
+  float TYPSIZ;
+} sps30_result;
+
+#define SPS_CMD_START_MEASUREMENT 0x0010
+#define SPS_CMD_START_MEASUREMENT_ARG 0x0300
+#define SPS_CMD_STOP_MEASUREMENT 0x0104
+#define SPS_CMD_READ_MEASUREMENT 0x0300
+#define SPS_CMD_GET_DATA_READY 0x0202
+#define SPS_CMD_AUTOCLEAN_INTERVAL 0x8004
+#define SPS_CMD_CLEAN 0x5607
+#define SPS_CMD_GET_ACODE 0xd025
+#define SPS_CMD_GET_SERIAL 0xd033
+#define SPS_CMD_RESET 0xd304
+#define SPS_WRITE_DELAY_US 20000
+#define SPS_MAX_SERIAL_LEN 32
+
+uint8_t sps30_calc_CRC(uint8_t *data) {
+    uint8_t crc = 0xFF;
+    for (uint32_t i = 0; i < 2; i++) {
+        crc ^= data[i];
+        for (uint32_t bit = 8; bit > 0; --bit) {
+            if(crc & 0x80) {
+                crc = (crc << 1) ^ 0x31u;
+            } else {
+                crc = (crc << 1);
+            }
+        }
+    }
+    return crc;
+}
+
+void CmdClean(void);
+
+unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
+
+void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen) {
+unsigned char cmdb[2];
+uint8_t tmp[3];
+uint8_t index=0;
+memset(data,0,dlen);
+uint8_t twi_buff[64];
+
+  Wire.beginTransmission(SPS30_ADDR);
+  cmdb[0]=cmd>>8;
+  cmdb[1]=cmd;
+  Wire.write(cmdb,2);
+  Wire.endTransmission();
+
+
+  dlen/=2;
+  dlen*=3;
+
+  twi_readFrom(SPS30_ADDR,twi_buff,dlen,1);
+
+  uint8_t bind=0;
+  while (bind<dlen) {
+    tmp[0] = twi_buff[bind++];
+    tmp[1] = twi_buff[bind++];
+    tmp[2] = twi_buff[bind++];
+    if (sps30_calc_CRC(tmp)!=tmp[2]) {
+
+      index+=2;
+    } else {
+      data[index++]=tmp[0];
+      data[index++]=tmp[1];
+    }
+  }
+}
+
+void sps30_cmd(uint16_t cmd) {
+unsigned char cmdb[6];
+  Wire.beginTransmission(SPS30_ADDR);
+  cmdb[0]=cmd>>8;
+  cmdb[1]=cmd;
+
+  if (cmd==SPS_CMD_START_MEASUREMENT) {
+    cmdb[2]=SPS_CMD_START_MEASUREMENT_ARG>>8;
+    cmdb[3]=SPS_CMD_START_MEASUREMENT_ARG&0xff;
+    cmdb[4]=sps30_calc_CRC(&cmdb[2]);
+    Wire.write(cmdb,5);
+  } else {
+    Wire.write(cmdb,2);
+  }
+  Wire.endTransmission();
+}
+
+void SPS30_Detect(void)
+{
+  if (!I2cSetDevice(SPS30_ADDR)) { return; }
+  I2cSetActiveFound(SPS30_ADDR, "SPS30");
+
+  uint8_t dcode[32];
+  sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode));
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode);
+  sps30_cmd(SPS_CMD_START_MEASUREMENT);
+  sps30_running = 1;
+  sps30_ready = 1;
+}
+
+#define D_UNIT_PM "ug/m3"
+#define D_UNIT_NCPM "#/m3"
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_PM "{e}";
+const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_NCPM "{e}";
+const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
+#endif
+
+#define PMDP 2
+
+#define SPS30_HOURS Settings.sps30_inuse_hours
+
+
+
+void SPS30_Every_Second() {
+  if (!sps30_running) return;
+
+  if (uptime%10==0) {
+    uint8_t vars[sizeof(float)*10];
+    sps30_get_data(SPS_CMD_READ_MEASUREMENT,vars,sizeof(vars));
+    float *fp=&sps30_result.PM1_0;
+
+    typedef union {
+    uint8_t array[4];
+    float value;
+    } ByteToFloat;
+
+    ByteToFloat conv;
+
+    for (uint32_t count=0; count<10; count++) {
+      for (uint32_t i = 0; i < 4; i++){
+        conv.array[3-i] = vars[count*sizeof(float)+i];
+      }
+      *fp++=conv.value;
+    }
+  }
+
+  if (uptime%3600==0 && uptime>60) {
+
+
+    SPS30_HOURS++;
+    if (SPS30_HOURS>(7*24)) {
+      CmdClean();
+      SPS30_HOURS=0;
+    }
+  }
+
+}
+
+void SPS30_Show(bool json)
+{
+  if (!sps30_running) { return; }
+
+  char str[64];
+  if (json) {
+    dtostrfd(sps30_result.PM1_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str);
+    dtostrfd(sps30_result.PM2_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM2_5" "\":%s"), str);
+    dtostrfd(sps30_result.PM4_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM4_0" "\":%s"), str);
+    dtostrfd(sps30_result.PM10,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM10" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM0_5" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM1_0" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM2_5" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM4_0" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM10,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM10" "\":%s"), str);
+    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "TYPSIZ" "\":%s}"), str);
+
+#ifdef USE_WEBSERVER
+  } else {
+    dtostrfd(sps30_result.PM1_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 1.0",str);
+    dtostrfd(sps30_result.PM2_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 2.5",str);
+    dtostrfd(sps30_result.PM4_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 4.0",str);
+    dtostrfd(sps30_result.PM10,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 10",str);
+    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 0.5",str);
+    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 1.0",str);
+    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 2.5",str);
+    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 4.0",str);
+    dtostrfd(sps30_result.NCPM10,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 10",str);
+    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_c,str);
+#endif
+  }
+}
+
+void CmdClean(void)
+{
+  sps30_cmd(SPS_CMD_CLEAN);
+  ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
+  MqttPublishTeleSensor();
+}
+
+bool SPS30_cmd(void)
+{
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp=='c') {
+
+        CmdClean();
+      } else if (*cp=='0' || *cp=='1') {
+        sps30_running=*cp&1;
+        sps30_cmd(sps30_running?SPS_CMD_START_MEASUREMENT:SPS_CMD_STOP_MEASUREMENT);
+      } else {
+        serviced=false;
+      }
+  }
+  Response_P(PSTR("{\"SPS30\":\"%s\"}"), sps30_running?"running":"stopped");
+
+  return serviced;
+}
+
+
+
+
+
+bool Xsns44(byte function)
+{
+  if (!I2cEnabled(XI2C_30)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    SPS30_Detect();
+  }
+  else if (sps30_ready) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        SPS30_Every_Second();
+        break;
+      case FUNC_JSON_APPEND:
+        SPS30_Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SPS30_Show(0);
+        break;
+  #endif
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_44 == XdrvMailbox.index) {
+          result = SPS30_cmd();
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_45_vl53l0x.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_45_vl53l0x.ino"
+#ifdef USE_I2C
+#ifdef USE_VL53L0X
+
+#define XSNS_45 45
+#define XI2C_31 31
+
+#include <Wire.h>
+#include "VL53L0X.h"
+VL53L0X sensor;
+
+uint8_t vl53l0x_ready = 0;
+uint16_t vl53l0x_distance;
+uint16_t Vl53l0_buffer[5];
+uint8_t Vl53l0_index;
+
+
+
+void Vl53l0Detect(void)
+{
+  if (!I2cSetDevice(0x29)) { return; }
+
+  if (!sensor.init()) { return; }
+
+  I2cSetActiveFound(sensor.getAddress(), "VL53L0X");
+
+  sensor.setTimeout(500);
+
+
+
+
+
+  sensor.startContinuous();
+  vl53l0x_ready = 1;
+
+  Vl53l0_index=0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_VL53L0X[] PROGMEM =
+ "{s}VL53L0X " D_DISTANCE "{m}%d" D_UNIT_MILLIMETER "{e}";
+#endif
+
+#define USE_VL_MEDIAN 
+
+void Vl53l0Every_250MSecond(void)
+{
+  uint16_t tbuff[5],tmp;
+  uint8_t flag;
+
+
+  uint16_t dist = sensor.readRangeContinuousMillimeters();
+  if (dist==0 || dist>2000) {
+    dist=9999;
+  }
+
+#ifdef USE_VL_MEDIAN
+
+  Vl53l0_buffer[Vl53l0_index]=dist;
+  Vl53l0_index++;
+  if (Vl53l0_index>=5) Vl53l0_index=0;
+
+
+  memmove(tbuff,Vl53l0_buffer,sizeof(tbuff));
+  for (byte ocnt=0; ocnt<5; ocnt++) {
+    flag=0;
+    for (byte count=0; count<4; count++) {
+      if (tbuff[count]>tbuff[count+1]) {
+        tmp=tbuff[count];
+        tbuff[count]=tbuff[count+1];
+        tbuff[count+1]=tmp;
+        flag=1;
+      }
+    }
+    if (!flag) break;
+  }
+  vl53l0x_distance=tbuff[2];
+#else
+  vl53l0x_distance=dist;
+#endif
+}
+
+void Vl53l0Show(boolean json)
+{
+  if (json) {
+    ResponseAppend_P(PSTR(",\"VL53L0X\":{\"" D_JSON_DISTANCE "\":%d}"), vl53l0x_distance);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_VL53L0X, vl53l0x_distance);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns45(byte function)
+{
+  if (!I2cEnabled(XI2C_31)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Vl53l0Detect();
+  }
+  else if (vl53l0x_ready) {
+    switch (function) {
+      case FUNC_EVERY_250_MSECOND:
+        Vl53l0Every_250MSecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Vl53l0Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Vl53l0Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_46_MLX90614.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_46_MLX90614.ino"
+#ifdef USE_I2C
+#ifdef USE_MLX90614
+
+#define XSNS_46 46
+#define XI2C_32 32
+
+#define I2_ADR_IRT 0x5a
+
+#define MLX90614_RAWIR1 0x04
+#define MLX90614_RAWIR2 0x05
+#define MLX90614_TA 0x06
+#define MLX90614_TOBJ1 0x07
+#define MLX90614_TOBJ2 0x08
+
+struct {
+  union {
+    uint16_t value;
+    uint32_t i2c_buf;
+    };
+  float obj_temp;
+  float amb_temp;
+  bool ready = false;
+} mlx90614;
+
+void MLX90614_Init(void)
+{
+  if (!I2cSetDevice(I2_ADR_IRT)) { return; }
+  I2cSetActiveFound(I2_ADR_IRT, "MLX90614");
+  mlx90614.ready = true;
+}
+
+void MLX90614_Every_Second(void)
+{
+    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT, MLX90614_TOBJ1);
+    if (mlx90614.value & 0x8000) {
+      mlx90614.obj_temp = -999;
+    } else {
+      mlx90614.obj_temp = ((float)mlx90614.value * 0.02) - 273.15;
+    }
+    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT,MLX90614_TA);
+    if (mlx90614.value & 0x8000) {
+      mlx90614.amb_temp = -999;
+    } else {
+      mlx90614.amb_temp = ((float)mlx90614.value * 0.02) - 273.15;
+    }
+}
+
+#ifdef USE_WEBSERVER
+ const char HTTP_IRTMP[] PROGMEM =
+  "{s}MXL90614 " "OBJ-" D_TEMPERATURE "{m}%s C" "{e}"
+  "{s}MXL90614 " "AMB-" D_TEMPERATURE "{m}%s C" "{e}";
+#endif
+
+void MLX90614_Show(uint8_t json)
+{
+  char obj_tstr[16];
+  dtostrfd(mlx90614.obj_temp, Settings.flag2.temperature_resolution, obj_tstr);
+  char amb_tstr[16];
+  dtostrfd(mlx90614.amb_temp, Settings.flag2.temperature_resolution, amb_tstr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"MLX90614\":{\"OBJTMP\":%s,\"AMBTMP\":%s}"), obj_tstr, amb_tstr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_IRTMP, obj_tstr, amb_tstr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns46(byte function)
+{
+  if (!I2cEnabled(XI2C_32)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MLX90614_Init();
+  }
+  else if (mlx90614.ready) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        MLX90614_Every_Second();
+        break;
+      case FUNC_JSON_APPEND:
+        MLX90614_Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MLX90614_Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_47_max31865.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_47_max31865.ino"
+#ifdef USE_MAX31865
+
+#ifndef USE_SPI
+#error "MAX31865 requires USE_SPI enabled"
+#endif
+
+#include "Adafruit_MAX31865.h"
+
+#define XSNS_47 47
+
+#if MAX31865_PTD_WIRES == 4
+  #define PTD_WIRES MAX31865_4WIRE
+#elif MAX31865_PTD_WIRES == 3
+  #define PTD_WIRES MAX31865_3WIRE
+#else
+  #define PTD_WIRES MAX31865_2WIRE
+#endif
+
+int8_t init_status = 0;
+
+Adafruit_MAX31865 max31865;
+
+struct MAX31865_Result_Struct {
+    uint8_t ErrorCode;
+    uint16_t Rtd;
+    float PtdResistance;
+    float PtdTemp;
+} MAX31865_Result;
+
+void MAX31865_Init(void){
+    if(init_status)
+        return;
+
+  max31865.setPins(
+    pin[GPIO_SSPI_CS],
+    pin[GPIO_SSPI_MOSI],
+    pin[GPIO_SSPI_MISO],
+    pin[GPIO_SSPI_SCLK]
+  );
+
+  if(max31865.begin(PTD_WIRES))
+    init_status = 1;
+  else
+    init_status = -1;
+}
+
+
+
+
+
+void MAX31865_GetResult(void){
+    uint16_t rtd;
+
+    rtd = max31865.readRTD();
+    MAX31865_Result.Rtd = rtd;
+    MAX31865_Result.PtdResistance = max31865.rtd_to_resistance(rtd, MAX31865_REF_RES);
+    MAX31865_Result.PtdTemp = max31865.rtd_to_temperature(rtd, MAX31865_PTD_RES, MAX31865_REF_RES) + MAX31865_PTD_BIAS;
+}
+
+void MAX31865_Show(bool Json){
+    char temperature[33];
+    char resistance[33];
+
+    dtostrfd(MAX31865_Result.PtdResistance, Settings.flag2.temperature_resolution, resistance);
+    dtostrfd(MAX31865_Result.PtdTemp, Settings.flag2.temperature_resolution, temperature);
+
+    if(Json){
+        ResponseAppend_P(PSTR(",\"MAX31865\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RESISTANCE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
+          temperature, resistance, MAX31865_Result.ErrorCode);
+#ifdef USE_DOMOTICZ
+        if (0 == tele_period) {
+          DomoticzSensor(DZ_TEMP, temperature);
+        }
+#endif
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, MAX31865_Result.PtdTemp);
+        }
+#endif
+    } else {
+#ifdef USE_WEBSERVER
+        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31865", temperature, TempUnit());
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns47(uint8_t function)
+{
+  bool result = false;
+  if((pin[GPIO_SSPI_MISO] < 99) && (pin[GPIO_SSPI_MOSI] < 99) &&
+     (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_CS] < 99)) {
+
+    switch (function) {
+      case FUNC_INIT:
+        MAX31865_Init();
+        break;
+
+      case FUNC_EVERY_SECOND:
+        MAX31865_GetResult();
+        break;
+
+      case FUNC_JSON_APPEND:
+        MAX31865_Show(true);
+        break;
+
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MAX31865_Show(false);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
+# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
+#ifdef USE_I2C
+#ifdef USE_CHIRP
+# 47 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
+#define XSNS_48 48
+#define XI2C_33 33
+
+#define CHIRP_MAX_SENSOR_COUNT 3
+
+#define CHIRP_ADDR_STANDARD 0x20
+
+
+
+
+
+#define D_CMND_CHIRP "CHIRP"
+
+const char S_JSON_CHIRP_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_CHIRP "%s\":%d}";
+const char S_JSON_CHIRP_COMMAND[] PROGMEM = "{\"" D_CMND_CHIRP "%s\"}";
+const char kCHIRP_Commands[] PROGMEM = "Select|Set|Scan|Reset|Sleep|Wake";
+
+const char kChirpTypes[] PROGMEM = "CHIRP";
+
+
+
+
+
+enum CHIRP_Commands {
+  CMND_CHIRP_SELECT,
+  CMND_CHIRP_SET,
+  CMND_CHIRP_SCAN,
+  CMND_CHIRP_RESET,
+  CMND_CHIRP_SLEEP,
+  CMND_CHIRP_WAKE };
+
+
+
+
+
+
+#define CHIRP_GET_CAPACITANCE 0x00
+#define CHIRP_SET_ADDRESS 0x01
+#define CHIRP_GET_ADDRESS 0x02
+#define CHIRP_MEASURE_LIGHT 0x03
+#define CHIRP_GET_LIGHT 0x04
+#define CHIRP_GET_TEMPERATURE 0x05
+#define CHIRP_RESET 0x06
+#define CHIRP_GET_VERSION 0x07
+#define CHIRP_SLEEP 0x08
+#define CHIRP_GET_BUSY 0x09
+
+
+
+
+
+void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg) {
+  Wire.beginTransmission(addr);
+  Wire.write(reg);
+  Wire.endTransmission();
+}
+
+uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr) {
+  Wire.requestFrom(addr,(uint8_t)2);
+  uint16_t t = Wire.read() << 8;
+  t = t | Wire.read();
+  return t;
+}
+
+
+
+
+
+uint8_t chirp_current = 0;
+uint8_t chirp_found_sensors = 0;
+
+char chirp_name[7];
+uint8_t chirp_next_job = 0;
+uint32_t chirp_timeout_count = 0;
+
+#pragma pack(1)
+struct ChirpSensor_t{
+    uint16_t moisture = 0;
+    uint16_t light = 0;
+    int16_t temperature = 0;
+    uint8_t version = 0;
+    uint8_t address:7;
+    uint8_t explicitSleep:1;
+};
+#pragma pack()
+
+ChirpSensor_t chirp_sensor[CHIRP_MAX_SENSOR_COUNT];
+
+
+
+void ChirpReset(uint8_t addr) {
+    ChirpWriteI2CRegister(addr, CHIRP_RESET);
+}
+
+
+
+void ChirpResetAll(void) {
+    for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+      if (chirp_sensor[i].version) {
+        ChirpReset(chirp_sensor[i].address);
+        }
+    }
+}
+
+
+void ChirpClockSet() {
+    Wire.setClockStretchLimit(4000);
+    Wire.setClock(50000);
+}
+
+
+
+void ChirpSleep(uint8_t addr) {
+    ChirpWriteI2CRegister(addr, CHIRP_SLEEP);
+}
+# 185 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
+void ChirpSelect(uint8_t sensor) {
+  if(sensor < chirp_found_sensors) {
+    chirp_current = sensor;
+    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u now active."), chirp_current);
+  }
+  if (sensor == 255) {
+    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u active at address 0x%x."), chirp_current, chirp_sensor[chirp_current].address);
+  }
+}
+
+
+
+uint8_t ChirpReadVersion(uint8_t addr) {
+  return (I2cRead8(addr, CHIRP_GET_VERSION));
+}
+
+
+
+bool ChirpSet(uint8_t addr) {
+  if(addr < 128){
+    if (I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr)){
+      if(chirp_sensor[chirp_current].version>0x25 && chirp_sensor[chirp_current].version != 255){
+        delay(5);
+        I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr);
+
+      }
+      DEBUG_SENSOR_LOG(PSTR("CHIRP: Wrote adress %u "), addr);
+      ChirpReset(chirp_sensor[chirp_current].address);
+      chirp_sensor[chirp_current].address = addr;
+      chirp_timeout_count = 10;
+      chirp_next_job = 0;
+      if(chirp_sensor[chirp_current].version == 255){
+          AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: wrote new address %u, please power off device"), addr);
+          chirp_sensor[chirp_current].version == 0;
+      }
+      return true;
+    }
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: address %u incorrect and not used"), addr);
+  return false;
+}
+
+
+
+bool ChirpScan()
+{
+  ChirpClockSet();
+  chirp_found_sensors = 0;
+  for (uint8_t address = 1; address <= 127; address++) {
+    chirp_sensor[chirp_found_sensors].version = 0;
+    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
+    delay(2);
+    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
+    if (chirp_sensor[chirp_found_sensors].version > 0) {
+      I2cSetActiveFound(address, "CHIRP");
+      if (chirp_found_sensors<CHIRP_MAX_SENSOR_COUNT) {
+        chirp_sensor[chirp_found_sensors].address = address;
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CHIRP: fw %x"), chirp_sensor[chirp_found_sensors].version);
+      }
+      chirp_found_sensors++;
+    }
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Found %u CHIRP sensor(s)."), chirp_found_sensors);
+  return (chirp_found_sensors > 0);
+}
+
+
+
+void ChirpDetect(void)
+{
+  if (chirp_next_job > 0) { return; }
+
+  DEBUG_SENSOR_LOG(PSTR("CHIRP: scan will start ..."));
+  if (ChirpScan()) {
+    uint8_t chirp_model = 0;
+    GetTextIndexed(chirp_name, sizeof(chirp_name), chirp_model, kChirpTypes);
+  }
+}
+
+
+void ChirpServiceAllSensors(uint8_t job){
+  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+    if (chirp_sensor[i].version && !chirp_sensor[i].explicitSleep) {
+      DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare for sensor at address 0x%x"), chirp_sensor[i].address);
+      switch(job){
+        case 0:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_CAPACITANCE);
+        break;
+        case 1:
+        chirp_sensor[i].moisture = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        case 2:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_TEMPERATURE);
+        break;
+        case 3:
+        chirp_sensor[i].temperature = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        case 4:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_MEASURE_LIGHT);
+        break;
+        case 5:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_LIGHT);
+        break;
+        case 6:
+        chirp_sensor[i].light = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        default:
+        break;
+      }
+    }
+  }
+}
+
+
+
+void ChirpEvery100MSecond(void)
+{
+
+  if(chirp_timeout_count == 0) {
+      switch(chirp_next_job) {
+          case 0:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: reset all"));
+          ChirpResetAll();
+          chirp_timeout_count = 10;
+          chirp_next_job++;
+          break;
+          case 1:
+
+
+          chirp_next_job++;
+          break;
+          case 2:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read"));
+          ChirpServiceAllSensors(0);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 3:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read"));
+          ChirpServiceAllSensors(1);
+          chirp_next_job++;
+          break;
+          case 4:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read - 2nd"));
+          ChirpServiceAllSensors(0);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 5:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read - 2nd"));
+          ChirpServiceAllSensors(1);
+          chirp_next_job++;
+          break;
+          case 6:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read"));
+          ChirpServiceAllSensors(2);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 7:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read"));
+          ChirpServiceAllSensors(3);
+          chirp_next_job++;
+          break;
+          case 8:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read - 2nd"));
+          ChirpServiceAllSensors(2);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 9:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read - 2nd"));
+          ChirpServiceAllSensors(3);
+          chirp_next_job++;
+          break;
+          case 10:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: start light measure process"));
+          ChirpServiceAllSensors(4);
+          chirp_timeout_count = 90;
+          chirp_next_job++;
+          break;
+          case 11:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare light read"));
+          ChirpServiceAllSensors(5);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 12:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish light read"));
+          ChirpServiceAllSensors(6);
+          chirp_next_job++;
+          break;
+          case 13:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: paused, waiting for TELE"));
+          break;
+          case 14:
+          if (Settings.tele_period > 16){
+              chirp_timeout_count = (Settings.tele_period - 17) * 10;
+              DEBUG_SENSOR_LOG(PSTR("CHIRP: timeout 1/10 sec: %u, tele: %u"), chirp_timeout_count, Settings.tele_period);
+            }
+          else{
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: TELEPERIOD must be > 16 seconds !"));
+
+          }
+          chirp_next_job = 1;
+          break;
+      }
+  }
+  else {
+      chirp_timeout_count--;
+  }
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+
+const char HTTP_SNS_DARKNESS[] PROGMEM = "{s} " D_JSON_DARKNESS "{m}%s %%{e}";
+const char HTTP_SNS_CHIRPVER[] PROGMEM = "{s} CHIRP-sensor %u at address{m}0x%x{e}"
+                                         "{s} FW-version{m}%s {e}"; ;
+const char HTTP_SNS_CHIRPSLEEP[] PROGMEM = "{s} {m} is sleeping ...{e}";
+#endif
+
+
+
+void ChirpShow(bool json)
+{
+  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+    if (chirp_sensor[i].version) {
+
+      char str_temperature[33];
+      double t_temperature = ((double) chirp_sensor[i].temperature )/10.0;
+      dtostrfd(t_temperature, Settings.flag2.temperature_resolution, str_temperature);
+      char str_light[33];
+      dtostrfd(chirp_sensor[i].light, 0, str_light);
+      char str_version[7];
+      if(chirp_sensor[i].version == 0xff){
+        strncpy_P(str_version, PSTR("Chirp!"), sizeof(str_version));
+      }
+      else{
+        sprintf(str_version, "%x", chirp_sensor[i].version);
+      }
+
+      if (json) {
+        if(!chirp_sensor[i].explicitSleep) {
+          ResponseAppend_P(PSTR(",\"%s%u\":{\"" D_JSON_MOISTURE "\":%d"), chirp_name, i, chirp_sensor[i].moisture);
+          if(chirp_sensor[i].temperature!=-1){
+            ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s"),str_temperature);
+          }
+          ResponseAppend_P(PSTR(",\"" D_JSON_DARKNESS "\":%s}"),str_light);
+        }
+        else {
+          ResponseAppend_P(PSTR(",\"%s%u\":{\"sleeping\"}"),chirp_name, i);
+        }
+  #ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        char str_moisture[33];
+        dtostrfd(chirp_sensor[i].moisture, 0, str_moisture);
+        DomoticzTempHumSensor(str_temperature, str_moisture);
+        DomoticzSensor(DZ_ILLUMINANCE,chirp_sensor[i].light);
+      }
+  #endif
+  #ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_CHIRPVER, i, chirp_sensor[i].address, str_version);
+        if (chirp_sensor[i].explicitSleep){
+          WSContentSend_PD(HTTP_SNS_CHIRPSLEEP);
+        }
+        else {
+          WSContentSend_PD(HTTP_SNS_MOISTURE, "", chirp_sensor[i].moisture);
+          WSContentSend_PD(HTTP_SNS_DARKNESS, str_light);
+          if (chirp_sensor[i].temperature!=-1) {
+            WSContentSend_PD(HTTP_SNS_TEMP, "", str_temperature, TempUnit());
+          }
+        }
+
+  #endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool ChirpCmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_CHIRP);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_CHIRP), disp_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kCHIRP_Commands);
+
+    switch (command_code) {
+      case CMND_CHIRP_SELECT:
+      case CMND_CHIRP_SET:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(XdrvMailbox.payload); }
+          if (command_code == CMND_CHIRP_SET) { ChirpSet((uint8_t)XdrvMailbox.payload); }
+        Response_P(S_JSON_CHIRP_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        }
+        else {
+          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(255); }
+        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
+        }
+        break;
+      case CMND_CHIRP_SCAN:
+      case CMND_CHIRP_SLEEP:
+      case CMND_CHIRP_WAKE:
+      case CMND_CHIRP_RESET:
+        if (command_code == CMND_CHIRP_SCAN) { chirp_next_job = 0;
+                                                    ChirpDetect(); }
+        if (command_code == CMND_CHIRP_SLEEP) { chirp_sensor[chirp_current].explicitSleep = true;
+                                                    ChirpSleep(chirp_sensor[chirp_current].address); }
+        if (command_code == CMND_CHIRP_WAKE) { chirp_sensor[chirp_current].explicitSleep = false;
+                                                    ChirpReadVersion(chirp_sensor[chirp_current].address); }
+        if (command_code == CMND_CHIRP_RESET) { ChirpReset(chirp_sensor[chirp_current].address); }
+        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
+        break;
+      default:
+
+        serviced = false;
+      break;
+    }
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns48(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_33)) { return false; }
+
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_100_MSECOND:
+      if(chirp_found_sensors > 0){
+        ChirpEvery100MSecond();
+      }
+      break;
+    case FUNC_COMMAND:
+      result = ChirpCmd();
+      break;
+    case FUNC_JSON_APPEND:
+      ChirpShow(1);
+      chirp_next_job = 14;
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      ChirpShow(0);
+      break;
+#endif
+    case FUNC_INIT:
+      ChirpDetect();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
+#ifdef USE_I2C
+#ifdef USE_PAJ7620
+
+
+
+
+
+
+#define XSNS_50 50
+#define XI2C_34 34
+
+#define PAJ7620_ADDR 0x73
+
+#define PAJ7620_BANK_SEL 0xEF
+
+
+
+#define PAJ7620_GET_GESTURE 0x43
+#define PAJ7620_PROXIMITY_AVG_Y 0x6c
+
+#define PAJ7620_OBJECT_CENTER_X 0xad
+#define PAJ7620_OBJECT_CENTER_Y 0xaf
+
+#define PAJ7620_DOWN 1
+#define PAJ7620_UP 2
+#define PAJ7620_RIGHT 4
+#define PAJ7620_LEFT 8
+#define PAJ7620_NEAR 16
+#define PAJ7620_FAR 32
+#define PAJ7620_CW 64
+#define PAJ7620_CCW 128
+
+
+
+
+const uint8_t PAJ7620initRegisterArray[][2] PROGMEM = {
+  {0xEF,0x00},
+ {0x32,0x29}, {0x33,0x01}, {0x34,0x00}, {0x35,0x01}, {0x36,0x00}, {0x37,0x07}, {0x38,0x17}, {0x39,0x06},
+ {0x3A,0x12}, {0x3F,0x00}, {0x40,0x02}, {0x41,0xFF}, {0x42,0x01}, {0x46,0x2D}, {0x47,0x0F}, {0x48,0x3C},
+ {0x49,0x00}, {0x4A,0x1E}, {0x4B,0x00}, {0x4C,0x20}, {0x4D,0x00}, {0x4E,0x1A}, {0x4F,0x14}, {0x50,0x00},
+ {0x51,0x10}, {0x52,0x00}, {0x5C,0x02}, {0x5D,0x00}, {0x5E,0x10}, {0x5F,0x3F}, {0x60,0x27}, {0x61,0x28},
+ {0x62,0x00}, {0x63,0x03}, {0x64,0xF7}, {0x65,0x03}, {0x66,0xD9}, {0x67,0x03}, {0x68,0x01}, {0x69,0xC8},
+ {0x6A,0x40}, {0x6D,0x04}, {0x6E,0x00}, {0x6F,0x00}, {0x70,0x80}, {0x71,0x00}, {0x72,0x00}, {0x73,0x00},
+ {0x74,0xF0}, {0x75,0x00}, {0x80,0x42}, {0x81,0x44}, {0x82,0x04}, {0x83,0x20}, {0x84,0x20}, {0x85,0x00},
+ {0x86,0x10}, {0x87,0x00}, {0x88,0x05}, {0x89,0x18}, {0x8A,0x10}, {0x8B,0x01}, {0x8C,0x37}, {0x8D,0x00},
+ {0x8E,0xF0}, {0x8F,0x81}, {0x90,0x06}, {0x91,0x06}, {0x92,0x1E}, {0x93,0x0D}, {0x94,0x0A}, {0x95,0x0A},
+ {0x96,0x0C}, {0x97,0x05}, {0x98,0x0A}, {0x99,0x41}, {0x9A,0x14}, {0x9B,0x0A}, {0x9C,0x3F}, {0x9D,0x33},
+ {0x9E,0xAE}, {0x9F,0xF9}, {0xA0,0x48}, {0xA1,0x13}, {0xA2,0x10}, {0xA3,0x08}, {0xA4,0x30}, {0xA5,0x19},
+ {0xA6,0x10}, {0xA7,0x08}, {0xA8,0x24}, {0xA9,0x04}, {0xAA,0x1E}, {0xAB,0x1E}, {0xCC,0x19}, {0xCD,0x0B},
+ {0xCE,0x13}, {0xCF,0x64}, {0xD0,0x21}, {0xD1,0x0F}, {0xD2,0x88}, {0xE0,0x01}, {0xE1,0x04}, {0xE2,0x41},
+ {0xE3,0xD6}, {0xE4,0x00}, {0xE5,0x0C}, {0xE6,0x0A}, {0xE7,0x00}, {0xE8,0x00}, {0xE9,0x00}, {0xEE,0x07},
+ {0xEF,0x01},
+ {0x00,0x1E}, {0x01,0x1E}, {0x02,0x0F}, {0x03,0x10}, {0x04,0x02}, {0x05,0x00}, {0x06,0xB0}, {0x07,0x04},
+ {0x08,0x0D}, {0x09,0x0E}, {0x0A,0x9C}, {0x0B,0x04}, {0x0C,0x05}, {0x0D,0x0F}, {0x0E,0x02}, {0x0F,0x12},
+ {0x10,0x02}, {0x11,0x02}, {0x12,0x00}, {0x13,0x01}, {0x14,0x05}, {0x15,0x07}, {0x16,0x05}, {0x17,0x07},
+ {0x18,0x01}, {0x19,0x04}, {0x1A,0x05}, {0x1B,0x0C}, {0x1C,0x2A}, {0x1D,0x01}, {0x1E,0x00}, {0x21,0x00},
+ {0x22,0x00}, {0x23,0x00}, {0x25,0x01}, {0x26,0x00}, {0x27,0x39}, {0x28,0x7F}, {0x29,0x08}, {0x30,0x03},
+ {0x31,0x00}, {0x32,0x1A}, {0x33,0x1A}, {0x34,0x07}, {0x35,0x07}, {0x36,0x01}, {0x37,0xFF}, {0x38,0x36},
+ {0x39,0x07}, {0x3A,0x00}, {0x3E,0xFF}, {0x3F,0x00}, {0x40,0x77}, {0x41,0x40}, {0x42,0x00}, {0x43,0x30},
+ {0x44,0xA0}, {0x45,0x5C}, {0x46,0x00}, {0x47,0x00}, {0x48,0x58}, {0x4A,0x1E}, {0x4B,0x1E}, {0x4C,0x00},
+ {0x4D,0x00}, {0x4E,0xA0}, {0x4F,0x80}, {0x50,0x00}, {0x51,0x00}, {0x52,0x00}, {0x53,0x00}, {0x54,0x00},
+ {0x57,0x80}, {0x59,0x10}, {0x5A,0x08}, {0x5B,0x94}, {0x5C,0xE8}, {0x5D,0x08}, {0x5E,0x3D}, {0x5F,0x99},
+ {0x60,0x45}, {0x61,0x40}, {0x63,0x2D}, {0x64,0x02}, {0x65,0x96}, {0x66,0x00}, {0x67,0x97}, {0x68,0x01},
+ {0x69,0xCD}, {0x6A,0x01}, {0x6B,0xB0}, {0x6C,0x04}, {0x6D,0x2C}, {0x6E,0x01}, {0x6F,0x32}, {0x71,0x00},
+ {0x72,0x01}, {0x73,0x35}, {0x74,0x00}, {0x75,0x33}, {0x76,0x31}, {0x77,0x01}, {0x7C,0x84}, {0x7D,0x03},
+ {0x7E,0x01},
+  {0xEF,0x00}
+};
+
+
+
+
+
+const char kPaj7620Directions[] PROGMEM = "Down|Up|Right|Left|Near|Far|CW|CCW";
+
+const uint8_t PAJ7620_PIN[]= {1,2,3,4};
+
+
+
+
+
+char PAJ7620_name[] = "PAJ7620";
+
+uint32_t PAJ7620_timeout_counter = 10;
+uint32_t PAJ7620_next_job = 0;
+uint32_t PAJ7620_mode = 1;
+
+struct {
+  uint8_t current;
+  uint8_t last;
+  uint8_t same;
+  uint8_t unfinished;
+} PAJ7620_gesture;
+
+bool PAJ7620_finished_gesture = false;
+char PAJ7620_currentGestureName[6];
+
+struct{
+  uint8_t x;
+  uint8_t y;
+  uint8_t last_x;
+  uint8_t last_y;
+  uint8_t proximity;
+  uint8_t last_proximity;
+  uint8_t corner;
+  struct {
+    uint8_t step:3;
+    uint8_t countdown:3;
+    uint8_t valid:1;
+    } PIN;
+} PAJ7620_state;
+
+
+
+
+
+void PAJ7620SelectBank(uint8_t bank)
+{
+  I2cWrite(PAJ7620_ADDR, PAJ7620_BANK_SEL, bank &1, 1);
+}
+
+
+
+void PAJ7620DecodeGesture(void)
+{
+  uint32_t index = 0;
+  switch (PAJ7620_gesture.current) {
+    case PAJ7620_LEFT:
+      index++;
+    case PAJ7620_RIGHT:
+      index++;
+    case PAJ7620_UP:
+      index++;
+    case PAJ7620_DOWN:
+      if (PAJ7620_gesture.unfinished) {
+        PAJ7620_finished_gesture = true;
+        break;
+      }
+      PAJ7620_gesture.unfinished = PAJ7620_gesture.current;
+      PAJ7620_timeout_counter = 5;
+      break;
+    case PAJ7620_NEAR:
+      index = 4;
+      PAJ7620_finished_gesture = true;
+      PAJ7620_timeout_counter = 25;
+      break;
+    case PAJ7620_FAR:
+      index = 5;
+      PAJ7620_finished_gesture = true;
+      PAJ7620_timeout_counter = 25;
+      break;
+    case PAJ7620_CW:
+      index = 6;
+      PAJ7620_finished_gesture = true;
+      break;
+    case PAJ7620_CCW:
+      index = 7;
+      PAJ7620_finished_gesture = true;
+      break;
+    default:
+      index = 8;
+      if (PAJ7620_gesture.unfinished) {
+        PAJ7620_finished_gesture = true;
+      }
+      break;
+  }
+  if (index < 8) {
+    GetTextIndexed(PAJ7620_currentGestureName, sizeof(PAJ7620_currentGestureName), index, kPaj7620Directions);
+  }
+
+  if (PAJ7620_finished_gesture) {
+    if (PAJ7620_gesture.unfinished) {
+      if ((PAJ7620_gesture.current != PAJ7620_NEAR) && (PAJ7620_gesture.current != PAJ7620_FAR)) {
+        PAJ7620_gesture.current = PAJ7620_gesture.unfinished;
+      }
+    }
+    if (PAJ7620_gesture.current == PAJ7620_gesture.last) {
+      PAJ7620_gesture.same++;
+    } else {
+      PAJ7620_gesture.same = 1;
+    }
+    PAJ7620_gesture.last = PAJ7620_gesture.current;
+    PAJ7620_finished_gesture = false;
+    PAJ7620_gesture.unfinished = 0;
+    PAJ7620_timeout_counter += 3;
+    MqttPublishSensor();
+  }
+}
+
+
+
+void PAJ7620ReadGesture(void)
+{
+  switch (PAJ7620_mode) {
+    case 1:
+      PAJ7620_gesture.current = I2cRead8(PAJ7620_ADDR,PAJ7620_GET_GESTURE);
+      if ((PAJ7620_gesture.current > 0) || PAJ7620_gesture.unfinished) {
+        DEBUG_SENSOR_LOG(PSTR("PAJ: gesture: %u"), PAJ7620_gesture.current);
+        PAJ7620DecodeGesture();
+      }
+      break;
+    case 2:
+      PAJ7620_state.proximity = I2cRead8(PAJ7620_ADDR, PAJ7620_PROXIMITY_AVG_Y);
+      if ((PAJ7620_state.proximity > 0) || (PAJ7620_state.last_proximity > 0)) {
+        if (PAJ7620_state.proximity != PAJ7620_state.last_proximity) {
+          PAJ7620_state.last_proximity = PAJ7620_state.proximity;
+          DEBUG_SENSOR_LOG(PSTR("PAJ: Proximity: %u"), PAJ7620_state.proximity);
+          MqttPublishSensor();
+        }
+      }
+      break;
+    case 3:
+    case 4:
+    case 5:
+      PAJ7620_state.x = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_X);
+      PAJ7620_state.y = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_Y);
+      if ((PAJ7620_state.y > 0) && (PAJ7620_state.x > 0)) {
+        if ((PAJ7620_state.y != PAJ7620_state.last_y) || (PAJ7620_state.x != PAJ7620_state.last_x)) {
+          PAJ7620_state.last_y = PAJ7620_state.y;
+          PAJ7620_state.last_x = PAJ7620_state.x;
+          DEBUG_SENSOR_LOG(PSTR("PAJ: x: %u   y: %u"), PAJ7620_state.x, PAJ7620_state.y);
+
+          PAJ7620_state.corner = 0;
+
+
+
+          switch (PAJ7620_state.y) {
+            case 0: case 1: case 2: case 3: case 4: case 5:
+              PAJ7620_state.corner = 3;
+              break;
+            case 9: case 10: case 11: case 12: case 13: case 14:
+              PAJ7620_state.corner = 1;
+              break;
+          }
+          if (PAJ7620_state.corner != 0) {
+            switch (PAJ7620_state.x) {
+              case 0: case 1: case 2: case 3: case 4: case 5:
+                break;
+              case 9: case 10: case 11: case 12: case 13: case 14:
+                PAJ7620_state.corner++;
+                break;
+              default:
+                PAJ7620_state.corner = 0;
+                break;
+            }
+          }
+          DEBUG_SENSOR_LOG(PSTR("PAJ: corner: %u"), PAJ7620_state.corner);
+
+          if (PAJ7620_state.PIN.countdown == 0) {
+            PAJ7620_state.PIN.step = 0;
+            PAJ7620_state.PIN.valid = 0;
+          }
+          if (!PAJ7620_state.PIN.step) {
+            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
+              PAJ7620_state.PIN.step = 1;
+              PAJ7620_state.PIN.countdown = 7;
+            }
+          } else {
+            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
+              PAJ7620_state.PIN.step += 1;
+              PAJ7620_state.PIN.countdown = 7;
+            } else {
+              PAJ7620_state.PIN.countdown -= 1;
+            }
+          }
+          if (PAJ7620_state.PIN.step == 4) {
+            PAJ7620_state.PIN.valid = 1;
+            DEBUG_SENSOR_LOG(PSTR("PAJ: PIN valid!!"));
+            PAJ7620_state.PIN.countdown = 0;
+          }
+          MqttPublishSensor();
+        }
+      }
+      break;
+  }
+}
+
+
+
+void PAJ7620Detect(void)
+{
+  if (I2cActive(PAJ7620_ADDR)) { return; }
+
+  PAJ7620SelectBank(0);
+  PAJ7620SelectBank(0);
+  uint16_t PAJ7620_id = I2cRead16LE(PAJ7620_ADDR,0);
+ uint8_t PAJ7620_ver = I2cRead8(PAJ7620_ADDR,2);
+  if (0x7620 == PAJ7620_id) {
+    I2cSetActiveFound(PAJ7620_ADDR, PAJ7620_name);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAJ: ID: 0x%x and VER: %u"), PAJ7620_id, PAJ7620_ver);
+    PAJ7620_next_job = 1;
+  }
+  else {
+    DEBUG_SENSOR_LOG(PSTR("PAJ: sensor not found, false ID 0x%x"), PAJ7620_id);
+  }
+}
+
+
+
+void PAJ7620Init(void)
+{
+  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor start %u"),millis());
+  union{
+    uint32_t raw;
+    uint8_t reg_val[4];
+  } buf;
+
+  for (uint32_t i = 0; i < (sizeof(PAJ7620initRegisterArray) / 2); i += 2)
+ {
+    buf.raw = pgm_read_dword(PAJ7620initRegisterArray + i);
+    DEBUG_SENSOR_LOG("PAJ: %x %x %x %x",buf.reg_val[0],buf.reg_val[1],buf.reg_val[2],buf.reg_val[3]);
+    I2cWrite(PAJ7620_ADDR, buf.reg_val[0], buf.reg_val[1], 1);
+    I2cWrite(PAJ7620_ADDR, buf.reg_val[2], buf.reg_val[3], 1);
+ }
+  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor done %u"),millis());
+  PAJ7620_next_job = 2;
+}
+
+
+
+void PAJ7620Loop(void)
+{
+  if (0 == PAJ7620_timeout_counter) {
+    switch (PAJ7620_next_job) {
+      case 1:
+        PAJ7620Init();
+        break;
+      case 2:
+        if (PAJ7620_mode != 0) {
+          PAJ7620ReadGesture();
+        }
+        break;
+    }
+  } else {
+    PAJ7620_timeout_counter--;
+  }
+}
+
+
+
+void PAJ7620Show(bool json)
+{
+  if (json) {
+    if (PAJ7620_currentGestureName[0] != '\0' ) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), PAJ7620_name, PAJ7620_currentGestureName, PAJ7620_gesture.same);
+      PAJ7620_currentGestureName[0] = '\0';
+      return;
+    }
+    switch (PAJ7620_mode) {
+      case 2:
+        ResponseAppend_P(PSTR(",\"%s\":{\"Proximity\":%u}"), PAJ7620_name, PAJ7620_state.proximity);
+        break;
+      case 3:
+        if (PAJ7620_state.corner > 0) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"Corner\":%u}"), PAJ7620_name, PAJ7620_state.corner);
+        }
+        break;
+      case 4:
+        if (PAJ7620_state.PIN.valid) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"PIN\":%u}"), PAJ7620_name, 1);
+          PAJ7620_state.PIN.valid = 0;
+        }
+        break;
+      case 5:
+        ResponseAppend_P(PSTR(",\"%s\":{\"x\":%u,\"y\":%u}"), PAJ7620_name, PAJ7620_state.x, PAJ7620_state.y);
+        break;
+    }
+  }
+}
+# 411 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
+bool PAJ7620CommandSensor(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    PAJ7620_mode = XdrvMailbox.payload;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_50, PAJ7620_mode);
+
+  return true;
+}
+
+
+
+
+
+bool Xsns50(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_34)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    PAJ7620Detect();
+  }
+  else if (PAJ7620_next_job) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_50 == XdrvMailbox.index){
+          result = PAJ7620CommandSensor();
+        }
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        PAJ7620Loop();
+        break;
+      case FUNC_JSON_APPEND:
+        PAJ7620Show(1);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_51_rdm6300.ino"
+# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_51_rdm6300.ino"
+#ifdef USE_RDM6300
+
+#define XSNS_51 51
+
+#define RDM6300_BAUDRATE 9600
+
+#include <TasmotaSerial.h>
+
+#define RDM_TIMEOUT 100
+char rdm_uid_str[10];
+
+
+#define RDM6300_BLOCK 2*10
+
+uint8_t rdm_blcnt;
+TasmotaSerial *RDM6300_Serial = nullptr;
+
+void RDM6300_Init() {
+  if (pin[GPIO_RDM6300_RX] < 99) {
+    RDM6300_Serial = new TasmotaSerial(pin[GPIO_RDM6300_RX],-1,1);
+    if (RDM6300_Serial->begin(RDM6300_BAUDRATE)) {
+      if (RDM6300_Serial->hardwareSerial()) {
+        ClaimSerial();
+      }
+    }
+  }
+  rdm_blcnt=0;
+}
+
+
+void RDM6300_ScanForTag() {
+  char rdm_buffer[14];
+  uint8_t rdm_index;
+  uint8_t rdm_array[6];
+
+  if (!RDM6300_Serial) return;
+
+  if (rdm_blcnt>0) {
+    rdm_blcnt--;
+    while (RDM6300_Serial->available()) RDM6300_Serial->read();
+    return;
+  }
+
+  if (RDM6300_Serial->available()) {
+
+    char c=RDM6300_Serial->read();
+    if (c!=2) return;
+
+
+    rdm_index=0;
+    uint32_t cmillis=millis();
+    while (1) {
+      if (RDM6300_Serial->available()) {
+        char c=RDM6300_Serial->read();
+        if (c==3) {
+
+          break;
+        }
+        rdm_buffer[rdm_index++]=c;
+        if (rdm_index>13) {
+
+          return;
+        }
+      }
+      if ((millis()-cmillis)>RDM_TIMEOUT) {
+
+        return;
+      }
+    }
+
+
+    rdm_blcnt=RDM6300_BLOCK;
+
+
+    rm6300_hstring_to_array(rdm_array,sizeof(rdm_array),rdm_buffer);
+    uint8_t accu=0;
+    for (uint8_t count=0;count<5;count++) {
+      accu^=rdm_array[count];
+    }
+    if (accu!=rdm_array[5]) {
+
+      return;
+    }
+
+
+    memcpy(rdm_uid_str,&rdm_buffer[2],8);
+    rdm_uid_str[9]=0;
+
+    ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str);
+    MqttPublishTeleSensor();
+
+
+
+
+
+  }
+
+
+}
+
+uint8_t rm6300_hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
+  }
+  return rVal;
+}
+
+
+void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[])
+{
+  char *cp=buffer;
+  for (uint8_t i = 0; i < len; i++) {
+    uint8_t val = rm6300_hexnibble(*cp++) << 4;
+    array[i]= val | rm6300_hexnibble(*cp++);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_RDM6300[] PROGMEM =
+ "{s}RDM6300 " "UID" "{m}%s" "{e}";
+
+void RDM6300_Show(void) {
+  if (!RDM6300_Serial) return;
+  if (!rdm_uid_str[0]) strcpy(rdm_uid_str,"????");
+  WSContentSend_PD(HTTP_RDM6300,rdm_uid_str);
+}
+#endif
+
+
+
+
+
+bool Xsns51(byte function)
+{
+  bool result = false;
+
+    switch (function) {
+      case FUNC_INIT:
+        RDM6300_Init();
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        RDM6300_ScanForTag();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        RDM6300_Show();
+        break;
+#endif
+    }
+    return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
+#ifdef USE_IBEACON
+
+
+
+#define XSNS_52 52
+
+#include <TasmotaSerial.h>
+
+#define HM17_BAUDRATE 9600
+
+#define IBEACON_DEBUG 
+
+
+#define HM17_V110 
+
+
+
+#define IB_TIMEOUT_INTERVAL 30
+
+#define IB_UPDATE_TIME_INTERVAL 10
+
+TasmotaSerial *IBEACON_Serial = nullptr;
+
+
+uint8_t hm17_found,hm17_cmd,hm17_flag;
+
+#ifdef IBEACON_DEBUG
+uint8_t hm17_debug=0;
+#endif
+
+
+
+#define HM17_BSIZ 128
+char hm17_sbuffer[HM17_BSIZ];
+uint8_t hm17_sindex,hm17_result,hm17_scanning,hm17_connecting;
+uint32_t hm17_lastms;
+char ib_mac[14];
+
+
+#if 1
+uint8_t ib_upd_interval,ib_tout_interval;
+#define IB_UPDATE_TIME ib_upd_interval
+#define IB_TIMEOUT_TIME ib_tout_interval
+#else
+#undef IB_UPDATE_TIME
+#undef IB_TIMEOUT_TIME
+#define IB_UPDATE_TIME Settings.ib_upd_interval
+#define IB_TIMEOUT_TIME Settings.ib_tout_interval
+#endif
+
+enum {HM17_TEST,HM17_ROLE,HM17_IMME,HM17_DISI,HM17_IBEA,HM17_SCAN,HM17_DISC,HM17_RESET,HM17_RENEW,HM17_CON};
+#define HM17_SUCESS 99
+
+struct IBEACON {
+  char FACID[8];
+  char UID[32];
+  char MAJOR[4];
+  char MINOR[4];
+  char PWR[2];
+  char MAC[12];
+  char RSSI[4];
+};
+
+#define MAX_IBEACONS 16
+
+struct IBEACON_UID {
+  char MAC[12];
+  char RSSI[4];
+  uint8_t FLAGS;
+  uint8_t TIME;
+} ibeacons[MAX_IBEACONS];
+
+
+void IBEACON_Init() {
+
+  hm17_found=0;
+
+
+  if ((pin[GPIO_IBEACON_RX] < 99) && (pin[GPIO_IBEACON_TX] < 99)) {
+    IBEACON_Serial = new TasmotaSerial(pin[GPIO_IBEACON_RX], pin[GPIO_IBEACON_TX],1);
+    if (IBEACON_Serial->begin(HM17_BAUDRATE)) {
+      if (IBEACON_Serial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      hm17_sendcmd(HM17_TEST);
+      hm17_lastms=millis();
+
+      IB_UPDATE_TIME=IB_UPDATE_TIME_INTERVAL;
+      IB_TIMEOUT_TIME=IB_TIMEOUT_INTERVAL;
+    }
+  }
+}
+
+void hm17_every_second(void) {
+  if (!IBEACON_Serial) return;
+
+  if (hm17_found) {
+    if (IB_UPDATE_TIME && (uptime%IB_UPDATE_TIME==0)) {
+      if (hm17_cmd!=99) {
+        if (hm17_flag&2) {
+          ib_sendbeep();
+        } else {
+          if (!hm17_connecting) {
+            hm17_sendcmd(HM17_DISI);
+          }
+        }
+      }
+    }
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (ibeacons[cnt].FLAGS) {
+        ibeacons[cnt].TIME++;
+        if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) {
+          ibeacons[cnt].FLAGS=0;
+          ibeacon_mqtt(ibeacons[cnt].MAC,"0000");
+        }
+      }
+    }
+  } else {
+    if (uptime%20==0) {
+      hm17_sendcmd(HM17_TEST);
+    }
+  }
+}
+
+void hm17_sbclr(void) {
+  memset(hm17_sbuffer,0,HM17_BSIZ);
+  hm17_sindex=0;
+  IBEACON_Serial->flush();
+}
+
+void hm17_sendcmd(uint8_t cmd) {
+  hm17_sbclr();
+  hm17_cmd=cmd;
+#ifdef IBEACON_DEBUG
+  if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("hm17cmd %d"),cmd);
+#endif
+  switch (cmd) {
+    case HM17_TEST:
+      IBEACON_Serial->write("AT");
+      break;
+    case HM17_ROLE:
+      IBEACON_Serial->write("AT+ROLE1");
+      break;
+    case HM17_IMME:
+      IBEACON_Serial->write("AT+IMME1");
+      break;
+    case HM17_DISI:
+      IBEACON_Serial->write("AT+DISI?");
+      hm17_scanning=1;
+      break;
+    case HM17_IBEA:
+      IBEACON_Serial->write("AT+IBEA1");
+      break;
+    case HM17_RESET:
+      IBEACON_Serial->write("AT+RESET");
+      break;
+    case HM17_RENEW:
+      IBEACON_Serial->write("AT+RENEW");
+      break;
+    case HM17_SCAN:
+      IBEACON_Serial->write("AT+SCAN5");
+      break;
+    case HM17_DISC:
+      IBEACON_Serial->write("AT+DISC?");
+      hm17_scanning=1;
+      break;
+    case HM17_CON:
+      IBEACON_Serial->write((const uint8_t*)"AT+CON",6);
+      IBEACON_Serial->write((const uint8_t*)ib_mac,12);
+      hm17_connecting=1;
+      break;
+  }
+}
+
+uint32_t ibeacon_add(struct IBEACON *ib) {
+
+  if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) {
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (ibeacons[cnt].FLAGS) {
+        if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) {
+
+          memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
+          ibeacons[cnt].TIME=0;
+          return 1;
+        }
+      }
+    }
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (!ibeacons[cnt].FLAGS) {
+        memcpy(ibeacons[cnt].MAC,ib->MAC,12);
+        memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
+        ibeacons[cnt].FLAGS=1;
+        ibeacons[cnt].TIME=0;
+        return 1;
+      }
+    }
+  }
+  return 0;
+}
+
+void hm17_decode(void) {
+  struct IBEACON ib;
+  switch (hm17_cmd) {
+    case HM17_TEST:
+      if (!strncmp(hm17_sbuffer,"OK",2)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("AT OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+        hm17_found=1;
+      }
+      break;
+    case HM17_ROLE:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("ROLE OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_IMME:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IMME OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_IBEA:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IBEA OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_SCAN:
+        if (!strncmp(hm17_sbuffer,"OK+Set:5",8)) {
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("SCAN OK"));
+#endif
+          hm17_sbclr();
+          hm17_result=HM17_SUCESS;
+        }
+        break;
+    case HM17_RESET:
+      if (!strncmp(hm17_sbuffer,"OK+RESET",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RESET OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_RENEW:
+      if (!strncmp(hm17_sbuffer,"OK+RENEW",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RENEW OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_CON:
+      if (!strncmp(hm17_sbuffer,"OK+CONNA",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNA OK"));
+#endif
+        hm17_connecting=2;
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+CONNE",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNE ERROR"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+CONNF",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNF ERROR"));
+#endif
+        break;
+      }
+      if (hm17_connecting==2 && !strncmp(hm17_sbuffer,"OK+CONN",7)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONN OK"));
+#endif
+        hm17_connecting=3;
+        hm17_sendcmd(HM17_TEST);
+        hm17_connecting=0;
+        break;
+      }
+      break;
+
+    case HM17_DISI:
+    case HM17_DISC:
+      if (!strncmp(hm17_sbuffer,"OK+DISCS",8)) {
+        hm17_sbclr();
+        hm17_result=1;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCS OK"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISIS",8)) {
+        hm17_sbclr();
+        hm17_result=1;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISIS OK"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISCE",8)) {
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCE OK"));
+#endif
+        hm17_scanning=0;
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+NAME:",8)) {
+        if (hm17_sbuffer[hm17_sindex-1]=='\n') {
+          hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) {
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("NAME OK"));
+            AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+          }
+#endif
+          hm17_sbclr();
+        }
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DIS0:",8)) {
+        if (hm17_cmd==HM17_DISI) {
+#ifdef HM17_V110
+          goto hm17_v110;
+#endif
+        } else {
+          if (hm17_sindex==20) {
+            hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+            if (hm17_debug) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+            }
+#endif
+            hm17_sbclr();
+          }
+        }
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISC:",8)) {
+hm17_v110:
+        if (hm17_cmd==HM17_DISI) {
+          if (hm17_sindex==78) {
+#ifdef IBEACON_DEBUG
+            if (hm17_debug) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("DISC: OK"));
+
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+            }
+#endif
+            memcpy(ib.FACID,&hm17_sbuffer[8],8);
+            memcpy(ib.UID,&hm17_sbuffer[8+8+1],32);
+            memcpy(ib.MAJOR,&hm17_sbuffer[8+8+1+32+1],4);
+            memcpy(ib.MINOR,&hm17_sbuffer[8+8+1+32+1+4],4);
+            memcpy(ib.PWR,&hm17_sbuffer[8+8+1+32+1+4+4],2);
+            memcpy(ib.MAC,&hm17_sbuffer[8+8+1+32+1+4+4+2+1],12);
+            memcpy(ib.RSSI,&hm17_sbuffer[8+8+1+32+1+4+4+2+1+12+1],4);
+
+            if (ibeacon_add(&ib)) {
+              ibeacon_mqtt(ib.MAC,ib.RSSI);
+            }
+            hm17_sbclr();
+            hm17_result=1;
+          }
+        } else {
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+#endif
+        }
+        break;
+      }
+  }
+}
+
+void IBEACON_loop() {
+
+  if (!IBEACON_Serial) return;
+
+uint32_t difftime=millis()-hm17_lastms;
+
+  while (IBEACON_Serial->available()) {
+    hm17_lastms=millis();
+
+    if (hm17_sindex<HM17_BSIZ) {
+      hm17_sbuffer[hm17_sindex]=IBEACON_Serial->read();
+      hm17_sindex++;
+      hm17_decode();
+    } else {
+      hm17_sindex=0;
+      break;
+    }
+  }
+
+  if (hm17_cmd==99) {
+   if (hm17_sindex>=HM17_BSIZ-2 || (hm17_sindex && (difftime>100))) {
+     AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),hm17_sbuffer);
+     hm17_sbclr();
+   }
+  }
+
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_IBEACON[] PROGMEM =
+ "{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}";
+
+void IBEACON_Show(void) {
+char mac[14];
+char rssi[6];
+
+  for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+    if (ibeacons[cnt].FLAGS) {
+      memcpy(mac,ibeacons[cnt].MAC,12);
+      mac[12]=0;
+      memcpy(rssi,ibeacons[cnt].RSSI,4);
+      rssi[4]=0;
+      WSContentSend_PD(HTTP_IBEACON,mac,rssi);
+    }
+  }
+
+}
+#endif
+# 485 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
+bool xsns52_cmd(void) {
+  bool serviced = true;
+  const char S_JSON_IBEACON[] = "{\"" D_CMND_SENSOR "%d\":%s:%d}";
+  const char S_JSON_IBEACON1[] = "{\"" D_CMND_SENSOR "%d\":%s:%s}";
+  uint16_t len=XdrvMailbox.data_len;
+  if (len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp>='0' && *cp<='8') {
+        hm17_sendcmd(*cp&7);
+        Response_P(S_JSON_IBEACON, XSNS_52,"hm17cmd",*cp&7);
+      } else if (*cp=='s') {
+        cp++;
+        len--;
+        while (*cp==' ') {
+          len--;
+          cp++;
+        }
+        IBEACON_Serial->write((uint8_t*)cp,len);
+        hm17_cmd=99;
+        Response_P(S_JSON_IBEACON1, XSNS_52,"hm17cmd",cp);
+      } else if (*cp=='u') {
+        cp++;
+        if (*cp) IB_UPDATE_TIME=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"uintv",IB_UPDATE_TIME);
+      } else if (*cp=='t') {
+        cp++;
+        if (*cp) IB_TIMEOUT_TIME=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"lintv",IB_TIMEOUT_TIME);
+      } else if (*cp=='c') {
+        for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) ibeacons[cnt].FLAGS=0;
+        Response_P(S_JSON_IBEACON1, XSNS_52,"clr list","");
+      }
+#ifdef IBEACON_DEBUG
+      else if (*cp=='d') {
+        cp++;
+        if (*cp) hm17_debug=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"debug",hm17_debug);
+      }
+#endif
+  } else {
+    serviced=false;
+  }
+  return serviced;
+}
+
+#define D_CMND_IBEACON "IBEACON"
+
+bool ibeacon_cmd(void) {
+  ib_mac[0]=0;
+  int16_t rssi=0;
+  const char S_JSON_IBEACON[] = "{\"" D_CMND_IBEACON "_%s_RSSI\":%d}";
+  uint8_t cmd_len = strlen(D_CMND_IBEACON);
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_IBEACON), cmd_len)) {
+
+    rssi = XdrvMailbox.payload;
+    if (rssi==99) {
+      memcpy(ib_mac,XdrvMailbox.topic+cmd_len+1,12);
+      ib_mac[12]=0;
+      if (hm17_scanning) {
+
+        hm17_flag|=2;
+      } else {
+        ib_sendbeep();
+      }
+    }
+    Response_P(S_JSON_IBEACON,ib_mac,rssi);
+    return true;
+  }
+  return false;
+}
+
+void ib_sendbeep(void) {
+  hm17_flag=0;
+  hm17_sendcmd(HM17_CON);
+}
+
+void ibeacon_mqtt(const char *mac,const char *rssi) {
+  char s_mac[14];
+  char s_rssi[6];
+  memcpy(s_mac,mac,12);
+  s_mac[12]=0;
+  memcpy(s_rssi,rssi,4);
+  s_rssi[4]=0;
+  int16_t n_rssi=atoi(s_rssi);
+  ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi);
+  MqttPublishTeleSensor();
+}
+
+
+
+
+
+
+bool Xsns52(byte function)
+{
+  bool result = false;
+
+    switch (function) {
+      case FUNC_INIT:
+        IBEACON_Init();
+        break;
+      case FUNC_LOOP:
+        IBEACON_loop();
+        break;
+      case FUNC_EVERY_SECOND:
+        hm17_every_second();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_52 == XdrvMailbox.index) {
+          result = xsns52_cmd();
+        }
+        break;
+      case FUNC_COMMAND:
+        result=ibeacon_cmd();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        if (hm17_found) IBEACON_Show();
+        break;
+#endif
+    }
+    return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+#ifdef USE_SML_M
+
+#define XSNS_53 53
+
+
+#define SML_BAUDRATE 9600
+# 45 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+#include <TasmotaSerial.h>
+
+
+#define SPECIAL_SS 
+
+
+
+
+
+#if MY_LANGUAGE==de-DE
+
+#define D_TPWRIN "Verbrauch"
+#define D_TPWROUT "Einspeisung"
+#define D_TPWRCURR "Aktueller Verbrauch"
+#define D_TPWRCURR1 "Verbrauch P1"
+#define D_TPWRCURR2 "Verbrauch P2"
+#define D_TPWRCURR3 "Verbrauch P3"
+#define D_Strom_L1 "Strom L1"
+#define D_Strom_L2 "Strom L2"
+#define D_Strom_L3 "Strom L3"
+#define D_Spannung_L1 "Spannung L1"
+#define D_Spannung_L2 "Spannung L2"
+#define D_Spannung_L3 "Spannung L3"
+#define D_METERNR "Zähler Nr"
+#define D_METERSID "Service ID"
+#define D_GasIN "Zählerstand"
+#define D_H2oIN "Zählerstand"
+#define D_StL1L2L3 "Ströme L1+L2+L3"
+#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
+
+#else
+
+#undef D_TPWRIN
+#undef D_TPWROUT
+#undef D_TPWRCURR
+#undef D_TPWRCURR1
+#undef D_TPWRCURR2
+#undef D_TPWRCURR3
+#undef D_Strom_L1
+#undef D_Strom_L2
+#undef D_Strom_L3
+#undef D_Spannung_L1
+#undef D_Spannung_L2
+#undef D_Spannung_L3
+#undef D_METERNR
+#undef D_METERSID
+#undef D_GasIN
+#undef D_H2oIN
+#undef D_StL1L2L3
+#undef D_SpL1L2L3
+
+#define D_TPWRIN "Total-In"
+#define D_TPWROUT "Total-Out"
+#define D_TPWRCURR "Current-In/Out"
+#define D_TPWRCURR1 "Current-In p1"
+#define D_TPWRCURR2 "Current-In p2"
+#define D_TPWRCURR3 "Current-In p3"
+#define D_Strom_L1 "Current L1"
+#define D_Strom_L2 "Current L2"
+#define D_Strom_L3 "Current L3"
+#define D_Spannung_L1 "Voltage L1"
+#define D_Spannung_L2 "Voltage L2"
+#define D_Spannung_L3 "Voltage L3"
+#define D_METERNR "Meter_number"
+#define D_METERSID "Service ID"
+#define D_GasIN "Counter"
+#define D_H2oIN "Counter"
+#define D_StL1L2L3 "Current L1+L2+L3"
+#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
+
+#endif
+
+
+
+#define DJ_TPWRIN "Total_in"
+#define DJ_TPWROUT "Total_out"
+#define DJ_TPWRCURR "Power_curr"
+#define DJ_TPWRCURR1 "Power_p1"
+#define DJ_TPWRCURR2 "Power_p2"
+#define DJ_TPWRCURR3 "Power_p3"
+#define DJ_CURR1 "Curr_p1"
+#define DJ_CURR2 "Curr_p2"
+#define DJ_CURR3 "Curr_p3"
+#define DJ_VOLT1 "Volt_p1"
+#define DJ_VOLT2 "Volt_p2"
+#define DJ_VOLT3 "Volt_p3"
+#define DJ_METERNR "Meter_number"
+#define DJ_METERSID "Meter_id"
+#define DJ_CSUM "Curr_summ"
+#define DJ_VAVG "Volt_avg"
+#define DJ_COUNTER "Count"
+
+struct METER_DESC {
+  uint8_t srcpin;
+  uint8_t type;
+  uint16_t flag;
+  int32_t params;
+  char prefix[8];
+  int8_t trxpin;
+  uint8_t tsecs;
+  char *txmem;
+  uint8_t index;
+  uint8_t max_index;
+};
+
+
+
+
+
+
+#define EHZ161_0 1
+#define EHZ161_1 2
+#define EHZ363 3
+#define EHZH 4
+#define EDL300 5
+#define Q3B 6
+#define COMBO3 7
+#define COMBO2 8
+#define COMBO3a 9
+#define Q3B_V1 10
+#define EHZ363_2 11
+#define COMBO3b 12
+#define WGS_COMBO 13
+#define EBZD_G 14
+
+
+#define METER EHZ161_1
+
+
+#if METER==EHZ161_0
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
+"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
+"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
+"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+
+
+#if METER==EHZ161_1
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZ363
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZH
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+
+
+#if METER==EDL300
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+#if METER==EBZD_G
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"strom",-1,1,0}};
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
+
+"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100600100ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+
+#if METER==Q3B
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+#if METER==COMBO3
+
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
+  [1]={14,'s',0,SML_BAUDRATE,"SML",-1,1,0},
+  [2]={4,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
+"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
+"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
+"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"2,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"3,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+#if METER==COMBO2
+
+#undef METERS_USED
+#define METERS_USED 2
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
+  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+
+"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+#if METER==COMBO3a
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
+  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0},
+  [2]={1,'o',0,SML_BAUDRATE,"OBIS3",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,=h --- Zähler Nr 1 ---|"
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"2,=h --- Zähler Nr 2 ---|"
+"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"3,=h --- Zähler Nr 3 ---|"
+"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"3,=d 10 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+
+
+#if METER==Q3B_V1
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+[0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,=d 1 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZ363_2
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+[0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
+
+"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+#if METER==COMBO3b
+#undef METERS_USED
+#define METERS_USED 3
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
+  [1]={14,'c',0,50,"Gas"},
+  [2]={1,'c',0,10,"Wasser"}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+
+
+"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",2|"
+
+"3,1-0:1.8.0*255(@100," D_H2oIN ",cbm," DJ_COUNTER ",2";
+#endif
+
+
+#if METER==WGS_COMBO
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={1,'c',0,10,"H20",-1,1,0},
+  [1]={4,'c',0,50,"GAS",-1,1,0},
+  [2]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+
+"1,1-0:1.8.0*255(@10000," D_H2oIN ",cbm," DJ_COUNTER ",4|"
+
+
+"2,=h==================|"
+"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",3|"
+
+"3,=h==================|"
+
+"3,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",3|"
+"3,=h==================|"
+
+"3,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",2|"
+"3,=h -------------------------------|"
+"3,=m 10+11+12 @100," D_StL1L2L3 ",A," DJ_CSUM ",2|"
+
+"3,=m 13+14+15/#3 @100," D_SpL1L2L3 ",V," DJ_VAVG ",2|"
+"3,=h==================|"
+
+"3,77070100240700ff@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",2|"
+
+"3,77070100380700ff@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",2|"
+
+"3,770701004c0700ff@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",2|"
+"3,=h -------------------------------|"
+
+"3,770701001f0700ff@100," D_Strom_L1 ",A," DJ_CURR1 ",2|"
+
+"3,77070100330700ff@100," D_Strom_L2 ",A," DJ_CURR2 ",2|"
+
+"3,77070100470700ff@100," D_Strom_L3 ",A," DJ_CURR3 ",2|"
+"3,=h -------------------------------|"
+
+"3,77070100200700ff@100," D_Spannung_L1 ",V," DJ_VOLT1 ",2|"
+
+"3,77070100340700ff@100," D_Spannung_L2 ",V," DJ_VOLT2 ",2|"
+
+"3,77070100480700ff@100," D_Spannung_L3 ",V," DJ_VOLT3 ",2|"
+"3,=h==================|"
+
+"3,77070100000009ff@#," D_METERSID ",," DJ_METERSID ",0|"
+"3,=h--------------------------------";
+#endif
+# 499 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+#define USE_SML_MEDIAN_FILTER 
+
+
+#ifndef SML_MAX_VARS
+#define SML_MAX_VARS 20
+#endif
+
+
+#define MAX_METERS 5
+double meter_vars[SML_MAX_VARS];
+
+#define MAX_DVARS MAX_METERS*2
+double dvalues[MAX_DVARS];
+uint32_t dtimes[MAX_DVARS];
+uint8_t meters_used;
+
+struct METER_DESC const *meter_desc_p;
+const uint8_t *meter_p;
+uint8_t meter_spos[MAX_METERS];
+
+
+TasmotaSerial *meter_ss[MAX_METERS];
+
+
+#define SML_BSIZ 48
+uint8_t smltbuf[MAX_METERS][SML_BSIZ];
+
+
+#define METER_ID_SIZE 24
+char meter_id[MAX_METERS][METER_ID_SIZE];
+
+#define EBUS_SYNC 0xaa
+#define EBUS_ESC 0xa9
+
+uint8_t sml_send_blocks;
+uint8_t sml_100ms_cnt;
+uint8_t sml_desc_cnt;
+
+#ifdef USE_SML_MEDIAN_FILTER
+
+#define MEDIAN_SIZE 5
+struct SML_MEDIAN_FILTER {
+double buffer[MEDIAN_SIZE];
+int8_t index;
+} sml_mf[SML_MAX_VARS];
+
+#ifndef FLT_MAX
+#define FLT_MAX 99999999
+#endif
+
+double sml_median_array(double *array,uint8_t len) {
+      uint8_t ind[len];
+      uint8_t mind=0,index=0,flg;
+      double min=FLT_MAX;
+
+      for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
+          for (uint8_t mcnt=0; mcnt<len; mcnt++) {
+              flg=0;
+              for (uint8_t icnt=0; icnt<index; icnt++) {
+                  if (ind[icnt]==mcnt) {
+                      flg=1;
+                  }
+              }
+              if (!flg) {
+                  if (array[mcnt]<min) {
+                      min=array[mcnt];
+                      mind=mcnt;
+                  }
+              }
+          }
+          ind[index]=mind;
+          index++;
+          min=FLT_MAX;
+      }
+      return array[ind[len/2]];
+  }
+
+
+
+double sml_median(struct SML_MEDIAN_FILTER* mf, double in) {
+
+
+  mf->buffer[mf->index]=in;
+  mf->index++;
+  if (mf->index>=MEDIAN_SIZE) mf->index=0;
+
+  return sml_median_array(mf->buffer,MEDIAN_SIZE);
+# 603 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+}
+#endif
+
+#ifdef ANALOG_OPTO_SENSOR
+
+uint8_t ads1115_up;
+
+
+#define SAMPLE_BIT (0x8000)
+
+#define ADS1115_COMP_QUEUE_SHIFT 0
+#define ADS1115_COMP_LATCH_SHIFT 2
+#define ADS1115_COMP_POLARITY_SHIFT 3
+#define ADS1115_COMP_MODE_SHIFT 4
+#define ADS1115_DATA_RATE_SHIFT 5
+#define ADS1115_MODE_SHIFT 8
+#define ADS1115_PGA_SHIFT 9
+#define ADS1115_MUX_SHIFT 12
+
+enum ads1115_comp_queue {
+ ADS1115_COMP_QUEUE_AFTER_ONE = 0,
+ ADS1115_COMP_QUEUE_AFTER_TWO = 0x1 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_AFTER_FOUR = 0x2 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_DISABLE = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_MASK = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
+};
+
+enum ads1115_comp_latch {
+ ADS1115_COMP_LATCH_NO = 0,
+ ADS1115_COMP_LATCH_YES = 1 << ADS1115_COMP_LATCH_SHIFT,
+ ADS1115_COMP_LATCH_MASK = 1 << ADS1115_COMP_LATCH_SHIFT,
+};
+
+enum ads1115_comp_polarity {
+ ADS1115_COMP_POLARITY_ACTIVE_LOW = 0,
+ ADS1115_COMP_POLARITY_ACTIVE_HIGH = 1 << ADS1115_COMP_POLARITY_SHIFT,
+ ADS1115_COMP_POLARITY_MASK = 1 << ADS1115_COMP_POLARITY_SHIFT,
+};
+
+enum ads1115_comp_mode {
+ ADS1115_COMP_MODE_WINDOW = 0,
+ ADS1115_COMP_MODE_HYSTERESIS = 1 << ADS1115_COMP_MODE_SHIFT,
+ ADS1115_COMP_MODE_MASK = 1 << ADS1115_COMP_MODE_SHIFT,
+};
+
+enum ads1115_data_rate {
+ ADS1115_DATA_RATE_8_SPS = 0,
+ ADS1115_DATA_RATE_16_SPS = 0x1 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_32_SPS = 0x2 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_64_SPS = 0x3 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_128_SPS = 0x4 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_250_SPS = 0x5 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_475_SPS = 0x6 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_860_SPS = 0x7 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_MASK = 0x7 << ADS1115_DATA_RATE_SHIFT,
+};
+
+enum ads1115_mode {
+ ADS1115_MODE_CONTINUOUS = 0,
+ ADS1115_MODE_SINGLE_SHOT = 1 << ADS1115_MODE_SHIFT,
+ ADS1115_MODE_MASK = 1 << ADS1115_MODE_SHIFT,
+};
+
+enum ads1115_pga {
+ ADS1115_PGA_TWO_THIRDS = 0,
+ ADS1115_PGA_ONE = 0x1 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_TWO = 0x2 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_FOUR = 0x3 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_EIGHT = 0x4 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_SIXTEEN = 0x5 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_MASK = 0x7 << ADS1115_PGA_SHIFT,
+};
+
+
+enum ads1115_mux {
+ ADS1115_MUX_DIFF_AIN0_AIN1 = 0,
+ ADS1115_MUX_DIFF_AIN0_AIN3 = 0x1 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_DIFF_AIN1_AIN3 = 0x2 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_DIFF_AIN2_AIN3 = 0x3 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN0 = 0x4 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN1 = 0x5 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN2 = 0x6 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN3 = 0x7 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_MASK = 0x7 << ADS1115_MUX_SHIFT,
+};
+
+class ADS1115 {
+public:
+ ADS1115(uint8_t address = 0x48);
+
+ void begin();
+ uint8_t trigger_sample();
+ uint8_t reset();
+ bool is_sample_in_progress();
+ int16_t read_sample();
+ float sample_to_float(int16_t val);
+ float read_sample_float();
+
+ void set_comp_queue(enum ads1115_comp_queue val) { set_config(val, ADS1115_COMP_QUEUE_MASK); }
+ void set_comp_latching(enum ads1115_comp_latch val) { set_config(val, ADS1115_COMP_LATCH_MASK); }
+ void set_comp_polarity(enum ads1115_comp_polarity val) { set_config(val, ADS1115_COMP_POLARITY_MASK); }
+ void set_comp_mode(enum ads1115_comp_mode val) { set_config(val, ADS1115_COMP_MODE_MASK); }
+ void set_data_rate(enum ads1115_data_rate val) { set_config(val, ADS1115_DATA_RATE_MASK); }
+ void set_mode(enum ads1115_mode val) { set_config(val, ADS1115_MODE_MASK); }
+ void set_pga(enum ads1115_pga val) { set_config(val, ADS1115_PGA_MASK); m_voltage_range = val >> ADS1115_PGA_SHIFT; }
+ void set_mux(enum ads1115_mux val) { set_config(val, ADS1115_MUX_MASK); }
+
+private:
+ void set_config(uint16_t val, uint16_t mask) {
+  m_config = (m_config & ~mask) | val;
+ }
+
+ uint8_t write_register(uint8_t reg, uint16_t val);
+ uint16_t read_register(uint8_t reg);
+
+ uint8_t m_address;
+ uint16_t m_config;
+ int m_voltage_range;
+};
+
+
+enum ads1115_register {
+ ADS1115_REGISTER_CONVERSION = 0,
+ ADS1115_REGISTER_CONFIG = 1,
+ ADS1115_REGISTER_LOW_THRESH = 2,
+ ADS1115_REGISTER_HIGH_THRESH = 3,
+};
+
+#define FACTOR 32768.0
+static float ranges[] = { 6.144 / FACTOR, 4.096 / FACTOR, 2.048 / FACTOR, 1.024 / FACTOR, 0.512 / FACTOR, 0.256 / FACTOR};
+
+ADS1115::ADS1115(uint8_t address)
+{
+        m_address = address;
+        m_config = ADS1115_COMP_QUEUE_AFTER_ONE |
+                   ADS1115_COMP_LATCH_NO |
+                   ADS1115_COMP_POLARITY_ACTIVE_LOW |
+                   ADS1115_COMP_MODE_WINDOW |
+                   ADS1115_DATA_RATE_128_SPS |
+                   ADS1115_MODE_SINGLE_SHOT |
+                   ADS1115_MUX_GND_AIN0;
+        set_pga(ADS1115_PGA_ONE);
+}
+
+uint8_t ADS1115::write_register(uint8_t reg, uint16_t val)
+{
+        Wire.beginTransmission(m_address);
+        Wire.write(reg);
+        Wire.write(val>>8);
+        Wire.write(val & 0xFF);
+        return Wire.endTransmission();
+}
+
+uint16_t ADS1115::read_register(uint8_t reg)
+{
+        Wire.beginTransmission(m_address);
+        Wire.write(reg);
+        Wire.endTransmission();
+
+        uint8_t result = Wire.requestFrom((int)m_address, 2, 1);
+        if (result != 2) {
+          return 0;
+        }
+
+        uint16_t val;
+
+        val = Wire.read() << 8;
+        val |= Wire.read();
+        return val;
+}
+
+void ADS1115::begin()
+{
+        Wire.begin();
+}
+
+uint8_t ADS1115::trigger_sample()
+{
+        return write_register(ADS1115_REGISTER_CONFIG, m_config | SAMPLE_BIT);
+}
+
+uint8_t ADS1115::reset()
+{
+ Wire.beginTransmission(0);
+ Wire.write(0x6);
+ return Wire.endTransmission();
+}
+
+bool ADS1115::is_sample_in_progress()
+{
+ uint16_t val = read_register(ADS1115_REGISTER_CONFIG);
+ return (val & SAMPLE_BIT) == 0;
+}
+
+int16_t ADS1115::read_sample()
+{
+        return read_register(ADS1115_REGISTER_CONVERSION);
+}
+
+float ADS1115::sample_to_float(int16_t val)
+{
+ return val * ranges[m_voltage_range];
+}
+
+float ADS1115::read_sample_float()
+{
+ return sample_to_float(read_sample());
+}
+
+ADS1115 adc;
+
+void ADS1115_init(void) {
+
+  ads1115_up=0;
+  if (!i2c_flg) return;
+
+  adc.begin();
+  adc.set_data_rate(ADS1115_DATA_RATE_128_SPS);
+  adc.set_mode(ADS1115_MODE_CONTINUOUS);
+  adc.set_mux(ADS1115_MUX_DIFF_AIN0_AIN3);
+  adc.set_pga(ADS1115_PGA_TWO);
+
+  int16_t val = adc.read_sample();
+  ads1115_up=1;
+}
+
+#endif
+
+char sml_start;
+uint8_t dump2log=0;
+
+#define SML_SAVAILABLE Serial_available()
+#define SML_SREAD Serial_read()
+#define SML_SPEAK Serial_peek()
+
+bool Serial_available() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->available();
+}
+
+uint8_t Serial_read() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->read();
+}
+
+uint8_t Serial_peek() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->peek();
+}
+
+uint8_t sml_logindex;
+
+void Dump2log(void) {
+
+int16_t index=0,hcnt=0;
+uint32_t d_lastms;
+uint8_t dchars[16];
+
+
+
+  if (dump2log&8) {
+
+    while (SML_SAVAILABLE) {
+      log_data[index]=':';
+      index++;
+      log_data[index]=' ';
+      index++;
+      d_lastms=millis();
+      while ((millis()-d_lastms)<40) {
+        if (SML_SAVAILABLE) {
+          uint8_t c=SML_SREAD;
+          sprintf(&log_data[index],"%02x ",c);
+          dchars[hcnt]=c;
+          index+=3;
+          hcnt++;
+          if (hcnt>15) {
+
+            log_data[index]='=';
+            index++;
+            log_data[index]='>';
+            index++;
+            log_data[index]=' ';
+            index++;
+            for (uint8_t ccnt=0; ccnt<16; ccnt++) {
+              if (isprint(dchars[ccnt])) {
+                log_data[index]=dchars[ccnt];
+              } else {
+                log_data[index]=' ';
+              }
+              index++;
+            }
+            break;
+          }
+        }
+      }
+      if (index>0) {
+        log_data[index]=0;
+        AddLog(LOG_LEVEL_INFO);
+        index=0;
+        hcnt=0;
+      }
+    }
+  } else {
+    if (meter_desc_p[(dump2log&7)-1].type=='o') {
+
+      while (SML_SAVAILABLE) {
+        char c=SML_SREAD&0x7f;
+        if (c=='\n' || c=='\r') {
+          log_data[sml_logindex]=0;
+          AddLog(LOG_LEVEL_INFO);
+          sml_logindex=2;
+          log_data[0]=':';
+          log_data[1]=' ';
+          break;
+        }
+        log_data[sml_logindex]=c;
+        if (sml_logindex<sizeof(log_data)-2) {
+          sml_logindex++;
+        }
+      }
+    } else {
+
+      index=0;
+      log_data[index]=':';
+      index++;
+      log_data[index]=' ';
+      index++;
+      d_lastms=millis();
+      while ((millis()-d_lastms)<40) {
+        if (SML_SAVAILABLE) {
+          unsigned char c;
+          if (meter_desc_p[(dump2log&7)-1].type=='e') {
+
+            c=SML_SREAD;
+            sprintf(&log_data[index],"%02x ",c);
+            index+=3;
+            if (c==EBUS_SYNC) break;
+          } else {
+
+            if (sml_start==0x77) {
+              sml_start=0;
+            } else {
+              c=SML_SPEAK;
+              if (c==0x77) {
+                sml_start=c;
+                break;
+              }
+            }
+            c=SML_SREAD;
+            sprintf(&log_data[index],"%02x ",c);
+            index+=3;
+          }
+        }
+      }
+      if (index>2) {
+        log_data[index]=0;
+        AddLog(LOG_LEVEL_INFO);
+      }
+    }
+  }
+}
+
+
+uint8_t *skip_sml(uint8_t *cp,int16_t *res) {
+    uint8_t len,len1,type;
+    len=*cp&0xf;
+    type=*cp&0x70;
+    if (type==0x70) {
+
+
+        cp++;
+        while (len--) {
+            len1=*cp&0x0f;
+            cp+=len1;
+        }
+         *res=0;
+    } else {
+
+        *res=(signed char)*(cp+1);
+        cp+=len;
+    }
+    return cp;
+}
+
+
+
+double sml_getvalue(unsigned char *cp,uint8_t index) {
+uint8_t len,unit,type;
+int16_t scaler,result;
+int64_t value;
+double dval;
+
+
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+  scaler=result;
+
+  type=*cp&0x70;
+  len=*cp&0x0f;
+  cp++;
+    if (type==0x50 || type==0x60) {
+
+        uint64_t uvalue=0;
+        uint8_t nlen=len;
+        while (--nlen) {
+            uvalue<<=8;
+            uvalue|=*cp++;
+        }
+        if (type==0x50) {
+
+            switch (len-1) {
+                case 1:
+
+                    value=(signed char)uvalue;
+                    break;
+                case 2:
+
+#ifdef DWS74_BUG
+                    if (scaler==-2) {
+                      value=(uint32_t)uvalue;
+                    } else {
+                      value=(int16_t)uvalue;
+                    }
+#else
+                    value=(int16_t)uvalue;
+#endif
+                    break;
+                case 3:
+                case 4:
+
+                    value=(int32_t)uvalue;
+                    break;
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+
+                    value=(int64_t)uvalue;
+                    break;
+            }
+        } else {
+
+            value=uvalue;
+        }
+
+    } else {
+        if (!(type&0xf0)) {
+
+
+
+            if (len==9) {
+
+                cp++;
+                uint32_t s1,s2;
+                s1=*cp<<16|*(cp+1)<<8|*(cp+2);
+                cp+=4;
+                s2=*cp<<16|*(cp+1)<<8|*(cp+2);
+                sprintf(&meter_id[index][0],"%u-%u",s1,s2);
+            } else {
+
+                char *str=&meter_id[index][0];
+                for (type=0; type<len-1; type++) {
+                    sprintf(str,"%02x",*cp++);
+                    str+=2;
+                }
+            }
+            value=0;
+        } else {
+            value=999999;
+            scaler=0;
+        }
+    }
+    dval=value;
+    if (scaler==-1) {
+      dval/=10;
+    } else if (scaler==-2) {
+      dval/=100;
+    } else if (scaler==-3) {
+      dval/=1000;
+    } else if (scaler==-4) {
+      dval/=10000;
+    } else if (scaler==1) {
+      dval*=10;
+    } else if (scaler==2) {
+      dval*=100;
+    } else if (scaler==3) {
+      dval*=1000;
+    }
+    return dval;
+}
+
+uint8_t hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    chr=toupper(chr);
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+  }
+  return rVal;
+}
+
+uint8_t sb_counter;
+
+
+double CharToDouble(const char *str)
+{
+
+  char strbuf[24];
+
+  strlcpy(strbuf, str, sizeof(strbuf));
+  char *pt = strbuf;
+  while ((*pt != '\0') && isblank(*pt)) { pt++; }
+
+  signed char sign = 1;
+  if (*pt == '-') { sign = -1; }
+  if (*pt == '-' || *pt=='+') { pt++; }
+
+  double left = 0;
+  if (*pt != '.') {
+    left = atoi(pt);
+    while (isdigit(*pt)) { pt++; }
+  }
+
+  double right = 0;
+  if (*pt == '.') {
+    pt++;
+    right = atoi(pt);
+    while (isdigit(*pt)) {
+      pt++;
+      right /= 10.0;
+    }
+  }
+
+  double result = left + right;
+  if (sign < 0) {
+    return -result;
+  }
+  return result;
+}
+
+
+
+void ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
+    short count,count1;
+    for (count=0; count<len; count++) {
+        if (ebus_buffer[count]==EBUS_ESC) {
+
+            ebus_buffer[count]+=ebus_buffer[count+1];
+
+            count++;
+            for (count1=count; count1<len; count1++) {
+                ebus_buffer[count1]=ebus_buffer[count1+1];
+            }
+        }
+    }
+
+}
+
+uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) {
+ uint8_t crc;
+ uint8_t polynom;
+ int i;
+
+ crc = crc_init;
+ for (i = 0; i < 8; i++) {
+  if (crc & 0x80) {
+   polynom = (uint8_t) 0x9B;
+  }
+  else {
+   polynom = (uint8_t) 0;
+  }
+  crc = (uint8_t)((crc & ~0x80) << 1);
+  if (data & 0x80) {
+   crc = (uint8_t)(crc | 1) ;
+  }
+  crc = (uint8_t)(crc ^ polynom);
+  data = (uint8_t)(data << 1);
+ }
+ return (crc);
+}
+
+
+uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen ) {
+ uint16_t i;
+ uint8_t Crc = 0;
+ for(i = 0 ; i < DataLen ; ++i, ++Data ) {
+      Crc = ebus_crc8( *Data, Crc );
+   }
+   return Crc;
+}
+
+void sml_empty_receiver(uint32_t meters) {
+  while (meter_ss[meters]->available()) {
+    meter_ss[meters]->read();
+  }
+}
+
+
+void sml_shift_in(uint32_t meters,uint32_t shard) {
+  uint32_t count;
+  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') {
+
+    for (count=0; count<SML_BSIZ-1; count++) {
+      smltbuf[meters][count]=smltbuf[meters][count+1];
+    }
+  }
+  uint8_t iob=(uint8_t)meter_ss[meters]->read();
+
+  if (meter_desc_p[meters].type=='o') {
+    smltbuf[meters][SML_BSIZ-1]=iob&0x7f;
+  } else if (meter_desc_p[meters].type=='s') {
+    smltbuf[meters][SML_BSIZ-1]=iob;
+  } else if (meter_desc_p[meters].type=='r') {
+    smltbuf[meters][SML_BSIZ-1]=iob;
+  } else if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M') {
+    smltbuf[meters][meter_spos[meters]] = iob;
+    meter_spos[meters]++;
+    if (meter_spos[meters]>=9) {
+      SML_Decode(meters);
+      sml_empty_receiver(meters);
+      meter_spos[meters]=0;
+    }
+  } else if (meter_desc_p[meters].type=='p') {
+    smltbuf[meters][meter_spos[meters]] = iob;
+    meter_spos[meters]++;
+    if (meter_spos[meters]>=7) {
+      SML_Decode(meters);
+      sml_empty_receiver(meters);
+      meter_spos[meters]=0;
+    }
+  } else {
+    if (iob==EBUS_SYNC) {
+
+
+      if (meter_spos[meters]>4+5) {
+
+        uint8_t tlen=smltbuf[meters][4]+5;
+
+        if (smltbuf[meters][tlen]=ebus_CalculateCRC(smltbuf[meters],tlen)) {
+            ebus_esc(smltbuf[meters],tlen);
+            SML_Decode(meters);
+        } else {
+
+
+        }
+      }
+      meter_spos[meters]=0;
+      return;
+    }
+  smltbuf[meters][meter_spos[meters]] = iob;
+  meter_spos[meters]++;
+  if (meter_spos[meters]>=SML_BSIZ) {
+   meter_spos[meters]=0;
+  }
+  }
+  sb_counter++;
+  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') SML_Decode(meters);
+}
+
+
+
+void SML_Poll(void) {
+uint32_t meters;
+
+    for (meters=0; meters<meters_used; meters++) {
+      if (meter_desc_p[meters].type!='c') {
+
+        while (meter_ss[meters]->available()) {
+          sml_shift_in(meters,0);
+        }
+      }
+    }
+}
+
+
+void SML_Decode(uint8_t index) {
+  const char *mp=(const char*)meter_p;
+  int8_t mindex;
+  uint8_t *cp;
+  uint8_t dindex=0,vindex=0;
+  delay(0);
+  while (mp != NULL) {
+
+
+
+    mindex=((*mp)&7)-1;
+
+    if (mindex<0 || mindex>=meters_used) mindex=0;
+    mp+=2;
+    if (*mp=='=' && *(mp+1)=='h') {
+      mp = strchr(mp, '|');
+      if (mp) mp++;
+      continue;
+    }
+
+    if (index!=mindex) goto nextsect;
+
+
+    cp=&smltbuf[mindex][0];
+
+
+    if (*mp=='=') {
+
+      mp++;
+
+      if (*mp=='m' && !sb_counter) {
+
+
+        mp++;
+        while (*mp==' ') mp++;
+
+        double dvar;
+        uint8_t opr;
+        uint32_t ind;
+        ind=atoi(mp);
+        while (*mp>='0' && *mp<='9') mp++;
+        if (ind<1 || ind>SML_MAX_VARS) ind=1;
+        dvar=meter_vars[ind-1];
+        for (uint8_t p=0;p<5;p++) {
+          if (*mp=='@') {
+
+            meter_vars[vindex]=dvar;
+            mp++;
+            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            break;
+          }
+          opr=*mp;
+          mp++;
+          uint8_t iflg=0;
+          if (*mp=='#') {
+            iflg=1;
+            mp++;
+          }
+          ind=atoi(mp);
+          while (*mp>='0' && *mp<='9') mp++;
+          if (ind<1 || ind>SML_MAX_VARS) ind=1;
+          switch (opr) {
+              case '+':
+                if (iflg) dvar+=ind;
+                else dvar+=meter_vars[ind-1];
+                break;
+              case '-':
+                if (iflg) dvar-=ind;
+                else dvar-=meter_vars[ind-1];
+                break;
+              case '*':
+                if (iflg) dvar*=ind;
+                else dvar*=meter_vars[ind-1];
+                break;
+              case '/':
+                if (iflg) dvar/=ind;
+                else dvar/=meter_vars[ind-1];
+                break;
+          }
+          while (*mp==' ') mp++;
+          if (*mp=='@') {
+
+            meter_vars[vindex]=dvar;
+            mp++;
+            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            break;
+          }
+        }
+      } else if (*mp=='d') {
+
+        if (dindex<MAX_DVARS) {
+
+          mp++;
+          while (*mp==' ') mp++;
+          uint8_t ind=atoi(mp);
+          while (*mp>='0' && *mp<='9') mp++;
+          if (ind<1 || ind>SML_MAX_VARS) ind=1;
+          uint32_t delay=atoi(mp)*1000;
+          uint32_t dtime=millis()-dtimes[dindex];
+          if (dtime>delay) {
+
+            dtimes[dindex]=millis();
+            double vdiff = meter_vars[ind-1]-dvalues[dindex];
+            dvalues[dindex]=meter_vars[ind-1];
+            meter_vars[vindex]=(double)360000.0*vdiff/((double)dtime/10000.0);
+
+            mp=strchr(mp,'@');
+            if (mp) {
+              mp++;
+              SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            }
+          }
+          dindex++;
+        }
+      } else if (*mp=='h') {
+
+        mp = strchr(mp, '|');
+        if (mp) mp++;
+        continue;
+      }
+    } else {
+
+      uint8_t found=1;
+      uint32_t ebus_dval=99;
+      float mbus_dval=99;
+      while (*mp!='@') {
+        if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
+          if (*mp++!=*cp++) {
+            found=0;
+          }
+        } else {
+          if (meter_desc_p[mindex].type=='s') {
+
+            uint8_t val = hexnibble(*mp++) << 4;
+            val |= hexnibble(*mp++);
+            if (val!=*cp++) {
+              found=0;
+            }
+          } else {
+
+
+            if (*mp=='x' && *(mp+1)=='x') {
+
+              mp+=2;
+              cp++;
+            } else if (!strncmp(mp,"UUuuUUuu",8)) {
+              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              ebus_dval=val;
+              mbus_dval=val;
+              mp+=8;
+              cp+=4;
+            } else if (*mp=='U' && *(mp+1)=='U' && *(mp+2)=='u' && *(mp+3)=='u'){
+              uint16_t val = cp[1]|(cp[0]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (!strncmp(mp,"SSssSSss",8)) {
+              int32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              ebus_dval=val;
+              mbus_dval=val;
+              mp+=8;
+              cp+=4;
+            } else if (*mp=='u' && *(mp+1)=='u' && *(mp+2)=='U' && *(mp+3)=='U'){
+              uint16_t val = cp[0]|(cp[1]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (*mp=='u' && *(mp+1)=='u') {
+              uint8_t val = *cp++;
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=2;
+            } else if (*mp=='s' && *(mp+1)=='s' && *(mp+2)=='S' && *(mp+3)=='S') {
+              int16_t val = *cp|(*(cp+1)<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (*mp=='S' && *(mp+1)=='S' && *(mp+2)=='s' && *(mp+3)=='s') {
+              int16_t val = cp[1]|(cp[0]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            }
+            else if (*mp=='s' && *(mp+1)=='s') {
+              int8_t val = *cp++;
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=2;
+            }
+            else if (!strncmp(mp,"ffffffff",8)) {
+              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              float *fp=(float*)&val;
+              ebus_dval=*fp;
+              mbus_dval=*fp;
+              mp+=8;
+              cp+=4;
+            }
+            else if (!strncmp(mp,"FFffFFff",8)) {
+
+              uint32_t val= (cp[1]<<0)|(cp[0]<<8)|(cp[3]<<16)|(cp[2]<<24);
+              float *fp=(float*)&val;
+              ebus_dval=*fp;
+              mbus_dval=*fp;
+              mp+=8;
+              cp+=4;
+            }
+            else if (!strncmp(mp,"eeeeee",6)) {
+              uint32_t val=(cp[0]<<16)|(cp[1]<<8)|(cp[2]<<0);
+              mbus_dval=val;
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"vvvvvv",6)) {
+              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/10.0);
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"cccccc",6)) {
+              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/100.0);
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"pppp",4)) {
+              mbus_dval=(float)((cp[0]<<8)|cp[1]);
+              mp+=4;
+              cp+=2;
+            }
+            else {
+              uint8_t val = hexnibble(*mp++) << 4;
+              val |= hexnibble(*mp++);
+              if (val!=*cp++) {
+                found=0;
+              }
+            }
+          }
+        }
+      }
+      if (found) {
+
+        mp++;
+        if (*mp=='#') {
+
+          mp++;
+          if (meter_desc_p[mindex].type=='o') {
+            for (uint8_t p=0;p<METER_ID_SIZE;p++) {
+              if (*cp==*mp) {
+                meter_id[mindex][p]=0;
+                break;
+              }
+              meter_id[mindex][p]=*cp++;
+            }
+          } else {
+            sml_getvalue(cp,mindex);
+          }
+        } else {
+          double dval;
+          if (meter_desc_p[mindex].type!='e' && meter_desc_p[mindex].type!='r' && meter_desc_p[mindex].type!='m' && meter_desc_p[mindex].type!='M' && meter_desc_p[mindex].type!='p') {
+
+            if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
+              dval=CharToDouble((char*)cp);
+            } else {
+              dval=sml_getvalue(cp,mindex);
+            }
+          } else {
+
+            if (*mp=='b') {
+              mp++;
+              uint8_t shift=*mp&7;
+              ebus_dval>>=shift;
+              ebus_dval&=1;
+              mp+=2;
+            }
+            if (*mp=='i') {
+
+              mp++;
+              uint8_t mb_index=strtol((char*)mp,(char**)&mp,10);
+              if (mb_index!=meter_desc_p[mindex].index) {
+                goto nextsect;
+              }
+              uint16_t crc = MBUS_calculateCRC(&smltbuf[mindex][0],7);
+              if (lowByte(crc)!=smltbuf[mindex][7]) goto nextsect;
+              if (highByte(crc)!=smltbuf[mindex][8]) goto nextsect;
+              dval=mbus_dval;
+
+              mp++;
+            } else {
+              if (meter_desc_p[mindex].type=='p') {
+                uint8_t crc = SML_PzemCrc(&smltbuf[mindex][0],6);
+                if (crc!=smltbuf[mindex][6]) goto nextsect;
+                dval=mbus_dval;
+              } else {
+                dval=ebus_dval;
+              }
+            }
+
+          }
+#ifdef USE_SML_MEDIAN_FILTER
+          if (meter_desc_p[mindex].flag&16) {
+            meter_vars[vindex]=sml_median(&sml_mf[vindex],dval);
+          } else {
+            meter_vars[vindex]=dval;
+          }
+#else
+          meter_vars[vindex]=dval;
+#endif
+
+
+          double fac=CharToDouble((char*)mp);
+          meter_vars[vindex]/=fac;
+          SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+        }
+      }
+    }
+nextsect:
+
+    if (vindex<SML_MAX_VARS-1) {
+      vindex++;
+    }
+    mp = strchr(mp, '|');
+    if (mp) mp++;
+  }
+}
+
+
+void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
+  char tpowstr[32];
+  char jname[24];
+
+
+  char *cp=strchr(mp,',');
+  if (cp) {
+    cp++;
+
+    cp=strchr(cp,',');
+    if (cp) {
+      cp++;
+
+      cp=strchr(cp,',');
+      if (cp) {
+        cp++;
+
+        for (uint8_t count=0;count<sizeof(jname);count++) {
+          if (*cp==',') {
+            jname[count]=0;
+            break;
+          }
+          jname[count]=*cp++;
+        }
+        cp++;
+        uint8_t dp=atoi(cp);
+        if (dp&0x10) {
+
+          dtostrfd(meter_vars[index],dp&0xf,tpowstr);
+          ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr);
+          MqttPublishTeleSensor();
+        }
+      }
+    }
+  }
+}
+
+
+void SML_Show(boolean json) {
+  int8_t count,mindex,cindex=0;
+  char tpowstr[32];
+  char name[24];
+  char unit[8];
+  char jname[24];
+  int8_t index=0,mid=0;
+  char *mp=(char*)meter_p;
+  char *cp;
+
+
+
+    int8_t lastmind=((*mp)&7)-1;
+    if (lastmind<0 || lastmind>=meters_used) lastmind=0;
+    while (mp != NULL) {
+
+        mindex=((*mp)&7)-1;
+        if (mindex<0 || mindex>=meters_used) mindex=0;
+        mp+=2;
+        if (*mp=='=' && *(mp+1)=='h') {
+          mp+=2;
+
+          if (json) {
+            mp = strchr(mp, '|');
+            if (mp) mp++;
+            continue;
+          }
+
+          uint8_t i;
+          for (i=0;i<sizeof(tpowstr)-2;i++) {
+            if (*mp=='|' || *mp==0) break;
+            tpowstr[i]=*mp++;
+          }
+          tpowstr[i]=0;
+
+
+          WSContentSend_PD(PSTR("{s}%s{e}"),tpowstr);
+
+          mp--;
+          mp = strchr(mp, '|');
+          if (mp) mp++;
+          continue;
+        }
+
+        cp=strchr(mp,'@');
+        if (cp) {
+          cp++;
+          if (*cp=='#') {
+
+            sprintf(tpowstr,"\"%s\"",&meter_id[mindex][0]);
+            mid=1;
+          } else {
+            mid=0;
+          }
+
+          cp=strchr(cp,',');
+          if (cp) {
+
+            cp++;
+            for (count=0;count<sizeof(name);count++) {
+              if (*cp==',') {
+                name[count]=0;
+                break;
+              }
+              name[count]=*cp++;
+            }
+            cp++;
+
+            for (count=0;count<sizeof(unit);count++) {
+              if (*cp==',') {
+                unit[count]=0;
+                break;
+              }
+              unit[count]=*cp++;
+            }
+            cp++;
+
+            for (count=0;count<sizeof(jname);count++) {
+              if (*cp==',') {
+                jname[count]=0;
+                break;
+              }
+              jname[count]=*cp++;
+            }
+
+            cp++;
+
+            if (!mid) {
+              uint8_t dp=atoi(cp)&0xf;
+              dtostrfd(meter_vars[index],dp,tpowstr);
+            }
+
+            if (json) {
+
+              if (index==0) {
+
+                ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+              }
+              else {
+                if (lastmind!=mindex) {
+
+
+                  ResponseAppend_P(PSTR("}"));
+
+
+                  ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  lastmind=mindex;
+                } else {
+
+                  ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
+                }
+              }
+            } else {
+
+
+              WSContentSend_PD(PSTR("{s}%s %s: {m}%s %s{e}"),meter_desc_p[mindex].prefix,name,tpowstr,unit);
+            }
+          }
+        }
+        if (index<SML_MAX_VARS-1) {
+          index++;
+        }
+
+        mp = strchr(cp, '|');
+        if (mp) mp++;
+    }
+    if (json) {
+
+
+     ResponseAppend_P(PSTR("}"));
+   } else {
+
+   }
+# 1802 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+}
+
+struct SML_COUNTER {
+  uint8_t sml_cnt_debounce;
+  uint8_t sml_cnt_old_state;
+  uint32_t sml_cnt_last_ts;
+  uint32_t sml_counter_ltime;
+  uint16_t sml_debounce;
+
+#ifdef ANALOG_OPTO_SENSOR
+  int16_t ana_curr;
+  int16_t ana_max;
+  int16_t ana_min;
+  int16_t ana_cmpl;
+  int16_t ana_cmph;
+#endif
+} sml_counters[MAX_COUNTERS];
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void SML_CounterUpd(uint8_t index) ICACHE_RAM_ATTR;
+void SML_CounterUpd1(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd2(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd3(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd4(void) ICACHE_RAM_ATTR;
+#endif
+
+void SML_CounterUpd(uint8_t index) {
+
+  uint8_t level=digitalRead(meter_desc_p[sml_counters[index].sml_cnt_old_state].srcpin);
+  if (!level) {
+
+    uint32_t ltime=millis()-sml_counters[index].sml_counter_ltime;
+    sml_counters[index].sml_counter_ltime=millis();
+    if (ltime>sml_counters[index].sml_debounce) {
+      RtcSettings.pulse_counter[index]++;
+      InjektCounterValue(sml_counters[index].sml_cnt_old_state,RtcSettings.pulse_counter[index]);
+    }
+  } else {
+
+    sml_counters[index].sml_counter_ltime=millis();
+  }
+}
+
+void SML_CounterUpd1(void) {
+  SML_CounterUpd(0);
+}
+
+void SML_CounterUpd2(void) {
+  SML_CounterUpd(1);
+}
+
+void SML_CounterUpd3(void) {
+  SML_CounterUpd(2);
+}
+
+void SML_CounterUpd4(void) {
+  SML_CounterUpd(3);
+}
+
+#ifdef USE_SCRIPT
+struct METER_DESC script_meter_desc[MAX_METERS];
+uint8_t *script_meter;
+#endif
+
+#ifndef METER_DEF_SIZE
+#define METER_DEF_SIZE 3000
+#endif
+
+bool Gpio_used(uint8_t gpiopin) {
+  for (uint16_t i=0;i<GPIO_SENSOR_END;i++) {
+    if (pin[i]==gpiopin) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void SML_Init(void) {
+  meters_used=METERS_USED;
+  meter_desc_p=meter_desc;
+  meter_p=meter;
+
+  sml_desc_cnt=0;
+
+  for (uint32_t cnt=0;cnt<SML_MAX_VARS;cnt++) {
+    meter_vars[cnt]=0;
+  }
+
+  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
+    meter_spos[cnt]=0;
+  }
+
+#ifdef USE_SCRIPT
+
+  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
+    if (script_meter_desc[cnt].txmem) {
+     free(script_meter_desc[cnt].txmem);
+     script_meter_desc[cnt].txmem=0;
+    }
+  }
+
+  uint8_t meter_script=Run_Scripter(">M",-2,0);
+  if (meter_script==99) {
+
+    if (script_meter) free(script_meter);
+    script_meter=0;
+    uint8_t *tp=0;
+    uint16_t index=0;
+    uint8_t section=0;
+    uint8_t srcpin=0;
+    char *lp=glob_script_mem.scriptptr;
+    sml_send_blocks=0;
+    while (lp) {
+      if (!section) {
+        if (*lp=='>' && *(lp+1)=='M') {
+          lp+=2;
+          meters_used=strtol(lp,0,10);
+          section=1;
+          uint32_t mlen=0;
+          for (uint32_t cnt=0;cnt<METER_DEF_SIZE-1;cnt++) {
+            if (lp[cnt]=='\n' && lp[cnt+1]=='#') {
+              mlen=cnt+3;
+              break;
+            }
+          }
+          if (mlen==0) return;
+          script_meter=(uint8_t*)calloc(mlen,1);
+          if (!script_meter) {
+            goto dddef_exit;
+          }
+          tp=script_meter;
+          goto next_line;
+        }
+      }
+      else {
+        if (!*lp || *lp=='#' || *lp=='>') {
+          if (*(tp-1)=='|') *(tp-1)=0;
+          break;
+        }
+        if (*lp=='+') {
+
+
+          lp++;
+          index=*lp&7;
+          lp+=2;
+          if (index<1 || index>meters_used) goto next_line;
+          index--;
+          srcpin=strtol(lp,&lp,10);
+          if (Gpio_used(srcpin)) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("gpio rx double define!"));
+dddef_exit:
+            if (script_meter) free(script_meter);
+            script_meter=0;
+            meters_used=METERS_USED;
+            goto init10;
+          }
+          script_meter_desc[index].srcpin=srcpin;
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].type=*lp;
+          lp+=2;
+          script_meter_desc[index].flag=strtol(lp,&lp,10);
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].params=strtol(lp,&lp,10);
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].prefix[7]=0;
+          for (uint32_t cnt=0; cnt<8; cnt++) {
+            if (*lp==SCRIPT_EOL || *lp==',') {
+              script_meter_desc[index].prefix[cnt]=0;
+              break;
+            }
+            script_meter_desc[index].prefix[cnt]=*lp++;
+          }
+          if (*lp==',') {
+            lp++;
+            script_meter_desc[index].trxpin=strtol(lp,&lp,10);
+            if (Gpio_used(script_meter_desc[index].trxpin)) {
+              AddLog_P(LOG_LEVEL_INFO, PSTR("gpio tx double define!"));
+              goto dddef_exit;
+            }
+            if (*lp!=',') goto next_line;
+            lp++;
+            script_meter_desc[index].tsecs=strtol(lp,&lp,10);
+            if (*lp==',') {
+              lp++;
+              char txbuff[256];
+              uint32_t txlen=0,tx_entries=1;
+              for (uint32_t cnt=0; cnt<sizeof(txbuff); cnt++) {
+                if (*lp==SCRIPT_EOL) {
+                  txbuff[cnt]=0;
+                  txlen=cnt;
+                  break;
+                }
+                if (*lp==',') tx_entries++;
+                txbuff[cnt]=*lp++;
+              }
+              if (txlen) {
+                script_meter_desc[index].txmem=(char*)calloc(txlen+2,1);
+                if (script_meter_desc[index].txmem) {
+                  strcpy(script_meter_desc[index].txmem,txbuff);
+                }
+                script_meter_desc[index].index=0;
+                script_meter_desc[index].max_index=tx_entries;
+                sml_send_blocks++;
+              }
+            }
+          }
+          if (*lp==SCRIPT_EOL) lp--;
+          goto next_line;
+        }
+
+        if (*lp=='-' || isdigit(*lp)) {
+
+
+          if (*lp=='-') lp++;
+          uint8_t mnum=strtol(lp,0,10);
+          if (mnum<1 || mnum>meters_used) goto next_line;
+          while (1) {
+            if (*lp==SCRIPT_EOL) {
+              if (*(tp-1)!='|') *tp++='|';
+              goto next_line;
+            }
+            *tp++=*lp++;
+            index++;
+            if (index>=METER_DEF_SIZE) break;
+          }
+        }
+
+      }
+
+next_line:
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+    *tp=0;
+    meter_desc_p=script_meter_desc;
+    meter_p=script_meter;
+  }
+#endif
+
+init10:
+  typedef void (*function)();
+  function counter_callbacks[] = {SML_CounterUpd1,SML_CounterUpd2,SML_CounterUpd3,SML_CounterUpd4};
+  uint8_t cindex=0;
+
+  for (byte i = 0; i < MAX_COUNTERS; i++) {
+      RtcSettings.pulse_counter[i]=Settings.pulse_counter[i];
+      sml_counters[i].sml_cnt_last_ts=millis();
+  }
+  for (uint8_t meters=0; meters<meters_used; meters++) {
+    if (meter_desc_p[meters].type=='c') {
+        if (meter_desc_p[meters].flag&2) {
+
+#ifdef ANALOG_OPTO_SENSOR
+          ADS1115_init();
+          sml_counters[cindex].ana_max=-32768;
+          sml_counters[cindex].ana_min=+32767;
+#endif
+        } else {
+
+          if (meter_desc_p[meters].flag&1) {
+            pinMode(meter_desc_p[meters].srcpin,INPUT_PULLUP);
+          } else {
+            pinMode(meter_desc_p[meters].srcpin,INPUT);
+          }
+
+          if (meter_desc_p[meters].params<=0) {
+
+            attachInterrupt(meter_desc_p[meters].srcpin, counter_callbacks[cindex], CHANGE);
+            sml_counters[cindex].sml_cnt_old_state=meters;
+            sml_counters[cindex].sml_debounce=-meter_desc_p[meters].params;
+          }
+          InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+          cindex++;
+        }
+    } else {
+
+#ifdef SPECIAL_SS
+        if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M' || meter_desc_p[meters].type=='p') {
+          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
+        } else {
+          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1);
+        }
+#else
+        meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
+#endif
+        if (meter_ss[meters]->begin(meter_desc_p[meters].params)) {
+          meter_ss[meters]->flush();
+        }
+        if (meter_ss[meters]->hardwareSerial()) {
+          if (meter_desc_p[meters].type=='M') {
+            Serial.begin(meter_desc_p[meters].params, SERIAL_8E1);
+          }
+          ClaimSerial();
+        }
+
+    }
+  }
+
+}
+
+
+#ifdef USE_SML_SCRIPT_CMD
+uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+  if (meter_ss[meter]->begin(br)) {
+    meter_ss[meter]->flush();
+  }
+  if (meter_ss[meter]->hardwareSerial()) {
+    if (meter_desc_p[meter].type=='M') {
+      Serial.begin(br, SERIAL_8E1);
+    }
+  }
+  return 1;
+}
+
+uint32_t SML_Write(uint32_t meter,char *hstr) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+  SML_Send_Seq(meter,hstr);
+  return 1;
+}
+#endif
+
+
+void SetDBGLed(uint8_t srcpin, uint8_t ledpin) {
+    pinMode(ledpin, OUTPUT);
+    if (digitalRead(srcpin)) {
+      digitalWrite(ledpin,LOW);
+    } else {
+      digitalWrite(ledpin,HIGH);
+    }
+}
+
+
+void SML_Counter_Poll(void) {
+uint16_t meters,cindex=0;
+uint32_t ctime=millis();
+
+  for (meters=0; meters<meters_used; meters++) {
+    if (meter_desc_p[meters].type=='c') {
+
+      if (meter_desc_p[meters].params>0) {
+        if (ctime-sml_counters[cindex].sml_cnt_last_ts>meter_desc_p[meters].params) {
+          sml_counters[cindex].sml_cnt_last_ts=ctime;
+
+          if (meter_desc_p[meters].flag&2) {
+
+#ifdef ANALOG_OPTO_SENSOR
+            if (ads1115_up) {
+              int16_t val = adc.read_sample();
+              if (val>sml_counters[cindex].ana_max) sml_counters[cindex].ana_max=val;
+              if (val<sml_counters[cindex].ana_min) sml_counters[cindex].ana_min=val;
+              sml_counters[cindex].ana_curr=val;
+              int16_t range=sml_counters[cindex].ana_max-sml_counters[cindex].ana_min;
+            }
+#endif
+          } else {
+
+            uint8_t state;
+            sml_counters[cindex].sml_cnt_debounce<<=1;
+            sml_counters[cindex].sml_cnt_debounce|=(digitalRead(meter_desc_p[meters].srcpin)&1)|0x80;
+            if (sml_counters[cindex].sml_cnt_debounce==0xc0) {
+
+              state=1;
+            } else {
+
+              state=0;
+            }
+            if (sml_counters[cindex].sml_cnt_old_state!=state) {
+
+              sml_counters[cindex].sml_cnt_old_state=state;
+              if (state==0) {
+
+                RtcSettings.pulse_counter[cindex]++;
+                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+              }
+            }
+          }
+        }
+#ifdef DEBUG_CNT_LED1
+        if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
+#endif
+#ifdef DEBUG_CNT_LED2
+        if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
+#endif
+      } else {
+        if (ctime-sml_counters[cindex].sml_cnt_last_ts>10) {
+          sml_counters[cindex].sml_cnt_last_ts=ctime;
+#ifdef DEBUG_CNT_LED1
+          if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
+#endif
+#ifdef DEBUG_CNT_LED2
+          if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
+#endif
+        }
+      }
+      cindex++;
+    }
+  }
+}
+
+#ifdef USE_SCRIPT
+char *SML_Get_Sequence(char *cp,uint32_t index) {
+  if (!index) return cp;
+  uint32_t cindex=0;
+  while (cp) {
+    cp=strchr(cp,',');
+    if (cp) {
+      cp++;
+      cindex++;
+      if (cindex==index) {
+        return cp;
+      }
+    }
+  }
+}
+
+void SML_Check_Send(void) {
+  sml_100ms_cnt++;
+  char *cp;
+  for (uint32_t cnt=sml_desc_cnt; cnt<meters_used; cnt++) {
+    if (script_meter_desc[cnt].trxpin>=0 && script_meter_desc[cnt].txmem) {
+      if ((sml_100ms_cnt%script_meter_desc[cnt].tsecs)==0) {
+        if (script_meter_desc[cnt].max_index>1) {
+          script_meter_desc[cnt].index++;
+          if (script_meter_desc[cnt].index>=script_meter_desc[cnt].max_index) {
+            script_meter_desc[cnt].index=0;
+            sml_desc_cnt++;
+          }
+          cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
+
+        } else {
+          cp=script_meter_desc[cnt].txmem;
+
+          sml_desc_cnt++;
+        }
+
+        SML_Send_Seq(cnt,cp);
+        if (sml_desc_cnt>=meters_used) {
+          sml_desc_cnt=0;
+        }
+        break;
+      }
+    } else {
+      sml_desc_cnt++;
+    }
+
+    if (sml_desc_cnt>=meters_used) {
+      sml_desc_cnt=0;
+    }
+  }
+}
+
+uint8_t sml_hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
+  }
+  return rVal;
+}
+
+
+void SML_Send_Seq(uint32_t meter,char *seq) {
+  uint8_t sbuff[32];
+  uint8_t *ucp=sbuff,slen=0;
+  char *cp=seq;
+  while (*cp) {
+    if (!*cp || !*(cp+1)) break;
+    if (*cp==',') break;
+    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
+    cp+=2;
+    *ucp++=iob;
+    slen++;
+    if (slen>=sizeof(sbuff)) break;
+  }
+  if (script_meter_desc[meter].type=='m' || script_meter_desc[meter].type=='M') {
+    *ucp++=0;
+    *ucp++=2;
+
+    uint16_t crc = MBUS_calculateCRC(sbuff,6);
+    *ucp++=lowByte(crc);
+    *ucp++=highByte(crc);
+    slen+=4;
+  }
+  if (script_meter_desc[meter].type=='o') {
+    for (uint32_t cnt=0;cnt<slen;cnt++) {
+      sbuff[cnt]|=(CalcEvenParity(sbuff[cnt])<<7);
+    }
+  }
+  if (script_meter_desc[meter].type=='p') {
+    *ucp++=0xc0;
+    *ucp++=0xa8;
+    *ucp++=1;
+    *ucp++=1;
+    *ucp++=0;
+    *ucp++=SML_PzemCrc(sbuff,6);
+    slen+=6;
+  }
+  meter_ss[meter]->write(sbuff,slen);
+}
+#endif
+
+uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num) {
+  uint16_t crc, flag;
+  crc = 0xFFFF;
+  for (uint32_t i = 0; i < num; i++) {
+    crc ^= frame[i];
+    for (uint32_t j = 8; j; j--) {
+      if ((crc & 0x0001) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
+
+uint8_t SML_PzemCrc(uint8_t *data, uint8_t len) {
+  uint16_t crc = 0;
+  for (uint32_t i = 0; i < len; i++) crc += *data++;
+  return (uint8_t)(crc & 0xFF);
+}
+
+
+uint8_t CalcEvenParity(uint8_t data) {
+uint8_t parity=0;
+
+  while(data) {
+    parity^=(data &1);
+    data>>=1;
+  }
+  return parity;
+}
+# 2361 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+bool XSNS_53_cmd(void) {
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp=='d') {
+
+        cp++;
+        uint8_t index=atoi(cp);
+        if ((index&7)>meters_used) index=1;
+        if (index>0 && meter_desc_p[(index&7)-1].type=='c') {
+          index=0;
+        }
+        dump2log=index;
+        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"dump: %d\"}}"),dump2log);
+      } else if (*cp=='c') {
+
+          cp++;
+          uint8_t index=*cp&7;
+          if (index<1 || index>MAX_COUNTERS) index=1;
+          cp++;
+          while (*cp==' ') cp++;
+          if (isdigit(*cp)) {
+            uint32_t cval=atoi(cp);
+            while (isdigit(*cp)) cp++;
+            RtcSettings.pulse_counter[index-1]=cval;
+            uint8_t cindex=0;
+            for (uint8_t meters=0; meters<meters_used; meters++) {
+              if (meter_desc_p[meters].type=='c') {
+                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+                cindex++;
+              }
+            }
+          }
+          ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"counter%d: %d\"}}"),index,RtcSettings.pulse_counter[index-1]);
+      } else if (*cp=='r') {
+
+        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"restart\"}}"));
+        SML_CounterSaveState();
+        SML_Init();
+      } else {
+        serviced=false;
+      }
+  }
+  return serviced;
+}
+
+void InjektCounterValue(uint8_t meter,uint32_t counter) {
+  sprintf((char*)&smltbuf[meter][0],"1-0:1.8.0*255(%d)",counter);
+  SML_Decode(meter);
+}
+
+void SML_CounterSaveState(void) {
+  for (byte i = 0; i < MAX_COUNTERS; i++) {
+      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
+  }
+}
+# 2425 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
+bool Xsns53(byte function) {
+  bool result = false;
+    switch (function) {
+      case FUNC_INIT:
+        SML_Init();
+        break;
+      case FUNC_LOOP:
+        SML_Counter_Poll();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (dump2log) Dump2log();
+        else SML_Poll();
+        break;
+#ifdef USE_SCRIPT
+      case FUNC_EVERY_100_MSECOND:
+        SML_Check_Send();
+        break;
+#endif
+      case FUNC_JSON_APPEND:
+        SML_Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SML_Show(0);
+        break;
+#endif
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_53 == XdrvMailbox.index) {
+          result = XSNS_53_cmd();
+        }
+        break;
+      case FUNC_SAVE_BEFORE_RESTART:
+      case FUNC_SAVE_AT_MIDNIGHT:
+        SML_CounterSaveState();
+        break;
+    }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+#ifdef USE_I2C
+#ifdef USE_INA226
+# 70 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+#define XSNS_54 54
+#define XI2C_35 35
+
+#define INA226_MAX_ADDRESSES 4
+#define INA226_ADDRESS1 (0x40)
+#define INA226_ADDRESS2 (0x41)
+#define INA226_ADDRESS3 (0x44)
+#define INA226_ADDRESS4 (0x45)
+
+#define INA226_REG_CONFIG (0x00)
+#define INA226_RES_CONFIG (0x4127)
+#define INA226_DEF_CONFIG (0x42FF)
+#define INA226_CONFIG_RESET (0x8000)
+
+#define INA226_REG_SHUNTVOLTAGE (0x01)
+#define INA226_REG_BUSVOLTAGE (0x02)
+#define INA226_REG_POWER (0x03)
+#define INA226_REG_CURRENT (0x04)
+#define INA226_REG_CALIBRATION (0x05)
+
+
+typedef struct Ina226SlaveInfo_tag {
+  uint8_t address;
+  uint16_t calibrationValue;
+  uint16_t config;
+  uint8_t present : 1;
+  float i_lsb;
+} Ina226SlaveInfo_t;
+
+
+
+
+
+static const uint8_t PROGMEM probeAddresses[INA226_MAX_ADDRESSES] = {INA226_ADDRESS1, INA226_ADDRESS2, INA226_ADDRESS3, INA226_ADDRESS4};
+
+
+
+
+
+
+static char Ina226Str[] = "INA226";
+static uint8_t slavesFound = 0;
+static uint8_t schedule_reinit = 0;
+static Ina226SlaveInfo_t slaveInfo[4] = {0};
+
+static float voltages[4];
+static float currents[4];
+static float powers[4];
+
+
+
+
+
+
+static void _debug_fval(const char *str, float fval, uint8_t prec = 4 )
+{
+  char fstr[32];
+  dtostrfd(fval, prec, fstr);
+  AddLog_P2( LOG_LEVEL_DEBUG, PSTR("%s: %s"), str, fstr );
+}
+# 138 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+static uint32_t _expand_r_shunt(uint16_t compact_r_shunt)
+{
+
+  uint32_t r_shunt_uohms = (compact_r_shunt & 0x8000) ?
+  (((uint32_t)(compact_r_shunt & 0x7FFF)) * 1000ul) :
+  (compact_r_shunt & 0x7FFF);
+  return r_shunt_uohms;
+}
+
+
+
+
+
+void Ina226SetCalibration(uint8_t slaveIndex)
+{
+
+Ina226SlaveInfo_t *si = slaveInfo + slaveIndex;
+
+I2cWrite16( si->address, INA226_REG_CALIBRATION, si->calibrationValue);
+
+}
+
+
+
+
+
+
+bool Ina226TestPresence(uint8_t device)
+{
+
+
+
+  uint16_t config = I2cRead16( slaveInfo[device].address, INA226_REG_CONFIG );
+
+
+  if (config != slaveInfo[device].config)
+    return false;
+
+  return true;
+
+}
+
+void Ina226ResetActive(void)
+{
+  Ina226SlaveInfo_t *p = slaveInfo;
+
+  for (uint32_t i = 0; i < INA226_MAX_ADDRESSES; i++) {
+    p = &slaveInfo[i];
+
+    uint8_t addr = p->address;
+    if (addr) {
+      I2cResetActive(addr);
+    }
+  }
+}
+
+
+
+
+
+void Ina226Init()
+{
+  uint32_t i;
+
+  slavesFound = 0;
+
+  Ina226SlaveInfo_t *p = slaveInfo;
+# 215 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+  for (i = 0; i < 4; i++){
+    *p = {0};
+  }
+
+
+
+
+
+  for (i = 0; i < INA226_MAX_ADDRESSES; i++){
+    uint8_t addr = pgm_read_byte(probeAddresses + i);
+
+    if (I2cActive(addr)) { continue; }
+
+
+
+
+    if (!Settings.ina226_i_fs[i])
+      continue;
+
+
+
+
+
+
+    if (!I2cWrite16( addr, INA226_REG_CONFIG, INA226_CONFIG_RESET)){
+
+      AddLog_P2( LOG_LEVEL_DEBUG, "No INA226 at address: %02X", addr);
+      continue;
+    }
+
+
+
+    uint16_t config = I2cRead16( addr, INA226_REG_CONFIG );
+
+
+    if (INA226_RES_CONFIG != config)
+      continue;
+
+
+    config = INA226_DEF_CONFIG;
+
+
+    if (!I2cWrite16( addr, INA226_REG_CONFIG, config))
+        continue;
+
+
+    p = &slaveInfo[i];
+
+    p->address = addr;
+
+    p->config = config;
+
+
+    p->i_lsb = (((float) Settings.ina226_i_fs[i])/10.0f)/32768.0f;
+
+
+
+    uint32_t r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[i]);
+
+
+
+    p->calibrationValue = ((uint16_t) (0.00512/(p->i_lsb * r_shunt_uohms/1000000.0f)));
+
+    p->present = true;
+
+
+    Ina226SetCalibration(i);
+
+    I2cSetActiveFound(addr, Ina226Str);
+
+    slavesFound++;
+  }
+}
+
+
+
+
+
+float Ina226ReadBus_v(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_bus_v = I2cReadS16( addr, INA226_REG_BUSVOLTAGE);
+
+  float result = ((float) reg_bus_v) * 0.00125f;
+
+  return result;
+
+}
+
+
+
+
+
+float Ina226ReadShunt_i(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_CURRENT);
+
+  float result = ((float) reg_shunt_i) * slaveInfo[device].i_lsb;
+
+  return result;
+}
+
+
+
+
+
+float Ina226ReadPower_w(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_POWER);
+
+  float result = ((float) reg_shunt_i) * (slaveInfo[device].i_lsb * 25.0);
+
+  return result;
+}
+
+
+
+
+
+
+void Ina226Read(uint8_t device)
+{
+
+  voltages[device] = Ina226ReadBus_v(device);
+  currents[device] = Ina226ReadShunt_i(device);
+  powers[device] = Ina226ReadPower_w(device);
+
+
+
+
+}
+
+
+
+
+
+void Ina226EverySecond()
+{
+
+  for (uint8_t device = 0; device < INA226_MAX_ADDRESSES; device++){
+
+    if (slavesFound && slaveInfo[device].present && Ina226TestPresence(device)){
+      Ina226Read(device);
+    }
+    else {
+        powers[device] = currents[device] = voltages[device] = 0.0f;
+
+
+
+
+
+
+        slaveInfo[device].present = false;
+    }
+  }
+}
+
+
+
+
+
+bool Ina226CommandSensor()
+{
+  bool serviced = true;
+  bool show_config = false;
+  char param_str[64];
+  char *cp, *params[4];
+  uint8_t i, param_count, device, p1 = XdrvMailbox.payload;
+  uint32_t r_shunt_uohms;
+  uint16_t compact_r_shunt_uohms;
+
+
+
+
+
+  if (XdrvMailbox.data_len > 62){
+    return false;
+  }
+
+  strncpy(param_str, XdrvMailbox.data, XdrvMailbox.data_len + 1);
+  param_str[XdrvMailbox.data_len] = 0;
+
+
+  for (cp = param_str, i = 0, param_count = 0; *cp && (i < XdrvMailbox.data_len + 1) && (param_count <= 3); i++)
+    if (param_str[i] == ' ' || param_str[i] == ',' || param_str[i] == 0){
+      param_str[i] = 0;
+      params[param_count] = cp;
+
+      param_count++;
+      cp = param_str + i + 1;
+    }
+
+
+  if (p1 < 10 || p1 >= 50){
+
+    switch (p1){
+      case 1:
+        Ina226ResetActive();
+        Ina226Init();
+        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"SlavesFound\":%d}}"),slavesFound);
+        break;
+
+      case 2:
+        restart_flag = 2;
+        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"Restart_flag\":%d}}"),restart_flag);
+        break;
+
+      default:
+        serviced = false;
+    }
+  }
+  else if (p1 < 50){
+
+    device = (p1 / 10) - 1;
+    switch (p1 % 10){
+      case 0:
+        show_config = true;
+        break;
+
+      case 1:
+        r_shunt_uohms = (uint32_t) ((CharToFloat(params[1])) * 1000000.0f);
+
+
+
+        if (r_shunt_uohms > 32767){
+          uint32_t r_shunt_mohms = r_shunt_uohms/1000UL;
+          Settings.ina226_r_shunt[device] = (uint16_t) (r_shunt_mohms | 0x8000);
+        }
+        else
+          Settings.ina226_r_shunt[device] = (uint16_t) r_shunt_uohms;
+
+
+        show_config = true;
+        break;
+
+      case 2:
+        Settings.ina226_i_fs[device] = (uint16_t) ((CharToFloat(params[1])) * 10.0f);
+
+        show_config = true;
+        break;
+
+
+      default:
+        serviced = false;
+        break;
+    }
+  }
+  else
+    serviced = false;
+
+  if (show_config) {
+    char shunt_r_str[16];
+    char fs_i_str[16];
+
+
+    r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[device]);
+    dtostrfd(((float)r_shunt_uohms)/1000000.0f, 6, shunt_r_str);
+
+    dtostrfd(((float)Settings.ina226_i_fs[device])/10.0f, 1, fs_i_str);
+
+    Response_P(PSTR("{\"Sensor54-device-settings-%d\":{\"SHUNT_R\":%s,\"FS_I\":%s}}"),
+      device + 1, shunt_r_str, fs_i_str);
+  }
+
+  return serviced;
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_INA226_DATA[] PROGMEM =
+  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
+#endif
+
+void Ina226Show(bool json)
+{
+  int i, num_found;
+  for (num_found = 0, i = 0; i < INA226_MAX_ADDRESSES; i++) {
+
+    if (!slaveInfo[i].present)
+      continue;
+
+    num_found++;
+
+    char voltage[16];
+    dtostrfd(voltages[i], Settings.flag2.voltage_resolution, voltage);
+    char current[16];
+    dtostrfd(currents[i], Settings.flag2.current_resolution, current);
+    char power[16];
+    dtostrfd(powers[i], Settings.flag2.wattage_resolution, power);
+    char name[16];
+    snprintf_P(name, sizeof(name), PSTR("INA226%c%d"),IndexSeparator(), i + 1);
+
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%d,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
+                       name, i, voltage, current, power);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, voltage);
+        DomoticzSensor(DZ_CURRENT, current);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_INA226_DATA, name, voltage, name, current, name, power);
+#endif
+    }
+
+  }
+
+}
+# 546 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
+bool Xsns54(byte callback_id)
+{
+  if (!I2cEnabled(XI2C_35)) { return false; }
+
+
+  bool result = false;
+
+
+  switch (callback_id) {
+    case FUNC_EVERY_SECOND:
+      Ina226EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      Ina226Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Ina226Show(0);
+      break;
+#endif
+    case FUNC_COMMAND_SENSOR:
+      if (XSNS_54 == XdrvMailbox.index) {
+        result = Ina226CommandSensor();
+      }
+      break;
+    case FUNC_INIT:
+      Ina226Init();
+      break;
+  }
+
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
+#ifdef USE_I2C
+#ifdef USE_HIH6
+# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
+#define XSNS_55 55
+#define XI2C_36 36
+
+#define HIH6_ADDR 0x27
+
+struct HIH6 {
+  float temperature = 0;
+  float humidity = 0;
+  uint8_t valid = 0;
+  uint8_t type = 0;
+  char types[4] = "HIH";
+} Hih6;
+
+bool Hih6Read(void)
+{
+  Wire.beginTransmission(HIH6_ADDR);
+  if (Wire.endTransmission() != 0) { return false; }
+
+  delay(40);
+
+  uint8_t data[4];
+  Wire.requestFrom(HIH6_ADDR, 4);
+  if (4 == Wire.available()) {
+    data[0] = Wire.read();
+    data[1] = Wire.read();
+    data[2] = Wire.read();
+    data[3] = Wire.read();
+  } else { return false; }
+
+
+
+  Hih6.humidity = ConvertHumidity(((float)(((data[0] & 0x3F) << 8) | data[1]) * 100.0) / 16383.0);
+
+  int temp = ((data[2] << 8) | (data[3] & 0xFC)) / 4;
+  Hih6.temperature = ConvertTemp(((float)temp / 16384.0) * 165.0 - 40.0);
+
+  Hih6.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Hih6Detect(void)
+{
+  if (I2cActive(HIH6_ADDR)) { return; }
+
+  if (uptime < 2) { delay(20); }
+  Hih6.type = Hih6Read();
+  if (Hih6.type) {
+    I2cSetActiveFound(HIH6_ADDR, Hih6.types);
+  }
+}
+
+void Hih6EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!Hih6Read()) {
+      AddLogMissed(Hih6.types, Hih6.valid);
+    }
+  }
+}
+
+void Hih6Show(bool json)
+{
+  if (Hih6.valid) {
+    char temperature[33];
+    dtostrfd(Hih6.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Hih6.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Hih6.types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Hih6.temperature);
+        KnxSensor(KNX_HUMIDITY, Hih6.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Hih6.types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Hih6.types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns55(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_36)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Hih6Detect();
+  }
+  else if (Hih6.type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Hih6EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Hih6Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Hih6Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
+# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
+#ifdef USE_HPMA
+# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
+#define XSNS_56 56
+
+#include <hpma115S0.h>
+#include <TasmotaSerial.h>
+
+TasmotaSerial *HpmaSerial;
+HPMA115S0 *hpma115S0;
+
+uint8_t hpma_type = 1;
+uint8_t hpma_valid = 0;
+
+struct hpmadata {
+  unsigned int pm10;
+  unsigned int pm2_5;
+} hpma_data;
+
+
+
+void HpmaSecond(void)
+{
+  unsigned int pm2_5, pm10;
+
+
+
+
+  if (hpma115S0->ReadParticleMeasurement(&pm2_5, &pm10)) {
+    hpma_data.pm2_5 = pm2_5;
+    hpma_data.pm10 = pm10;
+    hpma_valid = 1;
+  }
+
+}
+
+void HpmaInit(void)
+{
+  hpma_type = 0;
+  if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
+    HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
+    hpma115S0 = new HPMA115S0(*HpmaSerial);
+
+    if (HpmaSerial->begin(9600)) {
+      if (HpmaSerial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      hpma_type = 1;
+      hpma115S0->Init();
+      hpma115S0->StartParticleMeasurement();
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_HPMA_SNS[] PROGMEM =
+  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#endif
+
+void HpmaShow(bool json)
+{
+  if (hpma_valid) {
+    char pm10[33];
+    snprintf_P(pm10, 33, PSTR("%d"), hpma_data.pm10);
+    char pm2_5[33];
+    snprintf_P(pm2_5, 33, PSTR("%d"), hpma_data.pm2_5);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"HPMA\":{\"PM2.5\":%d,\"PM10\":%d}"), hpma_data.pm2_5, hpma_data.pm10);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, pm2_5);
+        DomoticzSensor(DZ_CURRENT, pm10);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_HPMA_SNS, pm2_5, pm10);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns56(uint8_t function)
+{
+  bool result = false;
+
+  if (hpma_type) {
+    switch (function) {
+      case FUNC_INIT:
+        HpmaInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        HpmaSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_56 == XdrvMailbox.index) {
+          return true;
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        HpmaShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HpmaShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_57_tsl2591.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_57_tsl2591.ino"
+#ifdef USE_I2C
+#ifdef USE_TSL2591
+
+
+
+
+
+
+
+#define XSNS_57 57
+#define XI2C_40 40
+
+#define TSL2591_ADDRESS 0x29
+
+#include <Adafruit_TSL2591.h>
+
+Adafruit_TSL2591 tsl = Adafruit_TSL2591();
+
+uint8_t tsl2591_type = 0;
+uint8_t tsl2591_valid = 0;
+float tsl2591_lux = 0;
+
+void Tsl2591Init(void)
+{
+
+  if (I2cSetDevice(0x29)) {
+    if (tsl.begin()) {
+      tsl.setGain(TSL2591_GAIN_MED);
+      tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
+      tsl2591_type = 1;
+      I2cSetActiveFound(TSL2591_ADDRESS, "TSL2591");
+    }
+  }
+}
+
+bool Tsl2591Read(void)
+{
+  uint32_t lum = tsl.getFullLuminosity();
+  uint16_t ir, full;
+  ir = lum >> 16;
+  full = lum & 0xFFFF;
+  tsl2591_lux = tsl.calculateLux(full, ir);
+  tsl2591_valid = 1;
+}
+
+void Tsl2591EverySecond(void)
+{
+  Tsl2591Read();
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TSL2591[] PROGMEM =
+  "{s}TSL2591 " D_ILLUMINANCE "{m}%s " D_UNIT_LUX "{e}";
+#endif
+
+void Tsl2591Show(bool json)
+{
+  if (tsl2591_valid) {
+    char lux_str[10];
+    dtostrf(tsl2591_lux, sizeof(lux_str)-1, 3, lux_str);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"TSL2591\":{\"" D_JSON_ILLUMINANCE "\":%s}"), lux_str);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, tsl2591_lux); }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TSL2591, lux_str);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns57(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_40)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Tsl2591Init();
+  }
+  else if (tsl2591_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Tsl2591EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Tsl2591Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tsl2591Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_58_dht12.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_58_dht12.ino"
+#ifdef USE_I2C
+#ifdef USE_DHT12
+
+
+
+
+
+
+#define XSNS_58 58
+#define XI2C_41 41
+
+#define DHT12_ADDR 0x5C
+
+struct DHT12 {
+  float temperature = NAN;
+  float humidity = NAN;
+  uint8_t valid = 0;
+  uint8_t count = 0;
+  char name[6] = "DHT12";
+} Dht12;
+
+bool Dht12Read(void)
+{
+  if (Dht12.valid) { Dht12.valid--; }
+
+  Wire.beginTransmission(DHT12_ADDR);
+  Wire.write(0);
+  if (Wire.endTransmission() != 0) { return false; }
+
+  delay(50);
+
+  Wire.requestFrom(DHT12_ADDR, 5);
+  delay(5);
+  uint8_t humidity = Wire.read();
+  uint8_t humidityTenth = Wire.read();
+  uint8_t temp = Wire.read();
+  uint8_t tempTenth = Wire.read();
+  uint8_t checksum = Wire.read();
+
+  Dht12.humidity = ConvertHumidity( (float) humidity + (float) humidityTenth/(float) 10.0 );
+  Dht12.temperature = ConvertTemp( (float) temp + (float) tempTenth/(float) 10.0 );
+
+  if (isnan(Dht12.temperature) || isnan(Dht12.humidity)) { return false; }
+
+  Dht12.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Dht12Detect(void)
+{
+  if (I2cActive(DHT12_ADDR)) { return; }
+
+  if (Dht12Read()) {
+    I2cSetActiveFound(DHT12_ADDR, Dht12.name);
+    Dht12.count = 1;
+  }
+}
+
+void Dht12EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!Dht12Read()) {
+      AddLogMissed(Dht12.name, Dht12.valid);
+    }
+  }
+}
+
+void Dht12Show(bool json)
+{
+  if (Dht12.valid) {
+    char temperature[33];
+    dtostrfd(Dht12.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht12.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht12.name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Dht12.temperature);
+        KnxSensor(KNX_HUMIDITY, Dht12.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht12.name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht12.name, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns58(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_41)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Dht12Detect();
+  }
+  else if (Dht12.count) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      Dht12EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      Dht12Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Dht12Show(0);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_59_ds1624.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_59_ds1624.ino"
+#ifdef USE_I2C
+#ifdef USE_DS1624
+
+
+
+
+
+
+
+#define XSNS_59 59
+#define XI2C_42 42
+
+#define DS1624_MEM_REGISTER 0x17
+#define DS1624_CONF_REGISTER 0xAC
+#define DS1624_TEMP_REGISTER 0xAA
+#define DS1624_START_REGISTER 0xEE
+#define DS1624_STOP_REGISTER 0x22
+
+#define DS1621_COUNTER_REGISTER 0xA8
+#define DS1621_SLOPE_REGISTER 0xA9
+
+#define DS1621_CFG_1SHOT (1<<0)
+#define DS1621_CFG_DONE (1<<7)
+
+enum {
+  DS1624_TYPE_DS1624,
+  DS1624_TYPE_DS1621
+};
+
+#define DS1624_MAX_SENSORS 8
+
+bool ds1624_init = false;
+
+struct {
+  float value;
+  uint8_t type;
+  int errcnt;
+  int misscnt;
+  bool valid;
+  char name[9];
+} ds1624_sns[DS1624_MAX_SENSORS];
+
+uint32_t DS1624_Idx2Addr(uint32_t idx) {
+  return 0x48 + idx;
+}
+
+int DS1624_Restart(uint8_t config, uint32_t idx) {
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if ((config & 1) == 1) {
+    config &= ~(DS1621_CFG_DONE|DS1621_CFG_1SHOT);
+    I2cWrite8(addr, DS1624_CONF_REGISTER, config);
+    delay(10);
+    AddLog_P2(LOG_LEVEL_ERROR, "%s addr %x is reset, reconfig: %x", ds1624_sns[idx].name, addr, config);
+  }
+  I2cValidRead(addr, DS1624_START_REGISTER, 1);
+}
+
+void DS1624_HotPlugUp(uint32_t idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+
+  if (I2cActive(addr)) { return; }
+  if (!I2cSetDevice(addr)) { return; }
+
+  uint8_t config;
+  if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    uint8_t tmp;
+    ds1624_sns[idx].type = (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER)) ? DS1624_TYPE_DS1624 : DS1624_TYPE_DS1621;
+
+    snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS162%c%c%d"),
+      (ds1624_sns[idx].type == DS1624_TYPE_DS1621) ? '1' : '4', IndexSeparator(), idx);
+    I2cSetActiveFound(addr, ds1624_sns[idx].name);
+
+    ds1624_sns[idx].valid = true;
+    ds1624_sns[idx].errcnt = 0;
+    ds1624_sns[idx].misscnt = 0;
+    DS1624_Restart(config,idx);
+    AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
+  }
+}
+
+void DS1624_HotPlugDown(int idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if (!I2cActive(addr)) { return; }
+  I2cResetActive(addr);
+  ds1624_sns[idx].valid = false;
+  AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
+}
+
+bool DS1624GetTemp(float *value, int idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+
+  uint8_t config;
+  if (!I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    ds1624_sns[idx].misscnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s device missing (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].misscnt);
+    return false;
+  }
+  ds1624_sns[idx].misscnt=0;
+  if (config & (DS1621_CFG_1SHOT|DS1621_CFG_DONE)) {
+    ds1624_sns[idx].errcnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s config error, restart... (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].errcnt);
+    DS1624_Restart(config, idx);
+    return false;
+  }
+
+  uint16_t t;
+  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
+  if (ds1624_sns[idx].type == DS1624_TYPE_DS1624) {
+    *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
+  } else {
+
+    *value = ((float)(int8_t)(t>>8));
+    uint8_t remain;
+    if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
+    uint8_t perc;
+    if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
+    float fix=(float)(perc - remain)/(float)perc;
+    *value+=fix;
+  }
+  ds1624_sns[idx].errcnt=0;
+  config &= ~(DS1621_CFG_DONE);
+  I2cWrite8(addr, DS1624_CONF_REGISTER, config);
+  return true;
+}
+
+void DS1624HotPlugScan(void)
+{
+  uint16_t t;
+
+  for (uint32_t idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
+    uint32_t addr = DS1624_Idx2Addr(idx);
+    if (I2cActive(addr) && !ds1624_sns[idx].valid) {
+      continue;
+    }
+    if (ds1624_sns[idx].valid) {
+      if ((ds1624_sns[idx].misscnt>2)||(ds1624_sns[idx].errcnt>2)) {
+        DS1624_HotPlugDown(idx);
+        continue;
+      }
+    }
+    DS1624_HotPlugUp(idx);
+  }
+}
+
+void DS1624EverySecond(void)
+{
+  float t;
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
+    if (!DS1624GetTemp(&t, i)) { continue; }
+    ds1624_sns[i].value = ConvertTemp(t);
+  }
+}
+
+void DS1624Show(bool json)
+{
+  char temperature[33];
+  bool once = true;
+
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
+
+    dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
+      if ((0 == tele_period) && once) {
+#ifdef USE_DOMOTICZ
+        DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_KNX
+        KnxSensor(KNX_TEMPERATURE, temperature);
+#endif
+        once = false;
+      }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns59(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_42)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    if (!ds1624_init) {
+      memset(ds1624_sns, 0, sizeof(ds1624_sns));
+      ds1624_init = true;
+      DS1624HotPlugScan();
+    }
+  }
+  switch (function) {
+    case FUNC_HOTPLUG_SCAN:
+      DS1624HotPlugScan();
+      break;
+    case FUNC_EVERY_SECOND:
+      DS1624EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      DS1624Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      DS1624Show(0);
+      break;
+#endif
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
+#ifdef USE_GPS
+# 113 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
+#define XSNS_60 60
+
+#include "NTPServer.h"
+#include "NTPPacket.h"
+
+
+
+
+
+#define D_CMND_UBX "UBX"
+
+const char S_JSON_UBX_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_UBX "%s\":%d}";
+
+const char kUBXTypes[] PROGMEM = "UBX";
+
+#define UBX_LAT_LON_THRESHOLD 1000
+
+#define UBX_SERIAL_BUFFER_SIZE 256
+#define UBX_TCP_PORT 1234
+
+
+
+
+
+const char UBLOX_INIT[] PROGMEM = {
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x24,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x2B,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x02,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x32,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x39,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x04,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x40,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x05,0x00,0x00,0x00,0x00,0x00,0x01,0x05,0x47,
+
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xDC,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xB9,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0xC0,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92,
+
+
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x13,0xBE,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x01,0x00,0x00,0x00,0x00,0x14,0xC5,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97,
+
+
+
+
+
+
+};
+
+char UBX_name[4];
+
+struct UBX_t {
+  const char UBX_HEADER[2] = { 0xB5, 0x62 };
+  const char NAV_POSLLH_HEADER[2] = { 0x01, 0x02 };
+  const char NAV_STATUS_HEADER[2] = { 0x01, 0x03 };
+  const char NAV_TIME_HEADER[2] = { 0x01, 0x21 };
+
+  struct entry_t {
+          int32_t lat;
+          int32_t lon;
+          uint32_t time;
+    };
+
+  union {
+    entry_t values;
+    uint8_t bytes[sizeof(entry_t)];
+    } rec_buffer;
+
+  struct POLL_MSG {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t zero;
+  };
+
+  struct NAV_POSLLH {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    int32_t lon;
+    int32_t lat;
+    int32_t alt;
+    int32_t hMSL;
+    uint32_t hAcc;
+    uint32_t vAcc;
+    };
+
+  struct NAV_STATUS {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    uint8_t gpsFix;
+    uint8_t flags;
+    uint8_t fixStat;
+    uint8_t flags2;
+    uint32_t ttff;
+    uint32_t msss;
+    };
+
+  struct NAV_TIME_UTC {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    uint32_t tAcc;
+    int32_t nano;
+    uint16_t year;
+    uint8_t month;
+    uint8_t day;
+    uint8_t hour;
+    uint8_t min;
+    uint8_t sec;
+    struct {
+      uint8_t UTC:1;
+      uint8_t WKN:1;
+      uint8_t TOW:1;
+      uint8_t padding:5;
+      } valid;
+    };
+
+  struct CFG_RATE {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint16_t measRate;
+    uint16_t navRate;
+    uint16_t timeRef;
+    char CK[2];
+    };
+
+  struct {
+    uint32_t last_iTOW;
+    int32_t last_alt;
+    uint32_t last_hAcc;
+    uint32_t last_vAcc;
+    uint8_t gpsFix;
+    uint8_t non_empty_loops;
+    uint16_t log_interval;
+  } state;
+
+  struct {
+    uint32_t init:1;
+    uint32_t filter_noise:1;
+    uint32_t send_when_new:1;
+    uint32_t send_UI_only:1;
+    uint32_t runningNTP:1;
+    uint32_t forceUTCupdate:1;
+    uint32_t runningVPort:1;
+
+  } mode;
+
+  union {
+    NAV_POSLLH navPosllh;
+    NAV_STATUS navStatus;
+    NAV_TIME_UTC navTime;
+    POLL_MSG pollMsg;
+    CFG_RATE cfgRate;
+    } Message;
+
+  uint8_t TCPbuf[UBX_SERIAL_BUFFER_SIZE];
+  size_t TCPbufSize;
+} UBX;
+
+enum UBXMsgType {
+  MT_NONE,
+  MT_NAV_POSLLH,
+  MT_NAV_STATUS,
+  MT_NAV_TIME,
+  MT_POLL
+};
+
+#ifdef USE_FLOG
+FLOG *Flog = nullptr;
+#endif
+TasmotaSerial *UBXSerial;
+
+NtpServer timeServer(PortUdp);
+
+WiFiServer vPortServer(UBX_TCP_PORT);
+WiFiClient vPortClient;
+
+
+
+
+
+void UBXcalcChecksum(char* CK, size_t msgSize)
+{
+  memset(CK, 0, 2);
+  for (int i = 0; i < msgSize; i++) {
+    CK[0] += ((char*)(&UBX.Message))[i];
+    CK[1] += CK[0];
+  }
+}
+
+bool UBXcompareMsgHeader(const char* msgHeader)
+{
+  char* ptr = (char*)(&UBX.Message);
+  return ptr[0] == msgHeader[0] && ptr[1] == msgHeader[1];
+}
+
+void UBXinitCFG(void)
+{
+  for (uint32_t i = 0; i < sizeof(UBLOX_INIT); i++) {
+    UBXSerial->write( pgm_read_byte(UBLOX_INIT+i) );
+  }
+  DEBUG_SENSOR_LOG(PSTR("UBX: turn off NMEA"));
+}
+
+void UBXTriggerTele(void)
+{
+  mqtt_data[0] = '\0';
+  if (MqttShowSensor()) {
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+#ifdef USE_RULES
+    RulesTeleperiod();
+#endif
+  }
+}
+
+
+
+void UBXDetect(void)
+{
+  UBX.mode.init = 0;
+  if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
+    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, UBX_SERIAL_BUFFER_SIZE);
+    if (UBXSerial->begin(9600)) {
+      DEBUG_SENSOR_LOG(PSTR("UBX: started serial"));
+      if (UBXSerial->hardwareSerial()) {
+        ClaimSerial();
+        DEBUG_SENSOR_LOG(PSTR("UBX: claim HW"));
+      }
+    }
+  }
+  else {
+    return;
+  }
+
+  UBXinitCFG();
+  UBX.mode.init = 1;
+
+#ifdef USE_FLOG
+  if (!Flog) {
+    Flog = new FLOG;
+    Flog->init();
+  }
+#endif
+
+  UBX.state.log_interval = 10;
+  UBX.mode.send_UI_only = true;
+  UBXTriggerTele();
+}
+
+uint32_t UBXprocessGPS()
+{
+  static uint32_t fpos = 0;
+  static char checksum[2];
+  static uint8_t currentMsgType = MT_NONE;
+  static size_t payloadSize = sizeof(UBX.Message);
+
+
+  uint32_t data_bytes = 0;
+  while ( UBXSerial->available() ) {
+    data_bytes++;
+    byte c = UBXSerial->read();
+    if (UBX.mode.runningVPort){
+      UBX.TCPbuf[data_bytes-1] = c;
+      UBX.TCPbufSize = data_bytes;
+    }
+    if ( fpos < 2 ) {
+
+      if ( c == UBX.UBX_HEADER[fpos] ) {
+        fpos++;
+      } else {
+        fpos = 0;
+      }
+    } else {
+
+
+
+
+
+      if ( (fpos-2) < payloadSize ) {
+        ((char*)(&UBX.Message))[fpos-2] = c;
+      }
+      fpos++;
+
+      if ( fpos == 4 ) {
+
+
+        if ( UBXcompareMsgHeader(UBX.NAV_POSLLH_HEADER) ) {
+          currentMsgType = MT_NAV_POSLLH;
+          payloadSize = sizeof(UBX_t::NAV_POSLLH);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_POSLLH"));
+        }
+        else if ( UBXcompareMsgHeader(UBX.NAV_STATUS_HEADER) ) {
+          currentMsgType = MT_NAV_STATUS;
+          payloadSize = sizeof(UBX_t::NAV_STATUS);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_STATUS"));
+        }
+        else if ( UBXcompareMsgHeader(UBX.NAV_TIME_HEADER) ) {
+          currentMsgType = MT_NAV_TIME;
+          payloadSize = sizeof(UBX_t::NAV_TIME_UTC);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_TIME_UTC"));
+        }
+        else {
+
+          fpos = 0;
+          continue;
+        }
+      }
+
+      if ( fpos == (payloadSize+2) ) {
+
+
+        UBXcalcChecksum(checksum, payloadSize);
+      }
+      else if ( fpos == (payloadSize+3) ) {
+
+
+        if ( c != checksum[0] ) {
+
+          fpos = 0;
+        }
+      }
+      else if ( fpos == (payloadSize+4) ) {
+
+
+        fpos = 0;
+        if ( c == checksum[1] ) {
+
+          return currentMsgType;
+        }
+      }
+      else if ( fpos > (payloadSize+4) ) {
+
+
+        fpos = 0;
+      }
+    }
+  }
+
+  if (data_bytes!=0) {
+    UBX.state.non_empty_loops++;
+    DEBUG_SENSOR_LOG(PSTR("UBX: got %u bytes, non-empty-loop: %u"), data_bytes, UBX.state.non_empty_loops);
+  } else {
+    UBX.state.non_empty_loops = 0;
+  }
+  return MT_NONE;
+}
+
+
+
+
+
+#ifdef USE_FLOG
+void UBXsendHeader(void)
+{
+  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+  WebServer->sendHeader(F("Content-Disposition"), F("attachment; filename=TASMOTA.gpx"));
+  WSSend(200, CT_STREAM, F(
+    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\r\n"
+    "<GPX version=\"1.1\" creator=\"TASMOTA\" xmlns=\"http://www.topografix.com/GPX/1/1\" \r\n"
+    "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n"
+    "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\r\n"
+    "<trk>\r\n<trkseg>\r\n"));
+}
+
+void UBXsendRecord(uint8_t *buf)
+{
+ char record[100];
+ char stime[32];
+ UBX_t::entry_t *entry = (UBX_t::entry_t*)buf;
+ snprintf_P(stime, sizeof(stime), GetDT(entry->time).c_str());
+ char lat[12];
+ char lon[12];
+ dtostrfd((double)entry->lat/10000000.0f,7,lat);
+ dtostrfd((double)entry->lon/10000000.0f,7,lon);
+ snprintf_P(record, sizeof(record),PSTR("<trkpt\n\t lat=\"%s\" lon=\"%s\">\n\t<time>%s</time>\n</trkpt>\n"),lat ,lon, stime);
+
+ WebServer->sendContent_P(record);
+}
+
+void UBXsendFooter(void)
+{
+  WebServer->sendContent(F("</trkseg>\n</trk>\n</gpx>"));
+  WebServer->sendContent("");
+  Rtc.user_time_entry = false;
+}
+
+
+
+void UBXsendFile(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+  Flog->startDownload(sizeof(UBX.rec_buffer),UBXsendHeader,UBXsendRecord,UBXsendFooter);
+}
+#endif
+
+
+
+void UBXSetRate(uint16_t interval)
+{
+  UBX.Message.cfgRate.cls = 0x06;
+  UBX.Message.cfgRate.id = 0x08;
+  UBX.Message.cfgRate.len = 6;
+  uint32_t measRate = (1000*(uint32_t)interval);
+  if (measRate > 0xffff) {
+    measRate = 0xffff;
+  }
+  UBX.Message.cfgRate.measRate = (uint16_t)measRate;
+  UBX.Message.cfgRate.navRate = 1;
+  UBX.Message.cfgRate.timeRef = 1;
+  UBXcalcChecksum(UBX.Message.cfgRate.CK, sizeof(UBX.Message.cfgRate)-sizeof(UBX.Message.cfgRate.CK));
+  DEBUG_SENSOR_LOG(PSTR("UBX: requested interval: %u seconds measRate: %u ms"), interval, UBX.Message.cfgRate.measRate);
+  UBXSerial->write(UBX.UBX_HEADER[0]);
+  UBXSerial->write(UBX.UBX_HEADER[1]);
+  for (uint32_t i =0; i<sizeof(UBX.Message.cfgRate); i++) {
+    UBXSerial->write(((uint8_t*)(&UBX.Message.cfgRate))[i]);
+    DEBUG_SENSOR_LOG(PSTR("UBX: cfgRate byte %u: %x"), i, ((uint8_t*)(&UBX.Message.cfgRate))[i]);
+  }
+  UBX.state.log_interval = 10*interval;
+}
+
+void UBXSelectMode(uint16_t mode)
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: set mode to %u"),mode);
+  switch(mode){
+#ifdef USE_FLOG
+    case 0:
+      Flog->mode = 0;
+      break;
+    case 1:
+      Flog->mode = 1;
+      break;
+    case 2:
+      UBX.mode.filter_noise = true;
+      break;
+    case 3:
+      UBX.mode.filter_noise = false;
+      break;
+    case 4:
+      Flog->startRecording(true);
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - appending"));
+      break;
+    case 5:
+      Flog->startRecording(false);
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - new log"));
+      break;
+    case 6:
+      if(Flog->recording == true){
+        Flog->stopRecording();
+      }
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: stop recording"));
+      break;
+#endif
+    case 7:
+      UBX.mode.send_when_new = 1;
+      break;
+    case 8:
+      UBX.mode.send_when_new = 0;
+      break;
+    case 9:
+      if (timeServer.beginListening()) {
+        UBX.mode.runningNTP = true;
+      }
+      break;
+    case 10:
+      UBX.mode.runningNTP = false;
+      break;
+    case 11:
+      UBX.mode.forceUTCupdate = true;
+      break;
+    case 12:
+      UBX.mode.forceUTCupdate = false;
+      break;
+    case 13:
+      Settings.latitude = UBX.rec_buffer.values.lat/10;
+      Settings.longitude = UBX.rec_buffer.values.lon/10;
+      break;
+    case 14:
+      vPortServer.begin();
+      UBX.mode.runningVPort = 1;
+      break;
+    case 15:
+
+      UBX.mode.runningVPort = 0;
+      break;
+    default:
+      if (mode>1000 && mode <1066) {
+
+        UBXSetRate(mode-1000);
+      }
+      break;
+  }
+  UBX.mode.send_UI_only = true;
+  UBXTriggerTele();
+}
+
+
+
+bool UBXHandlePOSLLH()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: iTOW: %u"),UBX.Message.navPosllh.iTOW);
+  if (UBX.state.gpsFix>1) {
+    if (UBX.mode.filter_noise) {
+      if ((UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat<abs(UBX_LAT_LON_THRESHOLD))||(UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon<abs(UBX_LAT_LON_THRESHOLD))) {
+        DEBUG_SENSOR_LOG(PSTR("UBX: Diff lat: %u lon: %u "),UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat, UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon);
+        return false;
+      }
+    }
+    UBX.rec_buffer.values.lat = UBX.Message.navPosllh.lat;
+    UBX.rec_buffer.values.lon = UBX.Message.navPosllh.lon;
+    DEBUG_SENSOR_LOG(PSTR("UBX: lat/lon: %i / %i"), UBX.rec_buffer.values.lat, UBX.rec_buffer.values.lon);
+    DEBUG_SENSOR_LOG(PSTR("UBX: hAcc: %d"), UBX.Message.navPosllh.hAcc);
+    UBX.state.last_iTOW = UBX.Message.navPosllh.iTOW;
+    UBX.state.last_alt = UBX.Message.navPosllh.alt;
+    UBX.state.last_vAcc = UBX.Message.navPosllh.vAcc;
+    UBX.state.last_hAcc = UBX.Message.navPosllh.hAcc;
+    if (UBX.mode.send_when_new) {
+      UBXTriggerTele();
+    }
+    return true;
+  } else {
+    DEBUG_SENSOR_LOG(PSTR("UBX: no valid position data"));
+  }
+  return false;
+}
+
+void UBXHandleSTATUS()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: gpsFix: %u, valid: %u"), UBX.Message.navStatus.gpsFix, (UBX.Message.navStatus.flags)&1);
+  if ((UBX.Message.navStatus.flags)&1) {
+    UBX.state.gpsFix = UBX.Message.navStatus.gpsFix;
+  } else {
+    UBX.state.gpsFix = 0;
+  }
+}
+
+void UBXHandleTIME()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time: %u-%u-%u %u:%u:%u"), UBX.Message.navTime.year, UBX.Message.navTime.month ,UBX.Message.navTime.day,UBX.Message.navTime.hour,UBX.Message.navTime.min,UBX.Message.navTime.sec);
+  if (UBX.Message.navTime.valid.UTC == 1) {
+    DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time is valid"));
+    if (Rtc.user_time_entry == false || UBX.mode.forceUTCupdate) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: UTC-Time is valid, set system time"));
+      TIME_T gpsTime;
+      gpsTime.year = UBX.Message.navTime.year - 1970;
+      gpsTime.month = UBX.Message.navTime.month;
+      gpsTime.day_of_month = UBX.Message.navTime.day;
+      gpsTime.hour = UBX.Message.navTime.hour;
+      gpsTime.minute = UBX.Message.navTime.min;
+      gpsTime.second = UBX.Message.navTime.sec;
+      Rtc.utc_time = MakeTime(gpsTime);
+      Rtc.user_time_entry = true;
+    }
+  }
+}
+
+void UBXHandleOther(void)
+{
+  if (UBX.state.non_empty_loops>6) {
+    if(UBX.mode.runningVPort) return;
+    UBXinitCFG();
+    AddLog_P(LOG_LEVEL_ERROR, PSTR("UBX: possible device-reset, will re-init"));
+    UBXSerial->flush();
+    UBX.state.non_empty_loops = 0;
+  }
+}
+
+
+
+void UBXLoop50msec(void)
+{
+
+  if (UBX.mode.runningVPort){
+    if(!vPortClient.connected()) {
+      vPortClient = vPortServer.available();
+    }
+    while(vPortClient.available()) {
+      byte _newByte = vPortClient.read();
+      UBXSerial->write(_newByte);
+    }
+
+    if (UBX.TCPbufSize!=0){
+      vPortClient.write((char*)UBX.TCPbuf, UBX.TCPbufSize);
+      UBX.TCPbufSize = 0;
+    }
+  }
+
+  if(UBX.mode.runningNTP){
+    timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
+  }
+}
+
+void UBXLoop(void)
+{
+  static uint16_t counter;
+  static bool new_position;
+
+  uint32_t msgType = UBXprocessGPS();
+
+  switch(msgType){
+    case MT_NAV_POSLLH:
+      new_position = UBXHandlePOSLLH();
+      break;
+    case MT_NAV_STATUS:
+      UBXHandleSTATUS();
+      break;
+    case MT_NAV_TIME:
+      UBXHandleTIME();
+      break;
+    default:
+      UBXHandleOther();
+      break;
+  }
+
+#ifdef USE_FLOG
+  if (counter>UBX.state.log_interval) {
+    if (Flog->recording && new_position) {
+      UBX.rec_buffer.values.time = Rtc.local_time;
+      Flog->addToBuffer(UBX.rec_buffer.bytes, sizeof(UBX.rec_buffer.bytes));
+      counter = 0;
+    }
+  }
+#endif
+
+  counter++;
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+
+#ifdef USE_FLOG
+#ifdef DEBUG_TASMOTA_SENSOR
+  const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} FLOG with %u sectors: {m}%u bytes{e}"
+                                          "{s} FLOG next sector for REC: {m} %u {e}"
+                                          "{s} %u sector(s) with data at sector: {m} %u {e}";
+  const char HTTP_SNS_FLOGREC[] PROGMEM = "{s} RECORDING (bytes in buffer) {m}%u{e}";
+#endif
+
+  const char HTTP_SNS_FLOG[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} Flash-Log {m} %s{e}";
+  const char kFLOG_STATE0[] PROGMEM = "ready";
+  const char kFLOG_STATE1[] PROGMEM = "recording";
+  const char * kFLOG_STATE[] ={kFLOG_STATE0, kFLOG_STATE1};
+
+  const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>";
+
+#endif
+  const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s} NTP server {m}active{e}";
+
+  const char HTTP_SNS_GPS[] PROGMEM = "{s} GPS latitude {m}%s{e}"
+                                      "{s} GPS longitude {m}%s{e}"
+                                      "{s} GPS altitude {m}%s   m{e}"
+                                      "{s} GPS hor. Accuracy {m}%s   m{e}"
+                                      "{s} GPS vert. Accuracy {m}%s   m{e}"
+                                      "{s} GPS sat-fix status {m}%s{e}";
+
+  const char kGPSFix0[] PROGMEM = "no fix";
+  const char kGPSFix1[] PROGMEM = "dead reckoning only";
+  const char kGPSFix2[] PROGMEM = "2D-fix";
+  const char kGPSFix3[] PROGMEM = "3D-fix";
+  const char kGPSFix4[] PROGMEM = "GPS + dead reckoning combined";
+  const char kGPSFix5[] PROGMEM = "Time only fix";
+  const char * kGPSFix[] PROGMEM ={kGPSFix0, kGPSFix1, kGPSFix2, kGPSFix3, kGPSFix4, kGPSFix5};
+
+
+
+
+#endif
+
+
+
+void UBXShow(bool json)
+{
+  char lat[12];
+  char lon[12];
+  char alt[12];
+  char hAcc[12];
+  char vAcc[12];
+  dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
+  dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
+  dtostrfd((double)UBX.state.last_alt/1000.0f,3,alt);
+  dtostrfd((double)UBX.state.last_vAcc/1000.0f,3,hAcc);
+  dtostrfd((double)UBX.state.last_hAcc/1000.0f,3,vAcc);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"GPS\":{"));
+    if (UBX.mode.send_UI_only) {
+      uint32_t i = UBX.state.log_interval / 10;
+      ResponseAppend_P(PSTR("\"fil\":%u,\"int\":%u}"), UBX.mode.filter_noise, i);
+    } else {
+      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"alt\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, alt, hAcc, vAcc);
+    }
+#ifdef USE_FLOG
+    ResponseAppend_P(PSTR(",\"FLOG\":{\"rec\":%u,\"mode\":%u,\"sec\":%u}"), Flog->recording, Flog->mode, Flog->sectors_left);
+#endif
+    UBX.mode.send_UI_only = false;
+#ifdef USE_WEBSERVER
+  } else {
+      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, alt, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
+
+#ifdef DEBUG_TASMOTA_SENSOR
+#ifdef USE_FLOG
+    WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector);
+    if (Flog->recording) {
+      WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8);
+    }
+#endif
+#endif
+#ifdef USE_FLOG
+    if (Flog->ready) {
+      WSContentSend_P(HTTP_SNS_FLOG,kFLOG_STATE[Flog->recording]);
+    }
+    if (!Flog->recording && Flog->found_saved_data) {
+      WSContentSend_P(HTTP_BTN_FLOG_DL);
+    }
+#endif
+    if (UBX.mode.runningNTP) {
+      WSContentSend_P(HTTP_SNS_NTPSERVER);
+    }
+#endif
+  }
+}
+
+
+
+
+
+bool UBXCmd(void)
+{
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+    UBXSelectMode(XdrvMailbox.payload);
+    Response_P(S_JSON_UBX_COMMAND_NVALUE, XdrvMailbox.command, XdrvMailbox.payload);
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns60(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    UBXDetect();
+  }
+
+  if (UBX.mode.init) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_60 == XdrvMailbox.index) {
+          result = UBXCmd();
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        UBXLoop50msec();
+        break;
+      case FUNC_EVERY_100_MSECOND:
+#ifdef USE_FLOG
+        if (!Flog->running_download)
+#endif
+        {
+          UBXLoop();
+        }
+        break;
+#ifdef USE_FLOG
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/UBX", UBXsendFile);
+        break;
+#endif
+      case FUNC_JSON_APPEND:
+        UBXShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+#ifdef USE_FLOG
+        if (!Flog->running_download)
+#endif
+        {
+          UBXShow(0);
+        }
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+#ifdef USE_SPI
+#ifdef USE_NRF24
+#ifdef USE_MIBLE
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  #define MINRF_LOG_BUFFER(x) MINRFshowBuffer(x);
+#else
+  #define MINRF_LOG_BUFFER(x)
+#endif
+# 53 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+#define XSNS_61 61
+
+#include <vector>
+
+#define FLORA 1
+#define MJ_HT_V1 2
+#define LYWSD02 3
+#define LYWSD03 4
+
+uint8_t kMINRFSlaveID[4][3] = { 0xC4,0x7C,0x8D,
+                                0x58,0x2D,0x34,
+                                0xE7,0x2E,0x00,
+                                0xA4,0xC1,0x38,
+                                };
+
+const char kMINRFSlaveType1[] PROGMEM = "Flora";
+const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
+const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
+const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4};
+
+
+const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
+const uint32_t kMINRFMJPDU[3] = {0x4760cd66,0xdbcc0cd3,0x33048df5};
+const uint32_t kMINRFL2PDU[3] = {0x3eaa057d,0xef3b0730,0x71da7646};
+
+const uint32_t kMINRFL3PDU[3] = {0x4760cb78,0xdbcc0acd,0x33048beb};
+
+
+const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};
+
+
+#pragma pack(1)
+struct MJ_HT_V1Header_t {
+  uint8_t padding[3];
+  uint8_t mesSize;
+  uint8_t padding2;
+  uint16_t uuid;
+  uint16_t type;
+  uint8_t padding3[2];
+  uint8_t counter;
+  uint8_t serial[6];
+  uint8_t mode;
+  uint8_t padding5;
+  uint8_t effectiveDataLength;
+  };
+
+struct FlowerHeader_t {
+  uint8_t padding[4];
+  uint8_t padding2;
+  uint16_t uuid;
+  uint8_t mesSize;
+  uint8_t padding22;
+  uint16_t uuid2;
+  uint16_t type;
+  uint8_t padding3[2];
+  uint8_t counter;
+  uint8_t serial[6];
+  uint8_t padding4;
+  uint8_t mode;
+  };
+
+union floraPacket_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } T;
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint32_t data:24;
+  } L;
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint8_t data;
+  } M;
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } F;
+};
+
+union MJ_HT_V1Packet_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t temp;
+      uint16_t hum;
+  } TH;
+      struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint8_t battery;
+  } B;
+
+};
+
+union LYWSD02Packet_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } TH;
+};
+
+struct bleAdvPacket_t {
+  uint8_t pduType;
+  uint8_t payloadSize;
+  uint8_t mac[6];
+  union {
+    uint8_t payload[24];
+    MJ_HT_V1Header_t header;
+    FlowerHeader_t flowerHeader;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+        uint8_t hum_lb;
+    } TH;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+    } T;
+    struct {
+        uint8_t padding[21];
+        uint16_t hum;
+    } H;
+    struct {
+        uint8_t padding[21];
+        uint8_t battery;
+    } B;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+    } F_T;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+        uint8_t data2;
+    } F_L;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint8_t data;
+    } F_M;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+    } F_F;
+  };
+};
+
+union FIFO_t{
+  bleAdvPacket_t bleAdv;
+  floraPacket_t floraPacket;
+  MJ_HT_V1Packet_t MJ_HT_V1Packet;
+  LYWSD02Packet_t LYWSD02Packet;
+  uint8_t raw[32];
+};
+
+#pragma pack(0)
+
+struct {
+  const uint8_t channel[3] = {37,38,39};
+  const uint8_t frequency[3] = { 2,26,80};
+
+  uint16_t timer;
+  uint8_t currentChan=0;
+  FIFO_t buffer;
+  uint8_t packetMode;
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  uint8_t streamBuffer[sizeof(buffer)];
+  uint8_t lsfrBuffer[sizeof(buffer)];
+#endif
+
+} MINRF;
+
+struct mi_sensor_t{
+  uint8_t type;
+  uint8_t serial[6];
+  uint8_t showedUp;
+  float temp;
+  union {
+    struct {
+      float moisture;
+      float fertility;
+      uint32_t lux;
+    };
+    struct {
+      float hum;
+      uint8_t bat;
+    };
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+
+
+
+bool MINRFinitBLE(uint8_t _mode)
+{
+  if (MINRF.timer%1000 == 0){
+    NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+    NRF24radio.setAutoAck(false);
+    NRF24radio.setDataRate(RF24_1MBPS);
+    NRF24radio.disableCRC();
+    NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+    NRF24radio.setRetries(0,0);
+    NRF24radio.setPALevel(RF24_PA_MIN);
+    NRF24radio.setAddressWidth(4);
+
+
+    NRF24radio.powerUp();
+  }
+  if(NRF24radio.isChipConnected()){
+
+    MINRFchangePacketModeTo(_mode);
+    return true;
+  }
+
+  return false;
+}
+
+void MINRFhopChannel()
+{
+  MINRF.currentChan++;
+  if(MINRF.currentChan >= sizeof(MINRF.channel)) {
+    MINRF.currentChan = 0;
+  }
+  NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+}
+
+
+
+
+
+
+
+bool MINRFreceivePacket(void)
+{
+  if(!NRF24radio.available()) {
+    return false;
+  }
+  while(NRF24radio.available()) {
+
+
+    NRF24radio.read( &MINRF.buffer, sizeof(MINRF.buffer) );
+#ifdef DEBUG_TASMOTA_SENSOR
+    memcpy(&MINRF.streamBuffer, &MINRF.buffer, sizeof(MINRF.buffer));
+#endif
+    MINRFswapbuf( sizeof(MINRF.buffer) );
+
+
+
+    switch (MINRF.packetMode) {
+      case 0:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), MINRF.channel[MINRF.currentChan] | 0x40);
+      break;
+      case 1:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
+      break;
+      case 2:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
+      break;
+      case 3:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
+      break;
+      case 4:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
+      break;
+    }
+
+
+  }
+
+  return true;
+}
+
+#ifdef DEBUG_TASMOTA_SENSOR
+void MINRFshowBuffer(uint8_t (&buf)[32]){
+
+
+
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
+  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
+  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
+  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
+  );
+}
+#endif
+
+
+
+
+
+
+void MINRFswapbuf(uint8_t len)
+{
+  uint8_t* buf = (uint8_t*)&MINRF.buffer;
+  while(len--) {
+    uint8_t a = *buf;
+    uint8_t v = 0;
+    if (a & 0x80) v |= 0x01;
+    if (a & 0x40) v |= 0x02;
+    if (a & 0x20) v |= 0x04;
+    if (a & 0x10) v |= 0x08;
+    if (a & 0x08) v |= 0x10;
+    if (a & 0x04) v |= 0x20;
+    if (a & 0x02) v |= 0x40;
+    if (a & 0x01) v |= 0x80;
+    *(buf++) = v;
+  }
+}
+# 420 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
+{
+  while(len--) {
+    uint8_t res = 0;
+
+    for (uint8_t i = 1; i; i <<= 1) {
+      if (lfsr & 0x01) {
+        lfsr ^= 0x88;
+        res |= i;
+      }
+      lfsr >>= 1;
+    }
+    *(buf++) ^= res;
+#ifdef DEBUG_TASMOTA_SENSOR
+    MINRF.lsfrBuffer[31-len] = lfsr;
+#endif
+  }
+}
+
+void MINRFreverseMAC(uint8_t _mac[]){
+  uint8_t _reversedMAC[6];
+  for (uint8_t i=0; i<6; i++){
+    _reversedMAC[5-i] = _mac[i];
+  }
+  memcpy(_mac,_reversedMAC, sizeof(_reversedMAC));
+}
+
+
+
+
+
+
+void MINRFchangePacketModeTo(uint8_t _mode) {
+  uint32_t (_nextchannel) = MINRF.currentChan+1;
+  if (_nextchannel>2) _nextchannel=0;
+
+  switch(_mode){
+    case 0:
+      NRF24radio.openReadingPipe(0,0x6B7D9171);
+    break;
+    case 1:
+      NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]);
+    break;
+    case 2:
+      NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]);
+    break;
+    case 3:
+      NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);
+    break;
+    case 4:
+      if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
+      NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);
+    break;
+  }
+
+  MINRF.packetMode = _mode;
+}
+# 485 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  if(_type==0xff){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: will test MAC-type"));
+    for (uint32_t i=0;i<4;i++){
+      if(memcmp(_serial,kMINRFSlaveID+i,3)==0){
+        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC is type %u"), i);
+        _type = i+1;
+      }
+      else {
+        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-type is unknown"));
+      }
+    }
+  }
+  if(_type==0xff) return _type;
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){
+        MIBLEsensors.at(i).showedUp++;
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MINRF i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MINRF n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MINRF: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0x00ffffff;
+      break;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+
+
+
+
+
+void MINRFpurgeFakeSensors(void){
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(MIBLEsensors.at(i).showedUp<3){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: remove FAKE sensor at slot: %u"), i);
+      MIBLEsensors.erase(MIBLEsensors.begin()+i);
+    }
+  }
+}
+
+
+void MINRFhandleFloraPacket(void){
+  if(MINRF.buffer.floraPacket.T.idWord!=0x9800 && MINRF.buffer.floraPacket.T.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, 0xff);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.floraPacket.L.mode) {
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.T.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MINRF.buffer.floraPacket.T.data );
+    break;
+    case 7:
+    if(true){
+        MIBLEsensors.at(_slot).lux=MINRF.buffer.floraPacket.L.data;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U24: %x Lux"), MINRF.buffer.floraPacket.L.data);
+    break;
+    case 8:
+    _tempFloat =(float)MINRF.buffer.floraPacket.M.data;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).moisture=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MINRF.buffer.floraPacket.M.data);
+    break;
+    case 9:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.F.data);
+    if(_tempFloat<65535){
+        MIBLEsensors.at(_slot).fertility=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MINRF.buffer.floraPacket.F.data);
+    break;
+  }
+}
+
+void MINRFhandleMJ_HT_V1Packet(void){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, 0xff);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
+void MINRFhandleLYWSD02Packet(void){
+  if(MINRF.buffer.LYWSD02Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected LYWSD02-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+    if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.LYWSD02Packet.TH.mode) {
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+    case 6:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<101){
+        MIBLEsensors.at(_slot).hum=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+  }
+}
+
+void MINRFhandleLYWSD03Packet(void){
+
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+    if(_slot==0xff) return;
+
+  MINRF_LOG_BUFFER(MINRF.streamBuffer);
+  MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+  MINRF_LOG_BUFFER(MINRF.buffer.raw);
+}
+
+void MINRF_EVERY_50_MSECOND() {
+
+  if(MINRF.timer>6000){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
+    MINRFpurgeFakeSensors();
+    MINRF.timer=0;
+  }
+  MINRF.timer++;
+
+  if (!MINRFreceivePacket()){
+
+  }
+
+  else if(MINRF.buffer.bleAdv.header.uuid==0xfe95){
+    MINRF_LOG_BUFFER(MINRF.streamBuffer);
+    MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    DEBUG_SENSOR_LOG(PSTR("MINRF: Type: %x"), MINRF.buffer.bleAdv.header.type);
+    switch(MINRF.buffer.bleAdv.header.type){
+      case 0x2050:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: MJ_HT_V1 Packet"));
+      break;
+      case 0x1613:case 0x1614:case 0x1615:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: Flora Packet"));
+      break;
+      default:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: unknown Packet"));
+      break;
+    }
+  }
+  else if (MINRF.packetMode == FLORA){
+    MINRFhandleFloraPacket();
+  }
+  else if (MINRF.packetMode == MJ_HT_V1){
+    MINRFhandleMJ_HT_V1Packet();
+  }
+  else if (MINRF.packetMode == LYWSD02){
+    MINRFhandleLYWSD02Packet();
+  }
+  else if (MINRF.packetMode == LYWSD03){
+    MINRFhandleLYWSD03Packet();
+  }
+
+
+  if (MINRF.packetMode == LYWSD03){
+    MINRFinitBLE(1);
+  }
+  else {
+    MINRFinitBLE(++MINRF.packetMode);
+  }
+
+  MINRFhopChannel();
+  NRF24radio.startListening();
+}
+
+
+
+
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_MINRF_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_MINRF_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
+
+void MINRFShow(bool json)
+{
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      if(MIBLEsensors.at(i).showedUp < 3){
+        DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+        break;
+        }
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kMINRFSlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
+    }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        if(MIBLEsensors.at(i).showedUp < 3){
+          DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+          break;
+          }
+        WSContentSend_PD(HTTP_MINRF_HL);
+        WSContentSend_PD(HTTP_MINRF_MAC, kMINRFSlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kMINRFSlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          if(MIBLEsensors.at(i).lux!=0x00ffffff){
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_MINRF_FLORA_DATA, kMINRFSlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kMINRFSlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
+        }
+      }
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns61(uint8_t function)
+{
+  bool result = false;
+
+  if (NRF24.chipType) {
+    switch (function) {
+      case FUNC_INIT:
+        MINRFinitBLE(1);
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: started"));
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        MINRF_EVERY_50_MSECOND();
+        break;
+      case FUNC_JSON_APPEND:
+        MINRFShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MINRFShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+#ifdef USE_HM10
+
+#define XSNS_62 62
+
+#include <TasmotaSerial.h>
+#include <vector>
+
+TasmotaSerial *HM10Serial;
+#define HM10_BAUDRATE 115200
+
+#define HM10_MAX_TASK_NUMBER 12
+uint8_t HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];
+
+#define HM10_MAX_RX_BUF 512
+char HM10_RX_STRING[HM10_MAX_RX_BUF] = {0};
+
+struct {
+  uint8_t current_task_delay;
+  uint8_t last_command;
+  uint16_t firmware;
+  uint32_t period;
+  uint32_t serialSpeed;
+  union {
+    uint32_t time;
+    uint8_t timebuf[4];
+  };
+  struct {
+    uint32_t init:1;
+    uint32_t pending_task:1;
+    uint32_t connected:1;
+    uint32_t subscribed:1;
+    uint32_t awaitingHT:1;
+    uint32_t awaitingB:1;
+
+  } mode;
+  struct {
+    uint8_t sensor;
+
+  } state;
+} HM10;
+
+#pragma pack(1)
+struct {
+  uint16_t temp;
+  uint8_t hum;
+} LYWSD0x_HT;
+#pragma pack(0)
+
+struct mi_sensor_t{
+  uint8_t type;
+  uint8_t serial[6];
+  uint8_t showedUp;
+  float temp;
+  union {
+    struct {
+      float moisture;
+      float fertility;
+      uint16_t lux;
+    };
+    struct {
+      float hum;
+      uint8_t bat;
+    };
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+
+
+
+
+#define D_CMND_HM10 "HM10"
+
+const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
+const char S_JSON_HM10_COMMAND[] PROGMEM = "{\"" D_CMND_HM10 "%s%s\"}";
+const char kHM10_Commands[] PROGMEM = "Scan|AT|Period|Baud|Time";
+
+#define FLORA 1
+#define MJ_HT_V1 2
+#define LYWSD02 3
+#define LYWSD03MMC 4
+
+uint8_t kHM10SlaveID[4][3] = { 0xC4,0x7C,0x8D,
+                                0x58,0x2D,0x34,
+                                0xE7,0x2E,0x00,
+                                0xA4,0xC1,0x38,
+                                };
+
+const char kHM10SlaveType1[] PROGMEM = "Flora";
+const char kHM10SlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
+const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
+const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
+
+
+
+
+
+enum HM10_Commands {
+  CMND_HM10_DISC_SCAN,
+  CMND_HM10_AT,
+  CMND_HM10_PERIOD,
+  CMND_HM10_BAUD,
+  CMND_HM10_TIME
+  };
+
+
+
+
+
+#define TASK_HM10_NOTASK 0
+#define TASK_HM10_ROLE1 1
+#define TASK_HM10_IMME1 2
+#define TASK_HM10_RENEW 3
+#define TASK_HM10_RESET 4
+#define TASK_HM10_DISC 5
+#define TASK_HM10_CONN 6
+#define TASK_HM10_VERSION 7
+#define TASK_HM10_NAME 8
+#define TASK_HM10_FEEDBACK 9
+#define TASK_HM10_DISCONN 10
+#define TASK_HM10_SUB_L3 11
+#define TASK_HM10_READ_HT 12
+#define TASK_HM10_FINDALLCHARS 13
+#define TASK_HM10_UN_L3 14
+#define TASK_HM10_DELAY_SUB 15
+#define TASK_HM10_READ_BT_L3 16
+#define TASK_HM10_SUB_L2 17
+#define TASK_HM10_UN_L2 18
+#define TASK_HM10_READ_BT_L2 19
+#define TASK_HM10_TIME_L2 20
+
+#define TASK_HM10_DONE 99
+
+
+
+
+
+void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
+                          HM10_TASK_LIST[slot][0] = task;
+                          HM10_TASK_LIST[slot][1] = delay;
+                          HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;
+                          HM10.current_task_delay = HM10_TASK_LIST[0][1];
+}
+
+void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
+                          HM10.last_command = HM10_TASK_LIST[slot][0];
+                          HM10_TASK_LIST[slot][0] = task;
+}
+
+
+
+
+
+void HM10_Reset(void) { HM10_Launchtask(TASK_HM10_DISCONN,0,1);
+                          HM10_Launchtask(TASK_HM10_ROLE1,1,1);
+                          HM10_Launchtask(TASK_HM10_IMME1,2,1);
+                          HM10_Launchtask(TASK_HM10_RESET,3,1);
+                          HM10_Launchtask(TASK_HM10_VERSION,4,10);
+                          HM10_Launchtask(TASK_HM10_DISC,5,50);
+                          }
+
+void HM10_Discovery_Scan(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,1);
+                          HM10_Launchtask(TASK_HM10_DISC,1,1);
+                          }
+
+void HM10_Read_LYWSD03(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
+                          HM10_Launchtask(TASK_HM10_SUB_L3,2,20);
+                          HM10_Launchtask(TASK_HM10_UN_L3,3,80);
+                          HM10_Launchtask(TASK_HM10_READ_BT_L3,4,5);
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
+                          }
+
+void HM10_Read_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
+                          HM10_Launchtask(TASK_HM10_SUB_L2,2,20);
+                          HM10_Launchtask(TASK_HM10_UN_L2,3,80);
+                          HM10_Launchtask(TASK_HM10_READ_BT_L2,4,5);
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
+                          }
+
+void HM10_Time_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,0);
+                          HM10_Launchtask(TASK_HM10_CONN,1,5);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);
+                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);
+                          HM10_Launchtask(TASK_HM10_DISCONN,4,5);
+                          }
+# 231 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  if(_type==0xff){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: will test MAC-type"));
+    for (uint32_t i=0;i<4;i++){
+      if(memcmp(_serial,kHM10SlaveID+i,3)==0){
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC is type %u"), i);
+        _type = i+1;
+      }
+      else {
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC-type is unknown"));
+      }
+    }
+  }
+  if(_type==0xff) return _type;
+
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){
+        MIBLEsensors.at(i).showedUp++;
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[0], _serial[1], _serial[2],_serial[3],_serial[4],_serial[5]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0xffff;
+      break;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+
+
+
+
+
+
+void HM10SerialInit(void) {
+  HM10.mode.init = false;
+  HM10.serialSpeed = HM10_BAUDRATE;
+  HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
+  if (HM10Serial->begin(HM10.serialSpeed)) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
+    if (HM10Serial->hardwareSerial()) {
+      ClaimSerial();
+      DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
+    }
+    HM10_Reset();
+    HM10.mode.pending_task = 1;
+    HM10.mode.init = 1;
+    HM10.period = Settings.tele_period;
+    DEBUG_SENSOR_LOG(PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
+  }
+  return;
+}
+# 315 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+void HM10MACStringToBytes(const char* string, uint8_t _mac[]) {
+    uint32_t index = 0;
+    while (index < 12) {
+        char c = string[index];
+        uint32_t value = 0;
+        if(c >= '0' && c <= '9')
+          value = (c - '0');
+        else if (c >= 'A' && c <= 'F')
+          value = (10 + (c - 'A'));
+        _mac[(index/2)] += value << (((index + 1) % 2) * 4);
+
+        index++;
+    }
+    DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_mac[0],_mac[1],_mac[2],_mac[3],_mac[4],_mac[5]);
+}
+
+
+
+
+
+
+void HM10ParseResponse(char *buf) {
+    if (!strncmp(buf,"OK",2)) {
+       DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
+     }
+    if (!strncmp(buf,"HMSoft",6)) {
+      const char* _fw = "000";
+      memcpy((void *)_fw,(void *)(buf+8),3);
+      HM10.firmware = atoi(_fw);
+      DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
+      return;
+     }
+    char * _pos = strstr(buf, "IS0:");
+    if(_pos) {
+      const char* _mac = "000000000000";
+      memcpy((void *)_mac,(void *)(_pos+4),12);
+      DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
+      uint8_t _newMacArray[6] = {0};
+      HM10MACStringToBytes(_mac, _newMacArray);
+      DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
+      MIBLEgetSensorSlot(_newMacArray, 0xff);
+    }
+    if (strstr(buf, "LOST")){
+      HM10.mode.connected = false;
+    }
+    else {
+      DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
+    }
+}
+
+void HM10readTempHum(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0 && _buf[1] != 0){
+    memcpy(&LYWSD0x_HT,(void *)_buf,3);
+    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD0x_HT.temp,LYWSD0x_HT.hum);
+    uint32_t _slot = HM10.state.sensor;
+
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    static float _tempFloat;
+    _tempFloat=(float)(LYWSD0x_HT.temp)/100.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+        HM10.mode.awaitingHT = false;
+        HM10.current_task_delay = 0;
+    }
+    _tempFloat=(float)LYWSD0x_HT.hum;
+    if(_tempFloat<100){
+      MIBLEsensors.at(_slot).hum = _tempFloat;
+      DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
+    }
+  }
+}
+
+bool HM10readBat(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0){
+    DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
+    uint32_t _slot = HM10.state.sensor;
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    if(_buf[0]<101){
+        MIBLEsensors.at(_slot).bat=_buf[0];
+        return true;
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool HM10SerialHandleFeedback(){
+  bool success = false;
+  uint32_t i = 0;
+  char ret[HM10_MAX_RX_BUF] = {0};
+
+
+  while(HM10Serial->available()) {
+
+    if(i<HM10_MAX_RX_BUF){
+      ret[i] = HM10Serial->read();
+    }
+    i++;
+    success = true;
+  }
+  if(HM10.mode.awaitingHT) {
+    if (HM10.mode.connected) HM10readTempHum(ret);
+  }
+  else if(HM10.mode.awaitingB) {
+    if (HM10.mode.connected) {
+      if (HM10readBat(ret)){
+        HM10.mode.awaitingB = false;
+        HM10.current_task_delay = 0;
+      }
+    }
+  }
+  else if(success) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
+    HM10ParseResponse(ret);
+  }
+  else {
+
+  }
+  return success;
+}
+
+
+
+
+
+void HM10_TaskEvery100ms(){
+  if (HM10.current_task_delay == 0) {
+    uint8_t i = 0;
+    bool runningTaskLoop = true;
+    while (runningTaskLoop) {
+      switch(HM10_TASK_LIST[i][0]) {
+        case TASK_HM10_ROLE1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+ROLE1");
+          break;
+        case TASK_HM10_IMME1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+IMME1");
+          break;
+        case TASK_HM10_DISC:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start discovery"),D_CMND_HM10);
+          HM10.current_task_delay = 35;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+DISC?");
+          break;
+        case TASK_HM10_VERSION:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+VERR?");
+          break;
+        case TASK_HM10_NAME:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NAME?");
+          break;
+        case TASK_HM10_CONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s connect"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          char _con[20];
+          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
+          HM10Serial->write(_con);
+          HM10.mode.awaitingB = false;
+          HM10.mode.connected = true;
+          break;
+        case TASK_HM10_DISCONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT");
+          break;
+        case TASK_HM10_RESET:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
+          HM10Serial->write("AT+RESET");
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_SUB_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 25;
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON0037");
+          break;
+        case TASK_HM10_UN_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.awaitingHT = false;
+          HM10Serial->write("AT+NOTIFYOFF0037");
+          break;
+        case TASK_HM10_SUB_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 25;
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON003C");
+          break;
+        case TASK_HM10_UN_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.awaitingHT = false;
+          HM10Serial->write("AT+NOTIFYOFF003C");
+          break;
+        case TASK_HM10_TIME_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set time"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.time = Rtc.utc_time;
+          HM10Serial->write("AT+SEND_DATAWR002F");
+          HM10Serial->write(HM10.timebuf,4);
+          HM10Serial->write(Rtc.time_timezone / 60);
+          AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s Time-string: %x%x%x%x%x"),D_CMND_HM10, HM10.timebuf[0],HM10.timebuf[1],HM10.timebuf[2],HM10.timebuf[3],(Rtc.time_timezone /60));
+          break;
+        case TASK_HM10_READ_HT:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
+          HM10.current_task_delay = 0;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA0036?");
+          HM10.mode.awaitingHT = true;
+          break;
+        case TASK_HM10_READ_BT_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA003A?");
+          HM10.mode.awaitingB = true;
+          break;
+        case TASK_HM10_READ_BT_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0043"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA0043?");
+          HM10.mode.awaitingB = true;
+          break;
+
+
+
+
+
+
+
+        case TASK_HM10_FEEDBACK:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_DELAY_SUB:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start reading"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
+          HM10.mode.awaitingHT = true;
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_DONE:
+
+
+          if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {
+            DEBUG_SENSOR_LOG(PSTR("%sno Tasks left"),D_CMND_HM10);
+            DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
+            for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {
+              DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
+              HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;
+              HM10_TASK_LIST[j][1] = 0;
+            }
+            runningTaskLoop = false;
+            HM10.mode.pending_task = 0;
+            break;
+          }
+      }
+      i++;
+    }
+  }
+  else {
+    HM10.current_task_delay--;
+  }
+}
+
+
+
+
+
+
+void HM10EverySecond(){
+  if(HM10.firmware == 0) return;
+  if(HM10.mode.pending_task == 1) return;
+  if (MIBLEsensors.size()==0) return;
+
+  static uint32_t _counter = 0;
+  static uint32_t _nextSensorSlot = 0;
+  if(_counter==0) {
+    HM10.state.sensor = _nextSensorSlot;
+    _nextSensorSlot++;
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_LYWSD03();
+    }
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD02) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_LYWSD02();
+    }
+    if (HM10.state.sensor==MIBLEsensors.size()-1) {
+      _nextSensorSlot= 0;
+      _counter++;
+    }
+    DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
+  }
+  else _counter++;
+  if (_counter>HM10.period) _counter = 0;
+}
+
+bool HM10Cmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_HM10);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_HM10), disp_len)) {
+    uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kHM10_Commands);
+    switch (command_code) {
+      case CMND_HM10_PERIOD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_PERIOD) { HM10.period = XdrvMailbox.payload; }
+        }
+        else {
+          if (command_code == CMND_HM10_PERIOD) XdrvMailbox.payload = HM10.period;
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_BAUD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_BAUD) {
+            HM10.serialSpeed = XdrvMailbox.payload;
+            HM10Serial->begin(HM10.serialSpeed);
+            }
+        }
+        else {
+          if (command_code == CMND_HM10_BAUD) XdrvMailbox.payload = HM10.serialSpeed;
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_TIME:
+        if (XdrvMailbox.data_len > 0) {
+          if(MIBLEsensors.size()>XdrvMailbox.payload){
+            if(MIBLEsensors.at(XdrvMailbox.payload).type == LYWSD02){
+              HM10.state.sensor = XdrvMailbox.payload;
+              HM10_Time_LYWSD02();
+              }
+            }
+          }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_AT:
+        HM10Serial->write("AT");
+        if (strlen(XdrvMailbox.data)!=0) {
+          HM10Serial->write("+");
+          HM10Serial->write(XdrvMailbox.data);
+          Response_P(S_JSON_HM10_COMMAND, ":AT+",XdrvMailbox.data);
+        }
+        else Response_P(S_JSON_HM10_COMMAND, ":AT",XdrvMailbox.data);
+        break;
+      case CMND_HM10_DISC_SCAN:
+        if (command_code == CMND_HM10_DISC_SCAN) { HM10_Discovery_Scan(); }
+        Response_P(S_JSON_HM10_COMMAND, command, "");
+        break;
+      default:
+
+       serviced = false;
+     break;
+    }
+  } else {
+    return false;
+  }
+  return serviced;
+}
+
+
+
+
+
+
+const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
+const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_HM10_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
+
+void HM10Show(bool json)
+{
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
+    }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_HM10, HM10.firmware);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        WSContentSend_PD(HTTP_HM10_HL);
+        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
+        }
+      }
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns62(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) {
+    switch (function) {
+      case FUNC_INIT:
+        HM10SerialInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        HM10SerialHandleFeedback();
+       break;
+      case FUNC_EVERY_100_MSECOND:
+        if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
+          HM10_TaskEvery100ms();
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        HM10EverySecond();
+        break;
+      case FUNC_COMMAND:
+        result = HM10Cmd();
+        break;
+      case FUNC_JSON_APPEND:
+        HM10Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HM10Show(0);
+        break;
+#endif
+      }
+  }
+  return result;
+}
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_64_aht10.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_64_aht10.ino"
+#ifdef USE_I2C
+#ifdef USE_AHT10
+
+
+
+
+
+
+#define XSNS_64 64
+#define XI2C_43 43
+
+#define AHT10_ADDR 0x38
+
+unsigned char eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
+unsigned char eSensorNormalCmd[3] = {0xA8, 0x00, 0x00};
+unsigned char eSensorMeasureCmd[3] = {0xAC, 0x33, 0x00};
+unsigned char eSensorResetCmd = 0xBA;
+
+struct AHT10 {
+  float humidity = NAN;
+  float temperature = NAN;
+  uint8_t valid = 0;
+  uint8_t count = 0;
+  char name[6] = "AHT10";
+} AHT10;
+
+bool begin()
+{
+    Wire.begin(AHT10_ADDR);
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorCalibrateCmd, 3);
+    Wire.endTransmission();
+    delay(500);
+
+    if((readStatus() & 0x68) == 0x08)
+        return true;
+    else
+    {
+        return false;
+    }
+}
+
+bool AHT10Read(void)
+{
+  unsigned long result, temp[6];
+
+  if (AHT10.valid) { AHT10.valid--; }
+
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorMeasureCmd, 3);
+    Wire.endTransmission();
+    delay(100);
+
+    Wire.requestFrom(AHT10_ADDR, 6);
+    for(unsigned char i = 0; Wire.available() > 0; i++)
+    {
+        temp[i] = Wire.read();
+    }
+
+  AHT10.humidity = (((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4)* 100 / 1048576;
+  AHT10.temperature = ((200 * (((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5])) / 1048576) - 50;
+
+  if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
+
+  AHT10.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+unsigned char readStatus(void)
+{
+    unsigned char result = 0;
+
+    Wire.requestFrom(AHT10_ADDR, 1);
+    result = Wire.read();
+    return result;
+}
+
+void AHT10Detect(void)
+{
+  if (I2cActive(AHT10_ADDR))
+  {
+  return;
+  }
+
+  if (begin())
+  {
+    I2cSetActiveFound(AHT10_ADDR, AHT10.name);
+    AHT10.count = 1;
+  }
+}
+
+void AHT10EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!AHT10Read()) {
+      AddLogMissed(AHT10.name, AHT10.valid);
+    }
+  }
+}
+
+void AHT10Show(bool json)
+{
+  if (AHT10.valid) {
+    char temperature[33];
+    dtostrfd(AHT10.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(AHT10.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, AHT10.name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, AHT10.temperature);
+        KnxSensor(KNX_HUMIDITY, AHT10.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, AHT10.name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, AHT10.name, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns64(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_43)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    AHT10Detect();
+  }
+  else if (AHT10.count) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      AHT10EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      AHT10Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      AHT10Show(0);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
+# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
+#ifdef USE_PROMETHEUS
+
+
+
+
+#define XSNS_91 91
+
+void HandleMetrics(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR("Prometheus"));
+
+  WSContentBegin(200, CT_PLAIN);
+
+
+  char parameter[FLOATSZ];
+
+  if (global_temperature != 9999) {
+    dtostrfd(global_temperature, Settings.flag2.temperature_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_temperature gauge\nglobal_temperature %s\n"), parameter);
+  }
+  if (global_humidity != 0) {
+    dtostrfd(global_humidity, Settings.flag2.humidity_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_humidity gauge\nglobal_humidity %s\n"), parameter);
+  }
+  if (global_pressure != 0) {
+    dtostrfd(global_pressure, Settings.flag2.pressure_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_pressure gauge\nglobal_pressure %s\n"), parameter);
+  }
+
+#ifdef USE_ENERGY_SENSOR
+  dtostrfd(Energy.voltage[0], Settings.flag2.voltage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE voltage gauge\nvoltage %s\n"), parameter);
+  dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
+  dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE active_power gauge\nactive_power %s\n"), parameter);
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
+#endif
+# 80 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
+  WSContentEnd();
+}
+
+
+
+
+
+bool Xsns91(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/metrics", HandleMetrics);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_interface.ino"
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xsns_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xsns_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XSNS_01
+  &Xsns01,
+#endif
+
+#ifdef XSNS_02
+  &Xsns02,
+#endif
+
+#ifdef XSNS_03
+  &Xsns03,
+#endif
+
+#ifdef XSNS_04
+  &Xsns04,
+#endif
+
+#ifdef XSNS_05
+  &Xsns05,
+#endif
+
+#ifdef XSNS_06
+  &Xsns06,
+#endif
+
+#ifdef XSNS_07
+  &Xsns07,
+#endif
+
+#ifdef XSNS_08
+  &Xsns08,
+#endif
+
+#ifdef XSNS_09
+  &Xsns09,
+#endif
+
+#ifdef XSNS_10
+  &Xsns10,
+#endif
+
+#ifdef XSNS_11
+  &Xsns11,
+#endif
+
+#ifdef XSNS_12
+  &Xsns12,
+#endif
+
+#ifdef XSNS_13
+  &Xsns13,
+#endif
+
+#ifdef XSNS_14
+  &Xsns14,
+#endif
+
+#ifdef XSNS_15
+  &Xsns15,
+#endif
+
+#ifdef XSNS_16
+  &Xsns16,
+#endif
+
+#ifdef XSNS_17
+  &Xsns17,
+#endif
+
+#ifdef XSNS_18
+  &Xsns18,
+#endif
+
+#ifdef XSNS_19
+  &Xsns19,
+#endif
+
+#ifdef XSNS_20
+  &Xsns20,
+#endif
+
+#ifdef XSNS_21
+  &Xsns21,
+#endif
+
+#ifdef XSNS_22
+  &Xsns22,
+#endif
+
+#ifdef XSNS_23
+  &Xsns23,
+#endif
+
+#ifdef XSNS_24
+  &Xsns24,
+#endif
+
+#ifdef XSNS_25
+  &Xsns25,
+#endif
+
+#ifdef XSNS_26
+  &Xsns26,
+#endif
+
+#ifdef XSNS_27
+  &Xsns27,
+#endif
+
+#ifdef XSNS_28
+  &Xsns28,
+#endif
+
+#ifdef XSNS_29
+  &Xsns29,
+#endif
+
+#ifdef XSNS_30
+  &Xsns30,
+#endif
+
+#ifdef XSNS_31
+  &Xsns31,
+#endif
+
+#ifdef XSNS_32
+  &Xsns32,
+#endif
+
+#ifdef XSNS_33
+  &Xsns33,
+#endif
+
+#ifdef XSNS_34
+  &Xsns34,
+#endif
+
+#ifdef XSNS_35
+  &Xsns35,
+#endif
+
+#ifdef XSNS_36
+  &Xsns36,
+#endif
+
+#ifdef XSNS_37
+  &Xsns37,
+#endif
+
+#ifdef XSNS_38
+  &Xsns38,
+#endif
+
+#ifdef XSNS_39
+  &Xsns39,
+#endif
+
+#ifdef XSNS_40
+  &Xsns40,
+#endif
+
+#ifdef XSNS_41
+  &Xsns41,
+#endif
+
+#ifdef XSNS_42
+  &Xsns42,
+#endif
+
+#ifdef XSNS_43
+  &Xsns43,
+#endif
+
+#ifdef XSNS_44
+  &Xsns44,
+#endif
+
+#ifdef XSNS_45
+  &Xsns45,
+#endif
+
+#ifdef XSNS_46
+  &Xsns46,
+#endif
+
+#ifdef XSNS_47
+  &Xsns47,
+#endif
+
+#ifdef XSNS_48
+  &Xsns48,
+#endif
+
+#ifdef XSNS_49
+  &Xsns49,
+#endif
+
+#ifdef XSNS_50
+  &Xsns50,
+#endif
+
+#ifdef XSNS_51
+  &Xsns51,
+#endif
+
+#ifdef XSNS_52
+  &Xsns52,
+#endif
+
+#ifdef XSNS_53
+  &Xsns53,
+#endif
+
+#ifdef XSNS_54
+  &Xsns54,
+#endif
+
+#ifdef XSNS_55
+  &Xsns55,
+#endif
+
+#ifdef XSNS_56
+  &Xsns56,
+#endif
+
+#ifdef XSNS_57
+  &Xsns57,
+#endif
+
+#ifdef XSNS_58
+  &Xsns58,
+#endif
+
+#ifdef XSNS_59
+  &Xsns59,
+#endif
+
+#ifdef XSNS_60
+  &Xsns60,
+#endif
+
+#ifdef XSNS_61
+  &Xsns61,
+#endif
+
+#ifdef XSNS_62
+  &Xsns62,
+#endif
+
+#ifdef XSNS_63
+  &Xsns63,
+#endif
+
+#ifdef XSNS_64
+  &Xsns64,
+#endif
+
+#ifdef XSNS_65
+  &Xsns65,
+#endif
+
+#ifdef XSNS_66
+  &Xsns66,
+#endif
+
+#ifdef XSNS_67
+  &Xsns67,
+#endif
+
+#ifdef XSNS_68
+  &Xsns68,
+#endif
+
+#ifdef XSNS_69
+  &Xsns69,
+#endif
+
+#ifdef XSNS_70
+  &Xsns70,
+#endif
+
+#ifdef XSNS_71
+  &Xsns71,
+#endif
+
+#ifdef XSNS_72
+  &Xsns72,
+#endif
+
+#ifdef XSNS_73
+  &Xsns73,
+#endif
+
+#ifdef XSNS_74
+  &Xsns74,
+#endif
+
+#ifdef XSNS_75
+  &Xsns75,
+#endif
+
+#ifdef XSNS_76
+  &Xsns76,
+#endif
+
+#ifdef XSNS_77
+  &Xsns77,
+#endif
+
+#ifdef XSNS_78
+  &Xsns78,
+#endif
+
+#ifdef XSNS_79
+  &Xsns79,
+#endif
+
+#ifdef XSNS_80
+  &Xsns80,
+#endif
+
+#ifdef XSNS_81
+  &Xsns81,
+#endif
+
+#ifdef XSNS_82
+  &Xsns82,
+#endif
+
+#ifdef XSNS_83
+  &Xsns83,
+#endif
+
+#ifdef XSNS_84
+  &Xsns84,
+#endif
+
+#ifdef XSNS_85
+  &Xsns85,
+#endif
+
+#ifdef XSNS_86
+  &Xsns86,
+#endif
+
+#ifdef XSNS_87
+  &Xsns87,
+#endif
+
+#ifdef XSNS_88
+  &Xsns88,
+#endif
+
+#ifdef XSNS_89
+  &Xsns89,
+#endif
+
+#ifdef XSNS_90
+  &Xsns90,
+#endif
+
+#ifdef XSNS_91
+  &Xsns91,
+#endif
+
+#ifdef XSNS_92
+  &Xsns92,
+#endif
+
+#ifdef XSNS_93
+  &Xsns93,
+#endif
+
+#ifdef XSNS_94
+  &Xsns94,
+#endif
+
+#ifdef XSNS_95
+  &Xsns95,
+#endif
+
+#ifdef XSNS_96
+  &Xsns96,
+#endif
+
+#ifdef XSNS_97
+  &Xsns97,
+#endif
+
+#ifdef XSNS_98
+  &Xsns98,
+#endif
+
+#ifdef XSNS_99
+  &Xsns99
+#endif
+};
+
+const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]);
+
+
+
+
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kXsnsList[] PROGMEM = {
+#else
+const uint8_t kXsnsList[] = {
+#endif
+
+#ifdef XSNS_01
+  XSNS_01,
+#endif
+
+#ifdef XSNS_02
+  XSNS_02,
+#endif
+
+#ifdef XSNS_03
+  XSNS_03,
+#endif
+
+#ifdef XSNS_04
+  XSNS_04,
+#endif
+
+#ifdef XSNS_05
+  XSNS_05,
+#endif
+
+#ifdef XSNS_06
+  XSNS_06,
+#endif
+
+#ifdef XSNS_07
+  XSNS_07,
+#endif
+
+#ifdef XSNS_08
+  XSNS_08,
+#endif
+
+#ifdef XSNS_09
+  XSNS_09,
+#endif
+
+#ifdef XSNS_10
+  XSNS_10,
+#endif
+
+#ifdef XSNS_11
+  XSNS_11,
+#endif
+
+#ifdef XSNS_12
+  XSNS_12,
+#endif
+
+#ifdef XSNS_13
+  XSNS_13,
+#endif
+
+#ifdef XSNS_14
+  XSNS_14,
+#endif
+
+#ifdef XSNS_15
+  XSNS_15,
+#endif
+
+#ifdef XSNS_16
+  XSNS_16,
+#endif
+
+#ifdef XSNS_17
+  XSNS_17,
+#endif
+
+#ifdef XSNS_18
+  XSNS_18,
+#endif
+
+#ifdef XSNS_19
+  XSNS_19,
+#endif
+
+#ifdef XSNS_20
+  XSNS_20,
+#endif
+
+#ifdef XSNS_21
+  XSNS_21,
+#endif
+
+#ifdef XSNS_22
+  XSNS_22,
+#endif
+
+#ifdef XSNS_23
+  XSNS_23,
+#endif
+
+#ifdef XSNS_24
+  XSNS_24,
+#endif
+
+#ifdef XSNS_25
+  XSNS_25,
+#endif
+
+#ifdef XSNS_26
+  XSNS_26,
+#endif
+
+#ifdef XSNS_27
+  XSNS_27,
+#endif
+
+#ifdef XSNS_28
+  XSNS_28,
+#endif
+
+#ifdef XSNS_29
+  XSNS_29,
+#endif
+
+#ifdef XSNS_30
+  XSNS_30,
+#endif
+
+#ifdef XSNS_31
+  XSNS_31,
+#endif
+
+#ifdef XSNS_32
+  XSNS_32,
+#endif
+
+#ifdef XSNS_33
+  XSNS_33,
+#endif
+
+#ifdef XSNS_34
+  XSNS_34,
+#endif
+
+#ifdef XSNS_35
+  XSNS_35,
+#endif
+
+#ifdef XSNS_36
+  XSNS_36,
+#endif
+
+#ifdef XSNS_37
+  XSNS_37,
+#endif
+
+#ifdef XSNS_38
+  XSNS_38,
+#endif
+
+#ifdef XSNS_39
+  XSNS_39,
+#endif
+
+#ifdef XSNS_40
+  XSNS_40,
+#endif
+
+#ifdef XSNS_41
+  XSNS_41,
+#endif
+
+#ifdef XSNS_42
+  XSNS_42,
+#endif
+
+#ifdef XSNS_43
+  XSNS_43,
+#endif
+
+#ifdef XSNS_44
+  XSNS_44,
+#endif
+
+#ifdef XSNS_45
+  XSNS_45,
+#endif
+
+#ifdef XSNS_46
+  XSNS_46,
+#endif
+
+#ifdef XSNS_47
+  XSNS_47,
+#endif
+
+#ifdef XSNS_48
+  XSNS_48,
+#endif
+
+#ifdef XSNS_49
+  XSNS_49,
+#endif
+
+#ifdef XSNS_50
+  XSNS_50,
+#endif
+
+#ifdef XSNS_51
+  XSNS_51,
+#endif
+
+#ifdef XSNS_52
+  XSNS_52,
+#endif
+
+#ifdef XSNS_53
+  XSNS_53,
+#endif
+
+#ifdef XSNS_54
+  XSNS_54,
+#endif
+
+#ifdef XSNS_55
+  XSNS_55,
+#endif
+
+#ifdef XSNS_56
+  XSNS_56,
+#endif
+
+#ifdef XSNS_57
+  XSNS_57,
+#endif
+
+#ifdef XSNS_58
+  XSNS_58,
+#endif
+
+#ifdef XSNS_59
+  XSNS_59,
+#endif
+
+#ifdef XSNS_60
+  XSNS_60,
+#endif
+
+#ifdef XSNS_61
+  XSNS_61,
+#endif
+
+#ifdef XSNS_62
+  XSNS_62,
+#endif
+
+#ifdef XSNS_63
+  XSNS_63,
+#endif
+
+#ifdef XSNS_64
+  XSNS_64,
+#endif
+
+#ifdef XSNS_65
+  XSNS_65,
+#endif
+
+#ifdef XSNS_66
+  XSNS_66,
+#endif
+
+#ifdef XSNS_67
+  XSNS_67,
+#endif
+
+#ifdef XSNS_68
+  XSNS_68,
+#endif
+
+#ifdef XSNS_69
+  XSNS_69,
+#endif
+
+#ifdef XSNS_70
+  XSNS_70,
+#endif
+
+#ifdef XSNS_71
+  XSNS_71,
+#endif
+
+#ifdef XSNS_72
+  XSNS_72,
+#endif
+
+#ifdef XSNS_73
+  XSNS_73,
+#endif
+
+#ifdef XSNS_74
+  XSNS_74,
+#endif
+
+#ifdef XSNS_75
+  XSNS_75,
+#endif
+
+#ifdef XSNS_76
+  XSNS_76,
+#endif
+
+#ifdef XSNS_77
+  XSNS_77,
+#endif
+
+#ifdef XSNS_78
+  XSNS_78,
+#endif
+
+#ifdef XSNS_79
+  XSNS_79,
+#endif
+
+#ifdef XSNS_80
+  XSNS_80,
+#endif
+
+#ifdef XSNS_81
+  XSNS_81,
+#endif
+
+#ifdef XSNS_82
+  XSNS_82,
+#endif
+
+#ifdef XSNS_83
+  XSNS_83,
+#endif
+
+#ifdef XSNS_84
+  XSNS_84,
+#endif
+
+#ifdef XSNS_85
+  XSNS_85,
+#endif
+
+#ifdef XSNS_86
+  XSNS_86,
+#endif
+
+#ifdef XSNS_87
+  XSNS_87,
+#endif
+
+#ifdef XSNS_88
+  XSNS_88,
+#endif
+
+#ifdef XSNS_89
+  XSNS_89,
+#endif
+
+#ifdef XSNS_90
+  XSNS_90,
+#endif
+
+#ifdef XSNS_91
+  XSNS_91,
+#endif
+
+#ifdef XSNS_92
+  XSNS_92,
+#endif
+
+#ifdef XSNS_93
+  XSNS_93,
+#endif
+
+#ifdef XSNS_94
+  XSNS_94,
+#endif
+
+#ifdef XSNS_95
+  XSNS_95,
+#endif
+
+#ifdef XSNS_96
+  XSNS_96,
+#endif
+
+#ifdef XSNS_97
+  XSNS_97,
+#endif
+
+#ifdef XSNS_98
+  XSNS_98,
+#endif
+
+#ifdef XSNS_99
+  XSNS_99
+#endif
+};
+
+
+
+bool XsnsEnabled(uint32_t sns_index)
+{
+  if (sns_index < sizeof(kXsnsList)) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t index = pgm_read_byte(kXsnsList + sns_index);
+#else
+    uint32_t index = kXsnsList[sns_index];
+#endif
+    return bitRead(Settings.sensors[index / 32], index % 32);
+  }
+  return true;
+}
+
+void XsnsSensorState(void)
+{
+  ResponseAppend_P(PSTR("\""));
+  for (uint32_t i = 0; i < sizeof(kXsnsList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t sensorid = pgm_read_byte(kXsnsList + i);
+#else
+    uint32_t sensorid = kXsnsList[i];
+#endif
+    bool disabled = false;
+    if (sensorid < MAX_XSNS_DRIVERS) {
+      disabled = !bitRead(Settings.sensors[sensorid / 32], sensorid % 32);
+    }
+    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", sensorid);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+
+
+
+
+bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index)
+{
+  xsns_index++;
+  if (xsns_index == xsns_present) { xsns_index = 0; }
+
+#ifndef USE_DEBUG_DRIVER
+  if (FUNC_WEB_SENSOR == Function) {
+#endif
+    uint32_t max_disabled = xsns_present;
+    while (!XsnsEnabled(xsns_index) && max_disabled--) {
+      xsns_index++;
+      if (xsns_index == xsns_present) { xsns_index = 0; }
+    }
+#ifndef USE_DEBUG_DRIVER
+  }
+#endif
+
+  return xsns_func_ptr[xsns_index](Function);
+}
+
+bool XsnsCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
+
+#ifdef PROFILE_XSNS_EVERY_SECOND
+  uint32_t profile_start_millis = millis();
+#endif
+
+  for (uint32_t x = 0; x < xsns_present; x++) {
+#ifdef USE_DEBUG_DRIVER
+    if (XsnsEnabled(x)) {
+#endif
+
+      if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(x)) { continue; }
+
+#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
+      uint32_t profile_start_millis = millis();
+#endif
+      result = xsns_func_ptr[x](Function);
+
+#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
+      uint32_t profile_millis = millis() - profile_start_millis;
+      if (profile_millis) {
+        if (FUNC_EVERY_SECOND == Function) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d to Sensor %d took %u mS"), uptime, Function, x, profile_millis);
+        }
+      }
+#endif
+
+      if (result && ((FUNC_COMMAND == Function) ||
+                     (FUNC_PIN_STATE == Function) ||
+                     (FUNC_COMMAND_SENSOR == Function)
+                    )) {
+        break;
+      }
+#ifdef USE_DEBUG_DRIVER
+    }
+#endif
+  }
+
+#ifdef PROFILE_XSNS_EVERY_SECOND
+  uint32_t profile_millis = millis() - profile_start_millis;
+  if (profile_millis) {
+    if (FUNC_EVERY_SECOND == Function) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d took %u mS"), uptime, Function, profile_millis);
+    }
+  }
+#endif
+
+  return result;
+}
+# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xx2c_interface.ino"
+# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xx2c_interface.ino"
+#ifdef USE_I2C
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kI2cList[] PROGMEM = {
+#else
+const uint8_t kI2cList[] = {
+#endif
+
+#ifdef XI2C_01
+  XI2C_01,
+#endif
+
+#ifdef XI2C_02
+  XI2C_02,
+#endif
+
+#ifdef XI2C_03
+  XI2C_03,
+#endif
+
+#ifdef XI2C_04
+  XI2C_04,
+#endif
+
+#ifdef XI2C_05
+  XI2C_05,
+#endif
+
+#ifdef XI2C_06
+  XI2C_06,
+#endif
+
+#ifdef XI2C_07
+  XI2C_07,
+#endif
+
+#ifdef XI2C_08
+  XI2C_08,
+#endif
+
+#ifdef XI2C_09
+  XI2C_09,
+#endif
+
+#ifdef XI2C_10
+  XI2C_10,
+#endif
+
+#ifdef XI2C_11
+  XI2C_11,
+#endif
+
+#ifdef XI2C_12
+  XI2C_12,
+#endif
+
+#ifdef XI2C_13
+  XI2C_13,
+#endif
+
+#ifdef XI2C_14
+  XI2C_14,
+#endif
+
+#ifdef XI2C_15
+  XI2C_15,
+#endif
+
+#ifdef XI2C_16
+  XI2C_16,
+#endif
+
+#ifdef XI2C_17
+  XI2C_17,
+#endif
+
+#ifdef XI2C_18
+  XI2C_18,
+#endif
+
+#ifdef XI2C_19
+  XI2C_19,
+#endif
+
+#ifdef XI2C_20
+  XI2C_20,
+#endif
+
+#ifdef XI2C_21
+  XI2C_21,
+#endif
+
+#ifdef XI2C_22
+  XI2C_22,
+#endif
+
+#ifdef XI2C_23
+  XI2C_23,
+#endif
+
+#ifdef XI2C_24
+  XI2C_24,
+#endif
+
+#ifdef XI2C_25
+  XI2C_25,
+#endif
+
+#ifdef XI2C_26
+  XI2C_26,
+#endif
+
+#ifdef XI2C_27
+  XI2C_27,
+#endif
+
+#ifdef XI2C_28
+  XI2C_28,
+#endif
+
+#ifdef XI2C_29
+  XI2C_29,
+#endif
+
+#ifdef XI2C_30
+  XI2C_30,
+#endif
+
+#ifdef XI2C_31
+  XI2C_31,
+#endif
+
+#ifdef XI2C_32
+  XI2C_32,
+#endif
+
+#ifdef XI2C_33
+  XI2C_33,
+#endif
+
+#ifdef XI2C_34
+  XI2C_34,
+#endif
+
+#ifdef XI2C_35
+  XI2C_35,
+#endif
+
+#ifdef XI2C_36
+  XI2C_36,
+#endif
+
+#ifdef XI2C_37
+  XI2C_37,
+#endif
+
+#ifdef XI2C_38
+  XI2C_38,
+#endif
+
+#ifdef XI2C_39
+  XI2C_39,
+#endif
+
+#ifdef XI2C_40
+  XI2C_40,
+#endif
+
+#ifdef XI2C_41
+  XI2C_41,
+#endif
+
+#ifdef XI2C_42
+  XI2C_42,
+#endif
+
+#ifdef XI2C_43
+  XI2C_43,
+#endif
+
+#ifdef XI2C_44
+  XI2C_44,
+#endif
+
+#ifdef XI2C_45
+  XI2C_45,
+#endif
+
+#ifdef XI2C_46
+  XI2C_46,
+#endif
+
+#ifdef XI2C_47
+  XI2C_47,
+#endif
+
+#ifdef XI2C_48
+  XI2C_48,
+#endif
+
+#ifdef XI2C_49
+  XI2C_49,
+#endif
+
+#ifdef XI2C_50
+  XI2C_50,
+#endif
+
+#ifdef XI2C_51
+  XI2C_51,
+#endif
+
+#ifdef XI2C_52
+  XI2C_52,
+#endif
+
+#ifdef XI2C_53
+  XI2C_53,
+#endif
+
+#ifdef XI2C_54
+  XI2C_54,
+#endif
+
+#ifdef XI2C_55
+  XI2C_55,
+#endif
+
+#ifdef XI2C_56
+  XI2C_56,
+#endif
+
+#ifdef XI2C_57
+  XI2C_57,
+#endif
+
+#ifdef XI2C_58
+  XI2C_58,
+#endif
+
+#ifdef XI2C_59
+  XI2C_59,
+#endif
+
+#ifdef XI2C_60
+  XI2C_60,
+#endif
+
+#ifdef XI2C_61
+  XI2C_61,
+#endif
+
+#ifdef XI2C_62
+  XI2C_62,
+#endif
+
+#ifdef XI2C_63
+  XI2C_63,
+#endif
+
+#ifdef XI2C_64
+  XI2C_64,
+#endif
+
+#ifdef XI2C_65
+  XI2C_65,
+#endif
+
+#ifdef XI2C_66
+  XI2C_66,
+#endif
+
+#ifdef XI2C_67
+  XI2C_67,
+#endif
+
+#ifdef XI2C_68
+  XI2C_68,
+#endif
+
+#ifdef XI2C_69
+  XI2C_69,
+#endif
+
+#ifdef XI2C_70
+  XI2C_70,
+#endif
+
+#ifdef XI2C_71
+  XI2C_71,
+#endif
+
+#ifdef XI2C_72
+  XI2C_72,
+#endif
+
+#ifdef XI2C_73
+  XI2C_73,
+#endif
+
+#ifdef XI2C_74
+  XI2C_74,
+#endif
+
+#ifdef XI2C_75
+  XI2C_75,
+#endif
+
+#ifdef XI2C_76
+  XI2C_76,
+#endif
+
+#ifdef XI2C_77
+  XI2C_77,
+#endif
+
+#ifdef XI2C_78
+  XI2C_78,
+#endif
+
+#ifdef XI2C_79
+  XI2C_79,
+#endif
+
+#ifdef XI2C_80
+  XI2C_80,
+#endif
+
+#ifdef XI2C_81
+  XI2C_81,
+#endif
+
+#ifdef XI2C_82
+  XI2C_82,
+#endif
+
+#ifdef XI2C_83
+  XI2C_83,
+#endif
+
+#ifdef XI2C_84
+  XI2C_84,
+#endif
+
+#ifdef XI2C_85
+  XI2C_85,
+#endif
+
+#ifdef XI2C_86
+  XI2C_86,
+#endif
+
+#ifdef XI2C_87
+  XI2C_87,
+#endif
+
+#ifdef XI2C_88
+  XI2C_88,
+#endif
+
+#ifdef XI2C_89
+  XI2C_89,
+#endif
+
+#ifdef XI2C_90
+  XI2C_90,
+#endif
+
+#ifdef XI2C_91
+  XI2C_91,
+#endif
+
+#ifdef XI2C_92
+  XI2C_92,
+#endif
+
+#ifdef XI2C_93
+  XI2C_93,
+#endif
+
+#ifdef XI2C_94
+  XI2C_94,
+#endif
+
+#ifdef XI2C_95
+  XI2C_95,
+#endif
+
+#ifdef XI2C_96
+  XI2C_96
+#endif
+};
+
+
+
+bool I2cEnabled(uint32_t i2c_index)
+{
+  return (i2c_flg && bitRead(Settings.i2c_drivers[i2c_index / 32], i2c_index % 32));
+}
+
+void I2cDriverState(void)
+{
+  ResponseAppend_P(PSTR("\""));
+  for (uint32_t i = 0; i < sizeof(kI2cList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t i2c_driver_id = pgm_read_byte(kI2cList + i);
+#else
+    uint32_t i2c_driver_id = kI2cList[i];
+#endif
+    bool disabled = false;
+    if (i2c_driver_id < MAX_I2C_DRIVERS) {
+      disabled = !bitRead(Settings.i2c_drivers[i2c_driver_id / 32], i2c_driver_id % 32);
+    }
+    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", i2c_driver_id);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+#endif
\ No newline at end of file

From 2e0a06c19aae33fe030245ece2c938c5e0fdda24 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:49:53 +0100
Subject: [PATCH 276/403] structual changes

structual changes
---
 tasmota/xsns_64_aht10.ino | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_64_aht10.ino
index 15dbbb5c1..00a9a262c 100644
--- a/tasmota/xsns_64_aht10.ino
+++ b/tasmota/xsns_64_aht10.ino
@@ -56,12 +56,12 @@ bool begin()
     else
     {
         return false;
-    }   
+    }
 }
 
 bool AHT10Read(void)
 {
-  unsigned long result, temp[6];
+  unsigned long result_t, result_h, temp[6];
 
   if (AHT10.valid) { AHT10.valid--; }
 
@@ -69,15 +69,17 @@ bool AHT10Read(void)
     Wire.write(eSensorMeasureCmd, 3);
     Wire.endTransmission();
     delay(100);
-    
-    Wire.requestFrom(AHT10_ADDR, 6);  
+
+    Wire.requestFrom(AHT10_ADDR, 6);
     for(unsigned char i = 0; Wire.available() > 0; i++)
     {
         temp[i] = Wire.read();
-    }   
+    }
+    result_h = ((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4;
+    result_t = ((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5];
 
-  AHT10.humidity = (((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4)* 100 / 1048576;
-  AHT10.temperature  =  ((200 * (((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5])) / 1048576) - 50;
+  AHT10.humidity = result_h * 100 / 1048576;
+  AHT10.temperature  =  ((200 * result_t) / 1048576) - 50;
 
   if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
 
@@ -97,12 +99,12 @@ unsigned char readStatus(void)
 
 void AHT10Detect(void)
 {
-  if (I2cActive(AHT10_ADDR)) 
-  { 
-  return; 
+  if (I2cActive(AHT10_ADDR))
+  {
+  return;
   }
 
-  if (begin()) 
+  if (begin())
   {
     I2cSetActiveFound(AHT10_ADDR, AHT10.name);
     AHT10.count = 1;

From b423c9716a7bf4318d99f9abe5e5780f900cbeb7 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:56:23 +0100
Subject: [PATCH 277/403] Update xsns_64_aht10.ino

---
 tasmota/xsns_64_aht10.ino | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_64_aht10.ino
index 00a9a262c..f45ca3f4f 100644
--- a/tasmota/xsns_64_aht10.ino
+++ b/tasmota/xsns_64_aht10.ino
@@ -91,7 +91,6 @@ bool AHT10Read(void)
 unsigned char readStatus(void)
 {
     unsigned char result = 0;
-
     Wire.requestFrom(AHT10_ADDR, 1);
     result = Wire.read();
     return result;
@@ -100,9 +99,7 @@ unsigned char readStatus(void)
 void AHT10Detect(void)
 {
   if (I2cActive(AHT10_ADDR))
-  {
-  return;
-  }
+  {return;}
 
   if (begin())
   {

From df3441786186cc2155ba76b0e1d2a2bb035cc93e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 18 Feb 2020 18:10:36 +0100
Subject: [PATCH 278/403] Fix DS18x20 driver

---
 tasmota/xsns_05_ds18x20.ino | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tasmota/xsns_05_ds18x20.ino b/tasmota/xsns_05_ds18x20.ino
index ba87e3a5d..5b46d5519 100644
--- a/tasmota/xsns_05_ds18x20.ino
+++ b/tasmota/xsns_05_ds18x20.ino
@@ -126,6 +126,8 @@ void OneWireWriteBit(uint8_t v)
   delayMicroseconds(delay_high[v]);
 }
 
+/*
+// Fails for reasons unknown to me
 uint8_t OneWireReadBit(void)
 {
   if (!ds18x20_dual_mode) {
@@ -143,6 +145,35 @@ uint8_t OneWireReadBit(void)
   delayMicroseconds(53);
   return r;
 }
+*/
+// Works fine in contrast to above. Why?
+void OneWireReadBit1(void)
+{
+  pinMode(ds18x20_pin, OUTPUT);
+  digitalWrite(ds18x20_pin, LOW);
+  delayMicroseconds(3);
+  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);  // SetOption74 - Enable internal pullup for single DS18x20 sensor
+}
+
+void OneWireReadBit2(void)
+{
+  digitalWrite(ds18x20_pin_out, LOW);
+  delayMicroseconds(3);
+  digitalWrite(ds18x20_pin_out, HIGH);
+}
+
+uint8_t OneWireReadBit(void)
+{
+  if (!ds18x20_dual_mode) {
+    OneWireReadBit1();
+  } else {
+    OneWireReadBit2();
+  }
+  delayMicroseconds(10);
+  uint8_t r = digitalRead(ds18x20_pin);
+  delayMicroseconds(53);
+  return r;
+}
 
 /*------------------------------------------------------------------------------------------*/
 
@@ -284,6 +315,7 @@ void Ds18x20Init(void)
   uint64_t ids[DS18X20_MAX_SENSORS];
 
   ds18x20_pin = pin[GPIO_DSB];
+
   if (pin[GPIO_DSB_OUT] < 99) {
     ds18x20_pin_out = pin[GPIO_DSB_OUT];
     ds18x20_dual_mode = true;    // Dual pins mode as used by Shelly
@@ -419,6 +451,8 @@ void Ds18x20Name(uint8_t sensor)
 
 void Ds18x20EverySecond(void)
 {
+  if (!ds18x20_sensors) { return; }
+
 #ifdef W1_PARASITE_POWER
   // skip access if there is still an eeprom write ongoing
   unsigned long now = millis();

From e2ede9ed5543c36d03210d09abe0dff51c70da0c Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:08:22 +0100
Subject: [PATCH 279/403] Add Reset Command

---
 tasmota/xsns_64_aht10.ino | 42 +++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_64_aht10.ino
index f45ca3f4f..7405c5537 100644
--- a/tasmota/xsns_64_aht10.ino
+++ b/tasmota/xsns_64_aht10.ino
@@ -43,21 +43,6 @@ struct AHT10 {
   char    name[6] = "AHT10";
 } AHT10;
 
-bool begin()
-{
-    Wire.begin(AHT10_ADDR);
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorCalibrateCmd, 3);
-    Wire.endTransmission();
-    delay(500);
-
-    if((readStatus() & 0x68) == 0x08)
-        return true;
-    else
-    {
-        return false;
-    }
-}
 
 bool AHT10Read(void)
 {
@@ -88,7 +73,21 @@ bool AHT10Read(void)
 }
 
 /********************************************************************************************/
-unsigned char readStatus(void)
+bool aht10init()
+{
+    Wire.begin(AHT10_ADDR);
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorCalibrateCmd, 3);
+    Wire.endTransmission();
+    delay(500);
+
+    if((aht10ReadStatus() & 0x68) == 0x08) {
+        return true;}
+    else
+      { return false; }
+}
+
+unsigned char aht10ReadStatus(void)
 {
     unsigned char result = 0;
     Wire.requestFrom(AHT10_ADDR, 1);
@@ -96,12 +95,21 @@ unsigned char readStatus(void)
     return result;
 }
 
+void aht10Reset(void)
+{
+    Wire.beginTransmission(AHT10_ADDR);
+    Wire.write(eSensorResetCmd);
+    Wire.endTransmission();
+    delay(20);
+}
+
+/********************************************************************************************/
 void AHT10Detect(void)
 {
   if (I2cActive(AHT10_ADDR))
   {return;}
 
-  if (begin())
+  if (aht10init())
   {
     I2cSetActiveFound(AHT10_ADDR, AHT10.name);
     AHT10.count = 1;

From 81b88a71a084ff83e6e975a1114d320ac16b38f3 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:13:12 +0100
Subject: [PATCH 280/403] Update xsns_64_aht10.ino

Correct text
---
 tasmota/xsns_64_aht10.ino | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_64_aht10.ino
index 7405c5537..95d5a3e2b 100644
--- a/tasmota/xsns_64_aht10.ino
+++ b/tasmota/xsns_64_aht10.ino
@@ -73,7 +73,7 @@ bool AHT10Read(void)
 }
 
 /********************************************************************************************/
-bool aht10init()
+bool AHT10Init()
 {
     Wire.begin(AHT10_ADDR);
     Wire.beginTransmission(AHT10_ADDR);
@@ -81,13 +81,13 @@ bool aht10init()
     Wire.endTransmission();
     delay(500);
 
-    if((aht10ReadStatus() & 0x68) == 0x08) {
+    if((AHT10ReadStatus() & 0x68) == 0x08) {
         return true;}
     else
       { return false; }
 }
 
-unsigned char aht10ReadStatus(void)
+unsigned char AHT10ReadStatus(void)
 {
     unsigned char result = 0;
     Wire.requestFrom(AHT10_ADDR, 1);
@@ -95,7 +95,7 @@ unsigned char aht10ReadStatus(void)
     return result;
 }
 
-void aht10Reset(void)
+void AHT10Reset(void)
 {
     Wire.beginTransmission(AHT10_ADDR);
     Wire.write(eSensorResetCmd);
@@ -109,7 +109,7 @@ void AHT10Detect(void)
   if (I2cActive(AHT10_ADDR))
   {return;}
 
-  if (aht10init())
+  if (AHT10Init())
   {
     I2cSetActiveFound(AHT10_ADDR, AHT10.name);
     AHT10.count = 1;

From 6e0cd5bd68df595d31e63d744a48432b7327aa53 Mon Sep 17 00:00:00 2001
From: David Gwynne <david@gwynne.id.au>
Date: Wed, 19 Feb 2020 18:10:07 +1100
Subject: [PATCH 281/403] print numbers as numbers in json, not strings.

---
 tasmota/xdrv_16_tuyamcu.ino | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index 11b134489..f250f6409 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -696,14 +696,14 @@ void TuyaSerialInput(void)
             if (TUYA_CMD_STATE == Tuya.buffer[3]) {
               ResponseAppend_P(PSTR(",\"DpType%uId%u\":"), dpDataType, dpId);
               if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
-                ResponseAppend_P(PSTR("\"%u\""), dpData[0]);
+                ResponseAppend_P(PSTR("%u"), dpData[0]);
               } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
                 uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
-                ResponseAppend_P(PSTR("\"%u\""), dpValue);
+                ResponseAppend_P(PSTR("%u"), dpValue);
               } else if (TUYA_TYPE_STRING == dpDataType) {
                 ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
               } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
-                ResponseAppend_P(PSTR("\"%u\""), dpData[0]);
+                ResponseAppend_P(PSTR("%u"), dpData[0]);
               } else {
                 ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
               }

From 7f72d266f8eb5a38013c0cca20e76c3412958aa0 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Wed, 19 Feb 2020 09:37:36 +0100
Subject: [PATCH 282/403] prepare for merging

---
 I2CDEVICES.md                                 |     2 +-
 tasmota/my_user_config.h                      |     2 +-
 tasmota/support_features.ino                  |     4 +-
 tasmota/tasmota.ino.cpp                       | 77284 ----------------
 .../{xsns_64_aht10.ino => xsns_63_aht1x.ino}  |    15 +-
 5 files changed, 12 insertions(+), 77295 deletions(-)
 delete mode 100644 tasmota/tasmota.ino.cpp
 rename tasmota/{xsns_64_aht10.ino => xsns_63_aht1x.ino} (94%)

diff --git a/I2CDEVICES.md b/I2CDEVICES.md
index be92d03dc..b607b3241 100644
--- a/I2CDEVICES.md
+++ b/I2CDEVICES.md
@@ -64,4 +64,4 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
   42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
   42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
-  43  | USE_AHT10           | xsns_64 | AHT10    | 0x38        | Temperature and humidity sensor
+  43  | USE_AHT1x           | xsns_63 | AHT10/15 | 0x38        | Temperature and humidity sensor
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 04395065a..7f7fa3a45 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -486,7 +486,7 @@
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 //  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
-  #define USE_AHT10                              // [I2cDriver43] Enable AHT10 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
+  #define USE_AHT1x                              // [I2cDriver43] Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 933db0960..648235f12 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -513,8 +513,8 @@ void GetFeatures(void)
 #ifdef USE_LE01MR
   feature5 |= 0x08000000;  // xnrg_13_fif_le01mr.ino
 #endif
-#ifdef USE_AHT10
-  feature5 |= 0x10000000;  // xsns_64_aht10.ino
+#ifdef USE_AHT1x
+  feature5 |= 0x10000000;  // xsns_63_aht1x.ino
 #endif
 //  feature5 |= 0x10000000;
 //  feature5 |= 0x20000000;
diff --git a/tasmota/tasmota.ino.cpp b/tasmota/tasmota.ino.cpp
deleted file mode 100644
index ddd9b7b19..000000000
--- a/tasmota/tasmota.ino.cpp
+++ /dev/null
@@ -1,77284 +0,0 @@
-# 1 "C:\\Users\\martin\\AppData\\Local\\Temp\\tmpeqetuoko"
-#include <Arduino.h>
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
-# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
-#include <core_version.h>
-#include "tasmota_version.h"
-#include "tasmota.h"
-#include "my_user_config.h"
-#ifdef USE_MQTT_TLS
-  #include <t_bearssl.h>
-#endif
-#include "tasmota_post.h"
-#include "i18n.h"
-#include "tasmota_template.h"
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_4_0
-#include "lwip/init.h"
-#if LWIP_VERSION_MAJOR != 1
-  #error Please use stable lwIP v1.4
-#endif
-#endif
-
-
-#include <ESP8266HTTPClient.h>
-#include <ESP8266httpUpdate.h>
-#include <StreamString.h>
-#include <ArduinoJson.h>
-#ifdef USE_ARDUINO_OTA
-  #include <ArduinoOTA.h>
-  #ifndef USE_DISCOVERY
-  #define USE_DISCOVERY
-  #endif
-#endif
-#ifdef USE_DISCOVERY
-  #include <ESP8266mDNS.h>
-#endif
-#ifdef USE_I2C
-  #include <Wire.h>
-#endif
-#ifdef USE_SPI
-  #include <SPI.h>
-#endif
-
-
-#include "settings.h"
-
-
-
-
-
-WiFiUDP PortUdp;
-
-unsigned long feature_drv1;
-unsigned long feature_drv2;
-unsigned long feature_sns1;
-unsigned long feature_sns2;
-unsigned long feature5;
-unsigned long feature6;
-unsigned long serial_polling_window = 0;
-unsigned long state_second = 0;
-unsigned long state_50msecond = 0;
-unsigned long state_100msecond = 0;
-unsigned long state_250msecond = 0;
-unsigned long pulse_timer[MAX_PULSETIMERS] = { 0 };
-unsigned long blink_timer = 0;
-unsigned long backlog_delay = 0;
-power_t power = 0;
-power_t last_power = 0;
-power_t blink_power;
-power_t blink_mask = 0;
-power_t blink_powersave;
-power_t latching_power = 0;
-power_t rel_inverted = 0;
-int serial_in_byte_counter = 0;
-int ota_state_flag = 0;
-int ota_result = 0;
-int restart_flag = 0;
-int wifi_state_flag = WIFI_RESTART;
-int blinks = 201;
-uint32_t uptime = 0;
-uint32_t loop_load_avg = 0;
-uint32_t global_update = 0;
-uint32_t web_log_index = 1;
-float global_temperature = 9999;
-float global_humidity = 0;
-float global_pressure = 0;
-uint16_t tele_period = 9999;
-uint16_t blink_counter = 0;
-uint16_t seriallog_timer = 0;
-uint16_t syslog_timer = 0;
-int16_t save_data_counter;
-RulesBitfield rules_flag;
-uint8_t mqtt_cmnd_blocked = 0;
-uint8_t mqtt_cmnd_blocked_reset = 0;
-uint8_t state_250mS = 0;
-uint8_t latching_relay_pulse = 0;
-uint8_t sleep;
-uint8_t blinkspeed = 1;
-uint8_t pin[GPIO_MAX];
-uint8_t active_device = 1;
-uint8_t leds_present = 0;
-uint8_t led_inverted = 0;
-uint8_t led_power = 0;
-uint8_t ledlnk_inverted = 0;
-uint8_t pwm_inverted = 0;
-uint8_t energy_flg = 0;
-uint8_t light_flg = 0;
-uint8_t light_type = 0;
-uint8_t serial_in_byte;
-uint8_t ota_retry_counter = OTA_ATTEMPTS;
-uint8_t devices_present = 0;
-uint8_t seriallog_level;
-uint8_t syslog_level;
-uint8_t my_module_type;
-uint8_t my_adc0;
-uint8_t last_source = 0;
-uint8_t shutters_present = 0;
-uint8_t prepped_loglevel = 0;
-
-bool serial_local = false;
-bool fallback_topic_flag = false;
-bool backlog_mutex = false;
-bool interlock_mutex = false;
-bool stop_flash_rotate = false;
-bool blinkstate = false;
-
-bool pwm_present = false;
-bool i2c_flg = false;
-bool spi_flg = false;
-bool soft_spi_flg = false;
-bool ntp_force_sync = false;
-bool is_8285 = false;
-myio my_module;
-gpio_flag my_module_flag;
-StateBitfield global_state;
-char my_version[33];
-char my_image[33];
-char my_hostname[33];
-char mqtt_client[TOPSZ];
-char mqtt_topic[TOPSZ];
-char serial_in_buffer[INPUT_BUFFER_SIZE];
-char mqtt_data[MESSZ];
-char log_data[LOGSZ];
-char web_log[WEB_LOG_SIZE] = {'\0'};
-#ifdef SUPPORT_IF_STATEMENT
-  #include <LinkedList.h>
-  LinkedList<String> backlog;
-  #define BACKLOG_EMPTY (backlog.size() == 0)
-#else
-  uint8_t backlog_index = 0;
-  uint8_t backlog_pointer = 0;
-  String backlog[MAX_BACKLOG];
-  #define BACKLOG_EMPTY (backlog_pointer == backlog_index)
-#endif
-void setup(void);
-void BacklogLoop(void);
-void loop(void);
-uint16_t SendMail(char *buffer);
-uint32_t GetRtcSettingsCrc(void);
-void RtcSettingsSave(void);
-void RtcSettingsLoad(void);
-bool RtcSettingsValid(void);
-uint32_t GetRtcRebootCrc(void);
-void RtcRebootSave(void);
-void RtcRebootReset(void);
-void RtcRebootLoad(void);
-bool RtcRebootValid(void);
-void SetFlashModeDout(void);
-bool VersionCompatible(void);
-void SettingsBufferFree(void);
-bool SettingsBufferAlloc(void);
-uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size);
-uint16_t GetSettingsCrc(void);
-uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size);
-uint32_t GetSettingsCrc32(void);
-void SettingsSaveAll(void);
-void UpdateQuickPowerCycle(bool update);
-uint32_t GetSettingsTextLen(void);
-bool SettingsUpdateText(uint32_t index, const char* replace_me);
-char* SettingsText(uint32_t index);
-uint32_t GetSettingsAddress(void);
-void SettingsSave(uint8_t rotate);
-void SettingsLoad(void);
-void EspErase(uint32_t start_sector, uint32_t end_sector);
-void SettingsErase(uint8_t type);
-void SettingsSdkErase(void);
-void SettingsDefault(void);
-void SettingsDefaultSet1(void);
-void SettingsDefaultSet2(void);
-void SettingsResetStd(void);
-void SettingsResetDst(void);
-void SettingsDefaultWebColor(void);
-void SettingsEnableAllI2cDrivers(void);
-void SettingsDelta(void);
-void OsWatchTicker(void);
-void OsWatchInit(void);
-void OsWatchLoop(void);
-bool OsWatchBlockedLoop(void);
-uint32_t ResetReason(void);
-String GetResetReason(void);
-size_t strchrspn(const char *str1, int character);
-char* subStr(char* dest, char* str, const char *delim, int index);
-float CharToFloat(const char *str);
-int TextToInt(char *str);
-char* ulltoa(unsigned long long value, char *str, int radix);
-char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween);
-char* Uint64toHex(uint64_t value, char *str, uint16_t bits);
-char* dtostrfd(double number, unsigned char prec, char *s);
-char* Unescape(char* buffer, uint32_t* size);
-char* RemoveSpace(char* p);
-char* ReplaceCommaWithDot(char* p);
-char* LowerCase(char* dest, const char* source);
-char* UpperCase(char* dest, const char* source);
-char* UpperCase_P(char* dest, const char* source);
-char* Trim(char* p);
-char* RemoveAllSpaces(char* p);
-char* NoAlNumToUnderscore(char* dest, const char* source);
-char IndexSeparator(void);
-void SetShortcutDefault(void);
-uint8_t Shortcut(void);
-bool ValidIpAddress(const char* str);
-bool ParseIp(uint32_t* addr, const char* str);
-uint32_t ParseParameters(uint32_t count, uint32_t *params);
-bool NewerVersion(char* version_str);
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option);
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size);
-void GetEspHardwareType(void);
-String GetDeviceHardware(void);
-float ConvertTemp(float c);
-float ConvertTempToCelsius(float c);
-char TempUnit(void);
-float ConvertHumidity(float h);
-float ConvertPressure(float p);
-String PressureUnit(void);
-void ResetGlobalValues(void);
-uint32_t SqrtInt(uint32_t num);
-uint32_t RoundSqrtInt(uint32_t num);
-char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack);
-int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack);
-int GetStateNumber(char *state_text);
-String GetSerialConfig(void);
-void SetSerialBegin();
-void SetSerialConfig(uint32_t serial_config);
-void SetSerialBaudrate(uint32_t baudrate);
-void SetSerial(uint32_t baudrate, uint32_t serial_config);
-void ClaimSerial(void);
-void SerialSendRaw(char *codes);
-uint32_t GetHash(const char *buffer, size_t size);
-void ShowSource(uint32_t source);
-void WebHexCode(uint32_t i, const char* code);
-uint32_t WebColor(uint32_t i);
-char* ResponseGetTime(uint32_t format, char* time_str);
-int Response_P(const char* format, ...);
-int ResponseTime_P(const char* format, ...);
-int ResponseAppend_P(const char* format, ...);
-int ResponseAppendTimeFormat(uint32_t format);
-int ResponseAppendTime(void);
-int ResponseJsonEnd(void);
-int ResponseJsonEndEnd(void);
-void DigitalWrite(uint32_t gpio_pin, uint32_t state);
-uint8_t ModuleNr(void);
-bool ValidTemplateModule(uint32_t index);
-bool ValidModule(uint32_t index);
-String AnyModuleName(uint32_t index);
-String ModuleName(void);
-void ModuleGpios(myio *gp);
-gpio_flag ModuleFlag(void);
-void ModuleDefault(uint32_t module);
-void SetModuleType(void);
-bool FlashPin(uint32_t pin);
-uint8_t ValidPin(uint32_t pin, uint32_t gpio);
-bool ValidGPIO(uint32_t pin, uint32_t gpio);
-bool ValidAdc(void);
-bool GetUsedInModule(uint32_t val, uint8_t *arr);
-bool JsonTemplate(const char* dataBuf);
-void TemplateJson(void);
-inline int32_t TimeDifference(uint32_t prev, uint32_t next);
-int32_t TimePassedSince(uint32_t timestamp);
-bool TimeReached(uint32_t timer);
-void SetNextTimeInterval(unsigned long& timer, const unsigned long step);
-int32_t TimePassedSinceUsec(uint32_t timestamp);
-bool TimeReachedUsec(uint32_t timer);
-bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size);
-bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg);
-uint8_t I2cRead8(uint8_t addr, uint8_t reg);
-uint16_t I2cRead16(uint8_t addr, uint8_t reg);
-int16_t I2cReadS16(uint8_t addr, uint8_t reg);
-uint16_t I2cRead16LE(uint8_t addr, uint8_t reg);
-int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg);
-int32_t I2cRead24(uint8_t addr, uint8_t reg);
-bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size);
-bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val);
-bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val);
-int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
-int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
-void I2cScan(char *devs, unsigned int devs_len);
-void I2cSetActiveFound(uint32_t addr, const char *types);
-bool I2cActive(uint32_t addr);
-bool I2cSetDevice(uint32_t addr);
-void SetSeriallog(uint32_t loglevel);
-void SetSyslog(uint32_t loglevel);
-void GetLog(uint32_t idx, char** entry_pp, size_t* len_p);
-void Syslog(void);
-void AddLog(uint32_t loglevel);
-void AddLog_P(uint32_t loglevel, const char *formatP);
-void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2);
-void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...);
-void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...);
-void AddLog_Debug(PGM_P formatP, ...);
-void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count);
-void AddLogSerial(uint32_t loglevel);
-void AddLogMissed(char *sensor, uint32_t misses);
-void ButtonPullupFlag(uint8 button_bit);
-void ButtonInvertFlag(uint8 button_bit);
-void ButtonInit(void);
-uint8_t ButtonSerial(uint8_t serial_in_byte);
-void ButtonHandler(void);
-void ButtonLoop(void);
-void ResponseCmndNumber(int value);
-void ResponseCmndFloat(float value, uint32_t decimals);
-void ResponseCmndIdxNumber(int value);
-void ResponseCmndChar(const char* value);
-void ResponseCmndStateText(uint32_t value);
-void ResponseCmndDone(void);
-void ResponseCmndIdxChar(const char* value);
-void ResponseCmndAll(uint32_t text_index, uint32_t count);
-void ExecuteCommand(const char *cmnd, uint32_t source);
-void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len);
-void CmndBacklog(void);
-void CmndDelay(void);
-void CmndPower(void);
-void CmndStatus(void);
-void CmndState(void);
-void CmndTempOffset(void);
-void CmndSleep(void);
-void CmndUpgrade(void);
-void CmndOtaUrl(void);
-void CmndSeriallog(void);
-void CmndRestart(void);
-void CmndPowerOnState(void);
-void CmndPulsetime(void);
-void CmndBlinktime(void);
-void CmndBlinkcount(void);
-void CmndSavedata(void);
-void CmndSetoption(void);
-void CmndTemperatureResolution(void);
-void CmndHumidityResolution(void);
-void CmndPressureResolution(void);
-void CmndPowerResolution(void);
-void CmndVoltageResolution(void);
-void CmndFrequencyResolution(void);
-void CmndCurrentResolution(void);
-void CmndEnergyResolution(void);
-void CmndWeightResolution(void);
-void CmndModule(void);
-void CmndModules(void);
-void CmndGpio(void);
-void CmndGpios(void);
-void CmndTemplate(void);
-void CmndPwm(void);
-void CmndPwmfrequency(void);
-void CmndPwmrange(void);
-void CmndButtonDebounce(void);
-void CmndSwitchDebounce(void);
-void CmndBaudrate(void);
-void CmndSerialConfig(void);
-void CmndSerialSend(void);
-void CmndSerialDelimiter(void);
-void CmndSyslog(void);
-void CmndLoghost(void);
-void CmndLogport(void);
-void CmndIpAddress(void);
-void CmndNtpServer(void);
-void CmndAp(void);
-void CmndSsid(void);
-void CmndPassword(void);
-void CmndHostname(void);
-void CmndWifiConfig(void);
-void CmndFriendlyname(void);
-void CmndSwitchMode(void);
-void CmndInterlock(void);
-void CmndTeleperiod(void);
-void CmndReset(void);
-void CmndTime(void);
-void CmndTimezone(void);
-void CmndTimeStdDst(uint32_t ts);
-void CmndTimeStd(void);
-void CmndTimeDst(void);
-void CmndAltitude(void);
-void CmndLedPower(void);
-void CmndLedState(void);
-void CmndLedMask(void);
-void CmndWifiPower(void);
-void CmndI2cScan(void);
-void CmndI2cDriver(void);
-void CmndSensor(void);
-void CmndDriver(void);
-void CmndCrash(void);
-void CmndWDT(void);
-void CmndBlockedLoop(void);
-void CrashDumpClear(void);
-bool CrashFlag(void);
-void CrashDump(void);
-static bool spiflash_is_ready(void);
-static void spi_write_enable(void);
-bool EsptoolEraseSector(uint32_t sector);
-void EsptoolErase(uint32_t start_sector, uint32_t end_sector);
-void GetFeatures(void);
-float fmodf(float x, float y);
-double FastPrecisePow(double a, double b);
-float FastPrecisePowf(const float x, const float y);
-double TaylorLog(double x);
-inline float sinf(float x);
-inline float cosf(float x);
-inline float tanf(float x);
-inline float atanf(float x);
-inline float asinf(float x);
-inline float acosf(float x);
-inline float sqrtf(float x);
-inline float powf(float x, float y);
-float cos_52s(float x);
-float cos_52(float x);
-float sin_52(float x);
-float tan_56s(float x);
-float tan_56(float x);
-float atan_66s(float x);
-float atan_66(float x);
-float asinf1(float x);
-float acosf1(float x);
-float sqrt1(const float x);
-uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
-                                       uint16_t ito_min, uint16_t ito_max);
-void* memchr(const void* ptr, int value, size_t num);
-size_t strcspn(const char *str1, const char *str2);
-char* strpbrk(const char *s1, const char *s2);
-void* memmove_P(void *dest, const void *src, size_t n);
-void update_rotary(void);
-bool RotaryButtonPressed(void);
-void RotaryInit(void);
-void RotaryHandler(void);
-void RotaryLoop(void);
-uint32_t UtcTime(void);
-uint32_t LocalTime(void);
-int32_t DriftTime(void);
-uint32_t Midnight(void);
-bool MidnightNow(void);
-bool IsDst(void);
-String GetBuildDateAndTime(void);
-String GetMinuteTime(uint32_t minutes);
-String GetTimeZone(void);
-String GetDuration(uint32_t time);
-String GetDT(uint32_t time);
-String GetDateAndTime(uint8_t time_type);
-String GetTime(int type);
-uint32_t UpTime(void);
-uint32_t MinutesUptime(void);
-String GetUptime(void);
-uint32_t MinutesPastMidnight(void);
-void BreakTime(uint32_t time_input, TIME_T &tm);
-uint32_t MakeTime(TIME_T &tm);
-uint32_t RuleToTime(TimeRule r, int yr);
-void RtcSecond(void);
-void RtcSetTime(uint32_t epoch);
-void RtcInit(void);
-String GetStatistics(void);
-String GetStatistics(void);
-void SwitchPullupFlag(uint16 switch_bit);
-void SwitchSetVirtual(uint32_t index, uint8_t state);
-uint8_t SwitchGetVirtual(uint32_t index);
-uint8_t SwitchLastState(uint32_t index);
-bool SwitchState(uint32_t index);
-void SwitchProbe(void);
-void SwitchInit(void);
-void SwitchHandler(uint8_t mode);
-void SwitchLoop(void);
-char* Format(char* output, const char* input, int size);
-char* GetOtaUrl(char *otaurl, size_t otaurl_size);
-char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic);
-char* GetGroupTopic_P(char *stopic, const char* subtopic);
-char* GetFallbackTopic_P(char *stopic, const char* subtopic);
-char* GetStateText(uint32_t state);
-void SetLatchingRelay(power_t lpower, uint32_t state);
-void SetDevicePower(power_t rpower, uint32_t source);
-void RestorePower(bool publish_power, uint32_t source);
-void SetAllPower(uint32_t state, uint32_t source);
-void SetPowerOnState(void);
-void SetLedPowerIdx(uint32_t led, uint32_t state);
-void SetLedPower(uint32_t state);
-void SetLedPowerAll(uint32_t state);
-void SetLedLink(uint32_t state);
-void SetPulseTimer(uint32_t index, uint32_t time);
-uint32_t GetPulseTimer(uint32_t index);
-bool SendKey(uint32_t key, uint32_t device, uint32_t state);
-void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source);
-void StopAllPowerBlink(void);
-void MqttShowPWMState(void);
-void MqttShowState(void);
-void MqttPublishTeleState(void);
-bool MqttShowSensor(void);
-void MqttPublishSensor(void);
-void PerformEverySecond(void);
-void Every100mSeconds(void);
-void Every250mSeconds(void);
-void ArduinoOTAInit(void);
-void ArduinoOtaLoop(void);
-void SerialInput(void);
-void GpioInit(void);
-bool UdpDisconnect(void);
-bool UdpConnect(void);
-void PollUdp(void);
-int WifiGetRssiAsQuality(int rssi);
-bool WifiConfigCounter(void);
-void WifiConfig(uint8_t type);
-void WifiSetMode(WiFiMode_t wifi_mode);
-void WiFiSetSleepMode(void);
-void WifiBegin(uint8_t flag, uint8_t channel);
-void WifiBeginAfterScan(void);
-uint16_t WifiLinkCount(void);
-String WifiDowntime(void);
-void WifiSetState(uint8_t state);
-bool WifiCheckIPv6(void);
-String WifiGetIPv6(void);
-bool WifiCheckIPAddrStatus(void);
-void WifiCheckIp(void);
-void WifiCheck(uint8_t param);
-int WifiState(void);
-String WifiGetOutputPower(void);
-void WifiSetOutputPower(void);
-void WifiConnect(void);
-void WifiDisconnect(void);
-void WifiShutdown(void);
-void EspRestart(void);
-static void WebGetArg(const char* arg, char* out, size_t max);
-static bool WifiIsInManagerMode();
-void ShowWebSource(uint32_t source);
-void ExecuteWebCommand(char* svalue, uint32_t source);
-void StartWebserver(int type, IPAddress ipweb);
-void StopWebserver(void);
-void WifiManagerBegin(bool reset_only);
-void PollDnsWebserver(void);
-bool WebAuthenticate(void);
-void HttpHeaderCors(void);
-void WSHeaderSend(void);
-void WSSend(int code, int ctype, const String& content);
-void WSContentBegin(int code, int ctype);
-void _WSContentSend(const String& content);
-void WSContentFlush(void);
-void _WSContentSendBuffer(void);
-void WSContentSend_P(const char* formatP, ...);
-void WSContentSend_PD(const char* formatP, ...);
-void WSContentStart_P(const char* title, bool auth);
-void WSContentStart_P(const char* title);
-void WSContentSendStyle_P(const char* formatP, ...);
-void WSContentSendStyle(void);
-void WSContentButton(uint32_t title_index);
-void WSContentSpaceButton(uint32_t title_index);
-void WSContentEnd(void);
-void WSContentStop(void);
-void WebRestart(uint32_t type);
-void HandleWifiLogin(void);
-void WebSliderColdWarm(void);
-void HandleRoot(void);
-bool HandleRootStatusRefresh(void);
-int32_t IsShutterWebButton(uint32_t idx);
-void HandleConfiguration(void);
-void HandleTemplateConfiguration(void);
-void TemplateSaveSettings(void);
-void HandleModuleConfiguration(void);
-void ModuleSaveSettings(void);
-String HtmlEscape(const String unescaped);
-void HandleWifiConfiguration(void);
-void WifiSaveSettings(void);
-void HandleLoggingConfiguration(void);
-void LoggingSaveSettings(void);
-void HandleOtherConfiguration(void);
-void OtherSaveSettings(void);
-void HandleBackupConfiguration(void);
-void HandleResetConfiguration(void);
-void HandleRestoreConfiguration(void);
-void HandleInformation(void);
-void HandleUpgradeFirmware(void);
-void HandleUpgradeFirmwareStart(void);
-void HandleUploadDone(void);
-void HandleUploadLoop(void);
-void HandlePreflightRequest(void);
-void HandleHttpCommand(void);
-void HandleConsole(void);
-void HandleConsoleRefresh(void);
-void HandleNotFound(void);
-bool CaptivePortal(void);
-String UrlEncode(const String& text);
-int WebSend(char *buffer);
-bool JsonWebColor(const char* dataBuf);
-void CmndEmulation(void);
-void CmndSendmail(void);
-void CmndWebServer(void);
-void CmndWebPassword(void);
-void CmndWeblog(void);
-void CmndWebRefresh(void);
-void CmndWebSend(void);
-void CmndWebColor(void);
-void CmndWebSensor(void);
-void CmndWebButton(void);
-void CmndCors(void);
-bool Xdrv01(uint8_t function);
-bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value);
-void MakeValidMqtt(uint32_t option, char* str);
-void MqttDiscoverServer(void);
-void MqttInit(void);
-bool MqttIsConnected(void);
-void MqttDisconnect(void);
-void MqttSubscribeLib(const char *topic);
-void MqttUnsubscribeLib(const char *topic);
-bool MqttPublishLib(const char* topic, bool retained);
-void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len);
-void MqttRetryCounter(uint8_t value);
-void MqttSubscribe(const char *topic);
-void MqttUnsubscribe(const char *topic);
-void MqttPublishLogging(const char *mxtime);
-void MqttPublish(const char* topic, bool retained);
-void MqttPublish(const char* topic);
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained);
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic);
-void MqttPublishTeleSensor(void);
-void MqttPublishPowerState(uint32_t device);
-void MqttPublishAllPowerState(void);
-void MqttPublishPowerBlinkState(uint32_t device);
-uint16_t MqttConnectCount(void);
-void MqttDisconnected(int state);
-void MqttConnected(void);
-void MqttReconnect(void);
-void MqttCheck(void);
-void CmndMqttFingerprint(void);
-void CmndMqttUser(void);
-void CmndMqttPassword(void);
-void CmndMqttlog(void);
-void CmndMqttHost(void);
-void CmndMqttPort(void);
-void CmndMqttRetry(void);
-void CmndStateText(void);
-void CmndMqttClient(void);
-void CmndFullTopic(void);
-void CmndPrefix(void);
-void CmndPublish(void);
-void CmndGroupTopic(void);
-void CmndTopic(void);
-void CmndButtonTopic(void);
-void CmndSwitchTopic(void);
-void CmndButtonRetain(void);
-void CmndSwitchRetain(void);
-void CmndPowerRetain(void);
-void CmndSensorRetain(void);
-inline void TlsEraseBuffer(uint8_t *buffer);
-void loadTlsDir(void);
-void CmndTlsKey(void);
-uint32_t bswap32(uint32_t x);
-void CmndTlsDump(void);
-void HandleMqttConfiguration(void);
-void MqttSaveSettings(void);
-bool Xdrv02(uint8_t function);
-bool EnergyTariff1Active();
-void EnergyUpdateToday(void);
-void EnergyUpdateTotal(float value, bool kwh);
-void Energy200ms(void);
-void EnergySaveState(void);
-bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag);
-void EnergyMarginCheck(void);
-void EnergyMqttShow(void);
-void EnergyEverySecond(void);
-void EnergyCommandCalResponse(uint32_t nvalue);
-void CmndEnergyReset(void);
-void CmndTariff(void);
-void CmndPowerCal(void);
-void CmndVoltageCal(void);
-void CmndCurrentCal(void);
-void CmndPowerSet(void);
-void CmndVoltageSet(void);
-void CmndCurrentSet(void);
-void CmndFrequencySet(void);
-void CmndModuleAddress(void);
-void CmndPowerDelta(void);
-void CmndPowerLow(void);
-void CmndPowerHigh(void);
-void CmndVoltageLow(void);
-void CmndVoltageHigh(void);
-void CmndCurrentLow(void);
-void CmndCurrentHigh(void);
-void CmndMaxPower(void);
-void CmndMaxPowerHold(void);
-void CmndMaxPowerWindow(void);
-void CmndSafePower(void);
-void CmndSafePowerHold(void);
-void CmndSafePowerWindow(void);
-void CmndMaxEnergy(void);
-void CmndMaxEnergyStart(void);
-void EnergySnsInit(void);
-void EnergyShow(bool json);
-bool Xdrv03(uint8_t function);
-bool Xsns03(uint8_t function);
-power_t LightPower(void);
-power_t LightPowerIRAM(void);
-uint8_t LightDevice(void);
-static uint32_t min3(uint32_t a, uint32_t b, uint32_t c);
-uint16_t change8to10(uint8_t v);
-uint8_t change10to8(uint16_t v);
-uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr);
-uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr);
-uint16_t ledGamma10_10(uint16_t v);
-uint16_t ledGamma10(uint8_t v);
-uint8_t ledGamma(uint8_t v);
-void LightPwmOffset(uint32_t offset);
-bool LightModuleInit(void);
-void LightInit(void);
-void LightUpdateColorMapping(void);
-uint8_t LightGetDimmer(uint8_t dimmer);
-void LightSetDimmer(uint8_t dimmer);
-void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri);
-void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
-uint8_t LightGetBri(uint8_t device);
-void LightSetBri(uint8_t device, uint8_t bri);
-void LightSetColorTemp(uint16_t ct);
-uint16_t LightGetColorTemp(void);
-void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value);
-void LightPowerOn(void);
-void LightState(uint8_t append);
-void LightCycleColor(int8_t direction);
-void LightSetPower(void);
-void LightAnimate(void);
-bool isChannelGammaCorrected(uint32_t channel);
-uint16_t fadeGamma(uint32_t channel, uint16_t v);
-uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg);
-bool LightApplyFade(void);
-void LightApplyPower(uint8_t new_color[LST_MAX], power_t power);
-void LightSetOutputs(const uint16_t *cur_col_10);
-void calcGammaMultiChannels(uint16_t cur_col_10[5]);
-void calcGammaBulbs(uint16_t cur_col_10[5]);
-bool LightColorEntry(char *buffer, uint32_t buffer_length);
-void CmndSupportColor(void);
-void CmndColor(void);
-void CmndWhite(void);
-void CmndChannel(void);
-void CmndHsbColor(void);
-void CmndScheme(void);
-void CmndWakeup(void);
-void CmndColorTemperature(void);
-void CmndDimmer(void);
-void CmndDimmerRange(void);
-void CmndLedTable(void);
-void CmndRgbwwTable(void);
-void CmndFade(void);
-void CmndSpeed(void);
-void CmndWakeupDuration(void);
-void CmndUndocA(void);
-bool Xdrv04(uint8_t function);
-void IrSendInit(void);
-void IrReceiveUpdateThreshold(void);
-void IrReceiveInit(void);
-void IrReceiveCheck(void);
-uint32_t IrRemoteCmndIrSendJson(void);
-void CmndIrSend(void);
-void IrRemoteCmndResponse(uint32_t error);
-bool Xdrv05(uint8_t function);
-void IrSendInit(void);
-uint8_t reverseBitsInByte(uint8_t b);
-uint64_t reverseBitsInBytes64(uint64_t b);
-void IrReceiveUpdateThreshold(void);
-void IrReceiveInit(void);
-String sendIRJsonState(const struct decode_results &results);
-void IrReceiveCheck(void);
-String listSupportedProtocols(bool hvac);
-uint32_t IrRemoteCmndIrHvacJson(void);
-void CmndIrHvac(void);
-uint32_t IrRemoteCmndIrSendJson(void);
-uint32_t IrRemoteCmndIrSendRaw(void);
-void CmndIrSend(void);
-void IrRemoteCmndResponse(uint32_t error);
-bool Xdrv05(uint8_t function);
-ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size);
-ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size);
-ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len);
-ssize_t rf_decode_and_write(uint8_t *record, size_t size);
-ssize_t rf_search_and_write(uint8_t *buf, size_t size);
-uint8_t rf_erase_flash(void);
-uint8_t SnfBrUpdateInit(void);
-void SonoffBridgeReceivedRaw(void);
-void SonoffBridgeLearnFailed(void);
-void SonoffBridgeReceived(void);
-bool SonoffBridgeSerialInput(void);
-void SonoffBridgeSendCommand(uint8_t code);
-void SonoffBridgeSendAck(void);
-void SonoffBridgeSendCode(uint32_t code);
-void SonoffBridgeSend(uint8_t idx, uint8_t key);
-void SonoffBridgeLearn(uint8_t key);
-void CmndRfBridge(void);
-void CmndRfKey(void);
-void CmndRfRaw(void);
-bool Xdrv06(uint8_t function);
-int DomoticzBatteryQuality(void);
-int DomoticzRssiQuality(void);
-void MqttPublishDomoticzFanState(void);
-void DomoticzUpdateFanState(void);
-void MqttPublishDomoticzPowerState(uint8_t device);
-void DomoticzUpdatePowerState(uint8_t device);
-void DomoticzMqttUpdate(void);
-void DomoticzMqttSubscribe(void);
-bool DomoticzMqttData(void);
-bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg);
-uint8_t DomoticzHumidityState(char *hum);
-void DomoticzSensor(uint8_t idx, char *data);
-void DomoticzSensor(uint8_t idx, uint32_t value);
-void DomoticzTempHumSensor(char *temp, char *hum);
-void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro);
-void DomoticzSensorPowerEnergy(int power, char *energy);
-void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power);
-void CmndDomoticzIdx(void);
-void CmndDomoticzKeyIdx(void);
-void CmndDomoticzSwitchIdx(void);
-void CmndDomoticzSensorIdx(void);
-void CmndDomoticzUpdateTimer(void);
-void HandleDomoticzConfiguration(void);
-void DomoticzSaveSettings(void);
-bool Xdrv07(uint8_t function);
-void SerialBridgeInput(void);
-void SerialBridgeInit(void);
-void CmndSSerialSend(void);
-void CmndSBaudrate(void);
-bool Xdrv08(uint8_t function);
-float JulianischesDatum(void);
-float InPi(float x);
-float eps(float T);
-float BerechneZeitgleichung(float *DK,float T);
-void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down);
-void ApplyTimerOffsets(Timer *duskdawn);
-String GetSun(uint32_t dawn);
-uint16_t SunMinutes(uint32_t dawn);
-void TimerSetRandomWindow(uint32_t index);
-void TimerSetRandomWindows(void);
-void TimerEverySecond(void);
-void PrepShowTimer(uint32_t index);
-void CmndTimer(void);
-void CmndTimers(void);
-void CmndLongitude(void);
-void CmndLatitude(void);
-void HandleTimerConfiguration(void);
-void TimerSaveSettings(void);
-bool Xdrv09(uint8_t function);
-bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule);
-int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr);
-void RulesVarReplace(String &commands, const String &sfind, const String &replace);
-bool RuleSetProcess(uint8_t rule_set, String &event_saved);
-bool RulesProcessEvent(char *json_event);
-bool RulesProcess(void);
-void RulesInit(void);
-void RulesEvery50ms(void);
-void RulesEvery100ms(void);
-void RulesEverySecond(void);
-void RulesSaveBeforeRestart(void);
-void RulesSetPower(void);
-void RulesTeleperiod(void);
-bool RulesMqttData(void);
-void CmndSubscribe(void);
-void CmndUnsubscribe(void);
-bool findNextNumber(char * &pNumber, float &value);
-bool findNextVariableValue(char * &pVarname, float &value);
-bool findNextObjectValue(char * &pointer, float &value);
-bool findNextOperator(char * &pointer, int8_t &op);
-float calculateTwoValues(float v1, float v2, uint8_t op);
-float evaluateExpression(const char * expression, unsigned int len);
-void CmndIf(void);
-bool evaluateComparisonExpression(const char *expression, int len);
-bool findNextLogicOperator(char * &pointer, int8_t &op);
-bool findNextLogicObjectValue(char * &pointer, bool &value);
-bool evaluateLogicalExpression(const char * expression, int len);
-int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type);
-void ExecuteCommandBlock(const char * commands, int len);
-void ProcessIfStatement(const char* statements);
-void RulesPreprocessCommand(char *pCommands);
-void CmndRule(void);
-void CmndRuleTimer(void);
-void CmndEvent(void);
-void CmndVariable(void);
-void CmndMemory(void);
-void CmndCalcResolution(void);
-void CmndAddition(void);
-void CmndSubtract(void);
-void CmndMultiply(void);
-void CmndScale(void);
-float map_double(float x, float in_min, float in_max, float out_min, float out_max);
-bool Xdrv10(uint8_t function);
-void ScriptEverySecond(void);
-void RulesTeleperiod(void);
-int16_t Init_Scripter(void);
-void ws2812_set_array(float *array ,uint8_t len);
-float median_array(float *array,uint8_t len);
-float Get_MFVal(uint8_t index,uint8_t bind);
-void Set_MFVal(uint8_t index,uint8_t bind,float val);
-float Get_MFilter(uint8_t index);
-void Set_MFilter(uint8_t index, float invar);
-float DoMedian5(uint8_t index, float in);
-uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value);
-uint16_t GetStack(void);
-uint16_t GetStack(void);
-void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize);
-void toLog(const char *str);
-void toLogN(const char *cp,uint8_t len);
-void toLogEOL(const char *s1,const char *str);
-void toSLog(const char *str);
-int16_t Run_Scripter(const char *type, int8_t tlen, char *js);
-void ScripterEvery100ms(void);
-void Scripter_save_pvars(void);
-void ListDir(char *path, uint8_t depth);
-void Script_FileUploadConfiguration(void);
-void ScriptFileUploadSuccess(void);
-void script_upload(void);
-uint8_t DownloadFile(char *file);
-void HandleScriptTextareaConfiguration(void);
-void HandleScriptConfiguration(void);
-void ScriptSaveSettings(void);
-void Script_HueStatus(String *response, uint16_t hue_devs);
-void Script_Check_Hue(String *response);
-void Script_Handle_Hue(String *path);
-bool Script_SubCmd(void);
-void execute_script(char *script);
-bool ScriptCommand(void);
-uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day);
-uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second);
-void dateTime(uint16_t* date, uint16_t* time);
-bool ScriptMqttData(void);
-String ScriptSubscribe(const char *data, int data_len);
-String ScriptUnsubscribe(const char * data, int data_len);
-void Script_Check_HTML_Setvars(void);
-void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen);
-void ScriptWebShow(void);
-void ScriptJsonAppend(void);
-bool Xdrv10(uint8_t function);
-void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF );
-void KNX_DEL_GA( uint8_t GAnum );
-void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF );
-void KNX_DEL_CB( uint8_t CBnum );
-bool KNX_CONFIG_NOT_MATCH(void);
-void KNXStart(void);
-void KNX_INIT(void);
-void KNX_CB_Action(message_t const &msg, void *arg);
-void KnxUpdatePowerState(uint8_t device, power_t state);
-void KnxSendButtonPower(void);
-void KnxSensor(uint8_t sensor_type, float value);
-void HandleKNXConfiguration(void);
-void KNX_Save_Settings(void);
-void CmndKnxTxCmnd(void);
-void CmndKnxTxVal(void);
-void CmndKnxEnabled(void);
-void CmndKnxEnhanced(void);
-void CmndKnxPa(void);
-void CmndKnxGa(void);
-void CmndKnxCb(void);
-bool Xdrv11(uint8_t function);
-void TryResponseAppend_P(const char *format, ...);
-void HAssAnnounceRelayLight(void);
-void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle);
-void HAssAnnounceSwitches(void);
-void HAssAnnounceButtons(void);
-void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx);
-void HAssAnnounceSensors(void);
-void HAssAnnounceStatusSensor(void);
-void HAssPublishStatus(void);
-void HAssDiscovery(void);
-void HAssDiscover(void);
-void HAssAnyKey(void);
-bool Xdrv12(uint8_t function);
-void DisplayInit(uint8_t mode);
-void DisplayClear(void);
-void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
-void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
-void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
-void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
-void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawFrame(void);
-void DisplaySetSize(uint8_t size);
-void DisplaySetFont(uint8_t font);
-void DisplaySetRotation(uint8_t rotation);
-void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void DisplayOnOff(uint8_t on);
-uint8_t fatoiv(char *cp,float *res);
-uint8_t atoiv(char *cp, int16_t *res);
-uint8_t atoiV(char *cp, uint16_t *res);
-void alignright(char *string);
-uint32_t decode_te(char *line);
-void DisplayText(void);
-void DisplayClearScreenBuffer(void);
-void DisplayFreeScreenBuffer(void);
-void DisplayAllocScreenBuffer(void);
-void DisplayReAllocScreenBuffer(void);
-void DisplayFillScreen(uint32_t line);
-void DisplayClearLogBuffer(void);
-void DisplayFreeLogBuffer(void);
-void DisplayAllocLogBuffer(void);
-void DisplayReAllocLogBuffer(void);
-void DisplayLogBufferAdd(char* txt);
-char* DisplayLogBuffer(char temp_code);
-void DisplayLogBufferInit(void);
-void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value);
-void DisplayAnalyzeJson(char *topic, char *json);
-void DisplayMqttSubscribe(void);
-bool DisplayMqttData(void);
-void DisplayLocalSensor(void);
-void DisplayInitDriver(void);
-void DisplaySetPower(void);
-void CmndDisplay(void);
-void CmndDisplayModel(void);
-void CmndDisplayWidth(void);
-void CmndDisplayHeight(void);
-void CmndDisplayMode(void);
-void CmndDisplayDimmer(void);
-void CmndDisplaySize(void);
-void CmndDisplayFont(void);
-void CmndDisplayRotate(void);
-void CmndDisplayText(void);
-void CmndDisplayAddress(void);
-void CmndDisplayRefresh(void);
-void CmndDisplayColumns(void);
-void CmndDisplayRows(void);
-void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp);
-void DrawAClock(uint16_t rad);
-void ClrGraph(uint16_t num);
-void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol);
-void DisplayCheckGraph();
-void Save_graph(uint8_t num, char *path);
-void Restore_graph(uint8_t num, char *path);
-void RedrawGraph(uint8_t num, uint8_t flags);
-void AddGraph(uint8_t num,uint8_t val);
-void AddValue(uint8_t num,float fval);
-bool Xdrv13(uint8_t function);
-uint16_t MP3_Checksum(uint8_t *array);
-void MP3PlayerInit(void);
-void MP3_CMD(uint8_t mp3cmd,uint16_t val);
-bool MP3PlayerCmd(void);
-bool Xdrv14(uint8_t function);
-void PCA9685_Detect(void);
-void PCA9685_Reset(void);
-void PCA9685_SetPWMfreq(double freq);
-void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off);
-void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted);
-bool PCA9685_Command(void);
-void PCA9685_OutputTelemetry(bool telemetry);
-bool Xdrv15(uint8_t function);
-void CmndTuyaSend(void);
-void CmndTuyaMcu(void);
-void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId);
-void UpdateDevices();
-inline bool TuyaFuncIdValid(uint8_t fnId);
-uint8_t TuyaGetFuncId(uint8_t dpid);
-uint8_t TuyaGetDpId(uint8_t fnId);
-void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value);
-void TuyaSendBool(uint8_t id, bool value);
-void TuyaSendValue(uint8_t id, uint32_t value);
-void TuyaSendEnum(uint8_t id, uint32_t value);
-void TuyaSendString(uint8_t id, char data[]);
-bool TuyaSetPower(void);
-bool TuyaSetChannels(void);
-void LightSerialDuty(uint16_t duty);
-void TuyaRequestState(void);
-void TuyaResetWifi(void);
-void TuyaProcessStatePacket(void);
-void TuyaLowPowerModePacketProcess(void);
-void TuyaHandleProductInfoPacket(void);
-void TuyaSendLowPowerSuccessIfNeeded(void);
-void TuyaNormalPowerModePacketProcess(void);
-bool TuyaModuleSelected(void);
-void TuyaInit(void);
-void TuyaSerialInput(void);
-bool TuyaButtonPressed(void);
-uint8_t TuyaGetTuyaWifiState(void);
-void TuyaSetWifiLed(void);
-bool Xnrg16(uint8_t function);
-bool Xdrv16(uint8_t function);
-void RfReceiveCheck(void);
-void RfInit(void);
-void CmndRfSend(void);
-bool Xdrv17(uint8_t function);
-bool ArmtronixSetChannels(void);
-void LightSerial2Duty(uint8_t duty1, uint8_t duty2);
-void ArmtronixRequestState(void);
-bool ArmtronixModuleSelected(void);
-void ArmtronixInit(void);
-void ArmtronixSerialInput(void);
-void ArmtronixSetWifiLed(void);
-bool Xdrv18(uint8_t function);
-void PS16DZSerialSend(const char *tx_buffer);
-void PS16DZSerialSendOk(void);
-void PS16DZSerialSendUpdateCommand(void);
-void PS16DZSerialInput(void);
-bool PS16DZSerialSendUpdateCommandIfRequired(void);
-void PS16DZInit(void);
-bool PS16DZModuleSelected(void);
-bool Xdrv19(uint8_t function);
-String HueBridgeId(void);
-String HueSerialnumber(void);
-String HueUuid(void);
-void HueRespondToMSearch(void);
-String GetHueDeviceId(uint8_t id);
-String GetHueUserId(void);
-void HandleUpnpSetupHue(void);
-void HueNotImplemented(String *path);
-void HueConfigResponse(String *response);
-void HueConfig(String *path);
-uint8_t getLocalLightSubtype(uint8_t device);
-void HueLightStatus1(uint8_t device, String *response);
-bool HueActive(uint8_t device);
-void HueLightStatus2(uint8_t device, String *response);
-uint32_t EncodeLightId(uint8_t relay_id);
-uint32_t DecodeLightId(uint32_t hue_id);
-uint32_t findEchoGeneration(void);
-void HueGlobalConfig(String *path);
-void HueAuthentication(String *path);
-void HueLights(String *path);
-void HueGroups(String *path);
-void HandleHueApi(String *path);
-bool Xdrv20(uint8_t function);
-String WemoSerialnumber(void);
-String WemoUuid(void);
-void WemoRespondToMSearch(int echo_type);
-void HandleUpnpEvent(void);
-void HandleUpnpService(void);
-void HandleUpnpMetaService(void);
-void HandleUpnpSetupWemo(void);
-bool Xdrv21(uint8_t function);
-bool IsModuleIfan(void);
-uint8_t MaxFanspeed(void);
-uint8_t GetFanspeed(void);
-void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence);
-void SonoffIfanReceived(void);
-bool SonoffIfanSerialInput(void);
-void CmndFanspeed(void);
-bool SonoffIfanInit(void);
-void SonoffIfanUpdate(void);
-bool Xdrv22(uint8_t function);
-void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val);
-void CopyJsonArray(JsonArray &to, const JsonArray &arr);
-void CopyJsonObject(JsonObject &to, const JsonObject &from);
-uint16_t fromClusterCode(uint8_t c);
-uint8_t toClusterCode(uint16_t c);
-class SBuffer hibernateDevice(const struct Z_Device &device);
-class SBuffer hibernateDevices(void);
-void hidrateDevices(const SBuffer &buf);
-void loadZigbeeDevices(void);
-void saveZigbeeDevices(void);
-void eraseZigbeeDevices(void);
-uint8_t toPercentageCR2032(uint32_t voltage);
-uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
-                              uint32_t offset, uint32_t len);
-int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint);
-const __FlashStringHelper* zigbeeFindCommand(const char *command);
-inline bool isXYZ(char c);
-inline char hexDigit(uint32_t h);
-String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z);
-uint32_t ZigbeeAliasOrNumber(const char *state_text);
-uint8_t ZigbeeGetInstructionSize(uint8_t instr);
-void ZigbeeGotoLabel(uint8_t label);
-void ZigbeeStateMachine_Run(void);
-int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf);
-int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf);
-int32_t Z_Reboot(int32_t res, class SBuffer &buf);
-int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf);
-bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match);
-int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf);
-void Z_SendActiveEpReq(uint16_t shortaddr);
-void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint);
-int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf);
-void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid);
-int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf);
-void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json);
-int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf);
-int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf);
-int32_t Z_Load_Devices(uint8_t value);
-int32_t Z_State_Ready(uint8_t value);
-int32_t ZigbeeProcessInput(class SBuffer &buf);
-void ZigbeeInput(void);
-void ZigbeeInit(void);
-uint32_t strToUInt(const JsonVariant &val);
-void CmndZbReset(void);
-void CmndZbZNPSendOrReceive(bool send);
-void CmndZbZNPReceive(void);
-void CmndZbZNPSend(void);
-void ZigbeeZNPSend(const uint8_t *msg, size_t len);
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId);
-inline int8_t hexValue(char c);
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data);
-void CmndZbSend(void);
-void CmndZbBind(void);
-void CmndZbProbe(void);
-void CmndZbName(void);
-void CmndZbForget(void);
-void CmndZbSave(void);
-void CmndZbRead(void);
-void CmndZbPermitJoin(void);
-void CmndZbStatus(void);
-bool Xdrv23(uint8_t function);
-void BuzzerOff(void);
-void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode);
-void BuzzerSetStateToLed(uint32_t state);
-void BuzzerBeep(uint32_t count);
-void BuzzerEnabledBeep(uint32_t count, uint32_t duration);
-bool BuzzerPinState(void);
-void BuzzerInit(void);
-void BuzzerEvery100mSec(void);
-void CmndBuzzer(void);
-bool Xdrv24(uint8_t function);
-void A4988Init(void);
-void CmndDoMove(void);
-void CmndDoRotate(void);
-void CmndDoTurn(void);
-void CmndSetMIS(void);
-void CmndSetSPR(void);
-void CmndSetRPM(void);
-bool Xdrv25(uint8_t function);
-void AriluxRfInterrupt(void);
-void AriluxRfHandler(void);
-void AriluxRfInit(void);
-void AriluxRfDisable(void);
-bool Xdrv26(uint8_t function);
-void ShutterLogPos(uint32_t i);
-void ShutterRtc50mS(void);
-int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index);
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index);
-void ShutterInit(void);
-void ShutterReportPosition(bool always);
-void ShutterLimitRealAndTargetPositions(uint32_t i);
-void ShutterUpdatePosition(void);
-bool ShutterState(uint32_t device);
-void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos);
-void ShutterWaitForMotorStop(uint32_t i);
-int32_t ShutterCounterBasedPosition(uint32_t i);
-void ShutterRelayChanged(void);
-bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index);
-void ShutterButtonHandler(void);
-void ShutterSetPosition(uint32_t device, uint32_t position);
-void CmndShutterOpen(void);
-void CmndShutterClose(void);
-void CmndShutterStop(void);
-void CmndShutterPosition(void);
-void CmndShutterOpenTime(void);
-void CmndShutterCloseTime(void);
-void CmndShutterMotorDelay(void);
-void CmndShutterRelay(void);
-void CmndShutterButton(void);
-void CmndShutterSetHalfway(void);
-void CmndShutterFrequency(void);
-void CmndShutterSetClose(void);
-void CmndShutterInvert(void);
-void CmndShutterCalibration(void);
-void CmndShutterLock(void);
-void CmndShutterEnableEndStopTime(void);
-bool Xdrv27(uint8_t function);
-void Pcf8574SwitchRelay(void);
-void Pcf8574Init(void);
-void HandlePcf8574(void);
-void Pcf8574SaveSettings(void);
-bool Xdrv28(uint8_t function);
-bool DeepSleepEnabled(void);
-void DeepSleepReInit(void);
-void DeepSleepPrepare(void);
-void DeepSleepStart(void);
-void DeepSleepEverySecond(void);
-void CmndDeepsleepTime(void);
-bool Xdrv29(uint8_t function);
-uint8_t crc8(const uint8_t *p, uint8_t len);
-void ExsSendCmd(uint8_t cmd, uint8_t value);
-uint8_t ExsSetPower(uint8_t device, uint8_t power);
-uint8_t ExsSetBri(uint8_t device, uint8_t bri);
-uint8_t ExsSyncState(uint8_t device);
-bool ExsSyncState();
-void ExsDebugState();
-void ExsPacketProcess(void);
-bool ExsModuleSelected(void);
-bool ExsSetChannels(void);
-bool ExsSetPower(void);
-void EsxMcuStart(void);
-void ExsInit(void);
-void ExsSerialInput(void);
-void CmndExsDimm(void);
-void CmndExsDimmTbl(void);
-void CmndExsDimmVal(void);
-void CmndExsDimms(void);
-void CmndExsChLock(void);
-void CmndExsState(void);
-bool Xdrv30(uint8_t function);
-uint32_t TasmotaSlave_FlashStart(void);
-uint8_t TasmotaSlave_UpdateInit(void);
-void TasmotaSlave_Reset(void);
-uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout);
-uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count);
-uint8_t TasmotaSlave_execCmd(uint8_t cmd);
-uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count);
-uint8_t TasmotaSlave_exitProgMode(void);
-uint8_t TasmotaSlave_SetupFlash(void);
-uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo);
-void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data);
-void TasmotaSlave_Flash(void);
-void TasmotaSlave_SetFlagFlashing(bool value);
-bool TasmotaSlave_GetFlagFlashing(void);
-void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size);
-void TasmotaSlave_Init(void);
-void TasmotaSlave_Show(void);
-void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param);
-void CmndTasmotaSlaveReset(void);
-void CmndTasmotaSlaveSend(void);
-void TasmotaSlave_ProcessIn(void);
-bool Xdrv31(uint8_t function);
-void HotPlugInit(void);
-void HotPlugEverySecond(void);
-void CmndHotPlugTime(void);
-bool Xdrv32(uint8_t function);
-bool NRF24initRadio();
-bool NRF24Detect(void);
-bool Xdrv33(uint8_t function);
-void ExceptionTest(uint8_t type);
-void CpuLoadLoop(void);
-void DebugFreeMem(void);
-void DebugFreeMem(void);
-void DebugRtcDump(char* parms);
-void DebugCfgDump(char* parms);
-void DebugCfgPeek(char* parms);
-void DebugCfgPoke(char* parms);
-void SetFlashMode(uint8_t mode);
-void CmndHelp(void);
-void CmndRtcDump(void);
-void CmndCfgDump(void);
-void CmndCfgPeek(void);
-void CmndCfgPoke(void);
-void CmndCfgXor(void);
-void CmndException(void);
-void CmndCpuCheck(void);
-void CmndFreemem(void);
-void CmndSetSensor(void);
-void CmndFlashMode(void);
-uint32_t DebugSwap32(uint32_t x);
-void CmndFlashDump(void);
-void CmndI2cWrite(void);
-void CmndI2cRead(void);
-void CmndI2cStretch(void);
-void CmndI2cClock(void);
-bool Xdrv99(uint8_t function);
-void XsnsDriverState(void);
-bool XdrvRulesProcess(void);
-void ShowFreeMem(const char *where);
-bool XdrvCallDriver(uint32_t driver, uint8_t Function);
-bool XdrvCall(uint8_t Function);
-void LcdInitMode(void);
-void LcdInit(uint8_t mode);
-void LcdInitDriver(void);
-void LcdDrawStringAt(void);
-void LcdDisplayOnOff(uint8_t on);
-void LcdCenter(uint8_t row, char* txt);
-bool LcdPrintLog(void);
-void LcdTime(void);
-void LcdRefresh(void);
-bool Xdsp01(uint8_t function);
-void SSD1306InitDriver(void);
-void Ssd1306PrintLog(void);
-void Ssd1306Time(void);
-void Ssd1306Refresh(void);
-bool Xdsp02(byte function);
-void MatrixWrite(void);
-void MatrixClear(void);
-void MatrixFixed(char* txt);
-void MatrixCenter(char* txt);
-void MatrixScrollLeft(char* txt, int loop);
-void MatrixScrollUp(char* txt, int loop);
-void MatrixInitMode(void);
-void MatrixInit(uint8_t mode);
-void MatrixInitDriver(void);
-void MatrixOnOff(void);
-void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void MatrixPrintLog(uint8_t direction);
-void MatrixRefresh(void);
-bool Xdsp03(uint8_t function);
-void Ili9341InitMode(void);
-void Ili9341Init(uint8_t mode);
-void Ili9341InitDriver(void);
-void Ili9341Clear(void);
-void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void Ili9341DisplayOnOff(uint8_t on);
-void Ili9341OnOff(void);
-void Ili9341PrintLog(void);
-void Ili9341Refresh(void);
-bool Xdsp04(uint8_t function);
-void EpdInitDriver29();
-void EpdPrintLog29(void);
-void EpdRefresh29(void);
-bool Xdsp05(uint8_t function);
-void EpdInitDriver42();
-void EpdRefresh42();
-bool Xdsp06(uint8_t function);
-void SH1106InitDriver();
-void SH1106PrintLog(void);
-void SH1106Time(void);
-void SH1106Refresh(void);
-bool Xdsp07(uint8_t function);
-void ILI9488_InitDriver();
-void ILI9488_MQTT(uint8_t count,const char *cp);
-void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr);
-void FT6236Check();
-bool Xdsp08(uint8_t function);
-void SSD1351_InitDriver();
-void SSD1351PrintLog(void);
-void SSD1351Time(void);
-void SSD1351Refresh(void);
-bool Xdsp09(uint8_t function);
-void RA8876_InitDriver();
-void RA8876_MQTT(uint8_t count,const char *cp);
-void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr);
-void FT5316Check();
-bool Xdsp10(uint8_t function);
-uint8_t XdspPresent(void);
-bool XdspCall(uint8_t Function);
-void Ws2812StripShow(void);
-int mod(int a, int b);
-void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset);
-void Ws2812UpdateHand(int position, uint32_t index);
-void Ws2812Clock(void);
-void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i);
-void Ws2812Gradient(uint32_t schemenr);
-void Ws2812Bars(uint32_t schemenr);
-void Ws2812Clear(void);
-void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
-char* Ws2812GetColor(uint32_t led, char* scolor);
-void Ws2812ForceSuspend (void);
-void Ws2812ForceUpdate (void);
-bool Ws2812SetChannels(void);
-void Ws2812ShowScheme(void);
-void Ws2812ModuleSelected(void);
-void CmndLed(void);
-void CmndPixels(void);
-void CmndRotation(void);
-void CmndWidth(void);
-bool Xlgt01(uint8_t function);
-void LightDiPulse(uint8_t times);
-void LightDckiPulse(uint8_t times);
-void LightMy92x1Write(uint8_t data);
-void LightMy92x1Init(void);
-void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c);
-bool My92x1SetChannels(void);
-void My92x1ModuleSelected(void);
-bool Xlgt02(uint8_t function);
-void SM16716_SendBit(uint8_t v);
-void SM16716_SendByte(uint8_t v);
-void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b);
-void SM16716_Init(void);
-bool Sm16716SetChannels(void);
-void Sm16716ModuleSelected(void);
-bool Xlgt03(uint8_t function);
-uint8_t Sm2135Write(uint8_t data);
-void Sm2135Send(uint8_t *buffer, uint8_t size);
-bool Sm2135SetChannels(void);
-void Sm2135ModuleSelected(void);
-bool Xlgt04(uint8_t function);
-void SnfL1Send(const char *buffer);
-void SnfL1SerialSendOk(void);
-bool SnfL1SerialInput(void);
-bool SnfL1SetChannels(void);
-void SnfL1ModuleSelected(void);
-bool Xlgt05(uint8_t function);
-bool XlgtCall(uint8_t function);
-void HlwCfInterrupt(void);
-void HlwCf1Interrupt(void);
-void HlwEvery200ms(void);
-void HlwEverySecond(void);
-void HlwSnsInit(void);
-void HlwDrvInit(void);
-bool HlwCommand(void);
-bool Xnrg01(uint8_t function);
-void CseReceived(void);
-bool CseSerialInput(void);
-void CseEverySecond(void);
-void CseSnsInit(void);
-void CseDrvInit(void);
-bool CseCommand(void);
-bool Xnrg02(uint8_t function);
-uint8_t PzemCrc(uint8_t *data);
-void PzemSend(uint8_t cmd);
-bool PzemReceiveReady(void);
-bool PzemRecieve(uint8_t resp, float *data);
-void PzemEvery250ms(void);
-void PzemSnsInit(void);
-void PzemDrvInit(void);
-bool PzemCommand(void);
-bool Xnrg03(uint8_t function);
-uint8_t McpChecksum(uint8_t *data);
-unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size);
-void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size);
-void McpSend(uint8_t *data);
-void McpGetAddress(void);
-void McpAddressReceive(void);
-void McpGetCalibration(void);
-void McpParseCalibration(void);
-bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift);
-void McpSetCalibration(struct mcp_cal_registers_type *cal_registers);
-void McpSetSystemConfiguration(uint16 interval);
-void McpGetFrequency(void);
-void McpParseFrequency(void);
-void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency);
-void McpGetData(void);
-void McpParseData(void);
-void McpSerialInput(void);
-void McpEverySecond(void);
-void McpSnsInit(void);
-void McpDrvInit(void);
-bool McpCommand(void);
-bool Xnrg04(uint8_t function);
-void PzemAcEverySecond(void);
-void PzemAcSnsInit(void);
-void PzemAcDrvInit(void);
-bool PzemAcCommand(void);
-bool Xnrg05(uint8_t function);
-void PzemDcEverySecond(void);
-void PzemDcSnsInit(void);
-void PzemDcDrvInit(void);
-bool PzemDcCommand(void);
-bool Xnrg06(uint8_t function);
-int Ade7953RegSize(uint16_t reg);
-void Ade7953Write(uint16_t reg, uint32_t val);
-int32_t Ade7953Read(uint16_t reg);
-void Ade7953Init(void);
-void Ade7953GetData(void);
-void Ade7953EnergyEverySecond(void);
-void Ade7953DrvInit(void);
-bool Ade7953Command(void);
-bool Xnrg07(uint8_t function);
-void SDM120Every250ms(void);
-void Sdm120SnsInit(void);
-void Sdm120DrvInit(void);
-void Sdm220Reset(void);
-void Sdm220Show(bool json);
-bool Xnrg08(uint8_t function);
-void Dds2382EverySecond(void);
-void Dds2382SnsInit(void);
-void Dds2382DrvInit(void);
-bool Xnrg09(uint8_t function);
-void SDM630Every250ms(void);
-void Sdm630SnsInit(void);
-void Sdm630DrvInit(void);
-bool Xnrg10(uint8_t function);
-void DDSU666Every250ms(void);
-void Ddsu666SnsInit(void);
-void Ddsu666DrvInit(void);
-bool Xnrg11(uint8_t function);
-bool solaxX1_RS485ReceiveReady(void);
-void solaxX1_RS485Send(uint16_t msgLen);
-uint8_t solaxX1_RS485Receive(uint8_t *value);
-uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen);
-void solaxX1_SendInverterAddress(void);
-void solaxX1_QueryLiveData(void);
-uint8_t solaxX1_ParseErrorCode(uint32_t code);
-void solaxX1250MSecond(void);
-void solaxX1SnsInit(void);
-void solaxX1DrvInit(void);
-void solaxX1Show(bool json);
-bool Xnrg12(uint8_t function);
-void FifLEEvery250ms(void);
-void FifLESnsInit(void);
-void FifLEDrvInit(void);
-void FifLEReset(void);
-void FifLEShow(bool json);
-bool Xnrg13(uint8_t function);
-bool XnrgCall(uint8_t function);
-void CounterUpdate(uint8_t index);
-void CounterUpdate1(void);
-void CounterUpdate2(void);
-void CounterUpdate3(void);
-void CounterUpdate4(void);
-bool CounterPinState(void);
-void CounterInit(void);
-void CounterEverySecond(void);
-void CounterSaveState(void);
-void CounterShow(bool json);
-void CmndCounter(void);
-void CmndCounterType(void);
-void CmndCounterDebounce(void);
-bool Xsns01(uint8_t function);
-void AdcInit(void);
-uint16_t AdcRead(uint8_t factor);
-void AdcEvery250ms(void);
-uint16_t AdcGetLux(void);
-uint16_t AdcGetRange(void);
-void AdcGetCurrentPower(uint8_t factor);
-void AdcEverySecond(void);
-void AdcShow(bool json);
-void CmndAdc(void);
-void CmndAdcs(void);
-void CmndAdcParam(void);
-bool Xsns02(uint8_t function);
-void SonoffScSend(const char *data);
-void SonoffScInit(void);
-void SonoffScSerialInput(char *rcvstat);
-void SonoffScShow(bool json);
-bool Xsns04(uint8_t function);
-uint8_t OneWireReset(void);
-void OneWireWriteBit(uint8_t v);
-uint8_t OneWireReadBit(void);
-void OneWireWrite(uint8_t v);
-uint8_t OneWireRead(void);
-void OneWireSelect(const uint8_t rom[8]);
-void OneWireResetSearch(void);
-uint8_t OneWireSearch(uint8_t *newAddr);
-bool OneWireCrc8(uint8_t *addr);
-void Ds18x20Init(void);
-void Ds18x20Convert(void);
-bool Ds18x20Read(uint8_t sensor);
-void Ds18x20Name(uint8_t sensor);
-void Ds18x20EverySecond(void);
-void Ds18x20Show(bool json);
-bool Xsns05(uint8_t function);
-void DhtReadPrep(void);
-int32_t DhtExpectPulse(uint8_t sensor, bool level);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-void DhtReadPrep(void);
-int32_t DhtExpectPulse(uint8_t sensor, bool level);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtExpectPulse(uint8_t sensor, int level);
-int DhtReadDat(uint8_t sensor);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtExpectPulse(uint32_t sensor, uint32_t level);
-bool DhtRead(uint32_t sensor);
-void DhtReadTempHum(uint32_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtWaitState(uint32_t sensor, uint32_t level);
-bool DhtRead(uint32_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool ShtReset(void);
-bool ShtSendCommand(const uint8_t cmd);
-bool ShtAwaitResult(void);
-int ShtReadData(void);
-bool ShtRead(void);
-void ShtDetect(void);
-void ShtEverySecond(void);
-void ShtShow(bool json);
-bool Xsns07(uint8_t function);
-uint8_t HtuCheckCrc8(uint16_t data);
-uint8_t HtuReadDeviceId(void);
-void HtuSetResolution(uint8_t resolution);
-void HtuReset(void);
-void HtuHeater(uint8_t heater);
-void HtuInit(void);
-bool HtuRead(void);
-void HtuDetect(void);
-void HtuEverySecond(void);
-void HtuShow(bool json);
-bool Xsns08(uint8_t function);
-bool Bmp180Calibration(uint8_t bmp_idx);
-void Bmp180Read(uint8_t bmp_idx);
-bool Bmx280Calibrate(uint8_t bmp_idx);
-void Bme280Read(uint8_t bmp_idx);
-static void BmeDelayMs(uint32_t ms);
-bool Bme680Init(uint8_t bmp_idx);
-void Bme680Read(uint8_t bmp_idx);
-void BmpDetect(void);
-void BmpRead(void);
-void BmpShow(bool json);
-void BMP_EnterSleep(void);
-bool Xsns09(uint8_t function);
-bool Bh1750Read(void);
-void Bh1750Detect(void);
-void Bh1750EverySecond(void);
-void Bh1750Show(bool json);
-bool Xsns10(uint8_t function);
-void Veml6070Detect(void);
-void Veml6070UvTableInit(void);
-void Veml6070EverySecond(void);
-void Veml6070ModeCmd(bool mode_cmd);
-uint16_t Veml6070ReadUv(void);
-double Veml6070UvRiskLevel(uint16_t uv_level);
-double Veml6070UvPower(double uvrisk);
-void Veml6070Show(bool json);
-bool Xsns11(uint8_t function);
-void Ads1115StartComparator(uint8_t channel, uint16_t mode);
-int16_t Ads1115GetConversion(uint8_t channel);
-void Ads1115Detect(void);
-void Ads1115Show(bool json);
-bool Xsns12(uint8_t function);
-bool Ina219SetCalibration(uint8_t mode, uint16_t addr);
-float Ina219GetShuntVoltage_mV(uint16_t addr);
-float Ina219GetBusVoltage_V(uint16_t addr);
-float Ina219GetCurrent_mA(uint16_t addr);
-bool Ina219Read(void);
-bool Ina219CommandSensor(void);
-void Ina219Detect(void);
-void Ina219EverySecond(void);
-void Ina219Show(bool json);
-bool Xsns13(uint8_t function);
-bool Sht3xRead(float &t, float &h, uint8_t sht3x_address);
-void Sht3xDetect(void);
-void Sht3xShow(bool json);
-bool Xsns14(uint8_t function);
-uint8_t MhzCalculateChecksum(uint8_t *array);
-size_t MhzSendCmd(uint8_t command_id);
-bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s);
-void MhzEverySecond(void);
-bool MhzCommandSensor(void);
-void MhzInit(void);
-void MhzShow(bool json);
-bool Xsns15(uint8_t function);
-bool Tsl2561Read(void);
-void Tsl2561Detect(void);
-void Tsl2561EverySecond(void);
-void Tsl2561Show(bool json);
-bool Xsns16(uint8_t function);
-void Senseair250ms(void);
-void SenseairInit(void);
-void SenseairShow(bool json);
-bool Xsns17(uint8_t function);
-bool PmsReadData(void);
-void PmsSecond(void);
-void PmsInit(void);
-void PmsShow(bool json);
-bool Xsns18(uint8_t function);
-void MGSInit(void);
-void MGSPrepare(void);
-char* measure_gas(int gas_type, char* buffer);
-void MGSShow(bool json);
-bool Xsns19(uint8_t function);
-bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer);
-void NovaSdsSetWorkPeriod(void);
-bool NovaSdsReadData(void);
-void NovaSdsSecond(void);
-bool NovaSdsCommandSensor(void);
-void NovaSdsInit(void);
-void NovaSdsShow(bool json);
-bool Xsns20(uint8_t function);
-void sgp30_Init(void);
-float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit);
-void Sgp30Update(void);
-void Sgp30Show(bool json);
-bool Xsns21(uint8_t function);
-uint8_t Sr04TModeDetect(void);
-uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third);
-uint16_t Sr04TMode3Distance();
-uint16_t Sr04TMode2Distance(void);
-void Sr04TReading(void);
-void Sr04Show(bool json);
-bool Xsns22(uint8_t function);
-uint8_t Si1145ReadByte(uint8_t reg);
-uint16_t Si1145ReadHalfWord(uint8_t reg);
-bool Si1145WriteByte(uint8_t reg, uint16_t val);
-uint8_t Si1145WriteParamData(uint8_t p, uint8_t v);
-bool Si1145Present(void);
-void Si1145Reset(void);
-void Si1145DeInit(void);
-bool Si1145Begin(void);
-uint16_t Si1145ReadUV(void);
-uint16_t Si1145ReadVisible(void);
-uint16_t Si1145ReadIR(void);
-bool Si1145Read(void);
-void Si1145Detect(void);
-void Si1145Update(void);
-void Si1145Show(bool json);
-bool Xsns24(uint8_t function);
-void LM75ADDetect(void);
-float LM75ADGetTemp(void);
-void LM75ADShow(bool json);
-bool Xsns26(uint8_t function);
-int8_t wireReadDataBlock( uint8_t reg,
-                                        uint8_t *val,
-                                        uint16_t len);
-void calculateColorTemperature(void);
-bool APDS9960_init(void);
-uint8_t getMode(void);
-void setMode(uint8_t mode, uint8_t enable);
-void enableLightSensor(void);
-void disableLightSensor(void);
-void enableProximitySensor(void);
-void disableProximitySensor(void);
-void enableGestureSensor(void);
-void disableGestureSensor(void);
-bool isGestureAvailable(void);
-int16_t readGesture(void);
-void enablePower(void);
-void disablePower(void);
-void readAllColorAndProximityData(void);
-void resetGestureParameters(void);
-bool processGestureData(void);
-bool decodeGesture(void);
-void handleGesture(void);
-void APDS9960_adjustATime(void);
-void APDS9960_loop(void);
-void APDS9960_detect(void);
-void APDS9960_show(bool json);
-bool APDS9960CommandSensor(void);
-bool Xsns27(uint8_t function);
-void Tm16XXSend(uint8_t data);
-void Tm16XXSendCommand(uint8_t cmd);
-void TM16XXSendData(uint8_t address, uint8_t data);
-uint8_t Tm16XXReceive(void);
-void Tm16XXClearDisplay(void);
-void Tm1638SetLED(uint8_t color, uint8_t pos);
-void Tm1638SetLEDs(word leds);
-uint8_t Tm1638GetButtons(void);
-void TmInit(void);
-void TmLoop(void);
-bool Xsns28(uint8_t function);
-void MCP230xx_CheckForIntCounter(void);
-void MCP230xx_CheckForIntRetainer(void);
-const char* IntModeTxt(uint8_t intmo);
-uint8_t MCP230xx_readGPIO(uint8_t port);
-void MCP230xx_ApplySettings(void);
-void MCP230xx_Detect(void);
-void MCP230xx_CheckForInterrupt(void);
-void MCP230xx_Show(bool json);
-void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate);
-void MCP230xx_Reset(uint8_t pinmode);
-bool MCP230xx_Command(void);
-void MCP230xx_UpdateWebData(void);
-void MCP230xx_OutputTelemetry(void);
-void MCP230xx_Interrupt_Counter_Report(void);
-void MCP230xx_Interrupt_Retain_Report(void);
-bool Xsns29(uint8_t function);
-void Mpr121Init(struct mpr121 *pS, bool initial);
-void Mpr121Show(struct mpr121 *pS, uint8_t function);
-bool Xsns30(uint8_t function);
-void CCS811Detect(void);
-void CCS811Update(void);
-void CCS811Show(bool json);
-bool Xsns31(uint8_t function);
-void MPU_6050PerformReading(void);
-void MPU_6050Detect(void);
-void MPU_6050Show(bool json);
-bool Xsns32(uint8_t function);
-void DS3231Detect(void);
-uint8_t bcd2dec(uint8_t n);
-uint8_t dec2bcd(uint8_t n);
-uint32_t ReadFromDS3231(void);
-void SetDS3231Time (uint32_t epoch_time);
-void DS3231EverySecond(void);
-bool Xsns33(uint8_t function);
-bool HxIsReady(uint16_t timeout);
-long HxRead(void);
-void HxResetPart(void);
-void HxReset(void);
-void HxCalibrationStateTextJson(uint8_t msg_id);
-void SetWeightDelta();
-bool HxCommand(void);
-long HxWeight(void);
-void HxInit(void);
-void HxEvery100mSecond(void);
-void HxSaveBeforeRestart(void);
-void HxShow(bool json);
-void HandleHxAction(void);
-void HxSaveSettings(void);
-void HxLogUpdates(void);
-bool Xsns34(uint8_t function);
-void Tx20StartRead(void);
-void Tx20Read(void);
-void Tx20Init(void);
-void Tx20Show(bool json);
-bool Xsns35(uint8_t function);
-void MGC3130_handleSensorData();
-void MGC3130_sendMessage(uint8_t data[], uint8_t length);
-void MGC3130_handleGesture();
-bool MGC3130_handleTouch();
-void MGC3130_handleAirWheel();
-void MGC3130_handleSystemStatus();
-bool MGC3130_receiveMessage();
-bool MGC3130_readData();
-void MGC3130_nextMode();
-void MGC3130_loop();
-void MGC3130_detect(void);
-void MGC3130_show(bool json);
-bool MGC3130CommandSensor();
-bool Xsns36(uint8_t function);
-bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal);
-void RfSnsInitTheoV2(void);
-void RfSnsAnalyzeTheov2(void);
-void RfSnsTheoV2Show(bool json);
-void RfSnsInitAlectoV2(void);
-void RfSnsAnalyzeAlectov2();
-void RfSnsAlectoResetRain(void);
-uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len);
-void RfSnsAlectoV2Show(bool json);
-void RfSnsInit(void);
-void RfSnsAnalyzeRawSignal(void);
-void RfSnsEverySecond(void);
-void RfSnsShow(bool json);
-bool Xsns37(uint8_t function);
-void AzEverySecond(void);
-void AzInit(void);
-void AzShow(bool json);
-bool Xsns38(uint8_t function);
-void MAX31855_Init(void);
-void MAX31855_GetResult(void);
-float MAX31855_GetProbeTemperature(int32_t RawData);
-float MAX31855_GetReferenceTemperature(int32_t RawData);
-int32_t MAX31855_ShiftIn(uint8_t Length);
-void MAX31855_Show(bool Json);
-bool Xsns39(uint8_t function);
-void PN532_Init(void);
-int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout);
-int8_t PN532_readAckFrame(void);
-uint32_t PN532_getFirmwareVersion(void);
-void PN532_wakeup(void);
-bool PN532_setPassiveActivationRetries(uint8_t maxRetries);
-bool PN532_SAMConfig(void);
-uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData);
-uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data);
-uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data);
-void PN532_ScanForTag(void);
-bool PN532_Command(void);
-bool Xsns40(uint8_t function);
-bool Max4409Read_lum(void);
-void Max4409Detect(void);
-void Max4409EverySecond(void);
-void Max4409Show(bool json);
-bool Xsns41(uint8_t function);
-void Scd30Detect(void);
-void Scd30Update(void);
-int Scd30GetCommand(int command_code, uint16_t *pvalue);
-int Scd30SetCommand(int command_code, uint16_t value);
-bool Scd30CommandSensor();
-void Scd30Show(bool json);
-bool Xsns42(byte function);
-int hreReadBit();
-char hreReadChar(int &parity_errors);
-void hreInit(void);
-void hreEvery50ms(void);
-void hreShow(boolean json);
-bool Xsns43(byte function);
-uint8_t sps30_calc_CRC(uint8_t *data);
-void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen);
-void sps30_cmd(uint16_t cmd);
-void SPS30_Detect(void);
-void SPS30_Every_Second();
-void SPS30_Show(bool json);
-bool SPS30_cmd(void);
-bool Xsns44(byte function);
-void Vl53l0Detect(void);
-void Vl53l0Every_250MSecond(void);
-void Vl53l0Show(boolean json);
-bool Xsns45(byte function);
-void MLX90614_Init(void);
-void MLX90614_Every_Second(void);
-void MLX90614_Show(uint8_t json);
-bool Xsns46(byte function);
-void MAX31865_Init(void);
-void MAX31865_GetResult(void);
-void MAX31865_Show(bool Json);
-bool Xsns47(uint8_t function);
-void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg);
-uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr);
-void ChirpReset(uint8_t addr);
-void ChirpResetAll(void);
-void ChirpClockSet();
-void ChirpSleep(uint8_t addr);
-void ChirpSelect(uint8_t sensor);
-uint8_t ChirpReadVersion(uint8_t addr);
-bool ChirpSet(uint8_t addr);
-bool ChirpScan();
-void ChirpDetect(void);
-void ChirpServiceAllSensors(uint8_t job);
-void ChirpEvery100MSecond(void);
-void ChirpShow(bool json);
-bool ChirpCmd(void);
-bool Xsns48(uint8_t function);
-void PAJ7620SelectBank(uint8_t bank);
-void PAJ7620DecodeGesture(void);
-void PAJ7620ReadGesture(void);
-void PAJ7620Detect(void);
-void PAJ7620Init(void);
-void PAJ7620Loop(void);
-void PAJ7620Show(bool json);
-bool PAJ7620CommandSensor(void);
-bool Xsns50(uint8_t function);
-void RDM6300_Init();
-void RDM6300_ScanForTag();
-uint8_t rm6300_hexnibble(char chr);
-void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[]);
-void RDM6300_Show(void);
-bool Xsns51(byte function);
-void IBEACON_Init();
-void hm17_every_second(void);
-void hm17_sbclr(void);
-void hm17_sendcmd(uint8_t cmd);
-uint32_t ibeacon_add(struct IBEACON *ib);
-void hm17_decode(void);
-void IBEACON_loop();
-void IBEACON_Show(void);
-bool xsns52_cmd(void);
-bool ibeacon_cmd(void);
-void ib_sendbeep(void);
-void ibeacon_mqtt(const char *mac,const char *rssi);
-bool Xsns52(byte function);
-double sml_median_array(double *array,uint8_t len);
-double sml_median(struct SML_MEDIAN_FILTER* mf, double in);
-void ADS1115_init(void);
-bool Serial_available();
-uint8_t Serial_read();
-uint8_t Serial_peek();
-void Dump2log(void);
-double sml_getvalue(unsigned char *cp,uint8_t index);
-uint8_t hexnibble(char chr);
-double CharToDouble(const char *str);
-void ebus_esc(uint8_t *ebus_buffer, unsigned char len);
-uint8_t ebus_crc8(uint8_t data, uint8_t crc_init);
-uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen );
-void sml_empty_receiver(uint32_t meters);
-void sml_shift_in(uint32_t meters,uint32_t shard);
-void SML_Poll(void);
-void SML_Decode(uint8_t index);
-void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex);
-void SML_Show(boolean json);
-void SML_CounterUpd(uint8_t index);
-void SML_CounterUpd1(void);
-void SML_CounterUpd2(void);
-void SML_CounterUpd3(void);
-void SML_CounterUpd4(void);
-bool Gpio_used(uint8_t gpiopin);
-void SML_Init(void);
-uint32_t SML_SetBaud(uint32_t meter, uint32_t br);
-uint32_t SML_Write(uint32_t meter,char *hstr);
-void SetDBGLed(uint8_t srcpin, uint8_t ledpin);
-void SML_Counter_Poll(void);
-void SML_Check_Send(void);
-uint8_t sml_hexnibble(char chr);
-void SML_Send_Seq(uint32_t meter,char *seq);
-uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num);
-uint8_t SML_PzemCrc(uint8_t *data, uint8_t len);
-uint8_t CalcEvenParity(uint8_t data);
-bool XSNS_53_cmd(void);
-void InjektCounterValue(uint8_t meter,uint32_t counter);
-void SML_CounterSaveState(void);
-bool Xsns53(byte function);
-static uint32_t _expand_r_shunt(uint16_t compact_r_shunt);
-void Ina226SetCalibration(uint8_t slaveIndex);
-bool Ina226TestPresence(uint8_t device);
-void Ina226ResetActive(void);
-void Ina226Init();
-float Ina226ReadBus_v(uint8_t device);
-float Ina226ReadShunt_i(uint8_t device);
-float Ina226ReadPower_w(uint8_t device);
-void Ina226Read(uint8_t device);
-void Ina226EverySecond();
-bool Ina226CommandSensor();
-void Ina226Show(bool json);
-bool Xsns54(byte callback_id);
-bool Hih6Read(void);
-void Hih6Detect(void);
-void Hih6EverySecond(void);
-void Hih6Show(bool json);
-bool Xsns55(uint8_t function);
-void HpmaSecond(void);
-void HpmaInit(void);
-void HpmaShow(bool json);
-bool Xsns56(uint8_t function);
-void Tsl2591Init(void);
-bool Tsl2591Read(void);
-void Tsl2591EverySecond(void);
-void Tsl2591Show(bool json);
-bool Xsns57(uint8_t function);
-bool Dht12Read(void);
-void Dht12Detect(void);
-void Dht12EverySecond(void);
-void Dht12Show(bool json);
-bool Xsns58(uint8_t function);
-uint32_t DS1624_Idx2Addr(uint32_t idx);
-int DS1624_Restart(uint8_t config, uint32_t idx);
-void DS1624_HotPlugUp(uint32_t idx);
-void DS1624_HotPlugDown(int idx);
-bool DS1624GetTemp(float *value, int idx);
-void DS1624HotPlugScan(void);
-void DS1624EverySecond(void);
-void DS1624Show(bool json);
-bool Xsns59(uint8_t function);
-void UBXcalcChecksum(char* CK, size_t msgSize);
-bool UBXcompareMsgHeader(const char* msgHeader);
-void UBXinitCFG(void);
-void UBXTriggerTele(void);
-void UBXDetect(void);
-uint32_t UBXprocessGPS();
-void UBXsendHeader(void);
-void UBXsendRecord(uint8_t *buf);
-void UBXsendFooter(void);
-void UBXsendFile(void);
-void UBXSetRate(uint16_t interval);
-void UBXSelectMode(uint16_t mode);
-bool UBXHandlePOSLLH();
-void UBXHandleSTATUS();
-void UBXHandleTIME();
-void UBXHandleOther(void);
-void UBXLoop50msec(void);
-void UBXLoop(void);
-void UBXShow(bool json);
-bool UBXCmd(void);
-bool Xsns60(uint8_t function);
-bool MINRFinitBLE(uint8_t _mode);
-void MINRFhopChannel();
-bool MINRFreceivePacket(void);
-void MINRFswapbuf(uint8_t len);
-void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr);
-void MINRFreverseMAC(uint8_t _mac[]);
-void MINRFchangePacketModeTo(uint8_t _mode);
-void MINRFpurgeFakeSensors(void);
-void MINRFhandleFloraPacket(void);
-void MINRFhandleMJ_HT_V1Packet(void);
-void MINRFhandleLYWSD02Packet(void);
-void MINRFhandleLYWSD03Packet(void);
-void MINRF_EVERY_50_MSECOND();
-void MINRFShow(bool json);
-bool Xsns61(uint8_t function);
-void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay);
-void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot);
-void HM10_Reset(void);
-void HM10_Discovery_Scan(void);
-void HM10_Read_LYWSD03(void);
-void HM10_Read_LYWSD02(void);
-void HM10_Time_LYWSD02(void);
-void HM10SerialInit(void);
-void HM10MACStringToBytes(const char* string, uint8_t _mac[]);
-void HM10ParseResponse(char *buf);
-void HM10readTempHum(char *_buf);
-bool HM10readBat(char *_buf);
-bool HM10SerialHandleFeedback();
-void HM10_TaskEvery100ms();
-void HM10EverySecond();
-bool HM10Cmd(void);
-void HM10Show(bool json);
-bool Xsns62(uint8_t function);
-bool begin();
-bool AHT10Read(void);
-unsigned char readStatus(void);
-void AHT10Detect(void);
-void AHT10EverySecond(void);
-void AHT10Show(bool json);
-bool Xsns64(uint8_t function);
-void HandleMetrics(void);
-bool Xsns91(uint8_t function);
-bool XsnsEnabled(uint32_t sns_index);
-void XsnsSensorState(void);
-bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index);
-bool XsnsCall(uint8_t Function);
-bool I2cEnabled(uint32_t i2c_index);
-void I2cDriverState(void);
-#line 184 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota.ino"
-void setup(void)
-{
-  global_state.data = 3;
-
-  RtcRebootLoad();
-  if (!RtcRebootValid()) {
-    RtcReboot.fast_reboot_count = 0;
-  }
-  RtcReboot.fast_reboot_count++;
-  RtcRebootSave();
-
-  Serial.begin(APP_BAUDRATE);
-  seriallog_level = LOG_LEVEL_INFO;
-
-  snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);
-  if (VERSION & 0xff) {
-    snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
-  }
-
-  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
-
-  SettingsLoad();
-  SettingsDelta();
-
-  OsWatchInit();
-
-  GetFeatures();
-
-  if (1 == RtcReboot.fast_reboot_count) {
-    UpdateQuickPowerCycle(true);
-    XdrvCall(FUNC_SETTINGS_OVERRIDE);
-  }
-
-
-  seriallog_level = Settings.seriallog_level;
-  seriallog_timer = SERIALLOG_TIMER;
-  syslog_level = Settings.syslog_level;
-  stop_flash_rotate = Settings.flag.stop_flash_rotate;
-  save_data_counter = Settings.save_data;
-  sleep = Settings.sleep;
-#ifndef USE_EMULATION
-  Settings.flag2.emulation = 0;
-#else
-#ifndef USE_EMULATION_WEMO
-  if (EMUL_WEMO == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
-#endif
-#ifndef USE_EMULATION_HUE
-  if (EMUL_HUE == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
-#endif
-#endif
-
-  if (Settings.param[P_BOOT_LOOP_OFFSET]) {
-
-    if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET]) {
-      Settings.flag3.user_esp8285_enable = 0;
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +1) {
-        for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-          if (bitRead(Settings.rule_stop, i)) {
-            bitWrite(Settings.rule_enabled, i, 0);
-          }
-        }
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +2) {
-        Settings.rule_enabled = 0;
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +3) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          Settings.my_gp.io[i] = GPIO_NONE;
-        }
-        Settings.my_adc0 = ADC0_NONE;
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +4) {
-        Settings.module = SONOFF_BASIC;
-
-      }
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
-    }
-  }
-
-  Format(mqtt_client, SettingsText(SET_MQTT_CLIENT), sizeof(mqtt_client));
-  Format(mqtt_topic, SettingsText(SET_MQTT_TOPIC), sizeof(mqtt_topic));
-  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME), mqtt_topic, ESP.getChipId() & 0x1FFF);
-  } else {
-    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME));
-  }
-
-  GetEspHardwareType();
-  GpioInit();
-
-
-
-  WifiConnect();
-
-  SetPowerOnState();
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE), PROJECT, SettingsText(SET_FRIENDLYNAME1), my_version, my_image);
-#ifdef FIRMWARE_MINIMAL
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_WARNING_MINIMAL_VERSION));
-#endif
-
-  memcpy_P(log_data, VERSION_MARKER, 1);
-
-  RtcInit();
-
-#ifdef USE_ARDUINO_OTA
-  ArduinoOTAInit();
-#endif
-
-  XdrvCall(FUNC_INIT);
-  XsnsCall(FUNC_INIT);
-}
-
-void BacklogLoop(void)
-{
-  if (TimeReached(backlog_delay)) {
-    if (!BACKLOG_EMPTY && !backlog_mutex) {
-#ifdef SUPPORT_IF_STATEMENT
-      backlog_mutex = true;
-      String cmd = backlog.shift();
-      backlog_mutex = false;
-      ExecuteCommand((char*)cmd.c_str(), SRC_BACKLOG);
-#else
-      backlog_mutex = true;
-      ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
-      backlog_pointer++;
-      if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
-      backlog_mutex = false;
-#endif
-    }
-  }
-}
-
-void loop(void)
-{
-  uint32_t my_sleep = millis();
-
-  XdrvCall(FUNC_LOOP);
-  XsnsCall(FUNC_LOOP);
-
-  OsWatchLoop();
-
-  ButtonLoop();
-  SwitchLoop();
-#ifdef ROTARY_V1
-  RotaryLoop();
-#endif
-  BacklogLoop();
-
-  if (TimeReached(state_50msecond)) {
-    SetNextTimeInterval(state_50msecond, 50);
-    XdrvCall(FUNC_EVERY_50_MSECOND);
-    XsnsCall(FUNC_EVERY_50_MSECOND);
-  }
-  if (TimeReached(state_100msecond)) {
-    SetNextTimeInterval(state_100msecond, 100);
-    Every100mSeconds();
-    XdrvCall(FUNC_EVERY_100_MSECOND);
-    XsnsCall(FUNC_EVERY_100_MSECOND);
-  }
-  if (TimeReached(state_250msecond)) {
-    SetNextTimeInterval(state_250msecond, 250);
-    Every250mSeconds();
-    XdrvCall(FUNC_EVERY_250_MSECOND);
-    XsnsCall(FUNC_EVERY_250_MSECOND);
-  }
-  if (TimeReached(state_second)) {
-    SetNextTimeInterval(state_second, 1000);
-    PerformEverySecond();
-    XdrvCall(FUNC_EVERY_SECOND);
-    XsnsCall(FUNC_EVERY_SECOND);
-  }
-
-  if (!serial_local) { SerialInput(); }
-
-#ifdef USE_ARDUINO_OTA
-  ArduinoOtaLoop();
-#endif
-
-  uint32_t my_activity = millis() - my_sleep;
-
-  if (Settings.flag3.sleep_normal) {
-
-    delay(sleep);
-  } else {
-    if (my_activity < (uint32_t)sleep) {
-      delay((uint32_t)sleep - my_activity);
-    } else {
-      if (global_state.wifi_down) {
-        delay(my_activity /2);
-      }
-    }
-  }
-
-  if (!my_activity) { my_activity++; }
-  uint32_t loop_delay = sleep;
-  if (!loop_delay) { loop_delay++; }
-  uint32_t loops_per_second = 1000 / loop_delay;
-  uint32_t this_cycle_ratio = 100 * my_activity / loop_delay;
-  loop_load_avg = loop_load_avg - (loop_load_avg / loops_per_second) + (this_cycle_ratio / loops_per_second);
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/sendemail.ino"
-#ifdef USE_SENDMAIL
-
-#include "sendemail.h"
-# 25 "C:/shared/sonoff/Git/Tasmota/tasmota/sendemail.ino"
-#ifndef SEND_MAIL_MINRAM
-#define SEND_MAIL_MINRAM 12*1024
-#endif
-
-#define xPSTR(a) a
-
-uint16_t SendMail(char *buffer) {
-  char *params,*oparams;
-  const char *mserv;
-  uint16_t port;
-  const char *user;
-  const char *pstr;
-  const char *passwd;
-  const char *from;
-  const char *to;
-  const char *subject;
-  const char *cmd;
-  char auth=0;
-  uint16_t status=1;
-  SendEmail *mail=0;
-  uint16_t blen;
-  char *endcmd;
-
-
-
-  uint16_t mem=ESP.getFreeHeap();
-  if (mem<SEND_MAIL_MINRAM) {
-    return 4;
-  }
-
-  while (*buffer==' ') buffer++;
-
-  if (*buffer!='[') {
-      goto exit;
-  }
-
-  buffer++;
-
-  endcmd=strchr(buffer,']');
-  if (!endcmd) {
-    goto exit;
-  }
-
-
-  blen=(uint32_t)endcmd-(uint32_t)buffer;
-  oparams=(char*)calloc(blen+2,1);
-  if (!oparams) return 4;
-  params=oparams;
-  strncpy(oparams,buffer,blen+2);
-  oparams[blen]=0;
-
-  cmd=endcmd+1;
-
-  #ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("mailsize: %d"),blen);
-  #endif
-
-  mserv=strtok(params,":");
-  if (!mserv) {
-      goto exit;
-  }
-
-
-  pstr=strtok(NULL,":");
-  if (!pstr) {
-      goto exit;
-  }
-
-#ifdef EMAIL_PORT
-  if (*pstr=='*') {
-    port=EMAIL_PORT;
-  } else {
-    port=atoi(pstr);
-  }
-#else
-  port=atoi(pstr);
-#endif
-
-  user=strtok(NULL,":");
-  if (!user) {
-      goto exit;
-  }
-
-  passwd=strtok(NULL,":");
-  if (!passwd) {
-      goto exit;
-  }
-
-  from=strtok(NULL,":");
-  if (!from) {
-      goto exit;
-  }
-
-  to=strtok(NULL,":");
-  if (!to) {
-      goto exit;
-  }
-
-  subject=strtok(NULL,"]");
-  if (!subject) {
-      goto exit;
-  }
-
-
-#ifdef EMAIL_USER
-  if (*user=='*') {
-    user=xPSTR(EMAIL_USER);
-  }
-#endif
-#ifdef EMAIL_PASSWORD
-  if (*passwd=='*') {
-    passwd=xPSTR(EMAIL_PASSWORD);
-  }
-#endif
-#ifdef EMAIL_SERVER
-  if (*mserv=='*') {
-    mserv=xPSTR(EMAIL_SERVER);
-  }
-#endif
-
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %d - %s - %s"),mserv,port,user,passwd);
-#endif
-
-
-#ifndef MAIL_TIMEOUT
-  #define MAIL_TIMEOUT 2000
-#endif
-  mail = new SendEmail(mserv,port,user,passwd, MAIL_TIMEOUT, auth);
-
-#ifdef EMAIL_FROM
-  if (*from=='*') {
-    from=xPSTR(EMAIL_FROM);
-  }
-#endif
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %s - %s - %s"),from,to,subject,cmd);
-#endif
-
-  if (mail) {
-    bool result=mail->send(from,to,subject,cmd);
-    delete mail;
-    if (result==true) status=0;
-  }
-
-exit:
-  if (oparams) free(oparams);
-  return status;
-}
-
-void script_send_email_body(BearSSL::WiFiClientSecure_light *client);
-
-
-SendEmail::SendEmail(const String& host, const int port, const String& user, const String& passwd, const int timeout, const int auth_used) :
-    host(host), port(port), user(user), passwd(passwd), timeout(timeout), ssl(ssl), auth_used(auth_used), client(new BearSSL::WiFiClientSecure_light(1024,1024)) {
-}
-
-String SendEmail::readClient() {
-  delay(0);
-  String r = client->readStringUntil('\n');
-
-  r.trim();
-  while (client->available()) {
-    delay(0);
-    r += client->readString();
-  }
-  return r;
-}
-
-bool SendEmail::send(const String& from, const String& to, const String& subject, const char *msg) {
-bool status=false;
-String buffer;
-
-  if (!host.length()) {
-    return status;
-  }
-
-  client->setTimeout(timeout);
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("Connecting: %s on port %d"),host.c_str(),port);
-#endif
-
-  if (!client->connect(host.c_str(), port)) {
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P(LOG_LEVEL_INFO, PSTR("Connection failed"));
-#endif
-    goto exit;
-  }
-
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("220"))) {
-    goto exit;
-  }
-
-  buffer = F("EHLO ");
-  buffer += client->localIP().toString();
-
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-  if (user.length()>0 && passwd.length()>0 ) {
-
-    buffer = F("AUTH LOGIN");
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("334")))
-    {
-      goto exit;
-    }
-    base64 b;
-    buffer = b.encode(user);
-
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("334"))) {
-      goto exit;
-    }
-    buffer = b.encode(passwd);
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("235"))) {
-      goto exit;
-    }
-  }
-
-
-  buffer = F("MAIL FROM:");
-  buffer += from;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-  buffer = F("RCPT TO:");
-  buffer += to;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-
-  buffer = F("DATA");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("354"))) {
-    goto exit;
-  }
-  buffer = F("From: ");
-  buffer += from;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = F("To: ");
-  buffer += to;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = F("Subject: ");
-  buffer += subject;
-  buffer += F("\r\n");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-#ifdef USE_SCRIPT
-  if (*msg=='*' && *(msg+1)==0) {
-    script_send_email_body(client);
-  } else {
-    client->println(msg);
-  }
-#else
-  client->println(msg);
-#endif
-  client->println('.');
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-  buffer = F("QUIT");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-  status=true;
-exit:
-
-  return status;
-}
-
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-#ifndef DOMOTICZ_UPDATE_TIMER
-#define DOMOTICZ_UPDATE_TIMER 0
-#endif
-
-#ifndef EMULATION
-#define EMULATION EMUL_NONE
-#endif
-
-#ifndef MTX_ADDRESS1
-#define MTX_ADDRESS1 0
-#endif
-#ifndef MTX_ADDRESS2
-#define MTX_ADDRESS2 0
-#endif
-#ifndef MTX_ADDRESS3
-#define MTX_ADDRESS3 0
-#endif
-#ifndef MTX_ADDRESS4
-#define MTX_ADDRESS4 0
-#endif
-#ifndef MTX_ADDRESS5
-#define MTX_ADDRESS5 0
-#endif
-#ifndef MTX_ADDRESS6
-#define MTX_ADDRESS6 0
-#endif
-#ifndef MTX_ADDRESS7
-#define MTX_ADDRESS7 0
-#endif
-#ifndef MTX_ADDRESS8
-#define MTX_ADDRESS8 0
-#endif
-
-#ifndef HOME_ASSISTANT_DISCOVERY_ENABLE
-#define HOME_ASSISTANT_DISCOVERY_ENABLE 0
-#endif
-
-#ifndef LATITUDE
-#define LATITUDE 48.858360
-#endif
-#ifndef LONGITUDE
-#define LONGITUDE 2.294442
-#endif
-
-#ifndef WORKING_PERIOD
-#define WORKING_PERIOD 5
-#endif
-
-#ifndef COLOR_TEXT
-#define COLOR_TEXT "#000"
-#endif
-#ifndef COLOR_BACKGROUND
-#define COLOR_BACKGROUND "#fff"
-#endif
-#ifndef COLOR_FORM
-#define COLOR_FORM "#f2f2f2"
-#endif
-#ifndef COLOR_INPUT_TEXT
-#define COLOR_INPUT_TEXT "#000"
-#endif
-#ifndef COLOR_INPUT
-#define COLOR_INPUT "#fff"
-#endif
-#ifndef COLOR_CONSOLE_TEXT
-#define COLOR_CONSOLE_TEXT "#000"
-#endif
-#ifndef COLOR_CONSOLE
-#define COLOR_CONSOLE "#fff"
-#endif
-#ifndef COLOR_TEXT_WARNING
-#define COLOR_TEXT_WARNING "#f00"
-#endif
-#ifndef COLOR_TEXT_SUCCESS
-#define COLOR_TEXT_SUCCESS "#008000"
-#endif
-#ifndef COLOR_BUTTON_TEXT
-#define COLOR_BUTTON_TEXT "#fff"
-#endif
-#ifndef COLOR_BUTTON
-#define COLOR_BUTTON "#1fa3ec"
-#endif
-#ifndef COLOR_BUTTON_HOVER
-#define COLOR_BUTTON_HOVER "#0e70a4"
-#endif
-#ifndef COLOR_BUTTON_RESET
-#define COLOR_BUTTON_RESET "#d43535"
-#endif
-#ifndef COLOR_BUTTON_RESET_HOVER
-#define COLOR_BUTTON_RESET_HOVER "#931f1f"
-#endif
-#ifndef COLOR_BUTTON_SAVE
-#define COLOR_BUTTON_SAVE "#47c266"
-#endif
-#ifndef COLOR_BUTTON_SAVE_HOVER
-#define COLOR_BUTTON_SAVE_HOVER "#5aaf6f"
-#endif
-#ifndef COLOR_TIMER_TAB_TEXT
-#define COLOR_TIMER_TAB_TEXT "#fff"
-#endif
-#ifndef COLOR_TIMER_TAB_BACKGROUND
-#define COLOR_TIMER_TAB_BACKGROUND "#999"
-#endif
-#ifndef COLOR_TITLE_TEXT
-#define COLOR_TITLE_TEXT COLOR_TEXT
-#endif
-#ifndef IR_RCV_MIN_UNKNOWN_SIZE
-#define IR_RCV_MIN_UNKNOWN_SIZE 6
-#endif
-#ifndef ENERGY_OVERTEMP
-#define ENERGY_OVERTEMP 90
-#endif
-#ifndef DEFAULT_DIMMER_MAX
-#define DEFAULT_DIMMER_MAX 100
-#endif
-#ifndef DEFAULT_DIMMER_MIN
-#define DEFAULT_DIMMER_MIN 0
-#endif
-#ifndef DEFAULT_LIGHT_DIMMER
-#define DEFAULT_LIGHT_DIMMER 10
-#endif
-#ifndef DEFAULT_LIGHT_COMPONENT
-#define DEFAULT_LIGHT_COMPONENT 255
-#endif
-#ifndef CORS_ENABLED_ALL
-#define CORS_ENABLED_ALL "*"
-#endif
-
-
-enum WebColors {
-  COL_TEXT, COL_BACKGROUND, COL_FORM,
-  COL_INPUT_TEXT, COL_INPUT, COL_CONSOLE_TEXT, COL_CONSOLE,
-  COL_TEXT_WARNING, COL_TEXT_SUCCESS,
-  COL_BUTTON_TEXT, COL_BUTTON, COL_BUTTON_HOVER, COL_BUTTON_RESET, COL_BUTTON_RESET_HOVER, COL_BUTTON_SAVE, COL_BUTTON_SAVE_HOVER,
-  COL_TIMER_TAB_TEXT, COL_TIMER_TAB_BACKGROUND, COL_TITLE,
-  COL_LAST };
-
-const char kWebColors[] PROGMEM =
-  COLOR_TEXT "|" COLOR_BACKGROUND "|" COLOR_FORM "|"
-  COLOR_INPUT_TEXT "|" COLOR_INPUT "|" COLOR_CONSOLE_TEXT "|" COLOR_CONSOLE "|"
-  COLOR_TEXT_WARNING "|" COLOR_TEXT_SUCCESS "|"
-  COLOR_BUTTON_TEXT "|" COLOR_BUTTON "|" COLOR_BUTTON_HOVER "|" COLOR_BUTTON_RESET "|" COLOR_BUTTON_RESET_HOVER "|" COLOR_BUTTON_SAVE "|" COLOR_BUTTON_SAVE_HOVER "|"
-  COLOR_TIMER_TAB_TEXT "|" COLOR_TIMER_TAB_BACKGROUND "|" COLOR_TITLE_TEXT;
-
-enum TasmotaSerialConfig {
-  TS_SERIAL_5N1, TS_SERIAL_6N1, TS_SERIAL_7N1, TS_SERIAL_8N1,
-  TS_SERIAL_5N2, TS_SERIAL_6N2, TS_SERIAL_7N2, TS_SERIAL_8N2,
-  TS_SERIAL_5E1, TS_SERIAL_6E1, TS_SERIAL_7E1, TS_SERIAL_8E1,
-  TS_SERIAL_5E2, TS_SERIAL_6E2, TS_SERIAL_7E2, TS_SERIAL_8E2,
-  TS_SERIAL_5O1, TS_SERIAL_6O1, TS_SERIAL_7O1, TS_SERIAL_8O1,
-  TS_SERIAL_5O2, TS_SERIAL_6O2, TS_SERIAL_7O2, TS_SERIAL_8O2 };
-
-const uint8_t kTasmotaSerialConfig[] PROGMEM = {
-  SERIAL_5N1, SERIAL_6N1, SERIAL_7N1, SERIAL_8N1,
-  SERIAL_5N2, SERIAL_6N2, SERIAL_7N2, SERIAL_8N2,
-  SERIAL_5E1, SERIAL_6E1, SERIAL_7E1, SERIAL_8E1,
-  SERIAL_5E2, SERIAL_6E2, SERIAL_7E2, SERIAL_8E2,
-  SERIAL_5O1, SERIAL_6O1, SERIAL_7O1, SERIAL_8O1,
-  SERIAL_5O2, SERIAL_6O2, SERIAL_7O2, SERIAL_8O2
-};
-
-
-
-
-
-const uint16_t RTC_MEM_VALID = 0xA55A;
-
-uint32_t rtc_settings_crc = 0;
-
-uint32_t GetRtcSettingsCrc(void)
-{
-  uint32_t crc = 0;
-  uint8_t *bytes = (uint8_t*)&RtcSettings;
-
-  for (uint32_t i = 0; i < sizeof(RTCMEM); i++) {
-    crc += bytes[i]*(i+1);
-  }
-  return crc;
-}
-
-void RtcSettingsSave(void)
-{
-  if (GetRtcSettingsCrc() != rtc_settings_crc) {
-    RtcSettings.valid = RTC_MEM_VALID;
-    ESP.rtcUserMemoryWrite(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
-    rtc_settings_crc = GetRtcSettingsCrc();
-  }
-}
-
-void RtcSettingsLoad(void)
-{
-  ESP.rtcUserMemoryRead(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
-  if (RtcSettings.valid != RTC_MEM_VALID) {
-    memset(&RtcSettings, 0, sizeof(RTCMEM));
-    RtcSettings.valid = RTC_MEM_VALID;
-    RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
-    RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
-    RtcSettings.energy_usage = Settings.energy_usage;
-    for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-      RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
-    }
-    RtcSettings.power = Settings.power;
-    RtcSettingsSave();
-  }
-  rtc_settings_crc = GetRtcSettingsCrc();
-}
-
-bool RtcSettingsValid(void)
-{
-  return (RTC_MEM_VALID == RtcSettings.valid);
-}
-
-
-
-uint32_t rtc_reboot_crc = 0;
-
-uint32_t GetRtcRebootCrc(void)
-{
-  uint32_t crc = 0;
-  uint8_t *bytes = (uint8_t*)&RtcReboot;
-
-  for (uint32_t i = 0; i < sizeof(RTCRBT); i++) {
-    crc += bytes[i]*(i+1);
-  }
-  return crc;
-}
-
-void RtcRebootSave(void)
-{
-  if (GetRtcRebootCrc() != rtc_reboot_crc) {
-    RtcReboot.valid = RTC_MEM_VALID;
-    ESP.rtcUserMemoryWrite(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
-    rtc_reboot_crc = GetRtcRebootCrc();
-  }
-}
-
-void RtcRebootReset(void)
-{
-  RtcReboot.fast_reboot_count = 0;
-  RtcRebootSave();
-}
-
-void RtcRebootLoad(void)
-{
-  ESP.rtcUserMemoryRead(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
-  if (RtcReboot.valid != RTC_MEM_VALID) {
-    memset(&RtcReboot, 0, sizeof(RTCRBT));
-    RtcReboot.valid = RTC_MEM_VALID;
-
-    RtcRebootSave();
-  }
-  rtc_reboot_crc = GetRtcRebootCrc();
-}
-
-bool RtcRebootValid(void)
-{
-  return (RTC_MEM_VALID == RtcReboot.valid);
-}
-
-
-
-
-
-extern "C" {
-#include "spi_flash.h"
-}
-#include "eboot_command.h"
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-
-extern "C" uint32_t _SPIFFS_end;
-
-const uint32_t SPIFFS_END = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#else
-
-#if AUTOFLASHSIZE
-
-#include "flash_hal.h"
-
-
-const uint32_t SPIFFS_END = (FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#else
-
-extern "C" uint32_t _FS_end;
-
-const uint32_t SPIFFS_END = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#endif
-
-#endif
-
-
-const uint32_t SETTINGS_LOCATION = SPIFFS_END;
-
-const uint8_t CFG_ROTATES = 8;
-
-uint32_t settings_location = SETTINGS_LOCATION;
-uint32_t settings_crc32 = 0;
-uint8_t *settings_buffer = nullptr;
-
-
-
-
-
-void SetFlashModeDout(void)
-{
-  uint8_t *_buffer;
-  uint32_t address;
-
-  eboot_command ebcmd;
-  eboot_command_read(&ebcmd);
-  address = ebcmd.args[0];
-  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
-
-  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
-    if (_buffer[2] != 3) {
-      _buffer[2] = 3;
-      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
-        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
-      }
-    }
-  }
-  delete[] _buffer;
-}
-
-bool VersionCompatible(void)
-{
-  if (Settings.flag3.compatibility_check) {
-    return true;
-  }
-
-  eboot_command ebcmd;
-  eboot_command_read(&ebcmd);
-  uint32_t start_address = ebcmd.args[0];
-  uint32_t end_address = start_address + (ebcmd.args[2] & 0xFFFFF000) + FLASH_SECTOR_SIZE;
-  uint32_t* buffer = new uint32_t[FLASH_SECTOR_SIZE / 4];
-
-  uint32_t version[3] = { 0 };
-  bool found = false;
-  for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
-    ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
-    if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
-      version[1] = 0xFFFFFFFF;
-      found = true;
-    } else {
-      for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
-        version[0] = version[1];
-        version[1] = version[2];
-        version[2] = buffer[i];
-        if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
-          found = true;
-          break;
-        }
-      }
-    }
-    if (found) { break; }
-  }
-  delete[] buffer;
-
-  if (!found) { version[1] = 0; }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
-
-  if (version[1] < VERSION_COMPATIBLE) {
-    uint32_t eboot_magic = 0;
-    ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
-    return false;
-  }
-
-  return true;
-}
-
-void SettingsBufferFree(void)
-{
-  if (settings_buffer != nullptr) {
-    free(settings_buffer);
-    settings_buffer = nullptr;
-  }
-}
-
-bool SettingsBufferAlloc(void)
-{
-  SettingsBufferFree();
-  if (!(settings_buffer = (uint8_t *)malloc(sizeof(Settings)))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_UPLOAD_ERR_2));
-    return false;
-  }
-  return true;
-}
-
-uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size)
-{
-  uint16_t crc = 0;
-
-  for (uint32_t i = 0; i < size; i++) {
-    if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); }
-  }
-  return crc;
-}
-
-uint16_t GetSettingsCrc(void)
-{
-
-  uint32_t size = ((Settings.version < 0x06060007) || (Settings.version > 0x0606000A)) ? 3584 : sizeof(SYSCFG);
-  return GetCfgCrc16((uint8_t*)&Settings, size);
-}
-
-uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size)
-{
-
-  uint32_t crc = 0;
-
-  while (size--) {
-    crc ^= *bytes++;
-    for (uint32_t j = 0; j < 8; j++) {
-      crc = (crc >> 1) ^ (-int(crc & 1) & 0xEDB88320);
-    }
-  }
-  return ~crc;
-}
-
-uint32_t GetSettingsCrc32(void)
-{
-  return GetCfgCrc32((uint8_t*)&Settings, sizeof(SYSCFG) -4);
-}
-
-void SettingsSaveAll(void)
-{
-  if (Settings.flag.save_state) {
-    Settings.power = power;
-  } else {
-    Settings.power = 0;
-  }
-  XsnsCall(FUNC_SAVE_BEFORE_RESTART);
-  XdrvCall(FUNC_SAVE_BEFORE_RESTART);
-  SettingsSave(0);
-}
-
-
-
-
-
-void UpdateQuickPowerCycle(bool update)
-{
-  if (Settings.flag3.fast_power_cycle_disable) { return; }
-
-  uint32_t pc_register;
-  uint32_t pc_location = SETTINGS_LOCATION - CFG_ROTATES;
-
-  ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-  if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
-    uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
-    if (0 == counter) {
-      SettingsErase(3);
-      EspRestart();
-    } else {
-      pc_register = 0xFFA55AB0 | counter;
-      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
-    }
-  }
-  else if (pc_register != 0xFFA55ABF) {
-    pc_register = 0xFFA55ABF;
-
-    if (ESP.flashEraseSector(pc_location)) {
-      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
-  }
-}
-
-
-
-
-
-uint32_t GetSettingsTextLen(void)
-{
-  char* position = Settings.text_pool;
-  for (uint32_t size = 0; size < SET_MAX; size++) {
-    while (*position++ != '\0') { }
-  }
-  return position - Settings.text_pool;
-}
-
-bool SettingsUpdateText(uint32_t index, const char* replace_me)
-{
-  if (index >= SET_MAX) {
-    return false;
-  }
-
-
-  uint32_t replace_len = strlen(replace_me);
-  char replace[replace_len +1];
-  memcpy(replace, replace_me, sizeof(replace));
-
-  uint32_t start_pos = 0;
-  uint32_t end_pos = 0;
-  char* position = Settings.text_pool;
-  for (uint32_t size = 0; size < SET_MAX; size++) {
-    while (*position++ != '\0') { }
-    if (1 == index) {
-      start_pos = position - Settings.text_pool;
-    }
-    else if (0 == index) {
-      end_pos = position - Settings.text_pool -1;
-    }
-    index--;
-  }
-  uint32_t char_len = position - Settings.text_pool;
-
-  uint32_t current_len = end_pos - start_pos;
-  int diff = replace_len - current_len;
-
-
-
-
-  int too_long = (char_len + diff) - settings_text_size;
-  if (too_long > 0) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_CONFIG "Text overflow by %d char(s)"), too_long);
-    return false;
-  }
-
-  if (diff != 0) {
-
-    memmove_P(Settings.text_pool + start_pos + replace_len, Settings.text_pool + end_pos, char_len - end_pos);
-  }
-
-  memmove_P(Settings.text_pool + start_pos, replace, replace_len);
-
-  memset(Settings.text_pool + char_len + diff, 0x00, settings_text_size - char_len - diff);
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "CR %d/%d"), GetSettingsTextLen(), settings_text_size);
-
-  return true;
-}
-
-char* SettingsText(uint32_t index)
-{
-  char* position = Settings.text_pool;
-
-  if (index >= SET_MAX) {
-    position += settings_text_size -1;
-  } else {
-    for (;index > 0; index--) {
-      while (*position++ != '\0') { }
-    }
-  }
-  return position;
-}
-
-
-
-
-
-uint32_t GetSettingsAddress(void)
-{
-  return settings_location * SPI_FLASH_SEC_SIZE;
-}
-
-void SettingsSave(uint8_t rotate)
-{
-# 590 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-#ifndef FIRMWARE_MINIMAL
-  if ((GetSettingsCrc32() != settings_crc32) || rotate) {
-    if (1 == rotate) {
-      stop_flash_rotate = 1;
-    }
-    if (2 == rotate) {
-      settings_location = SETTINGS_LOCATION +1;
-    }
-    if (stop_flash_rotate) {
-      settings_location = SETTINGS_LOCATION;
-    } else {
-      settings_location--;
-      if (settings_location <= (SETTINGS_LOCATION - CFG_ROTATES)) {
-        settings_location = SETTINGS_LOCATION;
-      }
-    }
-
-    Settings.save_flag++;
-    if (UtcTime() > START_VALID_TIME) {
-      Settings.cfg_timestamp = UtcTime();
-    } else {
-      Settings.cfg_timestamp++;
-    }
-    Settings.cfg_size = sizeof(SYSCFG);
-    Settings.cfg_crc = GetSettingsCrc();
-    Settings.cfg_crc32 = GetSettingsCrc32();
-
-    if (ESP.flashEraseSector(settings_location)) {
-      ESP.flashWrite(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-    }
-
-    if (!stop_flash_rotate && rotate) {
-      for (uint32_t i = 1; i < CFG_ROTATES; i++) {
-        ESP.flashEraseSector(settings_location -i);
-        delay(1);
-      }
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG D_SAVED_TO_FLASH_AT " %X, " D_COUNT " %d, " D_BYTES " %d"), settings_location, Settings.save_flag, sizeof(SYSCFG));
-
-    settings_crc32 = Settings.cfg_crc32;
-  }
-#endif
-  RtcSettingsSave();
-}
-
-void SettingsLoad(void)
-{
-
-  struct SYSCFGH {
-    uint16_t cfg_holder;
-    uint16_t cfg_size;
-    unsigned long save_flag;
-  } _SettingsH;
-  unsigned long save_flag = 0;
-
-  settings_location = 0;
-  uint32_t flash_location = SETTINGS_LOCATION +1;
-  uint16_t cfg_holder = 0;
-  for (uint32_t i = 0; i < CFG_ROTATES; i++) {
-    flash_location--;
-    ESP.flashRead(flash_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-
-    bool valid = false;
-    if (Settings.version > 0x06000000) {
-      bool almost_valid = (Settings.cfg_crc32 == GetSettingsCrc32());
-      if (Settings.version < 0x0606000B) {
-        almost_valid = (Settings.cfg_crc == GetSettingsCrc());
-      }
-
-      if (almost_valid && (0 == cfg_holder)) { cfg_holder = Settings.cfg_holder; }
-      valid = (cfg_holder == Settings.cfg_holder);
-    } else {
-      ESP.flashRead((flash_location -1) * SPI_FLASH_SEC_SIZE, (uint32*)&_SettingsH, sizeof(SYSCFGH));
-      valid = (Settings.cfg_holder == _SettingsH.cfg_holder);
-    }
-    if (valid) {
-      if (Settings.save_flag > save_flag) {
-        save_flag = Settings.save_flag;
-        settings_location = flash_location;
-        if (Settings.flag.stop_flash_rotate && (0 == i)) {
-          break;
-        }
-      }
-    }
-
-    delay(1);
-  }
-  if (settings_location > 0) {
-    ESP.flashRead(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-    AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %lu"), settings_location, Settings.save_flag);
-  }
-
-#ifndef FIRMWARE_MINIMAL
-  if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) {
-    SettingsDefault();
-  }
-  settings_crc32 = GetSettingsCrc32();
-#endif
-
-  RtcSettingsLoad();
-}
-
-void EspErase(uint32_t start_sector, uint32_t end_sector)
-{
-  bool serial_output = (LOG_LEVEL_DEBUG_MORE <= seriallog_level);
-  for (uint32_t sector = start_sector; sector < end_sector; sector++) {
-
-    bool result = ESP.flashEraseSector(sector);
-
-
-
-    if (serial_output) {
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-      Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
-#else
-      Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
-#endif
-      delay(10);
-    } else {
-      yield();
-    }
-    OsWatchLoop();
-  }
-}
-
-void SettingsErase(uint8_t type)
-{
-# 733 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-#ifndef FIRMWARE_MINIMAL
-  uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
-  uint32_t _sectorEnd = ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE;
-  if (1 == type) {
-
-    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;
-  }
-  else if (2 == type) {
-    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
-    _sectorEnd = SETTINGS_LOCATION +1;
-  }
-  else if (3 == type) {
-    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
-    _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " %d " D_UNIT_SECTORS), _sectorEnd - _sectorStart);
-
-
-  EsptoolErase(_sectorStart, _sectorEnd);
-#endif
-}
-
-void SettingsSdkErase(void)
-{
-  WiFi.disconnect(true);
-  SettingsErase(1);
-  delay(1000);
-}
-
-
-
-void SettingsDefault(void)
-{
-  AddLog_P(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_USE_DEFAULTS));
-  SettingsDefaultSet1();
-  SettingsDefaultSet2();
-  SettingsSave(2);
-}
-
-void SettingsDefaultSet1(void)
-{
-  memset(&Settings, 0x00, sizeof(SYSCFG));
-
-  Settings.cfg_holder = (uint16_t)CFG_HOLDER;
-  Settings.cfg_size = sizeof(SYSCFG);
-
-  Settings.version = VERSION;
-
-
-}
-
-void SettingsDefaultSet2(void)
-{
-  memset((char*)&Settings +16, 0x00, sizeof(SYSCFG) -16);
-
-  Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
-  Settings.flag.global_state = APP_ENABLE_LEDLINK;
-  Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
-  Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
-  Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
-  Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
-  Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
-  Settings.save_data = SAVE_DATA;
-  Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
-  Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
-  Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
-  Settings.sleep = APP_SLEEP;
-  if (Settings.sleep < 50) {
-    Settings.sleep = 50;
-  }
-
-
-
-  Settings.interlock[0] = 0xFF;
-  Settings.module = MODULE;
-  ModuleDefault(WEMOS);
-
-  SettingsUpdateText(SET_FRIENDLYNAME1, FRIENDLY_NAME);
-  SettingsUpdateText(SET_FRIENDLYNAME2, FRIENDLY_NAME"2");
-  SettingsUpdateText(SET_FRIENDLYNAME3, FRIENDLY_NAME"3");
-  SettingsUpdateText(SET_FRIENDLYNAME4, FRIENDLY_NAME"4");
-  SettingsUpdateText(SET_OTAURL, OTA_URL);
-
-
-  Settings.flag.save_state = SAVE_STATE;
-  Settings.power = APP_POWER;
-  Settings.poweronstate = APP_POWERON_STATE;
-  Settings.blinktime = APP_BLINKTIME;
-  Settings.blinkcount = APP_BLINKCOUNT;
-  Settings.ledstate = APP_LEDSTATE;
-  Settings.ledmask = APP_LEDMASK;
-  Settings.pulse_timer[0] = APP_PULSETIME;
-
-
-
-  Settings.serial_config = TS_SERIAL_8N1;
-  Settings.baudrate = APP_BAUDRATE / 300;
-  Settings.sbaudrate = SOFT_BAUDRATE / 300;
-  Settings.serial_delimiter = 0xff;
-  Settings.seriallog_level = SERIAL_LOG_LEVEL;
-
-
-  Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
-  Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
-  Settings.wifi_output_power = 170;
-  ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
-  ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
-  ParseIp(&Settings.ip_address[2], WIFI_SUBNETMASK);
-  ParseIp(&Settings.ip_address[3], WIFI_DNS);
-  Settings.sta_config = WIFI_CONFIG_TOOL;
-
-  SettingsUpdateText(SET_STASSID1, STA_SSID1);
-  SettingsUpdateText(SET_STASSID2, STA_SSID2);
-  SettingsUpdateText(SET_STAPWD1, STA_PASS1);
-  SettingsUpdateText(SET_STAPWD2, STA_PASS2);
-  SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-
-
-  SettingsUpdateText(SET_SYSLOG_HOST, SYS_LOG_HOST);
-  Settings.syslog_port = SYS_LOG_PORT;
-  Settings.syslog_level = SYS_LOG_LEVEL;
-
-
-  Settings.flag2.emulation = EMULATION;
-  Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
-  Settings.flag3.mdns_enabled = MDNS_ENABLED;
-  Settings.webserver = WEB_SERVER;
-  Settings.weblog_level = WEB_LOG_LEVEL;
-  SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
-  SettingsUpdateText(SET_CORS, CORS_DOMAIN);
-
-
-  Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
-  Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
-  Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
-  Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME;
-
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) { Settings.switchmode[i] = SWITCH_MODE; }
-
-
-  Settings.flag.mqtt_enabled = MQTT_USE;
-  Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
-  Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
-  Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
-  Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
-  Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
-  Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
-
-  Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
-  Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
-  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
-  Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
-  Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
-  Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
-  SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
-  Settings.mqtt_port = MQTT_PORT;
-  SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
-  SettingsUpdateText(SET_MQTT_USER, MQTT_USER);
-  SettingsUpdateText(SET_MQTT_PWD, MQTT_PASS);
-  SettingsUpdateText(SET_MQTT_TOPIC, MQTT_TOPIC);
-  SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC);
-  SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC);
-  SettingsUpdateText(SET_MQTT_GRP_TOPIC, MQTT_GRPTOPIC);
-  SettingsUpdateText(SET_MQTT_FULLTOPIC, MQTT_FULLTOPIC);
-  Settings.mqtt_retry = MQTT_RETRY_SECS;
-  SettingsUpdateText(SET_MQTTPREFIX1, SUB_PREFIX);
-  SettingsUpdateText(SET_MQTTPREFIX2, PUB_PREFIX);
-  SettingsUpdateText(SET_MQTTPREFIX3, PUB_PREFIX2);
-  SettingsUpdateText(SET_STATE_TXT1, MQTT_STATUS_OFF);
-  SettingsUpdateText(SET_STATE_TXT2, MQTT_STATUS_ON);
-  SettingsUpdateText(SET_STATE_TXT3, MQTT_CMND_TOGGLE);
-  SettingsUpdateText(SET_STATE_TXT4, MQTT_CMND_HOLD);
-  char fingerprint[60];
-  strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint));
-  char *p = fingerprint;
-  for (uint32_t i = 0; i < 20; i++) {
-    Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
-  }
-  strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint));
-  p = fingerprint;
-  for (uint32_t i = 0; i < 20; i++) {
-    Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16);
-  }
-  Settings.tele_period = TELE_PERIOD;
-  Settings.mqttlog_level = MQTT_LOG_LEVEL;
-
-
-  Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
-  Settings.flag2.current_resolution = 3;
-
-
-  Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
-  Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
-  Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
-  Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
-
-  Settings.energy_power_calibration = HLW_PREF_PULSE;
-  Settings.energy_voltage_calibration = HLW_UREF_PULSE;
-  Settings.energy_current_calibration = HLW_IREF_PULSE;
-# 944 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-  Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
-  Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
-
-  Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
-  Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
-
-
-
-  RtcSettings.energy_kWhtotal = 0;
-
-  memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
-  Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
-
-
-  Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
-  Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
-  Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
-
-
-  Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
-
-  memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
-
-
-  Settings.domoticz_update_timer = DOMOTICZ_UPDATE_TIMER;
-# 979 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-  Settings.flag.temperature_conversion = TEMP_CONVERSION;
-  Settings.flag.pressure_conversion = PRESSURE_CONVERSION;
-  Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
-  Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
-  Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
-  Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
-  Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
-
-
-
-
-
-
-  Settings.flag2.calc_resolution = CALC_RESOLUTION;
-
-
-  Settings.flag3.timers_enable = TIMERS_ENABLED;
-
-
-  Settings.flag.hass_light = HASS_AS_LIGHT;
-  Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
-  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
-
-
-  Settings.flag.knx_enabled = KNX_ENABLED;
-  Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
-
-
-  Settings.flag.pwm_control = LIGHT_MODE;
-  Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
-  Settings.flag.light_signal = LIGHT_PAIRS_CO2;
-  Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
-  Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
-  Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
-  Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
-  Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
-
-  Settings.pwm_frequency = PWM_FREQ;
-  Settings.pwm_range = PWM_RANGE;
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    Settings.light_color[i] = DEFAULT_LIGHT_COMPONENT;
-
-  }
-  Settings.light_correction = 1;
-  Settings.light_dimmer = DEFAULT_LIGHT_DIMMER;
-
-  Settings.light_speed = 1;
-
-  Settings.light_width = 1;
-
-  Settings.light_pixels = WS2812_LEDS;
-
-  Settings.ws_width[WS_SECOND] = 1;
-  Settings.ws_color[WS_SECOND][WS_RED] = 255;
-
-  Settings.ws_color[WS_SECOND][WS_BLUE] = 255;
-  Settings.ws_width[WS_MINUTE] = 3;
-
-  Settings.ws_color[WS_MINUTE][WS_GREEN] = 255;
-
-  Settings.ws_width[WS_HOUR] = 5;
-  Settings.ws_color[WS_HOUR][WS_RED] = 255;
-
-
-
-  Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
-  Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
-
-
-
-  Settings.display_mode = 1;
-  Settings.display_refresh = 2;
-  Settings.display_rows = 2;
-  Settings.display_cols[0] = 16;
-  Settings.display_cols[1] = 8;
-  Settings.display_dimmer = 1;
-  Settings.display_size = 1;
-  Settings.display_font = 1;
-
-  Settings.display_address[0] = MTX_ADDRESS1;
-  Settings.display_address[1] = MTX_ADDRESS2;
-  Settings.display_address[2] = MTX_ADDRESS3;
-  Settings.display_address[3] = MTX_ADDRESS4;
-  Settings.display_address[4] = MTX_ADDRESS5;
-  Settings.display_address[5] = MTX_ADDRESS6;
-  Settings.display_address[6] = MTX_ADDRESS7;
-  Settings.display_address[7] = MTX_ADDRESS8;
-
-
-  if (((APP_TIMEZONE > -14) && (APP_TIMEZONE < 15)) || (99 == APP_TIMEZONE)) {
-    Settings.timezone = APP_TIMEZONE;
-    Settings.timezone_minutes = 0;
-  } else {
-    Settings.timezone = APP_TIMEZONE / 60;
-    Settings.timezone_minutes = abs(APP_TIMEZONE % 60);
-  }
-  SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
-  SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
-  SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
-  for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
-    SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
-  }
-  Settings.latitude = (int)((double)LATITUDE * 1000000);
-  Settings.longitude = (int)((double)LONGITUDE * 1000000);
-  SettingsResetStd();
-  SettingsResetDst();
-
-  Settings.button_debounce = KEY_DEBOUNCE_TIME;
-  Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
-
-  for (uint32_t j = 0; j < 5; j++) {
-    Settings.rgbwwTable[j] = 255;
-  }
-
-  Settings.novasds_startingoffset = STARTING_OFFSET;
-
-  SettingsDefaultWebColor();
-
-  memset(&Settings.monitors, 0xFF, 20);
-  SettingsEnableAllI2cDrivers();
-
-
-  Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
-  Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
-
-  Settings.flag3.buzzer_enable = BUZZER_ENABLE;
-  Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
-  Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
-  Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
-}
-
-
-
-void SettingsResetStd(void)
-{
-  Settings.tflag[0].hemis = TIME_STD_HEMISPHERE;
-  Settings.tflag[0].week = TIME_STD_WEEK;
-  Settings.tflag[0].dow = TIME_STD_DAY;
-  Settings.tflag[0].month = TIME_STD_MONTH;
-  Settings.tflag[0].hour = TIME_STD_HOUR;
-  Settings.toffset[0] = TIME_STD_OFFSET;
-}
-
-void SettingsResetDst(void)
-{
-  Settings.tflag[1].hemis = TIME_DST_HEMISPHERE;
-  Settings.tflag[1].week = TIME_DST_WEEK;
-  Settings.tflag[1].dow = TIME_DST_DAY;
-  Settings.tflag[1].month = TIME_DST_MONTH;
-  Settings.tflag[1].hour = TIME_DST_HOUR;
-  Settings.toffset[1] = TIME_DST_OFFSET;
-}
-
-void SettingsDefaultWebColor(void)
-{
-  char scolor[10];
-  for (uint32_t i = 0; i < COL_LAST; i++) {
-    WebHexCode(i, GetTextIndexed(scolor, sizeof(scolor), i, kWebColors));
-  }
-}
-
-void SettingsEnableAllI2cDrivers(void)
-{
-  Settings.i2c_drivers[0] = 0xFFFFFFFF;
-  Settings.i2c_drivers[1] = 0xFFFFFFFF;
-  Settings.i2c_drivers[2] = 0xFFFFFFFF;
-}
-
-
-
-void SettingsDelta(void)
-{
-  if (Settings.version != VERSION) {
-    if (Settings.version < 0x06000000) {
-      Settings.cfg_size = sizeof(SYSCFG);
-      Settings.cfg_crc = GetSettingsCrc();
-    }
-    if (Settings.version < 0x06000002) {
-      for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-        if (i < 4) {
-          Settings.switchmode[i] = Settings.interlock[i];
-        } else {
-          Settings.switchmode[i] = SWITCH_MODE;
-        }
-      }
-      for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-        if (Settings.my_gp.io[i] >= GPIO_SWT5) {
-          Settings.my_gp.io[i] += 4;
-        }
-      }
-    }
-    if (Settings.version < 0x06000003) {
-      Settings.flag.mqtt_serial_raw = 0;
-      Settings.flag.pressure_conversion = 0;
-      Settings.flag3.data = 0;
-    }
-    if (Settings.version < 0x06010103) {
-      Settings.flag3.timers_enable = 1;
-    }
-    if (Settings.version < 0x0601010C) {
-      Settings.button_debounce = KEY_DEBOUNCE_TIME;
-      Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
-    }
-    if (Settings.version < 0x0602010A) {
-      for (uint32_t j = 0; j < 5; j++) {
-        Settings.rgbwwTable[j] = 255;
-      }
-    }
-    if (Settings.version < 0x06030002) {
-      Settings.timezone_minutes = 0;
-    }
-    if (Settings.version < 0x06030004) {
-      memset(&Settings.monitors, 0xFF, 20);
-    }
-    if (Settings.version < 0x0603000E) {
-      Settings.flag2.calc_resolution = CALC_RESOLUTION;
-    }
-    if (Settings.version < 0x0603000F) {
-      if (Settings.sleep < 50) {
-        Settings.sleep = 50;
-      }
-    }
-    if (Settings.version < 0x06040105) {
-      Settings.flag3.mdns_enabled = MDNS_ENABLED;
-      Settings.param[P_MDNS_DELAYED_START] = 0;
-    }
-    if (Settings.version < 0x0604010B) {
-      Settings.interlock[0] = 0xFF;
-      for (uint32_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
-    }
-    if (Settings.version < 0x0604010D) {
-      Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
-    }
-    if (Settings.version < 0x06040110) {
-      ModuleDefault(WEMOS);
-    }
-    if (Settings.version < 0x06040113) {
-      Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
-    }
-    if (Settings.version < 0x06050003) {
-      Settings.novasds_startingoffset = STARTING_OFFSET;
-    }
-    if (Settings.version < 0x06050006) {
-      SettingsDefaultWebColor();
-    }
-    if (Settings.version < 0x06050007) {
-      Settings.ledmask = APP_LEDMASK;
-    }
-    if (Settings.version < 0x0605000A) {
-      Settings.my_adc0 = ADC0_NONE;
-    }
-    if (Settings.version < 0x0605000D) {
-      Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
-    }
-    if (Settings.version < 0x06060001) {
-      Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
-    }
-    if (Settings.version < 0x06060007) {
-      memset((char*)&Settings +0xE00, 0x00, sizeof(SYSCFG) -0xE00);
-    }
-    if (Settings.version < 0x06060008) {
-
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        Settings.param[P_ex_DIMMER_MAX] = 100;
-      } else {
-        Settings.param[P_ex_DIMMER_MAX] = 255;
-      }
-    }
-    if (Settings.version < 0x06060009) {
-      Settings.baudrate = APP_BAUDRATE / 300;
-      Settings.sbaudrate = SOFT_BAUDRATE / 300;
-    }
-    if (Settings.version < 0x0606000A) {
-      uint8_t tuyaindex = 0;
-      if (Settings.param[P_BACKLOG_DELAY] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 21;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_BACKLOG_DELAY];
-        tuyaindex++;
-      } else if (Settings.flag3.fast_power_cycle_disable == 1) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 11;
-        Settings.tuya_fnid_map[tuyaindex].dpid = 1;
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_RELAYS] > 0) {
-        for (uint8_t i = 0 ; i < Settings.param[P_ex_TUYA_RELAYS]; i++) {
-          Settings.tuya_fnid_map[tuyaindex].fnid = 12 + i;
-          Settings.tuya_fnid_map[tuyaindex].dpid = i + 2;
-          tuyaindex++;
-        }
-      }
-      if (Settings.param[P_ex_TUYA_POWER_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 31;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_POWER_ID];
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_VOLTAGE_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 33;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_VOLTAGE_ID];
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_CURRENT_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 32;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_CURRENT_ID];
-      }
-    }
-    if (Settings.version < 0x0606000C) {
-      memset((char*)&Settings +0x1D6, 0x00, 16);
-    }
-    if (Settings.version < 0x0606000F) {
-      Settings.ex_shutter_accuracy = 0;
-      Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
-    }
-    if (Settings.version < 0x06060011) {
-      Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
-    }
-    if (Settings.version < 0x06060012) {
-      Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
-      Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
-      if (TUYA_DIMMER == Settings.module) {
-        if (Settings.flag3.ex_tuya_dimmer_min_limit) {
-          Settings.dimmer_hw_min = 25;
-        } else {
-          Settings.dimmer_hw_min = 1;
-        }
-        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
-      }
-      else if (PS_16_DZ == Settings.module) {
-        Settings.dimmer_hw_min = 10;
-        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
-      }
-    }
-    if (Settings.version < 0x06060014) {
-# 1323 "C:/shared/sonoff/Git/Tasmota/tasmota/settings.ino"
-      Settings.flag3.fast_power_cycle_disable = 0;
-      Settings.energy_power_delta = Settings.ex_energy_power_delta;
-      Settings.ex_energy_power_delta = 0;
-    }
-    if (Settings.version < 0x06060015) {
-      if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
-        Settings.ex_sta_config = WIFI_MANAGER;
-      }
-    }
-
-    if (Settings.version < 0x07000002) {
-      Settings.web_color2[0][0] = Settings.web_color[0][0];
-      Settings.web_color2[0][1] = Settings.web_color[0][1];
-      Settings.web_color2[0][2] = Settings.web_color[0][2];
-    }
-    if (Settings.version < 0x07000003) {
-      SettingsEnableAllI2cDrivers();
-    }
-    if (Settings.version < 0x07000004) {
-      Settings.ex_wifi_output_power = 170;
-    }
-    if (Settings.version < 0x07010202) {
-      Settings.ex_serial_config = TS_SERIAL_8N1;
-    }
-    if (Settings.version < 0x07010204) {
-      if (Settings.flag3.ex_cors_enabled == 1) {
-        strlcpy(Settings.ex_cors_domain, CORS_ENABLED_ALL, sizeof(Settings.ex_cors_domain));
-      } else {
-        Settings.ex_cors_domain[0] = 0;
-      }
-    }
-    if (Settings.version < 0x07010205) {
-      Settings.seriallog_level = Settings.ex_seriallog_level;
-      Settings.sta_config = Settings.ex_sta_config;
-      Settings.sta_active = Settings.ex_sta_active;
-      memcpy((char*)&Settings.rule_stop, (char*)&Settings.ex_rule_stop, 47);
-    }
-    if (Settings.version < 0x07010206) {
-      Settings.flag4 = Settings.ex_flag4;
-      Settings.mqtt_port = Settings.ex_mqtt_port;
-      memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);
-    }
-
-    if (Settings.version < 0x08000000) {
-      char temp[strlen(Settings.text_pool) +1]; strncpy(temp, Settings.text_pool, sizeof(temp));
-      char temp21[strlen(Settings.ex_mqtt_prefix[0]) +1]; strncpy(temp21, Settings.ex_mqtt_prefix[0], sizeof(temp21));
-      char temp22[strlen(Settings.ex_mqtt_prefix[1]) +1]; strncpy(temp22, Settings.ex_mqtt_prefix[1], sizeof(temp22));
-      char temp23[strlen(Settings.ex_mqtt_prefix[2]) +1]; strncpy(temp23, Settings.ex_mqtt_prefix[2], sizeof(temp23));
-      char temp31[strlen(Settings.ex_sta_ssid[0]) +1]; strncpy(temp31, Settings.ex_sta_ssid[0], sizeof(temp31));
-      char temp32[strlen(Settings.ex_sta_ssid[1]) +1]; strncpy(temp32, Settings.ex_sta_ssid[1], sizeof(temp32));
-      char temp41[strlen(Settings.ex_sta_pwd[0]) +1]; strncpy(temp41, Settings.ex_sta_pwd[0], sizeof(temp41));
-      char temp42[strlen(Settings.ex_sta_pwd[1]) +1]; strncpy(temp42, Settings.ex_sta_pwd[1], sizeof(temp42));
-      char temp5[strlen(Settings.ex_hostname) +1]; strncpy(temp5, Settings.ex_hostname, sizeof(temp5));
-      char temp6[strlen(Settings.ex_syslog_host) +1]; strncpy(temp6, Settings.ex_syslog_host, sizeof(temp6));
-      char temp7[strlen(Settings.ex_mqtt_host) +1]; strncpy(temp7, Settings.ex_mqtt_host, sizeof(temp7));
-      char temp8[strlen(Settings.ex_mqtt_client) +1]; strncpy(temp8, Settings.ex_mqtt_client, sizeof(temp8));
-      char temp9[strlen(Settings.ex_mqtt_user) +1]; strncpy(temp9, Settings.ex_mqtt_user, sizeof(temp9));
-      char temp10[strlen(Settings.ex_mqtt_pwd) +1]; strncpy(temp10, Settings.ex_mqtt_pwd, sizeof(temp10));
-      char temp11[strlen(Settings.ex_mqtt_topic) +1]; strncpy(temp11, Settings.ex_mqtt_topic, sizeof(temp11));
-      char temp12[strlen(Settings.ex_button_topic) +1]; strncpy(temp12, Settings.ex_button_topic, sizeof(temp12));
-      char temp13[strlen(Settings.ex_mqtt_grptopic) +1]; strncpy(temp13, Settings.ex_mqtt_grptopic, sizeof(temp13));
-
-      memset(Settings.text_pool, 0x00, settings_text_size);
-      SettingsUpdateText(SET_OTAURL, temp);
-      SettingsUpdateText(SET_MQTTPREFIX1, temp21);
-      SettingsUpdateText(SET_MQTTPREFIX2, temp22);
-      SettingsUpdateText(SET_MQTTPREFIX3, temp23);
-      SettingsUpdateText(SET_STASSID1, temp31);
-      SettingsUpdateText(SET_STASSID2, temp32);
-      SettingsUpdateText(SET_STAPWD1, temp41);
-      SettingsUpdateText(SET_STAPWD2, temp42);
-      SettingsUpdateText(SET_HOSTNAME, temp5);
-      SettingsUpdateText(SET_SYSLOG_HOST, temp6);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-      if (!strlen(Settings.ex_mqtt_user)) {
-        SettingsUpdateText(SET_MQTT_HOST, temp7);
-        SettingsUpdateText(SET_MQTT_USER, temp9);
-      } else {
-        char aws_mqtt_host[66];
-        snprintf_P(aws_mqtt_host, sizeof(aws_mqtt_host), PSTR("%s%s"), temp9, temp7);
-        SettingsUpdateText(SET_MQTT_HOST, aws_mqtt_host);
-        SettingsUpdateText(SET_MQTT_USER, "");
-      }
-#else
-      SettingsUpdateText(SET_MQTT_HOST, temp7);
-      SettingsUpdateText(SET_MQTT_USER, temp9);
-#endif
-      SettingsUpdateText(SET_MQTT_CLIENT, temp8);
-      SettingsUpdateText(SET_MQTT_PWD, temp10);
-      SettingsUpdateText(SET_MQTT_TOPIC, temp11);
-      SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, temp12);
-      SettingsUpdateText(SET_MQTT_GRP_TOPIC, temp13);
-
-      SettingsUpdateText(SET_WEBPWD, Settings.ex_web_password);
-      SettingsUpdateText(SET_CORS, Settings.ex_cors_domain);
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, Settings.ex_mqtt_fulltopic);
-      SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, Settings.ex_switch_topic);
-      SettingsUpdateText(SET_STATE_TXT1, Settings.ex_state_text[0]);
-      SettingsUpdateText(SET_STATE_TXT2, Settings.ex_state_text[1]);
-      SettingsUpdateText(SET_STATE_TXT3, Settings.ex_state_text[2]);
-      SettingsUpdateText(SET_STATE_TXT4, Settings.ex_state_text[3]);
-      SettingsUpdateText(SET_NTPSERVER1, Settings.ex_ntp_server[0]);
-      SettingsUpdateText(SET_NTPSERVER2, Settings.ex_ntp_server[1]);
-      SettingsUpdateText(SET_NTPSERVER3, Settings.ex_ntp_server[2]);
-      SettingsUpdateText(SET_MEM1, Settings.script_pram[0]);
-      SettingsUpdateText(SET_MEM2, Settings.script_pram[1]);
-      SettingsUpdateText(SET_MEM3, Settings.script_pram[2]);
-      SettingsUpdateText(SET_MEM4, Settings.script_pram[3]);
-      SettingsUpdateText(SET_MEM5, Settings.script_pram[4]);
-      SettingsUpdateText(SET_FRIENDLYNAME1, Settings.ex_friendlyname[0]);
-      SettingsUpdateText(SET_FRIENDLYNAME2, Settings.ex_friendlyname[1]);
-      SettingsUpdateText(SET_FRIENDLYNAME3, Settings.ex_friendlyname[2]);
-      SettingsUpdateText(SET_FRIENDLYNAME4, Settings.ex_friendlyname[3]);
-    }
-
-    Settings.version = VERSION;
-    SettingsSave(1);
-  }
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-IPAddress syslog_host_addr;
-uint32_t syslog_host_hash = 0;
-
-extern "C" {
-extern struct rst_info resetInfo;
-}
-
-
-
-
-
-#include <Ticker.h>
-
-Ticker tickerOSWatch;
-
-const uint32_t OSWATCH_RESET_TIME = 120;
-
-static unsigned long oswatch_last_loop_time;
-uint8_t oswatch_blocked_loop = 0;
-
-#ifndef USE_WS2812_DMA
-
-#endif
-
-#ifdef USE_KNX
-bool knx_started = false;
-#endif
-
-void OsWatchTicker(void)
-{
-  uint32_t t = millis();
-  uint32_t last_run = abs(t - oswatch_last_loop_time);
-
-#ifdef DEBUG_THEO
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), last_run);
-#endif
-  if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
-
-    RtcSettings.oswatch_blocked_loop = 1;
-    RtcSettingsSave();
-
-
-
-
-
-    volatile uint32_t dummy;
-    dummy = *((uint32_t*) 0x00000000);
-  }
-}
-
-void OsWatchInit(void)
-{
-  oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
-  RtcSettings.oswatch_blocked_loop = 0;
-  oswatch_last_loop_time = millis();
-  tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
-}
-
-void OsWatchLoop(void)
-{
-  oswatch_last_loop_time = millis();
-
-}
-
-bool OsWatchBlockedLoop(void)
-{
-  return oswatch_blocked_loop;
-}
-
-uint32_t ResetReason(void)
-{
-# 101 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-  return resetInfo.reason;
-}
-
-String GetResetReason(void)
-{
-  if (oswatch_blocked_loop) {
-    char buff[32];
-    strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
-    return String(buff);
-  } else {
-    return ESP.getResetReason();
-  }
-}
-
-
-
-
-
-
-size_t strchrspn(const char *str1, int character)
-{
-  size_t ret = 0;
-  char *start = (char*)str1;
-  char *end = strchr(str1, character);
-  if (end) ret = end - start;
-  return ret;
-}
-
-
-char* subStr(char* dest, char* str, const char *delim, int index)
-{
-  char *act;
-  char *sub = nullptr;
-  char *ptr;
-  int i;
-
-
-  strncpy(dest, str, strlen(str)+1);
-  for (i = 1, act = dest; i <= index; i++, act = nullptr) {
-    sub = strtok_r(act, delim, &ptr);
-    if (sub == nullptr) break;
-  }
-  sub = Trim(sub);
-  return sub;
-}
-
-float CharToFloat(const char *str)
-{
-
-  char strbuf[24];
-
-  strlcpy(strbuf, str, sizeof(strbuf));
-  char *pt = strbuf;
-  while ((*pt != '\0') && isblank(*pt)) { pt++; }
-
-  signed char sign = 1;
-  if (*pt == '-') { sign = -1; }
-  if (*pt == '-' || *pt=='+') { pt++; }
-
-  float left = 0;
-  if (*pt != '.') {
-    left = atoi(pt);
-    while (isdigit(*pt)) { pt++; }
-  }
-
-  float right = 0;
-  if (*pt == '.') {
-    pt++;
-    right = atoi(pt);
-    while (isdigit(*pt)) {
-      pt++;
-      right /= 10.0f;
-    }
-  }
-
-  float result = left + right;
-  if (sign < 0) {
-    return -result;
-  }
-  return result;
-}
-
-int TextToInt(char *str)
-{
-  char *p;
-  uint8_t radix = 10;
-  if ('#' == str[0]) {
-    radix = 16;
-    str++;
-  }
-  return strtol(str, &p, radix);
-}
-
-char* ulltoa(unsigned long long value, char *str, int radix)
-{
-  char digits[64];
-  char *dst = str;
-  int i = 0;
-
-
-
-  do {
-    int n = value % radix;
-    digits[i++] = (n < 10) ? (char)n+'0' : (char)n-10+'A';
-    value /= radix;
-  } while (value != 0);
-
-  while (i > 0) { *dst++ = digits[--i]; }
-
-  *dst = 0;
-  return str;
-}
-
-
-
-char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween)
-{
-
-
-
-  static const char * hex = "0123456789ABCDEF";
-  int between = (inbetween) ? 3 : 2;
-  const unsigned char * pin = in;
-  char * pout = out;
-  for (; pin < in+insz; pout += between, pin++) {
-    pout[0] = hex[(pgm_read_byte(pin)>>4) & 0xF];
-    pout[1] = hex[ pgm_read_byte(pin) & 0xF];
-    if (inbetween) { pout[2] = inbetween; }
-    if (pout + 3 - out > outsz) { break; }
-  }
-  pout[(inbetween && insz) ? -1 : 0] = 0;
-  return out;
-}
-
-char* Uint64toHex(uint64_t value, char *str, uint16_t bits)
-{
-  ulltoa(value, str, 16);
-
-  int fill = 8;
-  if ((bits > 3) && (bits < 65)) {
-    fill = bits / 4;
-    if (bits % 4) { fill++; }
-  }
-  int len = strlen(str);
-  fill -= len;
-  if (fill > 0) {
-    memmove(str + fill, str, len +1);
-    memset(str, '0', fill);
-  }
-  return str;
-}
-
-char* dtostrfd(double number, unsigned char prec, char *s)
-{
-  if ((isnan(number)) || (isinf(number))) {
-    strcpy(s, "null");
-    return s;
-  } else {
-    return dtostrf(number, 1, prec, s);
-  }
-}
-
-char* Unescape(char* buffer, uint32_t* size)
-{
-  uint8_t* read = (uint8_t*)buffer;
-  uint8_t* write = (uint8_t*)buffer;
-  int32_t start_size = *size;
-  int32_t end_size = *size;
-  uint8_t che = 0;
-
-
-
-  while (start_size > 0) {
-    uint8_t ch = *read++;
-    start_size--;
-    if (ch != '\\') {
-      *write++ = ch;
-    } else {
-      if (start_size > 0) {
-        uint8_t chi = *read++;
-        start_size--;
-        end_size--;
-        switch (chi) {
-          case '\\': che = '\\'; break;
-          case 'a': che = '\a'; break;
-          case 'b': che = '\b'; break;
-          case 'e': che = '\e'; break;
-          case 'f': che = '\f'; break;
-          case 'n': che = '\n'; break;
-          case 'r': che = '\r'; break;
-          case 's': che = ' '; break;
-          case 't': che = '\t'; break;
-          case 'v': che = '\v'; break;
-          case 'x': {
-            uint8_t* start = read;
-            che = (uint8_t)strtol((const char*)read, (char**)&read, 16);
-            start_size -= (uint16_t)(read - start);
-            end_size -= (uint16_t)(read - start);
-            break;
-          }
-          case '"': che = '\"'; break;
-
-          default : {
-            che = chi;
-            *write++ = ch;
-            end_size++;
-          }
-        }
-        *write++ = che;
-      }
-    }
-  }
-  *size = end_size;
-  *write++ = 0;
-
-
-  return buffer;
-}
-
-char* RemoveSpace(char* p)
-{
-  char* write = p;
-  char* read = p;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    if (!isspace(ch)) {
-      *write++ = ch;
-    }
-  }
-
-  return p;
-}
-
-char* ReplaceCommaWithDot(char* p)
-{
-  char* write = (char*)p;
-  char* read = (char*)p;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    if (ch == ',') {
-      ch = '.';
-    }
-    *write++ = ch;
-  }
-  return p;
-}
-
-char* LowerCase(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = tolower(ch);
-  }
-  return dest;
-}
-
-char* UpperCase(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = toupper(ch);
-  }
-  return dest;
-}
-
-char* UpperCase_P(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = pgm_read_byte(read++);
-    *write++ = toupper(ch);
-  }
-  return dest;
-}
-
-char* Trim(char* p)
-{
-  while ((*p != '\0') && isblank(*p)) { p++; }
-  char* q = p + strlen(p) -1;
-  while ((q >= p) && isblank(*q)) { q--; }
-  q++;
-  *q = '\0';
-  return p;
-}
-
-char* RemoveAllSpaces(char* p)
-{
-
-  char *cursor = p;
-  uint32_t offset = 0;
-  while (1) {
-    *cursor = *(cursor + offset);
-    if ((' ' == *cursor) || ('\t' == *cursor) || ('\n' == *cursor)) {
-      offset++;
-    } else {
-      if (0 == *cursor) { break; }
-      cursor++;
-    }
-  }
-  return p;
-}
-
-char* NoAlNumToUnderscore(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_';
-  }
-  return dest;
-}
-
-char IndexSeparator(void)
-{
-
-
-
-
-
-
-  if (Settings.flag3.use_underscore) {
-    return '_';
-  } else {
-    return '-';
-  }
-}
-
-void SetShortcutDefault(void)
-{
-  if ('\0' != XdrvMailbox.data[0]) {
-    XdrvMailbox.data[0] = '0' + SC_DEFAULT;
-    XdrvMailbox.data[1] = '\0';
-  }
-}
-
-uint8_t Shortcut(void)
-{
-  uint8_t result = 10;
-
-  if ('\0' == XdrvMailbox.data[1]) {
-    if (('"' == XdrvMailbox.data[0]) || ('0' == XdrvMailbox.data[0])) {
-      result = SC_CLEAR;
-    } else {
-      result = atoi(XdrvMailbox.data);
-      if (0 == result) {
-        result = 10;
-      }
-    }
-  }
-  return result;
-}
-
-bool ValidIpAddress(const char* str)
-{
-  const char* p = str;
-
-  while (*p && ((*p == '.') || ((*p >= '0') && (*p <= '9')))) { p++; }
-  return (*p == '\0');
-}
-
-bool ParseIp(uint32_t* addr, const char* str)
-{
-  uint8_t *part = (uint8_t*)addr;
-  uint8_t i;
-
-  *addr = 0;
-  for (i = 0; i < 4; i++) {
-    part[i] = strtoul(str, nullptr, 10);
-    str = strchr(str, '.');
-    if (str == nullptr || *str == '\0') {
-      break;
-    }
-    str++;
-  }
-  return (3 == i);
-}
-
-uint32_t ParseParameters(uint32_t count, uint32_t *params)
-{
-  char *p;
-  uint32_t i = 0;
-  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p), i++) {
-    params[i] = strtoul(str, nullptr, 0);
-  }
-  return i;
-}
-
-
-bool NewerVersion(char* version_str)
-{
-  uint32_t version = 0;
-  uint32_t i = 0;
-  char *str_ptr;
-
-  char version_dup[strlen(version_str) +1];
-  strncpy(version_dup, version_str, sizeof(version_dup));
-
-  for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) {
-    int field = atoi(str);
-
-    if ((field < 0) || (field > 255)) {
-      return false;
-    }
-
-    version = (version << 8) + field;
-
-    if ((2 == i) && isalpha(str[strlen(str)-1])) {
-      field = str[strlen(str)-1] & 0x1f;
-      version = (version << 8) + field;
-      i++;
-    }
-  }
-
-
-  if ((i < 2) || (i > sizeof(VERSION))) {
-    return false;
-  }
-
-
-  while (i < sizeof(VERSION)) {
-    version <<= 8;
-    i++;
-  }
-
-  return (version > VERSION);
-}
-
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option)
-{
-  strncpy_P(dest, S_RSLT_POWER, size);
-  if ((devices_present + option) > 1) {
-    char sidx[8];
-    snprintf_P(sidx, sizeof(sidx), PSTR("%d"), idx);
-    strncat(dest, sidx, size - strlen(dest) -1);
-  }
-  return dest;
-}
-
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size)
-{
-  return GetPowerDevice(dest, idx, size, 0);
-}
-
-void GetEspHardwareType(void)
-{
-
-  uint32_t efuse1 = *(uint32_t*)(0x3FF00050);
-  uint32_t efuse2 = *(uint32_t*)(0x3FF00054);
-
-
-
-  is_8285 = ( (efuse1 & (1 << 4)) || (efuse2 & (1 << 16)) );
-  if (is_8285 && (ESP.getFlashChipRealSize() > 1048576)) {
-    is_8285 = false;
-  }
-}
-
-String GetDeviceHardware(void)
-{
-  char buff[10];
-  if (is_8285) {
-    strcpy_P(buff, PSTR("ESP8285"));
-  } else {
-    strcpy_P(buff, PSTR("ESP8266EX"));
-  }
-  return String(buff);
-}
-
-float ConvertTemp(float c)
-{
-  float result = c;
-
-  global_update = uptime;
-  global_temperature = c;
-
-  if (!isnan(c) && Settings.flag.temperature_conversion) {
-    result = c * 1.8 + 32;
-  }
-  result = result + (0.1 * Settings.temp_comp);
-  return result;
-}
-
-float ConvertTempToCelsius(float c)
-{
-  float result = c;
-
-  if (!isnan(c) && Settings.flag.temperature_conversion) {
-    result = (c - 32) / 1.8;
-  }
-  result = result + (0.1 * Settings.temp_comp);
-  return result;
-}
-
-char TempUnit(void)
-{
-  return (Settings.flag.temperature_conversion) ? 'F' : 'C';
-}
-
-float ConvertHumidity(float h)
-{
-  global_update = uptime;
-  global_humidity = h;
-
-  return h;
-}
-
-float ConvertPressure(float p)
-{
-  float result = p;
-
-  global_update = uptime;
-  global_pressure = p;
-
-  if (!isnan(p) && Settings.flag.pressure_conversion) {
-    result = p * 0.75006375541921;
-  }
-  return result;
-}
-
-String PressureUnit(void)
-{
-  return (Settings.flag.pressure_conversion) ? String(D_UNIT_MILLIMETER_MERCURY) : String(D_UNIT_PRESSURE);
-}
-
-void ResetGlobalValues(void)
-{
-  if ((uptime - global_update) > GLOBAL_VALUES_VALID) {
-    global_update = 0;
-    global_temperature = 9999;
-    global_humidity = 0;
-    global_pressure = 0;
-  }
-}
-
-uint32_t SqrtInt(uint32_t num)
-{
-  if (num <= 1) {
-    return num;
-  }
-
-  uint32_t x = num / 2;
-  uint32_t y;
-  do {
-    y = (x + num / x) / 2;
-    if (y >= x) {
-      return x;
-    }
-    x = y;
-  } while (true);
-}
-
-uint32_t RoundSqrtInt(uint32_t num)
-{
-  uint32_t s = SqrtInt(4 * num);
-  if (s & 1) {
-    s++;
-  }
-  return s / 2;
-}
-
-char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack)
-{
-
-
-  char* write = destination;
-  const char* read = haystack;
-
-  index++;
-  while (index--) {
-    size_t size = destination_size -1;
-    write = destination;
-    char ch = '.';
-    while ((ch != '\0') && (ch != '|')) {
-      ch = pgm_read_byte(read++);
-      if (size && (ch != '|')) {
-        *write++ = ch;
-        size--;
-      }
-    }
-    if (0 == ch) {
-      if (index) {
-        write = destination;
-      }
-      break;
-    }
-  }
-  *write = '\0';
-  return destination;
-}
-
-int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack)
-{
-
-
-  int result = -1;
-  const char* read = haystack;
-  char* write = destination;
-
-  while (true) {
-    result++;
-    size_t size = destination_size -1;
-    write = destination;
-    char ch = '.';
-    while ((ch != '\0') && (ch != '|')) {
-      ch = pgm_read_byte(read++);
-      if (size && (ch != '|')) {
-        *write++ = ch;
-        size--;
-      }
-    }
-    *write = '\0';
-    if (!strcasecmp(needle, destination)) {
-      break;
-    }
-    if (0 == ch) {
-      result = -1;
-      break;
-    }
-  }
-  return result;
-}
-
-bool DecodeCommand(const char* haystack, void (* const MyCommand[])(void))
-{
-  GetTextIndexed(XdrvMailbox.command, CMDSZ, 0, haystack);
-  int prefix_length = strlen(XdrvMailbox.command);
-  if (prefix_length) {
-    char prefix[prefix_length +1];
-    snprintf_P(prefix, sizeof(prefix), XdrvMailbox.topic);
-    if (strcasecmp(prefix, XdrvMailbox.command)) {
-      return false;
-    }
-  }
-  int command_code = GetCommandCode(XdrvMailbox.command + prefix_length, CMDSZ, XdrvMailbox.topic + prefix_length, haystack);
-  if (command_code > 0) {
-    XdrvMailbox.command_code = command_code -1;
-    MyCommand[XdrvMailbox.command_code]();
-    return true;
-  }
-  return false;
-}
-
-const char kOptions[] PROGMEM = "OFF|" D_OFF "|FALSE|" D_FALSE "|STOP|" D_STOP "|" D_CELSIUS "|"
-                                "ON|" D_ON "|TRUE|" D_TRUE "|START|" D_START "|" D_FAHRENHEIT "|" D_USER "|"
-                                "TOGGLE|" D_TOGGLE "|" D_ADMIN "|"
-                                "BLINK|" D_BLINK "|"
-                                "BLINKOFF|" D_BLINKOFF "|"
-                                "ALL" ;
-
-const uint8_t sNumbers[] PROGMEM = { 0,0,0,0,0,0,0,
-                                     1,1,1,1,1,1,1,1,
-                                     2,2,2,
-                                     3,3,
-                                     4,4,
-                                     255 };
-
-int GetStateNumber(char *state_text)
-{
-  char command[CMDSZ];
-  int state_number = GetCommandCode(command, sizeof(command), state_text, kOptions);
-  if (state_number >= 0) {
-    state_number = pgm_read_byte(sNumbers + state_number);
-  }
-  return state_number;
-}
-
-String GetSerialConfig(void)
-{
-
-
-
-
-
-  const char kParity[] = "NEOI";
-
-  char config[4];
-  config[0] = '5' + (Settings.serial_config & 0x3);
-  config[1] = kParity[(Settings.serial_config >> 3) & 0x3];
-  config[2] = '1' + ((Settings.serial_config >> 2) & 0x1);
-  config[3] = '\0';
-  return String(config);
-}
-
-void SetSerialBegin()
-{
-  uint32_t baudrate = Settings.baudrate * 300;
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
-  Serial.flush();
-  Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
-}
-
-void SetSerialConfig(uint32_t serial_config)
-{
-  if (serial_config > TS_SERIAL_8O2) {
-    serial_config = TS_SERIAL_8N1;
-  }
-  if (serial_config != Settings.serial_config) {
-    Settings.serial_config = serial_config;
-    SetSerialBegin();
-  }
-}
-
-void SetSerialBaudrate(uint32_t baudrate)
-{
-  Settings.baudrate = baudrate / 300;
-  if (Serial.baudRate() != baudrate) {
-    SetSerialBegin();
-  }
-}
-
-void SetSerial(uint32_t baudrate, uint32_t serial_config)
-{
-  Settings.flag.mqtt_serial = 0;
-  Settings.serial_config = serial_config;
-  Settings.baudrate = baudrate / 300;
-  SetSeriallog(LOG_LEVEL_NONE);
-  SetSerialBegin();
-}
-
-void ClaimSerial(void)
-{
-  serial_local = true;
-  AddLog_P(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial"));
-  SetSeriallog(LOG_LEVEL_NONE);
-  Settings.baudrate = Serial.baudRate() / 300;
-}
-
-void SerialSendRaw(char *codes)
-{
-  char *p;
-  char stemp[3];
-  uint8_t code;
-
-  int size = strlen(codes);
-
-  while (size > 1) {
-    strlcpy(stemp, codes, sizeof(stemp));
-    code = strtol(stemp, &p, 16);
-    Serial.write(code);
-    size -= 2;
-    codes += 2;
-  }
-}
-
-uint32_t GetHash(const char *buffer, size_t size)
-{
-  uint32_t hash = 0;
-  for (uint32_t i = 0; i <= size; i++) {
-    hash += (uint8_t)*buffer++ * (i +1);
-  }
-  return hash;
-}
-
-void ShowSource(uint32_t source)
-{
-  if ((source > 0) && (source < SRC_MAX)) {
-    char stemp1[20];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource));
-  }
-}
-
-void WebHexCode(uint32_t i, const char* code)
-{
-  char scolor[10];
-
-  strlcpy(scolor, code, sizeof(scolor));
-  char* p = scolor;
-  if ('#' == p[0]) { p++; }
-
-  if (3 == strlen(p)) {
-    p[6] = p[3];
-    p[5] = p[2];
-    p[4] = p[2];
-    p[3] = p[1];
-    p[2] = p[1];
-    p[1] = p[0];
-  }
-
-  uint32_t color = strtol(p, nullptr, 16);
-
-
-
-
-
-
-  uint32_t j = sizeof(Settings.web_color) / 3;
-# 916 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-  if (i >= j) {
-
-    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
-  }
-  Settings.web_color[i][0] = (color >> 16) & 0xFF;
-  Settings.web_color[i][1] = (color >> 8) & 0xFF;
-  Settings.web_color[i][2] = color & 0xFF;
-}
-
-uint32_t WebColor(uint32_t i)
-{
-  uint32_t j = sizeof(Settings.web_color) / 3;
-
-
-
-
-  if (i >= j) {
-
-    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
-  }
-  uint32_t tcolor = (Settings.web_color[i][0] << 16) | (Settings.web_color[i][1] << 8) | Settings.web_color[i][2];
-
-  return tcolor;
-}
-
-
-
-
-
-const uint16_t TIMESZ = 100;
-
-char* ResponseGetTime(uint32_t format, char* time_str)
-{
-  switch (format) {
-  case 1:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%u"), GetDateAndTime(DT_LOCAL).c_str(), UtcTime());
-    break;
-  case 2:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":%u"), UtcTime());
-    break;
-  default:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
-  }
-  return time_str;
-}
-
-int Response_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), format, args);
-  va_end(args);
-  return len;
-}
-
-int ResponseTime_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-
-  ResponseGetTime(Settings.flag2.time_format, mqtt_data);
-
-  int mlen = strlen(mqtt_data);
-  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
-  va_end(args);
-  return len + mlen;
-}
-
-int ResponseAppend_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-  int mlen = strlen(mqtt_data);
-  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
-  va_end(args);
-  return len + mlen;
-}
-
-int ResponseAppendTimeFormat(uint32_t format)
-{
-  char time_str[TIMESZ];
-  return ResponseAppend_P(ResponseGetTime(format, time_str));
-}
-
-int ResponseAppendTime(void)
-{
-  return ResponseAppendTimeFormat(Settings.flag2.time_format);
-}
-
-int ResponseJsonEnd(void)
-{
-  return ResponseAppend_P(PSTR("}"));
-}
-
-int ResponseJsonEndEnd(void)
-{
-  return ResponseAppend_P(PSTR("}}"));
-}
-
-
-
-
-
-void DigitalWrite(uint32_t gpio_pin, uint32_t state)
-{
-  if (pin[gpio_pin] < 99) {
-    digitalWrite(pin[gpio_pin], state &1);
-  }
-}
-
-uint8_t ModuleNr(void)
-{
-
-
-  return (USER_MODULE == Settings.module) ? 0 : Settings.module +1;
-}
-
-bool ValidTemplateModule(uint32_t index)
-{
-  for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
-    if (index == pgm_read_byte(kModuleNiceList + i)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool ValidModule(uint32_t index)
-{
-  if (index == USER_MODULE) { return true; }
-  return ValidTemplateModule(index);
-}
-
-String AnyModuleName(uint32_t index)
-{
-  if (USER_MODULE == index) {
-    return String(Settings.user_template.name);
-  } else {
-    return FPSTR(kModules[index].name);
-  }
-}
-
-String ModuleName(void)
-{
-  return AnyModuleName(Settings.module);
-}
-
-void ModuleGpios(myio *gp)
-{
-  uint8_t *dest = (uint8_t *)gp;
-  memset(dest, GPIO_NONE, sizeof(myio));
-
-  uint8_t src[sizeof(mycfgio)];
-  if (USER_MODULE == Settings.module) {
-    memcpy(&src, &Settings.user_template.gp, sizeof(mycfgio));
-  } else {
-    memcpy_P(&src, &kModules[Settings.module].gp, sizeof(mycfgio));
-  }
-
-
-
-
-  uint32_t j = 0;
-  for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-    if (6 == i) { j = 9; }
-    if (8 == i) { j = 12; }
-    dest[j] = src[i];
-    j++;
-  }
-
-
-
-}
-
-gpio_flag ModuleFlag(void)
-{
-  gpio_flag flag;
-
-  if (USER_MODULE == Settings.module) {
-    flag = Settings.user_template.flag;
-  } else {
-    memcpy_P(&flag, &kModules[Settings.module].flag, sizeof(gpio_flag));
-  }
-
-  return flag;
-}
-
-void ModuleDefault(uint32_t module)
-{
-  if (USER_MODULE == module) { module = WEMOS; }
-  Settings.user_template_base = module;
-  memcpy_P(&Settings.user_template, &kModules[module], sizeof(mytmplt));
-}
-
-void SetModuleType(void)
-{
-  my_module_type = (USER_MODULE == Settings.module) ? Settings.user_template_base : Settings.module;
-}
-
-bool FlashPin(uint32_t pin)
-{
-  return (((pin > 5) && (pin < 9)) || (11 == pin));
-}
-
-uint8_t ValidPin(uint32_t pin, uint32_t gpio)
-{
-  if (FlashPin(pin)) {
-    return GPIO_NONE;
-  }
-
-
-  if ((WEMOS == Settings.module) && !Settings.flag3.user_esp8285_enable) {
-    if ((pin == 9) || (pin == 10)) {
-      return GPIO_NONE;
-    }
-  }
-
-  return gpio;
-}
-
-bool ValidGPIO(uint32_t pin, uint32_t gpio)
-{
-  return (GPIO_USER == ValidPin(pin, gpio));
-}
-
-bool ValidAdc(void)
-{
-  gpio_flag flag = ModuleFlag();
-  uint32_t template_adc0 = flag.data &15;
-  return (ADC0_USER == template_adc0);
-}
-
-bool GetUsedInModule(uint32_t val, uint8_t *arr)
-{
-  int offset = 0;
-
-  if (!val) { return false; }
-
-  if ((val >= GPIO_KEY1) && (val < GPIO_KEY1 + MAX_KEYS)) {
-    offset = (GPIO_KEY1_NP - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_NP) && (val < GPIO_KEY1_NP + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_NP - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_INV) && (val < GPIO_KEY1_INV + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_INV - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_INV_NP) && (val < GPIO_KEY1_INV_NP + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_INV_NP - GPIO_KEY1);
-  }
-
-  if ((val >= GPIO_SWT1) && (val < GPIO_SWT1 + MAX_SWITCHES)) {
-    offset = (GPIO_SWT1_NP - GPIO_SWT1);
-  }
-  if ((val >= GPIO_SWT1_NP) && (val < GPIO_SWT1_NP + MAX_SWITCHES)) {
-    offset = -(GPIO_SWT1_NP - GPIO_SWT1);
-  }
-
-  if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
-    offset = (GPIO_REL1_INV - GPIO_REL1);
-  }
-  if ((val >= GPIO_REL1_INV) && (val < GPIO_REL1_INV + MAX_RELAYS)) {
-    offset = -(GPIO_REL1_INV - GPIO_REL1);
-  }
-
-  if ((val >= GPIO_LED1) && (val < GPIO_LED1 + MAX_LEDS)) {
-    offset = (GPIO_LED1_INV - GPIO_LED1);
-  }
-  if ((val >= GPIO_LED1_INV) && (val < GPIO_LED1_INV + MAX_LEDS)) {
-    offset = -(GPIO_LED1_INV - GPIO_LED1);
-  }
-
-  if ((val >= GPIO_PWM1) && (val < GPIO_PWM1 + MAX_PWMS)) {
-    offset = (GPIO_PWM1_INV - GPIO_PWM1);
-  }
-  if ((val >= GPIO_PWM1_INV) && (val < GPIO_PWM1_INV + MAX_PWMS)) {
-    offset = -(GPIO_PWM1_INV - GPIO_PWM1);
-  }
-
-  if ((val >= GPIO_CNTR1) && (val < GPIO_CNTR1 + MAX_COUNTERS)) {
-    offset = (GPIO_CNTR1_NP - GPIO_CNTR1);
-  }
-  if ((val >= GPIO_CNTR1_NP) && (val < GPIO_CNTR1_NP + MAX_COUNTERS)) {
-    offset = -(GPIO_CNTR1_NP - GPIO_CNTR1);
-  }
-
-  for (uint32_t i = 0; i < MAX_GPIO_PIN; i++) {
-    if (arr[i] == val) { return true; }
-    if (arr[i] == val + offset) { return true; }
-  }
-  return false;
-}
-
-bool JsonTemplate(const char* dataBuf)
-{
-
-
-  if (strlen(dataBuf) < 9) { return false; }
-
-  StaticJsonBuffer<350> jb;
-  JsonObject& obj = jb.parseObject(dataBuf);
-  if (!obj.success()) { return false; }
-
-
-  const char* name = obj[D_JSON_NAME];
-  if (name != nullptr) {
-    strlcpy(Settings.user_template.name, name, sizeof(Settings.user_template.name));
-  }
-  if (obj[D_JSON_GPIO].success()) {
-    for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-      Settings.user_template.gp.io[i] = obj[D_JSON_GPIO][i] | 0;
-    }
-  }
-  if (obj[D_JSON_FLAG].success()) {
-    uint8_t flag = obj[D_JSON_FLAG] | 0;
-    memcpy(&Settings.user_template.flag, &flag, sizeof(gpio_flag));
-  }
-  if (obj[D_JSON_BASE].success()) {
-    uint8_t base = obj[D_JSON_BASE];
-    if ((0 == base) || !ValidTemplateModule(base -1)) { base = 18; }
-    Settings.user_template_base = base -1;
-  }
-  return true;
-}
-
-void TemplateJson(void)
-{
-  Response_P(PSTR("{\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), Settings.user_template.name);
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    ResponseAppend_P(PSTR("%s%d"), (i>0)?",":"", Settings.user_template.gp.io[i]);
-  }
-  ResponseAppend_P(PSTR("],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), Settings.user_template.flag, Settings.user_template_base +1);
-}
-
-
-
-
-
-inline int32_t TimeDifference(uint32_t prev, uint32_t next)
-{
-  return ((int32_t) (next - prev));
-}
-
-int32_t TimePassedSince(uint32_t timestamp)
-{
-
-
-  return TimeDifference(timestamp, millis());
-}
-
-bool TimeReached(uint32_t timer)
-{
-
-  const long passed = TimePassedSince(timer);
-  return (passed >= 0);
-}
-
-void SetNextTimeInterval(unsigned long& timer, const unsigned long step)
-{
-  timer += step;
-  const long passed = TimePassedSince(timer);
-  if (passed < 0) { return; }
-  if (static_cast<unsigned long>(passed) > step) {
-
-    timer = millis() + step;
-    return;
-  }
-
-  timer = millis() + (step - passed);
-}
-
-int32_t TimePassedSinceUsec(uint32_t timestamp)
-{
-  return TimeDifference(timestamp, micros());
-}
-
-bool TimeReachedUsec(uint32_t timer)
-{
-
-  const long passed = TimePassedSinceUsec(timer);
-  return (passed >= 0);
-}
-
-
-
-
-
-#ifdef USE_I2C
-const uint8_t I2C_RETRY_COUNTER = 3;
-
-uint32_t i2c_active[4] = { 0 };
-uint32_t i2c_buffer = 0;
-
-bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size)
-{
-  uint8_t retry = I2C_RETRY_COUNTER;
-  bool status = false;
-
-  i2c_buffer = 0;
-  while (!status && retry) {
-    Wire.beginTransmission(addr);
-    Wire.write(reg);
-    if (0 == Wire.endTransmission(false)) {
-      Wire.requestFrom((int)addr, (int)size);
-      if (Wire.available() == size) {
-        for (uint32_t i = 0; i < size; i++) {
-          i2c_buffer = i2c_buffer << 8 | Wire.read();
-        }
-        status = true;
-      }
-    }
-    retry--;
-  }
-  return status;
-}
-
-bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 1);
-  *data = (uint8_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 2);
-  *data = (uint16_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 2);
-  *data = (int16_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg)
-{
-  uint16_t ldata;
-  bool status = I2cValidRead16(&ldata, addr, reg);
-  *data = (ldata >> 8) | (ldata << 8);
-  return status;
-}
-
-bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg)
-{
-  uint16_t ldata;
-  bool status = I2cValidRead16LE(&ldata, addr, reg);
-  *data = (int16_t)ldata;
-  return status;
-}
-
-bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 3);
-  *data = i2c_buffer;
-  return status;
-}
-
-uint8_t I2cRead8(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 1);
-  return (uint8_t)i2c_buffer;
-}
-
-uint16_t I2cRead16(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  return (uint16_t)i2c_buffer;
-}
-
-int16_t I2cReadS16(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  return (int16_t)i2c_buffer;
-}
-
-uint16_t I2cRead16LE(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  uint16_t temp = (uint16_t)i2c_buffer;
-  return (temp >> 8) | (temp << 8);
-}
-
-int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg)
-{
-  return (int16_t)I2cRead16LE(addr, reg);
-}
-
-int32_t I2cRead24(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 3);
-  return i2c_buffer;
-}
-
-bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size)
-{
-  uint8_t x = I2C_RETRY_COUNTER;
-
-  do {
-    Wire.beginTransmission((uint8_t)addr);
-    Wire.write(reg);
-    uint8_t bytes = size;
-    while (bytes--) {
-      Wire.write((val >> (8 * bytes)) & 0xFF);
-    }
-    x--;
-  } while (Wire.endTransmission(true) != 0 && x != 0);
-  return (x);
-}
-
-bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val)
-{
-   return I2cWrite(addr, reg, val, 1);
-}
-
-bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val)
-{
-   return I2cWrite(addr, reg, val, 2);
-}
-
-int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
-{
-  Wire.beginTransmission((uint8_t)addr);
-  Wire.write((uint8_t)reg);
-  Wire.endTransmission();
-  if (len != Wire.requestFrom((uint8_t)addr, (uint8_t)len)) {
-    return 1;
-  }
-  while (len--) {
-    *reg_data = (uint8_t)Wire.read();
-    reg_data++;
-  }
-  return 0;
-}
-
-int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
-{
-  Wire.beginTransmission((uint8_t)addr);
-  Wire.write((uint8_t)reg);
-  while (len--) {
-    Wire.write(*reg_data);
-    reg_data++;
-  }
-  Wire.endTransmission();
-  return 0;
-}
-
-void I2cScan(char *devs, unsigned int devs_len)
-{
-
-
-
-
-
-
-
-  uint8_t error = 0;
-  uint8_t address = 0;
-  uint8_t any = 0;
-
-  snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_DEVICES_FOUND_AT));
-  for (address = 1; address <= 127; address++) {
-    Wire.beginTransmission(address);
-    error = Wire.endTransmission();
-    if (0 == error) {
-      any = 1;
-      snprintf_P(devs, devs_len, PSTR("%s 0x%02x"), devs, address);
-    }
-    else if (error != 2) {
-      any = 2;
-      snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"Error %d at 0x%02x"), error, address);
-      break;
-    }
-  }
-  if (any) {
-    strncat(devs, "\"}", devs_len - strlen(devs) -1);
-  }
-  else {
-    snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_NO_DEVICES_FOUND "\"}"));
-  }
-}
-
-void I2cResetActive(uint32_t addr, uint32_t count = 1)
-{
-  addr &= 0x7F;
-  count &= 0x7F;
-  while (count-- && (addr < 128)) {
-    i2c_active[addr / 32] &= ~(1 << (addr % 32));
-    addr++;
-  }
-
-}
-
-void I2cSetActive(uint32_t addr, uint32_t count = 1)
-{
-  addr &= 0x7F;
-  count &= 0x7F;
-  while (count-- && (addr < 128)) {
-    i2c_active[addr / 32] |= (1 << (addr % 32));
-    addr++;
-  }
-
-}
-
-void I2cSetActiveFound(uint32_t addr, const char *types)
-{
-  I2cSetActive(addr);
-  AddLog_P2(LOG_LEVEL_INFO, S_LOG_I2C_FOUND_AT, types, addr);
-}
-
-bool I2cActive(uint32_t addr)
-{
-  addr &= 0x7F;
-  if (i2c_active[addr / 32] & (1 << (addr % 32))) {
-    return true;
-  }
-  return false;
-}
-
-bool I2cSetDevice(uint32_t addr)
-{
-  addr &= 0x7F;
-  if (I2cActive(addr)) {
-    return false;
-  }
-  Wire.beginTransmission((uint8_t)addr);
-  return (0 == Wire.endTransmission());
-}
-#endif
-# 1559 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-void SetSeriallog(uint32_t loglevel)
-{
-  Settings.seriallog_level = loglevel;
-  seriallog_level = loglevel;
-  seriallog_timer = 0;
-}
-
-void SetSyslog(uint32_t loglevel)
-{
-  Settings.syslog_level = loglevel;
-  syslog_level = loglevel;
-  syslog_timer = 0;
-}
-
-#ifdef USE_WEBSERVER
-void GetLog(uint32_t idx, char** entry_pp, size_t* len_p)
-{
-  char* entry_p = nullptr;
-  size_t len = 0;
-
-  if (idx) {
-    char* it = web_log;
-    do {
-      uint32_t cur_idx = *it;
-      it++;
-      size_t tmp = strchrspn(it, '\1');
-      tmp++;
-      if (cur_idx == idx) {
-        len = tmp;
-        entry_p = it;
-        break;
-      }
-      it += tmp;
-    } while (it < web_log + WEB_LOG_SIZE && *it != '\0');
-  }
-  *entry_pp = entry_p;
-  *len_p = len;
-}
-#endif
-
-void Syslog(void)
-{
-
-
-  uint32_t current_hash = GetHash(SettingsText(SET_SYSLOG_HOST), strlen(SettingsText(SET_SYSLOG_HOST)));
-  if (syslog_host_hash != current_hash) {
-    syslog_host_hash = current_hash;
-    WiFi.hostByName(SettingsText(SET_SYSLOG_HOST), syslog_host_addr);
-  }
-  if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
-    char syslog_preamble[64];
-    snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);
-    memmove(log_data + strlen(syslog_preamble), log_data, sizeof(log_data) - strlen(syslog_preamble));
-    log_data[sizeof(log_data) -1] = '\0';
-    memcpy(log_data, syslog_preamble, strlen(syslog_preamble));
-    PortUdp.write(log_data, strlen(log_data));
-    PortUdp.endPacket();
-    delay(1);
-  } else {
-    syslog_level = 0;
-    syslog_timer = SYSLOG_TIMER;
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_HOST_NOT_FOUND ". " D_RETRY_IN " %d " D_UNIT_SECOND), SYSLOG_TIMER);
-  }
-}
-
-void AddLog(uint32_t loglevel)
-{
-  char mxtime[10];
-
-  snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
-
-  if (loglevel <= seriallog_level) {
-    Serial.printf("%s%s\r\n", mxtime, log_data);
-  }
-#ifdef USE_WEBSERVER
-  if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
-
-
-    web_log_index &= 0xFF;
-    if (!web_log_index) web_log_index++;
-    while (web_log_index == web_log[0] ||
-           strlen(web_log) + strlen(log_data) + 13 > WEB_LOG_SIZE)
-    {
-      char* it = web_log;
-      it++;
-      it += strchrspn(it, '\1');
-      it++;
-      memmove(web_log, it, WEB_LOG_SIZE -(it-web_log));
-    }
-    snprintf_P(web_log, sizeof(web_log), PSTR("%s%c%s%s\1"), web_log, web_log_index++, mxtime, log_data);
-    web_log_index &= 0xFF;
-    if (!web_log_index) web_log_index++;
-  }
-#endif
-  if (Settings.flag.mqtt_enabled &&
-      !global_state.mqtt_down &&
-      (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
-
-  if (!global_state.wifi_down &&
-      (loglevel <= syslog_level)) { Syslog(); }
-}
-
-void AddLog_P(uint32_t loglevel, const char *formatP)
-{
-  snprintf_P(log_data, sizeof(log_data), formatP);
-  AddLog(loglevel);
-}
-
-void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2)
-{
-  char message[sizeof(log_data)];
-
-  snprintf_P(log_data, sizeof(log_data), formatP);
-  snprintf_P(message, sizeof(message), formatP2);
-  strncat(log_data, message, sizeof(log_data) - strlen(log_data) -1);
-  AddLog(loglevel);
-}
-
-void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  prepped_loglevel = loglevel;
-}
-
-void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  AddLog(loglevel);
-}
-
-void AddLog_Debug(PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  AddLog(LOG_LEVEL_DEBUG);
-}
-
-void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count)
-{
-# 1721 "C:/shared/sonoff/Git/Tasmota/tasmota/support.ino"
-  char hex_char[(count * 3) + 2];
-  AddLog_P2(loglevel, PSTR("DMP: %s"), ToHex_P(buffer, count, hex_char, sizeof(hex_char), ' '));
-}
-
-void AddLogSerial(uint32_t loglevel)
-{
-  AddLogBuffer(loglevel, (uint8_t*)serial_in_buffer, serial_in_byte_counter);
-}
-
-void AddLogMissed(char *sensor, uint32_t misses)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SNS: %s missed %d"), sensor, SENSOR_MAX_MISS - misses);
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
-#define BUTTON_V1 
-#ifdef BUTTON_V1
-
-
-
-
-#define MAX_BUTTON_COMMANDS 5
-const char kCommands[] PROGMEM =
-  D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_RESTART " 1|" D_CMND_UPGRADE " 1";
-
-struct BUTTON {
-  unsigned long debounce = 0;
-  uint16_t hold_timer[MAX_KEYS] = { 0 };
-  uint16_t dual_code = 0;
-
-  uint8_t last_state[MAX_KEYS] = { NOT_PRESSED, NOT_PRESSED, NOT_PRESSED, NOT_PRESSED };
-  uint8_t window_timer[MAX_KEYS] = { 0 };
-  uint8_t press_counter[MAX_KEYS] = { 0 };
-
-  uint8_t dual_receive_count = 0;
-  uint8_t no_pullup_mask = 0;
-  uint8_t inverted_mask = 0;
-  uint8_t present = 0;
-  uint8_t adc = 99;
-} Button;
-
-
-
-void ButtonPullupFlag(uint8 button_bit)
-{
-  bitSet(Button.no_pullup_mask, button_bit);
-}
-
-void ButtonInvertFlag(uint8 button_bit)
-{
-  bitSet(Button.inverted_mask, button_bit);
-}
-
-void ButtonInit(void)
-{
-  Button.present = 0;
-  for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if (pin[GPIO_KEY1 +i] < 99) {
-      Button.present++;
-      pinMode(pin[GPIO_KEY1 +i], bitRead(Button.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_KEY1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
-    }
-#ifndef USE_ADC_VCC
-    else if ((99 == Button.adc) && ((ADC0_BUTTON == my_adc0) || (ADC0_BUTTON_INV == my_adc0))) {
-      Button.present++;
-      Button.adc = i;
-    }
-#endif
-  }
-}
-
-uint8_t ButtonSerial(uint8_t serial_in_byte)
-{
-  if (Button.dual_receive_count) {
-    Button.dual_receive_count--;
-    if (Button.dual_receive_count) {
-      Button.dual_code = (Button.dual_code << 8) | serial_in_byte;
-      serial_in_byte = 0;
-    } else {
-      if (serial_in_byte != 0xA1) {
-        Button.dual_code = 0;
-      }
-    }
-  }
-  if (0xA0 == serial_in_byte) {
-    serial_in_byte = 0;
-    Button.dual_code = 0;
-    Button.dual_receive_count = 3;
-  }
-
-  return serial_in_byte;
-}
-# 108 "C:/shared/sonoff/Git/Tasmota/tasmota/support_button.ino"
-void ButtonHandler(void)
-{
-  if (uptime < 4) { return; }
-
-  uint8_t hold_time_extent = IMMINENT_RESET_FACTOR;
-  uint16_t loops_per_second = 1000 / Settings.button_debounce;
-  char scmnd[20];
-
-
-
-  for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
-    uint8_t button = NOT_PRESSED;
-    uint8_t button_present = 0;
-
-    if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type))) {
-      button_present = 1;
-      if (Button.dual_code) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON " " D_CODE " %04X"), Button.dual_code);
-        button = PRESSED;
-        if (0xF500 == Button.dual_code) {
-          Button.hold_timer[button_index] = (loops_per_second * Settings.param[P_HOLD_TIME] / 10) -1;
-          hold_time_extent = 1;
-        }
-        Button.dual_code = 0;
-      }
-    }
-    else if (pin[GPIO_KEY1 +button_index] < 99) {
-      button_present = 1;
-      button = (digitalRead(pin[GPIO_KEY1 +button_index]) != bitRead(Button.inverted_mask, button_index));
-    }
-#ifndef USE_ADC_VCC
-    if (Button.adc == button_index) {
-      button_present = 1;
-      if (ADC0_BUTTON_INV == my_adc0) {
-        button = (AdcRead(1) < 128);
-      }
-      else if (ADC0_BUTTON == my_adc0) {
-        button = (AdcRead(1) > 128);
-      }
-    }
-#endif
-
-    if (button_present) {
-      XdrvMailbox.index = button_index;
-      XdrvMailbox.payload = button;
-      if (XdrvCall(FUNC_BUTTON_PRESSED)) {
-
-      }
-      else if (SONOFF_4CHPRO == my_module_type) {
-        if (Button.hold_timer[button_index]) { Button.hold_timer[button_index]--; }
-
-        bool button_pressed = false;
-        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_10), button_index +1);
-          Button.hold_timer[button_index] = loops_per_second;
-          button_pressed = true;
-        }
-        if ((NOT_PRESSED == button) && (PRESSED == Button.last_state[button_index])) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_01), button_index +1);
-          if (!Button.hold_timer[button_index]) { button_pressed = true; }
-        }
-        if (button_pressed) {
-          if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
-            ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
-          }
-        }
-      }
-      else {
-        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-          if (Settings.flag.button_single) {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1);
-            if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
-              ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
-            }
-          } else {
-            Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_MULTI_PRESS " %d"), button_index +1, Button.press_counter[button_index]);
-            Button.window_timer[button_index] = loops_per_second / 2;
-          }
-          blinks = 201;
-        }
-
-        if (NOT_PRESSED == button) {
-          Button.hold_timer[button_index] = 0;
-        } else {
-          Button.hold_timer[button_index]++;
-          if (Settings.flag.button_single) {
-            if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
-
-              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "13 0"));
-              ExecuteCommand(scmnd, SRC_BUTTON);
-            }
-          } else {
-            if (Settings.flag.button_restrict) {
-              if (Settings.param[P_HOLD_IGNORE] > 0) {
-                if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
-                  Button.hold_timer[button_index] = 0;
-                  Button.press_counter[button_index] = 0;
-                  DEBUG_CORE_LOG(PSTR("BTN: " D_BUTTON "%d cancel by " D_CMND_SETOPTION "40 %d"), button_index +1, Settings.param[P_HOLD_IGNORE]);
-                }
-              }
-              if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {
-                Button.press_counter[button_index] = 0;
-                SendKey(KEY_BUTTON, button_index +1, POWER_HOLD);
-              }
-            } else {
-              if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
-                Button.press_counter[button_index] = 0;
-                snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-                ExecuteCommand(scmnd, SRC_BUTTON);
-              }
-            }
-          }
-        }
-
-        if (!Settings.flag.button_single) {
-          if (Button.window_timer[button_index]) {
-            Button.window_timer[button_index]--;
-          } else {
-            if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0) && (Button.press_counter[button_index] < MAX_BUTTON_COMMANDS +3)) {
-              bool single_press = false;
-              if (Button.press_counter[button_index] < 3) {
-                if ((SONOFF_DUAL_R2 == my_module_type) || (SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-                  single_press = true;
-                } else {
-                  single_press = (Settings.flag.button_swap +1 == Button.press_counter[button_index]);
-                  if ((1 == Button.present) && (2 == devices_present)) {
-                    if (Settings.flag.button_swap) {
-                      Button.press_counter[button_index] = (single_press) ? 1 : 2;
-                    }
-                  } else {
-                    Button.press_counter[button_index] = 1;
-                  }
-                }
-              }
-#if defined(USE_LIGHT) && defined(ROTARY_V1)
-              if (!((0 == button_index) && RotaryButtonPressed())) {
-#endif
-                if (single_press && SendKey(KEY_BUTTON, button_index + Button.press_counter[button_index], POWER_TOGGLE)) {
-
-                } else {
-                  if (Button.press_counter[button_index] < 3) {
-                    if (WifiState() > WIFI_RESTART) {
-                      restart_flag = 1;
-                    } else {
-                      ExecuteCommandPower(button_index + Button.press_counter[button_index], POWER_TOGGLE, SRC_BUTTON);
-                    }
-                  } else {
-                    if (!Settings.flag.button_restrict) {
-                      GetTextIndexed(scmnd, sizeof(scmnd), Button.press_counter[button_index] -3, kCommands);
-                      ExecuteCommand(scmnd, SRC_BUTTON);
-                    }
-                  }
-                }
-#if defined(USE_LIGHT) && defined(ROTARY_V1)
-              }
-#endif
-              Button.press_counter[button_index] = 0;
-            }
-          }
-        }
-      }
-    }
-    Button.last_state[button_index] = button;
-  }
-}
-
-void ButtonLoop(void)
-{
-  if (Button.present) {
-    if (TimeReached(Button.debounce)) {
-      SetNextTimeInterval(Button.debounce, Settings.button_debounce);
-      ButtonHandler();
-    }
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
-const char kTasmotaCommands[] PROGMEM = "|"
-  D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|"
-  D_CMND_SERIALLOG "|" D_CMND_RESTART "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SAVEDATA "|"
-  D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" D_CMND_PRESSURE_RESOLUTION "|" D_CMND_POWER_RESOLUTION "|"
-  D_CMND_VOLTAGE_RESOLUTION "|" D_CMND_FREQUENCY_RESOLUTION "|" D_CMND_CURRENT_RESOLUTION "|" D_CMND_ENERGY_RESOLUTION "|" D_CMND_WEIGHT_RESOLUTION "|"
-  D_CMND_MODULE "|" D_CMND_MODULES "|" D_CMND_GPIO "|" D_CMND_GPIOS "|" D_CMND_TEMPLATE "|" D_CMND_PWM "|" D_CMND_PWMFREQUENCY "|" D_CMND_PWMRANGE "|"
-  D_CMND_BUTTONDEBOUNCE "|" D_CMND_SWITCHDEBOUNCE "|" D_CMND_SYSLOG "|" D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALCONFIG "|"
-  D_CMND_SERIALDELIMITER "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|"
-  D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_INTERLOCK "|" D_CMND_TELEPERIOD "|" D_CMND_RESET "|" D_CMND_TIME "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|"
-  D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_LEDMASK "|" D_CMND_WIFIPOWER "|" D_CMND_TEMPOFFSET "|"
-#ifdef USE_I2C
-  D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
-#endif
-  D_CMND_SENSOR "|" D_CMND_DRIVER;
-
-void (* const TasmotaCommand[])(void) PROGMEM = {
-  &CmndBacklog, &CmndDelay, &CmndPower, &CmndStatus, &CmndState, &CmndSleep, &CmndUpgrade, &CmndUpgrade, &CmndOtaUrl,
-  &CmndSeriallog, &CmndRestart, &CmndPowerOnState, &CmndPulsetime, &CmndBlinktime, &CmndBlinkcount, &CmndSavedata,
-  &CmndSetoption, &CmndTemperatureResolution, &CmndHumidityResolution, &CmndPressureResolution, &CmndPowerResolution,
-  &CmndVoltageResolution, &CmndFrequencyResolution, &CmndCurrentResolution, &CmndEnergyResolution, &CmndWeightResolution,
-  &CmndModule, &CmndModules, &CmndGpio, &CmndGpios, &CmndTemplate, &CmndPwm, &CmndPwmfrequency, &CmndPwmrange,
-  &CmndButtonDebounce, &CmndSwitchDebounce, &CmndSyslog, &CmndLoghost, &CmndLogport, &CmndSerialSend, &CmndBaudrate, &CmndSerialConfig,
-  &CmndSerialDelimiter, &CmndIpAddress, &CmndNtpServer, &CmndAp, &CmndSsid, &CmndPassword, &CmndHostname, &CmndWifiConfig,
-  &CmndFriendlyname, &CmndSwitchMode, &CmndInterlock, &CmndTeleperiod, &CmndReset, &CmndTime, &CmndTimezone, &CmndTimeStd,
-  &CmndTimeDst, &CmndAltitude, &CmndLedPower, &CmndLedState, &CmndLedMask, &CmndWifiPower, &CmndTempOffset,
-#ifdef USE_I2C
-  &CmndI2cScan, CmndI2cDriver,
-#endif
-  &CmndSensor, &CmndDriver };
-
-const char kWifiConfig[] PROGMEM =
-  D_WCFG_0_RESTART "||" D_WCFG_2_WIFIMANAGER "||" D_WCFG_4_RETRY "|" D_WCFG_5_WAIT "|" D_WCFG_6_SERIAL "|" D_WCFG_7_WIFIMANAGER_RESET_ONLY;
-
-
-
-void ResponseCmndNumber(int value)
-{
-  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, value);
-}
-
-void ResponseCmndFloat(float value, uint32_t decimals)
-{
-  char stemp1[TOPSZ];
-  dtostrfd(value, decimals, stemp1);
-  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp1);
-}
-
-void ResponseCmndIdxNumber(int value)
-{
-  Response_P(S_JSON_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
-}
-
-void ResponseCmndChar(const char* value)
-{
-  Response_P(S_JSON_COMMAND_SVALUE, XdrvMailbox.command, value);
-}
-
-void ResponseCmndStateText(uint32_t value)
-{
-  ResponseCmndChar(GetStateText(value));
-}
-
-void ResponseCmndDone(void)
-{
-  ResponseCmndChar(D_JSON_DONE);
-}
-
-void ResponseCmndIdxChar(const char* value)
-{
-  Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
-}
-
-void ResponseCmndAll(uint32_t text_index, uint32_t count)
-{
-  mqtt_data[0] = '\0';
-  for (uint32_t i = 0; i < count; i++) {
-    ResponseAppend_P(PSTR("%c\"%s%d\":\"%s\""), (i) ? ',' : '{', XdrvMailbox.command, i +1, SettingsText(text_index +i));
-  }
-  ResponseJsonEnd();
-}
-
-
-
-void ExecuteCommand(const char *cmnd, uint32_t source)
-{
-
-
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("ExecuteCommand"));
-#endif
-  ShowSource(source);
-
-  const char *pos = cmnd;
-  while (*pos && isspace(*pos)) {
-    pos++;
-  }
-
-  const char *start = pos;
-
-  while (*pos && (isalpha(*pos) || isdigit(*pos) || '_' == *pos || '/' == *pos)) {
-    if ('/' == *pos) {
-      start = pos + 1;
-    }
-    pos++;
-  }
-  if ('\0' == *start || pos <= start) {
-    return;
-  }
-
-  uint32_t size = pos - start;
-  char stopic[size + 2];
-  stopic[0] = '/';
-  memcpy(stopic+1, start, size);
-  stopic[size+1] = '\0';
-
-  char svalue[strlen(pos) +1];
-  strlcpy(svalue, pos, sizeof(svalue));
-  CommandHandler(stopic, svalue, strlen(svalue));
-}
-# 148 "C:/shared/sonoff/Git/Tasmota/tasmota/support_command.ino"
-void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("CommandHandler"));
-#endif
-
-  while (*dataBuf && isspace(*dataBuf)) {
-    dataBuf++;
-    data_len--;
-  }
-
-  bool grpflg = (strstr(topicBuf, SettingsText(SET_MQTT_GRP_TOPIC)) != nullptr);
-
-  char stemp1[TOPSZ];
-  GetFallbackTopic_P(stemp1, "");
-  fallback_topic_flag = (!strncmp(topicBuf, stemp1, strlen(stemp1)));
-
-  char *type = strrchr(topicBuf, '/');
-
-  uint32_t index = 1;
-  bool user_index = false;
-  if (type != nullptr) {
-    type++;
-    uint32_t i;
-    for (i = 0; i < strlen(type); i++) {
-      type[i] = toupper(type[i]);
-    }
-    while (isdigit(type[i-1])) {
-      i--;
-    }
-    if (i < strlen(type)) {
-      index = atoi(type +i);
-      user_index = true;
-    }
-    type[i] = '\0';
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CMD: " D_GROUP " %d, " D_INDEX " %d, " D_COMMAND " \"%s\", " D_DATA " \"%s\""), grpflg, index, type, dataBuf);
-
-  if (type != nullptr) {
-    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_ERROR "\"}"));
-
-    if (Settings.ledstate &0x02) { blinks++; }
-
-    if (!strcmp(dataBuf,"?")) { data_len = 0; }
-
-    char *p;
-    int32_t payload = strtol(dataBuf, &p, 0);
-    if (p == dataBuf) { payload = -99; }
-    int temp_payload = GetStateNumber(dataBuf);
-    if (temp_payload > -1) { payload = temp_payload; }
-
-    DEBUG_CORE_LOG(PSTR("CMD: Payload %d"), payload);
-
-
-    backlog_delay = millis() + Settings.param[P_BACKLOG_DELAY];
-
-    char command[CMDSZ] = { 0 };
-    XdrvMailbox.command = command;
-    XdrvMailbox.index = index;
-    XdrvMailbox.data_len = data_len;
-    XdrvMailbox.payload = payload;
-    XdrvMailbox.grpflg = grpflg;
-    XdrvMailbox.usridx = user_index;
-    XdrvMailbox.topic = type;
-    XdrvMailbox.data = dataBuf;
-
-#ifdef USE_SCRIPT_SUB_COMMAND
-
-    if (!Script_SubCmd()) {
-      if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
-        if (!XdrvCall(FUNC_COMMAND)) {
-          if (!XsnsCall(FUNC_COMMAND)) {
-            type = nullptr;
-          }
-        }
-      }
-    }
-#else
-    if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
-      if (!XdrvCall(FUNC_COMMAND)) {
-        if (!XsnsCall(FUNC_COMMAND)) {
-          type = nullptr;
-        }
-      }
-    }
-#endif
-
-  }
-
-  if (type == nullptr) {
-    blinks = 201;
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_COMMAND));
-    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}"));
-    type = (char*)stemp1;
-  }
-
-  if (mqtt_data[0] != '\0') {
-     MqttPublishPrefixTopic_P(RESULT_OR_STAT, type);
-     XdrvRulesProcess();
-  }
-  fallback_topic_flag = false;
-}
-
-
-
-void CmndBacklog(void)
-{
-  if (XdrvMailbox.data_len) {
-
-#ifdef SUPPORT_IF_STATEMENT
-    char *blcommand = strtok(XdrvMailbox.data, ";");
-    while ((blcommand != nullptr) && (backlog.size() < MAX_BACKLOG))
-#else
-    uint32_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer;
-    bl_pointer--;
-    char *blcommand = strtok(XdrvMailbox.data, ";");
-    while ((blcommand != nullptr) && (backlog_index != bl_pointer))
-#endif
-    {
-      while(true) {
-        blcommand = Trim(blcommand);
-        if (!strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) {
-          blcommand += strlen(D_CMND_BACKLOG);
-        } else {
-          break;
-        }
-      }
-      if (*blcommand != '\0') {
-#ifdef SUPPORT_IF_STATEMENT
-        if (backlog.size() < MAX_BACKLOG) {
-          backlog.add(blcommand);
-        }
-#else
-        backlog[backlog_index] = String(blcommand);
-        backlog_index++;
-        if (backlog_index >= MAX_BACKLOG) backlog_index = 0;
-#endif
-      }
-      blcommand = strtok(nullptr, ";");
-    }
-
-    mqtt_data[0] = '\0';
-  } else {
-    bool blflag = BACKLOG_EMPTY;
-#ifdef SUPPORT_IF_STATEMENT
-    backlog.clear();
-#else
-    backlog_pointer = backlog_index;
-#endif
-    ResponseCmndChar(blflag ? D_JSON_EMPTY : D_JSON_ABORTED);
-  }
-}
-
-void CmndDelay(void)
-{
-  if ((XdrvMailbox.payload >= (MIN_BACKLOG_DELAY / 100)) && (XdrvMailbox.payload <= 3600)) {
-    backlog_delay = millis() + (100 * XdrvMailbox.payload);
-  }
-  uint32_t bl_delay = 0;
-  long bl_delta = TimePassedSince(backlog_delay);
-  if (bl_delta < 0) { bl_delay = (bl_delta *-1) / 100; }
-  ResponseCmndNumber(bl_delay);
-}
-
-void CmndPower(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= devices_present)) {
-    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_BLINK_STOP)) {
-      XdrvMailbox.payload = POWER_SHOW_STATE;
-    }
-
-    ExecuteCommandPower(XdrvMailbox.index, XdrvMailbox.payload, SRC_IGNORE);
-    mqtt_data[0] = '\0';
-  }
-  else if (0 == XdrvMailbox.index) {
-    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_TOGGLE)) {
-      XdrvMailbox.payload = POWER_SHOW_STATE;
-    }
-    SetAllPower(XdrvMailbox.payload, SRC_IGNORE);
-    mqtt_data[0] = '\0';
-  }
-}
-
-void CmndStatus(void)
-{
-  uint32_t payload = ((XdrvMailbox.payload < 0) || (XdrvMailbox.payload > MAX_STATUS)) ? 99 : XdrvMailbox.payload;
-
-  uint32_t option = STAT;
-  char stemp[200];
-  char stemp2[TOPSZ];
-
-
-
-
-
-  if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }
-  if (!energy_flg && (9 == payload)) { payload = 99; }
-  if (!CrashFlag() && (12 == payload)) { payload = 99; }
-
-  if ((0 == payload) || (99 == payload)) {
-    uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) { maxfn = 1; }
-#endif
-    stemp[0] = '\0';
-    for (uint32_t i = 0; i < maxfn; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), SettingsText(SET_FRIENDLYNAME1 +i));
-    }
-    stemp2[0] = '\0';
-    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-      snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%s%d" ), stemp2, (i > 0 ? "," : ""), Settings.switchmode[i]);
-    }
-    Response_P(PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":[%s],\"" D_CMND_TOPIC "\":\"%s\",\""
-                          D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\""
-                          D_CMND_LEDMASK "\":\"%04X\",\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_SWITCHTOPIC "\":\"%s\",\""
-                          D_CMND_SWITCHMODE "\":[%s],\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_SWITCHRETAIN "\":%d,\"" D_CMND_SENSORRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"),
-                          ModuleNr(), stemp, mqtt_topic,
-                          SettingsText(SET_MQTT_BUTTON_TOPIC), power, Settings.poweronstate, Settings.ledstate,
-                          Settings.ledmask, Settings.save_data,
-                          Settings.flag.save_state,
-                          SettingsText(SET_MQTT_SWITCH_TOPIC),
-                          stemp2,
-                          Settings.flag.mqtt_button_retain,
-                          Settings.flag.mqtt_switch_retain,
-                          Settings.flag.mqtt_sensor_retain,
-                          Settings.flag.mqtt_power_retain);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS));
-  }
-
-  if ((0 == payload) || (1 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
-                          D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
-                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"BCResetTime\":\"%s\",\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
-                          Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
-                          GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
-                          Settings.cfg_holder, Settings.bootcount, GetDateAndTime(DT_BOOTCOUNT).c_str(), Settings.save_flag, GetSettingsAddress());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
-  }
-
-  if ((0 == payload) || (2 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\""
-                          D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
-                          "\"Hardware\":\"%s\""
-                          "%s}}"),
-                          my_version, my_image, GetBuildDateAndTime().c_str(),
-                          ESP.getBootVersion(), ESP.getSdkVersion(),
-                          GetDeviceHardware().c_str(),
-                          GetStatistics().c_str());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "2"));
-  }
-
-  if ((0 == payload) || (3 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_MQTTLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\""
-                          D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\""
-                          D_JSON_RESOLUTION "\":\"%08X\",\"" D_CMND_SETOPTION "\":[\"%08X\",\"%s\",\"%08X\",\"%08X\"]}}"),
-                          Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level,
-                          SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), Settings.tele_period,
-                          Settings.flag2.data, Settings.flag.data, ToHex_P((unsigned char*)Settings.param, PARAM8_SIZE, stemp2, sizeof(stemp2)),
-                          Settings.flag3.data, Settings.flag4.data);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
-  }
-
-  if ((0 == payload) || (4 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS4_MEMORY "\":{\"" D_JSON_PROGRAMSIZE "\":%d,\"" D_JSON_FREEMEMORY "\":%d,\"" D_JSON_HEAPSIZE "\":%d,\""
-                          D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d,\"" D_JSON_FLASHCHIPID "\":\"%06X\",\"" D_JSON_FLASHMODE "\":%d,\""
-                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
-                          ESP.getSketchSize()/1024, ESP.getFreeSketchSpace()/1024, ESP.getFreeHeap()/1024,
-                          ESP.getFlashChipSize()/1024, ESP.getFlashChipRealSize()/1024, ESP.getFlashChipId(), ESP.getFlashChipMode(),
-                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5, feature6);
-    XsnsDriverState();
-    ResponseAppend_P(PSTR(",\"Sensors\":"));
-    XsnsSensorState();
-    ResponseJsonEndEnd();
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "4"));
-  }
-
-  if ((0 == payload) || (5 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"" D_JSON_GATEWAY "\":\"%s\",\""
-                          D_JSON_SUBNETMASK "\":\"%s\",\"" D_JSON_DNSSERVER "\":\"%s\",\"" D_JSON_MAC "\":\"%s\",\""
-                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"),
-                          my_hostname, WiFi.localIP().toString().c_str(), IPAddress(Settings.ip_address[1]).toString().c_str(),
-                          IPAddress(Settings.ip_address[2]).toString().c_str(), IPAddress(Settings.ip_address[3]).toString().c_str(), WiFi.macAddress().c_str(),
-                          Settings.webserver, Settings.sta_config, WifiGetOutputPower().c_str());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "5"));
-  }
-
-  if (((0 == payload) || (6 == payload)) && Settings.flag.mqtt_enabled) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\""
-                          D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"),
-                          SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT),
-                          mqtt_client, SettingsText(SET_MQTT_USER), MqttConnectCount(), MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "6"));
-  }
-
-  if ((0 == payload) || (7 == payload)) {
-    if (99 == Settings.timezone) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%d" ), Settings.timezone);
-    } else {
-      snprintf_P(stemp, sizeof(stemp), PSTR("\"%s\"" ), GetTimeZone().c_str());
-    }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
-                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"),
-                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
-                          GetTime(3).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
-#else
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
-                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s}}"),
-                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
-                          GetTime(3).c_str(), stemp);
-#endif
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7"));
-  }
-
-#if defined(USE_ENERGY_SENSOR) && defined(USE_ENERGY_MARGIN_DETECTION)
-  if (energy_flg) {
-    if ((0 == payload) || (9 == payload)) {
-      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERDELTA "\":%d,\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\""
-                            D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"),
-                            Settings.energy_power_delta, Settings.energy_min_power, Settings.energy_max_power,
-                            Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current);
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "9"));
-    }
-  }
-#endif
-
-  if ((0 == payload) || (8 == payload) || (10 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS10_SENSOR "\":"));
-    MqttShowSensor();
-    ResponseJsonEnd();
-    if (8 == payload) {
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "8"));
-    } else {
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "10"));
-    }
-  }
-
-  if ((0 == payload) || (11 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS11_STATUS "\":"));
-    MqttShowState();
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "11"));
-  }
-
-  if (CrashFlag()) {
-    if ((0 == payload) || (12 == payload)) {
-      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":"));
-      CrashDump();
-      ResponseJsonEnd();
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "12"));
-    }
-  }
-
-#ifdef USE_SCRIPT_STATUS
-  if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">U",2,mqtt_data);
-#endif
-  mqtt_data[0] = '\0';
-}
-
-void CmndState(void)
-{
-  mqtt_data[0] = '\0';
-  MqttShowState();
-  if (Settings.flag3.hass_tele_on_power) {
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
-  }
-#ifdef USE_HOME_ASSISTANT
-  if (Settings.flag.hass_discovery) {
-    HAssPublishStatus();
-  }
-#endif
-}
-
-void CmndTempOffset(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    int value = (int)(CharToFloat(XdrvMailbox.data) * 10);
-    if ((value > -127) && (value < 127)) {
-      Settings.temp_comp = value;
-    }
-  }
-  ResponseCmndFloat((float)(Settings.temp_comp) / 10, 1);
-}
-
-void CmndSleep(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 251)) {
-    Settings.sleep = XdrvMailbox.payload;
-    sleep = XdrvMailbox.payload;
-    WiFiSetSleepMode();
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.sleep, sleep);
-
-}
-
-void CmndUpgrade(void)
-{
-
-
-
-
-  if (((1 == XdrvMailbox.data_len) && (1 == XdrvMailbox.payload)) || ((XdrvMailbox.data_len >= 3) && NewerVersion(XdrvMailbox.data))) {
-    ota_state_flag = 3;
-    char stemp1[TOPSZ];
-    Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, my_version, GetOtaUrl(stemp1, sizeof(stemp1)));
-  } else {
-    Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, my_version);
-  }
-}
-
-void CmndOtaUrl(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_OTAURL, (SC_DEFAULT == Shortcut()) ? OTA_URL : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_OTAURL));
-}
-
-void CmndSeriallog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.flag.mqtt_serial = 0;
-    SetSeriallog(XdrvMailbox.payload);
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, seriallog_level);
-}
-
-void CmndRestart(void)
-{
-  switch (XdrvMailbox.payload) {
-  case 1:
-    restart_flag = 2;
-    ResponseCmndChar(D_JSON_RESTARTING);
-    break;
-  case -1:
-    CmndCrash();
-    break;
-  case -2:
-    CmndWDT();
-    break;
-  case -3:
-    CmndBlockedLoop();
-    break;
-  case 99:
-    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
-    EspRestart();
-    break;
-  default:
-    ResponseCmndChar(D_JSON_ONE_TO_RESTART);
-  }
-}
-
-void CmndPowerOnState(void)
-{
-  if (my_module_type != MOTOR) {
-
-
-
-
-
-
-
-    if ((XdrvMailbox.payload >= POWER_ALL_OFF) && (XdrvMailbox.payload <= POWER_ALL_OFF_PULSETIME_ON)) {
-      Settings.poweronstate = XdrvMailbox.payload;
-      if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-        for (uint32_t i = 1; i <= devices_present; i++) {
-          ExecuteCommandPower(i, POWER_ON, SRC_IGNORE);
-        }
-      }
-    }
-    ResponseCmndNumber(Settings.poweronstate);
-  }
-}
-
-void CmndPulsetime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PULSETIMERS)) {
-    uint32_t items = 1;
-    if (!XdrvMailbox.usridx && !XdrvMailbox.data_len) {
-      items = MAX_PULSETIMERS;
-    } else {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
-        Settings.pulse_timer[XdrvMailbox.index -1] = XdrvMailbox.payload;
-        SetPulseTimer(XdrvMailbox.index -1, XdrvMailbox.payload);
-      }
-    }
-    mqtt_data[0] = '\0';
-    for (uint32_t i = 0; i < items; i++) {
-      uint32_t index = (1 == items) ? XdrvMailbox.index : i +1;
-      ResponseAppend_P(PSTR("%c\"%s%d\":{\"" D_JSON_SET "\":%d,\"" D_JSON_REMAINING "\":%d}"),
-        (i) ? ',' : '{',
-        XdrvMailbox.command, index,
-        Settings.pulse_timer[index -1], GetPulseTimer(index -1));
-    }
-    ResponseJsonEnd();
-  }
-}
-
-void CmndBlinktime(void)
-{
-  if ((XdrvMailbox.payload > 1) && (XdrvMailbox.payload <= 3600)) {
-    Settings.blinktime = XdrvMailbox.payload;
-    if (blink_timer > 0) { blink_timer = millis() + (100 * XdrvMailbox.payload); }
-  }
-  ResponseCmndNumber(Settings.blinktime);
-}
-
-void CmndBlinkcount(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.blinkcount = XdrvMailbox.payload;
-    if (blink_counter) { blink_counter = Settings.blinkcount *2; }
-  }
-  ResponseCmndNumber(Settings.blinkcount);
-}
-
-void CmndSavedata(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3600)) {
-    Settings.save_data = XdrvMailbox.payload;
-    save_data_counter = Settings.save_data;
-  }
-  SettingsSaveAll();
-  char stemp1[TOPSZ];
-  if (Settings.save_data > 1) {
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_EVERY " %d " D_UNIT_SECOND), Settings.save_data);
-  }
-  ResponseCmndChar((Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data));
-}
-
-void CmndSetoption(void)
-{
-  if (XdrvMailbox.index < 114) {
-    uint32_t ptype;
-    uint32_t pindex;
-    if (XdrvMailbox.index <= 31) {
-      ptype = 2;
-      pindex = XdrvMailbox.index;
-    }
-    else if (XdrvMailbox.index <= 49) {
-      ptype = 1;
-      pindex = XdrvMailbox.index -32;
-    }
-    else if (XdrvMailbox.index <= 81) {
-      ptype = 3;
-      pindex = XdrvMailbox.index -50;
-    }
-    else {
-      ptype = 4;
-      pindex = XdrvMailbox.index -82;
-    }
-
-    if (XdrvMailbox.payload >= 0) {
-      if (1 == ptype) {
-        uint32_t param_low = 0;
-        uint32_t param_high = 255;
-        switch (pindex) {
-          case P_HOLD_TIME:
-          case P_MAX_POWER_RETRY:
-            param_low = 1;
-            param_high = 250;
-            break;
-        }
-        if ((XdrvMailbox.payload >= param_low) && (XdrvMailbox.payload <= param_high)) {
-          Settings.param[pindex] = XdrvMailbox.payload;
-#ifdef USE_LIGHT
-          if (P_RGB_REMAP == pindex) {
-            LightUpdateColorMapping();
-            restart_flag = 2;
-          }
-#endif
-#if (defined(USE_IR_REMOTE) && defined(USE_IR_RECEIVE)) || defined(USE_IR_REMOTE_FULL)
-          if (P_IR_UNKNOW_THRESHOLD == pindex) {
-            IrReceiveUpdateThreshold();
-          }
-#endif
-        } else {
-          ptype = 99;
-        }
-      } else {
-        if (XdrvMailbox.payload <= 1) {
-          if (2 == ptype) {
-            switch (pindex) {
-              case 5:
-              case 6:
-              case 7:
-              case 9:
-              case 14:
-              case 22:
-              case 23:
-              case 25:
-              case 27:
-                ptype = 99;
-                break;
-              case 3:
-              case 15:
-                restart_flag = 2;
-              default:
-                bitWrite(Settings.flag.data, pindex, XdrvMailbox.payload);
-            }
-            if (12 == pindex) {
-              stop_flash_rotate = XdrvMailbox.payload;
-              SettingsSave(2);
-            }
-  #ifdef USE_HOME_ASSISTANT
-            if ((19 == pindex) || (30 == pindex)) {
-              HAssDiscover();
-            }
-  #endif
-          }
-          else if (3 == ptype) {
-            bitWrite(Settings.flag3.data, pindex, XdrvMailbox.payload);
-            switch (pindex) {
-              case 5:
-                if (0 == XdrvMailbox.payload) {
-                  restart_flag = 2;
-                }
-                break;
-              case 10:
-                WiFiSetSleepMode();
-                break;
-              case 18:
-              case 25:
-                restart_flag = 2;
-                break;
-            }
-          }
-          else if (4 == ptype) {
-            bitWrite(Settings.flag4.data, pindex, XdrvMailbox.payload);
-          }
-        } else {
-          ptype = 99;
-        }
-      }
-    }
-
-    if (ptype < 99) {
-      if (1 == ptype) {
-        ResponseCmndIdxNumber(Settings.param[pindex]);
-      } else {
-        uint32_t flag = Settings.flag.data;
-        if (3 == ptype) {
-          flag = Settings.flag3.data;
-        }
-        else if (4 == ptype) {
-          flag = Settings.flag4.data;
-        }
-        ResponseCmndIdxChar(GetStateText(bitRead(flag, pindex)));
-      }
-    }
-  }
-}
-
-void CmndTemperatureResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.temperature_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.temperature_resolution);
-}
-
-void CmndHumidityResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.humidity_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.humidity_resolution);
-}
-
-void CmndPressureResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.pressure_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.pressure_resolution);
-}
-
-void CmndPowerResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.wattage_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.wattage_resolution);
-}
-
-void CmndVoltageResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.voltage_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.voltage_resolution);
-}
-
-void CmndFrequencyResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.frequency_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.frequency_resolution);
-}
-
-void CmndCurrentResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.current_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.current_resolution);
-}
-
-void CmndEnergyResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    Settings.flag2.energy_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.energy_resolution);
-}
-
-void CmndWeightResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.weight_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.weight_resolution);
-}
-
-void CmndModule(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAXMODULE)) {
-    bool present = false;
-    if (0 == XdrvMailbox.payload) {
-      XdrvMailbox.payload = USER_MODULE;
-      present = true;
-    } else {
-      XdrvMailbox.payload--;
-      present = ValidTemplateModule(XdrvMailbox.payload);
-    }
-    if (present) {
-      Settings.last_module = Settings.module;
-      Settings.module = XdrvMailbox.payload;
-      SetModuleType();
-      if (Settings.last_module != XdrvMailbox.payload) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          Settings.my_gp.io[i] = GPIO_NONE;
-        }
-      }
-      restart_flag = 2;
-    }
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, ModuleNr(), ModuleName().c_str());
-}
-
-void CmndModules(void)
-{
-  uint32_t midx = USER_MODULE;
-  uint32_t lines = 1;
-  bool jsflg = false;
-  for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
-    if (i > 0) { midx = pgm_read_byte(kModuleNiceList + i -1); }
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_MODULES "%d\":{"), lines);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    uint32_t j = i ? midx +1 : 0;
-    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), j, AnyModuleName(midx).c_str()) > (LOGSZ - TOPSZ)) || (i == sizeof(kModuleNiceList))) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
-      jsflg = false;
-      lines++;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-void CmndGpio(void)
-{
-  if (XdrvMailbox.index < sizeof(Settings.my_gp)) {
-    myio cmodule;
-    ModuleGpios(&cmodule);
-    if (ValidGPIO(XdrvMailbox.index, cmodule.io[XdrvMailbox.index]) && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < GPIO_SENSOR_END)) {
-      bool present = false;
-      for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-        uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-        if (midx == XdrvMailbox.payload) { present = true; }
-      }
-      if (present) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          if (ValidGPIO(i, cmodule.io[i]) && (Settings.my_gp.io[i] == XdrvMailbox.payload)) {
-            Settings.my_gp.io[i] = GPIO_NONE;
-          }
-        }
-        Settings.my_gp.io[XdrvMailbox.index] = XdrvMailbox.payload;
-        restart_flag = 2;
-      }
-    }
-    Response_P(PSTR("{"));
-    bool jsflg = false;
-    for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-      if (ValidGPIO(i, cmodule.io[i]) || ((GPIO_USER == XdrvMailbox.payload) && !FlashPin(i))) {
-        if (jsflg) { ResponseAppend_P(PSTR(",")); }
-        jsflg = true;
-        uint8_t sensor_type = Settings.my_gp.io[i];
-        if (!ValidGPIO(i, cmodule.io[i])) {
-          sensor_type = cmodule.io[i];
-          if (GPIO_USER == sensor_type) {
-            sensor_type = GPIO_NONE;
-          }
-        }
-        uint8_t sensor_name_idx = sensor_type;
-        const char *sensor_names = kSensorNames;
-        if (sensor_type > GPIO_FIX_START) {
-          sensor_name_idx = sensor_type - GPIO_FIX_START -1;
-          sensor_names = kSensorNamesFixed;
-        }
-        char stemp1[TOPSZ];
-        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s\"}"),
-          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names));
-      }
-    }
-    if (jsflg) {
-      ResponseJsonEnd();
-    } else {
-      ResponseCmndChar(D_JSON_NOT_SUPPORTED);
-    }
-  }
-}
-
-void CmndGpios(void)
-{
-  myio cmodule;
-  ModuleGpios(&cmodule);
-  uint32_t lines = 1;
-  bool jsflg = false;
-  for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-    uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-    if ((XdrvMailbox.payload != 255) && GetUsedInModule(midx, cmodule.io)) { continue; }
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_GPIOS "%d\":{"), lines);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    char stemp1[TOPSZ];
-    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), midx, GetTextIndexed(stemp1, sizeof(stemp1), midx, kSensorNames)) > (LOGSZ - TOPSZ)) || (i == sizeof(kGpioNiceList) -1)) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
-      jsflg = false;
-      lines++;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-void CmndTemplate(void)
-{
-
-  bool error = false;
-
-  if (strstr(XdrvMailbox.data, "{") == nullptr) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= MAXMODULE)) {
-      XdrvMailbox.payload--;
-      if (ValidTemplateModule(XdrvMailbox.payload)) {
-        ModuleDefault(XdrvMailbox.payload);
-        if (USER_MODULE == Settings.module) { restart_flag = 2; }
-      }
-    }
-    else if (0 == XdrvMailbox.payload) {
-      if (Settings.module != USER_MODULE) {
-        ModuleDefault(Settings.module);
-      }
-    }
-    else if (255 == XdrvMailbox.payload) {
-      if (Settings.module != USER_MODULE) {
-        ModuleDefault(Settings.module);
-      }
-      snprintf_P(Settings.user_template.name, sizeof(Settings.user_template.name), PSTR("Merged"));
-      uint32_t j = 0;
-      for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-        if (6 == i) { j = 9; }
-        if (8 == i) { j = 12; }
-        if (my_module.io[j] > GPIO_NONE) {
-          Settings.user_template.gp.io[i] = my_module.io[j];
-        }
-        j++;
-      }
-    }
-  }
-  else {
-    if (JsonTemplate(XdrvMailbox.data)) {
-      if (USER_MODULE == Settings.module) { restart_flag = 2; }
-    } else {
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      error = true;
-    }
-  }
-  if (!error) { TemplateJson(); }
-}
-
-void CmndPwm(void)
-{
-  if (pwm_present && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PWMS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= Settings.pwm_range) && (pin[GPIO_PWM1 + XdrvMailbox.index -1] < 99)) {
-      Settings.pwm_value[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      analogWrite(pin[GPIO_PWM1 + XdrvMailbox.index -1], bitRead(pwm_inverted, XdrvMailbox.index -1) ? Settings.pwm_range - XdrvMailbox.payload : XdrvMailbox.payload);
-    }
-    Response_P(PSTR("{"));
-    MqttShowPWMState();
-    ResponseJsonEnd();
-  }
-}
-
-void CmndPwmfrequency(void)
-{
-  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload >= PWM_MIN) && (XdrvMailbox.payload <= PWM_MAX))) {
-    Settings.pwm_frequency = (1 == XdrvMailbox.payload) ? PWM_FREQ : XdrvMailbox.payload;
-    analogWriteFreq(Settings.pwm_frequency);
-  }
-  ResponseCmndNumber(Settings.pwm_frequency);
-}
-
-void CmndPwmrange(void)
-{
-  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload > 254) && (XdrvMailbox.payload < 1024))) {
-    Settings.pwm_range = (1 == XdrvMailbox.payload) ? PWM_RANGE : XdrvMailbox.payload;
-    for (uint32_t i = 0; i < MAX_PWMS; i++) {
-      if (Settings.pwm_value[i] > Settings.pwm_range) {
-        Settings.pwm_value[i] = Settings.pwm_range;
-      }
-    }
-    analogWriteRange(Settings.pwm_range);
-  }
-  ResponseCmndNumber(Settings.pwm_range);
-}
-
-void CmndButtonDebounce(void)
-{
-  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
-    Settings.button_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.button_debounce);
-}
-
-void CmndSwitchDebounce(void)
-{
-  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
-    Settings.switch_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.switch_debounce);
-}
-
-void CmndBaudrate(void)
-{
-  if (XdrvMailbox.payload >= 300) {
-    XdrvMailbox.payload /= 300;
-    uint32_t baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
-    SetSerialBaudrate(baudrate);
-  }
-  ResponseCmndNumber(Settings.baudrate * 300);
-}
-
-void CmndSerialConfig(void)
-{
-
-
-
-
-  if (XdrvMailbox.data_len > 0) {
-    if (XdrvMailbox.data_len < 3) {
-      if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2)) {
-        SetSerialConfig(XdrvMailbox.payload);
-      }
-    }
-    else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8)) {
-      uint8_t serial_config = XdrvMailbox.payload -5;
-
-      bool valid = true;
-      char parity = (XdrvMailbox.data[1] & 0xdf);
-      if ('E' == parity) {
-        serial_config += 0x08;
-      }
-      else if ('O' == parity) {
-        serial_config += 0x10;
-      }
-      else if ('N' != parity) {
-        valid = false;
-      }
-
-      if ('2' == XdrvMailbox.data[2]) {
-        serial_config += 0x04;
-      }
-      else if ('1' != XdrvMailbox.data[2]) {
-        valid = false;
-      }
-
-      if (valid) {
-        SetSerialConfig(serial_config);
-      }
-    }
-  }
-  ResponseCmndChar(GetSerialConfig().c_str());
-}
-
-void CmndSerialSend(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
-    SetSeriallog(LOG_LEVEL_NONE);
-    Settings.flag.mqtt_serial = 1;
-    Settings.flag.mqtt_serial_raw = (XdrvMailbox.index > 3) ? 1 : 0;
-    if (XdrvMailbox.data_len > 0) {
-      if (1 == XdrvMailbox.index) {
-        Serial.printf("%s\n", XdrvMailbox.data);
-      }
-      else if (2 == XdrvMailbox.index || 4 == XdrvMailbox.index) {
-        for (uint32_t i = 0; i < XdrvMailbox.data_len; i++) {
-          Serial.write(XdrvMailbox.data[i]);
-        }
-      }
-      else if (3 == XdrvMailbox.index) {
-        uint32_t dat_len = XdrvMailbox.data_len;
-        Serial.printf("%s", Unescape(XdrvMailbox.data, &dat_len));
-      }
-      else if (5 == XdrvMailbox.index) {
-        SerialSendRaw(RemoveSpace(XdrvMailbox.data));
-      }
-      ResponseCmndDone();
-    }
-  }
-}
-
-void CmndSerialDelimiter(void)
-{
-  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload < 256)) {
-    if (XdrvMailbox.payload > 0) {
-      Settings.serial_delimiter = XdrvMailbox.payload;
-    } else {
-      uint32_t dat_len = XdrvMailbox.data_len;
-      Unescape(XdrvMailbox.data, &dat_len);
-      Settings.serial_delimiter = XdrvMailbox.data[0];
-    }
-  }
-  ResponseCmndNumber(Settings.serial_delimiter);
-}
-
-void CmndSyslog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    SetSyslog(XdrvMailbox.payload);
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.syslog_level, syslog_level);
-}
-
-void CmndLoghost(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_SYSLOG_HOST, (SC_DEFAULT == Shortcut()) ? SYS_LOG_HOST : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_SYSLOG_HOST));
-}
-
-void CmndLogport(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.syslog_port = (1 == XdrvMailbox.payload) ? SYS_LOG_PORT : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.syslog_port);
-}
-
-void CmndIpAddress(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    uint32_t address;
-    if (ParseIp(&address, XdrvMailbox.data)) {
-      Settings.ip_address[XdrvMailbox.index -1] = address;
-
-    }
-    char stemp1[TOPSZ];
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(" (%s)"), WiFi.localIP().toString().c_str());
-    Response_P(S_JSON_COMMAND_INDEX_SVALUE_SVALUE, XdrvMailbox.command, XdrvMailbox.index, IPAddress(Settings.ip_address[XdrvMailbox.index -1]).toString().c_str(), (1 == XdrvMailbox.index) ? stemp1:"");
-  }
-}
-
-void CmndNtpServer(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_NTP_SERVERS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_NTPSERVER1, MAX_NTP_SERVERS);
-    } else {
-      uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(ntp_server,
-          (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
-        SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
-
-        ntp_force_sync = true;
-      }
-      ResponseCmndIdxChar(SettingsText(ntp_server));
-    }
-  }
-}
-
-void CmndAp(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    switch (XdrvMailbox.payload) {
-    case 0:
-      Settings.sta_active ^= 1;
-      break;
-    case 1:
-    case 2:
-      Settings.sta_active = XdrvMailbox.payload -1;
-    }
-    restart_flag = 2;
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active));
-}
-
-void CmndSsid(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SSIDS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_STASSID1, MAX_SSIDS);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
-                (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
-        Settings.sta_active = XdrvMailbox.index -1;
-        restart_flag = 2;
-      }
-      ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndPassword(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    if ((XdrvMailbox.data_len > 4) || (SC_CLEAR == Shortcut()) || (SC_DEFAULT == Shortcut())) {
-      SettingsUpdateText(SET_STAPWD1 + XdrvMailbox.index -1,
-              (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_PASS1 : STA_PASS2 : XdrvMailbox.data);
-      Settings.sta_active = XdrvMailbox.index -1;
-      restart_flag = 2;
-      ResponseCmndIdxChar(SettingsText(SET_STAPWD1 + XdrvMailbox.index -1));
-    } else {
-      Response_P(S_JSON_COMMAND_INDEX_ASTERISK, XdrvMailbox.command, XdrvMailbox.index);
-    }
-  }
-}
-
-void CmndHostname(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    SettingsUpdateText(SET_HOSTNAME, (SC_DEFAULT == Shortcut()) ? WIFI_HOSTNAME : XdrvMailbox.data);
-    if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-      SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-    }
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_HOSTNAME));
-}
-
-void CmndWifiConfig(void)
-{
-  if ((XdrvMailbox.payload >= WIFI_RESTART) && (XdrvMailbox.payload < MAX_WIFI_OPTION)) {
-    if ((EX_WIFI_SMARTCONFIG == XdrvMailbox.payload) || (EX_WIFI_WPSCONFIG == XdrvMailbox.payload)) {
-      XdrvMailbox.payload = WIFI_MANAGER;
-    }
-    Settings.sta_config = XdrvMailbox.payload;
-    wifi_state_flag = Settings.sta_config;
-    if (WifiState() > WIFI_RESTART) {
-      restart_flag = 2;
-    }
-  }
-  char stemp1[TOPSZ];
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_config, GetTextIndexed(stemp1, sizeof(stemp1), Settings.sta_config, kWifiConfig));
-}
-
-void CmndFriendlyname(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_FRIENDLYNAMES)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_FRIENDLYNAME1, MAX_FRIENDLYNAMES);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        char stemp1[TOPSZ];
-        if (1 == XdrvMailbox.index) {
-          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
-        } else {
-          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
-        }
-        SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndSwitchMode(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SWITCHES)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_SWITCH_OPTION)) {
-      Settings.switchmode[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.switchmode[XdrvMailbox.index-1]);
-  }
-}
-
-void CmndInterlock(void)
-{
-
-  uint32_t max_relays = devices_present;
-  if (light_type) { max_relays--; }
-  if (max_relays > sizeof(Settings.interlock[0]) * 8) { max_relays = sizeof(Settings.interlock[0]) * 8; }
-  if (max_relays > 1) {
-    if (XdrvMailbox.data_len > 0) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
-        char *group;
-        char *q;
-        uint32_t group_index = 0;
-        power_t relay_mask = 0;
-        for (group = strtok_r(XdrvMailbox.data, " ", &q); group && group_index < MAX_INTERLOCKS; group = strtok_r(nullptr, " ", &q)) {
-          char *str;
-          char *p;
-          for (str = strtok_r(group, ",", &p); str; str = strtok_r(nullptr, ",", &p)) {
-            int pbit = atoi(str);
-            if ((pbit > 0) && (pbit <= max_relays)) {
-              pbit--;
-              if (!bitRead(relay_mask, pbit)) {
-                bitSet(relay_mask, pbit);
-                bitSet(Settings.interlock[group_index], pbit);
-              }
-            }
-          }
-          group_index++;
-        }
-        for (uint32_t i = 0; i < group_index; i++) {
-          uint32_t minimal_bits = 0;
-          for (uint32_t j = 0; j < max_relays; j++) {
-            if (bitRead(Settings.interlock[i], j)) { minimal_bits++; }
-          }
-          if (minimal_bits < 2) { Settings.interlock[i] = 0; }
-        }
-      } else {
-        Settings.flag.interlock = XdrvMailbox.payload &1;
-        if (Settings.flag.interlock) {
-          SetDevicePower(power, SRC_IGNORE);
-        }
-      }
-#ifdef USE_SHUTTER
-      if (Settings.flag3.shutter_mode) {
-        ShutterInit();
-      }
-#endif
-    }
-    Response_P(PSTR("{\"" D_CMND_INTERLOCK "\":\"%s\",\"" D_JSON_GROUPS "\":\""), GetStateText(Settings.flag.interlock));
-    uint32_t anygroup = 0;
-    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-      if (Settings.interlock[i]) {
-        anygroup++;
-        ResponseAppend_P(PSTR("%s"), (anygroup > 1) ? " " : "");
-        uint32_t anybit = 0;
-        power_t mask = 1;
-        for (uint32_t j = 0; j < max_relays; j++) {
-          if (Settings.interlock[i] & mask) {
-            anybit++;
-            ResponseAppend_P(PSTR("%s%d"), (anybit > 1) ? "," : "", j +1);
-          }
-          mask <<= 1;
-        }
-      }
-    }
-    if (!anygroup) {
-      for (uint32_t j = 1; j <= max_relays; j++) {
-        ResponseAppend_P(PSTR("%s%d"), (j > 1) ? "," : "", j);
-      }
-    }
-    ResponseAppend_P(PSTR("\"}"));
-  } else {
-    Settings.flag.interlock = 0;
-    ResponseCmndStateText(Settings.flag.interlock);
-  }
-}
-
-void CmndTeleperiod(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.tele_period = (1 == XdrvMailbox.payload) ? TELE_PERIOD : XdrvMailbox.payload;
-    if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) Settings.tele_period = 10;
-    tele_period = Settings.tele_period;
-  }
-  ResponseCmndNumber(Settings.tele_period);
-}
-
-void CmndReset(void)
-{
-  switch (XdrvMailbox.payload) {
-  case 1:
-    restart_flag = 211;
-    ResponseCmndChar(D_JSON_RESET_AND_RESTARTING);
-    break;
-  case 2 ... 6:
-    restart_flag = 210 + XdrvMailbox.payload;
-    Response_P(PSTR("{\"" D_CMND_RESET "\":\"" D_JSON_ERASE ", " D_JSON_RESET_AND_RESTARTING "\"}"));
-    break;
-  case 99:
-    Settings.bootcount = 0;
-    Settings.bootcount_reset_time = 0;
-    ResponseCmndDone();
-    break;
-  default:
-    ResponseCmndChar(D_JSON_ONE_TO_RESET);
-  }
-}
-
-void CmndTime(void)
-{
-
-
-
-
-
-
-
-  uint32_t format = Settings.flag2.time_format;
-  if (XdrvMailbox.data_len > 0) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
-      Settings.flag2.time_format = XdrvMailbox.payload -1;
-      format = Settings.flag2.time_format;
-    } else {
-      format = 1;
-      RtcSetTime(XdrvMailbox.payload);
-    }
-  }
-  mqtt_data[0] = '\0';
-  ResponseAppendTimeFormat(format);
-  ResponseJsonEnd();
-}
-
-void CmndTimezone(void)
-{
-  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload >= -13)) {
-    Settings.timezone = XdrvMailbox.payload;
-    Settings.timezone_minutes = 0;
-    if (XdrvMailbox.payload < 15) {
-      char *p = strtok (XdrvMailbox.data, ":");
-      if (p) {
-        p = strtok (nullptr, ":");
-        if (p) {
-          Settings.timezone_minutes = strtol(p, nullptr, 10);
-          if (Settings.timezone_minutes > 59) { Settings.timezone_minutes = 59; }
-        }
-      }
-    } else {
-      Settings.timezone = 99;
-    }
-    ntp_force_sync = true;
-  }
-  if (99 == Settings.timezone) {
-    ResponseCmndNumber(Settings.timezone);
-  } else {
-    char stemp1[TOPSZ];
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("%+03d:%02d"), Settings.timezone, Settings.timezone_minutes);
-    ResponseCmndChar(stemp1);
-  }
-}
-
-void CmndTimeStdDst(uint32_t ts)
-{
-
-  if (XdrvMailbox.data_len > 0) {
-    if (strstr(XdrvMailbox.data, ",") != nullptr) {
-      uint32_t tpos = 0;
-      int value = 0;
-      char *p = XdrvMailbox.data;
-      char *q = p;
-      while (p && (tpos < 7)) {
-        if (p > q) {
-          if (1 == tpos) { Settings.tflag[ts].hemis = value &1; }
-          if (2 == tpos) { Settings.tflag[ts].week = (value < 0) ? 0 : (value > 4) ? 4 : value; }
-          if (3 == tpos) { Settings.tflag[ts].month = (value < 1) ? 1 : (value > 12) ? 12 : value; }
-          if (4 == tpos) { Settings.tflag[ts].dow = (value < 1) ? 1 : (value > 7) ? 7 : value; }
-          if (5 == tpos) { Settings.tflag[ts].hour = (value < 0) ? 0 : (value > 23) ? 23 : value; }
-          if (6 == tpos) { Settings.toffset[ts] = (value < -900) ? -900 : (value > 900) ? 900 : value; }
-        }
-        p = Trim(p);
-        if (tpos && (*p == ',')) { p++; }
-        p = Trim(p);
-        q = p;
-        value = strtol(p, &p, 10);
-        tpos++;
-      }
-      ntp_force_sync = true;
-    } else {
-      if (0 == XdrvMailbox.payload) {
-        if (0 == ts) {
-          SettingsResetStd();
-        } else {
-          SettingsResetDst();
-        }
-      }
-      ntp_force_sync = true;
-    }
-  }
-  Response_P(PSTR("{\"%s\":{\"Hemisphere\":%d,\"Week\":%d,\"Month\":%d,\"Day\":%d,\"Hour\":%d,\"Offset\":%d}}"),
-    XdrvMailbox.command, Settings.tflag[ts].hemis, Settings.tflag[ts].week, Settings.tflag[ts].month, Settings.tflag[ts].dow, Settings.tflag[ts].hour, Settings.toffset[ts]);
-}
-
-void CmndTimeStd(void)
-{
-  CmndTimeStdDst(0);
-}
-
-void CmndTimeDst(void)
-{
-  CmndTimeStdDst(1);
-}
-
-void CmndAltitude(void)
-{
-  if ((XdrvMailbox.data_len > 0) && ((XdrvMailbox.payload >= -30000) && (XdrvMailbox.payload <= 30000))) {
-    Settings.altitude = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.altitude);
-}
-
-void CmndLedPower(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_LEDS)) {
-    if (99 == pin[GPIO_LEDLNK]) { XdrvMailbox.index = 1; }
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-      Settings.ledstate &= 8;
-      uint32_t mask = 1 << (XdrvMailbox.index -1);
-      switch (XdrvMailbox.payload) {
-      case 0:
-        led_power &= (0xFF ^ mask);
-        Settings.ledstate = 0;
-        break;
-      case 1:
-        led_power |= mask;
-        Settings.ledstate = 8;
-        break;
-      case 2:
-        led_power ^= mask;
-        Settings.ledstate ^= 8;
-        break;
-      }
-      blinks = 0;
-      if (99 == pin[GPIO_LEDLNK]) {
-        SetLedPower(Settings.ledstate &8);
-      } else {
-        SetLedPowerIdx(XdrvMailbox.index -1, (led_power & mask));
-      }
-    }
-    bool state = bitRead(led_power, XdrvMailbox.index -1);
-    if (99 == pin[GPIO_LEDLNK]) {
-      state = bitRead(Settings.ledstate, 3);
-    }
-    ResponseCmndIdxChar(GetStateText(state));
-  }
-}
-
-void CmndLedState(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_LED_OPTION)) {
-    Settings.ledstate = XdrvMailbox.payload;
-    if (!Settings.ledstate) {
-      SetLedPowerAll(0);
-      SetLedLink(0);
-    }
-  }
-  ResponseCmndNumber(Settings.ledstate);
-}
-
-void CmndLedMask(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Settings.ledmask = XdrvMailbox.payload;
-  }
-  char stemp1[TOPSZ];
-  snprintf_P(stemp1, sizeof(stemp1), PSTR("%d (0x%04X)"), Settings.ledmask, Settings.ledmask);
-  ResponseCmndChar(stemp1);
-}
-
-void CmndWifiPower(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Settings.wifi_output_power = (uint8_t)(CharToFloat(XdrvMailbox.data) * 10);
-    if (Settings.wifi_output_power > 205) {
-      Settings.wifi_output_power = 205;
-    }
-    WifiSetOutputPower();
-  }
-  ResponseCmndChar(WifiGetOutputPower().c_str());
-}
-
-#ifdef USE_I2C
-void CmndI2cScan(void)
-{
-  if (i2c_flg) {
-    I2cScan(mqtt_data, sizeof(mqtt_data));
-  }
-}
-
-void CmndI2cDriver(void)
-{
-  if (XdrvMailbox.index < MAX_I2C_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.i2c_drivers[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-      restart_flag = 2;
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_I2CDRIVER "\":"));
-  I2cDriverState();
-  ResponseJsonEnd();
-}
-#endif
-
-void CmndSensor(void)
-{
-  XsnsCall(FUNC_COMMAND_SENSOR);
-}
-
-void CmndDriver(void)
-{
-  XdrvCall(FUNC_COMMAND_DRIVER);
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_crash_recorder.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_crash_recorder.ino"
-const uint32_t crash_magic = 0x53415400;
-const uint32_t crash_rtc_offset = 32;
-const uint32_t crash_dump_max_len = 31;
-
-
-
-
-
-
-extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack, uint32_t stack_end )
-{
-  uint32_t addr_written = 0;
-  uint32_t value;
-
-  for (uint32_t i = stack; i < stack_end; i += 4) {
-    value = *((uint32_t*) i);
-    if ((value >= 0x40000000) && (value < 0x40300000)) {
-      ESP.rtcUserMemoryWrite(crash_rtc_offset + addr_written, (uint32_t*)&value, sizeof(value));
-      addr_written++;
-      if (addr_written >= crash_dump_max_len) { break; }
-    }
-  }
-  value = crash_magic + addr_written;
-  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-}
-
-
-void CmndCrash(void)
-{
-  volatile uint32_t dummy;
-  dummy = *((uint32_t*) 0x00000000);
-}
-
-
-void CmndWDT(void)
-{
-  volatile uint32_t dummy = 0;
-  while (1) {
-    dummy++;
-  }
-}
-
-
-void CmndBlockedLoop(void)
-{
-  while (1) {
-    delay(1000);
-  }
-}
-
-
-void CrashDumpClear(void)
-{
-  uint32_t value = 0;
-  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-}
-
-
-
-
-
-bool CrashFlag(void)
-{
-  return ((ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST) || oswatch_blocked_loop);
-}
-
-void CrashDump(void)
-{
-  ResponseAppend_P(PSTR("{\"Exception\":%d,\"Reason\":\"%s\",\"EPC\":[\"%08x\",\"%08x\",\"%08x\"],\"EXCVADDR\":\"%08x\",\"DEPC\":\"%08x\""),
-    resetInfo.exccause,
-    GetResetReason().c_str(),
-    resetInfo.epc1,
-    resetInfo.epc2,
-    resetInfo.epc3,
-    resetInfo.excvaddr,
-    resetInfo.depc);
-
-  uint32_t value;
-  ESP.rtcUserMemoryRead(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-  if (crash_magic == (value & 0xFFFFFF00)) {
-    ResponseAppend_P(PSTR(",\"CallChain\":["));
-    uint32_t count = value & 0x3F;
-    for (uint32_t i = 0; i < count; i++) {
-      ESP.rtcUserMemoryRead(crash_rtc_offset +i, (uint32_t*)&value, sizeof(value));
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"%08x\""), value);
-    }
-    ResponseAppend_P(PSTR("]"));
-  }
-
-  ResponseJsonEnd();
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_esptool.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_esptool.ino"
-#define USE_ESPTOOL 
-#ifdef USE_ESPTOOL
-
-
-
-
-
-
-
-#define READ_REG(REG) (*((volatile uint32_t *)(REG)))
-#define WRITE_REG(REG,VAL) *((volatile uint32_t *)(REG)) = (VAL)
-#define REG_SET_MASK(reg,mask) WRITE_REG((reg), (READ_REG(reg)|(mask)))
-
-#define SPI_BASE_REG 0x60000200
-
-#define SPI_CMD_REG (SPI_BASE_REG + 0x00)
-#define SPI_FLASH_RDSR (1<<27)
-#define SPI_FLASH_SE (1<<24)
-#define SPI_FLASH_BE (1<<23)
-#define SPI_FLASH_WREN (1<<30)
-
-#define SPI_ADDR_REG (SPI_BASE_REG + 0x04)
-#define SPI_CTRL_REG (SPI_BASE_REG + 0x08)
-#define SPI_RD_STATUS_REG (SPI_BASE_REG + 0x10)
-#define SPI_W0_REG (SPI_BASE_REG + 0x40)
-#define SPI_EXT2_REG (SPI_BASE_REG + 0xF8)
-
-#define SPI_ST 0x7
-
-
-#define SECTORS_PER_BLOCK (FLASH_BLOCK_SIZE / SPI_FLASH_SEC_SIZE)
-
-
-static const uint32_t STATUS_WIP_BIT = (1 << 0);
-
-
-inline static void spi_wait_ready(void)
-{
-  while((READ_REG(SPI_EXT2_REG) & SPI_ST)) { }
-}
-
-
-
-static bool spiflash_is_ready(void)
-{
-  spi_wait_ready();
-  WRITE_REG(SPI_RD_STATUS_REG, 0);
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_RDSR);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-  uint32_t status_value = READ_REG(SPI_RD_STATUS_REG);
-  return (status_value & STATUS_WIP_BIT) == 0;
-}
-
-static void spi_write_enable(void)
-{
-  while(!spiflash_is_ready()) { }
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_WREN);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-}
-
-bool EsptoolEraseSector(uint32_t sector)
-{
-  spi_write_enable();
-  spi_wait_ready();
-
-  WRITE_REG(SPI_ADDR_REG, (sector * SPI_FLASH_SEC_SIZE) & 0xffffff);
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_SE);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-  while(!spiflash_is_ready()) { }
-
-  return true;
-}
-
-void EsptoolErase(uint32_t start_sector, uint32_t end_sector)
-{
-  int next_erase_sector = start_sector;
-  int remaining_erase_sector = end_sector - start_sector;
-
-  while (remaining_erase_sector > 0) {
-    spi_write_enable();
-
-    uint32_t command = SPI_FLASH_SE;
-    uint32_t sectors_to_erase = 1;
-    if (remaining_erase_sector >= SECTORS_PER_BLOCK &&
-        next_erase_sector % SECTORS_PER_BLOCK == 0) {
-      command = SPI_FLASH_BE;
-      sectors_to_erase = SECTORS_PER_BLOCK;
-    }
-    uint32_t addr = next_erase_sector * SPI_FLASH_SEC_SIZE;
-
-    spi_wait_ready();
-    WRITE_REG(SPI_ADDR_REG, addr & 0xffffff);
-    WRITE_REG(SPI_CMD_REG, command);
-    while(READ_REG(SPI_CMD_REG) != 0) { }
-    remaining_erase_sector -= sectors_to_erase;
-    next_erase_sector += sectors_to_erase;
-
-    while (!spiflash_is_ready()) { }
-    yield();
-    OsWatchLoop();
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
-# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
-void GetFeatures(void)
-{
-  feature_drv1 = 0x00000000;
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  feature_drv1 |= 0x00000001;
-#endif
-#ifdef USE_LIGHT
-  feature_drv1 |= 0x00000002;
-#endif
-#ifdef USE_I2C
-  feature_drv1 |= 0x00000004;
-#endif
-#ifdef USE_SPI
-  feature_drv1 |= 0x00000008;
-#endif
-#ifdef USE_DISCOVERY
-  feature_drv1 |= 0x00000010;
-#endif
-#ifdef USE_ARDUINO_OTA
-  feature_drv1 |= 0x00000020;
-#endif
-#ifdef USE_MQTT_TLS
-  feature_drv1 |= 0x00000040;
-#endif
-#ifdef USE_WEBSERVER
-  feature_drv1 |= 0x00000080;
-#endif
-#ifdef WEBSERVER_ADVERTISE
-  feature_drv1 |= 0x00000100;
-#endif
-#ifdef USE_EMULATION_HUE
-  feature_drv1 |= 0x00000200;
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
-  feature_drv1 |= 0x00000400;
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
-
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)
-
-#endif
-#ifdef MQTT_HOST_DISCOVERY
-  feature_drv1 |= 0x00002000;
-#endif
-#ifdef USE_ARILUX_RF
-  feature_drv1 |= 0x00004000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_WS2812)
-  feature_drv1 |= 0x00008000;
-#endif
-#ifdef USE_WS2812_DMA
-  feature_drv1 |= 0x00010000;
-#endif
-#if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL)
-  feature_drv1 |= 0x00020000;
-#endif
-#ifdef USE_IR_HVAC
-  feature_drv1 |= 0x00040000;
-#endif
-#ifdef USE_IR_RECEIVE
-  feature_drv1 |= 0x00080000;
-#endif
-#ifdef USE_DOMOTICZ
-  feature_drv1 |= 0x00100000;
-#endif
-#ifdef USE_DISPLAY
-  feature_drv1 |= 0x00200000;
-#endif
-#ifdef USE_HOME_ASSISTANT
-  feature_drv1 |= 0x00400000;
-#endif
-#ifdef USE_SERIAL_BRIDGE
-  feature_drv1 |= 0x00800000;
-#endif
-#ifdef USE_TIMERS
-  feature_drv1 |= 0x01000000;
-#endif
-#ifdef USE_SUNRISE
-  feature_drv1 |= 0x02000000;
-#endif
-#ifdef USE_TIMERS_WEB
-  feature_drv1 |= 0x04000000;
-#endif
-#ifdef USE_RULES
-  feature_drv1 |= 0x08000000;
-#endif
-#ifdef USE_KNX
-  feature_drv1 |= 0x10000000;
-#endif
-#ifdef USE_WPS
-  feature_drv1 |= 0x20000000;
-#endif
-#ifdef USE_SMARTCONFIG
-  feature_drv1 |= 0x40000000;
-#endif
-#ifdef USE_ENERGY_POWER_LIMIT
-  feature_drv1 |= 0x80000000;
-#endif
-
-
-
-  feature_drv2 = 0x00000000;
-
-#ifdef USE_CONFIG_OVERRIDE
-  feature_drv2 |= 0x00000001;
-#endif
-#ifdef FIRMWARE_MINIMAL
-  feature_drv2 |= 0x00000002;
-#endif
-#ifdef FIRMWARE_SENSORS
-  feature_drv2 |= 0x00000004;
-#endif
-#ifdef FIRMWARE_CLASSIC
-  feature_drv2 |= 0x00000008;
-#endif
-#ifdef FIRMWARE_KNX_NO_EMULATION
-  feature_drv2 |= 0x00000010;
-#endif
-#ifdef USE_DISPLAY_MODES1TO5
-  feature_drv2 |= 0x00000020;
-#endif
-#ifdef USE_DISPLAY_GRAPH
-  feature_drv2 |= 0x00000040;
-#endif
-#ifdef USE_DISPLAY_LCD
-  feature_drv2 |= 0x00000080;
-#endif
-#ifdef USE_DISPLAY_SSD1306
-  feature_drv2 |= 0x00000100;
-#endif
-#ifdef USE_DISPLAY_MATRIX
-  feature_drv2 |= 0x00000200;
-#endif
-#ifdef USE_DISPLAY_ILI9341
-  feature_drv2 |= 0x00000400;
-#endif
-#ifdef USE_DISPLAY_EPAPER_29
-  feature_drv2 |= 0x00000800;
-#endif
-#ifdef USE_DISPLAY_SH1106
-  feature_drv2 |= 0x00001000;
-#endif
-#ifdef USE_MP3_PLAYER
-  feature_drv2 |= 0x00002000;
-#endif
-#ifdef USE_PCA9685
-  feature_drv2 |= 0x00004000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_TUYA_MCU)
-  feature_drv2 |= 0x00008000;
-#endif
-#ifdef USE_RC_SWITCH
-  feature_drv2 |= 0x00010000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_ARMTRONIX_DIMMERS)
-  feature_drv2 |= 0x00020000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_SM16716)
-  feature_drv2 |= 0x00040000;
-#endif
-#ifdef USE_SCRIPT
-  feature_drv2 |= 0x00080000;
-#endif
-#ifdef USE_EMULATION_WEMO
-  feature_drv2 |= 0x00100000;
-#endif
-#ifdef USE_SONOFF_IFAN
-  feature_drv2 |= 0x00200000;
-#endif
-#ifdef USE_ZIGBEE
-  feature_drv2 |= 0x00400000;
-#endif
-#ifdef NO_EXTRA_4K_HEAP
-  feature_drv2 |= 0x00800000;
-#endif
-#ifdef VTABLES_IN_IRAM
-  feature_drv2 |= 0x01000000;
-#endif
-#ifdef VTABLES_IN_DRAM
-  feature_drv2 |= 0x02000000;
-#endif
-#ifdef VTABLES_IN_FLASH
-  feature_drv2 |= 0x04000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
-  feature_drv2 |= 0x08000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  feature_drv2 |= 0x10000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-  feature_drv2 |= 0x20000000;
-#endif
-#ifdef DEBUG_THEO
-  feature_drv2 |= 0x40000000;
-#endif
-#ifdef USE_DEBUG_DRIVER
-  feature_drv2 |= 0x80000000;
-#endif
-
-
-
-  feature_sns1 = 0x00000000;
-
-#ifdef USE_COUNTER
-  feature_sns1 |= 0x00000001;
-#endif
-#ifdef USE_ADC_VCC
-  feature_sns1 |= 0x00000002;
-#endif
-#ifdef USE_ENERGY_SENSOR
-  feature_sns1 |= 0x00000004;
-#endif
-#ifdef USE_PZEM004T
-  feature_sns1 |= 0x00000008;
-#endif
-#ifdef USE_DS18B20
-  feature_sns1 |= 0x00000010;
-#endif
-#ifdef USE_DS18x20_LEGACY
-  feature_sns1 |= 0x00000020;
-#endif
-#ifdef USE_DS18x20
-  feature_sns1 |= 0x00000040;
-#endif
-#ifdef USE_DHT
-  feature_sns1 |= 0x00000080;
-#endif
-#ifdef USE_SHT
-  feature_sns1 |= 0x00000100;
-#endif
-#ifdef USE_HTU
-  feature_sns1 |= 0x00000200;
-#endif
-#ifdef USE_BMP
-  feature_sns1 |= 0x00000400;
-#endif
-#ifdef USE_BME680
-  feature_sns1 |= 0x00000800;
-#endif
-#ifdef USE_BH1750
-  feature_sns1 |= 0x00001000;
-#endif
-#ifdef USE_VEML6070
-  feature_sns1 |= 0x00002000;
-#endif
-#ifdef USE_ADS1115_I2CDEV
-  feature_sns1 |= 0x00004000;
-#endif
-#ifdef USE_ADS1115
-  feature_sns1 |= 0x00008000;
-#endif
-#ifdef USE_INA219
-  feature_sns1 |= 0x00010000;
-#endif
-#ifdef USE_SHT3X
-  feature_sns1 |= 0x00020000;
-#endif
-#ifdef USE_MHZ19
-  feature_sns1 |= 0x00040000;
-#endif
-#ifdef USE_TSL2561
-  feature_sns1 |= 0x00080000;
-#endif
-#ifdef USE_SENSEAIR
-  feature_sns1 |= 0x00100000;
-#endif
-#ifdef USE_PMS5003
-  feature_sns1 |= 0x00200000;
-#endif
-#ifdef USE_MGS
-  feature_sns1 |= 0x00400000;
-#endif
-#ifdef USE_NOVA_SDS
-  feature_sns1 |= 0x00800000;
-#endif
-#ifdef USE_SGP30
-  feature_sns1 |= 0x01000000;
-#endif
-#ifdef USE_SR04
-  feature_sns1 |= 0x02000000;
-#endif
-#ifdef USE_SDM120
-  feature_sns1 |= 0x04000000;
-#endif
-#ifdef USE_SI1145
-  feature_sns1 |= 0x08000000;
-#endif
-#ifdef USE_SDM630
-  feature_sns1 |= 0x10000000;
-#endif
-#ifdef USE_LM75AD
-  feature_sns1 |= 0x20000000;
-#endif
-#ifdef USE_APDS9960
-  feature_sns1 |= 0x40000000;
-#endif
-#ifdef USE_TM1638
-  feature_sns1 |= 0x80000000;
-#endif
-
-
-
-  feature_sns2 = 0x00000000;
-
-#ifdef USE_MCP230xx
-  feature_sns2 |= 0x00000001;
-#endif
-#ifdef USE_MPR121
-  feature_sns2 |= 0x00000002;
-#endif
-#ifdef USE_CCS811
-  feature_sns2 |= 0x00000004;
-#endif
-#ifdef USE_MPU6050
-  feature_sns2 |= 0x00000008;
-#endif
-#ifdef USE_MCP230xx_OUTPUT
-  feature_sns2 |= 0x00000010;
-#endif
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-  feature_sns2 |= 0x00000020;
-#endif
-#ifdef USE_HLW8012
-  feature_sns2 |= 0x00000040;
-#endif
-#ifdef USE_CSE7766
-  feature_sns2 |= 0x00000080;
-#endif
-#ifdef USE_MCP39F501
-  feature_sns2 |= 0x00000100;
-#endif
-#ifdef USE_PZEM_AC
-  feature_sns2 |= 0x00000200;
-#endif
-#ifdef USE_DS3231
-  feature_sns2 |= 0x00000400;
-#endif
-#ifdef USE_HX711
-  feature_sns2 |= 0x00000800;
-#endif
-#ifdef USE_PZEM_DC
-  feature_sns2 |= 0x00001000;
-#endif
-#ifdef USE_TX20_WIND_SENSOR
-  feature_sns2 |= 0x00002000;
-#endif
-#ifdef USE_MGC3130
-  feature_sns2 |= 0x00004000;
-#endif
-#ifdef USE_RF_SENSOR
-  feature_sns2 |= 0x00008000;
-#endif
-#ifdef USE_THEO_V2
-  feature_sns2 |= 0x00010000;
-#endif
-#ifdef USE_ALECTO_V2
-  feature_sns2 |= 0x00020000;
-#endif
-#ifdef USE_AZ7798
-  feature_sns2 |= 0x00040000;
-#endif
-#ifdef USE_MAX31855
-  feature_sns2 |= 0x00080000;
-#endif
-#ifdef USE_PN532_HSU
-  feature_sns2 |= 0x00100000;
-#endif
-#ifdef USE_MAX44009
-  feature_sns2 |= 0x00200000;
-#endif
-#ifdef USE_SCD30
-  feature_sns2 |= 0x00400000;
-#endif
-#ifdef USE_HRE
-  feature_sns2 |= 0x00800000;
-#endif
-#ifdef USE_ADE7953
-  feature_sns2 |= 0x01000000;
-#endif
-#ifdef USE_SPS30
-  feature_sns2 |= 0x02000000;
-#endif
-#ifdef USE_VL53L0X
-  feature_sns2 |= 0x04000000;
-#endif
-#ifdef USE_MLX90614
-  feature_sns2 |= 0x08000000;
-#endif
-#ifdef USE_MAX31865
-  feature_sns2 |= 0x10000000;
-#endif
-#ifdef USE_CHIRP
-  feature_sns2 |= 0x20000000;
-#endif
-#ifdef USE_SOLAX_X1
-  feature_sns2 |= 0x40000000;
-#endif
-#ifdef USE_PAJ7620
-  feature_sns2 |= 0x80000000;
-#endif
-
-
-
-  feature5 = 0x00000000;
-
-#ifdef USE_BUZZER
-  feature5 |= 0x00000001;
-#endif
-#ifdef USE_RDM6300
-  feature5 |= 0x00000002;
-#endif
-#ifdef USE_IBEACON
-  feature5 |= 0x00000004;
-#endif
-#ifdef USE_SML_M
-  feature5 |= 0x00000008;
-#endif
-#ifdef USE_INA226
-  feature5 |= 0x00000010;
-#endif
-#ifdef USE_A4988_STEPPER
-  feature5 |= 0x00000020;
-#endif
-#ifdef USE_DDS2382
-  feature5 |= 0x00000040;
-#endif
-#ifdef USE_SM2135
-  feature5 |= 0x00000080;
-#endif
-#ifdef USE_SHUTTER
-  feature5 |= 0x00000100;
-#endif
-#ifdef USE_PCF8574
-  feature5 |= 0x00000200;
-#endif
-#ifdef USE_DDSU666
-  feature5 |= 0x00000400;
-#endif
-#ifdef USE_DEEPSLEEP
-  feature5 |= 0x00000800;
-#endif
-#ifdef USE_SONOFF_SC
-  feature5 |= 0x00001000;
-#endif
-#ifdef USE_SONOFF_RF
-  feature5 |= 0x00002000;
-#endif
-#ifdef USE_SONOFF_L1
-  feature5 |= 0x00004000;
-#endif
-#ifdef USE_EXS_DIMMER
-  feature5 |= 0x00008000;
-#endif
-#ifdef USE_ARDUINO_SLAVE
-  feature5 |= 0x00010000;
-#endif
-#ifdef USE_HIH6
-  feature5 |= 0x00020000;
-#endif
-#ifdef USE_HPMA
-  feature5 |= 0x00040000;
-#endif
-#ifdef USE_TSL2591
-  feature5 |= 0x00080000;
-#endif
-#ifdef USE_DHT12
-  feature5 |= 0x00100000;
-#endif
-#ifdef USE_DS1624
-  feature5 |= 0x00200000;
-#endif
-#ifdef USE_GPS
-  feature5 |= 0x00400000;
-#endif
-#ifdef USE_HOTPLUG
-  feature5 |= 0x00800000;
-#endif
-#ifdef USE_NRF24
-  feature5 |= 0x01000000;
-#endif
-#ifdef USE_MIBLE
-  feature5 |= 0x02000000;
-#endif
-#ifdef USE_HM10
-  feature5 |= 0x04000000;
-#endif
-#ifdef USE_LE01MR
-  feature5 |= 0x08000000;
-#endif
-#ifdef USE_AHT10
-  feature5 |= 0x10000000;
-#endif
-
-
-
-
-
-
-
-  feature6 = 0x00000000;
-# 568 "C:/shared/sonoff/Git/Tasmota/tasmota/support_features.ino"
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
-# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
-#ifdef USE_FLOG
-
-class FLOG
-
-#define MAGIC_WORD_FL 0x464c
-
-{
-
-struct header_t{
-    uint16_t magic_word;
-    uint16_t padding;
-    uint32_t physical_start_sector:10;
-    uint32_t number:10;
-    uint32_t buf_pointer:12;
-    };
-
-private:
-void _readSector(uint8_t one_sector);
-void _eraseSector(uint8_t one_sector);
-void _writeSector(uint8_t one_sector);
-void _clearBuffer(void);
-void _searchSaves(void);
-void _findFirstErasedSector(void);
-void _showBuffer(void);
-void _initBuffer(void);
-void _saveBufferToSector(void);
-header_t _saved_header;
-
-public:
-  uint32_t size;
-  uint32_t start;
-  uint32_t end;
-  uint16_t num_sectors;
-
-  uint16_t first_erased_sector;
-  uint16_t current_sector;
-
-  uint16_t bytes_left;
-  uint16_t sectors_left;
-
-  uint8_t mode = 0;
-  bool found_saved_data = false;
-  bool ready = false;
-  bool running_download = false;
-  bool recording = false;
-
-  union sector_t{
-  uint32_t dword_buffer[FLASH_SECTOR_SIZE/4];
-  uint8_t byte_buffer[FLASH_SECTOR_SIZE];
-  header_t header;
-  } sector;
-
-  void init(void);
-  void addToBuffer(uint8_t src[], uint32_t size);
-  void startRecording(bool append);
-  void stopRecording(void);
-
-  typedef void (*CallbackNoArgs) ();
-  typedef void (*CallbackWithArgs) (uint8_t *_record);
-
-  void startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter);
-};
-
-extern "C" uint32_t _SPIFFS_start;
-extern "C" uint32_t _FS_start;
-
-
-
-
-void FLOG::init(void)
-{
-DEBUG_SENSOR_LOG(PSTR("FLOG: init ..."));
-size = ESP.getSketchSize();
-
-start = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-end = (uint32_t)&_SPIFFS_start - 0x40200000;
-#else
-end = (uint32_t)&_FS_start - 0x40200000;
-#endif
-num_sectors = (end - start)/FLASH_SECTOR_SIZE;
-DEBUG_SENSOR_LOG(PSTR("FLOG: size: 0x%lx, start: 0x%lx, end: 0x%lx, num_sectors(dec): %lu"), size, start, end, num_sectors );
-_findFirstErasedSector();
-if(first_erased_sector == 0xffff){
-    _eraseSector(0);
-    first_erased_sector = 0;
-}
-_searchSaves();
-_initBuffer();
-ready = true;
-}
-# 142 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
-void FLOG::_readSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);
-  ESP.flashRead(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
-}
-
-
-
-
-
-void FLOG::_eraseSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);
-  ESP.flashEraseSector((start/FLASH_SECTOR_SIZE)+one_sector);
-}
-
-
-
-
-
-void FLOG::_writeSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);
-  ESP.flashWrite(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
-}
-
-
-
-
-void FLOG::_clearBuffer(){
-  for (uint32_t i = sizeof(sector.header)/4; i<(sizeof(sector.dword_buffer)/4); i++){
-      sector.dword_buffer[i] = 0;
-  }
-  sector.header.buf_pointer = sizeof(sector.header);
-
-}
-
-
-
-
-void FLOG::_saveBufferToSector(){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to current sector: %u" ),current_sector);
-  _writeSector(current_sector);
-  if(current_sector == num_sectors){
-    current_sector = 0;
-  }
-  else{
-    current_sector++;
-  }
-  _eraseSector(current_sector);
-  _clearBuffer();
-  sector.header.number++;
-  DEBUG_SENSOR_LOG(PSTR("FLOG: new sector header number: %u" ),sector.header.number);
-}
-
-
-
-
-
-void FLOG::_findFirstErasedSector(){
-  for (uint32_t i = 0; i<num_sectors; i++){
-    bool success = true;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: read sector: %u"), i);
-    _readSector(i);
-    for (uint32_t j = 0; j<(sizeof(sector.dword_buffer)/4); j++){
-      if(sector.dword_buffer[j]!=0xffffffff){
-
-        success = false;
-      }
-    }
-    if(success){
-      first_erased_sector = i;
-      sector.header.physical_start_sector = i;
-      current_sector = i;
-      DEBUG_SENSOR_LOG(PSTR("FLOG: first erased sector: %u, now init ..."), first_erased_sector);
-      return;
-    }
-  }
-  DEBUG_SENSOR_LOG(PSTR("FLOG: no erased sector found"));
-  first_erased_sector = 0xffff;
-}
-
-
-
-
-void FLOG::_searchSaves(void){
-
-  found_saved_data = false;
-  uint32_t s;
-  if(first_erased_sector==0){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: sector 0 was erased before, examine sector: %u"), num_sectors);
-    s = num_sectors;
-  }
-  else{
-    s = first_erased_sector-1;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: examine sector: %u"), s);
-  }
-  _readSector(s);
-  if(sector.header.magic_word!=MAGIC_WORD_FL){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
-    return;
-  }
-  sectors_left = sector.header.number + 1;
-  _saved_header = sector.header;
-  s = sector.header.physical_start_sector;
-  DEBUG_SENSOR_LOG(PSTR("FLOG: will check pysical start sector: %u"), s);
-  _readSector(s);
-  _showBuffer();
-  if(sector.header.magic_word!=MAGIC_WORD_FL){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
-    sectors_left = 0;
-    return;
-  }
-  if(sector.header.number==0){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: possible saved data found"));
-    found_saved_data = true;
-  }
-  else{
-    DEBUG_SENSOR_LOG(PSTR("FLOG: number: %u should be 0"), sector.header.number);
-    sectors_left = 0;
-  }
-}
-
-
-
-
-void FLOG::_initBuffer(void){
-  if(!found_saved_data){
-    sector.header.physical_start_sector = (uint16_t)first_erased_sector;
-  }
-  DEBUG_SENSOR_LOG(PSTR("FLOG: init header"));
-  sector.header.magic_word = MAGIC_WORD_FL;
-  sector.header.number = 0;
-  sector.header.buf_pointer = (uint16_t)sizeof(sector.header);
-  current_sector = first_erased_sector;
-  ready = true;
-  _clearBuffer();
-}
-
-
-
-
-void FLOG::_showBuffer(void){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: Header: %c %c"), sector.byte_buffer[0],sector.byte_buffer[1]);
-  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer);
-  uint32_t j = 0;
-  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){
-
-      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
-      j++;
-      if(j>3){
-        break;
-      }
-  }
-}
-
-
-
-
-
-
-
-void FLOG::addToBuffer(uint8_t src[], uint32_t size){
-    if(mode == 0){
-      if(sector.header.number == num_sectors && !ready){
-        return;
-      }
-    }
-  if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
-
-
-
-    memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
-    sector.header.buf_pointer+=size;
-
-  }
-  else{
-    DEBUG_SENSOR_LOG(PSTR("FLOG: save buffer to flash sector: %u"), current_sector);
-    DEBUG_SENSOR_LOG(PSTR("FLOG: current buf_pointer: %u"), sector.header.buf_pointer);
-    _saveBufferToSector();
-    sectors_left++;
-
-    if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
-      memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
-      sector.header.buf_pointer+=size;
-    }
-  }
-}
-
-
-
-
-
-
-void FLOG::startRecording(bool append){
-    if(recording){
-        DEBUG_SENSOR_LOG(PSTR("FLOG: already recording"));
-        return;
-    }
-    recording = true;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: start recording"));
-    _initBuffer();
-    if(!found_saved_data) {
-      append = false;
-    }
-    if(append){
-        sector.header.number = _saved_header.number+1;
-        sector.header.physical_start_sector = _saved_header.physical_start_sector;
-    }
-    else{
-        sector.header.physical_start_sector = (uint16_t)first_erased_sector;
-        found_saved_data = false;
-        sectors_left = 0;
-    }
-  }
-
-
-
-
-
-void FLOG::stopRecording(void){
-      _saveBufferToSector();
-      _findFirstErasedSector();
-      _searchSaves();
-      _initBuffer();
-      recording = false;
-      found_saved_data = true;
-  }
-# 381 "C:/shared/sonoff/Git/Tasmota/tasmota/support_flash_log.ino"
-  void FLOG::startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter){
-
-  _readSector(sector.header.physical_start_sector);
-  uint32_t next_sector = sector.header.physical_start_sector;
-  bytes_left = sector.header.buf_pointer - sizeof(sector.header);
-  DEBUG_SENSOR_LOG(PSTR("FLOG: create file for download, will process %u bytes"), bytes_left);
-  running_download = true;
-
-  sendHeader();
-
-  while(sectors_left){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: next sector: %u"), next_sector);
-
-    uint32_t k = sizeof(sector.header);
-    while(bytes_left){
-
-      uint8_t *_record_start = (uint8_t*)&sector.byte_buffer[k];
-
-      sendRecord(_record_start);
-      if(k%128 == 0){
-
-        OsWatchLoop();
-        delay(sleep);
-        }
-      k+=size;
-      if(bytes_left>7){
-        bytes_left-=size;
-      }
-      else{
-        bytes_left = 0;
-        DEBUG_SENSOR_LOG(PSTR("FLOG: Flog->bytes_left not dividable by 8 ??????"));
-        }
-      }
-    next_sector++;
-    if(next_sector>num_sectors){
-      next_sector = 0;
-    }
-    sectors_left--;
-    _readSector(next_sector);
-    bytes_left = sector.header.buf_pointer - sizeof(sector.header);
-    OsWatchLoop();
-    delay(sleep);
-  }
-  running_download = false;
-
-  sendFooter();
-
-  _searchSaves();
-  _initBuffer();
-  }
-
- #endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-# 23 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-float fmodf(float x, float y)
-{
-
-  union {float f; uint32_t i;} ux = {x}, uy = {y};
-  int ex = ux.i>>23 & 0xff;
-  int ey = uy.i>>23 & 0xff;
-  uint32_t sx = ux.i & 0x80000000;
-  uint32_t i;
-  uint32_t uxi = ux.i;
-
-  if (uy.i<<1 == 0 || isnan(y) || ex == 0xff)
-    return (x*y)/(x*y);
-  if (uxi<<1 <= uy.i<<1) {
-    if (uxi<<1 == uy.i<<1)
-      return 0*x;
-    return x;
-  }
-
-
-  if (!ex) {
-    for (i = uxi<<9; i>>31 == 0; ex--, i <<= 1);
-    uxi <<= -ex + 1;
-  } else {
-    uxi &= -1U >> 9;
-    uxi |= 1U << 23;
-  }
-  if (!ey) {
-    for (i = uy.i<<9; i>>31 == 0; ey--, i <<= 1);
-    uy.i <<= -ey + 1;
-  } else {
-    uy.i &= -1U >> 9;
-    uy.i |= 1U << 23;
-  }
-
-
-  for (; ex > ey; ex--) {
-    i = uxi - uy.i;
-    if (i >> 31 == 0) {
-      if (i == 0)
-        return 0*x;
-      uxi = i;
-    }
-    uxi <<= 1;
-  }
-  i = uxi - uy.i;
-  if (i >> 31 == 0) {
-    if (i == 0)
-      return 0*x;
-    uxi = i;
-  }
-  for (; uxi>>23 == 0; uxi <<= 1, ex--);
-
-
-  if (ex > 0) {
-    uxi -= 1U << 23;
-    uxi |= (uint32_t)ex << 23;
-  } else {
-    uxi >>= -ex + 1;
-  }
-  uxi |= sx;
-  ux.i = uxi;
-  return ux.f;
-}
-
-
-double FastPrecisePow(double a, double b)
-{
-
-
-  int e = abs((int)b);
-  union {
-    double d;
-    int x[2];
-  } u = { a };
-  u.x[1] = (int)((b - e) * (u.x[1] - 1072632447) + 1072632447);
-  u.x[0] = 0;
-
-
-  double r = 1.0;
-  while (e) {
-    if (e & 1) {
-      r *= a;
-    }
-    a *= a;
-    e >>= 1;
-  }
-  return r * u.d;
-}
-
-float FastPrecisePowf(const float x, const float y)
-{
-
-  return (float)FastPrecisePow(x, y);
-}
-
-double TaylorLog(double x)
-{
-
-
-  if (x <= 0.0) { return NAN; }
-  double z = (x + 1) / (x - 1);
-  double step = ((x - 1) * (x - 1)) / ((x + 1) * (x + 1));
-  double totalValue = 0;
-  double powe = 1;
-  for (uint32_t count = 0; count < 10; count++) {
-    z *= step;
-    double y = (1 / powe) * z;
-    totalValue = totalValue + y;
-    powe = powe + 2;
-  }
-  totalValue *= 2;
-# 144 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-  return totalValue;
-}
-# 154 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-inline float sinf(float x) { return sin_52(x); }
-inline float cosf(float x) { return cos_52(x); }
-inline float tanf(float x) { return tan_56(x); }
-inline float atanf(float x) { return atan_66(x); }
-inline float asinf(float x) { return asinf1(x); }
-inline float acosf(float x) { return acosf1(x); }
-inline float sqrtf(float x) { return sqrt1(x); }
-inline float powf(float x, float y) { return FastPrecisePow(x, y); }
-
-
-double const f_pi = 3.1415926535897932384626433;
-double const f_twopi = 2.0 * f_pi;
-double const f_two_over_pi = 2.0 / f_pi;
-double const f_halfpi = f_pi / 2.0;
-double const f_threehalfpi = 3.0 * f_pi / 2.0;
-double const f_four_over_pi = 4.0 / f_pi;
-double const f_qtrpi = f_pi / 4.0;
-double const f_sixthpi = f_pi / 6.0;
-double const f_tansixthpi = tan(f_sixthpi);
-double const f_twelfthpi = f_pi / 12.0;
-double const f_tantwelfthpi = tan(f_twelfthpi);
-float const f_180pi = 180 / f_pi;
-# 194 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-float cos_52s(float x)
-{
-  const float c1 = 0.9999932946;
-  const float c2 = -0.4999124376;
-  const float c3 = 0.0414877472;
-  const float c4 = -0.0012712095;
-
-  float x2 = x * x;
-  return (c1 + x2 * (c2 + x2 * (c3 + c4 * x2)));
-}
-
-
-
-
-
-
-float cos_52(float x)
-{
-  x = fmodf(x, f_twopi);
-  if (x < 0) { x = -x; }
-  int quad = int(x * (float)f_two_over_pi);
-  switch (quad) {
-    case 0: return cos_52s(x);
-    case 1: return -cos_52s((float)f_pi - x);
-    case 2: return -cos_52s(x-(float)f_pi);
-    case 3: return cos_52s((float)f_twopi - x);
-  }
-}
-
-
-
-
-float sin_52(float x)
-{
-  return cos_52((float)f_halfpi - x);
-}
-# 247 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-float tan_56s(float x)
-{
-  const float c1 = -3.16783027;
-  const float c2 = 0.134516124;
-  const float c3 = -4.033321984;
-
-  float x2 = x * x;
-  return (x * (c1 + c2 * x2) / (c3 + x2));
-}
-# 267 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-float tan_56(float x)
-{
-  x = fmodf(x, (float)f_twopi);
-  int octant = int(x * (float)f_four_over_pi);
-  switch (octant){
-    case 0: return tan_56s(x * (float)f_four_over_pi);
-    case 1: return 1.0f / tan_56s(((float)f_halfpi - x) * (float)f_four_over_pi);
-    case 2: return -1.0f / tan_56s((x-(float)f_halfpi) * (float)f_four_over_pi);
-    case 3: return - tan_56s(((float)f_pi - x) * (float)f_four_over_pi);
-    case 4: return tan_56s((x-(float)f_pi) * (float)f_four_over_pi);
-    case 5: return 1.0f / tan_56s(((float)f_threehalfpi - x) * (float)f_four_over_pi);
-    case 6: return -1.0f / tan_56s((x-(float)f_threehalfpi) * (float)f_four_over_pi);
-    case 7: return - tan_56s(((float)f_twopi - x) * (float)f_four_over_pi);
-  }
-}
-# 296 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-float atan_66s(float x)
-{
-  const float c1 = 1.6867629106;
-  const float c2 = 0.4378497304;
-  const float c3 = 1.6867633134;
-
-  float x2 = x * x;
-  return (x * (c1 + x2 * c2) / (c3 + x2));
-}
-
-
-
-
-
-float atan_66(float x)
-{
-  float y;
-  bool complement= false;
-  bool region= false;
-  bool sign= false;
-
-  if (x < 0) {
-    x = -x;
-    sign = true;
-  }
-  if (x > 1.0) {
-    x = 1.0 / x;
-    complement = true;
-  }
-  if (x > (float)f_tantwelfthpi) {
-    x = (x - (float)f_tansixthpi) / (1 + (float)f_tansixthpi * x);
-    region = true;
-  }
-
-  y = atan_66s(x);
-  if (region) { y += (float)f_sixthpi; }
-  if (complement) { y = (float)f_halfpi-y; }
-  if (sign) { y = -y; }
-  return (y);
-}
-
-float asinf1(float x)
-{
-  float d = 1.0f - x * x;
-  if (d < 0.0f) { return NAN; }
-  return 2 * atan_66(x / (1 + sqrt1(d)));
-}
-
-float acosf1(float x)
-{
-  float d = 1.0f - x * x;
-  if (d < 0.0f) { return NAN; }
-  float y = asinf1(sqrt1(d));
-  if (x >= 0.0f) {
-    return y;
-  } else {
-    return (float)f_pi - y;
-  }
-}
-
-
-float sqrt1(const float x)
-{
-  union {
-    int i;
-    float x;
-  } u;
-  u.x = x;
-  u.i = (1 << 29) + (u.i >> 1) - (1 << 22);
-
-
-
-
-  u.x = u.x + x / u.x;
-  u.x = 0.25f * u.x + x / u.x;
-
-  return u.x;
-}
-# 387 "C:/shared/sonoff/Git/Tasmota/tasmota/support_float.ino"
-uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
-                                       uint16_t ito_min, uint16_t ito_max) {
-
-  if (ifrom_min >= ifrom_max) {
-    if (ito_min > ito_max) {
-      return ito_max;
-    } else {
-      return ito_min;
-    }
-  }
-
-  uint32_t num = inum;
-  uint32_t from_min = ifrom_min;
-  uint32_t from_max = ifrom_max;
-  uint32_t to_min = ito_min;
-  uint32_t to_max = ito_max;
-
-
-  num = (num > from_max ? from_max : (num < from_min ? from_min : num));
-
-
-  if (to_min > to_max) {
-
-    num = (from_max - num) + from_min;
-    to_min = ito_max;
-    to_max = ito_min;
-  }
-
-  uint32_t numerator = (num - from_min) * (to_max - to_min);
-  uint32_t result;
-  if (numerator >= 0x80000000L) {
-
-    result = numerator / (from_max - from_min) + to_min;
-  } else {
-    result = (((numerator * 2) / (from_max - from_min)) + 1) / 2 + to_min;
-  }
-  return (uint32_t) (result > to_max ? to_max : (result < to_min ? to_min : result));
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_legacy_cores.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_legacy_cores.ino"
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-
-
-
-
-
-void* memchr(const void* ptr, int value, size_t num)
-{
-  unsigned char *p = (unsigned char*)ptr;
-  while (num--) {
-    if (*p != (unsigned char)value) {
-      p++;
-    } else {
-      return p;
-    }
-  }
-  return 0;
-}
-
-
-
-size_t strcspn(const char *str1, const char *str2)
-{
-  size_t ret = 0;
-  while (*str1) {
-    if (strchr(str2, *str1)) {
-      return ret;
-    } else {
-      str1++;
-      ret++;
-    }
-  }
-  return ret;
-}
-
-
-
-char* strpbrk(const char *s1, const char *s2)
-{
-  while(*s1) {
-    if (strchr(s2, *s1++)) {
-      return (char*)--s1;
-    }
-  }
-  return 0;
-}
-
-
-
-#ifndef __LONG_LONG_MAX__
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#endif
-#ifndef ULLONG_MAX
-#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
-#endif
-
-unsigned long long strtoull(const char *__restrict nptr, char **__restrict endptr, int base)
-{
-  const char *s = nptr;
-  char c;
-  do { c = *s++; } while (isspace((unsigned char)c));
-
-  int neg = 0;
-  if (c == '-') {
-    neg = 1;
-    c = *s++;
-  } else {
-    if (c == '+') {
-      c = *s++;
-    }
-  }
-
-  if ((base == 0 || base == 16) && (c == '0') && (*s == 'x' || *s == 'X')) {
-    c = s[1];
-    s += 2;
-    base = 16;
-  }
-  if (base == 0) { base = (c == '0') ? 8 : 10; }
-
-  unsigned long long acc = 0;
-  int any = 0;
-  if (base > 1 && base < 37) {
-    unsigned long long cutoff = ULLONG_MAX / base;
-    int cutlim = ULLONG_MAX % base;
-    for ( ; ; c = *s++) {
-      if (c >= '0' && c <= '9')
-        c -= '0';
-      else if (c >= 'A' && c <= 'Z')
-        c -= 'A' - 10;
-      else if (c >= 'a' && c <= 'z')
-        c -= 'a' - 10;
-      else
-        break;
-
-      if (c >= base)
-        break;
-
-      if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-        any = -1;
-      else {
-        any = 1;
-        acc *= base;
-        acc += c;
-      }
-    }
-    if (any < 0) {
-      acc = ULLONG_MAX;
-    }
-    else if (any && neg) {
-      acc = -acc;
-    }
-  }
-
-  if (endptr != nullptr) { *endptr = (char *)(any ? s - 1 : nptr); }
-
-  return acc;
-}
-
-#endif
-
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-
-
-
-
-
-void* memmove_P(void *dest, const void *src, size_t n)
-{
-  if (src > (void*)0x40000000) {
-    return memcpy_P(dest, src, n);
-  } else {
-    return memmove(dest, src, n);
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rotary.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rotary.ino"
-#ifdef USE_LIGHT
-
-#ifdef ROTARY_V1
-
-
-
-
-struct ROTARY {
-  unsigned long debounce = 0;
-  uint8_t present = 0;
-  uint8_t state = 0;
-  uint8_t position = 128;
-  uint8_t last_position = 128;
-  uint8_t interrupts_in_use_count = 0;
-  uint8_t changed = 0;
-} Rotary;
-
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void update_rotary(void) ICACHE_RAM_ATTR;
-#endif
-
-void update_rotary(void)
-{
-  if (MI_DESK_LAMP == my_module_type) {
-    if (LightPowerIRAM()) {
-
-
-
-
-      uint8_t s = Rotary.state & 3;
-      if (digitalRead(pin[GPIO_ROT1A])) { s |= 4; }
-      if (digitalRead(pin[GPIO_ROT1B])) { s |= 8; }
-      switch (s) {
-        case 0: case 5: case 10: case 15:
-          break;
-        case 1: case 7: case 8: case 14:
-          Rotary.position++; break;
-        case 2: case 4: case 11: case 13:
-          Rotary.position--; break;
-        case 3: case 12:
-          Rotary.position = Rotary.position + 2; break;
-        default:
-          Rotary.position = Rotary.position - 2; break;
-      }
-      Rotary.state = (s >> 2);
-    }
-  }
-}
-
-bool RotaryButtonPressed(void)
-{
-  if ((MI_DESK_LAMP == my_module_type) && (Rotary.changed) && LightPower()) {
-    Rotary.changed = 0;
-    return true;
-  }
-  return false;
-}
-
-void RotaryInit(void)
-{
-  Rotary.present = 0;
-  if ((pin[GPIO_ROT1A] < 99) && (pin[GPIO_ROT1B] < 99)) {
-    Rotary.present++;
-    pinMode(pin[GPIO_ROT1A], INPUT_PULLUP);
-    pinMode(pin[GPIO_ROT1B], INPUT_PULLUP);
-
-
-
-
-    if ((pin[GPIO_ROT1A] < 6) || (pin[GPIO_ROT1A] > 11)) {
-      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1A]), update_rotary, CHANGE);
-      Rotary.interrupts_in_use_count++;
-    }
-    if ((pin[GPIO_ROT1B] < 6) || (pin[GPIO_ROT1B] > 11)) {
-      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1B]), update_rotary, CHANGE);
-      Rotary.interrupts_in_use_count++;
-    }
-  }
-}
-
-
-
-
-
-void RotaryHandler(void)
-{
-  if (Rotary.interrupts_in_use_count < 2) {
-    noInterrupts();
-    update_rotary();
-  } else {
-    noInterrupts();
-  }
-  if (Rotary.last_position != Rotary.position) {
-    if (MI_DESK_LAMP == my_module_type) {
-      if (Button.hold_timer[0]) {
-        Rotary.changed = 1;
-
-        int16_t t = LightGetColorTemp();
-        t = t + (Rotary.position - Rotary.last_position);
-        if (t < 153) {
-          t = 153;
-        }
-        if (t > 500) {
-          t = 500;
-        }
-        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), Rotary.position - Rotary.last_position);
-        LightSetColorTemp((uint16_t)t);
-      } else {
-        int8_t d = Settings.light_dimmer;
-        d = d + (Rotary.position - Rotary.last_position);
-        if (d < 1) {
-          d = 1;
-        }
-        if (d > 100) {
-          d = 100;
-        }
-        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), Rotary.position - Rotary.last_position);
-
-        LightSetDimmer((uint8_t)d);
-        Settings.light_dimmer = d;
-      }
-    }
-    Rotary.last_position = 128;
-    Rotary.position = 128;
-  }
-  interrupts();
-}
-
-void RotaryLoop(void)
-{
-  if (Rotary.present) {
-    if (TimeReached(Rotary.debounce)) {
-      SetNextTimeInterval(Rotary.debounce, Settings.button_debounce);
-      RotaryHandler();
-    }
-  }
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
-# 25 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
-const uint32_t SECS_PER_MIN = 60UL;
-const uint32_t SECS_PER_HOUR = 3600UL;
-const uint32_t SECS_PER_DAY = SECS_PER_HOUR * 24UL;
-const uint32_t MINS_PER_HOUR = 60UL;
-
-#define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
-
-extern "C" {
-#include "sntp.h"
-}
-#include <Ticker.h>
-
-Ticker TickerRtc;
-
-static const uint8_t kDaysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-static const char kMonthNamesEnglish[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
-
-struct RTC {
-  uint32_t utc_time = 0;
-  uint32_t local_time = 0;
-  uint32_t daylight_saving_time = 0;
-  uint32_t standard_time = 0;
-  uint32_t ntp_time = 0;
-  uint32_t midnight = 0;
-  uint32_t restart_time = 0;
-  int32_t drift_time = 0;
-  int32_t time_timezone = 0;
-  uint8_t ntp_sync_minute = 0;
-  bool midnight_now = false;
-  bool user_time_entry = false;
-} Rtc;
-
-uint32_t UtcTime(void)
-{
-  return Rtc.utc_time;
-}
-
-uint32_t LocalTime(void)
-{
-  return Rtc.local_time;
-}
-
-int32_t DriftTime(void)
-{
-  return Rtc.drift_time;
-}
-
-uint32_t Midnight(void)
-{
-  return Rtc.midnight;
-}
-
-bool MidnightNow(void)
-{
-  if (Rtc.midnight_now) {
-    Rtc.midnight_now = false;
-    return true;
-  }
-  return false;
-}
-
-bool IsDst(void)
-{
-  if (Rtc.time_timezone == Settings.toffset[1]) {
-    return true;
-  }
-  return false;
-}
-
-String GetBuildDateAndTime(void)
-{
-
-  char bdt[21];
-  char *p;
-  char mdate[] = __DATE__;
-  char *smonth = mdate;
-  int day = 0;
-  int year = 0;
-
-
-  uint8_t i = 0;
-  for (char *str = strtok_r(mdate, " ", &p); str && i < 3; str = strtok_r(nullptr, " ", &p)) {
-    switch (i++) {
-    case 0:
-      smonth = str;
-      break;
-    case 1:
-      day = atoi(str);
-      break;
-    case 2:
-      year = atoi(str);
-    }
-  }
-  int month = (strstr(kMonthNamesEnglish, smonth) -kMonthNamesEnglish) /3 +1;
-  snprintf_P(bdt, sizeof(bdt), PSTR("%d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%s"), year, month, day, __TIME__);
-  return String(bdt);
-}
-
-String GetMinuteTime(uint32_t minutes)
-{
-  char tm[6];
-  snprintf_P(tm, sizeof(tm), PSTR("%02d:%02d"), minutes / 60, minutes % 60);
-
-  return String(tm);
-}
-
-String GetTimeZone(void)
-{
-  char tz[7];
-  snprintf_P(tz, sizeof(tz), PSTR("%+03d:%02d"), Rtc.time_timezone / 60, abs(Rtc.time_timezone % 60));
-
-  return String(tz);
-}
-
-String GetDuration(uint32_t time)
-{
-  char dt[16];
-
-  TIME_T ut;
-  BreakTime(time, ut);
-
-
-
-
-
-
-  snprintf_P(dt, sizeof(dt), PSTR("%dT%02d:%02d:%02d"), ut.days, ut.hour, ut.minute, ut.second);
-
-  return String(dt);
-}
-
-String GetDT(uint32_t time)
-{
-
-
-  char dt[20];
-  TIME_T tmpTime;
-
-  BreakTime(time, tmpTime);
-  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
-    tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
-
-  return String(dt);
-}
-# 181 "C:/shared/sonoff/Git/Tasmota/tasmota/support_rtc.ino"
-String GetDateAndTime(uint8_t time_type)
-{
-
-  uint32_t time = Rtc.local_time;
-
-  switch (time_type) {
-    case DT_BOOTCOUNT:
-      time = Settings.bootcount_reset_time;
-      break;
-    case DT_ENERGY:
-      time = Settings.energy_kWhtotal_time;
-      break;
-    case DT_UTC:
-      time = Rtc.utc_time;
-      break;
-    case DT_RESTART:
-      if (Rtc.restart_time == 0) {
-        return "";
-      }
-      time = Rtc.restart_time;
-      break;
-  }
-  String dt = GetDT(time);
-  if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {
-    dt += GetTimeZone();
-  }
-  return dt;
-}
-
-String GetTime(int type)
-{
-
-
-
-
-  char stime[25];
-
-  uint32_t time = Rtc.utc_time;
-  if (1 == type) time = Rtc.local_time;
-  if (2 == type) time = Rtc.daylight_saving_time;
-  if (3 == type) time = Rtc.standard_time;
-  snprintf_P(stime, sizeof(stime), sntp_get_real_time(time));
-
-  return String(stime);
-}
-
-uint32_t UpTime(void)
-{
-  if (Rtc.restart_time) {
-    return Rtc.utc_time - Rtc.restart_time;
-  } else {
-    return uptime;
-  }
-}
-
-uint32_t MinutesUptime(void)
-{
-  return (UpTime() / 60);
-}
-
-String GetUptime(void)
-{
-  return GetDuration(UpTime());
-}
-
-uint32_t MinutesPastMidnight(void)
-{
-  uint32_t minutes = 0;
-
-  if (RtcTime.valid) {
-    minutes = (RtcTime.hour *60) + RtcTime.minute;
-  }
-  return minutes;
-}
-
-void BreakTime(uint32_t time_input, TIME_T &tm)
-{
-
-
-
-
-  uint8_t year;
-  uint8_t month;
-  uint8_t month_length;
-  uint32_t time;
-  unsigned long days;
-
-  time = time_input;
-  tm.second = time % 60;
-  time /= 60;
-  tm.minute = time % 60;
-  time /= 60;
-  tm.hour = time % 24;
-  time /= 24;
-  tm.days = time;
-  tm.day_of_week = ((time + 4) % 7) + 1;
-
-  year = 0;
-  days = 0;
-  while((unsigned)(days += (LEAP_YEAR(year) ? 366 : 365)) <= time) {
-    year++;
-  }
-  tm.year = year;
-
-  days -= LEAP_YEAR(year) ? 366 : 365;
-  time -= days;
-  tm.day_of_year = time;
-
-  for (month = 0; month < 12; month++) {
-    if (1 == month) {
-      if (LEAP_YEAR(year)) {
-        month_length = 29;
-      } else {
-        month_length = 28;
-      }
-    } else {
-      month_length = kDaysInMonth[month];
-    }
-
-    if (time >= month_length) {
-      time -= month_length;
-    } else {
-      break;
-    }
-  }
-  strlcpy(tm.name_of_month, kMonthNames + (month *3), 4);
-  tm.month = month + 1;
-  tm.day_of_month = time + 1;
-  tm.valid = (time_input > START_VALID_TIME);
-}
-
-uint32_t MakeTime(TIME_T &tm)
-{
-
-
-
-  int i;
-  uint32_t seconds;
-
-
-  seconds = tm.year * (SECS_PER_DAY * 365);
-  for (i = 0; i < tm.year; i++) {
-    if (LEAP_YEAR(i)) {
-      seconds += SECS_PER_DAY;
-    }
-  }
-
-
-  for (i = 1; i < tm.month; i++) {
-    if ((2 == i) && LEAP_YEAR(tm.year)) {
-      seconds += SECS_PER_DAY * 29;
-    } else {
-      seconds += SECS_PER_DAY * kDaysInMonth[i-1];
-    }
-  }
-  seconds+= (tm.day_of_month - 1) * SECS_PER_DAY;
-  seconds+= tm.hour * SECS_PER_HOUR;
-  seconds+= tm.minute * SECS_PER_MIN;
-  seconds+= tm.second;
-  return seconds;
-}
-
-uint32_t RuleToTime(TimeRule r, int yr)
-{
-  TIME_T tm;
-  uint32_t t;
-  uint8_t m;
-  uint8_t w;
-
-  m = r.month;
-  w = r.week;
-  if (0 == w) {
-    if (++m > 12) {
-      m = 1;
-      yr++;
-    }
-    w = 1;
-  }
-
-  tm.hour = r.hour;
-  tm.minute = 0;
-  tm.second = 0;
-  tm.day_of_month = 1;
-  tm.month = m;
-  tm.year = yr - 1970;
-  t = MakeTime(tm);
-  BreakTime(t, tm);
-  t += (7 * (w - 1) + (r.dow - tm.day_of_week + 7) % 7) * SECS_PER_DAY;
-  if (0 == r.week) {
-    t -= 7 * SECS_PER_DAY;
-  }
-  return t;
-}
-
-void RtcSecond(void)
-{
-  TIME_T tmpTime;
-
-  if (!Rtc.user_time_entry && !global_state.wifi_down) {
-    uint8_t uptime_minute = (uptime / 60) % 60;
-    if ((Rtc.ntp_sync_minute > 59) && (uptime_minute > 2)) {
-      Rtc.ntp_sync_minute = 1;
-    }
-    uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ;
-    if ( (((offset == RtcTime.second) && ( (RtcTime.year < 2016) ||
-                                           (Rtc.ntp_sync_minute == uptime_minute))) ||
-                                            ntp_force_sync ) ) {
-      Rtc.ntp_time = sntp_get_current_timestamp();
-      if (Rtc.ntp_time > START_VALID_TIME) {
-        ntp_force_sync = false;
-        if (Rtc.utc_time > START_VALID_TIME) { Rtc.drift_time = Rtc.ntp_time - Rtc.utc_time; }
-        Rtc.utc_time = Rtc.ntp_time;
-        Rtc.ntp_sync_minute = 60;
-        if (Rtc.restart_time == 0) {
-          Rtc.restart_time = Rtc.utc_time - uptime;
-        }
-        BreakTime(Rtc.utc_time, tmpTime);
-        RtcTime.year = tmpTime.year + 1970;
-        Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
-        Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
-
-
-        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-          DriftTime(), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
-
-        if (Rtc.local_time < START_VALID_TIME) {
-          rules_flag.time_init = 1;
-        } else {
-          rules_flag.time_set = 1;
-        }
-      } else {
-        Rtc.ntp_sync_minute++;
-      }
-    }
-  }
-
-  Rtc.utc_time++;
-  Rtc.local_time = Rtc.utc_time;
-  if (Rtc.local_time > START_VALID_TIME) {
-    int16_t timezone_minutes = Settings.timezone_minutes;
-    if (Settings.timezone < 0) { timezone_minutes *= -1; }
-    Rtc.time_timezone = (Settings.timezone * SECS_PER_HOUR) + (timezone_minutes * SECS_PER_MIN);
-    if (99 == Settings.timezone) {
-      int32_t dstoffset = Settings.toffset[1] * SECS_PER_MIN;
-      int32_t stdoffset = Settings.toffset[0] * SECS_PER_MIN;
-      if (Settings.tflag[1].hemis) {
-
-        if ((Rtc.utc_time >= (Rtc.standard_time - dstoffset)) && (Rtc.utc_time < (Rtc.daylight_saving_time - stdoffset))) {
-          Rtc.time_timezone = stdoffset;
-        } else {
-          Rtc.time_timezone = dstoffset;
-        }
-      } else {
-
-        if ((Rtc.utc_time >= (Rtc.daylight_saving_time - stdoffset)) && (Rtc.utc_time < (Rtc.standard_time - dstoffset))) {
-          Rtc.time_timezone = dstoffset;
-        } else {
-          Rtc.time_timezone = stdoffset;
-        }
-      }
-    }
-    Rtc.local_time += Rtc.time_timezone;
-    Rtc.time_timezone /= 60;
-    if (!Settings.energy_kWhtotal_time) {
-      Settings.energy_kWhtotal_time = Rtc.local_time;
-    }
-    if (Settings.bootcount_reset_time < START_VALID_TIME) {
-      Settings.bootcount_reset_time = Rtc.local_time;
-    }
-  }
-
-  BreakTime(Rtc.local_time, RtcTime);
-  if (RtcTime.valid) {
-    if (!Rtc.midnight) {
-      Rtc.midnight = Rtc.local_time - (RtcTime.hour * 3600) - (RtcTime.minute * 60) - RtcTime.second;
-    }
-    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) {
-      Rtc.midnight = Rtc.local_time;
-      Rtc.midnight_now = true;
-    }
-  }
-
-  RtcTime.year += 1970;
-}
-
-void RtcSetTime(uint32_t epoch)
-{
-  if (epoch < START_VALID_TIME) {
-    Rtc.user_time_entry = false;
-    ntp_force_sync = true;
-    sntp_init();
-  } else {
-    sntp_stop();
-    Rtc.user_time_entry = true;
-    Rtc.utc_time = epoch -1;
-  }
-  RtcSecond();
-}
-
-void RtcInit(void)
-{
-  sntp_setservername(0, SettingsText(SET_NTPSERVER1));
-  sntp_setservername(1, SettingsText(SET_NTPSERVER2));
-  sntp_setservername(2, SettingsText(SET_NTPSERVER3));
-  sntp_stop();
-  sntp_set_timezone(0);
-  sntp_init();
-  Rtc.utc_time = 0;
-  BreakTime(Rtc.utc_time, RtcTime);
-  TickerRtc.attach(1, RtcSecond);
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_static_buffer.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_static_buffer.ino"
-typedef struct SBuffer_impl {
-  uint16_t size;
-  uint16_t len;
-  uint8_t buf[];
-} SBuffer_impl;
-
-
-
-typedef class SBuffer {
-
-protected:
-  SBuffer(void) {
-
-  }
-
-public:
-  SBuffer(const size_t size) {
-    _buf = (SBuffer_impl*) new char[size+4];
-    _buf->size = size;
-    _buf->len = 0;
-
-  }
-
-  inline size_t getSize(void) const { return _buf->size; }
-  inline size_t size(void) const { return _buf->size; }
-  inline size_t getLen(void) const { return _buf->len; }
-  inline size_t len(void) const { return _buf->len; }
-  inline uint8_t *getBuffer(void) const { return _buf->buf; }
-  inline uint8_t *buf(size_t i = 0) const { return &_buf->buf[i]; }
-  inline char *charptr(size_t i = 0) const { return (char*) &_buf->buf[i]; }
-
-  virtual ~SBuffer(void) {
-    delete[] _buf;
-  }
-
-  inline void setLen(const size_t len) {
-    uint16_t old_len = _buf->len;
-    _buf->len = (len <= _buf->size) ? len : _buf->size;
-    if (old_len < _buf->len) {
-      memset((void*) &_buf->buf[old_len], 0, _buf->len - old_len);
-    }
-  }
-
-  void set8(const size_t offset, const uint8_t data) {
-    if (offset < _buf->len) {
-      _buf->buf[offset] = data;
-    }
-  }
-
-  size_t add8(const uint8_t data) {
-    if (_buf->len < _buf->size) {
-      _buf->buf[_buf->len++] = data;
-    }
-    return _buf->len;
-  }
-  size_t add16(const uint16_t data) {
-    if (_buf->len < _buf->size - 1) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-    }
-    return _buf->len;
-  }
-  size_t add32(const uint32_t data) {
-    if (_buf->len < _buf->size - 3) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-      _buf->buf[_buf->len++] = data >> 16;
-      _buf->buf[_buf->len++] = data >> 24;
-    }
-    return _buf->len;
-  }
-  size_t add64(const uint64_t data) {
-    if (_buf->len < _buf->size - 7) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-      _buf->buf[_buf->len++] = data >> 16;
-      _buf->buf[_buf->len++] = data >> 24;
-      _buf->buf[_buf->len++] = data >> 32;
-      _buf->buf[_buf->len++] = data >> 40;
-      _buf->buf[_buf->len++] = data >> 48;
-      _buf->buf[_buf->len++] = data >> 56;
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const SBuffer &buf2) {
-    if (len() + buf2.len() <= size()) {
-      for (uint32_t i = 0; i < buf2.len(); i++) {
-        _buf->buf[_buf->len++] = buf2.buf()[i];
-      }
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const uint8_t *buf2, size_t len2) {
-    if (len() + len2 <= size()) {
-      for (uint32_t i = 0; i < len2; i++) {
-        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
-      }
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const char *buf2, size_t len2) {
-    if (len() + len2 <= size()) {
-      for (uint32_t i = 0; i < len2; i++) {
-        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
-      }
-    }
-    return _buf->len;
-  }
-
-  uint8_t get8(size_t offset) const {
-    if (offset < _buf->len) {
-      return _buf->buf[offset];
-    } else {
-      return 0;
-    }
-  }
-  uint8_t read8(const size_t offset) const {
-    if (offset < len()) {
-      return _buf->buf[offset];
-    }
-    return 0;
-  }
-  uint16_t get16(const size_t offset) const {
-    if (offset < len() - 1) {
-      return _buf->buf[offset] | (_buf->buf[offset+1] << 8);
-    }
-    return 0;
-  }
-  uint32_t get32(const size_t offset) const {
-    if (offset < len() - 3) {
-      return _buf->buf[offset] | (_buf->buf[offset+1] << 8) |
-            (_buf->buf[offset+2] << 16) | (_buf->buf[offset+3] << 24);
-    }
-    return 0;
-  }
-  uint64_t get64(const size_t offset) const {
-    if (offset < len() - 7) {
-      return (uint64_t)_buf->buf[offset] | ((uint64_t)_buf->buf[offset+1] << 8) |
-            ((uint64_t)_buf->buf[offset+2] << 16) | ((uint64_t)_buf->buf[offset+3] << 24) |
-            ((uint64_t)_buf->buf[offset+4] << 32) | ((uint64_t)_buf->buf[offset+5] << 40) |
-            ((uint64_t)_buf->buf[offset+6] << 48) | ((uint64_t)_buf->buf[offset+7] << 56);
-    }
-    return 0;
-  }
-
-
-  inline size_t strlen(const size_t offset) const {
-    return strnlen((const char*) &_buf->buf[offset], len() - offset);
-  }
-
-  size_t strlen_s(const size_t offset) const {
-    size_t slen = this->strlen(offset);
-    if (slen == len() - offset) {
-      return 0;
-    } else {
-      return slen;
-    }
-  }
-
-  SBuffer subBuffer(const size_t start, size_t len) const {
-    if (start >= _buf->len) {
-      len = 0;
-    } else if (start + len > _buf->len) {
-      len = _buf->len - start;
-    }
-
-    SBuffer buf2(len);
-    memcpy(buf2.buf(), buf()+start, len);
-    buf2._buf->len = len;
-    return buf2;
-  }
-
-  static SBuffer SBufferFromHex(const char *hex, size_t len) {
-    size_t buf_len = (len + 3) / 2;
-    SBuffer buf2(buf_len);
-    uint8_t val;
-
-    for (; len > 1; len -= 2) {
-      val = asc2byte(*hex++) << 4;
-      val |= asc2byte(*hex++);
-      buf2.add8(val);
-    }
-    return buf2;
-  }
-
-protected:
-
-  static uint8_t asc2byte(char chr) {
-    uint8_t rVal = 0;
-    if (isdigit(chr)) { rVal = chr - '0'; }
-    else if (chr >= 'A' && chr <= 'F') { rVal = chr + 10 - 'A'; }
-    else if (chr >= 'a' && chr <= 'f') { rVal = chr + 10 - 'a'; }
-    return rVal;
-  }
-
-  static void unHex(const char* in, uint8_t *out, size_t len) {
-  }
-
-protected:
-  SBuffer_impl * _buf;
-
-} SBuffer;
-
-typedef class PreAllocatedSBuffer : public SBuffer {
-
-public:
-  PreAllocatedSBuffer(const size_t size, void * buffer) {
-    _buf = (SBuffer_impl*) buffer;
-    _buf->size = size - 4;
-    _buf->len = 0;
-  }
-
-  ~PreAllocatedSBuffer(void) {
-
-    _buf = nullptr;
-  }
-} PreAllocatedSBuffer;
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_statistics.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_statistics.ino"
-#define USE_STATS_CODE 
-
-#ifdef USE_STATS_CODE
-
-
-
-
-String GetStatistics(void)
-{
-  char data[40];
-  snprintf_P(data, sizeof(data), PSTR(",\"CR\":\"%d/%d\""), GetSettingsTextLen(), settings_text_size);
-  return String(data);
-}
-
-#else
-
-String GetStatistics(void)
-{
-  return String("");
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_switch.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_switch.ino"
-#define SWITCH_V2 
-#ifdef SWITCH_V2
-
-
-
-
-
-
-const uint8_t SWITCH_PROBE_INTERVAL = 10;
-
-#include <Ticker.h>
-
-Ticker TickerSwitch;
-
-struct SWITCH {
-  unsigned long debounce = 0;
-  uint16_t no_pullup_mask = 0;
-  uint8_t state[MAX_SWITCHES] = { 0 };
-  uint8_t last_state[MAX_SWITCHES];
-  uint8_t hold_timer[MAX_SWITCHES] = { 0 };
-  uint8_t virtual_state[MAX_SWITCHES];
-  uint8_t present = 0;
-} Switch;
-
-
-
-void SwitchPullupFlag(uint16 switch_bit)
-{
-  bitSet(Switch.no_pullup_mask, switch_bit);
-}
-
-void SwitchSetVirtual(uint32_t index, uint8_t state)
-{
-  Switch.virtual_state[index] = state;
-}
-
-uint8_t SwitchGetVirtual(uint32_t index)
-{
-  return Switch.virtual_state[index];
-}
-
-uint8_t SwitchLastState(uint32_t index)
-{
-  return Switch.last_state[index];
-}
-
-bool SwitchState(uint32_t index)
-{
-  uint32_t switchmode = Settings.switchmode[index];
-  return ((FOLLOW_INV == switchmode) ||
-          (PUSHBUTTON_INV == switchmode) ||
-          (PUSHBUTTONHOLD_INV == switchmode) ||
-          (FOLLOWMULTI_INV == switchmode) ||
-          (PUSHHOLDMULTI_INV == switchmode)
-         ) ^ Switch.last_state[index];
-}
-
-
-
-void SwitchProbe(void)
-{
-  if (uptime < 4) { return; }
-
-  uint8_t state_filter = Settings.switch_debounce / SWITCH_PROBE_INTERVAL;
-  uint8_t force_high = (Settings.switch_debounce % 50) &1;
-  uint8_t force_low = (Settings.switch_debounce % 50) &2;
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    if (pin[GPIO_SWT1 +i] < 99) {
-
-      if (1 == digitalRead(pin[GPIO_SWT1 +i])) {
-
-        if (force_high) {
-          if (1 == Switch.virtual_state[i]) {
-            Switch.state[i] = state_filter;
-          }
-        }
-
-        if (Switch.state[i] < state_filter) {
-          Switch.state[i]++;
-          if (state_filter == Switch.state[i]) {
-            Switch.virtual_state[i] = 1;
-          }
-        }
-      } else {
-
-        if (force_low) {
-          if (0 == Switch.virtual_state[i]) {
-            Switch.state[i] = 0;
-          }
-        }
-
-        if (Switch.state[i] > 0) {
-          Switch.state[i]--;
-          if (0 == Switch.state[i]) {
-            Switch.virtual_state[i] = 0;
-          }
-        }
-      }
-    }
-  }
-  TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe);
-}
-
-void SwitchInit(void)
-{
-  Switch.present = 0;
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    Switch.last_state[i] = 1;
-    if (pin[GPIO_SWT1 +i] < 99) {
-      Switch.present++;
-      pinMode(pin[GPIO_SWT1 +i], bitRead(Switch.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_SWT1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
-      Switch.last_state[i] = digitalRead(pin[GPIO_SWT1 +i]);
-    }
-    Switch.virtual_state[i] = Switch.last_state[i];
-  }
-  if (Switch.present) { TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe); }
-}
-
-
-
-
-
-void SwitchHandler(uint8_t mode)
-{
-  if (uptime < 4) { return; }
-
-  uint16_t loops_per_second = 1000 / Settings.switch_debounce;
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    if ((pin[GPIO_SWT1 +i] < 99) || (mode)) {
-      uint8_t button = Switch.virtual_state[i];
-      uint8_t switchflag = POWER_TOGGLE +1;
-
-      if (Switch.hold_timer[i]) {
-        Switch.hold_timer[i]--;
-        if (0 == Switch.hold_timer[i]) {
-
-          switch (Settings.switchmode[i]) {
-            case TOGGLEMULTI:
-              switchflag = POWER_TOGGLE;
-              break;
-            case FOLLOWMULTI:
-              switchflag = button &1;
-              break;
-            case FOLLOWMULTI_INV:
-              switchflag = ~button &1;
-              break;
-            case PUSHHOLDMULTI:
-              if (NOT_PRESSED == button){
-                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
-              }
-              else
-                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
-              break;
-            case PUSHHOLDMULTI_INV:
-              if (PRESSED == button){
-                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
-              }
-              else
-                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
-              break;
-          default:
-            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
-            break;
-          }
-        }
-      }
-
-
-
-      if (button != Switch.last_state[i]) {
-        switch (Settings.switchmode[i]) {
-        case TOGGLE:
-        case PUSHBUTTON_TOGGLE:
-          switchflag = POWER_TOGGLE;
-          break;
-        case FOLLOW:
-          switchflag = button &1;
-          break;
-        case FOLLOW_INV:
-          switchflag = ~button &1;
-          break;
-        case PUSHBUTTON:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTON_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTONHOLD:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTONHOLD_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case TOGGLEMULTI:
-        case FOLLOWMULTI:
-        case FOLLOWMULTI_INV:
-          if (Switch.hold_timer[i]) {
-            Switch.hold_timer[i] = 0;
-            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
-          } else {
-            Switch.hold_timer[i] = loops_per_second / 2;
-          }
-          break;
-        case PUSHHOLDMULTI:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i]!=0)
-              SendKey(KEY_SWITCH, i +1, POWER_INV);
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
-              switchflag = POWER_TOGGLE;
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          break;
-        case PUSHHOLDMULTI_INV:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i]!=0)
-              SendKey(KEY_SWITCH, i +1, POWER_INV);
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
-              switchflag = POWER_TOGGLE;
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          break;
-        }
-        Switch.last_state[i] = button;
-      }
-      if (switchflag <= POWER_TOGGLE) {
-        if (!SendKey(KEY_SWITCH, i +1, switchflag)) {
-          ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);
-        }
-      }
-    }
-  }
-}
-
-void SwitchLoop(void)
-{
-  if (Switch.present) {
-    if (TimeReached(Switch.debounce)) {
-      SetNextTimeInterval(Switch.debounce, Settings.switch_debounce);
-      SwitchHandler(0);
-    }
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-const char kSleepMode[] PROGMEM = "Dynamic|Normal";
-const char kPrefixes[] PROGMEM = D_CMND "|" D_STAT "|" D_TELE;
-
-char* Format(char* output, const char* input, int size)
-{
-  char *token;
-  uint32_t digits = 0;
-
-  if (strstr(input, "%") != nullptr) {
-    strlcpy(output, input, size);
-    token = strtok(output, "%");
-    if (strstr(input, "%") == input) {
-      output[0] = '\0';
-    } else {
-      token = strtok(nullptr, "");
-    }
-    if (token != nullptr) {
-      digits = atoi(token);
-      if (digits) {
-        char tmp[size];
-        if (strchr(token, 'd')) {
-          snprintf_P(tmp, size, PSTR("%s%c0%dd"), output, '%', digits);
-          snprintf_P(output, size, tmp, ESP.getChipId() & 0x1fff);
-        } else {
-          snprintf_P(tmp, size, PSTR("%s%c0%dX"), output, '%', digits);
-          snprintf_P(output, size, tmp, ESP.getChipId());
-        }
-      } else {
-        if (strchr(token, 'd')) {
-          snprintf_P(output, size, PSTR("%s%d"), output, ESP.getChipId());
-          digits = 8;
-        }
-      }
-    }
-  }
-  if (!digits) {
-    strlcpy(output, input, size);
-  }
-  return output;
-}
-
-char* GetOtaUrl(char *otaurl, size_t otaurl_size)
-{
-  if (strstr(SettingsText(SET_OTAURL), "%04d") != nullptr) {
-    snprintf(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId() & 0x1fff);
-  }
-  else if (strstr(SettingsText(SET_OTAURL), "%d") != nullptr) {
-    snprintf_P(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId());
-  }
-  else {
-    strlcpy(otaurl, SettingsText(SET_OTAURL), otaurl_size);
-  }
-
-  return otaurl;
-}
-
-char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic)
-{
-# 88 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-  char romram[CMDSZ];
-  String fulltopic;
-
-  snprintf_P(romram, sizeof(romram), subtopic);
-  if (fallback_topic_flag || (prefix > 3)) {
-    bool fallback = (prefix < 8);
-    prefix &= 3;
-    char stemp[11];
-    fulltopic = GetTextIndexed(stemp, sizeof(stemp), prefix, kPrefixes);
-    fulltopic += F("/");
-    if (fallback) {
-      fulltopic += mqtt_client;
-      fulltopic += F("_fb");
-    } else {
-      fulltopic += topic;
-    }
-  } else {
-    fulltopic = SettingsText(SET_MQTT_FULLTOPIC);
-    if ((0 == prefix) && (-1 == fulltopic.indexOf(FPSTR(MQTT_TOKEN_PREFIX)))) {
-      fulltopic += F("/");
-      fulltopic += FPSTR(MQTT_TOKEN_PREFIX);
-    }
-    for (uint32_t i = 0; i < MAX_MQTT_PREFIXES; i++) {
-      if (!strlen(SettingsText(SET_MQTTPREFIX1 + i))) {
-        char temp[TOPSZ];
-        SettingsUpdateText(SET_MQTTPREFIX1 + i, GetTextIndexed(temp, sizeof(temp), i, kPrefixes));
-      }
-    }
-    fulltopic.replace(FPSTR(MQTT_TOKEN_PREFIX), SettingsText(SET_MQTTPREFIX1 + prefix));
-
-    fulltopic.replace(FPSTR(MQTT_TOKEN_TOPIC), topic);
-    fulltopic.replace(F("%hostname%"), my_hostname);
-    String token_id = WiFi.macAddress();
-    token_id.replace(":", "");
-    fulltopic.replace(F("%id%"), token_id);
-  }
-  fulltopic.replace(F("#"), "");
-  fulltopic.replace(F("//"), "/");
-  if (!fulltopic.endsWith("/")) {
-    fulltopic += "/";
-  }
-  snprintf_P(stopic, TOPSZ, PSTR("%s%s"), fulltopic.c_str(), romram);
-  return stopic;
-}
-
-char* GetGroupTopic_P(char *stopic, const char* subtopic)
-{
-
-
-  return GetTopic_P(stopic, (Settings.flag3.grouptopic_mode) ? CMND +8 : CMND, SettingsText(SET_MQTT_GRP_TOPIC), subtopic);
-}
-
-char* GetFallbackTopic_P(char *stopic, const char* subtopic)
-{
-  return GetTopic_P(stopic, CMND +4, nullptr, subtopic);
-}
-
-char* GetStateText(uint32_t state)
-{
-  if (state >= MAX_STATE_TEXT) {
-    state = 1;
-  }
-  return SettingsText(SET_STATE_TXT1 + state);
-}
-
-
-
-void SetLatchingRelay(power_t lpower, uint32_t state)
-{
-
-
-
-
-
-  if (state && !latching_relay_pulse) {
-    latching_power = lpower;
-    latching_relay_pulse = 2;
-  }
-
-  for (uint32_t i = 0; i < devices_present; i++) {
-    uint32_t port = (i << 1) + ((latching_power >> i) &1);
-    DigitalWrite(GPIO_REL1 +port, bitRead(rel_inverted, port) ? !state : state);
-  }
-}
-
-void SetDevicePower(power_t rpower, uint32_t source)
-{
-  ShowSource(source);
-  last_source = source;
-
-  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-    power = (1 << devices_present) -1;
-    rpower = power;
-  }
-
-  if (Settings.flag.interlock) {
-    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-      power_t mask = 1;
-      uint32_t count = 0;
-      for (uint32_t j = 0; j < devices_present; j++) {
-        if ((Settings.interlock[i] & mask) && (rpower & mask)) {
-          count++;
-        }
-        mask <<= 1;
-      }
-      if (count > 1) {
-        mask = ~Settings.interlock[i];
-        power &= mask;
-        rpower &= mask;
-      }
-    }
-  }
-
-  if (rpower) {
-    last_power = rpower;
-  }
-
-  XdrvMailbox.index = rpower;
-  XdrvCall(FUNC_SET_POWER);
-
-  XdrvMailbox.index = rpower;
-  XdrvMailbox.payload = source;
-  if (XdrvCall(FUNC_SET_DEVICE_POWER)) {
-
-  }
-  else if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-    Serial.write(0xA0);
-    Serial.write(0x04);
-    Serial.write(rpower &0xFF);
-    Serial.write(0xA1);
-    Serial.write('\n');
-    Serial.flush();
-  }
-  else if (EXS_RELAY == my_module_type) {
-    SetLatchingRelay(rpower, 1);
-  }
-  else {
-    for (uint32_t i = 0; i < devices_present; i++) {
-      power_t state = rpower &1;
-      if (i < MAX_RELAYS) {
-        DigitalWrite(GPIO_REL1 +i, bitRead(rel_inverted, i) ? !state : state);
-      }
-      rpower >>= 1;
-    }
-  }
-}
-
-void RestorePower(bool publish_power, uint32_t source)
-{
-  if (power != last_power) {
-    power = last_power;
-    SetDevicePower(power, source);
-    if (publish_power) {
-      MqttPublishAllPowerState();
-    }
-  }
-}
-
-void SetAllPower(uint32_t state, uint32_t source)
-{
-# 256 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-  bool publish_power = true;
-  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
-    state &= 3;
-    publish_power = false;
-  }
-  if ((state >= POWER_OFF) && (state <= POWER_TOGGLE)) {
-    power_t all_on = (1 << devices_present) -1;
-    switch (state) {
-    case POWER_OFF:
-      power = 0;
-      break;
-    case POWER_ON:
-      power = all_on;
-      break;
-    case POWER_TOGGLE:
-      power ^= all_on;
-    }
-    SetDevicePower(power, source);
-  }
-  if (publish_power) {
-    MqttPublishAllPowerState();
-  }
-}
-
-void SetPowerOnState(void)
-{
-  if (MOTOR == my_module_type) {
-    Settings.poweronstate = POWER_ALL_ON;
-  }
-  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-    SetDevicePower(1, SRC_RESTART);
-  } else {
-    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
-      switch (Settings.poweronstate) {
-      case POWER_ALL_OFF:
-      case POWER_ALL_OFF_PULSETIME_ON:
-        power = 0;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_ON:
-        power = (1 << devices_present) -1;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_SAVED_TOGGLE:
-        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
-        if (Settings.flag.save_state) {
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      case POWER_ALL_SAVED:
-        power = Settings.power & ((1 << devices_present) -1);
-        if (Settings.flag.save_state) {
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      }
-    } else {
-      power = Settings.power & ((1 << devices_present) -1);
-      if (Settings.flag.save_state) {
-        SetDevicePower(power, SRC_RESTART);
-      }
-    }
-  }
-
-
-  for (uint32_t i = 0; i < devices_present; i++) {
-    if (!Settings.flag3.no_power_feedback) {
-      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
-        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
-      }
-    }
-    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
-      SetPulseTimer(i, Settings.pulse_timer[i]);
-    }
-  }
-  blink_powersave = power;
-}
-
-void SetLedPowerIdx(uint32_t led, uint32_t state)
-{
-  if ((99 == pin[GPIO_LEDLNK]) && (0 == led)) {
-    if (pin[GPIO_LED2] < 99) {
-      led = 1;
-    }
-  }
-  if (pin[GPIO_LED1 + led] < 99) {
-    uint32_t mask = 1 << led;
-    if (state) {
-      state = 1;
-      led_power |= mask;
-    } else {
-      led_power &= (0xFF ^ mask);
-    }
-    DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
-  }
-#ifdef USE_BUZZER
-  if (led == 0) {
-    BuzzerSetStateToLed(state);
-  }
-#endif
-}
-
-void SetLedPower(uint32_t state)
-{
-  if (99 == pin[GPIO_LEDLNK]) {
-    SetLedPowerIdx(0, state);
-  } else {
-    power_t mask = 1;
-    for (uint32_t i = 0; i < leds_present; i++) {
-      bool tstate = (power & mask);
-      SetLedPowerIdx(i, tstate);
-      mask <<= 1;
-    }
-  }
-}
-
-void SetLedPowerAll(uint32_t state)
-{
-  for (uint32_t i = 0; i < leds_present; i++) {
-    SetLedPowerIdx(i, state);
-  }
-}
-
-void SetLedLink(uint32_t state)
-{
-  uint32_t led_pin = pin[GPIO_LEDLNK];
-  uint32_t led_inv = ledlnk_inverted;
-  if (99 == led_pin) {
-    led_pin = pin[GPIO_LED1];
-    led_inv = bitRead(led_inverted, 0);
-  }
-  if (led_pin < 99) {
-    if (state) { state = 1; }
-    digitalWrite(led_pin, (led_inv) ? !state : state);
-  }
-#ifdef USE_BUZZER
-  BuzzerSetStateToLed(state);
-#endif
-}
-
-void SetPulseTimer(uint32_t index, uint32_t time)
-{
-  pulse_timer[index] = (time > 111) ? millis() + (1000 * (time - 100)) : (time > 0) ? millis() + (100 * time) : 0L;
-}
-
-uint32_t GetPulseTimer(uint32_t index)
-{
-  long time = TimePassedSince(pulse_timer[index]);
-  if (time < 0) {
-    time *= -1;
-    return (time > 11100) ? (time / 1000) + 100 : (time > 0) ? time / 100 : 0;
-  }
-  return 0;
-}
-
-
-
-bool SendKey(uint32_t key, uint32_t device, uint32_t state)
-{
-# 423 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-  char stopic[TOPSZ];
-  char scommand[CMDSZ];
-  char key_topic[TOPSZ];
-  bool result = false;
-
-  char *tmp = (key) ? SettingsText(SET_MQTT_SWITCH_TOPIC) : SettingsText(SET_MQTT_BUTTON_TOPIC);
-  Format(key_topic, tmp, sizeof(key_topic));
-  if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) {
-    if (!key && (device > devices_present)) {
-      device = 1;
-    }
-    GetTopic_P(stopic, CMND, key_topic,
-               GetPowerDevice(scommand, device, sizeof(scommand), (key + Settings.flag.device_index_enable)));
-    if (CLEAR_RETAIN == state) {
-      mqtt_data[0] = '\0';
-    } else {
-      if ((Settings.flag3.button_switch_force_local ||
-           !strcmp(mqtt_topic, key_topic) ||
-           !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic)) &&
-          (POWER_TOGGLE == state)) {
-        state = ~(power >> (device -1)) &1;
-      }
-      snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(state));
-    }
-#ifdef USE_DOMOTICZ
-    if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) {
-#endif
-      MqttPublish(stopic, ((key) ? Settings.flag.mqtt_switch_retain
-                                 : Settings.flag.mqtt_button_retain) &&
-                                 (state != POWER_HOLD || !Settings.flag3.no_hold_retain));
-#ifdef USE_DOMOTICZ
-    }
-#endif
-    result = !Settings.flag3.button_switch_force_local;
-  } else {
-    Response_P(PSTR("{\"%s%d\":{\"State\":%d}}"), (key) ? "Switch" : "Button", device, state);
-    result = XdrvRulesProcess();
-  }
-  int32_t payload_save = XdrvMailbox.payload;
-  XdrvMailbox.payload = key << 16 | state << 8 | device;
-  XdrvCall(FUNC_ANY_KEY);
-  XdrvMailbox.payload = payload_save;
-  return result;
-}
-
-void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source)
-{
-# 483 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) {
-    blink_mask &= 1;
-    Settings.flag.interlock = 0;
-    Settings.pulse_timer[1] = 0;
-    Settings.pulse_timer[2] = 0;
-    Settings.pulse_timer[3] = 0;
-  }
-#endif
-
-  bool publish_power = true;
-  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
-    state &= 3;
-    publish_power = false;
-  }
-
-  if ((device < 1) || (device > devices_present)) {
-    device = 1;
-  }
-  active_device = device;
-
-  if (device <= MAX_PULSETIMERS) {
-    SetPulseTimer(device -1, 0);
-  }
-  power_t mask = 1 << (device -1);
-  if (state <= POWER_TOGGLE) {
-    if ((blink_mask & mask)) {
-      blink_mask &= (POWER_MASK ^ mask);
-      MqttPublishPowerBlinkState(device);
-    }
-
-    if (Settings.flag.interlock &&
-        !interlock_mutex &&
-        ((POWER_ON == state) || ((POWER_TOGGLE == state) && !(power & mask)))
-       ) {
-      interlock_mutex = true;
-      for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-        if (Settings.interlock[i] & mask) {
-          for (uint32_t j = 0; j < devices_present; j++) {
-            power_t imask = 1 << j;
-            if ((Settings.interlock[i] & imask) && (power & imask) && (mask != imask)) {
-              ExecuteCommandPower(j +1, POWER_OFF, SRC_IGNORE);
-              delay(50);
-            }
-          }
-          break;
-        }
-      }
-      interlock_mutex = false;
-    }
-
-    switch (state) {
-    case POWER_OFF: {
-      power &= (POWER_MASK ^ mask);
-      break; }
-    case POWER_ON:
-      power |= mask;
-      break;
-    case POWER_TOGGLE:
-      power ^= mask;
-    }
-    SetDevicePower(power, source);
-#ifdef USE_DOMOTICZ
-    DomoticzUpdatePowerState(device);
-#endif
-#ifdef USE_KNX
-    KnxUpdatePowerState(device, power);
-#endif
-    if (publish_power && Settings.flag3.hass_tele_on_power) {
-      MqttPublishTeleState();
-    }
-    if (device <= MAX_PULSETIMERS) {
-      SetPulseTimer(device -1, (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[device -1] : 0);
-    }
-  }
-  else if (POWER_BLINK == state) {
-    if (!(blink_mask & mask)) {
-      blink_powersave = (blink_powersave & (POWER_MASK ^ mask)) | (power & mask);
-      blink_power = (power >> (device -1))&1;
-    }
-    blink_timer = millis() + 100;
-    blink_counter = ((!Settings.blinkcount) ? 64000 : (Settings.blinkcount *2)) +1;
-    blink_mask |= mask;
-    MqttPublishPowerBlinkState(device);
-    return;
-  }
-  else if (POWER_BLINK_STOP == state) {
-    bool flag = (blink_mask & mask);
-    blink_mask &= (POWER_MASK ^ mask);
-    MqttPublishPowerBlinkState(device);
-    if (flag) {
-      ExecuteCommandPower(device, (blink_powersave >> (device -1))&1, SRC_IGNORE);
-    }
-    return;
-  }
-  if (publish_power) {
-    MqttPublishPowerState(device);
-  }
-}
-
-void StopAllPowerBlink(void)
-{
-  power_t mask;
-
-  for (uint32_t i = 1; i <= devices_present; i++) {
-    mask = 1 << (i -1);
-    if (blink_mask & mask) {
-      blink_mask &= (POWER_MASK ^ mask);
-      MqttPublishPowerBlinkState(i);
-      ExecuteCommandPower(i, (blink_powersave >> (i -1))&1, SRC_IGNORE);
-    }
-  }
-}
-
-void MqttShowPWMState(void)
-{
-  ResponseAppend_P(PSTR("\"" D_CMND_PWM "\":{"));
-  bool first = true;
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    if (pin[GPIO_PWM1 + i] < 99) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_PWM "%d\":%d"), first ? "" : ",", i+1, Settings.pwm_value[i]);
-      first = false;
-    }
-  }
-  ResponseJsonEnd();
-}
-
-void MqttShowState(void)
-{
-  char stemp1[TOPSZ];
-
-  ResponseAppendTime();
-  ResponseAppend_P(PSTR(",\"" D_JSON_UPTIME "\":\"%s\",\"UptimeSec\":%u"), GetUptime().c_str(), UpTime());
-
-#ifdef USE_ADC_VCC
-  dtostrfd((double)ESP.getVcc()/1000, 3, stemp1);
-  ResponseAppend_P(PSTR(",\"" D_JSON_VCC "\":%s"), stemp1);
-#endif
-
-  ResponseAppend_P(PSTR(",\"" D_JSON_HEAPSIZE "\":%d,\"SleepMode\":\"%s\",\"Sleep\":%u,\"LoadAvg\":%u,\"MqttCount\":%u"),
-    ESP.getFreeHeap()/1024, GetTextIndexed(stemp1, sizeof(stemp1), Settings.flag3.sleep_normal, kSleepMode),
-    sleep, loop_load_avg, MqttConnectCount());
-
-  for (uint32_t i = 1; i <= devices_present; i++) {
-#ifdef USE_LIGHT
-    if ((LightDevice()) && (i >= LightDevice())) {
-      if (i == LightDevice()) { LightState(1); }
-    } else {
-#endif
-      ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable),
-                                               GetStateText(bitRead(power, i-1)));
-#ifdef USE_SONOFF_IFAN
-      if (IsModuleIfan()) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_FANSPEED "\":%d"), GetFanspeed());
-        break;
-      }
-#endif
-#ifdef USE_LIGHT
-    }
-#endif
-  }
-
-  if (pwm_present) {
-    ResponseAppend_P(PSTR(","));
-    MqttShowPWMState();
-  }
-
-  ResponseAppend_P(PSTR(",\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_BSSID "\":\"%s\",\"" D_JSON_CHANNEL "\":%d,\"" D_JSON_RSSI "\":%d,\"" D_JSON_SIGNAL "\":%d,\"" D_JSON_LINK_COUNT "\":%d,\"" D_JSON_DOWNTIME "\":\"%s\"}}"),
-    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WiFi.BSSIDstr().c_str(), WiFi.channel(),
-    WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), WifiLinkCount(), WifiDowntime().c_str());
-}
-
-void MqttPublishTeleState(void)
-{
-  mqtt_data[0] = '\0';
-  MqttShowState();
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-  RulesTeleperiod();
-#endif
-}
-
-bool MqttShowSensor(void)
-{
-  ResponseAppendTime();
-
-  int json_data_start = strlen(mqtt_data);
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-#ifdef USE_TM1638
-    if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
-#else
-    if (pin[GPIO_SWT1 +i] < 99) {
-#endif
-      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(SwitchState(i)));
-    }
-  }
-  XsnsCall(FUNC_JSON_APPEND);
-  XdrvCall(FUNC_JSON_APPEND);
-
-  bool json_data_available = (strlen(mqtt_data) - json_data_start);
-  if (strstr_P(mqtt_data, PSTR(D_JSON_PRESSURE)) != nullptr) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
-  }
-  if (strstr_P(mqtt_data, PSTR(D_JSON_TEMPERATURE)) != nullptr) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
-  }
-  ResponseJsonEnd();
-
-  if (json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }
-  return json_data_available;
-}
-
-void MqttPublishSensor(void)
-{
-  mqtt_data[0] = '\0';
-  if (MqttShowSensor()) {
-    MqttPublishTeleSensor();
-  }
-}
-# 710 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-void PerformEverySecond(void)
-{
-  uptime++;
-
-  if (POWER_CYCLE_TIME == uptime) {
-    UpdateQuickPowerCycle(false);
-  }
-
-  if (BOOT_LOOP_TIME == uptime) {
-    RtcRebootReset();
-
-#ifdef USE_DEEPSLEEP
-    if (!(DeepSleepEnabled() && !Settings.flag3.bootcount_update)) {
-#endif
-      Settings.bootcount++;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BOOT_COUNT " %d"), Settings.bootcount);
-#ifdef USE_DEEPSLEEP
-    }
-#endif
-  }
-
-  if (mqtt_cmnd_blocked_reset) {
-    mqtt_cmnd_blocked_reset--;
-    if (!mqtt_cmnd_blocked_reset) {
-      mqtt_cmnd_blocked = 0;
-    }
-  }
-
-  if (seriallog_timer) {
-    seriallog_timer--;
-    if (!seriallog_timer) {
-      if (seriallog_level) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SERIAL_LOGGING_DISABLED));
-      }
-      seriallog_level = 0;
-    }
-  }
-
-  if (syslog_timer) {
-    syslog_timer--;
-    if (!syslog_timer) {
-      syslog_level = Settings.syslog_level;
-      if (Settings.syslog_level) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_LOGGING_REENABLED));
-      }
-    }
-  }
-
-  ResetGlobalValues();
-
-  if (Settings.tele_period) {
-    if (tele_period >= 9999) {
-      if (!global_state.wifi_down) {
-        tele_period = 0;
-      }
-    } else {
-      tele_period++;
-      if (tele_period >= Settings.tele_period) {
-        tele_period = 0;
-
-        MqttPublishTeleState();
-
-        mqtt_data[0] = '\0';
-        if (MqttShowSensor()) {
-          MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-          RulesTeleperiod();
-#endif
-        }
-
-        XdrvCall(FUNC_AFTER_TELEPERIOD);
-      }
-    }
-  }
-}
-
-
-
-
-
-void Every100mSeconds(void)
-{
-
-  power_t power_now;
-
-  if (prepped_loglevel) {
-    AddLog(prepped_loglevel);
-    prepped_loglevel = 0;
-  }
-
-  if (latching_relay_pulse) {
-    latching_relay_pulse--;
-    if (!latching_relay_pulse) SetLatchingRelay(0, 0);
-  }
-
-  for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
-    if (pulse_timer[i] != 0L) {
-      if (TimeReached(pulse_timer[i])) {
-        pulse_timer[i] = 0L;
-        ExecuteCommandPower(i +1, (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? POWER_ON : POWER_OFF, SRC_PULSETIMER);
-      }
-    }
-  }
-
-  if (blink_mask) {
-    if (TimeReached(blink_timer)) {
-      SetNextTimeInterval(blink_timer, 100 * Settings.blinktime);
-      blink_counter--;
-      if (!blink_counter) {
-        StopAllPowerBlink();
-      } else {
-        blink_power ^= 1;
-        power_now = (power & (POWER_MASK ^ blink_mask)) | ((blink_power) ? blink_mask : 0);
-        SetDevicePower(power_now, SRC_IGNORE);
-      }
-    }
-  }
-}
-
-
-
-
-
-void Every250mSeconds(void)
-{
-
-
-  uint32_t blinkinterval = 1;
-
-  state_250mS++;
-  state_250mS &= 0x3;
-
-  if (!Settings.flag.global_state) {
-    if (global_state.data) {
-      if (global_state.mqtt_down) { blinkinterval = 7; }
-      if (global_state.wifi_down) { blinkinterval = 3; }
-      blinks = 201;
-    }
-  }
-  if (blinks || restart_flag || ota_state_flag) {
-    if (restart_flag || ota_state_flag) {
-      blinkstate = true;
-    } else {
-      blinkspeed--;
-      if (!blinkspeed) {
-        blinkspeed = blinkinterval;
-        blinkstate ^= 1;
-      }
-    }
-    if ((!(Settings.ledstate &0x08)) && ((Settings.ledstate &0x06) || (blinks > 200) || (blinkstate))) {
-      SetLedLink(blinkstate);
-    }
-    if (!blinkstate) {
-      blinks--;
-      if (200 == blinks) blinks = 0;
-    }
-  }
-  if (Settings.ledstate &1 && (pin[GPIO_LEDLNK] < 99 || !(blinks || restart_flag || ota_state_flag)) ) {
-    bool tstate = power & Settings.ledmask;
-    if ((SONOFF_TOUCH == my_module_type) || (SONOFF_T11 == my_module_type) || (SONOFF_T12 == my_module_type) || (SONOFF_T13 == my_module_type)) {
-      tstate = (!power) ? 1 : 0;
-    }
-    SetLedPower(tstate);
-  }
-
-
-
-
-
-  switch (state_250mS) {
-  case 0:
-    if (ota_state_flag && BACKLOG_EMPTY) {
-      ota_state_flag--;
-      if (2 == ota_state_flag) {
-        RtcSettings.ota_loader = 0;
-        ota_retry_counter = OTA_ATTEMPTS;
-        ESPhttpUpdate.rebootOnUpdate(false);
-        SettingsSave(1);
-      }
-      if (ota_state_flag <= 0) {
-#ifdef USE_WEBSERVER
-        if (Settings.webserver) StopWebserver();
-#endif
-#ifdef USE_ARILUX_RF
-        AriluxRfDisable();
-#endif
-        ota_state_flag = 92;
-        ota_result = 0;
-        ota_retry_counter--;
-        if (ota_retry_counter) {
-          strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
-#ifndef FIRMWARE_MINIMAL
-          if (RtcSettings.ota_loader) {
-# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/support_tasmota.ino"
-            char *bch = strrchr(mqtt_data, '/');
-            if (bch == nullptr) { bch = mqtt_data; }
-
-            char *ech = strrchr(bch, '.');
-            if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
-              char *fch = ech;
-              *fch = '\0';
-              ech = strrchr(bch, '.');
-              *fch = '.';
-            }
-            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
-            char ota_url_type[strlen(ech) +1];
-            strncpy(ota_url_type, ech, sizeof(ota_url_type));
-
-            char *pch = strrchr(bch, '-');
-            if (pch == nullptr) { pch = ech; }
-            *pch = '\0';
-            snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);
-          }
-#endif
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(mqtt_data));
-#else
-
-          WiFiClient OTAclient;
-          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, mqtt_data));
-#endif
-          if (!ota_result) {
-#ifndef FIRMWARE_MINIMAL
-            int ota_error = ESPhttpUpdate.getLastError();
-            DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error);
-            if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
-              RtcSettings.ota_loader = 1;
-            }
-#endif
-            ota_state_flag = 2;
-          }
-        }
-      }
-      if (90 == ota_state_flag) {
-        ota_state_flag = 0;
-        Response_P(PSTR("{\"" D_CMND_UPGRADE "\":\""));
-        if (ota_result) {
-
-          if (!VersionCompatible()) {
-            ResponseAppend_P(PSTR(D_JSON_FAILED " " D_UPLOAD_ERR_14));
-          } else {
-            ResponseAppend_P(PSTR(D_JSON_SUCCESSFUL ". " D_JSON_RESTARTING));
-            restart_flag = 2;
-          }
-        } else {
-          ResponseAppend_P(PSTR(D_JSON_FAILED " %s"), ESPhttpUpdate.getLastErrorString().c_str());
-        }
-        ResponseAppend_P(PSTR("\"}"));
-
-        MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_UPGRADE));
-      }
-    }
-    break;
-  case 1:
-    if (MidnightNow()) {
-      XsnsCall(FUNC_SAVE_AT_MIDNIGHT);
-    }
-    if (save_data_counter && BACKLOG_EMPTY) {
-      save_data_counter--;
-      if (save_data_counter <= 0) {
-        if (Settings.flag.save_state) {
-          power_t mask = POWER_MASK;
-          for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
-            if ((Settings.pulse_timer[i] > 0) && (Settings.pulse_timer[i] < 30)) {
-              mask &= ~(1 << i);
-            }
-          }
-          if (!((Settings.power &mask) == (power &mask))) {
-            Settings.power = power;
-          }
-        } else {
-          Settings.power = 0;
-        }
-        SettingsSave(0);
-        save_data_counter = Settings.save_data;
-      }
-    }
-    if (restart_flag && BACKLOG_EMPTY) {
-      if ((214 == restart_flag) || (215 == restart_flag) || (216 == restart_flag)) {
-
-        char storage_ssid1[strlen(SettingsText(SET_STASSID1)) +1];
-        strncpy(storage_ssid1, SettingsText(SET_STASSID1), sizeof(storage_ssid1));
-        char storage_ssid2[strlen(SettingsText(SET_STASSID2)) +1];
-        strncpy(storage_ssid2, SettingsText(SET_STASSID2), sizeof(storage_ssid2));
-        char storage_pass1[strlen(SettingsText(SET_STAPWD1)) +1];
-        strncpy(storage_pass1, SettingsText(SET_STAPWD1), sizeof(storage_pass1));
-        char storage_pass2[strlen(SettingsText(SET_STAPWD2)) +1];
-        strncpy(storage_pass2, SettingsText(SET_STAPWD2), sizeof(storage_pass2));
-
-        char storage_mqtthost[strlen(SettingsText(SET_MQTT_HOST)) +1];
-        strncpy(storage_mqtthost, SettingsText(SET_MQTT_HOST), sizeof(storage_mqtthost));
-        char storage_mqttuser[strlen(SettingsText(SET_MQTT_USER)) +1];
-        strncpy(storage_mqttuser, SettingsText(SET_MQTT_USER), sizeof(storage_mqttuser));
-        char storage_mqttpwd[strlen(SettingsText(SET_MQTT_PWD)) +1];
-        strncpy(storage_mqttpwd, SettingsText(SET_MQTT_PWD), sizeof(storage_mqttpwd));
-        char storage_mqtttopic[strlen(SettingsText(SET_MQTT_TOPIC)) +1];
-        strncpy(storage_mqtttopic, SettingsText(SET_MQTT_TOPIC), sizeof(storage_mqtttopic));
-        uint16_t mqtt_port = Settings.mqtt_port;
-
-
-
-
-        if ((215 == restart_flag) || (216 == restart_flag)) {
-          SettingsErase(0);
-        }
-        SettingsDefault();
-
-        SettingsUpdateText(SET_STASSID1, storage_ssid1);
-        SettingsUpdateText(SET_STASSID2, storage_ssid2);
-        SettingsUpdateText(SET_STAPWD1, storage_pass1);
-        SettingsUpdateText(SET_STAPWD2, storage_pass2);
-        if (216 == restart_flag) {
-
-          SettingsUpdateText(SET_MQTT_HOST, storage_mqtthost);
-          SettingsUpdateText(SET_MQTT_USER, storage_mqttuser);
-          SettingsUpdateText(SET_MQTT_PWD, storage_mqttpwd);
-          SettingsUpdateText(SET_MQTT_TOPIC, storage_mqtttopic);
-          Settings.mqtt_port = mqtt_port;
-        }
-        restart_flag = 2;
-      }
-      else if (213 == restart_flag) {
-        SettingsSdkErase();
-        restart_flag = 2;
-      }
-      else if (212 == restart_flag) {
-        SettingsErase(0);
-        restart_flag = 211;
-      }
-      if (211 == restart_flag) {
-        SettingsDefault();
-        restart_flag = 2;
-      }
-      if (2 == restart_flag) {
-        SettingsSaveAll();
-      }
-      restart_flag--;
-      if (restart_flag <= 0) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
-        EspRestart();
-      }
-    }
-    break;
-  case 2:
-    WifiCheck(wifi_state_flag);
-    wifi_state_flag = WIFI_RESTART;
-    break;
-  case 3:
-    if (!global_state.wifi_down) { MqttCheck(); }
-    break;
-  }
-}
-
-#ifdef USE_ARDUINO_OTA
-
-
-
-
-
-
-
-bool arduino_ota_triggered = false;
-uint16_t arduino_ota_progress_dot_count = 0;
-
-void ArduinoOTAInit(void)
-{
-  ArduinoOTA.setPort(8266);
-  ArduinoOTA.setHostname(my_hostname);
-  if (strlen(SettingsText(SET_WEBPWD))) {
-    ArduinoOTA.setPassword(SettingsText(SET_WEBPWD));
-  }
-
-  ArduinoOTA.onStart([]()
-  {
-    SettingsSave(1);
-#ifdef USE_WEBSERVER
-    if (Settings.webserver) { StopWebserver(); }
-#endif
-#ifdef USE_ARILUX_RF
-    AriluxRfDisable();
-#endif
-    if (Settings.flag.mqtt_enabled) {
-      MqttDisconnect();
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_UPLOAD_STARTED));
-    arduino_ota_triggered = true;
-    arduino_ota_progress_dot_count = 0;
-    delay(100);
-  });
-
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
-  {
-    if ((LOG_LEVEL_DEBUG <= seriallog_level)) {
-      arduino_ota_progress_dot_count++;
-      Serial.printf(".");
-      if (!(arduino_ota_progress_dot_count % 80)) { Serial.println(); }
-    }
-  });
-
-  ArduinoOTA.onError([](ota_error_t error)
-  {
-
-
-
-
-    char error_str[100];
-
-    if ((LOG_LEVEL_DEBUG <= seriallog_level) && arduino_ota_progress_dot_count) { Serial.println(); }
-    switch (error) {
-      case OTA_BEGIN_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_2), sizeof(error_str)); break;
-      case OTA_RECEIVE_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_5), sizeof(error_str)); break;
-      case OTA_END_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_7), sizeof(error_str)); break;
-      default:
-        snprintf_P(error_str, sizeof(error_str), PSTR(D_UPLOAD_ERROR_CODE " %d"), error);
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA  %s. " D_RESTARTING), error_str);
-    EspRestart();
-  });
-
-  ArduinoOTA.onEnd([]()
-  {
-    if ((LOG_LEVEL_DEBUG <= seriallog_level)) { Serial.println(); }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_SUCCESSFUL ". " D_RESTARTING));
-    EspRestart();
- });
-
-  ArduinoOTA.begin();
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266"));
-}
-
-void ArduinoOtaLoop(void)
-{
-  MDNS.update();
-  ArduinoOTA.handle();
-
-  while (arduino_ota_triggered) { ArduinoOTA.handle(); }
-}
-#endif
-
-
-
-void SerialInput(void)
-{
-  while (Serial.available()) {
-
-    delay(0);
-    serial_in_byte = Serial.read();
-
-
-
-
-    if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-      serial_in_byte = ButtonSerial(serial_in_byte);
-    }
-
-
-
-    if (XdrvCall(FUNC_SERIAL)) {
-      serial_in_byte_counter = 0;
-      Serial.flush();
-      return;
-    }
-
-
-
-    if (serial_in_byte > 127 && !Settings.flag.mqtt_serial_raw) {
-      serial_in_byte_counter = 0;
-      Serial.flush();
-      return;
-    }
-    if (!Settings.flag.mqtt_serial) {
-      if (isprint(serial_in_byte)) {
-        if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) {
-          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-        } else {
-          serial_in_byte_counter = 0;
-        }
-      }
-    } else {
-      if (serial_in_byte || Settings.flag.mqtt_serial_raw) {
-        if ((serial_in_byte_counter < INPUT_BUFFER_SIZE -1) &&
-            ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
-            ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
-              Settings.flag.mqtt_serial_raw)) {
-          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-          serial_polling_window = millis();
-        } else {
-          serial_polling_window = 0;
-          break;
-        }
-      }
-    }
-
-#ifdef USE_SONOFF_SC
-
-
-
-    if (SONOFF_SC == my_module_type) {
-      if (serial_in_byte == '\x1B') {
-        serial_in_buffer[serial_in_byte_counter] = 0;
-        SonoffScSerialInput(serial_in_buffer);
-        serial_in_byte_counter = 0;
-        Serial.flush();
-        return;
-      }
-    } else
-#endif
-
-
-    if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) {
-      serial_in_buffer[serial_in_byte_counter] = 0;
-      seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (uint8_t)LOG_LEVEL_INFO : Settings.seriallog_level;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), serial_in_buffer);
-      ExecuteCommand(serial_in_buffer, SRC_SERIAL);
-      serial_in_byte_counter = 0;
-      serial_polling_window = 0;
-      Serial.flush();
-      return;
-    }
-  }
-
-  if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) {
-    serial_in_buffer[serial_in_byte_counter] = 0;
-    char hex_char[(serial_in_byte_counter * 2) + 2];
-    bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
-    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
-      (assume_json) ? "" : """",
-      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
-      (assume_json) ? "" : """");
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
-    XdrvRulesProcess();
-    serial_in_byte_counter = 0;
-  }
-}
-
-
-
-void GpioInit(void)
-{
-  uint32_t mpin;
-
-  if (!ValidModule(Settings.module)) {
-    uint32_t module = MODULE;
-    if (!ValidModule(MODULE)) { module = SONOFF_BASIC; }
-    Settings.module = module;
-    Settings.last_module = module;
-  }
-  SetModuleType();
-
-  if (Settings.module != Settings.last_module) {
-    Settings.baudrate = APP_BAUDRATE / 300;
-    Settings.serial_config = TS_SERIAL_8N1;
-  }
-
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    if ((Settings.user_template.gp.io[i] >= GPIO_SENSOR_END) && (Settings.user_template.gp.io[i] < GPIO_USER)) {
-      Settings.user_template.gp.io[i] = GPIO_USER;
-    }
-  }
-
-  myio def_gp;
-  ModuleGpios(&def_gp);
-  for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-    if ((Settings.my_gp.io[i] >= GPIO_SENSOR_END) && (Settings.my_gp.io[i] < GPIO_USER)) {
-      Settings.my_gp.io[i] = GPIO_NONE;
-    }
-    else if (Settings.my_gp.io[i] > GPIO_NONE) {
-      my_module.io[i] = Settings.my_gp.io[i];
-    }
-    if ((def_gp.io[i] > GPIO_NONE) && (def_gp.io[i] < GPIO_USER)) {
-      my_module.io[i] = def_gp.io[i];
-    }
-  }
-  if ((Settings.my_adc0 >= ADC0_END) && (Settings.my_adc0 < ADC0_USER)) {
-    Settings.my_adc0 = ADC0_NONE;
-  }
-  else if (Settings.my_adc0 > ADC0_NONE) {
-    my_adc0 = Settings.my_adc0;
-  }
-  my_module_flag = ModuleFlag();
-  uint32_t template_adc0 = my_module_flag.data &15;
-  if ((template_adc0 > ADC0_NONE) && (template_adc0 < ADC0_USER)) {
-    my_adc0 = template_adc0;
-  }
-
-  for (uint32_t i = 0; i < GPIO_MAX; i++) {
-    pin[i] = 99;
-  }
-  for (uint32_t i = 0; i < sizeof(my_module.io); i++) {
-    mpin = ValidPin(i, my_module.io[i]);
-
-    DEBUG_CORE_LOG(PSTR("INI: gpio pin %d, mpin %d"), i, mpin);
-
-    if (mpin) {
-      XdrvMailbox.index = mpin;
-      XdrvMailbox.payload = i;
-
-      if ((mpin >= GPIO_SWT1_NP) && (mpin < (GPIO_SWT1_NP + MAX_SWITCHES))) {
-        SwitchPullupFlag(mpin - GPIO_SWT1_NP);
-        mpin -= (GPIO_SWT1_NP - GPIO_SWT1);
-      }
-      else if ((mpin >= GPIO_KEY1_NP) && (mpin < (GPIO_KEY1_NP + MAX_KEYS))) {
-        ButtonPullupFlag(mpin - GPIO_KEY1_NP);
-        mpin -= (GPIO_KEY1_NP - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_KEY1_INV) && (mpin < (GPIO_KEY1_INV + MAX_KEYS))) {
-        ButtonInvertFlag(mpin - GPIO_KEY1_INV);
-        mpin -= (GPIO_KEY1_INV - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_KEY1_INV_NP) && (mpin < (GPIO_KEY1_INV_NP + MAX_KEYS))) {
-        ButtonPullupFlag(mpin - GPIO_KEY1_INV_NP);
-        ButtonInvertFlag(mpin - GPIO_KEY1_INV_NP);
-        mpin -= (GPIO_KEY1_INV_NP - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_REL1_INV) && (mpin < (GPIO_REL1_INV + MAX_RELAYS))) {
-        bitSet(rel_inverted, mpin - GPIO_REL1_INV);
-        mpin -= (GPIO_REL1_INV - GPIO_REL1);
-      }
-      else if ((mpin >= GPIO_LED1_INV) && (mpin < (GPIO_LED1_INV + MAX_LEDS))) {
-        bitSet(led_inverted, mpin - GPIO_LED1_INV);
-        mpin -= (GPIO_LED1_INV - GPIO_LED1);
-      }
-      else if (mpin == GPIO_LEDLNK_INV) {
-        ledlnk_inverted = 1;
-        mpin -= (GPIO_LEDLNK_INV - GPIO_LEDLNK);
-      }
-      else if ((mpin >= GPIO_PWM1_INV) && (mpin < (GPIO_PWM1_INV + MAX_PWMS))) {
-        bitSet(pwm_inverted, mpin - GPIO_PWM1_INV);
-        mpin -= (GPIO_PWM1_INV - GPIO_PWM1);
-      }
-      else if (XdrvCall(FUNC_PIN_STATE)) {
-        mpin = XdrvMailbox.index;
-      }
-      else if (XsnsCall(FUNC_PIN_STATE)) {
-        mpin = XdrvMailbox.index;
-      };
-    }
-    if (mpin) pin[mpin] = i;
-  }
-
-  if ((2 == pin[GPIO_TXD]) || (H801 == my_module_type)) { Serial.set_tx(2); }
-
-  analogWriteRange(Settings.pwm_range);
-  analogWriteFreq(Settings.pwm_frequency);
-
-#ifdef USE_SPI
-  spi_flg = ((((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CS] > 14)) || (pin[GPIO_SPI_CS] < 12)) || (((pin[GPIO_SPI_DC] < 99) && (pin[GPIO_SPI_DC] > 14)) || (pin[GPIO_SPI_DC] < 12)));
-  if (spi_flg) {
-    for (uint32_t i = 0; i < GPIO_MAX; i++) {
-      if ((pin[i] >= 12) && (pin[i] <=14)) pin[i] = 99;
-    }
-    my_module.io[12] = GPIO_SPI_MISO;
-    pin[GPIO_SPI_MISO] = 12;
-    my_module.io[13] = GPIO_SPI_MOSI;
-    pin[GPIO_SPI_MOSI] = 13;
-    my_module.io[14] = GPIO_SPI_CLK;
-    pin[GPIO_SPI_CLK] = 14;
-  }
-  soft_spi_flg = ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && ((pin[GPIO_SSPI_MOSI] < 99) || (pin[GPIO_SSPI_MOSI] < 99)));
-#endif
-
-#ifdef USE_I2C
-  i2c_flg = ((pin[GPIO_I2C_SCL] < 99) && (pin[GPIO_I2C_SDA] < 99));
-  if (i2c_flg) {
-    Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]);
-  }
-#endif
-
-  devices_present = 0;
-  light_type = LT_BASIC;
-  if (XdrvCall(FUNC_MODULE_INIT)) {
-
-  }
-  else if (YTF_IR_BRIDGE == my_module_type) {
-    ClaimSerial();
-
-  }
-  else if (SONOFF_DUAL == my_module_type) {
-    devices_present = 2;
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-  else if (CH4 == my_module_type) {
-    devices_present = 4;
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-#ifdef USE_SONOFF_SC
-  else if (SONOFF_SC == my_module_type) {
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-#endif
-
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    if (pin[GPIO_PWM1 +i] < 99) {
-      pinMode(pin[GPIO_PWM1 +i], OUTPUT);
-      if (light_type) {
-
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range : 0);
-      } else {
-        pwm_present = true;
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - Settings.pwm_value[i] : Settings.pwm_value[i]);
-      }
-    }
-  }
-
-  for (uint32_t i = 0; i < MAX_RELAYS; i++) {
-    if (pin[GPIO_REL1 +i] < 99) {
-      pinMode(pin[GPIO_REL1 +i], OUTPUT);
-      devices_present++;
-      if (EXS_RELAY == my_module_type) {
-        digitalWrite(pin[GPIO_REL1 +i], bitRead(rel_inverted, i) ? 1 : 0);
-        if (i &1) { devices_present--; }
-      }
-    }
-  }
-
-  for (uint32_t i = 0; i < MAX_LEDS; i++) {
-    if (pin[GPIO_LED1 +i] < 99) {
-#ifdef USE_ARILUX_RF
-      if ((3 == i) && (leds_present < 2) && (99 == pin[GPIO_ARIRFSEL])) {
-        pin[GPIO_ARIRFSEL] = pin[GPIO_LED4];
-        pin[GPIO_LED4] = 99;
-      } else {
-#endif
-        pinMode(pin[GPIO_LED1 +i], OUTPUT);
-        leds_present++;
-        digitalWrite(pin[GPIO_LED1 +i], bitRead(led_inverted, i));
-#ifdef USE_ARILUX_RF
-      }
-#endif
-    }
-  }
-  if (pin[GPIO_LEDLNK] < 99) {
-    pinMode(pin[GPIO_LEDLNK], OUTPUT);
-    digitalWrite(pin[GPIO_LEDLNK], ledlnk_inverted);
-  }
-
-  ButtonInit();
-  SwitchInit();
-#ifdef ROTARY_V1
-  RotaryInit();
-#endif
-
-  SetLedPower(Settings.ledstate &8);
-  SetLedLink(Settings.ledstate &8);
-
-  XdrvCall(FUNC_PRE_INIT);
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_udp.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/support_udp.ino"
-#ifdef USE_EMULATION
-
-#define UDP_BUFFER_SIZE 200
-#define UDP_MSEARCH_SEND_DELAY 1500
-
-#include <Ticker.h>
-Ticker TickerMSearch;
-
-IPAddress udp_remote_ip;
-uint16_t udp_remote_port;
-
-bool udp_connected = false;
-bool udp_response_mutex = false;
-
-
-
-
-
-const char URN_BELKIN_DEVICE[] PROGMEM = "urn:belkin:device:**";
-const char URN_BELKIN_DEVICE_CAP[] PROGMEM = "urn:Belkin:device:**";
-const char UPNP_ROOTDEVICE[] PROGMEM = "upnp:rootdevice";
-const char SSDPSEARCH_ALL[] PROGMEM = "ssdpsearch:all";
-const char SSDP_ALL[] PROGMEM = "ssdp:all";
-
-
-
-
-
-bool UdpDisconnect(void)
-{
-  if (udp_connected) {
-    PortUdp.flush();
-    WiFiUDP::stopAll();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_MULTICAST_DISABLED));
-    udp_connected = false;
-  }
-  return udp_connected;
-}
-
-bool UdpConnect(void)
-{
-  if (!udp_connected) {
-
-    if (PortUdp.beginMulticast(WiFi.localIP(), IPAddress(239,255,255,250), 1900)) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_REJOINED));
-      udp_response_mutex = false;
-      udp_connected = true;
-    } else {
-      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_JOIN_FAILED));
-      udp_connected = false;
-    }
-  }
-  return udp_connected;
-}
-
-void PollUdp(void)
-{
-  if (udp_connected) {
-    while (PortUdp.parsePacket()) {
-      char packet_buffer[UDP_BUFFER_SIZE];
-
-      int len = PortUdp.read(packet_buffer, UDP_BUFFER_SIZE -1);
-      packet_buffer[len] = 0;
-
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("UDP: Packet (%d)"), len);
-
-
-
-#ifdef USE_SCRIPT_HUE
-      if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
-#else
-      if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
-#endif
-        udp_response_mutex = true;
-
-        udp_remote_ip = PortUdp.remoteIP();
-        udp_remote_port = PortUdp.remotePort();
-
-
-
-
-        uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);
-
-        LowerCase(packet_buffer, packet_buffer);
-        RemoveSpace(packet_buffer);
-
-#ifdef USE_EMULATION_WEMO
-        if (EMUL_WEMO == Settings.flag2.emulation) {
-          if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {
-            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
-            return;
-          }
-          else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
-                   (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-                   (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
-            return;
-          }
-        }
-#endif
-
-#ifdef USE_EMULATION_HUE
-        if (EMUL_HUE == Settings.flag2.emulation) {
-          if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
-              (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
-              (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-              (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-            TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
-            return;
-          }
-        }
-#endif
-
-        udp_response_mutex = false;
-      }
-
-    }
-    optimistic_yield(100);
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
-# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
-#ifndef WIFI_RSSI_THRESHOLD
-
-#define WIFI_RSSI_THRESHOLD 5
-#endif
-#ifndef WIFI_RESCAN_MINUTES
-
-#define WIFI_RESCAN_MINUTES 5
-#endif
-
-const uint8_t WIFI_CONFIG_SEC = 180;
-
-const uint8_t WIFI_CHECK_SEC = 5;
-const uint8_t WIFI_RETRY_OFFSET_SEC = 20;
-
-#include <ESP8266WiFi.h>
-#if LWIP_IPV6
-#include <AddrList.h>
-#endif
-
-struct WIFI {
-  uint32_t last_event = 0;
-  uint32_t downtime = 0;
-  uint16_t link_count = 0;
-  uint8_t counter;
-  uint8_t retry_init;
-  uint8_t retry;
-  uint8_t status;
-  uint8_t config_type = 0;
-  uint8_t config_counter = 0;
-  uint8_t mdns_begun = 0;
-  uint8_t scan_state;
-  uint8_t bssid[6] = {0};
-  uint8_t bssid_last[6] = {0};
-  int8_t best_network_db;
-} Wifi;
-
-int WifiGetRssiAsQuality(int rssi)
-{
-  int quality = 0;
-
-  if (rssi <= -100) {
-    quality = 0;
-  } else if (rssi >= -50) {
-    quality = 100;
-  } else {
-    quality = 2 * (rssi + 100);
-  }
-  return quality;
-}
-
-bool WifiConfigCounter(void)
-{
-  if (Wifi.config_counter) {
-    Wifi.config_counter = WIFI_CONFIG_SEC;
-  }
-  return (Wifi.config_counter);
-}
-
-void WifiConfig(uint8_t type)
-{
-  if (!Wifi.config_type) {
-    if ((WIFI_RETRY == type) || (WIFI_WAIT == type)) { return; }
-#ifdef USE_EMULATION
-    UdpDisconnect();
-#endif
-    WiFi.disconnect();
-    Wifi.config_type = type;
-
-#ifndef USE_WEBSERVER
-    if (WIFI_MANAGER == Wifi.config_type) {
-      Wifi.config_type = WIFI_SERIAL;
-    }
-#endif
-
-    Wifi.config_counter = WIFI_CONFIG_SEC;
-    Wifi.counter = Wifi.config_counter +5;
-    blinks = 1999;
-    if (WIFI_RESTART == Wifi.config_type) {
-      restart_flag = 2;
-    }
-    else if (WIFI_SERIAL == Wifi.config_type) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_6_SERIAL " " D_ACTIVE_FOR_3_MINUTES));
-    }
-#ifdef USE_WEBSERVER
-    else if (WIFI_MANAGER == Wifi.config_type || WIFI_MANAGER_RESET_ONLY == Wifi.config_type) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_2_WIFIMANAGER " " D_ACTIVE_FOR_3_MINUTES));
-      WifiManagerBegin(WIFI_MANAGER_RESET_ONLY == Wifi.config_type);
-    }
-#endif
-  }
-}
-
-void WifiSetMode(WiFiMode_t wifi_mode)
-{
-  if (WiFi.getMode() == wifi_mode) { return; }
-
-  if (wifi_mode != WIFI_OFF) {
-
-    WiFi.forceSleepWake();
-    delay(100);
-  }
-
-  uint32_t retry = 2;
-  while (!WiFi.mode(wifi_mode) && retry--) {
-    AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR("Retry set Mode..."));
-    delay(100);
-  }
-
-  if (wifi_mode == WIFI_OFF) {
-    delay(1000);
-    WiFi.forceSleepBegin();
-    delay(1);
-  } else {
-    delay(30);
-  }
-}
-
-void WiFiSetSleepMode(void)
-{
-# 156 "C:/shared/sonoff/Git/Tasmota/tasmota/support_wifi.ino"
-#if defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-#else
-  if (sleep && Settings.flag3.sleep_normal) {
-    WiFi.setSleepMode(WIFI_LIGHT_SLEEP);
-  } else {
-    WiFi.setSleepMode(WIFI_MODEM_SLEEP);
-  }
-#endif
-  WifiSetOutputPower();
-}
-
-void WifiBegin(uint8_t flag, uint8_t channel)
-{
-  const char kWifiPhyMode[] = " BGN";
-
-#ifdef USE_EMULATION
-  UdpDisconnect();
-#endif
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_PATCH_ISSUE_2186));
-
-  WifiSetMode(WIFI_OFF);
-#endif
-
-  WiFi.persistent(false);
-  WiFi.disconnect(true);
-  delay(200);
-
-  WifiSetMode(WIFI_STA);
-  WiFiSetSleepMode();
-
-
-  if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
-
-
-
-
-
-  switch (flag) {
-  case 0:
-  case 1:
-    Settings.sta_active = flag;
-    break;
-  case 2:
-    Settings.sta_active ^= 1;
-  }
-  if (!strlen(SettingsText(SET_STASSID1 + Settings.sta_active))) {
-    Settings.sta_active ^= 1;
-  }
-  if (Settings.ip_address[0]) {
-    WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]);
-  }
-  WiFi.hostname(my_hostname);
-
-  char stemp[40] = { 0 };
-  if (channel) {
-    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
-
-    char hex_char[18];
-    snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
-  } else {
-    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
-    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
-
-#if LWIP_IPV6
-  for (bool configured = false; !configured;) {
-    uint16_t cfgcnt = 0;
-    for (auto addr : addrList) {
-      if ((configured = !addr.isLocal() && addr.isV6()) || cfgcnt==30) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI "Got IPv6 global address %s"), addr.toString().c_str());
-        break;
-      }
-      delay(500);
-      cfgcnt++;
-    }
-  }
-#endif
-}
-
-void WifiBeginAfterScan(void)
-{
-
-  if (0 == Wifi.scan_state) { return; }
-
-  if (1 == Wifi.scan_state) {
-    memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
-    Wifi.best_network_db = -127;
-    Wifi.scan_state = 3;
-  }
-
-  if (2 == Wifi.scan_state) {
-    uint8_t* bssid = WiFi.BSSID();
-    memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
-    Wifi.best_network_db = WiFi.RSSI();
-    if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
-      Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
-    }
-    Wifi.scan_state = 3;
-  }
-
-  if (3 == Wifi.scan_state) {
-    if (WiFi.scanComplete() != WIFI_SCAN_RUNNING) {
-      WiFi.scanNetworks(true);
-      Wifi.scan_state++;
-      AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR("Network (re)scan started..."));
-      return;
-    }
-  }
-  int8_t wifi_scan_result = WiFi.scanComplete();
-
-  if (4 == Wifi.scan_state) {
-    if (wifi_scan_result != WIFI_SCAN_RUNNING) {
-      Wifi.scan_state++;
-    }
-  }
-
-  if (5 == Wifi.scan_state) {
-    uint32_t number_known = 0;
-    int32_t channel_max = 0;
-    int8_t ap_max = 3;
-    uint8_t bssid_max[6];
-    memcpy((void*) &bssid_max, (void*) &Wifi.bssid, sizeof(bssid_max));
-
-    int32_t channel = 0;
-    int8_t ap = 3;
-    uint8_t last_bssid[6];
-    memcpy((void*) &last_bssid, (void*) &Wifi.bssid, sizeof(last_bssid));
-
-    if (wifi_scan_result > 0) {
-
-      for (uint32_t i = 0; i < wifi_scan_result; ++i) {
-
-        String ssid_scan;
-        int32_t rssi_scan;
-        uint8_t sec_scan;
-        uint8_t* bssid_scan;
-        int32_t chan_scan;
-        bool hidden_scan;
-
-        WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, bssid_scan, chan_scan, hidden_scan);
-
-        bool known = false;
-        uint32_t j;
-        for (j = 0; j < MAX_SSIDS; j++) {
-          if (ssid_scan == SettingsText(SET_STASSID1 + j)) {
-            known = true;
-            number_known++;
-            if (rssi_scan > Wifi.best_network_db) {
-              if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {
-
-                memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
-                channel_max = chan_scan;
-                ap_max = j;
-
-                for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
-                  if (bssid_scan[i] != Wifi.bssid_last[i]) {
-                    Wifi.best_network_db = (int8_t)rssi_scan;
-                    channel = chan_scan;
-                    ap = j;
-                    memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
-
-                    memcpy((void*) &Wifi.bssid_last, (void*) bssid_scan, sizeof(Wifi.bssid_last));
-                   break;
-                  }
-                }
-              }
-            }
-            break;
-          }
-        }
-        char hex_char[18];
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Network %d, AP%c, SSId %s, Channel %d, BSSId %s, RSSI %d, Encryption %d"),
-          i,
-          (known) ? (j) ? '2' : '1' : '-',
-          ssid_scan.c_str(),
-          chan_scan,
-          ToHex_P((unsigned char*)bssid_scan, 6, hex_char, sizeof(hex_char), ':'),
-          rssi_scan,
-          (sec_scan == ENC_TYPE_NONE) ? 0 : 1);
-        delay(0);
-      }
-      WiFi.scanDelete();
-      delay(0);
-    }
-
-
-    if (number_known == 1) {
-
-      memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
-      memcpy((void*) &Wifi.bssid, (void*) bssid_max, sizeof(Wifi.bssid));
-      channel = channel_max;
-      ap = ap_max;
-    }
-
-    Wifi.scan_state = 0;
-
-    for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
-      if (last_bssid[i] != Wifi.bssid[i]) {
-        WifiBegin(ap, channel);
-        break;
-      }
-    }
-  }
-}
-
-uint16_t WifiLinkCount(void)
-{
-  return Wifi.link_count;
-}
-
-String WifiDowntime(void)
-{
-  return GetDuration(Wifi.downtime);
-}
-
-void WifiSetState(uint8_t state)
-{
-  if (state == global_state.wifi_down) {
-    if (state) {
-      rules_flag.wifi_connected = 1;
-      Wifi.link_count++;
-      Wifi.downtime += UpTime() - Wifi.last_event;
-    } else {
-      rules_flag.wifi_disconnected = 1;
-      Wifi.last_event = UpTime();
-    }
-  }
-  global_state.wifi_down = state ^1;
-}
-
-#if LWIP_IPV6
-bool WifiCheckIPv6(void)
-{
-  bool ipv6_global=false;
-
-  for (auto a : addrList) {
-    if(!a.isLocal() && a.isV6()) ipv6_global=true;
-  }
-  return ipv6_global;
-}
-
-String WifiGetIPv6(void)
-{
-  for (auto a : addrList) {
-    if(!a.isLocal() && a.isV6()) return a.toString();
-  }
-  return "";
-}
-
-bool WifiCheckIPAddrStatus(void)
-{
-  bool ip_global=false;
-
-  for (auto a : addrList) {
-    if(!a.isLocal()) ip_global=true;
-  }
-  return ip_global;
-}
-#endif
-
-void WifiCheckIp(void)
-{
-#if LWIP_IPV6
-  if(WifiCheckIPAddrStatus()) {
-    Wifi.status = WL_CONNECTED;
-#else
-  if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
-#endif
-
-    memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
-    WifiSetState(1);
-    Wifi.counter = WIFI_CHECK_SEC;
-    Wifi.retry = Wifi.retry_init;
-    if (Wifi.status != WL_CONNECTED) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
-    }
-    Wifi.status = WL_CONNECTED;
-#ifdef USE_DISCOVERY
-#ifdef WEBSERVER_ADVERTISE
-    if (2 == Wifi.mdns_begun) {
-      MDNS.update();
-      AddLog_P(LOG_LEVEL_DEBUG_MORE, D_LOG_MDNS, "MDNS.update");
-    }
-#endif
-#endif
-  } else {
-    WifiSetState(0);
-    uint8_t wifi_config_tool = Settings.sta_config;
-    Wifi.status = WiFi.status();
-    switch (Wifi.status) {
-      case WL_CONNECTED:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
-
-
-        wifi_station_dhcpc_start();
-        break;
-      case WL_NO_SSID_AVAIL:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
-
-        if (WIFI_WAIT == Settings.sta_config) {
-          Wifi.retry = Wifi.retry_init;
-        } else {
-          if (Wifi.retry > (Wifi.retry_init / 2)) {
-            Wifi.retry = Wifi.retry_init / 2;
-          }
-          else if (Wifi.retry) {
-            Wifi.retry = 0;
-          }
-        }
-
-        break;
-      case WL_CONNECT_FAILED:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
-
-        if (Wifi.retry > (Wifi.retry_init / 2)) {
-          Wifi.retry = Wifi.retry_init / 2;
-        }
-        else if (Wifi.retry) {
-          Wifi.retry = 0;
-        }
-
-        break;
-      default:
-
-        if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
-          AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
-        } else {
-          if (!strlen(SettingsText(SET_STASSID1)) && !strlen(SettingsText(SET_STASSID2))) {
-            wifi_config_tool = WIFI_MANAGER;
-            Wifi.retry = 0;
-          } else {
-            AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION));
-          }
-        }
-    }
-
-    if (Wifi.retry) {
-      if (Settings.flag3.use_wifi_scan) {
-
-        if ((Wifi.retry_init == Wifi.retry) || ((Wifi.retry_init / 2) == Wifi.retry)){
-          Wifi.scan_state = 1;
-        }
-      } else {
-        if (Wifi.retry_init == Wifi.retry) {
-          WifiBegin(3, 0);
-        }
-        if ((Settings.sta_config != WIFI_WAIT) && ((Wifi.retry_init / 2) == Wifi.retry)) {
-          WifiBegin(2, 0);
-        }
-      }
-      Wifi.counter = 1;
-      Wifi.retry--;
-    } else {
-      WifiConfig(wifi_config_tool);
-      Wifi.counter = 1;
-      Wifi.retry = Wifi.retry_init;
-    }
-  }
-}
-
-void WifiCheck(uint8_t param)
-{
-  Wifi.counter--;
-  switch (param) {
-  case WIFI_SERIAL:
-  case WIFI_MANAGER:
-    WifiConfig(param);
-    break;
-  default:
-    if (Wifi.config_counter) {
-      Wifi.config_counter--;
-      Wifi.counter = Wifi.config_counter +5;
-      if (Wifi.config_counter) {
-        if (!Wifi.config_counter) {
-          if (strlen(WiFi.SSID().c_str())) {
-            SettingsUpdateText(SET_STASSID1, WiFi.SSID().c_str());
-          }
-          if (strlen(WiFi.psk().c_str())) {
-            SettingsUpdateText(SET_STAPWD1, WiFi.psk().c_str());
-          }
-          Settings.sta_active = 0;
-          AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_WCFG_2_WIFIMANAGER D_CMND_SSID "1 %s"), SettingsText(SET_STASSID1));
-        }
-      }
-      if (!Wifi.config_counter) {
-
-        restart_flag = 2;
-      }
-    } else {
-      if (Wifi.scan_state) { WifiBeginAfterScan(); }
-
-      if (Wifi.counter <= 0) {
-        AddLog_P(LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CHECKING_CONNECTION));
-        Wifi.counter = WIFI_CHECK_SEC;
-        WifiCheckIp();
-      }
-#if LWIP_IPV6
-      if (WifiCheckIPAddrStatus()) {
-#else
-      if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0) && !Wifi.config_type) {
-#endif
-        WifiSetState(1);
-
-        if (Settings.flag3.use_wifi_rescan) {
-          if (!(uptime % (60 * WIFI_RESCAN_MINUTES))) {
-            Wifi.scan_state = 2;
-          }
-        }
-
-#ifdef FIRMWARE_MINIMAL
-        if (1 == RtcSettings.ota_loader) {
-          RtcSettings.ota_loader = 0;
-          ota_state_flag = 3;
-        }
-#endif
-
-#ifdef USE_DISCOVERY
-        if (Settings.flag3.mdns_enabled) {
-          if (!Wifi.mdns_begun) {
-
-
-
-
-
-              Wifi.mdns_begun = (uint8_t)MDNS.begin(my_hostname);
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s"), (Wifi.mdns_begun) ? D_INITIALIZED : D_FAILED);
-
-          }
-        }
-#endif
-
-#ifdef USE_WEBSERVER
-        if (Settings.webserver) {
-          StartWebserver(Settings.webserver, WiFi.localIP());
-#ifdef USE_DISCOVERY
-#ifdef WEBSERVER_ADVERTISE
-          if (1 == Wifi.mdns_begun) {
-            Wifi.mdns_begun = 2;
-            MDNS.addService("http", "tcp", WEB_PORT);
-          }
-#endif
-#endif
-        } else {
-          StopWebserver();
-        }
-#ifdef USE_EMULATION
-        if (Settings.flag2.emulation) { UdpConnect(); }
-#endif
-#endif
-
-#ifdef USE_KNX
-        if (!knx_started && Settings.flag.knx_enabled) {
-          KNXStart();
-          knx_started = true;
-        }
-#endif
-
-      } else {
-        WifiSetState(0);
-#ifdef USE_EMULATION
-        UdpDisconnect();
-#endif
-        Wifi.mdns_begun = 0;
-#ifdef USE_KNX
-        knx_started = false;
-#endif
-      }
-    }
-  }
-}
-
-int WifiState(void)
-{
-  int state = -1;
-
-  if (!global_state.wifi_down) { state = WIFI_RESTART; }
-  if (Wifi.config_type) { state = Wifi.config_type; }
-  return state;
-}
-
-String WifiGetOutputPower(void)
-{
-  char stemp1[TOPSZ];
-  dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
-  return String(stemp1);
-}
-void WifiSetOutputPower(void)
-{
-  WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
-}
-
-void WifiConnect(void)
-{
-  WifiSetState(0);
-  WifiSetOutputPower();
-  WiFi.persistent(false);
-  Wifi.status = 0;
-
-
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);
-  Wifi.retry = Wifi.retry_init;
-  Wifi.counter = 1;
-}
-
-
-
-void WifiDisconnect(void)
-{
-
-  WiFi.persistent(true);
-  ETS_UART_INTR_DISABLE();
-  wifi_station_disconnect();
-  ETS_UART_INTR_ENABLE();
-  WiFi.persistent(false);
-}
-
-void WifiShutdown(void)
-{
-  delay(100);
-  if (Settings.flag.mqtt_enabled) {
-    MqttDisconnect();
-  }
-  WifiDisconnect();
-}
-
-void EspRestart(void)
-{
-  WifiShutdown();
-  CrashDumpClear();
-
-  ESP.reset();
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
-# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
-#ifdef USE_MQTT_TLS_CA_CERT
-
-#ifndef USE_MQTT_AWS_IOT
-# 38 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
-static const unsigned char PROGMEM TA0_DN[] = {
- 0x30, 0x4A, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
- 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0A,
- 0x13, 0x0D, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
- 0x79, 0x70, 0x74, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03,
- 0x13, 0x1A, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
- 0x79, 0x70, 0x74, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74,
- 0x79, 0x20, 0x58, 0x33
-};
-
-static const unsigned char PROGMEM TA0_RSA_N[] = {
- 0x9C, 0xD3, 0x0C, 0xF0, 0x5A, 0xE5, 0x2E, 0x47, 0xB7, 0x72, 0x5D, 0x37,
- 0x83, 0xB3, 0x68, 0x63, 0x30, 0xEA, 0xD7, 0x35, 0x26, 0x19, 0x25, 0xE1,
- 0xBD, 0xBE, 0x35, 0xF1, 0x70, 0x92, 0x2F, 0xB7, 0xB8, 0x4B, 0x41, 0x05,
- 0xAB, 0xA9, 0x9E, 0x35, 0x08, 0x58, 0xEC, 0xB1, 0x2A, 0xC4, 0x68, 0x87,
- 0x0B, 0xA3, 0xE3, 0x75, 0xE4, 0xE6, 0xF3, 0xA7, 0x62, 0x71, 0xBA, 0x79,
- 0x81, 0x60, 0x1F, 0xD7, 0x91, 0x9A, 0x9F, 0xF3, 0xD0, 0x78, 0x67, 0x71,
- 0xC8, 0x69, 0x0E, 0x95, 0x91, 0xCF, 0xFE, 0xE6, 0x99, 0xE9, 0x60, 0x3C,
- 0x48, 0xCC, 0x7E, 0xCA, 0x4D, 0x77, 0x12, 0x24, 0x9D, 0x47, 0x1B, 0x5A,
- 0xEB, 0xB9, 0xEC, 0x1E, 0x37, 0x00, 0x1C, 0x9C, 0xAC, 0x7B, 0xA7, 0x05,
- 0xEA, 0xCE, 0x4A, 0xEB, 0xBD, 0x41, 0xE5, 0x36, 0x98, 0xB9, 0xCB, 0xFD,
- 0x6D, 0x3C, 0x96, 0x68, 0xDF, 0x23, 0x2A, 0x42, 0x90, 0x0C, 0x86, 0x74,
- 0x67, 0xC8, 0x7F, 0xA5, 0x9A, 0xB8, 0x52, 0x61, 0x14, 0x13, 0x3F, 0x65,
- 0xE9, 0x82, 0x87, 0xCB, 0xDB, 0xFA, 0x0E, 0x56, 0xF6, 0x86, 0x89, 0xF3,
- 0x85, 0x3F, 0x97, 0x86, 0xAF, 0xB0, 0xDC, 0x1A, 0xEF, 0x6B, 0x0D, 0x95,
- 0x16, 0x7D, 0xC4, 0x2B, 0xA0, 0x65, 0xB2, 0x99, 0x04, 0x36, 0x75, 0x80,
- 0x6B, 0xAC, 0x4A, 0xF3, 0x1B, 0x90, 0x49, 0x78, 0x2F, 0xA2, 0x96, 0x4F,
- 0x2A, 0x20, 0x25, 0x29, 0x04, 0xC6, 0x74, 0xC0, 0xD0, 0x31, 0xCD, 0x8F,
- 0x31, 0x38, 0x95, 0x16, 0xBA, 0xA8, 0x33, 0xB8, 0x43, 0xF1, 0xB1, 0x1F,
- 0xC3, 0x30, 0x7F, 0xA2, 0x79, 0x31, 0x13, 0x3D, 0x2D, 0x36, 0xF8, 0xE3,
- 0xFC, 0xF2, 0x33, 0x6A, 0xB9, 0x39, 0x31, 0xC5, 0xAF, 0xC4, 0x8D, 0x0D,
- 0x1D, 0x64, 0x16, 0x33, 0xAA, 0xFA, 0x84, 0x29, 0xB6, 0xD4, 0x0B, 0xC0,
- 0xD8, 0x7D, 0xC3, 0x93
-};
-
-static const unsigned char TA0_RSA_E[] = {
- 0x01, 0x00, 0x01
-};
-
-static const br_x509_trust_anchor PROGMEM LetsEncryptX3CrossSigned_TA = {
- { (unsigned char *)TA0_DN, sizeof TA0_DN },
- BR_X509_TA_CA,
- {
-  BR_KEYTYPE_RSA,
-  { .rsa = {
-   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
-   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
-  } }
- }
-};
-
-#define TAs_NUM 1
-
-#endif
-
-#ifdef USE_MQTT_AWS_IOT
-# 106 "C:/shared/sonoff/Git/Tasmota/tasmota/tasmota_ca.ino"
-const unsigned char PROGMEM TA0_DN[] = {
- 0x30, 0x39, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
- 0x02, 0x55, 0x53, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x0A,
- 0x13, 0x06, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17,
- 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
- 0x6E, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x41, 0x20, 0x31
-};
-
-const unsigned char PROGMEM TA0_RSA_N[] = {
- 0xB2, 0x78, 0x80, 0x71, 0xCA, 0x78, 0xD5, 0xE3, 0x71, 0xAF, 0x47, 0x80,
- 0x50, 0x74, 0x7D, 0x6E, 0xD8, 0xD7, 0x88, 0x76, 0xF4, 0x99, 0x68, 0xF7,
- 0x58, 0x21, 0x60, 0xF9, 0x74, 0x84, 0x01, 0x2F, 0xAC, 0x02, 0x2D, 0x86,
- 0xD3, 0xA0, 0x43, 0x7A, 0x4E, 0xB2, 0xA4, 0xD0, 0x36, 0xBA, 0x01, 0xBE,
- 0x8D, 0xDB, 0x48, 0xC8, 0x07, 0x17, 0x36, 0x4C, 0xF4, 0xEE, 0x88, 0x23,
- 0xC7, 0x3E, 0xEB, 0x37, 0xF5, 0xB5, 0x19, 0xF8, 0x49, 0x68, 0xB0, 0xDE,
- 0xD7, 0xB9, 0x76, 0x38, 0x1D, 0x61, 0x9E, 0xA4, 0xFE, 0x82, 0x36, 0xA5,
- 0xE5, 0x4A, 0x56, 0xE4, 0x45, 0xE1, 0xF9, 0xFD, 0xB4, 0x16, 0xFA, 0x74,
- 0xDA, 0x9C, 0x9B, 0x35, 0x39, 0x2F, 0xFA, 0xB0, 0x20, 0x50, 0x06, 0x6C,
- 0x7A, 0xD0, 0x80, 0xB2, 0xA6, 0xF9, 0xAF, 0xEC, 0x47, 0x19, 0x8F, 0x50,
- 0x38, 0x07, 0xDC, 0xA2, 0x87, 0x39, 0x58, 0xF8, 0xBA, 0xD5, 0xA9, 0xF9,
- 0x48, 0x67, 0x30, 0x96, 0xEE, 0x94, 0x78, 0x5E, 0x6F, 0x89, 0xA3, 0x51,
- 0xC0, 0x30, 0x86, 0x66, 0xA1, 0x45, 0x66, 0xBA, 0x54, 0xEB, 0xA3, 0xC3,
- 0x91, 0xF9, 0x48, 0xDC, 0xFF, 0xD1, 0xE8, 0x30, 0x2D, 0x7D, 0x2D, 0x74,
- 0x70, 0x35, 0xD7, 0x88, 0x24, 0xF7, 0x9E, 0xC4, 0x59, 0x6E, 0xBB, 0x73,
- 0x87, 0x17, 0xF2, 0x32, 0x46, 0x28, 0xB8, 0x43, 0xFA, 0xB7, 0x1D, 0xAA,
- 0xCA, 0xB4, 0xF2, 0x9F, 0x24, 0x0E, 0x2D, 0x4B, 0xF7, 0x71, 0x5C, 0x5E,
- 0x69, 0xFF, 0xEA, 0x95, 0x02, 0xCB, 0x38, 0x8A, 0xAE, 0x50, 0x38, 0x6F,
- 0xDB, 0xFB, 0x2D, 0x62, 0x1B, 0xC5, 0xC7, 0x1E, 0x54, 0xE1, 0x77, 0xE0,
- 0x67, 0xC8, 0x0F, 0x9C, 0x87, 0x23, 0xD6, 0x3F, 0x40, 0x20, 0x7F, 0x20,
- 0x80, 0xC4, 0x80, 0x4C, 0x3E, 0x3B, 0x24, 0x26, 0x8E, 0x04, 0xAE, 0x6C,
- 0x9A, 0xC8, 0xAA, 0x0D
-};
-
-static const unsigned char PROGMEM TA0_RSA_E[] = {
- 0x01, 0x00, 0x01
-};
-
-const br_x509_trust_anchor PROGMEM AmazonRootCA1_TA = {
- { (unsigned char *)TA0_DN, sizeof TA0_DN },
- BR_X509_TA_CA,
- {
-  BR_KEYTYPE_RSA,
-  { .rsa = {
-   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
-   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
-  } }
- }
-};
-
-#define TAs_NUM 1
-
-#endif
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
-#ifdef USE_WEBSERVER
-
-
-
-
-
-
-
-#define XDRV_01 1
-
-#ifndef WIFI_SOFT_AP_CHANNEL
-#define WIFI_SOFT_AP_CHANNEL 1
-#endif
-
-const uint16_t CHUNKED_BUFFER_SIZE = 400;
-
-const uint16_t HTTP_REFRESH_TIME = 2345;
-#define HTTP_RESTART_RECONNECT_TIME 9000
-#define HTTP_OTA_RESTART_RECONNECT_TIME 20000
-
-#include <ESP8266WebServer.h>
-#include <DNSServer.h>
-
-#ifdef USE_RF_FLASH
-uint8_t *efm8bb1_update = nullptr;
-#endif
-
-enum UploadTypes { UPL_TASMOTA, UPL_SETTINGS, UPL_EFM8BB1, UPL_TASMOTASLAVE };
-
-static const char * HEADER_KEYS[] = { "User-Agent", };
-
-const char HTTP_HEADER[] PROGMEM =
-  "<!DOCTYPE html><html lang=\"" D_HTML_LANGUAGE "\" class=\"\">"
-  "<head>"
-  "<meta charset='utf-8'>"
-  "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1,user-scalable=no\"/>"
-  "<title>%s - %s</title>"
-
-  "<script>"
-  "var x=null,lt,to,tp,pc='';"
-
-#ifdef USE_JAVASCRIPT_ES6
-
-  "eb=s=>document.getElementById(s);"
-  "qs=s=>document.querySelector(s);"
-  "sp=i=>eb(i).type=(eb(i).type==='text'?'password':'text');"
-  "wl=f=>window.addEventListener('load',f);"
-  ;
-#else
-  "function eb(s){"
-    "return document.getElementById(s);"
-  "}"
-  "function qs(s){"
-    "return document.querySelector(s);"
-  "}"
-  "function sp(i){"
-    "eb(i).type=(eb(i).type==='text'?'password':'text');"
-  "}"
-  "function wl(f){"
-    "window.addEventListener('load',f);"
-  "}";
-#endif
-
-const char HTTP_SCRIPT_COUNTER[] PROGMEM =
-  "var cn=180;"
-  "function u(){"
-    "if(cn>=0){"
-      "eb('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';"
-      "cn--;"
-      "setTimeout(u,1000);"
-    "}"
-  "}"
-  "wl(u);";
-
-const char HTTP_SCRIPT_ROOT[] PROGMEM =
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  "var rfsh=1;"
-  "function la(p){"
-    "var a='';"
-    "if(la.arguments.length==1){"
-      "a=p;"
-      "clearTimeout(lt);"
-    "}"
-    "if(x!=null){x.abort();}"
-    "x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(x.readyState==4&&x.status==200){"
-        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
-        "eb('l1').innerHTML=s;"
-      "}"
-    "};"
-    "if (rfsh) {"
-      "x.open('GET','.?m=1'+a,true);"
-      "x.send();"
-      "lt=setTimeout(la,%d);"
-    "}"
-  "}"
-  "function seva(par,ivar){"
-    "la('&sv='+ivar+'_'+par);"
-  "}"
-  "function siva(par,ivar){"
-    "rfsh=1;"
-    "la('&sv='+ivar+'_'+par);"
-    "rfsh=0;"
-  "}"
-  "function pr(f){"
-    "if (f) {"
-      "lt=setTimeout(la,%d);"
-      "rfsh=1;"
-    "} else {"
-      "clearTimeout(lt);"
-      "rfsh=0;"
-    "}"
-  "}";
-#else
-  "function la(p){"
-    "var a='';"
-    "if(la.arguments.length==1){"
-      "a=p;"
-      "clearTimeout(lt);"
-    "}"
-    "if(x!=null){x.abort();}"
-    "x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(x.readyState==4&&x.status==200){"
-        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
-        "eb('l1').innerHTML=s;"
-      "}"
-    "};"
-    "x.open('GET','.?m=1'+a,true);"
-    "x.send();"
-    "lt=setTimeout(la,%d);"
-  "}";
-#endif
-
-const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM =
-  "function lc(v,i,p){"
-    "if(eb('s')){"
-      "if(v=='h'||v=='d'){"
-        "var sl=eb('sl4').value;"
-        "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';"
-      "}"
-    "}"
-    "la('&'+v+i+'='+p);"
-  "}"
-  "wl(la);";
-
-const char HTTP_SCRIPT_WIFI[] PROGMEM =
-  "function c(l){"
-    "eb('s1').value=l.innerText||l.textContent;"
-    "eb('p1').focus();"
-  "}";
-
-const char HTTP_SCRIPT_RELOAD[] PROGMEM =
-  "setTimeout(function(){location.href='.';}," STR(HTTP_RESTART_RECONNECT_TIME) ");";
-
-
-const char HTTP_SCRIPT_RELOAD_OTA[] PROGMEM =
-  "setTimeout(function(){location.href='.';}," STR(HTTP_OTA_RESTART_RECONNECT_TIME) ");";
-
-const char HTTP_SCRIPT_CONSOL[] PROGMEM =
-  "var sn=0,id=0;"
-  "function l(p){"
-    "var c,o='',t;"
-    "clearTimeout(lt);"
-    "t=eb('t1');"
-    "if(p==1){"
-      "c=eb('c1');"
-      "o='&c1='+encodeURIComponent(c.value);"
-      "c.value='';"
-      "t.scrollTop=99999;"
-      "sn=t.scrollTop;"
-    "}"
-    "if(t.scrollTop>=sn){"
-      "if(x!=null){x.abort();}"
-      "x=new XMLHttpRequest();"
-      "x.onreadystatechange=function(){"
-        "if(x.readyState==4&&x.status==200){"
-          "var z,d;"
-          "d=x.responseText.split(/}1/);"
-          "id=d.shift();"
-          "if(d.shift()==0){t.value='';}"
-          "z=d.shift();"
-          "if(z.length>0){t.value+=z;}"
-          "t.scrollTop=99999;"
-          "sn=t.scrollTop;"
-        "}"
-      "};"
-      "x.open('GET','cs?c2='+id+o,true);"
-      "x.send();"
-    "}"
-    "lt=setTimeout(l,%d);"
-    "return false;"
-  "}"
-  "wl(l);";
-
-const char HTTP_MODULE_TEMPLATE_REPLACE[] PROGMEM =
-  "}2%d'>%s (%d}3";
-
-const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
-  "var os;"
-  "function sk(s,g){"
-    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
-    "eb('g'+g).innerHTML=o;"
-    "eb('g'+g).value=s;"
-  "}"
-  "function ld(u,f){"
-    "var x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(this.readyState==4&&this.status==200){"
-        "f(this);"
-      "}"
-    "};"
-    "x.open('GET',u,true);"
-    "x.send();"
-  "}";
-
-const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
-  "var c;"
-  "function x1(b){"
-    "var i,j,g,k,o;"
-    "o=b.responseText.split(/}1/);"
-    "k=o.shift();"
-    "if(eb('s1').value==''){"
-      "eb('s1').value=k;"
-    "}"
-    "os=o.shift();"
-    "as=o.shift();"
-    "g=o.shift().split(',');"
-    "j=0;"
-    "for(i=0;i<13;i++){"
-      "if(6==i){j=9;}"
-      "if(8==i){j=12;}"
-      "sk(g[i],j);"
-      "j++;"
-    "}"
-    "g=o.shift();"
-    "os=as;"
-    "sk(g&15,17);"
-    "g>>=4;"
-    "for(i=0;i<" STR(GPIO_FLAG_USED) ";i++){"
-      "p=(g>>i)&1;"
-      "eb('c'+i).checked=p;"
-    "}"
-    "if(" STR(USER_MODULE) "==c){"
-      "g=o.shift();"
-      "eb('g99').value=g;"
-    "}"
-  "}"
-  "function st(t){"
-    "c=t;"
-    "var a='tp?t='+t;"
-    "ld(a,x1);"
-  "}"
-
-  "function x2(a){"
-    "os=a.responseText;"
-    "sk(17,99);"
-    "st(" STR(USER_MODULE) ");"
-  "}"
-
-#ifdef USE_JAVASCRIPT_ES6
-  "sl=()=>ld('tp?m=1',x2);"
-#else
-  "function sl(){"
-    "ld('tp?m=1',x2);"
-  "}"
-#endif
-
-  "wl(sl);";
-
-const char HTTP_SCRIPT_MODULE1[] PROGMEM =
-  "function x1(a){"
-    "os=a.responseText;"
-    "sk(%d,99);"
-  "}"
-  "function x2(b){"
-    "os=b.responseText;";
-const char HTTP_SCRIPT_MODULE2[] PROGMEM =
-  "}"
-  "function x3(a){"
-    "os=a.responseText;"
-    "sk(%d,17);"
-  "}"
-  "function sl(){"
-    "ld('md?m=1',x1);"
-    "ld('md?g=1',x2);"
-    "if(eb('g17')){"
-      "ld('md?a=1',x3);"
-    "}"
-  "}"
-  "wl(sl);";
-
-const char HTTP_SCRIPT_INFO_BEGIN[] PROGMEM =
-  "function i(){"
-    "var s,o=\"";
-const char HTTP_SCRIPT_INFO_END[] PROGMEM =
-    "\";"
-    "s=o.replace(/}1/g,\"</td></tr><tr><th>\").replace(/}2/g,\"</th><td>\");"
-    "eb('i').innerHTML=s;"
-  "}"
-  "wl(i);";
-
-const char HTTP_HEAD_LAST_SCRIPT[] PROGMEM =
-  "function jd(){"
-    "var t=0,i=document.querySelectorAll('input,button,textarea,select');"
-    "while(i.length>=t){"
-      "if(i[t]){"
-        "i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];"
-      "}"
-      "t++;"
-    "}"
-  "}"
-  "wl(jd);"
-  "</script>";
-
-const char HTTP_HEAD_STYLE1[] PROGMEM =
-  "<style>"
-  "div,fieldset,input,select{padding:5px;font-size:1em;}"
-  "fieldset{background:#%06x;}"
-  "p{margin:0.5em 0;}"
-  "input{width:100%%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#%06x;color:#%06x;}"
-  "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
-  "input[type=range]{width:99%%;}"
-  "select{width:100%%;background:#%06x;color:#%06x;}"
-  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"
-  "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"
-  "td{padding:0px;}";
-const char HTTP_HEAD_STYLE2[] PROGMEM =
-  "button{border:0;border-radius:0.3rem;background:#%06x;color:#%06x;line-height:2.4rem;font-size:1.2rem;width:100%%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}"
-  "button:hover{background:#%06x;}"
-  ".bred{background:#%06x;}"
-  ".bred:hover{background:#%06x;}"
-  ".bgrn{background:#%06x;}"
-  ".bgrn:hover{background:#%06x;}"
-  "a{color:#%06x;text-decoration:none;}"
-  ".p{float:left;text-align:left;}"
-  ".q{float:right;text-align:right;}"
-  ".r{border-radius:0.3em;padding:2px;margin:6px 2px;}";
-const char HTTP_HEAD_STYLE3[] PROGMEM =
-  "</style>"
-
-  "</head>"
-  "<body>"
-  "<div style='text-align:left;display:inline-block;color:#%06x;min-width:340px;'>"
-#ifdef FIRMWARE_MINIMAL
-  "<div style='text-align:center;color:#%06x;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
-#endif
-  "<div style='text-align:center;color:#%06x;'><noscript>" D_NOSCRIPT "<br></noscript>"
-#ifdef LANGUAGE_MODULE_NAME
-  "<h3>" D_MODULE " %s</h3>"
-#else
-  "<h3>%s " D_MODULE "</h3>"
-#endif
-  "<h2>%s</h2>";
-
-const char HTTP_MSG_SLIDER_GRADIENT[] PROGMEM =
-  "<div id='%s' class='r' style='background-image:linear-gradient(to right,%s,%s);'>"
-  "<input id='sl%d' type='range' min='%d' max='%d' value='%d' onchange='lc(\"%c\",%d,value)'>"
-  "</div>";
-const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
-  "<div><span class='p'>" D_CLOSE "</span><span class='q'>" D_OPEN "</span></div>"
-  "<div><input type='range' min='0' max='100' value='%d' onchange='lc(\"u\",%d,value)'></div>";
-
-const char HTTP_MSG_RSTRT[] PROGMEM =
-  "<br><div style='text-align:center;'>" D_DEVICE_WILL_RESTART "</div><br>";
-
-const char HTTP_FORM_LOGIN[] PROGMEM =
-  "<fieldset>"
-  "<form method='post' action='/'>"
-  "<p><b>" D_USER "</b><br><input name='USER1' placeholder='" D_USER "'></p>"
-  "<p><b>" D_PASSWORD "</b><br><input name='PASS1' type='password' placeholder='" D_PASSWORD "'></p>"
-  "<br>"
-  "<button>" D_OK "</button>"
-  "</form></fieldset>";
-
-const char HTTP_FORM_TEMPLATE[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='tp'>";
-const char HTTP_FORM_TEMPLATE_FLAG[] PROGMEM =
-  "<p></p>"
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_FLAGS "&nbsp;</b></legend><p>"
-
-  "</p></fieldset>";
-
-const char HTTP_FORM_MODULE[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='md'>"
-  "<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99'></select><br>"
-  "<br><table>";
-
-const char HTTP_FORM_WIFI[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_WIFI_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='wi'>"
-  "<p><b>" D_AP1_SSID "</b> (" STA_SSID1 ")<br><input id='s1' placeholder='" STA_SSID1 "' value='%s'></p>"
-  "<p><b>" D_AP1_PASSWORD "</b><input type='checkbox' onclick='sp(\"p1\")'><br><input id='p1' type='password' placeholder='" D_AP1_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_AP2_SSID "</b> (" STA_SSID2 ")<br><input id='s2' placeholder='" STA_SSID2 "' value='%s'></p>"
-  "<p><b>" D_AP2_PASSWORD "</b><input type='checkbox' onclick='sp(\"p2\")'><br><input id='p2' type='password' placeholder='" D_AP2_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_HOSTNAME "</b> (%s)<br><input id='h' placeholder='%s' value='%s'></p>"
-  "<p><b>" D_CORS_DOMAIN "</b><input id='c' placeholder='" CORS_DOMAIN "' value='%s'></p>";
-
-const char HTTP_FORM_LOG1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_LOGGING_PARAMETERS "&nbsp;</b>"
-  "</legend><form method='get' action='lg'>";
-const char HTTP_FORM_LOG2[] PROGMEM =
-  "<p><b>" D_SYSLOG_HOST "</b> (" SYS_LOG_HOST ")<br><input id='lh' placeholder='" SYS_LOG_HOST "' value='%s'></p>"
-  "<p><b>" D_SYSLOG_PORT "</b> (" STR(SYS_LOG_PORT) ")<br><input id='lp' placeholder='" STR(SYS_LOG_PORT) "' value='%d'></p>"
-  "<p><b>" D_TELEMETRY_PERIOD "</b> (" STR(TELE_PERIOD) ")<br><input id='lt' placeholder='" STR(TELE_PERIOD) "' value='%d'></p>";
-
-const char HTTP_FORM_OTHER[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_OTHER_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='co'>"
-  "<p></p>"
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE "&nbsp;</b></legend>"
-  "<p><input id='t1' placeholder='" D_TEMPLATE "' value='%s'></p>"
-  "<p><input id='t2' type='checkbox'%s><b>" D_ACTIVATE "</b></p>"
-  "</fieldset>"
-  "<br>"
-  "<b>" D_WEB_ADMIN_PASSWORD "</b><input type='checkbox' onclick='sp(\"wp\")'><br><input id='wp' type='password' placeholder='" D_WEB_ADMIN_PASSWORD "' value='" D_ASTERISK_PWD "'><br>"
-  "<br>"
-  "<input id='b1' type='checkbox'%s><b>" D_MQTT_ENABLE "</b><br>"
-  "<br>";
-
-const char HTTP_FORM_END[] PROGMEM =
-  "<br>"
-  "<button name='save' type='submit' class='button bgrn'>" D_SAVE "</button>"
-  "</form></fieldset>";
-
-const char HTTP_FORM_RST[] PROGMEM =
-  "<div id='f1' style='display:block;'>"
-  "<fieldset><legend><b>&nbsp;" D_RESTORE_CONFIGURATION "&nbsp;</b></legend>";
-const char HTTP_FORM_UPG[] PROGMEM =
-  "<div id='f1' style='display:block;'>"
-  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_WEBSERVER "&nbsp;</b></legend>"
-  "<form method='get' action='u1'>"
-  "<br><b>" D_OTA_URL "</b><br><input id='o' placeholder='OTA_URL' value='%s'><br>"
-  "<br><button type='submit'>" D_START_UPGRADE "</button></form>"
-  "</fieldset><br><br>"
-  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_FILE_UPLOAD "&nbsp;</b></legend>";
-const char HTTP_FORM_RST_UPG[] PROGMEM =
-  "<form method='post' action='u2' enctype='multipart/form-data'>"
-  "<br><input type='file' name='u2'><br>"
-  "<br><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>"
-  "</fieldset>"
-  "</div>"
-  "<div id='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
-
-const char HTTP_FORM_CMND[] PROGMEM =
-  "<br><textarea readonly id='t1' cols='340' wrap='off'></textarea><br><br>"
-  "<form method='get' onsubmit='return l(1);'>"
-  "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
-
-  "</form>";
-
-const char HTTP_TABLE100[] PROGMEM =
-  "<table style='width:100%%'>";
-
-const char HTTP_COUNTER[] PROGMEM =
-  "<br><div id='t' style='text-align:center;'></div>";
-
-const char HTTP_END[] PROGMEM =
-  "<div style='text-align:right;font-size:11px;'><hr/><a href='https://bit.ly/tasmota' target='_blank' style='color:#aaa;'>Tasmota %s " D_BY " Theo Arends</a></div>"
-  "</div>"
-  "</body>"
-  "</html>";
-
-const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button onclick='la(\"&o=%d\");'>%s%s</button></td>";
-const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";
-
-enum ButtonTitle {
-  BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
-  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_CONSOLE,
-  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE };
-const char kButtonTitle[] PROGMEM =
-  D_RESTART "|" D_RESET_CONFIGURATION "|"
-  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_CONSOLE "|"
-  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION;
-const char kButtonAction[] PROGMEM =
-  ".|rt|"
-  ".|cn|in|up|cs|"
-  "md|wi|lg|co|tp|dl|rs";
-const char kButtonConfirm[] PROGMEM = D_CONFIRM_RESTART "|" D_CONFIRM_RESET_CONFIGURATION;
-
-enum CTypes { CT_HTML, CT_PLAIN, CT_XML, CT_JSON, CT_STREAM };
-const char kContentTypes[] PROGMEM = "text/html|text/plain|text/xml|application/json|application/octet-stream";
-
-const char kLoggingOptions[] PROGMEM = D_SERIAL_LOG_LEVEL "|" D_WEB_LOG_LEVEL "|" D_MQTT_LOG_LEVEL "|" D_SYS_LOG_LEVEL;
-const char kLoggingLevels[] PROGMEM = D_NONE "|" D_ERROR "|" D_INFO "|" D_DEBUG "|" D_MORE_DEBUG;
-
-const char kEmulationOptions[] PROGMEM = D_NONE "|" D_BELKIN_WEMO "|" D_HUE_BRIDGE;
-
-const char kUploadErrors[] PROGMEM =
-  D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9
-#ifdef USE_RF_FLASH
-  "|" D_UPLOAD_ERR_10 "|" D_UPLOAD_ERR_11 "|" D_UPLOAD_ERR_12 "|" D_UPLOAD_ERR_13
-#endif
-  "|" D_UPLOAD_ERR_14
-  ;
-
-const uint16_t DNS_PORT = 53;
-enum HttpOptions {HTTP_OFF, HTTP_USER, HTTP_ADMIN, HTTP_MANAGER, HTTP_MANAGER_RESET_ONLY};
-
-DNSServer *DnsServer;
-ESP8266WebServer *WebServer;
-
-struct WEB {
-  String chunk_buffer = "";
-  bool reset_web_log_flag = false;
-  uint8_t state = HTTP_OFF;
-  uint8_t upload_error = 0;
-  uint8_t upload_file_type;
-  uint8_t upload_progress_dot_count;
-  uint8_t config_block_count = 0;
-  uint8_t config_xor_on = 0;
-  uint8_t config_xor_on_set = CONFIG_FILE_XOR;
-} Web;
-
-
-static void WebGetArg(const char* arg, char* out, size_t max)
-{
-  String s = WebServer->arg(arg);
-  strlcpy(out, s.c_str(), max);
-
-}
-
-static bool WifiIsInManagerMode(){
-  return (HTTP_MANAGER == Web.state || HTTP_MANAGER_RESET_ONLY == Web.state);
-}
-
-void ShowWebSource(uint32_t source)
-{
-  if ((source > 0) && (source < SRC_MAX)) {
-    char stemp1[20];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s from %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource), WebServer->client().remoteIP().toString().c_str());
-  }
-}
-
-void ExecuteWebCommand(char* svalue, uint32_t source)
-{
-  ShowWebSource(source);
-  last_source = source;
-  ExecuteCommand(svalue, SRC_IGNORE);
-}
-
-void StartWebserver(int type, IPAddress ipweb)
-{
-  if (!Settings.web_refresh) { Settings.web_refresh = HTTP_REFRESH_TIME; }
-  if (!Web.state) {
-    if (!WebServer) {
-      WebServer = new ESP8266WebServer((HTTP_MANAGER == type || HTTP_MANAGER_RESET_ONLY == type) ? 80 : WEB_PORT);
-      WebServer->on("/", HandleRoot);
-      WebServer->onNotFound(HandleNotFound);
-      WebServer->on("/up", HandleUpgradeFirmware);
-      WebServer->on("/u1", HandleUpgradeFirmwareStart);
-      WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop);
-      WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
-      WebServer->on("/cs", HTTP_GET, HandleConsole);
-      WebServer->on("/cs", HTTP_OPTIONS, HandlePreflightRequest);
-      WebServer->on("/cm", HandleHttpCommand);
-#ifndef FIRMWARE_MINIMAL
-      WebServer->on("/cn", HandleConfiguration);
-      WebServer->on("/md", HandleModuleConfiguration);
-      WebServer->on("/wi", HandleWifiConfiguration);
-      WebServer->on("/lg", HandleLoggingConfiguration);
-      WebServer->on("/tp", HandleTemplateConfiguration);
-      WebServer->on("/co", HandleOtherConfiguration);
-      WebServer->on("/dl", HandleBackupConfiguration);
-      WebServer->on("/rs", HandleRestoreConfiguration);
-      WebServer->on("/rt", HandleResetConfiguration);
-      WebServer->on("/in", HandleInformation);
-      XdrvCall(FUNC_WEB_ADD_HANDLER);
-      XsnsCall(FUNC_WEB_ADD_HANDLER);
-#endif
-    }
-    Web.reset_web_log_flag = false;
-
-
-
-    WebServer->collectHeaders(HEADER_KEYS, sizeof(HEADER_KEYS)/sizeof(char*));
-
-    WebServer->begin();
-  }
-  if (Web.state != type) {
-#if LWIP_IPV6
-    String ipv6_addr = WifiGetIPv6();
-    if(ipv6_addr!="") AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s and IPv6 global address %s "), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str(),ipv6_addr.c_str());
-    else AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
-#else
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
-#endif
-    rules_flag.http_init = 1;
-  }
-  if (type) { Web.state = type; }
-}
-
-void StopWebserver(void)
-{
-  if (Web.state) {
-    WebServer->close();
-    Web.state = HTTP_OFF;
-    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_STOPPED));
-  }
-}
-
-void WifiManagerBegin(bool reset_only)
-{
-
-  if (!global_state.wifi_down) {
-
-    WifiSetMode(WIFI_AP_STA);
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION));
-  } else {
-
-    WifiSetMode(WIFI_AP);
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT));
-  }
-
-  StopWebserver();
-
-  DnsServer = new DNSServer();
-
-  int channel = WIFI_SOFT_AP_CHANNEL;
-  if ((channel < 1) || (channel > 13)) { channel = 1; }
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-
-  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0);
-#else
-
-  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0, 1);
-#endif
-
-  delay(500);
-
-  DnsServer->setErrorReplyCode(DNSReplyCode::NoError);
-  DnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
-
-  StartWebserver((reset_only ? HTTP_MANAGER_RESET_ONLY : HTTP_MANAGER), WiFi.softAPIP());
-}
-
-void PollDnsWebserver(void)
-{
-  if (DnsServer) { DnsServer->processNextRequest(); }
-  if (WebServer) { WebServer->handleClient(); }
-}
-
-
-
-bool WebAuthenticate(void)
-{
-  if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) {
-    return WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD));
-  } else {
-    return true;
-  }
-}
-
-bool HttpCheckPriviledgedAccess(bool autorequestauth = true)
-{
-  if (HTTP_USER == Web.state) {
-    HandleRoot();
-    return false;
-  }
-  if (autorequestauth && !WebAuthenticate()) {
-    WebServer->requestAuthentication();
-    return false;
-  }
-  return true;
-}
-
-void HttpHeaderCors(void)
-{
-  if (strlen(SettingsText(SET_CORS))) {
-    WebServer->sendHeader(F("Access-Control-Allow-Origin"), SettingsText(SET_CORS));
-  }
-}
-
-void WSHeaderSend(void)
-{
-  WebServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
-  WebServer->sendHeader(F("Pragma"), F("no-cache"));
-  WebServer->sendHeader(F("Expires"), F("-1"));
-  HttpHeaderCors();
-}
-
-
-
-
-
-void WSSend(int code, int ctype, const String& content)
-{
-  char ct[25];
-  WebServer->send(code, GetTextIndexed(ct, sizeof(ct), ctype, kContentTypes), content);
-}
-
-
-
-
-
-void WSContentBegin(int code, int ctype)
-{
-  WebServer->client().flush();
-  WSHeaderSend();
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  WebServer->sendHeader(F("Accept-Ranges"),F("none"));
-  WebServer->sendHeader(F("Transfer-Encoding"),F("chunked"));
-#endif
-  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-  WSSend(code, ctype, "");
-  Web.chunk_buffer = "";
-}
-
-void _WSContentSend(const String& content)
-{
-  size_t len = content.length();
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  const char * footer = "\r\n";
-  char chunk_size[11];
-  sprintf(chunk_size, "%x\r\n", len);
-  WebServer->sendContent(String() + chunk_size + content + footer);
-#else
-  WebServer->sendContent(content);
-#endif
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("WSContentSend"));
-#endif
-  DEBUG_CORE_LOG(PSTR("WEB: Chunk size %d"), len);
-}
-
-void WSContentFlush(void)
-{
-  if (Web.chunk_buffer.length() > 0) {
-    _WSContentSend(Web.chunk_buffer);
-    Web.chunk_buffer = "";
-  }
-}
-
-void _WSContentSendBuffer(void)
-{
-  int len = strlen(mqtt_data);
-
-  if (0 == len) {
-    return;
-  }
-  else if (len == sizeof(mqtt_data)) {
-    AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: Content too large"));
-  }
-  else if (len < CHUNKED_BUFFER_SIZE) {
-    Web.chunk_buffer += mqtt_data;
-    len = Web.chunk_buffer.length();
-  }
-
-  if (len >= CHUNKED_BUFFER_SIZE) {
-    WSContentFlush();
-  }
-  if (strlen(mqtt_data) >= CHUNKED_BUFFER_SIZE) {
-    _WSContentSend(mqtt_data);
-  }
-}
-
-void WSContentSend_P(const char* formatP, ...)
-{
-
-  va_list arg;
-  va_start(arg, formatP);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-  va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-  _WSContentSendBuffer();
-}
-
-void WSContentSend_PD(const char* formatP, ...)
-{
-
-  va_list arg;
-  va_start(arg, formatP);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-  va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-  if (D_DECIMAL_SEPARATOR[0] != '.') {
-    for (uint32_t i = 0; i < len; i++) {
-      if ('.' == mqtt_data[i]) {
-        mqtt_data[i] = D_DECIMAL_SEPARATOR[0];
-      }
-    }
-  }
-
-  _WSContentSendBuffer();
-}
-
-void WSContentStart_P(const char* title, bool auth)
-{
-  if (auth && strlen(SettingsText(SET_WEBPWD)) && !WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD))) {
-    return WebServer->requestAuthentication();
-  }
-
-  WSContentBegin(200, CT_HTML);
-
-  if (title != nullptr) {
-    char ctitle[strlen_P(title) +1];
-    strcpy_P(ctitle, title);
-    WSContentSend_P(HTTP_HEADER, SettingsText(SET_FRIENDLYNAME1), ctitle);
-  }
-}
-
-void WSContentStart_P(const char* title)
-{
-  WSContentStart_P(title, true);
-}
-
-void WSContentSendStyle_P(const char* formatP, ...)
-{
-  if (WifiIsInManagerMode()) {
-    if (WifiConfigCounter()) {
-      WSContentSend_P(HTTP_SCRIPT_COUNTER);
-    }
-  }
-  WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
-
-  WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
-                  WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
-  WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
-                  WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
-                  WebColor(COL_BUTTON));
-  if (formatP != nullptr) {
-
-    va_list arg;
-    va_start(arg, formatP);
-    int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-    va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-    _WSContentSendBuffer();
-  }
-  WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT),
-#ifdef FIRMWARE_MINIMAL
-    WebColor(COL_TEXT_WARNING),
-#endif
-    WebColor(COL_TITLE),
-    ModuleName().c_str(), SettingsText(SET_FRIENDLYNAME1));
-  if (Settings.flag3.gui_hostname_ip) {
-    bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0);
-    bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0);
-    WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"),
-      my_hostname,
-      (Wifi.mdns_begun) ? ".local" : "",
-      (lip) ? WiFi.localIP().toString().c_str() : "",
-      (lip && sip) ? ", " : "",
-      (sip) ? WiFi.softAPIP().toString().c_str() : "");
-  }
-  WSContentSend_P(PSTR("</div>"));
-}
-
-void WSContentSendStyle(void)
-{
-  WSContentSendStyle_P(nullptr);
-}
-
-void WSContentButton(uint32_t title_index)
-{
-  char action[4];
-  char title[100];
-
-  if (title_index <= BUTTON_RESET_CONFIGURATION) {
-    char confirm[100];
-    WSContentSend_P(PSTR("<p><form action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
-      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
-      GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),
-      (!title_index) ? "rst" : "non",
-      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
-  } else {
-    WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),
-      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
-      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
-  }
-}
-
-void WSContentSpaceButton(uint32_t title_index)
-{
-  WSContentSend_P(PSTR("<div></div>"));
-  WSContentButton(title_index);
-}
-
-void WSContentEnd(void)
-{
-  WSContentFlush();
-  _WSContentSend("");
-  WebServer->client().stop();
-}
-
-void WSContentStop(void)
-{
-  if (WifiIsInManagerMode()) {
-    if (WifiConfigCounter()) {
-      WSContentSend_P(HTTP_COUNTER);
-    }
-  }
-  WSContentSend_P(HTTP_END, my_version);
-  WSContentEnd();
-}
-
-
-
-void WebRestart(uint32_t type)
-{
-
-
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
-
-  bool reset_only = (HTTP_MANAGER_RESET_ONLY == Web.state);
-
-  WSContentStart_P((type) ? S_SAVE_CONFIGURATION : S_RESTART, !reset_only);
-  WSContentSend_P(HTTP_SCRIPT_RELOAD);
-  WSContentSendStyle();
-  if (type) {
-    WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_CONFIGURATION_SAVED "</b><br>"));
-    if (2 == type) {
-      WSContentSend_P(PSTR("<br>" D_TRYING_TO_CONNECT "<br>"));
-    }
-    WSContentSend_P(PSTR("</div>"));
-  }
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  if (HTTP_MANAGER == Web.state || reset_only) {
-    Web.state = HTTP_ADMIN;
-  } else {
-    WSContentSpaceButton(BUTTON_MAIN);
-  }
-  WSContentStop();
-
-  ShowWebSource(SRC_WEBGUI);
-  restart_flag = 2;
-}
-
-
-
-void HandleWifiLogin(void)
-{
-  WSContentStart_P(S_CONFIGURE_WIFI, false);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_LOGIN);
-
-  if (HTTP_MANAGER_RESET_ONLY == Web.state) {
-    WSContentSpaceButton(BUTTON_RESTART);
-#ifndef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
-#endif
-  }
-
-  WSContentStop();
-}
-
-void WebSliderColdWarm(void)
-{
-  WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-    "a",
-    "#fff", "#ff0",
-    1,
-    153, 500,
-    LightGetColorTemp(),
-    't', 0);
-}
-
-void HandleRoot(void)
-{
-  if (CaptivePortal()) { return; }
-
-  if (WebServer->hasArg("rst")) {
-    WebRestart(0);
-    return;
-  }
-
-  if (WifiIsInManagerMode()) {
-#ifndef FIRMWARE_MINIMAL
-    if (strlen(SettingsText(SET_WEBPWD)) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1")) && HTTP_MANAGER_RESET_ONLY != Web.state) {
-      HandleWifiLogin();
-    } else {
-      if (!strlen(SettingsText(SET_WEBPWD)) || (((WebServer->arg("USER1") == WEB_USERNAME ) && (WebServer->arg("PASS1") == SettingsText(SET_WEBPWD) )) || HTTP_MANAGER_RESET_ONLY == Web.state)) {
-        HandleWifiConfiguration();
-      } else {
-
-        HandleWifiLogin();
-      }
-    }
-#endif
-    return;
-  }
-
-  if (HandleRootStatusRefresh()) {
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU);
-
-  char stemp[33];
-
-  WSContentStart_P(S_MAIN_MENU);
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh, Settings.web_refresh);
-#else
-  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh);
-#endif
-  WSContentSend_P(HTTP_SCRIPT_ROOT_PART2);
-
-  WSContentSendStyle();
-
-  WSContentSend_P(PSTR("<div id='l1' name='l1'></div>"));
-  if (devices_present) {
-#ifdef USE_LIGHT
-    if (light_type) {
-      uint8_t light_subtype = light_type &7;
-      if (!Settings.flag3.pwm_multi_channels) {
-        bool split_white = ((LST_RGBW <= light_subtype) && (devices_present > 1));
-
-        if ((LST_COLDWARM == light_subtype) || ((LST_RGBCW == light_subtype) && !split_white)) {
-          WebSliderColdWarm();
-        }
-
-        if (light_subtype > 2) {
-          uint16_t hue;
-          uint8_t sat;
-          LightGetHSB(&hue, &sat, nullptr);
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "b",
-            "#800", "#f00 5%,#ff0 20%,#0f0 35%,#0ff 50%,#00f 65%,#f0f 80%,#f00 95%,#800",
-            2,
-            1, 359,
-            hue,
-            'h', 0);
-
-          uint8_t dcolor = changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255);
-          char scolor[8];
-          snprintf_P(scolor, sizeof(scolor), PSTR("#%02X%02X%02X"), dcolor, dcolor, dcolor);
-          uint8_t red, green, blue;
-          LightHsToRgb(hue, 255, &red, &green, &blue);
-          snprintf_P(stemp, sizeof(stemp), PSTR("#%02X%02X%02X"), red, green, blue);
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "s",
-            scolor, stemp,
-            3,
-            0, 100,
-            changeUIntScale(sat, 0, 255, 0, 100),
-            'n', 0);
-        }
-
-        WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-          "c",
-          "#000", "#fff",
-          4,
-          Settings.flag3.slider_dimmer_stay_on, 100,
-          Settings.light_dimmer,
-          'd', 0);
-
-        if (split_white) {
-          if (LST_RGBCW == light_subtype) {
-            WebSliderColdWarm();
-          }
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "f",
-            "#000", "#fff",
-            5,
-            Settings.flag3.slider_dimmer_stay_on, 100,
-            LightGetDimmer(2),
-            'w', 0);
-        }
-      } else {
-        uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype;
-        stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0';
-        for (uint32_t i = 0; i < pwm_channels; i++) {
-          stemp[1]++;
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            stemp,
-            "#000", "#fff",
-            i+1,
-            1, 100,
-            changeUIntScale(Settings.light_color[i], 0, 255, 0, 100),
-            'e', i+1);
-        }
-      }
-    }
-#endif
-#ifdef USE_SHUTTER
-    if (Settings.flag3.shutter_mode) {
-      for (uint32_t i = 0; i < shutters_present; i++) {
-        WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, Settings.shutter_position[i], i+1);
-      }
-    }
-#endif
-    WSContentSend_P(HTTP_TABLE100);
-    WSContentSend_P(PSTR("<tr>"));
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      WSContentSend_P(HTTP_DEVICE_CONTROL, 36, 1,
-        (strlen(SettingsText(SET_BUTTON1))) ? SettingsText(SET_BUTTON1) : D_BUTTON_TOGGLE,
-        "");
-      for (uint32_t i = 0; i < MaxFanspeed(); i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i);
-        WSContentSend_P(HTTP_DEVICE_CONTROL, 16, i +2,
-          (strlen(SettingsText(SET_BUTTON2 + i))) ? SettingsText(SET_BUTTON2 + i) : stemp,
-          "");
-      }
-    } else {
-#endif
-      for (uint32_t idx = 1; idx <= devices_present; idx++) {
-        bool set_button = ((idx <= MAX_BUTTON_TEXT) && strlen(SettingsText(SET_BUTTON1 + idx -1)));
-#ifdef USE_SHUTTER
-        int32_t ShutterWebButton;
-        if (ShutterWebButton = IsShutterWebButton(idx)) {
-          WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((Settings.shutter_options[abs(ShutterWebButton)-1] & 2) ? "-" : ((ShutterWebButton>0) ? "▲" : "▼")),
-            "");
-          continue;
-        }
-#endif
-        snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx);
-        WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-          (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (devices_present < 5) ? D_BUTTON_TOGGLE : "",
-          (set_button) ? "" : (devices_present > 1) ? stemp : "");
-      }
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-#ifdef USE_SONOFF_RF
-  if (SONOFF_BRIDGE == my_module_type) {
-    WSContentSend_P(HTTP_TABLE100);
-    WSContentSend_P(PSTR("<tr>"));
-    uint32_t idx = 0;
-    for (uint32_t i = 0; i < 4; i++) {
-      if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
-      for (uint32_t j = 0; j < 4; j++) {
-        idx++;
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), idx);
-        WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,
-          (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : stemp);
-      }
-    }
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-#endif
-
-#ifndef FIRMWARE_MINIMAL
-  XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
-  XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
-#endif
-
-  if (HTTP_ADMIN == Web.state) {
-#ifdef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_FIRMWARE_UPGRADE);
-#else
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentButton(BUTTON_INFORMATION);
-    WSContentButton(BUTTON_FIRMWARE_UPGRADE);
-#endif
-    WSContentButton(BUTTON_CONSOLE);
-    WSContentButton(BUTTON_RESTART);
-  }
-  WSContentStop();
-}
-
-bool HandleRootStatusRefresh(void)
-{
-  if (!WebAuthenticate()) {
-    WebServer->requestAuthentication();
-    return true;
-  }
-
-  if (!WebServer->hasArg("m")) {
-    return false;
-  }
-
-  #ifdef USE_SCRIPT_WEB_DISPLAY
-    Script_Check_HTML_Setvars();
-  #endif
-
-  char tmp[8];
-  char svalue[32];
-  char webindex[5];
-
-  WebGetArg("o", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    ShowWebSource(SRC_WEBGUI);
-    uint32_t device = atoi(tmp);
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      if (device < 2) {
-        ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE);
-      } else {
-        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), device -2);
-        ExecuteCommand(svalue, SRC_WEBGUI);
-      }
-    } else {
-#endif
-#ifdef USE_SHUTTER
-      int32_t ShutterWebButton;
-      if (ShutterWebButton = IsShutterWebButton(device)) {
-        snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
-        ExecuteWebCommand(svalue, SRC_WEBGUI);
-      } else {
-#endif
-        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
-#ifdef USE_SHUTTER
-      }
-#endif
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-  }
-  WebGetArg("d0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("w0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-  for (uint32_t j = 1; j <= pwm_channels; j++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    if (strlen(tmp)) {
-      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp);
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-  }
-  WebGetArg("t0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_COLORTEMPERATURE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("h0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "1 %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("n0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "2 %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-#ifdef USE_SHUTTER
-  for (uint32_t j = 1; j <= shutters_present; j++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    if (strlen(tmp)) {
-      snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), j, tmp);
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-  }
-#endif
-#ifdef USE_SONOFF_RF
-  WebGetArg("k", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_RFKEY "%s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-#endif
-  WSContentBegin(200, CT_HTML);
-  WSContentSend_P(PSTR("{t}"));
-  XsnsCall(FUNC_WEB_SENSOR);
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  XdrvCall(FUNC_WEB_SENSOR);
-#endif
-
-  WSContentSend_P(PSTR("</table>"));
-
-  if (devices_present) {
-    WSContentSend_P(PSTR("{t}<tr>"));
-    uint32_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32;
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      WSContentSend_P(HTTP_DEVICE_STATE, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
-      uint32_t fanspeed = GetFanspeed();
-      snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fanspeed);
-      WSContentSend_P(HTTP_DEVICE_STATE, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
-    } else {
-#endif
-      for (uint32_t idx = 1; idx <= devices_present; idx++) {
-        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1));
-        WSContentSend_P(HTTP_DEVICE_STATE, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
-      }
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-  WSContentEnd();
-
-  return true;
-}
-
-#ifdef USE_SHUTTER
-int32_t IsShutterWebButton(uint32_t idx) {
-
-  int32_t ShutterWebButton = 0;
-  if (Settings.flag3.shutter_mode) {
-    for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-      if (Settings.shutter_startrelay[i] && ((Settings.shutter_startrelay[i] == idx) || (Settings.shutter_startrelay[i] == (idx-1)))) {
-        ShutterWebButton = (Settings.shutter_startrelay[i] == idx) ? (i+1): (-1-i);
-        break;
-      }
-    }
-  }
-  return ShutterWebButton;
-}
-#endif
-
-
-
-#ifndef FIRMWARE_MINIMAL
-
-void HandleConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION);
-
-  WSContentStart_P(S_CONFIGURATION);
-  WSContentSendStyle();
-
-  WSContentButton(BUTTON_MODULE);
-  WSContentButton(BUTTON_WIFI);
-
-  XdrvCall(FUNC_WEB_ADD_BUTTON);
-  XsnsCall(FUNC_WEB_ADD_BUTTON);
-
-  WSContentButton(BUTTON_LOGGING);
-  WSContentButton(BUTTON_OTHER);
-  WSContentButton(BUTTON_TEMPLATE);
-
-  WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
-  WSContentButton(BUTTON_BACKUP);
-  WSContentButton(BUTTON_RESTORE);
-
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-
-
-
-void HandleTemplateConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    TemplateSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[30];
-
-  if (WebServer->hasArg("m")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
-      uint32_t midx = pgm_read_byte(kModuleNiceList + i);
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
-    }
-    WSContentEnd();
-    return;
-  }
-
-  WebGetArg("t", stemp, sizeof(stemp));
-  if (strlen(stemp)) {
-    uint32_t module = atoi(stemp);
-    uint32_t module_save = Settings.module;
-    Settings.module = module;
-    myio cmodule;
-    ModuleGpios(&cmodule);
-    gpio_flag flag = ModuleFlag();
-    Settings.module = module_save;
-
-    WSContentBegin(200, CT_PLAIN);
-    WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str());
-    for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-      if (1 == i) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);
-      }
-      uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-    }
-    WSContentSend_P(PSTR("}1"));
-
-    for (uint32_t i = 0; i < ADC0_END; i++) {
-      if (1 == i) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ADC0_USER, D_SENSOR_USER, ADC0_USER);
-      }
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, i, GetTextIndexed(stemp, sizeof(stemp), i, kAdc0Names), i);
-    }
-    WSContentSend_P(PSTR("}1"));
-
-    for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-      if ((i < 6) || ((i > 8) && (i != 11))) {
-        WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", cmodule.io[i]);
-      }
-    }
-    WSContentSend_P(PSTR("}1%d}1%d"), flag, Settings.user_template_base);
-    WSContentEnd();
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TEMPLATE);
-
-  WSContentStart_P(S_CONFIGURE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_TEMPLATE);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_TEMPLATE);
-  WSContentSend_P(HTTP_TABLE100);
-  WSContentSend_P(PSTR("<tr><td><b>" D_TEMPLATE_NAME "</b></td><td style='width:200px'><input id='s1' placeholder='" D_TEMPLATE_NAME "'></td></tr>"
-                       "<tr><td><b>" D_BASE_TYPE "</b></td><td><select id='g99' onchange='st(this.value)'></select></td></tr>"
-                       "</table>"
-                       "<hr/>"));
-  WSContentSend_P(HTTP_TABLE100);
-  for (uint32_t i = 0; i < 17; i++) {
-    if ((i < 6) || ((i > 8) && (i != 11))) {
-      WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_GPIO "%d</font></b></td><td%s><select id='g%d'></select></td></tr>"),
-        ((9==i)||(10==i)) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? " style='width:200px'" : "", i);
-    }
-  }
-  WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_ADC "0</font></b></td><td><select id='g17'></select></td></tr>"), WebColor(COL_TEXT));
-  WSContentSend_P(PSTR("</table>"));
-  gpio_flag flag = ModuleFlag();
-  if (flag.data > ADC0_USER) {
-    WSContentSend_P(HTTP_FORM_TEMPLATE_FLAG);
-  }
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void TemplateSaveSettings(void)
-{
-  char tmp[sizeof(Settings.user_template.name)];
-  char webindex[5];
-  char svalue[128];
-
-  WebGetArg("s1", tmp, sizeof(tmp));
-  snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " {\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), tmp);
-
-  uint32_t j = 0;
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    if (6 == i) { j = 9; }
-    if (8 == i) { j = 12; }
-    snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    uint8_t gpio = atoi(tmp);
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s%d"), svalue, (i>0)?",":"", gpio);
-    j++;
-  }
-
-  WebGetArg("g17", tmp, sizeof(tmp));
-  uint32_t flag = atoi(tmp);
-  for (uint32_t i = 0; i < GPIO_FLAG_USED; i++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("c%d"), i);
-    uint32_t state = WebServer->hasArg(webindex) << i +4;
-    flag += state;
-  }
-  WebGetArg("g99", tmp, sizeof(tmp));
-  uint32_t base = atoi(tmp) +1;
-
-  snprintf_P(svalue, sizeof(svalue), PSTR("%s],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), svalue, flag, base);
-  ExecuteWebCommand(svalue, SRC_WEBGUI);
-}
-
-
-
-void HandleModuleConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    ModuleSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[30];
-  uint32_t midx;
-  myio cmodule;
-  ModuleGpios(&cmodule);
-
-  if (WebServer->hasArg("m")) {
-    WSContentBegin(200, CT_PLAIN);
-    uint32_t vidx = 0;
-    for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
-      if (0 == i) {
-        midx = USER_MODULE;
-        vidx = 0;
-      } else {
-        midx = pgm_read_byte(kModuleNiceList + i -1);
-        vidx = midx +1;
-      }
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
-    }
-    WSContentEnd();
-    return;
-  }
-
-  if (WebServer->hasArg("g")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t j = 0; j < sizeof(kGpioNiceList); j++) {
-      midx = pgm_read_byte(kGpioNiceList + j);
-      if (!GetUsedInModule(midx, cmodule.io)) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-      }
-    }
-    WSContentEnd();
-    return;
-  }
-
-#ifndef USE_ADC_VCC
-  if (WebServer->hasArg("a")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t j = 0; j < ADC0_END; j++) {
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, j, GetTextIndexed(stemp, sizeof(stemp), j, kAdc0Names), j);
-    }
-    WSContentEnd();
-    return;
-  }
-#endif
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MODULE);
-
-  WSContentStart_P(S_CONFIGURE_MODULE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE1, Settings.module);
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (ValidGPIO(i, cmodule.io[i])) {
-      WSContentSend_P(PSTR("sk(%d,%d);"), my_module.io[i], i);
-    }
-  }
-  WSContentSend_P(HTTP_SCRIPT_MODULE2, Settings.my_adc0);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_MODULE, AnyModuleName(MODULE).c_str());
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (ValidGPIO(i, cmodule.io[i])) {
-      snprintf_P(stemp, 3, PINS_WEMOS +i*2);
-      char sesp8285[40];
-      snprintf_P(sesp8285, sizeof(sesp8285), PSTR("<font color='#%06x'>ESP8285</font>"), WebColor(COL_TEXT_WARNING));
-      WSContentSend_P(PSTR("<tr><td style='width:190px'>%s <b>" D_GPIO "%d</b> %s</td><td style='width:176px'><select id='g%d'></select></td></tr>"),
-        (WEMOS==my_module_type)?stemp:"", i, (0==i)? D_SENSOR_BUTTON "1":(1==i)? D_SERIAL_OUT :(3==i)? D_SERIAL_IN :((9==i)||(10==i))? sesp8285 :(12==i)? D_SENSOR_RELAY "1":(13==i)? D_SENSOR_LED "1i":(14==i)? D_SENSOR :"", i);
-    }
-  }
-#ifndef USE_ADC_VCC
-  if (ValidAdc()) {
-    WSContentSend_P(PSTR("<tr><td>%s <b>" D_ADC "0</b></td><td style='width:176px'><select id='g17'></select></td></tr>"), (WEMOS==my_module_type)?"A0":"");
-  }
-#endif
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void ModuleSaveSettings(void)
-{
-  char tmp[8];
-  char webindex[5];
-
-  WebGetArg("g99", tmp, sizeof(tmp));
-  uint32_t new_module = (!strlen(tmp)) ? MODULE : atoi(tmp);
-  Settings.last_module = Settings.module;
-  Settings.module = new_module;
-  SetModuleType();
-  myio cmodule;
-  ModuleGpios(&cmodule);
-  String gpios = "";
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (Settings.last_module != new_module) {
-      Settings.my_gp.io[i] = GPIO_NONE;
-    } else {
-      if (ValidGPIO(i, cmodule.io[i])) {
-        snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), i);
-        WebGetArg(webindex, tmp, sizeof(tmp));
-        Settings.my_gp.io[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-        gpios += F(", " D_GPIO ); gpios += String(i); gpios += F(" "); gpios += String(Settings.my_gp.io[i]);
-      }
-    }
-  }
-#ifndef USE_ADC_VCC
-  WebGetArg("g17", tmp, sizeof(tmp));
-  Settings.my_adc0 = (!strlen(tmp)) ? 0 : atoi(tmp);
-  gpios += F(", " D_ADC "0 "); gpios += String(Settings.my_adc0);
-#endif
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MODULE "%s " D_CMND_MODULE "%s"), ModuleName().c_str(), gpios.c_str());
-}
-
-
-
-const char kUnescapeCode[] = "&><\"\'";
-const char kEscapeCode[] PROGMEM = "&amp;|&gt;|&lt;|&quot;|&apos;";
-
-String HtmlEscape(const String unescaped) {
-  char escaped[10];
-  size_t ulen = unescaped.length();
-  String result = "";
-  for (size_t i = 0; i < ulen; i++) {
-    char c = unescaped[i];
-    char *p = strchr(kUnescapeCode, c);
-    if (p != nullptr) {
-      result += GetTextIndexed(escaped, sizeof(escaped), p - kUnescapeCode, kEscapeCode);
-    } else {
-      result += c;
-    }
-  }
-  return result;
-}
-
-
-const char kEncryptionType[] PROGMEM = "|||" D_WPA_PSK "||" D_WPA2_PSK "|" D_WEP "||" D_NONE "|" D_AUTO;
-
-void HandleWifiConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI);
-
-  if (WebServer->hasArg("save") && HTTP_MANAGER_RESET_ONLY != Web.state) {
-    WifiSaveSettings();
-    WebRestart(2);
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_WIFI, !WifiIsInManagerMode());
-  WSContentSend_P(HTTP_SCRIPT_WIFI);
-  WSContentSendStyle();
-
-  if (HTTP_MANAGER_RESET_ONLY != Web.state) {
-    if (WebServer->hasArg("scan")) {
-#ifdef USE_EMULATION
-      UdpDisconnect();
-#endif
-      int n = WiFi.scanNetworks();
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_SCAN_DONE));
-
-      if (0 == n) {
-        AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, S_NO_NETWORKS_FOUND);
-        WSContentSend_P(S_NO_NETWORKS_FOUND);
-        WSContentSend_P(PSTR(". " D_REFRESH_TO_SCAN_AGAIN "."));
-      } else {
-
-        int indices[n];
-        for (uint32_t i = 0; i < n; i++) {
-          indices[i] = i;
-        }
-
-
-        for (uint32_t i = 0; i < n; i++) {
-          for (uint32_t j = i + 1; j < n; j++) {
-            if (WiFi.RSSI(indices[j]) > WiFi.RSSI(indices[i])) {
-              std::swap(indices[i], indices[j]);
-            }
-          }
-        }
-
-
-        String cssid;
-        for (uint32_t i = 0; i < n; i++) {
-          if (-1 == indices[i]) { continue; }
-          cssid = WiFi.SSID(indices[i]);
-          uint32_t cschn = WiFi.channel(indices[i]);
-          for (uint32_t j = i + 1; j < n; j++) {
-            if ((cssid == WiFi.SSID(indices[j])) && (cschn == WiFi.channel(indices[j]))) {
-              DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
-              indices[j] = -1;
-            }
-          }
-        }
-
-
-        for (uint32_t i = 0; i < n; i++) {
-          if (-1 == indices[i]) { continue; }
-          DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"),
-            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), WiFi.RSSI(indices[i]));
-          int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i]));
-          int auth = WiFi.encryptionType(indices[i]);
-          char encryption[20];
-          WSContentSend_P(PSTR("<div><a href='#p' onclick='c(this)'>%s</a>&nbsp;(%d)&nbsp<span class='q'>%s %d%% (%d dBm)</span></div>"),
-            HtmlEscape(WiFi.SSID(indices[i])).c_str(),
-            WiFi.channel(indices[i]),
-            GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
-            quality, WiFi.RSSI(indices[i])
-          );
-          delay(0);
-
-        }
-        WSContentSend_P(PSTR("<br>"));
-      }
-    } else {
-      WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br>"));
-    }
-
-
-    WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
-    WSContentSend_P(HTTP_FORM_END);
-  }
-
-  if (WifiIsInManagerMode()) {
-#ifndef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_RESTORE);
-    WSContentButton(BUTTON_RESET_CONFIGURATION);
-#endif
-    WSContentSpaceButton(BUTTON_RESTART);
-  } else {
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-  }
-  WSContentStop();
-}
-
-void WifiSaveSettings(void)
-{
-  char tmp[TOPSZ];
-
-  WebGetArg("h", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_HOSTNAME, (!strlen(tmp)) ? WIFI_HOSTNAME : tmp);
-  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-  }
-  WebGetArg("c", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_CORS, (!strlen(tmp)) ? CORS_DOMAIN : tmp);
-  WebGetArg("s1", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STASSID1, (!strlen(tmp)) ? STA_SSID1 : tmp);
-  WebGetArg("s2", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STASSID2, (!strlen(tmp)) ? STA_SSID2 : tmp);
-  WebGetArg("p1", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STAPWD1, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD1) : tmp);
-  WebGetArg("p2", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STAPWD2, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD2) : tmp);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_SSID "2 %s, " D_CMND_CORS " %s"),
-    SettingsText(SET_HOSTNAME), SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), SettingsText(SET_CORS));
-}
-
-
-
-void HandleLoggingConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING);
-
-  if (WebServer->hasArg("save")) {
-    LoggingSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_LOGGING);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_LOG1);
-  char stemp1[45];
-  char stemp2[32];
-  uint8_t dlevel[4] = { LOG_LEVEL_INFO, LOG_LEVEL_INFO, LOG_LEVEL_NONE, LOG_LEVEL_NONE };
-  for (uint32_t idx = 0; idx < 4; idx++) {
-    if ((2==idx) && !Settings.flag.mqtt_enabled) { continue; }
-    uint32_t llevel = (0==idx)?Settings.seriallog_level:(1==idx)?Settings.weblog_level:(2==idx)?Settings.mqttlog_level:Settings.syslog_level;
-    WSContentSend_P(PSTR("<p><b>%s</b> (%s)<br><select id='l%d'>"),
-      GetTextIndexed(stemp1, sizeof(stemp1), idx, kLoggingOptions),
-      GetTextIndexed(stemp2, sizeof(stemp2), dlevel[idx], kLoggingLevels),
-      idx);
-    for (uint32_t i = LOG_LEVEL_NONE; i <= LOG_LEVEL_DEBUG_MORE; i++) {
-      WSContentSend_P(PSTR("<option%s value='%d'>%d %s</option>"),
-        (i == llevel) ? " selected" : "", i, i,
-        GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
-    }
-    WSContentSend_P(PSTR("</select></p>"));
-  }
-  WSContentSend_P(HTTP_FORM_LOG2, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void LoggingSaveSettings(void)
-{
-  char tmp[TOPSZ];
-
-  WebGetArg("l0", tmp, sizeof(tmp));
-  SetSeriallog((!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp));
-  WebGetArg("l1", tmp, sizeof(tmp));
-  Settings.weblog_level = (!strlen(tmp)) ? WEB_LOG_LEVEL : atoi(tmp);
-  WebGetArg("l2", tmp, sizeof(tmp));
-  Settings.mqttlog_level = (!strlen(tmp)) ? MQTT_LOG_LEVEL : atoi(tmp);
-  WebGetArg("l3", tmp, sizeof(tmp));
-  SetSyslog((!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp));
-  WebGetArg("lh", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_SYSLOG_HOST, (!strlen(tmp)) ? SYS_LOG_HOST : tmp);
-  WebGetArg("lp", tmp, sizeof(tmp));
-  Settings.syslog_port = (!strlen(tmp)) ? SYS_LOG_PORT : atoi(tmp);
-  WebGetArg("lt", tmp, sizeof(tmp));
-  Settings.tele_period = (!strlen(tmp)) ? TELE_PERIOD : atoi(tmp);
-  if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) {
-    Settings.tele_period = 10;
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG D_CMND_SERIALLOG " %d, " D_CMND_WEBLOG " %d, " D_CMND_MQTTLOG " %d, " D_CMND_SYSLOG " %d, " D_CMND_LOGHOST " %s, " D_CMND_LOGPORT " %d, " D_CMND_TELEPERIOD " %d"),
-    Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
-}
-
-
-
-void HandleOtherConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER);
-
-  if (WebServer->hasArg("save")) {
-    OtherSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_OTHER);
-  WSContentSendStyle();
-
-  TemplateJson();
-  char stemp[strlen(mqtt_data) +1];
-  strlcpy(stemp, mqtt_data, sizeof(stemp));
-  WSContentSend_P(HTTP_FORM_OTHER, stemp, (USER_MODULE == Settings.module) ? " checked disabled" : "", (Settings.flag.mqtt_enabled) ? " checked" : "");
-
-  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) { maxfn = 1; }
-#endif
-  for (uint32_t i = 0; i < maxfn; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i +1);
-    WSContentSend_P(PSTR("<b>" D_FRIENDLY_NAME " %d</b> (" FRIENDLY_NAME "%s)<br><input id='a%d' placeholder='" FRIENDLY_NAME "%s' value='%s'><p></p>"),
-      i +1,
-      (i) ? stemp : "",
-      i,
-      (i) ? stemp : "",
-      SettingsText(SET_FRIENDLYNAME1 + i));
-  }
-
-#ifdef USE_EMULATION
-  WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));
-  for (uint32_t i = 0; i < EMUL_MAX; i++) {
-#ifndef USE_EMULATION_WEMO
-    if (i == EMUL_WEMO) { i++; }
-#endif
-#ifndef USE_EMULATION_HUE
-    if (i == EMUL_HUE) { i++; }
-#endif
-    if (i < EMUL_MAX) {
-      WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br>"),
-        i, i,
-        (i == Settings.flag2.emulation) ? " checked" : "",
-        GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
-        (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
-    }
-  }
-  WSContentSend_P(PSTR("</p></fieldset>"));
-#endif
-
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void OtherSaveSettings(void)
-{
-  char tmp[TOPSZ];
-  char webindex[5];
-  char friendlyname[TOPSZ];
-  char message[LOGSZ];
-
-  WebGetArg("wp", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
-  Settings.flag.mqtt_enabled = WebServer->hasArg("b1");
-#ifdef USE_EMULATION
-  WebGetArg("b2", tmp, sizeof(tmp));
-  Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
-#endif
-
-  snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);
-  for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("a%d"), i);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    snprintf_P(friendlyname, sizeof(friendlyname), PSTR(FRIENDLY_NAME"%d"), i +1);
-    SettingsUpdateText(SET_FRIENDLYNAME1 +i, (!strlen(tmp)) ? (i) ? friendlyname : FRIENDLY_NAME : tmp);
-    snprintf_P(message, sizeof(message), PSTR("%s%s %s"), message, (i) ? "," : "", SettingsText(SET_FRIENDLYNAME1 +i));
-  }
-  AddLog_P(LOG_LEVEL_INFO, message);
-
-  WebGetArg("t1", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    char svalue[128];
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-
-    if (WebServer->hasArg("t2")) {
-      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0"));
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-
-  }
-}
-
-
-
-void HandleBackupConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION));
-
-  if (!SettingsBufferAlloc()) { return; }
-
-  WiFiClient myClient = WebServer->client();
-  WebServer->setContentLength(sizeof(Settings));
-
-  char attachment[TOPSZ];
-
-
-
-
-  char hostname[sizeof(my_hostname)];
-  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(hostname, my_hostname), my_version);
-
-  WebServer->sendHeader(F("Content-Disposition"), attachment);
-
-  WSSend(200, CT_STREAM, "");
-
-  uint32_t cfg_crc32 = Settings.cfg_crc32;
-  Settings.cfg_crc32 = GetSettingsCrc32();
-
-  memcpy(settings_buffer, &Settings, sizeof(Settings));
-  if (Web.config_xor_on_set) {
-    for (uint32_t i = 2; i < sizeof(Settings); i++) {
-      settings_buffer[i] ^= (Web.config_xor_on_set +i);
-    }
-  }
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  size_t written = myClient.write((const char*)settings_buffer, sizeof(Settings));
-  if (written < sizeof(Settings)) {
-    myClient.write((const char*)settings_buffer +written, sizeof(Settings) -written);
-  }
-#else
-  myClient.write((const char*)settings_buffer, sizeof(Settings));
-#endif
-
-  SettingsBufferFree();
-
-  Settings.cfg_crc32 = cfg_crc32;
-}
-
-
-
-void HandleResetConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESET_CONFIGURATION);
-
-  WSContentStart_P(S_RESET_CONFIGURATION, !WifiIsInManagerMode());
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'>" D_CONFIGURATION_RESET "</div>"));
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  char command[CMDSZ];
-  snprintf_P(command, sizeof(command), PSTR(D_CMND_RESET " 1"));
-  ExecuteWebCommand(command, SRC_WEBGUI);
-}
-
-void HandleRestoreConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION);
-
-  WSContentStart_P(S_RESTORE_CONFIGURATION);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_RST);
-  WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
-  if (WifiIsInManagerMode()) {
-    WSContentSpaceButton(BUTTON_MAIN);
-  } else {
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-  }
-  WSContentStop();
-
-  Web.upload_error = 0;
-  Web.upload_file_type = UPL_SETTINGS;
-}
-
-
-
-void HandleInformation(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION);
-
-  char stopic[TOPSZ];
-
-  int freeMem = ESP.getFreeHeap();
-
-  WSContentStart_P(S_INFORMATION);
-
-
-
-  WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN);
-  WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>"));
-  WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s%s"), my_version, my_image);
-  WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str());
-  WSContentSend_P(PSTR("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/%s"), ESP.getSdkVersion());
-  WSContentSend_P(PSTR("}1" D_UPTIME "}2%s"), GetUptime().c_str());
-  WSContentSend_P(PSTR("}1" D_FLASH_WRITE_COUNT "}2%d at 0x%X"), Settings.save_flag, GetSettingsAddress());
-  WSContentSend_P(PSTR("}1" D_BOOT_COUNT "}2%d"), Settings.bootcount);
-  WSContentSend_P(PSTR("}1" D_RESTART_REASON "}2%s"), GetResetReason().c_str());
-  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present;
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) { maxfn = 1; }
-#endif
-  for (uint32_t i = 0; i < maxfn; i++) {
-    WSContentSend_P(PSTR("}1" D_FRIENDLY_NAME " %d}2%s"), i +1, SettingsText(SET_FRIENDLYNAME1 +i));
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI());
-  WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "");
-#if LWIP_IPV6
-    String ipv6_addr = WifiGetIPv6();
-    if(ipv6_addr != ""){
-      WSContentSend_P(PSTR("}1 IPv6 Address }2%s"), ipv6_addr.c_str());
-    }
-#endif
-  if (static_cast<uint32_t>(WiFi.localIP()) != 0) {
-    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.localIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), IPAddress(Settings.ip_address[1]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_SUBNET_MASK "}2%s"), IPAddress(Settings.ip_address[2]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_DNS_SERVER "}2%s"), IPAddress(Settings.ip_address[3]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.macAddress().c_str());
-  }
-  if (static_cast<uint32_t>(WiFi.softAPIP()) != 0) {
-    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.softAPIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), WiFi.softAPIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.softAPmacAddress().c_str());
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  if (Settings.flag.mqtt_enabled) {
-    WSContentSend_P(PSTR("}1" D_MQTT_HOST "}2%s"), SettingsText(SET_MQTT_HOST));
-    WSContentSend_P(PSTR("}1" D_MQTT_PORT "}2%d"), Settings.mqtt_port);
-    WSContentSend_P(PSTR("}1" D_MQTT_USER "}2%s"), SettingsText(SET_MQTT_USER));
-    WSContentSend_P(PSTR("}1" D_MQTT_CLIENT "}2%s"), mqtt_client);
-    WSContentSend_P(PSTR("}1" D_MQTT_TOPIC "}2%s"), SettingsText(SET_MQTT_TOPIC));
-
-    WSContentSend_P(PSTR("}1" D_MQTT_GROUP_TOPIC "}2%s"), GetGroupTopic_P(stopic, ""));
-    WSContentSend_P(PSTR("}1" D_MQTT_FULL_TOPIC "}2%s"), GetTopic_P(stopic, CMND, mqtt_topic, ""));
-    WSContentSend_P(PSTR("}1" D_MQTT " " D_FALLBACK_TOPIC "}2%s"), GetFallbackTopic_P(stopic, ""));
-  } else {
-    WSContentSend_P(PSTR("}1" D_MQTT "}2" D_DISABLED));
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-
-#ifdef USE_EMULATION
-  WSContentSend_P(PSTR("}1" D_EMULATION "}2%s"), GetTextIndexed(stopic, sizeof(stopic), Settings.flag2.emulation, kEmulationOptions));
-#else
-  WSContentSend_P(PSTR("}1" D_EMULATION "}2" D_DISABLED));
-#endif
-
-#ifdef USE_DISCOVERY
-  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2%s"), (Settings.flag3.mdns_enabled) ? D_ENABLED : D_DISABLED);
-  if (Settings.flag3.mdns_enabled) {
-#ifdef WEBSERVER_ADVERTISE
-    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_WEB_SERVER));
-#else
-    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_DISABLED));
-#endif
-  }
-#else
-  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2" D_DISABLED));
-#endif
-
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  WSContentSend_P(PSTR("}1" D_ESP_CHIP_ID "}2%d"), ESP.getChipId());
-  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_ID "}20x%06X"), ESP.getFlashChipId());
-  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_SIZE "}2%dkB"), ESP.getFlashChipRealSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_PROGRAM_FLASH_SIZE "}2%dkB"), ESP.getFlashChipSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_PROGRAM_SIZE "}2%dkB"), ESP.getSketchSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_FREE_PROGRAM_SPACE "}2%dkB"), ESP.getFreeSketchSpace() / 1024);
-  WSContentSend_P(PSTR("}1" D_FREE_MEMORY "}2%dkB"), freeMem / 1024);
-  WSContentSend_P(PSTR("</td></tr></table>"));
-
-  WSContentSend_P(HTTP_SCRIPT_INFO_END);
-  WSContentSendStyle();
-
-  WSContentSend_P(PSTR("<style>td{padding:0px 5px;}</style>"
-                       "<div id='i' name='i'></div>"));
-
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-#endif
-
-
-
-void HandleUpgradeFirmware(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE);
-
-  WSContentStart_P(S_FIRMWARE_UPGRADE);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_UPG, SettingsText(SET_OTAURL));
-  WSContentSend_P(HTTP_FORM_RST_UPG, D_UPGRADE);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  Web.upload_error = 0;
-  Web.upload_file_type = UPL_TASMOTA;
-}
-
-void HandleUpgradeFirmwareStart(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  char command[TOPSZ + 10];
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED));
-  WifiConfigCounter();
-
-  char otaurl[TOPSZ];
-  WebGetArg("o", otaurl, sizeof(otaurl));
-  if (strlen(otaurl)) {
-    snprintf_P(command, sizeof(command), PSTR(D_CMND_OTAURL " %s"), otaurl);
-    ExecuteWebCommand(command, SRC_WEBGUI);
-  }
-
-  WSContentStart_P(S_INFORMATION);
-  WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPGRADE_STARTED " ...</b></div>"));
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  snprintf_P(command, sizeof(command), PSTR(D_CMND_UPGRADE " 1"));
-  ExecuteWebCommand(command, SRC_WEBGUI);
-}
-
-void HandleUploadDone(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE));
-
-  char error[100];
-
-  WifiConfigCounter();
-  restart_flag = 0;
-  MqttRetryCounter(0);
-
-  WSContentStart_P(S_INFORMATION);
-  if (!Web.upload_error) {
-    WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
-  }
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
-  if (Web.upload_error) {
-    WSContentSend_P(PSTR("%06x'>" D_FAILED "</font></b><br><br>"), WebColor(COL_TEXT_WARNING));
-#ifdef USE_RF_FLASH
-    if (Web.upload_error < 15) {
-#else
-    if ((Web.upload_error < 10) || (14 == Web.upload_error)) {
-      if (14 == Web.upload_error) { Web.upload_error = 10; }
-#endif
-      GetTextIndexed(error, sizeof(error), Web.upload_error -1, kUploadErrors);
-    } else {
-      snprintf_P(error, sizeof(error), PSTR(D_UPLOAD_ERROR_CODE " %d"), Web.upload_error);
-    }
-    WSContentSend_P(error);
-    DEBUG_CORE_LOG(PSTR("UPL: %s"), error);
-    stop_flash_rotate = Settings.flag.stop_flash_rotate;
-  } else {
-    WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br>"), WebColor(COL_TEXT_SUCCESS));
-    WSContentSend_P(HTTP_MSG_RSTRT);
-    ShowWebSource(SRC_WEBGUI);
-#ifdef USE_TASMOTA_SLAVE
-    if (TasmotaSlave_GetFlagFlashing()) {
-      restart_flag = 0;
-    } else {
-      restart_flag = 2;
-    }
-#else
-    restart_flag = 2;
-#endif
-  }
-  SettingsBufferFree();
-  WSContentSend_P(PSTR("</div><br>"));
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-#ifdef USE_TASMOTA_SLAVE
-  if (TasmotaSlave_GetFlagFlashing()) {
-    TasmotaSlave_Flash();
-  }
-#endif
-}
-
-void HandleUploadLoop(void)
-{
-
-  bool _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level);
-
-  if (HTTP_USER == Web.state) { return; }
-  if (Web.upload_error) {
-    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
-    return;
-  }
-
-  HTTPUpload& upload = WebServer->upload();
-
-  if (UPLOAD_FILE_START == upload.status) {
-    restart_flag = 60;
-    if (0 == upload.filename.c_str()[0]) {
-      Web.upload_error = 1;
-      return;
-    }
-    SettingsSave(1);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s ..."), upload.filename.c_str());
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (!SettingsBufferAlloc()) {
-        Web.upload_error = 2;
-        return;
-      }
-    } else {
-      MqttRetryCounter(60);
-#ifdef USE_EMULATION
-      UdpDisconnect();
-#endif
-#ifdef USE_ARILUX_RF
-      AriluxRfDisable();
-#endif
-      if (Settings.flag.mqtt_enabled) {
-        MqttDisconnect();
-      }
-      uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-      if (!Update.begin(maxSketchSpace)) {
-
-
-
-
-
-
-        Web.upload_error = 2;
-        return;
-      }
-    }
-    Web.upload_progress_dot_count = 0;
-  } else if (!Web.upload_error && (UPLOAD_FILE_WRITE == upload.status)) {
-    if (0 == upload.totalSize) {
-      if (UPL_SETTINGS == Web.upload_file_type) {
-        Web.config_block_count = 0;
-      }
-      else {
-#ifdef USE_RF_FLASH
-        if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) {
-          Update.end();
-          Web.upload_file_type = UPL_EFM8BB1;
-
-          Web.upload_error = SnfBrUpdateInit();
-          if (Web.upload_error != 0) { return; }
-        } else
-#endif
-#ifdef USE_TASMOTA_SLAVE
-        if ((WEMOS == my_module_type) && (upload.buf[0] == ':')) {
-          Update.end();
-          Web.upload_file_type = UPL_TASMOTASLAVE;
-          Web.upload_error = TasmotaSlave_UpdateInit();
-          if (Web.upload_error != 0) { return; }
-        } else
-#endif
-        {
-          if ((upload.buf[0] != 0xE9) && (upload.buf[0] != 0x1F)) {
-            Web.upload_error = 3;
-            return;
-          }
-          if (0xE9 == upload.buf[0]) {
-            uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
-            if (bin_flash_size > ESP.getFlashChipRealSize()) {
-              Web.upload_error = 4;
-              return;
-            }
-
-          }
-        }
-      }
-    }
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (!Web.upload_error) {
-        if (upload.currentSize > (sizeof(Settings) - (Web.config_block_count * HTTP_UPLOAD_BUFLEN))) {
-          Web.upload_error = 9;
-          return;
-        }
-        memcpy(settings_buffer + (Web.config_block_count * HTTP_UPLOAD_BUFLEN), upload.buf, upload.currentSize);
-        Web.config_block_count++;
-      }
-    }
-#ifdef USE_RF_FLASH
-    else if (UPL_EFM8BB1 == Web.upload_file_type) {
-      if (efm8bb1_update != nullptr) {
-        ssize_t result = rf_glue_remnant_with_new_data_and_write(efm8bb1_update, upload.buf, upload.currentSize);
-        free(efm8bb1_update);
-        efm8bb1_update = nullptr;
-        if (result != 0) {
-          Web.upload_error = abs(result);
-          return;
-        }
-      }
-      ssize_t result = rf_search_and_write(upload.buf, upload.currentSize);
-      if (result < 0) {
-        Web.upload_error = abs(result);
-        return;
-      } else if (result > 0) {
-        if ((size_t)result > upload.currentSize) {
-
-          Web.upload_error = 9;
-          return;
-        }
-
-        size_t remnant_sz = upload.currentSize - result;
-        efm8bb1_update = (uint8_t *) malloc(remnant_sz + 1);
-        if (efm8bb1_update == nullptr) {
-          Web.upload_error = 2;
-          return;
-        }
-        memcpy(efm8bb1_update, upload.buf + result, remnant_sz);
-
-        efm8bb1_update[remnant_sz] = '\0';
-      }
-    }
-#endif
-#ifdef USE_TASMOTA_SLAVE
-    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
-      TasmotaSlave_WriteBuffer(upload.buf, upload.currentSize);
-    }
-#endif
-    else {
-      if (!Web.upload_error && (Update.write(upload.buf, upload.currentSize) != upload.currentSize)) {
-        Web.upload_error = 5;
-        return;
-      }
-      if (_serialoutput) {
-        Serial.printf(".");
-        Web.upload_progress_dot_count++;
-        if (!(Web.upload_progress_dot_count % 80)) { Serial.println(); }
-      }
-    }
-  } else if(!Web.upload_error && (UPLOAD_FILE_END == upload.status)) {
-    if (_serialoutput && (Web.upload_progress_dot_count % 80)) {
-      Serial.println();
-    }
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (Web.config_xor_on_set) {
-        for (uint32_t i = 2; i < sizeof(Settings); i++) {
-          settings_buffer[i] ^= (Web.config_xor_on_set +i);
-        }
-      }
-      bool valid_settings = false;
-      unsigned long buffer_version = settings_buffer[11] << 24 | settings_buffer[10] << 16 | settings_buffer[9] << 8 | settings_buffer[8];
-      if (buffer_version > 0x06000000) {
-        uint32_t buffer_size = settings_buffer[3] << 8 | settings_buffer[2];
-        if (buffer_version > 0x0606000A) {
-          uint32_t buffer_crc32 = settings_buffer[4095] << 24 | settings_buffer[4094] << 16 | settings_buffer[4093] << 8 | settings_buffer[4092];
-          valid_settings = (GetCfgCrc32(settings_buffer, buffer_size -4) == buffer_crc32);
-        } else {
-          uint16_t buffer_crc16 = settings_buffer[15] << 8 | settings_buffer[14];
-          valid_settings = (GetCfgCrc16(settings_buffer, buffer_size) == buffer_crc16);
-        }
-      } else {
-        valid_settings = (settings_buffer[0] == CONFIG_FILE_SIGN);
-      }
-      if (valid_settings) {
-        SettingsDefaultSet2();
-        memcpy((char*)&Settings +16, settings_buffer +16, sizeof(Settings) -16);
-        Settings.version = buffer_version;
-        SettingsBufferFree();
-      } else {
-        Web.upload_error = 8;
-        return;
-      }
-    }
-#ifdef USE_RF_FLASH
-    else if (UPL_EFM8BB1 == Web.upload_file_type) {
-
-      Web.upload_file_type = UPL_TASMOTA;
-    }
-#endif
-#ifdef USE_TASMOTA_SLAVE
-    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
-
-      TasmotaSlave_SetFlagFlashing(true);
-      Web.upload_file_type = UPL_TASMOTA;
-    }
-#endif
-    else {
-      if (!Update.end(true)) {
-        if (_serialoutput) { Update.printError(Serial); }
-        Web.upload_error = 6;
-        return;
-      }
-      if (!VersionCompatible()) {
-        Web.upload_error = 14;
-        return;
-      }
-    }
-    if (!Web.upload_error) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_SUCCESSFUL " %u bytes. " D_RESTARTING), upload.totalSize);
-    }
-  } else if (UPLOAD_FILE_ABORTED == upload.status) {
-    restart_flag = 0;
-    MqttRetryCounter(0);
-    Web.upload_error = 7;
-    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
-  }
-  delay(0);
-}
-
-
-
-void HandlePreflightRequest(void)
-{
-  HttpHeaderCors();
-  WebServer->sendHeader(F("Access-Control-Allow-Methods"), F("GET, POST"));
-  WebServer->sendHeader(F("Access-Control-Allow-Headers"), F("authorization"));
-  WSSend(200, CT_HTML, "");
-}
-
-
-
-void HandleHttpCommand(void)
-{
-  if (!HttpCheckPriviledgedAccess(false)) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND));
-
-  bool valid = true;
-  if (strlen(SettingsText(SET_WEBPWD))) {
-    char tmp1[33];
-    WebGetArg("user", tmp1, sizeof(tmp1));
-    char tmp2[strlen(SettingsText(SET_WEBPWD)) +1];
-    WebGetArg("password", tmp2, sizeof(tmp2));
-    if (!(!strcmp(tmp1, WEB_USERNAME) && !strcmp(tmp2, SettingsText(SET_WEBPWD)))) { valid = false; }
-  }
-
-  WSContentBegin(200, CT_JSON);
-  if (valid) {
-    uint32_t curridx = web_log_index;
-    String svalue = WebServer->arg("cmnd");
-    if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
-      ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCOMMAND);
-      if (web_log_index != curridx) {
-        uint32_t counter = curridx;
-        WSContentSend_P(PSTR("{"));
-        bool cflg = false;
-        do {
-          char* tmp;
-          size_t len;
-          GetLog(counter, &tmp, &len);
-          if (len) {
-
-            char* JSON = (char*)memchr(tmp, '{', len);
-            if (JSON) {
-              size_t JSONlen = len - (JSON - tmp);
-              if (JSONlen > sizeof(mqtt_data)) { JSONlen = sizeof(mqtt_data); }
-              char stemp[JSONlen];
-              strlcpy(stemp, JSON +1, JSONlen -2);
-              WSContentSend_P(PSTR("%s%s"), (cflg) ? "," : "", stemp);
-              cflg = true;
-            }
-          }
-          counter++;
-          counter &= 0xFF;
-          if (!counter) counter++;
-        } while (counter != web_log_index);
-        WSContentSend_P(PSTR("}"));
-      } else {
-        WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENABLE_WEBLOG_FOR_RESPONSE "\"}"));
-      }
-    } else {
-      WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENTER_COMMAND " cmnd=\"}"));
-    }
-  } else {
-    WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_NEED_USER_AND_PASSWORD "\"}"));
-  }
-  WSContentEnd();
-}
-
-
-
-void HandleConsole(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("c2")) {
-    HandleConsoleRefresh();
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE);
-
-  WSContentStart_P(S_CONSOLE);
-  WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings.web_refresh);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_CMND);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-
-void HandleConsoleRefresh(void)
-{
-  bool cflg = true;
-  uint32_t counter = 0;
-
-  String svalue = WebServer->arg("c1");
-  if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), svalue.c_str());
-    ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCONSOLE);
-  }
-
-  char stmp[8];
-  WebGetArg("c2", stmp, sizeof(stmp));
-  if (strlen(stmp)) { counter = atoi(stmp); }
-
-  WSContentBegin(200, CT_PLAIN);
-  WSContentSend_P(PSTR("%d}1%d}1"), web_log_index, Web.reset_web_log_flag);
-  if (!Web.reset_web_log_flag) {
-    counter = 0;
-    Web.reset_web_log_flag = true;
-  }
-  if (counter != web_log_index) {
-    if (!counter) {
-      counter = web_log_index;
-      cflg = false;
-    }
-    do {
-      char* tmp;
-      size_t len;
-      GetLog(counter, &tmp, &len);
-      if (len) {
-        if (len > sizeof(mqtt_data) -2) { len = sizeof(mqtt_data); }
-        char stemp[len +1];
-        strlcpy(stemp, tmp, len);
-        WSContentSend_P(PSTR("%s%s"), (cflg) ? "\n" : "", stemp);
-        cflg = true;
-      }
-      counter++;
-      counter &= 0xFF;
-      if (!counter) { counter++; }
-    } while (counter != web_log_index);
-  }
-  WSContentSend_P(PSTR("}1"));
-  WSContentEnd();
-}
-
-
-
-void HandleNotFound(void)
-{
-
-
-  if (CaptivePortal()) { return; }
-
-#ifdef USE_EMULATION
-#ifdef USE_EMULATION_HUE
-  String path = WebServer->uri();
-  if ((EMUL_HUE == Settings.flag2.emulation) && (path.startsWith("/api"))) {
-    HandleHueApi(&path);
-  } else
-#endif
-#endif
-  {
-    WSContentBegin(404, CT_PLAIN);
-    WSContentSend_P(PSTR(D_FILE_NOT_FOUND "\n\nURI: %s\nMethod: %s\nArguments: %d\n"), WebServer->uri().c_str(), (WebServer->method() == HTTP_GET) ? "GET" : "POST", WebServer->args());
-    for (uint32_t i = 0; i < WebServer->args(); i++) {
-      WSContentSend_P(PSTR(" %s: %s\n"), WebServer->argName(i).c_str(), WebServer->arg(i).c_str());
-    }
-    WSContentEnd();
-  }
-}
-
-
-bool CaptivePortal(void)
-{
-
-  if ((WifiIsInManagerMode()) && !ValidIpAddress(WebServer->hostHeader().c_str())) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_REDIRECTED));
-
-    WebServer->sendHeader(F("Location"), String("http://") + WebServer->client().localIP().toString(), true);
-    WSSend(302, CT_PLAIN, "");
-    WebServer->client().stop();
-    return true;
-  }
-  return false;
-}
-
-
-
-String UrlEncode(const String& text)
-{
-  const char hex[] = "0123456789ABCDEF";
-
- String encoded = "";
- int len = text.length();
- int i = 0;
- while (i < len) {
-  char decodedChar = text.charAt(i++);
-# 2672 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_01_webserver.ino"
-    if ((' ' == decodedChar) || ('+' == decodedChar)) {
-      encoded += '%';
-   encoded += hex[decodedChar >> 4];
-   encoded += hex[decodedChar & 0xF];
-    } else {
-      encoded += decodedChar;
-    }
-
- }
- return encoded;
-}
-
-int WebSend(char *buffer)
-{
-
-
-
-
-
-  char *host;
-  char *user;
-  char *password;
-  char *command;
-  int status = 1;
-
-
-  host = strtok_r(buffer, "]", &command);
-  if (host && command) {
-    RemoveSpace(host);
-    host++;
-    host = strtok_r(host, ",", &user);
-    String url = F("http://");
-    url += host;
-
-    command = Trim(command);
-    if (command[0] != '/') {
-      url += F("/cm?");
-      if (user) {
-        user = strtok_r(user, ":", &password);
-        if (user && password) {
-          char userpass[200];
-          snprintf_P(userpass, sizeof(userpass), PSTR("user=%s&password=%s&"), user, password);
-          url += userpass;
-        }
-      }
-      url += F("cmnd=");
-    }
-    url += command;
-
-    DEBUG_CORE_LOG(PSTR("WEB: Uri |%s|"), url.c_str());
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-    HTTPClient http;
-    if (http.begin(UrlEncode(url))) {
-#else
-    WiFiClient http_client;
-    HTTPClient http;
-    if (http.begin(http_client, UrlEncode(url))) {
-#endif
-      int http_code = http.GET();
-      if (http_code > 0) {
-        if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) {
-#ifdef USE_WEBSEND_RESPONSE
-
-          const char* read = http.getString().c_str();
-          uint32_t j = 0;
-          char text = '.';
-          while (text != '\0') {
-            text = *read++;
-            if (text > 31) {
-              mqtt_data[j++] = text;
-              if (j == sizeof(mqtt_data) -2) { break; }
-            }
-          }
-          mqtt_data[j] = '\0';
-          MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WEBSEND));
-#ifdef USE_SCRIPT
-extern uint8_t tasm_cmd_activ;
-
-          tasm_cmd_activ=0;
-          XdrvRulesProcess();
-#endif
-#endif
-        }
-        status = 0;
-      } else {
-        status = 2;
-      }
-      http.end();
-    } else {
-      status = 3;
-    }
-  }
-  return status;
-}
-
-bool JsonWebColor(const char* dataBuf)
-{
-
-
-
-
-
-  char dataBufLc[strlen(dataBuf) +1];
-  LowerCase(dataBufLc, dataBuf);
-  RemoveSpace(dataBufLc);
-  if (strlen(dataBufLc) < 9) { return false; }
-
-  StaticJsonBuffer<450> jb;
-  JsonObject& obj = jb.parseObject(dataBufLc);
-  if (!obj.success()) { return false; }
-
-  char parm_lc[10];
-  if (obj[LowerCase(parm_lc, D_CMND_WEBCOLOR)].success()) {
-    for (uint32_t i = 0; i < COL_LAST; i++) {
-      const char* color = obj[parm_lc][i];
-      if (color != nullptr) {
-        WebHexCode(i, color);
-      }
-    }
-  }
-  return true;
-}
-
-const char kWebSendStatus[] PROGMEM = D_JSON_DONE "|" D_JSON_WRONG_PARAMETERS "|" D_JSON_CONNECT_FAILED "|" D_JSON_HOST_NOT_FOUND "|" D_JSON_MEMORY_ERROR;
-
-const char kWebCommands[] PROGMEM = "|"
-#ifdef USE_EMULATION
-  D_CMND_EMULATION "|"
-#endif
-#ifdef USE_SENDMAIL
-  D_CMND_SENDMAIL "|"
-#endif
-  D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_WEBREFRESH "|" D_CMND_WEBSEND "|" D_CMND_WEBCOLOR "|"
-  D_CMND_WEBSENSOR "|" D_CMND_WEBBUTTON "|" D_CMND_CORS;
-
-void (* const WebCommand[])(void) PROGMEM = {
-#ifdef USE_EMULATION
-  &CmndEmulation,
-#endif
-#ifdef USE_SENDMAIL
-  &CmndSendmail,
-#endif
-  &CmndWebServer, &CmndWebPassword, &CmndWeblog, &CmndWebRefresh, &CmndWebSend, &CmndWebColor,
-  &CmndWebSensor, &CmndWebButton, &CmndCors };
-
-
-
-
-
-#ifdef USE_EMULATION
-void CmndEmulation(void)
-{
-#if defined(USE_EMULATION_WEMO) && defined(USE_EMULATION_HUE)
-  if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
-#else
-#ifndef USE_EMULATION_WEMO
-  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_HUE == XdrvMailbox.payload)) {
-#endif
-#ifndef USE_EMULATION_HUE
-  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_WEMO == XdrvMailbox.payload)) {
-#endif
-#endif
-    Settings.flag2.emulation = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  ResponseCmndNumber(Settings.flag2.emulation);
-}
-#endif
-
-#ifdef USE_SENDMAIL
-void CmndSendmail(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    uint8_t result = SendMail(XdrvMailbox.data);
-    char stemp1[20];
-    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
-  }
-}
-#endif
-
-
-void CmndWebServer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    Settings.webserver = XdrvMailbox.payload;
-  }
-  if (Settings.webserver) {
-    Response_P(PSTR("{\"" D_CMND_WEBSERVER "\":\"" D_JSON_ACTIVE_FOR " %s " D_JSON_ON_DEVICE " %s " D_JSON_WITH_IP_ADDRESS " %s\"}"),
-      (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
-  } else {
-    ResponseCmndStateText(0);
-  }
-}
-
-void CmndWebPassword(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_WEBPWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
-    ResponseCmndChar(SettingsText(SET_WEBPWD));
-  } else {
-    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
-  }
-}
-
-void CmndWeblog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.weblog_level = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.weblog_level);
-}
-
-void CmndWebRefresh(void)
-{
-  if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload <= 10000)) {
-    Settings.web_refresh = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.web_refresh);
-}
-
-void CmndWebSend(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    uint32_t result = WebSend(XdrvMailbox.data);
-    char stemp1[20];
-    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
-  }
-}
-
-void CmndWebColor(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      if ((XdrvMailbox.data_len > 3) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= COL_LAST)) {
-        WebHexCode(XdrvMailbox.index -1, XdrvMailbox.data);
-      }
-      else if (0 == XdrvMailbox.payload) {
-        SettingsDefaultWebColor();
-      }
-    }
-    else {
-      JsonWebColor(XdrvMailbox.data);
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_WEBCOLOR "\":["));
-  for (uint32_t i = 0; i < COL_LAST; i++) {
-    if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(PSTR("\"#%06x\""), WebColor(i));
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-void CmndWebSensor(void)
-{
-  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_WEBSENSOR "\":"));
-  XsnsSensorState();
-  ResponseJsonEnd();
-}
-
-void CmndWebButton(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_BUTTON_TEXT)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_BUTTON1, MAX_BUTTON_TEXT);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(SET_BUTTON1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_BUTTON1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndCors(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_CORS, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_CORS));
-}
-
-
-
-
-
-bool Xdrv01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      PollDnsWebserver();
-#ifdef USE_EMULATION
-      if (Settings.flag2.emulation) { PollUdp(); }
-#endif
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kWebCommands, WebCommand);
-      break;
-  }
-  return result;
-}
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
-#define XDRV_02 2
-
-
-
-#ifdef USE_MQTT_TLS
-  #include "WiFiClientSecureLightBearSSL.h"
-  BearSSL::WiFiClientSecure_light *tlsClient;
-#else
-  WiFiClient EspClient;
-#endif
-
-const char kMqttCommands[] PROGMEM = "|"
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  D_CMND_MQTTFINGERPRINT "|"
-#endif
-  D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|"
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  D_CMND_TLSKEY "|"
-#endif
-  D_CMND_MQTTHOST "|" D_CMND_MQTTPORT "|" D_CMND_MQTTRETRY "|" D_CMND_STATETEXT "|" D_CMND_MQTTCLIENT "|"
-  D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|"
-  D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ;
-
-void (* const MqttCommand[])(void) PROGMEM = {
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  &CmndMqttFingerprint,
-#endif
-  &CmndMqttUser, &CmndMqttPassword,
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  &CmndTlsKey,
-#endif
-  &CmndMqttHost, &CmndMqttPort, &CmndMqttRetry, &CmndStateText, &CmndMqttClient,
-  &CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog,
-  &CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain, &CmndSensorRetain };
-
-struct MQTT {
-  uint16_t connect_count = 0;
-  uint16_t retry_counter = 1;
-  uint8_t initial_connection_state = 2;
-  bool connected = false;
-  bool allowed = false;
-} Mqtt;
-
-#ifdef USE_MQTT_TLS
-
-#ifdef USE_MQTT_AWS_IOT
-#include <base64.hpp>
-
-const br_ec_private_key *AWS_IoT_Private_Key = nullptr;
-const br_x509_certificate *AWS_IoT_Client_Certificate = nullptr;
-
-class tls_entry_t {
-public:
-  uint32_t name;
-  uint16_t start;
-  uint16_t len;
-};
-
-const static uint32_t TLS_NAME_SKEY = 0x2079656B;
-const static uint32_t TLS_NAME_CRT = 0x20747263;
-
-class tls_dir_t {
-public:
-  tls_entry_t entry[4];
-};
-
-tls_dir_t tls_dir;
-
-#endif
-
-
-
-
-bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value) {
- for (uint32_t i = 0; i<20; i++) {
-  if (finger[i] != value) {
-   return false;
-  }
- }
- return true;
-}
-#endif
-
-void MakeValidMqtt(uint32_t option, char* str)
-{
-
-
-  uint32_t i = 0;
-  while (str[i] > 0) {
-
-    if ((str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
-      if (option) {
-        uint32_t j = i;
-        while (str[j] > 0) {
-          str[j] = str[j +1];
-          j++;
-        }
-        i--;
-      } else {
-        str[i] = '_';
-      }
-    }
-    i++;
-  }
-}
-
-#ifdef USE_DISCOVERY
-#ifdef MQTT_HOST_DISCOVERY
-void MqttDiscoverServer(void)
-{
-  if (!Wifi.mdns_begun) { return; }
-
-  int n = MDNS.queryService("mqtt", "tcp");
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
-
-  if (n > 0) {
-    uint32_t i = 0;
-#ifdef MDNS_HOSTNAME
-    for (i = n; i > 0; i--) {
-      if (!strcmp(MDNS.hostname(i).c_str(), MDNS_HOSTNAME)) {
-        break;
-      }
-    }
-#endif
-    SettingsUpdateText(SET_MQTT_HOST, MDNS.IP(i).toString().c_str());
-    Settings.mqtt_port = MDNS.port(i);
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"), MDNS.hostname(i).c_str(), SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
-  }
-}
-#endif
-#endif
-# 163 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_02_mqtt.ino"
-#include <PubSubClient.h>
-
-
-#if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MIN_MESSZ
-  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1200"
-#endif
-
-#ifdef USE_MQTT_TLS
-PubSubClient MqttClient;
-#else
-PubSubClient MqttClient(EspClient);
-#endif
-
-void MqttInit(void)
-{
-#ifdef USE_MQTT_TLS
-  tlsClient = new BearSSL::WiFiClientSecure_light(1024,1024);
-
-#ifdef USE_MQTT_AWS_IOT
-  loadTlsDir();
-  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
-                             AWS_IoT_Private_Key,
-                             0xFFFF , 0);
-#endif
-
-#ifdef USE_MQTT_TLS_CA_CERT
-#ifdef USE_MQTT_AWS_IOT
-  tlsClient->setTrustAnchor(&AmazonRootCA1_TA);
-#else
-  tlsClient->setTrustAnchor(&LetsEncryptX3CrossSigned_TA);
-#endif
-#endif
-
-  MqttClient.setClient(*tlsClient);
-#endif
-}
-
-bool MqttIsConnected(void)
-{
-  return MqttClient.connected();
-}
-
-void MqttDisconnect(void)
-{
-  MqttClient.disconnect();
-}
-
-void MqttSubscribeLib(const char *topic)
-{
-  MqttClient.subscribe(topic);
-  MqttClient.loop();
-}
-
-void MqttUnsubscribeLib(const char *topic)
-{
-  MqttClient.unsubscribe(topic);
-  MqttClient.loop();
-}
-
-bool MqttPublishLib(const char* topic, bool retained)
-{
-
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-    char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
-    if (str == topic) {
-      mqtt_cmnd_blocked_reset = 4;
-      mqtt_cmnd_blocked++;
-    }
-  }
-
-  bool result = MqttClient.publish(topic, mqtt_data, retained);
-  yield();
-  return result;
-}
-
-void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("MqttDataHandler"));
-#endif
-
-
-  if (data_len >= MQTT_MAX_PACKET_SIZE) { return; }
-
-
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-    char *str = strstr(mqtt_topic, SettingsText(SET_MQTTPREFIX1));
-    if ((str == mqtt_topic) && mqtt_cmnd_blocked) {
-      mqtt_cmnd_blocked--;
-      return;
-    }
-  }
-
-
-  char topic[TOPSZ];
-  strlcpy(topic, mqtt_topic, sizeof(topic));
-  mqtt_data[data_len] = 0;
-  char data[data_len +1];
-  memcpy(data, mqtt_data, sizeof(data));
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_MQTT D_RECEIVED_TOPIC " \"%s\", " D_DATA_SIZE " %d, " D_DATA " \"%s\""), topic, data_len, data);
-
-
-
-  XdrvMailbox.index = strlen(topic);
-  XdrvMailbox.data_len = data_len;
-  XdrvMailbox.topic = topic;
-  XdrvMailbox.data = (char*)data;
-  if (XdrvCall(FUNC_MQTT_DATA)) { return; }
-
-  ShowSource(SRC_MQTT);
-
-  CommandHandler(topic, data, data_len);
-}
-
-
-
-void MqttRetryCounter(uint8_t value)
-{
-  Mqtt.retry_counter = value;
-}
-
-void MqttSubscribe(const char *topic)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_SUBSCRIBE_TO " %s"), topic);
-  MqttSubscribeLib(topic);
-}
-
-void MqttUnsubscribe(const char *topic)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_UNSUBSCRIBE_FROM " %s"), topic);
-  MqttUnsubscribeLib(topic);
-}
-
-void MqttPublishLogging(const char *mxtime)
-{
-  char saved_mqtt_data[strlen(mqtt_data) +1];
-  memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
-
-
-  Response_P(PSTR("%s%s"), mxtime, log_data);
-  char stopic[TOPSZ];
-  GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
-  MqttPublishLib(stopic, false);
-
-  memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
-}
-
-void MqttPublish(const char* topic, bool retained)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("MqttPublish"));
-#endif
-
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT) || defined(MQTT_NO_RETAIN)
-
-
-
-  retained = false;
-#endif
-
-  char sretained[CMDSZ];
-  sretained[0] = '\0';
-  char slog_type[20];
-  snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
-
-  if (Settings.flag.mqtt_enabled) {
-    if (MqttPublishLib(topic, retained)) {
-      snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
-      if (retained) {
-        snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
-      }
-    }
-  }
-
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s = %s"), slog_type, (Settings.flag.mqtt_enabled) ? topic : strrchr(topic,'/')+1, mqtt_data);
-  if (strlen(log_data) >= (sizeof(log_data) - strlen(sretained) -1)) {
-    log_data[sizeof(log_data) - strlen(sretained) -5] = '\0';
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s ..."), log_data);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s"), log_data, sretained);
-  AddLog(LOG_LEVEL_INFO);
-
-  if (Settings.ledstate &0x04) {
-    blinks++;
-  }
-}
-
-void MqttPublish(const char* topic)
-{
-  MqttPublish(topic, false);
-}
-
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained)
-{
-
-
-
-
-
-
-
-  char romram[64];
-  char stopic[TOPSZ];
-
-  snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic);
-  for (uint32_t i = 0; i < strlen(romram); i++) {
-    romram[i] = toupper(romram[i]);
-  }
-  prefix &= 3;
-  GetTopic_P(stopic, prefix, mqtt_topic, romram);
-  MqttPublish(stopic, retained);
-
-#ifdef USE_MQTT_AWS_IOT
-  if ((prefix > 0) && (Settings.flag4.awsiot_shadow)) {
-
-    char *topic = SettingsText(SET_MQTT_TOPIC);
-    char topic2[strlen(topic)+1];
-    strcpy(topic2, topic);
-
-    char *s = topic2;
-    while (*s) {
-      if ('/' == *s) {
-        *s = '_';
-      }
-      s++;
-    }
-
-    snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
-
-
-    char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
-    if (!mqtt_save) { return; }
-    strcpy(mqtt_save, mqtt_data);
-    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"state\":{\"reported\":%s}}"), mqtt_save);
-    free(mqtt_save);
-
-    bool result = MqttClient.publish(romram, mqtt_data, false);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
-    yield();
-  }
-#endif
-}
-
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)
-{
-  MqttPublishPrefixTopic_P(prefix, subtopic, false);
-}
-
-void MqttPublishTeleSensor(void)
-{
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-  XdrvRulesProcess();
-}
-
-void MqttPublishPowerState(uint32_t device)
-{
-  char stopic[TOPSZ];
-  char scommand[33];
-
-  if ((device < 1) || (device > devices_present)) { device = 1; }
-
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan() && (device > 1)) {
-    if (GetFanspeed() < MaxFanspeed()) {
-#ifdef USE_DOMOTICZ
-      DomoticzUpdateFanState();
-#endif
-      snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED));
-      GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
-      Response_P(S_JSON_COMMAND_NVALUE, scommand, GetFanspeed());
-      MqttPublish(stopic);
-    }
-  } else {
-#endif
-    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable);
-    GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
-    Response_P(S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1)));
-    MqttPublish(stopic);
-
-    GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-    Response_P(GetStateText(bitRead(power, device -1)));
-    MqttPublish(stopic, Settings.flag.mqtt_power_retain);
-#ifdef USE_SONOFF_IFAN
-  }
-#endif
-}
-
-void MqttPublishAllPowerState(void)
-{
-  for (uint32_t i = 1; i <= devices_present; i++) {
-    MqttPublishPowerState(i);
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) { break; }
-#endif
-  }
-}
-
-void MqttPublishPowerBlinkState(uint32_t device)
-{
-  char scommand[33];
-
-  if ((device < 1) || (device > devices_present)) {
-    device = 1;
-  }
-  Response_P(PSTR("{\"%s\":\"" D_JSON_BLINK " %s\"}"),
-    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable), GetStateText(bitRead(blink_mask, device -1)));
-
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, S_RSLT_POWER);
-}
-
-
-
-uint16_t MqttConnectCount(void)
-{
-  return Mqtt.connect_count;
-}
-
-void MqttDisconnected(int state)
-{
-  Mqtt.connected = false;
-  Mqtt.retry_counter = Settings.mqtt_retry;
-
-  MqttClient.disconnect();
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), SettingsText(SET_MQTT_HOST), Settings.mqtt_port, state, Mqtt.retry_counter);
-  rules_flag.mqtt_disconnected = 1;
-}
-
-void MqttConnected(void)
-{
-  char stopic[TOPSZ];
-
-  if (Mqtt.allowed) {
-    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED));
-    Mqtt.connected = true;
-    Mqtt.retry_counter = 0;
-    Mqtt.connect_count++;
-
-    GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
-    Response_P(PSTR(D_ONLINE));
-    MqttPublish(stopic, true);
-
-
-    mqtt_data[0] = '\0';
-    MqttPublishPrefixTopic_P(CMND, S_RSLT_POWER);
-
-    GetTopic_P(stopic, CMND, mqtt_topic, PSTR("#"));
-    MqttSubscribe(stopic);
-    if (strstr_P(SettingsText(SET_MQTT_FULLTOPIC), MQTT_TOKEN_TOPIC) != nullptr) {
-      GetGroupTopic_P(stopic, PSTR("#"));
-      MqttSubscribe(stopic);
-      GetFallbackTopic_P(stopic, PSTR("#"));
-      MqttSubscribe(stopic);
-    }
-
-    XdrvCall(FUNC_MQTT_SUBSCRIBE);
-  }
-
-  if (Mqtt.initial_connection_state) {
-    char stopic2[TOPSZ];
-    Response_P(PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"),
-      ModuleName().c_str(), my_version, my_image, GetFallbackTopic_P(stopic, ""), GetGroupTopic_P(stopic2, ""));
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "1"));
-#ifdef USE_WEBSERVER
-    if (Settings.webserver) {
-#if LWIP_IPV6
-      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"IPv6Address\":\"%s\"}"),
-        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str(),WifiGetIPv6().c_str());
-#else
-      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\"}"),
-        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
-#endif
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "2"));
-    }
-#endif
-    Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":"));
-    if (CrashFlag()) {
-      CrashDump();
-    } else {
-      ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str());
-    }
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "3"));
-    MqttPublishAllPowerState();
-    if (Settings.tele_period) {
-      tele_period = Settings.tele_period -5;
-    }
-    rules_flag.system_boot = 1;
-    XdrvCall(FUNC_MQTT_INIT);
-  }
-  Mqtt.initial_connection_state = 0;
-
-  global_state.mqtt_down = 0;
-  if (Settings.flag.mqtt_enabled) {
-    rules_flag.mqtt_connected = 1;
-  }
-}
-
-void MqttReconnect(void)
-{
-  char stopic[TOPSZ];
-
-  Mqtt.allowed = Settings.flag.mqtt_enabled;
-  if (Mqtt.allowed) {
-#ifdef USE_DISCOVERY
-#ifdef MQTT_HOST_DISCOVERY
-    MqttDiscoverServer();
-#endif
-#endif
-    if (!strlen(SettingsText(SET_MQTT_HOST)) || !Settings.mqtt_port) {
-      Mqtt.allowed = false;
-    }
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-    if (!AWS_IoT_Private_Key || !AWS_IoT_Client_Certificate) {
-      Mqtt.allowed = false;
-    }
-#endif
-  }
-  if (!Mqtt.allowed) {
-    MqttConnected();
-    return;
-  }
-
-#ifdef USE_EMULATION
-  UdpDisconnect();
-#endif
-
-  AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_ATTEMPTING_CONNECTION));
-
-  Mqtt.connected = false;
-  Mqtt.retry_counter = Settings.mqtt_retry;
-  global_state.mqtt_down = 1;
-
-  char *mqtt_user = nullptr;
-  char *mqtt_pwd = nullptr;
-  if (strlen(SettingsText(SET_MQTT_USER))) {
-    mqtt_user = SettingsText(SET_MQTT_USER);
-  }
-  if (strlen(SettingsText(SET_MQTT_PWD))) {
-    mqtt_pwd = SettingsText(SET_MQTT_PWD);
-  }
-
-  GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
-  Response_P(S_OFFLINE);
-
-  if (MqttClient.connected()) { MqttClient.disconnect(); }
-#ifdef USE_MQTT_TLS
-  tlsClient->stop();
-#else
-  EspClient = WiFiClient();
-  MqttClient.setClient(EspClient);
-#endif
-
-  if (2 == Mqtt.initial_connection_state) {
-    Mqtt.initial_connection_state = 1;
-  }
-
-  MqttClient.setCallback(MqttDataHandler);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
-                             AWS_IoT_Private_Key,
-                             0xFFFF , 0);
-#endif
-  MqttClient.setServer(SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
-
-  uint32_t mqtt_connect_time = millis();
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  bool allow_all_fingerprints = false;
-  bool learn_fingerprint1 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0x00);
-  bool learn_fingerprint2 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0x00);
-  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0xff);
-  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0xff);
-  allow_all_fingerprints |= learn_fingerprint1;
-  allow_all_fingerprints |= learn_fingerprint2;
-  tlsClient->setPubKeyFingerprint(Settings.mqtt_fingerprint[0], Settings.mqtt_fingerprint[1], allow_all_fingerprints);
-#endif
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "AWS IoT endpoint: %s"), SettingsText(SET_MQTT_HOST));
-  if (MqttClient.connect(mqtt_client, nullptr, nullptr, stopic, 1, false, mqtt_data, MQTT_CLEAN_SESSION)) {
-#else
-  if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data, MQTT_CLEAN_SESSION)) {
-#endif
-#ifdef USE_MQTT_TLS
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connected in %d ms, max ThunkStack used %d"),
-      millis() - mqtt_connect_time, tlsClient->getMaxThunkStackUse());
-    if (!tlsClient->getMFLNStatus()) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("MFLN not supported by TLS server"));
-    }
-#ifndef USE_MQTT_TLS_CA_CERT
-
-    char buf_fingerprint[64];
-    ToHex_P((unsigned char *)tlsClient->getRecvPubKeyFingerprint(), 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
-
-    if (learn_fingerprint1 || learn_fingerprint2) {
-
-      bool fingerprint_matched = false;
-      const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
-      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[0], 20)) {
-        fingerprint_matched = true;
-      }
-      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[1], 20)) {
-        fingerprint_matched = true;
-      }
-      if (!fingerprint_matched) {
-
-        if (learn_fingerprint1) {
-          memcpy(Settings.mqtt_fingerprint[0], recv_fingerprint, 20);
-        }
-        if (learn_fingerprint2) {
-          memcpy(Settings.mqtt_fingerprint[1], recv_fingerprint, 20);
-        }
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
-
-        SettingsSaveAll();
-      }
-    }
-#endif
-#endif
-    MqttConnected();
-  } else {
-#ifdef USE_MQTT_TLS
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connection error: %d"), tlsClient->getLastError());
-#endif
-    MqttDisconnected(MqttClient.state());
-  }
-}
-
-void MqttCheck(void)
-{
-  if (Settings.flag.mqtt_enabled) {
-    if (!MqttIsConnected()) {
-      global_state.mqtt_down = 1;
-      if (!Mqtt.retry_counter) {
-        MqttReconnect();
-      } else {
-        Mqtt.retry_counter--;
-      }
-    } else {
-      global_state.mqtt_down = 0;
-    }
-  } else {
-    global_state.mqtt_down = 0;
-    if (Mqtt.initial_connection_state) {
-      MqttReconnect();
-    }
-  }
-}
-
-
-
-
-
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-void CmndMqttFingerprint(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    char fingerprint[60];
-    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(fingerprint))) {
-      strlcpy(fingerprint, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? MQTT_FINGERPRINT1 : MQTT_FINGERPRINT2 : XdrvMailbox.data, sizeof(fingerprint));
-      char *p = fingerprint;
-      for (uint32_t i = 0; i < 20; i++) {
-        Settings.mqtt_fingerprint[XdrvMailbox.index -1][i] = strtol(p, &p, 16);
-      }
-      restart_flag = 2;
-    }
-    ResponseCmndIdxChar(ToHex_P((unsigned char *)Settings.mqtt_fingerprint[XdrvMailbox.index -1], 20, fingerprint, sizeof(fingerprint), ' '));
-  }
-}
-#endif
-
-void CmndMqttUser(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_USER, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_USER : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_USER));
-}
-
-void CmndMqttPassword(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_PWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_PASS : XdrvMailbox.data);
-    ResponseCmndChar(SettingsText(SET_MQTT_PWD));
-    restart_flag = 2;
-  } else {
-    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
-  }
-}
-
-void CmndMqttlog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.mqttlog_level = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.mqttlog_level);
-}
-
-void CmndMqttHost(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_HOST, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_HOST : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_HOST));
-}
-
-void CmndMqttPort(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.mqtt_port = (1 == XdrvMailbox.payload) ? MQTT_PORT : XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  ResponseCmndNumber(Settings.mqtt_port);
-}
-
-void CmndMqttRetry(void)
-{
-  if ((XdrvMailbox.payload >= MQTT_RETRY_SECS) && (XdrvMailbox.payload < 32001)) {
-    Settings.mqtt_retry = XdrvMailbox.payload;
-    Mqtt.retry_counter = Settings.mqtt_retry;
-  }
-  ResponseCmndNumber(Settings.mqtt_retry);
-}
-
-void CmndStateText(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_STATE_TEXT)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_STATE_TXT1, MAX_STATE_TEXT);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
-          if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
-        }
-        SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndMqttClient(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    SettingsUpdateText(SET_MQTT_CLIENT, (SC_DEFAULT == Shortcut()) ? MQTT_CLIENT_ID : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_CLIENT));
-}
-
-void CmndFullTopic(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    MakeValidMqtt(1, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    char stemp1[TOPSZ];
-    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1));
-    if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) {
-      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp1);
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_FULLTOPIC));
-}
-
-void CmndPrefix(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_MQTT_PREFIXES)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_MQTTPREFIX1, MAX_MQTT_PREFIXES);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        MakeValidMqtt(0, XdrvMailbox.data);
-        SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
-          (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
-        restart_flag = 2;
-      }
-      ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndPublish(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    char *payload_part;
-    char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
-    if (mqtt_part) {
-      char stemp1[TOPSZ];
-      strlcpy(stemp1, mqtt_part, sizeof(stemp1));
-      if ((payload_part != nullptr) && strlen(payload_part)) {
-        strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
-      } else {
-        mqtt_data[0] = '\0';
-      }
-      MqttPublish(stemp1, (XdrvMailbox.index == 2));
-
-      mqtt_data[0] = '\0';
-    }
-  }
-}
-
-void CmndGroupTopic(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    SettingsUpdateText(SET_MQTT_GRP_TOPIC, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
-}
-
-void CmndTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    char stemp1[TOPSZ];
-    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1));
-    if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) {
-      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
-      SettingsUpdateText(SET_MQTT_TOPIC, stemp1);
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_TOPIC));
-}
-
-void CmndButtonTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    switch (Shortcut()) {
-      case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break;
-      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, mqtt_topic); break;
-      case SC_USER: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC); break;
-      default: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, XdrvMailbox.data);
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_BUTTON_TOPIC));
-}
-
-void CmndSwitchTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    switch (Shortcut()) {
-      case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break;
-      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, mqtt_topic); break;
-      case SC_USER: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC); break;
-      default: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, XdrvMailbox.data);
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_SWITCH_TOPIC));
-}
-
-void CmndButtonRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      for (uint32_t i = 1; i <= MAX_KEYS; i++) {
-        SendKey(KEY_BUTTON, i, CLEAR_RETAIN);
-      }
-    }
-    Settings.flag.mqtt_button_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_button_retain);
-}
-
-void CmndSwitchRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      for (uint32_t i = 1; i <= MAX_SWITCHES; i++) {
-        SendKey(KEY_SWITCH, i, CLEAR_RETAIN);
-      }
-    }
-    Settings.flag.mqtt_switch_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_switch_retain);
-}
-
-void CmndPowerRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      char stemp1[TOPSZ];
-      char scommand[CMDSZ];
-      for (uint32_t i = 1; i <= devices_present; i++) {
-        GetTopic_P(stemp1, STAT, mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings.flag.device_index_enable));
-        mqtt_data[0] = '\0';
-        MqttPublish(stemp1, Settings.flag.mqtt_power_retain);
-      }
-    }
-    Settings.flag.mqtt_power_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_power_retain);
-}
-
-void CmndSensorRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      mqtt_data[0] = '\0';
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain);
-    }
-    Settings.flag.mqtt_sensor_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_sensor_retain);
-}
-
-
-
-
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-
-
-const static uint16_t tls_spi_start_sector = 0xFF;
-const static uint8_t* tls_spi_start = (uint8_t*) 0x402FF000;
-const static size_t tls_spi_len = 0x1000;
-const static size_t tls_block_offset = 0x0400;
-const static size_t tls_block_len = 0x0400;
-const static size_t tls_obj_store_offset = tls_block_offset + sizeof(tls_dir_t);
-
-
-inline void TlsEraseBuffer(uint8_t *buffer) {
-  memset(buffer + tls_block_offset, 0xFF, tls_block_len);
-}
-
-
-
-static br_ec_private_key EC = {
- 23,
- nullptr, 0
-};
-
-static br_x509_certificate CHAIN[] = {
- { nullptr, 0 }
-};
-
-
-
-void loadTlsDir(void) {
-  memcpy_P(&tls_dir, tls_spi_start + tls_block_offset, sizeof(tls_dir));
-
-
-  if ((TLS_NAME_SKEY == tls_dir.entry[0].name) && (tls_dir.entry[0].len > 0)) {
-    EC.x = (unsigned char *)(tls_spi_start + tls_obj_store_offset + tls_dir.entry[0].start);
-    EC.xlen = tls_dir.entry[0].len;
-    AWS_IoT_Private_Key = &EC;
-  } else {
-    AWS_IoT_Private_Key = nullptr;
-  }
-  if ((TLS_NAME_CRT == tls_dir.entry[1].name) && (tls_dir.entry[1].len > 0)) {
-    CHAIN[0].data = (unsigned char *) (tls_spi_start + tls_obj_store_offset + tls_dir.entry[1].start);
-    CHAIN[0].data_len = tls_dir.entry[1].len;
-    AWS_IoT_Client_Certificate = CHAIN;
-  } else {
-    AWS_IoT_Client_Certificate = nullptr;
-  }
-
-}
-
-const char ALLOCATE_ERROR[] PROGMEM = "TLSKey " D_JSON_ERROR ": cannot allocate buffer.";
-
-void CmndTlsKey(void) {
-#ifdef DEBUG_DUMP_TLS
-  if (0 == XdrvMailbox.index){
-    CmndTlsDump();
-  }
-#endif
-  if ((XdrvMailbox.index >= 1) && (XdrvMailbox.index <= 2)) {
-    tls_dir_t *tls_dir_write;
-
-    if (XdrvMailbox.data_len > 0) {
-
-      uint8_t *spi_buffer = (uint8_t*) malloc(tls_spi_len);
-      if (!spi_buffer) {
-        AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
-        return;
-      }
-      memcpy_P(spi_buffer, tls_spi_start, tls_spi_len);
-
-
-      RemoveAllSpaces(XdrvMailbox.data);
-
-
-      uint32_t bin_len = decode_base64_length((unsigned char*)XdrvMailbox.data);
-      uint8_t *bin_buf = nullptr;
-      if (bin_len > 0) {
-        bin_buf = (uint8_t*) malloc(bin_len + 4);
-        if (!bin_buf) {
-          AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
-          free(spi_buffer);
-          return;
-        }
-      }
-
-
-      if (bin_len > 0) {
-        decode_base64((unsigned char*)XdrvMailbox.data, bin_buf);
-      }
-
-
-      tls_dir_write = (tls_dir_t*) (spi_buffer + tls_block_offset);
-
-      if (1 == XdrvMailbox.index) {
-
-
-        TlsEraseBuffer(spi_buffer);
-        if (bin_len > 0) {
-          if (bin_len != 32) {
-
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate must be 32 bytes: %d."), bin_len);
-            free(spi_buffer);
-            free(bin_buf);
-            return;
-          }
-          tls_entry_t *entry = &tls_dir_write->entry[0];
-          entry->name = TLS_NAME_SKEY;
-          entry->start = 0;
-          entry->len = bin_len;
-          memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
-        } else {
-
-        }
-      } else if (2 == XdrvMailbox.index) {
-
-        if (TLS_NAME_SKEY != tls_dir.entry[0].name) {
-
-          AddLog_P(LOG_LEVEL_INFO, PSTR("TLSKey: cannot store Cert if no Key previously stored."));
-          free(spi_buffer);
-          free(bin_buf);
-          return;
-        }
-        if (bin_len <= 256) {
-
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate length too short: %d."), bin_len);
-          free(spi_buffer);
-          free(bin_buf);
-          return;
-        }
-        tls_entry_t *entry = &tls_dir_write->entry[1];
-        entry->name = TLS_NAME_CRT;
-        entry->start = (tls_dir_write->entry[0].start + tls_dir_write->entry[0].len + 3) & ~0x03;
-        entry->len = bin_len;
-        memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
-      }
-
-      if (ESP.flashEraseSector(tls_spi_start_sector)) {
-        ESP.flashWrite(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-      }
-      free(spi_buffer);
-      free(bin_buf);
-    }
-
-    loadTlsDir();
-    Response_P(PSTR("{\"%s1\":%d,\"%s2\":%d}"),
-      XdrvMailbox.command, AWS_IoT_Private_Key ? tls_dir.entry[0].len : -1,
-      XdrvMailbox.command, AWS_IoT_Client_Certificate ? tls_dir.entry[1].len : -1);
-  }
-}
-
-#ifdef DEBUG_DUMP_TLS
-
-uint32_t bswap32(uint32_t x) {
- return ((x << 24) & 0xff000000 ) |
-  ((x << 8) & 0x00ff0000 ) |
-  ((x >> 8) & 0x0000ff00 ) |
-  ((x >> 24) & 0x000000ff );
-}
-void CmndTlsDump(void) {
-  uint32_t start = (uint32_t)tls_spi_start + tls_block_offset;
-  uint32_t end = start + tls_block_len -1;
-  for (uint32_t pos = start; pos < end; pos += 0x10) {
-    uint32_t* values = (uint32_t*)(pos);
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-    Serial.printf("%08x:  %08x %08x %08x %08x\n", pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
-#else
-    Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
-#endif
-  }
-}
-#endif
-#endif
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_MQTT "mq"
-
-const char S_CONFIGURE_MQTT[] PROGMEM = D_CONFIGURE_MQTT;
-
-const char HTTP_BTN_MENU_MQTT[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_MQTT "' method='get'><button>" D_CONFIGURE_MQTT "</button></form></p>";
-
-const char HTTP_FORM_MQTT1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_MQTT_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='" WEB_HANDLE_MQTT "'>"
-  "<p><b>" D_HOST "</b> (" MQTT_HOST ")<br><input id='mh' placeholder='" MQTT_HOST" ' value='%s'></p>"
-  "<p><b>" D_PORT "</b> (" STR(MQTT_PORT) ")<br><input id='ml' placeholder='" STR(MQTT_PORT) "' value='%d'></p>"
-  "<p><b>" D_CLIENT "</b> (%s)<br><input id='mc' placeholder='%s' value='%s'></p>";
-const char HTTP_FORM_MQTT2[] PROGMEM =
-  "<p><b>" D_USER "</b> (" MQTT_USER ")<br><input id='mu' placeholder='" MQTT_USER "' value='%s'></p>"
-  "<p><b>" D_PASSWORD "</b><input type='checkbox' onclick='sp(\"mp\")'><br><input id='mp' type='password' placeholder='" D_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_TOPIC "</b> = %%topic%% (%s)<br><input id='mt' placeholder='%s' value='%s'></p>"
-  "<p><b>" D_FULL_TOPIC "</b> (%s)<br><input id='mf' placeholder='%s' value='%s'></p>";
-
-void HandleMqttConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT);
-
-  if (WebServer->hasArg("save")) {
-    MqttSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char str[TOPSZ];
-
-  WSContentStart_P(S_CONFIGURE_MQTT);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_MQTT1,
-    SettingsText(SET_MQTT_HOST),
-    Settings.mqtt_port,
-    Format(str, MQTT_CLIENT_ID, sizeof(str)), MQTT_CLIENT_ID, SettingsText(SET_MQTT_CLIENT));
-  WSContentSend_P(HTTP_FORM_MQTT2,
-    (!strlen(SettingsText(SET_MQTT_USER))) ? "0" : SettingsText(SET_MQTT_USER),
-    Format(str, MQTT_TOPIC, sizeof(str)), MQTT_TOPIC, SettingsText(SET_MQTT_TOPIC),
-    MQTT_FULLTOPIC, MQTT_FULLTOPIC, SettingsText(SET_MQTT_FULLTOPIC));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void MqttSaveSettings(void)
-{
-  char tmp[TOPSZ];
-  char stemp[TOPSZ];
-  char stemp2[TOPSZ];
-
-  WebGetArg("mt", tmp, sizeof(tmp));
-  strlcpy(stemp, (!strlen(tmp)) ? MQTT_TOPIC : tmp, sizeof(stemp));
-  MakeValidMqtt(0, stemp);
-  WebGetArg("mf", tmp, sizeof(tmp));
-  strlcpy(stemp2, (!strlen(tmp)) ? MQTT_FULLTOPIC : tmp, sizeof(stemp2));
-  MakeValidMqtt(1, stemp2);
-  if ((strcmp(stemp, SettingsText(SET_MQTT_TOPIC))) || (strcmp(stemp2, SettingsText(SET_MQTT_FULLTOPIC)))) {
-    Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-    MqttPublishPrefixTopic_P(TELE, S_LWT, true);
-  }
-  SettingsUpdateText(SET_MQTT_TOPIC, stemp);
-  SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp2);
-  WebGetArg("mh", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_HOST, (!strlen(tmp)) ? MQTT_HOST : (!strcmp(tmp,"0")) ? "" : tmp);
-  WebGetArg("ml", tmp, sizeof(tmp));
-  Settings.mqtt_port = (!strlen(tmp)) ? MQTT_PORT : atoi(tmp);
-  WebGetArg("mc", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_CLIENT, (!strlen(tmp)) ? MQTT_CLIENT_ID : tmp);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
-    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
-#else
-  WebGetArg("mu", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_USER, (!strlen(tmp)) ? MQTT_USER : (!strcmp(tmp,"0")) ? "" : tmp);
-  WebGetArg("mp", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_PWD, (!strlen(tmp)) ? "" : (!strcmp(tmp, D_ASTERISK_PWD)) ? SettingsText(SET_MQTT_PWD) : tmp);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_MQTTUSER " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
-    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_USER), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
-#endif
-}
-#endif
-
-
-
-
-
-bool Xdrv02(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        MqttInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        MqttClient.loop();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_MQTT);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_MQTT, HandleMqttConfiguration);
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kMqttCommands, MqttCommand);
-        break;
-    }
-  }
-  return result;
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_03_energy.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_03_energy.ino"
-#ifdef USE_ENERGY_SENSOR
-
-
-
-
-#define XDRV_03 3
-#define XSNS_03 3
-
-
-
-
-#define ENERGY_NONE 0
-#define ENERGY_WATCHDOG 4
-
-#include <Ticker.h>
-
-#define D_CMND_POWERCAL "PowerCal"
-#define D_CMND_VOLTAGECAL "VoltageCal"
-#define D_CMND_CURRENTCAL "CurrentCal"
-#define D_CMND_TARIFF "Tariff"
-#define D_CMND_MODULEADDRESS "ModuleAddress"
-
-enum EnergyCommands {
-  CMND_POWERCAL, CMND_VOLTAGECAL, CMND_CURRENTCAL,
-  CMND_POWERSET, CMND_VOLTAGESET, CMND_CURRENTSET, CMND_FREQUENCYSET, CMND_MODULEADDRESS };
-
-const char kEnergyCommands[] PROGMEM = "|"
-  D_CMND_POWERCAL "|" D_CMND_VOLTAGECAL "|" D_CMND_CURRENTCAL "|"
-  D_CMND_POWERSET "|" D_CMND_VOLTAGESET "|" D_CMND_CURRENTSET "|" D_CMND_FREQUENCYSET "|" D_CMND_MODULEADDRESS "|"
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|"
-#ifdef USE_ENERGY_POWER_LIMIT
-  D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|"
-  D_CMND_MAXPOWER "|" D_CMND_MAXPOWERHOLD "|" D_CMND_MAXPOWERWINDOW "|"
-  D_CMND_SAFEPOWER "|" D_CMND_SAFEPOWERHOLD "|" D_CMND_SAFEPOWERWINDOW "|"
-#endif
-#endif
-  D_CMND_ENERGYRESET "|" D_CMND_TARIFF ;
-
-void (* const EnergyCommand[])(void) PROGMEM = {
-  &CmndPowerCal, &CmndVoltageCal, &CmndCurrentCal,
-  &CmndPowerSet, &CmndVoltageSet, &CmndCurrentSet, &CmndFrequencySet, &CmndModuleAddress,
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  &CmndPowerDelta, &CmndPowerLow, &CmndPowerHigh, &CmndVoltageLow, &CmndVoltageHigh, &CmndCurrentLow, &CmndCurrentHigh,
-#ifdef USE_ENERGY_POWER_LIMIT
-  &CmndMaxEnergy, &CmndMaxEnergyStart,
-  &CmndMaxPower, &CmndMaxPowerHold, &CmndMaxPowerWindow,
-  &CmndSafePower, &CmndSafePowerHold, &CmndSafePowerWindow,
-#endif
-#endif
-  &CmndEnergyReset, &CmndTariff };
-
-const char kEnergyPhases[] PROGMEM = "|%s / %s|%s / %s / %s||[%s,%s]|[%s,%s,%s]";
-
-struct ENERGY {
-  float voltage[3] = { 0, 0, 0 };
-  float current[3] = { 0, 0, 0 };
-  float active_power[3] = { 0, 0, 0 };
-  float apparent_power[3] = { NAN, NAN, NAN };
-  float reactive_power[3] = { NAN, NAN, NAN };
-  float power_factor[3] = { NAN, NAN, NAN };
-  float frequency[3] = { NAN, NAN, NAN };
-
-  float start_energy = 0;
-  float daily = 0;
-  float total = 0;
-  float export_active = NAN;
-
-  unsigned long kWhtoday_delta = 0;
-  unsigned long kWhtoday_offset = 0;
-  unsigned long kWhtoday;
-  unsigned long period = 0;
-
-  uint8_t fifth_second = 0;
-  uint8_t command_code = 0;
-  uint8_t data_valid[3] = { 0, 0, 0 };
-
-  uint8_t phase_count = 1;
-  bool voltage_common = false;
-
-  bool voltage_available = true;
-  bool current_available = true;
-
-  bool type_dc = false;
-  bool power_on = true;
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  uint16_t power_history[3] = { 0 };
-  uint8_t power_steady_counter = 8;
-  bool power_delta = false;
-  bool min_power_flag = false;
-  bool max_power_flag = false;
-  bool min_voltage_flag = false;
-  bool max_voltage_flag = false;
-  bool min_current_flag = false;
-  bool max_current_flag = false;
-
-#ifdef USE_ENERGY_POWER_LIMIT
-  uint16_t mplh_counter = 0;
-  uint16_t mplw_counter = 0;
-  uint8_t mplr_counter = 0;
-  uint8_t max_energy_state = 0;
-#endif
-#endif
-} Energy;
-
-Ticker ticker_energy;
-
-
-
-bool EnergyTariff1Active()
-{
-  uint8_t dst = 0;
-  if (IsDst() && (Settings.tariff[0][1] != Settings.tariff[1][1])) {
-    dst = 1;
-  }
-  if (Settings.tariff[0][dst] != Settings.tariff[1][dst]) {
-    if (Settings.flag3.energy_weekend && ((RtcTime.day_of_week == 1) ||
-                                          (RtcTime.day_of_week == 7))) {
-      return true;
-    }
-    uint32_t minutes = MinutesPastMidnight();
-    if (Settings.tariff[0][dst] > Settings.tariff[1][dst]) {
-
-      return ((minutes >= Settings.tariff[0][dst]) || (minutes < Settings.tariff[1][dst]));
-    } else {
-
-      return ((minutes >= Settings.tariff[0][dst]) && (minutes < Settings.tariff[1][dst]));
-    }
-  } else {
-    return false;
-  }
-}
-
-void EnergyUpdateToday(void)
-{
-  if (Energy.kWhtoday_delta > 1000) {
-    unsigned long delta = Energy.kWhtoday_delta / 1000;
-    Energy.kWhtoday_delta -= (delta * 1000);
-    Energy.kWhtoday += delta;
-  }
-
-  RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset + Energy.kWhtoday;
-  Energy.daily = (float)(RtcSettings.energy_kWhtoday) / 100000;
-  Energy.total = (float)(RtcSettings.energy_kWhtotal + RtcSettings.energy_kWhtoday) / 100000;
-
-  if (RtcTime.valid){
-
-    uint32_t energy_diff = (uint32_t)(Energy.total * 100000) - RtcSettings.energy_usage.last_usage_kWhtotal;
-    RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 100000);
-
-    uint32_t return_diff = 0;
-    if (!isnan(Energy.export_active)) {
-      return_diff = (uint32_t)(Energy.export_active * 100000) - RtcSettings.energy_usage.last_return_kWhtotal;
-      RtcSettings.energy_usage.last_return_kWhtotal = (uint32_t)(Energy.export_active * 100000);
-    }
-
-    if (EnergyTariff1Active()) {
-      RtcSettings.energy_usage.usage1_kWhtotal += energy_diff;
-      RtcSettings.energy_usage.return1_kWhtotal += return_diff;
-    } else {
-      RtcSettings.energy_usage.usage2_kWhtotal += energy_diff;
-      RtcSettings.energy_usage.return2_kWhtotal += return_diff;
-    }
-  }
-}
-
-void EnergyUpdateTotal(float value, bool kwh)
-{
-
-
-
-
-  uint32_t multiplier = (kwh) ? 100000 : 100;
-
-  if (0 == Energy.start_energy || (value < Energy.start_energy)) {
-    Energy.start_energy = value;
-  }
-  else if (value != Energy.start_energy) {
-    Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier);
-  }
-
-  if ((Energy.total < (value - 0.01)) &&
-      Settings.flag3.hardware_energy_total) {
-    RtcSettings.energy_kWhtotal = (unsigned long)((value * multiplier) - Energy.kWhtoday_offset - Energy.kWhtoday);
-    Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-    Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
-    Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
-
-  }
-  EnergyUpdateToday();
-}
-
-
-
-void Energy200ms(void)
-{
-  Energy.power_on = (power != 0) | Settings.flag.no_power_on_check;
-
-  Energy.fifth_second++;
-  if (5 == Energy.fifth_second) {
-    Energy.fifth_second = 0;
-
-    XnrgCall(FUNC_ENERGY_EVERY_SECOND);
-
-    if (RtcTime.valid) {
-      if (LocalTime() == Midnight()) {
-        Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday;
-
-        RtcSettings.energy_kWhtotal += RtcSettings.energy_kWhtoday;
-        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-        Energy.kWhtoday = 0;
-        Energy.kWhtoday_offset = 0;
-        RtcSettings.energy_kWhtoday = 0;
-        Energy.start_energy = 0;
-
-        Energy.kWhtoday_delta = 0;
-        Energy.period = Energy.kWhtoday;
-        EnergyUpdateToday();
-#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
-        Energy.max_energy_state = 3;
-#endif
-      }
-#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
-      if ((RtcTime.hour == Settings.energy_max_energy_start) && (3 == Energy.max_energy_state )) {
-        Energy.max_energy_state = 0;
-      }
-#endif
-
-    }
-  }
-
-  XnrgCall(FUNC_EVERY_200_MSECOND);
-}
-
-void EnergySaveState(void)
-{
-  Settings.energy_kWhdoy = (RtcTime.valid) ? RtcTime.day_of_year : 0;
-
-  Settings.energy_kWhtoday = RtcSettings.energy_kWhtoday;
-  Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-
-  Settings.energy_usage = RtcSettings.energy_usage;
-}
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag)
-{
-  bool change;
-
-  if (!margin) return false;
-  change = save_flag;
-  if (type) {
-    flag = (value > margin);
-  } else {
-    flag = (value < margin);
-  }
-  save_flag = flag;
-  return (change != save_flag);
-}
-
-void EnergyMarginCheck(void)
-{
-  if (Energy.power_steady_counter) {
-    Energy.power_steady_counter--;
-    return;
-  }
-
-  uint16_t energy_power_u = (uint16_t)(Energy.active_power[0]);
-
-  if (Settings.energy_power_delta) {
-    uint16_t delta = abs(Energy.power_history[0] - energy_power_u);
-    if (delta > 0) {
-      if (Settings.energy_power_delta < 101) {
-        uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
-        if (0 == min_power) { min_power++; }
-        if (((delta * 100) / min_power) > Settings.energy_power_delta) {
-          Energy.power_delta = true;
-        }
-      } else {
-        if (delta > (Settings.energy_power_delta -100)) {
-          Energy.power_delta = true;
-        }
-      }
-      if (Energy.power_delta) {
-        Energy.power_history[1] = Energy.active_power[0];
-        Energy.power_history[2] = Energy.active_power[0];
-      }
-    }
-  }
-  Energy.power_history[0] = Energy.power_history[1];
-  Energy.power_history[1] = Energy.power_history[2];
-  Energy.power_history[2] = energy_power_u;
-
-  if (Energy.power_on && (Settings.energy_min_power || Settings.energy_max_power || Settings.energy_min_voltage || Settings.energy_max_voltage || Settings.energy_min_current || Settings.energy_max_current)) {
-    uint16_t energy_voltage_u = (uint16_t)(Energy.voltage[0]);
-    uint16_t energy_current_u = (uint16_t)(Energy.current[0] * 1000);
-
-    DEBUG_DRIVER_LOG(PSTR("NRG: W %d, U %d, I %d"), energy_power_u, energy_voltage_u, energy_current_u);
-
-    Response_P(PSTR("{"));
-    bool flag;
-    bool jsonflg = false;
-    if (EnergyMargin(false, Settings.energy_min_power, energy_power_u, flag, Energy.min_power_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_power, energy_power_u, flag, Energy.max_power_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(false, Settings.energy_min_voltage, energy_voltage_u, flag, Energy.min_voltage_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGELOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_voltage, energy_voltage_u, flag, Energy.max_voltage_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGEHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(false, Settings.energy_min_current, energy_current_u, flag, Energy.min_current_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_current, energy_current_u, flag, Energy.max_current_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (jsonflg) {
-      ResponseJsonEnd();
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN);
-      EnergyMqttShow();
-    }
-  }
-
-#ifdef USE_ENERGY_POWER_LIMIT
-
-  if (Settings.energy_max_power_limit) {
-    if (Energy.active_power[0] > Settings.energy_max_power_limit) {
-      if (!Energy.mplh_counter) {
-        Energy.mplh_counter = Settings.energy_max_power_limit_hold;
-      } else {
-        Energy.mplh_counter--;
-        if (!Energy.mplh_counter) {
-          ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
-          MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-          EnergyMqttShow();
-          SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
-          if (!Energy.mplr_counter) {
-            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;
-          }
-          Energy.mplw_counter = Settings.energy_max_power_limit_window;
-        }
-      }
-    }
-    else if (power && (energy_power_u <= Settings.energy_max_power_limit)) {
-      Energy.mplh_counter = 0;
-      Energy.mplr_counter = 0;
-      Energy.mplw_counter = 0;
-    }
-    if (!power) {
-      if (Energy.mplw_counter) {
-        Energy.mplw_counter--;
-      } else {
-        if (Energy.mplr_counter) {
-          Energy.mplr_counter--;
-          if (Energy.mplr_counter) {
-            ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1));
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
-            RestorePower(true, SRC_MAXPOWER);
-          } else {
-            ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
-            MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-            EnergyMqttShow();
-            SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
-          }
-        }
-      }
-    }
-  }
-
-
-  if (Settings.energy_max_energy) {
-    uint16_t energy_daily_u = (uint16_t)(Energy.daily * 1000);
-    if (!Energy.max_energy_state && (RtcTime.hour == Settings.energy_max_energy_start)) {
-      Energy.max_energy_state = 1;
-      ResponseTime_P(PSTR(",\"" D_JSON_ENERGYMONITOR "\":\"%s\"}"), GetStateText(1));
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_ENERGYMONITOR));
-      RestorePower(true, SRC_MAXENERGY);
-    }
-    else if ((1 == Energy.max_energy_state ) && (energy_daily_u >= Settings.energy_max_energy)) {
-      Energy.max_energy_state = 2;
-      char stemp[FLOATSZ];
-      dtostrfd(Energy.daily, 3, stemp);
-      ResponseTime_P(PSTR(",\"" D_JSON_MAXENERGYREACHED "\":%s}"), stemp);
-      MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-      EnergyMqttShow();
-      SetAllPower(POWER_ALL_OFF, SRC_MAXENERGY);
-    }
-  }
-#endif
-
-  if (Energy.power_delta) { EnergyMqttShow(); }
-}
-
-void EnergyMqttShow(void)
-{
-
-  int tele_period_save = tele_period;
-  tele_period = 2;
-  mqtt_data[0] = '\0';
-  ResponseAppendTime();
-  EnergyShow(true);
-  tele_period = tele_period_save;
-  ResponseJsonEnd();
-  MqttPublishTeleSensor();
-  Energy.power_delta = false;
-}
-#endif
-
-void EnergyEverySecond(void)
-{
-
-  if (global_update) {
-    if (power && (global_temperature != 9999) && (global_temperature > Settings.param[P_OVER_TEMP])) {
-      SetAllPower(POWER_ALL_OFF, SRC_OVERTEMP);
-    }
-  }
-
-
-  uint32_t data_valid = Energy.phase_count;
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    if (Energy.data_valid[i] <= ENERGY_WATCHDOG) {
-      Energy.data_valid[i]++;
-      if (Energy.data_valid[i] > ENERGY_WATCHDOG) {
-
-        Energy.voltage[i] = 0;
-        Energy.current[i] = 0;
-        Energy.active_power[i] = 0;
-        if (!isnan(Energy.apparent_power[i])) { Energy.apparent_power[i] = 0; }
-        if (!isnan(Energy.reactive_power[i])) { Energy.reactive_power[i] = 0; }
-        if (!isnan(Energy.frequency[i])) { Energy.frequency[i] = 0; }
-        if (!isnan(Energy.power_factor[i])) { Energy.power_factor[i] = 0; }
-
-        data_valid--;
-      }
-    }
-  }
-  if (!data_valid) {
-    if (!isnan(Energy.export_active)) { Energy.export_active = 0; }
-    Energy.start_energy = 0;
-
-    XnrgCall(FUNC_ENERGY_RESET);
-  }
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  EnergyMarginCheck();
-#endif
-}
-
-
-
-
-
-void EnergyCommandCalResponse(uint32_t nvalue)
-{
-  snprintf_P(XdrvMailbox.command, CMDSZ, PSTR("%sCal"), XdrvMailbox.command);
-  ResponseCmndNumber(nvalue);
-}
-
-void CmndEnergyReset(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
-    char *p;
-    unsigned long lnum = strtoul(XdrvMailbox.data, &p, 10);
-    if (p != XdrvMailbox.data) {
-      switch (XdrvMailbox.index) {
-      case 1:
-
-        Energy.kWhtoday_offset = lnum *100;
-        Energy.kWhtoday = 0;
-        Energy.kWhtoday_delta = 0;
-        Energy.start_energy = 0;
-        Energy.period = Energy.kWhtoday_offset;
-        Settings.energy_kWhtoday = Energy.kWhtoday_offset;
-        RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset;
-        Energy.daily = (float)Energy.kWhtoday_offset / 100000;
-        if (!RtcSettings.energy_kWhtotal && !Energy.kWhtoday_offset) {
-          Settings.energy_kWhtotal_time = LocalTime();
-        }
-        break;
-      case 2:
-
-        Settings.energy_kWhyesterday = lnum *100;
-        break;
-      case 3:
-
-        RtcSettings.energy_kWhtotal = lnum *100;
-        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-
-        Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
-        RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 1000);
-        break;
-      }
-    }
-  }
-  else if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
-    uint32_t values[2] = { 0 };
-    uint32_t position = ParseParameters(2, values);
-    values[0] *= 100;
-    values[1] *= 100;
-
-    switch (XdrvMailbox.index)
-    {
-      case 4:
-
-        if (position > 0) {
-          RtcSettings.energy_usage.usage1_kWhtotal = values[0];
-        }
-        if (position > 1) {
-          RtcSettings.energy_usage.usage2_kWhtotal = values[1];
-        }
-        Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
-        Settings.energy_usage.usage2_kWhtotal = RtcSettings.energy_usage.usage2_kWhtotal;
-        break;
-      case 5:
-
-        if (position > 0) {
-          RtcSettings.energy_usage.return1_kWhtotal = values[0];
-        }
-        if (position > 1) {
-          RtcSettings.energy_usage.return2_kWhtotal = values[1];
-        }
-        Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
-        Settings.energy_usage.return2_kWhtotal = RtcSettings.energy_usage.return2_kWhtotal;
-        break;
-      }
-  }
-
-  Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
-
-  char energy_total_chr[FLOATSZ];
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr);
-  char energy_daily_chr[FLOATSZ];
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
-  char energy_yesterday_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
-
-  char energy_usage1_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage1_chr);
-  char energy_usage2_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage2_chr);
-  char energy_return1_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return1_chr);
-  char energy_return2_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return2_chr);
-
-  Response_P(PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s,\"" D_JSON_USAGE "\":[%s,%s],\"" D_JSON_EXPORT "\":[%s,%s]}}"),
-    XdrvMailbox.command, energy_total_chr, energy_yesterday_chr, energy_daily_chr, energy_usage1_chr, energy_usage2_chr, energy_return1_chr, energy_return2_chr);
-}
-
-void CmndTariff(void)
-{
-
-
-
-
-
-
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    uint32_t tariff = XdrvMailbox.index -1;
-    uint32_t time_type = 0;
-    char *p;
-    char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-    while ((str != nullptr) && (time_type < 2)) {
-      char *q;
-      uint32_t value = strtol(str, &q, 10);
-      Settings.tariff[tariff][time_type] = value;
-      if (value < 24) {
-        Settings.tariff[tariff][time_type] *= 60;
-        char *minute = strtok_r(nullptr, ":", &q);
-        if (minute) {
-          value = strtol(minute, nullptr, 10);
-          if (value > 59) {
-            value = 59;
-          }
-          Settings.tariff[tariff][time_type] += value;
-        }
-      }
-      if (Settings.tariff[tariff][time_type] > 1439) {
-        Settings.tariff[tariff][time_type] = 1439;
-      }
-      str = strtok_r(nullptr, ", ", &p);
-      time_type++;
-    }
-  }
-  else if (XdrvMailbox.index == 9) {
-    Settings.flag3.energy_weekend = XdrvMailbox.payload & 1;
-  }
-  Response_P(PSTR("{\"%s\":{\"Off-Peak\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Standard\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Weekend\":\"%s\"}}"),
-    XdrvMailbox.command,
-    GetMinuteTime(Settings.tariff[0][0]).c_str(),GetMinuteTime(Settings.tariff[0][1]).c_str(),
-    GetMinuteTime(Settings.tariff[1][0]).c_str(),GetMinuteTime(Settings.tariff[1][1]).c_str(),
-    GetStateText(Settings.flag3.energy_weekend));
-}
-
-void CmndPowerCal(void)
-{
-  Energy.command_code = CMND_POWERCAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_power_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_power_calibration);
-  }
-}
-
-void CmndVoltageCal(void)
-{
-  Energy.command_code = CMND_VOLTAGECAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_voltage_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_voltage_calibration);
-  }
-}
-
-void CmndCurrentCal(void)
-{
-  Energy.command_code = CMND_CURRENTCAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_current_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_current_calibration);
-  }
-}
-
-void CmndPowerSet(void)
-{
-  Energy.command_code = CMND_POWERSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_power_calibration);
-  }
-}
-
-void CmndVoltageSet(void)
-{
-  Energy.command_code = CMND_VOLTAGESET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_voltage_calibration);
-  }
-}
-
-void CmndCurrentSet(void)
-{
-  Energy.command_code = CMND_CURRENTSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_current_calibration);
-  }
-}
-
-void CmndFrequencySet(void)
-{
-  Energy.command_code = CMND_FREQUENCYSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_frequency_calibration);
-  }
-}
-
-void CmndModuleAddress(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4) && (1 == Energy.phase_count)) {
-    Energy.command_code = CMND_MODULEADDRESS;
-    if (XnrgCall(FUNC_COMMAND)) {
-      ResponseCmndDone();
-    }
-  }
-}
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-void CmndPowerDelta(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32000)) {
-    Settings.energy_power_delta = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_power_delta);
-}
-
-void CmndPowerLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_min_power = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_power);
-}
-
-void CmndPowerHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power);
-}
-
-void CmndVoltageLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
-    Settings.energy_min_voltage = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_voltage);
-}
-
-void CmndVoltageHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
-    Settings.energy_max_voltage = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_voltage);
-}
-
-void CmndCurrentLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
-    Settings.energy_min_current = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_current);
-}
-
-void CmndCurrentHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
-    Settings.energy_max_current = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_current);
-}
-
-#ifdef USE_ENERGY_POWER_LIMIT
-void CmndMaxPower(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit);
-}
-
-void CmndMaxPowerHold(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit_hold = (1 == XdrvMailbox.payload) ? MAX_POWER_HOLD : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit_hold);
-}
-
-void CmndMaxPowerWindow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit_window = (1 == XdrvMailbox.payload) ? MAX_POWER_WINDOW : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit_window);
-}
-
-void CmndSafePower(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_safe_limit = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit);
-}
-
-void CmndSafePowerHold(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_safe_limit_hold = (1 == XdrvMailbox.payload) ? SAFE_POWER_HOLD : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit_hold);
-}
-
-void CmndSafePowerWindow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 1440)) {
-    Settings.energy_max_power_safe_limit_window = (1 == XdrvMailbox.payload) ? SAFE_POWER_WINDOW : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit_window);
-}
-
-void CmndMaxEnergy(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_energy = XdrvMailbox.payload;
-    Energy.max_energy_state = 3;
-  }
-  ResponseCmndNumber(Settings.energy_max_energy);
-}
-
-void CmndMaxEnergyStart(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 24)) {
-    Settings.energy_max_energy_start = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_energy_start);
-}
-#endif
-#endif
-
-void EnergySnsInit(void)
-{
-  XnrgCall(FUNC_INIT);
-
-  if (energy_flg) {
-    if (RtcSettingsValid()) {
-      Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday;
-    }
-    else if (RtcTime.day_of_year == Settings.energy_kWhdoy) {
-      Energy.kWhtoday_offset = Settings.energy_kWhtoday;
-    }
-    else {
-      Energy.kWhtoday_offset = 0;
-    }
-    Energy.kWhtoday = 0;
-    Energy.kWhtoday_delta = 0;
-    Energy.period = Energy.kWhtoday_offset;
-    EnergyUpdateToday();
-    ticker_energy.attach_ms(200, Energy200ms);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_SNS1[] PROGMEM =
-  "{s}" D_POWERUSAGE_APPARENT "{m}%s " D_UNIT_VA "{e}"
-  "{s}" D_POWERUSAGE_REACTIVE "{m}%s " D_UNIT_VAR "{e}"
-  "{s}" D_POWER_FACTOR "{m}%s{e}";
-
-const char HTTP_ENERGY_SNS2[] PROGMEM =
-  "{s}" D_ENERGY_TODAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_YESTERDAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_TOTAL "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
-
-const char HTTP_ENERGY_SNS3[] PROGMEM =
-  "{s}" D_EXPORT_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
-#endif
-
-char* EnergyFormatIndex(char* result, char* input, bool json, uint32_t index, bool single = false)
-{
-  char layout[16];
-  GetTextIndexed(layout, sizeof(layout), (index -1) + (3 * json), kEnergyPhases);
-  switch (index) {
-    case 2:
-      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ);
-      break;
-    case 3:
-      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ, input + FLOATSZ + FLOATSZ);
-      break;
-    default:
-      snprintf_P(result, FLOATSZ *3, input);
-  }
-  return result;
-}
-
-char* EnergyFormat(char* result, char* input, bool json, bool single = false)
-{
-  uint8_t index = (single) ? 1 : Energy.phase_count;
-  return EnergyFormatIndex(result, input, json, index, single);
-}
-
-void EnergyShow(bool json)
-{
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    if (Energy.voltage_common) {
-      Energy.voltage[i] = Energy.voltage[0];
-    }
-  }
-
-  float power_factor_knx = Energy.power_factor[0];
-
-  char apparent_power_chr[Energy.phase_count][FLOATSZ];
-  char reactive_power_chr[Energy.phase_count][FLOATSZ];
-  char power_factor_chr[Energy.phase_count][FLOATSZ];
-  char frequency_chr[Energy.phase_count][FLOATSZ];
-  if (!Energy.type_dc) {
-    if (Energy.current_available && Energy.voltage_available) {
-      for (uint32_t i = 0; i < Energy.phase_count; i++) {
-        float apparent_power = Energy.apparent_power[i];
-        if (isnan(apparent_power)) {
-          apparent_power = Energy.voltage[i] * Energy.current[i];
-        }
-        if (apparent_power < Energy.active_power[i]) {
-          Energy.active_power[i] = apparent_power;
-        }
-
-        float power_factor = Energy.power_factor[i];
-        if (isnan(power_factor)) {
-          power_factor = (Energy.active_power[i] && apparent_power) ? Energy.active_power[i] / apparent_power : 0;
-          if (power_factor > 1) {
-            power_factor = 1;
-          }
-        }
-        if (0 == i) { power_factor_knx = power_factor; }
-
-        float reactive_power = Energy.reactive_power[i];
-        if (isnan(reactive_power)) {
-          reactive_power = 0;
-          uint32_t difference = ((uint32_t)(apparent_power * 100) - (uint32_t)(Energy.active_power[i] * 100)) / 10;
-          if ((Energy.current[i] > 0.005) && ((difference > 15) || (difference > (uint32_t)(apparent_power * 100 / 1000)))) {
-
-
-            reactive_power = (float)(RoundSqrtInt((uint32_t)(apparent_power * apparent_power * 100) - (uint32_t)(Energy.active_power[i] * Energy.active_power[i] * 100))) / 10;
-          }
-        }
-
-        dtostrfd(apparent_power, Settings.flag2.wattage_resolution, apparent_power_chr[i]);
-        dtostrfd(reactive_power, Settings.flag2.wattage_resolution, reactive_power_chr[i]);
-        dtostrfd(power_factor, 2, power_factor_chr[i]);
-      }
-    }
-    for (uint32_t i = 0; i < Energy.phase_count; i++) {
-      float frequency = Energy.frequency[i];
-      if (isnan(Energy.frequency[i])) {
-        frequency = 0;
-      }
-      dtostrfd(frequency, Settings.flag2.frequency_resolution, frequency_chr[i]);
-    }
-  }
-
-  char voltage_chr[Energy.phase_count][FLOATSZ];
-  char current_chr[Energy.phase_count][FLOATSZ];
-  char active_power_chr[Energy.phase_count][FLOATSZ];
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    dtostrfd(Energy.voltage[i], Settings.flag2.voltage_resolution, voltage_chr[i]);
-    dtostrfd(Energy.current[i], Settings.flag2.current_resolution, current_chr[i]);
-    dtostrfd(Energy.active_power[i], Settings.flag2.wattage_resolution, active_power_chr[i]);
-  }
-
-  char energy_daily_chr[FLOATSZ];
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
-  char energy_yesterday_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
-
-  char energy_total_chr[3][FLOATSZ];
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr[0]);
-  char export_active_chr[3][FLOATSZ];
-  dtostrfd(Energy.export_active, Settings.flag2.energy_resolution, export_active_chr[0]);
-  uint8_t energy_total_fields = 1;
-
-  if (Settings.tariff[0][0] != Settings.tariff[1][0]) {
-    dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[1]);
-    dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[2]);
-    dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[1]);
-    dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[2]);
-    energy_total_fields = 3;
-  }
-
-  char value_chr[FLOATSZ *3];
-  char value2_chr[FLOATSZ *3];
-  char value3_chr[FLOATSZ *3];
-
-  if (json) {
-    bool show_energy_period = (0 == tele_period);
-
-    ResponseAppend_P(PSTR(",\"" D_RSLT_ENERGY "\":{\"" D_JSON_TOTAL_START_TIME "\":\"%s\",\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s"),
-      GetDateAndTime(DT_ENERGY).c_str(),
-      EnergyFormatIndex(value_chr, energy_total_chr[0], json, energy_total_fields),
-      energy_yesterday_chr,
-      energy_daily_chr);
-
-    if (!isnan(Energy.export_active)) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_EXPORT_ACTIVE "\":%s"),
-        EnergyFormatIndex(value_chr, export_active_chr[0], json, energy_total_fields));
-    }
-
-    if (show_energy_period) {
-      float energy = 0;
-      if (Energy.period) {
-        energy = (float)(RtcSettings.energy_kWhtoday - Energy.period) / 100;
-      }
-      Energy.period = RtcSettings.energy_kWhtoday;
-      char energy_period_chr[FLOATSZ];
-      dtostrfd(energy, Settings.flag2.wattage_resolution, energy_period_chr);
-      ResponseAppend_P(PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr);
-    }
-    ResponseAppend_P(PSTR(",\"" D_JSON_POWERUSAGE "\":%s"),
-      EnergyFormat(value_chr, active_power_chr[0], json));
-    if (!Energy.type_dc) {
-      if (Energy.current_available && Energy.voltage_available) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_APPARENT_POWERUSAGE "\":%s,\"" D_JSON_REACTIVE_POWERUSAGE "\":%s,\"" D_JSON_POWERFACTOR "\":%s"),
-          EnergyFormat(value_chr, apparent_power_chr[0], json),
-          EnergyFormat(value2_chr, reactive_power_chr[0], json),
-          EnergyFormat(value3_chr, power_factor_chr[0], json));
-      }
-      if (!isnan(Energy.frequency[0])) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_FREQUENCY "\":%s"),
-          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
-      }
-    }
-    if (Energy.voltage_available) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_VOLTAGE "\":%s"),
-        EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
-    }
-    if (Energy.current_available) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_CURRENT "\":%s"),
-        EnergyFormat(value_chr, current_chr[0], json));
-    }
-    XnrgCall(FUNC_JSON_APPEND);
-    ResponseJsonEnd();
-
-#ifdef USE_DOMOTICZ
-    if (show_energy_period) {
-      dtostrfd(Energy.total * 1000, 1, energy_total_chr[0]);
-      DomoticzSensorPowerEnergy((int)Energy.active_power[0], energy_total_chr[0]);
-
-      dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100, 1, energy_total_chr[1]);
-      dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100, 1, energy_total_chr[2]);
-      dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100, 1, export_active_chr[1]);
-      dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100, 1, export_active_chr[2]);
-      DomoticzSensorP1SmartMeter(energy_total_chr[1], energy_total_chr[2], export_active_chr[1], export_active_chr[2], (int)Energy.active_power[0]);
-
-      if (Energy.voltage_available) {
-        DomoticzSensor(DZ_VOLTAGE, voltage_chr[0]);
-      }
-      if (Energy.current_available) {
-        DomoticzSensor(DZ_CURRENT, current_chr[0]);
-      }
-    }
-#endif
-#ifdef USE_KNX
-    if (show_energy_period) {
-      if (Energy.voltage_available) {
-        KnxSensor(KNX_ENERGY_VOLTAGE, Energy.voltage[0]);
-      }
-      if (Energy.current_available) {
-        KnxSensor(KNX_ENERGY_CURRENT, Energy.current[0]);
-      }
-      KnxSensor(KNX_ENERGY_POWER, Energy.active_power[0]);
-      if (!Energy.type_dc) {
-        KnxSensor(KNX_ENERGY_POWERFACTOR, power_factor_knx);
-      }
-      KnxSensor(KNX_ENERGY_DAILY, Energy.daily);
-      KnxSensor(KNX_ENERGY_TOTAL, Energy.total);
-      KnxSensor(KNX_ENERGY_START, Energy.start_energy);
-    }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    if (Energy.voltage_available) {
-      WSContentSend_PD(HTTP_SNS_VOLTAGE, EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
-    }
-    if (Energy.current_available) {
-      WSContentSend_PD(HTTP_SNS_CURRENT, EnergyFormat(value_chr, current_chr[0], json));
-    }
-    WSContentSend_PD(HTTP_SNS_POWER, EnergyFormat(value_chr, active_power_chr[0], json));
-    if (!Energy.type_dc) {
-      if (Energy.current_available && Energy.voltage_available) {
-        WSContentSend_PD(HTTP_ENERGY_SNS1, EnergyFormat(value_chr, apparent_power_chr[0], json),
-                                           EnergyFormat(value2_chr, reactive_power_chr[0], json),
-                                           EnergyFormat(value3_chr, power_factor_chr[0], json));
-      }
-      if (!isnan(Energy.frequency[0])) {
-        WSContentSend_PD(PSTR("{s}" D_FREQUENCY "{m}%s " D_UNIT_HERTZ "{e}"),
-          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
-      }
-    }
-    WSContentSend_PD(HTTP_ENERGY_SNS2, energy_daily_chr, energy_yesterday_chr, energy_total_chr[0]);
-    if (!isnan(Energy.export_active)) {
-      WSContentSend_PD(HTTP_ENERGY_SNS3, export_active_chr[0]);
-    }
-
-    XnrgCall(FUNC_WEB_SENSOR);
-#endif
-  }
-}
-
-
-
-
-
-bool Xdrv03(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_PRE_INIT == function) {
-    energy_flg = ENERGY_NONE;
-    XnrgCall(FUNC_PRE_INIT);
-  }
-  else if (energy_flg) {
-    switch (function) {
-      case FUNC_LOOP:
-        XnrgCall(FUNC_LOOP);
-        break;
-      case FUNC_EVERY_250_MSECOND:
-        XnrgCall(FUNC_EVERY_250_MSECOND);
-        break;
-      case FUNC_SERIAL:
-        result = XnrgCall(FUNC_SERIAL);
-        break;
-#ifdef USE_ENERGY_MARGIN_DETECTION
-      case FUNC_SET_POWER:
-        Energy.power_steady_counter = 2;
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kEnergyCommands, EnergyCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-bool Xsns03(uint8_t function)
-{
-  bool result = false;
-
-  if (energy_flg) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        EnergyEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        EnergyShow(true);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        EnergyShow(false);
-        break;
-#endif
-      case FUNC_SAVE_BEFORE_RESTART:
-        EnergySaveState();
-        break;
-      case FUNC_INIT:
-        EnergySnsInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-#ifdef USE_LIGHT
-# 124 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-#define XDRV_04 4
-
-
-enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX };
-
-const uint8_t LIGHT_COLOR_SIZE = 25;
-
-const char kLightCommands[] PROGMEM = "|"
-  D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|"
-  D_CMND_RGBWWTABLE "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|"
-  D_CMND_WHITE "|" D_CMND_CHANNEL "|" D_CMND_HSBCOLOR "|UNDOCA" ;
-
-void (* const LightCommand[])(void) PROGMEM = {
-  &CmndColor, &CmndColorTemperature, &CmndDimmer, &CmndDimmerRange, &CmndLedTable, &CmndFade,
-  &CmndRgbwwTable, &CmndScheme, &CmndSpeed, &CmndWakeup, &CmndWakeupDuration,
-  &CmndWhite, &CmndChannel, &CmndHsbColor, &CmndUndocA };
-
-
-enum LightColorModes {
-  LCM_RGB = 1, LCM_CT = 2, LCM_BOTH = 3 };
-
-struct LRgbColor {
-  uint8_t R, G, B;
-};
-const uint8_t MAX_FIXED_COLOR = 12;
-const LRgbColor kFixedColor[MAX_FIXED_COLOR] PROGMEM =
-  { 255,0,0, 0,255,0, 0,0,255, 228,32,0, 0,228,32, 0,32,228, 188,64,0, 0,160,96, 160,32,240, 255,255,0, 255,0,170, 255,255,255 };
-
-struct LWColor {
-  uint8_t W;
-};
-const uint8_t MAX_FIXED_WHITE = 4;
-const LWColor kFixedWhite[MAX_FIXED_WHITE] PROGMEM = { 0, 255, 128, 32 };
-
-struct LCwColor {
-  uint8_t C, W;
-};
-const uint8_t MAX_FIXED_COLD_WARM = 4;
-const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
-
-
-const uint16_t CT_MIN = 153;
-const uint16_t CT_MAX = 500;
-
-const uint16_t CT_MIN_ALEXA = 200;
-const uint16_t CT_MAX_ALEXA = 380;
-
-
-
-
-
-
-typedef struct gamma_table_t {
-  uint16_t to_src;
-  uint16_t to_gamma;
-} gamma_table_t;
-
-const gamma_table_t gamma_table[] = {
-  { 1, 1 },
-  { 4, 1 },
-  { 209, 13 },
-  { 312, 41 },
-  { 457, 106 },
-  { 626, 261 },
-  { 762, 450 },
-  { 895, 703 },
-  { 1023, 1023 },
-  { 0xFFFF, 0xFFFF }
-};
-
-
-const gamma_table_t gamma_table_fast[] = {
-  { 384, 192 },
-  { 768, 576 },
-  { 1023, 1023 },
-  { 0xFFFF, 0xFFFF }
-};
-# 248 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-struct LIGHT {
-  uint32_t strip_timer_counter = 0;
-  power_t power = 0;
-
-  uint16_t wakeup_counter = 0;
-
-  uint8_t entry_color[LST_MAX];
-  uint8_t current_color[LST_MAX];
-  uint8_t new_color[LST_MAX];
-  uint8_t last_color[LST_MAX];
-  uint8_t color_remap[LST_MAX];
-
-  uint8_t wheel = 0;
-  uint8_t random = 0;
-  uint8_t subtype = 0;
-  uint8_t device = 0;
-  uint8_t old_power = 1;
-  uint8_t wakeup_active = 0;
-  uint8_t wakeup_dimmer = 0;
-  uint8_t fixed_color_index = 1;
-  uint8_t pwm_offset = 0;
-  uint8_t max_scheme = LS_MAX -1;
-
-  bool update = true;
-  bool pwm_multi_channels = false;
-
-  bool fade_initialized = false;
-  bool fade_running = false;
-  uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
-  uint16_t fade_cur_10[LST_MAX];
-  uint16_t fade_end_10[LST_MAX];
-  uint16_t fade_duration = 0;
-  uint32_t fade_start = 0;
-} Light;
-
-power_t LightPower(void)
-{
-  return Light.power;
-}
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-power_t LightPowerIRAM(void) ICACHE_RAM_ATTR;
-#endif
-
-power_t LightPowerIRAM(void)
-{
-  return Light.power;
-}
-
-uint8_t LightDevice(void)
-{
-  return Light.device;
-}
-
-static uint32_t min3(uint32_t a, uint32_t b, uint32_t c) {
-  return (a < b && a < c) ? a : (b < c) ? b : c;
-}
-# 344 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-class LightStateClass {
-  private:
-    uint16_t _hue = 0;
-    uint8_t _sat = 255;
-    uint8_t _briRGB = 255;
-
-    uint8_t _r = 255;
-    uint8_t _g = 255;
-    uint8_t _b = 255;
-
-    uint8_t _subtype = 0;
-    uint16_t _ct = CT_MIN;
-    uint8_t _wc = 255;
-    uint8_t _ww = 0;
-    uint8_t _briCT = 255;
-
-    uint8_t _color_mode = LCM_RGB;
-
-
-
-
-
-    uint16_t _ct_min_range = CT_MIN;
-    uint16_t _ct_max_range = CT_MAX;
-
-  public:
-    LightStateClass() {
-
-    }
-
-    void setSubType(uint8_t sub_type) {
-      _subtype = sub_type;
-    }
-# 386 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-    uint8_t setColorMode(uint8_t cm) {
-      uint8_t prev_cm = _color_mode;
-      if (cm < LCM_RGB) { cm = LCM_RGB; }
-      if (cm > LCM_BOTH) { cm = LCM_BOTH; }
-      uint8_t maxbri = (_briRGB >= _briCT) ? _briRGB : _briCT;
-
-      switch (_subtype) {
-        case LST_COLDWARM:
-          _color_mode = LCM_CT;
-          break;
-
-        case LST_NONE:
-        case LST_SINGLE:
-        case LST_RGB:
-        default:
-          _color_mode = LCM_RGB;
-          break;
-
-        case LST_RGBW:
-        case LST_RGBCW:
-          _color_mode = cm;
-          break;
-      }
-      if (LCM_RGB == _color_mode) {
-        _briCT = 0;
-        if (0 == _briRGB) { _briRGB = maxbri; }
-      }
-      if (LCM_CT == _color_mode) {
-        _briRGB = 0;
-        if (0 == _briCT) { _briCT = maxbri; }
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setColorMode prev_cm (%d) req_cm (%d) new_cm (%d)", prev_cm, cm, _color_mode);
-#endif
-      return prev_cm;
-    }
-
-    inline uint8_t getColorMode() {
-      return _color_mode;
-    }
-
-    void addRGBMode() {
-      setColorMode(_color_mode | LCM_RGB);
-    }
-    void addCTMode() {
-      setColorMode(_color_mode | LCM_CT);
-    }
-
-
-    void getRGB(uint8_t *r, uint8_t *g, uint8_t *b) {
-      if (r) { *r = _r; }
-      if (g) { *g = _g; }
-      if (b) { *b = _b; }
-    }
-
-
-
-    void getCW(uint8_t *rc, uint8_t *rw) {
-      if (rc) { *rc = _wc; }
-      if (rw) { *rw = _ww; }
-    }
-
-
-    void getActualRGBCW(uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *c, uint8_t *w) {
-      bool rgb_channels_on = _color_mode & LCM_RGB;
-      bool ct_channels_on = _color_mode & LCM_CT;
-
-      if (r) { *r = rgb_channels_on ? changeUIntScale(_r, 0, 255, 0, _briRGB) : 0; }
-      if (g) { *g = rgb_channels_on ? changeUIntScale(_g, 0, 255, 0, _briRGB) : 0; }
-      if (b) { *b = rgb_channels_on ? changeUIntScale(_b, 0, 255, 0, _briRGB) : 0; }
-
-      if (c) { *c = ct_channels_on ? changeUIntScale(_wc, 0, 255, 0, _briCT) : 0; }
-      if (w) { *w = ct_channels_on ? changeUIntScale(_ww, 0, 255, 0, _briCT) : 0; }
-    }
-
-    uint8_t getChannels(uint8_t *channels) {
-      getActualRGBCW(&channels[0], &channels[1], &channels[2], &channels[3], &channels[4]);
-    }
-
-    void getChannelsRaw(uint8_t *channels) {
-      channels[0] = _r;
-      channels[1] = _g;
-      channels[2] = _b;
-      channels[3] = _wc;
-      channels[4] = _ww;
-    }
-
-    void getHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
-      if (hue) { *hue = _hue; }
-      if (sat) { *sat = _sat; }
-      if (bri) { *bri = _briRGB; }
-    }
-
-
-    uint8_t getBri(void) {
-
-      return (_briRGB >= _briCT) ? _briRGB : _briCT;
-    }
-
-
-    inline uint8_t getBriCT() {
-      return _briCT;
-    }
-
-    static inline uint8_t DimmerToBri(uint8_t dimmer) {
-      return changeUIntScale(dimmer, 0, 100, 0, 255);
-    }
-    static uint8_t BriToDimmer(uint8_t bri) {
-      uint8_t dimmer = changeUIntScale(bri, 0, 255, 0, 100);
-
-      if ((dimmer == 0) && (bri > 0)) { dimmer = 1; }
-      return dimmer;
-    }
-
-    uint8_t getDimmer(uint32_t mode = 0) {
-      uint8_t bri;
-      switch (mode) {
-        case 1:
-          bri = getBriRGB();
-          break;
-        case 2:
-          bri = getBriCT();
-          break;
-        default:
-          bri = getBri();
-          break;
-      }
-      return BriToDimmer(bri);
-    }
-
-    inline uint16_t getCT() const {
-      return _ct;
-    }
-
-
-    uint16_t getCT10bits() const {
-      return changeUIntScale(_ct, _ct_min_range, _ct_max_range, 0, 1023);
-    }
-
-    inline void setCTRange(uint16_t ct_min_range, uint16_t ct_max_range) {
-      _ct_min_range = ct_min_range;
-      _ct_max_range = ct_max_range;
-    }
-
-    inline void getCTRange(uint16_t *ct_min_range, uint16_t *ct_max_range) const {
-      if (ct_min_range) { *ct_min_range = _ct_min_range; }
-      if (ct_max_range) { *ct_max_range = _ct_max_range; }
-    }
-
-
-    void getXY(float *x, float *y) {
-      RgbToXy(_r, _g, _b, x, y);
-    }
-
-
-
-    void setBri(uint8_t bri) {
-      setBriRGB(_color_mode & LCM_RGB ? bri : 0);
-      setBriCT(_color_mode & LCM_CT ? bri : 0);
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setBri RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-    }
-
-
-    uint8_t setBriRGB(uint8_t bri_rgb) {
-      uint8_t prev_bri = _briRGB;
-      _briRGB = bri_rgb;
-      if (bri_rgb > 0) { addRGBMode(); }
-      return prev_bri;
-    }
-
-
-    uint8_t setBriCT(uint8_t bri_ct) {
-      uint8_t prev_bri = _briCT;
-      _briCT = bri_ct;
-      if (bri_ct > 0) { addCTMode(); }
-      return prev_bri;
-    }
-
-    inline uint8_t getBriRGB() {
-      return _briRGB;
-    }
-
-    void setDimmer(uint8_t dimmer) {
-      setBri(DimmerToBri(dimmer));
-    }
-
-    void setCT(uint16_t ct) {
-      if (0 == ct) {
-
-        setColorMode(LCM_RGB);
-      } else {
-        ct = (ct < CT_MIN ? CT_MIN : (ct > CT_MAX ? CT_MAX : ct));
-        _ww = changeUIntScale(ct, _ct_min_range, _ct_max_range, 0, 255);
-        _wc = 255 - _ww;
-        _ct = ct;
-        addCTMode();
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCT RGB raw (%d %d %d) HS (%d %d) briRGB (%d) briCT (%d) CT (%d)", _r, _g, _b, _hue, _sat, _briRGB, _briCT, _ct);
-#endif
-    }
-# 604 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-    void setCW(uint8_t c, uint8_t w, bool free_range = false) {
-      uint16_t max = (w > c) ? w : c;
-      uint16_t sum = c + w;
-
-      if (0 == max) {
-        _briCT = 0;
-        setColorMode(LCM_RGB);
-      } else {
-        if (!free_range) {
-
-          _ww = changeUIntScale(w, 0, sum, 0, 255);
-          _wc = 255 - _ww;
-        } else {
-          _ww = changeUIntScale(w, 0, max, 0, 255);
-          _wc = changeUIntScale(c, 0, max, 0, 255);
-        }
-        _ct = changeUIntScale(w, 0, sum, _ct_min_range, _ct_max_range);
-        addCTMode();
-        if (_color_mode & LCM_CT) { _briCT = free_range ? max : (sum > 255 ? 255 : sum); }
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCW CW (%d %d) CT (%d) briCT (%d)", c, w, _ct, _briCT);
-#endif
-    }
-
-
-    uint8_t setRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
-      uint16_t hue;
-      uint8_t sat;
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB input (%d %d %d)", r, g, b);
-#endif
-
-      uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
-
-      if (0 == max) {
-        r = g = b = 255;
-        setColorMode(LCM_CT);
-      } else {
-        if (255 > max) {
-
-          r = changeUIntScale(r, 0, max, 0, 255);
-          g = changeUIntScale(g, 0, max, 0, 255);
-          b = changeUIntScale(b, 0, max, 0, 255);
-        }
-        addRGBMode();
-      }
-      if (!keep_bri) {
-        _briRGB = (_color_mode & LCM_RGB) ? max : 0;
-      }
-
-      RgbToHsb(r, g, b, &hue, &sat, nullptr);
-      _r = r;
-      _g = g;
-      _b = b;
-      _hue = hue;
-      _sat = sat;
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-      return max;
-    }
-
-    void setHS(uint16_t hue, uint8_t sat) {
-      uint8_t r, g, b;
-      HsToRgb(hue, sat, &r, &g, &b);
-      _r = r;
-      _g = g;
-      _b = b;
-      _hue = hue;
-      _sat = sat;
-      addRGBMode();
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS HS (%d %d) rgb (%d %d %d)", hue, sat, r, g, b);
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-  }
-
-
-
-  void setChannelsRaw(uint8_t *channels) {
-    _r = channels[0];
-    _g = channels[1];
-    _b = channels[2];
-    _wc = channels[3];
-    _ww = channels[4];
-}
-
-
-
-
-  void setChannels(uint8_t *channels) {
-    setRGB(channels[0], channels[1], channels[2]);
-    setCW(channels[3], channels[4], true);
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels (%d %d %d %d %d)",
-      channels[0], channels[1], channels[2], channels[3], channels[4]);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels CT (%d) briRGB (%d) briCT (%d)", _ct, _briRGB, _briCT);
-#endif
-  }
-
-
-    static void RgbToHsb(uint8_t r, uint8_t g, uint8_t b, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri);
-    static void HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
-    static void RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y);
-    static void XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb);
-
-};
-# 720 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_04_light.ino"
-void LightStateClass::RgbToHsb(uint8_t ir, uint8_t ig, uint8_t ib, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri) {
-  uint32_t r = ir;
-  uint32_t g = ig;
-  uint32_t b = ib;
-  uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
-  uint32_t min = (r < g && r < b) ? r : (g < b) ? g : b;
-  uint32_t d = max - min;
-
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = max;
-
-  if (d != 0) {
-    sat = changeUIntScale(d, 0, max, 0, 255);
-    if (r == max) {
-      hue = (g > b) ? changeUIntScale(g-b,0,d,0,60) : 360 - changeUIntScale(b-g,0,d,0,60);
-    } else if (g == max) {
-      hue = (b > r) ? 120 + changeUIntScale(b-r,0,d,0,60) : 120 - changeUIntScale(r-b,0,d,0,60);
-    } else {
-      hue = (r > g) ? 240 + changeUIntScale(r-g,0,d,0,60) : 240 - changeUIntScale(g-r,0,d,0,60);
-    }
-    hue = hue % 360;
-  }
-
-  if (r_hue) *r_hue = hue;
-  if (r_sat) *r_sat = sat;
-  if (r_bri) *r_bri = bri;
-
-}
-
-void LightStateClass::HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
-  uint32_t r = 255;
-  uint32_t g = 255;
-  uint32_t b = 255;
-
-  hue = hue % 360;
-
-  if (sat > 0) {
-    uint32_t i = hue / 60;
-    uint32_t f = hue % 60;
-    uint32_t q = 255 - changeUIntScale(f, 0, 60, 0, sat);
-    uint32_t p = 255 - sat;
-    uint32_t t = 255 - changeUIntScale(60 - f, 0, 60, 0, sat);
-
-    switch (i) {
-      case 0:
-
-        g = t;
-        b = p;
-        break;
-      case 1:
-        r = q;
-
-        b = p;
-        break;
-      case 2:
-        r = p;
-
-        b = t;
-        break;
-      case 3:
-        r = p;
-        g = q;
-
-        break;
-      case 4:
-        r = t;
-        g = p;
-
-        break;
-      default:
-
-        g = p;
-        b = q;
-        break;
-      }
-    }
-  if (r_r) *r_r = r;
-  if (r_g) *r_g = g;
-  if (r_b) *r_b = b;
-}
-
-#define POW FastPrecisePowf
-
-void LightStateClass::RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y) {
-  float x = 0.31271f;
-  float y = 0.32902f;
-
-  if (i_r + i_b + i_g > 0) {
-    float r = (float)i_r / 255.0f;
-    float g = (float)i_g / 255.0f;
-    float b = (float)i_b / 255.0f;
-
-
-    r = (r > 0.04045f) ? POW((r + 0.055f) / (1.0f + 0.055f), 2.4f) : (r / 12.92f);
-    g = (g > 0.04045f) ? POW((g + 0.055f) / (1.0f + 0.055f), 2.4f) : (g / 12.92f);
-    b = (b > 0.04045f) ? POW((b + 0.055f) / (1.0f + 0.055f), 2.4f) : (b / 12.92f);
-
-
-
-    float X = r * 0.649926f + g * 0.103455f + b * 0.197109f;
-    float Y = r * 0.234327f + g * 0.743075f + b * 0.022598f;
-    float Z = r * 0.000000f + g * 0.053077f + b * 1.035763f;
-
-    x = X / (X + Y + Z);
-    y = Y / (X + Y + Z);
-
-  }
-  if (r_x) *r_x = x;
-  if (r_y) *r_y = y;
-}
-
-void LightStateClass::XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb)
-{
-  x = (x > 0.99f ? 0.99f : (x < 0.01f ? 0.01f : x));
-  y = (y > 0.99f ? 0.99f : (y < 0.01f ? 0.01f : y));
-  float z = 1.0f - x - y;
-
-  float X = x / y;
-  float Z = z / y;
-
-
-
-  float r = X * 3.2406f - 1.5372f - Z * 0.4986f;
-  float g = -X * 0.9689f + 1.8758f + Z * 0.0415f;
-  float b = X * 0.0557f - 0.2040f + Z * 1.0570f;
-  float max = (r > g && r > b) ? r : (g > b) ? g : b;
-  r = r / max;
-  g = g / max;
-  b = b / max;
-  r = (r <= 0.0031308f) ? 12.92f * r : 1.055f * POW(r, (1.0f / 2.4f)) - 0.055f;
-  g = (g <= 0.0031308f) ? 12.92f * g : 1.055f * POW(g, (1.0f / 2.4f)) - 0.055f;
-  b = (b <= 0.0031308f) ? 12.92f * b : 1.055f * POW(b, (1.0f / 2.4f)) - 0.055f;
-
-
-
-
-
-  int32_t ir = r * 255.0f + 0.5f;
-  int32_t ig = g * 255.0f + 0.5f;
-  int32_t ib = b * 255.0f + 0.5f;
-  if (rr) { *rr = (ir > 255 ? 255: (ir < 0 ? 0 : ir)); }
-  if (rg) { *rg = (ig > 255 ? 255: (ig < 0 ? 0 : ig)); }
-  if (rb) { *rb = (ib > 255 ? 255: (ib < 0 ? 0 : ib)); }
-}
-
-class LightControllerClass {
-private:
-  LightStateClass *_state;
-
-
-  bool _ct_rgb_linked = true;
-  bool _pwm_multi_channels = false;
-
-public:
-  LightControllerClass(LightStateClass& state) {
-    _state = &state;
-  }
-
-  void setSubType(uint8_t sub_type) {
-    _state->setSubType(sub_type);
-  }
-
-  inline bool setCTRGBLinked(bool ct_rgb_linked) {
-    bool prev = _ct_rgb_linked;
-    if (_pwm_multi_channels) {
-      _ct_rgb_linked = false;
-    } else {
-      _ct_rgb_linked = ct_rgb_linked;
-    }
-    return prev;
-  }
-
-  void setAlexaCTRange(bool alexa_ct_range) {
-
-    if (alexa_ct_range) {
-      _state->setCTRange(CT_MIN_ALEXA, CT_MAX_ALEXA);
-    } else {
-      _state->setCTRange(CT_MIN, CT_MAX);
-    }
-  }
-
-  inline bool isCTRGBLinked() {
-    return _ct_rgb_linked;
-  }
-
-  inline bool setPWMMultiChannel(bool pwm_multi_channels) {
-    bool prev = _pwm_multi_channels;
-    _pwm_multi_channels = pwm_multi_channels;
-    if (pwm_multi_channels) setCTRGBLinked(false);
-    return prev;
-  }
-
-  inline bool isPWMMultiChannel(void) {
-    return _pwm_multi_channels;
-  }
-
-#ifdef DEBUG_LIGHT
-  void debugLogs() {
-    uint8_t r,g,b,c,w;
-    _state->getActualRGBCW(&r,&g,&b,&c,&w);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs rgb (%d %d %d) cw (%d %d)",
-      r, g, b, c, w);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs lightCurrent (%d %d %d %d %d)",
-      Light.current_color[0], Light.current_color[1], Light.current_color[2],
-      Light.current_color[3], Light.current_color[4]);
-  }
-#endif
-
-  void loadSettings() {
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings Settings.light_color (%d %d %d %d %d - %d)",
-      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
-      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings light_type/sub (%d %d)",
-      light_type, Light.subtype);
-#endif
-    if (_pwm_multi_channels) {
-      _state->setChannelsRaw(Settings.light_color);
-    } else {
-
-      _state->setCW(Settings.light_color[3], Settings.light_color[4], true);
-      _state->setRGB(Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]);
-
-
-
-      uint8_t bri = _state->DimmerToBri(Settings.light_dimmer);
-      if (Settings.light_color[0] + Settings.light_color[1] + Settings.light_color[2] > 0) {
-
-
-        if ( (DEFAULT_LIGHT_COMPONENT == Settings.light_color[0]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[1]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[2]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[3]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[4]) &&
-             (DEFAULT_LIGHT_DIMMER == Settings.light_dimmer) ) {
-          _state->setColorMode(LCM_RGB);
-        }
-        _state->setBriRGB(bri);
-      } else {
-        _state->setBriCT(bri);
-      }
-    }
-  }
-
-  void changeCTB(uint16_t new_ct, uint8_t briCT) {
-
-
-
-
-
-
-    if ((LST_COLDWARM != Light.subtype) && (LST_RGBW > Light.subtype)) {
-      return;
-    }
-    _state->setCT(new_ct);
-    _state->setBriCT(briCT);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
-    saveSettings();
-    calcLevels();
-
-  }
-
-  void changeDimmer(uint8_t dimmer, uint32_t mode = 0) {
-    uint8_t bri = changeUIntScale(dimmer, 0, 100, 0, 255);
-    switch (mode) {
-      case 1:
-        changeBriRGB(bri);
-        if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-        break;
-      case 2:
-        changeBriCT(bri);
-        if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
-        break;
-      default:
-        changeBri(bri);
-        break;
-    }
-  }
-
-  void changeBri(uint8_t bri) {
-    _state->setBri(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeBriRGB(uint8_t bri) {
-    _state->setBriRGB(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeBriCT(uint8_t bri) {
-    _state->setBriCT(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
-    _state->setRGB(r, g, b, keep_bri);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-    saveSettings();
-    calcLevels();
-  }
-
-
-
-  void calcLevels(uint8_t *current_color = nullptr) {
-    uint8_t r,g,b,c,w,briRGB,briCT;
-    if (current_color == nullptr) { current_color = Light.current_color; }
-
-    if (_pwm_multi_channels) {
-      _state->getChannelsRaw(current_color);
-      return;
-    }
-
-    _state->getActualRGBCW(&r,&g,&b,&c,&w);
-    briRGB = _state->getBriRGB();
-    briCT = _state->getBriCT();
-
-    current_color[0] = current_color[1] = current_color[2] = 0;
-    current_color[3] = current_color[4] = 0;
-    switch (Light.subtype) {
-      case LST_NONE:
-        current_color[0] = 255;
-        break;
-      case LST_SINGLE:
-        current_color[0] = briRGB;
-        break;
-      case LST_COLDWARM:
-        current_color[0] = c;
-        current_color[1] = w;
-        break;
-      case LST_RGBW:
-      case LST_RGBCW:
-        if (LST_RGBCW == Light.subtype) {
-          current_color[3] = c;
-          current_color[4] = w;
-        } else {
-          current_color[3] = briCT;
-        }
-
-      case LST_RGB:
-        current_color[0] = r;
-        current_color[1] = g;
-        current_color[2] = b;
-        break;
-    }
-  }
-
-  void changeHSB(uint16_t hue, uint8_t sat, uint8_t briRGB) {
-    _state->setHS(hue, sat);
-    _state->setBriRGB(briRGB);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-    saveSettings();
-    calcLevels();
-  }
-
-
-  void saveSettings() {
-    if (Light.pwm_multi_channels) {
-
-      _state->getChannelsRaw(Settings.light_color);
-      Settings.light_dimmer = 100;
-    } else {
-      uint8_t cm = _state->getColorMode();
-
-      memset(&Settings.light_color[0], 0, sizeof(Settings.light_color));
-      if (LCM_RGB & cm) {
-        _state->getRGB(&Settings.light_color[0], &Settings.light_color[1], &Settings.light_color[2]);
-        Settings.light_dimmer = _state->BriToDimmer(_state->getBriRGB());
-
-        if (LCM_BOTH == cm) {
-
-          _state->getActualRGBCW(nullptr, nullptr, nullptr, &Settings.light_color[3], &Settings.light_color[4]);
-        }
-      } else if (LCM_CT == cm) {
-        _state->getCW(&Settings.light_color[3], &Settings.light_color[4]);
-        Settings.light_dimmer = _state->BriToDimmer(_state->getBriCT());
-      }
-    }
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::saveSettings Settings.light_color (%d %d %d %d %d - %d)",
-      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
-      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
-#endif
-  }
-
-
-
-
-  void changeChannels(uint8_t *channels) {
-    if (Light.pwm_multi_channels) {
-      _state->setChannelsRaw(channels);
-    } else if (LST_COLDWARM == Light.subtype) {
-
-      uint8_t remapped_channels[5] = {0,0,0,channels[0],channels[1]};
-      _state->setChannels(remapped_channels);
-    } else {
-      _state->setChannels(channels);
-    }
-
-    saveSettings();
-    calcLevels();
-  }
-};
-
-
-
-LightStateClass light_state = LightStateClass();
-LightControllerClass light_controller = LightControllerClass(light_state);
-
-
-
-
-
-uint16_t change8to10(uint8_t v) {
-  return changeUIntScale(v, 0, 255, 0, 1023);
-}
-
-uint8_t change10to8(uint16_t v) {
-  return (0 == v) ? 0 : changeUIntScale(v, 4, 1023, 1, 255);
-}
-
-
-
-
-
-uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
-  uint16_t from_src = 0;
-  uint16_t from_gamma = 0;
-
-  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
-    uint16_t to_src = gt->to_src;
-    uint16_t to_gamma = gt->to_gamma;
-    if (v <= to_src) {
-      return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
-    }
-    from_src = to_src;
-    from_gamma = to_gamma;
-  }
-}
-
-uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr) {
-  uint16_t from_src = 0;
-  uint16_t from_gamma = 0;
-
-  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
-    uint16_t to_src = gt->to_src;
-    uint16_t to_gamma = gt->to_gamma;
-    if (vg <= to_gamma) {
-      return changeUIntScale(vg, from_gamma, to_gamma, from_src, to_src);
-    }
-    from_src = to_src;
-    from_gamma = to_gamma;
-  }
-}
-
-
-uint16_t ledGamma10_10(uint16_t v) {
-  return ledGamma_internal(v, gamma_table);
-}
-
-uint16_t ledGamma10(uint8_t v) {
-  return ledGamma10_10(change8to10(v));
-}
-
-
-uint8_t ledGamma(uint8_t v) {
-  return change10to8(ledGamma10(v));
-}
-
-
-
-void LightPwmOffset(uint32_t offset)
-{
-  Light.pwm_offset = offset;
-}
-
-bool LightModuleInit(void)
-{
-  light_type = LT_BASIC;
-
-  if (Settings.flag.pwm_control) {
-    for (uint32_t i = 0; i < MAX_PWMS; i++) {
-      if (pin[GPIO_PWM1 +i] < 99) { light_type++; }
-    }
-  }
-
-  light_flg = 0;
-  if (XlgtCall(FUNC_MODULE_INIT)) {
-
-  }
-  else if (SONOFF_BN == my_module_type) {
-    light_type = LT_PWM1;
-  }
-  else if (SONOFF_LED == my_module_type) {
-    if (!my_module.io[4]) {
-      pinMode(4, OUTPUT);
-      digitalWrite(4, LOW);
-    }
-    if (!my_module.io[5]) {
-      pinMode(5, OUTPUT);
-      digitalWrite(5, LOW);
-    }
-    if (!my_module.io[14]) {
-      pinMode(14, OUTPUT);
-      digitalWrite(14, LOW);
-    }
-    light_type = LT_PWM2;
-  }
-
-  if (light_type > LT_BASIC) {
-    devices_present++;
-  }
-
-
-  if (Settings.flag3.pwm_multi_channels) {
-    uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-    if (0 == pwm_channels) { pwm_channels = 1; }
-    devices_present += pwm_channels - 1;
-  } else if ((Settings.param[P_RGB_REMAP] & 128) && (LST_RGBW <= (light_type & 7))) {
-
-    devices_present++;
-  }
-
-  return (light_type > LT_BASIC);
-}
-
-void LightInit(void)
-{
-  Light.device = devices_present;
-  Light.subtype = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-  Light.pwm_multi_channels = Settings.flag3.pwm_multi_channels;
-
-  if (LST_RGBW <= Light.subtype) {
-
-
-    bool ct_rgb_linked = !(Settings.param[P_RGB_REMAP] & 128);
-    light_controller.setCTRGBLinked(ct_rgb_linked);
-  }
-
-  if ((LST_SINGLE <= Light.subtype) && Light.pwm_multi_channels) {
-
-    light_controller.setPWMMultiChannel(true);
-    Light.device = devices_present - Light.subtype + 1;
-  } else if (!light_controller.isCTRGBLinked()) {
-
-    Light.device--;
-  }
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightInit Light.pwm_multi_channels=%d Light.subtype=%d Light.device=%d devices_present=%d",
-    Light.pwm_multi_channels, Light.subtype, Light.device, devices_present);
-#endif
-
-  light_controller.setSubType(Light.subtype);
-  light_controller.loadSettings();
-  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
-
-  if (LST_SINGLE == Light.subtype) {
-    Settings.light_color[0] = 255;
-  }
-  if (light_type < LT_PWM6) {
-    for (uint32_t i = 0; i < light_type; i++) {
-      Settings.pwm_value[i] = 0;
-      if (pin[GPIO_PWM1 +i] < 99) {
-        pinMode(pin[GPIO_PWM1 +i], OUTPUT);
-      }
-    }
-    if (pin[GPIO_ARIRFRCV] < 99) {
-      if (pin[GPIO_ARIRFSEL] < 99) {
-        pinMode(pin[GPIO_ARIRFSEL], OUTPUT);
-        digitalWrite(pin[GPIO_ARIRFSEL], 1);
-      }
-    }
-  }
-
-  uint32_t max_scheme = Light.max_scheme;
-  if (Light.subtype < LST_RGB) {
-    max_scheme = LS_POWER;
-  }
-  if ((LS_WAKEUP == Settings.light_scheme) || (Settings.light_scheme > max_scheme)) {
-    Settings.light_scheme = LS_POWER;
-  }
-  Light.power = 0;
-  Light.update = true;
-  Light.wakeup_active = 0;
-
-  LightUpdateColorMapping();
-}
-
-void LightUpdateColorMapping(void)
-{
-  uint8_t param = Settings.param[P_RGB_REMAP] & 127;
-  if (param > 119){ param = 0; }
-
-  uint8_t tmp[] = {0,1,2,3,4};
-  Light.color_remap[0] = tmp[param / 24];
-  for (uint32_t i = param / 24; i<4; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 24;
-  Light.color_remap[1] = tmp[(param / 6)];
-  for (uint32_t i = param / 6; i<3; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 6;
-  Light.color_remap[2] = tmp[(param / 2)];
-  for (uint32_t i = param / 2; i<2; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 2;
-  Light.color_remap[3] = tmp[param];
-  Light.color_remap[4] = tmp[1-param];
-
-  Light.update = true;
-
-}
-
-uint8_t LightGetDimmer(uint8_t dimmer) {
-  return light_state.getDimmer(dimmer);
-}
-
-void LightSetDimmer(uint8_t dimmer) {
-  light_controller.changeDimmer(dimmer);
-}
-
-void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
-  light_state.getHSB(hue, sat, bri);
-}
-
-void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
-  light_state.HsToRgb(hue, sat, r_r, r_g, r_b);
-}
-
-
-uint8_t LightGetBri(uint8_t device) {
-  uint8_t bri = 254;
-  if (Light.pwm_multi_channels) {
-    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
-      bri = Light.current_color[device - Light.device];
-    }
-  } else if (light_controller.isCTRGBLinked()) {
-    if (device == Light.device) {
-      bri = light_state.getBri();
-    }
-  } else {
-    if (device == Light.device) {
-      bri = light_state.getBriRGB();
-    } else if (device == Light.device + 1) {
-      bri = light_state.getBriCT();
-    }
-  }
-  return bri;
-}
-
-
-void LightSetBri(uint8_t device, uint8_t bri) {
-  if (Light.pwm_multi_channels) {
-    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
-      Light.current_color[device - Light.device] = bri;
-      light_controller.changeChannels(Light.current_color);
-    }
-  } else if (light_controller.isCTRGBLinked()) {
-    if (device == Light.device) {
-      light_controller.changeBri(bri);
-    }
-  } else {
-    if (device == Light.device) {
-      light_controller.changeBriRGB(bri);
-    } else if (device == Light.device + 1) {
-      light_controller.changeBriCT(bri);
-    }
-  }
-}
-
-void LightSetColorTemp(uint16_t ct)
-{
-
-
-
-
-
-
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
-    return;
-  }
-  light_controller.changeCTB(ct, light_state.getBriCT());
-}
-
-uint16_t LightGetColorTemp(void)
-{
-
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
-    return 0;
-  }
-  return (light_state.getColorMode() & LCM_CT) ? light_state.getCT() : 0;
-}
-
-void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value)
-{
-
-
-
-  if (Settings.flag.light_signal) {
-    uint16_t signal = changeUIntScale(value, lo, hi, 0, 255);
-
-    light_controller.changeRGB(signal, 255 - signal, 0, true);
-    Settings.light_scheme = 0;
-    if (0 == light_state.getBri()) {
-      light_controller.changeBri(50);
-    }
-  }
-}
-
-
-char* LightGetColor(char* scolor, boolean force_hex = false)
-{
-  light_controller.calcLevels();
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < Light.subtype; i++) {
-    if (!force_hex && Settings.flag.decimal_text) {
-      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Light.current_color[i]);
-    } else {
-      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%02X"), scolor, Light.current_color[i]);
-    }
-  }
-  return scolor;
-}
-
-void LightPowerOn(void)
-{
-  if (light_state.getBri() && !(Light.power)) {
-    ExecuteCommandPower(Light.device, POWER_ON, SRC_LIGHT);
-  }
-}
-
-void LightState(uint8_t append)
-{
-  char scolor[LIGHT_COLOR_SIZE];
-  char scommand[33];
-  bool unlinked = !light_controller.isCTRGBLinked() && (Light.subtype >= LST_RGBW);
-
-  if (append) {
-    ResponseAppend_P(PSTR(","));
-  } else {
-    Response_P(PSTR("{"));
-  }
-  if (!Light.pwm_multi_channels) {
-    if (unlinked) {
-
-      ResponseAppend_P(PSTR("\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"
-                           ",\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"),
-                            Light.device, GetStateText(Light.power & 1), Light.device, light_state.getDimmer(1),
-                            Light.device + 1, GetStateText(Light.power & 2 ? 1 : 0), Light.device + 1, light_state.getDimmer(2));
-    } else {
-      GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable);
-      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power & 1),
-                      light_state.getDimmer());
-    }
-
-
-    if (Light.subtype > LST_SINGLE) {
-      ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
-      if (LST_RGB <= Light.subtype) {
-        uint16_t hue;
-        uint8_t sat, bri;
-        light_state.getHSB(&hue, &sat, &bri);
-        sat = changeUIntScale(sat, 0, 255, 0, 100);
-        bri = changeUIntScale(bri, 0, 255, 0, 100);
-
-        ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
-      }
-
-      if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
-      }
-
-      if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
-      }
-
-      ResponseAppend_P(PSTR(",\"" D_CMND_CHANNEL "\":[" ));
-      for (uint32_t i = 0; i < Light.subtype; i++) {
-        uint8_t channel_raw = Light.current_color[i];
-        uint8_t channel = changeUIntScale(channel_raw,0,255,0,100);
-
-        if ((0 == channel) && (channel_raw > 0)) { channel = 1; }
-        ResponseAppend_P(PSTR("%s%d" ), (i > 0 ? "," : ""), channel);
-      }
-      ResponseAppend_P(PSTR("]"));
-    }
-
-    if (append) {
-      if (Light.subtype >= LST_RGB) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_SCHEME "\":%d"), Settings.light_scheme);
-      }
-      if (Light.max_scheme > LS_MAX) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_WIDTH "\":%d"), Settings.light_width);
-      }
-      ResponseAppend_P(PSTR(",\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d,\"" D_CMND_LEDTABLE "\":\"%s\""),
-        GetStateText(Settings.light_fade), Settings.light_speed, GetStateText(Settings.light_correction));
-    }
-  } else {
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      GetPowerDevice(scommand, Light.device + i, sizeof(scommand), 1);
-      uint32_t light_power_masked = Light.power & (1 << i);
-      light_power_masked = light_power_masked ? 1 : 0;
-      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_CHANNEL "%d\":%d,"), scommand, GetStateText(light_power_masked), Light.device + i,
-        changeUIntScale(Light.current_color[i], 0, 255, 0, 100));
-    }
-    ResponseAppend_P(PSTR("\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
-  }
-
-  if (!append) {
-    ResponseJsonEnd();
-  }
-}
-
-void LightPreparePower(power_t channels = 0xFFFFFFFF) {
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power);
-#endif
-
-  if (Light.pwm_multi_channels) {
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      if (bitRead(channels, i)) {
-
-        if ((Light.current_color[i]) && (!bitRead(Light.power, i))) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device + i, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else {
-
-          if ((0 == Light.current_color[i]) && bitRead(Light.power, i)) {
-            ExecuteCommandPower(Light.device + i, POWER_OFF_NO_STATE, SRC_LIGHT);
-          }
-        }
-  #ifdef USE_DOMOTICZ
-        DomoticzUpdatePowerState(Light.device + i);
-  #endif
-      }
-    }
-  } else {
-    if (light_controller.isCTRGBLinked()) {
-      if (light_state.getBri() && !(Light.power)) {
-        if (!Settings.flag.not_power_linked) {
-          ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
-        }
-      } else if (!light_state.getBri() && Light.power) {
-        ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
-      }
-    } else {
-
-      if (channels & 1) {
-        if (light_state.getBriRGB() && !(Light.power & 1)) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else if (!light_state.getBriRGB() && (Light.power & 1)) {
-          ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
-        }
-      }
-
-      if (channels & 2) {
-        if (light_state.getBriCT() && !(Light.power & 2)) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else if (!light_state.getBriCT() && (Light.power & 2)) {
-          ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
-        }
-      }
-    }
-#ifdef USE_DOMOTICZ
-    DomoticzUpdatePowerState(Light.device);
-#endif
-  }
-
-  if (Settings.flag3.hass_tele_on_power) {
-    MqttPublishTeleState();
-  }
-
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower End power=%d Light.power=%d", power, Light.power);
-#endif
-  Light.power = power >> (Light.device - 1);
-  LightState(0);
-}
-
-void LightCycleColor(int8_t direction)
-{
-  if (Light.strip_timer_counter % (Settings.light_speed * 2)) {
-    return;
-  }
-
-  if (0 == direction) {
-    if (Light.random == Light.wheel) {
-      Light.random = random(255);
-
-      uint8_t my_dir = (Light.random < Light.wheel -128) ? 1 :
-                       (Light.random < Light.wheel ) ? 0 :
-                       (Light.random > Light.wheel +128) ? 0 : 1;
-      Light.random = (Light.random & 0xFE) | my_dir;
-
-
-    }
-
-    direction = (Light.random &0x01) ? 1 : -1;
-  }
-  Light.wheel += direction;
-  uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);
-
-
-
-  uint8_t sat;
-  light_state.getHSB(nullptr, &sat, nullptr);
-  light_state.setHS(hue, sat);
-  light_controller.calcLevels(Light.new_color);
-}
-
-void LightSetPower(void)
-{
-
-  Light.old_power = Light.power;
-
-  uint32_t mask = 1;
-  if (Light.pwm_multi_channels) {
-    mask = (1 << Light.subtype) - 1;
-  } else if (!light_controller.isCTRGBLinked()) {
-    mask = 3;
-  }
-  uint32_t shift = Light.device - 1;
-
-
-
-
-
-  Light.power = (XdrvMailbox.index & (mask << shift)) >> shift;
-  if (Light.wakeup_active) {
-    Light.wakeup_active--;
-  }
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightSetPower XdrvMailbox.index=%d Light.old_power=%d Light.power=%d mask=%d shift=%d",
-    XdrvMailbox.index, Light.old_power, Light.power, mask, shift);
-#endif
-  if (Light.power != Light.old_power) {
-    Light.update = true;
-  }
-  LightAnimate();
-}
-
-
-
-
-void LightAnimate(void)
-{
-  uint16_t light_still_on = 0;
-  bool power_off = false;
-
-
-  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
-  Light.strip_timer_counter++;
-
-
-
-  if (Light.power || Light.fade_running) {
-    if (Settings.sleep > PWM_MAX_SLEEP) {
-      sleep = PWM_MAX_SLEEP;
-    } else {
-      sleep = Settings.sleep;
-    }
-  } else {
-    sleep = Settings.sleep;
-  }
-
-  if (!Light.power) {
-    Light.strip_timer_counter = 0;
-    if (Settings.light_scheme >= LS_MAX) {
-      power_off = true;
-    }
-  } else {
-    switch (Settings.light_scheme) {
-      case LS_POWER:
-        light_controller.calcLevels(Light.new_color);
-        break;
-      case LS_WAKEUP:
-        if (2 == Light.wakeup_active) {
-          Light.wakeup_active = 1;
-          for (uint32_t i = 0; i < Light.subtype; i++) {
-            Light.new_color[i] = 0;
-          }
-          Light.wakeup_counter = 0;
-          Light.wakeup_dimmer = 0;
-        }
-        Light.wakeup_counter++;
-        if (Light.wakeup_counter > ((Settings.light_wakeup * STATES) / Settings.light_dimmer)) {
-          Light.wakeup_counter = 0;
-          Light.wakeup_dimmer++;
-          if (Light.wakeup_dimmer <= Settings.light_dimmer) {
-            light_state.setDimmer(Light.wakeup_dimmer);
-            light_controller.calcLevels();
-            for (uint32_t i = 0; i < Light.subtype; i++) {
-              Light.new_color[i] = Light.current_color[i];
-            }
-          } else {
-
-
-
-
-            Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\""));
-            LightState(1);
-            ResponseJsonEnd();
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WAKEUP));
-            XdrvRulesProcess();
-
-            Light.wakeup_active = 0;
-            Settings.light_scheme = LS_POWER;
-          }
-        }
-        break;
-      case LS_CYCLEUP:
-        LightCycleColor(1);
-        break;
-      case LS_CYCLEDN:
-        LightCycleColor(-1);
-        break;
-      case LS_RANDOM:
-        LightCycleColor(0);
-        break;
-      default:
-        XlgtCall(FUNC_SET_SCHEME);
-    }
-  }
-
-  if ((Settings.light_scheme < LS_MAX) || power_off) {
-
-
-    LightApplyPower(Light.new_color, Light.power);
-
-
-
-
-
-
-
-    if (memcmp(Light.last_color, Light.new_color, Light.subtype)) {
-      Light.update = true;
-    }
-    if (Light.update) {
-      uint16_t cur_col_10[LST_MAX];
-      Light.update = false;
-
-
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        Light.last_color[i] = Light.new_color[i];
-
-        cur_col_10[i] = change8to10(Light.new_color[i]);
-      }
-
-      if (Light.pwm_multi_channels) {
-        calcGammaMultiChannels(cur_col_10);
-      } else {
-        calcGammaBulbs(cur_col_10);
-
-
-
-        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
-          uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
-          for (uint32_t i=0; i<3; i++) {
-
-            uint32_t adjust10 = change8to10(Settings.rgbwwTable[i]);
-            cur_col_10[i] = changeUIntScale(cur_col_10[i] - min_rgb_10, 0, 1023, 0, adjust10);
-          }
-
-
-          uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
-          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);
-          if (LST_RGBW == Light.subtype) {
-
-            cur_col_10[3] = white_10;
-          } else {
-
-            uint32_t ct = light_state.getCT10bits();
-            cur_col_10[4] = changeUIntScale(ct, 0, 1023, 0, white_10);
-            cur_col_10[3] = white_10 - cur_col_10[4];
-          }
-        }
-      }
-
-
-      if (0 != Settings.rgbwwTable[4]) {
-        for (uint32_t i = 0; i<Light.subtype; i++) {
-          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
-          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
-        }
-      }
-
-
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-
-        cur_col_10[i] = (cur_col_10[i] > 0) ? changeUIntScale(cur_col_10[i], 1, 1023, 1, Settings.pwm_range) : 0;
-      }
-
-
-      uint16_t orig_col_10bits[LST_MAX];
-      memcpy(orig_col_10bits, cur_col_10, sizeof(orig_col_10bits));
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
-      }
-
-      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) {
-
-        memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
-
-        LightSetOutputs(cur_col_10);
-        Light.fade_initialized = true;
-      } else {
-        if (Light.fade_running) {
-
-          memcpy(Light.fade_start_10, Light.fade_cur_10, sizeof(Light.fade_start_10));
-        }
-        memcpy(Light.fade_end_10, cur_col_10, sizeof(Light.fade_start_10));
-        Light.fade_running = true;
-        Light.fade_duration = 0;
-        Light.fade_start = 0;
-
-      }
-    }
-    if (Light.fade_running) {
-      if (LightApplyFade()) {
-
-
-
-        LightSetOutputs(Light.fade_cur_10);
-      }
-    }
-  }
-}
-
-bool isChannelGammaCorrected(uint32_t channel) {
-  if (!Settings.light_correction) { return false; }
-  if (channel >= Light.subtype) { return false; }
-
-  if (PHILIPS == my_module_type) {
-    if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }
-    if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }
-  }
-  return true;
-}
-
-
-uint16_t fadeGamma(uint32_t channel, uint16_t v) {
-  if (isChannelGammaCorrected(channel)) {
-    return ledGamma_internal(v, gamma_table_fast);
-  } else {
-    return v;
-  }
-}
-uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg) {
-  if (isChannelGammaCorrected(channel)) {
-    return ledGammaReverse_internal(vg, gamma_table_fast);
-  } else {
-    return vg;
-  }
-}
-
-bool LightApplyFade(void) {
-  static uint32_t last_millis = 0;
-  uint32_t now = millis();
-
-  if ((now - last_millis) <= 5) {
-    return false;
-  }
-  last_millis = now;
-
-
-  if (0 == Light.fade_duration) {
-    Light.fade_start = now;
-
-    uint32_t distance = 0;
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      int32_t channel_distance = fadeGammaReverse(i, Light.fade_end_10[i]) - fadeGammaReverse(i, Light.fade_start_10[i]);
-      if (channel_distance < 0) { channel_distance = - channel_distance; }
-      if (channel_distance > distance) { distance = channel_distance; }
-    }
-    if (distance > 0) {
-
-
-
-      Light.fade_duration = (distance * Settings.light_speed * 500) / 1023;
-      if (Settings.save_data) {
-
-        uint32_t delay_seconds = 1 + (Light.fade_duration + 999) / 1000;
-
-        if (save_data_counter < delay_seconds) {
-          save_data_counter = delay_seconds;
-        }
-      }
-    } else {
-
-      Light.fade_running = false;
-    }
-  }
-
-  uint16_t fade_current = now - Light.fade_start;
-  if (fade_current <= Light.fade_duration) {
-
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      Light.fade_cur_10[i] = fadeGamma(i,
-                                changeUIntScale(fadeGammaReverse(i, fade_current),
-                                             0, Light.fade_duration,
-                                             fadeGammaReverse(i, Light.fade_start_10[i]),
-                                             fadeGammaReverse(i, Light.fade_end_10[i])));
-
-
-
-    }
-  } else {
-
-
-    Light.fade_running = false;
-    Light.fade_start = 0;
-    Light.fade_duration = 0;
-
-    memcpy(Light.fade_cur_10, Light.fade_end_10, sizeof(Light.fade_end_10));
-
-    memcpy(Light.fade_start_10, Light.fade_end_10, sizeof(Light.fade_start_10));
-  }
-  return true;
-}
-
-
-
-void LightApplyPower(uint8_t new_color[LST_MAX], power_t power) {
-
-  if (Light.pwm_multi_channels) {
-
-    for (uint32_t i = 0; i < LST_MAX; i++) {
-      if (0 == bitRead(power,i)) {
-        new_color[i] = 0;
-      }
-    }
-
-
-
-
-
-  } else {
-    if (!light_controller.isCTRGBLinked()) {
-
-      if (0 == (power & 1)) {
-        new_color[0] = new_color[1] = new_color[2] = 0;
-      }
-      if (0 == (power & 2)) {
-        new_color[3] = new_color[4] = 0;
-      }
-    } else if (!power) {
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        new_color[i] = 0;
-      }
-    }
-  }
-}
-
-void LightSetOutputs(const uint16_t *cur_col_10) {
-
-  if (light_type < LT_PWM6) {
-    for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) {
-      if (pin[GPIO_PWM1 +i] < 99) {
-
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10[(i + Light.pwm_offset)] : cur_col_10[(i + Light.pwm_offset)]);
-      }
-    }
-  }
-
-
-
-
-  uint8_t cur_col[LST_MAX];
-  for (uint32_t i = 0; i < LST_MAX; i++) {
-    cur_col[i] = change10to8(cur_col_10[i]);
-  }
-
-
-  uint8_t scale_col[3];
-  uint32_t max = (cur_col[0] > cur_col[1] && cur_col[0] > cur_col[2]) ? cur_col[0] : (cur_col[1] > cur_col[2]) ? cur_col[1] : cur_col[2];
-  for (uint32_t i = 0; i < 3; i++) {
-    scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
-  }
-
-  char *tmp_data = XdrvMailbox.data;
-  char *tmp_topic = XdrvMailbox.topic;
-  XdrvMailbox.data = (char*)cur_col;
-  XdrvMailbox.topic = (char*)scale_col;
-  if (XlgtCall(FUNC_SET_CHANNELS)) { }
-  else if (XdrvCall(FUNC_SET_CHANNELS)) { }
-  XdrvMailbox.data = tmp_data;
-  XdrvMailbox.topic = tmp_topic;
-}
-
-
-void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
-
-  if (Settings.light_correction) {
-    for (uint32_t i = 0; i < LST_MAX; i++) {
-      cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
-    }
-  }
-}
-
-void calcGammaBulbs(uint16_t cur_col_10[5]) {
-
-
-
-  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-
-    uint32_t cw1 = Light.subtype - 1;
-    uint32_t cw0 = Light.subtype - 2;
-    uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];
-    uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;
-
-    if (PHILIPS == my_module_type) {
-
-      cur_col_10[cw1] = light_state.getCT10bits();
-
-      if (Settings.light_correction) {
-        cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);
-      } else {
-        cur_col_10[cw0] = white_bri10_1023;
-      }
-    } else if (Settings.light_correction) {
-
-      if (white_bri10 <= 1031) {
-
-        uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
-
-        cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
-        cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
-      } else {
-        cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
-        cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
-      }
-    }
-  }
-
-  if (Settings.light_correction) {
-
-    if (LST_RGB <= Light.subtype) {
-      for (uint32_t i = 0; i < 3; i++) {
-        cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
-      }
-    }
-
-    if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
-      cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
-    }
-  }
-}
-
-
-
-
-
-bool LightColorEntry(char *buffer, uint32_t buffer_length)
-{
-  char scolor[10];
-  char *p;
-  char *str;
-  uint32_t entry_type = 0;
-  uint8_t value = Light.fixed_color_index;
-
-  if (buffer[0] == '#') {
-    buffer++;
-    buffer_length--;
-  }
-
-  if (Light.subtype >= LST_RGB) {
-    char option = (1 == buffer_length) ? buffer[0] : '\0';
-    if (('+' == option) && (Light.fixed_color_index < MAX_FIXED_COLOR)) {
-      value++;
-    }
-    else if (('-' == option) && (Light.fixed_color_index > 1)) {
-      value--;
-    } else {
-      value = atoi(buffer);
-    }
-  }
-
-  memset(&Light.entry_color, 0x00, sizeof(Light.entry_color));
-
-  while ((buffer_length > 0) && ('=' == buffer[buffer_length - 1])) {
-    buffer_length--;
-    memcpy(&Light.entry_color, &Light.current_color, sizeof(Light.entry_color));
-  }
-  if (strstr(buffer, ",") != nullptr) {
-    int8_t i = 0;
-    for (str = strtok_r(buffer, ",", &p); str && i < 6; str = strtok_r(nullptr, ",", &p)) {
-      if (i < LST_MAX) {
-        Light.entry_color[i++] = atoi(str);
-      }
-    }
-    entry_type = 2;
-  }
-  else if (((2 * Light.subtype) == buffer_length) || (buffer_length > 3)) {
-    for (uint32_t i = 0; i < tmin((uint)(buffer_length / 2), sizeof(Light.entry_color)); i++) {
-      strlcpy(scolor, buffer + (i *2), 3);
-      Light.entry_color[i] = (uint8_t)strtol(scolor, &p, 16);
-    }
-    entry_type = 1;
-  }
-  else if ((Light.subtype >= LST_RGB) && (value > 0) && (value <= MAX_FIXED_COLOR)) {
-    Light.fixed_color_index = value;
-    memcpy_P(&Light.entry_color, &kFixedColor[value -1], 3);
-    entry_type = 1;
-  }
-  else if ((value > 199) && (value <= 199 + MAX_FIXED_COLD_WARM)) {
-    if (LST_RGBW == Light.subtype) {
-      memcpy_P(&Light.entry_color[3], &kFixedWhite[value -200], 1);
-      entry_type = 1;
-    }
-    else if (LST_COLDWARM == Light.subtype) {
-      memcpy_P(&Light.entry_color, &kFixedColdWarm[value -200], 2);
-      entry_type = 1;
-    }
-    else if (LST_RGBCW == Light.subtype) {
-      memcpy_P(&Light.entry_color[3], &kFixedColdWarm[value -200], 2);
-      entry_type = 1;
-    }
-  }
-  if (entry_type) {
-    Settings.flag.decimal_text = entry_type -1;
-  }
-  return (entry_type);
-}
-
-
-
-void CmndSupportColor(void)
-{
-  bool valid_entry = false;
-  bool coldim = false;
-
-  if (XdrvMailbox.data_len > 0) {
-    valid_entry = LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len);
-    if (valid_entry) {
-      if (XdrvMailbox.index <= 2) {
-        uint32_t old_bri = light_state.getBri();
-
-        light_controller.changeChannels(Light.entry_color);
-        if (2 == XdrvMailbox.index) {
-
-          light_controller.changeBri(old_bri);
-        }
-
-        Settings.light_scheme = 0;
-        coldim = true;
-      } else {
-        for (uint32_t i = 0; i < LST_RGB; i++) {
-          Settings.ws_color[XdrvMailbox.index -3][i] = Light.entry_color[i];
-        }
-      }
-    }
-  }
-  char scolor[LIGHT_COLOR_SIZE];
-  if (!valid_entry && (XdrvMailbox.index <= 2)) {
-    ResponseCmndChar(LightGetColor(scolor));
-  }
-  if (XdrvMailbox.index >= 3) {
-    scolor[0] = '\0';
-    for (uint32_t i = 0; i < LST_RGB; i++) {
-      if (Settings.flag.decimal_text) {
-        snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.ws_color[XdrvMailbox.index -3][i]);
-      } else {
-        snprintf_P(scolor, sizeof(scolor), PSTR("%s%02X"), scolor, Settings.ws_color[XdrvMailbox.index -3][i]);
-      }
-    }
-    ResponseCmndIdxChar(scolor);
-  }
-  if (coldim) {
-    LightPreparePower();
-  }
-}
-
-void CmndColor(void)
-{
-
-
-
-
-
-
-
-  if ((Light.subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) {
-    CmndSupportColor();
-  }
-}
-
-void CmndWhite(void)
-{
-
-
-  if (Light.pwm_multi_channels) { return; }
-  if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      light_controller.changeDimmer(XdrvMailbox.payload, 2);
-      LightPreparePower(2);
-    } else {
-      ResponseCmndNumber(light_state.getDimmer(2));
-    }
-  }
-}
-
-void CmndChannel(void)
-{
-
-
-
-
-  if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
-    uint32_t light_index = XdrvMailbox.index - Light.device;
-    power_t coldim = 0;
-
-
-    if (1 == XdrvMailbox.data_len) {
-      uint8_t channel = changeUIntScale(Light.current_color[light_index],0,255,0,100);
-      if ('+' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10;
-      } else if ('-' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (channel < 11) ? 1 : channel - 10;
-      }
-    }
-
-
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      Light.current_color[light_index] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
-      if (Light.pwm_multi_channels) {
-        coldim = 1 << light_index;
-      } else {
-        if (light_controller.isCTRGBLinked()) {
-
-          if ((light_index < 3) && (light_controller.isCTRGBLinked())) {
-            Light.current_color[3] = Light.current_color[4] = 0;
-          } else {
-            Light.current_color[0] = Light.current_color[1] = Light.current_color[2] = 0;
-          }
-          coldim = 1;
-        } else {
-          if (light_index < 3) { coldim = 1; }
-          else { coldim = 2; }
-        }
-      }
-      light_controller.changeChannels(Light.current_color);
-    }
-    ResponseCmndIdxNumber(changeUIntScale(Light.current_color[light_index],0,255,0,100));
-    if (coldim) {
-      LightPreparePower(coldim);
-    }
-  }
-}
-
-void CmndHsbColor(void)
-{
-
-
-
-
-
-
-
-  if (Light.subtype >= LST_RGB) {
-    if (XdrvMailbox.data_len > 0) {
-      uint16_t c_hue;
-      uint8_t c_sat;
-      light_state.getHSB(&c_hue, &c_sat, nullptr);
-      uint32_t HSB[3];
-      HSB[0] = c_hue;
-      HSB[1] = c_sat;
-      HSB[2] = light_state.getBriRGB();
-      if ((2 == XdrvMailbox.index) || (3 == XdrvMailbox.index)) {
-        if ((uint32_t)XdrvMailbox.payload > 100) { XdrvMailbox.payload = 100; }
-        HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
-      } else {
-        uint32_t paramcount = ParseParameters(3, HSB);
-        if (HSB[0] > 360) { HSB[0] = 360; }
-        for (uint32_t i = 1; i < paramcount; i++) {
-          if (HSB[i] > 100) { HSB[i] == 100; }
-          HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255);
-        }
-      }
-      light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
-      LightPreparePower(1);
-    } else {
-      LightState(0);
-    }
-  }
-}
-
-void CmndScheme(void)
-{
-
-
-
-
-
-  if (Light.subtype >= LST_RGB) {
-    uint32_t max_scheme = Light.max_scheme;
-
-    if (1 == XdrvMailbox.data_len) {
-      if (('+' == XdrvMailbox.data[0]) && (Settings.light_scheme < max_scheme)) {
-        XdrvMailbox.payload = Settings.light_scheme + ((0 == Settings.light_scheme) ? 2 : 1);
-      }
-      else if (('-' == XdrvMailbox.data[0]) && (Settings.light_scheme > 0)) {
-        XdrvMailbox.payload = Settings.light_scheme - ((2 == Settings.light_scheme) ? 2 : 1);
-      }
-    }
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= max_scheme)) {
-      uint32_t parm[2];
-      if (ParseParameters(2, parm) > 1) {
-        Light.wheel = parm[1];
-      }
-      Settings.light_scheme = XdrvMailbox.payload;
-      if (LS_WAKEUP == Settings.light_scheme) {
-        Light.wakeup_active = 3;
-      }
-      LightPowerOn();
-      Light.strip_timer_counter = 0;
-
-      if (Settings.flag3.hass_tele_on_power) {
-        MqttPublishTeleState();
-      }
-    }
-    ResponseCmndNumber(Settings.light_scheme);
-  }
-}
-
-void CmndWakeup(void)
-{
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    light_controller.changeDimmer(XdrvMailbox.payload);
-  }
-  Light.wakeup_active = 3;
-  Settings.light_scheme = LS_WAKEUP;
-  LightPowerOn();
-  ResponseCmndChar(D_JSON_STARTED);
-}
-
-void CmndColorTemperature(void)
-{
-
-
-
-
-  if (Light.pwm_multi_channels) { return; }
-  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-    uint32_t ct = light_state.getCT();
-    if (1 == XdrvMailbox.data_len) {
-      if ('+' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct > (CT_MAX-34)) ? CT_MAX : ct + 34;
-      }
-      else if ('-' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct < (CT_MIN+34)) ? CT_MIN : ct - 34;
-      }
-    }
-    if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {
-      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBriCT());
-      LightPreparePower(2);
-    } else {
-      ResponseCmndNumber(ct);
-    }
-  }
-}
-
-void CmndDimmer(void)
-{
-
-
-
-
-
-
-  uint32_t dimmer;
-  if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
-
-  if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
-    dimmer = light_state.getDimmer();
-  } else {
-    dimmer = light_state.getDimmer(XdrvMailbox.index);
-  }
-
-  if (1 == XdrvMailbox.data_len) {
-    if ('+' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (dimmer > 89) ? 100 : dimmer + 10;
-    } else if ('-' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (dimmer < 11) ? 1 : dimmer - 10;
-    }
-  }
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    if (light_controller.isCTRGBLinked()) {
-
-      light_controller.changeDimmer(XdrvMailbox.payload);
-      LightPreparePower();
-    } else {
-      if (0 != XdrvMailbox.index) {
-        light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
-        LightPreparePower(1 << (XdrvMailbox.index - 1));
-      } else {
-
-        light_controller.changeDimmer(XdrvMailbox.payload, 1);
-        light_controller.changeDimmer(XdrvMailbox.payload, 2);
-        LightPreparePower();
-      }
-    }
-    Light.update = true;
-  } else {
-    ResponseCmndNumber(dimmer);
-  }
-}
-
-void CmndDimmerRange(void)
-{
-
-
-  if (XdrvMailbox.data_len > 0) {
-    uint32_t parm[2];
-    parm[0] = Settings.dimmer_hw_min;
-    parm[1] = Settings.dimmer_hw_max;
-    ParseParameters(2, parm);
-    if (parm[0] < parm[1]) {
-      Settings.dimmer_hw_min = parm[0];
-      Settings.dimmer_hw_max = parm[1];
-    } else {
-      Settings.dimmer_hw_min = parm[1];
-      Settings.dimmer_hw_max = parm[0];
-    }
-    restart_flag = 2;
-  }
-  Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
-}
-
-void CmndLedTable(void)
-{
-
-
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    switch (XdrvMailbox.payload) {
-    case 0:
-    case 1:
-      Settings.light_correction = XdrvMailbox.payload;
-      break;
-    case 2:
-      Settings.light_correction ^= 1;
-      break;
-    }
-    Light.update = true;
-  }
-  ResponseCmndStateText(Settings.light_correction);
-}
-
-void CmndRgbwwTable(void)
-{
-
-
-  if ((XdrvMailbox.data_len > 0)) {
-    uint32_t parm[LST_RGBCW -1];
-    uint32_t parmcount = ParseParameters(LST_RGBCW, parm);
-    for (uint32_t i = 0; i < parmcount; i++) {
-      Settings.rgbwwTable[i] = parm[i];
-    }
-    Light.update = true;
-  }
-  char scolor[LIGHT_COLOR_SIZE];
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < LST_RGBCW; i++) {
-    snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
-  }
-  ResponseCmndChar(scolor);
-}
-
-void CmndFade(void)
-{
-
-
-
-
-  switch (XdrvMailbox.payload) {
-  case 0:
-  case 1:
-    Settings.light_fade = XdrvMailbox.payload;
-    break;
-  case 2:
-    Settings.light_fade ^= 1;
-    break;
-  }
-  if (!Settings.light_fade) { Light.fade_running = false; }
-  ResponseCmndStateText(Settings.light_fade);
-}
-
-void CmndSpeed(void)
-{
-
-
-
-
-  if (1 == XdrvMailbox.data_len) {
-    if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
-      XdrvMailbox.payload = Settings.light_speed - 1;
-    }
-    else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) {
-      XdrvMailbox.payload = Settings.light_speed + 1;
-    }
-  }
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
-    Settings.light_speed = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.light_speed);
-}
-
-void CmndWakeupDuration(void)
-{
-
-
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3001)) {
-    Settings.light_wakeup = XdrvMailbox.payload;
-    Light.wakeup_active = 0;
-  }
-  ResponseCmndNumber(Settings.light_wakeup);
-}
-
-void CmndUndocA(void)
-{
-
-  char scolor[LIGHT_COLOR_SIZE];
-  LightGetColor(scolor, true);
-  scolor[6] = '\0';
-  Response_P(PSTR("%s,%d,%d,%d,%d,%d"), scolor, Settings.light_fade, Settings.light_correction, Settings.light_scheme, Settings.light_speed, Settings.light_width);
-  MqttPublishPrefixTopic_P(STAT, XdrvMailbox.topic);
-  mqtt_data[0] = '\0';
-}
-
-
-
-
-
-bool Xdrv04(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_MODULE_INIT == function) {
-    return LightModuleInit();
-  }
-  else if (light_type) {
-    switch (function) {
-      case FUNC_SERIAL:
-        result = XlgtCall(FUNC_SERIAL);
-        break;
-      case FUNC_LOOP:
-        if (Light.fade_running) {
-          if (LightApplyFade()) {
-            LightSetOutputs(Light.fade_cur_10);
-          }
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        LightAnimate();
-        break;
-      case FUNC_SET_POWER:
-        LightSetPower();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kLightCommands, LightCommand);
-        if (!result) {
-          result = XlgtCall(FUNC_COMMAND);
-        }
-        break;
-      case FUNC_PRE_INIT:
-        LightInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote.ino"
-#if defined(USE_IR_REMOTE) && !defined(USE_IR_REMOTE_FULL)
-
-
-
-
-#define XDRV_05 5
-
-#include <IRremoteESP8266.h>
-
-enum IrErrors { IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND };
-
-const char kIrRemoteCommands[] PROGMEM = "|" D_CMND_IRSEND ;
-
-
-void (* const IrRemoteCommand[])(void) PROGMEM = {
-  &CmndIrSend };
-
-
-static const uint8_t MAX_STANDARD_IR = NEC;
-const char kIrRemoteProtocols[] PROGMEM = "UNKNOWN|RC5|RC6|NEC";
-
-
-
-
-
-#include <IRsend.h>
-
-IRsend *irsend = nullptr;
-bool irsend_active = false;
-
-void IrSendInit(void)
-{
-  irsend = new IRsend(pin[GPIO_IRSEND]);
-  irsend->begin();
-}
-
-#ifdef USE_IR_RECEIVE
-
-
-
-
-const bool IR_RCV_SAVE_BUFFER = false;
-const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
-
-#include <IRrecv.h>
-
-IRrecv *irrecv = nullptr;
-
-unsigned long ir_lasttime = 0;
-
-void IrReceiveUpdateThreshold(void)
-{
-  if (irrecv != nullptr) {
-    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
-    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  }
-}
-
-void IrReceiveInit(void)
-{
-
-  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_RCV_BUFFER_SIZE, IR_RCV_TIMEOUT, IR_RCV_SAVE_BUFFER);
-  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  irrecv->enableIRIn();
-
-
-}
-
-void IrReceiveCheck(void)
-{
-  char sirtype[8];
-  int8_t iridx = 0;
-
-  decode_results results;
-
-  if (irrecv->decode(&results)) {
-    char hvalue[65];
-
-    iridx = results.decode_type;
-    if ((iridx < 0) || (iridx > MAX_STANDARD_IR)) { iridx = 0; }
-
-    if (iridx) {
-      if (results.bits > 64) {
-
-        uint32_t digits2 = results.bits / 8;
-        if (results.bits % 8) { digits2++; }
-        ToHex_P((unsigned char*)results.state, digits2, hvalue, sizeof(hvalue));
-      } else {
-        Uint64toHex(results.value, hvalue, results.bits);
-      }
-    } else {
-      Uint64toHex(results.value, hvalue, 32);
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_IRR "Echo %d, RawLen %d, Overflow %d, Bits %d, Value 0x%s, Decode %d"),
-              irsend_active, results.rawlen, results.overflow, results.bits, hvalue, results.decode_type);
-
-    unsigned long now = millis();
-
-    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
-      ir_lasttime = now;
-
-      char svalue[64];
-      if (Settings.flag.ir_receive_decimal) {
-        ulltoa(results.value, svalue, 10);
-      } else {
-        snprintf_P(svalue, sizeof(svalue), PSTR("\"0x%s\""), hvalue);
-      }
-      ResponseTime_P(PSTR(",\"" D_JSON_IRRECEIVED "\":{\"" D_JSON_IR_PROTOCOL "\":\"%s\",\"" D_JSON_IR_BITS "\":%d"),
-        GetTextIndexed(sirtype, sizeof(sirtype), iridx, kIrRemoteProtocols), results.bits);
-      if (iridx) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_DATA "\":%s"), svalue);
-      } else {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_HASH "\":%s"), svalue);
-      }
-
-      if (Settings.flag3.receive_raw) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
-        uint16_t i;
-        for (i = 1; i < results.rawlen; i++) {
-          if (i > 1) { ResponseAppend_P(PSTR(",")); }
-          uint32_t usecs;
-          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
-            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
-          }
-          ResponseAppend_P(PSTR("%d"), usecs);
-          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
-        }
-        uint16_t extended_length = results.rawlen - 1;
-        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
-          uint32_t usecs = results.rawbuf[j] * kRawTick;
-
-          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
-        }
-        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
-      }
-
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
-
-      XdrvRulesProcess();
-#ifdef USE_DOMOTICZ
-      if (iridx) {
-        unsigned long value = results.value | (iridx << 28);
-        DomoticzSensor(DZ_COUNT, value);
-      }
-#endif
-    }
-
-    irrecv->resume();
-  }
-}
-#endif
-
-
-
-
-
-uint32_t IrRemoteCmndIrSendJson(void)
-{
-
-
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) {
-    return IE_INVALID_JSON;
-  }
-
-  StaticJsonBuffer<140> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(dataBufUc);
-  if (!root.success()) {
-    return IE_INVALID_JSON;
-  }
-
-
-
-  char parm_uc[10];
-  const char *protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_PROTOCOL))];
-  uint16_t bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS))];
-  uint64_t data = strtoull(root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA))], nullptr, 0);
-  uint16_t repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT))];
-
-  if (XdrvMailbox.index > repeat + 1) {
-    repeat = XdrvMailbox.index - 1;
-  }
-  if (!(protocol && bits)) {
-    return IE_SYNTAX_IRSEND;
-  }
-
-  char protocol_text[20];
-  int protocol_code = GetCommandCode(protocol_text, sizeof(protocol_text), protocol, kIrRemoteProtocols);
-
-  char dvalue[64];
-  char hvalue[20];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %s (0x%s), repeat %d, protocol_code %d"),
-    protocol_text, protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat, protocol_code);
-
-  irsend_active = true;
-  switch (protocol_code) {
-#ifdef USE_IR_SEND_RC5
-    case RC5:
-      irsend->sendRC5(data, bits, repeat); break;
-#endif
-#ifdef USE_IR_SEND_RC6
-    case RC6:
-      irsend->sendRC6(data, bits, repeat); break;
-#endif
-#ifdef USE_IR_SEND_NEC
-    case NEC:
-      irsend->sendNEC(data, (bits > NEC_BITS) ? NEC_BITS : bits, repeat); break;
-#endif
-    default:
-      irsend_active = false;
-      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
-  }
-
-  return IE_NO_ERROR;
-}
-
-void CmndIrSend(void)
-{
-  uint8_t error = IE_SYNTAX_IRSEND;
-
-  if (XdrvMailbox.data_len) {
-
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      error = IE_INVALID_JSON;
-    } else {
-      error = IrRemoteCmndIrSendJson();
-    }
-  }
-  IrRemoteCmndResponse(error);
-}
-
-void IrRemoteCmndResponse(uint32_t error)
-{
-  switch (error) {
-    case IE_INVALID_RAWDATA:
-      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
-      break;
-    case IE_INVALID_JSON:
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      break;
-    case IE_SYNTAX_IRSEND:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_PROTOCOL ", " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
-      break;
-    default:
-      ResponseCmndDone();
-  }
-}
-
-
-
-
-
-bool Xdrv05(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        if (pin[GPIO_IRSEND] < 99) {
-          IrSendInit();
-        }
-#ifdef USE_IR_RECEIVE
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveInit();
-        }
-#endif
-        break;
-      case FUNC_EVERY_50_MSECOND:
-#ifdef USE_IR_RECEIVE
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveCheck();
-        }
-#endif
-        irsend_active = false;
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_IRSEND] < 99) {
-          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote_full.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_05_irremote_full.ino"
-#ifdef USE_IR_REMOTE_FULL
-
-
-
-
-#define XDRV_05 5
-
-#include <IRremoteESP8266.h>
-#include <IRsend.h>
-#include <IRrecv.h>
-#include <IRutils.h>
-#include <IRac.h>
-
-enum IrErrors { IE_RESPONSE_PROVIDED, IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND, IE_SYNTAX_IRHVAC,
-                IE_UNSUPPORTED_HVAC, IE_UNSUPPORTED_PROTOCOL };
-
-const char kIrRemoteCommands[] PROGMEM = "|"
-  D_CMND_IRHVAC "|" D_CMND_IRSEND ;
-
-void (* const IrRemoteCommand[])(void) PROGMEM = {
-  &CmndIrHvac, &CmndIrSend };
-
-
-
-
-
-IRsend *irsend = nullptr;
-bool irsend_active = false;
-
-void IrSendInit(void)
-{
-  irsend = new IRsend(pin[GPIO_IRSEND]);
-  irsend->begin();
-}
-
-
-
-uint8_t reverseBitsInByte(uint8_t b) {
-   b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-   b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-   b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-   return b;
-}
-
-
-uint64_t reverseBitsInBytes64(uint64_t b) {
-  union {
-    uint8_t b[8];
-    uint64_t i;
-  } a;
-  a.i = b;
-  for (uint32_t i=0; i<8; i++) {
-    a.b[i] = reverseBitsInByte(a.b[i]);
-  }
-  return a.i;
-}
-
-
-
-
-
-const bool IR_FULL_RCV_SAVE_BUFFER = false;
-const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
-
-
-
-
-const uint16_t IR_FULL_BUFFER_SIZE = 1024;
-
-
-
-const uint8_t IR__FULL_RCV_TIMEOUT = 50;
-
-IRrecv *irrecv = nullptr;
-
-unsigned long ir_lasttime = 0;
-
-void IrReceiveUpdateThreshold(void)
-{
-  if (irrecv != nullptr) {
-    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
-    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  }
-}
-
-void IrReceiveInit(void)
-{
-
-  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_FULL_BUFFER_SIZE, IR__FULL_RCV_TIMEOUT, IR_FULL_RCV_SAVE_BUFFER);
-  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  irrecv->enableIRIn();
-}
-
-String sendACJsonState(const stdAc::state_t &state) {
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-  json[D_JSON_IRHVAC_VENDOR] = typeToString(state.protocol);
-  json[D_JSON_IRHVAC_MODEL] = state.model;
-  json[D_JSON_IRHVAC_POWER] = IRac::boolToString(state.power);
-  json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(state.mode);
-
-  if (state.mode == stdAc::opmode_t::kOff || !state.power) {
-    json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(stdAc::opmode_t::kOff);
-    json[D_JSON_IRHVAC_POWER] = IRac::boolToString(false);
-  }
-  json[D_JSON_IRHVAC_CELSIUS] = IRac::boolToString(state.celsius);
-  if (floorf(state.degrees) == state.degrees) {
-    json[D_JSON_IRHVAC_TEMP] = floorf(state.degrees);
-  } else {
-    json[D_JSON_IRHVAC_TEMP] = RawJson(String(state.degrees, 1));
-  }
-  json[D_JSON_IRHVAC_FANSPEED] = IRac::fanspeedToString(state.fanspeed);
-  json[D_JSON_IRHVAC_SWINGV] = IRac::swingvToString(state.swingv);
-  json[D_JSON_IRHVAC_SWINGH] = IRac::swinghToString(state.swingh);
-  json[D_JSON_IRHVAC_QUIET] = IRac::boolToString(state.quiet);
-  json[D_JSON_IRHVAC_TURBO] = IRac::boolToString(state.turbo);
-  json[D_JSON_IRHVAC_ECONO] = IRac::boolToString(state.econo);
-  json[D_JSON_IRHVAC_LIGHT] = IRac::boolToString(state.light);
-  json[D_JSON_IRHVAC_FILTER] = IRac::boolToString(state.filter);
-  json[D_JSON_IRHVAC_CLEAN] = IRac::boolToString(state.clean);
-  json[D_JSON_IRHVAC_BEEP] = IRac::boolToString(state.beep);
-  json[D_JSON_IRHVAC_SLEEP] = state.sleep;
-
-  String payload = "";
-  payload.reserve(200);
-  json.printTo(payload);
-  return payload;
-}
-
-String sendIRJsonState(const struct decode_results &results) {
-  String json("{");
-  json += "\"" D_JSON_IR_PROTOCOL "\":\"";
-  json += typeToString(results.decode_type);
-  json += "\",\"" D_JSON_IR_BITS "\":";
-  json += results.bits;
-
-  if (hasACState(results.decode_type)) {
-    json += ",\"" D_JSON_IR_DATA "\":\"0x";
-    json += resultToHexidecimal(&results);
-    json += "\"";
-  } else {
-    if (UNKNOWN != results.decode_type) {
-      json += ",\"" D_JSON_IR_DATA "\":";
-    } else {
-      json += ",\"" D_JSON_IR_HASH "\":";
-    }
-    if (Settings.flag.ir_receive_decimal) {
-      char svalue[32];
-      ulltoa(results.value, svalue, 10);
-      json += svalue;
-    } else {
-      char hvalue[64];
-      if (UNKNOWN != results.decode_type) {
-        Uint64toHex(results.value, hvalue, results.bits);
-        json += "\"0x";
-        json += hvalue;
-        json += "\",\"" D_JSON_IR_DATALSB "\":\"0x";
-        Uint64toHex(reverseBitsInBytes64(results.value), hvalue, results.bits);
-        json += hvalue;
-        json += "\"";
-      } else {
-        Uint64toHex(results.value, hvalue, 32);
-        json += "\"0x";
-        json += hvalue;
-        json += "\"";
-      }
-    }
-  }
-  json += ",\"" D_JSON_IR_REPEAT "\":";
-  json += results.repeat;
-
-  stdAc::state_t ac_result;
-  if (IRAcUtils::decodeToState(&results, &ac_result, nullptr)) {
-
-    json += ",\"" D_CMND_IRHVAC "\":";
-    json += sendACJsonState(ac_result);
-  }
-
-  return json;
-}
-
-void IrReceiveCheck(void)
-{
-  decode_results results;
-
-  if (irrecv->decode(&results)) {
-    uint32_t now = millis();
-
-
-    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
-      ir_lasttime = now;
-      Response_P(PSTR("{\"" D_JSON_IRRECEIVED "\":%s"), sendIRJsonState(results).c_str());
-
-      if (Settings.flag3.receive_raw) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
-        uint16_t i;
-        for (i = 1; i < results.rawlen; i++) {
-          if (i > 1) { ResponseAppend_P(PSTR(",")); }
-          uint32_t usecs;
-          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
-            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
-          }
-          ResponseAppend_P(PSTR("%d"), usecs);
-          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
-        }
-        uint16_t extended_length = results.rawlen - 1;
-        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
-          uint32_t usecs = results.rawbuf[j] * kRawTick;
-
-          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
-        }
-        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
-      }
-
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
-
-      XdrvRulesProcess();
-    }
-
-    irrecv->resume();
-  }
-}
-
-
-
-
-
-
-
-String listSupportedProtocols(bool hvac) {
-  String l("");
-  bool first = true;
-  for (uint32_t i = UNUSED + 1; i <= kLastDecodeType; i++) {
-    bool found = false;
-    if (hvac) {
-      found = IRac::isProtocolSupported((decode_type_t)i);
-    } else {
-      found = (IRsend::defaultBits((decode_type_t)i) > 0) && (!IRac::isProtocolSupported((decode_type_t)i));
-    }
-    if (found) {
-      if (first) {
-        first = false;
-      } else {
-        l += "|";
-      }
-      l += typeToString((decode_type_t)i);
-    }
-  }
-  return l;
-}
-
-
-const stdAc::fanspeed_t IrHvacFanSpeed[] PROGMEM = { stdAc::fanspeed_t::kAuto,
-                      stdAc::fanspeed_t::kMin, stdAc::fanspeed_t::kLow,stdAc::fanspeed_t::kMedium,
-                      stdAc::fanspeed_t::kHigh, stdAc::fanspeed_t::kMax };
-
-uint32_t IrRemoteCmndIrHvacJson(void)
-{
-  stdAc::state_t state, prev;
-  char parm_uc[12];
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
-
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(dataBufUc);
-  if (!json.success()) { return IE_INVALID_JSON; }
-
-
-  state.protocol = decode_type_t::UNKNOWN;
-  state.model = 1;
-  state.mode = stdAc::opmode_t::kAuto;
-  state.power = false;
-  state.celsius = true;
-  state.degrees = 21.0f;
-  state.fanspeed = stdAc::fanspeed_t::kMedium;
-  state.swingv = stdAc::swingv_t::kOff;
-  state.swingh = stdAc::swingh_t::kOff;
-  state.light = false;
-  state.beep = false;
-  state.econo = false;
-  state.filter = false;
-  state.turbo = false;
-  state.quiet = false;
-  state.sleep = -1;
-  state.clean = false;
-  state.clock = -1;
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
-  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
-  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
-  if (decode_type_t::UNKNOWN == state.protocol) { return IE_UNSUPPORTED_HVAC; }
-  if (!IRac::isProtocolSupported(state.protocol)) { return IE_UNSUPPORTED_HVAC; }
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FANSPEED));
-  if (json.containsKey(parm_uc)) {
-    uint32_t fan_speed = json[parm_uc];
-    if ((fan_speed >= 1) && (fan_speed <= 5)) {
-      state.fanspeed = (stdAc::fanspeed_t) pgm_read_byte(&IrHvacFanSpeed[fan_speed]);
-    } else {
-      state.fanspeed = IRac::strToFanspeed(json[parm_uc]);
-    }
-  }
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODEL));
-  if (json.containsKey(parm_uc)) { state.model = IRac::strToModel(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODE));
-  if (json.containsKey(parm_uc)) { state.mode = IRac::strToOpmode(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGV));
-  if (json.containsKey(parm_uc)) { state.swingv = IRac::strToSwingV(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGH));
-  if (json.containsKey(parm_uc)) { state.swingh = IRac::strToSwingH(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TEMP));
-  if (json.containsKey(parm_uc)) { state.degrees = json[parm_uc]; }
-
-
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_POWER));
-  if (json.containsKey(parm_uc)) { state.power = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CELSIUS));
-  if (json.containsKey(parm_uc)) { state.celsius = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_LIGHT));
-  if (json.containsKey(parm_uc)) { state.light = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_BEEP));
-  if (json.containsKey(parm_uc)) { state.beep = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_ECONO));
-  if (json.containsKey(parm_uc)) { state.econo = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FILTER));
-  if (json.containsKey(parm_uc)) { state.filter = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TURBO));
-  if (json.containsKey(parm_uc)) { state.turbo = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_QUIET));
-  if (json.containsKey(parm_uc)) { state.quiet = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CLEAN));
-  if (json.containsKey(parm_uc)) { state.clean = IRac::strToBool(json[parm_uc]); }
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SLEEP));
-  if (json[parm_uc]) { state.sleep = json[parm_uc]; }
-
-
-  IRac ac(pin[GPIO_IRSEND]);
-  bool success = ac.sendAc(state, &prev);
-  if (!success) { return IE_SYNTAX_IRHVAC; }
-
-  Response_P(PSTR("{\"" D_CMND_IRHVAC "\":%s}"), sendACJsonState(state).c_str());
-  return IE_RESPONSE_PROVIDED;
-}
-
-void CmndIrHvac(void)
-{
-  uint8_t error = IE_SYNTAX_IRHVAC;
-
-  if (XdrvMailbox.data_len) {
-    error = IrRemoteCmndIrHvacJson();
-  }
-  if (error != IE_RESPONSE_PROVIDED) { IrRemoteCmndResponse(error); }
-}
-
-
-
-
-
-uint32_t IrRemoteCmndIrSendJson(void)
-{
-  char parm_uc[12];
-
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
-
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(dataBufUc);
-  if (!json.success()) { return IE_INVALID_JSON; }
-
-
-
-  decode_type_t protocol = decode_type_t::UNKNOWN;
-  uint16_t bits = 0;
-  uint64_t data;
-  uint8_t repeat = 0;
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
-  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
-  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
-  if (decode_type_t::UNKNOWN == protocol) { return IE_UNSUPPORTED_PROTOCOL; }
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS));
-  if (json.containsKey(parm_uc)) { bits = json[parm_uc]; }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT));
-  if (json.containsKey(parm_uc)) { repeat = json[parm_uc]; }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATALSB));
-  if (json.containsKey(parm_uc)) { data = reverseBitsInBytes64(strtoull(json[parm_uc], nullptr, 0)); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA));
-  if (json.containsKey(parm_uc)) { data = strtoull(json[parm_uc], nullptr, 0); }
-  if (0 == bits) { return IE_SYNTAX_IRSEND; }
-
-
-  if (XdrvMailbox.index > repeat + 1) { repeat = XdrvMailbox.index - 1; }
-
-  char dvalue[32];
-  char hvalue[32];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol %d, bits %d, data 0x%s (%s), repeat %d"),
-    protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat);
-
-  irsend_active = true;
-  bool success = irsend->send(protocol, data, bits, repeat);
-
-  if (!success) {
-      irsend_active = false;
-      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
-  }
-  return IE_NO_ERROR;
-}
-
-uint32_t IrRemoteCmndIrSendRaw(void)
-{
-
-
-
-
-
-
-
-  char *p;
-  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-  if (p == nullptr) {
-    return IE_INVALID_RAWDATA;
-  }
-
-
-  uint16_t repeat = XdrvMailbox.index > 0 ? XdrvMailbox.index - 1 : 0;
-
-  uint16_t freq = atoi(str);
-  if (!freq && (*str != '0')) {
-    uint16_t count = 0;
-    char *q = p;
-    for (; *q; count += (*q++ == ','));
-    if (count < 2) {
-      return IE_INVALID_RAWDATA;
-    }
-
-    uint16_t parm[count];
-    for (uint32_t i = 0; i < count; i++) {
-      parm[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      if (!parm[i]) {
-        if (!i) {
-          parm[0] = 38000;
-        } else {
-          return IE_INVALID_RAWDATA;
-        }
-      }
-    }
-
-    uint16_t i = 0;
-    if (count < 4) {
-
-      uint16_t mark = parm[1] *2;
-      if (3 == count) {
-        if (parm[2] < parm[1]) {
-
-          mark = parm[1] * parm[2];
-        } else {
-
-          mark = parm[2];
-        }
-      }
-      uint16_t raw_array[strlen(p)];
-      for (; *p; *p++) {
-        if (*p == '0') {
-          raw_array[i++] = parm[1];
-        }
-        else if (*p == '1') {
-          raw_array[i++] = mark;
-        }
-      }
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, i, parm[0]);
-        if (r < repeat) {
-          irsend->space(40000);
-        }
-      }
-    }
-    else if (6 == count) {
-
-      uint16_t raw_array[strlen(p)*2+3];
-      raw_array[i++] = parm[1];
-      raw_array[i++] = parm[2];
-      uint32_t inter_message_32 = (parm[1] + parm[2]) * 3;
-      uint16_t inter_message = (inter_message_32 > 65000) ? 65000 : inter_message_32;
-      for (; *p; *p++) {
-        if (*p == '0') {
-          raw_array[i++] = parm[3];
-          raw_array[i++] = parm[4];
-        }
-        else if (*p == '1') {
-          raw_array[i++] = parm[3];
-          raw_array[i++] = parm[5];
-        }
-      }
-      raw_array[i++] = parm[3];
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, i, parm[0]);
-        if (r < repeat) {
-          irsend->space(inter_message);
-        }
-      }
-    }
-    else {
-      return IE_INVALID_RAWDATA;
-    }
-  } else {
-    if (!freq) { freq = 38000; }
-    uint16_t count = 0;
-    char *q = p;
-    for (; *q; count += (*q++ == ','));
-    if (0 == count) {
-      return IE_INVALID_RAWDATA;
-    }
-
-
-    count++;
-    if (count < 200) {
-      uint16_t raw_array[count];
-      for (uint32_t i = 0; i < count; i++) {
-        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      }
-
-
-
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, count, freq);
-      }
-    } else {
-      uint16_t *raw_array = reinterpret_cast<uint16_t*>(malloc(count * sizeof(uint16_t)));
-      if (raw_array == nullptr) {
-        return IE_INVALID_RAWDATA;
-      }
-
-      for (uint32_t i = 0; i < count; i++) {
-        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      }
-
-
-
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, count, freq);
-      }
-      free(raw_array);
-    }
-  }
-
-  return IE_NO_ERROR;
-}
-
-void CmndIrSend(void)
-{
-  uint8_t error = IE_SYNTAX_IRSEND;
-
-  if (XdrvMailbox.data_len) {
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      error = IrRemoteCmndIrSendRaw();
-    } else {
-      error = IrRemoteCmndIrSendJson();
-    }
-  }
-  IrRemoteCmndResponse(error);
-}
-
-void IrRemoteCmndResponse(uint32_t error)
-{
-  switch (error) {
-    case IE_INVALID_RAWDATA:
-      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
-      break;
-    case IE_INVALID_JSON:
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      break;
-    case IE_SYNTAX_IRSEND:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
-      break;
-    case IE_SYNTAX_IRHVAC:
-      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR ", " D_JSON_IRHVAC_MODE " " D_JSON_OR " " D_JSON_IRHVAC_FANSPEED "\"}"));
-      break;
-    case IE_UNSUPPORTED_HVAC:
-      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR " (%s)\"}"), listSupportedProtocols(true).c_str());
-      break;
-    case IE_UNSUPPORTED_PROTOCOL:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_PROTOCOL " (%s)\"}"), listSupportedProtocols(false).c_str());
-      break;
-    default:
-      ResponseCmndDone();
-  }
-}
-
-
-
-
-
-bool Xdrv05(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        if (pin[GPIO_IRSEND] < 99) {
-          IrSendInit();
-        }
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveInit();
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveCheck();
-        }
-        irsend_active = false;
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_IRSEND] < 99) {
-          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_06_snfbridge.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_06_snfbridge.ino"
-#ifdef USE_SONOFF_RF
-
-
-
-
-#define XDRV_06 6
-
-const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000;
-
-enum SonoffBridgeCommands {
-  CMND_RFSYNC, CMND_RFLOW, CMND_RFHIGH, CMND_RFHOST, CMND_RFCODE };
-
-const char kSonoffBridgeCommands[] PROGMEM = "|"
-  D_CMND_RFSYNC "|" D_CMND_RFLOW "|" D_CMND_RFHIGH "|" D_CMND_RFHOST "|" D_CMND_RFCODE "|" D_CMND_RFKEY "|" D_CMND_RFRAW;
-
-void (* const SonoffBridgeCommand[])(void) PROGMEM = {
-  &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfKey, &CmndRfRaw };
-
-struct SONOFFBRIDGE {
-  uint32_t last_received_id = 0;
-  uint32_t last_send_code = 0;
-  uint32_t last_time = 0;
-  uint32_t last_learn_time = 0;
-  uint8_t receive_flag = 0;
-  uint8_t receive_raw_flag = 0;
-  uint8_t learn_key = 1;
-  uint8_t learn_active = 0;
-  uint8_t expected_bytes = 0;
-} SnfBridge;
-
-#ifdef USE_RF_FLASH
-
-
-
-
-
-
-
-#include "ihx.h"
-#include "c2.h"
-
-const ssize_t RF_RECORD_NO_START_FOUND = -1;
-const ssize_t RF_RECORD_NO_END_FOUND = -2;
-
-ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size)
-{
-  for (size_t i = 0; i < size; i++) {
-    if (buf[i] == ':') {
-      return i;
-    }
-  }
-  return RF_RECORD_NO_START_FOUND;
-}
-
-ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size)
-{
-  for (size_t i = 0; i < size; i++) {
-    if (buf[i] == '\n') {
-      return i;
-    }
-  }
-  return RF_RECORD_NO_END_FOUND;
-}
-
-ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len)
-{
-  ssize_t record_start;
-  ssize_t record_end;
-  ssize_t glue_record_sz;
-  uint8_t *glue_buf;
-  ssize_t result;
-
-  if (remnant_data[0] != ':') { return -8; }
-
-
-  record_end = rf_find_hex_record_end(new_data, new_data_len);
-  record_start = rf_find_hex_record_start(new_data, new_data_len);
-
-
-
-
-  if ((record_start != RF_RECORD_NO_START_FOUND) && (record_start < record_end)) {
-    return -8;
-  }
-
-  glue_record_sz = strlen((const char *) remnant_data) + record_end;
-
-  glue_buf = (uint8_t *) malloc(glue_record_sz);
-  if (glue_buf == nullptr) { return -2; }
-
-
-  memcpy(glue_buf, remnant_data, strlen((const char *) remnant_data));
-  memcpy(glue_buf + strlen((const char *) remnant_data), new_data, record_end);
-
-  result = rf_decode_and_write(glue_buf, glue_record_sz);
-  free(glue_buf);
-  return result;
-}
-
-ssize_t rf_decode_and_write(uint8_t *record, size_t size)
-{
-  uint8_t err = ihx_decode(record, size);
-  if (err != IHX_SUCCESS) { return -13; }
-
-  ihx_t *h = (ihx_t *) record;
-  if (h->record_type == IHX_RT_DATA) {
-    int retries = 5;
-    uint16_t address = h->address_high * 0x100 + h->address_low;
-
-    do {
-      err = c2_programming_init();
-      err = c2_block_write(address, h->data, h->len);
-    } while (err != C2_SUCCESS && retries--);
-  } else if (h->record_type == IHX_RT_END_OF_FILE) {
-
-    err = c2_reset();
-  }
-
-  if (err != C2_SUCCESS) { return -12; }
-
-  return 0;
-}
-
-ssize_t rf_search_and_write(uint8_t *buf, size_t size)
-{
-
-  ssize_t rec_end;
-  ssize_t rec_start;
-  ssize_t err;
-
-  for (size_t i = 0; i < size; i++) {
-
-    rec_start = rf_find_hex_record_start(buf + i, size - i);
-    if (rec_start == RF_RECORD_NO_START_FOUND) {
-
-      return -8;
-    }
-
-
-    rec_start += i;
-    rec_end = rf_find_hex_record_end(buf + rec_start, size - rec_start);
-    if (rec_end == RF_RECORD_NO_END_FOUND) {
-
-      return rec_start;
-    }
-
-
-    rec_end += rec_start;
-
-    err = rf_decode_and_write(buf + rec_start, rec_end - rec_start);
-    if (err < 0) { return err; }
-    i = rec_end;
-  }
-
-  return 0;
-}
-
-uint8_t rf_erase_flash(void)
-{
-  uint8_t err;
-
-  for (uint32_t i = 0; i < 4; i++) {
-    err = c2_programming_init();
-    if (err != C2_SUCCESS) {
-      return 10;
-    }
-    err = c2_device_erase();
-    if (err != C2_SUCCESS) {
-      if (i < 3) {
-        c2_reset();
-      } else {
-        return 11;
-      }
-    } else {
-      break;
-    }
-  }
-  return 0;
-}
-
-uint8_t SnfBrUpdateInit(void)
-{
-  pinMode(PIN_C2CK, OUTPUT);
-  pinMode(PIN_C2D, INPUT);
-
-  return rf_erase_flash();
-}
-#endif
-
-
-
-void SonoffBridgeReceivedRaw(void)
-{
-
-  uint8_t buckets = 0;
-
-  if (0xB1 == serial_in_buffer[1]) { buckets = serial_in_buffer[2] << 1; }
-
-  ResponseTime_P(PSTR(",\"" D_CMND_RFRAW "\":{\"" D_JSON_DATA "\":\""));
-  for (uint32_t i = 0; i < serial_in_byte_counter; i++) {
-    ResponseAppend_P(PSTR("%02X"), serial_in_buffer[i]);
-    if (0xB1 == serial_in_buffer[1]) {
-      if ((i > 3) && buckets) { buckets--; }
-      if ((i < 3) || (buckets % 2) || (i == serial_in_byte_counter -2)) {
-        ResponseAppend_P(PSTR(" "));
-      }
-    }
-  }
-  ResponseAppend_P(PSTR("\"}}"));
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_CMND_RFRAW));
-
-  XdrvRulesProcess();
-}
-
-
-
-void SonoffBridgeLearnFailed(void)
-{
-  SnfBridge.learn_active = 0;
-  Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARN_FAILED);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
-}
-
-void SonoffBridgeReceived(void)
-{
-  uint16_t sync_time = 0;
-  uint16_t low_time = 0;
-  uint16_t high_time = 0;
-  uint32_t received_id = 0;
-  char rfkey[8];
-  char stemp[16];
-
-  AddLogSerial(LOG_LEVEL_DEBUG);
-
-  if (0xA2 == serial_in_buffer[0]) {
-    SonoffBridgeLearnFailed();
-  }
-  else if (0xA3 == serial_in_buffer[0]) {
-    SnfBridge.learn_active = 0;
-    low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
-    high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
-    if (low_time && high_time) {
-      for (uint32_t i = 0; i < 9; i++) {
-        Settings.rf_code[SnfBridge.learn_key][i] = serial_in_buffer[i +1];
-      }
-      Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARNED);
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
-    } else {
-      SonoffBridgeLearnFailed();
-    }
-  }
-  else if (0xA4 == serial_in_buffer[0]) {
-    if (SnfBridge.learn_active) {
-      SonoffBridgeLearnFailed();
-    } else {
-      sync_time = serial_in_buffer[1] << 8 | serial_in_buffer[2];
-      low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
-      high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
-      received_id = serial_in_buffer[7] << 16 | serial_in_buffer[8] << 8 | serial_in_buffer[9];
-
-      unsigned long now = millis();
-      if (!((received_id == SnfBridge.last_received_id) && (now - SnfBridge.last_time < SFB_TIME_AVOID_DUPLICATE))) {
-        SnfBridge.last_received_id = received_id;
-        SnfBridge.last_time = now;
-        strncpy_P(rfkey, PSTR("\"" D_JSON_NONE "\""), sizeof(rfkey));
-        for (uint32_t i = 1; i <= 16; i++) {
-          if (Settings.rf_code[i][0]) {
-            uint32_t send_id = Settings.rf_code[i][6] << 16 | Settings.rf_code[i][7] << 8 | Settings.rf_code[i][8];
-            if (send_id == received_id) {
-              snprintf_P(rfkey, sizeof(rfkey), PSTR("%d"), i);
-              break;
-            }
-          }
-        }
-        if (Settings.flag.rf_receive_decimal) {
-          snprintf_P(stemp, sizeof(stemp), PSTR("%u"), received_id);
-        } else {
-          snprintf_P(stemp, sizeof(stemp), PSTR("\"%06X\""), received_id);
-        }
-        ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":%s,\"" D_CMND_RFKEY "\":%s}}"),
-          sync_time, low_time, high_time, stemp, rfkey);
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
-        XdrvRulesProcess();
-  #ifdef USE_DOMOTICZ
-        DomoticzSensor(DZ_COUNT, received_id);
-  #endif
-      }
-    }
-  }
-}
-
-bool SonoffBridgeSerialInput(void)
-{
-
-  static int8_t receive_len = 0;
-
-  if (SnfBridge.receive_flag) {
-    if (SnfBridge.receive_raw_flag) {
-      if (!serial_in_byte_counter) {
-        serial_in_buffer[serial_in_byte_counter++] = 0xAA;
-      }
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if (serial_in_byte_counter == 3) {
-        if ((0xA6 == serial_in_buffer[1]) || (0xAB == serial_in_buffer[1])) {
-          receive_len = serial_in_buffer[2] + 4;
-        }
-      }
-      if ((!receive_len && (0x55 == serial_in_byte)) || (receive_len && (serial_in_byte_counter == receive_len))) {
-        SonoffBridgeReceivedRaw();
-        SnfBridge.receive_flag = 0;
-        return 1;
-      }
-    }
-    else if (!((0 == serial_in_byte_counter) && (0 == serial_in_byte))) {
-      if (0 == serial_in_byte_counter) {
-        SnfBridge.expected_bytes = 2;
-        if (serial_in_byte >= 0xA3) {
-          SnfBridge.expected_bytes = 11;
-        }
-        if (serial_in_byte == 0xA6) {
-          SnfBridge.expected_bytes = 0;
-          serial_in_buffer[serial_in_byte_counter++] = 0xAA;
-          SnfBridge.receive_raw_flag = 1;
-        }
-      }
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if ((SnfBridge.expected_bytes == serial_in_byte_counter) && (0x55 == serial_in_byte)) {
-        SonoffBridgeReceived();
-        SnfBridge.receive_flag = 0;
-        return 1;
-      }
-    }
-    serial_in_byte = 0;
-  }
-  if (0xAA == serial_in_byte) {
-    serial_in_byte_counter = 0;
-    serial_in_byte = 0;
-    SnfBridge.receive_flag = 1;
-    receive_len = 0;
-  }
-  return 0;
-}
-
-void SonoffBridgeSendCommand(uint8_t code)
-{
-  Serial.write(0xAA);
-  Serial.write(code);
-  Serial.write(0x55);
-}
-
-void SonoffBridgeSendAck(void)
-{
-  Serial.write(0xAA);
-  Serial.write(0xA0);
-  Serial.write(0x55);
-}
-
-void SonoffBridgeSendCode(uint32_t code)
-{
-  Serial.write(0xAA);
-  Serial.write(0xA5);
-  for (uint32_t i = 0; i < 6; i++) {
-    Serial.write(Settings.rf_code[0][i]);
-  }
-  Serial.write((code >> 16) & 0xff);
-  Serial.write((code >> 8) & 0xff);
-  Serial.write(code & 0xff);
-  Serial.write(0x55);
-  Serial.flush();
-}
-
-void SonoffBridgeSend(uint8_t idx, uint8_t key)
-{
-  uint8_t code;
-
-  key--;
-  Serial.write(0xAA);
-  Serial.write(0xA5);
-  for (uint32_t i = 0; i < 8; i++) {
-    Serial.write(Settings.rf_code[idx][i]);
-  }
-  if (0 == idx) {
-    code = (0x10 << (key >> 2)) | (1 << (key & 3));
-  } else {
-    code = Settings.rf_code[idx][8];
-  }
-  Serial.write(code);
-  Serial.write(0x55);
-  Serial.flush();
-#ifdef USE_DOMOTICZ
-
-
-#endif
-}
-
-void SonoffBridgeLearn(uint8_t key)
-{
-  SnfBridge.learn_key = key;
-  SnfBridge.learn_active = 1;
-  SnfBridge.last_learn_time = millis();
-  Serial.write(0xAA);
-  Serial.write(0xA1);
-  Serial.write(0x55);
-}
-
-
-
-
-
-void CmndRfBridge(void)
-{
-  char *p;
-  char stemp [10];
-  uint32_t code = 0;
-  uint8_t radix = 10;
-
-  uint32_t set_index = XdrvMailbox.command_code *2;
-
-  if (XdrvMailbox.data[0] == '#') {
-    XdrvMailbox.data++;
-    XdrvMailbox.data_len--;
-    radix = 16;
-  }
-
-  if (XdrvMailbox.data_len) {
-    code = strtol(XdrvMailbox.data, &p, radix);
-    if (code) {
-      if (CMND_RFCODE == XdrvMailbox.command_code) {
-        SnfBridge.last_send_code = code;
-        SonoffBridgeSendCode(code);
-      } else {
-        if (1 == XdrvMailbox.payload) {
-          code = pgm_read_byte(kDefaultRfCode + set_index) << 8 | pgm_read_byte(kDefaultRfCode + set_index +1);
-        }
-        uint8_t msb = code >> 8;
-        uint8_t lsb = code & 0xFF;
-        if ((code > 0) && (code < 0x7FFF) && (msb != 0x55) && (lsb != 0x55)) {
-          Settings.rf_code[0][set_index] = msb;
-          Settings.rf_code[0][set_index +1] = lsb;
-        }
-      }
-    }
-  }
-  if (CMND_RFCODE == XdrvMailbox.command_code) {
-    code = SnfBridge.last_send_code;
-  } else {
-    code = Settings.rf_code[0][set_index] << 8 | Settings.rf_code[0][set_index +1];
-  }
-  if (10 == radix) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), code);
-  } else {
-    snprintf_P(stemp, sizeof(stemp), PSTR("\"#%06X\""), code);
-  }
-  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp);
-}
-
-void CmndRfKey(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 16)) {
-    unsigned long now = millis();
-    if ((!SnfBridge.learn_active) || (now - SnfBridge.last_learn_time > 60100)) {
-      SnfBridge.learn_active = 0;
-      if (2 == XdrvMailbox.payload) {
-        SonoffBridgeLearn(XdrvMailbox.index);
-        ResponseCmndIdxChar(D_JSON_START_LEARNING);
-      }
-      else if (3 == XdrvMailbox.payload) {
-        Settings.rf_code[XdrvMailbox.index][0] = 0;
-        ResponseCmndIdxChar(D_JSON_SET_TO_DEFAULT);
-      }
-      else if (4 == XdrvMailbox.payload) {
-        for (uint32_t i = 0; i < 6; i++) {
-          Settings.rf_code[XdrvMailbox.index][i] = Settings.rf_code[0][i];
-        }
-        Settings.rf_code[XdrvMailbox.index][6] = (SnfBridge.last_send_code >> 16) & 0xff;
-        Settings.rf_code[XdrvMailbox.index][7] = (SnfBridge.last_send_code >> 8) & 0xff;
-        Settings.rf_code[XdrvMailbox.index][8] = SnfBridge.last_send_code & 0xff;
-        ResponseCmndIdxChar(D_JSON_SAVED);
-      } else if (5 == XdrvMailbox.payload) {
-        uint8_t key = XdrvMailbox.index;
-        uint8_t index = (0 == Settings.rf_code[key][0]) ? 0 : key;
-        uint16_t sync_time = (Settings.rf_code[index][0] << 8) | Settings.rf_code[index][1];
-        uint16_t low_time = (Settings.rf_code[index][2] << 8) | Settings.rf_code[index][3];
-        uint16_t high_time = (Settings.rf_code[index][4] << 8) | Settings.rf_code[index][5];
-        uint32_t code = (Settings.rf_code[index][6] << 16) | (Settings.rf_code[index][7] << 8);
-        if (0 == index) {
-          key--;
-          code |= (uint8_t)((0x10 << (key >> 2)) | (1 << (key & 3)));
-        } else {
-          code |= Settings.rf_code[index][8];
-        }
-        Response_P(PSTR("{\"%s%d\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":\"%06X\"}}"),
-                   XdrvMailbox.command, XdrvMailbox.index, sync_time, low_time, high_time, code);
-      } else {
-        if ((1 == XdrvMailbox.payload) || (0 == Settings.rf_code[XdrvMailbox.index][0])) {
-          SonoffBridgeSend(0, XdrvMailbox.index);
-          ResponseCmndIdxChar(D_JSON_DEFAULT_SENT);
-        } else {
-          SonoffBridgeSend(XdrvMailbox.index, 0);
-          ResponseCmndIdxChar(D_JSON_LEARNED_SENT);
-        }
-      }
-    } else {
-      Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, SnfBridge.learn_key, D_JSON_LEARNING_ACTIVE);
-    }
-  }
-}
-
-void CmndRfRaw(void)
-{
-  if (XdrvMailbox.data_len) {
-    if (XdrvMailbox.data_len < 6) {
-      switch (XdrvMailbox.payload) {
-      case 0:
-        SonoffBridgeSendCommand(0xA7);
-      case 1:
-        SnfBridge.receive_raw_flag = XdrvMailbox.payload;
-        break;
-      case 166:
-      case 167:
-      case 169:
-      case 176:
-      case 177:
-      case 255:
-        SonoffBridgeSendCommand(XdrvMailbox.payload);
-        SnfBridge.receive_raw_flag = 1;
-        break;
-      case 192:
-        char beep[] = "AAC000C055\0";
-        SerialSendRaw(beep);
-        break;
-      }
-    } else {
-      SerialSendRaw(RemoveSpace(XdrvMailbox.data));
-      SnfBridge.receive_raw_flag = 1;
-    }
-  }
-  ResponseCmndStateText(SnfBridge.receive_raw_flag);
-}
-
-
-
-
-
-bool Xdrv06(uint8_t function)
-{
-  bool result = false;
-
-  if (SONOFF_BRIDGE == my_module_type) {
-    switch (function) {
-      case FUNC_SERIAL:
-        result = SonoffBridgeSerialInput();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSonoffBridgeCommands, SonoffBridgeCommand);
-        break;
-      case FUNC_INIT:
-        SnfBridge.receive_raw_flag = 0;
-        SonoffBridgeSendCommand(0xA7);
-        break;
-      case FUNC_PRE_INIT:
-        SetSerial(19200, TS_SERIAL_8N1);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
-#ifdef USE_DOMOTICZ
-
-#define XDRV_07 7
-
-#define D_PRFX_DOMOTICZ "Domoticz"
-#define D_CMND_IDX "Idx"
-#define D_CMND_KEYIDX "KeyIdx"
-#define D_CMND_SWITCHIDX "SwitchIdx"
-#define D_CMND_SENSORIDX "SensorIdx"
-#define D_CMND_UPDATETIMER "UpdateTimer"
-
-const char kDomoticzCommands[] PROGMEM = D_PRFX_DOMOTICZ "|"
-  D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
-
-void (* const DomoticzCommand[])(void) PROGMEM = {
-  &CmndDomoticzIdx, &CmndDomoticzKeyIdx, &CmndDomoticzSwitchIdx, &CmndDomoticzSensorIdx, &CmndDomoticzUpdateTimer };
-
-const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}";
-
-#if MAX_DOMOTICZ_SNS_IDX < DZ_MAX_SENSORS
-  #error "Domoticz: Too many sensors or change settings.h layout"
-#endif
-
-const char kDomoticzSensors[] PROGMEM =
-  D_DOMOTICZ_TEMP "|" D_DOMOTICZ_TEMP_HUM "|" D_DOMOTICZ_TEMP_HUM_BARO "|" D_DOMOTICZ_POWER_ENERGY "|" D_DOMOTICZ_ILLUMINANCE "|"
-  D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY "|" D_DOMOTICZ_P1_SMART_METER "|" D_DOMOTICZ_SHUTTER ;
-
-char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC;
-
-int domoticz_update_timer = 0;
-uint32_t domoticz_fan_debounce = 0;
-bool domoticz_subscribe = false;
-bool domoticz_update_flag = true;
-
-#ifdef USE_SHUTTER
-bool domoticz_is_shutter = false;
-#endif
-
-int DomoticzBatteryQuality(void)
-{
-
-
-
-
-  int quality = 100;
-
-#ifdef USE_ADC_VCC
-  uint16_t voltage = ESP.getVcc();
-  if (voltage <= 2600) {
-    quality = 0;
-  } else if (voltage >= 4600) {
-    quality = 200;
-  } else {
-    quality = (voltage - 2600) / 10;
-  }
-#endif
-  return quality;
-}
-
-int DomoticzRssiQuality(void)
-{
-
-
-  return WifiGetRssiAsQuality(WiFi.RSSI()) / 10;
-}
-
-#ifdef USE_SONOFF_IFAN
-void MqttPublishDomoticzFanState(void)
-{
-  if (Settings.flag.mqtt_enabled && Settings.domoticz_relay_idx[1]) {
-    char svalue[8];
-
-    int fan_speed = GetFanspeed();
-    snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fan_speed * 10);
-    Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[1], (0 == fan_speed) ? 0 : 2, svalue, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    MqttPublish(domoticz_in_topic);
-
-    domoticz_fan_debounce = millis();
-  }
-}
-
-void DomoticzUpdateFanState(void)
-{
-  if (domoticz_update_flag) {
-    MqttPublishDomoticzFanState();
-  }
-  domoticz_update_flag = true;
-}
-#endif
-
-void MqttPublishDomoticzPowerState(uint8_t device)
-{
-  if (Settings.flag.mqtt_enabled) {
-    if ((device < 1) || (device > devices_present)) { device = 1; }
-    if (Settings.domoticz_relay_idx[device -1]) {
-#ifdef USE_SHUTTER
-      if (domoticz_is_shutter) {
-
-      } else {
-#endif
-#ifdef USE_SONOFF_IFAN
-      if (IsModuleIfan() && (device > 1)) {
-
-      } else {
-#endif
-        char svalue[8];
-
-        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), Settings.light_dimmer);
-        Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? svalue : "", DomoticzBatteryQuality(), DomoticzRssiQuality());
-        MqttPublish(domoticz_in_topic);
-#ifdef USE_SONOFF_IFAN
-      }
-#endif
-#ifdef USE_SHUTTER
-      }
-#endif
-    }
-  }
-}
-
-void DomoticzUpdatePowerState(uint8_t device)
-{
-  if (domoticz_update_flag) {
-    MqttPublishDomoticzPowerState(device);
-  }
-  domoticz_update_flag = true;
-}
-
-void DomoticzMqttUpdate(void)
-{
-  if (domoticz_subscribe && (Settings.domoticz_update_timer || domoticz_update_timer)) {
-    domoticz_update_timer--;
-    if (domoticz_update_timer <= 0) {
-      domoticz_update_timer = Settings.domoticz_update_timer;
-      for (uint32_t i = 1; i <= devices_present; i++) {
-#ifdef USE_SHUTTER
-        if (domoticz_is_shutter)
-        {
-
-            break;
-        }
-#endif
-#ifdef USE_SONOFF_IFAN
-        if (IsModuleIfan() && (i > 1)) {
-          MqttPublishDomoticzFanState();
-          break;
-        } else {
-#endif
-          MqttPublishDomoticzPowerState(i);
-#ifdef USE_SONOFF_IFAN
-        }
-#endif
-      }
-    }
-  }
-}
-
-void DomoticzMqttSubscribe(void)
-{
-  uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
-  for (uint32_t i = 0; i < maxdev; i++) {
-    if (Settings.domoticz_relay_idx[i]) {
-      domoticz_subscribe = true;
-    }
-  }
-
-  if (domoticz_subscribe) {
-    char stopic[TOPSZ];
-    snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#"));
-    MqttSubscribe(stopic);
-  }
-}
-# 219 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
-bool DomoticzMqttData(void)
-{
-  domoticz_update_flag = true;
-
-  if (strncasecmp_P(XdrvMailbox.topic, PSTR(DOMOTICZ_OUT_TOPIC), strlen(DOMOTICZ_OUT_TOPIC)) != 0) {
-    return false;
-  }
-
-
-  if (XdrvMailbox.data_len < 20) {
-    return true;
-  }
-  StaticJsonBuffer<400> jsonBuf;
-  JsonObject& domoticz = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!domoticz.success()) {
-    return true;
-  }
-
-
-
-  uint32_t idx = domoticz["idx"];
-  int16_t nvalue = -1;
-  if (domoticz.containsKey("nvalue")) {
-    nvalue = domoticz["nvalue"];
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ "idx %d, nvalue %d"), idx, nvalue);
-
-  bool found = false;
-  if ((idx > 0) && (nvalue >= 0) && (nvalue <= 15)) {
-    uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
-    for (uint32_t i = 0; i < maxdev; i++) {
-      if (idx == Settings.domoticz_relay_idx[i]) {
-        bool iscolordimmer = strcmp_P(domoticz["dtype"],PSTR("Color Switch")) == 0;
-        bool isShutter = strcmp_P(domoticz["dtype"],PSTR("Light/Switch")) == 0 & strncmp_P(domoticz["switchType"],PSTR("Blinds"), 6) == 0;
-
-        char stemp1[10];
-        snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), i +1);
-#ifdef USE_SONOFF_IFAN
-        if (IsModuleIfan() && (1 == i)) {
-          uint8_t svalue = 0;
-          if (domoticz.containsKey("svalue1")) {
-            svalue = domoticz["svalue1"];
-          } else {
-            return true;
-          }
-          svalue = (nvalue == 2) ? svalue / 10 : 0;
-          if (GetFanspeed() == svalue) {
-            return true;
-          }
-          if (TimePassedSince(domoticz_fan_debounce) < 1000) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_FANSPEED));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), svalue);
-          found = true;
-        } else
-#endif
-#ifdef USE_SHUTTER
-        if (isShutter)
-        {
-          if (domoticz.containsKey("nvalue")) {
-            nvalue = domoticz["nvalue"];
-          }
-
-          uint8_t position = 0;
-          if (domoticz.containsKey("svalue1")) {
-            position = domoticz["svalue1"];
-          }
-          if (nvalue != 2) {
-            position = nvalue == 0 ? 0 : 100;
-          }
-
-          snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), position);
-          XdrvMailbox.data_len = position > 99 ? 3 : (position > 9 ? 2 : 1);
-
-          found = true;
-        } else
-#endif
-        if (iscolordimmer && 10 == nvalue) {
-
-          JsonObject& color = domoticz["Color"];
-          uint16_t level = nvalue = domoticz["svalue1"];
-          uint16_t r = color["r"]; r = r * level / 100;
-          uint16_t g = color["g"]; g = g * level / 100;
-          uint16_t b = color["b"]; b = b * level / 100;
-          uint16_t cw = color["cw"]; cw = cw * level / 100;
-          uint16_t ww = color["ww"]; ww = ww * level / 100;
-          uint16_t m = 0;
-          uint16_t t = 0;
-          if (color.containsKey("m")) {
-            m = color["m"];
-            t = color["t"];
-          }
-          if (2 == m) {
-            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_BACKLOG));
-            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR(D_CMND_COLORTEMPERATURE " %d;" D_CMND_DIMMER " %d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX), level);
-          } else {
-            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
-            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
-          }
-          found = true;
-        }
-        else if ((!iscolordimmer && 2 == nvalue) ||
-                  (iscolordimmer && 15 == nvalue)) {
-          if (domoticz.containsKey("svalue1")) {
-            nvalue = domoticz["svalue1"];
-          } else {
-            return true;
-          }
-          if (light_type && (Settings.light_dimmer == nvalue) && ((power >> i) &1)) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
-          found = true;
-        }
-        else if (1 == nvalue || 0 == nvalue) {
-          if (((power >> i) &1) == (power_t)nvalue) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_POWER "%s"), (devices_present > 1) ? stemp1 : "");
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
-          found = true;
-        }
-        break;
-      }
-    }
-  }
-  if (!found) { return true; }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ D_RECEIVED_TOPIC " %s, " D_DATA " %s"), XdrvMailbox.topic, XdrvMailbox.data);
-
-  domoticz_update_flag = false;
-  return false;
-}
-
-
-
-bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg)
-{
-  bool result = false;
-
-  if (device <= MAX_DOMOTICZ_IDX) {
-    if ((Settings.domoticz_key_idx[device -1] || Settings.domoticz_switch_idx[device -1]) && (svalflg)) {
-      Response_P(PSTR("{\"command\":\"switchlight\",\"idx\":%d,\"switchcmd\":\"%s\"}"),
-        (key) ? Settings.domoticz_switch_idx[device -1] : Settings.domoticz_key_idx[device -1], (state) ? (POWER_TOGGLE == state) ? "Toggle" : "On" : "Off");
-      MqttPublish(domoticz_in_topic);
-      result = true;
-    }
-  }
-  return result;
-}
-# 391 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_07_domoticz.ino"
-uint8_t DomoticzHumidityState(char *hum)
-{
-  uint8_t h = atoi(hum);
-  return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
-}
-
-void DomoticzSensor(uint8_t idx, char *data)
-{
-  if (Settings.domoticz_sensor_idx[idx]) {
-    char dmess[128];
-
-    memcpy(dmess, mqtt_data, sizeof(dmess));
-    if (DZ_AIRQUALITY == idx) {
-      Response_P(PSTR("{\"idx\":%d,\"nvalue\":%s,\"Battery\":%d,\"RSSI\":%d}"),
-        Settings.domoticz_sensor_idx[idx], data, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    } else {
-      uint8_t nvalue = 0;
-#ifdef USE_SHUTTER
-      if (DZ_SHUTTER == idx) {
-        uint8_t position = atoi(data);
-        nvalue = position < 2 ? 0 : (position == 100 ? 1 : 2);
-      }
-#endif
-      Response_P(DOMOTICZ_MESSAGE,
-        Settings.domoticz_sensor_idx[idx], nvalue, data, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    }
-    MqttPublish(domoticz_in_topic);
-    memcpy(mqtt_data, dmess, sizeof(dmess));
-  }
-}
-
-void DomoticzSensor(uint8_t idx, uint32_t value)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%d"), value);
-  DomoticzSensor(idx, data);
-}
-
-void DomoticzTempHumSensor(char *temp, char *hum)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d"), temp, hum, DomoticzHumidityState(hum));
-  DomoticzSensor(DZ_TEMP_HUM, data);
-}
-
-void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro)
-{
-  char data[32];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d;%s;5"), temp, hum, DomoticzHumidityState(hum), baro);
-  DomoticzSensor(DZ_TEMP_HUM_BARO, data);
-}
-
-void DomoticzSensorPowerEnergy(int power, char *energy)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%d;%s"), power, energy);
-  DomoticzSensor(DZ_POWER_ENERGY, data);
-}
-
-void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power)
-{
-
-
-
-
-
-  int consumed = power;
-  int produced = 0;
-  if (power < 0) {
-    consumed = 0;
-    produced = -power;
-  }
-  char data[64];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%s;%s;%d;%d"), usage1, usage2, return1, return2, consumed, produced);
-  DomoticzSensor(DZ_P1_SMART_METER, data);
-}
-
-
-
-
-
-void CmndDomoticzIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzKeyIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_key_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzSwitchIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzSensorIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzUpdateTimer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.domoticz_update_timer = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.domoticz_update_timer);
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_DOMOTICZ "dm"
-
-const char S_CONFIGURE_DOMOTICZ[] PROGMEM = D_CONFIGURE_DOMOTICZ;
-
-const char HTTP_BTN_MENU_DOMOTICZ[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_DOMOTICZ "' method='get'><button>" D_CONFIGURE_DOMOTICZ "</button></form></p>";
-
-const char HTTP_FORM_DOMOTICZ[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_DOMOTICZ_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>"
-  "<table>";
-const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' placeholder='0' value='%d'></td></tr>"
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'></td></tr>";
-
-void HandleDomoticzConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_DOMOTICZ);
-
-  if (WebServer->hasArg("save")) {
-    DomoticzSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[40];
-
-  WSContentStart_P(S_CONFIGURE_DOMOTICZ);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_DOMOTICZ);
-  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
-    if (i < devices_present) {
-      WSContentSend_P(HTTP_FORM_DOMOTICZ_RELAY,
-        i +1, i, Settings.domoticz_relay_idx[i],
-        i +1, i, Settings.domoticz_key_idx[i]);
-    }
-    if (pin[GPIO_SWT1 +i] < 99) {
-      WSContentSend_P(HTTP_FORM_DOMOTICZ_SWITCH,
-        i +1, i, Settings.domoticz_switch_idx[i]);
-    }
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan() && (1 == i)) { break; }
-#endif
-  }
-  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
-    WSContentSend_P(HTTP_FORM_DOMOTICZ_SENSOR,
-      i +1, GetTextIndexed(stemp, sizeof(stemp), i, kDomoticzSensors), i, Settings.domoticz_sensor_idx[i]);
-  }
-  WSContentSend_P(HTTP_FORM_DOMOTICZ_TIMER, Settings.domoticz_update_timer);
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void DomoticzSaveSettings(void)
-{
-  char stemp[20];
-  char ssensor_indices[6 * MAX_DOMOTICZ_SNS_IDX];
-  char tmp[100];
-
-  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("r%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_relay_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(stemp, sizeof(stemp), PSTR("k%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_key_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(stemp, sizeof(stemp), PSTR("s%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_switch_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-  }
-  ssensor_indices[0] = '\0';
-  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("l%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_sensor_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(ssensor_indices, sizeof(ssensor_indices), PSTR("%s%s%d"), ssensor_indices, (strlen(ssensor_indices)) ? "," : "", Settings.domoticz_sensor_idx[i]);
-  }
-  WebGetArg("ut", tmp, sizeof(tmp));
-  Settings.domoticz_update_timer = (!strlen(tmp)) ? DOMOTICZ_UPDATE_TIMER : atoi(tmp);
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_DOMOTICZ D_CMND_IDX " %d,%d,%d,%d, " D_CMND_KEYIDX " %d,%d,%d,%d, " D_CMND_SWITCHIDX " %d,%d,%d,%d, " D_CMND_SENSORIDX " %s, " D_CMND_UPDATETIMER " %d"),
-    Settings.domoticz_relay_idx[0], Settings.domoticz_relay_idx[1], Settings.domoticz_relay_idx[2], Settings.domoticz_relay_idx[3],
-    Settings.domoticz_key_idx[0], Settings.domoticz_key_idx[1], Settings.domoticz_key_idx[2], Settings.domoticz_key_idx[3],
-    Settings.domoticz_switch_idx[0], Settings.domoticz_switch_idx[1], Settings.domoticz_switch_idx[2], Settings.domoticz_switch_idx[3],
-    ssensor_indices, Settings.domoticz_update_timer);
-}
-#endif
-
-
-
-
-
-bool Xdrv07(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DomoticzMqttUpdate();
-        break;
-      case FUNC_MQTT_DATA:
-        result = DomoticzMqttData();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_DOMOTICZ);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_DOMOTICZ, HandleDomoticzConfiguration);
-        break;
-#endif
-      case FUNC_MQTT_SUBSCRIBE:
-        DomoticzMqttSubscribe();
-#ifdef USE_SHUTTER
-        if (Settings.domoticz_sensor_idx[DZ_SHUTTER]) { domoticz_is_shutter = true; }
-#endif
-        break;
-      case FUNC_MQTT_INIT:
-        domoticz_update_timer = 2;
-        break;
-      case FUNC_SHOW_SENSOR:
-
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kDomoticzCommands, DomoticzCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
-#ifdef USE_SERIAL_BRIDGE
-
-
-
-
-#define XDRV_08 8
-
-const uint8_t SERIAL_BRIDGE_BUFFER_SIZE = 130;
-
-const char kSerialBridgeCommands[] PROGMEM = "|"
-  D_CMND_SSERIALSEND "|" D_CMND_SBAUDRATE;
-
-void (* const SerialBridgeCommand[])(void) PROGMEM = {
-  &CmndSSerialSend, &CmndSBaudrate };
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *SerialBridgeSerial = nullptr;
-
-unsigned long serial_bridge_polling_window = 0;
-char *serial_bridge_buffer = nullptr;
-int serial_bridge_in_byte_counter = 0;
-bool serial_bridge_active = true;
-bool serial_bridge_raw = false;
-
-void SerialBridgeInput(void)
-{
-  while (SerialBridgeSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = SerialBridgeSerial->read();
-
-    if ((serial_in_byte > 127) && !serial_bridge_raw) {
-      serial_bridge_in_byte_counter = 0;
-      SerialBridgeSerial->flush();
-      return;
-    }
-    if (serial_in_byte || serial_bridge_raw) {
-
-      if ((serial_bridge_in_byte_counter < SERIAL_BRIDGE_BUFFER_SIZE -1) &&
-          ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
-          ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
-            serial_bridge_raw)) {
-        serial_bridge_buffer[serial_bridge_in_byte_counter++] = serial_in_byte;
-        serial_bridge_polling_window = millis();
-      } else {
-        serial_bridge_polling_window = 0;
-        break;
-      }
-    }
-  }
-
-  if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
-    serial_bridge_buffer[serial_bridge_in_byte_counter] = 0;
-    char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
-    bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
-    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
-      (assume_json) ? "" : """",
-      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
-      (assume_json) ? "" : """");
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
-    XdrvRulesProcess();
-    serial_bridge_in_byte_counter = 0;
-  }
-}
-
-
-
-void SerialBridgeInit(void)
-{
-  serial_bridge_active = false;
-  if ((pin[GPIO_SBR_RX] < 99) && (pin[GPIO_SBR_TX] < 99)) {
-    SerialBridgeSerial = new TasmotaSerial(pin[GPIO_SBR_RX], pin[GPIO_SBR_TX]);
-    if (SerialBridgeSerial->begin(Settings.sbaudrate * 300)) {
-      if (SerialBridgeSerial->hardwareSerial()) {
-        ClaimSerial();
-        serial_bridge_buffer = serial_in_buffer;
-      } else {
-        serial_bridge_buffer = (char*)(malloc(SERIAL_BRIDGE_BUFFER_SIZE));
-      }
-      serial_bridge_active = true;
-      SerialBridgeSerial->flush();
-    }
-  }
-}
-
-
-
-
-
-void CmndSSerialSend(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
-    serial_bridge_raw = (XdrvMailbox.index > 3);
-    if (XdrvMailbox.data_len > 0) {
-      if (1 == XdrvMailbox.index) {
-        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
-        SerialBridgeSerial->write("\n");
-      }
-      else if ((2 == XdrvMailbox.index) || (4 == XdrvMailbox.index)) {
-        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
-      }
-      else if (3 == XdrvMailbox.index) {
-        SerialBridgeSerial->write(Unescape(XdrvMailbox.data, &XdrvMailbox.data_len), XdrvMailbox.data_len);
-      }
-      else if (5 == XdrvMailbox.index) {
-        char *p;
-        char stemp[3];
-        uint8_t code;
-
-        char *codes = RemoveSpace(XdrvMailbox.data);
-        int size = strlen(XdrvMailbox.data);
-
-        while (size > 1) {
-          strlcpy(stemp, codes, sizeof(stemp));
-          code = strtol(stemp, &p, 16);
-          SerialBridgeSerial->write(code);
-          size -= 2;
-          codes += 2;
-        }
-      }
-      ResponseCmndDone();
-    }
-  }
-}
-
-void CmndSBaudrate(void)
-{
-  if (XdrvMailbox.payload >= 300) {
-    XdrvMailbox.payload /= 300;
-    Settings.sbaudrate = XdrvMailbox.payload;
-    SerialBridgeSerial->begin(Settings.sbaudrate * 300);
-  }
-  ResponseCmndNumber(Settings.sbaudrate * 300);
-}
-
-
-
-
-
-bool Xdrv08(uint8_t function)
-{
-  bool result = false;
-
-  if (serial_bridge_active) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (SerialBridgeSerial) { SerialBridgeInput(); }
-        break;
-      case FUNC_PRE_INIT:
-        SerialBridgeInit();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSerialBridgeCommands, SerialBridgeCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
-#ifdef USE_TIMERS
-# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
-#define XDRV_09 9
-
-const char kTimerCommands[] PROGMEM = "|"
-  D_CMND_TIMER "|" D_CMND_TIMERS
-#ifdef USE_SUNRISE
-  "|" D_CMND_LATITUDE "|" D_CMND_LONGITUDE
-#endif
-  ;
-
-void (* const TimerCommand[])(void) PROGMEM = {
-  &CmndTimer, &CmndTimers
-#ifdef USE_SUNRISE
-  , &CmndLatitude, &CmndLongitude
-#endif
-  };
-
-uint16_t timer_last_minute = 60;
-int8_t timer_window[MAX_TIMERS] = { 0 };
-
-#ifdef USE_SUNRISE
-# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_09_timers.ino"
-const float pi2 = TWO_PI;
-const float pi = PI;
-const float RAD = DEG_TO_RAD;
-
-float JulianischesDatum(void)
-{
-
-  int Gregor;
-  int Jahr = RtcTime.year;
-  int Monat = RtcTime.month;
-  int Tag = RtcTime.day_of_month;
-
-  if (Monat <= 2) {
-    Monat += 12;
-    Jahr -= 1;
-  }
-  Gregor = (Jahr / 400) - (Jahr / 100) + (Jahr / 4);
-  return 2400000.5f + 365.0f*Jahr - 679004.0f + Gregor + (int)(30.6001f * (Monat +1)) + Tag + 0.5f;
-}
-
-float InPi(float x)
-{
-  int n = (int)(x / pi2);
-  x = x - n*pi2;
-  if (x < 0) x += pi2;
-  return x;
-}
-
-float eps(float T)
-{
-
-  return RAD * (23.43929111f + (-46.8150f*T - 0.00059f*T*T + 0.001813f*T*T*T)/3600.0f);
-}
-
-float BerechneZeitgleichung(float *DK,float T)
-{
-  float RA_Mittel = 18.71506921f + 2400.0513369f*T +(2.5862e-5f - 1.72e-9f*T)*T*T;
-  float M = InPi(pi2 * (0.993133f + 99.997361f*T));
-  float L = InPi(pi2 * (0.7859453f + M/pi2 + (6893.0f*sinf(M)+72.0f*sinf(2.0f*M)+6191.2f*T) / 1296.0e3f));
-  float e = eps(T);
-  float RA = atanf(tanf(L)*cosf(e));
-  if (RA < 0.0) RA += pi;
-  if (L > pi) RA += pi;
-  RA = 24.0*RA/pi2;
-  *DK = asinf(sinf(e)*sinf(L));
-
-  RA_Mittel = 24.0f * InPi(pi2*RA_Mittel/24.0f)/pi2;
-  float dRA = RA_Mittel - RA;
-  if (dRA < -12.0f) dRA += 24.0f;
-  if (dRA > 12.0f) dRA -= 24.0f;
-  dRA = dRA * 1.0027379f;
-  return dRA;
-}
-
-void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down)
-{
-  float JD2000 = 2451545.0f;
-  float JD = JulianischesDatum();
-  float T = (JD - JD2000) / 36525.0f;
-  float DK;
-
-
-
-
-
-
-
-  float h = SUNRISE_DAWN_ANGLE *RAD;
-  float B = (((float)Settings.latitude)/1000000) * RAD;
-  float GeographischeLaenge = ((float)Settings.longitude)/1000000;
-
-
-
-  float Zeitzone = ((float)Rtc.time_timezone) / 60;
-  float Zeitgleichung = BerechneZeitgleichung(&DK, T);
-  float Zeitdifferenz = 12.0f*acosf((sinf(h) - sinf(B)*sinf(DK)) / (cosf(B)*cosf(DK)))/pi;
-  float AufgangOrtszeit = 12.0f - Zeitdifferenz - Zeitgleichung;
-  float UntergangOrtszeit = 12.0f + Zeitdifferenz - Zeitgleichung;
-  float AufgangWeltzeit = AufgangOrtszeit - GeographischeLaenge / 15.0f;
-  float UntergangWeltzeit = UntergangOrtszeit - GeographischeLaenge / 15.0f;
-  float Aufgang = AufgangWeltzeit + Zeitzone;
-  if (Aufgang < 0.0f) {
-    Aufgang += 24.0f;
-  } else {
-    if (Aufgang >= 24.0f) Aufgang -= 24.0f;
-  }
-  float Untergang = UntergangWeltzeit + Zeitzone;
-  if (Untergang < 0.0f) {
-    Untergang += 24.0f;
-  } else {
-    if (Untergang >= 24.0f) Untergang -= 24.0f;
-  }
-  int AufgangMinuten = (int)(60.0f*(Aufgang - (int)Aufgang)+0.5f);
-  int AufgangStunden = (int)Aufgang;
-  if (AufgangMinuten >= 60.0f) {
-    AufgangMinuten -= 60.0f;
-    AufgangStunden++;
-  } else {
-    if (AufgangMinuten < 0.0f) {
-      AufgangMinuten += 60.0f;
-      AufgangStunden--;
-      if (AufgangStunden < 0.0f) AufgangStunden += 24.0f;
-    }
-  }
-  int UntergangMinuten = (int)(60.0f*(Untergang - (int)Untergang)+0.5f);
-  int UntergangStunden = (int)Untergang;
-  if (UntergangMinuten >= 60.0f) {
-    UntergangMinuten -= 60.0f;
-    UntergangStunden++;
-  } else {
-    if (UntergangMinuten<0) {
-      UntergangMinuten += 60.0f;
-      UntergangStunden--;
-      if (UntergangStunden < 0.0f) UntergangStunden += 24.0f;
-    }
-  }
-  *hour_up = AufgangStunden;
-  *minute_up = AufgangMinuten;
-  *hour_down = UntergangStunden;
-  *minute_down = UntergangMinuten;
-}
-
-void ApplyTimerOffsets(Timer *duskdawn)
-{
-  uint8_t hour[2];
-  uint8_t minute[2];
-  Timer stored = (Timer)*duskdawn;
-
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  uint8_t mode = (duskdawn->mode -1) &1;
-  duskdawn->time = (hour[mode] *60) + minute[mode];
-
-
-  uint16_t timeBuffer;
-  if ((uint16_t)stored.time > 719) {
-
-    timeBuffer = (uint16_t)stored.time - 720;
-
-    if (timeBuffer > (uint16_t)duskdawn->time) {
-      timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time);
-      duskdawn->days = duskdawn->days >> 1;
-      duskdawn->days |= (stored.days << 6);
-    } else {
-      timeBuffer = (uint16_t)duskdawn->time - timeBuffer;
-    }
-  } else {
-
-    timeBuffer = (uint16_t)duskdawn->time + (uint16_t)stored.time;
-
-    if (timeBuffer > 1440) {
-      timeBuffer -= 1440;
-      duskdawn->days = duskdawn->days << 1;
-      duskdawn->days |= (stored.days >> 6);
-    }
-  }
-  duskdawn->time = timeBuffer;
-}
-
-String GetSun(uint32_t dawn)
-{
-  char stime[6];
-
-  uint8_t hour[2];
-  uint8_t minute[2];
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  dawn &= 1;
-  snprintf_P(stime, sizeof(stime), PSTR("%02d:%02d"), hour[dawn], minute[dawn]);
-  return String(stime);
-}
-
-uint16_t SunMinutes(uint32_t dawn)
-{
-  uint8_t hour[2];
-  uint8_t minute[2];
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  dawn &= 1;
-  return (hour[dawn] *60) + minute[dawn];
-}
-
-#endif
-
-
-
-void TimerSetRandomWindow(uint32_t index)
-{
-  timer_window[index] = 0;
-  if (Settings.timer[index].window) {
-    timer_window[index] = (random(0, (Settings.timer[index].window << 1) +1)) - Settings.timer[index].window;
-  }
-}
-
-void TimerSetRandomWindows(void)
-{
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) { TimerSetRandomWindow(i); }
-}
-
-void TimerEverySecond(void)
-{
-  if (RtcTime.valid) {
-    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); }
-    if (Settings.flag3.timers_enable &&
-        (uptime > 60) && (RtcTime.minute != timer_last_minute)) {
-      timer_last_minute = RtcTime.minute;
-      int32_t time = (RtcTime.hour *60) + RtcTime.minute;
-      uint8_t days = 1 << (RtcTime.day_of_week -1);
-
-      for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-
-        Timer xtimer = Settings.timer[i];
-#ifdef USE_SUNRISE
-        if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
-          ApplyTimerOffsets(&xtimer);
-        }
-#endif
-        if (xtimer.arm) {
-          int32_t set_time = xtimer.time + timer_window[i];
-          if (set_time < 0) {
-            set_time = abs(timer_window[i]);
-          }
-          if (set_time > 1439) {
-            set_time = xtimer.time - abs(timer_window[i]);
-          }
-          if (set_time > 1439) { set_time = 1439; }
-
-          DEBUG_DRIVER_LOG(PSTR("TIM: Timer %d, Time %d, Window %d, SetTime %d"), i +1, xtimer.time, timer_window[i], set_time);
-
-          if (time == set_time) {
-            if (xtimer.days & days) {
-              Settings.timer[i].arm = xtimer.repeat;
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-              if (POWER_BLINK == xtimer.power) {
-                Response_P(PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1);
-                XdrvRulesProcess();
-              } else
-#endif
-                if (devices_present) { ExecuteCommandPower(xtimer.device +1, xtimer.power, SRC_TIMER); }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-void PrepShowTimer(uint32_t index)
-{
-  Timer xtimer = Settings.timer[index -1];
-
-  char days[8] = { 0 };
-  for (uint32_t i = 0; i < 7; i++) {
-    uint8_t mask = 1 << i;
-    snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0));
-  }
-
-  char soutput[80];
-  soutput[0] = '\0';
-  if (devices_present) {
-    snprintf_P(soutput, sizeof(soutput), PSTR(",\"" D_JSON_TIMER_OUTPUT "\":%d"), xtimer.device +1);
-  }
-#ifdef USE_SUNRISE
-  char sign[2] = { 0 };
-  int16_t hour = xtimer.time / 60;
-  if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
-    if (hour > 11) {
-      hour -= 12;
-      sign[0] = '-';
-    }
-  }
-  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%s%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
-    index, xtimer.arm, xtimer.mode, sign, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
-#else
-  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
-    index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
-#endif
-}
-
-
-
-
-
-void CmndTimer(void)
-{
-  uint32_t index = XdrvMailbox.index;
-  if ((index > 0) && (index <= MAX_TIMERS)) {
-    uint32_t error = 0;
-    if (XdrvMailbox.data_len) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_TIMERS)) {
-        if (XdrvMailbox.payload == 0) {
-          Settings.timer[index -1].data = 0;
-        } else {
-          Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data;
-        }
-      } else {
-
-#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
-        if (devices_present) {
-#endif
-          char dataBufUc[XdrvMailbox.data_len + 1];
-          UpperCase(dataBufUc, XdrvMailbox.data);
-          StaticJsonBuffer<256> jsonBuffer;
-          JsonObject& root = jsonBuffer.parseObject(dataBufUc);
-          if (!root.success()) {
-            Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index);
-            error = 1;
-          }
-          else {
-            char parm_uc[10];
-            index--;
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) {
-              Settings.timer[index].arm = (root[parm_uc] != 0);
-            }
-#ifdef USE_SUNRISE
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_MODE))].success()) {
-              Settings.timer[index].mode = (uint8_t)root[parm_uc] & 0x03;
-            }
-#endif
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) {
-              uint16_t itime = 0;
-              int8_t value = 0;
-              uint8_t sign = 0;
-              char time_str[10];
-
-              strlcpy(time_str, root[parm_uc], sizeof(time_str));
-              const char *substr = strtok(time_str, ":");
-              if (substr != nullptr) {
-                if (strchr(substr, '-')) {
-                  sign = 1;
-                  substr++;
-                }
-                value = atoi(substr);
-                if (sign) { value += 12; }
-                if (value > 23) { value = 23; }
-                itime = value * 60;
-                substr = strtok(nullptr, ":");
-                if (substr != nullptr) {
-                  value = atoi(substr);
-                  if (value < 0) { value = 0; }
-                  if (value > 59) { value = 59; }
-                  itime += value;
-                }
-              }
-              Settings.timer[index].time = itime;
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_WINDOW))].success()) {
-              Settings.timer[index].window = (uint8_t)root[parm_uc] & 0x0F;
-              TimerSetRandomWindow(index);
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) {
-
-              Settings.timer[index].days = 0;
-              const char *tday = root[parm_uc];
-              uint8_t i = 0;
-              char ch = *tday++;
-              while ((ch != '\0') && (i < 7)) {
-                if (ch == '-') { ch = '0'; }
-                uint8_t mask = 1 << i++;
-                Settings.timer[index].days |= (ch == '0') ? 0 : mask;
-                ch = *tday++;
-              }
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) {
-              Settings.timer[index].repeat = (root[parm_uc] != 0);
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) {
-              uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F;
-              Settings.timer[index].device = (device < devices_present) ? device : 0;
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) {
-              uint8_t action = (uint8_t)root[parm_uc] & 0x03;
-              Settings.timer[index].power = (devices_present) ? action : 3;
-            }
-
-            index++;
-          }
-
-#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
-        } else {
-          Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index);
-          error = 1;
-        }
-#endif
-      }
-    }
-    if (!error) {
-      Response_P(PSTR("{"));
-      PrepShowTimer(index);
-      ResponseJsonEnd();
-    }
-  }
-}
-
-void CmndTimers(void)
-{
-  if (XdrvMailbox.data_len) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-      Settings.flag3.timers_enable = XdrvMailbox.payload;
-    }
-    if (XdrvMailbox.payload == 2) {
-      Settings.flag3.timers_enable = !Settings.flag3.timers_enable;
-    }
-  }
-
-  ResponseCmndStateText(Settings.flag3.timers_enable);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
-
-  uint32_t jsflg = 0;
-  uint32_t lines = 1;
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_TIMERS "%d\":{"), lines++);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg++;
-    PrepShowTimer(i +1);
-    if (jsflg > 3) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS));
-      jsflg = 0;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-#ifdef USE_SUNRISE
-void CmndLongitude(void)
-{
-  if (XdrvMailbox.data_len) {
-    Settings.longitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
-  }
-  ResponseCmndFloat((float)(Settings.longitude) /1000000, 6);
-}
-
-void CmndLatitude(void)
-{
-  if (XdrvMailbox.data_len) {
-    Settings.latitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
-  }
-  ResponseCmndFloat((float)(Settings.latitude) /1000000, 6);
-}
-#endif
-
-
-
-
-
-#ifdef USE_WEBSERVER
-#ifdef USE_TIMERS_WEB
-
-#define WEB_HANDLE_TIMER "tm"
-
-const char S_CONFIGURE_TIMER[] PROGMEM = D_CONFIGURE_TIMER;
-
-const char HTTP_BTN_MENU_TIMER[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_TIMER "' method='get'><button>" D_CONFIGURE_TIMER "</button></form></p>";
-
-const char HTTP_TIMER_SCRIPT1[] PROGMEM =
-  "var pt=[],ct=99;"
-  "function ce(i,q){"
-    "var o=document.createElement('option');"
-    "o.textContent=i;"
-    "q.appendChild(o);"
-  "}";
-#ifdef USE_SUNRISE
-const char HTTP_TIMER_SCRIPT2[] PROGMEM =
-  "function gt(){"
-    "var m,p,q;"
-    "m=qs('input[name=\"rd\"]:checked').value;"
-    "p=pt[ct]&0x7FF;"
-    "if(m==0){"
-      "so(0);"
-      "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
-      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-    "}"
-    "if((m==1)||(m==2)){"
-      "so(1);"
-      "q=Math.floor(p/60);"
-      "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}"
-        "else{qs('#dr').selectedIndex=0;}"
-      "if(q<10){q='0'+q;}qs('#ho').value=q;"
-      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-    "}"
-  "}"
-  "function so(b){"
-    "o=qs('#ho');"
-    "e=o.childElementCount;"
-    "if(b==1){"
-      "qs('#dr').style.visibility='';"
-      "if(e>12){for(i=12;i<=23;i++){o.removeChild(o.lastElementChild);}}"
-    "}else{"
-      "qs('#dr').style.visibility='hidden';"
-      "if(e<23){for(i=12;i<=23;i++){ce(i,o);}}"
-    "}"
-  "}";
-#endif
-const char HTTP_TIMER_SCRIPT3[] PROGMEM =
-  "function st(){"
-    "var i,l,m,n,p,s;"
-    "m=0;s=0;"
-    "n=1<<31;if(eb('a0').checked){s|=n;}"
-    "n=1<<15;if(eb('r0').checked){s|=n;}"
-    "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}"
-#ifdef USE_SUNRISE
-    "m=qs('input[name=\"rd\"]:checked').value;"
-    "s|=(qs('input[name=\"rd\"]:checked').value<<29);"
-#endif
-    "if(%d>0){"
-      "i=qs('#d1').selectedIndex;if(i>=0){s|=(i<<23);}"
-      "s|=(qs('#p1').selectedIndex<<27);"
-    "}else{"
-      "s|=3<<27;"
-    "}"
-    "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;"
-    "if(m==0){s|=l;}"
-#ifdef USE_SUNRISE
-    "if((m==1)||(m==2)){"
-      "if(qs('#dr').selectedIndex>0){if(l>0){l+=720;}}"
-      "s|=l&0x7FF;"
-    "}"
-#endif
-    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"
-    "pt[ct]=s;"
-    "eb('t0').value=pt.join();"
-  "}";
-const char HTTP_TIMER_SCRIPT4[] PROGMEM =
-  "function ot(t,e){"
-    "var i,n,o,p,q,s;"
-    "if(ct<99){st();}"
-    "ct=t;"
-    "o=document.getElementsByClassName('tl');"
-    "for(i=0;i<o.length;i++){o[i].style.cssText=\"background:#%06x;color:#%06x;font-weight:normal;\"}"
-    "e.style.cssText=\"background:#%06x;color:#%06x;font-weight:bold;\";"
-    "s=pt[ct];"
-#ifdef USE_SUNRISE
-    "p=(s>>29)&3;eb('b'+p).checked=1;"
-    "gt();"
-#else
-    "p=s&0x7FF;"
-    "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
-    "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-#endif
-    "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;"
-    "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}"
-    "if(%d>0){"
-      "p=(s>>23)&0xF;qs('#d1').value=p+1;"
-      "p=(s>>27)&3;qs('#p1').selectedIndex=p;"
-    "}"
-    "p=(s>>15)&1;eb('r0').checked=p;"
-    "p=(s>>31)&1;eb('a0').checked=p;"
-  "}";
-const char HTTP_TIMER_SCRIPT5[] PROGMEM =
-  "function it(){"
-    "var b,i,o,s;"
-    "pt=eb('t0').value.split(',').map(Number);"
-    "s='';"
-    "for(i=0;i<%d;i++){"
-      "b='';"
-      "if(0==i){b=\" id='dP'\";}"
-      "s+=\"<button type='button' class='tl' onclick='ot(\"+i+\",this)'\"+b+\">\"+(i+1)+\"</button>\""
-    "}"
-    "eb('bt').innerHTML=s;"
-    "if(%d>0){"
-      "eb('oa').innerHTML=\"<b>" D_TIMER_OUTPUT "</b>&nbsp;<span><select style='width:60px;' id='d1'></select></span>&emsp;<b>" D_TIMER_ACTION "</b>&nbsp;<select style='width:99px;' id='p1'></select>\";"
-      "o=qs('#p1');ce('" D_OFF "',o);ce('" D_ON "',o);ce('" D_TOGGLE "',o);"
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-      "ce('" D_RULE "',o);"
-#else
-      "ce('" D_BLINK "',o);"
-#endif
-    "}else{"
-      "eb('oa').innerHTML=\"<b>" D_TIMER_ACTION "</b> " D_RULE "\";"
-    "}";
-const char HTTP_TIMER_SCRIPT6[] PROGMEM =
-#ifdef USE_SUNRISE
-    "o=qs('#dr');ce('+',o);ce('-',o);"
-#endif
-    "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#d1');for(i=0;i<%d;i++){ce(i+1,o);}"
-    "var a='" D_DAY3LIST "';"
-    "s='';for(i=0;i<7;i++){s+=\"<input id='w\"+i+\"' type='checkbox'><b>\"+a.substring(i*3,(i*3)+3)+\"</b> \"}"
-    "eb('ds').innerHTML=s;"
-    "eb('dP').click();"
-  "}"
-  "wl(it);";
-const char HTTP_TIMER_STYLE[] PROGMEM =
-  ".tl{float:left;border-radius:0;border:1px solid #%06x;padding:1px;width:6.25%%;}";
-const char HTTP_FORM_TIMER1[] PROGMEM =
-  "<fieldset style='min-width:470px;text-align:center;'>"
-  "<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>"
-  "<br><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br><br><hr>"
-  "<input id='t0' value='";
-const char HTTP_FORM_TIMER2[] PROGMEM =
-  "' hidden><div id='bt'></div><br><br><br>"
-  "<div id='oa' name='oa'></div><br>"
-  "<div>"
-  "<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;"
-  "<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>"
-  "</div><br>"
-  "<div>";
-#ifdef USE_SUNRISE
-const char HTTP_FORM_TIMER3[] PROGMEM =
-  "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
-  "<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br>"
-  "<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br>"
-  "<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br>"
-  "</fieldset>"
-  "<p></p>"
-  "<span><select style='width:46px;' id='dr'></select></span>"
-  "&nbsp;";
-#else
-const char HTTP_FORM_TIMER3[] PROGMEM =
-  "<b>" D_TIMER_TIME "</b>&nbsp;";
-#endif
-const char HTTP_FORM_TIMER4[] PROGMEM =
-  "<span><select style='width:60px;' id='ho'></select></span>"
-  "&nbsp;" D_HOUR_MINUTE_SEPARATOR "&nbsp;"
-  "<span><select style='width:60px;' id='mi'></select></span>"
-  "&emsp;<b>+/-</b>&nbsp;"
-  "<span><select style='width:60px;' id='mw'></select></span>"
-  "</div><br>"
-  "<div id='ds' name='ds'></div>";
-
-void HandleTimerConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TIMER);
-
-  if (WebServer->hasArg("save")) {
-    TimerSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_TIMER);
-  WSContentSend_P(HTTP_TIMER_SCRIPT1);
-#ifdef USE_SUNRISE
-  WSContentSend_P(HTTP_TIMER_SCRIPT2);
-#endif
-  WSContentSend_P(HTTP_TIMER_SCRIPT3, devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT4, WebColor(COL_TIMER_TAB_BACKGROUND), WebColor(COL_TIMER_TAB_TEXT), WebColor(COL_FORM), WebColor(COL_TEXT), devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT5, MAX_TIMERS, devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT6, devices_present);
-  WSContentSendStyle_P(HTTP_TIMER_STYLE, WebColor(COL_FORM));
-  WSContentSend_P(HTTP_FORM_TIMER1, (Settings.flag3.timers_enable) ? " checked" : "");
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    WSContentSend_P(PSTR("%s%u"), (i > 0) ? "," : "", Settings.timer[i].data);
-  }
-  WSContentSend_P(HTTP_FORM_TIMER2);
-#ifdef USE_SUNRISE
-  WSContentSend_P(HTTP_FORM_TIMER3, 100 + (strlen(D_SUNSET) *12), GetSun(0).c_str(), GetSun(1).c_str());
-#else
-  WSContentSend_P(HTTP_FORM_TIMER3);
-#endif
-  WSContentSend_P(HTTP_FORM_TIMER4);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void TimerSaveSettings(void)
-{
-  char tmp[MAX_TIMERS *12];
-  char message[LOGSZ];
-  Timer timer;
-
-  Settings.flag3.timers_enable = WebServer->hasArg("e0");
-  WebGetArg("t0", tmp, sizeof(tmp));
-  char *p = tmp;
-  snprintf_P(message, sizeof(message), PSTR(D_LOG_MQTT D_CMND_TIMERS " %d"), Settings.flag3.timers_enable);
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    timer.data = strtol(p, &p, 10);
-    p++;
-    if (timer.time < 1440) {
-      bool flag = (timer.window != Settings.timer[i].window);
-      Settings.timer[i].data = timer.data;
-      if (flag) TimerSetRandomWindow(i);
-    }
-    snprintf_P(message, sizeof(message), PSTR("%s,0x%08X"), message, Settings.timer[i].data);
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, message);
-}
-#endif
-#endif
-
-
-
-
-
-bool Xdrv09(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_PRE_INIT:
-      TimerSetRandomWindows();
-      break;
-#ifdef USE_WEBSERVER
-#ifdef USE_TIMERS_WEB
-    case FUNC_WEB_ADD_BUTTON:
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-      WSContentSend_P(HTTP_BTN_MENU_TIMER);
-#else
-      if (devices_present) { WSContentSend_P(HTTP_BTN_MENU_TIMER); }
-#endif
-      break;
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/" WEB_HANDLE_TIMER, HandleTimerConfiguration);
-      break;
-#endif
-#endif
-    case FUNC_EVERY_SECOND:
-      TimerEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kTimerCommands, TimerCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-#ifdef USE_RULES
-#ifndef USE_SCRIPT
-# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-#define XDRV_10 10
-
-#define D_CMND_RULE "Rule"
-#define D_CMND_RULETIMER "RuleTimer"
-#define D_CMND_EVENT "Event"
-#define D_CMND_VAR "Var"
-#define D_CMND_MEM "Mem"
-#define D_CMND_ADD "Add"
-#define D_CMND_SUB "Sub"
-#define D_CMND_MULT "Mult"
-#define D_CMND_SCALE "Scale"
-#define D_CMND_CALC_RESOLUTION "CalcRes"
-#define D_CMND_SUBSCRIBE "Subscribe"
-#define D_CMND_UNSUBSCRIBE "Unsubscribe"
-#define D_CMND_IF "If"
-
-#define D_JSON_INITIATED "Initiated"
-
-#define COMPARE_OPERATOR_NONE -1
-#define COMPARE_OPERATOR_EQUAL 0
-#define COMPARE_OPERATOR_BIGGER 1
-#define COMPARE_OPERATOR_SMALLER 2
-#define COMPARE_OPERATOR_EXACT_DIVISION 3
-#define COMPARE_OPERATOR_NUMBER_EQUAL 4
-#define COMPARE_OPERATOR_NOT_EQUAL 5
-#define COMPARE_OPERATOR_BIGGER_EQUAL 6
-#define COMPARE_OPERATOR_SMALLER_EQUAL 7
-#define MAXIMUM_COMPARE_OPERATOR COMPARE_OPERATOR_SMALLER_EQUAL
-const char kCompareOperators[] PROGMEM = "=\0>\0<\0|\0==!=>=<=";
-
-#ifdef USE_EXPRESSION
-  #include <LinkedList.h>
-
-  const char kExpressionOperators[] PROGMEM = "+-*/%^\0";
-  #define EXPRESSION_OPERATOR_ADD 0
-  #define EXPRESSION_OPERATOR_SUBTRACT 1
-  #define EXPRESSION_OPERATOR_MULTIPLY 2
-  #define EXPRESSION_OPERATOR_DIVIDEDBY 3
-  #define EXPRESSION_OPERATOR_MODULO 4
-  #define EXPRESSION_OPERATOR_POWER 5
-
-  const uint8_t kExpressionOperatorsPriorities[] PROGMEM = {1, 1, 2, 2, 3, 4};
-  #define MAX_EXPRESSION_OPERATOR_PRIORITY 4
-
-
-  #define LOGIC_OPERATOR_AND 1
-  #define LOGIC_OPERATOR_OR 2
-
-  #define IF_BLOCK_INVALID -1
-  #define IF_BLOCK_ANY 0
-  #define IF_BLOCK_ELSEIF 1
-  #define IF_BLOCK_ELSE 2
-  #define IF_BLOCK_ENDIF 3
-#endif
-
-const char kRulesCommands[] PROGMEM = "|"
-  D_CMND_RULE "|" D_CMND_RULETIMER "|" D_CMND_EVENT "|" D_CMND_VAR "|" D_CMND_MEM "|"
-  D_CMND_ADD "|" D_CMND_SUB "|" D_CMND_MULT "|" D_CMND_SCALE "|" D_CMND_CALC_RESOLUTION
-#ifdef SUPPORT_MQTT_EVENT
-  "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE
-#endif
-#ifdef SUPPORT_IF_STATEMENT
-  "|" D_CMND_IF
-#endif
-  ;
-
-void (* const RulesCommand[])(void) PROGMEM = {
-  &CmndRule, &CmndRuleTimer, &CmndEvent, &CmndVariable, &CmndMemory,
-  &CmndAddition, &CmndSubtract, &CmndMultiply, &CmndScale, &CmndCalcResolution
-#ifdef SUPPORT_MQTT_EVENT
-  , &CmndSubscribe, &CmndUnsubscribe
-#endif
-#ifdef SUPPORT_IF_STATEMENT
-  , &CmndIf
-#endif
-  };
-
-#ifdef SUPPORT_MQTT_EVENT
-  #include <LinkedList.h>
-  typedef struct {
-    String Event;
-    String Topic;
-    String Key;
-  } MQTT_Subscription;
-  LinkedList<MQTT_Subscription> subscriptions;
-#endif
-
-struct RULES {
-  String event_value;
-  unsigned long timer[MAX_RULE_TIMERS] = { 0 };
-  uint32_t triggers[MAX_RULE_SETS] = { 0 };
-  uint8_t trigger_count[MAX_RULE_SETS] = { 0 };
-
-  long new_power = -1;
-  long old_power = -1;
-  long old_dimm = -1;
-
-  uint16_t last_minute = 60;
-  uint16_t vars_event = 0;
-  uint8_t mems_event = 0;
-  bool teleperiod = false;
-
-  char event_data[100];
-} Rules;
-
-char rules_vars[MAX_RULE_VARS][33] = {{ 0 }};
-
-#if (MAX_RULE_VARS>16)
-#error MAX_RULE_VARS is bigger than 16
-#endif
-#if (MAX_RULE_MEMS>16)
-#error MAX_RULE_MEMS is bigger than 16
-#endif
-
-
-
-bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
-{
-
-
-
-
-  bool match = false;
-  char stemp[10];
-
-
-  int pos = rule.indexOf('#');
-  if (pos == -1) { return false; }
-
-  String rule_task = rule.substring(0, pos);
-  if (Rules.teleperiod) {
-    int ppos = rule_task.indexOf("TELE-");
-    if (ppos == -1) { return false; }
-    rule_task = rule.substring(5, pos);
-  }
-
-  String rule_expr = rule.substring(pos +1);
-  String rule_name, rule_param;
-  int8_t compareOperator = parseCompareExpression(rule_expr, rule_name, rule_param);
-
-  char rule_svalue[80] = { 0 };
-  float rule_value = 0;
-  if (compareOperator != COMPARE_OPERATOR_NONE) {
-    for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
-      if (rule_param.startsWith(stemp)) {
-        rule_param = rules_vars[i];
-        break;
-      }
-    }
-    for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
-      if (rule_param.startsWith(stemp)) {
-        rule_param = SettingsText(SET_MEM1 + i);
-        break;
-      }
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIME%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(MinutesPastMidnight());
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%UPTIME%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(MinutesUptime());
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMESTAMP%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = GetDateAndTime(DT_LOCAL).c_str();
-    }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNRISE%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(SunMinutes(0));
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNSET%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(SunMinutes(1));
-    }
-#endif
-    rule_param.toUpperCase();
-    strlcpy(rule_svalue, rule_param.c_str(), sizeof(rule_svalue));
-
-    int temp_value = GetStateNumber(rule_svalue);
-    if (temp_value > -1) {
-      rule_value = temp_value;
-    } else {
-      rule_value = CharToFloat((char*)rule_svalue);
-    }
-  }
-
-
-  int rule_name_idx = 0;
-  if ((pos = rule_name.indexOf("[")) > 0) {
-    rule_name_idx = rule_name.substring(pos +1).toInt();
-    if ((rule_name_idx < 1) || (rule_name_idx > 6)) {
-      rule_name_idx = 1;
-    }
-    rule_name = rule_name.substring(0, pos);
-  }
-
-  StaticJsonBuffer<1024> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(event);
-  if (!root.success()) { return false; }
-  if (!root[rule_task].success()) { return false; }
-
-  JsonObject &obj1 = root[rule_task];
-  JsonObject *obj = &obj1;
-  String subtype;
-  uint32_t i = 0;
-  while ((pos = rule_name.indexOf("#")) > 0) {
-    subtype = rule_name.substring(0, pos);
-    if (!(*obj)[subtype].success()) { return false; }
-    JsonObject &obj2 = (*obj)[subtype];
-    obj = &obj2;
-    rule_name = rule_name.substring(pos +1);
-    if (i++ > 10) { return false; }
-  }
-  if (!(*obj)[rule_name].success()) { return false; }
-  const char* str_value;
-  if (rule_name_idx) {
-    str_value = (*obj)[rule_name][rule_name_idx -1];
-  } else {
-    str_value = (*obj)[rule_name];
-  }
-
-
-
-
-  Rules.event_value = str_value;
-
-
-  float value = 0;
-  if (str_value) {
-    value = CharToFloat((char*)str_value);
-    int int_value = int(value);
-    int int_rule_value = int(rule_value);
-    switch (compareOperator) {
-      case COMPARE_OPERATOR_EXACT_DIVISION:
-        match = (int_rule_value && (int_value % int_rule_value) == 0);
-        break;
-      case COMPARE_OPERATOR_EQUAL:
-        match = (!strcasecmp(str_value, rule_svalue));
-        break;
-      case COMPARE_OPERATOR_BIGGER:
-        match = (value > rule_value);
-        break;
-      case COMPARE_OPERATOR_SMALLER:
-        match = (value < rule_value);
-        break;
-      case COMPARE_OPERATOR_NUMBER_EQUAL:
-        match = (value == rule_value);
-        break;
-      case COMPARE_OPERATOR_NOT_EQUAL:
-        match = (value != rule_value);
-        break;
-      case COMPARE_OPERATOR_BIGGER_EQUAL:
-        match = (value >= rule_value);
-        break;
-      case COMPARE_OPERATOR_SMALLER_EQUAL:
-        match = (value <= rule_value);
-        break;
-      default:
-        match = true;
-    }
-  } else match = true;
-
-  if (bitRead(Settings.rule_once, rule_set)) {
-    if (match) {
-      if (!bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set])) {
-        bitSet(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
-      } else {
-        match = false;
-      }
-    } else {
-      bitClear(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
-    }
-  }
-
-  return match;
-}
-# 363 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr)
-{
-  char compare_operator[3];
-  int8_t compare = COMPARE_OPERATOR_NONE;
-  leftExpr = expr;
-  int position;
-  for (int8_t i = MAXIMUM_COMPARE_OPERATOR; i >= 0; i--) {
-    snprintf_P(compare_operator, sizeof(compare_operator), kCompareOperators + (i *2));
-    if ((position = expr.indexOf(compare_operator)) > 0) {
-      compare = i;
-      leftExpr = expr.substring(0, position);
-      leftExpr.trim();
-      rightExpr = expr.substring(position + strlen(compare_operator));
-      rightExpr.trim();
-      break;
-    }
-  }
-  return compare;
-}
-
-void RulesVarReplace(String &commands, const String &sfind, const String &replace)
-{
-
-
-
-  char *find = (char*)sfind.c_str();
-  uint32_t flen = strlen(find);
-
-  String ucommand = commands;
-  ucommand.toUpperCase();
-  char *read_from = (char*)ucommand.c_str();
-  char *write_to = (char*)commands.c_str();
-  char *found_at;
-  while ((found_at = strstr(read_from, find)) != nullptr) {
-    write_to += (found_at - read_from);
-    memmove_P(write_to, find, flen);
-    write_to += flen;
-    read_from = found_at + flen;
-  }
-
-  commands.replace(find, replace);
-}
-
-
-
-bool RuleSetProcess(uint8_t rule_set, String &event_saved)
-{
-  bool serviced = false;
-  char stemp[10];
-
-  delay(0);
-
-
-
-  String rules = Settings.rules[rule_set];
-
-  Rules.trigger_count[rule_set] = 0;
-  int plen = 0;
-  int plen2 = 0;
-  bool stop_all_rules = false;
-  while (true) {
-    rules = rules.substring(plen);
-    rules.trim();
-    if (!rules.length()) { return serviced; }
-
-    String rule = rules;
-    rule.toUpperCase();
-    if (!rule.startsWith("ON ")) { return serviced; }
-
-    int pevt = rule.indexOf(" DO ");
-    if (pevt == -1) { return serviced; }
-    String event_trigger = rule.substring(3, pevt);
-
-    plen = rule.indexOf(" ENDON");
-    plen2 = rule.indexOf(" BREAK");
-    if ((plen == -1) && (plen2 == -1)) { return serviced; }
-
-    if (plen == -1) { plen = 9999; }
-    if (plen2 == -1) { plen2 = 9999; }
-    plen = tmin(plen, plen2);
-
-    String commands = rules.substring(pevt +4, plen);
-    Rules.event_value = "";
-    String event = event_saved;
-
-
-
-    if (RulesRuleMatch(rule_set, event, event_trigger)) {
-      if (plen == plen2) { stop_all_rules = true; }
-      commands.trim();
-      String ucommand = commands;
-      ucommand.toUpperCase();
-
-
-
-      if ((ucommand.indexOf("IF ") == -1) &&
-          (ucommand.indexOf("EVENT ") != -1) &&
-          (ucommand.indexOf("BACKLOG ") == -1)) {
-        commands = "backlog " + commands;
-      }
-
-      RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);
-      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
-        RulesVarReplace(commands, stemp, rules_vars[i]);
-      }
-      for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
-        RulesVarReplace(commands, stemp, SettingsText(SET_MEM1 +i));
-      }
-      RulesVarReplace(commands, F("%TIME%"), String(MinutesPastMidnight()));
-      RulesVarReplace(commands, F("%UPTIME%"), String(MinutesUptime()));
-      RulesVarReplace(commands, F("%TIMESTAMP%"), GetDateAndTime(DT_LOCAL));
-      RulesVarReplace(commands, F("%TOPIC%"), SettingsText(SET_MQTT_TOPIC));
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-      RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
-      RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));
-#endif
-
-      char command[commands.length() +1];
-      strlcpy(command, commands.c_str(), sizeof(command));
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command);
-
-
-
-#ifdef SUPPORT_IF_STATEMENT
-      char *pCmd = command;
-      RulesPreprocessCommand(pCmd);
-#endif
-      ExecuteCommand(command, SRC_RULE);
-      serviced = true;
-      if (stop_all_rules) { return serviced; }
-    }
-    plen += 6;
-    Rules.trigger_count[rule_set]++;
-  }
-  return serviced;
-}
-
-
-
-bool RulesProcessEvent(char *json_event)
-{
-  bool serviced = false;
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("RulesProcessEvent"));
-#endif
-
-  String event_saved = json_event;
-
-
-
-  char *p = strchr(json_event, ':');
-  if ((p != NULL) && !(strchr(++p, ':'))) {
-    event_saved.replace(F(":"), F(":{\"Data\":"));
-    event_saved += F("}");
-
-  }
-  event_saved.toUpperCase();
-
-
-
-  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-    if (strlen(Settings.rules[i]) && bitRead(Settings.rule_enabled, i)) {
-      if (RuleSetProcess(i, event_saved)) { serviced = true; }
-    }
-  }
-  return serviced;
-}
-
-bool RulesProcess(void)
-{
-  return RulesProcessEvent(mqtt_data);
-}
-
-void RulesInit(void)
-{
-  rules_flag.data = 0;
-  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-    if (Settings.rules[i][0] == '\0') {
-      bitWrite(Settings.rule_enabled, i, 0);
-      bitWrite(Settings.rule_once, i, 0);
-    }
-  }
-  Rules.teleperiod = false;
-}
-
-void RulesEvery50ms(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[120];
-
-    if (-1 == Rules.new_power) { Rules.new_power = power; }
-    if (Rules.new_power != Rules.old_power) {
-      if (Rules.old_power != -1) {
-        for (uint32_t i = 0; i < devices_present; i++) {
-          uint8_t new_state = (Rules.new_power >> i) &1;
-          if (new_state != ((Rules.old_power >> i) &1)) {
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"State\":%d}}"), i +1, new_state);
-            RulesProcessEvent(json_event);
-          }
-        }
-      } else {
-
-        for (uint32_t i = 0; i < devices_present; i++) {
-          uint8_t new_state = (Rules.new_power >> i) &1;
-          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"Boot\":%d}}"), i +1, new_state);
-          RulesProcessEvent(json_event);
-        }
-
-        for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-#ifdef USE_TM1638
-          if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
-#else
-          if (pin[GPIO_SWT1 +i] < 99) {
-#endif
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (SwitchState(i)));
-            RulesProcessEvent(json_event);
-          }
-        }
-      }
-      Rules.old_power = Rules.new_power;
-    }
-    else if (Rules.old_dimm != Settings.light_dimmer) {
-      if (Rules.old_dimm != -1) {
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"State\":%d}}"), Settings.light_dimmer);
-      } else {
-
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"Boot\":%d}}"), Settings.light_dimmer);
-      }
-      RulesProcessEvent(json_event);
-      Rules.old_dimm = Settings.light_dimmer;
-    }
-    else if (Rules.event_data[0]) {
-      char *event;
-      char *parameter;
-      event = strtok_r(Rules.event_data, "=", &parameter);
-      if (event) {
-        event = Trim(event);
-        if (parameter) {
-          parameter = Trim(parameter);
-        } else {
-          parameter = event + strlen(event);
-        }
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Event\":{\"%s\":\"%s\"}}"), event, parameter);
-        Rules.event_data[0] ='\0';
-        RulesProcessEvent(json_event);
-      } else {
-        Rules.event_data[0] ='\0';
-      }
-    }
-    else if (Rules.vars_event || Rules.mems_event){
-      if (Rules.vars_event) {
-        for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-          if (bitRead(Rules.vars_event, i)) {
-            bitClear(Rules.vars_event, i);
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Var%d\":{\"State\":%s}}"), i+1, rules_vars[i]);
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-      }
-      if (Rules.mems_event) {
-        for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-          if (bitRead(Rules.mems_event, i)) {
-            bitClear(Rules.mems_event, i);
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Mem%d\":{\"State\":%s}}"), i+1, SettingsText(SET_MEM1 +i));
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-      }
-    }
-    else if (rules_flag.data) {
-      uint16_t mask = 1;
-      for (uint32_t i = 0; i < MAX_RULES_FLAG; i++) {
-        if (rules_flag.data & mask) {
-          rules_flag.data ^= mask;
-          json_event[0] = '\0';
-          switch (i) {
-            case 0: strncpy_P(json_event, PSTR("{\"System\":{\"Boot\":1}}"), sizeof(json_event)); break;
-            case 1: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Initialized\":%d}}"), MinutesPastMidnight()); break;
-            case 2: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Set\":%d}}"), MinutesPastMidnight()); break;
-            case 3: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Connected\":1}}"), sizeof(json_event)); break;
-            case 4: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
-            case 5: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Connected\":1}}"), sizeof(json_event)); break;
-            case 6: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
-            case 7: strncpy_P(json_event, PSTR("{\"HTTP\":{\"Initialized\":1}}"), sizeof(json_event)); break;
-#ifdef USE_SHUTTER
-            case 8: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moved\":1}}"), sizeof(json_event)); break;
-            case 9: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moving\":1}}"), sizeof(json_event)); break;
-#endif
-          }
-          if (json_event[0]) {
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-        mask <<= 1;
-      }
-    }
-  }
-}
-
-uint8_t rules_xsns_index = 0;
-
-void RulesEvery100ms(void)
-{
-  if (Settings.rule_enabled && (uptime > 4)) {
-    mqtt_data[0] = '\0';
-    int tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, rules_xsns_index);
-    tele_period = tele_period_save;
-    if (strlen(mqtt_data)) {
-      mqtt_data[0] = '{';
-      ResponseJsonEnd();
-      RulesProcess();
-    }
-  }
-}
-
-void RulesEverySecond(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[120];
-
-    if (RtcTime.valid) {
-      if ((uptime > 60) && (RtcTime.minute != Rules.last_minute)) {
-        Rules.last_minute = RtcTime.minute;
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Minute\":%d}}"), MinutesPastMidnight());
-        RulesProcessEvent(json_event);
-      }
-    }
-    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
-      if (Rules.timer[i] != 0L) {
-        if (TimeReached(Rules.timer[i])) {
-          Rules.timer[i] = 0L;
-          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1);
-          RulesProcessEvent(json_event);
-        }
-      }
-    }
-  }
-}
-
-void RulesSaveBeforeRestart(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[32];
-
-    strncpy_P(json_event, PSTR("{\"System\":{\"Save\":1}}"), sizeof(json_event));
-    RulesProcessEvent(json_event);
-  }
-}
-
-void RulesSetPower(void)
-{
-  Rules.new_power = XdrvMailbox.index;
-}
-
-void RulesTeleperiod(void)
-{
-  Rules.teleperiod = true;
-  RulesProcess();
-  Rules.teleperiod = false;
-}
-
-#ifdef SUPPORT_MQTT_EVENT
-# 744 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool RulesMqttData(void)
-{
-  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
-    return false;
-  }
-  bool serviced = false;
-  String sTopic = XdrvMailbox.topic;
-  String sData = XdrvMailbox.data;
-
-  MQTT_Subscription event_item;
-
-  for (uint32_t index = 0; index < subscriptions.size(); index++) {
-    event_item = subscriptions.get(index);
-
-
-    if (sTopic.startsWith(event_item.Topic)) {
-
-      serviced = true;
-      String value;
-      if (event_item.Key.length() == 0) {
-        value = sData;
-      } else {
-        StaticJsonBuffer<500> jsonBuf;
-        JsonObject& jsonData = jsonBuf.parseObject(sData);
-        String key1 = event_item.Key;
-        String key2;
-        if (!jsonData.success()) break;
-        int dot;
-        if ((dot = key1.indexOf('.')) > 0) {
-          key2 = key1.substring(dot+1);
-          key1 = key1.substring(0, dot);
-          if (!jsonData[key1][key2].success()) break;
-          value = (const char *)jsonData[key1][key2];
-        } else {
-          if (!jsonData[key1].success()) break;
-          value = (const char *)jsonData[key1];
-        }
-      }
-      value.trim();
-
-      snprintf_P(Rules.event_data, sizeof(Rules.event_data), PSTR("%s=%s"), event_item.Event.c_str(), value.c_str());
-    }
-  }
-  return serviced;
-}
-# 806 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-void CmndSubscribe(void)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (XdrvMailbox.data_len > 0) {
-    char parameters[XdrvMailbox.data_len+1];
-    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
-    parameters[XdrvMailbox.data_len] = '\0';
-    String event_name, topic, key;
-
-    char * pos = strtok(parameters, ",");
-    if (pos) {
-      event_name = Trim(pos);
-      pos = strtok(nullptr, ",");
-      if (pos) {
-        topic = Trim(pos);
-        pos = strtok(nullptr, ",");
-        if (pos) {
-          key = Trim(pos);
-        }
-      }
-    }
-
-    event_name.toUpperCase();
-    if (event_name.length() > 0 && topic.length() > 0) {
-
-      for (uint32_t index=0; index < subscriptions.size(); index++) {
-        if (subscriptions.get(index).Event.equals(event_name)) {
-
-          String stopic = subscriptions.get(index).Topic + "/#";
-          MqttUnsubscribe(stopic.c_str());
-          subscriptions.remove(index);
-          break;
-        }
-      }
-
-      if (!topic.endsWith("#")) {
-        if (topic.endsWith("/")) {
-          topic.concat("#");
-        } else {
-          topic.concat("/#");
-        }
-      }
-
-
-      subscription_item.Event = event_name;
-      subscription_item.Topic = topic.substring(0, topic.length() - 2);
-      subscription_item.Key = key;
-      subscriptions.add(subscription_item);
-
-      MqttSubscribe(topic.c_str());
-      events.concat(event_name + "," + topic
-        + (key.length()>0 ? "," : "")
-        + key);
-    } else {
-      events = D_JSON_WRONG_PARAMETERS;
-    }
-  } else {
-
-    for (uint32_t index=0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      events.concat(subscription_item.Event + "," + subscription_item.Topic
-        + (subscription_item.Key.length()>0 ? "," : "")
-        + subscription_item.Key + "; ");
-    }
-  }
-  ResponseCmndChar(events.c_str());
-}
-# 886 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-void CmndUnsubscribe(void)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (XdrvMailbox.data_len > 0) {
-    for (uint32_t index = 0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      if (subscription_item.Event.equalsIgnoreCase(XdrvMailbox.data)) {
-        String stopic = subscription_item.Topic + "/#";
-        MqttUnsubscribe(stopic.c_str());
-        events = subscription_item.Event;
-        subscriptions.remove(index);
-        break;
-      }
-    }
-  } else {
-
-    String stopic;
-    while (subscriptions.size() > 0) {
-      events.concat(subscriptions.get(0).Event + "; ");
-      stopic = subscriptions.get(0).Topic + "/#";
-      MqttUnsubscribe(stopic.c_str());
-      subscriptions.remove(0);
-    }
-  }
-  ResponseCmndChar(events.c_str());
-}
-
-#endif
-
-#ifdef USE_EXPRESSION
-# 928 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-char * findClosureBracket(char * pStart)
-{
-  char * pointer = pStart + 1;
-
-  bool bFindClosures = false;
-  uint8_t matchClosures = 1;
-  while (*pointer)
-  {
-    if (*pointer == ')') {
-      matchClosures--;
-      if (matchClosures == 0) {
-        bFindClosures = true;
-        break;
-      }
-    } else if (*pointer == '(') {
-      matchClosures++;
-    }
-    pointer++;
-  }
-  if (bFindClosures) {
-    return pointer;
-  } else {
-    return nullptr;
-  }
-}
-# 967 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextNumber(char * &pNumber, float &value)
-{
-  bool bSucceed = false;
-  String sNumber = "";
-  if (*pNumber == '-') {
-    sNumber = "-";
-    pNumber++;
-  }
-  while (*pNumber) {
-    if (isdigit(*pNumber) || (*pNumber == '.')) {
-      sNumber += *pNumber;
-      pNumber++;
-    } else {
-      break;
-    }
-  }
-  if (sNumber.length() > 0) {
-    value = CharToFloat(sNumber.c_str());
-    bSucceed = true;
-  }
-  return bSucceed;
-}
-# 1003 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextVariableValue(char * &pVarname, float &value)
-{
-  bool succeed = true;
-  value = 0;
-  String sVarName = "";
-  while (*pVarname) {
-    if (isalpha(*pVarname) || isdigit(*pVarname)) {
-      sVarName.concat(*pVarname);
-      pVarname++;
-    } else {
-      break;
-    }
-  }
-  sVarName.toUpperCase();
-  if (sVarName.startsWith(F("VAR"))) {
-    int index = sVarName.substring(3).toInt();
-    if (index > 0 && index <= MAX_RULE_VARS) {
-      value = CharToFloat(rules_vars[index -1]);
-    }
-  } else if (sVarName.startsWith(F("MEM"))) {
-    int index = sVarName.substring(3).toInt();
-    if (index > 0 && index <= MAX_RULE_MEMS) {
-      value = CharToFloat(SettingsText(SET_MEM1 + index -1));
-    }
-  } else if (sVarName.equals(F("TIME"))) {
-    value = MinutesPastMidnight();
-  } else if (sVarName.equals(F("UPTIME"))) {
-    value = MinutesUptime();
-  } else if (sVarName.equals(F("UTCTIME"))) {
-    value = UtcTime();
-  } else if (sVarName.equals(F("LOCALTIME"))) {
-    value = LocalTime();
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-  } else if (sVarName.equals(F("SUNRISE"))) {
-    value = SunMinutes(0);
-  } else if (sVarName.equals(F("SUNSET"))) {
-    value = SunMinutes(1);
-#endif
-  } else {
-    succeed = false;
-  }
-
-  return succeed;
-}
-# 1065 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextObjectValue(char * &pointer, float &value)
-{
-  bool bSucceed = false;
-  while (*pointer)
-  {
-    if (isspace(*pointer)) {
-      pointer++;
-      continue;
-    }
-    if (isdigit(*pointer) || (*pointer) == '-') {
-      bSucceed = findNextNumber(pointer, value);
-      break;
-    } else if (isalpha(*pointer)) {
-      bSucceed = findNextVariableValue(pointer, value);
-      break;
-    } else if (*pointer == '(') {
-      char * closureBracket = findClosureBracket(pointer);
-      if (closureBracket != nullptr) {
-        value = evaluateExpression(pointer+1, closureBracket - pointer - 1);
-        pointer = closureBracket + 1;
-        bSucceed = true;
-      }
-      break;
-    } else {
-      break;
-    }
-  }
-  return bSucceed;
-}
-# 1109 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextOperator(char * &pointer, int8_t &op)
-{
-  bool bSucceed = false;
-  while (*pointer)
-  {
-    if (isspace(*pointer)) {
-      pointer++;
-      continue;
-    }
-    op = EXPRESSION_OPERATOR_ADD;
-    const char *pch = kExpressionOperators;
-    char ch;
-    while ((ch = pgm_read_byte(pch++)) != '\0') {
-      if (ch == *pointer) {
-        bSucceed = true;
-        pointer++;
-        break;
-      }
-      op++;
-    }
-    break;
-  }
-  return bSucceed;
-}
-# 1146 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-float calculateTwoValues(float v1, float v2, uint8_t op)
-{
-  switch (op)
-  {
-    case EXPRESSION_OPERATOR_ADD:
-      return v1 + v2;
-    case EXPRESSION_OPERATOR_SUBTRACT:
-      return v1 - v2;
-    case EXPRESSION_OPERATOR_MULTIPLY:
-      return v1 * v2;
-    case EXPRESSION_OPERATOR_DIVIDEDBY:
-      return (0 == v2) ? 0 : (v1 / v2);
-    case EXPRESSION_OPERATOR_MODULO:
-      return (0 == v2) ? 0 : (int(v1) % int(v2));
-    case EXPRESSION_OPERATOR_POWER:
-      return FastPrecisePow(v1, v2);
-  }
-  return 0;
-}
-# 1199 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-float evaluateExpression(const char * expression, unsigned int len)
-{
-  char expbuf[len + 1];
-  memcpy(expbuf, expression, len);
-  expbuf[len] = '\0';
-  char * scan_pointer = expbuf;
-
-  LinkedList<float> object_values;
-  LinkedList<int8_t> operators;
-  int8_t op;
-  float va;
-
-  if (findNextObjectValue(scan_pointer, va)) {
-    object_values.add(va);
-  } else {
-    return 0;
-  }
-  while (*scan_pointer)
-  {
-    if (findNextOperator(scan_pointer, op)
-        && *scan_pointer
-        && findNextObjectValue(scan_pointer, va))
-    {
-      operators.add(op);
-      object_values.add(va);
-    } else {
-
-      break;
-    }
-  }
-
-
-
-  for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) {
-    int index = 0;
-    while (index < operators.size()) {
-      if (priority == pgm_read_byte(kExpressionOperatorsPriorities + operators.get(index))) {
-
-        va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index));
-
-        object_values.set(index, va);
-      } else {
-        index++;
-      }
-    }
-  }
-  return object_values.get(0);
-}
-#endif
-
-#ifdef SUPPORT_IF_STATEMENT
-void CmndIf(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    char parameters[XdrvMailbox.data_len+1];
-    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
-    parameters[XdrvMailbox.data_len] = '\0';
-    ProcessIfStatement(parameters);
-  }
-  ResponseCmndDone();
-}
-# 1273 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool evaluateComparisonExpression(const char *expression, int len)
-{
-  bool bResult = true;
-  char expbuf[len + 1];
-  memcpy(expbuf, expression, len);
-  expbuf[len] = '\0';
-  String compare_expression = expbuf;
-  String leftExpr, rightExpr;
-  int8_t compareOp = parseCompareExpression(compare_expression, leftExpr, rightExpr);
-
-  double leftValue = evaluateExpression(leftExpr.c_str(), leftExpr.length());
-  double rightValue = evaluateExpression(rightExpr.c_str(), rightExpr.length());
-  switch (compareOp) {
-    case COMPARE_OPERATOR_EXACT_DIVISION:
-      bResult = (rightValue != 0 && leftValue == int(leftValue)
-          && rightValue == int(rightValue) && (int(leftValue) % int(rightValue)) == 0);
-      break;
-    case COMPARE_OPERATOR_EQUAL:
-      bResult = leftExpr.equalsIgnoreCase(rightExpr);
-      break;
-    case COMPARE_OPERATOR_BIGGER:
-      bResult = (leftValue > rightValue);
-      break;
-    case COMPARE_OPERATOR_SMALLER:
-      bResult = (leftValue < rightValue);
-      break;
-    case COMPARE_OPERATOR_NUMBER_EQUAL:
-      bResult = (leftValue == rightValue);
-      break;
-    case COMPARE_OPERATOR_NOT_EQUAL:
-      bResult = (leftValue != rightValue);
-      break;
-    case COMPARE_OPERATOR_BIGGER_EQUAL:
-      bResult = (leftValue >= rightValue);
-      break;
-    case COMPARE_OPERATOR_SMALLER_EQUAL:
-      bResult = (leftValue <= rightValue);
-      break;
-  }
-  return bResult;
-}
-# 1329 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextLogicOperator(char * &pointer, int8_t &op)
-{
-  bool bSucceed = false;
-  while (*pointer && isspace(*pointer)) {
-
-    pointer++;
-  }
-  if (*pointer) {
-    if (strncasecmp_P(pointer, PSTR("AND "), 4) == 0) {
-      op = LOGIC_OPERATOR_AND;
-      pointer += 4;
-      bSucceed = true;
-    } else if (strncasecmp_P(pointer, PSTR("OR "), 3) == 0) {
-      op = LOGIC_OPERATOR_OR;
-      pointer += 3;
-      bSucceed = true;
-    }
-  }
-  return bSucceed;
-}
-# 1366 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextLogicObjectValue(char * &pointer, bool &value)
-{
-  bool bSucceed = false;
-  while (*pointer && isspace(*pointer)) {
-
-    pointer++;
-  }
-  char * pExpr = pointer;
-  while (*pointer) {
-    if (isalpha(*pointer)
-       && (strncasecmp_P(pointer, PSTR("AND "), 4) == 0
-       || strncasecmp_P(pointer, PSTR("OR "), 3) == 0))
-    {
-      value = evaluateComparisonExpression(pExpr, pointer - pExpr);
-      bSucceed = true;
-      break;
-    } else if (*pointer == '(') {
-      char * closureBracket = findClosureBracket(pointer);
-      if (closureBracket != nullptr) {
-        value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 1);
-        pointer = closureBracket + 1;
-        bSucceed = true;
-      }
-      break;
-    }
-    pointer++;
-  }
-  if (!bSucceed && pointer > pExpr) {
-
-    value = evaluateComparisonExpression(pExpr, pointer - pExpr);
-    bSucceed = true;
-  }
-  return bSucceed;
-}
-# 1415 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-bool evaluateLogicalExpression(const char * expression, int len)
-{
-  bool bResult = false;
-
-  char expbuff[len + 1];
-  memcpy(expbuff, expression, len);
-  expbuff[len] = '\0';
-
-
-  char * pointer = expbuff;
-  LinkedList<bool> values;
-  LinkedList<int8_t> logicOperators;
-
-  bool bValue;
-  if (findNextLogicObjectValue(pointer, bValue)) {
-    values.add(bValue);
-  } else {
-    return false;
-  }
-  int8_t op;
-  while (*pointer) {
-    if (findNextLogicOperator(pointer, op)
-      && (*pointer) && findNextLogicObjectValue(pointer, bValue))
-    {
-      logicOperators.add(op);
-      values.add(bValue);
-    } else {
-      break;
-    }
-  }
-
-  int index = 0;
-  while (index < logicOperators.size()) {
-    if (logicOperators.get(index) == LOGIC_OPERATOR_AND) {
-      values.set(index, values.get(index) && values.get(index+1));
-      values.remove(index + 1);
-      logicOperators.remove(index);
-    } else {
-      index++;
-    }
-  }
-
-  index = 0;
-  while (index < logicOperators.size()) {
-    if (logicOperators.get(index) == LOGIC_OPERATOR_OR) {
-      values.set(index, values.get(index) || values.get(index+1));
-      values.remove(index + 1);
-      logicOperators.remove(index);
-    } else {
-      index++;
-    }
-  }
-  return values.get(0);
-}
-# 1486 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type)
-{
-  int8_t foundBlock = IF_BLOCK_INVALID;
-
-  const char * word;
-  while (*pointer) {
-    if (!isalpha(*pointer)) {
-      pointer++;
-      continue;
-    }
-    word = pointer;
-    while (*pointer && isalpha(*pointer)) {
-      pointer++;
-    }
-    lenWord = pointer - word;
-
-    if (2 == lenWord && 0 == strncasecmp_P(word, PSTR("IF"), 2)) {
-
-
-      if (findIfBlock(pointer, lenWord, IF_BLOCK_ENDIF) != IF_BLOCK_ENDIF) {
-
-        break;
-      }
-    } else if ( (IF_BLOCK_ENDIF == block_type || IF_BLOCK_ANY == block_type)
-      && (5 == lenWord) && (0 == strncasecmp_P(word, PSTR("ENDIF"), 5)))
-    {
-
-      foundBlock = IF_BLOCK_ENDIF;
-      break;
-    } else if ( (IF_BLOCK_ELSEIF == block_type || IF_BLOCK_ANY == block_type)
-      && (6 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSEIF"), 6)))
-    {
-
-      foundBlock = IF_BLOCK_ELSEIF;
-      break;
-    } else if ( (IF_BLOCK_ELSE == block_type || IF_BLOCK_ANY == block_type)
-      && (4 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSE"), 4)))
-    {
-
-      foundBlock = IF_BLOCK_ELSE;
-      break;
-    }
-  }
-  return foundBlock;
-}
-# 1543 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-void ExecuteCommandBlock(const char * commands, int len)
-{
-  char cmdbuff[len + 1];
-  memcpy(cmdbuff, commands, len);
-  cmdbuff[len] = '\0';
-
-
-  char oneCommand[len + 1];
-  int insertPosition = 0;
-  char * pos = cmdbuff;
-  int lenEndBlock = 0;
-  while (*pos) {
-    if (isspace(*pos) || '\x1e' == *pos || ';' == *pos) {
-      pos++;
-      continue;
-    }
-    if (strncasecmp_P(pos, PSTR("BACKLOG "), 8) == 0) {
-
-      pos += 8;
-      continue;
-    }
-    if (strncasecmp_P(pos, PSTR("IF "), 3) == 0) {
-
-
-      char *pEndif = pos + 3;
-      if (IF_BLOCK_ENDIF != findIfBlock(pEndif, lenEndBlock, IF_BLOCK_ENDIF)) {
-
-        break;
-      }
-
-      memcpy(oneCommand, pos, pEndif - pos);
-      oneCommand[pEndif - pos] = '\0';
-      pos = pEndif;
-    } else {
-
-      char *pEndOfCommand = strpbrk(pos, "\x1e;");
-      if (NULL == pEndOfCommand) {
-        pEndOfCommand = pos + strlen(pos);
-      }
-      memcpy(oneCommand, pos, pEndOfCommand - pos);
-      oneCommand[pEndOfCommand - pos] = '\0';
-      pos = pEndOfCommand;
-    }
-
-
-    String sCurrentCommand = oneCommand;
-    sCurrentCommand.trim();
-    if (sCurrentCommand.length() > 0
-      && backlog.size() < MAX_BACKLOG && !backlog_mutex)
-    {
-
-      backlog_mutex = true;
-      backlog.add(insertPosition, sCurrentCommand);
-      backlog_mutex = false;
-      insertPosition++;
-    }
-  }
-  return;
-}
-# 1613 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-void ProcessIfStatement(const char* statements)
-{
-  String conditionExpression;
-  int len = strlen(statements);
-  char statbuff[len + 1];
-  memcpy(statbuff, statements, len + 1);
-  char *pos = statbuff;
-  int lenEndBlock = 0;
-  while (true) {
-
-
-    while (*pos && *pos != '(') {
-      pos++;
-    }
-    if (0 == *pos) { break; }
-    char * posEnd = findClosureBracket(pos);
-
-    if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) {
-
-      char * cmdBlockStart = posEnd + 1;
-      char * cmdBlockEnd = cmdBlockStart;
-      int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ANY);
-      if (IF_BLOCK_INVALID == nextBlock) {
-
-        break;
-      }
-      ExecuteCommandBlock(cmdBlockStart, cmdBlockEnd - cmdBlockStart - lenEndBlock);
-      pos = cmdBlockEnd;
-      break;
-    } else {
-      pos = posEnd + 1;
-      int8_t nextBlock = findIfBlock(pos, lenEndBlock, IF_BLOCK_ANY);
-      if (IF_BLOCK_ELSEIF == nextBlock) {
-
-        continue;
-      } else if (IF_BLOCK_ELSE == nextBlock) {
-
-        char * cmdBlockEnd = pos;
-        int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ENDIF);
-        if (IF_BLOCK_ENDIF != nextBlock) {
-
-          break;
-        }
-        ExecuteCommandBlock(pos, cmdBlockEnd - pos - lenEndBlock);
-        break;
-      } else {
-
-        break;
-      }
-    }
-  }
-}
-# 1677 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_rules.ino"
-void RulesPreprocessCommand(char *pCommands)
-{
-  char * cmd = pCommands;
-  int lenEndBlock = 0;
-  while (*cmd) {
-
-    if (';' == *cmd || isspace(*cmd)) {
-      cmd++;
-    }
-    else if (strncasecmp_P(cmd, PSTR("IF "), 3) == 0) {
-
-      char * pIfStart = cmd;
-      char * pIfEnd = pIfStart + 3;
-
-      if (IF_BLOCK_ENDIF == findIfBlock(pIfEnd, lenEndBlock, IF_BLOCK_ENDIF)) {
-
-        cmd = pIfEnd;
-
-
-        while (pIfStart < pIfEnd) {
-          if (';' == *pIfStart)
-            *pIfStart = '\x1e';
-          pIfStart++;
-        }
-      }
-      else {
-        break;
-      }
-    }
-    else {
-      while (*cmd && ';' != *cmd) {
-        cmd++;
-      }
-    }
-  }
-  return;
-}
-#endif
-
-
-
-
-
-void CmndRule(void)
-{
-  uint8_t index = XdrvMailbox.index;
-  if ((index > 0) && (index <= MAX_RULE_SETS)) {
-    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(Settings.rules[index -1]))) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 10)) {
-        switch (XdrvMailbox.payload) {
-        case 0:
-        case 1:
-          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
-          break;
-        case 2:
-          bitWrite(Settings.rule_enabled, index -1, bitRead(Settings.rule_enabled, index -1) ^1);
-          break;
-        case 4:
-        case 5:
-          bitWrite(Settings.rule_once, index -1, XdrvMailbox.payload &1);
-          break;
-        case 6:
-          bitWrite(Settings.rule_once, index -1, bitRead(Settings.rule_once, index -1) ^1);
-          break;
-        case 8:
-        case 9:
-          bitWrite(Settings.rule_stop, index -1, XdrvMailbox.payload &1);
-          break;
-        case 10:
-          bitWrite(Settings.rule_stop, index -1, bitRead(Settings.rule_stop, index -1) ^1);
-          break;
-        }
-      } else {
-        int offset = 0;
-        if ('+' == XdrvMailbox.data[0]) {
-          offset = strlen(Settings.rules[index -1]);
-          if (XdrvMailbox.data_len < (sizeof(Settings.rules[index -1]) - offset -1)) {
-            XdrvMailbox.data[0] = ' ';
-          } else {
-            offset = -1;
-          }
-        }
-        if (offset != -1) {
-          strlcpy(Settings.rules[index -1] + offset, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(Settings.rules[index -1]));
-        }
-      }
-      Rules.triggers[index -1] = 0;
-    }
-    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s%d\":\"%s\",\"Once\":\"%s\",\"StopOnError\":\"%s\",\"Free\":%d,\"Rules\":\"%s\"}"),
-      XdrvMailbox.command, index, GetStateText(bitRead(Settings.rule_enabled, index -1)), GetStateText(bitRead(Settings.rule_once, index -1)),
-      GetStateText(bitRead(Settings.rule_stop, index -1)), sizeof(Settings.rules[index -1]) - strlen(Settings.rules[index -1]) -1, Settings.rules[index -1]);
-  }
-}
-
-void CmndRuleTimer(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_TIMERS)) {
-    if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-      float timer_set = evaluateExpression(XdrvMailbox.data, XdrvMailbox.data_len);
-      Rules.timer[XdrvMailbox.index -1] = (timer_set > 0) ? millis() + (1000 * timer_set) : 0;
-#else
-      Rules.timer[XdrvMailbox.index -1] = (XdrvMailbox.payload > 0) ? millis() + (1000 * XdrvMailbox.payload) : 0;
-#endif
-    }
-    mqtt_data[0] = '\0';
-    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
-      ResponseAppend_P(PSTR("%c\"T%d\":%d"), (i) ? ',' : '{', i +1, (Rules.timer[i]) ? (Rules.timer[i] - millis()) / 1000 : 0);
-    }
-    ResponseJsonEnd();
-  }
-}
-
-void CmndEvent(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    strlcpy(Rules.event_data, XdrvMailbox.data, sizeof(Rules.event_data));
-  }
-  ResponseCmndDone();
-}
-
-void CmndVariable(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (!XdrvMailbox.usridx) {
-      mqtt_data[0] = '\0';
-      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-        ResponseAppend_P(PSTR("%c\"Var%d\":\"%s\""), (i) ? ',' : '{', i +1, rules_vars[i]);
-      }
-      ResponseJsonEnd();
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-        if (XdrvMailbox.data[0] == '=') {
-          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-        } else {
-          strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
-        }
-#else
-        strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
-#endif
-        bitSet(Rules.vars_event, XdrvMailbox.index -1);
-      }
-      ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-    }
-  }
-}
-
-void CmndMemory(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_MEMS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_MEM1, MAX_RULE_MEMS);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-        if (XdrvMailbox.data[0] == '=') {
-          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, SettingsText(SET_MEM1 + XdrvMailbox.index -1));
-        } else {
-          SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-        }
-#else
-        SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-#endif
-        bitSet(Rules.mems_event, XdrvMailbox.index -1);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_MEM1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndCalcResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
-    Settings.flag2.calc_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.calc_resolution);
-}
-
-void CmndAddition(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) + CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndSubtract(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) - CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndMultiply(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) * CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndScale(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len +1];
-
-        float valueIN = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        float fromLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        float fromHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        float toLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4));
-        float toHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 5));
-        float value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
-        dtostrfd(value, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-        bitSet(Rules.vars_event, XdrvMailbox.index -1);
-      }
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-float map_double(float x, float in_min, float in_max, float out_min, float out_max)
-{
-  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-}
-
-
-
-
-
-bool Xdrv10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_50_MSECOND:
-      RulesEvery50ms();
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      RulesEvery100ms();
-      break;
-    case FUNC_EVERY_SECOND:
-      RulesEverySecond();
-      break;
-    case FUNC_SET_POWER:
-      RulesSetPower();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kRulesCommands, RulesCommand);
-      break;
-    case FUNC_RULES_PROCESS:
-      result = RulesProcess();
-      break;
-    case FUNC_SAVE_BEFORE_RESTART:
-      RulesSaveBeforeRestart();
-      break;
-#ifdef SUPPORT_MQTT_EVENT
-    case FUNC_MQTT_DATA:
-      result = RulesMqttData();
-      break;
-#endif
-    case FUNC_PRE_INIT:
-      RulesInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-#ifdef USE_SCRIPT
-#ifndef USE_RULES
-# 40 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-#define XDRV_10 10
-#define XI2C_37 37
-
-#define SCRIPT_DEBUG 0
-
-
-#ifndef MAXVARS
-#define MAXVARS 50
-#endif
-#ifndef MAXSVARS
-#define MAXSVARS 5
-#endif
-#define MAXNVARS MAXVARS-MAXSVARS
-
-#define MAXFILT 5
-#define SCRIPT_SVARSIZE 20
-#define SCRIPT_MAXSSIZE 48
-#define SCRIPT_EOL '\n'
-#define SCRIPT_FLOAT_PRECISION 2
-#define PMEM_SIZE sizeof(Settings.script_pram)
-#define SCRIPT_MAXPERM (PMEM_SIZE)-4/sizeof(float)
-#define MAX_SCRIPT_SIZE MAX_RULE_SIZE*MAX_RULE_SETS
-
-
-#define EPOCH_OFFSET 1546300800
-
-enum {OPER_EQU=1,OPER_PLS,OPER_MIN,OPER_MUL,OPER_DIV,OPER_PLSEQU,OPER_MINEQU,OPER_MULEQU,OPER_DIVEQU,OPER_EQUEQU,OPER_NOTEQU,OPER_GRTEQU,OPER_LOWEQU,OPER_GRT,OPER_LOW,OPER_PERC,OPER_XOR,OPER_AND,OPER_OR,OPER_ANDEQU,OPER_OREQU,OPER_XOREQU,OPER_PERCEQU};
-enum {SCRIPT_LOGLEVEL=1,SCRIPT_TELEPERIOD};
-
-#ifdef USE_SCRIPT_FATFS
-#include <SPI.h>
-#include <SD.h>
-#ifndef FAT_SCRIPT_SIZE
-#define FAT_SCRIPT_SIZE 4096
-#endif
-#define FAT_SCRIPT_NAME "script.txt"
-#if USE_LONG_FILE_NAMES==1
-#warning ("FATFS long filenames not supported");
-#endif
-#if USE_STANDARD_SPI_LIBRARY==0
-#warning ("FATFS standard spi should be used");
-#endif
-#endif
-
-#ifdef SUPPORT_MQTT_EVENT
-  #include <LinkedList.h>
-  typedef struct {
-    String Event;
-    String Topic;
-    String Key;
-  } MQTT_Subscription;
-  LinkedList<MQTT_Subscription> subscriptions;
-#endif
-
-#ifdef USE_DISPLAY
-#ifdef USE_TOUCH_BUTTONS
-#include <renderer.h>
-extern VButton *buttons[MAXBUTTONS];
-#endif
-#endif
-
-typedef union {
-  uint8_t data;
-  struct {
-    uint8_t is_string : 1;
-    uint8_t is_permanent : 1;
-    uint8_t is_timer : 1;
-    uint8_t is_autoinc : 1;
-    uint8_t changed : 1;
-    uint8_t settable : 1;
-    uint8_t is_filter : 1;
-    uint8_t constant : 1;
-  };
-} SCRIPT_TYPE;
-
-struct T_INDEX {
-  uint8_t index;
-  SCRIPT_TYPE bits;
-};
-
-struct M_FILT {
-  uint8_t numvals;
-  uint8_t index;
-  float maccu;
-  float rbuff[1];
-};
-
-typedef union {
-  uint8_t data;
-  struct {
-      uint8_t nutu8 : 1;
-      uint8_t nutu7 : 1;
-      uint8_t nutu6 : 1;
-      uint8_t nutu5 : 1;
-      uint8_t nutu4 : 1;
-      uint8_t nutu3 : 1;
-      uint8_t is_dir : 1;
-      uint8_t is_open : 1;
-  };
-} FILE_FLAGS;
-
-#define SFS_MAX 4
-
-struct SCRIPT_MEM {
-    float *fvars;
-    float *s_fvars;
-    struct T_INDEX *type;
-    struct M_FILT *mfilt;
-    char *glob_vnp;
-    uint8_t *vnp_offset;
-    char *glob_snp;
-    char *scriptptr;
-    char *section_ptr;
-    char *scriptptr_bu;
-    char *script_ram;
-    uint16_t script_size;
-    uint8_t *script_pram;
-    uint16_t script_pram_size;
-    uint8_t numvars;
-    void *script_mem;
-    uint16_t script_mem_size;
-    uint8_t script_dprec;
-    uint8_t var_not_found;
-    uint8_t glob_error;
-    uint8_t max_ssize;
-    uint8_t script_loglevel;
-    uint8_t flags;
-#ifdef USE_SCRIPT_FATFS
-    File files[SFS_MAX];
-    FILE_FLAGS file_flags[SFS_MAX];
-    uint8_t script_sd_found;
-    char flink[2][14];
-#endif
-} glob_script_mem;
-
-
-int16_t last_findex;
-uint8_t tasm_cmd_activ=0;
-uint8_t fast_script=0;
-uint32_t script_lastmillis;
-
-
-#ifdef USE_BUTTON_EVENT
-int8_t script_button[MAX_KEYS];
-#endif
-
-char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo);
-char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo);
-char *ForceStringVar(char *lp,char *dstr);
-void send_download(void);
-uint8_t reject(char *name);
-
-void ScriptEverySecond(void) {
-
-  if (bitRead(Settings.rule_enabled, 0)) {
-    struct T_INDEX *vtp=glob_script_mem.type;
-    float delta=(millis()-script_lastmillis)/1000;
-    script_lastmillis=millis();
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_timer) {
-
-        float *fp=&glob_script_mem.fvars[vtp[count].index];
-        if (*fp>0) {
-
-          *fp-=delta;
-          if (*fp<0) *fp=0;
-        }
-      }
-      if (vtp[count].bits.is_autoinc) {
-
-        float *fp=&glob_script_mem.fvars[vtp[count].index];
-        if (*fp>=0) {
-          *fp+=delta;
-        }
-      }
-    }
-    Run_Scripter(">S",2,0);
-  }
-}
-
-void RulesTeleperiod(void) {
-  if (bitRead(Settings.rule_enabled, 0) && mqtt_data[0]) Run_Scripter(">T",2, mqtt_data);
-}
-
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-
-#include <Eeprom24C128_256.h>
-#define EEPROM_ADDRESS 0x50
-
-#ifndef EEP_SCRIPT_SIZE
-#define EEP_SCRIPT_SIZE 4095
-#endif
-
-
-static Eeprom24C128_256 eeprom(EEPROM_ADDRESS);
-
-#define EEP_WRITE(A,B,C) eeprom.writeBytes(A,B,(uint8_t*)C);
-
-#define EEP_READ(A,B,C) eeprom.readBytes(A,B,(uint8_t*)C);
-#endif
-#endif
-
-#define SCRIPT_SKIP_SPACES while (*lp==' ' || *lp=='\t') lp++;
-#define SCRIPT_SKIP_EOL while (*lp==SCRIPT_EOL) lp++;
-
-
-int16_t Init_Scripter(void) {
-char *script;
-
-    script=glob_script_mem.script_ram;
-
-
-    uint16_t lines=0,nvars=0,svars=0,vars=0;
-    char *lp=script;
-    char vnames[MAXVARS*10];
-    char *vnames_p=vnames;
-    char *vnp[MAXVARS];
-    char **vnp_p=vnp;
-    char strings[MAXSVARS*SCRIPT_MAXSSIZE];
-    struct M_FILT mfilt[MAXFILT];
-
-    char *strings_p=strings;
-    char *snp[MAXSVARS];
-    char **snp_p=snp;
-    uint8_t numperm=0,numflt=0,count;
-
-    glob_script_mem.max_ssize=SCRIPT_SVARSIZE;
-    glob_script_mem.scriptptr=0;
-
-    if (!*script) return -999;
-
-    float fvalues[MAXVARS];
-    struct T_INDEX vtypes[MAXVARS];
-    char init=0;
-    while (1) {
-
-
-        SCRIPT_SKIP_SPACES
-
-        if (*lp=='\n' || *lp=='\r') goto next_line;
-
-        if (*lp==';') goto next_line;
-        if (init) {
-
-            if (*lp=='>') {
-                init=0;
-                break;
-            }
-            char *op=strchr(lp,'=');
-            if (op) {
-                vtypes[vars].bits.data=0;
-
-                if (*lp=='p' && *(lp+1)==':') {
-                    lp+=2;
-                    if (numperm<SCRIPT_MAXPERM) {
-                      vtypes[vars].bits.is_permanent=1;
-                      numperm++;
-                    }
-                } else {
-                    vtypes[vars].bits.is_permanent=0;
-                }
-                if (*lp=='t' && *(lp+1)==':') {
-                    lp+=2;
-                    vtypes[vars].bits.is_timer=1;
-                } else {
-                    vtypes[vars].bits.is_timer=0;
-                }
-                if (*lp=='i' && *(lp+1)==':') {
-                    lp+=2;
-                    vtypes[vars].bits.is_autoinc=1;
-                } else {
-                    vtypes[vars].bits.is_autoinc=0;
-                }
-                if ((*lp=='m' || *lp=='M') && *(lp+1)==':') {
-                    uint8_t flg=*lp;
-                    lp+=2;
-                    if (flg=='M') mfilt[numflt].numvals=8;
-                    else mfilt[numflt].numvals=5;
-                    vtypes[vars].bits.is_filter=1;
-                    mfilt[numflt].index=0;
-                    if (flg=='M') {
-                      mfilt[numflt].numvals|=0x80;
-                    }
-                    vtypes[vars].index=numflt;
-                    numflt++;
-                    if (numflt>MAXFILT) {
-                      return -6;
-                    }
-                } else {
-                    vtypes[vars].bits.is_filter=0;
-                }
-                *vnp_p++=vnames_p;
-                while (lp<op) {
-                    *vnames_p++=*lp++;
-                }
-                *vnames_p++=0;
-
-                op++;
-                if (*op!='"') {
-                    float fv;
-                    if (*op=='0' && *(op+1)=='x') {
-                      op+=2;
-                      fv=strtol(op,&op,16);
-                    } else {
-                      fv=CharToFloat(op);
-                    }
-                    fvalues[nvars]=fv;
-                    vtypes[vars].bits.is_string=0;
-                    if (!vtypes[vars].bits.is_filter) vtypes[vars].index=nvars;
-                    nvars++;
-                    if (nvars>MAXNVARS) {
-                      return -1;
-                    }
-                    if (vtypes[vars].bits.is_filter) {
-                      while (isdigit(*op) || *op=='.' || *op=='-') {
-                        op++;
-                      }
-                      while (*op==' ') op++;
-                      if (isdigit(*op)) {
-
-                        uint8_t flen=atoi(op);
-                        mfilt[numflt-1].numvals&=0x80;
-                        mfilt[numflt-1].numvals|=flen&0x7f;
-                      }
-                    }
-
-                } else {
-
-                    op++;
-                    *snp_p++=strings_p;
-                    while (*op!='\"') {
-                      if (*op==SCRIPT_EOL) break;
-                      *strings_p++=*op++;
-                    }
-                    *strings_p++=0;
-                    vtypes[vars].bits.is_string=1;
-                    vtypes[vars].index=svars;
-                    svars++;
-                    if (svars>MAXSVARS) {
-                      return -2;
-                    }
-                }
-                vars++;
-                if (vars>MAXVARS) {
-                  return -3;
-                }
-            }
-        } else {
-            if (!strncmp(lp,">D",2)) {
-              lp+=2;
-              SCRIPT_SKIP_SPACES
-              if (isdigit(*lp)) {
-                uint8_t ssize=atoi(lp)+1;
-                if (ssize<10 || ssize>SCRIPT_MAXSSIZE) ssize=SCRIPT_MAXSSIZE;
-                glob_script_mem.max_ssize=ssize;
-              }
-              init=1;
-            }
-        }
-
-    next_line:
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-    }
-
-    uint16_t fsize=0;
-    for (count=0; count<numflt; count++) {
-      fsize+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
-    }
-
-
-    uint16_t script_mem_size=
-
-    (sizeof(float)*nvars)+
-    (sizeof(float)*nvars)+
-
-    (vnames_p-vnames)+
-
-    (sizeof(uint8_t)*vars)+
-
-    (glob_script_mem.max_ssize*svars)+
-
-    (sizeof(struct T_INDEX)*vars)+
-    fsize;
-
-    script_mem_size+=16;
-    uint8_t *script_mem;
-    script_mem=(uint8_t*)calloc(script_mem_size,1);
-    if (!script_mem) {
-      return -4;
-    }
-    glob_script_mem.script_mem=script_mem;
-    glob_script_mem.script_mem_size=script_mem_size;
-
-
-
-    glob_script_mem.fvars=(float*)script_mem;
-    uint16_t size=sizeof(float)*nvars;
-    memcpy(script_mem,fvalues,size);
-    script_mem+=size;
-    glob_script_mem.s_fvars=(float*)script_mem;
-    size=sizeof(float)*nvars;
-    memcpy(script_mem,fvalues,size);
-    script_mem+=size;
-
-    glob_script_mem.mfilt=(struct M_FILT*)script_mem;
-    script_mem+=fsize;
-
-
-    glob_script_mem.type=(struct T_INDEX*)script_mem;
-    size=sizeof(struct T_INDEX)*vars;
-    memcpy(script_mem,vtypes,size);
-    script_mem+=size;
-
-
-    char *namep=(char*)script_mem;
-    glob_script_mem.glob_vnp=(char*)script_mem;
-    size=vnames_p-vnames;
-    memcpy(script_mem,vnames,size);
-    script_mem+=size;
-
-    glob_script_mem.vnp_offset=(uint8_t*)script_mem;
-    size=vars*sizeof(uint8_t);
-    script_mem+=size;
-
-
-    char *snamep=(char*)script_mem;
-    glob_script_mem.glob_snp=(char*)script_mem;
-    size=glob_script_mem.max_ssize*svars;
-
-    script_mem+=size;
-
-
-    uint16_t index=0;
-    uint8_t *cp=glob_script_mem.vnp_offset;
-    for (count=0;count<vars;count++) {
-        *cp++=index;
-        while (*namep) {
-            index++;
-            namep++;
-        }
-        namep++;
-        index++;
-        if (index>255) {
-          free(glob_script_mem.script_mem);
-          return -5;
-        }
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Script: nv=%d, tv=%d, vns=%d, ram=%d"), nvars, svars, index, glob_script_mem.script_mem_size);
-
-
-    char *cp1=glob_script_mem.glob_snp;
-    char *sp=strings;
-    for (count=0; count<svars;count++) {
-        strcpy(cp1,sp);
-        sp+=strlen(sp)+1;
-        cp1+=glob_script_mem.max_ssize;
-    }
-
-
-    uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-    for (count=0; count<numflt; count++) {
-      struct M_FILT *mflp=(struct M_FILT*)mp;
-      mflp->numvals=mfilt[count].numvals;
-      mp+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
-    }
-
-    glob_script_mem.numvars=vars;
-    glob_script_mem.script_dprec=SCRIPT_FLOAT_PRECISION;
-    glob_script_mem.script_loglevel=LOG_LEVEL_INFO;
-
-
-#if SCRIPT_DEBUG>2
-    struct T_INDEX *dvtp=glob_script_mem.type;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (dvtp[count].bits.is_string) {
-
-      } else {
-        char string[32];
-        dtostrfd(glob_script_mem.fvars[dvtp[count].index],glob_script_mem.script_dprec,string);
-        toLog(string);
-      }
-    }
-#endif
-
-
-    float *fp=(float*)glob_script_mem.script_pram;
-    struct T_INDEX *vtp=glob_script_mem.type;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
-        uint8_t index=vtp[count].index;
-        if (!isnan(*fp)) {
-          glob_script_mem.fvars[index]=*fp;
-        } else {
-          *fp=glob_script_mem.fvars[index];
-        }
-        fp++;
-      }
-    }
-    sp=(char*)fp;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
-        uint8_t index=vtp[count].index;
-        char *dp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
-        uint8_t slen=strlen(sp);
-        strlcpy(dp,sp,glob_script_mem.max_ssize);
-        sp+=slen+1;
-      }
-    }
-
-
-#ifdef USE_SCRIPT_FATFS
-    if (!glob_script_mem.script_sd_found) {
-      if (SD.begin(USE_SCRIPT_FATFS)) {
-        glob_script_mem.script_sd_found=1;
-      } else {
-        glob_script_mem.script_sd_found=0;
-      }
-    }
-    for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
-      glob_script_mem.file_flags[cnt].is_open=0;
-    }
-#endif
-
-#if SCRIPT_DEBUG>0
-    ClaimSerial();
-    SetSerialBaudrate(9600);
-#endif
-
-
-    glob_script_mem.scriptptr=lp-1;
-    glob_script_mem.scriptptr_bu=glob_script_mem.scriptptr;
-    return 0;
-
-}
-
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-void ws2812_set_array(float *array ,uint8_t len) {
-
-  Ws2812ForceSuspend();
-  for (uint8_t cnt=0;cnt<len;cnt++) {
-    if (cnt>Settings.light_pixels) break;
-    uint32_t col=array[cnt];
-    Ws2812SetColor(cnt+1,col>>16,col>>8,col,0);
-  }
-  Ws2812ForceUpdate();
-}
-#endif
-#endif
-
-#define NUM_RES 0xfe
-#define STR_RES 0xfd
-#define VAR_NV 0xff
-
-#define NTYPE 0
-#define STYPE 0x80
-
-#ifndef FLT_MAX
-#define FLT_MAX 99999999
-#endif
-
-float median_array(float *array,uint8_t len) {
-    uint8_t ind[len];
-    uint8_t mind=0,index=0,flg;
-    float min=FLT_MAX;
-
-    for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
-        for (uint8_t mcnt=0; mcnt<len; mcnt++) {
-            flg=0;
-            for (uint8_t icnt=0; icnt<index; icnt++) {
-                if (ind[icnt]==mcnt) {
-                    flg=1;
-                }
-            }
-            if (!flg) {
-                if (array[mcnt]<min) {
-                    min=array[mcnt];
-                    mind=mcnt;
-                }
-            }
-        }
-        ind[index]=mind;
-        index++;
-        min=FLT_MAX;
-    }
-    return array[ind[len/2]];
-}
-
-
-float *Get_MFAddr(uint8_t index,uint8_t *len) {
-  *len=0;
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        *len=mflp->numvals&0x7f;
-        return mflp->rbuff;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-
-float Get_MFVal(uint8_t index,uint8_t bind) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        uint8_t maxind=mflp->numvals&0x7f;
-        if (!bind) {
-          return mflp->index;
-        }
-        if (bind<1 || bind>maxind) bind=maxind;
-        return mflp->rbuff[bind-1];
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-void Set_MFVal(uint8_t index,uint8_t bind,float val) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        uint8_t maxind=mflp->numvals&0x7f;
-        if (!bind) {
-          mflp->index=val;
-        } else {
-          if (bind<1 || bind>maxind) bind=maxind;
-          mflp->rbuff[bind-1]=val;
-        }
-        return;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-}
-
-
-float Get_MFilter(uint8_t index) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-      if (mflp->numvals&0x80) {
-
-        return mflp->maccu/(mflp->numvals&0x7f);
-      } else {
-
-        return median_array(mflp->rbuff,mflp->numvals);
-      }
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-void Set_MFilter(uint8_t index, float invar) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-      if (mflp->numvals&0x80) {
-
-        mflp->maccu-=mflp->rbuff[mflp->index];
-        mflp->maccu+=invar;
-        mflp->rbuff[mflp->index]=invar;
-        mflp->index++;
-        if (mflp->index>=(mflp->numvals&0x7f)) mflp->index=0;
-      } else {
-
-        mflp->rbuff[mflp->index]=invar;
-        mflp->index++;
-        if (mflp->index>=mflp->numvals) mflp->index=0;
-      }
-      break;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-}
-
-#define MEDIAN_SIZE 5
-#define MEDIAN_FILTER_NUM 2
-
-struct MEDIAN_FILTER {
-float buffer[MEDIAN_SIZE];
-int8_t index;
-} script_mf[MEDIAN_FILTER_NUM];
-
-float DoMedian5(uint8_t index, float in) {
-
-  if (index>=MEDIAN_FILTER_NUM) index=0;
-
-  struct MEDIAN_FILTER* mf=&script_mf[index];
-  mf->buffer[mf->index]=in;
-  mf->index++;
-  if (mf->index>=MEDIAN_SIZE) mf->index=0;
-  return median_array(mf->buffer,MEDIAN_SIZE);
-}
-
-#ifdef USE_LIGHT
-
-uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
-float r = 0, g = 0, b = 0;
-struct HSV {
- float H;
- float S;
- float V;
-} hsv;
-
-hsv.H=hue;
-hsv.S=(float)saturation/100.0;
-hsv.V=(float)value/100.0;
-
-if (hsv.S == 0) {
-  r = hsv.V;
-  g = hsv.V;
-  b = hsv.V;
- } else {
-  int i;
-  float f, p, q, t;
-
-  if (hsv.H == 360)
-   hsv.H = 0;
-  else
-   hsv.H = hsv.H / 60;
-
-  i = (int)trunc(hsv.H);
-  f = hsv.H - i;
-
-  p = hsv.V * (1.0 - hsv.S);
-  q = hsv.V * (1.0 - (hsv.S * f));
-  t = hsv.V * (1.0 - (hsv.S * (1.0 - f)));
-
-  switch (i)
-  {
-  case 0:
-   r = hsv.V;
-   g = t;
-   b = p;
-   break;
-
-  case 1:
-   r = q;
-   g = hsv.V;
-   b = p;
-   break;
-
-  case 2:
-   r = p;
-   g = hsv.V;
-   b = t;
-   break;
-
-  case 3:
-   r = p;
-   g = q;
-   b = hsv.V;
-   break;
-
-  case 4:
-   r = t;
-   g = p;
-   b = hsv.V;
-   break;
-
-  default:
-   r = hsv.V;
-   g = p;
-   b = q;
-   break;
-  }
-
- }
-
-  uint8_t ir,ig,ib;
-  ir=r*255;
-  ig=g*255;
-  ib=b*255;
-
- uint32_t rgb=(ir<<16)|(ig<<8)|ib;
- return rgb;
-}
-#endif
-
-
-
-
-char *isvar(char *lp, uint8_t *vtype,struct T_INDEX *tind,float *fp,char *sp,JsonObject *jo) {
-    uint16_t count,len=0;
-    uint8_t nres=0;
-    char vname[32];
-    float fvar=0;
-    tind->index=0;
-    tind->bits.data=0;
-
-    if (isdigit(*lp) || (*lp=='-' && isdigit(*(lp+1))) || *lp=='.') {
-
-        if (fp) {
-          if (*lp=='0' && *(lp+1)=='x') {
-            lp+=2;
-            *fp=strtol(lp,0,16);
-          } else {
-            *fp=CharToFloat(lp);
-          }
-        }
-        if (*lp=='-') lp++;
-        while (isdigit(*lp) || *lp=='.') {
-          if (*lp==0 || *lp==SCRIPT_EOL) break;
-          lp++;
-        }
-        tind->bits.constant=1;
-        tind->bits.is_string=0;
-        *vtype=NUM_RES;
-        return lp;
-    }
-    if (*lp=='"') {
-      lp++;
-      while (*lp!='"') {
-        if (*lp==0 || *lp==SCRIPT_EOL) break;
-        uint8_t iob=*lp;
-        if (iob=='\\') {
-          lp++;
-          if (*lp=='t') {
-            iob='\t';
-          } else if (*lp=='n') {
-            iob='\n';
-          } else if (*lp=='r') {
-            iob='\r';
-          } else if (*lp=='\\') {
-            iob='\\';
-          } else {
-            lp--;
-          }
-          if (sp) *sp++=iob;
-        } else {
-          if (sp) *sp++=iob;
-        }
-        lp++;
-      }
-      if (sp) *sp=0;
-      *vtype=STR_RES;
-      tind->bits.constant=1;
-      tind->bits.is_string=1;
-      return lp+1;
-    }
-
-    if (*lp=='-') {
-
-      nres=1;
-      lp++;
-    }
-
-    const char *term="\n\r ])=+-/*%><!^&|}";
-    for (count=0; count<sizeof(vname); count++) {
-        char iob=lp[count];
-        if (!iob || strchr(term,iob)) {
-            vname[count]=0;
-            break;
-        }
-        vname[count]=iob;
-        len+=1;
-    }
-
-    if (!vname[0]) {
-
-      *vtype=VAR_NV;
-      tind->index=VAR_NV;
-      glob_script_mem.var_not_found=1;
-      return lp;
-    }
-
-    struct T_INDEX *vtp=glob_script_mem.type;
-    char dvnam[32];
-    strcpy (dvnam,vname);
-    uint8_t olen=len;
-    last_findex=-1;
-    char *ja=strchr(dvnam,'[');
-    if (ja) {
-      *ja=0;
-      ja++;
-      olen=strlen(dvnam);
-    }
-    for (count=0; count<glob_script_mem.numvars; count++) {
-        char *cp=glob_script_mem.glob_vnp+glob_script_mem.vnp_offset[count];
-        uint8_t slen=strlen(cp);
-        if (slen==olen && *cp==dvnam[0]) {
-            if (!strncmp(cp,dvnam,olen)) {
-                uint8_t index=vtp[count].index;
-                *tind=vtp[count];
-                tind->index=count;
-                if (vtp[count].bits.is_string==0) {
-                    *vtype=NTYPE|index;
-                    if (vtp[count].bits.is_filter) {
-                      if (ja) {
-                        lp+=olen+1;
-                        lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-                        last_findex=fvar;
-                        fvar=Get_MFVal(index,fvar);
-                        len=1;
-                      } else {
-                        fvar=Get_MFilter(index);
-                      }
-                    } else {
-                      fvar=glob_script_mem.fvars[index];
-                    }
-                    if (nres) fvar=-fvar;
-                    if (fp) *fp=fvar;
-                } else {
-                    *vtype=STYPE|index;
-                    if (sp) strlcpy(sp,glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize),SCRIPT_MAXSSIZE);
-                }
-                return lp+len;
-            }
-        }
-    }
-
-    if (jo) {
-
-      const char* str_value;
-      uint8_t aindex;
-      String vn;
-      char *ja=strchr(vname,'[');
-      if (ja) {
-
-        *ja=0;
-        ja++;
-
-        float fvar;
-        GetNumericResult(ja,OPER_EQU,&fvar,0);
-        aindex=fvar;
-        if (aindex<1 || aindex>6) aindex=1;
-        aindex--;
-      }
-      if (jo->success()) {
-        char *subtype=strchr(vname,'#');
-        char *subtype2;
-        if (subtype) {
-          *subtype=0;
-          subtype++;
-          subtype2=strchr(subtype,'#');
-          if (subtype2) {
-            *subtype2=0;
-            *subtype2++;
-          }
-        }
-        vn=vname;
-        str_value = (*jo)[vn];
-        if ((*jo)[vn].success()) {
-          if (subtype) {
-            JsonObject &jobj1=(*jo)[vn];
-            if (jobj1.success()) {
-              vn=subtype;
-              jo=&jobj1;
-              str_value = (*jo)[vn];
-              if ((*jo)[vn].success()) {
-
-                if (subtype2) {
-                  JsonObject &jobj2=(*jo)[vn];
-                  if ((*jo)[vn].success()) {
-                    vn=subtype2;
-                    jo=&jobj2;
-                    str_value = (*jo)[vn];
-                    if ((*jo)[vn].success()) {
-                      goto skip;
-                    } else {
-                      goto chknext;
-                    }
-                  } else {
-                    goto chknext;
-                  }
-                }
-
-                goto skip;
-              }
-            } else {
-              goto chknext;
-            }
-          }
-          skip:
-          if (ja) {
-
-            str_value = (*jo)[vn][aindex];
-          }
-          if (str_value && *str_value) {
-            if ((*jo).is<char*>(vn)) {
-              if (!strncmp(str_value,"ON",2)) {
-                if (fp) *fp=1;
-                goto nexit;
-              } else if (!strncmp(str_value,"OFF",3)) {
-                if (fp) *fp=0;
-                goto nexit;
-              } else {
-                *vtype=STR_RES;
-                tind->bits.constant=1;
-                tind->bits.is_string=1;
-                if (sp) strlcpy(sp,str_value,SCRIPT_MAXSSIZE);
-                return lp+len;
-              }
-
-            } else {
-              if (fp) {
-                if (!strncmp(vn.c_str(),"Epoch",5)) {
-                  *fp=atoi(str_value)-(uint32_t)EPOCH_OFFSET;
-                } else {
-                  *fp=CharToFloat((char*)str_value);
-                }
-              }
-              nexit:
-              *vtype=NUM_RES;
-              tind->bits.constant=1;
-              tind->bits.is_string=0;
-              return lp+len;
-            }
-          }
-        }
-      }
-    }
-
-chknext:
-    switch (vname[0]) {
-      case 'a':
-#ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname,"acos(",5)) {
-            lp+=5;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-            fvar=acosf(fvar);
-            lp++;
-            len=0;
-            goto exit;
-        }
-#endif
-        break;
-
-      case 'b':
-        if (!strncmp(vname,"boot",4)) {
-          if (rules_flag.system_boot) {
-            rules_flag.system_boot=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-#ifdef USE_BUTTON_EVENT
-        if (!strncmp(vname,"bt[",3)) {
-
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint32_t index=fvar;
-          if (index<1 || index>MAX_KEYS) index=1;
-          fvar=script_button[index-1];
-          script_button[index-1]|=0x80;
-          len++;
-          goto exit;
-        }
-#endif
-        break;
-      case 'c':
-        if (!strncmp(vname,"chg[",4)) {
-
-          struct T_INDEX ind;
-          uint8_t vtype;
-          isvar(vname+4,&vtype,&ind,0,0,0);
-          if (!ind.bits.constant) {
-            uint8_t index=glob_script_mem.type[ind.index].index;
-            if (glob_script_mem.fvars[index]!=glob_script_mem.s_fvars[index]) {
-
-              glob_script_mem.s_fvars[index]=glob_script_mem.fvars[index];
-              fvar=1;
-              len++;
-              goto exit;
-            } else {
-              fvar=0;
-              len++;
-              goto exit;
-            }
-          }
-        }
-        break;
-      case 'd':
-        if (!strncmp(vname,"day",3)) {
-          fvar=RtcTime.day_of_month;
-          goto exit;
-        }
-        break;
-      case 'e':
-        if (!strncmp(vname,"epoch",5)) {
-          fvar=UtcTime()-(uint32_t)EPOCH_OFFSET;
-          goto exit;
-        }
-        break;
-#ifdef USE_SCRIPT_FATFS
-      case 'f':
-        if (!strncmp(vname,"fo(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t mode=fvar;
-          fvar=-1;
-          for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
-            if (!glob_script_mem.file_flags[cnt].is_open) {
-              if (mode==0) {
-                glob_script_mem.files[cnt]=SD.open(str,FILE_READ);
-                if (glob_script_mem.files[cnt].isDirectory()) {
-                  glob_script_mem.files[cnt].rewindDirectory();
-                  glob_script_mem.file_flags[cnt].is_dir=1;
-                } else {
-                  glob_script_mem.file_flags[cnt].is_dir=0;
-                }
-              }
-              else glob_script_mem.files[cnt]=SD.open(str,FILE_WRITE);
-              if (glob_script_mem.files[cnt]) {
-                fvar=cnt;
-                glob_script_mem.file_flags[cnt].is_open=1;
-              } else {
-                AddLog_P(LOG_LEVEL_INFO,PSTR("file open failed"));
-              }
-              break;
-            }
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fc(",3)) {
-          lp+=3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          glob_script_mem.files[ind].close();
-          glob_script_mem.file_flags[ind].is_open=0;
-          fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"ff(",3)) {
-          lp+=3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          glob_script_mem.files[ind].flush();
-          fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fw(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=ForceStringVar(lp,str);
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          if (glob_script_mem.file_flags[ind].is_open) {
-            fvar=glob_script_mem.files[ind].print(str);
-          } else {
-            fvar=0;
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fr(",3)) {
-          lp+=3;
-          struct T_INDEX ind;
-          uint8_t vtype;
-          uint8_t sindex=0;
-          lp=isvar(lp,&vtype,&ind,0,0,0);
-          if (vtype!=VAR_NV) {
-
-            if ((vtype&STYPE)==0) {
-
-                  fvar=0;
-                  goto exit;
-            } else {
-
-              sindex=glob_script_mem.type[ind.index].index;
-            }
-          } else {
-
-              fvar=0;
-              goto exit;
-          }
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t find=fvar;
-          if (find>=SFS_MAX) find=SFS_MAX-1;
-          uint8_t index=0;
-          char str[glob_script_mem.max_ssize+1];
-          char *cp=str;
-          if (glob_script_mem.file_flags[find].is_open) {
-            if (glob_script_mem.file_flags[find].is_dir) {
-              while (true) {
-                File entry=glob_script_mem.files[find].openNextFile();
-                if (entry) {
-                  if (!reject((char*)entry.name())) {
-                    strcpy(str,entry.name());
-                    entry.close();
-                    break;
-                  }
-                } else {
-                  *cp=0;
-                  break;
-                }
-                entry.close();
-              }
-              index=strlen(str);
-            } else {
-              while (glob_script_mem.files[find].available()) {
-                uint8_t buf[1];
-                glob_script_mem.files[find].read(buf,1);
-                if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
-                  break;
-                } else {
-                  *cp++=buf[0];
-                  index++;
-                  if (index>=glob_script_mem.max_ssize-1) break;
-                }
-              }
-              *cp=0;
-            }
-          } else {
-            strcpy(str,"file error");
-          }
-          lp++;
-          strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-          fvar=index;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fd(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          SD.remove(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-#ifdef USE_SCRIPT_FATFS_EXT
-        if (!strncmp(vname,"fe(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-
-          File ef=SD.open(str);
-          if (ef) {
-            uint16_t fsiz=ef.size();
-            if (fsiz<2048) {
-              char *script=(char*)calloc(fsiz+16,1);
-              if (script) {
-                ef.read((uint8_t*)script,fsiz);
-                execute_script(script);
-                free(script);
-                fvar=1;
-              }
-            }
-            ef.close();
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fmd(",4)) {
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          fvar=SD.mkdir(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"frd(",4)) {
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          fvar=SD.rmdir(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fx(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          if (SD.exists(str)) fvar=1;
-          else fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-#endif
-        if (!strncmp(vname,"fl1(",4) || !strncmp(vname,"fl2(",4) ) {
-          uint8_t lknum=*(lp+2)&3;
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          if (lknum<1 || lknum>2) lknum=1;
-          strlcpy(glob_script_mem.flink[lknum-1],str,14);
-          lp++;
-          fvar=0;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fsm",3)) {
-          fvar=glob_script_mem.script_sd_found;
-
-          goto exit;
-        }
-        break;
-
-#endif
-      case 'g':
-        if (!strncmp(vname,"gtmp",4)) {
-          fvar=global_temperature;
-          goto exit;
-        }
-        if (!strncmp(vname,"ghum",4)) {
-          fvar=global_humidity;
-          goto exit;
-        }
-        if (!strncmp(vname,"gprs",4)) {
-          fvar=global_pressure;
-          goto exit;
-        }
-        if (!strncmp(vname,"gtopic",6)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTT_GRP_TOPIC),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        break;
-      case 'h':
-        if (!strncmp(vname,"hours",5)) {
-          fvar=RtcTime.hour;
-          goto exit;
-        }
-        if (!strncmp(vname,"heap",4)) {
-          fvar=ESP.getFreeHeap();
-          goto exit;
-        }
-        if (!strncmp(vname,"hn(",3)) {
-          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
-          if (fvar<0 || fvar>255) fvar=0;
-          lp++;
-          len=0;
-          if (sp) {
-            sprintf(sp,"%02x",(uint8_t)fvar);
-          }
-          goto strexit;
-        }
-        if (!strncmp(vname,"hx(",3)) {
-          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
-          lp++;
-          len=0;
-          if (sp) {
-            sprintf(sp,"%08x",(uint32_t)fvar);
-          }
-          goto strexit;
-        }
-#ifdef USE_LIGHT
-
-        if (!strncmp(vname,"hsvrgb(",7)) {
-          lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0);
-          if (fvar<0 || fvar>360) fvar=0;
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          if (fvar2<0 || fvar2>100) fvar2=0;
-          SCRIPT_SKIP_SPACES
-
-          float fvar3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
-          if (fvar3<0 || fvar3>100) fvar3=0;
-
-          fvar=HSVToRGB(fvar,fvar2,fvar3);
-
-          lp++;
-          len=0;
-          goto exit;
-        }
-
-#endif
-        break;
-      case 'i':
-        if (!strncmp(vname,"int(",4)) {
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar,0);
-          fvar=floor(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        break;
-      case 'l':
-        if (!strncmp(vname,"loglvl",6)) {
-          fvar=glob_script_mem.script_loglevel;
-          tind->index=SCRIPT_LOGLEVEL;
-  exit_settable:
-          if (fp) *fp=fvar;
-          *vtype=NTYPE;
-          tind->bits.settable=1;
-          tind->bits.is_string=0;
-          return lp+len;
-        }
-        break;
-      case 'm':
-        if (!strncmp(vname,"med(",4)) {
-          float fvar1;
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          fvar=DoMedian5(fvar1,fvar2);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"micros",6)) {
-          fvar=micros();
-          goto exit;
-        }
-        if (!strncmp(vname,"millis",6)) {
-          fvar=millis();
-          goto exit;
-        }
-        if (!strncmp(vname,"mins",4)) {
-          fvar=RtcTime.minute;
-          goto exit;
-        }
-        if (!strncmp(vname,"month",5)) {
-          fvar=RtcTime.month;
-          goto exit;
-        }
-        if (!strncmp(vname,"mqttc",5)) {
-          if (rules_flag.mqtt_connected) {
-            rules_flag.mqtt_connected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"mqttd",5)) {
-          if (rules_flag.mqtt_disconnected) {
-            rules_flag.mqtt_disconnected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"mqtts",5)) {
-          fvar=!global_state.mqtt_down;
-          goto exit;
-        }
-        break;
-      case 'p':
-        if (!strncmp(vname,"pin[",4)) {
-
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          fvar=digitalRead((uint8_t)fvar);
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"pn[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          fvar=pin[(uint8_t)fvar];
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"pd[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint8_t gpiopin=fvar;
-          for (uint8_t i=0;i<GPIO_SENSOR_END;i++) {
-            if (pin[i]==gpiopin) {
-              fvar=i;
-
-              len++;
-              goto exit;
-            }
-          }
-          fvar=999;
-          goto exit;
-        }
-        if (!strncmp(vname,"prefix1",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX1),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"prefix2",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX2),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"prefix3",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX3),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"pow(",4)) {
-
-          float fvar1;
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          lp++;
-
-          fvar=FastPrecisePow(fvar1,fvar2);
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"pwr[",4)) {
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<=devices_present) {
-            fvar=bitRead(power,index-1);
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-        if (!strncmp(vname,"pc[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<1 || index>MAX_COUNTERS) index=1;
-          fvar=RtcSettings.pulse_counter[index-1];
-          len+=1;
-          goto exit;
-        }
-        break;
-
-      case 'r':
-        if (!strncmp(vname,"ram",3)) {
-          fvar=glob_script_mem.script_mem_size+(glob_script_mem.script_size)+(PMEM_SIZE);
-          goto exit;
-        }
-        break;
-      case 's':
-        if (!strncmp(vname,"secs",4)) {
-          fvar=RtcTime.second;
-          goto exit;
-        }
-        if (!strncmp(vname,"sw[",3)) {
-
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          fvar=SwitchLastState((uint32_t)fvar);
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"stack",5)) {
-          fvar=GetStack();
-          goto exit;
-        }
-        if (!strncmp(vname,"slen",4)) {
-          fvar=strlen(glob_script_mem.script_ram);
-          goto exit;
-        }
-        if (!strncmp(vname,"sl(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          lp++;
-          len=0;
-          fvar=strlen(str);
-          goto exit;
-        }
-        if (!strncmp(vname,"sb(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          SCRIPT_SKIP_SPACES
-          float fvar1;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          lp++;
-          len=0;
-          if (fvar1<0) {
-            fvar1=strlen(str)+fvar1;
-          }
-          memcpy(sp,&str[(uint8_t)fvar1],(uint8_t)fvar2);
-          sp[(uint8_t)fvar2] = '\0';
-          goto strexit;
-        }
-        if (!strncmp(vname,"st(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          while (*lp==' ') lp++;
-          char token[2];
-          token[0]=*lp++;
-          token[1]=0;
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-
-          lp++;
-          len=0;
-          if (sp) {
-
-            char *st=strtok(str,token);
-            if (!st) {
-              *sp=0;
-            } else {
-              for (uint8_t cnt=1; cnt<=fvar; cnt++) {
-                if (cnt==fvar) {
-                  strcpy(sp,st);
-                  break;
-                }
-                st=strtok(NULL,token);
-                if (!st) {
-                  *sp=0;
-                  break;
-                }
-              }
-            }
-          }
-          goto strexit;
-        }
-        if (!strncmp(vname,"s(",2)) {
-          lp+=2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          char str[glob_script_mem.max_ssize+1];
-          dtostrfd(fvar,glob_script_mem.script_dprec,str);
-          if (sp) strlcpy(sp,str,glob_script_mem.max_ssize);
-          lp++;
-          len=0;
-          goto strexit;
-        }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-        if (!strncmp(vname,"sunrise",7)) {
-          fvar=SunMinutes(0);
-          goto exit;
-        }
-        if (!strncmp(vname,"sunset",6)) {
-          fvar=SunMinutes(1);
-          goto exit;
-        }
-#endif
-
-#ifdef USE_SHUTTER
-        if (!strncmp(vname,"sht[",4)) {
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<=shutters_present) {
-            fvar=Settings.shutter_position[index-1];
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-#endif
-#ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname,"sin(",4)) {
-          lp+=4;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          fvar=sinf(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"sqrt(",5)) {
-          lp+=5;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          fvar=sqrtf(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-#endif
-#ifdef USE_SML_SCRIPT_CMD
-        if (!strncmp(vname,"sml(",4)) {
-          lp+=4;
-          float fvar1;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          SCRIPT_SKIP_SPACES
-          if (fvar2==0) {
-            float fvar3;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
-            fvar=SML_SetBaud(fvar1,fvar3);
-          } else {
-            char str[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,str,0);
-            fvar=SML_Write(fvar1,str);
-          }
-          lp++;
-          fvar=0;
-          len=0;
-          goto exit;
-        }
-#endif
-        break;
-      case 't':
-        if (!strncmp(vname,"time",4)) {
-          fvar=MinutesPastMidnight();
-          goto exit;
-        }
-        if (!strncmp(vname,"tper",4)) {
-          fvar=Settings.tele_period;
-          tind->index=SCRIPT_TELEPERIOD;
-          goto exit_settable;
-        }
-        if (!strncmp(vname,"tinit",5)) {
-          if (rules_flag.time_init) {
-            rules_flag.time_init=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"tset",4)) {
-          if (rules_flag.time_set) {
-            rules_flag.time_set=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"tstamp",6)) {
-          if (sp) strlcpy(sp,GetDateAndTime(DT_LOCAL).c_str(),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"topic",5)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTT_TOPIC),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-#ifdef USE_DISPLAY
-#ifdef USE_TOUCH_BUTTONS
-        if (!strncmp(vname,"tbut[",5)) {
-          GetNumericResult(vname+5,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<1 || index>MAXBUTTONS) index=1;
-          index--;
-          if (buttons[index]) {
-            fvar=buttons[index]->vpower&0x80;
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-
-#endif
-#endif
-        break;
-      case 'u':
-        if (!strncmp(vname,"uptime",6)) {
-          fvar=MinutesUptime();
-          goto exit;
-        }
-        if (!strncmp(vname,"upsecs",6)) {
-          fvar=uptime;
-          goto exit;
-        }
-        if (!strncmp(vname,"upd[",4)) {
-
-          struct T_INDEX ind;
-          uint8_t vtype;
-          isvar(vname+4,&vtype,&ind,0,0,0);
-          if (!ind.bits.constant) {
-            if (!ind.bits.changed) {
-              fvar=0;
-              len++;
-              goto exit;
-            } else {
-              glob_script_mem.type[ind.index].bits.changed=0;
-              fvar=1;
-              len++;
-              goto exit;
-            }
-          }
-          goto notfound;
-        }
-        break;
-
-      case 'w':
-        if (!strncmp(vname,"wday",4)) {
-          fvar=RtcTime.day_of_week;
-          goto exit;
-        }
-        if (!strncmp(vname,"wific",5)) {
-          if (rules_flag.wifi_connected) {
-            rules_flag.wifi_connected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"wifid",5)) {
-          if (rules_flag.wifi_disconnected) {
-            rules_flag.wifi_disconnected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"wifis",5)) {
-          fvar=!global_state.wifi_down;
-          goto exit;
-        }
-        break;
-      case 'y':
-        if (!strncmp(vname,"year",4)) {
-          fvar=RtcTime.year;
-          goto exit;
-        }
-        break;
-      default:
-        break;
-    }
-
-notfound:
-    if (fp) *fp=0;
-    *vtype=VAR_NV;
-    tind->index=VAR_NV;
-    glob_script_mem.var_not_found=1;
-    return lp;
-
-exit:
-    if (fp) *fp=fvar;
-    *vtype=NUM_RES;
-    tind->bits.constant=1;
-    tind->bits.is_string=0;
-    return lp+len;
-
-strexit:
-    *vtype=STYPE;
-    tind->bits.constant=1;
-    tind->bits.is_string=1;
-    return lp+len;
-}
-
-
-
-char *getop(char *lp, uint8_t *operand) {
-    switch (*lp) {
-        case '=':
-            if (*(lp+1)=='=') {
-                *operand=OPER_EQUEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_EQU;
-                return lp+1;
-            }
-            break;
-        case '+':
-            if (*(lp+1)=='=') {
-                *operand=OPER_PLSEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_PLS;
-                return lp+1;
-            }
-            break;
-        case '-':
-            if (*(lp+1)=='=') {
-                *operand=OPER_MINEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_MIN;
-                return lp+1;
-            }
-            break;
-        case '*':
-            if (*(lp+1)=='=') {
-                *operand=OPER_MULEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_MUL;
-                return lp+1;
-            }
-            break;
-        case '/':
-            if (*(lp+1)=='=') {
-                *operand=OPER_DIVEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_DIV;
-                return lp+1;
-            }
-            break;
-        case '!':
-            if (*(lp+1)=='=') {
-                *operand=OPER_NOTEQU;
-                return lp+2;
-            }
-            break;
-        case '>':
-            if (*(lp+1)=='=') {
-                *operand=OPER_GRTEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_GRT;
-                return lp+1;
-
-            }
-            break;
-        case '<':
-            if (*(lp+1)=='=') {
-                *operand=OPER_LOWEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_LOW;
-                return lp+1;
-            }
-            break;
-        case '%':
-            if (*(lp+1)=='=') {
-                *operand=OPER_PERCEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_PERC;
-                return lp+1;
-            }
-            break;
-        case '^':
-            if (*(lp+1)=='=') {
-                *operand=OPER_XOREQU;
-                return lp+2;
-            } else {
-                *operand=OPER_XOR;
-                return lp+1;
-            }
-            break;
-        case '&':
-            if (*(lp+1)=='=') {
-                *operand=OPER_ANDEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_AND;
-                return lp+1;
-            }
-            break;
-        case '|':
-            if (*(lp+1)=='=') {
-                *operand=OPER_OREQU;
-                return lp+2;
-            } else {
-                *operand=OPER_OR;
-                return lp+1;
-            }
-            break;
-    }
-    *operand=0;
-    return lp;
-}
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t g_cont;
-}
-uint16_t GetStack(void) {
-  register uint32_t *sp asm("a1");
-  return (4 * (sp - g_cont.stack));
-}
-
-#else
-extern "C" {
-#include <cont.h>
-  extern cont_t* g_pcont;
-}
-uint16_t GetStack(void) {
-  register uint32_t *sp asm("a1");
-  return (4 * (sp - g_pcont->stack));
-}
-#endif
-
-char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
-  uint8_t operand=0;
-  uint8_t vtype;
-  char *slp;
-  struct T_INDEX ind;
-  char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
-  while (1) {
-    lp=isvar(lp,&vtype,&ind,0,str1,jo);
-    if (vtype!=STR_RES && !(vtype&STYPE)) {
-
-      glob_script_mem.glob_error=1;
-      return lp;
-    }
-    switch (lastop) {
-        case OPER_EQU:
-          strlcpy(str,str1,sizeof(str));
-          break;
-        case OPER_PLS:
-          strncat(str,str1,sizeof(str));
-          break;
-    }
-    slp=lp;
-    lp=getop(lp,&operand);
-    switch (operand) {
-      case OPER_EQUEQU:
-      case OPER_NOTEQU:
-      case OPER_LOW:
-      case OPER_LOWEQU:
-      case OPER_GRT:
-      case OPER_GRTEQU:
-          lp=slp;
-          strcpy(cp,str);
-          return lp;
-          break;
-      default:
-          break;
-    }
-    lastop=operand;
-    if (!operand) {
-      strcpy(cp,str);
-      return lp;
-    }
-  }
-}
-
-char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo) {
-uint8_t operand=0;
-float fvar1,fvar;
-char *slp;
-uint8_t vtype;
-struct T_INDEX ind;
-    while (1) {
-
-        if (*lp=='(') {
-            lp++;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
-            lp++;
-
-        } else {
-            lp=isvar(lp,&vtype,&ind,&fvar1,0,jo);
-            if (vtype!=NUM_RES && vtype&STYPE) {
-
-              glob_script_mem.glob_error=1;
-            }
-        }
-        switch (lastop) {
-            case OPER_EQU:
-                fvar=fvar1;
-                break;
-            case OPER_PLS:
-                fvar+=fvar1;
-                break;
-            case OPER_MIN:
-                fvar-=fvar1;
-                break;
-            case OPER_MUL:
-                fvar*=fvar1;
-                break;
-            case OPER_DIV:
-                fvar/=fvar1;
-                break;
-            case OPER_PERC:
-                fvar=fmodf(fvar,fvar1);
-                break;
-            case OPER_XOR:
-                fvar=(uint32_t)fvar^(uint32_t)fvar1;
-                break;
-            case OPER_AND:
-                fvar=(uint32_t)fvar&(uint32_t)fvar1;
-                break;
-            case OPER_OR:
-                fvar=(uint32_t)fvar|(uint32_t)fvar1;
-                break;
-            default:
-                break;
-
-        }
-        slp=lp;
-        lp=getop(lp,&operand);
-        switch (operand) {
-            case OPER_EQUEQU:
-            case OPER_NOTEQU:
-            case OPER_LOW:
-            case OPER_LOWEQU:
-            case OPER_GRT:
-            case OPER_GRTEQU:
-                lp=slp;
-                *fp=fvar;
-                return lp;
-                break;
-            default:
-                break;
-        }
-        lastop=operand;
-        if (!operand) {
-            *fp=fvar;
-            return lp;
-        }
-    }
-}
-
-
-char *ForceStringVar(char *lp,char *dstr) {
-  float fvar;
-  char *slp=lp;
-  glob_script_mem.glob_error=0;
-  lp=GetStringResult(lp,OPER_EQU,dstr,0);
-  if (glob_script_mem.glob_error) {
-
-    lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
-    dtostrfd(fvar,6,dstr);
-    glob_script_mem.glob_error=0;
-  }
-  return lp;
-}
-
-
-void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
-    char *cp;
-    uint16_t count;
-    uint8_t vtype;
-    uint8_t dprec=glob_script_mem.script_dprec;
-    float fvar;
-    cp=srcbuf;
-    struct T_INDEX ind;
-    char string[SCRIPT_MAXSSIZE];
-    dstsize-=2;
-    for (count=0;count<dstsize;count++) {
-        if (*cp=='%') {
-            cp++;
-            if (*cp=='%') {
-              dstbuf[count]=*cp++;
-            } else {
-              if (isdigit(*cp)) {
-                dprec=*cp&0xf;
-                cp++;
-              } else {
-                dprec=glob_script_mem.script_dprec;
-              }
-              cp=isvar(cp,&vtype,&ind,&fvar,string,0);
-              if (vtype!=VAR_NV) {
-
-                if (vtype==NUM_RES || (vtype&STYPE)==0) {
-
-                    dtostrfd(fvar,dprec,string);
-                } else {
-
-                }
-                uint8_t slen=strlen(string);
-                if (count+slen<dstsize-1) {
-                  strcpy(&dstbuf[count],string);
-                  count+=slen-1;
-                }
-                cp++;
-              } else {
-                strcpy(&dstbuf[count],"???");
-                count+=2;
-                while (*cp!='%') {
-                  if (*cp==0 || *cp==SCRIPT_EOL) {
-                    dstbuf[count+1]=0;
-                    return;
-                  }
-                  cp++;
-                }
-                cp++;
-              }
-            }
-        } else {
-            if (*cp=='\\') {
-              cp++;
-              if (*cp=='n') {
-                dstbuf[count]='\n';
-              } else if (*cp=='r') {
-                dstbuf[count]='\r';
-              } else if (*cp=='\\') {
-                dstbuf[count]='\\';
-              } else {
-                dstbuf[count]=*cp;
-              }
-            } else {
-              dstbuf[count]=*cp;
-            }
-            if (*cp==0) {
-                break;
-            }
-            cp++;
-        }
-    }
-    dstbuf[count]=0;
-}
-
-void toLog(const char *str) {
-  if (!str) return;
-  AddLog_P(LOG_LEVEL_INFO, str);
-}
-
-
-void toLogN(const char *cp,uint8_t len) {
-  if (!cp) return;
-  char str[32];
-  if (len>=sizeof(str)) len=len>=sizeof(str);
-  strlcpy(str,cp,len);
-  toSLog(str);
-}
-
-void toLogEOL(const char *s1,const char *str) {
-  if (!str) return;
-  uint8_t index=0;
-  char *cp=log_data;
-  strcpy(cp,s1);
-  cp+=strlen(s1);
-  while (*str) {
-    if (*str==SCRIPT_EOL) break;
-    *cp++=*str++;
-  }
-  *cp=0;
-  AddLog(LOG_LEVEL_INFO);
-}
-
-
-void toSLog(const char *str) {
-  if (!str) return;
-#if SCRIPT_DEBUG>0
-  while (*str) {
-    Serial.write(*str);
-    str++;
-  }
-#endif
-}
-
-char *Evaluate_expression(char *lp,uint8_t and_or, uint8_t *result,JsonObject *jo) {
-  float fvar,*dfvar,fvar1;
-  uint8_t numeric;
-  struct T_INDEX ind;
-  uint8_t vtype=0,lastop;
-  uint8_t res=0;
-  char *llp=lp;
-  char *slp;
-
-  SCRIPT_SKIP_SPACES
-  if (*lp=='(') {
-    uint8_t res=0;
-    uint8_t xand_or=0;
-    lp++;
-
-loop:
-    SCRIPT_SKIP_SPACES
-    lp=Evaluate_expression(lp,xand_or,&res,jo);
-    if (*lp==')') {
-      lp++;
-      goto exit0;
-    }
-
-    SCRIPT_SKIP_SPACES
-    if (!strncmp(lp,"or",2)) {
-      lp+=2;
-      xand_or=1;
-      goto loop;
-    } else if (!strncmp(lp,"and",3)) {
-      lp+=3;
-      xand_or=2;
-      goto loop;
-    }
-exit0:
-    if (!and_or) {
-      *result=res;
-    } else if (and_or==1) {
-      *result|=res;
-    } else {
-      *result&=res;
-    }
-    goto exit10;
-  }
-
-  llp=lp;
-
-  dfvar=&fvar;
-  glob_script_mem.glob_error=0;
-  slp=lp;
-  numeric=1;
-  lp=GetNumericResult(lp,OPER_EQU,dfvar,0);
-  if (glob_script_mem.glob_error==1) {
-
-   char cmpstr[SCRIPT_MAXSSIZE];
-    lp=slp;
-    numeric=0;
-
-    lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
-   lp=getop(lp,&lastop);
-
-    char str[SCRIPT_MAXSSIZE];
-    lp=GetStringResult(lp,OPER_EQU,str,jo);
-    if (lastop==OPER_EQUEQU || lastop==OPER_NOTEQU) {
-      res=strcmp(cmpstr,str);
-      if (lastop==OPER_EQUEQU) res=!res;
-      goto exit;
-    }
-
-  } else {
-
-
-    lp=getop(lp,&lastop);
-    lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
-    switch (lastop) {
-      case OPER_EQUEQU:
-          res=(*dfvar==fvar1);
-          break;
-      case OPER_NOTEQU:
-          res=(*dfvar!=fvar1);
-          break;
-      case OPER_LOW:
-          res=(*dfvar<fvar1);
-          break;
-      case OPER_LOWEQU:
-          res=(*dfvar<=fvar1);
-          break;
-      case OPER_GRT:
-          res=(*dfvar>fvar1);
-          break;
-      case OPER_GRTEQU:
-          res=(*dfvar>=fvar1);
-          break;
-      default:
-
-          break;
-    }
-
-exit:
-    if (!and_or) {
-      *result=res;
-    } else if (and_or==1) {
-      *result|=res;
-    } else {
-      *result&=res;
-    }
-  }
-
-
-exit10:
-#if SCRIPT_DEBUG>0
-  char tbuff[128];
-  sprintf(tbuff,"p1=%d,p2=%d,cmpres=%d,and_or=%d line: ",(int32_t)*dfvar,(int32_t)fvar1,*result,and_or);
-  toLogEOL(tbuff,llp);
-#endif
-  return lp;
-}
-
-
-
-#define IF_NEST 8
-
-int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
-
-    if (tasm_cmd_activ && tlen>0) return 0;
-
-    uint8_t vtype=0,sindex,xflg,floop=0,globvindex,fromscriptcmd=0;
-    int8_t globaindex;
-    struct T_INDEX ind;
-    uint8_t operand,lastop,numeric=1,if_state[IF_NEST],if_exe[IF_NEST],if_result[IF_NEST],and_or,ifstck=0;
-    if_state[ifstck]=0;
-    if_result[ifstck]=0;
-    if_exe[ifstck]=1;
-    char cmpstr[SCRIPT_MAXSSIZE];
-    uint8_t check=0;
-    if (tlen<0) {
-      tlen=abs(tlen);
-      check=1;
-    }
-
-    float *dfvar,*cv_count,cv_max,cv_inc;
-    char *cv_ptr;
-    float fvar=0,fvar1,sysvar,swvar;
-    uint8_t section=0,sysv_type=0,swflg=0;
-
-    if (!glob_script_mem.scriptptr) {
-      return -99;
-    }
-
-    DynamicJsonBuffer jsonBuffer;
-    JsonObject &jobj=jsonBuffer.parseObject(js);
-    JsonObject *jo;
-    if (js) jo=&jobj;
-    else jo=0;
-
-    char *lp=glob_script_mem.scriptptr;
-
-    while (1) {
-
-
-        startline:
-        SCRIPT_SKIP_SPACES
-
-        SCRIPT_SKIP_EOL
-
-        if (*lp==';') goto next_line;
-        if (!*lp) break;
-
-        if (section) {
-
-            if (*lp=='>') {
-                return 0;
-            }
-            if (*lp=='#') {
-                return 0;
-            }
-            glob_script_mem.var_not_found=0;
-
-
-#ifdef IFTHEN_DEBUG
-            char tbuff[128];
-            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
-            toLogEOL(tbuff,lp);
-#endif
-
-
-
-
-            if (!strncmp(lp,"if",2)) {
-                lp+=2;
-                if (ifstck<IF_NEST-1) ifstck++;
-                if_state[ifstck]=1;
-                if_result[ifstck]=0;
-                if (ifstck==1) if_exe[ifstck]=1;
-                else if_exe[ifstck]=if_exe[ifstck-1];
-                and_or=0;
-            } else if (!strncmp(lp,"then",4) && if_state[ifstck]==1) {
-                lp+=4;
-                if_state[ifstck]=2;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-            } else if (!strncmp(lp,"else",4) && if_state[ifstck]==2) {
-                lp+=4;
-                if_state[ifstck]=3;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
-            } else if (!strncmp(lp,"endif",5) && if_state[ifstck]>=2) {
-                lp+=5;
-                if (ifstck>0) {
-                  if_state[ifstck]=0;
-                  ifstck--;
-                }
-                goto next_line;
-            } else if (!strncmp(lp,"or",2) && if_state[ifstck]==1) {
-                lp+=2;
-                and_or=1;
-            } else if (!strncmp(lp,"and",3) && if_state[ifstck]==1) {
-                lp+=3;
-                and_or=2;
-            }
-
-            if (*lp=='{' && if_state[ifstck]==1) {
-              lp+=1;
-              if_state[ifstck]=2;
-              if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-            } else if (*lp=='{' && if_state[ifstck]==3) {
-              lp+=1;
-
-            } else if (*lp=='}' && if_state[ifstck]>=2) {
-              lp++;
-              char *slp=lp;
-              uint8_t iselse=0;
-              for (uint8_t count=0; count<8;count++) {
-                if (*lp=='}') {
-
-                  break;
-                }
-                if (!strncmp(lp,"else",4)) {
-
-                  if_state[ifstck]=3;
-                  if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
-                  lp+=4;
-                  iselse=1;
-                  SCRIPT_SKIP_SPACES
-                  if (*lp=='{') lp++;
-                  break;
-                }
-                lp++;
-              }
-              if (!iselse) {
-                lp=slp;
-
-                if (ifstck>0) {
-                  if_state[ifstck]=0;
-                  ifstck--;
-                }
-                goto next_line;
-              }
-            }
-
-            if (!strncmp(lp,"for",3)) {
-
-
-              lp+=3;
-              SCRIPT_SKIP_SPACES
-              lp=isvar(lp,&vtype,&ind,0,0,0);
-              if ((vtype!=VAR_NV) && (vtype&STYPE)==0) {
-
-                  uint8_t index=glob_script_mem.type[ind.index].index;
-                  cv_count=&glob_script_mem.fvars[index];
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,cv_count,0);
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,&cv_max,0);
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,&cv_inc,0);
-
-                  cv_ptr=lp;
-                  floop=1;
-              } else {
-
-                  toLogEOL("for error",lp);
-              }
-            } else if (!strncmp(lp,"next",4) && floop>0) {
-
-              *cv_count+=cv_inc;
-              if (*cv_count<=cv_max) {
-                lp=cv_ptr;
-              } else {
-                lp+=4;
-                floop=0;
-              }
-            }
-
-            if (!strncmp(lp,"switch",6)) {
-              lp+=6;
-              SCRIPT_SKIP_SPACES
-              char *slp=lp;
-              lp=GetNumericResult(lp,OPER_EQU,&swvar,0);
-              if (glob_script_mem.glob_error==1) {
-
-                lp=slp;
-
-                lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
-                swflg=0x81;
-              } else {
-                swflg=1;
-              }
-            } else if (!strncmp(lp,"case",4) && swflg>0) {
-              lp+=4;
-              SCRIPT_SKIP_SPACES
-              float cvar;
-              if (!(swflg&0x80)) {
-                lp=GetNumericResult(lp,OPER_EQU,&cvar,0);
-                if (swvar!=cvar) {
-                  swflg=2;
-                } else {
-                  swflg=1;
-                }
-              } else {
-                char str[SCRIPT_MAXSSIZE];
-                lp=GetStringResult(lp,OPER_EQU,str,0);
-                if (!strcmp(cmpstr,str)) {
-                    swflg=0x81;
-                } else {
-                  swflg=0x82;
-                }
-              }
-            } else if (!strncmp(lp,"ends",4) && swflg>0) {
-              lp+=4;
-              swflg=0;
-            }
-            if ((swflg&3)==2) goto next_line;
-
-            SCRIPT_SKIP_SPACES
-
-            if (*lp==SCRIPT_EOL) {
-             goto next_line;
-            }
-
-
-            if (!if_exe[ifstck] && if_state[ifstck]!=1) goto next_line;
-
-#ifdef IFTHEN_DEBUG
-            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d execute line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
-            toLogEOL(tbuff,lp);
-#endif
-
-            if (!strncmp(lp,"break",5)) {
-              if (floop) {
-
-                floop=0;
-              } else {
-                section=0;
-              }
-              break;
-            } else if (!strncmp(lp,"dp",2) && isdigit(*(lp+2))) {
-              lp+=2;
-
-              glob_script_mem.script_dprec=atoi(lp);
-              goto next_line;
-            } else if (!strncmp(lp,"delay(",6)) {
-              lp+=5;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              delay(fvar);
-              goto next_line;
-            } else if (!strncmp(lp,"spinm(",6)) {
-              lp+=6;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t pinnr=fvar;
-              SCRIPT_SKIP_SPACES
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t mode=fvar;
-              pinMode(pinnr,mode&3);
-              goto next_line;
-            } else if (!strncmp(lp,"spin(",5)) {
-              lp+=5;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t pinnr=fvar;
-              SCRIPT_SKIP_SPACES
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t mode=fvar;
-              digitalWrite(pinnr,mode&1);
-              goto next_line;
-            } else if (!strncmp(lp,"svars(",5)) {
-              lp+=5;
-
-              Scripter_save_pvars();
-              goto next_line;
-            }
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-            else if (!strncmp(lp,"ws2812(",7)) {
-              lp+=7;
-              lp=isvar(lp,&vtype,&ind,0,0,0);
-              if (vtype!=VAR_NV) {
-
-                uint8_t index=glob_script_mem.type[ind.index].index;
-                if ((vtype&STYPE)==0) {
-
-                  if (glob_script_mem.type[index].bits.is_filter) {
-                    uint8_t len=0;
-                    float *fa=Get_MFAddr(index,&len);
-
-                    if (fa && len) ws2812_set_array(fa,len);
-                  }
-                }
-              }
-              goto next_line;
-            }
-#endif
-#endif
-
-            else if (!strncmp(lp,"=>",2) || !strncmp(lp,"->",2) || !strncmp(lp,"+>",2) || !strncmp(lp,"print",5)) {
-
-                uint8_t sflag=0,pflg=0,svmqtt,swll;
-                if (*lp=='p') {
-                 pflg=1;
-                 lp+=5;
-                }
-                else {
-                  if (*lp=='-') sflag=1;
-                  if (*lp=='+') sflag=2;
-                  lp+=2;
-                }
-                char *slp=lp;
-                SCRIPT_SKIP_SPACES
-                #define SCRIPT_CMDMEM 512
-                char *cmdmem=(char*)malloc(SCRIPT_CMDMEM);
-                if (cmdmem) {
-                  char *cmd=cmdmem;
-                  uint16_t count;
-                  for (count=0; count<SCRIPT_CMDMEM/2-2; count++) {
-
-                    if (!*lp || *lp=='\r' || *lp=='\n') {
-                        cmd[count]=0;
-                        break;
-                    }
-                    cmd[count]=*lp++;
-                  }
-
-
-                  char *tmp=cmdmem+SCRIPT_CMDMEM/2;
-                  Replace_Cmd_Vars(cmd,tmp,SCRIPT_CMDMEM/2);
-
-
-                  if (!strncmp(tmp,"print",5) || pflg) {
-                    if (pflg) toLog(tmp);
-                    else toLog(&tmp[5]);
-                  } else {
-                    if (!sflag) {
-                      tasm_cmd_activ=1;
-                      AddLog_P2(glob_script_mem.script_loglevel&0x7f, PSTR("Script: performs \"%s\""), tmp);
-                    } else if (sflag==2) {
-
-                    } else {
-                      tasm_cmd_activ=1;
-                      svmqtt=Settings.flag.mqtt_enabled;
-                      swll=Settings.weblog_level;
-                      Settings.flag.mqtt_enabled=0;
-                      Settings.weblog_level=0;
-                    }
-                    ExecuteCommand((char*)tmp, SRC_RULE);
-                    tasm_cmd_activ=0;
-                    if (sflag==1) {
-                      Settings.flag.mqtt_enabled=svmqtt;
-                      Settings.weblog_level=swll;
-                    }
-                  }
-                  if (cmdmem) free(cmdmem);
-                }
-                lp=slp;
-                goto next_line;
-            } else if (!strncmp(lp,"=#",2)) {
-
-                lp+=1;
-                char *slp=lp;
-                uint8_t plen=0;
-                while (*lp) {
-                  if (*lp=='\n'|| *lp=='\r'|| *lp=='(') {
-                    break;
-                  }
-                  lp++;
-                  plen++;
-                }
-                if (fromscriptcmd) {
-                  char *sp=glob_script_mem.scriptptr;
-                  glob_script_mem.scriptptr=glob_script_mem.scriptptr_bu;
-                  Run_Scripter(slp,plen,0);
-                  glob_script_mem.scriptptr=sp;
-                } else {
-                  Run_Scripter(slp,plen,0);
-                }
-                lp=slp;
-                goto next_line;
-            } else if (!strncmp(lp,"=(",2)) {
-                lp+=2;
-                char str[128];
-                str[0]='>';
-                lp=GetStringResult(lp,OPER_EQU,&str[1],0);
-                lp++;
-                execute_script(str);
-            }
-
-
-            if (if_state[ifstck]==1) {
-
-              lp=Evaluate_expression(lp,and_or,&if_result[ifstck],jo);
-              SCRIPT_SKIP_SPACES
-              if (*lp=='{' && if_state[ifstck]==1) {
-                lp+=1;
-                if_state[ifstck]=2;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-              }
-              goto next_line;
-            } else {
-              lp=isvar(lp,&vtype,&ind,&sysvar,0,0);
-              if (vtype!=VAR_NV) {
-
-                  globvindex=ind.index;
-                  globaindex=last_findex;
-                  uint8_t index=glob_script_mem.type[ind.index].index;
-                  if ((vtype&STYPE)==0) {
-
-                      if (ind.bits.settable || ind.bits.is_filter) {
-                        dfvar=&sysvar;
-                        if (ind.bits.settable) {
-                          sysv_type=ind.index;
-                        } else {
-                          sysv_type=0;
-                        }
-
-                      } else {
-                        dfvar=&glob_script_mem.fvars[index];
-                        sysv_type=0;
-                      }
-                      numeric=1;
-                      lp=getop(lp,&lastop);
-                      char *slp=lp;
-                      glob_script_mem.glob_error=0;
-                      lp=GetNumericResult(lp,OPER_EQU,&fvar,jo);
-                      if (glob_script_mem.glob_error==1) {
-
-
-                        lp=isvar(slp,&vtype,&ind,0,cmpstr,jo);
-                        fvar=CharToFloat(cmpstr);
-                      }
-                      switch (lastop) {
-                          case OPER_EQU:
-                              if (glob_script_mem.var_not_found) {
-                                if (!js) toLogEOL("var not found: ",lp);
-                                goto next_line;
-                              }
-                              *dfvar=fvar;
-                              break;
-                          case OPER_PLSEQU:
-                              *dfvar+=fvar;
-                              break;
-                          case OPER_MINEQU:
-                              *dfvar-=fvar;
-                              break;
-                          case OPER_MULEQU:
-                              *dfvar*=fvar;
-                              break;
-                          case OPER_DIVEQU:
-                              *dfvar/=fvar;
-                              break;
-                          case OPER_PERCEQU:
-                              *dfvar=fmodf(*dfvar,fvar);
-                              break;
-                          case OPER_ANDEQU:
-                              *dfvar=(uint32_t)*dfvar&(uint32_t)fvar;
-                              break;
-                          case OPER_OREQU:
-                              *dfvar=(uint32_t)*dfvar|(uint32_t)fvar;
-                              break;
-                          case OPER_XOREQU:
-                              *dfvar=(uint32_t)*dfvar^(uint32_t)fvar;
-                              break;
-                          default:
-
-                              break;
-                      }
-
-                      glob_script_mem.type[globvindex].bits.changed=1;
-                      if (glob_script_mem.type[globvindex].bits.is_filter) {
-                        if (globaindex>=0) {
-                          Set_MFVal(glob_script_mem.type[globvindex].index,globaindex,*dfvar);
-                        } else {
-                          Set_MFilter(glob_script_mem.type[globvindex].index,*dfvar);
-                        }
-                      }
-
-                      if (sysv_type) {
-                        switch (sysv_type) {
-                          case SCRIPT_LOGLEVEL:
-                            glob_script_mem.script_loglevel=*dfvar;
-                            break;
-                          case SCRIPT_TELEPERIOD:
-                            if (*dfvar<10) *dfvar=10;
-                            if (*dfvar>300) *dfvar=300;
-                            Settings.tele_period=*dfvar;
-                            break;
-                        }
-                        sysv_type=0;
-                      }
-                  } else {
-
-                    numeric=0;
-                    sindex=index;
-
-                    char str[SCRIPT_MAXSSIZE];
-                    lp=getop(lp,&lastop);
-                    char *slp=lp;
-                    glob_script_mem.glob_error=0;
-                    lp=GetStringResult(lp,OPER_EQU,str,jo);
-                    if (!js && glob_script_mem.glob_error) {
-
-                      lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
-                      dtostrfd(fvar,6,str);
-                      glob_script_mem.glob_error=0;
-                    }
-
-                    if (!glob_script_mem.var_not_found) {
-
-                      glob_script_mem.type[globvindex].bits.changed=1;
-                      if (lastop==OPER_EQU) {
-                        strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-                      } else if (lastop==OPER_PLSEQU) {
-                        strncat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-                      }
-                    }
-                  }
-
-            }
-            SCRIPT_SKIP_SPACES
-            if (*lp=='{' && if_state[ifstck]==3) {
-              lp+=1;
-
-            }
-            goto next_line;
-          }
-        } else {
-
-            if (*lp=='>' && tlen==1) {
-
-              lp++;
-              section=1;
-              fromscriptcmd=1;
-              goto startline;
-            }
-            if (!strncmp(lp,type,tlen)) {
-
-                section=1;
-                glob_script_mem.section_ptr=lp;
-                if (check) {
-                  return 99;
-                }
-
-                char *ctype=(char*)type;
-                if (*ctype=='#') {
-
-                  ctype+=tlen;
-                  if (*ctype=='(' && *(lp+tlen)=='(') {
-                    float fparam;
-                    numeric=1;
-                    glob_script_mem.glob_error=0;
-                    GetNumericResult((char*)ctype,OPER_EQU,&fparam,0);
-                    if (glob_script_mem.glob_error==1) {
-
-                      numeric=0;
-
-                      GetStringResult((char*)ctype+1,OPER_EQU,cmpstr,0);
-                    }
-                    lp+=tlen;
-                    if (*lp=='(') {
-
-                      lp++;
-                      lp=isvar(lp,&vtype,&ind,0,0,0);
-                      if (vtype!=VAR_NV) {
-
-                        uint8_t index=glob_script_mem.type[ind.index].index;
-                        if ((vtype&STYPE)==0) {
-
-                            dfvar=&glob_script_mem.fvars[index];
-                            if (numeric) {
-                              *dfvar=fparam;
-                            } else {
-
-                              *dfvar=CharToFloat(cmpstr);
-                            }
-                        } else {
-
-                            sindex=index;
-                            if (!numeric) {
-                              strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),cmpstr,glob_script_mem.max_ssize);
-                            } else {
-
-                              dtostrfd(fparam,6,glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize));
-                            }
-                        }
-                      }
-                    }
-                  } else {
-                    lp+=tlen;
-                    if (*ctype=='(' || (*lp!=SCRIPT_EOL && *lp!='?')) {
-
-                      section=0;
-                    }
-                  }
-                }
-            }
-        }
-
-    next_line:
-        if (*lp==SCRIPT_EOL) {
-          lp++;
-        } else {
-          lp = strchr(lp, SCRIPT_EOL);
-          if (!lp) {
-            if (section) {
-              return 0;
-            } else {
-              return -1;
-            }
-          }
-          lp++;
-        }
-    }
-    return -1;
-}
-
-uint8_t script_xsns_index = 0;
-
-
-void ScripterEvery100ms(void) {
-
-  if (Settings.rule_enabled && (uptime > 4)) {
-    mqtt_data[0] = '\0';
-    uint16_t script_tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, script_xsns_index);
-    tele_period = script_tele_period_save;
-    if (strlen(mqtt_data)) {
-      mqtt_data[0] = '{';
-      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data);
-      Run_Scripter(">T",2, mqtt_data);
-    }
-  }
-  if (fast_script==99) Run_Scripter(">F",2,0);
-}
-
-
-
-
-void Scripter_save_pvars(void) {
-  int16_t mlen=0;
-  float *fp=(float*)glob_script_mem.script_pram;
-  mlen+=sizeof(float);
-  struct T_INDEX *vtp=glob_script_mem.type;
-  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-    if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
-      uint8_t index=vtp[count].index;
-      mlen+=sizeof(float);
-      if (mlen>PMEM_SIZE) {
-        vtp[count].bits.is_permanent=0;
-        return;
-      }
-      *fp++=glob_script_mem.fvars[index];
-    }
-  }
-  char *cp=(char*)fp;
-  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-    if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
-      uint8_t index=vtp[count].index;
-      char *sp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
-      uint8_t slen=strlen(sp);
-      mlen+=slen+1;
-      if (mlen>PMEM_SIZE) {
-        vtp[count].bits.is_permanent=0;
-        return;
-      }
-      strcpy(cp,sp);
-      cp+=slen+1;
-    }
-  }
-}
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_SCRIPT "s10"
-
-const char S_CONFIGURE_SCRIPT[] PROGMEM = D_CONFIGURE_SCRIPT;
-
-const char HTTP_BTN_MENU_RULES[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form></p>";
-
-
-const char HTTP_FORM_SCRIPT[] PROGMEM =
-    "<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>"
-    "<form method='post' action='" WEB_HANDLE_SCRIPT "'>";
-
-const char HTTP_FORM_SCRIPT1[] PROGMEM =
-    "<div style='text-align:right' id='charNum'> </div>"
-    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>" D_SCRIPT_ENABLE "</b><br/>"
-    "<br><textarea  id='t1' name='t1' rows='8' cols='80' maxlength='%d' style='font-size: 12pt' >";
-
-const char HTTP_FORM_SCRIPT1b[] PROGMEM =
-    "</textarea>"
-    "<script type='text/javascript'>"
-    "eb('charNum').innerHTML='-';"
-    "var ta=eb('t1');"
-    "ta.addEventListener('keydown',function(e){"
-    "e = e || window.event;"
-    "var ml=this.getAttribute('maxlength');"
-    "var cl=this.value.length;"
-    "if(cl>=ml){"
-    "eb('charNum').innerHTML='" D_SCRIPT_CHARS_NO_MORE "';"
-    "}else{"
-    "eb('charNum').innerHTML=ml-cl+' " D_SCRIPT_CHARS_LEFT "';"
-    "}"
-
-#if 0
-
-    "if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.which === 86) {"
-
-      "var paste = window.clipboardData.getData('Text');"
-
-
-      "var out=\"\";"
-      "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
-      "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
-      "allLines.forEach((line) => {"
-        "if(line.length>0) {"
-          "if(line.charAt(0)!=';'){"
-            "out+=line+'\\n';"
-          "}"
-        "}"
-      "});"
-      "alert(out);"
-    "}"
-#endif
-
-    "return true;"
-    "});"
-
-
-
-#ifdef SCRIPT_STRIP_COMMENTS
-    "ta.addEventListener('paste',function(e){"
-      "let paste = (e.clipboardData || window.clipboardData).getData('text');"
-      "var ml=this.getAttribute('maxlength');"
-      "if(paste.length>=ml){"
-        "var out=\"\";"
-        "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
-        "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
-        "allLines.forEach((line) => {"
-          "if(line.length>0) {"
-            "if(line.charAt(0)!=';'){"
-              "out+=line+'\\n';"
-            "}"
-          "}"
-        "});"
-        "event.preventDefault();"
-        "eb('t1').textContent=out;"
-      "}"
-# 3145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-    "});"
-
-
-#endif
-
-    "</script>";
-
-const char HTTP_SCRIPT_FORM_END[] PROGMEM =
-      "<br/>"
-      "<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ta' class='button bgrn'>" D_SAVE "</button>"
-      "</form></fieldset>";
-
-#ifdef USE_SCRIPT_FATFS
-const char HTTP_FORM_SCRIPT1c[] PROGMEM =
-    "<button name='d%d' type='submit' class='button bgrn'>" D_SCRIPT_DOWNLOAD " '%s'</button>";
-#ifdef SDCARD_DIR
-const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SDCARD_DIR "</button>";
-#else
-const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SCRIPT_UPLOAD_FILES "</button>";
-#endif
-
-#ifdef SDCARD_DIR
-const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_DIR;
-#else
-const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_UPLOAD;
-#endif
-
-const char HTTP_FORM_FILE_UPLOAD[] PROGMEM =
-"<div id='f1' name='f1' style='display:block;'>"
-"<fieldset><legend><b>&nbsp;%s" "&nbsp;</b></legend>";
-const char HTTP_FORM_FILE_UPG[] PROGMEM =
-"<form method='post' action='u3' enctype='multipart/form-data'>"
-"<br/><input type='file' name='u3'><br/>"
-"<br/><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>";
-
-const char HTTP_FORM_FILE_UPGb[] PROGMEM =
-"</fieldset>"
-"</div>"
-"<div id='f2' name='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
-
-const char HTTP_FORM_SDC_DIRa[] PROGMEM =
-"<div style='text-align:left'>";
-const char HTTP_FORM_SDC_DIRb[] PROGMEM =
- "<pre><a href='%s' file='%s'>%s</a>    %d</pre>";
-const char HTTP_FORM_SDC_DIRd[] PROGMEM =
-"<pre><a href='%s' file='%s'>%s</a></pre>";
-const char HTTP_FORM_SDC_DIRc[] PROGMEM =
-"</div>";
-const char HTTP_FORM_SDC_HREF[] PROGMEM =
-"http://%s/upl?download=%s/%s";
-#endif
-
-
-
-#ifdef USE_SCRIPT_FATFS
-
-#if USE_LONG_FILE_NAMES>0
-#undef REJCMPL
-#define REJCMPL 6
-#else
-#undef REJCMPL
-#define REJCMPL 8
-#endif
-
-uint8_t reject(char *name) {
-
-  if (*name=='_') return 1;
-  if (*name=='.') return 1;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-  if (!strncasecmp(name,"SPOTLI~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"TRASHE~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"FSEVEN~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"SYSTEM~1",REJCMPL)) return 1;
-#else
-  if (!strcasecmp(name,"SPOTLI~1")) return 1;
-  if (!strcasecmp(name,"TRASHE~1")) return 1;
-  if (!strcasecmp(name,"FSEVEN~1")) return 1;
-  if (!strcasecmp(name,"SYSTEM~1")) return 1;
-#endif
-  return 0;
-}
-
-void ListDir(char *path, uint8_t depth) {
-  char name[32];
-  char npath[128];
-  char format[12];
-  sprintf(format,"%%-%ds",24-depth);
-
-  File dir=SD.open(path);
-  if (dir) {
-    dir.rewindDirectory();
-    if (strlen(path)>1) {
-      snprintf_P(npath,sizeof(npath),PSTR("http://%s/upl?download=%s"),WiFi.localIP().toString().c_str(),path);
-      for (uint8_t cnt=strlen(npath)-1;cnt>0;cnt--) {
-        if (npath[cnt]=='/') {
-          if (npath[cnt-1]=='=') npath[cnt+1]=0;
-          else npath[cnt]=0;
-          break;
-        }
-      }
-      WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,path,"..");
-    }
-    while (true) {
-      File entry=dir.openNextFile();
-      if (!entry) {
-        break;
-      }
-      char *pp=path;
-      if (!*(pp+1)) pp++;
-      char *cp=name;
-
-      if (reject((char*)entry.name())) goto fclose;
-
-      for (uint8_t cnt=0;cnt<depth;cnt++) {
-        *cp++='-';
-      }
-
-      sprintf(cp,format,entry.name());
-      if (entry.isDirectory()) {
-        snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
-        WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,entry.name(),name);
-        uint8_t plen=strlen(path);
-        if (plen>1) {
-          strcat(path,"/");
-        }
-        strcat(path,entry.name());
-        ListDir(path,depth+4);
-        path[plen]=0;
-      } else {
-          snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
-          WSContentSend_P(HTTP_FORM_SDC_DIRb,npath,entry.name(),name,entry.size());
-      }
-      fclose:
-      entry.close();
-    }
-    dir.close();
-  }
-}
-
-char path[48];
-
-void Script_FileUploadConfiguration(void)
-{
-  uint8_t depth=0;
-  strcpy(path,"/");
-
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("download")) {
-    String stmp = WebServer->arg("download");
-    char *cp=(char*)stmp.c_str();
-    if (DownloadFile(cp)) {
-
-      strcpy(path,cp);
-    }
-  }
-
-  WSContentStart_P(S_SCRIPT_FILE_UPLOAD);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
-  WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
-#ifdef SDCARD_DIR
-  WSContentSend_P(HTTP_FORM_SDC_DIRa);
-  if (glob_script_mem.script_sd_found) {
-    ListDir(path,depth);
-  }
-  WSContentSend_P(HTTP_FORM_SDC_DIRc);
-#endif
-  WSContentSend_P(HTTP_FORM_FILE_UPGb);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-  Web.upload_error = 0;
-}
-
-File upload_file;
-
-void ScriptFileUploadSuccess(void) {
-  WSContentStart_P(S_INFORMATION);
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
-  WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br/>"), WebColor(COL_TEXT_SUCCESS));
-  WSContentSend_P(PSTR("</div><br/>"));
-  WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),"/upl",D_UPL_DONE);
-
-  WSContentStop();
-}
-
-
-
-void script_upload(void) {
-
-
-
-  HTTPUpload& upload = WebServer->upload();
-  if (upload.status == UPLOAD_FILE_START) {
-    char npath[48];
-    sprintf(npath,"%s/%s",path,upload.filename.c_str());
-    SD.remove(npath);
-    upload_file=SD.open(npath,FILE_WRITE);
-    if (!upload_file) Web.upload_error=1;
-  } else if(upload.status == UPLOAD_FILE_WRITE) {
-    if (upload_file) upload_file.write(upload.buf,upload.currentSize);
-  } else if(upload.status == UPLOAD_FILE_END) {
-    if (upload_file) upload_file.close();
-    if (Web.upload_error) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: upload error"));
-    }
-  } else {
-    Web.upload_error=1;
-    WebServer->send(500, "text/plain", "500: couldn't create file");
-  }
-}
-
-uint8_t DownloadFile(char *file) {
-  File download_file;
-  WiFiClient download_Client;
-
-    if (!SD.exists(file)) {
-      AddLog_P(LOG_LEVEL_INFO,PSTR("file not found"));
-      return 0;
-    }
-
-    download_file=SD.open(file,FILE_READ);
-    if (!download_file) {
-      AddLog_P(LOG_LEVEL_INFO,PSTR("could not open file"));
-      return 0;
-    }
-
-    if (download_file.isDirectory()) {
-      download_file.close();
-      return 1;
-    }
-
-    uint32_t flen=download_file.size();
-
-    download_Client = WebServer->client();
-    WebServer->setContentLength(flen);
-
-    char attachment[100];
-    char *cp;
-    for (uint8_t cnt=strlen(file); cnt>=0; cnt--) {
-      if (file[cnt]=='/') {
-        cp=&file[cnt+1];
-        break;
-      }
-    }
-    snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=%s"),cp);
-    WebServer->sendHeader(F("Content-Disposition"), attachment);
-    WSSend(200, CT_STREAM, "");
-
-    uint8_t buff[512];
-    uint16_t bread;
-
-
-    uint8_t cnt=0;
-    while (download_file.available()) {
-      bread=download_file.read(buff,sizeof(buff));
-      uint16_t bw=download_Client.write((const char*)buff,bread);
-      if (!bw) break;
-      cnt++;
-      if (cnt>7) {
-        cnt=0;
-        if (glob_script_mem.script_loglevel&0x80) {
-
-          loop();
-        }
-      }
-    }
-    download_file.close();
-    download_Client.stop();
-    return 0;
-}
-
-#endif
-
-
-void HandleScriptTextareaConfiguration(void) {
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    ScriptSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-}
-
-void HandleScriptConfiguration(void) {
-
-    if (!HttpCheckPriviledgedAccess()) { return; }
-
-    AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_SCRIPT);
-
-#ifdef USE_SCRIPT_FATFS
-    if (WebServer->hasArg("d1")) {
-      DownloadFile(glob_script_mem.flink[0]);
-    }
-    if (WebServer->hasArg("d2")) {
-      DownloadFile(glob_script_mem.flink[1]);
-    }
-    if (WebServer->hasArg("upl")) {
-      Script_FileUploadConfiguration();
-    }
-#endif
-
-    WSContentStart_P(S_CONFIGURE_SCRIPT);
-    WSContentSendStyle();
-    WSContentSend_P(HTTP_FORM_SCRIPT);
-
-
-#ifdef xSCRIPT_STRIP_COMMENTS
-    uint16_t ssize=glob_script_mem.script_size;
-    if (bitRead(Settings.rule_enabled, 1)) ssize*=2;
-    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",ssize);
-#else
-    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",glob_script_mem.script_size);
-#endif
-
-
-    if (glob_script_mem.script_ram[0]) {
-      _WSContentSend(glob_script_mem.script_ram);
-    }
-    WSContentSend_P(HTTP_FORM_SCRIPT1b);
-
-#ifdef USE_SCRIPT_FATFS
-    if (glob_script_mem.script_sd_found) {
-      WSContentSend_P(HTTP_FORM_SCRIPT1d);
-      if (glob_script_mem.flink[0][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,1,glob_script_mem.flink[0]);
-      if (glob_script_mem.flink[1][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,2,glob_script_mem.flink[1]);
-    }
-#endif
-
-    WSContentSend_P(HTTP_SCRIPT_FORM_END);
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentStop();
-  }
-
-
-void ScriptSaveSettings(void) {
-
-  if (WebServer->hasArg("c1")) {
-    bitWrite(Settings.rule_enabled,0,1);
-  } else {
-    bitWrite(Settings.rule_enabled,0,0);
-  }
-
-
-  String str = WebServer->arg("t1");
-
-  if (*str.c_str()) {
-
-    str.replace("\r\n","\n");
-    str.replace("\r","\n");
-
-#ifdef xSCRIPT_STRIP_COMMENTS
-    if (bitRead(Settings.rule_enabled, 1)) {
-      char *sp=(char*)str.c_str();
-      char *sp1=sp;
-      char *dp=sp;
-      uint8_t flg=0;
-      while (*sp) {
-        while (*sp==' ') sp++;
-        sp1=sp;
-        sp=strchr(sp,'\n');
-        if (!sp) {
-          flg=1;
-        } else {
-          *sp=0;
-        }
-        if (*sp1!=';') {
-          uint8_t slen=strlen(sp1);
-          if (slen) {
-            strcpy(dp,sp1);
-            dp+=slen;
-            *dp++='\n';
-          }
-        }
-        if (flg) {
-          *dp=0;
-          break;
-        }
-        sp++;
-      }
-    }
-#endif
-
-    strlcpy(glob_script_mem.script_ram,str.c_str(), glob_script_mem.script_size);
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-    if (glob_script_mem.flags&1) {
-      EEP_WRITE(0,EEP_SCRIPT_SIZE,glob_script_mem.script_ram);
-    }
-#endif
-#endif
-
-#ifdef USE_SCRIPT_FATFS
-    if (glob_script_mem.flags&1) {
-      SD.remove(FAT_SCRIPT_NAME);
-      File file=SD.open(FAT_SCRIPT_NAME,FILE_WRITE);
-      file.write(glob_script_mem.script_ram,FAT_SCRIPT_SIZE);
-      file.close();
-    }
-#endif
-
-  }
-
-  if (glob_script_mem.script_mem) {
-    Scripter_save_pvars();
-    free(glob_script_mem.script_mem);
-    glob_script_mem.script_mem=0;
-    glob_script_mem.script_mem_size=0;
-  }
-
-  if (bitRead(Settings.rule_enabled, 0)) {
-    int16_t res=Init_Scripter();
-    if (res) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
-      return;
-    }
-    Run_Scripter(">B",2,0);
-    fast_script=Run_Scripter(">F",-2,0);
-  }
-}
-
-#endif
-
-
-#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-
-
-#define HUE_DEV_MVNUM 5
-#define HUE_DEV_NSIZE 16
-struct HUE_SCRIPT {
-  char name[HUE_DEV_NSIZE];
-  uint8_t type;
-  uint8_t index[HUE_DEV_MVNUM];
-  uint8_t vindex[HUE_DEV_MVNUM];
-} hue_script[32];
-
-
-const char SCRIPT_HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
-  "{\"state\":"
-  "{\"on\":{state},"
-  "{light_status}"
-  "\"alert\":\"none\","
-  "\"effect\":\"none\","
-  "\"reachable\":true}"
-  ",\"type\":\"{type}\","
-  "\"name\":\"{j1\","
-  "\"modelid\":\"{m1}\","
-  "\"uniqueid\":\"{j2\","
-  "\"swversion\":\"5.50.1.19085\"}";
-# 3624 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-const char SCRIPT_HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
-"{\"state\":{"
-"\"presence\":{state},"
-"\"lastupdated\":\"2017-10-01T12:37:30\""
-"},"
-"\"swupdate\":{"
-"\"state\":\"noupdates\","
-"\"lastinstall\": null"
-"},"
-"\"config\":{"
-"\"on\":true,"
-"\"battery\":100,"
-"\"reachable\":true,"
-"\"alert\":\"none\","
-"\"ledindication\":false,"
-"\"usertest\":false,"
-"\"sensitivity\":2,"
-"\"sensitivitymax\":2,"
-"\"pending\":[]"
-"},"
-"\"name\":\"{j1\","
-"\"type\":\"ZLLPresence\","
-"\"modelid\":\"SML001\","
-"\"manufacturername\":\"Philips\","
-"\"swversion\":\"6.1.0.18912\","
-"\"uniqueid\":\"{j2\""
-"}";
-# 3705 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-void Script_HueStatus(String *response, uint16_t hue_devs) {
-
-  if (hue_script[hue_devs].type=='p') {
-    *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2);
-    response->replace("{j1",hue_script[hue_devs].name);
-    response->replace("{j2", GetHueDeviceId(hue_devs));
-    uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
-    response->replace("{state}", (pwr ? "true" : "false"));
-    return;
-  }
-
-  *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON1);
-  uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
-  response->replace("{state}", (pwr ? "true" : "false"));
-  String light_status = "";
-  if (hue_script[hue_devs].index[1]>0) {
-
-    light_status += "\"bri\":";
-    uint32_t bri=glob_script_mem.fvars[hue_script[hue_devs].index[1]-1];
-    if (bri > 254) bri = 254;
-    if (bri < 1) bri = 1;
-    light_status += String(bri);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[2]>0) {
-
-    uint32_t hue=glob_script_mem.fvars[hue_script[hue_devs].index[2]-1];
-
-    light_status += "\"hue\":";
-    light_status += String(hue);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[3]>0) {
-
-    uint32_t sat=glob_script_mem.fvars[hue_script[hue_devs].index[3]-1] ;
-    if (sat > 254) sat = 254;
-    if (sat < 1) sat = 1;
-    light_status += "\"sat\":";
-    light_status += String(sat);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[4]>0) {
-
-    uint32_t ct=glob_script_mem.fvars[hue_script[hue_devs].index[4]-1];
-    light_status += "\"ct\":";
-    light_status += String(ct);
-    light_status += ",";
-  }
-
-  float temp;
-  switch (hue_script[hue_devs].type) {
-    case 'C':
-      response->replace("{type}","Color Ligh");
-      response->replace("{m1","LST001");
-      break;
-    case 'D':
-      response->replace("{type}","Dimmable Light");
-      response->replace("{m1","LWB004");
-      break;
-    case 'T':
-      response->replace("{type}","Color Temperature Light");
-      response->replace("{m1","LTW011");
-      break;
-    case 'E':
-      response->replace("{type}","Extended color light");
-      response->replace("{m1","LCT007");
-      break;
-    case 'S':
-      response->replace("{type}","On/Off light");
-      response->replace("{m1","LCT007");
-      break;
-    default:
-      response->replace("{type}","color light");
-      response->replace("{m1","LST001");
-      break;
-  }
-
-  response->replace("{light_status}", light_status);
-  response->replace("{j1",hue_script[hue_devs].name);
-  response->replace("{j2", GetHueDeviceId(hue_devs));
-
-}
-
-void Script_Check_Hue(String *response) {
-  if (!bitRead(Settings.rule_enabled, 0)) return;
-
-  uint8_t hue_script_found=Run_Scripter(">H",-2,0);
-  if (hue_script_found!=99) return;
-
-  char line[128];
-  char tmp[128];
-  uint8_t hue_devs=0;
-  uint8_t vindex=0;
-  char *cp;
-  char *lp=glob_script_mem.section_ptr+2;
-  while (lp) {
-    SCRIPT_SKIP_SPACES
-    while (*lp==SCRIPT_EOL) {
-     lp++;
-    }
-    if (!*lp || *lp=='#' || *lp=='>') {
-        break;
-    }
-    if (*lp!=';') {
-
-      memcpy(line,lp,sizeof(line));
-      line[sizeof(line)-1]=0;
-      cp=line;
-      for (uint32_t i=0; i<sizeof(line); i++) {
-        if (!*cp || *cp=='\n' || *cp=='\r') {
-          *cp=0;
-          break;
-        }
-        cp++;
-      }
-      Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-
-
-      cp=tmp;
-      cp=strchr(cp,',');
-      if (!cp) break;
-      *cp=0;
-
-      strlcpy(hue_script[hue_devs].name,tmp,HUE_DEV_NSIZE);
-      cp++;
-      while (*cp==' ') cp++;
-
-      hue_script[hue_devs].type=*cp;
-
-      for (vindex=0;vindex<HUE_DEV_MVNUM;vindex++) {
-        hue_script[hue_devs].index[vindex]=0;
-      }
-      vindex=0;
-      while (1) {
-        cp=strchr(cp,',');
-        if (!cp) break;
-
-        cp++;
-        while (*cp==' ') cp++;
-
-        vindex==0xff;
-        if (!strncmp(cp,"on=",3)) {
-          cp+=3;
-          vindex=0;
-        } else if (!strncmp(cp,"bri=",4)) {
-          cp+=4;
-          vindex=1;
-        } else if (!strncmp(cp,"hue=",4)) {
-          cp+=4;
-          vindex=2;
-        } else if (!strncmp(cp,"sat=",4)) {
-          cp+=4;
-          vindex=3;
-        } else if (!strncmp(cp,"ct=",3)) {
-          cp+=3;
-          vindex=4;
-        } else {
-
-          vindex==0xff;
-          break;
-        }
-        if (vindex!=0xff) {
-          struct T_INDEX ind;
-          uint8_t vtype;
-          char vname[16];
-          for (uint32_t cnt=0;cnt<sizeof(vname)-1;cnt++) {
-            if (*cp==',' || *cp==0) {
-              vname[cnt]=0;
-              break;
-            }
-            vname[cnt]=*cp++;
-          }
-          isvar(vname,&vtype,&ind,0,0,0);
-          if (vtype!=VAR_NV) {
-
-            if (vtype==NUM_RES || (vtype&STYPE)==0) {
-              hue_script[hue_devs].vindex[vindex]=ind.index;
-              hue_script[hue_devs].index[vindex]=glob_script_mem.type[ind.index].index+1;
-            } else {
-
-            }
-          }
-        }
-      }
-
-      if (response) {
-        if (devices_present) {
-          *response+=",\"";
-        }
-        else {
-          if (hue_devs>0) *response+=",\"";
-        }
-        *response+=String(EncodeLightId(hue_devs+devices_present+1))+"\":";
-        Script_HueStatus(response,hue_devs);
-      }
-
-      hue_devs++;
-    }
-    if (*lp==SCRIPT_EOL) {
-      lp++;
-    } else {
-      lp = strchr(lp, SCRIPT_EOL);
-      if (!lp) break;
-      lp++;
-    }
-  }
-#if 0
-  if (response) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Hue: %d"), hue_devs);
-    toLog(">>>>");
-    toLog(response->c_str());
-    toLog(response->c_str()+LOGSZ);
-  }
-#endif
-}
-
-const char sHUE_LIGHT_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-
-const char sHUE_SENSOR_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-
-const char sHUE_ERROR_JSON[] PROGMEM =
-  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
-
-
-
-void Script_Handle_Hue(String *path) {
-  String response;
-  int code = 200;
-  uint16_t tmp = 0;
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint16_t ct = 0;
-  bool resp = false;
-
-  uint8_t device = DecodeLightId(atoi(path->c_str()));
-  uint8_t index = device-devices_present-1;
-
-  if (WebServer->args()) {
-    response = "[";
-
-    StaticJsonBuffer<400> jsonBuffer;
-    JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
-    if (hue_json.containsKey("on")) {
-
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "on");
-
-      bool on = hue_json["on"];
-      switch(on)
-      {
-        case false : glob_script_mem.fvars[hue_script[index].index[0]-1]=0;
-                     response.replace("{re", "false");
-                     break;
-        case true : glob_script_mem.fvars[hue_script[index].index[0]-1]=1;
-                     response.replace("{re", "true");
-                     break;
-      }
-      glob_script_mem.type[hue_script[index].vindex[0]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("bri")) {
-      tmp = hue_json["bri"];
-      bri=tmp;
-      if (254 <= bri) { bri = 255; }
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "bri");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[1]-1]=bri;
-      glob_script_mem.type[hue_script[index].vindex[1]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("xy")) {
-      float x, y;
-      x = hue_json["xy"][0];
-      y = hue_json["xy"][1];
-      const String &x_str = hue_json["xy"][0];
-      const String &y_str = hue_json["xy"][1];
-      uint8_t rr,gg,bb;
-      LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
-      LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(device));
-      response.replace("{cm", "xy");
-      response.replace("{re", "[" + x_str + "," + y_str + "]");
-      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
-      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
-      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
-      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
-      resp = true;
-    }
-
-    if (hue_json.containsKey("hue")) {
-      tmp = hue_json["hue"];
-
-
-      hue=tmp;
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "hue");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
-      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("sat")) {
-      tmp = hue_json["sat"];
-      sat=tmp;
-      if (254 <= sat) { sat = 255; }
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "sat");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
-      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("ct")) {
-      ct = hue_json["ct"];
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "ct");
-      response.replace("{re", String(ct));
-      glob_script_mem.fvars[hue_script[index].index[4]-1]=ct;
-      glob_script_mem.type[hue_script[index].vindex[4]].bits.changed=1;
-      resp = true;
-    }
-    response += "]";
-
-  } else {
-    response = FPSTR(sHUE_ERROR_JSON);
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
-  WSSend(code, CT_JSON, response);
-  if (resp) {
-    Run_Scripter(">E",2,0);
-  }
-}
-#endif
-
-
-#ifdef USE_SCRIPT_SUB_COMMAND
-bool Script_SubCmd(void) {
-  if (!bitRead(Settings.rule_enabled, 0)) return false;
-
-  if (tasm_cmd_activ) return false;
-
-  char command[CMDSZ];
-  strlcpy(command,XdrvMailbox.topic,CMDSZ);
-  uint32_t pl=XdrvMailbox.payload;
-  char pld[64];
-  strlcpy(pld,XdrvMailbox.data,sizeof(pld));
-
-  char cmdbuff[128];
-  char *cp=cmdbuff;
-  *cp++='#';
-  strcpy(cp,XdrvMailbox.topic);
-  uint8_t tlen=strlen(XdrvMailbox.topic);
-  cp+=tlen;
-  if (XdrvMailbox.index > 0) {
-    *cp++=XdrvMailbox.index|0x30;
-    tlen++;
-  }
-  if ((XdrvMailbox.payload>0) || (XdrvMailbox.data_len>0)) {
-    *cp++='(';
-    strncpy(cp,XdrvMailbox.data,XdrvMailbox.data_len);
-    cp+=XdrvMailbox.data_len;
-    *cp++=')';
-    *cp=0;
-  }
-
-  uint32_t res=Run_Scripter(cmdbuff,tlen+1,0);
-
-  if (res) return false;
-  else {
-    if (pl>=0) {
-      Response_P(S_JSON_COMMAND_NVALUE, command, pl);
-    } else {
-      Response_P(S_JSON_COMMAND_SVALUE, command, pld);
-    }
-  }
-  return true;
-}
-#endif
-
-void execute_script(char *script) {
-  char *svd_sp=glob_script_mem.scriptptr;
-  strcat(script,"\n#");
-  glob_script_mem.scriptptr=script;
-  Run_Scripter(">",1,0);
-  glob_script_mem.scriptptr=svd_sp;
-}
-#define D_CMND_SCRIPT "Script"
-#define D_CMND_SUBSCRIBE "Subscribe"
-#define D_CMND_UNSUBSCRIBE "Unsubscribe"
-
-enum ScriptCommands { CMND_SCRIPT,CMND_SUBSCRIBE, CMND_UNSUBSCRIBE };
-const char kScriptCommands[] PROGMEM = D_CMND_SCRIPT "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE;
-
-bool ScriptCommand(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t index = XdrvMailbox.index;
-
-  if (tasm_cmd_activ) return false;
-
-  int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kScriptCommands);
-  if (-1 == command_code) {
-    serviced = false;
-  }
-  else if ((CMND_SCRIPT == command_code) && (index > 0)) {
-
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
-      switch (XdrvMailbox.payload) {
-        case 0:
-        case 1:
-          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
-          break;
-#ifdef xSCRIPT_STRIP_COMMENTS
-        case 2:
-          bitWrite(Settings.rule_enabled, 1,0);
-          break;
-        case 3:
-          bitWrite(Settings.rule_enabled, 1,1);
-          break;
-#endif
-      }
-    } else {
-      if ('>' == XdrvMailbox.data[0]) {
-
-        snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\"}"),command,XdrvMailbox.data);
-        if (bitRead(Settings.rule_enabled, 0)) {
-          for (uint8_t count=0; count<XdrvMailbox.data_len; count++) {
-            if (XdrvMailbox.data[count]==';') XdrvMailbox.data[count]='\n';
-          }
-          execute_script(XdrvMailbox.data);
-        }
-      }
-      return serviced;
-    }
-    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Free\":%d}"),command, GetStateText(bitRead(Settings.rule_enabled,0)),glob_script_mem.script_size-strlen(glob_script_mem.script_ram));
-#ifdef SUPPORT_MQTT_EVENT
-  } else if (CMND_SUBSCRIBE == command_code) {
-      String result = ScriptSubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
-      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
-    } else if (CMND_UNSUBSCRIBE == command_code) {
-      String result = ScriptUnsubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
-      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
-#endif
-  }
-  return serviced;
-}
-
-
-#ifdef USE_SCRIPT_FATFS
-
-uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
-  return (year - 1980) << 9 | month << 5 | day;
-}
-uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
-  return hour << 11 | minute << 5 | second >> 1;
-}
-
-void dateTime(uint16_t* date, uint16_t* time) {
-
-  *date = xFAT_DATE(RtcTime.year,RtcTime.month, RtcTime.day_of_month);
-
-  *time = xFAT_TIME(RtcTime.hour,RtcTime.minute,RtcTime.second);
-}
-
-#endif
-
-
-
-#ifdef SUPPORT_MQTT_EVENT
-# 4199 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-bool ScriptMqttData(void)
-{
-  bool serviced = false;
-
-  toLog(XdrvMailbox.data);
-  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
-    return false;
-  }
-  String sTopic = XdrvMailbox.topic;
-  String sData = XdrvMailbox.data;
-
-  MQTT_Subscription event_item;
-
-  for (uint32_t index = 0; index < subscriptions.size(); index++) {
-    event_item = subscriptions.get(index);
-
-
-    if (sTopic.startsWith(event_item.Topic)) {
-
-      serviced = true;
-      String value;
-      String lkey;
-      if (event_item.Key.length() == 0) {
-        value = sData;
-      } else {
-        StaticJsonBuffer<400> jsonBuf;
-        JsonObject& jsonData = jsonBuf.parseObject(sData);
-        String key1 = event_item.Key;
-        String key2;
-        if (!jsonData.success()) break;
-        int dot;
-        if ((dot = key1.indexOf('.')) > 0) {
-          key2 = key1.substring(dot+1);
-          key1 = key1.substring(0, dot);
-          lkey=key2;
-          if (!jsonData[key1][key2].success()) break;
-          value = (const char *)jsonData[key1][key2];
-        } else {
-          if (!jsonData[key1].success()) break;
-          value = (const char *)jsonData[key1];
-          lkey=key1;
-        }
-      }
-      value.trim();
-      char sbuffer[128];
-
-      if (!strncmp(lkey.c_str(),"Epoch",5)) {
-        uint32_t ep=atoi(value.c_str())-(uint32_t)EPOCH_OFFSET;
-        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(),ep);
-      } else {
-        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str());
-      }
-
-      execute_script(sbuffer);
-    }
-  }
-  return serviced;
-}
-# 4274 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-String ScriptSubscribe(const char *data, int data_len)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (data_len > 0) {
-    char parameters[data_len+1];
-    memcpy(parameters, data, data_len);
-    parameters[data_len] = '\0';
-    String event_name, topic, key;
-
-    char * pos = strtok(parameters, ",");
-    if (pos) {
-      event_name = Trim(pos);
-      pos = strtok(nullptr, ",");
-      if (pos) {
-        topic = Trim(pos);
-        pos = strtok(nullptr, ",");
-        if (pos) {
-          key = Trim(pos);
-        }
-      }
-    }
-
-
-    if (event_name.length() > 0 && topic.length() > 0) {
-
-      for (uint32_t index=0; index < subscriptions.size(); index++) {
-        if (subscriptions.get(index).Event.equals(event_name)) {
-
-          String stopic = subscriptions.get(index).Topic + "/#";
-          MqttUnsubscribe(stopic.c_str());
-          subscriptions.remove(index);
-          break;
-        }
-      }
-
-      if (!topic.endsWith("#")) {
-        if (topic.endsWith("/")) {
-          topic.concat("#");
-        } else {
-          topic.concat("/#");
-        }
-      }
-
-
-      subscription_item.Event = event_name;
-      subscription_item.Topic = topic.substring(0, topic.length() - 2);
-      subscription_item.Key = key;
-      subscriptions.add(subscription_item);
-
-      MqttSubscribe(topic.c_str());
-      events.concat(event_name + "," + topic
-        + (key.length()>0 ? "," : "")
-        + key);
-    } else {
-      events = D_JSON_WRONG_PARAMETERS;
-    }
-  } else {
-
-    for (uint32_t index=0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      events.concat(subscription_item.Event + "," + subscription_item.Topic
-        + (subscription_item.Key.length()>0 ? "," : "")
-        + subscription_item.Key + "; ");
-    }
-  }
-  return events;
-}
-# 4354 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_10_scripter.ino"
-String ScriptUnsubscribe(const char * data, int data_len)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (data_len > 0) {
-    for (uint32_t index = 0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      if (subscription_item.Event.equalsIgnoreCase(data)) {
-        String stopic = subscription_item.Topic + "/#";
-        MqttUnsubscribe(stopic.c_str());
-        events = subscription_item.Event;
-        subscriptions.remove(index);
-        break;
-      }
-    }
-  } else {
-
-    String stopic;
-    while (subscriptions.size() > 0) {
-      events.concat(subscriptions.get(0).Event + "; ");
-      stopic = subscriptions.get(0).Topic + "/#";
-      MqttUnsubscribe(stopic.c_str());
-      subscriptions.remove(0);
-    }
-  }
-  return events;
-}
-#endif
-
-
-
-#ifdef USE_SCRIPT_WEB_DISPLAY
-
-void Script_Check_HTML_Setvars(void) {
-
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("sv")) {
-    String stmp = WebServer->arg("sv");
-    char cmdbuf[64];
-    memset(cmdbuf,0,sizeof(cmdbuf));
-    char *cp=cmdbuf;
-    *cp++='>';
-    strncpy(cp,stmp.c_str(),sizeof(cmdbuf)-1);
-    char *cp1=strchr(cp,'_');
-    if (!cp1) return;
-    *cp1=0;
-    char vname[32];
-    strncpy(vname,cp,sizeof(vname));
-    *cp1='=';
-    cp1++;
-
-    struct T_INDEX ind;
-    uint8_t vtype;
-    isvar(vname,&vtype,&ind,0,0,0);
-    if (vtype!=NUM_RES && vtype&STYPE) {
-
-      uint8_t tlen=strlen(cp1);
-      memmove(cp1+1,cp1,tlen);
-      *cp1='\"';
-      *(cp1+tlen+1)='\"';
-    }
-
-
-    execute_script(cmdbuf);
-    Run_Scripter(">E",2,0);
-  }
-}
-
-
-const char SCRIPT_MSG_BUTTONa[] PROGMEM =
-  "<button type='submit' style=\"width:%d%%\" onclick='seva(%d,\"%s\")'>%s</button>";
-
-const char SCRIPT_MSG_BUTTONa_TBL[] PROGMEM =
-  "<td style=\"width:%d%%\"><button type='submit' onclick='seva(%d,\"%s\")'>%s</button></td>";
-
-const char SCRIPT_MSG_BUTTONb[] PROGMEM =
-  "<img width=\"%d%%\"></img>";
-
-const char SCRIPT_MSG_BUT_START[] PROGMEM =
-  "<div>";
-const char SCRIPT_MSG_BUT_START_TBL[] PROGMEM =
-  "<table style='width:100%%'><tr>";
-
-const char SCRIPT_MSG_BUT_STOP[] PROGMEM =
-  "</div>";
-const char SCRIPT_MSG_BUT_STOP_TBL[] PROGMEM =
-  "</tr></table>";
-
-const char SCRIPT_MSG_SLIDER[] PROGMEM =
-  "<div><span class='p'>%s</span><center><b>%s</b><span class='q'>%s</span></div>"
-  "<div><input type='range' min='%d' max='%d' value='%d' onchange='seva(value,\"%s\")'></div>";
-
-const char SCRIPT_MSG_CHKBOX[] PROGMEM =
-  "<div><center><label><b>%s</b><input type='checkbox' %s onchange='seva(%d,\"%s\")'></label></div>";
-
-const char SCRIPT_MSG_TEXTINP[] PROGMEM =
-  "<div><center><label><b>%s</b><input type='text'  value='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
-
-const char SCRIPT_MSG_NUMINP[] PROGMEM =
-  "<div><center><label><b>%s</b><input  min='%s' max='%s' step='%s' value='%s' type='number' style='width:200px' onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
-
-
-void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen) {
-uint32_t cnt;
-  for (cnt=0;cnt<blen-1;cnt++) {
-    if (*sp==' ' || *sp==')') {
-      break;
-    }
-    nbuf[cnt]=*sp++;
-  }
-  nbuf[cnt]=0;
-}
-
-void ScriptWebShow(void) {
-  uint8_t web_script=Run_Scripter(">W",-2,0);
-  if (web_script==99) {
-    char line[128];
-    char tmp[128];
-    uint8_t optflg=0;
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        char *lin=line;
-        if (*lin=='@') {
-          lin++;
-          optflg=1;
-        } else {
-          optflg=0;
-        }
-
-        if (!strncmp(lin,"sl(",3)) {
-
-          char *lp=lin;
-          float min;
-          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
-          SCRIPT_SKIP_SPACES
-
-          float max;
-          lp=GetNumericResult(lp,OPER_EQU,&max,0);
-          SCRIPT_SKIP_SPACES
-          float val;
-          char *slp=lp;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char left[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,left,0);
-          SCRIPT_SKIP_SPACES
-          char mid[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,mid,0);
-          SCRIPT_SKIP_SPACES
-          char right[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,right,0);
-          SCRIPT_SKIP_SPACES
-
-          WSContentSend_PD(SCRIPT_MSG_SLIDER,left,mid,right,(uint32_t)min,(uint32_t)max,(uint32_t)val,vname);
-
-
-        } else if (!strncmp(lin,"ck(",3)) {
-          char *lp=lin+3;
-          char *slp=lp;
-          float val;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-          const char *cp;
-          uint8_t uval;
-          if (val>0) {
-            cp="checked='checked'";
-            uval=0;
-          } else {
-            cp="";
-            uval=1;
-          }
-          WSContentSend_PD(SCRIPT_MSG_CHKBOX,label,(char*)cp,uval,vname);
-
-        } else if (!strncmp(lin,"bu(",3)) {
-          char *lp=lin+3;
-          uint8_t bcnt=0;
-          char *found=lin;
-          while (bcnt<4) {
-            found=strstr(found,"bu(");
-            if (!found) break;
-            found+=3;
-            bcnt++;
-          }
-          uint8_t proz=100/bcnt;
-          if (!optflg && bcnt>1) proz-=2;
-          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_START_TBL);
-          else WSContentSend_PD(SCRIPT_MSG_BUT_START);
-          for (uint32_t cnt=0;cnt<bcnt;cnt++) {
-            float val;
-            char *slp=lp;
-            lp=GetNumericResult(lp,OPER_EQU,&val,0);
-            SCRIPT_SKIP_SPACES
-
-            char vname[16];
-            ScriptGetVarname(vname,slp,sizeof(vname));
-
-            SCRIPT_SKIP_SPACES
-            char ontxt[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,ontxt,0);
-            SCRIPT_SKIP_SPACES
-            char offtxt[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,offtxt,0);
-
-            char *cp;
-            uint8_t uval;
-            if (val>0) {
-              cp=ontxt;
-              uval=0;
-            } else {
-              cp=offtxt;
-              uval=1;
-            }
-            if (bcnt>1 && cnt==bcnt-1) {
-              if (!optflg) proz+=2;
-            }
-            if (!optflg) {
-              WSContentSend_PD(SCRIPT_MSG_BUTTONa,proz,uval,vname,cp);
-            } else {
-              WSContentSend_PD(SCRIPT_MSG_BUTTONa_TBL,proz,uval,vname,cp);
-            }
-            if (bcnt>1 && cnt<bcnt-1) {
-              if (!optflg) WSContentSend_PD(SCRIPT_MSG_BUTTONb,2);
-            }
-            lp+=4;
-          }
-          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_STOP_TBL);
-          else WSContentSend_PD(SCRIPT_MSG_BUT_STOP);
-        } else if (!strncmp(lin,"tx(",3)) {
-          char *lp=lin+3;
-          char *slp=lp;
-          char str[SCRIPT_MAXSSIZE];
-          lp=ForceStringVar(lp,str);
-          SCRIPT_SKIP_SPACES
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          WSContentSend_PD(SCRIPT_MSG_TEXTINP,label,str,vname);
-
-        } else if (!strncmp(lin,"nm(",3)) {
-          char *lp=lin;
-          float min;
-          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
-          SCRIPT_SKIP_SPACES
-          float max;
-          lp=GetNumericResult(lp,OPER_EQU,&max,0);
-          SCRIPT_SKIP_SPACES
-          float step;
-          lp=GetNumericResult(lp,OPER_EQU,&step,0);
-          SCRIPT_SKIP_SPACES
-          float val;
-          char *slp=lp;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-
-          char vstr[16],minstr[16],maxstr[16],stepstr[16];
-          dtostrfd(val,4,vstr);
-          dtostrfd(min,4,minstr);
-          dtostrfd(max,4,maxstr);
-          dtostrfd(step,4,stepstr);
-          WSContentSend_PD(SCRIPT_MSG_NUMINP,label,minstr,maxstr,stepstr,vstr,vname);
-
-        } else {
-          Replace_Cmd_Vars(lin,tmp,sizeof(tmp));
-          if (optflg) {
-            WSContentSend_PD(PSTR("<div>%s</div>"),tmp);
-          } else {
-            WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
-          }
-        }
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  }
-}
-#endif
-
-
-#ifdef USE_SENDMAIL
-void script_send_email_body(BearSSL::WiFiClientSecure_light *client) {
-uint8_t msect=Run_Scripter(">m",-2,0);
-  if (msect==99) {
-    char line[128];
-    char tmp[128];
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-        client->println(tmp);
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  } else {
-    client->println("*");
-  }
-}
-#endif
-
-#ifdef USE_SCRIPT_JSON_EXPORT
-void ScriptJsonAppend(void) {
-  uint8_t web_script=Run_Scripter(">J",-2,0);
-  if (web_script==99) {
-    char line[128];
-    char tmp[128];
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-        ResponseAppend_P(PSTR("%s"),tmp);
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  }
-}
-#endif
-
-
-
-
-
-
-bool Xdrv10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_PRE_INIT:
-
-      glob_script_mem.script_ram=Settings.rules[0];
-      glob_script_mem.script_size=MAX_SCRIPT_SIZE;
-      glob_script_mem.flags=0;
-      glob_script_mem.script_pram=(uint8_t*)Settings.script_pram[0];
-      glob_script_mem.script_pram_size=PMEM_SIZE;
-
-#ifdef USE_BUTTON_EVENT
-      for (uint32_t cnt=0;cnt<MAX_KEYS;cnt++) {
-        script_button[cnt]=-1;
-      }
-#endif
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-   if (I2cEnabled(XI2C_37)) {
-     if (I2cSetDevice(EEPROM_ADDRESS)) {
-
-          char *script;
-          script=(char*)calloc(EEP_SCRIPT_SIZE+4,1);
-          if (!script) break;
-          glob_script_mem.script_ram=script;
-          glob_script_mem.script_size=EEP_SCRIPT_SIZE;
-          EEP_READ(0,EEP_SCRIPT_SIZE,script);
-          if (*script==0xff) {
-            memset(script,EEP_SCRIPT_SIZE,0);
-          }
-          script[EEP_SCRIPT_SIZE-1]=0;
-
-          glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
-          glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
-
-          glob_script_mem.flags=1;
-          I2cSetActiveFound(EEPROM_ADDRESS, "EEPROM");
-        }
-      }
-#endif
-#endif
-
-#ifdef USE_SCRIPT_FATFS
-      if (SD.begin(USE_SCRIPT_FATFS)) {
-        glob_script_mem.script_sd_found=1;
-        char *script;
-        script=(char*)calloc(FAT_SCRIPT_SIZE+4,1);
-        if (!script) break;
-        glob_script_mem.script_ram=script;
-        glob_script_mem.script_size=FAT_SCRIPT_SIZE;
-        if (SD.exists(FAT_SCRIPT_NAME)) {
-          File file=SD.open(FAT_SCRIPT_NAME,FILE_READ);
-          file.read((uint8_t*)script,FAT_SCRIPT_SIZE);
-          file.close();
-        }
-        script[FAT_SCRIPT_SIZE-1]=0;
-
-        glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
-        glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
-
-        glob_script_mem.flags=1;
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-
-        SdFile::dateTimeCallback(dateTime);
-#endif
-
-      } else {
-        glob_script_mem.script_sd_found=0;
-      }
-#endif
-
-
-      { uint32_t ptr=(uint32_t)glob_script_mem.script_pram;
-      ptr&=0xfffffffc;
-      ptr+=4;
-      glob_script_mem.script_pram=(uint8_t*)ptr;
-      glob_script_mem.script_pram_size-=4;
-      }
-
-      if (bitRead(Settings.rule_enabled, 0)) Init_Scripter();
-      break;
-    case FUNC_INIT:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        Run_Scripter(">B",2,0);
-        fast_script=Run_Scripter(">F",-2,0);
-#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-        Script_Check_Hue(0);
-#endif
-      }
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      ScripterEvery100ms();
-      break;
-    case FUNC_EVERY_SECOND:
-      ScriptEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = ScriptCommand();
-      break;
-    case FUNC_SET_POWER:
-#ifdef SCRIPT_POWER_SECTION
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">P",2,0);
-#else
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,0);
-#endif
-      break;
-    case FUNC_RULES_PROCESS:
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,mqtt_data);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_ADD_BUTTON:
-      WSContentSend_P(HTTP_BTN_MENU_RULES);
-      break;
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/" WEB_HANDLE_SCRIPT, HandleScriptConfiguration);
-      WebServer->on("/ta",HTTP_POST, HandleScriptTextareaConfiguration);
-
-#ifdef USE_SCRIPT_FATFS
-      WebServer->on("/u3", HTTP_POST,[]() { WebServer->sendHeader("Location","/u3");WebServer->send(303);},script_upload);
-      WebServer->on("/u3", HTTP_GET,ScriptFileUploadSuccess);
-      WebServer->on("/upl", HTTP_GET,Script_FileUploadConfiguration);
-#endif
-      break;
-#endif
-    case FUNC_SAVE_BEFORE_RESTART:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        Run_Scripter(">R",2,0);
-        Scripter_save_pvars();
-      }
-      break;
-#ifdef SUPPORT_MQTT_EVENT
-    case FUNC_MQTT_DATA:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        result = ScriptMqttData();
-      }
-      break;
-#endif
-#ifdef USE_SCRIPT_WEB_DISPLAY
-    case FUNC_WEB_SENSOR:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        ScriptWebShow();
-      }
-      break;
-#endif
-
-#ifdef USE_SCRIPT_JSON_EXPORT
-    case FUNC_JSON_APPEND:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        ScriptJsonAppend();
-      }
-      break;
-#endif
-
-#ifdef USE_BUTTON_EVENT
-    case FUNC_BUTTON_PRESSED:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        if ((script_button[XdrvMailbox.index]&1)!=(XdrvMailbox.payload&1)) {
-          script_button[XdrvMailbox.index]=XdrvMailbox.payload;
-          Run_Scripter(">b",2,0);
-        }
-      }
-      break;
-#endif
-
-  }
-  return result;
-}
-
-
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
-#ifdef USE_KNX
-# 51 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
-#define XDRV_11 11
-
-#include <esp-knx-ip.h>
-
-address_t KNX_physs_addr;
-address_t KNX_addr;
-
-#define KNX_Empty 255
-
-#define TOGGLE_INHIBIT_TIME 15
-
-float last_temp;
-float last_hum;
-uint8_t toggle_inhibit;
-
-typedef struct __device_parameters
-{
-  uint8_t type;
-
-
-
-
-  bool show;
-
-  bool last_state;
-
-  callback_id_t CB_id;
-
-
-
-
-
-} device_parameters_t;
-
-
-device_parameters_t device_param[] = {
-  { 1, false, false, KNX_Empty },
-  { 2, false, false, KNX_Empty },
-  { 3, false, false, KNX_Empty },
-  { 4, false, false, KNX_Empty },
-  { 5, false, false, KNX_Empty },
-  { 6, false, false, KNX_Empty },
-  { 7, false, false, KNX_Empty },
-  { 8, false, false, KNX_Empty },
-  { 9, false, false, KNX_Empty },
-  { 10, false, false, KNX_Empty },
-  { 11, false, false, KNX_Empty },
-  { 12, false, false, KNX_Empty },
-  { 13, false, false, KNX_Empty },
-  { 14, false, false, KNX_Empty },
-  { 15, false, false, KNX_Empty },
-  { 16, false, false, KNX_Empty },
-  { KNX_TEMPERATURE, false, false, KNX_Empty },
-  { KNX_HUMIDITY , false, false, KNX_Empty },
-  { KNX_ENERGY_VOLTAGE , false, false, KNX_Empty },
-  { KNX_ENERGY_CURRENT , false, false, KNX_Empty },
-  { KNX_ENERGY_POWER , false, false, KNX_Empty },
-  { KNX_ENERGY_POWERFACTOR , false, false, KNX_Empty },
-  { KNX_ENERGY_DAILY , false, false, KNX_Empty },
-  { KNX_ENERGY_START , false, false, KNX_Empty },
-  { KNX_ENERGY_TOTAL , false, false, KNX_Empty },
-  { KNX_SLOT1 , false, false, KNX_Empty },
-  { KNX_SLOT2 , false, false, KNX_Empty },
-  { KNX_SLOT3 , false, false, KNX_Empty },
-  { KNX_SLOT4 , false, false, KNX_Empty },
-  { KNX_SLOT5 , false, false, KNX_Empty },
-  { KNX_Empty, false, false, KNX_Empty}
-};
-
-
-const char * device_param_ga[] = {
-  D_TIMER_OUTPUT " 1",
-  D_TIMER_OUTPUT " 2",
-  D_TIMER_OUTPUT " 3",
-  D_TIMER_OUTPUT " 4",
-  D_TIMER_OUTPUT " 5",
-  D_TIMER_OUTPUT " 6",
-  D_TIMER_OUTPUT " 7",
-  D_TIMER_OUTPUT " 8",
-  D_SENSOR_BUTTON " 1",
-  D_SENSOR_BUTTON " 2",
-  D_SENSOR_BUTTON " 3",
-  D_SENSOR_BUTTON " 4",
-  D_SENSOR_BUTTON " 5",
-  D_SENSOR_BUTTON " 6",
-  D_SENSOR_BUTTON " 7",
-  D_SENSOR_BUTTON " 8",
-  D_TEMPERATURE ,
-  D_HUMIDITY ,
-  D_VOLTAGE ,
-  D_CURRENT ,
-  D_POWERUSAGE ,
-  D_POWER_FACTOR ,
-  D_ENERGY_TODAY ,
-  D_ENERGY_YESTERDAY ,
-  D_ENERGY_TOTAL ,
-  D_KNX_TX_SLOT " 1",
-  D_KNX_TX_SLOT " 2",
-  D_KNX_TX_SLOT " 3",
-  D_KNX_TX_SLOT " 4",
-  D_KNX_TX_SLOT " 5",
-  nullptr
-};
-
-
-const char *device_param_cb[] = {
-  D_TIMER_OUTPUT " 1",
-  D_TIMER_OUTPUT " 2",
-  D_TIMER_OUTPUT " 3",
-  D_TIMER_OUTPUT " 4",
-  D_TIMER_OUTPUT " 5",
-  D_TIMER_OUTPUT " 6",
-  D_TIMER_OUTPUT " 7",
-  D_TIMER_OUTPUT " 8",
-  D_TIMER_OUTPUT " 1 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 2 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 3 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 4 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 5 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 6 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 7 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 8 " D_BUTTON_TOGGLE,
-  D_REPLY " " D_TEMPERATURE,
-  D_REPLY " " D_HUMIDITY,
-  D_REPLY " " D_VOLTAGE ,
-  D_REPLY " " D_CURRENT ,
-  D_REPLY " " D_POWERUSAGE ,
-  D_REPLY " " D_POWER_FACTOR ,
-  D_REPLY " " D_ENERGY_TODAY ,
-  D_REPLY " " D_ENERGY_YESTERDAY ,
-  D_REPLY " " D_ENERGY_TOTAL ,
-  D_KNX_RX_SLOT " 1",
-  D_KNX_RX_SLOT " 2",
-  D_KNX_RX_SLOT " 3",
-  D_KNX_RX_SLOT " 4",
-  D_KNX_RX_SLOT " 5",
-  nullptr
-};
-
-
-#define D_PRFX_KNX "Knx"
-#define D_CMND_KNXTXCMND "Tx_Cmnd"
-#define D_CMND_KNXTXVAL "Tx_Val"
-#define D_CMND_KNX_ENABLED "_Enabled"
-#define D_CMND_KNX_ENHANCED "_Enhanced"
-#define D_CMND_KNX_PA "_PA"
-#define D_CMND_KNX_GA "_GA"
-#define D_CMND_KNX_CB "_CB"
-
-const char kKnxCommands[] PROGMEM = D_PRFX_KNX "|"
-  D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB ;
-
-void (* const KnxCommand[])(void) PROGMEM = {
-  &CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb };
-
-uint8_t KNX_GA_Search( uint8_t param, uint8_t start = 0 )
-{
-  for (uint32_t i = start; i < Settings.knx_GA_registered; ++i)
-  {
-    if ( Settings.knx_GA_param[i] == param )
-    {
-      if ( Settings.knx_GA_addr[i] != 0 )
-      {
-         if ( i >= start ) { return i; }
-      }
-    }
-  }
-  return KNX_Empty;
-}
-
-
-uint8_t KNX_CB_Search( uint8_t param, uint8_t start = 0 )
-{
-  for (uint32_t i = start; i < Settings.knx_CB_registered; ++i)
-  {
-    if ( Settings.knx_CB_param[i] == param )
-    {
-      if ( Settings.knx_CB_addr[i] != 0 )
-      {
-         if ( i >= start ) { return i; }
-      }
-    }
-  }
-  return KNX_Empty;
-}
-
-
-void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF )
-{
-
-  if ( Settings.knx_GA_registered >= MAX_KNX_GA ) { return; }
-  if ( GA_FNUM == 0 && GA_AREA == 0 && GA_FDEF == 0 ) { return; }
-
-
-  Settings.knx_GA_param[Settings.knx_GA_registered] = GAop;
-  KNX_addr.ga.area = GA_FNUM;
-  KNX_addr.ga.line = GA_AREA;
-  KNX_addr.ga.member = GA_FDEF;
-  Settings.knx_GA_addr[Settings.knx_GA_registered] = KNX_addr.value;
-
-  Settings.knx_GA_registered++;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " GA #%d: %s " D_TO " %d/%d/%d"),
-   Settings.knx_GA_registered,
-   device_param_ga[GAop-1],
-   GA_FNUM, GA_AREA, GA_FDEF );
-}
-
-
-void KNX_DEL_GA( uint8_t GAnum )
-{
-
-  uint8_t dest_offset = 0;
-  uint8_t src_offset = 0;
-  uint8_t len = 0;
-
-
-  Settings.knx_GA_param[GAnum-1] = 0;
-
-  if (GAnum == 1)
-  {
-
-    src_offset = 1;
-
-
-
-    len = (Settings.knx_GA_registered - 1);
-  }
-  else if (GAnum == Settings.knx_GA_registered)
-  {
-
-  }
-  else
-  {
-
-
-
-
-    dest_offset = GAnum -1 ;
-    src_offset = dest_offset + 1;
-    len = (Settings.knx_GA_registered - GAnum);
-  }
-
-  if (len > 0)
-  {
-    memmove(Settings.knx_GA_param + dest_offset, Settings.knx_GA_param + src_offset, len * sizeof(uint8_t));
-    memmove(Settings.knx_GA_addr + dest_offset, Settings.knx_GA_addr + src_offset, len * sizeof(uint16_t));
-  }
-
-  Settings.knx_GA_registered--;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " GA #%d"),
-    GAnum );
-}
-
-
-void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF )
-{
-
-  if ( Settings.knx_CB_registered >= MAX_KNX_CB ) { return; }
-  if ( CB_FNUM == 0 && CB_AREA == 0 && CB_FDEF == 0 ) { return; }
-
-
-  if ( device_param[CBop-1].CB_id == KNX_Empty )
-  {
-
-    device_param[CBop-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[CBop-1]);
-
-
-
-
-  }
-
-  Settings.knx_CB_param[Settings.knx_CB_registered] = CBop;
-  KNX_addr.ga.area = CB_FNUM;
-  KNX_addr.ga.line = CB_AREA;
-  KNX_addr.ga.member = CB_FDEF;
-  Settings.knx_CB_addr[Settings.knx_CB_registered] = KNX_addr.value;
-
-  knx.callback_assign( device_param[CBop-1].CB_id, KNX_addr );
-
-  Settings.knx_CB_registered++;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " CB #%d: %d/%d/%d " D_TO " %s"),
-   Settings.knx_CB_registered,
-   CB_FNUM, CB_AREA, CB_FDEF,
-   device_param_cb[CBop-1] );
-}
-
-
-void KNX_DEL_CB( uint8_t CBnum )
-{
-  uint8_t oldparam = Settings.knx_CB_param[CBnum-1];
-  uint8_t dest_offset = 0;
-  uint8_t src_offset = 0;
-  uint8_t len = 0;
-
-
-  knx.callback_unassign(CBnum-1);
-  Settings.knx_CB_param[CBnum-1] = 0;
-
-  if (CBnum == 1)
-  {
-
-    src_offset = 1;
-
-
-
-    len = (Settings.knx_CB_registered - 1);
-  }
-  else if (CBnum == Settings.knx_CB_registered)
-  {
-
-  }
-  else
-  {
-
-
-
-
-    dest_offset = CBnum -1 ;
-    src_offset = dest_offset + 1;
-    len = (Settings.knx_CB_registered - CBnum);
-  }
-
-  if (len > 0)
-  {
-    memmove(Settings.knx_CB_param + dest_offset, Settings.knx_CB_param + src_offset, len * sizeof(uint8_t));
-    memmove(Settings.knx_CB_addr + dest_offset, Settings.knx_CB_addr + src_offset, len * sizeof(uint16_t));
-  }
-
-  Settings.knx_CB_registered--;
-
-
-  if ( KNX_CB_Search( oldparam ) == KNX_Empty ) {
-    knx.callback_deregister( device_param[oldparam-1].CB_id );
-    device_param[oldparam-1].CB_id = KNX_Empty;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " CB #%d"), CBnum );
-}
-
-
-bool KNX_CONFIG_NOT_MATCH(void)
-{
-
-  for (uint32_t i = 0; i < KNX_MAX_device_param; ++i)
-  {
-    if ( !device_param[i].show ) {
-
-
-
-      if ( KNX_GA_Search(i+1) != KNX_Empty ) { return true; }
-
-      if ( i < 8 )
-      {
-        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
-        if ( KNX_CB_Search(i+9) != KNX_Empty ) { return true; }
-      }
-
-      if ( i > 15 )
-      {
-        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
-      }
-    }
-  }
-
-
-  for (uint32_t i = 0; i < Settings.knx_GA_registered; ++i)
-  {
-    if ( Settings.knx_GA_param[i] != 0 )
-    {
-      if ( Settings.knx_GA_addr[i] == 0 )
-      {
-         return true;
-      }
-    }
-  }
-  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
-  {
-    if ( Settings.knx_CB_param[i] != 0 )
-    {
-      if ( Settings.knx_CB_addr[i] == 0 )
-      {
-         return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-
-void KNXStart(void)
-{
-  knx.start(nullptr);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_START));
-}
-
-
-void KNX_INIT(void)
-{
-
-  if (Settings.knx_GA_registered > MAX_KNX_GA) { Settings.knx_GA_registered = MAX_KNX_GA; }
-  if (Settings.knx_CB_registered > MAX_KNX_CB) { Settings.knx_CB_registered = MAX_KNX_CB; }
-
-
-  KNX_physs_addr.value = Settings.knx_physsical_addr;
-  knx.physical_address_set( KNX_physs_addr );
-# 472 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
-  for (uint32_t i = 0; i < devices_present; ++i)
-  {
-    device_param[i].show = true;
-  }
-  for (uint32_t i = GPIO_SWT1; i < GPIO_SWT4 + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1 + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_KEY1; i < GPIO_KEY4 + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1 + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_SWT1_NP; i < GPIO_SWT4_NP + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1_NP + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_KEY1_NP; i < GPIO_KEY4_NP + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1_NP + 8].show = true; }
-  }
-  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-#ifdef USE_DS18x20
-  if (GetUsedInModule(GPIO_DSB, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-#endif
-  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-
-#if defined(USE_ENERGY_SENSOR)
-
-  if ( energy_flg != ENERGY_NONE ) {
-    device_param[KNX_ENERGY_POWER-1].show = true;
-    device_param[KNX_ENERGY_DAILY-1].show = true;
-    device_param[KNX_ENERGY_START-1].show = true;
-    device_param[KNX_ENERGY_TOTAL-1].show = true;
-    device_param[KNX_ENERGY_VOLTAGE-1].show = true;
-    device_param[KNX_ENERGY_CURRENT-1].show = true;
-    device_param[KNX_ENERGY_POWERFACTOR-1].show = true;
-  }
-#endif
-
-#ifdef USE_RULES
-  device_param[KNX_SLOT1-1].show = true;
-  device_param[KNX_SLOT2-1].show = true;
-  device_param[KNX_SLOT3-1].show = true;
-  device_param[KNX_SLOT4-1].show = true;
-  device_param[KNX_SLOT5-1].show = true;
-#endif
-
-
-  if (KNX_CONFIG_NOT_MATCH()) {
-    Settings.knx_GA_registered = 0;
-    Settings.knx_CB_registered = 0;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " " D_KNX_PARAMETERS));
-  }
-
-
-
-
-  uint8_t j;
-  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
-  {
-    j = Settings.knx_CB_param[i];
-    if ( j > 0 )
-    {
-      device_param[j-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[j-1]);
-
-
-
-      KNX_addr.value = Settings.knx_CB_addr[i];
-      knx.callback_assign( device_param[j-1].CB_id, KNX_addr );
-    }
-  }
-}
-
-
-void KNX_CB_Action(message_t const &msg, void *arg)
-{
-  device_parameters_t *chan = (device_parameters_t *)arg;
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  char tempchar[33];
-
-  if (msg.data_len == 1) {
-
-    tempchar[0] = msg.data[0];
-    tempchar[1] = '\0';
-  } else {
-
-    float tempvar = knx.data_to_2byte_float(msg.data);
-    dtostrfd(tempvar,2,tempchar);
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX D_RECEIVED_FROM " %d.%d.%d " D_COMMAND " %s: %s " D_TO " %s"),
-   msg.received_on.ga.area, msg.received_on.ga.line, msg.received_on.ga.member,
-   (msg.ct == KNX_CT_WRITE) ? D_KNX_COMMAND_WRITE : (msg.ct == KNX_CT_READ) ? D_KNX_COMMAND_READ : D_KNX_COMMAND_OTHER,
-   tempchar,
-   device_param_cb[(chan->type)-1]);
-
-  switch (msg.ct)
-  {
-    case KNX_CT_WRITE:
-      if (chan->type < 9)
-      {
-        ExecuteCommandPower(chan->type, msg.data[0], SRC_KNX);
-      }
-      else if (chan->type < 17)
-      {
-        if (!toggle_inhibit) {
-          ExecuteCommandPower((chan->type) -8, POWER_TOGGLE, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#ifdef USE_RULES
-      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
-      {
-        if (!toggle_inhibit) {
-          char command[25];
-          if (msg.data_len == 1) {
-
-            snprintf_P(command, sizeof(command), PSTR("event KNXRX_CMND%d=%d"), ((chan->type) - KNX_SLOT1 + 1 ), msg.data[0]);
-          } else {
-
-            snprintf_P(command, sizeof(command), PSTR("event KNXRX_VAL%d=%s"), ((chan->type) - KNX_SLOT1 + 1 ), tempchar);
-          }
-          ExecuteCommand(command, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#endif
-      break;
-
-    case KNX_CT_READ:
-      if (chan->type < 9)
-      {
-        knx.answer_1bit(msg.received_on, chan->last_state);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_1bit(msg.received_on, chan->last_state);
-          knx.answer_1bit(msg.received_on, chan->last_state);
-        }
-      }
-      else if (chan->type == KNX_TEMPERATURE)
-      {
-        knx.answer_2byte_float(msg.received_on, last_temp);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_2byte_float(msg.received_on, last_temp);
-          knx.answer_2byte_float(msg.received_on, last_temp);
-        }
-      }
-      else if (chan->type == KNX_HUMIDITY)
-      {
-        knx.answer_2byte_float(msg.received_on, last_hum);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_2byte_float(msg.received_on, last_hum);
-          knx.answer_2byte_float(msg.received_on, last_hum);
-        }
-      }
-#ifdef USE_RULES
-      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
-      {
-        if (!toggle_inhibit) {
-          char command[25];
-          snprintf_P(command, sizeof(command), PSTR("event KNXRX_REQ%d"), ((chan->type) - KNX_SLOT1 + 1 ) );
-          ExecuteCommand(command, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#endif
-      break;
-  }
-}
-
-
-void KnxUpdatePowerState(uint8_t device, power_t state)
-{
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  device_param[device -1].last_state = bitRead(state, device -1);
-
-
-  uint8_t i = KNX_GA_Search(device);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-     device_param_ga[device -1], device_param[device -1].last_state,
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(device, i + 1);
-  }
-}
-
-
-void KnxSendButtonPower(void)
-{
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
-  uint32_t device = XdrvMailbox.payload & 0xFF;
-  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
-# 693 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_11_knx.ino"
-  uint8_t i = KNX_GA_Search(device + 8);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_1bit(KNX_addr, !(state == 0));
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_1bit(KNX_addr, !(state == 0));
-      knx.write_1bit(KNX_addr, !(state == 0));
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-     device_param_ga[device + 7], !(state == 0),
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(device + 8, i + 1);
-  }
-
-}
-
-
-void KnxSensor(uint8_t sensor_type, float value)
-{
-  if (sensor_type == KNX_TEMPERATURE)
-  {
-    last_temp = value;
-  } else if (sensor_type == KNX_HUMIDITY)
-  {
-    last_hum = value;
-  }
-
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  uint8_t i = KNX_GA_Search(sensor_type);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_2byte_float(KNX_addr, value);
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_2byte_float(KNX_addr, value);
-      knx.write_2byte_float(KNX_addr, value);
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "),
-     device_param_ga[sensor_type -1],
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(sensor_type, i+1);
-  }
-}
-
-
-
-
-
-
-#ifdef USE_WEBSERVER
-#ifdef USE_KNX_WEB_MENU
-const char S_CONFIGURE_KNX[] PROGMEM = D_CONFIGURE_KNX;
-
-const char HTTP_BTN_MENU_KNX[] PROGMEM =
-  "<p><form action='kn' method='get'><button>" D_CONFIGURE_KNX "</button></form></p>";
-
-const char HTTP_FORM_KNX[] PROGMEM =
-  "<fieldset style='min-width:530px;'>"
-  "<legend style='text-align:left;'><b>&nbsp;" D_KNX_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='kn'>"
-  "<br><center>"
-  "<b>" D_KNX_PHYSICAL_ADDRESS " </b>"
-  "<input style='width:12%%;' type='number' name='area' min='0' max='15' value='%d'> . "
-  "<input style='width:12%%;' type='number' name='line' min='0' max='15' value='%d'> . "
-  "<input style='width:12%%;' type='number' name='member' min='0' max='255' value='%d'>"
-  "<br><br>" D_KNX_PHYSICAL_ADDRESS_NOTE "<br><br>"
-  "<input id='b1' type='checkbox'";
-
-const char HTTP_FORM_KNX1[] PROGMEM =
-  "><b>" D_KNX_ENABLE "</b>&emsp;<input id='b2' type='checkbox'";
-
-const char HTTP_FORM_KNX2[] PROGMEM =
-  "><b>" D_KNX_ENHANCEMENT "</b><br></center><br>"
-
-  "<fieldset><center>"
-  "<b>" D_KNX_GROUP_ADDRESS_TO_WRITE "</b><hr>"
-
-  "<select name='GAop' style='width:25%%;'>";
-
-const char HTTP_FORM_KNX_OPT[] PROGMEM =
-  "<option value='%d'>%s</option>";
-
-const char HTTP_FORM_KNX_GA[] PROGMEM =
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='31' value='0'> / "
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='7' value='0'> / "
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='255' value='0'> ";
-
-const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM =
-  "<button type='submit' onclick='%s()' %s name='btn_add' value='%d' style='width:18%%;'>" D_ADD "</button><br><br>"
-  "<table style='width:80%%; font-size: 14px;'><col width='250'><col width='30'>";
-
-const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM =
-  "<tr><td><b>%s -> %d / %d / %d </b></td>"
-  "<td><button type='submit' name='btn_del_ga' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
-
-const char HTTP_FORM_KNX3[] PROGMEM =
-  "</table></center></fieldset><br>"
-  "<fieldset><form method='post' action='kn'><center>"
-  "<b>" D_KNX_GROUP_ADDRESS_TO_READ "</b><hr>";
-
-const char HTTP_FORM_KNX4[] PROGMEM =
-  "-> <select name='CBop' style='width:25%%;'>";
-
-const char HTTP_FORM_KNX_ADD_TABLE_ROW2[] PROGMEM =
-  "<tr><td><b>%d / %d / %d -> %s</b></td>"
-  "<td><button type='submit' name='btn_del_cb' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
-
-void HandleKNXConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_KNX);
-
-  char tmp[100];
-  String stmp;
-
-  if ( WebServer->hasArg("save") ) {
-    KNX_Save_Settings();
-    HandleConfiguration();
-  }
-  else
-  {
-    if ( WebServer->hasArg("btn_add") ) {
-      if ( WebServer->arg("btn_add") == "1" ) {
-
-        stmp = WebServer->arg("GAop");
-        uint8_t GAop = stmp.toInt();
-        stmp = WebServer->arg("GA_FNUM");
-        uint8_t GA_FNUM = stmp.toInt();
-        stmp = WebServer->arg("GA_AREA");
-        uint8_t GA_AREA = stmp.toInt();
-        stmp = WebServer->arg("GA_FDEF");
-        uint8_t GA_FDEF = stmp.toInt();
-
-        if (GAop) {
-          KNX_ADD_GA( GAop, GA_FNUM, GA_AREA, GA_FDEF );
-        }
-      }
-      else
-      {
-
-        stmp = WebServer->arg("CBop");
-        uint8_t CBop = stmp.toInt();
-        stmp = WebServer->arg("CB_FNUM");
-        uint8_t CB_FNUM = stmp.toInt();
-        stmp = WebServer->arg("CB_AREA");
-        uint8_t CB_AREA = stmp.toInt();
-        stmp = WebServer->arg("CB_FDEF");
-        uint8_t CB_FDEF = stmp.toInt();
-
-        if (CBop) {
-          KNX_ADD_CB( CBop, CB_FNUM, CB_AREA, CB_FDEF );
-        }
-      }
-    }
-    else if ( WebServer->hasArg("btn_del_ga") )
-    {
-
-      stmp = WebServer->arg("btn_del_ga");
-      uint8_t GA_NUM = stmp.toInt();
-
-      KNX_DEL_GA(GA_NUM);
-
-    }
-    else if ( WebServer->hasArg("btn_del_cb") )
-    {
-
-      stmp = WebServer->arg("btn_del_cb");
-      uint8_t CB_NUM = stmp.toInt();
-
-      KNX_DEL_CB(CB_NUM);
-
-    }
-
-    WSContentStart_P(S_CONFIGURE_KNX);
-    WSContentSend_P(
-      PSTR("function GAwarning()"
-          "{"
-            "var GA_FNUM=eb('GA_FNUM');"
-            "var GA_AREA=eb('GA_AREA');"
-            "var GA_FDEF=eb('GA_FDEF');"
-            "if(GA_FNUM!=null&&GA_FNUM.value=='0'&&GA_AREA.value=='0'&&GA_FDEF.value=='0'){"
-              "alert('" D_KNX_WARNING "');"
-            "}"
-          "}"
-          "function CBwarning()"
-          "{"
-            "var CB_FNUM=eb('CB_FNUM');"
-            "var CB_AREA=eb('CB_AREA');"
-            "var CB_FDEF=eb('CB_FDEF');"
-            "if(CB_FNUM!=null&&CB_FNUM.value=='0'&&CB_AREA.value=='0'&&CB_FDEF.value=='0'){"
-              "alert('" D_KNX_WARNING "');"
-            "}"
-          "}"));
-    WSContentSendStyle();
-    KNX_physs_addr.value = Settings.knx_physsical_addr;
-    WSContentSend_P(HTTP_FORM_KNX, KNX_physs_addr.pa.area, KNX_physs_addr.pa.line, KNX_physs_addr.pa.member);
-    if ( Settings.flag.knx_enabled ) { WSContentSend_P(PSTR(" checked")); }
-    WSContentSend_P(HTTP_FORM_KNX1);
-    if ( Settings.flag.knx_enable_enhancement ) { WSContentSend_P(PSTR(" checked")); }
-
-    WSContentSend_P(HTTP_FORM_KNX2);
-    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
-    {
-      if ( device_param[i].show )
-      {
-        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_ga[i]);
-      }
-    }
-    WSContentSend_P(PSTR("</select> -> "));
-    WSContentSend_P(HTTP_FORM_KNX_GA, "GA_FNUM", "GA_AREA", "GA_FDEF");
-    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "GAwarning", (Settings.knx_GA_registered < MAX_KNX_GA) ? "" : "disabled", 1);
-    for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
-    {
-      if ( Settings.knx_GA_param[i] )
-      {
-        KNX_addr.value = Settings.knx_GA_addr[i];
-        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW, device_param_ga[Settings.knx_GA_param[i]-1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, i +1);
-      }
-    }
-
-    WSContentSend_P(HTTP_FORM_KNX3);
-    WSContentSend_P(HTTP_FORM_KNX_GA, "CB_FNUM", "CB_AREA", "CB_FDEF");
-    WSContentSend_P(HTTP_FORM_KNX4);
-
-    uint8_t j;
-    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
-    {
-
-      if ( (i > 8) && (i < 16) ) { j=i-8; } else { j=i; }
-      if ( i == 8 ) { j = 0; }
-      if ( device_param[j].show )
-      {
-        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_cb[i]);
-      }
-    }
-    WSContentSend_P(PSTR("</select> "));
-    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "CBwarning", (Settings.knx_CB_registered < MAX_KNX_CB) ? "" : "disabled", 2);
-
-    for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
-    {
-      if ( Settings.knx_CB_param[i] )
-      {
-        KNX_addr.value = Settings.knx_CB_addr[i];
-        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW2, KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, device_param_cb[Settings.knx_CB_param[i]-1], i +1);
-      }
-    }
-    WSContentSend_P(PSTR("</table></center></fieldset>"));
-    WSContentSend_P(HTTP_FORM_END);
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentStop();
-  }
-
-}
-
-
-void KNX_Save_Settings(void)
-{
-  String stmp;
-  address_t KNX_addr;
-
-  Settings.flag.knx_enabled = WebServer->hasArg("b1");
-  Settings.flag.knx_enable_enhancement = WebServer->hasArg("b2");
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ENABLED ": %d, " D_KNX_ENHANCEMENT ": %d"),
-   Settings.flag.knx_enabled, Settings.flag.knx_enable_enhancement );
-
-  stmp = WebServer->arg("area");
-  KNX_addr.pa.area = stmp.toInt();
-  stmp = WebServer->arg("line");
-  KNX_addr.pa.line = stmp.toInt();
-  stmp = WebServer->arg("member");
-  KNX_addr.pa.member = stmp.toInt();
-  Settings.knx_physsical_addr = KNX_addr.value;
-  knx.physical_address_set( KNX_addr );
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_KNX_PHYSICAL_ADDRESS ": %d.%d.%d "),
-   KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA: %d"),
-   Settings.knx_GA_registered );
-  for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
-  {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"),
-     i+1, device_param_ga[Settings.knx_GA_param[i]-1],
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB: %d"),
-   Settings.knx_CB_registered );
-  for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
-  {
-    KNX_addr.value = Settings.knx_CB_addr[i];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"),
-     i+1,
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member,
-     device_param_cb[Settings.knx_CB_param[i]-1] );
-  }
-}
-
-#endif
-#endif
-
-
-
-
-
-void CmndKnxTxCmnd(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
-
-
-
-    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
-    while ( i != KNX_Empty ) {
-      KNX_addr.value = Settings.knx_GA_addr[i];
-      knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-      if (Settings.flag.knx_enable_enhancement) {
-        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-      }
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], !(XdrvMailbox.payload == 0),
-       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
-    }
-    ResponseCmndIdxChar (XdrvMailbox.data );
-  }
-}
-
-void CmndKnxTxVal(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
-
-
-
-    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
-    while ( i != KNX_Empty ) {
-      KNX_addr.value = Settings.knx_GA_addr[i];
-
-      float tempvar = CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar,2,XdrvMailbox.data);
-
-      knx.write_2byte_float(KNX_addr, tempvar);
-      if (Settings.flag.knx_enable_enhancement) {
-        knx.write_2byte_float(KNX_addr, tempvar);
-        knx.write_2byte_float(KNX_addr, tempvar);
-      }
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d.%d.%d"),
-       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
-       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
-    }
-    ResponseCmndIdxChar (XdrvMailbox.data );
-  }
-}
-
-void CmndKnxEnabled(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    Settings.flag.knx_enabled = XdrvMailbox.payload;
-  }
-  ResponseCmndChar (GetStateText(Settings.flag.knx_enabled) );
-}
-
-void CmndKnxEnhanced(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    Settings.flag.knx_enable_enhancement = XdrvMailbox.payload;
-  }
-  ResponseCmndChar (GetStateText(Settings.flag.knx_enable_enhancement) );
-}
-
-void CmndKnxPa(void)
-{
-  if (XdrvMailbox.data_len) {
-    if (strstr(XdrvMailbox.data, ".") != nullptr) {
-      char sub_string[XdrvMailbox.data_len];
-
-      int pa_area = atoi(subStr(sub_string, XdrvMailbox.data, ".", 1));
-      int pa_line = atoi(subStr(sub_string, XdrvMailbox.data, ".", 2));
-      int pa_member = atoi(subStr(sub_string, XdrvMailbox.data, ".", 3));
-
-      if ( ((pa_area == 0) && (pa_line == 0) && (pa_member == 0))
-            || (pa_area > 15) || (pa_line > 15) || (pa_member > 255) ) {
-              Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-              return;
-      }
-
-      KNX_addr.pa.area = pa_area;
-      KNX_addr.pa.line = pa_line;
-      KNX_addr.pa.member = pa_member;
-      Settings.knx_physsical_addr = KNX_addr.value;
-    }
-  }
-  KNX_addr.value = Settings.knx_physsical_addr;
-  Response_P (PSTR("{\"%s\":\"%d.%d.%d\"}"),
-    XdrvMailbox.command, KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
-}
-
-void CmndKnxGa(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_GA)) {
-    if (XdrvMailbox.data_len) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len];
-
-        int ga_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        int ga_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        int ga_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        int ga_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-
-        if ( ((ga_area == 0) && (ga_line == 0) && (ga_member == 0))
-          || (ga_area > 31) || (ga_line > 7) || (ga_member > 255)
-          || (ga_option < 0) || ((ga_option > KNX_MAX_device_param ) && (ga_option != KNX_Empty))
-          || (!device_param[ga_option-1].show) ) {
-               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-               return;
-        }
-
-        KNX_addr.ga.area = ga_area;
-        KNX_addr.ga.line = ga_line;
-        KNX_addr.ga.member = ga_member;
-
-        if ( XdrvMailbox.index > Settings.knx_GA_registered ) {
-          Settings.knx_GA_registered ++;
-          XdrvMailbox.index = Settings.knx_GA_registered;
-        }
-
-        Settings.knx_GA_addr[XdrvMailbox.index -1] = KNX_addr.value;
-        Settings.knx_GA_param[XdrvMailbox.index -1] = ga_option;
-      } else {
-        if ( (XdrvMailbox.payload <= Settings.knx_GA_registered) && (XdrvMailbox.payload > 0) ) {
-          XdrvMailbox.index = XdrvMailbox.payload;
-        } else {
-          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-          return;
-        }
-      }
-      if ( XdrvMailbox.index <= Settings.knx_GA_registered ) {
-        KNX_addr.value = Settings.knx_GA_addr[XdrvMailbox.index -1];
-        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
-          XdrvMailbox.command, XdrvMailbox.index, device_param_ga[Settings.knx_GA_param[XdrvMailbox.index-1]-1],
-          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-      }
-    } else {
-      ResponseCmndNumber (Settings.knx_GA_registered );
-    }
-  }
-}
-
-void CmndKnxCb(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_CB)) {
-    if (XdrvMailbox.data_len) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len];
-
-        int cb_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        int cb_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        int cb_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        int cb_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-
-        if ( ((cb_area == 0) && (cb_line == 0) && (cb_member == 0))
-          || (cb_area > 31) || (cb_line > 7) || (cb_member > 255)
-          || (cb_option < 0) || ((cb_option > KNX_MAX_device_param ) && (cb_option != KNX_Empty))
-          || (!device_param[cb_option-1].show) ) {
-               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-               return;
-        }
-
-        KNX_addr.ga.area = cb_area;
-        KNX_addr.ga.line = cb_line;
-        KNX_addr.ga.member = cb_member;
-
-        if ( XdrvMailbox.index > Settings.knx_CB_registered ) {
-          Settings.knx_CB_registered ++;
-          XdrvMailbox.index = Settings.knx_CB_registered;
-        }
-
-        Settings.knx_CB_addr[XdrvMailbox.index -1] = KNX_addr.value;
-        Settings.knx_CB_param[XdrvMailbox.index -1] = cb_option;
-      } else {
-        if ( (XdrvMailbox.payload <= Settings.knx_CB_registered) && (XdrvMailbox.payload > 0) ) {
-          XdrvMailbox.index = XdrvMailbox.payload;
-        } else {
-          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-          return;
-        }
-      }
-      if ( XdrvMailbox.index <= Settings.knx_CB_registered ) {
-        KNX_addr.value = Settings.knx_CB_addr[XdrvMailbox.index -1];
-        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
-          XdrvMailbox.command, XdrvMailbox.index, device_param_cb[Settings.knx_CB_param[XdrvMailbox.index-1]-1],
-          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-      }
-    } else {
-      ResponseCmndNumber (Settings.knx_CB_registered );
-    }
-  }
-}
-
-
-
-
-
-bool Xdrv11(uint8_t function)
-{
-  bool result = false;
-    switch (function) {
-      case FUNC_LOOP:
-        if (!global_state.wifi_down) { knx.loop(); }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (toggle_inhibit) {
-          toggle_inhibit--;
-        }
-        break;
-      case FUNC_ANY_KEY:
-        KnxSendButtonPower();
-        break;
-#ifdef USE_WEBSERVER
-#ifdef USE_KNX_WEB_MENU
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_KNX);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/kn", HandleKNXConfiguration);
-        break;
-#endif
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kKnxCommands, KnxCommand);
-        break;
-      case FUNC_PRE_INIT:
-        KNX_INIT();
-        break;
-
-
-    }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_12_home_assistant.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_12_home_assistant.ino"
-#ifdef USE_HOME_ASSISTANT
-
-#define XDRV_12 12
-
-
-const char kHAssJsonSensorTypes[] PROGMEM =
-  D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
-  D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
-  D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
-  D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
-const char kHAssJsonSensorUnits[] PROGMEM =
-  "|||"
-  "W|%|A|Cm|Hz|%|LX|"
-  "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
-  "W|KWh|KWh|V|Kg|KWh";
-const char kHAssJsonSensorDevCla[] PROGMEM =
-  "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
-  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
-  "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
-  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
-  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
-
-
-const char HASS_DISCOVER_SENSOR[] PROGMEM =
-    ",\"unit_of_meas\":\"%s\",\"%s\","
-    "\"frc_upd\":true,"
-    "\"val_tpl\":\"{{value_json['%s']['%s']";
-
-const char HASS_DISCOVER_BASE[] PROGMEM =
-    "{\"name\":\"%s\","
-    "\"stat_t\":\"%s\","
-    "\"avty_t\":\"%s\","
-    "\"pl_avail\":\"" D_ONLINE "\","
-    "\"pl_not_avail\":\"" D_OFFLINE "\"";
-
-const char HASS_DISCOVER_RELAY[] PROGMEM =
-    ",\"cmd_t\":\"%s\","
-    "\"val_tpl\":\"{{value_json.%s}}\","
-    "\"pl_off\":\"%s\","
-    "\"pl_on\":\"%s\"";
-
-const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
-    ",\"value_template\":\"{%%if is_state(entity_id,\\\"off\\\")-%%}ON{%%-endif%%}\","
-    "\"off_delay\":1";
-
-const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
-    ",\"value_template\":\"{{value_json.%s}}\","
-    "\"frc_upd\":true,"
-    "\"pl_on\":\"%s\","
-    "\"pl_off\":\"%s\"";
-
-const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
-    ",\"bri_cmd_t\":\"%s\","
-    "\"bri_stat_t\":\"%s\","
-    "\"bri_scl\":100,"
-    "\"on_cmd_type\":\"%s\","
-    "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
-
-const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
-    ",\"rgb_cmd_t\":\"%s2\","
-    "\"rgb_stat_t\":\"%s\","
-    "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
-
-const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
-    ",\"whit_val_cmd_t\":\"%s\","
-    "\"whit_val_stat_t\":\"%s\","
-    "\"white_value_scale\":100,"
-    "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
-
-const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
-    ",\"clr_temp_cmd_t\":\"%s\","
-    "\"clr_temp_stat_t\":\"%s\","
-    "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
-
-const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
-    ",\"fx_cmd_t\":\"%s\","
-    "\"fx_stat_t\":\"%s\","
-    "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
-    "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]";
-
-const char HASS_DISCOVER_SENSOR_HASS_STATUS[] PROGMEM =
-    ",\"json_attributes_topic\":\"%s\","
-    "\"unit_of_meas\":\" \","
-    "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\","
-    "\"ic\":\"mdi:information-outline\"";
-
-const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
-    ",\"uniq_id\":\"%s\","
-    "\"device\":{\"identifiers\":[\"%06X\"],"
-    "\"connections\":[[\"mac\",\"%s\"]],"
-    "\"name\":\"%s\","
-    "\"model\":\"%s\","
-    "\"sw_version\":\"%s%s\","
-    "\"manufacturer\":\"Tasmota\"}";
-
-const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
-    ",\"uniq_id\":\"%s\","
-    "\"device\":{\"identifiers\":[\"%06X\"],"
-    "\"connections\":[[\"mac\",\"%s\"]]}";
-
-uint8_t hass_init_step = 0;
-uint8_t hass_mode = 0;
-int hass_tele_period = 0;
-
-void TryResponseAppend_P(const char *format, ...)
-{
-  va_list args;
-  va_start(args, format);
-  char dummy[2];
-  int dlen = vsnprintf_P(dummy, 1, format, args);
-
-  int mlen = strlen(mqtt_data);
-  int slen = sizeof(mqtt_data) - 1 - mlen;
-  if (dlen >= slen)
-  {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: MQTT discovery failed due to too long topic or friendly name. "
-                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"),
-              dlen, slen);
-    va_start(args, format);
-    vsnprintf_P(log_data, sizeof(log_data), format, args);
-    AddLog(LOG_LEVEL_ERROR);
-  }
-  else
-  {
-    va_start(args, format);
-    vsnprintf_P(mqtt_data + mlen, slen, format, args);
-  }
-  va_end(args);
-}
-
-void HAssAnnounceRelayLight(void)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char stemp3[TOPSZ];
-  char unique_id[30];
-  bool is_light = false;
-  bool is_topic_light = false;
-
-  for (uint32_t i = 1; i <= MAX_RELAYS; i++)
-  {
-    is_light = ((i == devices_present) && (light_type));
-    is_topic_light = Settings.flag.hass_light || is_light;
-
-    mqtt_data[0] = '\0';
-
-
-    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "RL" : "LI", i);
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
-               (is_topic_light) ? "switch" : "light", unique_id);
-    MqttPublish(stopic, true);
-
-    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "LI" : "RL", i);
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
-               (is_topic_light) ? "light" : "switch", unique_id);
-
-    if (Settings.flag.hass_discovery && (i <= devices_present))
-    {
-      char name[33 + 2];
-      char value_template[33];
-      char prefix[TOPSZ];
-      char *command_topic = stemp1;
-      char *state_topic = stemp2;
-      char *availability_topic = stemp3;
-
-      if (i > MAX_FRIENDLYNAMES)
-      {
-        snprintf_P(name, sizeof(name), PSTR("%s %d"), SettingsText(SET_FRIENDLYNAME1), i);
-      }
-      else
-      {
-        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 + i - 1));
-      }
-      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable);
-      GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
-      GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
-      GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-      TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
-      TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-#ifdef USE_LIGHT
-      if (is_light)
-      {
-        char *brightness_command_topic = stemp1;
-
-        GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
-        strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3));
-        TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
-
-        if (Light.subtype >= LST_RGB)
-        {
-          char *rgb_command_topic = stemp1;
-
-          GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_COLOR, rgb_command_topic, state_topic);
-
-          char *effect_command_topic = stemp1;
-          GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
-        }
-        if (LST_RGBW == Light.subtype)
-        {
-          char *white_temp_command_topic = stemp1;
-
-          GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
-        }
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
-        {
-          char *color_temp_command_topic = stemp1;
-
-          GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
-        }
-      }
-#endif
-      TryResponseAppend_P(PSTR("}"));
-    }
-    MqttPublish(stopic, true);
-  }
-}
-
-void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle)
-{
-
-
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-  mqtt_data[0] = '\0';
-
-
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key ? "SW" : "BTN", device + 1);
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
-
-  if (Settings.flag.hass_discovery && present)
-  {
-    char name[33 + 6];
-    char value_template[33];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-    char jsoname[8];
-
-    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key ? "Switch" : "Button", device + 1);
-    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
-    GetPowerDevice(value_template, device + 1, sizeof(value_template),
-                   key + Settings.flag.device_index_enable);
-    GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-    if (toggle) {
-      if (!key) {
-        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE);
-      } else {
-        TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
-      }
-    } else {
-      TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
-    }
-    TryResponseAppend_P(PSTR("}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssAnnounceSwitches(void)
-{
-  char sw_topic[TOPSZ];
-
-
-  char *tmp = SettingsText(SET_MQTT_SWITCH_TOPIC);
-  Format(sw_topic, tmp, sizeof(sw_topic));
-  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0)
-  {
-    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++)
-    {
-      uint8_t switch_present = 0;
-      uint8_t toggle = 1;
-
-      if (pin[GPIO_SWT1 + switch_index] < 99)
-      {
-        switch_present = 1;
-      }
-
-
-      if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
-          Settings.flag3.button_switch_force_local ||
-          !strcmp(mqtt_topic, sw_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), sw_topic))
-      {
-        toggle = 0;
-      }
-      HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 1, toggle);
-    }
-  }
-}
-
-void HAssAnnounceButtons(void)
-{
-  char key_topic[TOPSZ];
-
-
-  char *tmp = SettingsText(SET_MQTT_BUTTON_TOPIC);
-  Format(key_topic, tmp, sizeof(key_topic));
-  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0)
-  {
-    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++)
-    {
-      uint8_t button_present = 0;
-      uint8_t toggle = 1;
-
-      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)))
-      {
-        button_present = 1;
-      }
-      else
-      {
-        if (pin[GPIO_KEY1 + button_index] < 99)
-        {
-          button_present = 1;
-        }
-      }
-
-
-      if (Settings.flag3.button_switch_force_local ||
-          !strcmp(mqtt_topic, key_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic))
-      {
-        toggle = 0;
-      }
-      HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 0, toggle);
-    }
-  }
-}
-
-void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-  mqtt_data[0] = '\0';
-
-  char subname[20];
-  NoAlNumToUnderscore(subname, MultiSubName);
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
-
-  if (Settings.flag.hass_discovery)
-  {
-    char name[33 + 42];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
-    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-    char jname[32];
-    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
-    if (sensor_index > -1) {
-      char param1[20];
-      GetTextIndexed(param1, sizeof(param1), sensor_index, kHAssJsonSensorUnits);
-      switch (sensor_index) {
-        case 0:
-          snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit());
-          break;
-        case 1:
-        case 2:
-          snprintf_P(param1, sizeof(param1), PSTR("%s"), PressureUnit().c_str());
-          break;
-      }
-      char param2[50];
-      GetTextIndexed(param2, sizeof(param2), sensor_index, kHAssJsonSensorDevCla);
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
-      if (subidx) {
-        TryResponseAppend_P(PSTR("[%d]"), subqty -1);
-      }
-    } else {
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR, " ", "ic\":\"mdi:eye", sensorname, subsensortype);
-    }
-    TryResponseAppend_P(PSTR("}}\"}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssAnnounceSensors(void)
-{
-  uint8_t hass_xsns_index = 0;
-  bool is_sensor = true;
-  uint8_t subqty = 0;
-  do
-  {
-    mqtt_data[0] = '\0';
-    int tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index);
-    tele_period = tele_period_save;
-
-    char sensordata[512];
-    strlcpy(sensordata, mqtt_data, sizeof(sensordata));
-
-    if (strlen(sensordata))
-    {
-      sensordata[0] = '{';
-      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);
-
-
-
-      StaticJsonBuffer<500> jsonBuffer;
-      JsonObject &root = jsonBuffer.parseObject(sensordata);
-      if (!root.success())
-      {
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: jsonBuffer failed to parse '%s'"), sensordata);
-        continue;
-      }
-      for (auto sensor : root)
-      {
-        const char *sensorname = sensor.key;
-        JsonObject &sensors = sensor.value.as<JsonObject>();
-        if (!sensors.success())
-        {
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: JsonObject failed to parse '%s'"), sensordata);
-          continue;
-        }
-        for (auto subsensor : sensors)
-        {
-
-          if (subsensor.value.is<JsonArray&>()) {
-            JsonArray& subsensors = subsensor.value.as<JsonArray&>();
-            subqty = subsensors.size();
-            char MultiSubName[20];
-            for (int i = 1; i <= subqty; i++) {
-              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s %d"), subsensor.key, i);
-              HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
-            }
-          } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}
-        }
-      }
-    }
-    yield();
-  } while (hass_xsns_index != 0);
-}
-
-void HAssAnnounceStatusSensor(void)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-
-  mqtt_data[0] = '\0';
-
-
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_status"), ESP.getChipId());
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-
-  if (Settings.flag.hass_discovery)
-  {
-    char name[33 + 7];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-
-    snprintf_P(name, sizeof(name), PSTR("%s status"), SettingsText(SET_FRIENDLYNAME1));
-    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
-                        SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
-
-    TryResponseAppend_P(PSTR("}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssPublishStatus(void)
-{
-  Response_P(PSTR("{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\","
-                  "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
-                  "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
-                  "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
-                  "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
-                  "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
-             my_version, my_image, GetBuildDateAndTime().c_str(), ESP.getSdkVersion(), ModuleName().c_str(),
-             GetResetReason().c_str(), GetUptime().c_str(), WifiLinkCount(), WifiDowntime().c_str(), MqttConnectCount(),
-             Settings.bootcount, Settings.save_flag, WiFi.localIP().toString().c_str(),
-             WifiGetRssiAsQuality(WiFi.RSSI()), loop_load_avg);
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_HASS_STATE));
-}
-
-void HAssDiscovery(void)
-{
-
-  if (Settings.flag.hass_discovery)
-  {
-    Settings.flag.mqtt_response = 0;
-    Settings.flag.decimal_text = 1;
-    Settings.flag3.hass_tele_on_power = 1;
-    Settings.light_scheme = 0;
-  }
-
-  if (Settings.flag.hass_discovery || (1 == hass_mode))
-  {
-
-    HAssAnnounceRelayLight();
-
-
-    HAssAnnounceButtons();
-
-
-    HAssAnnounceSwitches();
-
-
-    HAssAnnounceSensors();
-
-
-    HAssAnnounceStatusSensor();
-  }
-}
-
-void HAssDiscover(void)
-{
-  hass_mode = 1;
-  hass_init_step = 1;
-}
-
-void HAssAnyKey(void)
-{
-  if (!Settings.flag.hass_discovery)
-  {
-    return;
-  }
-
-  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
-  uint32_t device = XdrvMailbox.payload & 0xFF;
-  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
-
-  char scommand[CMDSZ];
-  snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);
-  char stopic[TOPSZ];
-
-  GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-  Response_P(S_JSON_COMMAND_SVALUE, PSTR(D_RSLT_STATE), GetStateText(state));
-  MqttPublish(stopic);
-}
-
-
-
-
-
-bool Xdrv12(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled)
-  {
-    switch (function)
-    {
-    case FUNC_EVERY_SECOND:
-      if (hass_init_step)
-      {
-        hass_init_step--;
-        if (!hass_init_step)
-        {
-          HAssDiscovery();
-        }
-      }
-      else if (Settings.flag.hass_discovery && Settings.tele_period)
-      {
-        hass_tele_period++;
-        if (hass_tele_period >= Settings.tele_period)
-        {
-          hass_tele_period = 0;
-
-          mqtt_data[0] = '\0';
-          HAssPublishStatus();
-        }
-      }
-      break;
-    case FUNC_ANY_KEY:
-      HAssAnyKey();
-      break;
-    case FUNC_MQTT_INIT:
-      hass_mode = 0;
-      hass_init_step = 2;
-      break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
-#if defined(USE_I2C) || defined(USE_SPI)
-#ifdef USE_DISPLAY
-
-#define XDRV_13 13
-
-#include <renderer.h>
-#include <FT6236.h>
-
-Renderer *renderer;
-
-enum ColorType { COLOR_BW, COLOR_COLOR };
-
-#ifndef MAXBUTTONS
-#define MAXBUTTONS 16
-#endif
-
-#ifdef USE_TOUCH_BUTTONS
-VButton *buttons[MAXBUTTONS];
-#endif
-
-
-
-uint16_t fg_color = 1;
-uint16_t bg_color = 0;
-uint8_t color_type = COLOR_BW;
-uint8_t auto_draw=1;
-
-const uint8_t DISPLAY_MAX_DRIVERS = 16;
-const uint8_t DISPLAY_MAX_COLS = 44;
-const uint8_t DISPLAY_MAX_ROWS = 32;
-
-const uint8_t DISPLAY_LOG_ROWS = 32;
-
-#define D_PRFX_DISPLAY "Display"
-#define D_CMND_DISP_ADDRESS "Address"
-#define D_CMND_DISP_COLS "Cols"
-#define D_CMND_DISP_DIMMER "Dimmer"
-#define D_CMND_DISP_MODE "Mode"
-#define D_CMND_DISP_MODEL "Model"
-#define D_CMND_DISP_REFRESH "Refresh"
-#define D_CMND_DISP_ROWS "Rows"
-#define D_CMND_DISP_SIZE "Size"
-#define D_CMND_DISP_FONT "Font"
-#define D_CMND_DISP_ROTATE "Rotate"
-#define D_CMND_DISP_TEXT "Text"
-#define D_CMND_DISP_WIDTH "Width"
-#define D_CMND_DISP_HEIGHT "Height"
-
-enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_EVERY_50_MSECOND, FUNC_DISPLAY_EVERY_SECOND,
-                     FUNC_DISPLAY_MODEL, FUNC_DISPLAY_MODE, FUNC_DISPLAY_POWER,
-                     FUNC_DISPLAY_CLEAR, FUNC_DISPLAY_DRAW_FRAME,
-                     FUNC_DISPLAY_DRAW_HLINE, FUNC_DISPLAY_DRAW_VLINE, FUNC_DISPLAY_DRAW_LINE,
-                     FUNC_DISPLAY_DRAW_CIRCLE, FUNC_DISPLAY_FILL_CIRCLE,
-                     FUNC_DISPLAY_DRAW_RECTANGLE, FUNC_DISPLAY_FILL_RECTANGLE,
-                     FUNC_DISPLAY_TEXT_SIZE, FUNC_DISPLAY_FONT_SIZE, FUNC_DISPLAY_ROTATION, FUNC_DISPLAY_DRAW_STRING, FUNC_DISPLAY_ONOFF };
-
-enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
-
-const char kDisplayCommands[] PROGMEM = D_PRFX_DISPLAY "|"
-  "|" D_CMND_DISP_MODEL "|" D_CMND_DISP_WIDTH "|" D_CMND_DISP_HEIGHT "|" D_CMND_DISP_MODE "|" D_CMND_DISP_REFRESH "|"
-  D_CMND_DISP_DIMMER "|" D_CMND_DISP_COLS "|" D_CMND_DISP_ROWS "|" D_CMND_DISP_SIZE "|" D_CMND_DISP_FONT "|"
-  D_CMND_DISP_ROTATE "|" D_CMND_DISP_TEXT "|" D_CMND_DISP_ADDRESS ;
-
-void (* const DisplayCommand[])(void) PROGMEM = {
-  &CmndDisplay, &CmndDisplayModel, &CmndDisplayWidth, &CmndDisplayHeight, &CmndDisplayMode, &CmndDisplayRefresh,
-  &CmndDisplayDimmer, &CmndDisplayColumns, &CmndDisplayRows, &CmndDisplaySize, &CmndDisplayFont,
-  &CmndDisplayRotate, &CmndDisplayText, &CmndDisplayAddress };
-
-char *dsp_str;
-
-uint16_t dsp_x;
-uint16_t dsp_y;
-uint16_t dsp_x2;
-uint16_t dsp_y2;
-uint16_t dsp_rad;
-uint16_t dsp_color;
-int16_t dsp_len;
-int16_t disp_xpos = 0;
-int16_t disp_ypos = 0;
-
-uint8_t disp_power = 0;
-uint8_t disp_device = 0;
-uint8_t disp_refresh = 1;
-uint8_t disp_autodraw = 1;
-uint8_t dsp_init;
-uint8_t dsp_font;
-uint8_t dsp_flag;
-uint8_t dsp_on;
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-char **disp_log_buffer;
-char **disp_screen_buffer;
-char disp_temp[2];
-char disp_pres[5];
-
-uint8_t disp_log_buffer_cols = 0;
-uint8_t disp_log_buffer_idx = 0;
-uint8_t disp_log_buffer_ptr = 0;
-uint8_t disp_screen_buffer_cols = 0;
-uint8_t disp_screen_buffer_rows = 0;
-bool disp_subscribed = false;
-
-#endif
-
-
-
-void DisplayInit(uint8_t mode)
-{
-  if (renderer) {
-    renderer->DisplayInit(mode, Settings.display_size, Settings.display_rotate, Settings.display_font);
-  }
-  else {
-    dsp_init = mode;
-    XdspCall(FUNC_DISPLAY_INIT);
-  }
-}
-
-void DisplayClear(void)
-{
-  XdspCall(FUNC_DISPLAY_CLEAR);
-}
-
-void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_len = len;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_HLINE);
-}
-
-void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_len = len;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_VLINE);
-}
-
-void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_LINE);
-}
-
-void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_rad = rad;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_CIRCLE);
-}
-
-void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_rad = rad;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_FILL_CIRCLE);
-}
-
-void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_RECTANGLE);
-}
-
-void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_FILL_RECTANGLE);
-}
-
-void DisplayDrawFrame(void)
-{
-  XdspCall(FUNC_DISPLAY_DRAW_FRAME);
-}
-
-void DisplaySetSize(uint8_t size)
-{
-  Settings.display_size = size &3;
-  XdspCall(FUNC_DISPLAY_TEXT_SIZE);
-}
-
-void DisplaySetFont(uint8_t font)
-{
-  Settings.display_font = font &3;
-  XdspCall(FUNC_DISPLAY_FONT_SIZE);
-}
-
-void DisplaySetRotation(uint8_t rotation)
-{
-  Settings.display_rotate = rotation &3;
-  XdspCall(FUNC_DISPLAY_ROTATION);
-}
-
-void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_str = str;
-  dsp_color = color;
-  dsp_flag = flag;
-  XdspCall(FUNC_DISPLAY_DRAW_STRING);
-}
-
-void DisplayOnOff(uint8_t on)
-{
-  dsp_on = on;
-  XdspCall(FUNC_DISPLAY_ONOFF);
-}
-
-
-
-
-uint8_t fatoiv(char *cp,float *res) {
-  uint8_t index=0;
-  *res=CharToFloat(cp);
-  while (*cp) {
-    if ((*cp>='0' && *cp<='9') || (*cp=='-') || (*cp=='.')) {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-uint8_t atoiv(char *cp, int16_t *res)
-{
-  uint8_t index = 0;
-  *res = atoi(cp);
-  while (*cp) {
-    if ((*cp>='0' && *cp<='9') || (*cp=='-')) {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-uint8_t atoiV(char *cp, uint16_t *res)
-{
-  uint8_t index = 0;
-  *res = atoi(cp);
-  while (*cp) {
-    if (*cp>='0' && *cp<='9') {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-void alignright(char *string) {
-  uint16_t slen=strlen(string);
-  uint16_t len=slen;
-  while (len) {
-
-    if (string[len-1]!=' ') {
-      break;
-    }
-    len--;
-  }
-  uint16_t diff=slen-len;
-  if (diff>0) {
-
-    memmove(&string[diff],string,len);
-    memset(string,' ',diff);
-  }
-}
-
-char *get_string(char *buff,uint8_t len,char *cp) {
-uint8_t index=0;
-  while (*cp!=':') {
-    buff[index]=*cp++;
-    index++;
-    if (index>=len) break;
-  }
-  buff[index]=0;
-  cp++;
-  return cp;
-}
-
-#define ESCAPE_CHAR '~'
-
-
-uint32_t decode_te(char *line) {
-  uint32_t skip = 0;
-  char sbuf[3],*cp;
-  while (*line) {
-    if (*line==ESCAPE_CHAR) {
-      cp=line+1;
-      if (*cp!=0 && *cp==ESCAPE_CHAR) {
-
-        memmove(cp,cp+1,strlen(cp));
-        skip++;
-      } else {
-
-        if (strlen(cp)<2) {
-
-          return skip;
-        }
-
-        sbuf[0]=*(cp);
-        sbuf[1]=*(cp+1);
-        sbuf[2]=0;
-        *line=strtol(sbuf,0,16);
-
-        memmove(cp,cp+2,strlen(cp)-1);
-        skip += 2;
-      }
-    }
-    line++;
-  }
-  return skip;
-}
-
-
-
-#define DISPLAY_BUFFER_COLS 128
-
-void DisplayText(void)
-{
-  uint8_t lpos;
-  uint8_t escape = 0;
-  uint8_t var;
-  int16_t lin = 0;
-  int16_t col = 0;
-  int16_t fill = 0;
-  int16_t temp;
-  int16_t temp1;
-  float ftemp;
-
-  char linebuf[DISPLAY_BUFFER_COLS];
-  char *dp = linebuf;
-  char *cp = XdrvMailbox.data;
-
-  memset(linebuf, ' ', sizeof(linebuf));
-  linebuf[sizeof(linebuf)-1] = 0;
-  *dp = 0;
-
-  while (*cp) {
-    if (!escape) {
-
-      if (*cp == '[') {
-        escape = 1;
-        cp++;
-
-        if ((uint32_t)dp - (uint32_t)linebuf) {
-          if (!fill) { *dp = 0; }
-          if (col > 0 && lin > 0) {
-
-            if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
-            else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
-          } else {
-
-            if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-            else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-          }
-          memset(linebuf, ' ', sizeof(linebuf));
-          linebuf[sizeof(linebuf)-1] = 0;
-          dp = linebuf;
-        }
-      } else {
-
-        if (dp < (linebuf + DISPLAY_BUFFER_COLS)) { *dp++ = *cp++; }
-      }
-    } else {
-
-      if (*cp == ']') {
-        escape = 0;
-        cp++;
-      } else {
-
-        switch (*cp++) {
-          case 'z':
-
-            if (!renderer) DisplayClear();
-            else renderer->fillScreen(bg_color);
-            disp_xpos = 0;
-            disp_ypos = 0;
-            col = 0;
-            lin = 0;
-            break;
-          case 'i':
-
-            DisplayInit(DISPLAY_INIT_PARTIAL);
-            break;
-          case 'I':
-
-            DisplayInit(DISPLAY_INIT_FULL);
-            break;
-          case 'o':
-            if (!renderer) {
-              DisplayOnOff(0);
-            } else {
-              renderer->DisplayOnff(0);
-            }
-            break;
-          case 'O':
-            if (!renderer) {
-              DisplayOnOff(1);
-            } else {
-              renderer->DisplayOnff(1);
-            }
-            break;
-          case 'x':
-
-            var = atoiv(cp, &disp_xpos);
-            cp += var;
-            break;
-          case 'y':
-
-            var = atoiv(cp, &disp_ypos);
-            cp += var;
-            break;
-          case 'l':
-
-            var = atoiv(cp, &lin);
-            cp += var;
-
-            break;
-          case 'c':
-
-            var = atoiv(cp, &col);
-            cp += var;
-
-            break;
-          case 'C':
-
-            if (*cp=='i') {
-
-              cp++;
-              var = atoiv(cp, &temp);
-              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
-            } else {
-
-              var = fatoiv(cp,&ftemp);
-            }
-            fg_color=ftemp;
-            cp += var;
-            if (renderer) renderer->setTextColor(fg_color,bg_color);
-            break;
-          case 'B':
-
-            if (*cp=='i') {
-
-              cp++;
-              var = atoiv(cp, &temp);
-              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
-            } else {
-              var = fatoiv(cp,&ftemp);
-            }
-            bg_color=ftemp;
-            cp += var;
-            if (renderer) renderer->setTextColor(fg_color,bg_color);
-            break;
-          case 'p':
-
-            var = atoiv(cp, &fill);
-            cp += var;
-            linebuf[fill] = 0;
-            break;
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-          case 'P':
-            { char *ep=strchr(cp,':');
-             if (ep) {
-               *ep=0;
-               ep++;
-               Draw_RGB_Bitmap(cp,disp_xpos,disp_ypos);
-               cp=ep;
-             }
-            }
-            break;
-#endif
-          case 'h':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (temp < 0) {
-              if (renderer) renderer->writeFastHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
-              else DisplayDrawHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
-            } else {
-              if (renderer) renderer->writeFastHLine(disp_xpos, disp_ypos, temp, fg_color);
-              else DisplayDrawHLine(disp_xpos, disp_ypos, temp, fg_color);
-            }
-            disp_xpos += temp;
-            break;
-          case 'v':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (temp < 0) {
-              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
-              else DisplayDrawVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
-            } else {
-              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos, temp, fg_color);
-              else DisplayDrawVLine(disp_xpos, disp_ypos, temp, fg_color);
-            }
-            disp_ypos += temp;
-            break;
-          case 'L':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->writeLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            disp_xpos += temp;
-            disp_ypos += temp1;
-            break;
-          case 'k':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (renderer) renderer->drawCircle(disp_xpos, disp_ypos, temp, fg_color);
-            else DisplayDrawCircle(disp_xpos, disp_ypos, temp, fg_color);
-            break;
-          case 'K':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color);
-            else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color);
-            break;
-          case 'r':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->drawRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            break;
-          case 'R':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->fillRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawFilledRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            break;
-          case 'u':
-
-            { int16_t rad;
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &rad);
-            cp += var;
-            if (renderer) renderer->drawRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
-
-            }
-            break;
-          case 'U':
-
-            { int16_t rad;
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &rad);
-            cp += var;
-            if (renderer) renderer->fillRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
-
-            }
-            break;
-
-          case 't':
-            if (*cp=='S') {
-              cp++;
-              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
-                snprintf_P(dp, 9, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-                dp += 8;
-              }
-            } else {
-              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -5) {
-                snprintf_P(dp, 6, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute);
-                dp += 5;
-              }
-            }
-            break;
-          case 'T':
-            if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
-              snprintf_P(dp, 9, PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year%2000);
-              dp += 8;
-            }
-            break;
-          case 'd':
-
-            if (renderer) renderer->Updateframe();
-            else DisplayDrawFrame();
-            break;
-          case 'D':
-
-            auto_draw=*cp&3;
-            if (renderer) renderer->setDrawMode(auto_draw>>1);
-            cp += 1;
-            break;
-          case 's':
-
-            if (renderer) renderer->setTextSize(*cp&7);
-            else DisplaySetSize(*cp&3);
-            cp += 1;
-            break;
-          case 'f':
-
-            if (renderer) renderer->setTextFont(*cp&7);
-            else DisplaySetFont(*cp&7);
-            cp += 1;
-            break;
-          case 'a':
-
-            if (renderer) renderer->setRotation(*cp&3);
-            else DisplaySetRotation(*cp&3);
-            cp+=1;
-            break;
-
-#ifdef USE_GRAPH
-          case 'G':
-
-            if (*cp=='d') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&temp1);
-              cp+=var;
-              RedrawGraph(temp,temp1);
-              break;
-            }
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-            if (*cp=='s') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-
-              char bbuff[128];
-              cp=get_string(bbuff,sizeof(bbuff),cp);
-              Save_graph(temp,bbuff);
-              break;
-            }
-            if (*cp=='r') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-
-              char bbuff[128];
-              cp=get_string(bbuff,sizeof(bbuff),cp);
-              Restore_graph(temp,bbuff);
-              break;
-            }
-#endif
-            { int16_t num,gxp,gyp,gxs,gys,dec,icol;
-              float ymin,ymax;
-              var=atoiv(cp,&num);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gxp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gyp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gxs);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gys);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&dec);
-              cp+=var;
-              cp++;
-              var=fatoiv(cp,&ymin);
-              cp+=var;
-              cp++;
-              var=fatoiv(cp,&ymax);
-              cp+=var;
-              if (color_type==COLOR_COLOR) {
-
-                cp++;
-                var=atoiv(cp,&icol);
-                cp+=var;
-              } else {
-                icol=0;
-              }
-              DefineGraph(num,gxp,gyp,gxs,gys,dec,ymin,ymax,icol);
-            }
-            break;
-          case 'g':
-              { float temp;
-                int16_t num;
-                var=atoiv(cp,&num);
-                cp+=var;
-                cp++;
-                var=fatoiv(cp,&temp);
-                cp+=var;
-                AddValue(num,temp);
-              }
-            break;
-#endif
-
-#ifdef USE_AWATCH
-          case 'w':
-              var = atoiv(cp, &temp);
-              cp += var;
-              DrawAClock(temp);
-              break;
-#endif
-
-#ifdef USE_TOUCH_BUTTONS
-          case 'b':
-          { int16_t num,gxp,gyp,gxs,gys,outline,fill,textcolor,textsize;
-            var=atoiv(cp,&num);
-            cp+=var;
-            cp++;
-            uint8_t bflags=num>>8;
-            num=num%MAXBUTTONS;
-            var=atoiv(cp,&gxp);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gyp);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gxs);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gys);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&outline);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&fill);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&textcolor);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&textsize);
-            cp+=var;
-            cp++;
-
-            char bbuff[32];
-            cp=get_string(bbuff,sizeof(bbuff),cp);
-
-            if (buttons[num]) {
-              delete buttons[num];
-            }
-            if (renderer) {
-              buttons[num]= new VButton();
-              if (buttons[num]) {
-                buttons[num]->vpower=bflags;
-                buttons[num]->initButtonUL(renderer,gxp,gyp,gxs,gys,renderer->GetColorFromIndex(outline),\
-                renderer->GetColorFromIndex(fill),renderer->GetColorFromIndex(textcolor),bbuff,textsize);
-                if (!bflags) {
-
-                  buttons[num]->xdrawButton(bitRead(power,num));
-                } else {
-
-                  buttons[num]->vpower&=0x7f;
-                  buttons[num]->xdrawButton(buttons[num]->vpower&0x80);
-                }
-              }
-            }
-          }
-          break;
-#endif
-          default:
-
-            Response_P(PSTR("Unknown Escape"));
-            goto exit;
-            break;
-        }
-      }
-    }
-  }
-  exit:
-
-    dp -= decode_te(linebuf);
-    if ((uint32_t)dp - (uint32_t)linebuf) {
-      if (!fill) {
-        *dp = 0;
-      } else {
-        linebuf[abs(fill)] = 0;
-      }
-      if (fill<0) {
-
-        alignright(linebuf);
-      }
-      if (col > 0 && lin > 0) {
-
-        if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
-        else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
-      } else {
-
-        if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-        else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-      }
-    }
-
-    if (auto_draw&1) {
-      if (renderer) renderer->Updateframe();
-      else DisplayDrawFrame();
-    }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void DisplayClearScreenBuffer(void)
-{
-  if (disp_screen_buffer_cols) {
-    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-      memset(disp_screen_buffer[i], 0, disp_screen_buffer_cols);
-    }
-  }
-}
-
-void DisplayFreeScreenBuffer(void)
-{
-  if (disp_screen_buffer != nullptr) {
-    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-      if (disp_screen_buffer[i] != nullptr) { free(disp_screen_buffer[i]); }
-    }
-    free(disp_screen_buffer);
-    disp_screen_buffer_cols = 0;
-    disp_screen_buffer_rows = 0;
-  }
-}
-
-void DisplayAllocScreenBuffer(void)
-{
-  if (!disp_screen_buffer_cols) {
-    disp_screen_buffer_rows = Settings.display_rows;
-    disp_screen_buffer = (char**)malloc(sizeof(*disp_screen_buffer) * disp_screen_buffer_rows);
-    if (disp_screen_buffer != nullptr) {
-      for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-        disp_screen_buffer[i] = (char*)malloc(sizeof(*disp_screen_buffer[i]) * (Settings.display_cols[0] +1));
-        if (disp_screen_buffer[i] == nullptr) {
-          DisplayFreeScreenBuffer();
-          break;
-        }
-      }
-    }
-    if (disp_screen_buffer != nullptr) {
-      disp_screen_buffer_cols = Settings.display_cols[0] +1;
-      DisplayClearScreenBuffer();
-    }
-  }
-}
-
-void DisplayReAllocScreenBuffer(void)
-{
-  DisplayFreeScreenBuffer();
-  DisplayAllocScreenBuffer();
-}
-
-void DisplayFillScreen(uint32_t line)
-{
-  uint32_t len = disp_screen_buffer_cols - strlen(disp_screen_buffer[line]);
-  if (len) {
-    memset(disp_screen_buffer[line] + strlen(disp_screen_buffer[line]), 0x20, len);
-    disp_screen_buffer[line][disp_screen_buffer_cols -1] = 0;
-  }
-}
-
-
-
-void DisplayClearLogBuffer(void)
-{
-  if (disp_log_buffer_cols) {
-    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-      memset(disp_log_buffer[i], 0, disp_log_buffer_cols);
-    }
-  }
-}
-
-void DisplayFreeLogBuffer(void)
-{
-  if (disp_log_buffer != nullptr) {
-    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-      if (disp_log_buffer[i] != nullptr) { free(disp_log_buffer[i]); }
-    }
-    free(disp_log_buffer);
-    disp_log_buffer_cols = 0;
-  }
-}
-
-void DisplayAllocLogBuffer(void)
-{
-  if (!disp_log_buffer_cols) {
-    disp_log_buffer = (char**)malloc(sizeof(*disp_log_buffer) * DISPLAY_LOG_ROWS);
-    if (disp_log_buffer != nullptr) {
-      for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-        disp_log_buffer[i] = (char*)malloc(sizeof(*disp_log_buffer[i]) * (Settings.display_cols[0] +1));
-        if (disp_log_buffer[i] == nullptr) {
-          DisplayFreeLogBuffer();
-          break;
-        }
-      }
-    }
-    if (disp_log_buffer != nullptr) {
-      disp_log_buffer_cols = Settings.display_cols[0] +1;
-      DisplayClearLogBuffer();
-    }
-  }
-}
-
-void DisplayReAllocLogBuffer(void)
-{
-  DisplayFreeLogBuffer();
-  DisplayAllocLogBuffer();
-}
-
-void DisplayLogBufferAdd(char* txt)
-{
-  if (disp_log_buffer_cols) {
-    strlcpy(disp_log_buffer[disp_log_buffer_idx], txt, disp_log_buffer_cols);
-    disp_log_buffer_idx++;
-    if (DISPLAY_LOG_ROWS == disp_log_buffer_idx) { disp_log_buffer_idx = 0; }
-  }
-}
-
-char* DisplayLogBuffer(char temp_code)
-{
-  char* result = nullptr;
-  if (disp_log_buffer_cols) {
-    if (disp_log_buffer_idx != disp_log_buffer_ptr) {
-      result = disp_log_buffer[disp_log_buffer_ptr];
-      disp_log_buffer_ptr++;
-      if (DISPLAY_LOG_ROWS == disp_log_buffer_ptr) { disp_log_buffer_ptr = 0; }
-
-      char *pch = strchr(result, '~');
-      if (pch != nullptr) { result[pch - result] = temp_code; }
-    }
-  }
-  return result;
-}
-
-void DisplayLogBufferInit(void)
-{
-  if (Settings.display_mode) {
-    disp_log_buffer_idx = 0;
-    disp_log_buffer_ptr = 0;
-    disp_refresh = Settings.display_refresh;
-
-    snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%c"), TempUnit());
-    snprintf_P(disp_pres, sizeof(disp_pres), PressureUnit().c_str());
-
-    DisplayReAllocLogBuffer();
-
-    char buffer[40];
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_VERSION " %s%s"), my_version, my_image);
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR("Display mode %d"), Settings.display_mode);
-    DisplayLogBufferAdd(buffer);
-
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_CMND_HOSTNAME " %s"), my_hostname);
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_SSID " %s"), SettingsText(SET_STASSID1 + Settings.sta_active));
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_MAC " %s"), WiFi.macAddress().c_str());
-    DisplayLogBufferAdd(buffer);
-    if (!global_state.wifi_down) {
-      snprintf_P(buffer, sizeof(buffer), PSTR("IP %s"), WiFi.localIP().toString().c_str());
-      DisplayLogBufferAdd(buffer);
-      snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_RSSI " %d%%"), WifiGetRssiAsQuality(WiFi.RSSI()));
-      DisplayLogBufferAdd(buffer);
-    }
-  }
-}
-
-
-
-
-
-enum SensorQuantity {
-  JSON_TEMPERATURE,
-  JSON_HUMIDITY, JSON_LIGHT, JSON_NOISE, JSON_AIRQUALITY,
-  JSON_PRESSURE, JSON_PRESSUREATSEALEVEL,
-  JSON_ILLUMINANCE,
-  JSON_GAS,
-  JSON_YESTERDAY, JSON_TOTAL, JSON_TODAY,
-  JSON_PERIOD,
-  JSON_POWERFACTOR, JSON_COUNTER, JSON_ANALOG_INPUT, JSON_UV_LEVEL,
-  JSON_CURRENT,
-  JSON_VOLTAGE,
-  JSON_POWERUSAGE,
-  JSON_CO2,
-  JSON_FREQUENCY };
-const char kSensorQuantity[] PROGMEM =
-  D_JSON_TEMPERATURE "|"
-  D_JSON_HUMIDITY "|" D_JSON_LIGHT "|" D_JSON_NOISE "|" D_JSON_AIRQUALITY "|"
-  D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
-  D_JSON_ILLUMINANCE "|"
-  D_JSON_GAS "|"
-  D_JSON_YESTERDAY "|" D_JSON_TOTAL "|" D_JSON_TODAY "|"
-  D_JSON_PERIOD "|"
-  D_JSON_POWERFACTOR "|" D_JSON_COUNTER "|" D_JSON_ANALOG_INPUT "|" D_JSON_UV_LEVEL "|"
-  D_JSON_CURRENT "|"
-  D_JSON_VOLTAGE "|"
-  D_JSON_POWERUSAGE "|"
-  D_JSON_CO2 "|"
-  D_JSON_FREQUENCY ;
-
-void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value)
-{
-  char quantity[TOPSZ];
-  char buffer[Settings.display_cols[0] +1];
-  char spaces[Settings.display_cols[0]];
-  char source[Settings.display_cols[0] - Settings.display_cols[1]];
-  char svalue[Settings.display_cols[1] +1];
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("DisplayJsonValue"));
-#endif
-
-  memset(spaces, 0x20, sizeof(spaces));
-  spaces[sizeof(spaces) -1] = '\0';
-  snprintf_P(source, sizeof(source), PSTR("%s%s%s%s"), topic, (strlen(topic))?"/":"", mkey, spaces);
-
-  int quantity_code = GetCommandCode(quantity, sizeof(quantity), mkey, kSensorQuantity);
-  if ((-1 == quantity_code) || !strcmp_P(mkey, S_RSLT_POWER)) {
-    return;
-  }
-  if (JSON_TEMPERATURE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s~%s"), value, disp_temp);
-  }
-  else if ((quantity_code >= JSON_HUMIDITY) && (quantity_code <= JSON_AIRQUALITY)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%%"), value);
-  }
-  else if ((quantity_code >= JSON_PRESSURE) && (quantity_code <= JSON_PRESSUREATSEALEVEL)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s"), value, disp_pres);
-  }
-  else if (JSON_ILLUMINANCE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_LUX), value);
-  }
-  else if (JSON_GAS == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOOHM), value);
-  }
-  else if ((quantity_code >= JSON_YESTERDAY) && (quantity_code <= JSON_TODAY)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOWATTHOUR), value);
-  }
-  else if (JSON_PERIOD == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATTHOUR), value);
-  }
-  else if ((quantity_code >= JSON_POWERFACTOR) && (quantity_code <= JSON_UV_LEVEL)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), value);
-  }
-  else if (JSON_CURRENT == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_AMPERE), value);
-  }
-  else if (JSON_VOLTAGE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_VOLT), value);
-  }
-  else if (JSON_POWERUSAGE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATT), value);
-  }
-  else if (JSON_CO2 == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_PARTS_PER_MILLION), value);
-  }
-  else if (JSON_FREQUENCY == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_HERTZ), value);
-  }
-  snprintf_P(buffer, sizeof(buffer), PSTR("%s %s"), source, svalue);
-
-
-
-  DisplayLogBufferAdd(buffer);
-}
-
-void DisplayAnalyzeJson(char *topic, char *json)
-{
-# 1145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
-  String jsonStr = json;
-
-  StaticJsonBuffer<1024> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(jsonStr);
-  if (root.success()) {
-
-    const char *unit;
-    unit = root[D_JSON_TEMPERATURE_UNIT];
-    if (unit) {
-      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), unit);
-    }
-    unit = root[D_JSON_PRESSURE_UNIT];
-    if (unit) {
-      snprintf_P(disp_pres, sizeof(disp_pres), PSTR("%s"), unit);
-    }
-
-    for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) {
-      JsonVariant value = it->value;
-      if (value.is<JsonObject>()) {
-        JsonObject& Object2 = value;
-        for (JsonObject::iterator it2 = Object2.begin(); it2 != Object2.end(); ++it2) {
-          JsonVariant value2 = it2->value;
-          if (value2.is<JsonObject>()) {
-            JsonObject& Object3 = value2;
-            for (JsonObject::iterator it3 = Object3.begin(); it3 != Object3.end(); ++it3) {
-              const char* value = it3->value;
-              if (value != nullptr) {
-                DisplayJsonValue(topic, it->key, it3->key, value);
-              }
-            }
-          } else {
-            const char* value = it2->value;
-            if (value != nullptr) {
-              DisplayJsonValue(topic, it->key, it2->key, value);
-            }
-          }
-        }
-      } else {
-        const char* value = it->value;
-        if (value != nullptr) {
-          DisplayJsonValue(topic, it->key, it->key, value);
-        }
-      }
-    }
-  }
-}
-
-void DisplayMqttSubscribe(void)
-{
-
-
-
-
-
-
-  if (Settings.display_model && (Settings.display_mode &0x04)) {
-
-    char stopic[TOPSZ];
-    char ntopic[TOPSZ];
-
-    ntopic[0] = '\0';
-    strlcpy(stopic, SettingsText(SET_MQTT_FULLTOPIC), sizeof(stopic));
-    char *tp = strtok(stopic, "/");
-    while (tp != nullptr) {
-      if (!strcmp_P(tp, MQTT_TOKEN_PREFIX)) {
-        break;
-      }
-      strncat_P(ntopic, PSTR("+/"), sizeof(ntopic) - strlen(ntopic) -1);
-      tp = strtok(nullptr, "/");
-    }
-    strncat(ntopic, SettingsText(SET_MQTTPREFIX3), sizeof(ntopic) - strlen(ntopic) -1);
-    strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1);
-    MqttSubscribe(ntopic);
-    disp_subscribed = true;
-  } else {
-    disp_subscribed = false;
-  }
-}
-
-bool DisplayMqttData(void)
-{
-  if (disp_subscribed) {
-    char stopic[TOPSZ];
-
-    snprintf_P(stopic, sizeof(stopic) , PSTR("%s/"), SettingsText(SET_MQTTPREFIX3));
-    char *tp = strstr(XdrvMailbox.topic, stopic);
-    if (tp) {
-      if (Settings.display_mode &0x04) {
-        tp = tp + strlen(stopic);
-        char *topic = strtok(tp, "/");
-        DisplayAnalyzeJson(topic, XdrvMailbox.data);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-void DisplayLocalSensor(void)
-{
-  if ((Settings.display_mode &0x02) && (0 == tele_period)) {
-    char no_topic[1] = { 0 };
-
-    DisplayAnalyzeJson(no_topic, mqtt_data);
-  }
-}
-
-#endif
-
-
-
-
-
-void DisplayInitDriver(void)
-{
-  XdspCall(FUNC_DISPLAY_INIT_DRIVER);
-
-  if (renderer) {
-    renderer->setTextFont(Settings.display_font);
-    renderer->setTextSize(Settings.display_size);
-  }
-
-
-
-
-  if (Settings.display_model) {
-    devices_present++;
-    disp_device = devices_present;
-
-#ifndef USE_DISPLAY_MODES1TO5
-    Settings.display_mode = 0;
-#else
-    DisplayLogBufferInit();
-#endif
-  }
-}
-
-void DisplaySetPower(void)
-{
-  disp_power = bitRead(XdrvMailbox.index, disp_device -1);
-
-
-
-  if (Settings.display_model) {
-    if (!renderer) {
-      XdspCall(FUNC_DISPLAY_POWER);
-    } else {
-      renderer->DisplayOnff(disp_power);
-    }
-  }
-}
-
-
-
-
-
-void CmndDisplay(void)
-{
-  Response_P(PSTR("{\"" D_PRFX_DISPLAY "\":{\"" D_CMND_DISP_MODEL "\":%d,\"" D_CMND_DISP_WIDTH "\":%d,\"" D_CMND_DISP_HEIGHT "\":%d,\""
-    D_CMND_DISP_MODE "\":%d,\"" D_CMND_DISP_DIMMER "\":%d,\"" D_CMND_DISP_SIZE "\":%d,\"" D_CMND_DISP_FONT "\":%d,\""
-    D_CMND_DISP_ROTATE "\":%d,\"" D_CMND_DISP_REFRESH "\":%d,\"" D_CMND_DISP_COLS "\":[%d,%d],\"" D_CMND_DISP_ROWS "\":%d}}"),
-    Settings.display_model, Settings.display_width, Settings.display_height,
-    Settings.display_mode, Settings.display_dimmer, Settings.display_size, Settings.display_font,
-    Settings.display_rotate, Settings.display_refresh, Settings.display_cols[0], Settings.display_cols[1], Settings.display_rows);
-}
-
-void CmndDisplayModel(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < DISPLAY_MAX_DRIVERS)) {
-    uint32_t last_display_model = Settings.display_model;
-    Settings.display_model = XdrvMailbox.payload;
-    if (XdspCall(FUNC_DISPLAY_MODEL)) {
-      restart_flag = 2;
-    } else {
-      Settings.display_model = last_display_model;
-    }
-  }
-  ResponseCmndNumber(Settings.display_model);
-}
-
-void CmndDisplayWidth(void)
-{
-  if (XdrvMailbox.payload > 0) {
-    if (XdrvMailbox.payload != Settings.display_width) {
-      Settings.display_width = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndNumber(Settings.display_width);
-}
-
-void CmndDisplayHeight(void)
-{
-  if (XdrvMailbox.payload > 0) {
-    if (XdrvMailbox.payload != Settings.display_height) {
-      Settings.display_height = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndNumber(Settings.display_height);
-}
-
-void CmndDisplayMode(void)
-{
-#ifdef USE_DISPLAY_MODES1TO5
-
-
-
-
-
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    uint32_t last_display_mode = Settings.display_mode;
-    Settings.display_mode = XdrvMailbox.payload;
-
-    if (disp_subscribed != (Settings.display_mode &0x04)) {
-      restart_flag = 2;
-    } else {
-      if (last_display_mode && !Settings.display_mode) {
-        DisplayInit(DISPLAY_INIT_MODE);
-        if (renderer) renderer->fillScreen(bg_color);
-        else DisplayClear();
-      } else {
-        DisplayLogBufferInit();
-        DisplayInit(DISPLAY_INIT_MODE);
-      }
-    }
-  }
-#endif
-  ResponseCmndNumber(Settings.display_mode);
-}
-
-void CmndDisplayDimmer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    Settings.display_dimmer = ((XdrvMailbox.payload +1) * 100) / 666;
-    if (Settings.display_dimmer && !(disp_power)) {
-      ExecuteCommandPower(disp_device, POWER_ON, SRC_DISPLAY);
-    }
-    else if (!Settings.display_dimmer && disp_power) {
-      ExecuteCommandPower(disp_device, POWER_OFF, SRC_DISPLAY);
-    }
-    if (renderer) renderer->dim(Settings.display_dimmer);
-  }
-  ResponseCmndNumber(Settings.display_dimmer);
-}
-
-void CmndDisplaySize(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 4)) {
-    Settings.display_size = XdrvMailbox.payload;
-    if (renderer) renderer->setTextSize(Settings.display_size);
-    else DisplaySetSize(Settings.display_size);
-  }
-  ResponseCmndNumber(Settings.display_size);
-}
-
-void CmndDisplayFont(void)
-{
-  if ((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 4)) {
-    Settings.display_font = XdrvMailbox.payload;
-    if (renderer) renderer->setTextFont(Settings.display_font);
-    else DisplaySetFont(Settings.display_font);
-  }
-  ResponseCmndNumber(Settings.display_font);
-}
-
-void CmndDisplayRotate(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
-    if (Settings.display_rotate != XdrvMailbox.payload) {
-# 1428 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_13_display.ino"
-      Settings.display_rotate = XdrvMailbox.payload;
-      DisplayInit(DISPLAY_INIT_MODE);
-#ifdef USE_DISPLAY_MODES1TO5
-      DisplayLogBufferInit();
-#endif
-    }
-  }
-  ResponseCmndNumber(Settings.display_rotate);
-}
-
-void CmndDisplayText(void)
-{
-  if (disp_device && XdrvMailbox.data_len > 0) {
-#ifndef USE_DISPLAY_MODES1TO5
-    DisplayText();
-#else
-    if (!Settings.display_mode) {
-      DisplayText();
-    } else {
-      DisplayLogBufferAdd(XdrvMailbox.data);
-    }
-#endif
-    ResponseCmndChar(XdrvMailbox.data);
-  }
-}
-
-void CmndDisplayAddress(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 8)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
-      Settings.display_address[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.display_address[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDisplayRefresh(void)
-{
-  if ((XdrvMailbox.payload >= 1) && (XdrvMailbox.payload <= 7)) {
-    Settings.display_refresh = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.display_refresh);
-}
-
-void CmndDisplayColumns(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_COLS)) {
-      Settings.display_cols[XdrvMailbox.index -1] = XdrvMailbox.payload;
-#ifdef USE_DISPLAY_MODES1TO5
-      if (1 == XdrvMailbox.index) {
-        DisplayLogBufferInit();
-        DisplayReAllocScreenBuffer();
-      }
-#endif
-    }
-    ResponseCmndIdxNumber(Settings.display_cols[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDisplayRows(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_ROWS)) {
-    Settings.display_rows = XdrvMailbox.payload;
-#ifdef USE_DISPLAY_MODES1TO5
-    DisplayLogBufferInit();
-    DisplayReAllocScreenBuffer();
-#endif
-  }
-  ResponseCmndNumber(Settings.display_rows);
-}
-
-
-
-
-
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp) {
-  if (!renderer) return;
-
-
-  File fp;
-  fp=SD.open(file,FILE_READ);
-  if (!fp) return;
-  uint16_t xsize;
-  fp.read((uint8_t*)&xsize,2);
-  uint16_t ysize;
-  fp.read((uint8_t*)&ysize,2);
-
-#if 1
-#define XBUFF 128
-  uint16_t xdiv=xsize/XBUFF;
-  renderer->setAddrWindow(xp,yp,xp+xsize,yp+ysize);
-  for(int16_t j=0; j<ysize; j++) {
-    for(int16_t i=0; i<xsize; i+=XBUFF) {
-      uint16_t rgb[XBUFF];
-      uint16_t len=fp.read((uint8_t*)rgb,XBUFF*2);
-      if (len>=2) renderer->pushColors(rgb,len/2,true);
-    }
-    OsWatchLoop();
-  }
-  renderer->setAddrWindow(0,0,0,0);
-#else
-  for(int16_t j=0; j<ysize; j++) {
-    for(int16_t i=0; i<xsize; i++ ) {
-      uint16_t rgb;
-      uint8_t res=fp.read((uint8_t*)&rgb,2);
-      if (!res) break;
-      renderer->writePixel(xp+i,yp,rgb);
-    }
-    delay(0);
-    OsWatchLoop();
-    yp++;
-  }
-#endif
-  fp.close();
-}
-#endif
-
-#ifdef USE_AWATCH
-#define MINUTE_REDUCT 4
-
-#ifndef pi
-#define pi 3.14159265359
-#endif
-
-
-void DrawAClock(uint16_t rad) {
-    if (!renderer) return;
-    float frad=rad;
-    uint16_t hred=frad/3.0;
-    renderer->fillCircle(disp_xpos, disp_ypos, rad, bg_color);
-    renderer->drawCircle(disp_xpos, disp_ypos, rad, fg_color);
-    renderer->fillCircle(disp_xpos, disp_ypos, 4, fg_color);
-    for (uint8_t count=0; count<60; count+=5) {
-      float p1=((float)count*(pi/30)-(pi/2));
-      uint8_t len;
-      if ((count%15)==0) {
-        len=4;
-      } else {
-        len=2;
-      }
-      renderer->writeLine(disp_xpos+((float)(rad-len)*cosf(p1)), disp_ypos+((float)(rad-len)*sinf(p1)), disp_xpos+(frad*cosf(p1)), disp_ypos+(frad*sinf(p1)), fg_color);
-    }
-
-
-    float hour=((float)RtcTime.hour*60.0+(float)RtcTime.minute)/60.0;
-    float temp=(hour*(pi/6.0)-(pi/2.0));
-    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-hred)*cosf(temp),disp_ypos+(frad-hred)*sinf(temp), fg_color);
-
-
-    temp=((float)RtcTime.minute*(pi/30.0)-(pi/2.0));
-    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-MINUTE_REDUCT)*cosf(temp),disp_ypos+(frad-MINUTE_REDUCT)*sinf(temp), fg_color);
-}
-#endif
-
-
-#ifdef USE_GRAPH
-
-typedef union {
-  uint8_t data;
-  struct {
-      uint8_t overlay : 1;
-      uint8_t draw : 1;
-      uint8_t nu3 : 1;
-      uint8_t nu4 : 1;
-      uint8_t nu5 : 1;
-      uint8_t nu6 : 1;
-      uint8_t nu7 : 1;
-      uint8_t nu8 : 1;
-  };
-} GFLAGS;
-
-struct GRAPH {
-  uint16_t xp;
-  uint16_t yp;
-  uint16_t xs;
-  uint16_t ys;
-  float ymin;
-  float ymax;
-  float range;
-  uint32_t x_time;
-  uint32_t last_ms;
-  uint32_t last_ms_redrawn;
-  int16_t decimation;
-  uint16_t dcnt;
-  uint32_t summ;
-  uint16_t xcnt;
-  uint8_t *values;
-  uint8_t xticks;
-  uint8_t yticks;
-  uint8_t last_val;
-  uint8_t color_index;
-  GFLAGS flags;
-};
-
-
-struct GRAPH *graph[NUM_GRAPHS];
-
-#define TICKLEN 4
-void ClrGraph(uint16_t num) {
-  struct GRAPH *gp=graph[num];
-
-  uint16_t xticks=gp->xticks;
-  uint16_t yticks=gp->yticks;
-  uint16_t count;
-
-
-  if (gp->flags.overlay) return;
-
-  renderer->fillRect(gp->xp+1,gp->yp+1,gp->xs-2,gp->ys-2,bg_color);
-
-  if (xticks) {
-    float cxp=gp->xp,xd=(float)gp->xs/(float)xticks;
-    for (count=0; count<xticks; count++) {
-      renderer->writeFastVLine(cxp,gp->yp+gp->ys-TICKLEN,TICKLEN,fg_color);
-      cxp+=xd;
-    }
-  }
-  if (yticks) {
-    if (gp->ymin<0 && gp->ymax>0) {
-
-      float cxp=0;
-      float czp=gp->yp+(gp->ymax/gp->range);
-      while (cxp<gp->xs) {
-        renderer->writeFastHLine(gp->xp+cxp,czp,2,fg_color);
-        cxp+=6.0;
-      }
-
-      float cyp=0,yd=gp->ys/yticks;
-      for (count=0; count<yticks; count++) {
-        if ((czp-cyp)>gp->yp) {
-          renderer->writeFastHLine(gp->xp,czp-cyp,TICKLEN,fg_color);
-          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp-cyp,TICKLEN,fg_color);
-        }
-        if ((czp+cyp)<(gp->yp+gp->ys)) {
-          renderer->writeFastHLine(gp->xp,czp+cyp,TICKLEN,fg_color);
-          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp+cyp,TICKLEN,fg_color);
-        }
-        cyp+=yd;
-      }
-    } else {
-      float cyp=gp->yp,yd=gp->ys/yticks;
-      for (count=0; count<yticks; count++) {
-        renderer->writeFastHLine(gp->xp,cyp,TICKLEN,fg_color);
-        renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,cyp,TICKLEN,fg_color);
-        cyp+=yd;
-      }
-    }
-  }
-}
-
-
-void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol) {
-  if (!renderer) return;
-  uint8_t rflg=0;
-  if (xs<0) {
-    rflg=1;
-    xs=abs(xs);
-  }
-  struct GRAPH *gp;
-  uint16_t count;
-  uint16_t index=num%NUM_GRAPHS;
-  if (!graph[index]) {
-    gp=(struct GRAPH*)calloc(sizeof(struct GRAPH),1);
-    if (!gp) return;
-    graph[index]=gp;
-  } else {
-    gp=graph[index];
-    if (rflg) {
-      RedrawGraph(index,1);
-      return;
-    }
-  }
-
-
-  gp->xticks=(num>>4)&0x3f;
-  gp->yticks=(num>>10)&0x3f;
-  gp->xp=xp;
-  gp->yp=yp;
-  gp->xs=xs;
-  gp->ys=ys;
-  if (!dec) dec=1;
-  gp->decimation=dec;
-  if (dec>0) {
-
-    gp->x_time=((float)dec*60000.0)/(float)xs;
-    gp->last_ms=millis()+gp->x_time;
-  }
-  gp->ymin=ymin;
-  gp->ymax=ymax;
-  gp->range=(ymax-ymin)/ys;
-  gp->xcnt=0;
-  gp->dcnt=0;
-  gp->summ=0;
-  if (gp->values) free(gp->values);
-  gp->values=(uint8_t*) calloc(1,xs+2);
-  if (!gp->values) {
-    free(gp);
-    graph[index]=0;
-    return;
-  }
-
-  gp->values[0]=0;
-
-  gp->last_ms_redrawn=millis();
-
-  if (!icol) icol=1;
-  gp->color_index=icol;
-  gp->flags.overlay=0;
-  gp->flags.draw=1;
-
-
-  if (index>0) {
-    for (uint8_t count=0; count<index; count++) {
-      if (graph[count]) {
-
-
-        struct GRAPH *gp1=graph[count];
-        if ((gp->xp==gp1->xp) && (gp->yp==gp1->yp)) {
-          gp->flags.overlay=1;
-          break;
-        }
-      }
-    }
-  }
-
-
-  renderer->drawRect(xp,yp,xs,ys,fg_color);
-
-  ClrGraph(index);
-
-}
-
-
-void DisplayCheckGraph() {
-  int16_t count;
-  struct GRAPH *gp;
-  for (count=0;count<NUM_GRAPHS;count++) {
-    gp=graph[count];
-    if (gp) {
-      if (gp->decimation>0) {
-
-        while (millis()>gp->last_ms) {
-          gp->last_ms+=gp->x_time;
-          uint8_t val;
-          if (gp->dcnt) {
-            val=gp->summ/gp->dcnt;
-            gp->dcnt=0;
-            gp->summ=0;
-            gp->last_val=val;
-          } else {
-            val=gp->last_val;
-          }
-          AddGraph(count,val);
-        }
-      }
-    }
-  }
-}
-
-
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-#include <SD.h>
-
-void Save_graph(uint8_t num, char *path) {
-  if (!renderer) return;
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  File fp;
-  SD.remove(path);
-  fp=SD.open(path,FILE_WRITE);
-  if (!fp) return;
-  char str[32];
-  sprintf_P(str,PSTR("%d\t%d\t%d\t"),gp->xcnt,gp->xs,gp->ys);
-  fp.print(str);
-  dtostrfd(gp->ymin,2,str);
-  fp.print(str);
-  fp.print("\t");
-  dtostrfd(gp->ymax,2,str);
-  fp.print(str);
-  fp.print("\t");
-  for (uint32_t count=0;count<gp->xs;count++) {
-    dtostrfd(gp->values[count],0,str);
-    fp.print(str);
-    fp.print("\t");
-  }
-  fp.print("\n");
-  fp.close();
-}
-void Restore_graph(uint8_t num, char *path) {
-  if (!renderer) return;
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  File fp;
-  fp=SD.open(path,FILE_READ);
-  if (!fp) return;
-  char vbuff[32];
-  char *cp=vbuff;
-  uint8_t buf[2];
-  uint8_t findex=0;
-
-  for (uint32_t count=0;count<=gp->xs+4;count++) {
-    cp=vbuff;
-    findex=0;
-    while (fp.available()) {
-      fp.read(buf,1);
-      if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
-        break;
-      } else {
-        *cp++=buf[0];
-        findex++;
-        if (findex>=sizeof(vbuff)-1) break;
-      }
-    }
-    *cp=0;
-    if (count<=4) {
-      if (count==0) gp->xcnt=atoi(vbuff);
-    } else {
-      gp->values[count-5]=atoi(vbuff);
-    }
-  }
-  fp.close();
-  RedrawGraph(num,1);
-}
-#endif
-
-void RedrawGraph(uint8_t num, uint8_t flags) {
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  if (!flags) {
-    gp->flags.draw=0;
-    return;
-  }
-  if (!renderer) return;
-
-  gp->flags.draw=1;
-  uint16_t linecol=fg_color;
-
-  if (color_type==COLOR_COLOR) {
-    linecol=renderer->GetColorFromIndex(gp->color_index);
-  }
-
-  if (!gp->flags.overlay) {
-
-    renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
-
-    ClrGraph(index);
-  }
-
-  for (uint16_t count=0;count<gp->xs-1;count++) {
-    renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
-  }
-}
-
-
-void AddGraph(uint8_t num,uint8_t val) {
-  struct GRAPH *gp=graph[num];
-  if (!renderer) return;
-
-  uint16_t linecol=fg_color;
-  if (color_type==COLOR_COLOR) {
-    linecol=renderer->GetColorFromIndex(gp->color_index);
-  }
-  gp->xcnt++;
-  if (gp->xcnt>gp->xs) {
-    gp->xcnt=gp->xs;
-    int16_t count;
-
-    for (count=0;count<gp->xs-1;count++) {
-      gp->values[count]=gp->values[count+1];
-    }
-    gp->values[gp->xcnt-1]=val;
-
-    if (!gp->flags.draw) return;
-
-
-    if (millis()-gp->last_ms_redrawn>1000) {
-      gp->last_ms_redrawn=millis();
-
-      if (!gp->flags.overlay) {
-
-        renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
-
-        ClrGraph(num);
-      }
-
-      for (count=0;count<gp->xs-1;count++) {
-        renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
-      }
-    }
-  } else {
-
-    gp->values[gp->xcnt]=val;
-    if (!gp->flags.draw) return;
-    renderer->writeLine(gp->xp+gp->xcnt-1,gp->yp+gp->ys-gp->values[gp->xcnt-1]-1,gp->xp+gp->xcnt,gp->yp+gp->ys-gp->values[gp->xcnt]-1,linecol);
-  }
-}
-
-
-
-void AddValue(uint8_t num,float fval) {
-
-  num=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[num];
-  if (!gp) return;
-
-  if (fval>gp->ymax) fval=gp->ymax;
-  if (fval<gp->ymin) fval=gp->ymin;
-
-  int16_t val;
-  val=(fval-gp->ymin)/gp->range;
-
-  if (val>gp->ys-1) val=gp->ys-1;
-  if (val<0) val=0;
-
-
-  gp->summ+=val;
-  gp->dcnt++;
-
-
-  if (gp->decimation<0) {
-    if (gp->dcnt>=-gp->decimation) {
-      gp->dcnt=0;
-
-      val=gp->summ/-gp->decimation;
-      gp->summ=0;
-
-      AddGraph(num,val);
-    }
-  }
-}
-#endif
-
-
-
-
-
-bool Xdrv13(uint8_t function)
-{
-  bool result = false;
-
-  if ((i2c_flg || spi_flg || soft_spi_flg) && XdspPresent()) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        DisplayInitDriver();
-#ifdef USE_GRAPH
-        for (uint8_t count=0;count<NUM_GRAPHS;count++) {
-          graph[count]=0;
-        }
-#endif
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (Settings.display_model) { XdspCall(FUNC_DISPLAY_EVERY_50_MSECOND); }
-        break;
-      case FUNC_SET_POWER:
-        DisplaySetPower();
-        break;
-      case FUNC_EVERY_SECOND:
-#ifdef USE_GRAPH
-        DisplayCheckGraph();
-#endif
-
-#ifdef USE_DISPLAY_MODES1TO5
-        if (Settings.display_model && Settings.display_mode) { XdspCall(FUNC_DISPLAY_EVERY_SECOND); }
-#endif
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_MQTT_SUBSCRIBE:
-        DisplayMqttSubscribe();
-        break;
-      case FUNC_MQTT_DATA:
-        result = DisplayMqttData();
-        break;
-      case FUNC_SHOW_SENSOR:
-        DisplayLocalSensor();
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kDisplayCommands, DisplayCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
-# 64 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
-#ifdef USE_MP3_PLAYER
-
-
-
-
-
-#define XDRV_14 14
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *MP3Player;
-
-
-
-
-
-#define D_CMND_MP3 "MP3"
-
-const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}";
-const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}";
-const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC";
-
-
-
-
-
-enum MP3_Commands {
-  CMND_MP3_TRACK,
-  CMND_MP3_PLAY,
-  CMND_MP3_PAUSE,
-  CMND_MP3_STOP,
-  CMND_MP3_VOLUME,
-  CMND_MP3_EQ,
-  CMND_MP3_DEVICE,
-  CMND_MP3_RESET,
-  CMND_MP3_DAC };
-
-
-
-
-
-
-#define MP3_CMD_RESET_VALUE 0
-
-#define MP3_CMD_TRACK 0x03
-#define MP3_CMD_PLAY 0x0d
-#define MP3_CMD_PAUSE 0x0e
-#define MP3_CMD_STOP 0x16
-#define MP3_CMD_VOLUME 0x06
-#define MP3_CMD_EQ 0x07
-#define MP3_CMD_DEVICE 0x09
-#define MP3_CMD_RESET 0x0C
-#define MP3_CMD_DAC 0x1A
-
-
-
-
-
-
-uint16_t MP3_Checksum(uint8_t *array)
-{
-  uint16_t checksum = 0;
-  for (uint32_t i = 0; i < 6; i++) {
-    checksum += array[i];
-  }
-  checksum = checksum^0xffff;
-  return (checksum+1);
-}
-
-
-
-
-
-
-void MP3PlayerInit(void) {
-  MP3Player = new TasmotaSerial(-1, pin[GPIO_MP3_DFR562]);
-
-  if (MP3Player->begin(9600)) {
-    MP3Player->flush();
-    delay(1000);
-    MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE);
-    delay(3000);
-    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
-  }
-  return;
-}
-# 159 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_14_mp3.ino"
-void MP3_CMD(uint8_t mp3cmd,uint16_t val) {
-  uint8_t i = 0;
-  uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef};
-  cmd[3] = mp3cmd;
-  cmd[4] = 0;
-  cmd[5] = val>>8;
-  cmd[6] = val;
-  uint16_t chks = MP3_Checksum(&cmd[1]);
-  cmd[7] = chks>>8;
-  cmd[8] = chks;
-  MP3Player->write(cmd, sizeof(cmd));
-  delay(1000);
-  if (mp3cmd == MP3_CMD_RESET) {
-    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
-  }
-  return;
-}
-
-
-
-
-
-bool MP3PlayerCmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_MP3);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands);
-
-    switch (command_code) {
-      case CMND_MP3_TRACK:
-      case CMND_MP3_VOLUME:
-      case CMND_MP3_EQ:
-      case CMND_MP3_DEVICE:
-      case CMND_MP3_DAC:
-
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); }
-          if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_DAC) { MP3_CMD(MP3_CMD_DAC, XdrvMailbox.payload); }
-        }
-        Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_MP3_PLAY:
-      case CMND_MP3_PAUSE:
-      case CMND_MP3_STOP:
-      case CMND_MP3_RESET:
-
-        if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); }
-        if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); }
-        if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); }
-        if (command_code == CMND_MP3_RESET) { MP3_CMD(MP3_CMD_RESET, 0); }
-        Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload);
-        break;
-      default:
-
-       serviced = false;
-     break;
-    }
-  } else {
-    return false;
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xdrv14(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_MP3_DFR562] < 99) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        MP3PlayerInit();
-        break;
-      case FUNC_COMMAND:
-        result = MP3PlayerCmd();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_15_pca9685.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_15_pca9685.ino"
-#ifdef USE_I2C
-#ifdef USE_PCA9685
-
-
-
-
-
-
-#define XDRV_15 15
-#define XI2C_01 1
-
-#define PCA9685_REG_MODE1 0x00
-#define PCA9685_REG_LED0_ON_L 0x06
-#define PCA9685_REG_PRE_SCALE 0xFE
-
-#ifndef USE_PCA9685_ADDR
-  #define USE_PCA9685_ADDR 0x40
-#endif
-#ifndef USE_PCA9685_FREQ
-  #define USE_PCA9685_FREQ 50
-#endif
-
-bool pca9685_detected = false;
-uint16_t pca9685_freq = USE_PCA9685_FREQ;
-uint16_t pca9685_pin_pwm_value[16];
-
-void PCA9685_Detect(void)
-{
-  if (I2cActive(USE_PCA9685_ADDR)) { return; }
-
-  uint8_t buffer;
-  if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
-    I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x20);
-    if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
-      if (0x20 == buffer) {
-        pca9685_detected = true;
-        I2cSetActiveFound(USE_PCA9685_ADDR, "PCA9685");
-        PCA9685_Reset();
-      }
-    }
-  }
-}
-
-void PCA9685_Reset(void)
-{
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x80);
-  PCA9685_SetPWMfreq(USE_PCA9685_FREQ);
-  for (uint32_t pin=0;pin<16;pin++) {
-    PCA9685_SetPWM(pin,0,false);
-    pca9685_pin_pwm_value[pin] = 0;
-  }
-  Response_P(PSTR("{\"PCA9685\":{\"RESET\":\"OK\"}}"));
-}
-
-void PCA9685_SetPWMfreq(double freq) {
-
-
-
-
-  if (freq > 23 && freq < 1527) {
-   pca9685_freq=freq;
-  } else {
-   pca9685_freq=50;
-  }
-  uint8_t pre_scale_osc = round(25000000/(4096*pca9685_freq))-1;
-  if (1526 == pca9685_freq) pre_scale_osc=0xFF;
-  uint8_t current_mode1 = I2cRead8(USE_PCA9685_ADDR, PCA9685_REG_MODE1);
-  uint8_t sleep_mode1 = (current_mode1&0x7F) | 0x10;
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, sleep_mode1);
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_PRE_SCALE, pre_scale_osc);
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, current_mode1 | 0xA0);
-}
-
-void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off) {
-  uint8_t led_reg = PCA9685_REG_LED0_ON_L + 4 * pin;
-  uint32_t led_data = 0;
-  I2cWrite8(USE_PCA9685_ADDR, led_reg, on);
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+1, (on >> 8));
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+2, off);
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+3, (off >> 8));
-}
-
-void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted) {
-  if (4096 == pwm) {
-    PCA9685_SetPWM_Reg(pin, 4096, 0);
-  } else {
-    PCA9685_SetPWM_Reg(pin, 0, pwm);
-  }
-  pca9685_pin_pwm_value[pin] = pwm;
-}
-
-bool PCA9685_Command(void)
-{
-  bool serviced = true;
-  bool validpin = false;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"STATUS")) { PCA9685_OutputTelemetry(false); return serviced; }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) {
-    if (paramcount > 1) {
-      uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((new_freq >= 24) && (new_freq <= 1526)) {
-        PCA9685_SetPWMfreq(new_freq);
-        Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i, \"Result\":\"OK\"}}"),new_freq);
-        return serviced;
-      }
-    } else {
-      Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i}}"),pca9685_freq);
-      return serviced;
-    }
-  }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWM")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (paramcount > 2) {
-        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "ON")) {
-          PCA9685_SetPWM(pin, 4096, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,4096);
-          serviced = true;
-          return serviced;
-        }
-        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "OFF")) {
-          PCA9685_SetPWM(pin, 0, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,0);
-          serviced = true;
-          return serviced;
-        }
-        uint16_t pwm = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        if ((pin >= 0 && pin <= 15) && (pwm >= 0 && pwm <= 4096)) {
-          PCA9685_SetPWM(pin, pwm, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,pwm);
-          serviced = true;
-          return serviced;
-        }
-      }
-    }
-  }
-  return serviced;
-}
-
-void PCA9685_OutputTelemetry(bool telemetry)
-{
-  ResponseTime_P(PSTR(",\"PCA9685\":{\"PWM_FREQ\":%i,"),pca9685_freq);
-  for (uint32_t pin=0;pin<16;pin++) {
-    ResponseAppend_P(PSTR("\"PWM%i\":%i,"),pin,pca9685_pin_pwm_value[pin]);
-  }
-  ResponseAppend_P(PSTR("\"END\":1}}"));
-  if (telemetry) {
-    MqttPublishTeleSensor();
-  }
-}
-
-bool Xdrv15(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_01)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    PCA9685_Detect();
-  }
-  else if (pca9685_detected) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        if (tele_period == 0) {
-          PCA9685_OutputTelemetry(true);
-        }
-        break;
-      case FUNC_COMMAND_DRIVER:
-        if (XDRV_15 == XdrvMailbox.index) {
-          result = PCA9685_Command();
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-#ifdef USE_LIGHT
-#ifdef USE_TUYA_MCU
-
-#define XDRV_16 16
-#define XNRG_16 16
-
-#ifndef TUYA_DIMMER_ID
-#define TUYA_DIMMER_ID 0
-#endif
-
-#define TUYA_CMD_HEARTBEAT 0x00
-#define TUYA_CMD_QUERY_PRODUCT 0x01
-#define TUYA_CMD_MCU_CONF 0x02
-#define TUYA_CMD_WIFI_STATE 0x03
-#define TUYA_CMD_WIFI_RESET 0x04
-#define TUYA_CMD_WIFI_SELECT 0x05
-#define TUYA_CMD_SET_DP 0x06
-#define TUYA_CMD_STATE 0x07
-#define TUYA_CMD_QUERY_STATE 0x08
-
-#define TUYA_LOW_POWER_CMD_WIFI_STATE 0x02
-#define TUYA_LOW_POWER_CMD_WIFI_RESET 0x03
-#define TUYA_LOW_POWER_CMD_WIFI_CONFIG 0x04
-#define TUYA_LOW_POWER_CMD_STATE 0x05
-
-#define TUYA_TYPE_BOOL 0x01
-#define TUYA_TYPE_VALUE 0x02
-#define TUYA_TYPE_STRING 0x03
-#define TUYA_TYPE_ENUM 0x04
-
-#define TUYA_BUFFER_SIZE 256
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *TuyaSerial = nullptr;
-
-struct TUYA {
-  uint16_t new_dim = 0;
-  bool ignore_dim = false;
-  uint8_t cmd_status = 0;
-  uint8_t cmd_checksum = 0;
-  uint8_t data_len = 0;
-  uint8_t wifi_state = -2;
-  uint8_t heartbeat_timer = 0;
-#ifdef USE_ENERGY_SENSOR
-  uint32_t lastPowerCheckTime = 0;
-#endif
-  char *buffer = nullptr;
-  int byte_counter = 0;
-  bool low_power_mode = false;
-  bool send_success_next_second = false;
-} Tuya;
-
-
-enum TuyaSupportedFunctions {
-  TUYA_MCU_FUNC_NONE,
-  TUYA_MCU_FUNC_SWT1 = 1,
-  TUYA_MCU_FUNC_SWT2,
-  TUYA_MCU_FUNC_SWT3,
-  TUYA_MCU_FUNC_SWT4,
-  TUYA_MCU_FUNC_REL1 = 11,
-  TUYA_MCU_FUNC_REL2,
-  TUYA_MCU_FUNC_REL3,
-  TUYA_MCU_FUNC_REL4,
-  TUYA_MCU_FUNC_REL5,
-  TUYA_MCU_FUNC_REL6,
-  TUYA_MCU_FUNC_REL7,
-  TUYA_MCU_FUNC_REL8,
-  TUYA_MCU_FUNC_DIMMER = 21,
-  TUYA_MCU_FUNC_POWER = 31,
-  TUYA_MCU_FUNC_CURRENT,
-  TUYA_MCU_FUNC_VOLTAGE,
-  TUYA_MCU_FUNC_BATTERY_STATE,
-  TUYA_MCU_FUNC_BATTERY_PERCENTAGE,
-  TUYA_MCU_FUNC_REL1_INV = 41,
-  TUYA_MCU_FUNC_REL2_INV,
-  TUYA_MCU_FUNC_REL3_INV,
-  TUYA_MCU_FUNC_REL4_INV,
-  TUYA_MCU_FUNC_REL5_INV,
-  TUYA_MCU_FUNC_REL6_INV,
-  TUYA_MCU_FUNC_REL7_INV,
-  TUYA_MCU_FUNC_REL8_INV,
-  TUYA_MCU_FUNC_LOWPOWER_MODE = 51,
-  TUYA_MCU_FUNC_LAST = 255
-};
-
-const char kTuyaCommand[] PROGMEM = "|"
-  D_CMND_TUYA_MCU "|" D_CMND_TUYA_MCU_SEND_STATE;
-
-void (* const TuyaCommand[])(void) PROGMEM = {
-  &CmndTuyaMcu, &CmndTuyaSend
-};
-# 126 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-void CmndTuyaSend(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    if (XdrvMailbox.data_len > 0) {
-
-      char *p;
-      char *data;
-      uint8_t i = 0;
-      uint8_t dpId = 0;
-      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
-        if ( i == 0) {
-          dpId = strtoul(str, nullptr, 0);
-        } else {
-          data = str;
-        }
-        i++;
-      }
-
-      if (1 == XdrvMailbox.index) {
-        TuyaSendBool(dpId, strtoul(data, nullptr, 0));
-      } else if (2 == XdrvMailbox.index) {
-        TuyaSendValue(dpId, strtoull(data, nullptr, 0));
-      } else if (3 == XdrvMailbox.index) {
-        TuyaSendString(dpId, data);
-      } else if (4 == XdrvMailbox.index) {
-        TuyaSendEnum(dpId, strtoul(data, nullptr, 0));
-      }
-    }
-    ResponseCmndDone();
-  }
-}
-
-
-
-
-
-
-
-void CmndTuyaMcu(void) {
-  if (XdrvMailbox.data_len > 0) {
-    char *p;
-    uint8_t i = 0;
-    uint8_t parm[3] = { 0 };
-    for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
-      parm[i] = strtoul(str, nullptr, 0);
-      i++;
-    }
-
-    if (TuyaFuncIdValid(parm[0])) {
-      TuyaAddMcuFunc(parm[0], parm[1]);
-      restart_flag = 2;
-    } else {
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR("TYA: TuyaMcu Invalid function id=%d"), parm[0]);
-    }
-
-  }
-
-  Response_P(PSTR("{\"" D_CMND_TUYA_MCU "\":["));
-  bool added = false;
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].fnid != 0) {
-      if (added) {
-        ResponseAppend_P(PSTR(","));
-      }
-      ResponseAppend_P(PSTR("{\"fnId\":%d,\"dpId\":%d}" ), Settings.tuya_fnid_map[i].fnid, Settings.tuya_fnid_map[i].dpid);
-      added = true;
-    }
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-
-
-
-
-void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId) {
-  bool added = false;
-
-  if (fnId == 0 || dpId == 0) {
-    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-      if ((dpId > 0 && Settings.tuya_fnid_map[i].dpid == dpId) || (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].fnid == fnId)) {
-        Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
-        Settings.tuya_fnid_map[i].dpid = 0;
-        break;
-      }
-    }
-  } else {
-    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-      if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].dpid == 0 || Settings.tuya_fnid_map[i].fnid == fnId || Settings.tuya_fnid_map[i].fnid == 0) {
-        if (!added) {
-          Settings.tuya_fnid_map[i].fnid = fnId;
-          Settings.tuya_fnid_map[i].dpid = dpId;
-          added = true;
-        } else if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].fnid == fnId) {
-          Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
-          Settings.tuya_fnid_map[i].dpid = 0;
-        }
-      }
-    }
-  }
-  UpdateDevices();
-}
-
-void UpdateDevices() {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    uint8_t fnId = Settings.tuya_fnid_map[i].fnid;
-    if (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].dpid > 0) {
-
-      if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
-        bitClear(rel_inverted, fnId - TUYA_MCU_FUNC_REL1);
-      } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
-        bitSet(rel_inverted, fnId - TUYA_MCU_FUNC_REL1_INV);
-      }
-
-    }
-  }
-}
-
-inline bool TuyaFuncIdValid(uint8_t fnId) {
-  return (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) ||
-  (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) ||
-    fnId == TUYA_MCU_FUNC_DIMMER ||
-    (fnId >= TUYA_MCU_FUNC_POWER && fnId <= TUYA_MCU_FUNC_VOLTAGE) ||
-    (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) ||
-    (fnId == TUYA_MCU_FUNC_LOWPOWER_MODE);
-}
-
-uint8_t TuyaGetFuncId(uint8_t dpid) {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].dpid == dpid) {
-      return Settings.tuya_fnid_map[i].fnid;
-    }
-  }
-  return TUYA_MCU_FUNC_NONE;
-}
-
-uint8_t TuyaGetDpId(uint8_t fnId) {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].fnid == fnId) {
-      return Settings.tuya_fnid_map[i].dpid;
-    }
-  }
-  return 0;
-}
-
-void TuyaSendCmd(uint8_t cmd, uint8_t payload[] = nullptr, uint16_t payload_len = 0)
-{
-  uint8_t checksum = (0xFF + cmd + (payload_len >> 8) + (payload_len & 0xFF));
-  TuyaSerial->write(0x55);
-  TuyaSerial->write(0xAA);
-  TuyaSerial->write((uint8_t)0x00);
-  TuyaSerial->write(cmd);
-  TuyaSerial->write(payload_len >> 8);
-  TuyaSerial->write(payload_len & 0xFF);
-  snprintf_P(log_data, sizeof(log_data), PSTR("TYA: Send \"55aa00%02x%02x%02x"), cmd, payload_len >> 8, payload_len & 0xFF);
-  for (uint32_t i = 0; i < payload_len; ++i) {
-    TuyaSerial->write(payload[i]);
-    checksum += payload[i];
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, payload[i]);
-  }
-  TuyaSerial->write(checksum);
-  TuyaSerial->flush();
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x\""), log_data, checksum);
-  AddLog(LOG_LEVEL_DEBUG);
-}
-
-void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value)
-{
-  uint16_t payload_len = 4;
-  uint8_t payload_buffer[8];
-  payload_buffer[0] = id;
-  payload_buffer[1] = type;
-  switch (type) {
-    case TUYA_TYPE_BOOL:
-    case TUYA_TYPE_ENUM:
-      payload_len += 1;
-      payload_buffer[2] = 0x00;
-      payload_buffer[3] = 0x01;
-      payload_buffer[4] = value[0];
-      break;
-    case TUYA_TYPE_VALUE:
-      payload_len += 4;
-      payload_buffer[2] = 0x00;
-      payload_buffer[3] = 0x04;
-      payload_buffer[4] = value[3];
-      payload_buffer[5] = value[2];
-      payload_buffer[6] = value[1];
-      payload_buffer[7] = value[0];
-      break;
-
-  }
-
-  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
-}
-
-void TuyaSendBool(uint8_t id, bool value)
-{
-  TuyaSendState(id, TUYA_TYPE_BOOL, (uint8_t*)&value);
-}
-
-void TuyaSendValue(uint8_t id, uint32_t value)
-{
-  TuyaSendState(id, TUYA_TYPE_VALUE, (uint8_t*)(&value));
-}
-
-void TuyaSendEnum(uint8_t id, uint32_t value)
-{
-  TuyaSendState(id, TUYA_TYPE_ENUM, (uint8_t*)(&value));
-}
-
-void TuyaSendString(uint8_t id, char data[]) {
-
-  uint16_t len = strlen(data);
-  uint16_t payload_len = 4 + len;
-  uint8_t payload_buffer[payload_len];
-  payload_buffer[0] = id;
-  payload_buffer[1] = TUYA_TYPE_STRING;
-  payload_buffer[2] = len >> 8;
-  payload_buffer[3] = len & 0xFF;
-
-  for (uint16_t i = 0; i < len; i++) {
-    payload_buffer[4+i] = data[i];
-  }
-
-  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
-}
-
-bool TuyaSetPower(void)
-{
-  bool status = false;
-
-  uint8_t rpower = XdrvMailbox.index;
-  int16_t source = XdrvMailbox.payload;
-
-  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1 + active_device - 1);
-  if (dpid == 0) dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1_INV + active_device - 1);
-
-  if (source != SRC_SWITCH && TuyaSerial) {
-    TuyaSendBool(dpid, bitRead(rpower, active_device-1) ^ bitRead(rel_inverted, active_device-1));
-    status = true;
-  }
-  return status;
-}
-
-bool TuyaSetChannels(void)
-{
-  LightSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
-  delay(20);
-  return true;
-}
-
-void LightSerialDuty(uint16_t duty)
-{
-  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_DIMMER);
-  if (duty > 0 && !Tuya.ignore_dim && TuyaSerial && dpid > 0) {
-    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
-    if (duty < Settings.dimmer_hw_min) { duty = Settings.dimmer_hw_min; }
-    if (Tuya.new_dim != duty) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim value=%d (id=%d)"), duty, dpid);
-      TuyaSendValue(dpid, duty);
-    }
-  } else if (dpid > 0) {
-    Tuya.ignore_dim = false;
-    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim skipped value=%d"), duty);
-  } else {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Cannot set dimmer. Dimmer Id unknown"));
-  }
-}
-
-void TuyaRequestState(void)
-{
-  if (TuyaSerial) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Read MCU state"));
-
-    TuyaSendCmd(TUYA_CMD_QUERY_STATE);
-  }
-}
-
-void TuyaResetWifi(void)
-{
-  if (!Settings.flag.button_restrict) {
-    char scmnd[20];
-    snprintf_P(scmnd, sizeof(scmnd), D_CMND_WIFICONFIG " %d", 2);
-    ExecuteCommand(scmnd, SRC_BUTTON);
-  }
-}
-
-void TuyaProcessStatePacket(void) {
-  char scmnd[20];
-  uint8_t dpidStart = 6;
-  uint8_t fnId;
-  uint16_t dpDataLen;
-
-  while (dpidStart + 4 < Tuya.byte_counter) {
-    dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-    fnId = TuyaGetFuncId(Tuya.buffer[dpidStart]);
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[dpidStart]);
-
-      if (Tuya.buffer[dpidStart + 1] == 1) {
-
-        if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
-          if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
-            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);
-          }
-        } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
-          if (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
-            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4] ^ 1, SRC_SWITCH);
-          }
-        } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[dpidStart + 4], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
-
-          if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[dpidStart + 4]) {
-            SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[dpidStart + 4]);
-            SwitchHandler(1);
-          }
-        }
-
-      }
-      else if (Tuya.buffer[dpidStart + 1] == 2) {
-        bool tuya_energy_enabled = (XNRG_16 == energy_flg);
-        uint16_t packetValue = Tuya.buffer[dpidStart + 6] << 8 | Tuya.buffer[dpidStart + 7];
-        if (fnId == TUYA_MCU_FUNC_DIMMER) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
-          Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
-          if ((power || Settings.flag3.tuya_apply_o20) &&
-              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
-            Tuya.ignore_dim = true;
-
-            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
-            ExecuteCommand(scmnd, SRC_SWITCH);
-          }
-        }
-
-  #ifdef USE_ENERGY_SENSOR
-        else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
-          Energy.voltage[0] = (float)packetValue / 10;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[dpidStart], packetValue);
-        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
-          Energy.current[0] = (float)packetValue / 1000;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[dpidStart], packetValue);
-        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
-          Energy.active_power[0] = (float)packetValue / 10;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[dpidStart], packetValue);
-
-          if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
-            Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
-            EnergyUpdateToday();
-          }
-          Tuya.lastPowerCheckTime = Rtc.utc_time;
-        }
-  #endif
-
-      }
-
-
-    dpidStart += dpDataLen + 4;
-  }
-}
-
-void TuyaLowPowerModePacketProcess(void) {
-  switch (Tuya.buffer[3]) {
-    case TUYA_CMD_QUERY_PRODUCT:
-      TuyaHandleProductInfoPacket();
-      TuyaSetWifiLed();
-      break;
-
-    case TUYA_LOW_POWER_CMD_STATE:
-      TuyaProcessStatePacket();
-      Tuya.send_success_next_second = true;
-      break;
-  }
-
-}
-
-void TuyaHandleProductInfoPacket(void) {
-  uint16_t dataLength = Tuya.buffer[4] << 8 | Tuya.buffer[5];
-  char *data = &Tuya.buffer[6];
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("TYA: MCU Product ID: %.*s"), dataLength, data);
-}
-
-void TuyaSendLowPowerSuccessIfNeeded(void) {
-  uint8_t success = 1;
-
-  if (Tuya.send_success_next_second) {
-    TuyaSendCmd(TUYA_LOW_POWER_CMD_STATE, &success, 1);
-    Tuya.send_success_next_second = false;
-  }
-}
-
-void TuyaNormalPowerModePacketProcess(void)
-{
-  switch (Tuya.buffer[3]) {
-    case TUYA_CMD_QUERY_PRODUCT:
-      TuyaHandleProductInfoPacket();
-      TuyaSendCmd(TUYA_CMD_MCU_CONF);
-      break;
-
-    case TUYA_CMD_HEARTBEAT:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Heartbeat"));
-      if (Tuya.buffer[6] == 0) {
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Detected MCU restart"));
-        Tuya.wifi_state = -2;
-      }
-      break;
-
-    case TUYA_CMD_STATE:
-      TuyaProcessStatePacket();
-      break;
-
-    case TUYA_CMD_WIFI_RESET:
-    case TUYA_CMD_WIFI_SELECT:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi Reset"));
-      TuyaResetWifi();
-      break;
-
-    case TUYA_CMD_WIFI_STATE:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi LED set ACK"));
-      Tuya.wifi_state = TuyaGetTuyaWifiState();
-      break;
-
-    case TUYA_CMD_MCU_CONF:
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX MCU configuration Mode=%d"), Tuya.buffer[5]);
-
-      if (Tuya.buffer[5] == 2) {
-        uint8_t led1_gpio = Tuya.buffer[6];
-        uint8_t key1_gpio = Tuya.buffer[7];
-        bool key1_set = false;
-        bool led1_set = false;
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          if (Settings.my_gp.io[i] == GPIO_LED1) led1_set = true;
-          else if (Settings.my_gp.io[i] == GPIO_KEY1) key1_set = true;
-        }
-        if (!Settings.my_gp.io[led1_gpio] && !led1_set) {
-          Settings.my_gp.io[led1_gpio] = GPIO_LED1;
-          restart_flag = 2;
-        }
-        if (!Settings.my_gp.io[key1_gpio] && !key1_set) {
-          Settings.my_gp.io[key1_gpio] = GPIO_KEY1;
-          restart_flag = 2;
-        }
-      }
-      TuyaRequestState();
-      break;
-
-    default:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX unknown command"));
-  }
-}
-
-
-
-
-
-bool TuyaModuleSelected(void)
-{
-  if (!(pin[GPIO_TUYA_RX] < 99) || !(pin[GPIO_TUYA_TX] < 99)) {
-    pin[GPIO_TUYA_TX] = 1;
-    pin[GPIO_TUYA_RX] = 3;
-    Settings.my_gp.io[1] = GPIO_TUYA_TX;
-    Settings.my_gp.io[3] = GPIO_TUYA_RX;
-    restart_flag = 2;
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) == 0 && TUYA_DIMMER_ID > 0) {
-    TuyaAddMcuFunc(TUYA_MCU_FUNC_DIMMER, TUYA_DIMMER_ID);
-  }
-
-  bool relaySet = false;
-
-  for (uint8_t i = 0 ; i < MAX_TUYA_FUNCTIONS; i++) {
-    if ((Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
-    (Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
-      relaySet = true;
-      devices_present++;
-    }
-  }
-
-  if (!relaySet) {
-    TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
-    devices_present++;
-    SettingsSaveAll();
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) != 0) {
-    light_type = LT_SERIAL1;
-  } else {
-    light_type = LT_BASIC;
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_LOWPOWER_MODE) != 0) {
-    Tuya.low_power_mode = true;
-    Settings.flag3.fast_power_cycle_disable = true;
-  }
-
-  UpdateDevices();
-  return true;
-}
-
-void TuyaInit(void)
-{
-  Tuya.buffer = (char*)(malloc(TUYA_BUFFER_SIZE));
-  if (Tuya.buffer != nullptr) {
-    TuyaSerial = new TasmotaSerial(pin[GPIO_TUYA_RX], pin[GPIO_TUYA_TX], 2);
-    if (TuyaSerial->begin(9600)) {
-      if (TuyaSerial->hardwareSerial()) { ClaimSerial(); }
-
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Request MCU configuration"));
-
-      TuyaSendCmd(TUYA_CMD_QUERY_PRODUCT);
-    }
-  }
-  Tuya.heartbeat_timer = 0;
-}
-
-void TuyaSerialInput(void)
-{
-  while (TuyaSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = TuyaSerial->read();
-
-    if (serial_in_byte == 0x55) {
-      Tuya.cmd_status = 1;
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-      Tuya.cmd_checksum += serial_in_byte;
-    }
-    else if (Tuya.cmd_status == 1 && serial_in_byte == 0xAA) {
-      Tuya.cmd_status = 2;
-
-      Tuya.byte_counter = 0;
-      Tuya.buffer[Tuya.byte_counter++] = 0x55;
-      Tuya.buffer[Tuya.byte_counter++] = 0xAA;
-      Tuya.cmd_checksum = 0xFF;
-    }
-    else if (Tuya.cmd_status == 2) {
-      if (Tuya.byte_counter == 5) {
-        Tuya.cmd_status = 3;
-        Tuya.data_len = serial_in_byte;
-      }
-      Tuya.cmd_checksum += serial_in_byte;
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-    }
-    else if ((Tuya.cmd_status == 3) && (Tuya.byte_counter == (6 + Tuya.data_len)) && (Tuya.cmd_checksum == serial_in_byte)) {
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-
-      char hex_char[(Tuya.byte_counter * 2) + 2];
-      uint16_t len = Tuya.buffer[4] << 8 | Tuya.buffer[5];
-      Response_P(PSTR("{\"" D_JSON_TUYA_MCU_RECEIVED "\":{\"Data\":\"%s\",\"Cmnd\":%d"), ToHex_P((unsigned char*)Tuya.buffer, Tuya.byte_counter, hex_char, sizeof(hex_char)), Tuya.buffer[3]);
-
-      if (len > 0) {
-        ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
-        if (TUYA_CMD_STATE == Tuya.buffer[3]) {
-
-
-          uint8_t dpidStart = 6;
-          while (dpidStart + 4 < Tuya.byte_counter) {
-            uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), Tuya.buffer[dpidStart], Tuya.buffer[dpidStart], Tuya.buffer[dpidStart + 1], ToHex_P((unsigned char*)&Tuya.buffer[dpidStart + 4], dpDataLen, hex_char, sizeof(hex_char)));
-            if (TUYA_TYPE_STRING == Tuya.buffer[dpidStart + 1]) {
-              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, (char *)&Tuya.buffer[dpidStart + 4]);
-            }
-            ResponseAppend_P(PSTR("}"));
-            dpidStart += dpDataLen + 4;
-          }
-        }
-      }
-
-      ResponseAppend_P(PSTR("}}"));
-
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_TUYA_MCU_RECEIVED));
-      } else {
-        AddLog_P(LOG_LEVEL_DEBUG, mqtt_data);
-      }
-      XdrvRulesProcess();
-
-      if (!Tuya.low_power_mode) {
-        TuyaNormalPowerModePacketProcess();
-      } else {
-        TuyaLowPowerModePacketProcess();
-      }
-
-      Tuya.byte_counter = 0;
-      Tuya.cmd_status = 0;
-      Tuya.cmd_checksum = 0;
-      Tuya.data_len = 0;
-    }
-    else if (Tuya.byte_counter < TUYA_BUFFER_SIZE -1) {
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-      Tuya.cmd_checksum += serial_in_byte;
-    } else {
-      Tuya.byte_counter = 0;
-      Tuya.cmd_status = 0;
-      Tuya.cmd_checksum = 0;
-      Tuya.data_len = 0;
-    }
-  }
-}
-
-bool TuyaButtonPressed(void)
-{
-  if (!XdrvMailbox.index && ((PRESSED == XdrvMailbox.payload) && (NOT_PRESSED == Button.last_state[XdrvMailbox.index]))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Reset GPIO triggered"));
-    TuyaResetWifi();
-    return true;
-  }
-  return false;
-}
-
-uint8_t TuyaGetTuyaWifiState(void) {
-
-  uint8_t wifi_state = 0x02;
-  switch(WifiState()){
-    case WIFI_MANAGER:
-      wifi_state = 0x01;
-      break;
-    case WIFI_RESTART:
-      wifi_state = 0x03;
-      break;
-  }
-
-  if (MqttIsConnected()) {
-    wifi_state = 0x04;
-  }
-
-  return wifi_state;
-}
-
-void TuyaSetWifiLed(void)
-{
-  Tuya.wifi_state = TuyaGetTuyaWifiState();
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Set WiFi LED %d (%d)"), Tuya.wifi_state, WifiState());
-
-  if (Tuya.low_power_mode) {
-    TuyaSendCmd(TUYA_LOW_POWER_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
-  } else {
-    TuyaSendCmd(TUYA_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
-  }
-}
-
-#ifdef USE_ENERGY_SENSOR
-
-
-
-
-bool Xnrg16(uint8_t function)
-{
-  bool result = false;
-
-  if (TUYA_DIMMER == my_module_type) {
-    if (FUNC_PRE_INIT == function) {
-      if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0) {
-        if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0) {
-          Energy.current_available = false;
-        }
-        if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0) {
-          Energy.voltage_available = false;
-        }
-        energy_flg = XNRG_16;
-      }
-    }
-  }
-  return result;
-}
-#endif
-
-
-
-
-
-bool Xdrv16(uint8_t function)
-{
-  bool result = false;
-
-  if (TUYA_DIMMER == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (TuyaSerial) { TuyaSerialInput(); }
-        break;
-      case FUNC_MODULE_INIT:
-        result = TuyaModuleSelected();
-        break;
-      case FUNC_PRE_INIT:
-        TuyaInit();
-        break;
-      case FUNC_SET_DEVICE_POWER:
-        result = TuyaSetPower();
-        break;
-      case FUNC_BUTTON_PRESSED:
-        result = TuyaButtonPressed();
-        break;
-      case FUNC_EVERY_SECOND:
-        if (TuyaSerial && Tuya.wifi_state != TuyaGetTuyaWifiState()) { TuyaSetWifiLed(); }
-        if (!Tuya.low_power_mode) {
-          Tuya.heartbeat_timer++;
-          if (Tuya.heartbeat_timer > 10) {
-            Tuya.heartbeat_timer = 0;
-            TuyaSendCmd(TUYA_CMD_HEARTBEAT);
-          }
-        } else {
-            TuyaSendLowPowerSuccessIfNeeded();
-        }
-        break;
-      case FUNC_SET_CHANNELS:
-        result = TuyaSetChannels();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kTuyaCommand, TuyaCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_17_rcswitch.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_17_rcswitch.ino"
-#ifdef USE_RC_SWITCH
-
-
-
-
-#define XDRV_17 17
-
-#define D_JSON_RF_PROTOCOL "Protocol"
-#define D_JSON_RF_BITS "Bits"
-#define D_JSON_RF_DATA "Data"
-
-#define D_CMND_RFSEND "RFSend"
-#define D_JSON_RF_PULSE "Pulse"
-#define D_JSON_RF_REPEAT "Repeat"
-
-const char kRfSendCommands[] PROGMEM = "|"
-  D_CMND_RFSEND;
-
-void (* const RfSendCommand[])(void) PROGMEM = {
-  &CmndRfSend };
-
-#include <RCSwitch.h>
-
-RCSwitch mySwitch = RCSwitch();
-
-#define RF_TIME_AVOID_DUPLICATE 1000
-
-uint32_t rf_lasttime = 0;
-
-void RfReceiveCheck(void)
-{
-  if (mySwitch.available()) {
-
-    unsigned long data = mySwitch.getReceivedValue();
-    unsigned int bits = mySwitch.getReceivedBitlength();
-    int protocol = mySwitch.getReceivedProtocol();
-    int delay = mySwitch.getReceivedDelay();
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFR: Data 0x%lX (%u), Bits %d, Protocol %d, Delay %d"), data, data, bits, protocol, delay);
-
-    uint32_t now = millis();
-    if ((now - rf_lasttime > RF_TIME_AVOID_DUPLICATE) && (data > 0)) {
-      rf_lasttime = now;
-
-      char stemp[16];
-      if (Settings.flag.rf_receive_decimal) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%u"), (uint32_t)data);
-      } else {
-        snprintf_P(stemp, sizeof(stemp), PSTR("\"0x%lX\""), (uint32_t)data);
-      }
-      ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_RF_DATA "\":%s,\"" D_JSON_RF_BITS "\":%d,\"" D_JSON_RF_PROTOCOL "\":%d,\"" D_JSON_RF_PULSE "\":%d}}"),
-        stemp, bits, protocol, delay);
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
-      XdrvRulesProcess();
-#ifdef USE_DOMOTICZ
-      DomoticzSensor(DZ_COUNT, data);
-#endif
-    }
-    mySwitch.resetAvailable();
-  }
-}
-
-void RfInit(void)
-{
-  if (pin[GPIO_RFSEND] < 99) {
-    mySwitch.enableTransmit(pin[GPIO_RFSEND]);
-  }
-  if (pin[GPIO_RFRECV] < 99) {
-    pinMode( pin[GPIO_RFRECV], INPUT);
-    mySwitch.enableReceive(pin[GPIO_RFRECV]);
-  }
-}
-
-
-
-
-
-void CmndRfSend(void)
-{
-  bool error = false;
-
-  if (XdrvMailbox.data_len) {
-    unsigned long data = 0;
-    unsigned int bits = 24;
-    int protocol = 1;
-    int repeat = 10;
-    int pulse = 350;
-
-    char dataBufUc[XdrvMailbox.data_len + 1];
-    UpperCase(dataBufUc, XdrvMailbox.data);
-    StaticJsonBuffer<150> jsonBuf;
-    JsonObject &root = jsonBuf.parseObject(dataBufUc);
-    if (root.success()) {
-
-      char parm_uc[10];
-      data = strtoul(root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_DATA))], nullptr, 0);
-      bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_BITS))];
-      protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PROTOCOL))];
-      repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_REPEAT))];
-      pulse = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PULSE))];
-    } else {
-
-      char *p;
-      uint8_t i = 0;
-      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 5; str = strtok_r(nullptr, ", ", &p)) {
-        switch (i++) {
-        case 0:
-          data = strtoul(str, nullptr, 0);
-          break;
-        case 1:
-          bits = atoi(str);
-          break;
-        case 2:
-          protocol = atoi(str);
-          break;
-        case 3:
-          repeat = atoi(str);
-          break;
-        case 4:
-          pulse = atoi(str);
-        }
-      }
-    }
-
-    if (!protocol) { protocol = 1; }
-    mySwitch.setProtocol(protocol);
-    if (!pulse) { pulse = 350; }
-    mySwitch.setPulseLength(pulse);
-    if (!repeat) { repeat = 10; }
-    mySwitch.setRepeatTransmit(repeat);
-    if (!bits) { bits = 24; }
-    if (data) {
-      mySwitch.send(data, bits);
-      ResponseCmndDone();
-    } else {
-      error = true;
-    }
-  } else {
-    error = true;
-  }
-  if (error) {
-    Response_P(PSTR("{\"" D_CMND_RFSEND "\":\"" D_JSON_NO " " D_JSON_RF_DATA ", " D_JSON_RF_BITS ", " D_JSON_RF_PROTOCOL ", " D_JSON_RF_REPEAT " " D_JSON_OR " " D_JSON_RF_PULSE "\"}"));
-  }
-}
-
-
-
-
-
-bool Xdrv17(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_RFSEND] < 99) || (pin[GPIO_RFRECV] < 99)) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (pin[GPIO_RFRECV] < 99) {
-          RfReceiveCheck();
-        }
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_RFSEND] < 99) {
-          result = DecodeCommand(kRfSendCommands, RfSendCommand);
-        }
-        break;
-      case FUNC_INIT:
-        RfInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
-#ifdef USE_LIGHT
-#ifdef USE_ARMTRONIX_DIMMERS
-
-
-
-
-
-
-
-#define XDRV_18 18
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *ArmtronixSerial = nullptr;
-
-struct ARMTRONIX {
-  bool ignore_dim = false;
-  int8_t wifi_state = -2;
-  int8_t dim_state[2];
-  int8_t knob_state[2];
-} Armtronix;
-
-
-
-
-
-bool ArmtronixSetChannels(void)
-{
-  LightSerial2Duty(((uint8_t*)XdrvMailbox.data)[0], ((uint8_t*)XdrvMailbox.data)[1]);
-  return true;
-}
-
-void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
-{
-  if (ArmtronixSerial && !Armtronix.ignore_dim) {
-    duty1 = ((float)duty1)/2.575757;
-    duty2 = ((float)duty2)/2.575757;
-    Armtronix.dim_state[0] = duty1;
-    Armtronix.dim_state[1] = duty2;
-    ArmtronixSerial->print("Dimmer1:");
-    ArmtronixSerial->print(duty1);
-    ArmtronixSerial->print("\nDimmer2:");
-    ArmtronixSerial->println(duty2);
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Serial Packet Dim Values=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
-
-  } else {
-    Armtronix.ignore_dim = false;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Dim Level skipped due to already set. Value=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
-
-  }
-}
-
-void ArmtronixRequestState(void)
-{
-  if (ArmtronixSerial) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("ARM: Request MCU state"));
-    ArmtronixSerial->println("Status");
-
-  }
-}
-
-
-
-
-
-bool ArmtronixModuleSelected(void)
-{
-  devices_present++;
-  light_type = LT_SERIAL2;
-  return true;
-}
-
-void ArmtronixInit(void)
-{
-  Armtronix.dim_state[0] = -1;
-  Armtronix.dim_state[1] = -1;
-  Armtronix.knob_state[0] = -1;
-  Armtronix.knob_state[1] = -1;
-  ArmtronixSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-  if (ArmtronixSerial->begin(115200)) {
-    if (ArmtronixSerial->hardwareSerial()) { ClaimSerial(); }
-    ArmtronixSerial->println("Status");
-  }
-}
-
-void ArmtronixSerialInput(void)
-{
-  String answer;
-  int8_t newDimState[2];
-  uint8_t temp;
-  int commaIndex;
-  char scmnd[20];
-  if (ArmtronixSerial->available()) {
-    yield();
-    answer = ArmtronixSerial->readStringUntil('\n');
-    if (answer.substring(0,7) == "Status:") {
-      commaIndex = 6;
-      for (uint32_t i =0; i<2; i++) {
-        newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-        if (newDimState[i] != Armtronix.dim_state[i]) {
-          temp = ((float)newDimState[i])*1.01010101010101;
-          Armtronix.dim_state[i] = newDimState[i];
-          Armtronix.ignore_dim = true;
-          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_CHANNEL "%d %d"),i+1, temp);
-          ExecuteCommand(scmnd,SRC_SWITCH);
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd );
-        }
-        commaIndex = answer.indexOf(',',commaIndex+1);
-      }
-      Armtronix.knob_state[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-      commaIndex = answer.indexOf(',',commaIndex+1);
-      Armtronix.knob_state[1] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-    }
-  }
-}
-
-void ArmtronixSetWifiLed(void)
-{
-  uint8_t wifi_state = 0x02;
-
-  switch (WifiState()) {
-    case WIFI_MANAGER:
-      wifi_state = 0x01;
-      break;
-    case WIFI_RESTART:
-      wifi_state = 0x03;
-      break;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Set WiFi LED to state %d (%d)"), wifi_state, WifiState());
-
-  char state = '0' + ((wifi_state & 1) > 0);
-  ArmtronixSerial->print("Setled:");
-  ArmtronixSerial->write(state);
-  ArmtronixSerial->write(',');
-  state = '0' + ((wifi_state & 2) > 0);
-  ArmtronixSerial->write(state);
-  ArmtronixSerial->write(10);
-  Armtronix.wifi_state = WifiState();
-}
-
-
-
-
-
-bool Xdrv18(uint8_t function)
-{
-  bool result = false;
-
-  if (ARMTRONIX_DIMMERS == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (ArmtronixSerial) { ArmtronixSerialInput(); }
-        break;
-      case FUNC_MODULE_INIT:
-        result = ArmtronixModuleSelected();
-        break;
-      case FUNC_INIT:
-        ArmtronixInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        if (ArmtronixSerial) {
-          if (Armtronix.wifi_state!=WifiState()) { ArmtronixSetWifiLed(); }
-          if (uptime &1) {
-            ArmtronixSerial->println("Status");
-          }
-        }
-        break;
-      case FUNC_SET_CHANNELS:
-        result = ArmtronixSetChannels();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
-#ifdef USE_LIGHT
-#ifdef USE_PS_16_DZ
-
-
-
-
-#define XDRV_19 19
-
-#define PS16DZ_BUFFER_SIZE 80
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PS16DZSerial = nullptr;
-
-struct PS16DZ {
-  char *rx_buffer = nullptr;
-  int byte_counter = 0;
-  uint8_t dimmer = 0;
-} Ps16dz;
-
-
-
-
-
-void PS16DZSerialSend(const char *tx_buffer)
-{
-
-
-  PS16DZSerial->print(tx_buffer);
-  PS16DZSerial->write(0x1B);
-  PS16DZSerial->flush();
-}
-
-void PS16DZSerialSendOk(void)
-{
-  char tx_buffer[16];
-  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+SEND=ok"));
-  PS16DZSerialSend(tx_buffer);
-}
-
-
-
-
-void PS16DZSerialSendUpdateCommand(void)
-{
-  uint8_t light_state_dimmer = light_state.getDimmer();
-
-  light_state_dimmer = (light_state_dimmer < Settings.dimmer_hw_min) ? Settings.dimmer_hw_min : light_state_dimmer;
-  light_state_dimmer = (light_state_dimmer > Settings.dimmer_hw_max) ? Settings.dimmer_hw_max : light_state_dimmer;
-
-  char tx_buffer[80];
-  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"bright\":%d"),
-    LocalTime(), millis()%1000, power?"on":"off", light_state_dimmer);
-
-  PS16DZSerialSend(tx_buffer);
-}
-
-
-
-
-
-void PS16DZSerialInput(void)
-{
-  char scmnd[20];
-  while (PS16DZSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = PS16DZSerial->read();
-    if (serial_in_byte != 0x1B) {
-      if (Ps16dz.byte_counter >= PS16DZ_BUFFER_SIZE - 1) {
-        memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
-        Ps16dz.byte_counter = 0;
-      }
-      if (Ps16dz.byte_counter || (!Ps16dz.byte_counter && ('A' == serial_in_byte))) {
-        Ps16dz.rx_buffer[Ps16dz.byte_counter++] = serial_in_byte;
-      }
-    } else {
-      Ps16dz.rx_buffer[Ps16dz.byte_counter++] = 0x00;
-
-
-
-
-      if (!strncmp(Ps16dz.rx_buffer+3, "RESULT", 6)) {
-
-      }
-      else if (!strncmp(Ps16dz.rx_buffer+3, "UPDATE", 6)) {
-
-        char *end_str;
-        char *string = Ps16dz.rx_buffer+10;
-        char *token = strtok_r(string, ",", &end_str);
-
-        bool is_switch_change = false;
-        bool is_brightness_change = false;
-
-        while (token != nullptr) {
-          char* end_token;
-          char* token2 = strtok_r(token, ":", &end_token);
-          char* token3 = strtok_r(nullptr, ":", &end_token);
-
-          if (!strncmp(token2, "\"switch\"", 8)) {
-            bool switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
-
-
-
-            is_switch_change = (switch_state != power);
-            if (is_switch_change) {
-              ExecuteCommandPower(1, switch_state, SRC_SWITCH);
-            }
-          }
-          else if (!strncmp(token2, "\"bright\"", 8)) {
-            Ps16dz.dimmer = atoi(token3);
-
-
-
-            is_brightness_change = Ps16dz.dimmer != Settings.light_dimmer;
-            if (power && (Ps16dz.dimmer > 0) && is_brightness_change) {
-              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Ps16dz.dimmer);
-              ExecuteCommand(scmnd, SRC_SWITCH);
-            }
-          }
-          else if (!strncmp(token2, "\"sequence\"", 10)) {
-
-
-
-          }
-          token = strtok_r(nullptr, ",", &end_str);
-        }
-
-        if (!is_brightness_change) {
-
-
-
-          PS16DZSerialSendOk();
-        }
-      }
-      else if (!strncmp(Ps16dz.rx_buffer+3, "SETTING", 7)) {
-
-
-        if (!Settings.flag.button_restrict) {
-          int state = WIFI_MANAGER;
-          if (!strncmp(Ps16dz.rx_buffer+10, "=exit", 5)) { state = WIFI_RETRY; }
-          if (state != Settings.sta_config) {
-            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " %d"), state);
-            ExecuteCommand(scmnd, SRC_BUTTON);
-          }
-        }
-      }
-      memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
-      Ps16dz.byte_counter = 0;
-    }
-  }
-}
-
-bool PS16DZSerialSendUpdateCommandIfRequired(void)
-{
-  if (!PS16DZSerial) { return true; }
-
-  bool is_switch_change = (XdrvMailbox.payload != SRC_SWITCH);
-  bool is_brightness_change = (light_state.getDimmer() != Ps16dz.dimmer);
-
-  if (is_switch_change || is_brightness_change) {
-    PS16DZSerialSendUpdateCommand();
-  }
-
-  return true;
-}
-
-void PS16DZInit(void)
-{
-  Ps16dz.rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
-  if (Ps16dz.rx_buffer != nullptr) {
-    PS16DZSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-    if (PS16DZSerial->begin(19200)) {
-      if (PS16DZSerial->hardwareSerial()) { ClaimSerial(); }
-    }
-  }
-}
-
-bool PS16DZModuleSelected(void)
-{
-  devices_present++;
-  light_type = LT_SERIAL1;
-
-  return true;
-}
-
-
-
-
-
-bool Xdrv19(uint8_t function)
-{
-  bool result = false;
-
-  if (PS_16_DZ == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (PS16DZSerial) { PS16DZSerialInput(); }
-        break;
-      case FUNC_SET_DEVICE_POWER:
-      case FUNC_SET_CHANNELS:
-        result = PS16DZSerialSendUpdateCommandIfRequired();
-        break;
-      case FUNC_INIT:
-        PS16DZInit();
-        break;
-      case FUNC_MODULE_INIT:
-        result = PS16DZModuleSelected();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
-#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
-#define XDRV_20 20
-
-const char HUE_RESPONSE[] PROGMEM =
-  "HTTP/1.1 200 OK\r\n"
-  "HOST: 239.255.255.250:1900\r\n"
-  "CACHE-CONTROL: max-age=100\r\n"
-  "EXT:\r\n"
-  "LOCATION: http://%s:80/description.xml\r\n"
-  "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.24.0\r\n"
-  "hue-bridgeid: %s\r\n";
-const char HUE_ST1[] PROGMEM =
-  "ST: upnp:rootdevice\r\n"
-  "USN: uuid:%s::upnp:rootdevice\r\n"
-  "\r\n";
-const char HUE_ST2[] PROGMEM =
-  "ST: uuid:%s\r\n"
-  "USN: uuid:%s\r\n"
-  "\r\n";
-const char HUE_ST3[] PROGMEM =
-  "ST: urn:schemas-upnp-org:device:basic:1\r\n"
-  "USN: uuid:%s\r\n"
-  "\r\n";
-
-String HueBridgeId(void)
-{
-  String temp = WiFi.macAddress();
-  temp.replace(":", "");
-  String bridgeid = temp.substring(0, 6) + "FFFE" + temp.substring(6);
-  return bridgeid;
-}
-
-String HueSerialnumber(void)
-{
-  String serial = WiFi.macAddress();
-  serial.replace(":", "");
-  serial.toLowerCase();
-  return serial;
-}
-
-String HueUuid(void)
-{
-  String uuid = F("f6543a06-da50-11ba-8d8f-");
-  uuid += HueSerialnumber();
-  return uuid;
-}
-
-void HueRespondToMSearch(void)
-{
-  char message[TOPSZ];
-
-  TickerMSearch.detach();
-  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
-    char response[320];
-    snprintf_P(response, sizeof(response), HUE_RESPONSE, WiFi.localIP().toString().c_str(), HueBridgeId().c_str());
-    int len = strlen(response);
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST1, HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST2, HueUuid().c_str(), HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST3, HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(message, sizeof(message), PSTR(D_3_RESPONSE_PACKETS_SENT));
-  } else {
-    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
-  }
-
-  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
-    message, udp_remote_ip.toString().c_str(), udp_remote_port);
-
-  udp_response_mutex = false;
-}
-
-
-
-
-
-const char HUE_DESCRIPTION_XML[] PROGMEM =
-  "<?xml version=\"1.0\"?>"
-  "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">"
-  "<specVersion>"
-    "<major>1</major>"
-    "<minor>0</minor>"
-  "</specVersion>"
-
-  "<URLBase>http://{x1:80/</URLBase>"
-  "<device>"
-    "<deviceType>urn:schemas-upnp-org:device:Basic:1</deviceType>"
-    "<friendlyName>Amazon-Echo-HA-Bridge ({x1)</friendlyName>"
-
-    "<manufacturer>Royal Philips Electronics</manufacturer>"
-    "<manufacturerURL>http://www.philips.com</manufacturerURL>"
-    "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
-    "<modelName>Philips hue bridge 2012</modelName>"
-    "<modelNumber>929000226503</modelNumber>"
-    "<serialNumber>{x3</serialNumber>"
-    "<UDN>uuid:{x2</UDN>"
-  "</device>"
-  "</root>\r\n"
-  "\r\n";
-const char HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
-  "{\"on\":{state},"
-  "{light_status}"
-  "\"alert\":\"none\","
-  "\"effect\":\"none\","
-  "\"reachable\":true}";
-const char HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
-  ",\"type\":\"Extended color light\","
-  "\"name\":\"{j1\","
-  "\"modelid\":\"LCT007\","
-  "\"uniqueid\":\"{j2\","
-  "\"swversion\":\"5.50.1.19085\"}";
-const char HUE_GROUP0_STATUS_JSON[] PROGMEM =
-  "{\"name\":\"Group 0\","
-   "\"lights\":[{l1],"
-   "\"type\":\"LightGroup\","
-   "\"action\":";
-
-const char HueConfigResponse_JSON[] PROGMEM =
-  "{\"name\":\"Philips hue\","
-   "\"mac\":\"{ma\","
-   "\"dhcp\":true,"
-   "\"ipaddress\":\"{ip\","
-   "\"netmask\":\"{ms\","
-   "\"gateway\":\"{gw\","
-   "\"proxyaddress\":\"none\","
-   "\"proxyport\":0,"
-   "\"bridgeid\":\"{br\","
-   "\"UTC\":\"{dt\","
-   "\"whitelist\":{\"{id\":{"
-     "\"last use date\":\"{dt\","
-     "\"create date\":\"{dt\","
-     "\"name\":\"Remote\"}},"
-   "\"swversion\":\"01041302\","
-   "\"apiversion\":\"1.17.0\","
-   "\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
-   "\"linkbutton\":false,"
-   "\"portalservices\":false"
-  "}";
-const char HUE_LIGHT_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-const char HUE_ERROR_JSON[] PROGMEM =
-  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
-
-
-
-String GetHueDeviceId(uint8_t id)
-{
-  String deviceid = WiFi.macAddress() + F(":00:11-") + String(id);
-  deviceid.toLowerCase();
-  return deviceid;
-}
-
-String GetHueUserId(void)
-{
-  char userid[7];
-
-  snprintf_P(userid, sizeof(userid), PSTR("%03x"), ESP.getChipId());
-  return String(userid);
-}
-
-void HandleUpnpSetupHue(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_HUE_BRIDGE_SETUP));
-  String description_xml = FPSTR(HUE_DESCRIPTION_XML);
-  description_xml.replace("{x1", WiFi.localIP().toString());
-  description_xml.replace("{x2", HueUuid());
-  description_xml.replace("{x3", HueSerialnumber());
-  WSSend(200, CT_XML, description_xml);
-}
-
-void HueNotImplemented(String *path)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API_NOT_IMPLEMENTED " (%s)"), path->c_str());
-
-  WSSend(200, CT_JSON, "{}");
-}
-
-void HueConfigResponse(String *response)
-{
-  *response += FPSTR(HueConfigResponse_JSON);
-  response->replace("{ma", WiFi.macAddress());
-  response->replace("{ip", WiFi.localIP().toString());
-  response->replace("{ms", WiFi.subnetMask().toString());
-  response->replace("{gw", WiFi.gatewayIP().toString());
-  response->replace("{br", HueBridgeId());
-  response->replace("{dt", GetDateAndTime(DT_UTC));
-  response->replace("{id", GetHueUserId());
-}
-
-void HueConfig(String *path)
-{
-  String response = "";
-  HueConfigResponse(&response);
-  WSSend(200, CT_JSON, response);
-}
-
-
-
-bool g_gotct = false;
-
-
-
-
-uint16_t prev_hue = 0;
-uint8_t prev_sat = 0;
-uint8_t prev_bri = 254;
-uint16_t prev_ct = 254;
-char prev_x_str[24] = "\0";
-char prev_y_str[24] = "\0";
-
-uint8_t getLocalLightSubtype(uint8_t device) {
-  if (light_type) {
-    if (device >= Light.device) {
-      if (Settings.flag3.pwm_multi_channels) {
-        return LST_SINGLE;
-      } else {
-        return Light.subtype;
-      }
-    } else {
-      return LST_NONE;
-    }
-  } else {
-    return LST_NONE;
-  }
-}
-
-void HueLightStatus1(uint8_t device, String *response)
-{
-  uint16_t ct = 0;
-  uint8_t color_mode;
-  String light_status = "";
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint32_t echo_gen = findEchoGeneration();
-
-
-  uint8_t local_light_subtype = getLocalLightSubtype(device);
-
-  bri = LightGetBri(device);
-  if (bri > 254) bri = 254;
-  if (bri < 1) bri = 1;
-
-#ifdef USE_SHUTTER
-  if (ShutterState(device)) {
-    bri = (float)((Settings.shutter_options[device-1] & 1) ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
-  }
-#endif
-
-  if (light_type) {
-    light_state.getHSB(&hue, &sat, nullptr);
-
-    if ((bri > prev_bri ? bri - prev_bri : prev_bri - bri) < 1)
-      bri = prev_bri;
-
-    if (sat > 254) sat = 254;
-    if ((sat > prev_sat ? sat - prev_sat : prev_sat - sat) < 1) {
-      sat = prev_sat;
-    } else {
-      prev_x_str[0] = prev_y_str[0] = 0;
-    }
-
-    hue = changeUIntScale(hue, 0, 359, 0, 65535);
-    if ((hue > prev_hue ? hue - prev_hue : prev_hue - hue) < 400) {
-      hue = prev_hue;
-    } else {
-      prev_x_str[0] = prev_y_str[0] = 0;
-    }
-
-    color_mode = light_state.getColorMode();
-    ct = light_state.getCT();
-    if (LCM_RGB == color_mode) { g_gotct = false; }
-    if (LCM_CT == color_mode) { g_gotct = true; }
-
-
-
-    if ((ct > prev_ct ? ct - prev_ct : prev_ct - ct) < 1)
-      ct = prev_ct;
-
-
-
-  }
-
-  *response += FPSTR(HUE_LIGHTS_STATUS_JSON1);
-  response->replace("{state}", (power & (1 << (device-1))) ? "true" : "false");
-
-  if ((1 == echo_gen) || (LST_SINGLE <= local_light_subtype)) {
-    light_status += "\"bri\":";
-    light_status += String(bri);
-    light_status += ",";
-  }
-  if (LST_COLDWARM <= local_light_subtype) {
-    light_status += F("\"colormode\":\"");
-    light_status += (g_gotct ? "ct" : "hs");
-    light_status += "\",";
-  }
-  if (LST_RGB <= local_light_subtype) {
-    if (prev_x_str[0] && prev_y_str[0]) {
-      light_status += "\"xy\":[";
-      light_status += prev_x_str;
-      light_status += ",";
-      light_status += prev_y_str;
-      light_status += "],";
-    } else {
-      float x, y;
-        light_state.getXY(&x, &y);
-      light_status += "\"xy\":[";
-      light_status += String(x, 5);
-      light_status += ",";
-      light_status += String(y, 5);
-      light_status += "],";
-    }
-    light_status += "\"hue\":";
-    light_status += String(hue);
-    light_status += ",";
-
-    light_status += "\"sat\":";
-    light_status += String(sat);
-    light_status += ",";
-  }
-  if (LST_COLDWARM == local_light_subtype || LST_RGBW <= local_light_subtype) {
-    light_status += "\"ct\":";
-    light_status += String(ct > 0 ? ct : 284);
-    light_status += ",";
-  }
-  response->replace("{light_status}", light_status);
-}
-
-
-
-bool HueActive(uint8_t device) {
-  if (device > MAX_FRIENDLYNAMES) { device = MAX_FRIENDLYNAMES; }
-  return '$' != *SettingsText(SET_FRIENDLYNAME1 +device -1);
-}
-
-void HueLightStatus2(uint8_t device, String *response)
-{
-  *response += FPSTR(HUE_LIGHTS_STATUS_JSON2);
-  if (device <= MAX_FRIENDLYNAMES) {
-    response->replace("{j1", SettingsText(SET_FRIENDLYNAME1 +device -1));
-  } else {
-    char fname[33];
-    strcpy(fname, SettingsText(SET_FRIENDLYNAME1 + MAX_FRIENDLYNAMES -1));
-    uint32_t fname_len = strlen(fname);
-    if (fname_len > 30) { fname_len = 30; }
-    fname[fname_len++] = '-';
-    if (device - MAX_FRIENDLYNAMES < 10) {
-      fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
-    } else {
-      fname[fname_len++] = 'A' + device - MAX_FRIENDLYNAMES - 10;
-    }
-    fname[fname_len] = 0x00;
-
-    response->replace("{j1", fname);
-  }
-  response->replace("{j2", GetHueDeviceId(device));
-}
-
-
-
-
-uint32_t EncodeLightId(uint8_t relay_id)
-{
-  uint8_t mac[6];
-  WiFi.macAddress(mac);
-  uint32_t id = 0;
-
-  if (relay_id >= 32) {
-    relay_id = 0;
-  }
-  if (relay_id > 15) {
-    id = (1 << 28);
-  }
-
-  id |= (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (relay_id & 0xF);
-  return id;
-}
-
-
-
-uint32_t DecodeLightId(uint32_t hue_id) {
-  uint8_t relay_id = hue_id & 0xF;
-  if (hue_id & (1 << 28)) {
-    relay_id += 16;
-  }
-  if (0 == relay_id) {
-    relay_id = 32;
-  }
-  return relay_id;
-}
-
-static const char * FIRST_GEN_UA[] = {
-  "AEOBC",
-};
-
-
-uint32_t findEchoGeneration(void) {
-
-  String user_agent = WebServer->header("User-Agent");
-  uint32_t gen = 2;
-
-  for (uint32_t i = 0; i < sizeof(FIRST_GEN_UA)/sizeof(char*); i++) {
-    if (user_agent.indexOf(FIRST_GEN_UA[i]) >= 0) {
-      gen = 1;
-      break;
-    }
-  }
-  if (0 == user_agent.length()) {
-    gen = 1;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, D_LOG_HTTP D_HUE " User-Agent: %s, gen=%d", user_agent.c_str(), gen);
-
-  return gen;
-}
-
-void HueGlobalConfig(String *path) {
-  String response;
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  path->remove(0,1);
-  response = F("{\"lights\":{");
-  bool appending = false;
-  for (uint32_t i = 1; i <= maxhue; i++) {
-    if (HueActive(i)) {
-      if (appending) { response += ","; }
-      response += "\"";
-      response += EncodeLightId(i);
-      response += F("\":{\"state\":");
-      HueLightStatus1(i, &response);
-      HueLightStatus2(i, &response);
-      appending = true;
-    }
-  }
-  response += F("},\"groups\":{},\"schedules\":{},\"config\":");
-  HueConfigResponse(&response);
-  response += "}";
-  WSSend(200, CT_JSON, response);
-}
-
-void HueAuthentication(String *path)
-{
-  char response[38];
-
-  snprintf_P(response, sizeof(response), PSTR("[{\"success\":{\"username\":\"%s\"}}]"), GetHueUserId().c_str());
-  WSSend(200, CT_JSON, response);
-}
-
-void HueLights(String *path)
-{
-
-
-
-  String response;
-  int code = 200;
-  uint16_t tmp = 0;
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint16_t ct = 0;
-  bool resp = false;
-  bool on = false;
-  bool change = false;
-  uint8_t device = 1;
-  uint8_t local_light_subtype = Light.subtype;
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  path->remove(0,path->indexOf("/lights"));
-  if (path->endsWith("/lights")) {
-    response = "{";
-    bool appending = false;
-    for (uint32_t i = 1; i <= maxhue; i++) {
-      if (HueActive(i)) {
-        if (appending) { response += ","; }
-        response += "\"";
-        response += EncodeLightId(i);
-        response += F("\":{\"state\":");
-        HueLightStatus1(i, &response);
-        HueLightStatus2(i, &response);
-        appending = true;
-      }
-    }
-#ifdef USE_SCRIPT_HUE
-    Script_Check_Hue(&response);
-#endif
-    response += "}";
-  }
-  else if (path->endsWith("/state")) {
-    path->remove(0,8);
-    path->remove(path->indexOf("/state"));
-    device = DecodeLightId(atoi(path->c_str()));
-
-#ifdef USE_SCRIPT_HUE
-    if (device>devices_present) {
-      return Script_Handle_Hue(path);
-    }
-#endif
-
-    if ((device < 1) || (device > maxhue)) {
-      device = 1;
-    }
-    local_light_subtype = getLocalLightSubtype(device);
-
-    if (WebServer->args()) {
-      response = "[";
-
-      StaticJsonBuffer<400> jsonBuffer;
-      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
-      if (hue_json.containsKey("on")) {
-
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(EncodeLightId(device)));
-        response.replace("{cm", "on");
-
-#ifdef USE_SHUTTER
-        if (ShutterState(device)) {
-          if (!change) {
-            on = hue_json["on"];
-            bri = on ? 1.0f : 0.0f;
-            change = true;
-          }
-          response.replace("{re", on ? "true" : "false");
-        } else {
-#endif
-          on = hue_json["on"];
-          switch(on)
-          {
-            case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
-                        response.replace("{re", "false");
-                        break;
-            case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
-                        response.replace("{re", "true");
-                        break;
-            default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
-                        break;
-          }
-          resp = true;
-#ifdef USE_SHUTTER
-        }
-#endif
-      }
-
-      if (light_type && (local_light_subtype >= LST_SINGLE)) {
-        if (!Settings.flag3.pwm_multi_channels) {
-          light_state.getHSB(&hue, &sat, nullptr);
-          bri = light_state.getBri();
-          ct = light_state.getCT();
-          uint8_t color_mode = light_state.getColorMode();
-          if (LCM_RGB == color_mode) { g_gotct = false; }
-          if (LCM_CT == color_mode) { g_gotct = true; }
-
-        } else {
-          bri = LightGetBri(device);
-        }
-      }
-      prev_x_str[0] = prev_y_str[0] = 0;
-
-      if (hue_json.containsKey("bri")) {
-        tmp = hue_json["bri"];
-        prev_bri = bri = tmp;
-
-        if (254 <= bri) { bri = 255; }
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "bri");
-        response.replace("{re", String(tmp));
-        if (LST_SINGLE <= Light.subtype) {
-          change = true;
-        }
-        resp = true;
-      }
-
-
-      if (hue_json.containsKey("xy")) {
-        float x, y;
-        x = hue_json["xy"][0];
-        y = hue_json["xy"][1];
-        const String &x_str = hue_json["xy"][0];
-        const String &y_str = hue_json["xy"][1];
-        x_str.toCharArray(prev_x_str, sizeof(prev_x_str));
-        y_str.toCharArray(prev_y_str, sizeof(prev_y_str));
-
-        uint8_t rr,gg,bb;
-        LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
-        LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
-        prev_hue = changeUIntScale(hue, 0, 359, 0, 65535);
-        prev_sat = (sat > 254 ? 254 : sat);
-
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "xy");
-        response.replace("{re", "[" + x_str + "," + y_str + "]");
-        g_gotct = false;
-        resp = true;
-        change = true;
-      }
-      if (hue_json.containsKey("hue")) {
-        tmp = hue_json["hue"];
-        prev_hue = tmp;
-
-        hue = changeUIntScale(tmp, 0, 65535, 0, 359);
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "hue");
-        response.replace("{re", String(tmp));
-        if (LST_RGB <= Light.subtype) {
-          g_gotct = false;
-          change = true;
-        }
-        resp = true;
-      }
-      if (hue_json.containsKey("sat")) {
-        tmp = hue_json["sat"];
-        prev_sat = sat = tmp;
-
-        if (254 <= sat) { sat = 255; }
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "sat");
-        response.replace("{re", String(tmp));
-        if (LST_RGB <= Light.subtype) {
-          g_gotct = false;
-          change = true;
-        }
-        resp = true;
-      }
-      if (hue_json.containsKey("ct")) {
-        ct = hue_json["ct"];
-        prev_ct = ct;
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "ct");
-        response.replace("{re", String(ct));
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
-          g_gotct = true;
-          change = true;
-        }
-        resp = true;
-      }
-      if (change) {
-#ifdef USE_SHUTTER
-        if (ShutterState(device)) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_options[device-1] & 1);
-          ShutterSetPosition(device, bri * 100.0f );
-        } else
-#endif
-        if (light_type && (local_light_subtype > LST_NONE)) {
-          if (!Settings.flag3.pwm_multi_channels) {
-            if (g_gotct) {
-              light_controller.changeCTB(ct, bri);
-            } else {
-              light_controller.changeHSB(hue, sat, bri);
-            }
-            LightPreparePower();
-          } else {
-            LightSetBri(device, bri);
-          }
-          if (LST_COLDWARM <= local_light_subtype) {
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
-          } else {
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_DIMMER));
-          }
-          XdrvRulesProcess();
-        }
-        change = false;
-      }
-      response += "]";
-      if (2 == response.length()) {
-        response = FPSTR(HUE_ERROR_JSON);
-      }
-    }
-    else {
-      response = FPSTR(HUE_ERROR_JSON);
-    }
-  }
-  else if(path->indexOf("/lights/") >= 0) {
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "/lights path=%s", path->c_str());
-    path->remove(0,8);
-    device = DecodeLightId(atoi(path->c_str()));
-
-#ifdef USE_SCRIPT_HUE
-    if (device>devices_present) {
-      Script_HueStatus(&response,device-devices_present-1);
-      goto exit;
-}
-#endif
-
-    if ((device < 1) || (device > maxhue)) {
-      device = 1;
-    }
-    response += F("{\"state\":");
-    HueLightStatus1(device, &response);
-    HueLightStatus2(device, &response);
-  }
-  else {
-    response = "{}";
-    code = 406;
-  }
-  exit:
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
-  WSSend(code, CT_JSON, response);
-}
-
-void HueGroups(String *path)
-{
-
-
-
-  String response = "{}";
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  if (path->endsWith("/0")) {
-    response = FPSTR(HUE_GROUP0_STATUS_JSON);
-    String lights = F("\"1\"");
-    for (uint32_t i = 2; i <= maxhue; i++) {
-      lights += ",\"";
-      lights += EncodeLightId(i);
-      lights += "\"";
-    }
-    response.replace("{l1", lights);
-    HueLightStatus1(1, &response);
-    response += F("}");
-  }
-
-  WSSend(200, CT_JSON, response);
-}
-
-void HandleHueApi(String *path)
-{
-# 784 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_20_hue.ino"
-  uint8_t args = 0;
-
-  path->remove(0, 4);
-  uint16_t apilen = path->length();
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API " (%s)"), path->c_str());
-  for (args = 0; args < WebServer->args(); args++) {
-    String json = WebServer->arg(args);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_POST_ARGS " (%s)"), json.c_str());
-  }
-
-  if (path->endsWith("/invalid/")) {}
-  else if (!apilen) HueAuthentication(path);
-  else if (path->endsWith("/")) HueAuthentication(path);
-  else if (path->endsWith("/config")) HueConfig(path);
-  else if (path->indexOf("/lights") >= 0) HueLights(path);
-  else if (path->indexOf("/groups") >= 0) HueGroups(path);
-  else if (path->endsWith("/schedules")) HueNotImplemented(path);
-  else if (path->endsWith("/sensors")) HueNotImplemented(path);
-  else if (path->endsWith("/scenes")) HueNotImplemented(path);
-  else if (path->endsWith("/rules")) HueNotImplemented(path);
-  else if (path->endsWith("/resourcelinks")) HueNotImplemented(path);
-  else HueGlobalConfig(path);
-}
-
-
-
-
-
-bool Xdrv20(uint8_t function)
-{
-  bool result = false;
-
-#ifdef USE_SCRIPT_HUE
-  if ((EMUL_HUE == Settings.flag2.emulation)) {
-#else
-  if (devices_present && (EMUL_HUE == Settings.flag2.emulation)) {
-#endif
-    switch (function) {
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/description.xml", HandleUpnpSetupHue);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_21_wemo.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_21_wemo.ino"
-#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined (USE_EMULATION_WEMO)
-
-
-
-
-#define XDRV_21 21
-
-const char WEMO_MSEARCH[] PROGMEM =
-  "HTTP/1.1 200 OK\r\n"
-  "CACHE-CONTROL: max-age=86400\r\n"
-  "DATE: Fri, 15 Apr 2016 04:56:29 GMT\r\n"
-  "EXT:\r\n"
-  "LOCATION: http://%s:80/setup.xml\r\n"
-  "OPT: \"http://schemas.upnp.org/upnp/1/0/\"; ns=01\r\n"
-  "01-NLS: b9200ebb-736d-4b93-bf03-835149d13983\r\n"
-  "SERVER: Unspecified, UPnP/1.0, Unspecified\r\n"
-  "ST: %s\r\n"
-  "USN: uuid:%s::%s\r\n"
-  "X-User-Agent: redsonic\r\n"
-  "\r\n";
-
-String WemoSerialnumber(void)
-{
-  char serial[16];
-
-  snprintf_P(serial, sizeof(serial), PSTR("201612K%08X"), ESP.getChipId());
-  return String(serial);
-}
-
-String WemoUuid(void)
-{
-  char uuid[27];
-
-  snprintf_P(uuid, sizeof(uuid), PSTR("Socket-1_0-%s"), WemoSerialnumber().c_str());
-  return String(uuid);
-}
-
-void WemoRespondToMSearch(int echo_type)
-{
-  char message[TOPSZ];
-
-  TickerMSearch.detach();
-  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
-    char type[24];
-    if (1 == echo_type) {
-      strcpy_P(type, URN_BELKIN_DEVICE_CAP);
-    } else {
-      strcpy_P(type, UPNP_ROOTDEVICE);
-    }
-    char response[400];
-    snprintf_P(response, sizeof(response), WEMO_MSEARCH, WiFi.localIP().toString().c_str(), type, WemoUuid().c_str(), type);
-    PortUdp.write(response);
-    PortUdp.endPacket();
-    snprintf_P(message, sizeof(message), PSTR(D_RESPONSE_SENT));
-  } else {
-    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
-  }
-
-  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
-    echo_type, message, udp_remote_ip.toString().c_str(), udp_remote_port);
-
-  udp_response_mutex = false;
-}
-
-
-
-
-
-const char WEMO_EVENTSERVICE_XML[] PROGMEM =
-  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
-    "<actionList>"
-      "<action>"
-        "<name>SetBinaryState</name>"
-        "<argumentList>"
-          "<argument>"
-            "<retval/>"
-            "<name>BinaryState</name>"
-            "<relatedStateVariable>BinaryState</relatedStateVariable>"
-            "<direction>in</direction>"
-          "</argument>"
-        "</argumentList>"
-      "</action>"
-      "<action>"
-        "<name>GetBinaryState</name>"
-        "<argumentList>"
-          "<argument>"
-            "<retval/>"
-            "<name>BinaryState</name>"
-            "<relatedStateVariable>BinaryState</relatedStateVariable>"
-            "<direction>out</direction>"
-          "</argument>"
-        "</argumentList>"
-      "</action>"
-    "</actionList>"
-    "<serviceStateTable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>BinaryState</name>"
-        "<dataType>bool</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>level</name>"
-        "<dataType>string</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-    "</serviceStateTable>"
-  "</scpd>\r\n\r\n";
-
-const char WEMO_METASERVICE_XML[] PROGMEM =
-  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
-    "<specVersion>"
-      "<major>1</major>"
-      "<minor>0</minor>"
-    "</specVersion>"
-    "<actionList>"
-      "<action>"
-        "<name>GetMetaInfo</name>"
-        "<argumentList>"
-          "<retval />"
-          "<name>GetMetaInfo</name>"
-          "<relatedStateVariable>MetaInfo</relatedStateVariable>"
-          "<direction>in</direction>"
-        "</argumentList>"
-      "</action>"
-    "</actionList>"
-    "<serviceStateTable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>MetaInfo</name>"
-        "<dataType>string</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-    "</serviceStateTable>"
-  "</scpd>\r\n\r\n";
-
-const char WEMO_RESPONSE_STATE_SOAP[] PROGMEM =
-  "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
-    "<s:Body>"
-      "<u:%cetBinaryStateResponse xmlns:u=\"urn:Belkin:service:basicevent:1\">"
-        "<BinaryState>%d</BinaryState>"
-      "</u:%cetBinaryStateResponse>"
-    "</s:Body>"
-  "</s:Envelope>\r\n";
-
-const char WEMO_SETUP_XML[] PROGMEM =
-  "<?xml version=\"1.0\"?>"
-  "<root xmlns=\"urn:Belkin:device-1-0\">"
-    "<device>"
-      "<deviceType>urn:Belkin:device:controllee:1</deviceType>"
-      "<friendlyName>{x1</friendlyName>"
-      "<manufacturer>Belkin International Inc.</manufacturer>"
-      "<modelName>Socket</modelName>"
-      "<modelNumber>3.1415</modelNumber>"
-      "<UDN>uuid:{x2</UDN>"
-      "<serialNumber>{x3</serialNumber>"
-      "<binaryState>0</binaryState>"
-      "<serviceList>"
-        "<service>"
-          "<serviceType>urn:Belkin:service:basicevent:1</serviceType>"
-          "<serviceId>urn:Belkin:serviceId:basicevent1</serviceId>"
-          "<controlURL>/upnp/control/basicevent1</controlURL>"
-          "<eventSubURL>/upnp/event/basicevent1</eventSubURL>"
-          "<SCPDURL>/eventservice.xml</SCPDURL>"
-        "</service>"
-        "<service>"
-          "<serviceType>urn:Belkin:service:metainfo:1</serviceType>"
-          "<serviceId>urn:Belkin:serviceId:metainfo1</serviceId>"
-          "<controlURL>/upnp/control/metainfo1</controlURL>"
-          "<eventSubURL>/upnp/event/metainfo1</eventSubURL>"
-          "<SCPDURL>/metainfoservice.xml</SCPDURL>"
-        "</service>"
-      "</serviceList>"
-    "</device>"
-  "</root>\r\n";
-
-
-
-void HandleUpnpEvent(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_BASIC_EVENT));
-
-  char event[500];
-  strlcpy(event, WebServer->arg(0).c_str(), sizeof(event));
-
-
-
-
-  char state = 'G';
-  if (strstr_P(event, PSTR("SetBinaryState")) != nullptr) {
-    state = 'S';
-    uint8_t power = POWER_TOGGLE;
-    if (strstr_P(event, PSTR("State>1</Binary")) != nullptr) {
-      power = POWER_ON;
-    }
-    else if (strstr_P(event, PSTR("State>0</Binary")) != nullptr) {
-      power = POWER_OFF;
-    }
-    if (power != POWER_TOGGLE) {
-      uint8_t device = (light_type) ? devices_present : 1;
-      ExecuteCommandPower(device, power, SRC_WEMO);
-    }
-  }
-
-  snprintf_P(event, sizeof(event), WEMO_RESPONSE_STATE_SOAP, state, bitRead(power, devices_present -1), state);
-  WSSend(200, CT_XML, event);
-}
-
-void HandleUpnpService(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_EVENT_SERVICE));
-
-  WSSend(200, CT_PLAIN, FPSTR(WEMO_EVENTSERVICE_XML));
-}
-
-void HandleUpnpMetaService(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_META_SERVICE));
-
-  WSSend(200, CT_PLAIN, FPSTR(WEMO_METASERVICE_XML));
-}
-
-void HandleUpnpSetupWemo(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_SETUP));
-
-  String setup_xml = FPSTR(WEMO_SETUP_XML);
-  setup_xml.replace("{x1", SettingsText(SET_FRIENDLYNAME1));
-  setup_xml.replace("{x2", WemoUuid());
-  setup_xml.replace("{x3", WemoSerialnumber());
-  WSSend(200, CT_XML, setup_xml);
-}
-
-
-
-
-
-bool Xdrv21(uint8_t function)
-{
-  bool result = false;
-
-  if (devices_present && (EMUL_WEMO == Settings.flag2.emulation)) {
-    switch (function) {
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/upnp/control/basicevent1", HTTP_POST, HandleUpnpEvent);
-        WebServer->on("/eventservice.xml", HandleUpnpService);
-        WebServer->on("/metainfoservice.xml", HandleUpnpMetaService);
-        WebServer->on("/setup.xml", HandleUpnpSetupWemo);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-#ifdef USE_SONOFF_IFAN
-
-
-
-
-#define XDRV_22 22
-
-const uint8_t MAX_FAN_SPEED = 4;
-
-const uint8_t kIFan02Speed[MAX_FAN_SPEED] = { 0x00, 0x01, 0x03, 0x05 };
-const uint8_t kIFan03Speed[MAX_FAN_SPEED +2] = { 0x00, 0x01, 0x03, 0x04, 0x05, 0x06 };
-const uint8_t kIFan03Sequence[MAX_FAN_SPEED][MAX_FAN_SPEED] = {{0, 2, 2, 2}, {0, 1, 2, 4}, {1, 1, 2, 5}, {4, 4, 5, 3}};
-
-const char kSonoffIfanCommands[] PROGMEM = "|"
-  D_CMND_FANSPEED;
-
-void (* const SonoffIfanCommand[])(void) PROGMEM = {
-  &CmndFanspeed };
-
-uint8_t ifan_fanspeed_timer = 0;
-uint8_t ifan_fanspeed_goal = 0;
-bool ifan_receive_flag = false;
-bool ifan_restart_flag = true;
-
-
-
-bool IsModuleIfan(void)
-{
-  return ((SONOFF_IFAN02 == my_module_type) || (SONOFF_IFAN03 == my_module_type));
-}
-
-uint8_t MaxFanspeed(void)
-{
-  return MAX_FAN_SPEED;
-}
-
-uint8_t GetFanspeed(void)
-{
-  if (ifan_fanspeed_timer) {
-    return ifan_fanspeed_goal;
-  } else {
-
-
-
-
-
-
-    uint8_t fanspeed = (uint8_t)(power &0xF) >> 1;
-    if (fanspeed) { fanspeed = (fanspeed >> 1) +1; }
-    return fanspeed;
-  }
-}
-
-
-
-void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence)
-{
-  ifan_fanspeed_timer = 0;
-  ifan_fanspeed_goal = fanspeed;
-
-  uint8_t fanspeed_now = GetFanspeed();
-
-  if (fanspeed == fanspeed_now) { return; }
-
-  uint8_t fans = kIFan02Speed[fanspeed];
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (sequence) {
-      fanspeed = kIFan03Sequence[fanspeed_now][ifan_fanspeed_goal];
-      if (fanspeed != ifan_fanspeed_goal) {
-        if (0 == fanspeed_now) {
-          ifan_fanspeed_timer = 20;
-        } else {
-          ifan_fanspeed_timer = 2;
-        }
-      }
-    }
-    fans = kIFan03Speed[fanspeed];
-  }
-  for (uint32_t i = 2; i < 5; i++) {
-    uint8_t state = (fans &1) + POWER_OFF_NO_STATE;
-    ExecuteCommandPower(i, state, SRC_IGNORE);
-    fans >>= 1;
-  }
-
-#ifdef USE_DOMOTICZ
-  if (sequence) { DomoticzUpdateFanState(); }
-#endif
-}
-
-
-
-void SonoffIfanReceived(void)
-{
-  char svalue[32];
-
-  uint8_t mode = serial_in_buffer[3];
-  uint8_t action = serial_in_buffer[6];
-
-  if (4 == mode) {
-    if (action < 4) {
-
-
-
-
-      if (action != GetFanspeed()) {
-        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), action);
-        ExecuteCommand(svalue, SRC_REMOTE);
-#ifdef USE_BUZZER
-        BuzzerEnabledBeep((action) ? action : 1, (action) ? 1 : 4);
-#endif
-      }
-    } else {
-
-      ExecuteCommandPower(1, POWER_TOGGLE, SRC_REMOTE);
-    }
-  }
-  if (6 == mode) {
-
-    Settings.flag3.buzzer_enable = !Settings.flag3.buzzer_enable;
-  }
-  if (7 == mode) {
-
-#ifdef USE_BUZZER
-    BuzzerEnabledBeep(4, 1);
-#endif
-  }
-
-
-
-  serial_in_buffer[5] = 0;
-  serial_in_buffer[6] = 0;
-  for (uint32_t i = 0; i < 7; i++) {
-    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
-    Serial.write(serial_in_buffer[i]);
-  }
-}
-
-bool SonoffIfanSerialInput(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (0xAA == serial_in_byte) {
-      serial_in_byte_counter = 0;
-      ifan_receive_flag = true;
-    }
-    if (ifan_receive_flag) {
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if (serial_in_byte_counter == 8) {
-# 176 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-        AddLogSerial(LOG_LEVEL_DEBUG);
-        uint8_t crc = 0;
-        for (uint32_t i = 2; i < 7; i++) {
-          crc += serial_in_buffer[i];
-        }
-        if (crc == serial_in_buffer[7]) {
-          SonoffIfanReceived();
-          ifan_receive_flag = false;
-          return true;
-        }
-      }
-      serial_in_byte = 0;
-    }
-    return false;
-  }
-}
-
-
-
-
-
-void CmndFanspeed(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    if ('-' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (int16_t)GetFanspeed() -1;
-      if (XdrvMailbox.payload < 0) { XdrvMailbox.payload = MAX_FAN_SPEED -1; }
-    }
-    else if ('+' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = GetFanspeed() +1;
-      if (XdrvMailbox.payload > MAX_FAN_SPEED -1) { XdrvMailbox.payload = 0; }
-    }
-  }
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_FAN_SPEED)) {
-    SonoffIFanSetFanspeed(XdrvMailbox.payload, true);
-  }
-  ResponseCmndNumber(GetFanspeed());
-}
-
-
-
-bool SonoffIfanInit(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    SetSerial(9600, TS_SERIAL_8N1);
-  }
-  return false;
-}
-
-void SonoffIfanUpdate(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (ifan_fanspeed_timer) {
-      ifan_fanspeed_timer--;
-      if (!ifan_fanspeed_timer) {
-        SonoffIFanSetFanspeed(ifan_fanspeed_goal, false);
-      }
-    }
-  }
-
-  if (ifan_restart_flag && (4 == uptime) && (SONOFF_IFAN02 == my_module_type)) {
-    ifan_restart_flag = false;
-    SetDevicePower(1, SRC_RETRY);
-    SetDevicePower(power, SRC_RETRY);
-  }
-}
-
-
-
-
-
-bool Xdrv22(uint8_t function)
-{
-  bool result = false;
-
-  if (IsModuleIfan()) {
-    switch (function) {
-      case FUNC_EVERY_250_MSECOND:
-        SonoffIfanUpdate();
-        break;
-      case FUNC_SERIAL:
-        result = SonoffIfanSerialInput();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSonoffIfanCommands, SonoffIfanCommand);
-        break;
-      case FUNC_MODULE_INIT:
-        result = SonoffIfanInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-#ifdef USE_ZIGBEE
-
-#define OCCUPANCY "Occupancy"
-
-typedef uint64_t Z_IEEEAddress;
-typedef uint16_t Z_ShortAddress;
-
-enum ZnpCommandType {
-  Z_POLL = 0x00,
-  Z_SREQ = 0x20,
-  Z_AREQ = 0x40,
-  Z_SRSP = 0x60
-};
-
-enum ZnpSubsystem {
-  Z_RPC_Error = 0x00,
-  Z_SYS = 0x01,
-  Z_MAC = 0x02,
-  Z_NWK = 0x03,
-  Z_AF = 0x04,
-  Z_ZDO = 0x05,
-  Z_SAPI = 0x06,
-  Z_UTIL = 0x07,
-  Z_DEBUG = 0x08,
-  Z_APP = 0x09
-};
-
-
-enum SysCommand {
-  SYS_RESET = 0x00,
-  SYS_PING = 0x01,
-  SYS_VERSION = 0x02,
-  SYS_SET_EXTADDR = 0x03,
-  SYS_GET_EXTADDR = 0x04,
-  SYS_RAM_READ = 0x05,
-  SYS_RAM_WRITE = 0x06,
-  SYS_OSAL_NV_ITEM_INIT = 0x07,
-  SYS_OSAL_NV_READ = 0x08,
-  SYS_OSAL_NV_WRITE = 0x09,
-  SYS_OSAL_START_TIMER = 0x0A,
-  SYS_OSAL_STOP_TIMER = 0x0B,
-  SYS_RANDOM = 0x0C,
-  SYS_ADC_READ = 0x0D,
-  SYS_GPIO = 0x0E,
-  SYS_STACK_TUNE = 0x0F,
-  SYS_SET_TIME = 0x10,
-  SYS_GET_TIME = 0x11,
-  SYS_OSAL_NV_DELETE = 0x12,
-  SYS_OSAL_NV_LENGTH = 0x13,
-  SYS_TEST_RF = 0x40,
-  SYS_TEST_LOOPBACK = 0x41,
-  SYS_RESET_IND = 0x80,
-  SYS_OSAL_TIMER_EXPIRED = 0x81,
-};
-
-enum SapiCommand {
-  SAPI_START_REQUEST = 0x00,
-  SAPI_BIND_DEVICE = 0x01,
-  SAPI_ALLOW_BIND = 0x02,
-  SAPI_SEND_DATA_REQUEST = 0x03,
-  SAPI_READ_CONFIGURATION = 0x04,
-  SAPI_WRITE_CONFIGURATION = 0x05,
-  SAPI_GET_DEVICE_INFO = 0x06,
-  SAPI_FIND_DEVICE_REQUEST = 0x07,
-  SAPI_PERMIT_JOINING_REQUEST = 0x08,
-  SAPI_SYSTEM_RESET = 0x09,
-  SAPI_START_CONFIRM = 0x80,
-  SAPI_BIND_CONFIRM = 0x81,
-  SAPI_ALLOW_BIND_CONFIRM = 0x82,
-  SAPI_SEND_DATA_CONFIRM = 0x83,
-  SAPI_FIND_DEVICE_CONFIRM = 0x85,
-  SAPI_RECEIVE_DATA_INDICATION = 0x87,
-};
-enum Z_configuration {
-  CONF_EXTADDR = 0x01,
-  CONF_BOOTCOUNTER = 0x02,
-  CONF_STARTUP_OPTION = 0x03,
-  CONF_START_DELAY = 0x04,
-  CONF_NIB = 0x21,
-  CONF_DEVICE_LIST = 0x22,
-  CONF_ADDRMGR = 0x23,
-  CONF_POLL_RATE = 0x24,
-  CONF_QUEUED_POLL_RATE = 0x25,
-  CONF_RESPONSE_POLL_RATE = 0x26,
-  CONF_REJOIN_POLL_RATE = 0x27,
-  CONF_DATA_RETRIES = 0x28,
-  CONF_POLL_FAILURE_RETRIES = 0x29,
-  CONF_STACK_PROFILE = 0x2A,
-  CONF_INDIRECT_MSG_TIMEOUT = 0x2B,
-  CONF_ROUTE_EXPIRY_TIME = 0x2C,
-  CONF_EXTENDED_PAN_ID = 0x2D,
-  CONF_BCAST_RETRIES = 0x2E,
-  CONF_PASSIVE_ACK_TIMEOUT = 0x2F,
-  CONF_BCAST_DELIVERY_TIME = 0x30,
-  CONF_NWK_MODE = 0x31,
-  CONF_CONCENTRATOR_ENABLE = 0x32,
-  CONF_CONCENTRATOR_DISCOVERY = 0x33,
-  CONF_CONCENTRATOR_RADIUS = 0x34,
-  CONF_CONCENTRATOR_RC = 0x36,
-  CONF_NWK_MGR_MODE = 0x37,
-  CONF_SRC_RTG_EXPIRY_TIME = 0x38,
-  CONF_ROUTE_DISCOVERY_TIME = 0x39,
-  CONF_NWK_ACTIVE_KEY_INFO = 0x3A,
-  CONF_NWK_ALTERN_KEY_INFO = 0x3B,
-  CONF_ROUTER_OFF_ASSOC_CLEANUP = 0x3C,
-  CONF_NWK_LEAVE_REQ_ALLOWED = 0x3D,
-  CONF_NWK_CHILD_AGE_ENABLE = 0x3E,
-  CONF_DEVICE_LIST_KA_TIMEOUT = 0x3F,
-  CONF_BINDING_TABLE = 0x41,
-  CONF_GROUP_TABLE = 0x42,
-  CONF_APS_FRAME_RETRIES = 0x43,
-  CONF_APS_ACK_WAIT_DURATION = 0x44,
-  CONF_APS_ACK_WAIT_MULTIPLIER = 0x45,
-  CONF_BINDING_TIME = 0x46,
-  CONF_APS_USE_EXT_PANID = 0x47,
-  CONF_APS_USE_INSECURE_JOIN = 0x48,
-  CONF_COMMISSIONED_NWK_ADDR = 0x49,
-  CONF_APS_NONMEMBER_RADIUS = 0x4B,
-  CONF_APS_LINK_KEY_TABLE = 0x4C,
-  CONF_APS_DUPREJ_TIMEOUT_INC = 0x4D,
-  CONF_APS_DUPREJ_TIMEOUT_COUNT = 0x4E,
-  CONF_APS_DUPREJ_TABLE_SIZE = 0x4F,
-  CONF_DIAGNOSTIC_STATS = 0x50,
-  CONF_SECURITY_LEVEL = 0x61,
-  CONF_PRECFGKEY = 0x62,
-  CONF_PRECFGKEYS_ENABLE = 0x63,
-  CONF_SECURITY_MODE = 0x64,
-  CONF_SECURE_PERMIT_JOIN = 0x65,
-  CONF_APS_LINK_KEY_TYPE = 0x66,
-  CONF_APS_ALLOW_R19_SECURITY = 0x67,
-  CONF_IMPLICIT_CERTIFICATE = 0x69,
-  CONF_DEVICE_PRIVATE_KEY = 0x6A,
-  CONF_CA_PUBLIC_KEY = 0x6B,
-  CONF_KE_MAX_DEVICES = 0x6C,
-  CONF_USE_DEFAULT_TCLK = 0x6D,
-  CONF_RNG_COUNTER = 0x6F,
-  CONF_RANDOM_SEED = 0x70,
-  CONF_TRUSTCENTER_ADDR = 0x71,
-  CONF_USERDESC = 0x81,
-  CONF_NWKKEY = 0x82,
-  CONF_PANID = 0x83,
-  CONF_CHANLIST = 0x84,
-  CONF_LEAVE_CTRL = 0x85,
-  CONF_SCAN_DURATION = 0x86,
-  CONF_LOGICAL_TYPE = 0x87,
-  CONF_NWKMGR_MIN_TX = 0x88,
-  CONF_NWKMGR_ADDR = 0x89,
-  CONF_ZDO_DIRECT_CB = 0x8F,
-  CONF_TCLK_TABLE_START = 0x0101,
-  ZNP_HAS_CONFIGURED = 0xF00
-};
-# 210 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-enum Z_Status {
-  Z_Success = 0x00,
-  Z_Failure = 0x01,
-  Z_InvalidParameter = 0x02,
-  Z_MemError = 0x03,
-  Z_Created = 0x09,
-  Z_BufferFull = 0x11
-};
-
-enum Z_App_Profiles {
-  Z_PROF_IPM = 0x0101,
-  Z_PROF_HA = 0x0104,
-  Z_PROF_CBA = 0x0105,
-  Z_PROF_TA = 0x0107,
-  Z_PROF_PHHC = 0x0108,
-  Z_PROF_AMI = 0x0109,
-};
-
-enum Z_Device_Ids {
-  Z_DEVID_CONF_TOOL = 0x0005,
-# 262 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-};
-# 275 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-enum AfCommand : uint8_t {
-  AF_REGISTER = 0x00,
-  AF_DATA_REQUEST = 0x01,
-  AF_DATA_REQUEST_EXT = 0x02,
-  AF_DATA_REQUEST_SRC_RTG = 0x03,
-  AF_INTER_PAN_CTL = 0x10,
-  AF_DATA_STORE = 0x11,
-  AF_DATA_RETRIEVE = 0x12,
-  AF_APSF_CONFIG_SET = 0x13,
-  AF_DATA_CONFIRM = 0x80,
-  AF_REFLECT_ERROR = 0x83,
-  AF_INCOMING_MSG = 0x81,
-  AF_INCOMING_MSG_EXT = 0x82
-};
-
-
-enum : uint8_t {
-  ZDO_NWK_ADDR_REQ = 0x00,
-  ZDO_IEEE_ADDR_REQ = 0x01,
-  ZDO_NODE_DESC_REQ = 0x02,
-  ZDO_POWER_DESC_REQ = 0x03,
-  ZDO_SIMPLE_DESC_REQ = 0x04,
-  ZDO_ACTIVE_EP_REQ = 0x05,
-  ZDO_MATCH_DESC_REQ = 0x06,
-  ZDO_COMPLEX_DESC_REQ = 0x07,
-  ZDO_USER_DESC_REQ = 0x08,
-  ZDO_DEVICE_ANNCE = 0x0A,
-  ZDO_USER_DESC_SET = 0x0B,
-  ZDO_SERVER_DISC_REQ = 0x0C,
-  ZDO_END_DEVICE_BIND_REQ = 0x20,
-  ZDO_BIND_REQ = 0x21,
-  ZDO_UNBIND_REQ = 0x22,
-  ZDO_SET_LINK_KEY = 0x23,
-  ZDO_REMOVE_LINK_KEY = 0x24,
-  ZDO_GET_LINK_KEY = 0x25,
-  ZDO_MGMT_NWK_DISC_REQ = 0x30,
-  ZDO_MGMT_LQI_REQ = 0x31,
-  ZDO_MGMT_RTQ_REQ = 0x32,
-  ZDO_MGMT_BIND_REQ = 0x33,
-  ZDO_MGMT_LEAVE_REQ = 0x34,
-  ZDO_MGMT_DIRECT_JOIN_REQ = 0x35,
-  ZDO_MGMT_PERMIT_JOIN_REQ = 0x36,
-  ZDO_MGMT_NWK_UPDATE_REQ = 0x37,
-  ZDO_MSG_CB_REGISTER = 0x3E,
-  ZDO_MGS_CB_REMOVE = 0x3F,
-  ZDO_STARTUP_FROM_APP = 0x40,
-  ZDO_AUTO_FIND_DESTINATION = 0x41,
-  ZDO_EXT_REMOVE_GROUP = 0x47,
-  ZDO_EXT_REMOVE_ALL_GROUP = 0x48,
-  ZDO_EXT_FIND_ALL_GROUPS_ENDPOINT = 0x49,
-  ZDO_EXT_FIND_GROUP = 0x4A,
-  ZDO_EXT_ADD_GROUP = 0x4B,
-  ZDO_EXT_COUNT_ALL_GROUPS = 0x4C,
-  ZDO_NWK_ADDR_RSP = 0x80,
-  ZDO_IEEE_ADDR_RSP = 0x81,
-  ZDO_NODE_DESC_RSP = 0x82,
-  ZDO_POWER_DESC_RSP = 0x83,
-  ZDO_SIMPLE_DESC_RSP = 0x84,
-  ZDO_ACTIVE_EP_RSP = 0x85,
-  ZDO_MATCH_DESC_RSP = 0x86,
-  ZDO_COMPLEX_DESC_RSP = 0x87,
-  ZDO_USER_DESC_RSP = 0x88,
-  ZDO_USER_DESC_CONF = 0x89,
-  ZDO_SERVER_DISC_RSP = 0x8A,
-  ZDO_END_DEVICE_BIND_RSP = 0xA0,
-  ZDO_BIND_RSP = 0xA1,
-  ZDO_UNBIND_RSP = 0xA2,
-  ZDO_MGMT_NWK_DISC_RSP = 0xB0,
-  ZDO_MGMT_LQI_RSP = 0xB1,
-  ZDO_MGMT_RTG_RSP = 0xB2,
-  ZDO_MGMT_BIND_RSP = 0xB3,
-  ZDO_MGMT_LEAVE_RSP = 0xB4,
-  ZDO_MGMT_DIRECT_JOIN_RSP = 0xB5,
-  ZDO_MGMT_PERMIT_JOIN_RSP = 0xB6,
-  ZDO_STATE_CHANGE_IND = 0xC0,
-  ZDO_END_DEVICE_ANNCE_IND = 0xC1,
-  ZDO_MATCH_DESC_RSP_SENT = 0xC2,
-  ZDO_STATUS_ERROR_RSP = 0xC3,
-  ZDO_SRC_RTG_IND = 0xC4,
-  ZDO_LEAVE_IND = 0xC9,
-  ZDO_TC_DEV_IND = 0xCA,
-  ZDO_PERMIT_JOIN_IND = 0xCB,
-  ZDO_MSG_CB_INCOMING = 0xFF
-};
-
-
-enum ZdoStates {
-  ZDO_DEV_HOLD = 0x00,
-  ZDO_DEV_INIT = 0x01,
-  ZDO_DEV_NWK_DISC = 0x02,
-  ZDO_DEV_NWK_JOINING = 0x03,
-  ZDO_DEV_NWK_REJOIN = 0x04,
-  ZDO_DEV_END_DEVICE_UNAUTH = 0x05,
-  ZDO_DEV_END_DEVICE = 0x06,
-  ZDO_DEV_ROUTER = 0x07,
-  ZDO_DEV_COORD_STARTING = 0x08,
-  ZDO_DEV_ZB_COORD = 0x09,
-  ZDO_DEV_NWK_ORPHAN = 0x0A,
-};
-
-
-enum Z_Util {
-  Z_UTIL_GET_DEVICE_INFO = 0x00,
-  Z_UTIL_GET_NV_INFO = 0x01,
-  Z_UTIL_SET_PANID = 0x02,
-  Z_UTIL_SET_CHANNELS = 0x03,
-  Z_UTIL_SET_SECLEVEL = 0x04,
-  Z_UTIL_SET_PRECFGKEY = 0x05,
-  Z_UTIL_CALLBACK_SUB_CMD = 0x06,
-  Z_UTIL_KEY_EVENT = 0x07,
-  Z_UTIL_TIME_ALIVE = 0x09,
-  Z_UTIL_LED_CONTROL = 0x0A,
-  Z_UTIL_TEST_LOOPBACK = 0x10,
-  Z_UTIL_DATA_REQ = 0x11,
-  Z_UTIL_SRC_MATCH_ENABLE = 0x20,
-  Z_UTIL_SRC_MATCH_ADD_ENTRY = 0x21,
-  Z_UTIL_SRC_MATCH_DEL_ENTRY = 0x22,
-  Z_UTIL_SRC_MATCH_CHECK_SRC_ADDR = 0x23,
-  Z_UTIL_SRC_MATCH_ACK_ALL_PENDING = 0x24,
-  Z_UTIL_SRC_MATCH_CHECK_ALL_PENDING = 0x25,
-  Z_UTIL_ADDRMGR_EXT_ADDR_LOOKUP = 0x40,
-  Z_UTIL_ADDRMGR_NWK_ADDR_LOOKUP = 0x41,
-  Z_UTIL_APSME_LINK_KEY_DATA_GET = 0x44,
-  Z_UTIL_APSME_LINK_KEY_NV_ID_GET = 0x45,
-  Z_UTIL_ASSOC_COUNT = 0x48,
-  Z_UTIL_ASSOC_FIND_DEVICE = 0x49,
-  Z_UTIL_ASSOC_GET_WITH_ADDRESS = 0x4A,
-  Z_UTIL_APSME_REQUEST_KEY_CMD = 0x4B,
-  Z_UTIL_ZCL_KEY_EST_INIT_EST = 0x80,
-  Z_UTIL_ZCL_KEY_EST_SIGN = 0x81,
-  Z_UTIL_UTIL_SYNC_REQ = 0xE0,
-  Z_UTIL_ZCL_KEY_ESTABLISH_IND = 0xE1
-};
-
-enum ZCL_Global_Commands {
-  ZCL_READ_ATTRIBUTES = 0x00,
-  ZCL_READ_ATTRIBUTES_RESPONSE = 0x01,
-  ZCL_WRITE_ATTRIBUTES = 0x02,
-  ZCL_WRITE_ATTRIBUTES_UNDIVIDED = 0x03,
-  ZCL_WRITE_ATTRIBUTES_RESPONSE = 0x04,
-  ZCL_WRITE_ATTRIBUTES_NORESPONSE = 0x05,
-  ZCL_CONFIGURE_REPORTING = 0x06,
-  ZCL_CONFIGURE_REPORTING_RESPONSE = 0x07,
-  ZCL_READ_REPORTING_CONFIGURATION = 0x08,
-  ZCL_READ_REPORTING_CONFIGURATION_RESPONSE = 0x09,
-  ZCL_REPORT_ATTRIBUTES = 0x0a,
-  ZCL_DEFAULT_RESPONSE = 0x0b,
-  ZCL_DISCOVER_ATTRIBUTES = 0x0c,
-  ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d
-
-};
-
-const uint16_t Z_ProfileIds[] PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
-const char Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
-#ifdef USE_ZIGBEE
-
-
-
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp = true, uint8_t transacId = 1);
-
-
-
-JsonVariant &getCaseInsensitive(const JsonObject &json, const char *needle) {
-
-  if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle))) {
-    return *(JsonVariant*)nullptr;
-  }
-
-  for (auto kv : json) {
-    const char *key = kv.key;
-    JsonVariant &value = kv.value;
-
-    if (0 == strcasecmp_P(key, needle)) {
-      return value;
-    }
-  }
-
-  return *(JsonVariant*)nullptr;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-#ifdef USE_ZIGBEE
-
-#include <vector>
-#include <map>
-
-#ifndef ZIGBEE_SAVE_DELAY_SECONDS
-#define ZIGBEE_SAVE_DELAY_SECONDS 10;
-#endif
-const uint16_t kZigbeeSaveDelaySeconds = ZIGBEE_SAVE_DELAY_SECONDS;
-
-typedef int32_t (*Z_DeviceTimer)(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-
-typedef struct Z_Device {
-  uint16_t shortaddr;
-  uint64_t longaddr;
-  uint32_t firstSeen;
-  uint32_t lastSeen;
-  String manufacturerId;
-  String modelId;
-  String friendlyName;
-  std::vector<uint32_t> endpoints;
-  std::vector<uint32_t> clusters_in;
-  std::vector<uint32_t> clusters_out;
-
-  uint32_t timer;
-  uint16_t cluster;
-  uint16_t endpoint;
-  uint32_t value;
-  Z_DeviceTimer func;
-
-  DynamicJsonBuffer *json_buffer;
-  JsonObject *json;
-} Z_Device;
-
-
-
-
-
-
-
-class Z_Devices {
-public:
-  Z_Devices() {};
-
-
-
-
-
-
-  uint16_t isKnownShortAddr(uint16_t shortaddr) const;
-  uint16_t isKnownLongAddr(uint64_t longaddr) const;
-  uint16_t isKnownIndex(uint32_t index) const;
-  uint16_t isKnownFriendlyName(const char * name) const;
-
-  uint64_t getDeviceLongAddr(uint16_t shortaddr) const;
-
-
-
-  void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
-
-
-  void addEndoint(uint16_t shortaddr, uint8_t endpoint);
-
-
-  void addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId);
-
-
-  void addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out);
-
-  uint8_t findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster);
-
-  void setManufId(uint16_t shortaddr, const char * str);
-  void setModelId(uint16_t shortaddr, const char * str);
-  void setFriendlyName(uint16_t shortaddr, const char * str);
-  const String * getFriendlyName(uint16_t) const;
-
-
-  void updateLastSeen(uint16_t shortaddr);
-
-
-  String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
-
-
-  void resetTimer(uint32_t shortaddr);
-  void setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func);
-  void runTimer(void);
-
-
-  void jsonClear(uint16_t shortaddr);
-  void jsonAppend(uint16_t shortaddr, const JsonObject &values);
-  const JsonObject *jsonGet(uint16_t shortaddr);
-  void jsonPublishFlush(uint16_t shortaddr);
-  bool jsonIsConflict(uint16_t shortaddr, const JsonObject &values);
-  void jsonPublishNow(uint16_t shortaddr, JsonObject &values);
-
-
-  size_t devicesSize(void) const {
-    return _devices.size();
-  }
-  const Z_Device &devicesAt(size_t i) const {
-    return _devices.at(i);
-  }
-
-
-  bool removeDevice(uint16_t shortaddr);
-
-
-  void dirty(void);
-  void clean(void);
-
-
-  uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
-
-private:
-  std::vector<Z_Device> _devices = {};
-  uint32_t _saveTimer = 0;
-
-  template < typename T>
-  static bool findInVector(const std::vector<T> & vecOfElements, const T & element);
-
-  template < typename T>
-  static int32_t findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element);
-
-
-  static int32_t findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t element);
-
-  Z_Device & getShortAddr(uint16_t shortaddr);
-  const Z_Device & getShortAddrConst(uint16_t shortaddr) const ;
-  Z_Device & getLongAddr(uint64_t longaddr);
-
-  int32_t findShortAddr(uint16_t shortaddr) const;
-  int32_t findLongAddr(uint64_t longaddr) const;
-  int32_t findFriendlyName(const char * name) const;
-
-  void _updateLastSeen(Z_Device &device) {
-    if (&device != nullptr) {
-      device.lastSeen = Rtc.utc_time;
-    }
-  };
-
-
-  Z_Device & createDeviceEntry(uint16_t shortaddr, uint64_t longaddr = 0);
-};
-
-Z_Devices zigbee_devices = Z_Devices();
-
-
-uint64_t localIEEEAddr = 0;
-
-
-template < typename T>
-bool Z_Devices::findInVector(const std::vector<T> & vecOfElements, const T & element) {
-
- auto it = std::find(vecOfElements.begin(), vecOfElements.end(), element);
-
- if (it != vecOfElements.end()) {
-  return true;
- } else {
-  return false;
- }
-}
-
-template < typename T>
-int32_t Z_Devices::findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element) {
-
-
-  int32_t found = 0;
-  for (auto &elem : vecOfElements) {
-    if ( ((elem >> 16) & 0xFF) == element) { return found; }
-    found++;
-  }
-
-  return -1;
-}
-# 204 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t cluster) {
-  int32_t found = 0;
-  for (auto &elem : vecOfElements) {
-    if ((elem & 0xFFFF) == cluster) { return found; }
-    found++;
-  }
-  return -1;
-}
-
-
-
-
-
-Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
-  if (!shortaddr && !longaddr) { return *(Z_Device*) nullptr; }
-  Z_Device device = { shortaddr, longaddr,
-                      Rtc.utc_time, Rtc.utc_time,
-                      String(),
-                      String(),
-                      String(),
-                      std::vector<uint32_t>(),
-                      std::vector<uint32_t>(),
-                      std::vector<uint32_t>(),
-                      0,0,0,0,
-                      nullptr,
-                      nullptr, nullptr };
-  device.json_buffer = new DynamicJsonBuffer();
-  _devices.push_back(device);
-  dirty();
-  return _devices.back();
-}
-# 244 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findShortAddr(uint16_t shortaddr) const {
-  if (!shortaddr) { return -1; }
-  int32_t found = 0;
-  if (shortaddr) {
-    for (auto &elem : _devices) {
-      if (elem.shortaddr == shortaddr) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-# 263 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findLongAddr(uint64_t longaddr) const {
-  if (!longaddr) { return -1; }
-  int32_t found = 0;
-  if (longaddr) {
-    for (auto &elem : _devices) {
-      if (elem.longaddr == longaddr) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-# 282 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findFriendlyName(const char * name) const {
-  if (!name) { return -1; }
-  size_t name_len = strlen(name);
-  int32_t found = 0;
-  if (name_len) {
-    for (auto &elem : _devices) {
-      if (elem.friendlyName == name) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-
-
-uint16_t Z_Devices::isKnownShortAddr(uint16_t shortaddr) const {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownLongAddr(uint64_t longaddr) const {
-  int32_t found = findLongAddr(longaddr);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownIndex(uint32_t index) const {
-  if (index < devicesSize()) {
-    const Z_Device & device = devicesAt(index);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
-  if ((!name) || (0 == strlen(name))) { return 0xFFFF; }
-  int32_t found = findFriendlyName(name);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint64_t Z_Devices::getDeviceLongAddr(uint16_t shortaddr) const {
-  const Z_Device & device = getShortAddrConst(shortaddr);
-  return device.longaddr;
-}
-
-
-
-
-Z_Device & Z_Devices::getShortAddr(uint16_t shortaddr) {
-  if (!shortaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return _devices[found];
-  }
-
-  return createDeviceEntry(shortaddr, 0);
-}
-
-const Z_Device & Z_Devices::getShortAddrConst(uint16_t shortaddr) const {
-  if (!shortaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return _devices[found];
-  }
-  return *((Z_Device*)nullptr);
-}
-
-
-Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
-  if (!longaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findLongAddr(longaddr);
-  if (found > 0) {
-    return _devices[found];
-  }
-  return createDeviceEntry(0, longaddr);
-}
-
-
-bool Z_Devices::removeDevice(uint16_t shortaddr) {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    _devices.erase(_devices.begin() + found);
-    dirty();
-    return true;
-  }
-  return false;
-}
-
-
-
-
-
-
-void Z_Devices::updateDevice(uint16_t shortaddr, uint64_t longaddr) {
-  int32_t s_found = findShortAddr(shortaddr);
-  int32_t l_found = findLongAddr(longaddr);
-
-  if ((s_found >= 0) && (l_found >= 0)) {
-    if (s_found == l_found) {
-      updateLastSeen(shortaddr);
-    } else {
-
-      _devices[l_found].shortaddr = shortaddr;
-
-      _devices.erase(_devices.begin() + s_found);
-      updateLastSeen(shortaddr);
-      dirty();
-    }
-  } else if (s_found >= 0) {
-
-
-    _devices[s_found].longaddr = longaddr;
-    updateLastSeen(shortaddr);
-    dirty();
-  } else if (l_found >= 0) {
-
-    _devices[l_found].shortaddr = shortaddr;
-    dirty();
-  } else {
-
-    if (shortaddr || longaddr) {
-      createDeviceEntry(shortaddr, longaddr);
-    }
-  }
-}
-
-
-
-
-void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
-  if (!shortaddr) { return; }
-  uint32_t ep_profile = (endpoint << 16);
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (findEndpointInVector(device.endpoints, endpoint) < 0) {
-    device.endpoints.push_back(ep_profile);
-    dirty();
-  }
-}
-
-void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId) {
-  if (!shortaddr) { return; }
-  uint32_t ep_profile = (endpoint << 16) | profileId;
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  int32_t found = findEndpointInVector(device.endpoints, endpoint);
-  if (found < 0) {
-    device.endpoints.push_back(ep_profile);
-    dirty();
-  } else {
-    if (device.endpoints[found] != ep_profile) {
-      device.endpoints[found] = ep_profile;
-      dirty();
-    }
-  }
-}
-
-void Z_Devices::addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out) {
-  if (!shortaddr) { return; }
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  uint32_t ep_cluster = (endpoint << 16) | cluster;
-  if (!out) {
-    if (!findInVector(device.clusters_in, ep_cluster)) {
-      device.clusters_in.push_back(ep_cluster);
-      dirty();
-    }
-  } else {
-    if (!findInVector(device.clusters_out, ep_cluster)) {
-      device.clusters_out.push_back(ep_cluster);
-      dirty();
-    }
-  }
-}
-
-
-
-uint8_t Z_Devices::findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster){
-  int32_t short_found = findShortAddr(shortaddr);
-  if (short_found < 0) return 0;
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return 0; }
-  int32_t found = findClusterEndpoint(device.clusters_in, cluster);
-  if (found >= 0) {
-    return (device.clusters_in[found] >> 16) & 0xFF;
-  } else {
-    return 0;
-  }
-}
-
-
-void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.manufacturerId.equals(str)) {
-    dirty();
-  }
-  device.manufacturerId = str;
-}
-void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.modelId.equals(str)) {
-    dirty();
-  }
-  device.modelId = str;
-}
-void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.friendlyName.equals(str)) {
-    dirty();
-  }
-  device.friendlyName = str;
-}
-
-const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    if (device.friendlyName.length() > 0) {
-      return &device.friendlyName;
-    }
-  }
-  return nullptr;
-}
-
-
-void Z_Devices::updateLastSeen(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-}
-
-
-
-
-void Z_Devices::resetTimer(uint32_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  device.timer = 0;
-  device.func = nullptr;
-}
-
-
-void Z_Devices::setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-
-  device.cluster = cluster;
-  device.endpoint = endpoint;
-  device.value = value;
-  device.func = func;
-  device.timer = wait_ms + millis();
-}
-
-
-void Z_Devices::runTimer(void) {
-  for (std::vector<Z_Device>::iterator it = _devices.begin(); it != _devices.end(); ++it) {
-    Z_Device &device = *it;
-    uint16_t shortaddr = device.shortaddr;
-
-    uint32_t timer = device.timer;
-    if ((timer) && TimeReached(timer)) {
-      device.timer = 0;
-
-      (*device.func)(device.shortaddr, device.cluster, device.endpoint, device.value);
-    }
-  }
-
-  if ((_saveTimer) && TimeReached(_saveTimer)) {
-    saveZigbeeDevices();
-    _saveTimer = 0;
-  }
-}
-
-void Z_Devices::jsonClear(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-
-  device.json = nullptr;
-  device.json_buffer->clear();
-}
-
-void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val) {
-  to.remove(key);
-
-  if (val.is<char*>()) {
-    String sval = val.as<String>();
-    to.set(key, sval);
-  } else if (val.is<JsonArray>()) {
-    JsonArray &nested_arr = to.createNestedArray(key);
-    CopyJsonArray(nested_arr, val.as<JsonArray>());
-  } else if (val.is<JsonObject>()) {
-    JsonObject &nested_obj = to.createNestedObject(key);
-    CopyJsonObject(nested_obj, val.as<JsonObject>());
-  } else {
-    to.set(key, val);
-  }
-}
-
-void CopyJsonArray(JsonArray &to, const JsonArray &arr) {
-  for (auto v : arr) {
-    if (v.is<char*>()) {
-      String sval = v.as<String>();
-      to.add(sval);
-    } else if (v.is<JsonArray>()) {
-    } else if (v.is<JsonObject>()) {
-    } else {
-      to.add(v);
-    }
-  }
-}
-
-void CopyJsonObject(JsonObject &to, const JsonObject &from) {
-  for (auto kv : from) {
-    String key_string = kv.key;
-    JsonVariant &val = kv.value;
-
-    CopyJsonVariant(to, key_string, val);
-  }
-}
-
-
-bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return false; }
-  if (&values == nullptr) { return false; }
-
-  if (nullptr == device.json) {
-    return false;
-  }
-
-  for (auto kv : values) {
-    String key_string = kv.key;
-
-    if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {
-      if (device.json->containsKey(kv.key)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  if (&values == nullptr) { return; }
-
-  if (nullptr == device.json) {
-    device.json = &(device.json_buffer->createObject());
-  }
-
-  char sa[8];
-  snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
-  device.json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
-
-  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
-  if (fname) {
-    device.json->set(F(D_JSON_ZIGBEE_NAME), (char*)fname->c_str());
-  }
-
-
-  CopyJsonObject(*device.json, values);
-}
-
-const JsonObject *Z_Devices::jsonGet(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return nullptr; }
-  return device.json;
-}
-
-void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  JsonObject * json = device.json;
-  if (json == nullptr) { return; }
-
-  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
-  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);
-# 693 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-  if (use_fname) {
-    json->remove(F(D_JSON_ZIGBEE_NAME));
-  } else {
-    json->remove(F(D_JSON_ZIGBEE_DEVICE));
-  }
-
-  String msg = "";
-  json->printTo(msg);
-  zigbee_devices.jsonClear(shortaddr);
-
-  if (use_fname) {
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-  } else {
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-  }
-
-
-}
-
-void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
-  jsonPublishFlush(shortaddr);
-  jsonAppend(shortaddr, values);
-  jsonPublishFlush(shortaddr);
-}
-
-void Z_Devices::dirty(void) {
-  _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
-}
-void Z_Devices::clean(void) {
-  _saveTimer = 0;
-}
-
-
-
-
-
-
-uint16_t Z_Devices::parseDeviceParam(const char * param, bool short_must_be_known) const {
-  if (nullptr == param) { return 0; }
-  size_t param_len = strlen(param);
-  char dataBuf[param_len + 1];
-  strcpy(dataBuf, param);
-  RemoveSpace(dataBuf);
-  uint16_t shortaddr = 0;
-
-  if (strlen(dataBuf) < 4) {
-
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 99)) {
-      shortaddr = zigbee_devices.isKnownIndex(XdrvMailbox.payload - 1);
-    }
-  } else if ((dataBuf[0] == '0') && (dataBuf[1] == 'x')) {
-
-    if (strlen(dataBuf) < 18) {
-
-      shortaddr = strtoull(dataBuf, nullptr, 0);
-      if (short_must_be_known) {
-        shortaddr = zigbee_devices.isKnownShortAddr(shortaddr);
-      }
-
-    } else {
-
-      uint64_t longaddr = strtoull(dataBuf, nullptr, 0);
-      shortaddr = zigbee_devices.isKnownLongAddr(longaddr);
-    }
-  } else {
-
-    shortaddr = zigbee_devices.isKnownFriendlyName(dataBuf);
-  }
-
-  return shortaddr;
-}
-
-
-
-
-
-String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
-  DynamicJsonBuffer jsonBuffer;
-  JsonArray& json = jsonBuffer.createArray();
-  JsonArray& devices = json;
-
-  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it) {
-    const Z_Device& device = *it;
-    uint16_t shortaddr = device.shortaddr;
-    char hex[22];
-
-
-    if ((status_shortaddr) && (status_shortaddr != shortaddr)) { continue; }
-
-    JsonObject& dev = devices.createNestedObject();
-
-    snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), shortaddr);
-    dev[F(D_JSON_ZIGBEE_DEVICE)] = hex;
-
-    if (device.friendlyName.length() > 0) {
-      dev[F(D_JSON_ZIGBEE_NAME)] = device.friendlyName;
-    }
-
-    if (2 <= dump_mode) {
-      hex[0] = '0';
-      hex[1] = 'x';
-      Uint64toHex(device.longaddr, &hex[2], 64);
-      dev[F("IEEEAddr")] = hex;
-      if (device.modelId.length() > 0) {
-        dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
-      }
-      if (device.manufacturerId.length() > 0) {
-        dev[F("Manufacturer")] = device.manufacturerId;
-      }
-    }
-
-
-    if (3 <= dump_mode) {
-      JsonObject& dev_endpoints = dev.createNestedObject(F("Endpoints"));
-      for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
-        uint32_t ep_profile = *ite;
-        uint8_t endpoint = (ep_profile >> 16) & 0xFF;
-        uint16_t profileId = ep_profile & 0xFFFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonObject& ep = dev_endpoints.createNestedObject(hex);
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), profileId);
-        ep[F("ProfileId")] = hex;
-
-        int32_t found = -1;
-        for (uint32_t i = 0; i < sizeof(Z_ProfileIds) / sizeof(Z_ProfileIds[0]); i++) {
-          if (pgm_read_word(&Z_ProfileIds[i]) == profileId) {
-            found = i;
-            break;
-          }
-        }
-        if (found > 0) {
-          GetTextIndexed(hex, sizeof(hex), found, Z_ProfileNames);
-          ep[F("ProfileIdName")] = hex;
-        }
-
-        ep.createNestedArray(F("ClustersIn"));
-        ep.createNestedArray(F("ClustersOut"));
-      }
-
-      for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
-        uint16_t cluster = *itc & 0xFFFF;
-        uint8_t endpoint = (*itc >> 16) & 0xFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersIn")];
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
-        cluster_arr.add(hex);
-      }
-
-      for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
-        uint16_t cluster = *itc & 0xFFFF;
-        uint8_t endpoint = (*itc >> 16) & 0xFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersOut")];
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
-        cluster_arr.add(hex);
-      }
-    }
-  }
-  String payload = "";
-  payload.reserve(200);
-  json.printTo(payload);
-  return payload;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-#ifdef USE_ZIGBEE
-# 50 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-const static uint16_t z_spi_start_sector = 0xFF;
-const static uint8_t* z_spi_start = (uint8_t*) 0x402FF000;
-const static uint8_t* z_dev_start = z_spi_start + 0x0800;
-const static size_t z_spi_len = 0x1000;
-const static size_t z_block_offset = 0x0800;
-const static size_t z_block_len = 0x0800;
-
-class z_flashdata_t {
-public:
-  uint32_t name;
-  uint16_t len;
-  uint16_t reserved;
-};
-
-const static uint32_t ZIGB_NAME = 0x3167697A;
-const static size_t Z_MAX_FLASH = z_block_len - sizeof(z_flashdata_t);
-
-
-const uint16_t Z_ClusterNumber[] PROGMEM = {
-  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-  0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
-  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-  0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
-  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-  0x0100, 0x0101, 0x0102,
-  0x0201, 0x0202, 0x0203, 0x0204,
-  0x0300, 0x0301,
-  0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406,
-  0x0500, 0x0501, 0x0502,
-  0x0700, 0x0701, 0x0702,
-  0x0B00, 0x0B01, 0x0B02, 0x0B03, 0x0B04, 0x0B05,
-  0x1000,
-  0xFC0F,
-};
-
-
-uint16_t fromClusterCode(uint8_t c) {
-  if (c >= sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0])) {
-    return 0xFFFF;
-  }
-  return pgm_read_word(&Z_ClusterNumber[c]);
-}
-
-
-uint8_t toClusterCode(uint16_t c) {
-  for (uint32_t i = 0; i < sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0]); i++) {
-    if (c == pgm_read_word(&Z_ClusterNumber[i])) {
-      return i;
-    }
-  }
-  return 0xFF;
-}
-
-class SBuffer hibernateDevice(const struct Z_Device &device) {
-  SBuffer buf(128);
-
-  buf.add8(0x00);
-  buf.add16(device.shortaddr);
-  buf.add64(device.longaddr);
-  uint32_t endpoints = device.endpoints.size();
-  if (endpoints > 254) { endpoints = 254; }
-  buf.add8(endpoints);
-
-  for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
-    uint32_t ep_profile = *ite;
-    uint8_t endpoint = (ep_profile >> 16) & 0xFF;
-    uint16_t profileId = ep_profile & 0xFFFF;
-
-    buf.add8(endpoint);
-    buf.add16(profileId);
-    for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
-      uint16_t cluster = *itc & 0xFFFF;
-      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
-
-      if (endpoint == c_endpoint) {
-        uint8_t clusterCode = toClusterCode(cluster);
-        if (0xFF != clusterCode) { buf.add8(clusterCode); }
-      }
-    }
-    buf.add8(0xFF);
-
-    for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
-      uint16_t cluster = *itc & 0xFFFF;
-      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
-
-      if (endpoint == c_endpoint) {
-        uint8_t clusterCode = toClusterCode(cluster);
-        if (0xFF != clusterCode) { buf.add8(clusterCode); }
-      }
-    }
-    buf.add8(0xFF);
-  }
-
-
-  size_t model_len = device.modelId.length();
-  if (model_len > 32) { model_len = 32; }
-  buf.addBuffer(device.modelId.c_str(), model_len);
-  buf.add8(0x00);
-
-
-  size_t manuf_len = device.manufacturerId.length();
-  if (manuf_len > 32) {manuf_len = 32; }
-  buf.addBuffer(device.manufacturerId.c_str(), manuf_len);
-  buf.add8(0x00);
-
-
-  size_t frname_len = device.friendlyName.length();
-  if (frname_len > 32) {frname_len = 32; }
-  buf.addBuffer(device.friendlyName.c_str(), frname_len);
-  buf.add8(0x00);
-
-
-  buf.set8(0, buf.len());
-
-  return buf;
-}
-
-class SBuffer hibernateDevices(void) {
-  SBuffer buf(2048);
-
-  size_t devices_size = zigbee_devices.devicesSize();
-  if (devices_size > 32) { devices_size = 32; }
-  buf.add8(devices_size);
-
-  for (uint32_t i = 0; i < devices_size; i++) {
-    const Z_Device & device = zigbee_devices.devicesAt(i);
-    const SBuffer buf_device = hibernateDevice(device);
-    buf.addBuffer(buf_device);
-  }
-
-  size_t buf_len = buf.len();
-  if (buf_len > 2040) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Devices list too big to fit in Flash (%d)"), buf_len);
-  }
-
-
-  char *hex_char = (char*) malloc((buf_len * 2) + 2);
-  if (hex_char) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZbFlashStore %s"),
-                                    ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
-    free(hex_char);
-  }
-
-  return buf;
-}
-
-void hidrateDevices(const SBuffer &buf) {
-  uint32_t buf_len = buf.len();
-  if (buf_len <= 10) { return; }
-
-  uint32_t k = 0;
-  uint32_t num_devices = buf.get8(k++);
-
-  for (uint32_t i = 0; (i < num_devices) && (k < buf_len); i++) {
-    uint32_t dev_record_len = buf.get8(k);
-
-    SBuffer buf_d = buf.subBuffer(k, dev_record_len);
-
-    uint32_t d = 1;
-    uint16_t shortaddr = buf_d.get16(d); d += 2;
-    uint64_t longaddr = buf_d.get64(d); d += 8;
-    zigbee_devices.updateDevice(shortaddr, longaddr);
-
-    uint32_t endpoints = buf_d.get8(d++);
-    for (uint32_t j = 0; j < endpoints; j++) {
-      uint8_t ep = buf_d.get8(d++);
-      uint16_t ep_profile = buf_d.get16(d); d += 2;
-      zigbee_devices.addEndointProfile(shortaddr, ep, ep_profile);
-
-
-      while (d < dev_record_len) {
-        uint8_t ep_cluster = buf_d.get8(d++);
-        if (0xFF == ep_cluster) { break; }
-        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), false);
-      }
-
-      while (d < dev_record_len) {
-        uint8_t ep_cluster = buf_d.get8(d++);
-        if (0xFF == ep_cluster) { break; }
-        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), true);
-      }
-    }
-
-
-    char empty[] = "";
-
-
-    uint32_t s_len = buf_d.strlen_s(d);
-    char *ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setModelId(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    s_len = buf_d.strlen_s(d);
-    ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setManufId(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    s_len = buf_d.strlen_s(d);
-    ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setFriendlyName(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    k += dev_record_len;
-  }
-}
-
-void loadZigbeeDevices(void) {
-  z_flashdata_t flashdata;
-  memcpy_P(&flashdata, z_dev_start, sizeof(z_flashdata_t));
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "Zigbee signature in Flash: %08X - %d"), flashdata.name, flashdata.len);
-
-
-  if ((flashdata.name == ZIGB_NAME) && (flashdata.len > 0)) {
-    uint16_t buf_len = flashdata.len;
-
-    SBuffer buf(buf_len);
-    buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
-    hidrateDevices(buf);
-    zigbee_devices.clean();
-  } else {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
-  }
-}
-
-void saveZigbeeDevices(void) {
-  SBuffer buf = hibernateDevices();
-  size_t buf_len = buf.len();
-  if (buf_len > Z_MAX_FLASH) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Buffer too big to fit in Flash (%d bytes)"), buf_len);
-    return;
-  }
-
-
-  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
-  if (!spi_buffer) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
-    return;
-  }
-
-  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-
-  z_flashdata_t *flashdata = (z_flashdata_t*)(spi_buffer + z_block_offset);
-  flashdata->name = ZIGB_NAME;
-  flashdata->len = buf_len;
-  flashdata->reserved = 0;
-
-  memcpy(spi_buffer + z_block_offset + sizeof(z_flashdata_t), buf.getBuffer(), buf_len);
-
-
-  if (ESP.flashEraseSector(z_spi_start_sector)) {
-    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-  }
-
-  free(spi_buffer);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
-}
-
-
-void eraseZigbeeDevices(void) {
-  zigbee_devices.clean();
-
-  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
-  if (!spi_buffer) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
-    return;
-  }
-
-  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-
-
-  memset(spi_buffer + z_block_offset, 0xFF, z_block_len);
-
-
-  if (ESP.flashEraseSector(z_spi_start_sector)) {
-    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-  }
-
-  free(spi_buffer);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (0x%08X - %d bytes)"), z_dev_start, z_block_len);
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-#ifdef USE_ZIGBEE
-
-
-
-
-
-typedef union ZCLHeaderFrameControl_t {
-  struct {
-    uint8_t frame_type : 2;
-    uint8_t manuf_specific : 1;
-    uint8_t direction : 1;
-    uint8_t disable_def_resp : 1;
-    uint8_t reserved : 3;
-  } b;
-  uint32_t d8;
-} ZCLHeaderFrameControl_t;
-
-
-class ZCLFrame {
-public:
-
-  ZCLFrame(uint8_t frame_control, uint16_t manuf_code, uint8_t transact_seq, uint8_t cmd_id,
-    const char *buf, size_t buf_len, uint16_t clusterid, uint16_t groupid,
-    uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
-    uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
-    uint32_t timestamp):
-    _cmd_id(cmd_id), _manuf_code(manuf_code), _transact_seq(transact_seq),
-    _payload(buf_len ? buf_len : 250),
-    _cluster_id(clusterid), _group_id(groupid),
-    _srcaddr(srcaddr), _srcendpoint(srcendpoint), _dstendpoint(dstendpoint), _wasbroadcast(wasbroadcast),
-    _linkquality(linkquality), _securityuse(securityuse), _seqnumber(seqnumber),
-    _timestamp(timestamp)
-    {
-      _frame_control.d8 = frame_control;
-      _payload.addBuffer(buf, buf_len);
-    };
-
-
-  void log(void) {
-    char hex_char[_payload.len()*2+2];
-  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-    Response_P(PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
-                    "\"groupid\":%d," "\"clusterid\":%d," "\"srcaddr\":\"0x%04X\","
-                    "\"srcendpoint\":%d," "\"dstendpoint\":%d," "\"wasbroadcast\":%d,"
-                    "\"" D_CMND_ZIGBEE_LINKQUALITY "\":%d," "\"securityuse\":%d," "\"seqnumber\":%d,"
-                    "\"timestamp\":%d,"
-                    "\"fc\":\"0x%02X\",\"manuf\":\"0x%04X\",\"transact\":%d,"
-                    "\"cmdid\":\"0x%02X\",\"payload\":\"%s\"}}"),
-                    _group_id, _cluster_id, _srcaddr,
-                    _srcendpoint, _dstendpoint, _wasbroadcast,
-                    _linkquality, _securityuse, _seqnumber,
-                    _timestamp,
-                    _frame_control, _manuf_code, _transact_seq, _cmd_id,
-                    hex_char);
-    if (Settings.flag3.tuya_serial_mqtt_publish) {
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-      XdrvRulesProcess();
-    } else {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
-    }
-  }
-
-  static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
-                                uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
-                                uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
-                                uint32_t timestamp) {
-    uint32_t i = offset;
-    ZCLHeaderFrameControl_t frame_control;
-    uint16_t manuf_code = 0;
-    uint8_t transact_seq;
-    uint8_t cmd_id;
-
-    frame_control.d8 = buf.get8(i++);
-    if (frame_control.b.manuf_specific) {
-      manuf_code = buf.get16(i);
-      i += 2;
-    }
-    transact_seq = buf.get8(i++);
-    cmd_id = buf.get8(i++);
-    ZCLFrame zcl_frame(frame_control.d8, manuf_code, transact_seq, cmd_id,
-                       (const char *)(buf.buf() + i), len + offset - i,
-                       clusterid, groupid,
-                       srcaddr, srcendpoint, dstendpoint, wasbroadcast,
-                       linkquality, securityuse, seqnumber,
-                       timestamp);
-    return zcl_frame;
-  }
-
-  bool isClusterSpecificCommand(void) {
-    return _frame_control.b.frame_type & 1;
-  }
-
-  static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
-  void parseRawAttributes(JsonObject& json, uint8_t offset = 0);
-  void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
-  void parseClusterSpecificCommand(JsonObject& json, uint8_t offset = 0);
-  void postProcessAttributes(uint16_t shortaddr, JsonObject& json);
-
-  inline void setGroupId(uint16_t groupid) {
-    _group_id = groupid;
-  }
-
-  inline void setClusterId(uint16_t clusterid) {
-    _cluster_id = clusterid;
-  }
-
-  inline uint8_t getCmdId(void) const {
-    return _cmd_id;
-  }
-
-  inline uint16_t getClusterId(void) const {
-    return _cluster_id;
-  }
-
-  inline uint16_t getSrcEndpoint(void) const {
-    return _srcendpoint;
-  }
-
-  const SBuffer &getPayload(void) const {
-    return _payload;
-  }
-
-  uint16_t getManufCode(void) const {
-    return _manuf_code;
-  }
-
-private:
-  ZCLHeaderFrameControl_t _frame_control = { .d8 = 0 };
-  uint16_t _manuf_code = 0;
-  uint8_t _transact_seq = 0;
-  uint8_t _cmd_id = 0;
-  uint16_t _cluster_id = 0;
-  uint16_t _group_id = 0;
-  SBuffer _payload;
-
-  uint16_t _srcaddr;
-  uint8_t _srcendpoint;
-  uint8_t _dstendpoint;
-  uint8_t _wasbroadcast;
-  uint8_t _linkquality;
-  uint8_t _securityuse;
-  uint8_t _seqnumber;
-  uint32_t _timestamp;
-};
-
-
-
-
-
-
-uint8_t toPercentageCR2032(uint32_t voltage) {
-  uint32_t percentage;
-  if (voltage < 2100) {
-      percentage = 0;
-  } else if (voltage < 2440) {
-      percentage = 6 - ((2440 - voltage) * 6) / 340;
-  } else if (voltage < 2740) {
-      percentage = 18 - ((2740 - voltage) * 12) / 300;
-  } else if (voltage < 2900) {
-      percentage = 42 - ((2900 - voltage) * 24) / 160;
-  } else if (voltage < 3000) {
-      percentage = 100 - ((3000 - voltage) * 58) / 100;
-  } else if (voltage >= 3000) {
-      percentage = 100;
-  }
-  return percentage;
-}
-
-
-uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
-                              uint32_t offset, uint32_t len) {
-
-  uint32_t i = offset;
-  uint32_t attrtype = buf.get8(i++);
-
-
-  json[attrid_str] = (char*) nullptr;
-
-
-  switch (attrtype) {
-    case 0x00:
-    case 0xFF:
-      break;
-    case 0x10:
-      {
-        uint8_t val_bool = buf.get8(i++);
-        if (0xFF != val_bool) {
-          json[attrid_str] = (bool) (val_bool ? true : false);
-        }
-      }
-      break;
-    case 0x20:
-      {
-        uint8_t uint8_val = buf.get8(i);
-        i += 1;
-        if (0xFF != uint8_val) {
-          json[attrid_str] = uint8_val;
-        }
-      }
-      break;
-    case 0x21:
-      {
-        uint16_t uint16_val = buf.get16(i);
-        i += 2;
-        if (0xFFFF != uint16_val) {
-          json[attrid_str] = uint16_val;
-        }
-      }
-      break;
-    case 0x23:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        i += 4;
-        if (0xFFFFFFFF != uint32_val) {
-          json[attrid_str] = uint32_val;
-        }
-      }
-      break;
-
-    case 0x24:
-    case 0x25:
-    case 0x26:
-    case 0x27:
-      {
-        uint8_t len = attrtype - 0x1F;
-
-        char hex[2*len+1];
-        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-        json[attrid_str] = hex;
-        i += len;
-      }
-      break;
-    case 0x28:
-      {
-        int8_t int8_val = buf.get8(i);
-        i += 1;
-        if (0x80 != int8_val) {
-          json[attrid_str] = int8_val;
-        }
-      }
-      break;
-    case 0x29:
-      {
-        int16_t int16_val = buf.get16(i);
-        i += 2;
-        if (0x8000 != int16_val) {
-          json[attrid_str] = int16_val;
-        }
-      }
-      break;
-    case 0x2B:
-      {
-        int32_t int32_val = buf.get32(i);
-        i += 4;
-        if (0x80000000 != int32_val) {
-          json[attrid_str] = int32_val;
-        }
-      }
-      break;
-
-    case 0x2C:
-    case 0x2D:
-    case 0x2E:
-    case 0x2F:
-      {
-        uint8_t len = attrtype - 0x27;
-
-        char hex[2*len+1];
-        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-        json[attrid_str] = hex;
-        i += len;
-      }
-      break;
-
-    case 0x41:
-    case 0x42:
-    case 0x43:
-    case 0x44:
-
-      {
-        bool parse_as_string = true;
-        uint32_t len = (attrtype <= 0x42) ? buf.get8(i) : buf.get16(i);
-        i += (attrtype <= 0x42) ? 1 : 2;
-        if (i + len > buf.len()) {
-          len = buf.len() - i;
-        }
-
-
-        if ((0x41 == attrtype) || (0x43 == attrtype)) { parse_as_string = false; }
-# 318 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-        if (parse_as_string) {
-          char str[len+1];
-          strncpy(str, buf.charptr(i), len);
-          str[len] = 0x00;
-          json[attrid_str] = str;
-        } else {
-
-          char hex[2*len+1];
-          ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-          json[attrid_str] = hex;
-        }
-
-        i += len;
-        break;
-      }
-      i += buf.get8(i) + 1;
-      break;
-
-    case 0x08:
-    case 0x18:
-      {
-        uint8_t uint8_val = buf.get8(i);
-        i += 1;
-        json[attrid_str] = uint8_val;
-      }
-      break;
-    case 0x09:
-    case 0x19:
-      {
-        uint16_t uint16_val = buf.get16(i);
-        i += 2;
-        json[attrid_str] = uint16_val;
-      }
-      break;
-    case 0x0B:
-    case 0x1B:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        i += 4;
-        json[attrid_str] = uint32_val;
-      }
-      break;
-
-    case 0x30:
-    case 0x31:
-      i += attrtype - 0x2F;
-      break;
-
-
-    case 0x39:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        float * float_val = (float*) &uint32_val;
-        i += 4;
-        json[attrid_str] = *float_val;
-      }
-      break;
-
-    case 0xE0:
-    case 0xE1:
-    case 0xE2:
-      i += 4;
-      break;
-
-    case 0xE8:
-    case 0xE9:
-      i += 2;
-      break;
-    case 0xEA:
-      i += 4;
-      break;
-
-    case 0xF0:
-      i += 8;
-      break;
-    case 0xF1:
-      i += 16;
-      break;
-
-
-    case 0x0A:
-    case 0x0C:
-    case 0x0D:
-    case 0x0E:
-    case 0x0F:
-      i += attrtype - 0x07;
-      break;
-
-    case 0x1A:
-    case 0x1C:
-    case 0x1D:
-    case 0x1E:
-    case 0x1F:
-      i += attrtype - 0x17;
-      break;
-
-    case 0x38:
-      i += 2;
-      break;
-    case 0x3A:
-      {
-        uint64_t uint64_val = buf.get64(i);
-        double * double_val = (double*) &uint64_val;
-        i += 8;
-        json[attrid_str] = *double_val;
-      }
-      break;
-  }
-
-
-
-
-
-
-  return i - offset;
-}
-
-
-void ZCLFrame::generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len) {
-  uint32_t suffix = 1;
-
-  snprintf_P(key, key_len, PSTR("%04X/%04X"), cluster, attr);
-  while (json.containsKey(key)) {
-    suffix++;
-    snprintf_P(key, key_len, PSTR("%04X/%04X+%d"), cluster, attr, suffix);
-  }
-}
-
-
-void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  while (len >= i + 3) {
-    uint16_t attrid = _payload.get16(i);
-    i += 2;
-
-    char key[16];
-    generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
-
-
-    if ((0x0000 == _cluster_id) && (0xFF01 == attrid)) {
-      if (0x42 == _payload.get8(i)) {
-        _payload.set8(i, 0x41);
-      }
-    }
-    i += parseSingleAttribute(json, key, _payload, i, len);
-  }
-}
-
-
-void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  while (len - i >= 4) {
-    uint16_t attrid = _payload.get16(i);
-    i += 2;
-    uint8_t status = _payload.get8(i++);
-
-    if (0 == status) {
-      char key[16];
-      generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
-
-      i += parseSingleAttribute(json, key, _payload, i, len);
-    }
-  }
-}
-
-
-
-
-void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  char attrid_str[12];
-  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cluster_id, _cmd_id);
-
-  char hex_char[_payload.len()*2+2];
-  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-
-  json[attrid_str] = hex_char;
-}
-
-
-
-
-typedef int32_t (*Z_AttrConverter)(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-typedef struct Z_AttributeConverter {
-  uint16_t cluster;
-  uint16_t attribute;
-  const char * name;
-  Z_AttrConverter func;
-} Z_AttributeConverter;
-
-
-const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
-  { 0x0000, 0x0000, "ZCLVersion", &Z_Copy },
-  { 0x0000, 0x0001, "AppVersion", &Z_Copy },
-  { 0x0000, 0x0002, "StackVersion", &Z_Copy },
-  { 0x0000, 0x0003, "HWVersion", &Z_Copy },
-  { 0x0000, 0x0004, "Manufacturer", &Z_ManufKeep },
-  { 0x0000, 0x0005, D_JSON_MODEL D_JSON_ID, &Z_ModelKeep },
-  { 0x0000, 0x0006, "DateCode", &Z_Copy },
-  { 0x0000, 0x0007, "PowerSource", &Z_Copy },
-  { 0x0000, 0x4000, "SWBuildID", &Z_Copy },
-  { 0x0000, 0xFFFF, nullptr, &Z_Remove },
-
-  { 0x0000, 0xFF01, nullptr, &Z_AqaraSensor },
-
-
-  { 0x0001, 0x0000, "MainsVoltage", &Z_Copy },
-  { 0x0001, 0x0001, "MainsFrequency", &Z_Copy },
-  { 0x0001, 0x0020, "BatteryVoltage", &Z_Copy },
-  { 0x0001, 0x0021, "BatteryPercentageRemaining",&Z_Copy },
-
-
-  { 0x0002, 0x0000, "CurrentTemperature", &Z_Copy },
-  { 0x0002, 0x0001, "MinTempExperienced", &Z_Copy },
-  { 0x0002, 0x0002, "MaxTempExperienced", &Z_Copy },
-  { 0x0002, 0x0003, "OverTempTotalDwell", &Z_Copy },
-
-
-  { 0x0006, 0x0000, "Power", &Z_Copy },
-  { 0x0006, 0x8000, "Power", &Z_Copy },
-
-
-  { 0x0007, 0x0000, "SwitchType", &Z_Copy },
-
-
-  { 0x0008, 0x0000, "Dimmer", &Z_Copy },
-# 558 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-  { 0x0009, 0x0000, "AlarmCount", &Z_Copy },
-
-  { 0x000A, 0x0000, "Time", &Z_Copy },
-  { 0x000A, 0x0001, "TimeStatus", &Z_Copy },
-  { 0x000A, 0x0002, "TimeZone", &Z_Copy },
-  { 0x000A, 0x0003, "DstStart", &Z_Copy },
-  { 0x000A, 0x0004, "DstStart", &Z_Copy },
-  { 0x000A, 0x0005, "DstShift", &Z_Copy },
-  { 0x000A, 0x0006, "StandardTime", &Z_Copy },
-  { 0x000A, 0x0007, "LocalTime", &Z_Copy },
-  { 0x000A, 0x0008, "LastSetTime", &Z_Copy },
-  { 0x000A, 0x0009, "ValidUntilTime", &Z_Copy },
-
-  { 0x000B, 0x0000, "LocationType", &Z_Copy },
-  { 0x000B, 0x0000, "LocationMethod", &Z_Copy },
-  { 0x000B, 0x0000, "LocationAge", &Z_Copy },
-  { 0x000B, 0x0000, "QualityMeasure", &Z_Copy },
-  { 0x000B, 0x0000, "NumberOfDevices", &Z_Copy },
-
-  { 0x000C, 0x0004, "ActiveText", &Z_Copy },
-  { 0x000C, 0x001C, "Description", &Z_Copy },
-  { 0x000C, 0x002E, "InactiveText", &Z_Copy },
-  { 0x000C, 0x0041, "MaxPresentValue", &Z_Copy },
-  { 0x000C, 0x0045, "MinPresentValue", &Z_Copy },
-  { 0x000C, 0x0051, "OutOfService", &Z_Copy },
-  { 0x000C, 0x0055, "AqaraRotate", &Z_Copy },
-  { 0x000C, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x000C, 0x0067, "Reliability", &Z_Copy },
-  { 0x000C, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x000C, 0x006A, "Resolution", &Z_Copy },
-  { 0x000C, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x000C, 0x0075, "EngineeringUnits", &Z_Copy },
-  { 0x000C, 0x0100, "ApplicationType", &Z_Copy },
-  { 0x000C, 0xFF05, "Aqara_FF05", &Z_Copy },
-
-  { 0x0010, 0x0004, "ActiveText", &Z_Copy },
-  { 0x0010, 0x001C, "Description", &Z_Copy },
-  { 0x0010, 0x002E, "InactiveText", &Z_Copy },
-  { 0x0010, 0x0042, "MinimumOffTime", &Z_Copy },
-  { 0x0010, 0x0043, "MinimumOnTime", &Z_Copy },
-  { 0x0010, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0010, 0x0054, "Polarity", &Z_Copy },
-  { 0x0010, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0010, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0010, 0x0067, "Reliability", &Z_Copy },
-  { 0x0010, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0010, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0010, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0011, 0x0004, "ActiveText", &Z_Copy },
-  { 0x0011, 0x001C, "Description", &Z_Copy },
-  { 0x0011, 0x002E, "InactiveText", &Z_Copy },
-  { 0x0011, 0x0042, "MinimumOffTime", &Z_Copy },
-  { 0x0011, 0x0043, "MinimumOnTime", &Z_Copy },
-  { 0x0011, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0011, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0011, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0011, 0x0067, "Reliability", &Z_Copy },
-  { 0x0011, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0011, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0011, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0012, 0x000E, "StateText", &Z_Copy },
-  { 0x0012, 0x001C, "Description", &Z_Copy },
-  { 0x0012, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0012, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0012, 0x0055, "PresentValue", &Z_AqaraCube },
-  { 0x0012, 0x0067, "Reliability", &Z_Copy },
-  { 0x0012, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0012, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0013, 0x000E, "StateText", &Z_Copy },
-  { 0x0013, 0x001C, "Description", &Z_Copy },
-  { 0x0013, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0013, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0013, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0013, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0013, 0x0067, "Reliability", &Z_Copy },
-  { 0x0013, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0013, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0013, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0014, 0x000E, "StateText", &Z_Copy },
-  { 0x0014, 0x001C, "Description", &Z_Copy },
-  { 0x0014, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0014, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0014, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0014, 0x0067, "Reliability", &Z_Copy },
-  { 0x0014, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0014, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0014, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x001A, 0x0000, "TotalProfileNum", &Z_Copy },
-  { 0x001A, 0x0001, "MultipleScheduling", &Z_Copy },
-  { 0x001A, 0x0002, "EnergyFormatting", &Z_Copy },
-  { 0x001A, 0x0003, "EnergyRemote", &Z_Copy },
-  { 0x001A, 0x0004, "ScheduleMode", &Z_Copy },
-
-  { 0x0020, 0x0000, "CheckinInterval", &Z_Copy },
-  { 0x0020, 0x0001, "LongPollInterval", &Z_Copy },
-  { 0x0020, 0x0002, "ShortPollInterval", &Z_Copy },
-  { 0x0020, 0x0003, "FastPollTimeout", &Z_Copy },
-  { 0x0020, 0x0004, "CheckinIntervalMin", &Z_Copy },
-  { 0x0020, 0x0005, "LongPollIntervalMin", &Z_Copy },
-  { 0x0020, 0x0006, "FastPollTimeoutMax", &Z_Copy },
-
-  { 0x0100, 0x0000, "PhysicalClosedLimit", &Z_Copy },
-  { 0x0100, 0x0001, "MotorStepSize", &Z_Copy },
-  { 0x0100, 0x0002, "Status", &Z_Copy },
-  { 0x0100, 0x0010, "ClosedLimit", &Z_Copy },
-  { 0x0100, 0x0011, "Mode", &Z_Copy },
-
-  { 0x0101, 0x0000, "LockState", &Z_Copy },
-  { 0x0101, 0x0001, "LockType", &Z_Copy },
-  { 0x0101, 0x0002, "ActuatorEnabled", &Z_Copy },
-  { 0x0101, 0x0003, "DoorState", &Z_Copy },
-  { 0x0101, 0x0004, "DoorOpenEvents", &Z_Copy },
-  { 0x0101, 0x0005, "DoorClosedEvents", &Z_Copy },
-  { 0x0101, 0x0006, "OpenPeriod", &Z_Copy },
-
-  { 0x0101, 0x0055, "AqaraVibrationMode", &Z_AqaraVibration },
-  { 0x0101, 0x0503, "AqaraVibrationsOrAngle", &Z_Copy },
-  { 0x0101, 0x0505, "AqaraVibration505", &Z_Copy },
-  { 0x0101, 0x0508, "AqaraAccelerometer", &Z_AqaraVibration },
-
-  { 0x0102, 0x0000, "WindowCoveringType", &Z_Copy },
-  { 0x0102, 0x0001, "PhysicalClosedLimitLift",&Z_Copy },
-  { 0x0102, 0x0002, "PhysicalClosedLimitTilt",&Z_Copy },
-  { 0x0102, 0x0003, "CurrentPositionLift", &Z_Copy },
-  { 0x0102, 0x0004, "CurrentPositionTilt", &Z_Copy },
-  { 0x0102, 0x0005, "NumberofActuationsLift",&Z_Copy },
-  { 0x0102, 0x0006, "NumberofActuationsTilt",&Z_Copy },
-  { 0x0102, 0x0007, "ConfigStatus", &Z_Copy },
-  { 0x0102, 0x0008, "CurrentPositionLiftPercentage",&Z_Copy },
-  { 0x0102, 0x0009, "CurrentPositionTiltPercentage",&Z_Copy },
-  { 0x0102, 0x0010, "InstalledOpenLimitLift",&Z_Copy },
-  { 0x0102, 0x0011, "InstalledClosedLimitLift",&Z_Copy },
-  { 0x0102, 0x0012, "InstalledOpenLimitTilt", &Z_Copy },
-  { 0x0102, 0x0013, "InstalledClosedLimitTilt", &Z_Copy },
-  { 0x0102, 0x0014, "VelocityLift",&Z_Copy },
-  { 0x0102, 0x0015, "AccelerationTimeLift",&Z_Copy },
-  { 0x0102, 0x0016, "DecelerationTimeLift", &Z_Copy },
-  { 0x0102, 0x0017, "Mode",&Z_Copy },
-  { 0x0102, 0x0018, "IntermediateSetpointsLift",&Z_Copy },
-  { 0x0102, 0x0019, "IntermediateSetpointsTilt",&Z_Copy },
-
-
-  { 0x0300, 0x0000, "Hue", &Z_Copy },
-  { 0x0300, 0x0001, "Sat", &Z_Copy },
-  { 0x0300, 0x0002, "RemainingTime", &Z_Copy },
-  { 0x0300, 0x0003, "X", &Z_Copy },
-  { 0x0300, 0x0004, "Y", &Z_Copy },
-  { 0x0300, 0x0005, "DriftCompensation", &Z_Copy },
-  { 0x0300, 0x0006, "CompensationText", &Z_Copy },
-  { 0x0300, 0x0007, "CT", &Z_Copy },
-  { 0x0300, 0x0008, "ColorMode", &Z_Copy },
-  { 0x0300, 0x0010, "NumberOfPrimaries", &Z_Copy },
-  { 0x0300, 0x0011, "Primary1X", &Z_Copy },
-  { 0x0300, 0x0012, "Primary1Y", &Z_Copy },
-  { 0x0300, 0x0013, "Primary1Intensity", &Z_Copy },
-  { 0x0300, 0x0015, "Primary2X", &Z_Copy },
-  { 0x0300, 0x0016, "Primary2Y", &Z_Copy },
-  { 0x0300, 0x0017, "Primary2Intensity", &Z_Copy },
-  { 0x0300, 0x0019, "Primary3X", &Z_Copy },
-  { 0x0300, 0x001A, "Primary3Y", &Z_Copy },
-  { 0x0300, 0x001B, "Primary3Intensity", &Z_Copy },
-  { 0x0300, 0x0030, "WhitePointX", &Z_Copy },
-  { 0x0300, 0x0031, "WhitePointY", &Z_Copy },
-  { 0x0300, 0x0032, "ColorPointRX", &Z_Copy },
-  { 0x0300, 0x0033, "ColorPointRY", &Z_Copy },
-  { 0x0300, 0x0034, "ColorPointRIntensity", &Z_Copy },
-  { 0x0300, 0x0036, "ColorPointGX", &Z_Copy },
-  { 0x0300, 0x0037, "ColorPointGY", &Z_Copy },
-  { 0x0300, 0x0038, "ColorPointGIntensity", &Z_Copy },
-  { 0x0300, 0x003A, "ColorPointBX", &Z_Copy },
-  { 0x0300, 0x003B, "ColorPointBY", &Z_Copy },
-  { 0x0300, 0x003C, "ColorPointBIntensity", &Z_Copy },
-
-
-  { 0x0400, 0x0000, D_JSON_ILLUMINANCE, &Z_Copy },
-  { 0x0400, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0400, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0400, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0400, 0x0004, "LightSensorType", &Z_Copy },
-  { 0x0400, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0401, 0x0000, "LevelStatus", &Z_Copy },
-  { 0x0401, 0x0001, "LightSensorType", &Z_Copy },
-  { 0x0401, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0402, 0x0000, D_JSON_TEMPERATURE, &Z_FloatDiv100 },
-  { 0x0402, 0x0001, "MinMeasuredValue", &Z_FloatDiv100 },
-  { 0x0402, 0x0002, "MaxMeasuredValue", &Z_FloatDiv100 },
-  { 0x0402, 0x0003, "Tolerance", &Z_FloatDiv100 },
-  { 0x0402, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0403, 0x0000, D_JSON_PRESSURE_UNIT, &Z_AddPressureUnit },
-  { 0x0403, 0x0000, D_JSON_PRESSURE, &Z_Copy },
-  { 0x0403, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0403, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0403, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0403, 0x0010, "ScaledValue", &Z_Copy },
-  { 0x0403, 0x0011, "MinScaledValue", &Z_Copy },
-  { 0x0403, 0x0012, "MaxScaledValue", &Z_Copy },
-  { 0x0403, 0x0013, "ScaledTolerance", &Z_Copy },
-  { 0x0403, 0x0014, "Scale", &Z_Copy },
-  { 0x0403, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0404, 0x0000, D_JSON_FLOWRATE, &Z_FloatDiv10 },
-  { 0x0404, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0404, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0404, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0404, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0405, 0x0000, D_JSON_HUMIDITY, &Z_FloatDiv100 },
-  { 0x0405, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0405, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0405, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0405, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0406, 0x0000, OCCUPANCY, &Z_Copy },
-  { 0x0406, 0x0001, "OccupancySensorType", &Z_Copy },
-  { 0x0406, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0B01, 0x0000, "CompanyName", &Z_Copy },
-  { 0x0B01, 0x0001, "MeterTypeID", &Z_Copy },
-  { 0x0B01, 0x0004, "DataQualityID", &Z_Copy },
-  { 0x0B01, 0x0005, "CustomerName", &Z_Copy },
-  { 0x0B01, 0x0006, "Model", &Z_Copy },
-  { 0x0B01, 0x0007, "PartNumber", &Z_Copy },
-  { 0x0B01, 0x000A, "SoftwareRevision", &Z_Copy },
-  { 0x0B01, 0x000C, "POD", &Z_Copy },
-  { 0x0B01, 0x000D, "AvailablePower", &Z_Copy },
-  { 0x0B01, 0x000E, "PowerThreshold", &Z_Copy },
-
-
-  { 0x0B05, 0x0000, "NumberOfResets", &Z_Copy },
-  { 0x0B05, 0x0001, "PersistentMemoryWrites",&Z_Copy },
-  { 0x0B05, 0x011C, "LastMessageLQI", &Z_Copy },
-  { 0x0B05, 0x011D, "LastMessageRSSI", &Z_Copy },
-
-};
-
-
-
-int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  zigbee_devices.setManufId(shortaddr, value.as<const char*>());
-  return 1;
-}
-
-int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  zigbee_devices.setModelId(shortaddr, value.as<const char*>());
-  return 1;
-}
-
-
-
-int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  return 1;
-}
-
-
-int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  return 1;
-}
-
-
-int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = F(D_UNIT_PRESSURE);
-  return 0;
-}
-
-
-int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = ((float)value) / 100.0f;
-  return 1;
-}
-
-int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = ((float)value) / 10.0f;
-  return 1;
-}
-
-
-int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-  json[F(OCCUPANCY)] = 0;
-  zigbee_devices.jsonPublishNow(shortaddr, json);
-}
-
-
-int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  int32_t val = value;
-  const __FlashStringHelper *aqara_cube = F("AqaraCube");
-  const __FlashStringHelper *aqara_cube_side = F("AqaraCubeSide");
-  const __FlashStringHelper *aqara_cube_from_side = F("AqaraCubeFromSide");
-
-  switch (val) {
-    case 0:
-      json[aqara_cube] = F("shake");
-      break;
-    case 2:
-      json[aqara_cube] = F("wakeup");
-      break;
-    case 3:
-      json[aqara_cube] = F("fall");
-      break;
-    case 64 ... 127:
-      json[aqara_cube] = F("flip90");
-      json[aqara_cube_side] = val % 8;
-      json[aqara_cube_from_side] = (val - 64) / 8;
-      break;
-    case 128 ... 132:
-      json[aqara_cube] = F("flip180");
-      json[aqara_cube_side] = val - 128;
-      break;
-    case 256 ... 261:
-      json[aqara_cube] = F("slide");
-      json[aqara_cube_side] = val - 256;
-      break;
-    case 512 ... 517:
-      json[aqara_cube] = F("tap");
-      json[aqara_cube_side] = val - 512;
-      break;
-  }
-# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-  return 1;
-}
-
-
-int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-
-  switch (attr) {
-    case 0x0055:
-      {
-        int32_t ivalue = value;
-        const __FlashStringHelper * svalue;
-        switch (ivalue) {
-          case 1: svalue = F("vibrate"); break;
-          case 2: svalue = F("tilt"); break;
-          case 3: svalue = F("drop"); break;
-          default: svalue = F("unknown"); break;
-        }
-        json[new_name] = svalue;
-      }
-      break;
-
-
-
-
-    case 0x0508:
-      {
-
-
-        String hex = value;
-        SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
-        int16_t x, y, z;
-        z = buf2.get16(0);
-        y = buf2.get16(2);
-        x = buf2.get16(4);
-        JsonArray& xyz = json.createNestedArray(new_name);
-        xyz.add(x);
-        xyz.add(y);
-        xyz.add(z);
-
-        float X = x;
-        float Y = y;
-        float Z = z;
-        int32_t Angle_X = 0.5f + atanf(X/sqrtf(z*z+y*y)) * f_180pi;
-        int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(x*x+z*z)) * f_180pi;
-        int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(x*x+y*y)) * f_180pi;
-
-
-
-        JsonArray& angles = json.createNestedArray(F("AqaraAngles"));
-        angles.add(Angle_X);
-        angles.add(Angle_Y);
-        angles.add(Angle_Z);
-      }
-      break;
-  }
-  return 1;
-}
-
-int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  String hex = value;
-  SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
-  uint32_t i = 0;
-  uint32_t len = buf2.len();
-  char tmp[] = "tmp";
-
-  JsonVariant sub_value;
-
-  while (len - i >= 2) {
-    uint8_t attrid = buf2.get8(i++);
-
-    i += parseSingleAttribute(json, tmp, buf2, i, len);
-    float val = json[tmp];
-    json.remove(tmp);
-    if (0x01 == attrid) {
-      json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
-      json[F("Battery")] = toPercentageCR2032(val);
-    } else if (0 == zcl->getManufCode()) {
-
-      if (0x64 == attrid) {
-        json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
-      } else if (0x65 == attrid) {
-        json[F(D_JSON_HUMIDITY)] = val / 100.0f;
-      } else if (0x66 == attrid) {
-        json[F(D_JSON_PRESSURE)] = val / 100.0f;
-        json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);
-      } else if (0x01 == attrid) {
-        json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
-        json[F("Battery")] = toPercentageCR2032(val);
-      }
-    } else if (0x115F == zcl->getManufCode()) {
-
-      json[F("AqaraUnknown")] = val;
-    }
-  }
-  return 1;
-}
-
-
-void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
-
-  for (auto kv : json) {
-    String key_string = kv.key;
-    const char * key = key_string.c_str();
-    JsonVariant& value = kv.value;
-
-    char * delimiter = strchr(key, '/');
-    char * delimiter2 = strchr(key, '+');
-    if (delimiter) {
-      uint16_t attribute;
-      uint16_t suffix = 1;
-      uint16_t cluster = strtoul(key, &delimiter, 16);
-      if (!delimiter2) {
-        attribute = strtoul(delimiter+1, nullptr, 16);
-      } else {
-        attribute = strtoul(delimiter+1, &delimiter2, 16);
-        suffix = strtoul(delimiter2+1, nullptr, 10);
-      }
-
-
-      for (uint32_t i = 0; i < sizeof(Z_PostProcess) / sizeof(Z_PostProcess[0]); i++) {
-        const Z_AttributeConverter *converter = &Z_PostProcess[i];
-        uint16_t conv_cluster = pgm_read_word(&converter->cluster);
-        uint16_t conv_attribute = pgm_read_word(&converter->attribute);
-
-        if ((conv_cluster == cluster) &&
-            ((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) {
-          String new_name_str = converter->name;
-          if (suffix > 1) { new_name_str += suffix; }
-          int32_t drop = (*converter->func)(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute);
-          if (drop) {
-            json.remove(key);
-          }
-
-        }
-      }
-    }
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
-#ifdef USE_ZIGBEE
-
-
-typedef struct Z_CommandConverter {
-  const char * tasmota_cmd;
-  const char * zcl_cmd;
-} Z_CommandConverter;
-
-
-const Z_CommandConverter Z_Commands[] = {
-  { "Power", "0006!xx" },
-  { "Dimmer", "0008!04/xx0A00" },
-  { "Dimmer+", "0008!06/001902" },
-  { "Dimmer-", "0008!06/011902" },
-  { "DimmerStop", "0008!03" },
-  { "ResetAlarm", "0009!00/xxyyyy" },
-  { "ResetAllAlarms","0009!01" },
-  { "Hue", "0300!00/xx000A00" },
-  { "Sat", "0300!03/xx0A00" },
-  { "HueSat", "0300!06/xxyy0A00" },
-  { "Color", "0300!07/xxxxyyyy0A00" },
-  { "CT", "0300!0A/xxxx0A00" },
-  { "Shutter", "0102!xx" },
-  { "ShutterOpen", "0102!00" },
-  { "ShutterClose", "0102!01" },
-  { "ShutterStop", "0102!02" },
-  { "ShutterLift", "0102!05xx" },
-  { "ShutterTilt", "0102!08xx" },
-};
-
-#define ZLE(x) ((x) & 0xFF), ((x) >> 8)
-
-
-const uint8_t CLUSTER_0006[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };
-
-int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  size_t attrs_len = 0;
-  const uint8_t* attrs = nullptr;
-
-  switch (cluster) {
-    case 0x0006:
-      attrs = CLUSTER_0006;
-      attrs_len = sizeof(CLUSTER_0006);
-      break;
-    case 0x0008:
-      attrs = CLUSTER_0008;
-      attrs_len = sizeof(CLUSTER_0008);
-      break;
-    case 0x0009:
-      attrs = CLUSTER_0009;
-      attrs_len = sizeof(CLUSTER_0009);
-      break;
-    case 0x0300:
-      attrs = CLUSTER_0300;
-      attrs_len = sizeof(CLUSTER_0300);
-      break;
-  }
-  if (attrs) {
-    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false );
-  }
-}
-
-
-
-void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
-  uint32_t wait_ms = 0;
-
-  switch (cluster) {
-    case 0x0006:
-    case 0x0009:
-      wait_ms = 200;
-      break;
-    case 0x0008:
-    case 0x0300:
-      wait_ms = 1050;
-      break;
-    case 0x0102:
-      wait_ms = 10000;
-      break;
-  }
-  if (wait_ms) {
-    zigbee_devices.setTimer(shortaddr, wait_ms, cluster, endpoint, 0 , &Z_ReadAttrCallback);
-  }
-}
-
-const __FlashStringHelper* zigbeeFindCommand(const char *command) {
-  char parm_uc[16];
-  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
-    const Z_CommandConverter *conv = &Z_Commands[i];
-    if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
-      return (const __FlashStringHelper*) conv->zcl_cmd;
-    }
-  }
-
-  return nullptr;
-}
-
-inline bool isXYZ(char c) {
-  return (c >= 'x') && (c <= 'z');
-}
-
-
-inline char hexDigit(uint32_t h) {
-  uint32_t nybble = h & 0x0F;
-  return (nybble > 9) ? 'A' - 10 + nybble : '0' + nybble;
-}
-
-
-String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z) {
-  size_t len = strlen_P(zcl_cmd_P);
-  char zcl_cmd[len+1];
-  strcpy_P(zcl_cmd, zcl_cmd_P);
-
-  char *p = zcl_cmd;
-  while (*p) {
-    if (isXYZ(*p) && (*p == *(p+1))) {
-      uint8_t val;
-      switch (*p) {
-        case 'x':
-          val = x & 0xFF;
-          x = x >> 8;
-          break;
-        case 'y':
-          val = y & 0xFF;
-          y = y >> 8;
-          break;
-        case 'z':
-          val = z & 0xFF;
-          z = z >> 8;
-          break;
-      }
-      *p = hexDigit(val >> 4);
-      *(p+1) = hexDigit(val);
-      p++;
-    }
-    p++;
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SendZCLCommand_P: zcl_cmd = %s"), zcl_cmd);
-
-  return String(zcl_cmd);
-}
-
-const char kZ_Alias[] PROGMEM = "OFF|" D_OFF "|" D_FALSE "|" D_STOP "|" "OPEN" "|"
-                                "ON|" D_ON "|" D_TRUE "|" D_START "|" "CLOSE" "|"
-                                "TOGGLE|" D_TOGGLE "|"
-                                "ALL" ;
-
-const uint8_t kZ_Numbers[] PROGMEM = { 0,0,0,0,0,
-                                       1,1,1,1,1,
-                                       2,2,
-                                       255 };
-
-
-uint32_t ZigbeeAliasOrNumber(const char *state_text) {
-  char command[16];
-  int state_number = GetCommandCode(command, sizeof(command), state_text, kZ_Alias);
-  if (state_number >= 0) {
-
-    return pgm_read_byte(kZ_Numbers + state_number);
-  } else {
-
-    return strtoul(state_text, nullptr, 0);
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-#ifdef USE_ZIGBEE
-
-
-
-const uint8_t ZIGBEE_STATUS_OK = 0;
-const uint8_t ZIGBEE_STATUS_BOOT = 1;
-const uint8_t ZIGBEE_STATUS_RESET_CONF = 2;
-const uint8_t ZIGBEE_STATUS_STARTING = 3;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_CLOSE = 20;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_60 = 21;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_XX = 22;
-const uint8_t ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;
-const uint8_t ZIGBEE_STATUS_NODE_DESC = 31;
-const uint8_t ZIGBEE_STATUS_ACTIVE_EP = 32;
-const uint8_t ZIGBEE_STATUS_SIMPLE_DESC = 33;
-const uint8_t ZIGBEE_STATUS_DEVICE_INDICATION = 34;
-const uint8_t ZIGBEE_STATUS_CC_VERSION = 50;
-const uint8_t ZIGBEE_STATUS_CC_INFO = 51;
-const uint8_t ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;
-const uint8_t ZIGBEE_STATUS_ABORT = 99;
-
-typedef int32_t (*ZB_Func)(uint8_t value);
-typedef int32_t (*ZB_RecvMsgFunc)(int32_t res, const class SBuffer &buf);
-
-typedef union Zigbee_Instruction {
-  struct {
-    uint8_t i;
-    uint8_t d8;
-    uint16_t d16;
-  } i;
-  const void *p;
-
-
-
-} Zigbee_Instruction;
-
-
-
-
-typedef struct Zigbee_Instruction_Type {
-  uint8_t instr;
-  uint8_t data;
-} Zigbee_Instruction_Type;
-
-enum Zigbee_StateMachine_Instruction_Set {
-
-  ZGB_INSTR_4_BYTES = 0,
-  ZGB_INSTR_NOOP = 0,
-  ZGB_INSTR_LABEL,
-  ZGB_INSTR_GOTO,
-  ZGB_INSTR_ON_ERROR_GOTO,
-  ZGB_INSTR_ON_TIMEOUT_GOTO,
-  ZGB_INSTR_WAIT,
-  ZGB_INSTR_WAIT_FOREVER,
-  ZGB_INSTR_STOP,
-
-
-  ZGB_INSTR_8_BYTES = 0x80,
-  ZGB_INSTR_CALL = 0x80,
-  ZGB_INSTR_LOG,
-  ZGB_INSTR_MQTT_STATE,
-  ZGB_INSTR_SEND,
-  ZGB_INSTR_WAIT_UNTIL,
-  ZGB_INSTR_WAIT_RECV,
-  ZGB_ON_RECV_UNEXPECTED,
-
-
-  ZGB_INSTR_12_BYTES = 0xF0,
-  ZGB_INSTR_WAIT_RECV_CALL,
-};
-
-#define ZI_NOOP() { .i = { ZGB_INSTR_NOOP, 0x00, 0x0000} },
-#define ZI_LABEL(x) { .i = { ZGB_INSTR_LABEL, (x), 0x0000} },
-#define ZI_GOTO(x) { .i = { ZGB_INSTR_GOTO, (x), 0x0000} },
-#define ZI_ON_ERROR_GOTO(x) { .i = { ZGB_INSTR_ON_ERROR_GOTO, (x), 0x0000} },
-#define ZI_ON_TIMEOUT_GOTO(x) { .i = { ZGB_INSTR_ON_TIMEOUT_GOTO, (x), 0x0000} },
-#define ZI_WAIT(x) { .i = { ZGB_INSTR_WAIT, 0x00, (x)} },
-#define ZI_WAIT_FOREVER() { .i = { ZGB_INSTR_WAIT_FOREVER, 0x00, 0x0000} },
-#define ZI_STOP(x) { .i = { ZGB_INSTR_STOP, (x), 0x0000} },
-
-#define ZI_CALL(f,x) { .i = { ZGB_INSTR_CALL, (x), 0x0000} }, { .p = (const void*)(f) },
-#define ZI_LOG(x,m) { .i = { ZGB_INSTR_LOG, (x), 0x0000 } }, { .p = ((const void*)(m)) },
-#define ZI_MQTT_STATE(x,m) { .i = { ZGB_INSTR_MQTT_STATE, (x), 0x0000 } }, { .p = ((const void*)(m)) },
-#define ZI_ON_RECV_UNEXPECTED(f) { .i = { ZGB_ON_RECV_UNEXPECTED, 0x00, 0x0000} }, { .p = (const void*)(f) },
-#define ZI_SEND(m) { .i = { ZGB_INSTR_SEND, sizeof(m), 0x0000} }, { .p = (const void*)(m) },
-#define ZI_WAIT_RECV(x,m) { .i = { ZGB_INSTR_WAIT_RECV, sizeof(m), (x)} }, { .p = (const void*)(m) },
-#define ZI_WAIT_UNTIL(x,m) { .i = { ZGB_INSTR_WAIT_UNTIL, sizeof(m), (x)} }, { .p = (const void*)(m) },
-#define ZI_WAIT_RECV_FUNC(x,m,f) { .i = { ZGB_INSTR_WAIT_RECV_CALL, sizeof(m), (x)} }, { .p = (const void*)(m) }, { .p = (const void*)(f) },
-
-
-const uint8_t ZIGBEE_LABEL_START = 10;
-const uint8_t ZIGBEE_LABEL_READY = 20;
-const uint8_t ZIGBEE_LABEL_MAIN_LOOP = 21;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_CLOSE = 30;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60 = 31;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX = 32;
-
-const uint8_t ZIGBEE_LABEL_ABORT = 99;
-const uint8_t ZIGBEE_LABEL_UNSUPPORTED_VERSION = 98;
-
-struct ZigbeeStatus {
-  bool active = true;
-  bool state_machine = false;
-  bool state_waiting = false;
-  bool state_no_timeout = false;
-  bool ready = false;
-  uint8_t on_error_goto = ZIGBEE_LABEL_ABORT;
-  uint8_t on_timeout_goto = ZIGBEE_LABEL_ABORT;
-  int16_t pc = 0;
-  uint32_t next_timeout = 0;
-
-  uint8_t *recv_filter = nullptr;
-  bool recv_until = false;
-  size_t recv_filter_len = 0;
-  ZB_RecvMsgFunc recv_func = nullptr;
-  ZB_RecvMsgFunc recv_unexpected = nullptr;
-
-  bool init_phase = true;
-};
-struct ZigbeeStatus zigbee;
-
-SBuffer *zigbee_buffer = nullptr;
-
-
-
-
-
-#define Z_B0(a) (uint8_t)( ((a) ) & 0xFF )
-#define Z_B1(a) (uint8_t)( ((a) >> 8) & 0xFF )
-#define Z_B2(a) (uint8_t)( ((a) >> 16) & 0xFF )
-#define Z_B3(a) (uint8_t)( ((a) >> 24) & 0xFF )
-#define Z_B4(a) (uint8_t)( ((a) >> 32) & 0xFF )
-#define Z_B5(a) (uint8_t)( ((a) >> 40) & 0xFF )
-#define Z_B6(a) (uint8_t)( ((a) >> 48) & 0xFF )
-#define Z_B7(a) (uint8_t)( ((a) >> 56) & 0xFF )
-
-#define ZBM(n,x...) const uint8_t n[] PROGMEM = { x };
-
-#define USE_ZIGBEE_CHANNEL_MASK (1 << (USE_ZIGBEE_CHANNEL))
-
-
-
-ZBM(ZBS_RESET, Z_AREQ | Z_SYS, SYS_RESET, 0x00 )
-ZBM(ZBR_RESET, Z_AREQ | Z_SYS, SYS_RESET_IND )
-
-ZBM(ZBS_VERSION, Z_SREQ | Z_SYS, SYS_VERSION )
-ZBM(ZBR_VERSION, Z_SRSP | Z_SYS, SYS_VERSION )
-
-
-ZBM(ZBS_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_READ, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8, 0x00 )
-ZBM(ZBR_ZNPHC, Z_SRSP | Z_SYS, SYS_OSAL_NV_READ, Z_Success, 0x01 , 0x55)
-
-
-ZBM(ZBS_PAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PANID )
-ZBM(ZBR_PAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PANID, 0x02 ,
-              Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
-
-ZBM(ZBS_EXTPAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_EXTENDED_PAN_ID )
-ZBM(ZBR_EXTPAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_EXTENDED_PAN_ID,
-                0x08 ,
-                Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
-                Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID),
-                )
-
-ZBM(ZBS_CHANN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_CHANLIST )
-ZBM(ZBR_CHANN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_CHANLIST,
-               0x04 ,
-               Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
-               )
-
-ZBM(ZBS_PFGK, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEY )
-ZBM(ZBR_PFGK, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEY,
-              0x10 ,
-              Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
-              Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
-              Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
-              Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
-
-                                                               )
-
-ZBM(ZBS_PFGKEN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEYS_ENABLE )
-ZBM(ZBR_PFGKEN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEYS_ENABLE,
-                0x01 , 0x00 )
-
-
-
-ZBM(ZBR_W_OK, Z_SRSP | Z_SAPI, SAPI_WRITE_CONFIGURATION, Z_Success )
-ZBM(ZBR_WNV_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_WRITE, Z_Success )
-
-
-ZBM(ZBS_FACTRES, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x02 )
-
-ZBM(ZBS_W_PAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PANID, 0x02 , Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
-
-ZBM(ZBS_W_EXTPAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_EXTENDED_PAN_ID, 0x08 ,
-                  Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
-                  Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID)
-                  )
-
-ZBM(ZBS_W_CHANN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_CHANLIST, 0x04 ,
-                Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
-                                           )
-
-ZBM(ZBS_W_LOGTYP, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_LOGICAL_TYPE, 0x01 , 0x00 )
-
-ZBM(ZBS_W_PFGK, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEY,
-                0x10 ,
-                Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
-                Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
-                Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
-                Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
-
-                                                                 )
-
-ZBM(ZBS_W_PFGKEN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEYS_ENABLE, 0x01 , 0x00 )
-
-ZBM(ZBS_WNV_SECMODE, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(CONF_TCLK_TABLE_START), Z_B1(CONF_TCLK_TABLE_START),
-                      0x00 , 0x20 ,
-                      0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-                      0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c,
-                      0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39,
-                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-
-ZBM(ZBS_W_ZDODCB, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_ZDO_DIRECT_CB, 0x01 , 0x01 )
-
-ZBM(ZBS_WNV_INITZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_ITEM_INIT, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8,
-                       0x01, 0x00 , 0x01 , 0x00 )
-
-
-ZBM(ZBR_WNV_INIT_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_ITEM_INIT )
-
-
-ZBM(ZBS_WNV_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(ZNP_HAS_CONFIGURED), Z_B1(ZNP_HAS_CONFIGURED),
-                   0x00 , 0x01 , 0x55 )
-
-ZBM(ZBS_STARTUPFROMAPP, Z_SREQ | Z_ZDO, ZDO_STARTUP_FROM_APP, 100, 0 )
-ZBM(ZBR_STARTUPFROMAPP, Z_SRSP | Z_ZDO, ZDO_STARTUP_FROM_APP )
-ZBM(AREQ_STARTUPFROMAPP, Z_AREQ | Z_ZDO, ZDO_STATE_CHANGE_IND, ZDO_DEV_ZB_COORD )
-
-ZBM(ZBS_GETDEVICEINFO, Z_SREQ | Z_UTIL, Z_UTIL_GET_DEVICE_INFO )
-ZBM(ZBR_GETDEVICEINFO, Z_SRSP | Z_UTIL, Z_UTIL_GET_DEVICE_INFO, Z_Success )
-# 271 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-ZBM(ZBS_ZDO_NODEDESCREQ, Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ, 0x00, 0x00 , 0x00, 0x00 )
-ZBM(ZBR_ZDO_NODEDESCREQ, Z_SRSP | Z_ZDO, ZDO_NODE_DESC_REQ, Z_Success )
-
-ZBM(AREQ_ZDO_NODEDESCRSP, Z_AREQ | Z_ZDO, ZDO_NODE_DESC_RSP)
-# 289 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-ZBM(ZBS_ZDO_ACTIVEEPREQ, Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ, 0x00, 0x00, 0x00, 0x00)
-ZBM(ZBR_ZDO_ACTIVEEPREQ, Z_SRSP | Z_ZDO, ZDO_ACTIVE_EP_REQ, Z_Success)
-ZBM(ZBR_ZDO_ACTIVEEPRSP_NONE, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
-    0x00, 0x00 , 0x00 )
-ZBM(ZBR_ZDO_ACTIVEEPRSP_OK, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
-    0x00, 0x00 , 0x02 , 0x0B, 0x01 )
-
-
-ZBM(ZBS_AF_REGISTER01, Z_SREQ | Z_AF, AF_REGISTER, 0x01 , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
-                        0x05, 0x00 , 0x00 , 0x00 ,
-                        0x00 , 0x00 )
-ZBM(ZBR_AF_REGISTER, Z_SRSP | Z_AF, AF_REGISTER, Z_Success)
-ZBM(ZBS_AF_REGISTER0B, Z_SREQ | Z_AF, AF_REGISTER, 0x0B , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
-                        0x05, 0x00 , 0x00 , 0x00 ,
-                        0x00 , 0x00 )
-
-ZBM(ZBS_PERMITJOINREQ_CLOSE, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x02 ,
-                              0x00, 0x00 , 0x00 , 0x00 )
-ZBM(ZBS_PERMITJOINREQ_OPEN_60, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
-                              0xFC, 0xFF , 60 , 0x00 )
-ZBM(ZBS_PERMITJOINREQ_OPEN_XX, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
-                              0xFC, 0xFF , 0xFF , 0x00 )
-ZBM(ZBR_PERMITJOINREQ, Z_SRSP | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, Z_Success)
-ZBM(ZBR_PERMITJOIN_AREQ_CLOSE, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0x00 )
-ZBM(ZBR_PERMITJOIN_AREQ_OPEN_60, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 60 )
-ZBM(ZBR_PERMITJOIN_AREQ_OPEN_FF, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0xFF )
-ZBM(ZBR_PERMITJOIN_AREQ_RSP, Z_AREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_RSP, 0x00, 0x00 , Z_Success )
-
-static const Zigbee_Instruction zb_prog[] PROGMEM = {
-  ZI_LABEL(0)
-    ZI_NOOP()
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_ON_TIMEOUT_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_ON_RECV_UNEXPECTED(&Z_Recv_Default)
-    ZI_WAIT(10500)
-    ZI_ON_ERROR_GOTO(50)
-
-
-
-    ZI_SEND(ZBS_RESET)
-    ZI_WAIT_RECV_FUNC(5000, ZBR_RESET, &Z_Reboot)
-    ZI_WAIT(100)
-    ZI_LOG(LOG_LEVEL_DEBUG, D_LOG_ZIGBEE "checking device configuration")
-    ZI_SEND(ZBS_ZNPHC)
-    ZI_WAIT_RECV(2000, ZBR_ZNPHC)
-    ZI_SEND(ZBS_VERSION)
-    ZI_WAIT_RECV_FUNC(2000, ZBR_VERSION, &Z_ReceiveCheckVersion)
-    ZI_SEND(ZBS_PAN)
-    ZI_WAIT_RECV(1000, ZBR_PAN)
-    ZI_SEND(ZBS_EXTPAN)
-    ZI_WAIT_RECV(1000, ZBR_EXTPAN)
-    ZI_SEND(ZBS_CHANN)
-    ZI_WAIT_RECV(1000, ZBR_CHANN)
-    ZI_SEND(ZBS_PFGK)
-    ZI_WAIT_RECV(1000, ZBR_PFGK)
-    ZI_SEND(ZBS_PFGKEN)
-    ZI_WAIT_RECV(1000, ZBR_PFGKEN)
-
-
-
-  ZI_LABEL(ZIGBEE_LABEL_START)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_STARTING, "Configured, starting coordinator")
-
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-
-
-ZI_SEND(ZBS_STARTUPFROMAPP)
-    ZI_WAIT_RECV(2000, ZBR_STARTUPFROMAPP)
-    ZI_WAIT_UNTIL(10000, AREQ_STARTUPFROMAPP)
-    ZI_SEND(ZBS_GETDEVICEINFO)
-    ZI_WAIT_RECV_FUNC(2000, ZBR_GETDEVICEINFO, &Z_ReceiveDeviceInfo)
-
-    ZI_SEND(ZBS_ZDO_NODEDESCREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_NODEDESCREQ)
-    ZI_WAIT_UNTIL(5000, AREQ_ZDO_NODEDESCRSP)
-    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_NONE)
-    ZI_SEND(ZBS_AF_REGISTER01)
-    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
-    ZI_SEND(ZBS_AF_REGISTER0B)
-    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
-
-
-    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_OK)
-    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_PERMITJOIN_AREQ_RSP)
-
-
-
-
-
-
-  ZI_LABEL(ZIGBEE_LABEL_READY)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_OK, "Started")
-    ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "Zigbee started")
-    ZI_CALL(&Z_State_Ready, 1)
-    ZI_CALL(&Z_Load_Devices, 0)
-  ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
-    ZI_WAIT_FOREVER()
-    ZI_GOTO(ZIGBEE_LABEL_READY)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_60)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_XX)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(50)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_RESET_CONF, "Reseting configuration")
-
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_SEND(ZBS_FACTRES)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_RESET)
-    ZI_WAIT_RECV(5000, ZBR_RESET)
-    ZI_SEND(ZBS_W_PAN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_EXTPAN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_CHANN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_LOGTYP)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_PFGK)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_PFGKEN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_WNV_SECMODE)
-    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
-    ZI_SEND(ZBS_W_ZDODCB)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-
-    ZI_SEND(ZBS_WNV_INITZNPHC)
-    ZI_WAIT_RECV_FUNC(1000, ZBR_WNV_INIT_OK, &Z_CheckNVWrite)
-    ZI_SEND(ZBS_WNV_ZNPHC)
-    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_START)
-
-  ZI_LABEL(ZIGBEE_LABEL_UNSUPPORTED_VERSION)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_UNSUPPORTED_VERSION, "Only ZNP 1.2 is currently supported")
-    ZI_GOTO(ZIGBEE_LABEL_ABORT)
-
-  ZI_LABEL(ZIGBEE_LABEL_ABORT)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_ABORT, "Abort")
-    ZI_LOG(LOG_LEVEL_ERROR, D_LOG_ZIGBEE "Abort")
-    ZI_STOP(ZIGBEE_LABEL_ABORT)
-};
-
-uint8_t ZigbeeGetInstructionSize(uint8_t instr) {
-  if (instr >= ZGB_INSTR_12_BYTES) {
-    return 3;
-  } else if (instr >= ZGB_INSTR_8_BYTES) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-void ZigbeeGotoLabel(uint8_t label) {
-
-  uint16_t goto_pc = 0xFFFF;
-  uint8_t cur_instr = 0;
-  uint8_t cur_d8 = 0;
-  uint8_t cur_instr_len = 1;
-
-  for (uint32_t i = 0; i < sizeof(zb_prog)/sizeof(zb_prog[0]); i += cur_instr_len) {
-    const Zigbee_Instruction *cur_instr_line = &zb_prog[i];
-    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
-    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
-
-
-    if (ZGB_INSTR_LABEL == cur_instr) {
-
-      if (label == cur_d8) {
-
-        zigbee.pc = i;
-        zigbee.state_machine = true;
-        zigbee.state_waiting = false;
-        return;
-      }
-    }
-
-    cur_instr_len = ZigbeeGetInstructionSize(cur_instr);
-  }
-
-
-  AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Goto label not found, label=%d pc=%d"), label, zigbee.pc);
-  if (ZIGBEE_LABEL_ABORT != label) {
-
-    ZigbeeGotoLabel(ZIGBEE_LABEL_ABORT);
-  } else {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Label Abort (%d) not present, aborting Zigbee"), ZIGBEE_LABEL_ABORT);
-    zigbee.state_machine = false;
-    zigbee.active = false;
-  }
-}
-
-void ZigbeeStateMachine_Run(void) {
-  uint8_t cur_instr = 0;
-  uint8_t cur_d8 = 0;
-  uint16_t cur_d16 = 0;
-  const void* cur_ptr1 = nullptr;
-  const void* cur_ptr2 = nullptr;
-  uint32_t now = millis();
-
-  if (zigbee.state_waiting) {
-
-    if ((zigbee.next_timeout) && (now > zigbee.next_timeout)) {
-
-      if (!zigbee.state_no_timeout) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "timeout, goto label %d"), zigbee.on_timeout_goto);
-        ZigbeeGotoLabel(zigbee.on_timeout_goto);
-      } else {
-        zigbee.state_waiting = false;
-      }
-    }
-  }
-
-  while ((zigbee.state_machine) && (!zigbee.state_waiting)) {
-
-    zigbee.recv_filter = nullptr;
-    zigbee.recv_func = nullptr;
-    zigbee.recv_until = false;
-    zigbee.state_no_timeout = false;
-
-    if (zigbee.pc > (sizeof(zb_prog)/sizeof(zb_prog[0]))) {
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Invalid pc: %d, aborting"), zigbee.pc);
-      zigbee.pc = -1;
-    }
-    if (zigbee.pc < 0) {
-      zigbee.state_machine = false;
-      return;
-    }
-
-
-
-    const Zigbee_Instruction *cur_instr_line = &zb_prog[zigbee.pc];
-    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
-    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
-    cur_d16 = pgm_read_word(&cur_instr_line->i.d16);
-    if (cur_instr >= ZGB_INSTR_8_BYTES) {
-      cur_instr_line++;
-      cur_ptr1 = cur_instr_line->p;
-    }
-    if (cur_instr >= ZGB_INSTR_12_BYTES) {
-      cur_instr_line++;
-      cur_ptr2 = cur_instr_line->p;
-    }
-
-    zigbee.pc += ZigbeeGetInstructionSize(cur_instr);
-
-    switch (cur_instr) {
-      case ZGB_INSTR_NOOP:
-      case ZGB_INSTR_LABEL:
-        break;
-      case ZGB_INSTR_GOTO:
-        ZigbeeGotoLabel(cur_d8);
-        break;
-      case ZGB_INSTR_ON_ERROR_GOTO:
-        zigbee.on_error_goto = cur_d8;
-        break;
-      case ZGB_INSTR_ON_TIMEOUT_GOTO:
-        zigbee.on_timeout_goto = cur_d8;
-        break;
-      case ZGB_INSTR_WAIT:
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        zigbee.state_no_timeout = true;
-        break;
-      case ZGB_INSTR_WAIT_FOREVER:
-        zigbee.next_timeout = 0;
-        zigbee.state_waiting = true;
-
-        break;
-      case ZGB_INSTR_STOP:
-        zigbee.state_machine = false;
-        if (cur_d8) {
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Stopping (%d)"), cur_d8);
-        }
-        break;
-      case ZGB_INSTR_CALL:
-        if (cur_ptr1) {
-          uint32_t res;
-          res = (*((ZB_Func)cur_ptr1))(cur_d8);
-          if (res > 0) {
-            ZigbeeGotoLabel(res);
-            continue;
-          } else if (res == 0) {
-
-          } else if (res == -1) {
-
-          } else {
-            ZigbeeGotoLabel(zigbee.on_error_goto);
-            continue;
-          }
-        }
-        break;
-      case ZGB_INSTR_LOG:
-        AddLog_P(cur_d8, (char*) cur_ptr1);
-        break;
-      case ZGB_INSTR_MQTT_STATE:
-        Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{\"Status\":%d,\"Message\":\"%s\"}}"),
-                          cur_d8, (char*) cur_ptr1);
-       MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-       XdrvRulesProcess();
-        break;
-      case ZGB_INSTR_SEND:
-        ZigbeeZNPSend((uint8_t*) cur_ptr1, cur_d8 );
-        break;
-      case ZGB_INSTR_WAIT_UNTIL:
-        zigbee.recv_until = true;
-      case ZGB_INSTR_WAIT_RECV:
-        zigbee.recv_filter = (uint8_t *) cur_ptr1;
-        zigbee.recv_filter_len = cur_d8;
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        break;
-      case ZGB_ON_RECV_UNEXPECTED:
-        zigbee.recv_unexpected = (ZB_RecvMsgFunc) cur_ptr1;
-        break;
-      case ZGB_INSTR_WAIT_RECV_CALL:
-        zigbee.recv_filter = (uint8_t *) cur_ptr1;
-        zigbee.recv_filter_len = cur_d8;
-        zigbee.recv_func = (ZB_RecvMsgFunc) cur_ptr2;
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        break;
-    }
-  }
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-#ifdef USE_ZIGBEE
-
-int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
-
-
-
-
-
-
-
-  Z_IEEEAddress long_adr = buf.get64(3);
-  Z_ShortAddress short_adr = buf.get16(11);
-  uint8_t device_type = buf.get8(13);
-  uint8_t device_state = buf.get8(14);
-  uint8_t device_associated = buf.get8(15);
-
-
-  localIEEEAddr = long_adr;
-
-  char hex[20];
-  Uint64toHex(long_adr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"DeviceType\":%d,\"DeviceState\":%d"
-                  ",\"NumAssocDevices\":%d"),
-                  ZIGBEE_STATUS_CC_INFO, hex, short_adr, device_type, device_state,
-                  device_associated);
-
-  if (device_associated > 0) {
-    uint idx = 16;
-    ResponseAppend_P(PSTR(",\"AssocDevicesList\":["));
-    for (uint32_t i = 0; i < device_associated; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(idx));
-      idx += 2;
-    }
-    ResponseAppend_P(PSTR("]"));
-  }
-
-  ResponseJsonEnd();
-  ResponseJsonEnd();
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  return res;
-}
-
-int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf) {
-
-
-
-  uint8_t status = buf.get8(2);
-  if ((0x00 == status) || (0x09 == status)) {
-    return 0;
-  } else {
-    return -2;
-  }
-}
-
-const char Z_RebootReason[] PROGMEM = "Power-up|External|Watchdog";
-
-int32_t Z_Reboot(int32_t res, class SBuffer &buf) {
-
-
-
-  uint8_t reason = buf.get8(2);
-  uint8_t transport_rev = buf.get8(3);
-  uint8_t product_id = buf.get8(4);
-  uint8_t major_rel = buf.get8(5);
-  uint8_t minor_rel = buf.get8(6);
-  uint8_t hw_rev = buf.get8(7);
-  char reason_str[12];
-
-  if (reason > 3) { reason = 3; }
-  GetTextIndexed(reason_str, sizeof(reason_str), reason, Z_RebootReason);
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"Message\":\"%s\",\"RestartReason\":\"%s\""
-                  ",\"MajorRel\":%d,\"MinorRel\":%d}}"),
-                  ZIGBEE_STATUS_BOOT, "CC2530 booted", reason_str,
-                  major_rel, minor_rel);
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
-   return 0;
-  } else {
-    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
-  }
-}
-
-int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf) {
-# 122 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-  uint8_t major_rel = buf.get8(4);
-  uint8_t minor_rel = buf.get8(5);
-  uint8_t maint_rel = buf.get8(6);
-  uint32_t revision = buf.get32(7);
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"MajorRel\":%d,\"MinorRel\":%d"
-                  ",\"MaintRel\":%d,\"Revision\":%d}}"),
-                  ZIGBEE_STATUS_CC_VERSION, major_rel, minor_rel,
-                  maint_rel, revision);
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
-   return 0;
-  } else {
-    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
-  }
-}
-
-bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match) {
-  if ( (pgm_read_byte(&match[0]) == buf.get8(0)) &&
-       (pgm_read_byte(&match[1]) == buf.get8(1)) ) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
-
-  uint8_t duration = buf.get8(2);
-  uint8_t status_code;
-  const char* message;
-
-  if (0xFF == duration) {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_XX;
-    message = PSTR("Enable Pairing mode until next boot");
-  } else if (duration > 0) {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_60;
-    message = PSTR("Enable Pairing mode for %d seconds");
-  } else {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_CLOSE;
-    message = PSTR("Disable Pairing mode");
-  }
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"Message\":\""),
-                  status_code);
-  ResponseAppend_P(message, duration);
-  ResponseAppend_P(PSTR("\"}}"));
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-  return -1;
-}
-
-
-void Z_SendActiveEpReq(uint16_t shortaddr) {
-  uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
-
-  uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
-
-  ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
-
-}
-
-
-void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint) {
-  uint8_t SimpleDescReq[] = { Z_SREQ | Z_ZDO, ZDO_SIMPLE_DESC_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr),
-              endpoint };
-
-  ZigbeeZNPSend(SimpleDescReq, sizeof(SimpleDescReq));
-}
-
-const char* Z_DeviceType[] = { "Coordinator", "Router", "End Device", "Unknown" };
-int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t logicalType = buf.get8(7);
-  uint8_t apsFlags = buf.get8(8);
-  uint8_t MACCapabilityFlags = buf.get8(9);
-  uint16_t manufacturerCapabilities = buf.get16(10);
-  uint8_t maxBufferSize = buf.get8(12);
-  uint16_t maxInTransferSize = buf.get16(13);
-  uint16_t serverMask = buf.get16(15);
-  uint16_t maxOutTransferSize = buf.get16(17);
-  uint8_t descriptorCapabilities = buf.get8(19);
-
-  if (0 == status) {
-    zigbee_devices.updateLastSeen(nwkAddr);
-
-    uint8_t deviceType = logicalType & 0x7;
-    if (deviceType > 3) { deviceType = 3; }
-    bool complexDescriptorAvailable = (logicalType & 0x08) ? 1 : 0;
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"NodeType\":\"%s\",\"ComplexDesc\":%s}}"),
-                    ZIGBEE_STATUS_NODE_DESC, Z_DeviceType[deviceType],
-                    complexDescriptorAvailable ? "true" : "false"
-                    );
-
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-  }
-
-  return -1;
-}
-
-int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t activeEpCount = buf.get8(7);
-  uint8_t* activeEpList = (uint8_t*) buf.charptr(8);
-
-
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    zigbee_devices.addEndoint(nwkAddr, activeEpList[i]);
-  }
-
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    Z_SendSimpleDescReq(nwkAddr, activeEpList[i]);
-  }
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"ActiveEndpoints\":["),
-                  ZIGBEE_STATUS_ACTIVE_EP);
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    if (i > 0) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(PSTR("\"0x%02X\""), activeEpList[i]);
-  }
-  ResponseAppend_P(PSTR("]}}"));
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-  return -1;
-}
-
-void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid) {
-  SBuffer buf(100);
-  buf.add8(Z_SREQ | Z_AF);
-  buf.add8(AF_DATA_REQUEST);
-  buf.add16(shortaddr);
-  buf.add8(endpoint);
-  buf.add8(0x01);
-  buf.add16(clusterid);
-  buf.add8(transacid);
-  buf.add8(0x30);
-  buf.add8(0x1E);
-
-  buf.add8(3 + 2*sizeof(uint16_t));
-  buf.add8(0x00);
-  buf.add8(transacid);
-  buf.add8(ZCL_READ_ATTRIBUTES);
-  buf.add16(0x0004);
-  buf.add16(0x0005);
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-}
-
-
-int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t lenDescriptor = buf.get8(7);
-  uint8_t endpoint = buf.get8(8);
-  uint16_t profileId = buf.get16(9);
-  uint16_t deviceId = buf.get16(11);
-  uint8_t deviceVersion = buf.get8(13);
-  uint8_t numInCluster = buf.get8(14);
-  uint8_t numOutCluster = buf.get8(15 + numInCluster*2);
-
-  if (0 == status) {
-    zigbee_devices.addEndointProfile(nwkAddr, endpoint, profileId);
-    for (uint32_t i = 0; i < numInCluster; i++) {
-      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(15 + i*2), false);
-    }
-    for (uint32_t i = 0; i < numOutCluster; i++) {
-      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(16 + numInCluster*2 + i*2), true);
-    }
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"Endpoint\":\"0x%02X\""
-                    ",\"ProfileId\":\"0x%04X\",\"DeviceId\":\"0x%04X\",\"DeviceVersion\":%d"
-                    "\"InClusters\":["),
-                    ZIGBEE_STATUS_SIMPLE_DESC, endpoint,
-                    profileId, deviceId, deviceVersion);
-    for (uint32_t i = 0; i < numInCluster; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(15 + i*2));
-    }
-    ResponseAppend_P(PSTR("],\"OutClusters\":["));
-    for (uint32_t i = 0; i < numOutCluster; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(16 + numInCluster*2 + i*2));
-    }
-    ResponseAppend_P(PSTR("]}}"));
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-
-    uint8_t cluster = zigbee_devices.findClusterEndpointIn(nwkAddr, 0x0000);
-    if (cluster) {
-      Z_SendAFInfoRequest(nwkAddr, cluster, 0x0000, 0x01);
-    }
-  }
-  return -1;
-}
-
-int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
-  Z_ShortAddress srcAddr = buf.get16(2);
-  Z_ShortAddress nwkAddr = buf.get16(4);
-  Z_IEEEAddress ieeeAddr = buf.get64(6);
-  uint8_t capabilities = buf.get8(14);
-
-  zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
-
-  char hex[20];
-  Uint64toHex(ieeeAddr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"PowerSource\":%s,\"ReceiveWhenIdle\":%s,\"Security\":%s}}"),
-                  ZIGBEE_STATUS_DEVICE_ANNOUNCE, hex, nwkAddr,
-                  (capabilities & 0x04) ? "true" : "false",
-                  (capabilities & 0x08) ? "true" : "false",
-                  (capabilities & 0x40) ? "true" : "false"
-                  );
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-  Z_SendActiveEpReq(nwkAddr);
-  return -1;
-}
-
-
-int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf) {
-  Z_ShortAddress srcAddr = buf.get16(2);
-  Z_IEEEAddress ieeeAddr = buf.get64(4);
-  Z_ShortAddress parentNw = buf.get16(12);
-
-  zigbee_devices.updateDevice(srcAddr, ieeeAddr);
-
-  char hex[20];
-  Uint64toHex(ieeeAddr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"ParentNetwork\":\"0x%04X\"}}"),
-                  ZIGBEE_STATUS_DEVICE_INDICATION, hex, srcAddr, parentNw
-                  );
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-
-  return -1;
-}
-
-
-
-const uint32_t OCCUPANCY_TIMEOUT = 90 * 1000;
-
-void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json) {
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(*json, PSTR(OCCUPANCY));
-  if (nullptr != &val_endpoint) {
-    uint32_t occupancy = strToUInt(val_endpoint);
-
-    if (occupancy) {
-      zigbee_devices.setTimer(shortaddr, OCCUPANCY_TIMEOUT, cluster, endpoint, 0, &Z_OccupancyCallback);
-    }
-  }
-}
-
-
-
-int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  const JsonObject *json = zigbee_devices.jsonGet(shortaddr);
-  if (json == nullptr) { return 0; }
-
-  Z_AqaraOccupancy(shortaddr, cluster, endpoint, json);
-
-  zigbee_devices.jsonPublishFlush(shortaddr);
-  return 1;
-}
-
-int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
-  uint16_t groupid = buf.get16(2);
-  uint16_t clusterid = buf.get16(4);
-  Z_ShortAddress srcaddr = buf.get16(6);
-  uint8_t srcendpoint = buf.get8(8);
-  uint8_t dstendpoint = buf.get8(9);
-  uint8_t wasbroadcast = buf.get8(10);
-  uint8_t linkquality = buf.get8(11);
-  uint8_t securityuse = buf.get8(12);
-  uint32_t timestamp = buf.get32(13);
-  uint8_t seqnumber = buf.get8(17);
-
-  bool defer_attributes = false;
-
-  zigbee_devices.updateLastSeen(srcaddr);
-  ZCLFrame zcl_received = ZCLFrame::parseRawFrame(buf, 19, buf.get8(18), clusterid, groupid,
-                              srcaddr,
-                              srcendpoint, dstendpoint, wasbroadcast,
-                              linkquality, securityuse, seqnumber,
-                              timestamp);
-  zcl_received.log();
-  char shortaddr[8];
-  snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%04X"), srcaddr);
-
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-
-  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
-    zcl_received.parseRawAttributes(json);
-    if (clusterid) { defer_attributes = true; }
-  } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
-    zcl_received.parseReadAttributes(json);
-  } else if (zcl_received.isClusterSpecificCommand()) {
-    zcl_received.parseClusterSpecificCommand(json);
-  }
-  String msg("");
-  msg.reserve(100);
-  json.printTo(msg);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
-
-  zcl_received.postProcessAttributes(srcaddr, json);
-
-  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
-
-  if (defer_attributes) {
-
-    if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
-
-      zigbee_devices.jsonPublishFlush(srcaddr);
-    } else {
-      zigbee_devices.jsonAppend(srcaddr, json);
-      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
-    }
-  } else {
-
-    zigbee_devices.jsonPublishNow(srcaddr, json);
-  }
-  return -1;
-}
-
-typedef struct Z_Dispatcher {
-  const uint8_t* match;
-  ZB_RecvMsgFunc func;
-} Z_Dispatcher;
-
-
-ZBM(AREQ_AF_INCOMING_MESSAGE, Z_AREQ | Z_AF, AF_INCOMING_MSG)
-ZBM(AREQ_END_DEVICE_ANNCE_IND, Z_AREQ | Z_ZDO, ZDO_END_DEVICE_ANNCE_IND)
-ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)
-ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )
-ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)
-ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)
-
-const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
-  { AREQ_AF_INCOMING_MESSAGE, &Z_ReceiveAfIncomingMessage },
-  { AREQ_END_DEVICE_ANNCE_IND, &Z_ReceiveEndDeviceAnnonce },
-  { AREQ_END_DEVICE_TC_DEV_IND, &Z_ReceiveTCDevInd },
-  { AREQ_PERMITJOIN_OPEN_XX, &Z_ReceivePermitJoinStatus },
-  { AREQ_ZDO_NODEDESCRSP, &Z_ReceiveNodeDesc },
-  { AREQ_ZDO_ACTIVEEPRSP, &Z_ReceiveActiveEp },
-  { AREQ_ZDO_SIMPLEDESCRSP, &Z_ReceiveSimpleDesc },
-};
-
-int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
-
-  if (zigbee.init_phase) {
-
-   return -1;
-  } else {
-    for (uint32_t i = 0; i < sizeof(Z_DispatchTable)/sizeof(Z_Dispatcher); i++) {
-      if (Z_ReceiveMatchPrefix(buf, Z_DispatchTable[i].match)) {
-        (*Z_DispatchTable[i].func)(res, buf);
-      }
-    }
-    return -1;
-  }
-}
-
-int32_t Z_Load_Devices(uint8_t value) {
-
-  loadZigbeeDevices();
-  return 0;
-}
-
-int32_t Z_State_Ready(uint8_t value) {
-  zigbee.init_phase = false;
-  return 0;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-#ifdef USE_ZIGBEE
-
-#define XDRV_23 23
-
-const uint32_t ZIGBEE_BUFFER_SIZE = 256;
-const uint8_t ZIGBEE_SOF = 0xFE;
-const uint8_t ZIGBEE_SOF_ALT = 0xFF;
-
-#include <TasmotaSerial.h>
-TasmotaSerial *ZigbeeSerial = nullptr;
-
-
-const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"
-  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
-  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
-
-const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"
-  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
-  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
-
-void (* const ZigbeeCommand[])(void) PROGMEM = {
-  &CmndZbZNPSend, &CmndZbPermitJoin,
-  &CmndZbStatus, &CmndZbReset, &CmndZbSend,
-  &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
-  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind
-  };
-
-int32_t ZigbeeProcessInput(class SBuffer &buf) {
-  if (!zigbee.state_machine) { return -1; }
-
-
-  bool recv_filter_match = true;
-  bool recv_prefix_match = false;
-  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
-    if (zigbee.recv_filter_len >= 2) {
-      recv_prefix_match = false;
-      if ( (pgm_read_byte(&zigbee.recv_filter[0]) == buf.get8(0)) &&
-           (pgm_read_byte(&zigbee.recv_filter[1]) == buf.get8(1)) ) {
-        recv_prefix_match = true;
-      }
-    }
-
-    for (uint32_t i = 0; i < zigbee.recv_filter_len; i++) {
-      if (pgm_read_byte(&zigbee.recv_filter[i]) != buf.get8(i)) {
-        recv_filter_match = false;
-        break;
-      }
-    }
-
-
-  }
-
-
-  int32_t res = -1;
-
-
-
-
-
-  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
-    if (!recv_prefix_match) {
-      res = -1;
-    } else {
-      if (recv_filter_match) {
-        res = 0;
-      } else {
-        if (zigbee.recv_until) {
-          res = -1;
-        } else {
-          res = -2;
-        }
-      }
-    }
-  } else {
-    res = -1;
-  }
-
-  if (recv_prefix_match) {
-    if (zigbee.recv_func) {
-      res = (*zigbee.recv_func)(res, buf);
-    }
-  }
-  if (-1 == res) {
-
-    if (zigbee.recv_unexpected) {
-      res = (*zigbee.recv_unexpected)(res, buf);
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: res = %d"), res);
-
-
-  if (0 == res) {
-
-    zigbee.state_waiting = false;
-  } else if (res > 0) {
-    ZigbeeGotoLabel(res);
-  } else if (-1 == res) {
-
-
-  } else {
-
-    ZigbeeGotoLabel(zigbee.on_error_goto);
-  }
-}
-
-void ZigbeeInput(void)
-{
- static uint32_t zigbee_polling_window = 0;
- static uint8_t fcs = ZIGBEE_SOF;
- static uint32_t zigbee_frame_len = 5;
-# 142 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-  while (ZigbeeSerial->available()) {
-    yield();
-    uint8_t zigbee_in_byte = ZigbeeSerial->read();
-
-
-  if (0 == zigbee_buffer->len()) {
-   zigbee_frame_len = 5;
-   fcs = ZIGBEE_SOF;
-
-
-
-      if (ZIGBEE_SOF_ALT == zigbee_in_byte) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
-        zigbee_in_byte = ZIGBEE_SOF;
-      }
-  }
-
-    if ((0 == zigbee_buffer->len()) && (ZIGBEE_SOF != zigbee_in_byte)) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput discarding byte %02X"), zigbee_in_byte);
-      continue;
-    }
-
-    if (zigbee_buffer->len() < zigbee_frame_len) {
-   zigbee_buffer->add8(zigbee_in_byte);
-      zigbee_polling_window = millis();
-   fcs ^= zigbee_in_byte;
-    }
-
-  if (zigbee_buffer->len() >= zigbee_frame_len) {
-      zigbee_polling_window = 0;
-      break;
-    }
-
-
-    if (02 == zigbee_buffer->len()) {
-
-      uint8_t len_byte = zigbee_buffer->get8(1);
-      if (len_byte > 250) len_byte = 250;
-
-      zigbee_frame_len = len_byte + 5;
-    }
-  }
-
-  if (zigbee_buffer->len() && (millis() > (zigbee_polling_window + ZIGBEE_POLLING))) {
-    char hex_char[(zigbee_buffer->len() * 2) + 2];
-  ToHex_P((unsigned char*)zigbee_buffer->getBuffer(), zigbee_buffer->len(), hex_char, sizeof(hex_char));
-
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Bytes follow_read_metric = %0d"), ZigbeeSerial->getLoopReadMetric());
-
-  if (zigbee_buffer->len() != zigbee_frame_len) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received frame of wrong size %s, len %d, expected %d"), hex_char, zigbee_buffer->len(), zigbee_frame_len);
-  } else if (0x00 != fcs) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received bad FCS frame %s, %d"), hex_char, fcs);
-  } else {
-
-
-
-   SBuffer znp_buffer = zigbee_buffer->subBuffer(2, zigbee_frame_len - 3);
-
-   ToHex_P((unsigned char*)znp_buffer.getBuffer(), znp_buffer.len(), hex_char, sizeof(hex_char));
-      Response_P(PSTR("{\"" D_JSON_ZIGBEEZNPRECEIVED "\":\"%s\"}"), hex_char);
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-        XdrvRulesProcess();
-      } else {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
-      }
-
-      ZigbeeProcessInput(znp_buffer);
-  }
-  zigbee_buffer->setLen(0);
-  }
-}
-
-
-
-void ZigbeeInit(void)
-{
-  zigbee.active = false;
-  if ((pin[GPIO_ZIGBEE_RX] < 99) && (pin[GPIO_ZIGBEE_TX] < 99)) {
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
-
-    ZigbeeSerial = new TasmotaSerial(pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX], seriallog_level ? 1 : 2, 0, 256);
-    ZigbeeSerial->begin(115200);
-    if (ZigbeeSerial->hardwareSerial()) {
-      ClaimSerial();
-      uint32_t aligned_buffer = ((uint32_t)serial_in_buffer + 3) & ~3;
-   zigbee_buffer = new PreAllocatedSBuffer(sizeof(serial_in_buffer) - 3, (char*) aligned_buffer);
-  } else {
-   zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
-  }
-    zigbee.active = true;
-  zigbee.init_phase = true;
-    zigbee.state_machine = true;
-    ZigbeeSerial->flush();
-  }
-}
-
-
-
-
-
-uint32_t strToUInt(const JsonVariant &val) {
-
-  if (val.is<unsigned int>()) {
-    return val.as<unsigned int>();
-  } else {
-    if (val.is<const char*>()) {
-      String sval = val.as<String>();
-      return strtoull(sval.c_str(), nullptr, 0);
-    }
-  }
-  return 0;
-}
-
-const unsigned char ZIGBEE_FACTORY_RESET[] PROGMEM =
-  { Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x01 };
-
-
-void CmndZbReset(void) {
-  if (ZigbeeSerial) {
-    switch (XdrvMailbox.payload) {
-    case 1:
-      ZigbeeZNPSend(ZIGBEE_FACTORY_RESET, sizeof(ZIGBEE_FACTORY_RESET));
-      eraseZigbeeDevices();
-      restart_flag = 2;
-      ResponseCmndChar(D_JSON_ZIGBEE_CC2530 " " D_JSON_RESET_AND_RESTARTING);
-      break;
-    default:
-      ResponseCmndChar(D_JSON_ONE_TO_RESET);
-    }
-  }
-}
-
-void CmndZbZNPSendOrReceive(bool send)
-{
-  if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
-    uint8_t code;
-
-    char *codes = RemoveSpace(XdrvMailbox.data);
-    int32_t size = strlen(XdrvMailbox.data);
-
-  SBuffer buf((size+1)/2);
-
-    while (size > 1) {
-      char stemp[3];
-      strlcpy(stemp, codes, sizeof(stemp));
-      code = strtol(stemp, nullptr, 16);
-   buf.add8(code);
-      size -= 2;
-      codes += 2;
-    }
-    if (send) {
-      ZigbeeZNPSend(buf.getBuffer(), buf.len());
-    } else {
-      ZigbeeProcessInput(buf);
-    }
-  }
-  ResponseCmndDone();
-}
-
-
-void CmndZbZNPReceive(void)
-{
-  CmndZbZNPSendOrReceive(false);
-}
-
-void CmndZbZNPSend(void)
-{
-  CmndZbZNPSendOrReceive(true);
-}
-
-void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
- if ((len < 2) || (len > 252)) {
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_JSON_ZIGBEEZNPSENT ": bad message len %d"), len);
-  return;
- }
- uint8_t data_len = len - 2;
-
-  if (ZigbeeSerial) {
-  uint8_t fcs = data_len;
-
-  ZigbeeSerial->write(ZIGBEE_SOF);
-
-  ZigbeeSerial->write(data_len);
-
-  for (uint32_t i = 0; i < len; i++) {
-   uint8_t b = pgm_read_byte(msg + i);
-   ZigbeeSerial->write(b);
-   fcs ^= b;
-
-  }
-  ZigbeeSerial->write(fcs);
-
-  }
-
- char hex_char[(len * 2) + 2];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZNPSENT " %s"),
-                                 ToHex_P(msg, len, hex_char, sizeof(hex_char)));
-}
-
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId) {
-  SBuffer buf(25+len);
-  buf.add8(Z_SREQ | Z_AF);
-  buf.add8(AF_DATA_REQUEST);
-  buf.add16(dtsAddr);
-  buf.add8(endpoint);
-  buf.add8(0x01);
-  buf.add16(clusterId);
-  buf.add8(transacId);
-  buf.add8(0x30);
-  buf.add8(0x1E);
-
-  buf.add8(3 + len);
-  buf.add8((disableDefResp ? 0x10 : 0x00) | (clusterSpecific ? 0x01 : 0x00));
-  buf.add8(transacId);
-  buf.add8(cmdId);
-  if (len > 0) {
-    buf.addBuffer(msg, len);
-  }
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-}
-
-inline int8_t hexValue(char c) {
-  if ((c >= '0') && (c <= '9')) {
-    return c - '0';
-  }
-  if ((c >= 'A') && (c <= 'F')) {
-    return 10 + c - 'A';
-  }
-  if ((c >= 'a') && (c <= 'f')) {
-    return 10 + c - 'a';
-  }
-  return -1;
-}
-
-uint32_t parseHex(const char **data, size_t max_len = 8) {
-  uint32_t ret = 0;
-  for (uint32_t i = 0; i < max_len; i++) {
-    int8_t v = hexValue(**data);
-    if (v < 0) { break; }
-    ret = (ret << 4) | v;
-    *data += 1;
-  }
-  return ret;
-}
-
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
-
-  uint16_t cluster = 0x0000;
-  uint8_t cmd = ZCL_READ_ATTRIBUTES;
-  bool clusterSpecific = false;
-
-
-
-  cluster = parseHex(&data, 4);
-
-
-  if (('_' == *data) || ('!' == *data)) {
-    if ('!' == *data) { clusterSpecific = true; }
-    data++;
-  } else {
-    ResponseCmndChar("Wrong delimiter for payload");
-    return;
-  }
-
-  cmd = parseHex(&data, 2);
-
-
-
-  if ('/' == *data) { data++; }
-
-  size_t size = strlen(data);
-  SBuffer buf((size+2)/2);
-
-  while (*data) {
-    uint8_t code = parseHex(&data, 2);
-    buf.add8(code);
-  }
-
-  if (0 == endpoint) {
-
-    endpoint = zigbee_devices.findClusterEndpointIn(dstAddr, cluster);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
-    dstAddr, cluster, endpoint, cmd, data);
-
-  if (0 == endpoint) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
-    return;
-  }
-
-
-  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len());
-
-  if (clusterSpecific) {
-    zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
-  }
-  ResponseCmndDone();
-}
-
-void CmndZbSend(void) {
-# 461 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-  static char delim[] = ", ";
-  uint16_t device = 0xFFFF;
-  uint8_t endpoint = 0x00;
-  String cmd_str = "";
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-  const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
-  if (nullptr != &val_cmd) {
-
-
-
-    if (val_cmd.is<JsonObject>()) {
-
-      JsonObject &cmd_obj = val_cmd.as<JsonObject&>();
-      int32_t cmd_size = cmd_obj.size();
-      if (cmd_size > 1) {
-        Response_P(PSTR("Only 1 command allowed (%d)"), cmd_size);
-        return;
-      } else if (1 == cmd_size) {
-
-        JsonObject::iterator it = cmd_obj.begin();
-        String key = it->key;
-        JsonVariant& value = it->value;
-        uint32_t x = 0, y = 0, z = 0;
-
-        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str());
-        if (tasmota_cmd) {
-          cmd_str = tasmota_cmd;
-        } else {
-          Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str());
-          return;
-        }
-
-
-        if (value.is<bool>()) {
-          x = value.as<bool>() ? 1 : 0;
-        } else if (value.is<unsigned int>()) {
-          x = value.as<unsigned int>();
-        } else {
-
-          const char *s_const = value.as<const char*>();
-          if (s_const != nullptr) {
-            char s[strlen(s_const)+1];
-            strcpy(s, s_const);
-            if ((nullptr != s) && (0x00 != *s)) {
-              char *sval = strtok(s, delim);
-              if (sval) {
-                x = ZigbeeAliasOrNumber(sval);
-                sval = strtok(nullptr, delim);
-                if (sval) {
-                  y = ZigbeeAliasOrNumber(sval);
-                  sval = strtok(nullptr, delim);
-                  if (sval) {
-                    z = ZigbeeAliasOrNumber(sval);
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
-        cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
-      } else {
-
-      }
-    } else if (val_cmd.is<char*>()) {
-
-      cmd_str = val_cmd.as<String>();
-    } else {
-
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
-              device, endpoint, cmd_str.c_str());
-    zigbeeZCLSendStr(device, endpoint, cmd_str.c_str());
-  } else {
-    Response_P(PSTR("Missing zigbee 'Send'"));
-    return;
-  }
-
-}
-
-ZBM(ZBS_BIND_REQ, Z_SREQ | Z_ZDO, ZDO_BIND_REQ,
-      0,0,
-      0,0,0,0,0,0,0,0,
-      0x00,
-      0x00, 0x00,
-      0x03,
-      0,0,0,0,0,0,0,0,
-      0x01
-)
-
-void CmndZbBind(void) {
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-
-  uint16_t device = 0xFFFF;
-  uint8_t endpoint = 0x00;
-  uint16_t cluster = 0;
-  uint32_t group = 0xFFFFFFFF;
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
-  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
-
-
-
-  SBuffer buf(sizeof(ZBS_BIND_REQ));
-  buf.add8(Z_SREQ | Z_ZDO);
-  buf.add8(ZDO_BIND_REQ);
-  buf.add16(device);
-  buf.add64(zigbee_devices.getDeviceLongAddr(device));
-  buf.add8(endpoint);
-  buf.add16(cluster);
-  buf.add8(0x03);
-  buf.add64(localIEEEAddr);
-  buf.add8(0x01);
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-
-  ResponseCmndDone();
-}
-
-
-void CmndZbProbe(void) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-
-  Z_SendActiveEpReq(shortaddr);
-  ResponseCmndDone();
-}
-
-
-void CmndZbName(void) {
-
-
-
-
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-
-
-  char *p;
-  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-
-
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-  if (p == nullptr) {
-    const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
-    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
-  } else {
-    zigbee_devices.setFriendlyName(shortaddr, p);
-    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, p);
-  }
-}
-
-
-void CmndZbForget(void) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-
-  if (zigbee_devices.removeDevice(shortaddr)) {
-    ResponseCmndDone();
-  } else {
-    ResponseCmndChar("Unknown device");
-  }
-}
-
-
-void CmndZbSave(void) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-
-  saveZigbeeDevices();
-
-  ResponseCmndDone();
-}
-
-
-void CmndZbRead(void) {
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-  uint16_t device = 0xFFFF;
-  uint16_t cluster = 0x0000;
-  uint8_t endpoint = 0x00;
-  size_t attrs_len = 0;
-  uint8_t* attrs = nullptr;
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
-  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-
-  const JsonVariant &val_attr = getCaseInsensitive(json, PSTR("Read"));
-  if (nullptr != &val_attr) {
-    uint16_t val = strToUInt(val_attr);
-    if (val_attr.is<JsonArray>()) {
-      JsonArray& attr_arr = val_attr;
-      attrs_len = attr_arr.size() * 2;
-      attrs = new uint8_t[attrs_len];
-
-      uint32_t i = 0;
-      for (auto value : attr_arr) {
-        uint16_t val = strToUInt(value);
-        attrs[i++] = val & 0xFF;
-        attrs[i++] = val >> 8;
-      }
-    } else {
-      attrs_len = 2;
-      attrs = new uint8_t[attrs_len];
-      attrs[0] = val & 0xFF;
-      attrs[1] = val >> 8;
-    }
-  }
-
-  if ((0 != endpoint) && (attrs_len > 0)) {
-    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false );
-    ResponseCmndDone();
-  } else {
-    ResponseCmndChar("Missing parameters");
-  }
-
-  if (attrs) { delete[] attrs; }
-}
-
-
-void CmndZbPermitJoin(void)
-{
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint32_t payload = XdrvMailbox.payload;
-  if (payload < 0) { payload = 0; }
-  if ((99 != payload) && (payload > 1)) { payload = 1; }
-
-  if (1 == payload) {
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60);
-  } else if (99 == payload){
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX);
-  } else {
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE);
-  }
-  ResponseCmndDone();
-}
-
-void CmndZbStatus(void) {
-  if (ZigbeeSerial) {
-    if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-    uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-    if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-    if (XdrvMailbox.payload > 0) {
-      if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-    }
-
-    String dump = zigbee_devices.dump(XdrvMailbox.index, shortaddr);
-    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
-  }
-}
-
-
-
-
-
-bool Xdrv23(uint8_t function)
-{
-  bool result = false;
-
-  if (zigbee.active) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (!zigbee.init_phase) {
-          zigbee_devices.runTimer();
-        }
-        break;
-      case FUNC_LOOP:
-        if (ZigbeeSerial) { ZigbeeInput(); }
-    if (zigbee.state_machine) {
-
-          ZigbeeStateMachine_Run();
-    }
-        break;
-      case FUNC_PRE_INIT:
-        ZigbeeInit();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kZbCommands, ZigbeeCommand);
-        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
-#ifdef USE_BUZZER
-
-
-
-
-#define XDRV_24 24
-
-struct BUZZER {
-  uint32_t tune = 0;
-  uint32_t tune_reload = 0;
-  bool active = true;
-  bool enable = false;
-  uint8_t inverted = 0;
-  uint8_t count = 0;
-  uint8_t mode = 0;
-  uint8_t set[2];
-  uint8_t duration;
-  uint8_t state = 0;
-} Buzzer;
-
-
-
-void BuzzerOff(void)
-{
-  DigitalWrite(GPIO_BUZZER, Buzzer.inverted);
-}
-
-
-void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode)
-{
-  Buzzer.set[0] = off;
-  Buzzer.set[1] = on;
-  Buzzer.duration = 1;
-  Buzzer.tune_reload = 0;
-  Buzzer.mode = mode;
-
-  if (tune) {
-    uint32_t tune1 = tune;
-    uint32_t tune2 = tune;
-    for (uint32_t i = 0; i < 32; i++) {
-      if (!(tune2 & 0x80000000)) {
-        tune2 <<= 1;
-      } else {
-        Buzzer.tune_reload <<= 1;
-        Buzzer.tune_reload |= tune1 & 1;
-        tune1 >>= 1;
-      }
-    }
-    Buzzer.tune = Buzzer.tune_reload;
-  }
-  Buzzer.count = count * 2;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BUZ: %d(%d),%d,%d,0x%08X(0x%08X)"), count, Buzzer.count, on, off, tune, Buzzer.tune);
-
-  Buzzer.enable = (Buzzer.count > 0);
-  if (!Buzzer.enable) {
-    BuzzerOff();
-  }
-}
-
-void BuzzerSetStateToLed(uint32_t state)
-{
-  if (Buzzer.enable && (2 == Buzzer.mode)) {
-    Buzzer.state = (state != 0);
-    DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
-  }
-}
-
-void BuzzerBeep(uint32_t count)
-{
-  BuzzerBeep(count, 1, 1, 0, 0);
-}
-
-void BuzzerEnabledBeep(uint32_t count, uint32_t duration)
-{
-  if (Settings.flag3.buzzer_enable) {
-    BuzzerBeep(count, duration, 1, 0, 0);
-  }
-}
-
-
-
-bool BuzzerPinState(void)
-{
-  if (XdrvMailbox.index == GPIO_BUZZER_INV) {
-    Buzzer.inverted = 1;
-    XdrvMailbox.index -= (GPIO_BUZZER_INV - GPIO_BUZZER);
-    return true;
-  }
-  return false;
-}
-
-void BuzzerInit(void)
-{
-  if (pin[GPIO_BUZZER] < 99) {
-    pinMode(pin[GPIO_BUZZER], OUTPUT);
-    BuzzerOff();
-  } else {
-    Buzzer.active = false;
-  }
-}
-
-void BuzzerEvery100mSec(void)
-{
-  if (Buzzer.enable && (Buzzer.mode != 2)) {
-    if (Buzzer.count) {
-      if (Buzzer.duration) {
-        Buzzer.duration--;
-        if (!Buzzer.duration) {
-          if (Buzzer.tune) {
-            Buzzer.state = Buzzer.tune & 1;
-            Buzzer.tune >>= 1;
-          } else {
-            Buzzer.tune = Buzzer.tune_reload;
-            Buzzer.count -= (Buzzer.tune_reload) ? 2 : 1;
-            Buzzer.state = Buzzer.count & 1;
-            if (Buzzer.mode) {
-              Buzzer.count |= 2;
-            }
-          }
-          Buzzer.duration = Buzzer.set[Buzzer.state];
-        }
-      }
-      DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
-    } else {
-      Buzzer.enable = false;
-    }
-  }
-}
-
-
-
-
-
-const char kBuzzerCommands[] PROGMEM = "|"
-  "Buzzer" ;
-
-void (* const BuzzerCommand[])(void) PROGMEM = {
-  &CmndBuzzer };
-
-void CmndBuzzer(void)
-{
-# 174 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_24_buzzer.ino"
-  if (XdrvMailbox.data_len > 0) {
-    if (XdrvMailbox.payload != 0) {
-      uint32_t parm[4] = { 0 };
-      uint32_t mode = 0;
-      ParseParameters(4, parm);
-      if (XdrvMailbox.payload <= 0) {
-        parm[0] = 1;
-        mode = -XdrvMailbox.payload;
-      }
-      for (uint32_t i = 1; i < 3; i++) {
-        if (parm[i] < 1) { parm[i] = 1; }
-      }
-      BuzzerBeep(parm[0], parm[1], parm[2], parm[3], mode);
-    } else {
-      BuzzerBeep(0);
-    }
-  } else {
-    BuzzerBeep(1);
-  }
-  ResponseCmndDone();
-}
-
-
-
-
-
-bool Xdrv24(uint8_t function)
-{
-  bool result = false;
-
-  if (Buzzer.active) {
-    switch (function) {
-      case FUNC_EVERY_100_MSECOND:
-        BuzzerEvery100mSec();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kBuzzerCommands, BuzzerCommand);
-        break;
-      case FUNC_PRE_INIT:
-        BuzzerInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = BuzzerPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
-# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
-#ifdef USE_A4988_STEPPER
-
-
-
-
-#define XDRV_25 25
-
-#include <A4988_Stepper.h>
-
-short A4988_dir_pin = pin[GPIO_MAX];
-short A4988_stp_pin = pin[GPIO_MAX];
-short A4988_ms1_pin = pin[GPIO_MAX];
-short A4988_ms2_pin = pin[GPIO_MAX];
-short A4988_ms3_pin = pin[GPIO_MAX];
-short A4988_ena_pin = pin[GPIO_MAX];
-int A4988_spr = 0;
-float A4988_rpm = 0;
-short A4988_mis = 0;
-
-A4988_Stepper* myA4988 = nullptr;
-
-void A4988Init(void)
-{
-  A4988_dir_pin = pin[GPIO_A4988_DIR];
-  A4988_stp_pin = pin[GPIO_A4988_STP];
-  A4988_ena_pin = pin[GPIO_A4988_ENA];
-  A4988_ms1_pin = pin[GPIO_A4988_MS1];
-  A4988_ms2_pin = pin[GPIO_A4988_MS2];
-  A4988_ms3_pin = pin[GPIO_A4988_MS3];
-  A4988_spr = 200;
-  A4988_rpm = 30;
-  A4988_mis = 1;
-
-  myA4988 = new A4988_Stepper( A4988_spr
-                            , A4988_rpm
-                            , A4988_mis
-                            , A4988_dir_pin
-                            , A4988_stp_pin
-                            , A4988_ena_pin
-                            , A4988_ms1_pin
-                            , A4988_ms2_pin
-                            , A4988_ms3_pin );
-}
-
-const char kA4988Commands[] PROGMEM = "Motor|"
-  "Move|Rotate|Turn|MIS|SPR|RPM";
-
-void (* const A4988Command[])(void) PROGMEM = {
-  &CmndDoMove,&CmndDoRotate,&CmndDoTurn,&CmndSetMIS,&CmndSetSPR,&CmndSetRPM};
-
-void CmndDoMove(void) {
-  if (XdrvMailbox.data_len > 0) {
-    long stepsPlease = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->doMove(stepsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndDoRotate(void) {
-  if (XdrvMailbox.data_len > 0) {
-    long degrsPlease = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->doRotate(degrsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndDoTurn(void) {
-  if (XdrvMailbox.data_len > 0) {
-    float turnsPlease = strtod(XdrvMailbox.data,nullptr);
-    myA4988->doTurn(turnsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetMIS(void) {
-  if ((pin[GPIO_A4988_MS1] < 99) && (pin[GPIO_A4988_MS2] < 99) && (pin[GPIO_A4988_MS3] < 99) && (XdrvMailbox.data_len > 0)) {
-    short newMIS = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setMIS(newMIS);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetSPR(void) {
-  if (XdrvMailbox.data_len > 0) {
-    int newSPR = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setSPR(newSPR);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetRPM(void) {
-  if (XdrvMailbox.data_len > 0) {
-    short newRPM = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setRPM(newRPM);
-    ResponseCmndDone();
-  }
-}
-
-
-
-
-bool Xdrv25(uint8_t function)
-{
-  bool result = false;
-  if ((pin[GPIO_A4988_DIR] < 99) && (pin[GPIO_A4988_STP] < 99)) {
-    switch (function) {
-      case FUNC_INIT:
-        A4988Init();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kA4988Commands, A4988Command);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
-#ifdef USE_LIGHT
-#ifdef USE_ARILUX_RF
-
-
-
-
-#define XDRV_26 26
-
-const uint32_t ARILUX_RF_TIME_AVOID_DUPLICATE = 1000;
-
-const uint8_t ARILUX_RF_MAX_CHANGES = 51;
-const uint32_t ARILUX_RF_SEPARATION_LIMIT = 4300;
-const uint32_t ARILUX_RF_RECEIVE_TOLERANCE = 60;
-
-struct ARILUX {
-  unsigned int rf_timings[ARILUX_RF_MAX_CHANGES];
-
-  unsigned long rf_received_value = 0;
-  unsigned long rf_last_received_value = 0;
-  unsigned long rf_last_time = 0;
-  unsigned long rf_lasttime = 0;
-
-  unsigned int rf_change_count = 0;
-  unsigned int rf_repeat_count = 0;
-
-  uint8_t rf_toggle = 0;
-} Arilux;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-#ifndef USE_WS2812_DMA
-void AriluxRfInterrupt(void) ICACHE_RAM_ATTR;
-#endif
-#endif
-
-void AriluxRfInterrupt(void)
-{
-  unsigned long time = micros();
-  unsigned int duration = time - Arilux.rf_lasttime;
-
-  if (duration > ARILUX_RF_SEPARATION_LIMIT) {
-    if (abs(duration - Arilux.rf_timings[0]) < 200) {
-      Arilux.rf_repeat_count++;
-      if (Arilux.rf_repeat_count == 2) {
-        unsigned long code = 0;
-        const unsigned int delay = Arilux.rf_timings[0] / 31;
-        const unsigned int delayTolerance = delay * ARILUX_RF_RECEIVE_TOLERANCE / 100;
-        for (unsigned int i = 1; i < Arilux.rf_change_count -1; i += 2) {
-          code <<= 1;
-          if (abs(Arilux.rf_timings[i] - (delay *3)) < delayTolerance && abs(Arilux.rf_timings[i +1] - delay) < delayTolerance) {
-            code |= 1;
-          }
-        }
-        if (Arilux.rf_change_count > 49) {
-          Arilux.rf_received_value = code;
-        }
-        Arilux.rf_repeat_count = 0;
-      }
-    }
-    Arilux.rf_change_count = 0;
-  }
-  if (Arilux.rf_change_count >= ARILUX_RF_MAX_CHANGES) {
-    Arilux.rf_change_count = 0;
-    Arilux.rf_repeat_count = 0;
-  }
-  Arilux.rf_timings[Arilux.rf_change_count++] = duration;
-  Arilux.rf_lasttime = time;
-}
-
-void AriluxRfHandler(void)
-{
-  unsigned long now = millis();
-  if (Arilux.rf_received_value && !((Arilux.rf_received_value == Arilux.rf_last_received_value) && (now - Arilux.rf_last_time < ARILUX_RF_TIME_AVOID_DUPLICATE))) {
-    Arilux.rf_last_received_value = Arilux.rf_received_value;
-    Arilux.rf_last_time = now;
-
-    uint16_t hostcode = Arilux.rf_received_value >> 8 & 0xFFFF;
-    if (Settings.rf_code[1][6] == Settings.rf_code[1][7]) {
-      Settings.rf_code[1][6] = hostcode >> 8 & 0xFF;
-      Settings.rf_code[1][7] = hostcode & 0xFF;
-    }
-    uint16_t stored_hostcode = Settings.rf_code[1][6] << 8 | Settings.rf_code[1][7];
-
-    DEBUG_DRIVER_LOG(PSTR(D_LOG_RFR D_HOST D_CODE " 0x%04X, " D_RECEIVED " 0x%06X"), stored_hostcode, Arilux.rf_received_value);
-
-    if (hostcode == stored_hostcode) {
-      char command[33];
-      char value = '-';
-      command[0] = '\0';
-      uint8_t keycode = Arilux.rf_received_value & 0xFF;
-      switch (keycode) {
-        case 1:
-        case 3:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_POWER " %d"), (1 == keycode) ? 1 : 0);
-          break;
-        case 2:
-          Arilux.rf_toggle++;
-          Arilux.rf_toggle &= 0x3;
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), 200 + Arilux.rf_toggle);
-          break;
-        case 4:
-          value = '+';
-        case 7:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_SPEED " %c"), value);
-          break;
-        case 5:
-          value = '+';
-        case 8:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_SCHEME " %c"), value);
-          break;
-        case 6:
-          value = '+';
-        case 9:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %c"), value);
-          break;
-        default: {
-          if ((keycode >= 10) && (keycode <= 21)) {
-            snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), keycode -9);
-          }
-        }
-      }
-      if (strlen(command)) {
-        ExecuteCommand(command, SRC_LIGHT);
-      }
-    }
-  }
-  Arilux.rf_received_value = 0;
-}
-
-void AriluxRfInit(void)
-{
-  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
-    if (Settings.last_module != Settings.module) {
-      Settings.rf_code[1][6] = 0;
-      Settings.rf_code[1][7] = 0;
-      Settings.last_module = Settings.module;
-    }
-    Arilux.rf_received_value = 0;
-
-    digitalWrite(pin[GPIO_ARIRFSEL], 0);
-    attachInterrupt(pin[GPIO_ARIRFRCV], AriluxRfInterrupt, CHANGE);
-  }
-}
-
-void AriluxRfDisable(void)
-{
-  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
-    detachInterrupt(pin[GPIO_ARIRFRCV]);
-    digitalWrite(pin[GPIO_ARIRFSEL], 1);
-  }
-}
-
-
-
-
-
-bool Xdrv26(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_50_MSECOND:
-      if (pin[GPIO_ARIRFRCV] < 99) { AriluxRfHandler(); }
-      break;
-    case FUNC_EVERY_SECOND:
-      if (10 == uptime) { AriluxRfInit(); }
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
-#ifdef USE_SHUTTER
-
-
-
-
-#define XDRV_27 27
-
-#define D_SHUTTER "SHUTTER"
-
-const uint16_t MOTOR_STOP_TIME = 500;
-const uint8_t steps_per_second = 20;
-
-uint8_t calibrate_pos[6] = {0,30,50,70,90,100};
-uint16_t messwerte[5] = {30,50,70,90,100};
-uint16_t last_execute_step;
-
-enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
-enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
-
-const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
-  D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION "|"
-  D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
-  D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
-  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME;
-
-void (* const ShutterCommand[])(void) PROGMEM = {
-  &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
-  &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
-  &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
-  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
-
-  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
-  const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
-
-#include <Ticker.h>
-
-Ticker TickerShutter;
-
-struct SHUTTER {
-  power_t mask = 0;
-  power_t old_power = 0;
-  power_t switched_relay = 0;
-  uint32_t time[MAX_SHUTTERS];
-  int32_t open_max[MAX_SHUTTERS];
-  int32_t target_position[MAX_SHUTTERS];
-  int32_t start_position[MAX_SHUTTERS];
-  int32_t real_position[MAX_SHUTTERS];
-  uint16_t open_time[MAX_SHUTTERS];
-  uint16_t close_time[MAX_SHUTTERS];
-  uint16_t close_velocity[MAX_SHUTTERS];
-  int8_t direction[MAX_SHUTTERS];
-  uint8_t mode = 0;
-  int16_t motordelay[MAX_SHUTTERS];
-  int16_t pwm_frequency;
-  uint16_t max_pwm_frequency = 1000;
-  uint16_t max_close_pwm_frequency[MAX_SHUTTERS];
-  uint8_t skip_relay_change;
-  int32_t accelerator[MAX_SHUTTERS];
-} Shutter;
-
-void ShutterLogPos(uint32_t i)
-{
-  char stemp2[10];
-  dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
-    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency);
-}
-
-void ShutterRtc50mS(void)
-{
-  for (uint32_t i = 0; i < shutters_present; i++) {
-    Shutter.time[i]++;
-    if (Shutter.accelerator[i]) {
-      Shutter.pwm_frequency += Shutter.accelerator[i];
-      Shutter.pwm_frequency = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency));
-      analogWriteFreq(Shutter.pwm_frequency);
-      analogWrite(pin[GPIO_PWM1+i], 50);
-    }
-  }
-}
-
-#define SHT_DIV_ROUND(__A,__B) (((__A) + (__B)/2) / (__B))
-
-int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
-{
-  if (0 == percent) return 0;
-  if (100 == percent) return Shutter.open_max[index];
- if (Settings.shutter_set50percent[index] != 50) {
-    return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
- } else {
-    uint32_t realpos;
-
-    for (uint32_t j = 0; j < 5; j++) {
-      if (0 == Settings.shuttercoeff[j][index]) {
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
-        for (uint32_t k = 0; k < 5; k++) {
-          Settings.shuttercoeff[k][index] = SHT_DIV_ROUND(calibrate_pos[k+1] * 1000, calibrate_pos[5]);
-        }
-      }
-    }
-    for (uint32_t i = 0; i < 5; i++) {
-      if ((percent * 10) >= Settings.shuttercoeff[i][index]) {
-        realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
-
-      } else {
-        if (0 == i) {
-          realpos = SHT_DIV_ROUND(SHT_DIV_ROUND(percent * Shutter.open_max[index] * calibrate_pos[i+1], Settings.shuttercoeff[i][index]), 10);
-        } else {
-
-
-          realpos += SHT_DIV_ROUND(SHT_DIV_ROUND((percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]), Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), 100);
-        }
-        break;
-      }
-    }
-  return realpos;
- }
-}
-
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
-{
-  if (0 >= realpos) return 0;
-  if (Shutter.open_max[index] <= realpos) return 100;
- if (Settings.shutter_set50percent[index] != 50) {
-  return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
- } else {
-    uint16_t realpercent;
-
-    for (uint32_t i = 0; i < 5; i++) {
-      if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
-        realpercent = SHT_DIV_ROUND(Settings.shuttercoeff[i][index], 10);
-
-      } else {
-        if (0 == i) {
-          realpercent = SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * Settings.shuttercoeff[i][index], calibrate_pos[i+1]), Shutter.open_max[index]);
-        } else {
-
-
-
-          realpercent += SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), (calibrate_pos[i+1] - calibrate_pos[i])), Shutter.open_max[index]) ;
-        }
-        break;
-      }
-    }
-    return realpercent;
-  }
-}
-
-void ShutterInit(void)
-{
-  shutters_present = 0;
-  Shutter.mask = 0;
-
-  Shutter.old_power = power;
-  bool relay_in_interlock = false;
-
-
-  if (Settings.shutter_startrelay[MAX_SHUTTERS] == 0) {
-     Shutter.max_pwm_frequency = Settings.shuttercoeff[4][3] > 0 ? Settings.shuttercoeff[4][3] : Shutter.max_pwm_frequency;
-  }
-  for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-
-    Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i == 0? 1 : Settings.shutter_startrelay[i]);
-    if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
-      shutters_present++;
-
-
-      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1) ;
-
-      for (uint32_t j = 0; j < MAX_INTERLOCKS * Settings.flag.interlock; j++) {
-
-        if (Settings.interlock[j] && (Settings.interlock[j] & Shutter.mask)) {
-
-          relay_in_interlock = true;
-        }
-      }
-      if (relay_in_interlock) {
-        if (Settings.pulse_timer[i] > 0) {
-          Shutter.mode = SHT_PULSE_OPEN__PULSE_CLOSE;
-        } else {
-          Shutter.mode = SHT_OFF_OPEN__OFF_CLOSE;
-        }
-      } else {
-        Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
-        if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
-          Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
-          Shutter.pwm_frequency = 0;
-          analogWriteFreq(Shutter.pwm_frequency);
-          analogWrite(pin[GPIO_PWM1+i], 50);
-        }
-      }
-
-      TickerShutter.attach_ms(50, ShutterRtc50mS );
-
-      Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] > 0) ? Settings.shutter_set50percent[i] : 50;
-
-
-      Shutter.open_time[i] = (Settings.shutter_opentime[i] > 0) ? Settings.shutter_opentime[i] : 100;
-      Shutter.close_time[i] = (Settings.shutter_closetime[i] > 0) ? Settings.shutter_closetime[i] : 100;
-
-
-      Shutter.open_max[i] = 200 * Shutter.open_time[i];
-      Shutter.close_velocity[i] = Shutter.open_max[i] / Shutter.close_time[i] / 2 ;
-      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i] / Shutter.close_time[i];
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d Closefreq: %d"),i, Shutter.max_close_pwm_frequency[i]);
-
-
-      if (Settings.shutter_set50percent[i] != 50) {
-       Settings.shuttercoeff[1][i] = Shutter.open_max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
-       Settings.shuttercoeff[0][i] = Shutter.open_max[i] - (Settings.shuttercoeff[1][i] * 100);
-       Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
-      }
-      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1);
-
-      Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
-
-      Shutter.start_position[i] = Shutter.target_position[i] = Shutter.real_position[i];
-      Shutter.motordelay[i] = Settings.shutter_motordelay[i];
-
-      char shutter_open_chr[10];
-      dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
-      char shutter_close_chr[10];
-      dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, end stop time enabled %d, shuttermode %d, motordelay %d"),
-        i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
-        Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
-        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, (Settings.shutter_options[i]&4) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
-
-    } else {
-
-      break;
-    }
-    ShutterLimitRealAndTargetPositions(i);
-    Settings.shutter_accuracy = 1;
-  }
-}
-
-void ShutterReportPosition(bool always)
-{
-  uint32_t shutter_moving = 0;
-  Response_P(PSTR("{"));
-  for (uint32_t i = 0; i < shutters_present; i++) {
-
-    uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
-    if (Shutter.direction[i] != 0) {
-      shutter_moving = 1;
-      ShutterLogPos(i);
-    }
-    if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i]);
-  }
-  ResponseJsonEnd();
-  if (always || (1 == shutter_moving)) {
-    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-  }
-  if (rules_flag.shutter_moving > shutter_moving) {
-    rules_flag.shutter_moved = 1;
-  } else {
-    rules_flag.shutter_moved = 0;
-  }
-  rules_flag.shutter_moving = shutter_moving;
-
-}
-
-void ShutterLimitRealAndTargetPositions(uint32_t i) {
-  if (Shutter.real_position[i]<0) Shutter.real_position[i] = 0;
-  if (Shutter.real_position[i]>Shutter.open_max[i]) Shutter.real_position[i] = Shutter.open_max[i];
-  if (Shutter.target_position[i]<0) Shutter.target_position[i] = 0;
-  if (Shutter.target_position[i]>Shutter.open_max[i]) Shutter.target_position[i] = Shutter.open_max[i];
-}
-
-void ShutterUpdatePosition(void)
-{
-
-  char scommand[CMDSZ];
-  char stopic[TOPSZ];
-
-  for (uint32_t i = 0; i < shutters_present; i++) {
-    if (Shutter.direction[i] != 0) {
-      int32_t stop_position_delta = 20;
-      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-
-
-        Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-
-        int32_t max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
-        int32_t max_freq_change_per_sec = Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-        int32_t min_runtime_ms = Shutter.pwm_frequency*1000 / max_freq_change_per_sec;
-        int32_t velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency / max_frequency * Shutter.direction[i] ;
-
-        int32_t next_possible_stop = Shutter.real_position[i] + minstopway ;
-        stop_position_delta =200 * Shutter.pwm_frequency/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
-
-
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
-                                      Shutter.pwm_frequency,max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
-
-        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
-
-            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop) ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
-
-        } else if ( Shutter.accelerator[i] > 0 && Shutter.pwm_frequency == max_frequency) {
-          Shutter.accelerator[i] = 0;
-        }
-      } else {
-        Shutter.real_position[i] = Shutter.start_position[i] + ( (Shutter.time[i] - Shutter.motordelay[i]) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
-      }
-      if ( Shutter.real_position[i] * Shutter.direction[i] + stop_position_delta >= Shutter.target_position[i] * Shutter.direction[i] ) {
-
-
-        uint8_t cur_relay = Settings.shutter_startrelay[i] + (Shutter.direction[i] == 1 ? 0 : 1) ;
-        int16_t missing_steps;
-
-        switch (Shutter.mode) {
-          case SHT_PULSE_OPEN__PULSE_CLOSE:
-
-            if (SRC_PULSETIMER == last_source || SRC_SHUTTER == last_source || SRC_WEBGUI == last_source) {
-              ExecuteCommandPower(cur_relay, 1, SRC_SHUTTER);
-            } else {
-              last_source = SRC_SHUTTER;
-            }
-          break;
-          case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
-            missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
-
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency);
-            Shutter.accelerator[i] = 0;
-            Shutter.pwm_frequency = Shutter.pwm_frequency > 250 ? 250 : Shutter.pwm_frequency;
-            analogWriteFreq(Shutter.pwm_frequency);
-            analogWrite(pin[GPIO_PWM1+i], 50);
-            Shutter.pwm_frequency = 0;
-            analogWriteFreq(Shutter.pwm_frequency);
-            while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
-              delay(1);
-            }
-            analogWrite(pin[GPIO_PWM1+i], 0);
-            Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
-
-            if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
-              ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-              ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
-            }
-          break;
-          case SHT_OFF_ON__OPEN_CLOSE:
-          if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
-            ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-            ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
-          }
-          break;
-          case SHT_OFF_OPEN__OFF_CLOSE:
-
-            if ((1 << (cur_relay-1)) & power) {
-
-              ExecuteCommandPower(cur_relay, 0, SRC_SHUTTER);
-            }
-          break;
-        }
-        ShutterLimitRealAndTargetPositions(i);
-        Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
-
-        ShutterLogPos(i);
-
-        Shutter.start_position[i] = Shutter.real_position[i];
-
-
-        snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i+1);
-        GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-        Response_P("%d", (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
-        MqttPublish(stopic, Settings.flag.mqtt_power_retain);
-
-        Shutter.direction[i] = 0;
-        ShutterReportPosition(true);
-        XdrvRulesProcess();
-      }
-    }
-  }
-}
-
-bool ShutterState(uint32_t device)
-{
-  device--;
-  device &= 3;
-  return (Settings.flag3.shutter_mode &&
-          (Shutter.mask & (1 << (Settings.shutter_startrelay[device]-1))) );
-}
-
-void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
-{
-
-  if ( ( (1 == direction) && ((Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2) )
-     || ( (-1 == direction) && (Shutter.real_position[i] / Shutter.close_velocity[i] <= 2)) ) {
-    Shutter.skip_relay_change = 1;
-  } else {
-    if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-      Shutter.pwm_frequency = 0;
-      analogWriteFreq(Shutter.pwm_frequency);
-      analogWrite(pin[GPIO_PWM1+i], 0);
-
-      if (pin[GPIO_CNTR1+i] < 99) {
-        RtcSettings.pulse_counter[i] = 0;
-      }
-      Shutter.accelerator[i] = Shutter.max_pwm_frequency / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Ramp up: %d"), Shutter.accelerator[i]);
-    }
-    Shutter.target_position[i] = target_pos;
-    Shutter.start_position[i] = Shutter.real_position[i];
-    Shutter.time[i] = 0;
-    Shutter.skip_relay_change = 0;
-    Shutter.direction[i] = direction;
-
-  }
-
-}
-
-void ShutterWaitForMotorStop(uint32_t i)
-{
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
-  if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
-    if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
-
-      while (Shutter.pwm_frequency > 0) {
-        Shutter.accelerator[i] = 0;
-        Shutter.pwm_frequency = tmax(Shutter.pwm_frequency-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
-        analogWriteFreq(Shutter.pwm_frequency);
-        analogWrite(pin[GPIO_PWM1+i], 50);
-        delay(50);
-      }
-      analogWrite(pin[GPIO_PWM1+i], 0);
-      Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-    } else {
-      ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-      delay(MOTOR_STOP_TIME);
-    }
-  } else {
-    delay(MOTOR_STOP_TIME);
-  }
-}
-
-int32_t ShutterCounterBasedPosition(uint32_t i)
-{
-  return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
-}
-
-void ShutterRelayChanged(void)
-{
-
-
-
-
-  char stemp1[10];
-
- for (uint32_t i = 0; i < shutters_present; i++) {
-  power_t powerstate_local = (power >> (Settings.shutter_startrelay[i] -1)) & 3;
-
-    uint8 manual_relays_changed = ((Shutter.switched_relay >> (Settings.shutter_startrelay[i] -1)) & 3) && SRC_SHUTTER != last_source && SRC_PULSETIMER != last_source ;
-
-    if (manual_relays_changed) {
-
-      ShutterLimitRealAndTargetPositions(i);
-      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-        ShutterWaitForMotorStop(i);
-    switch (powerstate_local) {
-     case 1:
-            ShutterStartInit(i, 1, Shutter.open_max[i]);
-       break;
-     case 3:
-       ShutterStartInit(i, -1, 0);
-       break;
-     default:
-
-       Shutter.target_position[i] = Shutter.real_position[i];
-      }
-   } else {
-        if (Shutter.direction[i] != 0 && (!powerstate_local || (powerstate_local && Shutter.mode == SHT_PULSE_OPEN__PULSE_CLOSE))) {
-     Shutter.target_position[i] = Shutter.real_position[i];
-     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Switch OFF motor. Target: %ld, source: %s, powerstate_local %ld, Shutter.switched_relay %d, manual change %d"), i+1, Shutter.target_position[i], GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), powerstate_local,Shutter.switched_relay,manual_relays_changed);
-    } else {
-     last_source = SRC_SHUTTER;
-     if (powerstate_local == 2) {
-
-            ShutterWaitForMotorStop(i);
-       ShutterStartInit(i, -1, 0);
-     } else {
-
-            ShutterWaitForMotorStop(i);
-       ShutterStartInit(i, 1, Shutter.open_max[i]);
-     }
-    }
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Target: %ld, powerstatelocal %d"), i+1, Shutter.target_position[i], powerstate_local);
-   }
-  }
- }
-}
-
-bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
-
-  uint32 min_shutterbutton_hold_timer = -1;
-  for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
-      min_shutterbutton_hold_timer = Button.hold_timer[i];
-  }
-  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
-}
-
-void ShutterButtonHandler(void)
-{
-  uint8_t buttonState = SHT_NOT_PRESSED;
-  uint8_t button = XdrvMailbox.payload;
-  uint8_t press_index;
-  uint32_t button_index = XdrvMailbox.index;
-  uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
-
-  uint16_t loops_per_second = 1000 / Settings.button_debounce;
-
-  if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-    if (Settings.flag.button_single) {
-        buttonState = SHT_PRESSED_MULTI;
-        press_index = 1;
-    } else {
-      if ((Shutter.direction[shutter_index]) && (Button.press_counter[button_index]==0)) {
-        buttonState = SHT_PRESSED_IMMEDIATE;
-        press_index = 1;
-        Button.press_counter[button_index] = 99;
-      } else
-        Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-      Button.window_timer[button_index] = loops_per_second / 2;
-    }
-    blinks = 201;
-  }
-
-  if (NOT_PRESSED == button) {
-    Button.hold_timer[button_index] = 0;
-  } else {
-    Button.hold_timer[button_index]++;
-    if (!Settings.flag.button_single) {
-      if (Settings.param[P_HOLD_IGNORE] > 0) {
-        if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
-          Button.hold_timer[button_index] = 0;
-          Button.press_counter[button_index] = 0;
-        }
-      }
-      if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {
-
-        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
-
-          for (uint32_t i = 0; i < MAX_KEYS; i++)
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
-              Button.press_counter[i] = 99;
-          press_index = 0;
-          buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
-        }
-        if (Button.press_counter[button_index]<99) {
-          press_index = 0;
-          buttonState = SHT_PRESSED_HOLD;
-        }
-        Button.press_counter[button_index] = 0;
-      }
-      if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {
-
-        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
-
-          press_index = 0;
-          buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
-        }
-      }
-    }
-  }
-
-  if (!Settings.flag.button_single) {
-    if (Button.window_timer[button_index]) {
-      Button.window_timer[button_index]--;
-    } else {
-      if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
-        if (Button.press_counter[button_index]<99) {
-
-          uint32 min_shutterbutton_press_counter = -1;
-          for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))
-              min_shutterbutton_press_counter = Button.press_counter[i];
-          }
-          if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
-
-            press_index = Button.press_counter[button_index];
-            for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
-                Button.press_counter[i] = 99;
-            buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
-          }
-          if ((buttonState != SHT_PRESSED_MULTI_SIMULTANEOUS) && (Button.press_counter[button_index]<99)) {
-
-            press_index = Button.press_counter[button_index];
-            buttonState = SHT_PRESSED_MULTI;
-          }
-        }
-        Button.press_counter[button_index] = 0;
-      }
-    }
-  }
-
- if (buttonState != SHT_NOT_PRESSED) {
-   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
-     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) {
-
-       char scmnd[20];
-       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-
-     if (!Settings.flag.button_restrict) {
-       char scmnd[20];
-       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
-      if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
-        uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
-        if (pos_press_index>3) pos_press_index=3;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, pos_press_index+1);
-        XdrvMailbox.index = shutter_index +1;
-        last_source = SRC_BUTTON;
-        XdrvMailbox.data_len = 0;
-        char databuf[1] = "";
-        XdrvMailbox.data = databuf;
-        XdrvMailbox.command = NULL;
-        if (buttonState == SHT_PRESSED_IMMEDIATE) {
-          XdrvMailbox.payload = XdrvMailbox.index;
-          CmndShutterStop();
-        }
-        else {
-          uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
-          if (position) {
-            if (Shutter.direction[shutter_index]) {
-              XdrvMailbox.payload = XdrvMailbox.index;
-              CmndShutterStop();
-            } else {
-              XdrvMailbox.payload = position = (position-1)<<1;
-              CmndShutterPosition();
-              if (Settings.shutter_button[button_index] & ((0x01<<26)<<pos_press_index)) {
-
-                char scommand[CMDSZ];
-                char stopic[TOPSZ];
-                for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-                  if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
-                    snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
-                    GetGroupTopic_P(stopic, scommand);
-                    Response_P("%d", position);
-                    MqttPublish(stopic, false);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    Response_P(PSTR("{"));
-    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-    XdrvRulesProcess();
-  }
-}
-
-void ShutterSetPosition(uint32_t device, uint32_t position)
-{
-  char svalue[32];
-  snprintf_P(svalue, sizeof(svalue), PSTR(D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION "%d %d"), device, position);
-  ExecuteCommand(svalue, SRC_IGNORE);
-}
-
-
-
-
-
-void CmndShutterOpen(void)
-{
-
-  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-    XdrvMailbox.index = XdrvMailbox.payload;
-  }
-  XdrvMailbox.payload = 100;
-  last_source = SRC_WEBGUI;
-  CmndShutterPosition();
-}
-
-void CmndShutterClose(void)
-{
-
-  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-    XdrvMailbox.index = XdrvMailbox.payload;
-  }
-  XdrvMailbox.payload = 0;
-  XdrvMailbox.data_len = 0;
-  last_source = SRC_WEBGUI;
-  CmndShutterPosition();
-}
-
-void CmndShutterStop(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
-      if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-        XdrvMailbox.index = XdrvMailbox.payload;
-      }
-      uint32_t i = XdrvMailbox.index -1;
-      if (Shutter.direction[i] != 0) {
-
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
-
-        int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
-        XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
-
-        last_source = SRC_WEBGUI;
-        CmndShutterPosition();
-      } else {
-        if (XdrvMailbox.command)
-          ResponseCmndDone();
-      }
-    } else {
-      if (XdrvMailbox.command)
-        ResponseCmndIdxChar("Locked");
-    }
-  }
-}
-
-void CmndShutterPosition(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
-      uint32_t index = XdrvMailbox.index-1;
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
-
-
-      if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
-
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
-          CmndShutterOpen();
-          return;
-        }
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
-          CmndShutterClose();
-          return;
-        }
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
-          XdrvMailbox.payload = -99;
-          CmndShutterStop();
-          return;
-        }
-      }
-
-      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
-
-      target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
-      if (XdrvMailbox.payload != -99) {
-
-        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-        Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
-
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
-      }
-      if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
-        if (Settings.shutter_options[index] & 4) {
-          if (0 == target_pos_percent) Shutter.target_position[index] -= 1 * 2000;
-          if (100 == target_pos_percent) Shutter.target_position[index] += 1 * 2000;
-        }
-        int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
-        if (Shutter.direction[index] == -new_shutterdirection) {
-
-          if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
-
-            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
-            delay(100);
-          } else {
-            if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
-              ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
-              ShutterWaitForMotorStop(index);
-            }
-          }
-        }
-        if (Shutter.direction[index] != new_shutterdirection) {
-          if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
-
-            ShutterWaitForMotorStop(index);
-            ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
-            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            if (Shutter.skip_relay_change == 0) {
-
-              ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
-
-              ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
-            }
-          } else {
-
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
-            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            if (Shutter.skip_relay_change == 0) {
-              ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
-            }
-
-          }
-          Shutter.switched_relay = 0;
-        }
-      } else {
-        target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
-        ShutterReportPosition(true);
-      }
-      XdrvMailbox.index = index +1;
-      if (XdrvMailbox.command)
-        ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
-    } else {
-      ShutterReportPosition(true);
-      if (XdrvMailbox.command)
-        ResponseCmndIdxChar("Locked");
-    }
-  }
-}
-
-void CmndShutterOpenTime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_opentime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_opentime[XdrvMailbox.index -1]) / 10, 1, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterCloseTime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_closetime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_closetime[XdrvMailbox.index -1]) / 10, 1, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterMotorDelay(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_motordelay[XdrvMailbox.index -1] = (uint16_t)(steps_per_second * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_motordelay[XdrvMailbox.index -1]) / steps_per_second, 2, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterRelay(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 64)) {
-      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      if (XdrvMailbox.payload > 0) {
-        Shutter.mask |= 3 << (XdrvMailbox.payload - 1);
-      } else {
-        Shutter.mask ^= 3 << (Settings.shutter_startrelay[XdrvMailbox.index -1] - 1);
-      }
-      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      ShutterInit();
-
-    }
-    ResponseCmndIdxNumber(Settings.shutter_startrelay[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndShutterButton(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
-    uint32_t setting = 0;
-# 915 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_27_shutter.ino"
-    if (XdrvMailbox.data_len > 0) {
-        uint32_t i = 0;
-        uint32_t button_index = 0;
-        bool done = false;
-        bool isShortCommand = false;
-        char *str_ptr;
-
-        char data_copy[strlen(XdrvMailbox.data) +1];
-        strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
-
-        for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
-          int field;
-          if (str[0] == '-') {
-            field = -1;
-          } else {
-            field = atoi(str);
-          }
-          switch (i) {
-            case 0:
-              if ((field >= -1) && (field<=4)) {
-                button_index = (field<=0)?(-1):field;
-                done = (button_index==-1);
-              } else
-                done = true;
-            break;
-            case 1:
-              if (!strcmp_P(str, PSTR("up"))) {
-                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20);
-                isShortCommand = true;
-                break;
-              } else if (!strcmp_P(str, PSTR("down"))) {
-                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20);
-                isShortCommand = true;
-                break;
-              } else if (!strcmp_P(str, PSTR("updown"))) {
-                setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
-                isShortCommand = true;
-                break;
-              }
-            case 2:
-              if (isShortCommand) {
-                if ((field==1) && (setting & (0x3F<<(2+6*3))))
-
-                  setting |= (0x3<<29);
-                done = true;
-                break;
-              }
-            case 3:
-            case 4:
-              if ((field >= -1) && (field<=100))
-                setting |= (((field>>1)+1)<<(i*6 + (2-6)));
-            break;
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-            case 9:
-              if (field==1)
-                setting |= (1<<(i + (26-5)));
-            break;
-          }
-          if (done) break;
-        }
-
-        if (button_index) {
-          if (button_index==-1) {
-
-            for (uint32_t i=0 ; i < MAX_KEYS ; i++)
-              if ((Settings.shutter_button[i]&0x3) == (XdrvMailbox.index-1))
-                Settings.shutter_button[i] = 0;
-          } else {
-            if (setting) {
-
-              setting |= (1<<31);
-              setting |= (XdrvMailbox.index-1) & 0x3;
-            }
-            Settings.shutter_button[button_index-1] = setting;
-          }
-        }
-      }
-      char setting_chr[30*MAX_KEYS] = "-", *setting_chr_ptr = setting_chr;
-      for (uint32_t i=0 ; i < MAX_KEYS ; i++) {
-        setting = Settings.shutter_button[i];
-        if ((setting&(1<<31)) && ((setting&0x3) == (XdrvMailbox.index-1))) {
-          if (*setting_chr_ptr == 0)
-            setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|"));
-          setting_chr_ptr += snprintf_P(setting_chr_ptr, 2, PSTR("%d"), i+1);
-
-          for (uint32_t j=0 ; j < 4 ; j++) {
-            int8_t pos = (((setting>> (2+6*j))&(0x3f))-1)<<1;
-            if (pos>=0)
-              setting_chr_ptr += snprintf_P(setting_chr_ptr, 5, PSTR(" %d"), pos);
-            else
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
-          }
-          for (uint32_t j=0 ; j < 5 ; j++) {
-            bool mqtt = ((setting>>(26+j))&(0x01)!=0);
-            if (mqtt)
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" 1"));
-            else
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
-          }
-        }
-      }
-      ResponseCmndIdxChar(setting_chr);
-   }
-}
-
-void CmndShutterSetHalfway(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      Settings.shutter_set50percent[XdrvMailbox.index -1] = (Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
-      ShutterInit();
-    }
-  ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndShutterFrequency(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) {
-    Shutter.max_pwm_frequency = XdrvMailbox.payload;
-    if (shutters_present < 4) {
-      Settings.shuttercoeff[4][3] = Shutter.max_pwm_frequency;
-    }
-    ShutterInit();
-    ResponseCmndNumber(XdrvMailbox.payload);
-  } else {
-    ResponseCmndNumber(Shutter.max_pwm_frequency);
-  }
-}
-
-void CmndShutterSetClose(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    Shutter.real_position[XdrvMailbox.index -1] = 0;
-    ShutterStartInit(XdrvMailbox.index -1, 0, 0);
-    Settings.shutter_position[XdrvMailbox.index -1] = 0;
-    ResponseCmndIdxChar(D_CONFIGURATION_RESET);
-  }
-}
-
-void CmndShutterInvert(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(1);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (1);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 1 : 0);
-  }
-}
-
-void CmndShutterCalibration(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      uint32_t i = 0;
-      char *str_ptr;
-
-      char data_copy[strlen(XdrvMailbox.data) +1];
-      strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
-
-      for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
-        int field = atoi(str);
-
-
-        if ((field <= 0) || (field > 30000) || ( (i>0) && (field <= messwerte[i-1]) ) ) {
-          break;
-        }
-        messwerte[i] = field;
-      }
-      for (i = 0; i < 5; i++) {
-        Settings.shuttercoeff[i][XdrvMailbox.index -1] = SHT_DIV_ROUND((uint32_t)messwerte[i] * 1000, messwerte[4]);
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
-      }
-      ShutterInit();
-      ResponseCmndIdxChar(XdrvMailbox.data);
-    } else {
-      char setting_chr[30] = "0";
-      snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);
-      ResponseCmndIdxChar(setting_chr);
-    }
-  }
-}
-
-void CmndShutterLock(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(2);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (2);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 2) ? 1 : 0);
-  }
-}
-
-void CmndShutterEnableEndStopTime(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(4);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (4);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 4) ? 1 : 0);
-  }
-}
-
-
-
-
-
-bool Xdrv27(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag3.shutter_mode) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        ShutterInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        ShutterUpdatePosition();
-        break;
-      case FUNC_EVERY_SECOND:
-
-        ShutterReportPosition(false);
-        break;
-
-      case FUNC_COMMAND:
-        result = DecodeCommand(kShutterCommands, ShutterCommand);
-        break;
-      case FUNC_JSON_APPEND:
-        for (uint8_t i = 0; i < shutters_present; i++) {
-          uint8_t position = (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
-          ResponseAppend_P(",");
-          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
-#ifdef USE_DOMOTICZ
-          if ((0 == tele_period) && (0 == i)) {
-             DomoticzSensor(DZ_SHUTTER, position);
-          }
-#endif
-        }
-        break;
-      case FUNC_SET_POWER:
-        char stemp1[10];
-
-        Shutter.switched_relay = XdrvMailbox.index ^ Shutter.old_power;
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Switched relay: %d by %s"), Shutter.switched_relay,GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource));
-        ShutterRelayChanged();
-        Shutter.old_power = XdrvMailbox.index;
-      break;
-      case FUNC_SET_DEVICE_POWER:
-        if (Shutter.skip_relay_change ) {
-          uint8_t i;
-          for (i = 0; i < devices_present; i++) {
-            if (Shutter.switched_relay &1) {
-              break;
-            }
-            Shutter.switched_relay >>= 1;
-          }
-
-          result = true;
-          Shutter.skip_relay_change = 0;
-          AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Skipping switch off relay %d"),i);
-          ExecuteCommandPower(i+1, 0, SRC_SHUTTER);
-        }
-      break;
-      case FUNC_BUTTON_PRESSED:
-        if (Settings.shutter_button[XdrvMailbox.index] & (1<<31)) {
-          ShutterButtonHandler();
-          result = true;
-        }
-      break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_28_pcf8574.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_28_pcf8574.ino"
-#ifdef USE_I2C
-#ifdef USE_PCF8574
-
-
-
-
-
-
-
-#define XDRV_28 28
-#define XI2C_02 2
-
-#define PCF8574_ADDR1 0x20
-#define PCF8574_ADDR2 0x38
-
-struct PCF8574 {
-  int error;
-  uint8_t pin[64];
-  uint8_t address[MAX_PCF8574];
-  uint8_t pin_mask[MAX_PCF8574] = { 0 };
-  uint8_t max_connected_ports = 0;
-  uint8_t max_devices = 0;
-  char stype[9];
-  bool type = false;
-} Pcf8574;
-
-void Pcf8574SwitchRelay(void)
-{
-  for (uint32_t i = 0; i < devices_present; i++) {
-    uint8_t relay_state = bitRead(XdrvMailbox.index, i);
-
-
-
-    if (Pcf8574.max_devices > 0 && Pcf8574.pin[i] < 99) {
-      uint8_t board = Pcf8574.pin[i]>>3;
-      uint8_t oldpinmask = Pcf8574.pin_mask[board];
-      uint8_t _val = bitRead(rel_inverted, i) ? !relay_state : relay_state;
-
-
-
-      if (_val) {
-        Pcf8574.pin_mask[board] |= _val << (Pcf8574.pin[i]&0x7);
-      } else {
-        Pcf8574.pin_mask[board] &= ~(1 << (Pcf8574.pin[i]&0x7));
-      }
-      if (oldpinmask != Pcf8574.pin_mask[board]) {
-        Wire.beginTransmission(Pcf8574.address[board]);
-        Wire.write(Pcf8574.pin_mask[board]);
-        Pcf8574.error = Wire.endTransmission();
-      }
-
-    }
-  }
-}
-
-void Pcf8574Init(void)
-{
-  uint8_t pcf8574_address = PCF8574_ADDR1;
-  while ((Pcf8574.max_devices < MAX_PCF8574) && (pcf8574_address < PCF8574_ADDR2 +8)) {
-
-
-
-    if (I2cSetDevice(pcf8574_address)) {
-      Pcf8574.type = true;
-
-      Pcf8574.address[Pcf8574.max_devices] = pcf8574_address;
-      Pcf8574.max_devices++;
-
-      strcpy(Pcf8574.stype, "PCF8574");
-      if (pcf8574_address >= PCF8574_ADDR2) {
-        strcpy(Pcf8574.stype, "PCF8574A");
-      }
-      I2cSetActiveFound(pcf8574_address, Pcf8574.stype);
-    }
-
-    pcf8574_address++;
-#ifdef USE_MCP230xx_ADDR
-    if (USE_MCP230xx_ADDR == pcf8574_address) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
-      pcf8574_address++;
-    }
-#endif
-    if ((PCF8574_ADDR1 +7) == pcf8574_address) {
-      pcf8574_address = PCF8574_ADDR2 +1;
-    }
-  }
-  if (Pcf8574.type) {
-    for (uint32_t i = 0; i < sizeof(Pcf8574.pin); i++) {
-      Pcf8574.pin[i] = 99;
-    }
-    devices_present = devices_present - Pcf8574.max_connected_ports;
-    Pcf8574.max_connected_ports = 0;
-    for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PCF: Device %d config 0x%02x"), idx +1, Settings.pcf8574_config[idx]);
-
-      for (uint32_t i = 0; i < 8; i++) {
-        uint8_t _result = Settings.pcf8574_config[idx] >> i &1;
-
-        if (_result > 0) {
-          Pcf8574.pin[devices_present] = i + 8 * idx;
-          bitWrite(rel_inverted, devices_present, Settings.flag3.pcf8574_ports_inverted);
-          devices_present++;
-          Pcf8574.max_connected_ports++;
-        }
-      }
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Total devices %d, PCF8574 output ports %d"), Pcf8574.max_devices, Pcf8574.max_connected_ports);
-  }
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_PCF8574 "pcf"
-
-const char HTTP_BTN_MENU_PCF8574[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_PCF8574 "' method='get'><button>" D_CONFIGURE_PCF8574 "</button></form></p>";
-
-const char HTTP_FORM_I2C_PCF8574_1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_PCF8574_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='" WEB_HANDLE_PCF8574 "'>"
-  "<p><input id='b1' name='b1' type='checkbox'%s><b>" D_INVERT_PORTS "</b></p><hr/>";
-
-const char HTTP_FORM_I2C_PCF8574_2[] PROGMEM =
-  "<tr><td><b>" D_DEVICE " %d " D_PORT " %d</b></td><td style='width:100px'><select id='i2cs%d' name='i2cs%d'>"
-  "<option%s value='0'>" D_DEVICE_INPUT "</option>"
-  "<option%s value='1'>" D_DEVICE_OUTPUT "</option>"
-  "</select></td></tr>";
-
-void HandlePcf8574(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_CONFIGURE_PCF8574));
-
-  if (WebServer->hasArg("save")) {
-    Pcf8574SaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  WSContentStart_P(D_CONFIGURE_PCF8574);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_I2C_PCF8574_1, (Settings.flag3.pcf8574_ports_inverted) ? " checked" : "");
-  WSContentSend_P(HTTP_TABLE100);
-  for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
-    for (uint32_t idx2 = 0; idx2 < 8; idx2++) {
-      uint8_t helper = 1 << idx2;
-      WSContentSend_P(HTTP_FORM_I2C_PCF8574_2,
-        idx +1, idx2,
-        idx2 + 8*idx,
-        idx2 + 8*idx,
-        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 0) ? " selected " : " ",
-        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 1) ? " selected " : " "
-      );
-    }
-  }
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void Pcf8574SaveSettings(void)
-{
-  char stemp[7];
-  char tmp[100];
-
-
-
-  Settings.flag3.pcf8574_ports_inverted = WebServer->hasArg("b1");
-  for (byte idx = 0; idx < Pcf8574.max_devices; idx++) {
-    byte count=0;
-    byte n = Settings.pcf8574_config[idx];
-    while(n!=0) {
-      n = n&(n-1);
-      count++;
-    }
-    if (count <= devices_present) {
-      devices_present = devices_present - count;
-    }
-    for (byte i = 0; i < 8; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("i2cs%d"), i+8*idx);
-      WebGetArg(stemp, tmp, sizeof(tmp));
-      byte _value = (!strlen(tmp)) ? 0 : atoi(tmp);
-      if (_value) {
-        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] | 1 << i;
-        devices_present++;
-        Pcf8574.max_connected_ports++;
-      } else {
-        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] & ~(1 << i );
-      }
-    }
-
-
-
-  }
-}
-#endif
-
-
-
-
-
-bool Xdrv28(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_02)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_PRE_INIT == function) {
-    Pcf8574Init();
-  }
-  else if (Pcf8574.type) {
-    switch (function) {
-      case FUNC_SET_POWER:
-        Pcf8574SwitchRelay();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_PCF8574);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_PCF8574, HandlePcf8574);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-#ifdef USE_DEEPSLEEP
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-#define XDRV_29 29
-
-#define D_PRFX_DEEPSLEEP "DeepSleep"
-#define D_CMND_DEEPSLEEP_TIME "Time"
-
-const uint32_t DEEPSLEEP_MAX = 10 * 366 * 24 * 60 * 60;
-const uint32_t DEEPSLEEP_MAX_CYCLE = 60 * 60;
-const uint32_t DEEPSLEEP_MIN_TIME = 5;
-const uint32_t DEEPSLEEP_START_COUNTDOWN = 4;
-
-const char kDeepsleepCommands[] PROGMEM = D_PRFX_DEEPSLEEP "|"
-  D_CMND_DEEPSLEEP_TIME ;
-
-void (* const DeepsleepCommand[])(void) PROGMEM = {
-  &CmndDeepsleepTime };
-
-uint32_t deepsleep_sleeptime = 0;
-uint8_t deepsleep_flag = 0;
-
-bool DeepSleepEnabled(void)
-{
-  if ((Settings.deepsleep < 10) || (Settings.deepsleep > DEEPSLEEP_MAX)) {
-    Settings.deepsleep = 0;
-    return false;
-  }
-
-  if (pin[GPIO_DEEPSLEEP] < 99) {
-    pinMode(pin[GPIO_DEEPSLEEP], INPUT_PULLUP);
-    return (digitalRead(pin[GPIO_DEEPSLEEP]));
-  }
-
-  return true;
-}
-
-void DeepSleepReInit(void)
-{
-  if ((ResetReason() == REASON_DEEP_SLEEP_AWAKE) && DeepSleepEnabled()) {
-    if ((RtcSettings.ultradeepsleep > DEEPSLEEP_MAX_CYCLE) && (RtcSettings.ultradeepsleep < 1700000000)) {
-
-      RtcSettings.ultradeepsleep = RtcSettings.ultradeepsleep - DEEPSLEEP_MAX_CYCLE;
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Remain DeepSleep %d"), RtcSettings.ultradeepsleep);
-      RtcSettingsSave();
-      RtcRebootReset();
-      ESP.deepSleep(100 * RtcSettings.deepsleep_slip * (DEEPSLEEP_MAX_CYCLE < RtcSettings.ultradeepsleep ? DEEPSLEEP_MAX_CYCLE : RtcSettings.ultradeepsleep), WAKE_RF_DEFAULT);
-      yield();
-
-    }
-  }
-
-  RtcSettings.ultradeepsleep = 0;
-}
-
-void DeepSleepPrepare(void)
-{
-
-
-
-
-  if ((RtcSettings.nextwakeup == 0) ||
-      (RtcSettings.deepsleep_slip < 9000) ||
-      (RtcSettings.deepsleep_slip > 11000) ||
-      (RtcSettings.nextwakeup > (UtcTime() + Settings.deepsleep))) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Reset wrong settings wakeup: %ld, slip %ld"), RtcSettings.nextwakeup, RtcSettings.deepsleep_slip );
-    RtcSettings.nextwakeup = 0;
-    RtcSettings.deepsleep_slip = 10000;
-  }
-
-
-
-  int16_t timeslip = (int16_t)(RtcSettings.nextwakeup + millis() / 1000 - UtcTime()) * 10;
-
-
-
-  timeslip = (timeslip < -(int32_t)Settings.deepsleep) ? 0 : (timeslip > (int32_t)Settings.deepsleep) ? 0 : 1;
-  if (timeslip) {
-    RtcSettings.deepsleep_slip = (Settings.deepsleep + RtcSettings.nextwakeup - UtcTime()) * RtcSettings.deepsleep_slip / tmax((Settings.deepsleep - (millis() / 1000)),5);
-
-    RtcSettings.deepsleep_slip = tmin(tmax(RtcSettings.deepsleep_slip, 9000), 11000);
-    RtcSettings.nextwakeup += Settings.deepsleep;
-  }
-
-
-
-  if (RtcSettings.nextwakeup <= (UtcTime() - DEEPSLEEP_MIN_TIME)) {
-
-    RtcSettings.nextwakeup += (((UtcTime() + DEEPSLEEP_MIN_TIME - RtcSettings.nextwakeup) / Settings.deepsleep) + 1) * Settings.deepsleep;
-  }
-
-  String dt = GetDT(RtcSettings.nextwakeup + LocalTime() - UtcTime());
-
-
-  deepsleep_sleeptime = tmin((uint32_t)DEEPSLEEP_MAX_CYCLE ,RtcSettings.nextwakeup - UtcTime());
-
-
-  Response_P(PSTR("{\"" D_PRFX_DEEPSLEEP "\":{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%d}}"), (char*)dt.c_str(), RtcSettings.nextwakeup);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_STATUS));
-
-
-
-}
-
-void DeepSleepStart(void)
-{
-  AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Sleeping"));
-
-  WifiShutdown();
-  RtcSettings.ultradeepsleep = RtcSettings.nextwakeup - UtcTime();
-  RtcSettingsSave();
-
-  ESP.deepSleep(100 * RtcSettings.deepsleep_slip * deepsleep_sleeptime);
-  yield();
-}
-
-void DeepSleepEverySecond(void)
-{
-  if (!deepsleep_flag) { return; }
-
-  if (DeepSleepEnabled()) {
-    if (DEEPSLEEP_START_COUNTDOWN == deepsleep_flag) {
-      SettingsSaveAll();
-      DeepSleepPrepare();
-    }
-    deepsleep_flag--;
-    if (deepsleep_flag <= 0) {
-      DeepSleepStart();
-    }
-  } else {
-    deepsleep_flag = 0;
-  }
-}
-
-
-
-
-
-void CmndDeepsleepTime(void)
-{
-  if ((0 == XdrvMailbox.payload) ||
-     ((XdrvMailbox.payload > 10) && (XdrvMailbox.payload < DEEPSLEEP_MAX))) {
-    Settings.deepsleep = XdrvMailbox.payload;
-    RtcSettings.nextwakeup = 0;
-    deepsleep_flag = (0 == XdrvMailbox.payload) ? 0 : DEEPSLEEP_START_COUNTDOWN;
-    if (deepsleep_flag) {
-      if (!Settings.tele_period) {
-        Settings.tele_period = TELE_PERIOD;
-      }
-    }
-  }
-  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.deepsleep);
-}
-
-
-
-
-
-bool Xdrv29(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_SECOND:
-      DeepSleepEverySecond();
-      break;
-    case FUNC_AFTER_TELEPERIOD:
-        if (DeepSleepEnabled() && !deepsleep_flag && (Settings.tele_period == 10 || Settings.tele_period == 300 || UpTime() > Settings.tele_period)) {
-        deepsleep_flag = DEEPSLEEP_START_COUNTDOWN;
-      }
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kDeepsleepCommands, DeepsleepCommand);
-      break;
-    case FUNC_PRE_INIT:
-      DeepSleepReInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-#ifdef USE_LIGHT
-#ifdef USE_EXS_DIMMER
-
-
-
-
-
-
-
-#define XDRV_30 30
-
-#define EXS_GATE_1_ON 0x20
-#define EXS_GATE_1_OFF 0x21
-#define EXS_DIMM_1_ON 0x22
-#define EXS_DIMM_1_OFF 0x23
-#define EXS_DIMM_1_TBL 0x24
-#define EXS_DIMM_1_VAL 0x25
-#define EXS_GATE_2_ON 0x30
-#define EXS_GATE_2_OFF 0x31
-#define EXS_DIMM_2_ON 0x32
-#define EXS_DIMM_2_OFF 0x33
-#define EXS_DIMM_2_TBL 0x34
-#define EXS_DIMM_2_VAL 0x35
-#define EXS_GATES_ON 0x40
-#define EXS_GATES_OFF 0x41
-#define EXS_DIMMS_ON 0x50
-#define EXS_DIMMS_OFF 0x51
-#define EXS_CH_LOCK 0x60
-#define EXS_GET_VALUES 0xFA
-#define EXS_WRITE_EE 0xFC
-#define EXS_READ_EE 0xFD
-#define EXS_GET_VERSION 0xFE
-#define EXS_RESET 0xFF
-
-#define EXS_BUFFER_SIZE 256
-#define EXS_ACK_TIMEOUT 200
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *ExsSerial = nullptr;
-
-typedef struct
-{
-  uint8_t on = 0;
-  uint8_t bright_tbl = 0;
-  uint8_t dimm = 0;
-  uint8_t impuls_start = 0;
-  uint32_t impuls_len = 0;
-} CHANNEL;
-
-typedef struct
-{
-  uint8_t version_major = 0;
-  uint8_t version_minor = 0;
-  CHANNEL channel[2];
-  uint8_t gate_lock = 0;
-} DIMMER;
-
-struct EXS
-{
-  uint8_t *buffer = nullptr;
-  int byte_counter = 0;
-  int cmd_status = 0;
-  uint8_t power = 0;
-  uint8_t dimm[2] = {0, 0};
-  DIMMER dimmer;
-} Exs;
-
-
-
-
-
-uint8_t crc8(const uint8_t *p, uint8_t len)
-{
-  const uint8_t table[] = {
-      0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
-      0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D};
-
-  const uint8_t table_rev[] = {
-      0x00, 0x70, 0xE0, 0x90, 0xC1, 0xB1, 0x21, 0x51,
-      0x83, 0xF3, 0x63, 0x13, 0x42, 0x32, 0xA2, 0xD2};
-
-  uint8_t offset;
-  uint8_t temp, crc8_temp;
-  uint8_t crc8 = 0;
-
-  for (int i = 0; i < len; i++)
-  {
-    temp = *(p + i);
-    offset = temp ^ crc8;
-    offset >>= 4;
-    crc8_temp = crc8 & 0x0f;
-    crc8 = crc8_temp ^ table_rev[offset];
-    offset = crc8 ^ temp;
-    offset &= 0x0f;
-    crc8_temp = crc8 & 0xf0;
-    crc8 = crc8_temp ^ table[offset];
-  }
-  return crc8 ^ 0x55;
-}
-
-void ExsSerialSend(const uint8_t data[] = nullptr, uint16_t len = 0)
-{
-  int retries = 3;
-  char rc;
-
-#ifdef EXS_DEBUG
-  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: Tx Packet: \""));
-  for (uint32_t i = 0; i < len; i++)
-  {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, data[i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
-  AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-  while (retries)
-  {
-    retries--;
-
-    ExsSerial->write(data, len);
-    ExsSerial->flush();
-
-
-    uint32_t snd_time = millis();
-    while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
-           (!ExsSerial->available()))
-      ;
-
-    if (!ExsSerial->available())
-    {
-
-#ifdef EXS_DEBUG
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("ESX: serial send timeout"));
-#endif
-      continue;
-    }
-
-    rc = ExsSerial->read();
-    if (rc == 0xFF)
-      break;
-  }
-}
-
-void ExsSendCmd(uint8_t cmd, uint8_t value)
-{
-  uint8_t buffer[8];
-  uint16_t len;
-
-  buffer[0] = 0x7b;
-  buffer[3] = cmd;
-
-  switch (cmd)
-  {
-  case EXS_GATE_1_ON:
-  case EXS_GATE_1_OFF:
-  case EXS_DIMM_1_ON:
-  case EXS_DIMM_1_OFF:
-  case EXS_GATE_2_ON:
-  case EXS_GATE_2_OFF:
-  case EXS_DIMM_2_ON:
-  case EXS_DIMM_2_OFF:
-  case EXS_GATES_ON:
-  case EXS_GATES_OFF:
-  case EXS_DIMMS_ON:
-  case EXS_DIMMS_OFF:
-  case EXS_GET_VALUES:
-  case EXS_GET_VERSION:
-  case EXS_RESET:
-    buffer[2] = 1;
-    len = 4;
-    break;
-
-  case EXS_CH_LOCK:
-  case EXS_DIMM_1_TBL:
-  case EXS_DIMM_1_VAL:
-  case EXS_DIMM_2_TBL:
-  case EXS_DIMM_2_VAL:
-    buffer[2] = 2;
-    buffer[4] = value;
-    len = 5;
-    break;
-  }
-  buffer[1] = crc8(&buffer[3], buffer[2]);
-
-  ExsSerialSend(buffer, len);
-}
-
-uint8_t ExsSetPower(uint8_t device, uint8_t power)
-{
-  Exs.dimmer.channel[device].dimm = power;
-  ExsSendCmd(EXS_DIMM_1_ON + 0x10 * device + power ^ 1, 0);
-}
-
-uint8_t ExsSetBri(uint8_t device, uint8_t bri)
-{
-  Exs.dimmer.channel[device].bright_tbl = bri;
-  ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * device, bri);
-}
-
-uint8_t ExsSyncState(uint8_t device)
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Channel %d Power Want %d, Is %d"),
-            device, bitRead(Exs.power, device), Exs.dimmer.channel[device].dimm);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Set Channel %d Brightness Want %d, Is %d"),
-            device, Exs.dimm[device], Exs.dimmer.channel[device].bright_tbl);
-#endif
-
-  if (bitRead(Exs.power, device) &&
-      Exs.dimm[device] != Exs.dimmer.channel[device].bright_tbl) {
-    ExsSetBri(device, Exs.dimm[device]);
-  }
-
-  if (!Exs.dimm[device]) {
-    Exs.dimmer.channel[device].dimm = 0;
-  } else if (Exs.dimmer.channel[device].dimm != bitRead(Exs.power, device)) {
-    ExsSetPower(device, bitRead(Exs.power, device));
-  }
-}
-
-bool ExsSyncState()
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Serial %p, Cmd %d"), ExsSerial, Exs.cmd_status);
-#endif
-
-  if (!ExsSerial || Exs.cmd_status != 0)
-    return false;
-
-  ExsSyncState(0);
-  ExsSyncState(1);
-}
-
-void ExsDebugState()
-{
-#ifdef EXS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: MCU v%d.%d, c0: On:%d,Dim:%d,Tbl:%d(%d%%), c1: On:%d,Dim:%d,Tbl:%d(%d%%), ChLock: %d"),
-              Exs.dimmer.version_major, Exs.dimmer.version_minor,
-              Exs.dimmer.channel[0].on, Exs.dimmer.channel[0].dimm,
-              Exs.dimmer.channel[0].bright_tbl,
-              changeUIntScale(Exs.dimmer.channel[0].bright_tbl, 0, 255, 0, 100),
-              Exs.dimmer.channel[1].on, Exs.dimmer.channel[1].dimm,
-              Exs.dimmer.channel[1].bright_tbl,
-              changeUIntScale(Exs.dimmer.channel[1].bright_tbl, 0, 255, 0, 100),
-              Exs.dimmer.gate_lock);
-#endif
-}
-
-void ExsPacketProcess(void)
-{
-  uint8_t len = Exs.buffer[1];
-  uint8_t cmd = Exs.buffer[2];
-
-  switch (cmd)
-  {
-  case EXS_GET_VALUES:
-# 294 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-    if (len > 9)
-    {
-      Exs.dimmer.version_major = Exs.buffer[3];
-      Exs.dimmer.version_minor = Exs.buffer[4];
-
-
-      Exs.dimmer.channel[0].on = Exs.buffer[6];
-      Exs.dimmer.channel[0].dimm = Exs.buffer[6];
-      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[7];
-
-
-      Exs.dimmer.channel[1].on = Exs.buffer[9];
-      Exs.dimmer.channel[1].dimm = Exs.buffer[9];
-      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[10];
-
-      Exs.dimmer.gate_lock = Exs.buffer[11];
-    }
-    else
-# 327 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-    {
-      Exs.dimmer.version_major = 1;
-      Exs.dimmer.version_minor = 0;
-
-
-      Exs.dimmer.channel[0].on = Exs.buffer[4] - 48;
-      Exs.dimmer.channel[0].dimm = Exs.buffer[4] - 48;
-      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[5] - 48;
-
-
-      Exs.dimmer.channel[1].on = Exs.buffer[7] - 48;
-      Exs.dimmer.channel[1].dimm = Exs.buffer[7] - 48;
-      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[8] - 48;
-
-      Exs.dimmer.gate_lock = Exs.buffer[9] - 48;
-    }
-
-    ExsDebugState();
-    ExsSyncState();
-    ExsDebugState();
-    break;
-  default:
-    break;
-  }
-}
-
-
-
-bool ExsModuleSelected(void)
-{
-  Settings.light_correction = 0;
-  Settings.flag.mqtt_serial = 0;
-  Settings.flag3.pwm_multi_channels = 1;
-  SetSeriallog(LOG_LEVEL_NONE);
-
-  devices_present = +2;
-  light_type = LT_SERIAL2;
-  return true;
-}
-
-bool ExsSetChannels(void)
-{
-#ifdef EXS_DEBUG
-  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: SetChannels: \""));
-  for (int i = 0; i < XdrvMailbox.data_len; i++)
-  {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, ((uint8_t *)XdrvMailbox.data)[i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
-  AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-  Exs.dimm[0] = ((uint8_t *)XdrvMailbox.data)[0];
-  Exs.dimm[1] = ((uint8_t *)XdrvMailbox.data)[1];
-  return ExsSyncState();
-}
-
-bool ExsSetPower(void)
-{
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Set Power, Device %d, Power 0x%02x"),
-            active_device, XdrvMailbox.index);
-
-  Exs.power = XdrvMailbox.index;
-  return ExsSyncState();
-}
-
-void EsxMcuStart(void)
-{
-  int retries = 3;
-
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Request MCU configuration, PIN %d to Low"), pin[GPIO_EXS_ENABLE]);
-#endif
-
-  pinMode(pin[GPIO_EXS_ENABLE], OUTPUT);
-  digitalWrite(pin[GPIO_EXS_ENABLE], LOW);
-
-  delay(1);
-
-  while (ExsSerial->available())
-  {
-
-    ExsSerial->read();
-  }
-}
-
-void ExsInit(void)
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Starting Tx %d Rx %d"), pin[GPIO_TXD], pin[GPIO_RXD]);
-#endif
-
-  Exs.buffer = (uint8_t *)malloc(EXS_BUFFER_SIZE);
-  if (Exs.buffer != nullptr)
-  {
-    ExsSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-    if (ExsSerial->begin(9600))
-    {
-      if (ExsSerial->hardwareSerial())
-      {
-        ClaimSerial();
-      }
-      ExsSerial->flush();
-      EsxMcuStart();
-      ExsSendCmd(EXS_CH_LOCK, 0);
-      ExsSendCmd(EXS_GET_VALUES, 0);
-   }
-  }
-}
-
-void ExsSerialInput(void)
-{
-  while (ExsSerial->available())
-  {
-    yield();
-    uint8_t serial_in_byte = ExsSerial->read();
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Serial In Byte 0x%02x"), serial_in_byte);
-
-    if (Exs.cmd_status == 0 &&
-        serial_in_byte == 0x7B)
-    {
-      Exs.cmd_status = 1;
-      Exs.byte_counter = 0;
-    }
-    else if (Exs.byte_counter >= EXS_BUFFER_SIZE)
-    {
-      Exs.cmd_status = 0;
-    }
-    else if (Exs.cmd_status == 1)
-    {
-      Exs.buffer[Exs.byte_counter++] = serial_in_byte;
-
-      if (Exs.byte_counter > 2 && Exs.byte_counter == Exs.buffer[1] + 2)
-      {
-        uint8_t crc = crc8(&Exs.buffer[2], Exs.buffer[1]);
-
-
-        Exs.cmd_status = 0;
-
-#ifdef EXS_DEBUG
-        snprintf_P(log_data, sizeof(log_data), PSTR("EXS: RX Packet: \""));
-        for (uint32_t i = 0; i < Exs.byte_counter; i++)
-        {
-          snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, Exs.buffer[i]);
-        }
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s\", CRC: 0x%02x"), log_data, crc);
-        AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-        if (Exs.buffer[0] == crc)
-        {
-          ExsSerial->write(0xFF);
-          ExsPacketProcess();
-        }
-        else
-        {
-          ExsSerial->write(0x00);
-        }
-
-      }
-    }
-  }
-}
-
-
-
-
-
-#ifdef EXS_MCU_CMNDS
-
-#define D_PRFX_EXS "Exs"
-#define D_CMND_EXS_DIMM "Dimm"
-#define D_CMND_EXS_DIMM_TBL "DimmTbl"
-#define D_CMND_EXS_DIMM_VAL "DimmVal"
-#define D_CMND_EXS_DIMMS "Dimms"
-#define D_CMND_EXS_CH_LOCK "ChLock"
-#define D_CMND_EXS_STATE "State"
-
-const char kExsCommands[] PROGMEM = D_PRFX_EXS "|"
-  D_CMND_EXS_DIMM "|" D_CMND_EXS_DIMM_TBL "|" D_CMND_EXS_DIMM_VAL "|"
-  D_CMND_EXS_DIMMS "|" D_CMND_EXS_CH_LOCK "|"
-  D_CMND_EXS_STATE;
-
-void (* const ExsCommand[])(void) PROGMEM = {
-  &CmndExsDimm, &CmndExsDimmTbl, &CmndExsDimmVal,
-  &CmndExsDimms, &CmndExsChLock,
-  &CmndExsState };
-
-void CmndExsDimm(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1)) {
-    ExsSendCmd(EXS_DIMM_1_ON + 0x10 * (XdrvMailbox.index - 1) +
-               XdrvMailbox.payload ^ 1, 0);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimmTbl(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
-    ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * (XdrvMailbox.index - 1),
-               XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimmVal(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
-    ExsSendCmd(EXS_DIMM_1_VAL + 0x10 * (XdrvMailbox.index - 1),
-               XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimms(void)
-{
-  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
-    ExsSendCmd(EXS_DIMMS_ON + XdrvMailbox.payload ^ 1, 0);
-  }
-  CmndExsState();
-}
-
-void CmndExsChLock(void)
-{
-  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
-    ExsSendCmd(EXS_CH_LOCK, XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsState(void)
-{
-  ExsSendCmd(EXS_GET_VALUES, 0);
-
-
-  uint32_t snd_time = millis();
-  while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
-         (!ExsSerial->available()))
-    ;
-  ExsSerialInput();
-
-  Response_P(PSTR("{\"" D_CMND_EXS_STATE "\":{"));
-  ResponseAppend_P(PSTR("\"McuVersion\":\"%d.%d\","
-                        "\"Channels\":["),
-                   Exs.dimmer.version_major, Exs.dimmer.version_minor);
-
-  for (uint32_t i = 0; i < 2; i++) {
-    if (i != 0) {
-      ResponseAppend_P(PSTR(","));
-    }
-    ResponseAppend_P(PSTR("{\"On\":\"%d\","
-                          "\"BrightProz\":\"%d\","
-                          "\"BrightTab\":\"%d\","
-                          "\"Dimm\":\"%d\"}"),
-                     Exs.dimmer.channel[i].on,
-                     changeUIntScale(Exs.dimmer.channel[i].bright_tbl, 0, 255, 0, 100),
-                     Exs.dimmer.channel[i].bright_tbl,
-                     Exs.dimmer.channel[i].dimm);
-  }
-  ResponseAppend_P(PSTR("],"));
-  ResponseAppend_P(PSTR("\"GateLock\":\"%d\""), Exs.dimmer.gate_lock);
-  ResponseJsonEndEnd();
-}
-
-#endif
-
-
-
-
-
-bool Xdrv30(uint8_t function)
-{
-  bool result = false;
-
-  if (EXS_DIMMER == my_module_type)
-  {
-    switch (function)
-    {
-    case FUNC_LOOP:
-      if (ExsSerial)
-        ExsSerialInput();
-      break;
-    case FUNC_MODULE_INIT:
-      result = ExsModuleSelected();
-      break;
-    case FUNC_INIT:
-      ExsInit();
-      break;
-    case FUNC_SET_DEVICE_POWER:
-      result = ExsSetPower();
-      break;
-    case FUNC_SET_CHANNELS:
-      result = ExsSetChannels();
-      break;
-#ifdef EXS_MCU_CMNDS
-    case FUNC_COMMAND:
-      result = DecodeCommand(kExsCommands, ExsCommand);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
-#ifdef USE_TASMOTA_SLAVE
-
-
-
-
-#define XDRV_31 31
-
-#define CONST_STK_CRC_EOP 0x20
-
-#define CMND_STK_GET_SYNC 0x30
-#define CMND_STK_SET_DEVICE 0x42
-#define CMND_STK_SET_DEVICE_EXT 0x45
-#define CMND_STK_ENTER_PROGMODE 0x50
-#define CMND_STK_LEAVE_PROGMODE 0x51
-#define CMND_STK_LOAD_ADDRESS 0x55
-#define CMND_STK_PROG_PAGE 0x64
-
-
-
-
-
-#define CMND_START 0xFC
-#define CMND_END 0xFD
-
-#define CMND_FEATURES 0x01
-#define CMND_JSON 0x02
-#define CMND_FUNC_EVERY_SECOND 0x03
-#define CMND_FUNC_EVERY_100_MSECOND 0x04
-#define CMND_SLAVE_SEND 0x05
-#define CMND_PUBLISH_TELE 0x06
-#define CMND_EXECUTE_CMND 0x07
-
-#define PARAM_DATA_START 0xFE
-#define PARAM_DATA_END 0xFF
-
-#include <TasmotaSerial.h>
-
-
-
-
-
-class SimpleHexParse {
-  public:
-   SimpleHexParse(void);
-   uint8_t parseLine(char *hexline);
-   uint8_t ptr_l = 0;
-   uint8_t ptr_h = 0;
-   bool PageIsReady = false;
-   bool firstrun = true;
-   bool EndOfFile = false;
-   uint8_t FlashPage[128];
-   uint8_t FlashPageIdx = 0;
-   uint8_t layoverBuffer[16];
-   uint8_t layoverIdx = 0;
-   uint8_t getByte(char *hexline, uint8_t idx);
-};
-
-SimpleHexParse::SimpleHexParse(void)
-{
-
-}
-
-uint8_t SimpleHexParse::parseLine(char *hexline)
-{
-  if (layoverIdx) {
-    memcpy(&FlashPage[0], &layoverBuffer[0], layoverIdx);
-    FlashPageIdx = layoverIdx;
-    layoverIdx = 0;
-  }
-  uint8_t len = getByte(hexline, 1);
-  uint8_t addr_h = getByte(hexline, 2);
-  uint8_t addr_l = getByte(hexline, 3);
-  uint8_t rectype = getByte(hexline, 4);
-  for (uint8_t idx = 0; idx < len; idx++) {
-       if (FlashPageIdx < 128) {
-         FlashPage[FlashPageIdx] = getByte(hexline, idx+5);
-         FlashPageIdx++;
-       } else {
-         layoverBuffer[layoverIdx] = getByte(hexline, idx+5);
-         layoverIdx++;
-       }
-  }
-  if (1 == rectype) {
-    EndOfFile = true;
-    while (FlashPageIdx < 128) {
-      FlashPage[FlashPageIdx] = 0xFF;
-      FlashPageIdx++;
-    }
-  }
-  if (FlashPageIdx == 128) {
-    if (firstrun) {
-      firstrun = false;
-    } else {
-      ptr_l += 0x40;
-      if (ptr_l == 0) {
-        ptr_l = 0;
-        ptr_h++;
-      }
-    }
-    firstrun = false;
-    PageIsReady = true;
-  }
-  return 0;
-}
-
-uint8_t SimpleHexParse::getByte(char* hexline, uint8_t idx)
-{
- char buff[3];
- buff[3] = '\0';
- memcpy(&buff, &hexline[(idx*2)-1], 2);
- return strtol(buff, 0, 16);
-}
-
-
-
-
-
-struct TSLAVE {
-  uint32_t spi_hex_size = 0;
-  uint32_t spi_sector_counter = 0;
-  uint8_t spi_sector_cursor = 0;
-  uint8_t inverted = LOW;
-  bool type = false;
-  bool flashing = false;
-  bool SerialEnabled = false;
-  uint8_t waitstate = 0;
-  bool unsupported = false;
-} TSlave;
-
-typedef union {
-  uint32_t data;
-  struct {
-    uint32_t func_json_append : 1;
-    uint32_t func_every_second : 1;
-    uint32_t func_every_100_msecond : 1;
-    uint32_t func_slave_send : 1;
-    uint32_t spare4 : 1;
-    uint32_t spare5 : 1;
-    uint32_t spare6 : 1;
-    uint32_t spare7 : 1;
-    uint32_t spare8 : 1;
-    uint32_t spare9 : 1;
-    uint32_t spare10 : 1;
-    uint32_t spare11 : 1;
-    uint32_t spare12 : 1;
-    uint32_t spare13 : 1;
-    uint32_t spare14 : 1;
-    uint32_t spare15 : 1;
-    uint32_t spare16 : 1;
-    uint32_t spare17 : 1;
-    uint32_t spare18 : 1;
-    uint32_t spare19 : 1;
-    uint32_t spare20 : 1;
-    uint32_t spare21 : 1;
-    uint32_t spare22 : 1;
-    uint32_t spare23 : 1;
-    uint32_t spare24 : 1;
-    uint32_t spare25 : 1;
-    uint32_t spare26 : 1;
-    uint32_t spare27 : 1;
-    uint32_t spare28 : 1;
-    uint32_t spare29 : 1;
-    uint32_t spare30 : 1;
-    uint32_t spare31 : 1;
-  };
-} TSlaveFeatureCfg;
-
-
-
-
-
-
-struct TSLAVE_FEATURES {
-  uint32_t features_version;
-  TSlaveFeatureCfg features;
-} TSlaveSettings;
-
-struct TSLAVE_COMMAND {
-  uint8_t command;
-  uint8_t parameter;
-  uint8_t unused2;
-  uint8_t unused3;
-} TSlaveCommand;
-
-TasmotaSerial *TasmotaSlave_Serial;
-
-uint32_t TasmotaSlave_FlashStart(void)
-{
-  return (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 2;
-}
-
-uint8_t TasmotaSlave_UpdateInit(void)
-{
-  TSlave.spi_hex_size = 0;
-  TSlave.spi_sector_counter = TasmotaSlave_FlashStart();
-  TSlave.spi_sector_cursor = 0;
-  return 0;
-}
-
-void TasmotaSlave_Reset(void)
-{
-  if (TSlave.SerialEnabled) {
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
-    delay(1);
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], TSlave.inverted);
-    delay(1);
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
-    delay(5);
-  }
-}
-
-uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout)
-{
-  int timer = 0;
-  while (timer < timeout) {
-    if (TasmotaSlave_Serial->available() >= dataCount) {
-      return 1;
-    }
-    delay(1);
-    timer++;
-  }
-  return 0;
-}
-
-uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count)
-{
-  TasmotaSlave_Serial->write(bytes, count);
-  TasmotaSlave_waitForSerialData(2, 250);
-  uint8_t sync = TasmotaSlave_Serial->read();
-  uint8_t ok = TasmotaSlave_Serial->read();
-  if ((sync == 0x14) && (ok == 0x10)) {
-    return 1;
-  }
-  return 0;
-}
-
-uint8_t TasmotaSlave_execCmd(uint8_t cmd)
-{
-  uint8_t bytes[] = { cmd, CONST_STK_CRC_EOP };
-  return TasmotaSlave_sendBytes(bytes, 2);
-}
-
-uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count)
-{
-  uint8_t bytes[32];
-  bytes[0] = cmd;
-  int i = 0;
-  while (i < count) {
-    bytes[i + 1] = params[i];
-    i++;
-  }
-  bytes[i + 1] = CONST_STK_CRC_EOP;
-  return TasmotaSlave_sendBytes(bytes, i + 2);
-}
-
-uint8_t TasmotaSlave_exitProgMode(void)
-{
-  return TasmotaSlave_execCmd(CMND_STK_LEAVE_PROGMODE);
-}
-
-uint8_t TasmotaSlave_SetupFlash(void)
-{
-  uint8_t ProgParams[] = {0x86, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00};
-  uint8_t ExtProgParams[] = {0x05, 0x04, 0xd7, 0xc2, 0x00};
-  TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_FLASH_SPEED);
-  if (TasmotaSlave_Serial->hardwareSerial()) {
-    ClaimSerial();
-  }
-
-  TasmotaSlave_Reset();
-
-  uint8_t timeout = 0;
-  uint8_t no_error = 0;
-  while (50 > timeout) {
-    if (TasmotaSlave_execCmd(CMND_STK_GET_SYNC)) {
-      timeout = 200;
-      no_error = 1;
-    }
-    timeout++;
-    delay(1);
-  }
-  if (no_error) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Found bootloader"));
-  } else {
-    no_error = 0;
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Bootloader could not be found"));
-  }
-  if (no_error) {
-    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE, ProgParams, sizeof(ProgParams))) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (1)"));
-    }
-  }
-  if (no_error) {
-    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE_EXT, ExtProgParams, sizeof(ExtProgParams))) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (2)"));
-    }
-  }
-  if (no_error) {
-    if (TasmotaSlave_execCmd(CMND_STK_ENTER_PROGMODE)) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Failed to put bootloader into programming mode"));
-    }
-  }
-  return no_error;
-}
-
-uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo)
-{
-  uint8_t params[] = { adrLo, adrHi };
-  return TasmotaSlave_execParam(CMND_STK_LOAD_ADDRESS, params, sizeof(params));
-}
-
-void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data)
-{
-  uint8_t Header[] = {CMND_STK_PROG_PAGE, 0x00, 0x80, 0x46};
-  TasmotaSlave_loadAddress(addr_h, addr_l);
-  TasmotaSlave_Serial->write(Header, 4);
-  for (int i = 0; i < 128; i++) {
-    TasmotaSlave_Serial->write(data[i]);
-  }
-  TasmotaSlave_Serial->write(CONST_STK_CRC_EOP);
-  TasmotaSlave_waitForSerialData(2, 250);
-  TasmotaSlave_Serial->read();
-  TasmotaSlave_Serial->read();
-}
-
-void TasmotaSlave_Flash(void)
-{
-  bool reading = true;
-  uint32_t read = 0;
-  uint32_t processed = 0;
-  char thishexline[50];
-  uint8_t position = 0;
-  char* flash_buffer;
-
-  SimpleHexParse hexParse = SimpleHexParse();
-
-  if (!TasmotaSlave_SetupFlash()) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flashing aborted!"));
-    TSlave.flashing = false;
-    restart_flag = 2;
-    return;
-  }
-
-  flash_buffer = new char[SPI_FLASH_SEC_SIZE];
-  uint32_t flash_start = TasmotaSlave_FlashStart() * SPI_FLASH_SEC_SIZE;
-  while (reading) {
-    ESP.flashRead(flash_start + read, (uint32_t*)flash_buffer, SPI_FLASH_SEC_SIZE);
-    read = read + SPI_FLASH_SEC_SIZE;
-    if (read >= TSlave.spi_hex_size) {
-      reading = false;
-    }
-    for (uint32_t ca = 0; ca < SPI_FLASH_SEC_SIZE; ca++) {
-      processed++;
-      if ((processed <= TSlave.spi_hex_size) && (!hexParse.EndOfFile)) {
-        if (':' == flash_buffer[ca]) {
-          position = 0;
-        }
-        if (0x0D == flash_buffer[ca]) {
-          thishexline[position] = 0;
-          hexParse.parseLine(thishexline);
-          if (hexParse.PageIsReady) {
-            TasmotaSlave_FlashPage(hexParse.ptr_h, hexParse.ptr_l, hexParse.FlashPage);
-            hexParse.PageIsReady = false;
-            hexParse.FlashPageIdx = 0;
-          }
-        } else {
-          if (0x0A != flash_buffer[ca]) {
-            thishexline[position] = flash_buffer[ca];
-            position++;
-          }
-        }
-      }
-    }
-  }
-  TasmotaSlave_exitProgMode();
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flash done!"));
-  TSlave.flashing = false;
-  restart_flag = 2;
-}
-
-void TasmotaSlave_SetFlagFlashing(bool value)
-{
-  TSlave.flashing = value;
-}
-
-bool TasmotaSlave_GetFlagFlashing(void)
-{
-  return TSlave.flashing;
-}
-
-void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size)
-{
-  if (0 == TSlave.spi_sector_cursor) {
-    ESP.flashEraseSector(TSlave.spi_sector_counter);
-  }
-  TSlave.spi_sector_cursor++;
-  ESP.flashWrite((TSlave.spi_sector_counter * SPI_FLASH_SEC_SIZE) + ((TSlave.spi_sector_cursor-1)*2048), (uint32_t*)buf, size);
-  TSlave.spi_hex_size = TSlave.spi_hex_size + size;
-  if (2 == TSlave.spi_sector_cursor) {
-    TSlave.spi_sector_cursor = 0;
-    TSlave.spi_sector_counter++;
-  }
-}
-
-void TasmotaSlave_Init(void)
-{
-  if (TSlave.type) {
-    return;
-  }
-  if (10 > TSlave.waitstate) {
-    TSlave.waitstate++;
-    return;
-  }
-  if (!TSlave.SerialEnabled) {
-    if ((pin[GPIO_TASMOTASLAVE_RXD] < 99) && (pin[GPIO_TASMOTASLAVE_TXD] < 99) &&
-        ((pin[GPIO_TASMOTASLAVE_RST] < 99) || (pin[GPIO_TASMOTASLAVE_RST_INV] < 99))) {
-      TasmotaSlave_Serial = new TasmotaSerial(pin[GPIO_TASMOTASLAVE_RXD], pin[GPIO_TASMOTASLAVE_TXD], 1, 0, 200);
-      if (TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_SERIAL_SPEED)) {
-        if (TasmotaSlave_Serial->hardwareSerial()) {
-          ClaimSerial();
-        }
-        TasmotaSlave_Serial->setTimeout(50);
-        if (pin[GPIO_TASMOTASLAVE_RST_INV] < 99) {
-          pin[GPIO_TASMOTASLAVE_RST] = pin[GPIO_TASMOTASLAVE_RST_INV];
-          pin[GPIO_TASMOTASLAVE_RST_INV] = 99;
-          TSlave.inverted = HIGH;
-        }
-        pinMode(pin[GPIO_TASMOTASLAVE_RST], OUTPUT);
-        TSlave.SerialEnabled = true;
-        TasmotaSlave_Reset();
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Enabled"));
-      }
-    }
-  }
-  if (TSlave.SerialEnabled) {
-    TasmotaSlave_sendCmnd(CMND_FEATURES, 0);
-    char buffer[32];
-    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer));
-    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer));
-    memcpy(&TSlaveSettings, &buffer, sizeof(TSlaveSettings));
-    if (20191129 == TSlaveSettings.features_version) {
-      TSlave.type = true;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u"), TSlaveSettings.features_version);
-    } else {
-      if ((!TSlave.unsupported) && (TSlaveSettings.features_version > 0)) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u not supported!"), TSlaveSettings.features_version);
-        TSlave.unsupported = true;
-      }
-    }
-  }
-}
-
-void TasmotaSlave_Show(void)
-{
-  if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
-    char buffer[100];
-    TasmotaSlave_sendCmnd(CMND_JSON, 0);
-    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer)-1);
-    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer)-1);
-    buffer[len] = '\0';
-    ResponseAppend_P(PSTR(",\"TasmotaSlave\":%s"), buffer);
-  }
-}
-
-void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param)
-{
-  TSlaveCommand.command = cmnd;
-  TSlaveCommand.parameter = param;
-  char buffer[sizeof(TSlaveCommand)+2];
-  buffer[0] = CMND_START;
-  memcpy(&buffer[1], &TSlaveCommand, sizeof(TSlaveCommand));
-  buffer[sizeof(TSlaveCommand)+1] = CMND_END;
-  for (uint8_t ca = 0; ca < sizeof(buffer); ca++) {
-    TasmotaSlave_Serial->write(buffer[ca]);
-  }
-}
-
-#define D_PRFX_SLAVE "Slave"
-#define D_CMND_SLAVE_RESET "Reset"
-#define D_CMND_SLAVE_SEND "Send"
-
-const char kTasmotaSlaveCommands[] PROGMEM = D_PRFX_SLAVE "|"
-  D_CMND_SLAVE_RESET "|" D_CMND_SLAVE_SEND;
-
-void (* const TasmotaSlaveCommand[])(void) PROGMEM = {
-  &CmndTasmotaSlaveReset, &CmndTasmotaSlaveSend };
-
-void CmndTasmotaSlaveReset(void)
-{
-  TasmotaSlave_Reset();
-  TSlave.type = false;
-  TSlave.waitstate = 7;
-  TSlave.unsupported = false;
-  ResponseCmndDone();
-}
-
-void CmndTasmotaSlaveSend(void)
-{
-  if (0 < XdrvMailbox.data_len) {
-    TasmotaSlave_sendCmnd(CMND_SLAVE_SEND, XdrvMailbox.data_len);
-    TasmotaSlave_Serial->write(char(PARAM_DATA_START));
-    for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
-      TasmotaSlave_Serial->write(XdrvMailbox.data[idx]);
-    }
-    TasmotaSlave_Serial->write(char(PARAM_DATA_END));
-  }
-  ResponseCmndDone();
-}
-
-void TasmotaSlave_ProcessIn(void)
-{
-  uint8_t cmnd = TasmotaSlave_Serial->read();
-  switch (cmnd) {
-    case CMND_START:
-      TasmotaSlave_waitForSerialData(sizeof(TSlaveCommand),50);
-      uint8_t buffer[sizeof(TSlaveCommand)];
-      for (uint8_t idx = 0; idx < sizeof(TSlaveCommand); idx++) {
-        buffer[idx] = TasmotaSlave_Serial->read();
-      }
-      TasmotaSlave_Serial->read();
-      memcpy(&TSlaveCommand, &buffer, sizeof(TSlaveCommand));
-      char inbuf[TSlaveCommand.parameter+1];
-      TasmotaSlave_waitForSerialData(TSlaveCommand.parameter, 50);
-      TasmotaSlave_Serial->read();
-      for (uint8_t idx = 0; idx < TSlaveCommand.parameter; idx++) {
-        inbuf[idx] = TasmotaSlave_Serial->read();
-      }
-      TasmotaSlave_Serial->read();
-      inbuf[TSlaveCommand.parameter] = '\0';
-
-      if (CMND_PUBLISH_TELE == TSlaveCommand.command) {
-        Response_P(PSTR("{\"TasmotaSlave\":"));
-        ResponseAppend_P("%s", inbuf);
-        ResponseJsonEnd();
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-        XdrvRulesProcess();
-      }
-      if (CMND_EXECUTE_CMND == TSlaveCommand.command) {
-        ExecuteCommand(inbuf, SRC_IGNORE);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-
-
-
-
-
-bool Xdrv31(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_100_MSECOND:
-      if (TSlave.type) {
-        if (TasmotaSlave_Serial->available()) {
-          TasmotaSlave_ProcessIn();
-        }
-        if (TSlaveSettings.features.func_every_100_msecond) {
-          TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_100_MSECOND, 0);
-        }
-      }
-      break;
-    case FUNC_EVERY_SECOND:
-      if ((TSlave.type) && (TSlaveSettings.features.func_every_second)) {
-        TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_SECOND, 0);
-      }
-      TasmotaSlave_Init();
-      break;
-    case FUNC_JSON_APPEND:
-      if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
-        TasmotaSlave_Show();
-      }
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kTasmotaSlaveCommands, TasmotaSlaveCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_32_hotplug.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_32_hotplug.ino"
-#ifdef USE_HOTPLUG
-
-
-
-
-
-
-
-#define XDRV_32 32
-
-const uint32_t HOTPLUG_MAX = 254;
-
-const char kHotPlugCommands[] PROGMEM = "|"
-  D_CMND_HOTPLUG;
-
-void (* const HotPlugCommand[])(void) PROGMEM = {
-  &CmndHotPlugTime };
-
-struct {
-
-  bool enabled = false;
-  uint8_t timeout = 0;
-} Hotplug;
-
-void HotPlugInit(void)
-{
-
-  if (Settings.hotplug_scan == 0xFF) { Settings.hotplug_scan = 0; }
-  if (Settings.hotplug_scan != 0) {
-    Hotplug.enabled = true;
-    Hotplug.timeout = 1;
-  } else
-    Hotplug.enabled = false;
-}
-
-void HotPlugEverySecond(void)
-{
-  if (Hotplug.enabled) {
-    if (Hotplug.timeout == 0) {
-      XsnsCall(FUNC_HOTPLUG_SCAN);
-      Hotplug.timeout = Settings.hotplug_scan;
-    }
-    Hotplug.timeout--;
-  }
-}
-
-
-
-
-
-void CmndHotPlugTime(void)
-{
-  if (XdrvMailbox.payload <= HOTPLUG_MAX) {
-    Settings.hotplug_scan = XdrvMailbox.payload;
-    HotPlugInit();
-  }
-  ResponseCmndNumber(Settings.hotplug_scan);
-}
-
-
-
-
-
-bool Xdrv32(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_SECOND:
-      HotPlugEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kHotPlugCommands, HotPlugCommand);
-      break;
-    case FUNC_PRE_INIT:
-      HotPlugInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
-#ifdef USE_SPI
-#ifdef USE_NRF24
-
-
-
-
-
-
-
-#define XDRV_33 33
-
-#define MOSI 13
-#define MISO 12
-#define SCK 14
-
-#include <SPI.h>
-#include <RF24.h>
-
-const char NRF24type[] PROGMEM = "NRF24";
-
-const char HTTP_NRF24[] PROGMEM =
- "{s}%sL01%c: " "{m}started{e}";
-
-struct {
-  uint8_t chipType = 0;
-} NRF24;
-
-
-
-RF24 NRF24radio;
-
-bool NRF24initRadio()
-{
-  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
-  NRF24radio.powerUp();
-
-  if(NRF24radio.isChipConnected()){
-    DEBUG_DRIVER_LOG(PSTR("NRF24 chip connected"));
-    return true;
-  }
-  DEBUG_DRIVER_LOG(PSTR("NRF24 chip NOT !!!! connected"));
-  return false;
-}
-
-bool NRF24Detect(void)
-{
-  if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
-    SPI.pins(SCK,MOSI,MISO,-1);
-    if(NRF24initRadio()){
-      NRF24.chipType = 32;
-     AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01 initialized"));
-      if(NRF24radio.isPVariant()){
-        NRF24.chipType = 43;
-        AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01+ detected"));
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool Xdrv33(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    result = NRF24Detect();
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
-# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
-#ifdef DEBUG_THEO
-#ifndef USE_DEBUG_DRIVER
-#define USE_DEBUG_DRIVER 
-#endif
-#endif
-
-#ifdef USE_DEBUG_DRIVER
-
-
-
-
-
-
-#define XDRV_99 99
-
-#ifndef CPU_LOAD_CHECK
-#define CPU_LOAD_CHECK 1
-#endif
-
-
-
-
-
-#define D_CMND_CFGDUMP "CfgDump"
-#define D_CMND_CFGPEEK "CfgPeek"
-#define D_CMND_CFGPOKE "CfgPoke"
-#define D_CMND_CFGSHOW "CfgShow"
-#define D_CMND_CFGXOR "CfgXor"
-#define D_CMND_CPUCHECK "CpuChk"
-#define D_CMND_EXCEPTION "Exception"
-#define D_CMND_FLASHDUMP "FlashDump"
-#define D_CMND_FLASHMODE "FlashMode"
-#define D_CMND_FREEMEM "FreeMem"
-#define D_CMND_HELP "Help"
-#define D_CMND_RTCDUMP "RtcDump"
-#define D_CMND_SETSENSOR "SetSensor"
-#define D_CMND_I2CWRITE "I2CWrite"
-#define D_CMND_I2CREAD "I2CRead"
-#define D_CMND_I2CSTRETCH "I2CStretch"
-#define D_CMND_I2CCLOCK "I2CClock"
-
-const char kDebugCommands[] PROGMEM = "|"
-  D_CMND_CFGDUMP "|" D_CMND_CFGPEEK "|" D_CMND_CFGPOKE "|"
-#ifdef USE_WEBSERVER
-  D_CMND_CFGXOR "|"
-#endif
-  D_CMND_CPUCHECK "|"
-#ifdef DEBUG_THEO
-  D_CMND_EXCEPTION "|"
-#endif
-  D_CMND_FLASHDUMP "|" D_CMND_FLASHMODE "|" D_CMND_FREEMEM"|" D_CMND_HELP "|" D_CMND_RTCDUMP "|" D_CMND_SETSENSOR "|"
-#ifdef USE_I2C
-  D_CMND_I2CWRITE "|" D_CMND_I2CREAD "|" D_CMND_I2CSTRETCH "|" D_CMND_I2CCLOCK
-#endif
-  ;
-
-void (* const DebugCommand[])(void) PROGMEM = {
-  &CmndCfgDump, &CmndCfgPeek, &CmndCfgPoke,
-#ifdef USE_WEBSERVER
-  &CmndCfgXor,
-#endif
-  &CmndCpuCheck,
-#ifdef DEBUG_THEO
-  &CmndException,
-#endif
-  &CmndFlashDump, &CmndFlashMode, &CmndFreemem, &CmndHelp, &CmndRtcDump, &CmndSetSensor,
-#ifdef USE_I2C
-  &CmndI2cWrite, &CmndI2cRead, &CmndI2cStretch, &CmndI2cClock
-#endif
-  };
-
-uint32_t CPU_loops = 0;
-uint32_t CPU_last_millis = 0;
-uint32_t CPU_last_loop_time = 0;
-uint8_t CPU_load_check = 0;
-uint8_t CPU_show_freemem = 0;
-
-
-
-#ifdef DEBUG_THEO
-void ExceptionTest(uint8_t type)
-{
-# 145 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
-  if (1 == type) {
-    char svalue[10];
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7);
-  }
-# 159 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
-  if (2 == type) {
-    while(1) delay(1000);
-  }
-}
-
-#endif
-
-
-
-void CpuLoadLoop(void)
-{
-  CPU_last_loop_time = millis();
-  if (CPU_load_check && CPU_last_millis) {
-    CPU_loops ++;
-    if ((CPU_last_millis + (CPU_load_check *1000)) <= CPU_last_loop_time) {
-#if defined(F_CPU) && (F_CPU == 160000000L)
-      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *800) );
-      CPU_loops = CPU_loops / CPU_load_check;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(160MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
-#else
-      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *400) );
-      CPU_loops = CPU_loops / CPU_load_check;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(80MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
-#endif
-      CPU_last_millis = CPU_last_loop_time;
-      CPU_loops = 0;
-    }
-  }
-}
-
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
-
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t g_cont;
-}
-
-void DebugFreeMem(void)
-{
-  register uint32_t *sp asm("a1");
-
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_cont.stack), XdrvMailbox.data);
-}
-
-#else
-
-
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t* g_pcont;
-}
-
-void DebugFreeMem(void)
-{
-  register uint32_t *sp asm("a1");
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_pcont->stack), XdrvMailbox.data);
-}
-
-#endif
-
-
-
-void DebugRtcDump(char* parms)
-{
-  #define CFG_COLS 16
-
-  uint16_t idx;
-  uint16_t maxrow;
-  uint16_t row;
-  uint16_t col;
-  char *p;
-# 246 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_99_debug.ino"
-  uint8_t buffer[768];
-
-  system_rtc_mem_read(0, (uint32_t*)&buffer, sizeof(buffer));
-
-  maxrow = ((sizeof(buffer)+CFG_COLS)/CFG_COLS);
-
-  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
-  uint16_t mrow = strtol(p, &p, 10);
-
-
-
-  if (0 == mrow) {
-    mrow = 8;
-  }
-  if (srow > maxrow) {
-    srow = maxrow - mrow;
-  }
-  if (mrow < (maxrow - srow)) {
-    maxrow = srow + mrow;
-  }
-
-  for (row = srow; row < maxrow; row++) {
-    idx = row * CFG_COLS;
-    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
-    for (col = 0; col < CFG_COLS; col++) {
-      if (!(col%4)) {
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
-      }
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-    for (col = 0; col < CFG_COLS; col++) {
-
-
-
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
-    AddLog(LOG_LEVEL_INFO);
-  }
-}
-
-
-
-void DebugCfgDump(char* parms)
-{
-  #define CFG_COLS 16
-
-  uint16_t idx;
-  uint16_t maxrow;
-  uint16_t row;
-  uint16_t col;
-  char *p;
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  maxrow = ((sizeof(SYSCFG)+CFG_COLS)/CFG_COLS);
-
-  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
-  uint16_t mrow = strtol(p, &p, 10);
-
-
-
-  if (0 == mrow) {
-    mrow = 8;
-  }
-  if (srow > maxrow) {
-    srow = maxrow - mrow;
-  }
-  if (mrow < (maxrow - srow)) {
-    maxrow = srow + mrow;
-  }
-
-  for (row = srow; row < maxrow; row++) {
-    idx = row * CFG_COLS;
-    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
-    for (col = 0; col < CFG_COLS; col++) {
-      if (!(col%4)) {
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
-      }
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-    for (col = 0; col < CFG_COLS; col++) {
-
-
-
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
-    AddLog(LOG_LEVEL_INFO);
-    delay(1);
-  }
-}
-
-void DebugCfgPeek(char* parms)
-{
-  char *p;
-
-  uint16_t address = strtol(parms, &p, 16);
-  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
-  address = (address >> 2) << 2;
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  uint8_t data8 = buffer[address];
-  uint16_t data16 = (buffer[address +1] << 8) + buffer[address];
-  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + data16;
-
-  snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), address);
-  for (uint32_t i = 0; i < 4; i++) {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[address +i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-  for (uint32_t i = 0; i < 4; i++) {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[address +i] > 0x20) && (buffer[address +i] < 0x7F)) ? (char)buffer[address +i] : ' ');
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s| 0x%02X (%d), 0x%04X (%d), 0x%0LX (%lu)"), log_data, data8, data8, data16, data16, data32, data32);
-  AddLog(LOG_LEVEL_INFO);
-}
-
-void DebugCfgPoke(char* parms)
-{
-  char *p;
-
-  uint16_t address = strtol(parms, &p, 16);
-  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
-  address = (address >> 2) << 2;
-
-  uint32_t data = strtol(p, &p, 16);
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
-
-  uint8_t *nbuffer = (uint8_t *) &data;
-  for (uint32_t i = 0; i < 4; i++) { buffer[address +i] = nbuffer[+i]; }
-
-  uint32_t ndata32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%03X: 0x%0LX (%lu) poked to 0x%0LX (%lu)"), address, data32, data32, ndata32, ndata32);
-}
-
-void SetFlashMode(uint8_t mode)
-{
-  uint8_t *_buffer;
-  uint32_t address;
-
-  address = 0;
-  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
-
-  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
-    if (_buffer[2] != mode) {
-      _buffer[2] = mode;
-      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
-        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
-      }
-    }
-  }
-  delete[] _buffer;
-}
-
-
-
-
-
-void CmndHelp(void)
-{
-  AddLog_P(LOG_LEVEL_INFO, PSTR("HLP: "), kDebugCommands);
-  ResponseCmndDone();
-}
-
-void CmndRtcDump(void)
-{
-  DebugRtcDump(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgDump(void)
-{
-  DebugCfgDump(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgPeek(void)
-{
-  DebugCfgPeek(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgPoke(void)
-{
-  DebugCfgPoke(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-#ifdef USE_WEBSERVER
-void CmndCfgXor(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Web.config_xor_on_set = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Web.config_xor_on_set);
-}
-#endif
-
-#ifdef DEBUG_THEO
-void CmndException(void)
-{
-  if (XdrvMailbox.data_len > 0) { ExceptionTest(XdrvMailbox.payload); }
-  ResponseCmndDone();
-}
-#endif
-
-void CmndCpuCheck(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    CPU_load_check = XdrvMailbox.payload;
-    CPU_last_millis = CPU_last_loop_time;
-  }
-  ResponseCmndNumber(CPU_load_check);
-}
-
-void CmndFreemem(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    CPU_show_freemem = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(CPU_show_freemem);
-}
-
-void CmndSetSensor(void)
-{
-  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-      if (1 == XdrvMailbox.payload) {
-        restart_flag = 2;
-      }
-    }
-    Response_P(PSTR("{\"" D_CMND_SETSENSOR "\":"));
-    XsnsSensorState();
-    ResponseJsonEnd();
-  }
-}
-
-void CmndFlashMode(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    SetFlashMode(XdrvMailbox.payload);
-  }
-  ResponseCmndNumber(ESP.getFlashChipMode());
-}
-
-uint32_t DebugSwap32(uint32_t x) {
- return ((x << 24) & 0xff000000 ) |
-  ((x << 8) & 0x00ff0000 ) |
-  ((x >> 8) & 0x0000ff00 ) |
-  ((x >> 24) & 0x000000ff );
-}
-
-void CmndFlashDump(void)
-{
-
-
-
-  const uint32_t flash_start = 0x40200000;
-  const uint8_t bytes_per_cols = 0x20;
-  const uint32_t max = (SPIFFS_END + 5) * SPI_FLASH_SEC_SIZE;
-
-  uint32_t start = flash_start;
-  uint32_t rows = 8;
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= (max - bytes_per_cols))) {
-    start += (XdrvMailbox.payload &0x7FFFFFFC);
-
-    char *p;
-    uint32_t is_payload = strtol(XdrvMailbox.data, &p, 16);
-    rows = strtol(p, &p, 10);
-    if (0 == rows) { rows = 8; }
-  }
-  uint32_t end = start + (rows * bytes_per_cols);
-  if ((end - flash_start) > max) {
-    end = flash_start + max;
-  }
-
-  for (uint32_t pos = start; pos < end; pos += bytes_per_cols) {
-    uint32_t* values = (uint32_t*)(pos);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%06X:  %08X %08X %08X %08X  %08X %08X %08X %08X"), pos - flash_start,
-      DebugSwap32(values[0]), DebugSwap32(values[1]), DebugSwap32(values[2]), DebugSwap32(values[3]),
-      DebugSwap32(values[4]), DebugSwap32(values[5]), DebugSwap32(values[6]), DebugSwap32(values[7]));
-  }
-  ResponseCmndDone();
-}
-
-#ifdef USE_I2C
-void CmndI2cWrite(void)
-{
-
-  if (i2c_flg) {
-    char* parms = XdrvMailbox.data;
-    uint8_t buffer[100];
-    uint32_t index = 0;
-
-    char *p;
-    char *data = strtok_r(parms, " ,", &p);
-    while (data != NULL && index < sizeof(buffer)) {
-      buffer[index++] = strtol(data, nullptr, 16);
-      data = strtok_r(nullptr, " ,", &p);
-    }
-
-    if (index > 1) {
-      AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
-
-      Wire.beginTransmission(buffer[0]);
-      for (uint32_t i = 1; i < index; i++) {
-        Wire.write(buffer[i]);
-      }
-      int result = Wire.endTransmission();
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("I2C: Result %d"), result);
-    }
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cRead(void)
-{
-
-  if (i2c_flg) {
-    char* parms = XdrvMailbox.data;
-    uint8_t buffer[100];
-    uint32_t index = 0;
-
-    char *p;
-    char *data = strtok_r(parms, " ,", &p);
-    while (data != NULL && index < sizeof(buffer)) {
-      buffer[index++] = strtol(data, nullptr, 16);
-      data = strtok_r(nullptr, " ,", &p);
-    }
-
-    if (index > 0) {
-      uint8_t size = 1;
-      if (index > 1) {
-        size = buffer[1];
-      }
-      Wire.requestFrom(buffer[0], size);
-      index = 0;
-      while (Wire.available() && index < sizeof(buffer)) {
-        buffer[index++] = Wire.read();
-      }
-      if (index > 0) {
-        AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
-      }
-    }
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cStretch(void)
-{
-  if (i2c_flg && (XdrvMailbox.payload > 0)) {
-    Wire.setClockStretchLimit(XdrvMailbox.payload);
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cClock(void)
-{
-  if (i2c_flg && (XdrvMailbox.payload > 0)) {
-    Wire.setClock(XdrvMailbox.payload);
-  }
-  ResponseCmndDone();
-}
-#endif
-
-
-
-
-
-bool Xdrv99(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      CpuLoadLoop();
-      break;
-    case FUNC_FREE_MEM:
-      if (CPU_show_freemem) { DebugFreeMem(); }
-      break;
-    case FUNC_PRE_INIT:
-      CPU_last_millis = millis();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kDebugCommands, DebugCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdrv_interface.ino"
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xdrv_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xdrv_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XDRV_01
-  &Xdrv01,
-#endif
-
-#ifdef XDRV_02
-  &Xdrv02,
-#endif
-
-#ifdef XDRV_03
-  &Xdrv03,
-#endif
-
-#ifdef XDRV_04
-  &Xdrv04,
-#endif
-
-#ifdef XDRV_05
-  &Xdrv05,
-#endif
-
-#ifdef XDRV_06
-  &Xdrv06,
-#endif
-
-#ifdef XDRV_07
-  &Xdrv07,
-#endif
-
-#ifdef XDRV_08
-  &Xdrv08,
-#endif
-
-#ifdef XDRV_09
-  &Xdrv09,
-#endif
-
-#ifdef XDRV_10
-  &Xdrv10,
-#endif
-
-#ifdef XDRV_11
-  &Xdrv11,
-#endif
-
-#ifdef XDRV_12
-  &Xdrv12,
-#endif
-
-#ifdef XDRV_13
-  &Xdrv13,
-#endif
-
-#ifdef XDRV_14
-  &Xdrv14,
-#endif
-
-#ifdef XDRV_15
-  &Xdrv15,
-#endif
-
-#ifdef XDRV_16
-  &Xdrv16,
-#endif
-
-#ifdef XDRV_17
-  &Xdrv17,
-#endif
-
-#ifdef XDRV_18
-  &Xdrv18,
-#endif
-
-#ifdef XDRV_19
-  &Xdrv19,
-#endif
-
-#ifdef XDRV_20
-  &Xdrv20,
-#endif
-
-#ifdef XDRV_21
-  &Xdrv21,
-#endif
-
-#ifdef XDRV_22
-  &Xdrv22,
-#endif
-
-#ifdef XDRV_23
-  &Xdrv23,
-#endif
-
-#ifdef XDRV_24
-  &Xdrv24,
-#endif
-
-#ifdef XDRV_25
-  &Xdrv25,
-#endif
-
-#ifdef XDRV_26
-  &Xdrv26,
-#endif
-
-#ifdef XDRV_27
-  &Xdrv27,
-#endif
-
-#ifdef XDRV_28
-  &Xdrv28,
-#endif
-
-#ifdef XDRV_29
-  &Xdrv29,
-#endif
-
-#ifdef XDRV_30
-  &Xdrv30,
-#endif
-
-#ifdef XDRV_31
-  &Xdrv31,
-#endif
-
-#ifdef XDRV_32
-  &Xdrv32,
-#endif
-
-#ifdef XDRV_33
-  &Xdrv33,
-#endif
-
-#ifdef XDRV_34
-  &Xdrv34,
-#endif
-
-#ifdef XDRV_35
-  &Xdrv35,
-#endif
-
-#ifdef XDRV_36
-  &Xdrv36,
-#endif
-
-#ifdef XDRV_37
-  &Xdrv37,
-#endif
-
-#ifdef XDRV_38
-  &Xdrv38,
-#endif
-
-#ifdef XDRV_39
-  &Xdrv39,
-#endif
-
-#ifdef XDRV_40
-  &Xdrv40,
-#endif
-
-#ifdef XDRV_41
-  &Xdrv41,
-#endif
-
-#ifdef XDRV_42
-  &Xdrv42,
-#endif
-
-#ifdef XDRV_43
-  &Xdrv43,
-#endif
-
-#ifdef XDRV_44
-  &Xdrv44,
-#endif
-
-#ifdef XDRV_45
-  &Xdrv45,
-#endif
-
-#ifdef XDRV_46
-  &Xdrv46,
-#endif
-
-#ifdef XDRV_47
-  &Xdrv47,
-#endif
-
-#ifdef XDRV_48
-  &Xdrv48,
-#endif
-
-#ifdef XDRV_49
-  &Xdrv49,
-#endif
-
-#ifdef XDRV_50
-  &Xdrv50,
-#endif
-
-#ifdef XDRV_51
-  &Xdrv51,
-#endif
-
-#ifdef XDRV_52
-  &Xdrv52,
-#endif
-
-#ifdef XDRV_53
-  &Xdrv53,
-#endif
-
-#ifdef XDRV_54
-  &Xdrv54,
-#endif
-
-#ifdef XDRV_55
-  &Xdrv55,
-#endif
-
-#ifdef XDRV_56
-  &Xdrv56,
-#endif
-
-#ifdef XDRV_57
-  &Xdrv57,
-#endif
-
-#ifdef XDRV_58
-  &Xdrv58,
-#endif
-
-#ifdef XDRV_59
-  &Xdrv59,
-#endif
-
-#ifdef XDRV_60
-  &Xdrv60,
-#endif
-
-#ifdef XDRV_61
-  &Xdrv61,
-#endif
-
-#ifdef XDRV_62
-  &Xdrv62,
-#endif
-
-#ifdef XDRV_63
-  &Xdrv63,
-#endif
-
-#ifdef XDRV_64
-  &Xdrv64,
-#endif
-
-#ifdef XDRV_65
-  &Xdrv65,
-#endif
-
-#ifdef XDRV_66
-  &Xdrv66,
-#endif
-
-#ifdef XDRV_67
-  &Xdrv67,
-#endif
-
-#ifdef XDRV_68
-  &Xdrv68,
-#endif
-
-#ifdef XDRV_69
-  &Xdrv69,
-#endif
-
-#ifdef XDRV_70
-  &Xdrv70,
-#endif
-
-#ifdef XDRV_71
-  &Xdrv71,
-#endif
-
-#ifdef XDRV_72
-  &Xdrv72,
-#endif
-
-#ifdef XDRV_73
-  &Xdrv73,
-#endif
-
-#ifdef XDRV_74
-  &Xdrv74,
-#endif
-
-#ifdef XDRV_75
-  &Xdrv75,
-#endif
-
-#ifdef XDRV_76
-  &Xdrv76,
-#endif
-
-#ifdef XDRV_77
-  &Xdrv77,
-#endif
-
-#ifdef XDRV_78
-  &Xdrv78,
-#endif
-
-#ifdef XDRV_79
-  &Xdrv79,
-#endif
-
-#ifdef XDRV_80
-  &Xdrv80,
-#endif
-
-#ifdef XDRV_81
-  &Xdrv81,
-#endif
-
-#ifdef XDRV_82
-  &Xdrv82,
-#endif
-
-#ifdef XDRV_83
-  &Xdrv83,
-#endif
-
-#ifdef XDRV_84
-  &Xdrv84,
-#endif
-
-#ifdef XDRV_85
-  &Xdrv85,
-#endif
-
-#ifdef XDRV_86
-  &Xdrv86,
-#endif
-
-#ifdef XDRV_87
-  &Xdrv87,
-#endif
-
-#ifdef XDRV_88
-  &Xdrv88,
-#endif
-
-#ifdef XDRV_89
-  &Xdrv89,
-#endif
-
-#ifdef XDRV_90
-  &Xdrv90,
-#endif
-
-#ifdef XDRV_91
-  &Xdrv91,
-#endif
-
-#ifdef XDRV_92
-  &Xdrv92,
-#endif
-
-#ifdef XDRV_93
-  &Xdrv93,
-#endif
-
-#ifdef XDRV_94
-  &Xdrv94,
-#endif
-
-#ifdef XDRV_95
-  &Xdrv95,
-#endif
-
-#ifdef XDRV_96
-  &Xdrv96,
-#endif
-
-#ifdef XDRV_97
-  &Xdrv97,
-#endif
-
-#ifdef XDRV_98
-  &Xdrv98,
-#endif
-
-#ifdef XDRV_99
-  &Xdrv99
-#endif
-};
-
-const uint8_t xdrv_present = sizeof(xdrv_func_ptr) / sizeof(xdrv_func_ptr[0]);
-
-
-
-
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kXdrvList[] PROGMEM = {
-#else
-const uint8_t kXdrvList[] = {
-#endif
-
-#ifdef XDRV_01
-  XDRV_01,
-#endif
-
-#ifdef XDRV_02
-  XDRV_02,
-#endif
-
-#ifdef XDRV_03
-  XDRV_03,
-#endif
-
-#ifdef XDRV_04
-  XDRV_04,
-#endif
-
-#ifdef XDRV_05
-  XDRV_05,
-#endif
-
-#ifdef XDRV_06
-  XDRV_06,
-#endif
-
-#ifdef XDRV_07
-  XDRV_07,
-#endif
-
-#ifdef XDRV_08
-  XDRV_08,
-#endif
-
-#ifdef XDRV_09
-  XDRV_09,
-#endif
-
-#ifdef XDRV_10
-  XDRV_10,
-#endif
-
-#ifdef XDRV_11
-  XDRV_11,
-#endif
-
-#ifdef XDRV_12
-  XDRV_12,
-#endif
-
-#ifdef XDRV_13
-  XDRV_13,
-#endif
-
-#ifdef XDRV_14
-  XDRV_14,
-#endif
-
-#ifdef XDRV_15
-  XDRV_15,
-#endif
-
-#ifdef XDRV_16
-  XDRV_16,
-#endif
-
-#ifdef XDRV_17
-  XDRV_17,
-#endif
-
-#ifdef XDRV_18
-  XDRV_18,
-#endif
-
-#ifdef XDRV_19
-  XDRV_19,
-#endif
-
-#ifdef XDRV_20
-  XDRV_20,
-#endif
-
-#ifdef XDRV_21
-  XDRV_21,
-#endif
-
-#ifdef XDRV_22
-  XDRV_22,
-#endif
-
-#ifdef XDRV_23
-  XDRV_23,
-#endif
-
-#ifdef XDRV_24
-  XDRV_24,
-#endif
-
-#ifdef XDRV_25
-  XDRV_25,
-#endif
-
-#ifdef XDRV_26
-  XDRV_26,
-#endif
-
-#ifdef XDRV_27
-  XDRV_27,
-#endif
-
-#ifdef XDRV_28
-  XDRV_28,
-#endif
-
-#ifdef XDRV_29
-  XDRV_29,
-#endif
-
-#ifdef XDRV_30
-  XDRV_30,
-#endif
-
-#ifdef XDRV_31
-  XDRV_31,
-#endif
-
-#ifdef XDRV_32
-  XDRV_32,
-#endif
-
-#ifdef XDRV_33
-  XDRV_33,
-#endif
-
-#ifdef XDRV_34
-  XDRV_34,
-#endif
-
-#ifdef XDRV_35
-  XDRV_35,
-#endif
-
-#ifdef XDRV_36
-  XDRV_36,
-#endif
-
-#ifdef XDRV_37
-  XDRV_37,
-#endif
-
-#ifdef XDRV_38
-  XDRV_38,
-#endif
-
-#ifdef XDRV_39
-  XDRV_39,
-#endif
-
-#ifdef XDRV_40
-  XDRV_40,
-#endif
-
-#ifdef XDRV_41
-  XDRV_41,
-#endif
-
-#ifdef XDRV_42
-  XDRV_42,
-#endif
-
-#ifdef XDRV_43
-  XDRV_43,
-#endif
-
-#ifdef XDRV_44
-  XDRV_44,
-#endif
-
-#ifdef XDRV_45
-  XDRV_45,
-#endif
-
-#ifdef XDRV_46
-  XDRV_46,
-#endif
-
-#ifdef XDRV_47
-  XDRV_47,
-#endif
-
-#ifdef XDRV_48
-  XDRV_48,
-#endif
-
-#ifdef XDRV_49
-  XDRV_49,
-#endif
-
-#ifdef XDRV_50
-  XDRV_50,
-#endif
-
-#ifdef XDRV_51
-  XDRV_51,
-#endif
-
-#ifdef XDRV_52
-  XDRV_52,
-#endif
-
-#ifdef XDRV_53
-  XDRV_53,
-#endif
-
-#ifdef XDRV_54
-  XDRV_54,
-#endif
-
-#ifdef XDRV_55
-  XDRV_55,
-#endif
-
-#ifdef XDRV_56
-  XDRV_56,
-#endif
-
-#ifdef XDRV_57
-  XDRV_57,
-#endif
-
-#ifdef XDRV_58
-  XDRV_58,
-#endif
-
-#ifdef XDRV_59
-  XDRV_59,
-#endif
-
-#ifdef XDRV_60
-  XDRV_60,
-#endif
-
-#ifdef XDRV_61
-  XDRV_61,
-#endif
-
-#ifdef XDRV_62
-  XDRV_62,
-#endif
-
-#ifdef XDRV_63
-  XDRV_63,
-#endif
-
-#ifdef XDRV_64
-  XDRV_64,
-#endif
-
-#ifdef XDRV_65
-  XDRV_65,
-#endif
-
-#ifdef XDRV_66
-  XDRV_66,
-#endif
-
-#ifdef XDRV_67
-  XDRV_67,
-#endif
-
-#ifdef XDRV_68
-  XDRV_68,
-#endif
-
-#ifdef XDRV_69
-  XDRV_69,
-#endif
-
-#ifdef XDRV_70
-  XDRV_70,
-#endif
-
-#ifdef XDRV_71
-  XDRV_71,
-#endif
-
-#ifdef XDRV_72
-  XDRV_72,
-#endif
-
-#ifdef XDRV_73
-  XDRV_73,
-#endif
-
-#ifdef XDRV_74
-  XDRV_74,
-#endif
-
-#ifdef XDRV_75
-  XDRV_75,
-#endif
-
-#ifdef XDRV_76
-  XDRV_76,
-#endif
-
-#ifdef XDRV_77
-  XDRV_77,
-#endif
-
-#ifdef XDRV_78
-  XDRV_78,
-#endif
-
-#ifdef XDRV_79
-  XDRV_79,
-#endif
-
-#ifdef XDRV_80
-  XDRV_80,
-#endif
-
-#ifdef XDRV_81
-  XDRV_81,
-#endif
-
-#ifdef XDRV_82
-  XDRV_82,
-#endif
-
-#ifdef XDRV_83
-  XDRV_83,
-#endif
-
-#ifdef XDRV_84
-  XDRV_84,
-#endif
-
-#ifdef XDRV_85
-  XDRV_85,
-#endif
-
-#ifdef XDRV_86
-  XDRV_86,
-#endif
-
-#ifdef XDRV_87
-  XDRV_87,
-#endif
-
-#ifdef XDRV_88
-  XDRV_88,
-#endif
-
-#ifdef XDRV_89
-  XDRV_89,
-#endif
-
-#ifdef XDRV_90
-  XDRV_90,
-#endif
-
-#ifdef XDRV_91
-  XDRV_91,
-#endif
-
-#ifdef XDRV_92
-  XDRV_92,
-#endif
-
-#ifdef XDRV_93
-  XDRV_93,
-#endif
-
-#ifdef XDRV_94
-  XDRV_94,
-#endif
-
-#ifdef XDRV_95
-  XDRV_95,
-#endif
-
-#ifdef XDRV_96
-  XDRV_96,
-#endif
-
-#ifdef XDRV_97
-  XDRV_97,
-#endif
-
-#ifdef XDRV_98
-  XDRV_98,
-#endif
-
-#ifdef XDRV_99
-  XDRV_99
-#endif
-};
-
-
-
-void XsnsDriverState(void)
-{
-  ResponseAppend_P(PSTR(",\"Drivers\":\""));
-  for (uint32_t i = 0; i < sizeof(kXdrvList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t driverid = pgm_read_byte(kXdrvList + i);
-#else
-    uint32_t driverid = kXdrvList[i];
-#endif
-    ResponseAppend_P(PSTR("%s%d"), (i) ? "," : "", driverid);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-
-
-bool XdrvRulesProcess(void)
-{
-  return XdrvCallDriver(10, FUNC_RULES_PROCESS);
-}
-
-#ifdef USE_DEBUG_DRIVER
-void ShowFreeMem(const char *where)
-{
-  char stemp[30];
-  snprintf_P(stemp, sizeof(stemp), where);
-  XdrvMailbox.data = stemp;
-  XdrvCall(FUNC_FREE_MEM);
-}
-#endif
-
-
-
-
-
-bool XdrvCallDriver(uint32_t driver, uint8_t Function)
-{
-  for (uint32_t x = 0; x < xdrv_present; x++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t listed = pgm_read_byte(kXdrvList + x);
-#else
-    uint32_t listed = kXdrvList[x];
-#endif
-    if (driver == listed) {
-      return xdrv_func_ptr[x](Function);
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool XdrvCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
-
-  for (uint32_t x = 0; x < xdrv_present; x++) {
-    result = xdrv_func_ptr[x](Function);
-
-    if (result && ((FUNC_COMMAND == Function) ||
-                   (FUNC_COMMAND_DRIVER == Function) ||
-                   (FUNC_MQTT_DATA == Function) ||
-                   (FUNC_RULES_PROCESS == Function) ||
-                   (FUNC_BUTTON_PRESSED == Function) ||
-                   (FUNC_SERIAL == Function) ||
-                   (FUNC_MODULE_INIT == Function) ||
-                   (FUNC_SET_CHANNELS == Function) ||
-                   (FUNC_PIN_STATE == Function) ||
-                   (FUNC_SET_DEVICE_POWER == Function)
-                  )) {
-      break;
-    }
-  }
-
-  return result;
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_LCD
-
-#define XDSP_01 1
-#define XI2C_03 3
-
-#define LCD_ADDRESS1 0x27
-#define LCD_ADDRESS2 0x3F
-
-#include <Wire.h>
-#include <LiquidCrystal_I2C.h>
-
-LiquidCrystal_I2C *lcd;
-
-
-
-void LcdInitMode(void)
-{
-  lcd->init();
-  lcd->clear();
-}
-
-void LcdInit(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      LcdInitMode();
-#ifdef USE_DISPLAY_MODES1TO5
-      DisplayClearScreenBuffer();
-#endif
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void LcdInitDriver(void)
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(LCD_ADDRESS1)) {
-      Settings.display_address[0] = LCD_ADDRESS1;
-      Settings.display_model = XDSP_01;
-    }
-    else if (I2cSetDevice(LCD_ADDRESS2)) {
-      Settings.display_address[0] = LCD_ADDRESS2;
-      Settings.display_model = XDSP_01;
-    }
-  }
-
-  if (XDSP_01 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "LCD");
-
-    Settings.display_width = Settings.display_cols[0];
-    Settings.display_height = Settings.display_rows;
-    lcd = new LiquidCrystal_I2C(Settings.display_address[0], Settings.display_cols[0], Settings.display_rows);
-
-#ifdef USE_DISPLAY_MODES1TO5
-    DisplayAllocScreenBuffer();
-#endif
-
-    LcdInitMode();
-  }
-}
-
-void LcdDrawStringAt(void)
-{
-  if (dsp_flag) {
-    dsp_x--;
-    dsp_y--;
-  }
-  lcd->setCursor(dsp_x, dsp_y);
-  lcd->print(dsp_str);
-}
-
-void LcdDisplayOnOff(uint8_t on)
-{
-  if (on) {
-    lcd->backlight();
-  } else {
-    lcd->noBacklight();
-  }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void LcdCenter(uint8_t row, char* txt)
-{
-  char line[Settings.display_cols[0] +2];
-
-  int len = strlen(txt);
-  int offset = 0;
-  if (len >= Settings.display_cols[0]) {
-    len = Settings.display_cols[0];
-  } else {
-    offset = (Settings.display_cols[0] - len) / 2;
-  }
-  memset(line, 0x20, Settings.display_cols[0]);
-  line[Settings.display_cols[0]] = 0;
-  for (uint32_t i = 0; i < len; i++) {
-    line[offset +i] = txt[i];
-  }
-  lcd->setCursor(0, row);
-  lcd->print(line);
-}
-
-bool LcdPrintLog(void)
-{
-  bool result = false;
-
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\337');
-    if (txt != nullptr) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      for (uint32_t i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        lcd->setCursor(0, i);
-        lcd->print(disp_screen_buffer[i +1]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      lcd->setCursor(0, last_row);
-      lcd->print(disp_screen_buffer[last_row]);
-
-      result = true;
-    }
-  }
-  return result;
-}
-
-void LcdTime(void)
-{
-  char line[Settings.display_cols[0] +1];
-
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  LcdCenter(0, line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  LcdCenter(1, line);
-}
-
-void LcdRefresh(void)
-{
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        LcdTime();
-        break;
-      case 2:
-      case 4:
-        LcdPrintLog();
-        break;
-      case 3:
-      case 5: {
-        if (!LcdPrintLog()) { LcdTime(); }
-        break;
-      }
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp01(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_03)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    LcdInitDriver();
-  }
-  else if (XDSP_01 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_INIT:
-        LcdInit(dsp_init);
-        break;
-      case FUNC_DISPLAY_POWER:
-        LcdDisplayOnOff(disp_power);
-        break;
-      case FUNC_DISPLAY_CLEAR:
-        lcd->clear();
-        break;
-# 238 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_01_lcd.ino"
-      case FUNC_DISPLAY_DRAW_STRING:
-        LcdDrawStringAt();
-        break;
-      case FUNC_DISPLAY_ONOFF:
-        LcdDisplayOnOff(dsp_on);
-        break;
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        LcdRefresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_02_ssd1306.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_02_ssd1306.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SSD1306
-
-#define XDSP_02 2
-#define XI2C_04 4
-
-#define OLED_RESET 4
-
-#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
-
-#define OLED_ADDRESS1 0x3C
-#define OLED_ADDRESS2 0x3D
-
-#define OLED_BUFFER_COLS 40
-#define OLED_BUFFER_ROWS 16
-
-#define OLED_FONT_WIDTH 6
-#define OLED_FONT_HEIGTH 8
-
-#include <Wire.h>
-#include <renderer.h>
-#include <Adafruit_SSD1306.h>
-
-Adafruit_SSD1306 *oled1306;
-
-extern uint8_t *buffer;
-
-
-
-void SSD1306InitDriver(void)
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(OLED_ADDRESS1)) {
-      Settings.display_address[0] = OLED_ADDRESS1;
-      Settings.display_model = XDSP_02;
-    }
-    else if (I2cSetDevice(OLED_ADDRESS2)) {
-      Settings.display_address[0] = OLED_ADDRESS2;
-      Settings.display_model = XDSP_02;
-    }
-  }
-
-  if (XDSP_02 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "SSD1306");
-
-    if ((Settings.display_width != 64) && (Settings.display_width != 96) && (Settings.display_width != 128)) {
-      Settings.display_width = 128;
-    }
-    if ((Settings.display_height != 16) && (Settings.display_height != 32) && (Settings.display_height != 48) && (Settings.display_height != 64)) {
-      Settings.display_height = 64;
-    }
-
-    uint8_t reset_pin = -1;
-    if (pin[GPIO_OLED_RESET] < 99) {
-      reset_pin = pin[GPIO_OLED_RESET];
-    }
-
-
-    if (buffer) { free(buffer); }
-    buffer = (unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1);
-    if (!buffer) { return; }
-
-
-
-    oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin);
-    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], reset_pin >= 0);
-    renderer = oled1306;
-    renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-    renderer->setTextFont(0);
-    renderer->setTextSize(2);
-    renderer->setCursor(20,20);
-    renderer->println(F("SSD1306"));
-    renderer->Updateframe();
-    renderer->DisplayOnff(1);
-#endif
-
-  }
-}
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void Ssd1306PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void Ssd1306Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(Settings.display_size);
-  renderer->setTextFont(Settings.display_font);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void Ssd1306Refresh(void)
-{
-  if (!renderer) return;
-
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        Ssd1306Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        Ssd1306PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp02(byte function)
-{
-  if (!I2cEnabled(XI2C_04)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    SSD1306InitDriver();
-  }
-  else if (XDSP_02 == Settings.display_model) {
-    switch (function) {
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        Ssd1306Refresh();
-        break;
-#endif
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_03_matrix.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_03_matrix.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_MATRIX
-
-#define XDSP_03 3
-#define XI2C_05 5
-
-#define MTX_MAX_SCREEN_BUFFER 80
-
-#include <Wire.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_LEDBackpack.h>
-
-Adafruit_8x8matrix *matrix[8];
-uint8_t mtx_matrices = 0;
-uint8_t mtx_state = 0;
-uint8_t mtx_counter = 0;
-int16_t mtx_x = 0;
-int16_t mtx_y = 0;
-
-
-char *mtx_buffer = nullptr;
-
-uint8_t mtx_mode = 0;
-uint8_t mtx_loop = 0;
-uint8_t mtx_done = 0;
-
-
-
-void MatrixWrite(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->writeDisplay();
-  }
-}
-
-void MatrixClear(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-  }
-  MatrixWrite();
-}
-
-void MatrixFixed(char* txt)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-    matrix[i]->setCursor(-i *8, 0);
-    matrix[i]->print(txt);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-  }
-  MatrixWrite();
-}
-
-void MatrixCenter(char* txt)
-{
-  int offset;
-
-  int len = strlen(txt);
-  offset = (len < 8) ? offset = ((mtx_matrices *8) - (len *6)) / 2 : 0;
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-    matrix[i]->setCursor(-(i *8)+offset, 0);
-    matrix[i]->print(txt);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-  }
-  MatrixWrite();
-}
-
-void MatrixScrollLeft(char* txt, int loop)
-{
-  switch (mtx_state) {
-  case 1:
-    mtx_state = 2;
-
-    mtx_x = 8 * mtx_matrices;
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), txt);
-
-    disp_refresh = Settings.display_refresh;
-  case 2:
-  disp_refresh--;
-    if (!disp_refresh) {
-      disp_refresh = Settings.display_refresh;
-      for (uint32_t i = 0; i < mtx_matrices; i++) {
-        matrix[i]->clear();
-        matrix[i]->setCursor(mtx_x - i *8, 0);
-        matrix[i]->print(txt);
-        matrix[i]->setBrightness(Settings.display_dimmer);
-      }
-      MatrixWrite();
-
-      mtx_x--;
-      int16_t len = strlen(txt);
-      if (mtx_x < -(len *6)) { mtx_state = loop; }
-    }
-    break;
-  }
-}
-
-void MatrixScrollUp(char* txt, int loop)
-{
-  int wordcounter = 0;
-  char tmpbuf[200];
-  char *words[100];
-
-
-
-  char separators[] = " /";
-
-  switch (mtx_state) {
-  case 1:
-    mtx_state = 2;
-
-    mtx_y = 8;
-    mtx_counter = 0;
-    disp_refresh = Settings.display_refresh;
-  case 2:
-    disp_refresh--;
-    if (!disp_refresh) {
-      disp_refresh = Settings.display_refresh;
-      strlcpy(tmpbuf, txt, sizeof(tmpbuf));
-      char *p = strtok(tmpbuf, separators);
-      while (p != nullptr && wordcounter < 40) {
-        words[wordcounter++] = p;
-        p = strtok(nullptr, separators);
-      }
-      for (uint32_t i = 0; i < mtx_matrices; i++) {
-        matrix[i]->clear();
-        for (uint32_t j = 0; j < wordcounter; j++) {
-          matrix[i]->setCursor(-i *8, mtx_y + (j *8));
-          matrix[i]->println(words[j]);
-        }
-        matrix[i]->setBrightness(Settings.display_dimmer);
-      }
-      MatrixWrite();
-      if (((mtx_y %8) == 0) && mtx_counter) {
-        mtx_counter--;
-      } else {
-        mtx_y--;
-        mtx_counter = STATES * 1;
-      }
-      if (mtx_y < -(wordcounter *8)) { mtx_state = loop; }
-    }
-    break;
-  }
-}
-
-
-
-void MatrixInitMode(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->setRotation(Settings.display_rotate);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-    matrix[i]->blinkRate(0);
-    matrix[i]->setTextWrap(false);
-
-
-    matrix[i]->cp437(true);
-  }
-  MatrixClear();
-}
-
-void MatrixInit(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      MatrixInitMode();
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void MatrixInitDriver(void)
-{
-  mtx_buffer = (char*)(malloc(MTX_MAX_SCREEN_BUFFER));
-  if (mtx_buffer != nullptr) {
-    if (!Settings.display_model) {
-      if (I2cSetDevice(Settings.display_address[1])) {
-        Settings.display_model = XDSP_03;
-      }
-    }
-
-    if (XDSP_03 == Settings.display_model) {
-      mtx_state = 1;
-      for (mtx_matrices = 0; mtx_matrices < 8; mtx_matrices++) {
-        if (Settings.display_address[mtx_matrices]) {
-          I2cSetActiveFound(Settings.display_address[mtx_matrices], "8x8Matrix");
-          matrix[mtx_matrices] = new Adafruit_8x8matrix();
-          matrix[mtx_matrices]->begin(Settings.display_address[mtx_matrices]);
-        } else {
-          break;
-        }
-      }
-
-      Settings.display_width = mtx_matrices * 8;
-      Settings.display_height = 8;
-
-      MatrixInitMode();
-    }
-  }
-}
-
-void MatrixOnOff(void)
-{
-  if (!disp_power) { MatrixClear(); }
-}
-
-void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  strlcpy(mtx_buffer, str, MTX_MAX_SCREEN_BUFFER);
-  mtx_mode = x &1;
-  mtx_loop = y &1;
-  if (!mtx_state) { mtx_state = 1; }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void MatrixPrintLog(uint8_t direction)
-{
-  char* txt = (!mtx_done) ? DisplayLogBuffer('\370') : mtx_buffer;
-  if (txt != nullptr) {
-    if (!mtx_state) { mtx_state = 1; }
-
-    if (!mtx_done) {
-
-      uint8_t space = 0;
-      uint8_t max_cols = (disp_log_buffer_cols < MTX_MAX_SCREEN_BUFFER) ? disp_log_buffer_cols : MTX_MAX_SCREEN_BUFFER;
-      mtx_buffer[0] = '\0';
-      uint8_t i = 0;
-      while ((txt[i] != '\0') && (i < max_cols)) {
-        if (txt[i] == ' ') {
-          space++;
-        } else {
-          space = 0;
-        }
-        if (space < 2) {
-          strncat(mtx_buffer, (const char*)txt +i, (strlen(mtx_buffer) < MTX_MAX_SCREEN_BUFFER -1) ? 1 : 0);
-        }
-        i++;
-      }
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), mtx_buffer);
-
-      mtx_done = 1;
-    }
-
-    if (direction) {
-      MatrixScrollUp(mtx_buffer, 0);
-    } else {
-      MatrixScrollLeft(mtx_buffer, 0);
-    }
-    if (!mtx_state) { mtx_done = 0; }
-  } else {
-    char disp_time[9];
-
-    snprintf_P(disp_time, sizeof(disp_time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-    MatrixFixed(disp_time);
-  }
-}
-
-#endif
-
-void MatrixRefresh(void)
-{
-  if (disp_power) {
-    switch (Settings.display_mode) {
-      case 0: {
-        switch (mtx_mode) {
-          case 0:
-            MatrixScrollLeft(mtx_buffer, mtx_loop);
-            break;
-          case 1:
-            MatrixScrollUp(mtx_buffer, mtx_loop);
-            break;
-        }
-        break;
-      }
-#ifdef USE_DISPLAY_MODES1TO5
-      case 2: {
-        char disp_date[9];
-        snprintf_P(disp_date, sizeof(disp_date), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year -2000);
-        MatrixFixed(disp_date);
-        break;
-      }
-      case 3: {
-        char disp_day[10];
-        snprintf_P(disp_day, sizeof(disp_day), PSTR("%d %s"), RtcTime.day_of_month, RtcTime.name_of_month);
-        MatrixCenter(disp_day);
-        break;
-      }
-      case 4:
-        MatrixPrintLog(0);
-        break;
-      case 1:
-      case 5:
-        MatrixPrintLog(1);
-        break;
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xdsp03(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_05)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    MatrixInitDriver();
-  }
-  else if (XDSP_03 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_INIT:
-        MatrixInit(dsp_init);
-        break;
-      case FUNC_DISPLAY_EVERY_50_MSECOND:
-        MatrixRefresh();
-        break;
-      case FUNC_DISPLAY_POWER:
-        MatrixOnOff();
-        break;
-      case FUNC_DISPLAY_DRAW_STRING:
-        MatrixDrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_04_ili9341.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_04_ili9341.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_ILI9341
-
-#define XDSP_04 4
-
-#define TFT_TOP 16
-#define TFT_BOTTOM 16
-#define TFT_FONT_WIDTH 6
-#define TFT_FONT_HEIGTH 8
-
-#include <SPI.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_ILI9341.h>
-
-Adafruit_ILI9341 *tft;
-
-uint16_t tft_scroll;
-
-
-
-void Ili9341InitMode(void)
-{
-  tft->setRotation(Settings.display_rotate);
-  tft->invertDisplay(0);
-  tft->fillScreen(ILI9341_BLACK);
-  tft->setTextWrap(false);
-  tft->cp437(true);
-  if (!Settings.display_mode) {
-    tft->setCursor(0, 0);
-    tft->setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-    tft->setTextSize(1);
-  } else {
-    tft->setScrollMargins(TFT_TOP, TFT_BOTTOM);
-    tft->setCursor(0, 0);
-    tft->setTextColor(ILI9341_YELLOW, ILI9341_BLACK);
-    tft->setTextSize(2);
-
-
-    tft_scroll = TFT_TOP;
-  }
-}
-
-void Ili9341Init(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      Ili9341InitMode();
-#ifdef USE_DISPLAY_MODES1TO5
-      if (Settings.display_rotate) {
-        DisplayClearScreenBuffer();
-      }
-#endif
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void Ili9341InitDriver(void)
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_04;
-  }
-
-  if (XDSP_04 == Settings.display_model) {
-    if (Settings.display_width != ILI9341_TFTWIDTH) {
-      Settings.display_width = ILI9341_TFTWIDTH;
-    }
-    if (Settings.display_height != ILI9341_TFTHEIGHT) {
-      Settings.display_height = ILI9341_TFTHEIGHT;
-    }
-    tft = new Adafruit_ILI9341(pin[GPIO_SPI_CS], pin[GPIO_SPI_DC]);
-    tft->begin();
-
-#ifdef USE_DISPLAY_MODES1TO5
-    if (Settings.display_rotate) {
-      DisplayAllocScreenBuffer();
-    }
-#endif
-
-    Ili9341InitMode();
-  }
-}
-
-void Ili9341Clear(void)
-{
-  tft->fillScreen(ILI9341_BLACK);
-  tft->setCursor(0, 0);
-}
-
-void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  uint16_t active_color = ILI9341_WHITE;
-
-  tft->setTextSize(Settings.display_size);
-  if (!flag) {
-    tft->setCursor(x, y);
-  } else {
-    tft->setCursor((x-1) * TFT_FONT_WIDTH * Settings.display_size, (y-1) * TFT_FONT_HEIGTH * Settings.display_size);
-  }
-  if (color) { active_color = color; }
-  tft->setTextColor(active_color, ILI9341_BLACK);
-  tft->println(str);
-}
-
-void Ili9341DisplayOnOff(uint8_t on)
-{
-
-
-  if (pin[GPIO_BACKLIGHT] < 99) {
-    pinMode(pin[GPIO_BACKLIGHT], OUTPUT);
-    digitalWrite(pin[GPIO_BACKLIGHT], on);
-  }
-}
-
-void Ili9341OnOff(void)
-{
-  Ili9341DisplayOnOff(disp_power);
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void Ili9341PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (Settings.display_rotate) {
-      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-    }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != nullptr) {
-      uint8_t size = Settings.display_size;
-      uint16_t theight = size * TFT_FONT_HEIGTH;
-
-      tft->setTextSize(size);
-      tft->setTextColor(ILI9341_CYAN, ILI9341_BLACK);
-      if (!Settings.display_rotate) {
-        tft->setCursor(0, tft_scroll);
-        tft->fillRect(0, tft_scroll, tft->width(), theight, ILI9341_BLACK);
-        tft->print(txt);
-        tft_scroll += theight;
-        if (tft_scroll >= (tft->height() - TFT_BOTTOM)) {
-          tft_scroll = TFT_TOP;
-        }
-        tft->scrollTo(tft_scroll);
-      } else {
-        uint8_t last_row = Settings.display_rows -1;
-
-        tft_scroll = theight;
-        tft->setCursor(0, tft_scroll);
-        for (uint32_t i = 0; i < last_row; i++) {
-          strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-
-          tft->print(disp_screen_buffer[i]);
-          tft_scroll += theight;
-          tft->setCursor(0, tft_scroll);
-          delay(1);
-        }
-        strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-        DisplayFillScreen(last_row);
-        tft->print(disp_screen_buffer[last_row]);
-      }
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
-    }
-  }
-}
-
-void Ili9341Refresh(void)
-{
-  if (Settings.display_mode) {
-    char tftdt[Settings.display_cols[0] +1];
-    char date4[11];
-    char space[Settings.display_cols[0] - 17];
-    char time[9];
-
-    tft->setTextSize(2);
-    tft->setTextColor(ILI9341_YELLOW, ILI9341_RED);
-    tft->setCursor(0, 0);
-
-    snprintf_P(date4, sizeof(date4), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-    memset(space, 0x20, sizeof(space));
-    space[sizeof(space) -1] = '\0';
-    snprintf_P(time, sizeof(time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-    snprintf_P(tftdt, sizeof(tftdt), PSTR("%s%s%s"), date4, space, time);
-
-    tft->print(tftdt);
-
-    switch (Settings.display_mode) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        Ili9341PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp04(uint8_t function)
-{
-  bool result = false;
-
-  if (spi_flg) {
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      Ili9341InitDriver();
-    }
-    else if (XDSP_04 == Settings.display_model) {
-
-      if (!dsp_color) { dsp_color = ILI9341_WHITE; }
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-        case FUNC_DISPLAY_INIT:
-          Ili9341Init(dsp_init);
-          break;
-        case FUNC_DISPLAY_POWER:
-          Ili9341OnOff();
-          break;
-        case FUNC_DISPLAY_CLEAR:
-          Ili9341Clear();
-          break;
-        case FUNC_DISPLAY_DRAW_HLINE:
-          tft->writeFastHLine(dsp_x, dsp_y, dsp_len, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_VLINE:
-          tft->writeFastVLine(dsp_x, dsp_y, dsp_len, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_LINE:
-          tft->writeLine(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_CIRCLE:
-          tft->drawCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
-          break;
-        case FUNC_DISPLAY_FILL_CIRCLE:
-          tft->fillCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_RECTANGLE:
-          tft->drawRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-        case FUNC_DISPLAY_FILL_RECTANGLE:
-          tft->fillRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-
-
-
-        case FUNC_DISPLAY_TEXT_SIZE:
-          tft->setTextSize(Settings.display_size);
-          break;
-        case FUNC_DISPLAY_FONT_SIZE:
-
-          break;
-        case FUNC_DISPLAY_DRAW_STRING:
-          Ili9341DrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
-          break;
-        case FUNC_DISPLAY_ONOFF:
-          Ili9341DisplayOnOff(dsp_on);
-          break;
-        case FUNC_DISPLAY_ROTATION:
-          tft->setRotation(Settings.display_rotate);
-          break;
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          Ili9341Refresh();
-          break;
-#endif
-      }
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER_29
-
-#define XDSP_05 5
-
-#define EPD_TOP 12
-#define EPD_FONT_HEIGTH 12
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-
-#define USE_TINY_FONT 
-
-#include <epd2in9.h>
-#include <epdpaint.h>
-
-
-extern uint8_t *buffer;
-uint16_t epd_scroll;
-
-Epd *epd;
-
-
-
-void EpdInitDriver29()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_05;
-  }
-
-  if (XDSP_05 == Settings.display_model) {
-    if (Settings.display_width != EPD_WIDTH) {
-      Settings.display_width = EPD_WIDTH;
-    }
-    if (Settings.display_height != EPD_HEIGHT) {
-      Settings.display_height = EPD_HEIGHT;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((EPD_WIDTH * EPD_HEIGHT) / 8,1);
-    if (!buffer) return;
-
-
-    epd = new Epd(EPD_WIDTH,EPD_HEIGHT);
-
-
-    if ((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CLK] < 99) && (pin[GPIO_SPI_MOSI] < 99)) {
-      epd->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: HardSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SPI_CS], pin[GPIO_SPI_CLK], pin[GPIO_SPI_MOSI]);
-    }
-    else if ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_MOSI] < 99)) {
-      epd->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: SoftSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SSPI_CS], pin[GPIO_SSPI_SCLK], pin[GPIO_SSPI_MOSI]);
-    } else {
-      free(buffer);
-      return;
-    }
-
-    renderer = epd;
-    epd->Init(DISPLAY_INIT_FULL);
-    epd->Init(DISPLAY_INIT_PARTIAL);
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(1);
-    renderer->DrawStringAt(50, 50, "Waveshare E-Paper Display!", COLORED,0);
-    renderer->Updateframe();
-    delay(1000);
-    renderer->fillScreen(0);
-#endif
-
-  }
-}
-
-
-
-
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-#define EPD_FONT_HEIGTH 12
-void EpdPrintLog29(void)
-{
-
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-
-      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-
-    char* txt = DisplayLogBuffer('\040');
-    if (txt != nullptr) {
-      uint8_t size = Settings.display_size;
-      uint16_t theight = size * EPD_FONT_HEIGTH;
-
-      renderer->setTextFont(size);
-      uint8_t last_row = Settings.display_rows -1;
-
-
-      epd_scroll = 0;
-      for (uint32_t i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[i], COLORED, 0);
-        epd_scroll += theight;
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-      renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[last_row], COLORED, 0);
-
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
-    }
-  }
-}
-
-void EpdRefresh29(void)
-{
-  if (Settings.display_mode) {
-
-    if (!renderer) return;
-# 165 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-    switch (Settings.display_mode) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        EpdPrintLog29();
-        renderer->Updateframe();
-        break;
-    }
-
-
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp05(uint8_t function)
-{
-  bool result = false;
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      EpdInitDriver29();
-    }
-    else if (XDSP_05 == Settings.display_model) {
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          EpdRefresh29();
-          break;
-#endif
-      }
-    }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_06_epaper_42.ino"
-# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_06_epaper_42.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER_42
-
-#define XDSP_06 6
-
-#define COLORED42 1
-#define UNCOLORED42 0
-
-
-
-#define USE_TINY_FONT 
-
-#include <epd4in2.h>
-#include <epdpaint.h>
-
-extern uint8_t *buffer;
-
-Epd42 *epd42;
-
-
-
-
-void EpdInitDriver42()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_06;
-  }
-
-  if (XDSP_06 == Settings.display_model) {
-
-    if (Settings.display_width != EPD_WIDTH42) {
-      Settings.display_width = EPD_WIDTH42;
-    }
-    if (Settings.display_height != EPD_HEIGHT42) {
-      Settings.display_height = EPD_HEIGHT42;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((EPD_WIDTH42 * EPD_HEIGHT42) / 8,1);
-    if (!buffer) return;
-
-
-    epd42 = new Epd42(EPD_WIDTH42,EPD_HEIGHT42);
-
-    #ifdef USE_SPI
-        if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)) {
-          epd42->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-        } else {
-          free(buffer);
-          return;
-        }
-    #else
-        if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
-          epd42->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-        } else {
-          free(buffer);
-          return;
-        }
-    #endif
-
-    renderer = epd42;
-
-    epd42->Init();
-
-    renderer->fillScreen(0);
-
-
-    epd42->Init(DISPLAY_INIT_FULL);
-
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-    epd42->ClearFrame();
-    renderer->Updateframe();
-    delay(3000);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->DrawStringAt(50, 140, "Waveshare E-Paper!", COLORED42,0);
-    renderer->Updateframe();
-    delay(350);
-    renderer->fillScreen(0);
-#endif
-
-  }
-}
-
-
-
-
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void EpdRefresh42()
-{
-  if (Settings.display_mode) {
-
-  }
-}
-
-#endif
-
-
-
-
-
-
-bool Xdsp06(uint8_t function)
-{
-  bool result = false;
-
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      EpdInitDriver42();
-    }
-    else if (XDSP_06 == Settings.display_model) {
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          EpdRefresh42();
-          break;
-#endif
-      }
-    }
-  return result;
-}
-
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_07_sh1106.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_07_sh1106.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SH1106
-
-#define OLED_RESET 4
-
-#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
-
-extern uint8_t *buffer;
-
-#define XDSP_07 7
-#define XI2C_06 6
-
-#define OLED_ADDRESS1 0x3C
-#define OLED_ADDRESS2 0x3D
-
-#define OLED_BUFFER_COLS 40
-#define OLED_BUFFER_ROWS 16
-
-#define OLED_FONT_WIDTH 6
-#define OLED_FONT_HEIGTH 8
-
-#include <Wire.h>
-#include <renderer.h>
-#include <Adafruit_SH1106.h>
-
-Adafruit_SH1106 *oled1106;
-
-
-
-
-void SH1106InitDriver()
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(OLED_ADDRESS1)) {
-      Settings.display_address[0] = OLED_ADDRESS1;
-      Settings.display_model = XDSP_07;
-    }
-    else if (I2cSetDevice(OLED_ADDRESS2)) {
-      Settings.display_address[0] = OLED_ADDRESS2;
-      Settings.display_model = XDSP_07;
-    }
-  }
-
-  if (XDSP_07 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "SH1106");
-
-    if (Settings.display_width != SH1106_LCDWIDTH) {
-      Settings.display_width = SH1106_LCDWIDTH;
-    }
-    if (Settings.display_height != SH1106_LCDHEIGHT) {
-      Settings.display_height = SH1106_LCDHEIGHT;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((SH1106_LCDWIDTH * SH1106_LCDHEIGHT) / 8,1);
-    if (!buffer) return;
-
-
-    oled1106 = new Adafruit_SH1106(SH1106_LCDWIDTH,SH1106_LCDHEIGHT);
-    renderer=oled1106;
-    renderer->Begin(SH1106_SWITCHCAPVCC, Settings.display_address[0],0);
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-    renderer->setTextFont(0);
-    renderer->setTextSize(2);
-    renderer->setCursor(20,20);
-    renderer->println(F("SH1106"));
-    renderer->Updateframe();
-    renderer->DisplayOnff(1);
-#endif
-  }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void SH1106PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void SH1106Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(Settings.display_size);
-  renderer->setTextFont(Settings.display_font);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void SH1106Refresh(void)
-{
-  if (!renderer) return;
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        SH1106Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        SH1106PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_06)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    SH1106InitDriver();
-  }
-  else if (XDSP_07 == Settings.display_model) {
-
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        SH1106Refresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_08_ILI9488.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_08_ILI9488.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_ILI9488
-
-#define XDSP_08 8
-#define XI2C_38 38
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-#define FT6236_address 0x38
-
-
-
-#define USE_TINY_FONT 
-
-
-#include <ILI9488.h>
-#include <FT6236.h>
-
-TouchLocation ili9488_pLoc;
-uint8_t ili9488_ctouch_counter = 0;
-
-
-#define BACKPLANE_PIN 2
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-ILI9488 *ili9488;
-
-#ifdef USE_TOUCH_BUTTONS
-extern VButton *buttons[];
-#endif
-
-extern const uint16_t picture[];
-uint8_t FT6236_found;
-
-
-
-void ILI9488_InitDriver()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_08;
-  }
-
-  if (XDSP_08 == Settings.display_model) {
-
-    if (Settings.display_width != ILI9488_TFTWIDTH) {
-      Settings.display_width = ILI9488_TFTWIDTH;
-    }
-    if (Settings.display_height != ILI9488_TFTHEIGHT) {
-      Settings.display_height = ILI9488_TFTHEIGHT;
-    }
-
-
-    buffer=NULL;
-
-
-    fg_color = ILI9488_WHITE;
-    bg_color = ILI9488_BLACK;
-
-    uint8_t bppin=BACKPLANE_PIN;
-    if (pin[GPIO_BACKLIGHT]<99) {
-      bppin=pin[GPIO_BACKLIGHT];
-    }
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
-      ili9488 = new ILI9488(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK],bppin);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
-        ili9488 = new ILI9488(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK],bppin);
-      } else {
-        return;
-      }
-    }
-
-    SPI.begin();
-    ili9488->begin();
-    renderer = ili9488;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(ILI9488_WHITE,ILI9488_BLACK);
-    renderer->DrawStringAt(50, 50, "ILI9488 TFT Display!", ILI9488_WHITE,0);
-    delay(1000);
-
-
-#endif
-
-    color_type = COLOR_COLOR;
-
-
-    if (I2cEnabled(XI2C_38) && I2cSetDevice(FT6236_address)) {
-      FT6236begin(FT6236_address);
-      FT6236_found=1;
-      I2cSetActiveFound(FT6236_address, "FT6236");
-    } else {
-      FT6236_found=0;
-    }
-
-  }
-}
-
-#ifdef USE_TOUCH_BUTTONS
-void ILI9488_MQTT(uint8_t count,const char *cp) {
-  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
-  MqttPublishTeleSensor();
-}
-
-void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) {
-  buttons[count]->xdrawButton(pwr);
-  if (pwr) buttons[count]->vpower|=0x80;
-  else buttons[count]->vpower&=0x7f;
-}
-
-void FT6236Check() {
-uint16_t temp;
-uint8_t rbutt=0,vbutt=0;
-ili9488_ctouch_counter++;
-if (2 == ili9488_ctouch_counter) {
-
-  ili9488_ctouch_counter=0;
-  if (FT6236readTouchLocation(&ili9488_pLoc,1)) {
-
-    if (renderer) {
-      uint8_t rot=renderer->getRotation();
-      switch (rot) {
-        case 0:
-          temp=ili9488_pLoc.y;
-          ili9488_pLoc.y=renderer->height()-ili9488_pLoc.x;
-          ili9488_pLoc.x=temp;
-          break;
-        case 1:
-          break;
-        case 2:
-          break;
-        case 3:
-          temp=ili9488_pLoc.y;
-          ili9488_pLoc.y=ili9488_pLoc.x;
-          ili9488_pLoc.x=renderer->width()-temp;
-          break;
-      }
-
-      for (uint8_t count=0; count<MAXBUTTONS; count++) {
-        if (buttons[count]) {
-            uint8_t bflags=buttons[count]->vpower&0x7f;
-            if (buttons[count]->contains(ili9488_pLoc.x,ili9488_pLoc.y)) {
-
-                buttons[count]->press(true);
-                if (buttons[count]->justPressed()) {
-                  if (!bflags) {
-                    uint8_t pwr=bitRead(power,rbutt);
-                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
-                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
-                      ILI9488_RDW_BUTT(count,!pwr);
-                    }
-                  } else {
-
-                    const char *cp;
-                    if (bflags==1) {
-
-                      buttons[count]->vpower^=0x80;
-                      cp="TBT";
-                    } else {
-
-                      buttons[count]->vpower|=0x80;
-                      cp="PBT";
-                    }
-                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-                    ILI9488_MQTT(count,cp);
-                  }
-                }
-            }
-            if (!bflags) {
-              rbutt++;
-            } else {
-              vbutt++;
-            }
-        }
-      }
-    }
-  } else {
-
-    for (uint8_t count=0; count<MAXBUTTONS; count++) {
-      if (buttons[count]) {
-        uint8_t bflags=buttons[count]->vpower&0x7f;
-        buttons[count]->press(false);
-        if (buttons[count]->justReleased()) {
-          uint8_t bflags=buttons[count]->vpower&0x7f;
-          if (bflags>0) {
-            if (bflags>1) {
-
-              buttons[count]->vpower&=0x7f;
-              ILI9488_MQTT(count,"PBT");
-            }
-            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-          }
-        }
-        if (!bflags) {
-
-          uint8_t pwr=bitRead(power,rbutt);
-          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
-          if (pwr!=vpwr) {
-            ILI9488_RDW_BUTT(count,pwr);
-          }
-          rbutt++;
-        }
-      }
-    }
-    ili9488_pLoc.x=0;
-    ili9488_pLoc.y=0;
-  }
-}
-}
-#endif
-
-
-
-
-bool Xdsp08(uint8_t function)
-{
-  bool result = false;
-
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      ILI9488_InitDriver();
-    }
-    else if (XDSP_08 == Settings.display_model) {
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-        case FUNC_DISPLAY_EVERY_50_MSECOND:
-#ifdef USE_TOUCH_BUTTONS
-          if (FT6236_found) FT6236Check();
-#endif
-          break;
-      }
-    }
-
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_09_SSD1351.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_09_SSD1351.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SSD1351
-
-#define XDSP_09 9
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-
-
-#define USE_TINY_FONT 
-
-#include <SSD1351.h>
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-SSD1351 *ssd1351;
-
-
-
-void SSD1351_InitDriver() {
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_09;
-  }
-
-  if (XDSP_09 == Settings.display_model) {
-
-    if (Settings.display_width != SSD1351_WIDTH) {
-      Settings.display_width = SSD1351_WIDTH;
-    }
-    if (Settings.display_height != SSD1351_HEIGHT) {
-      Settings.display_height = SSD1351_HEIGHT;
-    }
-
-    buffer=0;
-
-
-    fg_color = SSD1351_WHITE;
-    bg_color = SSD1351_BLACK;
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
-      ssd1351 = new SSD1351(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)){
-        ssd1351 = new SSD1351(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-      } else {
-        return;
-      }
-    }
-
-    delay(100);
-    SPI.begin();
-    ssd1351->begin();
-    renderer = ssd1351;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->dim(Settings.display_dimmer);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(SSD1351_WHITE,SSD1351_BLACK);
-    renderer->DrawStringAt(10, 60, "SSD1351", SSD1351_RED,0);
-    delay(1000);
-
-#endif
-    color_type = COLOR_COLOR;
-  }
-}
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void SSD1351PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void SSD1351Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(2);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void SSD1351Refresh(void)
-{
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        SSD1351Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        SSD1351PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-bool Xdsp09(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      SSD1351_InitDriver();
-  }
-  else if (XDSP_09 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        SSD1351Refresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_RA8876
-
-#define XDSP_10 10
-#define XI2C_39 39
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-#define FT5316_address 0x38
-
-
-
-#define USE_TINY_FONT 
-
-#include <RA8876.h>
-#include <FT6236.h>
-
-TouchLocation ra8876_pLoc;
-uint8_t ra8876_ctouch_counter = 0;
-
-#ifdef USE_TOUCH_BUTTONS
-extern VButton *buttons[];
-#endif
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-RA8876 *ra8876;
-
-uint8_t FT5316_found;
-
-
-void RA8876_InitDriver()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_10;
-  }
-
-  if (XDSP_10 == Settings.display_model) {
-
-    if (Settings.display_width != RA8876_TFTWIDTH) {
-      Settings.display_width = RA8876_TFTWIDTH;
-    }
-    if (Settings.display_height != RA8876_TFTHEIGHT) {
-      Settings.display_height = RA8876_TFTHEIGHT;
-    }
-    buffer=0;
-
-
-    fg_color = RA8876_WHITE;
-    bg_color = RA8876_BLACK;
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]==13) && (pin[GPIO_SSPI_MISO]==12) && (pin[GPIO_SSPI_SCLK]==14)) {
-      ra8876 = new RA8876(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_MISO],pin[GPIO_SSPI_SCLK],pin[GPIO_BACKLIGHT]);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]==13) && (pin[GPIO_SPI_MISO]==12) && (pin[GPIO_SPI_CLK]==14)) {
-        ra8876 = new RA8876(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_MISO],pin[GPIO_SPI_CLK],pin[GPIO_BACKLIGHT]);
-      } else {
-        return;
-      }
-    }
-
-    ra8876->begin();
-    renderer = ra8876;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->dim(Settings.display_dimmer);
-
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(RA8876_WHITE,RA8876_BLACK);
-    renderer->DrawStringAt(600, 300, "RA8876", RA8876_RED,0);
-    delay(1000);
-
-#endif
-    color_type = COLOR_COLOR;
-
-    if (I2cEnabled(XI2C_39) && I2cSetDevice(FT5316_address)) {
-      FT6236begin(FT5316_address);
-      FT5316_found=1;
-      I2cSetActiveFound(FT5316_address, "FT5316");
-    } else {
-      FT5316_found=0;
-    }
-
-  }
-}
-
-#ifdef USE_TOUCH_BUTTONS
-void RA8876_MQTT(uint8_t count,const char *cp) {
-  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
-  MqttPublishTeleSensor();
-}
-
-void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) {
-  buttons[count]->xdrawButton(pwr);
-  if (pwr) buttons[count]->vpower|=0x80;
-  else buttons[count]->vpower&=0x7f;
-}
-
-
-void FT5316Check() {
-uint16_t temp;
-uint8_t rbutt=0,vbutt=0;
-ra8876_ctouch_counter++;
-if (2 == ra8876_ctouch_counter) {
-
-  ra8876_ctouch_counter=0;
-
-  if (FT6236readTouchLocation(&ra8876_pLoc,1)) {
-    ra8876_pLoc.x=ra8876_pLoc.x*RA8876_TFTWIDTH/800;
-    ra8876_pLoc.y=ra8876_pLoc.y*RA8876_TFTHEIGHT/480;
-
-
-    if (renderer) {
-
-
-      ra8876_pLoc.x=RA8876_TFTWIDTH-ra8876_pLoc.x;
-      ra8876_pLoc.y=RA8876_TFTHEIGHT-ra8876_pLoc.y;
-# 170 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
-      for (uint8_t count=0; count<MAXBUTTONS; count++) {
-        if (buttons[count]) {
-            uint8_t bflags=buttons[count]->vpower&0x7f;
-            if (buttons[count]->contains(ra8876_pLoc.x,ra8876_pLoc.y)) {
-
-                buttons[count]->press(true);
-                if (buttons[count]->justPressed()) {
-                  if (!bflags) {
-
-                    uint8_t pwr=bitRead(power,rbutt);
-                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
-                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
-                      RA8876_RDW_BUTT(count,!pwr);
-                    }
-                  } else {
-
-                    const char *cp;
-                    if (bflags==1) {
-
-                      buttons[count]->vpower^=0x80;
-                      cp="TBT";
-                    } else {
-
-                      buttons[count]->vpower|=0x80;
-                      cp="PBT";
-                    }
-                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-                    RA8876_MQTT(count,cp);
-                  }
-                }
-            }
-            if (!bflags) {
-              rbutt++;
-            } else {
-              vbutt++;
-            }
-        }
-      }
-    }
-  } else {
-
-    for (uint8_t count=0; count<MAXBUTTONS; count++) {
-      if (buttons[count]) {
-        uint8_t bflags=buttons[count]->vpower&0x7f;
-        buttons[count]->press(false);
-        if (buttons[count]->justReleased()) {
-          if (bflags>0) {
-            if (bflags>1) {
-
-              buttons[count]->vpower&=0x7f;
-              RA8876_MQTT(count,"PBT");
-            }
-            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-          }
-        }
-        if (!bflags) {
-
-          uint8_t pwr=bitRead(power,rbutt);
-          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
-          if (pwr!=vpwr) {
-            RA8876_RDW_BUTT(count,pwr);
-          }
-          rbutt++;
-        }
-      }
-    }
-    ra8876_pLoc.x=0;
-    ra8876_pLoc.y=0;
-  }
-}
-}
-#endif
-# 426 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_10_RA8876.ino"
-bool Xdsp10(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      RA8876_InitDriver();
-  }
-  else if (XDSP_10 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_EVERY_50_MSECOND:
-#ifdef USE_TOUCH_BUTTONS
-        if (FT5316_found) FT5316Check();
-#endif
-        break;
-    }
-  }
-  return result;
-}
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
-#ifdef USE_DISPLAY
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xdsp_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xdsp_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XDSP_01
-  &Xdsp01,
-#endif
-
-#ifdef XDSP_02
-  &Xdsp02,
-#endif
-
-#ifdef XDSP_03
-  &Xdsp03,
-#endif
-
-#ifdef XDSP_04
-  &Xdsp04,
-#endif
-
-#ifdef XDSP_05
-  &Xdsp05,
-#endif
-
-#ifdef XDSP_06
-  &Xdsp06,
-#endif
-
-#ifdef XDSP_07
-  &Xdsp07,
-#endif
-
-#ifdef XDSP_08
-  &Xdsp08,
-#endif
-
-#ifdef XDSP_09
-  &Xdsp09,
-#endif
-
-#ifdef XDSP_10
-  &Xdsp10,
-#endif
-
-#ifdef XDSP_11
-  &Xdsp11,
-#endif
-
-#ifdef XDSP_12
-  &Xdsp12,
-#endif
-
-#ifdef XDSP_13
-  &Xdsp13,
-#endif
-
-#ifdef XDSP_14
-  &Xdsp14,
-#endif
-
-#ifdef XDSP_15
-  &Xdsp15,
-#endif
-
-#ifdef XDSP_16
-  &Xdsp16
-#endif
-};
-
-const uint8_t xdsp_present = sizeof(xdsp_func_ptr) / sizeof(xdsp_func_ptr[0]);
-# 117 "C:/shared/sonoff/Git/Tasmota/tasmota/xdsp_interface.ino"
-uint8_t XdspPresent(void)
-{
-  return xdsp_present;
-}
-
-bool XdspCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("DSP: %d"), Function);
-
-  for (uint32_t x = 0; x < xdsp_present; x++) {
-    result = xdsp_func_ptr[x](Function);
-
-    if (result && (FUNC_DISPLAY_MODEL == Function)) {
-      break;
-    }
-  }
-
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-# 38 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_01_ws2812.ino"
-#define XLGT_01 1
-
-const uint8_t WS2812_SCHEMES = 8;
-
-const char kWs2812Commands[] PROGMEM = "|"
-  D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH ;
-
-void (* const Ws2812Command[])(void) PROGMEM = {
-  &CmndLed, &CmndPixels, &CmndRotation, &CmndWidth };
-
-#include <NeoPixelBus.h>
-
-#if (USE_WS2812_CTYPE == NEO_GRB)
-  typedef NeoGrbFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_BRG)
-  typedef NeoBrgFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_RBG)
-  typedef NeoRbgFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_RGBW)
-  typedef NeoRgbwFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_GRBW)
-  typedef NeoGrbwFeature selectedNeoFeatureType;
-#else
-  typedef NeoRgbFeature selectedNeoFeatureType;
-#endif
-
-#ifdef USE_WS2812_DMA
-
-
-#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
-  typedef NeoEsp8266DmaWs2812xMethod selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
-  typedef NeoEsp8266DmaSk6812Method selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_APA106)
-  typedef NeoEsp8266DmaApa106Method selectedNeoSpeedType;
-#else
-  typedef NeoEsp8266Dma800KbpsMethod selectedNeoSpeedType;
-#endif
-
-#else
-
-
-#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
-  typedef NeoEsp8266BitBangWs2812xMethod selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
-  typedef NeoEsp8266BitBangSk6812Method selectedNeoSpeedType;
-#else
-  typedef NeoEsp8266BitBang800KbpsMethod selectedNeoSpeedType;
-#endif
-
-#endif
-
-NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType> *strip = nullptr;
-
-struct WsColor {
-  uint8_t red, green, blue;
-};
-
-struct ColorScheme {
-  WsColor* colors;
-  uint8_t count;
-};
-
-WsColor kIncandescent[2] = { 255,140,20, 0,0,0 };
-WsColor kRgb[3] = { 255,0,0, 0,255,0, 0,0,255 };
-WsColor kChristmas[2] = { 255,0,0, 0,255,0 };
-WsColor kHanukkah[2] = { 0,0,255, 255,255,255 };
-WsColor kwanzaa[3] = { 255,0,0, 0,0,0, 0,255,0 };
-WsColor kRainbow[7] = { 255,0,0, 255,128,0, 255,255,0, 0,255,0, 0,0,255, 128,0,255, 255,0,255 };
-WsColor kFire[3] = { 255,0,0, 255,102,0, 255,192,0 };
-ColorScheme kSchemes[WS2812_SCHEMES -1] = {
-  kIncandescent, 2,
-  kRgb, 3,
-  kChristmas, 2,
-  kHanukkah, 2,
-  kwanzaa, 3,
-  kRainbow, 7,
-  kFire, 3 };
-
-uint8_t kWidth[5] = {
-    1,
-    2,
-    4,
-    8,
-  255 };
-uint8_t kWsRepeat[5] = {
-    8,
-    6,
-    4,
-    2,
-    1 };
-
-struct WS2812 {
-  uint8_t show_next = 1;
-  uint8_t scheme_offset = 0;
-  bool suspend_update = false;
-} Ws2812;
-
-
-
-void Ws2812StripShow(void)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-#else
-  RgbColor c;
-#endif
-
-  if (Settings.light_correction) {
-    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-      c = strip->GetPixelColor(i);
-      c.R = ledGamma(c.R);
-      c.G = ledGamma(c.G);
-      c.B = ledGamma(c.B);
-#if (USE_WS2812_CTYPE > NEO_3LED)
-      c.W = ledGamma(c.W);
-#endif
-      strip->SetPixelColor(i, c);
-    }
-  }
-  strip->Show();
-}
-
-int mod(int a, int b)
-{
-   int ret = a % b;
-   if (ret < 0) ret += b;
-   return ret;
-}
-
-void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor color;
-#else
-  RgbColor color;
-#endif
-
-  uint32_t mod_position = mod(position, (int)Settings.light_pixels);
-
-  color = strip->GetPixelColor(mod_position);
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  color.R = tmin(color.R + ((hand_color.red / dimmer) * offset), 255);
-  color.G = tmin(color.G + ((hand_color.green / dimmer) * offset), 255);
-  color.B = tmin(color.B + ((hand_color.blue / dimmer) * offset), 255);
-  strip->SetPixelColor(mod_position, color);
-}
-
-void Ws2812UpdateHand(int position, uint32_t index)
-{
-  uint32_t width = Settings.light_width;
-  if (index < WS_MARKER) { width = Settings.ws_width[index]; }
-  if (!width) { return; }
-
-  position = (position + Settings.light_rotation) % Settings.light_pixels;
-
-  if (Settings.flag.ws_clock_reverse) {
-    position = Settings.light_pixels -position;
-  }
-  WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] };
-
-  Ws2812UpdatePixelColor(position, hand_color, 1);
-
-  uint32_t range = ((width -1) / 2) +1;
-  for (uint32_t h = 1; h < range; h++) {
-    float offset = (float)(range - h) / (float)range;
-    Ws2812UpdatePixelColor(position -h, hand_color, offset);
-    Ws2812UpdatePixelColor(position +h, hand_color, offset);
-  }
-}
-
-void Ws2812Clock(void)
-{
-  strip->ClearTo(0);
-  int clksize = 60000 / (int)Settings.light_pixels;
-
-  Ws2812UpdateHand((RtcTime.second * 1000) / clksize, WS_SECOND);
-  Ws2812UpdateHand((RtcTime.minute * 1000) / clksize, WS_MINUTE);
-  Ws2812UpdateHand((((RtcTime.hour % 12) * 5000) + ((RtcTime.minute * 1000) / 12 )) / clksize, WS_HOUR);
-  if (Settings.ws_color[WS_MARKER][WS_RED] + Settings.ws_color[WS_MARKER][WS_GREEN] + Settings.ws_color[WS_MARKER][WS_BLUE]) {
-    for (uint32_t i = 0; i < 12; i++) {
-      Ws2812UpdateHand((i * 5000) / clksize, WS_MARKER);
-    }
-  }
-
-  Ws2812StripShow();
-}
-
-void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i)
-{
-
-
-
-
-  ColorScheme scheme = kSchemes[schemenr];
-  uint32_t curRange = i / range;
-  uint32_t rangeIndex = i % range;
-  uint32_t colorIndex = rangeIndex / gradRange;
-  uint32_t start = colorIndex;
-  uint32_t end = colorIndex +1;
-  if (curRange % 2 != 0) {
-    start = (scheme.count -1) - start;
-    end = (scheme.count -1) - end;
-  }
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  float fmyRed = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].red, scheme.colors[end].red) / dimmer;
-  float fmyGrn = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].green, scheme.colors[end].green) / dimmer;
-  float fmyBlu = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].blue, scheme.colors[end].blue) / dimmer;
-  mColor->red = (uint8_t)fmyRed;
-  mColor->green = (uint8_t)fmyGrn;
-  mColor->blue = (uint8_t)fmyBlu;
-}
-
-void Ws2812Gradient(uint32_t schemenr)
-{
-
-
-
-
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-  c.W = 0;
-#else
-  RgbColor c;
-#endif
-
-  ColorScheme scheme = kSchemes[schemenr];
-  if (scheme.count < 2) { return; }
-
-  uint32_t repeat = kWsRepeat[Settings.light_width];
-  uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat);
-  uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1));
-  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
-  uint32_t offset = speed > 0 ? Light.strip_timer_counter / speed : 0;
-
-  WsColor oldColor, currentColor;
-  Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset);
-  currentColor = oldColor;
-  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-    if (kWsRepeat[Settings.light_width] > 1) {
-      Ws2812GradientColor(schemenr, &currentColor, range, gradRange, i +offset);
-    }
-    if (Settings.light_speed > 0) {
-
-      c.R = map(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red);
-      c.G = map(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green);
-      c.B = map(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue);
-    }
-    else {
-
-      c.R = currentColor.red;
-      c.G = currentColor.green;
-      c.B = currentColor.blue;
-    }
-    strip->SetPixelColor(i, c);
-    oldColor = currentColor;
-  }
-  Ws2812StripShow();
-}
-
-void Ws2812Bars(uint32_t schemenr)
-{
-
-
-
-
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-  c.W = 0;
-#else
-  RgbColor c;
-#endif
-
-  ColorScheme scheme = kSchemes[schemenr];
-
-  uint32_t maxSize = Settings.light_pixels / scheme.count;
-  if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; }
-
-  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
-  uint32_t offset = (speed > 0) ? Light.strip_timer_counter / speed : 0;
-
-  WsColor mcolor[scheme.count];
-  memcpy(mcolor, scheme.colors, sizeof(mcolor));
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  for (uint32_t i = 0; i < scheme.count; i++) {
-    float fmyRed = (float)mcolor[i].red / dimmer;
-    float fmyGrn = (float)mcolor[i].green / dimmer;
-    float fmyBlu = (float)mcolor[i].blue / dimmer;
-    mcolor[i].red = (uint8_t)fmyRed;
-    mcolor[i].green = (uint8_t)fmyGrn;
-    mcolor[i].blue = (uint8_t)fmyBlu;
-  }
-  uint32_t colorIndex = offset % scheme.count;
-  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-    if (maxSize) { colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; }
-    c.R = mcolor[colorIndex].red;
-    c.G = mcolor[colorIndex].green;
-    c.B = mcolor[colorIndex].blue;
-    strip->SetPixelColor(i, c);
-  }
-  Ws2812StripShow();
-}
-
-void Ws2812Clear(void)
-{
-  strip->ClearTo(0);
-  strip->Show();
-  Ws2812.show_next = 1;
-}
-
-void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor lcolor;
-  lcolor.W = white;
-#else
-  RgbColor lcolor;
-#endif
-
-  lcolor.R = red;
-  lcolor.G = green;
-  lcolor.B = blue;
-  if (led) {
-    strip->SetPixelColor(led -1, lcolor);
-  } else {
-
-    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-      strip->SetPixelColor(i, lcolor);
-    }
-  }
-
-  if (!Ws2812.suspend_update) {
-    strip->Show();
-    Ws2812.show_next = 1;
-  }
-}
-
-char* Ws2812GetColor(uint32_t led, char* scolor)
-{
-  uint8_t sl_ledcolor[4];
-
- #if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor lcolor = strip->GetPixelColor(led -1);
-  sl_ledcolor[3] = lcolor.W;
- #else
-  RgbColor lcolor = strip->GetPixelColor(led -1);
- #endif
-  sl_ledcolor[0] = lcolor.R;
-  sl_ledcolor[1] = lcolor.G;
-  sl_ledcolor[2] = lcolor.B;
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < Light.subtype; i++) {
-    if (Settings.flag.decimal_text) {
-      snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
-    } else {
-      snprintf_P(scolor, 25, PSTR("%s%02X"), scolor, sl_ledcolor[i]);
-    }
-  }
-  return scolor;
-}
-
-
-
-
-
-void Ws2812ForceSuspend (void)
-{
-  Ws2812.suspend_update = true;
-}
-
-void Ws2812ForceUpdate (void)
-{
-  Ws2812.suspend_update = false;
-  strip->Show();
-  Ws2812.show_next = 1;
-}
-
-
-
-bool Ws2812SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2], cur_col[3]);
-
-  return true;
-}
-
-void Ws2812ShowScheme(void)
-{
-  uint32_t scheme = Settings.light_scheme - Ws2812.scheme_offset;
-
-  switch (scheme) {
-    case 0:
-      if ((1 == state_250mS) || (Ws2812.show_next)) {
-        Ws2812Clock();
-        Ws2812.show_next = 0;
-      }
-      break;
-    default:
-      if (1 == Settings.light_fade) {
-        Ws2812Gradient(scheme -1);
-      } else {
-        Ws2812Bars(scheme -1);
-      }
-      Ws2812.show_next = 1;
-      break;
-  }
-}
-
-void Ws2812ModuleSelected(void)
-{
-  if (pin[GPIO_WS2812] < 99) {
-
-
-    strip = new NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
-    strip->Begin();
-
-    Ws2812Clear();
-
-    Ws2812.scheme_offset = Light.max_scheme +1;
-    Light.max_scheme += WS2812_SCHEMES;
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-    light_type = LT_RGBW;
-#else
-    light_type = LT_RGB;
-#endif
-    light_flg = XLGT_01;
-  }
-}
-
-
-
-void CmndLed(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) {
-    if (XdrvMailbox.data_len > 0) {
-      char *p;
-      uint16_t idx = XdrvMailbox.index;
-      Ws2812ForceSuspend();
-      for (char *color = strtok_r(XdrvMailbox.data, " ", &p); color; color = strtok_r(nullptr, " ", &p)) {
-        if (LightColorEntry(color, strlen(color))) {
-          Ws2812SetColor(idx, Light.entry_color[0], Light.entry_color[1], Light.entry_color[2], Light.entry_color[3]);
-          idx++;
-          if (idx > Settings.light_pixels) { break; }
-        } else {
-          break;
-        }
-      }
-      Ws2812ForceUpdate();
-    }
-    char scolor[LIGHT_COLOR_SIZE];
-    ResponseCmndIdxChar(Ws2812GetColor(XdrvMailbox.index, scolor));
-  }
-}
-
-void CmndPixels(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= WS2812_MAX_LEDS)) {
-    Settings.light_pixels = XdrvMailbox.payload;
-    Settings.light_rotation = 0;
-    Ws2812Clear();
-    Light.update = true;
-  }
-  ResponseCmndNumber(Settings.light_pixels);
-}
-
-void CmndRotation(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < Settings.light_pixels)) {
-    Settings.light_rotation = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.light_rotation);
-}
-
-void CmndWidth(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    if (1 == XdrvMailbox.index) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) {
-        Settings.light_width = XdrvMailbox.payload;
-      }
-      ResponseCmndNumber(Settings.light_width);
-    } else {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32)) {
-        Settings.ws_width[XdrvMailbox.index -2] = XdrvMailbox.payload;
-      }
-      ResponseCmndIdxNumber(Settings.ws_width[XdrvMailbox.index -2]);
-    }
-  }
-}
-
-
-
-
-
-bool Xlgt01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Ws2812SetChannels();
-      break;
-    case FUNC_SET_SCHEME:
-      Ws2812ShowScheme();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kWs2812Commands, Ws2812Command);
-      break;
-    case FUNC_MODULE_INIT:
-      Ws2812ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_02_my92x1.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_02_my92x1.ino"
-#ifdef USE_LIGHT
-#ifdef USE_MY92X1
-
-
-
-
-#define XLGT_02 2
-
-struct MY92X1 {
-  uint8_t pdi_pin = 0;
-  uint8_t pdcki_pin = 0;
-  uint8_t model = 0;
-} My92x1;
-
-extern "C" {
-  void os_delay_us(unsigned int);
-}
-
-void LightDiPulse(uint8_t times)
-{
-  for (uint32_t i = 0; i < times; i++) {
-    digitalWrite(My92x1.pdi_pin, HIGH);
-    digitalWrite(My92x1.pdi_pin, LOW);
-  }
-}
-
-void LightDckiPulse(uint8_t times)
-{
-  for (uint32_t i = 0; i < times; i++) {
-    digitalWrite(My92x1.pdcki_pin, HIGH);
-    digitalWrite(My92x1.pdcki_pin, LOW);
-  }
-}
-
-void LightMy92x1Write(uint8_t data)
-{
-  for (uint32_t i = 0; i < 4; i++) {
-    digitalWrite(My92x1.pdcki_pin, LOW);
-    digitalWrite(My92x1.pdi_pin, (data & 0x80));
-    digitalWrite(My92x1.pdcki_pin, HIGH);
-    data = data << 1;
-    digitalWrite(My92x1.pdi_pin, (data & 0x80));
-    digitalWrite(My92x1.pdcki_pin, LOW);
-    digitalWrite(My92x1.pdi_pin, LOW);
-    data = data << 1;
-  }
-}
-
-void LightMy92x1Init(void)
-{
-  uint8_t chips[3] = { 1, 2, 2 };
-
-  LightDckiPulse(chips[My92x1.model] * 32);
-  os_delay_us(12);
-
-
-  LightDiPulse(12);
-  os_delay_us(12);
-  for (uint32_t n = 0; n < chips[My92x1.model]; n++) {
-    LightMy92x1Write(0x18);
-  }
-  os_delay_us(12);
-
-
-  LightDiPulse(16);
-  os_delay_us(12);
-}
-
-void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c)
-{
-  uint8_t channels[3] = { 4, 6, 6 };
-
-  uint8_t duty[3][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 },
-                        { duty_w, duty_c, 0, duty_g, duty_r, duty_b },
-                        { duty_r, duty_g, duty_b, duty_w, duty_w, duty_w }};
-
-  os_delay_us(12);
-  for (uint32_t channel = 0; channel < channels[My92x1.model]; channel++) {
-    LightMy92x1Write(duty[My92x1.model][channel]);
-  }
-  os_delay_us(12);
-  LightDiPulse(8);
-  os_delay_us(12);
-}
-
-
-
-bool My92x1SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
-
-  return true;
-}
-
-void My92x1ModuleSelected(void)
-{
-  if ((pin[GPIO_DCKI] < 99) && (pin[GPIO_DI] < 99)) {
-    My92x1.pdi_pin = pin[GPIO_DI];
-    My92x1.pdcki_pin = pin[GPIO_DCKI];
-
-    pinMode(My92x1.pdi_pin, OUTPUT);
-    pinMode(My92x1.pdcki_pin, OUTPUT);
-    digitalWrite(My92x1.pdi_pin, LOW);
-    digitalWrite(My92x1.pdcki_pin, LOW);
-
-    My92x1.model = 2;
-    light_type = LT_RGBW;
-    if (AILIGHT == my_module_type) {
-      My92x1.model = 0;
-
-    }
-    else if (SONOFF_B1 == my_module_type) {
-      My92x1.model = 1;
-      light_type = LT_RGBWC;
-    }
-
-    LightMy92x1Init();
-
-    light_flg = XLGT_02;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: MY29x1 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = My92x1SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      My92x1ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SM16716
-
-
-
-
-
-
-
-#define XLGT_03 3
-
-#define D_LOG_SM16716 "SM16716: "
-
-struct SM16716 {
-  uint8_t pin_clk = 0;
-  uint8_t pin_dat = 0;
-  uint8_t pin_sel = 0;
-  bool enabled = false;
-} Sm16716;
-
-void SM16716_SendBit(uint8_t v)
-{
-
-
-
-
-
-  digitalWrite(Sm16716.pin_dat, (v != 0) ? HIGH : LOW);
-
-  digitalWrite(Sm16716.pin_clk, HIGH);
-
-  digitalWrite(Sm16716.pin_clk, LOW);
-}
-
-void SM16716_SendByte(uint8_t v)
-{
-  uint8_t mask;
-
-  for (mask = 0x80; mask; mask >>= 1) {
-    SM16716_SendBit(v & mask);
-  }
-}
-
-void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
-{
-  if (Sm16716.pin_sel < 99) {
-    bool should_enable = (duty_r | duty_g | duty_b);
-    if (!Sm16716.enabled && should_enable) {
-      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color on"));
-      Sm16716.enabled = true;
-      digitalWrite(Sm16716.pin_sel, HIGH);
-
-
-      delayMicroseconds(1000);
-      SM16716_Init();
-    }
-    else if (Sm16716.enabled && !should_enable) {
-      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color off"));
-      Sm16716.enabled = false;
-      digitalWrite(Sm16716.pin_sel, LOW);
-    }
-  }
-  DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "Update; rgb=%02x%02x%02x"), duty_r, duty_g, duty_b);
-
-
-  SM16716_SendBit(1);
-  SM16716_SendByte(duty_r);
-  SM16716_SendByte(duty_g);
-  SM16716_SendByte(duty_b);
-
-
-
-
-
-  SM16716_SendBit(0);
-  SM16716_SendByte(0);
-  SM16716_SendByte(0);
-  SM16716_SendByte(0);
-}
-# 111 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
-void SM16716_Init(void)
-{
-  for (uint32_t t_init = 0; t_init < 50; ++t_init) {
-    SM16716_SendBit(0);
-  }
-}
-
-
-
-bool Sm16716SetChannels(void)
-{
-# 132 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  SM16716_Update(cur_col[0], cur_col[1], cur_col[2]);
-
-  return true;
-}
-
-void Sm16716ModuleSelected(void)
-{
-  if ((pin[GPIO_SM16716_CLK] < 99) && (pin[GPIO_SM16716_DAT] < 99)) {
-    Sm16716.pin_clk = pin[GPIO_SM16716_CLK];
-    Sm16716.pin_dat = pin[GPIO_SM16716_DAT];
-    Sm16716.pin_sel = pin[GPIO_SM16716_SEL];
-# 157 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_03_sm16716.ino"
-    pinMode(Sm16716.pin_clk, OUTPUT);
-    digitalWrite(Sm16716.pin_clk, LOW);
-
-    pinMode(Sm16716.pin_dat, OUTPUT);
-    digitalWrite(Sm16716.pin_dat, LOW);
-
-    if (Sm16716.pin_sel < 99) {
-      pinMode(Sm16716.pin_sel, OUTPUT);
-      digitalWrite(Sm16716.pin_sel, LOW);
-
-    } else {
-
-      SM16716_Init();
-    }
-
-    LightPwmOffset(LST_RGB);
-    light_type += LST_RGB;
-    light_flg = XLGT_03;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM16716 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt03(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Sm16716SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      Sm16716ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SM2135
-
-
-
-
-
-
-#define XLGT_04 4
-
-#define SM2135_ADDR_MC 0xC0
-#define SM2135_ADDR_CH 0xC1
-#define SM2135_ADDR_R 0xC2
-#define SM2135_ADDR_G 0xC3
-#define SM2135_ADDR_B 0xC4
-#define SM2135_ADDR_C 0xC5
-#define SM2135_ADDR_W 0xC6
-
-#define SM2135_RGB 0x00
-#define SM2135_CW 0x80
-
-#define SM2135_10MA 0x00
-#define SM2135_15MA 0x01
-#define SM2135_20MA 0x02
-#define SM2135_25MA 0x03
-#define SM2135_30MA 0x04
-#define SM2135_35MA 0x05
-#define SM2135_40MA 0x06
-#define SM2135_45MA 0x07
-#define SM2135_50MA 0x08
-#define SM2135_55MA 0x09
-#define SM2135_60MA 0x0A
-
-
-const uint8_t SM2135_CURRENT = (SM2135_20MA << 4) | SM2135_15MA;
-
-struct SM2135 {
-  uint8_t clk = 0;
-  uint8_t data = 0;
-} Sm2135;
-
-uint8_t Sm2135Write(uint8_t data)
-{
-  for (uint32_t i = 0; i < 8; i++) {
-    digitalWrite(Sm2135.clk, LOW);
-    digitalWrite(Sm2135.data, (data & 0x80));
-    digitalWrite(Sm2135.clk, HIGH);
-    data = data << 1;
-  }
-  digitalWrite(Sm2135.clk, LOW);
-  digitalWrite(Sm2135.data, HIGH);
-  pinMode(Sm2135.data, INPUT);
-  digitalWrite(Sm2135.clk, HIGH);
-  uint8_t ack = digitalRead(Sm2135.data);
-  pinMode(Sm2135.data, OUTPUT);
-  return ack;
-}
-
-void Sm2135Send(uint8_t *buffer, uint8_t size)
-{
-  digitalWrite(Sm2135.data, LOW);
-  for (uint32_t i = 0; i < size; i++) {
-    Sm2135Write(buffer[i]);
-  }
-  digitalWrite(Sm2135.clk, LOW);
-  digitalWrite(Sm2135.clk, HIGH);
-  digitalWrite(Sm2135.data, HIGH);
-}
-
-
-
-bool Sm2135SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-  uint8_t data[6];
-
-  if ((0 == cur_col[0]) && (0 == cur_col[1]) && (0 == cur_col[2])) {
-# 106 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_04_sm2135.ino"
-    data[0] = SM2135_ADDR_MC;
-    data[1] = SM2135_CURRENT;
-    data[2] = SM2135_CW;
-    Sm2135Send(data, 3);
-    delay(1);
-    data[0] = SM2135_ADDR_C;
-    data[1] = cur_col[4];
-    data[2] = cur_col[3];
-    Sm2135Send(data, 3);
-  } else {
-
-
-
-
-
-
-
-    data[0] = SM2135_ADDR_MC;
-    data[1] = SM2135_CURRENT;
-    data[2] = SM2135_RGB;
-    data[3] = cur_col[1];
-    data[4] = cur_col[0];
-    data[5] = cur_col[2];
-    Sm2135Send(data, 6);
-  }
-
-  return true;
-}
-
-void Sm2135ModuleSelected(void)
-{
-  if ((pin[GPIO_SM2135_CLK] < 99) && (pin[GPIO_SM2135_DAT] < 99)) {
-    Sm2135.clk = pin[GPIO_SM2135_CLK];
-    Sm2135.data = pin[GPIO_SM2135_DAT];
-
-    pinMode(Sm2135.data, OUTPUT);
-    digitalWrite(Sm2135.data, HIGH);
-    pinMode(Sm2135.clk, OUTPUT);
-    digitalWrite(Sm2135.clk, HIGH);
-
-    light_type = LT_RGBWC;
-    light_flg = XLGT_04;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM2135 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt04(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Sm2135SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      Sm2135ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SONOFF_L1
-
-
-
-
-#define XLGT_05 5
-
-#define SONOFF_L1_BUFFER_SIZE 140
-
-#define SONOFF_L1_MODE_COLORFUL 1
-#define SONOFF_L1_MODE_COLORFUL_GRADIENT 2
-#define SONOFF_L1_MODE_COLORFUL_BREATH 3
-#define SONOFF_L1_MODE_DIY_GRADIENT 4
-#define SONOFF_L1_MODE_DIY_PULSE 5
-#define SONOFF_L1_MODE_DIY_BREATH 6
-#define SONOFF_L1_MODE_DIY_STROBE 7
-#define SONOFF_L1_MODE_RGB_GRADIENT 8
-#define SONOFF_L1_MODE_RGB_PULSE 9
-#define SONOFF_L1_MODE_RGB_BREATH 10
-#define SONOFF_L1_MODE_RGB_STROBE 11
-#define SONOFF_L1_MODE_SYNC_TO_MUSIC 12
-
-struct SNFL1 {
-  uint32_t unlock = 0;
-  bool receive_ready = true;
-} Snfl1;
-
-
-
-void SnfL1Send(const char *buffer)
-{
-
-
-  Serial.print(buffer);
-  Serial.write(0x1B);
-  Serial.flush();
-}
-
-void SnfL1SerialSendOk(void)
-{
-  char buffer[16];
-  snprintf_P(buffer, sizeof(buffer), PSTR("AT+SEND=ok"));
-
-  SnfL1Send(buffer);
-}
-
-bool SnfL1SerialInput(void)
-{
-  if (serial_in_byte != 0x1B) {
-    if (serial_in_byte_counter >= 140) {
-      serial_in_byte_counter = 0;
-    }
-    if (serial_in_byte_counter || (!serial_in_byte_counter && ('A' == serial_in_byte))) {
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-    }
-  } else {
-    serial_in_buffer[serial_in_byte_counter++] = 0x00;
-
-
-
-
-
-
-    if (!strncmp(serial_in_buffer +3, "RESULT", 6)) {
-      Snfl1.receive_ready = true;
-    }
-    else if (!strncmp(serial_in_buffer +3, "UPDATE", 6)) {
-      char cmnd_dimmer[20];
-      char cmnd_color[20];
-      char *end_str;
-      char *string = serial_in_buffer +10;
-      char *token = strtok_r(string, ",", &end_str);
-
-      bool color_updated[3] = { false, false, false };
-      uint8_t current_color[3];
-      memcpy(current_color, Settings.light_color, 3);
-
-      bool switch_state = false;
-      bool is_power_change = false;
-      bool is_color_change = false;
-      bool is_brightness_change = false;
-
-      while (token != nullptr) {
-        char* end_token;
-        char* token2 = strtok_r(token, ":", &end_token);
-        char* token3 = strtok_r(nullptr, ":", &end_token);
-
-        if (!strncmp(token2, "\"sequence\"", 10)) {
-
-
-
-          token = nullptr;
-        }
-
-        else if (!strncmp(token2, "\"switch\"", 8)) {
-          switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
-
-
-
-          is_power_change = (switch_state != Light.power);
-        }
-
-        else if (!strncmp(token2, "\"color", 6)) {
-          char color_channel_name = token2[6];
-          int color_index;
-          switch(color_channel_name)
-          {
-            case 'R': color_index = 0;
-              break;
-            case 'G': color_index = 1;
-              break;
-            case 'B': color_index = 2;
-              break;
-          }
-          int color_value = atoi(token3);
-          current_color[color_index] = color_value;
-          color_updated[color_index] = true;
-
-          bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
-          if (all_color_channels_updated) {
-
-
-
-
-
-            is_color_change = (Light.power && (memcmp(current_color, Settings.light_color, 3) != 0));
-          }
-          snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), current_color[0], current_color[1], current_color[2]);
-        }
-
-        else if (!strncmp(token2, "\"bright\"", 8)) {
-          uint8_t dimmer = atoi(token3);
-
-
-
-          is_brightness_change = (Light.power && (dimmer > 0) && (dimmer != Settings.light_dimmer));
-          snprintf_P(cmnd_dimmer, sizeof(cmnd_dimmer), PSTR(D_CMND_DIMMER " %d"), dimmer);
-        }
-
-        token = strtok_r(nullptr, ",", &end_str);
-      }
-
-      if (is_power_change) {
-        if (Settings.light_scheme > 0) {
-          if (!switch_state) {
-            char cmnd_scheme[20];
-            snprintf_P(cmnd_scheme, sizeof(cmnd_scheme), PSTR(D_CMND_SCHEME " 0"));
-            ExecuteCommand(cmnd_scheme, SRC_SWITCH);
-          }
-        } else {
-          ExecuteCommandPower(1, switch_state, SRC_SWITCH);
-        }
-      }
-      else if (is_brightness_change) {
-        ExecuteCommand(cmnd_dimmer, SRC_SWITCH);
-      }
-      else if (Light.power && is_color_change) {
-        if (0 == Settings.light_scheme) {
-          if (Settings.light_fade) {
-            char cmnd_fade[20];
-            snprintf_P(cmnd_fade, sizeof(cmnd_fade), PSTR(D_CMND_FADE " 0"));
-            ExecuteCommand(cmnd_fade, SRC_SWITCH);
-          }
-          ExecuteCommand(cmnd_color, SRC_SWITCH);
-        }
-      }
-    }
-
-    SnfL1SerialSendOk();
-
-    return true;
-  }
-  serial_in_byte = 0;
-  return false;
-}
-
-
-
-bool SnfL1SetChannels(void)
-{
-  if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) {
-
-    uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
-
-    char buffer[140];
-    snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"),
-      LocalTime(), millis()%1000,
-      Light.power ? "on" : "off",
-      scale_col[0], scale_col[1], scale_col[2],
-      light_state.getDimmer(),
-      SONOFF_L1_MODE_COLORFUL);
-
-    SnfL1Send(buffer);
-
-    Snfl1.unlock = millis() + 500;
-    Snfl1.receive_ready = false;
-  }
-  return true;
-}
-
-void SnfL1ModuleSelected(void)
-{
-  if (SONOFF_L1 == my_module_type) {
-    if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
-      SetSerial(19200, TS_SERIAL_8N1);
-
-      light_type = LT_RGB;
-      light_flg = XLGT_05;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Sonoff L1 Found"));
-    }
-  }
-}
-
-
-
-
-
-bool Xlgt05(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SERIAL:
-      result = SnfL1SerialInput();
-      break;
-    case FUNC_SET_CHANNELS:
-      result = SnfL1SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      SnfL1ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xlgt_interface.ino"
-#ifdef USE_LIGHT
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xlgt_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xlgt_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XLGT_01
-  &Xlgt01,
-#endif
-
-#ifdef XLGT_02
-  &Xlgt02,
-#endif
-
-#ifdef XLGT_03
-  &Xlgt03,
-#endif
-
-#ifdef XLGT_04
-  &Xlgt04,
-#endif
-
-#ifdef XLGT_05
-  &Xlgt05,
-#endif
-
-#ifdef XLGT_06
-  &Xlgt06,
-#endif
-
-#ifdef XLGT_07
-  &Xlgt07,
-#endif
-
-#ifdef XLGT_08
-  &Xlgt08,
-#endif
-
-#ifdef XLGT_09
-  &Xlgt09,
-#endif
-
-#ifdef XLGT_10
-  &Xlgt10,
-#endif
-
-#ifdef XLGT_11
-  &Xlgt11,
-#endif
-
-#ifdef XLGT_12
-  &Xlgt12,
-#endif
-
-#ifdef XLGT_13
-  &Xlgt13,
-#endif
-
-#ifdef XLGT_14
-  &Xlgt14,
-#endif
-
-#ifdef XLGT_15
-  &Xlgt15,
-#endif
-
-#ifdef XLGT_16
-  &Xlgt16
-#endif
-};
-
-const uint8_t xlgt_present = sizeof(xlgt_func_ptr) / sizeof(xlgt_func_ptr[0]);
-
-uint8_t xlgt_active = 0;
-
-bool XlgtCall(uint8_t function)
-{
-  DEBUG_TRACE_LOG(PSTR("LGT: %d"), function);
-
-  if (FUNC_MODULE_INIT == function) {
-    for (uint32_t x = 0; x < xlgt_present; x++) {
-      xlgt_func_ptr[x](function);
-      if (light_flg) {
-        xlgt_active = x;
-        return true;
-      }
-    }
-  }
-  else if (light_flg) {
-    return xlgt_func_ptr[xlgt_active](function);
-  }
-  return false;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_01_hlw8012.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_01_hlw8012.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_HLW8012
-
-
-
-
-
-
-#define XNRG_01 1
-
-
-#define HLW_PREF 10000
-#define HLW_UREF 2200
-#define HLW_IREF 4545
-
-
-#define HJL_PREF 1362
-#define HJL_UREF 822
-#define HJL_IREF 3300
-
-#define HLW_POWER_PROBE_TIME 10
-#define HLW_SAMPLE_COUNT 10
-
-
-
-struct HLW {
-#ifdef HLW_DEBUG
-  unsigned long debug[HLW_SAMPLE_COUNT];
-#endif
-  unsigned long cf_pulse_length = 0;
-  unsigned long cf_pulse_last_time = 0;
-  unsigned long cf_power_pulse_length = 0;
-
-  unsigned long cf1_pulse_length = 0;
-  unsigned long cf1_pulse_last_time = 0;
-  unsigned long cf1_summed_pulse_length = 0;
-  unsigned long cf1_pulse_counter = 0;
-  unsigned long cf1_voltage_pulse_length = 0;
-  unsigned long cf1_current_pulse_length = 0;
-
-  unsigned long energy_period_counter = 0;
-
-  unsigned long power_ratio = 0;
-  unsigned long voltage_ratio = 0;
-  unsigned long current_ratio = 0;
-
-  uint8_t model_type = 0;
-  uint8_t cf1_timer = 0;
-  uint8_t power_retry = 0;
-  bool select_ui_flag = false;
-  bool ui_flag = true;
-  bool load_off = true;
-} Hlw;
-
-
-#ifndef USE_WS2812_DMA
-void HlwCfInterrupt(void) ICACHE_RAM_ATTR;
-void HlwCf1Interrupt(void) ICACHE_RAM_ATTR;
-#endif
-
-void HlwCfInterrupt(void)
-{
-  unsigned long us = micros();
-
-  if (Hlw.load_off) {
-    Hlw.cf_pulse_last_time = us;
-    Hlw.load_off = false;
-  } else {
-    Hlw.cf_pulse_length = us - Hlw.cf_pulse_last_time;
-    Hlw.cf_pulse_last_time = us;
-    Hlw.energy_period_counter++;
-  }
-  Energy.data_valid[0] = 0;
-}
-
-void HlwCf1Interrupt(void)
-{
-  unsigned long us = micros();
-
-  Hlw.cf1_pulse_length = us - Hlw.cf1_pulse_last_time;
-  Hlw.cf1_pulse_last_time = us;
-  if ((Hlw.cf1_timer > 2) && (Hlw.cf1_timer < 8)) {
-    Hlw.cf1_summed_pulse_length += Hlw.cf1_pulse_length;
-#ifdef HLW_DEBUG
-    Hlw.debug[Hlw.cf1_pulse_counter] = Hlw.cf1_pulse_length;
-#endif
-    Hlw.cf1_pulse_counter++;
-    if (HLW_SAMPLE_COUNT == Hlw.cf1_pulse_counter) {
-      Hlw.cf1_timer = 8;
-    }
-  }
-  Energy.data_valid[0] = 0;
-}
-
-
-
-void HlwEvery200ms(void)
-{
-  unsigned long cf1_pulse_length = 0;
-  unsigned long hlw_w = 0;
-  unsigned long hlw_u = 0;
-  unsigned long hlw_i = 0;
-
-  if (micros() - Hlw.cf_pulse_last_time > (HLW_POWER_PROBE_TIME * 1000000)) {
-    Hlw.cf_pulse_length = 0;
-    Hlw.load_off = true;
-  }
-  Hlw.cf_power_pulse_length = Hlw.cf_pulse_length;
-
-  if (Hlw.cf_power_pulse_length && Energy.power_on && !Hlw.load_off) {
-    hlw_w = (Hlw.power_ratio * Settings.energy_power_calibration) / Hlw.cf_power_pulse_length ;
-    Energy.active_power[0] = (float)hlw_w / 10;
-    Hlw.power_retry = 1;
-  } else {
-    if (Hlw.power_retry) {
-      Hlw.power_retry--;
-    } else {
-      Energy.active_power[0] = 0;
-    }
-  }
-
-  if (pin[GPIO_NRG_CF1] < 99) {
-    Hlw.cf1_timer++;
-    if (Hlw.cf1_timer >= 8) {
-      Hlw.cf1_timer = 0;
-      Hlw.select_ui_flag = (Hlw.select_ui_flag) ? false : true;
-      DigitalWrite(GPIO_NRG_SEL, Hlw.select_ui_flag);
-
-      if (Hlw.cf1_pulse_counter) {
-        cf1_pulse_length = Hlw.cf1_summed_pulse_length / Hlw.cf1_pulse_counter;
-      }
-
-#ifdef HLW_DEBUG
-
-      char stemp[100];
-      stemp[0] = '\0';
-      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%s %d"), stemp, Hlw.debug[i]);
-      }
-      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
-        for (uint32_t j = i + 1; j < Hlw.cf1_pulse_counter; j++) {
-          if (Hlw.debug[i] > Hlw.debug[j]) {
-            std::swap(Hlw.debug[i], Hlw.debug[j]);
-          }
-        }
-      }
-      unsigned long median = Hlw.debug[(Hlw.cf1_pulse_counter +1) / 2];
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("NRG: power %d, ui %d, cnt %d, smpl%s, sum %d, mean %d, median %d"),
-        Hlw.cf_power_pulse_length , Hlw.select_ui_flag, Hlw.cf1_pulse_counter, stemp, Hlw.cf1_summed_pulse_length, cf1_pulse_length, median);
-#endif
-
-      if (Hlw.select_ui_flag == Hlw.ui_flag) {
-        Hlw.cf1_voltage_pulse_length = cf1_pulse_length;
-
-        if (Hlw.cf1_voltage_pulse_length && Energy.power_on) {
-          hlw_u = (Hlw.voltage_ratio * Settings.energy_voltage_calibration) / Hlw.cf1_voltage_pulse_length ;
-          Energy.voltage[0] = (float)hlw_u / 10;
-        } else {
-          Energy.voltage[0] = 0;
-        }
-
-      } else {
-        Hlw.cf1_current_pulse_length = cf1_pulse_length;
-
-        if (Hlw.cf1_current_pulse_length && Energy.active_power[0]) {
-          hlw_i = (Hlw.current_ratio * Settings.energy_current_calibration) / Hlw.cf1_current_pulse_length;
-          Energy.current[0] = (float)hlw_i / 1000;
-        } else {
-          Energy.current[0] = 0;
-        }
-
-      }
-      Hlw.cf1_summed_pulse_length = 0;
-      Hlw.cf1_pulse_counter = 0;
-    }
-  }
-}
-
-void HlwEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    Hlw.cf1_voltage_pulse_length = 0;
-    Hlw.cf1_current_pulse_length = 0;
-    Hlw.cf_power_pulse_length = 0;
-  } else {
-    unsigned long hlw_len;
-
-    if (Hlw.energy_period_counter) {
-      hlw_len = 10000 / Hlw.energy_period_counter;
-      Hlw.energy_period_counter = 0;
-      if (hlw_len) {
-        Energy.kWhtoday_delta += ((Hlw.power_ratio * Settings.energy_power_calibration) / hlw_len) / 36;
-        EnergyUpdateToday();
-      }
-    }
-  }
-}
-
-void HlwSnsInit(void)
-{
-  if (!Settings.energy_power_calibration || (4975 == Settings.energy_power_calibration)) {
-    Settings.energy_power_calibration = HLW_PREF_PULSE;
-    Settings.energy_voltage_calibration = HLW_UREF_PULSE;
-    Settings.energy_current_calibration = HLW_IREF_PULSE;
-  }
-
-  if (Hlw.model_type) {
-    Hlw.power_ratio = HJL_PREF;
-    Hlw.voltage_ratio = HJL_UREF;
-    Hlw.current_ratio = HJL_IREF;
-  } else {
-    Hlw.power_ratio = HLW_PREF;
-    Hlw.voltage_ratio = HLW_UREF;
-    Hlw.current_ratio = HLW_IREF;
-  }
-
-  if (pin[GPIO_NRG_SEL] < 99) {
-    pinMode(pin[GPIO_NRG_SEL], OUTPUT);
-    digitalWrite(pin[GPIO_NRG_SEL], Hlw.select_ui_flag);
-  }
-  if (pin[GPIO_NRG_CF1] < 99) {
-    pinMode(pin[GPIO_NRG_CF1], INPUT_PULLUP);
-    attachInterrupt(pin[GPIO_NRG_CF1], HlwCf1Interrupt, FALLING);
-  }
-  pinMode(pin[GPIO_HLW_CF], INPUT_PULLUP);
-  attachInterrupt(pin[GPIO_HLW_CF], HlwCfInterrupt, FALLING);
-}
-
-void HlwDrvInit(void)
-{
-  Hlw.model_type = 0;
-  if (pin[GPIO_HJL_CF] < 99) {
-    pin[GPIO_HLW_CF] = pin[GPIO_HJL_CF];
-    pin[GPIO_HJL_CF] = 99;
-    Hlw.model_type = 1;
-  }
-
-  if (pin[GPIO_HLW_CF] < 99) {
-
-    Hlw.ui_flag = true;
-    if (pin[GPIO_NRG_SEL_INV] < 99) {
-      pin[GPIO_NRG_SEL] = pin[GPIO_NRG_SEL_INV];
-      pin[GPIO_NRG_SEL_INV] = 99;
-      Hlw.ui_flag = false;
-    }
-
-    if (pin[GPIO_NRG_CF1] < 99) {
-      if (99 == pin[GPIO_NRG_SEL]) {
-        Energy.current_available = false;
-      }
-    } else {
-      Energy.current_available = false;
-      Energy.voltage_available = false;
-    }
-
-    energy_flg = XNRG_01;
-  }
-}
-
-bool HlwCommand(void)
-{
-  bool serviced = true;
-
-  if ((CMND_POWERCAL == Energy.command_code) || (CMND_VOLTAGECAL == Energy.command_code) || (CMND_CURRENTCAL == Energy.command_code)) {
-
-  }
-  else if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf_power_pulse_length ) {
-      Settings.energy_power_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf_power_pulse_length ) / Hlw.power_ratio;
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf1_voltage_pulse_length ) {
-      Settings.energy_voltage_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf1_voltage_pulse_length ) / Hlw.voltage_ratio;
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf1_current_pulse_length) {
-      Settings.energy_current_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data)) * Hlw.cf1_current_pulse_length) / Hlw.current_ratio;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_200_MSECOND:
-      HlwEvery200ms();
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      HlwEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = HlwCommand();
-      break;
-    case FUNC_INIT:
-      HlwSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      HlwDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_02_cse7766.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_02_cse7766.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_CSE7766
-
-
-
-
-
-
-
-#define XNRG_02 2
-
-#define CSE_MAX_INVALID_POWER 128
-
-#define CSE_NOT_CALIBRATED 0xAA
-
-#define CSE_PULSES_NOT_INITIALIZED -1
-
-#define CSE_PREF 1000
-#define CSE_UREF 100
-
-#define CSE_BUFFER_SIZE 25
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *CseSerial = nullptr;
-
-struct CSE {
-  long voltage_cycle = 0;
-  long current_cycle = 0;
-  long power_cycle = 0;
-  long power_cycle_first = 0;
-  long cf_pulses = 0;
-  long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
-
-  int byte_counter = 0;
-  uint8_t *rx_buffer = nullptr;
-  uint8_t power_invalid = 0;
-  bool received = false;
-} Cse;
-
-void CseReceived(void)
-{
-
-
-
-
-
-
-  uint8_t header = Cse.rx_buffer[0];
-  if ((header & 0xFC) == 0xFC) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Abnormal hardware"));
-    return;
-  }
-
-
-  if (HLW_UREF_PULSE == Settings.energy_voltage_calibration) {
-    long voltage_coefficient = 191200;
-    if (CSE_NOT_CALIBRATED != header) {
-      voltage_coefficient = Cse.rx_buffer[2] << 16 | Cse.rx_buffer[3] << 8 | Cse.rx_buffer[4];
-    }
-    Settings.energy_voltage_calibration = voltage_coefficient / CSE_UREF;
-  }
-  if (HLW_IREF_PULSE == Settings.energy_current_calibration) {
-    long current_coefficient = 16140;
-    if (CSE_NOT_CALIBRATED != header) {
-      current_coefficient = Cse.rx_buffer[8] << 16 | Cse.rx_buffer[9] << 8 | Cse.rx_buffer[10];
-    }
-    Settings.energy_current_calibration = current_coefficient;
-  }
-  if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
-    long power_coefficient = 5364000;
-    if (CSE_NOT_CALIBRATED != header) {
-      power_coefficient = Cse.rx_buffer[14] << 16 | Cse.rx_buffer[15] << 8 | Cse.rx_buffer[16];
-    }
-    Settings.energy_power_calibration = power_coefficient / CSE_PREF;
-  }
-
-  uint8_t adjustement = Cse.rx_buffer[20];
-  Cse.voltage_cycle = Cse.rx_buffer[5] << 16 | Cse.rx_buffer[6] << 8 | Cse.rx_buffer[7];
-  Cse.current_cycle = Cse.rx_buffer[11] << 16 | Cse.rx_buffer[12] << 8 | Cse.rx_buffer[13];
-  Cse.power_cycle = Cse.rx_buffer[17] << 16 | Cse.rx_buffer[18] << 8 | Cse.rx_buffer[19];
-  Cse.cf_pulses = Cse.rx_buffer[21] << 8 | Cse.rx_buffer[22];
-
-  if (Energy.power_on) {
-    if (adjustement & 0x40) {
-      Energy.voltage[0] = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)Cse.voltage_cycle;
-    }
-    if (adjustement & 0x10) {
-      Cse.power_invalid = 0;
-      if ((header & 0xF2) == 0xF2) {
-        Energy.active_power[0] = 0;
-      } else {
-        if (0 == Cse.power_cycle_first) { Cse.power_cycle_first = Cse.power_cycle; }
-        if (Cse.power_cycle_first != Cse.power_cycle) {
-          Cse.power_cycle_first = -1;
-          Energy.active_power[0] = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)Cse.power_cycle;
-        } else {
-          Energy.active_power[0] = 0;
-        }
-      }
-    } else {
-      if (Cse.power_invalid < Settings.param[P_CSE7766_INVALID_POWER]) {
-        Cse.power_invalid++;
-      } else {
-        Cse.power_cycle_first = 0;
-        Energy.active_power[0] = 0;
-      }
-    }
-    if (adjustement & 0x20) {
-      if (0 == Energy.active_power[0]) {
-        Energy.current[0] = 0;
-      } else {
-        Energy.current[0] = (float)Settings.energy_current_calibration / (float)Cse.current_cycle;
-      }
-    }
-  } else {
-    Cse.power_cycle_first = 0;
-    Energy.voltage[0] = 0;
-    Energy.active_power[0] = 0;
-    Energy.current[0] = 0;
-  }
-}
-
-bool CseSerialInput(void)
-{
-  while (CseSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = CseSerial->read();
-
-    if (Cse.received) {
-      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
-      if (24 == Cse.byte_counter) {
-
-        AddLogBuffer(LOG_LEVEL_DEBUG_MORE, Cse.rx_buffer, 24);
-
-        uint8_t checksum = 0;
-        for (uint32_t i = 2; i < 23; i++) { checksum += Cse.rx_buffer[i]; }
-        if (checksum == Cse.rx_buffer[23]) {
-          Energy.data_valid[0] = 0;
-          CseReceived();
-          Cse.received = false;
-          return true;
-        } else {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
-          do {
-            memmove(Cse.rx_buffer, Cse.rx_buffer +1, 24);
-            Cse.byte_counter--;
-          } while ((Cse.byte_counter > 2) && (0x5A != Cse.rx_buffer[1]));
-          if (0x5A != Cse.rx_buffer[1]) {
-            Cse.received = false;
-            Cse.byte_counter = 0;
-          }
-        }
-      }
-    } else {
-      if ((0x5A == serial_in_byte) && (1 == Cse.byte_counter)) {
-        Cse.received = true;
-      } else {
-        Cse.byte_counter = 0;
-      }
-      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
-    }
-  }
-}
-
-
-
-void CseEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    Cse.voltage_cycle = 0;
-    Cse.current_cycle = 0;
-    Cse.power_cycle = 0;
-  } else {
-    long cf_frequency = 0;
-
-    if (CSE_PULSES_NOT_INITIALIZED == Cse.cf_pulses_last_time) {
-      Cse.cf_pulses_last_time = Cse.cf_pulses;
-    } else {
-      if (Cse.cf_pulses < Cse.cf_pulses_last_time) {
-        cf_frequency = (65536 - Cse.cf_pulses_last_time) + Cse.cf_pulses;
-      } else {
-        cf_frequency = Cse.cf_pulses - Cse.cf_pulses_last_time;
-      }
-      if (cf_frequency && Energy.active_power[0]) {
-        unsigned long delta = (cf_frequency * Settings.energy_power_calibration) / 36;
-
-
-
-        if (delta <= (4000*100/36) * 10 ) {
-          Cse.cf_pulses_last_time = Cse.cf_pulses;
-          Energy.kWhtoday_delta += delta;
-        }
-        else {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Load overflow"));
-          Cse.cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
-        }
-        EnergyUpdateToday();
-      }
-    }
-  }
-}
-
-void CseSnsInit(void)
-{
-
-
-  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], -1, 1);
-  if (CseSerial->begin(4800, 2)) {
-    if (CseSerial->hardwareSerial()) {
-      SetSerial(4800, TS_SERIAL_8E1);
-      ClaimSerial();
-    }
-    if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
-      Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;
-    }
-    Cse.power_invalid = Settings.param[P_CSE7766_INVALID_POWER];
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void CseDrvInit(void)
-{
-  Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
-  if (Cse.rx_buffer != nullptr) {
-
-    if (pin[GPIO_CSE7766_RX] < 99) {
-      energy_flg = XNRG_02;
-    }
-  }
-}
-
-bool CseCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.power_cycle) {
-      Settings.energy_power_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.power_cycle) / CSE_PREF;
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.voltage_cycle) {
-      Settings.energy_voltage_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.voltage_cycle) / CSE_UREF;
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.current_cycle) {
-      Settings.energy_current_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.current_cycle) / 1000;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      if (CseSerial) { CseSerialInput(); }
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      CseEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = CseCommand();
-      break;
-    case FUNC_INIT:
-      CseSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      CseDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM004T
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-#define XNRG_03 3
-
-const uint32_t PZEM_STABILIZE = 30;
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PzemSerial = nullptr;
-
-#define PZEM_VOLTAGE (uint8_t)0xB0
-#define RESP_VOLTAGE (uint8_t)0xA0
-
-#define PZEM_CURRENT (uint8_t)0xB1
-#define RESP_CURRENT (uint8_t)0xA1
-
-#define PZEM_POWER (uint8_t)0xB2
-#define RESP_POWER (uint8_t)0xA2
-
-#define PZEM_ENERGY (uint8_t)0xB3
-#define RESP_ENERGY (uint8_t)0xA3
-
-#define PZEM_SET_ADDRESS (uint8_t)0xB4
-#define RESP_SET_ADDRESS (uint8_t)0xA4
-
-#define PZEM_POWER_ALARM (uint8_t)0xB5
-#define RESP_POWER_ALARM (uint8_t)0xA5
-
-#define PZEM_DEFAULT_READ_TIMEOUT 500
-
-
-
-struct PZEM {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t read_state = 0;
-  uint8_t phase = 0;
-  uint8_t address = 0;
-} Pzem;
-
-struct PZEMCommand {
-  uint8_t command;
-  uint8_t addr[4];
-  uint8_t data;
-  uint8_t crc;
-};
-
-uint8_t PzemCrc(uint8_t *data)
-{
-  uint16_t crc = 0;
-  for (uint32_t i = 0; i < sizeof(PZEMCommand) -1; i++) {
-    crc += *data++;
-  }
-  return (uint8_t)(crc & 0xFF);
-}
-
-void PzemSend(uint8_t cmd)
-{
-  PZEMCommand pzem;
-
-  pzem.command = cmd;
-  pzem.addr[0] = 192;
-  pzem.addr[1] = 168;
-  pzem.addr[2] = 1;
-  pzem.addr[3] = ((PZEM_SET_ADDRESS == cmd) && Pzem.address) ? Pzem.address : 1 + Pzem.phase;
-  pzem.data = 0;
-
-  uint8_t *bytes = (uint8_t*)&pzem;
-  pzem.crc = PzemCrc(bytes);
-
-  PzemSerial->flush();
-  PzemSerial->write(bytes, sizeof(pzem));
-
-  Pzem.address = 0;
-}
-
-bool PzemReceiveReady(void)
-{
-  return PzemSerial->available() >= (int)sizeof(PZEMCommand);
-}
-
-bool PzemRecieve(uint8_t resp, float *data)
-{
-# 124 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-  uint8_t buffer[sizeof(PZEMCommand)] = { 0 };
-
-  unsigned long start = millis();
-  uint8_t len = 0;
-  while ((len < sizeof(PZEMCommand)) && (millis() - start < PZEM_DEFAULT_READ_TIMEOUT)) {
-    if (PzemSerial->available() > 0) {
-      uint8_t c = (uint8_t)PzemSerial->read();
-      if (!len && ((c & 0xF8) != 0xA0)) {
-        continue;
-      }
-      buffer[len++] = c;
-    }
-  }
-
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, len);
-
-  if (len != sizeof(PZEMCommand)) {
-
-    return false;
-  }
-  if (buffer[6] != PzemCrc(buffer)) {
-
-    return false;
-  }
-  if (buffer[0] != resp) {
-
-    return false;
-  }
-
-  switch (resp) {
-    case RESP_VOLTAGE:
-      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 10.0);
-      break;
-    case RESP_CURRENT:
-      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 100.0);
-      break;
-    case RESP_POWER:
-      *data = (float)(buffer[1] << 8) + buffer[2];
-      break;
-    case RESP_ENERGY:
-      *data = (float)((uint32_t)buffer[1] << 16) + ((uint16_t)buffer[2] << 8) + buffer[3];
-      break;
-  }
-  return true;
-}
-
-
-
-const uint8_t pzem_commands[] { PZEM_SET_ADDRESS, PZEM_VOLTAGE, PZEM_CURRENT, PZEM_POWER, PZEM_ENERGY };
-const uint8_t pzem_responses[] { RESP_SET_ADDRESS, RESP_VOLTAGE, RESP_CURRENT, RESP_POWER, RESP_ENERGY };
-
-void PzemEvery250ms(void)
-{
-  bool data_ready = PzemReceiveReady();
-
-  if (data_ready) {
-    float value = 0;
-    if (PzemRecieve(pzem_responses[Pzem.read_state], &value)) {
-      Energy.data_valid[Pzem.phase] = 0;
-      switch (Pzem.read_state) {
-        case 1:
-          Energy.voltage[Pzem.phase] = value;
-          break;
-        case 2:
-          Energy.current[Pzem.phase] = value;
-          break;
-        case 3:
-          Energy.active_power[Pzem.phase] = value;
-          break;
-        case 4:
-          Pzem.energy += value;
-          if (Pzem.phase == Energy.phase_count -1) {
-            if (Pzem.energy > Pzem.last_energy) {
-              if (uptime > PZEM_STABILIZE) {
-                EnergyUpdateTotal(Pzem.energy, false);
-              }
-              Pzem.last_energy = Pzem.energy;
-            }
-            Pzem.energy = 0;
-          }
-          break;
-      }
-      Pzem.read_state++;
-      if (5 == Pzem.read_state) {
-        Pzem.read_state = 1;
-      }
-
-
-    }
-  }
-
-  if (0 == Pzem.send_retry || data_ready) {
-    if (1 == Pzem.read_state) {
-      if (0 == Pzem.phase) {
-        Pzem.phase = Energy.phase_count -1;
-      } else {
-        Pzem.phase--;
-      }
-
-
-    }
-
-    if (Pzem.address) {
-      Pzem.read_state = 0;
-    }
-
-    Pzem.send_retry = 5;
-    PzemSend(pzem_commands[Pzem.read_state]);
-  }
-  else {
-    Pzem.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == Pzem.send_retry) && (uptime < PZEM_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemSnsInit(void)
-{
-
-  PzemSerial = new TasmotaSerial(pin[GPIO_PZEM004_RX], pin[GPIO_PZEM0XX_TX], 1);
-  if (PzemSerial->begin(9600)) {
-    if (PzemSerial->hardwareSerial()) {
-      ClaimSerial();
-    }
-    Energy.phase_count = 3;
-    Pzem.phase = 0;
-    Pzem.read_state = 1;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemDrvInit(void)
-{
-  if ((pin[GPIO_PZEM004_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_03;
-  }
-}
-
-bool PzemCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
-      Pzem.address = XdrvMailbox.payload;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg03(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (PzemSerial && (uptime > 4)) { PzemEvery250ms(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemCommand();
-      break;
-    case FUNC_INIT:
-      PzemSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_MCP39F501
-
-
-
-
-
-
-
-#define XNRG_04 4
-
-#define MCP_BAUDRATE 4800
-#define MCP_TIMEOUT 4
-#define MCP_CALIBRATION_TIMEOUT 2
-
-#define MCP_CALIBRATE_POWER 0x001
-#define MCP_CALIBRATE_VOLTAGE 0x002
-#define MCP_CALIBRATE_CURRENT 0x004
-#define MCP_CALIBRATE_FREQUENCY 0x008
-#define MCP_SINGLE_WIRE_FLAG 0x100
-
-#define MCP_START_FRAME 0xA5
-#define MCP_ACK_FRAME 0x06
-#define MCP_ERROR_NAK 0x15
-#define MCP_ERROR_CRC 0x51
-
-#define MCP_SINGLE_WIRE 0xAB
-
-#define MCP_SET_ADDRESS 0x41
-
-#define MCP_READ 0x4E
-#define MCP_READ_16 0x52
-#define MCP_READ_32 0x44
-
-#define MCP_WRITE 0x4D
-#define MCP_WRITE_16 0x57
-#define MCP_WRITE_32 0x45
-
-#define MCP_SAVE_REGISTERS 0x53
-
-#define MCP_CALIBRATION_BASE 0x0028
-#define MCP_CALIBRATION_LEN 52
-
-#define MCP_FREQUENCY_REF_BASE 0x0094
-#define MCP_FREQUENCY_GAIN_BASE 0x00AE
-#define MCP_FREQUENCY_LEN 4
-
-#define MCP_BUFFER_SIZE 60
-
-#include <TasmotaSerial.h>
-TasmotaSerial *McpSerial = nullptr;
-
-typedef struct mcp_cal_registers_type {
-  uint16_t gain_current_rms;
-  uint16_t gain_voltage_rms;
-  uint16_t gain_active_power;
-  uint16_t gain_reactive_power;
-  sint32_t offset_current_rms;
-  sint32_t offset_active_power;
-  sint32_t offset_reactive_power;
-  sint16_t dc_offset_current;
-  sint16_t phase_compensation;
-  uint16_t apparent_power_divisor;
-
-  uint32_t system_configuration;
-  uint16_t dio_configuration;
-  uint32_t range;
-
-  uint32_t calibration_current;
-  uint16_t calibration_voltage;
-  uint32_t calibration_active_power;
-  uint32_t calibration_reactive_power;
-  uint16_t accumulation_interval;
-} mcp_cal_registers_type;
-
-char *mcp_buffer = nullptr;
-unsigned long mcp_window = 0;
-unsigned long mcp_kWhcounter = 0;
-uint32_t mcp_system_configuration = 0x03000000;
-uint32_t mcp_active_power;
-
-
-uint32_t mcp_current_rms;
-uint16_t mcp_voltage_rms;
-uint16_t mcp_line_frequency;
-
-uint8_t mcp_address = 0;
-uint8_t mcp_calibration_active = 0;
-uint8_t mcp_init = 0;
-uint8_t mcp_timeout = 0;
-uint8_t mcp_calibrate = 0;
-uint8_t mcp_byte_counter = 0;
-
-
-
-
-
-
-uint8_t McpChecksum(uint8_t *data)
-{
-  uint8_t checksum = 0;
-  uint8_t offset = 0;
-  uint8_t len = data[1] -1;
-
-  for (uint32_t i = offset; i < len; i++) { checksum += data[i]; }
-  return checksum;
-}
-
-unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size)
-{
- unsigned long result = 0;
- unsigned long pow = 1;
-
- for (uint32_t i = 0; i < size; i++) {
-  result = result + (uint8_t)data[offset + i] * pow;
-  pow = pow * 256;
- }
- return result;
-}
-
-void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size)
-{
- for (uint32_t i = 0; i < size; i++) {
-  data[offset + i] = ((value >> (i * 8)) & 0xFF);
- }
-}
-
-void McpSend(uint8_t *data)
-{
-  if (mcp_timeout) { return; }
-  mcp_timeout = MCP_TIMEOUT;
-
-  data[0] = MCP_START_FRAME;
-  data[data[1] -1] = McpChecksum(data);
-
-
-
-  for (uint32_t i = 0; i < data[1]; i++) {
-    McpSerial->write(data[i]);
-  }
-}
-
-
-
-void McpGetAddress(void)
-{
-  uint8_t data[] = { MCP_START_FRAME, 7, MCP_SET_ADDRESS, 0x00, 0x26, MCP_READ_16, 0x00 };
-
-  McpSend(data);
-}
-
-void McpAddressReceive(void)
-{
-
-  mcp_address = mcp_buffer[3];
-}
-
-
-
-void McpGetCalibration(void)
-{
-  if (mcp_calibration_active) { return; }
-  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
-
-  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, (MCP_CALIBRATION_BASE >> 8) & 0xFF, MCP_CALIBRATION_BASE & 0xFF, MCP_READ, MCP_CALIBRATION_LEN, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseCalibration(void)
-{
-  bool action = false;
-  mcp_cal_registers_type cal_registers;
-
-
-  cal_registers.gain_current_rms = McpExtractInt(mcp_buffer, 2, 2);
-  cal_registers.gain_voltage_rms = McpExtractInt(mcp_buffer, 4, 2);
-  cal_registers.gain_active_power = McpExtractInt(mcp_buffer, 6, 2);
-  cal_registers.gain_reactive_power = McpExtractInt(mcp_buffer, 8, 2);
-  cal_registers.offset_current_rms = McpExtractInt(mcp_buffer, 10, 4);
-  cal_registers.offset_active_power = McpExtractInt(mcp_buffer, 14, 4);
-  cal_registers.offset_reactive_power = McpExtractInt(mcp_buffer, 18, 4);
-  cal_registers.dc_offset_current = McpExtractInt(mcp_buffer, 22, 2);
-  cal_registers.phase_compensation = McpExtractInt(mcp_buffer, 24, 2);
-  cal_registers.apparent_power_divisor = McpExtractInt(mcp_buffer, 26, 2);
-
-  cal_registers.system_configuration = McpExtractInt(mcp_buffer, 28, 4);
-  cal_registers.dio_configuration = McpExtractInt(mcp_buffer, 32, 2);
-  cal_registers.range = McpExtractInt(mcp_buffer, 34, 4);
-
-  cal_registers.calibration_current = McpExtractInt(mcp_buffer, 38, 4);
-  cal_registers.calibration_voltage = McpExtractInt(mcp_buffer, 42, 2);
-  cal_registers.calibration_active_power = McpExtractInt(mcp_buffer, 44, 4);
-  cal_registers.calibration_reactive_power = McpExtractInt(mcp_buffer, 48, 4);
-  cal_registers.accumulation_interval = McpExtractInt(mcp_buffer, 52, 2);
-
-  if (mcp_calibrate & MCP_CALIBRATE_POWER) {
-    cal_registers.calibration_active_power = Settings.energy_power_calibration;
-    if (McpCalibrationCalc(&cal_registers, 16)) { action = true; }
-  }
-  if (mcp_calibrate & MCP_CALIBRATE_VOLTAGE) {
-    cal_registers.calibration_voltage = Settings.energy_voltage_calibration;
-    if (McpCalibrationCalc(&cal_registers, 0)) { action = true; }
-  }
-  if (mcp_calibrate & MCP_CALIBRATE_CURRENT) {
-    cal_registers.calibration_current = Settings.energy_current_calibration;
-    if (McpCalibrationCalc(&cal_registers, 8)) { action = true; }
-  }
-  mcp_timeout = 0;
-  if (action) { McpSetCalibration(&cal_registers); }
-
-  mcp_calibrate = 0;
-
-  Settings.energy_power_calibration = cal_registers.calibration_active_power;
-  Settings.energy_voltage_calibration = cal_registers.calibration_voltage;
-  Settings.energy_current_calibration = cal_registers.calibration_current;
-
-  mcp_system_configuration = cal_registers.system_configuration;
-
-  if (mcp_system_configuration & MCP_SINGLE_WIRE_FLAG) {
-    mcp_system_configuration &= ~MCP_SINGLE_WIRE_FLAG;
-   McpSetSystemConfiguration(2);
-  }
-}
-
-bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift)
-{
-  uint32_t measured;
-  uint32_t expected;
-  uint16_t *gain;
-  uint32_t new_gain;
-
-  if (range_shift == 0) {
-    measured = mcp_voltage_rms;
-    expected = cal_registers->calibration_voltage;
-    gain = &(cal_registers->gain_voltage_rms);
-  } else if (range_shift == 8) {
-    measured = mcp_current_rms;
-    expected = cal_registers->calibration_current;
-    gain = &(cal_registers->gain_current_rms);
-  } else if (range_shift == 16) {
-    measured = mcp_active_power;
-    expected = cal_registers->calibration_active_power;
-    gain = &(cal_registers->gain_active_power);
-  } else {
-    return false;
-  }
-
-  if (measured == 0) {
-    return false;
-  }
-
-  uint32_t range = (cal_registers->range >> range_shift) & 0xFF;
-
-calc:
-  new_gain = (*gain) * expected / measured;
-
-  if (new_gain < 25000) {
-    range++;
-    if (measured > 6) {
-      measured = measured / 2;
-      goto calc;
-    }
-  }
-
-  if (new_gain > 55000) {
-    range--;
-    measured = measured * 2;
-    goto calc;
-  }
-
-  *gain = new_gain;
-  uint32_t old_range = (cal_registers->range >> range_shift) & 0xFF;
-  cal_registers->range = cal_registers->range ^ (old_range << range_shift);
-  cal_registers->range = cal_registers->range | (range << range_shift);
-
-  return true;
-}
-
-
-
-
-
-
-void McpSetCalibration(struct mcp_cal_registers_type *cal_registers)
-{
-  uint8_t data[7 + MCP_CALIBRATION_LEN + 2 + 1];
-
-  data[1] = sizeof(data);
-  data[2] = MCP_SET_ADDRESS;
-  data[3] = (MCP_CALIBRATION_BASE >> 8) & 0xFF;
-  data[4] = (MCP_CALIBRATION_BASE >> 0) & 0xFF;
-
-  data[5] = MCP_WRITE;
-  data[6] = MCP_CALIBRATION_LEN;
-
-  McpSetInt(cal_registers->gain_current_rms, data, 0+7, 2);
-  McpSetInt(cal_registers->gain_voltage_rms, data, 2+7, 2);
-  McpSetInt(cal_registers->gain_active_power, data, 4+7, 2);
-  McpSetInt(cal_registers->gain_reactive_power, data, 6+7, 2);
-  McpSetInt(cal_registers->offset_current_rms, data, 8+7, 4);
-  McpSetInt(cal_registers->offset_active_power, data, 12+7, 4);
-  McpSetInt(cal_registers->offset_reactive_power, data, 16+7, 4);
-  McpSetInt(cal_registers->dc_offset_current, data, 20+7, 2);
-  McpSetInt(cal_registers->phase_compensation, data, 22+7, 2);
-  McpSetInt(cal_registers->apparent_power_divisor, data, 24+7, 2);
-
-  McpSetInt(cal_registers->system_configuration, data, 26+7, 4);
-  McpSetInt(cal_registers->dio_configuration, data, 30+7, 2);
-  McpSetInt(cal_registers->range, data, 32+7, 4);
-
-  McpSetInt(cal_registers->calibration_current, data, 36+7, 4);
-  McpSetInt(cal_registers->calibration_voltage, data, 40+7, 2);
-  McpSetInt(cal_registers->calibration_active_power, data, 42+7, 4);
-  McpSetInt(cal_registers->calibration_reactive_power, data, 46+7, 4);
-  McpSetInt(cal_registers->accumulation_interval, data, 50+7, 2);
-
-  data[MCP_CALIBRATION_LEN+7] = MCP_SAVE_REGISTERS;
-  data[MCP_CALIBRATION_LEN+8] = mcp_address;
-
-  McpSend(data);
-}
-
-
-
-void McpSetSystemConfiguration(uint16 interval)
-{
-
-  uint8_t data[17];
-
-  data[ 1] = sizeof(data);
-  data[ 2] = MCP_SET_ADDRESS;
-  data[ 3] = 0x00;
-  data[ 4] = 0x42;
-  data[ 5] = MCP_WRITE_32;
-  data[ 6] = (mcp_system_configuration >> 24) & 0xFF;
-  data[ 7] = (mcp_system_configuration >> 16) & 0xFF;
-  data[ 8] = (mcp_system_configuration >> 8) & 0xFF;
-  data[ 9] = (mcp_system_configuration >> 0) & 0xFF;
-  data[10] = MCP_SET_ADDRESS;
-  data[11] = 0x00;
-  data[12] = 0x5A;
-  data[13] = MCP_WRITE_16;
-  data[14] = (interval >> 8) & 0xFF;
-  data[15] = (interval >> 0) & 0xFF;
-
-  McpSend(data);
-}
-
-
-
-void McpGetFrequency(void)
-{
-  if (mcp_calibration_active) { return; }
-  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
-
-  uint8_t data[] = { MCP_START_FRAME, 11, MCP_SET_ADDRESS, (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF, MCP_FREQUENCY_REF_BASE & 0xFF, MCP_READ_16,
-                                          MCP_SET_ADDRESS, (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF, MCP_FREQUENCY_GAIN_BASE & 0xFF, MCP_READ_16, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseFrequency(void)
-{
-
-  uint16_t line_frequency_ref = mcp_buffer[2] * 256 + mcp_buffer[3];
-  uint16_t gain_line_frequency = mcp_buffer[4] * 256 + mcp_buffer[5];
-
-  if (mcp_calibrate & MCP_CALIBRATE_FREQUENCY) {
-    line_frequency_ref = Settings.energy_frequency_calibration;
-
-    if ((0xFFFF == mcp_line_frequency) || (0 == gain_line_frequency)) {
-      mcp_line_frequency = 50000;
-      gain_line_frequency = 0x8000;
-    }
-    gain_line_frequency = gain_line_frequency * line_frequency_ref / mcp_line_frequency;
-
-    mcp_timeout = 0;
-    McpSetFrequency(line_frequency_ref, gain_line_frequency);
-  }
-
-  Settings.energy_frequency_calibration = line_frequency_ref;
-
-  mcp_calibrate = 0;
-}
-
-void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency)
-{
-
-  uint8_t data[17];
-
-  data[ 1] = sizeof(data);
-  data[ 2] = MCP_SET_ADDRESS;
-  data[ 3] = (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF;
-  data[ 4] = (MCP_FREQUENCY_REF_BASE >> 0) & 0xFF;
-
-  data[ 5] = MCP_WRITE_16;
-  data[ 6] = (line_frequency_ref >> 8) & 0xFF;
-  data[ 7] = (line_frequency_ref >> 0) & 0xFF;
-
-  data[ 8] = MCP_SET_ADDRESS;
-  data[ 9] = (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF;
-  data[10] = (MCP_FREQUENCY_GAIN_BASE >> 0) & 0xFF;
-
-  data[11] = MCP_WRITE_16;
-  data[12] = (gain_line_frequency >> 8) & 0xFF;
-  data[13] = (gain_line_frequency >> 0) & 0xFF;
-
-  data[14] = MCP_SAVE_REGISTERS;
-  data[15] = mcp_address;
-
-  McpSend(data);
-}
-
-
-
-void McpGetData(void)
-{
-  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, 0x00, 0x04, MCP_READ, 22, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseData(void)
-{
-
-
-
-
-
-  mcp_current_rms = McpExtractInt(mcp_buffer, 2, 4);
-  mcp_voltage_rms = McpExtractInt(mcp_buffer, 6, 2);
-  mcp_active_power = McpExtractInt(mcp_buffer, 8, 4);
-
-
-  mcp_line_frequency = McpExtractInt(mcp_buffer, 22, 2);
-
-  if (Energy.power_on) {
-    Energy.data_valid[0] = 0;
-    Energy.frequency[0] = (float)mcp_line_frequency / 1000;
-    Energy.voltage[0] = (float)mcp_voltage_rms / 10;
-    Energy.active_power[0] = (float)mcp_active_power / 100;
-    if (0 == Energy.active_power[0]) {
-      Energy.current[0] = 0;
-    } else {
-      Energy.current[0] = (float)mcp_current_rms / 10000;
-    }
-  } else {
-    Energy.data_valid[0] = ENERGY_WATCHDOG;
-  }
-}
-
-
-
-void McpSerialInput(void)
-{
-  while ((McpSerial->available()) && (mcp_byte_counter < MCP_BUFFER_SIZE)) {
-    yield();
-    mcp_buffer[mcp_byte_counter++] = McpSerial->read();
-    mcp_window = millis();
-  }
-
-
-  if ((mcp_byte_counter) && (millis() - mcp_window > (24000 / MCP_BAUDRATE) +1)) {
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, (uint8_t*)mcp_buffer, mcp_byte_counter);
-
-    if (MCP_BUFFER_SIZE == mcp_byte_counter) {
-
-    }
-    else if (1 == mcp_byte_counter) {
-      if (MCP_ERROR_CRC == mcp_buffer[0]) {
-
-        mcp_timeout = 0;
-      }
-      else if (MCP_ERROR_NAK == mcp_buffer[0]) {
-
-        mcp_timeout = 0;
-      }
-    }
-    else if (MCP_ACK_FRAME == mcp_buffer[0]) {
-      if (mcp_byte_counter == mcp_buffer[1]) {
-
-        if (McpChecksum((uint8_t *)mcp_buffer) != mcp_buffer[mcp_byte_counter -1]) {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("MCP: " D_CHECKSUM_FAILURE));
-        } else {
-          if (5 == mcp_buffer[1]) { McpAddressReceive(); }
-          if (25 == mcp_buffer[1]) { McpParseData(); }
-          if (MCP_CALIBRATION_LEN + 3 == mcp_buffer[1]) { McpParseCalibration(); }
-          if (MCP_FREQUENCY_LEN + 3 == mcp_buffer[1]) { McpParseFrequency(); }
-        }
-
-      }
-      mcp_timeout = 0;
-    }
-    else if (MCP_SINGLE_WIRE == mcp_buffer[0]) {
-      mcp_timeout = 0;
-    }
-
-    mcp_byte_counter = 0;
-    McpSerial->flush();
-  }
-}
-
-
-
-void McpEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    mcp_voltage_rms = 0;
-    mcp_current_rms = 0;
-    mcp_active_power = 0;
-    mcp_line_frequency = 0;
-  }
-
-  if (mcp_active_power) {
-    Energy.kWhtoday_delta += ((mcp_active_power * 10) / 36);
-    EnergyUpdateToday();
-  }
-
-  if (mcp_timeout) {
-    mcp_timeout--;
-  }
-  else if (mcp_calibration_active) {
-    mcp_calibration_active--;
-  }
-  else if (mcp_init) {
-    if (2 == mcp_init) {
-      McpGetCalibration();
-    }
-    else if (1 == mcp_init) {
-      McpGetFrequency();
-    }
-    mcp_init--;
-  }
-  else if (!mcp_address) {
-    McpGetAddress();
-  }
-  else {
-    McpGetData();
-  }
-}
-
-void McpSnsInit(void)
-{
-
-  McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1);
-  if (McpSerial->begin(MCP_BAUDRATE)) {
-    if (McpSerial->hardwareSerial()) {
-      ClaimSerial();
-      mcp_buffer = serial_in_buffer;
-    } else {
-      mcp_buffer = (char*)(malloc(MCP_BUFFER_SIZE));
-    }
-    DigitalWrite(GPIO_MCP39F5_RST, 1);
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void McpDrvInit(void)
-{
-  if ((pin[GPIO_MCP39F5_RX] < 99) && (pin[GPIO_MCP39F5_TX] < 99)) {
-    if (pin[GPIO_MCP39F5_RST] < 99) {
-      pinMode(pin[GPIO_MCP39F5_RST], OUTPUT);
-      digitalWrite(pin[GPIO_MCP39F5_RST], 0);
-    }
-    mcp_calibrate = 0;
-    mcp_timeout = 2;
-    mcp_init = 2;
-    energy_flg = XNRG_04;
-  }
-}
-
-bool McpCommand(void)
-{
-  bool serviced = true;
-  unsigned long value = 0;
-
-  if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_active_power) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 100);
-      if ((value > 100) && (value < 200000)) {
-        Settings.energy_power_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_POWER;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_voltage_rms) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
-      if ((value > 1000) && (value < 2600)) {
-        Settings.energy_voltage_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_VOLTAGE;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_current_rms) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
-      if ((value > 100) && (value < 80000)) {
-        Settings.energy_current_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_CURRENT;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_FREQUENCYSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_line_frequency) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 1000);
-      if ((value > 45000) && (value < 65000)) {
-        Settings.energy_frequency_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_FREQUENCY;
-        McpGetFrequency();
-      }
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg04(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      if (McpSerial) { McpSerialInput(); }
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (McpSerial) { McpEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = McpCommand();
-      break;
-    case FUNC_INIT:
-      McpSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      McpDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM_AC
-# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-#define XNRG_05 5
-
-const uint8_t PZEM_AC_DEVICE_ADDRESS = 0x01;
-const uint32_t PZEM_AC_STABILIZE = 30;
-
-#include <TasmotaModbus.h>
-TasmotaModbus *PzemAcModbus;
-
-struct PZEMAC {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t phase = 0;
-  uint8_t address = 0;
-  uint8_t address_step = ADDR_IDLE;
-} PzemAc;
-
-void PzemAcEverySecond(void)
-{
-  bool data_ready = PzemAcModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[30];
-
-    uint8_t registers = 10;
-    if (ADDR_RECEIVE == PzemAc.address_step) {
-      registers = 2;
-      PzemAc.address_step--;
-    }
-    uint8_t error = PzemAcModbus->ReceiveBuffer(buffer, registers);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemAcModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAC: PzemAc %d error %d"), PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, error);
-    } else {
-      Energy.data_valid[PzemAc.phase] = 0;
-      if (10 == registers) {
-
-
-
-
-
-        Energy.voltage[PzemAc.phase] = (float)((buffer[3] << 8) + buffer[4]) / 10.0;
-        Energy.current[PzemAc.phase] = (float)((buffer[7] << 24) + (buffer[8] << 16) + (buffer[5] << 8) + buffer[6]) / 1000.0;
-        Energy.active_power[PzemAc.phase] = (float)((buffer[11] << 24) + (buffer[12] << 16) + (buffer[9] << 8) + buffer[10]) / 10.0;
-        Energy.frequency[PzemAc.phase] = (float)((buffer[17] << 8) + buffer[18]) / 10.0;
-        Energy.power_factor[PzemAc.phase] = (float)((buffer[19] << 8) + buffer[20]) / 100.0;
-
-        PzemAc.energy += (float)((buffer[15] << 24) + (buffer[16] << 16) + (buffer[13] << 8) + buffer[14]);
-        if (PzemAc.phase == Energy.phase_count -1) {
-          if (PzemAc.energy > PzemAc.last_energy) {
-            if (uptime > PZEM_AC_STABILIZE) {
-              EnergyUpdateTotal(PzemAc.energy, false);
-            }
-            PzemAc.last_energy = PzemAc.energy;
-          }
-          PzemAc.energy = 0;
-        }
-
-      }
-    }
-  }
-
-  if (0 == PzemAc.send_retry || data_ready) {
-    if (0 == PzemAc.phase) {
-      PzemAc.phase = Energy.phase_count -1;
-    } else {
-      PzemAc.phase--;
-    }
-    PzemAc.send_retry = ENERGY_WATCHDOG;
-    if (ADDR_SEND == PzemAc.address_step) {
-      PzemAcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemAc.address);
-      PzemAc.address_step--;
-    } else {
-      PzemAcModbus->Send(PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, 0x04, 0, 10);
-    }
-  }
-  else {
-    PzemAc.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == PzemAc.send_retry) && (uptime < PZEM_AC_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemAcSnsInit(void)
-{
-  PzemAcModbus = new TasmotaModbus(pin[GPIO_PZEM016_RX], pin[GPIO_PZEM0XX_TX]);
-  uint8_t result = PzemAcModbus->Begin(9600);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.phase_count = 3;
-    PzemAc.phase = 0;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemAcDrvInit(void)
-{
-  if ((pin[GPIO_PZEM016_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_05;
-  }
-}
-
-bool PzemAcCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    PzemAc.address = XdrvMailbox.payload;
-    PzemAc.address_step = ADDR_SEND;
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg05(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { PzemAcEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemAcCommand();
-      break;
-    case FUNC_INIT:
-      PzemAcSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemAcDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM_DC
-# 32 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-#define XNRG_06 6
-
-const uint8_t PZEM_DC_DEVICE_ADDRESS = 0x01;
-const uint32_t PZEM_DC_STABILIZE = 30;
-
-#include <TasmotaModbus.h>
-TasmotaModbus *PzemDcModbus;
-
-struct PZEMDC {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t channel = 0;
-  uint8_t address = 0;
-  uint8_t address_step = ADDR_IDLE;
-} PzemDc;
-
-void PzemDcEverySecond(void)
-{
-  bool data_ready = PzemDcModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[26];
-
-    uint8_t registers = 8;
-    if (ADDR_RECEIVE == PzemDc.address_step) {
-      registers = 2;
-      PzemDc.address_step--;
-    }
-    uint8_t error = PzemDcModbus->ReceiveBuffer(buffer, registers);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemDcModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PDC: PzemDc %d error %d"), PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, error);
-    } else {
-      Energy.data_valid[PzemDc.channel] = 0;
-      if (8 == registers) {
-
-
-
-
-
-        Energy.voltage[PzemDc.channel] = (float)((buffer[3] << 8) + buffer[4]) / 100.0;
-        Energy.current[PzemDc.channel] = (float)((buffer[5] << 8) + buffer[6]) / 100.0;
-        Energy.active_power[PzemDc.channel] = (float)((buffer[9] << 24) + (buffer[10] << 16) + (buffer[7] << 8) + buffer[8]) / 10.0;
-
-        PzemDc.energy += (float)((buffer[13] << 24) + (buffer[14] << 16) + (buffer[11] << 8) + buffer[12]);
-        if (PzemDc.channel == Energy.phase_count -1) {
-          if (PzemDc.energy > PzemDc.last_energy) {
-            if (uptime > PZEM_DC_STABILIZE) {
-              EnergyUpdateTotal(PzemDc.energy, false);
-            }
-            PzemDc.last_energy = PzemDc.energy;
-          }
-          PzemDc.energy = 0;
-        }
-      }
-    }
-  }
-
-  if (0 == PzemDc.send_retry || data_ready) {
-    if (0 == PzemDc.channel) {
-      PzemDc.channel = Energy.phase_count -1;
-    } else {
-      PzemDc.channel--;
-    }
-    PzemDc.send_retry = ENERGY_WATCHDOG;
-    if (ADDR_SEND == PzemDc.address_step) {
-      PzemDcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemDc.address);
-      PzemDc.address_step--;
-    } else {
-      PzemDcModbus->Send(PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, 0x04, 0, 8);
-    }
-  }
-  else {
-    PzemDc.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == PzemDc.send_retry) && (uptime < PZEM_DC_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemDcSnsInit(void)
-{
-  PzemDcModbus = new TasmotaModbus(pin[GPIO_PZEM017_RX], pin[GPIO_PZEM0XX_TX]);
-  uint8_t result = PzemDcModbus->Begin(9600, 2);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.type_dc = true;
-    Energy.phase_count = 3;
-    PzemDc.channel = 0;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemDcDrvInit(void)
-{
-  if ((pin[GPIO_PZEM017_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_06;
-  }
-}
-
-bool PzemDcCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    PzemDc.address = XdrvMailbox.payload;
-    PzemDc.address_step = ADDR_SEND;
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg06(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { PzemDcEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemDcCommand();
-      break;
-    case FUNC_INIT:
-      PzemDcSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemDcDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
-#ifdef USE_I2C
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_ADE7953
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_07_ade7953.ino"
-#define XNRG_07 7
-#define XI2C_07 7
-
-#define ADE7953_PREF 1540
-#define ADE7953_UREF 26000
-#define ADE7953_IREF 10000
-
-#define ADE7953_ADDR 0x38
-
-const uint16_t Ade7953Registers[] {
-  0x31B,
-  0x313,
-  0x311,
-  0x315,
-  0x31A,
-  0x312,
-  0x310,
-  0x314,
-  0x31C,
-  0x10E
-};
-
-struct Ade7953 {
-  uint32_t voltage_rms = 0;
-  uint32_t period = 0;
-  uint32_t current_rms[2] = { 0, 0 };
-  uint32_t active_power[2] = { 0, 0 };
-  uint8_t init_step = 0;
-} Ade7953;
-
-int Ade7953RegSize(uint16_t reg)
-{
-  int size = 0;
-  switch ((reg >> 8) & 0x0F) {
-    case 0x03:
-      size++;
-    case 0x02:
-      size++;
-    case 0x01:
-      size++;
-    case 0x00:
-    case 0x07:
-    case 0x08:
-      size++;
-  }
-  return size;
-}
-
-void Ade7953Write(uint16_t reg, uint32_t val)
-{
-  int size = Ade7953RegSize(reg);
-  if (size) {
-    Wire.beginTransmission(ADE7953_ADDR);
-    Wire.write((reg >> 8) & 0xFF);
-    Wire.write(reg & 0xFF);
-    while (size--) {
-      Wire.write((val >> (8 * size)) & 0xFF);
-    }
-    Wire.endTransmission();
-    delayMicroseconds(5);
-  }
-}
-
-int32_t Ade7953Read(uint16_t reg)
-{
- uint32_t response = 0;
-
-  int size = Ade7953RegSize(reg);
-  if (size) {
-    Wire.beginTransmission(ADE7953_ADDR);
-    Wire.write((reg >> 8) & 0xFF);
-    Wire.write(reg & 0xFF);
-    Wire.endTransmission(0);
-    Wire.requestFrom(ADE7953_ADDR, size);
-    if (size <= Wire.available()) {
-      for (uint32_t i = 0; i < size; i++) {
-        response = response << 8 | Wire.read();
-      }
-    }
-  }
- return response;
-}
-
-void Ade7953Init(void)
-{
-  Ade7953Write(0x102, 0x0004);
-  Ade7953Write(0x0FE, 0x00AD);
-  Ade7953Write(0x120, 0x0030);
-}
-
-void Ade7953GetData(void)
-{
-  int32_t reg[2][4];
-  for (uint32_t i = 0; i < sizeof(Ade7953Registers)/sizeof(uint16_t); i++) {
-    int32_t value = Ade7953Read(Ade7953Registers[i]);
-    if (8 == i) {
-      Ade7953.voltage_rms = value;
-    } else if (9 == i) {
-      Ade7953.period = value;
-    } else {
-      reg[i >> 2][i &3] = value;
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: %d, %d, [%d, %d, %d, %d], [%d, %d, %d, %d]"),
-    Ade7953.voltage_rms, Ade7953.period,
-    reg[0][0], reg[0][1], reg[0][2], reg[0][3],
-    reg[1][0], reg[1][1], reg[1][2], reg[1][3]);
-
-  uint32_t apparent_power[2] = { 0, 0 };
-  uint32_t reactive_power[2] = { 0, 0 };
-
-  for (uint32_t channel = 0; channel < 2; channel++) {
-    Ade7953.current_rms[channel] = reg[channel][0];
-    if (Ade7953.current_rms[channel] < 2000) {
-      Ade7953.current_rms[channel] = 0;
-      Ade7953.active_power[channel] = 0;
-    } else {
-      Ade7953.active_power[channel] = abs(reg[channel][1]);
-      apparent_power[channel] = abs(reg[channel][2]);
-      reactive_power[channel] = abs(reg[channel][3]);
-    }
-  }
-
-  uint32_t current_rms_sum = Ade7953.current_rms[0] + Ade7953.current_rms[1];
-  uint32_t active_power_sum = Ade7953.active_power[0] + Ade7953.active_power[1];
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ADE: U %d, C %d, I %d + %d = %d, P %d + %d = %d"),
-    Ade7953.voltage_rms, Ade7953.period,
-    Ade7953.current_rms[0], Ade7953.current_rms[1], current_rms_sum,
-    Ade7953.active_power[0], Ade7953.active_power[1], active_power_sum);
-
-  if (Energy.power_on) {
-    Energy.voltage[0] = (float)Ade7953.voltage_rms / Settings.energy_voltage_calibration;
-    Energy.frequency[0] = 223750.0f / ( (float)Ade7953.period + 1);
-
-    for (uint32_t channel = 0; channel < 2; channel++) {
-      Energy.data_valid[channel] = 0;
-      Energy.active_power[channel] = (float)Ade7953.active_power[channel] / (Settings.energy_power_calibration / 10);
-      Energy.reactive_power[channel] = (float)reactive_power[channel] / (Settings.energy_power_calibration / 10);
-      Energy.apparent_power[channel] = (float)apparent_power[channel] / (Settings.energy_power_calibration / 10);
-      if (0 == Energy.active_power[channel]) {
-        Energy.current[channel] = 0;
-      } else {
-        Energy.current[channel] = (float)Ade7953.current_rms[channel] / (Settings.energy_current_calibration * 10);
-      }
-    }
-  } else {
-    Energy.data_valid[0] = ENERGY_WATCHDOG;
-    Energy.data_valid[1] = ENERGY_WATCHDOG;
-  }
-
-  if (active_power_sum) {
-    Energy.kWhtoday_delta += ((active_power_sum * (100000 / (Settings.energy_power_calibration / 10))) / 3600);
-    EnergyUpdateToday();
-  }
-}
-
-void Ade7953EnergyEverySecond(void)
-{
- if (Ade7953.init_step) {
-    if (1 == Ade7953.init_step) {
-      Ade7953Init();
-   }
-    Ade7953.init_step--;
- } else {
-  Ade7953GetData();
- }
-}
-
-void Ade7953DrvInit(void)
-{
-  if (pin[GPIO_ADE7953_IRQ] < 99) {
-    delay(100);
-    if (I2cSetDevice(ADE7953_ADDR)) {
-      if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
-        Settings.energy_power_calibration = ADE7953_PREF;
-        Settings.energy_voltage_calibration = ADE7953_UREF;
-        Settings.energy_current_calibration = ADE7953_IREF;
-      }
-      I2cSetActiveFound(ADE7953_ADDR, "ADE7953");
-      Ade7953.init_step = 2;
-
-      Energy.phase_count = 2;
-      Energy.voltage_common = true;
-
-      energy_flg = XNRG_07;
-    }
-  }
-}
-
-bool Ade7953Command(void)
-{
-  bool serviced = true;
-
-  uint32_t channel = (2 == XdrvMailbox.index) ? 1 : 0;
-  uint32_t value = (uint32_t)(CharToFloat(XdrvMailbox.data) * 100);
-
-  if (CMND_POWERCAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_PREF; }
-
-  }
-  else if (CMND_VOLTAGECAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_UREF; }
-
-  }
-  else if (CMND_CURRENTCAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_IREF; }
-
-  }
-  else if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.active_power[channel]) {
-      if ((value > 100) && (value < 200000)) {
-        Settings.energy_power_calibration = (Ade7953.active_power[channel] * 1000) / value;
-      }
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.voltage_rms) {
-      if ((value > 10000) && (value < 26000)) {
-        Settings.energy_voltage_calibration = (Ade7953.voltage_rms * 100) / value;
-      }
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.current_rms[channel]) {
-      if ((value > 2000) && (value < 1000000)) {
-        Settings.energy_current_calibration = ((Ade7953.current_rms[channel] * 100) / value) * 100;
-      }
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_07)) { return false; }
-
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      Ade7953EnergyEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = Ade7953Command();
-      break;
-    case FUNC_PRE_INIT:
-      Ade7953DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_08_sdm120.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_08_sdm120.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SDM120
-
-
-
-
-
-
-#define XNRG_08 8
-
-
-#ifndef SDM120_SPEED
-  #define SDM120_SPEED 2400
-#endif
-
-#ifndef SDM120_ADDR
-  #define SDM120_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Sdm120Modbus;
-
-const uint8_t sdm120_table = 8;
-const uint8_t sdm220_table = 13;
-
-const uint16_t sdm120_start_addresses[] {
-  0x0000,
-  0x0006,
-  0x000C,
-  0x0012,
-  0x0018,
-  0x001E,
-  0x0046,
-  0x0156,
-
-  0X0048,
-  0X004A,
-  0X004C,
-  0X004E,
-  0X0024
-};
-
-struct SDM120 {
-  float total_active = 0;
-  float import_active = NAN;
-  float import_reactive = 0;
-  float export_reactive = 0;
-  float phase_angle = 0;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-  uint8_t start_address_count = sdm220_table;
-} Sdm120;
-
-
-
-void SDM120Every250ms(void)
-{
-  bool data_ready = Sdm120Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Sdm120Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm120Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM120 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Sdm120.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.current[0] = value;
-          break;
-
-        case 2:
-          Energy.active_power[0] = value;
-          break;
-
-        case 3:
-          Energy.apparent_power[0] = value;
-          break;
-
-        case 4:
-          Energy.reactive_power[0] = value;
-          break;
-
-        case 5:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 6:
-          Energy.frequency[0] = value;
-          break;
-
-        case 7:
-          Sdm120.total_active = value;
-          break;
-
-        case 8:
-          Sdm120.import_active = value;
-          break;
-
-        case 9:
-          Energy.export_active = value;
-          break;
-
-        case 10:
-          Sdm120.import_reactive = value;
-          break;
-
-        case 11:
-          Sdm120.export_reactive = value;
-          break;
-
-        case 12:
-          Sdm120.phase_angle = value;
-          break;
-      }
-
-      Sdm120.read_state++;
-      if (Sdm120.read_state == Sdm120.start_address_count) {
-        Sdm120.read_state = 0;
-
-        if (Sdm120.start_address_count > sdm120_table) {
-          if (!isnan(Sdm120.import_active)) {
-            Sdm120.total_active = Sdm120.import_active;
-          } else {
-            Sdm120.start_address_count = sdm120_table;
-          }
-        }
-        EnergyUpdateTotal(Sdm120.total_active, true);
-      }
-    }
-  }
-
-  if (0 == Sdm120.send_retry || data_ready) {
-    Sdm120.send_retry = 5;
-    Sdm120Modbus->Send(SDM120_ADDR, 0x04, sdm120_start_addresses[Sdm120.read_state], 2);
-  } else {
-    Sdm120.send_retry--;
-  }
-}
-
-void Sdm120SnsInit(void)
-{
-  Sdm120Modbus = new TasmotaModbus(pin[GPIO_SDM120_RX], pin[GPIO_SDM120_TX]);
-  uint8_t result = Sdm120Modbus->Begin(SDM120_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Sdm120DrvInit(void)
-{
-  if ((pin[GPIO_SDM120_RX] < 99) && (pin[GPIO_SDM120_TX] < 99)) {
-    energy_flg = XNRG_08;
-  }
-}
-
-void Sdm220Reset(void)
-{
-  if (isnan(Sdm120.import_active)) { return; }
-
-  Sdm120.import_active = 0;
-  Sdm120.import_reactive = 0;
-  Sdm120.export_reactive = 0;
-  Sdm120.phase_angle = 0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_SDM220[] PROGMEM =
-  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  "{s}" D_EXPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  "{s}" D_PHASE_ANGLE "{m}%s " D_UNIT_ANGLE "{e}";
-#endif
-
-void Sdm220Show(bool json)
-{
-  if (isnan(Sdm120.import_active)) { return; }
-
-  char import_active_chr[FLOATSZ];
-  dtostrfd(Sdm120.import_active, Settings.flag2.energy_resolution, import_active_chr);
-  char import_reactive_chr[FLOATSZ];
-  dtostrfd(Sdm120.import_reactive, Settings.flag2.energy_resolution, import_reactive_chr);
-  char export_reactive_chr[FLOATSZ];
-  dtostrfd(Sdm120.export_reactive, Settings.flag2.energy_resolution, export_reactive_chr);
-  char phase_angle_chr[FLOATSZ];
-  dtostrfd(Sdm120.phase_angle, 2, phase_angle_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_ACTIVE "\":%s,\"" D_JSON_IMPORT_REACTIVE "\":%s,\"" D_JSON_EXPORT_REACTIVE "\":%s,\"" D_JSON_PHASE_ANGLE "\":%s"),
-      import_active_chr, import_reactive_chr, export_reactive_chr, phase_angle_chr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_ENERGY_SDM220, import_reactive_chr, export_reactive_chr, phase_angle_chr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg08(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { SDM120Every250ms(); }
-      break;
-    case FUNC_JSON_APPEND:
-      Sdm220Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Sdm220Show(0);
-      break;
-#endif
-    case FUNC_ENERGY_RESET:
-      Sdm220Reset();
-      break;
-    case FUNC_INIT:
-      Sdm120SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Sdm120DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_DDS2382
-
-
-
-
-
-
-#define XNRG_09 9
-
-#ifndef DDS2382_SPEED
-#define DDS2382_SPEED 9600
-#endif
-#ifndef DDS2382_ADDR
-#define DDS2382_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Dds2382Modbus;
-
-uint8_t Dds2382_send_retry = 0;
-
-void Dds2382EverySecond(void)
-{
-  bool data_ready = Dds2382Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[46];
-
-    uint32_t error = Dds2382Modbus->ReceiveBuffer(buffer, 18);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Dds2382Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "DDS2382 response error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-# 67 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_09_dds2382.ino"
-      Energy.voltage[0] = (float)((buffer[27] << 8) + buffer[28]) / 10.0;
-      Energy.current[0] = (float)((buffer[29] << 8) + buffer[30]) / 100.0;
-      Energy.active_power[0] = (float)((buffer[31] << 8) + buffer[32]);
-      Energy.reactive_power[0] = (float)((buffer[33] << 8) + buffer[34]);
-      Energy.power_factor[0] = (float)((buffer[35] << 8) + buffer[36]) / 1000.0;
-      Energy.frequency[0] = (float)((buffer[37] << 8) + buffer[38]) / 100.0;
-      uint8_t offset = 11;
-      if (Settings.flag3.dds2382_model) {
-        offset = 19;
-      }
-      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;
-      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;
-
-      EnergyUpdateTotal(import_active, true);
-    }
-  }
-
-  if (0 == Dds2382_send_retry || data_ready) {
-    Dds2382_send_retry = 5;
-    Dds2382Modbus->Send(DDS2382_ADDR, 0x03, 0, 18);
-  } else {
-    Dds2382_send_retry--;
-  }
-}
-
-void Dds2382SnsInit(void)
-{
-  Dds2382Modbus = new TasmotaModbus(pin[GPIO_DDS2382_RX], pin[GPIO_DDS2382_TX]);
-  uint8_t result = Dds2382Modbus->Begin(DDS2382_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Dds2382DrvInit(void)
-{
-  if ((pin[GPIO_DDS2382_RX] < 99) && (pin[GPIO_DDS2382_TX] < 99)) {
-    energy_flg = XNRG_09;
-  }
-}
-
-
-
-
-
-bool Xnrg09(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { Dds2382EverySecond(); }
-      break;
-    case FUNC_INIT:
-      Dds2382SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Dds2382DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_10_sdm630.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_10_sdm630.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SDM630
-
-
-
-
-
-
-#define XNRG_10 10
-
-
-#ifndef SDM630_SPEED
-  #define SDM630_SPEED 9600
-#endif
-
-#ifndef SDM630_ADDR
-  #define SDM630_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Sdm630Modbus;
-
-const uint16_t sdm630_start_addresses[] {
-  0x0000,
-  0x0002,
-  0x0004,
-  0x0006,
-  0x0008,
-  0x000A,
-  0x000C,
-  0x000E,
-  0x0010,
-  0x0018,
-  0x001A,
-  0x001C,
-  0x001E,
-  0x0020,
-  0x0022,
-  0x0156
-};
-
-struct SDM630 {
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-} Sdm630;
-
-
-
-void SDM630Every250ms(void)
-{
-  bool data_ready = Sdm630Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Sdm630Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm630Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM630 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-      Energy.data_valid[1] = 0;
-      Energy.data_valid[2] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Sdm630.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.voltage[1] = value;
-          break;
-
-        case 2:
-          Energy.voltage[2] = value;
-          break;
-
-        case 3:
-          Energy.current[0] = value;
-          break;
-
-        case 4:
-          Energy.current[1] = value;
-          break;
-
-        case 5:
-          Energy.current[2] = value;
-          break;
-
-        case 6:
-          Energy.active_power[0] = value;
-          break;
-
-        case 7:
-          Energy.active_power[1] = value;
-          break;
-
-        case 8:
-          Energy.active_power[2] = value;
-          break;
-
-        case 9:
-          Energy.reactive_power[0] = value;
-          break;
-
-        case 10:
-          Energy.reactive_power[1] = value;
-          break;
-
-        case 11:
-          Energy.reactive_power[2] = value;
-          break;
-
-        case 12:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 13:
-          Energy.power_factor[1] = value;
-          break;
-
-        case 14:
-          Energy.power_factor[2] = value;
-          break;
-
-        case 15:
-          EnergyUpdateTotal(value, true);
-          break;
-      }
-
-      Sdm630.read_state++;
-      if (sizeof(sdm630_start_addresses)/2 == Sdm630.read_state) {
-        Sdm630.read_state = 0;
-      }
-    }
-  }
-
-  if (0 == Sdm630.send_retry || data_ready) {
-    Sdm630.send_retry = 5;
-    Sdm630Modbus->Send(SDM630_ADDR, 0x04, sdm630_start_addresses[Sdm630.read_state], 2);
-  } else {
-    Sdm630.send_retry--;
-  }
-}
-
-void Sdm630SnsInit(void)
-{
-  Sdm630Modbus = new TasmotaModbus(pin[GPIO_SDM630_RX], pin[GPIO_SDM630_TX]);
-  uint8_t result = Sdm630Modbus->Begin(SDM630_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.phase_count = 3;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Sdm630DrvInit(void)
-{
-  if ((pin[GPIO_SDM630_RX] < 99) && (pin[GPIO_SDM630_TX] < 99)) {
-    energy_flg = XNRG_10;
-  }
-}
-
-
-
-
-
-bool Xnrg10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { SDM630Every250ms(); }
-      break;
-    case FUNC_INIT:
-      Sdm630SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Sdm630DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_11_ddsu666.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_11_ddsu666.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_DDSU666
-
-
-
-
-#define XNRG_11 11
-
-
-#ifndef DDSU666_SPEED
-  #define DDSU666_SPEED 9600
-#endif
-
-#ifndef DDSU666_ADDR
-  #define DDSU666_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Ddsu666Modbus;
-
-const uint16_t Ddsu666_start_addresses[] {
-  0x2000,
-  0x2002,
-  0x2004,
-  0x2006,
-  0x200A,
-  0x200E,
-  0X4000,
-  0X400A,
-};
-
-struct DDSU666 {
-  float import_active = NAN;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-} Ddsu666;
-
-
-
-void DDSU666Every250ms(void)
-{
-  bool data_ready = Ddsu666Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Ddsu666Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Ddsu666Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: Ddsu666 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Ddsu666.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.current[0] = value;
-          break;
-
-        case 2:
-          Energy.active_power[0] = value * 1000;
-          break;
-
-        case 3:
-          Energy.reactive_power[0] = value * 1000;
-          break;
-
-        case 4:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 5:
-          Energy.frequency[0] = value;
-          break;
-
-        case 6:
-          Ddsu666.import_active = value;
-          break;
-
-        case 7:
-          Energy.export_active = value;
-          break;
-      }
-
-      Ddsu666.read_state++;
-
-      if (Ddsu666.read_state == 8) {
-        Ddsu666.read_state = 0;
-        EnergyUpdateTotal(Ddsu666.import_active, true);
-      }
-    }
-  }
-
-  if (0 == Ddsu666.send_retry || data_ready) {
-    Ddsu666.send_retry = 5;
-    Ddsu666Modbus->Send(DDSU666_ADDR, 0x04, Ddsu666_start_addresses[Ddsu666.read_state], 2);
-  } else {
-    Ddsu666.send_retry--;
-  }
-}
-
-void Ddsu666SnsInit(void)
-{
-  Ddsu666Modbus = new TasmotaModbus(pin[GPIO_DDSU666_RX], pin[GPIO_DDSU666_TX]);
-  uint8_t result = Ddsu666Modbus->Begin(DDSU666_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Ddsu666DrvInit(void)
-{
-  if ((pin[GPIO_DDSU666_RX] < 99) && (pin[GPIO_DDSU666_TX] < 99)) {
-    energy_flg = XNRG_11;
-  }
-}
-
-
-
-
-
-bool Xnrg11(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { DDSU666Every250ms(); }
-      break;
-    case FUNC_INIT:
-      Ddsu666SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Ddsu666DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_12_solaxX1.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_12_solaxX1.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SOLAX_X1
-
-
-
-
-#define XNRG_12 12
-
-#ifndef SOLAXX1_SPEED
-#define SOLAXX1_SPEED 9600
-#endif
-
-#define INVERTER_ADDRESS 0x0A
-
-#define D_SOLAX_X1 "SolaxX1"
-
-#include <TasmotaSerial.h>
-
-enum solaxX1_Error
-{
-  solaxX1_ERR_NO_ERROR,
-  solaxX1_ERR_CRC_ERROR
-};
-
-union {
-  uint32_t ErrMessage;
-  struct {
-
-    uint8_t TzProtectFault:1;
-    uint8_t MainsLostFault:1;
-    uint8_t GridVoltFault:1;
-    uint8_t GridFreqFault:1;
-    uint8_t PLLLostFault:1;
-    uint8_t BusVoltFault:1;
-    uint8_t ErrBit06:1;
-    uint8_t OciFault:1;
-
-    uint8_t Dci_OCP_Fault:1;
-    uint8_t ResidualCurrentFault:1;
-    uint8_t PvVoltFault:1;
-    uint8_t Ac10Mins_Voltage_Fault:1;
-    uint8_t IsolationFault:1;
-    uint8_t TemperatureOverFault:1;
-    uint8_t FanFault:1;
-    uint8_t ErrBit15:1;
-
-    uint8_t SpiCommsFault:1;
-    uint8_t SciCommsFault:1;
-    uint8_t ErrBit18:1;
-    uint8_t InputConfigFault:1;
-    uint8_t EepromFault:1;
-    uint8_t RelayFault:1;
-    uint8_t SampleConsistenceFault:1;
-    uint8_t ResidualCurrent_DeviceFault:1;
-
-    uint8_t ErrBit24:1;
-    uint8_t ErrBit25:1;
-    uint8_t ErrBit26:1;
-    uint8_t ErrBit27:1;
-    uint8_t ErrBit28:1;
-    uint8_t DCI_DeviceFault:1;
-    uint8_t OtherDeviceFault:1;
-    uint8_t ErrBit31:1;
-  };
-} ErrCode;
-
-const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE;
-
-const char kSolaxError[] PROGMEM =
-  D_SOLAX_ERROR_0 "|" D_SOLAX_ERROR_1 "|" D_SOLAX_ERROR_2 "|" D_SOLAX_ERROR_3 "|" D_SOLAX_ERROR_4 "|" D_SOLAX_ERROR_5 "|"
-  D_SOLAX_ERROR_6 "|" D_SOLAX_ERROR_7 "|" D_SOLAX_ERROR_8;
-
-
-
-TasmotaSerial *solaxX1Serial;
-
-uint8_t solaxX1_Init = 1;
-
-struct SOLAXX1 {
-  float temperature = 0;
-  float energy_today = 0;
-  float dc1_voltage = 0;
-  float dc2_voltage = 0;
-  float dc1_current = 0;
-  float dc2_current = 0;
-  float energy_total = 0;
-  float runtime_total = 0;
-  float dc1_power = 0;
-  float dc2_power = 0;
-
-  uint8_t status = 0;
-  uint32_t errorCode = 0;
-} solaxX1;
-
-union {
-  uint8_t status;
-  struct {
-    uint8_t freeBit7:1;
-    uint8_t freeBit6:1;
-    uint8_t freeBit5:1;
-    uint8_t queryOffline:1;
-    uint8_t queryOfflineSend:1;
-    uint8_t hasAddress:1;
-    uint8_t inverterAddressSend:1;
-    uint8_t inverterSnReceived:1;
-  };
-} protocolStatus;
-
-uint8_t header[2] = {0xAA, 0x55};
-uint8_t source[2] = {0x00, 0x00};
-uint8_t destination[2] = {0x00, 0x00};
-uint8_t controlCode[1] = {0x00};
-uint8_t functionCode[1] = {0x00};
-uint8_t dataLength[1] = {0x00};
-uint8_t data[16] = {0};
-
-uint8_t message[30];
-
-
-
-bool solaxX1_RS485ReceiveReady(void)
-{
-  return (solaxX1Serial->available() > 1);
-}
-
-void solaxX1_RS485Send(uint16_t msgLen)
-{
-  memcpy(message, header, 2);
-  memcpy(message + 2, source, 2);
-  memcpy(message + 4, destination, 2);
-  memcpy(message + 6, controlCode, 1);
-  memcpy(message + 7, functionCode, 1);
-  memcpy(message + 8, dataLength, 1);
-  memcpy(message + 9, data, sizeof(data));
-  uint16_t crc = solaxX1_calculateCRC(message, msgLen);
-
-  while (solaxX1Serial->available() > 0)
-  {
-    solaxX1Serial->read();
-  }
-
-  solaxX1Serial->flush();
-  solaxX1Serial->write(message, msgLen);
-  solaxX1Serial->write(highByte(crc));
-  solaxX1Serial->write(lowByte(crc));
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, message, msgLen);
-}
-
-uint8_t solaxX1_RS485Receive(uint8_t *value)
-{
-  uint8_t len = 0;
-
-  while (solaxX1Serial->available() > 0)
-  {
-    value[len++] = (uint8_t)solaxX1Serial->read();
-  }
-
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, value, len);
-
-  uint16_t crc = solaxX1_calculateCRC(value, len - 2);
-
-  if (value[len - 1] == lowByte(crc) && value[len - 2] == highByte(crc))
-  {
-    return solaxX1_ERR_NO_ERROR;
-  }
-  else
-  {
-    return solaxX1_ERR_CRC_ERROR;
-  }
-}
-
-uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen)
-{
-  uint8_t i;
-  uint16_t wChkSum;
-  wChkSum = 0;
-
-  for (i = 0; i < bLen; i++)
-  {
-    wChkSum = wChkSum + bExternTxPackage[i];
-  }
-  return wChkSum;
-}
-
-void solaxX1_SendInverterAddress(void)
-{
-  source[0] = 0x00;
-  destination[0] = 0x00;
-  destination[1] = 0x00;
-  controlCode[0] = 0x10;
-  functionCode[0] = 0x01;
-  dataLength[0] = 0x0F;
-  data[14] = INVERTER_ADDRESS;
-  solaxX1_RS485Send(24);
-}
-
-void solaxX1_QueryLiveData(void)
-{
-  source[0] = 0x01;
-  destination[0] = 0x00;
-  destination[1] = INVERTER_ADDRESS;
-  controlCode[0] = 0x11;
-  functionCode[0] = 0x02;
-  dataLength[0] = 0x00;
-  solaxX1_RS485Send(9);
-}
-
-uint8_t solaxX1_ParseErrorCode(uint32_t code){
-  ErrCode.ErrMessage = code;
-
-  if (code == 0) return 0;
-  if (ErrCode.MainsLostFault) return 1;
-  if (ErrCode.GridVoltFault) return 2;
-  if (ErrCode.GridFreqFault) return 3;
-  if (ErrCode.PvVoltFault) return 4;
-  if (ErrCode.IsolationFault) return 5;
-  if (ErrCode.TemperatureOverFault) return 6;
-  if (ErrCode.FanFault) return 7;
-  if (ErrCode.OtherDeviceFault) return 8;
-}
-
-
-
-uint8_t solaxX1_send_retry = 0;
-uint8_t solaxX1_nodata_count = 0;
-
-void solaxX1250MSecond(void)
-{
-  uint8_t value[61] = {0};
-  bool data_ready = solaxX1_RS485ReceiveReady();
-
-  if (protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
-  {
-    if (data_ready)
-    {
-      uint8_t error = solaxX1_RS485Receive(value);
-      if (error)
-      {
-        DEBUG_SENSOR_LOG(PSTR("SX1: Data response CRC error"));
-      }
-      else
-      {
-        solaxX1_nodata_count = 0;
-        solaxX1_send_retry = 12;
-        Energy.data_valid[0] = 0;
-
-        solaxX1.temperature = (float)((value[9] << 8) | value[10]);
-        solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f;
-        solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f;
-        solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f;
-        solaxX1.dc1_current = (float)((value[17] << 8) | value[18]) * 0.1f;
-        solaxX1.dc2_current = (float)((value[19] << 8) | value[20]) * 0.1f;
-        Energy.current[0] = (float)((value[21] << 8) | value[22]) * 0.1f;
-        Energy.voltage[0] = (float)((value[23] << 8) | value[24]) * 0.1f;
-        Energy.frequency[0] = (float)((value[25] << 8) | value[26]) * 0.01f;
-        Energy.active_power[0] = (float)((value[27] << 8) | value[28]);
-
-        solaxX1.energy_total = (float)((value[31] << 8) | (value[32] << 8) | (value[33] << 8) | value[34]) * 0.1f;
-        solaxX1.runtime_total = (float)((value[35] << 8) | (value[36] << 8) | (value[37] << 8) | value[38]);
-        solaxX1.status = (uint8_t)((value[39] << 8) | value[40]);
-
-
-
-
-
-
-
-        solaxX1.errorCode = (uint32_t)((value[58] << 8) | (value[57] << 8) | (value[56] << 8) | value[55]);
-
-        solaxX1.dc1_power = solaxX1.dc1_voltage * solaxX1.dc1_current;
-        solaxX1.dc2_power = solaxX1.dc2_voltage * solaxX1.dc2_current;
-
-        solaxX1_QueryLiveData();
-        EnergyUpdateTotal(solaxX1.energy_total, true);
-      }
-    }
-
-    if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) {
-      solaxX1_send_retry = 12;
-      solaxX1_QueryLiveData();
-    }
-
-
-
-    if (255 == solaxX1_nodata_count) {
-      solaxX1_nodata_count = 0;
-      solaxX1_send_retry = 12;
-    }
-  }
-  else
-  {
-    if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); }
-    if (solaxX1_nodata_count < 10 * 4)
-    {
-      solaxX1_nodata_count++;
-    }
-    else if (255 != solaxX1_nodata_count)
-    {
-
-      solaxX1_nodata_count = 255;
-      solaxX1_send_retry = 12;
-      protocolStatus.status = 0b00001000;
-      Energy.data_valid[0] = ENERGY_WATCHDOG;
-
-      solaxX1.temperature = solaxX1.dc1_voltage = solaxX1.dc2_voltage = solaxX1.dc1_current = solaxX1.dc2_current = solaxX1.dc1_power = 0;
-      solaxX1.dc2_power = solaxX1.status = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0;
-
-    }
-  }
-
-  if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
-  {
-    if (data_ready)
-    {
-
-      if (protocolStatus.inverterAddressSend)
-      {
-        uint8_t error = solaxX1_RS485Receive(value);
-        if (error)
-        {
-          DEBUG_SENSOR_LOG(PSTR("SX1: Address confirmation response CRC error"));
-        }
-        else
-        {
-          if (value[6] == 0x10 && value[7] == 0x81 && value[9] == 0x06)
-          {
-            DEBUG_SENSOR_LOG(PSTR("SX1: Set hasAddress"));
-            protocolStatus.status = 0b00100000;
-          }
-        }
-      }
-
-
-      if (protocolStatus.queryOfflineSend)
-      {
-        uint8_t error = solaxX1_RS485Receive(value);
-        if (error)
-        {
-          DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline response CRC error"));
-        }
-        else
-        {
-
-          if (value[6] == 0x10 && value[7] == 0x80 && protocolStatus.inverterSnReceived == false)
-          {
-            for (uint8_t i = 9; i <= 22; i++)
-            {
-              data[i - 9] = value[i];
-            }
-            solaxX1_SendInverterAddress();
-            protocolStatus.status = 0b1100000;
-            DEBUG_SENSOR_LOG(PSTR("SX1: Set inverterSnReceived and inverterAddressSend"));
-          }
-        }
-      }
-    }
-
-    if (solaxX1_send_retry == 0)
-    {
-      if (protocolStatus.queryOfflineSend)
-      {
-        protocolStatus.status = 0b00001000;
-        DEBUG_SENSOR_LOG(PSTR("SX1: Set Query Offline"));
-      }
-      solaxX1_send_retry = 12;
-    }
-
-
-    if (protocolStatus.queryOffline)
-    {
-
-      source[0] = 0x01;
-      destination[1] = 0x00;
-      controlCode[0] = 0x10;
-      functionCode[0] = 0x00;
-      dataLength[0] = 0x00;
-      solaxX1_RS485Send(9);
-      protocolStatus.status = 0b00010000;
-      DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline Send"));
-    }
-  }
-
-  if (!data_ready)
-    solaxX1_send_retry--;
-}
-
-void solaxX1SnsInit(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init"));
-  DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]);
-  protocolStatus.status = 0b00100000;
-
-  solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1);
-  if (solaxX1Serial->begin(SOLAXX1_SPEED)) {
-    if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void solaxX1DrvInit(void)
-{
-  if ((pin[GPIO_SOLAXX1_RX] < 99) && (pin[GPIO_SOLAXX1_TX] < 99)) {
-    energy_flg = XNRG_12;
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_solaxX1_DATA1[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_SOLAR_POWER "{m}%s " D_UNIT_WATT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_POWER "{m}%s " D_UNIT_WATT "{e}";
-#ifdef SOLAXX1_PV2
-const char HTTP_SNS_solaxX1_DATA2[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_PV2_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV2_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV2_POWER "{m}%s " D_UNIT_WATT "{e}";
-#endif
-const char HTTP_SNS_solaxX1_DATA3[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_UPTIME "{m}%s " D_UNIT_HOUR "{e}"
-    "{s}" D_SOLAX_X1 " " D_STATUS "{m}%s"
-    "{s}" D_SOLAX_X1 " " D_ERROR "{m}%s";
-#endif
-
-void solaxX1Show(bool json)
-{
-  char solar_power[33];
-  dtostrfd(solaxX1.dc1_power + solaxX1.dc2_power, Settings.flag2.wattage_resolution, solar_power);
-  char pv1_voltage[33];
-  dtostrfd(solaxX1.dc1_voltage, Settings.flag2.voltage_resolution, pv1_voltage);
-  char pv1_current[33];
-  dtostrfd(solaxX1.dc1_current, Settings.flag2.current_resolution, pv1_current);
-  char pv1_power[33];
-  dtostrfd(solaxX1.dc1_power, Settings.flag2.wattage_resolution, pv1_power);
-#ifdef SOLAXX1_PV2
-  char pv2_voltage[33];
-  dtostrfd(solaxX1.dc2_voltage, Settings.flag2.voltage_resolution, pv2_voltage);
-  char pv2_current[33];
-  dtostrfd(solaxX1.dc2_current, Settings.flag2.current_resolution, pv2_current);
-  char pv2_power[33];
-  dtostrfd(solaxX1.dc2_power, Settings.flag2.wattage_resolution, pv2_power);
-#endif
-  char temperature[33];
-  dtostrfd(solaxX1.temperature, Settings.flag2.temperature_resolution, temperature);
-  char runtime[33];
-  dtostrfd(solaxX1.runtime_total, 0, runtime);
-  char status[33];
-  GetTextIndexed(status, sizeof(status), solaxX1.status, kSolaxMode);
-
-  if (json)
-  {
-    ResponseAppend_P(PSTR(",\"" D_JSON_SOLAR_POWER "\":%s,\"" D_JSON_PV1_VOLTAGE "\":%s,\"" D_JSON_PV1_CURRENT "\":%s,\"" D_JSON_PV1_POWER "\":%s"),
-                                solar_power, pv1_voltage, pv1_current, pv1_power);
-#ifdef SOLAXX1_PV2
-    ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"),
-                                pv2_voltage, pv2_current, pv2_power);
-#endif
-    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"),
-                                temperature, runtime, status, solaxX1.errorCode);
-
-#ifdef USE_WEBSERVER
-  }
-  else
-  {
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA1, solar_power, pv1_voltage, pv1_current, pv1_power);
-#ifdef SOLAXX1_PV2
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA2, pv2_voltage, pv2_current, pv2_power);
-#endif
-    WSContentSend_PD(HTTP_SNS_TEMP, D_SOLAX_X1, temperature, TempUnit());
-    char errorCodeString[33];
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA3, runtime, status,
-      GetTextIndexed(errorCodeString, sizeof(errorCodeString), solaxX1_ParseErrorCode(solaxX1.errorCode), kSolaxError));
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg12(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { solaxX1250MSecond(); }
-      break;
-    case FUNC_JSON_APPEND:
-      solaxX1Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      solaxX1Show(0);
-      break;
-#endif
-    case FUNC_INIT:
-      solaxX1SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      solaxX1DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_LE01MR
-# 71 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-#define XNRG_13 13
-
-
-#ifndef LE01MR_SPEED
-  #define LE01MR_SPEED 2400
-#endif
-
-#ifndef LE01MR_ADDR
-  #define LE01MR_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *FifLEModbus;
-
-const uint8_t le01mr_table_sz = 9;
-
-const uint16_t le01mr_register_addresses[] {
-
-  0x0130,
-  0x0131,
-  0x0158,
-  0x0139,
-  0x0140,
-  0x0148,
-  0x0150,
-  0xA000,
-  0xA01E
-};
-
-struct LE01MR {
-  float total_active = 0;
-  float total_reactive = 0;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-  uint8_t start_address_count = le01mr_table_sz;
-} Le01mr;
-
-
-
-void FifLEEvery250ms(void)
-{
-  bool data_ready = FifLEModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-    uint8_t reg_count = 2;
-    if (Le01mr.read_state < 3) {
-      reg_count=1;
-    }
-
-    uint32_t error = FifLEModbus->ReceiveBuffer(buffer, reg_count);
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, FifLEModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-# 146 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-      uint32_t value_buff = 0;
-
-      if (Le01mr.read_state >= 0 && Le01mr.read_state < 3) {
-        value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
-      } else {
-        value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
-      }
-
-      switch(Le01mr.read_state) {
-        case 0:
-          Energy.frequency[0] = value_buff * 0.01f;
-          break;
-
-        case 1:
-          Energy.voltage[0] = value_buff * 0.01f;
-          break;
-
-        case 2:
-          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f;
-          break;
-
-        case 3:
-          Energy.current[0] = value_buff * 0.001f;
-          break;
-
-        case 4:
-          Energy.active_power[0] = value_buff * 1.0f;
-          break;
-
-        case 5:
-          Energy.reactive_power[0] = value_buff * 1.0f;
-          break;
-
-        case 6:
-          Energy.apparent_power[0] = value_buff * 1.0f;
-          break;
-
-        case 7:
-          Le01mr.total_active = value_buff * 0.01f;
-          break;
-
-        case 8:
-          Le01mr.total_reactive = value_buff * 0.01f;
-          break;
-      }
-
-      Le01mr.read_state++;
-      if (Le01mr.read_state == Le01mr.start_address_count) {
-        Le01mr.read_state = 0;
-
-        EnergyUpdateTotal(Le01mr.total_active, true);
-      }
-    }
-  }
-
-  if (0 == Le01mr.send_retry || data_ready) {
-    uint8_t reg_count = 2;
-
-    Le01mr.send_retry = 5;
-
-    if (Le01mr.read_state < 3) reg_count=1;
-
-    FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
-  } else {
-    Le01mr.send_retry--;
-  }
-}
-
-void FifLESnsInit(void)
-{
-  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_TX]);
-  uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void FifLEDrvInit(void)
-{
-  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_TX] < 99)) {
-    energy_flg = XNRG_13;
-  }
-}
-
-void FifLEReset(void)
-{
-  Le01mr.total_active = 0;
-  Le01mr.total_reactive = 0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_LE01MR[] PROGMEM =
-  "{s}" D_TOTAL_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_TOTAL_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  ;
-#endif
-
-void FifLEShow(bool json)
-{
-  char total_reactive_chr[FLOATSZ];
-  dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
-  char total_active_chr[FLOATSZ];
-  dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
-      total_active_chr, total_reactive_chr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_active_chr, total_reactive_chr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg13(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) {
-          FifLEEvery250ms();
-      }
-      break;
-    case FUNC_JSON_APPEND:
-      FifLEShow(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      FifLEShow(0);
-      break;
-#endif
-    case FUNC_ENERGY_RESET:
-      FifLEReset();
-      break;
-    case FUNC_INIT:
-      FifLESnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      FifLEDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xnrg_interface.ino"
-#ifdef USE_ENERGY_SENSOR
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xnrg_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XNRG_01
-  &Xnrg01,
-#endif
-
-#ifdef XNRG_02
-  &Xnrg02,
-#endif
-
-#ifdef XNRG_03
-  &Xnrg03,
-#endif
-
-#ifdef XNRG_04
-  &Xnrg04,
-#endif
-
-#ifdef XNRG_05
-  &Xnrg05,
-#endif
-
-#ifdef XNRG_06
-  &Xnrg06,
-#endif
-
-#ifdef XNRG_07
-  &Xnrg07,
-#endif
-
-#ifdef XNRG_08
-  &Xnrg08,
-#endif
-
-#ifdef XNRG_09
-  &Xnrg09,
-#endif
-
-#ifdef XNRG_10
-  &Xnrg10,
-#endif
-
-#ifdef XNRG_11
-  &Xnrg11,
-#endif
-
-#ifdef XNRG_12
-  &Xnrg12,
-#endif
-
-#ifdef XNRG_13
-  &Xnrg13,
-#endif
-
-#ifdef XNRG_14
-  &Xnrg14,
-#endif
-
-#ifdef XNRG_15
-  &Xnrg15,
-#endif
-
-#ifdef XNRG_16
-  &Xnrg16
-#endif
-};
-
-const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]);
-
-uint8_t xnrg_active = 0;
-
-bool XnrgCall(uint8_t function)
-{
-  DEBUG_TRACE_LOG(PSTR("NRG: %d"), function);
-
-  if (FUNC_PRE_INIT == function) {
-    for (uint32_t x = 0; x < xnrg_present; x++) {
-      xnrg_func_ptr[x](function);
-      if (energy_flg) {
-        xnrg_active = x;
-        return true;
-      }
-    }
-  }
-  else if (energy_flg) {
-    return xnrg_func_ptr[xnrg_active](function);
-  }
-  return false;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_01_counter.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_01_counter.ino"
-#ifdef USE_COUNTER
-
-
-
-
-#define XSNS_01 1
-
-#define D_PRFX_COUNTER "Counter"
-#define D_CMND_COUNTERTYPE "Type"
-#define D_CMND_COUNTERDEBOUNCE "Debounce"
-
-const char kCounterCommands[] PROGMEM = D_PRFX_COUNTER "|"
-  "|" D_CMND_COUNTERTYPE "|" D_CMND_COUNTERDEBOUNCE ;
-
-void (* const CounterCommand[])(void) PROGMEM = {
-  &CmndCounter, &CmndCounterType, &CmndCounterDebounce };
-
-struct COUNTER {
-  uint32_t timer[MAX_COUNTERS];
-  uint8_t no_pullup = 0;
-  bool any_counter = false;
-} Counter;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void CounterUpdate(uint8_t index) ICACHE_RAM_ATTR;
-void CounterUpdate1(void) ICACHE_RAM_ATTR;
-void CounterUpdate2(void) ICACHE_RAM_ATTR;
-void CounterUpdate3(void) ICACHE_RAM_ATTR;
-void CounterUpdate4(void) ICACHE_RAM_ATTR;
-#endif
-
-void CounterUpdate(uint8_t index)
-{
-  uint32_t time = micros();
-  uint32_t debounce_time = time - Counter.timer[index];
-  if (debounce_time > Settings.pulse_counter_debounce * 1000) {
-    Counter.timer[index] = time;
-    if (bitRead(Settings.pulse_counter_type, index)) {
-      RtcSettings.pulse_counter[index] = debounce_time;
-    } else {
-      RtcSettings.pulse_counter[index]++;
-    }
-  }
-}
-
-void CounterUpdate1(void)
-{
-  CounterUpdate(0);
-}
-
-void CounterUpdate2(void)
-{
-  CounterUpdate(1);
-}
-
-void CounterUpdate3(void)
-{
-  CounterUpdate(2);
-}
-
-void CounterUpdate4(void)
-{
-  CounterUpdate(3);
-}
-
-
-
-bool CounterPinState(void)
-{
-  if ((XdrvMailbox.index >= GPIO_CNTR1_NP) && (XdrvMailbox.index < (GPIO_CNTR1_NP + MAX_COUNTERS))) {
-    bitSet(Counter.no_pullup, XdrvMailbox.index - GPIO_CNTR1_NP);
-    XdrvMailbox.index -= (GPIO_CNTR1_NP - GPIO_CNTR1);
-    return true;
-  }
-  return false;
-}
-
-void CounterInit(void)
-{
-  typedef void (*function) () ;
-  function counter_callbacks[] = { CounterUpdate1, CounterUpdate2, CounterUpdate3, CounterUpdate4 };
-
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      Counter.any_counter = true;
-      pinMode(pin[GPIO_CNTR1 +i], bitRead(Counter.no_pullup, i) ? INPUT : INPUT_PULLUP);
-      attachInterrupt(pin[GPIO_CNTR1 +i], counter_callbacks[i], FALLING);
-    }
-  }
-}
-
-void CounterEverySecond(void)
-{
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      if (bitRead(Settings.pulse_counter_type, i)) {
-        uint32_t time = micros() - Counter.timer[i];
-        if (time > 4200000000) {
-          RtcSettings.pulse_counter[i] = 4200000000;
-        }
-      }
-    }
-  }
-}
-
-void CounterSaveState(void)
-{
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
-    }
-  }
-}
-
-void CounterShow(bool json)
-{
-  bool header = false;
-  uint8_t dsxflg = 0;
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      char counter[33];
-      if (bitRead(Settings.pulse_counter_type, i)) {
-        dtostrfd((double)RtcSettings.pulse_counter[i] / 1000000, 6, counter);
-      } else {
-        dsxflg++;
-        snprintf_P(counter, sizeof(counter), PSTR("%lu"), RtcSettings.pulse_counter[i]);
-      }
-
-      if (json) {
-        if (!header) {
-          ResponseAppend_P(PSTR(",\"COUNTER\":{"));
-        }
-        ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
-        header = true;
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (1 == dsxflg)) {
-          DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]);
-          dsxflg++;
-        }
-#endif
-        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
-          RtcSettings.pulse_counter[i] = 0;
-        }
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),
-          i +1, counter, (bitRead(Settings.pulse_counter_type, i)) ? " " D_UNIT_SECOND : "");
-#endif
-      }
-    }
-  }
-  if (header) {
-    ResponseJsonEnd();
-  }
-}
-
-
-
-
-
-void CmndCounter(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
-    if ((XdrvMailbox.data_len > 0) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
-      if ((XdrvMailbox.data[0] == '-') || (XdrvMailbox.data[0] == '+')) {
-        RtcSettings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
-        Settings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
-      } else {
-        RtcSettings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
-        Settings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      }
-    }
-    ResponseCmndIdxNumber(RtcSettings.pulse_counter[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndCounterType(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
-      bitWrite(Settings.pulse_counter_type, XdrvMailbox.index -1, XdrvMailbox.payload &1);
-      RtcSettings.pulse_counter[XdrvMailbox.index -1] = 0;
-      Settings.pulse_counter[XdrvMailbox.index -1] = 0;
-    }
-    ResponseCmndIdxNumber(bitRead(Settings.pulse_counter_type, XdrvMailbox.index -1));
-  }
-}
-
-void CmndCounterDebounce(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
-    Settings.pulse_counter_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.pulse_counter_debounce);
-}
-
-
-
-
-
-bool Xsns01(uint8_t function)
-{
-  bool result = false;
-
-  if (Counter.any_counter) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        CounterEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        CounterShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        CounterShow(0);
-        break;
-#endif
-      case FUNC_SAVE_BEFORE_RESTART:
-      case FUNC_SAVE_AT_MIDNIGHT:
-        CounterSaveState();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kCounterCommands, CounterCommand);
-        break;
-    }
-  } else {
-    switch (function) {
-      case FUNC_INIT:
-        CounterInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = CounterPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
-#ifndef USE_ADC_VCC
-
-
-
-
-#define XSNS_02 2
-
-#define TO_CELSIUS(x) ((x) - 273.15)
-#define TO_KELVIN(x) ((x) + 273.15)
-
-
-#define ANALOG_V33 3.3
-#define ANALOG_T0 TO_KELVIN(25.0)
-
-
-
-
-
-#define ANALOG_NTC_BRIDGE_RESISTANCE 32000
-#define ANALOG_NTC_RESISTANCE 10000
-#define ANALOG_NTC_B_COEFFICIENT 3350
-
-
-
-
-
-#define ANALOG_LDR_BRIDGE_RESISTANCE 10000
-#define ANALOG_LDR_LUX_CALC_SCALAR 12518931
-#define ANALOG_LDR_LUX_CALC_EXPONENT -1.4050
-# 58 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_02_analog.ino"
-#define ANALOG_CT_FLAGS 0
-#define ANALOG_CT_MULTIPLIER 2146
-#define ANALOG_CT_VOLTAGE 2300
-
-#define CT_FLAG_ENERGY_RESET (1 << 0)
-
-struct {
-  float temperature = 0;
-  float current = 0;
-  float energy = 0;
-  uint32_t previous_millis = 0;
-  uint16_t last_value = 0;
-} Adc;
-
-void AdcInit(void)
-{
-  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000)) {
-    if (ADC0_TEMP == my_adc0) {
-
-      Settings.adc_param_type = ADC0_TEMP;
-      Settings.adc_param1 = ANALOG_NTC_BRIDGE_RESISTANCE;
-      Settings.adc_param2 = ANALOG_NTC_RESISTANCE;
-      Settings.adc_param3 = ANALOG_NTC_B_COEFFICIENT * 10000;
-    }
-    else if (ADC0_LIGHT == my_adc0) {
-      Settings.adc_param_type = ADC0_LIGHT;
-      Settings.adc_param1 = ANALOG_LDR_BRIDGE_RESISTANCE;
-      Settings.adc_param2 = ANALOG_LDR_LUX_CALC_SCALAR;
-      Settings.adc_param3 = ANALOG_LDR_LUX_CALC_EXPONENT * 10000;
-    }
-    else if (ADC0_RANGE == my_adc0) {
-      Settings.adc_param_type = ADC0_RANGE;
-      Settings.adc_param1 = 0;
-      Settings.adc_param2 = 1023;
-      Settings.adc_param3 = 0;
-      Settings.adc_param4 = 100;
-    }
-    else if (ADC0_CT_POWER == my_adc0) {
-      Settings.adc_param_type = ADC0_CT_POWER;
-      Settings.adc_param1 = ANALOG_CT_FLAGS;
-      Settings.adc_param2 = ANALOG_CT_MULTIPLIER;
-      Settings.adc_param3 = ANALOG_CT_VOLTAGE;
-    }
-  }
-}
-
-uint16_t AdcRead(uint8_t factor)
-{
-
-
-
-
-
-  uint8_t samples = 1 << factor;
-  uint16_t analog = 0;
-  for (uint32_t i = 0; i < samples; i++) {
-    analog += analogRead(A0);
-    delay(1);
-  }
-  analog >>= factor;
-  return analog;
-}
-
-#ifdef USE_RULES
-void AdcEvery250ms(void)
-{
-  if (ADC0_INPUT == my_adc0) {
-    uint16_t new_value = AdcRead(5);
-    if ((new_value < Adc.last_value -10) || (new_value > Adc.last_value +10)) {
-      Adc.last_value = new_value;
-      uint16_t value = Adc.last_value / 10;
-      Response_P(PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value);
-      XdrvRulesProcess();
-    }
-  }
-}
-#endif
-
-uint16_t AdcGetLux(void)
-{
-  int adc = AdcRead(2);
-
-  double resistorVoltage = ((double)adc / 1023) * ANALOG_V33;
-  double ldrVoltage = ANALOG_V33 - resistorVoltage;
-  double ldrResistance = ldrVoltage / resistorVoltage * (double)Settings.adc_param1;
-  double ldrLux = (double)Settings.adc_param2 * FastPrecisePow(ldrResistance, (double)Settings.adc_param3 / 10000);
-
-  return (uint16_t)ldrLux;
-}
-
-uint16_t AdcGetRange(void)
-{
-
-
-
-  int adc = AdcRead(2);
-  double adcrange = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
-  return (uint16_t)adcrange;
-}
-
-void AdcGetCurrentPower(uint8_t factor)
-{
-
-
-
-
-
-  uint8_t samples = 1 << factor;
-  uint16_t analog = 0;
-  uint16_t analog_min = 1023;
-  uint16_t analog_max = 0;
-  for (uint32_t i = 0; i < samples; i++) {
-    analog = analogRead(A0);
-    if (analog < analog_min) {
-      analog_min = analog;
-    }
-    if (analog > analog_max) {
-      analog_max = analog;
-    }
-    delay(1);
-  }
-
-  Adc.current = (float)(analog_max-analog_min) * ((float)(Settings.adc_param2) / 100000);
-  float power = Adc.current * (float)(Settings.adc_param3) / 10;
-  uint32_t current_millis = millis();
-  Adc.energy = Adc.energy + ((power * (current_millis - Adc.previous_millis)) / 3600000000);
-  Adc.previous_millis = current_millis;
-}
-
-void AdcEverySecond(void)
-{
-  if (ADC0_TEMP == my_adc0) {
-    int adc = AdcRead(2);
-
-    double Rt = (adc * Settings.adc_param1) / (1024.0 * ANALOG_V33 - (double)adc);
-    double BC = (double)Settings.adc_param3 / 10000;
-    double T = BC / (BC / ANALOG_T0 + TaylorLog(Rt / (double)Settings.adc_param2));
-    Adc.temperature = ConvertTemp(TO_CELSIUS(T));
-  }
-  else if (ADC0_CT_POWER == my_adc0) {
-    AdcGetCurrentPower(5);
-  }
-}
-
-void AdcShow(bool json)
-{
-  if (ADC0_INPUT == my_adc0) {
-    uint16_t analog = AdcRead(5);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"ANALOG\":{\"A0\":%d}"), analog);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ANALOG, "", 0, analog);
-#endif
-    }
-  }
-
-  else if (ADC0_TEMP == my_adc0) {
-    char temperature[33];
-    dtostrfd(Adc.temperature, Settings.flag2.temperature_resolution, temperature);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMP, "ANALOG", temperature);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_TEMP, temperature);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Adc.temperature);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
-#endif
-    }
-  }
-
-  else if (ADC0_LIGHT == my_adc0) {
-    uint16_t adc_light = AdcGetLux();
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_ILLUMINANCE, "ANALOG", adc_light);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, adc_light);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, "", adc_light);
-#endif
-    }
-  }
-
-  else if (ADC0_RANGE == my_adc0) {
-    uint16_t adc_range = AdcGetRange();
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_RANGE, "ANALOG", adc_range);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_RANGE, "", adc_range);
-#endif
-    }
-  }
-
-  else if (ADC0_CT_POWER == my_adc0) {
-    AdcGetCurrentPower(5);
-
-    float voltage = (float)(Settings.adc_param3) / 10;
-    char voltage_chr[FLOATSZ];
-    dtostrfd(voltage, Settings.flag2.voltage_resolution, voltage_chr);
-    char current_chr[FLOATSZ];
-    dtostrfd(Adc.current, Settings.flag2.current_resolution, current_chr);
-    char power_chr[FLOATSZ];
-    dtostrfd(voltage * Adc.current, Settings.flag2.wattage_resolution, power_chr);
-    char energy_chr[FLOATSZ];
-    dtostrfd(Adc.energy, Settings.flag2.energy_resolution, energy_chr);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"ANALOG\":{\"" D_JSON_ENERGY "\":%s,\"" D_JSON_POWERUSAGE "\":%s,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s}"),
-        energy_chr, power_chr, voltage_chr, current_chr);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_POWER_ENERGY, power_chr);
-        DomoticzSensor(DZ_VOLTAGE, voltage_chr);
-        DomoticzSensor(DZ_CURRENT, current_chr);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_VOLTAGE, voltage_chr);
-      WSContentSend_PD(HTTP_SNS_CURRENT, current_chr);
-      WSContentSend_PD(HTTP_SNS_POWER, power_chr);
-      WSContentSend_PD(HTTP_SNS_ENERGY_TOTAL, energy_chr);
-#endif
-    }
-  }
-
-}
-
-
-
-
-
-const char kAdcCommands[] PROGMEM = "|"
-  D_CMND_ADC "|" D_CMND_ADCS "|" D_CMND_ADCPARAM;
-
-void (* const AdcCommand[])(void) PROGMEM = {
-  &CmndAdc, &CmndAdcs, &CmndAdcParam };
-
-void CmndAdc(void)
-{
-  if (ValidAdc() && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < ADC0_END)) {
-    Settings.my_adc0 = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  char stemp1[TOPSZ];
-  Response_P(PSTR("{\"" D_CMND_ADC "0\":{\"%d\":\"%s\"}}"), Settings.my_adc0, GetTextIndexed(stemp1, sizeof(stemp1), Settings.my_adc0, kAdc0Names));
-}
-
-void CmndAdcs(void)
-{
-  Response_P(PSTR("{\"" D_CMND_ADCS "\":{"));
-  bool jsflg = false;
-  char stemp1[TOPSZ];
-  for (uint32_t i = 0; i < ADC0_END; i++) {
-    if (jsflg) {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    ResponseAppend_P(PSTR("\"%d\":\"%s\""), i, GetTextIndexed(stemp1, sizeof(stemp1), i, kAdc0Names));
-  }
-  ResponseJsonEndEnd();
-}
-
-void CmndAdcParam(void)
-{
-  if (XdrvMailbox.data_len) {
-    if ((ADC0_TEMP == XdrvMailbox.payload) ||
-        (ADC0_LIGHT == XdrvMailbox.payload) ||
-        (ADC0_RANGE == XdrvMailbox.payload) ||
-        (ADC0_CT_POWER == XdrvMailbox.payload)) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len +1];
-
-
-
-        Settings.adc_param_type = XdrvMailbox.payload;
-        Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-        Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
-        if (ADC0_RANGE == XdrvMailbox.payload) {
-          Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
-          Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
-        } else {
-          Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
-        }
-        if (ADC0_CT_POWER == XdrvMailbox.payload) {
-          if ((Settings.adc_param1 & CT_FLAG_ENERGY_RESET) > 0) {
-            Adc.energy = 0;
-            Settings.adc_param1 ^= CT_FLAG_ENERGY_RESET;
-          }
-        }
-      } else {
-
-
-
-
-        Settings.adc_param_type = 0;
-        AdcInit();
-      }
-    }
-  }
-
-
-  Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
-  if (ADC0_RANGE == my_adc0) {
-    ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
-  } else {
-    int value = Settings.adc_param3;
-    uint8_t precision;
-    for (precision = 4; precision > 0; precision--) {
-      if (value % 10) { break; }
-      value /= 10;
-    }
-    char param3[33];
-    dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
-    ResponseAppend_P(PSTR(",%s"), param3);
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-
-
-
-
-bool Xsns02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_COMMAND:
-      result = DecodeCommand(kAdcCommands, AdcCommand);
-      break;
-    default:
-      if ((ADC0_INPUT == my_adc0) ||
-          (ADC0_TEMP == my_adc0) ||
-          (ADC0_LIGHT == my_adc0) ||
-          (ADC0_RANGE == my_adc0) ||
-          (ADC0_CT_POWER == my_adc0)) {
-        switch (function) {
-#ifdef USE_RULES
-          case FUNC_EVERY_250_MSECOND:
-            AdcEvery250ms();
-            break;
-#endif
-          case FUNC_EVERY_SECOND:
-            AdcEverySecond();
-            break;
-          case FUNC_INIT:
-            AdcInit();
-            break;
-          case FUNC_JSON_APPEND:
-            AdcShow(1);
-            break;
-#ifdef USE_WEBSERVER
-          case FUNC_WEB_SENSOR:
-            AdcShow(0);
-            break;
-#endif
-        }
-      }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
-#ifdef USE_SONOFF_SC
-# 57 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_04_snfsc.ino"
-#define XSNS_04 4
-
-uint16_t sc_value[5] = { 0 };
-
-void SonoffScSend(const char *data)
-{
-  Serial.write(data);
-  Serial.write('\x1B');
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_TRANSMIT " %s"), data);
-}
-
-void SonoffScInit(void)
-{
-
-  SonoffScSend("AT+START");
-
-}
-
-void SonoffScSerialInput(char *rcvstat)
-{
-  char *p;
-  char *str;
-  uint16_t value[5] = { 0 };
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_RECEIVED " %s"), rcvstat);
-
-  if (!strncasecmp_P(rcvstat, PSTR("AT+UPDATE="), 10)) {
-    int8_t i = -1;
-    for (str = strtok_r(rcvstat, ":", &p); str && i < 5; str = strtok_r(nullptr, ":", &p)) {
-      value[i++] = atoi(str);
-    }
-    if (value[0] > 0) {
-      for (uint32_t i = 0; i < 5; i++) {
-        sc_value[i] = value[i];
-      }
-      sc_value[2] = (11 - sc_value[2]) * 10;
-      sc_value[3] *= 10;
-      sc_value[4] = (11 - sc_value[4]) * 10;
-      SonoffScSend("AT+SEND=ok");
-    } else {
-      SonoffScSend("AT+SEND=fail");
-    }
-  }
-  else if (!strcasecmp_P(rcvstat, PSTR("AT+STATUS?"))) {
-    SonoffScSend("AT+STATUS=4");
-  }
-}
-
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SCPLUS[] PROGMEM =
-  "{s}" D_LIGHT "{m}%d%%{e}{s}" D_NOISE "{m}%d%%{e}{s}" D_AIR_QUALITY "{m}%d%%{e}";
-#endif
-
-void SonoffScShow(bool json)
-{
-  if (sc_value[0] > 0) {
-    float t = ConvertTemp(sc_value[1]);
-    float h = ConvertHumidity(sc_value[0]);
-
-    char temperature[33];
-    dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SonoffSC\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_LIGHT "\":%d,\"" D_JSON_NOISE "\":%d,\"" D_JSON_AIRQUALITY "\":%d}"),
-        temperature, humidity, sc_value[2], sc_value[3], sc_value[4]);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-        DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]);
-        DomoticzSensor(DZ_COUNT, sc_value[3]);
-        DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20));
-      }
-#endif
-
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, t);
-        KnxSensor(KNX_HUMIDITY, h);
-      }
-#endif
-
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, "", humidity);
-      WSContentSend_PD(HTTP_SNS_SCPLUS, sc_value[2], sc_value[3], sc_value[4]);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns04(uint8_t function)
-{
-  bool result = false;
-
-  if (SONOFF_SC == my_module_type) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        SonoffScShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SonoffScShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        SonoffScInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_05_ds18x20.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_05_ds18x20.ino"
-#ifdef USE_DS18x20
-
-
-
-
-#define XSNS_05 5
-
-
-
-#define DS18S20_CHIPID 0x10
-#define DS1822_CHIPID 0x22
-#define DS18B20_CHIPID 0x28
-#define MAX31850_CHIPID 0x3B
-
-#define W1_SKIP_ROM 0xCC
-#define W1_CONVERT_TEMP 0x44
-#define W1_WRITE_EEPROM 0x48
-#define W1_WRITE_SCRATCHPAD 0x4E
-#define W1_READ_SCRATCHPAD 0xBE
-
-#define DS18X20_MAX_SENSORS 8
-
-const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
-
-uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
-
-struct DS18X20STRUCT {
-  uint8_t address[8];
-  uint8_t index;
-  uint8_t valid;
-  float temperature;
-} ds18x20_sensor[DS18X20_MAX_SENSORS];
-uint8_t ds18x20_sensors = 0;
-uint8_t ds18x20_pin = 0;
-uint8_t ds18x20_pin_out = 0;
-bool ds18x20_dual_mode = false;
-char ds18x20_types[12];
-#ifdef W1_PARASITE_POWER
-uint8_t ds18x20_sensor_curr = 0;
-unsigned long w1_power_until = 0;
-#endif
-
-
-
-
-
-#define W1_MATCH_ROM 0x55
-#define W1_SEARCH_ROM 0xF0
-
-uint8_t onewire_last_discrepancy = 0;
-uint8_t onewire_last_family_discrepancy = 0;
-bool onewire_last_device_flag = false;
-unsigned char onewire_rom_id[8] = { 0 };
-
-
-
-uint8_t OneWireReset(void)
-{
-  uint8_t retries = 125;
-
-  if (!ds18x20_dual_mode) {
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-    do {
-      if (--retries == 0) {
-        return 0;
-      }
-      delayMicroseconds(2);
-    } while (!digitalRead(ds18x20_pin));
-    pinMode(ds18x20_pin, OUTPUT);
-    digitalWrite(ds18x20_pin, LOW);
-    delayMicroseconds(480);
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-  } else {
-    digitalWrite(ds18x20_pin_out, HIGH);
-    do {
-      if (--retries == 0) {
-        return 0;
-      }
-      delayMicroseconds(2);
-    } while (!digitalRead(ds18x20_pin));
-    digitalWrite(ds18x20_pin_out, LOW);
-    delayMicroseconds(480);
-    digitalWrite(ds18x20_pin_out, HIGH);
-  }
-  delayMicroseconds(70);
-  uint8_t r = !digitalRead(ds18x20_pin);
-  delayMicroseconds(410);
-  return r;
-}
-
-void OneWireWriteBit(uint8_t v)
-{
-  static const uint8_t delay_low[2] = { 65, 10 };
-  static const uint8_t delay_high[2] = { 5, 55 };
-
-  v &= 1;
-  if (!ds18x20_dual_mode) {
-    digitalWrite(ds18x20_pin, LOW);
-    pinMode(ds18x20_pin, OUTPUT);
-    delayMicroseconds(delay_low[v]);
-    digitalWrite(ds18x20_pin, HIGH);
-  } else {
-    digitalWrite(ds18x20_pin_out, LOW);
-    delayMicroseconds(delay_low[v]);
-    digitalWrite(ds18x20_pin_out, HIGH);
-  }
-  delayMicroseconds(delay_high[v]);
-}
-
-uint8_t OneWireReadBit(void)
-{
-  if (!ds18x20_dual_mode) {
-    pinMode(ds18x20_pin, OUTPUT);
-    digitalWrite(ds18x20_pin, LOW);
-    delayMicroseconds(3);
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-  } else {
-    digitalWrite(ds18x20_pin_out, LOW);
-    delayMicroseconds(3);
-    digitalWrite(ds18x20_pin_out, HIGH);
-  }
-  delayMicroseconds(10);
-  uint8_t r = digitalRead(ds18x20_pin);
-  delayMicroseconds(53);
-  return r;
-}
-
-
-
-void OneWireWrite(uint8_t v)
-{
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    OneWireWriteBit((bit_mask & v) ? 1 : 0);
-  }
-}
-
-uint8_t OneWireRead(void)
-{
-  uint8_t r = 0;
-
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    if (OneWireReadBit()) {
-      r |= bit_mask;
-    }
-  }
-  return r;
-}
-
-void OneWireSelect(const uint8_t rom[8])
-{
-  OneWireWrite(W1_MATCH_ROM);
-  for (uint32_t i = 0; i < 8; i++) {
-    OneWireWrite(rom[i]);
-  }
-}
-
-void OneWireResetSearch(void)
-{
-  onewire_last_discrepancy = 0;
-  onewire_last_device_flag = false;
-  onewire_last_family_discrepancy = 0;
-  for (uint32_t i = 0; i < 8; i++) {
-    onewire_rom_id[i] = 0;
-  }
-}
-
-uint8_t OneWireSearch(uint8_t *newAddr)
-{
-  uint8_t id_bit_number = 1;
-  uint8_t last_zero = 0;
-  uint8_t rom_byte_number = 0;
-  uint8_t search_result = 0;
-  uint8_t id_bit;
-  uint8_t cmp_id_bit;
-  unsigned char rom_byte_mask = 1;
-  unsigned char search_direction;
-
-  if (!onewire_last_device_flag) {
-    if (!OneWireReset()) {
-      onewire_last_discrepancy = 0;
-      onewire_last_device_flag = false;
-      onewire_last_family_discrepancy = 0;
-      return false;
-    }
-    OneWireWrite(W1_SEARCH_ROM);
-    do {
-      id_bit = OneWireReadBit();
-      cmp_id_bit = OneWireReadBit();
-
-      if ((id_bit == 1) && (cmp_id_bit == 1)) {
-        break;
-      } else {
-        if (id_bit != cmp_id_bit) {
-          search_direction = id_bit;
-        } else {
-          if (id_bit_number < onewire_last_discrepancy) {
-            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
-          } else {
-            search_direction = (id_bit_number == onewire_last_discrepancy);
-          }
-          if (search_direction == 0) {
-            last_zero = id_bit_number;
-            if (last_zero < 9) {
-              onewire_last_family_discrepancy = last_zero;
-            }
-          }
-        }
-        if (search_direction == 1) {
-          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
-        } else {
-          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
-        }
-        OneWireWriteBit(search_direction);
-        id_bit_number++;
-        rom_byte_mask <<= 1;
-        if (rom_byte_mask == 0) {
-          rom_byte_number++;
-          rom_byte_mask = 1;
-        }
-      }
-    } while (rom_byte_number < 8);
-    if (!(id_bit_number < 65)) {
-      onewire_last_discrepancy = last_zero;
-      if (onewire_last_discrepancy == 0) {
-        onewire_last_device_flag = true;
-      }
-      search_result = true;
-    }
-  }
-  if (!search_result || !onewire_rom_id[0]) {
-    onewire_last_discrepancy = 0;
-    onewire_last_device_flag = false;
-    onewire_last_family_discrepancy = 0;
-    search_result = false;
-  }
-  for (uint32_t i = 0; i < 8; i++) {
-    newAddr[i] = onewire_rom_id[i];
-  }
-  return search_result;
-}
-
-bool OneWireCrc8(uint8_t *addr)
-{
-  uint8_t crc = 0;
-  uint8_t len = 8;
-
-  while (len--) {
-    uint8_t inbyte = *addr++;
-    for (uint32_t i = 8; i; i--) {
-      uint8_t mix = (crc ^ inbyte) & 0x01;
-      crc >>= 1;
-      if (mix) {
-        crc ^= 0x8C;
-      }
-      inbyte >>= 1;
-    }
-  }
-  return (crc == *addr);
-}
-
-
-
-void Ds18x20Init(void)
-{
-  uint64_t ids[DS18X20_MAX_SENSORS];
-
-  ds18x20_pin = pin[GPIO_DSB];
-  if (pin[GPIO_DSB_OUT] < 99) {
-    ds18x20_pin_out = pin[GPIO_DSB_OUT];
-    ds18x20_dual_mode = true;
-    pinMode(ds18x20_pin_out, OUTPUT);
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-  }
-
-  OneWireResetSearch();
-
-  ds18x20_sensors = 0;
-  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
-    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
-      break;
-    }
-    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
-       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
-      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
-      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];
-      for (uint32_t j = 6; j > 0; j--) {
-        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
-      }
-      ds18x20_sensors++;
-    }
-  }
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
-      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {
-        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
-      }
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
-}
-
-void Ds18x20Convert(void)
-{
-  OneWireReset();
-#ifdef W1_PARASITE_POWER
-
-  if (++ds18x20_sensor_curr >= ds18x20_sensors)
-    ds18x20_sensor_curr = 0;
-  OneWireSelect(ds18x20_sensor[ds18x20_sensor_curr].address);
-#else
-  OneWireWrite(W1_SKIP_ROM);
-#endif
-  OneWireWrite(W1_CONVERT_TEMP);
-
-}
-
-bool Ds18x20Read(uint8_t sensor)
-{
-  uint8_t data[9];
-  int8_t sign = 1;
-
-  uint8_t index = ds18x20_sensor[sensor].index;
-  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
-  for (uint32_t retry = 0; retry < 3; retry++) {
-    OneWireReset();
-    OneWireSelect(ds18x20_sensor[index].address);
-    OneWireWrite(W1_READ_SCRATCHPAD);
-    for (uint32_t i = 0; i < 9; i++) {
-      data[i] = OneWireRead();
-    }
-    if (OneWireCrc8(data)) {
-      switch(ds18x20_sensor[index].address[0]) {
-        case DS18S20_CHIPID: {
-          if (data[1] > 0x80) {
-            data[0] = (~data[0]) +1;
-            sign = -1;
-          }
-          float temp9 = (float)(data[0] >> 1) * sign;
-          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case DS1822_CHIPID:
-        case DS18B20_CHIPID: {
-          if (data[4] != 0x7F) {
-            data[4] = 0x7F;
-            OneWireReset();
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_SCRATCHPAD);
-            OneWireWrite(data[2]);
-            OneWireWrite(data[3]);
-            OneWireWrite(data[4]);
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_EEPROM);
-#ifdef W1_PARASITE_POWER
-            w1_power_until = millis() + 10;
-#endif
-          }
-          uint16_t temp12 = (data[1] << 8) + data[0];
-          if (temp12 > 2047) {
-            temp12 = (~temp12) +1;
-            sign = -1;
-          }
-          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case MAX31850_CHIPID: {
-          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
-          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-      }
-    }
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
-  return false;
-}
-
-void Ds18x20Name(uint8_t sensor)
-{
-  uint8_t index = sizeof(ds18x20_chipids);
-  while (index) {
-    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
-      break;
-    }
-    index--;
-  }
-  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
-  if (ds18x20_sensors > 1) {
-    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
-  }
-}
-
-
-
-void Ds18x20EverySecond(void)
-{
-#ifdef W1_PARASITE_POWER
-
-  unsigned long now = millis();
-  if (now < w1_power_until)
-    return;
-#endif
-  if (uptime & 1
-#ifdef W1_PARASITE_POWER
-
-      || ds18x20_sensors >= 2
-#endif
-  ) {
-
-    Ds18x20Convert();
-  } else {
-    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-
-      if (!Ds18x20Read(i)) {
-        Ds18x20Name(i);
-        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
-#ifdef USE_DS18x20_RECONFIGURE
-        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
-          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
-          Ds18x20Init();
-        }
-#endif
-      }
-    }
-  }
-}
-
-void Ds18x20Show(bool json)
-{
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    uint8_t index = ds18x20_sensor[i].index;
-
-    if (ds18x20_sensor[index].valid) {
-      char temperature[33];
-      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
-
-      Ds18x20Name(i);
-
-      if (json) {
-        char address[17];
-        for (uint32_t j = 0; j < 6; j++) {
-          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);
-        }
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == i)) {
-          DomoticzSensor(DZ_TEMP, temperature);
-        }
-#endif
-#ifdef USE_KNX
-        if ((0 == tele_period) && (0 == i)) {
-          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
-        }
-#endif
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
-#endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool Xsns05(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_DSB] < 99) {
-    switch (function) {
-      case FUNC_INIT:
-        Ds18x20Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        Ds18x20EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Ds18x20Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ds18x20Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
-#ifdef USE_DHT_OLD
-# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_old.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint32_t dht_max_cycles;
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-void DhtReadPrep(void)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[i].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-  }
-}
-
-int32_t DhtExpectPulse(uint8_t sensor, bool level)
-{
-  int32_t count = 0;
-
-  while (digitalRead(Dht[sensor].pin) == level) {
-    if (count++ >= (int32_t)dht_max_cycles) {
-      return -1;
-    }
-  }
-  return count;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  int32_t cycles[80];
-  uint8_t error = 0;
-
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-
-
-
-  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-    Dht[sensor].lastresult = 0;
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[sensor].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-    delay(250);
-  }
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  if (GPIO_SI7021 == Dht[sensor].type) {
-    delayMicroseconds(500);
-  } else {
-    delay(20);
-  }
-
-  noInterrupts();
-  if (!dht_dual_mode) {
-    digitalWrite(Dht[sensor].pin, HIGH);
-    delayMicroseconds(40);
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-    delayMicroseconds(40);
-  }
-  delayMicroseconds(10);
-  if (-1 == DhtExpectPulse(sensor, LOW)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    error = 1;
-  }
-  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    error = 1;
-  }
-  else {
-    for (uint32_t i = 0; i < 80; i += 2) {
-      cycles[i] = DhtExpectPulse(sensor, LOW);
-      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
-    }
-  }
-  interrupts();
-
-  if (error) { return false; }
-
-  for (uint32_t i = 0; i < 40; ++i) {
-    int32_t lowCycles = cycles[2*i];
-    int32_t highCycles = cycles[2*i+1];
-    if ((-1 == lowCycles) || (-1 == highCycles)) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      return false;
-    }
-    dht_data[i/8] <<= 1;
-    if (highCycles > lowCycles) {
-      dht_data[i / 8] |= 1;
-    }
-  }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    dht_max_cycles = microsecondsToClockCycles(1000);
-
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-    DhtReadPrep();
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-#ifdef USE_DHT_V2
-# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint32_t dht_max_cycles;
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-void DhtReadPrep(void)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[i].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-  }
-}
-
-int32_t DhtExpectPulse(uint8_t sensor, bool level)
-{
-  int32_t count = 0;
-
-  while (digitalRead(Dht[sensor].pin) == level) {
-    if (count++ >= (int32_t)dht_max_cycles) {
-      return -1;
-    }
-  }
-  return count;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  int32_t cycles[80];
-  uint8_t error = 0;
-
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-    Dht[sensor].lastresult = 0;
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[sensor].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-    delay(250);
-  }
-
-
-  noInterrupts();
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_SI7021:
-# 114 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-      delayMicroseconds(500);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(40);
-      break;
-
-    case GPIO_DHT22:
-# 133 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-      delayMicroseconds(1100);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(30);
-      break;
-
-    case GPIO_DHT11:
-# 151 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v2.ino"
-    default:
-
-      delay(20);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(30);
-      break;
-  }
-
-
-  pinMode(Dht[sensor].pin, INPUT_PULLUP);
-
-  if (-1 == DhtExpectPulse(sensor, LOW)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    error = 1;
-  }
-  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    error = 1;
-  }
-  else {
-    for (uint32_t i = 0; i < 80; i += 2) {
-      cycles[i] = DhtExpectPulse(sensor, LOW);
-      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
-    }
-  }
-  interrupts();
-  if (error) { return false; }
-
-
-  for (uint32_t i = 0; i < 40; ++i) {
-    int32_t lowCycles = cycles[2*i];
-    int32_t highCycles = cycles[2*i+1];
-    if ((-1 == lowCycles) || (-1 == highCycles)) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      return false;
-    }
-    dht_data[i/8] <<= 1;
-    if (highCycles > lowCycles) {
-      dht_data[i / 8] |= 1;
-    }
-  }
-
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    dht_max_cycles = microsecondsToClockCycles(1000);
-
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v2) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-    DhtReadPrep();
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
-#ifdef USE_DHT_V3
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v3.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtExpectPulse(uint8_t sensor, int level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (micros() > timeout) { return false; }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-int DhtReadDat(uint8_t sensor)
-{
-  uint8_t result = 0;
-  for (uint32_t i = 0; i < 8; i++) {
-    if (!DhtExpectPulse(sensor, HIGH)) { return -1; }
-
-    delayMicroseconds(35);
-    if (digitalRead(Dht[sensor].pin)) {
-      result |= (1 << (7 - i));
-    }
-
-    if (!DhtExpectPulse(sensor, LOW)) { return -1; }
-  }
-  return result;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-
-      delayMicroseconds(20);
-      break;
-  }
-
-  noInterrupts();
-  if (!DhtExpectPulse(sensor, LOW)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    return false;
-  }
-  if (!DhtExpectPulse(sensor, HIGH)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    return false;
-  }
-  if (!DhtExpectPulse(sensor, LOW)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    return false;
-  }
-
-  int data = 0;
-  for (uint32_t i = 0; i < 5; i++) {
-    data = DhtReadDat(sensor);
-    if (-1 == data) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      break;
-    }
-    dht_data[i] = data;
-  }
-  interrupts();
-  if (-1 == data) { return false; }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v3) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
-#ifdef USE_DHT_V4
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v4.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtExpectPulse(uint32_t sensor, uint32_t level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (micros() > timeout) { return false; }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-bool DhtRead(uint32_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(20);
-      break;
-  }
-
-  uint32_t level = 9;
-  noInterrupts();
-  for (uint32_t i = 0; i < 3; i++) {
-    level = i &1;
-    if (!DhtExpectPulse(sensor, level)) { break; }
-    level = 9;
-  }
-  if (9 == level) {
-    int data = 0;
-    for (uint32_t i = 0; i < 5; i++) {
-      data = 0;
-      for (uint32_t j = 0; j < 8; j++) {
-        level = 1;
-        if (!DhtExpectPulse(sensor, level)) { break; }
-
-        delayMicroseconds(35);
-        if (digitalRead(Dht[sensor].pin)) {
-          data |= (1 << (7 - j));
-        }
-
-        level = 0;
-        if (!DhtExpectPulse(sensor, level)) { break; }
-        level = 9;
-      }
-      if (level < 2) { break; }
-
-      dht_data[i] = data;
-    }
-  }
-  interrupts();
-  if (level < 2) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE), (0 == level) ? D_START_SIGNAL_LOW : D_START_SIGNAL_HIGH);
-    return false;
-  }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint32_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    if (Dht[sensor].h > 100) { Dht[sensor].h = 100.0; }
-    if (Dht[sensor].h < 0) { Dht[sensor].h = 0.0; }
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v4) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
-#ifdef USE_DHT
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_06_dht_v5.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  uint8_t lastresult;
-  char stype[12];
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtWaitState(uint32_t sensor, uint32_t level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (TimeReachedUsec(timeout)) {
-      PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE),
-        (level) ? D_START_SIGNAL_HIGH : D_START_SIGNAL_LOW);
-      return false;
-    }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-bool DhtRead(uint32_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(20);
-      break;
-  }
-
-  bool error = false;
-  noInterrupts();
-  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
-    for (uint32_t i = 0; i < 5; i++) {
-      int data = 0;
-      for (uint32_t j = 0; j < 8; j++) {
-        if (!DhtWaitState(sensor, 1)) {
-          error = true;
-          break;
-        }
-        delayMicroseconds(35);
-        if (digitalRead(Dht[sensor].pin)) {
-          data |= (1 << (7 - j));
-        }
-        if (!DhtWaitState(sensor, 0)) {
-          error = true;
-          break;
-        }
-      }
-      if (error) { break; }
-      dht_data[i] = data;
-    }
-  } else {
-    error = true;
-  }
-  interrupts();
-  if (error) { return false; }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  float temperature = NAN;
-  float humidity = NAN;
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      humidity = dht_data[0];
-      temperature = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      humidity = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      temperature = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        temperature *= -1;
-      }
-      break;
-  }
-  if (isnan(temperature) || isnan(humidity)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
-    return false;
-  }
-
-  if (humidity > 100) { humidity = 100.0; }
-  if (humidity < 0) { humidity = 0.1; }
-  Dht[sensor].h = ConvertHumidity(humidity);
-  Dht[sensor].t = ConvertTemp(temperature);
-  Dht[sensor].lastresult = 0;
-
-  return true;
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastresult = DHT_MAX_RETRY;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v5) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-    for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
-
-      if (!DhtRead(sensor)) {
-        Dht[sensor].lastresult++;
-        if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-          Dht[sensor].t = NAN;
-          Dht[sensor].h = NAN;
-        }
-      }
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
-#ifdef USE_I2C
-#ifdef USE_SHT
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_07_sht1x.ino"
-#define XSNS_07 7
-#define XI2C_08 8
-
-enum {
-  SHT1X_CMD_MEASURE_TEMP = B00000011,
-  SHT1X_CMD_MEASURE_RH = B00000101,
-  SHT1X_CMD_SOFT_RESET = B00011110
-};
-
-uint8_t sht_sda_pin;
-uint8_t sht_scl_pin;
-uint8_t sht_type = 0;
-char sht_types[] = "SHT1X";
-uint8_t sht_valid = 0;
-float sht_temperature = 0;
-float sht_humidity = 0;
-
-bool ShtReset(void)
-{
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-  pinMode(sht_scl_pin, OUTPUT);
-  delay(11);
-  for (uint32_t i = 0; i < 9; i++) {
-    digitalWrite(sht_scl_pin, HIGH);
-    digitalWrite(sht_scl_pin, LOW);
-  }
-  bool success = ShtSendCommand(SHT1X_CMD_SOFT_RESET);
-  delay(11);
-  return success;
-}
-
-bool ShtSendCommand(const uint8_t cmd)
-{
-  pinMode(sht_sda_pin, OUTPUT);
-
-  digitalWrite(sht_sda_pin, HIGH);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_sda_pin, LOW);
-  digitalWrite(sht_scl_pin, LOW);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_sda_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-
-  shiftOut(sht_sda_pin, sht_scl_pin, MSBFIRST, cmd);
-
-  bool ackerror = false;
-  digitalWrite(sht_scl_pin, HIGH);
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-  if (digitalRead(sht_sda_pin) != LOW) {
-    ackerror = true;
-  }
-  digitalWrite(sht_scl_pin, LOW);
-  delayMicroseconds(1);
-  if (digitalRead(sht_sda_pin) != HIGH) {
-    ackerror = true;
-  }
-  if (ackerror) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_DID_NOT_ACK_COMMAND));
-  }
-  return (!ackerror);
-}
-
-bool ShtAwaitResult(void)
-{
-
-  for (uint32_t i = 0; i < 16; i++) {
-    if (LOW == digitalRead(sht_sda_pin)) {
-      return true;
-    }
-    delay(20);
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_BUSY));
-
-  return false;
-}
-
-int ShtReadData(void)
-{
-  int val = 0;
-
-
-  val = shiftIn(sht_sda_pin, sht_scl_pin, 8);
-  val <<= 8;
-
-  pinMode(sht_sda_pin, OUTPUT);
-  digitalWrite(sht_sda_pin, LOW);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-
-  val |= shiftIn(sht_sda_pin, sht_scl_pin, 8);
-
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-  return val;
-}
-
-bool ShtRead(void)
-{
-  if (sht_valid) { sht_valid--; }
-  if (!ShtReset()) { return false; }
-  if (!ShtSendCommand(SHT1X_CMD_MEASURE_TEMP)) { return false; }
-  if (!ShtAwaitResult()) { return false; }
-  float tempRaw = ShtReadData();
-  if (!ShtSendCommand(SHT1X_CMD_MEASURE_RH)) { return false; }
-  if (!ShtAwaitResult()) { return false; }
-  float humRaw = ShtReadData();
-
-
-  const float d1 = -39.7;
-  const float d2 = 0.01;
-  sht_temperature = d1 + (tempRaw * d2);
-  const float c1 = -2.0468;
-  const float c2 = 0.0367;
-  const float c3 = -1.5955E-6;
-  const float t1 = 0.01;
-  const float t2 = 0.00008;
-  float rhLinear = c1 + c2 * humRaw + c3 * humRaw * humRaw;
-  sht_humidity = (sht_temperature - 25) * (t1 + t2 * humRaw) + rhLinear;
-  sht_temperature = ConvertTemp(sht_temperature);
-  ConvertHumidity(sht_humidity);
-
-  sht_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void ShtDetect(void)
-{
-  sht_sda_pin = pin[GPIO_I2C_SDA];
-  sht_scl_pin = pin[GPIO_I2C_SCL];
-  if (ShtRead()) {
-    sht_type = 1;
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C D_SHT1X_FOUND));
-  } else {
-    Wire.begin(sht_sda_pin, sht_scl_pin);
-    sht_type = 0;
-  }
-}
-
-void ShtEverySecond(void)
-{
-  if (!(uptime %4)) {
-
-    if (!ShtRead()) {
-      AddLogMissed(sht_types, sht_valid);
-    }
-  }
-}
-
-void ShtShow(bool json)
-{
-  if (sht_valid) {
-    char temperature[33];
-    dtostrfd(sht_temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(sht_humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, sht_types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, sht_temperature);
-        KnxSensor(KNX_HUMIDITY, sht_humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, sht_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, sht_types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_08)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    ShtDetect();
-  }
-  else if (sht_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        ShtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        ShtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        ShtShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
-#ifdef USE_I2C
-#ifdef USE_HTU
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_08_htu21.ino"
-#define XSNS_08 8
-#define XI2C_09 9
-
-#define HTU21_ADDR 0x40
-
-#define SI7013_CHIPID 0x0D
-#define SI7020_CHIPID 0x14
-#define SI7021_CHIPID 0x15
-#define HTU21_CHIPID 0x32
-
-#define HTU21_READTEMP 0xE3
-#define HTU21_READHUM 0xE5
-#define HTU21_WRITEREG 0xE6
-#define HTU21_READREG 0xE7
-#define HTU21_RESET 0xFE
-#define HTU21_HEATER_WRITE 0x51
-#define HTU21_HEATER_READ 0x11
-#define HTU21_SERIAL2_READ1 0xFC
-#define HTU21_SERIAL2_READ2 0xC9
-
-#define HTU21_HEATER_ON 0x04
-#define HTU21_HEATER_OFF 0xFB
-
-#define HTU21_RES_RH12_T14 0x00
-#define HTU21_RES_RH8_T12 0x01
-#define HTU21_RES_RH10_T13 0x80
-#define HTU21_RES_RH11_T11 0x81
-
-#define HTU21_CRC8_POLYNOM 0x13100
-
-const char kHtuTypes[] PROGMEM = "HTU21|SI7013|SI7020|SI7021|T/RH?";
-
-uint8_t htu_address;
-uint8_t htu_type = 0;
-uint8_t htu_delay_temp;
-uint8_t htu_delay_humidity = 50;
-uint8_t htu_valid = 0;
-float htu_temperature = 0;
-float htu_humidity = 0;
-char htu_types[7];
-
-uint8_t HtuCheckCrc8(uint16_t data)
-{
-  for (uint32_t bit = 0; bit < 16; bit++) {
-    if (data & 0x8000) {
-      data = (data << 1) ^ HTU21_CRC8_POLYNOM;
-    } else {
-      data <<= 1;
-    }
-  }
-  return data >>= 8;
-}
-
-uint8_t HtuReadDeviceId(void)
-{
-  uint16_t deviceID = 0;
-  uint8_t checksum = 0;
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_SERIAL2_READ1);
-  Wire.write(HTU21_SERIAL2_READ2);
-  Wire.endTransmission();
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  deviceID = Wire.read() << 8;
-  deviceID |= Wire.read();
-  checksum = Wire.read();
-  if (HtuCheckCrc8(deviceID) == checksum) {
-    deviceID = deviceID >> 8;
-  } else {
-    deviceID = 0;
-  }
-  return (uint8_t)deviceID;
-}
-
-void HtuSetResolution(uint8_t resolution)
-{
-  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
-  current &= 0x7E;
-  current |= resolution;
-  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
-}
-
-void HtuReset(void)
-{
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_RESET);
-  Wire.endTransmission();
-  delay(15);
-}
-
-void HtuHeater(uint8_t heater)
-{
-  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
-
-  switch(heater)
-  {
-    case HTU21_HEATER_ON : current |= heater;
-                            break;
-    case HTU21_HEATER_OFF : current &= heater;
-                            break;
-    default : current &= heater;
-                            break;
-  }
-  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
-}
-
-void HtuInit(void)
-{
-  HtuReset();
-  HtuHeater(HTU21_HEATER_OFF);
-  HtuSetResolution(HTU21_RES_RH12_T14);
-}
-
-bool HtuRead(void)
-{
-  uint8_t checksum = 0;
-  uint16_t sensorval = 0;
-
-  if (htu_valid) { htu_valid--; }
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_READTEMP);
-  if (Wire.endTransmission() != 0) { return false; }
-  delay(htu_delay_temp);
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  if (3 == Wire.available()) {
-    sensorval = Wire.read() << 8;
-    sensorval |= Wire.read();
-    checksum = Wire.read();
-  }
-  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
-
-  htu_temperature = ConvertTemp(0.002681 * (float)sensorval - 46.85);
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_READHUM);
-  if (Wire.endTransmission() != 0) { return false; }
-  delay(htu_delay_humidity);
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  if (3 <= Wire.available()) {
-    sensorval = Wire.read() << 8;
-    sensorval |= Wire.read();
-    checksum = Wire.read();
-  }
-  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
-
-  sensorval ^= 0x02;
-  htu_humidity = 0.001907 * (float)sensorval - 6;
-  if (htu_humidity > 100) { htu_humidity = 100.0; }
-  if (htu_humidity < 0) { htu_humidity = 0.01; }
-
-  if ((0.00 == htu_humidity) && (0.00 == htu_temperature)) {
-    htu_humidity = 0.0;
-  }
-  if ((htu_temperature > 0.00) && (htu_temperature < 80.00)) {
-    htu_humidity = (-0.15) * (25 - htu_temperature) + htu_humidity;
-  }
-  ConvertHumidity(htu_humidity);
-
-  htu_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void HtuDetect(void)
-{
-  htu_address = HTU21_ADDR;
-  if (I2cActive(htu_address)) { return; }
-
-  htu_type = HtuReadDeviceId();
-  if (htu_type) {
-    uint8_t index = 0;
-    HtuInit();
-    switch (htu_type) {
-      case HTU21_CHIPID:
-        htu_delay_temp = 50;
-        htu_delay_humidity = 16;
-        break;
-      case SI7021_CHIPID:
-        index++;
-      case SI7020_CHIPID:
-        index++;
-      case SI7013_CHIPID:
-        index++;
-        htu_delay_temp = 12;
-        htu_delay_humidity = 23;
-        break;
-      default:
-        index = 4;
-        htu_delay_temp = 50;
-        htu_delay_humidity = 23;
-    }
-    GetTextIndexed(htu_types, sizeof(htu_types), index, kHtuTypes);
-    I2cSetActiveFound(htu_address, htu_types);
-  }
-}
-
-void HtuEverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!HtuRead()) {
-      AddLogMissed(htu_types, htu_valid);
-    }
-  }
-}
-
-void HtuShow(bool json)
-{
-  if (htu_valid) {
-    char temperature[33];
-    dtostrfd(htu_temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(htu_humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, htu_types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, htu_temperature);
-        KnxSensor(KNX_HUMIDITY, htu_humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, htu_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, htu_types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns08(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_09)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    HtuDetect();
-  }
-  else if (htu_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        HtuEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        HtuShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HtuShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
-#ifdef USE_I2C
-#ifdef USE_BMP
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_09_bmp.ino"
-#define XSNS_09 9
-#define XI2C_10 10
-
-#define BMP_ADDR1 0x76
-#define BMP_ADDR2 0x77
-
-#define BMP180_CHIPID 0x55
-#define BMP280_CHIPID 0x58
-#define BME280_CHIPID 0x60
-#define BME680_CHIPID 0x61
-
-#define BMP_REGISTER_CHIPID 0xD0
-
-#define BMP_REGISTER_RESET 0xE0
-
-#define BMP_CMND_RESET 0xB6
-
-#define BMP_MAX_SENSORS 2
-
-const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
-
-typedef struct {
-  uint8_t bmp_address;
-  char bmp_name[7];
-  uint8_t bmp_type;
-  uint8_t bmp_model;
-#ifdef USE_BME680
-  uint8_t bme680_state;
-  float bmp_gas_resistance;
-#endif
-  float bmp_temperature;
-  float bmp_pressure;
-  float bmp_humidity;
-} bmp_sensors_t;
-
-uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 };
-uint8_t bmp_count = 0;
-uint8_t bmp_once = 1;
-
-bmp_sensors_t *bmp_sensors = nullptr;
-
-
-
-
-
-#define BMP180_REG_CONTROL 0xF4
-#define BMP180_REG_RESULT 0xF6
-#define BMP180_TEMPERATURE 0x2E
-#define BMP180_PRESSURE3 0xF4
-
-#define BMP180_AC1 0xAA
-#define BMP180_AC2 0xAC
-#define BMP180_AC3 0xAE
-#define BMP180_AC4 0xB0
-#define BMP180_AC5 0xB2
-#define BMP180_AC6 0xB4
-#define BMP180_VB1 0xB6
-#define BMP180_VB2 0xB8
-#define BMP180_MB 0xBA
-#define BMP180_MC 0xBC
-#define BMP180_MD 0xBE
-
-#define BMP180_OSS 3
-
-typedef struct {
-  int16_t cal_ac1;
-  int16_t cal_ac2;
-  int16_t cal_ac3;
-  int16_t cal_b1;
-  int16_t cal_b2;
-  int16_t cal_mc;
-  int16_t cal_md;
-  uint16_t cal_ac4;
-  uint16_t cal_ac5;
-  uint16_t cal_ac6;
-} bmp180_cal_data_t;
-
-bmp180_cal_data_t *bmp180_cal_data = nullptr;
-
-bool Bmp180Calibration(uint8_t bmp_idx)
-{
-  if (!bmp180_cal_data) {
-    bmp180_cal_data = (bmp180_cal_data_t*)malloc(BMP_MAX_SENSORS * sizeof(bmp180_cal_data_t));
-  }
-  if (!bmp180_cal_data) { return false; }
-
-  bmp180_cal_data[bmp_idx].cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
-  bmp180_cal_data[bmp_idx].cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
-  bmp180_cal_data[bmp_idx].cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
-  bmp180_cal_data[bmp_idx].cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
-  bmp180_cal_data[bmp_idx].cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
-  bmp180_cal_data[bmp_idx].cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
-  bmp180_cal_data[bmp_idx].cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
-  bmp180_cal_data[bmp_idx].cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
-  bmp180_cal_data[bmp_idx].cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
-  bmp180_cal_data[bmp_idx].cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
-
-
-  if (!bmp180_cal_data[bmp_idx].cal_ac1 |
-      !bmp180_cal_data[bmp_idx].cal_ac2 |
-      !bmp180_cal_data[bmp_idx].cal_ac3 |
-      !bmp180_cal_data[bmp_idx].cal_ac4 |
-      !bmp180_cal_data[bmp_idx].cal_ac5 |
-      !bmp180_cal_data[bmp_idx].cal_ac6 |
-      !bmp180_cal_data[bmp_idx].cal_b1 |
-      !bmp180_cal_data[bmp_idx].cal_b2 |
-      !bmp180_cal_data[bmp_idx].cal_mc |
-      !bmp180_cal_data[bmp_idx].cal_md) {
-    return false;
-  }
-
-  if ((bmp180_cal_data[bmp_idx].cal_ac1 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac2 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac3 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac4 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac5 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac6 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_b1 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_b2 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_mc == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_md == (int16_t)0xFFFF)) {
-    return false;
-  }
-  return true;
-}
-
-void Bmp180Read(uint8_t bmp_idx)
-{
-  if (!bmp180_cal_data) { return; }
-
-  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_TEMPERATURE);
-  delay(5);
-  int ut = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
-  int32_t xt1 = (ut - (int32_t)bmp180_cal_data[bmp_idx].cal_ac6) * ((int32_t)bmp180_cal_data[bmp_idx].cal_ac5) >> 15;
-  int32_t xt2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_mc << 11) / (xt1 + (int32_t)bmp180_cal_data[bmp_idx].cal_md);
-  int32_t bmp180_b5 = xt1 + xt2;
-  bmp_sensors[bmp_idx].bmp_temperature = ((bmp180_b5 + 8) >> 4) / 10.0;
-
-  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_PRESSURE3);
-  delay(2 + (4 << BMP180_OSS));
-  uint32_t up = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
-  up >>= (8 - BMP180_OSS);
-
-  int32_t b6 = bmp180_b5 - 4000;
-  int32_t x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b2 * ((b6 * b6) >> 12)) >> 11;
-  int32_t x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac2 * b6) >> 11;
-  int32_t x3 = x1 + x2;
-  int32_t b3 = ((((int32_t)bmp180_cal_data[bmp_idx].cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
-
-  x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac3 * b6) >> 13;
-  x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b1 * ((b6 * b6) >> 12)) >> 16;
-  x3 = ((x1 + x2) + 2) >> 2;
-  uint32_t b4 = ((uint32_t)bmp180_cal_data[bmp_idx].cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
-  uint32_t b7 = ((uint32_t)up - b3) * (uint32_t)(50000UL >> BMP180_OSS);
-
-  int32_t p;
-  if (b7 < 0x80000000) {
-    p = (b7 * 2) / b4;
-  }
-  else {
-    p = (b7 / b4) * 2;
-  }
-  x1 = (p >> 8) * (p >> 8);
-  x1 = (x1 * 3038) >> 16;
-  x2 = (-7357 * p) >> 16;
-  p += ((x1 + x2 + (int32_t)3791) >> 4);
-  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 100.0;
-}
-
-
-
-
-
-
-
-#define BME280_REGISTER_CONTROLHUMID 0xF2
-#define BME280_REGISTER_CONTROL 0xF4
-#define BME280_REGISTER_CONFIG 0xF5
-#define BME280_REGISTER_PRESSUREDATA 0xF7
-#define BME280_REGISTER_TEMPDATA 0xFA
-#define BME280_REGISTER_HUMIDDATA 0xFD
-
-#define BME280_REGISTER_DIG_T1 0x88
-#define BME280_REGISTER_DIG_T2 0x8A
-#define BME280_REGISTER_DIG_T3 0x8C
-#define BME280_REGISTER_DIG_P1 0x8E
-#define BME280_REGISTER_DIG_P2 0x90
-#define BME280_REGISTER_DIG_P3 0x92
-#define BME280_REGISTER_DIG_P4 0x94
-#define BME280_REGISTER_DIG_P5 0x96
-#define BME280_REGISTER_DIG_P6 0x98
-#define BME280_REGISTER_DIG_P7 0x9A
-#define BME280_REGISTER_DIG_P8 0x9C
-#define BME280_REGISTER_DIG_P9 0x9E
-#define BME280_REGISTER_DIG_H1 0xA1
-#define BME280_REGISTER_DIG_H2 0xE1
-#define BME280_REGISTER_DIG_H3 0xE3
-#define BME280_REGISTER_DIG_H4 0xE4
-#define BME280_REGISTER_DIG_H5 0xE5
-#define BME280_REGISTER_DIG_H6 0xE7
-
-typedef struct {
-  uint16_t dig_T1;
-  int16_t dig_T2;
-  int16_t dig_T3;
-  uint16_t dig_P1;
-  int16_t dig_P2;
-  int16_t dig_P3;
-  int16_t dig_P4;
-  int16_t dig_P5;
-  int16_t dig_P6;
-  int16_t dig_P7;
-  int16_t dig_P8;
-  int16_t dig_P9;
-  int16_t dig_H2;
-  int16_t dig_H4;
-  int16_t dig_H5;
-  uint8_t dig_H1;
-  uint8_t dig_H3;
-  int8_t dig_H6;
-} Bme280CalibrationData_t;
-
-Bme280CalibrationData_t *Bme280CalibrationData = nullptr;
-
-bool Bmx280Calibrate(uint8_t bmp_idx)
-{
-
-
-  if (!Bme280CalibrationData) {
-    Bme280CalibrationData = (Bme280CalibrationData_t*)malloc(BMP_MAX_SENSORS * sizeof(Bme280CalibrationData_t));
-  }
-  if (!Bme280CalibrationData) { return false; }
-
-  Bme280CalibrationData[bmp_idx].dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
-  Bme280CalibrationData[bmp_idx].dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
-  Bme280CalibrationData[bmp_idx].dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
-  Bme280CalibrationData[bmp_idx].dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
-  Bme280CalibrationData[bmp_idx].dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
-  Bme280CalibrationData[bmp_idx].dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
-  Bme280CalibrationData[bmp_idx].dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
-  Bme280CalibrationData[bmp_idx].dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
-  Bme280CalibrationData[bmp_idx].dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
-  Bme280CalibrationData[bmp_idx].dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
-  Bme280CalibrationData[bmp_idx].dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
-  Bme280CalibrationData[bmp_idx].dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
-  if (BME280_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
-    Bme280CalibrationData[bmp_idx].dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
-    Bme280CalibrationData[bmp_idx].dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
-    Bme280CalibrationData[bmp_idx].dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
-    Bme280CalibrationData[bmp_idx].dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
-    Bme280CalibrationData[bmp_idx].dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
-    Bme280CalibrationData[bmp_idx].dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x00);
-
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROLHUMID, 0x01);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONFIG, 0xA0);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x27);
-  } else {
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0xB7);
-  }
-
-  return true;
-}
-
-void Bme280Read(uint8_t bmp_idx)
-{
-  if (!Bme280CalibrationData) { return; }
-
-  int32_t adc_T = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_TEMPDATA);
-  adc_T >>= 4;
-
-  int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1 << 1))) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_T2)) >> 11;
-  int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1))) >> 12) *
-    ((int32_t)Bme280CalibrationData[bmp_idx].dig_T3)) >> 14;
-  int32_t t_fine = vart1 + vart2;
-  float T = (t_fine * 5 + 128) >> 8;
-  bmp_sensors[bmp_idx].bmp_temperature = T / 100.0;
-
-  int32_t adc_P = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_PRESSUREDATA);
-  adc_P >>= 4;
-
-  int64_t var1 = ((int64_t)t_fine) - 128000;
-  int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P6;
-  var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P5) << 17);
-  var2 = var2 + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P4) << 35);
-  var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P2) << 12);
-  var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData[bmp_idx].dig_P1) >> 33;
-  if (0 == var1) {
-    return;
-  }
-  int64_t p = 1048576 - adc_P;
-  p = (((p << 31) - var2) * 3125) / var1;
-  var1 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P9) * (p >> 13) * (p >> 13)) >> 25;
-  var2 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P8) * p) >> 19;
-  p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P7) << 4);
-  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 25600.0;
-
-  if (BMP280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { return; }
-
-  int32_t adc_H = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_HUMIDDATA);
-
-  int32_t v_x1_u32r = (t_fine - ((int32_t)76800));
-  v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData[bmp_idx].dig_H4) << 20) -
-    (((int32_t)Bme280CalibrationData[bmp_idx].dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
-    (((((((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H6)) >> 10) *
-    (((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
-    ((int32_t)2097152)) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H2) + 8192) >> 14));
-  v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) *
-    ((int32_t)Bme280CalibrationData[bmp_idx].dig_H1)) >> 4));
-  v_x1_u32r = (v_x1_u32r < 0) ? 0 : v_x1_u32r;
-  v_x1_u32r = (v_x1_u32r > 419430400) ? 419430400 : v_x1_u32r;
-  float h = (v_x1_u32r >> 12);
-  bmp_sensors[bmp_idx].bmp_humidity = h / 1024.0;
-}
-
-#ifdef USE_BME680
-
-
-
-
-#include <bme680.h>
-
-struct bme680_dev *gas_sensor = nullptr;
-
-static void BmeDelayMs(uint32_t ms)
-{
-  delay(ms);
-}
-
-bool Bme680Init(uint8_t bmp_idx)
-{
-  if (!gas_sensor) {
-    gas_sensor = (bme680_dev*)malloc(BMP_MAX_SENSORS * sizeof(bme680_dev));
-  }
-  if (!gas_sensor) { return false; }
-
-  gas_sensor[bmp_idx].dev_id = bmp_sensors[bmp_idx].bmp_address;
-  gas_sensor[bmp_idx].intf = BME680_I2C_INTF;
-  gas_sensor[bmp_idx].read = &I2cReadBuffer;
-  gas_sensor[bmp_idx].write = &I2cWriteBuffer;
-  gas_sensor[bmp_idx].delay_ms = BmeDelayMs;
-
-
-
-  gas_sensor[bmp_idx].amb_temp = 25;
-
-  int8_t rslt = BME680_OK;
-  rslt = bme680_init(&gas_sensor[bmp_idx]);
-  if (rslt != BME680_OK) { return false; }
-
-
-  gas_sensor[bmp_idx].tph_sett.os_hum = BME680_OS_2X;
-  gas_sensor[bmp_idx].tph_sett.os_pres = BME680_OS_4X;
-  gas_sensor[bmp_idx].tph_sett.os_temp = BME680_OS_8X;
-  gas_sensor[bmp_idx].tph_sett.filter = BME680_FILTER_SIZE_3;
-
-
-  gas_sensor[bmp_idx].gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
-
-  gas_sensor[bmp_idx].gas_sett.heatr_temp = 320;
-  gas_sensor[bmp_idx].gas_sett.heatr_dur = 150;
-
-
-
-  gas_sensor[bmp_idx].power_mode = BME680_FORCED_MODE;
-
-
-  uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
-
-
-  rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor[bmp_idx]);
-  if (rslt != BME680_OK) { return false; }
-
-  bmp_sensors[bmp_idx].bme680_state = 0;
-
-  return true;
-}
-
-void Bme680Read(uint8_t bmp_idx)
-{
-  if (!gas_sensor) { return; }
-
-  int8_t rslt = BME680_OK;
-
-  if (BME680_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
-    if (0 == bmp_sensors[bmp_idx].bme680_state) {
-
-      rslt = bme680_set_sensor_mode(&gas_sensor[bmp_idx]);
-      if (rslt != BME680_OK) { return; }
-
-
-
-
-
-
-
-      bmp_sensors[bmp_idx].bme680_state = 1;
-    } else {
-      bmp_sensors[bmp_idx].bme680_state = 0;
-
-      struct bme680_field_data data;
-      rslt = bme680_get_sensor_data(&data, &gas_sensor[bmp_idx]);
-      if (rslt != BME680_OK) { return; }
-
-      bmp_sensors[bmp_idx].bmp_temperature = data.temperature / 100.0;
-      bmp_sensors[bmp_idx].bmp_humidity = data.humidity / 1000.0;
-      bmp_sensors[bmp_idx].bmp_pressure = data.pressure / 100.0;
-
-      if (data.status & BME680_GASM_VALID_MSK) {
-        bmp_sensors[bmp_idx].bmp_gas_resistance = data.gas_resistance / 1000.0;
-      } else {
-        bmp_sensors[bmp_idx].bmp_gas_resistance = 0;
-      }
-    }
-  }
-  return;
-}
-
-#endif
-
-
-
-void BmpDetect(void)
-{
-  int bmp_sensor_size = BMP_MAX_SENSORS * sizeof(bmp_sensors_t);
-  if (!bmp_sensors) {
-    bmp_sensors = (bmp_sensors_t*)malloc(bmp_sensor_size);
-  }
-  if (!bmp_sensors) { return; }
-  memset(bmp_sensors, 0, bmp_sensor_size);
-
-  for (uint32_t i = 0; i < BMP_MAX_SENSORS; i++) {
-    if (I2cActive(bmp_addresses[i])) { continue; }
-    uint8_t bmp_type = I2cRead8(bmp_addresses[i], BMP_REGISTER_CHIPID);
-    if (bmp_type) {
-      bmp_sensors[bmp_count].bmp_address = bmp_addresses[i];
-      bmp_sensors[bmp_count].bmp_type = bmp_type;
-      bmp_sensors[bmp_count].bmp_model = 0;
-
-      bool success = false;
-      switch (bmp_type) {
-        case BMP180_CHIPID:
-          success = Bmp180Calibration(bmp_count);
-          break;
-        case BME280_CHIPID:
-          bmp_sensors[bmp_count].bmp_model++;
-        case BMP280_CHIPID:
-          bmp_sensors[bmp_count].bmp_model++;
-          success = Bmx280Calibrate(bmp_count);
-          break;
-#ifdef USE_BME680
-        case BME680_CHIPID:
-          bmp_sensors[bmp_count].bmp_model = 3;
-          success = Bme680Init(bmp_count);
-          break;
-#endif
-      }
-      if (success) {
-        GetTextIndexed(bmp_sensors[bmp_count].bmp_name, sizeof(bmp_sensors[bmp_count].bmp_name), bmp_sensors[bmp_count].bmp_model, kBmpTypes);
-        I2cSetActiveFound(bmp_sensors[bmp_count].bmp_address, bmp_sensors[bmp_count].bmp_name);
-        bmp_count++;
-      }
-    }
-  }
-}
-
-void BmpRead(void)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    switch (bmp_sensors[bmp_idx].bmp_type) {
-      case BMP180_CHIPID:
-        Bmp180Read(bmp_idx);
-        break;
-      case BMP280_CHIPID:
-      case BME280_CHIPID:
-        Bme280Read(bmp_idx);
-        break;
-#ifdef USE_BME680
-      case BME680_CHIPID:
-        Bme680Read(bmp_idx);
-        break;
-#endif
-    }
-  }
-  ConvertTemp(bmp_sensors[0].bmp_temperature);
-  ConvertHumidity(bmp_sensors[0].bmp_humidity);
-}
-
-void BmpShow(bool json)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    if (bmp_sensors[bmp_idx].bmp_type) {
-      float bmp_sealevel = 0.0;
-      if (bmp_sensors[bmp_idx].bmp_pressure != 0.0) {
-        bmp_sealevel = (bmp_sensors[bmp_idx].bmp_pressure / FastPrecisePow(1.0 - ((float)Settings.altitude / 44330.0), 5.255)) - 21.6;
-        bmp_sealevel = ConvertPressure(bmp_sealevel);
-      }
-      float bmp_temperature = ConvertTemp(bmp_sensors[bmp_idx].bmp_temperature);
-      float bmp_pressure = ConvertPressure(bmp_sensors[bmp_idx].bmp_pressure);
-
-      char name[10];
-      strlcpy(name, bmp_sensors[bmp_idx].bmp_name, sizeof(name));
-      if (bmp_count > 1) {
-        snprintf_P(name, sizeof(name), PSTR("%s%c%02X"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_address);
-      }
-
-      char temperature[33];
-      dtostrfd(bmp_temperature, Settings.flag2.temperature_resolution, temperature);
-      char pressure[33];
-      dtostrfd(bmp_pressure, Settings.flag2.pressure_resolution, pressure);
-      char sea_pressure[33];
-      dtostrfd(bmp_sealevel, Settings.flag2.pressure_resolution, sea_pressure);
-      char humidity[33];
-      dtostrfd(bmp_sensors[bmp_idx].bmp_humidity, Settings.flag2.humidity_resolution, humidity);
-#ifdef USE_BME680
-      char gas_resistance[33];
-      dtostrfd(bmp_sensors[bmp_idx].bmp_gas_resistance, 2, gas_resistance);
-#endif
-
-      if (json) {
-        char json_humidity[40];
-        snprintf_P(json_humidity, sizeof(json_humidity), PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-        char json_sealevel[40];
-        snprintf_P(json_sealevel, sizeof(json_sealevel), PSTR(",\"" D_JSON_PRESSUREATSEALEVEL "\":%s"), sea_pressure);
-#ifdef USE_BME680
-        char json_gas[40];
-        snprintf_P(json_gas, sizeof(json_gas), PSTR(",\"" D_JSON_GAS "\":%s"), gas_resistance);
-
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s%s}"),
-          name,
-          temperature,
-          (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "",
-          pressure,
-          (Settings.altitude != 0) ? json_sealevel : "",
-          (bmp_sensors[bmp_idx].bmp_model >= 3) ? json_gas : "");
-#else
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s}"),
-          name, temperature, (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : "");
-#endif
-
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == bmp_idx)) {
-          DomoticzTempHumPressureSensor(temperature, humidity, pressure);
-#ifdef USE_BME680
-          if (bmp_sensors[bmp_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp_sensors[bmp_idx].bmp_gas_resistance); }
-#endif
-        }
-#endif
-
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, bmp_temperature);
-          KnxSensor(KNX_HUMIDITY, bmp_sensors[bmp_idx].bmp_humidity);
-        }
-#endif
-
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, name, temperature, TempUnit());
-        if (bmp_sensors[bmp_idx].bmp_model >= 2) {
-          WSContentSend_PD(HTTP_SNS_HUM, name, humidity);
-        }
-        WSContentSend_PD(HTTP_SNS_PRESSURE, name, pressure, PressureUnit().c_str());
-        if (Settings.altitude != 0) {
-          WSContentSend_PD(HTTP_SNS_SEAPRESSURE, name, sea_pressure, PressureUnit().c_str());
-        }
-#ifdef USE_BME680
-        if (bmp_sensors[bmp_idx].bmp_model >= 3) {
-          WSContentSend_PD(PSTR("{s}%s " D_GAS "{m}%s " D_UNIT_KILOOHM "{e}"), name, gas_resistance);
-        }
-#endif
-
-#endif
-      }
-    }
-  }
-}
-
-#ifdef USE_DEEPSLEEP
-
-void BMP_EnterSleep(void)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    switch (bmp_sensors[bmp_idx].bmp_type) {
-      case BMP180_CHIPID:
-      case BMP280_CHIPID:
-      case BME280_CHIPID:
-        I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP_REGISTER_RESET, BMP_CMND_RESET);
-        break;
-      default:
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xsns09(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_10)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    BmpDetect();
-  }
-  else if (bmp_count) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        BmpRead();
-        break;
-      case FUNC_JSON_APPEND:
-        BmpShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        BmpShow(0);
-        break;
-#endif
-#ifdef USE_DEEPSLEEP
-      case FUNC_SAVE_BEFORE_RESTART:
-        BMP_EnterSleep();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_10_bh1750.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_10_bh1750.ino"
-#ifdef USE_I2C
-#ifdef USE_BH1750
-
-
-
-
-
-
-#define XSNS_10 10
-#define XI2C_11 11
-
-#define BH1750_ADDR1 0x23
-#define BH1750_ADDR2 0x5C
-
-#define BH1750_CONTINUOUS_HIGH_RES_MODE 0x10
-
-uint8_t bh1750_address;
-uint8_t bh1750_addresses[] = { BH1750_ADDR1, BH1750_ADDR2 };
-uint8_t bh1750_type = 0;
-uint8_t bh1750_valid = 0;
-uint16_t bh1750_illuminance = 0;
-char bh1750_types[] = "BH1750";
-
-bool Bh1750Read(void)
-{
-  if (bh1750_valid) { bh1750_valid--; }
-
-  if (2 != Wire.requestFrom(bh1750_address, (uint8_t)2)) { return false; }
-  uint8_t msb = Wire.read();
-  uint8_t lsb = Wire.read();
-  bh1750_illuminance = ((msb << 8) | lsb) / 1.2;
-  bh1750_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Bh1750Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(bh1750_addresses); i++) {
-    bh1750_address = bh1750_addresses[i];
-    if (I2cActive(bh1750_address)) { continue; }
-    Wire.beginTransmission(bh1750_address);
-    Wire.write(BH1750_CONTINUOUS_HIGH_RES_MODE);
-    if (!Wire.endTransmission()) {
-      I2cSetActiveFound(bh1750_address, bh1750_types);
-      bh1750_type = 1;
-      break;
-    }
-  }
-}
-
-void Bh1750EverySecond(void)
-{
-
-  if (!Bh1750Read()) {
-    AddLogMissed(bh1750_types, bh1750_valid);
-  }
-}
-
-void Bh1750Show(bool json)
-{
-  if (bh1750_valid) {
-    if (json) {
-      ResponseAppend_P(JSON_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, bh1750_illuminance);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns10(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_11)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Bh1750Detect();
-  }
-  else if (bh1750_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Bh1750EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Bh1750Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Bh1750Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_11_veml6070.ino"
-# 89 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_11_veml6070.ino"
-#ifdef USE_I2C
-#ifdef USE_VEML6070
-
-
-
-
-
-
-#define XSNS_11 11
-#define XI2C_12 12
-
-#define VEML6070_ADDR_H 0x39
-#define VEML6070_ADDR_L 0x38
-#define VEML6070_INTEGRATION_TIME 3
-#define VEML6070_ENABLE 1
-#define VEML6070_DISABLE 0
-#define VEML6070_RSET_DEFAULT 270000
-#define VEML6070_UV_MAX_INDEX 15
-#define VEML6070_UV_MAX_DEFAULT 11
-#define VEML6070_POWER_COEFFCIENT 0.025
-#define VEML6070_TABLE_COEFFCIENT 32.86270591
-
-
-
-
-
-const char kVemlTypes[] PROGMEM = "VEML6070";
-double uv_risk_map[VEML6070_UV_MAX_INDEX] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-double uvrisk = 0;
-double uvpower = 0;
-uint16_t uvlevel = 0;
-uint8_t veml6070_addr_low = VEML6070_ADDR_L;
-uint8_t veml6070_addr_high = VEML6070_ADDR_H;
-uint8_t itime = VEML6070_INTEGRATION_TIME;
-uint8_t veml6070_type = 0;
-char veml6070_name[9];
-char str_uvrisk_text[10];
-
-
-
-void Veml6070Detect(void)
-{
-  if (I2cActive(VEML6070_ADDR_L)) { return; }
-
-
-  Wire.beginTransmission(VEML6070_ADDR_L);
-  Wire.write((itime << 2) | 0x02);
-  uint8_t status = Wire.endTransmission();
-
-  if (!status) {
-    veml6070_type = 1;
-    Veml6070UvTableInit();
-    uint8_t veml_model = 0;
-    GetTextIndexed(veml6070_name, sizeof(veml6070_name), veml_model, kVemlTypes);
-    I2cSetActiveFound(VEML6070_ADDR_L, veml6070_name);
-  }
-}
-
-
-
-void Veml6070UvTableInit(void)
-{
-
-  for (uint32_t i = 0; i < VEML6070_UV_MAX_INDEX; i++) {
-#ifdef USE_VEML6070_RSET
-    if ( (USE_VEML6070_RSET >= 220000) && (USE_VEML6070_RSET <= 1000000) ) {
-      uv_risk_map[i] = ( (USE_VEML6070_RSET / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-    } else {
-      uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor error %d"), USE_VEML6070_RSET);
-    }
-#else
-    uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor default used %d"), VEML6070_RSET_DEFAULT);
-#endif
-  }
-}
-
-
-
-void Veml6070EverySecond(void)
-{
-
-  Veml6070ModeCmd(1);
-  uvlevel = Veml6070ReadUv();
-  uvrisk = Veml6070UvRiskLevel(uvlevel);
-  uvpower = Veml6070UvPower(uvrisk);
-  Veml6070ModeCmd(0);
-}
-
-
-
-void Veml6070ModeCmd(bool mode_cmd)
-{
-
-
-  Wire.beginTransmission(VEML6070_ADDR_L);
-  Wire.write((mode_cmd << 0) | 0x02 | (itime << 2));
-  uint8_t status = Wire.endTransmission();
-
-  if (!status) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 mode_cmd"));
-  }
-}
-
-
-
-uint16_t Veml6070ReadUv(void)
-{
-  uint16_t uv_raw = 0;
-
-  if (Wire.requestFrom(VEML6070_ADDR_H, 1) != 1) {
-    return -1;
-  }
-  uv_raw = Wire.read();
-  uv_raw <<= 8;
-
-  if (Wire.requestFrom(VEML6070_ADDR_L, 1) != 1) {
-    return -1;
-  }
-  uv_raw |= Wire.read();
-
-  return uv_raw;
-}
-
-
-
-double Veml6070UvRiskLevel(uint16_t uv_level)
-{
-  double risk = 0;
-  if (uv_level < uv_risk_map[VEML6070_UV_MAX_INDEX-1]) {
-    risk = (double)uv_level / uv_risk_map[0];
-
-    if ( (risk >= 0) && (risk <= 2.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_1); }
-    else if ( (risk >= 3.0) && (risk <= 5.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_2); }
-    else if ( (risk >= 6.0) && (risk <= 7.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_3); }
-    else if ( (risk >= 8.0) && (risk <= 10.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_4); }
-    else if ( (risk >= 11.0) && (risk <= 12.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_5); }
-    else if ( (risk >= 13.0) && (risk <= 25.0) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_6); }
-    else { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7); }
-    return risk;
-  } else {
-
-    snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7);
-    return ( risk = 99 );
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 out of range %d"), risk);
-  }
-}
-
-
-
-double Veml6070UvPower(double uvrisk)
-{
-
-  double power = 0;
-  return ( power = VEML6070_POWER_COEFFCIENT * uvrisk );
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#ifdef USE_VEML6070_SHOW_RAW
-  const char HTTP_SNS_UV_LEVEL[] PROGMEM = "{s}VEML6070 " D_UV_LEVEL "{m}%s " D_UNIT_INCREMENTS "{e}";
-#endif
-
-  const char HTTP_SNS_UV_INDEX[] PROGMEM = "{s}VEML6070 " D_UV_INDEX "{m}%s %s{e}";
-  const char HTTP_SNS_UV_POWER[] PROGMEM = "{s}VEML6070 " D_UV_POWER "{m}%s " D_UNIT_WATT_METER_QUADRAT "{e}";
-#endif
-
-
-
-void Veml6070Show(bool json)
-{
-
-  char str_uvlevel[33];
-  dtostrfd((double)uvlevel, 0, str_uvlevel);
-  char str_uvrisk[33];
-  dtostrfd(uvrisk, 2, str_uvrisk);
-  char str_uvpower[33];
-  dtostrfd(uvpower, 3, str_uvpower);
-  if (json) {
-#ifdef USE_VEML6070_SHOW_RAW
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_LEVEL "\":%s,\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
-      veml6070_name, str_uvlevel, str_uvrisk, str_uvrisk_text, str_uvpower);
-#else
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
-      veml6070_name, str_uvrisk, str_uvrisk_text, str_uvpower);
-#endif
-#ifdef USE_DOMOTICZ
-  if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, uvlevel); }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-#ifdef USE_VEML6070_SHOW_RAW
-    WSContentSend_PD(HTTP_SNS_UV_LEVEL, str_uvlevel);
-#endif
-    WSContentSend_PD(HTTP_SNS_UV_INDEX, str_uvrisk, str_uvrisk_text);
-    WSContentSend_PD(HTTP_SNS_UV_POWER, str_uvpower);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns11(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_12)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Veml6070Detect();
-  }
-  else if (veml6070_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Veml6070EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Veml6070Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Veml6070Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
-#ifdef USE_I2C
-#ifdef USE_ADS1115
-# 43 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_12_ads1115.ino"
-#define XSNS_12 12
-#define XI2C_13 13
-
-#define ADS1115_ADDRESS_ADDR_GND 0x48
-#define ADS1115_ADDRESS_ADDR_VDD 0x49
-#define ADS1115_ADDRESS_ADDR_SDA 0x4A
-#define ADS1115_ADDRESS_ADDR_SCL 0x4B
-
-#define ADS1115_CONVERSIONDELAY (8)
-
-
-
-
-#define ADS1115_REG_POINTER_MASK (0x03)
-#define ADS1115_REG_POINTER_CONVERT (0x00)
-#define ADS1115_REG_POINTER_CONFIG (0x01)
-#define ADS1115_REG_POINTER_LOWTHRESH (0x02)
-#define ADS1115_REG_POINTER_HITHRESH (0x03)
-
-
-
-
-#define ADS1115_REG_CONFIG_OS_MASK (0x8000)
-#define ADS1115_REG_CONFIG_OS_SINGLE (0x8000)
-#define ADS1115_REG_CONFIG_OS_BUSY (0x0000)
-#define ADS1115_REG_CONFIG_OS_NOTBUSY (0x8000)
-
-#define ADS1115_REG_CONFIG_MUX_MASK (0x7000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_0_1 (0x0000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_0_3 (0x1000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_1_3 (0x2000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_2_3 (0x3000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_0 (0x4000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_1 (0x5000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_2 (0x6000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_3 (0x7000)
-
-#define ADS1115_REG_CONFIG_PGA_MASK (0x0E00)
-#define ADS1115_REG_CONFIG_PGA_6_144V (0x0000)
-#define ADS1115_REG_CONFIG_PGA_4_096V (0x0200)
-#define ADS1115_REG_CONFIG_PGA_2_048V (0x0400)
-#define ADS1115_REG_CONFIG_PGA_1_024V (0x0600)
-#define ADS1115_REG_CONFIG_PGA_0_512V (0x0800)
-#define ADS1115_REG_CONFIG_PGA_0_256V (0x0A00)
-
-#define ADS1115_REG_CONFIG_MODE_MASK (0x0100)
-#define ADS1115_REG_CONFIG_MODE_CONTIN (0x0000)
-#define ADS1115_REG_CONFIG_MODE_SINGLE (0x0100)
-
-#define ADS1115_REG_CONFIG_DR_MASK (0x00E0)
-#define ADS1115_REG_CONFIG_DR_128SPS (0x0000)
-#define ADS1115_REG_CONFIG_DR_250SPS (0x0020)
-#define ADS1115_REG_CONFIG_DR_490SPS (0x0040)
-#define ADS1115_REG_CONFIG_DR_920SPS (0x0060)
-#define ADS1115_REG_CONFIG_DR_1600SPS (0x0080)
-#define ADS1115_REG_CONFIG_DR_2400SPS (0x00A0)
-#define ADS1115_REG_CONFIG_DR_3300SPS (0x00C0)
-#define ADS1115_REG_CONFIG_DR_6000SPS (0x00E0)
-
-#define ADS1115_REG_CONFIG_CMODE_MASK (0x0010)
-#define ADS1115_REG_CONFIG_CMODE_TRAD (0x0000)
-#define ADS1115_REG_CONFIG_CMODE_WINDOW (0x0010)
-
-#define ADS1115_REG_CONFIG_CPOL_MASK (0x0008)
-#define ADS1115_REG_CONFIG_CPOL_ACTVLOW (0x0000)
-#define ADS1115_REG_CONFIG_CPOL_ACTVHI (0x0008)
-
-#define ADS1115_REG_CONFIG_CLAT_MASK (0x0004)
-#define ADS1115_REG_CONFIG_CLAT_NONLAT (0x0000)
-#define ADS1115_REG_CONFIG_CLAT_LATCH (0x0004)
-
-#define ADS1115_REG_CONFIG_CQUE_MASK (0x0003)
-#define ADS1115_REG_CONFIG_CQUE_1CONV (0x0000)
-#define ADS1115_REG_CONFIG_CQUE_2CONV (0x0001)
-#define ADS1115_REG_CONFIG_CQUE_4CONV (0x0002)
-#define ADS1115_REG_CONFIG_CQUE_NONE (0x0003)
-
-struct ADS1115 {
-  uint8_t count = 0;
-  uint8_t address;
-  uint8_t addresses[4] = { ADS1115_ADDRESS_ADDR_GND, ADS1115_ADDRESS_ADDR_VDD, ADS1115_ADDRESS_ADDR_SDA, ADS1115_ADDRESS_ADDR_SCL };
-  uint8_t found[4] = {false,false,false,false};
-} Ads1115;
-
-
-
-void Ads1115StartComparator(uint8_t channel, uint16_t mode)
-{
-
-  uint16_t config = mode |
-                    ADS1115_REG_CONFIG_CQUE_NONE |
-                    ADS1115_REG_CONFIG_CLAT_NONLAT |
-                    ADS1115_REG_CONFIG_PGA_6_144V |
-                    ADS1115_REG_CONFIG_CPOL_ACTVLOW |
-                    ADS1115_REG_CONFIG_CMODE_TRAD |
-                    ADS1115_REG_CONFIG_DR_6000SPS;
-
-
-  config |= (ADS1115_REG_CONFIG_MUX_SINGLE_0 + (0x1000 * channel));
-
-
-  I2cWrite16(Ads1115.address, ADS1115_REG_POINTER_CONFIG, config);
-}
-
-int16_t Ads1115GetConversion(uint8_t channel)
-{
-  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_SINGLE);
-
-  delay(ADS1115_CONVERSIONDELAY);
-
-  I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
-
-  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_CONTIN);
-  delay(ADS1115_CONVERSIONDELAY);
-
-  uint16_t res = I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
-  return (int16_t)res;
-}
-
-
-
-void Ads1115Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(Ads1115.addresses); i++) {
-    if (!Ads1115.found[i]) {
-      Ads1115.address = Ads1115.addresses[i];
-      if (I2cActive(Ads1115.address)) { continue; }
-      uint16_t buffer;
-      if (I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONVERT) &&
-          I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONFIG)) {
-        Ads1115StartComparator(i, ADS1115_REG_CONFIG_MODE_CONTIN);
-        I2cSetActiveFound(Ads1115.address, "ADS1115");
-        Ads1115.found[i] = 1;
-        Ads1115.count++;
-      }
-    }
-  }
-}
-
-void Ads1115Show(bool json)
-{
-  int16_t values[4];
-
-  for (uint32_t t = 0; t < sizeof(Ads1115.addresses); t++) {
-
-    if (Ads1115.found[t]) {
-
-      uint8_t old_address = Ads1115.address;
-      Ads1115.address = Ads1115.addresses[t];
-      for (uint32_t i = 0; i < 4; i++) {
-        values[i] = Ads1115GetConversion(i);
-
-      }
-      Ads1115.address = old_address;
-
-      char label[15];
-      if (1 == Ads1115.count) {
-
-        snprintf_P(label, sizeof(label), PSTR("ADS1115"));
-      } else {
-
-        snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
-      }
-
-      if (json) {
-        ResponseAppend_P(PSTR(",\"%s\":{"), label);
-        for (uint32_t i = 0; i < 4; i++) {
-          ResponseAppend_P(PSTR("%s\"A%d\":%d"), (0 == i) ? "" : ",", i, values[i]);
-        }
-        ResponseJsonEnd();
-      }
-#ifdef USE_WEBSERVER
-      else {
-        for (uint32_t i = 0; i < 4; i++) {
-          WSContentSend_PD(HTTP_SNS_ANALOG, label, i, values[i]);
-        }
-      }
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns12(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_13)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Ads1115Detect();
-  }
-  else if (Ads1115.count) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        Ads1115Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ads1115Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
-#ifdef USE_I2C
-#ifdef USE_INA219
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
-#define XSNS_13 13
-#define XI2C_14 14
-
-#define INA219_ADDRESS1 (0x40)
-#define INA219_ADDRESS2 (0x41)
-#define INA219_ADDRESS3 (0x44)
-#define INA219_ADDRESS4 (0x45)
-
-#define INA219_READ (0x01)
-#define INA219_REG_CONFIG (0x00)
-
-#define INA219_CONFIG_RESET (0x8000)
-
-#define INA219_CONFIG_BVOLTAGERANGE_MASK (0x2000)
-#define INA219_CONFIG_BVOLTAGERANGE_16V (0x0000)
-#define INA219_CONFIG_BVOLTAGERANGE_32V (0x2000)
-
-#define INA219_CONFIG_GAIN_MASK (0x1800)
-#define INA219_CONFIG_GAIN_1_40MV (0x0000)
-#define INA219_CONFIG_GAIN_2_80MV (0x0800)
-#define INA219_CONFIG_GAIN_4_160MV (0x1000)
-#define INA219_CONFIG_GAIN_8_320MV (0x1800)
-
-#define INA219_CONFIG_BADCRES_MASK (0x0780)
-#define INA219_CONFIG_BADCRES_9BIT (0x0080)
-#define INA219_CONFIG_BADCRES_10BIT (0x0100)
-#define INA219_CONFIG_BADCRES_11BIT (0x0200)
-#define INA219_CONFIG_BADCRES_12BIT (0x0400)
-
-#define INA219_CONFIG_SADCRES_MASK (0x0078)
-#define INA219_CONFIG_SADCRES_9BIT_1S_84US (0x0000)
-#define INA219_CONFIG_SADCRES_10BIT_1S_148US (0x0008)
-#define INA219_CONFIG_SADCRES_11BIT_1S_276US (0x0010)
-#define INA219_CONFIG_SADCRES_12BIT_1S_532US (0x0018)
-#define INA219_CONFIG_SADCRES_12BIT_2S_1060US (0x0048)
-#define INA219_CONFIG_SADCRES_12BIT_4S_2130US (0x0050)
-#define INA219_CONFIG_SADCRES_12BIT_8S_4260US (0x0058)
-#define INA219_CONFIG_SADCRES_12BIT_16S_8510US (0x0060)
-#define INA219_CONFIG_SADCRES_12BIT_32S_17MS (0x0068)
-#define INA219_CONFIG_SADCRES_12BIT_64S_34MS (0x0070)
-#define INA219_CONFIG_SADCRES_12BIT_128S_69MS (0x0078)
-
-#define INA219_CONFIG_MODE_MASK (0x0007)
-#define INA219_CONFIG_MODE_POWERDOWN (0x0000)
-#define INA219_CONFIG_MODE_SVOLT_TRIGGERED (0x0001)
-#define INA219_CONFIG_MODE_BVOLT_TRIGGERED (0x0002)
-#define INA219_CONFIG_MODE_SANDBVOLT_TRIGGERED (0x0003)
-#define INA219_CONFIG_MODE_ADCOFF (0x0004)
-#define INA219_CONFIG_MODE_SVOLT_CONTINUOUS (0x0005)
-#define INA219_CONFIG_MODE_BVOLT_CONTINUOUS (0x0006)
-#define INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS (0x0007)
-
-#define INA219_REG_SHUNTVOLTAGE (0x01)
-#define INA219_REG_BUSVOLTAGE (0x02)
-#define INA219_REG_POWER (0x03)
-#define INA219_REG_CURRENT (0x04)
-#define INA219_REG_CALIBRATION (0x05)
-
-uint8_t ina219_type[4] = {0,0,0,0};
-uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
-
-uint32_t ina219_cal_value = 0;
-
-uint32_t ina219_current_divider_ma = 0;
-
-uint8_t ina219_valid[4] = {0,0,0,0};
-float ina219_voltage[4] = {0,0,0,0};
-float ina219_current[4] = {0,0,0,0};
-char ina219_types[] = "INA219";
-uint8_t ina219_count = 0;
-
-bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
-{
-  uint16_t config = 0;
-
-  switch (mode &3) {
-    case 0:
-    case 3:
-      ina219_cal_value = 4096;
-      ina219_current_divider_ma = 10;
-      config = INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 1:
-      ina219_cal_value = 10240;
-      ina219_current_divider_ma = 25;
-      config |= INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 2:
-      ina219_cal_value = 8192;
-      ina219_current_divider_ma = 20;
-      config |= INA219_CONFIG_BVOLTAGERANGE_16V | INA219_CONFIG_GAIN_1_40MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-  }
-
-  bool success = I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
-  if (success) {
-
-    I2cWrite16(addr, INA219_REG_CONFIG, config);
-  }
-  return success;
-}
-
-float Ina219GetShuntVoltage_mV(uint16_t addr)
-{
-
-  int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
-
-  return value * 0.01;
-}
-
-float Ina219GetBusVoltage_V(uint16_t addr)
-{
-
-
-  int16_t value = (int16_t)(((uint16_t)I2cReadS16(addr, INA219_REG_BUSVOLTAGE) >> 3) * 4);
-
-  return value * 0.001;
-}
-
-float Ina219GetCurrent_mA(uint16_t addr)
-{
-
-
-
-  I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
-
-
-  float value = I2cReadS16(addr, INA219_REG_CURRENT);
-  value /= ina219_current_divider_ma;
-
-  return value;
-}
-
-bool Ina219Read(void)
-{
-  for (int i=0; i<sizeof(ina219_type); i++) {
-    if (!ina219_type[i]) { continue; }
-    uint16_t addr = ina219_addresses[i];
-    ina219_voltage[i] = Ina219GetBusVoltage_V(addr) + (Ina219GetShuntVoltage_mV(addr) / 1000);
-    ina219_current[i] = Ina219GetCurrent_mA(addr) / 1000;
-    ina219_valid[i] = SENSOR_MAX_MISS;
-
-  }
-  return true;
-}
-# 184 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_13_ina219.ino"
-bool Ina219CommandSensor(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    Settings.ina219_mode = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_13, Settings.ina219_mode);
-
-  return true;
-}
-
-
-
-void Ina219Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(ina219_type); i++) {
-    uint16_t addr = ina219_addresses[i];
-    if (I2cActive(addr)) { continue; }
-    if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
-      I2cSetActiveFound(addr, ina219_types);
-      ina219_type[i] = 1;
-      ina219_count++;
-    }
-  }
-}
-
-void Ina219EverySecond(void)
-{
-
-  Ina219Read();
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_INA219_DATA[] PROGMEM =
-  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
-#endif
-
-void Ina219Show(bool json)
-{
-  int num_found=0;
-  for (int i=0; i<sizeof(ina219_type); i++)
-    if (ina219_type[i] && ina219_valid[i])
-      num_found++;
-
-  int sensor_num = 0;
-  for (int i=0; i<sizeof(ina219_type); i++) {
-    if (!ina219_type[i] || !ina219_valid[i])
-      continue;
-    sensor_num++;
-
-    char voltage[16];
-    dtostrfd(ina219_voltage[i], Settings.flag2.voltage_resolution, voltage);
-    char current[16];
-    dtostrfd(ina219_current[i], Settings.flag2.current_resolution, current);
-    char power[16];
-    dtostrfd(ina219_voltage[i] * ina219_current[i], Settings.flag2.wattage_resolution, power);
-    char name[16];
-    if (num_found>1)
-      snprintf_P(name, sizeof(name), PSTR("%s%c%d"), ina219_types, IndexSeparator(), sensor_num);
-    else
-      snprintf_P(name, sizeof(name), PSTR("%s"), ina219_types);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%02x,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
-                       name, ina219_addresses[i], voltage, current, power);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, voltage);
-        DomoticzSensor(DZ_CURRENT, current);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_INA219_DATA, name, voltage, name, current, name, power);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns13(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_14)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Ina219Detect();
-  }
-  else if (ina219_count) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_13 == XdrvMailbox.index) {
-          result = Ina219CommandSensor();
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        Ina219EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Ina219Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ina219Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_14_sht3x.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_14_sht3x.ino"
-#ifdef USE_I2C
-#ifdef USE_SHT3X
-
-
-
-
-
-
-#define XSNS_14 14
-#define XI2C_15 15
-
-#define SHT3X_ADDR_GND 0x44
-#define SHT3X_ADDR_VDD 0x45
-#define SHTC3_ADDR 0x70
-
-#define SHT3X_MAX_SENSORS 3
-
-const char kShtTypes[] PROGMEM = "SHT3X|SHT3X|SHTC3";
-uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD, SHTC3_ADDR };
-
-uint8_t sht3x_count = 0;
-struct SHT3XSTRUCT {
-  uint8_t address;
-  char types[6];
-} sht3x_sensors[SHT3X_MAX_SENSORS];
-
-bool Sht3xRead(float &t, float &h, uint8_t sht3x_address)
-{
-  unsigned int data[6];
-
-  t = NAN;
-  h = NAN;
-
-  Wire.beginTransmission(sht3x_address);
-  if (SHTC3_ADDR == sht3x_address) {
-    Wire.write(0x35);
-    Wire.write(0x17);
-    Wire.endTransmission();
-    Wire.beginTransmission(sht3x_address);
-    Wire.write(0x78);
-    Wire.write(0x66);
-  } else {
-    Wire.write(0x2C);
-    Wire.write(0x06);
-  }
-  if (Wire.endTransmission() != 0) {
-    return false;
-  }
-  delay(30);
-  Wire.requestFrom(sht3x_address, (uint8_t)6);
-  for (uint32_t i = 0; i < 6; i++) {
-    data[i] = Wire.read();
-  };
-  t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45);
-  h = ConvertHumidity((float)((((data[3] << 8) | data[4]) * 100) / 65535.0));
-  return (!isnan(t) && !isnan(h) && (h != 0));
-}
-
-
-
-void Sht3xDetect(void)
-{
-  for (uint32_t i = 0; i < SHT3X_MAX_SENSORS; i++) {
-    if (I2cActive(sht3x_addresses[i])) { continue; }
-    float t;
-    float h;
-    if (Sht3xRead(t, h, sht3x_addresses[i])) {
-      sht3x_sensors[sht3x_count].address = sht3x_addresses[i];
-      GetTextIndexed(sht3x_sensors[sht3x_count].types, sizeof(sht3x_sensors[sht3x_count].types), i, kShtTypes);
-      I2cSetActiveFound(sht3x_sensors[sht3x_count].address, sht3x_sensors[sht3x_count].types);
-      sht3x_count++;
-    }
-  }
-}
-
-void Sht3xShow(bool json)
-{
-  for (uint32_t i = 0; i < sht3x_count; i++) {
-    float t;
-    float h;
-    if (Sht3xRead(t, h, sht3x_sensors[i].address)) {
-      char temperature[33];
-      dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-      char humidity[33];
-      dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
-      char types[11];
-      snprintf_P(types, sizeof(types), PSTR("%s%c0x%02X"), sht3x_sensors[i].types, IndexSeparator(), sht3x_sensors[i].address);
-
-      if (json) {
-        ResponseAppend_P(JSON_SNS_TEMPHUM, types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == i)) {
-          DomoticzTempHumSensor(temperature, humidity);
-        }
-#endif
-
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, t);
-        KnxSensor(KNX_HUMIDITY, h);
-      }
-#endif
-
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
-        WSContentSend_PD(HTTP_SNS_HUM, types, humidity);
-#endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool Xsns14(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_15)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Sht3xDetect();
-  }
-  else if (sht3x_count) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        Sht3xShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sht3xShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-#ifdef USE_MHZ19
-# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-#define XSNS_15 15
-
-enum MhzFilterOptions {MHZ19_FILTER_OFF, MHZ19_FILTER_OFF_ALLSAMPLES, MHZ19_FILTER_FAST, MHZ19_FILTER_MEDIUM, MHZ19_FILTER_SLOW};
-
-#define MHZ19_FILTER_OPTION MHZ19_FILTER_FAST
-# 58 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-#include <TasmotaSerial.h>
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#define MHZ19_READ_TIMEOUT 400
-#define MHZ19_RETRY_COUNT 8
-
-TasmotaSerial *MhzSerial;
-
-const char kMhzModels[] PROGMEM = "|B";
-
-const char ABC_ENABLED[] = "ABC is Enabled";
-const char ABC_DISABLED[] = "ABC is Disabled";
-
-enum MhzCommands { MHZ_CMND_READPPM, MHZ_CMND_ABCENABLE, MHZ_CMND_ABCDISABLE, MHZ_CMND_ZEROPOINT, MHZ_CMND_RESET, MHZ_CMND_RANGE_1000, MHZ_CMND_RANGE_2000, MHZ_CMND_RANGE_3000, MHZ_CMND_RANGE_5000 };
-const uint8_t kMhzCommands[][4] PROGMEM = {
-
-  {0x86,0x00,0x00,0x00},
-  {0x79,0xA0,0x00,0x00},
-  {0x79,0x00,0x00,0x00},
-  {0x87,0x00,0x00,0x00},
-  {0x8D,0x00,0x00,0x00},
-  {0x99,0x00,0x03,0xE8},
-  {0x99,0x00,0x07,0xD0},
-  {0x99,0x00,0x0B,0xB8},
-  {0x99,0x00,0x13,0x88}};
-
-uint8_t mhz_type = 1;
-uint16_t mhz_last_ppm = 0;
-uint8_t mhz_filter = MHZ19_FILTER_OPTION;
-bool mhz_abc_must_apply = false;
-
-float mhz_temperature = 0;
-uint8_t mhz_retry = MHZ19_RETRY_COUNT;
-uint8_t mhz_received = 0;
-uint8_t mhz_state = 0;
-
-
-
-uint8_t MhzCalculateChecksum(uint8_t *array)
-{
-  uint8_t checksum = 0;
-  for (uint32_t i = 1; i < 8; i++) {
-    checksum += array[i];
-  }
-  checksum = 255 - checksum;
-  return (checksum +1);
-}
-
-size_t MhzSendCmd(uint8_t command_id)
-{
-  uint8_t mhz_send[9] = { 0 };
-
-  mhz_send[0] = 0xFF;
-  mhz_send[1] = 0x01;
-  memcpy_P(&mhz_send[2], kMhzCommands[command_id], sizeof(uint16_t));
-
-
-
-
-  memcpy_P(&mhz_send[6], kMhzCommands[command_id] + sizeof(uint16_t), sizeof(uint16_t));
-  mhz_send[8] = MhzCalculateChecksum(mhz_send);
-
-
-
-  return MhzSerial->write(mhz_send, sizeof(mhz_send));
-}
-
-
-
-bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s)
-{
-  if (1 == s) {
-    return false;
-  }
-  if (mhz_last_ppm < 400 || mhz_last_ppm > 5000) {
-
-
-    mhz_last_ppm = ppm;
-    return true;
-  }
-  int32_t difference = ppm - mhz_last_ppm;
-  if (s > 0 && s < 64 && mhz_filter != MHZ19_FILTER_OFF) {
-# 154 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-    difference *= s;
-    difference /= 64;
-  }
-  if (MHZ19_FILTER_OFF == mhz_filter) {
-    if (s != 0 && s != 64) {
-      return false;
-    }
-  } else {
-    difference >>= (mhz_filter -1);
-  }
-  mhz_last_ppm = static_cast<uint16_t>(mhz_last_ppm + difference);
-  return true;
-}
-
-void MhzEverySecond(void)
-{
-  mhz_state++;
-  if (8 == mhz_state) {
-    mhz_state = 0;
-
-    if (mhz_retry) {
-      mhz_retry--;
-      if (!mhz_retry) {
-        mhz_last_ppm = 0;
-        mhz_temperature = 0;
-      }
-    }
-
-    MhzSerial->flush();
-    MhzSendCmd(MHZ_CMND_READPPM);
-    mhz_received = 0;
-  }
-
-  if ((mhz_state > 2) && !mhz_received) {
-    uint8_t mhz_response[9];
-
-    unsigned long start = millis();
-    uint8_t counter = 0;
-    while (((millis() - start) < MHZ19_READ_TIMEOUT) && (counter < 9)) {
-      if (MhzSerial->available() > 0) {
-        mhz_response[counter++] = MhzSerial->read();
-      } else {
-        delay(5);
-      }
-    }
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, mhz_response, counter);
-
-    if (counter < 9) {
-
-      return;
-    }
-
-    uint8_t crc = MhzCalculateChecksum(mhz_response);
-    if (mhz_response[8] != crc) {
-
-      return;
-    }
-    if (0xFF != mhz_response[0] || 0x86 != mhz_response[1]) {
-
-      return;
-    }
-
-    mhz_received = 1;
-
-    uint16_t u = (mhz_response[6] << 8) | mhz_response[7];
-    if (15000 == u) {
-      if (Settings.SensorBits1.mhz19b_abc_disable) {
-
-
-        mhz_abc_must_apply = true;
-      }
-    } else {
-      uint16_t ppm = (mhz_response[2] << 8) | mhz_response[3];
-      mhz_temperature = ConvertTemp((float)mhz_response[4] - 40);
-      uint8_t s = mhz_response[5];
-      mhz_type = (s) ? 1 : 2;
-      if (MhzCheckAndApplyFilter(ppm, s)) {
-        mhz_retry = MHZ19_RETRY_COUNT;
-        LightSetSignal(CO2_LOW, CO2_HIGH, mhz_last_ppm);
-
-        if (0 == s || 64 == s) {
-          if (mhz_abc_must_apply) {
-            mhz_abc_must_apply = false;
-            if (!Settings.SensorBits1.mhz19b_abc_disable) {
-              MhzSendCmd(MHZ_CMND_ABCENABLE);
-            } else {
-              MhzSendCmd(MHZ_CMND_ABCDISABLE);
-            }
-          }
-        }
-
-      }
-    }
-
-  }
-}
-# 266 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_15_mhz19.ino"
-#define D_JSON_RANGE_1000 "1000 ppm range"
-#define D_JSON_RANGE_2000 "2000 ppm range"
-#define D_JSON_RANGE_3000 "3000 ppm range"
-#define D_JSON_RANGE_5000 "5000 ppm range"
-
-bool MhzCommandSensor(void)
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      Settings.SensorBits1.mhz19b_abc_disable = true;
-      MhzSendCmd(MHZ_CMND_ABCDISABLE);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
-      break;
-    case 1:
-      Settings.SensorBits1.mhz19b_abc_disable = false;
-      MhzSendCmd(MHZ_CMND_ABCENABLE);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
-      break;
-    case 2:
-      MhzSendCmd(MHZ_CMND_ZEROPOINT);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_ZERO_POINT_CALIBRATION);
-      break;
-    case 9:
-      MhzSendCmd(MHZ_CMND_RESET);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RESET);
-      break;
-    case 1000:
-      MhzSendCmd(MHZ_CMND_RANGE_1000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_1000);
-      break;
-    case 2000:
-      MhzSendCmd(MHZ_CMND_RANGE_2000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_2000);
-      break;
-    case 3000:
-      MhzSendCmd(MHZ_CMND_RANGE_3000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_3000);
-      break;
-    case 5000:
-      MhzSendCmd(MHZ_CMND_RANGE_5000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_5000);
-      break;
-    default:
-      if (!Settings.SensorBits1.mhz19b_abc_disable) {
-        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
-      } else {
-        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
-      }
-  }
-
-  return serviced;
-}
-
-
-
-void MhzInit(void)
-{
-  mhz_type = 0;
-  if ((pin[GPIO_MHZ_RXD] < 99) && (pin[GPIO_MHZ_TXD] < 99)) {
-    MhzSerial = new TasmotaSerial(pin[GPIO_MHZ_RXD], pin[GPIO_MHZ_TXD], 1);
-    if (MhzSerial->begin(9600)) {
-      if (MhzSerial->hardwareSerial()) { ClaimSerial(); }
-      mhz_type = 1;
-    }
-
-  }
-}
-
-void MhzShow(bool json)
-{
-  char types[7] = "MHZ19B";
-  char temperature[33];
-  dtostrfd(mhz_temperature, Settings.flag2.temperature_resolution, temperature);
-  char model[3];
-  GetTextIndexed(model, sizeof(model), mhz_type -1, kMhzModels);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_MODEL "\":\"%s\",\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s}"), types, model, mhz_last_ppm, temperature);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) {
-      DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm);
-      DomoticzSensor(DZ_TEMP, temperature);
-    }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, types, mhz_last_ppm);
-    WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns15(uint8_t function)
-{
-  bool result = false;
-
-  if (mhz_type) {
-    switch (function) {
-      case FUNC_INIT:
-        MhzInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        MhzEverySecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_15 == XdrvMailbox.index) {
-          result = MhzCommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MhzShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MhzShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
-#ifdef USE_I2C
-#ifdef USE_TSL2561
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_16_tsl2561.ino"
-#define XSNS_16 16
-#define XI2C_16 16
-
-#include <Tsl2561Util.h>
-
-Tsl2561 Tsl(Wire);
-
-uint8_t tsl2561_type = 0;
-uint8_t tsl2561_valid = 0;
-uint32_t tsl2561_milliLux = 0;
-char tsl2561_types[] = "TSL2561";
-
-bool Tsl2561Read(void)
-{
-  if (tsl2561_valid) { tsl2561_valid--; }
-
-  uint8_t id;
-  bool gain;
-  Tsl2561::exposure_t exposure;
-  uint16_t scaledFull, scaledIr;
-  uint32_t full, ir;
-
-    if (Tsl.on()) {
-      if (Tsl.id(id)
-        && Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr)
-        && Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr)
-        && Tsl2561Util::milliLux(full, ir, tsl2561_milliLux, Tsl2561::packageCS(id))) {
-      } else{
-        tsl2561_milliLux = 0;
-      }
-    }
-  tsl2561_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-void Tsl2561Detect(void)
-{
-  if (I2cSetDevice(0x29) || I2cSetDevice(0x39) || I2cSetDevice(0x49)) {
-    uint8_t id;
-    Tsl.begin();
-    if (!Tsl.id(id)) return;
-    if (Tsl.on()) {
-      tsl2561_type = 1;
-      I2cSetActiveFound(Tsl.address(), tsl2561_types);
-    }
-  }
-}
-
-void Tsl2561EverySecond(void)
-{
-  if (!(uptime %2)) {
-
-    if (!Tsl2561Read()) {
-      AddLogMissed(tsl2561_types, tsl2561_valid);
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_TSL2561[] PROGMEM =
-  "{s}TSL2561 " D_ILLUMINANCE "{m}%u.%03u " D_UNIT_LUX "{e}";
-#endif
-
-void Tsl2561Show(bool json)
-{
-  if (tsl2561_valid) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"),
-        tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, (tsl2561_milliLux + 500) / 1000); }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TSL2561, tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns16(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_16)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Tsl2561Detect();
-  }
-  else if (tsl2561_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Tsl2561EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Tsl2561Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tsl2561Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
-#ifdef USE_SENSEAIR
-# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_17_senseair.ino"
-#define XSNS_17 17
-
-#define SENSEAIR_MODBUS_SPEED 9600
-#define SENSEAIR_DEVICE_ADDRESS 0xFE
-#define SENSEAIR_READ_REGISTER 0x04
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *SenseairModbus;
-
-const char kSenseairTypes[] PROGMEM = "Kx0|S8";
-
-uint8_t senseair_type = 1;
-char senseair_types[7];
-
-uint16_t senseair_co2 = 0;
-float senseair_temperature = 0;
-float senseair_humidity = 0;
-
-
-
-const uint8_t start_addresses[] { 0x1A, 0x00, 0x03, 0x04, 0x05, 0x1C, 0x0A };
-
-uint8_t senseair_read_state = 0;
-uint8_t senseair_send_retry = 0;
-
-void Senseair250ms(void)
-{
-
-
-
-
-    uint16_t value = 0;
-    bool data_ready = SenseairModbus->ReceiveReady();
-
-    if (data_ready) {
-      uint8_t error = SenseairModbus->Receive16BitRegister(&value);
-      if (error) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir response error %d"), error);
-      } else {
-        switch(senseair_read_state) {
-          case 0:
-            senseair_type = 2;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir type id low %04X"), value);
-            break;
-          case 1:
-            if (value) {
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir error %04X"), value);
-            }
-            break;
-          case 2:
-            senseair_co2 = value;
-            LightSetSignal(CO2_LOW, CO2_HIGH, senseair_co2);
-            break;
-          case 3:
-            senseair_temperature = ConvertTemp((float)value / 100);
-            break;
-          case 4:
-            senseair_humidity = ConvertHumidity((float)value / 100);
-            break;
-          case 5:
-          {
-            bool relay_state = value >> 8 & 1;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir relay state %d"), relay_state);
-            break;
-          }
-          case 6:
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir temp adjustment %d"), value);
-            break;
-        }
-      }
-      senseair_read_state++;
-      if (2 == senseair_type) {
-        if (3 == senseair_read_state) {
-          senseair_read_state = 1;
-        }
-      } else {
-        if (sizeof(start_addresses) == senseair_read_state) {
-          senseair_read_state = 1;
-        }
-      }
-    }
-
-    if (0 == senseair_send_retry || data_ready) {
-      senseair_send_retry = 5;
-      SenseairModbus->Send(SENSEAIR_DEVICE_ADDRESS, SENSEAIR_READ_REGISTER, (uint16_t)start_addresses[senseair_read_state], 1);
-    } else {
-      senseair_send_retry--;
-    }
-
-
-}
-
-
-
-void SenseairInit(void)
-{
-  senseair_type = 0;
-  if ((pin[GPIO_SAIR_RX] < 99) && (pin[GPIO_SAIR_TX] < 99)) {
-    SenseairModbus = new TasmotaModbus(pin[GPIO_SAIR_RX], pin[GPIO_SAIR_TX]);
-    uint8_t result = SenseairModbus->Begin(SENSEAIR_MODBUS_SPEED);
-    if (result) {
-      if (2 == result) { ClaimSerial(); }
-      senseair_type = 1;
-    }
-  }
-}
-
-void SenseairShow(bool json)
-{
-  char temperature[33];
-  dtostrfd(senseair_temperature, Settings.flag2.temperature_resolution, temperature);
-  char humidity[33];
-  dtostrfd(senseair_humidity, Settings.flag2.temperature_resolution, humidity);
-  GetTextIndexed(senseair_types, sizeof(senseair_types), senseair_type -1, kSenseairTypes);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d"), senseair_types, senseair_co2);
-    if (senseair_type != 2) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s"), temperature, humidity);
-    }
-    ResponseJsonEnd();
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, senseair_co2);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, senseair_types, senseair_co2);
-    if (senseair_type != 2) {
-      WSContentSend_PD(HTTP_SNS_TEMP, senseair_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, senseair_types, humidity);
-    }
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns17(uint8_t function)
-{
-  bool result = false;
-
-  if (senseair_type) {
-    switch (function) {
-      case FUNC_INIT:
-        SenseairInit();
-        break;
-      case FUNC_EVERY_250_MSECOND:
-        Senseair250ms();
-        break;
-      case FUNC_JSON_APPEND:
-        SenseairShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SenseairShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
-#ifdef USE_PMS5003
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_18_pms5003.ino"
-#define XSNS_18 18
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PmsSerial;
-
-uint8_t pms_type = 1;
-uint8_t pms_valid = 0;
-
-struct pmsX003data {
-  uint16_t framelen;
-  uint16_t pm10_standard, pm25_standard, pm100_standard;
-  uint16_t pm10_env, pm25_env, pm100_env;
-#ifdef PMS_MODEL_PMS3003
-  uint16_t reserved1, reserved2, reserved3;
-#else
-  uint16_t particles_03um, particles_05um, particles_10um, particles_25um, particles_50um, particles_100um;
-  uint16_t unused;
-#endif
-  uint16_t checksum;
-} pms_data;
-
-
-
-bool PmsReadData(void)
-{
-  if (! PmsSerial->available()) {
-    return false;
-  }
-  while ((PmsSerial->peek() != 0x42) && PmsSerial->available()) {
-    PmsSerial->read();
-  }
-#ifdef PMS_MODEL_PMS3003
-  if (PmsSerial->available() < 22) {
-#else
-  if (PmsSerial->available() < 32) {
-#endif
-    return false;
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  uint8_t buffer[22];
-  PmsSerial->readBytes(buffer, 22);
-#else
-  uint8_t buffer[32];
-  PmsSerial->readBytes(buffer, 32);
-#endif
-  uint16_t sum = 0;
-  PmsSerial->flush();
-
-#ifdef PMS_MODEL_PMS3003
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 22);
-#else
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 32);
-#endif
-
-
-#ifdef PMS_MODEL_PMS3003
-  for (uint32_t i = 0; i < 20; i++) {
-#else
-  for (uint32_t i = 0; i < 30; i++) {
-#endif
-    sum += buffer[i];
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  uint16_t buffer_u16[10];
-  for (uint32_t i = 0; i < 10; i++) {
-#else
-  uint16_t buffer_u16[15];
-  for (uint32_t i = 0; i < 15; i++) {
-#endif
-    buffer_u16[i] = buffer[2 + i*2 + 1];
-    buffer_u16[i] += (buffer[2 + i*2] << 8);
-  }
-#ifdef PMS_MODEL_PMS3003
-  if (sum != buffer_u16[9]) {
-#else
-  if (sum != buffer_u16[14]) {
-#endif
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("PMS: " D_CHECKSUM_FAILURE));
-    return false;
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  memcpy((void *)&pms_data, (void *)buffer_u16, 20);
-#else
-  memcpy((void *)&pms_data, (void *)buffer_u16, 30);
-#endif
-  pms_valid = 10;
-
-  return true;
-}
-
-
-
-void PmsSecond(void)
-{
-  if (PmsReadData()) {
-    pms_valid = 10;
-  } else {
-    if (pms_valid) {
-      pms_valid--;
-    }
-  }
-}
-
-
-
-void PmsInit(void)
-{
-  pms_type = 0;
-  if (pin[GPIO_PMS5003] < 99) {
-    PmsSerial = new TasmotaSerial(pin[GPIO_PMS5003], -1, 1);
-    if (PmsSerial->begin(9600)) {
-      if (PmsSerial->hardwareSerial()) { ClaimSerial(); }
-      pms_type = 1;
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-#ifdef PMS_MODEL_PMS3003
-const char HTTP_PMS3003_SNS[] PROGMEM =
-
-
-
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#else
-const char HTTP_PMS5003_SNS[] PROGMEM =
-
-
-
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.3 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}";
-#endif
-#endif
-
-void PmsShow(bool json)
-{
-  if (pms_valid) {
-    if (json) {
-#ifdef PMS_MODEL_PMS3003
-      ResponseAppend_P(PSTR(",\"PMS3003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d}"),
-        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
-#else
-      ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"),
-        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
-        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
-#endif
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_COUNT, pms_data.pm10_env);
-        DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env);
-        DomoticzSensor(DZ_CURRENT, pms_data.pm100_env);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-
-#ifdef PMS_MODEL_PMS3003
-        WSContentSend_PD(HTTP_PMS3003_SNS,
-
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
-#else
-        WSContentSend_PD(HTTP_PMS5003_SNS,
-
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
-        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
-#endif
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns18(uint8_t function)
-{
-  bool result = false;
-
-  if (pms_type) {
-    switch (function) {
-      case FUNC_INIT:
-        PmsInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        PmsSecond();
-        break;
-      case FUNC_JSON_APPEND:
-        PmsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        PmsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_19_mgs.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_19_mgs.ino"
-#ifdef USE_I2C
-#ifdef USE_MGS
-
-
-
-
-
-
-
-#define XSNS_19 19
-#define XI2C_17 17
-
-#ifndef MGS_SENSOR_ADDR
-#define MGS_SENSOR_ADDR 0x04
-#endif
-
-#include "MutichannelGasSensor.h"
-
-bool mgs_detected = false;
-
-void MGSInit(void) {
-  gas.begin(MGS_SENSOR_ADDR);
-}
-
-void MGSPrepare(void)
-{
-  if (I2cActive(MGS_SENSOR_ADDR)) { return; }
-
-  gas.begin(MGS_SENSOR_ADDR);
-  if (!gas.isError()) {
-    I2cSetActiveFound(MGS_SENSOR_ADDR, "MultiGas");
-    mgs_detected = true;
-  }
-}
-
-char* measure_gas(int gas_type, char* buffer)
-{
-  float f = gas.calcGas(gas_type);
-  dtostrfd(f, 2, buffer);
-  return buffer;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_MGS_GAS[] PROGMEM = "{s}MGS %s{m}%s " D_UNIT_PARTS_PER_MILLION "{e}";
-#endif
-
-void MGSShow(bool json)
-{
-  char buffer[33];
-  if (json) {
-    ResponseAppend_P(PSTR(",\"MGS\":{\"NH3\":%s"), measure_gas(NH3, buffer));
-    ResponseAppend_P(PSTR(",\"CO\":%s"), measure_gas(CO, buffer));
-    ResponseAppend_P(PSTR(",\"NO2\":%s"), measure_gas(NO2, buffer));
-    ResponseAppend_P(PSTR(",\"C3H8\":%s"), measure_gas(C3H8, buffer));
-    ResponseAppend_P(PSTR(",\"C4H10\":%s"), measure_gas(C4H10, buffer));
-    ResponseAppend_P(PSTR(",\"CH4\":%s"), measure_gas(GAS_CH4, buffer));
-    ResponseAppend_P(PSTR(",\"H2\":%s"), measure_gas(H2, buffer));
-    ResponseAppend_P(PSTR(",\"C2H5OH\":%s}"), measure_gas(C2H5OH, buffer));
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_MGS_GAS, "NH3", measure_gas(NH3, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "CO", measure_gas(CO, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "NO2", measure_gas(NO2, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C3H8", measure_gas(C3H8, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C4H10", measure_gas(C4H10, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "CH4", measure_gas(GAS_CH4, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "H2", measure_gas(H2, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C2H5OH", measure_gas(C2H5OH, buffer));
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns19(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_17)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MGSPrepare();
-  }
-  else if (mgs_detected) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        MGSShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MGSShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
-#ifdef USE_NOVA_SDS
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_20_novasds.ino"
-#define XSNS_20 20
-
-#include <TasmotaSerial.h>
-
-#ifndef STARTING_OFFSET
-#define STARTING_OFFSET 30
-#endif
-#if STARTING_OFFSET < 10
-#error "Please set STARTING_OFFSET >= 10"
-#endif
-#ifndef NOVA_SDS_RECDATA_TIMEOUT
-#define NOVA_SDS_RECDATA_TIMEOUT 150
-#endif
-#ifndef NOVA_SDS_DEVICE_ID
-#define NOVA_SDS_DEVICE_ID 0xFFFF
-#endif
-
-TasmotaSerial *NovaSdsSerial;
-
-uint8_t novasds_type = 1;
-uint8_t novasds_valid = 0;
-uint8_t cont_mode = 1;
-
-struct sds011data {
-  uint16_t pm100;
-  uint16_t pm25;
-} novasds_data;
-uint16_t pm100_sum;
-uint16_t pm25_sum;
-
-
-#define NOVA_SDS_REPORTING_MODE 2
-#define NOVA_SDS_QUERY_DATA 4
-#define NOVA_SDS_SET_DEVICE_ID 5
-#define NOVA_SDS_SLEEP_AND_WORK 6
-#define NOVA_SDS_WORKING_PERIOD 8
-#define NOVA_SDS_CHECK_FIRMWARE_VER 7
-  #define NOVA_SDS_QUERY_MODE 0
-  #define NOVA_SDS_SET_MODE 1
-  #define NOVA_SDS_REPORT_ACTIVE 0
-  #define NOVA_SDS_REPORT_QUERY 1
-  #define NOVA_SDS_SLEEP 0
-  #define NOVA_SDS_WORK 1
-
-
-bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer)
-{
-  uint8_t novasds_cmnd[19] = {0xAA, 0xB4, byte1, byte2, byte3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (uint8_t)(sensorid & 0xFF), (uint8_t)((sensorid>>8) & 0xFF), 0x00, 0xAB};
-
-
-  for (uint32_t i = 2; i < 17; i++) {
-    novasds_cmnd[17] += novasds_cmnd[i];
-  }
-
-
-
-
-
-  NovaSdsSerial->write(novasds_cmnd, sizeof(novasds_cmnd));
-  NovaSdsSerial->flush();
-
-
-  unsigned long cmndtime = millis();
-  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( ! NovaSdsSerial->available() ) );
-  if ( ! NovaSdsSerial->available() ) {
-
-    return false;
-  }
-  uint8_t recbuf[10];
-  memset(recbuf, 0, sizeof(recbuf));
-
-  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( NovaSdsSerial->available() > 0) && (0xAA != (recbuf[0] = NovaSdsSerial->read())) );
-  if ( 0xAA != recbuf[0] ) {
-
-    return false;
-  }
-
-
-  NovaSdsSerial->readBytes(&recbuf[1], 9);
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, recbuf, sizeof(recbuf));
-
-  if ( nullptr != buffer ) {
-
-    memcpy(buffer, recbuf, sizeof(recbuf));
-  }
-
-
-  if ((0xAB != recbuf[9] ) || (recbuf[8] != ((recbuf[2] + recbuf[3] + recbuf[4] + recbuf[5] + recbuf[6] + recbuf[7]) & 0xFF))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("SDS: " D_CHECKSUM_FAILURE));
-    return false;
-  }
-
-  return true;
-}
-
-void NovaSdsSetWorkPeriod(void)
-{
-
-    NovaSdsCommand(NOVA_SDS_WORKING_PERIOD, NOVA_SDS_SET_MODE, 0, NOVA_SDS_DEVICE_ID, nullptr);
-
-    NovaSdsCommand(NOVA_SDS_REPORTING_MODE, NOVA_SDS_SET_MODE, NOVA_SDS_REPORT_QUERY, NOVA_SDS_DEVICE_ID, nullptr);
-}
-
-bool NovaSdsReadData(void)
-{
-  uint8_t d[10];
-  if ( ! NovaSdsCommand(NOVA_SDS_QUERY_DATA, 0, 0, NOVA_SDS_DEVICE_ID, d) ) {
-    return false;
-  }
-  novasds_data.pm25 = (d[2] + 256 * d[3]);
-  novasds_data.pm100 = (d[4] + 256 * d[5]);
-
-  return true;
-}
-
-
-
-void NovaSdsSecond(void)
-{
-  if (!novasds_valid)
-  {
-    NovaSdsSetWorkPeriod();
-    novasds_valid=1;
-  }
-  if((Settings.tele_period - Settings.novasds_startingoffset <= 0))
-  {
-    if(!cont_mode)
-    {
-      cont_mode = 1;
-      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
-    }
-  }
-  else
-    cont_mode = 0;
-
-  if(tele_period == Settings.tele_period - Settings.novasds_startingoffset && !cont_mode)
-  {
-    NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
-  }
-  if(tele_period >= Settings.tele_period-5 && tele_period <= Settings.tele_period-2)
-  {
-    if(!(NovaSdsReadData())) novasds_valid=0;
-    pm100_sum += novasds_data.pm100;
-    pm25_sum += novasds_data.pm25;
-  }
-  if(tele_period == Settings.tele_period-1)
-  {
-    novasds_data.pm100 = pm100_sum >> 2;
-    novasds_data.pm25 = pm25_sum >> 2;
-    if(!cont_mode)
-      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_SLEEP, NOVA_SDS_DEVICE_ID, nullptr);
-    pm100_sum = pm25_sum = 0;
-  }
-}
-
-
-
-
-
-
-
-bool NovaSdsCommandSensor(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 256)) {
-    if( XdrvMailbox.payload < 10 ) Settings.novasds_startingoffset = 10;
-    else Settings.novasds_startingoffset = XdrvMailbox.payload;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_20, Settings.novasds_startingoffset);
-
-  return true;
-}
-
-void NovaSdsInit(void)
-{
-  novasds_type = 0;
-  if (pin[GPIO_SDS0X1_RX] < 99 && pin[GPIO_SDS0X1_TX] < 99) {
-    NovaSdsSerial = new TasmotaSerial(pin[GPIO_SDS0X1_RX], pin[GPIO_SDS0X1_TX], 1);
-    if (NovaSdsSerial->begin(9600)) {
-      if (NovaSdsSerial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      novasds_type = 1;
-      NovaSdsSetWorkPeriod();
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SDS0X1_SNS[] PROGMEM =
-  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#endif
-
-void NovaSdsShow(bool json)
-{
-  if (novasds_valid) {
-    float pm10f = (float)(novasds_data.pm100) / 10.0f;
-    float pm2_5f = (float)(novasds_data.pm25) / 10.0f;
-    char pm10[33];
-    dtostrfd(pm10f, 1, pm10);
-    char pm2_5[33];
-    dtostrfd(pm2_5f, 1, pm2_5);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), pm2_5, pm10);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, pm2_5);
-        DomoticzSensor(DZ_CURRENT, pm10);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SDS0X1_SNS, pm2_5, pm10);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns20(uint8_t function)
-{
-  bool result = false;
-
-  if (novasds_type) {
-    switch (function) {
-      case FUNC_INIT:
-        NovaSdsInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        NovaSdsSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_20 == XdrvMailbox.index) {
-          result = NovaSdsCommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        NovaSdsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        NovaSdsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
-#ifdef USE_I2C
-#ifdef USE_SGP30
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_21_sgp30.ino"
-#define XSNS_21 21
-#define XI2C_18 18
-
-#define SGP30_ADDRESS 0x58
-
-#include "Adafruit_SGP30.h"
-Adafruit_SGP30 sgp;
-
-bool sgp30_type = false;
-bool sgp30_ready = false;
-float sgp30_abshum;
-
-
-
-void sgp30_Init(void)
-{
-  if (I2cActive(SGP30_ADDRESS)) { return; }
-
-  if (sgp.begin()) {
-    sgp30_type = true;
-
-    I2cSetActiveFound(SGP30_ADDRESS, "SGP30");
-  }
-}
-
-
-#define POW_FUNC FastPrecisePow
-
-float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit) {
-
-
-
-
-
-  float temp = NAN;
-  const float mw = 18.01534;
-  const float r = 8.31447215;
-
-  if (isnan(temperature) || isnan(humidity) ) {
-    return NAN;
-  }
-
-  if (tempUnit != 'C') {
-    temperature = (temperature - 32.0) * (5.0 / 9.0);
-  }
-
-  temp = POW_FUNC(2.718281828, (17.67 * temperature) / (temperature + 243.5));
-
-
-  return (6.112 * temp * humidity * mw) / ((273.15 + temperature) * r);
-}
-
-#define SAVE_PERIOD 30
-
-void Sgp30Update(void)
-{
-  sgp30_ready = false;
-  if (!sgp.IAQmeasure()) {
-    return;
-  }
-  if (global_update && (global_humidity > 0) && (global_temperature != 9999)) {
-
-    sgp30_abshum=sgp30_AbsoluteHumidity(global_temperature,global_humidity,TempUnit());
-    sgp.setHumidity(sgp30_abshum*1000);
-  }
-  sgp30_ready = true;
-
-
-  if (!(uptime%SAVE_PERIOD)) {
-
-    uint16_t TVOC_base;
-    uint16_t eCO2_base;
-
-    if (!sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) return;
-
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SGP30[] PROGMEM =
-  "{s}SGP30 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
-  "{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
-const char HTTP_SNS_AHUM[] PROGMEM = "{s}SGP30 Abs Humidity{m}%s g/m3{e}";
-#endif
-
-#define D_JSON_AHUM "aHumidity"
-
-void Sgp30Show(bool json)
-{
-  if (sgp30_ready) {
-    char abs_hum[33];
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC);
-      if (global_update && global_humidity>0 && global_temperature!=9999) {
-
-        dtostrfd(sgp30_abshum,4,abs_hum);
-        ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum);
-      }
-      ResponseJsonEnd();
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC);
-      if (global_update) {
-        WSContentSend_PD(HTTP_SNS_AHUM, abs_hum);
-      }
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns21(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_18)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    sgp30_Init();
-  }
-  else if (sgp30_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Sgp30Update();
-        break;
-      case FUNC_JSON_APPEND:
-        Sgp30Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sgp30Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
-#ifdef USE_SR04
-
-#include <NewPing.h>
-#include <TasmotaSerial.h>
-# 32 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_22_sr04.ino"
-#define XSNS_22 22
-
-uint8_t sr04_type = 1;
-int sr04_echo_pin = 0;
-int sr04_trig_pin = 0;
-real64_t distance;
-
-NewPing* sonar = nullptr;
-TasmotaSerial* sonar_serial = nullptr;
-
-
-
-uint8_t Sr04TModeDetect(void)
-{
-  sr04_type = 0;
-  if (pin[GPIO_SR04_ECHO]>=99) return sr04_type;
-
-  sr04_echo_pin = pin[GPIO_SR04_ECHO];
-  sr04_trig_pin = (pin[GPIO_SR04_TRIG] < 99) ? pin[GPIO_SR04_TRIG] : -1;
-  sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
-
-  if (sonar_serial->begin(9600,1)) {
-    DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode"));
-
-    if (sr04_trig_pin!=-1) {
-        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;
-    } else {
-        sr04_type = 2;
-    }
-  } else {
-    sr04_type = 1;
-  }
-
-  if (sr04_type < 2) {
-      delete sonar_serial;
-      sonar_serial = nullptr;
-      sonar = new NewPing(sr04_trig_pin, sr04_echo_pin, 300);
-  } else {
-    if (sonar_serial->hardwareSerial()) {
-      ClaimSerial();
-    }
-  }
-
-  AddLog_P2(LOG_LEVEL_INFO,PSTR("SR04: Mode %d"), sr04_type);
-  return sr04_type;
-}
-
-uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third)
-{
-  uint16_t ret = first;
-  if (first > second) {
-    first = second;
-    second = ret;
-  }
-
-  if (third < first) {
-    return first;
-  } else if (third > second) {
-    return second;
-  } else {
-    return third;
-  }
-}
-
-uint16_t Sr04TMode3Distance() {
-
-    sonar_serial->write(0x55);
-    sonar_serial->flush();
-
-    return Sr04TMode2Distance();
-}
-
-uint16_t Sr04TMode2Distance(void)
-{
-  sonar_serial->setTimeout(300);
-  const char startByte = 0xff;
-
-  if (!sonar_serial->find(startByte)) {
-
-      return NO_ECHO;
-  }
-
-  delay(5);
-
-  uint8_t crc = sonar_serial->read();
-
-  uint16_t distance = ((uint16_t)crc) << 8;
-
-
-  distance += sonar_serial->read();
-  crc += distance & 0x00ff;
-  crc += 0x00FF;
-
-
-  if (crc != sonar_serial->read()) {
-    AddLog_P2(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error."));
-    return NO_ECHO;
-  }
-
-  return distance;
-}
-
-void Sr04TReading(void) {
-
-  if (sonar_serial==nullptr && sonar==nullptr) {
-    Sr04TModeDetect();
-  }
-
-  switch (sr04_type) {
-      case 3:
-        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10;
-        break;
-      case 2:
-
-        while(sonar_serial->available()) sonar_serial->read();
-        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode2Distance(),Sr04TMode2Distance(),Sr04TMode2Distance()))/10;
-        break;
-      case 1:
-        distance = (real64_t)(sonar->ping_median(5))/ US_ROUNDTRIP_CM;
-        break;
-      default:
-        distance = NO_ECHO;
-  }
-
-  return;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_DISTANCE[] PROGMEM =
-  "{s}SR04 " D_DISTANCE "{m}%s" D_UNIT_CENTIMETER "{e}";
-#endif
-
-void Sr04Show(bool json)
-{
-
-  if (distance != 0) {
-    char distance_chr[33];
-    dtostrfd(distance, 3, distance_chr);
-
-    if(json) {
-      ResponseAppend_P(PSTR(",\"SR04\":{\"" D_JSON_DISTANCE "\":%s}"), distance_chr);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_COUNT, distance_chr);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_DISTANCE, distance_chr);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns22(uint8_t function)
-{
-  bool result = false;
-
-  if (sr04_type) {
-    switch (function) {
-      case FUNC_INIT:
-        result = (pin[GPIO_SR04_ECHO]<99);
-        break;
-      case FUNC_EVERY_SECOND:
-        Sr04TReading();
-        result = true;
-        break;
-      case FUNC_JSON_APPEND:
-        Sr04Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sr04Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
-#ifdef USE_I2C
-#ifdef USE_SI1145
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_24_si1145.ino"
-#define XSNS_24 24
-#define XI2C_19 19
-
-#define SI114X_ADDR 0X60
-
-
-
-#define SI114X_QUERY 0X80
-#define SI114X_SET 0XA0
-#define SI114X_NOP 0X00
-#define SI114X_RESET 0X01
-#define SI114X_BUSADDR 0X02
-#define SI114X_PS_FORCE 0X05
-#define SI114X_GET_CAL 0X12
-#define SI114X_ALS_FORCE 0X06
-#define SI114X_PSALS_FORCE 0X07
-#define SI114X_PS_PAUSE 0X09
-#define SI114X_ALS_PAUSE 0X0A
-#define SI114X_PSALS_PAUSE 0X0B
-#define SI114X_PS_AUTO 0X0D
-#define SI114X_ALS_AUTO 0X0E
-#define SI114X_PSALS_AUTO 0X0F
-
-
-
-#define SI114X_PART_ID 0X00
-#define SI114X_REV_ID 0X01
-#define SI114X_SEQ_ID 0X02
-#define SI114X_INT_CFG 0X03
-#define SI114X_IRQ_ENABLE 0X04
-#define SI114X_IRQ_MODE1 0x05
-#define SI114X_IRQ_MODE2 0x06
-#define SI114X_HW_KEY 0X07
-#define SI114X_MEAS_RATE0 0X08
-#define SI114X_MEAS_RATE1 0X09
-#define SI114X_PS_RATE 0X0A
-#define SI114X_PS_LED21 0X0F
-#define SI114X_PS_LED3 0X10
-#define SI114X_UCOEFF0 0X13
-#define SI114X_UCOEFF1 0X14
-#define SI114X_UCOEFF2 0X15
-#define SI114X_UCOEFF3 0X16
-#define SI114X_WR 0X17
-#define SI114X_COMMAND 0X18
-#define SI114X_RESPONSE 0X20
-#define SI114X_IRQ_STATUS 0X21
-#define SI114X_ALS_VIS_DATA0 0X22
-#define SI114X_ALS_VIS_DATA1 0X23
-#define SI114X_ALS_IR_DATA0 0X24
-#define SI114X_ALS_IR_DATA1 0X25
-#define SI114X_PS1_DATA0 0X26
-#define SI114X_PS1_DATA1 0X27
-#define SI114X_PS2_DATA0 0X28
-#define SI114X_PS2_DATA1 0X29
-#define SI114X_PS3_DATA0 0X2A
-#define SI114X_PS3_DATA1 0X2B
-#define SI114X_AUX_DATA0_UVINDEX0 0X2C
-#define SI114X_AUX_DATA1_UVINDEX1 0X2D
-#define SI114X_RD 0X2E
-#define SI114X_CHIP_STAT 0X30
-
-
-
-#define SI114X_CHLIST 0X01
-#define SI114X_CHLIST_ENUV 0x80
-#define SI114X_CHLIST_ENAUX 0x40
-#define SI114X_CHLIST_ENALSIR 0x20
-#define SI114X_CHLIST_ENALSVIS 0x10
-#define SI114X_CHLIST_ENPS1 0x01
-#define SI114X_CHLIST_ENPS2 0x02
-#define SI114X_CHLIST_ENPS3 0x04
-
-#define SI114X_PSLED12_SELECT 0X02
-#define SI114X_PSLED3_SELECT 0X03
-
-#define SI114X_PS_ENCODE 0X05
-#define SI114X_ALS_ENCODE 0X06
-
-#define SI114X_PS1_ADCMUX 0X07
-#define SI114X_PS2_ADCMUX 0X08
-#define SI114X_PS3_ADCMUX 0X09
-
-#define SI114X_PS_ADC_COUNTER 0X0A
-#define SI114X_PS_ADC_GAIN 0X0B
-#define SI114X_PS_ADC_MISC 0X0C
-
-#define SI114X_ALS_IR_ADC_MUX 0X0E
-#define SI114X_AUX_ADC_MUX 0X0F
-
-#define SI114X_ALS_VIS_ADC_COUNTER 0X10
-#define SI114X_ALS_VIS_ADC_GAIN 0X11
-#define SI114X_ALS_VIS_ADC_MISC 0X12
-
-#define SI114X_LED_REC 0X1C
-
-#define SI114X_ALS_IR_ADC_COUNTER 0X1D
-#define SI114X_ALS_IR_ADC_GAIN 0X1E
-#define SI114X_ALS_IR_ADC_MISC 0X1F
-
-
-
-
-#define SI114X_ADCMUX_SMALL_IR 0x00
-#define SI114X_ADCMUX_VISIABLE 0x02
-#define SI114X_ADCMUX_LARGE_IR 0x03
-#define SI114X_ADCMUX_NO 0x06
-#define SI114X_ADCMUX_GND 0x25
-#define SI114X_ADCMUX_TEMPERATURE 0x65
-#define SI114X_ADCMUX_VDD 0x75
-
-#define SI114X_PSLED12_SELECT_PS1_NONE 0x00
-#define SI114X_PSLED12_SELECT_PS1_LED1 0x01
-#define SI114X_PSLED12_SELECT_PS1_LED2 0x02
-#define SI114X_PSLED12_SELECT_PS1_LED3 0x04
-#define SI114X_PSLED12_SELECT_PS2_NONE 0x00
-#define SI114X_PSLED12_SELECT_PS2_LED1 0x10
-#define SI114X_PSLED12_SELECT_PS2_LED2 0x20
-#define SI114X_PSLED12_SELECT_PS2_LED3 0x40
-#define SI114X_PSLED3_SELECT_PS2_NONE 0x00
-#define SI114X_PSLED3_SELECT_PS2_LED1 0x10
-#define SI114X_PSLED3_SELECT_PS2_LED2 0x20
-#define SI114X_PSLED3_SELECT_PS2_LED3 0x40
-
-#define SI114X_ADC_GAIN_DIV1 0X00
-#define SI114X_ADC_GAIN_DIV2 0X01
-#define SI114X_ADC_GAIN_DIV4 0X02
-#define SI114X_ADC_GAIN_DIV8 0X03
-#define SI114X_ADC_GAIN_DIV16 0X04
-#define SI114X_ADC_GAIN_DIV32 0X05
-
-#define SI114X_LED_CURRENT_5MA 0X01
-#define SI114X_LED_CURRENT_11MA 0X02
-#define SI114X_LED_CURRENT_22MA 0X03
-#define SI114X_LED_CURRENT_45MA 0X04
-
-#define SI114X_ADC_COUNTER_1ADCCLK 0X00
-#define SI114X_ADC_COUNTER_7ADCCLK 0X01
-#define SI114X_ADC_COUNTER_15ADCCLK 0X02
-#define SI114X_ADC_COUNTER_31ADCCLK 0X03
-#define SI114X_ADC_COUNTER_63ADCCLK 0X04
-#define SI114X_ADC_COUNTER_127ADCCLK 0X05
-#define SI114X_ADC_COUNTER_255ADCCLK 0X06
-#define SI114X_ADC_COUNTER_511ADCCLK 0X07
-
-#define SI114X_ADC_MISC_LOWRANGE 0X00
-#define SI114X_ADC_MISC_HIGHRANGE 0X20
-#define SI114X_ADC_MISC_ADC_NORMALPROXIMITY 0X00
-#define SI114X_ADC_MISC_ADC_RAWADC 0X04
-
-#define SI114X_INT_CFG_INTOE 0X01
-
-#define SI114X_IRQEN_ALS 0x01
-#define SI114X_IRQEN_PS1 0x04
-#define SI114X_IRQEN_PS2 0x08
-#define SI114X_IRQEN_PS3 0x10
-
-uint16_t si1145_visible;
-uint16_t si1145_infrared;
-uint16_t si1145_uvindex;
-
-bool si1145_type = false;
-uint8_t si1145_valid = 0;
-
-
-
-uint8_t Si1145ReadByte(uint8_t reg)
-{
-  return I2cRead8(SI114X_ADDR, reg);
-}
-
-uint16_t Si1145ReadHalfWord(uint8_t reg)
-{
-  return I2cRead16LE(SI114X_ADDR, reg);
-}
-
-bool Si1145WriteByte(uint8_t reg, uint16_t val)
-{
-  I2cWrite8(SI114X_ADDR, reg, val);
-}
-
-uint8_t Si1145WriteParamData(uint8_t p, uint8_t v)
-{
-  Si1145WriteByte(SI114X_WR, v);
-  Si1145WriteByte(SI114X_COMMAND, p | SI114X_SET);
-  return Si1145ReadByte(SI114X_RD);
-}
-
-
-
-bool Si1145Present(void)
-{
-  return (Si1145ReadByte(SI114X_PART_ID) == 0X45);
-}
-
-void Si1145Reset(void)
-{
-  Si1145WriteByte(SI114X_MEAS_RATE0, 0);
-  Si1145WriteByte(SI114X_MEAS_RATE1, 0);
-  Si1145WriteByte(SI114X_IRQ_ENABLE, 0);
-  Si1145WriteByte(SI114X_IRQ_MODE1, 0);
-  Si1145WriteByte(SI114X_IRQ_MODE2, 0);
-  Si1145WriteByte(SI114X_INT_CFG, 0);
-  Si1145WriteByte(SI114X_IRQ_STATUS, 0xFF);
-
-  Si1145WriteByte(SI114X_COMMAND, SI114X_RESET);
-  delay(10);
-  Si1145WriteByte(SI114X_HW_KEY, 0x17);
-  delay(10);
-}
-
-void Si1145DeInit(void)
-{
-
-
-  Si1145WriteByte(SI114X_UCOEFF0, 0x29);
-  Si1145WriteByte(SI114X_UCOEFF1, 0x89);
-  Si1145WriteByte(SI114X_UCOEFF2, 0x02);
-  Si1145WriteByte(SI114X_UCOEFF3, 0x00);
-  Si1145WriteParamData(SI114X_CHLIST, SI114X_CHLIST_ENUV | SI114X_CHLIST_ENALSIR | SI114X_CHLIST_ENALSVIS | SI114X_CHLIST_ENPS1);
-
-
-
-  Si1145WriteParamData(SI114X_PS1_ADCMUX, SI114X_ADCMUX_LARGE_IR);
-  Si1145WriteByte(SI114X_PS_LED21, SI114X_LED_CURRENT_22MA);
-  Si1145WriteParamData(SI114X_PSLED12_SELECT, SI114X_PSLED12_SELECT_PS1_LED1);
-
-
-
-  Si1145WriteParamData(SI114X_PS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_PS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_PS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE | SI114X_ADC_MISC_ADC_RAWADC);
-
-
-
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
-
-
-
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
-
-
-
-  Si1145WriteByte(SI114X_INT_CFG, SI114X_INT_CFG_INTOE);
-  Si1145WriteByte(SI114X_IRQ_ENABLE, SI114X_IRQEN_ALS);
-
-
-
-  Si1145WriteByte(SI114X_MEAS_RATE0, 0xFF);
-  Si1145WriteByte(SI114X_COMMAND, SI114X_PSALS_AUTO);
-}
-
-bool Si1145Begin(void)
-{
-  if (!Si1145Present()) { return false; }
-
-  Si1145Reset();
-  Si1145DeInit();
-  return true;
-}
-
-
-uint16_t Si1145ReadUV(void)
-{
-  return Si1145ReadHalfWord(SI114X_AUX_DATA0_UVINDEX0);
-}
-
-
-uint16_t Si1145ReadVisible(void)
-{
-  return Si1145ReadHalfWord(SI114X_ALS_VIS_DATA0);
-}
-
-
-uint16_t Si1145ReadIR(void)
-{
-  return Si1145ReadHalfWord(SI114X_ALS_IR_DATA0);
-}
-
-
-
-bool Si1145Read(void)
-{
-  if (si1145_valid) { si1145_valid--; }
-
-  if (!Si1145Present()) { return false; }
-
-  si1145_visible = Si1145ReadVisible();
-  si1145_infrared = Si1145ReadIR();
-  si1145_uvindex = Si1145ReadUV();
-  si1145_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-void Si1145Detect(void)
-{
-  if (I2cActive(SI114X_ADDR)) { return; }
-
-  if (Si1145Begin()) {
-    si1145_type = true;
-    I2cSetActiveFound(SI114X_ADDR, "SI1145");
-  }
-}
-
-void Si1145Update(void)
-{
-  if (!Si1145Read()) {
-    AddLogMissed("SI1145", si1145_valid);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SI1145[] PROGMEM =
-  "{s}SI1145 " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}"
-  "{s}SI1145 " D_INFRARED "{m}%d " D_UNIT_LUX "{e}"
-  "{s}SI1145 " D_UV_INDEX "{m}%d.%d{e}";
-#endif
-
-void Si1145Show(bool json)
-{
-  if (si1145_valid) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SI1145\":{\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_INFRARED "\":%d,\"" D_JSON_UV_INDEX "\":%d.%d}"),
-        si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, si1145_visible);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_SI1145, si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns24(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_19)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Si1145Detect();
-  }
-  else if (si1145_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Si1145Update();
-        break;
-      case FUNC_JSON_APPEND:
-        Si1145Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Si1145Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
-#ifdef USE_I2C
-#ifdef USE_LM75AD
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_26_lm75ad.ino"
-#define XSNS_26 26
-#define XI2C_20 20
-
-#define LM75AD_ADDRESS1 0x48
-#define LM75AD_ADDRESS2 0x49
-#define LM75AD_ADDRESS3 0x4A
-#define LM75AD_ADDRESS4 0x4B
-#define LM75AD_ADDRESS5 0x4C
-#define LM75AD_ADDRESS6 0x4D
-#define LM75AD_ADDRESS7 0x4E
-#define LM75AD_ADDRESS8 0x4F
-
-#define LM75_TEMP_REGISTER 0x00
-#define LM75_CONF_REGISTER 0x01
-#define LM75_THYST_REGISTER 0x02
-#define LM75_TOS_REGISTER 0x03
-
-bool lm75ad_type = false;
-uint8_t lm75ad_address;
-uint8_t lm75ad_addresses[] = { LM75AD_ADDRESS1, LM75AD_ADDRESS2, LM75AD_ADDRESS3, LM75AD_ADDRESS4, LM75AD_ADDRESS5, LM75AD_ADDRESS6, LM75AD_ADDRESS7, LM75AD_ADDRESS8 };
-
-void LM75ADDetect(void)
-{
-  for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
-    lm75ad_address = lm75ad_addresses[i];
-    if (I2cActive(lm75ad_address)) {
-      continue; }
-    if (!I2cSetDevice(lm75ad_address)) {
-      break;
-    }
-    uint16_t buffer;
-    if (I2cValidRead16(&buffer, lm75ad_address, LM75_THYST_REGISTER)) {
-      if (buffer == 0x4B00) {
-        lm75ad_type = true;
-        I2cSetActiveFound(lm75ad_address, "LM75AD");
-        break;
-      }
-    }
-  }
-}
-
-float LM75ADGetTemp(void)
-{
-  int16_t sign = 1;
-
-  uint16_t t = I2cRead16(lm75ad_address, LM75_TEMP_REGISTER);
-  if (t & 0x8000) {
-    t = (~t) +0x20;
-    sign = -1;
-  }
-  t = t >> 5;
-  return ConvertTemp(sign * t * 0.125);
-}
-
-void LM75ADShow(bool json)
-{
-  float t = LM75ADGetTemp();
-  char temperature[33];
-  dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"LM75AD\":{\"" D_JSON_TEMPERATURE "\":%s}"), temperature);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TEMP, "LM75AD", temperature, TempUnit());
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns26(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_20)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    LM75ADDetect();
-  }
-  else if (lm75ad_type) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        LM75ADShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        LM75ADShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-# 28 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-#ifdef USE_I2C
-#ifdef USE_APDS9960
-# 39 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-#define XSNS_27 27
-#define XI2C_21 21
-
-#if defined(USE_SHT) || defined(USE_VEML6070) || defined(USE_TSL2561)
-  #warning **** Turned off conflicting drivers SHT and VEML6070 ****
-  #ifdef USE_SHT
-  #undef USE_SHT
-  #endif
-  #ifdef USE_VEML6070
-  #undef USE_VEML6070
-  #endif
-  #ifdef USE_TSL2561
-  #undef USE_TSL2561
-  #endif
-#endif
-
-#define APDS9960_I2C_ADDR 0x39
-
-#define APDS9960_CHIPID_1 0xAB
-#define APDS9960_CHIPID_2 0x9C
-
-#define APDS9930_CHIPID_1 0x12
-#define APDS9930_CHIPID_2 0x39
-
-
-#define GESTURE_THRESHOLD_OUT 10
-#define GESTURE_SENSITIVITY_1 50
-#define GESTURE_SENSITIVITY_2 20
-
-uint8_t APDS9960addr;
-uint8_t APDS9960type = 0;
-char APDS9960stype[] = "APDS9960";
-char currentGesture[6];
-uint8_t gesture_mode = 1;
-
-
-volatile uint8_t recovery_loop_counter = 0;
-#define APDS9960_LONG_RECOVERY 50
-#define APDS9960_MAX_GESTURE_CYCLES 50
-bool APDS9960_overload = false;
-
-#ifdef USE_WEBSERVER
-const char HTTP_APDS_9960_SNS[] PROGMEM =
-  "{s}" "Red" "{m}%s{e}"
-  "{s}" "Green" "{m}%s{e}"
-  "{s}" "Blue" "{m}%s{e}"
-  "{s}" "Ambient" "{m}%s " D_UNIT_LUX "{e}"
-  "{s}" "CCT" "{m}%s " "K" "{e}"
-  "{s}" "Proximity" "{m}%s{e}";
-#endif
-# 97 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-#define FIFO_PAUSE_TIME 30
-
-
-#define APDS9960_ENABLE 0x80
-#define APDS9960_ATIME 0x81
-#define APDS9960_WTIME 0x83
-#define APDS9960_AILTL 0x84
-#define APDS9960_AILTH 0x85
-#define APDS9960_AIHTL 0x86
-#define APDS9960_AIHTH 0x87
-#define APDS9960_PILT 0x89
-#define APDS9960_PIHT 0x8B
-#define APDS9960_PERS 0x8C
-#define APDS9960_CONFIG1 0x8D
-#define APDS9960_PPULSE 0x8E
-#define APDS9960_CONTROL 0x8F
-#define APDS9960_CONFIG2 0x90
-#define APDS9960_ID 0x92
-#define APDS9960_STATUS 0x93
-#define APDS9960_CDATAL 0x94
-#define APDS9960_CDATAH 0x95
-#define APDS9960_RDATAL 0x96
-#define APDS9960_RDATAH 0x97
-#define APDS9960_GDATAL 0x98
-#define APDS9960_GDATAH 0x99
-#define APDS9960_BDATAL 0x9A
-#define APDS9960_BDATAH 0x9B
-#define APDS9960_PDATA 0x9C
-#define APDS9960_POFFSET_UR 0x9D
-#define APDS9960_POFFSET_DL 0x9E
-#define APDS9960_CONFIG3 0x9F
-#define APDS9960_GPENTH 0xA0
-#define APDS9960_GEXTH 0xA1
-#define APDS9960_GCONF1 0xA2
-#define APDS9960_GCONF2 0xA3
-#define APDS9960_GOFFSET_U 0xA4
-#define APDS9960_GOFFSET_D 0xA5
-#define APDS9960_GOFFSET_L 0xA7
-#define APDS9960_GOFFSET_R 0xA9
-#define APDS9960_GPULSE 0xA6
-#define APDS9960_GCONF3 0xAA
-#define APDS9960_GCONF4 0xAB
-#define APDS9960_GFLVL 0xAE
-#define APDS9960_GSTATUS 0xAF
-#define APDS9960_IFORCE 0xE4
-#define APDS9960_PICLEAR 0xE5
-#define APDS9960_CICLEAR 0xE6
-#define APDS9960_AICLEAR 0xE7
-#define APDS9960_GFIFO_U 0xFC
-#define APDS9960_GFIFO_D 0xFD
-#define APDS9960_GFIFO_L 0xFE
-#define APDS9960_GFIFO_R 0xFF
-
-
-#define APDS9960_PON 0b00000001
-#define APDS9960_AEN 0b00000010
-#define APDS9960_PEN 0b00000100
-#define APDS9960_WEN 0b00001000
-#define APSD9960_AIEN 0b00010000
-#define APDS9960_PIEN 0b00100000
-#define APDS9960_GEN 0b01000000
-#define APDS9960_GVALID 0b00000001
-
-
-#define OFF 0
-#define ON 1
-
-
-#define POWER 0
-#define AMBIENT_LIGHT 1
-#define PROXIMITY 2
-#define WAIT 3
-#define AMBIENT_LIGHT_INT 4
-#define PROXIMITY_INT 5
-#define GESTURE 6
-#define ALL 7
-
-
-#define LED_DRIVE_100MA 0
-#define LED_DRIVE_50MA 1
-#define LED_DRIVE_25MA 2
-#define LED_DRIVE_12_5MA 3
-
-
-#define PGAIN_1X 0
-#define PGAIN_2X 1
-#define PGAIN_4X 2
-#define PGAIN_8X 3
-
-
-#define AGAIN_1X 0
-#define AGAIN_4X 1
-#define AGAIN_16X 2
-#define AGAIN_64X 3
-
-
-#define GGAIN_1X 0
-#define GGAIN_2X 1
-#define GGAIN_4X 2
-#define GGAIN_8X 3
-
-
-#define LED_BOOST_100 0
-#define LED_BOOST_150 1
-#define LED_BOOST_200 2
-#define LED_BOOST_300 3
-
-
-#define GWTIME_0MS 0
-#define GWTIME_2_8MS 1
-#define GWTIME_5_6MS 2
-#define GWTIME_8_4MS 3
-#define GWTIME_14_0MS 4
-#define GWTIME_22_4MS 5
-#define GWTIME_30_8MS 6
-#define GWTIME_39_2MS 7
-
-
-#define DEFAULT_ATIME 0xdb
-#define DEFAULT_WTIME 246
-#define DEFAULT_PROX_PPULSE 0x87
-#define DEFAULT_GESTURE_PPULSE 0x89
-#define DEFAULT_POFFSET_UR 0
-#define DEFAULT_POFFSET_DL 0
-#define DEFAULT_CONFIG1 0x60
-#define DEFAULT_LDRIVE LED_DRIVE_100MA
-#define DEFAULT_PGAIN PGAIN_4X
-#define DEFAULT_AGAIN AGAIN_4X
-#define DEFAULT_PILT 0
-#define DEFAULT_PIHT 50
-#define DEFAULT_AILT 0xFFFF
-#define DEFAULT_AIHT 0
-#define DEFAULT_PERS 0x11
-#define DEFAULT_CONFIG2 0x01
-#define DEFAULT_CONFIG3 0
-#define DEFAULT_GPENTH 40
-#define DEFAULT_GEXTH 30
-#define DEFAULT_GCONF1 0x40
-#define DEFAULT_GGAIN GGAIN_4X
-#define DEFAULT_GLDRIVE LED_DRIVE_100MA
-#define DEFAULT_GWTIME GWTIME_2_8MS
-#define DEFAULT_GOFFSET 0
-#define DEFAULT_GPULSE 0xC9
-#define DEFAULT_GCONF3 0
-#define DEFAULT_GIEN 0
-
-#define ERROR 0xFF
-
-
-enum {
-  DIR_NONE,
-  DIR_LEFT,
-  DIR_RIGHT,
-  DIR_UP,
-  DIR_DOWN,
-  DIR_ALL
-};
-
-
-enum {
-  APDS9960_NA_STATE,
-  APDS9960_ALL_STATE
-};
-
-
-typedef struct gesture_data_type {
-    uint8_t u_data[32];
-    uint8_t d_data[32];
-    uint8_t l_data[32];
-    uint8_t r_data[32];
-    uint8_t index;
-    uint8_t total_gestures;
-    uint8_t in_threshold;
-    uint8_t out_threshold;
-} gesture_data_type;
-
-
- gesture_data_type gesture_data_;
- int16_t gesture_ud_delta_ = 0;
- int16_t gesture_lr_delta_ = 0;
- int16_t gesture_ud_count_ = 0;
- int16_t gesture_lr_count_ = 0;
- int16_t gesture_state_ = 0;
- int16_t gesture_motion_ = DIR_NONE;
-
- typedef struct color_data_type {
-    uint16_t a;
-    uint16_t r;
-    uint16_t g;
-    uint16_t b;
-    uint8_t p;
-    uint16_t cct;
-    uint16_t lux;
- } color_data_type;
-
- color_data_type color_data;
- uint8_t APDS9960_aTime = DEFAULT_ATIME;
-# 306 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- bool wireWriteByte(uint8_t val)
- {
-     Wire.beginTransmission(APDS9960_I2C_ADDR);
-     Wire.write(val);
-     if( Wire.endTransmission() != 0 ) {
-         return false;
-     }
-
-     return true;
- }
-# 325 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-int8_t wireReadDataBlock( uint8_t reg,
-                                        uint8_t *val,
-                                        uint16_t len)
-{
-    unsigned char i = 0;
-
-
-    if (!wireWriteByte(reg)) {
-        return -1;
-    }
-
-
-    Wire.requestFrom(APDS9960_I2C_ADDR, len);
-    while (Wire.available()) {
-        if (i >= len) {
-            return -1;
-        }
-        val[i] = Wire.read();
-        i++;
-    }
-
-    return i;
-}
-
-
-
-
-
-
-
-void calculateColorTemperature(void)
-{
-  float X, Y, Z;
-  float xc, yc;
-  float n;
-  float cct;
-
-
-
-
-
-  X = (-0.14282F * color_data.r) + (1.54924F * color_data.g) + (-0.95641F * color_data.b);
-  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b);
-  Z = (-0.68202F * color_data.r) + (0.77073F * color_data.g) + ( 0.56332F * color_data.b);
-
-
-  xc = (X) / (X + Y + Z);
-  yc = (Y) / (X + Y + Z);
-
-
-  n = (xc - 0.3320F) / (0.1858F - yc);
-
-
-  color_data.cct = (449.0F * FastPrecisePowf(n, 3)) + (3525.0F * FastPrecisePowf(n, 2)) + (6823.3F * n) + 5520.33F;
-
-  return;
-}
-# 392 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProxIntLowThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT) ;
-     return val;
- }
-
-
-
-
-
-
-  void setProxIntLowThresh(uint8_t threshold)
-  {
-        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold);
-  }
-
-
-
-
-
-
- uint8_t getProxIntHighThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
-     return val;
- }
-
-
-
-
-
-
-
- void setProxIntHighThresh(uint8_t threshold)
-   {
-         I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold);
-   }
-# 448 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getLEDDrive(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
-
-     val = (val >> 6) & 0b00000011;
-
-     return val;
- }
-# 471 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setLEDDrive(uint8_t drive)
-  {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-      drive &= 0b00000011;
-      drive = drive << 6;
-      val &= 0b00111111;
-      val |= drive;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
-  }
-# 500 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProximityGain(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
-
-     val = (val >> 2) & 0b00000011;
-
-     return val;
- }
-# 523 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setProximityGain(uint8_t drive)
- {
-     uint8_t val;
-
-
-   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-     drive &= 0b00000011;
-     drive = drive << 2;
-     val &= 0b11110011;
-     val |= drive;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
- }
-# 564 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setAmbientLightGain(uint8_t drive)
-  {
-      uint8_t val;
-
-
-      val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-      drive &= 0b00000011;
-      val &= 0b11111100;
-      val |= drive;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
-  }
-# 591 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getLEDBoost(void)
- {
-     uint8_t val;
-
-
-   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
-
-
-     val = (val >> 4) & 0b00000011;
-
-     return val;
- }
-# 615 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setLEDBoost(uint8_t boost)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
-
-     boost &= 0b00000011;
-     boost = boost << 4;
-     val &= 0b11001111;
-     val |= boost;
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, val) ;
- }
-
-
-
-
-
-
- uint8_t getProxGainCompEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     val = (val >> 5) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
-  void setProxGainCompEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 5;
-     val &= 0b11011111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
- }
-# 683 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProxPhotoMask(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     val &= 0b00001111;
-
-     return val;
- }
-# 708 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setProxPhotoMask(uint8_t mask)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     mask &= 0b00001111;
-     val &= 0b11110000;
-     val |= mask;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
- }
-
-
-
-
-
-
- uint8_t getGestureEnterThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GPENTH) ;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureEnterThresh(uint8_t threshold)
- {
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPENTH, threshold) ;
-
- }
-
-
-
-
-
-
- uint8_t getGestureExitThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GEXTH) ;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureExitThresh(uint8_t threshold)
- {
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GEXTH, threshold) ;
- }
-# 786 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureGain(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val = (val >> 5) & 0b00000011;
-
-     return val;
- }
-# 810 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureGain(uint8_t gain)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     gain &= 0b00000011;
-     gain = gain << 5;
-     val &= 0b10011111;
-     val |= gain;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-# 838 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureLEDDrive(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val = (val >> 3) & 0b00000011;
-
-     return val;
- }
-# 862 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureLEDDrive(uint8_t drive)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     drive &= 0b00000011;
-     drive = drive << 3;
-     val &= 0b11100111;
-     val |= drive;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-# 894 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureWaitTime(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val &= 0b00000111;
-
-     return val;
- }
-# 922 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureWaitTime(uint8_t time)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     time &= 0b00000111;
-     val &= 0b11111000;
-     val |= time;
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-
-
-
-
-
-
- void getLightIntLowThreshold(uint16_t &threshold)
- {
-     uint8_t val_byte;
-     threshold = 0;
-
-
-     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AILTL) ;
-     threshold = val_byte;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_byte) ;
-     threshold = threshold + ((uint16_t)val_byte << 8);
- }
-
-
-
-
-
-
-
-   void setLightIntLowThreshold(uint16_t threshold)
-   {
-       uint8_t val_low;
-       uint8_t val_high;
-
-
-       val_low = threshold & 0x00FF;
-       val_high = (threshold & 0xFF00) >> 8;
-
-
-       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTL, val_low) ;
-
-
-       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_high) ;
-
-   }
-
-
-
-
-
-
-
- void getLightIntHighThreshold(uint16_t &threshold)
- {
-     uint8_t val_byte;
-     threshold = 0;
-
-
-     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AIHTL);
-     threshold = val_byte;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_byte) ;
-     threshold = threshold + ((uint16_t)val_byte << 8);
- }
-
-
-
-
-
-
-  void setLightIntHighThreshold(uint16_t threshold)
-  {
-      uint8_t val_low;
-      uint8_t val_high;
-
-
-      val_low = threshold & 0x00FF;
-      val_high = (threshold & 0xFF00) >> 8;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTL, val_low);
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_high) ;
-  }
-
-
-
-
-
-
-
- void getProximityIntLowThreshold(uint8_t &threshold)
- {
-     threshold = 0;
-
-
-     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT);
-
- }
-
-
-
-
-
-
- void setProximityIntLowThreshold(uint8_t threshold)
- {
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold) ;
- }
-# 1055 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
- void getProximityIntHighThreshold(uint8_t &threshold)
- {
-     threshold = 0;
-
-
-     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
-
- }
-
-
-
-
-
-
- void setProximityIntHighThreshold(uint8_t threshold)
- {
-
-
-   I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold) ;
- }
-
-
-
-
-
-
- uint8_t getAmbientLightIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     val = (val >> 4) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setAmbientLightIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE);
-
-
-     enable &= 0b00000001;
-     enable = enable << 4;
-     val &= 0b11101111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
- }
-
-
-
-
-
-
- uint8_t getProximityIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     val = (val >> 5) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setProximityIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 5;
-     val &= 0b11011111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
- }
-
-
-
-
-
-
- uint8_t getGestureIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     val = (val >> 1) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 1;
-     val &= 0b11111101;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
- }
-
-
-
-
-
- void clearAmbientLightInt(void)
- {
-     uint8_t throwaway;
-     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AICLEAR);
- }
-
-
-
-
-
- void clearProximityInt(void)
- {
-     uint8_t throwaway;
-     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PICLEAR) ;
-
- }
-
-
-
-
-
-
- uint8_t getGestureMode(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     val &= 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureMode(uint8_t mode)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     mode &= 0b00000001;
-     val &= 0b11111110;
-     val |= mode;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
- }
-
-
-bool APDS9960_init(void)
-{
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, DEFAULT_ATIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, DEFAULT_WTIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_PROX_PPULSE) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_UR, DEFAULT_POFFSET_UR) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_DL, DEFAULT_POFFSET_DL) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG1, DEFAULT_CONFIG1) ;
-
-    setLEDDrive(DEFAULT_LDRIVE);
-
-    setProximityGain(DEFAULT_PGAIN);
-
-    setAmbientLightGain(DEFAULT_AGAIN);
-
-    setProxIntLowThresh(DEFAULT_PILT) ;
-
-    setProxIntHighThresh(DEFAULT_PIHT);
-
-    setLightIntLowThreshold(DEFAULT_AILT) ;
-
-    setLightIntHighThreshold(DEFAULT_AIHT) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PERS, DEFAULT_PERS) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, DEFAULT_CONFIG2) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, DEFAULT_CONFIG3) ;
-
-
-    setGestureEnterThresh(DEFAULT_GPENTH);
-
-    setGestureExitThresh(DEFAULT_GEXTH) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF1, DEFAULT_GCONF1) ;
-
-    setGestureGain(DEFAULT_GGAIN) ;
-
-    setGestureLEDDrive(DEFAULT_GLDRIVE) ;
-
-    setGestureWaitTime(DEFAULT_GWTIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_U, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_D, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_L, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_R, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPULSE, DEFAULT_GPULSE) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF3, DEFAULT_GCONF3) ;
-
-    setGestureIntEnable(DEFAULT_GIEN);
-
-    disablePower();
-
-    return true;
-}
-# 1333 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-uint8_t getMode(void)
-{
-    uint8_t enable_value;
-
-
-     enable_value = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-    return enable_value;
-}
-
-
-
-
-
-
-
-void setMode(uint8_t mode, uint8_t enable)
-{
-    uint8_t reg_val;
-
-
-    reg_val = getMode();
-
-
-
-    enable = enable & 0x01;
-    if( mode >= 0 && mode <= 6 ) {
-        if (enable) {
-            reg_val |= (1 << mode);
-        } else {
-            reg_val &= ~(1 << mode);
-        }
-    } else if( mode == ALL ) {
-        if (enable) {
-            reg_val = 0x7F;
-        } else {
-            reg_val = 0x00;
-        }
-    }
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, reg_val) ;
-}
-
-
-
-
-
-
-void enableLightSensor(void)
-{
-
-    setAmbientLightGain(DEFAULT_AGAIN);
-    setAmbientLightIntEnable(0);
-    enablePower() ;
-    setMode(AMBIENT_LIGHT, 1) ;
-}
-
-
-
-
-
-void disableLightSensor(void)
-{
-    setAmbientLightIntEnable(0) ;
-    setMode(AMBIENT_LIGHT, 0) ;
-}
-
-
-
-
-
-
-void enableProximitySensor(void)
-{
-
-    setProximityGain(DEFAULT_PGAIN);
-    setLEDDrive(DEFAULT_LDRIVE) ;
-    setProximityIntEnable(0) ;
-    enablePower();
-    setMode(PROXIMITY, 1) ;
-}
-
-
-
-
-
-void disableProximitySensor(void)
-{
- setProximityIntEnable(0) ;
-  setMode(PROXIMITY, 0) ;
-}
-
-
-
-
-
-
-void enableGestureSensor(void)
-{
-
-
-
-
-
-
-
-    resetGestureParameters();
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, 0xFF) ;
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_GESTURE_PPULSE) ;
-    setLEDBoost(LED_BOOST_100);
-    setGestureIntEnable(0) ;
-    setGestureMode(1);
-    enablePower() ;
-    setMode(WAIT, 1) ;
-    setMode(PROXIMITY, 1) ;
-    setMode(GESTURE, 1);
-}
-
-
-
-
-
-void disableGestureSensor(void)
-{
-    resetGestureParameters();
-    setGestureIntEnable(0) ;
-    setGestureMode(0) ;
-    setMode(GESTURE, 0) ;
-}
-
-
-
-
-
-
-bool isGestureAvailable(void)
-{
-    uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS) ;
-
-
-    val &= APDS9960_GVALID;
-
-
-    if( val == 1) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-
-
-
-
-
-int16_t readGesture(void)
-{
-    uint8_t fifo_level = 0;
-    uint8_t bytes_read = 0;
-    uint8_t fifo_data[128];
-    uint8_t gstatus;
-    uint16_t motion;
-    uint16_t i;
-    uint8_t gesture_loop_counter = 0;
-
-
-    if( !isGestureAvailable() || !(getMode() & 0b01000001) ) {
-        return DIR_NONE;
-    }
-
-
-    while(1) {
-        if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){
-          disableGestureSensor();
-          APDS9960_overload = true;
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("Sensor overload"));
-        }
-        gesture_loop_counter += 1;
-
-        delay(FIFO_PAUSE_TIME);
-
-
-       gstatus = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS);
-
-
-        if( (gstatus & APDS9960_GVALID) == APDS9960_GVALID ) {
-
-
-            fifo_level = I2cRead8(APDS9960_I2C_ADDR,APDS9960_GFLVL) ;
-
-
-            if( fifo_level > 0) {
-                bytes_read = wireReadDataBlock( APDS9960_GFIFO_U,
-                                                (uint8_t*)fifo_data,
-                                                (fifo_level * 4) );
-                if( bytes_read == -1 ) {
-                    return ERROR;
-                }
-
-
-                if( bytes_read >= 4 ) {
-                    for( i = 0; i < bytes_read; i += 4 ) {
-                        gesture_data_.u_data[gesture_data_.index] = \
-                                                            fifo_data[i + 0];
-                        gesture_data_.d_data[gesture_data_.index] = \
-                                                            fifo_data[i + 1];
-                        gesture_data_.l_data[gesture_data_.index] = \
-                                                            fifo_data[i + 2];
-                        gesture_data_.r_data[gesture_data_.index] = \
-                                                            fifo_data[i + 3];
-                        gesture_data_.index++;
-                        gesture_data_.total_gestures++;
-                    }
-
-                    if( processGestureData() ) {
-                        if( decodeGesture() ) {
-
-                        }
-                    }
-
-                    gesture_data_.index = 0;
-                    gesture_data_.total_gestures = 0;
-                }
-            }
-        } else {
-
-
-            delay(FIFO_PAUSE_TIME);
-            decodeGesture();
-            motion = gesture_motion_;
-            resetGestureParameters();
-            return motion;
-        }
-    }
-}
-
-
-
-
-
-void enablePower(void)
-{
-    setMode(POWER, 1) ;
-}
-
-
-
-
-
-void disablePower(void)
-{
-    setMode(POWER, 0) ;
-}
-# 1600 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-void readAllColorAndProximityData(void)
-{
-  if (I2cReadBuffer(APDS9960_I2C_ADDR, APDS9960_CDATAL, (uint8_t *) &color_data, (uint16_t)9))
-  {
-
-
-  }
-}
-# 1616 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-void resetGestureParameters(void)
-{
-    gesture_data_.index = 0;
-    gesture_data_.total_gestures = 0;
-
-    gesture_ud_delta_ = 0;
-    gesture_lr_delta_ = 0;
-
-    gesture_ud_count_ = 0;
-    gesture_lr_count_ = 0;
-
-    gesture_state_ = 0;
-    gesture_motion_ = DIR_NONE;
-}
-
-
-
-
-
-
-bool processGestureData(void)
-{
-    uint8_t u_first = 0;
-    uint8_t d_first = 0;
-    uint8_t l_first = 0;
-    uint8_t r_first = 0;
-    uint8_t u_last = 0;
-    uint8_t d_last = 0;
-    uint8_t l_last = 0;
-    uint8_t r_last = 0;
-    uint16_t ud_ratio_first;
-    uint16_t lr_ratio_first;
-    uint16_t ud_ratio_last;
-    uint16_t lr_ratio_last;
-    uint16_t ud_delta;
-    uint16_t lr_delta;
-    uint16_t i;
-
-
-    if( gesture_data_.total_gestures <= 4 ) {
-        return false;
-    }
-
-
-    if( (gesture_data_.total_gestures <= 32) && \
-        (gesture_data_.total_gestures > 0) ) {
-
-
-        for( i = 0; i < gesture_data_.total_gestures; i++ ) {
-            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
-
-                u_first = gesture_data_.u_data[i];
-                d_first = gesture_data_.d_data[i];
-                l_first = gesture_data_.l_data[i];
-                r_first = gesture_data_.r_data[i];
-                break;
-            }
-        }
-
-
-        if( (u_first == 0) || (d_first == 0) || \
-            (l_first == 0) || (r_first == 0) ) {
-
-            return false;
-        }
-
-        for( i = gesture_data_.total_gestures - 1; i >= 0; i-- ) {
-
-            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
-
-                u_last = gesture_data_.u_data[i];
-                d_last = gesture_data_.d_data[i];
-                l_last = gesture_data_.l_data[i];
-                r_last = gesture_data_.r_data[i];
-                break;
-            }
-        }
-    }
-
-
-    ud_ratio_first = ((u_first - d_first) * 100) / (u_first + d_first);
-    lr_ratio_first = ((l_first - r_first) * 100) / (l_first + r_first);
-    ud_ratio_last = ((u_last - d_last) * 100) / (u_last + d_last);
-    lr_ratio_last = ((l_last - r_last) * 100) / (l_last + r_last);
-
-
-    ud_delta = ud_ratio_last - ud_ratio_first;
-    lr_delta = lr_ratio_last - lr_ratio_first;
-
-
-    gesture_ud_delta_ += ud_delta;
-    gesture_lr_delta_ += lr_delta;
-
-
-    if( gesture_ud_delta_ >= GESTURE_SENSITIVITY_1 ) {
-        gesture_ud_count_ = 1;
-    } else if( gesture_ud_delta_ <= -GESTURE_SENSITIVITY_1 ) {
-        gesture_ud_count_ = -1;
-    } else {
-        gesture_ud_count_ = 0;
-    }
-
-
-    if( gesture_lr_delta_ >= GESTURE_SENSITIVITY_1 ) {
-        gesture_lr_count_ = 1;
-    } else if( gesture_lr_delta_ <= -GESTURE_SENSITIVITY_1 ) {
-        gesture_lr_count_ = -1;
-    } else {
-        gesture_lr_count_ = 0;
-    }
-    return false;
-}
-
-
-
-
-
-
-bool decodeGesture(void)
-{
-
-
-    if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 0) ) {
-        gesture_motion_ = DIR_UP;
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 0) ) {
-        gesture_motion_ = DIR_DOWN;
-    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == 1) ) {
-        gesture_motion_ = DIR_RIGHT;
-    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == -1) ) {
-        gesture_motion_ = DIR_LEFT;
-    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_UP;
-        } else {
-            gesture_motion_ = DIR_RIGHT;
-        }
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == -1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_DOWN;
-        } else {
-            gesture_motion_ = DIR_LEFT;
-        }
-    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == -1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_UP;
-        } else {
-            gesture_motion_ = DIR_LEFT;
-        }
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_DOWN;
-        } else {
-            gesture_motion_ = DIR_RIGHT;
-        }
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
-void handleGesture(void) {
-    if (isGestureAvailable() ) {
-    switch (readGesture()) {
-      case DIR_UP:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("UP"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up"));
-        break;
-      case DIR_DOWN:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("DOWN"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down"));
-        break;
-      case DIR_LEFT:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LEFT"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
-        break;
-      case DIR_RIGHT:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("RIGHT"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
-        break;
-      default:
-      if(APDS9960_overload)
-      {
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LONG"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
-      }
-      else{
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("NONE"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
-      }
-    }
-    MqttPublishSensor();
-  }
-}
-
-void APDS9960_adjustATime(void)
-{
-
-  I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);
-
-
-  if (color_data.a < (uint16_t)20){
-    APDS9960_aTime = 0x40;
-  }
-  else if (color_data.a < (uint16_t)40){
-    APDS9960_aTime = 0x80;
-  }
-  else if (color_data.a < (uint16_t)50){
-    APDS9960_aTime = DEFAULT_ATIME;
-  }
-  else if (color_data.a < (uint16_t)70){
-    APDS9960_aTime = 0xc0;
-  }
-  if (color_data.a < 200){
-    APDS9960_aTime = 0xe9;
-  }
-
-
-
-  else{
-    APDS9960_aTime = 0xff;
-  }
-
-
-  I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, APDS9960_aTime);
-  enablePower();
-  enableLightSensor();
-  delay(20);
-}
-
-
-void APDS9960_loop(void)
-{
-  if (recovery_loop_counter > 0){
-    recovery_loop_counter -= 1;
-  }
-  if (recovery_loop_counter == 1 && APDS9960_overload){
-    enableGestureSensor();
-    APDS9960_overload = false;
-    Response_P(PSTR("{\"Gesture\":\"On\"}"));
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-    gesture_mode = 1;
-  }
-
-  if (gesture_mode) {
-      if (recovery_loop_counter == 0){
-      handleGesture();
-
-        if (APDS9960_overload)
-        {
-        disableGestureSensor();
-        recovery_loop_counter = APDS9960_LONG_RECOVERY;
-        Response_P(PSTR("{\"Gesture\":\"Off\"}"));
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-        gesture_mode = 0;
-        }
-      }
-  }
-}
-
-void APDS9960_detect(void)
-{
-  if (APDS9960type || I2cActive(APDS9960_I2C_ADDR)) { return; }
-
-  APDS9960type = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ID);
-  if (APDS9960type == APDS9960_CHIPID_1 || APDS9960type == APDS9960_CHIPID_2) {
-    if (APDS9960_init()) {
-      I2cSetActiveFound(APDS9960_I2C_ADDR, APDS9960stype);
-
-      enableProximitySensor();
-      enableGestureSensor();
-    } else {
-      APDS9960type = 0;
-    }
-  } else {
-    APDS9960type = 0;
-  }
-  currentGesture[0] = '\0';
-}
-
-
-
-
-
-void APDS9960_show(bool json)
-{
-  if (!APDS9960type) { return; }
-
-  if (!gesture_mode && !APDS9960_overload) {
-    char red_chr[10];
-    char green_chr[10];
-    char blue_chr[10];
-    char ambient_chr[10];
-    char cct_chr[10];
-    char prox_chr[10];
-
-    readAllColorAndProximityData();
-
-    sprintf (ambient_chr, "%u", color_data.a/4);
-    sprintf (red_chr, "%u", color_data.r);
-    sprintf (green_chr, "%u", color_data.g);
-    sprintf (blue_chr, "%u", color_data.b );
-    sprintf (prox_chr, "%u", color_data.p );
-
-
-
-
-
-    calculateColorTemperature();
-    sprintf (cct_chr, "%u", color_data.cct);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"CCT\":%s,\"Proximity\":%s}"),
-        APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_APDS_9960_SNS, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr );
-#endif
-    }
-  }
-  else {
-    if (json && (currentGesture[0] != '\0' )) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":1}"), APDS9960stype, currentGesture);
-      currentGesture[0] = '\0';
-    }
-  }
-}
-# 1961 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_27_apds9960.ino"
-bool APDS9960CommandSensor(void)
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      disableGestureSensor();
-      gesture_mode = 0;
-      enableLightSensor();
-      APDS9960_overload = false;
-      break;
-    case 1:
-      if (APDS9960type) {
-        setGestureGain(DEFAULT_GGAIN);
-        setProximityGain(DEFAULT_PGAIN);
-        disableLightSensor();
-        enableGestureSensor();
-        gesture_mode = 1;
-      }
-      break;
-    case 2:
-      if (APDS9960type) {
-        setGestureGain(GGAIN_2X);
-        setProximityGain(PGAIN_2X);
-        disableLightSensor();
-        enableGestureSensor();
-        gesture_mode = 1;
-      }
-      break;
-    default:
-      int temp_aTime = (uint8_t)XdrvMailbox.payload;
-      if (temp_aTime > 2 && temp_aTime < 256){
-        disablePower();
-        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, temp_aTime);
-        enablePower();
-        enableLightSensor();
-      }
-    break;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_27, GetStateText(gesture_mode));
-
-  return serviced;
-}
-
-
-
-
-
-bool Xsns27(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_21)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    APDS9960_detect();
-  }
-  else if (APDS9960type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-          APDS9960_loop();
-          break;
-      case FUNC_COMMAND_SENSOR:
-          if (XSNS_27 == XdrvMailbox.index) {
-          result = APDS9960CommandSensor();
-          }
-          break;
-      case FUNC_JSON_APPEND:
-          APDS9960_show(1);
-          break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        APDS9960_show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
-#ifdef USE_TM1638
-
-
-
-
-
-
-#define XSNS_28 28
-
-#define TM1638_COLOR_NONE 0
-#define TM1638_COLOR_RED 1
-#define TM1638_COLOR_GREEN 2
-
-#define TM1638_CLOCK_DELAY 1
-
-uint8_t tm1638_type = 1;
-uint8_t tm1638_clock_pin = 0;
-uint8_t tm1638_data_pin = 0;
-uint8_t tm1638_strobe_pin = 0;
-uint8_t tm1638_displays = 8;
-uint8_t tm1638_active_display = 1;
-uint8_t tm1638_intensity = 0;
-uint8_t tm1638_state = 0;
-
-
-
-
-
-
-void Tm16XXSend(uint8_t data)
-{
- for (uint32_t i = 0; i < 8; i++) {
-    digitalWrite(tm1638_data_pin, !!(data & (1 << i)));
-    digitalWrite(tm1638_clock_pin, LOW);
-    delayMicroseconds(TM1638_CLOCK_DELAY);
-    digitalWrite(tm1638_clock_pin, HIGH);
-  }
-}
-
-void Tm16XXSendCommand(uint8_t cmd)
-{
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(cmd);
-  digitalWrite(tm1638_strobe_pin, HIGH);
-}
-
-void TM16XXSendData(uint8_t address, uint8_t data)
-{
-  Tm16XXSendCommand(0x44);
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(0xC0 | address);
-  Tm16XXSend(data);
-  digitalWrite(tm1638_strobe_pin, HIGH);
-}
-
-uint8_t Tm16XXReceive(void)
-{
-  uint8_t temp = 0;
-
-
-  pinMode(tm1638_data_pin, INPUT);
-  digitalWrite(tm1638_data_pin, HIGH);
-
-  for (uint32_t i = 0; i < 8; ++i) {
-    digitalWrite(tm1638_clock_pin, LOW);
-    delayMicroseconds(TM1638_CLOCK_DELAY);
-    temp |= digitalRead(tm1638_data_pin) << i;
-    digitalWrite(tm1638_clock_pin, HIGH);
-  }
-
-
-  pinMode(tm1638_data_pin, OUTPUT);
-  digitalWrite(tm1638_data_pin, LOW);
-
-  return temp;
-}
-
-
-
-void Tm16XXClearDisplay(void)
-{
-  for (uint32_t i = 0; i < tm1638_displays; i++) {
-    TM16XXSendData(i << 1, 0);
-  }
-}
-
-void Tm1638SetLED(uint8_t color, uint8_t pos)
-{
-  TM16XXSendData((pos << 1) + 1, color);
-}
-
-void Tm1638SetLEDs(word leds)
-{
-  for (uint32_t i = 0; i < tm1638_displays; i++) {
-    uint8_t color = 0;
-
-    if ((leds & (1 << i)) != 0) {
-      color |= TM1638_COLOR_RED;
-    }
-
-    if ((leds & (1 << (i + 8))) != 0) {
-      color |= TM1638_COLOR_GREEN;
-    }
-
-    Tm1638SetLED(color, i);
-  }
-}
-
-uint8_t Tm1638GetButtons(void)
-{
-  uint8_t keys = 0;
-
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(0x42);
-  for (uint32_t i = 0; i < 4; i++) {
-    keys |= Tm16XXReceive() << i;
-  }
-  digitalWrite(tm1638_strobe_pin, HIGH);
-
-  return keys;
-}
-
-
-
-void TmInit(void)
-{
-  tm1638_type = 0;
-  if ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99)) {
-    tm1638_clock_pin = pin[GPIO_TM16CLK];
-    tm1638_data_pin = pin[GPIO_TM16DIO];
-    tm1638_strobe_pin = pin[GPIO_TM16STB];
-
-    pinMode(tm1638_data_pin, OUTPUT);
-    pinMode(tm1638_clock_pin, OUTPUT);
-    pinMode(tm1638_strobe_pin, OUTPUT);
-
-    digitalWrite(tm1638_strobe_pin, HIGH);
-    digitalWrite(tm1638_clock_pin, HIGH);
-
-    Tm16XXSendCommand(0x40);
-    Tm16XXSendCommand(0x80 | (tm1638_active_display ? 8 : 0) | tmin(7, tm1638_intensity));
-
-    digitalWrite(tm1638_strobe_pin, LOW);
-    Tm16XXSend(0xC0);
-    for (uint32_t i = 0; i < 16; i++) {
-      Tm16XXSend(0x00);
-    }
-    digitalWrite(tm1638_strobe_pin, HIGH);
-
-    tm1638_type = 1;
-    tm1638_state = 1;
-  }
-}
-
-void TmLoop(void)
-{
-  if (tm1638_state) {
-    uint8_t buttons = Tm1638GetButtons();
-    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-      SwitchSetVirtual(i, (buttons &1) ^1);
-      uint8_t color = (SwitchGetVirtual(i)) ? TM1638_COLOR_NONE : TM1638_COLOR_RED;
-      Tm1638SetLED(color, i);
-      buttons >>= 1;
-    }
-    SwitchHandler(1);
-  }
-}
-# 201 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
-bool Xsns28(uint8_t function)
-{
-  bool result = false;
-
-  if (tm1638_type) {
-    switch (function) {
-      case FUNC_INIT:
-        TmInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        TmLoop();
-        break;
-# 223 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_28_tm1638.ino"
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-#ifdef USE_I2C
-#ifdef USE_MCP230xx
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-#define XSNS_29 29
-#define XI2C_22 22
-
-
-
-
-
-uint8_t MCP230xx_IODIR = 0x00;
-uint8_t MCP230xx_GPINTEN = 0x02;
-uint8_t MCP230xx_IOCON = 0x05;
-uint8_t MCP230xx_GPPU = 0x06;
-uint8_t MCP230xx_INTF = 0x07;
-uint8_t MCP230xx_INTCAP = 0x08;
-uint8_t MCP230xx_GPIO = 0x09;
-
-uint8_t mcp230xx_type = 0;
-uint8_t mcp230xx_pincount = 0;
-uint8_t mcp230xx_int_en = 0;
-uint8_t mcp230xx_int_prio_counter = 0;
-uint8_t mcp230xx_int_counter_en = 0;
-uint8_t mcp230xx_int_retainer_en = 0;
-uint8_t mcp230xx_int_sec_counter = 0;
-
-uint8_t mcp230xx_int_report_defer_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-uint16_t mcp230xx_int_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-uint8_t mcp230xx_int_retainer[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-unsigned long int_millis[16];
-
-const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL_UP\":\"%s\",\"INT_MODE\":\"%s\",\"STATE\":\"%s\"}}";
-
-const char MCP230XX_INTCFG_RESPONSE[] PROGMEM = "{\"MCP230xx_INT%s\":{\"D_%i\":%i}}";
-
-#ifdef USE_MCP230xx_OUTPUT
-const char MCP230XX_CMND_RESPONSE[] PROGMEM = "{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"}}";
-#endif
-
-void MCP230xx_CheckForIntCounter(void) {
-  uint8_t en = 0;
-  for (uint32_t ca=0;ca<16;ca++) {
-    if (Settings.mcp230xx_config[ca].int_count_en) {
-      en=1;
-    }
-  }
-  if (!Settings.mcp230xx_int_timer) en=0;
-  mcp230xx_int_counter_en=en;
-  if (!mcp230xx_int_counter_en) {
-    for (uint32_t ca=0;ca<16;ca++) {
-      mcp230xx_int_counter[ca] = 0;
-    }
-  }
-}
-
-void MCP230xx_CheckForIntRetainer(void) {
-  uint8_t en = 0;
-  for (uint32_t ca=0;ca<16;ca++) {
-    if (Settings.mcp230xx_config[ca].int_retain_flag) {
-      en=1;
-    }
-  }
-  mcp230xx_int_retainer_en=en;
-  if (!mcp230xx_int_retainer_en) {
-    for (uint32_t ca=0;ca<16;ca++) {
-      mcp230xx_int_retainer[ca] = 0;
-    }
-  }
-}
-
-const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) {
-#ifdef USE_MCP230xx_OUTPUT
-if ((6 == pinmod) && (statu < 2)) { statu = abs(statu-1); }
-#endif
-  switch (statu) {
-    case 0:
-      return "OFF";
-      break;
-    case 1:
-      return "ON";
-      break;
-#ifdef USE_MCP230xx_OUTPUT
-    case 2:
-      return "TOGGLE";
-      break;
-#endif
-  }
-  return "";
-}
-
-const char* IntModeTxt(uint8_t intmo) {
-  switch (intmo) {
-    case 0:
-      return "ALL";
-      break;
-    case 1:
-      return "EVENT";
-      break;
-    case 2:
-      return "TELE";
-      break;
-    case 3:
-      return "DISABLED";
-      break;
-  }
-  return "";
-}
-
-uint8_t MCP230xx_readGPIO(uint8_t port) {
-  return I2cRead8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port);
-}
-
-void MCP230xx_ApplySettings(void)
-{
-  uint8_t int_en = 0;
-  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
-    uint8_t reg_gppu = 0;
-    uint8_t reg_gpinten = 0;
-    uint8_t reg_iodir = 0xFF;
-#ifdef USE_MCP230xx_OUTPUT
-    uint8_t reg_portpins = 0x00;
-#endif
-    for (uint32_t idx = 0; idx < 8; idx++) {
-      switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) {
-        case 0 ... 1:
-          reg_iodir |= (1 << idx);
-          break;
-        case 2 ... 4:
-          reg_iodir |= (1 << idx);
-          reg_gpinten |= (1 << idx);
-          int_en = 1;
-          break;
-#ifdef USE_MCP230xx_OUTPUT
-        case 5 ... 6:
-          reg_iodir &= ~(1 << idx);
-          if (Settings.flag.save_state) {
-            reg_portpins |= (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].saved_state << idx);
-          } else {
-            if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
-              reg_portpins |= (1 << idx);
-            }
-          }
-          break;
-#endif
-        default:
-          break;
-      }
-#ifdef USE_MCP230xx_OUTPUT
-      if ((Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) {
-        reg_gppu |= (1 << idx);
-      }
-#else
-      if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
-        reg_gppu |= (1 << idx);
-      }
-#endif
-    }
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPPU+mcp230xx_port, reg_gppu);
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten);
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IODIR+mcp230xx_port, reg_iodir);
-#ifdef USE_MCP230xx_OUTPUT
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO+mcp230xx_port, reg_portpins);
-#endif
-  }
-  for (uint32_t idx=0;idx<mcp230xx_pincount;idx++) {
-    int_millis[idx]=millis();
-  }
-  mcp230xx_int_en = int_en;
-  MCP230xx_CheckForIntCounter();
-  MCP230xx_CheckForIntRetainer();
-}
-
-void MCP230xx_Detect(void)
-{
-  if (I2cActive(USE_MCP230xx_ADDR)) { return; }
-
-  uint8_t buffer;
-
-  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x80);
-  if (I2cValidRead8(&buffer, USE_MCP230xx_ADDR, MCP230xx_IOCON)) {
-    if (0x00 == buffer) {
-      mcp230xx_type = 1;
-      I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23008");
-      mcp230xx_pincount = 8;
-      MCP230xx_ApplySettings();
-    } else {
-      if (0x80 == buffer) {
-        mcp230xx_type = 2;
-        I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23017");
-        mcp230xx_pincount = 16;
-
-        I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x00);
-
-        MCP230xx_GPINTEN = 0x04;
-        MCP230xx_GPPU = 0x0C;
-        MCP230xx_INTF = 0x0E;
-        MCP230xx_INTCAP = 0x10;
-        MCP230xx_GPIO = 0x12;
-        MCP230xx_ApplySettings();
-      }
-    }
-  }
-}
-
-void MCP230xx_CheckForInterrupt(void) {
-  uint8_t intf;
-  uint8_t mcp230xx_intcap = 0;
-  uint8_t report_int;
-  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
-    if (I2cValidRead8(&intf,USE_MCP230xx_ADDR,MCP230xx_INTF+mcp230xx_port)) {
-      if (intf > 0) {
-        if (I2cValidRead8(&mcp230xx_intcap, USE_MCP230xx_ADDR, MCP230xx_INTCAP+mcp230xx_port)) {
-          for (uint32_t intp = 0; intp < 8; intp++) {
-            if ((intf >> intp) & 0x01) {
-              report_int = 0;
-              if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode > 1) {
-                switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode) {
-                  case 2:
-                    report_int = 1;
-                    break;
-                  case 3:
-                    if (((mcp230xx_intcap >> intp) & 0x01) == 0) report_int = 1;
-                    break;
-                  case 4:
-                    if (((mcp230xx_intcap >> intp) & 0x01) == 1) report_int = 1;
-                    break;
-                  default:
-                    break;
-                }
-
-                if ((mcp230xx_int_counter_en) && (report_int)) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
-                    mcp230xx_int_counter[intp+(mcp230xx_port*8)]++;
-                  }
-                }
-
-                if (report_int) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
-                    mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]++;
-                    if (mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)] >= Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
-                      mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]=0;
-                    } else {
-                      report_int = 0;
-                    }
-                  }
-                }
-
-                if (report_int) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_retain_flag) {
-                    mcp230xx_int_retainer[intp+(mcp230xx_port*8)] = 1;
-                    report_int = 0;
-                  }
-                }
-                if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
-                  report_int = 0;
-                }
-                if (report_int) {
-                  bool int_tele = false;
-                  bool int_event = false;
-                  unsigned long millis_now = millis();
-                  unsigned long millis_since_last_int = millis_now - int_millis[intp+(mcp230xx_port*8)];
-                  int_millis[intp+(mcp230xx_port*8)]=millis_now;
-                  switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_mode) {
-                    case 0:
-                      int_tele=true;
-                      int_event=true;
-                      break;
-                    case 1:
-                      int_event=true;
-                      break;
-                    case 2:
-                      int_tele=true;
-                      break;
-                  }
-                  if (int_tele) {
-                    ResponseTime_P(PSTR(",\"MCP230XX_INT\":{\"D%i\":%i,\"MS\":%lu}}"),
-                      intp+(mcp230xx_port*8), ((mcp230xx_intcap >> intp) & 0x01),millis_since_last_int);
-                    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("MCP230XX_INT"));
-                  }
-                  if (int_event) {
-                    char command[19];
-                    sprintf(command,"event MCPINT_D%i=%i",intp+(mcp230xx_port*8),((mcp230xx_intcap >> intp) & 0x01));
-                    ExecuteCommand(command, SRC_RULE);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-void MCP230xx_Show(bool json)
-{
-  if (json) {
-    uint8_t gpio = MCP230xx_readGPIO(0);
-    ResponseAppend_P(PSTR(",\"MCP230XX\":{\"D0\":%i,\"D1\":%i,\"D2\":%i,\"D3\":%i,\"D4\":%i,\"D5\":%i,\"D6\":%i,\"D7\":%i"),
-                (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
-    if (2 == mcp230xx_type) {
-      gpio = MCP230xx_readGPIO(1);
-      ResponseAppend_P(PSTR(",\"D8\":%i,\"D9\":%i,\"D10\":%i,\"D11\":%i,\"D12\":%i,\"D13\":%i,\"D14\":%i,\"D15\":%i"),
-                  (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
-    }
-    ResponseJsonEnd();
-  }
-}
-
-#ifdef USE_MCP230xx_OUTPUT
-
-void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
-  uint8_t portpins;
-  uint8_t port = 0;
-  uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode;
-  uint8_t interlock = Settings.flag.interlock;
-  int pinadd = (pin % 2)+1-(3*(pin % 2));
-  char cmnd[7], stt[4];
-  if (pin > 7) { port = 1; }
-  portpins = MCP230xx_readGPIO(port);
-  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
-    if (pinstate < 2) {
-      if (6 == pinmo) {
-        if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins |= (1 << (pin+pinadd-(port*8))),portpins &= ~(1 << (pin-(port*8)));
-      } else {
-        if (pinstate) portpins &= ~(1 << (pin+pinadd-(port*8))),portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
-      }
-    } else {
-      if (6 == pinmo) {
-      portpins |= (1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
-      } else {
-      portpins &= ~(1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
-      }
-    }
-  } else {
-    if (pinstate < 2) {
-      if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
-    } else {
-      portpins ^= (1 << (pin-(port*8)));
-    }
-  }
-  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port, portpins);
-  if (Settings.flag.save_state) {
-    Settings.mcp230xx_config[pin].saved_state=portpins>>(pin-(port*8))&1;
-    Settings.mcp230xx_config[pin+pinadd].saved_state=portpins>>(pin+pinadd-(port*8))&1;
-  }
-  sprintf(cmnd,ConvertNumTxt(pinstate, pinmo));
-  sprintf(stt,ConvertNumTxt((portpins >> (pin-(port*8))&1), pinmo));
-  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
-    char stt1[4];
-    sprintf(stt1,ConvertNumTxt((portpins >> (pin+pinadd-(port*8))&1), pinmo));
-    Response_P(PSTR("{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"},\"S29cmnd_D%i\":{\"STATE\":\"%s\"}}"),pin, cmnd, stt, pin+pinadd, stt1);
-  } else {
-    Response_P(MCP230XX_CMND_RESPONSE, pin, cmnd, stt);
-  }
-}
-
-#endif
-
-void MCP230xx_Reset(uint8_t pinmode) {
-  uint8_t pullup = 0;
-  if ((pinmode > 1) && (pinmode < 5)) { pullup=1; }
-  for (uint32_t pinx=0;pinx<16;pinx++) {
-    Settings.mcp230xx_config[pinx].pinmode=pinmode;
-    Settings.mcp230xx_config[pinx].pullup=pullup;
-    Settings.mcp230xx_config[pinx].saved_state=0;
-    if ((pinmode > 1) && (pinmode < 5)) {
-      Settings.mcp230xx_config[pinx].int_report_mode=0;
-    } else {
-      Settings.mcp230xx_config[pinx].int_report_mode=3;
-    }
-    Settings.mcp230xx_config[pinx].int_report_defer=0;
-    Settings.mcp230xx_config[pinx].int_count_en=0;
-    Settings.mcp230xx_config[pinx].int_retain_flag=0;
-    Settings.mcp230xx_config[pinx].spare13=0;
-    Settings.mcp230xx_config[pinx].spare14=0;
-    Settings.mcp230xx_config[pinx].spare15=0;
-  }
-  Settings.mcp230xx_int_prio = 0;
-  Settings.mcp230xx_int_timer = 0;
-  MCP230xx_ApplySettings();
-  char pulluptxt[7];
-  char intmodetxt[9];
-  sprintf(pulluptxt,ConvertNumTxt(pullup));
-  uint8_t intmode = 3;
-  if ((pinmode > 1) && (pinmode < 5)) { intmode = 0; }
-  sprintf(intmodetxt,IntModeTxt(intmode));
-  Response_P(MCP230XX_SENSOR_RESPONSE,99,pinmode,pulluptxt,intmodetxt,"");
-}
-
-bool MCP230xx_Command(void)
-{
-  bool serviced = true;
-  bool validpin = false;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { MCP230xx_Reset(1); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET1")) { MCP230xx_Reset(1); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET2")) { MCP230xx_Reset(2); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET3")) { MCP230xx_Reset(3); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET4")) { MCP230xx_Reset(4); return serviced; }
-#ifdef USE_MCP230xx_OUTPUT
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET5")) { MCP230xx_Reset(5); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET6")) { MCP230xx_Reset(6); return serviced; }
-#endif
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTPRI")) {
-    if (paramcount > 1) {
-      uint8_t intpri = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((intpri >= 0) && (intpri <= 20)) {
-        Settings.mcp230xx_int_prio = intpri;
-        Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
-        return serviced;
-      }
-    } else {
-      Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTTIMER")) {
-    if (paramcount > 1) {
-      uint8_t inttim = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((inttim >= 0) && (inttim <= 3600)) {
-        Settings.mcp230xx_int_timer = inttim;
-        MCP230xx_CheckForIntCounter();
-        Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
-        return serviced;
-      }
-    } else {
-      Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTDEF")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t intdef = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((intdef >= 0) && (intdef <= 15)) {
-            Settings.mcp230xx_config[pin].int_report_defer=intdef;
-            if (Settings.mcp230xx_config[pin].int_count_en) {
-              Settings.mcp230xx_config[pin].int_count_en=0;
-              MCP230xx_CheckForIntCounter();
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTCNT for pin D%i"),pin);
-            }
-            Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTCNT")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t intcnt = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((intcnt >= 0) && (intcnt <= 1)) {
-            Settings.mcp230xx_config[pin].int_count_en=intcnt;
-            if (Settings.mcp230xx_config[pin].int_report_defer) {
-              Settings.mcp230xx_config[pin].int_report_defer=0;
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTDEF for pin D%i"),pin);
-            }
-            if (Settings.mcp230xx_config[pin].int_report_mode < 3) {
-              Settings.mcp230xx_config[pin].int_report_mode=3;
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled immediate interrupt/telemetry reporting for pin D%i"),pin);
-            }
-            if ((Settings.mcp230xx_config[pin].int_count_en) && (!Settings.mcp230xx_int_timer)) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - INTCNT enabled for pin D%i but global INTTIMER is disabled!"),pin);
-            }
-            MCP230xx_CheckForIntCounter();
-            Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTRETAIN")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t int_retain = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((int_retain >= 0) && (int_retain <= 1)) {
-            Settings.mcp230xx_config[pin].int_retain_flag=int_retain;
-            Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
-            MCP230xx_CheckForIntRetainer();
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-
-  if (pin < mcp230xx_pincount) {
-    if (0 == pin) {
-      if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1), "0")) validpin=true;
-    } else {
-      validpin=true;
-    }
-  }
-  if (validpin && (paramcount > 1)) {
-    if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "?")) {
-      uint8_t port = 0;
-      if (pin > 7) { port = 1; }
-      uint8_t portdata = MCP230xx_readGPIO(port);
-      char pulluptxtr[7],pinstatustxtr[7];
-      char intmodetxt[9];
-      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
-      sprintf(pulluptxtr,ConvertNumTxt(Settings.mcp230xx_config[pin].pullup));
-#ifdef USE_MCP230xx_OUTPUT
-      uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode;
-      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod));
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,intmodetxt,pinstatustxtr);
-#else
-      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1));
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,intmodetxt,pinstatustxtr);
-#endif
-      return serviced;
-    }
-#ifdef USE_MCP230xx_OUTPUT
-    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
-      uint8_t pincmd = Settings.mcp230xx_config[pin].pinmode - 5;
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "ON")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "1"))) {
-        MCP230xx_SetOutPin(pin,abs(pincmd-1));
-        return serviced;
-      }
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "OFF")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0"))) {
-        MCP230xx_SetOutPin(pin,pincmd);
-        return serviced;
-      }
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "T")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "2"))) {
-        MCP230xx_SetOutPin(pin,2);
-        return serviced;
-      }
-    }
-#endif
-    uint8_t pinmode = 0;
-    uint8_t pullup = 0;
-    uint8_t intmode = 0;
-    if (paramcount > 1) {
-      pinmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-    }
-    if (paramcount > 2) {
-      pullup = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-    }
-    if (paramcount > 3) {
-      intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-    }
-#ifdef USE_MCP230xx_OUTPUT
-    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2) && (paramcount > 2)) {
-#else
-    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2) && (paramcount > 2)) {
-#endif
-      Settings.mcp230xx_config[pin].pinmode=pinmode;
-      Settings.mcp230xx_config[pin].pullup=pullup;
-      if ((pinmode > 1) && (pinmode < 5)) {
-        if ((intmode >= 0) && (intmode <= 3)) {
-          Settings.mcp230xx_config[pin].int_report_mode=intmode;
-        }
-      } else {
-        Settings.mcp230xx_config[pin].int_report_mode=3;
-      }
-      MCP230xx_ApplySettings();
-      uint8_t port = 0;
-      if (pin > 7) { port = 1; }
-      uint8_t portdata = MCP230xx_readGPIO(port);
-      char pulluptxtc[7], pinstatustxtc[7];
-      char intmodetxt[9];
-      sprintf(pulluptxtc,ConvertNumTxt(pullup));
-      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
-#ifdef USE_MCP230xx_OUTPUT
-      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1,Settings.mcp230xx_config[pin].pinmode));
-#else
-      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1));
-#endif
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmode,pulluptxtc,intmodetxt,pinstatustxtc);
-      return serviced;
-    }
-  } else {
-    serviced=false;
-    return serviced;
-  }
-  return serviced;
-}
-
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-
-const char HTTP_SNS_MCP230xx_OUTPUT[] PROGMEM = "{s}MCP230XX D%d{m}%s{e}";
-
-void MCP230xx_UpdateWebData(void)
-{
-  uint8_t gpio1 = MCP230xx_readGPIO(0);
-  uint8_t gpio2 = 0;
-  if (2 == mcp230xx_type) {
-    gpio2 = MCP230xx_readGPIO(1);
-  }
-  uint16_t gpio = (gpio2 << 8) + gpio1;
-  for (uint32_t pin = 0; pin < mcp230xx_pincount; pin++) {
-    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
-      char stt[7];
-      sprintf(stt,ConvertNumTxt((gpio>>pin)&1,Settings.mcp230xx_config[pin].pinmode));
-      WSContentSend_PD(HTTP_SNS_MCP230xx_OUTPUT, pin, stt);
-    }
-  }
-}
-
-#endif
-
-#ifdef USE_MCP230xx_OUTPUT
-
-void MCP230xx_OutputTelemetry(void)
-{
-  uint8_t outputcount = 0;
-  uint16_t gpiototal = 0;
-  uint8_t gpioa = 0;
-  uint8_t gpiob = 0;
-  gpioa=MCP230xx_readGPIO(0);
-  if (2 == mcp230xx_type) { gpiob=MCP230xx_readGPIO(1); }
-  gpiototal=((uint16_t)gpiob << 8) | gpioa;
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].pinmode >= 5) outputcount++;
-  }
-  if (outputcount) {
-    char stt[7];
-    ResponseTime_P(PSTR(",\"MCP230_OUT\":{"));
-    for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-      if (Settings.mcp230xx_config[pinx].pinmode >= 5) {
-        sprintf(stt,ConvertNumTxt(((gpiototal>>pinx)&1),Settings.mcp230xx_config[pinx].pinmode));
-        ResponseAppend_P(PSTR("\"OUT_D%i\":\"%s\","),pinx,stt);
-      }
-    }
-    ResponseAppend_P(PSTR("\"END\":1}}"));
-    MqttPublishTeleSensor();
-  }
-}
-
-#endif
-
-void MCP230xx_Interrupt_Counter_Report(void) {
-  ResponseTime_P(PSTR(",\"MCP230_INTTIMER\":{"));
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].int_count_en) {
-      ResponseAppend_P(PSTR("\"INTCNT_D%i\":%i,"),pinx,mcp230xx_int_counter[pinx]);
-      mcp230xx_int_counter[pinx]=0;
-    }
-  }
-  ResponseAppend_P(PSTR("\"END\":1}}"));
-  MqttPublishTeleSensor();
-  mcp230xx_int_sec_counter = 0;
-}
-
-void MCP230xx_Interrupt_Retain_Report(void) {
-  uint16_t retainresult = 0;
-  ResponseTime_P(PSTR(",\"MCP_INTRETAIN\":{"));
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].int_retain_flag) {
-      ResponseAppend_P(PSTR("\"D%i\":%i,"),pinx,mcp230xx_int_retainer[pinx]);
-      retainresult |= (((mcp230xx_int_retainer[pinx])&1) << pinx);
-      mcp230xx_int_retainer[pinx]=0;
-    }
-  }
-  ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult);
-  MqttPublishTeleSensor();
-}
-
-
-
-
-
-bool Xsns29(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_22)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-      MCP230xx_Detect();
-  }
-  else if (mcp230xx_type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (mcp230xx_int_en) {
-          mcp230xx_int_prio_counter++;
-          if ((mcp230xx_int_prio_counter) >= (Settings.mcp230xx_int_prio)) {
-            MCP230xx_CheckForInterrupt();
-            mcp230xx_int_prio_counter=0;
-          }
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        if (mcp230xx_int_counter_en) {
-          mcp230xx_int_sec_counter++;
-          if (mcp230xx_int_sec_counter >= Settings.mcp230xx_int_timer) {
-            MCP230xx_Interrupt_Counter_Report();
-          }
-        }
-        if (tele_period == 0) {
-          if (mcp230xx_int_retainer_en) {
-            MCP230xx_Interrupt_Retain_Report();
-          }
-#ifdef USE_MCP230xx_OUTPUT
-          MCP230xx_OutputTelemetry();
-#endif
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MCP230xx_Show(1);
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_29 == XdrvMailbox.index) {
-          result = MCP230xx_Command();
-        }
-        break;
-#ifdef USE_WEBSERVER
-#ifdef USE_MCP230xx_OUTPUT
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-      case FUNC_WEB_SENSOR:
-        MCP230xx_UpdateWebData();
-        break;
-#endif
-#endif
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-# 46 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-#ifdef USE_I2C
-#ifdef USE_MPR121
-
-
-
-
-
-#define XSNS_30 30
-#define XI2C_23 23
-
-
-
-
-
-
-
-#define MPR121_ELEX_REG 0x00
-
-
-#define MPR121_MHDR_REG 0x2B
-
-
-#define MPR121_MHDR_VAL 0x01
-
-
-#define MPR121_NHDR_REG 0x2C
-
-
-#define MPR121_NHDR_VAL 0x01
-
-
-#define MPR121_NCLR_REG 0x2D
-
-
-#define MPR121_NCLR_VAL 0x0E
-
-
-#define MPR121_MHDF_REG 0x2F
-
-
-#define MPR121_MHDF_VAL 0x01
-
-
-#define MPR121_NHDF_REG 0x30
-
-
-#define MPR121_NHDF_VAL 0x05
-
-
-#define MPR121_NCLF_REG 0x31
-
-
-#define MPR121_NCLF_VAL 0x01
-
-
-#define MPR121_MHDPROXR_REG 0x36
-
-
-#define MPR121_MHDPROXR_VAL 0x3F
-
-
-#define MPR121_NHDPROXR_REG 0x37
-
-
-#define MPR121_NHDPROXR_VAL 0x5F
-
-
-#define MPR121_NCLPROXR_REG 0x38
-
-
-#define MPR121_NCLPROXR_VAL 0x04
-
-
-#define MPR121_FDLPROXR_REG 0x39
-
-
-#define MPR121_FDLPROXR_VAL 0x00
-
-
-#define MPR121_MHDPROXF_REG 0x3A
-
-
-#define MPR121_MHDPROXF_VAL 0x01
-
-
-#define MPR121_NHDPROXF_REG 0x3B
-
-
-#define MPR121_NHDPROXF_VAL 0x01
-
-
-#define MPR121_NCLPROXF_REG 0x3C
-
-
-#define MPR121_NCLPROXF_VAL 0x1F
-
-
-#define MPR121_FDLPROXF_REG 0x3D
-
-
-#define MPR121_FDLPROXF_VAL 0x04
-
-
-#define MPR121_E0TTH_REG 0x41
-
-
-#define MPR121_E0TTH_VAL 12
-
-
-#define MPR121_E0RTH_REG 0x42
-
-
-#define MPR121_E0RTH_VAL 6
-
-
-#define MPR121_CDT_REG 0x5D
-
-
-#define MPR121_CDT_VAL 0x20
-
-
-#define MPR121_ECR_REG 0x5E
-
-
-#define MPR121_ECR_VAL 0x8F
-
-
-
-#define MPR121_SRST_REG 0x80
-
-
-#define MPR121_SRST_VAL 0x63
-
-
-#define BITC(sensor,position) ((pS->current[sensor] >> position) & 1)
-
-
-#define BITP(sensor,position) ((pS->previous[sensor] >> position) & 1)
-# 195 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-typedef struct mpr121 mpr121;
-struct mpr121 {
- const uint8_t i2c_addr[4] = { 0x5A, 0x5B, 0x5C, 0x5D };
- const char id[4] = { 'A', 'B', 'C', 'D' };
- bool connected[4] = { false, false, false, false };
- bool running[4] = { false, false, false, false };
- uint16_t current[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
- uint16_t previous[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
-};
-
-bool mpr21_found = false;
-# 217 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-void Mpr121Init(struct mpr121 *pS, bool initial)
-{
-
- for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
-
-    if (initial && I2cActive(pS->i2c_addr[i])) { continue; }
-
-
-  pS->connected[i] = (I2cWrite8(pS->i2c_addr[i], MPR121_SRST_REG, MPR121_SRST_VAL)
-        && (0x24 == I2cRead8(pS->i2c_addr[i], 0x5D)));
-  if (pS->connected[i]) {
-
-
-      mpr21_found = true;
-   char device_name[16];
-   snprintf_P(device_name, sizeof(device_name), PSTR("MPR121(%c)"), pS->id[i]);
-      I2cSetActiveFound(pS->i2c_addr[i], device_name);
-
-
-   for (uint32_t j = 0; j < 13; j++) {
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_E0TTH_REG + 2 * j, MPR121_E0TTH_VAL);
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_E0RTH_REG + 2 * j, MPR121_E0RTH_VAL);
-   }
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDR_REG, MPR121_MHDR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDR_REG, MPR121_NHDR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLR_REG, MPR121_NCLR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDF_REG, MPR121_MHDF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDF_REG, MPR121_NHDF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLF_REG, MPR121_NCLF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXR_REG, MPR121_MHDPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXR_REG, MPR121_NHDPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXR_REG, MPR121_NCLPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXR_REG, MPR121_FDLPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXF_REG, MPR121_MHDPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXF_REG, MPR121_NHDPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXF_REG, MPR121_NCLPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXF_REG, MPR121_FDLPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_CDT_REG, MPR121_CDT_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_ECR_REG, MPR121_ECR_VAL);
-
-
-   pS->running[i] = (0x00 != I2cRead8(pS->i2c_addr[i], MPR121_ECR_REG));
-
-   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_I2C "MPR121%c: %sRunning"), pS->id[i], (pS->running[i]) ? "" : "NOT");
-
-  } else {
-
-
-   pS->running[i] = false;
-  }
- }
-
-
- if (!(pS->connected[0] || pS->connected[1] || pS->connected[2]
-       || pS->connected[3])) {
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C "MPR121: No sensors found"));
- }
-}
-# 326 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-void Mpr121Show(struct mpr121 *pS, uint8_t function)
-{
-
-
- for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
-
-
-  if (pS->connected[i]) {
-
-
-   if (!I2cValidRead16LE(&pS->current[i], pS->i2c_addr[i], MPR121_ELEX_REG)) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Cannot read data!"), pS->id[i]);
-    Mpr121Init(pS, false);
-    return;
-   }
-
-   if (BITC(i, 15)) {
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_ELEX_REG, 0x00);
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Excess current detected! Fix circuits if it happens repeatedly! Soft-resetting MPR121 ..."), pS->id[i]);
-    Mpr121Init(pS, false);
-    return;
-   }
-  }
-
-  if (pS->running[i]) {
-
-
-   if (FUNC_JSON_APPEND == function) {
-    ResponseAppend_P(PSTR(",\"MPR121%c\":{"), pS->id[i]);
-   }
-
-   for (uint32_t j = 0; j < 13; j++) {
-
-
-    if ((FUNC_EVERY_50_MSECOND == function)
-        && (BITC(i, j) != BITP(i, j))) {
-     Response_P(PSTR("{\"MPR121%c\":{\"Button%i\":%i}}"), pS->id[i], j, BITC(i, j));
-     MqttPublishPrefixTopic_P(RESULT_OR_STAT, mqtt_data);
-    }
-
-#ifdef USE_WEBSERVER
-    if (FUNC_WEB_SENSOR == function) {
-     WSContentSend_PD(PSTR("{s}MPR121%c Button%d{m}%d{e}"), pS->id[i], j, BITC(i, j));
-    }
-#endif
-
-
-    if (FUNC_JSON_APPEND == function) {
-     ResponseAppend_P(PSTR("%s\"Button%i\":%i"), (j > 0 ? "," : ""), j, BITC(i, j));
-    }
-   }
-
-
-   pS->previous[i] = pS->current[i];
-
-
-   if (FUNC_JSON_APPEND == function) {
-        ResponseJsonEnd();
-   }
-  }
- }
-}
-# 410 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_30_mpr121.ino"
-bool Xsns30(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_23)) { return false; }
-
- bool result = false;
-
-
- static struct mpr121 mpr121;
-
-  if (FUNC_INIT == function) {
-
-  Mpr121Init(&mpr121, true);
-  }
-  else if (mpr21_found) {
-
-  switch (function) {
-
-
-  case FUNC_EVERY_50_MSECOND:
-   Mpr121Show(&mpr121, FUNC_EVERY_50_MSECOND);
-   break;
-
-
-  case FUNC_JSON_APPEND:
-   Mpr121Show(&mpr121, FUNC_JSON_APPEND);
-   break;
-
-#ifdef USE_WEBSERVER
-
-  case FUNC_WEB_SENSOR:
-   Mpr121Show(&mpr121, FUNC_WEB_SENSOR);
-   break;
-#endif
-  }
- }
-
- return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
-#ifdef USE_I2C
-#ifdef USE_CCS811
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_31_ccs811.ino"
-#define XSNS_31 31
-#define XI2C_24 24
-
-#define EVERYNSECONDS 5
-
-#include "Adafruit_CCS811.h"
-
-Adafruit_CCS811 ccs;
-uint8_t CCS811_ready = 0;
-uint8_t CCS811_type = 0;;
-uint16_t eCO2;
-uint16_t TVOC;
-uint8_t tcnt = 0;
-uint8_t ecnt = 0;
-
-
-
-void CCS811Detect(void)
-{
-  if (I2cActive(CCS811_ADDRESS)) { return; }
-
-  if (!ccs.begin(CCS811_ADDRESS)) {
-    CCS811_type = 1;
-    I2cSetActiveFound(CCS811_ADDRESS, "CCS811");
-  }
-}
-
-void CCS811Update(void)
-{
-  tcnt++;
-  if (tcnt >= EVERYNSECONDS) {
-    tcnt = 0;
-    CCS811_ready = 0;
-    if (ccs.available()) {
-      if (!ccs.readData()){
-        TVOC = ccs.getTVOC();
-        eCO2 = ccs.geteCO2();
-        CCS811_ready = 1;
-        if (global_update && global_humidity>0 && global_temperature!=9999) { ccs.setEnvironmentalData((uint8_t)global_humidity, global_temperature); }
-        ecnt = 0;
-      }
-    } else {
-
-      ecnt++;
-      if (ecnt > 6) {
-
-        ccs.begin(CCS811_ADDRESS);
-      }
-    }
-  }
-}
-
-const char HTTP_SNS_CCS811[] PROGMEM =
-  "{s}CCS811 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
-  "{s}CCS811 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
-
-void CCS811Show(bool json)
-{
-  if (CCS811_ready) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"CCS811\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), eCO2,TVOC);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, eCO2);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_CCS811, eCO2, TVOC);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns31(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_24)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    CCS811Detect();
-  }
-  else if (CCS811_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        CCS811Update();
-        break;
-      case FUNC_JSON_APPEND:
-        CCS811Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        CCS811Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
-#ifdef USE_I2C
-#ifdef USE_MPU6050
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
-#define XSNS_32 32
-#define XI2C_25 25
-
-#define D_SENSOR_MPU6050 "MPU6050"
-
-#define MPU_6050_ADDR_AD0_LOW 0x68
-#define MPU_6050_ADDR_AD0_HIGH 0x69
-
-uint8_t MPU_6050_address;
-uint8_t MPU_6050_addresses[] = { MPU_6050_ADDR_AD0_LOW, MPU_6050_ADDR_AD0_HIGH };
-uint8_t MPU_6050_found;
-
-int16_t MPU_6050_ax = 0, MPU_6050_ay = 0, MPU_6050_az = 0;
-int16_t MPU_6050_gx = 0, MPU_6050_gy = 0, MPU_6050_gz = 0;
-int16_t MPU_6050_temperature = 0;
-
-#ifdef USE_MPU6050_DMP
-  #include "MPU6050_6Axis_MotionApps20.h"
-  #include "I2Cdev.h"
-  #include <helper_3dmath.h>
-  typedef struct MPU6050_DMP{
-  uint8_t devStatus;
-  uint16_t packetSize;
-  uint16_t fifoCount;
-  uint8_t fifoBuffer[64];
-  Quaternion q;
-  VectorInt16 aa;
-  VectorInt16 aaReal;
-  VectorFloat gravity;
-  float euler[3];
-  float yawPitchRoll[3];
-  } MPU6050_DMP;
-
-  MPU6050_DMP MPU6050_dmp;
-#else
-  #include <MPU6050.h>
-#endif
-MPU6050 mpu6050;
-
-void MPU_6050PerformReading(void)
-{
-#ifdef USE_MPU6050_DMP
-    mpu6050.resetFIFO();
-    MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
-    while (MPU6050_dmp.fifoCount < MPU6050_dmp.packetSize) MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
-    mpu6050.getFIFOBytes(MPU6050_dmp.fifoBuffer, MPU6050_dmp.packetSize);
-    MPU6050_dmp.fifoCount -= MPU6050_dmp.packetSize;
-
-    mpu6050.dmpGetQuaternion(&MPU6050_dmp.q, MPU6050_dmp.fifoBuffer);
-    mpu6050.dmpGetEuler(MPU6050_dmp.euler, &MPU6050_dmp.q);
-    mpu6050.dmpGetAccel(&MPU6050_dmp.aa, MPU6050_dmp.fifoBuffer);
-    mpu6050.dmpGetGravity(&MPU6050_dmp.gravity, &MPU6050_dmp.q);
-    mpu6050.dmpGetLinearAccel(&MPU6050_dmp.aaReal, &MPU6050_dmp.aa, &MPU6050_dmp.gravity);
-    mpu6050.dmpGetYawPitchRoll(MPU6050_dmp.yawPitchRoll, &MPU6050_dmp.q, &MPU6050_dmp.gravity);
-    MPU_6050_gx = MPU6050_dmp.euler[0] * 180/M_PI;
-    MPU_6050_gy = MPU6050_dmp.euler[1] * 180/M_PI;
-    MPU_6050_gz = MPU6050_dmp.euler[2] * 180/M_PI;
-    MPU_6050_ax = MPU6050_dmp.aaReal.x;
-    MPU_6050_ay = MPU6050_dmp.aaReal.y;
-    MPU_6050_az = MPU6050_dmp.aaReal.z;
-#else
-  mpu6050.getMotion6(
-    &MPU_6050_ax,
-    &MPU_6050_ay,
-    &MPU_6050_az,
-    &MPU_6050_gx,
-    &MPU_6050_gy,
-    &MPU_6050_gz
-  );
-#endif
-  MPU_6050_temperature = mpu6050.getTemperature();
-}
-# 119 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_32_mpu6050.ino"
-void MPU_6050Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(MPU_6050_addresses); i++)
-  {
-    MPU_6050_address = MPU_6050_addresses[i];
-    if (!I2cSetDevice(MPU_6050_address)) { break; }
-    mpu6050.setAddr(MPU_6050_addresses[i]);
-
-#ifdef USE_MPU6050_DMP
-    MPU6050_dmp.devStatus = mpu6050.dmpInitialize();
-    mpu6050.setXGyroOffset(220);
-    mpu6050.setYGyroOffset(76);
-    mpu6050.setZGyroOffset(-85);
-    mpu6050.setZAccelOffset(1788);
-    if (MPU6050_dmp.devStatus == 0) {
-      mpu6050.setDMPEnabled(true);
-      MPU6050_dmp.packetSize = mpu6050.dmpGetFIFOPacketSize();
-      MPU_6050_found = true;
-    }
-#else
-    mpu6050.initialize();
-    MPU_6050_found = mpu6050.testConnection();
-#endif
-    Settings.flag2.axis_resolution = 2;
-  }
-
-  if (MPU_6050_found) {
-    I2cSetActiveFound(MPU_6050_address, D_SENSOR_MPU6050);
-  }
-}
-
-#define D_YAW "Yaw"
-#define D_PITCH "Pitch"
-#define D_ROLL "Roll"
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_AXIS[] PROGMEM =
-  "{s}" D_SENSOR_MPU6050 " " D_AX_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_AY_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_AZ_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GX_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GY_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GZ_AXIS "{m}%s{e}";
-#ifdef USE_MPU6050_DMP
-const char HTTP_SNS_YPR[] PROGMEM =
-  "{s}" D_SENSOR_MPU6050 " " D_YAW "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_PITCH "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_ROLL "{m}%s{e}";
-#endif
-#endif
-
-#define D_JSON_AXIS_AX "AccelXAxis"
-#define D_JSON_AXIS_AY "AccelYAxis"
-#define D_JSON_AXIS_AZ "AccelZAxis"
-#define D_JSON_AXIS_GX "GyroXAxis"
-#define D_JSON_AXIS_GY "GyroYAxis"
-#define D_JSON_AXIS_GZ "GyroZAxis"
-#define D_JSON_YAW "Yaw"
-#define D_JSON_PITCH "Pitch"
-#define D_JSON_ROLL "Roll"
-
-void MPU_6050Show(bool json)
-{
-  MPU_6050PerformReading();
-
-  double tempConv = (MPU_6050_temperature / 340.0 + 35.53);
-  char temperature[33];
-  dtostrfd(tempConv, Settings.flag2.temperature_resolution, temperature);
-  char axis_ax[33];
-  dtostrfd(MPU_6050_ax, Settings.flag2.axis_resolution, axis_ax);
-  char axis_ay[33];
-  dtostrfd(MPU_6050_ay, Settings.flag2.axis_resolution, axis_ay);
-  char axis_az[33];
-  dtostrfd(MPU_6050_az, Settings.flag2.axis_resolution, axis_az);
-  char axis_gx[33];
-  dtostrfd(MPU_6050_gx, Settings.flag2.axis_resolution, axis_gx);
-  char axis_gy[33];
-  dtostrfd(MPU_6050_gy, Settings.flag2.axis_resolution, axis_gy);
-  char axis_gz[33];
-  dtostrfd(MPU_6050_gz, Settings.flag2.axis_resolution, axis_gz);
-#ifdef USE_MPU6050_DMP
-  char axis_yaw[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[0] / PI * 180.0, Settings.flag2.axis_resolution, axis_yaw);
-  char axis_pitch[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[1] / PI * 180.0, Settings.flag2.axis_resolution, axis_pitch);
-  char axis_roll[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[2] / PI * 180.0, Settings.flag2.axis_resolution, axis_roll);
-#endif
-
-  if (json) {
-    char json_axis_ax[25];
-    snprintf_P(json_axis_ax, sizeof(json_axis_ax), PSTR(",\"" D_JSON_AXIS_AX "\":%s"), axis_ax);
-    char json_axis_ay[25];
-    snprintf_P(json_axis_ay, sizeof(json_axis_ay), PSTR(",\"" D_JSON_AXIS_AY "\":%s"), axis_ay);
-    char json_axis_az[25];
-    snprintf_P(json_axis_az, sizeof(json_axis_az), PSTR(",\"" D_JSON_AXIS_AZ "\":%s"), axis_az);
-    char json_axis_gx[25];
-    snprintf_P(json_axis_gx, sizeof(json_axis_gx), PSTR(",\"" D_JSON_AXIS_GX "\":%s"), axis_gx);
-    char json_axis_gy[25];
-    snprintf_P(json_axis_gy, sizeof(json_axis_gy), PSTR(",\"" D_JSON_AXIS_GY "\":%s"), axis_gy);
-    char json_axis_gz[25];
-    snprintf_P(json_axis_gz, sizeof(json_axis_gz), PSTR(",\"" D_JSON_AXIS_GZ "\":%s"), axis_gz);
-#ifdef USE_MPU6050_DMP
-    char json_ypr_y[25];
-    snprintf_P(json_ypr_y, sizeof(json_ypr_y), PSTR(",\"" D_JSON_YAW "\":%s"), axis_yaw);
-    char json_ypr_p[25];
-    snprintf_P(json_ypr_p, sizeof(json_ypr_p), PSTR(",\"" D_JSON_PITCH "\":%s"), axis_pitch);
-    char json_ypr_r[25];
-    snprintf_P(json_ypr_r, sizeof(json_ypr_r), PSTR(",\"" D_JSON_ROLL "\":%s"), axis_roll);
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s%s%s%s}"),
-      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz,
-      json_ypr_y, json_ypr_p, json_ypr_r);
-#else
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s}"),
-      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz);
-#endif
-#ifdef USE_DOMOTICZ
-    DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TEMP, D_SENSOR_MPU6050, temperature, TempUnit());
-    WSContentSend_PD(HTTP_SNS_AXIS, axis_ax, axis_ay, axis_az, axis_gx, axis_gy, axis_gz);
-#ifdef USE_MPU6050_DMP
-    WSContentSend_PD(HTTP_SNS_YPR, axis_yaw, axis_pitch, axis_roll);
-#endif
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns32(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_25)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MPU_6050Detect();
-  }
-  else if (MPU_6050_found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        if (tele_period == Settings.tele_period -3) {
-          MPU_6050PerformReading();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MPU_6050Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MPU_6050Show(0);
-        MPU_6050PerformReading();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
-#ifdef USE_I2C
-#ifdef USE_DS3231
-# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_33_ds3231.ino"
-#define XSNS_33 33
-#define XI2C_26 26
-
-
-#ifndef USE_RTC_ADDR
-#define USE_RTC_ADDR 0x68
-#endif
-
-
-#define RTC_SECONDS 0x00
-#define RTC_MINUTES 0x01
-#define RTC_HOURS 0x02
-#define RTC_DAY 0x03
-#define RTC_DATE 0x04
-#define RTC_MONTH 0x05
-#define RTC_YEAR 0x06
-#define RTC_CONTROL 0x0E
-#define RTC_STATUS 0x0F
-
-#define OSF 7
-#define EOSC 7
-#define BBSQW 6
-#define CONV 5
-#define RS2 4
-#define RS1 3
-#define INTCN 2
-
-
-#define HR1224 6
-#define CENTURY 7
-#define DYDT 6
-bool ds3231ReadStatus = false;
-bool ds3231WriteStatus = false;
-bool DS3231chipDetected = false;
-
-
-
-
-void DS3231Detect(void)
-{
-  if (I2cActive(USE_RTC_ADDR)) { return; }
-
-  if (I2cValidRead(USE_RTC_ADDR, RTC_STATUS, 1)) {
-    I2cSetActiveFound(USE_RTC_ADDR, "DS3231");
-    DS3231chipDetected = true;
-  }
-}
-
-
-
-
-uint8_t bcd2dec(uint8_t n)
-{
-  return n - 6 * (n >> 4);
-}
-
-
-
-
-uint8_t dec2bcd(uint8_t n)
-{
-  return n + 6 * (n / 10);
-}
-
-
-
-
-uint32_t ReadFromDS3231(void)
-{
-  TIME_T tm;
-  tm.second = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_SECONDS));
-  tm.minute = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MINUTES));
-  tm.hour = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_HOURS) & ~_BV(HR1224));
-  tm.day_of_week = I2cRead8(USE_RTC_ADDR, RTC_DAY);
-  tm.day_of_month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_DATE));
-  tm.month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MONTH) & ~_BV(CENTURY));
-  tm.year = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_YEAR));
-  return MakeTime(tm);
-}
-
-
-
-void SetDS3231Time (uint32_t epoch_time) {
-  TIME_T tm;
-  BreakTime(epoch_time, tm);
-  I2cWrite8(USE_RTC_ADDR, RTC_SECONDS, dec2bcd(tm.second));
-  I2cWrite8(USE_RTC_ADDR, RTC_MINUTES, dec2bcd(tm.minute));
-  I2cWrite8(USE_RTC_ADDR, RTC_HOURS, dec2bcd(tm.hour));
-  I2cWrite8(USE_RTC_ADDR, RTC_DAY, tm.day_of_week);
-  I2cWrite8(USE_RTC_ADDR, RTC_DATE, dec2bcd(tm.day_of_month));
-  I2cWrite8(USE_RTC_ADDR, RTC_MONTH, dec2bcd(tm.month));
-  I2cWrite8(USE_RTC_ADDR, RTC_YEAR, dec2bcd(tm.year));
-  I2cWrite8(USE_RTC_ADDR, RTC_STATUS, I2cRead8(USE_RTC_ADDR, RTC_STATUS) & ~_BV(OSF));
-}
-
-void DS3231EverySecond(void)
-{
-  TIME_T tmpTime;
-  if (!ds3231ReadStatus && Rtc.utc_time < START_VALID_TIME ) {
-    ntp_force_sync = true;
-    Rtc.utc_time = ReadFromDS3231();
-
-
-    BreakTime(Rtc.utc_time, tmpTime);
-    if (Rtc.utc_time < START_VALID_TIME ) {
-      ds3231ReadStatus = true;
-    }
-    RtcTime.year = tmpTime.year + 1970;
-    Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
-    Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Set time from DS3231 to RTC (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
-    if (Rtc.local_time < START_VALID_TIME) {
-      rules_flag.time_init = 1;
-    } else {
-      rules_flag.time_set = 1;
-    }
-  }
-  else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs(Rtc.utc_time - ReadFromDS3231()) > 60) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
-    SetDS3231Time (Rtc.utc_time);
-    ds3231WriteStatus = true;
-  }
-}
-
-
-
-
-
-bool Xsns33(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_26)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    DS3231Detect();
-  }
-  else if (DS3231chipDetected) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DS3231EverySecond();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
-#ifdef USE_HX711
-# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
-#define XSNS_34 34
-
-#ifndef HX_MAX_WEIGHT
-#define HX_MAX_WEIGHT 20000
-#endif
-#ifndef HX_REFERENCE
-#define HX_REFERENCE 250
-#endif
-#ifndef HX_SCALE
-#define HX_SCALE 120
-#endif
-
-#define HX_TIMEOUT 120
-#define HX_SAMPLES 10
-#define HX_CAL_TIMEOUT 15
-
-#define HX_GAIN_128 1
-#define HX_GAIN_32 2
-#define HX_GAIN_64 3
-
-#define D_JSON_WEIGHT_REF "WeightRef"
-#define D_JSON_WEIGHT_CAL "WeightCal"
-#define D_JSON_WEIGHT_MAX "WeightMax"
-#define D_JSON_WEIGHT_ITEM "WeightItem"
-#define D_JSON_WEIGHT_CHANGE "WeightChange"
-#define D_JSON_WEIGHT_RAW "WeightRaw"
-#define D_JSON_WEIGHT_DELTA "WeightDelta"
-
-enum HxCalibrationSteps { HX_CAL_END, HX_CAL_LIMBO, HX_CAL_FINISH, HX_CAL_FAIL, HX_CAL_DONE, HX_CAL_FIRST, HX_CAL_RESET, HX_CAL_START };
-
-const char kHxCalibrationStates[] PROGMEM = D_HX_CAL_FAIL "|" D_HX_CAL_DONE "|" D_HX_CAL_REFERENCE "|" D_HX_CAL_REMOVE;
-
-struct HX {
-  long weight = 0;
-  long raw = 0;
-  long last_weight = 0;
-  long sum_weight = 0;
-  long sum_raw = 0;
-  long offset = 0;
-  long scale = 1;
-  long weight_diff = 0;
-  uint8_t type = 1;
-  uint8_t sample_count = 0;
-  uint8_t calibrate_step = HX_CAL_END;
-  uint8_t calibrate_timer = 0;
-  uint8_t calibrate_msg = 0;
-  uint8_t pin_sck;
-  uint8_t pin_dout;
-  bool tare_flg = false;
-  bool weight_changed = false;
-  uint16_t weight_delta = 4;
-} Hx;
-
-
-
-bool HxIsReady(uint16_t timeout)
-{
-
-  uint32_t start = millis();
-  while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) { yield(); }
-  return (digitalRead(Hx.pin_dout) == LOW);
-}
-
-long HxRead(void)
-{
-  if (!HxIsReady(HX_TIMEOUT)) { return -1; }
-
-  uint8_t data[3] = { 0 };
-  uint8_t filler = 0x00;
-
-
-  data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-  data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-  data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-
-
-  for (unsigned int i = 0; i < HX_GAIN_128; i++) {
-    digitalWrite(Hx.pin_sck, HIGH);
-    digitalWrite(Hx.pin_sck, LOW);
-  }
-
-
-  if (data[2] & 0x80) { filler = 0xFF; }
-
-
-  unsigned long value = ( static_cast<unsigned long>(filler) << 24
-                        | static_cast<unsigned long>(data[2]) << 16
-                        | static_cast<unsigned long>(data[1]) << 8
-                        | static_cast<unsigned long>(data[0]) );
-
-  return static_cast<long>(value);
-}
-
-
-
-void HxResetPart(void)
-{
-  Hx.tare_flg = true;
-  Hx.sum_weight = 0;
-  Hx.sample_count = 0;
-  Hx.last_weight = 0;
-}
-
-void HxReset(void)
-{
-  HxResetPart();
-  Settings.energy_frequency_calibration = 0;
-}
-
-void HxCalibrationStateTextJson(uint8_t msg_id)
-{
-  char cal_text[30];
-
-  Hx.calibrate_msg = msg_id;
-  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
-
-  if (msg_id < 3) { MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("Sensor34")); }
-}
-
-void SetWeightDelta()
-{
-
-  if (Settings.weight_change == 0) {
-    Hx.weight_delta = 4;
-    return;
-  }
-
-
-  if (Settings.weight_change > 100) {
-    Hx.weight_delta = (Settings.weight_change - 100) * 10 + 100;
-    return;
-  }
-
-
-  Hx.weight_delta = Settings.weight_change - 1;
-}
-# 192 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_34_hx711.ino"
-bool HxCommand(void)
-{
-  bool serviced = true;
-  bool show_parms = false;
-  char sub_string[XdrvMailbox.data_len +1];
-
-  for (uint32_t ca = 0; ca < XdrvMailbox.data_len; ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-  }
-
-  switch (XdrvMailbox.payload) {
-    case 1:
-      HxReset();
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, "Reset");
-      break;
-    case 2:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-      }
-      Hx.scale = 1;
-      HxReset();
-      Hx.calibrate_step = HX_CAL_START;
-      Hx.calibrate_timer = 1;
-      HxCalibrationStateTextJson(3);
-      break;
-    case 3:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-      }
-      show_parms = true;
-      break;
-    case 4:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_calibration = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-        Hx.scale = Settings.weight_calibration;
-      }
-      show_parms = true;
-      break;
-    case 5:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_max = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) / 1000;
-      }
-      show_parms = true;
-      break;
-    case 6:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_item = (unsigned long)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 10);
-      }
-      show_parms = true;
-      break;
-    case 7:
-      Settings.energy_frequency_calibration = Hx.weight;
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, D_JSON_DONE);
-      break;
-    case 8:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.SensorBits1.hx711_json_weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) & 1;
-      }
-      show_parms = true;
-      break;
-    case 9:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
- Settings.weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
- SetWeightDelta();
-      }
-      show_parms = true;
-      break;
-    default:
-      show_parms = true;
-  }
-
-  if (show_parms) {
-    char item[33];
-    dtostrfd((float)Settings.weight_item / 10, 1, item);
-    Response_P(PSTR("{\"Sensor34\":{\"" D_JSON_WEIGHT_REF "\":%d,\"" D_JSON_WEIGHT_CAL "\":%d,\"" D_JSON_WEIGHT_MAX "\":%d,\""
-      D_JSON_WEIGHT_ITEM "\":%s,\"" D_JSON_WEIGHT_CHANGE "\":%s,\"" D_JSON_WEIGHT_DELTA "\":%d}}"),
-        Settings.weight_reference, Settings.weight_calibration, Settings.weight_max * 1000,
-        item, GetStateText(Settings.SensorBits1.hx711_json_weight_change), Settings.weight_change);
-  }
-
-  return serviced;
-}
-
-
-
-long HxWeight(void)
-{
-  return (Hx.calibrate_step < HX_CAL_FAIL) ? Hx.weight : 0;
-}
-
-void HxInit(void)
-{
-  Hx.type = 0;
-  if ((pin[GPIO_HX711_DAT] < 99) && (pin[GPIO_HX711_SCK] < 99)) {
-    Hx.pin_sck = pin[GPIO_HX711_SCK];
-    Hx.pin_dout = pin[GPIO_HX711_DAT];
-
-    pinMode(Hx.pin_sck, OUTPUT);
-    pinMode(Hx.pin_dout, INPUT);
-
-    digitalWrite(Hx.pin_sck, LOW);
-
-    SetWeightDelta();
-
-    if (HxIsReady(8 * HX_TIMEOUT)) {
-      if (!Settings.weight_max) { Settings.weight_max = HX_MAX_WEIGHT / 1000; }
-      if (!Settings.weight_calibration) { Settings.weight_calibration = HX_SCALE; }
-      if (!Settings.weight_reference) { Settings.weight_reference = HX_REFERENCE; }
-      Hx.scale = Settings.weight_calibration;
-      HxRead();
-      HxResetPart();
-      Hx.type = 1;
-    }
-  }
-}
-
-void HxEvery100mSecond(void)
-{
-  long raw = HxRead();
-  Hx.sum_raw += raw;
-  Hx.sum_weight += raw;
-
-  Hx.sample_count++;
-  if (HX_SAMPLES == Hx.sample_count) {
-    long average = Hx.sum_weight / Hx.sample_count;
-    long raw_average = Hx.sum_raw / Hx.sample_count;
-    long value = average - Hx.offset;
-    Hx.weight = value / Hx.scale;
-    Hx.raw = raw_average / Hx.scale;
-    if (Hx.weight < 0) {
-      if (Settings.energy_frequency_calibration) {
-        long difference = Settings.energy_frequency_calibration + Hx.weight;
-        Hx.last_weight = difference;
-        if (difference < 0) { HxReset(); }
-      }
-      Hx.weight = 0;
-    } else {
-      Hx.last_weight = Settings.energy_frequency_calibration;
-    }
-
-    if (Hx.tare_flg) {
-      Hx.tare_flg = false;
-      Hx.offset = average;
-    }
-
-    if (Hx.calibrate_step) {
-      Hx.calibrate_timer--;
-
-      if (HX_CAL_START == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
-      }
-      else if (HX_CAL_RESET == Hx.calibrate_step) {
-        if (Hx.calibrate_timer) {
-          if (Hx.weight < (long)Settings.weight_reference) {
-            Hx.calibrate_step--;
-            Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
-            HxCalibrationStateTextJson(2);
-          }
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-      else if (HX_CAL_FIRST == Hx.calibrate_step) {
-        if (Hx.calibrate_timer) {
-          if (Hx.weight > (long)Settings.weight_reference) {
-            Hx.calibrate_step--;
-          }
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-      else if (HX_CAL_DONE == Hx.calibrate_step) {
-        if (Hx.weight > (long)Settings.weight_reference) {
-          Hx.calibrate_step = HX_CAL_FINISH;
-          Settings.weight_calibration = Hx.weight / Settings.weight_reference;
-          Hx.weight = 0;
-          HxCalibrationStateTextJson(1);
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-
-      if (HX_CAL_FAIL == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.tare_flg = true;
-        HxCalibrationStateTextJson(0);
-      }
-      if (HX_CAL_FINISH == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.calibrate_timer = 3 * (10 / HX_SAMPLES);
-        Hx.scale = Settings.weight_calibration;
-      }
-
-      if (!Hx.calibrate_timer) {
-        Hx.calibrate_step = HX_CAL_END;
-      }
-    } else {
-      Hx.weight += Hx.last_weight;
-
-      if (Settings.SensorBits1.hx711_json_weight_change) {
-        if (abs(Hx.weight - Hx.weight_diff) > Hx.weight_delta) {
-          Hx.weight_diff = Hx.weight;
-          Hx.weight_changed = true;
-        }
-        else if (Hx.weight_changed && (Hx.weight == Hx.weight_diff)) {
-          mqtt_data[0] = '\0';
-          ResponseAppendTime();
-          HxShow(true);
-          ResponseJsonEnd();
-          MqttPublishTeleSensor();
-          Hx.weight_changed = false;
-        }
-      }
-    }
-
-    Hx.sum_weight = 0;
-    Hx.sum_raw = 0;
-    Hx.sample_count = 0;
-  }
-}
-
-void HxSaveBeforeRestart(void)
-{
-  Settings.energy_frequency_calibration = Hx.weight;
-  Hx.sample_count = HX_SAMPLES +1;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_HX711_WEIGHT[] PROGMEM =
-  "{s}HX711 " D_WEIGHT "{m}%s " D_UNIT_KILOGRAM "{e}";
-const char HTTP_HX711_COUNT[] PROGMEM =
-  "{s}HX711 " D_COUNT "{m}%d{e}";
-const char HTTP_HX711_CAL[] PROGMEM =
-  "{s}HX711 %s{m}{e}";
-#endif
-
-void HxShow(bool json)
-{
-  char scount[30] = { 0 };
-
-  uint16_t count = 0;
-  float weight = 0;
-  if (Hx.calibrate_step < HX_CAL_FAIL) {
-    if (Hx.weight && Settings.weight_item) {
-      count = (Hx.weight * 10) / Settings.weight_item;
-      if (count > 1) {
-        snprintf_P(scount, sizeof(scount), PSTR(",\"" D_JSON_COUNT "\":%d"), count);
-      }
-    }
-    weight = (float)Hx.weight / 1000;
-  }
-  char weight_chr[33];
-  dtostrfd(weight, Settings.flag2.weight_resolution, weight_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"HX711\":{\"" D_JSON_WEIGHT "\":%s%s, \"" D_JSON_WEIGHT_RAW "\":%d}"), weight_chr, scount, Hx.raw);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_HX711_WEIGHT, weight_chr);
-    if (count > 1) {
-      WSContentSend_PD(HTTP_HX711_COUNT, count);
-    }
-    if (Hx.calibrate_step) {
-      char cal_text[30];
-      WSContentSend_PD(HTTP_HX711_CAL, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
-    }
-#endif
-  }
-}
-
-#ifdef USE_WEBSERVER
-#ifdef USE_HX711_GUI
-
-
-
-
-#define WEB_HANDLE_HX711 "s34"
-
-const char S_CONFIGURE_HX711[] PROGMEM = D_CONFIGURE_HX711;
-
-const char HTTP_BTN_MENU_MAIN_HX711[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button name='reset'>" D_RESET_HX711 "</button></form></p>";
-
-const char HTTP_BTN_MENU_HX711[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button>" D_CONFIGURE_HX711 "</button></form></p>";
-
-const char HTTP_FORM_HX711[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_CALIBRATION "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
-  "<p><b>" D_REFERENCE_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' step='0.001' id='p1' placeholder='0' value='%s'></p>"
-  "<br><button name='calibrate' type='submit'>" D_CALIBRATE "</button>"
-  "</form>"
-  "</fieldset><br><br>"
-
-  "<fieldset><legend><b>&nbsp;" D_HX711_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
-  "<p><b>" D_ITEM_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' max='6.5535' step='0.0001' id='p2' placeholder='0.0' value='%s'></p>";
-
-void HandleHxAction(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_HX711);
-
-  if (WebServer->hasArg("save")) {
-    HxSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  char stemp1[20];
-
-  if (WebServer->hasArg("reset")) {
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 1"));
-    ExecuteWebCommand(stemp1, SRC_WEBGUI);
-
-    HandleRoot();
-    return;
-  }
-
-  if (WebServer->hasArg("calibrate")) {
-    WebGetArg("p1", stemp1, sizeof(stemp1));
-    Settings.weight_reference = (!strlen(stemp1)) ? 0 : (unsigned long)(CharToFloat(stemp1) * 1000);
-
-    HxLogUpdates();
-
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 2"));
-    ExecuteWebCommand(stemp1, SRC_WEBGUI);
-
-    HandleRoot();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_HX711);
-  WSContentSendStyle();
-  dtostrfd((float)Settings.weight_reference / 1000, 3, stemp1);
-  char stemp2[20];
-  dtostrfd((float)Settings.weight_item / 10000, 4, stemp2);
-  WSContentSend_P(HTTP_FORM_HX711, stemp1, stemp2);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void HxSaveSettings(void)
-{
-  char tmp[100];
-
-  WebGetArg("p2", tmp, sizeof(tmp));
-  Settings.weight_item = (!strlen(tmp)) ? 0 : (unsigned long)(CharToFloat(tmp) * 10000);
-
-  HxLogUpdates();
-}
-
-void HxLogUpdates(void)
-{
-  char weigth_ref_chr[33];
-  dtostrfd((float)Settings.weight_reference / 1000, Settings.flag2.weight_resolution, weigth_ref_chr);
-  char weigth_item_chr[33];
-  dtostrfd((float)Settings.weight_item / 10000, 4, weigth_item_chr);
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_JSON_WEIGHT_REF " %s, " D_JSON_WEIGHT_ITEM " %s"), weigth_ref_chr, weigth_item_chr);
-}
-
-#endif
-#endif
-
-
-
-
-
-bool Xsns34(uint8_t function)
-{
-  bool result = false;
-
-  if (Hx.type) {
-    switch (function) {
-      case FUNC_EVERY_100_MSECOND:
-        HxEvery100mSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_34 == XdrvMailbox.index) {
-          result = HxCommand();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        HxShow(1);
-        break;
-      case FUNC_SAVE_BEFORE_RESTART:
-        HxSaveBeforeRestart();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HxShow(0);
-        break;
-#ifdef USE_HX711_GUI
-      case FUNC_WEB_ADD_MAIN_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_MAIN_HX711);
-        break;
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_HX711);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_HX711, HandleHxAction);
-        break;
-#endif
-#endif
-      case FUNC_INIT:
-        HxInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
-#ifdef USE_TX20_WIND_SENSOR
-# 29 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
-#define XSNS_35 35
-
-#define TX20_BIT_TIME 1220
-#define TX20_RESET_VALUES 60
-
-
-
-extern "C" {
-#include "gpio.h"
-}
-
-#ifdef USE_WEBSERVER
-
-const char HTTP_SNS_TX20[] PROGMEM =
-   "{s}TX20 " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_DIRECTION "{m}%s{e}";
-
-#endif
-
-const char kTx20Directions[] PROGMEM = D_TX20_NORTH "|"
-                                       D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_EAST "|"
-                                       D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH "|"
-                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_WEST "|"
-                                       D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
-                                       D_TX20_NORTH D_TX20_WEST "|"
-                                       D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
-
-uint8_t tx20_sa = 0;
-uint8_t tx20_sb = 0;
-uint8_t tx20_sd = 0;
-uint8_t tx20_se = 0;
-uint16_t tx20_sc = 0;
-uint16_t tx20_sf = 0;
-
-float tx20_wind_speed_kmh = 0;
-float tx20_wind_speed_max = 0;
-float tx20_wind_speed_avg = 0;
-float tx20_wind_sum = 0;
-int tx20_count = 0;
-uint8_t tx20_wind_direction = 0;
-
-bool tx20_available = false;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void Tx20StartRead(void) ICACHE_RAM_ATTR;
-#endif
-
-void Tx20StartRead(void)
-{
-# 101 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_35_tx20.ino"
-  tx20_available = false;
-
-  tx20_sa = 0;
-  tx20_sb = 0;
-  tx20_sd = 0;
-  tx20_se = 0;
-  tx20_sc = 0;
-  tx20_sf = 0;
-
-  delayMicroseconds(TX20_BIT_TIME / 2);
-
-  for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
-    uint8_t dpin = (digitalRead(pin[GPIO_TX20_TXD_BLACK]));
-    if (bitcount > 41 - 5) {
-
-      tx20_sa = (tx20_sa << 1) | (dpin ^ 1);
-    } else if (bitcount > 41 - 5 - 4) {
-
-      tx20_sb = tx20_sb >> 1 | ((dpin ^ 1) << 3);
-    } else if (bitcount > 41 - 5 - 4 - 12) {
-
-      tx20_sc = tx20_sc >> 1 | ((dpin ^ 1) << 11);
-    } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
-
-      tx20_sd = tx20_sd >> 1 | ((dpin ^ 1) << 3);
-    } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
-
-      tx20_se = tx20_se >> 1 | (dpin << 3);
-    } else {
-
-      tx20_sf = tx20_sf >> 1 | (dpin << 11);
-    }
-
-    delayMicroseconds(TX20_BIT_TIME);
-  }
-
-  uint8_t chk = (tx20_sb + (tx20_sc & 0xf) + ((tx20_sc >> 4) & 0xf) + ((tx20_sc >> 8) & 0xf));
-  chk &= 0xf;
-
-  if ((chk == tx20_sd) && (tx20_sc < 400)) {
-    tx20_available = true;
-  }
-
-
-
-
-
-
-
-  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX20_TXD_BLACK]);
-}
-
-void Tx20Read(void)
-{
-  if (!(uptime % TX20_RESET_VALUES)) {
-    tx20_count = 0;
-    tx20_wind_sum = 0;
-    tx20_wind_speed_max = 0;
-  }
-  else if (tx20_available) {
-    tx20_wind_speed_kmh = float(tx20_sc) * 0.36;
-    if (tx20_wind_speed_kmh > tx20_wind_speed_max) {
-      tx20_wind_speed_max = tx20_wind_speed_kmh;
-    }
-    tx20_count++;
-    tx20_wind_sum += tx20_wind_speed_kmh;
-    tx20_wind_speed_avg = tx20_wind_sum / tx20_count;
-    tx20_wind_direction = tx20_sb;
-  }
-}
-
-void Tx20Init(void) {
-  pinMode(pin[GPIO_TX20_TXD_BLACK], INPUT);
-  attachInterrupt(pin[GPIO_TX20_TXD_BLACK], Tx20StartRead, RISING);
-}
-
-void Tx20Show(bool json)
-{
-  char wind_speed_string[33];
-  dtostrfd(tx20_wind_speed_kmh, 2, wind_speed_string);
-  char wind_speed_max_string[33];
-  dtostrfd(tx20_wind_speed_max, 2, wind_speed_max_string);
-  char wind_speed_avg_string[33];
-  dtostrfd(tx20_wind_speed_avg, 2, wind_speed_avg_string);
-  char wind_direction_string[4];
-  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx20_wind_direction, kTx20Directions);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"TX20\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\"}"),
-      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TX20, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns35(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_TX20_TXD_BLACK] < 99) {
-    switch (function) {
-      case FUNC_INIT:
-        Tx20Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        Tx20Read();
-        break;
-      case FUNC_JSON_APPEND:
-        Tx20Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tx20Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
-# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
-#ifdef USE_I2C
-#ifdef USE_MGC3130
-# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
-#define XSNS_36 36
-#define XI2C_27 27
-
-#warning **** MGC3130: It is recommended to disable all unneeded I2C-drivers ****
-
-#define MGC3130_I2C_ADDR 0x42
-
-#define MGC3130_xfer pin[GPIO_MGC3130_XFER]
-#define MGC3130_reset pin[GPIO_MGC3130_RESET]
-
-
-bool MGC3130_type = false;
-char MGC3130stype[] = "MGC3130";
-
-
-#define MGC3130_SYSTEM_STATUS 0x15
-#define MGC3130_REQUEST_MSG 0x06
-#define MGC3130_FW_VERSION 0x83
-#define MGC3130_SET_RUNTIME 0xA2
-#define MGC3130_SENSOR_DATA 0x91
-
-
-#define MGC3130_GESTURE_GARBAGE 1
-#define MGC3130_FLICK_WEST_EAST 2
-#define MGC3130_FLICK_EAST_WEST 3
-#define MGC3130_FLICK_SOUTH_NORTH 4
-#define MGC3130_FLICK_NORTH_SOUTH 5
-#define MGC3130_CIRCLE_CLOCKWISE 6
-#define MGC3130_CIRCLE_CCLOCKWISE 7
-
-#define MGC3130_MIN_ROTVALUE 0
-#define MGC3130_MAX_ROTVALUE 1023
-#define MGC3130_MIN_ZVALUE 32768
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_MGC_3130_SNS[] PROGMEM =
-  "{s}" "%s" "{m}%s{e}"
-  "{s}" "HwRev" "{m}%u.%u{e}"
-  "{s}" "loaderVer" "{m}%u.%u{e}"
-  "{s}" "platVer" "{m}%u{e}";
-#endif
-
-
-
-
-
-
-
-#pragma pack(1)
-union MGC3130_Union{
-  uint8_t buffer[132];
-  struct
-  {
-
-    uint8_t msgSize;
-    uint8_t flag;
-    uint8_t counter;
-    uint8_t id;
-
-    struct {
-        uint8_t DSPStatus:1;
-        uint8_t gestureInfo:1;
-        uint8_t touchInfo:1;
-        uint8_t airWheelInfo:1;
-        uint8_t xyzPosition:1;
-        uint8_t noisePower:1;
-        uint8_t reserved:2;
-        uint8_t electrodeConfiguration:3;
-        uint8_t CICData:1;
-        uint8_t SDData:1;
-        uint16_t reserved2:3;
-    } outputConfigMask;
-    uint8_t timestamp;
-    struct {
-        uint8_t positionValid:1;
-        uint8_t airWheelValid:1;
-        uint8_t rawDataValid:1;
-        uint8_t noisePowerValid:1;
-        uint8_t environmentalNoise:1;
-        uint8_t clipping:1;
-        uint8_t reserved:1;
-        uint8_t DSPRunning:1;
-    } systemInfo;
-    uint16_t dspInfo;
-    struct {
-        uint8_t gestureCode:8;
-        uint8_t reserved:4;
-        uint8_t gestureType:4;
-        uint8_t edgeFlick:1;
-        uint16_t reserved2:14;
-        uint8_t gestureInProgress:1;
-    } gestureInfo;
-    struct {
-        uint8_t touchSouth:1;
-        uint8_t touchWest:1;
-        uint8_t touchNorth:1;
-        uint8_t touchEast:1;
-        uint8_t touchCentre:1;
-        uint8_t tapSouth:1;
-        uint8_t tapWest:1;
-        uint8_t tapNorth:1;
-        uint8_t tapEast :1;
-        uint8_t tapCentre:1;
-        uint8_t doubleTapSouth:1;
-        uint8_t doubleTapWest:1;
-        uint8_t doubleTapNorth:1;
-        uint8_t doubleTapEast:1;
-        uint8_t doubleTapCentre:1;
-        uint8_t reserved:1;
-        uint8_t touchCounter;
-        uint8_t reserved2;
-    } touchInfo;
-    int8_t airWheel;
-    uint8_t reserved;
-    uint16_t x;
-    uint16_t y;
-    uint16_t z;
-    float noisePower;
-    float CICData[4];
-    float SDData[4];
-  } out;
-  struct {
-    uint8_t header[3];
-
-    uint8_t valid;
-    uint8_t hwRev[2];
-    uint8_t parameterStartAddr;
-    uint8_t loaderVersion[2];
-    uint8_t loaderPlatform;
-    uint8_t fwStartAddr;
-    char fwVersion[120];
-  } fw;
-  struct{
-    uint8_t id;
-    uint8_t size;
-    uint16_t error;
-    uint32_t reserved;
-    uint32_t reserved1;
-  } status;
-} MGC_data;
-#pragma pack()
-
-char MGC3130_currentGesture[12];
-
-int8_t MGC3130_delta, MGC3130_lastrotation = 0;
-int16_t MGC3130_rotValue, MGC3130_lastSentRotValue = 0;
-
-uint16_t MGC3130_lastSentX, MGC3130_lastSentY, MGC3130_lastSentZ = 0;
-
-uint8_t hwRev[2], loaderVersion[2], loaderPlatform = 0;
-char MGC3130_firmwareInfo[20];
-
-uint8_t MGC3130_touchTimeout = 0;
-uint16_t MGC3130_touchCounter = 1;
-uint32_t MGC3130_touchTimeStamp = millis();
-bool MGC3130_triggeredByTouch = false;
-
-uint8_t MGC3130_mode = 1;
-
-
-
-uint8_t MGC3130autoCal[] = {0x10, 0x00, 0x00, 0xA2, 0x80, 0x00 , 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF};
-uint8_t MGC3130disableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-uint8_t MGC3130enableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-
-void MGC3130_handleSensorData(){
-      if ( MGC_data.out.outputConfigMask.touchInfo && MGC3130_touchTimeout == 0){
-        if (MGC3130_handleTouch()){
-            MGC3130_triggeredByTouch = true;
-            MqttPublishSensor();
-        }
-      }
-
-      if(MGC3130_mode == 1){
-        if( MGC_data.out.outputConfigMask.gestureInfo && MGC_data.out.gestureInfo.gestureCode > 0){
-          MGC3130_handleGesture();
-          MqttPublishSensor();
-        }
-      }
-      if(MGC3130_mode == 2){
-        if(MGC_data.out.outputConfigMask.airWheelInfo && MGC_data.out.systemInfo.airWheelValid){
-          MGC3130_handleAirWheel();
-          MqttPublishSensor();
-        }
-      }
-      if(MGC3130_mode == 3){
-        if(MGC_data.out.systemInfo.positionValid && (MGC_data.out.z > MGC3130_MIN_ZVALUE)){
-          MqttPublishSensor();
-        }
-      }
-}
-
-void MGC3130_sendMessage(uint8_t data[], uint8_t length){
-   Wire.beginTransmission(MGC3130_I2C_ADDR);
-    Wire.write(data,length);
-   Wire.endTransmission();
-    delay(2);
-    MGC3130_receiveMessage();
-}
-
-
-void MGC3130_handleGesture(){
-
-  char edge[5];
-  if (MGC_data.out.gestureInfo.edgeFlick){
-    snprintf_P(edge, sizeof(edge), PSTR("ED_"));
-  }
-  else{
-    snprintf_P(edge, sizeof(edge), PSTR(""));
-  }
-  switch(MGC_data.out.gestureInfo.gestureCode){
-    case MGC3130_GESTURE_GARBAGE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("NONE"));
-    break;
-    case MGC3130_FLICK_WEST_EAST:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_WE"), edge);
-    break;
-    case MGC3130_FLICK_EAST_WEST:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_EW"), edge);
-    break;
-    case MGC3130_FLICK_SOUTH_NORTH:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_SN"), edge);
-    break;
-    case MGC3130_FLICK_NORTH_SOUTH:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_NS"), edge);
-    break;
-    case MGC3130_CIRCLE_CLOCKWISE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CW"));
-    break;
-    case MGC3130_CIRCLE_CCLOCKWISE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CCW"));
-    break;
-  }
-
-}
-
-bool MGC3130_handleTouch(){
-
-  bool success = false;
-    if (MGC_data.out.touchInfo.doubleTapCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_C"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_E"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_N"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_W"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_S"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    if (MGC_data.out.touchInfo.tapCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_C"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_E"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_N"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_W"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_S"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.touchCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_C"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_E"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_N"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_W"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_S"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-
-  return success;
-}
-
-void MGC3130_handleAirWheel(){
-  MGC3130_delta = MGC_data.out.airWheel - MGC3130_lastrotation;
-  MGC3130_lastrotation = MGC_data.out.airWheel;
-
-      MGC3130_rotValue = MGC3130_rotValue + MGC3130_delta;
-      if(MGC3130_rotValue < MGC3130_MIN_ROTVALUE){
-        MGC3130_rotValue = MGC3130_MIN_ROTVALUE;
-      }
-      if(MGC3130_rotValue > MGC3130_MAX_ROTVALUE){
-        MGC3130_rotValue = MGC3130_MAX_ROTVALUE;
-      }
-}
-
-void MGC3130_handleSystemStatus(){
-
-}
-
-bool MGC3130_receiveMessage(){
-  if(MGC3130_readData()){
-      switch(MGC_data.out.id){
-        case MGC3130_SENSOR_DATA:
-          MGC3130_handleSensorData();
-          break;
-        case MGC3130_SYSTEM_STATUS:
-          MGC3130_handleSystemStatus();
-          break;
-        case MGC3130_FW_VERSION:
-          hwRev[0] = MGC_data.fw.hwRev[1];
-          hwRev[1] = MGC_data.fw.hwRev[0];
-          loaderVersion[0] = MGC_data.fw.loaderVersion[0];
-          loaderVersion[1] = MGC_data.fw.loaderVersion[1];
-          loaderPlatform = MGC_data.fw.loaderPlatform;
-          snprintf_P(MGC3130_firmwareInfo, sizeof(MGC3130_firmwareInfo), PSTR("FW: %s"), MGC_data.fw.fwVersion);
-          MGC3130_firmwareInfo[20] = '\0';
-
-          break;
-      }
-    return true;
-  }
-  return false;
-}
-
-bool MGC3130_readData()
-{
-  bool success = false;
-  if (!digitalRead(MGC3130_xfer)){
-    pinMode(MGC3130_xfer, OUTPUT);
-    digitalWrite(MGC3130_xfer, LOW);
-    Wire.requestFrom(MGC3130_I2C_ADDR, (uint16_t)32);
-
-    MGC_data.buffer[0] = 4;
-    unsigned char i = 0;
-    while(Wire.available() && (i < MGC_data.buffer[0])){
-      MGC_data.buffer[i] = Wire.read();
-      i++;
-      }
-    digitalWrite(MGC3130_xfer, HIGH);
-    pinMode(MGC3130_xfer, INPUT);
-    success = true;
-  }
-  return success;
-}
-
-void MGC3130_nextMode(){
-  if (MGC3130_mode < 3){
-    MGC3130_mode++;
-  }
-  else{
-    MGC3130_mode = 1;
-  }
-  switch(MGC3130_mode){
-    case 1:
-    MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-    case 2:
-    MGC3130_sendMessage(MGC3130enableAirwheel,16);
-    break;
-    case 3:
-    MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-  }
-}
-
-void MGC3130_loop()
-{
-  if(MGC3130_touchTimeout > 0){
-    MGC3130_touchTimeout--;
-  }
-  MGC3130_receiveMessage();
-}
-
-void MGC3130_detect(void)
-{
-  if (MGC3130_type || I2cActive(MGC3130_I2C_ADDR)) { return; }
-
-  pinMode(MGC3130_xfer, INPUT_PULLUP);
-  pinMode(MGC3130_reset, OUTPUT);
-  digitalWrite(MGC3130_reset, LOW);
-  delay(10);
-  digitalWrite(MGC3130_reset, HIGH);
-  delay(50);
-
-  if (MGC3130_receiveMessage()) {
-    I2cSetActiveFound(MGC3130_I2C_ADDR, MGC3130stype);
-    MGC3130_currentGesture[0] = '\0';
-    MGC3130_type = true;
-  }
-}
-
-
-
-
-
-void MGC3130_show(bool json)
-{
-  if (!MGC3130_type) { return; }
-
-  char status_chr[2];
-  if (MGC_data.out.systemInfo.DSPRunning) {
-    sprintf (status_chr, "1");
-  }
-  else{
-    sprintf (status_chr, "0");
-  }
-
-  if (json) {
-    if (MGC3130_mode == 3 && !MGC3130_triggeredByTouch) {
-      if (MGC_data.out.systemInfo.positionValid && !(MGC_data.out.x == MGC3130_lastSentX && MGC_data.out.y == MGC3130_lastSentY && MGC_data.out.z == MGC3130_lastSentZ)) {
-        ResponseAppend_P(PSTR(",\"%s\":{\"X\":%u,\"Y\":%u,\"Z\":%u}"),
-          MGC3130stype, MGC_data.out.x/64, MGC_data.out.y/64, (MGC_data.out.z-(uint16_t)MGC3130_MIN_ZVALUE)/64);
-        MGC3130_lastSentX = MGC_data.out.x;
-        MGC3130_lastSentY = MGC_data.out.y;
-        MGC3130_lastSentZ = MGC_data.out.z;
-      }
-    }
-    MGC3130_triggeredByTouch = false;
-
-    if (MGC3130_mode == 2) {
-      if (MGC_data.out.systemInfo.airWheelValid && (MGC3130_rotValue != MGC3130_lastSentRotValue)) {
-        ResponseAppend_P(PSTR(",\"%s\":{\"AW\":%i}"), MGC3130stype, MGC3130_rotValue);
-        MGC3130_lastSentRotValue = MGC3130_rotValue;
-      }
-    }
-
-    if (MGC3130_currentGesture[0] != '\0') {
-      if (millis() - MGC3130_touchTimeStamp > 220 ) {
-        MGC3130_touchCounter = 1;
-      }
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), MGC3130stype, MGC3130_currentGesture, MGC3130_touchCounter);
-      MGC3130_currentGesture[0] = '\0';
-      MGC3130_touchTimeStamp = millis();
-    }
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_MGC_3130_SNS, MGC3130stype, status_chr, hwRev[0], hwRev[1], loaderVersion[0], loaderVersion[1], loaderPlatform );
-#endif
-  }
-}
-# 557 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_36_mgc3130.ino"
-bool MGC3130CommandSensor()
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      MGC3130_nextMode();
-      break;
-    case 1:
-      MGC3130_mode = 1;
-      MGC3130_sendMessage(MGC3130disableAirwheel,16);
-      break;
-    case 2:
-      MGC3130_mode = 2;
-      MGC3130_sendMessage(MGC3130enableAirwheel,16);
-      break;
-    case 3:
-      MGC3130_mode = 3;
-      MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns36(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_27)) { return false; }
-
-  bool result = false;
-
-  if ((FUNC_INIT == function) && (pin[GPIO_MGC3130_XFER] < 99) && (pin[GPIO_MGC3130_RESET] < 99)) {
-    MGC3130_detect();
-  }
-  else if (MGC3130_type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        MGC3130_loop();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_36 == XdrvMailbox.index) {
-          result = MGC3130CommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MGC3130_show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MGC3130_show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#ifdef USE_RF_SENSOR
-# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define XSNS_37 37
-
-
-
-
-#define RFSNS_VALID_WINDOW 1800
-
-#define RFSNS_LOOPS_PER_MILLI 1900
-#define RFSNS_RAW_BUFFER_SIZE 180
-#define RFSNS_MIN_RAW_PULSES 112
-
-#define RFSNS_MIN_PULSE_LENGTH 300
-#define RFSNS_RAWSIGNAL_SAMPLE 50
-#define RFSNS_SIGNAL_TIMEOUT 10
-#define RFSNS_SIGNAL_REPEAT_TIME 500
-
-typedef struct RawSignalStruct
-{
-  int Number;
-  uint8_t Repeats;
-  uint8_t Multiply;
-  unsigned long Time;
-  uint8_t Pulses[RFSNS_RAW_BUFFER_SIZE+2];
-
-} raw_signal_t;
-
-raw_signal_t *rfsns_raw_signal = nullptr;
-uint8_t rfsns_rf_bit;
-uint8_t rfsns_rf_port;
-uint8_t rfsns_any_sensor = 0;
-
-
-
-
-
-bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal)
-{
-  uint8_t Fbit = digitalPinToBitMask(DataPin);
-  uint8_t Fport = digitalPinToPort(DataPin);
-  uint8_t FstateMask = (StateSignal ? Fbit : 0);
-
-  if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
-    const unsigned long LoopsPerMilli = RFSNS_LOOPS_PER_MILLI;
-
-
-
-
-
-
-    unsigned long PulseLength = 0;
-    if (rfsns_raw_signal->Time) {
-      if (rfsns_raw_signal->Repeats && (rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) {
-        PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
-        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && (PulseLength > micros())) {
-          if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
-            PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
-          }
-        }
-        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && ((*portInputRegister(Fport) & Fbit) != FstateMask));
-      }
-    }
-
-    int RawCodeLength = 1;
-    bool Ftoggle = false;
-    unsigned long numloops = 0;
-    unsigned long maxloops = RFSNS_SIGNAL_TIMEOUT * LoopsPerMilli;
-    rfsns_raw_signal->Multiply = RFSNS_RAWSIGNAL_SAMPLE;
-    do {
-      numloops = 0;
-      while(((*portInputRegister(Fport) & Fbit) == FstateMask) ^ Ftoggle) {
-        if (numloops++ == maxloops) { break; }
-      }
-      PulseLength = (numloops *1000) / LoopsPerMilli;
-      if (PulseLength < RFSNS_MIN_PULSE_LENGTH) { break; }
-      Ftoggle = !Ftoggle;
-      rfsns_raw_signal->Pulses[RawCodeLength++] = PulseLength / (unsigned long)rfsns_raw_signal->Multiply;
-    }
-    while(RawCodeLength < RFSNS_RAW_BUFFER_SIZE && numloops <= maxloops);
-
-    if ((RawCodeLength >= RFSNS_MIN_RAW_PULSES) && (RawCodeLength < RFSNS_RAW_BUFFER_SIZE -1)) {
-      rfsns_raw_signal->Repeats = 0;
-      rfsns_raw_signal->Number = RawCodeLength -1;
-      rfsns_raw_signal->Pulses[rfsns_raw_signal->Number] = 0;
-      rfsns_raw_signal->Time = millis();
-      return true;
-    }
-    else
-      rfsns_raw_signal->Number = 0;
-  }
-
-  return false;
-}
-
-#ifdef USE_THEO_V2
-# 149 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define RFSNS_THEOV2_MAX_CHANNEL 2
-
-#define RFSNS_THEOV2_PULSECOUNT 114
-#define RFSNS_THEOV2_RF_PULSE_MID 1000
-
-typedef struct {
-  uint32_t time;
-  int16_t temp;
-  uint16_t lux;
-  uint8_t volt;
-} theo_v2_t1_t;
-
-typedef struct {
-  uint32_t time;
-  int16_t temp;
-  uint16_t hum;
-  uint8_t volt;
-} theo_v2_t2_t;
-
-theo_v2_t1_t *rfsns_theo_v2_t1 = nullptr;
-theo_v2_t2_t *rfsns_theo_v2_t2 = nullptr;
-
-void RfSnsInitTheoV2(void)
-{
-  rfsns_theo_v2_t1 = (theo_v2_t1_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t1_t));
-  rfsns_theo_v2_t2 = (theo_v2_t2_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t2_t));
-  rfsns_any_sensor++;
-}
-
-void RfSnsAnalyzeTheov2(void)
-{
-  if (rfsns_raw_signal->Number != RFSNS_THEOV2_PULSECOUNT) { return; }
-
-  uint8_t Checksum;
-  uint8_t Channel;
-  uint8_t Type;
-  uint8_t Voltage;
-  int Payload1;
-  int Payload2;
-
-  uint8_t b, bytes, bits, id;
-
-  uint8_t idx = 3;
-  uint8_t chksum = 0;
-  for (bytes = 0; bytes < 7; bytes++) {
-    b = 0;
-    for (bits = 0; bits <= 7; bits++)
-    {
-      if ((rfsns_raw_signal->Pulses[idx] * rfsns_raw_signal->Multiply) > RFSNS_THEOV2_RF_PULSE_MID) {
-        b |= 1 << bits;
-      }
-      idx += 2;
-    }
-    if (bytes > 0) { chksum += b; }
-
-    switch (bytes) {
-    case 0:
-      Checksum = b;
-      break;
-    case 1:
-      id = b;
-      Channel = b & 0x7;
-      Type = (b >> 3) & 0x1f;
-      break;
-    case 2:
-      Voltage = b;
-      break;
-    case 3:
-      Payload1 = b;
-      break;
-    case 4:
-      Payload1 = (b << 8) | Payload1;
-      break;
-    case 5:
-      Payload2 = b;
-      break;
-    case 6:
-      Payload2 = (b << 8) | Payload2;
-      break;
-    }
-  }
-
-  if (Checksum != chksum) { return; }
-  if ((Channel == 0) || (Channel > RFSNS_THEOV2_MAX_CHANNEL)) { return; }
-  Channel--;
-
-  rfsns_raw_signal->Repeats = 1;
-
-  int Payload3 = Voltage & 0x3f;
-
-  switch (Type) {
-  case 1:
-    rfsns_theo_v2_t1[Channel].time = LocalTime();
-    rfsns_theo_v2_t1[Channel].volt = Payload3;
-    rfsns_theo_v2_t1[Channel].temp = Payload1;
-    rfsns_theo_v2_t1[Channel].lux = Payload2;
-    break;
-  case 2:
-    rfsns_theo_v2_t2[Channel].time = LocalTime();
-    rfsns_theo_v2_t2[Channel].volt = Payload3;
-    rfsns_theo_v2_t2[Channel].temp = Payload1;
-    rfsns_theo_v2_t2[Channel].hum = Payload2;
-    break;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: TheoV2, ChkCalc %d, Chksum %d, id %d, Type %d, Ch %d, Volt %d, BattLo %d, Pld1 %d, Pld2 %d"),
-    chksum, Checksum, id, Type, Channel +1, Payload3, (Voltage & 0x80) >> 7, Payload1, Payload2);
-}
-
-void RfSnsTheoV2Show(bool json)
-{
-  bool sensor_once = false;
-
-  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
-    if (rfsns_theo_v2_t1[i].time) {
-      char sensor[10];
-      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T1C%d"), i +1);
-      char voltage[33];
-      dtostrfd((float)rfsns_theo_v2_t1[i].volt / 10, 1, voltage);
-
-      if (rfsns_theo_v2_t1[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED "\":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, GetDT(rfsns_theo_v2_t1[i].time).c_str(), voltage);
-        }
-      } else {
-        char temperature[33];
-        dtostrfd(ConvertTemp((float)rfsns_theo_v2_t1[i].temp / 100), Settings.flag2.temperature_resolution, temperature);
-
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, temperature, rfsns_theo_v2_t1[i].lux, voltage);
-#ifdef USE_DOMOTICZ
-          if ((0 == tele_period) && !sensor_once) {
-            DomoticzSensor(DZ_TEMP, temperature);
-            DomoticzSensor(DZ_ILLUMINANCE, rfsns_theo_v2_t1[i].lux);
-            sensor_once = true;
-          }
-#endif
-#ifdef USE_WEBSERVER
-        } else {
-          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
-          WSContentSend_PD(HTTP_SNS_ILLUMINANCE, sensor, rfsns_theo_v2_t1[i].lux);
-#endif
-        }
-      }
-    }
-  }
-
-  sensor_once = false;
-  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
-    if (rfsns_theo_v2_t2[i].time) {
-      char sensor[10];
-      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T2C%d"), i +1);
-      char voltage[33];
-      dtostrfd((float)rfsns_theo_v2_t2[i].volt / 10, 1, voltage);
-
-      if (rfsns_theo_v2_t2[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED" \":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, GetDT(rfsns_theo_v2_t2[i].time).c_str(), voltage);
-        }
-      } else {
-        float temp = ConvertTemp((float)rfsns_theo_v2_t2[i].temp / 100);
-        float humi = ConvertHumidity((float)rfsns_theo_v2_t2[i].hum / 100);
-        char temperature[33];
-        dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
-        char humidity[33];
-        dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
-
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, temperature, humidity, voltage);
-          if ((0 == tele_period) && !sensor_once) {
-#ifdef USE_DOMOTICZ
-            DomoticzTempHumSensor(temperature, humidity);
-#endif
-#ifdef USE_KNX
-            KnxSensor(KNX_TEMPERATURE, temp);
-            KnxSensor(KNX_HUMIDITY, humi);
-#endif
-            sensor_once = true;
-          }
-#ifdef USE_WEBSERVER
-        } else {
-          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
-          WSContentSend_PD(HTTP_SNS_HUM, sensor, humidity);
-#endif
-        }
-      }
-    }
-  }
-}
-
-#endif
-
-#ifdef USE_ALECTO_V2
-# 392 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define RFSNS_DKW2012_PULSECOUNT 176
-#define RFSNS_ACH2010_MIN_PULSECOUNT 160
-#define RFSNS_ACH2010_MAX_PULSECOUNT 160
-
-#define D_ALECTOV2 "AlectoV2"
-
-const char kAlectoV2Directions[] PROGMEM = D_TX20_NORTH "|"
-                                           D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_EAST "|"
-                                           D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH "|"
-                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_WEST "|"
-                                           D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
-                                           D_TX20_NORTH D_TX20_WEST "|"
-                                           D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
-
-typedef struct {
-  uint32_t time;
-  float temp;
-  float rain;
-  float wind;
-  float gust;
-  uint8_t type;
-  uint8_t humi;
-  uint8_t wdir;
-} alecto_v2_t;
-
-alecto_v2_t *rfsns_alecto_v2 = nullptr;
-uint16_t rfsns_alecto_rain_base = 0;
-
-void RfSnsInitAlectoV2(void)
-{
-  rfsns_alecto_v2 = (alecto_v2_t*)malloc(sizeof(alecto_v2_t));
-  rfsns_any_sensor++;
-}
-
-void RfSnsAnalyzeAlectov2()
-{
-  if (!(((rfsns_raw_signal->Number >= RFSNS_ACH2010_MIN_PULSECOUNT) &&
-         (rfsns_raw_signal->Number <= RFSNS_ACH2010_MAX_PULSECOUNT)) || (rfsns_raw_signal->Number == RFSNS_DKW2012_PULSECOUNT))) { return; }
-
-  uint8_t c = 0;
-  uint8_t rfbit;
-  uint8_t data[9] = { 0 };
-  uint8_t msgtype = 0;
-  uint8_t rc = 0;
-  int temp;
-  uint8_t checksum = 0;
-  uint8_t checksumcalc = 0;
-  uint8_t maxidx = 8;
-  unsigned long atime;
-  float factor;
-  char buf1[16];
-
-  if (rfsns_raw_signal->Number > RFSNS_ACH2010_MAX_PULSECOUNT) { maxidx = 9; }
-
-  uint8_t idx = maxidx;
-  for (uint32_t x = rfsns_raw_signal->Number; x > 0; x = x-2) {
-    if (rfsns_raw_signal->Pulses[x-1] * rfsns_raw_signal->Multiply < 0x300) {
-      rfbit = 0x80;
-    } else {
-      rfbit = 0;
-    }
-    data[idx] = (data[idx] >> 1) | rfbit;
-    c++;
-    if (c == 8) {
-      if (idx == 0) { break; }
-      c = 0;
-      idx--;
-    }
-  }
-
-  checksum = data[maxidx];
-  checksumcalc = RfSnsAlectoCRC8(data, maxidx);
-
-  msgtype = (data[0] >> 4) & 0xf;
-  rc = (data[0] << 4) | (data[1] >> 4);
-
-  if (checksum != checksumcalc) { return; }
-  if ((msgtype != 10) && (msgtype != 5)) { return; }
-
-  rfsns_raw_signal->Repeats = 1;
-
-
-
-
-
-  factor = 1.22;
-
-
-
-
-
-  rfsns_alecto_v2->time = LocalTime();
-  rfsns_alecto_v2->type = (RFSNS_DKW2012_PULSECOUNT == rfsns_raw_signal->Number);
-  rfsns_alecto_v2->temp = (float)(((data[1] & 0x3) * 256 + data[2]) - 400) / 10;
-  rfsns_alecto_v2->humi = data[3];
-  uint16_t rain = (data[6] * 256) + data[7];
-
-  if (rain < rfsns_alecto_rain_base) { rfsns_alecto_rain_base = rain; }
-  if (rfsns_alecto_rain_base > 0) {
-    rfsns_alecto_v2->rain += ((float)rain - rfsns_alecto_rain_base) * 0.30;
-  }
-  rfsns_alecto_rain_base = rain;
-  rfsns_alecto_v2->wind = (float)data[4] * factor;
-  rfsns_alecto_v2->gust = (float)data[5] * factor;
-  if (rfsns_alecto_v2->type) {
-    rfsns_alecto_v2->wdir = data[8] & 0xf;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: " D_ALECTOV2 ", ChkCalc %d, Chksum %d, rc %d, Temp %d, Hum %d, Rain %d, Wind %d, Gust %d, Dir %d, Factor %s"),
-    checksumcalc, checksum, rc, ((data[1] & 0x3) * 256 + data[2]) - 400, data[3], (data[6] * 256) + data[7], data[4], data[5], data[8] & 0xf, dtostrfd(factor, 3, buf1));
-}
-
-void RfSnsAlectoResetRain(void)
-{
-  if ((RtcTime.hour == 0) && (RtcTime.minute == 0) && (RtcTime.second == 5)) {
-    rfsns_alecto_v2->rain = 0;
-  }
-}
-
-
-
-
-
-
-
-uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len)
-{
-  uint8_t crc = 0;
-  while (len--) {
-    uint8_t inbyte = *addr++;
-    for (uint32_t i = 8; i; i--) {
-      uint8_t mix = (crc ^ inbyte) & 0x80;
-      crc <<= 1;
-      if (mix) { crc ^= 0x31; }
-      inbyte <<= 1;
-    }
-  }
-  return crc;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_ALECTOV2[] PROGMEM =
-  "{s}" D_ALECTOV2 " " D_RAIN "{m}%s " D_UNIT_MILLIMETER "{e}"
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}";
-const char HTTP_SNS_ALECTOV2_WDIR[] PROGMEM =
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_DIRECTION "{m}%s{e}";
-#endif
-
-void RfSnsAlectoV2Show(bool json)
-{
-  if (rfsns_alecto_v2->time) {
-    if (rfsns_alecto_v2->time < LocalTime() - RFSNS_VALID_WINDOW) {
-      if (json) {
-        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_RFRECEIVED "\":\"%s\"}"), GetDT(rfsns_alecto_v2->time).c_str());
-      }
-    } else {
-      float temp = ConvertTemp(rfsns_alecto_v2->temp);
-      char temperature[33];
-      dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
-      float humi = ConvertHumidity((float)rfsns_alecto_v2->humi);
-      char humidity[33];
-      dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
-      char rain[33];
-      dtostrfd(rfsns_alecto_v2->rain, 2, rain);
-      char wind[33];
-      dtostrfd(rfsns_alecto_v2->wind, 2, wind);
-      char gust[33];
-      dtostrfd(rfsns_alecto_v2->gust, 2, gust);
-      char wdir[4];
-      char direction[20];
-      if (rfsns_alecto_v2->type) {
-        GetTextIndexed(wdir, sizeof(wdir), rfsns_alecto_v2->wdir, kAlectoV2Directions);
-        snprintf_P(direction, sizeof(direction), PSTR(",\"Direction\":\"%s\""), wdir);
-      }
-
-      if (json) {
-        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"Rain\":%s,\"Wind\":%s,\"Gust\":%s%s}"),
-          temperature, humidity, rain, wind, gust, (rfsns_alecto_v2->type) ? direction : "");
-        if (0 == tele_period) {
-#ifdef USE_DOMOTICZ
-
-
-
-
-#endif
-        }
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, D_ALECTOV2, temperature, TempUnit());
-        WSContentSend_PD(HTTP_SNS_HUM, D_ALECTOV2, humidity);
-        WSContentSend_PD(HTTP_SNS_ALECTOV2, rain, wind, gust);
-        if (rfsns_alecto_v2->type) {
-          WSContentSend_PD(HTTP_SNS_ALECTOV2_WDIR, wdir);
-        }
-#endif
-      }
-    }
-  }
-}
-#endif
-
-void RfSnsInit(void)
-{
-  rfsns_raw_signal = (raw_signal_t*)(malloc(sizeof(raw_signal_t)));
-  if (rfsns_raw_signal) {
-    memset(rfsns_raw_signal, 0, sizeof(raw_signal_t));
-#ifdef USE_THEO_V2
-    RfSnsInitTheoV2();
-#endif
-#ifdef USE_ALECTO_V2
-    RfSnsInitAlectoV2();
-#endif
-    if (rfsns_any_sensor) {
-      rfsns_rf_bit = digitalPinToBitMask(pin[GPIO_RF_SENSOR]);
-      rfsns_rf_port = digitalPinToPort(pin[GPIO_RF_SENSOR]);
-      pinMode(pin[GPIO_RF_SENSOR], INPUT);
-    } else {
-      free(rfsns_raw_signal);
-      rfsns_raw_signal = nullptr;
-    }
-  }
-}
-
-void RfSnsAnalyzeRawSignal(void)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: Pulses %d"), (int)rfsns_raw_signal->Number);
-
-#ifdef USE_THEO_V2
-    RfSnsAnalyzeTheov2();
-#endif
-#ifdef USE_ALECTO_V2
-    RfSnsAnalyzeAlectov2();
-#endif
-}
-
-void RfSnsEverySecond(void)
-{
-#ifdef USE_ALECTO_V2
-  RfSnsAlectoResetRain();
-#endif
-}
-
-void RfSnsShow(bool json)
-{
-#ifdef USE_THEO_V2
-  RfSnsTheoV2Show(json);
-#endif
-#ifdef USE_ALECTO_V2
-  RfSnsAlectoV2Show(json);
-#endif
-}
-
-
-
-
-
-bool Xsns37(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_RF_SENSOR] < 99) && (FUNC_INIT == function)) {
-    RfSnsInit();
-  }
-  else if (rfsns_raw_signal) {
-    switch (function) {
-      case FUNC_LOOP:
-        if ((*portInputRegister(rfsns_rf_port) &rfsns_rf_bit) == rfsns_rf_bit) {
-          if (RfSnsFetchSignal(pin[GPIO_RF_SENSOR], HIGH)) {
-            RfSnsAnalyzeRawSignal();
-          }
-        }
-        sleep = 0;
-        break;
-      case FUNC_EVERY_SECOND:
-        RfSnsEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        RfSnsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        RfSnsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
-#ifdef USE_AZ7798
-
-#define XSNS_38 38
-# 112 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_38_az7798.ino"
-#include <TasmotaSerial.h>
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#define AZ_READ_TIMEOUT 400
-
-#define AZ_CLOCK_UPDATE_INTERVAL (24UL * 60 * 60)
-#define AZ_EPOCH (946684800UL)
-
-TasmotaSerial *AzSerial;
-
-const char ktype[] = "AZ7798";
-uint8_t az_type = 1;
-uint16_t az_co2 = 0;
-double az_temperature = 0;
-double az_humidity = 0;
-uint8_t az_received = 0;
-uint8_t az_state = 0;
-unsigned long az_clock_update = 10;
-
-
-
-void AzEverySecond(void)
-{
-  unsigned long start = millis();
-
-  az_state++;
-  if (5 == az_state) {
-    az_state = 0;
-
-    AzSerial->flush();
-    AzSerial->write(":\r", 2);
-    az_received = 0;
-
-    uint8_t az_response[32];
-    uint8_t counter = 0;
-    uint8_t i, j;
-    uint8_t response_substr[16];
-
-    do {
-      if (AzSerial->available() > 0) {
-        az_response[counter] = AzSerial->read();
-        if(az_response[counter] == 0x0d) { az_received = 1; }
-        counter++;
-      } else {
-        delay(5);
-      }
-    } while(((millis() - start) < AZ_READ_TIMEOUT) && (counter < sizeof(az_response)) && !az_received);
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, az_response, counter);
-
-    if (!az_received) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 comms timeout"));
-      return;
-    }
-
-    i = 0;
-    while((az_response[i] != 'T') && (i < counter)) {i++;}
-    if(az_response[i] != 'T') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find start of response"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != 'C') && (az_response[i] != 'F') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if((az_response[i] != 'C') && (az_response[i] != 'F')){
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of temperature"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_temperature = CharToFloat((char*)response_substr);
-    if(az_response[i] == 'C') {
-      az_temperature = ConvertTemp((float)az_temperature);
-    } else {
-      az_temperature = ConvertTemp((az_temperature - 32) / 1.8);
-    }
-    i++;
-    if(az_response[i] != ':') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error first delimiter"));
-      return;
-    }
-    i++;
-    if(az_response[i] != 'C') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of CO2"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != 'p') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if(az_response[i] != 'p') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of CO2"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_co2 = atoi((char*)response_substr);
-    LightSetSignal(CO2_LOW, CO2_HIGH, az_co2);
-    i += 3;
-    if(az_response[i] != ':') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error second delimiter"));
-      return;
-    }
-    i++;
-    if(az_response[i] != 'H') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of humidity"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != '%') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if(az_response[i] != '%') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of humidity"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_humidity = ConvertHumidity(CharToFloat((char*)response_substr));
-  }
-
-
-  if ((az_clock_update == 0) && (LocalTime() > AZ_EPOCH)) {
-    char tmpString[16];
-    sprintf(tmpString, "C %d\r", (int)(LocalTime() - AZ_EPOCH));
-    AzSerial->write(tmpString);
-
-    do {
-      if (AzSerial->available() > 0) {
-        if(AzSerial->read() == 0x0d) { break; }
-      } else {
-        delay(5);
-      }
-    } while(((millis() - start) < AZ_READ_TIMEOUT));
-    az_clock_update = AZ_CLOCK_UPDATE_INTERVAL;
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 clock updated"));
-  } else {
-    az_clock_update--;
-  }
-}
-
-
-
-void AzInit(void)
-{
-  az_type = 0;
-  if ((pin[GPIO_AZ_RXD] < 99) && (pin[GPIO_AZ_TXD] < 99)) {
-    AzSerial = new TasmotaSerial(pin[GPIO_AZ_RXD], pin[GPIO_AZ_TXD], 1);
-    if (AzSerial->begin(9600)) {
-      if (AzSerial->hardwareSerial()) { ClaimSerial(); }
-      az_type = 1;
-    }
-  }
-}
-
-void AzShow(bool json)
-{
-  char temperature[33];
-  dtostrfd(az_temperature, Settings.flag2.temperature_resolution, temperature);
-  char humidity[33];
-  dtostrfd(az_humidity, Settings.flag2.humidity_resolution, humidity);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"), ktype, az_co2, temperature, humidity);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, az_co2);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, ktype, az_co2);
-    WSContentSend_PD(HTTP_SNS_TEMP, ktype, temperature, TempUnit());
-    WSContentSend_PD(HTTP_SNS_HUM, ktype, humidity);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns38(uint8_t function)
-{
-  bool result = false;
-
-  if(az_type){
-    switch (function) {
-      case FUNC_INIT:
-        AzInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        AzEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        AzShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        AzShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_39_max31855.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_39_max31855.ino"
-#ifdef USE_MAX31855
-
-#define XSNS_39 39
-
-bool initialized = false;
-
-struct MAX31855_ResultStruct{
-    uint8_t ErrorCode;
-    float ProbeTemperature;
-    float ReferenceTemperature;
-} MAX31855_Result;
-
-void MAX31855_Init(void){
-    if(initialized)
-        return;
-
-
-    pinMode(pin[GPIO_MAX31855CS], OUTPUT);
-    pinMode(pin[GPIO_MAX31855CLK], OUTPUT);
-    pinMode(pin[GPIO_MAX31855DO], INPUT);
-
-
-    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
-    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-
-    initialized = true;
-}
-
-
-
-
-
-void MAX31855_GetResult(void){
-    int32_t RawData = MAX31855_ShiftIn(32);
-    uint8_t probeerror = RawData & 0x7;
-
-    MAX31855_Result.ErrorCode = probeerror;
-    MAX31855_Result.ReferenceTemperature = MAX31855_GetReferenceTemperature(RawData);
-    if(probeerror)
-        MAX31855_Result.ProbeTemperature = NAN;
-    else
-        MAX31855_Result.ProbeTemperature = MAX31855_GetProbeTemperature(RawData);
-}
-
-
-
-
-
-
-float MAX31855_GetProbeTemperature(int32_t RawData){
-    if(RawData & 0x80000000)
-        RawData = (RawData >> 18) | 0xFFFFC000;
-    else
-        RawData >>= 18;
-
-    float result = (RawData * 0.25);
-
-    return ConvertTemp(result);
-}
-
-
-
-
-
-float MAX31855_GetReferenceTemperature(int32_t RawData){
-    if(RawData & 0x8000)
-        RawData = (RawData >> 4) | 0xFFFFF000;
-    else
-        RawData = (RawData >> 4) & 0x00000FFF;
-
-    float result = (RawData * 0.0625);
-
-    return ConvertTemp(result);
-}
-
-
-
-
-
-int32_t MAX31855_ShiftIn(uint8_t Length){
-    int32_t dataIn = 0;
-
-    digitalWrite(pin[GPIO_MAX31855CS], LOW);
-    delayMicroseconds(1);
-
-    for (uint32_t i = 0; i < Length; i++)
-    {
-        digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-        delayMicroseconds(1);
-        dataIn <<= 1;
-        if(digitalRead(pin[GPIO_MAX31855DO]))
-            dataIn |= 1;
-        digitalWrite(pin[GPIO_MAX31855CLK], HIGH);
-        delayMicroseconds(1);
-    }
-
-    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
-    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-    return dataIn;
-}
-
-void MAX31855_Show(bool Json){
-    char probetemp[33];
-    char referencetemp[33];
-    dtostrfd(MAX31855_Result.ProbeTemperature, Settings.flag2.temperature_resolution, probetemp);
-    dtostrfd(MAX31855_Result.ReferenceTemperature, Settings.flag2.temperature_resolution, referencetemp);
-
-    if(Json){
-        ResponseAppend_P(PSTR(",\"MAX31855\":{\"" D_JSON_PROBETEMPERATURE "\":%s,\"" D_JSON_REFERENCETEMPERATURE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
-          probetemp, referencetemp, MAX31855_Result.ErrorCode);
-#ifdef USE_DOMOTICZ
-        if (0 == tele_period) {
-          DomoticzSensor(DZ_TEMP, probetemp);
-        }
-#endif
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, MAX31855_Result.ProbeTemperature);
-        }
-#endif
-    } else {
-#ifdef USE_WEBSERVER
-        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31855", probetemp, TempUnit());
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns39(uint8_t function)
-{
-  bool result = false;
-  if((pin[GPIO_MAX31855CS] < 99) && (pin[GPIO_MAX31855CLK] < 99) && (pin[GPIO_MAX31855DO] < 99)){
-
-    switch (function) {
-      case FUNC_INIT:
-        MAX31855_Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        MAX31855_GetResult();
-        break;
-      case FUNC_JSON_APPEND:
-        MAX31855_Show(true);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MAX31855_Show(false);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
-#ifdef USE_PN532_HSU
-
-#define XSNS_40 40
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PN532_Serial;
-
-#define PN532_INVALID_ACK -1
-#define PN532_TIMEOUT -2
-#define PN532_INVALID_FRAME -3
-#define PN532_NO_SPACE -4
-
-#define PN532_PREAMBLE 0x00
-#define PN532_STARTCODE1 0x00
-#define PN532_STARTCODE2 0xFF
-#define PN532_POSTAMBLE 0x00
-
-#define PN532_HOSTTOPN532 0xD4
-#define PN532_PN532TOHOST 0xD5
-
-#define PN532_ACK_WAIT_TIME 0x0A
-
-#define PN532_COMMAND_GETFIRMWAREVERSION 0x02
-#define PN532_COMMAND_SAMCONFIGURATION 0x14
-#define PN532_COMMAND_RFCONFIGURATION 0x32
-#define PN532_COMMAND_INDATAEXCHANGE 0x40
-#define PN532_COMMAND_INLISTPASSIVETARGET 0x4A
-
-#define PN532_MIFARE_ISO14443A 0x00
-#define MIFARE_CMD_READ 0x30
-#define MIFARE_CMD_AUTH_A 0x60
-#define MIFARE_CMD_AUTH_B 0x61
-#define MIFARE_CMD_WRITE 0xA0
-
-uint8_t pn532_model = 0;
-uint8_t pn532_command = 0;
-uint8_t pn532_scantimer = 0;
-
-uint8_t pn532_packetbuffer[64];
-
-#ifdef USE_PN532_DATA_FUNCTION
-uint8_t pn532_function = 0;
-uint8_t pn532_newdata[16];
-uint8_t pn532_newdata_len = 0;
-#endif
-
-void PN532_Init(void)
-{
-  if ((pin[GPIO_PN532_RXD] < 99) && (pin[GPIO_PN532_TXD] < 99)) {
-    PN532_Serial = new TasmotaSerial(pin[GPIO_PN532_RXD], pin[GPIO_PN532_TXD], 1);
-    if (PN532_Serial->begin(115200)) {
-      if (PN532_Serial->hardwareSerial()) { ClaimSerial(); }
-      PN532_wakeup();
-      uint32_t ver = PN532_getFirmwareVersion();
-      if (ver) {
-        PN532_setPassiveActivationRetries(0xFF);
-        PN532_SAMConfig();
-        pn532_model = 1;
-        AddLog_P2(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected (V%u.%u)",(ver>>16) & 0xFF, (ver>>8) & 0xFF);
-      }
-    }
-  }
-}
-
-int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout)
-{
-  int read_bytes = 0;
-  int ret;
-  unsigned long start_millis;
-  while (read_bytes < len) {
-    start_millis = millis();
-    do {
-      ret = PN532_Serial->read();
-      if (ret >= 0) {
-        break;
-      }
-    } while((timeout == 0) || ((millis()- start_millis ) < timeout));
-
-    if (ret < 0) {
-      if (read_bytes) {
-        return read_bytes;
-      } else {
-        return PN532_TIMEOUT;
-      }
-    }
-    buf[read_bytes] = (uint8_t)ret;
-    read_bytes++;
-  }
-  return read_bytes;
-}
-
-int8_t PN532_readAckFrame(void)
-{
-  const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
-  uint8_t ackBuf[sizeof(PN532_ACK)];
-
-  if (PN532_receive(ackBuf, sizeof(PN532_ACK), PN532_ACK_WAIT_TIME) <= 0) {
-    return PN532_TIMEOUT;
-  }
-
-  if (memcmp(&ackBuf, &PN532_ACK, sizeof(PN532_ACK))) {
-    return PN532_INVALID_ACK;
-  }
-  return 0;
-}
-
-int8_t PN532_writeCommand(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0)
-{
-
-  PN532_Serial->flush();
-
-  pn532_command = header[0];
-  PN532_Serial->write((uint8_t)PN532_PREAMBLE);
-  PN532_Serial->write((uint8_t)PN532_STARTCODE1);
-  PN532_Serial->write(PN532_STARTCODE2);
-
-  uint8_t length = hlen + blen + 1;
-  PN532_Serial->write(length);
-  PN532_Serial->write(~length + 1);
-
-  PN532_Serial->write(PN532_HOSTTOPN532);
-  uint8_t sum = PN532_HOSTTOPN532;
-
-  PN532_Serial->write(header, hlen);
-  for (uint32_t i = 0; i < hlen; i++) {
-    sum += header[i];
-  }
-
-  PN532_Serial->write(body, blen);
-  for (uint32_t i = 0; i < blen; i++) {
-    sum += body[i];
-  }
-
-  uint8_t checksum = ~sum + 1;
-  PN532_Serial->write(checksum);
-  PN532_Serial->write((uint8_t)PN532_POSTAMBLE);
-
-  return PN532_readAckFrame();
-}
-
-int16_t PN532_readResponse(uint8_t buf[], uint8_t len, uint16_t timeout = 50)
-{
-  uint8_t tmp[3];
-
-
-  if (PN532_receive(tmp, 3, timeout)<=0) {
-    return PN532_TIMEOUT;
-  }
-  if (0 != tmp[0] || 0!= tmp[1] || 0xFF != tmp[2]) {
-    return PN532_INVALID_FRAME;
-  }
-
-
-  uint8_t length[2];
-  if (PN532_receive(length, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-
-  if (0 != (uint8_t)(length[0] + length[1])) {
-    return PN532_INVALID_FRAME;
-  }
-  length[0] -= 2;
-  if (length[0] > len) {
-    return PN532_NO_SPACE;
-  }
-
-
-  uint8_t cmd = pn532_command + 1;
-  if (PN532_receive(tmp, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-  if (PN532_PN532TOHOST != tmp[0] || cmd != tmp[1]) {
-    return PN532_INVALID_FRAME;
-  }
-
-  if (PN532_receive(buf, length[0], timeout) != length[0]) {
-    return PN532_TIMEOUT;
-  }
-
-  uint8_t sum = PN532_PN532TOHOST + cmd;
-  for (uint32_t i=0; i<length[0]; i++) {
-    sum += buf[i];
-  }
-
-
-  if (PN532_receive(tmp, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-  if (0 != (uint8_t)(sum + tmp[0]) || 0 != tmp[1]) {
-    return PN532_INVALID_FRAME;
-  }
-
-  return length[0];
-}
-
-uint32_t PN532_getFirmwareVersion(void)
-{
-  uint32_t response;
-
-  pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
-
-  if (PN532_writeCommand(pn532_packetbuffer, 1)) {
-    return 0;
-  }
-
-
-  int16_t status = PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-  if (0 > status) {
-    return 0;
-  }
-
-  response = pn532_packetbuffer[0];
-  response <<= 8;
-  response |= pn532_packetbuffer[1];
-  response <<= 8;
-  response |= pn532_packetbuffer[2];
-  response <<= 8;
-  response |= pn532_packetbuffer[3];
-
-  return response;
-}
-
-void PN532_wakeup(void)
-{
-  uint8_t wakeup[5] = {0x55, 0x55, 0, 0, 0 };
-  PN532_Serial->write(wakeup,sizeof(wakeup));
-
-
-  PN532_Serial->flush();
-}
-
-bool PN532_readPassiveTargetID(uint8_t cardbaudrate, uint8_t *uid, uint8_t *uidLength, uint16_t timeout = 50)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
-  pn532_packetbuffer[1] = 1;
-  pn532_packetbuffer[2] = cardbaudrate;
-  if (PN532_writeCommand(pn532_packetbuffer, 3)) {
-    return 0x0;
-  }
-
-  if (PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer), timeout) < 0) {
-    return 0x0;
-  }
-# 274 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_40_pn532.ino"
-  if (pn532_packetbuffer[0] != 1) {
-    return 0;
-  }
-
-  uint16_t sens_res = pn532_packetbuffer[2];
-  sens_res <<= 8;
-  sens_res |= pn532_packetbuffer[3];
-
-
-  *uidLength = pn532_packetbuffer[5];
-
-  for (uint32_t i = 0; i < pn532_packetbuffer[5]; i++) {
-    uid[i] = pn532_packetbuffer[6 + i];
-  }
-
-  return 1;
-}
-
-bool PN532_setPassiveActivationRetries(uint8_t maxRetries)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
-  pn532_packetbuffer[1] = 5;
-  pn532_packetbuffer[2] = 0xFF;
-  pn532_packetbuffer[3] = 0x01;
-  pn532_packetbuffer[4] = maxRetries;
-  if (PN532_writeCommand(pn532_packetbuffer, 5)) {
-    return 0;
-  }
-  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-bool PN532_SAMConfig(void)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
-  pn532_packetbuffer[1] = 0x01;
-  pn532_packetbuffer[2] = 0x14;
-  pn532_packetbuffer[3] = 0x00;
-  if (PN532_writeCommand(pn532_packetbuffer, 4)) {
-    return false;
-  }
-  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-#ifdef USE_PN532_DATA_FUNCTION
-
-uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData)
-{
-    uint8_t i;
-    uint8_t _key[6];
-    uint8_t _uid[7];
-    uint8_t _uidLen;
-
-
-    memcpy(&_key, keyData, 6);
-    memcpy(&_uid, uid, uidLen);
-    _uidLen = uidLen;
-
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
-    pn532_packetbuffer[3] = blockNumber;
-    memcpy(&pn532_packetbuffer[4], &_key, 6);
-    for (i = 0; i < _uidLen; i++) {
-        pn532_packetbuffer[10 + i] = _uid[i];
-    }
-
-    if (PN532_writeCommand(pn532_packetbuffer, 10 + _uidLen)) { return 0; }
-
-
-    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-
-
-
-
-    if (pn532_packetbuffer[0] != 0x00) {
-
-        return 0;
-    }
-
-    return 1;
-}
-
-uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data)
-{
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = MIFARE_CMD_READ;
-    pn532_packetbuffer[3] = blockNumber;
-
-
-    if (PN532_writeCommand(pn532_packetbuffer, 4)) {
-        return 0;
-    }
-
-
-    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-
-
-    if (pn532_packetbuffer[0] != 0x00) {
-        return 0;
-    }
-
-
-
-    memcpy (data, &pn532_packetbuffer[1], 16);
-
-    return 1;
-}
-
-uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data)
-{
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = MIFARE_CMD_WRITE;
-    pn532_packetbuffer[3] = blockNumber;
-    memcpy(&pn532_packetbuffer[4], data, 16);
-
-
-    if (PN532_writeCommand(pn532_packetbuffer, 20)) {
-        return 0;
-    }
-
-
-    return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-#endif
-
-void PN532_ScanForTag(void)
-{
-  if (!pn532_model) { return; }
-  uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
-  uint8_t uid_len = 0;
-  uint8_t card_data[16];
-  bool erase_success = false;
-  bool set_success = false;
-  if (PN532_readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uid_len)) {
-      char uids[15];
-
-#ifdef USE_PN532_DATA_FUNCTION
-      char card_datas[34];
-#endif
-
-      ToHex_P((unsigned char*)uid, uid_len, uids, sizeof(uids));
-
-#ifdef USE_PN532_DATA_FUNCTION
-      if (uid_len == 4) {
-        uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-        if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) {
-          if (mifareclassic_ReadDataBlock(1, card_data)) {
-#ifdef USE_PN532_DATA_RAW
-            memcpy(&card_datas,&card_data,sizeof(card_data));
-#else
-            for (uint32_t i = 0;i < sizeof(card_data);i++) {
-              if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) {
-                card_datas[i] = char(card_data[i]);
-              } else {
-                card_datas[i] = '\0';
-              }
-            }
-#endif
-          }
-          if (pn532_function == 1) {
-            for (uint32_t i = 0;i<16;i++) {
-              card_data[i] = 0x00;
-            }
-            if (mifareclassic_WriteDataBlock(1, card_data)) {
-              erase_success = true;
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase success"));
-              memcpy(&card_datas,&card_data,sizeof(card_data));
-            }
-          }
-          if (pn532_function == 2) {
-#ifdef USE_PN532_DATA_RAW
-            memcpy(&card_data,&pn532_newdata,sizeof(card_data));
-            if (mifareclassic_WriteDataBlock(1, card_data)) {
-              set_success = true;
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
-              memcpy(&card_datas,&card_data,sizeof(card_data));
-            }
-#else
-            bool IsAlphaNumeric = true;
-            for (uint32_t i = 0;i < pn532_newdata_len;i++) {
-              if ((!isalpha(pn532_newdata[i])) && (!isdigit(pn532_newdata[i]))) {
-                IsAlphaNumeric = false;
-              }
-            }
-            if (IsAlphaNumeric) {
-              memcpy(&card_data,&pn532_newdata,pn532_newdata_len);
-              card_data[pn532_newdata_len] = '\0';
-              if (mifareclassic_WriteDataBlock(1, card_data)) {
-                set_success = true;
-                AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
-                memcpy(&card_datas,&card_data,sizeof(card_data));
-              }
-            } else {
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data must be alphanumeric"));
-            }
-#endif
-          }
-        } else {
-          sprintf(card_datas,"AUTHFAIL");
-        }
-      }
-      switch (pn532_function) {
-        case 0x01:
-          if (!erase_success) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase fail - exiting erase mode"));
-          }
-          break;
-        case 0x02:
-          if (!set_success) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Write failed - exiting set mode"));
-          }
-        default:
-          break;
-      }
-      pn532_function = 0;
-#endif
-
-#ifdef USE_PN532_DATA_FUNCTION
-      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\", \"DATA\":\"%s\"}}"), uids, card_datas);
-#else
-      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids);
-#endif
-
-      MqttPublishTeleSensor();
-
-#ifdef USE_PN532_CAUSE_EVENTS
-
-      char command[71];
-#ifdef USE_PN532_DATA_FUNCTION
-      sprintf(command,"backlog event PN532_UID=%s;event PN532_DATA=%s",uids,card_datas);
-#else
-      sprintf(command,"event PN532_UID=%s",uids);
-#endif
-      ExecuteCommand(command, SRC_RULE);
-#endif
-
-      pn532_scantimer = 7;
-  }
-}
-
-#ifdef USE_PN532_DATA_FUNCTION
-
-bool PN532_Command(void)
-{
-  bool serviced = true;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  char sub_string_tmp[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"E")) {
-    pn532_function = 1;
-    AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be erased"));
-    ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"E\"}}"));
-    return serviced;
-  }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"S")) {
-    if (paramcount > 1) {
-      if (XdrvMailbox.data[XdrvMailbox.data_len-1] == ',') {
-        serviced = false;
-        return serviced;
-      }
-      sprintf(sub_string_tmp,subStr(sub_string, XdrvMailbox.data, ",", 2));
-      pn532_newdata_len = strlen(sub_string_tmp);
-      if (pn532_newdata_len > 15) { pn532_newdata_len = 15; }
-      memcpy(&pn532_newdata,&sub_string_tmp,pn532_newdata_len);
-      pn532_newdata[pn532_newdata_len] = 0x00;
-      pn532_function = 2;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be set to '%s'"), pn532_newdata);
-      ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"S\"}}"));
-      return serviced;
-    }
-  }
-}
-
-#endif
-
-bool Xsns40(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_INIT:
-      PN532_Init();
-      result = true;
-      break;
-    case FUNC_EVERY_50_MSECOND:
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      break;
-    case FUNC_EVERY_250_MSECOND:
-      if (pn532_scantimer > 0) {
-        pn532_scantimer--;
-      } else {
-        PN532_ScanForTag();
-      }
-      break;
-    case FUNC_EVERY_SECOND:
-      break;
-#ifdef USE_PN532_DATA_FUNCTION
-    case FUNC_COMMAND_SENSOR:
-      if (XSNS_40 == XdrvMailbox.index) {
-        result = PN532_Command();
-      }
-      break;
-#endif
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_41_max44009.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_41_max44009.ino"
-#ifdef USE_I2C
-#ifdef USE_MAX44009
-
-
-
-
-
-
-#define XSNS_41 41
-#define XI2C_28 28
-
-#define MAX44009_ADDR1 0x4A
-#define MAX44009_ADDR2 0x4B
-#define MAX44009_NO_REGISTERS 8
-#define REG_CONFIG 0x02
-#define REG_LUMINANCE 0x03
-#define REG_LOWER_THRESHOLD 0x06
-#define REG_THRESHOLD_TIMER 0x07
-
-#define MAX44009_CONTINUOUS_AUTO_MODE 0x80
-
-uint8_t max44009_address;
-uint8_t max44009_addresses[] = { MAX44009_ADDR1, MAX44009_ADDR2, 0 };
-uint8_t max44009_found = 0;
-uint8_t max44009_valid = 0;
-float max44009_illuminance = 0;
-char max44009_types[] = "MAX44009";
-
-bool Max4409Read_lum(void)
-{
-  max44009_valid = 0;
-  uint8_t regdata[2];
-
-
-  if (I2cValidRead16((uint16_t *)&regdata, max44009_address, REG_LUMINANCE)) {
-    int exponent = (regdata[0] & 0xF0) >> 4;
-    int mantissa = ((regdata[0] & 0x0F) << 4) | (regdata[1] & 0x0F);
-    max44009_illuminance = (float)(((0x00000001 << exponent) * (float)mantissa) * 0.045);
-    max44009_valid = 1;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-
-
-void Max4409Detect(void)
-{
-  uint8_t buffer1;
-  uint8_t buffer2;
-  for (uint32_t i = 0; 0 != max44009_addresses[i]; i++) {
-
-    max44009_address = max44009_addresses[i];
-    if (I2cActive(max44009_address)) { continue; }
-
-    if ((I2cValidRead8(&buffer1, max44009_address, REG_LOWER_THRESHOLD)) &&
-        (I2cValidRead8(&buffer2, max44009_address, REG_THRESHOLD_TIMER))) {
-
-      if ((0x00 == buffer1) &&
-          (0xFF == buffer2)) {
-
-
-
-        Wire.beginTransmission(max44009_address);
-
-
-        Wire.write(REG_CONFIG);
-        Wire.write(MAX44009_CONTINUOUS_AUTO_MODE);
-        if (0 == Wire.endTransmission()) {
-          I2cSetActiveFound(max44009_address, max44009_types);
-          max44009_found = 1;
-          break;
-        }
-      }
-    }
-  }
-}
-
-void Max4409EverySecond(void)
-{
-  Max4409Read_lum();
-}
-
-void Max4409Show(bool json)
-{
-  char illum_str[8];
-
-  if (max44009_valid) {
-
-
-
-    uint8_t prec = 0;
-    if (10 > max44009_illuminance ) {
-      prec = 3;
-    } else if (100 > max44009_illuminance) {
-      prec = 2;
-    } else if (1000 > max44009_illuminance) {
-      prec = 1;
-    }
-    dtostrf(max44009_illuminance, sizeof(illum_str) -1, prec, illum_str);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%s}"), max44009_types, illum_str);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, illum_str);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, max44009_types, (int)max44009_illuminance);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns41(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_28)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Max4409Detect();
-  }
-  else if (max44009_found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Max4409EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Max4409Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Max4409Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_42_scd30.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_42_scd30.ino"
-#ifdef USE_I2C
-#ifdef USE_SCD30
-
-#define XSNS_42 42
-#define XI2C_29 29
-
-
-
-#define SCD30_ADDRESS 0x61
-
-#define SCD30_MAX_MISSED_READS 3
-#define SCD30_STATE_NO_ERROR 0
-#define SCD30_STATE_ERROR_DATA_CRC 1
-#define SCD30_STATE_ERROR_READ_MEAS 2
-#define SCD30_STATE_ERROR_SOFT_RESET 3
-#define SCD30_STATE_ERROR_I2C_RESET 4
-#define SCD30_STATE_ERROR_UNKNOWN 5
-
-#include "Arduino.h"
-#include <FrogmoreScd30.h>
-
-#define D_CMND_SCD30 "SCD30"
-
-const char S_JSON_SCD30_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d}";
-const char S_JSON_SCD30_COMMAND_NFW_VALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d.%d}";
-const char S_JSON_SCD30_COMMAND[] PROGMEM = "{\"" D_CMND_SCD30 "%s\"}";
-const char kSCD30_Commands[] PROGMEM = "Alt|Auto|Cal|FW|Int|Pres|TOff";
-
-
-
-
-
-enum SCD30_Commands {
-  CMND_SCD30_ALTITUDE,
-  CMND_SCD30_AUTOMODE,
-  CMND_SCD30_CALIBRATE,
-  CMND_SCD30_FW,
-  CMND_SCD30_INTERVAL,
-  CMND_SCD30_PRESSURE,
-  CMND_SCD30_TEMPOFFSET
-};
-
-FrogmoreScd30 scd30;
-
-bool scd30Found = false;
-bool scd30IsDataValid = false;
-int scd30ErrorState = SCD30_STATE_NO_ERROR;
-uint16_t scd30Interval_sec;
-int scd30Loop_count = 0;
-int scd30DataNotAvailable_count = 0;
-int scd30GoodMeas_count = 0;
-int scd30Reset_count = 0;
-int scd30CrcError_count = 0;
-int scd30Co2Zero_count = 0;
-int i2cReset_count = 0;
-uint16_t scd30_CO2 = 0;
-uint16_t scd30_CO2EAvg = 0;
-float scd30_Humid = 0.0;
-float scd30_Temp = 0.0;
-
-void Scd30Detect(void)
-{
-  if (I2cActive(SCD30_ADDRESS)) { return; }
-
-  scd30.begin();
-
-  uint8_t major = 0;
-  uint8_t minor = 0;
-  if (scd30.getFirmwareVersion(&major, &minor)) { return; }
-  uint16_t interval_sec;
-  if (scd30.getMeasurementInterval(&scd30Interval_sec)) { return; }
-  if (scd30.beginMeasuring()) { return; }
-
-  I2cSetActiveFound(SCD30_ADDRESS, "SCD30");
-  scd30Found = true;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SCD: FW v%d.%d"), major, minor);
-}
-
-
-void Scd30Update(void)
-{
-  scd30Loop_count++;
-  if (scd30Loop_count > (scd30Interval_sec - 1)) {
-    int error = 0;
-    switch (scd30ErrorState) {
-      case SCD30_STATE_NO_ERROR: {
-        error = scd30.readMeasurement(&scd30_CO2, &scd30_CO2EAvg, &scd30_Temp, &scd30_Humid);
-        switch (error) {
-          case ERROR_SCD30_NO_ERROR:
-            scd30Loop_count = 0;
-            scd30IsDataValid = true;
-            scd30GoodMeas_count++;
-            break;
-
-          case ERROR_SCD30_NO_DATA:
-            scd30DataNotAvailable_count++;
-            break;
-
-          case ERROR_SCD30_CRC_ERROR:
-            scd30ErrorState = SCD30_STATE_ERROR_DATA_CRC;
-            scd30CrcError_count++;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CRC error, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
-              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-#endif
-            break;
-
-          case ERROR_SCD30_CO2_ZERO:
-            scd30Co2Zero_count++;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CO2 zero, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
-              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-#endif
-            break;
-
-          default: {
-            scd30ErrorState = SCD30_STATE_ERROR_READ_MEAS;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: Update: ReadMeasurement error: 0x%lX, counter: %ld"), error, scd30Loop_count);
-#endif
-             return;
-          }
-          break;
-        }
-      }
-      break;
-
-      case SCD30_STATE_ERROR_DATA_CRC: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: got CRC error, try again, counter: %ld"), scd30Loop_count);
-#endif
-        scd30ErrorState = ERROR_SCD30_NO_ERROR;
-      }
-      break;
-
-      case SCD30_STATE_ERROR_READ_MEAS: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: not answering, sending soft reset, counter: %ld"), scd30Loop_count);
-#endif
-        scd30Reset_count++;
-        error = scd30.softReset();
-        if (error) {
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: resetting got error: 0x%lX"), error);
-#endif
-          error >>= 8;
-          if (error == 4) {
-            scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
-          } else {
-            scd30ErrorState = SCD30_STATE_ERROR_UNKNOWN;
-          }
-        } else {
-          scd30ErrorState = ERROR_SCD30_NO_ERROR;
-        }
-      }
-      break;
-
-      case SCD30_STATE_ERROR_SOFT_RESET: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P(LOG_LEVEL_ERROR, PSTR("SCD30: clearing i2c bus"));
-#endif
-        i2cReset_count++;
-        error = scd30.clearI2CBus();
-        if (error) {
-          scd30ErrorState = SCD30_STATE_ERROR_I2C_RESET;
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error clearing i2c bus: 0x%lX"), error);
-#endif
-        } else {
-          scd30ErrorState = ERROR_SCD30_NO_ERROR;
-        }
-      }
-      break;
-
-      default: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: unknown error state: 0x%lX"), scd30ErrorState);
-#endif
-        scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
-      }
-    }
-
-    if (scd30Loop_count > (SCD30_MAX_MISSED_READS * scd30Interval_sec)) {
-      scd30IsDataValid = false;
-    }
-  }
-}
-
-
-int Scd30GetCommand(int command_code, uint16_t *pvalue)
-{
-  switch (command_code)
-  {
-    case CMND_SCD30_ALTITUDE:
-      return scd30.getAltitudeCompensation(pvalue);
-      break;
-
-    case CMND_SCD30_AUTOMODE:
-      return scd30.getCalibrationType(pvalue);
-      break;
-
-    case CMND_SCD30_CALIBRATE:
-      return scd30.getForcedRecalibrationFactor(pvalue);
-      break;
-
-    case CMND_SCD30_INTERVAL:
-      return scd30.getMeasurementInterval(pvalue);
-      break;
-
-    case CMND_SCD30_PRESSURE:
-      return scd30.getAmbientPressure(pvalue);
-      break;
-
-    case CMND_SCD30_TEMPOFFSET:
-      return scd30.getTemperatureOffset(pvalue);
-      break;
-
-      default:
-
-      break;
-  }
-}
-
-int Scd30SetCommand(int command_code, uint16_t value)
-{
-  switch (command_code)
-  {
-    case CMND_SCD30_ALTITUDE:
-      return scd30.setAltitudeCompensation(value);
-      break;
-
-    case CMND_SCD30_AUTOMODE:
-      return scd30.setCalibrationType(value);
-      break;
-
-    case CMND_SCD30_CALIBRATE:
-      return scd30.setForcedRecalibrationFactor(value);
-      break;
-
-    case CMND_SCD30_INTERVAL:
-    {
-      int error = scd30.setMeasurementInterval(value);
-      if (!error)
-      {
-        scd30Interval_sec = value;
-      }
-
-      return error;
-    }
-      break;
-
-    case CMND_SCD30_PRESSURE:
-      return scd30.setAmbientPressure(value);
-      break;
-
-    case CMND_SCD30_TEMPOFFSET:
-      return scd30.setTemperatureOffset(value);
-      break;
-
-      default:
-
-      break;
-  }
-}
-
-
-
-
-
-bool Scd30CommandSensor()
-{
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t prefix_len = strlen(D_CMND_SCD30);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_SCD30), prefix_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + prefix_len, kSCD30_Commands);
-
-    switch (command_code) {
-      case CMND_SCD30_ALTITUDE:
-      case CMND_SCD30_AUTOMODE:
-      case CMND_SCD30_CALIBRATE:
-      case CMND_SCD30_INTERVAL:
-      case CMND_SCD30_PRESSURE:
-      case CMND_SCD30_TEMPOFFSET:
-      {
-        uint16_t value = 0;
-        if (XdrvMailbox.data_len > 0)
-        {
-          value = XdrvMailbox.payload;
-          Scd30SetCommand(command_code, value);
-        }
-        else
-        {
-          Scd30GetCommand(command_code, &value);
-        }
-
-        Response_P(S_JSON_SCD30_COMMAND_NVALUE, command, value);
-      }
-        break;
-
-      case CMND_SCD30_FW:
-      {
-        uint8_t major = 0;
-        uint8_t minor = 0;
-        int error;
-        error = scd30.getFirmwareVersion(&major, &minor);
-        if (error)
-        {
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error getting FW version: 0x%lX"), error);
-#endif
-          serviced = false;
-        }
-        else
-        {
-          Response_P(S_JSON_SCD30_COMMAND_NFW_VALUE, command, major, minor);
-        }
-      }
-        break;
-
-      default:
-
-        serviced = false;
-      break;
-    }
-  }
-  return serviced;
-}
-
-void Scd30Show(bool json)
-{
-  if (scd30IsDataValid)
-  {
-    char humidity[10];
-    dtostrfd(ConvertHumidity(scd30_Humid), Settings.flag2.humidity_resolution, humidity);
-    char temperature[10];
-    dtostrfd(ConvertTemp(scd30_Temp), Settings.flag2.temperature_resolution, temperature);
-
-    if (json) {
-
-      ResponseAppend_P(PSTR(",\"SCD30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"),
-        scd30_CO2, scd30_CO2EAvg, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period)
-      {
-        DomoticzSensor(DZ_AIRQUALITY, scd30_CO2);
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_CO2EAVG, "SCD30", scd30_CO2EAvg);
-      WSContentSend_PD(HTTP_SNS_CO2, "SCD30", scd30_CO2);
-      WSContentSend_PD(HTTP_SNS_TEMP, "SCD30", temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, "SCD30", humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns42(byte function)
-{
-  if (!I2cEnabled(XI2C_29)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Scd30Detect();
-  }
-  else if (scd30Found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Scd30Update();
-        break;
-      case FUNC_COMMAND:
-        result = Scd30CommandSensor();
-        break;
-      case FUNC_JSON_APPEND:
-        Scd30Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Scd30Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
-#ifdef USE_HRE
-# 49 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_43_hre.ino"
-#define XSNS_43 43
-
-enum hre_states {
-   hre_idle,
-   hre_sync,
-   hre_syncing,
-   hre_read,
-   hre_reading,
-   hre_sleep,
-   hre_sleeping
-};
-
-hre_states hre_state = hre_idle;
-
-float hre_usage = 0;
-float hre_rate = 0;
-uint32_t hre_usage_time = 0;
-
-int hre_read_errors = 0;
-bool hre_good = false;
-
-
-
-int hreReadBit()
-{
-   digitalWrite(pin[GPIO_HRE_CLOCK], HIGH);
-   delay(1);
-   int bit = digitalRead(pin[GPIO_HRE_DATA]);
-   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
-   delay(1);
-   return bit;
-}
-
-
-
-char hreReadChar(int &parity_errors)
-{
-
-   hreReadBit();
-
-   unsigned ch=0;
-   int sum=0;
-   for (uint32_t i=0; i<7; i++)
-   {
-      int b = hreReadBit();
-      ch |= b << i;
-      sum += b;
-   }
-
-
-   if ( (sum & 0x1) != hreReadBit())
-      parity_errors++;
-
-
-   hreReadBit();
-
-   return ch;
-}
-
-void hreInit(void)
-{
-   hre_read_errors = 0;
-   hre_good = false;
-
-   pinMode(pin[GPIO_HRE_CLOCK], OUTPUT);
-   pinMode(pin[GPIO_HRE_DATA], INPUT);
-
-
-
-   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
-
-   hre_state = hre_sync;
-}
-
-
-void hreEvery50ms(void)
-{
-   static int sync_counter = 0;
-   static int sync_run = 0;
-
-   static uint32_t curr_start = 0;
-   static int read_counter = 0;
-   static int parity_errors = 0;
-   static char buff[46];
-
-   static char ch;
-   static size_t i;
-
-   switch (hre_state)
-   {
-      case hre_sync:
-         if (uptime < 10)
-            break;
-         sync_run = 0;
-         sync_counter = 0;
-         hre_state = hre_syncing;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_syncing"));
-         break;
-
-      case hre_syncing:
-
-
-         for (uint32_t i=0; i<20; i++)
-         {
-            if (hreReadBit())
-               sync_run++;
-            else
-               sync_run = 0;
-            if (sync_run == 62)
-            {
-               hre_state = hre_read;
-               break;
-            }
-            sync_counter++;
-         }
-
-         if (sync_counter > 1000)
-         {
-            hre_state = hre_sleep;
-            AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE D_ERROR));
-         }
-         break;
-
-
-      case hre_read:
-         AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "sync_run:%d, sync_counter:%d"), sync_run, sync_counter);
-         read_counter = 0;
-         parity_errors = 0;
-         curr_start = uptime;
-         memset(buff, 0, sizeof(buff));
-         hre_state = hre_reading;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_reading"));
-
-
-
-
-
-      case hre_reading:
-
-         buff[read_counter++] = hreReadChar(parity_errors);
-         buff[read_counter++] = hreReadChar(parity_errors);
-
-         if (read_counter == 46)
-         {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "pe:%d, re:%d, buff:%s"),
-                      parity_errors, hre_read_errors, buff);
-            if (parity_errors == 0)
-            {
-               float curr_usage;
-               curr_usage = 0.01 * atol(buff+24);
-               if (hre_usage_time)
-               {
-                  double dt = 1.666e-2 * (curr_start - hre_usage_time);
-                  hre_rate = (curr_usage - hre_usage)/dt;
-               }
-               hre_usage = curr_usage;
-               hre_usage_time = curr_start;
-               hre_good = true;
-
-               hre_state = hre_sleep;
-            }
-            else
-            {
-               hre_read_errors++;
-               hre_state = hre_sleep;
-            }
-         }
-         break;
-
-      case hre_sleep:
-         hre_usage_time = curr_start;
-         hre_state = hre_sleeping;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_sleeping"));
-
-      case hre_sleeping:
-
-
-         if (uptime - hre_usage_time >= 27)
-            hre_state = hre_sync;
-   }
-}
-
-void hreShow(boolean json)
-{
-   if (!hre_good)
-      return;
-
-   const char *id = "HRE";
-
-   char usage[16];
-   char rate[16];
-   dtostrfd(hre_usage, 2, usage);
-   dtostrfd(hre_rate, 3, rate);
-
-   if (json)
-   {
-      ResponseAppend_P(JSON_SNS_GNGPM, id, usage, rate);
-#ifdef USE_WEBSERVER
-   }
-   else
-   {
-      WSContentSend_PD(HTTP_SNS_GALLONS, id, usage);
-      WSContentSend_PD(HTTP_SNS_GPM, id, rate);
-#endif
-   }
-}
-
-
-
-
-
-bool Xsns43(byte function)
-{
-
-   if (pin[GPIO_HRE_CLOCK] >= 99 || pin[GPIO_HRE_DATA] >= 99)
-      return false;
-
-   switch (function)
-   {
-      case FUNC_INIT:
-         hreInit();
-         break;
-      case FUNC_EVERY_50_MSECOND:
-         hreEvery50ms();
-         break;
-      case FUNC_EVERY_SECOND:
-         break;
-      case FUNC_JSON_APPEND:
-         hreShow(1);
-         break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-         hreShow(0);
-         break;
-#endif
-   }
-   return false;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_44_sps30.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_44_sps30.ino"
-#ifdef USE_I2C
-#ifdef USE_SPS30
-
-#define XSNS_44 44
-#define XI2C_30 30
-
-#define SPS30_ADDR 0x69
-
-#include <Wire.h>
-#include <twi.h>
-
-uint8_t sps30_ready = 0;
-uint8_t sps30_running;
-
-struct SPS30 {
-  float PM1_0;
-  float PM2_5;
-  float PM4_0;
-  float PM10;
-  float NCPM0_5;
-  float NCPM1_0;
-  float NCPM2_5;
-  float NCPM4_0;
-  float NCPM10;
-  float TYPSIZ;
-} sps30_result;
-
-#define SPS_CMD_START_MEASUREMENT 0x0010
-#define SPS_CMD_START_MEASUREMENT_ARG 0x0300
-#define SPS_CMD_STOP_MEASUREMENT 0x0104
-#define SPS_CMD_READ_MEASUREMENT 0x0300
-#define SPS_CMD_GET_DATA_READY 0x0202
-#define SPS_CMD_AUTOCLEAN_INTERVAL 0x8004
-#define SPS_CMD_CLEAN 0x5607
-#define SPS_CMD_GET_ACODE 0xd025
-#define SPS_CMD_GET_SERIAL 0xd033
-#define SPS_CMD_RESET 0xd304
-#define SPS_WRITE_DELAY_US 20000
-#define SPS_MAX_SERIAL_LEN 32
-
-uint8_t sps30_calc_CRC(uint8_t *data) {
-    uint8_t crc = 0xFF;
-    for (uint32_t i = 0; i < 2; i++) {
-        crc ^= data[i];
-        for (uint32_t bit = 8; bit > 0; --bit) {
-            if(crc & 0x80) {
-                crc = (crc << 1) ^ 0x31u;
-            } else {
-                crc = (crc << 1);
-            }
-        }
-    }
-    return crc;
-}
-
-void CmdClean(void);
-
-unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
-
-void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen) {
-unsigned char cmdb[2];
-uint8_t tmp[3];
-uint8_t index=0;
-memset(data,0,dlen);
-uint8_t twi_buff[64];
-
-  Wire.beginTransmission(SPS30_ADDR);
-  cmdb[0]=cmd>>8;
-  cmdb[1]=cmd;
-  Wire.write(cmdb,2);
-  Wire.endTransmission();
-
-
-  dlen/=2;
-  dlen*=3;
-
-  twi_readFrom(SPS30_ADDR,twi_buff,dlen,1);
-
-  uint8_t bind=0;
-  while (bind<dlen) {
-    tmp[0] = twi_buff[bind++];
-    tmp[1] = twi_buff[bind++];
-    tmp[2] = twi_buff[bind++];
-    if (sps30_calc_CRC(tmp)!=tmp[2]) {
-
-      index+=2;
-    } else {
-      data[index++]=tmp[0];
-      data[index++]=tmp[1];
-    }
-  }
-}
-
-void sps30_cmd(uint16_t cmd) {
-unsigned char cmdb[6];
-  Wire.beginTransmission(SPS30_ADDR);
-  cmdb[0]=cmd>>8;
-  cmdb[1]=cmd;
-
-  if (cmd==SPS_CMD_START_MEASUREMENT) {
-    cmdb[2]=SPS_CMD_START_MEASUREMENT_ARG>>8;
-    cmdb[3]=SPS_CMD_START_MEASUREMENT_ARG&0xff;
-    cmdb[4]=sps30_calc_CRC(&cmdb[2]);
-    Wire.write(cmdb,5);
-  } else {
-    Wire.write(cmdb,2);
-  }
-  Wire.endTransmission();
-}
-
-void SPS30_Detect(void)
-{
-  if (!I2cSetDevice(SPS30_ADDR)) { return; }
-  I2cSetActiveFound(SPS30_ADDR, "SPS30");
-
-  uint8_t dcode[32];
-  sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode));
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode);
-  sps30_cmd(SPS_CMD_START_MEASUREMENT);
-  sps30_running = 1;
-  sps30_ready = 1;
-}
-
-#define D_UNIT_PM "ug/m3"
-#define D_UNIT_NCPM "#/m3"
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_PM "{e}";
-const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_NCPM "{e}";
-const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
-#endif
-
-#define PMDP 2
-
-#define SPS30_HOURS Settings.sps30_inuse_hours
-
-
-
-void SPS30_Every_Second() {
-  if (!sps30_running) return;
-
-  if (uptime%10==0) {
-    uint8_t vars[sizeof(float)*10];
-    sps30_get_data(SPS_CMD_READ_MEASUREMENT,vars,sizeof(vars));
-    float *fp=&sps30_result.PM1_0;
-
-    typedef union {
-    uint8_t array[4];
-    float value;
-    } ByteToFloat;
-
-    ByteToFloat conv;
-
-    for (uint32_t count=0; count<10; count++) {
-      for (uint32_t i = 0; i < 4; i++){
-        conv.array[3-i] = vars[count*sizeof(float)+i];
-      }
-      *fp++=conv.value;
-    }
-  }
-
-  if (uptime%3600==0 && uptime>60) {
-
-
-    SPS30_HOURS++;
-    if (SPS30_HOURS>(7*24)) {
-      CmdClean();
-      SPS30_HOURS=0;
-    }
-  }
-
-}
-
-void SPS30_Show(bool json)
-{
-  if (!sps30_running) { return; }
-
-  char str[64];
-  if (json) {
-    dtostrfd(sps30_result.PM1_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str);
-    dtostrfd(sps30_result.PM2_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM2_5" "\":%s"), str);
-    dtostrfd(sps30_result.PM4_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM4_0" "\":%s"), str);
-    dtostrfd(sps30_result.PM10,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM10" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM0_5" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM1_0" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM2_5" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM4_0" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM10,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM10" "\":%s"), str);
-    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "TYPSIZ" "\":%s}"), str);
-
-#ifdef USE_WEBSERVER
-  } else {
-    dtostrfd(sps30_result.PM1_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 1.0",str);
-    dtostrfd(sps30_result.PM2_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 2.5",str);
-    dtostrfd(sps30_result.PM4_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 4.0",str);
-    dtostrfd(sps30_result.PM10,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 10",str);
-    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 0.5",str);
-    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 1.0",str);
-    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 2.5",str);
-    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 4.0",str);
-    dtostrfd(sps30_result.NCPM10,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 10",str);
-    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_c,str);
-#endif
-  }
-}
-
-void CmdClean(void)
-{
-  sps30_cmd(SPS_CMD_CLEAN);
-  ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
-  MqttPublishTeleSensor();
-}
-
-bool SPS30_cmd(void)
-{
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp=='c') {
-
-        CmdClean();
-      } else if (*cp=='0' || *cp=='1') {
-        sps30_running=*cp&1;
-        sps30_cmd(sps30_running?SPS_CMD_START_MEASUREMENT:SPS_CMD_STOP_MEASUREMENT);
-      } else {
-        serviced=false;
-      }
-  }
-  Response_P(PSTR("{\"SPS30\":\"%s\"}"), sps30_running?"running":"stopped");
-
-  return serviced;
-}
-
-
-
-
-
-bool Xsns44(byte function)
-{
-  if (!I2cEnabled(XI2C_30)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    SPS30_Detect();
-  }
-  else if (sps30_ready) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        SPS30_Every_Second();
-        break;
-      case FUNC_JSON_APPEND:
-        SPS30_Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SPS30_Show(0);
-        break;
-  #endif
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_44 == XdrvMailbox.index) {
-          result = SPS30_cmd();
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_45_vl53l0x.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_45_vl53l0x.ino"
-#ifdef USE_I2C
-#ifdef USE_VL53L0X
-
-#define XSNS_45 45
-#define XI2C_31 31
-
-#include <Wire.h>
-#include "VL53L0X.h"
-VL53L0X sensor;
-
-uint8_t vl53l0x_ready = 0;
-uint16_t vl53l0x_distance;
-uint16_t Vl53l0_buffer[5];
-uint8_t Vl53l0_index;
-
-
-
-void Vl53l0Detect(void)
-{
-  if (!I2cSetDevice(0x29)) { return; }
-
-  if (!sensor.init()) { return; }
-
-  I2cSetActiveFound(sensor.getAddress(), "VL53L0X");
-
-  sensor.setTimeout(500);
-
-
-
-
-
-  sensor.startContinuous();
-  vl53l0x_ready = 1;
-
-  Vl53l0_index=0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_VL53L0X[] PROGMEM =
- "{s}VL53L0X " D_DISTANCE "{m}%d" D_UNIT_MILLIMETER "{e}";
-#endif
-
-#define USE_VL_MEDIAN 
-
-void Vl53l0Every_250MSecond(void)
-{
-  uint16_t tbuff[5],tmp;
-  uint8_t flag;
-
-
-  uint16_t dist = sensor.readRangeContinuousMillimeters();
-  if (dist==0 || dist>2000) {
-    dist=9999;
-  }
-
-#ifdef USE_VL_MEDIAN
-
-  Vl53l0_buffer[Vl53l0_index]=dist;
-  Vl53l0_index++;
-  if (Vl53l0_index>=5) Vl53l0_index=0;
-
-
-  memmove(tbuff,Vl53l0_buffer,sizeof(tbuff));
-  for (byte ocnt=0; ocnt<5; ocnt++) {
-    flag=0;
-    for (byte count=0; count<4; count++) {
-      if (tbuff[count]>tbuff[count+1]) {
-        tmp=tbuff[count];
-        tbuff[count]=tbuff[count+1];
-        tbuff[count+1]=tmp;
-        flag=1;
-      }
-    }
-    if (!flag) break;
-  }
-  vl53l0x_distance=tbuff[2];
-#else
-  vl53l0x_distance=dist;
-#endif
-}
-
-void Vl53l0Show(boolean json)
-{
-  if (json) {
-    ResponseAppend_P(PSTR(",\"VL53L0X\":{\"" D_JSON_DISTANCE "\":%d}"), vl53l0x_distance);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_VL53L0X, vl53l0x_distance);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns45(byte function)
-{
-  if (!I2cEnabled(XI2C_31)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Vl53l0Detect();
-  }
-  else if (vl53l0x_ready) {
-    switch (function) {
-      case FUNC_EVERY_250_MSECOND:
-        Vl53l0Every_250MSecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Vl53l0Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Vl53l0Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_46_MLX90614.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_46_MLX90614.ino"
-#ifdef USE_I2C
-#ifdef USE_MLX90614
-
-#define XSNS_46 46
-#define XI2C_32 32
-
-#define I2_ADR_IRT 0x5a
-
-#define MLX90614_RAWIR1 0x04
-#define MLX90614_RAWIR2 0x05
-#define MLX90614_TA 0x06
-#define MLX90614_TOBJ1 0x07
-#define MLX90614_TOBJ2 0x08
-
-struct {
-  union {
-    uint16_t value;
-    uint32_t i2c_buf;
-    };
-  float obj_temp;
-  float amb_temp;
-  bool ready = false;
-} mlx90614;
-
-void MLX90614_Init(void)
-{
-  if (!I2cSetDevice(I2_ADR_IRT)) { return; }
-  I2cSetActiveFound(I2_ADR_IRT, "MLX90614");
-  mlx90614.ready = true;
-}
-
-void MLX90614_Every_Second(void)
-{
-    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT, MLX90614_TOBJ1);
-    if (mlx90614.value & 0x8000) {
-      mlx90614.obj_temp = -999;
-    } else {
-      mlx90614.obj_temp = ((float)mlx90614.value * 0.02) - 273.15;
-    }
-    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT,MLX90614_TA);
-    if (mlx90614.value & 0x8000) {
-      mlx90614.amb_temp = -999;
-    } else {
-      mlx90614.amb_temp = ((float)mlx90614.value * 0.02) - 273.15;
-    }
-}
-
-#ifdef USE_WEBSERVER
- const char HTTP_IRTMP[] PROGMEM =
-  "{s}MXL90614 " "OBJ-" D_TEMPERATURE "{m}%s C" "{e}"
-  "{s}MXL90614 " "AMB-" D_TEMPERATURE "{m}%s C" "{e}";
-#endif
-
-void MLX90614_Show(uint8_t json)
-{
-  char obj_tstr[16];
-  dtostrfd(mlx90614.obj_temp, Settings.flag2.temperature_resolution, obj_tstr);
-  char amb_tstr[16];
-  dtostrfd(mlx90614.amb_temp, Settings.flag2.temperature_resolution, amb_tstr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"MLX90614\":{\"OBJTMP\":%s,\"AMBTMP\":%s}"), obj_tstr, amb_tstr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_IRTMP, obj_tstr, amb_tstr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns46(byte function)
-{
-  if (!I2cEnabled(XI2C_32)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MLX90614_Init();
-  }
-  else if (mlx90614.ready) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        MLX90614_Every_Second();
-        break;
-      case FUNC_JSON_APPEND:
-        MLX90614_Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MLX90614_Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_47_max31865.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_47_max31865.ino"
-#ifdef USE_MAX31865
-
-#ifndef USE_SPI
-#error "MAX31865 requires USE_SPI enabled"
-#endif
-
-#include "Adafruit_MAX31865.h"
-
-#define XSNS_47 47
-
-#if MAX31865_PTD_WIRES == 4
-  #define PTD_WIRES MAX31865_4WIRE
-#elif MAX31865_PTD_WIRES == 3
-  #define PTD_WIRES MAX31865_3WIRE
-#else
-  #define PTD_WIRES MAX31865_2WIRE
-#endif
-
-int8_t init_status = 0;
-
-Adafruit_MAX31865 max31865;
-
-struct MAX31865_Result_Struct {
-    uint8_t ErrorCode;
-    uint16_t Rtd;
-    float PtdResistance;
-    float PtdTemp;
-} MAX31865_Result;
-
-void MAX31865_Init(void){
-    if(init_status)
-        return;
-
-  max31865.setPins(
-    pin[GPIO_SSPI_CS],
-    pin[GPIO_SSPI_MOSI],
-    pin[GPIO_SSPI_MISO],
-    pin[GPIO_SSPI_SCLK]
-  );
-
-  if(max31865.begin(PTD_WIRES))
-    init_status = 1;
-  else
-    init_status = -1;
-}
-
-
-
-
-
-void MAX31865_GetResult(void){
-    uint16_t rtd;
-
-    rtd = max31865.readRTD();
-    MAX31865_Result.Rtd = rtd;
-    MAX31865_Result.PtdResistance = max31865.rtd_to_resistance(rtd, MAX31865_REF_RES);
-    MAX31865_Result.PtdTemp = max31865.rtd_to_temperature(rtd, MAX31865_PTD_RES, MAX31865_REF_RES) + MAX31865_PTD_BIAS;
-}
-
-void MAX31865_Show(bool Json){
-    char temperature[33];
-    char resistance[33];
-
-    dtostrfd(MAX31865_Result.PtdResistance, Settings.flag2.temperature_resolution, resistance);
-    dtostrfd(MAX31865_Result.PtdTemp, Settings.flag2.temperature_resolution, temperature);
-
-    if(Json){
-        ResponseAppend_P(PSTR(",\"MAX31865\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RESISTANCE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
-          temperature, resistance, MAX31865_Result.ErrorCode);
-#ifdef USE_DOMOTICZ
-        if (0 == tele_period) {
-          DomoticzSensor(DZ_TEMP, temperature);
-        }
-#endif
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, MAX31865_Result.PtdTemp);
-        }
-#endif
-    } else {
-#ifdef USE_WEBSERVER
-        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31865", temperature, TempUnit());
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns47(uint8_t function)
-{
-  bool result = false;
-  if((pin[GPIO_SSPI_MISO] < 99) && (pin[GPIO_SSPI_MOSI] < 99) &&
-     (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_CS] < 99)) {
-
-    switch (function) {
-      case FUNC_INIT:
-        MAX31865_Init();
-        break;
-
-      case FUNC_EVERY_SECOND:
-        MAX31865_GetResult();
-        break;
-
-      case FUNC_JSON_APPEND:
-        MAX31865_Show(true);
-        break;
-
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MAX31865_Show(false);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
-# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
-#ifdef USE_I2C
-#ifdef USE_CHIRP
-# 47 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
-#define XSNS_48 48
-#define XI2C_33 33
-
-#define CHIRP_MAX_SENSOR_COUNT 3
-
-#define CHIRP_ADDR_STANDARD 0x20
-
-
-
-
-
-#define D_CMND_CHIRP "CHIRP"
-
-const char S_JSON_CHIRP_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_CHIRP "%s\":%d}";
-const char S_JSON_CHIRP_COMMAND[] PROGMEM = "{\"" D_CMND_CHIRP "%s\"}";
-const char kCHIRP_Commands[] PROGMEM = "Select|Set|Scan|Reset|Sleep|Wake";
-
-const char kChirpTypes[] PROGMEM = "CHIRP";
-
-
-
-
-
-enum CHIRP_Commands {
-  CMND_CHIRP_SELECT,
-  CMND_CHIRP_SET,
-  CMND_CHIRP_SCAN,
-  CMND_CHIRP_RESET,
-  CMND_CHIRP_SLEEP,
-  CMND_CHIRP_WAKE };
-
-
-
-
-
-
-#define CHIRP_GET_CAPACITANCE 0x00
-#define CHIRP_SET_ADDRESS 0x01
-#define CHIRP_GET_ADDRESS 0x02
-#define CHIRP_MEASURE_LIGHT 0x03
-#define CHIRP_GET_LIGHT 0x04
-#define CHIRP_GET_TEMPERATURE 0x05
-#define CHIRP_RESET 0x06
-#define CHIRP_GET_VERSION 0x07
-#define CHIRP_SLEEP 0x08
-#define CHIRP_GET_BUSY 0x09
-
-
-
-
-
-void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg) {
-  Wire.beginTransmission(addr);
-  Wire.write(reg);
-  Wire.endTransmission();
-}
-
-uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr) {
-  Wire.requestFrom(addr,(uint8_t)2);
-  uint16_t t = Wire.read() << 8;
-  t = t | Wire.read();
-  return t;
-}
-
-
-
-
-
-uint8_t chirp_current = 0;
-uint8_t chirp_found_sensors = 0;
-
-char chirp_name[7];
-uint8_t chirp_next_job = 0;
-uint32_t chirp_timeout_count = 0;
-
-#pragma pack(1)
-struct ChirpSensor_t{
-    uint16_t moisture = 0;
-    uint16_t light = 0;
-    int16_t temperature = 0;
-    uint8_t version = 0;
-    uint8_t address:7;
-    uint8_t explicitSleep:1;
-};
-#pragma pack()
-
-ChirpSensor_t chirp_sensor[CHIRP_MAX_SENSOR_COUNT];
-
-
-
-void ChirpReset(uint8_t addr) {
-    ChirpWriteI2CRegister(addr, CHIRP_RESET);
-}
-
-
-
-void ChirpResetAll(void) {
-    for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-      if (chirp_sensor[i].version) {
-        ChirpReset(chirp_sensor[i].address);
-        }
-    }
-}
-
-
-void ChirpClockSet() {
-    Wire.setClockStretchLimit(4000);
-    Wire.setClock(50000);
-}
-
-
-
-void ChirpSleep(uint8_t addr) {
-    ChirpWriteI2CRegister(addr, CHIRP_SLEEP);
-}
-# 185 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_48_chirp.ino"
-void ChirpSelect(uint8_t sensor) {
-  if(sensor < chirp_found_sensors) {
-    chirp_current = sensor;
-    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u now active."), chirp_current);
-  }
-  if (sensor == 255) {
-    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u active at address 0x%x."), chirp_current, chirp_sensor[chirp_current].address);
-  }
-}
-
-
-
-uint8_t ChirpReadVersion(uint8_t addr) {
-  return (I2cRead8(addr, CHIRP_GET_VERSION));
-}
-
-
-
-bool ChirpSet(uint8_t addr) {
-  if(addr < 128){
-    if (I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr)){
-      if(chirp_sensor[chirp_current].version>0x25 && chirp_sensor[chirp_current].version != 255){
-        delay(5);
-        I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr);
-
-      }
-      DEBUG_SENSOR_LOG(PSTR("CHIRP: Wrote adress %u "), addr);
-      ChirpReset(chirp_sensor[chirp_current].address);
-      chirp_sensor[chirp_current].address = addr;
-      chirp_timeout_count = 10;
-      chirp_next_job = 0;
-      if(chirp_sensor[chirp_current].version == 255){
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: wrote new address %u, please power off device"), addr);
-          chirp_sensor[chirp_current].version == 0;
-      }
-      return true;
-    }
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: address %u incorrect and not used"), addr);
-  return false;
-}
-
-
-
-bool ChirpScan()
-{
-  ChirpClockSet();
-  chirp_found_sensors = 0;
-  for (uint8_t address = 1; address <= 127; address++) {
-    chirp_sensor[chirp_found_sensors].version = 0;
-    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
-    delay(2);
-    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
-    if (chirp_sensor[chirp_found_sensors].version > 0) {
-      I2cSetActiveFound(address, "CHIRP");
-      if (chirp_found_sensors<CHIRP_MAX_SENSOR_COUNT) {
-        chirp_sensor[chirp_found_sensors].address = address;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CHIRP: fw %x"), chirp_sensor[chirp_found_sensors].version);
-      }
-      chirp_found_sensors++;
-    }
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Found %u CHIRP sensor(s)."), chirp_found_sensors);
-  return (chirp_found_sensors > 0);
-}
-
-
-
-void ChirpDetect(void)
-{
-  if (chirp_next_job > 0) { return; }
-
-  DEBUG_SENSOR_LOG(PSTR("CHIRP: scan will start ..."));
-  if (ChirpScan()) {
-    uint8_t chirp_model = 0;
-    GetTextIndexed(chirp_name, sizeof(chirp_name), chirp_model, kChirpTypes);
-  }
-}
-
-
-void ChirpServiceAllSensors(uint8_t job){
-  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-    if (chirp_sensor[i].version && !chirp_sensor[i].explicitSleep) {
-      DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare for sensor at address 0x%x"), chirp_sensor[i].address);
-      switch(job){
-        case 0:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_CAPACITANCE);
-        break;
-        case 1:
-        chirp_sensor[i].moisture = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        case 2:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_TEMPERATURE);
-        break;
-        case 3:
-        chirp_sensor[i].temperature = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        case 4:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_MEASURE_LIGHT);
-        break;
-        case 5:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_LIGHT);
-        break;
-        case 6:
-        chirp_sensor[i].light = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        default:
-        break;
-      }
-    }
-  }
-}
-
-
-
-void ChirpEvery100MSecond(void)
-{
-
-  if(chirp_timeout_count == 0) {
-      switch(chirp_next_job) {
-          case 0:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: reset all"));
-          ChirpResetAll();
-          chirp_timeout_count = 10;
-          chirp_next_job++;
-          break;
-          case 1:
-
-
-          chirp_next_job++;
-          break;
-          case 2:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read"));
-          ChirpServiceAllSensors(0);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 3:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read"));
-          ChirpServiceAllSensors(1);
-          chirp_next_job++;
-          break;
-          case 4:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read - 2nd"));
-          ChirpServiceAllSensors(0);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 5:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read - 2nd"));
-          ChirpServiceAllSensors(1);
-          chirp_next_job++;
-          break;
-          case 6:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read"));
-          ChirpServiceAllSensors(2);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 7:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read"));
-          ChirpServiceAllSensors(3);
-          chirp_next_job++;
-          break;
-          case 8:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read - 2nd"));
-          ChirpServiceAllSensors(2);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 9:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read - 2nd"));
-          ChirpServiceAllSensors(3);
-          chirp_next_job++;
-          break;
-          case 10:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: start light measure process"));
-          ChirpServiceAllSensors(4);
-          chirp_timeout_count = 90;
-          chirp_next_job++;
-          break;
-          case 11:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare light read"));
-          ChirpServiceAllSensors(5);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 12:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish light read"));
-          ChirpServiceAllSensors(6);
-          chirp_next_job++;
-          break;
-          case 13:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: paused, waiting for TELE"));
-          break;
-          case 14:
-          if (Settings.tele_period > 16){
-              chirp_timeout_count = (Settings.tele_period - 17) * 10;
-              DEBUG_SENSOR_LOG(PSTR("CHIRP: timeout 1/10 sec: %u, tele: %u"), chirp_timeout_count, Settings.tele_period);
-            }
-          else{
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: TELEPERIOD must be > 16 seconds !"));
-
-          }
-          chirp_next_job = 1;
-          break;
-      }
-  }
-  else {
-      chirp_timeout_count--;
-  }
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-
-const char HTTP_SNS_DARKNESS[] PROGMEM = "{s} " D_JSON_DARKNESS "{m}%s %%{e}";
-const char HTTP_SNS_CHIRPVER[] PROGMEM = "{s} CHIRP-sensor %u at address{m}0x%x{e}"
-                                         "{s} FW-version{m}%s {e}"; ;
-const char HTTP_SNS_CHIRPSLEEP[] PROGMEM = "{s} {m} is sleeping ...{e}";
-#endif
-
-
-
-void ChirpShow(bool json)
-{
-  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-    if (chirp_sensor[i].version) {
-
-      char str_temperature[33];
-      double t_temperature = ((double) chirp_sensor[i].temperature )/10.0;
-      dtostrfd(t_temperature, Settings.flag2.temperature_resolution, str_temperature);
-      char str_light[33];
-      dtostrfd(chirp_sensor[i].light, 0, str_light);
-      char str_version[7];
-      if(chirp_sensor[i].version == 0xff){
-        strncpy_P(str_version, PSTR("Chirp!"), sizeof(str_version));
-      }
-      else{
-        sprintf(str_version, "%x", chirp_sensor[i].version);
-      }
-
-      if (json) {
-        if(!chirp_sensor[i].explicitSleep) {
-          ResponseAppend_P(PSTR(",\"%s%u\":{\"" D_JSON_MOISTURE "\":%d"), chirp_name, i, chirp_sensor[i].moisture);
-          if(chirp_sensor[i].temperature!=-1){
-            ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s"),str_temperature);
-          }
-          ResponseAppend_P(PSTR(",\"" D_JSON_DARKNESS "\":%s}"),str_light);
-        }
-        else {
-          ResponseAppend_P(PSTR(",\"%s%u\":{\"sleeping\"}"),chirp_name, i);
-        }
-  #ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        char str_moisture[33];
-        dtostrfd(chirp_sensor[i].moisture, 0, str_moisture);
-        DomoticzTempHumSensor(str_temperature, str_moisture);
-        DomoticzSensor(DZ_ILLUMINANCE,chirp_sensor[i].light);
-      }
-  #endif
-  #ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_CHIRPVER, i, chirp_sensor[i].address, str_version);
-        if (chirp_sensor[i].explicitSleep){
-          WSContentSend_PD(HTTP_SNS_CHIRPSLEEP);
-        }
-        else {
-          WSContentSend_PD(HTTP_SNS_MOISTURE, "", chirp_sensor[i].moisture);
-          WSContentSend_PD(HTTP_SNS_DARKNESS, str_light);
-          if (chirp_sensor[i].temperature!=-1) {
-            WSContentSend_PD(HTTP_SNS_TEMP, "", str_temperature, TempUnit());
-          }
-        }
-
-  #endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool ChirpCmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_CHIRP);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_CHIRP), disp_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kCHIRP_Commands);
-
-    switch (command_code) {
-      case CMND_CHIRP_SELECT:
-      case CMND_CHIRP_SET:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(XdrvMailbox.payload); }
-          if (command_code == CMND_CHIRP_SET) { ChirpSet((uint8_t)XdrvMailbox.payload); }
-        Response_P(S_JSON_CHIRP_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        }
-        else {
-          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(255); }
-        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
-        }
-        break;
-      case CMND_CHIRP_SCAN:
-      case CMND_CHIRP_SLEEP:
-      case CMND_CHIRP_WAKE:
-      case CMND_CHIRP_RESET:
-        if (command_code == CMND_CHIRP_SCAN) { chirp_next_job = 0;
-                                                    ChirpDetect(); }
-        if (command_code == CMND_CHIRP_SLEEP) { chirp_sensor[chirp_current].explicitSleep = true;
-                                                    ChirpSleep(chirp_sensor[chirp_current].address); }
-        if (command_code == CMND_CHIRP_WAKE) { chirp_sensor[chirp_current].explicitSleep = false;
-                                                    ChirpReadVersion(chirp_sensor[chirp_current].address); }
-        if (command_code == CMND_CHIRP_RESET) { ChirpReset(chirp_sensor[chirp_current].address); }
-        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
-        break;
-      default:
-
-        serviced = false;
-      break;
-    }
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns48(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_33)) { return false; }
-
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_100_MSECOND:
-      if(chirp_found_sensors > 0){
-        ChirpEvery100MSecond();
-      }
-      break;
-    case FUNC_COMMAND:
-      result = ChirpCmd();
-      break;
-    case FUNC_JSON_APPEND:
-      ChirpShow(1);
-      chirp_next_job = 14;
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      ChirpShow(0);
-      break;
-#endif
-    case FUNC_INIT:
-      ChirpDetect();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
-#ifdef USE_I2C
-#ifdef USE_PAJ7620
-
-
-
-
-
-
-#define XSNS_50 50
-#define XI2C_34 34
-
-#define PAJ7620_ADDR 0x73
-
-#define PAJ7620_BANK_SEL 0xEF
-
-
-
-#define PAJ7620_GET_GESTURE 0x43
-#define PAJ7620_PROXIMITY_AVG_Y 0x6c
-
-#define PAJ7620_OBJECT_CENTER_X 0xad
-#define PAJ7620_OBJECT_CENTER_Y 0xaf
-
-#define PAJ7620_DOWN 1
-#define PAJ7620_UP 2
-#define PAJ7620_RIGHT 4
-#define PAJ7620_LEFT 8
-#define PAJ7620_NEAR 16
-#define PAJ7620_FAR 32
-#define PAJ7620_CW 64
-#define PAJ7620_CCW 128
-
-
-
-
-const uint8_t PAJ7620initRegisterArray[][2] PROGMEM = {
-  {0xEF,0x00},
- {0x32,0x29}, {0x33,0x01}, {0x34,0x00}, {0x35,0x01}, {0x36,0x00}, {0x37,0x07}, {0x38,0x17}, {0x39,0x06},
- {0x3A,0x12}, {0x3F,0x00}, {0x40,0x02}, {0x41,0xFF}, {0x42,0x01}, {0x46,0x2D}, {0x47,0x0F}, {0x48,0x3C},
- {0x49,0x00}, {0x4A,0x1E}, {0x4B,0x00}, {0x4C,0x20}, {0x4D,0x00}, {0x4E,0x1A}, {0x4F,0x14}, {0x50,0x00},
- {0x51,0x10}, {0x52,0x00}, {0x5C,0x02}, {0x5D,0x00}, {0x5E,0x10}, {0x5F,0x3F}, {0x60,0x27}, {0x61,0x28},
- {0x62,0x00}, {0x63,0x03}, {0x64,0xF7}, {0x65,0x03}, {0x66,0xD9}, {0x67,0x03}, {0x68,0x01}, {0x69,0xC8},
- {0x6A,0x40}, {0x6D,0x04}, {0x6E,0x00}, {0x6F,0x00}, {0x70,0x80}, {0x71,0x00}, {0x72,0x00}, {0x73,0x00},
- {0x74,0xF0}, {0x75,0x00}, {0x80,0x42}, {0x81,0x44}, {0x82,0x04}, {0x83,0x20}, {0x84,0x20}, {0x85,0x00},
- {0x86,0x10}, {0x87,0x00}, {0x88,0x05}, {0x89,0x18}, {0x8A,0x10}, {0x8B,0x01}, {0x8C,0x37}, {0x8D,0x00},
- {0x8E,0xF0}, {0x8F,0x81}, {0x90,0x06}, {0x91,0x06}, {0x92,0x1E}, {0x93,0x0D}, {0x94,0x0A}, {0x95,0x0A},
- {0x96,0x0C}, {0x97,0x05}, {0x98,0x0A}, {0x99,0x41}, {0x9A,0x14}, {0x9B,0x0A}, {0x9C,0x3F}, {0x9D,0x33},
- {0x9E,0xAE}, {0x9F,0xF9}, {0xA0,0x48}, {0xA1,0x13}, {0xA2,0x10}, {0xA3,0x08}, {0xA4,0x30}, {0xA5,0x19},
- {0xA6,0x10}, {0xA7,0x08}, {0xA8,0x24}, {0xA9,0x04}, {0xAA,0x1E}, {0xAB,0x1E}, {0xCC,0x19}, {0xCD,0x0B},
- {0xCE,0x13}, {0xCF,0x64}, {0xD0,0x21}, {0xD1,0x0F}, {0xD2,0x88}, {0xE0,0x01}, {0xE1,0x04}, {0xE2,0x41},
- {0xE3,0xD6}, {0xE4,0x00}, {0xE5,0x0C}, {0xE6,0x0A}, {0xE7,0x00}, {0xE8,0x00}, {0xE9,0x00}, {0xEE,0x07},
- {0xEF,0x01},
- {0x00,0x1E}, {0x01,0x1E}, {0x02,0x0F}, {0x03,0x10}, {0x04,0x02}, {0x05,0x00}, {0x06,0xB0}, {0x07,0x04},
- {0x08,0x0D}, {0x09,0x0E}, {0x0A,0x9C}, {0x0B,0x04}, {0x0C,0x05}, {0x0D,0x0F}, {0x0E,0x02}, {0x0F,0x12},
- {0x10,0x02}, {0x11,0x02}, {0x12,0x00}, {0x13,0x01}, {0x14,0x05}, {0x15,0x07}, {0x16,0x05}, {0x17,0x07},
- {0x18,0x01}, {0x19,0x04}, {0x1A,0x05}, {0x1B,0x0C}, {0x1C,0x2A}, {0x1D,0x01}, {0x1E,0x00}, {0x21,0x00},
- {0x22,0x00}, {0x23,0x00}, {0x25,0x01}, {0x26,0x00}, {0x27,0x39}, {0x28,0x7F}, {0x29,0x08}, {0x30,0x03},
- {0x31,0x00}, {0x32,0x1A}, {0x33,0x1A}, {0x34,0x07}, {0x35,0x07}, {0x36,0x01}, {0x37,0xFF}, {0x38,0x36},
- {0x39,0x07}, {0x3A,0x00}, {0x3E,0xFF}, {0x3F,0x00}, {0x40,0x77}, {0x41,0x40}, {0x42,0x00}, {0x43,0x30},
- {0x44,0xA0}, {0x45,0x5C}, {0x46,0x00}, {0x47,0x00}, {0x48,0x58}, {0x4A,0x1E}, {0x4B,0x1E}, {0x4C,0x00},
- {0x4D,0x00}, {0x4E,0xA0}, {0x4F,0x80}, {0x50,0x00}, {0x51,0x00}, {0x52,0x00}, {0x53,0x00}, {0x54,0x00},
- {0x57,0x80}, {0x59,0x10}, {0x5A,0x08}, {0x5B,0x94}, {0x5C,0xE8}, {0x5D,0x08}, {0x5E,0x3D}, {0x5F,0x99},
- {0x60,0x45}, {0x61,0x40}, {0x63,0x2D}, {0x64,0x02}, {0x65,0x96}, {0x66,0x00}, {0x67,0x97}, {0x68,0x01},
- {0x69,0xCD}, {0x6A,0x01}, {0x6B,0xB0}, {0x6C,0x04}, {0x6D,0x2C}, {0x6E,0x01}, {0x6F,0x32}, {0x71,0x00},
- {0x72,0x01}, {0x73,0x35}, {0x74,0x00}, {0x75,0x33}, {0x76,0x31}, {0x77,0x01}, {0x7C,0x84}, {0x7D,0x03},
- {0x7E,0x01},
-  {0xEF,0x00}
-};
-
-
-
-
-
-const char kPaj7620Directions[] PROGMEM = "Down|Up|Right|Left|Near|Far|CW|CCW";
-
-const uint8_t PAJ7620_PIN[]= {1,2,3,4};
-
-
-
-
-
-char PAJ7620_name[] = "PAJ7620";
-
-uint32_t PAJ7620_timeout_counter = 10;
-uint32_t PAJ7620_next_job = 0;
-uint32_t PAJ7620_mode = 1;
-
-struct {
-  uint8_t current;
-  uint8_t last;
-  uint8_t same;
-  uint8_t unfinished;
-} PAJ7620_gesture;
-
-bool PAJ7620_finished_gesture = false;
-char PAJ7620_currentGestureName[6];
-
-struct{
-  uint8_t x;
-  uint8_t y;
-  uint8_t last_x;
-  uint8_t last_y;
-  uint8_t proximity;
-  uint8_t last_proximity;
-  uint8_t corner;
-  struct {
-    uint8_t step:3;
-    uint8_t countdown:3;
-    uint8_t valid:1;
-    } PIN;
-} PAJ7620_state;
-
-
-
-
-
-void PAJ7620SelectBank(uint8_t bank)
-{
-  I2cWrite(PAJ7620_ADDR, PAJ7620_BANK_SEL, bank &1, 1);
-}
-
-
-
-void PAJ7620DecodeGesture(void)
-{
-  uint32_t index = 0;
-  switch (PAJ7620_gesture.current) {
-    case PAJ7620_LEFT:
-      index++;
-    case PAJ7620_RIGHT:
-      index++;
-    case PAJ7620_UP:
-      index++;
-    case PAJ7620_DOWN:
-      if (PAJ7620_gesture.unfinished) {
-        PAJ7620_finished_gesture = true;
-        break;
-      }
-      PAJ7620_gesture.unfinished = PAJ7620_gesture.current;
-      PAJ7620_timeout_counter = 5;
-      break;
-    case PAJ7620_NEAR:
-      index = 4;
-      PAJ7620_finished_gesture = true;
-      PAJ7620_timeout_counter = 25;
-      break;
-    case PAJ7620_FAR:
-      index = 5;
-      PAJ7620_finished_gesture = true;
-      PAJ7620_timeout_counter = 25;
-      break;
-    case PAJ7620_CW:
-      index = 6;
-      PAJ7620_finished_gesture = true;
-      break;
-    case PAJ7620_CCW:
-      index = 7;
-      PAJ7620_finished_gesture = true;
-      break;
-    default:
-      index = 8;
-      if (PAJ7620_gesture.unfinished) {
-        PAJ7620_finished_gesture = true;
-      }
-      break;
-  }
-  if (index < 8) {
-    GetTextIndexed(PAJ7620_currentGestureName, sizeof(PAJ7620_currentGestureName), index, kPaj7620Directions);
-  }
-
-  if (PAJ7620_finished_gesture) {
-    if (PAJ7620_gesture.unfinished) {
-      if ((PAJ7620_gesture.current != PAJ7620_NEAR) && (PAJ7620_gesture.current != PAJ7620_FAR)) {
-        PAJ7620_gesture.current = PAJ7620_gesture.unfinished;
-      }
-    }
-    if (PAJ7620_gesture.current == PAJ7620_gesture.last) {
-      PAJ7620_gesture.same++;
-    } else {
-      PAJ7620_gesture.same = 1;
-    }
-    PAJ7620_gesture.last = PAJ7620_gesture.current;
-    PAJ7620_finished_gesture = false;
-    PAJ7620_gesture.unfinished = 0;
-    PAJ7620_timeout_counter += 3;
-    MqttPublishSensor();
-  }
-}
-
-
-
-void PAJ7620ReadGesture(void)
-{
-  switch (PAJ7620_mode) {
-    case 1:
-      PAJ7620_gesture.current = I2cRead8(PAJ7620_ADDR,PAJ7620_GET_GESTURE);
-      if ((PAJ7620_gesture.current > 0) || PAJ7620_gesture.unfinished) {
-        DEBUG_SENSOR_LOG(PSTR("PAJ: gesture: %u"), PAJ7620_gesture.current);
-        PAJ7620DecodeGesture();
-      }
-      break;
-    case 2:
-      PAJ7620_state.proximity = I2cRead8(PAJ7620_ADDR, PAJ7620_PROXIMITY_AVG_Y);
-      if ((PAJ7620_state.proximity > 0) || (PAJ7620_state.last_proximity > 0)) {
-        if (PAJ7620_state.proximity != PAJ7620_state.last_proximity) {
-          PAJ7620_state.last_proximity = PAJ7620_state.proximity;
-          DEBUG_SENSOR_LOG(PSTR("PAJ: Proximity: %u"), PAJ7620_state.proximity);
-          MqttPublishSensor();
-        }
-      }
-      break;
-    case 3:
-    case 4:
-    case 5:
-      PAJ7620_state.x = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_X);
-      PAJ7620_state.y = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_Y);
-      if ((PAJ7620_state.y > 0) && (PAJ7620_state.x > 0)) {
-        if ((PAJ7620_state.y != PAJ7620_state.last_y) || (PAJ7620_state.x != PAJ7620_state.last_x)) {
-          PAJ7620_state.last_y = PAJ7620_state.y;
-          PAJ7620_state.last_x = PAJ7620_state.x;
-          DEBUG_SENSOR_LOG(PSTR("PAJ: x: %u   y: %u"), PAJ7620_state.x, PAJ7620_state.y);
-
-          PAJ7620_state.corner = 0;
-
-
-
-          switch (PAJ7620_state.y) {
-            case 0: case 1: case 2: case 3: case 4: case 5:
-              PAJ7620_state.corner = 3;
-              break;
-            case 9: case 10: case 11: case 12: case 13: case 14:
-              PAJ7620_state.corner = 1;
-              break;
-          }
-          if (PAJ7620_state.corner != 0) {
-            switch (PAJ7620_state.x) {
-              case 0: case 1: case 2: case 3: case 4: case 5:
-                break;
-              case 9: case 10: case 11: case 12: case 13: case 14:
-                PAJ7620_state.corner++;
-                break;
-              default:
-                PAJ7620_state.corner = 0;
-                break;
-            }
-          }
-          DEBUG_SENSOR_LOG(PSTR("PAJ: corner: %u"), PAJ7620_state.corner);
-
-          if (PAJ7620_state.PIN.countdown == 0) {
-            PAJ7620_state.PIN.step = 0;
-            PAJ7620_state.PIN.valid = 0;
-          }
-          if (!PAJ7620_state.PIN.step) {
-            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
-              PAJ7620_state.PIN.step = 1;
-              PAJ7620_state.PIN.countdown = 7;
-            }
-          } else {
-            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
-              PAJ7620_state.PIN.step += 1;
-              PAJ7620_state.PIN.countdown = 7;
-            } else {
-              PAJ7620_state.PIN.countdown -= 1;
-            }
-          }
-          if (PAJ7620_state.PIN.step == 4) {
-            PAJ7620_state.PIN.valid = 1;
-            DEBUG_SENSOR_LOG(PSTR("PAJ: PIN valid!!"));
-            PAJ7620_state.PIN.countdown = 0;
-          }
-          MqttPublishSensor();
-        }
-      }
-      break;
-  }
-}
-
-
-
-void PAJ7620Detect(void)
-{
-  if (I2cActive(PAJ7620_ADDR)) { return; }
-
-  PAJ7620SelectBank(0);
-  PAJ7620SelectBank(0);
-  uint16_t PAJ7620_id = I2cRead16LE(PAJ7620_ADDR,0);
- uint8_t PAJ7620_ver = I2cRead8(PAJ7620_ADDR,2);
-  if (0x7620 == PAJ7620_id) {
-    I2cSetActiveFound(PAJ7620_ADDR, PAJ7620_name);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAJ: ID: 0x%x and VER: %u"), PAJ7620_id, PAJ7620_ver);
-    PAJ7620_next_job = 1;
-  }
-  else {
-    DEBUG_SENSOR_LOG(PSTR("PAJ: sensor not found, false ID 0x%x"), PAJ7620_id);
-  }
-}
-
-
-
-void PAJ7620Init(void)
-{
-  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor start %u"),millis());
-  union{
-    uint32_t raw;
-    uint8_t reg_val[4];
-  } buf;
-
-  for (uint32_t i = 0; i < (sizeof(PAJ7620initRegisterArray) / 2); i += 2)
- {
-    buf.raw = pgm_read_dword(PAJ7620initRegisterArray + i);
-    DEBUG_SENSOR_LOG("PAJ: %x %x %x %x",buf.reg_val[0],buf.reg_val[1],buf.reg_val[2],buf.reg_val[3]);
-    I2cWrite(PAJ7620_ADDR, buf.reg_val[0], buf.reg_val[1], 1);
-    I2cWrite(PAJ7620_ADDR, buf.reg_val[2], buf.reg_val[3], 1);
- }
-  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor done %u"),millis());
-  PAJ7620_next_job = 2;
-}
-
-
-
-void PAJ7620Loop(void)
-{
-  if (0 == PAJ7620_timeout_counter) {
-    switch (PAJ7620_next_job) {
-      case 1:
-        PAJ7620Init();
-        break;
-      case 2:
-        if (PAJ7620_mode != 0) {
-          PAJ7620ReadGesture();
-        }
-        break;
-    }
-  } else {
-    PAJ7620_timeout_counter--;
-  }
-}
-
-
-
-void PAJ7620Show(bool json)
-{
-  if (json) {
-    if (PAJ7620_currentGestureName[0] != '\0' ) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), PAJ7620_name, PAJ7620_currentGestureName, PAJ7620_gesture.same);
-      PAJ7620_currentGestureName[0] = '\0';
-      return;
-    }
-    switch (PAJ7620_mode) {
-      case 2:
-        ResponseAppend_P(PSTR(",\"%s\":{\"Proximity\":%u}"), PAJ7620_name, PAJ7620_state.proximity);
-        break;
-      case 3:
-        if (PAJ7620_state.corner > 0) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"Corner\":%u}"), PAJ7620_name, PAJ7620_state.corner);
-        }
-        break;
-      case 4:
-        if (PAJ7620_state.PIN.valid) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"PIN\":%u}"), PAJ7620_name, 1);
-          PAJ7620_state.PIN.valid = 0;
-        }
-        break;
-      case 5:
-        ResponseAppend_P(PSTR(",\"%s\":{\"x\":%u,\"y\":%u}"), PAJ7620_name, PAJ7620_state.x, PAJ7620_state.y);
-        break;
-    }
-  }
-}
-# 411 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_50_paj7620.ino"
-bool PAJ7620CommandSensor(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    PAJ7620_mode = XdrvMailbox.payload;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_50, PAJ7620_mode);
-
-  return true;
-}
-
-
-
-
-
-bool Xsns50(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_34)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    PAJ7620Detect();
-  }
-  else if (PAJ7620_next_job) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_50 == XdrvMailbox.index){
-          result = PAJ7620CommandSensor();
-        }
-        break;
-      case FUNC_EVERY_100_MSECOND:
-        PAJ7620Loop();
-        break;
-      case FUNC_JSON_APPEND:
-        PAJ7620Show(1);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_51_rdm6300.ino"
-# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_51_rdm6300.ino"
-#ifdef USE_RDM6300
-
-#define XSNS_51 51
-
-#define RDM6300_BAUDRATE 9600
-
-#include <TasmotaSerial.h>
-
-#define RDM_TIMEOUT 100
-char rdm_uid_str[10];
-
-
-#define RDM6300_BLOCK 2*10
-
-uint8_t rdm_blcnt;
-TasmotaSerial *RDM6300_Serial = nullptr;
-
-void RDM6300_Init() {
-  if (pin[GPIO_RDM6300_RX] < 99) {
-    RDM6300_Serial = new TasmotaSerial(pin[GPIO_RDM6300_RX],-1,1);
-    if (RDM6300_Serial->begin(RDM6300_BAUDRATE)) {
-      if (RDM6300_Serial->hardwareSerial()) {
-        ClaimSerial();
-      }
-    }
-  }
-  rdm_blcnt=0;
-}
-
-
-void RDM6300_ScanForTag() {
-  char rdm_buffer[14];
-  uint8_t rdm_index;
-  uint8_t rdm_array[6];
-
-  if (!RDM6300_Serial) return;
-
-  if (rdm_blcnt>0) {
-    rdm_blcnt--;
-    while (RDM6300_Serial->available()) RDM6300_Serial->read();
-    return;
-  }
-
-  if (RDM6300_Serial->available()) {
-
-    char c=RDM6300_Serial->read();
-    if (c!=2) return;
-
-
-    rdm_index=0;
-    uint32_t cmillis=millis();
-    while (1) {
-      if (RDM6300_Serial->available()) {
-        char c=RDM6300_Serial->read();
-        if (c==3) {
-
-          break;
-        }
-        rdm_buffer[rdm_index++]=c;
-        if (rdm_index>13) {
-
-          return;
-        }
-      }
-      if ((millis()-cmillis)>RDM_TIMEOUT) {
-
-        return;
-      }
-    }
-
-
-    rdm_blcnt=RDM6300_BLOCK;
-
-
-    rm6300_hstring_to_array(rdm_array,sizeof(rdm_array),rdm_buffer);
-    uint8_t accu=0;
-    for (uint8_t count=0;count<5;count++) {
-      accu^=rdm_array[count];
-    }
-    if (accu!=rdm_array[5]) {
-
-      return;
-    }
-
-
-    memcpy(rdm_uid_str,&rdm_buffer[2],8);
-    rdm_uid_str[9]=0;
-
-    ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str);
-    MqttPublishTeleSensor();
-
-
-
-
-
-  }
-
-
-}
-
-uint8_t rm6300_hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
-  }
-  return rVal;
-}
-
-
-void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[])
-{
-  char *cp=buffer;
-  for (uint8_t i = 0; i < len; i++) {
-    uint8_t val = rm6300_hexnibble(*cp++) << 4;
-    array[i]= val | rm6300_hexnibble(*cp++);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_RDM6300[] PROGMEM =
- "{s}RDM6300 " "UID" "{m}%s" "{e}";
-
-void RDM6300_Show(void) {
-  if (!RDM6300_Serial) return;
-  if (!rdm_uid_str[0]) strcpy(rdm_uid_str,"????");
-  WSContentSend_PD(HTTP_RDM6300,rdm_uid_str);
-}
-#endif
-
-
-
-
-
-bool Xsns51(byte function)
-{
-  bool result = false;
-
-    switch (function) {
-      case FUNC_INIT:
-        RDM6300_Init();
-        break;
-      case FUNC_EVERY_100_MSECOND:
-        RDM6300_ScanForTag();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        RDM6300_Show();
-        break;
-#endif
-    }
-    return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
-#ifdef USE_IBEACON
-
-
-
-#define XSNS_52 52
-
-#include <TasmotaSerial.h>
-
-#define HM17_BAUDRATE 9600
-
-#define IBEACON_DEBUG 
-
-
-#define HM17_V110 
-
-
-
-#define IB_TIMEOUT_INTERVAL 30
-
-#define IB_UPDATE_TIME_INTERVAL 10
-
-TasmotaSerial *IBEACON_Serial = nullptr;
-
-
-uint8_t hm17_found,hm17_cmd,hm17_flag;
-
-#ifdef IBEACON_DEBUG
-uint8_t hm17_debug=0;
-#endif
-
-
-
-#define HM17_BSIZ 128
-char hm17_sbuffer[HM17_BSIZ];
-uint8_t hm17_sindex,hm17_result,hm17_scanning,hm17_connecting;
-uint32_t hm17_lastms;
-char ib_mac[14];
-
-
-#if 1
-uint8_t ib_upd_interval,ib_tout_interval;
-#define IB_UPDATE_TIME ib_upd_interval
-#define IB_TIMEOUT_TIME ib_tout_interval
-#else
-#undef IB_UPDATE_TIME
-#undef IB_TIMEOUT_TIME
-#define IB_UPDATE_TIME Settings.ib_upd_interval
-#define IB_TIMEOUT_TIME Settings.ib_tout_interval
-#endif
-
-enum {HM17_TEST,HM17_ROLE,HM17_IMME,HM17_DISI,HM17_IBEA,HM17_SCAN,HM17_DISC,HM17_RESET,HM17_RENEW,HM17_CON};
-#define HM17_SUCESS 99
-
-struct IBEACON {
-  char FACID[8];
-  char UID[32];
-  char MAJOR[4];
-  char MINOR[4];
-  char PWR[2];
-  char MAC[12];
-  char RSSI[4];
-};
-
-#define MAX_IBEACONS 16
-
-struct IBEACON_UID {
-  char MAC[12];
-  char RSSI[4];
-  uint8_t FLAGS;
-  uint8_t TIME;
-} ibeacons[MAX_IBEACONS];
-
-
-void IBEACON_Init() {
-
-  hm17_found=0;
-
-
-  if ((pin[GPIO_IBEACON_RX] < 99) && (pin[GPIO_IBEACON_TX] < 99)) {
-    IBEACON_Serial = new TasmotaSerial(pin[GPIO_IBEACON_RX], pin[GPIO_IBEACON_TX],1);
-    if (IBEACON_Serial->begin(HM17_BAUDRATE)) {
-      if (IBEACON_Serial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      hm17_sendcmd(HM17_TEST);
-      hm17_lastms=millis();
-
-      IB_UPDATE_TIME=IB_UPDATE_TIME_INTERVAL;
-      IB_TIMEOUT_TIME=IB_TIMEOUT_INTERVAL;
-    }
-  }
-}
-
-void hm17_every_second(void) {
-  if (!IBEACON_Serial) return;
-
-  if (hm17_found) {
-    if (IB_UPDATE_TIME && (uptime%IB_UPDATE_TIME==0)) {
-      if (hm17_cmd!=99) {
-        if (hm17_flag&2) {
-          ib_sendbeep();
-        } else {
-          if (!hm17_connecting) {
-            hm17_sendcmd(HM17_DISI);
-          }
-        }
-      }
-    }
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (ibeacons[cnt].FLAGS) {
-        ibeacons[cnt].TIME++;
-        if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) {
-          ibeacons[cnt].FLAGS=0;
-          ibeacon_mqtt(ibeacons[cnt].MAC,"0000");
-        }
-      }
-    }
-  } else {
-    if (uptime%20==0) {
-      hm17_sendcmd(HM17_TEST);
-    }
-  }
-}
-
-void hm17_sbclr(void) {
-  memset(hm17_sbuffer,0,HM17_BSIZ);
-  hm17_sindex=0;
-  IBEACON_Serial->flush();
-}
-
-void hm17_sendcmd(uint8_t cmd) {
-  hm17_sbclr();
-  hm17_cmd=cmd;
-#ifdef IBEACON_DEBUG
-  if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("hm17cmd %d"),cmd);
-#endif
-  switch (cmd) {
-    case HM17_TEST:
-      IBEACON_Serial->write("AT");
-      break;
-    case HM17_ROLE:
-      IBEACON_Serial->write("AT+ROLE1");
-      break;
-    case HM17_IMME:
-      IBEACON_Serial->write("AT+IMME1");
-      break;
-    case HM17_DISI:
-      IBEACON_Serial->write("AT+DISI?");
-      hm17_scanning=1;
-      break;
-    case HM17_IBEA:
-      IBEACON_Serial->write("AT+IBEA1");
-      break;
-    case HM17_RESET:
-      IBEACON_Serial->write("AT+RESET");
-      break;
-    case HM17_RENEW:
-      IBEACON_Serial->write("AT+RENEW");
-      break;
-    case HM17_SCAN:
-      IBEACON_Serial->write("AT+SCAN5");
-      break;
-    case HM17_DISC:
-      IBEACON_Serial->write("AT+DISC?");
-      hm17_scanning=1;
-      break;
-    case HM17_CON:
-      IBEACON_Serial->write((const uint8_t*)"AT+CON",6);
-      IBEACON_Serial->write((const uint8_t*)ib_mac,12);
-      hm17_connecting=1;
-      break;
-  }
-}
-
-uint32_t ibeacon_add(struct IBEACON *ib) {
-
-  if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) {
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (ibeacons[cnt].FLAGS) {
-        if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) {
-
-          memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
-          ibeacons[cnt].TIME=0;
-          return 1;
-        }
-      }
-    }
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (!ibeacons[cnt].FLAGS) {
-        memcpy(ibeacons[cnt].MAC,ib->MAC,12);
-        memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
-        ibeacons[cnt].FLAGS=1;
-        ibeacons[cnt].TIME=0;
-        return 1;
-      }
-    }
-  }
-  return 0;
-}
-
-void hm17_decode(void) {
-  struct IBEACON ib;
-  switch (hm17_cmd) {
-    case HM17_TEST:
-      if (!strncmp(hm17_sbuffer,"OK",2)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("AT OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-        hm17_found=1;
-      }
-      break;
-    case HM17_ROLE:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("ROLE OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_IMME:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IMME OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_IBEA:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IBEA OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_SCAN:
-        if (!strncmp(hm17_sbuffer,"OK+Set:5",8)) {
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("SCAN OK"));
-#endif
-          hm17_sbclr();
-          hm17_result=HM17_SUCESS;
-        }
-        break;
-    case HM17_RESET:
-      if (!strncmp(hm17_sbuffer,"OK+RESET",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RESET OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_RENEW:
-      if (!strncmp(hm17_sbuffer,"OK+RENEW",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RENEW OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_CON:
-      if (!strncmp(hm17_sbuffer,"OK+CONNA",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNA OK"));
-#endif
-        hm17_connecting=2;
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+CONNE",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNE ERROR"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+CONNF",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNF ERROR"));
-#endif
-        break;
-      }
-      if (hm17_connecting==2 && !strncmp(hm17_sbuffer,"OK+CONN",7)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONN OK"));
-#endif
-        hm17_connecting=3;
-        hm17_sendcmd(HM17_TEST);
-        hm17_connecting=0;
-        break;
-      }
-      break;
-
-    case HM17_DISI:
-    case HM17_DISC:
-      if (!strncmp(hm17_sbuffer,"OK+DISCS",8)) {
-        hm17_sbclr();
-        hm17_result=1;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCS OK"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISIS",8)) {
-        hm17_sbclr();
-        hm17_result=1;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISIS OK"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISCE",8)) {
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCE OK"));
-#endif
-        hm17_scanning=0;
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+NAME:",8)) {
-        if (hm17_sbuffer[hm17_sindex-1]=='\n') {
-          hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) {
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("NAME OK"));
-            AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-          }
-#endif
-          hm17_sbclr();
-        }
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DIS0:",8)) {
-        if (hm17_cmd==HM17_DISI) {
-#ifdef HM17_V110
-          goto hm17_v110;
-#endif
-        } else {
-          if (hm17_sindex==20) {
-            hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-            if (hm17_debug) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-            }
-#endif
-            hm17_sbclr();
-          }
-        }
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISC:",8)) {
-hm17_v110:
-        if (hm17_cmd==HM17_DISI) {
-          if (hm17_sindex==78) {
-#ifdef IBEACON_DEBUG
-            if (hm17_debug) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("DISC: OK"));
-
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-            }
-#endif
-            memcpy(ib.FACID,&hm17_sbuffer[8],8);
-            memcpy(ib.UID,&hm17_sbuffer[8+8+1],32);
-            memcpy(ib.MAJOR,&hm17_sbuffer[8+8+1+32+1],4);
-            memcpy(ib.MINOR,&hm17_sbuffer[8+8+1+32+1+4],4);
-            memcpy(ib.PWR,&hm17_sbuffer[8+8+1+32+1+4+4],2);
-            memcpy(ib.MAC,&hm17_sbuffer[8+8+1+32+1+4+4+2+1],12);
-            memcpy(ib.RSSI,&hm17_sbuffer[8+8+1+32+1+4+4+2+1+12+1],4);
-
-            if (ibeacon_add(&ib)) {
-              ibeacon_mqtt(ib.MAC,ib.RSSI);
-            }
-            hm17_sbclr();
-            hm17_result=1;
-          }
-        } else {
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-#endif
-        }
-        break;
-      }
-  }
-}
-
-void IBEACON_loop() {
-
-  if (!IBEACON_Serial) return;
-
-uint32_t difftime=millis()-hm17_lastms;
-
-  while (IBEACON_Serial->available()) {
-    hm17_lastms=millis();
-
-    if (hm17_sindex<HM17_BSIZ) {
-      hm17_sbuffer[hm17_sindex]=IBEACON_Serial->read();
-      hm17_sindex++;
-      hm17_decode();
-    } else {
-      hm17_sindex=0;
-      break;
-    }
-  }
-
-  if (hm17_cmd==99) {
-   if (hm17_sindex>=HM17_BSIZ-2 || (hm17_sindex && (difftime>100))) {
-     AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),hm17_sbuffer);
-     hm17_sbclr();
-   }
-  }
-
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_IBEACON[] PROGMEM =
- "{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}";
-
-void IBEACON_Show(void) {
-char mac[14];
-char rssi[6];
-
-  for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-    if (ibeacons[cnt].FLAGS) {
-      memcpy(mac,ibeacons[cnt].MAC,12);
-      mac[12]=0;
-      memcpy(rssi,ibeacons[cnt].RSSI,4);
-      rssi[4]=0;
-      WSContentSend_PD(HTTP_IBEACON,mac,rssi);
-    }
-  }
-
-}
-#endif
-# 485 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_52_ibeacon.ino"
-bool xsns52_cmd(void) {
-  bool serviced = true;
-  const char S_JSON_IBEACON[] = "{\"" D_CMND_SENSOR "%d\":%s:%d}";
-  const char S_JSON_IBEACON1[] = "{\"" D_CMND_SENSOR "%d\":%s:%s}";
-  uint16_t len=XdrvMailbox.data_len;
-  if (len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp>='0' && *cp<='8') {
-        hm17_sendcmd(*cp&7);
-        Response_P(S_JSON_IBEACON, XSNS_52,"hm17cmd",*cp&7);
-      } else if (*cp=='s') {
-        cp++;
-        len--;
-        while (*cp==' ') {
-          len--;
-          cp++;
-        }
-        IBEACON_Serial->write((uint8_t*)cp,len);
-        hm17_cmd=99;
-        Response_P(S_JSON_IBEACON1, XSNS_52,"hm17cmd",cp);
-      } else if (*cp=='u') {
-        cp++;
-        if (*cp) IB_UPDATE_TIME=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"uintv",IB_UPDATE_TIME);
-      } else if (*cp=='t') {
-        cp++;
-        if (*cp) IB_TIMEOUT_TIME=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"lintv",IB_TIMEOUT_TIME);
-      } else if (*cp=='c') {
-        for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) ibeacons[cnt].FLAGS=0;
-        Response_P(S_JSON_IBEACON1, XSNS_52,"clr list","");
-      }
-#ifdef IBEACON_DEBUG
-      else if (*cp=='d') {
-        cp++;
-        if (*cp) hm17_debug=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"debug",hm17_debug);
-      }
-#endif
-  } else {
-    serviced=false;
-  }
-  return serviced;
-}
-
-#define D_CMND_IBEACON "IBEACON"
-
-bool ibeacon_cmd(void) {
-  ib_mac[0]=0;
-  int16_t rssi=0;
-  const char S_JSON_IBEACON[] = "{\"" D_CMND_IBEACON "_%s_RSSI\":%d}";
-  uint8_t cmd_len = strlen(D_CMND_IBEACON);
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_IBEACON), cmd_len)) {
-
-    rssi = XdrvMailbox.payload;
-    if (rssi==99) {
-      memcpy(ib_mac,XdrvMailbox.topic+cmd_len+1,12);
-      ib_mac[12]=0;
-      if (hm17_scanning) {
-
-        hm17_flag|=2;
-      } else {
-        ib_sendbeep();
-      }
-    }
-    Response_P(S_JSON_IBEACON,ib_mac,rssi);
-    return true;
-  }
-  return false;
-}
-
-void ib_sendbeep(void) {
-  hm17_flag=0;
-  hm17_sendcmd(HM17_CON);
-}
-
-void ibeacon_mqtt(const char *mac,const char *rssi) {
-  char s_mac[14];
-  char s_rssi[6];
-  memcpy(s_mac,mac,12);
-  s_mac[12]=0;
-  memcpy(s_rssi,rssi,4);
-  s_rssi[4]=0;
-  int16_t n_rssi=atoi(s_rssi);
-  ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi);
-  MqttPublishTeleSensor();
-}
-
-
-
-
-
-
-bool Xsns52(byte function)
-{
-  bool result = false;
-
-    switch (function) {
-      case FUNC_INIT:
-        IBEACON_Init();
-        break;
-      case FUNC_LOOP:
-        IBEACON_loop();
-        break;
-      case FUNC_EVERY_SECOND:
-        hm17_every_second();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_52 == XdrvMailbox.index) {
-          result = xsns52_cmd();
-        }
-        break;
-      case FUNC_COMMAND:
-        result=ibeacon_cmd();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        if (hm17_found) IBEACON_Show();
-        break;
-#endif
-    }
-    return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-# 24 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-#ifdef USE_SML_M
-
-#define XSNS_53 53
-
-
-#define SML_BAUDRATE 9600
-# 45 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-#include <TasmotaSerial.h>
-
-
-#define SPECIAL_SS 
-
-
-
-
-
-#if MY_LANGUAGE==de-DE
-
-#define D_TPWRIN "Verbrauch"
-#define D_TPWROUT "Einspeisung"
-#define D_TPWRCURR "Aktueller Verbrauch"
-#define D_TPWRCURR1 "Verbrauch P1"
-#define D_TPWRCURR2 "Verbrauch P2"
-#define D_TPWRCURR3 "Verbrauch P3"
-#define D_Strom_L1 "Strom L1"
-#define D_Strom_L2 "Strom L2"
-#define D_Strom_L3 "Strom L3"
-#define D_Spannung_L1 "Spannung L1"
-#define D_Spannung_L2 "Spannung L2"
-#define D_Spannung_L3 "Spannung L3"
-#define D_METERNR "Zähler Nr"
-#define D_METERSID "Service ID"
-#define D_GasIN "Zählerstand"
-#define D_H2oIN "Zählerstand"
-#define D_StL1L2L3 "Ströme L1+L2+L3"
-#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
-
-#else
-
-#undef D_TPWRIN
-#undef D_TPWROUT
-#undef D_TPWRCURR
-#undef D_TPWRCURR1
-#undef D_TPWRCURR2
-#undef D_TPWRCURR3
-#undef D_Strom_L1
-#undef D_Strom_L2
-#undef D_Strom_L3
-#undef D_Spannung_L1
-#undef D_Spannung_L2
-#undef D_Spannung_L3
-#undef D_METERNR
-#undef D_METERSID
-#undef D_GasIN
-#undef D_H2oIN
-#undef D_StL1L2L3
-#undef D_SpL1L2L3
-
-#define D_TPWRIN "Total-In"
-#define D_TPWROUT "Total-Out"
-#define D_TPWRCURR "Current-In/Out"
-#define D_TPWRCURR1 "Current-In p1"
-#define D_TPWRCURR2 "Current-In p2"
-#define D_TPWRCURR3 "Current-In p3"
-#define D_Strom_L1 "Current L1"
-#define D_Strom_L2 "Current L2"
-#define D_Strom_L3 "Current L3"
-#define D_Spannung_L1 "Voltage L1"
-#define D_Spannung_L2 "Voltage L2"
-#define D_Spannung_L3 "Voltage L3"
-#define D_METERNR "Meter_number"
-#define D_METERSID "Service ID"
-#define D_GasIN "Counter"
-#define D_H2oIN "Counter"
-#define D_StL1L2L3 "Current L1+L2+L3"
-#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
-
-#endif
-
-
-
-#define DJ_TPWRIN "Total_in"
-#define DJ_TPWROUT "Total_out"
-#define DJ_TPWRCURR "Power_curr"
-#define DJ_TPWRCURR1 "Power_p1"
-#define DJ_TPWRCURR2 "Power_p2"
-#define DJ_TPWRCURR3 "Power_p3"
-#define DJ_CURR1 "Curr_p1"
-#define DJ_CURR2 "Curr_p2"
-#define DJ_CURR3 "Curr_p3"
-#define DJ_VOLT1 "Volt_p1"
-#define DJ_VOLT2 "Volt_p2"
-#define DJ_VOLT3 "Volt_p3"
-#define DJ_METERNR "Meter_number"
-#define DJ_METERSID "Meter_id"
-#define DJ_CSUM "Curr_summ"
-#define DJ_VAVG "Volt_avg"
-#define DJ_COUNTER "Count"
-
-struct METER_DESC {
-  uint8_t srcpin;
-  uint8_t type;
-  uint16_t flag;
-  int32_t params;
-  char prefix[8];
-  int8_t trxpin;
-  uint8_t tsecs;
-  char *txmem;
-  uint8_t index;
-  uint8_t max_index;
-};
-
-
-
-
-
-
-#define EHZ161_0 1
-#define EHZ161_1 2
-#define EHZ363 3
-#define EHZH 4
-#define EDL300 5
-#define Q3B 6
-#define COMBO3 7
-#define COMBO2 8
-#define COMBO3a 9
-#define Q3B_V1 10
-#define EHZ363_2 11
-#define COMBO3b 12
-#define WGS_COMBO 13
-#define EBZD_G 14
-
-
-#define METER EHZ161_1
-
-
-#if METER==EHZ161_0
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
-"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
-"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
-"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-
-
-#if METER==EHZ161_1
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZ363
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZH
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-
-
-#if METER==EDL300
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-#if METER==EBZD_G
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"strom",-1,1,0}};
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
-
-"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100600100ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-
-#if METER==Q3B
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-#if METER==COMBO3
-
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
-  [1]={14,'s',0,SML_BAUDRATE,"SML",-1,1,0},
-  [2]={4,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
-"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
-"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
-"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"2,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"3,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-#if METER==COMBO2
-
-#undef METERS_USED
-#define METERS_USED 2
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
-  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-
-"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-#if METER==COMBO3a
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
-  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0},
-  [2]={1,'o',0,SML_BAUDRATE,"OBIS3",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,=h --- Zähler Nr 1 ---|"
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"2,=h --- Zähler Nr 2 ---|"
-"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"3,=h --- Zähler Nr 3 ---|"
-"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"3,=d 10 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-
-
-#if METER==Q3B_V1
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-[0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,=d 1 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZ363_2
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-[0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
-
-"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-#if METER==COMBO3b
-#undef METERS_USED
-#define METERS_USED 3
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
-  [1]={14,'c',0,50,"Gas"},
-  [2]={1,'c',0,10,"Wasser"}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-
-
-"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",2|"
-
-"3,1-0:1.8.0*255(@100," D_H2oIN ",cbm," DJ_COUNTER ",2";
-#endif
-
-
-#if METER==WGS_COMBO
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={1,'c',0,10,"H20",-1,1,0},
-  [1]={4,'c',0,50,"GAS",-1,1,0},
-  [2]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-
-"1,1-0:1.8.0*255(@10000," D_H2oIN ",cbm," DJ_COUNTER ",4|"
-
-
-"2,=h==================|"
-"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",3|"
-
-"3,=h==================|"
-
-"3,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",3|"
-"3,=h==================|"
-
-"3,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",2|"
-"3,=h -------------------------------|"
-"3,=m 10+11+12 @100," D_StL1L2L3 ",A," DJ_CSUM ",2|"
-
-"3,=m 13+14+15/#3 @100," D_SpL1L2L3 ",V," DJ_VAVG ",2|"
-"3,=h==================|"
-
-"3,77070100240700ff@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",2|"
-
-"3,77070100380700ff@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",2|"
-
-"3,770701004c0700ff@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",2|"
-"3,=h -------------------------------|"
-
-"3,770701001f0700ff@100," D_Strom_L1 ",A," DJ_CURR1 ",2|"
-
-"3,77070100330700ff@100," D_Strom_L2 ",A," DJ_CURR2 ",2|"
-
-"3,77070100470700ff@100," D_Strom_L3 ",A," DJ_CURR3 ",2|"
-"3,=h -------------------------------|"
-
-"3,77070100200700ff@100," D_Spannung_L1 ",V," DJ_VOLT1 ",2|"
-
-"3,77070100340700ff@100," D_Spannung_L2 ",V," DJ_VOLT2 ",2|"
-
-"3,77070100480700ff@100," D_Spannung_L3 ",V," DJ_VOLT3 ",2|"
-"3,=h==================|"
-
-"3,77070100000009ff@#," D_METERSID ",," DJ_METERSID ",0|"
-"3,=h--------------------------------";
-#endif
-# 499 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-#define USE_SML_MEDIAN_FILTER 
-
-
-#ifndef SML_MAX_VARS
-#define SML_MAX_VARS 20
-#endif
-
-
-#define MAX_METERS 5
-double meter_vars[SML_MAX_VARS];
-
-#define MAX_DVARS MAX_METERS*2
-double dvalues[MAX_DVARS];
-uint32_t dtimes[MAX_DVARS];
-uint8_t meters_used;
-
-struct METER_DESC const *meter_desc_p;
-const uint8_t *meter_p;
-uint8_t meter_spos[MAX_METERS];
-
-
-TasmotaSerial *meter_ss[MAX_METERS];
-
-
-#define SML_BSIZ 48
-uint8_t smltbuf[MAX_METERS][SML_BSIZ];
-
-
-#define METER_ID_SIZE 24
-char meter_id[MAX_METERS][METER_ID_SIZE];
-
-#define EBUS_SYNC 0xaa
-#define EBUS_ESC 0xa9
-
-uint8_t sml_send_blocks;
-uint8_t sml_100ms_cnt;
-uint8_t sml_desc_cnt;
-
-#ifdef USE_SML_MEDIAN_FILTER
-
-#define MEDIAN_SIZE 5
-struct SML_MEDIAN_FILTER {
-double buffer[MEDIAN_SIZE];
-int8_t index;
-} sml_mf[SML_MAX_VARS];
-
-#ifndef FLT_MAX
-#define FLT_MAX 99999999
-#endif
-
-double sml_median_array(double *array,uint8_t len) {
-      uint8_t ind[len];
-      uint8_t mind=0,index=0,flg;
-      double min=FLT_MAX;
-
-      for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
-          for (uint8_t mcnt=0; mcnt<len; mcnt++) {
-              flg=0;
-              for (uint8_t icnt=0; icnt<index; icnt++) {
-                  if (ind[icnt]==mcnt) {
-                      flg=1;
-                  }
-              }
-              if (!flg) {
-                  if (array[mcnt]<min) {
-                      min=array[mcnt];
-                      mind=mcnt;
-                  }
-              }
-          }
-          ind[index]=mind;
-          index++;
-          min=FLT_MAX;
-      }
-      return array[ind[len/2]];
-  }
-
-
-
-double sml_median(struct SML_MEDIAN_FILTER* mf, double in) {
-
-
-  mf->buffer[mf->index]=in;
-  mf->index++;
-  if (mf->index>=MEDIAN_SIZE) mf->index=0;
-
-  return sml_median_array(mf->buffer,MEDIAN_SIZE);
-# 603 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-}
-#endif
-
-#ifdef ANALOG_OPTO_SENSOR
-
-uint8_t ads1115_up;
-
-
-#define SAMPLE_BIT (0x8000)
-
-#define ADS1115_COMP_QUEUE_SHIFT 0
-#define ADS1115_COMP_LATCH_SHIFT 2
-#define ADS1115_COMP_POLARITY_SHIFT 3
-#define ADS1115_COMP_MODE_SHIFT 4
-#define ADS1115_DATA_RATE_SHIFT 5
-#define ADS1115_MODE_SHIFT 8
-#define ADS1115_PGA_SHIFT 9
-#define ADS1115_MUX_SHIFT 12
-
-enum ads1115_comp_queue {
- ADS1115_COMP_QUEUE_AFTER_ONE = 0,
- ADS1115_COMP_QUEUE_AFTER_TWO = 0x1 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_AFTER_FOUR = 0x2 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_DISABLE = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_MASK = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
-};
-
-enum ads1115_comp_latch {
- ADS1115_COMP_LATCH_NO = 0,
- ADS1115_COMP_LATCH_YES = 1 << ADS1115_COMP_LATCH_SHIFT,
- ADS1115_COMP_LATCH_MASK = 1 << ADS1115_COMP_LATCH_SHIFT,
-};
-
-enum ads1115_comp_polarity {
- ADS1115_COMP_POLARITY_ACTIVE_LOW = 0,
- ADS1115_COMP_POLARITY_ACTIVE_HIGH = 1 << ADS1115_COMP_POLARITY_SHIFT,
- ADS1115_COMP_POLARITY_MASK = 1 << ADS1115_COMP_POLARITY_SHIFT,
-};
-
-enum ads1115_comp_mode {
- ADS1115_COMP_MODE_WINDOW = 0,
- ADS1115_COMP_MODE_HYSTERESIS = 1 << ADS1115_COMP_MODE_SHIFT,
- ADS1115_COMP_MODE_MASK = 1 << ADS1115_COMP_MODE_SHIFT,
-};
-
-enum ads1115_data_rate {
- ADS1115_DATA_RATE_8_SPS = 0,
- ADS1115_DATA_RATE_16_SPS = 0x1 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_32_SPS = 0x2 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_64_SPS = 0x3 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_128_SPS = 0x4 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_250_SPS = 0x5 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_475_SPS = 0x6 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_860_SPS = 0x7 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_MASK = 0x7 << ADS1115_DATA_RATE_SHIFT,
-};
-
-enum ads1115_mode {
- ADS1115_MODE_CONTINUOUS = 0,
- ADS1115_MODE_SINGLE_SHOT = 1 << ADS1115_MODE_SHIFT,
- ADS1115_MODE_MASK = 1 << ADS1115_MODE_SHIFT,
-};
-
-enum ads1115_pga {
- ADS1115_PGA_TWO_THIRDS = 0,
- ADS1115_PGA_ONE = 0x1 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_TWO = 0x2 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_FOUR = 0x3 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_EIGHT = 0x4 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_SIXTEEN = 0x5 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_MASK = 0x7 << ADS1115_PGA_SHIFT,
-};
-
-
-enum ads1115_mux {
- ADS1115_MUX_DIFF_AIN0_AIN1 = 0,
- ADS1115_MUX_DIFF_AIN0_AIN3 = 0x1 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_DIFF_AIN1_AIN3 = 0x2 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_DIFF_AIN2_AIN3 = 0x3 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN0 = 0x4 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN1 = 0x5 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN2 = 0x6 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN3 = 0x7 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_MASK = 0x7 << ADS1115_MUX_SHIFT,
-};
-
-class ADS1115 {
-public:
- ADS1115(uint8_t address = 0x48);
-
- void begin();
- uint8_t trigger_sample();
- uint8_t reset();
- bool is_sample_in_progress();
- int16_t read_sample();
- float sample_to_float(int16_t val);
- float read_sample_float();
-
- void set_comp_queue(enum ads1115_comp_queue val) { set_config(val, ADS1115_COMP_QUEUE_MASK); }
- void set_comp_latching(enum ads1115_comp_latch val) { set_config(val, ADS1115_COMP_LATCH_MASK); }
- void set_comp_polarity(enum ads1115_comp_polarity val) { set_config(val, ADS1115_COMP_POLARITY_MASK); }
- void set_comp_mode(enum ads1115_comp_mode val) { set_config(val, ADS1115_COMP_MODE_MASK); }
- void set_data_rate(enum ads1115_data_rate val) { set_config(val, ADS1115_DATA_RATE_MASK); }
- void set_mode(enum ads1115_mode val) { set_config(val, ADS1115_MODE_MASK); }
- void set_pga(enum ads1115_pga val) { set_config(val, ADS1115_PGA_MASK); m_voltage_range = val >> ADS1115_PGA_SHIFT; }
- void set_mux(enum ads1115_mux val) { set_config(val, ADS1115_MUX_MASK); }
-
-private:
- void set_config(uint16_t val, uint16_t mask) {
-  m_config = (m_config & ~mask) | val;
- }
-
- uint8_t write_register(uint8_t reg, uint16_t val);
- uint16_t read_register(uint8_t reg);
-
- uint8_t m_address;
- uint16_t m_config;
- int m_voltage_range;
-};
-
-
-enum ads1115_register {
- ADS1115_REGISTER_CONVERSION = 0,
- ADS1115_REGISTER_CONFIG = 1,
- ADS1115_REGISTER_LOW_THRESH = 2,
- ADS1115_REGISTER_HIGH_THRESH = 3,
-};
-
-#define FACTOR 32768.0
-static float ranges[] = { 6.144 / FACTOR, 4.096 / FACTOR, 2.048 / FACTOR, 1.024 / FACTOR, 0.512 / FACTOR, 0.256 / FACTOR};
-
-ADS1115::ADS1115(uint8_t address)
-{
-        m_address = address;
-        m_config = ADS1115_COMP_QUEUE_AFTER_ONE |
-                   ADS1115_COMP_LATCH_NO |
-                   ADS1115_COMP_POLARITY_ACTIVE_LOW |
-                   ADS1115_COMP_MODE_WINDOW |
-                   ADS1115_DATA_RATE_128_SPS |
-                   ADS1115_MODE_SINGLE_SHOT |
-                   ADS1115_MUX_GND_AIN0;
-        set_pga(ADS1115_PGA_ONE);
-}
-
-uint8_t ADS1115::write_register(uint8_t reg, uint16_t val)
-{
-        Wire.beginTransmission(m_address);
-        Wire.write(reg);
-        Wire.write(val>>8);
-        Wire.write(val & 0xFF);
-        return Wire.endTransmission();
-}
-
-uint16_t ADS1115::read_register(uint8_t reg)
-{
-        Wire.beginTransmission(m_address);
-        Wire.write(reg);
-        Wire.endTransmission();
-
-        uint8_t result = Wire.requestFrom((int)m_address, 2, 1);
-        if (result != 2) {
-          return 0;
-        }
-
-        uint16_t val;
-
-        val = Wire.read() << 8;
-        val |= Wire.read();
-        return val;
-}
-
-void ADS1115::begin()
-{
-        Wire.begin();
-}
-
-uint8_t ADS1115::trigger_sample()
-{
-        return write_register(ADS1115_REGISTER_CONFIG, m_config | SAMPLE_BIT);
-}
-
-uint8_t ADS1115::reset()
-{
- Wire.beginTransmission(0);
- Wire.write(0x6);
- return Wire.endTransmission();
-}
-
-bool ADS1115::is_sample_in_progress()
-{
- uint16_t val = read_register(ADS1115_REGISTER_CONFIG);
- return (val & SAMPLE_BIT) == 0;
-}
-
-int16_t ADS1115::read_sample()
-{
-        return read_register(ADS1115_REGISTER_CONVERSION);
-}
-
-float ADS1115::sample_to_float(int16_t val)
-{
- return val * ranges[m_voltage_range];
-}
-
-float ADS1115::read_sample_float()
-{
- return sample_to_float(read_sample());
-}
-
-ADS1115 adc;
-
-void ADS1115_init(void) {
-
-  ads1115_up=0;
-  if (!i2c_flg) return;
-
-  adc.begin();
-  adc.set_data_rate(ADS1115_DATA_RATE_128_SPS);
-  adc.set_mode(ADS1115_MODE_CONTINUOUS);
-  adc.set_mux(ADS1115_MUX_DIFF_AIN0_AIN3);
-  adc.set_pga(ADS1115_PGA_TWO);
-
-  int16_t val = adc.read_sample();
-  ads1115_up=1;
-}
-
-#endif
-
-char sml_start;
-uint8_t dump2log=0;
-
-#define SML_SAVAILABLE Serial_available()
-#define SML_SREAD Serial_read()
-#define SML_SPEAK Serial_peek()
-
-bool Serial_available() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->available();
-}
-
-uint8_t Serial_read() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->read();
-}
-
-uint8_t Serial_peek() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->peek();
-}
-
-uint8_t sml_logindex;
-
-void Dump2log(void) {
-
-int16_t index=0,hcnt=0;
-uint32_t d_lastms;
-uint8_t dchars[16];
-
-
-
-  if (dump2log&8) {
-
-    while (SML_SAVAILABLE) {
-      log_data[index]=':';
-      index++;
-      log_data[index]=' ';
-      index++;
-      d_lastms=millis();
-      while ((millis()-d_lastms)<40) {
-        if (SML_SAVAILABLE) {
-          uint8_t c=SML_SREAD;
-          sprintf(&log_data[index],"%02x ",c);
-          dchars[hcnt]=c;
-          index+=3;
-          hcnt++;
-          if (hcnt>15) {
-
-            log_data[index]='=';
-            index++;
-            log_data[index]='>';
-            index++;
-            log_data[index]=' ';
-            index++;
-            for (uint8_t ccnt=0; ccnt<16; ccnt++) {
-              if (isprint(dchars[ccnt])) {
-                log_data[index]=dchars[ccnt];
-              } else {
-                log_data[index]=' ';
-              }
-              index++;
-            }
-            break;
-          }
-        }
-      }
-      if (index>0) {
-        log_data[index]=0;
-        AddLog(LOG_LEVEL_INFO);
-        index=0;
-        hcnt=0;
-      }
-    }
-  } else {
-    if (meter_desc_p[(dump2log&7)-1].type=='o') {
-
-      while (SML_SAVAILABLE) {
-        char c=SML_SREAD&0x7f;
-        if (c=='\n' || c=='\r') {
-          log_data[sml_logindex]=0;
-          AddLog(LOG_LEVEL_INFO);
-          sml_logindex=2;
-          log_data[0]=':';
-          log_data[1]=' ';
-          break;
-        }
-        log_data[sml_logindex]=c;
-        if (sml_logindex<sizeof(log_data)-2) {
-          sml_logindex++;
-        }
-      }
-    } else {
-
-      index=0;
-      log_data[index]=':';
-      index++;
-      log_data[index]=' ';
-      index++;
-      d_lastms=millis();
-      while ((millis()-d_lastms)<40) {
-        if (SML_SAVAILABLE) {
-          unsigned char c;
-          if (meter_desc_p[(dump2log&7)-1].type=='e') {
-
-            c=SML_SREAD;
-            sprintf(&log_data[index],"%02x ",c);
-            index+=3;
-            if (c==EBUS_SYNC) break;
-          } else {
-
-            if (sml_start==0x77) {
-              sml_start=0;
-            } else {
-              c=SML_SPEAK;
-              if (c==0x77) {
-                sml_start=c;
-                break;
-              }
-            }
-            c=SML_SREAD;
-            sprintf(&log_data[index],"%02x ",c);
-            index+=3;
-          }
-        }
-      }
-      if (index>2) {
-        log_data[index]=0;
-        AddLog(LOG_LEVEL_INFO);
-      }
-    }
-  }
-}
-
-
-uint8_t *skip_sml(uint8_t *cp,int16_t *res) {
-    uint8_t len,len1,type;
-    len=*cp&0xf;
-    type=*cp&0x70;
-    if (type==0x70) {
-
-
-        cp++;
-        while (len--) {
-            len1=*cp&0x0f;
-            cp+=len1;
-        }
-         *res=0;
-    } else {
-
-        *res=(signed char)*(cp+1);
-        cp+=len;
-    }
-    return cp;
-}
-
-
-
-double sml_getvalue(unsigned char *cp,uint8_t index) {
-uint8_t len,unit,type;
-int16_t scaler,result;
-int64_t value;
-double dval;
-
-
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-  scaler=result;
-
-  type=*cp&0x70;
-  len=*cp&0x0f;
-  cp++;
-    if (type==0x50 || type==0x60) {
-
-        uint64_t uvalue=0;
-        uint8_t nlen=len;
-        while (--nlen) {
-            uvalue<<=8;
-            uvalue|=*cp++;
-        }
-        if (type==0x50) {
-
-            switch (len-1) {
-                case 1:
-
-                    value=(signed char)uvalue;
-                    break;
-                case 2:
-
-#ifdef DWS74_BUG
-                    if (scaler==-2) {
-                      value=(uint32_t)uvalue;
-                    } else {
-                      value=(int16_t)uvalue;
-                    }
-#else
-                    value=(int16_t)uvalue;
-#endif
-                    break;
-                case 3:
-                case 4:
-
-                    value=(int32_t)uvalue;
-                    break;
-                case 5:
-                case 6:
-                case 7:
-                case 8:
-
-                    value=(int64_t)uvalue;
-                    break;
-            }
-        } else {
-
-            value=uvalue;
-        }
-
-    } else {
-        if (!(type&0xf0)) {
-
-
-
-            if (len==9) {
-
-                cp++;
-                uint32_t s1,s2;
-                s1=*cp<<16|*(cp+1)<<8|*(cp+2);
-                cp+=4;
-                s2=*cp<<16|*(cp+1)<<8|*(cp+2);
-                sprintf(&meter_id[index][0],"%u-%u",s1,s2);
-            } else {
-
-                char *str=&meter_id[index][0];
-                for (type=0; type<len-1; type++) {
-                    sprintf(str,"%02x",*cp++);
-                    str+=2;
-                }
-            }
-            value=0;
-        } else {
-            value=999999;
-            scaler=0;
-        }
-    }
-    dval=value;
-    if (scaler==-1) {
-      dval/=10;
-    } else if (scaler==-2) {
-      dval/=100;
-    } else if (scaler==-3) {
-      dval/=1000;
-    } else if (scaler==-4) {
-      dval/=10000;
-    } else if (scaler==1) {
-      dval*=10;
-    } else if (scaler==2) {
-      dval*=100;
-    } else if (scaler==3) {
-      dval*=1000;
-    }
-    return dval;
-}
-
-uint8_t hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    chr=toupper(chr);
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-  }
-  return rVal;
-}
-
-uint8_t sb_counter;
-
-
-double CharToDouble(const char *str)
-{
-
-  char strbuf[24];
-
-  strlcpy(strbuf, str, sizeof(strbuf));
-  char *pt = strbuf;
-  while ((*pt != '\0') && isblank(*pt)) { pt++; }
-
-  signed char sign = 1;
-  if (*pt == '-') { sign = -1; }
-  if (*pt == '-' || *pt=='+') { pt++; }
-
-  double left = 0;
-  if (*pt != '.') {
-    left = atoi(pt);
-    while (isdigit(*pt)) { pt++; }
-  }
-
-  double right = 0;
-  if (*pt == '.') {
-    pt++;
-    right = atoi(pt);
-    while (isdigit(*pt)) {
-      pt++;
-      right /= 10.0;
-    }
-  }
-
-  double result = left + right;
-  if (sign < 0) {
-    return -result;
-  }
-  return result;
-}
-
-
-
-void ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
-    short count,count1;
-    for (count=0; count<len; count++) {
-        if (ebus_buffer[count]==EBUS_ESC) {
-
-            ebus_buffer[count]+=ebus_buffer[count+1];
-
-            count++;
-            for (count1=count; count1<len; count1++) {
-                ebus_buffer[count1]=ebus_buffer[count1+1];
-            }
-        }
-    }
-
-}
-
-uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) {
- uint8_t crc;
- uint8_t polynom;
- int i;
-
- crc = crc_init;
- for (i = 0; i < 8; i++) {
-  if (crc & 0x80) {
-   polynom = (uint8_t) 0x9B;
-  }
-  else {
-   polynom = (uint8_t) 0;
-  }
-  crc = (uint8_t)((crc & ~0x80) << 1);
-  if (data & 0x80) {
-   crc = (uint8_t)(crc | 1) ;
-  }
-  crc = (uint8_t)(crc ^ polynom);
-  data = (uint8_t)(data << 1);
- }
- return (crc);
-}
-
-
-uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen ) {
- uint16_t i;
- uint8_t Crc = 0;
- for(i = 0 ; i < DataLen ; ++i, ++Data ) {
-      Crc = ebus_crc8( *Data, Crc );
-   }
-   return Crc;
-}
-
-void sml_empty_receiver(uint32_t meters) {
-  while (meter_ss[meters]->available()) {
-    meter_ss[meters]->read();
-  }
-}
-
-
-void sml_shift_in(uint32_t meters,uint32_t shard) {
-  uint32_t count;
-  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') {
-
-    for (count=0; count<SML_BSIZ-1; count++) {
-      smltbuf[meters][count]=smltbuf[meters][count+1];
-    }
-  }
-  uint8_t iob=(uint8_t)meter_ss[meters]->read();
-
-  if (meter_desc_p[meters].type=='o') {
-    smltbuf[meters][SML_BSIZ-1]=iob&0x7f;
-  } else if (meter_desc_p[meters].type=='s') {
-    smltbuf[meters][SML_BSIZ-1]=iob;
-  } else if (meter_desc_p[meters].type=='r') {
-    smltbuf[meters][SML_BSIZ-1]=iob;
-  } else if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M') {
-    smltbuf[meters][meter_spos[meters]] = iob;
-    meter_spos[meters]++;
-    if (meter_spos[meters]>=9) {
-      SML_Decode(meters);
-      sml_empty_receiver(meters);
-      meter_spos[meters]=0;
-    }
-  } else if (meter_desc_p[meters].type=='p') {
-    smltbuf[meters][meter_spos[meters]] = iob;
-    meter_spos[meters]++;
-    if (meter_spos[meters]>=7) {
-      SML_Decode(meters);
-      sml_empty_receiver(meters);
-      meter_spos[meters]=0;
-    }
-  } else {
-    if (iob==EBUS_SYNC) {
-
-
-      if (meter_spos[meters]>4+5) {
-
-        uint8_t tlen=smltbuf[meters][4]+5;
-
-        if (smltbuf[meters][tlen]=ebus_CalculateCRC(smltbuf[meters],tlen)) {
-            ebus_esc(smltbuf[meters],tlen);
-            SML_Decode(meters);
-        } else {
-
-
-        }
-      }
-      meter_spos[meters]=0;
-      return;
-    }
-  smltbuf[meters][meter_spos[meters]] = iob;
-  meter_spos[meters]++;
-  if (meter_spos[meters]>=SML_BSIZ) {
-   meter_spos[meters]=0;
-  }
-  }
-  sb_counter++;
-  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') SML_Decode(meters);
-}
-
-
-
-void SML_Poll(void) {
-uint32_t meters;
-
-    for (meters=0; meters<meters_used; meters++) {
-      if (meter_desc_p[meters].type!='c') {
-
-        while (meter_ss[meters]->available()) {
-          sml_shift_in(meters,0);
-        }
-      }
-    }
-}
-
-
-void SML_Decode(uint8_t index) {
-  const char *mp=(const char*)meter_p;
-  int8_t mindex;
-  uint8_t *cp;
-  uint8_t dindex=0,vindex=0;
-  delay(0);
-  while (mp != NULL) {
-
-
-
-    mindex=((*mp)&7)-1;
-
-    if (mindex<0 || mindex>=meters_used) mindex=0;
-    mp+=2;
-    if (*mp=='=' && *(mp+1)=='h') {
-      mp = strchr(mp, '|');
-      if (mp) mp++;
-      continue;
-    }
-
-    if (index!=mindex) goto nextsect;
-
-
-    cp=&smltbuf[mindex][0];
-
-
-    if (*mp=='=') {
-
-      mp++;
-
-      if (*mp=='m' && !sb_counter) {
-
-
-        mp++;
-        while (*mp==' ') mp++;
-
-        double dvar;
-        uint8_t opr;
-        uint32_t ind;
-        ind=atoi(mp);
-        while (*mp>='0' && *mp<='9') mp++;
-        if (ind<1 || ind>SML_MAX_VARS) ind=1;
-        dvar=meter_vars[ind-1];
-        for (uint8_t p=0;p<5;p++) {
-          if (*mp=='@') {
-
-            meter_vars[vindex]=dvar;
-            mp++;
-            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            break;
-          }
-          opr=*mp;
-          mp++;
-          uint8_t iflg=0;
-          if (*mp=='#') {
-            iflg=1;
-            mp++;
-          }
-          ind=atoi(mp);
-          while (*mp>='0' && *mp<='9') mp++;
-          if (ind<1 || ind>SML_MAX_VARS) ind=1;
-          switch (opr) {
-              case '+':
-                if (iflg) dvar+=ind;
-                else dvar+=meter_vars[ind-1];
-                break;
-              case '-':
-                if (iflg) dvar-=ind;
-                else dvar-=meter_vars[ind-1];
-                break;
-              case '*':
-                if (iflg) dvar*=ind;
-                else dvar*=meter_vars[ind-1];
-                break;
-              case '/':
-                if (iflg) dvar/=ind;
-                else dvar/=meter_vars[ind-1];
-                break;
-          }
-          while (*mp==' ') mp++;
-          if (*mp=='@') {
-
-            meter_vars[vindex]=dvar;
-            mp++;
-            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            break;
-          }
-        }
-      } else if (*mp=='d') {
-
-        if (dindex<MAX_DVARS) {
-
-          mp++;
-          while (*mp==' ') mp++;
-          uint8_t ind=atoi(mp);
-          while (*mp>='0' && *mp<='9') mp++;
-          if (ind<1 || ind>SML_MAX_VARS) ind=1;
-          uint32_t delay=atoi(mp)*1000;
-          uint32_t dtime=millis()-dtimes[dindex];
-          if (dtime>delay) {
-
-            dtimes[dindex]=millis();
-            double vdiff = meter_vars[ind-1]-dvalues[dindex];
-            dvalues[dindex]=meter_vars[ind-1];
-            meter_vars[vindex]=(double)360000.0*vdiff/((double)dtime/10000.0);
-
-            mp=strchr(mp,'@');
-            if (mp) {
-              mp++;
-              SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            }
-          }
-          dindex++;
-        }
-      } else if (*mp=='h') {
-
-        mp = strchr(mp, '|');
-        if (mp) mp++;
-        continue;
-      }
-    } else {
-
-      uint8_t found=1;
-      uint32_t ebus_dval=99;
-      float mbus_dval=99;
-      while (*mp!='@') {
-        if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
-          if (*mp++!=*cp++) {
-            found=0;
-          }
-        } else {
-          if (meter_desc_p[mindex].type=='s') {
-
-            uint8_t val = hexnibble(*mp++) << 4;
-            val |= hexnibble(*mp++);
-            if (val!=*cp++) {
-              found=0;
-            }
-          } else {
-
-
-            if (*mp=='x' && *(mp+1)=='x') {
-
-              mp+=2;
-              cp++;
-            } else if (!strncmp(mp,"UUuuUUuu",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='U' && *(mp+1)=='U' && *(mp+2)=='u' && *(mp+3)=='u'){
-              uint16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (!strncmp(mp,"SSssSSss",8)) {
-              int32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='u' && *(mp+1)=='u' && *(mp+2)=='U' && *(mp+3)=='U'){
-              uint16_t val = cp[0]|(cp[1]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='u' && *(mp+1)=='u') {
-              uint8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            } else if (*mp=='s' && *(mp+1)=='s' && *(mp+2)=='S' && *(mp+3)=='S') {
-              int16_t val = *cp|(*(cp+1)<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='S' && *(mp+1)=='S' && *(mp+2)=='s' && *(mp+3)=='s') {
-              int16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            }
-            else if (*mp=='s' && *(mp+1)=='s') {
-              int8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            }
-            else if (!strncmp(mp,"ffffffff",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"FFffFFff",8)) {
-
-              uint32_t val= (cp[1]<<0)|(cp[0]<<8)|(cp[3]<<16)|(cp[2]<<24);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"eeeeee",6)) {
-              uint32_t val=(cp[0]<<16)|(cp[1]<<8)|(cp[2]<<0);
-              mbus_dval=val;
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"vvvvvv",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/10.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"cccccc",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/100.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"pppp",4)) {
-              mbus_dval=(float)((cp[0]<<8)|cp[1]);
-              mp+=4;
-              cp+=2;
-            }
-            else {
-              uint8_t val = hexnibble(*mp++) << 4;
-              val |= hexnibble(*mp++);
-              if (val!=*cp++) {
-                found=0;
-              }
-            }
-          }
-        }
-      }
-      if (found) {
-
-        mp++;
-        if (*mp=='#') {
-
-          mp++;
-          if (meter_desc_p[mindex].type=='o') {
-            for (uint8_t p=0;p<METER_ID_SIZE;p++) {
-              if (*cp==*mp) {
-                meter_id[mindex][p]=0;
-                break;
-              }
-              meter_id[mindex][p]=*cp++;
-            }
-          } else {
-            sml_getvalue(cp,mindex);
-          }
-        } else {
-          double dval;
-          if (meter_desc_p[mindex].type!='e' && meter_desc_p[mindex].type!='r' && meter_desc_p[mindex].type!='m' && meter_desc_p[mindex].type!='M' && meter_desc_p[mindex].type!='p') {
-
-            if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
-              dval=CharToDouble((char*)cp);
-            } else {
-              dval=sml_getvalue(cp,mindex);
-            }
-          } else {
-
-            if (*mp=='b') {
-              mp++;
-              uint8_t shift=*mp&7;
-              ebus_dval>>=shift;
-              ebus_dval&=1;
-              mp+=2;
-            }
-            if (*mp=='i') {
-
-              mp++;
-              uint8_t mb_index=strtol((char*)mp,(char**)&mp,10);
-              if (mb_index!=meter_desc_p[mindex].index) {
-                goto nextsect;
-              }
-              uint16_t crc = MBUS_calculateCRC(&smltbuf[mindex][0],7);
-              if (lowByte(crc)!=smltbuf[mindex][7]) goto nextsect;
-              if (highByte(crc)!=smltbuf[mindex][8]) goto nextsect;
-              dval=mbus_dval;
-
-              mp++;
-            } else {
-              if (meter_desc_p[mindex].type=='p') {
-                uint8_t crc = SML_PzemCrc(&smltbuf[mindex][0],6);
-                if (crc!=smltbuf[mindex][6]) goto nextsect;
-                dval=mbus_dval;
-              } else {
-                dval=ebus_dval;
-              }
-            }
-
-          }
-#ifdef USE_SML_MEDIAN_FILTER
-          if (meter_desc_p[mindex].flag&16) {
-            meter_vars[vindex]=sml_median(&sml_mf[vindex],dval);
-          } else {
-            meter_vars[vindex]=dval;
-          }
-#else
-          meter_vars[vindex]=dval;
-#endif
-
-
-          double fac=CharToDouble((char*)mp);
-          meter_vars[vindex]/=fac;
-          SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-        }
-      }
-    }
-nextsect:
-
-    if (vindex<SML_MAX_VARS-1) {
-      vindex++;
-    }
-    mp = strchr(mp, '|');
-    if (mp) mp++;
-  }
-}
-
-
-void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
-  char tpowstr[32];
-  char jname[24];
-
-
-  char *cp=strchr(mp,',');
-  if (cp) {
-    cp++;
-
-    cp=strchr(cp,',');
-    if (cp) {
-      cp++;
-
-      cp=strchr(cp,',');
-      if (cp) {
-        cp++;
-
-        for (uint8_t count=0;count<sizeof(jname);count++) {
-          if (*cp==',') {
-            jname[count]=0;
-            break;
-          }
-          jname[count]=*cp++;
-        }
-        cp++;
-        uint8_t dp=atoi(cp);
-        if (dp&0x10) {
-
-          dtostrfd(meter_vars[index],dp&0xf,tpowstr);
-          ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr);
-          MqttPublishTeleSensor();
-        }
-      }
-    }
-  }
-}
-
-
-void SML_Show(boolean json) {
-  int8_t count,mindex,cindex=0;
-  char tpowstr[32];
-  char name[24];
-  char unit[8];
-  char jname[24];
-  int8_t index=0,mid=0;
-  char *mp=(char*)meter_p;
-  char *cp;
-
-
-
-    int8_t lastmind=((*mp)&7)-1;
-    if (lastmind<0 || lastmind>=meters_used) lastmind=0;
-    while (mp != NULL) {
-
-        mindex=((*mp)&7)-1;
-        if (mindex<0 || mindex>=meters_used) mindex=0;
-        mp+=2;
-        if (*mp=='=' && *(mp+1)=='h') {
-          mp+=2;
-
-          if (json) {
-            mp = strchr(mp, '|');
-            if (mp) mp++;
-            continue;
-          }
-
-          uint8_t i;
-          for (i=0;i<sizeof(tpowstr)-2;i++) {
-            if (*mp=='|' || *mp==0) break;
-            tpowstr[i]=*mp++;
-          }
-          tpowstr[i]=0;
-
-
-          WSContentSend_PD(PSTR("{s}%s{e}"),tpowstr);
-
-          mp--;
-          mp = strchr(mp, '|');
-          if (mp) mp++;
-          continue;
-        }
-
-        cp=strchr(mp,'@');
-        if (cp) {
-          cp++;
-          if (*cp=='#') {
-
-            sprintf(tpowstr,"\"%s\"",&meter_id[mindex][0]);
-            mid=1;
-          } else {
-            mid=0;
-          }
-
-          cp=strchr(cp,',');
-          if (cp) {
-
-            cp++;
-            for (count=0;count<sizeof(name);count++) {
-              if (*cp==',') {
-                name[count]=0;
-                break;
-              }
-              name[count]=*cp++;
-            }
-            cp++;
-
-            for (count=0;count<sizeof(unit);count++) {
-              if (*cp==',') {
-                unit[count]=0;
-                break;
-              }
-              unit[count]=*cp++;
-            }
-            cp++;
-
-            for (count=0;count<sizeof(jname);count++) {
-              if (*cp==',') {
-                jname[count]=0;
-                break;
-              }
-              jname[count]=*cp++;
-            }
-
-            cp++;
-
-            if (!mid) {
-              uint8_t dp=atoi(cp)&0xf;
-              dtostrfd(meter_vars[index],dp,tpowstr);
-            }
-
-            if (json) {
-
-              if (index==0) {
-
-                ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
-              }
-              else {
-                if (lastmind!=mindex) {
-
-
-                  ResponseAppend_P(PSTR("}"));
-
-
-                  ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
-                  lastmind=mindex;
-                } else {
-
-                  ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
-                }
-              }
-            } else {
-
-
-              WSContentSend_PD(PSTR("{s}%s %s: {m}%s %s{e}"),meter_desc_p[mindex].prefix,name,tpowstr,unit);
-            }
-          }
-        }
-        if (index<SML_MAX_VARS-1) {
-          index++;
-        }
-
-        mp = strchr(cp, '|');
-        if (mp) mp++;
-    }
-    if (json) {
-
-
-     ResponseAppend_P(PSTR("}"));
-   } else {
-
-   }
-# 1802 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-}
-
-struct SML_COUNTER {
-  uint8_t sml_cnt_debounce;
-  uint8_t sml_cnt_old_state;
-  uint32_t sml_cnt_last_ts;
-  uint32_t sml_counter_ltime;
-  uint16_t sml_debounce;
-
-#ifdef ANALOG_OPTO_SENSOR
-  int16_t ana_curr;
-  int16_t ana_max;
-  int16_t ana_min;
-  int16_t ana_cmpl;
-  int16_t ana_cmph;
-#endif
-} sml_counters[MAX_COUNTERS];
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void SML_CounterUpd(uint8_t index) ICACHE_RAM_ATTR;
-void SML_CounterUpd1(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd2(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd3(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd4(void) ICACHE_RAM_ATTR;
-#endif
-
-void SML_CounterUpd(uint8_t index) {
-
-  uint8_t level=digitalRead(meter_desc_p[sml_counters[index].sml_cnt_old_state].srcpin);
-  if (!level) {
-
-    uint32_t ltime=millis()-sml_counters[index].sml_counter_ltime;
-    sml_counters[index].sml_counter_ltime=millis();
-    if (ltime>sml_counters[index].sml_debounce) {
-      RtcSettings.pulse_counter[index]++;
-      InjektCounterValue(sml_counters[index].sml_cnt_old_state,RtcSettings.pulse_counter[index]);
-    }
-  } else {
-
-    sml_counters[index].sml_counter_ltime=millis();
-  }
-}
-
-void SML_CounterUpd1(void) {
-  SML_CounterUpd(0);
-}
-
-void SML_CounterUpd2(void) {
-  SML_CounterUpd(1);
-}
-
-void SML_CounterUpd3(void) {
-  SML_CounterUpd(2);
-}
-
-void SML_CounterUpd4(void) {
-  SML_CounterUpd(3);
-}
-
-#ifdef USE_SCRIPT
-struct METER_DESC script_meter_desc[MAX_METERS];
-uint8_t *script_meter;
-#endif
-
-#ifndef METER_DEF_SIZE
-#define METER_DEF_SIZE 3000
-#endif
-
-bool Gpio_used(uint8_t gpiopin) {
-  for (uint16_t i=0;i<GPIO_SENSOR_END;i++) {
-    if (pin[i]==gpiopin) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void SML_Init(void) {
-  meters_used=METERS_USED;
-  meter_desc_p=meter_desc;
-  meter_p=meter;
-
-  sml_desc_cnt=0;
-
-  for (uint32_t cnt=0;cnt<SML_MAX_VARS;cnt++) {
-    meter_vars[cnt]=0;
-  }
-
-  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
-    meter_spos[cnt]=0;
-  }
-
-#ifdef USE_SCRIPT
-
-  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
-    if (script_meter_desc[cnt].txmem) {
-     free(script_meter_desc[cnt].txmem);
-     script_meter_desc[cnt].txmem=0;
-    }
-  }
-
-  uint8_t meter_script=Run_Scripter(">M",-2,0);
-  if (meter_script==99) {
-
-    if (script_meter) free(script_meter);
-    script_meter=0;
-    uint8_t *tp=0;
-    uint16_t index=0;
-    uint8_t section=0;
-    uint8_t srcpin=0;
-    char *lp=glob_script_mem.scriptptr;
-    sml_send_blocks=0;
-    while (lp) {
-      if (!section) {
-        if (*lp=='>' && *(lp+1)=='M') {
-          lp+=2;
-          meters_used=strtol(lp,0,10);
-          section=1;
-          uint32_t mlen=0;
-          for (uint32_t cnt=0;cnt<METER_DEF_SIZE-1;cnt++) {
-            if (lp[cnt]=='\n' && lp[cnt+1]=='#') {
-              mlen=cnt+3;
-              break;
-            }
-          }
-          if (mlen==0) return;
-          script_meter=(uint8_t*)calloc(mlen,1);
-          if (!script_meter) {
-            goto dddef_exit;
-          }
-          tp=script_meter;
-          goto next_line;
-        }
-      }
-      else {
-        if (!*lp || *lp=='#' || *lp=='>') {
-          if (*(tp-1)=='|') *(tp-1)=0;
-          break;
-        }
-        if (*lp=='+') {
-
-
-          lp++;
-          index=*lp&7;
-          lp+=2;
-          if (index<1 || index>meters_used) goto next_line;
-          index--;
-          srcpin=strtol(lp,&lp,10);
-          if (Gpio_used(srcpin)) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("gpio rx double define!"));
-dddef_exit:
-            if (script_meter) free(script_meter);
-            script_meter=0;
-            meters_used=METERS_USED;
-            goto init10;
-          }
-          script_meter_desc[index].srcpin=srcpin;
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].type=*lp;
-          lp+=2;
-          script_meter_desc[index].flag=strtol(lp,&lp,10);
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].params=strtol(lp,&lp,10);
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].prefix[7]=0;
-          for (uint32_t cnt=0; cnt<8; cnt++) {
-            if (*lp==SCRIPT_EOL || *lp==',') {
-              script_meter_desc[index].prefix[cnt]=0;
-              break;
-            }
-            script_meter_desc[index].prefix[cnt]=*lp++;
-          }
-          if (*lp==',') {
-            lp++;
-            script_meter_desc[index].trxpin=strtol(lp,&lp,10);
-            if (Gpio_used(script_meter_desc[index].trxpin)) {
-              AddLog_P(LOG_LEVEL_INFO, PSTR("gpio tx double define!"));
-              goto dddef_exit;
-            }
-            if (*lp!=',') goto next_line;
-            lp++;
-            script_meter_desc[index].tsecs=strtol(lp,&lp,10);
-            if (*lp==',') {
-              lp++;
-              char txbuff[256];
-              uint32_t txlen=0,tx_entries=1;
-              for (uint32_t cnt=0; cnt<sizeof(txbuff); cnt++) {
-                if (*lp==SCRIPT_EOL) {
-                  txbuff[cnt]=0;
-                  txlen=cnt;
-                  break;
-                }
-                if (*lp==',') tx_entries++;
-                txbuff[cnt]=*lp++;
-              }
-              if (txlen) {
-                script_meter_desc[index].txmem=(char*)calloc(txlen+2,1);
-                if (script_meter_desc[index].txmem) {
-                  strcpy(script_meter_desc[index].txmem,txbuff);
-                }
-                script_meter_desc[index].index=0;
-                script_meter_desc[index].max_index=tx_entries;
-                sml_send_blocks++;
-              }
-            }
-          }
-          if (*lp==SCRIPT_EOL) lp--;
-          goto next_line;
-        }
-
-        if (*lp=='-' || isdigit(*lp)) {
-
-
-          if (*lp=='-') lp++;
-          uint8_t mnum=strtol(lp,0,10);
-          if (mnum<1 || mnum>meters_used) goto next_line;
-          while (1) {
-            if (*lp==SCRIPT_EOL) {
-              if (*(tp-1)!='|') *tp++='|';
-              goto next_line;
-            }
-            *tp++=*lp++;
-            index++;
-            if (index>=METER_DEF_SIZE) break;
-          }
-        }
-
-      }
-
-next_line:
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-    *tp=0;
-    meter_desc_p=script_meter_desc;
-    meter_p=script_meter;
-  }
-#endif
-
-init10:
-  typedef void (*function)();
-  function counter_callbacks[] = {SML_CounterUpd1,SML_CounterUpd2,SML_CounterUpd3,SML_CounterUpd4};
-  uint8_t cindex=0;
-
-  for (byte i = 0; i < MAX_COUNTERS; i++) {
-      RtcSettings.pulse_counter[i]=Settings.pulse_counter[i];
-      sml_counters[i].sml_cnt_last_ts=millis();
-  }
-  for (uint8_t meters=0; meters<meters_used; meters++) {
-    if (meter_desc_p[meters].type=='c') {
-        if (meter_desc_p[meters].flag&2) {
-
-#ifdef ANALOG_OPTO_SENSOR
-          ADS1115_init();
-          sml_counters[cindex].ana_max=-32768;
-          sml_counters[cindex].ana_min=+32767;
-#endif
-        } else {
-
-          if (meter_desc_p[meters].flag&1) {
-            pinMode(meter_desc_p[meters].srcpin,INPUT_PULLUP);
-          } else {
-            pinMode(meter_desc_p[meters].srcpin,INPUT);
-          }
-
-          if (meter_desc_p[meters].params<=0) {
-
-            attachInterrupt(meter_desc_p[meters].srcpin, counter_callbacks[cindex], CHANGE);
-            sml_counters[cindex].sml_cnt_old_state=meters;
-            sml_counters[cindex].sml_debounce=-meter_desc_p[meters].params;
-          }
-          InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-          cindex++;
-        }
-    } else {
-
-#ifdef SPECIAL_SS
-        if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M' || meter_desc_p[meters].type=='p') {
-          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
-        } else {
-          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1);
-        }
-#else
-        meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
-#endif
-        if (meter_ss[meters]->begin(meter_desc_p[meters].params)) {
-          meter_ss[meters]->flush();
-        }
-        if (meter_ss[meters]->hardwareSerial()) {
-          if (meter_desc_p[meters].type=='M') {
-            Serial.begin(meter_desc_p[meters].params, SERIAL_8E1);
-          }
-          ClaimSerial();
-        }
-
-    }
-  }
-
-}
-
-
-#ifdef USE_SML_SCRIPT_CMD
-uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
-  if (meter<1 || meter>meters_used) return 0;
-  meter--;
-  if (!meter_ss[meter]) return 0;
-  if (meter_ss[meter]->begin(br)) {
-    meter_ss[meter]->flush();
-  }
-  if (meter_ss[meter]->hardwareSerial()) {
-    if (meter_desc_p[meter].type=='M') {
-      Serial.begin(br, SERIAL_8E1);
-    }
-  }
-  return 1;
-}
-
-uint32_t SML_Write(uint32_t meter,char *hstr) {
-  if (meter<1 || meter>meters_used) return 0;
-  meter--;
-  if (!meter_ss[meter]) return 0;
-  SML_Send_Seq(meter,hstr);
-  return 1;
-}
-#endif
-
-
-void SetDBGLed(uint8_t srcpin, uint8_t ledpin) {
-    pinMode(ledpin, OUTPUT);
-    if (digitalRead(srcpin)) {
-      digitalWrite(ledpin,LOW);
-    } else {
-      digitalWrite(ledpin,HIGH);
-    }
-}
-
-
-void SML_Counter_Poll(void) {
-uint16_t meters,cindex=0;
-uint32_t ctime=millis();
-
-  for (meters=0; meters<meters_used; meters++) {
-    if (meter_desc_p[meters].type=='c') {
-
-      if (meter_desc_p[meters].params>0) {
-        if (ctime-sml_counters[cindex].sml_cnt_last_ts>meter_desc_p[meters].params) {
-          sml_counters[cindex].sml_cnt_last_ts=ctime;
-
-          if (meter_desc_p[meters].flag&2) {
-
-#ifdef ANALOG_OPTO_SENSOR
-            if (ads1115_up) {
-              int16_t val = adc.read_sample();
-              if (val>sml_counters[cindex].ana_max) sml_counters[cindex].ana_max=val;
-              if (val<sml_counters[cindex].ana_min) sml_counters[cindex].ana_min=val;
-              sml_counters[cindex].ana_curr=val;
-              int16_t range=sml_counters[cindex].ana_max-sml_counters[cindex].ana_min;
-            }
-#endif
-          } else {
-
-            uint8_t state;
-            sml_counters[cindex].sml_cnt_debounce<<=1;
-            sml_counters[cindex].sml_cnt_debounce|=(digitalRead(meter_desc_p[meters].srcpin)&1)|0x80;
-            if (sml_counters[cindex].sml_cnt_debounce==0xc0) {
-
-              state=1;
-            } else {
-
-              state=0;
-            }
-            if (sml_counters[cindex].sml_cnt_old_state!=state) {
-
-              sml_counters[cindex].sml_cnt_old_state=state;
-              if (state==0) {
-
-                RtcSettings.pulse_counter[cindex]++;
-                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-              }
-            }
-          }
-        }
-#ifdef DEBUG_CNT_LED1
-        if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
-#endif
-#ifdef DEBUG_CNT_LED2
-        if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
-#endif
-      } else {
-        if (ctime-sml_counters[cindex].sml_cnt_last_ts>10) {
-          sml_counters[cindex].sml_cnt_last_ts=ctime;
-#ifdef DEBUG_CNT_LED1
-          if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
-#endif
-#ifdef DEBUG_CNT_LED2
-          if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
-#endif
-        }
-      }
-      cindex++;
-    }
-  }
-}
-
-#ifdef USE_SCRIPT
-char *SML_Get_Sequence(char *cp,uint32_t index) {
-  if (!index) return cp;
-  uint32_t cindex=0;
-  while (cp) {
-    cp=strchr(cp,',');
-    if (cp) {
-      cp++;
-      cindex++;
-      if (cindex==index) {
-        return cp;
-      }
-    }
-  }
-}
-
-void SML_Check_Send(void) {
-  sml_100ms_cnt++;
-  char *cp;
-  for (uint32_t cnt=sml_desc_cnt; cnt<meters_used; cnt++) {
-    if (script_meter_desc[cnt].trxpin>=0 && script_meter_desc[cnt].txmem) {
-      if ((sml_100ms_cnt%script_meter_desc[cnt].tsecs)==0) {
-        if (script_meter_desc[cnt].max_index>1) {
-          script_meter_desc[cnt].index++;
-          if (script_meter_desc[cnt].index>=script_meter_desc[cnt].max_index) {
-            script_meter_desc[cnt].index=0;
-            sml_desc_cnt++;
-          }
-          cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
-
-        } else {
-          cp=script_meter_desc[cnt].txmem;
-
-          sml_desc_cnt++;
-        }
-
-        SML_Send_Seq(cnt,cp);
-        if (sml_desc_cnt>=meters_used) {
-          sml_desc_cnt=0;
-        }
-        break;
-      }
-    } else {
-      sml_desc_cnt++;
-    }
-
-    if (sml_desc_cnt>=meters_used) {
-      sml_desc_cnt=0;
-    }
-  }
-}
-
-uint8_t sml_hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
-  }
-  return rVal;
-}
-
-
-void SML_Send_Seq(uint32_t meter,char *seq) {
-  uint8_t sbuff[32];
-  uint8_t *ucp=sbuff,slen=0;
-  char *cp=seq;
-  while (*cp) {
-    if (!*cp || !*(cp+1)) break;
-    if (*cp==',') break;
-    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
-    cp+=2;
-    *ucp++=iob;
-    slen++;
-    if (slen>=sizeof(sbuff)) break;
-  }
-  if (script_meter_desc[meter].type=='m' || script_meter_desc[meter].type=='M') {
-    *ucp++=0;
-    *ucp++=2;
-
-    uint16_t crc = MBUS_calculateCRC(sbuff,6);
-    *ucp++=lowByte(crc);
-    *ucp++=highByte(crc);
-    slen+=4;
-  }
-  if (script_meter_desc[meter].type=='o') {
-    for (uint32_t cnt=0;cnt<slen;cnt++) {
-      sbuff[cnt]|=(CalcEvenParity(sbuff[cnt])<<7);
-    }
-  }
-  if (script_meter_desc[meter].type=='p') {
-    *ucp++=0xc0;
-    *ucp++=0xa8;
-    *ucp++=1;
-    *ucp++=1;
-    *ucp++=0;
-    *ucp++=SML_PzemCrc(sbuff,6);
-    slen+=6;
-  }
-  meter_ss[meter]->write(sbuff,slen);
-}
-#endif
-
-uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num) {
-  uint16_t crc, flag;
-  crc = 0xFFFF;
-  for (uint32_t i = 0; i < num; i++) {
-    crc ^= frame[i];
-    for (uint32_t j = 8; j; j--) {
-      if ((crc & 0x0001) != 0) {
-        crc >>= 1;
-        crc ^= 0xA001;
-      } else {
-        crc >>= 1;
-      }
-    }
-  }
-  return crc;
-}
-
-uint8_t SML_PzemCrc(uint8_t *data, uint8_t len) {
-  uint16_t crc = 0;
-  for (uint32_t i = 0; i < len; i++) crc += *data++;
-  return (uint8_t)(crc & 0xFF);
-}
-
-
-uint8_t CalcEvenParity(uint8_t data) {
-uint8_t parity=0;
-
-  while(data) {
-    parity^=(data &1);
-    data>>=1;
-  }
-  return parity;
-}
-# 2361 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-bool XSNS_53_cmd(void) {
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp=='d') {
-
-        cp++;
-        uint8_t index=atoi(cp);
-        if ((index&7)>meters_used) index=1;
-        if (index>0 && meter_desc_p[(index&7)-1].type=='c') {
-          index=0;
-        }
-        dump2log=index;
-        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"dump: %d\"}}"),dump2log);
-      } else if (*cp=='c') {
-
-          cp++;
-          uint8_t index=*cp&7;
-          if (index<1 || index>MAX_COUNTERS) index=1;
-          cp++;
-          while (*cp==' ') cp++;
-          if (isdigit(*cp)) {
-            uint32_t cval=atoi(cp);
-            while (isdigit(*cp)) cp++;
-            RtcSettings.pulse_counter[index-1]=cval;
-            uint8_t cindex=0;
-            for (uint8_t meters=0; meters<meters_used; meters++) {
-              if (meter_desc_p[meters].type=='c') {
-                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-                cindex++;
-              }
-            }
-          }
-          ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"counter%d: %d\"}}"),index,RtcSettings.pulse_counter[index-1]);
-      } else if (*cp=='r') {
-
-        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"restart\"}}"));
-        SML_CounterSaveState();
-        SML_Init();
-      } else {
-        serviced=false;
-      }
-  }
-  return serviced;
-}
-
-void InjektCounterValue(uint8_t meter,uint32_t counter) {
-  sprintf((char*)&smltbuf[meter][0],"1-0:1.8.0*255(%d)",counter);
-  SML_Decode(meter);
-}
-
-void SML_CounterSaveState(void) {
-  for (byte i = 0; i < MAX_COUNTERS; i++) {
-      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
-  }
-}
-# 2425 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_53_sml.ino"
-bool Xsns53(byte function) {
-  bool result = false;
-    switch (function) {
-      case FUNC_INIT:
-        SML_Init();
-        break;
-      case FUNC_LOOP:
-        SML_Counter_Poll();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (dump2log) Dump2log();
-        else SML_Poll();
-        break;
-#ifdef USE_SCRIPT
-      case FUNC_EVERY_100_MSECOND:
-        SML_Check_Send();
-        break;
-#endif
-      case FUNC_JSON_APPEND:
-        SML_Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SML_Show(0);
-        break;
-#endif
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_53 == XdrvMailbox.index) {
-          result = XSNS_53_cmd();
-        }
-        break;
-      case FUNC_SAVE_BEFORE_RESTART:
-      case FUNC_SAVE_AT_MIDNIGHT:
-        SML_CounterSaveState();
-        break;
-    }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-#ifdef USE_I2C
-#ifdef USE_INA226
-# 70 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-#define XSNS_54 54
-#define XI2C_35 35
-
-#define INA226_MAX_ADDRESSES 4
-#define INA226_ADDRESS1 (0x40)
-#define INA226_ADDRESS2 (0x41)
-#define INA226_ADDRESS3 (0x44)
-#define INA226_ADDRESS4 (0x45)
-
-#define INA226_REG_CONFIG (0x00)
-#define INA226_RES_CONFIG (0x4127)
-#define INA226_DEF_CONFIG (0x42FF)
-#define INA226_CONFIG_RESET (0x8000)
-
-#define INA226_REG_SHUNTVOLTAGE (0x01)
-#define INA226_REG_BUSVOLTAGE (0x02)
-#define INA226_REG_POWER (0x03)
-#define INA226_REG_CURRENT (0x04)
-#define INA226_REG_CALIBRATION (0x05)
-
-
-typedef struct Ina226SlaveInfo_tag {
-  uint8_t address;
-  uint16_t calibrationValue;
-  uint16_t config;
-  uint8_t present : 1;
-  float i_lsb;
-} Ina226SlaveInfo_t;
-
-
-
-
-
-static const uint8_t PROGMEM probeAddresses[INA226_MAX_ADDRESSES] = {INA226_ADDRESS1, INA226_ADDRESS2, INA226_ADDRESS3, INA226_ADDRESS4};
-
-
-
-
-
-
-static char Ina226Str[] = "INA226";
-static uint8_t slavesFound = 0;
-static uint8_t schedule_reinit = 0;
-static Ina226SlaveInfo_t slaveInfo[4] = {0};
-
-static float voltages[4];
-static float currents[4];
-static float powers[4];
-
-
-
-
-
-
-static void _debug_fval(const char *str, float fval, uint8_t prec = 4 )
-{
-  char fstr[32];
-  dtostrfd(fval, prec, fstr);
-  AddLog_P2( LOG_LEVEL_DEBUG, PSTR("%s: %s"), str, fstr );
-}
-# 138 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-static uint32_t _expand_r_shunt(uint16_t compact_r_shunt)
-{
-
-  uint32_t r_shunt_uohms = (compact_r_shunt & 0x8000) ?
-  (((uint32_t)(compact_r_shunt & 0x7FFF)) * 1000ul) :
-  (compact_r_shunt & 0x7FFF);
-  return r_shunt_uohms;
-}
-
-
-
-
-
-void Ina226SetCalibration(uint8_t slaveIndex)
-{
-
-Ina226SlaveInfo_t *si = slaveInfo + slaveIndex;
-
-I2cWrite16( si->address, INA226_REG_CALIBRATION, si->calibrationValue);
-
-}
-
-
-
-
-
-
-bool Ina226TestPresence(uint8_t device)
-{
-
-
-
-  uint16_t config = I2cRead16( slaveInfo[device].address, INA226_REG_CONFIG );
-
-
-  if (config != slaveInfo[device].config)
-    return false;
-
-  return true;
-
-}
-
-void Ina226ResetActive(void)
-{
-  Ina226SlaveInfo_t *p = slaveInfo;
-
-  for (uint32_t i = 0; i < INA226_MAX_ADDRESSES; i++) {
-    p = &slaveInfo[i];
-
-    uint8_t addr = p->address;
-    if (addr) {
-      I2cResetActive(addr);
-    }
-  }
-}
-
-
-
-
-
-void Ina226Init()
-{
-  uint32_t i;
-
-  slavesFound = 0;
-
-  Ina226SlaveInfo_t *p = slaveInfo;
-# 215 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-  for (i = 0; i < 4; i++){
-    *p = {0};
-  }
-
-
-
-
-
-  for (i = 0; i < INA226_MAX_ADDRESSES; i++){
-    uint8_t addr = pgm_read_byte(probeAddresses + i);
-
-    if (I2cActive(addr)) { continue; }
-
-
-
-
-    if (!Settings.ina226_i_fs[i])
-      continue;
-
-
-
-
-
-
-    if (!I2cWrite16( addr, INA226_REG_CONFIG, INA226_CONFIG_RESET)){
-
-      AddLog_P2( LOG_LEVEL_DEBUG, "No INA226 at address: %02X", addr);
-      continue;
-    }
-
-
-
-    uint16_t config = I2cRead16( addr, INA226_REG_CONFIG );
-
-
-    if (INA226_RES_CONFIG != config)
-      continue;
-
-
-    config = INA226_DEF_CONFIG;
-
-
-    if (!I2cWrite16( addr, INA226_REG_CONFIG, config))
-        continue;
-
-
-    p = &slaveInfo[i];
-
-    p->address = addr;
-
-    p->config = config;
-
-
-    p->i_lsb = (((float) Settings.ina226_i_fs[i])/10.0f)/32768.0f;
-
-
-
-    uint32_t r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[i]);
-
-
-
-    p->calibrationValue = ((uint16_t) (0.00512/(p->i_lsb * r_shunt_uohms/1000000.0f)));
-
-    p->present = true;
-
-
-    Ina226SetCalibration(i);
-
-    I2cSetActiveFound(addr, Ina226Str);
-
-    slavesFound++;
-  }
-}
-
-
-
-
-
-float Ina226ReadBus_v(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_bus_v = I2cReadS16( addr, INA226_REG_BUSVOLTAGE);
-
-  float result = ((float) reg_bus_v) * 0.00125f;
-
-  return result;
-
-}
-
-
-
-
-
-float Ina226ReadShunt_i(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_CURRENT);
-
-  float result = ((float) reg_shunt_i) * slaveInfo[device].i_lsb;
-
-  return result;
-}
-
-
-
-
-
-float Ina226ReadPower_w(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_POWER);
-
-  float result = ((float) reg_shunt_i) * (slaveInfo[device].i_lsb * 25.0);
-
-  return result;
-}
-
-
-
-
-
-
-void Ina226Read(uint8_t device)
-{
-
-  voltages[device] = Ina226ReadBus_v(device);
-  currents[device] = Ina226ReadShunt_i(device);
-  powers[device] = Ina226ReadPower_w(device);
-
-
-
-
-}
-
-
-
-
-
-void Ina226EverySecond()
-{
-
-  for (uint8_t device = 0; device < INA226_MAX_ADDRESSES; device++){
-
-    if (slavesFound && slaveInfo[device].present && Ina226TestPresence(device)){
-      Ina226Read(device);
-    }
-    else {
-        powers[device] = currents[device] = voltages[device] = 0.0f;
-
-
-
-
-
-
-        slaveInfo[device].present = false;
-    }
-  }
-}
-
-
-
-
-
-bool Ina226CommandSensor()
-{
-  bool serviced = true;
-  bool show_config = false;
-  char param_str[64];
-  char *cp, *params[4];
-  uint8_t i, param_count, device, p1 = XdrvMailbox.payload;
-  uint32_t r_shunt_uohms;
-  uint16_t compact_r_shunt_uohms;
-
-
-
-
-
-  if (XdrvMailbox.data_len > 62){
-    return false;
-  }
-
-  strncpy(param_str, XdrvMailbox.data, XdrvMailbox.data_len + 1);
-  param_str[XdrvMailbox.data_len] = 0;
-
-
-  for (cp = param_str, i = 0, param_count = 0; *cp && (i < XdrvMailbox.data_len + 1) && (param_count <= 3); i++)
-    if (param_str[i] == ' ' || param_str[i] == ',' || param_str[i] == 0){
-      param_str[i] = 0;
-      params[param_count] = cp;
-
-      param_count++;
-      cp = param_str + i + 1;
-    }
-
-
-  if (p1 < 10 || p1 >= 50){
-
-    switch (p1){
-      case 1:
-        Ina226ResetActive();
-        Ina226Init();
-        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"SlavesFound\":%d}}"),slavesFound);
-        break;
-
-      case 2:
-        restart_flag = 2;
-        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"Restart_flag\":%d}}"),restart_flag);
-        break;
-
-      default:
-        serviced = false;
-    }
-  }
-  else if (p1 < 50){
-
-    device = (p1 / 10) - 1;
-    switch (p1 % 10){
-      case 0:
-        show_config = true;
-        break;
-
-      case 1:
-        r_shunt_uohms = (uint32_t) ((CharToFloat(params[1])) * 1000000.0f);
-
-
-
-        if (r_shunt_uohms > 32767){
-          uint32_t r_shunt_mohms = r_shunt_uohms/1000UL;
-          Settings.ina226_r_shunt[device] = (uint16_t) (r_shunt_mohms | 0x8000);
-        }
-        else
-          Settings.ina226_r_shunt[device] = (uint16_t) r_shunt_uohms;
-
-
-        show_config = true;
-        break;
-
-      case 2:
-        Settings.ina226_i_fs[device] = (uint16_t) ((CharToFloat(params[1])) * 10.0f);
-
-        show_config = true;
-        break;
-
-
-      default:
-        serviced = false;
-        break;
-    }
-  }
-  else
-    serviced = false;
-
-  if (show_config) {
-    char shunt_r_str[16];
-    char fs_i_str[16];
-
-
-    r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[device]);
-    dtostrfd(((float)r_shunt_uohms)/1000000.0f, 6, shunt_r_str);
-
-    dtostrfd(((float)Settings.ina226_i_fs[device])/10.0f, 1, fs_i_str);
-
-    Response_P(PSTR("{\"Sensor54-device-settings-%d\":{\"SHUNT_R\":%s,\"FS_I\":%s}}"),
-      device + 1, shunt_r_str, fs_i_str);
-  }
-
-  return serviced;
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_INA226_DATA[] PROGMEM =
-  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
-#endif
-
-void Ina226Show(bool json)
-{
-  int i, num_found;
-  for (num_found = 0, i = 0; i < INA226_MAX_ADDRESSES; i++) {
-
-    if (!slaveInfo[i].present)
-      continue;
-
-    num_found++;
-
-    char voltage[16];
-    dtostrfd(voltages[i], Settings.flag2.voltage_resolution, voltage);
-    char current[16];
-    dtostrfd(currents[i], Settings.flag2.current_resolution, current);
-    char power[16];
-    dtostrfd(powers[i], Settings.flag2.wattage_resolution, power);
-    char name[16];
-    snprintf_P(name, sizeof(name), PSTR("INA226%c%d"),IndexSeparator(), i + 1);
-
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%d,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
-                       name, i, voltage, current, power);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, voltage);
-        DomoticzSensor(DZ_CURRENT, current);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_INA226_DATA, name, voltage, name, current, name, power);
-#endif
-    }
-
-  }
-
-}
-# 546 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_54_ina226.ino"
-bool Xsns54(byte callback_id)
-{
-  if (!I2cEnabled(XI2C_35)) { return false; }
-
-
-  bool result = false;
-
-
-  switch (callback_id) {
-    case FUNC_EVERY_SECOND:
-      Ina226EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      Ina226Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Ina226Show(0);
-      break;
-#endif
-    case FUNC_COMMAND_SENSOR:
-      if (XSNS_54 == XdrvMailbox.index) {
-        result = Ina226CommandSensor();
-      }
-      break;
-    case FUNC_INIT:
-      Ina226Init();
-      break;
-  }
-
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
-#ifdef USE_I2C
-#ifdef USE_HIH6
-# 33 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_55_hih_series.ino"
-#define XSNS_55 55
-#define XI2C_36 36
-
-#define HIH6_ADDR 0x27
-
-struct HIH6 {
-  float temperature = 0;
-  float humidity = 0;
-  uint8_t valid = 0;
-  uint8_t type = 0;
-  char types[4] = "HIH";
-} Hih6;
-
-bool Hih6Read(void)
-{
-  Wire.beginTransmission(HIH6_ADDR);
-  if (Wire.endTransmission() != 0) { return false; }
-
-  delay(40);
-
-  uint8_t data[4];
-  Wire.requestFrom(HIH6_ADDR, 4);
-  if (4 == Wire.available()) {
-    data[0] = Wire.read();
-    data[1] = Wire.read();
-    data[2] = Wire.read();
-    data[3] = Wire.read();
-  } else { return false; }
-
-
-
-  Hih6.humidity = ConvertHumidity(((float)(((data[0] & 0x3F) << 8) | data[1]) * 100.0) / 16383.0);
-
-  int temp = ((data[2] << 8) | (data[3] & 0xFC)) / 4;
-  Hih6.temperature = ConvertTemp(((float)temp / 16384.0) * 165.0 - 40.0);
-
-  Hih6.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Hih6Detect(void)
-{
-  if (I2cActive(HIH6_ADDR)) { return; }
-
-  if (uptime < 2) { delay(20); }
-  Hih6.type = Hih6Read();
-  if (Hih6.type) {
-    I2cSetActiveFound(HIH6_ADDR, Hih6.types);
-  }
-}
-
-void Hih6EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!Hih6Read()) {
-      AddLogMissed(Hih6.types, Hih6.valid);
-    }
-  }
-}
-
-void Hih6Show(bool json)
-{
-  if (Hih6.valid) {
-    char temperature[33];
-    dtostrfd(Hih6.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Hih6.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Hih6.types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Hih6.temperature);
-        KnxSensor(KNX_HUMIDITY, Hih6.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Hih6.types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Hih6.types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns55(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_36)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Hih6Detect();
-  }
-  else if (Hih6.type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Hih6EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Hih6Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Hih6Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
-# 21 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
-#ifdef USE_HPMA
-# 31 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_56_hpma.ino"
-#define XSNS_56 56
-
-#include <hpma115S0.h>
-#include <TasmotaSerial.h>
-
-TasmotaSerial *HpmaSerial;
-HPMA115S0 *hpma115S0;
-
-uint8_t hpma_type = 1;
-uint8_t hpma_valid = 0;
-
-struct hpmadata {
-  unsigned int pm10;
-  unsigned int pm2_5;
-} hpma_data;
-
-
-
-void HpmaSecond(void)
-{
-  unsigned int pm2_5, pm10;
-
-
-
-
-  if (hpma115S0->ReadParticleMeasurement(&pm2_5, &pm10)) {
-    hpma_data.pm2_5 = pm2_5;
-    hpma_data.pm10 = pm10;
-    hpma_valid = 1;
-  }
-
-}
-
-void HpmaInit(void)
-{
-  hpma_type = 0;
-  if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
-    HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
-    hpma115S0 = new HPMA115S0(*HpmaSerial);
-
-    if (HpmaSerial->begin(9600)) {
-      if (HpmaSerial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      hpma_type = 1;
-      hpma115S0->Init();
-      hpma115S0->StartParticleMeasurement();
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_HPMA_SNS[] PROGMEM =
-  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#endif
-
-void HpmaShow(bool json)
-{
-  if (hpma_valid) {
-    char pm10[33];
-    snprintf_P(pm10, 33, PSTR("%d"), hpma_data.pm10);
-    char pm2_5[33];
-    snprintf_P(pm2_5, 33, PSTR("%d"), hpma_data.pm2_5);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"HPMA\":{\"PM2.5\":%d,\"PM10\":%d}"), hpma_data.pm2_5, hpma_data.pm10);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, pm2_5);
-        DomoticzSensor(DZ_CURRENT, pm10);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_HPMA_SNS, pm2_5, pm10);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns56(uint8_t function)
-{
-  bool result = false;
-
-  if (hpma_type) {
-    switch (function) {
-      case FUNC_INIT:
-        HpmaInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        HpmaSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_56 == XdrvMailbox.index) {
-          return true;
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        HpmaShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HpmaShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_57_tsl2591.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_57_tsl2591.ino"
-#ifdef USE_I2C
-#ifdef USE_TSL2591
-
-
-
-
-
-
-
-#define XSNS_57 57
-#define XI2C_40 40
-
-#define TSL2591_ADDRESS 0x29
-
-#include <Adafruit_TSL2591.h>
-
-Adafruit_TSL2591 tsl = Adafruit_TSL2591();
-
-uint8_t tsl2591_type = 0;
-uint8_t tsl2591_valid = 0;
-float tsl2591_lux = 0;
-
-void Tsl2591Init(void)
-{
-
-  if (I2cSetDevice(0x29)) {
-    if (tsl.begin()) {
-      tsl.setGain(TSL2591_GAIN_MED);
-      tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
-      tsl2591_type = 1;
-      I2cSetActiveFound(TSL2591_ADDRESS, "TSL2591");
-    }
-  }
-}
-
-bool Tsl2591Read(void)
-{
-  uint32_t lum = tsl.getFullLuminosity();
-  uint16_t ir, full;
-  ir = lum >> 16;
-  full = lum & 0xFFFF;
-  tsl2591_lux = tsl.calculateLux(full, ir);
-  tsl2591_valid = 1;
-}
-
-void Tsl2591EverySecond(void)
-{
-  Tsl2591Read();
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_TSL2591[] PROGMEM =
-  "{s}TSL2591 " D_ILLUMINANCE "{m}%s " D_UNIT_LUX "{e}";
-#endif
-
-void Tsl2591Show(bool json)
-{
-  if (tsl2591_valid) {
-    char lux_str[10];
-    dtostrf(tsl2591_lux, sizeof(lux_str)-1, 3, lux_str);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"TSL2591\":{\"" D_JSON_ILLUMINANCE "\":%s}"), lux_str);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, tsl2591_lux); }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TSL2591, lux_str);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns57(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_40)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Tsl2591Init();
-  }
-  else if (tsl2591_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Tsl2591EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Tsl2591Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tsl2591Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_58_dht12.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_58_dht12.ino"
-#ifdef USE_I2C
-#ifdef USE_DHT12
-
-
-
-
-
-
-#define XSNS_58 58
-#define XI2C_41 41
-
-#define DHT12_ADDR 0x5C
-
-struct DHT12 {
-  float temperature = NAN;
-  float humidity = NAN;
-  uint8_t valid = 0;
-  uint8_t count = 0;
-  char name[6] = "DHT12";
-} Dht12;
-
-bool Dht12Read(void)
-{
-  if (Dht12.valid) { Dht12.valid--; }
-
-  Wire.beginTransmission(DHT12_ADDR);
-  Wire.write(0);
-  if (Wire.endTransmission() != 0) { return false; }
-
-  delay(50);
-
-  Wire.requestFrom(DHT12_ADDR, 5);
-  delay(5);
-  uint8_t humidity = Wire.read();
-  uint8_t humidityTenth = Wire.read();
-  uint8_t temp = Wire.read();
-  uint8_t tempTenth = Wire.read();
-  uint8_t checksum = Wire.read();
-
-  Dht12.humidity = ConvertHumidity( (float) humidity + (float) humidityTenth/(float) 10.0 );
-  Dht12.temperature = ConvertTemp( (float) temp + (float) tempTenth/(float) 10.0 );
-
-  if (isnan(Dht12.temperature) || isnan(Dht12.humidity)) { return false; }
-
-  Dht12.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Dht12Detect(void)
-{
-  if (I2cActive(DHT12_ADDR)) { return; }
-
-  if (Dht12Read()) {
-    I2cSetActiveFound(DHT12_ADDR, Dht12.name);
-    Dht12.count = 1;
-  }
-}
-
-void Dht12EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!Dht12Read()) {
-      AddLogMissed(Dht12.name, Dht12.valid);
-    }
-  }
-}
-
-void Dht12Show(bool json)
-{
-  if (Dht12.valid) {
-    char temperature[33];
-    dtostrfd(Dht12.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht12.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht12.name, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Dht12.temperature);
-        KnxSensor(KNX_HUMIDITY, Dht12.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht12.name, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht12.name, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns58(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_41)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Dht12Detect();
-  }
-  else if (Dht12.count) {
-    switch (function) {
-    case FUNC_EVERY_SECOND:
-      Dht12EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      Dht12Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Dht12Show(0);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_59_ds1624.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_59_ds1624.ino"
-#ifdef USE_I2C
-#ifdef USE_DS1624
-
-
-
-
-
-
-
-#define XSNS_59 59
-#define XI2C_42 42
-
-#define DS1624_MEM_REGISTER 0x17
-#define DS1624_CONF_REGISTER 0xAC
-#define DS1624_TEMP_REGISTER 0xAA
-#define DS1624_START_REGISTER 0xEE
-#define DS1624_STOP_REGISTER 0x22
-
-#define DS1621_COUNTER_REGISTER 0xA8
-#define DS1621_SLOPE_REGISTER 0xA9
-
-#define DS1621_CFG_1SHOT (1<<0)
-#define DS1621_CFG_DONE (1<<7)
-
-enum {
-  DS1624_TYPE_DS1624,
-  DS1624_TYPE_DS1621
-};
-
-#define DS1624_MAX_SENSORS 8
-
-bool ds1624_init = false;
-
-struct {
-  float value;
-  uint8_t type;
-  int errcnt;
-  int misscnt;
-  bool valid;
-  char name[9];
-} ds1624_sns[DS1624_MAX_SENSORS];
-
-uint32_t DS1624_Idx2Addr(uint32_t idx) {
-  return 0x48 + idx;
-}
-
-int DS1624_Restart(uint8_t config, uint32_t idx) {
-  uint32_t addr = DS1624_Idx2Addr(idx);
-  if ((config & 1) == 1) {
-    config &= ~(DS1621_CFG_DONE|DS1621_CFG_1SHOT);
-    I2cWrite8(addr, DS1624_CONF_REGISTER, config);
-    delay(10);
-    AddLog_P2(LOG_LEVEL_ERROR, "%s addr %x is reset, reconfig: %x", ds1624_sns[idx].name, addr, config);
-  }
-  I2cValidRead(addr, DS1624_START_REGISTER, 1);
-}
-
-void DS1624_HotPlugUp(uint32_t idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-
-  if (I2cActive(addr)) { return; }
-  if (!I2cSetDevice(addr)) { return; }
-
-  uint8_t config;
-  if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
-    uint8_t tmp;
-    ds1624_sns[idx].type = (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER)) ? DS1624_TYPE_DS1624 : DS1624_TYPE_DS1621;
-
-    snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS162%c%c%d"),
-      (ds1624_sns[idx].type == DS1624_TYPE_DS1621) ? '1' : '4', IndexSeparator(), idx);
-    I2cSetActiveFound(addr, ds1624_sns[idx].name);
-
-    ds1624_sns[idx].valid = true;
-    ds1624_sns[idx].errcnt = 0;
-    ds1624_sns[idx].misscnt = 0;
-    DS1624_Restart(config,idx);
-    AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
-  }
-}
-
-void DS1624_HotPlugDown(int idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-  if (!I2cActive(addr)) { return; }
-  I2cResetActive(addr);
-  ds1624_sns[idx].valid = false;
-  AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
-}
-
-bool DS1624GetTemp(float *value, int idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-
-  uint8_t config;
-  if (!I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
-    ds1624_sns[idx].misscnt++;
-    AddLog_P2(LOG_LEVEL_INFO, "%s device missing (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].misscnt);
-    return false;
-  }
-  ds1624_sns[idx].misscnt=0;
-  if (config & (DS1621_CFG_1SHOT|DS1621_CFG_DONE)) {
-    ds1624_sns[idx].errcnt++;
-    AddLog_P2(LOG_LEVEL_INFO, "%s config error, restart... (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].errcnt);
-    DS1624_Restart(config, idx);
-    return false;
-  }
-
-  uint16_t t;
-  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
-  if (ds1624_sns[idx].type == DS1624_TYPE_DS1624) {
-    *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
-  } else {
-
-    *value = ((float)(int8_t)(t>>8));
-    uint8_t remain;
-    if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
-    uint8_t perc;
-    if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
-    float fix=(float)(perc - remain)/(float)perc;
-    *value+=fix;
-  }
-  ds1624_sns[idx].errcnt=0;
-  config &= ~(DS1621_CFG_DONE);
-  I2cWrite8(addr, DS1624_CONF_REGISTER, config);
-  return true;
-}
-
-void DS1624HotPlugScan(void)
-{
-  uint16_t t;
-
-  for (uint32_t idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
-    uint32_t addr = DS1624_Idx2Addr(idx);
-    if (I2cActive(addr) && !ds1624_sns[idx].valid) {
-      continue;
-    }
-    if (ds1624_sns[idx].valid) {
-      if ((ds1624_sns[idx].misscnt>2)||(ds1624_sns[idx].errcnt>2)) {
-        DS1624_HotPlugDown(idx);
-        continue;
-      }
-    }
-    DS1624_HotPlugUp(idx);
-  }
-}
-
-void DS1624EverySecond(void)
-{
-  float t;
-  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (!ds1624_sns[i].valid) { continue; }
-    if (!DS1624GetTemp(&t, i)) { continue; }
-    ds1624_sns[i].value = ConvertTemp(t);
-  }
-}
-
-void DS1624Show(bool json)
-{
-  char temperature[33];
-  bool once = true;
-
-  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (!ds1624_sns[i].valid) { continue; }
-
-    dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
-      if ((0 == tele_period) && once) {
-#ifdef USE_DOMOTICZ
-        DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_KNX
-        KnxSensor(KNX_TEMPERATURE, temperature);
-#endif
-        once = false;
-      }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns59(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_42)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    if (!ds1624_init) {
-      memset(ds1624_sns, 0, sizeof(ds1624_sns));
-      ds1624_init = true;
-      DS1624HotPlugScan();
-    }
-  }
-  switch (function) {
-    case FUNC_HOTPLUG_SCAN:
-      DS1624HotPlugScan();
-      break;
-    case FUNC_EVERY_SECOND:
-      DS1624EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      DS1624Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      DS1624Show(0);
-      break;
-#endif
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
-#ifdef USE_GPS
-# 113 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_60_GPS.ino"
-#define XSNS_60 60
-
-#include "NTPServer.h"
-#include "NTPPacket.h"
-
-
-
-
-
-#define D_CMND_UBX "UBX"
-
-const char S_JSON_UBX_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_UBX "%s\":%d}";
-
-const char kUBXTypes[] PROGMEM = "UBX";
-
-#define UBX_LAT_LON_THRESHOLD 1000
-
-#define UBX_SERIAL_BUFFER_SIZE 256
-#define UBX_TCP_PORT 1234
-
-
-
-
-
-const char UBLOX_INIT[] PROGMEM = {
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x24,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x2B,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x02,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x32,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x39,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x04,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x40,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x05,0x00,0x00,0x00,0x00,0x00,0x01,0x05,0x47,
-
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xDC,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xB9,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0xC0,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92,
-
-
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x13,0xBE,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x01,0x00,0x00,0x00,0x00,0x14,0xC5,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97,
-
-
-
-
-
-
-};
-
-char UBX_name[4];
-
-struct UBX_t {
-  const char UBX_HEADER[2] = { 0xB5, 0x62 };
-  const char NAV_POSLLH_HEADER[2] = { 0x01, 0x02 };
-  const char NAV_STATUS_HEADER[2] = { 0x01, 0x03 };
-  const char NAV_TIME_HEADER[2] = { 0x01, 0x21 };
-
-  struct entry_t {
-          int32_t lat;
-          int32_t lon;
-          uint32_t time;
-    };
-
-  union {
-    entry_t values;
-    uint8_t bytes[sizeof(entry_t)];
-    } rec_buffer;
-
-  struct POLL_MSG {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t zero;
-  };
-
-  struct NAV_POSLLH {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    int32_t lon;
-    int32_t lat;
-    int32_t alt;
-    int32_t hMSL;
-    uint32_t hAcc;
-    uint32_t vAcc;
-    };
-
-  struct NAV_STATUS {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    uint8_t gpsFix;
-    uint8_t flags;
-    uint8_t fixStat;
-    uint8_t flags2;
-    uint32_t ttff;
-    uint32_t msss;
-    };
-
-  struct NAV_TIME_UTC {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    uint32_t tAcc;
-    int32_t nano;
-    uint16_t year;
-    uint8_t month;
-    uint8_t day;
-    uint8_t hour;
-    uint8_t min;
-    uint8_t sec;
-    struct {
-      uint8_t UTC:1;
-      uint8_t WKN:1;
-      uint8_t TOW:1;
-      uint8_t padding:5;
-      } valid;
-    };
-
-  struct CFG_RATE {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint16_t measRate;
-    uint16_t navRate;
-    uint16_t timeRef;
-    char CK[2];
-    };
-
-  struct {
-    uint32_t last_iTOW;
-    int32_t last_alt;
-    uint32_t last_hAcc;
-    uint32_t last_vAcc;
-    uint8_t gpsFix;
-    uint8_t non_empty_loops;
-    uint16_t log_interval;
-  } state;
-
-  struct {
-    uint32_t init:1;
-    uint32_t filter_noise:1;
-    uint32_t send_when_new:1;
-    uint32_t send_UI_only:1;
-    uint32_t runningNTP:1;
-    uint32_t forceUTCupdate:1;
-    uint32_t runningVPort:1;
-
-  } mode;
-
-  union {
-    NAV_POSLLH navPosllh;
-    NAV_STATUS navStatus;
-    NAV_TIME_UTC navTime;
-    POLL_MSG pollMsg;
-    CFG_RATE cfgRate;
-    } Message;
-
-  uint8_t TCPbuf[UBX_SERIAL_BUFFER_SIZE];
-  size_t TCPbufSize;
-} UBX;
-
-enum UBXMsgType {
-  MT_NONE,
-  MT_NAV_POSLLH,
-  MT_NAV_STATUS,
-  MT_NAV_TIME,
-  MT_POLL
-};
-
-#ifdef USE_FLOG
-FLOG *Flog = nullptr;
-#endif
-TasmotaSerial *UBXSerial;
-
-NtpServer timeServer(PortUdp);
-
-WiFiServer vPortServer(UBX_TCP_PORT);
-WiFiClient vPortClient;
-
-
-
-
-
-void UBXcalcChecksum(char* CK, size_t msgSize)
-{
-  memset(CK, 0, 2);
-  for (int i = 0; i < msgSize; i++) {
-    CK[0] += ((char*)(&UBX.Message))[i];
-    CK[1] += CK[0];
-  }
-}
-
-bool UBXcompareMsgHeader(const char* msgHeader)
-{
-  char* ptr = (char*)(&UBX.Message);
-  return ptr[0] == msgHeader[0] && ptr[1] == msgHeader[1];
-}
-
-void UBXinitCFG(void)
-{
-  for (uint32_t i = 0; i < sizeof(UBLOX_INIT); i++) {
-    UBXSerial->write( pgm_read_byte(UBLOX_INIT+i) );
-  }
-  DEBUG_SENSOR_LOG(PSTR("UBX: turn off NMEA"));
-}
-
-void UBXTriggerTele(void)
-{
-  mqtt_data[0] = '\0';
-  if (MqttShowSensor()) {
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-#ifdef USE_RULES
-    RulesTeleperiod();
-#endif
-  }
-}
-
-
-
-void UBXDetect(void)
-{
-  UBX.mode.init = 0;
-  if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
-    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, UBX_SERIAL_BUFFER_SIZE);
-    if (UBXSerial->begin(9600)) {
-      DEBUG_SENSOR_LOG(PSTR("UBX: started serial"));
-      if (UBXSerial->hardwareSerial()) {
-        ClaimSerial();
-        DEBUG_SENSOR_LOG(PSTR("UBX: claim HW"));
-      }
-    }
-  }
-  else {
-    return;
-  }
-
-  UBXinitCFG();
-  UBX.mode.init = 1;
-
-#ifdef USE_FLOG
-  if (!Flog) {
-    Flog = new FLOG;
-    Flog->init();
-  }
-#endif
-
-  UBX.state.log_interval = 10;
-  UBX.mode.send_UI_only = true;
-  UBXTriggerTele();
-}
-
-uint32_t UBXprocessGPS()
-{
-  static uint32_t fpos = 0;
-  static char checksum[2];
-  static uint8_t currentMsgType = MT_NONE;
-  static size_t payloadSize = sizeof(UBX.Message);
-
-
-  uint32_t data_bytes = 0;
-  while ( UBXSerial->available() ) {
-    data_bytes++;
-    byte c = UBXSerial->read();
-    if (UBX.mode.runningVPort){
-      UBX.TCPbuf[data_bytes-1] = c;
-      UBX.TCPbufSize = data_bytes;
-    }
-    if ( fpos < 2 ) {
-
-      if ( c == UBX.UBX_HEADER[fpos] ) {
-        fpos++;
-      } else {
-        fpos = 0;
-      }
-    } else {
-
-
-
-
-
-      if ( (fpos-2) < payloadSize ) {
-        ((char*)(&UBX.Message))[fpos-2] = c;
-      }
-      fpos++;
-
-      if ( fpos == 4 ) {
-
-
-        if ( UBXcompareMsgHeader(UBX.NAV_POSLLH_HEADER) ) {
-          currentMsgType = MT_NAV_POSLLH;
-          payloadSize = sizeof(UBX_t::NAV_POSLLH);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_POSLLH"));
-        }
-        else if ( UBXcompareMsgHeader(UBX.NAV_STATUS_HEADER) ) {
-          currentMsgType = MT_NAV_STATUS;
-          payloadSize = sizeof(UBX_t::NAV_STATUS);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_STATUS"));
-        }
-        else if ( UBXcompareMsgHeader(UBX.NAV_TIME_HEADER) ) {
-          currentMsgType = MT_NAV_TIME;
-          payloadSize = sizeof(UBX_t::NAV_TIME_UTC);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_TIME_UTC"));
-        }
-        else {
-
-          fpos = 0;
-          continue;
-        }
-      }
-
-      if ( fpos == (payloadSize+2) ) {
-
-
-        UBXcalcChecksum(checksum, payloadSize);
-      }
-      else if ( fpos == (payloadSize+3) ) {
-
-
-        if ( c != checksum[0] ) {
-
-          fpos = 0;
-        }
-      }
-      else if ( fpos == (payloadSize+4) ) {
-
-
-        fpos = 0;
-        if ( c == checksum[1] ) {
-
-          return currentMsgType;
-        }
-      }
-      else if ( fpos > (payloadSize+4) ) {
-
-
-        fpos = 0;
-      }
-    }
-  }
-
-  if (data_bytes!=0) {
-    UBX.state.non_empty_loops++;
-    DEBUG_SENSOR_LOG(PSTR("UBX: got %u bytes, non-empty-loop: %u"), data_bytes, UBX.state.non_empty_loops);
-  } else {
-    UBX.state.non_empty_loops = 0;
-  }
-  return MT_NONE;
-}
-
-
-
-
-
-#ifdef USE_FLOG
-void UBXsendHeader(void)
-{
-  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-  WebServer->sendHeader(F("Content-Disposition"), F("attachment; filename=TASMOTA.gpx"));
-  WSSend(200, CT_STREAM, F(
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\r\n"
-    "<GPX version=\"1.1\" creator=\"TASMOTA\" xmlns=\"http://www.topografix.com/GPX/1/1\" \r\n"
-    "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n"
-    "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\r\n"
-    "<trk>\r\n<trkseg>\r\n"));
-}
-
-void UBXsendRecord(uint8_t *buf)
-{
- char record[100];
- char stime[32];
- UBX_t::entry_t *entry = (UBX_t::entry_t*)buf;
- snprintf_P(stime, sizeof(stime), GetDT(entry->time).c_str());
- char lat[12];
- char lon[12];
- dtostrfd((double)entry->lat/10000000.0f,7,lat);
- dtostrfd((double)entry->lon/10000000.0f,7,lon);
- snprintf_P(record, sizeof(record),PSTR("<trkpt\n\t lat=\"%s\" lon=\"%s\">\n\t<time>%s</time>\n</trkpt>\n"),lat ,lon, stime);
-
- WebServer->sendContent_P(record);
-}
-
-void UBXsendFooter(void)
-{
-  WebServer->sendContent(F("</trkseg>\n</trk>\n</gpx>"));
-  WebServer->sendContent("");
-  Rtc.user_time_entry = false;
-}
-
-
-
-void UBXsendFile(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-  Flog->startDownload(sizeof(UBX.rec_buffer),UBXsendHeader,UBXsendRecord,UBXsendFooter);
-}
-#endif
-
-
-
-void UBXSetRate(uint16_t interval)
-{
-  UBX.Message.cfgRate.cls = 0x06;
-  UBX.Message.cfgRate.id = 0x08;
-  UBX.Message.cfgRate.len = 6;
-  uint32_t measRate = (1000*(uint32_t)interval);
-  if (measRate > 0xffff) {
-    measRate = 0xffff;
-  }
-  UBX.Message.cfgRate.measRate = (uint16_t)measRate;
-  UBX.Message.cfgRate.navRate = 1;
-  UBX.Message.cfgRate.timeRef = 1;
-  UBXcalcChecksum(UBX.Message.cfgRate.CK, sizeof(UBX.Message.cfgRate)-sizeof(UBX.Message.cfgRate.CK));
-  DEBUG_SENSOR_LOG(PSTR("UBX: requested interval: %u seconds measRate: %u ms"), interval, UBX.Message.cfgRate.measRate);
-  UBXSerial->write(UBX.UBX_HEADER[0]);
-  UBXSerial->write(UBX.UBX_HEADER[1]);
-  for (uint32_t i =0; i<sizeof(UBX.Message.cfgRate); i++) {
-    UBXSerial->write(((uint8_t*)(&UBX.Message.cfgRate))[i]);
-    DEBUG_SENSOR_LOG(PSTR("UBX: cfgRate byte %u: %x"), i, ((uint8_t*)(&UBX.Message.cfgRate))[i]);
-  }
-  UBX.state.log_interval = 10*interval;
-}
-
-void UBXSelectMode(uint16_t mode)
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: set mode to %u"),mode);
-  switch(mode){
-#ifdef USE_FLOG
-    case 0:
-      Flog->mode = 0;
-      break;
-    case 1:
-      Flog->mode = 1;
-      break;
-    case 2:
-      UBX.mode.filter_noise = true;
-      break;
-    case 3:
-      UBX.mode.filter_noise = false;
-      break;
-    case 4:
-      Flog->startRecording(true);
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - appending"));
-      break;
-    case 5:
-      Flog->startRecording(false);
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - new log"));
-      break;
-    case 6:
-      if(Flog->recording == true){
-        Flog->stopRecording();
-      }
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: stop recording"));
-      break;
-#endif
-    case 7:
-      UBX.mode.send_when_new = 1;
-      break;
-    case 8:
-      UBX.mode.send_when_new = 0;
-      break;
-    case 9:
-      if (timeServer.beginListening()) {
-        UBX.mode.runningNTP = true;
-      }
-      break;
-    case 10:
-      UBX.mode.runningNTP = false;
-      break;
-    case 11:
-      UBX.mode.forceUTCupdate = true;
-      break;
-    case 12:
-      UBX.mode.forceUTCupdate = false;
-      break;
-    case 13:
-      Settings.latitude = UBX.rec_buffer.values.lat/10;
-      Settings.longitude = UBX.rec_buffer.values.lon/10;
-      break;
-    case 14:
-      vPortServer.begin();
-      UBX.mode.runningVPort = 1;
-      break;
-    case 15:
-
-      UBX.mode.runningVPort = 0;
-      break;
-    default:
-      if (mode>1000 && mode <1066) {
-
-        UBXSetRate(mode-1000);
-      }
-      break;
-  }
-  UBX.mode.send_UI_only = true;
-  UBXTriggerTele();
-}
-
-
-
-bool UBXHandlePOSLLH()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: iTOW: %u"),UBX.Message.navPosllh.iTOW);
-  if (UBX.state.gpsFix>1) {
-    if (UBX.mode.filter_noise) {
-      if ((UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat<abs(UBX_LAT_LON_THRESHOLD))||(UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon<abs(UBX_LAT_LON_THRESHOLD))) {
-        DEBUG_SENSOR_LOG(PSTR("UBX: Diff lat: %u lon: %u "),UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat, UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon);
-        return false;
-      }
-    }
-    UBX.rec_buffer.values.lat = UBX.Message.navPosllh.lat;
-    UBX.rec_buffer.values.lon = UBX.Message.navPosllh.lon;
-    DEBUG_SENSOR_LOG(PSTR("UBX: lat/lon: %i / %i"), UBX.rec_buffer.values.lat, UBX.rec_buffer.values.lon);
-    DEBUG_SENSOR_LOG(PSTR("UBX: hAcc: %d"), UBX.Message.navPosllh.hAcc);
-    UBX.state.last_iTOW = UBX.Message.navPosllh.iTOW;
-    UBX.state.last_alt = UBX.Message.navPosllh.alt;
-    UBX.state.last_vAcc = UBX.Message.navPosllh.vAcc;
-    UBX.state.last_hAcc = UBX.Message.navPosllh.hAcc;
-    if (UBX.mode.send_when_new) {
-      UBXTriggerTele();
-    }
-    return true;
-  } else {
-    DEBUG_SENSOR_LOG(PSTR("UBX: no valid position data"));
-  }
-  return false;
-}
-
-void UBXHandleSTATUS()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: gpsFix: %u, valid: %u"), UBX.Message.navStatus.gpsFix, (UBX.Message.navStatus.flags)&1);
-  if ((UBX.Message.navStatus.flags)&1) {
-    UBX.state.gpsFix = UBX.Message.navStatus.gpsFix;
-  } else {
-    UBX.state.gpsFix = 0;
-  }
-}
-
-void UBXHandleTIME()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time: %u-%u-%u %u:%u:%u"), UBX.Message.navTime.year, UBX.Message.navTime.month ,UBX.Message.navTime.day,UBX.Message.navTime.hour,UBX.Message.navTime.min,UBX.Message.navTime.sec);
-  if (UBX.Message.navTime.valid.UTC == 1) {
-    DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time is valid"));
-    if (Rtc.user_time_entry == false || UBX.mode.forceUTCupdate) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: UTC-Time is valid, set system time"));
-      TIME_T gpsTime;
-      gpsTime.year = UBX.Message.navTime.year - 1970;
-      gpsTime.month = UBX.Message.navTime.month;
-      gpsTime.day_of_month = UBX.Message.navTime.day;
-      gpsTime.hour = UBX.Message.navTime.hour;
-      gpsTime.minute = UBX.Message.navTime.min;
-      gpsTime.second = UBX.Message.navTime.sec;
-      Rtc.utc_time = MakeTime(gpsTime);
-      Rtc.user_time_entry = true;
-    }
-  }
-}
-
-void UBXHandleOther(void)
-{
-  if (UBX.state.non_empty_loops>6) {
-    if(UBX.mode.runningVPort) return;
-    UBXinitCFG();
-    AddLog_P(LOG_LEVEL_ERROR, PSTR("UBX: possible device-reset, will re-init"));
-    UBXSerial->flush();
-    UBX.state.non_empty_loops = 0;
-  }
-}
-
-
-
-void UBXLoop50msec(void)
-{
-
-  if (UBX.mode.runningVPort){
-    if(!vPortClient.connected()) {
-      vPortClient = vPortServer.available();
-    }
-    while(vPortClient.available()) {
-      byte _newByte = vPortClient.read();
-      UBXSerial->write(_newByte);
-    }
-
-    if (UBX.TCPbufSize!=0){
-      vPortClient.write((char*)UBX.TCPbuf, UBX.TCPbufSize);
-      UBX.TCPbufSize = 0;
-    }
-  }
-
-  if(UBX.mode.runningNTP){
-    timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
-  }
-}
-
-void UBXLoop(void)
-{
-  static uint16_t counter;
-  static bool new_position;
-
-  uint32_t msgType = UBXprocessGPS();
-
-  switch(msgType){
-    case MT_NAV_POSLLH:
-      new_position = UBXHandlePOSLLH();
-      break;
-    case MT_NAV_STATUS:
-      UBXHandleSTATUS();
-      break;
-    case MT_NAV_TIME:
-      UBXHandleTIME();
-      break;
-    default:
-      UBXHandleOther();
-      break;
-  }
-
-#ifdef USE_FLOG
-  if (counter>UBX.state.log_interval) {
-    if (Flog->recording && new_position) {
-      UBX.rec_buffer.values.time = Rtc.local_time;
-      Flog->addToBuffer(UBX.rec_buffer.bytes, sizeof(UBX.rec_buffer.bytes));
-      counter = 0;
-    }
-  }
-#endif
-
-  counter++;
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-
-#ifdef USE_FLOG
-#ifdef DEBUG_TASMOTA_SENSOR
-  const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} FLOG with %u sectors: {m}%u bytes{e}"
-                                          "{s} FLOG next sector for REC: {m} %u {e}"
-                                          "{s} %u sector(s) with data at sector: {m} %u {e}";
-  const char HTTP_SNS_FLOGREC[] PROGMEM = "{s} RECORDING (bytes in buffer) {m}%u{e}";
-#endif
-
-  const char HTTP_SNS_FLOG[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} Flash-Log {m} %s{e}";
-  const char kFLOG_STATE0[] PROGMEM = "ready";
-  const char kFLOG_STATE1[] PROGMEM = "recording";
-  const char * kFLOG_STATE[] ={kFLOG_STATE0, kFLOG_STATE1};
-
-  const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>";
-
-#endif
-  const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s} NTP server {m}active{e}";
-
-  const char HTTP_SNS_GPS[] PROGMEM = "{s} GPS latitude {m}%s{e}"
-                                      "{s} GPS longitude {m}%s{e}"
-                                      "{s} GPS altitude {m}%s   m{e}"
-                                      "{s} GPS hor. Accuracy {m}%s   m{e}"
-                                      "{s} GPS vert. Accuracy {m}%s   m{e}"
-                                      "{s} GPS sat-fix status {m}%s{e}";
-
-  const char kGPSFix0[] PROGMEM = "no fix";
-  const char kGPSFix1[] PROGMEM = "dead reckoning only";
-  const char kGPSFix2[] PROGMEM = "2D-fix";
-  const char kGPSFix3[] PROGMEM = "3D-fix";
-  const char kGPSFix4[] PROGMEM = "GPS + dead reckoning combined";
-  const char kGPSFix5[] PROGMEM = "Time only fix";
-  const char * kGPSFix[] PROGMEM ={kGPSFix0, kGPSFix1, kGPSFix2, kGPSFix3, kGPSFix4, kGPSFix5};
-
-
-
-
-#endif
-
-
-
-void UBXShow(bool json)
-{
-  char lat[12];
-  char lon[12];
-  char alt[12];
-  char hAcc[12];
-  char vAcc[12];
-  dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
-  dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
-  dtostrfd((double)UBX.state.last_alt/1000.0f,3,alt);
-  dtostrfd((double)UBX.state.last_vAcc/1000.0f,3,hAcc);
-  dtostrfd((double)UBX.state.last_hAcc/1000.0f,3,vAcc);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"GPS\":{"));
-    if (UBX.mode.send_UI_only) {
-      uint32_t i = UBX.state.log_interval / 10;
-      ResponseAppend_P(PSTR("\"fil\":%u,\"int\":%u}"), UBX.mode.filter_noise, i);
-    } else {
-      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"alt\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, alt, hAcc, vAcc);
-    }
-#ifdef USE_FLOG
-    ResponseAppend_P(PSTR(",\"FLOG\":{\"rec\":%u,\"mode\":%u,\"sec\":%u}"), Flog->recording, Flog->mode, Flog->sectors_left);
-#endif
-    UBX.mode.send_UI_only = false;
-#ifdef USE_WEBSERVER
-  } else {
-      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, alt, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
-
-#ifdef DEBUG_TASMOTA_SENSOR
-#ifdef USE_FLOG
-    WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector);
-    if (Flog->recording) {
-      WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8);
-    }
-#endif
-#endif
-#ifdef USE_FLOG
-    if (Flog->ready) {
-      WSContentSend_P(HTTP_SNS_FLOG,kFLOG_STATE[Flog->recording]);
-    }
-    if (!Flog->recording && Flog->found_saved_data) {
-      WSContentSend_P(HTTP_BTN_FLOG_DL);
-    }
-#endif
-    if (UBX.mode.runningNTP) {
-      WSContentSend_P(HTTP_SNS_NTPSERVER);
-    }
-#endif
-  }
-}
-
-
-
-
-
-bool UBXCmd(void)
-{
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-    UBXSelectMode(XdrvMailbox.payload);
-    Response_P(S_JSON_UBX_COMMAND_NVALUE, XdrvMailbox.command, XdrvMailbox.payload);
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns60(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    UBXDetect();
-  }
-
-  if (UBX.mode.init) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_60 == XdrvMailbox.index) {
-          result = UBXCmd();
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        UBXLoop50msec();
-        break;
-      case FUNC_EVERY_100_MSECOND:
-#ifdef USE_FLOG
-        if (!Flog->running_download)
-#endif
-        {
-          UBXLoop();
-        }
-        break;
-#ifdef USE_FLOG
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/UBX", UBXsendFile);
-        break;
-#endif
-      case FUNC_JSON_APPEND:
-        UBXShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-#ifdef USE_FLOG
-        if (!Flog->running_download)
-#endif
-        {
-          UBXShow(0);
-        }
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-# 35 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-#ifdef USE_SPI
-#ifdef USE_NRF24
-#ifdef USE_MIBLE
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  #define MINRF_LOG_BUFFER(x) MINRFshowBuffer(x);
-#else
-  #define MINRF_LOG_BUFFER(x)
-#endif
-# 53 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-#define XSNS_61 61
-
-#include <vector>
-
-#define FLORA 1
-#define MJ_HT_V1 2
-#define LYWSD02 3
-#define LYWSD03 4
-
-uint8_t kMINRFSlaveID[4][3] = { 0xC4,0x7C,0x8D,
-                                0x58,0x2D,0x34,
-                                0xE7,0x2E,0x00,
-                                0xA4,0xC1,0x38,
-                                };
-
-const char kMINRFSlaveType1[] PROGMEM = "Flora";
-const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
-const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
-const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
-const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4};
-
-
-const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
-const uint32_t kMINRFMJPDU[3] = {0x4760cd66,0xdbcc0cd3,0x33048df5};
-const uint32_t kMINRFL2PDU[3] = {0x3eaa057d,0xef3b0730,0x71da7646};
-
-const uint32_t kMINRFL3PDU[3] = {0x4760cb78,0xdbcc0acd,0x33048beb};
-
-
-const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};
-const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};
-
-
-#pragma pack(1)
-struct MJ_HT_V1Header_t {
-  uint8_t padding[3];
-  uint8_t mesSize;
-  uint8_t padding2;
-  uint16_t uuid;
-  uint16_t type;
-  uint8_t padding3[2];
-  uint8_t counter;
-  uint8_t serial[6];
-  uint8_t mode;
-  uint8_t padding5;
-  uint8_t effectiveDataLength;
-  };
-
-struct FlowerHeader_t {
-  uint8_t padding[4];
-  uint8_t padding2;
-  uint16_t uuid;
-  uint8_t mesSize;
-  uint8_t padding22;
-  uint16_t uuid2;
-  uint16_t type;
-  uint8_t padding3[2];
-  uint8_t counter;
-  uint8_t serial[6];
-  uint8_t padding4;
-  uint8_t mode;
-  };
-
-union floraPacket_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } T;
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint32_t data:24;
-  } L;
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint8_t data;
-  } M;
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } F;
-};
-
-union MJ_HT_V1Packet_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t temp;
-      uint16_t hum;
-  } TH;
-      struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint8_t battery;
-  } B;
-
-};
-
-union LYWSD02Packet_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } TH;
-};
-
-struct bleAdvPacket_t {
-  uint8_t pduType;
-  uint8_t payloadSize;
-  uint8_t mac[6];
-  union {
-    uint8_t payload[24];
-    MJ_HT_V1Header_t header;
-    FlowerHeader_t flowerHeader;
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-        uint8_t hum_lb;
-    } TH;
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-    } T;
-    struct {
-        uint8_t padding[21];
-        uint16_t hum;
-    } H;
-    struct {
-        uint8_t padding[21];
-        uint8_t battery;
-    } B;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-    } F_T;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-        uint8_t data2;
-    } F_L;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint8_t data;
-    } F_M;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-    } F_F;
-  };
-};
-
-union FIFO_t{
-  bleAdvPacket_t bleAdv;
-  floraPacket_t floraPacket;
-  MJ_HT_V1Packet_t MJ_HT_V1Packet;
-  LYWSD02Packet_t LYWSD02Packet;
-  uint8_t raw[32];
-};
-
-#pragma pack(0)
-
-struct {
-  const uint8_t channel[3] = {37,38,39};
-  const uint8_t frequency[3] = { 2,26,80};
-
-  uint16_t timer;
-  uint8_t currentChan=0;
-  FIFO_t buffer;
-  uint8_t packetMode;
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  uint8_t streamBuffer[sizeof(buffer)];
-  uint8_t lsfrBuffer[sizeof(buffer)];
-#endif
-
-} MINRF;
-
-struct mi_sensor_t{
-  uint8_t type;
-  uint8_t serial[6];
-  uint8_t showedUp;
-  float temp;
-  union {
-    struct {
-      float moisture;
-      float fertility;
-      uint32_t lux;
-    };
-    struct {
-      float hum;
-      uint8_t bat;
-    };
-  };
-};
-
-std::vector<mi_sensor_t> MIBLEsensors;
-
-
-
-
-bool MINRFinitBLE(uint8_t _mode)
-{
-  if (MINRF.timer%1000 == 0){
-    NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
-    NRF24radio.setAutoAck(false);
-    NRF24radio.setDataRate(RF24_1MBPS);
-    NRF24radio.disableCRC();
-    NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
-    NRF24radio.setRetries(0,0);
-    NRF24radio.setPALevel(RF24_PA_MIN);
-    NRF24radio.setAddressWidth(4);
-
-
-    NRF24radio.powerUp();
-  }
-  if(NRF24radio.isChipConnected()){
-
-    MINRFchangePacketModeTo(_mode);
-    return true;
-  }
-
-  return false;
-}
-
-void MINRFhopChannel()
-{
-  MINRF.currentChan++;
-  if(MINRF.currentChan >= sizeof(MINRF.channel)) {
-    MINRF.currentChan = 0;
-  }
-  NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
-}
-
-
-
-
-
-
-
-bool MINRFreceivePacket(void)
-{
-  if(!NRF24radio.available()) {
-    return false;
-  }
-  while(NRF24radio.available()) {
-
-
-    NRF24radio.read( &MINRF.buffer, sizeof(MINRF.buffer) );
-#ifdef DEBUG_TASMOTA_SENSOR
-    memcpy(&MINRF.streamBuffer, &MINRF.buffer, sizeof(MINRF.buffer));
-#endif
-    MINRFswapbuf( sizeof(MINRF.buffer) );
-
-
-
-    switch (MINRF.packetMode) {
-      case 0:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), MINRF.channel[MINRF.currentChan] | 0x40);
-      break;
-      case 1:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
-      break;
-      case 2:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
-      break;
-      case 3:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
-      break;
-      case 4:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
-      break;
-    }
-
-
-  }
-
-  return true;
-}
-
-#ifdef DEBUG_TASMOTA_SENSOR
-void MINRFshowBuffer(uint8_t (&buf)[32]){
-
-
-
-
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
-  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
-  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
-  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
-  );
-}
-#endif
-
-
-
-
-
-
-void MINRFswapbuf(uint8_t len)
-{
-  uint8_t* buf = (uint8_t*)&MINRF.buffer;
-  while(len--) {
-    uint8_t a = *buf;
-    uint8_t v = 0;
-    if (a & 0x80) v |= 0x01;
-    if (a & 0x40) v |= 0x02;
-    if (a & 0x20) v |= 0x04;
-    if (a & 0x10) v |= 0x08;
-    if (a & 0x08) v |= 0x10;
-    if (a & 0x04) v |= 0x20;
-    if (a & 0x02) v |= 0x40;
-    if (a & 0x01) v |= 0x80;
-    *(buf++) = v;
-  }
-}
-# 420 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
-{
-  while(len--) {
-    uint8_t res = 0;
-
-    for (uint8_t i = 1; i; i <<= 1) {
-      if (lfsr & 0x01) {
-        lfsr ^= 0x88;
-        res |= i;
-      }
-      lfsr >>= 1;
-    }
-    *(buf++) ^= res;
-#ifdef DEBUG_TASMOTA_SENSOR
-    MINRF.lsfrBuffer[31-len] = lfsr;
-#endif
-  }
-}
-
-void MINRFreverseMAC(uint8_t _mac[]){
-  uint8_t _reversedMAC[6];
-  for (uint8_t i=0; i<6; i++){
-    _reversedMAC[5-i] = _mac[i];
-  }
-  memcpy(_mac,_reversedMAC, sizeof(_reversedMAC));
-}
-
-
-
-
-
-
-void MINRFchangePacketModeTo(uint8_t _mode) {
-  uint32_t (_nextchannel) = MINRF.currentChan+1;
-  if (_nextchannel>2) _nextchannel=0;
-
-  switch(_mode){
-    case 0:
-      NRF24radio.openReadingPipe(0,0x6B7D9171);
-    break;
-    case 1:
-      NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]);
-    break;
-    case 2:
-      NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]);
-    break;
-    case 3:
-      NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);
-    break;
-    case 4:
-      if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
-      NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);
-    break;
-  }
-
-  MINRF.packetMode = _mode;
-}
-# 485 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  if(_type==0xff){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: will test MAC-type"));
-    for (uint32_t i=0;i<4;i++){
-      if(memcmp(_serial,kMINRFSlaveID+i,3)==0){
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC is type %u"), i);
-        _type = i+1;
-      }
-      else {
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-type is unknown"));
-      }
-    }
-  }
-  if(_type==0xff) return _type;
-
-  DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
-      DEBUG_SENSOR_LOG(PSTR("MINRF: known sensor at slot: %u"), i);
-      if(MIBLEsensors.at(i).showedUp < 3){
-        MIBLEsensors.at(i).showedUp++;
-      }
-      return i;
-    }
-    DEBUG_SENSOR_LOG(PSTR("MINRF i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-    DEBUG_SENSOR_LOG(PSTR("MINRF n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
-  }
-  DEBUG_SENSOR_LOG(PSTR("MINRF: found new sensor"));
-  mi_sensor_t _newSensor;
-  memcpy(_newSensor.serial,_serial, sizeof(_serial));
-  _newSensor.type = _type;
-  _newSensor.showedUp = 1;
-  _newSensor.temp =-1000.0f;
-  switch (_type)
-    {
-    case 1:
-      _newSensor.moisture =-1000.0f;
-      _newSensor.fertility =-1000.0f;
-      _newSensor.lux = 0x00ffffff;
-      break;
-    case 2: case 3: case 4:
-      _newSensor.hum=-1.0f;
-      _newSensor.bat=0xff;
-      break;
-    default:
-      break;
-    }
-  MIBLEsensors.push_back(_newSensor);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: new sensor at slot: %u"), MIBLEsensors.size()-1);
-  return MIBLEsensors.size()-1;
-};
-
-
-
-
-
-
-void MINRFpurgeFakeSensors(void){
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(MIBLEsensors.at(i).showedUp<3){
-      DEBUG_SENSOR_LOG(PSTR("MINRF: remove FAKE sensor at slot: %u"), i);
-      MIBLEsensors.erase(MIBLEsensors.begin()+i);
-    }
-  }
-}
-
-
-void MINRFhandleFloraPacket(void){
-  if(MINRF.buffer.floraPacket.T.idWord!=0x9800 && MINRF.buffer.floraPacket.T.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, 0xff);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.floraPacket.L.mode) {
-    case 4:
-    _tempFloat=(float)(MINRF.buffer.floraPacket.T.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MINRF.buffer.floraPacket.T.data );
-    break;
-    case 7:
-    if(true){
-        MIBLEsensors.at(_slot).lux=MINRF.buffer.floraPacket.L.data;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U24: %x Lux"), MINRF.buffer.floraPacket.L.data);
-    break;
-    case 8:
-    _tempFloat =(float)MINRF.buffer.floraPacket.M.data;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).moisture=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MINRF.buffer.floraPacket.M.data);
-    break;
-    case 9:
-    _tempFloat=(float)(MINRF.buffer.floraPacket.F.data);
-    if(_tempFloat<65535){
-        MIBLEsensors.at(_slot).fertility=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MINRF.buffer.floraPacket.F.data);
-    break;
-  }
-}
-
-void MINRFhandleMJ_HT_V1Packet(void){
-  if(MINRF.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, 0xff);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
-    case 0x0d:
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
-    }
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).hum = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
-    break;
-    case 0x0a:
-    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
-        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
-    break;
-  }
-}
-
-void MINRFhandleLYWSD02Packet(void){
-  if(MINRF.buffer.LYWSD02Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected LYWSD02-packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-    if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.LYWSD02Packet.TH.mode) {
-    case 4:
-    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MINRF.buffer.LYWSD02Packet.TH.data );
-    break;
-    case 6:
-    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<101){
-        MIBLEsensors.at(_slot).hum=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MINRF.buffer.LYWSD02Packet.TH.data );
-    break;
-  }
-}
-
-void MINRFhandleLYWSD03Packet(void){
-
-  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-    if(_slot==0xff) return;
-
-  MINRF_LOG_BUFFER(MINRF.streamBuffer);
-  MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
-  MINRF_LOG_BUFFER(MINRF.buffer.raw);
-}
-
-void MINRF_EVERY_50_MSECOND() {
-
-  if(MINRF.timer>6000){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
-    MINRFpurgeFakeSensors();
-    MINRF.timer=0;
-  }
-  MINRF.timer++;
-
-  if (!MINRFreceivePacket()){
-
-  }
-
-  else if(MINRF.buffer.bleAdv.header.uuid==0xfe95){
-    MINRF_LOG_BUFFER(MINRF.streamBuffer);
-    MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    DEBUG_SENSOR_LOG(PSTR("MINRF: Type: %x"), MINRF.buffer.bleAdv.header.type);
-    switch(MINRF.buffer.bleAdv.header.type){
-      case 0x2050:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: MJ_HT_V1 Packet"));
-      break;
-      case 0x1613:case 0x1614:case 0x1615:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: Flora Packet"));
-      break;
-      default:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: unknown Packet"));
-      break;
-    }
-  }
-  else if (MINRF.packetMode == FLORA){
-    MINRFhandleFloraPacket();
-  }
-  else if (MINRF.packetMode == MJ_HT_V1){
-    MINRFhandleMJ_HT_V1Packet();
-  }
-  else if (MINRF.packetMode == LYWSD02){
-    MINRFhandleLYWSD02Packet();
-  }
-  else if (MINRF.packetMode == LYWSD03){
-    MINRFhandleLYWSD03Packet();
-  }
-
-
-  if (MINRF.packetMode == LYWSD03){
-    MINRFinitBLE(1);
-  }
-  else {
-    MINRFinitBLE(++MINRF.packetMode);
-  }
-
-  MINRFhopChannel();
-  NRF24radio.startListening();
-}
-
-
-
-
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
-const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-const char HTTP_MINRF_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
-const char HTTP_MINRF_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
-
-void MINRFShow(bool json)
-{
-  if (json) {
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      if(MIBLEsensors.at(i).showedUp < 3){
-        DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
-        break;
-        }
-      char slave[33];
-      sprintf_P(slave,"%s-%02x%02x%02x",kMINRFSlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-
-      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          char lux[33];
-          char moisture[33];
-          char fertility[33];
-          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
-          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
-          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
-          }
-        }
-        ResponseAppend_P(PSTR("}"));
-    }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
-      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        if(MIBLEsensors.at(i).showedUp < 3){
-          DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
-          break;
-          }
-        WSContentSend_PD(HTTP_MINRF_HL);
-        WSContentSend_PD(HTTP_MINRF_MAC, kMINRFSlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-          WSContentSend_PD(HTTP_SNS_TEMP, kMINRFSlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          if(MIBLEsensors.at(i).lux!=0x00ffffff){
-            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_MOISTURE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            char fertility[33];
-            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-            WSContentSend_PD(HTTP_MINRF_FLORA_DATA, kMINRFSlaveType[MIBLEsensors.at(i).type-1], fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-            char humidity[33];
-            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-            WSContentSend_PD(HTTP_SNS_HUM, kMINRFSlaveType[MIBLEsensors.at(i).type-1], humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            WSContentSend_PD(HTTP_BATTERY, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
-          }
-        }
-      }
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns61(uint8_t function)
-{
-  bool result = false;
-
-  if (NRF24.chipType) {
-    switch (function) {
-      case FUNC_INIT:
-        MINRFinitBLE(1);
-        AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: started"));
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        MINRF_EVERY_50_MSECOND();
-        break;
-      case FUNC_JSON_APPEND:
-        MINRFShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MINRFShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-# 30 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-#ifdef USE_HM10
-
-#define XSNS_62 62
-
-#include <TasmotaSerial.h>
-#include <vector>
-
-TasmotaSerial *HM10Serial;
-#define HM10_BAUDRATE 115200
-
-#define HM10_MAX_TASK_NUMBER 12
-uint8_t HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];
-
-#define HM10_MAX_RX_BUF 512
-char HM10_RX_STRING[HM10_MAX_RX_BUF] = {0};
-
-struct {
-  uint8_t current_task_delay;
-  uint8_t last_command;
-  uint16_t firmware;
-  uint32_t period;
-  uint32_t serialSpeed;
-  union {
-    uint32_t time;
-    uint8_t timebuf[4];
-  };
-  struct {
-    uint32_t init:1;
-    uint32_t pending_task:1;
-    uint32_t connected:1;
-    uint32_t subscribed:1;
-    uint32_t awaitingHT:1;
-    uint32_t awaitingB:1;
-
-  } mode;
-  struct {
-    uint8_t sensor;
-
-  } state;
-} HM10;
-
-#pragma pack(1)
-struct {
-  uint16_t temp;
-  uint8_t hum;
-} LYWSD0x_HT;
-#pragma pack(0)
-
-struct mi_sensor_t{
-  uint8_t type;
-  uint8_t serial[6];
-  uint8_t showedUp;
-  float temp;
-  union {
-    struct {
-      float moisture;
-      float fertility;
-      uint16_t lux;
-    };
-    struct {
-      float hum;
-      uint8_t bat;
-    };
-  };
-};
-
-std::vector<mi_sensor_t> MIBLEsensors;
-
-
-
-
-
-#define D_CMND_HM10 "HM10"
-
-const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
-const char S_JSON_HM10_COMMAND[] PROGMEM = "{\"" D_CMND_HM10 "%s%s\"}";
-const char kHM10_Commands[] PROGMEM = "Scan|AT|Period|Baud|Time";
-
-#define FLORA 1
-#define MJ_HT_V1 2
-#define LYWSD02 3
-#define LYWSD03MMC 4
-
-uint8_t kHM10SlaveID[4][3] = { 0xC4,0x7C,0x8D,
-                                0x58,0x2D,0x34,
-                                0xE7,0x2E,0x00,
-                                0xA4,0xC1,0x38,
-                                };
-
-const char kHM10SlaveType1[] PROGMEM = "Flora";
-const char kHM10SlaveType2[] PROGMEM = "MJ_HT_V1";
-const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
-const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
-const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
-
-
-
-
-
-enum HM10_Commands {
-  CMND_HM10_DISC_SCAN,
-  CMND_HM10_AT,
-  CMND_HM10_PERIOD,
-  CMND_HM10_BAUD,
-  CMND_HM10_TIME
-  };
-
-
-
-
-
-#define TASK_HM10_NOTASK 0
-#define TASK_HM10_ROLE1 1
-#define TASK_HM10_IMME1 2
-#define TASK_HM10_RENEW 3
-#define TASK_HM10_RESET 4
-#define TASK_HM10_DISC 5
-#define TASK_HM10_CONN 6
-#define TASK_HM10_VERSION 7
-#define TASK_HM10_NAME 8
-#define TASK_HM10_FEEDBACK 9
-#define TASK_HM10_DISCONN 10
-#define TASK_HM10_SUB_L3 11
-#define TASK_HM10_READ_HT 12
-#define TASK_HM10_FINDALLCHARS 13
-#define TASK_HM10_UN_L3 14
-#define TASK_HM10_DELAY_SUB 15
-#define TASK_HM10_READ_BT_L3 16
-#define TASK_HM10_SUB_L2 17
-#define TASK_HM10_UN_L2 18
-#define TASK_HM10_READ_BT_L2 19
-#define TASK_HM10_TIME_L2 20
-
-#define TASK_HM10_DONE 99
-
-
-
-
-
-void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
-                          HM10_TASK_LIST[slot][0] = task;
-                          HM10_TASK_LIST[slot][1] = delay;
-                          HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;
-                          HM10.current_task_delay = HM10_TASK_LIST[0][1];
-}
-
-void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
-                          HM10.last_command = HM10_TASK_LIST[slot][0];
-                          HM10_TASK_LIST[slot][0] = task;
-}
-
-
-
-
-
-void HM10_Reset(void) { HM10_Launchtask(TASK_HM10_DISCONN,0,1);
-                          HM10_Launchtask(TASK_HM10_ROLE1,1,1);
-                          HM10_Launchtask(TASK_HM10_IMME1,2,1);
-                          HM10_Launchtask(TASK_HM10_RESET,3,1);
-                          HM10_Launchtask(TASK_HM10_VERSION,4,10);
-                          HM10_Launchtask(TASK_HM10_DISC,5,50);
-                          }
-
-void HM10_Discovery_Scan(void) {
-                          HM10_Launchtask(TASK_HM10_DISCONN,0,1);
-                          HM10_Launchtask(TASK_HM10_DISC,1,1);
-                          }
-
-void HM10_Read_LYWSD03(void) {
-                          HM10_Launchtask(TASK_HM10_CONN,0,1);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
-                          HM10_Launchtask(TASK_HM10_SUB_L3,2,20);
-                          HM10_Launchtask(TASK_HM10_UN_L3,3,80);
-                          HM10_Launchtask(TASK_HM10_READ_BT_L3,4,5);
-                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
-                          }
-
-void HM10_Read_LYWSD02(void) {
-                          HM10_Launchtask(TASK_HM10_CONN,0,1);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
-                          HM10_Launchtask(TASK_HM10_SUB_L2,2,20);
-                          HM10_Launchtask(TASK_HM10_UN_L2,3,80);
-                          HM10_Launchtask(TASK_HM10_READ_BT_L2,4,5);
-                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
-                          }
-
-void HM10_Time_LYWSD02(void) {
-                          HM10_Launchtask(TASK_HM10_DISCONN,0,0);
-                          HM10_Launchtask(TASK_HM10_CONN,1,5);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);
-                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);
-                          HM10_Launchtask(TASK_HM10_DISCONN,4,5);
-                          }
-# 231 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  if(_type==0xff){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: will test MAC-type"));
-    for (uint32_t i=0;i<4;i++){
-      if(memcmp(_serial,kHM10SlaveID+i,3)==0){
-        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC is type %u"), i);
-        _type = i+1;
-      }
-      else {
-        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC-type is unknown"));
-      }
-    }
-  }
-  if(_type==0xff) return _type;
-
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
-      if(MIBLEsensors.at(i).showedUp < 3){
-        MIBLEsensors.at(i).showedUp++;
-      }
-      return i;
-    }
-    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[0], _serial[1], _serial[2],_serial[3],_serial[4],_serial[5]);
-  }
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
-  mi_sensor_t _newSensor;
-  memcpy(_newSensor.serial,_serial, sizeof(_serial));
-  _newSensor.type = _type;
-  _newSensor.showedUp = 1;
-  _newSensor.temp =-1000.0f;
-  switch (_type)
-    {
-    case 1:
-      _newSensor.moisture =-1000.0f;
-      _newSensor.fertility =-1000.0f;
-      _newSensor.lux = 0xffff;
-      break;
-    case 2: case 3: case 4:
-      _newSensor.hum=-1.0f;
-      _newSensor.bat=0xff;
-      break;
-    default:
-      break;
-    }
-  MIBLEsensors.push_back(_newSensor);
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
-  return MIBLEsensors.size()-1;
-};
-
-
-
-
-
-
-
-void HM10SerialInit(void) {
-  HM10.mode.init = false;
-  HM10.serialSpeed = HM10_BAUDRATE;
-  HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
-  if (HM10Serial->begin(HM10.serialSpeed)) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
-    if (HM10Serial->hardwareSerial()) {
-      ClaimSerial();
-      DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
-    }
-    HM10_Reset();
-    HM10.mode.pending_task = 1;
-    HM10.mode.init = 1;
-    HM10.period = Settings.tele_period;
-    DEBUG_SENSOR_LOG(PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
-  }
-  return;
-}
-# 315 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-void HM10MACStringToBytes(const char* string, uint8_t _mac[]) {
-    uint32_t index = 0;
-    while (index < 12) {
-        char c = string[index];
-        uint32_t value = 0;
-        if(c >= '0' && c <= '9')
-          value = (c - '0');
-        else if (c >= 'A' && c <= 'F')
-          value = (10 + (c - 'A'));
-        _mac[(index/2)] += value << (((index + 1) % 2) * 4);
-
-        index++;
-    }
-    DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_mac[0],_mac[1],_mac[2],_mac[3],_mac[4],_mac[5]);
-}
-
-
-
-
-
-
-void HM10ParseResponse(char *buf) {
-    if (!strncmp(buf,"OK",2)) {
-       DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
-     }
-    if (!strncmp(buf,"HMSoft",6)) {
-      const char* _fw = "000";
-      memcpy((void *)_fw,(void *)(buf+8),3);
-      HM10.firmware = atoi(_fw);
-      DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
-      return;
-     }
-    char * _pos = strstr(buf, "IS0:");
-    if(_pos) {
-      const char* _mac = "000000000000";
-      memcpy((void *)_mac,(void *)(_pos+4),12);
-      DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
-      uint8_t _newMacArray[6] = {0};
-      HM10MACStringToBytes(_mac, _newMacArray);
-      DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
-      MIBLEgetSensorSlot(_newMacArray, 0xff);
-    }
-    if (strstr(buf, "LOST")){
-      HM10.mode.connected = false;
-    }
-    else {
-      DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
-    }
-}
-
-void HM10readTempHum(char *_buf){
-  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
-  if(_buf[0] != 0 && _buf[1] != 0){
-    memcpy(&LYWSD0x_HT,(void *)_buf,3);
-    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD0x_HT.temp,LYWSD0x_HT.hum);
-    uint32_t _slot = HM10.state.sensor;
-
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-    static float _tempFloat;
-    _tempFloat=(float)(LYWSD0x_HT.temp)/100.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-        HM10.mode.awaitingHT = false;
-        HM10.current_task_delay = 0;
-    }
-    _tempFloat=(float)LYWSD0x_HT.hum;
-    if(_tempFloat<100){
-      MIBLEsensors.at(_slot).hum = _tempFloat;
-      DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
-    }
-  }
-}
-
-bool HM10readBat(char *_buf){
-  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
-  if(_buf[0] != 0){
-    DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
-    uint32_t _slot = HM10.state.sensor;
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-    if(_buf[0]<101){
-        MIBLEsensors.at(_slot).bat=_buf[0];
-        return true;
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool HM10SerialHandleFeedback(){
-  bool success = false;
-  uint32_t i = 0;
-  char ret[HM10_MAX_RX_BUF] = {0};
-
-
-  while(HM10Serial->available()) {
-
-    if(i<HM10_MAX_RX_BUF){
-      ret[i] = HM10Serial->read();
-    }
-    i++;
-    success = true;
-  }
-  if(HM10.mode.awaitingHT) {
-    if (HM10.mode.connected) HM10readTempHum(ret);
-  }
-  else if(HM10.mode.awaitingB) {
-    if (HM10.mode.connected) {
-      if (HM10readBat(ret)){
-        HM10.mode.awaitingB = false;
-        HM10.current_task_delay = 0;
-      }
-    }
-  }
-  else if(success) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
-    HM10ParseResponse(ret);
-  }
-  else {
-
-  }
-  return success;
-}
-
-
-
-
-
-void HM10_TaskEvery100ms(){
-  if (HM10.current_task_delay == 0) {
-    uint8_t i = 0;
-    bool runningTaskLoop = true;
-    while (runningTaskLoop) {
-      switch(HM10_TASK_LIST[i][0]) {
-        case TASK_HM10_ROLE1:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+ROLE1");
-          break;
-        case TASK_HM10_IMME1:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+IMME1");
-          break;
-        case TASK_HM10_DISC:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start discovery"),D_CMND_HM10);
-          HM10.current_task_delay = 35;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+DISC?");
-          break;
-        case TASK_HM10_VERSION:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+VERR?");
-          break;
-        case TASK_HM10_NAME:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NAME?");
-          break;
-        case TASK_HM10_CONN:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s connect"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          char _con[20];
-          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
-          HM10Serial->write(_con);
-          HM10.mode.awaitingB = false;
-          HM10.mode.connected = true;
-          break;
-        case TASK_HM10_DISCONN:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT");
-          break;
-        case TASK_HM10_RESET:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
-          HM10Serial->write("AT+RESET");
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_SUB_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 25;
-          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NOTIFY_ON0037");
-          break;
-        case TASK_HM10_UN_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.mode.awaitingHT = false;
-          HM10Serial->write("AT+NOTIFYOFF0037");
-          break;
-        case TASK_HM10_SUB_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 25;
-          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NOTIFY_ON003C");
-          break;
-        case TASK_HM10_UN_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.mode.awaitingHT = false;
-          HM10Serial->write("AT+NOTIFYOFF003C");
-          break;
-        case TASK_HM10_TIME_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set time"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.time = Rtc.utc_time;
-          HM10Serial->write("AT+SEND_DATAWR002F");
-          HM10Serial->write(HM10.timebuf,4);
-          HM10Serial->write(Rtc.time_timezone / 60);
-          AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s Time-string: %x%x%x%x%x"),D_CMND_HM10, HM10.timebuf[0],HM10.timebuf[1],HM10.timebuf[2],HM10.timebuf[3],(Rtc.time_timezone /60));
-          break;
-        case TASK_HM10_READ_HT:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
-          HM10.current_task_delay = 0;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA0036?");
-          HM10.mode.awaitingHT = true;
-          break;
-        case TASK_HM10_READ_BT_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA003A?");
-          HM10.mode.awaitingB = true;
-          break;
-        case TASK_HM10_READ_BT_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0043"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA0043?");
-          HM10.mode.awaitingB = true;
-          break;
-
-
-
-
-
-
-
-        case TASK_HM10_FEEDBACK:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
-          HM10SerialHandleFeedback();
-          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
-          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_DELAY_SUB:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start reading"),D_CMND_HM10);
-          HM10SerialHandleFeedback();
-          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
-          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
-          HM10.mode.awaitingHT = true;
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_DONE:
-
-
-          if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {
-            DEBUG_SENSOR_LOG(PSTR("%sno Tasks left"),D_CMND_HM10);
-            DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
-            for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {
-              DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
-              HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;
-              HM10_TASK_LIST[j][1] = 0;
-            }
-            runningTaskLoop = false;
-            HM10.mode.pending_task = 0;
-            break;
-          }
-      }
-      i++;
-    }
-  }
-  else {
-    HM10.current_task_delay--;
-  }
-}
-
-
-
-
-
-
-void HM10EverySecond(){
-  if(HM10.firmware == 0) return;
-  if(HM10.mode.pending_task == 1) return;
-  if (MIBLEsensors.size()==0) return;
-
-  static uint32_t _counter = 0;
-  static uint32_t _nextSensorSlot = 0;
-  if(_counter==0) {
-    HM10.state.sensor = _nextSensorSlot;
-    _nextSensorSlot++;
-    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) {
-      HM10.mode.pending_task = 1;
-      HM10_Read_LYWSD03();
-    }
-    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD02) {
-      HM10.mode.pending_task = 1;
-      HM10_Read_LYWSD02();
-    }
-    if (HM10.state.sensor==MIBLEsensors.size()-1) {
-      _nextSensorSlot= 0;
-      _counter++;
-    }
-    DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
-  }
-  else _counter++;
-  if (_counter>HM10.period) _counter = 0;
-}
-
-bool HM10Cmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_HM10);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_HM10), disp_len)) {
-    uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kHM10_Commands);
-    switch (command_code) {
-      case CMND_HM10_PERIOD:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_HM10_PERIOD) { HM10.period = XdrvMailbox.payload; }
-        }
-        else {
-          if (command_code == CMND_HM10_PERIOD) XdrvMailbox.payload = HM10.period;
-        }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_BAUD:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_HM10_BAUD) {
-            HM10.serialSpeed = XdrvMailbox.payload;
-            HM10Serial->begin(HM10.serialSpeed);
-            }
-        }
-        else {
-          if (command_code == CMND_HM10_BAUD) XdrvMailbox.payload = HM10.serialSpeed;
-        }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_TIME:
-        if (XdrvMailbox.data_len > 0) {
-          if(MIBLEsensors.size()>XdrvMailbox.payload){
-            if(MIBLEsensors.at(XdrvMailbox.payload).type == LYWSD02){
-              HM10.state.sensor = XdrvMailbox.payload;
-              HM10_Time_LYWSD02();
-              }
-            }
-          }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_AT:
-        HM10Serial->write("AT");
-        if (strlen(XdrvMailbox.data)!=0) {
-          HM10Serial->write("+");
-          HM10Serial->write(XdrvMailbox.data);
-          Response_P(S_JSON_HM10_COMMAND, ":AT+",XdrvMailbox.data);
-        }
-        else Response_P(S_JSON_HM10_COMMAND, ":AT",XdrvMailbox.data);
-        break;
-      case CMND_HM10_DISC_SCAN:
-        if (command_code == CMND_HM10_DISC_SCAN) { HM10_Discovery_Scan(); }
-        Response_P(S_JSON_HM10_COMMAND, command, "");
-        break;
-      default:
-
-       serviced = false;
-     break;
-    }
-  } else {
-    return false;
-  }
-  return serviced;
-}
-
-
-
-
-
-
-const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
-const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
-const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
-const char HTTP_HM10_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
-
-void HM10Show(bool json)
-{
-  if (json) {
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      char slave[33];
-      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-
-      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          char lux[33];
-          char moisture[33];
-          char fertility[33];
-          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
-          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
-          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
-          }
-        }
-        ResponseAppend_P(PSTR("}"));
-    }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_HM10, HM10.firmware);
-      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        WSContentSend_PD(HTTP_HM10_HL);
-        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-          WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            char fertility[33];
-            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-            WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-            char humidity[33];
-            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-            WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            WSContentSend_PD(HTTP_BATTERY, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
-          }
-        }
-      }
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns62(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) {
-    switch (function) {
-      case FUNC_INIT:
-        HM10SerialInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        HM10SerialHandleFeedback();
-       break;
-      case FUNC_EVERY_100_MSECOND:
-        if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
-          HM10_TaskEvery100ms();
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        HM10EverySecond();
-        break;
-      case FUNC_COMMAND:
-        result = HM10Cmd();
-        break;
-      case FUNC_JSON_APPEND:
-        HM10Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HM10Show(0);
-        break;
-#endif
-      }
-  }
-  return result;
-}
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_64_aht10.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_64_aht10.ino"
-#ifdef USE_I2C
-#ifdef USE_AHT10
-
-
-
-
-
-
-#define XSNS_64 64
-#define XI2C_43 43
-
-#define AHT10_ADDR 0x38
-
-unsigned char eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
-unsigned char eSensorNormalCmd[3] = {0xA8, 0x00, 0x00};
-unsigned char eSensorMeasureCmd[3] = {0xAC, 0x33, 0x00};
-unsigned char eSensorResetCmd = 0xBA;
-
-struct AHT10 {
-  float humidity = NAN;
-  float temperature = NAN;
-  uint8_t valid = 0;
-  uint8_t count = 0;
-  char name[6] = "AHT10";
-} AHT10;
-
-bool begin()
-{
-    Wire.begin(AHT10_ADDR);
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorCalibrateCmd, 3);
-    Wire.endTransmission();
-    delay(500);
-
-    if((readStatus() & 0x68) == 0x08)
-        return true;
-    else
-    {
-        return false;
-    }
-}
-
-bool AHT10Read(void)
-{
-  unsigned long result, temp[6];
-
-  if (AHT10.valid) { AHT10.valid--; }
-
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorMeasureCmd, 3);
-    Wire.endTransmission();
-    delay(100);
-
-    Wire.requestFrom(AHT10_ADDR, 6);
-    for(unsigned char i = 0; Wire.available() > 0; i++)
-    {
-        temp[i] = Wire.read();
-    }
-
-  AHT10.humidity = (((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4)* 100 / 1048576;
-  AHT10.temperature = ((200 * (((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5])) / 1048576) - 50;
-
-  if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
-
-  AHT10.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-unsigned char readStatus(void)
-{
-    unsigned char result = 0;
-
-    Wire.requestFrom(AHT10_ADDR, 1);
-    result = Wire.read();
-    return result;
-}
-
-void AHT10Detect(void)
-{
-  if (I2cActive(AHT10_ADDR))
-  {
-  return;
-  }
-
-  if (begin())
-  {
-    I2cSetActiveFound(AHT10_ADDR, AHT10.name);
-    AHT10.count = 1;
-  }
-}
-
-void AHT10EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!AHT10Read()) {
-      AddLogMissed(AHT10.name, AHT10.valid);
-    }
-  }
-}
-
-void AHT10Show(bool json)
-{
-  if (AHT10.valid) {
-    char temperature[33];
-    dtostrfd(AHT10.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(AHT10.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, AHT10.name, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, AHT10.temperature);
-        KnxSensor(KNX_HUMIDITY, AHT10.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, AHT10.name, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, AHT10.name, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns64(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_43)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    AHT10Detect();
-  }
-  else if (AHT10.count) {
-    switch (function) {
-    case FUNC_EVERY_SECOND:
-      AHT10EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      AHT10Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      AHT10Show(0);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
-# 22 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
-#ifdef USE_PROMETHEUS
-
-
-
-
-#define XSNS_91 91
-
-void HandleMetrics(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR("Prometheus"));
-
-  WSContentBegin(200, CT_PLAIN);
-
-
-  char parameter[FLOATSZ];
-
-  if (global_temperature != 9999) {
-    dtostrfd(global_temperature, Settings.flag2.temperature_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_temperature gauge\nglobal_temperature %s\n"), parameter);
-  }
-  if (global_humidity != 0) {
-    dtostrfd(global_humidity, Settings.flag2.humidity_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_humidity gauge\nglobal_humidity %s\n"), parameter);
-  }
-  if (global_pressure != 0) {
-    dtostrfd(global_pressure, Settings.flag2.pressure_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_pressure gauge\nglobal_pressure %s\n"), parameter);
-  }
-
-#ifdef USE_ENERGY_SENSOR
-  dtostrfd(Energy.voltage[0], Settings.flag2.voltage_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE voltage gauge\nvoltage %s\n"), parameter);
-  dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
-  dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE active_power gauge\nactive_power %s\n"), parameter);
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
-#endif
-# 80 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_91_prometheus.ino"
-  WSContentEnd();
-}
-
-
-
-
-
-bool Xsns91(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/metrics", HandleMetrics);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xsns_interface.ino"
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xsns_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xsns_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XSNS_01
-  &Xsns01,
-#endif
-
-#ifdef XSNS_02
-  &Xsns02,
-#endif
-
-#ifdef XSNS_03
-  &Xsns03,
-#endif
-
-#ifdef XSNS_04
-  &Xsns04,
-#endif
-
-#ifdef XSNS_05
-  &Xsns05,
-#endif
-
-#ifdef XSNS_06
-  &Xsns06,
-#endif
-
-#ifdef XSNS_07
-  &Xsns07,
-#endif
-
-#ifdef XSNS_08
-  &Xsns08,
-#endif
-
-#ifdef XSNS_09
-  &Xsns09,
-#endif
-
-#ifdef XSNS_10
-  &Xsns10,
-#endif
-
-#ifdef XSNS_11
-  &Xsns11,
-#endif
-
-#ifdef XSNS_12
-  &Xsns12,
-#endif
-
-#ifdef XSNS_13
-  &Xsns13,
-#endif
-
-#ifdef XSNS_14
-  &Xsns14,
-#endif
-
-#ifdef XSNS_15
-  &Xsns15,
-#endif
-
-#ifdef XSNS_16
-  &Xsns16,
-#endif
-
-#ifdef XSNS_17
-  &Xsns17,
-#endif
-
-#ifdef XSNS_18
-  &Xsns18,
-#endif
-
-#ifdef XSNS_19
-  &Xsns19,
-#endif
-
-#ifdef XSNS_20
-  &Xsns20,
-#endif
-
-#ifdef XSNS_21
-  &Xsns21,
-#endif
-
-#ifdef XSNS_22
-  &Xsns22,
-#endif
-
-#ifdef XSNS_23
-  &Xsns23,
-#endif
-
-#ifdef XSNS_24
-  &Xsns24,
-#endif
-
-#ifdef XSNS_25
-  &Xsns25,
-#endif
-
-#ifdef XSNS_26
-  &Xsns26,
-#endif
-
-#ifdef XSNS_27
-  &Xsns27,
-#endif
-
-#ifdef XSNS_28
-  &Xsns28,
-#endif
-
-#ifdef XSNS_29
-  &Xsns29,
-#endif
-
-#ifdef XSNS_30
-  &Xsns30,
-#endif
-
-#ifdef XSNS_31
-  &Xsns31,
-#endif
-
-#ifdef XSNS_32
-  &Xsns32,
-#endif
-
-#ifdef XSNS_33
-  &Xsns33,
-#endif
-
-#ifdef XSNS_34
-  &Xsns34,
-#endif
-
-#ifdef XSNS_35
-  &Xsns35,
-#endif
-
-#ifdef XSNS_36
-  &Xsns36,
-#endif
-
-#ifdef XSNS_37
-  &Xsns37,
-#endif
-
-#ifdef XSNS_38
-  &Xsns38,
-#endif
-
-#ifdef XSNS_39
-  &Xsns39,
-#endif
-
-#ifdef XSNS_40
-  &Xsns40,
-#endif
-
-#ifdef XSNS_41
-  &Xsns41,
-#endif
-
-#ifdef XSNS_42
-  &Xsns42,
-#endif
-
-#ifdef XSNS_43
-  &Xsns43,
-#endif
-
-#ifdef XSNS_44
-  &Xsns44,
-#endif
-
-#ifdef XSNS_45
-  &Xsns45,
-#endif
-
-#ifdef XSNS_46
-  &Xsns46,
-#endif
-
-#ifdef XSNS_47
-  &Xsns47,
-#endif
-
-#ifdef XSNS_48
-  &Xsns48,
-#endif
-
-#ifdef XSNS_49
-  &Xsns49,
-#endif
-
-#ifdef XSNS_50
-  &Xsns50,
-#endif
-
-#ifdef XSNS_51
-  &Xsns51,
-#endif
-
-#ifdef XSNS_52
-  &Xsns52,
-#endif
-
-#ifdef XSNS_53
-  &Xsns53,
-#endif
-
-#ifdef XSNS_54
-  &Xsns54,
-#endif
-
-#ifdef XSNS_55
-  &Xsns55,
-#endif
-
-#ifdef XSNS_56
-  &Xsns56,
-#endif
-
-#ifdef XSNS_57
-  &Xsns57,
-#endif
-
-#ifdef XSNS_58
-  &Xsns58,
-#endif
-
-#ifdef XSNS_59
-  &Xsns59,
-#endif
-
-#ifdef XSNS_60
-  &Xsns60,
-#endif
-
-#ifdef XSNS_61
-  &Xsns61,
-#endif
-
-#ifdef XSNS_62
-  &Xsns62,
-#endif
-
-#ifdef XSNS_63
-  &Xsns63,
-#endif
-
-#ifdef XSNS_64
-  &Xsns64,
-#endif
-
-#ifdef XSNS_65
-  &Xsns65,
-#endif
-
-#ifdef XSNS_66
-  &Xsns66,
-#endif
-
-#ifdef XSNS_67
-  &Xsns67,
-#endif
-
-#ifdef XSNS_68
-  &Xsns68,
-#endif
-
-#ifdef XSNS_69
-  &Xsns69,
-#endif
-
-#ifdef XSNS_70
-  &Xsns70,
-#endif
-
-#ifdef XSNS_71
-  &Xsns71,
-#endif
-
-#ifdef XSNS_72
-  &Xsns72,
-#endif
-
-#ifdef XSNS_73
-  &Xsns73,
-#endif
-
-#ifdef XSNS_74
-  &Xsns74,
-#endif
-
-#ifdef XSNS_75
-  &Xsns75,
-#endif
-
-#ifdef XSNS_76
-  &Xsns76,
-#endif
-
-#ifdef XSNS_77
-  &Xsns77,
-#endif
-
-#ifdef XSNS_78
-  &Xsns78,
-#endif
-
-#ifdef XSNS_79
-  &Xsns79,
-#endif
-
-#ifdef XSNS_80
-  &Xsns80,
-#endif
-
-#ifdef XSNS_81
-  &Xsns81,
-#endif
-
-#ifdef XSNS_82
-  &Xsns82,
-#endif
-
-#ifdef XSNS_83
-  &Xsns83,
-#endif
-
-#ifdef XSNS_84
-  &Xsns84,
-#endif
-
-#ifdef XSNS_85
-  &Xsns85,
-#endif
-
-#ifdef XSNS_86
-  &Xsns86,
-#endif
-
-#ifdef XSNS_87
-  &Xsns87,
-#endif
-
-#ifdef XSNS_88
-  &Xsns88,
-#endif
-
-#ifdef XSNS_89
-  &Xsns89,
-#endif
-
-#ifdef XSNS_90
-  &Xsns90,
-#endif
-
-#ifdef XSNS_91
-  &Xsns91,
-#endif
-
-#ifdef XSNS_92
-  &Xsns92,
-#endif
-
-#ifdef XSNS_93
-  &Xsns93,
-#endif
-
-#ifdef XSNS_94
-  &Xsns94,
-#endif
-
-#ifdef XSNS_95
-  &Xsns95,
-#endif
-
-#ifdef XSNS_96
-  &Xsns96,
-#endif
-
-#ifdef XSNS_97
-  &Xsns97,
-#endif
-
-#ifdef XSNS_98
-  &Xsns98,
-#endif
-
-#ifdef XSNS_99
-  &Xsns99
-#endif
-};
-
-const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]);
-
-
-
-
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kXsnsList[] PROGMEM = {
-#else
-const uint8_t kXsnsList[] = {
-#endif
-
-#ifdef XSNS_01
-  XSNS_01,
-#endif
-
-#ifdef XSNS_02
-  XSNS_02,
-#endif
-
-#ifdef XSNS_03
-  XSNS_03,
-#endif
-
-#ifdef XSNS_04
-  XSNS_04,
-#endif
-
-#ifdef XSNS_05
-  XSNS_05,
-#endif
-
-#ifdef XSNS_06
-  XSNS_06,
-#endif
-
-#ifdef XSNS_07
-  XSNS_07,
-#endif
-
-#ifdef XSNS_08
-  XSNS_08,
-#endif
-
-#ifdef XSNS_09
-  XSNS_09,
-#endif
-
-#ifdef XSNS_10
-  XSNS_10,
-#endif
-
-#ifdef XSNS_11
-  XSNS_11,
-#endif
-
-#ifdef XSNS_12
-  XSNS_12,
-#endif
-
-#ifdef XSNS_13
-  XSNS_13,
-#endif
-
-#ifdef XSNS_14
-  XSNS_14,
-#endif
-
-#ifdef XSNS_15
-  XSNS_15,
-#endif
-
-#ifdef XSNS_16
-  XSNS_16,
-#endif
-
-#ifdef XSNS_17
-  XSNS_17,
-#endif
-
-#ifdef XSNS_18
-  XSNS_18,
-#endif
-
-#ifdef XSNS_19
-  XSNS_19,
-#endif
-
-#ifdef XSNS_20
-  XSNS_20,
-#endif
-
-#ifdef XSNS_21
-  XSNS_21,
-#endif
-
-#ifdef XSNS_22
-  XSNS_22,
-#endif
-
-#ifdef XSNS_23
-  XSNS_23,
-#endif
-
-#ifdef XSNS_24
-  XSNS_24,
-#endif
-
-#ifdef XSNS_25
-  XSNS_25,
-#endif
-
-#ifdef XSNS_26
-  XSNS_26,
-#endif
-
-#ifdef XSNS_27
-  XSNS_27,
-#endif
-
-#ifdef XSNS_28
-  XSNS_28,
-#endif
-
-#ifdef XSNS_29
-  XSNS_29,
-#endif
-
-#ifdef XSNS_30
-  XSNS_30,
-#endif
-
-#ifdef XSNS_31
-  XSNS_31,
-#endif
-
-#ifdef XSNS_32
-  XSNS_32,
-#endif
-
-#ifdef XSNS_33
-  XSNS_33,
-#endif
-
-#ifdef XSNS_34
-  XSNS_34,
-#endif
-
-#ifdef XSNS_35
-  XSNS_35,
-#endif
-
-#ifdef XSNS_36
-  XSNS_36,
-#endif
-
-#ifdef XSNS_37
-  XSNS_37,
-#endif
-
-#ifdef XSNS_38
-  XSNS_38,
-#endif
-
-#ifdef XSNS_39
-  XSNS_39,
-#endif
-
-#ifdef XSNS_40
-  XSNS_40,
-#endif
-
-#ifdef XSNS_41
-  XSNS_41,
-#endif
-
-#ifdef XSNS_42
-  XSNS_42,
-#endif
-
-#ifdef XSNS_43
-  XSNS_43,
-#endif
-
-#ifdef XSNS_44
-  XSNS_44,
-#endif
-
-#ifdef XSNS_45
-  XSNS_45,
-#endif
-
-#ifdef XSNS_46
-  XSNS_46,
-#endif
-
-#ifdef XSNS_47
-  XSNS_47,
-#endif
-
-#ifdef XSNS_48
-  XSNS_48,
-#endif
-
-#ifdef XSNS_49
-  XSNS_49,
-#endif
-
-#ifdef XSNS_50
-  XSNS_50,
-#endif
-
-#ifdef XSNS_51
-  XSNS_51,
-#endif
-
-#ifdef XSNS_52
-  XSNS_52,
-#endif
-
-#ifdef XSNS_53
-  XSNS_53,
-#endif
-
-#ifdef XSNS_54
-  XSNS_54,
-#endif
-
-#ifdef XSNS_55
-  XSNS_55,
-#endif
-
-#ifdef XSNS_56
-  XSNS_56,
-#endif
-
-#ifdef XSNS_57
-  XSNS_57,
-#endif
-
-#ifdef XSNS_58
-  XSNS_58,
-#endif
-
-#ifdef XSNS_59
-  XSNS_59,
-#endif
-
-#ifdef XSNS_60
-  XSNS_60,
-#endif
-
-#ifdef XSNS_61
-  XSNS_61,
-#endif
-
-#ifdef XSNS_62
-  XSNS_62,
-#endif
-
-#ifdef XSNS_63
-  XSNS_63,
-#endif
-
-#ifdef XSNS_64
-  XSNS_64,
-#endif
-
-#ifdef XSNS_65
-  XSNS_65,
-#endif
-
-#ifdef XSNS_66
-  XSNS_66,
-#endif
-
-#ifdef XSNS_67
-  XSNS_67,
-#endif
-
-#ifdef XSNS_68
-  XSNS_68,
-#endif
-
-#ifdef XSNS_69
-  XSNS_69,
-#endif
-
-#ifdef XSNS_70
-  XSNS_70,
-#endif
-
-#ifdef XSNS_71
-  XSNS_71,
-#endif
-
-#ifdef XSNS_72
-  XSNS_72,
-#endif
-
-#ifdef XSNS_73
-  XSNS_73,
-#endif
-
-#ifdef XSNS_74
-  XSNS_74,
-#endif
-
-#ifdef XSNS_75
-  XSNS_75,
-#endif
-
-#ifdef XSNS_76
-  XSNS_76,
-#endif
-
-#ifdef XSNS_77
-  XSNS_77,
-#endif
-
-#ifdef XSNS_78
-  XSNS_78,
-#endif
-
-#ifdef XSNS_79
-  XSNS_79,
-#endif
-
-#ifdef XSNS_80
-  XSNS_80,
-#endif
-
-#ifdef XSNS_81
-  XSNS_81,
-#endif
-
-#ifdef XSNS_82
-  XSNS_82,
-#endif
-
-#ifdef XSNS_83
-  XSNS_83,
-#endif
-
-#ifdef XSNS_84
-  XSNS_84,
-#endif
-
-#ifdef XSNS_85
-  XSNS_85,
-#endif
-
-#ifdef XSNS_86
-  XSNS_86,
-#endif
-
-#ifdef XSNS_87
-  XSNS_87,
-#endif
-
-#ifdef XSNS_88
-  XSNS_88,
-#endif
-
-#ifdef XSNS_89
-  XSNS_89,
-#endif
-
-#ifdef XSNS_90
-  XSNS_90,
-#endif
-
-#ifdef XSNS_91
-  XSNS_91,
-#endif
-
-#ifdef XSNS_92
-  XSNS_92,
-#endif
-
-#ifdef XSNS_93
-  XSNS_93,
-#endif
-
-#ifdef XSNS_94
-  XSNS_94,
-#endif
-
-#ifdef XSNS_95
-  XSNS_95,
-#endif
-
-#ifdef XSNS_96
-  XSNS_96,
-#endif
-
-#ifdef XSNS_97
-  XSNS_97,
-#endif
-
-#ifdef XSNS_98
-  XSNS_98,
-#endif
-
-#ifdef XSNS_99
-  XSNS_99
-#endif
-};
-
-
-
-bool XsnsEnabled(uint32_t sns_index)
-{
-  if (sns_index < sizeof(kXsnsList)) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t index = pgm_read_byte(kXsnsList + sns_index);
-#else
-    uint32_t index = kXsnsList[sns_index];
-#endif
-    return bitRead(Settings.sensors[index / 32], index % 32);
-  }
-  return true;
-}
-
-void XsnsSensorState(void)
-{
-  ResponseAppend_P(PSTR("\""));
-  for (uint32_t i = 0; i < sizeof(kXsnsList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t sensorid = pgm_read_byte(kXsnsList + i);
-#else
-    uint32_t sensorid = kXsnsList[i];
-#endif
-    bool disabled = false;
-    if (sensorid < MAX_XSNS_DRIVERS) {
-      disabled = !bitRead(Settings.sensors[sensorid / 32], sensorid % 32);
-    }
-    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", sensorid);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-
-
-
-
-bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index)
-{
-  xsns_index++;
-  if (xsns_index == xsns_present) { xsns_index = 0; }
-
-#ifndef USE_DEBUG_DRIVER
-  if (FUNC_WEB_SENSOR == Function) {
-#endif
-    uint32_t max_disabled = xsns_present;
-    while (!XsnsEnabled(xsns_index) && max_disabled--) {
-      xsns_index++;
-      if (xsns_index == xsns_present) { xsns_index = 0; }
-    }
-#ifndef USE_DEBUG_DRIVER
-  }
-#endif
-
-  return xsns_func_ptr[xsns_index](Function);
-}
-
-bool XsnsCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
-
-#ifdef PROFILE_XSNS_EVERY_SECOND
-  uint32_t profile_start_millis = millis();
-#endif
-
-  for (uint32_t x = 0; x < xsns_present; x++) {
-#ifdef USE_DEBUG_DRIVER
-    if (XsnsEnabled(x)) {
-#endif
-
-      if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(x)) { continue; }
-
-#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
-      uint32_t profile_start_millis = millis();
-#endif
-      result = xsns_func_ptr[x](Function);
-
-#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
-      uint32_t profile_millis = millis() - profile_start_millis;
-      if (profile_millis) {
-        if (FUNC_EVERY_SECOND == Function) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d to Sensor %d took %u mS"), uptime, Function, x, profile_millis);
-        }
-      }
-#endif
-
-      if (result && ((FUNC_COMMAND == Function) ||
-                     (FUNC_PIN_STATE == Function) ||
-                     (FUNC_COMMAND_SENSOR == Function)
-                    )) {
-        break;
-      }
-#ifdef USE_DEBUG_DRIVER
-    }
-#endif
-  }
-
-#ifdef PROFILE_XSNS_EVERY_SECOND
-  uint32_t profile_millis = millis() - profile_start_millis;
-  if (profile_millis) {
-    if (FUNC_EVERY_SECOND == Function) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d took %u mS"), uptime, Function, profile_millis);
-    }
-  }
-#endif
-
-  return result;
-}
-# 1 "C:/shared/sonoff/Git/Tasmota/tasmota/xx2c_interface.ino"
-# 20 "C:/shared/sonoff/Git/Tasmota/tasmota/xx2c_interface.ino"
-#ifdef USE_I2C
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kI2cList[] PROGMEM = {
-#else
-const uint8_t kI2cList[] = {
-#endif
-
-#ifdef XI2C_01
-  XI2C_01,
-#endif
-
-#ifdef XI2C_02
-  XI2C_02,
-#endif
-
-#ifdef XI2C_03
-  XI2C_03,
-#endif
-
-#ifdef XI2C_04
-  XI2C_04,
-#endif
-
-#ifdef XI2C_05
-  XI2C_05,
-#endif
-
-#ifdef XI2C_06
-  XI2C_06,
-#endif
-
-#ifdef XI2C_07
-  XI2C_07,
-#endif
-
-#ifdef XI2C_08
-  XI2C_08,
-#endif
-
-#ifdef XI2C_09
-  XI2C_09,
-#endif
-
-#ifdef XI2C_10
-  XI2C_10,
-#endif
-
-#ifdef XI2C_11
-  XI2C_11,
-#endif
-
-#ifdef XI2C_12
-  XI2C_12,
-#endif
-
-#ifdef XI2C_13
-  XI2C_13,
-#endif
-
-#ifdef XI2C_14
-  XI2C_14,
-#endif
-
-#ifdef XI2C_15
-  XI2C_15,
-#endif
-
-#ifdef XI2C_16
-  XI2C_16,
-#endif
-
-#ifdef XI2C_17
-  XI2C_17,
-#endif
-
-#ifdef XI2C_18
-  XI2C_18,
-#endif
-
-#ifdef XI2C_19
-  XI2C_19,
-#endif
-
-#ifdef XI2C_20
-  XI2C_20,
-#endif
-
-#ifdef XI2C_21
-  XI2C_21,
-#endif
-
-#ifdef XI2C_22
-  XI2C_22,
-#endif
-
-#ifdef XI2C_23
-  XI2C_23,
-#endif
-
-#ifdef XI2C_24
-  XI2C_24,
-#endif
-
-#ifdef XI2C_25
-  XI2C_25,
-#endif
-
-#ifdef XI2C_26
-  XI2C_26,
-#endif
-
-#ifdef XI2C_27
-  XI2C_27,
-#endif
-
-#ifdef XI2C_28
-  XI2C_28,
-#endif
-
-#ifdef XI2C_29
-  XI2C_29,
-#endif
-
-#ifdef XI2C_30
-  XI2C_30,
-#endif
-
-#ifdef XI2C_31
-  XI2C_31,
-#endif
-
-#ifdef XI2C_32
-  XI2C_32,
-#endif
-
-#ifdef XI2C_33
-  XI2C_33,
-#endif
-
-#ifdef XI2C_34
-  XI2C_34,
-#endif
-
-#ifdef XI2C_35
-  XI2C_35,
-#endif
-
-#ifdef XI2C_36
-  XI2C_36,
-#endif
-
-#ifdef XI2C_37
-  XI2C_37,
-#endif
-
-#ifdef XI2C_38
-  XI2C_38,
-#endif
-
-#ifdef XI2C_39
-  XI2C_39,
-#endif
-
-#ifdef XI2C_40
-  XI2C_40,
-#endif
-
-#ifdef XI2C_41
-  XI2C_41,
-#endif
-
-#ifdef XI2C_42
-  XI2C_42,
-#endif
-
-#ifdef XI2C_43
-  XI2C_43,
-#endif
-
-#ifdef XI2C_44
-  XI2C_44,
-#endif
-
-#ifdef XI2C_45
-  XI2C_45,
-#endif
-
-#ifdef XI2C_46
-  XI2C_46,
-#endif
-
-#ifdef XI2C_47
-  XI2C_47,
-#endif
-
-#ifdef XI2C_48
-  XI2C_48,
-#endif
-
-#ifdef XI2C_49
-  XI2C_49,
-#endif
-
-#ifdef XI2C_50
-  XI2C_50,
-#endif
-
-#ifdef XI2C_51
-  XI2C_51,
-#endif
-
-#ifdef XI2C_52
-  XI2C_52,
-#endif
-
-#ifdef XI2C_53
-  XI2C_53,
-#endif
-
-#ifdef XI2C_54
-  XI2C_54,
-#endif
-
-#ifdef XI2C_55
-  XI2C_55,
-#endif
-
-#ifdef XI2C_56
-  XI2C_56,
-#endif
-
-#ifdef XI2C_57
-  XI2C_57,
-#endif
-
-#ifdef XI2C_58
-  XI2C_58,
-#endif
-
-#ifdef XI2C_59
-  XI2C_59,
-#endif
-
-#ifdef XI2C_60
-  XI2C_60,
-#endif
-
-#ifdef XI2C_61
-  XI2C_61,
-#endif
-
-#ifdef XI2C_62
-  XI2C_62,
-#endif
-
-#ifdef XI2C_63
-  XI2C_63,
-#endif
-
-#ifdef XI2C_64
-  XI2C_64,
-#endif
-
-#ifdef XI2C_65
-  XI2C_65,
-#endif
-
-#ifdef XI2C_66
-  XI2C_66,
-#endif
-
-#ifdef XI2C_67
-  XI2C_67,
-#endif
-
-#ifdef XI2C_68
-  XI2C_68,
-#endif
-
-#ifdef XI2C_69
-  XI2C_69,
-#endif
-
-#ifdef XI2C_70
-  XI2C_70,
-#endif
-
-#ifdef XI2C_71
-  XI2C_71,
-#endif
-
-#ifdef XI2C_72
-  XI2C_72,
-#endif
-
-#ifdef XI2C_73
-  XI2C_73,
-#endif
-
-#ifdef XI2C_74
-  XI2C_74,
-#endif
-
-#ifdef XI2C_75
-  XI2C_75,
-#endif
-
-#ifdef XI2C_76
-  XI2C_76,
-#endif
-
-#ifdef XI2C_77
-  XI2C_77,
-#endif
-
-#ifdef XI2C_78
-  XI2C_78,
-#endif
-
-#ifdef XI2C_79
-  XI2C_79,
-#endif
-
-#ifdef XI2C_80
-  XI2C_80,
-#endif
-
-#ifdef XI2C_81
-  XI2C_81,
-#endif
-
-#ifdef XI2C_82
-  XI2C_82,
-#endif
-
-#ifdef XI2C_83
-  XI2C_83,
-#endif
-
-#ifdef XI2C_84
-  XI2C_84,
-#endif
-
-#ifdef XI2C_85
-  XI2C_85,
-#endif
-
-#ifdef XI2C_86
-  XI2C_86,
-#endif
-
-#ifdef XI2C_87
-  XI2C_87,
-#endif
-
-#ifdef XI2C_88
-  XI2C_88,
-#endif
-
-#ifdef XI2C_89
-  XI2C_89,
-#endif
-
-#ifdef XI2C_90
-  XI2C_90,
-#endif
-
-#ifdef XI2C_91
-  XI2C_91,
-#endif
-
-#ifdef XI2C_92
-  XI2C_92,
-#endif
-
-#ifdef XI2C_93
-  XI2C_93,
-#endif
-
-#ifdef XI2C_94
-  XI2C_94,
-#endif
-
-#ifdef XI2C_95
-  XI2C_95,
-#endif
-
-#ifdef XI2C_96
-  XI2C_96
-#endif
-};
-
-
-
-bool I2cEnabled(uint32_t i2c_index)
-{
-  return (i2c_flg && bitRead(Settings.i2c_drivers[i2c_index / 32], i2c_index % 32));
-}
-
-void I2cDriverState(void)
-{
-  ResponseAppend_P(PSTR("\""));
-  for (uint32_t i = 0; i < sizeof(kI2cList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t i2c_driver_id = pgm_read_byte(kI2cList + i);
-#else
-    uint32_t i2c_driver_id = kI2cList[i];
-#endif
-    bool disabled = false;
-    if (i2c_driver_id < MAX_I2C_DRIVERS) {
-      disabled = !bitRead(Settings.i2c_drivers[i2c_driver_id / 32], i2c_driver_id % 32);
-    }
-    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", i2c_driver_id);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-#endif
\ No newline at end of file
diff --git a/tasmota/xsns_64_aht10.ino b/tasmota/xsns_63_aht1x.ino
similarity index 94%
rename from tasmota/xsns_64_aht10.ino
rename to tasmota/xsns_63_aht1x.ino
index 95d5a3e2b..59a02a7de 100644
--- a/tasmota/xsns_64_aht10.ino
+++ b/tasmota/xsns_63_aht1x.ino
@@ -1,7 +1,7 @@
 /*
-  xsns_64_AHT10.ino - AHT10 I2C temperature and humidity sensor support for Tasmota
+  xsns_63_AHT1x.ino - AHT10 I2C temperature and humidity sensor support for Tasmota
 
-  Copyright (C) 2020  M. Wagner
+  Copyright (C) 2020  Martin Wagner
 
   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
@@ -18,14 +18,14 @@
 */
 
 #ifdef USE_I2C
-#ifdef USE_AHT10
+#ifdef USE_AHT1x
 /*********************************************************************************************\
- * AHT10 - Temperature and Humidity
+ * AHT10/15 - Temperature and Humidity
  *
  * I2C Address: 0x38
 \*********************************************************************************************/
 
-#define XSNS_64              64
+#define XSNS_63              63
 #define XI2C_43              43  // See I2CDEVICES.md
 
 #define AHT10_ADDR           0x38
@@ -40,7 +40,7 @@ struct AHT10 {
   float   temperature = NAN;
   uint8_t valid = 0;
   uint8_t count = 0;
-  char    name[6] = "AHT10";
+  char    name[9] = "AHT10/15";
 } AHT10;
 
 
@@ -60,6 +60,7 @@ bool AHT10Read(void)
     {
         temp[i] = Wire.read();
     }
+
     result_h = ((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4;
     result_t = ((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5];
 
@@ -160,7 +161,7 @@ void AHT10Show(bool json)
  * Interface
 \*********************************************************************************************/
 
-bool Xsns64(uint8_t function)
+bool Xsns63(uint8_t function)
 {
   if (!I2cEnabled(XI2C_43)) { return false; }
 

From 5c4864499401af9a84a3c90aec43d53904398971 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Wed, 19 Feb 2020 10:23:56 +0100
Subject: [PATCH 283/403] typo change

---
 tasmota/my_user_config.h  | 2 +-
 tasmota/xsns_63_aht1x.ino | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 7f7fa3a45..d641ac761 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -486,7 +486,7 @@
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 //  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
-  #define USE_AHT1x                              // [I2cDriver43] Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
+//  #define USE_AHT1x                              // [I2cDriver43] Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/xsns_63_aht1x.ino b/tasmota/xsns_63_aht1x.ino
index 59a02a7de..4407fb625 100644
--- a/tasmota/xsns_63_aht1x.ino
+++ b/tasmota/xsns_63_aht1x.ino
@@ -56,7 +56,7 @@ bool AHT10Read(void)
     delay(100);
 
     Wire.requestFrom(AHT10_ADDR, 6);
-    for(unsigned char i = 0; Wire.available() > 0; i++)
+    for(uint8_t i = 0; Wire.available() > 0; i++)
     {
         temp[i] = Wire.read();
     }

From 414020d19fe959e5a04365a26f9fdcf433d01fbf Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 19 Feb 2020 12:21:53 +0100
Subject: [PATCH 284/403] Use new syntax for providing ldscript

---
 platformio_override_sample.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 383e7f04b..93bbbb5ba 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -226,10 +226,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest beta
-platform                  = espressif8266@2.3.1
+platform                  = espressif8266@2.3.2
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
+board_build.ldscript      = eagle.flash.1m.ld
 build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
                             -DNOPRINTFLOAT
 ; NONOSDK221

From fbd2216d094778f28198965d49a7b2a47f32e676 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Wed, 19 Feb 2020 14:06:35 +0100
Subject: [PATCH 285/403] Update xsns_63_aht1x.ino

Sensor Name changement
---
 tasmota/xsns_63_aht1x.ino | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_63_aht1x.ino b/tasmota/xsns_63_aht1x.ino
index 4407fb625..815f3a30a 100644
--- a/tasmota/xsns_63_aht1x.ino
+++ b/tasmota/xsns_63_aht1x.ino
@@ -40,13 +40,13 @@ struct AHT10 {
   float   temperature = NAN;
   uint8_t valid = 0;
   uint8_t count = 0;
-  char    name[9] = "AHT10/15";
+  char    name[6] = "AHT1x";
 } AHT10;
 
 
 bool AHT10Read(void)
 {
-  unsigned long result_t, result_h, temp[6];
+  unsigned long result_t, result_h, data[6];
 
   if (AHT10.valid) { AHT10.valid--; }
 
@@ -58,11 +58,11 @@ bool AHT10Read(void)
     Wire.requestFrom(AHT10_ADDR, 6);
     for(uint8_t i = 0; Wire.available() > 0; i++)
     {
-        temp[i] = Wire.read();
+        data[i] = Wire.read();
     }
 
-    result_h = ((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4;
-    result_t = ((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5];
+    result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
+    result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
 
   AHT10.humidity = result_h * 100 / 1048576;
   AHT10.temperature  =  ((200 * result_t) / 1048576) - 50;

From 84a2da2ee27c480747668583242bfb1a2051ec36 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Wed, 19 Feb 2020 14:24:37 +0100
Subject: [PATCH 286/403] Update support_features.ino

---
 tasmota/support_features.ino | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 648235f12..85f5a77ea 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -516,7 +516,6 @@ void GetFeatures(void)
 #ifdef USE_AHT1x
   feature5 |= 0x10000000;  // xsns_63_aht1x.ino
 #endif
-//  feature5 |= 0x10000000;
 //  feature5 |= 0x20000000;
 //  feature5 |= 0x40000000;
 //  feature5 |= 0x80000000;

From 6a84899e1072358a2505d24018a9a4ecedf8fba1 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 19 Feb 2020 15:23:59 +0100
Subject: [PATCH 287/403] Eliminating call sntp_get_real_time

Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
---
 RELEASENOTES.md             |  1 +
 tasmota/CHANGELOG.md        |  1 +
 tasmota/support_command.ino |  8 +++----
 tasmota/support_rtc.ino     | 46 +++++++++++++++----------------------
 tasmota/tasmota.h           |  2 +-
 tasmota/xsns_33_ds3231.ino  |  4 ++--
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0962f6617..5ec616909 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -61,6 +61,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change wifi connectivity stability (#7602)
 - Change some wifi code to attempt faster connection (#7621)
 - Change MQTT message size with additional 200 characters
+- Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 0366cfb7f..ff2a178f6 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Change MQTT message size with additional 200 characters
 - Change some wifi code to attempt faster connection (#7621)
+- Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
 
 ### 8.1.0.7 20200210
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index df5abda86..c749a3be2 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -449,13 +449,13 @@ void CmndStatus(void)
 #if defined(USE_TIMERS) && defined(USE_SUNRISE)
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
                           D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"),
-                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
-                          GetTime(3).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
+                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
+                          GetDateAndTime(DT_STD).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
 #else
     Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
                           D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s}}"),
-                          GetTime(0).c_str(), GetTime(1).c_str(), GetTime(2).c_str(),
-                          GetTime(3).c_str(), stemp);
+                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
+                          GetDateAndTime(DT_STD).c_str(), stemp);
 #endif  // USE_TIMERS and USE_SUNRISE
     MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7"));
   }
diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino
index f8fb25779..7af66653a 100644
--- a/tasmota/support_rtc.ino
+++ b/tasmota/support_rtc.ino
@@ -170,8 +170,8 @@ String GetDT(uint32_t time)
 /*
  * timestamps in https://en.wikipedia.org/wiki/ISO_8601 format
  *
- *  DT_UTC - current data and time in Greenwich, England (aka GMT)
- *  DT_LOCAL - current date and time taking timezone into account
+ *  DT_UTC     - current data and time in Greenwich, England (aka GMT)
+ *  DT_LOCAL   - current date and time taking timezone into account
  *  DT_RESTART - the date and time this device last started, in local timezone
  *
  * Format:
@@ -184,21 +184,30 @@ String GetDateAndTime(uint8_t time_type)
   uint32_t time = Rtc.local_time;
 
   switch (time_type) {
-    case DT_BOOTCOUNT:
-      time = Settings.bootcount_reset_time;
-      break;
-    case DT_ENERGY:
-      time = Settings.energy_kWhtotal_time;
-      break;
     case DT_UTC:
       time = Rtc.utc_time;
       break;
+//    case DT_LOCALNOTZ:  // Is default anyway but allows for not appendig timezone
+//      time = Rtc.local_time;
+//      break;
+    case DT_DST:
+      time = Rtc.daylight_saving_time;
+      break;
+    case DT_STD:
+      time = Rtc.standard_time;
+      break;
     case DT_RESTART:
       if (Rtc.restart_time == 0) {
         return "";
       }
       time = Rtc.restart_time;
       break;
+    case DT_ENERGY:
+      time = Settings.energy_kWhtotal_time;
+      break;
+    case DT_BOOTCOUNT:
+      time = Settings.bootcount_reset_time;
+      break;
   }
   String dt = GetDT(time);  // 2017-03-07T11:08:02
   if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {  // SetOption52 - Append timezone to JSON time
@@ -207,23 +216,6 @@ String GetDateAndTime(uint8_t time_type)
   return dt;  // 2017-03-07T11:08:02-07:00
 }
 
-String GetTime(int type)
-{
-  /* type 1 - Local time
-   * type 2 - Daylight Savings time
-   * type 3 - Standard time
-   */
-  char stime[25];   // Skip newline
-
-  uint32_t time = Rtc.utc_time;
-  if (1 == type) time = Rtc.local_time;
-  if (2 == type) time = Rtc.daylight_saving_time;
-  if (3 == type) time = Rtc.standard_time;
-  snprintf_P(stime, sizeof(stime), sntp_get_real_time(time));
-
-  return String(stime);  // Thu Nov 01 11:41:02 2018
-}
-
 uint32_t UpTime(void)
 {
   if (Rtc.restart_time) {
@@ -400,8 +392,8 @@ void RtcSecond(void)
         Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
 
         // Do not use AddLog_P2 here (interrupt routine) if syslog or mqttlog is enabled. UDP/TCP will force exception 9
-        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-          DriftTime(), GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ")%s, (" D_DST_TIME ")%s, (" D_STD_TIME ")%s"),
+          DriftTime(), GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
 
         if (Rtc.local_time < START_VALID_TIME) {  // 2016-01-01
           rules_flag.time_init = 1;
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 2aa441878..377f9e8b8 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -226,7 +226,7 @@ enum WeekInMonthOptions {Last, First, Second, Third, Fourth};
 enum DayOfTheWeekOptions {Sun=1, Mon, Tue, Wed, Thu, Fri, Sat};
 enum MonthNamesOptions {Jan=1, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec};
 enum HemisphereOptions {North, South};
-enum GetDateAndTimeOptions { DT_LOCAL, DT_UTC, DT_RESTART, DT_ENERGY, DT_BOOTCOUNT };
+enum GetDateAndTimeOptions { DT_LOCAL, DT_UTC, DT_LOCALNOTZ, DT_DST, DT_STD, DT_RESTART, DT_ENERGY, DT_BOOTCOUNT };
 
 enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE};
 
diff --git a/tasmota/xsns_33_ds3231.ino b/tasmota/xsns_33_ds3231.ino
index 0c72c6b11..09814bcf0 100644
--- a/tasmota/xsns_33_ds3231.ino
+++ b/tasmota/xsns_33_ds3231.ino
@@ -143,7 +143,7 @@ void DS3231EverySecond(void)
     Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
     Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
     AddLog_P2(LOG_LEVEL_INFO, PSTR("Set time from DS3231 to RTC (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
     if (Rtc.local_time < START_VALID_TIME) {  // 2016-01-01
       rules_flag.time_init = 1;
     } else {
@@ -152,7 +152,7 @@ void DS3231EverySecond(void)
   }
   else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs(Rtc.utc_time - ReadFromDS3231()) > 60) {//if time is valid and is drift from RTC in more that 60 second
     AddLog_P2(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
+                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
     SetDS3231Time (Rtc.utc_time); //update the DS3231 time
     ds3231WriteStatus = true;
   }

From f7d4d5ddb18870e3b3687bb1e62f388acc92cec3 Mon Sep 17 00:00:00 2001
From: device111 <48546979+device111@users.noreply.github.com>
Date: Wed, 19 Feb 2020 19:49:09 +0100
Subject: [PATCH 288/403] Ad release note

---
 RELEASENOTES.md           |  1 +
 tasmota/xsns_63_aht1x.ino | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0962f6617..cf7184534 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -103,3 +103,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for FiF LE-01MR energy meter by saper-2 (#7584)
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
+- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
\ No newline at end of file
diff --git a/tasmota/xsns_63_aht1x.ino b/tasmota/xsns_63_aht1x.ino
index 815f3a30a..b3b17e0e4 100644
--- a/tasmota/xsns_63_aht1x.ino
+++ b/tasmota/xsns_63_aht1x.ino
@@ -50,22 +50,22 @@ bool AHT10Read(void)
 
   if (AHT10.valid) { AHT10.valid--; }
 
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorMeasureCmd, 3);
-    Wire.endTransmission();
-    delay(100);
+   Wire.beginTransmission(AHT10_ADDR);
+   Wire.write(eSensorMeasureCmd, 3);
+   Wire.endTransmission();
+   delay(100);
 
-    Wire.requestFrom(AHT10_ADDR, 6);
-    for(uint8_t i = 0; Wire.available() > 0; i++)
-    {
-        data[i] = Wire.read();
-    }
+   Wire.requestFrom(AHT10_ADDR, 6);
+   for(uint8_t i = 0; Wire.available() > 0; i++)
+   {
+      data[i] = Wire.read();
+   }
 
-    result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
-    result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
+   result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
+   result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
 
-  AHT10.humidity = result_h * 100 / 1048576;
-  AHT10.temperature  =  ((200 * result_t) / 1048576) - 50;
+   AHT10.humidity = result_h * 100 / 1048576;
+   AHT10.temperature  =  ((200 * result_t) / 1048576) - 50;
 
   if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
 

From 46ad5166e1b02472f5ff26614b8154501d3569c0 Mon Sep 17 00:00:00 2001
From: Denis <dsborets@MacBook-Pro.local>
Date: Wed, 19 Feb 2020 21:55:20 -0800
Subject: [PATCH 289/403] Add Wemos DC mottor shild (v1.0.0) support

---
 I2CDEVICES.md                      |   1 +
 tasmota/my_user_config.h           |   3 +
 tasmota/support_features.ino       |   4 +-
 tasmota/tasmota_post.h             |   3 +
 tasmota/xdrv_34_wemos_motor_v1.ino | 188 +++++++++++++++++++++++++++++
 5 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 tasmota/xdrv_34_wemos_motor_v1.ino

diff --git a/I2CDEVICES.md b/I2CDEVICES.md
index c7b42108f..57e906af7 100644
--- a/I2CDEVICES.md
+++ b/I2CDEVICES.md
@@ -64,4 +64,5 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
   42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
   42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
+  43  | USE_WEMOS_MOTOR_V1  | xdrv_34 |          | 0x30        | WEMOS motor shield v1.0.0 (6612FNG)
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 67ab1cf1c..af3295928 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -501,6 +501,9 @@
       #define MTX_ADDRESS7     0x00              // [DisplayAddress7] I2C address of seventh 8x8 matrix module
       #define MTX_ADDRESS8     0x00              // [DisplayAddress8] I2C address of eigth 8x8 matrix module
 //    #define USE_DISPLAY_SH1106                   // [DisplayModel 7] [I2cDriver6] Enable SH1106 Oled 128x64 display (I2C addresses 0x3C and 0x3D)
+  #define USE_WEMOS_MOTOR_V1
+    #define USE_WEMOS_MOTOR_V1_ADDR  0x30
+    #define USE_WEMOS_MOTOR_V1_FREQ  1000
 #endif  // USE_I2C
 
 // -- SPI sensors ---------------------------------
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 2dc25b8e5..224ef86f6 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -513,8 +513,10 @@ void GetFeatures(void)
 #ifdef USE_LE01MR
   feature5 |= 0x08000000;  // xnrg_13_fif_le01mr.ino
 #endif
+#ifdef USE_WEMOS_MOTOR_V1
+  feature5 |= 0x10000000;  // xdrv_34_wemos_motor_v1.ino
+#endif
 
-//  feature5 |= 0x10000000;
 //  feature5 |= 0x20000000;
 //  feature5 |= 0x40000000;
 //  feature5 |= 0x80000000;
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 615ff8919..33e9c200b 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -221,6 +221,9 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_ARDUINO_SLAVE                        // Add support for Arduino Uno/Pro Mini via serial interface including flashing (+2k3 code, 44 mem)
 #undef DEBUG_THEO                                // Disable debug code
 #undef USE_DEBUG_DRIVER                          // Disable debug code
+#define USE_WEMOS_MOTOR_V1
+  #define USE_WEMOS_MOTOR_V1_ADDR  0x30
+  #define USE_WEMOS_MOTOR_V1_FREQ  1000
 #endif  // FIRMWARE_SENSORS
 
 /*********************************************************************************************\
diff --git a/tasmota/xdrv_34_wemos_motor_v1.ino b/tasmota/xdrv_34_wemos_motor_v1.ino
new file mode 100644
index 000000000..fbf03d66d
--- /dev/null
+++ b/tasmota/xdrv_34_wemos_motor_v1.ino
@@ -0,0 +1,188 @@
+/*
+  xdrv_34_wemos_motor_v1.ino - Support for I2C WEMOS motor shield (6612FNG)
+
+  Copyright (C) 2020  Andre Thomas and Theo Arends
+
+  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/>.
+*/
+
+#ifdef USE_I2C
+#ifdef USE_WEMOS_MOTOR_V1
+/*********************************************************************************************\
+ * WEMOS_MOTOR_V1 - DC motor driver shield (6612FNG) v 1.0.0
+ *
+ * I2C Address: 0x30
+ * Command format:
+ * driver43 <command>,<motor>,<direction>{,<duty>}
+ * command:
+ *    RESET - reset a motor shield
+ *    SETMOTOR - seter motor state
+ * motor:
+ *    0 - motor A
+ *    1 - motor B
+ * direction:
+ *    0 - short break
+ *    1 - CCW
+ *    2 - CW
+ *    3 - stop
+ *    4 - standby
+ * duty (optional):
+ *    0 - 100% (100% by default)
+\*********************************************************************************************/
+
+#define XDRV_34 34
+#define XI2C_43 43 // See I2CDEVICES.md
+
+#define MOTOR_A 0
+#define MOTOR_B 1
+
+#define SHORT_BRAKE 0
+#define CCW 1
+#define CW 2
+#define STOP 3
+#define STANDBY 4
+
+bool wemos_driver_detected = false;
+
+uint8_t _motor;
+
+void Wemos_Driver_Detect(void)
+{
+  if (!I2cActive(USE_WEMOS_MOTOR_V1_ADDR))
+  {
+    I2cSetActiveFound(USE_WEMOS_MOTOR_V1_ADDR, "WEMOS_MOTOR_V1");
+    wemos_driver_detected = true;
+    Motor_Reset();
+    return;
+  }
+}
+
+void Motor_Reset(void)
+{
+  Wire.begin();
+  Motor_SetFreq(USE_WEMOS_MOTOR_V1_FREQ);
+  Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"RESET\":\"OK\"}}"));
+}
+
+void Motor_SetFreq(uint32_t freq)
+{
+  Wire.beginTransmission(USE_WEMOS_MOTOR_V1_ADDR);
+  Wire.write(((byte)(freq >> 16)) & (byte)0x0f);
+  Wire.write((byte)(freq >> 16));
+  Wire.write((byte)(freq >> 8));
+  Wire.write((byte)freq);
+  Wire.endTransmission(); // stop transmitting
+  delay(100);
+}
+
+void Motor_SetMotor(uint8_t motor, uint8_t dir, float pwm_val)
+{
+  uint16_t _pwm_val;
+  Wire.beginTransmission(USE_WEMOS_MOTOR_V1_ADDR);
+  Wire.write(motor | (byte)0x10);
+  Wire.write(dir);
+
+  _pwm_val = uint16_t(pwm_val * 100);
+
+  if (_pwm_val > 10000)
+    _pwm_val = 10000;
+
+  Wire.write((byte)(_pwm_val >> 8));
+  Wire.write((byte)_pwm_val);
+  Wire.endTransmission();
+
+  delay(100);
+
+  Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"SETMOTOR\":\"OK\"}}"));
+}
+
+bool Motor_Command(void)
+{
+  uint8_t args_count = 0;
+  if (XdrvMailbox.data_len > 0)
+  {
+    args_count = 1;
+  }
+  else
+  {
+    return false;
+  }
+
+  for (uint32_t idx = 0; idx < XdrvMailbox.data_len; idx++)
+  {
+    if (' ' == XdrvMailbox.data[idx])
+    {
+      XdrvMailbox.data[idx] = ',';
+    }
+    if (',' == XdrvMailbox.data[idx])
+    {
+      args_count++;
+    }
+  }
+  UpperCase(XdrvMailbox.data, XdrvMailbox.data);
+
+  char *command = strtok(XdrvMailbox.data, ",");
+
+  if (strcmp(command, "RESET") == 0)
+  {
+    Motor_Reset();
+    return true;
+  }
+
+  if (strcmp(command, "SETMOTOR") == 0)
+  {
+    if (args_count >= 3)
+    {
+
+      int motor = atoi(strtok(NULL, ","));
+      int dir = atoi(strtok(NULL, ","));
+      int duty = 100;
+
+      if (args_count == 4)
+      {
+        duty = atoi(strtok(NULL, ","));
+      }
+
+      Motor_SetMotor(motor, dir, duty);
+
+      return true;
+    }
+  }
+  return false;
+}
+
+bool Xdrv34(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_43))
+  {
+    return false;
+  }
+  bool result = false;
+  if (FUNC_INIT == function)
+  {
+    Wemos_Driver_Detect();
+    result = wemos_driver_detected;
+  }
+  else if (wemos_driver_detected)
+  {
+    if (FUNC_COMMAND_DRIVER == function && XI2C_43 == XdrvMailbox.index)
+    {
+      result = Motor_Command();
+    }
+  }
+  return result;
+}
+
+#endif // USE_WEMOS_MOTOR_V1
+#endif // USE_IC2

From 5e4d8e5641936f58bc448d36444a63a70266c984 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 20 Feb 2020 10:07:00 +0100
Subject: [PATCH 290/403] Fix relation between RSSI and signal strength

Fix relation between RSSI and signal strength
---
 RELEASENOTES.md               |  1 +
 tasmota/CHANGELOG.md          |  1 +
 tasmota/support.ino           |  3 ++-
 tasmota/support_tasmota.ino   |  3 ++-
 tasmota/xdrv_01_webserver.ino | 10 ++++++----
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5ec616909..781913f39 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -75,6 +75,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix PWM flickering at low levels (#7415)
 - Fix Hass sensor discovery part 1/4 by Federico Leoni (#7582, #7548)
 - Fix MaxPower functionality (#7647)
+- Fix relation between RSSI and signal strength
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
 - Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ff2a178f6..cf1679ad0 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Change MQTT message size with additional 200 characters
 - Change some wifi code to attempt faster connection (#7621)
 - Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
+- Fix relation between RSSI and signal strength
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
 
 ### 8.1.0.7 20200210
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 336774105..ed2cea4c1 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -51,7 +51,8 @@ void OsWatchTicker(void)
   uint32_t last_run = abs(t - oswatch_last_loop_time);
 
 #ifdef DEBUG_THEO
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), last_run);
+  int32_t rssi = WiFi.RSSI();
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(rssi), rssi, last_run);
 #endif  // DEBUG_THEO
   if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
 //    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_OSWATCH " " D_BLOCKED_LOOP ". " D_RESTARTING));  // Save iram space
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 888893fea..1ea7f631d 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -647,9 +647,10 @@ void MqttShowState(void)
     MqttShowPWMState();
   }
 
+  int32_t rssi = WiFi.RSSI();
   ResponseAppend_P(PSTR(",\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_BSSID "\":\"%s\",\"" D_JSON_CHANNEL "\":%d,\"" D_JSON_RSSI "\":%d,\"" D_JSON_SIGNAL "\":%d,\"" D_JSON_LINK_COUNT "\":%d,\"" D_JSON_DOWNTIME "\":\"%s\"}}"),
     Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WiFi.BSSIDstr().c_str(), WiFi.channel(),
-    WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI(), WifiLinkCount(), WifiDowntime().c_str());
+    WifiGetRssiAsQuality(rssi), rssi, WifiLinkCount(), WifiDowntime().c_str());
 }
 
 void MqttPublishTeleState(void)
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index fc143f73a..29eece8d4 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1719,16 +1719,17 @@ void HandleWifiConfiguration(void)
         //display networks in page
         for (uint32_t i = 0; i < n; i++) {
           if (-1 == indices[i]) { continue; }  // skip dups
+          int32_t rssi = WiFi.RSSI(indices[i])
           DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"),
-            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), WiFi.RSSI(indices[i]));
-          int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i]));
+            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), rssi);
+          int quality = WifiGetRssiAsQuality(rssi);
           int auth = WiFi.encryptionType(indices[i]);
           char encryption[20];
           WSContentSend_P(PSTR("<div><a href='#p' onclick='c(this)'>%s</a>&nbsp;(%d)&nbsp<span class='q'>%s %d%% (%d dBm)</span></div>"),
             HtmlEscape(WiFi.SSID(indices[i])).c_str(),
             WiFi.channel(indices[i]),
             GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
-            quality, WiFi.RSSI(indices[i])
+            quality, rssi
           );
           delay(0);
 
@@ -2067,7 +2068,8 @@ void HandleInformation(void)
     WSContentSend_P(PSTR("}1" D_FRIENDLY_NAME " %d}2%s"), i +1, SettingsText(SET_FRIENDLYNAME1 +i));
   }
   WSContentSend_P(PSTR("}1}2&nbsp;"));  // Empty line
-  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(WiFi.RSSI()), WiFi.RSSI());
+  int32_t rssi = WiFi.RSSI();
+  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(rssi), rssi);
   WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "");
 #if LWIP_IPV6
     String ipv6_addr = WifiGetIPv6();

From 9b1fc4342bd1262d71d6a406e99374d5e6548bd5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 20 Feb 2020 11:24:35 +0100
Subject: [PATCH 291/403] Revert wifi connectivity stability introduced in
 8.1.0.5

Revert wifi connectivity stability introduced in 8.1.0.5 (#7746, #7602, #7621)
---
 RELEASENOTES.md           |  4 +-
 tasmota/CHANGELOG.md      |  4 ++
 tasmota/support_wifi.ino  | 82 +++++++++------------------------------
 tasmota/tasmota_version.h |  2 +-
 4 files changed, 25 insertions(+), 67 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 781913f39..c22a4c59d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,14 +52,12 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.8
+### Version 8.1.0.9
 
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Change IRremoteESP8266 library updated to v2.7.3
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
-- Change wifi connectivity stability (#7602)
-- Change some wifi code to attempt faster connection (#7621)
 - Change MQTT message size with additional 200 characters
 - Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index cf1679ad0..186ff457e 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.9 20200220
+
+- Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
+
 ### 8.1.0.8 20200212
 
 - Change MQTT message size with additional 200 characters
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 376e7c6b1..df509b9d3 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -22,17 +22,14 @@
 \*********************************************************************************************/
 
 #ifndef WIFI_RSSI_THRESHOLD
-// Decrease the roam threshold from 10 to 5 to address devices connecting at very low RSSI and being close to inoperative
-#define WIFI_RSSI_THRESHOLD     5          // Difference in dB between current network and scanned network
+#define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
 #endif
 #ifndef WIFI_RESCAN_MINUTES
-// Increase rescan interval from 44 to 5 minutes to improve ability for devices to reach network harmony
-#define WIFI_RESCAN_MINUTES     5          // Number of minutes between wifi network rescan
+#define WIFI_RESCAN_MINUTES     44         // Number of minutes between wifi network rescan
 #endif
 
 const uint8_t WIFI_CONFIG_SEC = 180;       // seconds before restart
-// Drop from 20 seconds to 5 seconds since we control the reconnections, not the Arduino SDK
-const uint8_t WIFI_CHECK_SEC = 5;          // seconds
+const uint8_t WIFI_CHECK_SEC = 20;         // seconds
 const uint8_t WIFI_RETRY_OFFSET_SEC = 20;  // seconds
 
 #include <ESP8266WiFi.h>                   // Wifi, MQTT, Ota, WifiManager
@@ -52,8 +49,7 @@ struct WIFI {
   uint8_t config_counter = 0;
   uint8_t mdns_begun = 0;                  // mDNS active
   uint8_t scan_state;
-  uint8_t bssid[6] = {0};
-  uint8_t bssid_last[6] = {0};             // store the last connect bssid
+  uint8_t bssid[6];
   int8_t best_network_db;
 } Wifi;
 
@@ -187,11 +183,7 @@ void WifiBegin(uint8_t flag, uint8_t channel)
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) { WiFi.setPhyMode(WIFI_PHY_MODE_11N); }  // B/G/N
 //  if (WiFi.getPhyMode() != WIFI_PHY_MODE_11G) { WiFi.setPhyMode(WIFI_PHY_MODE_11G); }  // B/G
   if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
-
-  // Handle the reconnection in WifiCheckIp() since the autoreconnect keeps sending deauthentication messages which causes the AP to block traffic as it looks like an DoS attack
-  // This needs to be explicitly called as "false" otherwise the default is enabled
-//    WiFi.setAutoReconnect(false);  // See #7621
-
+//  WiFi.setAutoReconnect(true);
   switch (flag) {
   case 0:  // AP1
   case 1:  // AP2
@@ -249,7 +241,7 @@ void WifiBeginAfterScan(void)
   if (2 == Wifi.scan_state) {
     uint8_t* bssid = WiFi.BSSID();                  // Get current bssid
     memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
-    Wifi.best_network_db = WiFi.RSSI();                  // Get current rssi and add threshold
+    Wifi.best_network_db = WiFi.RSSI();             // Get current rssi and add threshold
     if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
       Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
     }
@@ -273,12 +265,6 @@ void WifiBeginAfterScan(void)
   }
   // Scan done
   if (5 == Wifi.scan_state) {
-    uint32_t number_known = 0;                                              // count the number of known AP's so we can clear the Wifi.bssid_last if there is only one
-    int32_t channel_max = 0;                                                // No scan result
-    int8_t ap_max = 3;                                                      // AP default if not found
-    uint8_t bssid_max[6];                                                   // Save last bssid
-    memcpy((void*) &bssid_max, (void*) &Wifi.bssid, sizeof(bssid_max));     // store the strongest bssid
-
     int32_t channel = 0;                            // No scan result
     int8_t ap = 3;                                  // AP default if not found
     uint8_t last_bssid[6];                          // Save last bssid
@@ -302,25 +288,12 @@ void WifiBeginAfterScan(void)
         for (j = 0; j < MAX_SSIDS; j++) {
           if (ssid_scan == SettingsText(SET_STASSID1 + j)) {  // SSID match
             known = true;
-            number_known++;
             if (rssi_scan > Wifi.best_network_db) {      // Best network
               if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {  // Check for passphrase if not open wlan
-                // store the max values in case there is only one AP and we need to try to reconnect
-                memcpy((void*) &bssid_max, (void*) bssid_scan, sizeof(bssid_max));
-                channel_max = chan_scan;
-                ap_max = j;
-                // if the bssid is not the same as the last failed attempt, force picking the next strongest AP to prevent getting stuck on a strong RSSI, but poor channel health
-                for (uint32_t i = 0; i < sizeof(Wifi.bssid_last); i++) {
-                  if (bssid_scan[i] != Wifi.bssid_last[i]) {
-                    Wifi.best_network_db = (int8_t)rssi_scan;
-                    channel = chan_scan;
-                    ap = j;                             // AP1 or AP2
-                    memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
-                    // save the last bssid used
-                    memcpy((void*) &Wifi.bssid_last, (void*) bssid_scan, sizeof(Wifi.bssid_last));
-                   break;
-                  }
-                }
+                Wifi.best_network_db = (int8_t)rssi_scan;
+                channel = chan_scan;
+                ap = j;                             // AP1 or AP2
+                memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
               }
             }
             break;
@@ -340,16 +313,6 @@ void WifiBeginAfterScan(void)
       WiFi.scanDelete();                            // Clean up Ram
       delay(0);
     }
-
-    // reset the last bssid if there is only one AP to allow the reconnect of the same AP on the next cycle
-    if (number_known == 1) {
-      // clear the last value
-      memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
-      memcpy((void*) &Wifi.bssid, (void*) bssid_max, sizeof(Wifi.bssid));
-      channel = channel_max;
-      ap = ap_max;
-    }
-
     Wifi.scan_state = 0;
     // If bssid changed then (re)connect wifi
     for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
@@ -424,13 +387,15 @@ void WifiCheckIp(void)
 #else
   if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
 #endif  // LWIP_IPV6=1
-    // initialize the last connect bssid since we had a successful connection
-    memset((void*) &Wifi.bssid_last, 0, sizeof(Wifi.bssid_last));
     WifiSetState(1);
     Wifi.counter = WIFI_CHECK_SEC;
     Wifi.retry = Wifi.retry_init;
     if (Wifi.status != WL_CONNECTED) {
       AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
+//      AddLog_P(LOG_LEVEL_INFO, PSTR("Wifi: Set IP addresses"));
+      Settings.ip_address[1] = (uint32_t)WiFi.gatewayIP();
+      Settings.ip_address[2] = (uint32_t)WiFi.subnetMask();
+      Settings.ip_address[3] = (uint32_t)WiFi.dnsIP();
     }
     Wifi.status = WL_CONNECTED;
 #ifdef USE_DISCOVERY
@@ -448,13 +413,11 @@ void WifiCheckIp(void)
     switch (Wifi.status) {
       case WL_CONNECTED:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
-        // if poor channel health prevents DHCP broadcast from succeeding, restart the request
-        // The code will eventually do a recoonect when the 1/2 interval is hit to try another access point if this remains unsuccessful
-        wifi_station_dhcpc_start();
+        Wifi.status = 0;
+        Wifi.retry = Wifi.retry_init;
         break;
       case WL_NO_SSID_AVAIL:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
-
         if (WIFI_WAIT == Settings.sta_config) {
           Wifi.retry = Wifi.retry_init;
         } else {
@@ -465,21 +428,17 @@ void WifiCheckIp(void)
             Wifi.retry = 0;
           }
         }
-
         break;
       case WL_CONNECT_FAILED:
         AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
-
         if (Wifi.retry > (Wifi.retry_init / 2)) {
           Wifi.retry = Wifi.retry_init / 2;
         }
         else if (Wifi.retry) {
           Wifi.retry = 0;
         }
-
         break;
       default:  // WL_IDLE_STATUS and WL_DISCONNECTED
-        // log on the 1/2 or full interval
         if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
           AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
         } else {
@@ -491,11 +450,9 @@ void WifiCheckIp(void)
           }
         }
     }
-
     if (Wifi.retry) {
       if (Settings.flag3.use_wifi_scan) {  // SetOption56 - Scan wifi network at restart for configured AP's
-        // check the 1/2 interval as well when rescanning - scan state machine takes 4 seconds
-        if ((Wifi.retry_init == Wifi.retry) || ((Wifi.retry_init / 2) == Wifi.retry)){
+        if (Wifi.retry_init == Wifi.retry) {
           Wifi.scan_state = 1;    // Select scanned SSID
         }
       } else {
@@ -642,6 +599,7 @@ String WifiGetOutputPower(void)
   dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
   return String(stemp1);
 }
+
 void WifiSetOutputPower(void)
 {
   WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
@@ -653,9 +611,7 @@ void WifiConnect(void)
   WifiSetOutputPower();
   WiFi.persistent(false);     // Solve possible wifi init errors
   Wifi.status = 0;
-  // lower the rety times now Tasmota control the reconnections, not the Arduino SDK
-  // Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
 }
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index d0db39f4b..b1e4eba9f 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010008;
+const uint32_t VERSION = 0x08010009;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;

From f674feb0ef0950c46a132be6e509251f0f181d98 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 20 Feb 2020 13:38:03 +0100
Subject: [PATCH 292/403] Add initial support for Sensors AHT1x

Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
---
 tasmota/CHANGELOG.md      |  1 +
 tasmota/tasmota_post.h    |  1 +
 tasmota/xsns_63_aht1x.ino | 88 +++++++++++++++++++--------------------
 tools/decode-status.py    |  4 +-
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 186ff457e..2689a7222 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 8.1.0.9 20200220
 
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
+- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 615ff8919..c148efd9f 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -164,6 +164,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_PAJ7620                              // Enable PAJ7620 gesture sensor (I2C address 0x73) (+2.5k code)
 //#define USE_PCF8574                              // Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x26 and 0x39 - 0x3F) (+1k9 code)
 #define USE_HIH6                                 // Enable Honywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
+//#define USE_AHT1x                                // Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
 
 #define USE_MHZ19                                // Add support for MH-Z19 CO2 sensor (+2k code)
 #define USE_SENSEAIR                             // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
diff --git a/tasmota/xsns_63_aht1x.ino b/tasmota/xsns_63_aht1x.ino
index b3b17e0e4..542cb72ea 100644
--- a/tasmota/xsns_63_aht1x.ino
+++ b/tasmota/xsns_63_aht1x.ino
@@ -30,10 +30,10 @@
 
 #define AHT10_ADDR           0x38
 
-unsigned char eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
-unsigned char eSensorNormalCmd[3]    = {0xA8, 0x00, 0x00};
-unsigned char eSensorMeasureCmd[3]   = {0xAC, 0x33, 0x00};
-unsigned char eSensorResetCmd        = 0xBA;
+uint8_t eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
+uint8_t eSensorNormalCmd[3]    = {0xA8, 0x00, 0x00};
+uint8_t eSensorMeasureCmd[3]   = {0xAC, 0x33, 0x00};
+uint8_t eSensorResetCmd        = 0xBA;
 
 struct AHT10 {
   float   humidity = NAN;
@@ -43,75 +43,73 @@ struct AHT10 {
   char    name[6] = "AHT1x";
 } AHT10;
 
-
 bool AHT10Read(void)
 {
-  unsigned long result_t, result_h, data[6];
-
   if (AHT10.valid) { AHT10.valid--; }
 
-   Wire.beginTransmission(AHT10_ADDR);
-   Wire.write(eSensorMeasureCmd, 3);
-   Wire.endTransmission();
-   delay(100);
+  uint8_t data[6];
 
-   Wire.requestFrom(AHT10_ADDR, 6);
-   for(uint8_t i = 0; Wire.available() > 0; i++)
-   {
-      data[i] = Wire.read();
-   }
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorMeasureCmd, 3);
+  Wire.endTransmission();
+  delay(100);
 
-   result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
-   result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
+  Wire.requestFrom(AHT10_ADDR, 6);
+  for (uint32_t i = 0; Wire.available() > 0; i++) {
+    data[i] = Wire.read();
+  }
 
-   AHT10.humidity = result_h * 100 / 1048576;
-   AHT10.temperature  =  ((200 * result_t) / 1048576) - 50;
+  uint32_t result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
+  uint32_t result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
 
-  if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
+  float humidity = result_h * 100 / 1048576;
+  float temperature = ((200 * result_t) / 1048576) - 50;
+
+  if (isnan(temperature) || isnan(humidity)) { return false; }
+
+  AHT10.humidity = ConvertHumidity(humidity);
+  AHT10.temperature  = ConvertTemp(temperature);
 
   AHT10.valid = SENSOR_MAX_MISS;
   return true;
 }
 
 /********************************************************************************************/
-bool AHT10Init()
-{
-    Wire.begin(AHT10_ADDR);
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorCalibrateCmd, 3);
-    Wire.endTransmission();
-    delay(500);
 
-    if((AHT10ReadStatus() & 0x68) == 0x08) {
-        return true;}
-    else
-      { return false; }
+bool AHT10Init(void)
+{
+  Wire.begin(AHT10_ADDR);
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorCalibrateCmd, 3);
+  Wire.endTransmission();
+
+  delay(500);  // ?!?! too long
+
+  return (0x08 == (AHT10ReadStatus() & 0x68));
 }
 
-unsigned char AHT10ReadStatus(void)
+uint8_t AHT10ReadStatus(void)
 {
-    unsigned char result = 0;
-    Wire.requestFrom(AHT10_ADDR, 1);
-    result = Wire.read();
-    return result;
+  Wire.requestFrom(AHT10_ADDR, 1);
+  uint8_t result = Wire.read();
+  return result;
 }
 
 void AHT10Reset(void)
 {
-    Wire.beginTransmission(AHT10_ADDR);
-    Wire.write(eSensorResetCmd);
-    Wire.endTransmission();
-    delay(20);
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorResetCmd);
+  Wire.endTransmission();
+  delay(20);
 }
 
 /********************************************************************************************/
+
 void AHT10Detect(void)
 {
-  if (I2cActive(AHT10_ADDR))
-  {return;}
+  if (I2cActive(AHT10_ADDR)) { return; }
 
-  if (AHT10Init())
-  {
+  if (AHT10Init()) {
     I2cSetActiveFound(AHT10_ADDR, AHT10.name);
     AHT10.count = 1;
   }
diff --git a/tools/decode-status.py b/tools/decode-status.py
index f4d00833a..210175de8 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -193,7 +193,7 @@ a_features = [[
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
-    "","","",""
+    "USE_AHT1x","","",""
     ],[
     "","","","",
     "","","","",
@@ -236,7 +236,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200210 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200220 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From e9c7026e823f305802a776004e30f4302cbadab5 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 20 Feb 2020 14:55:41 +0100
Subject: [PATCH 293/403] Remove NTP drift information

Remove NTP drift information
---
 tasmota/support_rtc.ino | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino
index 7af66653a..3b7da8e37 100644
--- a/tasmota/support_rtc.ino
+++ b/tasmota/support_rtc.ino
@@ -47,7 +47,6 @@ struct RTC {
   uint32_t ntp_time = 0;
   uint32_t midnight = 0;
   uint32_t restart_time = 0;
-  int32_t drift_time = 0;
   int32_t time_timezone = 0;
   uint8_t ntp_sync_minute = 0;
   bool midnight_now = false;
@@ -64,11 +63,6 @@ uint32_t LocalTime(void)
   return Rtc.local_time;
 }
 
-int32_t DriftTime(void)
-{
-  return Rtc.drift_time;
-}
-
 uint32_t Midnight(void)
 {
   return Rtc.midnight;
@@ -380,7 +374,6 @@ void RtcSecond(void)
       Rtc.ntp_time = sntp_get_current_timestamp();
       if (Rtc.ntp_time > START_VALID_TIME) {  // Fix NTP bug in core 2.4.1/SDK 2.2.1 (returns Thu Jan 01 08:00:10 1970 after power on)
         ntp_force_sync = false;
-        if (Rtc.utc_time > START_VALID_TIME) { Rtc.drift_time = Rtc.ntp_time - Rtc.utc_time; }
         Rtc.utc_time = Rtc.ntp_time;
         Rtc.ntp_sync_minute = 60;  // Sync so block further requests
         if (Rtc.restart_time == 0) {
@@ -392,8 +385,8 @@ void RtcSecond(void)
         Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
 
         // Do not use AddLog_P2 here (interrupt routine) if syslog or mqttlog is enabled. UDP/TCP will force exception 9
-        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: Drift %d, (" D_UTC_TIME ")%s, (" D_DST_TIME ")%s, (" D_STD_TIME ")%s"),
-          DriftTime(), GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
+        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: " D_UTC_TIME " %s, " D_DST_TIME " %s, " D_STD_TIME " %s"),
+          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
 
         if (Rtc.local_time < START_VALID_TIME) {  // 2016-01-01
           rules_flag.time_init = 1;

From ea99cdce5700e87f13218ce2729656b33e2f5cc5 Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Thu, 20 Feb 2020 18:50:43 +0100
Subject: [PATCH 294/403] Add support for La Crosse TX23 Anemometer (#3146)

---
 tasmota/language/bg-BG.h     |   2 +-
 tasmota/language/cs-CZ.h     |   2 +-
 tasmota/language/de-DE.h     |   2 +-
 tasmota/language/el-GR.h     |   2 +-
 tasmota/language/en-GB.h     |   2 +-
 tasmota/language/es-ES.h     |   2 +-
 tasmota/language/fr-FR.h     |   2 +-
 tasmota/language/he-HE.h     |   2 +-
 tasmota/language/hu-HU.h     |   2 +-
 tasmota/language/it-IT.h     |   2 +-
 tasmota/language/ko-KO.h     |   2 +-
 tasmota/language/nl-NL.h     |   2 +-
 tasmota/language/pl-PL.h     |   2 +-
 tasmota/language/pt-BR.h     |   2 +-
 tasmota/language/pt-PT.h     |   2 +-
 tasmota/language/ru-RU.h     |   2 +-
 tasmota/language/sk-SK.h     |   2 +-
 tasmota/language/sv-SE.h     |   2 +-
 tasmota/language/tr-TR.h     |   2 +-
 tasmota/language/uk-UA.h     |   2 +-
 tasmota/language/zh-CN.h     |   2 +-
 tasmota/language/zh-TW.h     |   2 +-
 tasmota/my_user_config.h     |   4 +-
 tasmota/support_features.ino |   2 +-
 tasmota/tasmota_post.h       |   6 +-
 tasmota/tasmota_template.h   |   8 +-
 tasmota/xsns_35_tx20.ino     | 311 +++++++++++++++++++++++------------
 27 files changed, 241 insertions(+), 134 deletions(-)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 270300bf7..be2fceb3c 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 8c47e47ab..6ef51f27d 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 615020f33..e7e3c6a74 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX20_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index a73651d93..b3608bb7b 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index b9f03bacc..66a6e0243 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 9b0b08888..59916f487 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 455bec483..5356848d8 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RF TX"
 #define D_SENSOR_RFRECV        "RF RX"
 #define D_SENSOR_TUYA_TX       "Tuya TX"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index 009191f54..fa3b07a31 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index 65de942cb..541d0c783 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index a8ab6f1c6..62127ef24 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 9607cd9d5..2a20ce2d0 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 6602a7129..658f18547 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 06bf65d06..e2d59a2dc 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index a896196b1..da386917c 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 551f4767e..1f9c36a6b 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index b4708ac10..846a653ac 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index 5427059bc..f335ca42d 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index dea7e0210..9485c1f4e 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 8fc13e0df..ee2a548ae 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 9365f68e7..98a352ea7 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFRecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 019b679f4..c46d353ea 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 5d7c00069..118aeb501 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX20"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index d641ac761..6c4af1e31 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -618,7 +618,9 @@
 #define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
 //  #define USE_HX711_GUI                          // Add optional web GUI to HX711 as scale (+1k8 code)
 
-//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+2k code)
+// Select none or only one of the below defines
+//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+1k3 code)
+//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+1k4 code)
 
 //#define USE_RC_SWITCH                            // Add support for RF transceiver using library RcSwitch (+2k7 code, 460 iram)
 
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 85f5a77ea..ba1a2e465 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -367,7 +367,7 @@ void GetFeatures(void)
 #ifdef USE_PZEM_DC
   feature_sns2 |= 0x00001000;  // xnrg_06_pzem_dc.ino
 #endif
-#ifdef USE_TX20_WIND_SENSOR
+#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
   feature_sns2 |= 0x00002000;  // xsns_35_tx20.ino
 #endif
 #ifdef USE_MGC3130
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index c148efd9f..0d0b65d6e 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -212,7 +212,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_TM1638                               // Add support for TM1638 switches copying Switch1 .. Switch8 (+1k code)
 #define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
 //#define USE_HX711_GUI                            // Add optional web GUI to HX711 as scale (+1k8 code)
-//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+2k code)
+//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+1k3 code)
+//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+1k4 code)
 #define USE_RC_SWITCH                            // Add support for RF transceiver using library RcSwitch (+2k7 code, 460 iram)
 #define USE_RF_SENSOR                            // Add support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
 //  #define USE_THEO_V2                            // Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver (+1k4 code)
@@ -404,6 +405,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_TM1638                                // Disable support for TM1638 switches copying Switch1 .. Switch8
 #undef USE_HX711                                 // Disable support for HX711 load cell
 #undef USE_TX20_WIND_SENSOR                      // Disable support for La Crosse TX20 anemometer
+#undef USE_TX23_WIND_SENSOR                      // Disable support for La Crosse TX23 anemometer
 #undef USE_RC_SWITCH                             // Disable support for RF transceiver using library RcSwitch
 #undef USE_RF_SENSOR                             // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
 #undef USE_HRE                                   // Disable support for Badger HR-E Water Meter (+1k4 code)
@@ -513,6 +515,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_TM1638                                // Disable support for TM1638 switches copying Switch1 .. Switch8
 #undef USE_HX711                                 // Disable support for HX711 load cell
 #undef USE_TX20_WIND_SENSOR                      // Disable support for La Crosse TX20 anemometer
+#undef USE_TX23_WIND_SENSOR                      // Disable support for La Crosse TX23 anemometer
 #undef USE_RC_SWITCH                             // Disable support for RF transceiver using library RcSwitch
 #undef USE_RF_SENSOR                             // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
 #undef USE_HRE                                   // Disable support for Badger HR-E Water Meter (+1k4 code)
@@ -625,6 +628,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_TM1638                                // Disable support for TM1638 switches copying Switch1 .. Switch8
 #undef USE_HX711                                 // Disable support for HX711 load cell
 #undef USE_TX20_WIND_SENSOR                      // Disable support for La Crosse TX20 anemometer
+#undef USE_TX23_WIND_SENSOR                      // Disable support for La Crosse TX23 anemometer
 #undef USE_RC_SWITCH                             // Disable support for RF transceiver using library RcSwitch
 #undef USE_RF_SENSOR                             // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
 #undef USE_HRE                                   // Disable support for Badger HR-E Water Meter (+1k4 code)
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index b099eb49b..c4ee7b19d 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -128,7 +128,7 @@ enum UserSelectablePins {
   GPIO_SDS0X1_TX,      // Nova Fitness SDS011 Serial interface
   GPIO_HX711_SCK,      // HX711 Load Cell clock
   GPIO_HX711_DAT,      // HX711 Load Cell data
-  GPIO_TX20_TXD_BLACK, // TX20 Transmission Pin
+  GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
   GPIO_RFSEND,         // RF transmitter
   GPIO_RFRECV,         // RF receiver
   GPIO_TUYA_TX,        // Tuya Serial interface
@@ -267,7 +267,7 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_PZEM016_RX "|" D_SENSOR_PZEM017_RX "|"
   D_SENSOR_DFR562 "|" D_SENSOR_SDS0X1_TX "|"
   D_SENSOR_HX711_SCK "|" D_SENSOR_HX711_DAT "|"
-  D_SENSOR_TX20_TX "|"
+  D_SENSOR_TX2X_TX "|"
   D_SENSOR_RFSEND "|" D_SENSOR_RFRECV "|"
   D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|"
   D_SENSOR_MGC3130_XFER "|" D_SENSOR_MGC3130_RESET "|"
@@ -721,8 +721,8 @@ const uint8_t kGpioNiceList[] PROGMEM = {
 #ifdef USE_PMS5003
   GPIO_PMS5003,        // Plantower PMS5003 Serial interface
 #endif
-#ifdef USE_TX20_WIND_SENSOR
-  GPIO_TX20_TXD_BLACK, // TX20 Transmission Pin
+#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
+  GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
 #endif
 #ifdef USE_MP3_PLAYER
   GPIO_MP3_DFR562,     // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface
diff --git a/tasmota/xsns_35_tx20.ino b/tasmota/xsns_35_tx20.ino
index 0c61392bc..850c7deda 100644
--- a/tasmota/xsns_35_tx20.ino
+++ b/tasmota/xsns_35_tx20.ino
@@ -1,7 +1,7 @@
 /*
-  xsns_35_Tx20.ino - La Crosse Tx20 wind sensor support for Tasmota
+  xsns_35_Tx20.ino - La Crosse Tx20/Tx23 wind sensor support for Tasmota
 
-  Copyright (C) 2020  Thomas Eckerstorfer and Theo Arends
+  Copyright (C) 2020  Thomas Eckerstorfer, Norbert Richter and Theo Arends
 
   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
@@ -17,19 +17,31 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef USE_TX20_WIND_SENSOR
+#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
+#if defined(USE_TX20_WIND_SENSOR) && defined(USE_TX23_WIND_SENSOR)
+#undef USE_TX20_WIND_SENSOR
+#warning **** use USE_TX20_WIND_SENSOR or USE_TX23_WIND_SENSOR but not both together, TX20 disabled ****
+#endif
 /*********************************************************************************************\
- * La Crosse Tx20 wind sensor
+ * La Crosse TX20/TX23 Anemometer
  *
  * based on https://github.com/bunnyhu/ESP8266_TX20_wind_sensor/
  * http://blog.bubux.de/windsensor-tx20-mit-esp8266/
  * https://www.john.geek.nz/2011/07/la-crosse-tx20-anemometer-communication-protocol/
+ * http://www.rd-1000.com/chpm78/lacrosse/Lacrosse_TX23_protocol.html
+ * https://www.john.geek.nz/2012/08/la-crosse-tx23u-anemometer-communication-protocol/
+ * 
+ * TX23 RJ11 connection:
+ *  1 yellow      - GND
+ *  2 green       - NC
+ *  3 red         - Vcc 3.3V
+ *  4 black/brown - TxD Signal (GPIOxx)
 \*********************************************************************************************/
 
 #define XSNS_35                  35
 
-#define TX20_BIT_TIME          1220  // microseconds
-#define TX20_RESET_VALUES        60  // seconds
+#define TX2X_BIT_TIME          1220  // microseconds
+#define TX2X_RESET_VALUES        60  // seconds
 
 // The Arduino standard GPIO routines are not enough,
 // must use some from the Espressif SDK as well
@@ -37,17 +49,21 @@ extern "C" {
 #include "gpio.h"
 }
 
+#ifdef USE_TX20_WIND_SENSOR
+  #define D_TX2x_NAME "TX20"
+#else 
+  #define D_TX2x_NAME "TX23"
+#endif
+
 #ifdef USE_WEBSERVER
-
-const char HTTP_SNS_TX20[] PROGMEM =
-   "{s}TX20 " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}TX20 " D_TX20_WIND_DIRECTION "{m}%s{e}";
-
+const char HTTP_SNS_TX2X[] PROGMEM =
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s (%s&deg;){e}";
 #endif  // USE_WEBSERVER
 
-const char kTx20Directions[] PROGMEM = D_TX20_NORTH "|"
+const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
                                        D_TX20_NORTH D_TX20_EAST "|"
                                        D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
@@ -64,133 +80,218 @@ const char kTx20Directions[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_WEST "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
 
-uint8_t tx20_sa = 0;
-uint8_t tx20_sb = 0;
-uint8_t tx20_sd = 0;
-uint8_t tx20_se = 0;
-uint16_t tx20_sc = 0;
-uint16_t tx20_sf = 0;
+uint8_t tx2x_sa = 0;
+uint8_t tx2x_sb = 0;
+uint8_t tx2x_sd = 0;
+uint8_t tx2x_se = 0;
+uint16_t tx2x_sc = 0;
+uint16_t tx2x_sf = 0;
 
-float tx20_wind_speed_kmh = 0;
-float tx20_wind_speed_max = 0;
-float tx20_wind_speed_avg = 0;
-float tx20_wind_sum = 0;
-int tx20_count = 0;
-uint8_t tx20_wind_direction = 0;
+float tx2x_wind_speed_kmh = 0;
+float tx2x_wind_speed_max = 0;
+float tx2x_wind_speed_avg = 0;
+float tx2x_wind_sum = 0;
+int tx2x_count = 0;
+uint8_t tx2x_wind_direction = 0;
 
-bool tx20_available = false;
+bool tx2x_available = false;
+
+#ifdef USE_TX23_WIND_SENSOR
+uint8_t tx23_stage = 0;
+#endif
 
 #ifndef ARDUINO_ESP8266_RELEASE_2_3_0      // Fix core 2.5.x ISR not in IRAM Exception
-void Tx20StartRead(void) ICACHE_RAM_ATTR;  // As iram is tight and it works this way too
+void TX2xStartRead(void) ICACHE_RAM_ATTR;  // As iram is tight and it works this way too
 #endif  // ARDUINO_ESP8266_RELEASE_2_3_0
 
-void Tx20StartRead(void)
+void TX2xStartRead(void)
 {
-  /* La Crosse TX20 Anemometer datagram every 2 seconds
+  /**
+   * La Crosse TX20 Anemometer datagram every 2 seconds
    * 0-0 11011 0011 111010101111 0101 1100 000101010000 0-0 - Received pin data at 1200 uSec per bit
    *     sa    sb   sc           sd   se   sf
    *     00100 1100 000101010000 1010 1100 000101010000     - sa to sd inverted user data, LSB first
-   * sa - Start frame always 00100
+   * sa - Start frame (invert) 00100
+   * sb - Wind direction (invert) 0 - 15
+   * sc - Wind speed 0 (invert) - 511
+   * sd - Checksum (invert)
+   * se - Wind direction 0 - 15
+   * sf - Wind speed 0 - 511
+   * 
+   * La Crosse TX23 Anemometer datagram after setting TxD to low/high
+   * 1-1 0 1 0-0 11011 0011 111010101111 0101 1100 000101010000 1-1 - Received pin data at 1200 uSec per bit
+   *     t s c   sa    sb   sc           sd   se   sf
+   *     1 0 1-1 00100 1100 000101010000 1010 1100 000101010000     - sa to sd inverted user data, LSB first
+   * t  - host pulls TxD low - signals TX23 to sent measurement
+   * s  - TxD released - TxD is pulled high due to pullup
+   * c  - TX23U pulls TxD low - calculation in progress
+   * sa - Start frame 11011
    * sb - Wind direction 0 - 15
    * sc - Wind speed 0 - 511
    * sd - Checksum
-   * se - Wind direction 0 - 15
-   * sf - Wind speed 0 - 511
+   * se - Wind direction (invert) 0 - 15
+   * sf - Wind speed (invert) 0 - 511
    */
+#ifdef USE_TX23_WIND_SENSOR
+  if (0!=tx23_stage)
+  {
+    if ((2==tx23_stage) || (3==tx23_stage))
+    {
+#endif
+      tx2x_available = false;
 
-  tx20_available = false;
+      tx2x_sa = 0;
+      tx2x_sb = 0;
+      tx2x_sd = 0;
+      tx2x_se = 0;
+      tx2x_sc = 0;
+      tx2x_sf = 0;
 
-  tx20_sa = 0;
-  tx20_sb = 0;
-  tx20_sd = 0;
-  tx20_se = 0;
-  tx20_sc = 0;
-  tx20_sf = 0;
+      delayMicroseconds(TX2X_BIT_TIME / 2);
 
-  delayMicroseconds(TX20_BIT_TIME / 2);
+      for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
+        uint8_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
+#ifdef USE_TX23_WIND_SENSOR
+        if (bitcount > 41 - 5) {
+          // start
+          tx2x_sa = (tx2x_sa << 1) | (dpin);
+        } else if (bitcount > 41 - 5 - 4) {
+          // wind dir
+          tx2x_sb = tx2x_sb >> 1 | ((dpin) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12) {
+          // windspeed
+          tx2x_sc = tx2x_sc >> 1 | ((dpin) << 11);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
+          // checksum
+          tx2x_sd = tx2x_sd >> 1 | ((dpin) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
+          // wind dir (invert)
+          tx2x_se = tx2x_se >> 1 | ((dpin ^ 1) << 3);
+        } else {
+          // windspeed (invert)
+          tx2x_sf = tx2x_sf >> 1 | ((dpin ^ 1) << 11);
+        }
+#else
+        if (bitcount > 41 - 5) {
+          // start frame (invert)
+          tx2x_sa = (tx2x_sa << 1) | (dpin ^ 1);
+        } else if (bitcount > 41 - 5 - 4) {
+          // wind dir (invert)
+          tx2x_sb = tx2x_sb >> 1 | ((dpin ^ 1) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12) {
+          // windspeed (invert)
+          tx2x_sc = tx2x_sc >> 1 | ((dpin ^ 1) << 11);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
+          // checksum (invert)
+          tx2x_sd = tx2x_sd >> 1 | ((dpin ^ 1) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
+          // wind dir
+          tx2x_se = tx2x_se >> 1 | (dpin << 3);
+        } else {
+          // windspeed
+          tx2x_sf = tx2x_sf >> 1 | (dpin << 11);
+        }
+#endif
+        delayMicroseconds(TX2X_BIT_TIME);
+      }
 
-  for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
-    uint8_t dpin = (digitalRead(pin[GPIO_TX20_TXD_BLACK]));
-    if (bitcount > 41 - 5) {
-      // start, inverted
-      tx20_sa = (tx20_sa << 1) | (dpin ^ 1);
-    } else if (bitcount > 41 - 5 - 4) {
-      // wind dir, inverted
-      tx20_sb = tx20_sb >> 1 | ((dpin ^ 1) << 3);
-    } else if (bitcount > 41 - 5 - 4 - 12) {
-      // windspeed, inverted
-      tx20_sc = tx20_sc >> 1 | ((dpin ^ 1) << 11);
-    } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
-      // checksum, inverted
-      tx20_sd = tx20_sd >> 1 | ((dpin ^ 1) << 3);
-    } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
-      // wind dir
-      tx20_se = tx20_se >> 1 | (dpin << 3);
-    } else {
-      // windspeed
-      tx20_sf = tx20_sf >> 1 | (dpin << 11);
+      uint8_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
+      chk &= 0xf;
+
+#ifdef USE_TX23_WIND_SENSOR
+      // check checksum, non-inverted with inverted values and max. speed
+      if ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
+        tx2x_available = true;
+      }
+#else
+      if ((chk == tx2x_sd) && (tx2x_sc < 511)) {  // if checksum seems to be ok and wind speed below 51.1 m/s
+        tx2x_available = true;
+      }
+#endif
+#ifdef USE_TX23_WIND_SENSOR
     }
-
-    delayMicroseconds(TX20_BIT_TIME);
+    tx23_stage++;
   }
+#endif
 
-  uint8_t chk = (tx20_sb + (tx20_sc & 0xf) + ((tx20_sc >> 4) & 0xf) + ((tx20_sc >> 8) & 0xf));
-  chk &= 0xf;
-
-  if ((chk == tx20_sd) && (tx20_sc < 400)) {  // if checksum seems to be ok and wind speed below 40 m/s
-    tx20_available = true;
-  }
-/*
-  if ((tx20_sb == tx20_se) && (tx20_sc == tx20_sf) && (tx20_sc < 400)) {
-    tx20_available = true;
-  }
-*/
   // Must clear this bit in the interrupt register,
   // it gets set even when interrupts are disabled
-  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX20_TXD_BLACK]);
+  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX2X_TXD_BLACK]);
 }
 
-void Tx20Read(void)
+void Tx2xReset(void) 
 {
-  if (!(uptime % TX20_RESET_VALUES)) {
-    tx20_count = 0;
-    tx20_wind_sum = 0;
-    tx20_wind_speed_max = 0;
+    tx2x_count = 0;
+    tx2x_wind_sum = 0;
+    tx2x_wind_speed_max = 0;
+}
+
+void Tx2xRead(void)
+{
+#ifdef USE_TX23_WIND_SENSOR
+  // note: TX23 speed calculation is unstable when conversion starts 
+  //       less than 2 seconds after last request
+  if ((uptime % 3)==0) {
+    // TX23 start transmission by pulling down TxD line for at minimum 500ms
+    // so we pull TxD signal to low every 3 seconds
+    tx23_stage = 0;
+    pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
+    digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
+  } else if ((uptime % 3)==1) {
+    // after pulling down TxD every 3 second we pull-up TxD every 3+1 seconds
+    // to trigger start transmission
+    tx23_stage = 1; // first rising signal is invalid
+    pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT_PULLUP);
   }
-  else if (tx20_available) {
-    tx20_wind_speed_kmh = float(tx20_sc) * 0.36;
-    if (tx20_wind_speed_kmh > tx20_wind_speed_max) {
-      tx20_wind_speed_max = tx20_wind_speed_kmh;
+#endif
+  if (0==Settings.tele_period && !(uptime % TX2X_RESET_VALUES)) {
+    Tx2xReset();
+  }
+  else if (tx2x_available) {
+    // Wind speed spec: 0 to 180 km/h (0 to 50 m/s)
+    tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+    if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
+      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
     }
-    tx20_count++;
-    tx20_wind_sum += tx20_wind_speed_kmh;
-    tx20_wind_speed_avg = tx20_wind_sum / tx20_count;
-    tx20_wind_direction = tx20_sb;
+    tx2x_count++;
+    tx2x_wind_sum += tx2x_wind_speed_kmh;
+    tx2x_wind_speed_avg = tx2x_wind_sum / tx2x_count;
+    tx2x_wind_direction = tx2x_sb;
   }
 }
 
-void Tx20Init(void) {
-  pinMode(pin[GPIO_TX20_TXD_BLACK], INPUT);
-  attachInterrupt(pin[GPIO_TX20_TXD_BLACK], Tx20StartRead, RISING);
+void Tx2xInit(void) 
+{
+#ifdef USE_TX23_WIND_SENSOR
+  tx23_stage = 0;
+  pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
+  digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
+#else
+  pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT);
+#endif
+  attachInterrupt(pin[GPIO_TX2X_TXD_BLACK], TX2xStartRead, RISING);
 }
 
-void Tx20Show(bool json)
+void Tx2xShow(bool json)
 {
   char wind_speed_string[33];
-  dtostrfd(tx20_wind_speed_kmh, 2, wind_speed_string);
+  dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
   char wind_speed_max_string[33];
-  dtostrfd(tx20_wind_speed_max, 2, wind_speed_max_string);
+  dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
   char wind_speed_avg_string[33];
-  dtostrfd(tx20_wind_speed_avg, 2, wind_speed_avg_string);
+  dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
   char wind_direction_string[4];
-  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx20_wind_direction, kTx20Directions);
+  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx2x_wind_direction, kTx2xDirections);
+  char wind_direction_degree[33];
+  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree);
 
   if (json) {
-    ResponseAppend_P(PSTR(",\"TX20\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\"}"),
-      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
+      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
+    Tx2xReset();
 #ifdef USE_WEBSERVER
   } else {
-    WSContentSend_PD(HTTP_SNS_TX20, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string);
+    WSContentSend_PD(HTTP_SNS_TX2X, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
 #endif  // USE_WEBSERVER
   }
 }
@@ -203,20 +304,20 @@ bool Xsns35(uint8_t function)
 {
   bool result = false;
 
-  if (pin[GPIO_TX20_TXD_BLACK] < 99) {
+  if (pin[GPIO_TX2X_TXD_BLACK] < 99) {
     switch (function) {
       case FUNC_INIT:
-        Tx20Init();
+        Tx2xInit();
         break;
       case FUNC_EVERY_SECOND:
-        Tx20Read();
+        Tx2xRead();
         break;
       case FUNC_JSON_APPEND:
-        Tx20Show(1);
+        Tx2xShow(1);
         break;
 #ifdef USE_WEBSERVER
       case FUNC_WEB_SENSOR:
-        Tx20Show(0);
+        Tx2xShow(0);
         break;
 #endif  // USE_WEBSERVER
     }
@@ -224,4 +325,4 @@ bool Xsns35(uint8_t function)
   return result;
 }
 
-#endif  // USE_TX20_WIND_SENSOR
\ No newline at end of file
+#endif  // USE_TX20_WIND_SENSOR || USE_TX23_WIND_SENSOR
\ No newline at end of file

From a912daff0ba4057f199b37b8721c7bb4b42d9c3e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 20 Feb 2020 21:07:58 +0100
Subject: [PATCH 295/403] Update de-DE.h

---
 tasmota/language/de-DE.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index e7e3c6a74..cf2aa258b 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -564,7 +564,7 @@
 #define D_SENSOR_TM1638_STB    "TM16 STB"
 #define D_SENSOR_HX711_SCK     "HX711 SCK"
 #define D_SENSOR_HX711_DAT     "HX711 DAT"
-#define D_SENSOR_TX20_TX       "TX2x"
+#define D_SENSOR_TX2X_TX       "TX2x"
 #define D_SENSOR_RFSEND        "RFSend"
 #define D_SENSOR_RFRECV        "RFrecv"
 #define D_SENSOR_TUYA_TX       "Tuya Tx"

From f409d7258e88efb35bce7bd8b3337df8e89a8574 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Fri, 21 Feb 2020 09:09:21 -0600
Subject: [PATCH 296/403] Initial device groups support (power and light)

---
 tasmota/i18n.h                    |   1 +
 tasmota/my_user_config.h          |   1 +
 tasmota/settings.h                |   5 +
 tasmota/support_command.ino       |  17 +
 tasmota/support_device_groups.ino | 716 ++++++++++++++++++++++++++++++
 tasmota/support_tasmota.ino       |   3 +
 tasmota/support_udp.ino           |  64 +--
 tasmota/support_wifi.ino          |   6 +-
 tasmota/tasmota.h                 |  27 +-
 tasmota/tasmota.ino               |   6 +
 tasmota/tasmota_post.h            |  11 +
 tasmota/xdrv_01_webserver.ino     |   4 +
 tasmota/xdrv_02_mqtt.ino          |   7 +
 tasmota/xdrv_04_light.ino         |  98 ++++
 14 files changed, 936 insertions(+), 30 deletions(-)
 create mode 100644 tasmota/support_device_groups.ino

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 00cda53b4..cb9bb1196 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -289,6 +289,7 @@
 #define D_CMND_WIFIPOWER "WifiPower"
 #define D_CMND_I2CSCAN "I2CScan"
 #define D_CMND_I2CDRIVER "I2CDriver"
+#define D_CMND_DEVGROUP_SHARE "DevGroupShare"
 #define D_CMND_SERIALSEND "SerialSend"
 #define D_CMND_SERIALDELIMITER "SerialDelimiter"
 #define D_CMND_BAUDRATE "Baudrate"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 67ab1cf1c..406fd19af 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,6 +415,7 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
+//  #define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/settings.h b/tasmota/settings.h
index b1afca3ea..972af6974 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -573,4 +573,9 @@ typedef union {
   ADC_MODE(ADC_VCC);                       // Set ADC input for Power Supply Voltage usage
 #endif
 
+// Settings re-purposed for device groups
+#define device_groups_enabled  ws_clock_reverse   // SetOption16 - Enable device groups
+#define device_group_share_in  domoticz_sensor_idx[0]    // Bitmask of device group items imported
+#define device_group_share_out domoticz_sensor_idx[1]    // Bitmask of device group items exported
+
 #endif  // _SETTINGS_H_
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index df5abda86..b4c575e31 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -30,6 +30,9 @@ const char kTasmotaCommands[] PROGMEM = "|"  // No prefix
 #ifdef USE_I2C
   D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
 #endif
+#ifdef USE_DEVICE_GROUPS
+  D_CMND_DEVGROUP_SHARE "|"
+#endif  // USE_DEVICE_GROUPS
   D_CMND_SENSOR "|" D_CMND_DRIVER;
 
 void (* const TasmotaCommand[])(void) PROGMEM = {
@@ -45,6 +48,9 @@ void (* const TasmotaCommand[])(void) PROGMEM = {
 #ifdef USE_I2C
   &CmndI2cScan, CmndI2cDriver,
 #endif
+#ifdef USE_DEVICE_GROUPS
+  &CmndDevGroupShare,
+#endif  // USE_DEVICE_GROUPS
   &CmndSensor, &CmndDriver };
 
 const char kWifiConfig[] PROGMEM =
@@ -1664,6 +1670,17 @@ void CmndI2cDriver(void)
 }
 #endif  // USE_I2C
 
+#ifdef USE_DEVICE_GROUPS
+void CmndDevGroupShare(void)
+{
+  uint32_t parm[2] = { Settings.device_group_share_in, Settings.device_group_share_out };
+  ParseParameters(2, parm);
+  Settings.device_group_share_in = parm[0];
+  Settings.device_group_share_out = parm[1];
+  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%d,\"Out\":%d}}"), Settings.device_group_share_in, Settings.device_group_share_out);
+}
+#endif  // USE_DEVICE_GROUPS
+
 void CmndSensor(void)
 {
   XsnsCall(FUNC_COMMAND_SENSOR);
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
new file mode 100644
index 000000000..3add948a7
--- /dev/null
+++ b/tasmota/support_device_groups.ino
@@ -0,0 +1,716 @@
+/*
+  support_device_groups.ino - device groups support for Tasmota
+
+  Copyright (C) 2020  Paul C Diem
+
+  Device group allow multiple devices to be in a group with power, light
+  brightness, fade and speed settings and other module-specific settings
+  kept in sync across all devices in the group.
+
+  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/>.
+*/
+#ifdef USE_DEVICE_GROUPS
+
+//#define DEVICE_GROUPS_DEBUG
+
+extern bool udp_connected;
+
+struct device_group_member {
+  struct device_group_member * flink;
+  IPAddress ip_address;
+  uint32_t timeout_time;
+  uint16_t received_sequence;
+  uint16_t acked_sequence;
+};
+
+struct device_group {
+  uint32_t next_ack_check_time;
+  power_t power;
+  uint16_t last_full_status_sequence;
+  uint16_t message_length;
+  uint8_t message_header_length;
+  uint8_t initial_status_requests_remaining;
+  bool local;
+  char group_name[TOPSZ];
+  char message[128];
+  uint8_t group_member_count;
+  struct device_group_member * device_group_members;
+};
+
+struct device_group * device_groups;
+uint16_t outgoing_sequence = 0;
+bool initialized = false;
+bool building_status_message = false;
+bool processing_remote_device_message = false;
+bool waiting_for_acks;
+bool udp_was_connected = false;
+
+void DeviceGroupsInit(void)
+{
+  /*
+    Initialize the device information for each device group. The group name is the MQTT group topic.
+  */
+  if (Settings.flag.device_groups_enabled) {
+    device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
+    if (device_groups == nullptr) {
+      AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error allocating %u-element device group array", device_group_count);
+      Settings.flag.device_groups_enabled = false;
+      return;
+    }
+
+    for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+      struct device_group * device_group = &device_groups[device_group_index];
+      strcpy(device_group->group_name, SettingsText((device_group_index == 0 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + device_group_index - 1)));
+      device_group->message_header_length = sprintf(device_group->message, "%s%s HTTP/1.1\n\n", kDeviceGroupMessage, device_group->group_name);
+      device_group->last_full_status_sequence = -1;
+    }
+
+    device_groups[0].local = true;
+
+    // If both in and out shared items masks are 0, assume they're unitialized and initialize them.
+    if (!Settings.device_group_share_in && !Settings.device_group_share_out) {
+      Settings.device_group_share_in = Settings.device_group_share_out = 0xff;
+    }
+
+    initialized = true;
+  }
+}
+
+char * IPAddressToString(const IPAddress& ip_address)
+{
+  static char buffer[16];
+  sprintf(buffer, "%u.%u.%u.%u", ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
+  return buffer;
+}
+
+// Return true if we're configured to share the specified item.
+bool DeviceGroupItemShared(bool incoming, uint8_t item)
+{
+  uint8_t mask = 0;
+  switch (item) {
+    case DGR_ITEM_LIGHT_BRI:
+      mask = DGR_SHARE_LIGHT_BRI;
+      break;
+    case DGR_ITEM_POWER:
+      mask = DGR_SHARE_POWER;
+      break;
+    case DGR_ITEM_LIGHT_SCHEME:
+      mask = DGR_SHARE_LIGHT_SCHEME;
+      break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+    case DGR_ITEM_LIGHT_CHANNELS:
+      mask = DGR_SHARE_LIGHT_COLOR;
+      break;
+    case DGR_ITEM_LIGHT_FADE:
+    case DGR_ITEM_LIGHT_SPEED:
+      mask = DGR_SHARE_LIGHT_FADE;
+      break;
+    case DGR_ITEM_BRI_MIN:
+      mask = DGR_SHARE_BRI_MIN;
+      break;
+  }
+  return (!mask || ((incoming ? Settings.device_group_share_in : Settings.device_group_share_out) & mask));
+}
+
+void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * label)
+{
+  for (int attempt = 1; attempt <= 5; attempt++) {
+    if (PortUdp.beginPacket(ip, 1900)) {
+      PortUdp.write(packet, len);
+      if (PortUdp.endPacket()) return;
+    }
+    delay(10);
+  }
+  AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error sending %s packet", label);
+}
+
+void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
+{
+  // If device groups are not enabled, ignore this request.
+  if (!Settings.flag.device_groups_enabled) return;
+
+  // If UDP is not set up, ignore this request.
+  if (!udp_connected) return;
+
+  // If we're currently processing a remote device message, ignore this request.
+  if (processing_remote_device_message) return;
+
+  // Get a pointer to the device information for this device.
+  device_group * device_group = &device_groups[device_group_index];
+
+  // If we're still sending initial status requests, ignore this request.
+  if (device_group->initial_status_requests_remaining) return;
+
+  // A full status request is a request from a remote device for the status of every item we
+  // control. As long as we're building it, we may as well broadcast the status update to all
+  // device group members.
+  char * message_ptr = &device_group->message[device_group->message_header_length];
+  if (message_type == DGR_MSGTYP_FULL_STATUS) {
+
+    // Set the flag indicating we're currently building a status message. SendDeviceGroupMessage
+    // will build but not send messages while this flag is set.
+    building_status_message = true;
+
+    // Call the drivers to build the status update.
+    if (!++outgoing_sequence) outgoing_sequence = 1;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "Building device group %s full status packet", device_group->group_name);
+#endif  // DEVICE_GROUPS_DEBUG
+    device_group->message_length = 0;
+    _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
+    XdrvMailbox.command_code = DGR_ITEM_STATUS;
+    XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+    building_status_message = false;
+
+    // If we have nothing to share with the other members, restore the message sequence and return.
+    if (!device_group->message_length) {
+      if (!--outgoing_sequence) outgoing_sequence = -1;
+      return;
+    }
+    device_group->last_full_status_sequence = outgoing_sequence;
+
+    // Set the status update flag in the outgoing message.
+    *(message_ptr + 2) |= DGR_FLAG_FULL_STATUS;
+  }
+
+  else {
+    bool shared;
+    uint8_t item;
+    uint32_t value;
+    uint8_t * value_ptr;
+    va_list ap;
+
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "Building device group %s packet", device_group->group_name);
+#endif  // DEVICE_GROUPS_DEBUG
+    uint16_t original_sequence = outgoing_sequence;
+    if (!building_status_message && message_type != DGR_MSGTYP_PARTIAL_UPDATE && !++outgoing_sequence) outgoing_sequence = 1;
+    *message_ptr++ = outgoing_sequence & 0xff;
+    *message_ptr++ = outgoing_sequence >> 8;
+
+    value = 0;
+    if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME)
+      value |= DGR_FLAG_MORE_TO_COME;
+    else if (message_type == DGR_MSGTYP_UPDATE_DIRECT)
+      value |= DGR_FLAG_DIRECT;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, ">sequence=%u, flags=%u", outgoing_sequence, value);
+#endif  // DEVICE_GROUPS_DEBUG
+    *message_ptr++ = value & 0xff;
+    *message_ptr++ = value >> 8;
+    char * first_item_ptr = message_ptr;
+
+    // If we're still building this update or all group members haven't acknowledged the previous
+    // update yet, update the message to include these new updates. First we need to rebuild the
+    // previous update message to remove any items and their values that are included in this new
+    // update.
+    if (device_group->message_length) {
+      uint8_t item_array[32];
+      int item_index = 0;
+      int kept_item_count = 0;
+
+      // Build an array of all the items in this new update.
+      va_start(ap, message_type);
+      while ((item = va_arg(ap, int))) {
+        item_array[item_index++] = item;
+        if (item <= DGR_ITEM_MAX_32BIT)
+          va_arg(ap, int);
+        else if (item <= DGR_ITEM_MAX_STRING)
+          va_arg(ap, char *);
+        else {
+          switch (item) {
+            case DGR_ITEM_LIGHT_CHANNELS:
+              va_arg(ap, uint8_t *) ;
+              break;
+          }
+        }
+      }
+      va_end(ap);
+      item_array[item_index] = 0;
+
+      // Rebuild the previous update message, removing any items their values that are included in
+      // this new update.
+      char * previous_message_ptr = message_ptr;
+      while (item = *previous_message_ptr++) {
+
+        // Search for this item in the new update.
+        for (item_index = 0; item_array[item_index]; item_index++) {
+          if (item_array[item_index] == item) break;
+        }
+
+        // If this item was found in the new update skip over it and it's value.
+        if (item_array[item_index]) {
+          if (item <= DGR_ITEM_MAX_32BIT) {
+            previous_message_ptr++;
+            if (item > DGR_ITEM_MAX_8BIT) {
+              previous_message_ptr++;
+              if (item > DGR_ITEM_MAX_16BIT) {
+                previous_message_ptr++;
+                previous_message_ptr++;
+              }
+            }
+          }
+          else if (item <= DGR_ITEM_MAX_STRING)
+            previous_message_ptr += *previous_message_ptr++;
+          else {
+            switch (item) {
+              case DGR_ITEM_LIGHT_CHANNELS:
+                previous_message_ptr += 5;
+                break;
+            }
+          }
+        }
+
+        // If this item was not found in the new udpate, copy it to the new update message.
+        else {
+          *message_ptr++ = item;
+          if (item <= DGR_ITEM_MAX_32BIT) {
+            *message_ptr++ = *previous_message_ptr++;
+            if (item > DGR_ITEM_MAX_8BIT) {
+              *message_ptr++ = *previous_message_ptr++;
+              if (item > DGR_ITEM_MAX_16BIT) {
+                *message_ptr++ = *previous_message_ptr++;
+                *message_ptr++ = *previous_message_ptr++;
+              }
+            }
+          }
+          else if (item <= DGR_ITEM_MAX_STRING) {
+            *message_ptr++ = value = *previous_message_ptr++;
+            memmove(message_ptr, previous_message_ptr, value);
+            previous_message_ptr += value;
+            message_ptr += value;
+          }
+          else {
+            switch (item) {
+              case DGR_ITEM_LIGHT_CHANNELS:
+                memmove(message_ptr, previous_message_ptr, 5);
+                previous_message_ptr += 5;
+                message_ptr += 5;
+                break;
+            }
+          }
+          kept_item_count++;
+        }
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "%u items carried over from previous update", kept_item_count);
+#endif  // DEVICE_GROUPS_DEBUG
+    }
+
+    // Itertate through the passed items adding them and their values to the message.
+    va_start(ap, message_type);
+    while ((item = va_arg(ap, int))) {
+      shared = DeviceGroupItemShared(false, item);
+      if (shared) *message_ptr++ = item;
+      if (item <= DGR_ITEM_MAX_32BIT) {
+        value = va_arg(ap, int);
+        if (shared) {
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%u", item, value);
+#endif  // DEVICE_GROUPS_DEBUG
+          *message_ptr++ = value & 0xff;
+          if (item > DGR_ITEM_MAX_8BIT) {
+            value >>= 8;
+            *message_ptr++ = value & 0xff;
+          }
+          if (item > DGR_ITEM_MAX_16BIT) {
+            value >>= 8;
+            *message_ptr++ = value & 0xff;
+            *message_ptr++ = value >> 8;
+          }
+        }
+      }
+      else if (item <= DGR_ITEM_MAX_STRING) {
+        value_ptr = va_arg(ap, uint8_t *);
+        if (shared) {
+          value = strlen((const char *)value_ptr);
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%s", item, value_ptr);
+#endif  // DEVICE_GROUPS_DEBUG
+          *message_ptr++ = value;
+          memcpy(message_ptr, value_ptr, value);
+          message_ptr += value;
+        }
+      }
+      else {
+        switch (item) {
+          case DGR_ITEM_LIGHT_CHANNELS:
+            value_ptr = va_arg(ap, uint8_t *);
+            if (shared) {
+#ifdef DEVICE_GROUPS_DEBUG
+              AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%u,%u,%u,%u,%u", item, *value_ptr, *(value_ptr + 1), *(value_ptr + 2), *(value_ptr + 3), *(value_ptr + 4));
+#endif  // DEVICE_GROUPS_DEBUG
+              memmove(message_ptr, value_ptr, 5);
+              message_ptr += 5;
+            }
+            break;
+        }
+      }
+    }
+    va_end(ap);
+
+    // If there weren't any items added to the message, restore the outgoing message sequence and
+    // return.
+    if (message_ptr == first_item_ptr) {
+      outgoing_sequence = original_sequence;
+      return;
+    }
+
+    // Add the EOL item code and calculate the message length.
+    *message_ptr++ = 0;
+    device_group->message_length = message_ptr - device_group->message;
+
+    // If there's going to be more items added to this message, return.
+    if (building_status_message || message_type == DGR_MSGTYP_PARTIAL_UPDATE) return;
+  }
+
+  // Broadcast the packet.
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending %u-byte device group %s packet via broadcast, sequence=%u", device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
+#endif  // DEVICE_GROUPS_DEBUG
+  SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Broadcast");
+  device_group->next_ack_check_time = millis() + 100;
+
+  if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME) {
+    for (struct device_group_member * device_group_member = device_group->device_group_members; device_group_member != nullptr; device_group_member = device_group_member->flink) {
+      device_group_member->acked_sequence = outgoing_sequence;
+    }
+  }
+  else {
+    waiting_for_acks = true;
+  }
+}
+
+void ProcessDeviceGroupMessage(char * packet, int packet_length)
+{
+  // Make the group name a null-terminated string.
+  char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
+  char * message_ptr = strchr(message_group_name, ' ');
+  if (message_ptr == nullptr) return;
+  *message_ptr = 0;
+
+  // Search for a device group with the target group name. If one isn't found, return.
+  struct device_group * device_group;
+  uint32_t device_group_index = 0;
+  for (;;) {
+    device_group = &device_groups[device_group_index];
+    if (!strcmp(message_group_name, device_group->group_name)) break;
+    if (++device_group_index >= device_group_count) return;
+  }
+  *message_ptr++ = ' ';
+
+  // Find the group member. If this is a new group member, add it.
+  IPAddress remote_ip = PortUdp.remoteIP();
+  struct device_group_member * * flink = &device_group->device_group_members;
+  struct device_group_member * device_group_member;
+  for (;;) {
+    device_group_member = *flink;
+    if (!device_group_member) {
+      device_group_member = (struct device_group_member *)calloc(1, sizeof(struct device_group_member));
+      if (device_group_member == nullptr) {
+        AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error allocating device group member block");
+        return;
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: adding member %s (%p)", IPAddressToString(remote_ip), device_group_member);
+#endif  // DEVICE_GROUPS_DEBUG
+      device_group_member->ip_address = remote_ip;
+      *flink = device_group_member;
+      break;
+    }
+    else if (device_group_member->ip_address == remote_ip) {
+      break;
+    }
+    flink = &device_group_member->flink;
+  }
+
+  // Find the start of the actual message (after the http header).
+  message_ptr = strstr(message_ptr, "\n\n");
+  if (message_ptr == nullptr) return;
+  message_ptr += 2;
+
+  bool light_fade;
+  uint16_t flags;
+  uint16_t item;
+  uint16_t message_sequence;
+  int32_t value;
+
+  // Get the message sequence and flags.
+  if (packet_length - (message_ptr - packet) < 4) goto badmsg;  // Malformed message - must be at least 16-bit sequence, 16-bit flags left
+  message_sequence = *message_ptr++;
+  message_sequence |= *message_ptr++ << 8;
+  flags = *message_ptr++;
+  flags |= *message_ptr++ << 8;
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, "Received device group %s packet from %s: sequence=%u, flags=%u", device_group->group_name, IPAddressToString(remote_ip), message_sequence, flags);
+#endif  // DEVICE_GROUPS_DEBUG
+
+  // If this is an ack message, save the message sequence if it's newwer than the last ack we
+  // received from this member.
+  if (flags == DGR_FLAG_ACK) {
+    if (message_sequence > device_group_member->acked_sequence || device_group_member->acked_sequence - message_sequence < 64536) {
+      device_group_member->acked_sequence = message_sequence;
+    }
+    device_group_member->timeout_time = 0;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "<ack");
+#endif  // DEVICE_GROUPS_DEBUG
+    return;
+  }
+
+  // Send an ack message to the sender.
+  if (!(flags & DGR_FLAG_MORE_TO_COME)) {
+    *(message_ptr - 2) = DGR_FLAG_ACK;
+    *(message_ptr - 1) = 0;      
+    SendDeviceGroupPacket(remote_ip, packet, message_ptr - packet, "Ack");
+  }
+
+  // If this is a status request message, then if the requestor didn't just ack our previous full
+  // status update, send a full status update.
+  if ((flags & DGR_FLAG_STATUS_REQUEST)) {
+    if ((flags & DGR_FLAG_RESET) || device_group_member->acked_sequence != device_group->last_full_status_sequence) {
+      _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
+    }
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "<status request");
+#endif  // DEVICE_GROUPS_DEBUG
+    return;
+  }
+
+  // If we already processed this or a later message from this group member, ignore this message.
+  if (message_sequence < device_group_member->received_sequence && device_group_member->received_sequence - message_sequence > 64536) {
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, "<old message");
+#endif  // DEVICE_GROUPS_DEBUG
+    return;
+  }
+  device_group_member->received_sequence = message_sequence;
+
+  // Set the flag indicating we're currently processing a remote device message.
+  // SendDeviceGroupMessage will not send messages while this flag is set.
+  processing_remote_device_message = true;
+
+  /*
+    XdrvMailbox
+    bool          grpflg
+    bool          usridx
+    uint16_t      command_code    Item code
+    uint32_t      index           Flags
+    uint32_t      data_len        String item value length
+    int32_t       payload         Integer item value
+    char         *topic
+    char         *data            Pointer to non-integer item value
+    char         *command         nullptr
+  */
+  XdrvMailbox.command = nullptr;  // Indicates the source is a device group update
+  XdrvMailbox.index = flags;
+  light_fade = Settings.light_fade;
+  if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
+
+  for (;;) {
+    if (packet_length - (message_ptr - packet) < 1) goto badmsg;  // Malformed message
+    item = *message_ptr++;
+    if (!item) break; // Done
+
+#ifdef DEVICE_GROUPS_DEBUG
+    switch (item) {
+      case DGR_ITEM_LIGHT_FADE:
+      case DGR_ITEM_LIGHT_SPEED:
+      case DGR_ITEM_LIGHT_BRI:
+      case DGR_ITEM_LIGHT_SCHEME:
+      case DGR_ITEM_LIGHT_FIXED_COLOR:
+      case DGR_ITEM_BRI_MIN:
+      case DGR_ITEM_BRI_PRESET_LOW:
+      case DGR_ITEM_BRI_PRESET_HIGH:
+      case DGR_ITEM_BRI_POWER_ON:
+      case DGR_ITEM_POWER:
+      case DGR_ITEM_LIGHT_CHANNELS:
+        break;
+      default:
+        AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: ********** invalid item=%u received from device group %s member %s", item, device_group->group_name, IPAddressToString(remote_ip));
+    }
+#endif  // DEVICE_GROUPS_DEBUG
+
+    XdrvMailbox.command_code = item;
+    if (item <= DGR_ITEM_LAST_32BIT) {
+      value = *message_ptr++;
+      if (item > DGR_ITEM_MAX_8BIT) {
+        value |= *message_ptr++ << 8;
+        if (item > DGR_ITEM_MAX_16BIT) {
+          value |= *message_ptr++ << 16;
+          value |= *message_ptr++ << 24;
+        }
+      }
+      else if (item == DGR_ITEM_LIGHT_FADE) {
+        light_fade = value;
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%u", item, value);
+#endif  // DEVICE_GROUPS_DEBUG
+      XdrvMailbox.payload = value;
+    }
+    else if (item <= DGR_ITEM_MAX_STRING) {
+      value = *message_ptr++;
+      if (value >= packet_length - (message_ptr - packet)) goto badmsg;  // Malformed message
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%.*s", item, value, message_ptr);
+#endif  // DEVICE_GROUPS_DEBUG
+      XdrvMailbox.data_len = value;
+      XdrvMailbox.data = message_ptr;
+      message_ptr += value;
+    }
+    else {
+      switch (item) {
+        case DGR_ITEM_LIGHT_CHANNELS:
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%u,%u,%u,%u,%u", item, *message_ptr, *(message_ptr + 1), *(message_ptr + 2), *(message_ptr + 3), *(message_ptr + 4));
+#endif  // DEVICE_GROUPS_DEBUG
+          XdrvMailbox.data = message_ptr;
+          message_ptr += 5;
+          break;
+      }
+    }
+
+    if (DeviceGroupItemShared(true, item)) {
+      if (item == DGR_ITEM_POWER) {
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint32_t mask = 1 << i;
+          bool on = (value & mask);
+          if (on != (power & mask)) ExecuteCommandPower(i + 1, (on ? POWER_ON : POWER_OFF), SRC_REMOTE);
+        }
+      }
+      else {
+        XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+      }
+    }
+  }
+
+  XdrvMailbox.command_code = DGR_ITEM_EOL;
+  XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+  Settings.light_fade = light_fade;
+
+  processing_remote_device_message = false;
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, "<processed");
+#endif  // DEVICE_GROUPS_DEBUG
+  return;
+
+badmsg:
+  AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: malformed message received from %s", IPAddressToString(remote_ip));
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, "packet_length=%u, offset=%u", packet_length, message_ptr - packet);
+#endif  // DEVICE_GROUPS_DEBUG
+  processing_remote_device_message = false;
+}
+
+void DeviceGroupsLoop(void)
+{
+  if (!Settings.flag.device_groups_enabled) return;
+  if (udp_connected) {
+    if (!udp_was_connected) {
+      udp_was_connected = true;
+      if (!initialized) {
+        DeviceGroupsInit();
+        if (!Settings.flag.device_groups_enabled) return;
+      }
+
+      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+        device_group * device_group = &device_groups[device_group_index];
+        char * message_ptr = &device_group->message[device_group->message_header_length];
+        if (!++outgoing_sequence) outgoing_sequence = 1;
+        *message_ptr++ = outgoing_sequence & 0xff;
+        *message_ptr++ = outgoing_sequence >> 8;
+        *message_ptr++ = DGR_FLAG_RESET | DGR_FLAG_STATUS_REQUEST;
+        *message_ptr++ = 0;
+        device_group->message_length = message_ptr - device_group->message;
+        device_group->initial_status_requests_remaining = 5;
+        device_group->next_ack_check_time = millis() + 2000;
+      }
+
+      waiting_for_acks = true;
+    }
+
+    if (waiting_for_acks) {
+      uint32_t now = millis();
+      waiting_for_acks = false;
+      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+        device_group * device_group = &device_groups[device_group_index];
+        if (device_group->next_ack_check_time) {
+          if (device_group->next_ack_check_time <= now) {
+            if (device_group->initial_status_requests_remaining) {
+#ifdef DEVICE_GROUPS_DEBUG
+              AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending initial status request for group %s", device_group->group_name);
+#endif  // DEVICE_GROUPS_DEBUG
+              if (--device_group->initial_status_requests_remaining) {
+                SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Initial");
+                device_group->message[device_group->message_header_length + 2] = DGR_FLAG_STATUS_REQUEST; // The reset flag is on only for the first packet - turn it off now
+                device_group->next_ack_check_time = now + 200;
+                waiting_for_acks = true;
+              }
+              else {
+                device_group->next_ack_check_time = 0;
+                _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
+              }
+            }
+            else {
+              bool acked = true;
+              struct device_group_member ** flink = &device_group->device_group_members;
+              struct device_group_member * device_group_member;
+              while ((device_group_member = *flink)) {
+                if (device_group_member->acked_sequence != outgoing_sequence) {
+
+                  if (device_group_member->timeout_time && device_group_member->timeout_time < now) {
+#ifdef DEVICE_GROUPS_DEBUG
+                    AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: removing member %s (%p)", IPAddressToString(device_group_member->ip_address), device_group_member);
+#endif  // DEVICE_GROUPS_DEBUG
+                    *flink = device_group_member->flink;
+                    free(device_group_member);
+                  }
+                  else {
+#ifdef DEVICE_GROUPS_DEBUG
+                    AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u", device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
+#endif  // DEVICE_GROUPS_DEBUG
+                    SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, "Unicast");
+                    if (!device_group_member->timeout_time) device_group_member->timeout_time = now + 15000;
+                    acked = false;
+                    flink = &device_group_member->flink;
+                  }
+                }
+                else {
+                  flink = &device_group_member->flink;
+                }
+              }
+              if (acked) {
+                device_group->next_ack_check_time = 0;
+                device_group->message_length = 0;
+              }
+              else {
+                device_group->next_ack_check_time = now + 500;
+                waiting_for_acks = true;
+              }
+            }
+          }
+          else {
+            waiting_for_acks = true;
+          }
+        }
+      }
+    }
+  }
+  else {
+    udp_was_connected = false;
+  }
+}
+
+#endif  // USE_DEVICE_GROUPS
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 888893fea..a638ef26e 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -541,6 +541,9 @@ void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source)
     case POWER_TOGGLE:
       power ^= mask;
     }
+#ifdef USE_DEVICE_GROUPS
+    if (SRC_REMOTE != source && SRC_RETRY != source) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_POWER, power);
+#endif  // USE_DEVICE_GROUPS
     SetDevicePower(power, source);
 #ifdef USE_DOMOTICZ
     DomoticzUpdatePowerState(device);
diff --git a/tasmota/support_udp.ino b/tasmota/support_udp.ino
index 71fb07490..6f1d12c2e 100644
--- a/tasmota/support_udp.ino
+++ b/tasmota/support_udp.ino
@@ -85,54 +85,62 @@ void PollUdp(void)
 //      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("\n%s"), packet_buffer);
 
       // Simple Service Discovery Protocol (SSDP)
+      if (Settings.flag2.emulation) {
 #ifdef USE_SCRIPT_HUE
-      if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+        if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
 #else
-      if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+        if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
 #endif
-        udp_response_mutex = true;
+          udp_response_mutex = true;
 
-        udp_remote_ip = PortUdp.remoteIP();
-        udp_remote_port = PortUdp.remotePort();
+          udp_remote_ip = PortUdp.remoteIP();
+          udp_remote_port = PortUdp.remotePort();
 
 //        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("UDP: M-SEARCH Packet from %s:%d\n%s"),
 //          udp_remote_ip.toString().c_str(), udp_remote_port, packet_buffer);
 
-        uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);  // 1500 - 2200 msec
+          uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);  // 1500 - 2200 msec
 
-        LowerCase(packet_buffer, packet_buffer);
-        RemoveSpace(packet_buffer);
+          LowerCase(packet_buffer, packet_buffer);
+          RemoveSpace(packet_buffer);
 
 #ifdef USE_EMULATION_WEMO
-        if (EMUL_WEMO == Settings.flag2.emulation) {
-          if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {     // type1 echo dot 2g, echo 1g's
-            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
-            return;
+          if (EMUL_WEMO == Settings.flag2.emulation) {
+            if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {     // type1 echo dot 2g, echo 1g's
+              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
+              return;
+            }
+            else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||  // type2 Echo 2g (echo & echo plus)
+                    (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+                    (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
+              return;
+            }
           }
-          else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||  // type2 Echo 2g (echo & echo plus)
-                   (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-                   (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-            TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
-            return;
-          }
-        }
 #endif  // USE_EMULATION_WEMO
 
 #ifdef USE_EMULATION_HUE
-        if (EMUL_HUE == Settings.flag2.emulation) {
-          if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
-              (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
-              (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-              (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-            TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
-            return;
+          if (EMUL_HUE == Settings.flag2.emulation) {
+            if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
+                (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
+                (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+                (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+              TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
+              return;
+            }
           }
-        }
 #endif  // USE_EMULATION_HUE
 
-        udp_response_mutex = false;
+          udp_response_mutex = false;
+          continue;
+        }
       }
 
+#ifdef USE_DEVICE_GROUPS
+      if (Settings.flag.device_groups_enabled && !strncmp_P(packet_buffer, kDeviceGroupMessage, sizeof(DEVICE_GROUP_MESSAGE) - 1)) {
+        ProcessDeviceGroupMessage(packet_buffer, len);
+      }
+#endif  // USE_DEVICE_GROUPS
     }
     optimistic_yield(100);
   }
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 376e7c6b1..47a45ba00 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -602,7 +602,11 @@ void WifiCheck(uint8_t param)
           StopWebserver();
         }
 #ifdef USE_EMULATION
-        if (Settings.flag2.emulation) { UdpConnect(); }
+#ifdef USE_DEVICE_GROUPS
+        if (Settings.flag2.emulation || Settings.flag.device_groups_enabled) { UdpConnect(); }
+#else // USE_DEVICE_GROUPS
+      if (Settings.flag2.emulation) { UdpConnect(); }
+#endif // USE_DEVICE_GROUPS
 #endif  // USE_EMULATION
 #endif  // USE_WEBSERVER
 
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 2aa441878..d5db7abb9 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -277,7 +277,8 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_SET_POWER, FUNC_SET_DEVICE_POWER, FUNC_SHOW_SENSOR, FUNC_ANY_KEY,
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
                     FUNC_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED,
-                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN};
+                    FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON, FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
+                    FUNC_DEVICE_GROUP_REQUEST };
 
 enum AddressConfigSteps { ADDR_IDLE, ADDR_RECEIVE, ADDR_SEND };
 
@@ -299,8 +300,32 @@ enum SettingsTextIndex { SET_OTAURL,
                          SET_FRIENDLYNAME5, SET_FRIENDLYNAME6, SET_FRIENDLYNAME7, SET_FRIENDLYNAME8,
                          SET_BUTTON1, SET_BUTTON2, SET_BUTTON3, SET_BUTTON4, SET_BUTTON5, SET_BUTTON6, SET_BUTTON7, SET_BUTTON8,
                          SET_BUTTON9, SET_BUTTON10, SET_BUTTON11, SET_BUTTON12, SET_BUTTON13, SET_BUTTON14, SET_BUTTON15, SET_BUTTON16,
+                         SET_MQTT_GRP_TOPIC2, SET_MQTT_GRP_TOPIC3, SET_MQTT_GRP_TOPIC4,
                          SET_MAX };
 
+enum DeviceGroupMessageType { DGR_MSGTYP_FULL_STATUS, DGR_MSGTYP_PARTIAL_UPDATE, DGR_MSGTYP_UPDATE, DGR_MSGTYP_UPDATE_MORE_TO_COME, DGR_MSGTYP_UPDATE_DIRECT, DGR_MSGTYP_REUPDATE };
+
+enum DeviceGroupMessageFlag { DGR_FLAG_RESET = 1, DGR_FLAG_STATUS_REQUEST = 2, DGR_FLAG_FULL_STATUS = 4, DGR_FLAG_ACK = 8, DGR_FLAG_MORE_TO_COME = 16, DGR_FLAG_DIRECT = 32 };
+
+enum DeviceGroupItem { DGR_ITEM_EOL, DGR_ITEM_STATUS,
+                       DGR_ITEM_LIGHT_FADE, DGR_ITEM_LIGHT_SPEED, DGR_ITEM_LIGHT_BRI, DGR_ITEM_LIGHT_SCHEME, DGR_ITEM_LIGHT_FIXED_COLOR,
+                       DGR_ITEM_BRI_MIN, DGR_ITEM_BRI_PRESET_LOW, DGR_ITEM_BRI_PRESET_HIGH, DGR_ITEM_BRI_POWER_ON,
+                       // Add new 8-bit items before this line
+                       DGR_ITEM_LAST_8BIT, DGR_ITEM_MAX_8BIT = 63,
+                       DGR_ITEM_ACK,
+                       DGR_ITEM_ANALOG1, DGR_ITEM_ANALOG2, DGR_ITEM_ANALOG3, DGR_ITEM_ANALOG4, DGR_ITEM_ANALOG5,
+                       // Add new 16-bit items before this line
+                       DGR_ITEM_LAST_16BIT, DGR_ITEM_MAX_16BIT = 127,
+                       DGR_ITEM_POWER,
+                       // Add new 32-bit items before this line
+                       DGR_ITEM_LAST_32BIT, DGR_ITEM_MAX_32BIT = 191,                       
+                       // Add new string items before this line
+                       DGR_ITEM_LAST_STRING, DGR_ITEM_MAX_STRING = 223,
+                       DGR_ITEM_LIGHT_CHANNELS };
+
+enum DeviceGroupShareItem { DGR_SHARE_POWER = 1, DGR_SHARE_LIGHT_BRI = 2, DGR_SHARE_LIGHT_FADE = 4, DGR_SHARE_LIGHT_SCHEME = 8,
+                            DGR_SHARE_LIGHT_COLOR = 16, DGR_SHARE_BRI_MIN = 32 };
+
 enum CommandSource { SRC_IGNORE, SRC_MQTT, SRC_RESTART, SRC_BUTTON, SRC_SWITCH, SRC_BACKLOG, SRC_SERIAL, SRC_WEBGUI, SRC_WEBCOMMAND, SRC_WEBCONSOLE, SRC_PULSETIMER,
                      SRC_TIMER, SRC_RULE, SRC_MAXPOWER, SRC_MAXENERGY, SRC_OVERTEMP, SRC_LIGHT, SRC_KNX, SRC_DISPLAY, SRC_WEMO, SRC_HUE, SRC_RETRY, SRC_REMOTE, SRC_SHUTTER,
                      SRC_MAX };
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 2ed7976e1..8d17a0eb4 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -290,6 +290,9 @@ void setup(void)
 #ifdef USE_ARDUINO_OTA
   ArduinoOTAInit();
 #endif  // USE_ARDUINO_OTA
+#ifdef USE_DEVICE_GROUPS
+  DeviceGroupsInit();
+#endif  // USE_DEVICE_GROUPS
 
   XdrvCall(FUNC_INIT);
   XsnsCall(FUNC_INIT);
@@ -329,6 +332,9 @@ void loop(void)
 #ifdef ROTARY_V1
   RotaryLoop();
 #endif
+#ifdef USE_DEVICE_GROUPS
+  DeviceGroupsLoop();
+#endif  // USE_DEVICE_GROUPS
   BacklogLoop();
 
   if (TimeReached(state_50msecond)) {
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 615ff8919..74d6b0d84 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -55,6 +55,9 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #ifdef USE_EMULATION_WEMO
 #define USE_EMULATION
 #endif
+#ifdef USE_DEVICE_GROUPS
+#define USE_EMULATION
+#endif
 
 #ifdef USE_MQTT_TLS
   const uint16_t WEB_LOG_SIZE = 2000;            // Max number of characters in weblog
@@ -692,6 +695,14 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_MQTT_TLS_CA_CERT
 #endif
 
+#ifdef USE_DEVICE_GROUPS
+#define SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, ...) _SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, __VA_ARGS__, 0)
+#define SendLocalDeviceGroupMessage(REQUEST_TYPE, ...) _SendDeviceGroupMessage(0, REQUEST_TYPE, __VA_ARGS__, 0)
+#define DEVICE_GROUP_MESSAGE "M-TASMOTA_DGR/"
+const char kDeviceGroupMessage[] PROGMEM = DEVICE_GROUP_MESSAGE;
+uint8_t device_group_count = 1;
+#endif  // USE_DEVICE_GROUPS
+
 #ifdef DEBUG_TASMOTA_CORE
 #define DEBUG_CORE_LOG(...) AddLog_Debug(__VA_ARGS__)
 #else
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index fc143f73a..4296583e1 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2968,7 +2968,11 @@ bool Xdrv01(uint8_t function)
     case FUNC_LOOP:
       PollDnsWebserver();
 #ifdef USE_EMULATION
+#ifdef USE_DEVICE_GROUPS
+      if (Settings.flag2.emulation || Settings.flag.device_groups_enabled) { PollUdp(); }
+#else // USE_DEVICE_GROUPS
       if (Settings.flag2.emulation) { PollUdp(); }
+#endif // USE_DEVICE_GROUPS
 #endif  // USE_EMULATION
       break;
     case FUNC_COMMAND:
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index aadf44f71..f72ec5ab3 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -871,10 +871,17 @@ void CmndPublish(void)
 
 void CmndGroupTopic(void)
 {
+#ifdef USE_DEVICE_GROUPS
+  uint32_t settings_text_index = (XdrvMailbox.index <= 1 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2);
+#endif  // USE_DEVICE_GROUPS
   if (XdrvMailbox.data_len > 0) {
     MakeValidMqtt(0, XdrvMailbox.data);
     if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+#ifdef USE_DEVICE_GROUPS
+    SettingsUpdateText(settings_text_index, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
+#else  // USE_DEVICE_GROUPS
     SettingsUpdateText(SET_MQTT_GRP_TOPIC, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
+#endif  // USE_DEVICE_GROUPS
     restart_flag = 2;
   }
   ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index a45a5499d..baaf2b7a7 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1767,6 +1767,10 @@ void LightAnimate(void)
       Light.update = true;
     }
     if (Light.update) {
+#ifdef USE_DEVICE_GROUPS
+      if (Light.power) LightSendDeviceGroupStatus();
+#endif  // USE_DEVICE_GROUPS
+
       uint16_t cur_col_10[LST_MAX];   // 10 bits resolution
       Light.update = false;
 
@@ -2077,6 +2081,86 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
   }
 }
 
+#ifdef USE_DEVICE_GROUPS
+void LightSendDeviceGroupStatus()
+{
+  uint8_t channels[LST_MAX];
+  light_state.getChannels(channels);
+  SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme, DGR_ITEM_LIGHT_CHANNELS, channels,
+    DGR_ITEM_LIGHT_BRI, (power ? light_state.getBri() : 0));
+}
+
+void LightHandleDeviceGroupRequest()
+{
+  static bool send_state = false;
+  uint32_t value = XdrvMailbox.payload;
+  switch (XdrvMailbox.command_code) {
+    case DGR_ITEM_EOL:
+      LightAnimate();
+      if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
+        light_controller.saveSettings();
+        if (Settings.flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
+          MqttPublishTeleState();
+        }
+        send_state = false;
+      }
+      break;
+    case DGR_ITEM_LIGHT_BRI:
+      if (light_state.getBri() != value) {
+        light_controller.changeBri(value);
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_SCHEME:
+      if (Settings.light_scheme != value) {
+        Settings.light_scheme = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_CHANNELS:
+      light_controller.changeChannels((uint8_t *)XdrvMailbox.data);
+      send_state = true;
+      break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+      {
+        power_t save_power = Light.power;
+        if (value) {
+          bool save_decimal_text = Settings.flag.decimal_text;
+          char str[16];
+          XdrvMailbox.index = 2;
+          XdrvMailbox.data_len = sprintf_P(str, PSTR("%u"), value);
+          XdrvMailbox.data = str;
+          CmndSupportColor();
+          Settings.flag.decimal_text = save_decimal_text;
+        }
+        else {
+          Light.fixed_color_index = 0;
+          XdrvMailbox.index = 1;
+          XdrvMailbox.payload = light_state.BriToDimmer(light_state.getBri());
+          CmndWhite();
+        }
+        if (Light.power != save_power) {
+          XdrvMailbox.index = save_power;
+          LightSetPower();
+        }
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_SPEED:
+      if (Settings.light_speed != value && value > 0 && value <= 40) {
+        Settings.light_speed = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_STATUS:
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
+        DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
+      LightSendDeviceGroupStatus();
+      break;
+  }
+}
+#endif  // USE_DEVICE_GROUPS
+
 /*********************************************************************************************\
  * Commands
 \*********************************************************************************************/
@@ -2339,6 +2423,9 @@ void CmndScheme(void)
         Light.wheel = parm[1];
       }
       Settings.light_scheme = XdrvMailbox.payload;
+#ifdef USE_DEVICE_GROUPS
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme);
+#endif  // USE_DEVICE_GROUPS
       if (LS_WAKEUP == Settings.light_scheme) {
         Light.wakeup_active = 3;
       }
@@ -2516,6 +2603,9 @@ void CmndFade(void)
     Settings.light_fade ^= 1;
     break;
   }
+#ifdef USE_DEVICE_GROUPS
+  if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
+#endif  // USE_DEVICE_GROUPS
   if (!Settings.light_fade) { Light.fade_running = false; }
   ResponseCmndStateText(Settings.light_fade);
 }
@@ -2536,6 +2626,9 @@ void CmndSpeed(void)
   }
   if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
     Settings.light_speed = XdrvMailbox.payload;
+#ifdef USE_DEVICE_GROUPS
+    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
+#endif  // USE_DEVICE_GROUPS
   }
   ResponseCmndNumber(Settings.light_speed);
 }
@@ -2588,6 +2681,11 @@ bool Xdrv04(uint8_t function)
       case FUNC_EVERY_50_MSECOND:
         LightAnimate();
         break;
+#ifdef USE_DEVICE_GROUPS
+      case FUNC_DEVICE_GROUP_REQUEST:
+        LightHandleDeviceGroupRequest();
+        break;
+#endif  // USE_DEVICE_GROUPS
       case FUNC_SET_POWER:
         LightSetPower();
         break;

From a721e35449f7b9de6ac90d3b79009a4d746c943f Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Fri, 21 Feb 2020 21:47:33 -0600
Subject: [PATCH 297/403] Remove power from struct, use DGR log prefix

---
 tasmota/support_device_groups.ino | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 3add948a7..336b13cad 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -36,7 +36,6 @@ struct device_group_member {
 
 struct device_group {
   uint32_t next_ack_check_time;
-  power_t power;
   uint16_t last_full_status_sequence;
   uint16_t message_length;
   uint8_t message_header_length;
@@ -64,7 +63,7 @@ void DeviceGroupsInit(void)
   if (Settings.flag.device_groups_enabled) {
     device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
     if (device_groups == nullptr) {
-      AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error allocating %u-element device group array", device_group_count);
+      AddLog_P2(LOG_LEVEL_ERROR, "DGR: error allocating %u-element device group array", device_group_count);
       Settings.flag.device_groups_enabled = false;
       return;
     }
@@ -132,7 +131,7 @@ void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * la
     }
     delay(10);
   }
-  AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error sending %s packet", label);
+  AddLog_P2(LOG_LEVEL_ERROR, "DGR: error sending %s packet", label);
 }
 
 void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
@@ -377,7 +376,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
 
   // Broadcast the packet.
 #ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending %u-byte device group %s packet via broadcast, sequence=%u", device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
+  AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending %u-byte device group %s packet via broadcast, sequence=%u", device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
 #endif  // DEVICE_GROUPS_DEBUG
   SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Broadcast");
   device_group->next_ack_check_time = millis() + 100;
@@ -419,11 +418,11 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     if (!device_group_member) {
       device_group_member = (struct device_group_member *)calloc(1, sizeof(struct device_group_member));
       if (device_group_member == nullptr) {
-        AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: error allocating device group member block");
+        AddLog_P2(LOG_LEVEL_ERROR, "DGR: error allocating device group member block");
         return;
       }
 #ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: adding member %s (%p)", IPAddressToString(remote_ip), device_group_member);
+      AddLog_P2(LOG_LEVEL_DEBUG, "DGR: adding member %s (%p)", IPAddressToString(remote_ip), device_group_member);
 #endif  // DEVICE_GROUPS_DEBUG
       device_group_member->ip_address = remote_ip;
       *flink = device_group_member;
@@ -538,7 +537,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       case DGR_ITEM_LIGHT_CHANNELS:
         break;
       default:
-        AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: ********** invalid item=%u received from device group %s member %s", item, device_group->group_name, IPAddressToString(remote_ip));
+        AddLog_P2(LOG_LEVEL_ERROR, "DGR: ********** invalid item=%u received from device group %s member %s", item, device_group->group_name, IPAddressToString(remote_ip));
     }
 #endif  // DEVICE_GROUPS_DEBUG
 
@@ -607,7 +606,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   return;
 
 badmsg:
-  AddLog_P2(LOG_LEVEL_ERROR, "DeviceGroups: malformed message received from %s", IPAddressToString(remote_ip));
+  AddLog_P2(LOG_LEVEL_ERROR, "DGR: malformed message received from %s", IPAddressToString(remote_ip));
 #ifdef DEVICE_GROUPS_DEBUG
   AddLog_P2(LOG_LEVEL_DEBUG, "packet_length=%u, offset=%u", packet_length, message_ptr - packet);
 #endif  // DEVICE_GROUPS_DEBUG
@@ -650,7 +649,7 @@ void DeviceGroupsLoop(void)
           if (device_group->next_ack_check_time <= now) {
             if (device_group->initial_status_requests_remaining) {
 #ifdef DEVICE_GROUPS_DEBUG
-              AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending initial status request for group %s", device_group->group_name);
+              AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending initial status request for group %s", device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
               if (--device_group->initial_status_requests_remaining) {
                 SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Initial");
@@ -672,14 +671,14 @@ void DeviceGroupsLoop(void)
 
                   if (device_group_member->timeout_time && device_group_member->timeout_time < now) {
 #ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: removing member %s (%p)", IPAddressToString(device_group_member->ip_address), device_group_member);
+                    AddLog_P2(LOG_LEVEL_DEBUG, "DGR: removing member %s (%p)", IPAddressToString(device_group_member->ip_address), device_group_member);
 #endif  // DEVICE_GROUPS_DEBUG
                     *flink = device_group_member->flink;
                     free(device_group_member);
                   }
                   else {
 #ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, "DeviceGroups: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u", device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
+                    AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u", device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
 #endif  // DEVICE_GROUPS_DEBUG
                     SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, "Unicast");
                     if (!device_group_member->timeout_time) device_group_member->timeout_time = now + 15000;

From 5f1dac2119de6676f8cf410d9c40ffe3ed2042c4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 22 Feb 2020 11:01:47 +0100
Subject: [PATCH 298/403] Update my_user_config.h

---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 15f8e3a3f..8bf359605 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -502,7 +502,7 @@
       #define MTX_ADDRESS7     0x00              // [DisplayAddress7] I2C address of seventh 8x8 matrix module
       #define MTX_ADDRESS8     0x00              // [DisplayAddress8] I2C address of eigth 8x8 matrix module
 //    #define USE_DISPLAY_SH1106                   // [DisplayModel 7] [I2cDriver6] Enable SH1106 Oled 128x64 display (I2C addresses 0x3C and 0x3D)
-  #define USE_WEMOS_MOTOR_V1
+//  #define USE_WEMOS_MOTOR_V1
     #define USE_WEMOS_MOTOR_V1_ADDR  0x30
     #define USE_WEMOS_MOTOR_V1_FREQ  1000
 #endif  // USE_I2C

From f706b7c4900edc0820ed688ab6396647cd30a66d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 22 Feb 2020 12:18:20 +0100
Subject: [PATCH 299/403] Add support for Wemos Motor Shield V1

Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
---
 BUILDS.md                          |   7 ++
 RELEASENOTES.md                    |   3 +-
 tasmota/CHANGELOG.md               |   1 +
 tasmota/my_user_config.h           |   6 +-
 tasmota/tasmota_post.h             |   6 +-
 tasmota/xdrv_34_wemos_motor_v1.ino | 130 ++++++++++++++---------------
 tools/decode-status.py             |   4 +-
 7 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/BUILDS.md b/BUILDS.md
index aa1834061..88ee58cd0 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -62,6 +62,7 @@
 | USE_DDS2382           | - | - | - | - | x | - | - |
 | USE_DDSU666           | - | - | - | - | x | - | - |
 | USE_SOLAX_X1          | - | - | - | - | - | - | - |
+| USE_LE01MR            | - | - | - | - | - | - | - |
 |                       |   |   |   |   |   |   |   |
 | USE_ADC_VCC           | x | x | - | - | - | - | - |
 | USE_COUNTER           | - | - | x | x | x | x | x |
@@ -109,6 +110,8 @@
 | USE_HIH6              | - | - | - | - | x | - | - |
 | USE_DHT12             | - | - | - | - | x | - | - |
 | USE_DS1624            | - | - | - | - | x | - | - |
+| USE_AHT1x             | - | - | - | - | - | - | - |
+| USE_WEMOS_MOTOR_V1    | - | - | - | - | x | - | - |
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_SPI               | - | - | - | - | - | - | x |
@@ -124,6 +127,10 @@
 | USE_RDM6300           | - | - | - | - | x | - | - |
 | USE_IBEACON           | - | - | - | - | x | - | - |
 | USE_GPS               | - | - | - | - | - | - | - |
+| USE_HM10              | - | - | - | - | x | - | - |
+|                       |   |   |   |   |   |   |   |
+| USE_NRF24             | - | - | - | - | - | - | - |
+| USE_MIBLE             | - | - | - | - | - | - | - |
 | USE_ZIGBEE            | - | - | - | - | - | - | - |
 |                       |   |   |   |   |   |   |   |
 | USE_IR_REMOTE         | - | - | x | x | x | x | x |
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dba7abeed..e5e08674c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -103,4 +103,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for FiF LE-01MR energy meter by saper-2 (#7584)
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
-- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
\ No newline at end of file
+- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
+- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 2689a7222..465bcde8f 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
+- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 8bf359605..c2cf75fe0 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -487,6 +487,9 @@
 //  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 //  #define USE_DS1624                             // [I2cDriver42] Enable DS1624, DS1621 temperature sensor (I2C addresses 0x48 - 0x4F) (+1k2 code)
 //  #define USE_AHT1x                              // [I2cDriver43] Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
+//  #define USE_WEMOS_MOTOR_V1                     // [I2cDriver44] Enable Wemos motor driver V1 (I2C addresses 0x2D - 0x30) (+0k7 code)
+//    #define WEMOS_MOTOR_V1_ADDR  0x30            // Default I2C address 0x30
+//    #define WEMOS_MOTOR_V1_FREQ  1000            // Default frequency
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
@@ -502,9 +505,6 @@
       #define MTX_ADDRESS7     0x00              // [DisplayAddress7] I2C address of seventh 8x8 matrix module
       #define MTX_ADDRESS8     0x00              // [DisplayAddress8] I2C address of eigth 8x8 matrix module
 //    #define USE_DISPLAY_SH1106                   // [DisplayModel 7] [I2cDriver6] Enable SH1106 Oled 128x64 display (I2C addresses 0x3C and 0x3D)
-//  #define USE_WEMOS_MOTOR_V1
-    #define USE_WEMOS_MOTOR_V1_ADDR  0x30
-    #define USE_WEMOS_MOTOR_V1_FREQ  1000
 #endif  // USE_I2C
 
 // -- SPI sensors ---------------------------------
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index a126ff6fc..a2b49e677 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -165,6 +165,9 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_PCF8574                              // Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x26 and 0x39 - 0x3F) (+1k9 code)
 #define USE_HIH6                                 // Enable Honywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
 //#define USE_AHT1x                                // Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
+#define USE_WEMOS_MOTOR_V1                       // Enable Wemos motor driver V1 (I2C addresses 0x2D - 0x30) (+0k7 code)
+  #define WEMOS_MOTOR_V1_ADDR  0x30              // Default I2C address 0x30
+  #define WEMOS_MOTOR_V1_FREQ  1000              // Default frequency
 
 #define USE_MHZ19                                // Add support for MH-Z19 CO2 sensor (+2k code)
 #define USE_SENSEAIR                             // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
@@ -223,9 +226,6 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_ARDUINO_SLAVE                        // Add support for Arduino Uno/Pro Mini via serial interface including flashing (+2k3 code, 44 mem)
 #undef DEBUG_THEO                                // Disable debug code
 #undef USE_DEBUG_DRIVER                          // Disable debug code
-#define USE_WEMOS_MOTOR_V1
-  #define USE_WEMOS_MOTOR_V1_ADDR  0x30
-  #define USE_WEMOS_MOTOR_V1_FREQ  1000
 #endif  // FIRMWARE_SENSORS
 
 /*********************************************************************************************\
diff --git a/tasmota/xdrv_34_wemos_motor_v1.ino b/tasmota/xdrv_34_wemos_motor_v1.ino
index 5f744a914..9e6c0a967 100644
--- a/tasmota/xdrv_34_wemos_motor_v1.ino
+++ b/tasmota/xdrv_34_wemos_motor_v1.ino
@@ -1,7 +1,7 @@
 /*
   xdrv_34_wemos_motor_v1.ino - Support for I2C WEMOS motor shield (6612FNG)
 
-  Copyright (C) 2020  Andre Thomas and Theo Arends
+  Copyright (C) 2020  Denis Sborets and Theo Arends
 
   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
@@ -23,6 +23,7 @@
  * WEMOS_MOTOR_V1 - DC motor driver shield (6612FNG) v 1.0.0
  *
  * I2C Address: 0x30
+ *
  * Command format:
  * driver44 <command>,<motor>,<direction>{,<duty>}
  * command:
@@ -41,8 +42,15 @@
  *    0 - 100% (100% by default)
 \*********************************************************************************************/
 
-#define XDRV_34 34
-#define XI2C_44 44 // See I2CDEVICES.md
+#define XDRV_34              34
+#define XI2C_44              44          // See I2CDEVICES.md
+
+#ifndef WEMOS_MOTOR_V1_ADDR
+#define WEMOS_MOTOR_V1_ADDR  0x30        // Default I2C address 0x30
+#endif
+#ifndef WEMOS_MOTOR_V1_FREQ
+#define WEMOS_MOTOR_V1_FREQ  1000        // Default frequency
+#endif
 
 #define MOTOR_A 0
 #define MOTOR_B 1
@@ -53,80 +61,69 @@
 #define STOP 3
 #define STANDBY 4
 
-bool wemos_driver_detected = false;
+struct WMOTORV1 {
+  bool detected = false;
+  uint8_t motor;
+} WMotorV1;
 
-uint8_t _motor;
-
-void Wemos_Driver_Detect(void)
+void WMotorV1Detect(void)
 {
-  if (!I2cActive(USE_WEMOS_MOTOR_V1_ADDR))
-  {
-    I2cSetActiveFound(USE_WEMOS_MOTOR_V1_ADDR, "WEMOS_MOTOR_V1");
-    wemos_driver_detected = true;
-    Motor_Reset();
-    return;
+  if (I2cSetDevice(WEMOS_MOTOR_V1_ADDR)) {
+    WMotorV1.detected = true;
+    I2cSetActiveFound(WEMOS_MOTOR_V1_ADDR, "WEMOS_MOTOR_V1");
+    WMotorV1Reset();
   }
 }
 
-void Motor_Reset(void)
+void WMotorV1Reset(void)
 {
-  Wire.begin();
-  Motor_SetFreq(USE_WEMOS_MOTOR_V1_FREQ);
-  Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"RESET\":\"OK\"}}"));
+//  Wire.begin();
+  WMotorV1SetFrequency(WEMOS_MOTOR_V1_FREQ);
 }
 
-void Motor_SetFreq(uint32_t freq)
+void WMotorV1SetFrequency(uint32_t freq)
 {
-  Wire.beginTransmission(USE_WEMOS_MOTOR_V1_ADDR);
+  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
   Wire.write(((byte)(freq >> 16)) & (byte)0x0f);
   Wire.write((byte)(freq >> 16));
   Wire.write((byte)(freq >> 8));
   Wire.write((byte)freq);
   Wire.endTransmission(); // stop transmitting
-  delay(100);
+//  delay(100);
 }
 
-void Motor_SetMotor(uint8_t motor, uint8_t dir, float pwm_val)
+void WMotorV1SetMotor(uint8_t motor, uint8_t dir, float pwm_val)
 {
-  uint16_t _pwm_val;
-  Wire.beginTransmission(USE_WEMOS_MOTOR_V1_ADDR);
+  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
   Wire.write(motor | (byte)0x10);
   Wire.write(dir);
 
-  _pwm_val = uint16_t(pwm_val * 100);
-
-  if (_pwm_val > 10000)
+  uint16_t _pwm_val = uint16_t(pwm_val * 100);
+  if (_pwm_val > 10000) {
     _pwm_val = 10000;
+  }
 
   Wire.write((byte)(_pwm_val >> 8));
   Wire.write((byte)_pwm_val);
   Wire.endTransmission();
-
-  delay(100);
-
-  Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"SETMOTOR\":\"OK\"}}"));
+//  delay(100);
 }
 
-bool Motor_Command(void)
+bool WMotorV1Command(void)
 {
   uint8_t args_count = 0;
-  if (XdrvMailbox.data_len > 0)
-  {
+
+  if (XdrvMailbox.data_len > 0) {
     args_count = 1;
-  }
-  else
-  {
+  } else {
     return false;
   }
 
-  for (uint32_t idx = 0; idx < XdrvMailbox.data_len; idx++)
-  {
-    if (' ' == XdrvMailbox.data[idx])
-    {
+  for (uint32_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
+    if (' ' == XdrvMailbox.data[idx]) {
       XdrvMailbox.data[idx] = ',';
     }
-    if (',' == XdrvMailbox.data[idx])
-    {
+    if (',' == XdrvMailbox.data[idx]) {
       args_count++;
     }
   }
@@ -134,51 +131,50 @@ bool Motor_Command(void)
 
   char *command = strtok(XdrvMailbox.data, ",");
 
-  if (strcmp(command, "RESET") == 0)
-  {
-    Motor_Reset();
+  if (strcmp(command, "RESET") == 0) {
+    WMotorV1Reset();
+    Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"RESET\":\"OK\"}}"));
     return true;
   }
 
-  if (strcmp(command, "SETMOTOR") == 0)
-  {
-    if (args_count >= 3)
-    {
+  if (strcmp(command, "SETMOTOR") == 0) {
+    if (args_count >= 3) {
 
       int motor = atoi(strtok(NULL, ","));
       int dir = atoi(strtok(NULL, ","));
       int duty = 100;
-
-      if (args_count == 4)
-      {
+      if (args_count == 4) {
         duty = atoi(strtok(NULL, ","));
       }
 
-      Motor_SetMotor(motor, dir, duty);
-
+      WMotorV1SetMotor(motor, dir, duty);
+      Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"SETMOTOR\":\"OK\"}}"));
       return true;
     }
   }
   return false;
 }
 
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
 bool Xdrv34(uint8_t function)
 {
-  if (!I2cEnabled(XI2C_44))
-  {
-    return false;
-  }
+  if (!I2cEnabled(XI2C_44)) { return false; }
+
   bool result = false;
-  if (FUNC_INIT == function)
-  {
-    Wemos_Driver_Detect();
-    result = wemos_driver_detected;
+
+  if (FUNC_INIT == function) {
+    WMotorV1Detect();
   }
-  else if (wemos_driver_detected)
-  {
-    if (FUNC_COMMAND_DRIVER == function && XI2C_44 == XdrvMailbox.index)
-    {
-      result = Motor_Command();
+  else if (WMotorV1.detected) {
+    switch (function) {
+      case FUNC_COMMAND_DRIVER:
+        if (XI2C_44 == XdrvMailbox.index) {
+          result = WMotorV1Command();
+        }
+        break;
     }
   }
   return result;
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 210175de8..3838d8faf 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -193,7 +193,7 @@ a_features = [[
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
-    "USE_AHT1x","","",""
+    "USE_AHT1x","USE_WEMOS_MOTOR_V1","",""
     ],[
     "","","","",
     "","","","",
@@ -236,7 +236,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200220 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200222 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 13763f55a68361c13e81b56b279cdb0d798c76b3 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 22 Feb 2020 20:53:55 +0100
Subject: [PATCH 300/403] Fix Zigbee auto-increment transaction number (#7757)

---
 tasmota/CHANGELOG.md                  |  1 +
 tasmota/i18n.h                        |  1 +
 tasmota/xdrv_23_zigbee_1_headers.ino  |  2 +-
 tasmota/xdrv_23_zigbee_3_devices.ino  | 23 ++++++++++++++++++++++-
 tasmota/xdrv_23_zigbee_6_commands.ino |  2 +-
 tasmota/xdrv_23_zigbee_8_parsers.ino  |  2 ++
 tasmota/xdrv_23_zigbee_9_impl.ino     |  9 +++++----
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 465bcde8f..c8cf0ab3a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
+- Fix Zigbee auto-increment transaction number (#7757)
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 00cda53b4..c7930e79b 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -489,6 +489,7 @@
 #define D_CMND_ZIGBEE_FORGET "Forget"
 #define D_CMND_ZIGBEE_SAVE "Save"
   #define D_CMND_ZIGBEE_LINKQUALITY "LinkQuality"
+  #define D_CMND_ZIGBEE_ENDPOINT "Endpoint"
 #define D_CMND_ZIGBEE_READ "Read"
 #define D_CMND_ZIGBEE_SEND "Send"
   #define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent"
diff --git a/tasmota/xdrv_23_zigbee_1_headers.ino b/tasmota/xdrv_23_zigbee_1_headers.ino
index 101d5703d..0bc592266 100644
--- a/tasmota/xdrv_23_zigbee_1_headers.ino
+++ b/tasmota/xdrv_23_zigbee_1_headers.ino
@@ -21,7 +21,7 @@
 
 // contains some definitions for functions used before their declarations
 
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp = true, uint8_t transacId = 1);
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId);
 
 
 // Get an JSON attribute, with case insensitive key search
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 4814bdb8a..78c192cc1 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -49,6 +49,8 @@ typedef struct Z_Device {
   // json buffer used for attribute reporting
   DynamicJsonBuffer    *json_buffer;
   JsonObject           *json;
+  // sequence number for Zigbee frames
+  uint8_t              seqNumber;
 } Z_Device;
 
 // All devices are stored in a Vector
@@ -96,6 +98,9 @@ public:
   // device just seen on the network, update the lastSeen field
   void updateLastSeen(uint16_t shortaddr);
 
+  // get next sequence number for (increment at each all)
+  uint8_t getNextSeqNumber(uint16_t shortaddr);
+
   // Dump json
   String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
 
@@ -133,6 +138,7 @@ public:
 private:
   std::vector<Z_Device> _devices = {};
   uint32_t              _saveTimer = 0;   
+  uint8_t               _seqNumber = 0;     // global seqNumber if device is unknown
 
   template < typename T>
   static bool findInVector(const std::vector<T>  & vecOfElements, const T  & element);
@@ -226,7 +232,9 @@ Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
                       std::vector<uint32_t>(),
                       0,0,0,0,
                       nullptr,
-                      nullptr, nullptr };
+                      nullptr, nullptr,
+                      0,          // seqNumber
+                      };
   device.json_buffer = new DynamicJsonBuffer();
   _devices.push_back(device);
   dirty();
@@ -532,6 +540,19 @@ void Z_Devices::updateLastSeen(uint16_t shortaddr) {
   _updateLastSeen(device);
 }
 
+// get the next sequance number for the device, or use the global seq number if device is unknown
+uint8_t Z_Devices::getNextSeqNumber(uint16_t shortaddr) {
+  int32_t short_found = findShortAddr(shortaddr);
+  if (short_found >= 0) {
+    Z_Device &device = getShortAddr(shortaddr);
+    device.seqNumber += 1;
+    return device.seqNumber;
+  } else {
+    _seqNumber += 1;
+    return _seqNumber;
+  }
+}
+
 // Per device timers
 //
 // Reset the timer for a specific device
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 073ab8e4c..9d6f38b95 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -78,7 +78,7 @@ int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoi
       break;
   }
   if (attrs) {
-    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true /* we do want a response */, zigbee_devices.getNextSeqNumber(shortaddr));
   }
 }
 
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 668f85471..7d84124ed 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -451,6 +451,8 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
 
   zcl_received.postProcessAttributes(srcaddr, json);
+  // Add Endpoint
+  json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
   // Add linkquality
   json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
 
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 6ea08c4ac..eccfc56be 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -344,7 +344,7 @@ void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
                                		ToHex_P(msg, len, hex_char, sizeof(hex_char)));
 }
 
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId) {
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId) {
   SBuffer buf(25+len);
   buf.add8(Z_SREQ | Z_AF);        // 24
   buf.add8(AF_DATA_REQUEST);      // 01
@@ -357,7 +357,7 @@ void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8
   buf.add8(0x1E);                 // 1E radius
 
   buf.add8(3 + len);
-  buf.add8((disableDefResp ? 0x10 : 0x00) | (clusterSpecific ? 0x01 : 0x00));                 // Frame Control Field
+  buf.add8((needResponse ? 0x00 : 0x10) | (clusterSpecific ? 0x01 : 0x00));                 // Frame Control Field
   buf.add8(transacId);            // Transaction Sequance Number
   buf.add8(cmdId);
   if (len > 0) {
@@ -438,7 +438,7 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
   }
 
   // everything is good, we can send the command
-  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len());
+  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len(), false, zigbee_devices.getNextSeqNumber(dstAddr));
   // now set the timer, if any, to read back the state later
   if (clusterSpecific) {
     zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
@@ -469,6 +469,7 @@ void CmndZbSend(void) {
   uint8_t  endpoint = 0x00;       // 0x00 is invalid for the dst endpoint
   String   cmd_str = "";          // the actual low-level command, either specified or computed
 
+  // parse JSON
   const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
   if (nullptr != &val_device) {
     device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
@@ -729,7 +730,7 @@ void CmndZbRead(void) {
   }
 
   if ((0 != endpoint) && (attrs_len > 0)) {
-    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true /* we do want a response */, zigbee_devices.getNextSeqNumber(device));
     ResponseCmndDone();
   } else {
     ResponseCmndChar("Missing parameters");

From 73b2fdd6f472891631be54233d0968597d5d3bbd Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 23 Feb 2020 09:21:54 +0100
Subject: [PATCH 301/403] fix OUI-bug

---
 tasmota/xsns_61_MI_NRF24.ino | 115 +++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 32 deletions(-)

diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index 8527c9749..cc865f6d6 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -21,6 +21,9 @@
   Version yyyymmdd  Action    Description
   --------------------------------------------------------------------------------------------
 
+  0.9.3.0 20200222  integrate - use now the correct id-word instead of MAC-OUI, 
+                                add CGG1
+  ---
   0.9.2.0 20200212  integrate - "backports" from MI-HM10, change reading pattern, 
                                 add missing PDU-types, renaming driver
   ---
@@ -58,18 +61,21 @@
 #define MJ_HT_V1    2
 #define LYWSD02     3
 #define LYWSD03     4
+#define CGG1        5
 
-uint8_t kMINRFSlaveID[4][3]  = { 0xC4,0x7C,0x8D, // Flora
-                                0x58,0x2D,0x34, // MJ_HT_V1
-                                0xE7,0x2E,0x00, // LYWSD02
-                                0xA4,0xC1,0x38, // LYWSD03
-                                };
+const uint16_t kMINRFSlaveID[5]={ 0x0098, // Flora
+                                  0x01aa, // MJ_HT_V1
+                                  0x045b, // LYWSD02
+                                  0x055b, // LYWSD03
+                                  0x0347  // CGG1
+                                  };
 
 const char kMINRFSlaveType1[] PROGMEM = "Flora";
 const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
 const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
 const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
-const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4};
+const char kMINRFSlaveType5[] PROGMEM = "CGG1";
+const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4,kMINRFSlaveType5};
 
 // PDU's or different channels 37-39
 const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
@@ -77,10 +83,11 @@ const uint32_t kMINRFMJPDU[3]  = {0x4760cd66,0xdbcc0cd3,0x33048df5};
 const uint32_t kMINRFL2PDU[3]  = {0x3eaa057d,0xef3b0730,0x71da7646}; // 1 and 3 unsure
 // const uint32_t kMINRFL3PDU[3]  = {0x4760dd78,0xdbcc1ccd,0xffffffff}; //encrypted - 58 58
 const uint32_t kMINRFL3PDU[3]  = {0x4760cb78,0xdbcc0acd,0x33048beb}; //unencrypted  - 30 58
+const uint32_t kMINRFCGPDU[3]  = {0x4760cd78,0xdbcc0ccd,0x33048deb}; // very unsure!!!
 
 // start-LSFR for different channels 37-39
 const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};  // Flora, LYWSD02
-const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03, ???CGG1????
 
 
 #pragma pack(1)  // important!!
@@ -269,7 +276,7 @@ struct {
 } MINRF;
 
 struct mi_sensor_t{
-  uint8_t type; //Flora = 1; MJ_HT_V1=2; LYWSD02=3; LYWSD03=4
+  uint8_t type; //Flora = 1; MJ_HT_V1=2; LYWSD02=3; LYWSD03=4; ; CGG1=5
   uint8_t serial[6];
   uint8_t showedUp;
   float temp; //Flora, MJ_HT_V1, LYWSD0x
@@ -362,6 +369,9 @@ bool MINRFreceivePacket(void)
       case 4:
       MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "LYWSD03" mode
       break;
+      case 5:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "CGG1" mode
+      break;
     }
     // DEBUG_SENSOR_LOG(PSTR("MINRF: LSFR:%x"),_lsfr);
     // if (_lsfr>254) _lsfr=0;
@@ -470,6 +480,9 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
       if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
       NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);// 95 fe 58 30 -> LYWSD03 (= no data message)
     break;
+    case 5: // special CGG1 packet
+      NRF24radio.openReadingPipe(0,kMINRFCGPDU[_nextchannel]); // 95 fe 50 30 -> CGG1
+    break;
   }
   // DEBUG_SENSOR_LOG(PSTR("MINRF: Change Mode to %u"),_mode);
   MINRF.packetMode = _mode;
@@ -479,24 +492,25 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
  * @brief Return the slot number of a known sensor or return create new sensor slot
  *
  * @param _serial     BLE address of the sensor
- * @param _type       Type number of the sensor, 0xff for Auto-type
+ * @param _type       Type number of the sensor
  * @return uint32_t   Known or new slot in the sensors-vector
  */
-uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  if(_type==0xff){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: will test MAC-type"));
-    for (uint32_t i=0;i<4;i++){
-      if(memcmp(_serial,kMINRFSlaveID+i,3)==0){
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC is type %u"), i);
-        _type = i+1;
-      }
-      else {
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-type is unknown"));
-      }
+uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint16_t _type){
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: will test ID-type: %x"), _type);
+  bool _success = false;
+  for (uint32_t i=0;i<5;i++){
+    if(_type == kMINRFSlaveID[i]){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID is type %u"), i);
+      _type = i+1;
+      _success = true;
+    }
+    else {
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID-type is not: %x"),kMINRFSlaveID[i]);
     }
   }
-  if(_type==0xff) return _type; // error
-
+  if(!_success) return 0xff;
+ 
   DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
   for(uint32_t i=0; i<MIBLEsensors.size(); i++){
     if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
@@ -550,13 +564,13 @@ void MINRFpurgeFakeSensors(void){
 
 
 void MINRFhandleFloraPacket(void){
-  if(MINRF.buffer.floraPacket.T.idWord!=0x9800 && MINRF.buffer.floraPacket.T.valueTen!=0x10){
+  if(MINRF.buffer.floraPacket.T.valueTen!=0x10){
     DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
     MINRF_LOG_BUFFER(MINRF.buffer.raw);
     return;
   }
   MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, 0xff); // T is not specific, any struct would be possible to use
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, MINRF.buffer.floraPacket.T.idWord); // T is not specific, any struct would be possible to use
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
   if(_slot==0xff) return;
 
@@ -593,13 +607,13 @@ void MINRFhandleFloraPacket(void){
 }
 
 void MINRFhandleMJ_HT_V1Packet(void){
-  if(MINRF.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
     DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
     MINRF_LOG_BUFFER(MINRF.buffer.raw);
     return;
   }
   MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, 0xff); // B would be possible too
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord); // B would be possible too
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
   if(_slot==0xff) return;
 
@@ -635,9 +649,9 @@ void MINRFhandleLYWSD02Packet(void){
     return;
   }
   MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff); // H would be possible too
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord); // H would be possible too
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-    if(_slot==0xff) return;
+  if(_slot==0xff) return;
 
   static float _tempFloat;
   switch(MINRF.buffer.LYWSD02Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
@@ -661,7 +675,7 @@ void MINRFhandleLYWSD02Packet(void){
 void MINRFhandleLYWSD03Packet(void){
   // not much to do ATM, just show the sensor without data
   MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial); //the beginning is equal to the LYWSD02-packet
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
     if(_slot==0xff) return;
 
@@ -670,6 +684,42 @@ void MINRFhandleLYWSD03Packet(void){
   MINRF_LOG_BUFFER(MINRF.buffer.raw);
 }
 
+void MINRFhandleCGG1Packet(void){ // we assume, that the packet structure is equal to the MJ_HT_V1
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected CGG1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord); // B would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp,  MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
 void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   
   if(MINRF.timer>6000){ // happens every 6000/20 = 300 seconds
@@ -712,9 +762,10 @@ void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   else if (MINRF.packetMode == LYWSD03){
     MINRFhandleLYWSD03Packet();
   }
-  
-  // DEBUG_SENSOR_LOG(PSTR("MINRF: Change packet mode every 50 msec"));
-  if (MINRF.packetMode == LYWSD03){
+  else if (MINRF.packetMode == CGG1){
+    MINRFhandleCGG1Packet();
+  }
+  if (MINRF.packetMode == CGG1){
     MINRFinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
   }
   else {

From 11604e30d4fcb5a56f996b41f745e24f17730d8e Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 23 Feb 2020 10:29:04 +0100
Subject: [PATCH 302/403] Moved 'Updated shadow' do DEBUG log level

---
 tasmota/xdrv_02_mqtt.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index aadf44f71..1fda2a95a 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -398,7 +398,7 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retain
     free(mqtt_save);
 
     bool result = MqttClient.publish(romram, mqtt_data, false);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
     yield();  // #3313
   }
 #endif // USE_MQTT_AWS_IOT

From 8411178dacef96ccf20b9536de0bb4540bbb5e20 Mon Sep 17 00:00:00 2001
From: Staars <Baars@gmx.de>
Date: Sun, 23 Feb 2020 14:52:26 +0100
Subject: [PATCH 303/403] use now the correct PDU-types

---
 tasmota/xsns_61_MI_NRF24.ino | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index cc865f6d6..f1db19d74 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -83,11 +83,11 @@ const uint32_t kMINRFMJPDU[3]  = {0x4760cd66,0xdbcc0cd3,0x33048df5};
 const uint32_t kMINRFL2PDU[3]  = {0x3eaa057d,0xef3b0730,0x71da7646}; // 1 and 3 unsure
 // const uint32_t kMINRFL3PDU[3]  = {0x4760dd78,0xdbcc1ccd,0xffffffff}; //encrypted - 58 58
 const uint32_t kMINRFL3PDU[3]  = {0x4760cb78,0xdbcc0acd,0x33048beb}; //unencrypted  - 30 58
-const uint32_t kMINRFCGPDU[3]  = {0x4760cd78,0xdbcc0ccd,0x33048deb}; // very unsure!!!
+const uint32_t kMINRFCGPDU[3]  = {0x4760cd6e,0xdbcc0cdb,0x33048dfd};
 
 // start-LSFR for different channels 37-39
 const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};  // Flora, LYWSD02
-const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03, ???CGG1????
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03, CGG1
 
 
 #pragma pack(1)  // important!!
@@ -720,6 +720,10 @@ void MINRFhandleCGG1Packet(void){ // we assume, that the packet structure is equ
   }
 }
 
+/*********************************************************************************************\
+ * Main loop of the driver
+\*********************************************************************************************/
+
 void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   
   if(MINRF.timer>6000){ // happens every 6000/20 = 300 seconds
@@ -771,7 +775,7 @@ void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   else {
     MINRFinitBLE(++MINRF.packetMode);
   }
-  
+
   MINRFhopChannel();
   NRF24radio.startListening();
 }

From d4dd0a39a5ab865055c99c2a8e045972d67b7da7 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 23 Feb 2020 16:46:00 +0100
Subject: [PATCH 304/403] Add Zigbee enhanced commands decoding, added
 ``ZbPing``

---
 tasmota/CHANGELOG.md                      |   1 +
 tasmota/i18n.h                            |   2 +
 tasmota/xdrv_23_zigbee_3_devices.ino      |   8 +
 tasmota/xdrv_23_zigbee_5_converters.ino   |  12 +-
 tasmota/xdrv_23_zigbee_6_commands.ino     | 261 +++++++++++++++++++---
 tasmota/xdrv_23_zigbee_7_statemachine.ino |   1 +
 tasmota/xdrv_23_zigbee_8_parsers.ino      |  51 ++++-
 tasmota/xdrv_23_zigbee_9_impl.ino         | 114 +++++-----
 8 files changed, 344 insertions(+), 106 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index c8cf0ab3a..ef9ce17f4 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 - Fix Zigbee auto-increment transaction number (#7757)
+- Add Zigbee enhanced commands decoding, added ``ZbPing``
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index c7930e79b..ab7d18ce0 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -496,6 +496,8 @@
 #define D_JSON_ZIGBEE_RECEIVED "ZbReceived"
 #define D_JSON_ZIGBEE_RECEIVED_LEGACY "ZigbeeReceived"
 #define D_CMND_ZIGBEE_BIND "Bind"
+#define D_CMND_ZIGBEE_PING "Ping"
+  #define D_JSON_ZIGBEE_PING "ZbPing"
 
 // Commands xdrv_25_A4988_Stepper.ino
 #define D_CMND_MOTOR "MOTOR"
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 78c192cc1..71752f4e3 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -19,6 +19,10 @@
 
 #ifdef USE_ZIGBEE
 
+#ifndef ZIGBEERECEIVED
+#define ZIGBEERECEIVED 1
+#endif
+
 #include <vector>
 #include <map>
 
@@ -725,18 +729,22 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#if ZIGBEERECEIVED
     // DEPRECATED TODO
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#endif
   } else {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#if ZIGBEERECEIVED
     // DEPRECATED TODO
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#endif
   }
   // MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
   // XdrvRulesProcess();
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index d97e5e7d4..4debd73fd 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -486,18 +486,8 @@ void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
 
 
 // Parse non-normalized attributes
-// The key is "s_" followed by 16 bits clusterId, "_" followed by 8 bits command id
 void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  char attrid_str[12];
-  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cluster_id, _cmd_id);
-
-  char hex_char[_payload.len()*2+2];
-  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-
-  json[attrid_str] = hex_char;
+  convertClusterSpecific(json, _cluster_id, _cmd_id, _frame_control.b.direction, _payload);
 }
 
 // return value:
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 9d6f38b95..83841f90c 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -19,34 +19,79 @@
 
 #ifdef USE_ZIGBEE
 
-//typedef int32_t (*Z_AttrConverter)(uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param);
 typedef struct Z_CommandConverter {
   const char * tasmota_cmd;
-  const char * zcl_cmd;
+  uint16_t     cluster;
+  uint8_t      cmd;         // normally 8 bits, 0xFF means it's a parameter
+  uint8_t      direction;   // direction of the command. 0x01 client->server, 0x02 server->client, 0x03 both
+  const char * param;
 } Z_CommandConverter;
 
+typedef struct Z_XYZ_Var {    // Holds values for vairables X, Y and Z
+  uint32_t    x = 0;
+  uint32_t    y = 0;
+  uint32_t    z = 0;
+  uint8_t     x_type = 0;     // 0 = no value, 1 = 1 bytes, 2 = 2 bytes
+  uint8_t     y_type = 0;
+  uint8_t     z_type = 0;
+} Z_XYZ_Var;
+
 // list of post-processing directives
 const Z_CommandConverter Z_Commands[] = {
-  { "Power",        "0006!xx" },              // 0=Off, 1=On, 2=Toggle
-  { "Dimmer",       "0008!04/xx0A00" },       // Move to Level with On/Off, xx=0..254 (255 is invalid)
-  { "Dimmer+",      "0008!06/001902" },       // Step up by 10%, 0.2 secs
-  { "Dimmer-",      "0008!06/011902" },       // Step down by 10%, 0.2 secs
-  { "DimmerStop",   "0008!03" },              // Stop any Dimmer animation
-  { "ResetAlarm",   "0009!00/xxyyyy" },       // Reset alarm (alarm code + cluster identifier)
-  { "ResetAllAlarms","0009!01" },             // Reset all alarms
-  { "Hue",          "0300!00/xx000A00" },     // Move to Hue, shortest time, 1s
-  { "Sat",          "0300!03/xx0A00" },       // Move to Sat
-  { "HueSat",       "0300!06/xxyy0A00" },     // Hue, Sat
-  { "Color",        "0300!07/xxxxyyyy0A00" }, // x, y (uint16)
-  { "CT",           "0300!0A/xxxx0A00" },     // Color Temperature Mireds (uint16)
-  { "Shutter",      "0102!xx" },
-  { "ShutterOpen",  "0102!00" },
-  { "ShutterClose", "0102!01" },
-  { "ShutterStop",  "0102!02" },
-  { "ShutterLift",  "0102!05xx" },            // Lift percentage, 0%=open, 100%=closed
-  { "ShutterTilt",  "0102!08xx" },            // Tilt percentage
+  // Group adress commands
+  { "AddGroup",       0x0004, 0x00, 0x01,   "xxxx00" },       // Add group id, group name is not supported
+  { "ViewGroup",      0x0004, 0x01, 0x01,   "xxxx" },         // Ask for the group name
+  { "GetGroup",       0x0004, 0x02, 0x01,   "01xxxx" },       // Get one group membership
+  { "GetAllGroups",   0x0004, 0x02, 0x01,   "00" },           // Get all groups membership
+  { "RemoveGroup",    0x0004, 0x03, 0x01,   "xxxx" },         // Remove one group
+  { "RemoveAllGroups",0x0004, 0x04, 0x01,   "" },             // Remove all groups
+  // Light & Shutter commands
+  { "Power",          0x0006, 0xFF, 0x01,   "" },             // 0=Off, 1=On, 2=Toggle
+  { "Dimmer",         0x0008, 0x04, 0x01,   "xx0A00" },       // Move to Level with On/Off, xx=0..254 (255 is invalid)
+  { "Dimmer+",        0x0008, 0x06, 0x01,   "001902" },       // Step up by 10%, 0.2 secs
+  { "Dimmer-",        0x0008, 0x06, 0x01,   "011902" },       // Step down by 10%, 0.2 secs
+  { "DimmerStop",     0x0008, 0x03, 0x01,   "" },             // Stop any Dimmer animation
+  { "ResetAlarm",     0x0009, 0x00, 0x01,   "xxyyyy" },       // Reset alarm (alarm code + cluster identifier)
+  { "ResetAllAlarms", 0x0009, 0x01, 0x01,   "" },             // Reset all alarms
+  { "Hue",            0x0300, 0x00, 0x01,   "xx000A00" },     // Move to Hue, shortest time, 1s
+  { "Sat",            0x0300, 0x03, 0x01,   "xx0A00" },       // Move to Sat
+  { "HueSat",         0x0300, 0x06, 0x01,   "xxyy0A00" },     // Hue, Sat
+  { "Color",          0x0300, 0x07, 0x01,   "xxxxyyyy0A00" }, // x, y (uint16)
+  { "CT",             0x0300, 0x0A, 0x01,   "xxxx0A00" },     // Color Temperature Mireds (uint16)
+  { "ShutterOpen",    0x0102, 0x00, 0x01,   "" },
+  { "ShutterClose",   0x0102, 0x01, 0x01,   "" },
+  { "ShutterStop",    0x0102, 0x02, 0x01,   "" },
+  { "ShutterLift",    0x0102, 0x05, 0x01,   "xx" },            // Lift percentage, 0%=open, 100%=closed
+  { "ShutterTilt",    0x0102, 0x08, 0x01,   "xx" },            // Tilt percentage
+  { "Shutter",        0x0102, 0xFF, 0x01,   "" },
+  // Blitzwolf PIR
+  { "Occupancy",      0xEF00, 0x01, 0x01,   "xx"},                // Specific decoder for Blitzwolf PIR, empty name means special treatment
+  // Decoders only - normally not used to send, and names may be masked by previous definitions
+  { "Dimmer",         0x0008, 0x00, 0x01,   "xx" },
+  { "DimmerMove",     0x0008, 0x01, 0x01,   "xx0A" },
+  { "DimmerStep",     0x0008, 0x02, 0x01,   "xx190A00" },
+  { "DimmerMove",     0x0008, 0x05, 0x01,   "xx0A" },
+  { "Dimmer+",        0x0008, 0x06, 0x01,   "00" },
+  { "Dimmer-",        0x0008, 0x06, 0x01,   "01" },
+  { "DimmerStop",     0x0008, 0x07, 0x01,   "" },
+  { "HueMove",        0x0300, 0x01, 0x01,   "xx19" },
+  { "HueStep",        0x0300, 0x02, 0x01,   "xx190A00" },
+  { "SatMove",        0x0300, 0x04, 0x01,   "xx19" },
+  { "SatStep",        0x0300, 0x05, 0x01,   "xx190A" },
+  { "ColorMove",      0x0300, 0x08, 0x01,   "xxxxyyyy" },
+  { "ColorStep",      0x0300, 0x09, 0x01,   "xxxxyyyy0A00" },
+  // Tradfri
+  { "ArrowClick",     0x0005, 0x07, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
+  { "ArrowHold",      0x0005, 0x08, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
+  { "ArrowRelease",   0x0005, 0x09, 0x01,   "" },
+  // responses for Group cluster commands
+  { "AddGroupResp",   0x0004, 0x00, 0x02,   "xxyyyy" },       // xx = status, yy = group id
+  { "ViewGroupResp",  0x0004, 0x01, 0x02,   "xxyyyy" },       // xx = status, yy = group id, name ignored
+  { "GetGroupResp",   0x0004, 0x02, 0x02,   "xxyyzzzz" },     // xx = capacity, yy = count, zzzz = first group id, following groups ignored
+  { "RemoveGroup",    0x0004, 0x03, 0x02,   "xxyyyy" },       // xx = status, yy = group id
 };
 
+
 #define ZLE(x) ((x) & 0xFF), ((x) >> 8)     // Little Endian
 
 // Below are the attributes we wand to read from each cluster
@@ -55,6 +100,7 @@ const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };    // CurrentLevel
 const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };    // AlarmCount
 const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };    // Hue, Sat, X, Y, CT
 
+// This callback is registered after a cluster specific command and sends a read command for the same cluster
 int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
   size_t         attrs_len = 0;
   const uint8_t* attrs = nullptr;
@@ -82,7 +128,6 @@ int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoi
   }
 }
 
-
 // set a timer to read back the value in the future
 void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
   uint32_t wait_ms = 0;
@@ -105,22 +150,182 @@ void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoi
   }
 }
 
-const __FlashStringHelper* zigbeeFindCommand(const char *command) {
-  char parm_uc[16];   // used to convert JSON keys to uppercase
+// returns true if char is 'x', 'y' or 'z'
+inline bool isXYZ(char c) {
+  return (c >= 'x') && (c <= 'z');
+}
+
+// returns the Hex value of a digit [0-9A-Fa-f]
+// return: 0x00-0x0F
+// or -1 if cannot be parsed
+inline int8_t hexValue(char c) {
+  if ((c >= '0') && (c <= '9')) {
+    return c - '0';
+  }
+  if ((c >= 'A') && (c <= 'F')) {
+    return 10 + c - 'A';
+  }
+  if ((c >= 'a') && (c <= 'f')) {
+    return 10 + c - 'a';
+  }
+  return -1;
+}
+
+// Parse a Big Endian suite of max_len digits, or stops when a non-hex digit is found
+uint32_t parseHex_P(const char **data, size_t max_len = 8) {
+  uint32_t ret = 0;
+  for (uint32_t i = 0; i < max_len; i++) {
+    int8_t v = hexValue(pgm_read_byte(*data));
+    if (v < 0) { break; }     // non hex digit, we stop parsing
+    ret = (ret << 4) | v;
+    *data += 1;
+  }
+  return ret;
+}
+
+// Parse a model like "xxyy00"
+// and fill x, y and z values
+// Little Endian encoding
+// On exit, xyz is updated, and x_type, y_type, z_type contain the number of bytes read for each
+void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz) {
+  const char *p = model;    // pointer to the model character
+  uint32_t   v = 0;         // index in the payload bytes buffer
+  char c = pgm_read_byte(p);  // cur char
+  while (c) {
+    char c1 = pgm_read_byte(p+1);   // next char
+    if (!c1) { break; }   // unexpected end of model
+    if (isXYZ(c) && (c == c1) && (v < payload.len())) {    // if char is [x-z] and followed by same char
+      uint8_t val = payload.get8(v);
+      switch (c) {
+        case 'x':
+          xyz->x = xyz->x | (val << (xyz->x_type * 8));
+          xyz->x_type++;
+          break;
+        case 'y':
+          xyz->y = xyz->y | (val << (xyz->y_type * 8));
+          xyz->y_type++;
+          break;
+        case 'z':
+          xyz->z = xyz->z | (val << (xyz->z_type * 8));
+          xyz->z_type++;
+          break;
+      }
+    }
+    p += 2;
+    v++;
+    c = pgm_read_byte(p);
+  }
+}
+
+// works on big endiand hex only
+// Returns if found:
+//  - cluster number
+//  - command number or 0xFF if command is part of the variable part
+//  - the payload in the form of a HEX string with x/y/z variables
+
+
+
+// Parse a cluster specific command, and try to convert into human readable
+void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload) {
+  size_t hex_char_len = payload.len()*2+2;
+  char *hex_char = (char*) malloc(hex_char_len);
+  if (!hex_char) { return; }
+  ToHex_P((unsigned char*)payload.getBuffer(), payload.len(), hex_char, hex_char_len);
+
+  const __FlashStringHelper* command_name = nullptr;
+  Z_XYZ_Var xyz;
+
+//AddLog_P2(LOG_LEVEL_INFO, PSTR(">>> len = %d - %02X%02X%02X"), payload.len(), payload.get8(0), payload.get8(1), payload.get8(2));
+  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
+    const Z_CommandConverter *conv = &Z_Commands[i];
+    if (conv->cluster == cluster) {
+      // cluster match
+      if ((0xFF == conv->cmd) || (cmd == conv->cmd)) {
+          // cmd match
+        if ((direction && (conv->direction & 0x02)) || (!direction && (conv->direction & 0x01))) {
+          // check if we have a match for params too
+          // Match if:
+          //  - payload exactly matches conv->param (conv->param may be longer)
+          //  - payload matches conv->param until 'x', 'y' or 'z'
+          const char * p = conv->param;
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++1 param = %s"), p);
+          bool match = true;
+          for (uint8_t i = 0; i < payload.len(); i++) {
+            const char c1 = pgm_read_byte(p);
+            const char c2 = pgm_read_byte(p+1);
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++2 c1 = %c, c2 = %c"), c1, c2);
+            if ((0x00 == c1) || isXYZ(c1)) {
+              break;
+            }
+            const char * p2 = p;
+            uint32_t nextbyte = parseHex_P(&p2, 2);
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++3 parseHex_P = %02X"), nextbyte);
+            if (nextbyte != payload.get8(i)) {
+              match = false;
+              break;
+            }
+            p += 2;
+          }
+          if (match) {
+            command_name = (const __FlashStringHelper*) conv->tasmota_cmd;
+            parseXYZ(conv->param, payload, &xyz);
+            if (0xFF == conv->cmd) {
+              // shift all values
+              xyz.z = xyz.y;
+              xyz.z_type = xyz.y_type;
+              xyz.y = xyz.x;
+              xyz.y_type = xyz.x_type;
+              xyz.x = cmd;
+              xyz.x_type = 1;   // 1 byte
+            }
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  // always report attribute in raw format
+  // Format: "0001!06": "00" = "<cluster>!<cmd>": "<payload>" for commands to devices
+  // Format: "0004<00": "00" = "<cluster><<cmd>": "<payload>" for commands to devices
+  char attrid_str[12];
+  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X%c%02X"), cluster, direction ? '<' : '!', cmd);
+  json[attrid_str] = hex_char;
+  free(hex_char);
+
+  if (command_name) {
+    if (0 == xyz.x_type) {
+      json[command_name] = true;    // no parameter
+    } else if (0 == xyz.y_type) {
+      json[command_name] = xyz.x;       // 1 parameter
+    } else {
+      // multiple answers, create an array
+      JsonArray &arr = json.createNestedArray(command_name);
+      arr.add(xyz.x);
+      arr.add(xyz.y);
+      if (xyz.z_type) {
+        arr.add(xyz.z);
+      }
+    }
+  }
+}
+
+// Find the command details by command name
+// If not found:
+//  - returns nullptr
+const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd) {
   for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
     const Z_CommandConverter *conv = &Z_Commands[i];
     if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
-      return (const __FlashStringHelper*) conv->zcl_cmd;
+      *cluster = conv->cluster;
+      *cmd = conv->cmd;
+      return (const __FlashStringHelper*) conv->param;
     }
   }
 
   return nullptr;
 }
 
-inline bool isXYZ(char c) {
-  return (c >= 'x') && (c <= 'z');
-}
-
 // take the lower 4 bits and turn it to an hex char
 inline char hexDigit(uint32_t h) {
   uint32_t nybble = h & 0x0F;
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 5a3d78e85..d0616a40b 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -33,6 +33,7 @@ const uint8_t  ZIGBEE_STATUS_NODE_DESC = 31;            // Node descriptor
 const uint8_t  ZIGBEE_STATUS_ACTIVE_EP = 32;            // Endpoints descriptor
 const uint8_t  ZIGBEE_STATUS_SIMPLE_DESC = 33;          // Simple Descriptor (clusters)
 const uint8_t  ZIGBEE_STATUS_DEVICE_INDICATION = 34;    // Device announces its address
+const uint8_t  ZIGBEE_STATUS_DEVICE_IEEE = 35;          // Request of device address
 const uint8_t  ZIGBEE_STATUS_CC_VERSION = 50;           // Status: CC2530 ZNP Version
 const uint8_t  ZIGBEE_STATUS_CC_INFO = 51;              // Status: CC2530 Device Configuration
 const uint8_t  ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;  // Unsupported ZNP version
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 7d84124ed..b67add374 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -176,15 +176,24 @@ int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
   return -1;
 }
 
+// Send ZDO_IEEE_ADDR_REQ request to get IEEE long address
+void Z_SendIEEEAddrReq(uint16_t shortaddr) {
+  uint8_t IEEEAddrReq[] = { Z_SREQ | Z_ZDO, ZDO_IEEE_ADDR_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), 0x00, 0x00 };
+
+  ZigbeeZNPSend(IEEEAddrReq, sizeof(IEEEAddrReq));
+}
+
 // Send ACTIVE_EP_REQ to collect active endpoints for this address
 void Z_SendActiveEpReq(uint16_t shortaddr) {
   uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
               Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
 
-  uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
-
   ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
+
+  // uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
+  //             Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
+
   //ZigbeeZNPSend(NodeDescReq, sizeof(NodeDescReq));      Not sure this is useful
 }
 
@@ -335,6 +344,40 @@ int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
   return -1;
 }
 
+int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
+  uint8_t           status = buf.get8(2);
+  Z_IEEEAddress     ieeeAddr = buf.get64(3);
+  Z_ShortAddress    nwkAddr = buf.get16(11);
+  // uint8_t           startIndex = buf.get8(13);
+  // uint8_t           numAssocDev = buf.get8(14);
+
+  if (0 == status) {    // SUCCESS
+    zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
+    char hex[20];
+    Uint64toHex(ieeeAddr, hex, 64);
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                    "}}"),
+                    ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
+                    );
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+    // Ping response
+    const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
+    if (friendlyName) {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, friendlyName->c_str());
+    } else {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\"}}"), nwkAddr);
+    }
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+  }
+  return -1;
+}
+
 int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
   Z_ShortAddress    srcAddr = buf.get16(2);
   Z_ShortAddress    nwkAddr = buf.get16(4);
@@ -484,6 +527,7 @@ ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)   // 45CA
 ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )    // 45CB
 ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)    // 4585
 ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)    // 4584
+ZBM(AREQ_ZDO_IEEE_ADDR_RSP, Z_AREQ | Z_ZDO, ZDO_IEEE_ADDR_RSP)    // 4581
 
 const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_AF_INCOMING_MESSAGE,     &Z_ReceiveAfIncomingMessage },
@@ -493,6 +537,7 @@ const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_ZDO_NODEDESCRSP,         &Z_ReceiveNodeDesc },
   { AREQ_ZDO_ACTIVEEPRSP,         &Z_ReceiveActiveEp },
   { AREQ_ZDO_SIMPLEDESCRSP,       &Z_ReceiveSimpleDesc },
+  { AREQ_ZDO_IEEE_ADDR_RSP,       &Z_ReceiveIEEEAddr },
 };
 
 int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index eccfc56be..08055ba9e 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -33,19 +33,22 @@ const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"    // prefix
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
 
 const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"    // legacy prefix -- deprecated
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
   &CmndZbZNPSend, &CmndZbPermitJoin,
   &CmndZbStatus, &CmndZbReset, &CmndZbSend,
   &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
-  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind
+  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind,
+  &CmndZbPing,
   };
 
 int32_t ZigbeeProcessInput(class SBuffer &buf) {
@@ -367,61 +370,16 @@ void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8
   ZigbeeZNPSend(buf.getBuffer(), buf.len());
 }
 
-inline int8_t hexValue(char c) {
-  if ((c >= '0') && (c <= '9')) {
-    return c - '0';
-  }
-  if ((c >= 'A') && (c <= 'F')) {
-    return 10 + c - 'A';
-  }
-  if ((c >= 'a') && (c <= 'f')) {
-    return 10 + c - 'a';
-  }
-  return -1;
-}
-
-uint32_t parseHex(const char **data, size_t max_len = 8) {
-  uint32_t ret = 0;
-  for (uint32_t i = 0; i < max_len; i++) {
-    int8_t v = hexValue(**data);
-    if (v < 0) { break; }     // non hex digit, we stop parsing
-    ret = (ret << 4) | v;
-    *data += 1;
-  }
-  return ret;
-}
-
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
-
-  uint16_t cluster = 0x0000;    // 0x0000 is a valid default value
-  uint8_t  cmd = ZCL_READ_ATTRIBUTES; // default command is READ_ATTRIBUTES
-  bool     clusterSpecific = false;
-  // Parse 'cmd' in the form "AAAA_BB/CCCCCCCC" or "AAAA!BB/CCCCCCCC"
-  // where AA is the cluster number, BBBB the command number, CCCC... the payload
-  // First delimiter is '_' for a global command, or '!' for a cluster specific commanc
-  cluster = parseHex(&data, 4);
-
-  // delimiter
-  if (('_' == *data) || ('!' == *data)) {
-    if ('!' == *data) { clusterSpecific = true; }
-    data++;
-  } else {
-    ResponseCmndChar("Wrong delimiter for payload");
-    return;
-  }
-  // parse cmd number
-  cmd = parseHex(&data, 2);
-
-  // move to end of payload
-  // delimiter is optional
-  if ('/' == *data) { data++; }   // skip delimiter
-
-  size_t size = strlen(data);
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
+                       uint16_t cluster, uint8_t cmd, const char *param) {
+  size_t size = param ? strlen(param) : 0;
   SBuffer buf((size+2)/2);    // actual bytes buffer for data
 
-  while (*data) {
-    uint8_t code = parseHex(&data, 2);
-    buf.add8(code);
+  if (param) {
+    while (*param) {
+      uint8_t code = parseHex_P(&param, 2);
+      buf.add8(code);
+    }
   }
 
   if (0 == endpoint) {
@@ -430,7 +388,7 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
   }
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
-    dstAddr, cluster, endpoint, cmd, data);
+    dstAddr, cluster, endpoint, cmd, param);
 
   if (0 == endpoint) {
     AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
@@ -467,6 +425,9 @@ void CmndZbSend(void) {
   static char delim[] = ", ";     // delimiters for parameters
   uint16_t device = 0xFFFF;       // 0xFFFF is broadcast, so considered valid
   uint8_t  endpoint = 0x00;       // 0x00 is invalid for the dst endpoint
+  // Command elements
+  uint16_t cluster = 0;
+  uint8_t  cmd = 0;
   String   cmd_str = "";          // the actual low-level command, either specified or computed
 
   // parse JSON
@@ -497,8 +458,9 @@ void CmndZbSend(void) {
         String key = it->key;
         JsonVariant& value = it->value;
         uint32_t x = 0, y = 0, z = 0;
+        uint16_t cmd_var;
 
-        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str());
+        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &cluster, &cmd_var);
         if (tasmota_cmd) {
           cmd_str = tasmota_cmd;
         } else {
@@ -534,9 +496,16 @@ void CmndZbSend(void) {
           }
         }
 
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
+        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
+        if (0xFF == cmd_var) {      // if command number is a variable, replace it with x
+          cmd = x;
+          x = y;                  // and shift other variables
+          y = z;
+        } else {
+          cmd = cmd_var;          // or simply copy the cmd number
+        }
         cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);   // fill in parameters
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
+        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
       } else {
         // we have zero command, pass through until last error for missing command
       }
@@ -547,9 +516,9 @@ void CmndZbSend(void) {
       // we have an unsupported command type, just ignore it and fallback to missing command
     }
 
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
-              device, endpoint, cmd_str.c_str());
-    zigbeeZCLSendStr(device, endpoint, cmd_str.c_str());
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%04X!%02X/%s\"}"),
+              device, endpoint, cluster, cmd, cmd_str.c_str());
+    zigbeeZCLSendStr(device, endpoint, true, cluster, cmd, cmd_str.c_str());
   } else {
     Response_P(PSTR("Missing zigbee 'Send'"));
     return;
@@ -615,16 +584,28 @@ void CmndZbBind(void) {
 
 // Probe a specific device to get its endpoints and supported clusters
 void CmndZbProbe(void) {
+  CmndZbProbeOrPing(true);
+}
+
+void CmndZbProbeOrPing(boolean probe) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
   uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
   if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
   if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
 
   // everything is good, we can send the command
-  Z_SendActiveEpReq(shortaddr);
+  Z_SendIEEEAddrReq(shortaddr);
+  if (probe) {
+    Z_SendActiveEpReq(shortaddr);
+  }
   ResponseCmndDone();
 }
 
+// Ping a device, actually a simplified version of ZbProbe
+void CmndZbPing(void) {
+  CmndZbProbeOrPing(false);
+}
+
 // Specify, read or erase a Friendly Name
 void CmndZbName(void) {
   // Syntax is:
@@ -729,6 +710,11 @@ void CmndZbRead(void) {
     }
   }
 
+  if (0 == endpoint) {    // try to compute the endpoint
+    endpoint = zigbee_devices.findClusterEndpointIn(device, cluster);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
+  }
+
   if ((0 != endpoint) && (attrs_len > 0)) {
     ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true /* we do want a response */, zigbee_devices.getNextSeqNumber(device));
     ResponseCmndDone();

From 21976005e13e1161031f21519ab601f3011338cf Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 23 Feb 2020 17:11:51 +0100
Subject: [PATCH 305/403] Support for BW-IS5 leak detector

---
 tasmota/xdrv_23_zigbee_6_commands.ino | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 83841f90c..5c3e3fc1b 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -84,6 +84,8 @@ const Z_CommandConverter Z_Commands[] = {
   { "ArrowClick",     0x0005, 0x07, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
   { "ArrowHold",      0x0005, 0x08, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
   { "ArrowRelease",   0x0005, 0x09, 0x01,   "" },
+  // IAS - Intruder Alarm System + leak/fire detection
+  { "ZoneStatusChange",0x0500, 0x00, 0x02,  "xxxxyyzz" },   // xxxx = zone status, yy = extended status, zz = zone id, Delay is ignored
   // responses for Group cluster commands
   { "AddGroupResp",   0x0004, 0x00, 0x02,   "xxyyyy" },       // xx = status, yy = group id
   { "ViewGroupResp",  0x0004, 0x01, 0x02,   "xxyyyy" },       // xx = status, yy = group id, name ignored

From 9b758350b580542f556e1815c56f7f679eb2f759 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 23 Feb 2020 20:49:54 +0100
Subject: [PATCH 306/403] Fix Domoticz compile error

Fix compile error when Domoticz is enabled but Lights is disabled
---
 tasmota/xdrv_07_domoticz.ino | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index 49e546b65..90563eeed 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -296,6 +296,7 @@ bool DomoticzMqttData(void)
           found = true;
         } else
 #endif // USE_SHUTTER
+#ifdef USE_LIGHT
         if (iscolordimmer && 10 == nvalue) {  // Color_SetColor
           // https://www.domoticz.com/wiki/Domoticz_API/JSON_URL%27s#Set_a_light_to_a_certain_color_or_color_temperature
           JsonObject& color = domoticz["Color"];
@@ -333,8 +334,9 @@ bool DomoticzMqttData(void)
           snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
           snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
           found = true;
-        }
-        else if (1 == nvalue || 0 == nvalue) {
+        } else
+#endif  // USE_LIGHT
+        if (1 == nvalue || 0 == nvalue) {
           if (((power >> i) &1) == (power_t)nvalue) {
             return true;  // Stop loop
           }

From 8969877502503a536f4f2df15ae0ee9d1c33383b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 23 Feb 2020 21:26:58 +0100
Subject: [PATCH 307/403] Refactor DHT driver

Refactor DHT driver (#7717)
---
 tasmota/xsns_06_dht_v5.ino | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tasmota/xsns_06_dht_v5.ino b/tasmota/xsns_06_dht_v5.ino
index f08286b43..9c7003970 100644
--- a/tasmota/xsns_06_dht_v5.ino
+++ b/tasmota/xsns_06_dht_v5.ino
@@ -100,6 +100,7 @@ bool DhtRead(uint32_t sensor)
       break;
   }
 
+/*
   bool error = false;
   noInterrupts();
   if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
@@ -127,6 +128,22 @@ bool DhtRead(uint32_t sensor)
   }
   interrupts();
   if (error) { return false; }
+*/
+
+  uint32_t i = 0;
+  noInterrupts();
+  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
+    for (i = 0; i < 40; i++) {
+      if (!DhtWaitState(sensor, 1)) { break; }
+      delayMicroseconds(35);                          // Was 30
+      if (digitalRead(Dht[sensor].pin)) {
+        dht_data[i / 8] |= (1 << (7 - i % 8));
+      }
+      if (!DhtWaitState(sensor, 0)) { break; }
+    }
+  }
+  interrupts();
+  if (i < 40) { return false; }
 
   uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
   if (dht_data[4] != checksum) {

From 18af25bb71ba612b6536aeb4b87c29353d16f4db Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 24 Feb 2020 09:57:51 +0100
Subject: [PATCH 308/403] Update platformio_tasmota_env.ini

---
 platformio_tasmota_env.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 2a26ba4d2..cfcd53686 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -3,6 +3,7 @@ platform = ${common.platform}
 platform_packages = ${common.platform_packages}
 framework = ${common.framework}
 board = ${common.board}
+board_build.ldscript  = ${common.board_build.ldscript}
 board_build.flash_mode = ${common.board_build.flash_mode}
 board_build.f_cpu = ${common.board_build.f_cpu}
 build_unflags = ${common.build_unflags}

From 3b0b9088e1e40962137493d7976edffe232498be Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:01:26 +0100
Subject: [PATCH 309/403] Update platformio.ini

---
 platformio.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio.ini b/platformio.ini
index 16553f0d6..552408790 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -56,6 +56,7 @@ default_envs =
 framework                 = arduino
 board                     = esp01_1m
 board_build.flash_mode    = dout
+board_build.ldscript      = eagle.flash.1m.ld
 
 platform                  = ${core_active.platform}
 platform_packages         = ${core_active.platform_packages}

From 25301b8cdcbd5afd8d28ef6e4108d68ccefb9655 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:04:48 +0100
Subject: [PATCH 310/403] Fix using new syntax for custom LD script

---
 platformio_override_sample.ini | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 93bbbb5ba..0c63c6e8f 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -135,10 +135,9 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_2_6_3]
 ; *** Esp8266 core for Arduino version 2.6.3
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         =
 build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -180,12 +179,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [tasmota_core_stage]
 ; *** Esp8266 core for Arduino version stable beta
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf
 build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
-                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
@@ -226,12 +223,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest beta
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-board_build.ldscript      = eagle.flash.1m.ld
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
-                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313

From 7a3a9bd364e332b8ffe3f37a98eb74ad17a5eb6c Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Mon, 24 Feb 2020 12:23:03 +0100
Subject: [PATCH 311/403] fixes and enhancements

- shutterposition now reports actual position if the shutter is moving #7686
- new RuleEvent: Shutter1#Target to get upfront info where the shutter is moving
- RuleExecution now every second to get an update of the current position
- New functionality for Stepper Motors. Now supporting 4 Stepper shutters working simultanously
---
 tasmota/xdrv_27_shutter.ino | 129 +++++++++++++++++++-----------------
 1 file changed, 70 insertions(+), 59 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index c353a1dd4..0fd6d861b 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -48,7 +48,7 @@ void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
   &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
 
-  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
+  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d}";
   const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
 
 #include <Ticker.h>
@@ -70,7 +70,7 @@ struct SHUTTER {
   int8_t  direction[MAX_SHUTTERS];        // 1 == UP , 0 == stop; -1 == down
   uint8_t mode = 0;                       // operation mode definition. see enum type above SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE
   int16_t motordelay[MAX_SHUTTERS];       // initial motorstarttime in 0.05sec.
-  int16_t pwm_frequency;                 // frequency of PWN for stepper motors
+  int16_t pwm_frequency[MAX_SHUTTERS];    // frequency of PWN for stepper motors
   uint16_t max_pwm_frequency = 1000;      // maximum of PWM frequency for openig the shutter. depend on the motor and drivers
   uint16_t max_close_pwm_frequency[MAX_SHUTTERS];// maximum of PWM frequency for closeing the shutter. depend on the motor and drivers
   uint8_t skip_relay_change;                 // avoid overrun at endstops
@@ -82,17 +82,18 @@ void ShutterLogPos(uint32_t i)
   char stemp2[10];
   dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
   AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
-    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency);
+    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency[i]);
 }
 
 void ShutterRtc50mS(void)
 {
-  for (uint32_t i = 0; i < shutters_present; i++) {
+  for (uint8_t i = 0; i < shutters_present; i++) {
     Shutter.time[i]++;
     if (Shutter.accelerator[i]) {
-      Shutter.pwm_frequency += Shutter.accelerator[i];
-      Shutter.pwm_frequency = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency));
-      analogWriteFreq(Shutter.pwm_frequency);
+      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: accelerator i=%d ->  %d"),i, Shutter.accelerator[i]);
+      Shutter.pwm_frequency[i] += Shutter.accelerator[i];
+      Shutter.pwm_frequency[i] = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency[i]));
+      analogWriteFreq(Shutter.pwm_frequency[i]);
       analogWrite(pin[GPIO_PWM1+i], 50);
     }
   }
@@ -102,8 +103,6 @@ void ShutterRtc50mS(void)
 
 int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 {
-  if (0 == percent) return 0;
-  if (100 == percent) return Shutter.open_max[index];
 	if (Settings.shutter_set50percent[index] != 50) {
     return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
 	} else {
@@ -138,8 +137,6 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 
 uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
 {
-  if (0 >= realpos) return 0;
-  if (Shutter.open_max[index] <= realpos) return 100;
 	if (Settings.shutter_set50percent[index] != 50) {
 		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
 	} else {
@@ -203,8 +200,9 @@ void ShutterInit(void)
         Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
         if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
           Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
-          Shutter.pwm_frequency = 0;
-          analogWriteFreq(Shutter.pwm_frequency);
+          Shutter.pwm_frequency[i] = 0;
+          Shutter.accelerator[i] = 0;
+          analogWriteFreq(Shutter.pwm_frequency[i]);
           analogWrite(pin[GPIO_PWM1+i], 50);
         }
       }
@@ -256,29 +254,24 @@ void ShutterInit(void)
 
 void ShutterReportPosition(bool always)
 {
-  uint32_t shutter_moving = 0;
   Response_P(PSTR("{"));
   for (uint32_t i = 0; i < shutters_present; i++) {
     //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
     uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
     if (Shutter.direction[i] != 0) {
-      shutter_moving = 1;
+      rules_flag.shutter_moving = 1;
       ShutterLogPos(i);
     }
     if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i]);
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i], ShutterRealToPercentPosition(Shutter.target_position[i], i));
   }
   ResponseJsonEnd();
-  if (always || (1 == shutter_moving)) {
+  if (always || (rules_flag.shutter_moving)) {
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
   }
-  if (rules_flag.shutter_moving > shutter_moving) {
-    rules_flag.shutter_moved = 1;
-  } else {
-    rules_flag.shutter_moved = 0;
-  }
-  rules_flag.shutter_moving = shutter_moving;
-  //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
+  //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
+
 }
 
 void ShutterLimitRealAndTargetPositions(uint32_t i) {
@@ -304,22 +297,22 @@ void ShutterUpdatePosition(void)
 
         int32_t  max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
         int32_t  max_freq_change_per_sec =  Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-        int32_t  min_runtime_ms = Shutter.pwm_frequency*1000 / max_freq_change_per_sec;
+        int32_t  min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
         int32_t  velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency / max_frequency  * Shutter.direction[i] ;
+        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency  * Shutter.direction[i] ;
 
         int32_t  next_possible_stop = Shutter.real_position[i] + minstopway ;
-        stop_position_delta =200 * Shutter.pwm_frequency/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+        stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
         //Shutter.accelerator[i] = tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
         //int32_t act_freq_change = max_freq_change_per_sec/20;
         AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
-                                      Shutter.pwm_frequency,max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
+                                      Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
 
         if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
 
             Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
             //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Ramp down: acc: %d"),   Shutter.accelerator[i]);
-        } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency ==  max_frequency) {
+        } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] ==  max_frequency) {
           Shutter.accelerator[i] = 0;
         }
       } else {
@@ -343,13 +336,13 @@ void ShutterUpdatePosition(void)
           case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
             missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
             //prepare for stop PWM
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency[i]);
             Shutter.accelerator[i] = 0;
-            Shutter.pwm_frequency = Shutter.pwm_frequency > 250 ? 250 : Shutter.pwm_frequency;
-            analogWriteFreq(Shutter.pwm_frequency);
+            Shutter.pwm_frequency[i] = Shutter.pwm_frequency[i] > 250 ? 250 : Shutter.pwm_frequency[i];
+            analogWriteFreq(Shutter.pwm_frequency[i]);
             analogWrite(pin[GPIO_PWM1+i], 50);
-            Shutter.pwm_frequency = 0;
-            analogWriteFreq(Shutter.pwm_frequency);
+            Shutter.pwm_frequency[i] = 0;
+            analogWriteFreq(Shutter.pwm_frequency[i]);
             while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
               delay(1);
             }
@@ -391,6 +384,7 @@ void ShutterUpdatePosition(void)
 
         Shutter.direction[i] = 0;
         ShutterReportPosition(true);
+        rules_flag.shutter_moved = 1;
         XdrvRulesProcess();
       }
     }
@@ -413,8 +407,8 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
     Shutter.skip_relay_change = 1;
   } else {
     if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-      Shutter.pwm_frequency = 0;
-      analogWriteFreq(Shutter.pwm_frequency);
+      Shutter.pwm_frequency[i] = 0;
+      analogWriteFreq(Shutter.pwm_frequency[i]);
       analogWrite(pin[GPIO_PWM1+i], 0);
       // can be operated without counter, but then not that acurate.
       if (pin[GPIO_CNTR1+i] < 99) {
@@ -435,14 +429,16 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
 
 void ShutterWaitForMotorStop(uint32_t i)
 {
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop..dir %d, akt freq: %d, max %d, maxclose %d"),Shutter.direction[i],Shutter.pwm_frequency[i], Shutter.max_pwm_frequency, Shutter.max_close_pwm_frequency[i]);
   if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
     if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
       //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Frequency change %d"), Shutter.pwm_frequency);
-      while (Shutter.pwm_frequency > 0) {
-        Shutter.accelerator[i] = 0;
-        Shutter.pwm_frequency = tmax(Shutter.pwm_frequency-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
-        analogWriteFreq(Shutter.pwm_frequency);
+      while (Shutter.pwm_frequency[i] > 0) {
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld, delta: %d"), Shutter.pwm_frequency[i], (int32_t)((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) );
+
+        Shutter.pwm_frequency[i] = tmax(Shutter.pwm_frequency[i]-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld"),  Shutter.pwm_frequency[i]);
+        analogWriteFreq(Shutter.pwm_frequency[i]);
         analogWrite(pin[GPIO_PWM1+i], 50);
         delay(50);
       }
@@ -532,7 +528,10 @@ void ShutterButtonHandler(void)
   uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
 
   uint16_t loops_per_second = 1000 / Settings.button_debounce;  // ButtonDebounce (50)
-
+  if ( button != Button.last_state[button_index]) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d, presstate %d, lasttate %d, Settings.flag.button_single %d)"), shutter_index+1, button_index+1, button, Button.last_state[button_index], Settings.flag.button_single);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Button.press_counter[button_index] %d, Button.hold_timer[button_index] %d, Button.window_timer[button_index] %d "), Button.press_counter[button_index],  Button.hold_timer[button_index], Button.window_timer[button_index] );
+  }
   if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
     if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
         buttonState = SHT_PRESSED_MULTI;
@@ -542,9 +541,10 @@ void ShutterButtonHandler(void)
         buttonState = SHT_PRESSED_IMMEDIATE;
         press_index = 1;
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
-      } else
+      } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-      Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
+        Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
+      }
     }
     blinks = 201;
   }
@@ -596,14 +596,18 @@ void ShutterButtonHandler(void)
           // check for simultaneous shutter button press
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
+            }
+
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
             press_index = Button.press_counter[button_index];
             for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
+              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
                 Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
             buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
           }
@@ -617,9 +621,13 @@ void ShutterButtonHandler(void)
       }
     }
   }
+  if (buttonState) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Final buttonState %d"),  buttonState);
+  }
 
  if (buttonState != SHT_NOT_PRESSED) {
    if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
+     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_MULTI_SIMULTANEOUS"));
      if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) { // 5x..7x && no SetOption1 (0)
        // simultaneous shutter button press 5x, 6x, 7x detected
        char scmnd[20];
@@ -628,7 +636,7 @@ void ShutterButtonHandler(void)
        return;
      }
    } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-     // simultaneous shutter button extend hold detected
+     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_EXT_HOLD_SIMULTANEOUS"));// simultaneous shutter button extend hold detected
      if (!Settings.flag.button_restrict) { // no SetOption1 (0)
        char scmnd[20];
        snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
@@ -636,6 +644,7 @@ void ShutterButtonHandler(void)
        return;
      }
    } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_IMMEDIATE"));
       if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
         uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
         if (pos_press_index>3) pos_press_index=3;
@@ -647,14 +656,15 @@ void ShutterButtonHandler(void)
         XdrvMailbox.data = databuf;
         XdrvMailbox.command = NULL;
         if (buttonState == SHT_PRESSED_IMMEDIATE) {
-          XdrvMailbox.payload = XdrvMailbox.index;
-          CmndShutterStop();
-        }
-        else {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_IMMEDIATE stop"));
+          //XdrvMailbox.payload = XdrvMailbox.index;
+          //CmndShutterStop();
+        } else {
           uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
           if (position) {
             if (Shutter.direction[shutter_index]) {
               XdrvMailbox.payload = XdrvMailbox.index;
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: immegency stop"));
               CmndShutterStop();
             } else {
               XdrvMailbox.payload = position = (position-1)<<1;
@@ -670,12 +680,12 @@ void ShutterButtonHandler(void)
                     Response_P("%d", position);
                     MqttPublish(stopic, false);
                   }
-                }
-              }
-            }
-          }
-        }
-      }
+                } // for (uint32_t)
+              } // if (Settings.shutter)
+            } // ende else
+          } // if (position)
+        } // end else
+      } // if   if (Settings.shutter_startrelay[shutter_index]
     }
     Response_P(PSTR("{"));
     ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
@@ -756,6 +766,7 @@ void CmndShutterPosition(void)
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
 
       // value 0 with data_len > 0 can mean Open
+      // special handling fo UP,DOWN,TOGGLE,STOP command comming with payload -99
       if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
         //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
         if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
@@ -773,13 +784,13 @@ void CmndShutterPosition(void)
         }
       }
 
-      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
+      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter.real_position[index], index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
       // webgui still send also on inverted shutter the native position.
       target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
       if (XdrvMailbox.payload != -99) {
         //target_pos_percent = (Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
         Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-        Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
+        //Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
         //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
         AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
       }

From 66a1dc957336b1a4d9a86f910d45fc4cdee3a5bf Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Mon, 24 Feb 2020 12:33:52 +0100
Subject: [PATCH 312/403] Update xdrv_27_shutter.ino

- fixed shutter#moved rule not triggered
---
 tasmota/xdrv_27_shutter.ino | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 0fd6d861b..4c8ae1d52 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -429,15 +429,14 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
 
 void ShutterWaitForMotorStop(uint32_t i)
 {
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop..dir %d, akt freq: %d, max %d, maxclose %d"),Shutter.direction[i],Shutter.pwm_frequency[i], Shutter.max_pwm_frequency, Shutter.max_close_pwm_frequency[i]);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
   if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
     if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
       //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Frequency change %d"), Shutter.pwm_frequency);
       while (Shutter.pwm_frequency[i] > 0) {
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld, delta: %d"), Shutter.pwm_frequency[i], (int32_t)((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) );
-
+        //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld, delta: %d"), Shutter.pwm_frequency[i], (int32_t)((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) );
         Shutter.pwm_frequency[i] = tmax(Shutter.pwm_frequency[i]-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld"),  Shutter.pwm_frequency[i]);
+        //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld"),  Shutter.pwm_frequency[i]);
         analogWriteFreq(Shutter.pwm_frequency[i]);
         analogWrite(pin[GPIO_PWM1+i], 50);
         delay(50);
@@ -528,10 +527,6 @@ void ShutterButtonHandler(void)
   uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
 
   uint16_t loops_per_second = 1000 / Settings.button_debounce;  // ButtonDebounce (50)
-  if ( button != Button.last_state[button_index]) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d, presstate %d, lasttate %d, Settings.flag.button_single %d)"), shutter_index+1, button_index+1, button, Button.last_state[button_index], Settings.flag.button_single);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Button.press_counter[button_index] %d, Button.hold_timer[button_index] %d, Button.window_timer[button_index] %d "), Button.press_counter[button_index],  Button.hold_timer[button_index], Button.window_timer[button_index] );
-  }
   if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
     if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
         buttonState = SHT_PRESSED_MULTI;
@@ -543,7 +538,6 @@ void ShutterButtonHandler(void)
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
       } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-        Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
       }
     }
     blinks = 201;
@@ -597,7 +591,7 @@ void ShutterButtonHandler(void)
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
             AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))            
               min_shutterbutton_press_counter = Button.press_counter[i];
             }
 
@@ -621,13 +615,9 @@ void ShutterButtonHandler(void)
       }
     }
   }
-  if (buttonState) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Final buttonState %d"),  buttonState);
-  }
 
  if (buttonState != SHT_NOT_PRESSED) {
    if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
-     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_MULTI_SIMULTANEOUS"));
      if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) { // 5x..7x && no SetOption1 (0)
        // simultaneous shutter button press 5x, 6x, 7x detected
        char scmnd[20];
@@ -636,7 +626,6 @@ void ShutterButtonHandler(void)
        return;
      }
    } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_EXT_HOLD_SIMULTANEOUS"));// simultaneous shutter button extend hold detected
      if (!Settings.flag.button_restrict) { // no SetOption1 (0)
        char scmnd[20];
        snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
@@ -644,7 +633,6 @@ void ShutterButtonHandler(void)
        return;
      }
    } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_IMMEDIATE"));
       if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
         uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
         if (pos_press_index>3) pos_press_index=3;
@@ -656,15 +644,13 @@ void ShutterButtonHandler(void)
         XdrvMailbox.data = databuf;
         XdrvMailbox.command = NULL;
         if (buttonState == SHT_PRESSED_IMMEDIATE) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: SHT_PRESSED_IMMEDIATE stop"));
-          //XdrvMailbox.payload = XdrvMailbox.index;
-          //CmndShutterStop();
+          XdrvMailbox.payload = XdrvMailbox.index;
+          CmndShutterStop();
         } else {
           uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
           if (position) {
             if (Shutter.direction[shutter_index]) {
               XdrvMailbox.payload = XdrvMailbox.index;
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: immegency stop"));
               CmndShutterStop();
             } else {
               XdrvMailbox.payload = position = (position-1)<<1;

From b54f2d406eca8853dbaaffef33d89897fdc5437d Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Mon, 24 Feb 2020 12:38:00 +0100
Subject: [PATCH 313/403] Update xdrv_27_shutter.ino

---
 tasmota/xdrv_27_shutter.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 4c8ae1d52..6f4d711d7 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -591,7 +591,7 @@ void ShutterButtonHandler(void)
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
             AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))            
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
             }
 

From 94c9072815e0aab9397bcf6871f9cd24d4068cbb Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 24 Feb 2020 13:27:22 +0100
Subject: [PATCH 314/403] Add wifi debug code

---
 tasmota/settings.ino     | 42 +++++++++++++++++++++++++++++++++++++---
 tasmota/support_wifi.ino |  5 +++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 33da93562..c2ddc6607 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -277,6 +277,23 @@ bool RtcRebootValid(void)
 
 /*********************************************************************************************\
  * Config - Flash
+ *
+ * Tasmota 1M flash usage
+ * 0x00000000 - Unzipped binary bootloader
+ * 0x00001000 - Unzipped binary code start
+ *    ::::
+ * 0x000xxxxx - Unzipped binary code end
+ * 0x000x1000 - First page used by Core OTA
+ *    ::::
+ * 0x000F3000 - Tasmota Quick Power Cycle counter (SETTINGS_LOCATION - CFG_ROTATES) - First four bytes only
+ * 0x000F4000 - First Tasmota rotating settings page
+ *    ::::
+ * 0x000FA000 - Last Tasmota rotating settings page = Last page used by Core OTA
+ * 0x000FB000 - Core SPIFFS end = Core EEPROM = Tasmota settings page during OTA and when no flash rotation is active (SETTINGS_LOCATION)
+ * 0x000FC000 - SDK - Uses first 128 bytes for phy init data mirrored by Core in RAM. See core_esp8266_phy.cpp phy_init_data[128] = Core user_rf_cal_sector
+ * 0x000FD000 - SDK - Uses scattered bytes from 0x340 (iTead use as settings storage from 0x000FD000)
+ * 0x000FE000 - SDK - Uses scattered bytes from 0x340 (iTead use as mirrored settings storage from 0x000FE000)
+ * 0x000FF000 - SDK - Uses at least first 32 bytes of this page - Tasmota Zigbee persistence from 0x000FF800 to 0x000FFFFF
 \*********************************************************************************************/
 
 extern "C" {
@@ -745,8 +762,17 @@ void SettingsErase(uint8_t type)
     _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;                       // Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
     _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;             // Flash size as seen by SDK
   }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " %d " D_UNIT_SECTORS), _sectorEnd - _sectorStart);
+#ifdef USE_WIFI_SDK_ERASE
+  else if (4 == type) {
+    _sectorStart = SETTINGS_LOCATION +1;                                  // SDK phy area and Core calibration sector (0x0FC000)
+    _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0x0FCFFF)
+  }
+  else if (5 == type) {
+    _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;  // SDK phy area and Core calibration sector (0xxFC000)
+    _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
+  }
+#endif  // USE_WIFI_SDK_ERASE
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
   EsptoolErase(_sectorStart, _sectorEnd);                                 // Esptool - erases flash completely
@@ -755,11 +781,21 @@ void SettingsErase(uint8_t type)
 
 void SettingsSdkErase(void)
 {
-  WiFi.disconnect(true);    // Delete SDK wifi config
+  WiFi.disconnect(false);    // Delete SDK wifi config
   SettingsErase(1);
   delay(1000);
 }
 
+#ifdef USE_WIFI_SDK_ERASE
+void SettingsSdkWifiErase(void)
+{
+  WiFi.disconnect(false);    // Delete SDK wifi config
+  SettingsErase(4);
+  SettingsErase(5);
+  delay(200);
+}
+#endif  // USE_WIFI_SDK_ERASE
+
 /********************************************************************************************/
 
 void SettingsDefault(void)
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index df509b9d3..866ca4eee 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -620,12 +620,17 @@ void WifiConnect(void)
 // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
 void WifiDisconnect(void)
 {
+#ifdef USE_WIFI_SDK_ERASE     // Do not enable with DeepSleep as it will wear out flash
+  SettingsSdkWifiErase();
+#else
   // Courtesy of EspEasy
   WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
   ETS_UART_INTR_DISABLE();
   wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
   ETS_UART_INTR_ENABLE();
   WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
+  delay(100);                 // Flush anything in the network buffers.
+#endif  // USE_WIFI_SDK_ERASE
 }
 
 void WifiShutdown(void)

From 9fdd5e25de2789a376d749fcd0615c2478d29a91 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 07:15:19 -0600
Subject: [PATCH 315/403] Add Device_Groups.md

---
 Device_Groups.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Device_Groups.md

diff --git a/Device_Groups.md b/Device_Groups.md
new file mode 100644
index 000000000..c5990136f
--- /dev/null
+++ b/Device_Groups.md
@@ -0,0 +1,45 @@
+# Device Groups
+
+The device groups module provides a framework to allow multiple devices to be in a group with values such as power, light color/temperature/brightness, PWM values, sensor values, etc. shared with other devices in the group. For example, with multiple light modules in a device group, the light settings can be changed on one module and the settings will automatically be changed on the other light modules. Dimmer switch modules could be in a device group with light modules and the dimmer switch could control the power, brightness and colors of all the lights in the group. Multiple dimmer switches could be in a device group to form a 3-way/4-way dimmer switch.
+
+UDP broadcasts, followed by UDP unicasts if necessary, are used to send updates to all devices so updates are fast. There is no need for an MQTT server but all the devices in a group must be on the same IP network.
+
+To include device groups support in the build, define USE_DEVICE_GROUPS in your user_config_override. This adds 3.5K to the code size. All devices in a group must be running firmware with device group support and have device groups enabled.
+
+To enable device groups, set Option16 to 1 and **restart the device**.
+
+
+## Device Groups Operation
+
+The device group name is the MQTT group topic set with the GroupTopic command. All devices in the same IP network with the same group topic are in the same group. Some modules may define additional device groups. For example, if Remote Device Mode is enabled, the PWM Dimmer module defines three devices groups.
+
+The items that are sent to the group and the items that are received from the group are selected with the DevGroupShare command. By default all items are sent and received from the group. An example of when the DevGroupShare command would be used is when you have a group of lights that you control with a dimmer switch and home automation software. You want the dimmer switch to be able to control all items. The home automation software controls each light individually. When it controls the whole group, it actually sends command to each light in the group. If you use the home automation software to turn an individual light on or off or change it’s brightness, color or scheme, you do not want the change to be replicated to the other lights. In this case, you would set the incoming and outgoing item masks to 255 on the dimmer switch (DevGroupShare 255,255) and set the incoming item mask to 255 and outgoing item mask to 0 on all the lights (DevGroupShare 255,0).
+
+
+### Commands
+
+
+<table>
+  <tr>
+   <td><strong>Command</strong>
+   </td>
+   <td><strong>Parameters</strong>
+   </td>
+  </tr>
+  <tr>
+   <td>DevGroupShare
+   </td>
+   <td><in>,&lt;out> = set incoming and outgoing shared item mask (default = 255,255)
+<p>
+1 = Power, 2 = Light brightness, 4 = Light fade/speed, 8 = Light scheme, 16 = Light color, 32 = Minimum brightness
+   </td>
+  </tr>
+  <tr>
+   <td>GroupTopic&lt;x>
+   </td>
+   <td>1 = reset device group &lt;x> MQTT group topic to firmware default (MQTT_GRPTOPIC) and restart
+<p>
+<value> = set device group &lt;x> MQTT group topic (32 chars max) and restart
+   </td>
+  </tr>
+</table>

From c0a5156d8f2b04079b5cb746d1f63f8be7bf00d1 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 07:19:15 -0600
Subject: [PATCH 316/403] Initial pwm dimmer support

---
 BUILDS.md                                 |    7 +
 I2CDEVICES.md                             |    1 +
 MODULES.md                                |    1 +
 PWM_Dimmer.md                             |  197 ++++
 RELEASENOTES.md                           |    3 +-
 TEMPLATES.md                              |    1 +
 platformio.ini                            |    1 +
 platformio_override_sample.ini            |   11 +-
 platformio_tasmota_env.ini                |    1 +
 tasmota/CHANGELOG.md                      |    3 +
 tasmota/i18n.h                            |    8 +
 tasmota/my_user_config.h                  |    4 +-
 tasmota/settings.h                        |   14 +
 tasmota/settings.ino                      |   42 +-
 tasmota/support_features.ino              |    5 +-
 tasmota/support_tasmota.ino               |    6 +
 tasmota/tasmota_post.h                    |   10 +
 tasmota/tasmota_template.h                |   31 +
 tasmota/xdrv_01_webserver.ino             |   11 +
 tasmota/xdrv_04_light.ino                 |   11 +-
 tasmota/xdrv_07_domoticz.ino              |    6 +-
 tasmota/xdrv_12_home_assistant.ino        |    8 +-
 tasmota/xdrv_23_zigbee_1_headers.ino      |    2 +-
 tasmota/xdrv_23_zigbee_3_devices.ino      |   31 +-
 tasmota/xdrv_23_zigbee_5_converters.ino   |   12 +-
 tasmota/xdrv_23_zigbee_6_commands.ino     |  265 ++++-
 tasmota/xdrv_23_zigbee_7_statemachine.ino |    1 +
 tasmota/xdrv_23_zigbee_8_parsers.ino      |   53 +-
 tasmota/xdrv_23_zigbee_9_impl.ino         |  123 +--
 tasmota/xdrv_27_shutter.ino               |  109 +-
 tasmota/xdrv_35_pwm_dimmer.ino            | 1141 +++++++++++++++++++++
 tasmota/xsns_06_dht_v5.ino                |   17 +
 tasmota/xsns_61_MI_NRF24.ino              |  121 ++-
 tools/decode-status.py                    |    4 +-
 34 files changed, 2037 insertions(+), 224 deletions(-)
 create mode 100644 PWM_Dimmer.md
 create mode 100644 tasmota/xdrv_35_pwm_dimmer.ino

diff --git a/BUILDS.md b/BUILDS.md
index aa1834061..88ee58cd0 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -62,6 +62,7 @@
 | USE_DDS2382           | - | - | - | - | x | - | - |
 | USE_DDSU666           | - | - | - | - | x | - | - |
 | USE_SOLAX_X1          | - | - | - | - | - | - | - |
+| USE_LE01MR            | - | - | - | - | - | - | - |
 |                       |   |   |   |   |   |   |   |
 | USE_ADC_VCC           | x | x | - | - | - | - | - |
 | USE_COUNTER           | - | - | x | x | x | x | x |
@@ -109,6 +110,8 @@
 | USE_HIH6              | - | - | - | - | x | - | - |
 | USE_DHT12             | - | - | - | - | x | - | - |
 | USE_DS1624            | - | - | - | - | x | - | - |
+| USE_AHT1x             | - | - | - | - | - | - | - |
+| USE_WEMOS_MOTOR_V1    | - | - | - | - | x | - | - |
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_SPI               | - | - | - | - | - | - | x |
@@ -124,6 +127,10 @@
 | USE_RDM6300           | - | - | - | - | x | - | - |
 | USE_IBEACON           | - | - | - | - | x | - | - |
 | USE_GPS               | - | - | - | - | - | - | - |
+| USE_HM10              | - | - | - | - | x | - | - |
+|                       |   |   |   |   |   |   |   |
+| USE_NRF24             | - | - | - | - | - | - | - |
+| USE_MIBLE             | - | - | - | - | - | - | - |
 | USE_ZIGBEE            | - | - | - | - | - | - | - |
 |                       |   |   |   |   |   |   |   |
 | USE_IR_REMOTE         | - | - | x | x | x | x | x |
diff --git a/I2CDEVICES.md b/I2CDEVICES.md
index b607b3241..f9cf5b0e3 100644
--- a/I2CDEVICES.md
+++ b/I2CDEVICES.md
@@ -65,3 +65,4 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   42  | USE_DS1624          | xsns_59 | DS1621   | 0x48 - 0x4F | Temperature sensor
   42  | USE_DS1624          | xsns_59 | DS1624   | 0x48 - 0x4F | Temperature sensor
   43  | USE_AHT1x           | xsns_63 | AHT10/15 | 0x38        | Temperature and humidity sensor
+  44  | USE_WEMOS_MOTOR_V1  | xdrv_34 |          | 0x2D - 0x30 | WEMOS motor shield v1.0.0 (6612FNG)
diff --git a/MODULES.md b/MODULES.md
index bb02bfe73..be1d5d110 100644
--- a/MODULES.md
+++ b/MODULES.md
@@ -76,5 +76,6 @@ Module            | Description
 70 Sonoff L1      | Sonoff L1 light strip
 71 Sonoff iFan03  | Sonoff iFan03 Wifi Smart Ceiling Fan with Light
 72 EXS Dimmer     | EXS Wifi Dimmer v4
+73 PWM Dimmer     | Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM Dimmer Switches
 
 Over 600 additional devices are supported using [templates](TEMPLATES.md).
diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
new file mode 100644
index 000000000..528b3f9fb
--- /dev/null
+++ b/PWM_Dimmer.md
@@ -0,0 +1,197 @@
+# PWM Dimmer
+
+The PWM Dimmer module adds support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches. The brightness of the load for these dimmers is controlled by a PWM GPIO pin. They typically have power, up and down buttons, a powered-on LED, five brightness LEDs and another status LED. Examples are:[ https://www.amazon.com/dp/B07FXYSVR1](https://www.amazon.com/dp/B07FXYSVR1),[ https://www.amazon.com/dp/B07V26Q3VD](https://www.amazon.com/dp/B07V26Q3VD),[ https://www.amazon.com/dp/B07K67D43J](https://www.amazon.com/dp/B07K67D43J),[ https://www.amazon.com/dp/B07TTGFWFM](https://www.amazon.com/dp/B07TTGFWFM)
+
+To include PWM dimmer support in the build, define USE_PWM_DIMMER in your user_config_override. This adds 4.5K to the code size. The light module is not required for PWM dimmer operation so you can #undef USE_LIGHT to reduce the firmware bin size.
+
+To enable PWM dimmer operation, select the PWM Dimmer module.
+
+
+## PWM Dimmer Operation
+
+Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
+
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster as higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
+
+The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
+
+When the power is off, holding the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
+
+If there are LED’s defined in the template, they are turned on to indicate the current brightness. More LEDs are turned on at higher brightnesses. The LedTimeout command enables/disables an LED timeout. If LED timeout is enabled, the LED’s turn off five seconds after the last change in brightness. Note that the lowest LED and the blue power LED are always on when the power is on.
+
+The LEDLink LED can be used as a nightlight/powered-off indicator. The PoweredOffLed command enables/disables turning the LEDLink LED on when the power is off.
+
+Tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
+
+
+<table>
+  <tr>
+   <td>Taps
+   </td>
+   <td>Down Button
+   </td>
+   <td>Up Button
+   </td>
+  </tr>
+  <tr>
+   <td>1
+   </td>
+   <td>Set fixed color<sup>1</sup>
+   </td>
+   <td>Publish MQTT event<sup>2</sup>
+   </td>
+  </tr>
+  <tr>
+   <td>2
+   </td>
+   <td>Adjust minimum brightness
+   </td>
+   <td>Adjust fade speed
+   </td>
+  </tr>
+  <tr>
+   <td>3
+   </td>
+   <td>Adjust low brightness preset
+   </td>
+   <td>Adjust high brightness preset
+   </td>
+  </tr>
+</table>
+
+
+1. Setting the previous/next color only functions when remote device mode is enabled (see below) and only when the switch is in a device group with an RGB light. The color sequence as defined by the Light module is red, green, blue, orange, light green, light blue, amber, cyan, purple, yellow, pink, white using RGB channels, white using CT channels.
+
+2. The MQTT topic has the format %group-topic%/cmnd/Event, where %group-topic% is the group topic set by the GroupTopic command. The MQTT payload is SwitchTrigger#, where # is 1 if the down button is held or 2 if the up button is held. These triggers can be used in rules on remote devices  (ON Event#SwitchTrigger1) or by automation software to trigger automations such as scene changes. For example, the Event topic SwitchTrigger1 payload could trigger the automation software to turn on the previous scene in a list and the SwitchTrigger2 payload could trigger the automation software to turn on the next scene in a list.
+
+Holding the power button, pressing the down/up buttons a given number of times and then releasing the power button toggles options according to the table below. Note that you must press a down or up button within 0.5 seconds to prevent the power button hold action from taking place.
+
+
+<table>
+  <tr>
+   <td>Presses
+   </td>
+   <td>Down Button
+   </td>
+   <td>Up Button
+   </td>
+  </tr>
+  <tr>
+   <td>1
+   </td>
+   <td>Toggle powered-off LED
+   </td>
+   <td>Toggle brightness LED timeout
+   </td>
+  </tr>
+  <tr>
+   <td>2
+   </td>
+   <td>Toggle fading
+   </td>
+   <td>
+   </td>
+  </tr>
+</table>
+
+
+Holding any button for over 10 seconds executes the WiFiConfig 2 command.
+
+When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness presets are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
+
+
+### Commands
+
+
+<table>
+  <tr>
+   <td><strong>Command</strong>
+   </td>
+   <td><strong>Parameters</strong>
+   </td>
+  </tr>
+  <tr>
+   <td>BriMin
+   </td>
+   <td>1..255 = set minimum brightness
+<p>
++ = increase minimum brightness
+<p>
+- = decrease minimum brightness
+   </td>
+  </tr>
+  <tr>
+   <td>BriPreset
+   </td>
+   <td><low>,&lt;high> = set brightness low and high presets
+<p>
+1..255 = set brightness preset
+<p>
++ = increase brightness preset
+<p>
+- = decrease brightness preset
+   </td>
+  </tr>
+  <tr>
+   <td>Dimmer
+   </td>
+   <td>0..100 = set dimmer value from 0 to 100%
+<p>
++ = increase by 10
+<p>
+- = decrease by 10
+   </td>
+  </tr>
+  <tr>
+   <td>Fade
+   </td>
+   <td>0 = do not use fade <em>(default)</em>
+<p>
+1 = use fade
+   </td>
+  </tr>
+  <tr>
+   <td>LedTimeout
+   </td>
+   <td>0 = disable LED timeout
+<p>
+1 = enable LED timeout
+   </td>
+  </tr>
+  <tr>
+   <td>PoweredOffLed
+   </td>
+   <td>0 = disable powered-off LED
+<p>
+1 = disable powered-off LED
+   </td>
+  </tr>
+  <tr>
+   <td>Speed
+   </td>
+   <td>1..20 = set fade speed from fast 1 to very slow 20
+<p>
++ = increase speed
+<p>
+- = decrease speed
+   </td>
+  </tr>
+</table>
+
+
+
+### Remote Device Mode
+
+Remote device mode allows PWM Dimmer switches to control remote devices. With remote device mode enabled, each button controls a different device. Note that dimmer switches with toggle-style down/up buttons have limited functionality as remote device mode switches because you can not push the down and up buttons simultaneously.
+
+To include remote device mode support in the build, define USE_PWM_DIMMER_REMOTE in your user_config_override. Remote device mode support requires device group support so USE_DEVICE_GROUPS is automatically defined if USE_PWM_DIMMER_REMOTE is defined. Remote device mode support adds 0.7K to the code size in addition to the code size required for device groups support.
+
+To enable remote device mode, set Option71 to 1. Each remote device must be running firmware with device group support and have remote device support enabled. The remote devices do not need to be built with PWM dimmer support nor do they need to be switches.
+
+If a remote device is a PWM dimmer, the device acts like a 3-way dimmer switch would and may or may not have a load connected to it. It’s also possible to use a PWM dimmer switch without a load to act as a wall switch to control the power, brightness and color of one or more smart lights with Tasmota with device group support loaded on them.
+
+With remote device mode enabled, button 1 is the power button for the local device while buttons 2 and 3 are the power buttons for remote devices. Group names for buttons 2 and 3 are set by the GroupTopic2 and GroupTopic3 commands respectively. Note that the button numbers are defined by the module template and can be in any physical order on the switch (button 1 can be defined as the top button, the middle button or the bottom button).
+
+Pressing and releasing a power button toggles the power on all devices in the group assigned to the button. When the power is on, holding the button alternately increases or decreases the brightness. When the power is off, holding the button turns the power on at a temporary brightness of the low level set by the BriPreset command (default =10).
+
+While holding a power button, the other two buttons act like the down and up buttons for the remote device. All the functions performed by the down and up buttons in non-remote device mode are available in remote device mode. While holding button 1, button 2 performs the functions of the down button and button 3 performs the functions of the up button. While holding button 2, button 1 performs the functions of the down button and button 3 performs the functions of the up button. While holding button 3, button 1 performs the functions of the down button and button 2 performs the functions of the up button.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dba7abeed..e5e08674c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -103,4 +103,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for FiF LE-01MR energy meter by saper-2 (#7584)
 - Add new DHT driver. The old driver can still be used using define USE_DHT_OLD (#7468)
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
-- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
\ No newline at end of file
+- Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
+- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
diff --git a/TEMPLATES.md b/TEMPLATES.md
index 2cb5b4773..d922a4174 100644
--- a/TEMPLATES.md
+++ b/TEMPLATES.md
@@ -130,6 +130,7 @@ Kingart Touch         {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255
 Moes DS01             {"NAME":"MOES - DS01","GPIO":[255,255,255,255,255,255,0,0,255,108,255,107,255],"FLAG":0,"BASE":54}
 Moes QS-WiFi-D01 Dimmer 150W {"NAME":"WiFi-Dimmer","GPIO":[0,148,0,149,0,0,0,0,0,42,37,0,0],"FLAG":0,"BASE":18}
 PS-16-DZ              {"NAME":"PS-16-DZ","GPIO":[255,148,255,149,255,255,0,0,255,52,255,255,255],"FLAG":0,"BASE":58}
+PWM Dimmer            {"NAME":"PWM Dimmer","GPIO":[19,18,0,59,158,58,0,0,57,37,56,122,29],"FLAG":0,"BASE":73}
 Zemismart KS-7011     {"NAME":"KS-7011 Dimmer","GPIO":[255,107,255,108,255,255,0,0,255,255,255,255,255],"FLAG":0,"BASE":54}
 ```
 
diff --git a/platformio.ini b/platformio.ini
index 16553f0d6..552408790 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -56,6 +56,7 @@ default_envs =
 framework                 = arduino
 board                     = esp01_1m
 board_build.flash_mode    = dout
+board_build.ldscript      = eagle.flash.1m.ld
 
 platform                  = ${core_active.platform}
 platform_packages         = ${core_active.platform_packages}
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 93bbbb5ba..0c63c6e8f 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -135,10 +135,9 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_2_6_3]
 ; *** Esp8266 core for Arduino version 2.6.3
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         =
 build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -180,12 +179,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [tasmota_core_stage]
 ; *** Esp8266 core for Arduino version stable beta
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf
 build_flags               = ${esp82xx_defaults.build_flags}
-                            -Wl,-Teagle.flash.1m.ld
                             -DBEARSSL_SSL_BASIC
-                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
@@ -226,12 +223,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest beta
-platform                  = espressif8266@2.3.2
+platform                  = espressif8266@2.3.3
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-board_build.ldscript      = eagle.flash.1m.ld
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
-                            -DNOPRINTFLOAT
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 2a26ba4d2..cfcd53686 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -3,6 +3,7 @@ platform = ${common.platform}
 platform_packages = ${common.platform_packages}
 framework = ${common.framework}
 board = ${common.board}
+board_build.ldscript  = ${common.board_build.ldscript}
 board_build.flash_mode = ${common.board_build.flash_mode}
 board_build.f_cpu = ${common.board_build.f_cpu}
 build_unflags = ${common.build_unflags}
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 2689a7222..ef9ce17f4 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
+- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
+- Fix Zigbee auto-increment transaction number (#7757)
+- Add Zigbee enhanced commands decoding, added ``ZbPing``
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index cb9bb1196..630da2f6f 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -532,6 +532,14 @@
 // Commands xdrv_32_hotplug.ino
 #define D_CMND_HOTPLUG "HotPlug"
 
+// Commands xdrv_34_pwm_dimmer.ino
+#ifdef USE_PWM_DIMMER
+#define D_CMND_BRI_MIN "BriMin"
+#define D_CMND_BRI_PRESET "BriPreset"
+#define D_CMND_LED_TIMEOUT "LedTimeout"
+#define D_CMND_POWERED_OFF_LED "PoweredOffLed"
+#endif
+
 // Commands xsns_02_analog.ino
 #define D_CMND_ADCPARAM "AdcParam"
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 57e10c955..0d43b9489 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,7 +415,9 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//  #define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
+//  #define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
+//  #define USE_PWM_DIMMER                          // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+//  #define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 972af6974..88862f090 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -578,4 +578,18 @@ typedef union {
 #define device_group_share_in  domoticz_sensor_idx[0]    // Bitmask of device group items imported
 #define device_group_share_out domoticz_sensor_idx[1]    // Bitmask of device group items exported
 
+// Settings re-purposed for the PWM_DIMMER module
+#ifdef USE_PWM_DIMMER
+#define led_timeout            light_signal       // SetOption18 - Turn brightness LED's off 5 seconds after last change
+#define powered_off_led        buzzer_enable      // SetOption67 - Turn red LED on when powered off
+#define bri_power_on           pcf8574_config[0]  // Brightness when next powered-on
+#define bri_min                pcf8574_config[1]  // Minimum brightness
+#define bri_preset_low         pcf8574_config[2]  // Bri preset low
+#define bri_preset_high        pcf8574_config[3]  // Bri preset high
+#define button_devices         pcf8574_config[4]  // Button-device map
+#ifdef USE_PWM_DIMMER_REMOTE
+#define remote_device_mode     dds2382_model      // SetOption71 - Buttons control remote devices
+#endif  // USE_PWM_DIMMER_REMOTE
+#endif // USE_PWM_DIMMER
+
 #endif  // _SETTINGS_H_
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 33da93562..c2ddc6607 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -277,6 +277,23 @@ bool RtcRebootValid(void)
 
 /*********************************************************************************************\
  * Config - Flash
+ *
+ * Tasmota 1M flash usage
+ * 0x00000000 - Unzipped binary bootloader
+ * 0x00001000 - Unzipped binary code start
+ *    ::::
+ * 0x000xxxxx - Unzipped binary code end
+ * 0x000x1000 - First page used by Core OTA
+ *    ::::
+ * 0x000F3000 - Tasmota Quick Power Cycle counter (SETTINGS_LOCATION - CFG_ROTATES) - First four bytes only
+ * 0x000F4000 - First Tasmota rotating settings page
+ *    ::::
+ * 0x000FA000 - Last Tasmota rotating settings page = Last page used by Core OTA
+ * 0x000FB000 - Core SPIFFS end = Core EEPROM = Tasmota settings page during OTA and when no flash rotation is active (SETTINGS_LOCATION)
+ * 0x000FC000 - SDK - Uses first 128 bytes for phy init data mirrored by Core in RAM. See core_esp8266_phy.cpp phy_init_data[128] = Core user_rf_cal_sector
+ * 0x000FD000 - SDK - Uses scattered bytes from 0x340 (iTead use as settings storage from 0x000FD000)
+ * 0x000FE000 - SDK - Uses scattered bytes from 0x340 (iTead use as mirrored settings storage from 0x000FE000)
+ * 0x000FF000 - SDK - Uses at least first 32 bytes of this page - Tasmota Zigbee persistence from 0x000FF800 to 0x000FFFFF
 \*********************************************************************************************/
 
 extern "C" {
@@ -745,8 +762,17 @@ void SettingsErase(uint8_t type)
     _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;                       // Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
     _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;             // Flash size as seen by SDK
   }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " %d " D_UNIT_SECTORS), _sectorEnd - _sectorStart);
+#ifdef USE_WIFI_SDK_ERASE
+  else if (4 == type) {
+    _sectorStart = SETTINGS_LOCATION +1;                                  // SDK phy area and Core calibration sector (0x0FC000)
+    _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0x0FCFFF)
+  }
+  else if (5 == type) {
+    _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;  // SDK phy area and Core calibration sector (0xxFC000)
+    _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
+  }
+#endif  // USE_WIFI_SDK_ERASE
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
   EsptoolErase(_sectorStart, _sectorEnd);                                 // Esptool - erases flash completely
@@ -755,11 +781,21 @@ void SettingsErase(uint8_t type)
 
 void SettingsSdkErase(void)
 {
-  WiFi.disconnect(true);    // Delete SDK wifi config
+  WiFi.disconnect(false);    // Delete SDK wifi config
   SettingsErase(1);
   delay(1000);
 }
 
+#ifdef USE_WIFI_SDK_ERASE
+void SettingsSdkWifiErase(void)
+{
+  WiFi.disconnect(false);    // Delete SDK wifi config
+  SettingsErase(4);
+  SettingsErase(5);
+  delay(200);
+}
+#endif  // USE_WIFI_SDK_ERASE
+
 /********************************************************************************************/
 
 void SettingsDefault(void)
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index ba1a2e465..b6101b1cf 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -516,7 +516,10 @@ void GetFeatures(void)
 #ifdef USE_AHT1x
   feature5 |= 0x10000000;  // xsns_63_aht1x.ino
 #endif
-//  feature5 |= 0x20000000;
+#ifdef USE_WEMOS_MOTOR_V1
+  feature5 |= 0x20000000;  // xdrv_34_wemos_motor_v1.ino
+#endif
+
 //  feature5 |= 0x40000000;
 //  feature5 |= 0x80000000;
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index b4d699cb6..ad9b38165 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -640,6 +640,12 @@ void MqttShowState(void)
         break;
       }
 #endif  // USE_SONOFF_IFAN
+#ifdef USE_PWM_DIMMER
+      if (PWM_DIMMER == my_module_type) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_DIMMER "\":%d,\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d"),
+          Settings.light_dimmer, GetStateText(Settings.light_fade), Settings.light_speed);
+      }
+#endif  // USE_PWM_DIMMER
 #ifdef USE_LIGHT
     }
 #endif
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index fc94e5167..a8ff65967 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -708,6 +708,16 @@ const char kDeviceGroupMessage[] PROGMEM = DEVICE_GROUP_MESSAGE;
 uint8_t device_group_count = 1;
 #endif  // USE_DEVICE_GROUPS
 
+#ifdef USE_PWM_DIMMER_REMOTE
+#ifdef USE_PWM_DIMMER
+#ifndef USE_DEVICE_GROUPS
+#define USE_DEVICE_GROUPS 
+#endif  // USE_DEVICE_GROUPS
+#else  // USE_PWM_DIMMER
+#undef USE_PWM_DIMMER_REMOTE
+#endif  // USE_PWM_DIMMER
+#endif  // USE_PWM_DIMMER_REMOTE
+
 #ifdef DEBUG_TASMOTA_CORE
 #define DEBUG_CORE_LOG(...) AddLog_Debug(__VA_ARGS__)
 #else
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index c4ee7b19d..6f5aa0f8c 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -418,6 +418,7 @@ enum SupportedModules {
   SONOFF_L1,
   SONOFF_IFAN03,
   EXS_DIMMER,
+  PWM_DIMMER,
   MAXMODULE};
 
 #define USER_MODULE        255
@@ -864,6 +865,9 @@ const uint8_t kModuleNiceList[] PROGMEM = {
 #endif
 #ifdef USE_EXS_DIMMER
   EXS_DIMMER,
+#endif
+#ifdef USE_PWM_DIMMER
+  PWM_DIMMER,
 #endif
   H801,                // Light Devices
   MAGICHOME,
@@ -2204,6 +2208,33 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_USER,        // GPIO14
      0,                // GPIO15
      0, 0
+  },
+  { "PWM Dimmer",      // PWM_DIMMER - Support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM
+                       // dimmer switches. The brightness of the load for these dimmers is
+                       // controlled by a PWM GPIO pin. There are typically power, up & down
+                       // buttons and 4 LED's. Examples are:
+                       // https://www.amazon.com/dp/B07FXYSVR1
+                       // https://www.amazon.com/dp/B07V26Q3VD
+                       // https://www.amazon.com/dp/B07K67D43J
+                       // https://www.amazon.com/dp/B07TTGFWFM
+     GPIO_KEY3,        // GPIO00 Up button
+     GPIO_KEY2,        // GPIO01 Down button
+     0,                // GPIO02
+     GPIO_LED4_INV,    // GPIO03 Level 5 LED
+     GPIO_LEDLNK_INV,  // GPIO04 LED Link
+     GPIO_LED3_INV,    // GPIO05 Level 4 LED
+                       // GPIO06 (SD_CLK   Flash)
+                       // GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT)
+                       // GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT)
+     0,                // GPIO09 (SD_DATA2 Flash QIO or ESP8285)
+     0,                // GPIO10 (SD_DATA3 Flash QIO or ESP8285)
+                       // GPIO11 (SD_CMD   Flash)
+     GPIO_LED2_INV,    // GPIO12 Level 3 LED
+     GPIO_PWM1,        // GPIO13 Dimmer PWM
+     GPIO_LED1_INV,    // GPIO12 Level 2 LED
+     GPIO_KEY1_INV,    // GPIO15 Power button
+     GPIO_REL1_INV,    // GPIO16 Power relay/Level 1 LED
+     0
   }
 };
 
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 3eaa24ef5..377799a72 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1123,6 +1123,17 @@ void HandleRoot(void)
       }  // Settings.flag3.pwm_multi_channels
     }
 #endif // USE_LIGHT
+#ifdef USE_PWM_DIMMER
+    if (PWM_DIMMER == my_module_type) {
+      WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // Brightness - Black to White
+        "c",               // c - Unique HTML id
+        "#000", "#fff",    // Black to White
+        4,                 // sl4 - Unique range HTML id - Used as source for Saturation begin color
+        Settings.flag3.slider_dimmer_stay_on, 100,  // Range 0/1 to 100%
+        Settings.light_dimmer,
+        'd', 0);           // d0 - Value id is related to lc("d0", value) and WebGetArg("d0", tmp, sizeof(tmp));
+    }
+#endif  // USE_PWM_DIMMER
 #ifdef USE_SHUTTER
     if (Settings.flag3.shutter_mode) {  // SetOption80 - Enable shutter support
       for (uint32_t i = 0; i < shutters_present; i++) {
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index baaf2b7a7..d54598077 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2588,6 +2588,8 @@ void CmndRgbwwTable(void)
   ResponseCmndChar(scolor);
 }
 
+#endif  // USE_LIGHT
+#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
 void CmndFade(void)
 {
   // Fade        - Show current Fade state
@@ -2606,7 +2608,9 @@ void CmndFade(void)
 #ifdef USE_DEVICE_GROUPS
   if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
 #endif  // USE_DEVICE_GROUPS
+#ifdef USE_LIGHT
   if (!Settings.light_fade) { Light.fade_running = false; }
+#endif  // USE_LIGHT
   ResponseCmndStateText(Settings.light_fade);
 }
 
@@ -2632,6 +2636,8 @@ void CmndSpeed(void)
   }
   ResponseCmndNumber(Settings.light_speed);
 }
+#endif  // #if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
+#ifdef USE_LIGHT
 
 void CmndWakeupDuration(void)
 {
@@ -2664,7 +2670,10 @@ bool Xdrv04(uint8_t function)
   bool result = false;
 
   if (FUNC_MODULE_INIT == function) {
-    return LightModuleInit();
+#ifdef USE_PWM_DIMMER
+    if (PWM_DIMMER != my_module_type)
+#endif  // USE_PWM_DIMMER
+      return LightModuleInit();
   }
   else if (light_type) {
     switch (function) {
diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino
index 49e546b65..90563eeed 100644
--- a/tasmota/xdrv_07_domoticz.ino
+++ b/tasmota/xdrv_07_domoticz.ino
@@ -296,6 +296,7 @@ bool DomoticzMqttData(void)
           found = true;
         } else
 #endif // USE_SHUTTER
+#ifdef USE_LIGHT
         if (iscolordimmer && 10 == nvalue) {  // Color_SetColor
           // https://www.domoticz.com/wiki/Domoticz_API/JSON_URL%27s#Set_a_light_to_a_certain_color_or_color_temperature
           JsonObject& color = domoticz["Color"];
@@ -333,8 +334,9 @@ bool DomoticzMqttData(void)
           snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
           snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
           found = true;
-        }
-        else if (1 == nvalue || 0 == nvalue) {
+        } else
+#endif  // USE_LIGHT
+        if (1 == nvalue || 0 == nvalue) {
           if (((power >> i) &1) == (power_t)nvalue) {
             return true;  // Stop loop
           }
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 7396694af..fde47a623 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -200,8 +200,8 @@ void HAssAnnounceRelayLight(void)
       TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
       TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
 
-#ifdef USE_LIGHT
-      if (is_light)
+#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
+      if (is_light || PWM_DIMMER == my_module_type)
       {
         char *brightness_command_topic = stemp1;
 
@@ -209,6 +209,7 @@ void HAssAnnounceRelayLight(void)
         strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3)); // SetOption20 - Control power in relation to Dimmer/Color/Ct changes
         TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
 
+#ifdef USE_LIGHT
         if (Light.subtype >= LST_RGB)
         {
           char *rgb_command_topic = stemp1;
@@ -234,8 +235,9 @@ void HAssAnnounceRelayLight(void)
           GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
           TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
         }
+#endif  // USE_LIGHT
       }
-#endif // USE_LIGHT
+#endif  // defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
       TryResponseAppend_P(PSTR("}"));
     }
     MqttPublish(stopic, true);
diff --git a/tasmota/xdrv_23_zigbee_1_headers.ino b/tasmota/xdrv_23_zigbee_1_headers.ino
index 101d5703d..0bc592266 100644
--- a/tasmota/xdrv_23_zigbee_1_headers.ino
+++ b/tasmota/xdrv_23_zigbee_1_headers.ino
@@ -21,7 +21,7 @@
 
 // contains some definitions for functions used before their declarations
 
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp = true, uint8_t transacId = 1);
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId);
 
 
 // Get an JSON attribute, with case insensitive key search
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 4814bdb8a..71752f4e3 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -19,6 +19,10 @@
 
 #ifdef USE_ZIGBEE
 
+#ifndef ZIGBEERECEIVED
+#define ZIGBEERECEIVED 1
+#endif
+
 #include <vector>
 #include <map>
 
@@ -49,6 +53,8 @@ typedef struct Z_Device {
   // json buffer used for attribute reporting
   DynamicJsonBuffer    *json_buffer;
   JsonObject           *json;
+  // sequence number for Zigbee frames
+  uint8_t              seqNumber;
 } Z_Device;
 
 // All devices are stored in a Vector
@@ -96,6 +102,9 @@ public:
   // device just seen on the network, update the lastSeen field
   void updateLastSeen(uint16_t shortaddr);
 
+  // get next sequence number for (increment at each all)
+  uint8_t getNextSeqNumber(uint16_t shortaddr);
+
   // Dump json
   String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
 
@@ -133,6 +142,7 @@ public:
 private:
   std::vector<Z_Device> _devices = {};
   uint32_t              _saveTimer = 0;   
+  uint8_t               _seqNumber = 0;     // global seqNumber if device is unknown
 
   template < typename T>
   static bool findInVector(const std::vector<T>  & vecOfElements, const T  & element);
@@ -226,7 +236,9 @@ Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
                       std::vector<uint32_t>(),
                       0,0,0,0,
                       nullptr,
-                      nullptr, nullptr };
+                      nullptr, nullptr,
+                      0,          // seqNumber
+                      };
   device.json_buffer = new DynamicJsonBuffer();
   _devices.push_back(device);
   dirty();
@@ -532,6 +544,19 @@ void Z_Devices::updateLastSeen(uint16_t shortaddr) {
   _updateLastSeen(device);
 }
 
+// get the next sequance number for the device, or use the global seq number if device is unknown
+uint8_t Z_Devices::getNextSeqNumber(uint16_t shortaddr) {
+  int32_t short_found = findShortAddr(shortaddr);
+  if (short_found >= 0) {
+    Z_Device &device = getShortAddr(shortaddr);
+    device.seqNumber += 1;
+    return device.seqNumber;
+  } else {
+    _seqNumber += 1;
+    return _seqNumber;
+  }
+}
+
 // Per device timers
 //
 // Reset the timer for a specific device
@@ -704,18 +729,22 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#if ZIGBEERECEIVED
     // DEPRECATED TODO
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#endif
   } else {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#if ZIGBEERECEIVED
     // DEPRECATED TODO
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
+#endif
   }
   // MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
   // XdrvRulesProcess();
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index d97e5e7d4..4debd73fd 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -486,18 +486,8 @@ void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
 
 
 // Parse non-normalized attributes
-// The key is "s_" followed by 16 bits clusterId, "_" followed by 8 bits command id
 void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  char attrid_str[12];
-  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X!%02X"), _cluster_id, _cmd_id);
-
-  char hex_char[_payload.len()*2+2];
-  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-
-  json[attrid_str] = hex_char;
+  convertClusterSpecific(json, _cluster_id, _cmd_id, _frame_control.b.direction, _payload);
 }
 
 // return value:
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 073ab8e4c..5c3e3fc1b 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -19,34 +19,81 @@
 
 #ifdef USE_ZIGBEE
 
-//typedef int32_t (*Z_AttrConverter)(uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param);
 typedef struct Z_CommandConverter {
   const char * tasmota_cmd;
-  const char * zcl_cmd;
+  uint16_t     cluster;
+  uint8_t      cmd;         // normally 8 bits, 0xFF means it's a parameter
+  uint8_t      direction;   // direction of the command. 0x01 client->server, 0x02 server->client, 0x03 both
+  const char * param;
 } Z_CommandConverter;
 
+typedef struct Z_XYZ_Var {    // Holds values for vairables X, Y and Z
+  uint32_t    x = 0;
+  uint32_t    y = 0;
+  uint32_t    z = 0;
+  uint8_t     x_type = 0;     // 0 = no value, 1 = 1 bytes, 2 = 2 bytes
+  uint8_t     y_type = 0;
+  uint8_t     z_type = 0;
+} Z_XYZ_Var;
+
 // list of post-processing directives
 const Z_CommandConverter Z_Commands[] = {
-  { "Power",        "0006!xx" },              // 0=Off, 1=On, 2=Toggle
-  { "Dimmer",       "0008!04/xx0A00" },       // Move to Level with On/Off, xx=0..254 (255 is invalid)
-  { "Dimmer+",      "0008!06/001902" },       // Step up by 10%, 0.2 secs
-  { "Dimmer-",      "0008!06/011902" },       // Step down by 10%, 0.2 secs
-  { "DimmerStop",   "0008!03" },              // Stop any Dimmer animation
-  { "ResetAlarm",   "0009!00/xxyyyy" },       // Reset alarm (alarm code + cluster identifier)
-  { "ResetAllAlarms","0009!01" },             // Reset all alarms
-  { "Hue",          "0300!00/xx000A00" },     // Move to Hue, shortest time, 1s
-  { "Sat",          "0300!03/xx0A00" },       // Move to Sat
-  { "HueSat",       "0300!06/xxyy0A00" },     // Hue, Sat
-  { "Color",        "0300!07/xxxxyyyy0A00" }, // x, y (uint16)
-  { "CT",           "0300!0A/xxxx0A00" },     // Color Temperature Mireds (uint16)
-  { "Shutter",      "0102!xx" },
-  { "ShutterOpen",  "0102!00" },
-  { "ShutterClose", "0102!01" },
-  { "ShutterStop",  "0102!02" },
-  { "ShutterLift",  "0102!05xx" },            // Lift percentage, 0%=open, 100%=closed
-  { "ShutterTilt",  "0102!08xx" },            // Tilt percentage
+  // Group adress commands
+  { "AddGroup",       0x0004, 0x00, 0x01,   "xxxx00" },       // Add group id, group name is not supported
+  { "ViewGroup",      0x0004, 0x01, 0x01,   "xxxx" },         // Ask for the group name
+  { "GetGroup",       0x0004, 0x02, 0x01,   "01xxxx" },       // Get one group membership
+  { "GetAllGroups",   0x0004, 0x02, 0x01,   "00" },           // Get all groups membership
+  { "RemoveGroup",    0x0004, 0x03, 0x01,   "xxxx" },         // Remove one group
+  { "RemoveAllGroups",0x0004, 0x04, 0x01,   "" },             // Remove all groups
+  // Light & Shutter commands
+  { "Power",          0x0006, 0xFF, 0x01,   "" },             // 0=Off, 1=On, 2=Toggle
+  { "Dimmer",         0x0008, 0x04, 0x01,   "xx0A00" },       // Move to Level with On/Off, xx=0..254 (255 is invalid)
+  { "Dimmer+",        0x0008, 0x06, 0x01,   "001902" },       // Step up by 10%, 0.2 secs
+  { "Dimmer-",        0x0008, 0x06, 0x01,   "011902" },       // Step down by 10%, 0.2 secs
+  { "DimmerStop",     0x0008, 0x03, 0x01,   "" },             // Stop any Dimmer animation
+  { "ResetAlarm",     0x0009, 0x00, 0x01,   "xxyyyy" },       // Reset alarm (alarm code + cluster identifier)
+  { "ResetAllAlarms", 0x0009, 0x01, 0x01,   "" },             // Reset all alarms
+  { "Hue",            0x0300, 0x00, 0x01,   "xx000A00" },     // Move to Hue, shortest time, 1s
+  { "Sat",            0x0300, 0x03, 0x01,   "xx0A00" },       // Move to Sat
+  { "HueSat",         0x0300, 0x06, 0x01,   "xxyy0A00" },     // Hue, Sat
+  { "Color",          0x0300, 0x07, 0x01,   "xxxxyyyy0A00" }, // x, y (uint16)
+  { "CT",             0x0300, 0x0A, 0x01,   "xxxx0A00" },     // Color Temperature Mireds (uint16)
+  { "ShutterOpen",    0x0102, 0x00, 0x01,   "" },
+  { "ShutterClose",   0x0102, 0x01, 0x01,   "" },
+  { "ShutterStop",    0x0102, 0x02, 0x01,   "" },
+  { "ShutterLift",    0x0102, 0x05, 0x01,   "xx" },            // Lift percentage, 0%=open, 100%=closed
+  { "ShutterTilt",    0x0102, 0x08, 0x01,   "xx" },            // Tilt percentage
+  { "Shutter",        0x0102, 0xFF, 0x01,   "" },
+  // Blitzwolf PIR
+  { "Occupancy",      0xEF00, 0x01, 0x01,   "xx"},                // Specific decoder for Blitzwolf PIR, empty name means special treatment
+  // Decoders only - normally not used to send, and names may be masked by previous definitions
+  { "Dimmer",         0x0008, 0x00, 0x01,   "xx" },
+  { "DimmerMove",     0x0008, 0x01, 0x01,   "xx0A" },
+  { "DimmerStep",     0x0008, 0x02, 0x01,   "xx190A00" },
+  { "DimmerMove",     0x0008, 0x05, 0x01,   "xx0A" },
+  { "Dimmer+",        0x0008, 0x06, 0x01,   "00" },
+  { "Dimmer-",        0x0008, 0x06, 0x01,   "01" },
+  { "DimmerStop",     0x0008, 0x07, 0x01,   "" },
+  { "HueMove",        0x0300, 0x01, 0x01,   "xx19" },
+  { "HueStep",        0x0300, 0x02, 0x01,   "xx190A00" },
+  { "SatMove",        0x0300, 0x04, 0x01,   "xx19" },
+  { "SatStep",        0x0300, 0x05, 0x01,   "xx190A" },
+  { "ColorMove",      0x0300, 0x08, 0x01,   "xxxxyyyy" },
+  { "ColorStep",      0x0300, 0x09, 0x01,   "xxxxyyyy0A00" },
+  // Tradfri
+  { "ArrowClick",     0x0005, 0x07, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
+  { "ArrowHold",      0x0005, 0x08, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
+  { "ArrowRelease",   0x0005, 0x09, 0x01,   "" },
+  // IAS - Intruder Alarm System + leak/fire detection
+  { "ZoneStatusChange",0x0500, 0x00, 0x02,  "xxxxyyzz" },   // xxxx = zone status, yy = extended status, zz = zone id, Delay is ignored
+  // responses for Group cluster commands
+  { "AddGroupResp",   0x0004, 0x00, 0x02,   "xxyyyy" },       // xx = status, yy = group id
+  { "ViewGroupResp",  0x0004, 0x01, 0x02,   "xxyyyy" },       // xx = status, yy = group id, name ignored
+  { "GetGroupResp",   0x0004, 0x02, 0x02,   "xxyyzzzz" },     // xx = capacity, yy = count, zzzz = first group id, following groups ignored
+  { "RemoveGroup",    0x0004, 0x03, 0x02,   "xxyyyy" },       // xx = status, yy = group id
 };
 
+
 #define ZLE(x) ((x) & 0xFF), ((x) >> 8)     // Little Endian
 
 // Below are the attributes we wand to read from each cluster
@@ -55,6 +102,7 @@ const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };    // CurrentLevel
 const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };    // AlarmCount
 const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };    // Hue, Sat, X, Y, CT
 
+// This callback is registered after a cluster specific command and sends a read command for the same cluster
 int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
   size_t         attrs_len = 0;
   const uint8_t* attrs = nullptr;
@@ -78,11 +126,10 @@ int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoi
       break;
   }
   if (attrs) {
-    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true /* we do want a response */, zigbee_devices.getNextSeqNumber(shortaddr));
   }
 }
 
-
 // set a timer to read back the value in the future
 void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
   uint32_t wait_ms = 0;
@@ -105,22 +152,182 @@ void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoi
   }
 }
 
-const __FlashStringHelper* zigbeeFindCommand(const char *command) {
-  char parm_uc[16];   // used to convert JSON keys to uppercase
+// returns true if char is 'x', 'y' or 'z'
+inline bool isXYZ(char c) {
+  return (c >= 'x') && (c <= 'z');
+}
+
+// returns the Hex value of a digit [0-9A-Fa-f]
+// return: 0x00-0x0F
+// or -1 if cannot be parsed
+inline int8_t hexValue(char c) {
+  if ((c >= '0') && (c <= '9')) {
+    return c - '0';
+  }
+  if ((c >= 'A') && (c <= 'F')) {
+    return 10 + c - 'A';
+  }
+  if ((c >= 'a') && (c <= 'f')) {
+    return 10 + c - 'a';
+  }
+  return -1;
+}
+
+// Parse a Big Endian suite of max_len digits, or stops when a non-hex digit is found
+uint32_t parseHex_P(const char **data, size_t max_len = 8) {
+  uint32_t ret = 0;
+  for (uint32_t i = 0; i < max_len; i++) {
+    int8_t v = hexValue(pgm_read_byte(*data));
+    if (v < 0) { break; }     // non hex digit, we stop parsing
+    ret = (ret << 4) | v;
+    *data += 1;
+  }
+  return ret;
+}
+
+// Parse a model like "xxyy00"
+// and fill x, y and z values
+// Little Endian encoding
+// On exit, xyz is updated, and x_type, y_type, z_type contain the number of bytes read for each
+void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz) {
+  const char *p = model;    // pointer to the model character
+  uint32_t   v = 0;         // index in the payload bytes buffer
+  char c = pgm_read_byte(p);  // cur char
+  while (c) {
+    char c1 = pgm_read_byte(p+1);   // next char
+    if (!c1) { break; }   // unexpected end of model
+    if (isXYZ(c) && (c == c1) && (v < payload.len())) {    // if char is [x-z] and followed by same char
+      uint8_t val = payload.get8(v);
+      switch (c) {
+        case 'x':
+          xyz->x = xyz->x | (val << (xyz->x_type * 8));
+          xyz->x_type++;
+          break;
+        case 'y':
+          xyz->y = xyz->y | (val << (xyz->y_type * 8));
+          xyz->y_type++;
+          break;
+        case 'z':
+          xyz->z = xyz->z | (val << (xyz->z_type * 8));
+          xyz->z_type++;
+          break;
+      }
+    }
+    p += 2;
+    v++;
+    c = pgm_read_byte(p);
+  }
+}
+
+// works on big endiand hex only
+// Returns if found:
+//  - cluster number
+//  - command number or 0xFF if command is part of the variable part
+//  - the payload in the form of a HEX string with x/y/z variables
+
+
+
+// Parse a cluster specific command, and try to convert into human readable
+void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload) {
+  size_t hex_char_len = payload.len()*2+2;
+  char *hex_char = (char*) malloc(hex_char_len);
+  if (!hex_char) { return; }
+  ToHex_P((unsigned char*)payload.getBuffer(), payload.len(), hex_char, hex_char_len);
+
+  const __FlashStringHelper* command_name = nullptr;
+  Z_XYZ_Var xyz;
+
+//AddLog_P2(LOG_LEVEL_INFO, PSTR(">>> len = %d - %02X%02X%02X"), payload.len(), payload.get8(0), payload.get8(1), payload.get8(2));
+  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
+    const Z_CommandConverter *conv = &Z_Commands[i];
+    if (conv->cluster == cluster) {
+      // cluster match
+      if ((0xFF == conv->cmd) || (cmd == conv->cmd)) {
+          // cmd match
+        if ((direction && (conv->direction & 0x02)) || (!direction && (conv->direction & 0x01))) {
+          // check if we have a match for params too
+          // Match if:
+          //  - payload exactly matches conv->param (conv->param may be longer)
+          //  - payload matches conv->param until 'x', 'y' or 'z'
+          const char * p = conv->param;
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++1 param = %s"), p);
+          bool match = true;
+          for (uint8_t i = 0; i < payload.len(); i++) {
+            const char c1 = pgm_read_byte(p);
+            const char c2 = pgm_read_byte(p+1);
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++2 c1 = %c, c2 = %c"), c1, c2);
+            if ((0x00 == c1) || isXYZ(c1)) {
+              break;
+            }
+            const char * p2 = p;
+            uint32_t nextbyte = parseHex_P(&p2, 2);
+  //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>>++3 parseHex_P = %02X"), nextbyte);
+            if (nextbyte != payload.get8(i)) {
+              match = false;
+              break;
+            }
+            p += 2;
+          }
+          if (match) {
+            command_name = (const __FlashStringHelper*) conv->tasmota_cmd;
+            parseXYZ(conv->param, payload, &xyz);
+            if (0xFF == conv->cmd) {
+              // shift all values
+              xyz.z = xyz.y;
+              xyz.z_type = xyz.y_type;
+              xyz.y = xyz.x;
+              xyz.y_type = xyz.x_type;
+              xyz.x = cmd;
+              xyz.x_type = 1;   // 1 byte
+            }
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  // always report attribute in raw format
+  // Format: "0001!06": "00" = "<cluster>!<cmd>": "<payload>" for commands to devices
+  // Format: "0004<00": "00" = "<cluster><<cmd>": "<payload>" for commands to devices
+  char attrid_str[12];
+  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X%c%02X"), cluster, direction ? '<' : '!', cmd);
+  json[attrid_str] = hex_char;
+  free(hex_char);
+
+  if (command_name) {
+    if (0 == xyz.x_type) {
+      json[command_name] = true;    // no parameter
+    } else if (0 == xyz.y_type) {
+      json[command_name] = xyz.x;       // 1 parameter
+    } else {
+      // multiple answers, create an array
+      JsonArray &arr = json.createNestedArray(command_name);
+      arr.add(xyz.x);
+      arr.add(xyz.y);
+      if (xyz.z_type) {
+        arr.add(xyz.z);
+      }
+    }
+  }
+}
+
+// Find the command details by command name
+// If not found:
+//  - returns nullptr
+const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd) {
   for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
     const Z_CommandConverter *conv = &Z_Commands[i];
     if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
-      return (const __FlashStringHelper*) conv->zcl_cmd;
+      *cluster = conv->cluster;
+      *cmd = conv->cmd;
+      return (const __FlashStringHelper*) conv->param;
     }
   }
 
   return nullptr;
 }
 
-inline bool isXYZ(char c) {
-  return (c >= 'x') && (c <= 'z');
-}
-
 // take the lower 4 bits and turn it to an hex char
 inline char hexDigit(uint32_t h) {
   uint32_t nybble = h & 0x0F;
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index 5a3d78e85..d0616a40b 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -33,6 +33,7 @@ const uint8_t  ZIGBEE_STATUS_NODE_DESC = 31;            // Node descriptor
 const uint8_t  ZIGBEE_STATUS_ACTIVE_EP = 32;            // Endpoints descriptor
 const uint8_t  ZIGBEE_STATUS_SIMPLE_DESC = 33;          // Simple Descriptor (clusters)
 const uint8_t  ZIGBEE_STATUS_DEVICE_INDICATION = 34;    // Device announces its address
+const uint8_t  ZIGBEE_STATUS_DEVICE_IEEE = 35;          // Request of device address
 const uint8_t  ZIGBEE_STATUS_CC_VERSION = 50;           // Status: CC2530 ZNP Version
 const uint8_t  ZIGBEE_STATUS_CC_INFO = 51;              // Status: CC2530 Device Configuration
 const uint8_t  ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;  // Unsupported ZNP version
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 668f85471..b67add374 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -176,15 +176,24 @@ int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
   return -1;
 }
 
+// Send ZDO_IEEE_ADDR_REQ request to get IEEE long address
+void Z_SendIEEEAddrReq(uint16_t shortaddr) {
+  uint8_t IEEEAddrReq[] = { Z_SREQ | Z_ZDO, ZDO_IEEE_ADDR_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), 0x00, 0x00 };
+
+  ZigbeeZNPSend(IEEEAddrReq, sizeof(IEEEAddrReq));
+}
+
 // Send ACTIVE_EP_REQ to collect active endpoints for this address
 void Z_SendActiveEpReq(uint16_t shortaddr) {
   uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
               Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
 
-  uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
-
   ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
+
+  // uint8_t NodeDescReq[] = { Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ,
+  //             Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
+
   //ZigbeeZNPSend(NodeDescReq, sizeof(NodeDescReq));      Not sure this is useful
 }
 
@@ -335,6 +344,40 @@ int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
   return -1;
 }
 
+int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
+  uint8_t           status = buf.get8(2);
+  Z_IEEEAddress     ieeeAddr = buf.get64(3);
+  Z_ShortAddress    nwkAddr = buf.get16(11);
+  // uint8_t           startIndex = buf.get8(13);
+  // uint8_t           numAssocDev = buf.get8(14);
+
+  if (0 == status) {    // SUCCESS
+    zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
+    char hex[20];
+    Uint64toHex(ieeeAddr, hex, 64);
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                    "}}"),
+                    ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
+                    );
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+    // Ping response
+    const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
+    if (friendlyName) {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, friendlyName->c_str());
+    } else {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\"}}"), nwkAddr);
+    }
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+  }
+  return -1;
+}
+
 int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
   Z_ShortAddress    srcAddr = buf.get16(2);
   Z_ShortAddress    nwkAddr = buf.get16(4);
@@ -451,6 +494,8 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
 
   zcl_received.postProcessAttributes(srcaddr, json);
+  // Add Endpoint
+  json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
   // Add linkquality
   json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
 
@@ -482,6 +527,7 @@ ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)   // 45CA
 ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )    // 45CB
 ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)    // 4585
 ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)    // 4584
+ZBM(AREQ_ZDO_IEEE_ADDR_RSP, Z_AREQ | Z_ZDO, ZDO_IEEE_ADDR_RSP)    // 4581
 
 const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_AF_INCOMING_MESSAGE,     &Z_ReceiveAfIncomingMessage },
@@ -491,6 +537,7 @@ const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_ZDO_NODEDESCRSP,         &Z_ReceiveNodeDesc },
   { AREQ_ZDO_ACTIVEEPRSP,         &Z_ReceiveActiveEp },
   { AREQ_ZDO_SIMPLEDESCRSP,       &Z_ReceiveSimpleDesc },
+  { AREQ_ZDO_IEEE_ADDR_RSP,       &Z_ReceiveIEEEAddr },
 };
 
 int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 6ea08c4ac..08055ba9e 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -33,19 +33,22 @@ const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"    // prefix
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
 
 const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"    // legacy prefix -- deprecated
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
   &CmndZbZNPSend, &CmndZbPermitJoin,
   &CmndZbStatus, &CmndZbReset, &CmndZbSend,
   &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
-  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind
+  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind,
+  &CmndZbPing,
   };
 
 int32_t ZigbeeProcessInput(class SBuffer &buf) {
@@ -344,7 +347,7 @@ void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
                                		ToHex_P(msg, len, hex_char, sizeof(hex_char)));
 }
 
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool disableDefResp, uint8_t transacId) {
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId) {
   SBuffer buf(25+len);
   buf.add8(Z_SREQ | Z_AF);        // 24
   buf.add8(AF_DATA_REQUEST);      // 01
@@ -357,7 +360,7 @@ void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8
   buf.add8(0x1E);                 // 1E radius
 
   buf.add8(3 + len);
-  buf.add8((disableDefResp ? 0x10 : 0x00) | (clusterSpecific ? 0x01 : 0x00));                 // Frame Control Field
+  buf.add8((needResponse ? 0x00 : 0x10) | (clusterSpecific ? 0x01 : 0x00));                 // Frame Control Field
   buf.add8(transacId);            // Transaction Sequance Number
   buf.add8(cmdId);
   if (len > 0) {
@@ -367,61 +370,16 @@ void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8
   ZigbeeZNPSend(buf.getBuffer(), buf.len());
 }
 
-inline int8_t hexValue(char c) {
-  if ((c >= '0') && (c <= '9')) {
-    return c - '0';
-  }
-  if ((c >= 'A') && (c <= 'F')) {
-    return 10 + c - 'A';
-  }
-  if ((c >= 'a') && (c <= 'f')) {
-    return 10 + c - 'a';
-  }
-  return -1;
-}
-
-uint32_t parseHex(const char **data, size_t max_len = 8) {
-  uint32_t ret = 0;
-  for (uint32_t i = 0; i < max_len; i++) {
-    int8_t v = hexValue(**data);
-    if (v < 0) { break; }     // non hex digit, we stop parsing
-    ret = (ret << 4) | v;
-    *data += 1;
-  }
-  return ret;
-}
-
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
-
-  uint16_t cluster = 0x0000;    // 0x0000 is a valid default value
-  uint8_t  cmd = ZCL_READ_ATTRIBUTES; // default command is READ_ATTRIBUTES
-  bool     clusterSpecific = false;
-  // Parse 'cmd' in the form "AAAA_BB/CCCCCCCC" or "AAAA!BB/CCCCCCCC"
-  // where AA is the cluster number, BBBB the command number, CCCC... the payload
-  // First delimiter is '_' for a global command, or '!' for a cluster specific commanc
-  cluster = parseHex(&data, 4);
-
-  // delimiter
-  if (('_' == *data) || ('!' == *data)) {
-    if ('!' == *data) { clusterSpecific = true; }
-    data++;
-  } else {
-    ResponseCmndChar("Wrong delimiter for payload");
-    return;
-  }
-  // parse cmd number
-  cmd = parseHex(&data, 2);
-
-  // move to end of payload
-  // delimiter is optional
-  if ('/' == *data) { data++; }   // skip delimiter
-
-  size_t size = strlen(data);
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
+                       uint16_t cluster, uint8_t cmd, const char *param) {
+  size_t size = param ? strlen(param) : 0;
   SBuffer buf((size+2)/2);    // actual bytes buffer for data
 
-  while (*data) {
-    uint8_t code = parseHex(&data, 2);
-    buf.add8(code);
+  if (param) {
+    while (*param) {
+      uint8_t code = parseHex_P(&param, 2);
+      buf.add8(code);
+    }
   }
 
   if (0 == endpoint) {
@@ -430,7 +388,7 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
   }
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
-    dstAddr, cluster, endpoint, cmd, data);
+    dstAddr, cluster, endpoint, cmd, param);
 
   if (0 == endpoint) {
     AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
@@ -438,7 +396,7 @@ void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, const char *data) {
   }
 
   // everything is good, we can send the command
-  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len());
+  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len(), false, zigbee_devices.getNextSeqNumber(dstAddr));
   // now set the timer, if any, to read back the state later
   if (clusterSpecific) {
     zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
@@ -467,8 +425,12 @@ void CmndZbSend(void) {
   static char delim[] = ", ";     // delimiters for parameters
   uint16_t device = 0xFFFF;       // 0xFFFF is broadcast, so considered valid
   uint8_t  endpoint = 0x00;       // 0x00 is invalid for the dst endpoint
+  // Command elements
+  uint16_t cluster = 0;
+  uint8_t  cmd = 0;
   String   cmd_str = "";          // the actual low-level command, either specified or computed
 
+  // parse JSON
   const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
   if (nullptr != &val_device) {
     device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
@@ -496,8 +458,9 @@ void CmndZbSend(void) {
         String key = it->key;
         JsonVariant& value = it->value;
         uint32_t x = 0, y = 0, z = 0;
+        uint16_t cmd_var;
 
-        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str());
+        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &cluster, &cmd_var);
         if (tasmota_cmd) {
           cmd_str = tasmota_cmd;
         } else {
@@ -533,9 +496,16 @@ void CmndZbSend(void) {
           }
         }
 
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
+        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_template = %s"), cmd_str.c_str());
+        if (0xFF == cmd_var) {      // if command number is a variable, replace it with x
+          cmd = x;
+          x = y;                  // and shift other variables
+          y = z;
+        } else {
+          cmd = cmd_var;          // or simply copy the cmd number
+        }
         cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);   // fill in parameters
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
+        //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: command_final    = %s"), cmd_str.c_str());
       } else {
         // we have zero command, pass through until last error for missing command
       }
@@ -546,9 +516,9 @@ void CmndZbSend(void) {
       // we have an unsupported command type, just ignore it and fallback to missing command
     }
 
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%s\"}"),
-              device, endpoint, cmd_str.c_str());
-    zigbeeZCLSendStr(device, endpoint, cmd_str.c_str());
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%04X!%02X/%s\"}"),
+              device, endpoint, cluster, cmd, cmd_str.c_str());
+    zigbeeZCLSendStr(device, endpoint, true, cluster, cmd, cmd_str.c_str());
   } else {
     Response_P(PSTR("Missing zigbee 'Send'"));
     return;
@@ -614,16 +584,28 @@ void CmndZbBind(void) {
 
 // Probe a specific device to get its endpoints and supported clusters
 void CmndZbProbe(void) {
+  CmndZbProbeOrPing(true);
+}
+
+void CmndZbProbeOrPing(boolean probe) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
   uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
   if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
   if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
 
   // everything is good, we can send the command
-  Z_SendActiveEpReq(shortaddr);
+  Z_SendIEEEAddrReq(shortaddr);
+  if (probe) {
+    Z_SendActiveEpReq(shortaddr);
+  }
   ResponseCmndDone();
 }
 
+// Ping a device, actually a simplified version of ZbProbe
+void CmndZbPing(void) {
+  CmndZbProbeOrPing(false);
+}
+
 // Specify, read or erase a Friendly Name
 void CmndZbName(void) {
   // Syntax is:
@@ -728,8 +710,13 @@ void CmndZbRead(void) {
     }
   }
 
+  if (0 == endpoint) {    // try to compute the endpoint
+    endpoint = zigbee_devices.findClusterEndpointIn(device, cluster);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
+  }
+
   if ((0 != endpoint) && (attrs_len > 0)) {
-    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, false /* we do want a response */);
+    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true /* we do want a response */, zigbee_devices.getNextSeqNumber(device));
     ResponseCmndDone();
   } else {
     ResponseCmndChar("Missing parameters");
diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index c353a1dd4..6f4d711d7 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -48,7 +48,7 @@ void (* const ShutterCommand[])(void) PROGMEM = {
   &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
   &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
 
-  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d}";
+  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d}";
   const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
 
 #include <Ticker.h>
@@ -70,7 +70,7 @@ struct SHUTTER {
   int8_t  direction[MAX_SHUTTERS];        // 1 == UP , 0 == stop; -1 == down
   uint8_t mode = 0;                       // operation mode definition. see enum type above SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE
   int16_t motordelay[MAX_SHUTTERS];       // initial motorstarttime in 0.05sec.
-  int16_t pwm_frequency;                 // frequency of PWN for stepper motors
+  int16_t pwm_frequency[MAX_SHUTTERS];    // frequency of PWN for stepper motors
   uint16_t max_pwm_frequency = 1000;      // maximum of PWM frequency for openig the shutter. depend on the motor and drivers
   uint16_t max_close_pwm_frequency[MAX_SHUTTERS];// maximum of PWM frequency for closeing the shutter. depend on the motor and drivers
   uint8_t skip_relay_change;                 // avoid overrun at endstops
@@ -82,17 +82,18 @@ void ShutterLogPos(uint32_t i)
   char stemp2[10];
   dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
   AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
-    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency);
+    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency[i]);
 }
 
 void ShutterRtc50mS(void)
 {
-  for (uint32_t i = 0; i < shutters_present; i++) {
+  for (uint8_t i = 0; i < shutters_present; i++) {
     Shutter.time[i]++;
     if (Shutter.accelerator[i]) {
-      Shutter.pwm_frequency += Shutter.accelerator[i];
-      Shutter.pwm_frequency = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency));
-      analogWriteFreq(Shutter.pwm_frequency);
+      //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: accelerator i=%d ->  %d"),i, Shutter.accelerator[i]);
+      Shutter.pwm_frequency[i] += Shutter.accelerator[i];
+      Shutter.pwm_frequency[i] = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency[i]));
+      analogWriteFreq(Shutter.pwm_frequency[i]);
       analogWrite(pin[GPIO_PWM1+i], 50);
     }
   }
@@ -102,8 +103,6 @@ void ShutterRtc50mS(void)
 
 int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 {
-  if (0 == percent) return 0;
-  if (100 == percent) return Shutter.open_max[index];
 	if (Settings.shutter_set50percent[index] != 50) {
     return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
 	} else {
@@ -138,8 +137,6 @@ int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
 
 uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
 {
-  if (0 >= realpos) return 0;
-  if (Shutter.open_max[index] <= realpos) return 100;
 	if (Settings.shutter_set50percent[index] != 50) {
 		return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
 	} else {
@@ -203,8 +200,9 @@ void ShutterInit(void)
         Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
         if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
           Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
-          Shutter.pwm_frequency = 0;
-          analogWriteFreq(Shutter.pwm_frequency);
+          Shutter.pwm_frequency[i] = 0;
+          Shutter.accelerator[i] = 0;
+          analogWriteFreq(Shutter.pwm_frequency[i]);
           analogWrite(pin[GPIO_PWM1+i], 50);
         }
       }
@@ -256,29 +254,24 @@ void ShutterInit(void)
 
 void ShutterReportPosition(bool always)
 {
-  uint32_t shutter_moving = 0;
   Response_P(PSTR("{"));
   for (uint32_t i = 0; i < shutters_present; i++) {
     //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
     uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
     if (Shutter.direction[i] != 0) {
-      shutter_moving = 1;
+      rules_flag.shutter_moving = 1;
       ShutterLogPos(i);
     }
     if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i]);
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i], ShutterRealToPercentPosition(Shutter.target_position[i], i));
   }
   ResponseJsonEnd();
-  if (always || (1 == shutter_moving)) {
+  if (always || (rules_flag.shutter_moving)) {
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
   }
-  if (rules_flag.shutter_moving > shutter_moving) {
-    rules_flag.shutter_moved = 1;
-  } else {
-    rules_flag.shutter_moved = 0;
-  }
-  rules_flag.shutter_moving = shutter_moving;
-  //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
+  //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
+
 }
 
 void ShutterLimitRealAndTargetPositions(uint32_t i) {
@@ -304,22 +297,22 @@ void ShutterUpdatePosition(void)
 
         int32_t  max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
         int32_t  max_freq_change_per_sec =  Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-        int32_t  min_runtime_ms = Shutter.pwm_frequency*1000 / max_freq_change_per_sec;
+        int32_t  min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
         int32_t  velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency / max_frequency  * Shutter.direction[i] ;
+        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency  * Shutter.direction[i] ;
 
         int32_t  next_possible_stop = Shutter.real_position[i] + minstopway ;
-        stop_position_delta =200 * Shutter.pwm_frequency/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+        stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
         //Shutter.accelerator[i] = tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
         //int32_t act_freq_change = max_freq_change_per_sec/20;
         AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
-                                      Shutter.pwm_frequency,max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
+                                      Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
 
         if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
 
             Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
             //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Ramp down: acc: %d"),   Shutter.accelerator[i]);
-        } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency ==  max_frequency) {
+        } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] ==  max_frequency) {
           Shutter.accelerator[i] = 0;
         }
       } else {
@@ -343,13 +336,13 @@ void ShutterUpdatePosition(void)
           case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
             missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
             //prepare for stop PWM
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency[i]);
             Shutter.accelerator[i] = 0;
-            Shutter.pwm_frequency = Shutter.pwm_frequency > 250 ? 250 : Shutter.pwm_frequency;
-            analogWriteFreq(Shutter.pwm_frequency);
+            Shutter.pwm_frequency[i] = Shutter.pwm_frequency[i] > 250 ? 250 : Shutter.pwm_frequency[i];
+            analogWriteFreq(Shutter.pwm_frequency[i]);
             analogWrite(pin[GPIO_PWM1+i], 50);
-            Shutter.pwm_frequency = 0;
-            analogWriteFreq(Shutter.pwm_frequency);
+            Shutter.pwm_frequency[i] = 0;
+            analogWriteFreq(Shutter.pwm_frequency[i]);
             while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
               delay(1);
             }
@@ -391,6 +384,7 @@ void ShutterUpdatePosition(void)
 
         Shutter.direction[i] = 0;
         ShutterReportPosition(true);
+        rules_flag.shutter_moved = 1;
         XdrvRulesProcess();
       }
     }
@@ -413,8 +407,8 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
     Shutter.skip_relay_change = 1;
   } else {
     if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-      Shutter.pwm_frequency = 0;
-      analogWriteFreq(Shutter.pwm_frequency);
+      Shutter.pwm_frequency[i] = 0;
+      analogWriteFreq(Shutter.pwm_frequency[i]);
       analogWrite(pin[GPIO_PWM1+i], 0);
       // can be operated without counter, but then not that acurate.
       if (pin[GPIO_CNTR1+i] < 99) {
@@ -439,10 +433,11 @@ void ShutterWaitForMotorStop(uint32_t i)
   if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
     if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
       //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Frequency change %d"), Shutter.pwm_frequency);
-      while (Shutter.pwm_frequency > 0) {
-        Shutter.accelerator[i] = 0;
-        Shutter.pwm_frequency = tmax(Shutter.pwm_frequency-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
-        analogWriteFreq(Shutter.pwm_frequency);
+      while (Shutter.pwm_frequency[i] > 0) {
+        //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld, delta: %d"), Shutter.pwm_frequency[i], (int32_t)((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) );
+        Shutter.pwm_frequency[i] = tmax(Shutter.pwm_frequency[i]-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
+        //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Frequency: %ld"),  Shutter.pwm_frequency[i]);
+        analogWriteFreq(Shutter.pwm_frequency[i]);
         analogWrite(pin[GPIO_PWM1+i], 50);
         delay(50);
       }
@@ -532,7 +527,6 @@ void ShutterButtonHandler(void)
   uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
 
   uint16_t loops_per_second = 1000 / Settings.button_debounce;  // ButtonDebounce (50)
-
   if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
     if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
         buttonState = SHT_PRESSED_MULTI;
@@ -542,9 +536,9 @@ void ShutterButtonHandler(void)
         buttonState = SHT_PRESSED_IMMEDIATE;
         press_index = 1;
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
-      } else
+      } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-      Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
+      }
     }
     blinks = 201;
   }
@@ -596,14 +590,18 @@ void ShutterButtonHandler(void)
           // check for simultaneous shutter button press
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter))
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
+            }
+
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
             press_index = Button.press_counter[button_index];
             for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
+              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
                 Button.press_counter[i] = 99; // Remember to discard further action for press & hold within button timings
             buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
           }
@@ -628,7 +626,6 @@ void ShutterButtonHandler(void)
        return;
      }
    } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-     // simultaneous shutter button extend hold detected
      if (!Settings.flag.button_restrict) { // no SetOption1 (0)
        char scmnd[20];
        snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
@@ -649,8 +646,7 @@ void ShutterButtonHandler(void)
         if (buttonState == SHT_PRESSED_IMMEDIATE) {
           XdrvMailbox.payload = XdrvMailbox.index;
           CmndShutterStop();
-        }
-        else {
+        } else {
           uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
           if (position) {
             if (Shutter.direction[shutter_index]) {
@@ -670,12 +666,12 @@ void ShutterButtonHandler(void)
                     Response_P("%d", position);
                     MqttPublish(stopic, false);
                   }
-                }
-              }
-            }
-          }
-        }
-      }
+                } // for (uint32_t)
+              } // if (Settings.shutter)
+            } // ende else
+          } // if (position)
+        } // end else
+      } // if   if (Settings.shutter_startrelay[shutter_index]
     }
     Response_P(PSTR("{"));
     ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
@@ -756,6 +752,7 @@ void CmndShutterPosition(void)
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
 
       // value 0 with data_len > 0 can mean Open
+      // special handling fo UP,DOWN,TOGGLE,STOP command comming with payload -99
       if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
         //UpperCase(XdrvMailbox.data, XdrvMailbox.data);
         if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
@@ -773,13 +770,13 @@ void CmndShutterPosition(void)
         }
       }
 
-      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? 0 : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
+      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter.real_position[index], index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
       // webgui still send also on inverted shutter the native position.
       target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
       if (XdrvMailbox.payload != -99) {
         //target_pos_percent = (Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
         Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-        Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
+        //Shutter.accelerator[index] = Shutter.max_pwm_frequency / ((Shutter.motordelay[index] > 0) ? Shutter.motordelay[index] : 1);
         //Shutter.target_position[index] = XdrvMailbox.payload < 5 ?  Settings.shuttercoeff[2][index] * XdrvMailbox.payload : Settings.shuttercoeff[1][index] * XdrvMailbox.payload + Settings.shuttercoeff[0,index];
         AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
       }
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
new file mode 100644
index 000000000..ea3211563
--- /dev/null
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -0,0 +1,1141 @@
+/*
+  xdrv_35_pwm_dimmer.ino - PWM Dimmer Switch support for Tasmota
+
+  Copyright (C) 2020  Paul C Diem
+
+  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/>.
+*/
+
+#ifdef USE_PWM_DIMMER
+
+/*********************************************************************************************\
+* Support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches. The brightness of
+* the load for these dimmers is controlled by a PWM GPIO pin. Examples are:
+*
+* https://www.amazon.com/dp/B07FXYSVR1
+* https://www.amazon.com/dp/B07V26Q3VD
+* https://www.amazon.com/dp/B07K67D43J
+* https://www.amazon.com/dp/B07TTGFWFM
+*
+\*********************************************************************************************/
+
+#define XDRV_35             35
+
+#ifndef MAX_FIXED_COLOR
+#define MAX_FIXED_COLOR     12
+#endif  // MAX_FIXED_COLOR
+
+const char kPWMDimmerCommands[] PROGMEM = "|"  // No prefix
+   D_CMND_BRI_MIN "|" D_CMND_BRI_PRESET "|" D_CMND_DIMMER "|" D_CMND_FADE "|" D_CMND_LED_TIMEOUT "|"
+   D_CMND_POWERED_OFF_LED "|" D_CMND_SPEED;
+
+void (* const PWMDimmerCommand[])(void) PROGMEM = {
+  &CmndBriMin, &CmndBriPreset, &PWMDmmerCmndDimmer, &CmndFade, &CmndLedTimeout,
+  &CmndPoweredOffLed, &CmndSpeed };
+
+#ifdef USE_PWM_DIMMER_REMOTE
+struct remote_pwm_dimmer {
+  power_t power;
+  uint8_t light_speed;
+  uint8_t x_bri_power_on;
+  uint8_t x_bri_min;
+  uint8_t x_bri_preset_low;
+  uint8_t x_bri_preset_high;
+  uint8_t fixed_color_index;
+  uint8_t bri;
+  bool power_button_increases_bri;
+  bool light_fade;
+};
+#endif  // USE_PWM_DIMMER_REMOTE
+
+uint32_t led_timeout_time = 0;
+uint32_t turn_off_brightness_leds_time = 0;
+uint32_t button_hold_time[3];
+uint8_t current_bri;
+uint8_t target_bri;
+uint8_t restore_powered_off_led = 0;
+uint8_t power_button_index = 0;
+uint8_t down_button_index = 1;
+uint8_t up_button_index = 2;
+uint8_t fixed_color_index;
+uint8_t button_press_count[3] = { 0, 0, 0 };
+bool relay_is_on = false;
+bool ignore_power_button_hold;
+bool ignore_power_button_release;
+bool button_was_held = false;
+bool power_button_increases_bri = true;
+bool invert_power_button_bri_direction = false;
+bool button_hold_sent[3];
+bool button_pressed[3] = { false, false, false };
+#ifdef USE_PWM_DIMMER_REMOTE
+struct remote_pwm_dimmer * remote_pwm_dimmers;
+struct device_group * active_device_group;
+struct remote_pwm_dimmer * active_remote_pwm_dimmer;
+uint8_t buttons_pressed = 0;
+bool active_device_is_local;
+#endif  // USE_PWM_DIMMER_REMOTE
+
+void PWMDimmerCheckBri(uint8_t * value_ptr)
+{
+  if (*value_ptr < Settings.bri_min) *value_ptr = Settings.bri_min;
+}
+
+void PWMModuleInit()
+{
+  Settings.seriallog_level = 0;
+  Settings.flag.mqtt_serial = 0;  // Disable serial logging
+  Settings.ledstate = 0;          // Disable LED usage
+  Settings.flag.pwm_control = 0;  // Use basic PWM control instead of Light    
+
+  if (Settings.last_module != Settings.module) {
+    Settings.bri_min = 8;
+    Settings.bri_power_on = 50;
+    Settings.bri_preset_low = 8;
+    Settings.bri_preset_high = 255;
+    Settings.last_module = Settings.module;
+  }
+  else {
+    if (Settings.bri_min < 1) Settings.bri_min = 8;
+    PWMDimmerCheckBri(&Settings.bri_power_on);
+    PWMDimmerCheckBri(&Settings.bri_preset_low);
+    PWMDimmerCheckBri(&Settings.bri_preset_high);
+  }
+
+  if (Settings.light_speed < 1) Settings.light_speed = 1;
+
+  target_bri = ((Settings.power & 1) ? changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255) : 0);
+  PWMDimmerCheckBri(&target_bri);
+  current_bri = target_bri;
+
+  if (pin[GPIO_PWM1] < 99) {
+    uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
+    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
+  }
+
+  relay_is_on = (current_bri > 0);
+  if (pin[GPIO_REL1] < 99) DigitalWrite(GPIO_REL1, bitRead(rel_inverted, 0) ? !relay_is_on : relay_is_on);
+
+  PWMDimmerSetPoweredOffLed();
+  PWMDimmerSetBrightnessLeds(0);
+}
+
+void PWMDimmerInit(void)
+{
+#ifdef USE_PWM_DIMMER_REMOTE
+  if (Settings.flag3.remote_device_mode) {
+    if (device_group_count > 1) {
+      if ((remote_pwm_dimmers = (struct remote_pwm_dimmer *) calloc(device_group_count - 1, sizeof(struct remote_pwm_dimmer))) == nullptr) {
+        AddLog_P2(LOG_LEVEL_ERROR, "PWMDimmer: error allocating PWM dimmer array");
+        Settings.flag3.remote_device_mode = false;
+      }
+    }
+  }
+
+  active_device_group = &device_groups[0];
+  active_device_is_local = true;
+#endif  // USE_PWM_DIMMER_REMOTE
+}
+
+// operation: 0 = normal, -1 = all off, 1 = all on
+void PWMDimmerSetBrightnessLeds(int32_t operation)
+{
+  if (leds_present) {
+    uint32_t step = (!operation ? (255 - Settings.bri_min) / (leds_present + 1) : operation < 0 ? 255 : 0);
+    uint32_t level = step;
+    SetLedPowerIdx(0, current_bri >= level);
+    if (leds_present > 1) {
+      level += step;
+      SetLedPowerIdx(1, current_bri >= level);
+      if (leds_present > 2) {
+        level += step;
+        SetLedPowerIdx(2, current_bri >= level);
+        if (leds_present > 3) {
+          level += step;
+          SetLedPowerIdx(3, current_bri >= level);
+        }
+      }
+    }
+
+    // If enabled, set the LED timeout.
+    if (!operation) led_timeout_time = (current_bri && Settings.flag.led_timeout ? millis() + 5000 : 0);
+  }
+}
+
+void PWMDimmerSetPoweredOffLed(void)
+{
+  // Set the powered-off LED state.
+  if (pin[GPIO_LEDLNK] < 99) {
+    bool power_off_led_on = !power && Settings.flag3.powered_off_led;
+    if (ledlnk_inverted) power_off_led_on ^= 1;
+    digitalWrite(pin[GPIO_LEDLNK], power_off_led_on);
+  }
+}
+
+void PWMDimmerAnimate(bool no_fade)
+{
+  // We're only here if something changed. If this is no longer the case, uncomment the following
+  // line.
+  //if (current_bri == target_bri) return;
+
+  // Advance the current brightness towards the target.
+  if (!no_fade && Settings.light_fade) {
+    if (current_bri < Settings.bri_min) {
+      current_bri = Settings.bri_min;
+    }
+    else {
+      uint8_t offset = current_bri / Settings.light_speed / 5 + 1;
+      uint8_t max_offset = abs(target_bri - current_bri);
+      if (offset > max_offset) offset = max_offset;
+      if (current_bri < target_bri)
+        current_bri += offset;
+      else
+        current_bri -= offset;
+    }
+  }
+  else {
+    current_bri = target_bri;
+  }
+
+  // If the current brightness is now < bri_min, set the current and target brightness to 0.
+  if (current_bri < Settings.bri_min) current_bri = target_bri = 0;
+
+  // Sset the new PWM value.
+  if (pin[GPIO_PWM1] < 99) {
+    uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
+    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
+  }
+
+  // Handle a power state change.
+  if (relay_is_on != (current_bri > 0)) {
+    bool power_is_on = ((power & 1) != 0);
+    if (power_is_on == relay_is_on) {
+AddLog_P2(LOG_LEVEL_DEBUG, "****************** ExecuteCommandPower(1, %d, SRC_SWITCH)", (relay_is_on ? 0 : 1));
+      ExecuteCommandPower(1, (relay_is_on ? POWER_OFF : POWER_ON), SRC_SWITCH);
+    }
+
+    relay_is_on = !relay_is_on;
+    if (pin[GPIO_REL1] < 99) DigitalWrite(GPIO_REL1, bitRead(rel_inverted, 0) ? !relay_is_on : relay_is_on);
+
+    // Set the powered-off LED.
+    PWMDimmerSetPoweredOffLed();
+  }
+
+  // Set the brightness LED's.
+  PWMDimmerSetBrightnessLeds(0);
+}
+
+void PWMDimmerSetBri(uint8_t bri)
+{
+  if (bri == target_bri) return;
+  target_bri = bri;
+  if (target_bri && target_bri < Settings.bri_min) target_bri = Settings.bri_min;
+  Settings.bri_power_on = target_bri;
+  Settings.light_dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
+  if (Settings.flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
+    MqttPublishTeleState();
+  }
+  PWMDimmerAnimate(false);
+}
+
+#ifdef USE_DEVICE_GROUPS
+void PWMDimmerHandleDeviceGroupRequest()
+{
+  static bool send_state = false;
+  uint8_t value = XdrvMailbox.payload;
+  switch (XdrvMailbox.command_code) {
+    case DGR_ITEM_BRI_MIN:
+      Settings.bri_min = 1;
+    case DGR_ITEM_BRI_PRESET_LOW:
+    case DGR_ITEM_BRI_PRESET_HIGH:
+    case DGR_ITEM_BRI_POWER_ON:
+      PWMDimmerCheckBri(&value);
+      break;
+    case DGR_ITEM_LIGHT_BRI:
+      if (value) PWMDimmerCheckBri(&value);
+      break;
+  }
+
+  switch (XdrvMailbox.command_code) {
+    case DGR_ITEM_EOL:
+      if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
+        if (Settings.flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
+          MqttPublishTeleState();
+        }
+        send_state = false;
+      }
+      break;
+    case DGR_ITEM_LIGHT_BRI:
+      if (target_bri != value) {
+        PWMDimmerSetBri(value);
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_SPEED:
+      if (Settings.light_speed != value && value > 0 && value <= 40) {
+        Settings.light_speed = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_BRI_MIN:
+      if (Settings.bri_min != value) {
+        Settings.bri_min = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_BRI_PRESET_LOW:
+      if (Settings.bri_preset_low != value) {
+        Settings.bri_preset_low = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_BRI_PRESET_HIGH:
+      if (Settings.bri_preset_high != value) {
+        Settings.bri_preset_high = value;
+        send_state = true;
+      }
+   break;
+    case DGR_ITEM_BRI_POWER_ON:
+      if (Settings.bri_power_on != value) {
+        Settings.bri_power_on = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_STATUS:
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
+        DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
+        DGR_ITEM_BRI_MIN, Settings.bri_min, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
+        DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high, DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
+      break;
+  }
+}
+#endif  // USE_DEVICE_GROUPS
+
+void PWMDimmerHandleButton()
+{
+  /*
+  * Power Button          Up/Down Buttons         State   Remote Mode   Action
+  * --------------------  ----------------------  -----   ------------  ----------------------------
+  * Press & release       Released                Any     Any           Toggle power
+  * Hold for hold time    Released                On      Any           Brighter/dimmer while held
+  *                                                                     then reverse direction
+  * Hold for hold time    Released                Off     Any           Power on at bri preset low
+  * Hold while            Press & release up      Any     Any           Toggle/change options
+  * Hold while            Press & release down    Any     Any           Toggle/change options
+  * Hold while            Press up                On      Yes           Brighter
+  * Hold while            Press down              On      Yes           Dimmer
+  * Released              Press up                On      No            Brigther
+  * Released              Press down              On      No            Dimmer
+  * Released              Press & release up      Off     No            Power on at bri preset low
+  * Released              Press & release down    Off     No            Power on at bri preset high
+  * 
+  * Holding any button for over 10 seconds executes the WiFiConfig 2 command.
+  * 
+  * In remote mode, whichever button is pressed first becomes the power button and any buttons
+  * pressed while it is held affect the device associated with it. The up and down buttons change
+  * depeneding on which button is the current power button:
+  * 
+  * Power Down  Up
+  * ----- ----  --
+  * 1     2     3
+  * 2     1     3
+  * 3     1     2
+  */
+  uint32_t button_index = XdrvMailbox.index;
+  uint32_t now = millis();
+  bool toggle_power = false;
+  uint8_t dgr_item = 0;
+  uint8_t dgr_value;
+
+  // If the button is pressed, ...
+  if (!XdrvMailbox.payload) {
+    int8_t bri_direction = 0;
+
+    // If the button was just pressed, reset the press count if it was released for longer than 1
+    // second, flag the button as pressed, clear the hold sent flag and increment the buttons
+    // pressed count.
+    if (!button_pressed[button_index]) {
+      if (now > button_hold_time[button_index] && now - button_hold_time[button_index] > 1000) button_press_count[button_index] = 0;
+      button_pressed[button_index] = true;
+      button_hold_sent[button_index] = false;
+#ifdef USE_PWM_DIMMER_REMOTE
+      buttons_pressed++;
+
+      // If there are no other buttons pressed right now and remote mode is enabled, make the device
+      // associated with this button the device we're going to control.
+      if (buttons_pressed == 1 && Settings.flag3.remote_device_mode) {
+        power_button_index = button_index;
+        up_button_index = (button_index == 2 ? 1 : 2);
+        down_button_index = (button_index ? 0 : 1);
+        active_device_group = &device_groups[power_button_index];
+        active_device_is_local = active_device_group->local;
+        if (!active_device_is_local) active_remote_pwm_dimmer = &remote_pwm_dimmers[power_button_index - 1];
+      }
+      if (button_index == power_button_index) {
+#else // USE_PWM_DIMMER_REMOTE
+      // If this is about the power button, initialize some variables.
+      if (!button_index) {
+#endif  // USE_PWM_DIMMER_REMOTE
+        button_hold_time[button_index] = now + 500;
+        ignore_power_button_hold = false;
+        ignore_power_button_release = false;
+        return;
+      }
+
+      // If this is not about the power button, load the new hold time. Note that the hold time for
+      // the power button is longer than the hold time for the other buttons.
+      button_hold_time[button_index] = now + 250;
+    }
+
+    // If the button is being held, send a button hold.
+    else if (button_hold_time[button_index] < now) {
+      if (!button_hold_sent[button_index]) {
+        button_hold_sent[button_index] = true;
+        SendKey(KEY_BUTTON, button_index + 1, POWER_HOLD);
+      }
+
+      // If the button has been held for over 10 seconds, execute the WiFiConfig 2 command.
+      if (now - button_hold_time[button_index] > 10000) {
+          char scmnd[20];
+          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " 2"));
+          ExecuteCommand(scmnd, SRC_BUTTON);
+          return;
+      }
+    }
+
+    // If this is about the power button, ...
+#ifdef USE_PWM_DIMMER_REMOTE
+    if (button_index == power_button_index) {
+#else // USE_PWM_DIMMER_REMOTE
+    if (!button_index) {
+#endif  // USE_PWM_DIMMER_REMOTE
+
+      // If the power button has been held with no other buttons pressed, ...
+      if (!ignore_power_button_hold && button_hold_time[button_index] < now) {
+        ignore_power_button_release = true;
+
+        // If the device power is on, adjust the brightness. Set the direction based on the current
+        // direction for the device and then invert the direction when the power button is released.
+        // The new brightness will be calculated below.
+#ifdef USE_PWM_DIMMER_REMOTE
+        if (!active_device_is_local ? active_remote_pwm_dimmer->power : power) {
+          bri_direction = (!active_device_is_local ? (active_remote_pwm_dimmer->power_button_increases_bri ? 1 : -1) : (power_button_increases_bri ? 1 : -1));
+#else // USE_PWM_DIMMER_REMOTE
+        if (power) {
+          bri_direction = (power_button_increases_bri ? 1 : -1);
+#endif  // USE_PWM_DIMMER_REMOTE
+          invert_power_button_bri_direction = true;
+        }
+
+        // If the power is not on, turn it on using an initial brightness of bri_preset_low and set
+        // the power button hold dimmer direction to true so holding the power switch increases the
+        // brightness.
+        else {
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local) {
+            active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->x_bri_preset_low;
+            active_remote_pwm_dimmer->power_button_increases_bri = true;
+          }
+          else {
+#endif  // USE_PWM_DIMMER_REMOTE
+            target_bri = Settings.bri_preset_low;
+            power_button_increases_bri = true;
+#ifdef USE_PWM_DIMMER_REMOTE
+          }
+#endif  // USE_PWM_DIMMER_REMOTE
+          toggle_power = true;
+
+          // Reset the power button hold time to delay before we start increasing the brightness.
+          button_hold_time[button_index] = now + 500;
+        }
+      }
+    }
+
+    // If this is about the down or up buttons, ...
+    else {
+
+      // If the power button is also pressed, set flags to ignore the power button being held and
+      // the next power button release.
+      if (button_pressed[power_button_index]) {
+        ignore_power_button_release = ignore_power_button_hold = true;
+      }
+
+      // If the active device is local or the power button if also pressed, then if the down/up
+      // button has been held, handle the action based on the number of times the down or up button
+      // was pressed and released before holding it.
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (active_device_is_local == !button_pressed[power_button_index]) {
+#endif  // USE_PWM_DIMMER_REMOTE
+        if (button_hold_time[button_index] < now) {
+
+          uint8_t uint8_value;
+          uint8_t min_uint8_value;
+          bool down_button_is_held = (button_index == down_button_index);
+          bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
+          uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
+          switch (tap_count) {
+            case 0:
+              // If the power is on, adjust the brightness. Set the direction based on which button is
+              // pressed. The new brightness will be calculated below.
+#ifdef USE_PWM_DIMMER_REMOTE
+              if ((!active_device_is_local ? active_remote_pwm_dimmer->power : power)) {
+#else // USE_PWM_DIMMER_REMOTE
+              if (power) {
+#endif  // USE_PWM_DIMMER_REMOTE
+                bri_direction = (down_button_is_held ? -1 : 1);
+              }
+
+              // If the power is not on, turn it on using a temporary brightness of bri_preset_low if
+              // the down button is pressed or bri_preset_low if the up button is pressed.
+              else {
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->x_bri_preset_low : active_remote_pwm_dimmer->x_bri_preset_high);
+                else
+#endif  // USE_PWM_DIMMER_REMOTE
+                  target_bri = (down_button_is_held ? Settings.bri_preset_low : Settings.bri_preset_high);
+                toggle_power = true;
+                button_hold_time[button_index] = now + 1000;
+
+                // If the power button is also pressed, set the power button hold dimmer direction
+                // so holding the power switch adjusts the brightness away from the brightness we
+                // just set.
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = down_button_is_held;
+#endif  // USE_PWM_DIMMER_REMOTE
+              }
+              break;
+
+            case 1:
+              if (down_button_was_tapped) {
+                // Select the previous/next color.
+#ifdef USE_DEVICE_GROUPS
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  uint8_value = active_remote_pwm_dimmer->fixed_color_index;
+                else
+#endif  // USE_PWM_DIMMER_REMOTE
+                  uint8_value = fixed_color_index;
+                if (down_button_is_held) {
+                  if (uint8_value)
+                    uint8_value--;
+                  else
+                    uint8_value = MAX_FIXED_COLOR;
+                }
+                else {
+                  if (uint8_value < MAX_FIXED_COLOR)
+                    uint8_value++;
+                  else
+                    uint8_value = 0;
+                }
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  active_remote_pwm_dimmer->fixed_color_index = uint8_value;
+                else
+#endif  // USE_PWM_DIMMER_REMOTE
+                  fixed_color_index = uint8_value;
+                dgr_item = DGR_ITEM_LIGHT_FIXED_COLOR;
+                dgr_value = uint8_value;
+#endif // USE_DEVICE_GROUPS
+                ;
+              }
+              else {
+                // Publish MQTT Event SwitchTrigger#.
+                char topic[TOPSZ];
+#ifdef USE_PWM_DIMMER_REMOTE
+                snprintf(topic, sizeof(topic), "%s/cmnd/Event", active_device_group->group_name);
+#else  // USE_PWM_DIMMER_REMOTE
+                snprintf(topic, sizeof(topic), "%s/cmnd/Event", SettingsText(SET_MQTT_GRP_TOPIC));
+#endif  // USE_PWM_DIMMER_REMOTE
+                sprintf(mqtt_data, "SwitchTrigger%u", (down_button_is_held ? 1 : 2));
+                MqttPublish(topic);
+              }
+              break;
+
+            case 2:
+              if (down_button_was_tapped) {
+                // Decrease/increase the minimum brightness.
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  uint8_value = active_remote_pwm_dimmer->x_bri_min;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  uint8_value = Settings.bri_min;
+                if (down_button_is_held) {
+                  if (uint8_value > 4) uint8_value--;
+                }
+                else if (uint8_value < 255) {
+                  uint8_value++;
+                }
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local) {
+                  active_remote_pwm_dimmer->x_bri_min = uint8_value;
+                  if (active_remote_pwm_dimmer->x_bri_power_on < uint8_value) active_remote_pwm_dimmer->x_bri_power_on = uint8_value;
+                }
+                else {
+#endif // USE_PWM_DIMMER_REMOTE
+                  Settings.bri_min = uint8_value;
+                  if (Settings.bri_power_on < uint8_value) Settings.bri_power_on = uint8_value;
+#ifdef USE_PWM_DIMMER_REMOTE
+                }
+#endif // USE_PWM_DIMMER_REMOTE
+                dgr_item = DGR_ITEM_BRI_MIN;
+                dgr_value = uint8_value;
+              }
+              else {
+                // Decrease/increase the fade speed.
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  uint8_value = active_remote_pwm_dimmer->light_speed;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  uint8_value = Settings.light_speed;
+                if (down_button_is_held) {
+                  if (uint8_value > 1) uint8_value--;
+                }
+                else if (uint8_value < 40) {
+                  uint8_value++;
+                }
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  active_remote_pwm_dimmer->light_speed = uint8_value;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  Settings.light_speed = uint8_value;
+                dgr_item = DGR_ITEM_LIGHT_SPEED;
+                dgr_value = uint8_value;
+              }
+              break;
+
+            case 3:
+              if (down_button_was_tapped) {
+                // Decrease/increase the low brightness preset.
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local) {
+                  uint8_value = active_remote_pwm_dimmer->x_bri_preset_low;
+                  min_uint8_value =active_remote_pwm_dimmer->x_bri_min;
+                }
+                else {
+#endif // USE_PWM_DIMMER_REMOTE
+                  uint8_value = Settings.bri_preset_low;
+                  min_uint8_value = Settings.bri_min;
+#ifdef USE_PWM_DIMMER_REMOTE
+                }
+#endif // USE_PWM_DIMMER_REMOTE
+                if (down_button_is_held) {
+                  if (uint8_value > min_uint8_value) uint8_value--;
+                }
+                else if (uint8_value < 255) {
+                  uint8_value++;
+                }
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  active_remote_pwm_dimmer->x_bri_preset_low = uint8_value;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  Settings.bri_preset_low = uint8_value;
+                dgr_item = DGR_ITEM_BRI_PRESET_LOW;
+                dgr_value = uint8_value;
+              }
+              else {
+                // Decrease/increase the high brightness preset.
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  uint8_value = active_remote_pwm_dimmer->x_bri_preset_high;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  uint8_value = Settings.bri_preset_high;
+                if (down_button_is_held) {
+                  if (uint8_value > 4) uint8_value--;
+                }
+                else if (uint8_value < 255) {
+                  uint8_value++;
+                }
+#ifdef USE_PWM_DIMMER_REMOTE
+                if (!active_device_is_local)
+                  active_remote_pwm_dimmer->x_bri_preset_high = uint8_value;
+                else
+#endif // USE_PWM_DIMMER_REMOTE
+                  Settings.bri_preset_high = uint8_value;
+                dgr_item = DGR_ITEM_BRI_PRESET_HIGH;
+                dgr_value = uint8_value;
+              }
+              break;
+          }
+
+          button_was_held = true;
+
+          // If the button was tapped before it was held, reset the button hold time to one second and
+          // turn all the brightness LEDs on for 250ms.
+          if (tap_count > 0) {
+            button_hold_time[button_index] = now + 1000;
+            turn_off_brightness_leds_time = now + 250;
+            PWMDimmerSetBrightnessLeds(1);
+          }
+        }
+        else if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
+          turn_off_brightness_leds_time = 0;
+          PWMDimmerSetBrightnessLeds(-1);
+        }
+#ifdef USE_PWM_DIMMER_REMOTE
+      }
+#endif // USE_PWM_DIMMER_REMOTE
+    }
+
+    // If we need to adjust the brightness, do it. The brightness is adjusted faster the longer the
+    // button is held.
+    if (bri_direction) {
+      int32_t bri;
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!active_device_is_local)
+        bri = active_remote_pwm_dimmer->bri;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
+        bri = target_bri;
+      int32_t new_bri;
+      int32_t offset = bri / 12 + 1;
+      if (bri_direction > 0) {
+        new_bri = bri + offset;
+        if (new_bri > 255) new_bri = 255;
+      }
+      else {
+        new_bri = bri - offset;
+        if (new_bri < Settings.bri_min) new_bri = Settings.bri_min;
+      }
+      if (new_bri != bri) {
+#ifdef USE_DEVICE_GROUPS
+        SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE_MORE_TO_COME, DGR_ITEM_LIGHT_BRI, new_bri);
+#endif  // USE_DEVICE_GROUPS
+#ifdef USE_PWM_DIMMER_REMOTE
+        if (!active_device_is_local)
+          active_remote_pwm_dimmer->x_bri_power_on = active_remote_pwm_dimmer->bri = new_bri;
+        else {
+#endif  // USE_PWM_DIMMER_REMOTE
+          Settings.bri_power_on = target_bri = new_bri;
+          Settings.light_dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
+          PWMDimmerAnimate(true);
+#ifdef USE_PWM_DIMMER_REMOTE
+        }
+#endif  // USE_PWM_DIMMER_REMOTE
+      }
+    }
+  }
+
+  // If the button was just released, ...
+  else if (button_pressed[button_index]) {
+
+    // If the button was held, send a button off; otherwise, send a button toggle.
+    SendKey(KEY_BUTTON, button_index + 1, (button_hold_sent[button_index] ? POWER_OFF : POWER_TOGGLE));
+
+    // If this is about the power button, ...
+#ifdef USE_PWM_DIMMER_REMOTE
+    if (button_index == power_button_index) {
+#else // USE_PWM_DIMMER_REMOTE
+    if (!button_index) {
+#endif  // USE_PWM_DIMMER_REMOTE
+
+      // If we're ignoring the next power button released, ...
+      if (ignore_power_button_release) {
+        ignore_power_button_release = false;
+
+        // If the power button was held with no other buttons pressed, we changed the brightness so
+        // invert the bri direction for the next time and send a final update.
+        if (invert_power_button_bri_direction) {
+          invert_power_button_bri_direction = false;
+          dgr_item = DGR_ITEM_LIGHT_BRI;
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local) {
+            active_remote_pwm_dimmer->power_button_increases_bri ^= 1;
+            dgr_value = active_remote_pwm_dimmer->bri;
+          }
+          else {
+#endif  // USE_PWM_DIMMER_REMOTE
+            power_button_increases_bri ^= 1;
+            dgr_value = target_bri;
+#ifdef USE_PWM_DIMMER_REMOTE
+          }
+#endif  // USE_PWM_DIMMER_REMOTE
+        }
+
+        // The up and/or down buttons were pressed while the power button was pressed. Handle the
+        // options based on the number of times the buttons were pressed.
+        else {
+          switch (button_press_count[down_button_index]) {
+            case 1:
+              // Toggle the powered-off LED option.
+#ifdef USE_PWM_DIMMER_REMOTE
+              if (active_device_is_local) {
+#endif // USE_PWM_DIMMER_REMOTE
+                Settings.flag3.powered_off_led ^= 1;
+                PWMDimmerSetPoweredOffLed();
+#ifdef USE_PWM_DIMMER_REMOTE
+              }
+#endif // USE_PWM_DIMMER_REMOTE
+              break;
+            case 2:
+              // Toggle fading.
+              dgr_item = DGR_ITEM_LIGHT_FADE;
+#ifdef USE_PWM_DIMMER_REMOTE
+              if (!active_device_is_local) {
+                active_remote_pwm_dimmer->light_fade ^= 1;
+                dgr_value = active_remote_pwm_dimmer->light_fade;
+              }
+              else {
+#endif // USE_PWM_DIMMER_REMOTE
+                Settings.light_fade ^= 1;
+                dgr_value = Settings.light_fade;
+#ifdef USE_PWM_DIMMER_REMOTE
+              }
+#endif // USE_PWM_DIMMER_REMOTE
+              break;
+          }
+          button_press_count[down_button_index] = 0;
+
+          switch (button_press_count[up_button_index]) {
+            case 1:
+              // Toggle the LED timeout.
+#ifdef USE_PWM_DIMMER_REMOTE
+              if (active_device_is_local) {
+#endif // USE_PWM_DIMMER_REMOTE
+                Settings.flag.led_timeout ^= 1;
+                if (relay_is_on) PWMDimmerSetBrightnessLeds(Settings.flag.led_timeout ? -1 : 0);
+#ifdef USE_PWM_DIMMER_REMOTE
+              }
+#endif // USE_PWM_DIMMER_REMOTE
+              break;
+          }
+          button_press_count[up_button_index] = 0;
+        }
+      }
+
+      // If we're not ignoring the power button until it's released, toggle the power.
+      else {
+#ifdef USE_PWM_DIMMER_REMOTE
+        if (!active_device_is_local)
+          active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->x_bri_power_on;
+        else
+#endif  // USE_PWM_DIMMER_REMOTE
+          target_bri = Settings.bri_power_on;
+        toggle_power = true;
+      }
+    }
+
+    // If this is about the up or down buttons, ...
+    else {
+
+      // If the button was held, ...
+      if (button_was_held) {
+        button_was_held = false;
+
+        // If the button was tapped before it was held, we used the brightness LEDs to inidcate the
+        // operation so reset the brightness LEDs.
+        if (button_press_count[down_button_index] > 0 || button_press_count[up_button_index]) {
+          turn_off_brightness_leds_time = 0;
+          PWMDimmerSetBrightnessLeds(0);
+        }
+
+        // If the button was not tapped before it was held, we changed the brightness and sent
+        // updates with the more-to-come message type. Send a final update.
+        else {
+          dgr_item = DGR_ITEM_LIGHT_BRI;
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local)
+            dgr_value = active_remote_pwm_dimmer->bri;
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            dgr_value = target_bri;
+        }
+
+        // Reset the the button press count.
+        button_press_count[button_index] = 0;
+      }
+
+      // If the button was tapped (pressed and released quickly), increment the count of how many
+      // times this button has been pressed.
+      else if (button_hold_time[button_index] >= now) {
+        button_press_count[button_index]++;
+      }
+    }
+
+    // Flag the button as released.
+    button_pressed[button_index] = false;
+#ifdef USE_PWM_DIMMER_REMOTE
+    buttons_pressed--;
+#endif  // USE_PWM_DIMMER_REMOTE
+  }
+
+  if (toggle_power) {
+    power_t new_power;
+    uint8_t new_bri;
+#ifdef USE_DEVICE_GROUPS
+#ifdef USE_PWM_DIMMER_REMOTE
+    if (!active_device_is_local) {
+      active_remote_pwm_dimmer->power ^= 1;
+      new_power = active_remote_pwm_dimmer->power;
+      new_bri = active_remote_pwm_dimmer->bri;
+    }
+    else {
+#endif  // USE_PWM_DIMMER_REMOTE
+      new_power = power ^ 1;
+      new_bri = target_bri;
+#ifdef USE_PWM_DIMMER_REMOTE
+    }
+#endif  // USE_PWM_DIMMER_REMOTE
+    if (new_power)
+      SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_BRI, new_bri, DGR_ITEM_POWER, new_power);
+    else
+      SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE, DGR_ITEM_POWER, new_power);
+#endif  // USE_DEVICE_GROUPS
+
+#ifdef USE_PWM_DIMMER_REMOTE
+    // The target brightness has already been set. Execute the toggle power command with a source of
+    // SRC_RETRY. This will turn the power on using the current target brightness (see
+    // FUNC_SET_DEVICE_POWER below).
+    if (active_device_is_local)
+#endif  // USE_PWM_DIMMER_REMOTE
+      ExecuteCommandPower(1, POWER_TOGGLE, SRC_RETRY);
+  }
+
+  // If we're not toggling the power and we made changes, send a group update.
+  else if (dgr_item) {
+#ifdef USE_DEVICE_GROUPS
+    SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE_DIRECT, dgr_item, dgr_value);
+#endif  // USE_DEVICE_GROUPS
+    if (Settings.flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
+      MqttPublishTeleState();
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Commands
+\*********************************************************************************************/
+
+void CmndBriMin(void)
+{
+  uint8_t new_bri_min = Settings.bri_min;
+  if (XdrvMailbox.payload > 0 && XdrvMailbox.payload <= 255) {
+    new_bri_min = (XdrvMailbox.payload < 4 ? 4 : XdrvMailbox.payload);
+  }
+  else if (1 == XdrvMailbox.data_len) {
+    if ('-' == XdrvMailbox.data[0]) {
+      if (new_bri_min > 4) new_bri_min--;
+    }
+    else if ('+' == XdrvMailbox.data[0] && new_bri_min < 255)
+      new_bri_min++;
+  }
+
+  if (new_bri_min != Settings.bri_min) {
+    Settings.bri_min = new_bri_min;
+    PWMDimmerCheckBri(&Settings.bri_power_on);
+    PWMDimmerCheckBri(&Settings.bri_preset_low);
+    PWMDimmerCheckBri(&Settings.bri_preset_high);
+
+#ifdef DEVICE_GROUPS
+    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_MIN, Settings.bri_min,
+      DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
+      DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
+#endif  // DEVICE_GROUPS
+  }
+
+  ResponseCmndNumber(Settings.bri_min);
+}
+
+void CmndBriPreset(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    bool valid = true;
+    uint32_t value;
+    uint8_t parm[2];
+    parm[0] = Settings.bri_preset_low;
+    parm[1] = Settings.bri_preset_high;
+    char * ptr = XdrvMailbox.data;
+    for (uint32_t i = 0; i < 2; i++) {
+      while (*ptr == ' ') ptr++;
+      if (*ptr == '+') {
+        if (parm[i] < 255) parm[i]++;
+      }
+      else if (*ptr == '-') {
+        if (parm[i] > Settings.bri_min) parm[i]--;
+      }
+      else {
+        value = strtoul(ptr, &ptr, 0);
+        if (value < 1 || parm[i] > 255) {
+          valid = false;
+          break;
+        }
+        parm[i] = value;
+        PWMDimmerCheckBri(&parm[i]);
+        if (*ptr != ',') break;
+      }
+      ptr++;
+    }
+    if (valid && !*ptr) {
+      if (parm[0] < parm[1]) {
+        Settings.bri_preset_low = parm[0];
+        Settings.bri_preset_high = parm[1];
+      } else
+      {
+        Settings.bri_preset_low = parm[1];
+        Settings.bri_preset_high = parm[0];
+      }
+#ifdef DEVICE_GROUPS
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
+#endif  // DEVICE_GROUPS
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_BRI_PRESET "\":{\"Low\":%d,\"High\":%d}}"), Settings.bri_preset_low, Settings.bri_preset_high);
+}
+
+void PWMDmmerCmndDimmer(void)
+{
+  uint8_t dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
+  if (1 == XdrvMailbox.data_len) {
+    if ('+' == XdrvMailbox.data[0])
+      XdrvMailbox.payload = (dimmer > 89) ? 100 : dimmer + 10;
+    else if ('-' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (dimmer < 11) ? 1 : dimmer - 10;
+    }
+  }
+
+  if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 100) {
+    uint8_t bri = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
+#ifdef USE_DEVICE_GROUPS
+    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_BRI, bri);
+#endif  // USE_DEVICE_GROUPS
+    PWMDimmerSetBri(bri);
+  }
+
+  ResponseCmndNumber(Settings.light_dimmer);
+}
+
+void CmndLedTimeout(void)
+{
+  // Set the brightness LED timeout state.
+  switch (XdrvMailbox.payload) {
+  case 0: // Off
+  case 1: // On
+    Settings.flag.led_timeout = XdrvMailbox.payload;
+    break;
+  case 2: // Toggle
+    Settings.flag.led_timeout ^= 1;
+    break;
+  }
+  if (relay_is_on) PWMDimmerSetBrightnessLeds(0);
+  ResponseCmndStateText(Settings.flag.led_timeout);
+}
+
+void CmndPoweredOffLed(void)
+{
+  // Set the powered-off LED state.
+  switch (XdrvMailbox.payload) {
+  case 0: // Off
+  case 1: // On
+    Settings.flag3.powered_off_led = XdrvMailbox.payload;
+    break;
+  case 2: // Toggle
+    Settings.flag3.powered_off_led ^= 1;
+    break;
+  }
+  PWMDimmerSetPoweredOffLed();
+  ResponseCmndStateText(Settings.flag3.powered_off_led);
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv35(uint8_t function)
+{
+  bool result = false;
+
+  if (PWM_DIMMER != my_module_type) return result;
+
+  switch (function) {
+    case FUNC_LOOP:
+      if (current_bri != target_bri) PWMDimmerAnimate(false);
+      break;
+
+    case FUNC_EVERY_SECOND:
+      // Turn off the brightness LED's if it's time.
+      if (led_timeout_time && led_timeout_time < millis()) {
+        for (uint32_t index = 0; index < leds_present; index++) SetLedPowerIdx(index, 0);
+        led_timeout_time = 0;
+      }
+
+      // The powered-off LED is also the LedLink LED. If we lose the WiFi or MQTT server
+      // connection, the LED will be set to a blinking state and will be turned off when the
+      // connection is restored. If the state is blinking now, set a flag so we know that we need
+      // to restore it when it stops blinking.
+      if (global_state.data)
+        restore_powered_off_led = 5;
+      else if (restore_powered_off_led) {
+        PWMDimmerSetPoweredOffLed();
+        restore_powered_off_led--;
+      }
+      break;
+
+    case FUNC_BUTTON_PRESSED:
+      // Handle the button press/release instead of the button handler.
+      PWMDimmerHandleButton();
+      result = true;
+      break;
+
+#ifdef USE_DEVICE_GROUPS
+    case FUNC_DEVICE_GROUP_REQUEST:
+      PWMDimmerHandleDeviceGroupRequest();
+      break;
+#endif  // USE_DEVICE_GROUPS
+
+    case FUNC_SET_DEVICE_POWER:
+      // Handle turning the power on/off here so we can fade off. Set the target brightness and let
+      // Animate handle turning the power off/on. If the source is SRC_RETRY, we're turning the
+      // power on with a brightness preset and the target brightness has already been set.
+      if (!XdrvMailbox.index)
+        target_bri = 0;
+      else if (SRC_RETRY != XdrvMailbox.payload) {
+        target_bri = Settings.bri_power_on;
+        Settings.light_dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
+      }
+      result = true;
+      break;
+
+    case FUNC_COMMAND:
+      result = DecodeCommand(kPWMDimmerCommands, PWMDimmerCommand);
+      break;
+
+    case FUNC_INIT:
+      PWMDimmerInit();
+      break;
+
+    case FUNC_PRE_INIT:
+#ifdef USE_PWM_DIMMER_REMOTE
+      // If remote device mode is enabled, set the device group count to the number of buttons
+      // present.
+      if (Settings.flag3.remote_device_mode) {
+        for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
+          if (pin[GPIO_KEY1 + button_index] < 99) device_group_count++;
+        }
+      }
+#endif  // USE_PWM_DIMMER_REMOTE
+      break;
+
+    case FUNC_MODULE_INIT:
+      PWMModuleInit();
+      result = true;
+      break;
+  }
+  return result;
+}
+
+#endif  // USE_PWM_DIMMER
\ No newline at end of file
diff --git a/tasmota/xsns_06_dht_v5.ino b/tasmota/xsns_06_dht_v5.ino
index f08286b43..9c7003970 100644
--- a/tasmota/xsns_06_dht_v5.ino
+++ b/tasmota/xsns_06_dht_v5.ino
@@ -100,6 +100,7 @@ bool DhtRead(uint32_t sensor)
       break;
   }
 
+/*
   bool error = false;
   noInterrupts();
   if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
@@ -127,6 +128,22 @@ bool DhtRead(uint32_t sensor)
   }
   interrupts();
   if (error) { return false; }
+*/
+
+  uint32_t i = 0;
+  noInterrupts();
+  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
+    for (i = 0; i < 40; i++) {
+      if (!DhtWaitState(sensor, 1)) { break; }
+      delayMicroseconds(35);                          // Was 30
+      if (digitalRead(Dht[sensor].pin)) {
+        dht_data[i / 8] |= (1 << (7 - i % 8));
+      }
+      if (!DhtWaitState(sensor, 0)) { break; }
+    }
+  }
+  interrupts();
+  if (i < 40) { return false; }
 
   uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
   if (dht_data[4] != checksum) {
diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index 8527c9749..f1db19d74 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -21,6 +21,9 @@
   Version yyyymmdd  Action    Description
   --------------------------------------------------------------------------------------------
 
+  0.9.3.0 20200222  integrate - use now the correct id-word instead of MAC-OUI, 
+                                add CGG1
+  ---
   0.9.2.0 20200212  integrate - "backports" from MI-HM10, change reading pattern, 
                                 add missing PDU-types, renaming driver
   ---
@@ -58,18 +61,21 @@
 #define MJ_HT_V1    2
 #define LYWSD02     3
 #define LYWSD03     4
+#define CGG1        5
 
-uint8_t kMINRFSlaveID[4][3]  = { 0xC4,0x7C,0x8D, // Flora
-                                0x58,0x2D,0x34, // MJ_HT_V1
-                                0xE7,0x2E,0x00, // LYWSD02
-                                0xA4,0xC1,0x38, // LYWSD03
-                                };
+const uint16_t kMINRFSlaveID[5]={ 0x0098, // Flora
+                                  0x01aa, // MJ_HT_V1
+                                  0x045b, // LYWSD02
+                                  0x055b, // LYWSD03
+                                  0x0347  // CGG1
+                                  };
 
 const char kMINRFSlaveType1[] PROGMEM = "Flora";
 const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
 const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
 const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
-const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4};
+const char kMINRFSlaveType5[] PROGMEM = "CGG1";
+const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4,kMINRFSlaveType5};
 
 // PDU's or different channels 37-39
 const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
@@ -77,10 +83,11 @@ const uint32_t kMINRFMJPDU[3]  = {0x4760cd66,0xdbcc0cd3,0x33048df5};
 const uint32_t kMINRFL2PDU[3]  = {0x3eaa057d,0xef3b0730,0x71da7646}; // 1 and 3 unsure
 // const uint32_t kMINRFL3PDU[3]  = {0x4760dd78,0xdbcc1ccd,0xffffffff}; //encrypted - 58 58
 const uint32_t kMINRFL3PDU[3]  = {0x4760cb78,0xdbcc0acd,0x33048beb}; //unencrypted  - 30 58
+const uint32_t kMINRFCGPDU[3]  = {0x4760cd6e,0xdbcc0cdb,0x33048dfd};
 
 // start-LSFR for different channels 37-39
 const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};  // Flora, LYWSD02
-const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};  // MJ_HT_V1, LYWSD03, CGG1
 
 
 #pragma pack(1)  // important!!
@@ -269,7 +276,7 @@ struct {
 } MINRF;
 
 struct mi_sensor_t{
-  uint8_t type; //Flora = 1; MJ_HT_V1=2; LYWSD02=3; LYWSD03=4
+  uint8_t type; //Flora = 1; MJ_HT_V1=2; LYWSD02=3; LYWSD03=4; ; CGG1=5
   uint8_t serial[6];
   uint8_t showedUp;
   float temp; //Flora, MJ_HT_V1, LYWSD0x
@@ -362,6 +369,9 @@ bool MINRFreceivePacket(void)
       case 4:
       MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "LYWSD03" mode
       break;
+      case 5:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer),  kMINRFlsfrList_B[MINRF.currentChan]); // "CGG1" mode
+      break;
     }
     // DEBUG_SENSOR_LOG(PSTR("MINRF: LSFR:%x"),_lsfr);
     // if (_lsfr>254) _lsfr=0;
@@ -470,6 +480,9 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
       if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
       NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);// 95 fe 58 30 -> LYWSD03 (= no data message)
     break;
+    case 5: // special CGG1 packet
+      NRF24radio.openReadingPipe(0,kMINRFCGPDU[_nextchannel]); // 95 fe 50 30 -> CGG1
+    break;
   }
   // DEBUG_SENSOR_LOG(PSTR("MINRF: Change Mode to %u"),_mode);
   MINRF.packetMode = _mode;
@@ -479,24 +492,25 @@ void MINRFchangePacketModeTo(uint8_t _mode) {
  * @brief Return the slot number of a known sensor or return create new sensor slot
  *
  * @param _serial     BLE address of the sensor
- * @param _type       Type number of the sensor, 0xff for Auto-type
+ * @param _type       Type number of the sensor
  * @return uint32_t   Known or new slot in the sensors-vector
  */
-uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  if(_type==0xff){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: will test MAC-type"));
-    for (uint32_t i=0;i<4;i++){
-      if(memcmp(_serial,kMINRFSlaveID+i,3)==0){
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC is type %u"), i);
-        _type = i+1;
-      }
-      else {
-        DEBUG_SENSOR_LOG(PSTR("MINRF: MAC-type is unknown"));
-      }
+uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint16_t _type){
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: will test ID-type: %x"), _type);
+  bool _success = false;
+  for (uint32_t i=0;i<5;i++){
+    if(_type == kMINRFSlaveID[i]){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID is type %u"), i);
+      _type = i+1;
+      _success = true;
+    }
+    else {
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID-type is not: %x"),kMINRFSlaveID[i]);
     }
   }
-  if(_type==0xff) return _type; // error
-
+  if(!_success) return 0xff;
+ 
   DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
   for(uint32_t i=0; i<MIBLEsensors.size(); i++){
     if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
@@ -550,13 +564,13 @@ void MINRFpurgeFakeSensors(void){
 
 
 void MINRFhandleFloraPacket(void){
-  if(MINRF.buffer.floraPacket.T.idWord!=0x9800 && MINRF.buffer.floraPacket.T.valueTen!=0x10){
+  if(MINRF.buffer.floraPacket.T.valueTen!=0x10){
     DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
     MINRF_LOG_BUFFER(MINRF.buffer.raw);
     return;
   }
   MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, 0xff); // T is not specific, any struct would be possible to use
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, MINRF.buffer.floraPacket.T.idWord); // T is not specific, any struct would be possible to use
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
   if(_slot==0xff) return;
 
@@ -593,13 +607,13 @@ void MINRFhandleFloraPacket(void){
 }
 
 void MINRFhandleMJ_HT_V1Packet(void){
-  if(MINRF.buffer.MJ_HT_V1Packet.TH.idWord != 0xaa01 && MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
     DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
     MINRF_LOG_BUFFER(MINRF.buffer.raw);
     return;
   }
   MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, 0xff); // B would be possible too
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord); // B would be possible too
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
   if(_slot==0xff) return;
 
@@ -635,9 +649,9 @@ void MINRFhandleLYWSD02Packet(void){
     return;
   }
   MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff); // H would be possible too
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord); // H would be possible too
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-    if(_slot==0xff) return;
+  if(_slot==0xff) return;
 
   static float _tempFloat;
   switch(MINRF.buffer.LYWSD02Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
@@ -661,7 +675,7 @@ void MINRFhandleLYWSD02Packet(void){
 void MINRFhandleLYWSD03Packet(void){
   // not much to do ATM, just show the sensor without data
   MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial); //the beginning is equal to the LYWSD02-packet
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, 0xff);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
   DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
     if(_slot==0xff) return;
 
@@ -670,6 +684,46 @@ void MINRFhandleLYWSD03Packet(void){
   MINRF_LOG_BUFFER(MINRF.buffer.raw);
 }
 
+void MINRFhandleCGG1Packet(void){ // we assume, that the packet structure is equal to the MJ_HT_V1
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected CGG1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord); // B would be possible too
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) { // we can use any struct with a mode, they are all same at this point
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp,  MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
+/*********************************************************************************************\
+ * Main loop of the driver
+\*********************************************************************************************/
+
 void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   
   if(MINRF.timer>6000){ // happens every 6000/20 = 300 seconds
@@ -712,15 +766,16 @@ void MINRF_EVERY_50_MSECOND() { // Every 50mseconds
   else if (MINRF.packetMode == LYWSD03){
     MINRFhandleLYWSD03Packet();
   }
-  
-  // DEBUG_SENSOR_LOG(PSTR("MINRF: Change packet mode every 50 msec"));
-  if (MINRF.packetMode == LYWSD03){
+  else if (MINRF.packetMode == CGG1){
+    MINRFhandleCGG1Packet();
+  }
+  if (MINRF.packetMode == CGG1){
     MINRFinitBLE(1); // no real ble packets in release mode, otherwise for developing use 0
   }
   else {
     MINRFinitBLE(++MINRF.packetMode);
   }
-  
+
   MINRFhopChannel();
   NRF24radio.startListening();
 }
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 210175de8..3838d8faf 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -193,7 +193,7 @@ a_features = [[
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
-    "USE_AHT1x","","",""
+    "USE_AHT1x","USE_WEMOS_MOTOR_V1","",""
     ],[
     "","","","",
     "","","","",
@@ -236,7 +236,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200220 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200222 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 2b94cd77a0a474a363d4f43223dffa1578e82214 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 07:34:30 -0600
Subject: [PATCH 317/403] Build with device groups, pwm dimmer (with remote)

---
 tasmota/my_user_config.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 353dc1130..0ae6d4663 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,9 +415,9 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//  #define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
-//  #define USE_PWM_DIMMER                          // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
-//  #define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
+#define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
+#define USE_PWM_DIMMER                          // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+#define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //

From 9682da603a817cde2782582b960dfcf5f60e2e4e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 24 Feb 2020 16:47:41 +0100
Subject: [PATCH 318/403] Add Device Group storage

Add Device Group storage (#7786)
---
 tasmota/settings.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index b1afca3ea..7952dd9cf 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -104,7 +104,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t alexa_ct_range : 1;           // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
     uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
-    uint32_t spare03 : 1;
+    uint32_t device_groups_enabled : 1;    // bit 3 (v8.1.0.9)   - SetOption85 - Enable Device Groups
     uint32_t spare04 : 1;
     uint32_t spare05 : 1;
     uint32_t spare06 : 1;
@@ -467,8 +467,10 @@ struct SYSCFG {
   uint8_t       hotplug_scan;              // F03
   uint8_t       reserved1;                 // F04 - reserved for s-hadinger
 
-  uint8_t       free_f05[207];             // F05
+  uint8_t       free_f05[199];             // F05
 
+  uint32_t      device_group_share_in;     // FCC - Bitmask of device group items imported
+  uint32_t      device_group_share_out;    // FD0 - Bitmask of device group items exported
   uint32_t      bootcount_reset_time;      // FD4
   int           adc_param4;                // FD8
   uint32_t      shutter_button[MAX_KEYS];  // FDC

From 5ec1ab83edb7257015d524b79776ca23234d603b Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Mon, 24 Feb 2020 17:25:03 +0100
Subject: [PATCH 319/403] extend TX2x sensor stats

new JSON for TX2x (for legacy format define USE_TX2x_LEGACY_JSON)
exp weighted average prevents jump in avg values after period
refactor sensor reading
---
 tasmota/language/bg-BG.h |   2 +
 tasmota/language/cs-CZ.h |   2 +
 tasmota/language/de-DE.h |   8 ++-
 tasmota/language/el-GR.h |   2 +
 tasmota/language/en-GB.h |   2 +
 tasmota/language/es-ES.h |   2 +
 tasmota/language/fr-FR.h |   2 +
 tasmota/language/he-HE.h |   2 +
 tasmota/language/hu-HU.h |   2 +
 tasmota/language/it-IT.h |   2 +
 tasmota/language/ko-KO.h |   4 +-
 tasmota/language/nl-NL.h |   2 +
 tasmota/language/pl-PL.h |   2 +
 tasmota/language/pt-BR.h |   2 +
 tasmota/language/pt-PT.h |   2 +
 tasmota/language/ru-RU.h |   2 +
 tasmota/language/sk-SK.h |   2 +
 tasmota/language/sv-SE.h |   2 +
 tasmota/language/tr-TR.h |   2 +
 tasmota/language/uk-UA.h |   2 +
 tasmota/language/zh-CN.h |   2 +
 tasmota/language/zh-TW.h |   2 +
 tasmota/xsns_35_tx20.ino | 140 ++++++++++++++++++++++++---------------
 23 files changed, 134 insertions(+), 58 deletions(-)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index be2fceb3c..8acbff8e1 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Посока на вятъра"
+#define D_TX20_WIND_DEGREES "Степени на вятъра"
 #define D_TX20_WIND_SPEED "Скорост на вятъра"
 #define D_TX20_WIND_SPEED_AVG "Средна скорост на вятъра"
+#define D_TX20_WIND_SPEED_MIN "Мини. скорост на вятъра"
 #define D_TX20_WIND_SPEED_MAX "Макс. скорост на вятъра"
 #define D_TX20_NORTH "С"
 #define D_TX20_EAST "И"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 6ef51f27d..2d15ac443 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Směr větru"
+#define D_TX20_WIND_DEGREES "Úhel větru"
 #define D_TX20_WIND_SPEED "Rychlost větru"
 #define D_TX20_WIND_SPEED_AVG "Průměrná rychlost větru"
+#define D_TX20_WIND_SPEED_MIN "Minimální rychlost větru"
 #define D_TX20_WIND_SPEED_MAX "Maximální rychlost větru"
 #define D_TX20_NORTH "S"
 #define D_TX20_EAST "V"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index cf2aa258b..e87624bfa 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -503,10 +503,12 @@
 #define D_CALIBRATION "Kalibrierung"
 
 //xsns_35_tx20.ino
-#define D_TX20_WIND_DIRECTION "Wind Richtung"
+#define D_TX20_WIND_DIRECTION "Windrichtung"
+#define D_TX20_WIND_DEGREES "Windrichtung Grad"
 #define D_TX20_WIND_SPEED "Windgeschwindigkeit"
-#define D_TX20_WIND_SPEED_AVG "Ø Windgeschwindigkeit"
-#define D_TX20_WIND_SPEED_MAX "max Windgeschwindigkeit"
+#define D_TX20_WIND_SPEED_AVG "Windgeschwindigkeit Ø"
+#define D_TX20_WIND_SPEED_MIN "Windgeschwindigkeit Min"
+#define D_TX20_WIND_SPEED_MAX "Windgeschwindigkeit Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "O"
 #define D_TX20_SOUTH "S"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index b3608bb7b..dbeb71a68 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Κατεύθυνση ανέμου"
+#define D_TX20_WIND_DEGREES "Βαθμός ανέμου"
 #define D_TX20_WIND_SPEED "Ταχύτητα ανέμου"
 #define D_TX20_WIND_SPEED_AVG "Μέση ταχύτητα ανέμου"
+#define D_TX20_WIND_SPEED_MIN "Ελάχιστη ταχύτητα ανέμου"
 #define D_TX20_WIND_SPEED_MAX "Μέγιστη ταχύτητα ανέμου"
 #define D_TX20_NORTH "Β"
 #define D_TX20_EAST "Α"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 66a6e0243..792c2b597 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
+#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
 #define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
+#define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 59916f487..77e7c6047 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Dirección del Viento"
+#define D_TX20_WIND_DEGREES "Ángulo del Viento"
 #define D_TX20_WIND_SPEED "Vel. del Viento"
 #define D_TX20_WIND_SPEED_AVG "Vel. Prom. del Viento"
+#define D_TX20_WIND_SPEED_MIN "Vel. Min. del Viento"
 #define D_TX20_WIND_SPEED_MAX "Vel. Max. del Viento"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index 5356848d8..a63955ab7 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -504,8 +504,10 @@
 
 //xsns_35_TX20.ino
 #define D_TX20_WIND_DIRECTION "Direction du vent"
+#define D_TX20_WIND_DEGREES "Degré de vent"
 #define D_TX20_WIND_SPEED "Vitesse du vent"
 #define D_TX20_WIND_SPEED_AVG "Vitesse Moy."
+#define D_TX20_WIND_SPEED_MIN "Vitesse Min"
 #define D_TX20_WIND_SPEED_MAX "Vitesse Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index fa3b07a31..86af3c35a 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "כיוון הרוח"
+#define D_TX20_WIND_DEGREES "זווית הרוח"
 #define D_TX20_WIND_SPEED "מהירות הרוח"
 #define D_TX20_WIND_SPEED_AVG "מהירות הרוח ממוצעת"
+#define D_TX20_WIND_SPEED_MIN "מהירות הרוח היא מינימלית"
 #define D_TX20_WIND_SPEED_MAX "מהירות הרוח מקסימלית"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index 541d0c783..d9348dde1 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Szélirány"
+#define D_TX20_WIND_DEGREES "Szél mértéke"
 #define D_TX20_WIND_SPEED "Szélsebesség"
 #define D_TX20_WIND_SPEED_AVG "Átlag szélsebesség"
+#define D_TX20_WIND_SPEED_MIN "Min. szélsebesség"
 #define D_TX20_WIND_SPEED_MAX "Max. szélsebesség"
 #define D_TX20_NORTH "É"
 #define D_TX20_EAST "K"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index 62127ef24..e5ee2f1aa 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direzione Vento"
+#define D_TX20_WIND_DEGREES "Angolo Vento"
 #define D_TX20_WIND_SPEED "Velocità Vento"
 #define D_TX20_WIND_SPEED_AVG "Velocità Media Vento"
+#define D_TX20_WIND_SPEED_MIN "Velocità Minima Vento"
 #define D_TX20_WIND_SPEED_MAX "Velocità Massima Vento"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 2a20ce2d0..f8cd83e99 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -504,9 +504,11 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "풍향"
+#define D_TX20_WIND_DEGREES "바람 정도"
 #define D_TX20_WIND_SPEED "풍속"
 #define D_TX20_WIND_SPEED_AVG "평균 풍속"
-#define D_TX20_WIND_SPEED_MAX "최대 풍속"
+#define D_TX20_WIND_SPEED_MIN "풍속 최소"
+#define D_TX20_WIND_SPEED_MAX "풍속 최대"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
 #define D_TX20_SOUTH "S"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 658f18547..bc9b1876e 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Windrichting"
+#define D_TX20_WIND_DEGREES "Wind graad"
 #define D_TX20_WIND_SPEED "Windsnelheid"
 #define D_TX20_WIND_SPEED_AVG "Windsnelheid gemiddeld"
+#define D_TX20_WIND_SPEED_MIN "Windsnelhied minimum"
 #define D_TX20_WIND_SPEED_MAX "Windsnelhied maximaal"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index e2d59a2dc..9cc522fa7 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Kierunek"
+#define D_TX20_WIND_DEGREES "Grad"
 #define D_TX20_WIND_SPEED "Prędkość"
 #define D_TX20_WIND_SPEED_AVG "Średnia prędkość"
+#define D_TX20_WIND_SPEED_MIN "Minimalna prędkość"
 #define D_TX20_WIND_SPEED_MAX "Maksymalna prędkość"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index da386917c..4909fc08c 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direção do vento"
+#define D_TX20_WIND_DEGREES "Ângulo do vento"
 #define D_TX20_WIND_SPEED "Velocidade do vento"
 #define D_TX20_WIND_SPEED_AVG "Velocidade média do vento"
+#define D_TX20_WIND_SPEED_MIN "Velocidade do vento Mínima"
 #define D_TX20_WIND_SPEED_MAX "Velocidade do vento Máxima"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "L"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 1f9c36a6b..1e49c449c 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direção do vento"
+#define D_TX20_WIND_DEGREES "Ângulo do vento"
 #define D_TX20_WIND_SPEED "Velocidade do vento"
 #define D_TX20_WIND_SPEED_AVG "Velocidade média do vento"
+#define D_TX20_WIND_SPEED_MIN "Velocidade mínima do vento"
 #define D_TX20_WIND_SPEED_MAX "Velocidade máxima do vento"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 846a653ac..a312000b7 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
+#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
 #define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
+#define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index f335ca42d..f5041901a 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Smer vetra"
+#define D_TX20_WIND_DEGREES "Uhol vetra"
 #define D_TX20_WIND_SPEED "Rýchlosť vetra"
 #define D_TX20_WIND_SPEED_AVG "Priemerná rýchlosť vetra"
+#define D_TX20_WIND_SPEED_MIN "Minimálna rýchlosť vetra"
 #define D_TX20_WIND_SPEED_MAX "Maximálna rýchlosť vetra"
 #define D_TX20_NORTH "S"
 #define D_TX20_EAST "V"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 9485c1f4e..7741c8937 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Vindriktning"
+#define D_TX20_WIND_DEGREES "Vindvinkel"
 #define D_TX20_WIND_SPEED "Vindstyrka"
 #define D_TX20_WIND_SPEED_AVG "Vindstyrka medel"
+#define D_TX20_WIND_SPEED_MIN "Vindstyrka min"
 #define D_TX20_WIND_SPEED_MAX "Vindstyrka max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "Ö"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index ee2a548ae..51f0a3ddb 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
+#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
 #define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
+#define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 98a352ea7..a7bcfa5da 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Напрям вітру"
+#define D_TX20_WIND_DEGREES "Кут вітру"
 #define D_TX20_WIND_SPEED "Швидкість вітру"
 #define D_TX20_WIND_SPEED_AVG "Середня швидкість вітру"
+#define D_TX20_WIND_SPEED_MIN "Мінімальна швидкість вітру"
 #define D_TX20_WIND_SPEED_MAX "Максимальна швидкість вітру"
 #define D_TX20_NORTH "Пн"
 #define D_TX20_EAST "Сх"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index c46d353ea..53e05b1f4 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "风向"
+#define D_TX20_WIND_DEGREES "风度"
 #define D_TX20_WIND_SPEED "风速"
 #define D_TX20_WIND_SPEED_AVG "平均风速"
+#define D_TX20_WIND_SPEED_MIN "最低风速"
 #define D_TX20_WIND_SPEED_MAX "最高风速"
 #define D_TX20_NORTH "北"
 #define D_TX20_EAST "东"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 118aeb501..2e9994046 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -504,8 +504,10 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
+#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
 #define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
+#define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
 #define D_TX20_EAST "E"
diff --git a/tasmota/xsns_35_tx20.ino b/tasmota/xsns_35_tx20.ino
index 850c7deda..14fd5c9f9 100644
--- a/tasmota/xsns_35_tx20.ino
+++ b/tasmota/xsns_35_tx20.ino
@@ -41,7 +41,8 @@
 #define XSNS_35                  35
 
 #define TX2X_BIT_TIME          1220  // microseconds
-#define TX2X_RESET_VALUES        60  // seconds
+#define TX2X_WEIGHT_AVG_SAMPLE  150  // seconds
+#define TX23_READ_INTERVAL        4  // seconds (don't use less than 3)
 
 // The Arduino standard GPIO routines are not enough,
 // must use some from the Espressif SDK as well
@@ -59,8 +60,9 @@ extern "C" {
 const char HTTP_SNS_TX2X[] PROGMEM =
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MIN "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s (%s&deg;){e}";
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s %s&deg;{e}";
 #endif  // USE_WEBSERVER
 
 const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
@@ -88,11 +90,12 @@ uint16_t tx2x_sc = 0;
 uint16_t tx2x_sf = 0;
 
 float tx2x_wind_speed_kmh = 0;
+float tx2x_wind_speed_min = 200.0;
 float tx2x_wind_speed_max = 0;
 float tx2x_wind_speed_avg = 0;
-float tx2x_wind_sum = 0;
-int tx2x_count = 0;
 uint8_t tx2x_wind_direction = 0;
+int tx2x_count = 0;
+uint16_t tx2x_avg_samples;
 
 bool tx2x_available = false;
 
@@ -121,7 +124,6 @@ void TX2xStartRead(void)
    * La Crosse TX23 Anemometer datagram after setting TxD to low/high
    * 1-1 0 1 0-0 11011 0011 111010101111 0101 1100 000101010000 1-1 - Received pin data at 1200 uSec per bit
    *     t s c   sa    sb   sc           sd   se   sf
-   *     1 0 1-1 00100 1100 000101010000 1010 1100 000101010000     - sa to sd inverted user data, LSB first
    * t  - host pulls TxD low - signals TX23 to sent measurement
    * s  - TxD released - TxD is pulled high due to pullup
    * c  - TX23U pulls TxD low - calculation in progress
@@ -152,26 +154,8 @@ void TX2xStartRead(void)
       for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
         uint8_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
 #ifdef USE_TX23_WIND_SENSOR
-        if (bitcount > 41 - 5) {
-          // start
-          tx2x_sa = (tx2x_sa << 1) | (dpin);
-        } else if (bitcount > 41 - 5 - 4) {
-          // wind dir
-          tx2x_sb = tx2x_sb >> 1 | ((dpin) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12) {
-          // windspeed
-          tx2x_sc = tx2x_sc >> 1 | ((dpin) << 11);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
-          // checksum
-          tx2x_sd = tx2x_sd >> 1 | ((dpin) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
-          // wind dir (invert)
-          tx2x_se = tx2x_se >> 1 | ((dpin ^ 1) << 3);
-        } else {
-          // windspeed (invert)
-          tx2x_sf = tx2x_sf >> 1 | ((dpin ^ 1) << 11);
-        }
-#else
+        dpin ^= 1;
+#endif
         if (bitcount > 41 - 5) {
           // start frame (invert)
           tx2x_sa = (tx2x_sa << 1) | (dpin ^ 1);
@@ -191,23 +175,14 @@ void TX2xStartRead(void)
           // windspeed
           tx2x_sf = tx2x_sf >> 1 | (dpin << 11);
         }
-#endif
         delayMicroseconds(TX2X_BIT_TIME);
       }
 
       uint8_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
       chk &= 0xf;
 
-#ifdef USE_TX23_WIND_SENSOR
       // check checksum, non-inverted with inverted values and max. speed
-      if ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
-        tx2x_available = true;
-      }
-#else
-      if ((chk == tx2x_sd) && (tx2x_sc < 511)) {  // if checksum seems to be ok and wind speed below 51.1 m/s
-        tx2x_available = true;
-      }
-#endif
+      tx2x_available = ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511));
 #ifdef USE_TX23_WIND_SENSOR
     }
     tx23_stage++;
@@ -219,49 +194,82 @@ void TX2xStartRead(void)
   GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX2X_TXD_BLACK]);
 }
 
-void Tx2xReset(void) 
+void Tx2xResetStat(void) 
 {
+  tx2x_wind_speed_min = tx2x_wind_speed_kmh;
+  tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+  uint16_t tx2x_prev_avg_samples = tx2x_avg_samples;
+  if (Settings.tele_period) {
+    // number for avg samples = teleperiod value if set
+    tx2x_avg_samples = Settings.tele_period;
+  } else {
+    // otherwise use default number of samples for this driver
+    tx2x_avg_samples = TX2X_WEIGHT_AVG_SAMPLE;
+  }
+  if (tx2x_prev_avg_samples != tx2x_avg_samples) {
+    tx2x_wind_speed_avg = tx2x_wind_speed_kmh;
     tx2x_count = 0;
-    tx2x_wind_sum = 0;
-    tx2x_wind_speed_max = 0;
+  }
 }
 
 void Tx2xRead(void)
 {
 #ifdef USE_TX23_WIND_SENSOR
+  // TX23 needs to trigger start transmission - TxD Line
+  // ___________      _             ___   ___
+  //            |____| |___________|   |_|   |__XXXXXXXXXX
+  //           trigger  start conv  Startframe  Data
+  //
   // note: TX23 speed calculation is unstable when conversion starts 
   //       less than 2 seconds after last request
-  if ((uptime % 3)==0) {
+  if ((uptime % TX23_READ_INTERVAL)==0) {
     // TX23 start transmission by pulling down TxD line for at minimum 500ms
     // so we pull TxD signal to low every 3 seconds
     tx23_stage = 0;
     pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
     digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
-  } else if ((uptime % 3)==1) {
-    // after pulling down TxD every 3 second we pull-up TxD every 3+1 seconds
-    // to trigger start transmission
+  } else if ((uptime % TX23_READ_INTERVAL)==1) {
+    // after pulling down TxD: pull-up TxD every x+1 seconds
+    // to trigger TX23 start transmission
     tx23_stage = 1; // first rising signal is invalid
     pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT_PULLUP);
   }
 #endif
-  if (0==Settings.tele_period && !(uptime % TX2X_RESET_VALUES)) {
-    Tx2xReset();
+  if (0!=Settings.tele_period && Settings.tele_period!=tx2x_avg_samples) {
+    // new teleperiod value
+    Tx2xResetStat();
   }
-  else if (tx2x_available) {
+  if (tx2x_available) {
     // Wind speed spec: 0 to 180 km/h (0 to 50 m/s)
     tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+    if (tx2x_wind_speed_kmh < tx2x_wind_speed_min) {
+      tx2x_wind_speed_min = tx2x_wind_speed_kmh;
+    }
     if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
       tx2x_wind_speed_max = tx2x_wind_speed_kmh;
     }
-    tx2x_count++;
-    tx2x_wind_sum += tx2x_wind_speed_kmh;
-    tx2x_wind_speed_avg = tx2x_wind_sum / tx2x_count;
+    // exponentially weighted average is not quite as smooth as the arithmetic average 
+    // but close enough to the moving average and does not require the regular reset 
+    // of the divider with the associated jump in avg values after period is over
+    if (tx2x_count <= tx2x_avg_samples) {
+      tx2x_count++;
+    }
+    tx2x_wind_speed_avg -= tx2x_wind_speed_avg / tx2x_count;
+    tx2x_wind_speed_avg += tx2x_wind_speed_kmh / tx2x_count;
+
     tx2x_wind_direction = tx2x_sb;
+
+    if (!(uptime % tx2x_avg_samples)) {
+      tx2x_wind_speed_min = tx2x_wind_speed_kmh;
+      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+
+    }
   }
 }
 
 void Tx2xInit(void) 
 {
+  Tx2xResetStat();
 #ifdef USE_TX23_WIND_SENSOR
   tx23_stage = 0;
   pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
@@ -276,22 +284,46 @@ void Tx2xShow(bool json)
 {
   char wind_speed_string[33];
   dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
+  char wind_speed_min_string[33];
+  dtostrfd(tx2x_wind_speed_min, 1, wind_speed_min_string);
   char wind_speed_max_string[33];
   dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
   char wind_speed_avg_string[33];
   dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
+  char wind_direction_degree_string[33];
+  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree_string);
   char wind_direction_string[4];
   GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx2x_wind_direction, kTx2xDirections);
-  char wind_direction_degree[33];
-  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree);
 
   if (json) {
+#ifdef USE_TX2x_LEGACY_JSON
     ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
       wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
-    Tx2xReset();
+#else
+    // new format grouped by Speed and Dir(ection)
+    // Card = cardianal (N../O../S../W..)
+    // Deg = Degree
+    ResponseAppend_P(
+      PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Direction\":{\"Cardinal\":\"%s\",\"Degree\":%s}}"),
+      wind_speed_string, 
+      wind_speed_avg_string, 
+      wind_speed_min_string, 
+      wind_speed_max_string, 
+      wind_direction_string, 
+      wind_direction_degree_string
+    );
+#endif
 #ifdef USE_WEBSERVER
   } else {
-    WSContentSend_PD(HTTP_SNS_TX2X, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
+    WSContentSend_PD(
+      HTTP_SNS_TX2X, 
+      wind_speed_string, 
+      wind_speed_avg_string, 
+      wind_speed_min_string, 
+      wind_speed_max_string, 
+      wind_direction_string, 
+      wind_direction_degree_string
+    );
 #endif  // USE_WEBSERVER
   }
 }
@@ -313,11 +345,11 @@ bool Xsns35(uint8_t function)
         Tx2xRead();
         break;
       case FUNC_JSON_APPEND:
-        Tx2xShow(1);
+        Tx2xShow(true);
         break;
 #ifdef USE_WEBSERVER
       case FUNC_WEB_SENSOR:
-        Tx2xShow(0);
+        Tx2xShow(false);
         break;
 #endif  // USE_WEBSERVER
     }

From e25f14f37aa97361159e536856b8cb81d08d1548 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Thu, 20 Feb 2020 20:50:46 +0100
Subject: [PATCH 320/403] Jarolift shutter working with keeloq

---
 lib/KeeloqLib/README.md                       |  12 +
 lib/KeeloqLib/keywords.txt                    |  20 +
 lib/KeeloqLib/library.properties              |   9 +
 lib/KeeloqLib/src/KeeloqLib.cpp               |  58 ++
 lib/KeeloqLib/src/KeeloqLib.h                 |  28 +
 .../tests/KeeloqLibTest/KeeloqLibTest.ino     |  27 +
 lib/cc1101/README.md                          |   1 +
 lib/cc1101/cc1101.cpp                         | 548 +++++++++++++++++
 lib/cc1101/cc1101.h                           | 548 +++++++++++++++++
 lib/cc1101/cc1101.h.txt                       | 549 ++++++++++++++++++
 lib/cc1101/ccpacket.h                         |  70 +++
 tasmota/my_user_config.h                      |   1 +
 tasmota/settings.h                            |   6 +-
 tasmota/xdrv_35_keeloq.ino                    | 275 +++++++++
 14 files changed, 2151 insertions(+), 1 deletion(-)
 create mode 100644 lib/KeeloqLib/README.md
 create mode 100644 lib/KeeloqLib/keywords.txt
 create mode 100644 lib/KeeloqLib/library.properties
 create mode 100644 lib/KeeloqLib/src/KeeloqLib.cpp
 create mode 100644 lib/KeeloqLib/src/KeeloqLib.h
 create mode 100644 lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
 create mode 100644 lib/cc1101/README.md
 create mode 100644 lib/cc1101/cc1101.cpp
 create mode 100644 lib/cc1101/cc1101.h
 create mode 100644 lib/cc1101/cc1101.h.txt
 create mode 100644 lib/cc1101/ccpacket.h
 create mode 100644 tasmota/xdrv_35_keeloq.ino

diff --git a/lib/KeeloqLib/README.md b/lib/KeeloqLib/README.md
new file mode 100644
index 000000000..5b8e5b77d
--- /dev/null
+++ b/lib/KeeloqLib/README.md
@@ -0,0 +1,12 @@
+## Keeloq encryption algorithm    
+This implementations might be useful if you are playing around with [Microchip Keeloq](http://www.microchip.com/pagehandler/en-us/technology/embeddedsecurity/technology/keeloqencoderdl.html) chips.    
+I verified that this algorithm gives the same results as that produced by the Microchip SDK for several test cases.      
+The Keeloq algorithm is not patented.       
+However, since Microchip does hold a patent on its application to secure keyless entry,
+it probably would not be wise to make a commercial secure keyless entry product using this algorithm in a non-Microchip processor.     
+Personal experimentation should be okay.      
+    
+__If you decide to make something commercial, buy Microchip's processors.__      
+
+
+
diff --git a/lib/KeeloqLib/keywords.txt b/lib/KeeloqLib/keywords.txt
new file mode 100644
index 000000000..c07c1ea48
--- /dev/null
+++ b/lib/KeeloqLib/keywords.txt
@@ -0,0 +1,20 @@
+#######################################
+# Syntax Coloring Map For CamelliaLib.
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+Keeloq		KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+encrypt		KEYWORD2
+decrypt		KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/lib/KeeloqLib/library.properties b/lib/KeeloqLib/library.properties
new file mode 100644
index 000000000..fa974d9bf
--- /dev/null
+++ b/lib/KeeloqLib/library.properties
@@ -0,0 +1,9 @@
+name=KeeloqLib
+version=1.1
+author=Mirko Falchetto <mirko.monmarche@gmail.com>
+maintainer=Mirko Falchetto <mirko.monmarche@gmail.com>
+sentence=C++ Class Implementing Keeloq cipher by Microchip.com.
+paragraph=Developed/Tested on Arduino/ESP8266 with Arduino IDE Environment.
+category=Uncategorized
+url=http://none.net
+architectures=*
diff --git a/lib/KeeloqLib/src/KeeloqLib.cpp b/lib/KeeloqLib/src/KeeloqLib.cpp
new file mode 100644
index 000000000..5dc1619b9
--- /dev/null
+++ b/lib/KeeloqLib/src/KeeloqLib.cpp
@@ -0,0 +1,58 @@
+/*
+  Keeloq.cpp - Keeloq encryption/decryption
+  Written by Frank Kienast in November, 2010
+*/
+
+#include "KeeloqLib.h"
+
+#define KeeLoq_NLF              (0x3A5C742EUL)
+
+Keeloq::Keeloq(const unsigned long keyHigh, const unsigned long keyLow) :
+_keyHigh( keyHigh ),
+_keyLow( keyLow )
+{
+}
+
+unsigned long Keeloq::encrypt( const unsigned long data )
+{
+  unsigned long x = data;
+  unsigned long r;
+  int keyBitNo, index;
+  unsigned long keyBitVal,bitVal;
+
+  for ( r = 0; r < 528; r++ )
+  {
+    keyBitNo = r & 63;
+    if(keyBitNo < 32)
+      keyBitVal = bitRead(_keyLow,keyBitNo);
+    else
+      keyBitVal = bitRead(_keyHigh, keyBitNo - 32);
+    index = 1 * bitRead(x,1) + 2 * bitRead(x,9) + 4 * bitRead(x,20) + 8 * bitRead(x,26) + 16 * bitRead(x,31);
+    bitVal = bitRead(x,0) ^ bitRead(x, 16) ^ bitRead(KeeLoq_NLF,index) ^ keyBitVal;
+    x = (x>>1) ^ bitVal<<31;
+  }
+  return x;
+}
+
+unsigned long Keeloq::decrypt( const unsigned long data )
+{
+  unsigned long x = data;
+  unsigned long r;
+  int keyBitNo, index;
+  unsigned long keyBitVal,bitVal;
+
+  for (r = 0; r < 528; r++)
+  {
+    keyBitNo = (15-r) & 63;
+    if(keyBitNo < 32)
+      keyBitVal = bitRead(_keyLow,keyBitNo);
+    else
+      keyBitVal = bitRead(_keyHigh, keyBitNo - 32);
+    index = 1 * bitRead(x,0) + 2 * bitRead(x,8) + 4 * bitRead(x,19) + 8 * bitRead(x,25) + 16 * bitRead(x,30);
+    bitVal = bitRead(x,31) ^ bitRead(x, 15) ^ bitRead(KeeLoq_NLF,index) ^ keyBitVal;
+    x = (x<<1) ^ bitVal;
+  }
+  return x;
+ }
+ 
+
diff --git a/lib/KeeloqLib/src/KeeloqLib.h b/lib/KeeloqLib/src/KeeloqLib.h
new file mode 100644
index 000000000..ea18fadb6
--- /dev/null
+++ b/lib/KeeloqLib/src/KeeloqLib.h
@@ -0,0 +1,28 @@
+/*
+  Keeloq.h - Crypto library
+  Written by Frank Kienast in November, 2010
+*/
+#ifndef Keeloq_lib_h
+#define Keeloq_lib_h
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
+#include <WProgram.h>
+#endif
+
+class Keeloq
+{
+  public:
+    Keeloq(
+		const unsigned long keyHigh,
+		const unsigned long keyLow );
+		
+    unsigned long encrypt( const unsigned long data );
+    unsigned long decrypt( const unsigned long data );
+    
+  private:
+    unsigned long _keyHigh;
+	unsigned long _keyLow;
+};
+
+#endif		/*Keeloq_lib_h*/
diff --git a/lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino b/lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
new file mode 100644
index 000000000..2e25730dd
--- /dev/null
+++ b/lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
@@ -0,0 +1,27 @@
+#include <KeeloqLib.h>
+
+void setup( void )
+{
+  Serial.begin(9600);
+  
+  Keeloq k(0x01020304,0x05060708);
+
+  const unsigned long p   = 6623281UL;
+  const unsigned long enc = k.encrypt(p);
+  const unsigned long dec = k.decrypt(enc);
+
+  Serial.print("Plaintext    : ");
+  Serial.println(p,DEC);
+  
+  Serial.print("After encrypt: ");
+  Serial.println(enc,HEX);
+  
+  Serial.print("After decrypt: ");
+  Serial.println(dec,DEC);
+}
+
+void loop( void )
+{
+  delay(3000);
+}
+
diff --git a/lib/cc1101/README.md b/lib/cc1101/README.md
new file mode 100644
index 000000000..249930ed1
--- /dev/null
+++ b/lib/cc1101/README.md
@@ -0,0 +1 @@
+Port of panStamp's CC1101 Library to ESP8266.
diff --git a/lib/cc1101/cc1101.cpp b/lib/cc1101/cc1101.cpp
new file mode 100644
index 000000000..6a828e7d8
--- /dev/null
+++ b/lib/cc1101/cc1101.cpp
@@ -0,0 +1,548 @@
+#include <SPI.h>
+
+/**
+ * Copyright (c) 2011 panStamp <contact@panstamp.com>
+ * 
+ * This file is part of the panStamp project.
+ * 
+ * panStamp  is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ * 
+ * panStamp 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 Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with panStamp; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 
+ * USA
+ * 
+ * Author: Daniel Berenguer
+ * Creation date: 03/03/2011
+ */
+
+extern "C" {
+#include "cc1101.h"
+}
+
+#define PORT_GDO0 5
+#define byte uint8_t
+
+/**
+ * Macros
+ */
+// Select (SPI) CC1101
+#define cc1101_Select()  spi.begin()
+// Deselect (SPI) CC1101
+#define   cc1101_Deselect()  spi.end()
+// Wait until SPI MISO line goes low
+#define wait_Miso()  delay(10)
+//while(digitalRead(PORT_SPI_MISO))
+// Get GDO0 pin state
+#define getGDO0state()  digitalRead(PORT_GDO0)
+// Wait until GDO0 line goes high
+#define wait_GDO0_high()  while(!getGDO0state()) {delay(1);}
+// Wait until GDO0 line goes low
+#define wait_GDO0_low()  while(getGDO0state()) {delay(1);}
+
+ /**
+  * PATABLE
+  */
+const byte paTable[8] = {0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/**
+ * CC1101
+ * 
+ * Class constructor
+ */
+CC1101::CC1101(void)
+{
+  carrierFreq = CFREQ_868;
+  channel = CC1101_DEFVAL_CHANNR;
+  syncWord[0] = CC1101_DEFVAL_SYNC1;
+  syncWord[1] = CC1101_DEFVAL_SYNC0;
+  devAddress = CC1101_DEFVAL_ADDR;
+  paTableByte = PA_LowPower;            // Priority = Low power
+}
+
+/**
+ * wakeUp
+ * 
+ * Wake up CC1101 from Power Down state
+ */
+void CC1101::wakeUp(void)
+{
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  cc1101_Deselect();                    // Deselect CC1101
+}
+
+/**
+ * writeReg
+ * 
+ * Write single register into the CC1101 IC via SPI
+ * 
+ * 'regAddr'	Register address
+ * 'value'	Value to be writen
+ */
+void CC1101::writeReg(byte regAddr, byte value) 
+{
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(regAddr);                    // Send register address
+  spi.transfer(value);                      // Send value
+  cc1101_Deselect();                    // Deselect CC1101
+}
+
+/**
+ * writeBurstReg
+ * 
+ * Write multiple registers into the CC1101 IC via SPI
+ * 
+ * 'regAddr'	Register address
+ * 'buffer'	Data to be writen
+ * 'len'	Data length
+ */
+void CC1101::writeBurstReg(byte regAddr, byte* buffer, byte len)
+{
+  byte addr, i;
+  
+  addr = regAddr | WRITE_BURST;         // Enable burst transfer
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(addr);                       // Send register address
+  
+  for(i=0 ; i<len ; i++)
+    spi.transfer(buffer[i]);                // Send value
+
+  cc1101_Deselect();                    // Deselect CC1101  
+}
+
+/**
+ * cmdStrobe
+ * 
+ * Send command strobe to the CC1101 IC via SPI
+ * 
+ * 'cmd'	Command strobe
+ */     
+void CC1101::cmdStrobe(byte cmd) 
+{
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(cmd);                        // Send strobe command
+  cc1101_Deselect();                    // Deselect CC1101
+}
+
+/**
+ * readReg
+ * 
+ * Read CC1101 register via SPI
+ * 
+ * 'regAddr'	Register address
+ * 'regType'	Type of register: CC1101_CONFIG_REGISTER or CC1101_STATUS_REGISTER
+ * 
+ * Return:
+ * 	Data byte returned by the CC1101 IC
+ */
+byte CC1101::readReg(byte regAddr, byte regType)
+{
+  byte addr, val;
+
+  addr = regAddr | regType;
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(addr);                       // Send register address
+  val = spi.transfer(0x00);                 // Read result
+  cc1101_Deselect();                    // Deselect CC1101
+
+  return val;
+}
+
+/**
+ * readBurstReg
+ * 
+ * Read burst data from CC1101 via SPI
+ * 
+ * 'buffer'	Buffer where to copy the result to
+ * 'regAddr'	Register address
+ * 'len'	Data length
+ */
+void CC1101::readBurstReg(byte * buffer, byte regAddr, byte len) 
+{
+  byte addr, i;
+  
+  addr = regAddr | READ_BURST;
+  cc1101_Select();                      // Select CC1101
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(addr);                       // Send register address
+  for(i=0 ; i<len ; i++)
+    buffer[i] = spi.transfer(0x00);         // Read result byte by byte
+  cc1101_Deselect();                    // Deselect CC1101
+}
+
+/**
+ * reset
+ * 
+ * Reset CC1101
+ */
+void CC1101::reset(void) 
+{
+  cc1101_Deselect();                    // Deselect CC1101
+  delayMicroseconds(5);
+  cc1101_Select();                      // Select CC1101
+  delayMicroseconds(10);
+  cc1101_Deselect();                    // Deselect CC1101
+  delayMicroseconds(41);
+  cc1101_Select();                      // Select CC1101
+
+  wait_Miso();                          // Wait until MISO goes low
+  spi.transfer(CC1101_SRES);                // Send reset command strobe
+  wait_Miso();                          // Wait until MISO goes low
+
+  cc1101_Deselect();                    // Deselect CC1101
+
+  setCCregs();                          // Reconfigure CC1101
+}
+
+/**
+ * setCCregs
+ * 
+ * Configure CC1101 registers
+ */
+void CC1101::setCCregs(void) 
+{
+  writeReg(CC1101_IOCFG2,  CC1101_DEFVAL_IOCFG2);
+  writeReg(CC1101_IOCFG1,  CC1101_DEFVAL_IOCFG1);
+  writeReg(CC1101_IOCFG0,  CC1101_DEFVAL_IOCFG0);
+  writeReg(CC1101_FIFOTHR,  CC1101_DEFVAL_FIFOTHR);
+  writeReg(CC1101_PKTLEN,  CC1101_DEFVAL_PKTLEN);
+  writeReg(CC1101_PKTCTRL1,  CC1101_DEFVAL_PKTCTRL1);
+  writeReg(CC1101_PKTCTRL0,  CC1101_DEFVAL_PKTCTRL0);
+
+  // Set default synchronization word
+  setSyncWord(syncWord);
+
+  // Set default device address
+  setDevAddress(devAddress);
+
+  // Set default frequency channel
+  setChannel(channel);
+  
+  writeReg(CC1101_FSCTRL1,  CC1101_DEFVAL_FSCTRL1);
+  writeReg(CC1101_FSCTRL0,  CC1101_DEFVAL_FSCTRL0);
+
+  // Set default carrier frequency = 868 MHz
+  setCarrierFreq(carrierFreq);
+
+  writeReg(CC1101_MDMCFG4,  CC1101_DEFVAL_MDMCFG4);
+  writeReg(CC1101_MDMCFG3,  CC1101_DEFVAL_MDMCFG3);
+  writeReg(CC1101_MDMCFG2,  CC1101_DEFVAL_MDMCFG2);
+  writeReg(CC1101_MDMCFG1,  CC1101_DEFVAL_MDMCFG1);
+  writeReg(CC1101_MDMCFG0,  CC1101_DEFVAL_MDMCFG0);
+  writeReg(CC1101_DEVIATN,  CC1101_DEFVAL_DEVIATN);
+  writeReg(CC1101_MCSM2,  CC1101_DEFVAL_MCSM2);
+  writeReg(CC1101_MCSM1,  CC1101_DEFVAL_MCSM1);
+  writeReg(CC1101_MCSM0,  CC1101_DEFVAL_MCSM0);
+  writeReg(CC1101_FOCCFG,  CC1101_DEFVAL_FOCCFG);
+  writeReg(CC1101_BSCFG,  CC1101_DEFVAL_BSCFG);
+  writeReg(CC1101_AGCCTRL2,  CC1101_DEFVAL_AGCCTRL2);
+  writeReg(CC1101_AGCCTRL1,  CC1101_DEFVAL_AGCCTRL1);
+  writeReg(CC1101_AGCCTRL0,  CC1101_DEFVAL_AGCCTRL0);
+  writeReg(CC1101_WOREVT1,  CC1101_DEFVAL_WOREVT1);
+  writeReg(CC1101_WOREVT0,  CC1101_DEFVAL_WOREVT0);
+  writeReg(CC1101_WORCTRL,  CC1101_DEFVAL_WORCTRL);
+  writeReg(CC1101_FREND1,  CC1101_DEFVAL_FREND1);
+  writeReg(CC1101_FREND0,  CC1101_DEFVAL_FREND0);
+  writeReg(CC1101_FSCAL3,  CC1101_DEFVAL_FSCAL3);
+  writeReg(CC1101_FSCAL2,  CC1101_DEFVAL_FSCAL2);
+  writeReg(CC1101_FSCAL1,  CC1101_DEFVAL_FSCAL1);
+  writeReg(CC1101_FSCAL0,  CC1101_DEFVAL_FSCAL0);
+  writeReg(CC1101_RCCTRL1,  CC1101_DEFVAL_RCCTRL1);
+  writeReg(CC1101_RCCTRL0,  CC1101_DEFVAL_RCCTRL0);
+  writeReg(CC1101_FSTEST,  CC1101_DEFVAL_FSTEST);
+  writeReg(CC1101_PTEST,  CC1101_DEFVAL_PTEST);
+  writeReg(CC1101_AGCTEST,  CC1101_DEFVAL_AGCTEST);
+  writeReg(CC1101_TEST2,  CC1101_DEFVAL_TEST2);
+  writeReg(CC1101_TEST1,  CC1101_DEFVAL_TEST1);
+  writeReg(CC1101_TEST0,  CC1101_DEFVAL_TEST0);
+  
+  // Send empty packet
+  CCPACKET packet;
+  packet.length = 0;
+  sendData(packet);
+}
+
+/**
+ * init
+ * 
+ * Initialize CC1101 radio
+ *
+ * @param freq Carrier frequency
+ */
+void CC1101::init(uint8_t freq)
+{
+  carrierFreq = freq;
+  
+  spi.begin();                           // Initialize SPI interface
+  pinMode(PORT_GDO0, INPUT);                 // Config GDO0 as input
+
+  reset();                              // Reset CC1101
+
+  // Configure PATABLE
+  //writeBurstReg(CC1101_PATABLE, (byte*)paTable, 8);
+  writeReg(CC1101_PATABLE, paTableByte);
+}
+
+/**
+ * setSyncWord
+ * 
+ * Set synchronization word
+ * 
+ * 'syncH'	Synchronization word - High byte
+ * 'syncL'	Synchronization word - Low byte
+ */
+void CC1101::setSyncWord(uint8_t syncH, uint8_t syncL) 
+{
+  writeReg(CC1101_SYNC1, syncH);
+  writeReg(CC1101_SYNC0, syncL);
+  syncWord[0] = syncH;
+  syncWord[1] = syncL;
+}
+
+/**
+ * setSyncWord (overriding method)
+ * 
+ * Set synchronization word
+ * 
+ * 'syncH'	Synchronization word - pointer to 2-byte array
+ */
+void CC1101::setSyncWord(byte *sync) 
+{
+  CC1101::setSyncWord(sync[0], sync[1]);
+}
+
+/**
+ * setDevAddress
+ * 
+ * Set device address
+ * 
+ * @param addr	Device address
+ */
+void CC1101::setDevAddress(byte addr) 
+{
+  writeReg(CC1101_ADDR, addr);
+  devAddress = addr;
+}
+
+/**
+ * setChannel
+ * 
+ * Set frequency channel
+ * 
+ * 'chnl'	Frequency channel
+ */
+void CC1101::setChannel(byte chnl) 
+{
+  writeReg(CC1101_CHANNR,  chnl);
+  channel = chnl;
+}
+
+/**
+ * setCarrierFreq
+ * 
+ * Set carrier frequency
+ * 
+ * 'freq'	New carrier frequency
+ */
+void CC1101::setCarrierFreq(byte freq)
+{
+  switch(freq)
+  {
+    case CFREQ_915:
+      writeReg(CC1101_FREQ2,  CC1101_DEFVAL_FREQ2_915);
+      writeReg(CC1101_FREQ1,  CC1101_DEFVAL_FREQ1_915);
+      writeReg(CC1101_FREQ0,  CC1101_DEFVAL_FREQ0_915);
+      break;
+    case CFREQ_433:
+      writeReg(CC1101_FREQ2,  CC1101_DEFVAL_FREQ2_433);
+      writeReg(CC1101_FREQ1,  CC1101_DEFVAL_FREQ1_433);
+      writeReg(CC1101_FREQ0,  CC1101_DEFVAL_FREQ0_433);
+      break;
+    case CFREQ_918:
+      writeReg(CC1101_FREQ2,  CC1101_DEFVAL_FREQ2_918);
+      writeReg(CC1101_FREQ1,  CC1101_DEFVAL_FREQ1_918);
+      writeReg(CC1101_FREQ0,  CC1101_DEFVAL_FREQ0_918);
+      break;
+    default:
+      writeReg(CC1101_FREQ2,  CC1101_DEFVAL_FREQ2_868);
+      writeReg(CC1101_FREQ1,  CC1101_DEFVAL_FREQ1_868);
+      writeReg(CC1101_FREQ0,  CC1101_DEFVAL_FREQ0_868);
+      break;
+  }
+   
+  carrierFreq = freq;  
+}
+
+/**
+ * setPowerDownState
+ * 
+ * Put CC1101 into power-down state
+ */
+void CC1101::setPowerDownState() 
+{
+  // Comming from RX state, we need to enter the IDLE state first
+  cmdStrobe(CC1101_SIDLE);
+  // Enter Power-down state
+  cmdStrobe(CC1101_SPWD);
+}
+
+/**
+ * sendData
+ * 
+ * Send data packet via RF
+ * 
+ * 'packet'	Packet to be transmitted. First byte is the destination address
+ *
+ *  Return:
+ *    True if the transmission succeeds
+ *    False otherwise
+ */
+bool CC1101::sendData(CCPACKET packet)
+{
+  byte marcState;
+  bool res = false;
+ 
+  // Declare to be in Tx state. This will avoid receiving packets whilst
+  // transmitting
+  rfState = RFSTATE_TX;
+
+  // Enter RX state
+  setRxState();
+
+  // Check that the RX state has been entered
+  while (((marcState = readStatusReg(CC1101_MARCSTATE)) & 0x1F) != 0x0D)
+  {
+    if (marcState == 0x11)        // RX_OVERFLOW
+      flushRxFifo();              // flush receive queue
+  }
+
+  delayMicroseconds(500);
+
+  if (packet.length > 0)
+  {
+    // Set data length at the first position of the TX FIFO
+    writeReg(CC1101_TXFIFO,  packet.length);
+    // Write data into the TX FIFO
+    writeBurstReg(CC1101_TXFIFO, packet.data, packet.length);
+
+    // CCA enabled: will enter TX state only if the channel is clear
+    setTxState();
+  }
+
+  // Check that TX state is being entered (state = RXTX_SETTLING)
+  marcState = readStatusReg(CC1101_MARCSTATE) & 0x1F;
+  if((marcState != 0x13) && (marcState != 0x14) && (marcState != 0x15))
+  {
+    setIdleState();       // Enter IDLE state
+    flushTxFifo();        // Flush Tx FIFO
+    setRxState();         // Back to RX state
+
+    // Declare to be in Rx state
+    rfState = RFSTATE_RX;
+    return false;
+  }
+
+  // Wait for the sync word to be transmitted
+  wait_GDO0_high();
+
+  // Wait until the end of the packet transmission
+  wait_GDO0_low();
+
+  // Check that the TX FIFO is empty
+  if((readStatusReg(CC1101_TXBYTES) & 0x7F) == 0)
+    res = true;
+
+  setIdleState();       // Enter IDLE state
+  flushTxFifo();        // Flush Tx FIFO
+
+  // Enter back into RX state
+  setRxState();
+
+  // Declare to be in Rx state
+  rfState = RFSTATE_RX;
+
+  return res;
+}
+
+/**
+ * receiveData
+ * 
+ * Read data packet from RX FIFO
+ *
+ * 'packet'	Container for the packet received
+ * 
+ * Return:
+ * 	Amount of bytes received
+ */
+byte CC1101::receiveData(CCPACKET * packet)
+{
+  byte val;
+  byte rxBytes = readStatusReg(CC1101_RXBYTES);
+
+  // Any byte waiting to be read and no overflow?
+  if (rxBytes & 0x7F)
+  {
+    // Read data length
+    packet->length = readConfigReg(CC1101_RXFIFO);
+    // If packet is too long
+    if (packet->length > CCPACKET_DATA_LEN)
+      packet->length = 0;   // Discard packet
+    else
+    {
+      // Read data packet
+      readBurstReg(packet->data, CC1101_RXFIFO, packet->length);
+      // Read RSSI
+      packet->rssi = readConfigReg(CC1101_RXFIFO);
+      // Read LQI and CRC_OK
+      val = readConfigReg(CC1101_RXFIFO);
+      packet->lqi = val & 0x7F;
+      packet->crc_ok = bitRead(val, 7);
+    }
+  }
+  else
+    packet->length = 0;
+
+  setIdleState();       // Enter IDLE state
+  flushRxFifo();        // Flush Rx FIFO
+  //cmdStrobe(CC1101_SCAL);
+
+  // Back to RX state
+  setRxState();
+
+  return packet->length;
+}
+
+/**
+ * setRxState
+ * 
+ * Enter Rx state
+ */
+void CC1101::setRxState(void)
+{
+  cmdStrobe(CC1101_SRX);
+  rfState = RFSTATE_RX;
+}
+
+/**
+ * setTxState
+ * 
+ * Enter Tx state
+ */
+void CC1101::setTxState(void)
+{
+   cmdStrobe(CC1101_STX);
+  rfState = RFSTATE_TX;
+}
diff --git a/lib/cc1101/cc1101.h b/lib/cc1101/cc1101.h
new file mode 100644
index 000000000..8636d8678
--- /dev/null
+++ b/lib/cc1101/cc1101.h
@@ -0,0 +1,548 @@
+#include <SPI.h>
+
+/**
+ * Copyright (c) 2011 panStamp <contact@panstamp.com>
+ * 
+ * This file is part of the panStamp project.
+ * 
+ * panStamp  is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ * 
+ * panStamp 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 Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with panStamp; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 
+ * USA
+ * 
+ * Author: Daniel Berenguer
+ * Creation date: 03/03/2011
+ */
+
+#ifndef _CC1101_H
+#define _CC1101_H
+
+//#include "simplespi.h"
+extern "C" {
+#include <stdint.h>
+#include "ccpacket.h"
+}
+
+/**
+ * Carrier frequencies
+ */
+enum CFREQ
+{
+  CFREQ_868 = 0,
+  CFREQ_915,
+  CFREQ_433,
+  CFREQ_918,
+  CFREQ_LAST
+};
+
+/**
+ * RF STATES
+ */
+enum RFSTATE
+{
+  RFSTATE_IDLE = 0,
+  RFSTATE_RX,
+  RFSTATE_TX
+};
+
+
+/**
+ * Frequency channels
+ */
+#define NUMBER_OF_FCHANNELS      10
+
+/**
+ * Type of transfers
+ */
+#define WRITE_BURST              0x40
+#define READ_SINGLE              0x80
+#define READ_BURST               0xC0
+
+/**
+ * Type of register
+ */
+#define CC1101_CONFIG_REGISTER   READ_SINGLE
+#define CC1101_STATUS_REGISTER   READ_BURST
+
+/**
+ * PATABLE & FIFO's
+ */
+#define CC1101_PATABLE           0x3E        // PATABLE address
+#define CC1101_TXFIFO            0x3F        // TX FIFO address
+#define CC1101_RXFIFO            0x3F        // RX FIFO address
+
+/**
+ * Command strobes
+ */
+#define CC1101_SRES              0x30        // Reset CC1101 chip
+#define CC1101_SFSTXON           0x31        // Enable and calibrate frequency synthesizer (if MCSM0.FS_AUTOCAL=1). If in RX (with CCA):
+                                             // Go to a wait state where only the synthesizer is running (for quick RX / TX turnaround).
+#define CC1101_SXOFF             0x32        // Turn off crystal oscillator
+#define CC1101_SCAL              0x33        // Calibrate frequency synthesizer and turn it off. SCAL can be strobed from IDLE mode without
+                                             // setting manual calibration mode (MCSM0.FS_AUTOCAL=0)
+#define CC1101_SRX               0x34        // Enable RX. Perform calibration first if coming from IDLE and MCSM0.FS_AUTOCAL=1
+#define CC1101_STX               0x35        // In IDLE state: Enable TX. Perform calibration first if MCSM0.FS_AUTOCAL=1.
+                                             // If in RX state and CCA is enabled: Only go to TX if channel is clear
+#define CC1101_SIDLE             0x36        // Exit RX / TX, turn off frequency synthesizer and exit Wake-On-Radio mode if applicable
+#define CC1101_SWOR              0x38        // Start automatic RX polling sequence (Wake-on-Radio) as described in Section 19.5 if
+                                             // WORCTRL.RC_PD=0
+#define CC1101_SPWD              0x39        // Enter power down mode when CSn goes high
+#define CC1101_SFRX              0x3A        // Flush the RX FIFO buffer. Only issue SFRX in IDLE or RXFIFO_OVERFLOW states
+#define CC1101_SFTX              0x3B        // Flush the TX FIFO buffer. Only issue SFTX in IDLE or TXFIFO_UNDERFLOW states
+#define CC1101_SWORRST           0x3C        // Reset real time clock to Event1 value
+#define CC1101_SNOP              0x3D        // No operation. May be used to get access to the chip status byte
+
+/**
+ * CC1101 configuration registers
+ */
+#define CC1101_IOCFG2            0x00        // GDO2 Output Pin Configuration
+#define CC1101_IOCFG1            0x01        // GDO1 Output Pin Configuration
+#define CC1101_IOCFG0            0x02        // GDO0 Output Pin Configuration
+#define CC1101_FIFOTHR           0x03        // RX FIFO and TX FIFO Thresholds
+#define CC1101_SYNC1             0x04        // Sync Word, High Byte
+#define CC1101_SYNC0             0x05        // Sync Word, Low Byte
+#define CC1101_PKTLEN            0x06        // Packet Length
+#define CC1101_PKTCTRL1          0x07        // Packet Automation Control
+#define CC1101_PKTCTRL0          0x08        // Packet Automation Control
+#define CC1101_ADDR              0x09        // Device Address
+#define CC1101_CHANNR            0x0A        // Channel Number
+#define CC1101_FSCTRL1           0x0B        // Frequency Synthesizer Control
+#define CC1101_FSCTRL0           0x0C        // Frequency Synthesizer Control
+#define CC1101_FREQ2             0x0D        // Frequency Control Word, High Byte
+#define CC1101_FREQ1             0x0E        // Frequency Control Word, Middle Byte
+#define CC1101_FREQ0             0x0F        // Frequency Control Word, Low Byte
+#define CC1101_MDMCFG4           0x10        // Modem Configuration
+#define CC1101_MDMCFG3           0x11        // Modem Configuration
+#define CC1101_MDMCFG2           0x12        // Modem Configuration
+#define CC1101_MDMCFG1           0x13        // Modem Configuration
+#define CC1101_MDMCFG0           0x14        // Modem Configuration
+#define CC1101_DEVIATN           0x15        // Modem Deviation Setting
+#define CC1101_MCSM2             0x16        // Main Radio Control State Machine Configuration
+#define CC1101_MCSM1             0x17        // Main Radio Control State Machine Configuration
+#define CC1101_MCSM0             0x18        // Main Radio Control State Machine Configuration
+#define CC1101_FOCCFG            0x19        // Frequency Offset Compensation Configuration
+#define CC1101_BSCFG             0x1A        // Bit Synchronization Configuration
+#define CC1101_AGCCTRL2          0x1B        // AGC Control
+#define CC1101_AGCCTRL1          0x1C        // AGC Control
+#define CC1101_AGCCTRL0          0x1D        // AGC Control
+#define CC1101_WOREVT1           0x1E        // High Byte Event0 Timeout
+#define CC1101_WOREVT0           0x1F        // Low Byte Event0 Timeout
+#define CC1101_WORCTRL           0x20        // Wake On Radio Control
+#define CC1101_FREND1            0x21        // Front End RX Configuration
+#define CC1101_FREND0            0x22        // Front End TX Configuration
+#define CC1101_FSCAL3            0x23        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL2            0x24        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL1            0x25        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL0            0x26        // Frequency Synthesizer Calibration
+#define CC1101_RCCTRL1           0x27        // RC Oscillator Configuration
+#define CC1101_RCCTRL0           0x28        // RC Oscillator Configuration
+#define CC1101_FSTEST            0x29        // Frequency Synthesizer Calibration Control
+#define CC1101_PTEST             0x2A        // Production Test
+#define CC1101_AGCTEST           0x2B        // AGC Test
+#define CC1101_TEST2             0x2C        // Various Test Settings
+#define CC1101_TEST1             0x2D        // Various Test Settings
+#define CC1101_TEST0             0x2E        // Various Test Settings
+
+/**
+ * Status registers
+ */
+#define CC1101_PARTNUM           0x30        // Chip ID
+#define CC1101_VERSION           0x31        // Chip ID
+#define CC1101_FREQEST           0x32        // Frequency Offset Estimate from Demodulator
+#define CC1101_LQI               0x33        // Demodulator Estimate for Link Quality
+#define CC1101_RSSI              0x34        // Received Signal Strength Indication
+#define CC1101_MARCSTATE         0x35        // Main Radio Control State Machine State
+#define CC1101_WORTIME1          0x36        // High Byte of WOR Time
+#define CC1101_WORTIME0          0x37        // Low Byte of WOR Time
+#define CC1101_PKTSTATUS         0x38        // Current GDOx Status and Packet Status
+#define CC1101_VCO_VC_DAC        0x39        // Current Setting from PLL Calibration Module
+#define CC1101_TXBYTES           0x3A        // Underflow and Number of Bytes
+#define CC1101_RXBYTES           0x3B        // Overflow and Number of Bytes
+#define CC1101_RCCTRL1_STATUS    0x3C        // Last RC Oscillator Calibration Result
+#define CC1101_RCCTRL0_STATUS    0x3D        // Last RC Oscillator Calibration Result 
+
+/**
+ * CC1101 configuration registers - Default values extracted from SmartRF Studio
+ *
+ * Configuration:
+ *
+ * Deviation = 20.629883 
+ * Base frequency = 867.999939 
+ * Carrier frequency = 867.999939 
+ * Channel number = 0 
+ * Carrier frequency = 867.999939 
+ * Modulated = true 
+ * Modulation format = GFSK 
+ * Manchester enable = false
+ * Data whitening = off
+ * Sync word qualifier mode = 30/32 sync word bits detected 
+ * Preamble count = 4 
+ * Channel spacing = 199.951172 
+ * Carrier frequency = 867.999939 
+ * Data rate = 38.3835 Kbps
+ * RX filter BW = 101.562500 
+ * Data format = Normal mode 
+ * Length config = Variable packet length mode. Packet length configured by the first byte after sync word 
+ * CRC enable = true 
+ * Packet length = 255 
+ * Device address = 1 
+ * Address config = Enable address check
+ * Append status = Append two status bytes to the payload of the packet. The status bytes contain RSSI and
+ * LQI values, as well as CRC OK
+ * CRC autoflush = false 
+ * PA ramping = false 
+ * TX power = 12
+ * GDO0 mode = Asserts when sync word has been sent / received, and de-asserts at the end of the packet.
+ * In RX, the pin will also de-assert when a packet is discarded due to address or maximum length filtering
+ * or when the radio enters RXFIFO_OVERFLOW state. In TX the pin will de-assert if the TX FIFO underflows
+ * Settings optimized for low current consumption
+ */
+
+#define CC1101_DEFVAL_IOCFG2     0x0D        // GDO2 Output Pin Configuration
+#define CC1101_DEFVAL_IOCFG1     0x2E        // GDO1 Output Pin Configuration
+#define CC1101_DEFVAL_IOCFG0     0x2D        // GDO0 Output Pin Configuration
+#define CC1101_DEFVAL_FIFOTHR    0x07        // RX FIFO and TX FIFO Thresholds
+#define CC1101_DEFVAL_SYNC1      0xD3        // Synchronization word, high byte
+#define CC1101_DEFVAL_SYNC0      0x91        // Synchronization word, low byte
+#define CC1101_DEFVAL_PKTLEN     0x3D        // Packet Length
+#define CC1101_DEFVAL_PKTCTRL1   0x04        // Packet Automation Control
+#define CC1101_DEFVAL_PKTCTRL0   0x32        // Packet Automation Control
+#define CC1101_DEFVAL_ADDR       0xFF        // Device Address
+#define CC1101_DEFVAL_CHANNR     0x00        // Channel Number
+#define CC1101_DEFVAL_FSCTRL1    0x06        // Frequency Synthesizer Control
+#define CC1101_DEFVAL_FSCTRL0    0x00        // Frequency Synthesizer Control
+// Carrier frequency = 868 MHz
+#define CC1101_DEFVAL_FREQ2_868  0x21        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_868  0x62        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_868  0x76        // Frequency Control Word, Low Byte
+// Carrier frequency = 902 MHz
+#define CC1101_DEFVAL_FREQ2_915  0x22        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_915  0xB1        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_915  0x3B        // Frequency Control Word, Low Byte
+// Carrier frequency = 918 MHz
+#define CC1101_DEFVAL_FREQ2_918  0x23        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_918  0x4E        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_918  0xC4        // Frequency Control Word, Low Byte
+
+// Carrier frequency = 433 MHz
+#define CC1101_DEFVAL_FREQ2_433  0x10        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_433  0xB0        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_433  0xBD       // Frequency Control Word, Low Byte
+
+#define CC1101_DEFVAL_MDMCFG4    0x56     // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG3    0x83      // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG2    0x30        // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG1    0x22        // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG0    0xF8        // Modem Configuration
+#define CC1101_DEFVAL_DEVIATN    0x00      // Modem Deviation Setting
+#define CC1101_DEFVAL_MCSM2      0x07        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_MCSM1      0x00        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_MCSM0      0x18        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_FOCCFG     0x14        // Frequency Offset Compensation Configuration
+#define CC1101_DEFVAL_BSCFG      0x6C        // Bit Synchronization Configuration
+#define CC1101_DEFVAL_AGCCTRL2   0x07        // AGC Control
+#define CC1101_DEFVAL_AGCCTRL1   0x00       // AGC Control
+#define CC1101_DEFVAL_AGCCTRL0   0x91        // AGC Control
+#define CC1101_DEFVAL_WOREVT1    0x87        // High Byte Event0 Timeout
+#define CC1101_DEFVAL_WOREVT0    0x6B        // Low Byte Event0 Timeout
+#define CC1101_DEFVAL_WORCTRL    0xF8        // Wake On Radio Control
+#define CC1101_DEFVAL_FREND1     0x56        // Front End RX Configuration
+#define CC1101_DEFVAL_FREND0     0x11        // Front End TX Configuration
+#define CC1101_DEFVAL_FSCAL3     0xE9        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL2     0x2A        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL1     0x00        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL0     0x1F        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_RCCTRL1    0x41        // RC Oscillator Configuration
+#define CC1101_DEFVAL_RCCTRL0    0x00        // RC Oscillator Configuration
+#define CC1101_DEFVAL_FSTEST     0x59        // Frequency Synthesizer Calibration Control
+#define CC1101_DEFVAL_PTEST      0x7F        // Production Test
+#define CC1101_DEFVAL_AGCTEST    0x3F        // AGC Test
+#define CC1101_DEFVAL_TEST2      0x88        // Various Test Settings
+#define CC1101_DEFVAL_TEST1      0x31        // Various Test Settings
+#define CC1101_DEFVAL_TEST0      0x09        // Various Test Settings
+
+/**
+ * Alias for some default values
+ */
+#define CCDEF_CHANNR  CC1101_DEFVAL_CHANNR
+#define CCDEF_SYNC0  CC1101_DEFVAL_SYNC0
+#define CCDEF_SYNC1  CC1101_DEFVAL_SYNC1
+#define CCDEF_ADDR  CC1101_DEFVAL_ADDR
+
+/**
+ * Macros
+ */
+// Read CC1101 Config register
+#define readConfigReg(regAddr)    readReg(regAddr, CC1101_CONFIG_REGISTER)
+// Read CC1101 Status register
+#define readStatusReg(regAddr)    readReg(regAddr, CC1101_STATUS_REGISTER)
+// Enter Rx state
+//#define setRxState()              cmdStrobe(CC1101_SRX)
+// Enter Tx state
+//#define setTxState()              cmdStrobe(CC1101_STX)
+// Enter IDLE state
+#define setIdleState()            cmdStrobe(CC1101_SIDLE)
+// Flush Rx FIFO
+#define flushRxFifo()             cmdStrobe(CC1101_SFRX)
+// Flush Tx FIFO
+#define flushTxFifo()             cmdStrobe(CC1101_SFTX)
+// Disable address check
+#define disableAddressCheck()     writeReg(CC1101_PKTCTRL1, 0x04)
+// Enable address check
+#define enableAddressCheck()      writeReg(CC1101_PKTCTRL1, 0x06)
+// Disable CCA
+#define disableCCA()              writeReg(CC1101_MCSM1, 0)
+// Enable CCA
+#define enableCCA()               writeReg(CC1101_MCSM1, CC1101_DEFVAL_MCSM1)
+// Set PATABLE single byte
+#define setTxPowerAmp(setting)    paTableByte = setting
+// PATABLE values
+#define PA_LowPower               0x60
+#define PA_LongDistance           0xC0
+
+/**
+ * Class: CC1101
+ * 
+ * Description:
+ * CC1101 interface
+ */
+class CC1101
+{
+  private:
+    /**
+     * Atmega's SPI interface
+     */
+    SPIClass spi;
+
+    /**
+     * writeBurstReg
+     * 
+     * Write multiple registers into the CC1101 IC via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'buffer'	Data to be writen
+     * 'len'	Data length
+     */
+    void writeBurstReg(uint8_t regAddr, uint8_t* buffer, uint8_t len);
+
+    /**
+     * readBurstReg
+     * 
+     * Read burst data from CC1101 via SPI
+     * 
+     * 'buffer'	Buffer where to copy the result to
+     * 'regAddr'	Register address
+     * 'len'	Data length
+     */
+    void readBurstReg(uint8_t * buffer, uint8_t regAddr, uint8_t len);
+
+    /**
+     * setRegsFromEeprom
+     * 
+     * Set registers from EEPROM
+     */
+    void setRegsFromEeprom(void);
+
+  public:
+    /*
+     * RF state
+     */
+    uint8_t rfState;
+
+    /**
+     * Tx Power byte (single PATABLE config)
+     */
+    uint8_t paTableByte;
+
+    /**
+     * Carrier frequency
+     */
+    uint8_t carrierFreq;
+
+    /**
+     * Frequency channel
+     */
+    uint8_t channel;
+
+    /**
+     * Synchronization word
+     */
+    uint8_t syncWord[2];
+
+    /**
+     * Device address
+     */
+    uint8_t devAddress;
+
+    /**
+     * CC1101
+     * 
+     * Class constructor
+     */
+    CC1101(void);
+
+    /**
+     * cmdStrobe
+     * 
+     * Send command strobe to the CC1101 IC via SPI
+     * 
+     * 'cmd'	Command strobe
+     */
+    void cmdStrobe(uint8_t cmd);
+
+    /**
+     * wakeUp
+     * 
+     * Wake up CC1101 from Power Down state
+     */
+    void wakeUp(void);
+
+    /**
+     * readReg
+     * 
+     * Read CC1101 register via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'regType'	Type of register: CC1101_CONFIG_REGISTER or CC1101_STATUS_REGISTER
+     * 
+     * Return:
+     * 	Data byte returned by the CC1101 IC
+     */
+    uint8_t readReg(uint8_t regAddr, uint8_t regType);
+
+    /**
+     * writeReg
+     * 
+     * Write single register into the CC1101 IC via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'value'	Value to be writen
+     */
+    void writeReg(uint8_t regAddr, uint8_t value);
+
+    /**
+     * setCCregs
+     * 
+     * Configure CC1101 registers
+     */
+    void setCCregs(void);
+
+    /**
+     * reset
+     * 
+     * Reset CC1101
+     */
+    void reset(void);
+    
+    /**
+     * init
+     * 
+     * Initialize CC1101 radio
+     *
+     * @param freq Carrier frequency
+     */
+    void init(uint8_t freq=CFREQ_868);
+
+    /**
+     * setSyncWord
+     * 
+     * Set synchronization word
+     * 
+     * 'syncH'	Synchronization word - High byte
+     * 'syncL'	Synchronization word - Low byte
+     */
+    void setSyncWord(uint8_t syncH, uint8_t syncL);
+
+    /**
+     * setSyncWord (overriding method)
+     * 
+     * Set synchronization word
+     * 
+     * 'syncH'	Synchronization word - pointer to 2-byte array
+     */
+    void setSyncWord(uint8_t *sync);
+
+    /**
+     * setDevAddress
+     * 
+     * Set device address
+     * 
+     * 'addr'	Device address
+     */
+    void setDevAddress(uint8_t addr);
+
+    /**
+     * setCarrierFreq
+     * 
+     * Set carrier frequency
+     * 
+     * 'freq'	New carrier frequency
+     */
+    void setCarrierFreq(uint8_t freq);
+    
+    /**
+     * setChannel
+     * 
+     * Set frequency channel
+     * 
+     * 'chnl'	Frequency channel
+     */
+    void setChannel(uint8_t chnl);
+
+    /**
+     * setPowerDownState
+     * 
+     * Put CC1101 into power-down state
+     */
+    void setPowerDownState();
+    
+    /**
+     * sendData
+     * 
+     * Send data packet via RF
+     * 
+     * 'packet'	Packet to be transmitted. First byte is the destination address
+     *
+     *  Return:
+     *    True if the transmission succeeds
+     *    False otherwise
+     */
+    bool sendData(CCPACKET packet);
+
+    /**
+     * receiveData
+     * 
+     * Read data packet from RX FIFO
+     * 
+     * Return:
+     * 	Amount of bytes received
+     */
+    uint8_t receiveData(CCPACKET *packet);
+    
+    /**
+     * setRxState
+     * 
+     * Enter Rx state
+     */
+    void setRxState(void);
+
+    /**
+     * setTxState
+     * 
+     * Enter Tx state
+     */
+    void setTxState(void);
+};
+
+#endif
+
diff --git a/lib/cc1101/cc1101.h.txt b/lib/cc1101/cc1101.h.txt
new file mode 100644
index 000000000..6f48d992f
--- /dev/null
+++ b/lib/cc1101/cc1101.h.txt
@@ -0,0 +1,549 @@
+#include <SPI.h>
+
+/**
+ * Copyright (c) 2011 panStamp <contact@panstamp.com>
+ * 
+ * This file is part of the panStamp project.
+ * 
+ * panStamp  is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ * 
+ * panStamp 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 Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with panStamp; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 
+ * USA
+ * 
+ * Author: Daniel Berenguer
+ * Creation date: 03/03/2011
+ */
+
+#ifndef _CC1101_H
+#define _CC1101_H
+
+//#include "simplespi.h"
+extern "C" {
+#include <stdint.h>
+#include "ccpacket.h"
+}
+
+/**
+ * Carrier frequencies
+ */
+enum CFREQ
+{
+  CFREQ_868 = 0,
+  CFREQ_915,
+  CFREQ_433,
+  CFREQ_918,
+  CFREQ_LAST
+};
+
+/**
+ * RF STATES
+ */
+enum RFSTATE
+{
+  RFSTATE_IDLE = 0,
+  RFSTATE_RX,
+  RFSTATE_TX
+};
+
+
+/**
+ * Frequency channels
+ */
+#define NUMBER_OF_FCHANNELS      10
+
+/**
+ * Type of transfers
+ */
+#define WRITE_BURST              0x40
+#define READ_SINGLE              0x80
+#define READ_BURST               0xC0
+
+/**
+ * Type of register
+ */
+#define CC1101_CONFIG_REGISTER   READ_SINGLE
+#define CC1101_STATUS_REGISTER   READ_BURST
+
+/**
+ * PATABLE & FIFO's
+ */
+#define CC1101_PATABLE           0x3E        // PATABLE address
+#define CC1101_TXFIFO            0x3F        // TX FIFO address
+#define CC1101_RXFIFO            0x3F        // RX FIFO address
+
+/**
+ * Command strobes
+ */
+#define CC1101_SRES              0x30        // Reset CC1101 chip
+#define CC1101_SFSTXON           0x31        // Enable and calibrate frequency synthesizer (if MCSM0.FS_AUTOCAL=1). If in RX (with CCA):
+                                             // Go to a wait state where only the synthesizer is running (for quick RX / TX turnaround).
+#define CC1101_SXOFF             0x32        // Turn off crystal oscillator
+#define CC1101_SCAL              0x33        // Calibrate frequency synthesizer and turn it off. SCAL can be strobed from IDLE mode without
+                                             // setting manual calibration mode (MCSM0.FS_AUTOCAL=0)
+#define CC1101_SRX               0x34        // Enable RX. Perform calibration first if coming from IDLE and MCSM0.FS_AUTOCAL=1
+#define CC1101_STX               0x35        // In IDLE state: Enable TX. Perform calibration first if MCSM0.FS_AUTOCAL=1.
+                                             // If in RX state and CCA is enabled: Only go to TX if channel is clear
+#define CC1101_SIDLE             0x36        // Exit RX / TX, turn off frequency synthesizer and exit Wake-On-Radio mode if applicable
+#define CC1101_SWOR              0x38        // Start automatic RX polling sequence (Wake-on-Radio) as described in Section 19.5 if
+                                             // WORCTRL.RC_PD=0
+#define CC1101_SPWD              0x39        // Enter power down mode when CSn goes high
+#define CC1101_SFRX              0x3A        // Flush the RX FIFO buffer. Only issue SFRX in IDLE or RXFIFO_OVERFLOW states
+#define CC1101_SFTX              0x3B        // Flush the TX FIFO buffer. Only issue SFTX in IDLE or TXFIFO_UNDERFLOW states
+#define CC1101_SWORRST           0x3C        // Reset real time clock to Event1 value
+#define CC1101_SNOP              0x3D        // No operation. May be used to get access to the chip status byte
+
+/**
+ * CC1101 configuration registers
+ */
+#define CC1101_IOCFG2            0x00        // GDO2 Output Pin Configuration
+#define CC1101_IOCFG1            0x01        // GDO1 Output Pin Configuration
+#define CC1101_IOCFG0            0x02        // GDO0 Output Pin Configuration
+#define CC1101_FIFOTHR           0x03        // RX FIFO and TX FIFO Thresholds
+#define CC1101_SYNC1             0x04        // Sync Word, High Byte
+#define CC1101_SYNC0             0x05        // Sync Word, Low Byte
+#define CC1101_PKTLEN            0x06        // Packet Length
+#define CC1101_PKTCTRL1          0x07        // Packet Automation Control
+#define CC1101_PKTCTRL0          0x08        // Packet Automation Control
+#define CC1101_ADDR              0x09        // Device Address
+#define CC1101_CHANNR            0x0A        // Channel Number
+#define CC1101_FSCTRL1           0x0B        // Frequency Synthesizer Control
+#define CC1101_FSCTRL0           0x0C        // Frequency Synthesizer Control
+#define CC1101_FREQ2             0x0D        // Frequency Control Word, High Byte
+#define CC1101_FREQ1             0x0E        // Frequency Control Word, Middle Byte
+#define CC1101_FREQ0             0x0F        // Frequency Control Word, Low Byte
+#define CC1101_MDMCFG4           0x10        // Modem Configuration
+#define CC1101_MDMCFG3           0x11        // Modem Configuration
+#define CC1101_MDMCFG2           0x12        // Modem Configuration
+#define CC1101_MDMCFG1           0x13        // Modem Configuration
+#define CC1101_MDMCFG0           0x14        // Modem Configuration
+#define CC1101_DEVIATN           0x15        // Modem Deviation Setting
+#define CC1101_MCSM2             0x16        // Main Radio Control State Machine Configuration
+#define CC1101_MCSM1             0x17        // Main Radio Control State Machine Configuration
+#define CC1101_MCSM0             0x18        // Main Radio Control State Machine Configuration
+#define CC1101_FOCCFG            0x19        // Frequency Offset Compensation Configuration
+#define CC1101_BSCFG             0x1A        // Bit Synchronization Configuration
+#define CC1101_AGCCTRL2          0x1B        // AGC Control
+#define CC1101_AGCCTRL1          0x1C        // AGC Control
+#define CC1101_AGCCTRL0          0x1D        // AGC Control
+#define CC1101_WOREVT1           0x1E        // High Byte Event0 Timeout
+#define CC1101_WOREVT0           0x1F        // Low Byte Event0 Timeout
+#define CC1101_WORCTRL           0x20        // Wake On Radio Control
+#define CC1101_FREND1            0x21        // Front End RX Configuration
+#define CC1101_FREND0            0x22        // Front End TX Configuration
+#define CC1101_FSCAL3            0x23        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL2            0x24        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL1            0x25        // Frequency Synthesizer Calibration
+#define CC1101_FSCAL0            0x26        // Frequency Synthesizer Calibration
+#define CC1101_RCCTRL1           0x27        // RC Oscillator Configuration
+#define CC1101_RCCTRL0           0x28        // RC Oscillator Configuration
+#define CC1101_FSTEST            0x29        // Frequency Synthesizer Calibration Control
+#define CC1101_PTEST             0x2A        // Production Test
+#define CC1101_AGCTEST           0x2B        // AGC Test
+#define CC1101_TEST2             0x2C        // Various Test Settings
+#define CC1101_TEST1             0x2D        // Various Test Settings
+#define CC1101_TEST0             0x2E        // Various Test Settings
+
+/**
+ * Status registers
+ */
+#define CC1101_PARTNUM           0x30        // Chip ID
+#define CC1101_VERSION           0x31        // Chip ID
+#define CC1101_FREQEST           0x32        // Frequency Offset Estimate from Demodulator
+#define CC1101_LQI               0x33        // Demodulator Estimate for Link Quality
+#define CC1101_RSSI              0x34        // Received Signal Strength Indication
+#define CC1101_MARCSTATE         0x35        // Main Radio Control State Machine State
+#define CC1101_WORTIME1          0x36        // High Byte of WOR Time
+#define CC1101_WORTIME0          0x37        // Low Byte of WOR Time
+#define CC1101_PKTSTATUS         0x38        // Current GDOx Status and Packet Status
+#define CC1101_VCO_VC_DAC        0x39        // Current Setting from PLL Calibration Module
+#define CC1101_TXBYTES           0x3A        // Underflow and Number of Bytes
+#define CC1101_RXBYTES           0x3B        // Overflow and Number of Bytes
+#define CC1101_RCCTRL1_STATUS    0x3C        // Last RC Oscillator Calibration Result
+#define CC1101_RCCTRL0_STATUS    0x3D        // Last RC Oscillator Calibration Result 
+
+/**
+ * CC1101 configuration registers - Default values extracted from SmartRF Studio
+ *
+ * Configuration:
+ *
+ * Deviation = 20.629883 
+ * Base frequency = 867.999939 
+ * Carrier frequency = 867.999939 
+ * Channel number = 0 
+ * Carrier frequency = 867.999939 
+ * Modulated = true 
+ * Modulation format = GFSK 
+ * Manchester enable = false
+ * Data whitening = off
+ * Sync word qualifier mode = 30/32 sync word bits detected 
+ * Preamble count = 4 
+ * Channel spacing = 199.951172 
+ * Carrier frequency = 867.999939 
+ * Data rate = 38.3835 Kbps
+ * RX filter BW = 101.562500 
+ * Data format = Normal mode 
+ * Length config = Variable packet length mode. Packet length configured by the first byte after sync word 
+ * CRC enable = true 
+ * Packet length = 255 
+ * Device address = 1 
+ * Address config = Enable address check
+ * Append status = Append two status bytes to the payload of the packet. The status bytes contain RSSI and
+ * LQI values, as well as CRC OK
+ * CRC autoflush = false 
+ * PA ramping = false 
+ * TX power = 12
+ * GDO0 mode = Asserts when sync word has been sent / received, and de-asserts at the end of the packet.
+ * In RX, the pin will also de-assert when a packet is discarded due to address or maximum length filtering
+ * or when the radio enters RXFIFO_OVERFLOW state. In TX the pin will de-assert if the TX FIFO underflows
+ * Settings optimized for low current consumption
+ */
+//#define CC1101_DEFVAL_IOCFG2     0x29        // GDO2 Output Pin Configuration
+#define CC1101_DEFVAL_IOCFG2     0x0D        // GDO2 Output Pin Configuration
+#define CC1101_DEFVAL_IOCFG1     0x2E        // GDO1 Output Pin Configuration
+#define CC1101_DEFVAL_IOCFG0     0x2D        // GDO0 Output Pin Configuration
+#define CC1101_DEFVAL_FIFOTHR    0x07        // RX FIFO and TX FIFO Thresholds
+#define CC1101_DEFVAL_SYNC1      0xD3        // Synchronization word, high byte
+#define CC1101_DEFVAL_SYNC0      0x91        // Synchronization word, low byte
+#define CC1101_DEFVAL_PKTLEN     0x3D        // Packet Length
+#define CC1101_DEFVAL_PKTCTRL1   0x04        // Packet Automation Control
+#define CC1101_DEFVAL_PKTCTRL0   0x32        // Packet Automation Control
+#define CC1101_DEFVAL_ADDR       0xFF        // Device Address
+#define CC1101_DEFVAL_CHANNR     0x00        // Channel Number
+#define CC1101_DEFVAL_FSCTRL1    0x06        // Frequency Synthesizer Control
+#define CC1101_DEFVAL_FSCTRL0    0x00        // Frequency Synthesizer Control
+// Carrier frequency = 868 MHz
+#define CC1101_DEFVAL_FREQ2_868  0x21        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_868  0x62        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_868  0x76        // Frequency Control Word, Low Byte
+// Carrier frequency = 902 MHz
+#define CC1101_DEFVAL_FREQ2_915  0x22        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_915  0xB1        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_915  0x3B        // Frequency Control Word, Low Byte
+// Carrier frequency = 918 MHz
+#define CC1101_DEFVAL_FREQ2_918  0x23        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_918  0x4E        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_918  0xC4        // Frequency Control Word, Low Byte
+
+// Carrier frequency = 433 MHz
+#define CC1101_DEFVAL_FREQ2_433  0x10        // Frequency Control Word, High Byte
+#define CC1101_DEFVAL_FREQ1_433  0xB0        // Frequency Control Word, Middle Byte
+#define CC1101_DEFVAL_FREQ0_433  0xB0       // Frequency Control Word, Low Byte
+
+#define CC1101_DEFVAL_MDMCFG4    0xA9     // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG3    0xE4      // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG2    0x30        // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG1    0x22        // Modem Configuration
+#define CC1101_DEFVAL_MDMCFG0    0xF8        // Modem Configuration
+#define CC1101_DEFVAL_DEVIATN    0x00      // Modem Deviation Setting
+#define CC1101_DEFVAL_MCSM2      0x07        // Main Radio Control State Machine Configuration
+//#define CC1101_DEFVAL_MCSM1      0x30        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_MCSM1      0x30        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_MCSM0      0x18        // Main Radio Control State Machine Configuration
+#define CC1101_DEFVAL_FOCCFG     0x14        // Frequency Offset Compensation Configuration
+#define CC1101_DEFVAL_BSCFG      0x6C        // Bit Synchronization Configuration
+#define CC1101_DEFVAL_AGCCTRL2   0x04        // AGC Control
+#define CC1101_DEFVAL_AGCCTRL1   0x00       // AGC Control
+#define CC1101_DEFVAL_AGCCTRL0   0x92        // AGC Control
+#define CC1101_DEFVAL_WOREVT1    0x87        // High Byte Event0 Timeout
+#define CC1101_DEFVAL_WOREVT0    0x6B        // Low Byte Event0 Timeout
+#define CC1101_DEFVAL_WORCTRL    0xF8        // Wake On Radio Control
+#define CC1101_DEFVAL_FREND1     0xB6        // Front End RX Configuration
+#define CC1101_DEFVAL_FREND0     0x11        // Front End TX Configuration
+#define CC1101_DEFVAL_FSCAL3     0xE9        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL2     0x2A        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL1     0x00        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_FSCAL0     0x1F        // Frequency Synthesizer Calibration
+#define CC1101_DEFVAL_RCCTRL1    0x41        // RC Oscillator Configuration
+#define CC1101_DEFVAL_RCCTRL0    0x00        // RC Oscillator Configuration
+#define CC1101_DEFVAL_FSTEST     0x59        // Frequency Synthesizer Calibration Control
+#define CC1101_DEFVAL_PTEST      0x7F        // Production Test
+#define CC1101_DEFVAL_AGCTEST    0x3F        // AGC Test
+#define CC1101_DEFVAL_TEST2      0x81        // Various Test Settings
+#define CC1101_DEFVAL_TEST1      0x35        // Various Test Settings
+#define CC1101_DEFVAL_TEST0      0x09        // Various Test Settings
+
+/**
+ * Alias for some default values
+ */
+#define CCDEF_CHANNR  CC1101_DEFVAL_CHANNR
+#define CCDEF_SYNC0  CC1101_DEFVAL_SYNC0
+#define CCDEF_SYNC1  CC1101_DEFVAL_SYNC1
+#define CCDEF_ADDR  CC1101_DEFVAL_ADDR
+
+/**
+ * Macros
+ */
+// Read CC1101 Config register
+#define readConfigReg(regAddr)    readReg(regAddr, CC1101_CONFIG_REGISTER)
+// Read CC1101 Status register
+#define readStatusReg(regAddr)    readReg(regAddr, CC1101_STATUS_REGISTER)
+// Enter Rx state
+//#define setRxState()              cmdStrobe(CC1101_SRX)
+// Enter Tx state
+//#define setTxState()              cmdStrobe(CC1101_STX)
+// Enter IDLE state
+#define setIdleState()            cmdStrobe(CC1101_SIDLE)
+// Flush Rx FIFO
+#define flushRxFifo()             cmdStrobe(CC1101_SFRX)
+// Flush Tx FIFO
+#define flushTxFifo()             cmdStrobe(CC1101_SFTX)
+// Disable address check
+#define disableAddressCheck()     writeReg(CC1101_PKTCTRL1, 0x04)
+// Enable address check
+#define enableAddressCheck()      writeReg(CC1101_PKTCTRL1, 0x06)
+// Disable CCA
+#define disableCCA()              writeReg(CC1101_MCSM1, 0)
+// Enable CCA
+#define enableCCA()               writeReg(CC1101_MCSM1, CC1101_DEFVAL_MCSM1)
+// Set PATABLE single byte
+#define setTxPowerAmp(setting)    paTableByte = setting
+// PATABLE values
+#define PA_LowPower               0x60
+#define PA_LongDistance           0xC0
+
+/**
+ * Class: CC1101
+ * 
+ * Description:
+ * CC1101 interface
+ */
+class CC1101
+{
+  private:
+    /**
+     * Atmega's SPI interface
+     */
+    SPIClass spi;
+
+    /**
+     * writeBurstReg
+     * 
+     * Write multiple registers into the CC1101 IC via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'buffer'	Data to be writen
+     * 'len'	Data length
+     */
+    void writeBurstReg(uint8_t regAddr, uint8_t* buffer, uint8_t len);
+
+    /**
+     * readBurstReg
+     * 
+     * Read burst data from CC1101 via SPI
+     * 
+     * 'buffer'	Buffer where to copy the result to
+     * 'regAddr'	Register address
+     * 'len'	Data length
+     */
+    void readBurstReg(uint8_t * buffer, uint8_t regAddr, uint8_t len);
+
+    /**
+     * setRegsFromEeprom
+     * 
+     * Set registers from EEPROM
+     */
+    void setRegsFromEeprom(void);
+
+  public:
+    /*
+     * RF state
+     */
+    uint8_t rfState;
+
+    /**
+     * Tx Power byte (single PATABLE config)
+     */
+    uint8_t paTableByte;
+
+    /**
+     * Carrier frequency
+     */
+    uint8_t carrierFreq;
+
+    /**
+     * Frequency channel
+     */
+    uint8_t channel;
+
+    /**
+     * Synchronization word
+     */
+    uint8_t syncWord[2];
+
+    /**
+     * Device address
+     */
+    uint8_t devAddress;
+
+    /**
+     * CC1101
+     * 
+     * Class constructor
+     */
+    CC1101(void);
+
+    /**
+     * cmdStrobe
+     * 
+     * Send command strobe to the CC1101 IC via SPI
+     * 
+     * 'cmd'	Command strobe
+     */
+    void cmdStrobe(uint8_t cmd);
+
+    /**
+     * wakeUp
+     * 
+     * Wake up CC1101 from Power Down state
+     */
+    void wakeUp(void);
+
+    /**
+     * readReg
+     * 
+     * Read CC1101 register via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'regType'	Type of register: CC1101_CONFIG_REGISTER or CC1101_STATUS_REGISTER
+     * 
+     * Return:
+     * 	Data byte returned by the CC1101 IC
+     */
+    uint8_t readReg(uint8_t regAddr, uint8_t regType);
+
+    /**
+     * writeReg
+     * 
+     * Write single register into the CC1101 IC via SPI
+     * 
+     * 'regAddr'	Register address
+     * 'value'	Value to be writen
+     */
+    void writeReg(uint8_t regAddr, uint8_t value);
+
+    /**
+     * setCCregs
+     * 
+     * Configure CC1101 registers
+     */
+    void setCCregs(void);
+
+    /**
+     * reset
+     * 
+     * Reset CC1101
+     */
+    void reset(void);
+    
+    /**
+     * init
+     * 
+     * Initialize CC1101 radio
+     *
+     * @param freq Carrier frequency
+     */
+    void init(uint8_t freq=CFREQ_868);
+
+    /**
+     * setSyncWord
+     * 
+     * Set synchronization word
+     * 
+     * 'syncH'	Synchronization word - High byte
+     * 'syncL'	Synchronization word - Low byte
+     */
+    void setSyncWord(uint8_t syncH, uint8_t syncL);
+
+    /**
+     * setSyncWord (overriding method)
+     * 
+     * Set synchronization word
+     * 
+     * 'syncH'	Synchronization word - pointer to 2-byte array
+     */
+    void setSyncWord(uint8_t *sync);
+
+    /**
+     * setDevAddress
+     * 
+     * Set device address
+     * 
+     * 'addr'	Device address
+     */
+    void setDevAddress(uint8_t addr);
+
+    /**
+     * setCarrierFreq
+     * 
+     * Set carrier frequency
+     * 
+     * 'freq'	New carrier frequency
+     */
+    void setCarrierFreq(uint8_t freq);
+    
+    /**
+     * setChannel
+     * 
+     * Set frequency channel
+     * 
+     * 'chnl'	Frequency channel
+     */
+    void setChannel(uint8_t chnl);
+
+    /**
+     * setPowerDownState
+     * 
+     * Put CC1101 into power-down state
+     */
+    void setPowerDownState();
+    
+    /**
+     * sendData
+     * 
+     * Send data packet via RF
+     * 
+     * 'packet'	Packet to be transmitted. First byte is the destination address
+     *
+     *  Return:
+     *    True if the transmission succeeds
+     *    False otherwise
+     */
+    bool sendData(CCPACKET packet);
+
+    /**
+     * receiveData
+     * 
+     * Read data packet from RX FIFO
+     * 
+     * Return:
+     * 	Amount of bytes received
+     */
+    uint8_t receiveData(CCPACKET *packet);
+    
+    /**
+     * setRxState
+     * 
+     * Enter Rx state
+     */
+    void setRxState(void);
+
+    /**
+     * setTxState
+     * 
+     * Enter Tx state
+     */
+    void setTxState(void);
+};
+
+#endif
+
diff --git a/lib/cc1101/ccpacket.h b/lib/cc1101/ccpacket.h
new file mode 100644
index 000000000..02f131e94
--- /dev/null
+++ b/lib/cc1101/ccpacket.h
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2011 panStamp <contact@panstamp.com>
+ * 
+ * This file is part of the panStamp project.
+ * 
+ * panStamp  is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ * 
+ * panStamp 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 Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with panStamp; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 
+ * USA
+ * 
+ * Author: Daniel Berenguer
+ * Creation date: 06/03/2013
+ */
+
+#ifndef _CCPACKET_H
+#define _CCPACKET_H
+
+/**
+ * Buffer and data lengths
+ */
+#define CCPACKET_BUFFER_LEN        64
+#define CCPACKET_DATA_LEN          CCPACKET_BUFFER_LEN - 3
+
+/**
+ * Class: CCPACKET
+ * 
+ * Description:
+ * CC1101 data packet class
+ */
+struct CCPACKET
+{
+  public:
+    /**
+     * Data length
+     */
+    unsigned char length;
+
+    /**
+     * Data buffer
+     */
+    unsigned char data[CCPACKET_DATA_LEN];
+
+    /**
+     * CRC OK flag
+     */
+    bool crc_ok;
+
+    /**
+     * Received Strength Signal Indication
+     */
+    unsigned char rssi;
+
+    /**
+     * Link Quality Index
+     */
+    unsigned char lqi;
+};
+
+#endif
+
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index c2cf75fe0..fa31b37ef 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,6 +415,7 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
+//#define USE_KEELOQ
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/settings.h b/tasmota/settings.h
index b1afca3ea..51151afd1 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -466,8 +466,12 @@ struct SYSCFG {
   uint8_t       sps30_inuse_hours;         // F02
   uint8_t       hotplug_scan;              // F03
   uint8_t       reserved1;                 // F04 - reserved for s-hadinger
+  uint8_t       free_f05[191];             // F05
 
-  uint8_t       free_f05[207];             // F05
+  uint32_t      keeloq_master_msb;         // FC4
+  uint32_t      keeloq_master_lsb;         // FC8
+  uint32_t      keeloq_serial;             // FCD
+  uint32_t      keeloq_count;              // FD0
 
   uint32_t      bootcount_reset_time;      // FD4
   int           adc_param4;                // FD8
diff --git a/tasmota/xdrv_35_keeloq.ino b/tasmota/xdrv_35_keeloq.ino
new file mode 100644
index 000000000..c360fdb8e
--- /dev/null
+++ b/tasmota/xdrv_35_keeloq.ino
@@ -0,0 +1,275 @@
+/*
+  xdrv_35
+
+  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/>.
+*/
+
+#ifdef USE_KEELOQ
+
+#define XDRV_35 35
+
+#include "cc1101.h"
+#include <KeeloqLib.h>
+
+#define SYNC_WORD 199
+
+#define Lowpulse         400
+#define Highpulse        800
+
+#define TX_PORT            4              // Outputport for transmission
+#define RX_PORT            5              // Inputport for reception
+
+const char kJaroliftCommands[] PROGMEM = "Keeloq|" // prefix
+  "SendRaw|SendButton|Set";
+
+void (* const jaroliftCommand[])(void) PROGMEM = {
+  &CmndSendRaw, &CmdSendButton, &CmdSet};
+
+CC1101 cc1101;
+
+struct JAROLIFT_DEVICE {
+  int device_key_msb       = 0x0; // stores cryptkey MSB
+  int device_key_lsb       = 0x0; // stores cryptkey LSB
+  uint64_t button          = 0x0; // 1000=0x8 up, 0100=0x4 stop, 0010=0x2 down, 0001=0x1 learning
+  int disc                 = 0x0100; // 0x0100 for single channel remote
+  uint32_t enc             = 0x0;   // stores the 32Bit encrypted code
+  uint64_t pack            = 0;   // Contains data to send.
+  int count                = 0;
+  uint32_t serial          = 0x0;
+} jaroliftDevice;
+
+void CmdSet(void)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("set called, check for params master key high, low, serial, counter.."));
+  if (XdrvMailbox.data_len > 0) {
+    if (XdrvMailbox.payload > 0) {
+      char *p;
+      uint32_t i = 0;
+      uint32_t param[4] = { 0 };
+      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 4; str = strtok_r(nullptr, ", ", &p)) {
+        param[i] = strtoul(str, nullptr, 0);
+        i++;
+      }
+      for (uint32_t i = 0; i < 3; i++) {
+        if (param[i] < 1) { param[i] = 1; }  // msb, lsb, serial, counter
+      }
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("params: %08x %08x %08x %08x"), param[0], param[1], param[2], param[3]);
+      Settings.keeloq_master_msb = param[0];
+      Settings.keeloq_master_lsb = param[1];
+      Settings.keeloq_serial = param[2];
+      Settings.keeloq_count = param[3];
+      
+      jaroliftDevice.serial = param[2];
+      jaroliftDevice.count = param[3];
+ 
+      GenerateDeviceCryptKey();
+      ResponseCmndDone();
+    } else {
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("no payload"));      
+    } 
+  } else {
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("no param"));
+  }
+}
+
+void GenerateDeviceCryptKey()
+{
+  Keeloq k(Settings.keeloq_master_msb, Settings.keeloq_master_lsb);
+  jaroliftDevice.device_key_msb = k.decrypt(jaroliftDevice.serial | 0x60000000L);
+  jaroliftDevice.device_key_lsb = k.decrypt(jaroliftDevice.serial | 0x20000000L);
+  
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("device keys: %08x %08x"), jaroliftDevice.device_key_msb, jaroliftDevice.device_key_lsb);
+}
+
+void CmdSendButton(void)
+{
+  noInterrupts();
+  entertx();
+  
+  if (XdrvMailbox.data_len > 0)
+  {
+    if (XdrvMailbox.payload > 0)
+    {
+      jaroliftDevice.button = strtoul(XdrvMailbox.data, nullptr, 0);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("msb: %08x"), jaroliftDevice.device_key_msb);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("lsb: %08x"), jaroliftDevice.device_key_lsb);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("count: %08x"), jaroliftDevice.count);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("serial: %08x"), jaroliftDevice.serial);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("disc: %08x"), jaroliftDevice.disc);
+      
+      CreateKeeloqPacket();
+      jaroliftDevice.count++;
+      Settings.keeloq_count = jaroliftDevice.count;
+
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("sync frame"));
+      digitalWrite(TX_PORT, LOW);      // CC1101 in TX Mode+
+      delayMicroseconds(1150);
+      SendSyncPreamble(13);
+      delayMicroseconds(3500);
+      for(int i=72; i>0; i--)
+      {
+        SendBit(jaroliftDevice.pack & 0x0000000000000001);
+        jaroliftDevice.pack >>= 1;
+      }
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
+  
+      delay(16); // delay in loop context is save for wdt
+    }
+  }
+
+  interrupts();
+  enterrx();
+
+  ResponseCmndDone();
+}
+
+void SendBit(byte bitToSend)
+{
+  if (bitToSend==1)
+  {
+    digitalWrite(TX_PORT, LOW);  // Simple encoding of bit state 1
+    delayMicroseconds(Lowpulse);
+    digitalWrite(TX_PORT, HIGH);
+    delayMicroseconds(Highpulse);
+  }
+  else
+  {
+    digitalWrite(TX_PORT, LOW);  // Simple encoding of bit state 0
+    delayMicroseconds(Highpulse);
+    digitalWrite(TX_PORT, HIGH);
+    delayMicroseconds(Lowpulse);
+  }
+}
+
+void CmndSendRaw(void)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("cmd send called at %d"), micros());
+  noInterrupts();
+  entertx();
+  for(int repeat = 0; repeat < 1; repeat++)
+  {
+    if (XdrvMailbox.data_len > 0)
+    {
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("sync frame"));
+      digitalWrite(TX_PORT, LOW);
+      delayMicroseconds(1150);
+      SendSyncPreamble(13);
+      delayMicroseconds(3500);
+
+      for(int i=XdrvMailbox.data_len-1; i>=0; i--)
+      {
+        SendBit(XdrvMailbox.data[i] == '1');
+      }
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
+  
+      delay(16);                       // delay in loop context is save for wdt
+    }
+    interrupts();
+  }
+  enterrx();
+  ResponseCmndDone();
+}
+
+void enterrx() {
+  unsigned char marcState = 0;
+  cc1101.setRxState();
+  delay(2);
+  unsigned long rx_time = micros();
+  while (((marcState = cc1101.readStatusReg(CC1101_MARCSTATE)) & 0x1F) != 0x0D )
+  {
+    if (micros() - rx_time > 50000) break; // Quit when marcState does not change...
+  }
+} // void enterrx
+
+//####################################################################
+// put CC1101 to send mode
+//####################################################################
+void entertx() {
+  unsigned char marcState = 0;
+  cc1101.setTxState();
+  delay(2);
+  unsigned long rx_time = micros();
+  while (((marcState = cc1101.readStatusReg(CC1101_MARCSTATE)) & 0x1F) != 0x13 && 0x14 && 0x15)
+  {
+    if (micros() - rx_time > 50000) break; // Quit when marcState does not change...
+  }
+} // void entertx
+
+void SendSyncPreamble(int l)
+{
+  for (int i = 0; i < l; ++i)
+  {
+    digitalWrite(TX_PORT, LOW);
+    delayMicroseconds(400);
+    digitalWrite(TX_PORT, HIGH);
+    delayMicroseconds(380);
+  }
+}
+
+void CreateKeeloqPacket()
+{
+  Keeloq k(jaroliftDevice.device_key_msb, jaroliftDevice.device_key_lsb);
+  unsigned int result = (jaroliftDevice.disc << 16) | jaroliftDevice.count;
+  jaroliftDevice.pack = (uint64_t)0;
+	jaroliftDevice.pack |= jaroliftDevice.serial & 0xfffffffL;
+	jaroliftDevice.pack |= (jaroliftDevice.button & 0xfL) << 28;
+  jaroliftDevice.pack <<= 32;
+
+  jaroliftDevice.enc = k.encrypt(result);
+  jaroliftDevice.pack |= jaroliftDevice.enc;
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("pack high: %08x"), jaroliftDevice.pack>>32);
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("pack low:  %08x"), jaroliftDevice.pack);
+}
+
+void InitKeeloq()
+{
+  AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("cc1101.init()"));
+  delay(100);
+  cc1101.init();
+  AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("CC1101 done."));
+  cc1101.setSyncWord(SYNC_WORD, false);
+  cc1101.setCarrierFreq(CFREQ_433);
+  cc1101.disableAddressCheck();
+
+  pinMode(TX_PORT, OUTPUT); 
+  pinMode(RX_PORT, INPUT_PULLUP);
+
+  jaroliftDevice.serial = Settings.keeloq_serial;
+  jaroliftDevice.count = Settings.keeloq_count;
+  GenerateDeviceCryptKey();
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+bool Xdrv35(uint8_t function)
+{
+  bool result = false;
+     
+  switch (function) {
+    case FUNC_INIT:
+      InitKeeloq();
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("init done."));
+      break;
+    case FUNC_COMMAND:
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("calling command"));
+      result = DecodeCommand(kJaroliftCommands, jaroliftCommand);
+      break;
+  }
+
+  return result;
+}
+
+#endif // USE_KEELOQ

From a550fe3ac765a2761e153308a7df21865fc4c425 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 16:34:45 -0600
Subject: [PATCH 321/403] Use newly allocated settings and flag

---
 Device_Groups.md                  |   8 +-
 tasmota/settings.h                |  11 +--
 tasmota/support_command.ino       |   2 +-
 tasmota/support_device_groups.ino | 129 +++++++++++++++---------------
 tasmota/support_udp.ino           |   2 +-
 tasmota/support_wifi.ino          |   2 +-
 tasmota/tasmota.ino               |   3 -
 tasmota/tasmota_post.h            |   4 +
 tasmota/xdrv_01_webserver.ino     |   2 +-
 9 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/Device_Groups.md b/Device_Groups.md
index c5990136f..3384132b4 100644
--- a/Device_Groups.md
+++ b/Device_Groups.md
@@ -2,7 +2,7 @@
 
 The device groups module provides a framework to allow multiple devices to be in a group with values such as power, light color/temperature/brightness, PWM values, sensor values, etc. shared with other devices in the group. For example, with multiple light modules in a device group, the light settings can be changed on one module and the settings will automatically be changed on the other light modules. Dimmer switch modules could be in a device group with light modules and the dimmer switch could control the power, brightness and colors of all the lights in the group. Multiple dimmer switches could be in a device group to form a 3-way/4-way dimmer switch.
 
-UDP broadcasts, followed by UDP unicasts if necessary, are used to send updates to all devices so updates are fast. There is no need for an MQTT server but all the devices in a group must be on the same IP network.
+UDP multicasts, followed by UDP unicasts if necessary, are used to send updates to all devices so updates are fast. There is no need for an MQTT server but all the devices in a group must be on the same IP network.
 
 To include device groups support in the build, define USE_DEVICE_GROUPS in your user_config_override. This adds 3.5K to the code size. All devices in a group must be running firmware with device group support and have device groups enabled.
 
@@ -13,7 +13,7 @@ To enable device groups, set Option16 to 1 and **restart the device**.
 
 The device group name is the MQTT group topic set with the GroupTopic command. All devices in the same IP network with the same group topic are in the same group. Some modules may define additional device groups. For example, if Remote Device Mode is enabled, the PWM Dimmer module defines three devices groups.
 
-The items that are sent to the group and the items that are received from the group are selected with the DevGroupShare command. By default all items are sent and received from the group. An example of when the DevGroupShare command would be used is when you have a group of lights that you control with a dimmer switch and home automation software. You want the dimmer switch to be able to control all items. The home automation software controls each light individually. When it controls the whole group, it actually sends command to each light in the group. If you use the home automation software to turn an individual light on or off or change it’s brightness, color or scheme, you do not want the change to be replicated to the other lights. In this case, you would set the incoming and outgoing item masks to 255 on the dimmer switch (DevGroupShare 255,255) and set the incoming item mask to 255 and outgoing item mask to 0 on all the lights (DevGroupShare 255,0).
+The items that are sent to the group and the items that are received from the group are selected with the DevGroupShare command. By default all items are sent and received from the group. An example of when the DevGroupShare command would be used is when you have a group of lights that you control with a dimmer switch and home automation software. You want the dimmer switch to be able to control all items. The home automation software controls each light individually. When it controls the whole group, it actually sends command to each light in the group. If you use the home automation software to turn an individual light on or off or change it’s brightness, color or scheme, you do not want the change to be replicated to the other lights. In this case, you would set the incoming and outgoing item masks to 0xffffffff (all items) on the dimmer switch (DevGroupShare 0xffffffff,0xffffffff) and set the incoming item mask to 0xffffffff and outgoing item mask to 0 on all the lights (DevGroupShare 0xffffffff,0).
 
 
 ### Commands
@@ -29,7 +29,7 @@ The items that are sent to the group and the items that are received from the gr
   <tr>
    <td>DevGroupShare
    </td>
-   <td><in>,&lt;out> = set incoming and outgoing shared item mask (default = 255,255)
+   <td><in>,&lt;out> = set incoming and outgoing shared item mask (default = 0xffffffff,0xffffffff)
 <p>
 1 = Power, 2 = Light brightness, 4 = Light fade/speed, 8 = Light scheme, 16 = Light color, 32 = Minimum brightness
    </td>
@@ -42,4 +42,4 @@ The items that are sent to the group and the items that are received from the gr
 <value> = set device group &lt;x> MQTT group topic (32 chars max) and restart
    </td>
   </tr>
-</table>
+</table>
\ No newline at end of file
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 972af6974..514cf7bdd 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -104,7 +104,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t alexa_ct_range : 1;           // bit 0 (v8.1.0.2)   - SetOption82 - Reduced CT range for Alexa
     uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
-    uint32_t spare03 : 1;
+    uint32_t device_groups_enabled : 1;    // bit 3 (v8.1.0.10)  - SetOption85 - Enable device groups
     uint32_t spare04 : 1;
     uint32_t spare05 : 1;
     uint32_t spare06 : 1;
@@ -467,8 +467,10 @@ struct SYSCFG {
   uint8_t       hotplug_scan;              // F03
   uint8_t       reserved1;                 // F04 - reserved for s-hadinger
 
-  uint8_t       free_f05[207];             // F05
+  uint8_t       free_f05[199];             // F05
 
+  uint32_t      device_group_share_in;     // FCC - Bitmask of device group items imported
+  uint32_t      device_group_share_out;    // FD0 - Bitmask of device group items exported
   uint32_t      bootcount_reset_time;      // FD4
   int           adc_param4;                // FD8
   uint32_t      shutter_button[MAX_KEYS];  // FDC
@@ -573,9 +575,4 @@ typedef union {
   ADC_MODE(ADC_VCC);                       // Set ADC input for Power Supply Voltage usage
 #endif
 
-// Settings re-purposed for device groups
-#define device_groups_enabled  ws_clock_reverse   // SetOption16 - Enable device groups
-#define device_group_share_in  domoticz_sensor_idx[0]    // Bitmask of device group items imported
-#define device_group_share_out domoticz_sensor_idx[1]    // Bitmask of device group items exported
-
 #endif  // _SETTINGS_H_
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 772e22eeb..59d6b11d5 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1677,7 +1677,7 @@ void CmndDevGroupShare(void)
   ParseParameters(2, parm);
   Settings.device_group_share_in = parm[0];
   Settings.device_group_share_out = parm[1];
-  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%d,\"Out\":%d}}"), Settings.device_group_share_in, Settings.device_group_share_out);
+  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%x,\"Out\":%x}}"), Settings.device_group_share_in, Settings.device_group_share_out);
 }
 #endif  // USE_DEVICE_GROUPS
 
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 336b13cad..63775d0c3 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -49,7 +49,7 @@ struct device_group {
 
 struct device_group * device_groups;
 uint16_t outgoing_sequence = 0;
-bool initialized = false;
+bool device_groups_active = false;
 bool building_status_message = false;
 bool processing_remote_device_message = false;
 bool waiting_for_acks;
@@ -60,36 +60,33 @@ void DeviceGroupsInit(void)
   /*
     Initialize the device information for each device group. The group name is the MQTT group topic.
   */
-  if (Settings.flag.device_groups_enabled) {
-    device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
-    if (device_groups == nullptr) {
-      AddLog_P2(LOG_LEVEL_ERROR, "DGR: error allocating %u-element device group array", device_group_count);
-      Settings.flag.device_groups_enabled = false;
-      return;
-    }
-
-    for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
-      struct device_group * device_group = &device_groups[device_group_index];
-      strcpy(device_group->group_name, SettingsText((device_group_index == 0 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + device_group_index - 1)));
-      device_group->message_header_length = sprintf(device_group->message, "%s%s HTTP/1.1\n\n", kDeviceGroupMessage, device_group->group_name);
-      device_group->last_full_status_sequence = -1;
-    }
-
-    device_groups[0].local = true;
-
-    // If both in and out shared items masks are 0, assume they're unitialized and initialize them.
-    if (!Settings.device_group_share_in && !Settings.device_group_share_out) {
-      Settings.device_group_share_in = Settings.device_group_share_out = 0xff;
-    }
-
-    initialized = true;
+  device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
+  if (device_groups == nullptr) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating %u-element device group array"), device_group_count);
+    return;
   }
+
+  for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+    struct device_group * device_group = &device_groups[device_group_index];
+    strcpy(device_group->group_name, SettingsText((device_group_index == 0 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + device_group_index - 1)));
+    device_group->message_header_length = sprintf_P(device_group->message, PSTR("%s%s HTTP/1.1\n\n"), kDeviceGroupMessage, device_group->group_name);
+    device_group->last_full_status_sequence = -1;
+  }
+
+  device_groups[0].local = true;
+
+  // If both in and out shared items masks are 0, assume they're unitialized and initialize them.
+  if (!Settings.device_group_share_in && !Settings.device_group_share_out) {
+    Settings.device_group_share_in = Settings.device_group_share_out = 0xffffffff;
+  }
+
+  device_groups_active = true;
 }
 
 char * IPAddressToString(const IPAddress& ip_address)
 {
   static char buffer[16];
-  sprintf(buffer, "%u.%u.%u.%u", ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
+  sprintf_P(buffer, PSTR("%u.%u.%u.%u"), ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
   return buffer;
 }
 
@@ -131,13 +128,13 @@ void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * la
     }
     delay(10);
   }
-  AddLog_P2(LOG_LEVEL_ERROR, "DGR: error sending %s packet", label);
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error sending %s packet"), label);
 }
 
 void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
 {
-  // If device groups are not enabled, ignore this request.
-  if (!Settings.flag.device_groups_enabled) return;
+  // If device groups are not active, ignore this request.
+  if (!device_groups_active) return;
 
   // If UDP is not set up, ignore this request.
   if (!udp_connected) return;
@@ -152,7 +149,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
   if (device_group->initial_status_requests_remaining) return;
 
   // A full status request is a request from a remote device for the status of every item we
-  // control. As long as we're building it, we may as well broadcast the status update to all
+  // control. As long as we're building it, we may as well multicast the status update to all
   // device group members.
   char * message_ptr = &device_group->message[device_group->message_header_length];
   if (message_type == DGR_MSGTYP_FULL_STATUS) {
@@ -164,7 +161,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     // Call the drivers to build the status update.
     if (!++outgoing_sequence) outgoing_sequence = 1;
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "Building device group %s full status packet", device_group->group_name);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s full status packet"), device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
     device_group->message_length = 0;
     _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
@@ -191,7 +188,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     va_list ap;
 
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "Building device group %s packet", device_group->group_name);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s packet"), device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
     uint16_t original_sequence = outgoing_sequence;
     if (!building_status_message && message_type != DGR_MSGTYP_PARTIAL_UPDATE && !++outgoing_sequence) outgoing_sequence = 1;
@@ -204,7 +201,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     else if (message_type == DGR_MSGTYP_UPDATE_DIRECT)
       value |= DGR_FLAG_DIRECT;
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, ">sequence=%u, flags=%u", outgoing_sequence, value);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">sequence=%u, flags=%u"), outgoing_sequence, value);
 #endif  // DEVICE_GROUPS_DEBUG
     *message_ptr++ = value & 0xff;
     *message_ptr++ = value >> 8;
@@ -303,7 +300,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
         }
       }
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "%u items carried over from previous update", kept_item_count);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
 #endif  // DEVICE_GROUPS_DEBUG
     }
 
@@ -316,7 +313,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
         value = va_arg(ap, int);
         if (shared) {
 #ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%u", item, value);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u"), item, value);
 #endif  // DEVICE_GROUPS_DEBUG
           *message_ptr++ = value & 0xff;
           if (item > DGR_ITEM_MAX_8BIT) {
@@ -335,7 +332,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
         if (shared) {
           value = strlen((const char *)value_ptr);
 #ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%s", item, value_ptr);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%s"), item, value_ptr);
 #endif  // DEVICE_GROUPS_DEBUG
           *message_ptr++ = value;
           memcpy(message_ptr, value_ptr, value);
@@ -348,7 +345,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
             value_ptr = va_arg(ap, uint8_t *);
             if (shared) {
 #ifdef DEVICE_GROUPS_DEBUG
-              AddLog_P2(LOG_LEVEL_DEBUG, ">item=%u, value=%u,%u,%u,%u,%u", item, *value_ptr, *(value_ptr + 1), *(value_ptr + 2), *(value_ptr + 3), *(value_ptr + 4));
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u,%u,%u,%u,%u"), item, *value_ptr, *(value_ptr + 1), *(value_ptr + 2), *(value_ptr + 3), *(value_ptr + 4));
 #endif  // DEVICE_GROUPS_DEBUG
               memmove(message_ptr, value_ptr, 5);
               message_ptr += 5;
@@ -374,11 +371,11 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     if (building_status_message || message_type == DGR_MSGTYP_PARTIAL_UPDATE) return;
   }
 
-  // Broadcast the packet.
+  // Multicast the packet.
 #ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending %u-byte device group %s packet via broadcast, sequence=%u", device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via multicast, sequence=%u"), device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
 #endif  // DEVICE_GROUPS_DEBUG
-  SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Broadcast");
+  SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Multicast"));
   device_group->next_ack_check_time = millis() + 100;
 
   if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME) {
@@ -393,6 +390,9 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
 
 void ProcessDeviceGroupMessage(char * packet, int packet_length)
 {
+  // If device groups are not active, ignore this request.
+  if (!device_groups_active) return;
+
   // Make the group name a null-terminated string.
   char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
   char * message_ptr = strchr(message_group_name, ' ');
@@ -418,11 +418,11 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     if (!device_group_member) {
       device_group_member = (struct device_group_member *)calloc(1, sizeof(struct device_group_member));
       if (device_group_member == nullptr) {
-        AddLog_P2(LOG_LEVEL_ERROR, "DGR: error allocating device group member block");
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating device group member block"));
         return;
       }
 #ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, "DGR: adding member %s (%p)", IPAddressToString(remote_ip), device_group_member);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: adding member %s (%p)"), IPAddressToString(remote_ip), device_group_member);
 #endif  // DEVICE_GROUPS_DEBUG
       device_group_member->ip_address = remote_ip;
       *flink = device_group_member;
@@ -435,7 +435,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   }
 
   // Find the start of the actual message (after the http header).
-  message_ptr = strstr(message_ptr, "\n\n");
+  message_ptr = strstr_P(message_ptr, PSTR("\n\n"));
   if (message_ptr == nullptr) return;
   message_ptr += 2;
 
@@ -452,7 +452,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   flags = *message_ptr++;
   flags |= *message_ptr++ << 8;
 #ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, "Received device group %s packet from %s: sequence=%u, flags=%u", device_group->group_name, IPAddressToString(remote_ip), message_sequence, flags);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Received device group %s packet from %s: sequence=%u, flags=%u"), device_group->group_name, IPAddressToString(remote_ip), message_sequence, flags);
 #endif  // DEVICE_GROUPS_DEBUG
 
   // If this is an ack message, save the message sequence if it's newwer than the last ack we
@@ -463,7 +463,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     }
     device_group_member->timeout_time = 0;
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "<ack");
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<ack"));
 #endif  // DEVICE_GROUPS_DEBUG
     return;
   }
@@ -472,7 +472,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   if (!(flags & DGR_FLAG_MORE_TO_COME)) {
     *(message_ptr - 2) = DGR_FLAG_ACK;
     *(message_ptr - 1) = 0;      
-    SendDeviceGroupPacket(remote_ip, packet, message_ptr - packet, "Ack");
+    SendDeviceGroupPacket(remote_ip, packet, message_ptr - packet, PSTR("Ack"));
   }
 
   // If this is a status request message, then if the requestor didn't just ack our previous full
@@ -482,7 +482,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
     }
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "<status request");
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<status request"));
 #endif  // DEVICE_GROUPS_DEBUG
     return;
   }
@@ -490,7 +490,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   // If we already processed this or a later message from this group member, ignore this message.
   if (message_sequence < device_group_member->received_sequence && device_group_member->received_sequence - message_sequence > 64536) {
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, "<old message");
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<old message"));
 #endif  // DEVICE_GROUPS_DEBUG
     return;
   }
@@ -537,7 +537,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       case DGR_ITEM_LIGHT_CHANNELS:
         break;
       default:
-        AddLog_P2(LOG_LEVEL_ERROR, "DGR: ********** invalid item=%u received from device group %s member %s", item, device_group->group_name, IPAddressToString(remote_ip));
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));
     }
 #endif  // DEVICE_GROUPS_DEBUG
 
@@ -555,7 +555,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
         light_fade = value;
       }
 #ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%u", item, value);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u"), item, value);
 #endif  // DEVICE_GROUPS_DEBUG
       XdrvMailbox.payload = value;
     }
@@ -563,7 +563,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       value = *message_ptr++;
       if (value >= packet_length - (message_ptr - packet)) goto badmsg;  // Malformed message
 #ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%.*s", item, value, message_ptr);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%.*s"), item, value, message_ptr);
 #endif  // DEVICE_GROUPS_DEBUG
       XdrvMailbox.data_len = value;
       XdrvMailbox.data = message_ptr;
@@ -573,7 +573,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       switch (item) {
         case DGR_ITEM_LIGHT_CHANNELS:
 #ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, "<item=%u, value=%u,%u,%u,%u,%u", item, *message_ptr, *(message_ptr + 1), *(message_ptr + 2), *(message_ptr + 3), *(message_ptr + 4));
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u,%u,%u,%u,%u"), item, *message_ptr, *(message_ptr + 1), *(message_ptr + 2), *(message_ptr + 3), *(message_ptr + 4));
 #endif  // DEVICE_GROUPS_DEBUG
           XdrvMailbox.data = message_ptr;
           message_ptr += 5;
@@ -601,28 +601,29 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
 
   processing_remote_device_message = false;
 #ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, "<processed");
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<processed"));
 #endif  // DEVICE_GROUPS_DEBUG
   return;
 
 badmsg:
-  AddLog_P2(LOG_LEVEL_ERROR, "DGR: malformed message received from %s", IPAddressToString(remote_ip));
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: malformed message received from %s"), IPAddressToString(remote_ip));
 #ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, "packet_length=%u, offset=%u", packet_length, message_ptr - packet);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("packet_length=%u, offset=%u"), packet_length, message_ptr - packet);
 #endif  // DEVICE_GROUPS_DEBUG
   processing_remote_device_message = false;
 }
 
 void DeviceGroupsLoop(void)
 {
-  if (!Settings.flag.device_groups_enabled) return;
+  if (!Settings.flag4.device_groups_enabled) return;
   if (udp_connected) {
+    if (!device_groups_active) {
+      DeviceGroupsInit();
+      if (!device_groups_active) return;
+    }
+
     if (!udp_was_connected) {
       udp_was_connected = true;
-      if (!initialized) {
-        DeviceGroupsInit();
-        if (!Settings.flag.device_groups_enabled) return;
-      }
 
       for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
         device_group * device_group = &device_groups[device_group_index];
@@ -649,10 +650,10 @@ void DeviceGroupsLoop(void)
           if (device_group->next_ack_check_time <= now) {
             if (device_group->initial_status_requests_remaining) {
 #ifdef DEVICE_GROUPS_DEBUG
-              AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending initial status request for group %s", device_group->group_name);
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending initial status request for group %s"), device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
               if (--device_group->initial_status_requests_remaining) {
-                SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, "Initial");
+                SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Initial"));
                 device_group->message[device_group->message_header_length + 2] = DGR_FLAG_STATUS_REQUEST; // The reset flag is on only for the first packet - turn it off now
                 device_group->next_ack_check_time = now + 200;
                 waiting_for_acks = true;
@@ -671,16 +672,16 @@ void DeviceGroupsLoop(void)
 
                   if (device_group_member->timeout_time && device_group_member->timeout_time < now) {
 #ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, "DGR: removing member %s (%p)", IPAddressToString(device_group_member->ip_address), device_group_member);
+                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: removing member %s (%p)"), IPAddressToString(device_group_member->ip_address), device_group_member);
 #endif  // DEVICE_GROUPS_DEBUG
                     *flink = device_group_member->flink;
                     free(device_group_member);
                   }
                   else {
 #ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, "DGR: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u", device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
+                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u"), device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
 #endif  // DEVICE_GROUPS_DEBUG
-                    SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, "Unicast");
+                    SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, PSTR("Unicast"));
                     if (!device_group_member->timeout_time) device_group_member->timeout_time = now + 15000;
                     acked = false;
                     flink = &device_group_member->flink;
diff --git a/tasmota/support_udp.ino b/tasmota/support_udp.ino
index 6f1d12c2e..9ff745364 100644
--- a/tasmota/support_udp.ino
+++ b/tasmota/support_udp.ino
@@ -137,7 +137,7 @@ void PollUdp(void)
       }
 
 #ifdef USE_DEVICE_GROUPS
-      if (Settings.flag.device_groups_enabled && !strncmp_P(packet_buffer, kDeviceGroupMessage, sizeof(DEVICE_GROUP_MESSAGE) - 1)) {
+      if (Settings.flag4.device_groups_enabled && !strncmp_P(packet_buffer, kDeviceGroupMessage, sizeof(DEVICE_GROUP_MESSAGE) - 1)) {
         ProcessDeviceGroupMessage(packet_buffer, len);
       }
 #endif  // USE_DEVICE_GROUPS
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 6d902e2a9..dd8d2441c 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -560,7 +560,7 @@ void WifiCheck(uint8_t param)
         }
 #ifdef USE_EMULATION
 #ifdef USE_DEVICE_GROUPS
-        if (Settings.flag2.emulation || Settings.flag.device_groups_enabled) { UdpConnect(); }
+        if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { UdpConnect(); }
 #else // USE_DEVICE_GROUPS
       if (Settings.flag2.emulation) { UdpConnect(); }
 #endif // USE_DEVICE_GROUPS
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 8d17a0eb4..8e9546ed6 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -290,9 +290,6 @@ void setup(void)
 #ifdef USE_ARDUINO_OTA
   ArduinoOTAInit();
 #endif  // USE_ARDUINO_OTA
-#ifdef USE_DEVICE_GROUPS
-  DeviceGroupsInit();
-#endif  // USE_DEVICE_GROUPS
 
   XdrvCall(FUNC_INIT);
   XsnsCall(FUNC_INIT);
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 39ceb8208..e27213b5a 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -249,6 +249,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EMULATION                             // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem)
 #undef USE_EMULATION_HUE                         // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common)
 #undef USE_EMULATION_WEMO                        // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common)
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 #undef DEBUG_THEO                                // Disable debug code
 #undef USE_DEBUG_DRIVER                          // Disable debug code
 #endif  // FIRMWARE_KNX_NO_EMULATION
@@ -286,6 +287,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors (-14k code)
   #undef USE_PZEM004T                            // Disable PZEM004T energy sensor
@@ -362,6 +364,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
@@ -583,6 +586,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 
 // -- Optional light modules ----------------------
 #undef USE_LIGHT                                 // Disable support for lights
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 3eaa24ef5..e8c728024 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2971,7 +2971,7 @@ bool Xdrv01(uint8_t function)
       PollDnsWebserver();
 #ifdef USE_EMULATION
 #ifdef USE_DEVICE_GROUPS
-      if (Settings.flag2.emulation || Settings.flag.device_groups_enabled) { PollUdp(); }
+      if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { PollUdp(); }
 #else // USE_DEVICE_GROUPS
       if (Settings.flag2.emulation) { PollUdp(); }
 #endif // USE_DEVICE_GROUPS

From 9c5e5b689ee6560a457f8fed53316f99b5d41be3 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 18:40:44 -0600
Subject: [PATCH 322/403] Improve dgr initialization failure handling

---
 tasmota/support_device_groups.ino | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 63775d0c3..7036169e8 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -22,7 +22,7 @@
 */
 #ifdef USE_DEVICE_GROUPS
 
-//#define DEVICE_GROUPS_DEBUG
+#define DEVICE_GROUPS_DEBUG
 
 extern bool udp_connected;
 
@@ -49,7 +49,8 @@ struct device_group {
 
 struct device_group * device_groups;
 uint16_t outgoing_sequence = 0;
-bool device_groups_active = false;
+bool device_groups_initialized = false;
+bool device_groups_initialization_failed = false;
 bool building_status_message = false;
 bool processing_remote_device_message = false;
 bool waiting_for_acks;
@@ -57,12 +58,11 @@ bool udp_was_connected = false;
 
 void DeviceGroupsInit(void)
 {
-  /*
-    Initialize the device information for each device group. The group name is the MQTT group topic.
-  */
+  // Initialize the device information for each device group. The group name is the MQTT group topic.
   device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
   if (device_groups == nullptr) {
     AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating %u-element device group array"), device_group_count);
+    device_groups_initialization_failed = true;
     return;
   }
 
@@ -80,7 +80,7 @@ void DeviceGroupsInit(void)
     Settings.device_group_share_in = Settings.device_group_share_out = 0xffffffff;
   }
 
-  device_groups_active = true;
+  device_groups_initialized = true;
 }
 
 char * IPAddressToString(const IPAddress& ip_address)
@@ -133,8 +133,8 @@ void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * la
 
 void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
 {
-  // If device groups are not active, ignore this request.
-  if (!device_groups_active) return;
+  // If device groups are not enabled, ignore this request.
+  if (!Settings.flag4.device_groups_enabled) return;
 
   // If UDP is not set up, ignore this request.
   if (!udp_connected) return;
@@ -164,7 +164,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s full status packet"), device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
     device_group->message_length = 0;
-    _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
+    SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
     XdrvMailbox.command_code = DGR_ITEM_STATUS;
     XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
     building_status_message = false;
@@ -300,7 +300,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
         }
       }
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
 #endif  // DEVICE_GROUPS_DEBUG
     }
 
@@ -390,9 +390,6 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
 
 void ProcessDeviceGroupMessage(char * packet, int packet_length)
 {
-  // If device groups are not active, ignore this request.
-  if (!device_groups_active) return;
-
   // Make the group name a null-terminated string.
   char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
   char * message_ptr = strchr(message_group_name, ' ');
@@ -617,14 +614,12 @@ void DeviceGroupsLoop(void)
 {
   if (!Settings.flag4.device_groups_enabled) return;
   if (udp_connected) {
-    if (!device_groups_active) {
-      DeviceGroupsInit();
-      if (!device_groups_active) return;
-    }
-
     if (!udp_was_connected) {
       udp_was_connected = true;
 
+      if (!device_groups_initialized) DeviceGroupsInit();
+      if (device_groups_initialization_failed) return;
+
       for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
         device_group * device_group = &device_groups[device_group_index];
         char * message_ptr = &device_group->message[device_group->message_header_length];
@@ -635,12 +630,14 @@ void DeviceGroupsLoop(void)
         *message_ptr++ = 0;
         device_group->message_length = message_ptr - device_group->message;
         device_group->initial_status_requests_remaining = 5;
-        device_group->next_ack_check_time = millis() + 2000;
+        device_group->next_ack_check_time = millis() + 1000;
       }
 
       waiting_for_acks = true;
     }
 
+    if (device_groups_initialization_failed) return;
+
     if (waiting_for_acks) {
       uint32_t now = millis();
       waiting_for_acks = false;

From e1103b248fe09e1f3b44f2ca50797c0e5b6dd53a Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 19:07:46 -0600
Subject: [PATCH 323/403] Improve dgr initialization failure handling

---
 tasmota/my_user_config.h          |     2 +-
 tasmota/support_device_groups.ino |    33 +-
 tasmota/tasmota.ino.cpp           | 78659 ++++++++++++++++++++++++++++
 3 files changed, 78675 insertions(+), 19 deletions(-)
 create mode 100644 tasmota/tasmota.ino.cpp

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 931996bf4..836fbeb10 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,7 +415,7 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//  #define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
+#define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 63775d0c3..c94ea2f57 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -49,7 +49,8 @@ struct device_group {
 
 struct device_group * device_groups;
 uint16_t outgoing_sequence = 0;
-bool device_groups_active = false;
+bool device_groups_initialized = false;
+bool device_groups_initialization_failed = false;
 bool building_status_message = false;
 bool processing_remote_device_message = false;
 bool waiting_for_acks;
@@ -57,12 +58,11 @@ bool udp_was_connected = false;
 
 void DeviceGroupsInit(void)
 {
-  /*
-    Initialize the device information for each device group. The group name is the MQTT group topic.
-  */
+  // Initialize the device information for each device group. The group name is the MQTT group topic.
   device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
   if (device_groups == nullptr) {
     AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating %u-element device group array"), device_group_count);
+    device_groups_initialization_failed = true;
     return;
   }
 
@@ -80,7 +80,7 @@ void DeviceGroupsInit(void)
     Settings.device_group_share_in = Settings.device_group_share_out = 0xffffffff;
   }
 
-  device_groups_active = true;
+  device_groups_initialized = true;
 }
 
 char * IPAddressToString(const IPAddress& ip_address)
@@ -133,8 +133,8 @@ void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * la
 
 void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
 {
-  // If device groups are not active, ignore this request.
-  if (!device_groups_active) return;
+  // If device groups are not enabled, ignore this request.
+  if (!Settings.flag4.device_groups_enabled) return;
 
   // If UDP is not set up, ignore this request.
   if (!udp_connected) return;
@@ -164,7 +164,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s full status packet"), device_group->group_name);
 #endif  // DEVICE_GROUPS_DEBUG
     device_group->message_length = 0;
-    _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
+    SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
     XdrvMailbox.command_code = DGR_ITEM_STATUS;
     XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
     building_status_message = false;
@@ -300,7 +300,7 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
         }
       }
 #ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
 #endif  // DEVICE_GROUPS_DEBUG
     }
 
@@ -390,9 +390,6 @@ void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType
 
 void ProcessDeviceGroupMessage(char * packet, int packet_length)
 {
-  // If device groups are not active, ignore this request.
-  if (!device_groups_active) return;
-
   // Make the group name a null-terminated string.
   char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
   char * message_ptr = strchr(message_group_name, ' ');
@@ -617,14 +614,12 @@ void DeviceGroupsLoop(void)
 {
   if (!Settings.flag4.device_groups_enabled) return;
   if (udp_connected) {
-    if (!device_groups_active) {
-      DeviceGroupsInit();
-      if (!device_groups_active) return;
-    }
-
     if (!udp_was_connected) {
       udp_was_connected = true;
 
+      if (!device_groups_initialized) DeviceGroupsInit();
+      if (device_groups_initialization_failed) return;
+
       for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
         device_group * device_group = &device_groups[device_group_index];
         char * message_ptr = &device_group->message[device_group->message_header_length];
@@ -635,12 +630,14 @@ void DeviceGroupsLoop(void)
         *message_ptr++ = 0;
         device_group->message_length = message_ptr - device_group->message;
         device_group->initial_status_requests_remaining = 5;
-        device_group->next_ack_check_time = millis() + 2000;
+        device_group->next_ack_check_time = millis() + 1000;
       }
 
       waiting_for_acks = true;
     }
 
+    if (device_groups_initialization_failed) return;
+
     if (waiting_for_acks) {
       uint32_t now = millis();
       waiting_for_acks = false;
diff --git a/tasmota/tasmota.ino.cpp b/tasmota/tasmota.ino.cpp
new file mode 100644
index 000000000..8f8387ba2
--- /dev/null
+++ b/tasmota/tasmota.ino.cpp
@@ -0,0 +1,78659 @@
+# 1 "C:\\Users\\pcdie\\AppData\\Local\\Temp\\tmpnb0ml5sg"
+#include <Arduino.h>
+# 1 "S:/Development/Tasmota/tasmota/tasmota.ino"
+# 29 "S:/Development/Tasmota/tasmota/tasmota.ino"
+#include <core_version.h>
+#include "tasmota_version.h"
+#include "tasmota.h"
+#include "my_user_config.h"
+#ifdef USE_MQTT_TLS
+  #include <t_bearssl.h>
+#endif
+#include "tasmota_post.h"
+#include "i18n.h"
+#include "tasmota_template.h"
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_4_0
+#include "lwip/init.h"
+#if LWIP_VERSION_MAJOR != 1
+  #error Please use stable lwIP v1.4
+#endif
+#endif
+
+
+#include <ESP8266HTTPClient.h>
+#include <ESP8266httpUpdate.h>
+#include <StreamString.h>
+#include <ArduinoJson.h>
+#ifdef USE_ARDUINO_OTA
+  #include <ArduinoOTA.h>
+  #ifndef USE_DISCOVERY
+  #define USE_DISCOVERY
+  #endif
+#endif
+#ifdef USE_DISCOVERY
+  #include <ESP8266mDNS.h>
+#endif
+#ifdef USE_I2C
+  #include <Wire.h>
+#endif
+#ifdef USE_SPI
+  #include <SPI.h>
+#endif
+
+
+#include "settings.h"
+
+
+
+
+
+WiFiUDP PortUdp;
+
+unsigned long feature_drv1;
+unsigned long feature_drv2;
+unsigned long feature_sns1;
+unsigned long feature_sns2;
+unsigned long feature5;
+unsigned long feature6;
+unsigned long serial_polling_window = 0;
+unsigned long state_second = 0;
+unsigned long state_50msecond = 0;
+unsigned long state_100msecond = 0;
+unsigned long state_250msecond = 0;
+unsigned long pulse_timer[MAX_PULSETIMERS] = { 0 };
+unsigned long blink_timer = 0;
+unsigned long backlog_delay = 0;
+power_t power = 0;
+power_t last_power = 0;
+power_t blink_power;
+power_t blink_mask = 0;
+power_t blink_powersave;
+power_t latching_power = 0;
+power_t rel_inverted = 0;
+int serial_in_byte_counter = 0;
+int ota_state_flag = 0;
+int ota_result = 0;
+int restart_flag = 0;
+int wifi_state_flag = WIFI_RESTART;
+int blinks = 201;
+uint32_t uptime = 0;
+uint32_t loop_load_avg = 0;
+uint32_t global_update = 0;
+uint32_t web_log_index = 1;
+float global_temperature = 9999;
+float global_humidity = 0;
+float global_pressure = 0;
+uint16_t tele_period = 9999;
+uint16_t blink_counter = 0;
+uint16_t seriallog_timer = 0;
+uint16_t syslog_timer = 0;
+int16_t save_data_counter;
+RulesBitfield rules_flag;
+uint8_t mqtt_cmnd_blocked = 0;
+uint8_t mqtt_cmnd_blocked_reset = 0;
+uint8_t state_250mS = 0;
+uint8_t latching_relay_pulse = 0;
+uint8_t sleep;
+uint8_t blinkspeed = 1;
+uint8_t pin[GPIO_MAX];
+uint8_t active_device = 1;
+uint8_t leds_present = 0;
+uint8_t led_inverted = 0;
+uint8_t led_power = 0;
+uint8_t ledlnk_inverted = 0;
+uint8_t pwm_inverted = 0;
+uint8_t energy_flg = 0;
+uint8_t light_flg = 0;
+uint8_t light_type = 0;
+uint8_t serial_in_byte;
+uint8_t ota_retry_counter = OTA_ATTEMPTS;
+uint8_t devices_present = 0;
+uint8_t seriallog_level;
+uint8_t syslog_level;
+uint8_t my_module_type;
+uint8_t my_adc0;
+uint8_t last_source = 0;
+uint8_t shutters_present = 0;
+uint8_t prepped_loglevel = 0;
+
+bool serial_local = false;
+bool fallback_topic_flag = false;
+bool backlog_mutex = false;
+bool interlock_mutex = false;
+bool stop_flash_rotate = false;
+bool blinkstate = false;
+
+bool pwm_present = false;
+bool i2c_flg = false;
+bool spi_flg = false;
+bool soft_spi_flg = false;
+bool ntp_force_sync = false;
+bool is_8285 = false;
+myio my_module;
+gpio_flag my_module_flag;
+StateBitfield global_state;
+char my_version[33];
+char my_image[33];
+char my_hostname[33];
+char mqtt_client[TOPSZ];
+char mqtt_topic[TOPSZ];
+char serial_in_buffer[INPUT_BUFFER_SIZE];
+char mqtt_data[MESSZ];
+char log_data[LOGSZ];
+char web_log[WEB_LOG_SIZE] = {'\0'};
+#ifdef SUPPORT_IF_STATEMENT
+  #include <LinkedList.h>
+  LinkedList<String> backlog;
+  #define BACKLOG_EMPTY (backlog.size() == 0)
+#else
+  uint8_t backlog_index = 0;
+  uint8_t backlog_pointer = 0;
+  String backlog[MAX_BACKLOG];
+  #define BACKLOG_EMPTY (backlog_pointer == backlog_index)
+#endif
+void setup(void);
+void BacklogLoop(void);
+void loop(void);
+uint16_t SendMail(char *buffer);
+uint32_t GetRtcSettingsCrc(void);
+void RtcSettingsSave(void);
+void RtcSettingsLoad(void);
+bool RtcSettingsValid(void);
+uint32_t GetRtcRebootCrc(void);
+void RtcRebootSave(void);
+void RtcRebootReset(void);
+void RtcRebootLoad(void);
+bool RtcRebootValid(void);
+void SetFlashModeDout(void);
+bool VersionCompatible(void);
+void SettingsBufferFree(void);
+bool SettingsBufferAlloc(void);
+uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size);
+uint16_t GetSettingsCrc(void);
+uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size);
+uint32_t GetSettingsCrc32(void);
+void SettingsSaveAll(void);
+void UpdateQuickPowerCycle(bool update);
+uint32_t GetSettingsTextLen(void);
+bool SettingsUpdateText(uint32_t index, const char* replace_me);
+char* SettingsText(uint32_t index);
+uint32_t GetSettingsAddress(void);
+void SettingsSave(uint8_t rotate);
+void SettingsLoad(void);
+void EspErase(uint32_t start_sector, uint32_t end_sector);
+void SettingsErase(uint8_t type);
+void SettingsSdkErase(void);
+void SettingsSdkWifiErase(void);
+void SettingsDefault(void);
+void SettingsDefaultSet1(void);
+void SettingsDefaultSet2(void);
+void SettingsResetStd(void);
+void SettingsResetDst(void);
+void SettingsDefaultWebColor(void);
+void SettingsEnableAllI2cDrivers(void);
+void SettingsDelta(void);
+void OsWatchTicker(void);
+void OsWatchInit(void);
+void OsWatchLoop(void);
+bool OsWatchBlockedLoop(void);
+uint32_t ResetReason(void);
+String GetResetReason(void);
+size_t strchrspn(const char *str1, int character);
+char* subStr(char* dest, char* str, const char *delim, int index);
+float CharToFloat(const char *str);
+int TextToInt(char *str);
+char* ulltoa(unsigned long long value, char *str, int radix);
+char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween);
+char* Uint64toHex(uint64_t value, char *str, uint16_t bits);
+char* dtostrfd(double number, unsigned char prec, char *s);
+char* Unescape(char* buffer, uint32_t* size);
+char* RemoveSpace(char* p);
+char* ReplaceCommaWithDot(char* p);
+char* LowerCase(char* dest, const char* source);
+char* UpperCase(char* dest, const char* source);
+char* UpperCase_P(char* dest, const char* source);
+char* Trim(char* p);
+char* RemoveAllSpaces(char* p);
+char* NoAlNumToUnderscore(char* dest, const char* source);
+char IndexSeparator(void);
+void SetShortcutDefault(void);
+uint8_t Shortcut(void);
+bool ValidIpAddress(const char* str);
+bool ParseIp(uint32_t* addr, const char* str);
+uint32_t ParseParameters(uint32_t count, uint32_t *params);
+bool NewerVersion(char* version_str);
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option);
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size);
+void GetEspHardwareType(void);
+String GetDeviceHardware(void);
+float ConvertTemp(float c);
+float ConvertTempToCelsius(float c);
+char TempUnit(void);
+float ConvertHumidity(float h);
+float ConvertPressure(float p);
+String PressureUnit(void);
+void ResetGlobalValues(void);
+uint32_t SqrtInt(uint32_t num);
+uint32_t RoundSqrtInt(uint32_t num);
+char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack);
+int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack);
+int GetStateNumber(char *state_text);
+String GetSerialConfig(void);
+void SetSerialBegin();
+void SetSerialConfig(uint32_t serial_config);
+void SetSerialBaudrate(uint32_t baudrate);
+void SetSerial(uint32_t baudrate, uint32_t serial_config);
+void ClaimSerial(void);
+void SerialSendRaw(char *codes);
+uint32_t GetHash(const char *buffer, size_t size);
+void ShowSource(uint32_t source);
+void WebHexCode(uint32_t i, const char* code);
+uint32_t WebColor(uint32_t i);
+char* ResponseGetTime(uint32_t format, char* time_str);
+int Response_P(const char* format, ...);
+int ResponseTime_P(const char* format, ...);
+int ResponseAppend_P(const char* format, ...);
+int ResponseAppendTimeFormat(uint32_t format);
+int ResponseAppendTime(void);
+int ResponseJsonEnd(void);
+int ResponseJsonEndEnd(void);
+void DigitalWrite(uint32_t gpio_pin, uint32_t state);
+uint8_t ModuleNr(void);
+bool ValidTemplateModule(uint32_t index);
+bool ValidModule(uint32_t index);
+String AnyModuleName(uint32_t index);
+String ModuleName(void);
+void ModuleGpios(myio *gp);
+gpio_flag ModuleFlag(void);
+void ModuleDefault(uint32_t module);
+void SetModuleType(void);
+bool FlashPin(uint32_t pin);
+uint8_t ValidPin(uint32_t pin, uint32_t gpio);
+bool ValidGPIO(uint32_t pin, uint32_t gpio);
+bool ValidAdc(void);
+bool GetUsedInModule(uint32_t val, uint8_t *arr);
+bool JsonTemplate(const char* dataBuf);
+void TemplateJson(void);
+inline int32_t TimeDifference(uint32_t prev, uint32_t next);
+int32_t TimePassedSince(uint32_t timestamp);
+bool TimeReached(uint32_t timer);
+void SetNextTimeInterval(unsigned long& timer, const unsigned long step);
+int32_t TimePassedSinceUsec(uint32_t timestamp);
+bool TimeReachedUsec(uint32_t timer);
+bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size);
+bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg);
+bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg);
+uint8_t I2cRead8(uint8_t addr, uint8_t reg);
+uint16_t I2cRead16(uint8_t addr, uint8_t reg);
+int16_t I2cReadS16(uint8_t addr, uint8_t reg);
+uint16_t I2cRead16LE(uint8_t addr, uint8_t reg);
+int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg);
+int32_t I2cRead24(uint8_t addr, uint8_t reg);
+bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size);
+bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val);
+bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val);
+int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
+int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
+void I2cScan(char *devs, unsigned int devs_len);
+void I2cSetActiveFound(uint32_t addr, const char *types);
+bool I2cActive(uint32_t addr);
+bool I2cSetDevice(uint32_t addr);
+void SetSeriallog(uint32_t loglevel);
+void SetSyslog(uint32_t loglevel);
+void GetLog(uint32_t idx, char** entry_pp, size_t* len_p);
+void Syslog(void);
+void AddLog(uint32_t loglevel);
+void AddLog_P(uint32_t loglevel, const char *formatP);
+void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2);
+void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...);
+void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...);
+void AddLog_Debug(PGM_P formatP, ...);
+void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count);
+void AddLogSerial(uint32_t loglevel);
+void AddLogMissed(char *sensor, uint32_t misses);
+void ButtonPullupFlag(uint8 button_bit);
+void ButtonInvertFlag(uint8 button_bit);
+void ButtonInit(void);
+uint8_t ButtonSerial(uint8_t serial_in_byte);
+void ButtonHandler(void);
+void ButtonLoop(void);
+void ResponseCmndNumber(int value);
+void ResponseCmndFloat(float value, uint32_t decimals);
+void ResponseCmndIdxNumber(int value);
+void ResponseCmndChar(const char* value);
+void ResponseCmndStateText(uint32_t value);
+void ResponseCmndDone(void);
+void ResponseCmndIdxChar(const char* value);
+void ResponseCmndAll(uint32_t text_index, uint32_t count);
+void ExecuteCommand(const char *cmnd, uint32_t source);
+void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len);
+void CmndBacklog(void);
+void CmndDelay(void);
+void CmndPower(void);
+void CmndStatus(void);
+void CmndState(void);
+void CmndTempOffset(void);
+void CmndSleep(void);
+void CmndUpgrade(void);
+void CmndOtaUrl(void);
+void CmndSeriallog(void);
+void CmndRestart(void);
+void CmndPowerOnState(void);
+void CmndPulsetime(void);
+void CmndBlinktime(void);
+void CmndBlinkcount(void);
+void CmndSavedata(void);
+void CmndSetoption(void);
+void CmndTemperatureResolution(void);
+void CmndHumidityResolution(void);
+void CmndPressureResolution(void);
+void CmndPowerResolution(void);
+void CmndVoltageResolution(void);
+void CmndFrequencyResolution(void);
+void CmndCurrentResolution(void);
+void CmndEnergyResolution(void);
+void CmndWeightResolution(void);
+void CmndModule(void);
+void CmndModules(void);
+void CmndGpio(void);
+void CmndGpios(void);
+void CmndTemplate(void);
+void CmndPwm(void);
+void CmndPwmfrequency(void);
+void CmndPwmrange(void);
+void CmndButtonDebounce(void);
+void CmndSwitchDebounce(void);
+void CmndBaudrate(void);
+void CmndSerialConfig(void);
+void CmndSerialSend(void);
+void CmndSerialDelimiter(void);
+void CmndSyslog(void);
+void CmndLoghost(void);
+void CmndLogport(void);
+void CmndIpAddress(void);
+void CmndNtpServer(void);
+void CmndAp(void);
+void CmndSsid(void);
+void CmndPassword(void);
+void CmndHostname(void);
+void CmndWifiConfig(void);
+void CmndFriendlyname(void);
+void CmndSwitchMode(void);
+void CmndInterlock(void);
+void CmndTeleperiod(void);
+void CmndReset(void);
+void CmndTime(void);
+void CmndTimezone(void);
+void CmndTimeStdDst(uint32_t ts);
+void CmndTimeStd(void);
+void CmndTimeDst(void);
+void CmndAltitude(void);
+void CmndLedPower(void);
+void CmndLedState(void);
+void CmndLedMask(void);
+void CmndWifiPower(void);
+void CmndI2cScan(void);
+void CmndI2cDriver(void);
+void CmndDevGroupShare(void);
+void CmndSensor(void);
+void CmndDriver(void);
+void CmndCrash(void);
+void CmndWDT(void);
+void CmndBlockedLoop(void);
+void CrashDumpClear(void);
+bool CrashFlag(void);
+void CrashDump(void);
+void DeviceGroupsInit(void);
+bool DeviceGroupItemShared(bool incoming, uint8_t item);
+void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * label);
+void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...);
+void ProcessDeviceGroupMessage(char * packet, int packet_length);
+void DeviceGroupsLoop(void);
+static bool spiflash_is_ready(void);
+static void spi_write_enable(void);
+bool EsptoolEraseSector(uint32_t sector);
+void EsptoolErase(uint32_t start_sector, uint32_t end_sector);
+void GetFeatures(void);
+float fmodf(float x, float y);
+double FastPrecisePow(double a, double b);
+float FastPrecisePowf(const float x, const float y);
+double TaylorLog(double x);
+inline float sinf(float x);
+inline float cosf(float x);
+inline float tanf(float x);
+inline float atanf(float x);
+inline float asinf(float x);
+inline float acosf(float x);
+inline float sqrtf(float x);
+inline float powf(float x, float y);
+float cos_52s(float x);
+float cos_52(float x);
+float sin_52(float x);
+float tan_56s(float x);
+float tan_56(float x);
+float atan_66s(float x);
+float atan_66(float x);
+float asinf1(float x);
+float acosf1(float x);
+float sqrt1(const float x);
+uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
+                                       uint16_t ito_min, uint16_t ito_max);
+void* memchr(const void* ptr, int value, size_t num);
+size_t strcspn(const char *str1, const char *str2);
+char* strpbrk(const char *s1, const char *s2);
+void* memmove_P(void *dest, const void *src, size_t n);
+void update_rotary(void);
+bool RotaryButtonPressed(void);
+void RotaryInit(void);
+void RotaryHandler(void);
+void RotaryLoop(void);
+uint32_t UtcTime(void);
+uint32_t LocalTime(void);
+uint32_t Midnight(void);
+bool MidnightNow(void);
+bool IsDst(void);
+String GetBuildDateAndTime(void);
+String GetMinuteTime(uint32_t minutes);
+String GetTimeZone(void);
+String GetDuration(uint32_t time);
+String GetDT(uint32_t time);
+String GetDateAndTime(uint8_t time_type);
+uint32_t UpTime(void);
+uint32_t MinutesUptime(void);
+String GetUptime(void);
+uint32_t MinutesPastMidnight(void);
+void BreakTime(uint32_t time_input, TIME_T &tm);
+uint32_t MakeTime(TIME_T &tm);
+uint32_t RuleToTime(TimeRule r, int yr);
+void RtcSecond(void);
+void RtcSetTime(uint32_t epoch);
+void RtcInit(void);
+String GetStatistics(void);
+String GetStatistics(void);
+void SwitchPullupFlag(uint16 switch_bit);
+void SwitchSetVirtual(uint32_t index, uint8_t state);
+uint8_t SwitchGetVirtual(uint32_t index);
+uint8_t SwitchLastState(uint32_t index);
+bool SwitchState(uint32_t index);
+void SwitchProbe(void);
+void SwitchInit(void);
+void SwitchHandler(uint8_t mode);
+void SwitchLoop(void);
+char* Format(char* output, const char* input, int size);
+char* GetOtaUrl(char *otaurl, size_t otaurl_size);
+char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic);
+char* GetGroupTopic_P(char *stopic, const char* subtopic);
+char* GetFallbackTopic_P(char *stopic, const char* subtopic);
+char* GetStateText(uint32_t state);
+void SetLatchingRelay(power_t lpower, uint32_t state);
+void SetDevicePower(power_t rpower, uint32_t source);
+void RestorePower(bool publish_power, uint32_t source);
+void SetAllPower(uint32_t state, uint32_t source);
+void SetPowerOnState(void);
+void SetLedPowerIdx(uint32_t led, uint32_t state);
+void SetLedPower(uint32_t state);
+void SetLedPowerAll(uint32_t state);
+void SetLedLink(uint32_t state);
+void SetPulseTimer(uint32_t index, uint32_t time);
+uint32_t GetPulseTimer(uint32_t index);
+bool SendKey(uint32_t key, uint32_t device, uint32_t state);
+void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source);
+void StopAllPowerBlink(void);
+void MqttShowPWMState(void);
+void MqttShowState(void);
+void MqttPublishTeleState(void);
+bool MqttShowSensor(void);
+void MqttPublishSensor(void);
+void PerformEverySecond(void);
+void Every100mSeconds(void);
+void Every250mSeconds(void);
+void ArduinoOTAInit(void);
+void ArduinoOtaLoop(void);
+void SerialInput(void);
+void GpioInit(void);
+bool UdpDisconnect(void);
+bool UdpConnect(void);
+void PollUdp(void);
+int WifiGetRssiAsQuality(int rssi);
+bool WifiConfigCounter(void);
+void WifiConfig(uint8_t type);
+void WifiSetMode(WiFiMode_t wifi_mode);
+void WiFiSetSleepMode(void);
+void WifiBegin(uint8_t flag, uint8_t channel);
+void WifiBeginAfterScan(void);
+uint16_t WifiLinkCount(void);
+String WifiDowntime(void);
+void WifiSetState(uint8_t state);
+bool WifiCheckIPv6(void);
+String WifiGetIPv6(void);
+bool WifiCheckIPAddrStatus(void);
+void WifiCheckIp(void);
+void WifiCheck(uint8_t param);
+int WifiState(void);
+String WifiGetOutputPower(void);
+void WifiSetOutputPower(void);
+void WifiConnect(void);
+void WifiDisconnect(void);
+void WifiShutdown(void);
+void EspRestart(void);
+static void WebGetArg(const char* arg, char* out, size_t max);
+static bool WifiIsInManagerMode();
+void ShowWebSource(uint32_t source);
+void ExecuteWebCommand(char* svalue, uint32_t source);
+void StartWebserver(int type, IPAddress ipweb);
+void StopWebserver(void);
+void WifiManagerBegin(bool reset_only);
+void PollDnsWebserver(void);
+bool WebAuthenticate(void);
+void HttpHeaderCors(void);
+void WSHeaderSend(void);
+void WSSend(int code, int ctype, const String& content);
+void WSContentBegin(int code, int ctype);
+void _WSContentSend(const String& content);
+void WSContentFlush(void);
+void _WSContentSendBuffer(void);
+void WSContentSend_P(const char* formatP, ...);
+void WSContentSend_PD(const char* formatP, ...);
+void WSContentStart_P(const char* title, bool auth);
+void WSContentStart_P(const char* title);
+void WSContentSendStyle_P(const char* formatP, ...);
+void WSContentSendStyle(void);
+void WSContentButton(uint32_t title_index);
+void WSContentSpaceButton(uint32_t title_index);
+void WSContentEnd(void);
+void WSContentStop(void);
+void WebRestart(uint32_t type);
+void HandleWifiLogin(void);
+void WebSliderColdWarm(void);
+void HandleRoot(void);
+bool HandleRootStatusRefresh(void);
+int32_t IsShutterWebButton(uint32_t idx);
+void HandleConfiguration(void);
+void HandleTemplateConfiguration(void);
+void TemplateSaveSettings(void);
+void HandleModuleConfiguration(void);
+void ModuleSaveSettings(void);
+String HtmlEscape(const String unescaped);
+void HandleWifiConfiguration(void);
+void WifiSaveSettings(void);
+void HandleLoggingConfiguration(void);
+void LoggingSaveSettings(void);
+void HandleOtherConfiguration(void);
+void OtherSaveSettings(void);
+void HandleBackupConfiguration(void);
+void HandleResetConfiguration(void);
+void HandleRestoreConfiguration(void);
+void HandleInformation(void);
+void HandleUpgradeFirmware(void);
+void HandleUpgradeFirmwareStart(void);
+void HandleUploadDone(void);
+void HandleUploadLoop(void);
+void HandlePreflightRequest(void);
+void HandleHttpCommand(void);
+void HandleConsole(void);
+void HandleConsoleRefresh(void);
+void HandleNotFound(void);
+bool CaptivePortal(void);
+String UrlEncode(const String& text);
+int WebSend(char *buffer);
+bool JsonWebColor(const char* dataBuf);
+void CmndEmulation(void);
+void CmndSendmail(void);
+void CmndWebServer(void);
+void CmndWebPassword(void);
+void CmndWeblog(void);
+void CmndWebRefresh(void);
+void CmndWebSend(void);
+void CmndWebColor(void);
+void CmndWebSensor(void);
+void CmndWebButton(void);
+void CmndCors(void);
+bool Xdrv01(uint8_t function);
+bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value);
+void MakeValidMqtt(uint32_t option, char* str);
+void MqttDiscoverServer(void);
+void MqttInit(void);
+bool MqttIsConnected(void);
+void MqttDisconnect(void);
+void MqttSubscribeLib(const char *topic);
+void MqttUnsubscribeLib(const char *topic);
+bool MqttPublishLib(const char* topic, bool retained);
+void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len);
+void MqttRetryCounter(uint8_t value);
+void MqttSubscribe(const char *topic);
+void MqttUnsubscribe(const char *topic);
+void MqttPublishLogging(const char *mxtime);
+void MqttPublish(const char* topic, bool retained);
+void MqttPublish(const char* topic);
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained);
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic);
+void MqttPublishTeleSensor(void);
+void MqttPublishPowerState(uint32_t device);
+void MqttPublishAllPowerState(void);
+void MqttPublishPowerBlinkState(uint32_t device);
+uint16_t MqttConnectCount(void);
+void MqttDisconnected(int state);
+void MqttConnected(void);
+void MqttReconnect(void);
+void MqttCheck(void);
+void CmndMqttFingerprint(void);
+void CmndMqttUser(void);
+void CmndMqttPassword(void);
+void CmndMqttlog(void);
+void CmndMqttHost(void);
+void CmndMqttPort(void);
+void CmndMqttRetry(void);
+void CmndStateText(void);
+void CmndMqttClient(void);
+void CmndFullTopic(void);
+void CmndPrefix(void);
+void CmndPublish(void);
+void CmndGroupTopic(void);
+void CmndTopic(void);
+void CmndButtonTopic(void);
+void CmndSwitchTopic(void);
+void CmndButtonRetain(void);
+void CmndSwitchRetain(void);
+void CmndPowerRetain(void);
+void CmndSensorRetain(void);
+inline void TlsEraseBuffer(uint8_t *buffer);
+void loadTlsDir(void);
+void CmndTlsKey(void);
+uint32_t bswap32(uint32_t x);
+void CmndTlsDump(void);
+void HandleMqttConfiguration(void);
+void MqttSaveSettings(void);
+bool Xdrv02(uint8_t function);
+bool EnergyTariff1Active();
+void EnergyUpdateToday(void);
+void EnergyUpdateTotal(float value, bool kwh);
+void Energy200ms(void);
+void EnergySaveState(void);
+bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag);
+void EnergyMarginCheck(void);
+void EnergyMqttShow(void);
+void EnergyEverySecond(void);
+void EnergyCommandCalResponse(uint32_t nvalue);
+void CmndEnergyReset(void);
+void CmndTariff(void);
+void CmndPowerCal(void);
+void CmndVoltageCal(void);
+void CmndCurrentCal(void);
+void CmndPowerSet(void);
+void CmndVoltageSet(void);
+void CmndCurrentSet(void);
+void CmndFrequencySet(void);
+void CmndModuleAddress(void);
+void CmndPowerDelta(void);
+void CmndPowerLow(void);
+void CmndPowerHigh(void);
+void CmndVoltageLow(void);
+void CmndVoltageHigh(void);
+void CmndCurrentLow(void);
+void CmndCurrentHigh(void);
+void CmndMaxPower(void);
+void CmndMaxPowerHold(void);
+void CmndMaxPowerWindow(void);
+void CmndSafePower(void);
+void CmndSafePowerHold(void);
+void CmndSafePowerWindow(void);
+void CmndMaxEnergy(void);
+void CmndMaxEnergyStart(void);
+void EnergySnsInit(void);
+void EnergyShow(bool json);
+bool Xdrv03(uint8_t function);
+bool Xsns03(uint8_t function);
+power_t LightPower(void);
+power_t LightPowerIRAM(void);
+uint8_t LightDevice(void);
+static uint32_t min3(uint32_t a, uint32_t b, uint32_t c);
+uint16_t change8to10(uint8_t v);
+uint8_t change10to8(uint16_t v);
+uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr);
+uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr);
+uint16_t ledGamma10_10(uint16_t v);
+uint16_t ledGamma10(uint8_t v);
+uint8_t ledGamma(uint8_t v);
+void LightPwmOffset(uint32_t offset);
+bool LightModuleInit(void);
+void LightInit(void);
+void LightUpdateColorMapping(void);
+uint8_t LightGetDimmer(uint8_t dimmer);
+void LightSetDimmer(uint8_t dimmer);
+void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri);
+void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
+uint8_t LightGetBri(uint8_t device);
+void LightSetBri(uint8_t device, uint8_t bri);
+void LightSetColorTemp(uint16_t ct);
+uint16_t LightGetColorTemp(void);
+void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value);
+void LightPowerOn(void);
+void LightState(uint8_t append);
+void LightCycleColor(int8_t direction);
+void LightSetPower(void);
+void LightAnimate(void);
+bool isChannelGammaCorrected(uint32_t channel);
+uint16_t fadeGamma(uint32_t channel, uint16_t v);
+uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg);
+bool LightApplyFade(void);
+void LightApplyPower(uint8_t new_color[LST_MAX], power_t power);
+void LightSetOutputs(const uint16_t *cur_col_10);
+void calcGammaMultiChannels(uint16_t cur_col_10[5]);
+void calcGammaBulbs(uint16_t cur_col_10[5]);
+void LightSendDeviceGroupStatus();
+void LightHandleDeviceGroupRequest();
+bool LightColorEntry(char *buffer, uint32_t buffer_length);
+void CmndSupportColor(void);
+void CmndColor(void);
+void CmndWhite(void);
+void CmndChannel(void);
+void CmndHsbColor(void);
+void CmndScheme(void);
+void CmndWakeup(void);
+void CmndColorTemperature(void);
+void CmndDimmer(void);
+void CmndDimmerRange(void);
+void CmndLedTable(void);
+void CmndRgbwwTable(void);
+void CmndFade(void);
+void CmndSpeed(void);
+void CmndWakeupDuration(void);
+void CmndUndocA(void);
+bool Xdrv04(uint8_t function);
+void IrSendInit(void);
+void IrReceiveUpdateThreshold(void);
+void IrReceiveInit(void);
+void IrReceiveCheck(void);
+uint32_t IrRemoteCmndIrSendJson(void);
+void CmndIrSend(void);
+void IrRemoteCmndResponse(uint32_t error);
+bool Xdrv05(uint8_t function);
+void IrSendInit(void);
+uint8_t reverseBitsInByte(uint8_t b);
+uint64_t reverseBitsInBytes64(uint64_t b);
+void IrReceiveUpdateThreshold(void);
+void IrReceiveInit(void);
+String sendIRJsonState(const struct decode_results &results);
+void IrReceiveCheck(void);
+String listSupportedProtocols(bool hvac);
+uint32_t IrRemoteCmndIrHvacJson(void);
+void CmndIrHvac(void);
+uint32_t IrRemoteCmndIrSendJson(void);
+uint32_t IrRemoteCmndIrSendRaw(void);
+void CmndIrSend(void);
+void IrRemoteCmndResponse(uint32_t error);
+bool Xdrv05(uint8_t function);
+ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size);
+ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size);
+ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len);
+ssize_t rf_decode_and_write(uint8_t *record, size_t size);
+ssize_t rf_search_and_write(uint8_t *buf, size_t size);
+uint8_t rf_erase_flash(void);
+uint8_t SnfBrUpdateInit(void);
+void SonoffBridgeReceivedRaw(void);
+void SonoffBridgeLearnFailed(void);
+void SonoffBridgeReceived(void);
+bool SonoffBridgeSerialInput(void);
+void SonoffBridgeSendCommand(uint8_t code);
+void SonoffBridgeSendAck(void);
+void SonoffBridgeSendCode(uint32_t code);
+void SonoffBridgeSend(uint8_t idx, uint8_t key);
+void SonoffBridgeLearn(uint8_t key);
+void CmndRfBridge(void);
+void CmndRfKey(void);
+void CmndRfRaw(void);
+bool Xdrv06(uint8_t function);
+int DomoticzBatteryQuality(void);
+int DomoticzRssiQuality(void);
+void MqttPublishDomoticzFanState(void);
+void DomoticzUpdateFanState(void);
+void MqttPublishDomoticzPowerState(uint8_t device);
+void DomoticzUpdatePowerState(uint8_t device);
+void DomoticzMqttUpdate(void);
+void DomoticzMqttSubscribe(void);
+bool DomoticzMqttData(void);
+bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg);
+uint8_t DomoticzHumidityState(char *hum);
+void DomoticzSensor(uint8_t idx, char *data);
+void DomoticzSensor(uint8_t idx, uint32_t value);
+void DomoticzTempHumSensor(char *temp, char *hum);
+void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro);
+void DomoticzSensorPowerEnergy(int power, char *energy);
+void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power);
+void CmndDomoticzIdx(void);
+void CmndDomoticzKeyIdx(void);
+void CmndDomoticzSwitchIdx(void);
+void CmndDomoticzSensorIdx(void);
+void CmndDomoticzUpdateTimer(void);
+void HandleDomoticzConfiguration(void);
+void DomoticzSaveSettings(void);
+bool Xdrv07(uint8_t function);
+void SerialBridgeInput(void);
+void SerialBridgeInit(void);
+void CmndSSerialSend(void);
+void CmndSBaudrate(void);
+bool Xdrv08(uint8_t function);
+float JulianischesDatum(void);
+float InPi(float x);
+float eps(float T);
+float BerechneZeitgleichung(float *DK,float T);
+void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down);
+void ApplyTimerOffsets(Timer *duskdawn);
+String GetSun(uint32_t dawn);
+uint16_t SunMinutes(uint32_t dawn);
+void TimerSetRandomWindow(uint32_t index);
+void TimerSetRandomWindows(void);
+void TimerEverySecond(void);
+void PrepShowTimer(uint32_t index);
+void CmndTimer(void);
+void CmndTimers(void);
+void CmndLongitude(void);
+void CmndLatitude(void);
+void HandleTimerConfiguration(void);
+void TimerSaveSettings(void);
+bool Xdrv09(uint8_t function);
+bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule);
+int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr);
+void RulesVarReplace(String &commands, const String &sfind, const String &replace);
+bool RuleSetProcess(uint8_t rule_set, String &event_saved);
+bool RulesProcessEvent(char *json_event);
+bool RulesProcess(void);
+void RulesInit(void);
+void RulesEvery50ms(void);
+void RulesEvery100ms(void);
+void RulesEverySecond(void);
+void RulesSaveBeforeRestart(void);
+void RulesSetPower(void);
+void RulesTeleperiod(void);
+bool RulesMqttData(void);
+void CmndSubscribe(void);
+void CmndUnsubscribe(void);
+bool findNextNumber(char * &pNumber, float &value);
+bool findNextVariableValue(char * &pVarname, float &value);
+bool findNextObjectValue(char * &pointer, float &value);
+bool findNextOperator(char * &pointer, int8_t &op);
+float calculateTwoValues(float v1, float v2, uint8_t op);
+float evaluateExpression(const char * expression, unsigned int len);
+void CmndIf(void);
+bool evaluateComparisonExpression(const char *expression, int len);
+bool findNextLogicOperator(char * &pointer, int8_t &op);
+bool findNextLogicObjectValue(char * &pointer, bool &value);
+bool evaluateLogicalExpression(const char * expression, int len);
+int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type);
+void ExecuteCommandBlock(const char * commands, int len);
+void ProcessIfStatement(const char* statements);
+void RulesPreprocessCommand(char *pCommands);
+void CmndRule(void);
+void CmndRuleTimer(void);
+void CmndEvent(void);
+void CmndVariable(void);
+void CmndMemory(void);
+void CmndCalcResolution(void);
+void CmndAddition(void);
+void CmndSubtract(void);
+void CmndMultiply(void);
+void CmndScale(void);
+float map_double(float x, float in_min, float in_max, float out_min, float out_max);
+bool Xdrv10(uint8_t function);
+void ScriptEverySecond(void);
+void RulesTeleperiod(void);
+int16_t Init_Scripter(void);
+void ws2812_set_array(float *array ,uint8_t len);
+float median_array(float *array,uint8_t len);
+float Get_MFVal(uint8_t index,uint8_t bind);
+void Set_MFVal(uint8_t index,uint8_t bind,float val);
+float Get_MFilter(uint8_t index);
+void Set_MFilter(uint8_t index, float invar);
+float DoMedian5(uint8_t index, float in);
+uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value);
+uint16_t GetStack(void);
+uint16_t GetStack(void);
+void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize);
+void toLog(const char *str);
+void toLogN(const char *cp,uint8_t len);
+void toLogEOL(const char *s1,const char *str);
+void toSLog(const char *str);
+int16_t Run_Scripter(const char *type, int8_t tlen, char *js);
+void ScripterEvery100ms(void);
+void Scripter_save_pvars(void);
+void ListDir(char *path, uint8_t depth);
+void Script_FileUploadConfiguration(void);
+void ScriptFileUploadSuccess(void);
+void script_upload(void);
+uint8_t DownloadFile(char *file);
+void HandleScriptTextareaConfiguration(void);
+void HandleScriptConfiguration(void);
+void ScriptSaveSettings(void);
+void Script_HueStatus(String *response, uint16_t hue_devs);
+void Script_Check_Hue(String *response);
+void Script_Handle_Hue(String *path);
+bool Script_SubCmd(void);
+void execute_script(char *script);
+bool ScriptCommand(void);
+uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day);
+uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second);
+void dateTime(uint16_t* date, uint16_t* time);
+bool ScriptMqttData(void);
+String ScriptSubscribe(const char *data, int data_len);
+String ScriptUnsubscribe(const char * data, int data_len);
+void Script_Check_HTML_Setvars(void);
+void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen);
+void ScriptWebShow(void);
+void ScriptJsonAppend(void);
+bool Xdrv10(uint8_t function);
+void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF );
+void KNX_DEL_GA( uint8_t GAnum );
+void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF );
+void KNX_DEL_CB( uint8_t CBnum );
+bool KNX_CONFIG_NOT_MATCH(void);
+void KNXStart(void);
+void KNX_INIT(void);
+void KNX_CB_Action(message_t const &msg, void *arg);
+void KnxUpdatePowerState(uint8_t device, power_t state);
+void KnxSendButtonPower(void);
+void KnxSensor(uint8_t sensor_type, float value);
+void HandleKNXConfiguration(void);
+void KNX_Save_Settings(void);
+void CmndKnxTxCmnd(void);
+void CmndKnxTxVal(void);
+void CmndKnxEnabled(void);
+void CmndKnxEnhanced(void);
+void CmndKnxPa(void);
+void CmndKnxGa(void);
+void CmndKnxCb(void);
+bool Xdrv11(uint8_t function);
+void TryResponseAppend_P(const char *format, ...);
+void HAssAnnounceRelayLight(void);
+void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle);
+void HAssAnnounceSwitches(void);
+void HAssAnnounceButtons(void);
+void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx);
+void HAssAnnounceSensors(void);
+void HAssAnnounceStatusSensor(void);
+void HAssPublishStatus(void);
+void HAssDiscovery(void);
+void HAssDiscover(void);
+void HAssAnyKey(void);
+bool Xdrv12(uint8_t function);
+void DisplayInit(uint8_t mode);
+void DisplayClear(void);
+void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
+void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
+void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
+void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
+void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
+void DisplayDrawFrame(void);
+void DisplaySetSize(uint8_t size);
+void DisplaySetFont(uint8_t font);
+void DisplaySetRotation(uint8_t rotation);
+void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void DisplayOnOff(uint8_t on);
+uint8_t fatoiv(char *cp,float *res);
+uint8_t atoiv(char *cp, int16_t *res);
+uint8_t atoiV(char *cp, uint16_t *res);
+void alignright(char *string);
+uint32_t decode_te(char *line);
+void DisplayText(void);
+void DisplayClearScreenBuffer(void);
+void DisplayFreeScreenBuffer(void);
+void DisplayAllocScreenBuffer(void);
+void DisplayReAllocScreenBuffer(void);
+void DisplayFillScreen(uint32_t line);
+void DisplayClearLogBuffer(void);
+void DisplayFreeLogBuffer(void);
+void DisplayAllocLogBuffer(void);
+void DisplayReAllocLogBuffer(void);
+void DisplayLogBufferAdd(char* txt);
+char* DisplayLogBuffer(char temp_code);
+void DisplayLogBufferInit(void);
+void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value);
+void DisplayAnalyzeJson(char *topic, char *json);
+void DisplayMqttSubscribe(void);
+bool DisplayMqttData(void);
+void DisplayLocalSensor(void);
+void DisplayInitDriver(void);
+void DisplaySetPower(void);
+void CmndDisplay(void);
+void CmndDisplayModel(void);
+void CmndDisplayWidth(void);
+void CmndDisplayHeight(void);
+void CmndDisplayMode(void);
+void CmndDisplayDimmer(void);
+void CmndDisplaySize(void);
+void CmndDisplayFont(void);
+void CmndDisplayRotate(void);
+void CmndDisplayText(void);
+void CmndDisplayAddress(void);
+void CmndDisplayRefresh(void);
+void CmndDisplayColumns(void);
+void CmndDisplayRows(void);
+void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp);
+void DrawAClock(uint16_t rad);
+void ClrGraph(uint16_t num);
+void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol);
+void DisplayCheckGraph();
+void Save_graph(uint8_t num, char *path);
+void Restore_graph(uint8_t num, char *path);
+void RedrawGraph(uint8_t num, uint8_t flags);
+void AddGraph(uint8_t num,uint8_t val);
+void AddValue(uint8_t num,float fval);
+bool Xdrv13(uint8_t function);
+uint16_t MP3_Checksum(uint8_t *array);
+void MP3PlayerInit(void);
+void MP3_CMD(uint8_t mp3cmd,uint16_t val);
+bool MP3PlayerCmd(void);
+bool Xdrv14(uint8_t function);
+void PCA9685_Detect(void);
+void PCA9685_Reset(void);
+void PCA9685_SetPWMfreq(double freq);
+void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off);
+void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted);
+bool PCA9685_Command(void);
+void PCA9685_OutputTelemetry(bool telemetry);
+bool Xdrv15(uint8_t function);
+void CmndTuyaSend(void);
+void CmndTuyaMcu(void);
+void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId);
+void UpdateDevices();
+inline bool TuyaFuncIdValid(uint8_t fnId);
+uint8_t TuyaGetFuncId(uint8_t dpid);
+uint8_t TuyaGetDpId(uint8_t fnId);
+void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value);
+void TuyaSendBool(uint8_t id, bool value);
+void TuyaSendValue(uint8_t id, uint32_t value);
+void TuyaSendEnum(uint8_t id, uint32_t value);
+void TuyaSendString(uint8_t id, char data[]);
+bool TuyaSetPower(void);
+bool TuyaSetChannels(void);
+void LightSerialDuty(uint16_t duty);
+void TuyaRequestState(void);
+void TuyaResetWifi(void);
+void TuyaProcessStatePacket(void);
+void TuyaLowPowerModePacketProcess(void);
+void TuyaHandleProductInfoPacket(void);
+void TuyaSendLowPowerSuccessIfNeeded(void);
+void TuyaNormalPowerModePacketProcess(void);
+bool TuyaModuleSelected(void);
+void TuyaInit(void);
+void TuyaSerialInput(void);
+bool TuyaButtonPressed(void);
+uint8_t TuyaGetTuyaWifiState(void);
+void TuyaSetWifiLed(void);
+bool Xnrg16(uint8_t function);
+bool Xdrv16(uint8_t function);
+void RfReceiveCheck(void);
+void RfInit(void);
+void CmndRfSend(void);
+bool Xdrv17(uint8_t function);
+bool ArmtronixSetChannels(void);
+void LightSerial2Duty(uint8_t duty1, uint8_t duty2);
+void ArmtronixRequestState(void);
+bool ArmtronixModuleSelected(void);
+void ArmtronixInit(void);
+void ArmtronixSerialInput(void);
+void ArmtronixSetWifiLed(void);
+bool Xdrv18(uint8_t function);
+void PS16DZSerialSend(const char *tx_buffer);
+void PS16DZSerialSendOk(void);
+void PS16DZSerialSendUpdateCommand(void);
+void PS16DZSerialInput(void);
+bool PS16DZSerialSendUpdateCommandIfRequired(void);
+void PS16DZInit(void);
+bool PS16DZModuleSelected(void);
+bool Xdrv19(uint8_t function);
+String HueBridgeId(void);
+String HueSerialnumber(void);
+String HueUuid(void);
+void HueRespondToMSearch(void);
+String GetHueDeviceId(uint8_t id);
+String GetHueUserId(void);
+void HandleUpnpSetupHue(void);
+void HueNotImplemented(String *path);
+void HueConfigResponse(String *response);
+void HueConfig(String *path);
+uint8_t getLocalLightSubtype(uint8_t device);
+void HueLightStatus1(uint8_t device, String *response);
+bool HueActive(uint8_t device);
+void HueLightStatus2(uint8_t device, String *response);
+uint32_t EncodeLightId(uint8_t relay_id);
+uint32_t DecodeLightId(uint32_t hue_id);
+uint32_t findEchoGeneration(void);
+void HueGlobalConfig(String *path);
+void HueAuthentication(String *path);
+void HueLights(String *path);
+void HueGroups(String *path);
+void HandleHueApi(String *path);
+bool Xdrv20(uint8_t function);
+String WemoSerialnumber(void);
+String WemoUuid(void);
+void WemoRespondToMSearch(int echo_type);
+void HandleUpnpEvent(void);
+void HandleUpnpService(void);
+void HandleUpnpMetaService(void);
+void HandleUpnpSetupWemo(void);
+bool Xdrv21(uint8_t function);
+bool IsModuleIfan(void);
+uint8_t MaxFanspeed(void);
+uint8_t GetFanspeed(void);
+void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence);
+void SonoffIfanReceived(void);
+bool SonoffIfanSerialInput(void);
+void CmndFanspeed(void);
+bool SonoffIfanInit(void);
+void SonoffIfanUpdate(void);
+bool Xdrv22(uint8_t function);
+void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val);
+void CopyJsonArray(JsonArray &to, const JsonArray &arr);
+void CopyJsonObject(JsonObject &to, const JsonObject &from);
+uint16_t fromClusterCode(uint8_t c);
+uint8_t toClusterCode(uint16_t c);
+class SBuffer hibernateDevice(const struct Z_Device &device);
+class SBuffer hibernateDevices(void);
+void hidrateDevices(const SBuffer &buf);
+void loadZigbeeDevices(void);
+void saveZigbeeDevices(void);
+void eraseZigbeeDevices(void);
+uint8_t toPercentageCR2032(uint32_t voltage);
+uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
+                              uint32_t offset, uint32_t len);
+int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint);
+inline bool isXYZ(char c);
+inline int8_t hexValue(char c);
+void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz);
+void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload);
+const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd);
+inline char hexDigit(uint32_t h);
+String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z);
+uint32_t ZigbeeAliasOrNumber(const char *state_text);
+uint8_t ZigbeeGetInstructionSize(uint8_t instr);
+void ZigbeeGotoLabel(uint8_t label);
+void ZigbeeStateMachine_Run(void);
+int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf);
+int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf);
+int32_t Z_Reboot(int32_t res, class SBuffer &buf);
+int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf);
+bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match);
+int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf);
+void Z_SendIEEEAddrReq(uint16_t shortaddr);
+void Z_SendActiveEpReq(uint16_t shortaddr);
+void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint);
+int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf);
+void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid);
+int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf);
+int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf);
+void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json);
+int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf);
+int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf);
+int32_t Z_Load_Devices(uint8_t value);
+int32_t Z_State_Ready(uint8_t value);
+int32_t ZigbeeProcessInput(class SBuffer &buf);
+void ZigbeeInput(void);
+void ZigbeeInit(void);
+uint32_t strToUInt(const JsonVariant &val);
+void CmndZbReset(void);
+void CmndZbZNPSendOrReceive(bool send);
+void CmndZbZNPReceive(void);
+void CmndZbZNPSend(void);
+void ZigbeeZNPSend(const uint8_t *msg, size_t len);
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
+                       uint16_t cluster, uint8_t cmd, const char *param);
+void CmndZbSend(void);
+void CmndZbBind(void);
+void CmndZbProbe(void);
+void CmndZbProbeOrPing(boolean probe);
+void CmndZbPing(void);
+void CmndZbName(void);
+void CmndZbForget(void);
+void CmndZbSave(void);
+void CmndZbRead(void);
+void CmndZbPermitJoin(void);
+void CmndZbStatus(void);
+bool Xdrv23(uint8_t function);
+void BuzzerOff(void);
+void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode);
+void BuzzerSetStateToLed(uint32_t state);
+void BuzzerBeep(uint32_t count);
+void BuzzerEnabledBeep(uint32_t count, uint32_t duration);
+bool BuzzerPinState(void);
+void BuzzerInit(void);
+void BuzzerEvery100mSec(void);
+void CmndBuzzer(void);
+bool Xdrv24(uint8_t function);
+void A4988Init(void);
+void CmndDoMove(void);
+void CmndDoRotate(void);
+void CmndDoTurn(void);
+void CmndSetMIS(void);
+void CmndSetSPR(void);
+void CmndSetRPM(void);
+bool Xdrv25(uint8_t function);
+void AriluxRfInterrupt(void);
+void AriluxRfHandler(void);
+void AriluxRfInit(void);
+void AriluxRfDisable(void);
+bool Xdrv26(uint8_t function);
+void ShutterLogPos(uint32_t i);
+void ShutterRtc50mS(void);
+int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index);
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index);
+void ShutterInit(void);
+void ShutterReportPosition(bool always);
+void ShutterLimitRealAndTargetPositions(uint32_t i);
+void ShutterUpdatePosition(void);
+bool ShutterState(uint32_t device);
+void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos);
+void ShutterWaitForMotorStop(uint32_t i);
+int32_t ShutterCounterBasedPosition(uint32_t i);
+void ShutterRelayChanged(void);
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index);
+void ShutterButtonHandler(void);
+void ShutterSetPosition(uint32_t device, uint32_t position);
+void CmndShutterOpen(void);
+void CmndShutterClose(void);
+void CmndShutterStop(void);
+void CmndShutterPosition(void);
+void CmndShutterOpenTime(void);
+void CmndShutterCloseTime(void);
+void CmndShutterMotorDelay(void);
+void CmndShutterRelay(void);
+void CmndShutterButton(void);
+void CmndShutterSetHalfway(void);
+void CmndShutterFrequency(void);
+void CmndShutterSetClose(void);
+void CmndShutterInvert(void);
+void CmndShutterCalibration(void);
+void CmndShutterLock(void);
+void CmndShutterEnableEndStopTime(void);
+bool Xdrv27(uint8_t function);
+void Pcf8574SwitchRelay(void);
+void Pcf8574Init(void);
+void HandlePcf8574(void);
+void Pcf8574SaveSettings(void);
+bool Xdrv28(uint8_t function);
+bool DeepSleepEnabled(void);
+void DeepSleepReInit(void);
+void DeepSleepPrepare(void);
+void DeepSleepStart(void);
+void DeepSleepEverySecond(void);
+void CmndDeepsleepTime(void);
+bool Xdrv29(uint8_t function);
+uint8_t crc8(const uint8_t *p, uint8_t len);
+void ExsSendCmd(uint8_t cmd, uint8_t value);
+uint8_t ExsSetPower(uint8_t device, uint8_t power);
+uint8_t ExsSetBri(uint8_t device, uint8_t bri);
+uint8_t ExsSyncState(uint8_t device);
+bool ExsSyncState();
+void ExsDebugState();
+void ExsPacketProcess(void);
+bool ExsModuleSelected(void);
+bool ExsSetChannels(void);
+bool ExsSetPower(void);
+void EsxMcuStart(void);
+void ExsInit(void);
+void ExsSerialInput(void);
+void CmndExsDimm(void);
+void CmndExsDimmTbl(void);
+void CmndExsDimmVal(void);
+void CmndExsDimms(void);
+void CmndExsChLock(void);
+void CmndExsState(void);
+bool Xdrv30(uint8_t function);
+uint32_t TasmotaSlave_FlashStart(void);
+uint8_t TasmotaSlave_UpdateInit(void);
+void TasmotaSlave_Reset(void);
+uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout);
+uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count);
+uint8_t TasmotaSlave_execCmd(uint8_t cmd);
+uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count);
+uint8_t TasmotaSlave_exitProgMode(void);
+uint8_t TasmotaSlave_SetupFlash(void);
+uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo);
+void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data);
+void TasmotaSlave_Flash(void);
+void TasmotaSlave_SetFlagFlashing(bool value);
+bool TasmotaSlave_GetFlagFlashing(void);
+void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size);
+void TasmotaSlave_Init(void);
+void TasmotaSlave_Show(void);
+void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param);
+void CmndTasmotaSlaveReset(void);
+void CmndTasmotaSlaveSend(void);
+void TasmotaSlave_ProcessIn(void);
+bool Xdrv31(uint8_t function);
+void HotPlugInit(void);
+void HotPlugEverySecond(void);
+void CmndHotPlugTime(void);
+bool Xdrv32(uint8_t function);
+bool NRF24initRadio();
+bool NRF24Detect(void);
+bool Xdrv33(uint8_t function);
+void WMotorV1Detect(void);
+void WMotorV1Reset(void);
+void WMotorV1SetFrequency(uint32_t freq);
+void WMotorV1SetMotor(uint8_t motor, uint8_t dir, float pwm_val);
+bool WMotorV1Command(void);
+bool Xdrv34(uint8_t function);
+void ExceptionTest(uint8_t type);
+void CpuLoadLoop(void);
+void DebugFreeMem(void);
+void DebugFreeMem(void);
+void DebugRtcDump(char* parms);
+void DebugCfgDump(char* parms);
+void DebugCfgPeek(char* parms);
+void DebugCfgPoke(char* parms);
+void SetFlashMode(uint8_t mode);
+void CmndHelp(void);
+void CmndRtcDump(void);
+void CmndCfgDump(void);
+void CmndCfgPeek(void);
+void CmndCfgPoke(void);
+void CmndCfgXor(void);
+void CmndException(void);
+void CmndCpuCheck(void);
+void CmndFreemem(void);
+void CmndSetSensor(void);
+void CmndFlashMode(void);
+uint32_t DebugSwap32(uint32_t x);
+void CmndFlashDump(void);
+void CmndI2cWrite(void);
+void CmndI2cRead(void);
+void CmndI2cStretch(void);
+void CmndI2cClock(void);
+bool Xdrv99(uint8_t function);
+void XsnsDriverState(void);
+bool XdrvRulesProcess(void);
+void ShowFreeMem(const char *where);
+bool XdrvCallDriver(uint32_t driver, uint8_t Function);
+bool XdrvCall(uint8_t Function);
+void LcdInitMode(void);
+void LcdInit(uint8_t mode);
+void LcdInitDriver(void);
+void LcdDrawStringAt(void);
+void LcdDisplayOnOff(uint8_t on);
+void LcdCenter(uint8_t row, char* txt);
+bool LcdPrintLog(void);
+void LcdTime(void);
+void LcdRefresh(void);
+bool Xdsp01(uint8_t function);
+void SSD1306InitDriver(void);
+void Ssd1306PrintLog(void);
+void Ssd1306Time(void);
+void Ssd1306Refresh(void);
+bool Xdsp02(byte function);
+void MatrixWrite(void);
+void MatrixClear(void);
+void MatrixFixed(char* txt);
+void MatrixCenter(char* txt);
+void MatrixScrollLeft(char* txt, int loop);
+void MatrixScrollUp(char* txt, int loop);
+void MatrixInitMode(void);
+void MatrixInit(uint8_t mode);
+void MatrixInitDriver(void);
+void MatrixOnOff(void);
+void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void MatrixPrintLog(uint8_t direction);
+void MatrixRefresh(void);
+bool Xdsp03(uint8_t function);
+void Ili9341InitMode(void);
+void Ili9341Init(uint8_t mode);
+void Ili9341InitDriver(void);
+void Ili9341Clear(void);
+void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
+void Ili9341DisplayOnOff(uint8_t on);
+void Ili9341OnOff(void);
+void Ili9341PrintLog(void);
+void Ili9341Refresh(void);
+bool Xdsp04(uint8_t function);
+void EpdInitDriver29();
+void EpdPrintLog29(void);
+void EpdRefresh29(void);
+bool Xdsp05(uint8_t function);
+void EpdInitDriver42();
+void EpdRefresh42();
+bool Xdsp06(uint8_t function);
+void SH1106InitDriver();
+void SH1106PrintLog(void);
+void SH1106Time(void);
+void SH1106Refresh(void);
+bool Xdsp07(uint8_t function);
+void ILI9488_InitDriver();
+void ILI9488_MQTT(uint8_t count,const char *cp);
+void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr);
+void FT6236Check();
+bool Xdsp08(uint8_t function);
+void SSD1351_InitDriver();
+void SSD1351PrintLog(void);
+void SSD1351Time(void);
+void SSD1351Refresh(void);
+bool Xdsp09(uint8_t function);
+void RA8876_InitDriver();
+void RA8876_MQTT(uint8_t count,const char *cp);
+void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr);
+void FT5316Check();
+bool Xdsp10(uint8_t function);
+uint8_t XdspPresent(void);
+bool XdspCall(uint8_t Function);
+void Ws2812StripShow(void);
+int mod(int a, int b);
+void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset);
+void Ws2812UpdateHand(int position, uint32_t index);
+void Ws2812Clock(void);
+void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i);
+void Ws2812Gradient(uint32_t schemenr);
+void Ws2812Bars(uint32_t schemenr);
+void Ws2812Clear(void);
+void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
+char* Ws2812GetColor(uint32_t led, char* scolor);
+void Ws2812ForceSuspend (void);
+void Ws2812ForceUpdate (void);
+bool Ws2812SetChannels(void);
+void Ws2812ShowScheme(void);
+void Ws2812ModuleSelected(void);
+void CmndLed(void);
+void CmndPixels(void);
+void CmndRotation(void);
+void CmndWidth(void);
+bool Xlgt01(uint8_t function);
+void LightDiPulse(uint8_t times);
+void LightDckiPulse(uint8_t times);
+void LightMy92x1Write(uint8_t data);
+void LightMy92x1Init(void);
+void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c);
+bool My92x1SetChannels(void);
+void My92x1ModuleSelected(void);
+bool Xlgt02(uint8_t function);
+void SM16716_SendBit(uint8_t v);
+void SM16716_SendByte(uint8_t v);
+void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b);
+void SM16716_Init(void);
+bool Sm16716SetChannels(void);
+void Sm16716ModuleSelected(void);
+bool Xlgt03(uint8_t function);
+uint8_t Sm2135Write(uint8_t data);
+void Sm2135Send(uint8_t *buffer, uint8_t size);
+bool Sm2135SetChannels(void);
+void Sm2135ModuleSelected(void);
+bool Xlgt04(uint8_t function);
+void SnfL1Send(const char *buffer);
+void SnfL1SerialSendOk(void);
+bool SnfL1SerialInput(void);
+bool SnfL1SetChannels(void);
+void SnfL1ModuleSelected(void);
+bool Xlgt05(uint8_t function);
+bool XlgtCall(uint8_t function);
+void HlwCfInterrupt(void);
+void HlwCf1Interrupt(void);
+void HlwEvery200ms(void);
+void HlwEverySecond(void);
+void HlwSnsInit(void);
+void HlwDrvInit(void);
+bool HlwCommand(void);
+bool Xnrg01(uint8_t function);
+void CseReceived(void);
+bool CseSerialInput(void);
+void CseEverySecond(void);
+void CseSnsInit(void);
+void CseDrvInit(void);
+bool CseCommand(void);
+bool Xnrg02(uint8_t function);
+uint8_t PzemCrc(uint8_t *data);
+void PzemSend(uint8_t cmd);
+bool PzemReceiveReady(void);
+bool PzemRecieve(uint8_t resp, float *data);
+void PzemEvery250ms(void);
+void PzemSnsInit(void);
+void PzemDrvInit(void);
+bool PzemCommand(void);
+bool Xnrg03(uint8_t function);
+uint8_t McpChecksum(uint8_t *data);
+unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size);
+void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size);
+void McpSend(uint8_t *data);
+void McpGetAddress(void);
+void McpAddressReceive(void);
+void McpGetCalibration(void);
+void McpParseCalibration(void);
+bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift);
+void McpSetCalibration(struct mcp_cal_registers_type *cal_registers);
+void McpSetSystemConfiguration(uint16 interval);
+void McpGetFrequency(void);
+void McpParseFrequency(void);
+void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency);
+void McpGetData(void);
+void McpParseData(void);
+void McpSerialInput(void);
+void McpEverySecond(void);
+void McpSnsInit(void);
+void McpDrvInit(void);
+bool McpCommand(void);
+bool Xnrg04(uint8_t function);
+void PzemAcEverySecond(void);
+void PzemAcSnsInit(void);
+void PzemAcDrvInit(void);
+bool PzemAcCommand(void);
+bool Xnrg05(uint8_t function);
+void PzemDcEverySecond(void);
+void PzemDcSnsInit(void);
+void PzemDcDrvInit(void);
+bool PzemDcCommand(void);
+bool Xnrg06(uint8_t function);
+int Ade7953RegSize(uint16_t reg);
+void Ade7953Write(uint16_t reg, uint32_t val);
+int32_t Ade7953Read(uint16_t reg);
+void Ade7953Init(void);
+void Ade7953GetData(void);
+void Ade7953EnergyEverySecond(void);
+void Ade7953DrvInit(void);
+bool Ade7953Command(void);
+bool Xnrg07(uint8_t function);
+void SDM120Every250ms(void);
+void Sdm120SnsInit(void);
+void Sdm120DrvInit(void);
+void Sdm220Reset(void);
+void Sdm220Show(bool json);
+bool Xnrg08(uint8_t function);
+void Dds2382EverySecond(void);
+void Dds2382SnsInit(void);
+void Dds2382DrvInit(void);
+bool Xnrg09(uint8_t function);
+void SDM630Every250ms(void);
+void Sdm630SnsInit(void);
+void Sdm630DrvInit(void);
+bool Xnrg10(uint8_t function);
+void DDSU666Every250ms(void);
+void Ddsu666SnsInit(void);
+void Ddsu666DrvInit(void);
+bool Xnrg11(uint8_t function);
+bool solaxX1_RS485ReceiveReady(void);
+void solaxX1_RS485Send(uint16_t msgLen);
+uint8_t solaxX1_RS485Receive(uint8_t *value);
+uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen);
+void solaxX1_SendInverterAddress(void);
+void solaxX1_QueryLiveData(void);
+uint8_t solaxX1_ParseErrorCode(uint32_t code);
+void solaxX1250MSecond(void);
+void solaxX1SnsInit(void);
+void solaxX1DrvInit(void);
+void solaxX1Show(bool json);
+bool Xnrg12(uint8_t function);
+void FifLEEvery250ms(void);
+void FifLESnsInit(void);
+void FifLEDrvInit(void);
+void FifLEReset(void);
+void FifLEShow(bool json);
+bool Xnrg13(uint8_t function);
+bool XnrgCall(uint8_t function);
+void CounterUpdate(uint8_t index);
+void CounterUpdate1(void);
+void CounterUpdate2(void);
+void CounterUpdate3(void);
+void CounterUpdate4(void);
+bool CounterPinState(void);
+void CounterInit(void);
+void CounterEverySecond(void);
+void CounterSaveState(void);
+void CounterShow(bool json);
+void CmndCounter(void);
+void CmndCounterType(void);
+void CmndCounterDebounce(void);
+bool Xsns01(uint8_t function);
+void AdcInit(void);
+uint16_t AdcRead(uint8_t factor);
+void AdcEvery250ms(void);
+uint16_t AdcGetLux(void);
+uint16_t AdcGetRange(void);
+void AdcGetCurrentPower(uint8_t factor);
+void AdcEverySecond(void);
+void AdcShow(bool json);
+void CmndAdc(void);
+void CmndAdcs(void);
+void CmndAdcParam(void);
+bool Xsns02(uint8_t function);
+void SonoffScSend(const char *data);
+void SonoffScInit(void);
+void SonoffScSerialInput(char *rcvstat);
+void SonoffScShow(bool json);
+bool Xsns04(uint8_t function);
+uint8_t OneWireReset(void);
+void OneWireWriteBit(uint8_t v);
+void OneWireReadBit1(void);
+void OneWireReadBit2(void);
+uint8_t OneWireReadBit(void);
+void OneWireWrite(uint8_t v);
+uint8_t OneWireRead(void);
+void OneWireSelect(const uint8_t rom[8]);
+void OneWireResetSearch(void);
+uint8_t OneWireSearch(uint8_t *newAddr);
+bool OneWireCrc8(uint8_t *addr);
+void Ds18x20Init(void);
+void Ds18x20Convert(void);
+bool Ds18x20Read(uint8_t sensor);
+void Ds18x20Name(uint8_t sensor);
+void Ds18x20EverySecond(void);
+void Ds18x20Show(bool json);
+bool Xsns05(uint8_t function);
+void DhtReadPrep(void);
+int32_t DhtExpectPulse(uint8_t sensor, bool level);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+void DhtReadPrep(void);
+int32_t DhtExpectPulse(uint8_t sensor, bool level);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtExpectPulse(uint8_t sensor, int level);
+int DhtReadDat(uint8_t sensor);
+bool DhtRead(uint8_t sensor);
+void DhtReadTempHum(uint8_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtExpectPulse(uint32_t sensor, uint32_t level);
+bool DhtRead(uint32_t sensor);
+void DhtReadTempHum(uint32_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool DhtWaitState(uint32_t sensor, uint32_t level);
+bool DhtRead(uint32_t sensor);
+bool DhtPinState();
+void DhtInit(void);
+void DhtEverySecond(void);
+void DhtShow(bool json);
+bool Xsns06(uint8_t function);
+bool ShtReset(void);
+bool ShtSendCommand(const uint8_t cmd);
+bool ShtAwaitResult(void);
+int ShtReadData(void);
+bool ShtRead(void);
+void ShtDetect(void);
+void ShtEverySecond(void);
+void ShtShow(bool json);
+bool Xsns07(uint8_t function);
+uint8_t HtuCheckCrc8(uint16_t data);
+uint8_t HtuReadDeviceId(void);
+void HtuSetResolution(uint8_t resolution);
+void HtuReset(void);
+void HtuHeater(uint8_t heater);
+void HtuInit(void);
+bool HtuRead(void);
+void HtuDetect(void);
+void HtuEverySecond(void);
+void HtuShow(bool json);
+bool Xsns08(uint8_t function);
+bool Bmp180Calibration(uint8_t bmp_idx);
+void Bmp180Read(uint8_t bmp_idx);
+bool Bmx280Calibrate(uint8_t bmp_idx);
+void Bme280Read(uint8_t bmp_idx);
+static void BmeDelayMs(uint32_t ms);
+bool Bme680Init(uint8_t bmp_idx);
+void Bme680Read(uint8_t bmp_idx);
+void BmpDetect(void);
+void BmpRead(void);
+void BmpShow(bool json);
+void BMP_EnterSleep(void);
+bool Xsns09(uint8_t function);
+bool Bh1750Read(void);
+void Bh1750Detect(void);
+void Bh1750EverySecond(void);
+void Bh1750Show(bool json);
+bool Xsns10(uint8_t function);
+void Veml6070Detect(void);
+void Veml6070UvTableInit(void);
+void Veml6070EverySecond(void);
+void Veml6070ModeCmd(bool mode_cmd);
+uint16_t Veml6070ReadUv(void);
+double Veml6070UvRiskLevel(uint16_t uv_level);
+double Veml6070UvPower(double uvrisk);
+void Veml6070Show(bool json);
+bool Xsns11(uint8_t function);
+void Ads1115StartComparator(uint8_t channel, uint16_t mode);
+int16_t Ads1115GetConversion(uint8_t channel);
+void Ads1115Detect(void);
+void Ads1115Show(bool json);
+bool Xsns12(uint8_t function);
+bool Ina219SetCalibration(uint8_t mode, uint16_t addr);
+float Ina219GetShuntVoltage_mV(uint16_t addr);
+float Ina219GetBusVoltage_V(uint16_t addr);
+float Ina219GetCurrent_mA(uint16_t addr);
+bool Ina219Read(void);
+bool Ina219CommandSensor(void);
+void Ina219Detect(void);
+void Ina219EverySecond(void);
+void Ina219Show(bool json);
+bool Xsns13(uint8_t function);
+bool Sht3xRead(float &t, float &h, uint8_t sht3x_address);
+void Sht3xDetect(void);
+void Sht3xShow(bool json);
+bool Xsns14(uint8_t function);
+uint8_t MhzCalculateChecksum(uint8_t *array);
+size_t MhzSendCmd(uint8_t command_id);
+bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s);
+void MhzEverySecond(void);
+bool MhzCommandSensor(void);
+void MhzInit(void);
+void MhzShow(bool json);
+bool Xsns15(uint8_t function);
+bool Tsl2561Read(void);
+void Tsl2561Detect(void);
+void Tsl2561EverySecond(void);
+void Tsl2561Show(bool json);
+bool Xsns16(uint8_t function);
+void Senseair250ms(void);
+void SenseairInit(void);
+void SenseairShow(bool json);
+bool Xsns17(uint8_t function);
+bool PmsReadData(void);
+void PmsSecond(void);
+void PmsInit(void);
+void PmsShow(bool json);
+bool Xsns18(uint8_t function);
+void MGSInit(void);
+void MGSPrepare(void);
+char* measure_gas(int gas_type, char* buffer);
+void MGSShow(bool json);
+bool Xsns19(uint8_t function);
+bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer);
+void NovaSdsSetWorkPeriod(void);
+bool NovaSdsReadData(void);
+void NovaSdsSecond(void);
+bool NovaSdsCommandSensor(void);
+void NovaSdsInit(void);
+void NovaSdsShow(bool json);
+bool Xsns20(uint8_t function);
+void sgp30_Init(void);
+float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit);
+void Sgp30Update(void);
+void Sgp30Show(bool json);
+bool Xsns21(uint8_t function);
+uint8_t Sr04TModeDetect(void);
+uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third);
+uint16_t Sr04TMode3Distance();
+uint16_t Sr04TMode2Distance(void);
+void Sr04TReading(void);
+void Sr04Show(bool json);
+bool Xsns22(uint8_t function);
+uint8_t Si1145ReadByte(uint8_t reg);
+uint16_t Si1145ReadHalfWord(uint8_t reg);
+bool Si1145WriteByte(uint8_t reg, uint16_t val);
+uint8_t Si1145WriteParamData(uint8_t p, uint8_t v);
+bool Si1145Present(void);
+void Si1145Reset(void);
+void Si1145DeInit(void);
+bool Si1145Begin(void);
+uint16_t Si1145ReadUV(void);
+uint16_t Si1145ReadVisible(void);
+uint16_t Si1145ReadIR(void);
+bool Si1145Read(void);
+void Si1145Detect(void);
+void Si1145Update(void);
+void Si1145Show(bool json);
+bool Xsns24(uint8_t function);
+void LM75ADDetect(void);
+float LM75ADGetTemp(void);
+void LM75ADShow(bool json);
+bool Xsns26(uint8_t function);
+int8_t wireReadDataBlock( uint8_t reg,
+                                        uint8_t *val,
+                                        uint16_t len);
+void calculateColorTemperature(void);
+bool APDS9960_init(void);
+uint8_t getMode(void);
+void setMode(uint8_t mode, uint8_t enable);
+void enableLightSensor(void);
+void disableLightSensor(void);
+void enableProximitySensor(void);
+void disableProximitySensor(void);
+void enableGestureSensor(void);
+void disableGestureSensor(void);
+bool isGestureAvailable(void);
+int16_t readGesture(void);
+void enablePower(void);
+void disablePower(void);
+void readAllColorAndProximityData(void);
+void resetGestureParameters(void);
+bool processGestureData(void);
+bool decodeGesture(void);
+void handleGesture(void);
+void APDS9960_adjustATime(void);
+void APDS9960_loop(void);
+void APDS9960_detect(void);
+void APDS9960_show(bool json);
+bool APDS9960CommandSensor(void);
+bool Xsns27(uint8_t function);
+void Tm16XXSend(uint8_t data);
+void Tm16XXSendCommand(uint8_t cmd);
+void TM16XXSendData(uint8_t address, uint8_t data);
+uint8_t Tm16XXReceive(void);
+void Tm16XXClearDisplay(void);
+void Tm1638SetLED(uint8_t color, uint8_t pos);
+void Tm1638SetLEDs(word leds);
+uint8_t Tm1638GetButtons(void);
+void TmInit(void);
+void TmLoop(void);
+bool Xsns28(uint8_t function);
+void MCP230xx_CheckForIntCounter(void);
+void MCP230xx_CheckForIntRetainer(void);
+const char* IntModeTxt(uint8_t intmo);
+uint8_t MCP230xx_readGPIO(uint8_t port);
+void MCP230xx_ApplySettings(void);
+void MCP230xx_Detect(void);
+void MCP230xx_CheckForInterrupt(void);
+void MCP230xx_Show(bool json);
+void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate);
+void MCP230xx_Reset(uint8_t pinmode);
+bool MCP230xx_Command(void);
+void MCP230xx_UpdateWebData(void);
+void MCP230xx_OutputTelemetry(void);
+void MCP230xx_Interrupt_Counter_Report(void);
+void MCP230xx_Interrupt_Retain_Report(void);
+bool Xsns29(uint8_t function);
+void Mpr121Init(struct mpr121 *pS, bool initial);
+void Mpr121Show(struct mpr121 *pS, uint8_t function);
+bool Xsns30(uint8_t function);
+void CCS811Detect(void);
+void CCS811Update(void);
+void CCS811Show(bool json);
+bool Xsns31(uint8_t function);
+void MPU_6050PerformReading(void);
+void MPU_6050Detect(void);
+void MPU_6050Show(bool json);
+bool Xsns32(uint8_t function);
+void DS3231Detect(void);
+uint8_t bcd2dec(uint8_t n);
+uint8_t dec2bcd(uint8_t n);
+uint32_t ReadFromDS3231(void);
+void SetDS3231Time (uint32_t epoch_time);
+void DS3231EverySecond(void);
+bool Xsns33(uint8_t function);
+bool HxIsReady(uint16_t timeout);
+long HxRead(void);
+void HxResetPart(void);
+void HxReset(void);
+void HxCalibrationStateTextJson(uint8_t msg_id);
+void SetWeightDelta();
+bool HxCommand(void);
+long HxWeight(void);
+void HxInit(void);
+void HxEvery100mSecond(void);
+void HxSaveBeforeRestart(void);
+void HxShow(bool json);
+void HandleHxAction(void);
+void HxSaveSettings(void);
+void HxLogUpdates(void);
+bool Xsns34(uint8_t function);
+void TX2xStartRead(void);
+void Tx2xReset(void);
+void Tx2xRead(void);
+void Tx2xInit(void);
+void Tx2xShow(bool json);
+bool Xsns35(uint8_t function);
+void MGC3130_handleSensorData();
+void MGC3130_sendMessage(uint8_t data[], uint8_t length);
+void MGC3130_handleGesture();
+bool MGC3130_handleTouch();
+void MGC3130_handleAirWheel();
+void MGC3130_handleSystemStatus();
+bool MGC3130_receiveMessage();
+bool MGC3130_readData();
+void MGC3130_nextMode();
+void MGC3130_loop();
+void MGC3130_detect(void);
+void MGC3130_show(bool json);
+bool MGC3130CommandSensor();
+bool Xsns36(uint8_t function);
+bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal);
+void RfSnsInitTheoV2(void);
+void RfSnsAnalyzeTheov2(void);
+void RfSnsTheoV2Show(bool json);
+void RfSnsInitAlectoV2(void);
+void RfSnsAnalyzeAlectov2();
+void RfSnsAlectoResetRain(void);
+uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len);
+void RfSnsAlectoV2Show(bool json);
+void RfSnsInit(void);
+void RfSnsAnalyzeRawSignal(void);
+void RfSnsEverySecond(void);
+void RfSnsShow(bool json);
+bool Xsns37(uint8_t function);
+void AzEverySecond(void);
+void AzInit(void);
+void AzShow(bool json);
+bool Xsns38(uint8_t function);
+void MAX31855_Init(void);
+void MAX31855_GetResult(void);
+float MAX31855_GetProbeTemperature(int32_t RawData);
+float MAX31855_GetReferenceTemperature(int32_t RawData);
+int32_t MAX31855_ShiftIn(uint8_t Length);
+void MAX31855_Show(bool Json);
+bool Xsns39(uint8_t function);
+void PN532_Init(void);
+int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout);
+int8_t PN532_readAckFrame(void);
+uint32_t PN532_getFirmwareVersion(void);
+void PN532_wakeup(void);
+bool PN532_setPassiveActivationRetries(uint8_t maxRetries);
+bool PN532_SAMConfig(void);
+uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData);
+uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data);
+uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data);
+void PN532_ScanForTag(void);
+bool PN532_Command(void);
+bool Xsns40(uint8_t function);
+bool Max4409Read_lum(void);
+void Max4409Detect(void);
+void Max4409EverySecond(void);
+void Max4409Show(bool json);
+bool Xsns41(uint8_t function);
+void Scd30Detect(void);
+void Scd30Update(void);
+int Scd30GetCommand(int command_code, uint16_t *pvalue);
+int Scd30SetCommand(int command_code, uint16_t value);
+bool Scd30CommandSensor();
+void Scd30Show(bool json);
+bool Xsns42(byte function);
+int hreReadBit();
+char hreReadChar(int &parity_errors);
+void hreInit(void);
+void hreEvery50ms(void);
+void hreShow(boolean json);
+bool Xsns43(byte function);
+uint8_t sps30_calc_CRC(uint8_t *data);
+void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen);
+void sps30_cmd(uint16_t cmd);
+void SPS30_Detect(void);
+void SPS30_Every_Second();
+void SPS30_Show(bool json);
+bool SPS30_cmd(void);
+bool Xsns44(byte function);
+void Vl53l0Detect(void);
+void Vl53l0Every_250MSecond(void);
+void Vl53l0Show(boolean json);
+bool Xsns45(byte function);
+void MLX90614_Init(void);
+void MLX90614_Every_Second(void);
+void MLX90614_Show(uint8_t json);
+bool Xsns46(byte function);
+void MAX31865_Init(void);
+void MAX31865_GetResult(void);
+void MAX31865_Show(bool Json);
+bool Xsns47(uint8_t function);
+void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg);
+uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr);
+void ChirpReset(uint8_t addr);
+void ChirpResetAll(void);
+void ChirpClockSet();
+void ChirpSleep(uint8_t addr);
+void ChirpSelect(uint8_t sensor);
+uint8_t ChirpReadVersion(uint8_t addr);
+bool ChirpSet(uint8_t addr);
+bool ChirpScan();
+void ChirpDetect(void);
+void ChirpServiceAllSensors(uint8_t job);
+void ChirpEvery100MSecond(void);
+void ChirpShow(bool json);
+bool ChirpCmd(void);
+bool Xsns48(uint8_t function);
+void PAJ7620SelectBank(uint8_t bank);
+void PAJ7620DecodeGesture(void);
+void PAJ7620ReadGesture(void);
+void PAJ7620Detect(void);
+void PAJ7620Init(void);
+void PAJ7620Loop(void);
+void PAJ7620Show(bool json);
+bool PAJ7620CommandSensor(void);
+bool Xsns50(uint8_t function);
+void RDM6300_Init();
+void RDM6300_ScanForTag();
+uint8_t rm6300_hexnibble(char chr);
+void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[]);
+void RDM6300_Show(void);
+bool Xsns51(byte function);
+void IBEACON_Init();
+void hm17_every_second(void);
+void hm17_sbclr(void);
+void hm17_sendcmd(uint8_t cmd);
+uint32_t ibeacon_add(struct IBEACON *ib);
+void hm17_decode(void);
+void IBEACON_loop();
+void IBEACON_Show(void);
+bool xsns52_cmd(void);
+bool ibeacon_cmd(void);
+void ib_sendbeep(void);
+void ibeacon_mqtt(const char *mac,const char *rssi);
+bool Xsns52(byte function);
+double sml_median_array(double *array,uint8_t len);
+double sml_median(struct SML_MEDIAN_FILTER* mf, double in);
+void ADS1115_init(void);
+bool Serial_available();
+uint8_t Serial_read();
+uint8_t Serial_peek();
+void Dump2log(void);
+double sml_getvalue(unsigned char *cp,uint8_t index);
+uint8_t hexnibble(char chr);
+double CharToDouble(const char *str);
+void ebus_esc(uint8_t *ebus_buffer, unsigned char len);
+uint8_t ebus_crc8(uint8_t data, uint8_t crc_init);
+uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen );
+void sml_empty_receiver(uint32_t meters);
+void sml_shift_in(uint32_t meters,uint32_t shard);
+void SML_Poll(void);
+void SML_Decode(uint8_t index);
+void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex);
+void SML_Show(boolean json);
+void SML_CounterUpd(uint8_t index);
+void SML_CounterUpd1(void);
+void SML_CounterUpd2(void);
+void SML_CounterUpd3(void);
+void SML_CounterUpd4(void);
+bool Gpio_used(uint8_t gpiopin);
+void SML_Init(void);
+uint32_t SML_SetBaud(uint32_t meter, uint32_t br);
+uint32_t SML_Write(uint32_t meter,char *hstr);
+void SetDBGLed(uint8_t srcpin, uint8_t ledpin);
+void SML_Counter_Poll(void);
+void SML_Check_Send(void);
+uint8_t sml_hexnibble(char chr);
+void SML_Send_Seq(uint32_t meter,char *seq);
+uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num);
+uint8_t SML_PzemCrc(uint8_t *data, uint8_t len);
+uint8_t CalcEvenParity(uint8_t data);
+bool XSNS_53_cmd(void);
+void InjektCounterValue(uint8_t meter,uint32_t counter);
+void SML_CounterSaveState(void);
+bool Xsns53(byte function);
+static uint32_t _expand_r_shunt(uint16_t compact_r_shunt);
+void Ina226SetCalibration(uint8_t slaveIndex);
+bool Ina226TestPresence(uint8_t device);
+void Ina226ResetActive(void);
+void Ina226Init();
+float Ina226ReadBus_v(uint8_t device);
+float Ina226ReadShunt_i(uint8_t device);
+float Ina226ReadPower_w(uint8_t device);
+void Ina226Read(uint8_t device);
+void Ina226EverySecond();
+bool Ina226CommandSensor();
+void Ina226Show(bool json);
+bool Xsns54(byte callback_id);
+bool Hih6Read(void);
+void Hih6Detect(void);
+void Hih6EverySecond(void);
+void Hih6Show(bool json);
+bool Xsns55(uint8_t function);
+void HpmaSecond(void);
+void HpmaInit(void);
+void HpmaShow(bool json);
+bool Xsns56(uint8_t function);
+void Tsl2591Init(void);
+bool Tsl2591Read(void);
+void Tsl2591EverySecond(void);
+void Tsl2591Show(bool json);
+bool Xsns57(uint8_t function);
+bool Dht12Read(void);
+void Dht12Detect(void);
+void Dht12EverySecond(void);
+void Dht12Show(bool json);
+bool Xsns58(uint8_t function);
+uint32_t DS1624_Idx2Addr(uint32_t idx);
+int DS1624_Restart(uint8_t config, uint32_t idx);
+void DS1624_HotPlugUp(uint32_t idx);
+void DS1624_HotPlugDown(int idx);
+bool DS1624GetTemp(float *value, int idx);
+void DS1624HotPlugScan(void);
+void DS1624EverySecond(void);
+void DS1624Show(bool json);
+bool Xsns59(uint8_t function);
+void UBXcalcChecksum(char* CK, size_t msgSize);
+bool UBXcompareMsgHeader(const char* msgHeader);
+void UBXinitCFG(void);
+void UBXTriggerTele(void);
+void UBXDetect(void);
+uint32_t UBXprocessGPS();
+void UBXsendHeader(void);
+void UBXsendRecord(uint8_t *buf);
+void UBXsendFooter(void);
+void UBXsendFile(void);
+void UBXSetRate(uint16_t interval);
+void UBXSelectMode(uint16_t mode);
+bool UBXHandlePOSLLH();
+void UBXHandleSTATUS();
+void UBXHandleTIME();
+void UBXHandleOther(void);
+void UBXLoop50msec(void);
+void UBXLoop(void);
+void UBXShow(bool json);
+bool UBXCmd(void);
+bool Xsns60(uint8_t function);
+bool MINRFinitBLE(uint8_t _mode);
+void MINRFhopChannel();
+bool MINRFreceivePacket(void);
+void MINRFswapbuf(uint8_t len);
+void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr);
+void MINRFreverseMAC(uint8_t _mac[]);
+void MINRFchangePacketModeTo(uint8_t _mode);
+void MINRFpurgeFakeSensors(void);
+void MINRFhandleFloraPacket(void);
+void MINRFhandleMJ_HT_V1Packet(void);
+void MINRFhandleLYWSD02Packet(void);
+void MINRFhandleLYWSD03Packet(void);
+void MINRFhandleCGG1Packet(void);
+void MINRF_EVERY_50_MSECOND();
+void MINRFShow(bool json);
+bool Xsns61(uint8_t function);
+void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay);
+void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot);
+void HM10_Reset(void);
+void HM10_Discovery_Scan(void);
+void HM10_Read_LYWSD03(void);
+void HM10_Read_LYWSD02(void);
+void HM10_Time_LYWSD02(void);
+void HM10SerialInit(void);
+void HM10MACStringToBytes(const char* string, uint8_t _mac[]);
+void HM10ParseResponse(char *buf);
+void HM10readTempHum(char *_buf);
+bool HM10readBat(char *_buf);
+bool HM10SerialHandleFeedback();
+void HM10_TaskEvery100ms();
+void HM10EverySecond();
+bool HM10Cmd(void);
+void HM10Show(bool json);
+bool Xsns62(uint8_t function);
+bool AHT10Read(void);
+bool AHT10Init(void);
+uint8_t AHT10ReadStatus(void);
+void AHT10Reset(void);
+void AHT10Detect(void);
+void AHT10EverySecond(void);
+void AHT10Show(bool json);
+bool Xsns63(uint8_t function);
+void HandleMetrics(void);
+bool Xsns91(uint8_t function);
+bool XsnsEnabled(uint32_t sns_index);
+void XsnsSensorState(void);
+bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index);
+bool XsnsCall(uint8_t Function);
+bool I2cEnabled(uint32_t i2c_index);
+void I2cDriverState(void);
+#line 184 "S:/Development/Tasmota/tasmota/tasmota.ino"
+void setup(void)
+{
+  global_state.data = 3;
+
+  RtcRebootLoad();
+  if (!RtcRebootValid()) {
+    RtcReboot.fast_reboot_count = 0;
+  }
+  RtcReboot.fast_reboot_count++;
+  RtcRebootSave();
+
+  Serial.begin(APP_BAUDRATE);
+  seriallog_level = LOG_LEVEL_INFO;
+
+  snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);
+  if (VERSION & 0xff) {
+    snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
+  }
+
+  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
+
+  SettingsLoad();
+  SettingsDelta();
+
+  OsWatchInit();
+
+  GetFeatures();
+
+  if (1 == RtcReboot.fast_reboot_count) {
+    UpdateQuickPowerCycle(true);
+    XdrvCall(FUNC_SETTINGS_OVERRIDE);
+  }
+
+
+  seriallog_level = Settings.seriallog_level;
+  seriallog_timer = SERIALLOG_TIMER;
+  syslog_level = Settings.syslog_level;
+  stop_flash_rotate = Settings.flag.stop_flash_rotate;
+  save_data_counter = Settings.save_data;
+  sleep = Settings.sleep;
+#ifndef USE_EMULATION
+  Settings.flag2.emulation = 0;
+#else
+#ifndef USE_EMULATION_WEMO
+  if (EMUL_WEMO == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
+#endif
+#ifndef USE_EMULATION_HUE
+  if (EMUL_HUE == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
+#endif
+#endif
+
+  if (Settings.param[P_BOOT_LOOP_OFFSET]) {
+
+    if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET]) {
+      Settings.flag3.user_esp8285_enable = 0;
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +1) {
+        for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+          if (bitRead(Settings.rule_stop, i)) {
+            bitWrite(Settings.rule_enabled, i, 0);
+          }
+        }
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +2) {
+        Settings.rule_enabled = 0;
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +3) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          Settings.my_gp.io[i] = GPIO_NONE;
+        }
+        Settings.my_adc0 = ADC0_NONE;
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +4) {
+        Settings.module = SONOFF_BASIC;
+
+      }
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
+    }
+  }
+
+  Format(mqtt_client, SettingsText(SET_MQTT_CLIENT), sizeof(mqtt_client));
+  Format(mqtt_topic, SettingsText(SET_MQTT_TOPIC), sizeof(mqtt_topic));
+  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME), mqtt_topic, ESP.getChipId() & 0x1FFF);
+  } else {
+    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME));
+  }
+
+  GetEspHardwareType();
+  GpioInit();
+
+
+
+  WifiConnect();
+
+  SetPowerOnState();
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE), PROJECT, SettingsText(SET_FRIENDLYNAME1), my_version, my_image);
+#ifdef FIRMWARE_MINIMAL
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_WARNING_MINIMAL_VERSION));
+#endif
+
+  memcpy_P(log_data, VERSION_MARKER, 1);
+
+  RtcInit();
+
+#ifdef USE_ARDUINO_OTA
+  ArduinoOTAInit();
+#endif
+
+  XdrvCall(FUNC_INIT);
+  XsnsCall(FUNC_INIT);
+}
+
+void BacklogLoop(void)
+{
+  if (TimeReached(backlog_delay)) {
+    if (!BACKLOG_EMPTY && !backlog_mutex) {
+#ifdef SUPPORT_IF_STATEMENT
+      backlog_mutex = true;
+      String cmd = backlog.shift();
+      backlog_mutex = false;
+      ExecuteCommand((char*)cmd.c_str(), SRC_BACKLOG);
+#else
+      backlog_mutex = true;
+      ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
+      backlog_pointer++;
+      if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
+      backlog_mutex = false;
+#endif
+    }
+  }
+}
+
+void loop(void)
+{
+  uint32_t my_sleep = millis();
+
+  XdrvCall(FUNC_LOOP);
+  XsnsCall(FUNC_LOOP);
+
+  OsWatchLoop();
+
+  ButtonLoop();
+  SwitchLoop();
+#ifdef ROTARY_V1
+  RotaryLoop();
+#endif
+#ifdef USE_DEVICE_GROUPS
+  DeviceGroupsLoop();
+#endif
+  BacklogLoop();
+
+  if (TimeReached(state_50msecond)) {
+    SetNextTimeInterval(state_50msecond, 50);
+    XdrvCall(FUNC_EVERY_50_MSECOND);
+    XsnsCall(FUNC_EVERY_50_MSECOND);
+  }
+  if (TimeReached(state_100msecond)) {
+    SetNextTimeInterval(state_100msecond, 100);
+    Every100mSeconds();
+    XdrvCall(FUNC_EVERY_100_MSECOND);
+    XsnsCall(FUNC_EVERY_100_MSECOND);
+  }
+  if (TimeReached(state_250msecond)) {
+    SetNextTimeInterval(state_250msecond, 250);
+    Every250mSeconds();
+    XdrvCall(FUNC_EVERY_250_MSECOND);
+    XsnsCall(FUNC_EVERY_250_MSECOND);
+  }
+  if (TimeReached(state_second)) {
+    SetNextTimeInterval(state_second, 1000);
+    PerformEverySecond();
+    XdrvCall(FUNC_EVERY_SECOND);
+    XsnsCall(FUNC_EVERY_SECOND);
+  }
+
+  if (!serial_local) { SerialInput(); }
+
+#ifdef USE_ARDUINO_OTA
+  ArduinoOtaLoop();
+#endif
+
+  uint32_t my_activity = millis() - my_sleep;
+
+  if (Settings.flag3.sleep_normal) {
+
+    delay(sleep);
+  } else {
+    if (my_activity < (uint32_t)sleep) {
+      delay((uint32_t)sleep - my_activity);
+    } else {
+      if (global_state.wifi_down) {
+        delay(my_activity /2);
+      }
+    }
+  }
+
+  if (!my_activity) { my_activity++; }
+  uint32_t loop_delay = sleep;
+  if (!loop_delay) { loop_delay++; }
+  uint32_t loops_per_second = 1000 / loop_delay;
+  uint32_t this_cycle_ratio = 100 * my_activity / loop_delay;
+  loop_load_avg = loop_load_avg - (loop_load_avg / loops_per_second) + (this_cycle_ratio / loops_per_second);
+}
+# 1 "S:/Development/Tasmota/tasmota/sendemail.ino"
+#ifdef USE_SENDMAIL
+
+#include "sendemail.h"
+# 25 "S:/Development/Tasmota/tasmota/sendemail.ino"
+#ifndef SEND_MAIL_MINRAM
+#define SEND_MAIL_MINRAM 12*1024
+#endif
+
+#define xPSTR(a) a
+
+uint16_t SendMail(char *buffer) {
+  char *params,*oparams;
+  const char *mserv;
+  uint16_t port;
+  const char *user;
+  const char *pstr;
+  const char *passwd;
+  const char *from;
+  const char *to;
+  const char *subject;
+  const char *cmd;
+  char auth=0;
+  uint16_t status=1;
+  SendEmail *mail=0;
+  uint16_t blen;
+  char *endcmd;
+
+
+
+  uint16_t mem=ESP.getFreeHeap();
+  if (mem<SEND_MAIL_MINRAM) {
+    return 4;
+  }
+
+  while (*buffer==' ') buffer++;
+
+  if (*buffer!='[') {
+      goto exit;
+  }
+
+  buffer++;
+
+  endcmd=strchr(buffer,']');
+  if (!endcmd) {
+    goto exit;
+  }
+
+
+  blen=(uint32_t)endcmd-(uint32_t)buffer;
+  oparams=(char*)calloc(blen+2,1);
+  if (!oparams) return 4;
+  params=oparams;
+  strncpy(oparams,buffer,blen+2);
+  oparams[blen]=0;
+
+  cmd=endcmd+1;
+
+  #ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("mailsize: %d"),blen);
+  #endif
+
+  mserv=strtok(params,":");
+  if (!mserv) {
+      goto exit;
+  }
+
+
+  pstr=strtok(NULL,":");
+  if (!pstr) {
+      goto exit;
+  }
+
+#ifdef EMAIL_PORT
+  if (*pstr=='*') {
+    port=EMAIL_PORT;
+  } else {
+    port=atoi(pstr);
+  }
+#else
+  port=atoi(pstr);
+#endif
+
+  user=strtok(NULL,":");
+  if (!user) {
+      goto exit;
+  }
+
+  passwd=strtok(NULL,":");
+  if (!passwd) {
+      goto exit;
+  }
+
+  from=strtok(NULL,":");
+  if (!from) {
+      goto exit;
+  }
+
+  to=strtok(NULL,":");
+  if (!to) {
+      goto exit;
+  }
+
+  subject=strtok(NULL,"]");
+  if (!subject) {
+      goto exit;
+  }
+
+
+#ifdef EMAIL_USER
+  if (*user=='*') {
+    user=xPSTR(EMAIL_USER);
+  }
+#endif
+#ifdef EMAIL_PASSWORD
+  if (*passwd=='*') {
+    passwd=xPSTR(EMAIL_PASSWORD);
+  }
+#endif
+#ifdef EMAIL_SERVER
+  if (*mserv=='*') {
+    mserv=xPSTR(EMAIL_SERVER);
+  }
+#endif
+
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %d - %s - %s"),mserv,port,user,passwd);
+#endif
+
+
+#ifndef MAIL_TIMEOUT
+  #define MAIL_TIMEOUT 2000
+#endif
+  mail = new SendEmail(mserv,port,user,passwd, MAIL_TIMEOUT, auth);
+
+#ifdef EMAIL_FROM
+  if (*from=='*') {
+    from=xPSTR(EMAIL_FROM);
+  }
+#endif
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %s - %s - %s"),from,to,subject,cmd);
+#endif
+
+  if (mail) {
+    bool result=mail->send(from,to,subject,cmd);
+    delete mail;
+    if (result==true) status=0;
+  }
+
+exit:
+  if (oparams) free(oparams);
+  return status;
+}
+
+void script_send_email_body(BearSSL::WiFiClientSecure_light *client);
+
+
+SendEmail::SendEmail(const String& host, const int port, const String& user, const String& passwd, const int timeout, const int auth_used) :
+    host(host), port(port), user(user), passwd(passwd), timeout(timeout), ssl(ssl), auth_used(auth_used), client(new BearSSL::WiFiClientSecure_light(1024,1024)) {
+}
+
+String SendEmail::readClient() {
+  delay(0);
+  String r = client->readStringUntil('\n');
+
+  r.trim();
+  while (client->available()) {
+    delay(0);
+    r += client->readString();
+  }
+  return r;
+}
+
+bool SendEmail::send(const String& from, const String& to, const String& subject, const char *msg) {
+bool status=false;
+String buffer;
+
+  if (!host.length()) {
+    return status;
+  }
+
+  client->setTimeout(timeout);
+
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("Connecting: %s on port %d"),host.c_str(),port);
+#endif
+
+  if (!client->connect(host.c_str(), port)) {
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P(LOG_LEVEL_INFO, PSTR("Connection failed"));
+#endif
+    goto exit;
+  }
+
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("220"))) {
+    goto exit;
+  }
+
+  buffer = F("EHLO ");
+  buffer += client->localIP().toString();
+
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+  if (user.length()>0 && passwd.length()>0 ) {
+
+    buffer = F("AUTH LOGIN");
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("334")))
+    {
+      goto exit;
+    }
+    base64 b;
+    buffer = b.encode(user);
+
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("334"))) {
+      goto exit;
+    }
+    buffer = b.encode(passwd);
+    client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+    if (!buffer.startsWith(F("235"))) {
+      goto exit;
+    }
+  }
+
+
+  buffer = F("MAIL FROM:");
+  buffer += from;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+  buffer = F("RCPT TO:");
+  buffer += to;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("250"))) {
+    goto exit;
+  }
+
+  buffer = F("DATA");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = readClient();
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  if (!buffer.startsWith(F("354"))) {
+    goto exit;
+  }
+  buffer = F("From: ");
+  buffer += from;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = F("To: ");
+  buffer += to;
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+  buffer = F("Subject: ");
+  buffer += subject;
+  buffer += F("\r\n");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+#ifdef USE_SCRIPT
+  if (*msg=='*' && *(msg+1)==0) {
+    script_send_email_body(client);
+  } else {
+    client->println(msg);
+  }
+#else
+  client->println(msg);
+#endif
+  client->println('.');
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+  buffer = F("QUIT");
+  client->println(buffer);
+#ifdef DEBUG_EMAIL_PORT
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
+#endif
+
+  status=true;
+exit:
+
+  return status;
+}
+
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/settings.ino"
+# 20 "S:/Development/Tasmota/tasmota/settings.ino"
+#ifndef DOMOTICZ_UPDATE_TIMER
+#define DOMOTICZ_UPDATE_TIMER 0
+#endif
+
+#ifndef EMULATION
+#define EMULATION EMUL_NONE
+#endif
+
+#ifndef MTX_ADDRESS1
+#define MTX_ADDRESS1 0
+#endif
+#ifndef MTX_ADDRESS2
+#define MTX_ADDRESS2 0
+#endif
+#ifndef MTX_ADDRESS3
+#define MTX_ADDRESS3 0
+#endif
+#ifndef MTX_ADDRESS4
+#define MTX_ADDRESS4 0
+#endif
+#ifndef MTX_ADDRESS5
+#define MTX_ADDRESS5 0
+#endif
+#ifndef MTX_ADDRESS6
+#define MTX_ADDRESS6 0
+#endif
+#ifndef MTX_ADDRESS7
+#define MTX_ADDRESS7 0
+#endif
+#ifndef MTX_ADDRESS8
+#define MTX_ADDRESS8 0
+#endif
+
+#ifndef HOME_ASSISTANT_DISCOVERY_ENABLE
+#define HOME_ASSISTANT_DISCOVERY_ENABLE 0
+#endif
+
+#ifndef LATITUDE
+#define LATITUDE 48.858360
+#endif
+#ifndef LONGITUDE
+#define LONGITUDE 2.294442
+#endif
+
+#ifndef WORKING_PERIOD
+#define WORKING_PERIOD 5
+#endif
+
+#ifndef COLOR_TEXT
+#define COLOR_TEXT "#000"
+#endif
+#ifndef COLOR_BACKGROUND
+#define COLOR_BACKGROUND "#fff"
+#endif
+#ifndef COLOR_FORM
+#define COLOR_FORM "#f2f2f2"
+#endif
+#ifndef COLOR_INPUT_TEXT
+#define COLOR_INPUT_TEXT "#000"
+#endif
+#ifndef COLOR_INPUT
+#define COLOR_INPUT "#fff"
+#endif
+#ifndef COLOR_CONSOLE_TEXT
+#define COLOR_CONSOLE_TEXT "#000"
+#endif
+#ifndef COLOR_CONSOLE
+#define COLOR_CONSOLE "#fff"
+#endif
+#ifndef COLOR_TEXT_WARNING
+#define COLOR_TEXT_WARNING "#f00"
+#endif
+#ifndef COLOR_TEXT_SUCCESS
+#define COLOR_TEXT_SUCCESS "#008000"
+#endif
+#ifndef COLOR_BUTTON_TEXT
+#define COLOR_BUTTON_TEXT "#fff"
+#endif
+#ifndef COLOR_BUTTON
+#define COLOR_BUTTON "#1fa3ec"
+#endif
+#ifndef COLOR_BUTTON_HOVER
+#define COLOR_BUTTON_HOVER "#0e70a4"
+#endif
+#ifndef COLOR_BUTTON_RESET
+#define COLOR_BUTTON_RESET "#d43535"
+#endif
+#ifndef COLOR_BUTTON_RESET_HOVER
+#define COLOR_BUTTON_RESET_HOVER "#931f1f"
+#endif
+#ifndef COLOR_BUTTON_SAVE
+#define COLOR_BUTTON_SAVE "#47c266"
+#endif
+#ifndef COLOR_BUTTON_SAVE_HOVER
+#define COLOR_BUTTON_SAVE_HOVER "#5aaf6f"
+#endif
+#ifndef COLOR_TIMER_TAB_TEXT
+#define COLOR_TIMER_TAB_TEXT "#fff"
+#endif
+#ifndef COLOR_TIMER_TAB_BACKGROUND
+#define COLOR_TIMER_TAB_BACKGROUND "#999"
+#endif
+#ifndef COLOR_TITLE_TEXT
+#define COLOR_TITLE_TEXT COLOR_TEXT
+#endif
+#ifndef IR_RCV_MIN_UNKNOWN_SIZE
+#define IR_RCV_MIN_UNKNOWN_SIZE 6
+#endif
+#ifndef ENERGY_OVERTEMP
+#define ENERGY_OVERTEMP 90
+#endif
+#ifndef DEFAULT_DIMMER_MAX
+#define DEFAULT_DIMMER_MAX 100
+#endif
+#ifndef DEFAULT_DIMMER_MIN
+#define DEFAULT_DIMMER_MIN 0
+#endif
+#ifndef DEFAULT_LIGHT_DIMMER
+#define DEFAULT_LIGHT_DIMMER 10
+#endif
+#ifndef DEFAULT_LIGHT_COMPONENT
+#define DEFAULT_LIGHT_COMPONENT 255
+#endif
+#ifndef CORS_ENABLED_ALL
+#define CORS_ENABLED_ALL "*"
+#endif
+
+
+enum WebColors {
+  COL_TEXT, COL_BACKGROUND, COL_FORM,
+  COL_INPUT_TEXT, COL_INPUT, COL_CONSOLE_TEXT, COL_CONSOLE,
+  COL_TEXT_WARNING, COL_TEXT_SUCCESS,
+  COL_BUTTON_TEXT, COL_BUTTON, COL_BUTTON_HOVER, COL_BUTTON_RESET, COL_BUTTON_RESET_HOVER, COL_BUTTON_SAVE, COL_BUTTON_SAVE_HOVER,
+  COL_TIMER_TAB_TEXT, COL_TIMER_TAB_BACKGROUND, COL_TITLE,
+  COL_LAST };
+
+const char kWebColors[] PROGMEM =
+  COLOR_TEXT "|" COLOR_BACKGROUND "|" COLOR_FORM "|"
+  COLOR_INPUT_TEXT "|" COLOR_INPUT "|" COLOR_CONSOLE_TEXT "|" COLOR_CONSOLE "|"
+  COLOR_TEXT_WARNING "|" COLOR_TEXT_SUCCESS "|"
+  COLOR_BUTTON_TEXT "|" COLOR_BUTTON "|" COLOR_BUTTON_HOVER "|" COLOR_BUTTON_RESET "|" COLOR_BUTTON_RESET_HOVER "|" COLOR_BUTTON_SAVE "|" COLOR_BUTTON_SAVE_HOVER "|"
+  COLOR_TIMER_TAB_TEXT "|" COLOR_TIMER_TAB_BACKGROUND "|" COLOR_TITLE_TEXT;
+
+enum TasmotaSerialConfig {
+  TS_SERIAL_5N1, TS_SERIAL_6N1, TS_SERIAL_7N1, TS_SERIAL_8N1,
+  TS_SERIAL_5N2, TS_SERIAL_6N2, TS_SERIAL_7N2, TS_SERIAL_8N2,
+  TS_SERIAL_5E1, TS_SERIAL_6E1, TS_SERIAL_7E1, TS_SERIAL_8E1,
+  TS_SERIAL_5E2, TS_SERIAL_6E2, TS_SERIAL_7E2, TS_SERIAL_8E2,
+  TS_SERIAL_5O1, TS_SERIAL_6O1, TS_SERIAL_7O1, TS_SERIAL_8O1,
+  TS_SERIAL_5O2, TS_SERIAL_6O2, TS_SERIAL_7O2, TS_SERIAL_8O2 };
+
+const uint8_t kTasmotaSerialConfig[] PROGMEM = {
+  SERIAL_5N1, SERIAL_6N1, SERIAL_7N1, SERIAL_8N1,
+  SERIAL_5N2, SERIAL_6N2, SERIAL_7N2, SERIAL_8N2,
+  SERIAL_5E1, SERIAL_6E1, SERIAL_7E1, SERIAL_8E1,
+  SERIAL_5E2, SERIAL_6E2, SERIAL_7E2, SERIAL_8E2,
+  SERIAL_5O1, SERIAL_6O1, SERIAL_7O1, SERIAL_8O1,
+  SERIAL_5O2, SERIAL_6O2, SERIAL_7O2, SERIAL_8O2
+};
+
+
+
+
+
+const uint16_t RTC_MEM_VALID = 0xA55A;
+
+uint32_t rtc_settings_crc = 0;
+
+uint32_t GetRtcSettingsCrc(void)
+{
+  uint32_t crc = 0;
+  uint8_t *bytes = (uint8_t*)&RtcSettings;
+
+  for (uint32_t i = 0; i < sizeof(RTCMEM); i++) {
+    crc += bytes[i]*(i+1);
+  }
+  return crc;
+}
+
+void RtcSettingsSave(void)
+{
+  if (GetRtcSettingsCrc() != rtc_settings_crc) {
+    RtcSettings.valid = RTC_MEM_VALID;
+    ESP.rtcUserMemoryWrite(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
+    rtc_settings_crc = GetRtcSettingsCrc();
+  }
+}
+
+void RtcSettingsLoad(void)
+{
+  ESP.rtcUserMemoryRead(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
+  if (RtcSettings.valid != RTC_MEM_VALID) {
+    memset(&RtcSettings, 0, sizeof(RTCMEM));
+    RtcSettings.valid = RTC_MEM_VALID;
+    RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
+    RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
+    RtcSettings.energy_usage = Settings.energy_usage;
+    for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+      RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
+    }
+    RtcSettings.power = Settings.power;
+    RtcSettingsSave();
+  }
+  rtc_settings_crc = GetRtcSettingsCrc();
+}
+
+bool RtcSettingsValid(void)
+{
+  return (RTC_MEM_VALID == RtcSettings.valid);
+}
+
+
+
+uint32_t rtc_reboot_crc = 0;
+
+uint32_t GetRtcRebootCrc(void)
+{
+  uint32_t crc = 0;
+  uint8_t *bytes = (uint8_t*)&RtcReboot;
+
+  for (uint32_t i = 0; i < sizeof(RTCRBT); i++) {
+    crc += bytes[i]*(i+1);
+  }
+  return crc;
+}
+
+void RtcRebootSave(void)
+{
+  if (GetRtcRebootCrc() != rtc_reboot_crc) {
+    RtcReboot.valid = RTC_MEM_VALID;
+    ESP.rtcUserMemoryWrite(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
+    rtc_reboot_crc = GetRtcRebootCrc();
+  }
+}
+
+void RtcRebootReset(void)
+{
+  RtcReboot.fast_reboot_count = 0;
+  RtcRebootSave();
+}
+
+void RtcRebootLoad(void)
+{
+  ESP.rtcUserMemoryRead(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
+  if (RtcReboot.valid != RTC_MEM_VALID) {
+    memset(&RtcReboot, 0, sizeof(RTCRBT));
+    RtcReboot.valid = RTC_MEM_VALID;
+
+    RtcRebootSave();
+  }
+  rtc_reboot_crc = GetRtcRebootCrc();
+}
+
+bool RtcRebootValid(void)
+{
+  return (RTC_MEM_VALID == RtcReboot.valid);
+}
+# 299 "S:/Development/Tasmota/tasmota/settings.ino"
+extern "C" {
+#include "spi_flash.h"
+}
+#include "eboot_command.h"
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+
+extern "C" uint32_t _SPIFFS_end;
+
+const uint32_t SPIFFS_END = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#else
+
+#if AUTOFLASHSIZE
+
+#include "flash_hal.h"
+
+
+const uint32_t SPIFFS_END = (FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#else
+
+extern "C" uint32_t _FS_end;
+
+const uint32_t SPIFFS_END = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+
+#endif
+
+#endif
+
+
+const uint32_t SETTINGS_LOCATION = SPIFFS_END;
+
+const uint8_t CFG_ROTATES = 8;
+
+uint32_t settings_location = SETTINGS_LOCATION;
+uint32_t settings_crc32 = 0;
+uint8_t *settings_buffer = nullptr;
+
+
+
+
+
+void SetFlashModeDout(void)
+{
+  uint8_t *_buffer;
+  uint32_t address;
+
+  eboot_command ebcmd;
+  eboot_command_read(&ebcmd);
+  address = ebcmd.args[0];
+  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
+
+  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
+    if (_buffer[2] != 3) {
+      _buffer[2] = 3;
+      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
+        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
+      }
+    }
+  }
+  delete[] _buffer;
+}
+
+bool VersionCompatible(void)
+{
+  if (Settings.flag3.compatibility_check) {
+    return true;
+  }
+
+  eboot_command ebcmd;
+  eboot_command_read(&ebcmd);
+  uint32_t start_address = ebcmd.args[0];
+  uint32_t end_address = start_address + (ebcmd.args[2] & 0xFFFFF000) + FLASH_SECTOR_SIZE;
+  uint32_t* buffer = new uint32_t[FLASH_SECTOR_SIZE / 4];
+
+  uint32_t version[3] = { 0 };
+  bool found = false;
+  for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
+    ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
+    if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
+      version[1] = 0xFFFFFFFF;
+      found = true;
+    } else {
+      for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
+        version[0] = version[1];
+        version[1] = version[2];
+        version[2] = buffer[i];
+        if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
+          found = true;
+          break;
+        }
+      }
+    }
+    if (found) { break; }
+  }
+  delete[] buffer;
+
+  if (!found) { version[1] = 0; }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
+
+  if (version[1] < VERSION_COMPATIBLE) {
+    uint32_t eboot_magic = 0;
+    ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
+    return false;
+  }
+
+  return true;
+}
+
+void SettingsBufferFree(void)
+{
+  if (settings_buffer != nullptr) {
+    free(settings_buffer);
+    settings_buffer = nullptr;
+  }
+}
+
+bool SettingsBufferAlloc(void)
+{
+  SettingsBufferFree();
+  if (!(settings_buffer = (uint8_t *)malloc(sizeof(Settings)))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_UPLOAD_ERR_2));
+    return false;
+  }
+  return true;
+}
+
+uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size)
+{
+  uint16_t crc = 0;
+
+  for (uint32_t i = 0; i < size; i++) {
+    if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); }
+  }
+  return crc;
+}
+
+uint16_t GetSettingsCrc(void)
+{
+
+  uint32_t size = ((Settings.version < 0x06060007) || (Settings.version > 0x0606000A)) ? 3584 : sizeof(SYSCFG);
+  return GetCfgCrc16((uint8_t*)&Settings, size);
+}
+
+uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size)
+{
+
+  uint32_t crc = 0;
+
+  while (size--) {
+    crc ^= *bytes++;
+    for (uint32_t j = 0; j < 8; j++) {
+      crc = (crc >> 1) ^ (-int(crc & 1) & 0xEDB88320);
+    }
+  }
+  return ~crc;
+}
+
+uint32_t GetSettingsCrc32(void)
+{
+  return GetCfgCrc32((uint8_t*)&Settings, sizeof(SYSCFG) -4);
+}
+
+void SettingsSaveAll(void)
+{
+  if (Settings.flag.save_state) {
+    Settings.power = power;
+  } else {
+    Settings.power = 0;
+  }
+  XsnsCall(FUNC_SAVE_BEFORE_RESTART);
+  XdrvCall(FUNC_SAVE_BEFORE_RESTART);
+  SettingsSave(0);
+}
+
+
+
+
+
+void UpdateQuickPowerCycle(bool update)
+{
+  if (Settings.flag3.fast_power_cycle_disable) { return; }
+
+  uint32_t pc_register;
+  uint32_t pc_location = SETTINGS_LOCATION - CFG_ROTATES;
+
+  ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+  if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
+    uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
+    if (0 == counter) {
+      SettingsErase(3);
+      EspRestart();
+    } else {
+      pc_register = 0xFFA55AB0 | counter;
+      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
+    }
+  }
+  else if (pc_register != 0xFFA55ABF) {
+    pc_register = 0xFFA55ABF;
+
+    if (ESP.flashEraseSector(pc_location)) {
+      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
+  }
+}
+
+
+
+
+
+uint32_t GetSettingsTextLen(void)
+{
+  char* position = Settings.text_pool;
+  for (uint32_t size = 0; size < SET_MAX; size++) {
+    while (*position++ != '\0') { }
+  }
+  return position - Settings.text_pool;
+}
+
+bool SettingsUpdateText(uint32_t index, const char* replace_me)
+{
+  if (index >= SET_MAX) {
+    return false;
+  }
+
+
+  uint32_t replace_len = strlen(replace_me);
+  char replace[replace_len +1];
+  memcpy(replace, replace_me, sizeof(replace));
+
+  uint32_t start_pos = 0;
+  uint32_t end_pos = 0;
+  char* position = Settings.text_pool;
+  for (uint32_t size = 0; size < SET_MAX; size++) {
+    while (*position++ != '\0') { }
+    if (1 == index) {
+      start_pos = position - Settings.text_pool;
+    }
+    else if (0 == index) {
+      end_pos = position - Settings.text_pool -1;
+    }
+    index--;
+  }
+  uint32_t char_len = position - Settings.text_pool;
+
+  uint32_t current_len = end_pos - start_pos;
+  int diff = replace_len - current_len;
+
+
+
+
+  int too_long = (char_len + diff) - settings_text_size;
+  if (too_long > 0) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_CONFIG "Text overflow by %d char(s)"), too_long);
+    return false;
+  }
+
+  if (diff != 0) {
+
+    memmove_P(Settings.text_pool + start_pos + replace_len, Settings.text_pool + end_pos, char_len - end_pos);
+  }
+
+  memmove_P(Settings.text_pool + start_pos, replace, replace_len);
+
+  memset(Settings.text_pool + char_len + diff, 0x00, settings_text_size - char_len - diff);
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "CR %d/%d"), GetSettingsTextLen(), settings_text_size);
+
+  return true;
+}
+
+char* SettingsText(uint32_t index)
+{
+  char* position = Settings.text_pool;
+
+  if (index >= SET_MAX) {
+    position += settings_text_size -1;
+  } else {
+    for (;index > 0; index--) {
+      while (*position++ != '\0') { }
+    }
+  }
+  return position;
+}
+
+
+
+
+
+uint32_t GetSettingsAddress(void)
+{
+  return settings_location * SPI_FLASH_SEC_SIZE;
+}
+
+void SettingsSave(uint8_t rotate)
+{
+# 607 "S:/Development/Tasmota/tasmota/settings.ino"
+#ifndef FIRMWARE_MINIMAL
+  if ((GetSettingsCrc32() != settings_crc32) || rotate) {
+    if (1 == rotate) {
+      stop_flash_rotate = 1;
+    }
+    if (2 == rotate) {
+      settings_location = SETTINGS_LOCATION +1;
+    }
+    if (stop_flash_rotate) {
+      settings_location = SETTINGS_LOCATION;
+    } else {
+      settings_location--;
+      if (settings_location <= (SETTINGS_LOCATION - CFG_ROTATES)) {
+        settings_location = SETTINGS_LOCATION;
+      }
+    }
+
+    Settings.save_flag++;
+    if (UtcTime() > START_VALID_TIME) {
+      Settings.cfg_timestamp = UtcTime();
+    } else {
+      Settings.cfg_timestamp++;
+    }
+    Settings.cfg_size = sizeof(SYSCFG);
+    Settings.cfg_crc = GetSettingsCrc();
+    Settings.cfg_crc32 = GetSettingsCrc32();
+
+    if (ESP.flashEraseSector(settings_location)) {
+      ESP.flashWrite(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+    }
+
+    if (!stop_flash_rotate && rotate) {
+      for (uint32_t i = 1; i < CFG_ROTATES; i++) {
+        ESP.flashEraseSector(settings_location -i);
+        delay(1);
+      }
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG D_SAVED_TO_FLASH_AT " %X, " D_COUNT " %d, " D_BYTES " %d"), settings_location, Settings.save_flag, sizeof(SYSCFG));
+
+    settings_crc32 = Settings.cfg_crc32;
+  }
+#endif
+  RtcSettingsSave();
+}
+
+void SettingsLoad(void)
+{
+
+  struct SYSCFGH {
+    uint16_t cfg_holder;
+    uint16_t cfg_size;
+    unsigned long save_flag;
+  } _SettingsH;
+  unsigned long save_flag = 0;
+
+  settings_location = 0;
+  uint32_t flash_location = SETTINGS_LOCATION +1;
+  uint16_t cfg_holder = 0;
+  for (uint32_t i = 0; i < CFG_ROTATES; i++) {
+    flash_location--;
+    ESP.flashRead(flash_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+
+    bool valid = false;
+    if (Settings.version > 0x06000000) {
+      bool almost_valid = (Settings.cfg_crc32 == GetSettingsCrc32());
+      if (Settings.version < 0x0606000B) {
+        almost_valid = (Settings.cfg_crc == GetSettingsCrc());
+      }
+
+      if (almost_valid && (0 == cfg_holder)) { cfg_holder = Settings.cfg_holder; }
+      valid = (cfg_holder == Settings.cfg_holder);
+    } else {
+      ESP.flashRead((flash_location -1) * SPI_FLASH_SEC_SIZE, (uint32*)&_SettingsH, sizeof(SYSCFGH));
+      valid = (Settings.cfg_holder == _SettingsH.cfg_holder);
+    }
+    if (valid) {
+      if (Settings.save_flag > save_flag) {
+        save_flag = Settings.save_flag;
+        settings_location = flash_location;
+        if (Settings.flag.stop_flash_rotate && (0 == i)) {
+          break;
+        }
+      }
+    }
+
+    delay(1);
+  }
+  if (settings_location > 0) {
+    ESP.flashRead(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
+    AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %lu"), settings_location, Settings.save_flag);
+  }
+
+#ifndef FIRMWARE_MINIMAL
+  if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) {
+    SettingsDefault();
+  }
+  settings_crc32 = GetSettingsCrc32();
+#endif
+
+  RtcSettingsLoad();
+}
+
+void EspErase(uint32_t start_sector, uint32_t end_sector)
+{
+  bool serial_output = (LOG_LEVEL_DEBUG_MORE <= seriallog_level);
+  for (uint32_t sector = start_sector; sector < end_sector; sector++) {
+
+    bool result = ESP.flashEraseSector(sector);
+
+
+
+    if (serial_output) {
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+      Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
+#else
+      Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
+#endif
+      delay(10);
+    } else {
+      yield();
+    }
+    OsWatchLoop();
+  }
+}
+
+void SettingsErase(uint8_t type)
+{
+# 750 "S:/Development/Tasmota/tasmota/settings.ino"
+#ifndef FIRMWARE_MINIMAL
+  uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
+  uint32_t _sectorEnd = ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE;
+  if (1 == type) {
+
+    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;
+  }
+  else if (2 == type) {
+    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
+    _sectorEnd = SETTINGS_LOCATION +1;
+  }
+  else if (3 == type) {
+    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
+    _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;
+  }
+#ifdef USE_WIFI_SDK_ERASE
+  else if (4 == type) {
+    _sectorStart = SETTINGS_LOCATION +1;
+    _sectorEnd = _sectorStart +1;
+  }
+  else if (5 == type) {
+    _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;
+    _sectorEnd = _sectorStart +1;
+  }
+#endif
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
+
+
+  EsptoolErase(_sectorStart, _sectorEnd);
+#endif
+}
+
+void SettingsSdkErase(void)
+{
+  WiFi.disconnect(false);
+  SettingsErase(1);
+  delay(1000);
+}
+
+#ifdef USE_WIFI_SDK_ERASE
+void SettingsSdkWifiErase(void)
+{
+  WiFi.disconnect(false);
+  SettingsErase(4);
+  SettingsErase(5);
+  delay(200);
+}
+#endif
+
+
+
+void SettingsDefault(void)
+{
+  AddLog_P(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_USE_DEFAULTS));
+  SettingsDefaultSet1();
+  SettingsDefaultSet2();
+  SettingsSave(2);
+}
+
+void SettingsDefaultSet1(void)
+{
+  memset(&Settings, 0x00, sizeof(SYSCFG));
+
+  Settings.cfg_holder = (uint16_t)CFG_HOLDER;
+  Settings.cfg_size = sizeof(SYSCFG);
+
+  Settings.version = VERSION;
+
+
+}
+
+void SettingsDefaultSet2(void)
+{
+  memset((char*)&Settings +16, 0x00, sizeof(SYSCFG) -16);
+
+  Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
+  Settings.flag.global_state = APP_ENABLE_LEDLINK;
+  Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
+  Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
+  Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
+  Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
+  Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
+  Settings.save_data = SAVE_DATA;
+  Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
+  Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+  Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
+  Settings.sleep = APP_SLEEP;
+  if (Settings.sleep < 50) {
+    Settings.sleep = 50;
+  }
+
+
+
+  Settings.interlock[0] = 0xFF;
+  Settings.module = MODULE;
+  ModuleDefault(WEMOS);
+
+  SettingsUpdateText(SET_FRIENDLYNAME1, FRIENDLY_NAME);
+  SettingsUpdateText(SET_FRIENDLYNAME2, FRIENDLY_NAME"2");
+  SettingsUpdateText(SET_FRIENDLYNAME3, FRIENDLY_NAME"3");
+  SettingsUpdateText(SET_FRIENDLYNAME4, FRIENDLY_NAME"4");
+  SettingsUpdateText(SET_OTAURL, OTA_URL);
+
+
+  Settings.flag.save_state = SAVE_STATE;
+  Settings.power = APP_POWER;
+  Settings.poweronstate = APP_POWERON_STATE;
+  Settings.blinktime = APP_BLINKTIME;
+  Settings.blinkcount = APP_BLINKCOUNT;
+  Settings.ledstate = APP_LEDSTATE;
+  Settings.ledmask = APP_LEDMASK;
+  Settings.pulse_timer[0] = APP_PULSETIME;
+
+
+
+  Settings.serial_config = TS_SERIAL_8N1;
+  Settings.baudrate = APP_BAUDRATE / 300;
+  Settings.sbaudrate = SOFT_BAUDRATE / 300;
+  Settings.serial_delimiter = 0xff;
+  Settings.seriallog_level = SERIAL_LOG_LEVEL;
+
+
+  Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
+  Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
+  Settings.wifi_output_power = 170;
+  ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
+  ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
+  ParseIp(&Settings.ip_address[2], WIFI_SUBNETMASK);
+  ParseIp(&Settings.ip_address[3], WIFI_DNS);
+  Settings.sta_config = WIFI_CONFIG_TOOL;
+
+  SettingsUpdateText(SET_STASSID1, STA_SSID1);
+  SettingsUpdateText(SET_STASSID2, STA_SSID2);
+  SettingsUpdateText(SET_STAPWD1, STA_PASS1);
+  SettingsUpdateText(SET_STAPWD2, STA_PASS2);
+  SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+
+
+  SettingsUpdateText(SET_SYSLOG_HOST, SYS_LOG_HOST);
+  Settings.syslog_port = SYS_LOG_PORT;
+  Settings.syslog_level = SYS_LOG_LEVEL;
+
+
+  Settings.flag2.emulation = EMULATION;
+  Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
+  Settings.flag3.mdns_enabled = MDNS_ENABLED;
+  Settings.webserver = WEB_SERVER;
+  Settings.weblog_level = WEB_LOG_LEVEL;
+  SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
+  SettingsUpdateText(SET_CORS, CORS_DOMAIN);
+
+
+  Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
+  Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
+  Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
+  Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME;
+
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) { Settings.switchmode[i] = SWITCH_MODE; }
+
+
+  Settings.flag.mqtt_enabled = MQTT_USE;
+  Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
+  Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
+  Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
+  Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
+  Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
+  Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
+
+  Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
+  Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
+  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
+  Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
+  Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
+  Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
+  SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
+  Settings.mqtt_port = MQTT_PORT;
+  SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
+  SettingsUpdateText(SET_MQTT_USER, MQTT_USER);
+  SettingsUpdateText(SET_MQTT_PWD, MQTT_PASS);
+  SettingsUpdateText(SET_MQTT_TOPIC, MQTT_TOPIC);
+  SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC);
+  SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC);
+  SettingsUpdateText(SET_MQTT_GRP_TOPIC, MQTT_GRPTOPIC);
+  SettingsUpdateText(SET_MQTT_FULLTOPIC, MQTT_FULLTOPIC);
+  Settings.mqtt_retry = MQTT_RETRY_SECS;
+  SettingsUpdateText(SET_MQTTPREFIX1, SUB_PREFIX);
+  SettingsUpdateText(SET_MQTTPREFIX2, PUB_PREFIX);
+  SettingsUpdateText(SET_MQTTPREFIX3, PUB_PREFIX2);
+  SettingsUpdateText(SET_STATE_TXT1, MQTT_STATUS_OFF);
+  SettingsUpdateText(SET_STATE_TXT2, MQTT_STATUS_ON);
+  SettingsUpdateText(SET_STATE_TXT3, MQTT_CMND_TOGGLE);
+  SettingsUpdateText(SET_STATE_TXT4, MQTT_CMND_HOLD);
+  char fingerprint[60];
+  strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint));
+  char *p = fingerprint;
+  for (uint32_t i = 0; i < 20; i++) {
+    Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
+  }
+  strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint));
+  p = fingerprint;
+  for (uint32_t i = 0; i < 20; i++) {
+    Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16);
+  }
+  Settings.tele_period = TELE_PERIOD;
+  Settings.mqttlog_level = MQTT_LOG_LEVEL;
+
+
+  Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
+  Settings.flag2.current_resolution = 3;
+
+
+  Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
+  Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
+  Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
+  Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
+
+  Settings.energy_power_calibration = HLW_PREF_PULSE;
+  Settings.energy_voltage_calibration = HLW_UREF_PULSE;
+  Settings.energy_current_calibration = HLW_IREF_PULSE;
+# 980 "S:/Development/Tasmota/tasmota/settings.ino"
+  Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
+  Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
+
+  Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
+  Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
+
+
+
+  RtcSettings.energy_kWhtotal = 0;
+
+  memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
+  Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
+
+
+  Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
+  Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
+  Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
+
+
+  Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
+
+  memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
+
+
+  Settings.domoticz_update_timer = DOMOTICZ_UPDATE_TIMER;
+# 1015 "S:/Development/Tasmota/tasmota/settings.ino"
+  Settings.flag.temperature_conversion = TEMP_CONVERSION;
+  Settings.flag.pressure_conversion = PRESSURE_CONVERSION;
+  Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
+  Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
+  Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
+  Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
+  Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
+
+
+
+
+
+
+  Settings.flag2.calc_resolution = CALC_RESOLUTION;
+
+
+  Settings.flag3.timers_enable = TIMERS_ENABLED;
+
+
+  Settings.flag.hass_light = HASS_AS_LIGHT;
+  Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
+  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
+
+
+  Settings.flag.knx_enabled = KNX_ENABLED;
+  Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
+
+
+  Settings.flag.pwm_control = LIGHT_MODE;
+  Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
+  Settings.flag.light_signal = LIGHT_PAIRS_CO2;
+  Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
+  Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
+  Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
+  Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
+  Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
+
+  Settings.pwm_frequency = PWM_FREQ;
+  Settings.pwm_range = PWM_RANGE;
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    Settings.light_color[i] = DEFAULT_LIGHT_COMPONENT;
+
+  }
+  Settings.light_correction = 1;
+  Settings.light_dimmer = DEFAULT_LIGHT_DIMMER;
+
+  Settings.light_speed = 1;
+
+  Settings.light_width = 1;
+
+  Settings.light_pixels = WS2812_LEDS;
+
+  Settings.ws_width[WS_SECOND] = 1;
+  Settings.ws_color[WS_SECOND][WS_RED] = 255;
+
+  Settings.ws_color[WS_SECOND][WS_BLUE] = 255;
+  Settings.ws_width[WS_MINUTE] = 3;
+
+  Settings.ws_color[WS_MINUTE][WS_GREEN] = 255;
+
+  Settings.ws_width[WS_HOUR] = 5;
+  Settings.ws_color[WS_HOUR][WS_RED] = 255;
+
+
+
+  Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
+  Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
+
+
+
+  Settings.display_mode = 1;
+  Settings.display_refresh = 2;
+  Settings.display_rows = 2;
+  Settings.display_cols[0] = 16;
+  Settings.display_cols[1] = 8;
+  Settings.display_dimmer = 1;
+  Settings.display_size = 1;
+  Settings.display_font = 1;
+
+  Settings.display_address[0] = MTX_ADDRESS1;
+  Settings.display_address[1] = MTX_ADDRESS2;
+  Settings.display_address[2] = MTX_ADDRESS3;
+  Settings.display_address[3] = MTX_ADDRESS4;
+  Settings.display_address[4] = MTX_ADDRESS5;
+  Settings.display_address[5] = MTX_ADDRESS6;
+  Settings.display_address[6] = MTX_ADDRESS7;
+  Settings.display_address[7] = MTX_ADDRESS8;
+
+
+  if (((APP_TIMEZONE > -14) && (APP_TIMEZONE < 15)) || (99 == APP_TIMEZONE)) {
+    Settings.timezone = APP_TIMEZONE;
+    Settings.timezone_minutes = 0;
+  } else {
+    Settings.timezone = APP_TIMEZONE / 60;
+    Settings.timezone_minutes = abs(APP_TIMEZONE % 60);
+  }
+  SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
+  SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
+  SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
+  for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
+    SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
+  }
+  Settings.latitude = (int)((double)LATITUDE * 1000000);
+  Settings.longitude = (int)((double)LONGITUDE * 1000000);
+  SettingsResetStd();
+  SettingsResetDst();
+
+  Settings.button_debounce = KEY_DEBOUNCE_TIME;
+  Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
+
+  for (uint32_t j = 0; j < 5; j++) {
+    Settings.rgbwwTable[j] = 255;
+  }
+
+  Settings.novasds_startingoffset = STARTING_OFFSET;
+
+  SettingsDefaultWebColor();
+
+  memset(&Settings.monitors, 0xFF, 20);
+  SettingsEnableAllI2cDrivers();
+
+
+  Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
+  Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
+
+  Settings.flag3.buzzer_enable = BUZZER_ENABLE;
+  Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
+  Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
+  Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
+}
+
+
+
+void SettingsResetStd(void)
+{
+  Settings.tflag[0].hemis = TIME_STD_HEMISPHERE;
+  Settings.tflag[0].week = TIME_STD_WEEK;
+  Settings.tflag[0].dow = TIME_STD_DAY;
+  Settings.tflag[0].month = TIME_STD_MONTH;
+  Settings.tflag[0].hour = TIME_STD_HOUR;
+  Settings.toffset[0] = TIME_STD_OFFSET;
+}
+
+void SettingsResetDst(void)
+{
+  Settings.tflag[1].hemis = TIME_DST_HEMISPHERE;
+  Settings.tflag[1].week = TIME_DST_WEEK;
+  Settings.tflag[1].dow = TIME_DST_DAY;
+  Settings.tflag[1].month = TIME_DST_MONTH;
+  Settings.tflag[1].hour = TIME_DST_HOUR;
+  Settings.toffset[1] = TIME_DST_OFFSET;
+}
+
+void SettingsDefaultWebColor(void)
+{
+  char scolor[10];
+  for (uint32_t i = 0; i < COL_LAST; i++) {
+    WebHexCode(i, GetTextIndexed(scolor, sizeof(scolor), i, kWebColors));
+  }
+}
+
+void SettingsEnableAllI2cDrivers(void)
+{
+  Settings.i2c_drivers[0] = 0xFFFFFFFF;
+  Settings.i2c_drivers[1] = 0xFFFFFFFF;
+  Settings.i2c_drivers[2] = 0xFFFFFFFF;
+}
+
+
+
+void SettingsDelta(void)
+{
+  if (Settings.version != VERSION) {
+    if (Settings.version < 0x06000000) {
+      Settings.cfg_size = sizeof(SYSCFG);
+      Settings.cfg_crc = GetSettingsCrc();
+    }
+    if (Settings.version < 0x06000002) {
+      for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+        if (i < 4) {
+          Settings.switchmode[i] = Settings.interlock[i];
+        } else {
+          Settings.switchmode[i] = SWITCH_MODE;
+        }
+      }
+      for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+        if (Settings.my_gp.io[i] >= GPIO_SWT5) {
+          Settings.my_gp.io[i] += 4;
+        }
+      }
+    }
+    if (Settings.version < 0x06000003) {
+      Settings.flag.mqtt_serial_raw = 0;
+      Settings.flag.pressure_conversion = 0;
+      Settings.flag3.data = 0;
+    }
+    if (Settings.version < 0x06010103) {
+      Settings.flag3.timers_enable = 1;
+    }
+    if (Settings.version < 0x0601010C) {
+      Settings.button_debounce = KEY_DEBOUNCE_TIME;
+      Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
+    }
+    if (Settings.version < 0x0602010A) {
+      for (uint32_t j = 0; j < 5; j++) {
+        Settings.rgbwwTable[j] = 255;
+      }
+    }
+    if (Settings.version < 0x06030002) {
+      Settings.timezone_minutes = 0;
+    }
+    if (Settings.version < 0x06030004) {
+      memset(&Settings.monitors, 0xFF, 20);
+    }
+    if (Settings.version < 0x0603000E) {
+      Settings.flag2.calc_resolution = CALC_RESOLUTION;
+    }
+    if (Settings.version < 0x0603000F) {
+      if (Settings.sleep < 50) {
+        Settings.sleep = 50;
+      }
+    }
+    if (Settings.version < 0x06040105) {
+      Settings.flag3.mdns_enabled = MDNS_ENABLED;
+      Settings.param[P_MDNS_DELAYED_START] = 0;
+    }
+    if (Settings.version < 0x0604010B) {
+      Settings.interlock[0] = 0xFF;
+      for (uint32_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
+    }
+    if (Settings.version < 0x0604010D) {
+      Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+    }
+    if (Settings.version < 0x06040110) {
+      ModuleDefault(WEMOS);
+    }
+    if (Settings.version < 0x06040113) {
+      Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
+    }
+    if (Settings.version < 0x06050003) {
+      Settings.novasds_startingoffset = STARTING_OFFSET;
+    }
+    if (Settings.version < 0x06050006) {
+      SettingsDefaultWebColor();
+    }
+    if (Settings.version < 0x06050007) {
+      Settings.ledmask = APP_LEDMASK;
+    }
+    if (Settings.version < 0x0605000A) {
+      Settings.my_adc0 = ADC0_NONE;
+    }
+    if (Settings.version < 0x0605000D) {
+      Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
+    }
+    if (Settings.version < 0x06060001) {
+      Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
+    }
+    if (Settings.version < 0x06060007) {
+      memset((char*)&Settings +0xE00, 0x00, sizeof(SYSCFG) -0xE00);
+    }
+    if (Settings.version < 0x06060008) {
+
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        Settings.param[P_ex_DIMMER_MAX] = 100;
+      } else {
+        Settings.param[P_ex_DIMMER_MAX] = 255;
+      }
+    }
+    if (Settings.version < 0x06060009) {
+      Settings.baudrate = APP_BAUDRATE / 300;
+      Settings.sbaudrate = SOFT_BAUDRATE / 300;
+    }
+    if (Settings.version < 0x0606000A) {
+      uint8_t tuyaindex = 0;
+      if (Settings.param[P_BACKLOG_DELAY] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 21;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_BACKLOG_DELAY];
+        tuyaindex++;
+      } else if (Settings.flag3.fast_power_cycle_disable == 1) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 11;
+        Settings.tuya_fnid_map[tuyaindex].dpid = 1;
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_RELAYS] > 0) {
+        for (uint8_t i = 0 ; i < Settings.param[P_ex_TUYA_RELAYS]; i++) {
+          Settings.tuya_fnid_map[tuyaindex].fnid = 12 + i;
+          Settings.tuya_fnid_map[tuyaindex].dpid = i + 2;
+          tuyaindex++;
+        }
+      }
+      if (Settings.param[P_ex_TUYA_POWER_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 31;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_POWER_ID];
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_VOLTAGE_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 33;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_VOLTAGE_ID];
+        tuyaindex++;
+      }
+      if (Settings.param[P_ex_TUYA_CURRENT_ID] > 0) {
+        Settings.tuya_fnid_map[tuyaindex].fnid = 32;
+        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_CURRENT_ID];
+      }
+    }
+    if (Settings.version < 0x0606000C) {
+      memset((char*)&Settings +0x1D6, 0x00, 16);
+    }
+    if (Settings.version < 0x0606000F) {
+      Settings.ex_shutter_accuracy = 0;
+      Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
+    }
+    if (Settings.version < 0x06060011) {
+      Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
+    }
+    if (Settings.version < 0x06060012) {
+      Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
+      Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
+      if (TUYA_DIMMER == Settings.module) {
+        if (Settings.flag3.ex_tuya_dimmer_min_limit) {
+          Settings.dimmer_hw_min = 25;
+        } else {
+          Settings.dimmer_hw_min = 1;
+        }
+        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
+      }
+      else if (PS_16_DZ == Settings.module) {
+        Settings.dimmer_hw_min = 10;
+        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
+      }
+    }
+    if (Settings.version < 0x06060014) {
+# 1359 "S:/Development/Tasmota/tasmota/settings.ino"
+      Settings.flag3.fast_power_cycle_disable = 0;
+      Settings.energy_power_delta = Settings.ex_energy_power_delta;
+      Settings.ex_energy_power_delta = 0;
+    }
+    if (Settings.version < 0x06060015) {
+      if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
+        Settings.ex_sta_config = WIFI_MANAGER;
+      }
+    }
+
+    if (Settings.version < 0x07000002) {
+      Settings.web_color2[0][0] = Settings.web_color[0][0];
+      Settings.web_color2[0][1] = Settings.web_color[0][1];
+      Settings.web_color2[0][2] = Settings.web_color[0][2];
+    }
+    if (Settings.version < 0x07000003) {
+      SettingsEnableAllI2cDrivers();
+    }
+    if (Settings.version < 0x07000004) {
+      Settings.ex_wifi_output_power = 170;
+    }
+    if (Settings.version < 0x07010202) {
+      Settings.ex_serial_config = TS_SERIAL_8N1;
+    }
+    if (Settings.version < 0x07010204) {
+      if (Settings.flag3.ex_cors_enabled == 1) {
+        strlcpy(Settings.ex_cors_domain, CORS_ENABLED_ALL, sizeof(Settings.ex_cors_domain));
+      } else {
+        Settings.ex_cors_domain[0] = 0;
+      }
+    }
+    if (Settings.version < 0x07010205) {
+      Settings.seriallog_level = Settings.ex_seriallog_level;
+      Settings.sta_config = Settings.ex_sta_config;
+      Settings.sta_active = Settings.ex_sta_active;
+      memcpy((char*)&Settings.rule_stop, (char*)&Settings.ex_rule_stop, 47);
+    }
+    if (Settings.version < 0x07010206) {
+      Settings.flag4 = Settings.ex_flag4;
+      Settings.mqtt_port = Settings.ex_mqtt_port;
+      memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);
+    }
+
+    if (Settings.version < 0x08000000) {
+      char temp[strlen(Settings.text_pool) +1]; strncpy(temp, Settings.text_pool, sizeof(temp));
+      char temp21[strlen(Settings.ex_mqtt_prefix[0]) +1]; strncpy(temp21, Settings.ex_mqtt_prefix[0], sizeof(temp21));
+      char temp22[strlen(Settings.ex_mqtt_prefix[1]) +1]; strncpy(temp22, Settings.ex_mqtt_prefix[1], sizeof(temp22));
+      char temp23[strlen(Settings.ex_mqtt_prefix[2]) +1]; strncpy(temp23, Settings.ex_mqtt_prefix[2], sizeof(temp23));
+      char temp31[strlen(Settings.ex_sta_ssid[0]) +1]; strncpy(temp31, Settings.ex_sta_ssid[0], sizeof(temp31));
+      char temp32[strlen(Settings.ex_sta_ssid[1]) +1]; strncpy(temp32, Settings.ex_sta_ssid[1], sizeof(temp32));
+      char temp41[strlen(Settings.ex_sta_pwd[0]) +1]; strncpy(temp41, Settings.ex_sta_pwd[0], sizeof(temp41));
+      char temp42[strlen(Settings.ex_sta_pwd[1]) +1]; strncpy(temp42, Settings.ex_sta_pwd[1], sizeof(temp42));
+      char temp5[strlen(Settings.ex_hostname) +1]; strncpy(temp5, Settings.ex_hostname, sizeof(temp5));
+      char temp6[strlen(Settings.ex_syslog_host) +1]; strncpy(temp6, Settings.ex_syslog_host, sizeof(temp6));
+      char temp7[strlen(Settings.ex_mqtt_host) +1]; strncpy(temp7, Settings.ex_mqtt_host, sizeof(temp7));
+      char temp8[strlen(Settings.ex_mqtt_client) +1]; strncpy(temp8, Settings.ex_mqtt_client, sizeof(temp8));
+      char temp9[strlen(Settings.ex_mqtt_user) +1]; strncpy(temp9, Settings.ex_mqtt_user, sizeof(temp9));
+      char temp10[strlen(Settings.ex_mqtt_pwd) +1]; strncpy(temp10, Settings.ex_mqtt_pwd, sizeof(temp10));
+      char temp11[strlen(Settings.ex_mqtt_topic) +1]; strncpy(temp11, Settings.ex_mqtt_topic, sizeof(temp11));
+      char temp12[strlen(Settings.ex_button_topic) +1]; strncpy(temp12, Settings.ex_button_topic, sizeof(temp12));
+      char temp13[strlen(Settings.ex_mqtt_grptopic) +1]; strncpy(temp13, Settings.ex_mqtt_grptopic, sizeof(temp13));
+
+      memset(Settings.text_pool, 0x00, settings_text_size);
+      SettingsUpdateText(SET_OTAURL, temp);
+      SettingsUpdateText(SET_MQTTPREFIX1, temp21);
+      SettingsUpdateText(SET_MQTTPREFIX2, temp22);
+      SettingsUpdateText(SET_MQTTPREFIX3, temp23);
+      SettingsUpdateText(SET_STASSID1, temp31);
+      SettingsUpdateText(SET_STASSID2, temp32);
+      SettingsUpdateText(SET_STAPWD1, temp41);
+      SettingsUpdateText(SET_STAPWD2, temp42);
+      SettingsUpdateText(SET_HOSTNAME, temp5);
+      SettingsUpdateText(SET_SYSLOG_HOST, temp6);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+      if (!strlen(Settings.ex_mqtt_user)) {
+        SettingsUpdateText(SET_MQTT_HOST, temp7);
+        SettingsUpdateText(SET_MQTT_USER, temp9);
+      } else {
+        char aws_mqtt_host[66];
+        snprintf_P(aws_mqtt_host, sizeof(aws_mqtt_host), PSTR("%s%s"), temp9, temp7);
+        SettingsUpdateText(SET_MQTT_HOST, aws_mqtt_host);
+        SettingsUpdateText(SET_MQTT_USER, "");
+      }
+#else
+      SettingsUpdateText(SET_MQTT_HOST, temp7);
+      SettingsUpdateText(SET_MQTT_USER, temp9);
+#endif
+      SettingsUpdateText(SET_MQTT_CLIENT, temp8);
+      SettingsUpdateText(SET_MQTT_PWD, temp10);
+      SettingsUpdateText(SET_MQTT_TOPIC, temp11);
+      SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, temp12);
+      SettingsUpdateText(SET_MQTT_GRP_TOPIC, temp13);
+
+      SettingsUpdateText(SET_WEBPWD, Settings.ex_web_password);
+      SettingsUpdateText(SET_CORS, Settings.ex_cors_domain);
+      SettingsUpdateText(SET_MQTT_FULLTOPIC, Settings.ex_mqtt_fulltopic);
+      SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, Settings.ex_switch_topic);
+      SettingsUpdateText(SET_STATE_TXT1, Settings.ex_state_text[0]);
+      SettingsUpdateText(SET_STATE_TXT2, Settings.ex_state_text[1]);
+      SettingsUpdateText(SET_STATE_TXT3, Settings.ex_state_text[2]);
+      SettingsUpdateText(SET_STATE_TXT4, Settings.ex_state_text[3]);
+      SettingsUpdateText(SET_NTPSERVER1, Settings.ex_ntp_server[0]);
+      SettingsUpdateText(SET_NTPSERVER2, Settings.ex_ntp_server[1]);
+      SettingsUpdateText(SET_NTPSERVER3, Settings.ex_ntp_server[2]);
+      SettingsUpdateText(SET_MEM1, Settings.script_pram[0]);
+      SettingsUpdateText(SET_MEM2, Settings.script_pram[1]);
+      SettingsUpdateText(SET_MEM3, Settings.script_pram[2]);
+      SettingsUpdateText(SET_MEM4, Settings.script_pram[3]);
+      SettingsUpdateText(SET_MEM5, Settings.script_pram[4]);
+      SettingsUpdateText(SET_FRIENDLYNAME1, Settings.ex_friendlyname[0]);
+      SettingsUpdateText(SET_FRIENDLYNAME2, Settings.ex_friendlyname[1]);
+      SettingsUpdateText(SET_FRIENDLYNAME3, Settings.ex_friendlyname[2]);
+      SettingsUpdateText(SET_FRIENDLYNAME4, Settings.ex_friendlyname[3]);
+    }
+
+    Settings.version = VERSION;
+    SettingsSave(1);
+  }
+}
+# 1 "S:/Development/Tasmota/tasmota/support.ino"
+# 20 "S:/Development/Tasmota/tasmota/support.ino"
+IPAddress syslog_host_addr;
+uint32_t syslog_host_hash = 0;
+
+extern "C" {
+extern struct rst_info resetInfo;
+}
+
+
+
+
+
+#include <Ticker.h>
+
+Ticker tickerOSWatch;
+
+const uint32_t OSWATCH_RESET_TIME = 120;
+
+static unsigned long oswatch_last_loop_time;
+uint8_t oswatch_blocked_loop = 0;
+
+#ifndef USE_WS2812_DMA
+
+#endif
+
+#ifdef USE_KNX
+bool knx_started = false;
+#endif
+
+void OsWatchTicker(void)
+{
+  uint32_t t = millis();
+  uint32_t last_run = abs(t - oswatch_last_loop_time);
+
+#ifdef DEBUG_THEO
+  int32_t rssi = WiFi.RSSI();
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(rssi), rssi, last_run);
+#endif
+  if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
+
+    RtcSettings.oswatch_blocked_loop = 1;
+    RtcSettingsSave();
+
+
+
+
+
+    volatile uint32_t dummy;
+    dummy = *((uint32_t*) 0x00000000);
+  }
+}
+
+void OsWatchInit(void)
+{
+  oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
+  RtcSettings.oswatch_blocked_loop = 0;
+  oswatch_last_loop_time = millis();
+  tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
+}
+
+void OsWatchLoop(void)
+{
+  oswatch_last_loop_time = millis();
+
+}
+
+bool OsWatchBlockedLoop(void)
+{
+  return oswatch_blocked_loop;
+}
+
+uint32_t ResetReason(void)
+{
+# 102 "S:/Development/Tasmota/tasmota/support.ino"
+  return resetInfo.reason;
+}
+
+String GetResetReason(void)
+{
+  if (oswatch_blocked_loop) {
+    char buff[32];
+    strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
+    return String(buff);
+  } else {
+    return ESP.getResetReason();
+  }
+}
+
+
+
+
+
+
+size_t strchrspn(const char *str1, int character)
+{
+  size_t ret = 0;
+  char *start = (char*)str1;
+  char *end = strchr(str1, character);
+  if (end) ret = end - start;
+  return ret;
+}
+
+
+char* subStr(char* dest, char* str, const char *delim, int index)
+{
+  char *act;
+  char *sub = nullptr;
+  char *ptr;
+  int i;
+
+
+  strncpy(dest, str, strlen(str)+1);
+  for (i = 1, act = dest; i <= index; i++, act = nullptr) {
+    sub = strtok_r(act, delim, &ptr);
+    if (sub == nullptr) break;
+  }
+  sub = Trim(sub);
+  return sub;
+}
+
+float CharToFloat(const char *str)
+{
+
+  char strbuf[24];
+
+  strlcpy(strbuf, str, sizeof(strbuf));
+  char *pt = strbuf;
+  while ((*pt != '\0') && isblank(*pt)) { pt++; }
+
+  signed char sign = 1;
+  if (*pt == '-') { sign = -1; }
+  if (*pt == '-' || *pt=='+') { pt++; }
+
+  float left = 0;
+  if (*pt != '.') {
+    left = atoi(pt);
+    while (isdigit(*pt)) { pt++; }
+  }
+
+  float right = 0;
+  if (*pt == '.') {
+    pt++;
+    right = atoi(pt);
+    while (isdigit(*pt)) {
+      pt++;
+      right /= 10.0f;
+    }
+  }
+
+  float result = left + right;
+  if (sign < 0) {
+    return -result;
+  }
+  return result;
+}
+
+int TextToInt(char *str)
+{
+  char *p;
+  uint8_t radix = 10;
+  if ('#' == str[0]) {
+    radix = 16;
+    str++;
+  }
+  return strtol(str, &p, radix);
+}
+
+char* ulltoa(unsigned long long value, char *str, int radix)
+{
+  char digits[64];
+  char *dst = str;
+  int i = 0;
+
+
+
+  do {
+    int n = value % radix;
+    digits[i++] = (n < 10) ? (char)n+'0' : (char)n-10+'A';
+    value /= radix;
+  } while (value != 0);
+
+  while (i > 0) { *dst++ = digits[--i]; }
+
+  *dst = 0;
+  return str;
+}
+
+
+
+char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween)
+{
+
+
+
+  static const char * hex = "0123456789ABCDEF";
+  int between = (inbetween) ? 3 : 2;
+  const unsigned char * pin = in;
+  char * pout = out;
+  for (; pin < in+insz; pout += between, pin++) {
+    pout[0] = hex[(pgm_read_byte(pin)>>4) & 0xF];
+    pout[1] = hex[ pgm_read_byte(pin) & 0xF];
+    if (inbetween) { pout[2] = inbetween; }
+    if (pout + 3 - out > outsz) { break; }
+  }
+  pout[(inbetween && insz) ? -1 : 0] = 0;
+  return out;
+}
+
+char* Uint64toHex(uint64_t value, char *str, uint16_t bits)
+{
+  ulltoa(value, str, 16);
+
+  int fill = 8;
+  if ((bits > 3) && (bits < 65)) {
+    fill = bits / 4;
+    if (bits % 4) { fill++; }
+  }
+  int len = strlen(str);
+  fill -= len;
+  if (fill > 0) {
+    memmove(str + fill, str, len +1);
+    memset(str, '0', fill);
+  }
+  return str;
+}
+
+char* dtostrfd(double number, unsigned char prec, char *s)
+{
+  if ((isnan(number)) || (isinf(number))) {
+    strcpy(s, "null");
+    return s;
+  } else {
+    return dtostrf(number, 1, prec, s);
+  }
+}
+
+char* Unescape(char* buffer, uint32_t* size)
+{
+  uint8_t* read = (uint8_t*)buffer;
+  uint8_t* write = (uint8_t*)buffer;
+  int32_t start_size = *size;
+  int32_t end_size = *size;
+  uint8_t che = 0;
+
+
+
+  while (start_size > 0) {
+    uint8_t ch = *read++;
+    start_size--;
+    if (ch != '\\') {
+      *write++ = ch;
+    } else {
+      if (start_size > 0) {
+        uint8_t chi = *read++;
+        start_size--;
+        end_size--;
+        switch (chi) {
+          case '\\': che = '\\'; break;
+          case 'a': che = '\a'; break;
+          case 'b': che = '\b'; break;
+          case 'e': che = '\e'; break;
+          case 'f': che = '\f'; break;
+          case 'n': che = '\n'; break;
+          case 'r': che = '\r'; break;
+          case 's': che = ' '; break;
+          case 't': che = '\t'; break;
+          case 'v': che = '\v'; break;
+          case 'x': {
+            uint8_t* start = read;
+            che = (uint8_t)strtol((const char*)read, (char**)&read, 16);
+            start_size -= (uint16_t)(read - start);
+            end_size -= (uint16_t)(read - start);
+            break;
+          }
+          case '"': che = '\"'; break;
+
+          default : {
+            che = chi;
+            *write++ = ch;
+            end_size++;
+          }
+        }
+        *write++ = che;
+      }
+    }
+  }
+  *size = end_size;
+  *write++ = 0;
+
+
+  return buffer;
+}
+
+char* RemoveSpace(char* p)
+{
+  char* write = p;
+  char* read = p;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    if (!isspace(ch)) {
+      *write++ = ch;
+    }
+  }
+
+  return p;
+}
+
+char* ReplaceCommaWithDot(char* p)
+{
+  char* write = (char*)p;
+  char* read = (char*)p;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    if (ch == ',') {
+      ch = '.';
+    }
+    *write++ = ch;
+  }
+  return p;
+}
+
+char* LowerCase(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = tolower(ch);
+  }
+  return dest;
+}
+
+char* UpperCase(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = toupper(ch);
+  }
+  return dest;
+}
+
+char* UpperCase_P(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = pgm_read_byte(read++);
+    *write++ = toupper(ch);
+  }
+  return dest;
+}
+
+char* Trim(char* p)
+{
+  while ((*p != '\0') && isblank(*p)) { p++; }
+  char* q = p + strlen(p) -1;
+  while ((q >= p) && isblank(*q)) { q--; }
+  q++;
+  *q = '\0';
+  return p;
+}
+
+char* RemoveAllSpaces(char* p)
+{
+
+  char *cursor = p;
+  uint32_t offset = 0;
+  while (1) {
+    *cursor = *(cursor + offset);
+    if ((' ' == *cursor) || ('\t' == *cursor) || ('\n' == *cursor)) {
+      offset++;
+    } else {
+      if (0 == *cursor) { break; }
+      cursor++;
+    }
+  }
+  return p;
+}
+
+char* NoAlNumToUnderscore(char* dest, const char* source)
+{
+  char* write = dest;
+  const char* read = source;
+  char ch = '.';
+
+  while (ch != '\0') {
+    ch = *read++;
+    *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_';
+  }
+  return dest;
+}
+
+char IndexSeparator(void)
+{
+
+
+
+
+
+
+  if (Settings.flag3.use_underscore) {
+    return '_';
+  } else {
+    return '-';
+  }
+}
+
+void SetShortcutDefault(void)
+{
+  if ('\0' != XdrvMailbox.data[0]) {
+    XdrvMailbox.data[0] = '0' + SC_DEFAULT;
+    XdrvMailbox.data[1] = '\0';
+  }
+}
+
+uint8_t Shortcut(void)
+{
+  uint8_t result = 10;
+
+  if ('\0' == XdrvMailbox.data[1]) {
+    if (('"' == XdrvMailbox.data[0]) || ('0' == XdrvMailbox.data[0])) {
+      result = SC_CLEAR;
+    } else {
+      result = atoi(XdrvMailbox.data);
+      if (0 == result) {
+        result = 10;
+      }
+    }
+  }
+  return result;
+}
+
+bool ValidIpAddress(const char* str)
+{
+  const char* p = str;
+
+  while (*p && ((*p == '.') || ((*p >= '0') && (*p <= '9')))) { p++; }
+  return (*p == '\0');
+}
+
+bool ParseIp(uint32_t* addr, const char* str)
+{
+  uint8_t *part = (uint8_t*)addr;
+  uint8_t i;
+
+  *addr = 0;
+  for (i = 0; i < 4; i++) {
+    part[i] = strtoul(str, nullptr, 10);
+    str = strchr(str, '.');
+    if (str == nullptr || *str == '\0') {
+      break;
+    }
+    str++;
+  }
+  return (3 == i);
+}
+
+uint32_t ParseParameters(uint32_t count, uint32_t *params)
+{
+  char *p;
+  uint32_t i = 0;
+  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p), i++) {
+    params[i] = strtoul(str, nullptr, 0);
+  }
+  return i;
+}
+
+
+bool NewerVersion(char* version_str)
+{
+  uint32_t version = 0;
+  uint32_t i = 0;
+  char *str_ptr;
+
+  char version_dup[strlen(version_str) +1];
+  strncpy(version_dup, version_str, sizeof(version_dup));
+
+  for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) {
+    int field = atoi(str);
+
+    if ((field < 0) || (field > 255)) {
+      return false;
+    }
+
+    version = (version << 8) + field;
+
+    if ((2 == i) && isalpha(str[strlen(str)-1])) {
+      field = str[strlen(str)-1] & 0x1f;
+      version = (version << 8) + field;
+      i++;
+    }
+  }
+
+
+  if ((i < 2) || (i > sizeof(VERSION))) {
+    return false;
+  }
+
+
+  while (i < sizeof(VERSION)) {
+    version <<= 8;
+    i++;
+  }
+
+  return (version > VERSION);
+}
+
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option)
+{
+  strncpy_P(dest, S_RSLT_POWER, size);
+  if ((devices_present + option) > 1) {
+    char sidx[8];
+    snprintf_P(sidx, sizeof(sidx), PSTR("%d"), idx);
+    strncat(dest, sidx, size - strlen(dest) -1);
+  }
+  return dest;
+}
+
+char* GetPowerDevice(char* dest, uint32_t idx, size_t size)
+{
+  return GetPowerDevice(dest, idx, size, 0);
+}
+
+void GetEspHardwareType(void)
+{
+
+  uint32_t efuse1 = *(uint32_t*)(0x3FF00050);
+  uint32_t efuse2 = *(uint32_t*)(0x3FF00054);
+
+
+
+  is_8285 = ( (efuse1 & (1 << 4)) || (efuse2 & (1 << 16)) );
+  if (is_8285 && (ESP.getFlashChipRealSize() > 1048576)) {
+    is_8285 = false;
+  }
+}
+
+String GetDeviceHardware(void)
+{
+  char buff[10];
+  if (is_8285) {
+    strcpy_P(buff, PSTR("ESP8285"));
+  } else {
+    strcpy_P(buff, PSTR("ESP8266EX"));
+  }
+  return String(buff);
+}
+
+float ConvertTemp(float c)
+{
+  float result = c;
+
+  global_update = uptime;
+  global_temperature = c;
+
+  if (!isnan(c) && Settings.flag.temperature_conversion) {
+    result = c * 1.8 + 32;
+  }
+  result = result + (0.1 * Settings.temp_comp);
+  return result;
+}
+
+float ConvertTempToCelsius(float c)
+{
+  float result = c;
+
+  if (!isnan(c) && Settings.flag.temperature_conversion) {
+    result = (c - 32) / 1.8;
+  }
+  result = result + (0.1 * Settings.temp_comp);
+  return result;
+}
+
+char TempUnit(void)
+{
+  return (Settings.flag.temperature_conversion) ? 'F' : 'C';
+}
+
+float ConvertHumidity(float h)
+{
+  global_update = uptime;
+  global_humidity = h;
+
+  return h;
+}
+
+float ConvertPressure(float p)
+{
+  float result = p;
+
+  global_update = uptime;
+  global_pressure = p;
+
+  if (!isnan(p) && Settings.flag.pressure_conversion) {
+    result = p * 0.75006375541921;
+  }
+  return result;
+}
+
+String PressureUnit(void)
+{
+  return (Settings.flag.pressure_conversion) ? String(D_UNIT_MILLIMETER_MERCURY) : String(D_UNIT_PRESSURE);
+}
+
+void ResetGlobalValues(void)
+{
+  if ((uptime - global_update) > GLOBAL_VALUES_VALID) {
+    global_update = 0;
+    global_temperature = 9999;
+    global_humidity = 0;
+    global_pressure = 0;
+  }
+}
+
+uint32_t SqrtInt(uint32_t num)
+{
+  if (num <= 1) {
+    return num;
+  }
+
+  uint32_t x = num / 2;
+  uint32_t y;
+  do {
+    y = (x + num / x) / 2;
+    if (y >= x) {
+      return x;
+    }
+    x = y;
+  } while (true);
+}
+
+uint32_t RoundSqrtInt(uint32_t num)
+{
+  uint32_t s = SqrtInt(4 * num);
+  if (s & 1) {
+    s++;
+  }
+  return s / 2;
+}
+
+char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack)
+{
+
+
+  char* write = destination;
+  const char* read = haystack;
+
+  index++;
+  while (index--) {
+    size_t size = destination_size -1;
+    write = destination;
+    char ch = '.';
+    while ((ch != '\0') && (ch != '|')) {
+      ch = pgm_read_byte(read++);
+      if (size && (ch != '|')) {
+        *write++ = ch;
+        size--;
+      }
+    }
+    if (0 == ch) {
+      if (index) {
+        write = destination;
+      }
+      break;
+    }
+  }
+  *write = '\0';
+  return destination;
+}
+
+int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack)
+{
+
+
+  int result = -1;
+  const char* read = haystack;
+  char* write = destination;
+
+  while (true) {
+    result++;
+    size_t size = destination_size -1;
+    write = destination;
+    char ch = '.';
+    while ((ch != '\0') && (ch != '|')) {
+      ch = pgm_read_byte(read++);
+      if (size && (ch != '|')) {
+        *write++ = ch;
+        size--;
+      }
+    }
+    *write = '\0';
+    if (!strcasecmp(needle, destination)) {
+      break;
+    }
+    if (0 == ch) {
+      result = -1;
+      break;
+    }
+  }
+  return result;
+}
+
+bool DecodeCommand(const char* haystack, void (* const MyCommand[])(void))
+{
+  GetTextIndexed(XdrvMailbox.command, CMDSZ, 0, haystack);
+  int prefix_length = strlen(XdrvMailbox.command);
+  if (prefix_length) {
+    char prefix[prefix_length +1];
+    snprintf_P(prefix, sizeof(prefix), XdrvMailbox.topic);
+    if (strcasecmp(prefix, XdrvMailbox.command)) {
+      return false;
+    }
+  }
+  int command_code = GetCommandCode(XdrvMailbox.command + prefix_length, CMDSZ, XdrvMailbox.topic + prefix_length, haystack);
+  if (command_code > 0) {
+    XdrvMailbox.command_code = command_code -1;
+    MyCommand[XdrvMailbox.command_code]();
+    return true;
+  }
+  return false;
+}
+
+const char kOptions[] PROGMEM = "OFF|" D_OFF "|FALSE|" D_FALSE "|STOP|" D_STOP "|" D_CELSIUS "|"
+                                "ON|" D_ON "|TRUE|" D_TRUE "|START|" D_START "|" D_FAHRENHEIT "|" D_USER "|"
+                                "TOGGLE|" D_TOGGLE "|" D_ADMIN "|"
+                                "BLINK|" D_BLINK "|"
+                                "BLINKOFF|" D_BLINKOFF "|"
+                                "ALL" ;
+
+const uint8_t sNumbers[] PROGMEM = { 0,0,0,0,0,0,0,
+                                     1,1,1,1,1,1,1,1,
+                                     2,2,2,
+                                     3,3,
+                                     4,4,
+                                     255 };
+
+int GetStateNumber(char *state_text)
+{
+  char command[CMDSZ];
+  int state_number = GetCommandCode(command, sizeof(command), state_text, kOptions);
+  if (state_number >= 0) {
+    state_number = pgm_read_byte(sNumbers + state_number);
+  }
+  return state_number;
+}
+
+String GetSerialConfig(void)
+{
+
+
+
+
+
+  const char kParity[] = "NEOI";
+
+  char config[4];
+  config[0] = '5' + (Settings.serial_config & 0x3);
+  config[1] = kParity[(Settings.serial_config >> 3) & 0x3];
+  config[2] = '1' + ((Settings.serial_config >> 2) & 0x1);
+  config[3] = '\0';
+  return String(config);
+}
+
+void SetSerialBegin()
+{
+  uint32_t baudrate = Settings.baudrate * 300;
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
+  Serial.flush();
+  Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
+}
+
+void SetSerialConfig(uint32_t serial_config)
+{
+  if (serial_config > TS_SERIAL_8O2) {
+    serial_config = TS_SERIAL_8N1;
+  }
+  if (serial_config != Settings.serial_config) {
+    Settings.serial_config = serial_config;
+    SetSerialBegin();
+  }
+}
+
+void SetSerialBaudrate(uint32_t baudrate)
+{
+  Settings.baudrate = baudrate / 300;
+  if (Serial.baudRate() != baudrate) {
+    SetSerialBegin();
+  }
+}
+
+void SetSerial(uint32_t baudrate, uint32_t serial_config)
+{
+  Settings.flag.mqtt_serial = 0;
+  Settings.serial_config = serial_config;
+  Settings.baudrate = baudrate / 300;
+  SetSeriallog(LOG_LEVEL_NONE);
+  SetSerialBegin();
+}
+
+void ClaimSerial(void)
+{
+  serial_local = true;
+  AddLog_P(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial"));
+  SetSeriallog(LOG_LEVEL_NONE);
+  Settings.baudrate = Serial.baudRate() / 300;
+}
+
+void SerialSendRaw(char *codes)
+{
+  char *p;
+  char stemp[3];
+  uint8_t code;
+
+  int size = strlen(codes);
+
+  while (size > 1) {
+    strlcpy(stemp, codes, sizeof(stemp));
+    code = strtol(stemp, &p, 16);
+    Serial.write(code);
+    size -= 2;
+    codes += 2;
+  }
+}
+
+uint32_t GetHash(const char *buffer, size_t size)
+{
+  uint32_t hash = 0;
+  for (uint32_t i = 0; i <= size; i++) {
+    hash += (uint8_t)*buffer++ * (i +1);
+  }
+  return hash;
+}
+
+void ShowSource(uint32_t source)
+{
+  if ((source > 0) && (source < SRC_MAX)) {
+    char stemp1[20];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource));
+  }
+}
+
+void WebHexCode(uint32_t i, const char* code)
+{
+  char scolor[10];
+
+  strlcpy(scolor, code, sizeof(scolor));
+  char* p = scolor;
+  if ('#' == p[0]) { p++; }
+
+  if (3 == strlen(p)) {
+    p[6] = p[3];
+    p[5] = p[2];
+    p[4] = p[2];
+    p[3] = p[1];
+    p[2] = p[1];
+    p[1] = p[0];
+  }
+
+  uint32_t color = strtol(p, nullptr, 16);
+
+
+
+
+
+
+  uint32_t j = sizeof(Settings.web_color) / 3;
+# 917 "S:/Development/Tasmota/tasmota/support.ino"
+  if (i >= j) {
+
+    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
+  }
+  Settings.web_color[i][0] = (color >> 16) & 0xFF;
+  Settings.web_color[i][1] = (color >> 8) & 0xFF;
+  Settings.web_color[i][2] = color & 0xFF;
+}
+
+uint32_t WebColor(uint32_t i)
+{
+  uint32_t j = sizeof(Settings.web_color) / 3;
+
+
+
+
+  if (i >= j) {
+
+    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
+  }
+  uint32_t tcolor = (Settings.web_color[i][0] << 16) | (Settings.web_color[i][1] << 8) | Settings.web_color[i][2];
+
+  return tcolor;
+}
+
+
+
+
+
+const uint16_t TIMESZ = 100;
+
+char* ResponseGetTime(uint32_t format, char* time_str)
+{
+  switch (format) {
+  case 1:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%u"), GetDateAndTime(DT_LOCAL).c_str(), UtcTime());
+    break;
+  case 2:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":%u"), UtcTime());
+    break;
+  default:
+    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
+  }
+  return time_str;
+}
+
+int Response_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), format, args);
+  va_end(args);
+  return len;
+}
+
+int ResponseTime_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+
+  ResponseGetTime(Settings.flag2.time_format, mqtt_data);
+
+  int mlen = strlen(mqtt_data);
+  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
+  va_end(args);
+  return len + mlen;
+}
+
+int ResponseAppend_P(const char* format, ...)
+{
+
+  va_list args;
+  va_start(args, format);
+  int mlen = strlen(mqtt_data);
+  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
+  va_end(args);
+  return len + mlen;
+}
+
+int ResponseAppendTimeFormat(uint32_t format)
+{
+  char time_str[TIMESZ];
+  return ResponseAppend_P(ResponseGetTime(format, time_str));
+}
+
+int ResponseAppendTime(void)
+{
+  return ResponseAppendTimeFormat(Settings.flag2.time_format);
+}
+
+int ResponseJsonEnd(void)
+{
+  return ResponseAppend_P(PSTR("}"));
+}
+
+int ResponseJsonEndEnd(void)
+{
+  return ResponseAppend_P(PSTR("}}"));
+}
+
+
+
+
+
+void DigitalWrite(uint32_t gpio_pin, uint32_t state)
+{
+  if (pin[gpio_pin] < 99) {
+    digitalWrite(pin[gpio_pin], state &1);
+  }
+}
+
+uint8_t ModuleNr(void)
+{
+
+
+  return (USER_MODULE == Settings.module) ? 0 : Settings.module +1;
+}
+
+bool ValidTemplateModule(uint32_t index)
+{
+  for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
+    if (index == pgm_read_byte(kModuleNiceList + i)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool ValidModule(uint32_t index)
+{
+  if (index == USER_MODULE) { return true; }
+  return ValidTemplateModule(index);
+}
+
+String AnyModuleName(uint32_t index)
+{
+  if (USER_MODULE == index) {
+    return String(Settings.user_template.name);
+  } else {
+    return FPSTR(kModules[index].name);
+  }
+}
+
+String ModuleName(void)
+{
+  return AnyModuleName(Settings.module);
+}
+
+void ModuleGpios(myio *gp)
+{
+  uint8_t *dest = (uint8_t *)gp;
+  memset(dest, GPIO_NONE, sizeof(myio));
+
+  uint8_t src[sizeof(mycfgio)];
+  if (USER_MODULE == Settings.module) {
+    memcpy(&src, &Settings.user_template.gp, sizeof(mycfgio));
+  } else {
+    memcpy_P(&src, &kModules[Settings.module].gp, sizeof(mycfgio));
+  }
+
+
+
+
+  uint32_t j = 0;
+  for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+    if (6 == i) { j = 9; }
+    if (8 == i) { j = 12; }
+    dest[j] = src[i];
+    j++;
+  }
+
+
+
+}
+
+gpio_flag ModuleFlag(void)
+{
+  gpio_flag flag;
+
+  if (USER_MODULE == Settings.module) {
+    flag = Settings.user_template.flag;
+  } else {
+    memcpy_P(&flag, &kModules[Settings.module].flag, sizeof(gpio_flag));
+  }
+
+  return flag;
+}
+
+void ModuleDefault(uint32_t module)
+{
+  if (USER_MODULE == module) { module = WEMOS; }
+  Settings.user_template_base = module;
+  memcpy_P(&Settings.user_template, &kModules[module], sizeof(mytmplt));
+}
+
+void SetModuleType(void)
+{
+  my_module_type = (USER_MODULE == Settings.module) ? Settings.user_template_base : Settings.module;
+}
+
+bool FlashPin(uint32_t pin)
+{
+  return (((pin > 5) && (pin < 9)) || (11 == pin));
+}
+
+uint8_t ValidPin(uint32_t pin, uint32_t gpio)
+{
+  if (FlashPin(pin)) {
+    return GPIO_NONE;
+  }
+
+
+  if ((WEMOS == Settings.module) && !Settings.flag3.user_esp8285_enable) {
+    if ((pin == 9) || (pin == 10)) {
+      return GPIO_NONE;
+    }
+  }
+
+  return gpio;
+}
+
+bool ValidGPIO(uint32_t pin, uint32_t gpio)
+{
+  return (GPIO_USER == ValidPin(pin, gpio));
+}
+
+bool ValidAdc(void)
+{
+  gpio_flag flag = ModuleFlag();
+  uint32_t template_adc0 = flag.data &15;
+  return (ADC0_USER == template_adc0);
+}
+
+bool GetUsedInModule(uint32_t val, uint8_t *arr)
+{
+  int offset = 0;
+
+  if (!val) { return false; }
+
+  if ((val >= GPIO_KEY1) && (val < GPIO_KEY1 + MAX_KEYS)) {
+    offset = (GPIO_KEY1_NP - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_NP) && (val < GPIO_KEY1_NP + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_NP - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_INV) && (val < GPIO_KEY1_INV + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_INV - GPIO_KEY1);
+  }
+  if ((val >= GPIO_KEY1_INV_NP) && (val < GPIO_KEY1_INV_NP + MAX_KEYS)) {
+    offset = -(GPIO_KEY1_INV_NP - GPIO_KEY1);
+  }
+
+  if ((val >= GPIO_SWT1) && (val < GPIO_SWT1 + MAX_SWITCHES)) {
+    offset = (GPIO_SWT1_NP - GPIO_SWT1);
+  }
+  if ((val >= GPIO_SWT1_NP) && (val < GPIO_SWT1_NP + MAX_SWITCHES)) {
+    offset = -(GPIO_SWT1_NP - GPIO_SWT1);
+  }
+
+  if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
+    offset = (GPIO_REL1_INV - GPIO_REL1);
+  }
+  if ((val >= GPIO_REL1_INV) && (val < GPIO_REL1_INV + MAX_RELAYS)) {
+    offset = -(GPIO_REL1_INV - GPIO_REL1);
+  }
+
+  if ((val >= GPIO_LED1) && (val < GPIO_LED1 + MAX_LEDS)) {
+    offset = (GPIO_LED1_INV - GPIO_LED1);
+  }
+  if ((val >= GPIO_LED1_INV) && (val < GPIO_LED1_INV + MAX_LEDS)) {
+    offset = -(GPIO_LED1_INV - GPIO_LED1);
+  }
+
+  if ((val >= GPIO_PWM1) && (val < GPIO_PWM1 + MAX_PWMS)) {
+    offset = (GPIO_PWM1_INV - GPIO_PWM1);
+  }
+  if ((val >= GPIO_PWM1_INV) && (val < GPIO_PWM1_INV + MAX_PWMS)) {
+    offset = -(GPIO_PWM1_INV - GPIO_PWM1);
+  }
+
+  if ((val >= GPIO_CNTR1) && (val < GPIO_CNTR1 + MAX_COUNTERS)) {
+    offset = (GPIO_CNTR1_NP - GPIO_CNTR1);
+  }
+  if ((val >= GPIO_CNTR1_NP) && (val < GPIO_CNTR1_NP + MAX_COUNTERS)) {
+    offset = -(GPIO_CNTR1_NP - GPIO_CNTR1);
+  }
+
+  for (uint32_t i = 0; i < MAX_GPIO_PIN; i++) {
+    if (arr[i] == val) { return true; }
+    if (arr[i] == val + offset) { return true; }
+  }
+  return false;
+}
+
+bool JsonTemplate(const char* dataBuf)
+{
+
+
+  if (strlen(dataBuf) < 9) { return false; }
+
+  StaticJsonBuffer<350> jb;
+  JsonObject& obj = jb.parseObject(dataBuf);
+  if (!obj.success()) { return false; }
+
+
+  const char* name = obj[D_JSON_NAME];
+  if (name != nullptr) {
+    strlcpy(Settings.user_template.name, name, sizeof(Settings.user_template.name));
+  }
+  if (obj[D_JSON_GPIO].success()) {
+    for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+      Settings.user_template.gp.io[i] = obj[D_JSON_GPIO][i] | 0;
+    }
+  }
+  if (obj[D_JSON_FLAG].success()) {
+    uint8_t flag = obj[D_JSON_FLAG] | 0;
+    memcpy(&Settings.user_template.flag, &flag, sizeof(gpio_flag));
+  }
+  if (obj[D_JSON_BASE].success()) {
+    uint8_t base = obj[D_JSON_BASE];
+    if ((0 == base) || !ValidTemplateModule(base -1)) { base = 18; }
+    Settings.user_template_base = base -1;
+  }
+  return true;
+}
+
+void TemplateJson(void)
+{
+  Response_P(PSTR("{\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), Settings.user_template.name);
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    ResponseAppend_P(PSTR("%s%d"), (i>0)?",":"", Settings.user_template.gp.io[i]);
+  }
+  ResponseAppend_P(PSTR("],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), Settings.user_template.flag, Settings.user_template_base +1);
+}
+
+
+
+
+
+inline int32_t TimeDifference(uint32_t prev, uint32_t next)
+{
+  return ((int32_t) (next - prev));
+}
+
+int32_t TimePassedSince(uint32_t timestamp)
+{
+
+
+  return TimeDifference(timestamp, millis());
+}
+
+bool TimeReached(uint32_t timer)
+{
+
+  const long passed = TimePassedSince(timer);
+  return (passed >= 0);
+}
+
+void SetNextTimeInterval(unsigned long& timer, const unsigned long step)
+{
+  timer += step;
+  const long passed = TimePassedSince(timer);
+  if (passed < 0) { return; }
+  if (static_cast<unsigned long>(passed) > step) {
+
+    timer = millis() + step;
+    return;
+  }
+
+  timer = millis() + (step - passed);
+}
+
+int32_t TimePassedSinceUsec(uint32_t timestamp)
+{
+  return TimeDifference(timestamp, micros());
+}
+
+bool TimeReachedUsec(uint32_t timer)
+{
+
+  const long passed = TimePassedSinceUsec(timer);
+  return (passed >= 0);
+}
+
+
+
+
+
+#ifdef USE_I2C
+const uint8_t I2C_RETRY_COUNTER = 3;
+
+uint32_t i2c_active[4] = { 0 };
+uint32_t i2c_buffer = 0;
+
+bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size)
+{
+  uint8_t retry = I2C_RETRY_COUNTER;
+  bool status = false;
+
+  i2c_buffer = 0;
+  while (!status && retry) {
+    Wire.beginTransmission(addr);
+    Wire.write(reg);
+    if (0 == Wire.endTransmission(false)) {
+      Wire.requestFrom((int)addr, (int)size);
+      if (Wire.available() == size) {
+        for (uint32_t i = 0; i < size; i++) {
+          i2c_buffer = i2c_buffer << 8 | Wire.read();
+        }
+        status = true;
+      }
+    }
+    retry--;
+  }
+  return status;
+}
+
+bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 1);
+  *data = (uint8_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 2);
+  *data = (uint16_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 2);
+  *data = (int16_t)i2c_buffer;
+  return status;
+}
+
+bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg)
+{
+  uint16_t ldata;
+  bool status = I2cValidRead16(&ldata, addr, reg);
+  *data = (ldata >> 8) | (ldata << 8);
+  return status;
+}
+
+bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg)
+{
+  uint16_t ldata;
+  bool status = I2cValidRead16LE(&ldata, addr, reg);
+  *data = (int16_t)ldata;
+  return status;
+}
+
+bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg)
+{
+  bool status = I2cValidRead(addr, reg, 3);
+  *data = i2c_buffer;
+  return status;
+}
+
+uint8_t I2cRead8(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 1);
+  return (uint8_t)i2c_buffer;
+}
+
+uint16_t I2cRead16(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  return (uint16_t)i2c_buffer;
+}
+
+int16_t I2cReadS16(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  return (int16_t)i2c_buffer;
+}
+
+uint16_t I2cRead16LE(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 2);
+  uint16_t temp = (uint16_t)i2c_buffer;
+  return (temp >> 8) | (temp << 8);
+}
+
+int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg)
+{
+  return (int16_t)I2cRead16LE(addr, reg);
+}
+
+int32_t I2cRead24(uint8_t addr, uint8_t reg)
+{
+  I2cValidRead(addr, reg, 3);
+  return i2c_buffer;
+}
+
+bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size)
+{
+  uint8_t x = I2C_RETRY_COUNTER;
+
+  do {
+    Wire.beginTransmission((uint8_t)addr);
+    Wire.write(reg);
+    uint8_t bytes = size;
+    while (bytes--) {
+      Wire.write((val >> (8 * bytes)) & 0xFF);
+    }
+    x--;
+  } while (Wire.endTransmission(true) != 0 && x != 0);
+  return (x);
+}
+
+bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val)
+{
+   return I2cWrite(addr, reg, val, 1);
+}
+
+bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val)
+{
+   return I2cWrite(addr, reg, val, 2);
+}
+
+int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
+{
+  Wire.beginTransmission((uint8_t)addr);
+  Wire.write((uint8_t)reg);
+  Wire.endTransmission();
+  if (len != Wire.requestFrom((uint8_t)addr, (uint8_t)len)) {
+    return 1;
+  }
+  while (len--) {
+    *reg_data = (uint8_t)Wire.read();
+    reg_data++;
+  }
+  return 0;
+}
+
+int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
+{
+  Wire.beginTransmission((uint8_t)addr);
+  Wire.write((uint8_t)reg);
+  while (len--) {
+    Wire.write(*reg_data);
+    reg_data++;
+  }
+  Wire.endTransmission();
+  return 0;
+}
+
+void I2cScan(char *devs, unsigned int devs_len)
+{
+
+
+
+
+
+
+
+  uint8_t error = 0;
+  uint8_t address = 0;
+  uint8_t any = 0;
+
+  snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_DEVICES_FOUND_AT));
+  for (address = 1; address <= 127; address++) {
+    Wire.beginTransmission(address);
+    error = Wire.endTransmission();
+    if (0 == error) {
+      any = 1;
+      snprintf_P(devs, devs_len, PSTR("%s 0x%02x"), devs, address);
+    }
+    else if (error != 2) {
+      any = 2;
+      snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"Error %d at 0x%02x"), error, address);
+      break;
+    }
+  }
+  if (any) {
+    strncat(devs, "\"}", devs_len - strlen(devs) -1);
+  }
+  else {
+    snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_NO_DEVICES_FOUND "\"}"));
+  }
+}
+
+void I2cResetActive(uint32_t addr, uint32_t count = 1)
+{
+  addr &= 0x7F;
+  count &= 0x7F;
+  while (count-- && (addr < 128)) {
+    i2c_active[addr / 32] &= ~(1 << (addr % 32));
+    addr++;
+  }
+
+}
+
+void I2cSetActive(uint32_t addr, uint32_t count = 1)
+{
+  addr &= 0x7F;
+  count &= 0x7F;
+  while (count-- && (addr < 128)) {
+    i2c_active[addr / 32] |= (1 << (addr % 32));
+    addr++;
+  }
+
+}
+
+void I2cSetActiveFound(uint32_t addr, const char *types)
+{
+  I2cSetActive(addr);
+  AddLog_P2(LOG_LEVEL_INFO, S_LOG_I2C_FOUND_AT, types, addr);
+}
+
+bool I2cActive(uint32_t addr)
+{
+  addr &= 0x7F;
+  if (i2c_active[addr / 32] & (1 << (addr % 32))) {
+    return true;
+  }
+  return false;
+}
+
+bool I2cSetDevice(uint32_t addr)
+{
+  addr &= 0x7F;
+  if (I2cActive(addr)) {
+    return false;
+  }
+  Wire.beginTransmission((uint8_t)addr);
+  return (0 == Wire.endTransmission());
+}
+#endif
+# 1560 "S:/Development/Tasmota/tasmota/support.ino"
+void SetSeriallog(uint32_t loglevel)
+{
+  Settings.seriallog_level = loglevel;
+  seriallog_level = loglevel;
+  seriallog_timer = 0;
+}
+
+void SetSyslog(uint32_t loglevel)
+{
+  Settings.syslog_level = loglevel;
+  syslog_level = loglevel;
+  syslog_timer = 0;
+}
+
+#ifdef USE_WEBSERVER
+void GetLog(uint32_t idx, char** entry_pp, size_t* len_p)
+{
+  char* entry_p = nullptr;
+  size_t len = 0;
+
+  if (idx) {
+    char* it = web_log;
+    do {
+      uint32_t cur_idx = *it;
+      it++;
+      size_t tmp = strchrspn(it, '\1');
+      tmp++;
+      if (cur_idx == idx) {
+        len = tmp;
+        entry_p = it;
+        break;
+      }
+      it += tmp;
+    } while (it < web_log + WEB_LOG_SIZE && *it != '\0');
+  }
+  *entry_pp = entry_p;
+  *len_p = len;
+}
+#endif
+
+void Syslog(void)
+{
+
+
+  uint32_t current_hash = GetHash(SettingsText(SET_SYSLOG_HOST), strlen(SettingsText(SET_SYSLOG_HOST)));
+  if (syslog_host_hash != current_hash) {
+    syslog_host_hash = current_hash;
+    WiFi.hostByName(SettingsText(SET_SYSLOG_HOST), syslog_host_addr);
+  }
+  if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
+    char syslog_preamble[64];
+    snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);
+    memmove(log_data + strlen(syslog_preamble), log_data, sizeof(log_data) - strlen(syslog_preamble));
+    log_data[sizeof(log_data) -1] = '\0';
+    memcpy(log_data, syslog_preamble, strlen(syslog_preamble));
+    PortUdp.write(log_data, strlen(log_data));
+    PortUdp.endPacket();
+    delay(1);
+  } else {
+    syslog_level = 0;
+    syslog_timer = SYSLOG_TIMER;
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_HOST_NOT_FOUND ". " D_RETRY_IN " %d " D_UNIT_SECOND), SYSLOG_TIMER);
+  }
+}
+
+void AddLog(uint32_t loglevel)
+{
+  char mxtime[10];
+
+  snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
+
+  if (loglevel <= seriallog_level) {
+    Serial.printf("%s%s\r\n", mxtime, log_data);
+  }
+#ifdef USE_WEBSERVER
+  if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
+
+
+    web_log_index &= 0xFF;
+    if (!web_log_index) web_log_index++;
+    while (web_log_index == web_log[0] ||
+           strlen(web_log) + strlen(log_data) + 13 > WEB_LOG_SIZE)
+    {
+      char* it = web_log;
+      it++;
+      it += strchrspn(it, '\1');
+      it++;
+      memmove(web_log, it, WEB_LOG_SIZE -(it-web_log));
+    }
+    snprintf_P(web_log, sizeof(web_log), PSTR("%s%c%s%s\1"), web_log, web_log_index++, mxtime, log_data);
+    web_log_index &= 0xFF;
+    if (!web_log_index) web_log_index++;
+  }
+#endif
+  if (Settings.flag.mqtt_enabled &&
+      !global_state.mqtt_down &&
+      (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
+
+  if (!global_state.wifi_down &&
+      (loglevel <= syslog_level)) { Syslog(); }
+}
+
+void AddLog_P(uint32_t loglevel, const char *formatP)
+{
+  snprintf_P(log_data, sizeof(log_data), formatP);
+  AddLog(loglevel);
+}
+
+void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2)
+{
+  char message[sizeof(log_data)];
+
+  snprintf_P(log_data, sizeof(log_data), formatP);
+  snprintf_P(message, sizeof(message), formatP2);
+  strncat(log_data, message, sizeof(log_data) - strlen(log_data) -1);
+  AddLog(loglevel);
+}
+
+void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  prepped_loglevel = loglevel;
+}
+
+void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  AddLog(loglevel);
+}
+
+void AddLog_Debug(PGM_P formatP, ...)
+{
+  va_list arg;
+  va_start(arg, formatP);
+  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
+  va_end(arg);
+
+  AddLog(LOG_LEVEL_DEBUG);
+}
+
+void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count)
+{
+# 1722 "S:/Development/Tasmota/tasmota/support.ino"
+  char hex_char[(count * 3) + 2];
+  AddLog_P2(loglevel, PSTR("DMP: %s"), ToHex_P(buffer, count, hex_char, sizeof(hex_char), ' '));
+}
+
+void AddLogSerial(uint32_t loglevel)
+{
+  AddLogBuffer(loglevel, (uint8_t*)serial_in_buffer, serial_in_byte_counter);
+}
+
+void AddLogMissed(char *sensor, uint32_t misses)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SNS: %s missed %d"), sensor, SENSOR_MAX_MISS - misses);
+}
+# 1 "S:/Development/Tasmota/tasmota/support_button.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_button.ino"
+#define BUTTON_V1 
+#ifdef BUTTON_V1
+
+
+
+
+#define MAX_BUTTON_COMMANDS 5
+const char kCommands[] PROGMEM =
+  D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_RESTART " 1|" D_CMND_UPGRADE " 1";
+
+struct BUTTON {
+  unsigned long debounce = 0;
+  uint16_t hold_timer[MAX_KEYS] = { 0 };
+  uint16_t dual_code = 0;
+
+  uint8_t last_state[MAX_KEYS] = { NOT_PRESSED, NOT_PRESSED, NOT_PRESSED, NOT_PRESSED };
+  uint8_t window_timer[MAX_KEYS] = { 0 };
+  uint8_t press_counter[MAX_KEYS] = { 0 };
+
+  uint8_t dual_receive_count = 0;
+  uint8_t no_pullup_mask = 0;
+  uint8_t inverted_mask = 0;
+  uint8_t present = 0;
+  uint8_t adc = 99;
+} Button;
+
+
+
+void ButtonPullupFlag(uint8 button_bit)
+{
+  bitSet(Button.no_pullup_mask, button_bit);
+}
+
+void ButtonInvertFlag(uint8 button_bit)
+{
+  bitSet(Button.inverted_mask, button_bit);
+}
+
+void ButtonInit(void)
+{
+  Button.present = 0;
+  for (uint32_t i = 0; i < MAX_KEYS; i++) {
+    if (pin[GPIO_KEY1 +i] < 99) {
+      Button.present++;
+      pinMode(pin[GPIO_KEY1 +i], bitRead(Button.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_KEY1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
+    }
+#ifndef USE_ADC_VCC
+    else if ((99 == Button.adc) && ((ADC0_BUTTON == my_adc0) || (ADC0_BUTTON_INV == my_adc0))) {
+      Button.present++;
+      Button.adc = i;
+    }
+#endif
+  }
+}
+
+uint8_t ButtonSerial(uint8_t serial_in_byte)
+{
+  if (Button.dual_receive_count) {
+    Button.dual_receive_count--;
+    if (Button.dual_receive_count) {
+      Button.dual_code = (Button.dual_code << 8) | serial_in_byte;
+      serial_in_byte = 0;
+    } else {
+      if (serial_in_byte != 0xA1) {
+        Button.dual_code = 0;
+      }
+    }
+  }
+  if (0xA0 == serial_in_byte) {
+    serial_in_byte = 0;
+    Button.dual_code = 0;
+    Button.dual_receive_count = 3;
+  }
+
+  return serial_in_byte;
+}
+# 108 "S:/Development/Tasmota/tasmota/support_button.ino"
+void ButtonHandler(void)
+{
+  if (uptime < 4) { return; }
+
+  uint8_t hold_time_extent = IMMINENT_RESET_FACTOR;
+  uint16_t loops_per_second = 1000 / Settings.button_debounce;
+  char scmnd[20];
+
+
+
+  for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
+    uint8_t button = NOT_PRESSED;
+    uint8_t button_present = 0;
+
+    if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type))) {
+      button_present = 1;
+      if (Button.dual_code) {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON " " D_CODE " %04X"), Button.dual_code);
+        button = PRESSED;
+        if (0xF500 == Button.dual_code) {
+          Button.hold_timer[button_index] = (loops_per_second * Settings.param[P_HOLD_TIME] / 10) -1;
+          hold_time_extent = 1;
+        }
+        Button.dual_code = 0;
+      }
+    }
+    else if (pin[GPIO_KEY1 +button_index] < 99) {
+      button_present = 1;
+      button = (digitalRead(pin[GPIO_KEY1 +button_index]) != bitRead(Button.inverted_mask, button_index));
+    }
+#ifndef USE_ADC_VCC
+    if (Button.adc == button_index) {
+      button_present = 1;
+      if (ADC0_BUTTON_INV == my_adc0) {
+        button = (AdcRead(1) < 128);
+      }
+      else if (ADC0_BUTTON == my_adc0) {
+        button = (AdcRead(1) > 128);
+      }
+    }
+#endif
+
+    if (button_present) {
+      XdrvMailbox.index = button_index;
+      XdrvMailbox.payload = button;
+      if (XdrvCall(FUNC_BUTTON_PRESSED)) {
+
+      }
+      else if (SONOFF_4CHPRO == my_module_type) {
+        if (Button.hold_timer[button_index]) { Button.hold_timer[button_index]--; }
+
+        bool button_pressed = false;
+        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_10), button_index +1);
+          Button.hold_timer[button_index] = loops_per_second;
+          button_pressed = true;
+        }
+        if ((NOT_PRESSED == button) && (PRESSED == Button.last_state[button_index])) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_01), button_index +1);
+          if (!Button.hold_timer[button_index]) { button_pressed = true; }
+        }
+        if (button_pressed) {
+          if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
+            ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
+          }
+        }
+      }
+      else {
+        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+          if (Settings.flag.button_single) {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1);
+            if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
+              ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
+            }
+          } else {
+            Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_MULTI_PRESS " %d"), button_index +1, Button.press_counter[button_index]);
+            Button.window_timer[button_index] = loops_per_second / 2;
+          }
+          blinks = 201;
+        }
+
+        if (NOT_PRESSED == button) {
+          Button.hold_timer[button_index] = 0;
+        } else {
+          Button.hold_timer[button_index]++;
+          if (Settings.flag.button_single) {
+            if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
+
+              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "13 0"));
+              ExecuteCommand(scmnd, SRC_BUTTON);
+            }
+          } else {
+            if (Settings.flag.button_restrict) {
+              if (Settings.param[P_HOLD_IGNORE] > 0) {
+                if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+                  Button.hold_timer[button_index] = 0;
+                  Button.press_counter[button_index] = 0;
+                  DEBUG_CORE_LOG(PSTR("BTN: " D_BUTTON "%d cancel by " D_CMND_SETOPTION "40 %d"), button_index +1, Settings.param[P_HOLD_IGNORE]);
+                }
+              }
+              if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {
+                Button.press_counter[button_index] = 0;
+                SendKey(KEY_BUTTON, button_index +1, POWER_HOLD);
+              }
+            } else {
+              if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
+                Button.press_counter[button_index] = 0;
+                snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+                ExecuteCommand(scmnd, SRC_BUTTON);
+              }
+            }
+          }
+        }
+
+        if (!Settings.flag.button_single) {
+          if (Button.window_timer[button_index]) {
+            Button.window_timer[button_index]--;
+          } else {
+            if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0) && (Button.press_counter[button_index] < MAX_BUTTON_COMMANDS +3)) {
+              bool single_press = false;
+              if (Button.press_counter[button_index] < 3) {
+                if ((SONOFF_DUAL_R2 == my_module_type) || (SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+                  single_press = true;
+                } else {
+                  single_press = (Settings.flag.button_swap +1 == Button.press_counter[button_index]);
+                  if ((1 == Button.present) && (2 == devices_present)) {
+                    if (Settings.flag.button_swap) {
+                      Button.press_counter[button_index] = (single_press) ? 1 : 2;
+                    }
+                  } else {
+                    Button.press_counter[button_index] = 1;
+                  }
+                }
+              }
+#if defined(USE_LIGHT) && defined(ROTARY_V1)
+              if (!((0 == button_index) && RotaryButtonPressed())) {
+#endif
+                if (single_press && SendKey(KEY_BUTTON, button_index + Button.press_counter[button_index], POWER_TOGGLE)) {
+
+                } else {
+                  if (Button.press_counter[button_index] < 3) {
+                    if (WifiState() > WIFI_RESTART) {
+                      restart_flag = 1;
+                    } else {
+                      ExecuteCommandPower(button_index + Button.press_counter[button_index], POWER_TOGGLE, SRC_BUTTON);
+                    }
+                  } else {
+                    if (!Settings.flag.button_restrict) {
+                      GetTextIndexed(scmnd, sizeof(scmnd), Button.press_counter[button_index] -3, kCommands);
+                      ExecuteCommand(scmnd, SRC_BUTTON);
+                    }
+                  }
+                }
+#if defined(USE_LIGHT) && defined(ROTARY_V1)
+              }
+#endif
+              Button.press_counter[button_index] = 0;
+            }
+          }
+        }
+      }
+    }
+    Button.last_state[button_index] = button;
+  }
+}
+
+void ButtonLoop(void)
+{
+  if (Button.present) {
+    if (TimeReached(Button.debounce)) {
+      SetNextTimeInterval(Button.debounce, Settings.button_debounce);
+      ButtonHandler();
+    }
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_command.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_command.ino"
+const char kTasmotaCommands[] PROGMEM = "|"
+  D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|"
+  D_CMND_SERIALLOG "|" D_CMND_RESTART "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SAVEDATA "|"
+  D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" D_CMND_PRESSURE_RESOLUTION "|" D_CMND_POWER_RESOLUTION "|"
+  D_CMND_VOLTAGE_RESOLUTION "|" D_CMND_FREQUENCY_RESOLUTION "|" D_CMND_CURRENT_RESOLUTION "|" D_CMND_ENERGY_RESOLUTION "|" D_CMND_WEIGHT_RESOLUTION "|"
+  D_CMND_MODULE "|" D_CMND_MODULES "|" D_CMND_GPIO "|" D_CMND_GPIOS "|" D_CMND_TEMPLATE "|" D_CMND_PWM "|" D_CMND_PWMFREQUENCY "|" D_CMND_PWMRANGE "|"
+  D_CMND_BUTTONDEBOUNCE "|" D_CMND_SWITCHDEBOUNCE "|" D_CMND_SYSLOG "|" D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALCONFIG "|"
+  D_CMND_SERIALDELIMITER "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|"
+  D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_INTERLOCK "|" D_CMND_TELEPERIOD "|" D_CMND_RESET "|" D_CMND_TIME "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|"
+  D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_LEDMASK "|" D_CMND_WIFIPOWER "|" D_CMND_TEMPOFFSET "|"
+#ifdef USE_I2C
+  D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
+#endif
+#ifdef USE_DEVICE_GROUPS
+  D_CMND_DEVGROUP_SHARE "|"
+#endif
+  D_CMND_SENSOR "|" D_CMND_DRIVER;
+
+void (* const TasmotaCommand[])(void) PROGMEM = {
+  &CmndBacklog, &CmndDelay, &CmndPower, &CmndStatus, &CmndState, &CmndSleep, &CmndUpgrade, &CmndUpgrade, &CmndOtaUrl,
+  &CmndSeriallog, &CmndRestart, &CmndPowerOnState, &CmndPulsetime, &CmndBlinktime, &CmndBlinkcount, &CmndSavedata,
+  &CmndSetoption, &CmndTemperatureResolution, &CmndHumidityResolution, &CmndPressureResolution, &CmndPowerResolution,
+  &CmndVoltageResolution, &CmndFrequencyResolution, &CmndCurrentResolution, &CmndEnergyResolution, &CmndWeightResolution,
+  &CmndModule, &CmndModules, &CmndGpio, &CmndGpios, &CmndTemplate, &CmndPwm, &CmndPwmfrequency, &CmndPwmrange,
+  &CmndButtonDebounce, &CmndSwitchDebounce, &CmndSyslog, &CmndLoghost, &CmndLogport, &CmndSerialSend, &CmndBaudrate, &CmndSerialConfig,
+  &CmndSerialDelimiter, &CmndIpAddress, &CmndNtpServer, &CmndAp, &CmndSsid, &CmndPassword, &CmndHostname, &CmndWifiConfig,
+  &CmndFriendlyname, &CmndSwitchMode, &CmndInterlock, &CmndTeleperiod, &CmndReset, &CmndTime, &CmndTimezone, &CmndTimeStd,
+  &CmndTimeDst, &CmndAltitude, &CmndLedPower, &CmndLedState, &CmndLedMask, &CmndWifiPower, &CmndTempOffset,
+#ifdef USE_I2C
+  &CmndI2cScan, CmndI2cDriver,
+#endif
+#ifdef USE_DEVICE_GROUPS
+  &CmndDevGroupShare,
+#endif
+  &CmndSensor, &CmndDriver };
+
+const char kWifiConfig[] PROGMEM =
+  D_WCFG_0_RESTART "||" D_WCFG_2_WIFIMANAGER "||" D_WCFG_4_RETRY "|" D_WCFG_5_WAIT "|" D_WCFG_6_SERIAL "|" D_WCFG_7_WIFIMANAGER_RESET_ONLY;
+
+
+
+void ResponseCmndNumber(int value)
+{
+  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, value);
+}
+
+void ResponseCmndFloat(float value, uint32_t decimals)
+{
+  char stemp1[TOPSZ];
+  dtostrfd(value, decimals, stemp1);
+  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp1);
+}
+
+void ResponseCmndIdxNumber(int value)
+{
+  Response_P(S_JSON_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
+}
+
+void ResponseCmndChar(const char* value)
+{
+  Response_P(S_JSON_COMMAND_SVALUE, XdrvMailbox.command, value);
+}
+
+void ResponseCmndStateText(uint32_t value)
+{
+  ResponseCmndChar(GetStateText(value));
+}
+
+void ResponseCmndDone(void)
+{
+  ResponseCmndChar(D_JSON_DONE);
+}
+
+void ResponseCmndIdxChar(const char* value)
+{
+  Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
+}
+
+void ResponseCmndAll(uint32_t text_index, uint32_t count)
+{
+  mqtt_data[0] = '\0';
+  for (uint32_t i = 0; i < count; i++) {
+    ResponseAppend_P(PSTR("%c\"%s%d\":\"%s\""), (i) ? ',' : '{', XdrvMailbox.command, i +1, SettingsText(text_index +i));
+  }
+  ResponseJsonEnd();
+}
+
+
+
+void ExecuteCommand(const char *cmnd, uint32_t source)
+{
+
+
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("ExecuteCommand"));
+#endif
+  ShowSource(source);
+
+  const char *pos = cmnd;
+  while (*pos && isspace(*pos)) {
+    pos++;
+  }
+
+  const char *start = pos;
+
+  while (*pos && (isalpha(*pos) || isdigit(*pos) || '_' == *pos || '/' == *pos)) {
+    if ('/' == *pos) {
+      start = pos + 1;
+    }
+    pos++;
+  }
+  if ('\0' == *start || pos <= start) {
+    return;
+  }
+
+  uint32_t size = pos - start;
+  char stopic[size + 2];
+  stopic[0] = '/';
+  memcpy(stopic+1, start, size);
+  stopic[size+1] = '\0';
+
+  char svalue[strlen(pos) +1];
+  strlcpy(svalue, pos, sizeof(svalue));
+  CommandHandler(stopic, svalue, strlen(svalue));
+}
+# 154 "S:/Development/Tasmota/tasmota/support_command.ino"
+void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("CommandHandler"));
+#endif
+
+  while (*dataBuf && isspace(*dataBuf)) {
+    dataBuf++;
+    data_len--;
+  }
+
+  bool grpflg = (strstr(topicBuf, SettingsText(SET_MQTT_GRP_TOPIC)) != nullptr);
+
+  char stemp1[TOPSZ];
+  GetFallbackTopic_P(stemp1, "");
+  fallback_topic_flag = (!strncmp(topicBuf, stemp1, strlen(stemp1)));
+
+  char *type = strrchr(topicBuf, '/');
+
+  uint32_t index = 1;
+  bool user_index = false;
+  if (type != nullptr) {
+    type++;
+    uint32_t i;
+    for (i = 0; i < strlen(type); i++) {
+      type[i] = toupper(type[i]);
+    }
+    while (isdigit(type[i-1])) {
+      i--;
+    }
+    if (i < strlen(type)) {
+      index = atoi(type +i);
+      user_index = true;
+    }
+    type[i] = '\0';
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CMD: " D_GROUP " %d, " D_INDEX " %d, " D_COMMAND " \"%s\", " D_DATA " \"%s\""), grpflg, index, type, dataBuf);
+
+  if (type != nullptr) {
+    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_ERROR "\"}"));
+
+    if (Settings.ledstate &0x02) { blinks++; }
+
+    if (!strcmp(dataBuf,"?")) { data_len = 0; }
+
+    char *p;
+    int32_t payload = strtol(dataBuf, &p, 0);
+    if (p == dataBuf) { payload = -99; }
+    int temp_payload = GetStateNumber(dataBuf);
+    if (temp_payload > -1) { payload = temp_payload; }
+
+    DEBUG_CORE_LOG(PSTR("CMD: Payload %d"), payload);
+
+
+    backlog_delay = millis() + Settings.param[P_BACKLOG_DELAY];
+
+    char command[CMDSZ] = { 0 };
+    XdrvMailbox.command = command;
+    XdrvMailbox.index = index;
+    XdrvMailbox.data_len = data_len;
+    XdrvMailbox.payload = payload;
+    XdrvMailbox.grpflg = grpflg;
+    XdrvMailbox.usridx = user_index;
+    XdrvMailbox.topic = type;
+    XdrvMailbox.data = dataBuf;
+
+#ifdef USE_SCRIPT_SUB_COMMAND
+
+    if (!Script_SubCmd()) {
+      if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
+        if (!XdrvCall(FUNC_COMMAND)) {
+          if (!XsnsCall(FUNC_COMMAND)) {
+            type = nullptr;
+          }
+        }
+      }
+    }
+#else
+    if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
+      if (!XdrvCall(FUNC_COMMAND)) {
+        if (!XsnsCall(FUNC_COMMAND)) {
+          type = nullptr;
+        }
+      }
+    }
+#endif
+
+  }
+
+  if (type == nullptr) {
+    blinks = 201;
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_COMMAND));
+    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}"));
+    type = (char*)stemp1;
+  }
+
+  if (mqtt_data[0] != '\0') {
+     MqttPublishPrefixTopic_P(RESULT_OR_STAT, type);
+     XdrvRulesProcess();
+  }
+  fallback_topic_flag = false;
+}
+
+
+
+void CmndBacklog(void)
+{
+  if (XdrvMailbox.data_len) {
+
+#ifdef SUPPORT_IF_STATEMENT
+    char *blcommand = strtok(XdrvMailbox.data, ";");
+    while ((blcommand != nullptr) && (backlog.size() < MAX_BACKLOG))
+#else
+    uint32_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer;
+    bl_pointer--;
+    char *blcommand = strtok(XdrvMailbox.data, ";");
+    while ((blcommand != nullptr) && (backlog_index != bl_pointer))
+#endif
+    {
+      while(true) {
+        blcommand = Trim(blcommand);
+        if (!strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) {
+          blcommand += strlen(D_CMND_BACKLOG);
+        } else {
+          break;
+        }
+      }
+      if (*blcommand != '\0') {
+#ifdef SUPPORT_IF_STATEMENT
+        if (backlog.size() < MAX_BACKLOG) {
+          backlog.add(blcommand);
+        }
+#else
+        backlog[backlog_index] = String(blcommand);
+        backlog_index++;
+        if (backlog_index >= MAX_BACKLOG) backlog_index = 0;
+#endif
+      }
+      blcommand = strtok(nullptr, ";");
+    }
+
+    mqtt_data[0] = '\0';
+  } else {
+    bool blflag = BACKLOG_EMPTY;
+#ifdef SUPPORT_IF_STATEMENT
+    backlog.clear();
+#else
+    backlog_pointer = backlog_index;
+#endif
+    ResponseCmndChar(blflag ? D_JSON_EMPTY : D_JSON_ABORTED);
+  }
+}
+
+void CmndDelay(void)
+{
+  if ((XdrvMailbox.payload >= (MIN_BACKLOG_DELAY / 100)) && (XdrvMailbox.payload <= 3600)) {
+    backlog_delay = millis() + (100 * XdrvMailbox.payload);
+  }
+  uint32_t bl_delay = 0;
+  long bl_delta = TimePassedSince(backlog_delay);
+  if (bl_delta < 0) { bl_delay = (bl_delta *-1) / 100; }
+  ResponseCmndNumber(bl_delay);
+}
+
+void CmndPower(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= devices_present)) {
+    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_BLINK_STOP)) {
+      XdrvMailbox.payload = POWER_SHOW_STATE;
+    }
+
+    ExecuteCommandPower(XdrvMailbox.index, XdrvMailbox.payload, SRC_IGNORE);
+    mqtt_data[0] = '\0';
+  }
+  else if (0 == XdrvMailbox.index) {
+    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_TOGGLE)) {
+      XdrvMailbox.payload = POWER_SHOW_STATE;
+    }
+    SetAllPower(XdrvMailbox.payload, SRC_IGNORE);
+    mqtt_data[0] = '\0';
+  }
+}
+
+void CmndStatus(void)
+{
+  uint32_t payload = ((XdrvMailbox.payload < 0) || (XdrvMailbox.payload > MAX_STATUS)) ? 99 : XdrvMailbox.payload;
+
+  uint32_t option = STAT;
+  char stemp[200];
+  char stemp2[TOPSZ];
+
+
+
+
+
+  if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }
+  if (!energy_flg && (9 == payload)) { payload = 99; }
+  if (!CrashFlag() && (12 == payload)) { payload = 99; }
+
+  if ((0 == payload) || (99 == payload)) {
+    uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) { maxfn = 1; }
+#endif
+    stemp[0] = '\0';
+    for (uint32_t i = 0; i < maxfn; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), SettingsText(SET_FRIENDLYNAME1 +i));
+    }
+    stemp2[0] = '\0';
+    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+      snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%s%d" ), stemp2, (i > 0 ? "," : ""), Settings.switchmode[i]);
+    }
+    Response_P(PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":[%s],\"" D_CMND_TOPIC "\":\"%s\",\""
+                          D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\""
+                          D_CMND_LEDMASK "\":\"%04X\",\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_SWITCHTOPIC "\":\"%s\",\""
+                          D_CMND_SWITCHMODE "\":[%s],\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_SWITCHRETAIN "\":%d,\"" D_CMND_SENSORRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"),
+                          ModuleNr(), stemp, mqtt_topic,
+                          SettingsText(SET_MQTT_BUTTON_TOPIC), power, Settings.poweronstate, Settings.ledstate,
+                          Settings.ledmask, Settings.save_data,
+                          Settings.flag.save_state,
+                          SettingsText(SET_MQTT_SWITCH_TOPIC),
+                          stemp2,
+                          Settings.flag.mqtt_button_retain,
+                          Settings.flag.mqtt_switch_retain,
+                          Settings.flag.mqtt_sensor_retain,
+                          Settings.flag.mqtt_power_retain);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS));
+  }
+
+  if ((0 == payload) || (1 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
+                          D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
+                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"BCResetTime\":\"%s\",\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
+                          Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
+                          GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
+                          Settings.cfg_holder, Settings.bootcount, GetDateAndTime(DT_BOOTCOUNT).c_str(), Settings.save_flag, GetSettingsAddress());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
+  }
+
+  if ((0 == payload) || (2 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\""
+                          D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
+                          "\"Hardware\":\"%s\""
+                          "%s}}"),
+                          my_version, my_image, GetBuildDateAndTime().c_str(),
+                          ESP.getBootVersion(), ESP.getSdkVersion(),
+                          GetDeviceHardware().c_str(),
+                          GetStatistics().c_str());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "2"));
+  }
+
+  if ((0 == payload) || (3 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_MQTTLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\""
+                          D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\""
+                          D_JSON_RESOLUTION "\":\"%08X\",\"" D_CMND_SETOPTION "\":[\"%08X\",\"%s\",\"%08X\",\"%08X\"]}}"),
+                          Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level,
+                          SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), Settings.tele_period,
+                          Settings.flag2.data, Settings.flag.data, ToHex_P((unsigned char*)Settings.param, PARAM8_SIZE, stemp2, sizeof(stemp2)),
+                          Settings.flag3.data, Settings.flag4.data);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
+  }
+
+  if ((0 == payload) || (4 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS4_MEMORY "\":{\"" D_JSON_PROGRAMSIZE "\":%d,\"" D_JSON_FREEMEMORY "\":%d,\"" D_JSON_HEAPSIZE "\":%d,\""
+                          D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d,\"" D_JSON_FLASHCHIPID "\":\"%06X\",\"" D_JSON_FLASHMODE "\":%d,\""
+                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
+                          ESP.getSketchSize()/1024, ESP.getFreeSketchSpace()/1024, ESP.getFreeHeap()/1024,
+                          ESP.getFlashChipSize()/1024, ESP.getFlashChipRealSize()/1024, ESP.getFlashChipId(), ESP.getFlashChipMode(),
+                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5, feature6);
+    XsnsDriverState();
+    ResponseAppend_P(PSTR(",\"Sensors\":"));
+    XsnsSensorState();
+    ResponseJsonEndEnd();
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "4"));
+  }
+
+  if ((0 == payload) || (5 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"" D_JSON_GATEWAY "\":\"%s\",\""
+                          D_JSON_SUBNETMASK "\":\"%s\",\"" D_JSON_DNSSERVER "\":\"%s\",\"" D_JSON_MAC "\":\"%s\",\""
+                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"),
+                          my_hostname, WiFi.localIP().toString().c_str(), IPAddress(Settings.ip_address[1]).toString().c_str(),
+                          IPAddress(Settings.ip_address[2]).toString().c_str(), IPAddress(Settings.ip_address[3]).toString().c_str(), WiFi.macAddress().c_str(),
+                          Settings.webserver, Settings.sta_config, WifiGetOutputPower().c_str());
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "5"));
+  }
+
+  if (((0 == payload) || (6 == payload)) && Settings.flag.mqtt_enabled) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\""
+                          D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"),
+                          SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT),
+                          mqtt_client, SettingsText(SET_MQTT_USER), MqttConnectCount(), MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE);
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "6"));
+  }
+
+  if ((0 == payload) || (7 == payload)) {
+    if (99 == Settings.timezone) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%d" ), Settings.timezone);
+    } else {
+      snprintf_P(stemp, sizeof(stemp), PSTR("\"%s\"" ), GetTimeZone().c_str());
+    }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
+                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"),
+                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
+                          GetDateAndTime(DT_STD).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
+#else
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
+                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s}}"),
+                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
+                          GetDateAndTime(DT_STD).c_str(), stemp);
+#endif
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7"));
+  }
+
+#if defined(USE_ENERGY_SENSOR) && defined(USE_ENERGY_MARGIN_DETECTION)
+  if (energy_flg) {
+    if ((0 == payload) || (9 == payload)) {
+      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERDELTA "\":%d,\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\""
+                            D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"),
+                            Settings.energy_power_delta, Settings.energy_min_power, Settings.energy_max_power,
+                            Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current);
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "9"));
+    }
+  }
+#endif
+
+  if ((0 == payload) || (8 == payload) || (10 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS10_SENSOR "\":"));
+    MqttShowSensor();
+    ResponseJsonEnd();
+    if (8 == payload) {
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "8"));
+    } else {
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "10"));
+    }
+  }
+
+  if ((0 == payload) || (11 == payload)) {
+    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS11_STATUS "\":"));
+    MqttShowState();
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "11"));
+  }
+
+  if (CrashFlag()) {
+    if ((0 == payload) || (12 == payload)) {
+      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":"));
+      CrashDump();
+      ResponseJsonEnd();
+      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "12"));
+    }
+  }
+
+#ifdef USE_SCRIPT_STATUS
+  if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">U",2,mqtt_data);
+#endif
+  mqtt_data[0] = '\0';
+}
+
+void CmndState(void)
+{
+  mqtt_data[0] = '\0';
+  MqttShowState();
+  if (Settings.flag3.hass_tele_on_power) {
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
+  }
+#ifdef USE_HOME_ASSISTANT
+  if (Settings.flag.hass_discovery) {
+    HAssPublishStatus();
+  }
+#endif
+}
+
+void CmndTempOffset(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    int value = (int)(CharToFloat(XdrvMailbox.data) * 10);
+    if ((value > -127) && (value < 127)) {
+      Settings.temp_comp = value;
+    }
+  }
+  ResponseCmndFloat((float)(Settings.temp_comp) / 10, 1);
+}
+
+void CmndSleep(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 251)) {
+    Settings.sleep = XdrvMailbox.payload;
+    sleep = XdrvMailbox.payload;
+    WiFiSetSleepMode();
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.sleep, sleep);
+
+}
+
+void CmndUpgrade(void)
+{
+
+
+
+
+  if (((1 == XdrvMailbox.data_len) && (1 == XdrvMailbox.payload)) || ((XdrvMailbox.data_len >= 3) && NewerVersion(XdrvMailbox.data))) {
+    ota_state_flag = 3;
+    char stemp1[TOPSZ];
+    Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, my_version, GetOtaUrl(stemp1, sizeof(stemp1)));
+  } else {
+    Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, my_version);
+  }
+}
+
+void CmndOtaUrl(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_OTAURL, (SC_DEFAULT == Shortcut()) ? OTA_URL : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_OTAURL));
+}
+
+void CmndSeriallog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.flag.mqtt_serial = 0;
+    SetSeriallog(XdrvMailbox.payload);
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, seriallog_level);
+}
+
+void CmndRestart(void)
+{
+  switch (XdrvMailbox.payload) {
+  case 1:
+    restart_flag = 2;
+    ResponseCmndChar(D_JSON_RESTARTING);
+    break;
+  case -1:
+    CmndCrash();
+    break;
+  case -2:
+    CmndWDT();
+    break;
+  case -3:
+    CmndBlockedLoop();
+    break;
+  case 99:
+    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
+    EspRestart();
+    break;
+  default:
+    ResponseCmndChar(D_JSON_ONE_TO_RESTART);
+  }
+}
+
+void CmndPowerOnState(void)
+{
+  if (my_module_type != MOTOR) {
+
+
+
+
+
+
+
+    if ((XdrvMailbox.payload >= POWER_ALL_OFF) && (XdrvMailbox.payload <= POWER_ALL_OFF_PULSETIME_ON)) {
+      Settings.poweronstate = XdrvMailbox.payload;
+      if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+        for (uint32_t i = 1; i <= devices_present; i++) {
+          ExecuteCommandPower(i, POWER_ON, SRC_IGNORE);
+        }
+      }
+    }
+    ResponseCmndNumber(Settings.poweronstate);
+  }
+}
+
+void CmndPulsetime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PULSETIMERS)) {
+    uint32_t items = 1;
+    if (!XdrvMailbox.usridx && !XdrvMailbox.data_len) {
+      items = MAX_PULSETIMERS;
+    } else {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
+        Settings.pulse_timer[XdrvMailbox.index -1] = XdrvMailbox.payload;
+        SetPulseTimer(XdrvMailbox.index -1, XdrvMailbox.payload);
+      }
+    }
+    mqtt_data[0] = '\0';
+    for (uint32_t i = 0; i < items; i++) {
+      uint32_t index = (1 == items) ? XdrvMailbox.index : i +1;
+      ResponseAppend_P(PSTR("%c\"%s%d\":{\"" D_JSON_SET "\":%d,\"" D_JSON_REMAINING "\":%d}"),
+        (i) ? ',' : '{',
+        XdrvMailbox.command, index,
+        Settings.pulse_timer[index -1], GetPulseTimer(index -1));
+    }
+    ResponseJsonEnd();
+  }
+}
+
+void CmndBlinktime(void)
+{
+  if ((XdrvMailbox.payload > 1) && (XdrvMailbox.payload <= 3600)) {
+    Settings.blinktime = XdrvMailbox.payload;
+    if (blink_timer > 0) { blink_timer = millis() + (100 * XdrvMailbox.payload); }
+  }
+  ResponseCmndNumber(Settings.blinktime);
+}
+
+void CmndBlinkcount(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.blinkcount = XdrvMailbox.payload;
+    if (blink_counter) { blink_counter = Settings.blinkcount *2; }
+  }
+  ResponseCmndNumber(Settings.blinkcount);
+}
+
+void CmndSavedata(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3600)) {
+    Settings.save_data = XdrvMailbox.payload;
+    save_data_counter = Settings.save_data;
+  }
+  SettingsSaveAll();
+  char stemp1[TOPSZ];
+  if (Settings.save_data > 1) {
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_EVERY " %d " D_UNIT_SECOND), Settings.save_data);
+  }
+  ResponseCmndChar((Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data));
+}
+
+void CmndSetoption(void)
+{
+  if (XdrvMailbox.index < 114) {
+    uint32_t ptype;
+    uint32_t pindex;
+    if (XdrvMailbox.index <= 31) {
+      ptype = 2;
+      pindex = XdrvMailbox.index;
+    }
+    else if (XdrvMailbox.index <= 49) {
+      ptype = 1;
+      pindex = XdrvMailbox.index -32;
+    }
+    else if (XdrvMailbox.index <= 81) {
+      ptype = 3;
+      pindex = XdrvMailbox.index -50;
+    }
+    else {
+      ptype = 4;
+      pindex = XdrvMailbox.index -82;
+    }
+
+    if (XdrvMailbox.payload >= 0) {
+      if (1 == ptype) {
+        uint32_t param_low = 0;
+        uint32_t param_high = 255;
+        switch (pindex) {
+          case P_HOLD_TIME:
+          case P_MAX_POWER_RETRY:
+            param_low = 1;
+            param_high = 250;
+            break;
+        }
+        if ((XdrvMailbox.payload >= param_low) && (XdrvMailbox.payload <= param_high)) {
+          Settings.param[pindex] = XdrvMailbox.payload;
+#ifdef USE_LIGHT
+          if (P_RGB_REMAP == pindex) {
+            LightUpdateColorMapping();
+            restart_flag = 2;
+          }
+#endif
+#if (defined(USE_IR_REMOTE) && defined(USE_IR_RECEIVE)) || defined(USE_IR_REMOTE_FULL)
+          if (P_IR_UNKNOW_THRESHOLD == pindex) {
+            IrReceiveUpdateThreshold();
+          }
+#endif
+        } else {
+          ptype = 99;
+        }
+      } else {
+        if (XdrvMailbox.payload <= 1) {
+          if (2 == ptype) {
+            switch (pindex) {
+              case 5:
+              case 6:
+              case 7:
+              case 9:
+              case 14:
+              case 22:
+              case 23:
+              case 25:
+              case 27:
+                ptype = 99;
+                break;
+              case 3:
+              case 15:
+                restart_flag = 2;
+              default:
+                bitWrite(Settings.flag.data, pindex, XdrvMailbox.payload);
+            }
+            if (12 == pindex) {
+              stop_flash_rotate = XdrvMailbox.payload;
+              SettingsSave(2);
+            }
+  #ifdef USE_HOME_ASSISTANT
+            if ((19 == pindex) || (30 == pindex)) {
+              HAssDiscover();
+            }
+  #endif
+          }
+          else if (3 == ptype) {
+            bitWrite(Settings.flag3.data, pindex, XdrvMailbox.payload);
+            switch (pindex) {
+              case 5:
+                if (0 == XdrvMailbox.payload) {
+                  restart_flag = 2;
+                }
+                break;
+              case 10:
+                WiFiSetSleepMode();
+                break;
+              case 18:
+              case 25:
+                restart_flag = 2;
+                break;
+            }
+          }
+          else if (4 == ptype) {
+            bitWrite(Settings.flag4.data, pindex, XdrvMailbox.payload);
+          }
+        } else {
+          ptype = 99;
+        }
+      }
+    }
+
+    if (ptype < 99) {
+      if (1 == ptype) {
+        ResponseCmndIdxNumber(Settings.param[pindex]);
+      } else {
+        uint32_t flag = Settings.flag.data;
+        if (3 == ptype) {
+          flag = Settings.flag3.data;
+        }
+        else if (4 == ptype) {
+          flag = Settings.flag4.data;
+        }
+        ResponseCmndIdxChar(GetStateText(bitRead(flag, pindex)));
+      }
+    }
+  }
+}
+
+void CmndTemperatureResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.temperature_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.temperature_resolution);
+}
+
+void CmndHumidityResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.humidity_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.humidity_resolution);
+}
+
+void CmndPressureResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.pressure_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.pressure_resolution);
+}
+
+void CmndPowerResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.wattage_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.wattage_resolution);
+}
+
+void CmndVoltageResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.voltage_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.voltage_resolution);
+}
+
+void CmndFrequencyResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.frequency_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.frequency_resolution);
+}
+
+void CmndCurrentResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.current_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.current_resolution);
+}
+
+void CmndEnergyResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    Settings.flag2.energy_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.energy_resolution);
+}
+
+void CmndWeightResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    Settings.flag2.weight_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.weight_resolution);
+}
+
+void CmndModule(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAXMODULE)) {
+    bool present = false;
+    if (0 == XdrvMailbox.payload) {
+      XdrvMailbox.payload = USER_MODULE;
+      present = true;
+    } else {
+      XdrvMailbox.payload--;
+      present = ValidTemplateModule(XdrvMailbox.payload);
+    }
+    if (present) {
+      Settings.last_module = Settings.module;
+      Settings.module = XdrvMailbox.payload;
+      SetModuleType();
+      if (Settings.last_module != XdrvMailbox.payload) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          Settings.my_gp.io[i] = GPIO_NONE;
+        }
+      }
+      restart_flag = 2;
+    }
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, ModuleNr(), ModuleName().c_str());
+}
+
+void CmndModules(void)
+{
+  uint32_t midx = USER_MODULE;
+  uint32_t lines = 1;
+  bool jsflg = false;
+  for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
+    if (i > 0) { midx = pgm_read_byte(kModuleNiceList + i -1); }
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_MODULES "%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    uint32_t j = i ? midx +1 : 0;
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), j, AnyModuleName(midx).c_str()) > (LOGSZ - TOPSZ)) || (i == sizeof(kModuleNiceList))) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
+      jsflg = false;
+      lines++;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+void CmndGpio(void)
+{
+  if (XdrvMailbox.index < sizeof(Settings.my_gp)) {
+    myio cmodule;
+    ModuleGpios(&cmodule);
+    if (ValidGPIO(XdrvMailbox.index, cmodule.io[XdrvMailbox.index]) && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < GPIO_SENSOR_END)) {
+      bool present = false;
+      for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+        uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+        if (midx == XdrvMailbox.payload) { present = true; }
+      }
+      if (present) {
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          if (ValidGPIO(i, cmodule.io[i]) && (Settings.my_gp.io[i] == XdrvMailbox.payload)) {
+            Settings.my_gp.io[i] = GPIO_NONE;
+          }
+        }
+        Settings.my_gp.io[XdrvMailbox.index] = XdrvMailbox.payload;
+        restart_flag = 2;
+      }
+    }
+    Response_P(PSTR("{"));
+    bool jsflg = false;
+    for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+      if (ValidGPIO(i, cmodule.io[i]) || ((GPIO_USER == XdrvMailbox.payload) && !FlashPin(i))) {
+        if (jsflg) { ResponseAppend_P(PSTR(",")); }
+        jsflg = true;
+        uint8_t sensor_type = Settings.my_gp.io[i];
+        if (!ValidGPIO(i, cmodule.io[i])) {
+          sensor_type = cmodule.io[i];
+          if (GPIO_USER == sensor_type) {
+            sensor_type = GPIO_NONE;
+          }
+        }
+        uint8_t sensor_name_idx = sensor_type;
+        const char *sensor_names = kSensorNames;
+        if (sensor_type > GPIO_FIX_START) {
+          sensor_name_idx = sensor_type - GPIO_FIX_START -1;
+          sensor_names = kSensorNamesFixed;
+        }
+        char stemp1[TOPSZ];
+        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s\"}"),
+          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names));
+      }
+    }
+    if (jsflg) {
+      ResponseJsonEnd();
+    } else {
+      ResponseCmndChar(D_JSON_NOT_SUPPORTED);
+    }
+  }
+}
+
+void CmndGpios(void)
+{
+  myio cmodule;
+  ModuleGpios(&cmodule);
+  uint32_t lines = 1;
+  bool jsflg = false;
+  for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+    uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+    if ((XdrvMailbox.payload != 255) && GetUsedInModule(midx, cmodule.io)) { continue; }
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_GPIOS "%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    char stemp1[TOPSZ];
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), midx, GetTextIndexed(stemp1, sizeof(stemp1), midx, kSensorNames)) > (LOGSZ - TOPSZ)) || (i == sizeof(kGpioNiceList) -1)) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
+      jsflg = false;
+      lines++;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+void CmndTemplate(void)
+{
+
+  bool error = false;
+
+  if (strstr(XdrvMailbox.data, "{") == nullptr) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= MAXMODULE)) {
+      XdrvMailbox.payload--;
+      if (ValidTemplateModule(XdrvMailbox.payload)) {
+        ModuleDefault(XdrvMailbox.payload);
+        if (USER_MODULE == Settings.module) { restart_flag = 2; }
+      }
+    }
+    else if (0 == XdrvMailbox.payload) {
+      if (Settings.module != USER_MODULE) {
+        ModuleDefault(Settings.module);
+      }
+    }
+    else if (255 == XdrvMailbox.payload) {
+      if (Settings.module != USER_MODULE) {
+        ModuleDefault(Settings.module);
+      }
+      snprintf_P(Settings.user_template.name, sizeof(Settings.user_template.name), PSTR("Merged"));
+      uint32_t j = 0;
+      for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
+        if (6 == i) { j = 9; }
+        if (8 == i) { j = 12; }
+        if (my_module.io[j] > GPIO_NONE) {
+          Settings.user_template.gp.io[i] = my_module.io[j];
+        }
+        j++;
+      }
+    }
+  }
+  else {
+    if (JsonTemplate(XdrvMailbox.data)) {
+      if (USER_MODULE == Settings.module) { restart_flag = 2; }
+    } else {
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      error = true;
+    }
+  }
+  if (!error) { TemplateJson(); }
+}
+
+void CmndPwm(void)
+{
+  if (pwm_present && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PWMS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= Settings.pwm_range) && (pin[GPIO_PWM1 + XdrvMailbox.index -1] < 99)) {
+      Settings.pwm_value[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      analogWrite(pin[GPIO_PWM1 + XdrvMailbox.index -1], bitRead(pwm_inverted, XdrvMailbox.index -1) ? Settings.pwm_range - XdrvMailbox.payload : XdrvMailbox.payload);
+    }
+    Response_P(PSTR("{"));
+    MqttShowPWMState();
+    ResponseJsonEnd();
+  }
+}
+
+void CmndPwmfrequency(void)
+{
+  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload >= PWM_MIN) && (XdrvMailbox.payload <= PWM_MAX))) {
+    Settings.pwm_frequency = (1 == XdrvMailbox.payload) ? PWM_FREQ : XdrvMailbox.payload;
+    analogWriteFreq(Settings.pwm_frequency);
+  }
+  ResponseCmndNumber(Settings.pwm_frequency);
+}
+
+void CmndPwmrange(void)
+{
+  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload > 254) && (XdrvMailbox.payload < 1024))) {
+    Settings.pwm_range = (1 == XdrvMailbox.payload) ? PWM_RANGE : XdrvMailbox.payload;
+    for (uint32_t i = 0; i < MAX_PWMS; i++) {
+      if (Settings.pwm_value[i] > Settings.pwm_range) {
+        Settings.pwm_value[i] = Settings.pwm_range;
+      }
+    }
+    analogWriteRange(Settings.pwm_range);
+  }
+  ResponseCmndNumber(Settings.pwm_range);
+}
+
+void CmndButtonDebounce(void)
+{
+  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
+    Settings.button_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.button_debounce);
+}
+
+void CmndSwitchDebounce(void)
+{
+  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
+    Settings.switch_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.switch_debounce);
+}
+
+void CmndBaudrate(void)
+{
+  if (XdrvMailbox.payload >= 300) {
+    XdrvMailbox.payload /= 300;
+    uint32_t baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
+    SetSerialBaudrate(baudrate);
+  }
+  ResponseCmndNumber(Settings.baudrate * 300);
+}
+
+void CmndSerialConfig(void)
+{
+
+
+
+
+  if (XdrvMailbox.data_len > 0) {
+    if (XdrvMailbox.data_len < 3) {
+      if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2)) {
+        SetSerialConfig(XdrvMailbox.payload);
+      }
+    }
+    else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8)) {
+      uint8_t serial_config = XdrvMailbox.payload -5;
+
+      bool valid = true;
+      char parity = (XdrvMailbox.data[1] & 0xdf);
+      if ('E' == parity) {
+        serial_config += 0x08;
+      }
+      else if ('O' == parity) {
+        serial_config += 0x10;
+      }
+      else if ('N' != parity) {
+        valid = false;
+      }
+
+      if ('2' == XdrvMailbox.data[2]) {
+        serial_config += 0x04;
+      }
+      else if ('1' != XdrvMailbox.data[2]) {
+        valid = false;
+      }
+
+      if (valid) {
+        SetSerialConfig(serial_config);
+      }
+    }
+  }
+  ResponseCmndChar(GetSerialConfig().c_str());
+}
+
+void CmndSerialSend(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
+    SetSeriallog(LOG_LEVEL_NONE);
+    Settings.flag.mqtt_serial = 1;
+    Settings.flag.mqtt_serial_raw = (XdrvMailbox.index > 3) ? 1 : 0;
+    if (XdrvMailbox.data_len > 0) {
+      if (1 == XdrvMailbox.index) {
+        Serial.printf("%s\n", XdrvMailbox.data);
+      }
+      else if (2 == XdrvMailbox.index || 4 == XdrvMailbox.index) {
+        for (uint32_t i = 0; i < XdrvMailbox.data_len; i++) {
+          Serial.write(XdrvMailbox.data[i]);
+        }
+      }
+      else if (3 == XdrvMailbox.index) {
+        uint32_t dat_len = XdrvMailbox.data_len;
+        Serial.printf("%s", Unescape(XdrvMailbox.data, &dat_len));
+      }
+      else if (5 == XdrvMailbox.index) {
+        SerialSendRaw(RemoveSpace(XdrvMailbox.data));
+      }
+      ResponseCmndDone();
+    }
+  }
+}
+
+void CmndSerialDelimiter(void)
+{
+  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload < 256)) {
+    if (XdrvMailbox.payload > 0) {
+      Settings.serial_delimiter = XdrvMailbox.payload;
+    } else {
+      uint32_t dat_len = XdrvMailbox.data_len;
+      Unescape(XdrvMailbox.data, &dat_len);
+      Settings.serial_delimiter = XdrvMailbox.data[0];
+    }
+  }
+  ResponseCmndNumber(Settings.serial_delimiter);
+}
+
+void CmndSyslog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    SetSyslog(XdrvMailbox.payload);
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.syslog_level, syslog_level);
+}
+
+void CmndLoghost(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_SYSLOG_HOST, (SC_DEFAULT == Shortcut()) ? SYS_LOG_HOST : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_SYSLOG_HOST));
+}
+
+void CmndLogport(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.syslog_port = (1 == XdrvMailbox.payload) ? SYS_LOG_PORT : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.syslog_port);
+}
+
+void CmndIpAddress(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+    uint32_t address;
+    if (ParseIp(&address, XdrvMailbox.data)) {
+      Settings.ip_address[XdrvMailbox.index -1] = address;
+
+    }
+    char stemp1[TOPSZ];
+    snprintf_P(stemp1, sizeof(stemp1), PSTR(" (%s)"), WiFi.localIP().toString().c_str());
+    Response_P(S_JSON_COMMAND_INDEX_SVALUE_SVALUE, XdrvMailbox.command, XdrvMailbox.index, IPAddress(Settings.ip_address[XdrvMailbox.index -1]).toString().c_str(), (1 == XdrvMailbox.index) ? stemp1:"");
+  }
+}
+
+void CmndNtpServer(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_NTP_SERVERS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_NTPSERVER1, MAX_NTP_SERVERS);
+    } else {
+      uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(ntp_server,
+          (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
+        SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
+
+        ntp_force_sync = true;
+      }
+      ResponseCmndIdxChar(SettingsText(ntp_server));
+    }
+  }
+}
+
+void CmndAp(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    switch (XdrvMailbox.payload) {
+    case 0:
+      Settings.sta_active ^= 1;
+      break;
+    case 1:
+    case 2:
+      Settings.sta_active = XdrvMailbox.payload -1;
+    }
+    restart_flag = 2;
+  }
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active));
+}
+
+void CmndSsid(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SSIDS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STASSID1, MAX_SSIDS);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
+                (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
+        Settings.sta_active = XdrvMailbox.index -1;
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndPassword(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    if ((XdrvMailbox.data_len > 4) || (SC_CLEAR == Shortcut()) || (SC_DEFAULT == Shortcut())) {
+      SettingsUpdateText(SET_STAPWD1 + XdrvMailbox.index -1,
+              (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_PASS1 : STA_PASS2 : XdrvMailbox.data);
+      Settings.sta_active = XdrvMailbox.index -1;
+      restart_flag = 2;
+      ResponseCmndIdxChar(SettingsText(SET_STAPWD1 + XdrvMailbox.index -1));
+    } else {
+      Response_P(S_JSON_COMMAND_INDEX_ASTERISK, XdrvMailbox.command, XdrvMailbox.index);
+    }
+  }
+}
+
+void CmndHostname(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    SettingsUpdateText(SET_HOSTNAME, (SC_DEFAULT == Shortcut()) ? WIFI_HOSTNAME : XdrvMailbox.data);
+    if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+      SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+    }
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_HOSTNAME));
+}
+
+void CmndWifiConfig(void)
+{
+  if ((XdrvMailbox.payload >= WIFI_RESTART) && (XdrvMailbox.payload < MAX_WIFI_OPTION)) {
+    if ((EX_WIFI_SMARTCONFIG == XdrvMailbox.payload) || (EX_WIFI_WPSCONFIG == XdrvMailbox.payload)) {
+      XdrvMailbox.payload = WIFI_MANAGER;
+    }
+    Settings.sta_config = XdrvMailbox.payload;
+    wifi_state_flag = Settings.sta_config;
+    if (WifiState() > WIFI_RESTART) {
+      restart_flag = 2;
+    }
+  }
+  char stemp1[TOPSZ];
+  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_config, GetTextIndexed(stemp1, sizeof(stemp1), Settings.sta_config, kWifiConfig));
+}
+
+void CmndFriendlyname(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_FRIENDLYNAMES)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_FRIENDLYNAME1, MAX_FRIENDLYNAMES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        char stemp1[TOPSZ];
+        if (1 == XdrvMailbox.index) {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
+        } else {
+          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
+        }
+        SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndSwitchMode(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SWITCHES)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_SWITCH_OPTION)) {
+      Settings.switchmode[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.switchmode[XdrvMailbox.index-1]);
+  }
+}
+
+void CmndInterlock(void)
+{
+
+  uint32_t max_relays = devices_present;
+  if (light_type) { max_relays--; }
+  if (max_relays > sizeof(Settings.interlock[0]) * 8) { max_relays = sizeof(Settings.interlock[0]) * 8; }
+  if (max_relays > 1) {
+    if (XdrvMailbox.data_len > 0) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
+        char *group;
+        char *q;
+        uint32_t group_index = 0;
+        power_t relay_mask = 0;
+        for (group = strtok_r(XdrvMailbox.data, " ", &q); group && group_index < MAX_INTERLOCKS; group = strtok_r(nullptr, " ", &q)) {
+          char *str;
+          char *p;
+          for (str = strtok_r(group, ",", &p); str; str = strtok_r(nullptr, ",", &p)) {
+            int pbit = atoi(str);
+            if ((pbit > 0) && (pbit <= max_relays)) {
+              pbit--;
+              if (!bitRead(relay_mask, pbit)) {
+                bitSet(relay_mask, pbit);
+                bitSet(Settings.interlock[group_index], pbit);
+              }
+            }
+          }
+          group_index++;
+        }
+        for (uint32_t i = 0; i < group_index; i++) {
+          uint32_t minimal_bits = 0;
+          for (uint32_t j = 0; j < max_relays; j++) {
+            if (bitRead(Settings.interlock[i], j)) { minimal_bits++; }
+          }
+          if (minimal_bits < 2) { Settings.interlock[i] = 0; }
+        }
+      } else {
+        Settings.flag.interlock = XdrvMailbox.payload &1;
+        if (Settings.flag.interlock) {
+          SetDevicePower(power, SRC_IGNORE);
+        }
+      }
+#ifdef USE_SHUTTER
+      if (Settings.flag3.shutter_mode) {
+        ShutterInit();
+      }
+#endif
+    }
+    Response_P(PSTR("{\"" D_CMND_INTERLOCK "\":\"%s\",\"" D_JSON_GROUPS "\":\""), GetStateText(Settings.flag.interlock));
+    uint32_t anygroup = 0;
+    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+      if (Settings.interlock[i]) {
+        anygroup++;
+        ResponseAppend_P(PSTR("%s"), (anygroup > 1) ? " " : "");
+        uint32_t anybit = 0;
+        power_t mask = 1;
+        for (uint32_t j = 0; j < max_relays; j++) {
+          if (Settings.interlock[i] & mask) {
+            anybit++;
+            ResponseAppend_P(PSTR("%s%d"), (anybit > 1) ? "," : "", j +1);
+          }
+          mask <<= 1;
+        }
+      }
+    }
+    if (!anygroup) {
+      for (uint32_t j = 1; j <= max_relays; j++) {
+        ResponseAppend_P(PSTR("%s%d"), (j > 1) ? "," : "", j);
+      }
+    }
+    ResponseAppend_P(PSTR("\"}"));
+  } else {
+    Settings.flag.interlock = 0;
+    ResponseCmndStateText(Settings.flag.interlock);
+  }
+}
+
+void CmndTeleperiod(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.tele_period = (1 == XdrvMailbox.payload) ? TELE_PERIOD : XdrvMailbox.payload;
+    if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) Settings.tele_period = 10;
+    tele_period = Settings.tele_period;
+  }
+  ResponseCmndNumber(Settings.tele_period);
+}
+
+void CmndReset(void)
+{
+  switch (XdrvMailbox.payload) {
+  case 1:
+    restart_flag = 211;
+    ResponseCmndChar(D_JSON_RESET_AND_RESTARTING);
+    break;
+  case 2 ... 6:
+    restart_flag = 210 + XdrvMailbox.payload;
+    Response_P(PSTR("{\"" D_CMND_RESET "\":\"" D_JSON_ERASE ", " D_JSON_RESET_AND_RESTARTING "\"}"));
+    break;
+  case 99:
+    Settings.bootcount = 0;
+    Settings.bootcount_reset_time = 0;
+    ResponseCmndDone();
+    break;
+  default:
+    ResponseCmndChar(D_JSON_ONE_TO_RESET);
+  }
+}
+
+void CmndTime(void)
+{
+
+
+
+
+
+
+
+  uint32_t format = Settings.flag2.time_format;
+  if (XdrvMailbox.data_len > 0) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
+      Settings.flag2.time_format = XdrvMailbox.payload -1;
+      format = Settings.flag2.time_format;
+    } else {
+      format = 1;
+      RtcSetTime(XdrvMailbox.payload);
+    }
+  }
+  mqtt_data[0] = '\0';
+  ResponseAppendTimeFormat(format);
+  ResponseJsonEnd();
+}
+
+void CmndTimezone(void)
+{
+  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload >= -13)) {
+    Settings.timezone = XdrvMailbox.payload;
+    Settings.timezone_minutes = 0;
+    if (XdrvMailbox.payload < 15) {
+      char *p = strtok (XdrvMailbox.data, ":");
+      if (p) {
+        p = strtok (nullptr, ":");
+        if (p) {
+          Settings.timezone_minutes = strtol(p, nullptr, 10);
+          if (Settings.timezone_minutes > 59) { Settings.timezone_minutes = 59; }
+        }
+      }
+    } else {
+      Settings.timezone = 99;
+    }
+    ntp_force_sync = true;
+  }
+  if (99 == Settings.timezone) {
+    ResponseCmndNumber(Settings.timezone);
+  } else {
+    char stemp1[TOPSZ];
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("%+03d:%02d"), Settings.timezone, Settings.timezone_minutes);
+    ResponseCmndChar(stemp1);
+  }
+}
+
+void CmndTimeStdDst(uint32_t ts)
+{
+
+  if (XdrvMailbox.data_len > 0) {
+    if (strstr(XdrvMailbox.data, ",") != nullptr) {
+      uint32_t tpos = 0;
+      int value = 0;
+      char *p = XdrvMailbox.data;
+      char *q = p;
+      while (p && (tpos < 7)) {
+        if (p > q) {
+          if (1 == tpos) { Settings.tflag[ts].hemis = value &1; }
+          if (2 == tpos) { Settings.tflag[ts].week = (value < 0) ? 0 : (value > 4) ? 4 : value; }
+          if (3 == tpos) { Settings.tflag[ts].month = (value < 1) ? 1 : (value > 12) ? 12 : value; }
+          if (4 == tpos) { Settings.tflag[ts].dow = (value < 1) ? 1 : (value > 7) ? 7 : value; }
+          if (5 == tpos) { Settings.tflag[ts].hour = (value < 0) ? 0 : (value > 23) ? 23 : value; }
+          if (6 == tpos) { Settings.toffset[ts] = (value < -900) ? -900 : (value > 900) ? 900 : value; }
+        }
+        p = Trim(p);
+        if (tpos && (*p == ',')) { p++; }
+        p = Trim(p);
+        q = p;
+        value = strtol(p, &p, 10);
+        tpos++;
+      }
+      ntp_force_sync = true;
+    } else {
+      if (0 == XdrvMailbox.payload) {
+        if (0 == ts) {
+          SettingsResetStd();
+        } else {
+          SettingsResetDst();
+        }
+      }
+      ntp_force_sync = true;
+    }
+  }
+  Response_P(PSTR("{\"%s\":{\"Hemisphere\":%d,\"Week\":%d,\"Month\":%d,\"Day\":%d,\"Hour\":%d,\"Offset\":%d}}"),
+    XdrvMailbox.command, Settings.tflag[ts].hemis, Settings.tflag[ts].week, Settings.tflag[ts].month, Settings.tflag[ts].dow, Settings.tflag[ts].hour, Settings.toffset[ts]);
+}
+
+void CmndTimeStd(void)
+{
+  CmndTimeStdDst(0);
+}
+
+void CmndTimeDst(void)
+{
+  CmndTimeStdDst(1);
+}
+
+void CmndAltitude(void)
+{
+  if ((XdrvMailbox.data_len > 0) && ((XdrvMailbox.payload >= -30000) && (XdrvMailbox.payload <= 30000))) {
+    Settings.altitude = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.altitude);
+}
+
+void CmndLedPower(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_LEDS)) {
+    if (99 == pin[GPIO_LEDLNK]) { XdrvMailbox.index = 1; }
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+      Settings.ledstate &= 8;
+      uint32_t mask = 1 << (XdrvMailbox.index -1);
+      switch (XdrvMailbox.payload) {
+      case 0:
+        led_power &= (0xFF ^ mask);
+        Settings.ledstate = 0;
+        break;
+      case 1:
+        led_power |= mask;
+        Settings.ledstate = 8;
+        break;
+      case 2:
+        led_power ^= mask;
+        Settings.ledstate ^= 8;
+        break;
+      }
+      blinks = 0;
+      if (99 == pin[GPIO_LEDLNK]) {
+        SetLedPower(Settings.ledstate &8);
+      } else {
+        SetLedPowerIdx(XdrvMailbox.index -1, (led_power & mask));
+      }
+    }
+    bool state = bitRead(led_power, XdrvMailbox.index -1);
+    if (99 == pin[GPIO_LEDLNK]) {
+      state = bitRead(Settings.ledstate, 3);
+    }
+    ResponseCmndIdxChar(GetStateText(state));
+  }
+}
+
+void CmndLedState(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_LED_OPTION)) {
+    Settings.ledstate = XdrvMailbox.payload;
+    if (!Settings.ledstate) {
+      SetLedPowerAll(0);
+      SetLedLink(0);
+    }
+  }
+  ResponseCmndNumber(Settings.ledstate);
+}
+
+void CmndLedMask(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Settings.ledmask = XdrvMailbox.payload;
+  }
+  char stemp1[TOPSZ];
+  snprintf_P(stemp1, sizeof(stemp1), PSTR("%d (0x%04X)"), Settings.ledmask, Settings.ledmask);
+  ResponseCmndChar(stemp1);
+}
+
+void CmndWifiPower(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Settings.wifi_output_power = (uint8_t)(CharToFloat(XdrvMailbox.data) * 10);
+    if (Settings.wifi_output_power > 205) {
+      Settings.wifi_output_power = 205;
+    }
+    WifiSetOutputPower();
+  }
+  ResponseCmndChar(WifiGetOutputPower().c_str());
+}
+
+#ifdef USE_I2C
+void CmndI2cScan(void)
+{
+  if (i2c_flg) {
+    I2cScan(mqtt_data, sizeof(mqtt_data));
+  }
+}
+
+void CmndI2cDriver(void)
+{
+  if (XdrvMailbox.index < MAX_I2C_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.i2c_drivers[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+      restart_flag = 2;
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_I2CDRIVER "\":"));
+  I2cDriverState();
+  ResponseJsonEnd();
+}
+#endif
+
+#ifdef USE_DEVICE_GROUPS
+void CmndDevGroupShare(void)
+{
+  uint32_t parm[2] = { Settings.device_group_share_in, Settings.device_group_share_out };
+  ParseParameters(2, parm);
+  Settings.device_group_share_in = parm[0];
+  Settings.device_group_share_out = parm[1];
+  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%x,\"Out\":%x}}"), Settings.device_group_share_in, Settings.device_group_share_out);
+}
+#endif
+
+void CmndSensor(void)
+{
+  XsnsCall(FUNC_COMMAND_SENSOR);
+}
+
+void CmndDriver(void)
+{
+  XdrvCall(FUNC_COMMAND_DRIVER);
+}
+# 1 "S:/Development/Tasmota/tasmota/support_crash_recorder.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_crash_recorder.ino"
+const uint32_t crash_magic = 0x53415400;
+const uint32_t crash_rtc_offset = 32;
+const uint32_t crash_dump_max_len = 31;
+
+
+
+
+
+
+extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack, uint32_t stack_end )
+{
+  uint32_t addr_written = 0;
+  uint32_t value;
+
+  for (uint32_t i = stack; i < stack_end; i += 4) {
+    value = *((uint32_t*) i);
+    if ((value >= 0x40000000) && (value < 0x40300000)) {
+      ESP.rtcUserMemoryWrite(crash_rtc_offset + addr_written, (uint32_t*)&value, sizeof(value));
+      addr_written++;
+      if (addr_written >= crash_dump_max_len) { break; }
+    }
+  }
+  value = crash_magic + addr_written;
+  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+}
+
+
+void CmndCrash(void)
+{
+  volatile uint32_t dummy;
+  dummy = *((uint32_t*) 0x00000000);
+}
+
+
+void CmndWDT(void)
+{
+  volatile uint32_t dummy = 0;
+  while (1) {
+    dummy++;
+  }
+}
+
+
+void CmndBlockedLoop(void)
+{
+  while (1) {
+    delay(1000);
+  }
+}
+
+
+void CrashDumpClear(void)
+{
+  uint32_t value = 0;
+  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+}
+
+
+
+
+
+bool CrashFlag(void)
+{
+  return ((ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST) || oswatch_blocked_loop);
+}
+
+void CrashDump(void)
+{
+  ResponseAppend_P(PSTR("{\"Exception\":%d,\"Reason\":\"%s\",\"EPC\":[\"%08x\",\"%08x\",\"%08x\"],\"EXCVADDR\":\"%08x\",\"DEPC\":\"%08x\""),
+    resetInfo.exccause,
+    GetResetReason().c_str(),
+    resetInfo.epc1,
+    resetInfo.epc2,
+    resetInfo.epc3,
+    resetInfo.excvaddr,
+    resetInfo.depc);
+
+  uint32_t value;
+  ESP.rtcUserMemoryRead(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
+  if (crash_magic == (value & 0xFFFFFF00)) {
+    ResponseAppend_P(PSTR(",\"CallChain\":["));
+    uint32_t count = value & 0x3F;
+    for (uint32_t i = 0; i < count; i++) {
+      ESP.rtcUserMemoryRead(crash_rtc_offset +i, (uint32_t*)&value, sizeof(value));
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"%08x\""), value);
+    }
+    ResponseAppend_P(PSTR("]"));
+  }
+
+  ResponseJsonEnd();
+}
+# 1 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
+# 23 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
+#ifdef USE_DEVICE_GROUPS
+
+
+
+extern bool udp_connected;
+
+struct device_group_member {
+  struct device_group_member * flink;
+  IPAddress ip_address;
+  uint32_t timeout_time;
+  uint16_t received_sequence;
+  uint16_t acked_sequence;
+};
+
+struct device_group {
+  uint32_t next_ack_check_time;
+  uint16_t last_full_status_sequence;
+  uint16_t message_length;
+  uint8_t message_header_length;
+  uint8_t initial_status_requests_remaining;
+  bool local;
+  char group_name[TOPSZ];
+  char message[128];
+  uint8_t group_member_count;
+  struct device_group_member * device_group_members;
+};
+
+struct device_group * device_groups;
+uint16_t outgoing_sequence = 0;
+bool device_groups_initialized = false;
+bool device_groups_initialization_failed = false;
+bool building_status_message = false;
+bool processing_remote_device_message = false;
+bool waiting_for_acks;
+bool udp_was_connected = false;
+
+void DeviceGroupsInit(void)
+{
+
+  device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
+  if (device_groups == nullptr) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating %u-element device group array"), device_group_count);
+    device_groups_initialization_failed = true;
+    return;
+  }
+
+  for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+    struct device_group * device_group = &device_groups[device_group_index];
+    strcpy(device_group->group_name, SettingsText((device_group_index == 0 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + device_group_index - 1)));
+    device_group->message_header_length = sprintf_P(device_group->message, PSTR("%s%s HTTP/1.1\n\n"), kDeviceGroupMessage, device_group->group_name);
+    device_group->last_full_status_sequence = -1;
+  }
+
+  device_groups[0].local = true;
+
+
+  if (!Settings.device_group_share_in && !Settings.device_group_share_out) {
+    Settings.device_group_share_in = Settings.device_group_share_out = 0xffffffff;
+  }
+
+  device_groups_initialized = true;
+}
+
+char * IPAddressToString(const IPAddress& ip_address)
+{
+  static char buffer[16];
+  sprintf_P(buffer, PSTR("%u.%u.%u.%u"), ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
+  return buffer;
+}
+
+
+bool DeviceGroupItemShared(bool incoming, uint8_t item)
+{
+  uint8_t mask = 0;
+  switch (item) {
+    case DGR_ITEM_LIGHT_BRI:
+      mask = DGR_SHARE_LIGHT_BRI;
+      break;
+    case DGR_ITEM_POWER:
+      mask = DGR_SHARE_POWER;
+      break;
+    case DGR_ITEM_LIGHT_SCHEME:
+      mask = DGR_SHARE_LIGHT_SCHEME;
+      break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+    case DGR_ITEM_LIGHT_CHANNELS:
+      mask = DGR_SHARE_LIGHT_COLOR;
+      break;
+    case DGR_ITEM_LIGHT_FADE:
+    case DGR_ITEM_LIGHT_SPEED:
+      mask = DGR_SHARE_LIGHT_FADE;
+      break;
+    case DGR_ITEM_BRI_MIN:
+      mask = DGR_SHARE_BRI_MIN;
+      break;
+  }
+  return (!mask || ((incoming ? Settings.device_group_share_in : Settings.device_group_share_out) & mask));
+}
+
+void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * label)
+{
+  for (int attempt = 1; attempt <= 5; attempt++) {
+    if (PortUdp.beginPacket(ip, 1900)) {
+      PortUdp.write(packet, len);
+      if (PortUdp.endPacket()) return;
+    }
+    delay(10);
+  }
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error sending %s packet"), label);
+}
+
+void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
+{
+
+  if (!Settings.flag4.device_groups_enabled) return;
+
+
+  if (!udp_connected) return;
+
+
+  if (processing_remote_device_message) return;
+
+
+  device_group * device_group = &device_groups[device_group_index];
+
+
+  if (device_group->initial_status_requests_remaining) return;
+
+
+
+
+  char * message_ptr = &device_group->message[device_group->message_header_length];
+  if (message_type == DGR_MSGTYP_FULL_STATUS) {
+
+
+
+    building_status_message = true;
+
+
+    if (!++outgoing_sequence) outgoing_sequence = 1;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s full status packet"), device_group->group_name);
+#endif
+    device_group->message_length = 0;
+    SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
+    XdrvMailbox.command_code = DGR_ITEM_STATUS;
+    XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+    building_status_message = false;
+
+
+    if (!device_group->message_length) {
+      if (!--outgoing_sequence) outgoing_sequence = -1;
+      return;
+    }
+    device_group->last_full_status_sequence = outgoing_sequence;
+
+
+    *(message_ptr + 2) |= DGR_FLAG_FULL_STATUS;
+  }
+
+  else {
+    bool shared;
+    uint8_t item;
+    uint32_t value;
+    uint8_t * value_ptr;
+    va_list ap;
+
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s packet"), device_group->group_name);
+#endif
+    uint16_t original_sequence = outgoing_sequence;
+    if (!building_status_message && message_type != DGR_MSGTYP_PARTIAL_UPDATE && !++outgoing_sequence) outgoing_sequence = 1;
+    *message_ptr++ = outgoing_sequence & 0xff;
+    *message_ptr++ = outgoing_sequence >> 8;
+
+    value = 0;
+    if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME)
+      value |= DGR_FLAG_MORE_TO_COME;
+    else if (message_type == DGR_MSGTYP_UPDATE_DIRECT)
+      value |= DGR_FLAG_DIRECT;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">sequence=%u, flags=%u"), outgoing_sequence, value);
+#endif
+    *message_ptr++ = value & 0xff;
+    *message_ptr++ = value >> 8;
+    char * first_item_ptr = message_ptr;
+
+
+
+
+
+    if (device_group->message_length) {
+      uint8_t item_array[32];
+      int item_index = 0;
+      int kept_item_count = 0;
+
+
+      va_start(ap, message_type);
+      while ((item = va_arg(ap, int))) {
+        item_array[item_index++] = item;
+        if (item <= DGR_ITEM_MAX_32BIT)
+          va_arg(ap, int);
+        else if (item <= DGR_ITEM_MAX_STRING)
+          va_arg(ap, char *);
+        else {
+          switch (item) {
+            case DGR_ITEM_LIGHT_CHANNELS:
+              va_arg(ap, uint8_t *) ;
+              break;
+          }
+        }
+      }
+      va_end(ap);
+      item_array[item_index] = 0;
+
+
+
+      char * previous_message_ptr = message_ptr;
+      while (item = *previous_message_ptr++) {
+
+
+        for (item_index = 0; item_array[item_index]; item_index++) {
+          if (item_array[item_index] == item) break;
+        }
+
+
+        if (item_array[item_index]) {
+          if (item <= DGR_ITEM_MAX_32BIT) {
+            previous_message_ptr++;
+            if (item > DGR_ITEM_MAX_8BIT) {
+              previous_message_ptr++;
+              if (item > DGR_ITEM_MAX_16BIT) {
+                previous_message_ptr++;
+                previous_message_ptr++;
+              }
+            }
+          }
+          else if (item <= DGR_ITEM_MAX_STRING)
+            previous_message_ptr += *previous_message_ptr++;
+          else {
+            switch (item) {
+              case DGR_ITEM_LIGHT_CHANNELS:
+                previous_message_ptr += 5;
+                break;
+            }
+          }
+        }
+
+
+        else {
+          *message_ptr++ = item;
+          if (item <= DGR_ITEM_MAX_32BIT) {
+            *message_ptr++ = *previous_message_ptr++;
+            if (item > DGR_ITEM_MAX_8BIT) {
+              *message_ptr++ = *previous_message_ptr++;
+              if (item > DGR_ITEM_MAX_16BIT) {
+                *message_ptr++ = *previous_message_ptr++;
+                *message_ptr++ = *previous_message_ptr++;
+              }
+            }
+          }
+          else if (item <= DGR_ITEM_MAX_STRING) {
+            *message_ptr++ = value = *previous_message_ptr++;
+            memmove(message_ptr, previous_message_ptr, value);
+            previous_message_ptr += value;
+            message_ptr += value;
+          }
+          else {
+            switch (item) {
+              case DGR_ITEM_LIGHT_CHANNELS:
+                memmove(message_ptr, previous_message_ptr, 5);
+                previous_message_ptr += 5;
+                message_ptr += 5;
+                break;
+            }
+          }
+          kept_item_count++;
+        }
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
+#endif
+    }
+
+
+    va_start(ap, message_type);
+    while ((item = va_arg(ap, int))) {
+      shared = DeviceGroupItemShared(false, item);
+      if (shared) *message_ptr++ = item;
+      if (item <= DGR_ITEM_MAX_32BIT) {
+        value = va_arg(ap, int);
+        if (shared) {
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u"), item, value);
+#endif
+          *message_ptr++ = value & 0xff;
+          if (item > DGR_ITEM_MAX_8BIT) {
+            value >>= 8;
+            *message_ptr++ = value & 0xff;
+          }
+          if (item > DGR_ITEM_MAX_16BIT) {
+            value >>= 8;
+            *message_ptr++ = value & 0xff;
+            *message_ptr++ = value >> 8;
+          }
+        }
+      }
+      else if (item <= DGR_ITEM_MAX_STRING) {
+        value_ptr = va_arg(ap, uint8_t *);
+        if (shared) {
+          value = strlen((const char *)value_ptr);
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%s"), item, value_ptr);
+#endif
+          *message_ptr++ = value;
+          memcpy(message_ptr, value_ptr, value);
+          message_ptr += value;
+        }
+      }
+      else {
+        switch (item) {
+          case DGR_ITEM_LIGHT_CHANNELS:
+            value_ptr = va_arg(ap, uint8_t *);
+            if (shared) {
+#ifdef DEVICE_GROUPS_DEBUG
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u,%u,%u,%u,%u"), item, *value_ptr, *(value_ptr + 1), *(value_ptr + 2), *(value_ptr + 3), *(value_ptr + 4));
+#endif
+              memmove(message_ptr, value_ptr, 5);
+              message_ptr += 5;
+            }
+            break;
+        }
+      }
+    }
+    va_end(ap);
+
+
+
+    if (message_ptr == first_item_ptr) {
+      outgoing_sequence = original_sequence;
+      return;
+    }
+
+
+    *message_ptr++ = 0;
+    device_group->message_length = message_ptr - device_group->message;
+
+
+    if (building_status_message || message_type == DGR_MSGTYP_PARTIAL_UPDATE) return;
+  }
+
+
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via multicast, sequence=%u"), device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
+#endif
+  SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Multicast"));
+  device_group->next_ack_check_time = millis() + 100;
+
+  if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME) {
+    for (struct device_group_member * device_group_member = device_group->device_group_members; device_group_member != nullptr; device_group_member = device_group_member->flink) {
+      device_group_member->acked_sequence = outgoing_sequence;
+    }
+  }
+  else {
+    waiting_for_acks = true;
+  }
+}
+
+void ProcessDeviceGroupMessage(char * packet, int packet_length)
+{
+
+  char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
+  char * message_ptr = strchr(message_group_name, ' ');
+  if (message_ptr == nullptr) return;
+  *message_ptr = 0;
+
+
+  struct device_group * device_group;
+  uint32_t device_group_index = 0;
+  for (;;) {
+    device_group = &device_groups[device_group_index];
+    if (!strcmp(message_group_name, device_group->group_name)) break;
+    if (++device_group_index >= device_group_count) return;
+  }
+  *message_ptr++ = ' ';
+
+
+  IPAddress remote_ip = PortUdp.remoteIP();
+  struct device_group_member * * flink = &device_group->device_group_members;
+  struct device_group_member * device_group_member;
+  for (;;) {
+    device_group_member = *flink;
+    if (!device_group_member) {
+      device_group_member = (struct device_group_member *)calloc(1, sizeof(struct device_group_member));
+      if (device_group_member == nullptr) {
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating device group member block"));
+        return;
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: adding member %s (%p)"), IPAddressToString(remote_ip), device_group_member);
+#endif
+      device_group_member->ip_address = remote_ip;
+      *flink = device_group_member;
+      break;
+    }
+    else if (device_group_member->ip_address == remote_ip) {
+      break;
+    }
+    flink = &device_group_member->flink;
+  }
+
+
+  message_ptr = strstr_P(message_ptr, PSTR("\n\n"));
+  if (message_ptr == nullptr) return;
+  message_ptr += 2;
+
+  bool light_fade;
+  uint16_t flags;
+  uint16_t item;
+  uint16_t message_sequence;
+  int32_t value;
+
+
+  if (packet_length - (message_ptr - packet) < 4) goto badmsg;
+  message_sequence = *message_ptr++;
+  message_sequence |= *message_ptr++ << 8;
+  flags = *message_ptr++;
+  flags |= *message_ptr++ << 8;
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Received device group %s packet from %s: sequence=%u, flags=%u"), device_group->group_name, IPAddressToString(remote_ip), message_sequence, flags);
+#endif
+
+
+
+  if (flags == DGR_FLAG_ACK) {
+    if (message_sequence > device_group_member->acked_sequence || device_group_member->acked_sequence - message_sequence < 64536) {
+      device_group_member->acked_sequence = message_sequence;
+    }
+    device_group_member->timeout_time = 0;
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<ack"));
+#endif
+    return;
+  }
+
+
+  if (!(flags & DGR_FLAG_MORE_TO_COME)) {
+    *(message_ptr - 2) = DGR_FLAG_ACK;
+    *(message_ptr - 1) = 0;
+    SendDeviceGroupPacket(remote_ip, packet, message_ptr - packet, PSTR("Ack"));
+  }
+
+
+
+  if ((flags & DGR_FLAG_STATUS_REQUEST)) {
+    if ((flags & DGR_FLAG_RESET) || device_group_member->acked_sequence != device_group->last_full_status_sequence) {
+      _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
+    }
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<status request"));
+#endif
+    return;
+  }
+
+
+  if (message_sequence < device_group_member->received_sequence && device_group_member->received_sequence - message_sequence > 64536) {
+#ifdef DEVICE_GROUPS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<old message"));
+#endif
+    return;
+  }
+  device_group_member->received_sequence = message_sequence;
+
+
+
+  processing_remote_device_message = true;
+# 512 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
+  XdrvMailbox.command = nullptr;
+  XdrvMailbox.index = flags;
+  light_fade = Settings.light_fade;
+  if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
+
+  for (;;) {
+    if (packet_length - (message_ptr - packet) < 1) goto badmsg;
+    item = *message_ptr++;
+    if (!item) break;
+
+#ifdef DEVICE_GROUPS_DEBUG
+    switch (item) {
+      case DGR_ITEM_LIGHT_FADE:
+      case DGR_ITEM_LIGHT_SPEED:
+      case DGR_ITEM_LIGHT_BRI:
+      case DGR_ITEM_LIGHT_SCHEME:
+      case DGR_ITEM_LIGHT_FIXED_COLOR:
+      case DGR_ITEM_BRI_MIN:
+      case DGR_ITEM_BRI_PRESET_LOW:
+      case DGR_ITEM_BRI_PRESET_HIGH:
+      case DGR_ITEM_BRI_POWER_ON:
+      case DGR_ITEM_POWER:
+      case DGR_ITEM_LIGHT_CHANNELS:
+        break;
+      default:
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));
+    }
+#endif
+
+    XdrvMailbox.command_code = item;
+    if (item <= DGR_ITEM_LAST_32BIT) {
+      value = *message_ptr++;
+      if (item > DGR_ITEM_MAX_8BIT) {
+        value |= *message_ptr++ << 8;
+        if (item > DGR_ITEM_MAX_16BIT) {
+          value |= *message_ptr++ << 16;
+          value |= *message_ptr++ << 24;
+        }
+      }
+      else if (item == DGR_ITEM_LIGHT_FADE) {
+        light_fade = value;
+      }
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u"), item, value);
+#endif
+      XdrvMailbox.payload = value;
+    }
+    else if (item <= DGR_ITEM_MAX_STRING) {
+      value = *message_ptr++;
+      if (value >= packet_length - (message_ptr - packet)) goto badmsg;
+#ifdef DEVICE_GROUPS_DEBUG
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%.*s"), item, value, message_ptr);
+#endif
+      XdrvMailbox.data_len = value;
+      XdrvMailbox.data = message_ptr;
+      message_ptr += value;
+    }
+    else {
+      switch (item) {
+        case DGR_ITEM_LIGHT_CHANNELS:
+#ifdef DEVICE_GROUPS_DEBUG
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u,%u,%u,%u,%u"), item, *message_ptr, *(message_ptr + 1), *(message_ptr + 2), *(message_ptr + 3), *(message_ptr + 4));
+#endif
+          XdrvMailbox.data = message_ptr;
+          message_ptr += 5;
+          break;
+      }
+    }
+
+    if (DeviceGroupItemShared(true, item)) {
+      if (item == DGR_ITEM_POWER) {
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint32_t mask = 1 << i;
+          bool on = (value & mask);
+          if (on != (power & mask)) ExecuteCommandPower(i + 1, (on ? POWER_ON : POWER_OFF), SRC_REMOTE);
+        }
+      }
+      else {
+        XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+      }
+    }
+  }
+
+  XdrvMailbox.command_code = DGR_ITEM_EOL;
+  XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
+  Settings.light_fade = light_fade;
+
+  processing_remote_device_message = false;
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<processed"));
+#endif
+  return;
+
+badmsg:
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: malformed message received from %s"), IPAddressToString(remote_ip));
+#ifdef DEVICE_GROUPS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("packet_length=%u, offset=%u"), packet_length, message_ptr - packet);
+#endif
+  processing_remote_device_message = false;
+}
+
+void DeviceGroupsLoop(void)
+{
+  if (!Settings.flag4.device_groups_enabled) return;
+  if (udp_connected) {
+    if (!udp_was_connected) {
+      udp_was_connected = true;
+
+      if (!device_groups_initialized) DeviceGroupsInit();
+      if (device_groups_initialization_failed) return;
+
+      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+        device_group * device_group = &device_groups[device_group_index];
+        char * message_ptr = &device_group->message[device_group->message_header_length];
+        if (!++outgoing_sequence) outgoing_sequence = 1;
+        *message_ptr++ = outgoing_sequence & 0xff;
+        *message_ptr++ = outgoing_sequence >> 8;
+        *message_ptr++ = DGR_FLAG_RESET | DGR_FLAG_STATUS_REQUEST;
+        *message_ptr++ = 0;
+        device_group->message_length = message_ptr - device_group->message;
+        device_group->initial_status_requests_remaining = 5;
+        device_group->next_ack_check_time = millis() + 1000;
+      }
+
+      waiting_for_acks = true;
+    }
+
+    if (device_groups_initialization_failed) return;
+
+    if (waiting_for_acks) {
+      uint32_t now = millis();
+      waiting_for_acks = false;
+      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
+        device_group * device_group = &device_groups[device_group_index];
+        if (device_group->next_ack_check_time) {
+          if (device_group->next_ack_check_time <= now) {
+            if (device_group->initial_status_requests_remaining) {
+#ifdef DEVICE_GROUPS_DEBUG
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending initial status request for group %s"), device_group->group_name);
+#endif
+              if (--device_group->initial_status_requests_remaining) {
+                SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Initial"));
+                device_group->message[device_group->message_header_length + 2] = DGR_FLAG_STATUS_REQUEST;
+                device_group->next_ack_check_time = now + 200;
+                waiting_for_acks = true;
+              }
+              else {
+                device_group->next_ack_check_time = 0;
+                _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
+              }
+            }
+            else {
+              bool acked = true;
+              struct device_group_member ** flink = &device_group->device_group_members;
+              struct device_group_member * device_group_member;
+              while ((device_group_member = *flink)) {
+                if (device_group_member->acked_sequence != outgoing_sequence) {
+
+                  if (device_group_member->timeout_time && device_group_member->timeout_time < now) {
+#ifdef DEVICE_GROUPS_DEBUG
+                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: removing member %s (%p)"), IPAddressToString(device_group_member->ip_address), device_group_member);
+#endif
+                    *flink = device_group_member->flink;
+                    free(device_group_member);
+                  }
+                  else {
+#ifdef DEVICE_GROUPS_DEBUG
+                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u"), device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
+#endif
+                    SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, PSTR("Unicast"));
+                    if (!device_group_member->timeout_time) device_group_member->timeout_time = now + 15000;
+                    acked = false;
+                    flink = &device_group_member->flink;
+                  }
+                }
+                else {
+                  flink = &device_group_member->flink;
+                }
+              }
+              if (acked) {
+                device_group->next_ack_check_time = 0;
+                device_group->message_length = 0;
+              }
+              else {
+                device_group->next_ack_check_time = now + 500;
+                waiting_for_acks = true;
+              }
+            }
+          }
+          else {
+            waiting_for_acks = true;
+          }
+        }
+      }
+    }
+  }
+  else {
+    udp_was_connected = false;
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_esptool.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_esptool.ino"
+#define USE_ESPTOOL 
+#ifdef USE_ESPTOOL
+
+
+
+
+
+
+
+#define READ_REG(REG) (*((volatile uint32_t *)(REG)))
+#define WRITE_REG(REG,VAL) *((volatile uint32_t *)(REG)) = (VAL)
+#define REG_SET_MASK(reg,mask) WRITE_REG((reg), (READ_REG(reg)|(mask)))
+
+#define SPI_BASE_REG 0x60000200
+
+#define SPI_CMD_REG (SPI_BASE_REG + 0x00)
+#define SPI_FLASH_RDSR (1<<27)
+#define SPI_FLASH_SE (1<<24)
+#define SPI_FLASH_BE (1<<23)
+#define SPI_FLASH_WREN (1<<30)
+
+#define SPI_ADDR_REG (SPI_BASE_REG + 0x04)
+#define SPI_CTRL_REG (SPI_BASE_REG + 0x08)
+#define SPI_RD_STATUS_REG (SPI_BASE_REG + 0x10)
+#define SPI_W0_REG (SPI_BASE_REG + 0x40)
+#define SPI_EXT2_REG (SPI_BASE_REG + 0xF8)
+
+#define SPI_ST 0x7
+
+
+#define SECTORS_PER_BLOCK (FLASH_BLOCK_SIZE / SPI_FLASH_SEC_SIZE)
+
+
+static const uint32_t STATUS_WIP_BIT = (1 << 0);
+
+
+inline static void spi_wait_ready(void)
+{
+  while((READ_REG(SPI_EXT2_REG) & SPI_ST)) { }
+}
+
+
+
+static bool spiflash_is_ready(void)
+{
+  spi_wait_ready();
+  WRITE_REG(SPI_RD_STATUS_REG, 0);
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_RDSR);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+  uint32_t status_value = READ_REG(SPI_RD_STATUS_REG);
+  return (status_value & STATUS_WIP_BIT) == 0;
+}
+
+static void spi_write_enable(void)
+{
+  while(!spiflash_is_ready()) { }
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_WREN);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+}
+
+bool EsptoolEraseSector(uint32_t sector)
+{
+  spi_write_enable();
+  spi_wait_ready();
+
+  WRITE_REG(SPI_ADDR_REG, (sector * SPI_FLASH_SEC_SIZE) & 0xffffff);
+  WRITE_REG(SPI_CMD_REG, SPI_FLASH_SE);
+  while(READ_REG(SPI_CMD_REG) != 0) { }
+  while(!spiflash_is_ready()) { }
+
+  return true;
+}
+
+void EsptoolErase(uint32_t start_sector, uint32_t end_sector)
+{
+  int next_erase_sector = start_sector;
+  int remaining_erase_sector = end_sector - start_sector;
+
+  while (remaining_erase_sector > 0) {
+    spi_write_enable();
+
+    uint32_t command = SPI_FLASH_SE;
+    uint32_t sectors_to_erase = 1;
+    if (remaining_erase_sector >= SECTORS_PER_BLOCK &&
+        next_erase_sector % SECTORS_PER_BLOCK == 0) {
+      command = SPI_FLASH_BE;
+      sectors_to_erase = SECTORS_PER_BLOCK;
+    }
+    uint32_t addr = next_erase_sector * SPI_FLASH_SEC_SIZE;
+
+    spi_wait_ready();
+    WRITE_REG(SPI_ADDR_REG, addr & 0xffffff);
+    WRITE_REG(SPI_CMD_REG, command);
+    while(READ_REG(SPI_CMD_REG) != 0) { }
+    remaining_erase_sector -= sectors_to_erase;
+    next_erase_sector += sectors_to_erase;
+
+    while (!spiflash_is_ready()) { }
+    yield();
+    OsWatchLoop();
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_features.ino"
+# 24 "S:/Development/Tasmota/tasmota/support_features.ino"
+void GetFeatures(void)
+{
+  feature_drv1 = 0x00000000;
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  feature_drv1 |= 0x00000001;
+#endif
+#ifdef USE_LIGHT
+  feature_drv1 |= 0x00000002;
+#endif
+#ifdef USE_I2C
+  feature_drv1 |= 0x00000004;
+#endif
+#ifdef USE_SPI
+  feature_drv1 |= 0x00000008;
+#endif
+#ifdef USE_DISCOVERY
+  feature_drv1 |= 0x00000010;
+#endif
+#ifdef USE_ARDUINO_OTA
+  feature_drv1 |= 0x00000020;
+#endif
+#ifdef USE_MQTT_TLS
+  feature_drv1 |= 0x00000040;
+#endif
+#ifdef USE_WEBSERVER
+  feature_drv1 |= 0x00000080;
+#endif
+#ifdef WEBSERVER_ADVERTISE
+  feature_drv1 |= 0x00000100;
+#endif
+#ifdef USE_EMULATION_HUE
+  feature_drv1 |= 0x00000200;
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
+  feature_drv1 |= 0x00000400;
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
+
+#endif
+#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)
+
+#endif
+#ifdef MQTT_HOST_DISCOVERY
+  feature_drv1 |= 0x00002000;
+#endif
+#ifdef USE_ARILUX_RF
+  feature_drv1 |= 0x00004000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_WS2812)
+  feature_drv1 |= 0x00008000;
+#endif
+#ifdef USE_WS2812_DMA
+  feature_drv1 |= 0x00010000;
+#endif
+#if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL)
+  feature_drv1 |= 0x00020000;
+#endif
+#ifdef USE_IR_HVAC
+  feature_drv1 |= 0x00040000;
+#endif
+#ifdef USE_IR_RECEIVE
+  feature_drv1 |= 0x00080000;
+#endif
+#ifdef USE_DOMOTICZ
+  feature_drv1 |= 0x00100000;
+#endif
+#ifdef USE_DISPLAY
+  feature_drv1 |= 0x00200000;
+#endif
+#ifdef USE_HOME_ASSISTANT
+  feature_drv1 |= 0x00400000;
+#endif
+#ifdef USE_SERIAL_BRIDGE
+  feature_drv1 |= 0x00800000;
+#endif
+#ifdef USE_TIMERS
+  feature_drv1 |= 0x01000000;
+#endif
+#ifdef USE_SUNRISE
+  feature_drv1 |= 0x02000000;
+#endif
+#ifdef USE_TIMERS_WEB
+  feature_drv1 |= 0x04000000;
+#endif
+#ifdef USE_RULES
+  feature_drv1 |= 0x08000000;
+#endif
+#ifdef USE_KNX
+  feature_drv1 |= 0x10000000;
+#endif
+#ifdef USE_WPS
+  feature_drv1 |= 0x20000000;
+#endif
+#ifdef USE_SMARTCONFIG
+  feature_drv1 |= 0x40000000;
+#endif
+#ifdef USE_ENERGY_POWER_LIMIT
+  feature_drv1 |= 0x80000000;
+#endif
+
+
+
+  feature_drv2 = 0x00000000;
+
+#ifdef USE_CONFIG_OVERRIDE
+  feature_drv2 |= 0x00000001;
+#endif
+#ifdef FIRMWARE_MINIMAL
+  feature_drv2 |= 0x00000002;
+#endif
+#ifdef FIRMWARE_SENSORS
+  feature_drv2 |= 0x00000004;
+#endif
+#ifdef FIRMWARE_CLASSIC
+  feature_drv2 |= 0x00000008;
+#endif
+#ifdef FIRMWARE_KNX_NO_EMULATION
+  feature_drv2 |= 0x00000010;
+#endif
+#ifdef USE_DISPLAY_MODES1TO5
+  feature_drv2 |= 0x00000020;
+#endif
+#ifdef USE_DISPLAY_GRAPH
+  feature_drv2 |= 0x00000040;
+#endif
+#ifdef USE_DISPLAY_LCD
+  feature_drv2 |= 0x00000080;
+#endif
+#ifdef USE_DISPLAY_SSD1306
+  feature_drv2 |= 0x00000100;
+#endif
+#ifdef USE_DISPLAY_MATRIX
+  feature_drv2 |= 0x00000200;
+#endif
+#ifdef USE_DISPLAY_ILI9341
+  feature_drv2 |= 0x00000400;
+#endif
+#ifdef USE_DISPLAY_EPAPER_29
+  feature_drv2 |= 0x00000800;
+#endif
+#ifdef USE_DISPLAY_SH1106
+  feature_drv2 |= 0x00001000;
+#endif
+#ifdef USE_MP3_PLAYER
+  feature_drv2 |= 0x00002000;
+#endif
+#ifdef USE_PCA9685
+  feature_drv2 |= 0x00004000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_TUYA_MCU)
+  feature_drv2 |= 0x00008000;
+#endif
+#ifdef USE_RC_SWITCH
+  feature_drv2 |= 0x00010000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_ARMTRONIX_DIMMERS)
+  feature_drv2 |= 0x00020000;
+#endif
+#if defined(USE_LIGHT) && defined(USE_SM16716)
+  feature_drv2 |= 0x00040000;
+#endif
+#ifdef USE_SCRIPT
+  feature_drv2 |= 0x00080000;
+#endif
+#ifdef USE_EMULATION_WEMO
+  feature_drv2 |= 0x00100000;
+#endif
+#ifdef USE_SONOFF_IFAN
+  feature_drv2 |= 0x00200000;
+#endif
+#ifdef USE_ZIGBEE
+  feature_drv2 |= 0x00400000;
+#endif
+#ifdef NO_EXTRA_4K_HEAP
+  feature_drv2 |= 0x00800000;
+#endif
+#ifdef VTABLES_IN_IRAM
+  feature_drv2 |= 0x01000000;
+#endif
+#ifdef VTABLES_IN_DRAM
+  feature_drv2 |= 0x02000000;
+#endif
+#ifdef VTABLES_IN_FLASH
+  feature_drv2 |= 0x04000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+  feature_drv2 |= 0x08000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+  feature_drv2 |= 0x10000000;
+#endif
+#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+  feature_drv2 |= 0x20000000;
+#endif
+#ifdef DEBUG_THEO
+  feature_drv2 |= 0x40000000;
+#endif
+#ifdef USE_DEBUG_DRIVER
+  feature_drv2 |= 0x80000000;
+#endif
+
+
+
+  feature_sns1 = 0x00000000;
+
+#ifdef USE_COUNTER
+  feature_sns1 |= 0x00000001;
+#endif
+#ifdef USE_ADC_VCC
+  feature_sns1 |= 0x00000002;
+#endif
+#ifdef USE_ENERGY_SENSOR
+  feature_sns1 |= 0x00000004;
+#endif
+#ifdef USE_PZEM004T
+  feature_sns1 |= 0x00000008;
+#endif
+#ifdef USE_DS18B20
+  feature_sns1 |= 0x00000010;
+#endif
+#ifdef USE_DS18x20_LEGACY
+  feature_sns1 |= 0x00000020;
+#endif
+#ifdef USE_DS18x20
+  feature_sns1 |= 0x00000040;
+#endif
+#ifdef USE_DHT
+  feature_sns1 |= 0x00000080;
+#endif
+#ifdef USE_SHT
+  feature_sns1 |= 0x00000100;
+#endif
+#ifdef USE_HTU
+  feature_sns1 |= 0x00000200;
+#endif
+#ifdef USE_BMP
+  feature_sns1 |= 0x00000400;
+#endif
+#ifdef USE_BME680
+  feature_sns1 |= 0x00000800;
+#endif
+#ifdef USE_BH1750
+  feature_sns1 |= 0x00001000;
+#endif
+#ifdef USE_VEML6070
+  feature_sns1 |= 0x00002000;
+#endif
+#ifdef USE_ADS1115_I2CDEV
+  feature_sns1 |= 0x00004000;
+#endif
+#ifdef USE_ADS1115
+  feature_sns1 |= 0x00008000;
+#endif
+#ifdef USE_INA219
+  feature_sns1 |= 0x00010000;
+#endif
+#ifdef USE_SHT3X
+  feature_sns1 |= 0x00020000;
+#endif
+#ifdef USE_MHZ19
+  feature_sns1 |= 0x00040000;
+#endif
+#ifdef USE_TSL2561
+  feature_sns1 |= 0x00080000;
+#endif
+#ifdef USE_SENSEAIR
+  feature_sns1 |= 0x00100000;
+#endif
+#ifdef USE_PMS5003
+  feature_sns1 |= 0x00200000;
+#endif
+#ifdef USE_MGS
+  feature_sns1 |= 0x00400000;
+#endif
+#ifdef USE_NOVA_SDS
+  feature_sns1 |= 0x00800000;
+#endif
+#ifdef USE_SGP30
+  feature_sns1 |= 0x01000000;
+#endif
+#ifdef USE_SR04
+  feature_sns1 |= 0x02000000;
+#endif
+#ifdef USE_SDM120
+  feature_sns1 |= 0x04000000;
+#endif
+#ifdef USE_SI1145
+  feature_sns1 |= 0x08000000;
+#endif
+#ifdef USE_SDM630
+  feature_sns1 |= 0x10000000;
+#endif
+#ifdef USE_LM75AD
+  feature_sns1 |= 0x20000000;
+#endif
+#ifdef USE_APDS9960
+  feature_sns1 |= 0x40000000;
+#endif
+#ifdef USE_TM1638
+  feature_sns1 |= 0x80000000;
+#endif
+
+
+
+  feature_sns2 = 0x00000000;
+
+#ifdef USE_MCP230xx
+  feature_sns2 |= 0x00000001;
+#endif
+#ifdef USE_MPR121
+  feature_sns2 |= 0x00000002;
+#endif
+#ifdef USE_CCS811
+  feature_sns2 |= 0x00000004;
+#endif
+#ifdef USE_MPU6050
+  feature_sns2 |= 0x00000008;
+#endif
+#ifdef USE_MCP230xx_OUTPUT
+  feature_sns2 |= 0x00000010;
+#endif
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+  feature_sns2 |= 0x00000020;
+#endif
+#ifdef USE_HLW8012
+  feature_sns2 |= 0x00000040;
+#endif
+#ifdef USE_CSE7766
+  feature_sns2 |= 0x00000080;
+#endif
+#ifdef USE_MCP39F501
+  feature_sns2 |= 0x00000100;
+#endif
+#ifdef USE_PZEM_AC
+  feature_sns2 |= 0x00000200;
+#endif
+#ifdef USE_DS3231
+  feature_sns2 |= 0x00000400;
+#endif
+#ifdef USE_HX711
+  feature_sns2 |= 0x00000800;
+#endif
+#ifdef USE_PZEM_DC
+  feature_sns2 |= 0x00001000;
+#endif
+#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
+  feature_sns2 |= 0x00002000;
+#endif
+#ifdef USE_MGC3130
+  feature_sns2 |= 0x00004000;
+#endif
+#ifdef USE_RF_SENSOR
+  feature_sns2 |= 0x00008000;
+#endif
+#ifdef USE_THEO_V2
+  feature_sns2 |= 0x00010000;
+#endif
+#ifdef USE_ALECTO_V2
+  feature_sns2 |= 0x00020000;
+#endif
+#ifdef USE_AZ7798
+  feature_sns2 |= 0x00040000;
+#endif
+#ifdef USE_MAX31855
+  feature_sns2 |= 0x00080000;
+#endif
+#ifdef USE_PN532_HSU
+  feature_sns2 |= 0x00100000;
+#endif
+#ifdef USE_MAX44009
+  feature_sns2 |= 0x00200000;
+#endif
+#ifdef USE_SCD30
+  feature_sns2 |= 0x00400000;
+#endif
+#ifdef USE_HRE
+  feature_sns2 |= 0x00800000;
+#endif
+#ifdef USE_ADE7953
+  feature_sns2 |= 0x01000000;
+#endif
+#ifdef USE_SPS30
+  feature_sns2 |= 0x02000000;
+#endif
+#ifdef USE_VL53L0X
+  feature_sns2 |= 0x04000000;
+#endif
+#ifdef USE_MLX90614
+  feature_sns2 |= 0x08000000;
+#endif
+#ifdef USE_MAX31865
+  feature_sns2 |= 0x10000000;
+#endif
+#ifdef USE_CHIRP
+  feature_sns2 |= 0x20000000;
+#endif
+#ifdef USE_SOLAX_X1
+  feature_sns2 |= 0x40000000;
+#endif
+#ifdef USE_PAJ7620
+  feature_sns2 |= 0x80000000;
+#endif
+
+
+
+  feature5 = 0x00000000;
+
+#ifdef USE_BUZZER
+  feature5 |= 0x00000001;
+#endif
+#ifdef USE_RDM6300
+  feature5 |= 0x00000002;
+#endif
+#ifdef USE_IBEACON
+  feature5 |= 0x00000004;
+#endif
+#ifdef USE_SML_M
+  feature5 |= 0x00000008;
+#endif
+#ifdef USE_INA226
+  feature5 |= 0x00000010;
+#endif
+#ifdef USE_A4988_STEPPER
+  feature5 |= 0x00000020;
+#endif
+#ifdef USE_DDS2382
+  feature5 |= 0x00000040;
+#endif
+#ifdef USE_SM2135
+  feature5 |= 0x00000080;
+#endif
+#ifdef USE_SHUTTER
+  feature5 |= 0x00000100;
+#endif
+#ifdef USE_PCF8574
+  feature5 |= 0x00000200;
+#endif
+#ifdef USE_DDSU666
+  feature5 |= 0x00000400;
+#endif
+#ifdef USE_DEEPSLEEP
+  feature5 |= 0x00000800;
+#endif
+#ifdef USE_SONOFF_SC
+  feature5 |= 0x00001000;
+#endif
+#ifdef USE_SONOFF_RF
+  feature5 |= 0x00002000;
+#endif
+#ifdef USE_SONOFF_L1
+  feature5 |= 0x00004000;
+#endif
+#ifdef USE_EXS_DIMMER
+  feature5 |= 0x00008000;
+#endif
+#ifdef USE_ARDUINO_SLAVE
+  feature5 |= 0x00010000;
+#endif
+#ifdef USE_HIH6
+  feature5 |= 0x00020000;
+#endif
+#ifdef USE_HPMA
+  feature5 |= 0x00040000;
+#endif
+#ifdef USE_TSL2591
+  feature5 |= 0x00080000;
+#endif
+#ifdef USE_DHT12
+  feature5 |= 0x00100000;
+#endif
+#ifdef USE_DS1624
+  feature5 |= 0x00200000;
+#endif
+#ifdef USE_GPS
+  feature5 |= 0x00400000;
+#endif
+#ifdef USE_HOTPLUG
+  feature5 |= 0x00800000;
+#endif
+#ifdef USE_NRF24
+  feature5 |= 0x01000000;
+#endif
+#ifdef USE_MIBLE
+  feature5 |= 0x02000000;
+#endif
+#ifdef USE_HM10
+  feature5 |= 0x04000000;
+#endif
+#ifdef USE_LE01MR
+  feature5 |= 0x08000000;
+#endif
+#ifdef USE_AHT1x
+  feature5 |= 0x10000000;
+#endif
+#ifdef USE_WEMOS_MOTOR_V1
+  feature5 |= 0x20000000;
+#endif
+
+
+
+
+
+
+  feature6 = 0x00000000;
+# 570 "S:/Development/Tasmota/tasmota/support_features.ino"
+}
+# 1 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
+# 39 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
+#ifdef USE_FLOG
+
+class FLOG
+
+#define MAGIC_WORD_FL 0x464c
+
+{
+
+struct header_t{
+    uint16_t magic_word;
+    uint16_t padding;
+    uint32_t physical_start_sector:10;
+    uint32_t number:10;
+    uint32_t buf_pointer:12;
+    };
+
+private:
+void _readSector(uint8_t one_sector);
+void _eraseSector(uint8_t one_sector);
+void _writeSector(uint8_t one_sector);
+void _clearBuffer(void);
+void _searchSaves(void);
+void _findFirstErasedSector(void);
+void _showBuffer(void);
+void _initBuffer(void);
+void _saveBufferToSector(void);
+header_t _saved_header;
+
+public:
+  uint32_t size;
+  uint32_t start;
+  uint32_t end;
+  uint16_t num_sectors;
+
+  uint16_t first_erased_sector;
+  uint16_t current_sector;
+
+  uint16_t bytes_left;
+  uint16_t sectors_left;
+
+  uint8_t mode = 0;
+  bool found_saved_data = false;
+  bool ready = false;
+  bool running_download = false;
+  bool recording = false;
+
+  union sector_t{
+  uint32_t dword_buffer[FLASH_SECTOR_SIZE/4];
+  uint8_t byte_buffer[FLASH_SECTOR_SIZE];
+  header_t header;
+  } sector;
+
+  void init(void);
+  void addToBuffer(uint8_t src[], uint32_t size);
+  void startRecording(bool append);
+  void stopRecording(void);
+
+  typedef void (*CallbackNoArgs) ();
+  typedef void (*CallbackWithArgs) (uint8_t *_record);
+
+  void startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter);
+};
+
+extern "C" uint32_t _SPIFFS_start;
+extern "C" uint32_t _FS_start;
+
+
+
+
+void FLOG::init(void)
+{
+DEBUG_SENSOR_LOG(PSTR("FLOG: init ..."));
+size = ESP.getSketchSize();
+
+start = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+end = (uint32_t)&_SPIFFS_start - 0x40200000;
+#else
+end = (uint32_t)&_FS_start - 0x40200000;
+#endif
+num_sectors = (end - start)/FLASH_SECTOR_SIZE;
+DEBUG_SENSOR_LOG(PSTR("FLOG: size: 0x%lx, start: 0x%lx, end: 0x%lx, num_sectors(dec): %lu"), size, start, end, num_sectors );
+_findFirstErasedSector();
+if(first_erased_sector == 0xffff){
+    _eraseSector(0);
+    first_erased_sector = 0;
+}
+_searchSaves();
+_initBuffer();
+ready = true;
+}
+# 142 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
+void FLOG::_readSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);
+  ESP.flashRead(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
+}
+
+
+
+
+
+void FLOG::_eraseSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);
+  ESP.flashEraseSector((start/FLASH_SECTOR_SIZE)+one_sector);
+}
+
+
+
+
+
+void FLOG::_writeSector(uint8_t one_sector){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);
+  ESP.flashWrite(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
+}
+
+
+
+
+void FLOG::_clearBuffer(){
+  for (uint32_t i = sizeof(sector.header)/4; i<(sizeof(sector.dword_buffer)/4); i++){
+      sector.dword_buffer[i] = 0;
+  }
+  sector.header.buf_pointer = sizeof(sector.header);
+
+}
+
+
+
+
+void FLOG::_saveBufferToSector(){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to current sector: %u" ),current_sector);
+  _writeSector(current_sector);
+  if(current_sector == num_sectors){
+    current_sector = 0;
+  }
+  else{
+    current_sector++;
+  }
+  _eraseSector(current_sector);
+  _clearBuffer();
+  sector.header.number++;
+  DEBUG_SENSOR_LOG(PSTR("FLOG: new sector header number: %u" ),sector.header.number);
+}
+
+
+
+
+
+void FLOG::_findFirstErasedSector(){
+  for (uint32_t i = 0; i<num_sectors; i++){
+    bool success = true;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: read sector: %u"), i);
+    _readSector(i);
+    for (uint32_t j = 0; j<(sizeof(sector.dword_buffer)/4); j++){
+      if(sector.dword_buffer[j]!=0xffffffff){
+
+        success = false;
+      }
+    }
+    if(success){
+      first_erased_sector = i;
+      sector.header.physical_start_sector = i;
+      current_sector = i;
+      DEBUG_SENSOR_LOG(PSTR("FLOG: first erased sector: %u, now init ..."), first_erased_sector);
+      return;
+    }
+  }
+  DEBUG_SENSOR_LOG(PSTR("FLOG: no erased sector found"));
+  first_erased_sector = 0xffff;
+}
+
+
+
+
+void FLOG::_searchSaves(void){
+
+  found_saved_data = false;
+  uint32_t s;
+  if(first_erased_sector==0){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: sector 0 was erased before, examine sector: %u"), num_sectors);
+    s = num_sectors;
+  }
+  else{
+    s = first_erased_sector-1;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: examine sector: %u"), s);
+  }
+  _readSector(s);
+  if(sector.header.magic_word!=MAGIC_WORD_FL){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
+    return;
+  }
+  sectors_left = sector.header.number + 1;
+  _saved_header = sector.header;
+  s = sector.header.physical_start_sector;
+  DEBUG_SENSOR_LOG(PSTR("FLOG: will check pysical start sector: %u"), s);
+  _readSector(s);
+  _showBuffer();
+  if(sector.header.magic_word!=MAGIC_WORD_FL){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
+    sectors_left = 0;
+    return;
+  }
+  if(sector.header.number==0){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: possible saved data found"));
+    found_saved_data = true;
+  }
+  else{
+    DEBUG_SENSOR_LOG(PSTR("FLOG: number: %u should be 0"), sector.header.number);
+    sectors_left = 0;
+  }
+}
+
+
+
+
+void FLOG::_initBuffer(void){
+  if(!found_saved_data){
+    sector.header.physical_start_sector = (uint16_t)first_erased_sector;
+  }
+  DEBUG_SENSOR_LOG(PSTR("FLOG: init header"));
+  sector.header.magic_word = MAGIC_WORD_FL;
+  sector.header.number = 0;
+  sector.header.buf_pointer = (uint16_t)sizeof(sector.header);
+  current_sector = first_erased_sector;
+  ready = true;
+  _clearBuffer();
+}
+
+
+
+
+void FLOG::_showBuffer(void){
+  DEBUG_SENSOR_LOG(PSTR("FLOG: Header: %c %c"), sector.byte_buffer[0],sector.byte_buffer[1]);
+  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer);
+  uint32_t j = 0;
+  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){
+
+      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
+      j++;
+      if(j>3){
+        break;
+      }
+  }
+}
+
+
+
+
+
+
+
+void FLOG::addToBuffer(uint8_t src[], uint32_t size){
+    if(mode == 0){
+      if(sector.header.number == num_sectors && !ready){
+        return;
+      }
+    }
+  if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
+
+
+
+    memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
+    sector.header.buf_pointer+=size;
+
+  }
+  else{
+    DEBUG_SENSOR_LOG(PSTR("FLOG: save buffer to flash sector: %u"), current_sector);
+    DEBUG_SENSOR_LOG(PSTR("FLOG: current buf_pointer: %u"), sector.header.buf_pointer);
+    _saveBufferToSector();
+    sectors_left++;
+
+    if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
+      memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
+      sector.header.buf_pointer+=size;
+    }
+  }
+}
+
+
+
+
+
+
+void FLOG::startRecording(bool append){
+    if(recording){
+        DEBUG_SENSOR_LOG(PSTR("FLOG: already recording"));
+        return;
+    }
+    recording = true;
+    DEBUG_SENSOR_LOG(PSTR("FLOG: start recording"));
+    _initBuffer();
+    if(!found_saved_data) {
+      append = false;
+    }
+    if(append){
+        sector.header.number = _saved_header.number+1;
+        sector.header.physical_start_sector = _saved_header.physical_start_sector;
+    }
+    else{
+        sector.header.physical_start_sector = (uint16_t)first_erased_sector;
+        found_saved_data = false;
+        sectors_left = 0;
+    }
+  }
+
+
+
+
+
+void FLOG::stopRecording(void){
+      _saveBufferToSector();
+      _findFirstErasedSector();
+      _searchSaves();
+      _initBuffer();
+      recording = false;
+      found_saved_data = true;
+  }
+# 381 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
+  void FLOG::startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter){
+
+  _readSector(sector.header.physical_start_sector);
+  uint32_t next_sector = sector.header.physical_start_sector;
+  bytes_left = sector.header.buf_pointer - sizeof(sector.header);
+  DEBUG_SENSOR_LOG(PSTR("FLOG: create file for download, will process %u bytes"), bytes_left);
+  running_download = true;
+
+  sendHeader();
+
+  while(sectors_left){
+    DEBUG_SENSOR_LOG(PSTR("FLOG: next sector: %u"), next_sector);
+
+    uint32_t k = sizeof(sector.header);
+    while(bytes_left){
+
+      uint8_t *_record_start = (uint8_t*)&sector.byte_buffer[k];
+
+      sendRecord(_record_start);
+      if(k%128 == 0){
+
+        OsWatchLoop();
+        delay(sleep);
+        }
+      k+=size;
+      if(bytes_left>7){
+        bytes_left-=size;
+      }
+      else{
+        bytes_left = 0;
+        DEBUG_SENSOR_LOG(PSTR("FLOG: Flog->bytes_left not dividable by 8 ??????"));
+        }
+      }
+    next_sector++;
+    if(next_sector>num_sectors){
+      next_sector = 0;
+    }
+    sectors_left--;
+    _readSector(next_sector);
+    bytes_left = sector.header.buf_pointer - sizeof(sector.header);
+    OsWatchLoop();
+    delay(sleep);
+  }
+  running_download = false;
+
+  sendFooter();
+
+  _searchSaves();
+  _initBuffer();
+  }
+
+ #endif
+# 1 "S:/Development/Tasmota/tasmota/support_float.ino"
+# 23 "S:/Development/Tasmota/tasmota/support_float.ino"
+float fmodf(float x, float y)
+{
+
+  union {float f; uint32_t i;} ux = {x}, uy = {y};
+  int ex = ux.i>>23 & 0xff;
+  int ey = uy.i>>23 & 0xff;
+  uint32_t sx = ux.i & 0x80000000;
+  uint32_t i;
+  uint32_t uxi = ux.i;
+
+  if (uy.i<<1 == 0 || isnan(y) || ex == 0xff)
+    return (x*y)/(x*y);
+  if (uxi<<1 <= uy.i<<1) {
+    if (uxi<<1 == uy.i<<1)
+      return 0*x;
+    return x;
+  }
+
+
+  if (!ex) {
+    for (i = uxi<<9; i>>31 == 0; ex--, i <<= 1);
+    uxi <<= -ex + 1;
+  } else {
+    uxi &= -1U >> 9;
+    uxi |= 1U << 23;
+  }
+  if (!ey) {
+    for (i = uy.i<<9; i>>31 == 0; ey--, i <<= 1);
+    uy.i <<= -ey + 1;
+  } else {
+    uy.i &= -1U >> 9;
+    uy.i |= 1U << 23;
+  }
+
+
+  for (; ex > ey; ex--) {
+    i = uxi - uy.i;
+    if (i >> 31 == 0) {
+      if (i == 0)
+        return 0*x;
+      uxi = i;
+    }
+    uxi <<= 1;
+  }
+  i = uxi - uy.i;
+  if (i >> 31 == 0) {
+    if (i == 0)
+      return 0*x;
+    uxi = i;
+  }
+  for (; uxi>>23 == 0; uxi <<= 1, ex--);
+
+
+  if (ex > 0) {
+    uxi -= 1U << 23;
+    uxi |= (uint32_t)ex << 23;
+  } else {
+    uxi >>= -ex + 1;
+  }
+  uxi |= sx;
+  ux.i = uxi;
+  return ux.f;
+}
+
+
+double FastPrecisePow(double a, double b)
+{
+
+
+  int e = abs((int)b);
+  union {
+    double d;
+    int x[2];
+  } u = { a };
+  u.x[1] = (int)((b - e) * (u.x[1] - 1072632447) + 1072632447);
+  u.x[0] = 0;
+
+
+  double r = 1.0;
+  while (e) {
+    if (e & 1) {
+      r *= a;
+    }
+    a *= a;
+    e >>= 1;
+  }
+  return r * u.d;
+}
+
+float FastPrecisePowf(const float x, const float y)
+{
+
+  return (float)FastPrecisePow(x, y);
+}
+
+double TaylorLog(double x)
+{
+
+
+  if (x <= 0.0) { return NAN; }
+  double z = (x + 1) / (x - 1);
+  double step = ((x - 1) * (x - 1)) / ((x + 1) * (x + 1));
+  double totalValue = 0;
+  double powe = 1;
+  for (uint32_t count = 0; count < 10; count++) {
+    z *= step;
+    double y = (1 / powe) * z;
+    totalValue = totalValue + y;
+    powe = powe + 2;
+  }
+  totalValue *= 2;
+# 144 "S:/Development/Tasmota/tasmota/support_float.ino"
+  return totalValue;
+}
+# 154 "S:/Development/Tasmota/tasmota/support_float.ino"
+inline float sinf(float x) { return sin_52(x); }
+inline float cosf(float x) { return cos_52(x); }
+inline float tanf(float x) { return tan_56(x); }
+inline float atanf(float x) { return atan_66(x); }
+inline float asinf(float x) { return asinf1(x); }
+inline float acosf(float x) { return acosf1(x); }
+inline float sqrtf(float x) { return sqrt1(x); }
+inline float powf(float x, float y) { return FastPrecisePow(x, y); }
+
+
+double const f_pi = 3.1415926535897932384626433;
+double const f_twopi = 2.0 * f_pi;
+double const f_two_over_pi = 2.0 / f_pi;
+double const f_halfpi = f_pi / 2.0;
+double const f_threehalfpi = 3.0 * f_pi / 2.0;
+double const f_four_over_pi = 4.0 / f_pi;
+double const f_qtrpi = f_pi / 4.0;
+double const f_sixthpi = f_pi / 6.0;
+double const f_tansixthpi = tan(f_sixthpi);
+double const f_twelfthpi = f_pi / 12.0;
+double const f_tantwelfthpi = tan(f_twelfthpi);
+float const f_180pi = 180 / f_pi;
+# 194 "S:/Development/Tasmota/tasmota/support_float.ino"
+float cos_52s(float x)
+{
+  const float c1 = 0.9999932946;
+  const float c2 = -0.4999124376;
+  const float c3 = 0.0414877472;
+  const float c4 = -0.0012712095;
+
+  float x2 = x * x;
+  return (c1 + x2 * (c2 + x2 * (c3 + c4 * x2)));
+}
+
+
+
+
+
+
+float cos_52(float x)
+{
+  x = fmodf(x, f_twopi);
+  if (x < 0) { x = -x; }
+  int quad = int(x * (float)f_two_over_pi);
+  switch (quad) {
+    case 0: return cos_52s(x);
+    case 1: return -cos_52s((float)f_pi - x);
+    case 2: return -cos_52s(x-(float)f_pi);
+    case 3: return cos_52s((float)f_twopi - x);
+  }
+}
+
+
+
+
+float sin_52(float x)
+{
+  return cos_52((float)f_halfpi - x);
+}
+# 247 "S:/Development/Tasmota/tasmota/support_float.ino"
+float tan_56s(float x)
+{
+  const float c1 = -3.16783027;
+  const float c2 = 0.134516124;
+  const float c3 = -4.033321984;
+
+  float x2 = x * x;
+  return (x * (c1 + c2 * x2) / (c3 + x2));
+}
+# 267 "S:/Development/Tasmota/tasmota/support_float.ino"
+float tan_56(float x)
+{
+  x = fmodf(x, (float)f_twopi);
+  int octant = int(x * (float)f_four_over_pi);
+  switch (octant){
+    case 0: return tan_56s(x * (float)f_four_over_pi);
+    case 1: return 1.0f / tan_56s(((float)f_halfpi - x) * (float)f_four_over_pi);
+    case 2: return -1.0f / tan_56s((x-(float)f_halfpi) * (float)f_four_over_pi);
+    case 3: return - tan_56s(((float)f_pi - x) * (float)f_four_over_pi);
+    case 4: return tan_56s((x-(float)f_pi) * (float)f_four_over_pi);
+    case 5: return 1.0f / tan_56s(((float)f_threehalfpi - x) * (float)f_four_over_pi);
+    case 6: return -1.0f / tan_56s((x-(float)f_threehalfpi) * (float)f_four_over_pi);
+    case 7: return - tan_56s(((float)f_twopi - x) * (float)f_four_over_pi);
+  }
+}
+# 296 "S:/Development/Tasmota/tasmota/support_float.ino"
+float atan_66s(float x)
+{
+  const float c1 = 1.6867629106;
+  const float c2 = 0.4378497304;
+  const float c3 = 1.6867633134;
+
+  float x2 = x * x;
+  return (x * (c1 + x2 * c2) / (c3 + x2));
+}
+
+
+
+
+
+float atan_66(float x)
+{
+  float y;
+  bool complement= false;
+  bool region= false;
+  bool sign= false;
+
+  if (x < 0) {
+    x = -x;
+    sign = true;
+  }
+  if (x > 1.0) {
+    x = 1.0 / x;
+    complement = true;
+  }
+  if (x > (float)f_tantwelfthpi) {
+    x = (x - (float)f_tansixthpi) / (1 + (float)f_tansixthpi * x);
+    region = true;
+  }
+
+  y = atan_66s(x);
+  if (region) { y += (float)f_sixthpi; }
+  if (complement) { y = (float)f_halfpi-y; }
+  if (sign) { y = -y; }
+  return (y);
+}
+
+float asinf1(float x)
+{
+  float d = 1.0f - x * x;
+  if (d < 0.0f) { return NAN; }
+  return 2 * atan_66(x / (1 + sqrt1(d)));
+}
+
+float acosf1(float x)
+{
+  float d = 1.0f - x * x;
+  if (d < 0.0f) { return NAN; }
+  float y = asinf1(sqrt1(d));
+  if (x >= 0.0f) {
+    return y;
+  } else {
+    return (float)f_pi - y;
+  }
+}
+
+
+float sqrt1(const float x)
+{
+  union {
+    int i;
+    float x;
+  } u;
+  u.x = x;
+  u.i = (1 << 29) + (u.i >> 1) - (1 << 22);
+
+
+
+
+  u.x = u.x + x / u.x;
+  u.x = 0.25f * u.x + x / u.x;
+
+  return u.x;
+}
+# 387 "S:/Development/Tasmota/tasmota/support_float.ino"
+uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
+                                       uint16_t ito_min, uint16_t ito_max) {
+
+  if (ifrom_min >= ifrom_max) {
+    if (ito_min > ito_max) {
+      return ito_max;
+    } else {
+      return ito_min;
+    }
+  }
+
+  uint32_t num = inum;
+  uint32_t from_min = ifrom_min;
+  uint32_t from_max = ifrom_max;
+  uint32_t to_min = ito_min;
+  uint32_t to_max = ito_max;
+
+
+  num = (num > from_max ? from_max : (num < from_min ? from_min : num));
+
+
+  if (to_min > to_max) {
+
+    num = (from_max - num) + from_min;
+    to_min = ito_max;
+    to_max = ito_min;
+  }
+
+  uint32_t numerator = (num - from_min) * (to_max - to_min);
+  uint32_t result;
+  if (numerator >= 0x80000000L) {
+
+    result = numerator / (from_max - from_min) + to_min;
+  } else {
+    result = (((numerator * 2) / (from_max - from_min)) + 1) / 2 + to_min;
+  }
+  return (uint32_t) (result > to_max ? to_max : (result < to_min ? to_min : result));
+}
+# 1 "S:/Development/Tasmota/tasmota/support_legacy_cores.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_legacy_cores.ino"
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+
+
+
+
+
+void* memchr(const void* ptr, int value, size_t num)
+{
+  unsigned char *p = (unsigned char*)ptr;
+  while (num--) {
+    if (*p != (unsigned char)value) {
+      p++;
+    } else {
+      return p;
+    }
+  }
+  return 0;
+}
+
+
+
+size_t strcspn(const char *str1, const char *str2)
+{
+  size_t ret = 0;
+  while (*str1) {
+    if (strchr(str2, *str1)) {
+      return ret;
+    } else {
+      str1++;
+      ret++;
+    }
+  }
+  return ret;
+}
+
+
+
+char* strpbrk(const char *s1, const char *s2)
+{
+  while(*s1) {
+    if (strchr(s2, *s1++)) {
+      return (char*)--s1;
+    }
+  }
+  return 0;
+}
+
+
+
+#ifndef __LONG_LONG_MAX__
+#define __LONG_LONG_MAX__ 9223372036854775807LL
+#endif
+#ifndef ULLONG_MAX
+#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
+#endif
+
+unsigned long long strtoull(const char *__restrict nptr, char **__restrict endptr, int base)
+{
+  const char *s = nptr;
+  char c;
+  do { c = *s++; } while (isspace((unsigned char)c));
+
+  int neg = 0;
+  if (c == '-') {
+    neg = 1;
+    c = *s++;
+  } else {
+    if (c == '+') {
+      c = *s++;
+    }
+  }
+
+  if ((base == 0 || base == 16) && (c == '0') && (*s == 'x' || *s == 'X')) {
+    c = s[1];
+    s += 2;
+    base = 16;
+  }
+  if (base == 0) { base = (c == '0') ? 8 : 10; }
+
+  unsigned long long acc = 0;
+  int any = 0;
+  if (base > 1 && base < 37) {
+    unsigned long long cutoff = ULLONG_MAX / base;
+    int cutlim = ULLONG_MAX % base;
+    for ( ; ; c = *s++) {
+      if (c >= '0' && c <= '9')
+        c -= '0';
+      else if (c >= 'A' && c <= 'Z')
+        c -= 'A' - 10;
+      else if (c >= 'a' && c <= 'z')
+        c -= 'a' - 10;
+      else
+        break;
+
+      if (c >= base)
+        break;
+
+      if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+        any = -1;
+      else {
+        any = 1;
+        acc *= base;
+        acc += c;
+      }
+    }
+    if (any < 0) {
+      acc = ULLONG_MAX;
+    }
+    else if (any && neg) {
+      acc = -acc;
+    }
+  }
+
+  if (endptr != nullptr) { *endptr = (char *)(any ? s - 1 : nptr); }
+
+  return acc;
+}
+
+#endif
+
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
+
+
+
+
+
+void* memmove_P(void *dest, const void *src, size_t n)
+{
+  if (src > (void*)0x40000000) {
+    return memcpy_P(dest, src, n);
+  } else {
+    return memmove(dest, src, n);
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_rotary.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_rotary.ino"
+#ifdef USE_LIGHT
+
+#ifdef ROTARY_V1
+
+
+
+
+struct ROTARY {
+  unsigned long debounce = 0;
+  uint8_t present = 0;
+  uint8_t state = 0;
+  uint8_t position = 128;
+  uint8_t last_position = 128;
+  uint8_t interrupts_in_use_count = 0;
+  uint8_t changed = 0;
+} Rotary;
+
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void update_rotary(void) ICACHE_RAM_ATTR;
+#endif
+
+void update_rotary(void)
+{
+  if (MI_DESK_LAMP == my_module_type) {
+    if (LightPowerIRAM()) {
+
+
+
+
+      uint8_t s = Rotary.state & 3;
+      if (digitalRead(pin[GPIO_ROT1A])) { s |= 4; }
+      if (digitalRead(pin[GPIO_ROT1B])) { s |= 8; }
+      switch (s) {
+        case 0: case 5: case 10: case 15:
+          break;
+        case 1: case 7: case 8: case 14:
+          Rotary.position++; break;
+        case 2: case 4: case 11: case 13:
+          Rotary.position--; break;
+        case 3: case 12:
+          Rotary.position = Rotary.position + 2; break;
+        default:
+          Rotary.position = Rotary.position - 2; break;
+      }
+      Rotary.state = (s >> 2);
+    }
+  }
+}
+
+bool RotaryButtonPressed(void)
+{
+  if ((MI_DESK_LAMP == my_module_type) && (Rotary.changed) && LightPower()) {
+    Rotary.changed = 0;
+    return true;
+  }
+  return false;
+}
+
+void RotaryInit(void)
+{
+  Rotary.present = 0;
+  if ((pin[GPIO_ROT1A] < 99) && (pin[GPIO_ROT1B] < 99)) {
+    Rotary.present++;
+    pinMode(pin[GPIO_ROT1A], INPUT_PULLUP);
+    pinMode(pin[GPIO_ROT1B], INPUT_PULLUP);
+
+
+
+
+    if ((pin[GPIO_ROT1A] < 6) || (pin[GPIO_ROT1A] > 11)) {
+      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1A]), update_rotary, CHANGE);
+      Rotary.interrupts_in_use_count++;
+    }
+    if ((pin[GPIO_ROT1B] < 6) || (pin[GPIO_ROT1B] > 11)) {
+      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1B]), update_rotary, CHANGE);
+      Rotary.interrupts_in_use_count++;
+    }
+  }
+}
+
+
+
+
+
+void RotaryHandler(void)
+{
+  if (Rotary.interrupts_in_use_count < 2) {
+    noInterrupts();
+    update_rotary();
+  } else {
+    noInterrupts();
+  }
+  if (Rotary.last_position != Rotary.position) {
+    if (MI_DESK_LAMP == my_module_type) {
+      if (Button.hold_timer[0]) {
+        Rotary.changed = 1;
+
+        int16_t t = LightGetColorTemp();
+        t = t + (Rotary.position - Rotary.last_position);
+        if (t < 153) {
+          t = 153;
+        }
+        if (t > 500) {
+          t = 500;
+        }
+        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), Rotary.position - Rotary.last_position);
+        LightSetColorTemp((uint16_t)t);
+      } else {
+        int8_t d = Settings.light_dimmer;
+        d = d + (Rotary.position - Rotary.last_position);
+        if (d < 1) {
+          d = 1;
+        }
+        if (d > 100) {
+          d = 100;
+        }
+        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), Rotary.position - Rotary.last_position);
+
+        LightSetDimmer((uint8_t)d);
+        Settings.light_dimmer = d;
+      }
+    }
+    Rotary.last_position = 128;
+    Rotary.position = 128;
+  }
+  interrupts();
+}
+
+void RotaryLoop(void)
+{
+  if (Rotary.present) {
+    if (TimeReached(Rotary.debounce)) {
+      SetNextTimeInterval(Rotary.debounce, Settings.button_debounce);
+      RotaryHandler();
+    }
+  }
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_rtc.ino"
+# 25 "S:/Development/Tasmota/tasmota/support_rtc.ino"
+const uint32_t SECS_PER_MIN = 60UL;
+const uint32_t SECS_PER_HOUR = 3600UL;
+const uint32_t SECS_PER_DAY = SECS_PER_HOUR * 24UL;
+const uint32_t MINS_PER_HOUR = 60UL;
+
+#define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
+
+extern "C" {
+#include "sntp.h"
+}
+#include <Ticker.h>
+
+Ticker TickerRtc;
+
+static const uint8_t kDaysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static const char kMonthNamesEnglish[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
+
+struct RTC {
+  uint32_t utc_time = 0;
+  uint32_t local_time = 0;
+  uint32_t daylight_saving_time = 0;
+  uint32_t standard_time = 0;
+  uint32_t ntp_time = 0;
+  uint32_t midnight = 0;
+  uint32_t restart_time = 0;
+  int32_t time_timezone = 0;
+  uint8_t ntp_sync_minute = 0;
+  bool midnight_now = false;
+  bool user_time_entry = false;
+} Rtc;
+
+uint32_t UtcTime(void)
+{
+  return Rtc.utc_time;
+}
+
+uint32_t LocalTime(void)
+{
+  return Rtc.local_time;
+}
+
+uint32_t Midnight(void)
+{
+  return Rtc.midnight;
+}
+
+bool MidnightNow(void)
+{
+  if (Rtc.midnight_now) {
+    Rtc.midnight_now = false;
+    return true;
+  }
+  return false;
+}
+
+bool IsDst(void)
+{
+  if (Rtc.time_timezone == Settings.toffset[1]) {
+    return true;
+  }
+  return false;
+}
+
+String GetBuildDateAndTime(void)
+{
+
+  char bdt[21];
+  char *p;
+  char mdate[] = __DATE__;
+  char *smonth = mdate;
+  int day = 0;
+  int year = 0;
+
+
+  uint8_t i = 0;
+  for (char *str = strtok_r(mdate, " ", &p); str && i < 3; str = strtok_r(nullptr, " ", &p)) {
+    switch (i++) {
+    case 0:
+      smonth = str;
+      break;
+    case 1:
+      day = atoi(str);
+      break;
+    case 2:
+      year = atoi(str);
+    }
+  }
+  int month = (strstr(kMonthNamesEnglish, smonth) -kMonthNamesEnglish) /3 +1;
+  snprintf_P(bdt, sizeof(bdt), PSTR("%d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%s"), year, month, day, __TIME__);
+  return String(bdt);
+}
+
+String GetMinuteTime(uint32_t minutes)
+{
+  char tm[6];
+  snprintf_P(tm, sizeof(tm), PSTR("%02d:%02d"), minutes / 60, minutes % 60);
+
+  return String(tm);
+}
+
+String GetTimeZone(void)
+{
+  char tz[7];
+  snprintf_P(tz, sizeof(tz), PSTR("%+03d:%02d"), Rtc.time_timezone / 60, abs(Rtc.time_timezone % 60));
+
+  return String(tz);
+}
+
+String GetDuration(uint32_t time)
+{
+  char dt[16];
+
+  TIME_T ut;
+  BreakTime(time, ut);
+
+
+
+
+
+
+  snprintf_P(dt, sizeof(dt), PSTR("%dT%02d:%02d:%02d"), ut.days, ut.hour, ut.minute, ut.second);
+
+  return String(dt);
+}
+
+String GetDT(uint32_t time)
+{
+
+
+  char dt[20];
+  TIME_T tmpTime;
+
+  BreakTime(time, tmpTime);
+  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
+    tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
+
+  return String(dt);
+}
+# 175 "S:/Development/Tasmota/tasmota/support_rtc.ino"
+String GetDateAndTime(uint8_t time_type)
+{
+
+  uint32_t time = Rtc.local_time;
+
+  switch (time_type) {
+    case DT_UTC:
+      time = Rtc.utc_time;
+      break;
+
+
+
+    case DT_DST:
+      time = Rtc.daylight_saving_time;
+      break;
+    case DT_STD:
+      time = Rtc.standard_time;
+      break;
+    case DT_RESTART:
+      if (Rtc.restart_time == 0) {
+        return "";
+      }
+      time = Rtc.restart_time;
+      break;
+    case DT_ENERGY:
+      time = Settings.energy_kWhtotal_time;
+      break;
+    case DT_BOOTCOUNT:
+      time = Settings.bootcount_reset_time;
+      break;
+  }
+  String dt = GetDT(time);
+  if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {
+    dt += GetTimeZone();
+  }
+  return dt;
+}
+
+uint32_t UpTime(void)
+{
+  if (Rtc.restart_time) {
+    return Rtc.utc_time - Rtc.restart_time;
+  } else {
+    return uptime;
+  }
+}
+
+uint32_t MinutesUptime(void)
+{
+  return (UpTime() / 60);
+}
+
+String GetUptime(void)
+{
+  return GetDuration(UpTime());
+}
+
+uint32_t MinutesPastMidnight(void)
+{
+  uint32_t minutes = 0;
+
+  if (RtcTime.valid) {
+    minutes = (RtcTime.hour *60) + RtcTime.minute;
+  }
+  return minutes;
+}
+
+void BreakTime(uint32_t time_input, TIME_T &tm)
+{
+
+
+
+
+  uint8_t year;
+  uint8_t month;
+  uint8_t month_length;
+  uint32_t time;
+  unsigned long days;
+
+  time = time_input;
+  tm.second = time % 60;
+  time /= 60;
+  tm.minute = time % 60;
+  time /= 60;
+  tm.hour = time % 24;
+  time /= 24;
+  tm.days = time;
+  tm.day_of_week = ((time + 4) % 7) + 1;
+
+  year = 0;
+  days = 0;
+  while((unsigned)(days += (LEAP_YEAR(year) ? 366 : 365)) <= time) {
+    year++;
+  }
+  tm.year = year;
+
+  days -= LEAP_YEAR(year) ? 366 : 365;
+  time -= days;
+  tm.day_of_year = time;
+
+  for (month = 0; month < 12; month++) {
+    if (1 == month) {
+      if (LEAP_YEAR(year)) {
+        month_length = 29;
+      } else {
+        month_length = 28;
+      }
+    } else {
+      month_length = kDaysInMonth[month];
+    }
+
+    if (time >= month_length) {
+      time -= month_length;
+    } else {
+      break;
+    }
+  }
+  strlcpy(tm.name_of_month, kMonthNames + (month *3), 4);
+  tm.month = month + 1;
+  tm.day_of_month = time + 1;
+  tm.valid = (time_input > START_VALID_TIME);
+}
+
+uint32_t MakeTime(TIME_T &tm)
+{
+
+
+
+  int i;
+  uint32_t seconds;
+
+
+  seconds = tm.year * (SECS_PER_DAY * 365);
+  for (i = 0; i < tm.year; i++) {
+    if (LEAP_YEAR(i)) {
+      seconds += SECS_PER_DAY;
+    }
+  }
+
+
+  for (i = 1; i < tm.month; i++) {
+    if ((2 == i) && LEAP_YEAR(tm.year)) {
+      seconds += SECS_PER_DAY * 29;
+    } else {
+      seconds += SECS_PER_DAY * kDaysInMonth[i-1];
+    }
+  }
+  seconds+= (tm.day_of_month - 1) * SECS_PER_DAY;
+  seconds+= tm.hour * SECS_PER_HOUR;
+  seconds+= tm.minute * SECS_PER_MIN;
+  seconds+= tm.second;
+  return seconds;
+}
+
+uint32_t RuleToTime(TimeRule r, int yr)
+{
+  TIME_T tm;
+  uint32_t t;
+  uint8_t m;
+  uint8_t w;
+
+  m = r.month;
+  w = r.week;
+  if (0 == w) {
+    if (++m > 12) {
+      m = 1;
+      yr++;
+    }
+    w = 1;
+  }
+
+  tm.hour = r.hour;
+  tm.minute = 0;
+  tm.second = 0;
+  tm.day_of_month = 1;
+  tm.month = m;
+  tm.year = yr - 1970;
+  t = MakeTime(tm);
+  BreakTime(t, tm);
+  t += (7 * (w - 1) + (r.dow - tm.day_of_week + 7) % 7) * SECS_PER_DAY;
+  if (0 == r.week) {
+    t -= 7 * SECS_PER_DAY;
+  }
+  return t;
+}
+
+void RtcSecond(void)
+{
+  TIME_T tmpTime;
+
+  if (!Rtc.user_time_entry && !global_state.wifi_down) {
+    uint8_t uptime_minute = (uptime / 60) % 60;
+    if ((Rtc.ntp_sync_minute > 59) && (uptime_minute > 2)) {
+      Rtc.ntp_sync_minute = 1;
+    }
+    uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ;
+    if ( (((offset == RtcTime.second) && ( (RtcTime.year < 2016) ||
+                                           (Rtc.ntp_sync_minute == uptime_minute))) ||
+                                            ntp_force_sync ) ) {
+      Rtc.ntp_time = sntp_get_current_timestamp();
+      if (Rtc.ntp_time > START_VALID_TIME) {
+        ntp_force_sync = false;
+        Rtc.utc_time = Rtc.ntp_time;
+        Rtc.ntp_sync_minute = 60;
+        if (Rtc.restart_time == 0) {
+          Rtc.restart_time = Rtc.utc_time - uptime;
+        }
+        BreakTime(Rtc.utc_time, tmpTime);
+        RtcTime.year = tmpTime.year + 1970;
+        Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
+        Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
+
+
+        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: " D_UTC_TIME " %s, " D_DST_TIME " %s, " D_STD_TIME " %s"),
+          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
+
+        if (Rtc.local_time < START_VALID_TIME) {
+          rules_flag.time_init = 1;
+        } else {
+          rules_flag.time_set = 1;
+        }
+      } else {
+        Rtc.ntp_sync_minute++;
+      }
+    }
+  }
+
+  Rtc.utc_time++;
+  Rtc.local_time = Rtc.utc_time;
+  if (Rtc.local_time > START_VALID_TIME) {
+    int16_t timezone_minutes = Settings.timezone_minutes;
+    if (Settings.timezone < 0) { timezone_minutes *= -1; }
+    Rtc.time_timezone = (Settings.timezone * SECS_PER_HOUR) + (timezone_minutes * SECS_PER_MIN);
+    if (99 == Settings.timezone) {
+      int32_t dstoffset = Settings.toffset[1] * SECS_PER_MIN;
+      int32_t stdoffset = Settings.toffset[0] * SECS_PER_MIN;
+      if (Settings.tflag[1].hemis) {
+
+        if ((Rtc.utc_time >= (Rtc.standard_time - dstoffset)) && (Rtc.utc_time < (Rtc.daylight_saving_time - stdoffset))) {
+          Rtc.time_timezone = stdoffset;
+        } else {
+          Rtc.time_timezone = dstoffset;
+        }
+      } else {
+
+        if ((Rtc.utc_time >= (Rtc.daylight_saving_time - stdoffset)) && (Rtc.utc_time < (Rtc.standard_time - dstoffset))) {
+          Rtc.time_timezone = dstoffset;
+        } else {
+          Rtc.time_timezone = stdoffset;
+        }
+      }
+    }
+    Rtc.local_time += Rtc.time_timezone;
+    Rtc.time_timezone /= 60;
+    if (!Settings.energy_kWhtotal_time) {
+      Settings.energy_kWhtotal_time = Rtc.local_time;
+    }
+    if (Settings.bootcount_reset_time < START_VALID_TIME) {
+      Settings.bootcount_reset_time = Rtc.local_time;
+    }
+  }
+
+  BreakTime(Rtc.local_time, RtcTime);
+  if (RtcTime.valid) {
+    if (!Rtc.midnight) {
+      Rtc.midnight = Rtc.local_time - (RtcTime.hour * 3600) - (RtcTime.minute * 60) - RtcTime.second;
+    }
+    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) {
+      Rtc.midnight = Rtc.local_time;
+      Rtc.midnight_now = true;
+    }
+  }
+
+  RtcTime.year += 1970;
+}
+
+void RtcSetTime(uint32_t epoch)
+{
+  if (epoch < START_VALID_TIME) {
+    Rtc.user_time_entry = false;
+    ntp_force_sync = true;
+    sntp_init();
+  } else {
+    sntp_stop();
+    Rtc.user_time_entry = true;
+    Rtc.utc_time = epoch -1;
+  }
+  RtcSecond();
+}
+
+void RtcInit(void)
+{
+  sntp_setservername(0, SettingsText(SET_NTPSERVER1));
+  sntp_setservername(1, SettingsText(SET_NTPSERVER2));
+  sntp_setservername(2, SettingsText(SET_NTPSERVER3));
+  sntp_stop();
+  sntp_set_timezone(0);
+  sntp_init();
+  Rtc.utc_time = 0;
+  BreakTime(Rtc.utc_time, RtcTime);
+  TickerRtc.attach(1, RtcSecond);
+}
+# 1 "S:/Development/Tasmota/tasmota/support_static_buffer.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_static_buffer.ino"
+typedef struct SBuffer_impl {
+  uint16_t size;
+  uint16_t len;
+  uint8_t buf[];
+} SBuffer_impl;
+
+
+
+typedef class SBuffer {
+
+protected:
+  SBuffer(void) {
+
+  }
+
+public:
+  SBuffer(const size_t size) {
+    _buf = (SBuffer_impl*) new char[size+4];
+    _buf->size = size;
+    _buf->len = 0;
+
+  }
+
+  inline size_t getSize(void) const { return _buf->size; }
+  inline size_t size(void) const { return _buf->size; }
+  inline size_t getLen(void) const { return _buf->len; }
+  inline size_t len(void) const { return _buf->len; }
+  inline uint8_t *getBuffer(void) const { return _buf->buf; }
+  inline uint8_t *buf(size_t i = 0) const { return &_buf->buf[i]; }
+  inline char *charptr(size_t i = 0) const { return (char*) &_buf->buf[i]; }
+
+  virtual ~SBuffer(void) {
+    delete[] _buf;
+  }
+
+  inline void setLen(const size_t len) {
+    uint16_t old_len = _buf->len;
+    _buf->len = (len <= _buf->size) ? len : _buf->size;
+    if (old_len < _buf->len) {
+      memset((void*) &_buf->buf[old_len], 0, _buf->len - old_len);
+    }
+  }
+
+  void set8(const size_t offset, const uint8_t data) {
+    if (offset < _buf->len) {
+      _buf->buf[offset] = data;
+    }
+  }
+
+  size_t add8(const uint8_t data) {
+    if (_buf->len < _buf->size) {
+      _buf->buf[_buf->len++] = data;
+    }
+    return _buf->len;
+  }
+  size_t add16(const uint16_t data) {
+    if (_buf->len < _buf->size - 1) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+    }
+    return _buf->len;
+  }
+  size_t add32(const uint32_t data) {
+    if (_buf->len < _buf->size - 3) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+      _buf->buf[_buf->len++] = data >> 16;
+      _buf->buf[_buf->len++] = data >> 24;
+    }
+    return _buf->len;
+  }
+  size_t add64(const uint64_t data) {
+    if (_buf->len < _buf->size - 7) {
+      _buf->buf[_buf->len++] = data;
+      _buf->buf[_buf->len++] = data >> 8;
+      _buf->buf[_buf->len++] = data >> 16;
+      _buf->buf[_buf->len++] = data >> 24;
+      _buf->buf[_buf->len++] = data >> 32;
+      _buf->buf[_buf->len++] = data >> 40;
+      _buf->buf[_buf->len++] = data >> 48;
+      _buf->buf[_buf->len++] = data >> 56;
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const SBuffer &buf2) {
+    if (len() + buf2.len() <= size()) {
+      for (uint32_t i = 0; i < buf2.len(); i++) {
+        _buf->buf[_buf->len++] = buf2.buf()[i];
+      }
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const uint8_t *buf2, size_t len2) {
+    if (len() + len2 <= size()) {
+      for (uint32_t i = 0; i < len2; i++) {
+        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
+      }
+    }
+    return _buf->len;
+  }
+
+  size_t addBuffer(const char *buf2, size_t len2) {
+    if (len() + len2 <= size()) {
+      for (uint32_t i = 0; i < len2; i++) {
+        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
+      }
+    }
+    return _buf->len;
+  }
+
+  uint8_t get8(size_t offset) const {
+    if (offset < _buf->len) {
+      return _buf->buf[offset];
+    } else {
+      return 0;
+    }
+  }
+  uint8_t read8(const size_t offset) const {
+    if (offset < len()) {
+      return _buf->buf[offset];
+    }
+    return 0;
+  }
+  uint16_t get16(const size_t offset) const {
+    if (offset < len() - 1) {
+      return _buf->buf[offset] | (_buf->buf[offset+1] << 8);
+    }
+    return 0;
+  }
+  uint32_t get32(const size_t offset) const {
+    if (offset < len() - 3) {
+      return _buf->buf[offset] | (_buf->buf[offset+1] << 8) |
+            (_buf->buf[offset+2] << 16) | (_buf->buf[offset+3] << 24);
+    }
+    return 0;
+  }
+  uint64_t get64(const size_t offset) const {
+    if (offset < len() - 7) {
+      return (uint64_t)_buf->buf[offset] | ((uint64_t)_buf->buf[offset+1] << 8) |
+            ((uint64_t)_buf->buf[offset+2] << 16) | ((uint64_t)_buf->buf[offset+3] << 24) |
+            ((uint64_t)_buf->buf[offset+4] << 32) | ((uint64_t)_buf->buf[offset+5] << 40) |
+            ((uint64_t)_buf->buf[offset+6] << 48) | ((uint64_t)_buf->buf[offset+7] << 56);
+    }
+    return 0;
+  }
+
+
+  inline size_t strlen(const size_t offset) const {
+    return strnlen((const char*) &_buf->buf[offset], len() - offset);
+  }
+
+  size_t strlen_s(const size_t offset) const {
+    size_t slen = this->strlen(offset);
+    if (slen == len() - offset) {
+      return 0;
+    } else {
+      return slen;
+    }
+  }
+
+  SBuffer subBuffer(const size_t start, size_t len) const {
+    if (start >= _buf->len) {
+      len = 0;
+    } else if (start + len > _buf->len) {
+      len = _buf->len - start;
+    }
+
+    SBuffer buf2(len);
+    memcpy(buf2.buf(), buf()+start, len);
+    buf2._buf->len = len;
+    return buf2;
+  }
+
+  static SBuffer SBufferFromHex(const char *hex, size_t len) {
+    size_t buf_len = (len + 3) / 2;
+    SBuffer buf2(buf_len);
+    uint8_t val;
+
+    for (; len > 1; len -= 2) {
+      val = asc2byte(*hex++) << 4;
+      val |= asc2byte(*hex++);
+      buf2.add8(val);
+    }
+    return buf2;
+  }
+
+protected:
+
+  static uint8_t asc2byte(char chr) {
+    uint8_t rVal = 0;
+    if (isdigit(chr)) { rVal = chr - '0'; }
+    else if (chr >= 'A' && chr <= 'F') { rVal = chr + 10 - 'A'; }
+    else if (chr >= 'a' && chr <= 'f') { rVal = chr + 10 - 'a'; }
+    return rVal;
+  }
+
+  static void unHex(const char* in, uint8_t *out, size_t len) {
+  }
+
+protected:
+  SBuffer_impl * _buf;
+
+} SBuffer;
+
+typedef class PreAllocatedSBuffer : public SBuffer {
+
+public:
+  PreAllocatedSBuffer(const size_t size, void * buffer) {
+    _buf = (SBuffer_impl*) buffer;
+    _buf->size = size - 4;
+    _buf->len = 0;
+  }
+
+  ~PreAllocatedSBuffer(void) {
+
+    _buf = nullptr;
+  }
+} PreAllocatedSBuffer;
+# 1 "S:/Development/Tasmota/tasmota/support_statistics.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_statistics.ino"
+#define USE_STATS_CODE 
+
+#ifdef USE_STATS_CODE
+
+
+
+
+String GetStatistics(void)
+{
+  char data[40];
+  snprintf_P(data, sizeof(data), PSTR(",\"CR\":\"%d/%d\""), GetSettingsTextLen(), settings_text_size);
+  return String(data);
+}
+
+#else
+
+String GetStatistics(void)
+{
+  return String("");
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_switch.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_switch.ino"
+#define SWITCH_V2 
+#ifdef SWITCH_V2
+
+
+
+
+
+
+const uint8_t SWITCH_PROBE_INTERVAL = 10;
+
+#include <Ticker.h>
+
+Ticker TickerSwitch;
+
+struct SWITCH {
+  unsigned long debounce = 0;
+  uint16_t no_pullup_mask = 0;
+  uint8_t state[MAX_SWITCHES] = { 0 };
+  uint8_t last_state[MAX_SWITCHES];
+  uint8_t hold_timer[MAX_SWITCHES] = { 0 };
+  uint8_t virtual_state[MAX_SWITCHES];
+  uint8_t present = 0;
+} Switch;
+
+
+
+void SwitchPullupFlag(uint16 switch_bit)
+{
+  bitSet(Switch.no_pullup_mask, switch_bit);
+}
+
+void SwitchSetVirtual(uint32_t index, uint8_t state)
+{
+  Switch.virtual_state[index] = state;
+}
+
+uint8_t SwitchGetVirtual(uint32_t index)
+{
+  return Switch.virtual_state[index];
+}
+
+uint8_t SwitchLastState(uint32_t index)
+{
+  return Switch.last_state[index];
+}
+
+bool SwitchState(uint32_t index)
+{
+  uint32_t switchmode = Settings.switchmode[index];
+  return ((FOLLOW_INV == switchmode) ||
+          (PUSHBUTTON_INV == switchmode) ||
+          (PUSHBUTTONHOLD_INV == switchmode) ||
+          (FOLLOWMULTI_INV == switchmode) ||
+          (PUSHHOLDMULTI_INV == switchmode)
+         ) ^ Switch.last_state[index];
+}
+
+
+
+void SwitchProbe(void)
+{
+  if (uptime < 4) { return; }
+
+  uint8_t state_filter = Settings.switch_debounce / SWITCH_PROBE_INTERVAL;
+  uint8_t force_high = (Settings.switch_debounce % 50) &1;
+  uint8_t force_low = (Settings.switch_debounce % 50) &2;
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    if (pin[GPIO_SWT1 +i] < 99) {
+
+      if (1 == digitalRead(pin[GPIO_SWT1 +i])) {
+
+        if (force_high) {
+          if (1 == Switch.virtual_state[i]) {
+            Switch.state[i] = state_filter;
+          }
+        }
+
+        if (Switch.state[i] < state_filter) {
+          Switch.state[i]++;
+          if (state_filter == Switch.state[i]) {
+            Switch.virtual_state[i] = 1;
+          }
+        }
+      } else {
+
+        if (force_low) {
+          if (0 == Switch.virtual_state[i]) {
+            Switch.state[i] = 0;
+          }
+        }
+
+        if (Switch.state[i] > 0) {
+          Switch.state[i]--;
+          if (0 == Switch.state[i]) {
+            Switch.virtual_state[i] = 0;
+          }
+        }
+      }
+    }
+  }
+  TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe);
+}
+
+void SwitchInit(void)
+{
+  Switch.present = 0;
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    Switch.last_state[i] = 1;
+    if (pin[GPIO_SWT1 +i] < 99) {
+      Switch.present++;
+      pinMode(pin[GPIO_SWT1 +i], bitRead(Switch.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_SWT1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
+      Switch.last_state[i] = digitalRead(pin[GPIO_SWT1 +i]);
+    }
+    Switch.virtual_state[i] = Switch.last_state[i];
+  }
+  if (Switch.present) { TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe); }
+}
+
+
+
+
+
+void SwitchHandler(uint8_t mode)
+{
+  if (uptime < 4) { return; }
+
+  uint16_t loops_per_second = 1000 / Settings.switch_debounce;
+
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+    if ((pin[GPIO_SWT1 +i] < 99) || (mode)) {
+      uint8_t button = Switch.virtual_state[i];
+      uint8_t switchflag = POWER_TOGGLE +1;
+
+      if (Switch.hold_timer[i]) {
+        Switch.hold_timer[i]--;
+        if (0 == Switch.hold_timer[i]) {
+
+          switch (Settings.switchmode[i]) {
+            case TOGGLEMULTI:
+              switchflag = POWER_TOGGLE;
+              break;
+            case FOLLOWMULTI:
+              switchflag = button &1;
+              break;
+            case FOLLOWMULTI_INV:
+              switchflag = ~button &1;
+              break;
+            case PUSHHOLDMULTI:
+              if (NOT_PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
+              break;
+            case PUSHHOLDMULTI_INV:
+              if (PRESSED == button){
+                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
+                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
+              }
+              else
+                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
+              break;
+          default:
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
+            break;
+          }
+        }
+      }
+
+
+
+      if (button != Switch.last_state[i]) {
+        switch (Settings.switchmode[i]) {
+        case TOGGLE:
+        case PUSHBUTTON_TOGGLE:
+          switchflag = POWER_TOGGLE;
+          break;
+        case FOLLOW:
+          switchflag = button &1;
+          break;
+        case FOLLOW_INV:
+          switchflag = ~button &1;
+          break;
+        case PUSHBUTTON:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTON_INV:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTONHOLD:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
+            Switch.hold_timer[i] = 0;
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case PUSHBUTTONHOLD_INV:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
+            Switch.hold_timer[i] = 0;
+            switchflag = POWER_TOGGLE;
+          }
+          break;
+        case TOGGLEMULTI:
+        case FOLLOWMULTI:
+        case FOLLOWMULTI_INV:
+          if (Switch.hold_timer[i]) {
+            Switch.hold_timer[i] = 0;
+            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
+          } else {
+            Switch.hold_timer[i] = loops_per_second / 2;
+          }
+          break;
+        case PUSHHOLDMULTI:
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          break;
+        case PUSHHOLDMULTI_INV:
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i]!=0)
+              SendKey(KEY_SWITCH, i +1, POWER_INV);
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
+              switchflag = POWER_TOGGLE;
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          }
+          break;
+        }
+        Switch.last_state[i] = button;
+      }
+      if (switchflag <= POWER_TOGGLE) {
+        if (!SendKey(KEY_SWITCH, i +1, switchflag)) {
+          ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);
+        }
+      }
+    }
+  }
+}
+
+void SwitchLoop(void)
+{
+  if (Switch.present) {
+    if (TimeReached(Switch.debounce)) {
+      SetNextTimeInterval(Switch.debounce, Settings.switch_debounce);
+      SwitchHandler(0);
+    }
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+const char kSleepMode[] PROGMEM = "Dynamic|Normal";
+const char kPrefixes[] PROGMEM = D_CMND "|" D_STAT "|" D_TELE;
+
+char* Format(char* output, const char* input, int size)
+{
+  char *token;
+  uint32_t digits = 0;
+
+  if (strstr(input, "%") != nullptr) {
+    strlcpy(output, input, size);
+    token = strtok(output, "%");
+    if (strstr(input, "%") == input) {
+      output[0] = '\0';
+    } else {
+      token = strtok(nullptr, "");
+    }
+    if (token != nullptr) {
+      digits = atoi(token);
+      if (digits) {
+        char tmp[size];
+        if (strchr(token, 'd')) {
+          snprintf_P(tmp, size, PSTR("%s%c0%dd"), output, '%', digits);
+          snprintf_P(output, size, tmp, ESP.getChipId() & 0x1fff);
+        } else {
+          snprintf_P(tmp, size, PSTR("%s%c0%dX"), output, '%', digits);
+          snprintf_P(output, size, tmp, ESP.getChipId());
+        }
+      } else {
+        if (strchr(token, 'd')) {
+          snprintf_P(output, size, PSTR("%s%d"), output, ESP.getChipId());
+          digits = 8;
+        }
+      }
+    }
+  }
+  if (!digits) {
+    strlcpy(output, input, size);
+  }
+  return output;
+}
+
+char* GetOtaUrl(char *otaurl, size_t otaurl_size)
+{
+  if (strstr(SettingsText(SET_OTAURL), "%04d") != nullptr) {
+    snprintf(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId() & 0x1fff);
+  }
+  else if (strstr(SettingsText(SET_OTAURL), "%d") != nullptr) {
+    snprintf_P(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId());
+  }
+  else {
+    strlcpy(otaurl, SettingsText(SET_OTAURL), otaurl_size);
+  }
+
+  return otaurl;
+}
+
+char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic)
+{
+# 88 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+  char romram[CMDSZ];
+  String fulltopic;
+
+  snprintf_P(romram, sizeof(romram), subtopic);
+  if (fallback_topic_flag || (prefix > 3)) {
+    bool fallback = (prefix < 8);
+    prefix &= 3;
+    char stemp[11];
+    fulltopic = GetTextIndexed(stemp, sizeof(stemp), prefix, kPrefixes);
+    fulltopic += F("/");
+    if (fallback) {
+      fulltopic += mqtt_client;
+      fulltopic += F("_fb");
+    } else {
+      fulltopic += topic;
+    }
+  } else {
+    fulltopic = SettingsText(SET_MQTT_FULLTOPIC);
+    if ((0 == prefix) && (-1 == fulltopic.indexOf(FPSTR(MQTT_TOKEN_PREFIX)))) {
+      fulltopic += F("/");
+      fulltopic += FPSTR(MQTT_TOKEN_PREFIX);
+    }
+    for (uint32_t i = 0; i < MAX_MQTT_PREFIXES; i++) {
+      if (!strlen(SettingsText(SET_MQTTPREFIX1 + i))) {
+        char temp[TOPSZ];
+        SettingsUpdateText(SET_MQTTPREFIX1 + i, GetTextIndexed(temp, sizeof(temp), i, kPrefixes));
+      }
+    }
+    fulltopic.replace(FPSTR(MQTT_TOKEN_PREFIX), SettingsText(SET_MQTTPREFIX1 + prefix));
+
+    fulltopic.replace(FPSTR(MQTT_TOKEN_TOPIC), topic);
+    fulltopic.replace(F("%hostname%"), my_hostname);
+    String token_id = WiFi.macAddress();
+    token_id.replace(":", "");
+    fulltopic.replace(F("%id%"), token_id);
+  }
+  fulltopic.replace(F("#"), "");
+  fulltopic.replace(F("//"), "/");
+  if (!fulltopic.endsWith("/")) {
+    fulltopic += "/";
+  }
+  snprintf_P(stopic, TOPSZ, PSTR("%s%s"), fulltopic.c_str(), romram);
+  return stopic;
+}
+
+char* GetGroupTopic_P(char *stopic, const char* subtopic)
+{
+
+
+  return GetTopic_P(stopic, (Settings.flag3.grouptopic_mode) ? CMND +8 : CMND, SettingsText(SET_MQTT_GRP_TOPIC), subtopic);
+}
+
+char* GetFallbackTopic_P(char *stopic, const char* subtopic)
+{
+  return GetTopic_P(stopic, CMND +4, nullptr, subtopic);
+}
+
+char* GetStateText(uint32_t state)
+{
+  if (state >= MAX_STATE_TEXT) {
+    state = 1;
+  }
+  return SettingsText(SET_STATE_TXT1 + state);
+}
+
+
+
+void SetLatchingRelay(power_t lpower, uint32_t state)
+{
+
+
+
+
+
+  if (state && !latching_relay_pulse) {
+    latching_power = lpower;
+    latching_relay_pulse = 2;
+  }
+
+  for (uint32_t i = 0; i < devices_present; i++) {
+    uint32_t port = (i << 1) + ((latching_power >> i) &1);
+    DigitalWrite(GPIO_REL1 +port, bitRead(rel_inverted, port) ? !state : state);
+  }
+}
+
+void SetDevicePower(power_t rpower, uint32_t source)
+{
+  ShowSource(source);
+  last_source = source;
+
+  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+    power = (1 << devices_present) -1;
+    rpower = power;
+  }
+
+  if (Settings.flag.interlock) {
+    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+      power_t mask = 1;
+      uint32_t count = 0;
+      for (uint32_t j = 0; j < devices_present; j++) {
+        if ((Settings.interlock[i] & mask) && (rpower & mask)) {
+          count++;
+        }
+        mask <<= 1;
+      }
+      if (count > 1) {
+        mask = ~Settings.interlock[i];
+        power &= mask;
+        rpower &= mask;
+      }
+    }
+  }
+
+  if (rpower) {
+    last_power = rpower;
+  }
+
+  XdrvMailbox.index = rpower;
+  XdrvCall(FUNC_SET_POWER);
+
+  XdrvMailbox.index = rpower;
+  XdrvMailbox.payload = source;
+  if (XdrvCall(FUNC_SET_DEVICE_POWER)) {
+
+  }
+  else if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+    Serial.write(0xA0);
+    Serial.write(0x04);
+    Serial.write(rpower &0xFF);
+    Serial.write(0xA1);
+    Serial.write('\n');
+    Serial.flush();
+  }
+  else if (EXS_RELAY == my_module_type) {
+    SetLatchingRelay(rpower, 1);
+  }
+  else {
+    for (uint32_t i = 0; i < devices_present; i++) {
+      power_t state = rpower &1;
+      if (i < MAX_RELAYS) {
+        DigitalWrite(GPIO_REL1 +i, bitRead(rel_inverted, i) ? !state : state);
+      }
+      rpower >>= 1;
+    }
+  }
+}
+
+void RestorePower(bool publish_power, uint32_t source)
+{
+  if (power != last_power) {
+    power = last_power;
+    SetDevicePower(power, source);
+    if (publish_power) {
+      MqttPublishAllPowerState();
+    }
+  }
+}
+
+void SetAllPower(uint32_t state, uint32_t source)
+{
+# 256 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+  bool publish_power = true;
+  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
+    state &= 3;
+    publish_power = false;
+  }
+  if ((state >= POWER_OFF) && (state <= POWER_TOGGLE)) {
+    power_t all_on = (1 << devices_present) -1;
+    switch (state) {
+    case POWER_OFF:
+      power = 0;
+      break;
+    case POWER_ON:
+      power = all_on;
+      break;
+    case POWER_TOGGLE:
+      power ^= all_on;
+    }
+    SetDevicePower(power, source);
+  }
+  if (publish_power) {
+    MqttPublishAllPowerState();
+  }
+}
+
+void SetPowerOnState(void)
+{
+  if (MOTOR == my_module_type) {
+    Settings.poweronstate = POWER_ALL_ON;
+  }
+  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
+    SetDevicePower(1, SRC_RESTART);
+  } else {
+    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
+      switch (Settings.poweronstate) {
+      case POWER_ALL_OFF:
+      case POWER_ALL_OFF_PULSETIME_ON:
+        power = 0;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_ON:
+        power = (1 << devices_present) -1;
+        SetDevicePower(power, SRC_RESTART);
+        break;
+      case POWER_ALL_SAVED_TOGGLE:
+        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
+        if (Settings.flag.save_state) {
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      case POWER_ALL_SAVED:
+        power = Settings.power & ((1 << devices_present) -1);
+        if (Settings.flag.save_state) {
+          SetDevicePower(power, SRC_RESTART);
+        }
+        break;
+      }
+    } else {
+      power = Settings.power & ((1 << devices_present) -1);
+      if (Settings.flag.save_state) {
+        SetDevicePower(power, SRC_RESTART);
+      }
+    }
+  }
+
+
+  for (uint32_t i = 0; i < devices_present; i++) {
+    if (!Settings.flag3.no_power_feedback) {
+      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
+        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
+      }
+    }
+    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
+      SetPulseTimer(i, Settings.pulse_timer[i]);
+    }
+  }
+  blink_powersave = power;
+}
+
+void SetLedPowerIdx(uint32_t led, uint32_t state)
+{
+  if ((99 == pin[GPIO_LEDLNK]) && (0 == led)) {
+    if (pin[GPIO_LED2] < 99) {
+      led = 1;
+    }
+  }
+  if (pin[GPIO_LED1 + led] < 99) {
+    uint32_t mask = 1 << led;
+    if (state) {
+      state = 1;
+      led_power |= mask;
+    } else {
+      led_power &= (0xFF ^ mask);
+    }
+    DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
+  }
+#ifdef USE_BUZZER
+  if (led == 0) {
+    BuzzerSetStateToLed(state);
+  }
+#endif
+}
+
+void SetLedPower(uint32_t state)
+{
+  if (99 == pin[GPIO_LEDLNK]) {
+    SetLedPowerIdx(0, state);
+  } else {
+    power_t mask = 1;
+    for (uint32_t i = 0; i < leds_present; i++) {
+      bool tstate = (power & mask);
+      SetLedPowerIdx(i, tstate);
+      mask <<= 1;
+    }
+  }
+}
+
+void SetLedPowerAll(uint32_t state)
+{
+  for (uint32_t i = 0; i < leds_present; i++) {
+    SetLedPowerIdx(i, state);
+  }
+}
+
+void SetLedLink(uint32_t state)
+{
+  uint32_t led_pin = pin[GPIO_LEDLNK];
+  uint32_t led_inv = ledlnk_inverted;
+  if (99 == led_pin) {
+    led_pin = pin[GPIO_LED1];
+    led_inv = bitRead(led_inverted, 0);
+  }
+  if (led_pin < 99) {
+    if (state) { state = 1; }
+    digitalWrite(led_pin, (led_inv) ? !state : state);
+  }
+#ifdef USE_BUZZER
+  BuzzerSetStateToLed(state);
+#endif
+}
+
+void SetPulseTimer(uint32_t index, uint32_t time)
+{
+  pulse_timer[index] = (time > 111) ? millis() + (1000 * (time - 100)) : (time > 0) ? millis() + (100 * time) : 0L;
+}
+
+uint32_t GetPulseTimer(uint32_t index)
+{
+  long time = TimePassedSince(pulse_timer[index]);
+  if (time < 0) {
+    time *= -1;
+    return (time > 11100) ? (time / 1000) + 100 : (time > 0) ? time / 100 : 0;
+  }
+  return 0;
+}
+
+
+
+bool SendKey(uint32_t key, uint32_t device, uint32_t state)
+{
+# 423 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+  char stopic[TOPSZ];
+  char scommand[CMDSZ];
+  char key_topic[TOPSZ];
+  bool result = false;
+
+  char *tmp = (key) ? SettingsText(SET_MQTT_SWITCH_TOPIC) : SettingsText(SET_MQTT_BUTTON_TOPIC);
+  Format(key_topic, tmp, sizeof(key_topic));
+  if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) {
+    if (!key && (device > devices_present)) {
+      device = 1;
+    }
+    GetTopic_P(stopic, CMND, key_topic,
+               GetPowerDevice(scommand, device, sizeof(scommand), (key + Settings.flag.device_index_enable)));
+    if (CLEAR_RETAIN == state) {
+      mqtt_data[0] = '\0';
+    } else {
+      if ((Settings.flag3.button_switch_force_local ||
+           !strcmp(mqtt_topic, key_topic) ||
+           !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic)) &&
+          (POWER_TOGGLE == state)) {
+        state = ~(power >> (device -1)) &1;
+      }
+      snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(state));
+    }
+#ifdef USE_DOMOTICZ
+    if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) {
+#endif
+      MqttPublish(stopic, ((key) ? Settings.flag.mqtt_switch_retain
+                                 : Settings.flag.mqtt_button_retain) &&
+                                 (state != POWER_HOLD || !Settings.flag3.no_hold_retain));
+#ifdef USE_DOMOTICZ
+    }
+#endif
+    result = !Settings.flag3.button_switch_force_local;
+  } else {
+    Response_P(PSTR("{\"%s%d\":{\"State\":%d}}"), (key) ? "Switch" : "Button", device, state);
+    result = XdrvRulesProcess();
+  }
+  int32_t payload_save = XdrvMailbox.payload;
+  XdrvMailbox.payload = key << 16 | state << 8 | device;
+  XdrvCall(FUNC_ANY_KEY);
+  XdrvMailbox.payload = payload_save;
+  return result;
+}
+
+void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source)
+{
+# 483 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) {
+    blink_mask &= 1;
+    Settings.flag.interlock = 0;
+    Settings.pulse_timer[1] = 0;
+    Settings.pulse_timer[2] = 0;
+    Settings.pulse_timer[3] = 0;
+  }
+#endif
+
+  bool publish_power = true;
+  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
+    state &= 3;
+    publish_power = false;
+  }
+
+  if ((device < 1) || (device > devices_present)) {
+    device = 1;
+  }
+  active_device = device;
+
+  if (device <= MAX_PULSETIMERS) {
+    SetPulseTimer(device -1, 0);
+  }
+  power_t mask = 1 << (device -1);
+  if (state <= POWER_TOGGLE) {
+    if ((blink_mask & mask)) {
+      blink_mask &= (POWER_MASK ^ mask);
+      MqttPublishPowerBlinkState(device);
+    }
+
+    if (Settings.flag.interlock &&
+        !interlock_mutex &&
+        ((POWER_ON == state) || ((POWER_TOGGLE == state) && !(power & mask)))
+       ) {
+      interlock_mutex = true;
+      for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
+        if (Settings.interlock[i] & mask) {
+          for (uint32_t j = 0; j < devices_present; j++) {
+            power_t imask = 1 << j;
+            if ((Settings.interlock[i] & imask) && (power & imask) && (mask != imask)) {
+              ExecuteCommandPower(j +1, POWER_OFF, SRC_IGNORE);
+              delay(50);
+            }
+          }
+          break;
+        }
+      }
+      interlock_mutex = false;
+    }
+
+    switch (state) {
+    case POWER_OFF: {
+      power &= (POWER_MASK ^ mask);
+      break; }
+    case POWER_ON:
+      power |= mask;
+      break;
+    case POWER_TOGGLE:
+      power ^= mask;
+    }
+#ifdef USE_DEVICE_GROUPS
+    if (SRC_REMOTE != source && SRC_RETRY != source) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_POWER, power);
+#endif
+    SetDevicePower(power, source);
+#ifdef USE_DOMOTICZ
+    DomoticzUpdatePowerState(device);
+#endif
+#ifdef USE_KNX
+    KnxUpdatePowerState(device, power);
+#endif
+    if (publish_power && Settings.flag3.hass_tele_on_power) {
+      MqttPublishTeleState();
+    }
+    if (device <= MAX_PULSETIMERS) {
+      SetPulseTimer(device -1, (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[device -1] : 0);
+    }
+  }
+  else if (POWER_BLINK == state) {
+    if (!(blink_mask & mask)) {
+      blink_powersave = (blink_powersave & (POWER_MASK ^ mask)) | (power & mask);
+      blink_power = (power >> (device -1))&1;
+    }
+    blink_timer = millis() + 100;
+    blink_counter = ((!Settings.blinkcount) ? 64000 : (Settings.blinkcount *2)) +1;
+    blink_mask |= mask;
+    MqttPublishPowerBlinkState(device);
+    return;
+  }
+  else if (POWER_BLINK_STOP == state) {
+    bool flag = (blink_mask & mask);
+    blink_mask &= (POWER_MASK ^ mask);
+    MqttPublishPowerBlinkState(device);
+    if (flag) {
+      ExecuteCommandPower(device, (blink_powersave >> (device -1))&1, SRC_IGNORE);
+    }
+    return;
+  }
+  if (publish_power) {
+    MqttPublishPowerState(device);
+  }
+}
+
+void StopAllPowerBlink(void)
+{
+  power_t mask;
+
+  for (uint32_t i = 1; i <= devices_present; i++) {
+    mask = 1 << (i -1);
+    if (blink_mask & mask) {
+      blink_mask &= (POWER_MASK ^ mask);
+      MqttPublishPowerBlinkState(i);
+      ExecuteCommandPower(i, (blink_powersave >> (i -1))&1, SRC_IGNORE);
+    }
+  }
+}
+
+void MqttShowPWMState(void)
+{
+  ResponseAppend_P(PSTR("\"" D_CMND_PWM "\":{"));
+  bool first = true;
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    if (pin[GPIO_PWM1 + i] < 99) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_PWM "%d\":%d"), first ? "" : ",", i+1, Settings.pwm_value[i]);
+      first = false;
+    }
+  }
+  ResponseJsonEnd();
+}
+
+void MqttShowState(void)
+{
+  char stemp1[TOPSZ];
+
+  ResponseAppendTime();
+  ResponseAppend_P(PSTR(",\"" D_JSON_UPTIME "\":\"%s\",\"UptimeSec\":%u"), GetUptime().c_str(), UpTime());
+
+#ifdef USE_ADC_VCC
+  dtostrfd((double)ESP.getVcc()/1000, 3, stemp1);
+  ResponseAppend_P(PSTR(",\"" D_JSON_VCC "\":%s"), stemp1);
+#endif
+
+  ResponseAppend_P(PSTR(",\"" D_JSON_HEAPSIZE "\":%d,\"SleepMode\":\"%s\",\"Sleep\":%u,\"LoadAvg\":%u,\"MqttCount\":%u"),
+    ESP.getFreeHeap()/1024, GetTextIndexed(stemp1, sizeof(stemp1), Settings.flag3.sleep_normal, kSleepMode),
+    sleep, loop_load_avg, MqttConnectCount());
+
+  for (uint32_t i = 1; i <= devices_present; i++) {
+#ifdef USE_LIGHT
+    if ((LightDevice()) && (i >= LightDevice())) {
+      if (i == LightDevice()) { LightState(1); }
+    } else {
+#endif
+      ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable),
+                                               GetStateText(bitRead(power, i-1)));
+#ifdef USE_SONOFF_IFAN
+      if (IsModuleIfan()) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_FANSPEED "\":%d"), GetFanspeed());
+        break;
+      }
+#endif
+#ifdef USE_LIGHT
+    }
+#endif
+  }
+
+  if (pwm_present) {
+    ResponseAppend_P(PSTR(","));
+    MqttShowPWMState();
+  }
+
+  int32_t rssi = WiFi.RSSI();
+  ResponseAppend_P(PSTR(",\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_BSSID "\":\"%s\",\"" D_JSON_CHANNEL "\":%d,\"" D_JSON_RSSI "\":%d,\"" D_JSON_SIGNAL "\":%d,\"" D_JSON_LINK_COUNT "\":%d,\"" D_JSON_DOWNTIME "\":\"%s\"}}"),
+    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WiFi.BSSIDstr().c_str(), WiFi.channel(),
+    WifiGetRssiAsQuality(rssi), rssi, WifiLinkCount(), WifiDowntime().c_str());
+}
+
+void MqttPublishTeleState(void)
+{
+  mqtt_data[0] = '\0';
+  MqttShowState();
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+  RulesTeleperiod();
+#endif
+}
+
+bool MqttShowSensor(void)
+{
+  ResponseAppendTime();
+
+  int json_data_start = strlen(mqtt_data);
+  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+#ifdef USE_TM1638
+    if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
+#else
+    if (pin[GPIO_SWT1 +i] < 99) {
+#endif
+      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(SwitchState(i)));
+    }
+  }
+  XsnsCall(FUNC_JSON_APPEND);
+  XdrvCall(FUNC_JSON_APPEND);
+
+  bool json_data_available = (strlen(mqtt_data) - json_data_start);
+  if (strstr_P(mqtt_data, PSTR(D_JSON_PRESSURE)) != nullptr) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
+  }
+  if (strstr_P(mqtt_data, PSTR(D_JSON_TEMPERATURE)) != nullptr) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
+  }
+  ResponseJsonEnd();
+
+  if (json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }
+  return json_data_available;
+}
+
+void MqttPublishSensor(void)
+{
+  mqtt_data[0] = '\0';
+  if (MqttShowSensor()) {
+    MqttPublishTeleSensor();
+  }
+}
+# 714 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+void PerformEverySecond(void)
+{
+  uptime++;
+
+  if (POWER_CYCLE_TIME == uptime) {
+    UpdateQuickPowerCycle(false);
+  }
+
+  if (BOOT_LOOP_TIME == uptime) {
+    RtcRebootReset();
+
+#ifdef USE_DEEPSLEEP
+    if (!(DeepSleepEnabled() && !Settings.flag3.bootcount_update)) {
+#endif
+      Settings.bootcount++;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BOOT_COUNT " %d"), Settings.bootcount);
+#ifdef USE_DEEPSLEEP
+    }
+#endif
+  }
+
+  if (mqtt_cmnd_blocked_reset) {
+    mqtt_cmnd_blocked_reset--;
+    if (!mqtt_cmnd_blocked_reset) {
+      mqtt_cmnd_blocked = 0;
+    }
+  }
+
+  if (seriallog_timer) {
+    seriallog_timer--;
+    if (!seriallog_timer) {
+      if (seriallog_level) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SERIAL_LOGGING_DISABLED));
+      }
+      seriallog_level = 0;
+    }
+  }
+
+  if (syslog_timer) {
+    syslog_timer--;
+    if (!syslog_timer) {
+      syslog_level = Settings.syslog_level;
+      if (Settings.syslog_level) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_LOGGING_REENABLED));
+      }
+    }
+  }
+
+  ResetGlobalValues();
+
+  if (Settings.tele_period) {
+    if (tele_period >= 9999) {
+      if (!global_state.wifi_down) {
+        tele_period = 0;
+      }
+    } else {
+      tele_period++;
+      if (tele_period >= Settings.tele_period) {
+        tele_period = 0;
+
+        MqttPublishTeleState();
+
+        mqtt_data[0] = '\0';
+        if (MqttShowSensor()) {
+          MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+          RulesTeleperiod();
+#endif
+        }
+
+        XdrvCall(FUNC_AFTER_TELEPERIOD);
+      }
+    }
+  }
+}
+
+
+
+
+
+void Every100mSeconds(void)
+{
+
+  power_t power_now;
+
+  if (prepped_loglevel) {
+    AddLog(prepped_loglevel);
+    prepped_loglevel = 0;
+  }
+
+  if (latching_relay_pulse) {
+    latching_relay_pulse--;
+    if (!latching_relay_pulse) SetLatchingRelay(0, 0);
+  }
+
+  for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
+    if (pulse_timer[i] != 0L) {
+      if (TimeReached(pulse_timer[i])) {
+        pulse_timer[i] = 0L;
+        ExecuteCommandPower(i +1, (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? POWER_ON : POWER_OFF, SRC_PULSETIMER);
+      }
+    }
+  }
+
+  if (blink_mask) {
+    if (TimeReached(blink_timer)) {
+      SetNextTimeInterval(blink_timer, 100 * Settings.blinktime);
+      blink_counter--;
+      if (!blink_counter) {
+        StopAllPowerBlink();
+      } else {
+        blink_power ^= 1;
+        power_now = (power & (POWER_MASK ^ blink_mask)) | ((blink_power) ? blink_mask : 0);
+        SetDevicePower(power_now, SRC_IGNORE);
+      }
+    }
+  }
+}
+
+
+
+
+
+void Every250mSeconds(void)
+{
+
+
+  uint32_t blinkinterval = 1;
+
+  state_250mS++;
+  state_250mS &= 0x3;
+
+  if (!Settings.flag.global_state) {
+    if (global_state.data) {
+      if (global_state.mqtt_down) { blinkinterval = 7; }
+      if (global_state.wifi_down) { blinkinterval = 3; }
+      blinks = 201;
+    }
+  }
+  if (blinks || restart_flag || ota_state_flag) {
+    if (restart_flag || ota_state_flag) {
+      blinkstate = true;
+    } else {
+      blinkspeed--;
+      if (!blinkspeed) {
+        blinkspeed = blinkinterval;
+        blinkstate ^= 1;
+      }
+    }
+    if ((!(Settings.ledstate &0x08)) && ((Settings.ledstate &0x06) || (blinks > 200) || (blinkstate))) {
+      SetLedLink(blinkstate);
+    }
+    if (!blinkstate) {
+      blinks--;
+      if (200 == blinks) blinks = 0;
+    }
+  }
+  if (Settings.ledstate &1 && (pin[GPIO_LEDLNK] < 99 || !(blinks || restart_flag || ota_state_flag)) ) {
+    bool tstate = power & Settings.ledmask;
+    if ((SONOFF_TOUCH == my_module_type) || (SONOFF_T11 == my_module_type) || (SONOFF_T12 == my_module_type) || (SONOFF_T13 == my_module_type)) {
+      tstate = (!power) ? 1 : 0;
+    }
+    SetLedPower(tstate);
+  }
+
+
+
+
+
+  switch (state_250mS) {
+  case 0:
+    if (ota_state_flag && BACKLOG_EMPTY) {
+      ota_state_flag--;
+      if (2 == ota_state_flag) {
+        RtcSettings.ota_loader = 0;
+        ota_retry_counter = OTA_ATTEMPTS;
+        ESPhttpUpdate.rebootOnUpdate(false);
+        SettingsSave(1);
+      }
+      if (ota_state_flag <= 0) {
+#ifdef USE_WEBSERVER
+        if (Settings.webserver) StopWebserver();
+#endif
+#ifdef USE_ARILUX_RF
+        AriluxRfDisable();
+#endif
+        ota_state_flag = 92;
+        ota_result = 0;
+        ota_retry_counter--;
+        if (ota_retry_counter) {
+          strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
+#ifndef FIRMWARE_MINIMAL
+          if (RtcSettings.ota_loader) {
+# 919 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
+            char *bch = strrchr(mqtt_data, '/');
+            if (bch == nullptr) { bch = mqtt_data; }
+
+            char *ech = strrchr(bch, '.');
+            if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
+              char *fch = ech;
+              *fch = '\0';
+              ech = strrchr(bch, '.');
+              *fch = '.';
+            }
+            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
+            char ota_url_type[strlen(ech) +1];
+            strncpy(ota_url_type, ech, sizeof(ota_url_type));
+
+            char *pch = strrchr(bch, '-');
+            if (pch == nullptr) { pch = ech; }
+            *pch = '\0';
+            snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);
+          }
+#endif
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(mqtt_data));
+#else
+
+          WiFiClient OTAclient;
+          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, mqtt_data));
+#endif
+          if (!ota_result) {
+#ifndef FIRMWARE_MINIMAL
+            int ota_error = ESPhttpUpdate.getLastError();
+            DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error);
+            if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
+              RtcSettings.ota_loader = 1;
+            }
+#endif
+            ota_state_flag = 2;
+          }
+        }
+      }
+      if (90 == ota_state_flag) {
+        ota_state_flag = 0;
+        Response_P(PSTR("{\"" D_CMND_UPGRADE "\":\""));
+        if (ota_result) {
+
+          if (!VersionCompatible()) {
+            ResponseAppend_P(PSTR(D_JSON_FAILED " " D_UPLOAD_ERR_14));
+          } else {
+            ResponseAppend_P(PSTR(D_JSON_SUCCESSFUL ". " D_JSON_RESTARTING));
+            restart_flag = 2;
+          }
+        } else {
+          ResponseAppend_P(PSTR(D_JSON_FAILED " %s"), ESPhttpUpdate.getLastErrorString().c_str());
+        }
+        ResponseAppend_P(PSTR("\"}"));
+
+        MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_UPGRADE));
+      }
+    }
+    break;
+  case 1:
+    if (MidnightNow()) {
+      XsnsCall(FUNC_SAVE_AT_MIDNIGHT);
+    }
+    if (save_data_counter && BACKLOG_EMPTY) {
+      save_data_counter--;
+      if (save_data_counter <= 0) {
+        if (Settings.flag.save_state) {
+          power_t mask = POWER_MASK;
+          for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
+            if ((Settings.pulse_timer[i] > 0) && (Settings.pulse_timer[i] < 30)) {
+              mask &= ~(1 << i);
+            }
+          }
+          if (!((Settings.power &mask) == (power &mask))) {
+            Settings.power = power;
+          }
+        } else {
+          Settings.power = 0;
+        }
+        SettingsSave(0);
+        save_data_counter = Settings.save_data;
+      }
+    }
+    if (restart_flag && BACKLOG_EMPTY) {
+      if ((214 == restart_flag) || (215 == restart_flag) || (216 == restart_flag)) {
+
+        char storage_ssid1[strlen(SettingsText(SET_STASSID1)) +1];
+        strncpy(storage_ssid1, SettingsText(SET_STASSID1), sizeof(storage_ssid1));
+        char storage_ssid2[strlen(SettingsText(SET_STASSID2)) +1];
+        strncpy(storage_ssid2, SettingsText(SET_STASSID2), sizeof(storage_ssid2));
+        char storage_pass1[strlen(SettingsText(SET_STAPWD1)) +1];
+        strncpy(storage_pass1, SettingsText(SET_STAPWD1), sizeof(storage_pass1));
+        char storage_pass2[strlen(SettingsText(SET_STAPWD2)) +1];
+        strncpy(storage_pass2, SettingsText(SET_STAPWD2), sizeof(storage_pass2));
+
+        char storage_mqtthost[strlen(SettingsText(SET_MQTT_HOST)) +1];
+        strncpy(storage_mqtthost, SettingsText(SET_MQTT_HOST), sizeof(storage_mqtthost));
+        char storage_mqttuser[strlen(SettingsText(SET_MQTT_USER)) +1];
+        strncpy(storage_mqttuser, SettingsText(SET_MQTT_USER), sizeof(storage_mqttuser));
+        char storage_mqttpwd[strlen(SettingsText(SET_MQTT_PWD)) +1];
+        strncpy(storage_mqttpwd, SettingsText(SET_MQTT_PWD), sizeof(storage_mqttpwd));
+        char storage_mqtttopic[strlen(SettingsText(SET_MQTT_TOPIC)) +1];
+        strncpy(storage_mqtttopic, SettingsText(SET_MQTT_TOPIC), sizeof(storage_mqtttopic));
+        uint16_t mqtt_port = Settings.mqtt_port;
+
+
+
+
+        if ((215 == restart_flag) || (216 == restart_flag)) {
+          SettingsErase(0);
+        }
+        SettingsDefault();
+
+        SettingsUpdateText(SET_STASSID1, storage_ssid1);
+        SettingsUpdateText(SET_STASSID2, storage_ssid2);
+        SettingsUpdateText(SET_STAPWD1, storage_pass1);
+        SettingsUpdateText(SET_STAPWD2, storage_pass2);
+        if (216 == restart_flag) {
+
+          SettingsUpdateText(SET_MQTT_HOST, storage_mqtthost);
+          SettingsUpdateText(SET_MQTT_USER, storage_mqttuser);
+          SettingsUpdateText(SET_MQTT_PWD, storage_mqttpwd);
+          SettingsUpdateText(SET_MQTT_TOPIC, storage_mqtttopic);
+          Settings.mqtt_port = mqtt_port;
+        }
+        restart_flag = 2;
+      }
+      else if (213 == restart_flag) {
+        SettingsSdkErase();
+        restart_flag = 2;
+      }
+      else if (212 == restart_flag) {
+        SettingsErase(0);
+        restart_flag = 211;
+      }
+      if (211 == restart_flag) {
+        SettingsDefault();
+        restart_flag = 2;
+      }
+      if (2 == restart_flag) {
+        SettingsSaveAll();
+      }
+      restart_flag--;
+      if (restart_flag <= 0) {
+        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
+        EspRestart();
+      }
+    }
+    break;
+  case 2:
+    WifiCheck(wifi_state_flag);
+    wifi_state_flag = WIFI_RESTART;
+    break;
+  case 3:
+    if (!global_state.wifi_down) { MqttCheck(); }
+    break;
+  }
+}
+
+#ifdef USE_ARDUINO_OTA
+
+
+
+
+
+
+
+bool arduino_ota_triggered = false;
+uint16_t arduino_ota_progress_dot_count = 0;
+
+void ArduinoOTAInit(void)
+{
+  ArduinoOTA.setPort(8266);
+  ArduinoOTA.setHostname(my_hostname);
+  if (strlen(SettingsText(SET_WEBPWD))) {
+    ArduinoOTA.setPassword(SettingsText(SET_WEBPWD));
+  }
+
+  ArduinoOTA.onStart([]()
+  {
+    SettingsSave(1);
+#ifdef USE_WEBSERVER
+    if (Settings.webserver) { StopWebserver(); }
+#endif
+#ifdef USE_ARILUX_RF
+    AriluxRfDisable();
+#endif
+    if (Settings.flag.mqtt_enabled) {
+      MqttDisconnect();
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_UPLOAD_STARTED));
+    arduino_ota_triggered = true;
+    arduino_ota_progress_dot_count = 0;
+    delay(100);
+  });
+
+  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
+  {
+    if ((LOG_LEVEL_DEBUG <= seriallog_level)) {
+      arduino_ota_progress_dot_count++;
+      Serial.printf(".");
+      if (!(arduino_ota_progress_dot_count % 80)) { Serial.println(); }
+    }
+  });
+
+  ArduinoOTA.onError([](ota_error_t error)
+  {
+
+
+
+
+    char error_str[100];
+
+    if ((LOG_LEVEL_DEBUG <= seriallog_level) && arduino_ota_progress_dot_count) { Serial.println(); }
+    switch (error) {
+      case OTA_BEGIN_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_2), sizeof(error_str)); break;
+      case OTA_RECEIVE_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_5), sizeof(error_str)); break;
+      case OTA_END_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_7), sizeof(error_str)); break;
+      default:
+        snprintf_P(error_str, sizeof(error_str), PSTR(D_UPLOAD_ERROR_CODE " %d"), error);
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA  %s. " D_RESTARTING), error_str);
+    EspRestart();
+  });
+
+  ArduinoOTA.onEnd([]()
+  {
+    if ((LOG_LEVEL_DEBUG <= seriallog_level)) { Serial.println(); }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_SUCCESSFUL ". " D_RESTARTING));
+    EspRestart();
+ });
+
+  ArduinoOTA.begin();
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266"));
+}
+
+void ArduinoOtaLoop(void)
+{
+  MDNS.update();
+  ArduinoOTA.handle();
+
+  while (arduino_ota_triggered) { ArduinoOTA.handle(); }
+}
+#endif
+
+
+
+void SerialInput(void)
+{
+  while (Serial.available()) {
+
+    delay(0);
+    serial_in_byte = Serial.read();
+
+
+
+
+    if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
+      serial_in_byte = ButtonSerial(serial_in_byte);
+    }
+
+
+
+    if (XdrvCall(FUNC_SERIAL)) {
+      serial_in_byte_counter = 0;
+      Serial.flush();
+      return;
+    }
+
+
+
+    if (serial_in_byte > 127 && !Settings.flag.mqtt_serial_raw) {
+      serial_in_byte_counter = 0;
+      Serial.flush();
+      return;
+    }
+    if (!Settings.flag.mqtt_serial) {
+      if (isprint(serial_in_byte)) {
+        if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) {
+          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+        } else {
+          serial_in_byte_counter = 0;
+        }
+      }
+    } else {
+      if (serial_in_byte || Settings.flag.mqtt_serial_raw) {
+        if ((serial_in_byte_counter < INPUT_BUFFER_SIZE -1) &&
+            ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
+            ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
+              Settings.flag.mqtt_serial_raw)) {
+          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+          serial_polling_window = millis();
+        } else {
+          serial_polling_window = 0;
+          break;
+        }
+      }
+    }
+
+#ifdef USE_SONOFF_SC
+
+
+
+    if (SONOFF_SC == my_module_type) {
+      if (serial_in_byte == '\x1B') {
+        serial_in_buffer[serial_in_byte_counter] = 0;
+        SonoffScSerialInput(serial_in_buffer);
+        serial_in_byte_counter = 0;
+        Serial.flush();
+        return;
+      }
+    } else
+#endif
+
+
+    if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) {
+      serial_in_buffer[serial_in_byte_counter] = 0;
+      seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (uint8_t)LOG_LEVEL_INFO : Settings.seriallog_level;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), serial_in_buffer);
+      ExecuteCommand(serial_in_buffer, SRC_SERIAL);
+      serial_in_byte_counter = 0;
+      serial_polling_window = 0;
+      Serial.flush();
+      return;
+    }
+  }
+
+  if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) {
+    serial_in_buffer[serial_in_byte_counter] = 0;
+    char hex_char[(serial_in_byte_counter * 2) + 2];
+    bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
+      (assume_json) ? "" : """");
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
+    XdrvRulesProcess();
+    serial_in_byte_counter = 0;
+  }
+}
+
+
+
+void GpioInit(void)
+{
+  uint32_t mpin;
+
+  if (!ValidModule(Settings.module)) {
+    uint32_t module = MODULE;
+    if (!ValidModule(MODULE)) { module = SONOFF_BASIC; }
+    Settings.module = module;
+    Settings.last_module = module;
+  }
+  SetModuleType();
+
+  if (Settings.module != Settings.last_module) {
+    Settings.baudrate = APP_BAUDRATE / 300;
+    Settings.serial_config = TS_SERIAL_8N1;
+  }
+
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    if ((Settings.user_template.gp.io[i] >= GPIO_SENSOR_END) && (Settings.user_template.gp.io[i] < GPIO_USER)) {
+      Settings.user_template.gp.io[i] = GPIO_USER;
+    }
+  }
+
+  myio def_gp;
+  ModuleGpios(&def_gp);
+  for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+    if ((Settings.my_gp.io[i] >= GPIO_SENSOR_END) && (Settings.my_gp.io[i] < GPIO_USER)) {
+      Settings.my_gp.io[i] = GPIO_NONE;
+    }
+    else if (Settings.my_gp.io[i] > GPIO_NONE) {
+      my_module.io[i] = Settings.my_gp.io[i];
+    }
+    if ((def_gp.io[i] > GPIO_NONE) && (def_gp.io[i] < GPIO_USER)) {
+      my_module.io[i] = def_gp.io[i];
+    }
+  }
+  if ((Settings.my_adc0 >= ADC0_END) && (Settings.my_adc0 < ADC0_USER)) {
+    Settings.my_adc0 = ADC0_NONE;
+  }
+  else if (Settings.my_adc0 > ADC0_NONE) {
+    my_adc0 = Settings.my_adc0;
+  }
+  my_module_flag = ModuleFlag();
+  uint32_t template_adc0 = my_module_flag.data &15;
+  if ((template_adc0 > ADC0_NONE) && (template_adc0 < ADC0_USER)) {
+    my_adc0 = template_adc0;
+  }
+
+  for (uint32_t i = 0; i < GPIO_MAX; i++) {
+    pin[i] = 99;
+  }
+  for (uint32_t i = 0; i < sizeof(my_module.io); i++) {
+    mpin = ValidPin(i, my_module.io[i]);
+
+    DEBUG_CORE_LOG(PSTR("INI: gpio pin %d, mpin %d"), i, mpin);
+
+    if (mpin) {
+      XdrvMailbox.index = mpin;
+      XdrvMailbox.payload = i;
+
+      if ((mpin >= GPIO_SWT1_NP) && (mpin < (GPIO_SWT1_NP + MAX_SWITCHES))) {
+        SwitchPullupFlag(mpin - GPIO_SWT1_NP);
+        mpin -= (GPIO_SWT1_NP - GPIO_SWT1);
+      }
+      else if ((mpin >= GPIO_KEY1_NP) && (mpin < (GPIO_KEY1_NP + MAX_KEYS))) {
+        ButtonPullupFlag(mpin - GPIO_KEY1_NP);
+        mpin -= (GPIO_KEY1_NP - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_KEY1_INV) && (mpin < (GPIO_KEY1_INV + MAX_KEYS))) {
+        ButtonInvertFlag(mpin - GPIO_KEY1_INV);
+        mpin -= (GPIO_KEY1_INV - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_KEY1_INV_NP) && (mpin < (GPIO_KEY1_INV_NP + MAX_KEYS))) {
+        ButtonPullupFlag(mpin - GPIO_KEY1_INV_NP);
+        ButtonInvertFlag(mpin - GPIO_KEY1_INV_NP);
+        mpin -= (GPIO_KEY1_INV_NP - GPIO_KEY1);
+      }
+      else if ((mpin >= GPIO_REL1_INV) && (mpin < (GPIO_REL1_INV + MAX_RELAYS))) {
+        bitSet(rel_inverted, mpin - GPIO_REL1_INV);
+        mpin -= (GPIO_REL1_INV - GPIO_REL1);
+      }
+      else if ((mpin >= GPIO_LED1_INV) && (mpin < (GPIO_LED1_INV + MAX_LEDS))) {
+        bitSet(led_inverted, mpin - GPIO_LED1_INV);
+        mpin -= (GPIO_LED1_INV - GPIO_LED1);
+      }
+      else if (mpin == GPIO_LEDLNK_INV) {
+        ledlnk_inverted = 1;
+        mpin -= (GPIO_LEDLNK_INV - GPIO_LEDLNK);
+      }
+      else if ((mpin >= GPIO_PWM1_INV) && (mpin < (GPIO_PWM1_INV + MAX_PWMS))) {
+        bitSet(pwm_inverted, mpin - GPIO_PWM1_INV);
+        mpin -= (GPIO_PWM1_INV - GPIO_PWM1);
+      }
+      else if (XdrvCall(FUNC_PIN_STATE)) {
+        mpin = XdrvMailbox.index;
+      }
+      else if (XsnsCall(FUNC_PIN_STATE)) {
+        mpin = XdrvMailbox.index;
+      };
+    }
+    if (mpin) pin[mpin] = i;
+  }
+
+  if ((2 == pin[GPIO_TXD]) || (H801 == my_module_type)) { Serial.set_tx(2); }
+
+  analogWriteRange(Settings.pwm_range);
+  analogWriteFreq(Settings.pwm_frequency);
+
+#ifdef USE_SPI
+  spi_flg = ((((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CS] > 14)) || (pin[GPIO_SPI_CS] < 12)) || (((pin[GPIO_SPI_DC] < 99) && (pin[GPIO_SPI_DC] > 14)) || (pin[GPIO_SPI_DC] < 12)));
+  if (spi_flg) {
+    for (uint32_t i = 0; i < GPIO_MAX; i++) {
+      if ((pin[i] >= 12) && (pin[i] <=14)) pin[i] = 99;
+    }
+    my_module.io[12] = GPIO_SPI_MISO;
+    pin[GPIO_SPI_MISO] = 12;
+    my_module.io[13] = GPIO_SPI_MOSI;
+    pin[GPIO_SPI_MOSI] = 13;
+    my_module.io[14] = GPIO_SPI_CLK;
+    pin[GPIO_SPI_CLK] = 14;
+  }
+  soft_spi_flg = ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && ((pin[GPIO_SSPI_MOSI] < 99) || (pin[GPIO_SSPI_MOSI] < 99)));
+#endif
+
+#ifdef USE_I2C
+  i2c_flg = ((pin[GPIO_I2C_SCL] < 99) && (pin[GPIO_I2C_SDA] < 99));
+  if (i2c_flg) {
+    Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]);
+  }
+#endif
+
+  devices_present = 0;
+  light_type = LT_BASIC;
+  if (XdrvCall(FUNC_MODULE_INIT)) {
+
+  }
+  else if (YTF_IR_BRIDGE == my_module_type) {
+    ClaimSerial();
+
+  }
+  else if (SONOFF_DUAL == my_module_type) {
+    devices_present = 2;
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+  else if (CH4 == my_module_type) {
+    devices_present = 4;
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+#ifdef USE_SONOFF_SC
+  else if (SONOFF_SC == my_module_type) {
+    SetSerial(19200, TS_SERIAL_8N1);
+  }
+#endif
+
+  for (uint32_t i = 0; i < MAX_PWMS; i++) {
+    if (pin[GPIO_PWM1 +i] < 99) {
+      pinMode(pin[GPIO_PWM1 +i], OUTPUT);
+      if (light_type) {
+
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range : 0);
+      } else {
+        pwm_present = true;
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - Settings.pwm_value[i] : Settings.pwm_value[i]);
+      }
+    }
+  }
+
+  for (uint32_t i = 0; i < MAX_RELAYS; i++) {
+    if (pin[GPIO_REL1 +i] < 99) {
+      pinMode(pin[GPIO_REL1 +i], OUTPUT);
+      devices_present++;
+      if (EXS_RELAY == my_module_type) {
+        digitalWrite(pin[GPIO_REL1 +i], bitRead(rel_inverted, i) ? 1 : 0);
+        if (i &1) { devices_present--; }
+      }
+    }
+  }
+
+  for (uint32_t i = 0; i < MAX_LEDS; i++) {
+    if (pin[GPIO_LED1 +i] < 99) {
+#ifdef USE_ARILUX_RF
+      if ((3 == i) && (leds_present < 2) && (99 == pin[GPIO_ARIRFSEL])) {
+        pin[GPIO_ARIRFSEL] = pin[GPIO_LED4];
+        pin[GPIO_LED4] = 99;
+      } else {
+#endif
+        pinMode(pin[GPIO_LED1 +i], OUTPUT);
+        leds_present++;
+        digitalWrite(pin[GPIO_LED1 +i], bitRead(led_inverted, i));
+#ifdef USE_ARILUX_RF
+      }
+#endif
+    }
+  }
+  if (pin[GPIO_LEDLNK] < 99) {
+    pinMode(pin[GPIO_LEDLNK], OUTPUT);
+    digitalWrite(pin[GPIO_LEDLNK], ledlnk_inverted);
+  }
+
+  ButtonInit();
+  SwitchInit();
+#ifdef ROTARY_V1
+  RotaryInit();
+#endif
+
+  SetLedPower(Settings.ledstate &8);
+  SetLedLink(Settings.ledstate &8);
+
+  XdrvCall(FUNC_PRE_INIT);
+}
+# 1 "S:/Development/Tasmota/tasmota/support_udp.ino"
+# 20 "S:/Development/Tasmota/tasmota/support_udp.ino"
+#ifdef USE_EMULATION
+
+#define UDP_BUFFER_SIZE 200
+#define UDP_MSEARCH_SEND_DELAY 1500
+
+#include <Ticker.h>
+Ticker TickerMSearch;
+
+IPAddress udp_remote_ip;
+uint16_t udp_remote_port;
+
+bool udp_connected = false;
+bool udp_response_mutex = false;
+
+
+
+
+
+const char URN_BELKIN_DEVICE[] PROGMEM = "urn:belkin:device:**";
+const char URN_BELKIN_DEVICE_CAP[] PROGMEM = "urn:Belkin:device:**";
+const char UPNP_ROOTDEVICE[] PROGMEM = "upnp:rootdevice";
+const char SSDPSEARCH_ALL[] PROGMEM = "ssdpsearch:all";
+const char SSDP_ALL[] PROGMEM = "ssdp:all";
+
+
+
+
+
+bool UdpDisconnect(void)
+{
+  if (udp_connected) {
+    PortUdp.flush();
+    WiFiUDP::stopAll();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_MULTICAST_DISABLED));
+    udp_connected = false;
+  }
+  return udp_connected;
+}
+
+bool UdpConnect(void)
+{
+  if (!udp_connected) {
+
+    if (PortUdp.beginMulticast(WiFi.localIP(), IPAddress(239,255,255,250), 1900)) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_REJOINED));
+      udp_response_mutex = false;
+      udp_connected = true;
+    } else {
+      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_JOIN_FAILED));
+      udp_connected = false;
+    }
+  }
+  return udp_connected;
+}
+
+void PollUdp(void)
+{
+  if (udp_connected) {
+    while (PortUdp.parsePacket()) {
+      char packet_buffer[UDP_BUFFER_SIZE];
+
+      int len = PortUdp.read(packet_buffer, UDP_BUFFER_SIZE -1);
+      packet_buffer[len] = 0;
+
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("UDP: Packet (%d)"), len);
+
+
+
+      if (Settings.flag2.emulation) {
+#ifdef USE_SCRIPT_HUE
+        if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+#else
+        if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
+#endif
+          udp_response_mutex = true;
+
+          udp_remote_ip = PortUdp.remoteIP();
+          udp_remote_port = PortUdp.remotePort();
+
+
+
+
+          uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);
+
+          LowerCase(packet_buffer, packet_buffer);
+          RemoveSpace(packet_buffer);
+
+#ifdef USE_EMULATION_WEMO
+          if (EMUL_WEMO == Settings.flag2.emulation) {
+            if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {
+              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
+              return;
+            }
+            else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
+                    (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+                    (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
+              return;
+            }
+          }
+#endif
+
+#ifdef USE_EMULATION_HUE
+          if (EMUL_HUE == Settings.flag2.emulation) {
+            if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
+                (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
+                (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
+                (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
+              TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
+              return;
+            }
+          }
+#endif
+
+          udp_response_mutex = false;
+          continue;
+        }
+      }
+
+#ifdef USE_DEVICE_GROUPS
+      if (Settings.flag4.device_groups_enabled && !strncmp_P(packet_buffer, kDeviceGroupMessage, sizeof(DEVICE_GROUP_MESSAGE) - 1)) {
+        ProcessDeviceGroupMessage(packet_buffer, len);
+      }
+#endif
+    }
+    optimistic_yield(100);
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/support_wifi.ino"
+# 24 "S:/Development/Tasmota/tasmota/support_wifi.ino"
+#ifndef WIFI_RSSI_THRESHOLD
+#define WIFI_RSSI_THRESHOLD 10
+#endif
+#ifndef WIFI_RESCAN_MINUTES
+#define WIFI_RESCAN_MINUTES 44
+#endif
+
+const uint8_t WIFI_CONFIG_SEC = 180;
+const uint8_t WIFI_CHECK_SEC = 20;
+const uint8_t WIFI_RETRY_OFFSET_SEC = 20;
+
+#include <ESP8266WiFi.h>
+#if LWIP_IPV6
+#include <AddrList.h>
+#endif
+
+struct WIFI {
+  uint32_t last_event = 0;
+  uint32_t downtime = 0;
+  uint16_t link_count = 0;
+  uint8_t counter;
+  uint8_t retry_init;
+  uint8_t retry;
+  uint8_t status;
+  uint8_t config_type = 0;
+  uint8_t config_counter = 0;
+  uint8_t mdns_begun = 0;
+  uint8_t scan_state;
+  uint8_t bssid[6];
+  int8_t best_network_db;
+} Wifi;
+
+int WifiGetRssiAsQuality(int rssi)
+{
+  int quality = 0;
+
+  if (rssi <= -100) {
+    quality = 0;
+  } else if (rssi >= -50) {
+    quality = 100;
+  } else {
+    quality = 2 * (rssi + 100);
+  }
+  return quality;
+}
+
+bool WifiConfigCounter(void)
+{
+  if (Wifi.config_counter) {
+    Wifi.config_counter = WIFI_CONFIG_SEC;
+  }
+  return (Wifi.config_counter);
+}
+
+void WifiConfig(uint8_t type)
+{
+  if (!Wifi.config_type) {
+    if ((WIFI_RETRY == type) || (WIFI_WAIT == type)) { return; }
+#ifdef USE_EMULATION
+    UdpDisconnect();
+#endif
+    WiFi.disconnect();
+    Wifi.config_type = type;
+
+#ifndef USE_WEBSERVER
+    if (WIFI_MANAGER == Wifi.config_type) {
+      Wifi.config_type = WIFI_SERIAL;
+    }
+#endif
+
+    Wifi.config_counter = WIFI_CONFIG_SEC;
+    Wifi.counter = Wifi.config_counter +5;
+    blinks = 1999;
+    if (WIFI_RESTART == Wifi.config_type) {
+      restart_flag = 2;
+    }
+    else if (WIFI_SERIAL == Wifi.config_type) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_6_SERIAL " " D_ACTIVE_FOR_3_MINUTES));
+    }
+#ifdef USE_WEBSERVER
+    else if (WIFI_MANAGER == Wifi.config_type || WIFI_MANAGER_RESET_ONLY == Wifi.config_type) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_2_WIFIMANAGER " " D_ACTIVE_FOR_3_MINUTES));
+      WifiManagerBegin(WIFI_MANAGER_RESET_ONLY == Wifi.config_type);
+    }
+#endif
+  }
+}
+
+void WifiSetMode(WiFiMode_t wifi_mode)
+{
+  if (WiFi.getMode() == wifi_mode) { return; }
+
+  if (wifi_mode != WIFI_OFF) {
+
+    WiFi.forceSleepWake();
+    delay(100);
+  }
+
+  uint32_t retry = 2;
+  while (!WiFi.mode(wifi_mode) && retry--) {
+    AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR("Retry set Mode..."));
+    delay(100);
+  }
+
+  if (wifi_mode == WIFI_OFF) {
+    delay(1000);
+    WiFi.forceSleepBegin();
+    delay(1);
+  } else {
+    delay(30);
+  }
+}
+
+void WiFiSetSleepMode(void)
+{
+# 152 "S:/Development/Tasmota/tasmota/support_wifi.ino"
+#if defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+#else
+  if (sleep && Settings.flag3.sleep_normal) {
+    WiFi.setSleepMode(WIFI_LIGHT_SLEEP);
+  } else {
+    WiFi.setSleepMode(WIFI_MODEM_SLEEP);
+  }
+#endif
+  WifiSetOutputPower();
+}
+
+void WifiBegin(uint8_t flag, uint8_t channel)
+{
+  const char kWifiPhyMode[] = " BGN";
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_PATCH_ISSUE_2186));
+
+  WifiSetMode(WIFI_OFF);
+#endif
+
+  WiFi.persistent(false);
+  WiFi.disconnect(true);
+  delay(200);
+
+  WifiSetMode(WIFI_STA);
+  WiFiSetSleepMode();
+
+
+  if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
+
+  switch (flag) {
+  case 0:
+  case 1:
+    Settings.sta_active = flag;
+    break;
+  case 2:
+    Settings.sta_active ^= 1;
+  }
+  if (!strlen(SettingsText(SET_STASSID1 + Settings.sta_active))) {
+    Settings.sta_active ^= 1;
+  }
+  if (Settings.ip_address[0]) {
+    WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]);
+  }
+  WiFi.hostname(my_hostname);
+
+  char stemp[40] = { 0 };
+  if (channel) {
+    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
+
+    char hex_char[18];
+    snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
+  } else {
+    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
+    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
+
+#if LWIP_IPV6
+  for (bool configured = false; !configured;) {
+    uint16_t cfgcnt = 0;
+    for (auto addr : addrList) {
+      if ((configured = !addr.isLocal() && addr.isV6()) || cfgcnt==30) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI "Got IPv6 global address %s"), addr.toString().c_str());
+        break;
+      }
+      delay(500);
+      cfgcnt++;
+    }
+  }
+#endif
+}
+
+void WifiBeginAfterScan(void)
+{
+
+  if (0 == Wifi.scan_state) { return; }
+
+  if (1 == Wifi.scan_state) {
+    memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
+    Wifi.best_network_db = -127;
+    Wifi.scan_state = 3;
+  }
+
+  if (2 == Wifi.scan_state) {
+    uint8_t* bssid = WiFi.BSSID();
+    memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
+    Wifi.best_network_db = WiFi.RSSI();
+    if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
+      Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
+    }
+    Wifi.scan_state = 3;
+  }
+
+  if (3 == Wifi.scan_state) {
+    if (WiFi.scanComplete() != WIFI_SCAN_RUNNING) {
+      WiFi.scanNetworks(true);
+      Wifi.scan_state++;
+      AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR("Network (re)scan started..."));
+      return;
+    }
+  }
+  int8_t wifi_scan_result = WiFi.scanComplete();
+
+  if (4 == Wifi.scan_state) {
+    if (wifi_scan_result != WIFI_SCAN_RUNNING) {
+      Wifi.scan_state++;
+    }
+  }
+
+  if (5 == Wifi.scan_state) {
+    int32_t channel = 0;
+    int8_t ap = 3;
+    uint8_t last_bssid[6];
+    memcpy((void*) &last_bssid, (void*) &Wifi.bssid, sizeof(last_bssid));
+
+    if (wifi_scan_result > 0) {
+
+      for (uint32_t i = 0; i < wifi_scan_result; ++i) {
+
+        String ssid_scan;
+        int32_t rssi_scan;
+        uint8_t sec_scan;
+        uint8_t* bssid_scan;
+        int32_t chan_scan;
+        bool hidden_scan;
+
+        WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, bssid_scan, chan_scan, hidden_scan);
+
+        bool known = false;
+        uint32_t j;
+        for (j = 0; j < MAX_SSIDS; j++) {
+          if (ssid_scan == SettingsText(SET_STASSID1 + j)) {
+            known = true;
+            if (rssi_scan > Wifi.best_network_db) {
+              if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {
+                Wifi.best_network_db = (int8_t)rssi_scan;
+                channel = chan_scan;
+                ap = j;
+                memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
+              }
+            }
+            break;
+          }
+        }
+        char hex_char[18];
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Network %d, AP%c, SSId %s, Channel %d, BSSId %s, RSSI %d, Encryption %d"),
+          i,
+          (known) ? (j) ? '2' : '1' : '-',
+          ssid_scan.c_str(),
+          chan_scan,
+          ToHex_P((unsigned char*)bssid_scan, 6, hex_char, sizeof(hex_char), ':'),
+          rssi_scan,
+          (sec_scan == ENC_TYPE_NONE) ? 0 : 1);
+        delay(0);
+      }
+      WiFi.scanDelete();
+      delay(0);
+    }
+    Wifi.scan_state = 0;
+
+    for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
+      if (last_bssid[i] != Wifi.bssid[i]) {
+        WifiBegin(ap, channel);
+        break;
+      }
+    }
+  }
+}
+
+uint16_t WifiLinkCount(void)
+{
+  return Wifi.link_count;
+}
+
+String WifiDowntime(void)
+{
+  return GetDuration(Wifi.downtime);
+}
+
+void WifiSetState(uint8_t state)
+{
+  if (state == global_state.wifi_down) {
+    if (state) {
+      rules_flag.wifi_connected = 1;
+      Wifi.link_count++;
+      Wifi.downtime += UpTime() - Wifi.last_event;
+    } else {
+      rules_flag.wifi_disconnected = 1;
+      Wifi.last_event = UpTime();
+    }
+  }
+  global_state.wifi_down = state ^1;
+}
+
+#if LWIP_IPV6
+bool WifiCheckIPv6(void)
+{
+  bool ipv6_global=false;
+
+  for (auto a : addrList) {
+    if(!a.isLocal() && a.isV6()) ipv6_global=true;
+  }
+  return ipv6_global;
+}
+
+String WifiGetIPv6(void)
+{
+  for (auto a : addrList) {
+    if(!a.isLocal() && a.isV6()) return a.toString();
+  }
+  return "";
+}
+
+bool WifiCheckIPAddrStatus(void)
+{
+  bool ip_global=false;
+
+  for (auto a : addrList) {
+    if(!a.isLocal()) ip_global=true;
+  }
+  return ip_global;
+}
+#endif
+
+void WifiCheckIp(void)
+{
+#if LWIP_IPV6
+  if(WifiCheckIPAddrStatus()) {
+    Wifi.status = WL_CONNECTED;
+#else
+  if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
+#endif
+    WifiSetState(1);
+    Wifi.counter = WIFI_CHECK_SEC;
+    Wifi.retry = Wifi.retry_init;
+    if (Wifi.status != WL_CONNECTED) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
+
+      Settings.ip_address[1] = (uint32_t)WiFi.gatewayIP();
+      Settings.ip_address[2] = (uint32_t)WiFi.subnetMask();
+      Settings.ip_address[3] = (uint32_t)WiFi.dnsIP();
+    }
+    Wifi.status = WL_CONNECTED;
+#ifdef USE_DISCOVERY
+#ifdef WEBSERVER_ADVERTISE
+    if (2 == Wifi.mdns_begun) {
+      MDNS.update();
+      AddLog_P(LOG_LEVEL_DEBUG_MORE, D_LOG_MDNS, "MDNS.update");
+    }
+#endif
+#endif
+  } else {
+    WifiSetState(0);
+    uint8_t wifi_config_tool = Settings.sta_config;
+    Wifi.status = WiFi.status();
+    switch (Wifi.status) {
+      case WL_CONNECTED:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
+        Wifi.status = 0;
+        Wifi.retry = Wifi.retry_init;
+        break;
+      case WL_NO_SSID_AVAIL:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
+        if (WIFI_WAIT == Settings.sta_config) {
+          Wifi.retry = Wifi.retry_init;
+        } else {
+          if (Wifi.retry > (Wifi.retry_init / 2)) {
+            Wifi.retry = Wifi.retry_init / 2;
+          }
+          else if (Wifi.retry) {
+            Wifi.retry = 0;
+          }
+        }
+        break;
+      case WL_CONNECT_FAILED:
+        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
+        if (Wifi.retry > (Wifi.retry_init / 2)) {
+          Wifi.retry = Wifi.retry_init / 2;
+        }
+        else if (Wifi.retry) {
+          Wifi.retry = 0;
+        }
+        break;
+      default:
+        if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
+          AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
+        } else {
+          if (!strlen(SettingsText(SET_STASSID1)) && !strlen(SettingsText(SET_STASSID2))) {
+            wifi_config_tool = WIFI_MANAGER;
+            Wifi.retry = 0;
+          } else {
+            AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION));
+          }
+        }
+    }
+    if (Wifi.retry) {
+      if (Settings.flag3.use_wifi_scan) {
+        if (Wifi.retry_init == Wifi.retry) {
+          Wifi.scan_state = 1;
+        }
+      } else {
+        if (Wifi.retry_init == Wifi.retry) {
+          WifiBegin(3, 0);
+        }
+        if ((Settings.sta_config != WIFI_WAIT) && ((Wifi.retry_init / 2) == Wifi.retry)) {
+          WifiBegin(2, 0);
+        }
+      }
+      Wifi.counter = 1;
+      Wifi.retry--;
+    } else {
+      WifiConfig(wifi_config_tool);
+      Wifi.counter = 1;
+      Wifi.retry = Wifi.retry_init;
+    }
+  }
+}
+
+void WifiCheck(uint8_t param)
+{
+  Wifi.counter--;
+  switch (param) {
+  case WIFI_SERIAL:
+  case WIFI_MANAGER:
+    WifiConfig(param);
+    break;
+  default:
+    if (Wifi.config_counter) {
+      Wifi.config_counter--;
+      Wifi.counter = Wifi.config_counter +5;
+      if (Wifi.config_counter) {
+        if (!Wifi.config_counter) {
+          if (strlen(WiFi.SSID().c_str())) {
+            SettingsUpdateText(SET_STASSID1, WiFi.SSID().c_str());
+          }
+          if (strlen(WiFi.psk().c_str())) {
+            SettingsUpdateText(SET_STAPWD1, WiFi.psk().c_str());
+          }
+          Settings.sta_active = 0;
+          AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_WCFG_2_WIFIMANAGER D_CMND_SSID "1 %s"), SettingsText(SET_STASSID1));
+        }
+      }
+      if (!Wifi.config_counter) {
+
+        restart_flag = 2;
+      }
+    } else {
+      if (Wifi.scan_state) { WifiBeginAfterScan(); }
+
+      if (Wifi.counter <= 0) {
+        AddLog_P(LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CHECKING_CONNECTION));
+        Wifi.counter = WIFI_CHECK_SEC;
+        WifiCheckIp();
+      }
+#if LWIP_IPV6
+      if (WifiCheckIPAddrStatus()) {
+#else
+      if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0) && !Wifi.config_type) {
+#endif
+        WifiSetState(1);
+
+        if (Settings.flag3.use_wifi_rescan) {
+          if (!(uptime % (60 * WIFI_RESCAN_MINUTES))) {
+            Wifi.scan_state = 2;
+          }
+        }
+
+#ifdef FIRMWARE_MINIMAL
+        if (1 == RtcSettings.ota_loader) {
+          RtcSettings.ota_loader = 0;
+          ota_state_flag = 3;
+        }
+#endif
+
+#ifdef USE_DISCOVERY
+        if (Settings.flag3.mdns_enabled) {
+          if (!Wifi.mdns_begun) {
+
+
+
+
+
+              Wifi.mdns_begun = (uint8_t)MDNS.begin(my_hostname);
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s"), (Wifi.mdns_begun) ? D_INITIALIZED : D_FAILED);
+
+          }
+        }
+#endif
+
+#ifdef USE_WEBSERVER
+        if (Settings.webserver) {
+          StartWebserver(Settings.webserver, WiFi.localIP());
+#ifdef USE_DISCOVERY
+#ifdef WEBSERVER_ADVERTISE
+          if (1 == Wifi.mdns_begun) {
+            Wifi.mdns_begun = 2;
+            MDNS.addService("http", "tcp", WEB_PORT);
+          }
+#endif
+#endif
+        } else {
+          StopWebserver();
+        }
+#ifdef USE_EMULATION
+#ifdef USE_DEVICE_GROUPS
+        if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { UdpConnect(); }
+#else
+      if (Settings.flag2.emulation) { UdpConnect(); }
+#endif
+#endif
+#endif
+
+#ifdef USE_KNX
+        if (!knx_started && Settings.flag.knx_enabled) {
+          KNXStart();
+          knx_started = true;
+        }
+#endif
+
+      } else {
+        WifiSetState(0);
+#ifdef USE_EMULATION
+        UdpDisconnect();
+#endif
+        Wifi.mdns_begun = 0;
+#ifdef USE_KNX
+        knx_started = false;
+#endif
+      }
+    }
+  }
+}
+
+int WifiState(void)
+{
+  int state = -1;
+
+  if (!global_state.wifi_down) { state = WIFI_RESTART; }
+  if (Wifi.config_type) { state = Wifi.config_type; }
+  return state;
+}
+
+String WifiGetOutputPower(void)
+{
+  char stemp1[TOPSZ];
+  dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
+  return String(stemp1);
+}
+
+void WifiSetOutputPower(void)
+{
+  WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
+}
+
+void WifiConnect(void)
+{
+  WifiSetState(0);
+  WifiSetOutputPower();
+  WiFi.persistent(false);
+  Wifi.status = 0;
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
+  Wifi.retry = Wifi.retry_init;
+  Wifi.counter = 1;
+}
+
+
+
+void WifiDisconnect(void)
+{
+#ifdef USE_WIFI_SDK_ERASE
+  SettingsSdkWifiErase();
+#else
+
+  WiFi.persistent(true);
+  ETS_UART_INTR_DISABLE();
+  wifi_station_disconnect();
+  ETS_UART_INTR_ENABLE();
+  WiFi.persistent(false);
+  delay(100);
+#endif
+}
+
+void WifiShutdown(void)
+{
+  delay(100);
+  if (Settings.flag.mqtt_enabled) {
+    MqttDisconnect();
+  }
+  WifiDisconnect();
+}
+
+void EspRestart(void)
+{
+  WifiShutdown();
+  CrashDumpClear();
+
+  ESP.reset();
+}
+# 1 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
+# 24 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
+#ifdef USE_MQTT_TLS_CA_CERT
+
+#ifndef USE_MQTT_AWS_IOT
+# 38 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
+static const unsigned char PROGMEM TA0_DN[] = {
+ 0x30, 0x4A, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+ 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0A,
+ 0x13, 0x0D, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
+ 0x79, 0x70, 0x74, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03,
+ 0x13, 0x1A, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
+ 0x79, 0x70, 0x74, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74,
+ 0x79, 0x20, 0x58, 0x33
+};
+
+static const unsigned char PROGMEM TA0_RSA_N[] = {
+ 0x9C, 0xD3, 0x0C, 0xF0, 0x5A, 0xE5, 0x2E, 0x47, 0xB7, 0x72, 0x5D, 0x37,
+ 0x83, 0xB3, 0x68, 0x63, 0x30, 0xEA, 0xD7, 0x35, 0x26, 0x19, 0x25, 0xE1,
+ 0xBD, 0xBE, 0x35, 0xF1, 0x70, 0x92, 0x2F, 0xB7, 0xB8, 0x4B, 0x41, 0x05,
+ 0xAB, 0xA9, 0x9E, 0x35, 0x08, 0x58, 0xEC, 0xB1, 0x2A, 0xC4, 0x68, 0x87,
+ 0x0B, 0xA3, 0xE3, 0x75, 0xE4, 0xE6, 0xF3, 0xA7, 0x62, 0x71, 0xBA, 0x79,
+ 0x81, 0x60, 0x1F, 0xD7, 0x91, 0x9A, 0x9F, 0xF3, 0xD0, 0x78, 0x67, 0x71,
+ 0xC8, 0x69, 0x0E, 0x95, 0x91, 0xCF, 0xFE, 0xE6, 0x99, 0xE9, 0x60, 0x3C,
+ 0x48, 0xCC, 0x7E, 0xCA, 0x4D, 0x77, 0x12, 0x24, 0x9D, 0x47, 0x1B, 0x5A,
+ 0xEB, 0xB9, 0xEC, 0x1E, 0x37, 0x00, 0x1C, 0x9C, 0xAC, 0x7B, 0xA7, 0x05,
+ 0xEA, 0xCE, 0x4A, 0xEB, 0xBD, 0x41, 0xE5, 0x36, 0x98, 0xB9, 0xCB, 0xFD,
+ 0x6D, 0x3C, 0x96, 0x68, 0xDF, 0x23, 0x2A, 0x42, 0x90, 0x0C, 0x86, 0x74,
+ 0x67, 0xC8, 0x7F, 0xA5, 0x9A, 0xB8, 0x52, 0x61, 0x14, 0x13, 0x3F, 0x65,
+ 0xE9, 0x82, 0x87, 0xCB, 0xDB, 0xFA, 0x0E, 0x56, 0xF6, 0x86, 0x89, 0xF3,
+ 0x85, 0x3F, 0x97, 0x86, 0xAF, 0xB0, 0xDC, 0x1A, 0xEF, 0x6B, 0x0D, 0x95,
+ 0x16, 0x7D, 0xC4, 0x2B, 0xA0, 0x65, 0xB2, 0x99, 0x04, 0x36, 0x75, 0x80,
+ 0x6B, 0xAC, 0x4A, 0xF3, 0x1B, 0x90, 0x49, 0x78, 0x2F, 0xA2, 0x96, 0x4F,
+ 0x2A, 0x20, 0x25, 0x29, 0x04, 0xC6, 0x74, 0xC0, 0xD0, 0x31, 0xCD, 0x8F,
+ 0x31, 0x38, 0x95, 0x16, 0xBA, 0xA8, 0x33, 0xB8, 0x43, 0xF1, 0xB1, 0x1F,
+ 0xC3, 0x30, 0x7F, 0xA2, 0x79, 0x31, 0x13, 0x3D, 0x2D, 0x36, 0xF8, 0xE3,
+ 0xFC, 0xF2, 0x33, 0x6A, 0xB9, 0x39, 0x31, 0xC5, 0xAF, 0xC4, 0x8D, 0x0D,
+ 0x1D, 0x64, 0x16, 0x33, 0xAA, 0xFA, 0x84, 0x29, 0xB6, 0xD4, 0x0B, 0xC0,
+ 0xD8, 0x7D, 0xC3, 0x93
+};
+
+static const unsigned char TA0_RSA_E[] = {
+ 0x01, 0x00, 0x01
+};
+
+static const br_x509_trust_anchor PROGMEM LetsEncryptX3CrossSigned_TA = {
+ { (unsigned char *)TA0_DN, sizeof TA0_DN },
+ BR_X509_TA_CA,
+ {
+  BR_KEYTYPE_RSA,
+  { .rsa = {
+   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
+   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
+  } }
+ }
+};
+
+#define TAs_NUM 1
+
+#endif
+
+#ifdef USE_MQTT_AWS_IOT
+# 106 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
+const unsigned char PROGMEM TA0_DN[] = {
+ 0x30, 0x39, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+ 0x02, 0x55, 0x53, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x0A,
+ 0x13, 0x06, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17,
+ 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
+ 0x6E, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x41, 0x20, 0x31
+};
+
+const unsigned char PROGMEM TA0_RSA_N[] = {
+ 0xB2, 0x78, 0x80, 0x71, 0xCA, 0x78, 0xD5, 0xE3, 0x71, 0xAF, 0x47, 0x80,
+ 0x50, 0x74, 0x7D, 0x6E, 0xD8, 0xD7, 0x88, 0x76, 0xF4, 0x99, 0x68, 0xF7,
+ 0x58, 0x21, 0x60, 0xF9, 0x74, 0x84, 0x01, 0x2F, 0xAC, 0x02, 0x2D, 0x86,
+ 0xD3, 0xA0, 0x43, 0x7A, 0x4E, 0xB2, 0xA4, 0xD0, 0x36, 0xBA, 0x01, 0xBE,
+ 0x8D, 0xDB, 0x48, 0xC8, 0x07, 0x17, 0x36, 0x4C, 0xF4, 0xEE, 0x88, 0x23,
+ 0xC7, 0x3E, 0xEB, 0x37, 0xF5, 0xB5, 0x19, 0xF8, 0x49, 0x68, 0xB0, 0xDE,
+ 0xD7, 0xB9, 0x76, 0x38, 0x1D, 0x61, 0x9E, 0xA4, 0xFE, 0x82, 0x36, 0xA5,
+ 0xE5, 0x4A, 0x56, 0xE4, 0x45, 0xE1, 0xF9, 0xFD, 0xB4, 0x16, 0xFA, 0x74,
+ 0xDA, 0x9C, 0x9B, 0x35, 0x39, 0x2F, 0xFA, 0xB0, 0x20, 0x50, 0x06, 0x6C,
+ 0x7A, 0xD0, 0x80, 0xB2, 0xA6, 0xF9, 0xAF, 0xEC, 0x47, 0x19, 0x8F, 0x50,
+ 0x38, 0x07, 0xDC, 0xA2, 0x87, 0x39, 0x58, 0xF8, 0xBA, 0xD5, 0xA9, 0xF9,
+ 0x48, 0x67, 0x30, 0x96, 0xEE, 0x94, 0x78, 0x5E, 0x6F, 0x89, 0xA3, 0x51,
+ 0xC0, 0x30, 0x86, 0x66, 0xA1, 0x45, 0x66, 0xBA, 0x54, 0xEB, 0xA3, 0xC3,
+ 0x91, 0xF9, 0x48, 0xDC, 0xFF, 0xD1, 0xE8, 0x30, 0x2D, 0x7D, 0x2D, 0x74,
+ 0x70, 0x35, 0xD7, 0x88, 0x24, 0xF7, 0x9E, 0xC4, 0x59, 0x6E, 0xBB, 0x73,
+ 0x87, 0x17, 0xF2, 0x32, 0x46, 0x28, 0xB8, 0x43, 0xFA, 0xB7, 0x1D, 0xAA,
+ 0xCA, 0xB4, 0xF2, 0x9F, 0x24, 0x0E, 0x2D, 0x4B, 0xF7, 0x71, 0x5C, 0x5E,
+ 0x69, 0xFF, 0xEA, 0x95, 0x02, 0xCB, 0x38, 0x8A, 0xAE, 0x50, 0x38, 0x6F,
+ 0xDB, 0xFB, 0x2D, 0x62, 0x1B, 0xC5, 0xC7, 0x1E, 0x54, 0xE1, 0x77, 0xE0,
+ 0x67, 0xC8, 0x0F, 0x9C, 0x87, 0x23, 0xD6, 0x3F, 0x40, 0x20, 0x7F, 0x20,
+ 0x80, 0xC4, 0x80, 0x4C, 0x3E, 0x3B, 0x24, 0x26, 0x8E, 0x04, 0xAE, 0x6C,
+ 0x9A, 0xC8, 0xAA, 0x0D
+};
+
+static const unsigned char PROGMEM TA0_RSA_E[] = {
+ 0x01, 0x00, 0x01
+};
+
+const br_x509_trust_anchor PROGMEM AmazonRootCA1_TA = {
+ { (unsigned char *)TA0_DN, sizeof TA0_DN },
+ BR_X509_TA_CA,
+ {
+  BR_KEYTYPE_RSA,
+  { .rsa = {
+   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
+   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
+  } }
+ }
+};
+
+#define TAs_NUM 1
+
+#endif
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
+#ifdef USE_WEBSERVER
+
+
+
+
+
+
+
+#define XDRV_01 1
+
+#ifndef WIFI_SOFT_AP_CHANNEL
+#define WIFI_SOFT_AP_CHANNEL 1
+#endif
+
+const uint16_t CHUNKED_BUFFER_SIZE = 400;
+
+const uint16_t HTTP_REFRESH_TIME = 2345;
+#define HTTP_RESTART_RECONNECT_TIME 9000
+#define HTTP_OTA_RESTART_RECONNECT_TIME 20000
+
+#include <ESP8266WebServer.h>
+#include <DNSServer.h>
+
+#ifdef USE_RF_FLASH
+uint8_t *efm8bb1_update = nullptr;
+#endif
+
+enum UploadTypes { UPL_TASMOTA, UPL_SETTINGS, UPL_EFM8BB1, UPL_TASMOTASLAVE };
+
+static const char * HEADER_KEYS[] = { "User-Agent", };
+
+const char HTTP_HEADER[] PROGMEM =
+  "<!DOCTYPE html><html lang=\"" D_HTML_LANGUAGE "\" class=\"\">"
+  "<head>"
+  "<meta charset='utf-8'>"
+  "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1,user-scalable=no\"/>"
+  "<title>%s - %s</title>"
+
+  "<script>"
+  "var x=null,lt,to,tp,pc='';"
+
+#ifdef USE_JAVASCRIPT_ES6
+
+  "eb=s=>document.getElementById(s);"
+  "qs=s=>document.querySelector(s);"
+  "sp=i=>eb(i).type=(eb(i).type==='text'?'password':'text');"
+  "wl=f=>window.addEventListener('load',f);"
+  ;
+#else
+  "function eb(s){"
+    "return document.getElementById(s);"
+  "}"
+  "function qs(s){"
+    "return document.querySelector(s);"
+  "}"
+  "function sp(i){"
+    "eb(i).type=(eb(i).type==='text'?'password':'text');"
+  "}"
+  "function wl(f){"
+    "window.addEventListener('load',f);"
+  "}";
+#endif
+
+const char HTTP_SCRIPT_COUNTER[] PROGMEM =
+  "var cn=180;"
+  "function u(){"
+    "if(cn>=0){"
+      "eb('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';"
+      "cn--;"
+      "setTimeout(u,1000);"
+    "}"
+  "}"
+  "wl(u);";
+
+const char HTTP_SCRIPT_ROOT[] PROGMEM =
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  "var rfsh=1;"
+  "function la(p){"
+    "var a='';"
+    "if(la.arguments.length==1){"
+      "a=p;"
+      "clearTimeout(lt);"
+    "}"
+    "if(x!=null){x.abort();}"
+    "x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(x.readyState==4&&x.status==200){"
+        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
+        "eb('l1').innerHTML=s;"
+      "}"
+    "};"
+    "if (rfsh) {"
+      "x.open('GET','.?m=1'+a,true);"
+      "x.send();"
+      "lt=setTimeout(la,%d);"
+    "}"
+  "}"
+  "function seva(par,ivar){"
+    "la('&sv='+ivar+'_'+par);"
+  "}"
+  "function siva(par,ivar){"
+    "rfsh=1;"
+    "la('&sv='+ivar+'_'+par);"
+    "rfsh=0;"
+  "}"
+  "function pr(f){"
+    "if (f) {"
+      "lt=setTimeout(la,%d);"
+      "rfsh=1;"
+    "} else {"
+      "clearTimeout(lt);"
+      "rfsh=0;"
+    "}"
+  "}";
+#else
+  "function la(p){"
+    "var a='';"
+    "if(la.arguments.length==1){"
+      "a=p;"
+      "clearTimeout(lt);"
+    "}"
+    "if(x!=null){x.abort();}"
+    "x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(x.readyState==4&&x.status==200){"
+        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
+        "eb('l1').innerHTML=s;"
+      "}"
+    "};"
+    "x.open('GET','.?m=1'+a,true);"
+    "x.send();"
+    "lt=setTimeout(la,%d);"
+  "}";
+#endif
+
+const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM =
+  "function lc(v,i,p){"
+    "if(eb('s')){"
+      "if(v=='h'||v=='d'){"
+        "var sl=eb('sl4').value;"
+        "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';"
+      "}"
+    "}"
+    "la('&'+v+i+'='+p);"
+  "}"
+  "wl(la);";
+
+const char HTTP_SCRIPT_WIFI[] PROGMEM =
+  "function c(l){"
+    "eb('s1').value=l.innerText||l.textContent;"
+    "eb('p1').focus();"
+  "}";
+
+const char HTTP_SCRIPT_RELOAD[] PROGMEM =
+  "setTimeout(function(){location.href='.';}," STR(HTTP_RESTART_RECONNECT_TIME) ");";
+
+
+const char HTTP_SCRIPT_RELOAD_OTA[] PROGMEM =
+  "setTimeout(function(){location.href='.';}," STR(HTTP_OTA_RESTART_RECONNECT_TIME) ");";
+
+const char HTTP_SCRIPT_CONSOL[] PROGMEM =
+  "var sn=0,id=0;"
+  "function l(p){"
+    "var c,o='',t;"
+    "clearTimeout(lt);"
+    "t=eb('t1');"
+    "if(p==1){"
+      "c=eb('c1');"
+      "o='&c1='+encodeURIComponent(c.value);"
+      "c.value='';"
+      "t.scrollTop=99999;"
+      "sn=t.scrollTop;"
+    "}"
+    "if(t.scrollTop>=sn){"
+      "if(x!=null){x.abort();}"
+      "x=new XMLHttpRequest();"
+      "x.onreadystatechange=function(){"
+        "if(x.readyState==4&&x.status==200){"
+          "var z,d;"
+          "d=x.responseText.split(/}1/);"
+          "id=d.shift();"
+          "if(d.shift()==0){t.value='';}"
+          "z=d.shift();"
+          "if(z.length>0){t.value+=z;}"
+          "t.scrollTop=99999;"
+          "sn=t.scrollTop;"
+        "}"
+      "};"
+      "x.open('GET','cs?c2='+id+o,true);"
+      "x.send();"
+    "}"
+    "lt=setTimeout(l,%d);"
+    "return false;"
+  "}"
+  "wl(l);";
+
+const char HTTP_MODULE_TEMPLATE_REPLACE[] PROGMEM =
+  "}2%d'>%s (%d}3";
+
+const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
+  "var os;"
+  "function sk(s,g){"
+    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
+    "eb('g'+g).innerHTML=o;"
+    "eb('g'+g).value=s;"
+  "}"
+  "function ld(u,f){"
+    "var x=new XMLHttpRequest();"
+    "x.onreadystatechange=function(){"
+      "if(this.readyState==4&&this.status==200){"
+        "f(this);"
+      "}"
+    "};"
+    "x.open('GET',u,true);"
+    "x.send();"
+  "}";
+
+const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
+  "var c;"
+  "function x1(b){"
+    "var i,j,g,k,o;"
+    "o=b.responseText.split(/}1/);"
+    "k=o.shift();"
+    "if(eb('s1').value==''){"
+      "eb('s1').value=k;"
+    "}"
+    "os=o.shift();"
+    "as=o.shift();"
+    "g=o.shift().split(',');"
+    "j=0;"
+    "for(i=0;i<13;i++){"
+      "if(6==i){j=9;}"
+      "if(8==i){j=12;}"
+      "sk(g[i],j);"
+      "j++;"
+    "}"
+    "g=o.shift();"
+    "os=as;"
+    "sk(g&15,17);"
+    "g>>=4;"
+    "for(i=0;i<" STR(GPIO_FLAG_USED) ";i++){"
+      "p=(g>>i)&1;"
+      "eb('c'+i).checked=p;"
+    "}"
+    "if(" STR(USER_MODULE) "==c){"
+      "g=o.shift();"
+      "eb('g99').value=g;"
+    "}"
+  "}"
+  "function st(t){"
+    "c=t;"
+    "var a='tp?t='+t;"
+    "ld(a,x1);"
+  "}"
+
+  "function x2(a){"
+    "os=a.responseText;"
+    "sk(17,99);"
+    "st(" STR(USER_MODULE) ");"
+  "}"
+
+#ifdef USE_JAVASCRIPT_ES6
+  "sl=()=>ld('tp?m=1',x2);"
+#else
+  "function sl(){"
+    "ld('tp?m=1',x2);"
+  "}"
+#endif
+
+  "wl(sl);";
+
+const char HTTP_SCRIPT_MODULE1[] PROGMEM =
+  "function x1(a){"
+    "os=a.responseText;"
+    "sk(%d,99);"
+  "}"
+  "function x2(b){"
+    "os=b.responseText;";
+const char HTTP_SCRIPT_MODULE2[] PROGMEM =
+  "}"
+  "function x3(a){"
+    "os=a.responseText;"
+    "sk(%d,17);"
+  "}"
+  "function sl(){"
+    "ld('md?m=1',x1);"
+    "ld('md?g=1',x2);"
+    "if(eb('g17')){"
+      "ld('md?a=1',x3);"
+    "}"
+  "}"
+  "wl(sl);";
+
+const char HTTP_SCRIPT_INFO_BEGIN[] PROGMEM =
+  "function i(){"
+    "var s,o=\"";
+const char HTTP_SCRIPT_INFO_END[] PROGMEM =
+    "\";"
+    "s=o.replace(/}1/g,\"</td></tr><tr><th>\").replace(/}2/g,\"</th><td>\");"
+    "eb('i').innerHTML=s;"
+  "}"
+  "wl(i);";
+
+const char HTTP_HEAD_LAST_SCRIPT[] PROGMEM =
+  "function jd(){"
+    "var t=0,i=document.querySelectorAll('input,button,textarea,select');"
+    "while(i.length>=t){"
+      "if(i[t]){"
+        "i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];"
+      "}"
+      "t++;"
+    "}"
+  "}"
+  "wl(jd);"
+  "</script>";
+
+const char HTTP_HEAD_STYLE1[] PROGMEM =
+  "<style>"
+  "div,fieldset,input,select{padding:5px;font-size:1em;}"
+  "fieldset{background:#%06x;}"
+  "p{margin:0.5em 0;}"
+  "input{width:100%%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#%06x;color:#%06x;}"
+  "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
+  "input[type=range]{width:99%%;}"
+  "select{width:100%%;background:#%06x;color:#%06x;}"
+  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"
+  "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"
+  "td{padding:0px;}";
+const char HTTP_HEAD_STYLE2[] PROGMEM =
+  "button{border:0;border-radius:0.3rem;background:#%06x;color:#%06x;line-height:2.4rem;font-size:1.2rem;width:100%%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}"
+  "button:hover{background:#%06x;}"
+  ".bred{background:#%06x;}"
+  ".bred:hover{background:#%06x;}"
+  ".bgrn{background:#%06x;}"
+  ".bgrn:hover{background:#%06x;}"
+  "a{color:#%06x;text-decoration:none;}"
+  ".p{float:left;text-align:left;}"
+  ".q{float:right;text-align:right;}"
+  ".r{border-radius:0.3em;padding:2px;margin:6px 2px;}";
+const char HTTP_HEAD_STYLE3[] PROGMEM =
+  "</style>"
+
+  "</head>"
+  "<body>"
+  "<div style='text-align:left;display:inline-block;color:#%06x;min-width:340px;'>"
+#ifdef FIRMWARE_MINIMAL
+  "<div style='text-align:center;color:#%06x;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
+#endif
+  "<div style='text-align:center;color:#%06x;'><noscript>" D_NOSCRIPT "<br></noscript>"
+#ifdef LANGUAGE_MODULE_NAME
+  "<h3>" D_MODULE " %s</h3>"
+#else
+  "<h3>%s " D_MODULE "</h3>"
+#endif
+  "<h2>%s</h2>";
+
+const char HTTP_MSG_SLIDER_GRADIENT[] PROGMEM =
+  "<div id='%s' class='r' style='background-image:linear-gradient(to right,%s,%s);'>"
+  "<input id='sl%d' type='range' min='%d' max='%d' value='%d' onchange='lc(\"%c\",%d,value)'>"
+  "</div>";
+const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
+  "<div><span class='p'>" D_CLOSE "</span><span class='q'>" D_OPEN "</span></div>"
+  "<div><input type='range' min='0' max='100' value='%d' onchange='lc(\"u\",%d,value)'></div>";
+
+const char HTTP_MSG_RSTRT[] PROGMEM =
+  "<br><div style='text-align:center;'>" D_DEVICE_WILL_RESTART "</div><br>";
+
+const char HTTP_FORM_LOGIN[] PROGMEM =
+  "<fieldset>"
+  "<form method='post' action='/'>"
+  "<p><b>" D_USER "</b><br><input name='USER1' placeholder='" D_USER "'></p>"
+  "<p><b>" D_PASSWORD "</b><br><input name='PASS1' type='password' placeholder='" D_PASSWORD "'></p>"
+  "<br>"
+  "<button>" D_OK "</button>"
+  "</form></fieldset>";
+
+const char HTTP_FORM_TEMPLATE[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='tp'>";
+const char HTTP_FORM_TEMPLATE_FLAG[] PROGMEM =
+  "<p></p>"
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_FLAGS "&nbsp;</b></legend><p>"
+
+  "</p></fieldset>";
+
+const char HTTP_FORM_MODULE[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='md'>"
+  "<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99'></select><br>"
+  "<br><table>";
+
+const char HTTP_FORM_WIFI[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_WIFI_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='wi'>"
+  "<p><b>" D_AP1_SSID "</b> (" STA_SSID1 ")<br><input id='s1' placeholder='" STA_SSID1 "' value='%s'></p>"
+  "<p><b>" D_AP1_PASSWORD "</b><input type='checkbox' onclick='sp(\"p1\")'><br><input id='p1' type='password' placeholder='" D_AP1_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_AP2_SSID "</b> (" STA_SSID2 ")<br><input id='s2' placeholder='" STA_SSID2 "' value='%s'></p>"
+  "<p><b>" D_AP2_PASSWORD "</b><input type='checkbox' onclick='sp(\"p2\")'><br><input id='p2' type='password' placeholder='" D_AP2_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_HOSTNAME "</b> (%s)<br><input id='h' placeholder='%s' value='%s'></p>"
+  "<p><b>" D_CORS_DOMAIN "</b><input id='c' placeholder='" CORS_DOMAIN "' value='%s'></p>";
+
+const char HTTP_FORM_LOG1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_LOGGING_PARAMETERS "&nbsp;</b>"
+  "</legend><form method='get' action='lg'>";
+const char HTTP_FORM_LOG2[] PROGMEM =
+  "<p><b>" D_SYSLOG_HOST "</b> (" SYS_LOG_HOST ")<br><input id='lh' placeholder='" SYS_LOG_HOST "' value='%s'></p>"
+  "<p><b>" D_SYSLOG_PORT "</b> (" STR(SYS_LOG_PORT) ")<br><input id='lp' placeholder='" STR(SYS_LOG_PORT) "' value='%d'></p>"
+  "<p><b>" D_TELEMETRY_PERIOD "</b> (" STR(TELE_PERIOD) ")<br><input id='lt' placeholder='" STR(TELE_PERIOD) "' value='%d'></p>";
+
+const char HTTP_FORM_OTHER[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_OTHER_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='co'>"
+  "<p></p>"
+  "<fieldset><legend><b>&nbsp;" D_TEMPLATE "&nbsp;</b></legend>"
+  "<p><input id='t1' placeholder='" D_TEMPLATE "' value='%s'></p>"
+  "<p><input id='t2' type='checkbox'%s><b>" D_ACTIVATE "</b></p>"
+  "</fieldset>"
+  "<br>"
+  "<b>" D_WEB_ADMIN_PASSWORD "</b><input type='checkbox' onclick='sp(\"wp\")'><br><input id='wp' type='password' placeholder='" D_WEB_ADMIN_PASSWORD "' value='" D_ASTERISK_PWD "'><br>"
+  "<br>"
+  "<input id='b1' type='checkbox'%s><b>" D_MQTT_ENABLE "</b><br>"
+  "<br>";
+
+const char HTTP_FORM_END[] PROGMEM =
+  "<br>"
+  "<button name='save' type='submit' class='button bgrn'>" D_SAVE "</button>"
+  "</form></fieldset>";
+
+const char HTTP_FORM_RST[] PROGMEM =
+  "<div id='f1' style='display:block;'>"
+  "<fieldset><legend><b>&nbsp;" D_RESTORE_CONFIGURATION "&nbsp;</b></legend>";
+const char HTTP_FORM_UPG[] PROGMEM =
+  "<div id='f1' style='display:block;'>"
+  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_WEBSERVER "&nbsp;</b></legend>"
+  "<form method='get' action='u1'>"
+  "<br><b>" D_OTA_URL "</b><br><input id='o' placeholder='OTA_URL' value='%s'><br>"
+  "<br><button type='submit'>" D_START_UPGRADE "</button></form>"
+  "</fieldset><br><br>"
+  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_FILE_UPLOAD "&nbsp;</b></legend>";
+const char HTTP_FORM_RST_UPG[] PROGMEM =
+  "<form method='post' action='u2' enctype='multipart/form-data'>"
+  "<br><input type='file' name='u2'><br>"
+  "<br><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>"
+  "</fieldset>"
+  "</div>"
+  "<div id='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
+
+const char HTTP_FORM_CMND[] PROGMEM =
+  "<br><textarea readonly id='t1' cols='340' wrap='off'></textarea><br><br>"
+  "<form method='get' onsubmit='return l(1);'>"
+  "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
+
+  "</form>";
+
+const char HTTP_TABLE100[] PROGMEM =
+  "<table style='width:100%%'>";
+
+const char HTTP_COUNTER[] PROGMEM =
+  "<br><div id='t' style='text-align:center;'></div>";
+
+const char HTTP_END[] PROGMEM =
+  "<div style='text-align:right;font-size:11px;'><hr/><a href='https://bit.ly/tasmota' target='_blank' style='color:#aaa;'>Tasmota %s " D_BY " Theo Arends</a></div>"
+  "</div>"
+  "</body>"
+  "</html>";
+
+const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button onclick='la(\"&o=%d\");'>%s%s</button></td>";
+const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";
+
+enum ButtonTitle {
+  BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
+  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_CONSOLE,
+  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE };
+const char kButtonTitle[] PROGMEM =
+  D_RESTART "|" D_RESET_CONFIGURATION "|"
+  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_CONSOLE "|"
+  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION;
+const char kButtonAction[] PROGMEM =
+  ".|rt|"
+  ".|cn|in|up|cs|"
+  "md|wi|lg|co|tp|dl|rs";
+const char kButtonConfirm[] PROGMEM = D_CONFIRM_RESTART "|" D_CONFIRM_RESET_CONFIGURATION;
+
+enum CTypes { CT_HTML, CT_PLAIN, CT_XML, CT_JSON, CT_STREAM };
+const char kContentTypes[] PROGMEM = "text/html|text/plain|text/xml|application/json|application/octet-stream";
+
+const char kLoggingOptions[] PROGMEM = D_SERIAL_LOG_LEVEL "|" D_WEB_LOG_LEVEL "|" D_MQTT_LOG_LEVEL "|" D_SYS_LOG_LEVEL;
+const char kLoggingLevels[] PROGMEM = D_NONE "|" D_ERROR "|" D_INFO "|" D_DEBUG "|" D_MORE_DEBUG;
+
+const char kEmulationOptions[] PROGMEM = D_NONE "|" D_BELKIN_WEMO "|" D_HUE_BRIDGE;
+
+const char kUploadErrors[] PROGMEM =
+  D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9
+#ifdef USE_RF_FLASH
+  "|" D_UPLOAD_ERR_10 "|" D_UPLOAD_ERR_11 "|" D_UPLOAD_ERR_12 "|" D_UPLOAD_ERR_13
+#endif
+  "|" D_UPLOAD_ERR_14
+  ;
+
+const uint16_t DNS_PORT = 53;
+enum HttpOptions {HTTP_OFF, HTTP_USER, HTTP_ADMIN, HTTP_MANAGER, HTTP_MANAGER_RESET_ONLY};
+
+DNSServer *DnsServer;
+ESP8266WebServer *WebServer;
+
+struct WEB {
+  String chunk_buffer = "";
+  bool reset_web_log_flag = false;
+  uint8_t state = HTTP_OFF;
+  uint8_t upload_error = 0;
+  uint8_t upload_file_type;
+  uint8_t upload_progress_dot_count;
+  uint8_t config_block_count = 0;
+  uint8_t config_xor_on = 0;
+  uint8_t config_xor_on_set = CONFIG_FILE_XOR;
+} Web;
+
+
+static void WebGetArg(const char* arg, char* out, size_t max)
+{
+  String s = WebServer->arg(arg);
+  strlcpy(out, s.c_str(), max);
+
+}
+
+static bool WifiIsInManagerMode(){
+  return (HTTP_MANAGER == Web.state || HTTP_MANAGER_RESET_ONLY == Web.state);
+}
+
+void ShowWebSource(uint32_t source)
+{
+  if ((source > 0) && (source < SRC_MAX)) {
+    char stemp1[20];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s from %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource), WebServer->client().remoteIP().toString().c_str());
+  }
+}
+
+void ExecuteWebCommand(char* svalue, uint32_t source)
+{
+  ShowWebSource(source);
+  last_source = source;
+  ExecuteCommand(svalue, SRC_IGNORE);
+}
+
+void StartWebserver(int type, IPAddress ipweb)
+{
+  if (!Settings.web_refresh) { Settings.web_refresh = HTTP_REFRESH_TIME; }
+  if (!Web.state) {
+    if (!WebServer) {
+      WebServer = new ESP8266WebServer((HTTP_MANAGER == type || HTTP_MANAGER_RESET_ONLY == type) ? 80 : WEB_PORT);
+      WebServer->on("/", HandleRoot);
+      WebServer->onNotFound(HandleNotFound);
+      WebServer->on("/up", HandleUpgradeFirmware);
+      WebServer->on("/u1", HandleUpgradeFirmwareStart);
+      WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop);
+      WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
+      WebServer->on("/cs", HTTP_GET, HandleConsole);
+      WebServer->on("/cs", HTTP_OPTIONS, HandlePreflightRequest);
+      WebServer->on("/cm", HandleHttpCommand);
+#ifndef FIRMWARE_MINIMAL
+      WebServer->on("/cn", HandleConfiguration);
+      WebServer->on("/md", HandleModuleConfiguration);
+      WebServer->on("/wi", HandleWifiConfiguration);
+      WebServer->on("/lg", HandleLoggingConfiguration);
+      WebServer->on("/tp", HandleTemplateConfiguration);
+      WebServer->on("/co", HandleOtherConfiguration);
+      WebServer->on("/dl", HandleBackupConfiguration);
+      WebServer->on("/rs", HandleRestoreConfiguration);
+      WebServer->on("/rt", HandleResetConfiguration);
+      WebServer->on("/in", HandleInformation);
+      XdrvCall(FUNC_WEB_ADD_HANDLER);
+      XsnsCall(FUNC_WEB_ADD_HANDLER);
+#endif
+    }
+    Web.reset_web_log_flag = false;
+
+
+
+    WebServer->collectHeaders(HEADER_KEYS, sizeof(HEADER_KEYS)/sizeof(char*));
+
+    WebServer->begin();
+  }
+  if (Web.state != type) {
+#if LWIP_IPV6
+    String ipv6_addr = WifiGetIPv6();
+    if(ipv6_addr!="") AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s and IPv6 global address %s "), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str(),ipv6_addr.c_str());
+    else AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
+#else
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
+#endif
+    rules_flag.http_init = 1;
+  }
+  if (type) { Web.state = type; }
+}
+
+void StopWebserver(void)
+{
+  if (Web.state) {
+    WebServer->close();
+    Web.state = HTTP_OFF;
+    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_STOPPED));
+  }
+}
+
+void WifiManagerBegin(bool reset_only)
+{
+
+  if (!global_state.wifi_down) {
+
+    WifiSetMode(WIFI_AP_STA);
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION));
+  } else {
+
+    WifiSetMode(WIFI_AP);
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT));
+  }
+
+  StopWebserver();
+
+  DnsServer = new DNSServer();
+
+  int channel = WIFI_SOFT_AP_CHANNEL;
+  if ((channel < 1) || (channel > 13)) { channel = 1; }
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0);
+#else
+
+  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0, 1);
+#endif
+
+  delay(500);
+
+  DnsServer->setErrorReplyCode(DNSReplyCode::NoError);
+  DnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
+
+  StartWebserver((reset_only ? HTTP_MANAGER_RESET_ONLY : HTTP_MANAGER), WiFi.softAPIP());
+}
+
+void PollDnsWebserver(void)
+{
+  if (DnsServer) { DnsServer->processNextRequest(); }
+  if (WebServer) { WebServer->handleClient(); }
+}
+
+
+
+bool WebAuthenticate(void)
+{
+  if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) {
+    return WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD));
+  } else {
+    return true;
+  }
+}
+
+bool HttpCheckPriviledgedAccess(bool autorequestauth = true)
+{
+  if (HTTP_USER == Web.state) {
+    HandleRoot();
+    return false;
+  }
+  if (autorequestauth && !WebAuthenticate()) {
+    WebServer->requestAuthentication();
+    return false;
+  }
+  return true;
+}
+
+void HttpHeaderCors(void)
+{
+  if (strlen(SettingsText(SET_CORS))) {
+    WebServer->sendHeader(F("Access-Control-Allow-Origin"), SettingsText(SET_CORS));
+  }
+}
+
+void WSHeaderSend(void)
+{
+  WebServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
+  WebServer->sendHeader(F("Pragma"), F("no-cache"));
+  WebServer->sendHeader(F("Expires"), F("-1"));
+  HttpHeaderCors();
+}
+
+
+
+
+
+void WSSend(int code, int ctype, const String& content)
+{
+  char ct[25];
+  WebServer->send(code, GetTextIndexed(ct, sizeof(ct), ctype, kContentTypes), content);
+}
+
+
+
+
+
+void WSContentBegin(int code, int ctype)
+{
+  WebServer->client().flush();
+  WSHeaderSend();
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  WebServer->sendHeader(F("Accept-Ranges"),F("none"));
+  WebServer->sendHeader(F("Transfer-Encoding"),F("chunked"));
+#endif
+  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+  WSSend(code, ctype, "");
+  Web.chunk_buffer = "";
+}
+
+void _WSContentSend(const String& content)
+{
+  size_t len = content.length();
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  const char * footer = "\r\n";
+  char chunk_size[11];
+  sprintf(chunk_size, "%x\r\n", len);
+  WebServer->sendContent(String() + chunk_size + content + footer);
+#else
+  WebServer->sendContent(content);
+#endif
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("WSContentSend"));
+#endif
+  DEBUG_CORE_LOG(PSTR("WEB: Chunk size %d"), len);
+}
+
+void WSContentFlush(void)
+{
+  if (Web.chunk_buffer.length() > 0) {
+    _WSContentSend(Web.chunk_buffer);
+    Web.chunk_buffer = "";
+  }
+}
+
+void _WSContentSendBuffer(void)
+{
+  int len = strlen(mqtt_data);
+
+  if (0 == len) {
+    return;
+  }
+  else if (len == sizeof(mqtt_data)) {
+    AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: Content too large"));
+  }
+  else if (len < CHUNKED_BUFFER_SIZE) {
+    Web.chunk_buffer += mqtt_data;
+    len = Web.chunk_buffer.length();
+  }
+
+  if (len >= CHUNKED_BUFFER_SIZE) {
+    WSContentFlush();
+  }
+  if (strlen(mqtt_data) >= CHUNKED_BUFFER_SIZE) {
+    _WSContentSend(mqtt_data);
+  }
+}
+
+void WSContentSend_P(const char* formatP, ...)
+{
+
+  va_list arg;
+  va_start(arg, formatP);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+  va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+  _WSContentSendBuffer();
+}
+
+void WSContentSend_PD(const char* formatP, ...)
+{
+
+  va_list arg;
+  va_start(arg, formatP);
+  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+  va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+  if (D_DECIMAL_SEPARATOR[0] != '.') {
+    for (uint32_t i = 0; i < len; i++) {
+      if ('.' == mqtt_data[i]) {
+        mqtt_data[i] = D_DECIMAL_SEPARATOR[0];
+      }
+    }
+  }
+
+  _WSContentSendBuffer();
+}
+
+void WSContentStart_P(const char* title, bool auth)
+{
+  if (auth && strlen(SettingsText(SET_WEBPWD)) && !WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD))) {
+    return WebServer->requestAuthentication();
+  }
+
+  WSContentBegin(200, CT_HTML);
+
+  if (title != nullptr) {
+    char ctitle[strlen_P(title) +1];
+    strcpy_P(ctitle, title);
+    WSContentSend_P(HTTP_HEADER, SettingsText(SET_FRIENDLYNAME1), ctitle);
+  }
+}
+
+void WSContentStart_P(const char* title)
+{
+  WSContentStart_P(title, true);
+}
+
+void WSContentSendStyle_P(const char* formatP, ...)
+{
+  if (WifiIsInManagerMode()) {
+    if (WifiConfigCounter()) {
+      WSContentSend_P(HTTP_SCRIPT_COUNTER);
+    }
+  }
+  WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
+
+  WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
+                  WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
+  WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
+                  WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
+                  WebColor(COL_BUTTON));
+  if (formatP != nullptr) {
+
+    va_list arg;
+    va_start(arg, formatP);
+    int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
+    va_end(arg);
+
+#ifdef DEBUG_TASMOTA_CORE
+  if (len > (sizeof(mqtt_data) -1)) {
+    mqtt_data[33] = '\0';
+    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
+  }
+#endif
+
+    _WSContentSendBuffer();
+  }
+  WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT),
+#ifdef FIRMWARE_MINIMAL
+    WebColor(COL_TEXT_WARNING),
+#endif
+    WebColor(COL_TITLE),
+    ModuleName().c_str(), SettingsText(SET_FRIENDLYNAME1));
+  if (Settings.flag3.gui_hostname_ip) {
+    bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0);
+    bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0);
+    WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"),
+      my_hostname,
+      (Wifi.mdns_begun) ? ".local" : "",
+      (lip) ? WiFi.localIP().toString().c_str() : "",
+      (lip && sip) ? ", " : "",
+      (sip) ? WiFi.softAPIP().toString().c_str() : "");
+  }
+  WSContentSend_P(PSTR("</div>"));
+}
+
+void WSContentSendStyle(void)
+{
+  WSContentSendStyle_P(nullptr);
+}
+
+void WSContentButton(uint32_t title_index)
+{
+  char action[4];
+  char title[100];
+
+  if (title_index <= BUTTON_RESET_CONFIGURATION) {
+    char confirm[100];
+    WSContentSend_P(PSTR("<p><form action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
+      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
+      GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),
+      (!title_index) ? "rst" : "non",
+      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
+  } else {
+    WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),
+      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
+      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
+  }
+}
+
+void WSContentSpaceButton(uint32_t title_index)
+{
+  WSContentSend_P(PSTR("<div></div>"));
+  WSContentButton(title_index);
+}
+
+void WSContentEnd(void)
+{
+  WSContentFlush();
+  _WSContentSend("");
+  WebServer->client().stop();
+}
+
+void WSContentStop(void)
+{
+  if (WifiIsInManagerMode()) {
+    if (WifiConfigCounter()) {
+      WSContentSend_P(HTTP_COUNTER);
+    }
+  }
+  WSContentSend_P(HTTP_END, my_version);
+  WSContentEnd();
+}
+
+
+
+void WebRestart(uint32_t type)
+{
+
+
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
+
+  bool reset_only = (HTTP_MANAGER_RESET_ONLY == Web.state);
+
+  WSContentStart_P((type) ? S_SAVE_CONFIGURATION : S_RESTART, !reset_only);
+  WSContentSend_P(HTTP_SCRIPT_RELOAD);
+  WSContentSendStyle();
+  if (type) {
+    WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_CONFIGURATION_SAVED "</b><br>"));
+    if (2 == type) {
+      WSContentSend_P(PSTR("<br>" D_TRYING_TO_CONNECT "<br>"));
+    }
+    WSContentSend_P(PSTR("</div>"));
+  }
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  if (HTTP_MANAGER == Web.state || reset_only) {
+    Web.state = HTTP_ADMIN;
+  } else {
+    WSContentSpaceButton(BUTTON_MAIN);
+  }
+  WSContentStop();
+
+  ShowWebSource(SRC_WEBGUI);
+  restart_flag = 2;
+}
+
+
+
+void HandleWifiLogin(void)
+{
+  WSContentStart_P(S_CONFIGURE_WIFI, false);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_LOGIN);
+
+  if (HTTP_MANAGER_RESET_ONLY == Web.state) {
+    WSContentSpaceButton(BUTTON_RESTART);
+#ifndef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
+#endif
+  }
+
+  WSContentStop();
+}
+
+void WebSliderColdWarm(void)
+{
+  WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+    "a",
+    "#fff", "#ff0",
+    1,
+    153, 500,
+    LightGetColorTemp(),
+    't', 0);
+}
+
+void HandleRoot(void)
+{
+  if (CaptivePortal()) { return; }
+
+  if (WebServer->hasArg("rst")) {
+    WebRestart(0);
+    return;
+  }
+
+  if (WifiIsInManagerMode()) {
+#ifndef FIRMWARE_MINIMAL
+    if (strlen(SettingsText(SET_WEBPWD)) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1")) && HTTP_MANAGER_RESET_ONLY != Web.state) {
+      HandleWifiLogin();
+    } else {
+      if (!strlen(SettingsText(SET_WEBPWD)) || (((WebServer->arg("USER1") == WEB_USERNAME ) && (WebServer->arg("PASS1") == SettingsText(SET_WEBPWD) )) || HTTP_MANAGER_RESET_ONLY == Web.state)) {
+        HandleWifiConfiguration();
+      } else {
+
+        HandleWifiLogin();
+      }
+    }
+#endif
+    return;
+  }
+
+  if (HandleRootStatusRefresh()) {
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU);
+
+  char stemp[33];
+
+  WSContentStart_P(S_MAIN_MENU);
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh, Settings.web_refresh);
+#else
+  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh);
+#endif
+  WSContentSend_P(HTTP_SCRIPT_ROOT_PART2);
+
+  WSContentSendStyle();
+
+  WSContentSend_P(PSTR("<div id='l1' name='l1'></div>"));
+  if (devices_present) {
+#ifdef USE_LIGHT
+    if (light_type) {
+      uint8_t light_subtype = light_type &7;
+      if (!Settings.flag3.pwm_multi_channels) {
+        bool split_white = ((LST_RGBW <= light_subtype) && (devices_present > 1));
+
+        if ((LST_COLDWARM == light_subtype) || ((LST_RGBCW == light_subtype) && !split_white)) {
+          WebSliderColdWarm();
+        }
+
+        if (light_subtype > 2) {
+          uint16_t hue;
+          uint8_t sat;
+          LightGetHSB(&hue, &sat, nullptr);
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "b",
+            "#800", "#f00 5%,#ff0 20%,#0f0 35%,#0ff 50%,#00f 65%,#f0f 80%,#f00 95%,#800",
+            2,
+            1, 359,
+            hue,
+            'h', 0);
+
+          uint8_t dcolor = changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255);
+          char scolor[8];
+          snprintf_P(scolor, sizeof(scolor), PSTR("#%02X%02X%02X"), dcolor, dcolor, dcolor);
+          uint8_t red, green, blue;
+          LightHsToRgb(hue, 255, &red, &green, &blue);
+          snprintf_P(stemp, sizeof(stemp), PSTR("#%02X%02X%02X"), red, green, blue);
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "s",
+            scolor, stemp,
+            3,
+            0, 100,
+            changeUIntScale(sat, 0, 255, 0, 100),
+            'n', 0);
+        }
+
+        WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+          "c",
+          "#000", "#fff",
+          4,
+          Settings.flag3.slider_dimmer_stay_on, 100,
+          Settings.light_dimmer,
+          'd', 0);
+
+        if (split_white) {
+          if (LST_RGBCW == light_subtype) {
+            WebSliderColdWarm();
+          }
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            "f",
+            "#000", "#fff",
+            5,
+            Settings.flag3.slider_dimmer_stay_on, 100,
+            LightGetDimmer(2),
+            'w', 0);
+        }
+      } else {
+        uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype;
+        stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0';
+        for (uint32_t i = 0; i < pwm_channels; i++) {
+          stemp[1]++;
+
+          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
+            stemp,
+            "#000", "#fff",
+            i+1,
+            1, 100,
+            changeUIntScale(Settings.light_color[i], 0, 255, 0, 100),
+            'e', i+1);
+        }
+      }
+    }
+#endif
+#ifdef USE_SHUTTER
+    if (Settings.flag3.shutter_mode) {
+      for (uint32_t i = 0; i < shutters_present; i++) {
+        WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, Settings.shutter_position[i], i+1);
+      }
+    }
+#endif
+    WSContentSend_P(HTTP_TABLE100);
+    WSContentSend_P(PSTR("<tr>"));
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      WSContentSend_P(HTTP_DEVICE_CONTROL, 36, 1,
+        (strlen(SettingsText(SET_BUTTON1))) ? SettingsText(SET_BUTTON1) : D_BUTTON_TOGGLE,
+        "");
+      for (uint32_t i = 0; i < MaxFanspeed(); i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i);
+        WSContentSend_P(HTTP_DEVICE_CONTROL, 16, i +2,
+          (strlen(SettingsText(SET_BUTTON2 + i))) ? SettingsText(SET_BUTTON2 + i) : stemp,
+          "");
+      }
+    } else {
+#endif
+      for (uint32_t idx = 1; idx <= devices_present; idx++) {
+        bool set_button = ((idx <= MAX_BUTTON_TEXT) && strlen(SettingsText(SET_BUTTON1 + idx -1)));
+#ifdef USE_SHUTTER
+        int32_t ShutterWebButton;
+        if (ShutterWebButton = IsShutterWebButton(idx)) {
+          WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
+            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((Settings.shutter_options[abs(ShutterWebButton)-1] & 2) ? "-" : ((ShutterWebButton>0) ? "▲" : "▼")),
+            "");
+          continue;
+        }
+#endif
+        snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx);
+        WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
+          (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (devices_present < 5) ? D_BUTTON_TOGGLE : "",
+          (set_button) ? "" : (devices_present > 1) ? stemp : "");
+      }
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+#ifdef USE_SONOFF_RF
+  if (SONOFF_BRIDGE == my_module_type) {
+    WSContentSend_P(HTTP_TABLE100);
+    WSContentSend_P(PSTR("<tr>"));
+    uint32_t idx = 0;
+    for (uint32_t i = 0; i < 4; i++) {
+      if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
+      for (uint32_t j = 0; j < 4; j++) {
+        idx++;
+        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), idx);
+        WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,
+          (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : stemp);
+      }
+    }
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+#endif
+
+#ifndef FIRMWARE_MINIMAL
+  XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
+  XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
+#endif
+
+  if (HTTP_ADMIN == Web.state) {
+#ifdef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_FIRMWARE_UPGRADE);
+#else
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentButton(BUTTON_INFORMATION);
+    WSContentButton(BUTTON_FIRMWARE_UPGRADE);
+#endif
+    WSContentButton(BUTTON_CONSOLE);
+    WSContentButton(BUTTON_RESTART);
+  }
+  WSContentStop();
+}
+
+bool HandleRootStatusRefresh(void)
+{
+  if (!WebAuthenticate()) {
+    WebServer->requestAuthentication();
+    return true;
+  }
+
+  if (!WebServer->hasArg("m")) {
+    return false;
+  }
+
+  #ifdef USE_SCRIPT_WEB_DISPLAY
+    Script_Check_HTML_Setvars();
+  #endif
+
+  char tmp[8];
+  char svalue[32];
+  char webindex[5];
+
+  WebGetArg("o", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    ShowWebSource(SRC_WEBGUI);
+    uint32_t device = atoi(tmp);
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      if (device < 2) {
+        ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE);
+      } else {
+        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), device -2);
+        ExecuteCommand(svalue, SRC_WEBGUI);
+      }
+    } else {
+#endif
+#ifdef USE_SHUTTER
+      int32_t ShutterWebButton;
+      if (ShutterWebButton = IsShutterWebButton(device)) {
+        snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
+        ExecuteWebCommand(svalue, SRC_WEBGUI);
+      } else {
+#endif
+        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
+#ifdef USE_SHUTTER
+      }
+#endif
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+  }
+  WebGetArg("d0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("w0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+  for (uint32_t j = 1; j <= pwm_channels; j++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    if (strlen(tmp)) {
+      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp);
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+  }
+  WebGetArg("t0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_COLORTEMPERATURE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("h0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "1 %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+  WebGetArg("n0", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "2 %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+#ifdef USE_SHUTTER
+  for (uint32_t j = 1; j <= shutters_present; j++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    if (strlen(tmp)) {
+      snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), j, tmp);
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+  }
+#endif
+#ifdef USE_SONOFF_RF
+  WebGetArg("k", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_RFKEY "%s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+  }
+#endif
+  WSContentBegin(200, CT_HTML);
+  WSContentSend_P(PSTR("{t}"));
+  XsnsCall(FUNC_WEB_SENSOR);
+#ifdef USE_SCRIPT_WEB_DISPLAY
+  XdrvCall(FUNC_WEB_SENSOR);
+#endif
+
+  WSContentSend_P(PSTR("</table>"));
+
+  if (devices_present) {
+    WSContentSend_P(PSTR("{t}<tr>"));
+    uint32_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32;
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) {
+      WSContentSend_P(HTTP_DEVICE_STATE, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
+      uint32_t fanspeed = GetFanspeed();
+      snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fanspeed);
+      WSContentSend_P(HTTP_DEVICE_STATE, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
+    } else {
+#endif
+      for (uint32_t idx = 1; idx <= devices_present; idx++) {
+        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1));
+        WSContentSend_P(HTTP_DEVICE_STATE, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
+      }
+#ifdef USE_SONOFF_IFAN
+    }
+#endif
+    WSContentSend_P(PSTR("</tr></table>"));
+  }
+  WSContentEnd();
+
+  return true;
+}
+
+#ifdef USE_SHUTTER
+int32_t IsShutterWebButton(uint32_t idx) {
+
+  int32_t ShutterWebButton = 0;
+  if (Settings.flag3.shutter_mode) {
+    for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+      if (Settings.shutter_startrelay[i] && ((Settings.shutter_startrelay[i] == idx) || (Settings.shutter_startrelay[i] == (idx-1)))) {
+        ShutterWebButton = (Settings.shutter_startrelay[i] == idx) ? (i+1): (-1-i);
+        break;
+      }
+    }
+  }
+  return ShutterWebButton;
+}
+#endif
+
+
+
+#ifndef FIRMWARE_MINIMAL
+
+void HandleConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION);
+
+  WSContentStart_P(S_CONFIGURATION);
+  WSContentSendStyle();
+
+  WSContentButton(BUTTON_MODULE);
+  WSContentButton(BUTTON_WIFI);
+
+  XdrvCall(FUNC_WEB_ADD_BUTTON);
+  XsnsCall(FUNC_WEB_ADD_BUTTON);
+
+  WSContentButton(BUTTON_LOGGING);
+  WSContentButton(BUTTON_OTHER);
+  WSContentButton(BUTTON_TEMPLATE);
+
+  WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
+  WSContentButton(BUTTON_BACKUP);
+  WSContentButton(BUTTON_RESTORE);
+
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+
+
+
+void HandleTemplateConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    TemplateSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[30];
+
+  if (WebServer->hasArg("m")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
+      uint32_t midx = pgm_read_byte(kModuleNiceList + i);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
+    }
+    WSContentEnd();
+    return;
+  }
+
+  WebGetArg("t", stemp, sizeof(stemp));
+  if (strlen(stemp)) {
+    uint32_t module = atoi(stemp);
+    uint32_t module_save = Settings.module;
+    Settings.module = module;
+    myio cmodule;
+    ModuleGpios(&cmodule);
+    gpio_flag flag = ModuleFlag();
+    Settings.module = module_save;
+
+    WSContentBegin(200, CT_PLAIN);
+    WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str());
+    for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
+      if (1 == i) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);
+      }
+      uint32_t midx = pgm_read_byte(kGpioNiceList + i);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+    }
+    WSContentSend_P(PSTR("}1"));
+
+    for (uint32_t i = 0; i < ADC0_END; i++) {
+      if (1 == i) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ADC0_USER, D_SENSOR_USER, ADC0_USER);
+      }
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, i, GetTextIndexed(stemp, sizeof(stemp), i, kAdc0Names), i);
+    }
+    WSContentSend_P(PSTR("}1"));
+
+    for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+      if ((i < 6) || ((i > 8) && (i != 11))) {
+        WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", cmodule.io[i]);
+      }
+    }
+    WSContentSend_P(PSTR("}1%d}1%d"), flag, Settings.user_template_base);
+    WSContentEnd();
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TEMPLATE);
+
+  WSContentStart_P(S_CONFIGURE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_TEMPLATE);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_TEMPLATE);
+  WSContentSend_P(HTTP_TABLE100);
+  WSContentSend_P(PSTR("<tr><td><b>" D_TEMPLATE_NAME "</b></td><td style='width:200px'><input id='s1' placeholder='" D_TEMPLATE_NAME "'></td></tr>"
+                       "<tr><td><b>" D_BASE_TYPE "</b></td><td><select id='g99' onchange='st(this.value)'></select></td></tr>"
+                       "</table>"
+                       "<hr/>"));
+  WSContentSend_P(HTTP_TABLE100);
+  for (uint32_t i = 0; i < 17; i++) {
+    if ((i < 6) || ((i > 8) && (i != 11))) {
+      WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_GPIO "%d</font></b></td><td%s><select id='g%d'></select></td></tr>"),
+        ((9==i)||(10==i)) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? " style='width:200px'" : "", i);
+    }
+  }
+  WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_ADC "0</font></b></td><td><select id='g17'></select></td></tr>"), WebColor(COL_TEXT));
+  WSContentSend_P(PSTR("</table>"));
+  gpio_flag flag = ModuleFlag();
+  if (flag.data > ADC0_USER) {
+    WSContentSend_P(HTTP_FORM_TEMPLATE_FLAG);
+  }
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void TemplateSaveSettings(void)
+{
+  char tmp[sizeof(Settings.user_template.name)];
+  char webindex[5];
+  char svalue[128];
+
+  WebGetArg("s1", tmp, sizeof(tmp));
+  snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " {\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), tmp);
+
+  uint32_t j = 0;
+  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
+    if (6 == i) { j = 9; }
+    if (8 == i) { j = 12; }
+    snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), j);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    uint8_t gpio = atoi(tmp);
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s%d"), svalue, (i>0)?",":"", gpio);
+    j++;
+  }
+
+  WebGetArg("g17", tmp, sizeof(tmp));
+  uint32_t flag = atoi(tmp);
+  for (uint32_t i = 0; i < GPIO_FLAG_USED; i++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("c%d"), i);
+    uint32_t state = WebServer->hasArg(webindex) << i +4;
+    flag += state;
+  }
+  WebGetArg("g99", tmp, sizeof(tmp));
+  uint32_t base = atoi(tmp) +1;
+
+  snprintf_P(svalue, sizeof(svalue), PSTR("%s],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), svalue, flag, base);
+  ExecuteWebCommand(svalue, SRC_WEBGUI);
+}
+
+
+
+void HandleModuleConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    ModuleSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[30];
+  uint32_t midx;
+  myio cmodule;
+  ModuleGpios(&cmodule);
+
+  if (WebServer->hasArg("m")) {
+    WSContentBegin(200, CT_PLAIN);
+    uint32_t vidx = 0;
+    for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
+      if (0 == i) {
+        midx = USER_MODULE;
+        vidx = 0;
+      } else {
+        midx = pgm_read_byte(kModuleNiceList + i -1);
+        vidx = midx +1;
+      }
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
+    }
+    WSContentEnd();
+    return;
+  }
+
+  if (WebServer->hasArg("g")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t j = 0; j < sizeof(kGpioNiceList); j++) {
+      midx = pgm_read_byte(kGpioNiceList + j);
+      if (!GetUsedInModule(midx, cmodule.io)) {
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+      }
+    }
+    WSContentEnd();
+    return;
+  }
+
+#ifndef USE_ADC_VCC
+  if (WebServer->hasArg("a")) {
+    WSContentBegin(200, CT_PLAIN);
+    for (uint32_t j = 0; j < ADC0_END; j++) {
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, j, GetTextIndexed(stemp, sizeof(stemp), j, kAdc0Names), j);
+    }
+    WSContentEnd();
+    return;
+  }
+#endif
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MODULE);
+
+  WSContentStart_P(S_CONFIGURE_MODULE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
+  WSContentSend_P(HTTP_SCRIPT_MODULE1, Settings.module);
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (ValidGPIO(i, cmodule.io[i])) {
+      WSContentSend_P(PSTR("sk(%d,%d);"), my_module.io[i], i);
+    }
+  }
+  WSContentSend_P(HTTP_SCRIPT_MODULE2, Settings.my_adc0);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_MODULE, AnyModuleName(MODULE).c_str());
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (ValidGPIO(i, cmodule.io[i])) {
+      snprintf_P(stemp, 3, PINS_WEMOS +i*2);
+      char sesp8285[40];
+      snprintf_P(sesp8285, sizeof(sesp8285), PSTR("<font color='#%06x'>ESP8285</font>"), WebColor(COL_TEXT_WARNING));
+      WSContentSend_P(PSTR("<tr><td style='width:190px'>%s <b>" D_GPIO "%d</b> %s</td><td style='width:176px'><select id='g%d'></select></td></tr>"),
+        (WEMOS==my_module_type)?stemp:"", i, (0==i)? D_SENSOR_BUTTON "1":(1==i)? D_SERIAL_OUT :(3==i)? D_SERIAL_IN :((9==i)||(10==i))? sesp8285 :(12==i)? D_SENSOR_RELAY "1":(13==i)? D_SENSOR_LED "1i":(14==i)? D_SENSOR :"", i);
+    }
+  }
+#ifndef USE_ADC_VCC
+  if (ValidAdc()) {
+    WSContentSend_P(PSTR("<tr><td>%s <b>" D_ADC "0</b></td><td style='width:176px'><select id='g17'></select></td></tr>"), (WEMOS==my_module_type)?"A0":"");
+  }
+#endif
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void ModuleSaveSettings(void)
+{
+  char tmp[8];
+  char webindex[5];
+
+  WebGetArg("g99", tmp, sizeof(tmp));
+  uint32_t new_module = (!strlen(tmp)) ? MODULE : atoi(tmp);
+  Settings.last_module = Settings.module;
+  Settings.module = new_module;
+  SetModuleType();
+  myio cmodule;
+  ModuleGpios(&cmodule);
+  String gpios = "";
+  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
+    if (Settings.last_module != new_module) {
+      Settings.my_gp.io[i] = GPIO_NONE;
+    } else {
+      if (ValidGPIO(i, cmodule.io[i])) {
+        snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), i);
+        WebGetArg(webindex, tmp, sizeof(tmp));
+        Settings.my_gp.io[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+        gpios += F(", " D_GPIO ); gpios += String(i); gpios += F(" "); gpios += String(Settings.my_gp.io[i]);
+      }
+    }
+  }
+#ifndef USE_ADC_VCC
+  WebGetArg("g17", tmp, sizeof(tmp));
+  Settings.my_adc0 = (!strlen(tmp)) ? 0 : atoi(tmp);
+  gpios += F(", " D_ADC "0 "); gpios += String(Settings.my_adc0);
+#endif
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MODULE "%s " D_CMND_MODULE "%s"), ModuleName().c_str(), gpios.c_str());
+}
+
+
+
+const char kUnescapeCode[] = "&><\"\'";
+const char kEscapeCode[] PROGMEM = "&amp;|&gt;|&lt;|&quot;|&apos;";
+
+String HtmlEscape(const String unescaped) {
+  char escaped[10];
+  size_t ulen = unescaped.length();
+  String result = "";
+  for (size_t i = 0; i < ulen; i++) {
+    char c = unescaped[i];
+    char *p = strchr(kUnescapeCode, c);
+    if (p != nullptr) {
+      result += GetTextIndexed(escaped, sizeof(escaped), p - kUnescapeCode, kEscapeCode);
+    } else {
+      result += c;
+    }
+  }
+  return result;
+}
+
+
+const char kEncryptionType[] PROGMEM = "|||" D_WPA_PSK "||" D_WPA2_PSK "|" D_WEP "||" D_NONE "|" D_AUTO;
+
+void HandleWifiConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI);
+
+  if (WebServer->hasArg("save") && HTTP_MANAGER_RESET_ONLY != Web.state) {
+    WifiSaveSettings();
+    WebRestart(2);
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_WIFI, !WifiIsInManagerMode());
+  WSContentSend_P(HTTP_SCRIPT_WIFI);
+  WSContentSendStyle();
+
+  if (HTTP_MANAGER_RESET_ONLY != Web.state) {
+    if (WebServer->hasArg("scan")) {
+#ifdef USE_EMULATION
+      UdpDisconnect();
+#endif
+      int n = WiFi.scanNetworks();
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_SCAN_DONE));
+
+      if (0 == n) {
+        AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, S_NO_NETWORKS_FOUND);
+        WSContentSend_P(S_NO_NETWORKS_FOUND);
+        WSContentSend_P(PSTR(". " D_REFRESH_TO_SCAN_AGAIN "."));
+      } else {
+
+        int indices[n];
+        for (uint32_t i = 0; i < n; i++) {
+          indices[i] = i;
+        }
+
+
+        for (uint32_t i = 0; i < n; i++) {
+          for (uint32_t j = i + 1; j < n; j++) {
+            if (WiFi.RSSI(indices[j]) > WiFi.RSSI(indices[i])) {
+              std::swap(indices[i], indices[j]);
+            }
+          }
+        }
+
+
+        String cssid;
+        for (uint32_t i = 0; i < n; i++) {
+          if (-1 == indices[i]) { continue; }
+          cssid = WiFi.SSID(indices[i]);
+          uint32_t cschn = WiFi.channel(indices[i]);
+          for (uint32_t j = i + 1; j < n; j++) {
+            if ((cssid == WiFi.SSID(indices[j])) && (cschn == WiFi.channel(indices[j]))) {
+              DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
+              indices[j] = -1;
+            }
+          }
+        }
+
+
+        for (uint32_t i = 0; i < n; i++) {
+          if (-1 == indices[i]) { continue; }
+          int32_t rssi = WiFi.RSSI(indices[i])
+          DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"),
+            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), rssi);
+          int quality = WifiGetRssiAsQuality(rssi);
+          int auth = WiFi.encryptionType(indices[i]);
+          char encryption[20];
+          WSContentSend_P(PSTR("<div><a href='#p' onclick='c(this)'>%s</a>&nbsp;(%d)&nbsp<span class='q'>%s %d%% (%d dBm)</span></div>"),
+            HtmlEscape(WiFi.SSID(indices[i])).c_str(),
+            WiFi.channel(indices[i]),
+            GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
+            quality, rssi
+          );
+          delay(0);
+
+        }
+        WSContentSend_P(PSTR("<br>"));
+      }
+    } else {
+      WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br>"));
+    }
+
+
+    WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
+    WSContentSend_P(HTTP_FORM_END);
+  }
+
+  if (WifiIsInManagerMode()) {
+#ifndef FIRMWARE_MINIMAL
+    WSContentSpaceButton(BUTTON_RESTORE);
+    WSContentButton(BUTTON_RESET_CONFIGURATION);
+#endif
+    WSContentSpaceButton(BUTTON_RESTART);
+  } else {
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+  }
+  WSContentStop();
+}
+
+void WifiSaveSettings(void)
+{
+  char tmp[TOPSZ];
+
+  WebGetArg("h", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_HOSTNAME, (!strlen(tmp)) ? WIFI_HOSTNAME : tmp);
+  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
+    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
+  }
+  WebGetArg("c", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_CORS, (!strlen(tmp)) ? CORS_DOMAIN : tmp);
+  WebGetArg("s1", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STASSID1, (!strlen(tmp)) ? STA_SSID1 : tmp);
+  WebGetArg("s2", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STASSID2, (!strlen(tmp)) ? STA_SSID2 : tmp);
+  WebGetArg("p1", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STAPWD1, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD1) : tmp);
+  WebGetArg("p2", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_STAPWD2, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD2) : tmp);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_SSID "2 %s, " D_CMND_CORS " %s"),
+    SettingsText(SET_HOSTNAME), SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), SettingsText(SET_CORS));
+}
+
+
+
+void HandleLoggingConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING);
+
+  if (WebServer->hasArg("save")) {
+    LoggingSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_LOGGING);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_LOG1);
+  char stemp1[45];
+  char stemp2[32];
+  uint8_t dlevel[4] = { LOG_LEVEL_INFO, LOG_LEVEL_INFO, LOG_LEVEL_NONE, LOG_LEVEL_NONE };
+  for (uint32_t idx = 0; idx < 4; idx++) {
+    if ((2==idx) && !Settings.flag.mqtt_enabled) { continue; }
+    uint32_t llevel = (0==idx)?Settings.seriallog_level:(1==idx)?Settings.weblog_level:(2==idx)?Settings.mqttlog_level:Settings.syslog_level;
+    WSContentSend_P(PSTR("<p><b>%s</b> (%s)<br><select id='l%d'>"),
+      GetTextIndexed(stemp1, sizeof(stemp1), idx, kLoggingOptions),
+      GetTextIndexed(stemp2, sizeof(stemp2), dlevel[idx], kLoggingLevels),
+      idx);
+    for (uint32_t i = LOG_LEVEL_NONE; i <= LOG_LEVEL_DEBUG_MORE; i++) {
+      WSContentSend_P(PSTR("<option%s value='%d'>%d %s</option>"),
+        (i == llevel) ? " selected" : "", i, i,
+        GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
+    }
+    WSContentSend_P(PSTR("</select></p>"));
+  }
+  WSContentSend_P(HTTP_FORM_LOG2, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void LoggingSaveSettings(void)
+{
+  char tmp[TOPSZ];
+
+  WebGetArg("l0", tmp, sizeof(tmp));
+  SetSeriallog((!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp));
+  WebGetArg("l1", tmp, sizeof(tmp));
+  Settings.weblog_level = (!strlen(tmp)) ? WEB_LOG_LEVEL : atoi(tmp);
+  WebGetArg("l2", tmp, sizeof(tmp));
+  Settings.mqttlog_level = (!strlen(tmp)) ? MQTT_LOG_LEVEL : atoi(tmp);
+  WebGetArg("l3", tmp, sizeof(tmp));
+  SetSyslog((!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp));
+  WebGetArg("lh", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_SYSLOG_HOST, (!strlen(tmp)) ? SYS_LOG_HOST : tmp);
+  WebGetArg("lp", tmp, sizeof(tmp));
+  Settings.syslog_port = (!strlen(tmp)) ? SYS_LOG_PORT : atoi(tmp);
+  WebGetArg("lt", tmp, sizeof(tmp));
+  Settings.tele_period = (!strlen(tmp)) ? TELE_PERIOD : atoi(tmp);
+  if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) {
+    Settings.tele_period = 10;
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG D_CMND_SERIALLOG " %d, " D_CMND_WEBLOG " %d, " D_CMND_MQTTLOG " %d, " D_CMND_SYSLOG " %d, " D_CMND_LOGHOST " %s, " D_CMND_LOGPORT " %d, " D_CMND_TELEPERIOD " %d"),
+    Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
+}
+
+
+
+void HandleOtherConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER);
+
+  if (WebServer->hasArg("save")) {
+    OtherSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_OTHER);
+  WSContentSendStyle();
+
+  TemplateJson();
+  char stemp[strlen(mqtt_data) +1];
+  strlcpy(stemp, mqtt_data, sizeof(stemp));
+  WSContentSend_P(HTTP_FORM_OTHER, stemp, (USER_MODULE == Settings.module) ? " checked disabled" : "", (Settings.flag.mqtt_enabled) ? " checked" : "");
+
+  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) { maxfn = 1; }
+#endif
+  for (uint32_t i = 0; i < maxfn; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i +1);
+    WSContentSend_P(PSTR("<b>" D_FRIENDLY_NAME " %d</b> (" FRIENDLY_NAME "%s)<br><input id='a%d' placeholder='" FRIENDLY_NAME "%s' value='%s'><p></p>"),
+      i +1,
+      (i) ? stemp : "",
+      i,
+      (i) ? stemp : "",
+      SettingsText(SET_FRIENDLYNAME1 + i));
+  }
+
+#ifdef USE_EMULATION
+  WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));
+  for (uint32_t i = 0; i < EMUL_MAX; i++) {
+#ifndef USE_EMULATION_WEMO
+    if (i == EMUL_WEMO) { i++; }
+#endif
+#ifndef USE_EMULATION_HUE
+    if (i == EMUL_HUE) { i++; }
+#endif
+    if (i < EMUL_MAX) {
+      WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br>"),
+        i, i,
+        (i == Settings.flag2.emulation) ? " checked" : "",
+        GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
+        (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
+    }
+  }
+  WSContentSend_P(PSTR("</p></fieldset>"));
+#endif
+
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void OtherSaveSettings(void)
+{
+  char tmp[TOPSZ];
+  char webindex[5];
+  char friendlyname[TOPSZ];
+  char message[LOGSZ];
+
+  WebGetArg("wp", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
+  Settings.flag.mqtt_enabled = WebServer->hasArg("b1");
+#ifdef USE_EMULATION
+  WebGetArg("b2", tmp, sizeof(tmp));
+  Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
+#endif
+
+  snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);
+  for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("a%d"), i);
+    WebGetArg(webindex, tmp, sizeof(tmp));
+    snprintf_P(friendlyname, sizeof(friendlyname), PSTR(FRIENDLY_NAME"%d"), i +1);
+    SettingsUpdateText(SET_FRIENDLYNAME1 +i, (!strlen(tmp)) ? (i) ? friendlyname : FRIENDLY_NAME : tmp);
+    snprintf_P(message, sizeof(message), PSTR("%s%s %s"), message, (i) ? "," : "", SettingsText(SET_FRIENDLYNAME1 +i));
+  }
+  AddLog_P(LOG_LEVEL_INFO, message);
+
+  WebGetArg("t1", tmp, sizeof(tmp));
+  if (strlen(tmp)) {
+    char svalue[128];
+    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp);
+    ExecuteWebCommand(svalue, SRC_WEBGUI);
+
+    if (WebServer->hasArg("t2")) {
+      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0"));
+      ExecuteWebCommand(svalue, SRC_WEBGUI);
+    }
+
+  }
+}
+
+
+
+void HandleBackupConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION));
+
+  if (!SettingsBufferAlloc()) { return; }
+
+  WiFiClient myClient = WebServer->client();
+  WebServer->setContentLength(sizeof(Settings));
+
+  char attachment[TOPSZ];
+
+
+
+
+  char hostname[sizeof(my_hostname)];
+  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(hostname, my_hostname), my_version);
+
+  WebServer->sendHeader(F("Content-Disposition"), attachment);
+
+  WSSend(200, CT_STREAM, "");
+
+  uint32_t cfg_crc32 = Settings.cfg_crc32;
+  Settings.cfg_crc32 = GetSettingsCrc32();
+
+  memcpy(settings_buffer, &Settings, sizeof(Settings));
+  if (Web.config_xor_on_set) {
+    for (uint32_t i = 2; i < sizeof(Settings); i++) {
+      settings_buffer[i] ^= (Web.config_xor_on_set +i);
+    }
+  }
+
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  size_t written = myClient.write((const char*)settings_buffer, sizeof(Settings));
+  if (written < sizeof(Settings)) {
+    myClient.write((const char*)settings_buffer +written, sizeof(Settings) -written);
+  }
+#else
+  myClient.write((const char*)settings_buffer, sizeof(Settings));
+#endif
+
+  SettingsBufferFree();
+
+  Settings.cfg_crc32 = cfg_crc32;
+}
+
+
+
+void HandleResetConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESET_CONFIGURATION);
+
+  WSContentStart_P(S_RESET_CONFIGURATION, !WifiIsInManagerMode());
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'>" D_CONFIGURATION_RESET "</div>"));
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  char command[CMDSZ];
+  snprintf_P(command, sizeof(command), PSTR(D_CMND_RESET " 1"));
+  ExecuteWebCommand(command, SRC_WEBGUI);
+}
+
+void HandleRestoreConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION);
+
+  WSContentStart_P(S_RESTORE_CONFIGURATION);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_RST);
+  WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
+  if (WifiIsInManagerMode()) {
+    WSContentSpaceButton(BUTTON_MAIN);
+  } else {
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+  }
+  WSContentStop();
+
+  Web.upload_error = 0;
+  Web.upload_file_type = UPL_SETTINGS;
+}
+
+
+
+void HandleInformation(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION);
+
+  char stopic[TOPSZ];
+
+  int freeMem = ESP.getFreeHeap();
+
+  WSContentStart_P(S_INFORMATION);
+
+
+
+  WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN);
+  WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>"));
+  WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s%s"), my_version, my_image);
+  WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str());
+  WSContentSend_P(PSTR("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/%s"), ESP.getSdkVersion());
+  WSContentSend_P(PSTR("}1" D_UPTIME "}2%s"), GetUptime().c_str());
+  WSContentSend_P(PSTR("}1" D_FLASH_WRITE_COUNT "}2%d at 0x%X"), Settings.save_flag, GetSettingsAddress());
+  WSContentSend_P(PSTR("}1" D_BOOT_COUNT "}2%d"), Settings.bootcount);
+  WSContentSend_P(PSTR("}1" D_RESTART_REASON "}2%s"), GetResetReason().c_str());
+  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present;
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan()) { maxfn = 1; }
+#endif
+  for (uint32_t i = 0; i < maxfn; i++) {
+    WSContentSend_P(PSTR("}1" D_FRIENDLY_NAME " %d}2%s"), i +1, SettingsText(SET_FRIENDLYNAME1 +i));
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  int32_t rssi = WiFi.RSSI();
+  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(rssi), rssi);
+  WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "");
+#if LWIP_IPV6
+    String ipv6_addr = WifiGetIPv6();
+    if(ipv6_addr != ""){
+      WSContentSend_P(PSTR("}1 IPv6 Address }2%s"), ipv6_addr.c_str());
+    }
+#endif
+  if (static_cast<uint32_t>(WiFi.localIP()) != 0) {
+    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.localIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), IPAddress(Settings.ip_address[1]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_SUBNET_MASK "}2%s"), IPAddress(Settings.ip_address[2]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_DNS_SERVER "}2%s"), IPAddress(Settings.ip_address[3]).toString().c_str());
+    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.macAddress().c_str());
+  }
+  if (static_cast<uint32_t>(WiFi.softAPIP()) != 0) {
+    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.softAPIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), WiFi.softAPIP().toString().c_str());
+    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.softAPmacAddress().c_str());
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  if (Settings.flag.mqtt_enabled) {
+    WSContentSend_P(PSTR("}1" D_MQTT_HOST "}2%s"), SettingsText(SET_MQTT_HOST));
+    WSContentSend_P(PSTR("}1" D_MQTT_PORT "}2%d"), Settings.mqtt_port);
+    WSContentSend_P(PSTR("}1" D_MQTT_USER "}2%s"), SettingsText(SET_MQTT_USER));
+    WSContentSend_P(PSTR("}1" D_MQTT_CLIENT "}2%s"), mqtt_client);
+    WSContentSend_P(PSTR("}1" D_MQTT_TOPIC "}2%s"), SettingsText(SET_MQTT_TOPIC));
+
+    WSContentSend_P(PSTR("}1" D_MQTT_GROUP_TOPIC "}2%s"), GetGroupTopic_P(stopic, ""));
+    WSContentSend_P(PSTR("}1" D_MQTT_FULL_TOPIC "}2%s"), GetTopic_P(stopic, CMND, mqtt_topic, ""));
+    WSContentSend_P(PSTR("}1" D_MQTT " " D_FALLBACK_TOPIC "}2%s"), GetFallbackTopic_P(stopic, ""));
+  } else {
+    WSContentSend_P(PSTR("}1" D_MQTT "}2" D_DISABLED));
+  }
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+
+#ifdef USE_EMULATION
+  WSContentSend_P(PSTR("}1" D_EMULATION "}2%s"), GetTextIndexed(stopic, sizeof(stopic), Settings.flag2.emulation, kEmulationOptions));
+#else
+  WSContentSend_P(PSTR("}1" D_EMULATION "}2" D_DISABLED));
+#endif
+
+#ifdef USE_DISCOVERY
+  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2%s"), (Settings.flag3.mdns_enabled) ? D_ENABLED : D_DISABLED);
+  if (Settings.flag3.mdns_enabled) {
+#ifdef WEBSERVER_ADVERTISE
+    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_WEB_SERVER));
+#else
+    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_DISABLED));
+#endif
+  }
+#else
+  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2" D_DISABLED));
+#endif
+
+  WSContentSend_P(PSTR("}1}2&nbsp;"));
+  WSContentSend_P(PSTR("}1" D_ESP_CHIP_ID "}2%d"), ESP.getChipId());
+  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_ID "}20x%06X"), ESP.getFlashChipId());
+  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_SIZE "}2%dkB"), ESP.getFlashChipRealSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_PROGRAM_FLASH_SIZE "}2%dkB"), ESP.getFlashChipSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_PROGRAM_SIZE "}2%dkB"), ESP.getSketchSize() / 1024);
+  WSContentSend_P(PSTR("}1" D_FREE_PROGRAM_SPACE "}2%dkB"), ESP.getFreeSketchSpace() / 1024);
+  WSContentSend_P(PSTR("}1" D_FREE_MEMORY "}2%dkB"), freeMem / 1024);
+  WSContentSend_P(PSTR("</td></tr></table>"));
+
+  WSContentSend_P(HTTP_SCRIPT_INFO_END);
+  WSContentSendStyle();
+
+  WSContentSend_P(PSTR("<style>td{padding:0px 5px;}</style>"
+                       "<div id='i' name='i'></div>"));
+
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+#endif
+
+
+
+void HandleUpgradeFirmware(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE);
+
+  WSContentStart_P(S_FIRMWARE_UPGRADE);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_UPG, SettingsText(SET_OTAURL));
+  WSContentSend_P(HTTP_FORM_RST_UPG, D_UPGRADE);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  Web.upload_error = 0;
+  Web.upload_file_type = UPL_TASMOTA;
+}
+
+void HandleUpgradeFirmwareStart(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  char command[TOPSZ + 10];
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED));
+  WifiConfigCounter();
+
+  char otaurl[TOPSZ];
+  WebGetArg("o", otaurl, sizeof(otaurl));
+  if (strlen(otaurl)) {
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_OTAURL " %s"), otaurl);
+    ExecuteWebCommand(command, SRC_WEBGUI);
+  }
+
+  WSContentStart_P(S_INFORMATION);
+  WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPGRADE_STARTED " ...</b></div>"));
+  WSContentSend_P(HTTP_MSG_RSTRT);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+
+  snprintf_P(command, sizeof(command), PSTR(D_CMND_UPGRADE " 1"));
+  ExecuteWebCommand(command, SRC_WEBGUI);
+}
+
+void HandleUploadDone(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE));
+
+  char error[100];
+
+  WifiConfigCounter();
+  restart_flag = 0;
+  MqttRetryCounter(0);
+
+  WSContentStart_P(S_INFORMATION);
+  if (!Web.upload_error) {
+    WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
+  }
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
+  if (Web.upload_error) {
+    WSContentSend_P(PSTR("%06x'>" D_FAILED "</font></b><br><br>"), WebColor(COL_TEXT_WARNING));
+#ifdef USE_RF_FLASH
+    if (Web.upload_error < 15) {
+#else
+    if ((Web.upload_error < 10) || (14 == Web.upload_error)) {
+      if (14 == Web.upload_error) { Web.upload_error = 10; }
+#endif
+      GetTextIndexed(error, sizeof(error), Web.upload_error -1, kUploadErrors);
+    } else {
+      snprintf_P(error, sizeof(error), PSTR(D_UPLOAD_ERROR_CODE " %d"), Web.upload_error);
+    }
+    WSContentSend_P(error);
+    DEBUG_CORE_LOG(PSTR("UPL: %s"), error);
+    stop_flash_rotate = Settings.flag.stop_flash_rotate;
+  } else {
+    WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br>"), WebColor(COL_TEXT_SUCCESS));
+    WSContentSend_P(HTTP_MSG_RSTRT);
+    ShowWebSource(SRC_WEBGUI);
+#ifdef USE_TASMOTA_SLAVE
+    if (TasmotaSlave_GetFlagFlashing()) {
+      restart_flag = 0;
+    } else {
+      restart_flag = 2;
+    }
+#else
+    restart_flag = 2;
+#endif
+  }
+  SettingsBufferFree();
+  WSContentSend_P(PSTR("</div><br>"));
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+#ifdef USE_TASMOTA_SLAVE
+  if (TasmotaSlave_GetFlagFlashing()) {
+    TasmotaSlave_Flash();
+  }
+#endif
+}
+
+void HandleUploadLoop(void)
+{
+
+  bool _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level);
+
+  if (HTTP_USER == Web.state) { return; }
+  if (Web.upload_error) {
+    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
+    return;
+  }
+
+  HTTPUpload& upload = WebServer->upload();
+
+  if (UPLOAD_FILE_START == upload.status) {
+    restart_flag = 60;
+    if (0 == upload.filename.c_str()[0]) {
+      Web.upload_error = 1;
+      return;
+    }
+    SettingsSave(1);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s ..."), upload.filename.c_str());
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (!SettingsBufferAlloc()) {
+        Web.upload_error = 2;
+        return;
+      }
+    } else {
+      MqttRetryCounter(60);
+#ifdef USE_EMULATION
+      UdpDisconnect();
+#endif
+#ifdef USE_ARILUX_RF
+      AriluxRfDisable();
+#endif
+      if (Settings.flag.mqtt_enabled) {
+        MqttDisconnect();
+      }
+      uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+      if (!Update.begin(maxSketchSpace)) {
+
+
+
+
+
+
+        Web.upload_error = 2;
+        return;
+      }
+    }
+    Web.upload_progress_dot_count = 0;
+  } else if (!Web.upload_error && (UPLOAD_FILE_WRITE == upload.status)) {
+    if (0 == upload.totalSize) {
+      if (UPL_SETTINGS == Web.upload_file_type) {
+        Web.config_block_count = 0;
+      }
+      else {
+#ifdef USE_RF_FLASH
+        if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) {
+          Update.end();
+          Web.upload_file_type = UPL_EFM8BB1;
+
+          Web.upload_error = SnfBrUpdateInit();
+          if (Web.upload_error != 0) { return; }
+        } else
+#endif
+#ifdef USE_TASMOTA_SLAVE
+        if ((WEMOS == my_module_type) && (upload.buf[0] == ':')) {
+          Update.end();
+          Web.upload_file_type = UPL_TASMOTASLAVE;
+          Web.upload_error = TasmotaSlave_UpdateInit();
+          if (Web.upload_error != 0) { return; }
+        } else
+#endif
+        {
+          if ((upload.buf[0] != 0xE9) && (upload.buf[0] != 0x1F)) {
+            Web.upload_error = 3;
+            return;
+          }
+          if (0xE9 == upload.buf[0]) {
+            uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
+            if (bin_flash_size > ESP.getFlashChipRealSize()) {
+              Web.upload_error = 4;
+              return;
+            }
+
+          }
+        }
+      }
+    }
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (!Web.upload_error) {
+        if (upload.currentSize > (sizeof(Settings) - (Web.config_block_count * HTTP_UPLOAD_BUFLEN))) {
+          Web.upload_error = 9;
+          return;
+        }
+        memcpy(settings_buffer + (Web.config_block_count * HTTP_UPLOAD_BUFLEN), upload.buf, upload.currentSize);
+        Web.config_block_count++;
+      }
+    }
+#ifdef USE_RF_FLASH
+    else if (UPL_EFM8BB1 == Web.upload_file_type) {
+      if (efm8bb1_update != nullptr) {
+        ssize_t result = rf_glue_remnant_with_new_data_and_write(efm8bb1_update, upload.buf, upload.currentSize);
+        free(efm8bb1_update);
+        efm8bb1_update = nullptr;
+        if (result != 0) {
+          Web.upload_error = abs(result);
+          return;
+        }
+      }
+      ssize_t result = rf_search_and_write(upload.buf, upload.currentSize);
+      if (result < 0) {
+        Web.upload_error = abs(result);
+        return;
+      } else if (result > 0) {
+        if ((size_t)result > upload.currentSize) {
+
+          Web.upload_error = 9;
+          return;
+        }
+
+        size_t remnant_sz = upload.currentSize - result;
+        efm8bb1_update = (uint8_t *) malloc(remnant_sz + 1);
+        if (efm8bb1_update == nullptr) {
+          Web.upload_error = 2;
+          return;
+        }
+        memcpy(efm8bb1_update, upload.buf + result, remnant_sz);
+
+        efm8bb1_update[remnant_sz] = '\0';
+      }
+    }
+#endif
+#ifdef USE_TASMOTA_SLAVE
+    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
+      TasmotaSlave_WriteBuffer(upload.buf, upload.currentSize);
+    }
+#endif
+    else {
+      if (!Web.upload_error && (Update.write(upload.buf, upload.currentSize) != upload.currentSize)) {
+        Web.upload_error = 5;
+        return;
+      }
+      if (_serialoutput) {
+        Serial.printf(".");
+        Web.upload_progress_dot_count++;
+        if (!(Web.upload_progress_dot_count % 80)) { Serial.println(); }
+      }
+    }
+  } else if(!Web.upload_error && (UPLOAD_FILE_END == upload.status)) {
+    if (_serialoutput && (Web.upload_progress_dot_count % 80)) {
+      Serial.println();
+    }
+    if (UPL_SETTINGS == Web.upload_file_type) {
+      if (Web.config_xor_on_set) {
+        for (uint32_t i = 2; i < sizeof(Settings); i++) {
+          settings_buffer[i] ^= (Web.config_xor_on_set +i);
+        }
+      }
+      bool valid_settings = false;
+      unsigned long buffer_version = settings_buffer[11] << 24 | settings_buffer[10] << 16 | settings_buffer[9] << 8 | settings_buffer[8];
+      if (buffer_version > 0x06000000) {
+        uint32_t buffer_size = settings_buffer[3] << 8 | settings_buffer[2];
+        if (buffer_version > 0x0606000A) {
+          uint32_t buffer_crc32 = settings_buffer[4095] << 24 | settings_buffer[4094] << 16 | settings_buffer[4093] << 8 | settings_buffer[4092];
+          valid_settings = (GetCfgCrc32(settings_buffer, buffer_size -4) == buffer_crc32);
+        } else {
+          uint16_t buffer_crc16 = settings_buffer[15] << 8 | settings_buffer[14];
+          valid_settings = (GetCfgCrc16(settings_buffer, buffer_size) == buffer_crc16);
+        }
+      } else {
+        valid_settings = (settings_buffer[0] == CONFIG_FILE_SIGN);
+      }
+      if (valid_settings) {
+        SettingsDefaultSet2();
+        memcpy((char*)&Settings +16, settings_buffer +16, sizeof(Settings) -16);
+        Settings.version = buffer_version;
+        SettingsBufferFree();
+      } else {
+        Web.upload_error = 8;
+        return;
+      }
+    }
+#ifdef USE_RF_FLASH
+    else if (UPL_EFM8BB1 == Web.upload_file_type) {
+
+      Web.upload_file_type = UPL_TASMOTA;
+    }
+#endif
+#ifdef USE_TASMOTA_SLAVE
+    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
+
+      TasmotaSlave_SetFlagFlashing(true);
+      Web.upload_file_type = UPL_TASMOTA;
+    }
+#endif
+    else {
+      if (!Update.end(true)) {
+        if (_serialoutput) { Update.printError(Serial); }
+        Web.upload_error = 6;
+        return;
+      }
+      if (!VersionCompatible()) {
+        Web.upload_error = 14;
+        return;
+      }
+    }
+    if (!Web.upload_error) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_SUCCESSFUL " %u bytes. " D_RESTARTING), upload.totalSize);
+    }
+  } else if (UPLOAD_FILE_ABORTED == upload.status) {
+    restart_flag = 0;
+    MqttRetryCounter(0);
+    Web.upload_error = 7;
+    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
+  }
+  delay(0);
+}
+
+
+
+void HandlePreflightRequest(void)
+{
+  HttpHeaderCors();
+  WebServer->sendHeader(F("Access-Control-Allow-Methods"), F("GET, POST"));
+  WebServer->sendHeader(F("Access-Control-Allow-Headers"), F("authorization"));
+  WSSend(200, CT_HTML, "");
+}
+
+
+
+void HandleHttpCommand(void)
+{
+  if (!HttpCheckPriviledgedAccess(false)) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND));
+
+  bool valid = true;
+  if (strlen(SettingsText(SET_WEBPWD))) {
+    char tmp1[33];
+    WebGetArg("user", tmp1, sizeof(tmp1));
+    char tmp2[strlen(SettingsText(SET_WEBPWD)) +1];
+    WebGetArg("password", tmp2, sizeof(tmp2));
+    if (!(!strcmp(tmp1, WEB_USERNAME) && !strcmp(tmp2, SettingsText(SET_WEBPWD)))) { valid = false; }
+  }
+
+  WSContentBegin(200, CT_JSON);
+  if (valid) {
+    uint32_t curridx = web_log_index;
+    String svalue = WebServer->arg("cmnd");
+    if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
+      ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCOMMAND);
+      if (web_log_index != curridx) {
+        uint32_t counter = curridx;
+        WSContentSend_P(PSTR("{"));
+        bool cflg = false;
+        do {
+          char* tmp;
+          size_t len;
+          GetLog(counter, &tmp, &len);
+          if (len) {
+
+            char* JSON = (char*)memchr(tmp, '{', len);
+            if (JSON) {
+              size_t JSONlen = len - (JSON - tmp);
+              if (JSONlen > sizeof(mqtt_data)) { JSONlen = sizeof(mqtt_data); }
+              char stemp[JSONlen];
+              strlcpy(stemp, JSON +1, JSONlen -2);
+              WSContentSend_P(PSTR("%s%s"), (cflg) ? "," : "", stemp);
+              cflg = true;
+            }
+          }
+          counter++;
+          counter &= 0xFF;
+          if (!counter) counter++;
+        } while (counter != web_log_index);
+        WSContentSend_P(PSTR("}"));
+      } else {
+        WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENABLE_WEBLOG_FOR_RESPONSE "\"}"));
+      }
+    } else {
+      WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENTER_COMMAND " cmnd=\"}"));
+    }
+  } else {
+    WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_NEED_USER_AND_PASSWORD "\"}"));
+  }
+  WSContentEnd();
+}
+
+
+
+void HandleConsole(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("c2")) {
+    HandleConsoleRefresh();
+    return;
+  }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE);
+
+  WSContentStart_P(S_CONSOLE);
+  WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings.web_refresh);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_CMND);
+  WSContentSpaceButton(BUTTON_MAIN);
+  WSContentStop();
+}
+
+void HandleConsoleRefresh(void)
+{
+  bool cflg = true;
+  uint32_t counter = 0;
+
+  String svalue = WebServer->arg("c1");
+  if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), svalue.c_str());
+    ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCONSOLE);
+  }
+
+  char stmp[8];
+  WebGetArg("c2", stmp, sizeof(stmp));
+  if (strlen(stmp)) { counter = atoi(stmp); }
+
+  WSContentBegin(200, CT_PLAIN);
+  WSContentSend_P(PSTR("%d}1%d}1"), web_log_index, Web.reset_web_log_flag);
+  if (!Web.reset_web_log_flag) {
+    counter = 0;
+    Web.reset_web_log_flag = true;
+  }
+  if (counter != web_log_index) {
+    if (!counter) {
+      counter = web_log_index;
+      cflg = false;
+    }
+    do {
+      char* tmp;
+      size_t len;
+      GetLog(counter, &tmp, &len);
+      if (len) {
+        if (len > sizeof(mqtt_data) -2) { len = sizeof(mqtt_data); }
+        char stemp[len +1];
+        strlcpy(stemp, tmp, len);
+        WSContentSend_P(PSTR("%s%s"), (cflg) ? "\n" : "", stemp);
+        cflg = true;
+      }
+      counter++;
+      counter &= 0xFF;
+      if (!counter) { counter++; }
+    } while (counter != web_log_index);
+  }
+  WSContentSend_P(PSTR("}1"));
+  WSContentEnd();
+}
+
+
+
+void HandleNotFound(void)
+{
+
+
+  if (CaptivePortal()) { return; }
+
+#ifdef USE_EMULATION
+#ifdef USE_EMULATION_HUE
+  String path = WebServer->uri();
+  if ((EMUL_HUE == Settings.flag2.emulation) && (path.startsWith("/api"))) {
+    HandleHueApi(&path);
+  } else
+#endif
+#endif
+  {
+    WSContentBegin(404, CT_PLAIN);
+    WSContentSend_P(PSTR(D_FILE_NOT_FOUND "\n\nURI: %s\nMethod: %s\nArguments: %d\n"), WebServer->uri().c_str(), (WebServer->method() == HTTP_GET) ? "GET" : "POST", WebServer->args());
+    for (uint32_t i = 0; i < WebServer->args(); i++) {
+      WSContentSend_P(PSTR(" %s: %s\n"), WebServer->argName(i).c_str(), WebServer->arg(i).c_str());
+    }
+    WSContentEnd();
+  }
+}
+
+
+bool CaptivePortal(void)
+{
+
+  if ((WifiIsInManagerMode()) && !ValidIpAddress(WebServer->hostHeader().c_str())) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_REDIRECTED));
+
+    WebServer->sendHeader(F("Location"), String("http://") + WebServer->client().localIP().toString(), true);
+    WSSend(302, CT_PLAIN, "");
+    WebServer->client().stop();
+    return true;
+  }
+  return false;
+}
+
+
+
+String UrlEncode(const String& text)
+{
+  const char hex[] = "0123456789ABCDEF";
+
+ String encoded = "";
+ int len = text.length();
+ int i = 0;
+ while (i < len) {
+  char decodedChar = text.charAt(i++);
+# 2674 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
+    if ((' ' == decodedChar) || ('+' == decodedChar)) {
+      encoded += '%';
+   encoded += hex[decodedChar >> 4];
+   encoded += hex[decodedChar & 0xF];
+    } else {
+      encoded += decodedChar;
+    }
+
+ }
+ return encoded;
+}
+
+int WebSend(char *buffer)
+{
+
+
+
+
+
+  char *host;
+  char *user;
+  char *password;
+  char *command;
+  int status = 1;
+
+
+  host = strtok_r(buffer, "]", &command);
+  if (host && command) {
+    RemoveSpace(host);
+    host++;
+    host = strtok_r(host, ",", &user);
+    String url = F("http://");
+    url += host;
+
+    command = Trim(command);
+    if (command[0] != '/') {
+      url += F("/cm?");
+      if (user) {
+        user = strtok_r(user, ":", &password);
+        if (user && password) {
+          char userpass[200];
+          snprintf_P(userpass, sizeof(userpass), PSTR("user=%s&password=%s&"), user, password);
+          url += userpass;
+        }
+      }
+      url += F("cmnd=");
+    }
+    url += command;
+
+    DEBUG_CORE_LOG(PSTR("WEB: Uri |%s|"), url.c_str());
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+    HTTPClient http;
+    if (http.begin(UrlEncode(url))) {
+#else
+    WiFiClient http_client;
+    HTTPClient http;
+    if (http.begin(http_client, UrlEncode(url))) {
+#endif
+      int http_code = http.GET();
+      if (http_code > 0) {
+        if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) {
+#ifdef USE_WEBSEND_RESPONSE
+
+          const char* read = http.getString().c_str();
+          uint32_t j = 0;
+          char text = '.';
+          while (text != '\0') {
+            text = *read++;
+            if (text > 31) {
+              mqtt_data[j++] = text;
+              if (j == sizeof(mqtt_data) -2) { break; }
+            }
+          }
+          mqtt_data[j] = '\0';
+          MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WEBSEND));
+#ifdef USE_SCRIPT
+extern uint8_t tasm_cmd_activ;
+
+          tasm_cmd_activ=0;
+          XdrvRulesProcess();
+#endif
+#endif
+        }
+        status = 0;
+      } else {
+        status = 2;
+      }
+      http.end();
+    } else {
+      status = 3;
+    }
+  }
+  return status;
+}
+
+bool JsonWebColor(const char* dataBuf)
+{
+
+
+
+
+
+  char dataBufLc[strlen(dataBuf) +1];
+  LowerCase(dataBufLc, dataBuf);
+  RemoveSpace(dataBufLc);
+  if (strlen(dataBufLc) < 9) { return false; }
+
+  StaticJsonBuffer<450> jb;
+  JsonObject& obj = jb.parseObject(dataBufLc);
+  if (!obj.success()) { return false; }
+
+  char parm_lc[10];
+  if (obj[LowerCase(parm_lc, D_CMND_WEBCOLOR)].success()) {
+    for (uint32_t i = 0; i < COL_LAST; i++) {
+      const char* color = obj[parm_lc][i];
+      if (color != nullptr) {
+        WebHexCode(i, color);
+      }
+    }
+  }
+  return true;
+}
+
+const char kWebSendStatus[] PROGMEM = D_JSON_DONE "|" D_JSON_WRONG_PARAMETERS "|" D_JSON_CONNECT_FAILED "|" D_JSON_HOST_NOT_FOUND "|" D_JSON_MEMORY_ERROR;
+
+const char kWebCommands[] PROGMEM = "|"
+#ifdef USE_EMULATION
+  D_CMND_EMULATION "|"
+#endif
+#ifdef USE_SENDMAIL
+  D_CMND_SENDMAIL "|"
+#endif
+  D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_WEBREFRESH "|" D_CMND_WEBSEND "|" D_CMND_WEBCOLOR "|"
+  D_CMND_WEBSENSOR "|" D_CMND_WEBBUTTON "|" D_CMND_CORS;
+
+void (* const WebCommand[])(void) PROGMEM = {
+#ifdef USE_EMULATION
+  &CmndEmulation,
+#endif
+#ifdef USE_SENDMAIL
+  &CmndSendmail,
+#endif
+  &CmndWebServer, &CmndWebPassword, &CmndWeblog, &CmndWebRefresh, &CmndWebSend, &CmndWebColor,
+  &CmndWebSensor, &CmndWebButton, &CmndCors };
+
+
+
+
+
+#ifdef USE_EMULATION
+void CmndEmulation(void)
+{
+#if defined(USE_EMULATION_WEMO) && defined(USE_EMULATION_HUE)
+  if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
+#else
+#ifndef USE_EMULATION_WEMO
+  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_HUE == XdrvMailbox.payload)) {
+#endif
+#ifndef USE_EMULATION_HUE
+  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_WEMO == XdrvMailbox.payload)) {
+#endif
+#endif
+    Settings.flag2.emulation = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  ResponseCmndNumber(Settings.flag2.emulation);
+}
+#endif
+
+#ifdef USE_SENDMAIL
+void CmndSendmail(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    uint8_t result = SendMail(XdrvMailbox.data);
+    char stemp1[20];
+    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
+  }
+}
+#endif
+
+
+void CmndWebServer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    Settings.webserver = XdrvMailbox.payload;
+  }
+  if (Settings.webserver) {
+    Response_P(PSTR("{\"" D_CMND_WEBSERVER "\":\"" D_JSON_ACTIVE_FOR " %s " D_JSON_ON_DEVICE " %s " D_JSON_WITH_IP_ADDRESS " %s\"}"),
+      (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
+  } else {
+    ResponseCmndStateText(0);
+  }
+}
+
+void CmndWebPassword(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_WEBPWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
+    ResponseCmndChar(SettingsText(SET_WEBPWD));
+  } else {
+    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
+  }
+}
+
+void CmndWeblog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.weblog_level = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.weblog_level);
+}
+
+void CmndWebRefresh(void)
+{
+  if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload <= 10000)) {
+    Settings.web_refresh = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.web_refresh);
+}
+
+void CmndWebSend(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    uint32_t result = WebSend(XdrvMailbox.data);
+    char stemp1[20];
+    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
+  }
+}
+
+void CmndWebColor(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      if ((XdrvMailbox.data_len > 3) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= COL_LAST)) {
+        WebHexCode(XdrvMailbox.index -1, XdrvMailbox.data);
+      }
+      else if (0 == XdrvMailbox.payload) {
+        SettingsDefaultWebColor();
+      }
+    }
+    else {
+      JsonWebColor(XdrvMailbox.data);
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_WEBCOLOR "\":["));
+  for (uint32_t i = 0; i < COL_LAST; i++) {
+    if (i) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(PSTR("\"#%06x\""), WebColor(i));
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+void CmndWebSensor(void)
+{
+  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+    }
+  }
+  Response_P(PSTR("{\"" D_CMND_WEBSENSOR "\":"));
+  XsnsSensorState();
+  ResponseJsonEnd();
+}
+
+void CmndWebButton(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_BUTTON_TEXT)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_BUTTON1, MAX_BUTTON_TEXT);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        SettingsUpdateText(SET_BUTTON1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_BUTTON1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndCors(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_CORS, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
+  }
+  ResponseCmndChar(SettingsText(SET_CORS));
+}
+
+
+
+
+
+bool Xdrv01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      PollDnsWebserver();
+#ifdef USE_EMULATION
+#ifdef USE_DEVICE_GROUPS
+      if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { PollUdp(); }
+#else
+      if (Settings.flag2.emulation) { PollUdp(); }
+#endif
+#endif
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kWebCommands, WebCommand);
+      break;
+  }
+  return result;
+}
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
+#define XDRV_02 2
+
+
+
+#ifdef USE_MQTT_TLS
+  #include "WiFiClientSecureLightBearSSL.h"
+  BearSSL::WiFiClientSecure_light *tlsClient;
+#else
+  WiFiClient EspClient;
+#endif
+
+const char kMqttCommands[] PROGMEM = "|"
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  D_CMND_MQTTFINGERPRINT "|"
+#endif
+  D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|"
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  D_CMND_TLSKEY "|"
+#endif
+  D_CMND_MQTTHOST "|" D_CMND_MQTTPORT "|" D_CMND_MQTTRETRY "|" D_CMND_STATETEXT "|" D_CMND_MQTTCLIENT "|"
+  D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|"
+  D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ;
+
+void (* const MqttCommand[])(void) PROGMEM = {
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  &CmndMqttFingerprint,
+#endif
+  &CmndMqttUser, &CmndMqttPassword,
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  &CmndTlsKey,
+#endif
+  &CmndMqttHost, &CmndMqttPort, &CmndMqttRetry, &CmndStateText, &CmndMqttClient,
+  &CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog,
+  &CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain, &CmndSensorRetain };
+
+struct MQTT {
+  uint16_t connect_count = 0;
+  uint16_t retry_counter = 1;
+  uint8_t initial_connection_state = 2;
+  bool connected = false;
+  bool allowed = false;
+} Mqtt;
+
+#ifdef USE_MQTT_TLS
+
+#ifdef USE_MQTT_AWS_IOT
+#include <base64.hpp>
+
+const br_ec_private_key *AWS_IoT_Private_Key = nullptr;
+const br_x509_certificate *AWS_IoT_Client_Certificate = nullptr;
+
+class tls_entry_t {
+public:
+  uint32_t name;
+  uint16_t start;
+  uint16_t len;
+};
+
+const static uint32_t TLS_NAME_SKEY = 0x2079656B;
+const static uint32_t TLS_NAME_CRT = 0x20747263;
+
+class tls_dir_t {
+public:
+  tls_entry_t entry[4];
+};
+
+tls_dir_t tls_dir;
+
+#endif
+
+
+
+
+bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value) {
+ for (uint32_t i = 0; i<20; i++) {
+  if (finger[i] != value) {
+   return false;
+  }
+ }
+ return true;
+}
+#endif
+
+void MakeValidMqtt(uint32_t option, char* str)
+{
+
+
+  uint32_t i = 0;
+  while (str[i] > 0) {
+
+    if ((str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
+      if (option) {
+        uint32_t j = i;
+        while (str[j] > 0) {
+          str[j] = str[j +1];
+          j++;
+        }
+        i--;
+      } else {
+        str[i] = '_';
+      }
+    }
+    i++;
+  }
+}
+
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+void MqttDiscoverServer(void)
+{
+  if (!Wifi.mdns_begun) { return; }
+
+  int n = MDNS.queryService("mqtt", "tcp");
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
+
+  if (n > 0) {
+    uint32_t i = 0;
+#ifdef MDNS_HOSTNAME
+    for (i = n; i > 0; i--) {
+      if (!strcmp(MDNS.hostname(i).c_str(), MDNS_HOSTNAME)) {
+        break;
+      }
+    }
+#endif
+    SettingsUpdateText(SET_MQTT_HOST, MDNS.IP(i).toString().c_str());
+    Settings.mqtt_port = MDNS.port(i);
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"), MDNS.hostname(i).c_str(), SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
+  }
+}
+#endif
+#endif
+# 163 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
+#include <PubSubClient.h>
+
+
+#if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MIN_MESSZ
+  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1200"
+#endif
+
+#ifdef USE_MQTT_TLS
+PubSubClient MqttClient;
+#else
+PubSubClient MqttClient(EspClient);
+#endif
+
+void MqttInit(void)
+{
+#ifdef USE_MQTT_TLS
+  tlsClient = new BearSSL::WiFiClientSecure_light(1024,1024);
+
+#ifdef USE_MQTT_AWS_IOT
+  loadTlsDir();
+  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
+                             AWS_IoT_Private_Key,
+                             0xFFFF , 0);
+#endif
+
+#ifdef USE_MQTT_TLS_CA_CERT
+#ifdef USE_MQTT_AWS_IOT
+  tlsClient->setTrustAnchor(&AmazonRootCA1_TA);
+#else
+  tlsClient->setTrustAnchor(&LetsEncryptX3CrossSigned_TA);
+#endif
+#endif
+
+  MqttClient.setClient(*tlsClient);
+#endif
+}
+
+bool MqttIsConnected(void)
+{
+  return MqttClient.connected();
+}
+
+void MqttDisconnect(void)
+{
+  MqttClient.disconnect();
+}
+
+void MqttSubscribeLib(const char *topic)
+{
+  MqttClient.subscribe(topic);
+  MqttClient.loop();
+}
+
+void MqttUnsubscribeLib(const char *topic)
+{
+  MqttClient.unsubscribe(topic);
+  MqttClient.loop();
+}
+
+bool MqttPublishLib(const char* topic, bool retained)
+{
+
+  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
+    char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
+    if (str == topic) {
+      mqtt_cmnd_blocked_reset = 4;
+      mqtt_cmnd_blocked++;
+    }
+  }
+
+  bool result = MqttClient.publish(topic, mqtt_data, retained);
+  yield();
+  return result;
+}
+
+void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("MqttDataHandler"));
+#endif
+
+
+  if (data_len >= MQTT_MAX_PACKET_SIZE) { return; }
+
+
+  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
+    char *str = strstr(mqtt_topic, SettingsText(SET_MQTTPREFIX1));
+    if ((str == mqtt_topic) && mqtt_cmnd_blocked) {
+      mqtt_cmnd_blocked--;
+      return;
+    }
+  }
+
+
+  char topic[TOPSZ];
+  strlcpy(topic, mqtt_topic, sizeof(topic));
+  mqtt_data[data_len] = 0;
+  char data[data_len +1];
+  memcpy(data, mqtt_data, sizeof(data));
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_MQTT D_RECEIVED_TOPIC " \"%s\", " D_DATA_SIZE " %d, " D_DATA " \"%s\""), topic, data_len, data);
+
+
+
+  XdrvMailbox.index = strlen(topic);
+  XdrvMailbox.data_len = data_len;
+  XdrvMailbox.topic = topic;
+  XdrvMailbox.data = (char*)data;
+  if (XdrvCall(FUNC_MQTT_DATA)) { return; }
+
+  ShowSource(SRC_MQTT);
+
+  CommandHandler(topic, data, data_len);
+}
+
+
+
+void MqttRetryCounter(uint8_t value)
+{
+  Mqtt.retry_counter = value;
+}
+
+void MqttSubscribe(const char *topic)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_SUBSCRIBE_TO " %s"), topic);
+  MqttSubscribeLib(topic);
+}
+
+void MqttUnsubscribe(const char *topic)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_UNSUBSCRIBE_FROM " %s"), topic);
+  MqttUnsubscribeLib(topic);
+}
+
+void MqttPublishLogging(const char *mxtime)
+{
+  char saved_mqtt_data[strlen(mqtt_data) +1];
+  memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
+
+
+  Response_P(PSTR("%s%s"), mxtime, log_data);
+  char stopic[TOPSZ];
+  GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
+  MqttPublishLib(stopic, false);
+
+  memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
+}
+
+void MqttPublish(const char* topic, bool retained)
+{
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("MqttPublish"));
+#endif
+
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT) || defined(MQTT_NO_RETAIN)
+
+
+
+  retained = false;
+#endif
+
+  char sretained[CMDSZ];
+  sretained[0] = '\0';
+  char slog_type[20];
+  snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
+
+  if (Settings.flag.mqtt_enabled) {
+    if (MqttPublishLib(topic, retained)) {
+      snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
+      if (retained) {
+        snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
+      }
+    }
+  }
+
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s = %s"), slog_type, (Settings.flag.mqtt_enabled) ? topic : strrchr(topic,'/')+1, mqtt_data);
+  if (strlen(log_data) >= (sizeof(log_data) - strlen(sretained) -1)) {
+    log_data[sizeof(log_data) - strlen(sretained) -5] = '\0';
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s ..."), log_data);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s"), log_data, sretained);
+  AddLog(LOG_LEVEL_INFO);
+
+  if (Settings.ledstate &0x04) {
+    blinks++;
+  }
+}
+
+void MqttPublish(const char* topic)
+{
+  MqttPublish(topic, false);
+}
+
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained)
+{
+
+
+
+
+
+
+
+  char romram[64];
+  char stopic[TOPSZ];
+
+  snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic);
+  for (uint32_t i = 0; i < strlen(romram); i++) {
+    romram[i] = toupper(romram[i]);
+  }
+  prefix &= 3;
+  GetTopic_P(stopic, prefix, mqtt_topic, romram);
+  MqttPublish(stopic, retained);
+
+#ifdef USE_MQTT_AWS_IOT
+  if ((prefix > 0) && (Settings.flag4.awsiot_shadow)) {
+
+    char *topic = SettingsText(SET_MQTT_TOPIC);
+    char topic2[strlen(topic)+1];
+    strcpy(topic2, topic);
+
+    char *s = topic2;
+    while (*s) {
+      if ('/' == *s) {
+        *s = '_';
+      }
+      s++;
+    }
+
+    snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
+
+
+    char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
+    if (!mqtt_save) { return; }
+    strcpy(mqtt_save, mqtt_data);
+    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"state\":{\"reported\":%s}}"), mqtt_save);
+    free(mqtt_save);
+
+    bool result = MqttClient.publish(romram, mqtt_data, false);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
+    yield();
+  }
+#endif
+}
+
+void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)
+{
+  MqttPublishPrefixTopic_P(prefix, subtopic, false);
+}
+
+void MqttPublishTeleSensor(void)
+{
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+  XdrvRulesProcess();
+}
+
+void MqttPublishPowerState(uint32_t device)
+{
+  char stopic[TOPSZ];
+  char scommand[33];
+
+  if ((device < 1) || (device > devices_present)) { device = 1; }
+
+#ifdef USE_SONOFF_IFAN
+  if (IsModuleIfan() && (device > 1)) {
+    if (GetFanspeed() < MaxFanspeed()) {
+#ifdef USE_DOMOTICZ
+      DomoticzUpdateFanState();
+#endif
+      snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED));
+      GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
+      Response_P(S_JSON_COMMAND_NVALUE, scommand, GetFanspeed());
+      MqttPublish(stopic);
+    }
+  } else {
+#endif
+    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable);
+    GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
+    Response_P(S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1)));
+    MqttPublish(stopic);
+
+    GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+    Response_P(GetStateText(bitRead(power, device -1)));
+    MqttPublish(stopic, Settings.flag.mqtt_power_retain);
+#ifdef USE_SONOFF_IFAN
+  }
+#endif
+}
+
+void MqttPublishAllPowerState(void)
+{
+  for (uint32_t i = 1; i <= devices_present; i++) {
+    MqttPublishPowerState(i);
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan()) { break; }
+#endif
+  }
+}
+
+void MqttPublishPowerBlinkState(uint32_t device)
+{
+  char scommand[33];
+
+  if ((device < 1) || (device > devices_present)) {
+    device = 1;
+  }
+  Response_P(PSTR("{\"%s\":\"" D_JSON_BLINK " %s\"}"),
+    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable), GetStateText(bitRead(blink_mask, device -1)));
+
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, S_RSLT_POWER);
+}
+
+
+
+uint16_t MqttConnectCount(void)
+{
+  return Mqtt.connect_count;
+}
+
+void MqttDisconnected(int state)
+{
+  Mqtt.connected = false;
+  Mqtt.retry_counter = Settings.mqtt_retry;
+
+  MqttClient.disconnect();
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), SettingsText(SET_MQTT_HOST), Settings.mqtt_port, state, Mqtt.retry_counter);
+  rules_flag.mqtt_disconnected = 1;
+}
+
+void MqttConnected(void)
+{
+  char stopic[TOPSZ];
+
+  if (Mqtt.allowed) {
+    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED));
+    Mqtt.connected = true;
+    Mqtt.retry_counter = 0;
+    Mqtt.connect_count++;
+
+    GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
+    Response_P(PSTR(D_ONLINE));
+    MqttPublish(stopic, true);
+
+
+    mqtt_data[0] = '\0';
+    MqttPublishPrefixTopic_P(CMND, S_RSLT_POWER);
+
+    GetTopic_P(stopic, CMND, mqtt_topic, PSTR("#"));
+    MqttSubscribe(stopic);
+    if (strstr_P(SettingsText(SET_MQTT_FULLTOPIC), MQTT_TOKEN_TOPIC) != nullptr) {
+      GetGroupTopic_P(stopic, PSTR("#"));
+      MqttSubscribe(stopic);
+      GetFallbackTopic_P(stopic, PSTR("#"));
+      MqttSubscribe(stopic);
+    }
+
+    XdrvCall(FUNC_MQTT_SUBSCRIBE);
+  }
+
+  if (Mqtt.initial_connection_state) {
+    char stopic2[TOPSZ];
+    Response_P(PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"),
+      ModuleName().c_str(), my_version, my_image, GetFallbackTopic_P(stopic, ""), GetGroupTopic_P(stopic2, ""));
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "1"));
+#ifdef USE_WEBSERVER
+    if (Settings.webserver) {
+#if LWIP_IPV6
+      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"IPv6Address\":\"%s\"}"),
+        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str(),WifiGetIPv6().c_str());
+#else
+      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\"}"),
+        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
+#endif
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "2"));
+    }
+#endif
+    Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":"));
+    if (CrashFlag()) {
+      CrashDump();
+    } else {
+      ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str());
+    }
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "3"));
+    MqttPublishAllPowerState();
+    if (Settings.tele_period) {
+      tele_period = Settings.tele_period -5;
+    }
+    rules_flag.system_boot = 1;
+    XdrvCall(FUNC_MQTT_INIT);
+  }
+  Mqtt.initial_connection_state = 0;
+
+  global_state.mqtt_down = 0;
+  if (Settings.flag.mqtt_enabled) {
+    rules_flag.mqtt_connected = 1;
+  }
+}
+
+void MqttReconnect(void)
+{
+  char stopic[TOPSZ];
+
+  Mqtt.allowed = Settings.flag.mqtt_enabled;
+  if (Mqtt.allowed) {
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+    MqttDiscoverServer();
+#endif
+#endif
+    if (!strlen(SettingsText(SET_MQTT_HOST)) || !Settings.mqtt_port) {
+      Mqtt.allowed = false;
+    }
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+    if (!AWS_IoT_Private_Key || !AWS_IoT_Client_Certificate) {
+      Mqtt.allowed = false;
+    }
+#endif
+  }
+  if (!Mqtt.allowed) {
+    MqttConnected();
+    return;
+  }
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif
+
+  AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_ATTEMPTING_CONNECTION));
+
+  Mqtt.connected = false;
+  Mqtt.retry_counter = Settings.mqtt_retry;
+  global_state.mqtt_down = 1;
+
+  char *mqtt_user = nullptr;
+  char *mqtt_pwd = nullptr;
+  if (strlen(SettingsText(SET_MQTT_USER))) {
+    mqtt_user = SettingsText(SET_MQTT_USER);
+  }
+  if (strlen(SettingsText(SET_MQTT_PWD))) {
+    mqtt_pwd = SettingsText(SET_MQTT_PWD);
+  }
+
+  GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
+  Response_P(S_OFFLINE);
+
+  if (MqttClient.connected()) { MqttClient.disconnect(); }
+#ifdef USE_MQTT_TLS
+  tlsClient->stop();
+#else
+  EspClient = WiFiClient();
+  MqttClient.setClient(EspClient);
+#endif
+
+  if (2 == Mqtt.initial_connection_state) {
+    Mqtt.initial_connection_state = 1;
+  }
+
+  MqttClient.setCallback(MqttDataHandler);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
+                             AWS_IoT_Private_Key,
+                             0xFFFF , 0);
+#endif
+  MqttClient.setServer(SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
+
+  uint32_t mqtt_connect_time = millis();
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+  bool allow_all_fingerprints = false;
+  bool learn_fingerprint1 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0x00);
+  bool learn_fingerprint2 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0x00);
+  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0xff);
+  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0xff);
+  allow_all_fingerprints |= learn_fingerprint1;
+  allow_all_fingerprints |= learn_fingerprint2;
+  tlsClient->setPubKeyFingerprint(Settings.mqtt_fingerprint[0], Settings.mqtt_fingerprint[1], allow_all_fingerprints);
+#endif
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "AWS IoT endpoint: %s"), SettingsText(SET_MQTT_HOST));
+  if (MqttClient.connect(mqtt_client, nullptr, nullptr, stopic, 1, false, mqtt_data, MQTT_CLEAN_SESSION)) {
+#else
+  if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data, MQTT_CLEAN_SESSION)) {
+#endif
+#ifdef USE_MQTT_TLS
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connected in %d ms, max ThunkStack used %d"),
+      millis() - mqtt_connect_time, tlsClient->getMaxThunkStackUse());
+    if (!tlsClient->getMFLNStatus()) {
+      AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("MFLN not supported by TLS server"));
+    }
+#ifndef USE_MQTT_TLS_CA_CERT
+
+    char buf_fingerprint[64];
+    ToHex_P((unsigned char *)tlsClient->getRecvPubKeyFingerprint(), 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
+
+    if (learn_fingerprint1 || learn_fingerprint2) {
+
+      bool fingerprint_matched = false;
+      const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
+      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[0], 20)) {
+        fingerprint_matched = true;
+      }
+      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[1], 20)) {
+        fingerprint_matched = true;
+      }
+      if (!fingerprint_matched) {
+
+        if (learn_fingerprint1) {
+          memcpy(Settings.mqtt_fingerprint[0], recv_fingerprint, 20);
+        }
+        if (learn_fingerprint2) {
+          memcpy(Settings.mqtt_fingerprint[1], recv_fingerprint, 20);
+        }
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
+
+        SettingsSaveAll();
+      }
+    }
+#endif
+#endif
+    MqttConnected();
+  } else {
+#ifdef USE_MQTT_TLS
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connection error: %d"), tlsClient->getLastError());
+#endif
+    MqttDisconnected(MqttClient.state());
+  }
+}
+
+void MqttCheck(void)
+{
+  if (Settings.flag.mqtt_enabled) {
+    if (!MqttIsConnected()) {
+      global_state.mqtt_down = 1;
+      if (!Mqtt.retry_counter) {
+        MqttReconnect();
+      } else {
+        Mqtt.retry_counter--;
+      }
+    } else {
+      global_state.mqtt_down = 0;
+    }
+  } else {
+    global_state.mqtt_down = 0;
+    if (Mqtt.initial_connection_state) {
+      MqttReconnect();
+    }
+  }
+}
+
+
+
+
+
+#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+void CmndMqttFingerprint(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    char fingerprint[60];
+    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(fingerprint))) {
+      strlcpy(fingerprint, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? MQTT_FINGERPRINT1 : MQTT_FINGERPRINT2 : XdrvMailbox.data, sizeof(fingerprint));
+      char *p = fingerprint;
+      for (uint32_t i = 0; i < 20; i++) {
+        Settings.mqtt_fingerprint[XdrvMailbox.index -1][i] = strtol(p, &p, 16);
+      }
+      restart_flag = 2;
+    }
+    ResponseCmndIdxChar(ToHex_P((unsigned char *)Settings.mqtt_fingerprint[XdrvMailbox.index -1], 20, fingerprint, sizeof(fingerprint), ' '));
+  }
+}
+#endif
+
+void CmndMqttUser(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_USER, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_USER : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_USER));
+}
+
+void CmndMqttPassword(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_PWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_PASS : XdrvMailbox.data);
+    ResponseCmndChar(SettingsText(SET_MQTT_PWD));
+    restart_flag = 2;
+  } else {
+    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
+  }
+}
+
+void CmndMqttlog(void)
+{
+  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
+    Settings.mqttlog_level = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.mqttlog_level);
+}
+
+void CmndMqttHost(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    SettingsUpdateText(SET_MQTT_HOST, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_HOST : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_HOST));
+}
+
+void CmndMqttPort(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
+    Settings.mqtt_port = (1 == XdrvMailbox.payload) ? MQTT_PORT : XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  ResponseCmndNumber(Settings.mqtt_port);
+}
+
+void CmndMqttRetry(void)
+{
+  if ((XdrvMailbox.payload >= MQTT_RETRY_SECS) && (XdrvMailbox.payload < 32001)) {
+    Settings.mqtt_retry = XdrvMailbox.payload;
+    Mqtt.retry_counter = Settings.mqtt_retry;
+  }
+  ResponseCmndNumber(Settings.mqtt_retry);
+}
+
+void CmndStateText(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_STATE_TEXT)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_STATE_TXT1, MAX_STATE_TEXT);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
+          if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
+        }
+        SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
+      }
+      ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndMqttClient(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    SettingsUpdateText(SET_MQTT_CLIENT, (SC_DEFAULT == Shortcut()) ? MQTT_CLIENT_ID : XdrvMailbox.data);
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_CLIENT));
+}
+
+void CmndFullTopic(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    MakeValidMqtt(1, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    char stemp1[TOPSZ];
+    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1));
+    if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) {
+      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
+      SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp1);
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_FULLTOPIC));
+}
+
+void CmndPrefix(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_MQTT_PREFIXES)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_MQTTPREFIX1, MAX_MQTT_PREFIXES);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+        MakeValidMqtt(0, XdrvMailbox.data);
+        SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
+          (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
+        restart_flag = 2;
+      }
+      ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndPublish(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    char *payload_part;
+    char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
+    if (mqtt_part) {
+      char stemp1[TOPSZ];
+      strlcpy(stemp1, mqtt_part, sizeof(stemp1));
+      if ((payload_part != nullptr) && strlen(payload_part)) {
+        strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
+      } else {
+        mqtt_data[0] = '\0';
+      }
+      MqttPublish(stemp1, (XdrvMailbox.index == 2));
+
+      mqtt_data[0] = '\0';
+    }
+  }
+}
+
+void CmndGroupTopic(void)
+{
+#ifdef USE_DEVICE_GROUPS
+  uint32_t settings_text_index = (XdrvMailbox.index <= 1 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2);
+#endif
+  if (XdrvMailbox.data_len > 0) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+#ifdef USE_DEVICE_GROUPS
+    SettingsUpdateText(settings_text_index, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
+#else
+    SettingsUpdateText(SET_MQTT_GRP_TOPIC, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
+#endif
+    restart_flag = 2;
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
+}
+
+void CmndTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    char stemp1[TOPSZ];
+    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1));
+    if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) {
+      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
+      SettingsUpdateText(SET_MQTT_TOPIC, stemp1);
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_TOPIC));
+}
+
+void CmndButtonTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    switch (Shortcut()) {
+      case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break;
+      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, mqtt_topic); break;
+      case SC_USER: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC); break;
+      default: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, XdrvMailbox.data);
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_BUTTON_TOPIC));
+}
+
+void CmndSwitchTopic(void)
+{
+  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
+    MakeValidMqtt(0, XdrvMailbox.data);
+    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
+    switch (Shortcut()) {
+      case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break;
+      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, mqtt_topic); break;
+      case SC_USER: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC); break;
+      default: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, XdrvMailbox.data);
+    }
+  }
+  ResponseCmndChar(SettingsText(SET_MQTT_SWITCH_TOPIC));
+}
+
+void CmndButtonRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      for (uint32_t i = 1; i <= MAX_KEYS; i++) {
+        SendKey(KEY_BUTTON, i, CLEAR_RETAIN);
+      }
+    }
+    Settings.flag.mqtt_button_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_button_retain);
+}
+
+void CmndSwitchRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      for (uint32_t i = 1; i <= MAX_SWITCHES; i++) {
+        SendKey(KEY_SWITCH, i, CLEAR_RETAIN);
+      }
+    }
+    Settings.flag.mqtt_switch_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_switch_retain);
+}
+
+void CmndPowerRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      char stemp1[TOPSZ];
+      char scommand[CMDSZ];
+      for (uint32_t i = 1; i <= devices_present; i++) {
+        GetTopic_P(stemp1, STAT, mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings.flag.device_index_enable));
+        mqtt_data[0] = '\0';
+        MqttPublish(stemp1, Settings.flag.mqtt_power_retain);
+      }
+    }
+    Settings.flag.mqtt_power_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_power_retain);
+}
+
+void CmndSensorRetain(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    if (!XdrvMailbox.payload) {
+      mqtt_data[0] = '\0';
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain);
+    }
+    Settings.flag.mqtt_sensor_retain = XdrvMailbox.payload;
+  }
+  ResponseCmndStateText(Settings.flag.mqtt_sensor_retain);
+}
+
+
+
+
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+
+
+
+const static uint16_t tls_spi_start_sector = 0xFF;
+const static uint8_t* tls_spi_start = (uint8_t*) 0x402FF000;
+const static size_t tls_spi_len = 0x1000;
+const static size_t tls_block_offset = 0x0400;
+const static size_t tls_block_len = 0x0400;
+const static size_t tls_obj_store_offset = tls_block_offset + sizeof(tls_dir_t);
+
+
+inline void TlsEraseBuffer(uint8_t *buffer) {
+  memset(buffer + tls_block_offset, 0xFF, tls_block_len);
+}
+
+
+
+static br_ec_private_key EC = {
+ 23,
+ nullptr, 0
+};
+
+static br_x509_certificate CHAIN[] = {
+ { nullptr, 0 }
+};
+
+
+
+void loadTlsDir(void) {
+  memcpy_P(&tls_dir, tls_spi_start + tls_block_offset, sizeof(tls_dir));
+
+
+  if ((TLS_NAME_SKEY == tls_dir.entry[0].name) && (tls_dir.entry[0].len > 0)) {
+    EC.x = (unsigned char *)(tls_spi_start + tls_obj_store_offset + tls_dir.entry[0].start);
+    EC.xlen = tls_dir.entry[0].len;
+    AWS_IoT_Private_Key = &EC;
+  } else {
+    AWS_IoT_Private_Key = nullptr;
+  }
+  if ((TLS_NAME_CRT == tls_dir.entry[1].name) && (tls_dir.entry[1].len > 0)) {
+    CHAIN[0].data = (unsigned char *) (tls_spi_start + tls_obj_store_offset + tls_dir.entry[1].start);
+    CHAIN[0].data_len = tls_dir.entry[1].len;
+    AWS_IoT_Client_Certificate = CHAIN;
+  } else {
+    AWS_IoT_Client_Certificate = nullptr;
+  }
+
+}
+
+const char ALLOCATE_ERROR[] PROGMEM = "TLSKey " D_JSON_ERROR ": cannot allocate buffer.";
+
+void CmndTlsKey(void) {
+#ifdef DEBUG_DUMP_TLS
+  if (0 == XdrvMailbox.index){
+    CmndTlsDump();
+  }
+#endif
+  if ((XdrvMailbox.index >= 1) && (XdrvMailbox.index <= 2)) {
+    tls_dir_t *tls_dir_write;
+
+    if (XdrvMailbox.data_len > 0) {
+
+      uint8_t *spi_buffer = (uint8_t*) malloc(tls_spi_len);
+      if (!spi_buffer) {
+        AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
+        return;
+      }
+      memcpy_P(spi_buffer, tls_spi_start, tls_spi_len);
+
+
+      RemoveAllSpaces(XdrvMailbox.data);
+
+
+      uint32_t bin_len = decode_base64_length((unsigned char*)XdrvMailbox.data);
+      uint8_t *bin_buf = nullptr;
+      if (bin_len > 0) {
+        bin_buf = (uint8_t*) malloc(bin_len + 4);
+        if (!bin_buf) {
+          AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
+          free(spi_buffer);
+          return;
+        }
+      }
+
+
+      if (bin_len > 0) {
+        decode_base64((unsigned char*)XdrvMailbox.data, bin_buf);
+      }
+
+
+      tls_dir_write = (tls_dir_t*) (spi_buffer + tls_block_offset);
+
+      if (1 == XdrvMailbox.index) {
+
+
+        TlsEraseBuffer(spi_buffer);
+        if (bin_len > 0) {
+          if (bin_len != 32) {
+
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate must be 32 bytes: %d."), bin_len);
+            free(spi_buffer);
+            free(bin_buf);
+            return;
+          }
+          tls_entry_t *entry = &tls_dir_write->entry[0];
+          entry->name = TLS_NAME_SKEY;
+          entry->start = 0;
+          entry->len = bin_len;
+          memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
+        } else {
+
+        }
+      } else if (2 == XdrvMailbox.index) {
+
+        if (TLS_NAME_SKEY != tls_dir.entry[0].name) {
+
+          AddLog_P(LOG_LEVEL_INFO, PSTR("TLSKey: cannot store Cert if no Key previously stored."));
+          free(spi_buffer);
+          free(bin_buf);
+          return;
+        }
+        if (bin_len <= 256) {
+
+          AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate length too short: %d."), bin_len);
+          free(spi_buffer);
+          free(bin_buf);
+          return;
+        }
+        tls_entry_t *entry = &tls_dir_write->entry[1];
+        entry->name = TLS_NAME_CRT;
+        entry->start = (tls_dir_write->entry[0].start + tls_dir_write->entry[0].len + 3) & ~0x03;
+        entry->len = bin_len;
+        memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
+      }
+
+      if (ESP.flashEraseSector(tls_spi_start_sector)) {
+        ESP.flashWrite(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+      }
+      free(spi_buffer);
+      free(bin_buf);
+    }
+
+    loadTlsDir();
+    Response_P(PSTR("{\"%s1\":%d,\"%s2\":%d}"),
+      XdrvMailbox.command, AWS_IoT_Private_Key ? tls_dir.entry[0].len : -1,
+      XdrvMailbox.command, AWS_IoT_Client_Certificate ? tls_dir.entry[1].len : -1);
+  }
+}
+
+#ifdef DEBUG_DUMP_TLS
+
+uint32_t bswap32(uint32_t x) {
+ return ((x << 24) & 0xff000000 ) |
+  ((x << 8) & 0x00ff0000 ) |
+  ((x >> 8) & 0x0000ff00 ) |
+  ((x >> 24) & 0x000000ff );
+}
+void CmndTlsDump(void) {
+  uint32_t start = (uint32_t)tls_spi_start + tls_block_offset;
+  uint32_t end = start + tls_block_len -1;
+  for (uint32_t pos = start; pos < end; pos += 0x10) {
+    uint32_t* values = (uint32_t*)(pos);
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+    Serial.printf("%08x:  %08x %08x %08x %08x\n", pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#else
+    Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
+#endif
+  }
+}
+#endif
+#endif
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_MQTT "mq"
+
+const char S_CONFIGURE_MQTT[] PROGMEM = D_CONFIGURE_MQTT;
+
+const char HTTP_BTN_MENU_MQTT[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_MQTT "' method='get'><button>" D_CONFIGURE_MQTT "</button></form></p>";
+
+const char HTTP_FORM_MQTT1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_MQTT_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='" WEB_HANDLE_MQTT "'>"
+  "<p><b>" D_HOST "</b> (" MQTT_HOST ")<br><input id='mh' placeholder='" MQTT_HOST" ' value='%s'></p>"
+  "<p><b>" D_PORT "</b> (" STR(MQTT_PORT) ")<br><input id='ml' placeholder='" STR(MQTT_PORT) "' value='%d'></p>"
+  "<p><b>" D_CLIENT "</b> (%s)<br><input id='mc' placeholder='%s' value='%s'></p>";
+const char HTTP_FORM_MQTT2[] PROGMEM =
+  "<p><b>" D_USER "</b> (" MQTT_USER ")<br><input id='mu' placeholder='" MQTT_USER "' value='%s'></p>"
+  "<p><b>" D_PASSWORD "</b><input type='checkbox' onclick='sp(\"mp\")'><br><input id='mp' type='password' placeholder='" D_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
+  "<p><b>" D_TOPIC "</b> = %%topic%% (%s)<br><input id='mt' placeholder='%s' value='%s'></p>"
+  "<p><b>" D_FULL_TOPIC "</b> (%s)<br><input id='mf' placeholder='%s' value='%s'></p>";
+
+void HandleMqttConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT);
+
+  if (WebServer->hasArg("save")) {
+    MqttSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char str[TOPSZ];
+
+  WSContentStart_P(S_CONFIGURE_MQTT);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_MQTT1,
+    SettingsText(SET_MQTT_HOST),
+    Settings.mqtt_port,
+    Format(str, MQTT_CLIENT_ID, sizeof(str)), MQTT_CLIENT_ID, SettingsText(SET_MQTT_CLIENT));
+  WSContentSend_P(HTTP_FORM_MQTT2,
+    (!strlen(SettingsText(SET_MQTT_USER))) ? "0" : SettingsText(SET_MQTT_USER),
+    Format(str, MQTT_TOPIC, sizeof(str)), MQTT_TOPIC, SettingsText(SET_MQTT_TOPIC),
+    MQTT_FULLTOPIC, MQTT_FULLTOPIC, SettingsText(SET_MQTT_FULLTOPIC));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void MqttSaveSettings(void)
+{
+  char tmp[TOPSZ];
+  char stemp[TOPSZ];
+  char stemp2[TOPSZ];
+
+  WebGetArg("mt", tmp, sizeof(tmp));
+  strlcpy(stemp, (!strlen(tmp)) ? MQTT_TOPIC : tmp, sizeof(stemp));
+  MakeValidMqtt(0, stemp);
+  WebGetArg("mf", tmp, sizeof(tmp));
+  strlcpy(stemp2, (!strlen(tmp)) ? MQTT_FULLTOPIC : tmp, sizeof(stemp2));
+  MakeValidMqtt(1, stemp2);
+  if ((strcmp(stemp, SettingsText(SET_MQTT_TOPIC))) || (strcmp(stemp2, SettingsText(SET_MQTT_FULLTOPIC)))) {
+    Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
+    MqttPublishPrefixTopic_P(TELE, S_LWT, true);
+  }
+  SettingsUpdateText(SET_MQTT_TOPIC, stemp);
+  SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp2);
+  WebGetArg("mh", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_HOST, (!strlen(tmp)) ? MQTT_HOST : (!strcmp(tmp,"0")) ? "" : tmp);
+  WebGetArg("ml", tmp, sizeof(tmp));
+  Settings.mqtt_port = (!strlen(tmp)) ? MQTT_PORT : atoi(tmp);
+  WebGetArg("mc", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_CLIENT, (!strlen(tmp)) ? MQTT_CLIENT_ID : tmp);
+#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
+    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
+#else
+  WebGetArg("mu", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_USER, (!strlen(tmp)) ? MQTT_USER : (!strcmp(tmp,"0")) ? "" : tmp);
+  WebGetArg("mp", tmp, sizeof(tmp));
+  SettingsUpdateText(SET_MQTT_PWD, (!strlen(tmp)) ? "" : (!strcmp(tmp, D_ASTERISK_PWD)) ? SettingsText(SET_MQTT_PWD) : tmp);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_MQTTUSER " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
+    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_USER), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
+#endif
+}
+#endif
+
+
+
+
+
+bool Xdrv02(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        MqttInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        MqttClient.loop();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_MQTT);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_MQTT, HandleMqttConfiguration);
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kMqttCommands, MqttCommand);
+        break;
+    }
+  }
+  return result;
+}
+# 1 "S:/Development/Tasmota/tasmota/xdrv_03_energy.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_03_energy.ino"
+#ifdef USE_ENERGY_SENSOR
+
+
+
+
+#define XDRV_03 3
+#define XSNS_03 3
+
+
+
+
+#define ENERGY_NONE 0
+#define ENERGY_WATCHDOG 4
+
+#include <Ticker.h>
+
+#define D_CMND_POWERCAL "PowerCal"
+#define D_CMND_VOLTAGECAL "VoltageCal"
+#define D_CMND_CURRENTCAL "CurrentCal"
+#define D_CMND_TARIFF "Tariff"
+#define D_CMND_MODULEADDRESS "ModuleAddress"
+
+enum EnergyCommands {
+  CMND_POWERCAL, CMND_VOLTAGECAL, CMND_CURRENTCAL,
+  CMND_POWERSET, CMND_VOLTAGESET, CMND_CURRENTSET, CMND_FREQUENCYSET, CMND_MODULEADDRESS };
+
+const char kEnergyCommands[] PROGMEM = "|"
+  D_CMND_POWERCAL "|" D_CMND_VOLTAGECAL "|" D_CMND_CURRENTCAL "|"
+  D_CMND_POWERSET "|" D_CMND_VOLTAGESET "|" D_CMND_CURRENTSET "|" D_CMND_FREQUENCYSET "|" D_CMND_MODULEADDRESS "|"
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|"
+#ifdef USE_ENERGY_POWER_LIMIT
+  D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|"
+  D_CMND_MAXPOWER "|" D_CMND_MAXPOWERHOLD "|" D_CMND_MAXPOWERWINDOW "|"
+  D_CMND_SAFEPOWER "|" D_CMND_SAFEPOWERHOLD "|" D_CMND_SAFEPOWERWINDOW "|"
+#endif
+#endif
+  D_CMND_ENERGYRESET "|" D_CMND_TARIFF ;
+
+void (* const EnergyCommand[])(void) PROGMEM = {
+  &CmndPowerCal, &CmndVoltageCal, &CmndCurrentCal,
+  &CmndPowerSet, &CmndVoltageSet, &CmndCurrentSet, &CmndFrequencySet, &CmndModuleAddress,
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  &CmndPowerDelta, &CmndPowerLow, &CmndPowerHigh, &CmndVoltageLow, &CmndVoltageHigh, &CmndCurrentLow, &CmndCurrentHigh,
+#ifdef USE_ENERGY_POWER_LIMIT
+  &CmndMaxEnergy, &CmndMaxEnergyStart,
+  &CmndMaxPower, &CmndMaxPowerHold, &CmndMaxPowerWindow,
+  &CmndSafePower, &CmndSafePowerHold, &CmndSafePowerWindow,
+#endif
+#endif
+  &CmndEnergyReset, &CmndTariff };
+
+const char kEnergyPhases[] PROGMEM = "|%s / %s|%s / %s / %s||[%s,%s]|[%s,%s,%s]";
+
+struct ENERGY {
+  float voltage[3] = { 0, 0, 0 };
+  float current[3] = { 0, 0, 0 };
+  float active_power[3] = { 0, 0, 0 };
+  float apparent_power[3] = { NAN, NAN, NAN };
+  float reactive_power[3] = { NAN, NAN, NAN };
+  float power_factor[3] = { NAN, NAN, NAN };
+  float frequency[3] = { NAN, NAN, NAN };
+
+  float start_energy = 0;
+  float daily = 0;
+  float total = 0;
+  float export_active = NAN;
+
+  unsigned long kWhtoday_delta = 0;
+  unsigned long kWhtoday_offset = 0;
+  unsigned long kWhtoday;
+  unsigned long period = 0;
+
+  uint8_t fifth_second = 0;
+  uint8_t command_code = 0;
+  uint8_t data_valid[3] = { 0, 0, 0 };
+
+  uint8_t phase_count = 1;
+  bool voltage_common = false;
+
+  bool voltage_available = true;
+  bool current_available = true;
+
+  bool type_dc = false;
+  bool power_on = true;
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  uint16_t power_history[3] = { 0 };
+  uint8_t power_steady_counter = 8;
+  bool power_delta = false;
+  bool min_power_flag = false;
+  bool max_power_flag = false;
+  bool min_voltage_flag = false;
+  bool max_voltage_flag = false;
+  bool min_current_flag = false;
+  bool max_current_flag = false;
+
+#ifdef USE_ENERGY_POWER_LIMIT
+  uint16_t mplh_counter = 0;
+  uint16_t mplw_counter = 0;
+  uint8_t mplr_counter = 0;
+  uint8_t max_energy_state = 0;
+#endif
+#endif
+} Energy;
+
+Ticker ticker_energy;
+
+
+
+bool EnergyTariff1Active()
+{
+  uint8_t dst = 0;
+  if (IsDst() && (Settings.tariff[0][1] != Settings.tariff[1][1])) {
+    dst = 1;
+  }
+  if (Settings.tariff[0][dst] != Settings.tariff[1][dst]) {
+    if (Settings.flag3.energy_weekend && ((RtcTime.day_of_week == 1) ||
+                                          (RtcTime.day_of_week == 7))) {
+      return true;
+    }
+    uint32_t minutes = MinutesPastMidnight();
+    if (Settings.tariff[0][dst] > Settings.tariff[1][dst]) {
+
+      return ((minutes >= Settings.tariff[0][dst]) || (minutes < Settings.tariff[1][dst]));
+    } else {
+
+      return ((minutes >= Settings.tariff[0][dst]) && (minutes < Settings.tariff[1][dst]));
+    }
+  } else {
+    return false;
+  }
+}
+
+void EnergyUpdateToday(void)
+{
+  if (Energy.kWhtoday_delta > 1000) {
+    unsigned long delta = Energy.kWhtoday_delta / 1000;
+    Energy.kWhtoday_delta -= (delta * 1000);
+    Energy.kWhtoday += delta;
+  }
+
+  RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset + Energy.kWhtoday;
+  Energy.daily = (float)(RtcSettings.energy_kWhtoday) / 100000;
+  Energy.total = (float)(RtcSettings.energy_kWhtotal + RtcSettings.energy_kWhtoday) / 100000;
+
+  if (RtcTime.valid){
+
+    uint32_t energy_diff = (uint32_t)(Energy.total * 100000) - RtcSettings.energy_usage.last_usage_kWhtotal;
+    RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 100000);
+
+    uint32_t return_diff = 0;
+    if (!isnan(Energy.export_active)) {
+      return_diff = (uint32_t)(Energy.export_active * 100000) - RtcSettings.energy_usage.last_return_kWhtotal;
+      RtcSettings.energy_usage.last_return_kWhtotal = (uint32_t)(Energy.export_active * 100000);
+    }
+
+    if (EnergyTariff1Active()) {
+      RtcSettings.energy_usage.usage1_kWhtotal += energy_diff;
+      RtcSettings.energy_usage.return1_kWhtotal += return_diff;
+    } else {
+      RtcSettings.energy_usage.usage2_kWhtotal += energy_diff;
+      RtcSettings.energy_usage.return2_kWhtotal += return_diff;
+    }
+  }
+}
+
+void EnergyUpdateTotal(float value, bool kwh)
+{
+
+
+
+
+  uint32_t multiplier = (kwh) ? 100000 : 100;
+
+  if (0 == Energy.start_energy || (value < Energy.start_energy)) {
+    Energy.start_energy = value;
+  }
+  else if (value != Energy.start_energy) {
+    Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier);
+  }
+
+  if ((Energy.total < (value - 0.01)) &&
+      Settings.flag3.hardware_energy_total) {
+    RtcSettings.energy_kWhtotal = (unsigned long)((value * multiplier) - Energy.kWhtoday_offset - Energy.kWhtoday);
+    Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+    Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
+    Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
+
+  }
+  EnergyUpdateToday();
+}
+
+
+
+void Energy200ms(void)
+{
+  Energy.power_on = (power != 0) | Settings.flag.no_power_on_check;
+
+  Energy.fifth_second++;
+  if (5 == Energy.fifth_second) {
+    Energy.fifth_second = 0;
+
+    XnrgCall(FUNC_ENERGY_EVERY_SECOND);
+
+    if (RtcTime.valid) {
+      if (LocalTime() == Midnight()) {
+        Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday;
+
+        RtcSettings.energy_kWhtotal += RtcSettings.energy_kWhtoday;
+        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+        Energy.kWhtoday = 0;
+        Energy.kWhtoday_offset = 0;
+        RtcSettings.energy_kWhtoday = 0;
+        Energy.start_energy = 0;
+
+        Energy.kWhtoday_delta = 0;
+        Energy.period = Energy.kWhtoday;
+        EnergyUpdateToday();
+#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
+        Energy.max_energy_state = 3;
+#endif
+      }
+#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
+      if ((RtcTime.hour == Settings.energy_max_energy_start) && (3 == Energy.max_energy_state )) {
+        Energy.max_energy_state = 0;
+      }
+#endif
+
+    }
+  }
+
+  XnrgCall(FUNC_EVERY_200_MSECOND);
+}
+
+void EnergySaveState(void)
+{
+  Settings.energy_kWhdoy = (RtcTime.valid) ? RtcTime.day_of_year : 0;
+
+  Settings.energy_kWhtoday = RtcSettings.energy_kWhtoday;
+  Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+
+  Settings.energy_usage = RtcSettings.energy_usage;
+}
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag)
+{
+  bool change;
+
+  if (!margin) return false;
+  change = save_flag;
+  if (type) {
+    flag = (value > margin);
+  } else {
+    flag = (value < margin);
+  }
+  save_flag = flag;
+  return (change != save_flag);
+}
+
+void EnergyMarginCheck(void)
+{
+  if (Energy.power_steady_counter) {
+    Energy.power_steady_counter--;
+    return;
+  }
+
+  uint16_t energy_power_u = (uint16_t)(Energy.active_power[0]);
+
+  if (Settings.energy_power_delta) {
+    uint16_t delta = abs(Energy.power_history[0] - energy_power_u);
+    if (delta > 0) {
+      if (Settings.energy_power_delta < 101) {
+        uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
+        if (0 == min_power) { min_power++; }
+        if (((delta * 100) / min_power) > Settings.energy_power_delta) {
+          Energy.power_delta = true;
+        }
+      } else {
+        if (delta > (Settings.energy_power_delta -100)) {
+          Energy.power_delta = true;
+        }
+      }
+      if (Energy.power_delta) {
+        Energy.power_history[1] = Energy.active_power[0];
+        Energy.power_history[2] = Energy.active_power[0];
+      }
+    }
+  }
+  Energy.power_history[0] = Energy.power_history[1];
+  Energy.power_history[1] = Energy.power_history[2];
+  Energy.power_history[2] = energy_power_u;
+
+  if (Energy.power_on && (Settings.energy_min_power || Settings.energy_max_power || Settings.energy_min_voltage || Settings.energy_max_voltage || Settings.energy_min_current || Settings.energy_max_current)) {
+    uint16_t energy_voltage_u = (uint16_t)(Energy.voltage[0]);
+    uint16_t energy_current_u = (uint16_t)(Energy.current[0] * 1000);
+
+    DEBUG_DRIVER_LOG(PSTR("NRG: W %d, U %d, I %d"), energy_power_u, energy_voltage_u, energy_current_u);
+
+    Response_P(PSTR("{"));
+    bool flag;
+    bool jsonflg = false;
+    if (EnergyMargin(false, Settings.energy_min_power, energy_power_u, flag, Energy.min_power_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_power, energy_power_u, flag, Energy.max_power_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(false, Settings.energy_min_voltage, energy_voltage_u, flag, Energy.min_voltage_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGELOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_voltage, energy_voltage_u, flag, Energy.max_voltage_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGEHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(false, Settings.energy_min_current, energy_current_u, flag, Energy.min_current_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (EnergyMargin(true, Settings.energy_max_current, energy_current_u, flag, Energy.max_current_flag)) {
+      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
+      jsonflg = true;
+    }
+    if (jsonflg) {
+      ResponseJsonEnd();
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN);
+      EnergyMqttShow();
+    }
+  }
+
+#ifdef USE_ENERGY_POWER_LIMIT
+
+  if (Settings.energy_max_power_limit) {
+    if (Energy.active_power[0] > Settings.energy_max_power_limit) {
+      if (!Energy.mplh_counter) {
+        Energy.mplh_counter = Settings.energy_max_power_limit_hold;
+      } else {
+        Energy.mplh_counter--;
+        if (!Energy.mplh_counter) {
+          ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
+          MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+          EnergyMqttShow();
+          SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
+          if (!Energy.mplr_counter) {
+            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;
+          }
+          Energy.mplw_counter = Settings.energy_max_power_limit_window;
+        }
+      }
+    }
+    else if (power && (energy_power_u <= Settings.energy_max_power_limit)) {
+      Energy.mplh_counter = 0;
+      Energy.mplr_counter = 0;
+      Energy.mplw_counter = 0;
+    }
+    if (!power) {
+      if (Energy.mplw_counter) {
+        Energy.mplw_counter--;
+      } else {
+        if (Energy.mplr_counter) {
+          Energy.mplr_counter--;
+          if (Energy.mplr_counter) {
+            ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1));
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
+            RestorePower(true, SRC_MAXPOWER);
+          } else {
+            ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
+            MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+            EnergyMqttShow();
+            SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
+          }
+        }
+      }
+    }
+  }
+
+
+  if (Settings.energy_max_energy) {
+    uint16_t energy_daily_u = (uint16_t)(Energy.daily * 1000);
+    if (!Energy.max_energy_state && (RtcTime.hour == Settings.energy_max_energy_start)) {
+      Energy.max_energy_state = 1;
+      ResponseTime_P(PSTR(",\"" D_JSON_ENERGYMONITOR "\":\"%s\"}"), GetStateText(1));
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_ENERGYMONITOR));
+      RestorePower(true, SRC_MAXENERGY);
+    }
+    else if ((1 == Energy.max_energy_state ) && (energy_daily_u >= Settings.energy_max_energy)) {
+      Energy.max_energy_state = 2;
+      char stemp[FLOATSZ];
+      dtostrfd(Energy.daily, 3, stemp);
+      ResponseTime_P(PSTR(",\"" D_JSON_MAXENERGYREACHED "\":%s}"), stemp);
+      MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
+      EnergyMqttShow();
+      SetAllPower(POWER_ALL_OFF, SRC_MAXENERGY);
+    }
+  }
+#endif
+
+  if (Energy.power_delta) { EnergyMqttShow(); }
+}
+
+void EnergyMqttShow(void)
+{
+
+  int tele_period_save = tele_period;
+  tele_period = 2;
+  mqtt_data[0] = '\0';
+  ResponseAppendTime();
+  EnergyShow(true);
+  tele_period = tele_period_save;
+  ResponseJsonEnd();
+  MqttPublishTeleSensor();
+  Energy.power_delta = false;
+}
+#endif
+
+void EnergyEverySecond(void)
+{
+
+  if (global_update) {
+    if (power && (global_temperature != 9999) && (global_temperature > Settings.param[P_OVER_TEMP])) {
+      SetAllPower(POWER_ALL_OFF, SRC_OVERTEMP);
+    }
+  }
+
+
+  uint32_t data_valid = Energy.phase_count;
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    if (Energy.data_valid[i] <= ENERGY_WATCHDOG) {
+      Energy.data_valid[i]++;
+      if (Energy.data_valid[i] > ENERGY_WATCHDOG) {
+
+        Energy.voltage[i] = 0;
+        Energy.current[i] = 0;
+        Energy.active_power[i] = 0;
+        if (!isnan(Energy.apparent_power[i])) { Energy.apparent_power[i] = 0; }
+        if (!isnan(Energy.reactive_power[i])) { Energy.reactive_power[i] = 0; }
+        if (!isnan(Energy.frequency[i])) { Energy.frequency[i] = 0; }
+        if (!isnan(Energy.power_factor[i])) { Energy.power_factor[i] = 0; }
+
+        data_valid--;
+      }
+    }
+  }
+  if (!data_valid) {
+    if (!isnan(Energy.export_active)) { Energy.export_active = 0; }
+    Energy.start_energy = 0;
+
+    XnrgCall(FUNC_ENERGY_RESET);
+  }
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+  EnergyMarginCheck();
+#endif
+}
+
+
+
+
+
+void EnergyCommandCalResponse(uint32_t nvalue)
+{
+  snprintf_P(XdrvMailbox.command, CMDSZ, PSTR("%sCal"), XdrvMailbox.command);
+  ResponseCmndNumber(nvalue);
+}
+
+void CmndEnergyReset(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
+    char *p;
+    unsigned long lnum = strtoul(XdrvMailbox.data, &p, 10);
+    if (p != XdrvMailbox.data) {
+      switch (XdrvMailbox.index) {
+      case 1:
+
+        Energy.kWhtoday_offset = lnum *100;
+        Energy.kWhtoday = 0;
+        Energy.kWhtoday_delta = 0;
+        Energy.start_energy = 0;
+        Energy.period = Energy.kWhtoday_offset;
+        Settings.energy_kWhtoday = Energy.kWhtoday_offset;
+        RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset;
+        Energy.daily = (float)Energy.kWhtoday_offset / 100000;
+        if (!RtcSettings.energy_kWhtotal && !Energy.kWhtoday_offset) {
+          Settings.energy_kWhtotal_time = LocalTime();
+        }
+        break;
+      case 2:
+
+        Settings.energy_kWhyesterday = lnum *100;
+        break;
+      case 3:
+
+        RtcSettings.energy_kWhtotal = lnum *100;
+        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
+
+        Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
+        RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 1000);
+        break;
+      }
+    }
+  }
+  else if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
+    uint32_t values[2] = { 0 };
+    uint32_t position = ParseParameters(2, values);
+    values[0] *= 100;
+    values[1] *= 100;
+
+    switch (XdrvMailbox.index)
+    {
+      case 4:
+
+        if (position > 0) {
+          RtcSettings.energy_usage.usage1_kWhtotal = values[0];
+        }
+        if (position > 1) {
+          RtcSettings.energy_usage.usage2_kWhtotal = values[1];
+        }
+        Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
+        Settings.energy_usage.usage2_kWhtotal = RtcSettings.energy_usage.usage2_kWhtotal;
+        break;
+      case 5:
+
+        if (position > 0) {
+          RtcSettings.energy_usage.return1_kWhtotal = values[0];
+        }
+        if (position > 1) {
+          RtcSettings.energy_usage.return2_kWhtotal = values[1];
+        }
+        Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
+        Settings.energy_usage.return2_kWhtotal = RtcSettings.energy_usage.return2_kWhtotal;
+        break;
+      }
+  }
+
+  Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
+
+  char energy_total_chr[FLOATSZ];
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr);
+  char energy_daily_chr[FLOATSZ];
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
+  char energy_yesterday_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
+
+  char energy_usage1_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage1_chr);
+  char energy_usage2_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage2_chr);
+  char energy_return1_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return1_chr);
+  char energy_return2_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return2_chr);
+
+  Response_P(PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s,\"" D_JSON_USAGE "\":[%s,%s],\"" D_JSON_EXPORT "\":[%s,%s]}}"),
+    XdrvMailbox.command, energy_total_chr, energy_yesterday_chr, energy_daily_chr, energy_usage1_chr, energy_usage2_chr, energy_return1_chr, energy_return2_chr);
+}
+
+void CmndTariff(void)
+{
+
+
+
+
+
+
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    uint32_t tariff = XdrvMailbox.index -1;
+    uint32_t time_type = 0;
+    char *p;
+    char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+    while ((str != nullptr) && (time_type < 2)) {
+      char *q;
+      uint32_t value = strtol(str, &q, 10);
+      Settings.tariff[tariff][time_type] = value;
+      if (value < 24) {
+        Settings.tariff[tariff][time_type] *= 60;
+        char *minute = strtok_r(nullptr, ":", &q);
+        if (minute) {
+          value = strtol(minute, nullptr, 10);
+          if (value > 59) {
+            value = 59;
+          }
+          Settings.tariff[tariff][time_type] += value;
+        }
+      }
+      if (Settings.tariff[tariff][time_type] > 1439) {
+        Settings.tariff[tariff][time_type] = 1439;
+      }
+      str = strtok_r(nullptr, ", ", &p);
+      time_type++;
+    }
+  }
+  else if (XdrvMailbox.index == 9) {
+    Settings.flag3.energy_weekend = XdrvMailbox.payload & 1;
+  }
+  Response_P(PSTR("{\"%s\":{\"Off-Peak\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Standard\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Weekend\":\"%s\"}}"),
+    XdrvMailbox.command,
+    GetMinuteTime(Settings.tariff[0][0]).c_str(),GetMinuteTime(Settings.tariff[0][1]).c_str(),
+    GetMinuteTime(Settings.tariff[1][0]).c_str(),GetMinuteTime(Settings.tariff[1][1]).c_str(),
+    GetStateText(Settings.flag3.energy_weekend));
+}
+
+void CmndPowerCal(void)
+{
+  Energy.command_code = CMND_POWERCAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_power_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_power_calibration);
+  }
+}
+
+void CmndVoltageCal(void)
+{
+  Energy.command_code = CMND_VOLTAGECAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_voltage_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_voltage_calibration);
+  }
+}
+
+void CmndCurrentCal(void)
+{
+  Energy.command_code = CMND_CURRENTCAL;
+  if (XnrgCall(FUNC_COMMAND)) {
+    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
+      Settings.energy_current_calibration = XdrvMailbox.payload;
+    }
+    ResponseCmndNumber(Settings.energy_current_calibration);
+  }
+}
+
+void CmndPowerSet(void)
+{
+  Energy.command_code = CMND_POWERSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_power_calibration);
+  }
+}
+
+void CmndVoltageSet(void)
+{
+  Energy.command_code = CMND_VOLTAGESET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_voltage_calibration);
+  }
+}
+
+void CmndCurrentSet(void)
+{
+  Energy.command_code = CMND_CURRENTSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_current_calibration);
+  }
+}
+
+void CmndFrequencySet(void)
+{
+  Energy.command_code = CMND_FREQUENCYSET;
+  if (XnrgCall(FUNC_COMMAND)) {
+    EnergyCommandCalResponse(Settings.energy_frequency_calibration);
+  }
+}
+
+void CmndModuleAddress(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4) && (1 == Energy.phase_count)) {
+    Energy.command_code = CMND_MODULEADDRESS;
+    if (XnrgCall(FUNC_COMMAND)) {
+      ResponseCmndDone();
+    }
+  }
+}
+
+#ifdef USE_ENERGY_MARGIN_DETECTION
+void CmndPowerDelta(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32000)) {
+    Settings.energy_power_delta = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_power_delta);
+}
+
+void CmndPowerLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_min_power = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_power);
+}
+
+void CmndPowerHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power);
+}
+
+void CmndVoltageLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
+    Settings.energy_min_voltage = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_voltage);
+}
+
+void CmndVoltageHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
+    Settings.energy_max_voltage = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_voltage);
+}
+
+void CmndCurrentLow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
+    Settings.energy_min_current = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_min_current);
+}
+
+void CmndCurrentHigh(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
+    Settings.energy_max_current = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_current);
+}
+
+#ifdef USE_ENERGY_POWER_LIMIT
+void CmndMaxPower(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit);
+}
+
+void CmndMaxPowerHold(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit_hold = (1 == XdrvMailbox.payload) ? MAX_POWER_HOLD : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit_hold);
+}
+
+void CmndMaxPowerWindow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_limit_window = (1 == XdrvMailbox.payload) ? MAX_POWER_WINDOW : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_limit_window);
+}
+
+void CmndSafePower(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_safe_limit = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit);
+}
+
+void CmndSafePowerHold(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_power_safe_limit_hold = (1 == XdrvMailbox.payload) ? SAFE_POWER_HOLD : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit_hold);
+}
+
+void CmndSafePowerWindow(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 1440)) {
+    Settings.energy_max_power_safe_limit_window = (1 == XdrvMailbox.payload) ? SAFE_POWER_WINDOW : XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_power_safe_limit_window);
+}
+
+void CmndMaxEnergy(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.energy_max_energy = XdrvMailbox.payload;
+    Energy.max_energy_state = 3;
+  }
+  ResponseCmndNumber(Settings.energy_max_energy);
+}
+
+void CmndMaxEnergyStart(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 24)) {
+    Settings.energy_max_energy_start = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.energy_max_energy_start);
+}
+#endif
+#endif
+
+void EnergySnsInit(void)
+{
+  XnrgCall(FUNC_INIT);
+
+  if (energy_flg) {
+    if (RtcSettingsValid()) {
+      Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday;
+    }
+    else if (RtcTime.day_of_year == Settings.energy_kWhdoy) {
+      Energy.kWhtoday_offset = Settings.energy_kWhtoday;
+    }
+    else {
+      Energy.kWhtoday_offset = 0;
+    }
+    Energy.kWhtoday = 0;
+    Energy.kWhtoday_delta = 0;
+    Energy.period = Energy.kWhtoday_offset;
+    EnergyUpdateToday();
+    ticker_energy.attach_ms(200, Energy200ms);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_SNS1[] PROGMEM =
+  "{s}" D_POWERUSAGE_APPARENT "{m}%s " D_UNIT_VA "{e}"
+  "{s}" D_POWERUSAGE_REACTIVE "{m}%s " D_UNIT_VAR "{e}"
+  "{s}" D_POWER_FACTOR "{m}%s{e}";
+
+const char HTTP_ENERGY_SNS2[] PROGMEM =
+  "{s}" D_ENERGY_TODAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_YESTERDAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_TOTAL "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
+
+const char HTTP_ENERGY_SNS3[] PROGMEM =
+  "{s}" D_EXPORT_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
+#endif
+
+char* EnergyFormatIndex(char* result, char* input, bool json, uint32_t index, bool single = false)
+{
+  char layout[16];
+  GetTextIndexed(layout, sizeof(layout), (index -1) + (3 * json), kEnergyPhases);
+  switch (index) {
+    case 2:
+      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ);
+      break;
+    case 3:
+      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ, input + FLOATSZ + FLOATSZ);
+      break;
+    default:
+      snprintf_P(result, FLOATSZ *3, input);
+  }
+  return result;
+}
+
+char* EnergyFormat(char* result, char* input, bool json, bool single = false)
+{
+  uint8_t index = (single) ? 1 : Energy.phase_count;
+  return EnergyFormatIndex(result, input, json, index, single);
+}
+
+void EnergyShow(bool json)
+{
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    if (Energy.voltage_common) {
+      Energy.voltage[i] = Energy.voltage[0];
+    }
+  }
+
+  float power_factor_knx = Energy.power_factor[0];
+
+  char apparent_power_chr[Energy.phase_count][FLOATSZ];
+  char reactive_power_chr[Energy.phase_count][FLOATSZ];
+  char power_factor_chr[Energy.phase_count][FLOATSZ];
+  char frequency_chr[Energy.phase_count][FLOATSZ];
+  if (!Energy.type_dc) {
+    if (Energy.current_available && Energy.voltage_available) {
+      for (uint32_t i = 0; i < Energy.phase_count; i++) {
+        float apparent_power = Energy.apparent_power[i];
+        if (isnan(apparent_power)) {
+          apparent_power = Energy.voltage[i] * Energy.current[i];
+        }
+        if (apparent_power < Energy.active_power[i]) {
+          Energy.active_power[i] = apparent_power;
+        }
+
+        float power_factor = Energy.power_factor[i];
+        if (isnan(power_factor)) {
+          power_factor = (Energy.active_power[i] && apparent_power) ? Energy.active_power[i] / apparent_power : 0;
+          if (power_factor > 1) {
+            power_factor = 1;
+          }
+        }
+        if (0 == i) { power_factor_knx = power_factor; }
+
+        float reactive_power = Energy.reactive_power[i];
+        if (isnan(reactive_power)) {
+          reactive_power = 0;
+          uint32_t difference = ((uint32_t)(apparent_power * 100) - (uint32_t)(Energy.active_power[i] * 100)) / 10;
+          if ((Energy.current[i] > 0.005) && ((difference > 15) || (difference > (uint32_t)(apparent_power * 100 / 1000)))) {
+
+
+            reactive_power = (float)(RoundSqrtInt((uint32_t)(apparent_power * apparent_power * 100) - (uint32_t)(Energy.active_power[i] * Energy.active_power[i] * 100))) / 10;
+          }
+        }
+
+        dtostrfd(apparent_power, Settings.flag2.wattage_resolution, apparent_power_chr[i]);
+        dtostrfd(reactive_power, Settings.flag2.wattage_resolution, reactive_power_chr[i]);
+        dtostrfd(power_factor, 2, power_factor_chr[i]);
+      }
+    }
+    for (uint32_t i = 0; i < Energy.phase_count; i++) {
+      float frequency = Energy.frequency[i];
+      if (isnan(Energy.frequency[i])) {
+        frequency = 0;
+      }
+      dtostrfd(frequency, Settings.flag2.frequency_resolution, frequency_chr[i]);
+    }
+  }
+
+  char voltage_chr[Energy.phase_count][FLOATSZ];
+  char current_chr[Energy.phase_count][FLOATSZ];
+  char active_power_chr[Energy.phase_count][FLOATSZ];
+  for (uint32_t i = 0; i < Energy.phase_count; i++) {
+    dtostrfd(Energy.voltage[i], Settings.flag2.voltage_resolution, voltage_chr[i]);
+    dtostrfd(Energy.current[i], Settings.flag2.current_resolution, current_chr[i]);
+    dtostrfd(Energy.active_power[i], Settings.flag2.wattage_resolution, active_power_chr[i]);
+  }
+
+  char energy_daily_chr[FLOATSZ];
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
+  char energy_yesterday_chr[FLOATSZ];
+  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
+
+  char energy_total_chr[3][FLOATSZ];
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr[0]);
+  char export_active_chr[3][FLOATSZ];
+  dtostrfd(Energy.export_active, Settings.flag2.energy_resolution, export_active_chr[0]);
+  uint8_t energy_total_fields = 1;
+
+  if (Settings.tariff[0][0] != Settings.tariff[1][0]) {
+    dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[1]);
+    dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[2]);
+    dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[1]);
+    dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[2]);
+    energy_total_fields = 3;
+  }
+
+  char value_chr[FLOATSZ *3];
+  char value2_chr[FLOATSZ *3];
+  char value3_chr[FLOATSZ *3];
+
+  if (json) {
+    bool show_energy_period = (0 == tele_period);
+
+    ResponseAppend_P(PSTR(",\"" D_RSLT_ENERGY "\":{\"" D_JSON_TOTAL_START_TIME "\":\"%s\",\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s"),
+      GetDateAndTime(DT_ENERGY).c_str(),
+      EnergyFormatIndex(value_chr, energy_total_chr[0], json, energy_total_fields),
+      energy_yesterday_chr,
+      energy_daily_chr);
+
+    if (!isnan(Energy.export_active)) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_EXPORT_ACTIVE "\":%s"),
+        EnergyFormatIndex(value_chr, export_active_chr[0], json, energy_total_fields));
+    }
+
+    if (show_energy_period) {
+      float energy = 0;
+      if (Energy.period) {
+        energy = (float)(RtcSettings.energy_kWhtoday - Energy.period) / 100;
+      }
+      Energy.period = RtcSettings.energy_kWhtoday;
+      char energy_period_chr[FLOATSZ];
+      dtostrfd(energy, Settings.flag2.wattage_resolution, energy_period_chr);
+      ResponseAppend_P(PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr);
+    }
+    ResponseAppend_P(PSTR(",\"" D_JSON_POWERUSAGE "\":%s"),
+      EnergyFormat(value_chr, active_power_chr[0], json));
+    if (!Energy.type_dc) {
+      if (Energy.current_available && Energy.voltage_available) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_APPARENT_POWERUSAGE "\":%s,\"" D_JSON_REACTIVE_POWERUSAGE "\":%s,\"" D_JSON_POWERFACTOR "\":%s"),
+          EnergyFormat(value_chr, apparent_power_chr[0], json),
+          EnergyFormat(value2_chr, reactive_power_chr[0], json),
+          EnergyFormat(value3_chr, power_factor_chr[0], json));
+      }
+      if (!isnan(Energy.frequency[0])) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_FREQUENCY "\":%s"),
+          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
+      }
+    }
+    if (Energy.voltage_available) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_VOLTAGE "\":%s"),
+        EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
+    }
+    if (Energy.current_available) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_CURRENT "\":%s"),
+        EnergyFormat(value_chr, current_chr[0], json));
+    }
+    XnrgCall(FUNC_JSON_APPEND);
+    ResponseJsonEnd();
+
+#ifdef USE_DOMOTICZ
+    if (show_energy_period) {
+      dtostrfd(Energy.total * 1000, 1, energy_total_chr[0]);
+      DomoticzSensorPowerEnergy((int)Energy.active_power[0], energy_total_chr[0]);
+
+      dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100, 1, energy_total_chr[1]);
+      dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100, 1, energy_total_chr[2]);
+      dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100, 1, export_active_chr[1]);
+      dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100, 1, export_active_chr[2]);
+      DomoticzSensorP1SmartMeter(energy_total_chr[1], energy_total_chr[2], export_active_chr[1], export_active_chr[2], (int)Energy.active_power[0]);
+
+      if (Energy.voltage_available) {
+        DomoticzSensor(DZ_VOLTAGE, voltage_chr[0]);
+      }
+      if (Energy.current_available) {
+        DomoticzSensor(DZ_CURRENT, current_chr[0]);
+      }
+    }
+#endif
+#ifdef USE_KNX
+    if (show_energy_period) {
+      if (Energy.voltage_available) {
+        KnxSensor(KNX_ENERGY_VOLTAGE, Energy.voltage[0]);
+      }
+      if (Energy.current_available) {
+        KnxSensor(KNX_ENERGY_CURRENT, Energy.current[0]);
+      }
+      KnxSensor(KNX_ENERGY_POWER, Energy.active_power[0]);
+      if (!Energy.type_dc) {
+        KnxSensor(KNX_ENERGY_POWERFACTOR, power_factor_knx);
+      }
+      KnxSensor(KNX_ENERGY_DAILY, Energy.daily);
+      KnxSensor(KNX_ENERGY_TOTAL, Energy.total);
+      KnxSensor(KNX_ENERGY_START, Energy.start_energy);
+    }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    if (Energy.voltage_available) {
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
+    }
+    if (Energy.current_available) {
+      WSContentSend_PD(HTTP_SNS_CURRENT, EnergyFormat(value_chr, current_chr[0], json));
+    }
+    WSContentSend_PD(HTTP_SNS_POWER, EnergyFormat(value_chr, active_power_chr[0], json));
+    if (!Energy.type_dc) {
+      if (Energy.current_available && Energy.voltage_available) {
+        WSContentSend_PD(HTTP_ENERGY_SNS1, EnergyFormat(value_chr, apparent_power_chr[0], json),
+                                           EnergyFormat(value2_chr, reactive_power_chr[0], json),
+                                           EnergyFormat(value3_chr, power_factor_chr[0], json));
+      }
+      if (!isnan(Energy.frequency[0])) {
+        WSContentSend_PD(PSTR("{s}" D_FREQUENCY "{m}%s " D_UNIT_HERTZ "{e}"),
+          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
+      }
+    }
+    WSContentSend_PD(HTTP_ENERGY_SNS2, energy_daily_chr, energy_yesterday_chr, energy_total_chr[0]);
+    if (!isnan(Energy.export_active)) {
+      WSContentSend_PD(HTTP_ENERGY_SNS3, export_active_chr[0]);
+    }
+
+    XnrgCall(FUNC_WEB_SENSOR);
+#endif
+  }
+}
+
+
+
+
+
+bool Xdrv03(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_PRE_INIT == function) {
+    energy_flg = ENERGY_NONE;
+    XnrgCall(FUNC_PRE_INIT);
+  }
+  else if (energy_flg) {
+    switch (function) {
+      case FUNC_LOOP:
+        XnrgCall(FUNC_LOOP);
+        break;
+      case FUNC_EVERY_250_MSECOND:
+        XnrgCall(FUNC_EVERY_250_MSECOND);
+        break;
+      case FUNC_SERIAL:
+        result = XnrgCall(FUNC_SERIAL);
+        break;
+#ifdef USE_ENERGY_MARGIN_DETECTION
+      case FUNC_SET_POWER:
+        Energy.power_steady_counter = 2;
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kEnergyCommands, EnergyCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+bool Xsns03(uint8_t function)
+{
+  bool result = false;
+
+  if (energy_flg) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        EnergyEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        EnergyShow(true);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        EnergyShow(false);
+        break;
+#endif
+      case FUNC_SAVE_BEFORE_RESTART:
+        EnergySaveState();
+        break;
+      case FUNC_INIT:
+        EnergySnsInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+#ifdef USE_LIGHT
+# 124 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+#define XDRV_04 4
+
+
+enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX };
+
+const uint8_t LIGHT_COLOR_SIZE = 25;
+
+const char kLightCommands[] PROGMEM = "|"
+  D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|"
+  D_CMND_RGBWWTABLE "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|"
+  D_CMND_WHITE "|" D_CMND_CHANNEL "|" D_CMND_HSBCOLOR "|UNDOCA" ;
+
+void (* const LightCommand[])(void) PROGMEM = {
+  &CmndColor, &CmndColorTemperature, &CmndDimmer, &CmndDimmerRange, &CmndLedTable, &CmndFade,
+  &CmndRgbwwTable, &CmndScheme, &CmndSpeed, &CmndWakeup, &CmndWakeupDuration,
+  &CmndWhite, &CmndChannel, &CmndHsbColor, &CmndUndocA };
+
+
+enum LightColorModes {
+  LCM_RGB = 1, LCM_CT = 2, LCM_BOTH = 3 };
+
+struct LRgbColor {
+  uint8_t R, G, B;
+};
+const uint8_t MAX_FIXED_COLOR = 12;
+const LRgbColor kFixedColor[MAX_FIXED_COLOR] PROGMEM =
+  { 255,0,0, 0,255,0, 0,0,255, 228,32,0, 0,228,32, 0,32,228, 188,64,0, 0,160,96, 160,32,240, 255,255,0, 255,0,170, 255,255,255 };
+
+struct LWColor {
+  uint8_t W;
+};
+const uint8_t MAX_FIXED_WHITE = 4;
+const LWColor kFixedWhite[MAX_FIXED_WHITE] PROGMEM = { 0, 255, 128, 32 };
+
+struct LCwColor {
+  uint8_t C, W;
+};
+const uint8_t MAX_FIXED_COLD_WARM = 4;
+const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
+
+
+const uint16_t CT_MIN = 153;
+const uint16_t CT_MAX = 500;
+
+const uint16_t CT_MIN_ALEXA = 200;
+const uint16_t CT_MAX_ALEXA = 380;
+
+
+
+
+
+
+typedef struct gamma_table_t {
+  uint16_t to_src;
+  uint16_t to_gamma;
+} gamma_table_t;
+
+const gamma_table_t gamma_table[] = {
+  { 1, 1 },
+  { 4, 1 },
+  { 209, 13 },
+  { 312, 41 },
+  { 457, 106 },
+  { 626, 261 },
+  { 762, 450 },
+  { 895, 703 },
+  { 1023, 1023 },
+  { 0xFFFF, 0xFFFF }
+};
+
+
+const gamma_table_t gamma_table_fast[] = {
+  { 384, 192 },
+  { 768, 576 },
+  { 1023, 1023 },
+  { 0xFFFF, 0xFFFF }
+};
+# 248 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+struct LIGHT {
+  uint32_t strip_timer_counter = 0;
+  power_t power = 0;
+
+  uint16_t wakeup_counter = 0;
+
+  uint8_t entry_color[LST_MAX];
+  uint8_t current_color[LST_MAX];
+  uint8_t new_color[LST_MAX];
+  uint8_t last_color[LST_MAX];
+  uint8_t color_remap[LST_MAX];
+
+  uint8_t wheel = 0;
+  uint8_t random = 0;
+  uint8_t subtype = 0;
+  uint8_t device = 0;
+  uint8_t old_power = 1;
+  uint8_t wakeup_active = 0;
+  uint8_t wakeup_dimmer = 0;
+  uint8_t fixed_color_index = 1;
+  uint8_t pwm_offset = 0;
+  uint8_t max_scheme = LS_MAX -1;
+
+  bool update = true;
+  bool pwm_multi_channels = false;
+
+  bool fade_initialized = false;
+  bool fade_running = false;
+  uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
+  uint16_t fade_cur_10[LST_MAX];
+  uint16_t fade_end_10[LST_MAX];
+  uint16_t fade_duration = 0;
+  uint32_t fade_start = 0;
+} Light;
+
+power_t LightPower(void)
+{
+  return Light.power;
+}
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+power_t LightPowerIRAM(void) ICACHE_RAM_ATTR;
+#endif
+
+power_t LightPowerIRAM(void)
+{
+  return Light.power;
+}
+
+uint8_t LightDevice(void)
+{
+  return Light.device;
+}
+
+static uint32_t min3(uint32_t a, uint32_t b, uint32_t c) {
+  return (a < b && a < c) ? a : (b < c) ? b : c;
+}
+# 344 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+class LightStateClass {
+  private:
+    uint16_t _hue = 0;
+    uint8_t _sat = 255;
+    uint8_t _briRGB = 255;
+
+    uint8_t _r = 255;
+    uint8_t _g = 255;
+    uint8_t _b = 255;
+
+    uint8_t _subtype = 0;
+    uint16_t _ct = CT_MIN;
+    uint8_t _wc = 255;
+    uint8_t _ww = 0;
+    uint8_t _briCT = 255;
+
+    uint8_t _color_mode = LCM_RGB;
+
+
+
+
+
+    uint16_t _ct_min_range = CT_MIN;
+    uint16_t _ct_max_range = CT_MAX;
+
+  public:
+    LightStateClass() {
+
+    }
+
+    void setSubType(uint8_t sub_type) {
+      _subtype = sub_type;
+    }
+# 386 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+    uint8_t setColorMode(uint8_t cm) {
+      uint8_t prev_cm = _color_mode;
+      if (cm < LCM_RGB) { cm = LCM_RGB; }
+      if (cm > LCM_BOTH) { cm = LCM_BOTH; }
+      uint8_t maxbri = (_briRGB >= _briCT) ? _briRGB : _briCT;
+
+      switch (_subtype) {
+        case LST_COLDWARM:
+          _color_mode = LCM_CT;
+          break;
+
+        case LST_NONE:
+        case LST_SINGLE:
+        case LST_RGB:
+        default:
+          _color_mode = LCM_RGB;
+          break;
+
+        case LST_RGBW:
+        case LST_RGBCW:
+          _color_mode = cm;
+          break;
+      }
+      if (LCM_RGB == _color_mode) {
+        _briCT = 0;
+        if (0 == _briRGB) { _briRGB = maxbri; }
+      }
+      if (LCM_CT == _color_mode) {
+        _briRGB = 0;
+        if (0 == _briCT) { _briCT = maxbri; }
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setColorMode prev_cm (%d) req_cm (%d) new_cm (%d)", prev_cm, cm, _color_mode);
+#endif
+      return prev_cm;
+    }
+
+    inline uint8_t getColorMode() {
+      return _color_mode;
+    }
+
+    void addRGBMode() {
+      setColorMode(_color_mode | LCM_RGB);
+    }
+    void addCTMode() {
+      setColorMode(_color_mode | LCM_CT);
+    }
+
+
+    void getRGB(uint8_t *r, uint8_t *g, uint8_t *b) {
+      if (r) { *r = _r; }
+      if (g) { *g = _g; }
+      if (b) { *b = _b; }
+    }
+
+
+
+    void getCW(uint8_t *rc, uint8_t *rw) {
+      if (rc) { *rc = _wc; }
+      if (rw) { *rw = _ww; }
+    }
+
+
+    void getActualRGBCW(uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *c, uint8_t *w) {
+      bool rgb_channels_on = _color_mode & LCM_RGB;
+      bool ct_channels_on = _color_mode & LCM_CT;
+
+      if (r) { *r = rgb_channels_on ? changeUIntScale(_r, 0, 255, 0, _briRGB) : 0; }
+      if (g) { *g = rgb_channels_on ? changeUIntScale(_g, 0, 255, 0, _briRGB) : 0; }
+      if (b) { *b = rgb_channels_on ? changeUIntScale(_b, 0, 255, 0, _briRGB) : 0; }
+
+      if (c) { *c = ct_channels_on ? changeUIntScale(_wc, 0, 255, 0, _briCT) : 0; }
+      if (w) { *w = ct_channels_on ? changeUIntScale(_ww, 0, 255, 0, _briCT) : 0; }
+    }
+
+    uint8_t getChannels(uint8_t *channels) {
+      getActualRGBCW(&channels[0], &channels[1], &channels[2], &channels[3], &channels[4]);
+    }
+
+    void getChannelsRaw(uint8_t *channels) {
+      channels[0] = _r;
+      channels[1] = _g;
+      channels[2] = _b;
+      channels[3] = _wc;
+      channels[4] = _ww;
+    }
+
+    void getHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
+      if (hue) { *hue = _hue; }
+      if (sat) { *sat = _sat; }
+      if (bri) { *bri = _briRGB; }
+    }
+
+
+    uint8_t getBri(void) {
+
+      return (_briRGB >= _briCT) ? _briRGB : _briCT;
+    }
+
+
+    inline uint8_t getBriCT() {
+      return _briCT;
+    }
+
+    static inline uint8_t DimmerToBri(uint8_t dimmer) {
+      return changeUIntScale(dimmer, 0, 100, 0, 255);
+    }
+    static uint8_t BriToDimmer(uint8_t bri) {
+      uint8_t dimmer = changeUIntScale(bri, 0, 255, 0, 100);
+
+      if ((dimmer == 0) && (bri > 0)) { dimmer = 1; }
+      return dimmer;
+    }
+
+    uint8_t getDimmer(uint32_t mode = 0) {
+      uint8_t bri;
+      switch (mode) {
+        case 1:
+          bri = getBriRGB();
+          break;
+        case 2:
+          bri = getBriCT();
+          break;
+        default:
+          bri = getBri();
+          break;
+      }
+      return BriToDimmer(bri);
+    }
+
+    inline uint16_t getCT() const {
+      return _ct;
+    }
+
+
+    uint16_t getCT10bits() const {
+      return changeUIntScale(_ct, _ct_min_range, _ct_max_range, 0, 1023);
+    }
+
+    inline void setCTRange(uint16_t ct_min_range, uint16_t ct_max_range) {
+      _ct_min_range = ct_min_range;
+      _ct_max_range = ct_max_range;
+    }
+
+    inline void getCTRange(uint16_t *ct_min_range, uint16_t *ct_max_range) const {
+      if (ct_min_range) { *ct_min_range = _ct_min_range; }
+      if (ct_max_range) { *ct_max_range = _ct_max_range; }
+    }
+
+
+    void getXY(float *x, float *y) {
+      RgbToXy(_r, _g, _b, x, y);
+    }
+
+
+
+    void setBri(uint8_t bri) {
+      setBriRGB(_color_mode & LCM_RGB ? bri : 0);
+      setBriCT(_color_mode & LCM_CT ? bri : 0);
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setBri RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+    }
+
+
+    uint8_t setBriRGB(uint8_t bri_rgb) {
+      uint8_t prev_bri = _briRGB;
+      _briRGB = bri_rgb;
+      if (bri_rgb > 0) { addRGBMode(); }
+      return prev_bri;
+    }
+
+
+    uint8_t setBriCT(uint8_t bri_ct) {
+      uint8_t prev_bri = _briCT;
+      _briCT = bri_ct;
+      if (bri_ct > 0) { addCTMode(); }
+      return prev_bri;
+    }
+
+    inline uint8_t getBriRGB() {
+      return _briRGB;
+    }
+
+    void setDimmer(uint8_t dimmer) {
+      setBri(DimmerToBri(dimmer));
+    }
+
+    void setCT(uint16_t ct) {
+      if (0 == ct) {
+
+        setColorMode(LCM_RGB);
+      } else {
+        ct = (ct < CT_MIN ? CT_MIN : (ct > CT_MAX ? CT_MAX : ct));
+        _ww = changeUIntScale(ct, _ct_min_range, _ct_max_range, 0, 255);
+        _wc = 255 - _ww;
+        _ct = ct;
+        addCTMode();
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCT RGB raw (%d %d %d) HS (%d %d) briRGB (%d) briCT (%d) CT (%d)", _r, _g, _b, _hue, _sat, _briRGB, _briCT, _ct);
+#endif
+    }
+# 604 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+    void setCW(uint8_t c, uint8_t w, bool free_range = false) {
+      uint16_t max = (w > c) ? w : c;
+      uint16_t sum = c + w;
+
+      if (0 == max) {
+        _briCT = 0;
+        setColorMode(LCM_RGB);
+      } else {
+        if (!free_range) {
+
+          _ww = changeUIntScale(w, 0, sum, 0, 255);
+          _wc = 255 - _ww;
+        } else {
+          _ww = changeUIntScale(w, 0, max, 0, 255);
+          _wc = changeUIntScale(c, 0, max, 0, 255);
+        }
+        _ct = changeUIntScale(w, 0, sum, _ct_min_range, _ct_max_range);
+        addCTMode();
+        if (_color_mode & LCM_CT) { _briCT = free_range ? max : (sum > 255 ? 255 : sum); }
+      }
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCW CW (%d %d) CT (%d) briCT (%d)", c, w, _ct, _briCT);
+#endif
+    }
+
+
+    uint8_t setRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
+      uint16_t hue;
+      uint8_t sat;
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB input (%d %d %d)", r, g, b);
+#endif
+
+      uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
+
+      if (0 == max) {
+        r = g = b = 255;
+        setColorMode(LCM_CT);
+      } else {
+        if (255 > max) {
+
+          r = changeUIntScale(r, 0, max, 0, 255);
+          g = changeUIntScale(g, 0, max, 0, 255);
+          b = changeUIntScale(b, 0, max, 0, 255);
+        }
+        addRGBMode();
+      }
+      if (!keep_bri) {
+        _briRGB = (_color_mode & LCM_RGB) ? max : 0;
+      }
+
+      RgbToHsb(r, g, b, &hue, &sat, nullptr);
+      _r = r;
+      _g = g;
+      _b = b;
+      _hue = hue;
+      _sat = sat;
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+      return max;
+    }
+
+    void setHS(uint16_t hue, uint8_t sat) {
+      uint8_t r, g, b;
+      HsToRgb(hue, sat, &r, &g, &b);
+      _r = r;
+      _g = g;
+      _b = b;
+      _hue = hue;
+      _sat = sat;
+      addRGBMode();
+#ifdef DEBUG_LIGHT
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS HS (%d %d) rgb (%d %d %d)", hue, sat, r, g, b);
+      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
+#endif
+  }
+
+
+
+  void setChannelsRaw(uint8_t *channels) {
+    _r = channels[0];
+    _g = channels[1];
+    _b = channels[2];
+    _wc = channels[3];
+    _ww = channels[4];
+}
+
+
+
+
+  void setChannels(uint8_t *channels) {
+    setRGB(channels[0], channels[1], channels[2]);
+    setCW(channels[3], channels[4], true);
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels (%d %d %d %d %d)",
+      channels[0], channels[1], channels[2], channels[3], channels[4]);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels CT (%d) briRGB (%d) briCT (%d)", _ct, _briRGB, _briCT);
+#endif
+  }
+
+
+    static void RgbToHsb(uint8_t r, uint8_t g, uint8_t b, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri);
+    static void HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
+    static void RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y);
+    static void XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb);
+
+};
+# 720 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
+void LightStateClass::RgbToHsb(uint8_t ir, uint8_t ig, uint8_t ib, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri) {
+  uint32_t r = ir;
+  uint32_t g = ig;
+  uint32_t b = ib;
+  uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
+  uint32_t min = (r < g && r < b) ? r : (g < b) ? g : b;
+  uint32_t d = max - min;
+
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = max;
+
+  if (d != 0) {
+    sat = changeUIntScale(d, 0, max, 0, 255);
+    if (r == max) {
+      hue = (g > b) ? changeUIntScale(g-b,0,d,0,60) : 360 - changeUIntScale(b-g,0,d,0,60);
+    } else if (g == max) {
+      hue = (b > r) ? 120 + changeUIntScale(b-r,0,d,0,60) : 120 - changeUIntScale(r-b,0,d,0,60);
+    } else {
+      hue = (r > g) ? 240 + changeUIntScale(r-g,0,d,0,60) : 240 - changeUIntScale(g-r,0,d,0,60);
+    }
+    hue = hue % 360;
+  }
+
+  if (r_hue) *r_hue = hue;
+  if (r_sat) *r_sat = sat;
+  if (r_bri) *r_bri = bri;
+
+}
+
+void LightStateClass::HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
+  uint32_t r = 255;
+  uint32_t g = 255;
+  uint32_t b = 255;
+
+  hue = hue % 360;
+
+  if (sat > 0) {
+    uint32_t i = hue / 60;
+    uint32_t f = hue % 60;
+    uint32_t q = 255 - changeUIntScale(f, 0, 60, 0, sat);
+    uint32_t p = 255 - sat;
+    uint32_t t = 255 - changeUIntScale(60 - f, 0, 60, 0, sat);
+
+    switch (i) {
+      case 0:
+
+        g = t;
+        b = p;
+        break;
+      case 1:
+        r = q;
+
+        b = p;
+        break;
+      case 2:
+        r = p;
+
+        b = t;
+        break;
+      case 3:
+        r = p;
+        g = q;
+
+        break;
+      case 4:
+        r = t;
+        g = p;
+
+        break;
+      default:
+
+        g = p;
+        b = q;
+        break;
+      }
+    }
+  if (r_r) *r_r = r;
+  if (r_g) *r_g = g;
+  if (r_b) *r_b = b;
+}
+
+#define POW FastPrecisePowf
+
+void LightStateClass::RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y) {
+  float x = 0.31271f;
+  float y = 0.32902f;
+
+  if (i_r + i_b + i_g > 0) {
+    float r = (float)i_r / 255.0f;
+    float g = (float)i_g / 255.0f;
+    float b = (float)i_b / 255.0f;
+
+
+    r = (r > 0.04045f) ? POW((r + 0.055f) / (1.0f + 0.055f), 2.4f) : (r / 12.92f);
+    g = (g > 0.04045f) ? POW((g + 0.055f) / (1.0f + 0.055f), 2.4f) : (g / 12.92f);
+    b = (b > 0.04045f) ? POW((b + 0.055f) / (1.0f + 0.055f), 2.4f) : (b / 12.92f);
+
+
+
+    float X = r * 0.649926f + g * 0.103455f + b * 0.197109f;
+    float Y = r * 0.234327f + g * 0.743075f + b * 0.022598f;
+    float Z = r * 0.000000f + g * 0.053077f + b * 1.035763f;
+
+    x = X / (X + Y + Z);
+    y = Y / (X + Y + Z);
+
+  }
+  if (r_x) *r_x = x;
+  if (r_y) *r_y = y;
+}
+
+void LightStateClass::XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb)
+{
+  x = (x > 0.99f ? 0.99f : (x < 0.01f ? 0.01f : x));
+  y = (y > 0.99f ? 0.99f : (y < 0.01f ? 0.01f : y));
+  float z = 1.0f - x - y;
+
+  float X = x / y;
+  float Z = z / y;
+
+
+
+  float r = X * 3.2406f - 1.5372f - Z * 0.4986f;
+  float g = -X * 0.9689f + 1.8758f + Z * 0.0415f;
+  float b = X * 0.0557f - 0.2040f + Z * 1.0570f;
+  float max = (r > g && r > b) ? r : (g > b) ? g : b;
+  r = r / max;
+  g = g / max;
+  b = b / max;
+  r = (r <= 0.0031308f) ? 12.92f * r : 1.055f * POW(r, (1.0f / 2.4f)) - 0.055f;
+  g = (g <= 0.0031308f) ? 12.92f * g : 1.055f * POW(g, (1.0f / 2.4f)) - 0.055f;
+  b = (b <= 0.0031308f) ? 12.92f * b : 1.055f * POW(b, (1.0f / 2.4f)) - 0.055f;
+
+
+
+
+
+  int32_t ir = r * 255.0f + 0.5f;
+  int32_t ig = g * 255.0f + 0.5f;
+  int32_t ib = b * 255.0f + 0.5f;
+  if (rr) { *rr = (ir > 255 ? 255: (ir < 0 ? 0 : ir)); }
+  if (rg) { *rg = (ig > 255 ? 255: (ig < 0 ? 0 : ig)); }
+  if (rb) { *rb = (ib > 255 ? 255: (ib < 0 ? 0 : ib)); }
+}
+
+class LightControllerClass {
+private:
+  LightStateClass *_state;
+
+
+  bool _ct_rgb_linked = true;
+  bool _pwm_multi_channels = false;
+
+public:
+  LightControllerClass(LightStateClass& state) {
+    _state = &state;
+  }
+
+  void setSubType(uint8_t sub_type) {
+    _state->setSubType(sub_type);
+  }
+
+  inline bool setCTRGBLinked(bool ct_rgb_linked) {
+    bool prev = _ct_rgb_linked;
+    if (_pwm_multi_channels) {
+      _ct_rgb_linked = false;
+    } else {
+      _ct_rgb_linked = ct_rgb_linked;
+    }
+    return prev;
+  }
+
+  void setAlexaCTRange(bool alexa_ct_range) {
+
+    if (alexa_ct_range) {
+      _state->setCTRange(CT_MIN_ALEXA, CT_MAX_ALEXA);
+    } else {
+      _state->setCTRange(CT_MIN, CT_MAX);
+    }
+  }
+
+  inline bool isCTRGBLinked() {
+    return _ct_rgb_linked;
+  }
+
+  inline bool setPWMMultiChannel(bool pwm_multi_channels) {
+    bool prev = _pwm_multi_channels;
+    _pwm_multi_channels = pwm_multi_channels;
+    if (pwm_multi_channels) setCTRGBLinked(false);
+    return prev;
+  }
+
+  inline bool isPWMMultiChannel(void) {
+    return _pwm_multi_channels;
+  }
+
+#ifdef DEBUG_LIGHT
+  void debugLogs() {
+    uint8_t r,g,b,c,w;
+    _state->getActualRGBCW(&r,&g,&b,&c,&w);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs rgb (%d %d %d) cw (%d %d)",
+      r, g, b, c, w);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs lightCurrent (%d %d %d %d %d)",
+      Light.current_color[0], Light.current_color[1], Light.current_color[2],
+      Light.current_color[3], Light.current_color[4]);
+  }
+#endif
+
+  void loadSettings() {
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings Settings.light_color (%d %d %d %d %d - %d)",
+      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
+      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings light_type/sub (%d %d)",
+      light_type, Light.subtype);
+#endif
+    if (_pwm_multi_channels) {
+      _state->setChannelsRaw(Settings.light_color);
+    } else {
+
+      _state->setCW(Settings.light_color[3], Settings.light_color[4], true);
+      _state->setRGB(Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]);
+
+
+
+      uint8_t bri = _state->DimmerToBri(Settings.light_dimmer);
+      if (Settings.light_color[0] + Settings.light_color[1] + Settings.light_color[2] > 0) {
+
+
+        if ( (DEFAULT_LIGHT_COMPONENT == Settings.light_color[0]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[1]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[2]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[3]) &&
+             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[4]) &&
+             (DEFAULT_LIGHT_DIMMER == Settings.light_dimmer) ) {
+          _state->setColorMode(LCM_RGB);
+        }
+        _state->setBriRGB(bri);
+      } else {
+        _state->setBriCT(bri);
+      }
+    }
+  }
+
+  void changeCTB(uint16_t new_ct, uint8_t briCT) {
+
+
+
+
+
+
+    if ((LST_COLDWARM != Light.subtype) && (LST_RGBW > Light.subtype)) {
+      return;
+    }
+    _state->setCT(new_ct);
+    _state->setBriCT(briCT);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
+    saveSettings();
+    calcLevels();
+
+  }
+
+  void changeDimmer(uint8_t dimmer, uint32_t mode = 0) {
+    uint8_t bri = changeUIntScale(dimmer, 0, 100, 0, 255);
+    switch (mode) {
+      case 1:
+        changeBriRGB(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+        break;
+      case 2:
+        changeBriCT(bri);
+        if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
+        break;
+      default:
+        changeBri(bri);
+        break;
+    }
+  }
+
+  void changeBri(uint8_t bri) {
+    _state->setBri(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeBriRGB(uint8_t bri) {
+    _state->setBriRGB(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeBriCT(uint8_t bri) {
+    _state->setBriCT(bri);
+    saveSettings();
+    calcLevels();
+  }
+
+  void changeRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
+    _state->setRGB(r, g, b, keep_bri);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+    saveSettings();
+    calcLevels();
+  }
+
+
+
+  void calcLevels(uint8_t *current_color = nullptr) {
+    uint8_t r,g,b,c,w,briRGB,briCT;
+    if (current_color == nullptr) { current_color = Light.current_color; }
+
+    if (_pwm_multi_channels) {
+      _state->getChannelsRaw(current_color);
+      return;
+    }
+
+    _state->getActualRGBCW(&r,&g,&b,&c,&w);
+    briRGB = _state->getBriRGB();
+    briCT = _state->getBriCT();
+
+    current_color[0] = current_color[1] = current_color[2] = 0;
+    current_color[3] = current_color[4] = 0;
+    switch (Light.subtype) {
+      case LST_NONE:
+        current_color[0] = 255;
+        break;
+      case LST_SINGLE:
+        current_color[0] = briRGB;
+        break;
+      case LST_COLDWARM:
+        current_color[0] = c;
+        current_color[1] = w;
+        break;
+      case LST_RGBW:
+      case LST_RGBCW:
+        if (LST_RGBCW == Light.subtype) {
+          current_color[3] = c;
+          current_color[4] = w;
+        } else {
+          current_color[3] = briCT;
+        }
+
+      case LST_RGB:
+        current_color[0] = r;
+        current_color[1] = g;
+        current_color[2] = b;
+        break;
+    }
+  }
+
+  void changeHSB(uint16_t hue, uint8_t sat, uint8_t briRGB) {
+    _state->setHS(hue, sat);
+    _state->setBriRGB(briRGB);
+    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
+    saveSettings();
+    calcLevels();
+  }
+
+
+  void saveSettings() {
+    if (Light.pwm_multi_channels) {
+
+      _state->getChannelsRaw(Settings.light_color);
+      Settings.light_dimmer = 100;
+    } else {
+      uint8_t cm = _state->getColorMode();
+
+      memset(&Settings.light_color[0], 0, sizeof(Settings.light_color));
+      if (LCM_RGB & cm) {
+        _state->getRGB(&Settings.light_color[0], &Settings.light_color[1], &Settings.light_color[2]);
+        Settings.light_dimmer = _state->BriToDimmer(_state->getBriRGB());
+
+        if (LCM_BOTH == cm) {
+
+          _state->getActualRGBCW(nullptr, nullptr, nullptr, &Settings.light_color[3], &Settings.light_color[4]);
+        }
+      } else if (LCM_CT == cm) {
+        _state->getCW(&Settings.light_color[3], &Settings.light_color[4]);
+        Settings.light_dimmer = _state->BriToDimmer(_state->getBriCT());
+      }
+    }
+#ifdef DEBUG_LIGHT
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::saveSettings Settings.light_color (%d %d %d %d %d - %d)",
+      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
+      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
+#endif
+  }
+
+
+
+
+  void changeChannels(uint8_t *channels) {
+    if (Light.pwm_multi_channels) {
+      _state->setChannelsRaw(channels);
+    } else if (LST_COLDWARM == Light.subtype) {
+
+      uint8_t remapped_channels[5] = {0,0,0,channels[0],channels[1]};
+      _state->setChannels(remapped_channels);
+    } else {
+      _state->setChannels(channels);
+    }
+
+    saveSettings();
+    calcLevels();
+  }
+};
+
+
+
+LightStateClass light_state = LightStateClass();
+LightControllerClass light_controller = LightControllerClass(light_state);
+
+
+
+
+
+uint16_t change8to10(uint8_t v) {
+  return changeUIntScale(v, 0, 255, 0, 1023);
+}
+
+uint8_t change10to8(uint16_t v) {
+  return (0 == v) ? 0 : changeUIntScale(v, 4, 1023, 1, 255);
+}
+
+
+
+
+
+uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (v <= to_src) {
+      return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
+    }
+    from_src = to_src;
+    from_gamma = to_gamma;
+  }
+}
+
+uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr) {
+  uint16_t from_src = 0;
+  uint16_t from_gamma = 0;
+
+  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
+    uint16_t to_src = gt->to_src;
+    uint16_t to_gamma = gt->to_gamma;
+    if (vg <= to_gamma) {
+      return changeUIntScale(vg, from_gamma, to_gamma, from_src, to_src);
+    }
+    from_src = to_src;
+    from_gamma = to_gamma;
+  }
+}
+
+
+uint16_t ledGamma10_10(uint16_t v) {
+  return ledGamma_internal(v, gamma_table);
+}
+
+uint16_t ledGamma10(uint8_t v) {
+  return ledGamma10_10(change8to10(v));
+}
+
+
+uint8_t ledGamma(uint8_t v) {
+  return change10to8(ledGamma10(v));
+}
+
+
+
+void LightPwmOffset(uint32_t offset)
+{
+  Light.pwm_offset = offset;
+}
+
+bool LightModuleInit(void)
+{
+  light_type = LT_BASIC;
+
+  if (Settings.flag.pwm_control) {
+    for (uint32_t i = 0; i < MAX_PWMS; i++) {
+      if (pin[GPIO_PWM1 +i] < 99) { light_type++; }
+    }
+  }
+
+  light_flg = 0;
+  if (XlgtCall(FUNC_MODULE_INIT)) {
+
+  }
+  else if (SONOFF_BN == my_module_type) {
+    light_type = LT_PWM1;
+  }
+  else if (SONOFF_LED == my_module_type) {
+    if (!my_module.io[4]) {
+      pinMode(4, OUTPUT);
+      digitalWrite(4, LOW);
+    }
+    if (!my_module.io[5]) {
+      pinMode(5, OUTPUT);
+      digitalWrite(5, LOW);
+    }
+    if (!my_module.io[14]) {
+      pinMode(14, OUTPUT);
+      digitalWrite(14, LOW);
+    }
+    light_type = LT_PWM2;
+  }
+
+  if (light_type > LT_BASIC) {
+    devices_present++;
+  }
+
+
+  if (Settings.flag3.pwm_multi_channels) {
+    uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+    if (0 == pwm_channels) { pwm_channels = 1; }
+    devices_present += pwm_channels - 1;
+  } else if ((Settings.param[P_RGB_REMAP] & 128) && (LST_RGBW <= (light_type & 7))) {
+
+    devices_present++;
+  }
+
+  return (light_type > LT_BASIC);
+}
+
+void LightInit(void)
+{
+  Light.device = devices_present;
+  Light.subtype = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
+  Light.pwm_multi_channels = Settings.flag3.pwm_multi_channels;
+
+  if (LST_RGBW <= Light.subtype) {
+
+
+    bool ct_rgb_linked = !(Settings.param[P_RGB_REMAP] & 128);
+    light_controller.setCTRGBLinked(ct_rgb_linked);
+  }
+
+  if ((LST_SINGLE <= Light.subtype) && Light.pwm_multi_channels) {
+
+    light_controller.setPWMMultiChannel(true);
+    Light.device = devices_present - Light.subtype + 1;
+  } else if (!light_controller.isCTRGBLinked()) {
+
+    Light.device--;
+  }
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightInit Light.pwm_multi_channels=%d Light.subtype=%d Light.device=%d devices_present=%d",
+    Light.pwm_multi_channels, Light.subtype, Light.device, devices_present);
+#endif
+
+  light_controller.setSubType(Light.subtype);
+  light_controller.loadSettings();
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
+
+  if (LST_SINGLE == Light.subtype) {
+    Settings.light_color[0] = 255;
+  }
+  if (light_type < LT_PWM6) {
+    for (uint32_t i = 0; i < light_type; i++) {
+      Settings.pwm_value[i] = 0;
+      if (pin[GPIO_PWM1 +i] < 99) {
+        pinMode(pin[GPIO_PWM1 +i], OUTPUT);
+      }
+    }
+    if (pin[GPIO_ARIRFRCV] < 99) {
+      if (pin[GPIO_ARIRFSEL] < 99) {
+        pinMode(pin[GPIO_ARIRFSEL], OUTPUT);
+        digitalWrite(pin[GPIO_ARIRFSEL], 1);
+      }
+    }
+  }
+
+  uint32_t max_scheme = Light.max_scheme;
+  if (Light.subtype < LST_RGB) {
+    max_scheme = LS_POWER;
+  }
+  if ((LS_WAKEUP == Settings.light_scheme) || (Settings.light_scheme > max_scheme)) {
+    Settings.light_scheme = LS_POWER;
+  }
+  Light.power = 0;
+  Light.update = true;
+  Light.wakeup_active = 0;
+
+  LightUpdateColorMapping();
+}
+
+void LightUpdateColorMapping(void)
+{
+  uint8_t param = Settings.param[P_RGB_REMAP] & 127;
+  if (param > 119){ param = 0; }
+
+  uint8_t tmp[] = {0,1,2,3,4};
+  Light.color_remap[0] = tmp[param / 24];
+  for (uint32_t i = param / 24; i<4; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 24;
+  Light.color_remap[1] = tmp[(param / 6)];
+  for (uint32_t i = param / 6; i<3; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 6;
+  Light.color_remap[2] = tmp[(param / 2)];
+  for (uint32_t i = param / 2; i<2; ++i){
+    tmp[i] = tmp[i+1];
+  }
+  param = param % 2;
+  Light.color_remap[3] = tmp[param];
+  Light.color_remap[4] = tmp[1-param];
+
+  Light.update = true;
+
+}
+
+uint8_t LightGetDimmer(uint8_t dimmer) {
+  return light_state.getDimmer(dimmer);
+}
+
+void LightSetDimmer(uint8_t dimmer) {
+  light_controller.changeDimmer(dimmer);
+}
+
+void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
+  light_state.getHSB(hue, sat, bri);
+}
+
+void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
+  light_state.HsToRgb(hue, sat, r_r, r_g, r_b);
+}
+
+
+uint8_t LightGetBri(uint8_t device) {
+  uint8_t bri = 254;
+  if (Light.pwm_multi_channels) {
+    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
+      bri = Light.current_color[device - Light.device];
+    }
+  } else if (light_controller.isCTRGBLinked()) {
+    if (device == Light.device) {
+      bri = light_state.getBri();
+    }
+  } else {
+    if (device == Light.device) {
+      bri = light_state.getBriRGB();
+    } else if (device == Light.device + 1) {
+      bri = light_state.getBriCT();
+    }
+  }
+  return bri;
+}
+
+
+void LightSetBri(uint8_t device, uint8_t bri) {
+  if (Light.pwm_multi_channels) {
+    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
+      Light.current_color[device - Light.device] = bri;
+      light_controller.changeChannels(Light.current_color);
+    }
+  } else if (light_controller.isCTRGBLinked()) {
+    if (device == Light.device) {
+      light_controller.changeBri(bri);
+    }
+  } else {
+    if (device == Light.device) {
+      light_controller.changeBriRGB(bri);
+    } else if (device == Light.device + 1) {
+      light_controller.changeBriCT(bri);
+    }
+  }
+}
+
+void LightSetColorTemp(uint16_t ct)
+{
+
+
+
+
+
+
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
+    return;
+  }
+  light_controller.changeCTB(ct, light_state.getBriCT());
+}
+
+uint16_t LightGetColorTemp(void)
+{
+
+  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
+    return 0;
+  }
+  return (light_state.getColorMode() & LCM_CT) ? light_state.getCT() : 0;
+}
+
+void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value)
+{
+
+
+
+  if (Settings.flag.light_signal) {
+    uint16_t signal = changeUIntScale(value, lo, hi, 0, 255);
+
+    light_controller.changeRGB(signal, 255 - signal, 0, true);
+    Settings.light_scheme = 0;
+    if (0 == light_state.getBri()) {
+      light_controller.changeBri(50);
+    }
+  }
+}
+
+
+char* LightGetColor(char* scolor, boolean force_hex = false)
+{
+  light_controller.calcLevels();
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < Light.subtype; i++) {
+    if (!force_hex && Settings.flag.decimal_text) {
+      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Light.current_color[i]);
+    } else {
+      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%02X"), scolor, Light.current_color[i]);
+    }
+  }
+  return scolor;
+}
+
+void LightPowerOn(void)
+{
+  if (light_state.getBri() && !(Light.power)) {
+    ExecuteCommandPower(Light.device, POWER_ON, SRC_LIGHT);
+  }
+}
+
+void LightState(uint8_t append)
+{
+  char scolor[LIGHT_COLOR_SIZE];
+  char scommand[33];
+  bool unlinked = !light_controller.isCTRGBLinked() && (Light.subtype >= LST_RGBW);
+
+  if (append) {
+    ResponseAppend_P(PSTR(","));
+  } else {
+    Response_P(PSTR("{"));
+  }
+  if (!Light.pwm_multi_channels) {
+    if (unlinked) {
+
+      ResponseAppend_P(PSTR("\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"
+                           ",\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"),
+                            Light.device, GetStateText(Light.power & 1), Light.device, light_state.getDimmer(1),
+                            Light.device + 1, GetStateText(Light.power & 2 ? 1 : 0), Light.device + 1, light_state.getDimmer(2));
+    } else {
+      GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable);
+      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power & 1),
+                      light_state.getDimmer());
+    }
+
+
+    if (Light.subtype > LST_SINGLE) {
+      ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
+      if (LST_RGB <= Light.subtype) {
+        uint16_t hue;
+        uint8_t sat, bri;
+        light_state.getHSB(&hue, &sat, &bri);
+        sat = changeUIntScale(sat, 0, 255, 0, 100);
+        bri = changeUIntScale(bri, 0, 255, 0, 100);
+
+        ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
+      }
+
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
+      }
+
+      if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
+      }
+
+      ResponseAppend_P(PSTR(",\"" D_CMND_CHANNEL "\":[" ));
+      for (uint32_t i = 0; i < Light.subtype; i++) {
+        uint8_t channel_raw = Light.current_color[i];
+        uint8_t channel = changeUIntScale(channel_raw,0,255,0,100);
+
+        if ((0 == channel) && (channel_raw > 0)) { channel = 1; }
+        ResponseAppend_P(PSTR("%s%d" ), (i > 0 ? "," : ""), channel);
+      }
+      ResponseAppend_P(PSTR("]"));
+    }
+
+    if (append) {
+      if (Light.subtype >= LST_RGB) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_SCHEME "\":%d"), Settings.light_scheme);
+      }
+      if (Light.max_scheme > LS_MAX) {
+        ResponseAppend_P(PSTR(",\"" D_CMND_WIDTH "\":%d"), Settings.light_width);
+      }
+      ResponseAppend_P(PSTR(",\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d,\"" D_CMND_LEDTABLE "\":\"%s\""),
+        GetStateText(Settings.light_fade), Settings.light_speed, GetStateText(Settings.light_correction));
+    }
+  } else {
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      GetPowerDevice(scommand, Light.device + i, sizeof(scommand), 1);
+      uint32_t light_power_masked = Light.power & (1 << i);
+      light_power_masked = light_power_masked ? 1 : 0;
+      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_CHANNEL "%d\":%d,"), scommand, GetStateText(light_power_masked), Light.device + i,
+        changeUIntScale(Light.current_color[i], 0, 255, 0, 100));
+    }
+    ResponseAppend_P(PSTR("\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
+  }
+
+  if (!append) {
+    ResponseJsonEnd();
+  }
+}
+
+void LightPreparePower(power_t channels = 0xFFFFFFFF) {
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power);
+#endif
+
+  if (Light.pwm_multi_channels) {
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      if (bitRead(channels, i)) {
+
+        if ((Light.current_color[i]) && (!bitRead(Light.power, i))) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device + i, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else {
+
+          if ((0 == Light.current_color[i]) && bitRead(Light.power, i)) {
+            ExecuteCommandPower(Light.device + i, POWER_OFF_NO_STATE, SRC_LIGHT);
+          }
+        }
+  #ifdef USE_DOMOTICZ
+        DomoticzUpdatePowerState(Light.device + i);
+  #endif
+      }
+    }
+  } else {
+    if (light_controller.isCTRGBLinked()) {
+      if (light_state.getBri() && !(Light.power)) {
+        if (!Settings.flag.not_power_linked) {
+          ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
+        }
+      } else if (!light_state.getBri() && Light.power) {
+        ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
+      }
+    } else {
+
+      if (channels & 1) {
+        if (light_state.getBriRGB() && !(Light.power & 1)) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else if (!light_state.getBriRGB() && (Light.power & 1)) {
+          ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
+        }
+      }
+
+      if (channels & 2) {
+        if (light_state.getBriCT() && !(Light.power & 2)) {
+          if (!Settings.flag.not_power_linked) {
+            ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT);
+          }
+        } else if (!light_state.getBriCT() && (Light.power & 2)) {
+          ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
+        }
+      }
+    }
+#ifdef USE_DOMOTICZ
+    DomoticzUpdatePowerState(Light.device);
+#endif
+  }
+
+  if (Settings.flag3.hass_tele_on_power) {
+    MqttPublishTeleState();
+  }
+
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower End power=%d Light.power=%d", power, Light.power);
+#endif
+  Light.power = power >> (Light.device - 1);
+  LightState(0);
+}
+
+void LightCycleColor(int8_t direction)
+{
+  if (Light.strip_timer_counter % (Settings.light_speed * 2)) {
+    return;
+  }
+
+  if (0 == direction) {
+    if (Light.random == Light.wheel) {
+      Light.random = random(255);
+
+      uint8_t my_dir = (Light.random < Light.wheel -128) ? 1 :
+                       (Light.random < Light.wheel ) ? 0 :
+                       (Light.random > Light.wheel +128) ? 0 : 1;
+      Light.random = (Light.random & 0xFE) | my_dir;
+
+
+    }
+
+    direction = (Light.random &0x01) ? 1 : -1;
+  }
+  Light.wheel += direction;
+  uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);
+
+
+
+  uint8_t sat;
+  light_state.getHSB(nullptr, &sat, nullptr);
+  light_state.setHS(hue, sat);
+  light_controller.calcLevels(Light.new_color);
+}
+
+void LightSetPower(void)
+{
+
+  Light.old_power = Light.power;
+
+  uint32_t mask = 1;
+  if (Light.pwm_multi_channels) {
+    mask = (1 << Light.subtype) - 1;
+  } else if (!light_controller.isCTRGBLinked()) {
+    mask = 3;
+  }
+  uint32_t shift = Light.device - 1;
+
+
+
+
+
+  Light.power = (XdrvMailbox.index & (mask << shift)) >> shift;
+  if (Light.wakeup_active) {
+    Light.wakeup_active--;
+  }
+#ifdef DEBUG_LIGHT
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightSetPower XdrvMailbox.index=%d Light.old_power=%d Light.power=%d mask=%d shift=%d",
+    XdrvMailbox.index, Light.old_power, Light.power, mask, shift);
+#endif
+  if (Light.power != Light.old_power) {
+    Light.update = true;
+  }
+  LightAnimate();
+}
+
+
+
+
+void LightAnimate(void)
+{
+  uint16_t light_still_on = 0;
+  bool power_off = false;
+
+
+  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
+  Light.strip_timer_counter++;
+
+
+
+  if (Light.power || Light.fade_running) {
+    if (Settings.sleep > PWM_MAX_SLEEP) {
+      sleep = PWM_MAX_SLEEP;
+    } else {
+      sleep = Settings.sleep;
+    }
+  } else {
+    sleep = Settings.sleep;
+  }
+
+  if (!Light.power) {
+    Light.strip_timer_counter = 0;
+    if (Settings.light_scheme >= LS_MAX) {
+      power_off = true;
+    }
+  } else {
+    switch (Settings.light_scheme) {
+      case LS_POWER:
+        light_controller.calcLevels(Light.new_color);
+        break;
+      case LS_WAKEUP:
+        if (2 == Light.wakeup_active) {
+          Light.wakeup_active = 1;
+          for (uint32_t i = 0; i < Light.subtype; i++) {
+            Light.new_color[i] = 0;
+          }
+          Light.wakeup_counter = 0;
+          Light.wakeup_dimmer = 0;
+        }
+        Light.wakeup_counter++;
+        if (Light.wakeup_counter > ((Settings.light_wakeup * STATES) / Settings.light_dimmer)) {
+          Light.wakeup_counter = 0;
+          Light.wakeup_dimmer++;
+          if (Light.wakeup_dimmer <= Settings.light_dimmer) {
+            light_state.setDimmer(Light.wakeup_dimmer);
+            light_controller.calcLevels();
+            for (uint32_t i = 0; i < Light.subtype; i++) {
+              Light.new_color[i] = Light.current_color[i];
+            }
+          } else {
+
+
+
+
+            Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\""));
+            LightState(1);
+            ResponseJsonEnd();
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WAKEUP));
+            XdrvRulesProcess();
+
+            Light.wakeup_active = 0;
+            Settings.light_scheme = LS_POWER;
+          }
+        }
+        break;
+      case LS_CYCLEUP:
+        LightCycleColor(1);
+        break;
+      case LS_CYCLEDN:
+        LightCycleColor(-1);
+        break;
+      case LS_RANDOM:
+        LightCycleColor(0);
+        break;
+      default:
+        XlgtCall(FUNC_SET_SCHEME);
+    }
+  }
+
+  if ((Settings.light_scheme < LS_MAX) || power_off) {
+
+
+    LightApplyPower(Light.new_color, Light.power);
+
+
+
+
+
+
+
+    if (memcmp(Light.last_color, Light.new_color, Light.subtype)) {
+      Light.update = true;
+    }
+    if (Light.update) {
+#ifdef USE_DEVICE_GROUPS
+      if (Light.power) LightSendDeviceGroupStatus();
+#endif
+
+      uint16_t cur_col_10[LST_MAX];
+      Light.update = false;
+
+
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        Light.last_color[i] = Light.new_color[i];
+
+        cur_col_10[i] = change8to10(Light.new_color[i]);
+      }
+
+      if (Light.pwm_multi_channels) {
+        calcGammaMultiChannels(cur_col_10);
+      } else {
+        calcGammaBulbs(cur_col_10);
+
+
+
+        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
+          uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
+          for (uint32_t i=0; i<3; i++) {
+
+            uint32_t adjust10 = change8to10(Settings.rgbwwTable[i]);
+            cur_col_10[i] = changeUIntScale(cur_col_10[i] - min_rgb_10, 0, 1023, 0, adjust10);
+          }
+
+
+          uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
+          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);
+          if (LST_RGBW == Light.subtype) {
+
+            cur_col_10[3] = white_10;
+          } else {
+
+            uint32_t ct = light_state.getCT10bits();
+            cur_col_10[4] = changeUIntScale(ct, 0, 1023, 0, white_10);
+            cur_col_10[3] = white_10 - cur_col_10[4];
+          }
+        }
+      }
+
+
+      if (0 != Settings.rgbwwTable[4]) {
+        for (uint32_t i = 0; i<Light.subtype; i++) {
+          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
+          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
+        }
+      }
+
+
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+
+        cur_col_10[i] = (cur_col_10[i] > 0) ? changeUIntScale(cur_col_10[i], 1, 1023, 1, Settings.pwm_range) : 0;
+      }
+
+
+      uint16_t orig_col_10bits[LST_MAX];
+      memcpy(orig_col_10bits, cur_col_10, sizeof(orig_col_10bits));
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
+      }
+
+      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) {
+
+        memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
+
+        LightSetOutputs(cur_col_10);
+        Light.fade_initialized = true;
+      } else {
+        if (Light.fade_running) {
+
+          memcpy(Light.fade_start_10, Light.fade_cur_10, sizeof(Light.fade_start_10));
+        }
+        memcpy(Light.fade_end_10, cur_col_10, sizeof(Light.fade_start_10));
+        Light.fade_running = true;
+        Light.fade_duration = 0;
+        Light.fade_start = 0;
+
+      }
+    }
+    if (Light.fade_running) {
+      if (LightApplyFade()) {
+
+
+
+        LightSetOutputs(Light.fade_cur_10);
+      }
+    }
+  }
+}
+
+bool isChannelGammaCorrected(uint32_t channel) {
+  if (!Settings.light_correction) { return false; }
+  if (channel >= Light.subtype) { return false; }
+
+  if (PHILIPS == my_module_type) {
+    if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }
+    if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }
+  }
+  return true;
+}
+
+
+uint16_t fadeGamma(uint32_t channel, uint16_t v) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGamma_internal(v, gamma_table_fast);
+  } else {
+    return v;
+  }
+}
+uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg) {
+  if (isChannelGammaCorrected(channel)) {
+    return ledGammaReverse_internal(vg, gamma_table_fast);
+  } else {
+    return vg;
+  }
+}
+
+bool LightApplyFade(void) {
+  static uint32_t last_millis = 0;
+  uint32_t now = millis();
+
+  if ((now - last_millis) <= 5) {
+    return false;
+  }
+  last_millis = now;
+
+
+  if (0 == Light.fade_duration) {
+    Light.fade_start = now;
+
+    uint32_t distance = 0;
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      int32_t channel_distance = fadeGammaReverse(i, Light.fade_end_10[i]) - fadeGammaReverse(i, Light.fade_start_10[i]);
+      if (channel_distance < 0) { channel_distance = - channel_distance; }
+      if (channel_distance > distance) { distance = channel_distance; }
+    }
+    if (distance > 0) {
+
+
+
+      Light.fade_duration = (distance * Settings.light_speed * 500) / 1023;
+      if (Settings.save_data) {
+
+        uint32_t delay_seconds = 1 + (Light.fade_duration + 999) / 1000;
+
+        if (save_data_counter < delay_seconds) {
+          save_data_counter = delay_seconds;
+        }
+      }
+    } else {
+
+      Light.fade_running = false;
+    }
+  }
+
+  uint16_t fade_current = now - Light.fade_start;
+  if (fade_current <= Light.fade_duration) {
+
+    for (uint32_t i = 0; i < Light.subtype; i++) {
+      Light.fade_cur_10[i] = fadeGamma(i,
+                                changeUIntScale(fadeGammaReverse(i, fade_current),
+                                             0, Light.fade_duration,
+                                             fadeGammaReverse(i, Light.fade_start_10[i]),
+                                             fadeGammaReverse(i, Light.fade_end_10[i])));
+
+
+
+    }
+  } else {
+
+
+    Light.fade_running = false;
+    Light.fade_start = 0;
+    Light.fade_duration = 0;
+
+    memcpy(Light.fade_cur_10, Light.fade_end_10, sizeof(Light.fade_end_10));
+
+    memcpy(Light.fade_start_10, Light.fade_end_10, sizeof(Light.fade_start_10));
+  }
+  return true;
+}
+
+
+
+void LightApplyPower(uint8_t new_color[LST_MAX], power_t power) {
+
+  if (Light.pwm_multi_channels) {
+
+    for (uint32_t i = 0; i < LST_MAX; i++) {
+      if (0 == bitRead(power,i)) {
+        new_color[i] = 0;
+      }
+    }
+
+
+
+
+
+  } else {
+    if (!light_controller.isCTRGBLinked()) {
+
+      if (0 == (power & 1)) {
+        new_color[0] = new_color[1] = new_color[2] = 0;
+      }
+      if (0 == (power & 2)) {
+        new_color[3] = new_color[4] = 0;
+      }
+    } else if (!power) {
+      for (uint32_t i = 0; i < LST_MAX; i++) {
+        new_color[i] = 0;
+      }
+    }
+  }
+}
+
+void LightSetOutputs(const uint16_t *cur_col_10) {
+
+  if (light_type < LT_PWM6) {
+    for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) {
+      if (pin[GPIO_PWM1 +i] < 99) {
+
+        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10[(i + Light.pwm_offset)] : cur_col_10[(i + Light.pwm_offset)]);
+      }
+    }
+  }
+
+
+
+
+  uint8_t cur_col[LST_MAX];
+  for (uint32_t i = 0; i < LST_MAX; i++) {
+    cur_col[i] = change10to8(cur_col_10[i]);
+  }
+
+
+  uint8_t scale_col[3];
+  uint32_t max = (cur_col[0] > cur_col[1] && cur_col[0] > cur_col[2]) ? cur_col[0] : (cur_col[1] > cur_col[2]) ? cur_col[1] : cur_col[2];
+  for (uint32_t i = 0; i < 3; i++) {
+    scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
+  }
+
+  char *tmp_data = XdrvMailbox.data;
+  char *tmp_topic = XdrvMailbox.topic;
+  XdrvMailbox.data = (char*)cur_col;
+  XdrvMailbox.topic = (char*)scale_col;
+  if (XlgtCall(FUNC_SET_CHANNELS)) { }
+  else if (XdrvCall(FUNC_SET_CHANNELS)) { }
+  XdrvMailbox.data = tmp_data;
+  XdrvMailbox.topic = tmp_topic;
+}
+
+
+void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
+
+  if (Settings.light_correction) {
+    for (uint32_t i = 0; i < LST_MAX; i++) {
+      cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
+    }
+  }
+}
+
+void calcGammaBulbs(uint16_t cur_col_10[5]) {
+
+
+
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+
+    uint32_t cw1 = Light.subtype - 1;
+    uint32_t cw0 = Light.subtype - 2;
+    uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];
+    uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;
+
+    if (PHILIPS == my_module_type) {
+
+      cur_col_10[cw1] = light_state.getCT10bits();
+
+      if (Settings.light_correction) {
+        cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);
+      } else {
+        cur_col_10[cw0] = white_bri10_1023;
+      }
+    } else if (Settings.light_correction) {
+
+      if (white_bri10 <= 1031) {
+
+        uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
+
+        cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
+        cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
+      } else {
+        cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
+        cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
+      }
+    }
+  }
+
+  if (Settings.light_correction) {
+
+    if (LST_RGB <= Light.subtype) {
+      for (uint32_t i = 0; i < 3; i++) {
+        cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
+      }
+    }
+
+    if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
+      cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
+    }
+  }
+}
+
+#ifdef USE_DEVICE_GROUPS
+void LightSendDeviceGroupStatus()
+{
+  uint8_t channels[LST_MAX];
+  light_state.getChannels(channels);
+  SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme, DGR_ITEM_LIGHT_CHANNELS, channels,
+    DGR_ITEM_LIGHT_BRI, (power ? light_state.getBri() : 0));
+}
+
+void LightHandleDeviceGroupRequest()
+{
+  static bool send_state = false;
+  uint32_t value = XdrvMailbox.payload;
+  switch (XdrvMailbox.command_code) {
+    case DGR_ITEM_EOL:
+      LightAnimate();
+      if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
+        light_controller.saveSettings();
+        if (Settings.flag3.hass_tele_on_power) {
+          MqttPublishTeleState();
+        }
+        send_state = false;
+      }
+      break;
+    case DGR_ITEM_LIGHT_BRI:
+      if (light_state.getBri() != value) {
+        light_controller.changeBri(value);
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_SCHEME:
+      if (Settings.light_scheme != value) {
+        Settings.light_scheme = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_CHANNELS:
+      light_controller.changeChannels((uint8_t *)XdrvMailbox.data);
+      send_state = true;
+      break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+      {
+        power_t save_power = Light.power;
+        if (value) {
+          bool save_decimal_text = Settings.flag.decimal_text;
+          char str[16];
+          XdrvMailbox.index = 2;
+          XdrvMailbox.data_len = sprintf_P(str, PSTR("%u"), value);
+          XdrvMailbox.data = str;
+          CmndSupportColor();
+          Settings.flag.decimal_text = save_decimal_text;
+        }
+        else {
+          Light.fixed_color_index = 0;
+          XdrvMailbox.index = 1;
+          XdrvMailbox.payload = light_state.BriToDimmer(light_state.getBri());
+          CmndWhite();
+        }
+        if (Light.power != save_power) {
+          XdrvMailbox.index = save_power;
+          LightSetPower();
+        }
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_LIGHT_SPEED:
+      if (Settings.light_speed != value && value > 0 && value <= 40) {
+        Settings.light_speed = value;
+        send_state = true;
+      }
+      break;
+    case DGR_ITEM_STATUS:
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
+        DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
+      LightSendDeviceGroupStatus();
+      break;
+  }
+}
+#endif
+
+
+
+
+
+bool LightColorEntry(char *buffer, uint32_t buffer_length)
+{
+  char scolor[10];
+  char *p;
+  char *str;
+  uint32_t entry_type = 0;
+  uint8_t value = Light.fixed_color_index;
+
+  if (buffer[0] == '#') {
+    buffer++;
+    buffer_length--;
+  }
+
+  if (Light.subtype >= LST_RGB) {
+    char option = (1 == buffer_length) ? buffer[0] : '\0';
+    if (('+' == option) && (Light.fixed_color_index < MAX_FIXED_COLOR)) {
+      value++;
+    }
+    else if (('-' == option) && (Light.fixed_color_index > 1)) {
+      value--;
+    } else {
+      value = atoi(buffer);
+    }
+  }
+
+  memset(&Light.entry_color, 0x00, sizeof(Light.entry_color));
+
+  while ((buffer_length > 0) && ('=' == buffer[buffer_length - 1])) {
+    buffer_length--;
+    memcpy(&Light.entry_color, &Light.current_color, sizeof(Light.entry_color));
+  }
+  if (strstr(buffer, ",") != nullptr) {
+    int8_t i = 0;
+    for (str = strtok_r(buffer, ",", &p); str && i < 6; str = strtok_r(nullptr, ",", &p)) {
+      if (i < LST_MAX) {
+        Light.entry_color[i++] = atoi(str);
+      }
+    }
+    entry_type = 2;
+  }
+  else if (((2 * Light.subtype) == buffer_length) || (buffer_length > 3)) {
+    for (uint32_t i = 0; i < tmin((uint)(buffer_length / 2), sizeof(Light.entry_color)); i++) {
+      strlcpy(scolor, buffer + (i *2), 3);
+      Light.entry_color[i] = (uint8_t)strtol(scolor, &p, 16);
+    }
+    entry_type = 1;
+  }
+  else if ((Light.subtype >= LST_RGB) && (value > 0) && (value <= MAX_FIXED_COLOR)) {
+    Light.fixed_color_index = value;
+    memcpy_P(&Light.entry_color, &kFixedColor[value -1], 3);
+    entry_type = 1;
+  }
+  else if ((value > 199) && (value <= 199 + MAX_FIXED_COLD_WARM)) {
+    if (LST_RGBW == Light.subtype) {
+      memcpy_P(&Light.entry_color[3], &kFixedWhite[value -200], 1);
+      entry_type = 1;
+    }
+    else if (LST_COLDWARM == Light.subtype) {
+      memcpy_P(&Light.entry_color, &kFixedColdWarm[value -200], 2);
+      entry_type = 1;
+    }
+    else if (LST_RGBCW == Light.subtype) {
+      memcpy_P(&Light.entry_color[3], &kFixedColdWarm[value -200], 2);
+      entry_type = 1;
+    }
+  }
+  if (entry_type) {
+    Settings.flag.decimal_text = entry_type -1;
+  }
+  return (entry_type);
+}
+
+
+
+void CmndSupportColor(void)
+{
+  bool valid_entry = false;
+  bool coldim = false;
+
+  if (XdrvMailbox.data_len > 0) {
+    valid_entry = LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len);
+    if (valid_entry) {
+      if (XdrvMailbox.index <= 2) {
+        uint32_t old_bri = light_state.getBri();
+
+        light_controller.changeChannels(Light.entry_color);
+        if (2 == XdrvMailbox.index) {
+
+          light_controller.changeBri(old_bri);
+        }
+
+        Settings.light_scheme = 0;
+        coldim = true;
+      } else {
+        for (uint32_t i = 0; i < LST_RGB; i++) {
+          Settings.ws_color[XdrvMailbox.index -3][i] = Light.entry_color[i];
+        }
+      }
+    }
+  }
+  char scolor[LIGHT_COLOR_SIZE];
+  if (!valid_entry && (XdrvMailbox.index <= 2)) {
+    ResponseCmndChar(LightGetColor(scolor));
+  }
+  if (XdrvMailbox.index >= 3) {
+    scolor[0] = '\0';
+    for (uint32_t i = 0; i < LST_RGB; i++) {
+      if (Settings.flag.decimal_text) {
+        snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.ws_color[XdrvMailbox.index -3][i]);
+      } else {
+        snprintf_P(scolor, sizeof(scolor), PSTR("%s%02X"), scolor, Settings.ws_color[XdrvMailbox.index -3][i]);
+      }
+    }
+    ResponseCmndIdxChar(scolor);
+  }
+  if (coldim) {
+    LightPreparePower();
+  }
+}
+
+void CmndColor(void)
+{
+
+
+
+
+
+
+
+  if ((Light.subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) {
+    CmndSupportColor();
+  }
+}
+
+void CmndWhite(void)
+{
+
+
+  if (Light.pwm_multi_channels) { return; }
+  if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      light_controller.changeDimmer(XdrvMailbox.payload, 2);
+      LightPreparePower(2);
+    } else {
+      ResponseCmndNumber(light_state.getDimmer(2));
+    }
+  }
+}
+
+void CmndChannel(void)
+{
+
+
+
+
+  if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
+    uint32_t light_index = XdrvMailbox.index - Light.device;
+    power_t coldim = 0;
+
+
+    if (1 == XdrvMailbox.data_len) {
+      uint8_t channel = changeUIntScale(Light.current_color[light_index],0,255,0,100);
+      if ('+' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10;
+      } else if ('-' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (channel < 11) ? 1 : channel - 10;
+      }
+    }
+
+
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      Light.current_color[light_index] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
+      if (Light.pwm_multi_channels) {
+        coldim = 1 << light_index;
+      } else {
+        if (light_controller.isCTRGBLinked()) {
+
+          if ((light_index < 3) && (light_controller.isCTRGBLinked())) {
+            Light.current_color[3] = Light.current_color[4] = 0;
+          } else {
+            Light.current_color[0] = Light.current_color[1] = Light.current_color[2] = 0;
+          }
+          coldim = 1;
+        } else {
+          if (light_index < 3) { coldim = 1; }
+          else { coldim = 2; }
+        }
+      }
+      light_controller.changeChannels(Light.current_color);
+    }
+    ResponseCmndIdxNumber(changeUIntScale(Light.current_color[light_index],0,255,0,100));
+    if (coldim) {
+      LightPreparePower(coldim);
+    }
+  }
+}
+
+void CmndHsbColor(void)
+{
+
+
+
+
+
+
+
+  if (Light.subtype >= LST_RGB) {
+    if (XdrvMailbox.data_len > 0) {
+      uint16_t c_hue;
+      uint8_t c_sat;
+      light_state.getHSB(&c_hue, &c_sat, nullptr);
+      uint32_t HSB[3];
+      HSB[0] = c_hue;
+      HSB[1] = c_sat;
+      HSB[2] = light_state.getBriRGB();
+      if ((2 == XdrvMailbox.index) || (3 == XdrvMailbox.index)) {
+        if ((uint32_t)XdrvMailbox.payload > 100) { XdrvMailbox.payload = 100; }
+        HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
+      } else {
+        uint32_t paramcount = ParseParameters(3, HSB);
+        if (HSB[0] > 360) { HSB[0] = 360; }
+        for (uint32_t i = 1; i < paramcount; i++) {
+          if (HSB[i] > 100) { HSB[i] == 100; }
+          HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255);
+        }
+      }
+      light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
+      LightPreparePower(1);
+    } else {
+      LightState(0);
+    }
+  }
+}
+
+void CmndScheme(void)
+{
+
+
+
+
+
+  if (Light.subtype >= LST_RGB) {
+    uint32_t max_scheme = Light.max_scheme;
+
+    if (1 == XdrvMailbox.data_len) {
+      if (('+' == XdrvMailbox.data[0]) && (Settings.light_scheme < max_scheme)) {
+        XdrvMailbox.payload = Settings.light_scheme + ((0 == Settings.light_scheme) ? 2 : 1);
+      }
+      else if (('-' == XdrvMailbox.data[0]) && (Settings.light_scheme > 0)) {
+        XdrvMailbox.payload = Settings.light_scheme - ((2 == Settings.light_scheme) ? 2 : 1);
+      }
+    }
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= max_scheme)) {
+      uint32_t parm[2];
+      if (ParseParameters(2, parm) > 1) {
+        Light.wheel = parm[1];
+      }
+      Settings.light_scheme = XdrvMailbox.payload;
+#ifdef USE_DEVICE_GROUPS
+      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme);
+#endif
+      if (LS_WAKEUP == Settings.light_scheme) {
+        Light.wakeup_active = 3;
+      }
+      LightPowerOn();
+      Light.strip_timer_counter = 0;
+
+      if (Settings.flag3.hass_tele_on_power) {
+        MqttPublishTeleState();
+      }
+    }
+    ResponseCmndNumber(Settings.light_scheme);
+  }
+}
+
+void CmndWakeup(void)
+{
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    light_controller.changeDimmer(XdrvMailbox.payload);
+  }
+  Light.wakeup_active = 3;
+  Settings.light_scheme = LS_WAKEUP;
+  LightPowerOn();
+  ResponseCmndChar(D_JSON_STARTED);
+}
+
+void CmndColorTemperature(void)
+{
+
+
+
+
+  if (Light.pwm_multi_channels) { return; }
+  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+    uint32_t ct = light_state.getCT();
+    if (1 == XdrvMailbox.data_len) {
+      if ('+' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (ct > (CT_MAX-34)) ? CT_MAX : ct + 34;
+      }
+      else if ('-' == XdrvMailbox.data[0]) {
+        XdrvMailbox.payload = (ct < (CT_MIN+34)) ? CT_MIN : ct - 34;
+      }
+    }
+    if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {
+      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBriCT());
+      LightPreparePower(2);
+    } else {
+      ResponseCmndNumber(ct);
+    }
+  }
+}
+
+void CmndDimmer(void)
+{
+
+
+
+
+
+
+  uint32_t dimmer;
+  if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
+
+  if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
+    dimmer = light_state.getDimmer();
+  } else {
+    dimmer = light_state.getDimmer(XdrvMailbox.index);
+  }
+
+  if (1 == XdrvMailbox.data_len) {
+    if ('+' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (dimmer > 89) ? 100 : dimmer + 10;
+    } else if ('-' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (dimmer < 11) ? 1 : dimmer - 10;
+    }
+  }
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    if (light_controller.isCTRGBLinked()) {
+
+      light_controller.changeDimmer(XdrvMailbox.payload);
+      LightPreparePower();
+    } else {
+      if (0 != XdrvMailbox.index) {
+        light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
+        LightPreparePower(1 << (XdrvMailbox.index - 1));
+      } else {
+
+        light_controller.changeDimmer(XdrvMailbox.payload, 1);
+        light_controller.changeDimmer(XdrvMailbox.payload, 2);
+        LightPreparePower();
+      }
+    }
+    Light.update = true;
+  } else {
+    ResponseCmndNumber(dimmer);
+  }
+}
+
+void CmndDimmerRange(void)
+{
+
+
+  if (XdrvMailbox.data_len > 0) {
+    uint32_t parm[2];
+    parm[0] = Settings.dimmer_hw_min;
+    parm[1] = Settings.dimmer_hw_max;
+    ParseParameters(2, parm);
+    if (parm[0] < parm[1]) {
+      Settings.dimmer_hw_min = parm[0];
+      Settings.dimmer_hw_max = parm[1];
+    } else {
+      Settings.dimmer_hw_min = parm[1];
+      Settings.dimmer_hw_max = parm[0];
+    }
+    restart_flag = 2;
+  }
+  Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
+}
+
+void CmndLedTable(void)
+{
+
+
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    switch (XdrvMailbox.payload) {
+    case 0:
+    case 1:
+      Settings.light_correction = XdrvMailbox.payload;
+      break;
+    case 2:
+      Settings.light_correction ^= 1;
+      break;
+    }
+    Light.update = true;
+  }
+  ResponseCmndStateText(Settings.light_correction);
+}
+
+void CmndRgbwwTable(void)
+{
+
+
+  if ((XdrvMailbox.data_len > 0)) {
+    uint32_t parm[LST_RGBCW -1];
+    uint32_t parmcount = ParseParameters(LST_RGBCW, parm);
+    for (uint32_t i = 0; i < parmcount; i++) {
+      Settings.rgbwwTable[i] = parm[i];
+    }
+    Light.update = true;
+  }
+  char scolor[LIGHT_COLOR_SIZE];
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < LST_RGBCW; i++) {
+    snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
+  }
+  ResponseCmndChar(scolor);
+}
+
+void CmndFade(void)
+{
+
+
+
+
+  switch (XdrvMailbox.payload) {
+  case 0:
+  case 1:
+    Settings.light_fade = XdrvMailbox.payload;
+    break;
+  case 2:
+    Settings.light_fade ^= 1;
+    break;
+  }
+#ifdef USE_DEVICE_GROUPS
+  if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
+#endif
+  if (!Settings.light_fade) { Light.fade_running = false; }
+  ResponseCmndStateText(Settings.light_fade);
+}
+
+void CmndSpeed(void)
+{
+
+
+
+
+  if (1 == XdrvMailbox.data_len) {
+    if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
+      XdrvMailbox.payload = Settings.light_speed - 1;
+    }
+    else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) {
+      XdrvMailbox.payload = Settings.light_speed + 1;
+    }
+  }
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
+    Settings.light_speed = XdrvMailbox.payload;
+#ifdef USE_DEVICE_GROUPS
+    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
+#endif
+  }
+  ResponseCmndNumber(Settings.light_speed);
+}
+
+void CmndWakeupDuration(void)
+{
+
+
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3001)) {
+    Settings.light_wakeup = XdrvMailbox.payload;
+    Light.wakeup_active = 0;
+  }
+  ResponseCmndNumber(Settings.light_wakeup);
+}
+
+void CmndUndocA(void)
+{
+
+  char scolor[LIGHT_COLOR_SIZE];
+  LightGetColor(scolor, true);
+  scolor[6] = '\0';
+  Response_P(PSTR("%s,%d,%d,%d,%d,%d"), scolor, Settings.light_fade, Settings.light_correction, Settings.light_scheme, Settings.light_speed, Settings.light_width);
+  MqttPublishPrefixTopic_P(STAT, XdrvMailbox.topic);
+  mqtt_data[0] = '\0';
+}
+
+
+
+
+
+bool Xdrv04(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_MODULE_INIT == function) {
+    return LightModuleInit();
+  }
+  else if (light_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = XlgtCall(FUNC_SERIAL);
+        break;
+      case FUNC_LOOP:
+        if (Light.fade_running) {
+          if (LightApplyFade()) {
+            LightSetOutputs(Light.fade_cur_10);
+          }
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        LightAnimate();
+        break;
+#ifdef USE_DEVICE_GROUPS
+      case FUNC_DEVICE_GROUP_REQUEST:
+        LightHandleDeviceGroupRequest();
+        break;
+#endif
+      case FUNC_SET_POWER:
+        LightSetPower();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kLightCommands, LightCommand);
+        if (!result) {
+          result = XlgtCall(FUNC_COMMAND);
+        }
+        break;
+      case FUNC_PRE_INIT:
+        LightInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_05_irremote.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_05_irremote.ino"
+#if defined(USE_IR_REMOTE) && !defined(USE_IR_REMOTE_FULL)
+
+
+
+
+#define XDRV_05 5
+
+#include <IRremoteESP8266.h>
+
+enum IrErrors { IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND };
+
+const char kIrRemoteCommands[] PROGMEM = "|" D_CMND_IRSEND ;
+
+
+void (* const IrRemoteCommand[])(void) PROGMEM = {
+  &CmndIrSend };
+
+
+static const uint8_t MAX_STANDARD_IR = NEC;
+const char kIrRemoteProtocols[] PROGMEM = "UNKNOWN|RC5|RC6|NEC";
+
+
+
+
+
+#include <IRsend.h>
+
+IRsend *irsend = nullptr;
+bool irsend_active = false;
+
+void IrSendInit(void)
+{
+  irsend = new IRsend(pin[GPIO_IRSEND]);
+  irsend->begin();
+}
+
+#ifdef USE_IR_RECEIVE
+
+
+
+
+const bool IR_RCV_SAVE_BUFFER = false;
+const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
+
+#include <IRrecv.h>
+
+IRrecv *irrecv = nullptr;
+
+unsigned long ir_lasttime = 0;
+
+void IrReceiveUpdateThreshold(void)
+{
+  if (irrecv != nullptr) {
+    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
+    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  }
+}
+
+void IrReceiveInit(void)
+{
+
+  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_RCV_BUFFER_SIZE, IR_RCV_TIMEOUT, IR_RCV_SAVE_BUFFER);
+  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  irrecv->enableIRIn();
+
+
+}
+
+void IrReceiveCheck(void)
+{
+  char sirtype[8];
+  int8_t iridx = 0;
+
+  decode_results results;
+
+  if (irrecv->decode(&results)) {
+    char hvalue[65];
+
+    iridx = results.decode_type;
+    if ((iridx < 0) || (iridx > MAX_STANDARD_IR)) { iridx = 0; }
+
+    if (iridx) {
+      if (results.bits > 64) {
+
+        uint32_t digits2 = results.bits / 8;
+        if (results.bits % 8) { digits2++; }
+        ToHex_P((unsigned char*)results.state, digits2, hvalue, sizeof(hvalue));
+      } else {
+        Uint64toHex(results.value, hvalue, results.bits);
+      }
+    } else {
+      Uint64toHex(results.value, hvalue, 32);
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_IRR "Echo %d, RawLen %d, Overflow %d, Bits %d, Value 0x%s, Decode %d"),
+              irsend_active, results.rawlen, results.overflow, results.bits, hvalue, results.decode_type);
+
+    unsigned long now = millis();
+
+    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
+      ir_lasttime = now;
+
+      char svalue[64];
+      if (Settings.flag.ir_receive_decimal) {
+        ulltoa(results.value, svalue, 10);
+      } else {
+        snprintf_P(svalue, sizeof(svalue), PSTR("\"0x%s\""), hvalue);
+      }
+      ResponseTime_P(PSTR(",\"" D_JSON_IRRECEIVED "\":{\"" D_JSON_IR_PROTOCOL "\":\"%s\",\"" D_JSON_IR_BITS "\":%d"),
+        GetTextIndexed(sirtype, sizeof(sirtype), iridx, kIrRemoteProtocols), results.bits);
+      if (iridx) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_DATA "\":%s"), svalue);
+      } else {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_HASH "\":%s"), svalue);
+      }
+
+      if (Settings.flag3.receive_raw) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
+        uint16_t i;
+        for (i = 1; i < results.rawlen; i++) {
+          if (i > 1) { ResponseAppend_P(PSTR(",")); }
+          uint32_t usecs;
+          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
+            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
+          }
+          ResponseAppend_P(PSTR("%d"), usecs);
+          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
+        }
+        uint16_t extended_length = results.rawlen - 1;
+        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
+          uint32_t usecs = results.rawbuf[j] * kRawTick;
+
+          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
+        }
+        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
+      }
+
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
+
+      XdrvRulesProcess();
+#ifdef USE_DOMOTICZ
+      if (iridx) {
+        unsigned long value = results.value | (iridx << 28);
+        DomoticzSensor(DZ_COUNT, value);
+      }
+#endif
+    }
+
+    irrecv->resume();
+  }
+}
+#endif
+
+
+
+
+
+uint32_t IrRemoteCmndIrSendJson(void)
+{
+
+
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) {
+    return IE_INVALID_JSON;
+  }
+
+  StaticJsonBuffer<140> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(dataBufUc);
+  if (!root.success()) {
+    return IE_INVALID_JSON;
+  }
+
+
+
+  char parm_uc[10];
+  const char *protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_PROTOCOL))];
+  uint16_t bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS))];
+  uint64_t data = strtoull(root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA))], nullptr, 0);
+  uint16_t repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT))];
+
+  if (XdrvMailbox.index > repeat + 1) {
+    repeat = XdrvMailbox.index - 1;
+  }
+  if (!(protocol && bits)) {
+    return IE_SYNTAX_IRSEND;
+  }
+
+  char protocol_text[20];
+  int protocol_code = GetCommandCode(protocol_text, sizeof(protocol_text), protocol, kIrRemoteProtocols);
+
+  char dvalue[64];
+  char hvalue[20];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %s (0x%s), repeat %d, protocol_code %d"),
+    protocol_text, protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat, protocol_code);
+
+  irsend_active = true;
+  switch (protocol_code) {
+#ifdef USE_IR_SEND_RC5
+    case RC5:
+      irsend->sendRC5(data, bits, repeat); break;
+#endif
+#ifdef USE_IR_SEND_RC6
+    case RC6:
+      irsend->sendRC6(data, bits, repeat); break;
+#endif
+#ifdef USE_IR_SEND_NEC
+    case NEC:
+      irsend->sendNEC(data, (bits > NEC_BITS) ? NEC_BITS : bits, repeat); break;
+#endif
+    default:
+      irsend_active = false;
+      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
+  }
+
+  return IE_NO_ERROR;
+}
+
+void CmndIrSend(void)
+{
+  uint8_t error = IE_SYNTAX_IRSEND;
+
+  if (XdrvMailbox.data_len) {
+
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      error = IE_INVALID_JSON;
+    } else {
+      error = IrRemoteCmndIrSendJson();
+    }
+  }
+  IrRemoteCmndResponse(error);
+}
+
+void IrRemoteCmndResponse(uint32_t error)
+{
+  switch (error) {
+    case IE_INVALID_RAWDATA:
+      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
+      break;
+    case IE_INVALID_JSON:
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      break;
+    case IE_SYNTAX_IRSEND:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_PROTOCOL ", " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
+      break;
+    default:
+      ResponseCmndDone();
+  }
+}
+
+
+
+
+
+bool Xdrv05(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        if (pin[GPIO_IRSEND] < 99) {
+          IrSendInit();
+        }
+#ifdef USE_IR_RECEIVE
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveInit();
+        }
+#endif
+        break;
+      case FUNC_EVERY_50_MSECOND:
+#ifdef USE_IR_RECEIVE
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveCheck();
+        }
+#endif
+        irsend_active = false;
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_IRSEND] < 99) {
+          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_05_irremote_full.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_05_irremote_full.ino"
+#ifdef USE_IR_REMOTE_FULL
+
+
+
+
+#define XDRV_05 5
+
+#include <IRremoteESP8266.h>
+#include <IRsend.h>
+#include <IRrecv.h>
+#include <IRutils.h>
+#include <IRac.h>
+
+enum IrErrors { IE_RESPONSE_PROVIDED, IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND, IE_SYNTAX_IRHVAC,
+                IE_UNSUPPORTED_HVAC, IE_UNSUPPORTED_PROTOCOL };
+
+const char kIrRemoteCommands[] PROGMEM = "|"
+  D_CMND_IRHVAC "|" D_CMND_IRSEND ;
+
+void (* const IrRemoteCommand[])(void) PROGMEM = {
+  &CmndIrHvac, &CmndIrSend };
+
+
+
+
+
+IRsend *irsend = nullptr;
+bool irsend_active = false;
+
+void IrSendInit(void)
+{
+  irsend = new IRsend(pin[GPIO_IRSEND]);
+  irsend->begin();
+}
+
+
+
+uint8_t reverseBitsInByte(uint8_t b) {
+   b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
+   b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
+   b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
+   return b;
+}
+
+
+uint64_t reverseBitsInBytes64(uint64_t b) {
+  union {
+    uint8_t b[8];
+    uint64_t i;
+  } a;
+  a.i = b;
+  for (uint32_t i=0; i<8; i++) {
+    a.b[i] = reverseBitsInByte(a.b[i]);
+  }
+  return a.i;
+}
+
+
+
+
+
+const bool IR_FULL_RCV_SAVE_BUFFER = false;
+const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
+
+
+
+
+const uint16_t IR_FULL_BUFFER_SIZE = 1024;
+
+
+
+const uint8_t IR__FULL_RCV_TIMEOUT = 50;
+
+IRrecv *irrecv = nullptr;
+
+unsigned long ir_lasttime = 0;
+
+void IrReceiveUpdateThreshold(void)
+{
+  if (irrecv != nullptr) {
+    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
+    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  }
+}
+
+void IrReceiveInit(void)
+{
+
+  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_FULL_BUFFER_SIZE, IR__FULL_RCV_TIMEOUT, IR_FULL_RCV_SAVE_BUFFER);
+  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
+  irrecv->enableIRIn();
+}
+
+String sendACJsonState(const stdAc::state_t &state) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+  json[D_JSON_IRHVAC_VENDOR] = typeToString(state.protocol);
+  json[D_JSON_IRHVAC_MODEL] = state.model;
+  json[D_JSON_IRHVAC_POWER] = IRac::boolToString(state.power);
+  json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(state.mode);
+
+  if (state.mode == stdAc::opmode_t::kOff || !state.power) {
+    json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(stdAc::opmode_t::kOff);
+    json[D_JSON_IRHVAC_POWER] = IRac::boolToString(false);
+  }
+  json[D_JSON_IRHVAC_CELSIUS] = IRac::boolToString(state.celsius);
+  if (floorf(state.degrees) == state.degrees) {
+    json[D_JSON_IRHVAC_TEMP] = floorf(state.degrees);
+  } else {
+    json[D_JSON_IRHVAC_TEMP] = RawJson(String(state.degrees, 1));
+  }
+  json[D_JSON_IRHVAC_FANSPEED] = IRac::fanspeedToString(state.fanspeed);
+  json[D_JSON_IRHVAC_SWINGV] = IRac::swingvToString(state.swingv);
+  json[D_JSON_IRHVAC_SWINGH] = IRac::swinghToString(state.swingh);
+  json[D_JSON_IRHVAC_QUIET] = IRac::boolToString(state.quiet);
+  json[D_JSON_IRHVAC_TURBO] = IRac::boolToString(state.turbo);
+  json[D_JSON_IRHVAC_ECONO] = IRac::boolToString(state.econo);
+  json[D_JSON_IRHVAC_LIGHT] = IRac::boolToString(state.light);
+  json[D_JSON_IRHVAC_FILTER] = IRac::boolToString(state.filter);
+  json[D_JSON_IRHVAC_CLEAN] = IRac::boolToString(state.clean);
+  json[D_JSON_IRHVAC_BEEP] = IRac::boolToString(state.beep);
+  json[D_JSON_IRHVAC_SLEEP] = state.sleep;
+
+  String payload = "";
+  payload.reserve(200);
+  json.printTo(payload);
+  return payload;
+}
+
+String sendIRJsonState(const struct decode_results &results) {
+  String json("{");
+  json += "\"" D_JSON_IR_PROTOCOL "\":\"";
+  json += typeToString(results.decode_type);
+  json += "\",\"" D_JSON_IR_BITS "\":";
+  json += results.bits;
+
+  if (hasACState(results.decode_type)) {
+    json += ",\"" D_JSON_IR_DATA "\":\"0x";
+    json += resultToHexidecimal(&results);
+    json += "\"";
+  } else {
+    if (UNKNOWN != results.decode_type) {
+      json += ",\"" D_JSON_IR_DATA "\":";
+    } else {
+      json += ",\"" D_JSON_IR_HASH "\":";
+    }
+    if (Settings.flag.ir_receive_decimal) {
+      char svalue[32];
+      ulltoa(results.value, svalue, 10);
+      json += svalue;
+    } else {
+      char hvalue[64];
+      if (UNKNOWN != results.decode_type) {
+        Uint64toHex(results.value, hvalue, results.bits);
+        json += "\"0x";
+        json += hvalue;
+        json += "\",\"" D_JSON_IR_DATALSB "\":\"0x";
+        Uint64toHex(reverseBitsInBytes64(results.value), hvalue, results.bits);
+        json += hvalue;
+        json += "\"";
+      } else {
+        Uint64toHex(results.value, hvalue, 32);
+        json += "\"0x";
+        json += hvalue;
+        json += "\"";
+      }
+    }
+  }
+  json += ",\"" D_JSON_IR_REPEAT "\":";
+  json += results.repeat;
+
+  stdAc::state_t ac_result;
+  if (IRAcUtils::decodeToState(&results, &ac_result, nullptr)) {
+
+    json += ",\"" D_CMND_IRHVAC "\":";
+    json += sendACJsonState(ac_result);
+  }
+
+  return json;
+}
+
+void IrReceiveCheck(void)
+{
+  decode_results results;
+
+  if (irrecv->decode(&results)) {
+    uint32_t now = millis();
+
+
+    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
+      ir_lasttime = now;
+      Response_P(PSTR("{\"" D_JSON_IRRECEIVED "\":%s"), sendIRJsonState(results).c_str());
+
+      if (Settings.flag3.receive_raw) {
+        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
+        uint16_t i;
+        for (i = 1; i < results.rawlen; i++) {
+          if (i > 1) { ResponseAppend_P(PSTR(",")); }
+          uint32_t usecs;
+          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
+            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
+          }
+          ResponseAppend_P(PSTR("%d"), usecs);
+          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
+        }
+        uint16_t extended_length = results.rawlen - 1;
+        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
+          uint32_t usecs = results.rawbuf[j] * kRawTick;
+
+          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
+        }
+        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
+      }
+
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
+
+      XdrvRulesProcess();
+    }
+
+    irrecv->resume();
+  }
+}
+
+
+
+
+
+
+
+String listSupportedProtocols(bool hvac) {
+  String l("");
+  bool first = true;
+  for (uint32_t i = UNUSED + 1; i <= kLastDecodeType; i++) {
+    bool found = false;
+    if (hvac) {
+      found = IRac::isProtocolSupported((decode_type_t)i);
+    } else {
+      found = (IRsend::defaultBits((decode_type_t)i) > 0) && (!IRac::isProtocolSupported((decode_type_t)i));
+    }
+    if (found) {
+      if (first) {
+        first = false;
+      } else {
+        l += "|";
+      }
+      l += typeToString((decode_type_t)i);
+    }
+  }
+  return l;
+}
+
+
+const stdAc::fanspeed_t IrHvacFanSpeed[] PROGMEM = { stdAc::fanspeed_t::kAuto,
+                      stdAc::fanspeed_t::kMin, stdAc::fanspeed_t::kLow,stdAc::fanspeed_t::kMedium,
+                      stdAc::fanspeed_t::kHigh, stdAc::fanspeed_t::kMax };
+
+uint32_t IrRemoteCmndIrHvacJson(void)
+{
+  stdAc::state_t state, prev;
+  char parm_uc[12];
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
+
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(dataBufUc);
+  if (!json.success()) { return IE_INVALID_JSON; }
+
+
+  state.protocol = decode_type_t::UNKNOWN;
+  state.model = 1;
+  state.mode = stdAc::opmode_t::kAuto;
+  state.power = false;
+  state.celsius = true;
+  state.degrees = 21.0f;
+  state.fanspeed = stdAc::fanspeed_t::kMedium;
+  state.swingv = stdAc::swingv_t::kOff;
+  state.swingh = stdAc::swingh_t::kOff;
+  state.light = false;
+  state.beep = false;
+  state.econo = false;
+  state.filter = false;
+  state.turbo = false;
+  state.quiet = false;
+  state.sleep = -1;
+  state.clean = false;
+  state.clock = -1;
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
+  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
+  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
+  if (decode_type_t::UNKNOWN == state.protocol) { return IE_UNSUPPORTED_HVAC; }
+  if (!IRac::isProtocolSupported(state.protocol)) { return IE_UNSUPPORTED_HVAC; }
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FANSPEED));
+  if (json.containsKey(parm_uc)) {
+    uint32_t fan_speed = json[parm_uc];
+    if ((fan_speed >= 1) && (fan_speed <= 5)) {
+      state.fanspeed = (stdAc::fanspeed_t) pgm_read_byte(&IrHvacFanSpeed[fan_speed]);
+    } else {
+      state.fanspeed = IRac::strToFanspeed(json[parm_uc]);
+    }
+  }
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODEL));
+  if (json.containsKey(parm_uc)) { state.model = IRac::strToModel(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODE));
+  if (json.containsKey(parm_uc)) { state.mode = IRac::strToOpmode(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGV));
+  if (json.containsKey(parm_uc)) { state.swingv = IRac::strToSwingV(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGH));
+  if (json.containsKey(parm_uc)) { state.swingh = IRac::strToSwingH(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TEMP));
+  if (json.containsKey(parm_uc)) { state.degrees = json[parm_uc]; }
+
+
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_POWER));
+  if (json.containsKey(parm_uc)) { state.power = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CELSIUS));
+  if (json.containsKey(parm_uc)) { state.celsius = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_LIGHT));
+  if (json.containsKey(parm_uc)) { state.light = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_BEEP));
+  if (json.containsKey(parm_uc)) { state.beep = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_ECONO));
+  if (json.containsKey(parm_uc)) { state.econo = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FILTER));
+  if (json.containsKey(parm_uc)) { state.filter = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TURBO));
+  if (json.containsKey(parm_uc)) { state.turbo = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_QUIET));
+  if (json.containsKey(parm_uc)) { state.quiet = IRac::strToBool(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CLEAN));
+  if (json.containsKey(parm_uc)) { state.clean = IRac::strToBool(json[parm_uc]); }
+
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SLEEP));
+  if (json[parm_uc]) { state.sleep = json[parm_uc]; }
+
+
+  IRac ac(pin[GPIO_IRSEND]);
+  bool success = ac.sendAc(state, &prev);
+  if (!success) { return IE_SYNTAX_IRHVAC; }
+
+  Response_P(PSTR("{\"" D_CMND_IRHVAC "\":%s}"), sendACJsonState(state).c_str());
+  return IE_RESPONSE_PROVIDED;
+}
+
+void CmndIrHvac(void)
+{
+  uint8_t error = IE_SYNTAX_IRHVAC;
+
+  if (XdrvMailbox.data_len) {
+    error = IrRemoteCmndIrHvacJson();
+  }
+  if (error != IE_RESPONSE_PROVIDED) { IrRemoteCmndResponse(error); }
+}
+
+
+
+
+
+uint32_t IrRemoteCmndIrSendJson(void)
+{
+  char parm_uc[12];
+
+
+
+  char dataBufUc[XdrvMailbox.data_len + 1];
+  UpperCase(dataBufUc, XdrvMailbox.data);
+  RemoveSpace(dataBufUc);
+  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
+
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(dataBufUc);
+  if (!json.success()) { return IE_INVALID_JSON; }
+
+
+
+  decode_type_t protocol = decode_type_t::UNKNOWN;
+  uint16_t bits = 0;
+  uint64_t data;
+  uint8_t repeat = 0;
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
+  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
+  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
+  if (decode_type_t::UNKNOWN == protocol) { return IE_UNSUPPORTED_PROTOCOL; }
+
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS));
+  if (json.containsKey(parm_uc)) { bits = json[parm_uc]; }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT));
+  if (json.containsKey(parm_uc)) { repeat = json[parm_uc]; }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATALSB));
+  if (json.containsKey(parm_uc)) { data = reverseBitsInBytes64(strtoull(json[parm_uc], nullptr, 0)); }
+  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA));
+  if (json.containsKey(parm_uc)) { data = strtoull(json[parm_uc], nullptr, 0); }
+  if (0 == bits) { return IE_SYNTAX_IRSEND; }
+
+
+  if (XdrvMailbox.index > repeat + 1) { repeat = XdrvMailbox.index - 1; }
+
+  char dvalue[32];
+  char hvalue[32];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol %d, bits %d, data 0x%s (%s), repeat %d"),
+    protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat);
+
+  irsend_active = true;
+  bool success = irsend->send(protocol, data, bits, repeat);
+
+  if (!success) {
+      irsend_active = false;
+      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
+  }
+  return IE_NO_ERROR;
+}
+
+uint32_t IrRemoteCmndIrSendRaw(void)
+{
+
+
+
+
+
+
+
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+  if (p == nullptr) {
+    return IE_INVALID_RAWDATA;
+  }
+
+
+  uint16_t repeat = XdrvMailbox.index > 0 ? XdrvMailbox.index - 1 : 0;
+
+  uint16_t freq = atoi(str);
+  if (!freq && (*str != '0')) {
+    uint16_t count = 0;
+    char *q = p;
+    for (; *q; count += (*q++ == ','));
+    if (count < 2) {
+      return IE_INVALID_RAWDATA;
+    }
+
+    uint16_t parm[count];
+    for (uint32_t i = 0; i < count; i++) {
+      parm[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      if (!parm[i]) {
+        if (!i) {
+          parm[0] = 38000;
+        } else {
+          return IE_INVALID_RAWDATA;
+        }
+      }
+    }
+
+    uint16_t i = 0;
+    if (count < 4) {
+
+      uint16_t mark = parm[1] *2;
+      if (3 == count) {
+        if (parm[2] < parm[1]) {
+
+          mark = parm[1] * parm[2];
+        } else {
+
+          mark = parm[2];
+        }
+      }
+      uint16_t raw_array[strlen(p)];
+      for (; *p; *p++) {
+        if (*p == '0') {
+          raw_array[i++] = parm[1];
+        }
+        else if (*p == '1') {
+          raw_array[i++] = mark;
+        }
+      }
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, i, parm[0]);
+        if (r < repeat) {
+          irsend->space(40000);
+        }
+      }
+    }
+    else if (6 == count) {
+
+      uint16_t raw_array[strlen(p)*2+3];
+      raw_array[i++] = parm[1];
+      raw_array[i++] = parm[2];
+      uint32_t inter_message_32 = (parm[1] + parm[2]) * 3;
+      uint16_t inter_message = (inter_message_32 > 65000) ? 65000 : inter_message_32;
+      for (; *p; *p++) {
+        if (*p == '0') {
+          raw_array[i++] = parm[3];
+          raw_array[i++] = parm[4];
+        }
+        else if (*p == '1') {
+          raw_array[i++] = parm[3];
+          raw_array[i++] = parm[5];
+        }
+      }
+      raw_array[i++] = parm[3];
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, i, parm[0]);
+        if (r < repeat) {
+          irsend->space(inter_message);
+        }
+      }
+    }
+    else {
+      return IE_INVALID_RAWDATA;
+    }
+  } else {
+    if (!freq) { freq = 38000; }
+    uint16_t count = 0;
+    char *q = p;
+    for (; *q; count += (*q++ == ','));
+    if (0 == count) {
+      return IE_INVALID_RAWDATA;
+    }
+
+
+    count++;
+    if (count < 200) {
+      uint16_t raw_array[count];
+      for (uint32_t i = 0; i < count; i++) {
+        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      }
+
+
+
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, count, freq);
+      }
+    } else {
+      uint16_t *raw_array = reinterpret_cast<uint16_t*>(malloc(count * sizeof(uint16_t)));
+      if (raw_array == nullptr) {
+        return IE_INVALID_RAWDATA;
+      }
+
+      for (uint32_t i = 0; i < count; i++) {
+        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
+      }
+
+
+
+      irsend_active = true;
+      for (uint32_t r = 0; r <= repeat; r++) {
+        irsend->sendRaw(raw_array, count, freq);
+      }
+      free(raw_array);
+    }
+  }
+
+  return IE_NO_ERROR;
+}
+
+void CmndIrSend(void)
+{
+  uint8_t error = IE_SYNTAX_IRSEND;
+
+  if (XdrvMailbox.data_len) {
+    if (strstr(XdrvMailbox.data, "{") == nullptr) {
+      error = IrRemoteCmndIrSendRaw();
+    } else {
+      error = IrRemoteCmndIrSendJson();
+    }
+  }
+  IrRemoteCmndResponse(error);
+}
+
+void IrRemoteCmndResponse(uint32_t error)
+{
+  switch (error) {
+    case IE_INVALID_RAWDATA:
+      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
+      break;
+    case IE_INVALID_JSON:
+      ResponseCmndChar(D_JSON_INVALID_JSON);
+      break;
+    case IE_SYNTAX_IRSEND:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
+      break;
+    case IE_SYNTAX_IRHVAC:
+      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR ", " D_JSON_IRHVAC_MODE " " D_JSON_OR " " D_JSON_IRHVAC_FANSPEED "\"}"));
+      break;
+    case IE_UNSUPPORTED_HVAC:
+      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR " (%s)\"}"), listSupportedProtocols(true).c_str());
+      break;
+    case IE_UNSUPPORTED_PROTOCOL:
+      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_PROTOCOL " (%s)\"}"), listSupportedProtocols(false).c_str());
+      break;
+    default:
+      ResponseCmndDone();
+  }
+}
+
+
+
+
+
+bool Xdrv05(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        if (pin[GPIO_IRSEND] < 99) {
+          IrSendInit();
+        }
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveInit();
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (pin[GPIO_IRRECV] < 99) {
+          IrReceiveCheck();
+        }
+        irsend_active = false;
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_IRSEND] < 99) {
+          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_06_snfbridge.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_06_snfbridge.ino"
+#ifdef USE_SONOFF_RF
+
+
+
+
+#define XDRV_06 6
+
+const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000;
+
+enum SonoffBridgeCommands {
+  CMND_RFSYNC, CMND_RFLOW, CMND_RFHIGH, CMND_RFHOST, CMND_RFCODE };
+
+const char kSonoffBridgeCommands[] PROGMEM = "|"
+  D_CMND_RFSYNC "|" D_CMND_RFLOW "|" D_CMND_RFHIGH "|" D_CMND_RFHOST "|" D_CMND_RFCODE "|" D_CMND_RFKEY "|" D_CMND_RFRAW;
+
+void (* const SonoffBridgeCommand[])(void) PROGMEM = {
+  &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfKey, &CmndRfRaw };
+
+struct SONOFFBRIDGE {
+  uint32_t last_received_id = 0;
+  uint32_t last_send_code = 0;
+  uint32_t last_time = 0;
+  uint32_t last_learn_time = 0;
+  uint8_t receive_flag = 0;
+  uint8_t receive_raw_flag = 0;
+  uint8_t learn_key = 1;
+  uint8_t learn_active = 0;
+  uint8_t expected_bytes = 0;
+} SnfBridge;
+
+#ifdef USE_RF_FLASH
+
+
+
+
+
+
+
+#include "ihx.h"
+#include "c2.h"
+
+const ssize_t RF_RECORD_NO_START_FOUND = -1;
+const ssize_t RF_RECORD_NO_END_FOUND = -2;
+
+ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size)
+{
+  for (size_t i = 0; i < size; i++) {
+    if (buf[i] == ':') {
+      return i;
+    }
+  }
+  return RF_RECORD_NO_START_FOUND;
+}
+
+ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size)
+{
+  for (size_t i = 0; i < size; i++) {
+    if (buf[i] == '\n') {
+      return i;
+    }
+  }
+  return RF_RECORD_NO_END_FOUND;
+}
+
+ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len)
+{
+  ssize_t record_start;
+  ssize_t record_end;
+  ssize_t glue_record_sz;
+  uint8_t *glue_buf;
+  ssize_t result;
+
+  if (remnant_data[0] != ':') { return -8; }
+
+
+  record_end = rf_find_hex_record_end(new_data, new_data_len);
+  record_start = rf_find_hex_record_start(new_data, new_data_len);
+
+
+
+
+  if ((record_start != RF_RECORD_NO_START_FOUND) && (record_start < record_end)) {
+    return -8;
+  }
+
+  glue_record_sz = strlen((const char *) remnant_data) + record_end;
+
+  glue_buf = (uint8_t *) malloc(glue_record_sz);
+  if (glue_buf == nullptr) { return -2; }
+
+
+  memcpy(glue_buf, remnant_data, strlen((const char *) remnant_data));
+  memcpy(glue_buf + strlen((const char *) remnant_data), new_data, record_end);
+
+  result = rf_decode_and_write(glue_buf, glue_record_sz);
+  free(glue_buf);
+  return result;
+}
+
+ssize_t rf_decode_and_write(uint8_t *record, size_t size)
+{
+  uint8_t err = ihx_decode(record, size);
+  if (err != IHX_SUCCESS) { return -13; }
+
+  ihx_t *h = (ihx_t *) record;
+  if (h->record_type == IHX_RT_DATA) {
+    int retries = 5;
+    uint16_t address = h->address_high * 0x100 + h->address_low;
+
+    do {
+      err = c2_programming_init();
+      err = c2_block_write(address, h->data, h->len);
+    } while (err != C2_SUCCESS && retries--);
+  } else if (h->record_type == IHX_RT_END_OF_FILE) {
+
+    err = c2_reset();
+  }
+
+  if (err != C2_SUCCESS) { return -12; }
+
+  return 0;
+}
+
+ssize_t rf_search_and_write(uint8_t *buf, size_t size)
+{
+
+  ssize_t rec_end;
+  ssize_t rec_start;
+  ssize_t err;
+
+  for (size_t i = 0; i < size; i++) {
+
+    rec_start = rf_find_hex_record_start(buf + i, size - i);
+    if (rec_start == RF_RECORD_NO_START_FOUND) {
+
+      return -8;
+    }
+
+
+    rec_start += i;
+    rec_end = rf_find_hex_record_end(buf + rec_start, size - rec_start);
+    if (rec_end == RF_RECORD_NO_END_FOUND) {
+
+      return rec_start;
+    }
+
+
+    rec_end += rec_start;
+
+    err = rf_decode_and_write(buf + rec_start, rec_end - rec_start);
+    if (err < 0) { return err; }
+    i = rec_end;
+  }
+
+  return 0;
+}
+
+uint8_t rf_erase_flash(void)
+{
+  uint8_t err;
+
+  for (uint32_t i = 0; i < 4; i++) {
+    err = c2_programming_init();
+    if (err != C2_SUCCESS) {
+      return 10;
+    }
+    err = c2_device_erase();
+    if (err != C2_SUCCESS) {
+      if (i < 3) {
+        c2_reset();
+      } else {
+        return 11;
+      }
+    } else {
+      break;
+    }
+  }
+  return 0;
+}
+
+uint8_t SnfBrUpdateInit(void)
+{
+  pinMode(PIN_C2CK, OUTPUT);
+  pinMode(PIN_C2D, INPUT);
+
+  return rf_erase_flash();
+}
+#endif
+
+
+
+void SonoffBridgeReceivedRaw(void)
+{
+
+  uint8_t buckets = 0;
+
+  if (0xB1 == serial_in_buffer[1]) { buckets = serial_in_buffer[2] << 1; }
+
+  ResponseTime_P(PSTR(",\"" D_CMND_RFRAW "\":{\"" D_JSON_DATA "\":\""));
+  for (uint32_t i = 0; i < serial_in_byte_counter; i++) {
+    ResponseAppend_P(PSTR("%02X"), serial_in_buffer[i]);
+    if (0xB1 == serial_in_buffer[1]) {
+      if ((i > 3) && buckets) { buckets--; }
+      if ((i < 3) || (buckets % 2) || (i == serial_in_byte_counter -2)) {
+        ResponseAppend_P(PSTR(" "));
+      }
+    }
+  }
+  ResponseAppend_P(PSTR("\"}}"));
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_CMND_RFRAW));
+
+  XdrvRulesProcess();
+}
+
+
+
+void SonoffBridgeLearnFailed(void)
+{
+  SnfBridge.learn_active = 0;
+  Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARN_FAILED);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
+}
+
+void SonoffBridgeReceived(void)
+{
+  uint16_t sync_time = 0;
+  uint16_t low_time = 0;
+  uint16_t high_time = 0;
+  uint32_t received_id = 0;
+  char rfkey[8];
+  char stemp[16];
+
+  AddLogSerial(LOG_LEVEL_DEBUG);
+
+  if (0xA2 == serial_in_buffer[0]) {
+    SonoffBridgeLearnFailed();
+  }
+  else if (0xA3 == serial_in_buffer[0]) {
+    SnfBridge.learn_active = 0;
+    low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
+    high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
+    if (low_time && high_time) {
+      for (uint32_t i = 0; i < 9; i++) {
+        Settings.rf_code[SnfBridge.learn_key][i] = serial_in_buffer[i +1];
+      }
+      Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARNED);
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
+    } else {
+      SonoffBridgeLearnFailed();
+    }
+  }
+  else if (0xA4 == serial_in_buffer[0]) {
+    if (SnfBridge.learn_active) {
+      SonoffBridgeLearnFailed();
+    } else {
+      sync_time = serial_in_buffer[1] << 8 | serial_in_buffer[2];
+      low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
+      high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
+      received_id = serial_in_buffer[7] << 16 | serial_in_buffer[8] << 8 | serial_in_buffer[9];
+
+      unsigned long now = millis();
+      if (!((received_id == SnfBridge.last_received_id) && (now - SnfBridge.last_time < SFB_TIME_AVOID_DUPLICATE))) {
+        SnfBridge.last_received_id = received_id;
+        SnfBridge.last_time = now;
+        strncpy_P(rfkey, PSTR("\"" D_JSON_NONE "\""), sizeof(rfkey));
+        for (uint32_t i = 1; i <= 16; i++) {
+          if (Settings.rf_code[i][0]) {
+            uint32_t send_id = Settings.rf_code[i][6] << 16 | Settings.rf_code[i][7] << 8 | Settings.rf_code[i][8];
+            if (send_id == received_id) {
+              snprintf_P(rfkey, sizeof(rfkey), PSTR("%d"), i);
+              break;
+            }
+          }
+        }
+        if (Settings.flag.rf_receive_decimal) {
+          snprintf_P(stemp, sizeof(stemp), PSTR("%u"), received_id);
+        } else {
+          snprintf_P(stemp, sizeof(stemp), PSTR("\"%06X\""), received_id);
+        }
+        ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":%s,\"" D_CMND_RFKEY "\":%s}}"),
+          sync_time, low_time, high_time, stemp, rfkey);
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
+        XdrvRulesProcess();
+  #ifdef USE_DOMOTICZ
+        DomoticzSensor(DZ_COUNT, received_id);
+  #endif
+      }
+    }
+  }
+}
+
+bool SonoffBridgeSerialInput(void)
+{
+
+  static int8_t receive_len = 0;
+
+  if (SnfBridge.receive_flag) {
+    if (SnfBridge.receive_raw_flag) {
+      if (!serial_in_byte_counter) {
+        serial_in_buffer[serial_in_byte_counter++] = 0xAA;
+      }
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if (serial_in_byte_counter == 3) {
+        if ((0xA6 == serial_in_buffer[1]) || (0xAB == serial_in_buffer[1])) {
+          receive_len = serial_in_buffer[2] + 4;
+        }
+      }
+      if ((!receive_len && (0x55 == serial_in_byte)) || (receive_len && (serial_in_byte_counter == receive_len))) {
+        SonoffBridgeReceivedRaw();
+        SnfBridge.receive_flag = 0;
+        return 1;
+      }
+    }
+    else if (!((0 == serial_in_byte_counter) && (0 == serial_in_byte))) {
+      if (0 == serial_in_byte_counter) {
+        SnfBridge.expected_bytes = 2;
+        if (serial_in_byte >= 0xA3) {
+          SnfBridge.expected_bytes = 11;
+        }
+        if (serial_in_byte == 0xA6) {
+          SnfBridge.expected_bytes = 0;
+          serial_in_buffer[serial_in_byte_counter++] = 0xAA;
+          SnfBridge.receive_raw_flag = 1;
+        }
+      }
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if ((SnfBridge.expected_bytes == serial_in_byte_counter) && (0x55 == serial_in_byte)) {
+        SonoffBridgeReceived();
+        SnfBridge.receive_flag = 0;
+        return 1;
+      }
+    }
+    serial_in_byte = 0;
+  }
+  if (0xAA == serial_in_byte) {
+    serial_in_byte_counter = 0;
+    serial_in_byte = 0;
+    SnfBridge.receive_flag = 1;
+    receive_len = 0;
+  }
+  return 0;
+}
+
+void SonoffBridgeSendCommand(uint8_t code)
+{
+  Serial.write(0xAA);
+  Serial.write(code);
+  Serial.write(0x55);
+}
+
+void SonoffBridgeSendAck(void)
+{
+  Serial.write(0xAA);
+  Serial.write(0xA0);
+  Serial.write(0x55);
+}
+
+void SonoffBridgeSendCode(uint32_t code)
+{
+  Serial.write(0xAA);
+  Serial.write(0xA5);
+  for (uint32_t i = 0; i < 6; i++) {
+    Serial.write(Settings.rf_code[0][i]);
+  }
+  Serial.write((code >> 16) & 0xff);
+  Serial.write((code >> 8) & 0xff);
+  Serial.write(code & 0xff);
+  Serial.write(0x55);
+  Serial.flush();
+}
+
+void SonoffBridgeSend(uint8_t idx, uint8_t key)
+{
+  uint8_t code;
+
+  key--;
+  Serial.write(0xAA);
+  Serial.write(0xA5);
+  for (uint32_t i = 0; i < 8; i++) {
+    Serial.write(Settings.rf_code[idx][i]);
+  }
+  if (0 == idx) {
+    code = (0x10 << (key >> 2)) | (1 << (key & 3));
+  } else {
+    code = Settings.rf_code[idx][8];
+  }
+  Serial.write(code);
+  Serial.write(0x55);
+  Serial.flush();
+#ifdef USE_DOMOTICZ
+
+
+#endif
+}
+
+void SonoffBridgeLearn(uint8_t key)
+{
+  SnfBridge.learn_key = key;
+  SnfBridge.learn_active = 1;
+  SnfBridge.last_learn_time = millis();
+  Serial.write(0xAA);
+  Serial.write(0xA1);
+  Serial.write(0x55);
+}
+
+
+
+
+
+void CmndRfBridge(void)
+{
+  char *p;
+  char stemp [10];
+  uint32_t code = 0;
+  uint8_t radix = 10;
+
+  uint32_t set_index = XdrvMailbox.command_code *2;
+
+  if (XdrvMailbox.data[0] == '#') {
+    XdrvMailbox.data++;
+    XdrvMailbox.data_len--;
+    radix = 16;
+  }
+
+  if (XdrvMailbox.data_len) {
+    code = strtol(XdrvMailbox.data, &p, radix);
+    if (code) {
+      if (CMND_RFCODE == XdrvMailbox.command_code) {
+        SnfBridge.last_send_code = code;
+        SonoffBridgeSendCode(code);
+      } else {
+        if (1 == XdrvMailbox.payload) {
+          code = pgm_read_byte(kDefaultRfCode + set_index) << 8 | pgm_read_byte(kDefaultRfCode + set_index +1);
+        }
+        uint8_t msb = code >> 8;
+        uint8_t lsb = code & 0xFF;
+        if ((code > 0) && (code < 0x7FFF) && (msb != 0x55) && (lsb != 0x55)) {
+          Settings.rf_code[0][set_index] = msb;
+          Settings.rf_code[0][set_index +1] = lsb;
+        }
+      }
+    }
+  }
+  if (CMND_RFCODE == XdrvMailbox.command_code) {
+    code = SnfBridge.last_send_code;
+  } else {
+    code = Settings.rf_code[0][set_index] << 8 | Settings.rf_code[0][set_index +1];
+  }
+  if (10 == radix) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), code);
+  } else {
+    snprintf_P(stemp, sizeof(stemp), PSTR("\"#%06X\""), code);
+  }
+  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp);
+}
+
+void CmndRfKey(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 16)) {
+    unsigned long now = millis();
+    if ((!SnfBridge.learn_active) || (now - SnfBridge.last_learn_time > 60100)) {
+      SnfBridge.learn_active = 0;
+      if (2 == XdrvMailbox.payload) {
+        SonoffBridgeLearn(XdrvMailbox.index);
+        ResponseCmndIdxChar(D_JSON_START_LEARNING);
+      }
+      else if (3 == XdrvMailbox.payload) {
+        Settings.rf_code[XdrvMailbox.index][0] = 0;
+        ResponseCmndIdxChar(D_JSON_SET_TO_DEFAULT);
+      }
+      else if (4 == XdrvMailbox.payload) {
+        for (uint32_t i = 0; i < 6; i++) {
+          Settings.rf_code[XdrvMailbox.index][i] = Settings.rf_code[0][i];
+        }
+        Settings.rf_code[XdrvMailbox.index][6] = (SnfBridge.last_send_code >> 16) & 0xff;
+        Settings.rf_code[XdrvMailbox.index][7] = (SnfBridge.last_send_code >> 8) & 0xff;
+        Settings.rf_code[XdrvMailbox.index][8] = SnfBridge.last_send_code & 0xff;
+        ResponseCmndIdxChar(D_JSON_SAVED);
+      } else if (5 == XdrvMailbox.payload) {
+        uint8_t key = XdrvMailbox.index;
+        uint8_t index = (0 == Settings.rf_code[key][0]) ? 0 : key;
+        uint16_t sync_time = (Settings.rf_code[index][0] << 8) | Settings.rf_code[index][1];
+        uint16_t low_time = (Settings.rf_code[index][2] << 8) | Settings.rf_code[index][3];
+        uint16_t high_time = (Settings.rf_code[index][4] << 8) | Settings.rf_code[index][5];
+        uint32_t code = (Settings.rf_code[index][6] << 16) | (Settings.rf_code[index][7] << 8);
+        if (0 == index) {
+          key--;
+          code |= (uint8_t)((0x10 << (key >> 2)) | (1 << (key & 3)));
+        } else {
+          code |= Settings.rf_code[index][8];
+        }
+        Response_P(PSTR("{\"%s%d\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":\"%06X\"}}"),
+                   XdrvMailbox.command, XdrvMailbox.index, sync_time, low_time, high_time, code);
+      } else {
+        if ((1 == XdrvMailbox.payload) || (0 == Settings.rf_code[XdrvMailbox.index][0])) {
+          SonoffBridgeSend(0, XdrvMailbox.index);
+          ResponseCmndIdxChar(D_JSON_DEFAULT_SENT);
+        } else {
+          SonoffBridgeSend(XdrvMailbox.index, 0);
+          ResponseCmndIdxChar(D_JSON_LEARNED_SENT);
+        }
+      }
+    } else {
+      Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, SnfBridge.learn_key, D_JSON_LEARNING_ACTIVE);
+    }
+  }
+}
+
+void CmndRfRaw(void)
+{
+  if (XdrvMailbox.data_len) {
+    if (XdrvMailbox.data_len < 6) {
+      switch (XdrvMailbox.payload) {
+      case 0:
+        SonoffBridgeSendCommand(0xA7);
+      case 1:
+        SnfBridge.receive_raw_flag = XdrvMailbox.payload;
+        break;
+      case 166:
+      case 167:
+      case 169:
+      case 176:
+      case 177:
+      case 255:
+        SonoffBridgeSendCommand(XdrvMailbox.payload);
+        SnfBridge.receive_raw_flag = 1;
+        break;
+      case 192:
+        char beep[] = "AAC000C055\0";
+        SerialSendRaw(beep);
+        break;
+      }
+    } else {
+      SerialSendRaw(RemoveSpace(XdrvMailbox.data));
+      SnfBridge.receive_raw_flag = 1;
+    }
+  }
+  ResponseCmndStateText(SnfBridge.receive_raw_flag);
+}
+
+
+
+
+
+bool Xdrv06(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_BRIDGE == my_module_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = SonoffBridgeSerialInput();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSonoffBridgeCommands, SonoffBridgeCommand);
+        break;
+      case FUNC_INIT:
+        SnfBridge.receive_raw_flag = 0;
+        SonoffBridgeSendCommand(0xA7);
+        break;
+      case FUNC_PRE_INIT:
+        SetSerial(19200, TS_SERIAL_8N1);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
+#ifdef USE_DOMOTICZ
+
+#define XDRV_07 7
+
+#define D_PRFX_DOMOTICZ "Domoticz"
+#define D_CMND_IDX "Idx"
+#define D_CMND_KEYIDX "KeyIdx"
+#define D_CMND_SWITCHIDX "SwitchIdx"
+#define D_CMND_SENSORIDX "SensorIdx"
+#define D_CMND_UPDATETIMER "UpdateTimer"
+
+const char kDomoticzCommands[] PROGMEM = D_PRFX_DOMOTICZ "|"
+  D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
+
+void (* const DomoticzCommand[])(void) PROGMEM = {
+  &CmndDomoticzIdx, &CmndDomoticzKeyIdx, &CmndDomoticzSwitchIdx, &CmndDomoticzSensorIdx, &CmndDomoticzUpdateTimer };
+
+const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}";
+
+#if MAX_DOMOTICZ_SNS_IDX < DZ_MAX_SENSORS
+  #error "Domoticz: Too many sensors or change settings.h layout"
+#endif
+
+const char kDomoticzSensors[] PROGMEM =
+  D_DOMOTICZ_TEMP "|" D_DOMOTICZ_TEMP_HUM "|" D_DOMOTICZ_TEMP_HUM_BARO "|" D_DOMOTICZ_POWER_ENERGY "|" D_DOMOTICZ_ILLUMINANCE "|"
+  D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY "|" D_DOMOTICZ_P1_SMART_METER "|" D_DOMOTICZ_SHUTTER ;
+
+char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC;
+
+int domoticz_update_timer = 0;
+uint32_t domoticz_fan_debounce = 0;
+bool domoticz_subscribe = false;
+bool domoticz_update_flag = true;
+
+#ifdef USE_SHUTTER
+bool domoticz_is_shutter = false;
+#endif
+
+int DomoticzBatteryQuality(void)
+{
+
+
+
+
+  int quality = 100;
+
+#ifdef USE_ADC_VCC
+  uint16_t voltage = ESP.getVcc();
+  if (voltage <= 2600) {
+    quality = 0;
+  } else if (voltage >= 4600) {
+    quality = 200;
+  } else {
+    quality = (voltage - 2600) / 10;
+  }
+#endif
+  return quality;
+}
+
+int DomoticzRssiQuality(void)
+{
+
+
+  return WifiGetRssiAsQuality(WiFi.RSSI()) / 10;
+}
+
+#ifdef USE_SONOFF_IFAN
+void MqttPublishDomoticzFanState(void)
+{
+  if (Settings.flag.mqtt_enabled && Settings.domoticz_relay_idx[1]) {
+    char svalue[8];
+
+    int fan_speed = GetFanspeed();
+    snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fan_speed * 10);
+    Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[1], (0 == fan_speed) ? 0 : 2, svalue, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    MqttPublish(domoticz_in_topic);
+
+    domoticz_fan_debounce = millis();
+  }
+}
+
+void DomoticzUpdateFanState(void)
+{
+  if (domoticz_update_flag) {
+    MqttPublishDomoticzFanState();
+  }
+  domoticz_update_flag = true;
+}
+#endif
+
+void MqttPublishDomoticzPowerState(uint8_t device)
+{
+  if (Settings.flag.mqtt_enabled) {
+    if ((device < 1) || (device > devices_present)) { device = 1; }
+    if (Settings.domoticz_relay_idx[device -1]) {
+#ifdef USE_SHUTTER
+      if (domoticz_is_shutter) {
+
+      } else {
+#endif
+#ifdef USE_SONOFF_IFAN
+      if (IsModuleIfan() && (device > 1)) {
+
+      } else {
+#endif
+        char svalue[8];
+
+        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), Settings.light_dimmer);
+        Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? svalue : "", DomoticzBatteryQuality(), DomoticzRssiQuality());
+        MqttPublish(domoticz_in_topic);
+#ifdef USE_SONOFF_IFAN
+      }
+#endif
+#ifdef USE_SHUTTER
+      }
+#endif
+    }
+  }
+}
+
+void DomoticzUpdatePowerState(uint8_t device)
+{
+  if (domoticz_update_flag) {
+    MqttPublishDomoticzPowerState(device);
+  }
+  domoticz_update_flag = true;
+}
+
+void DomoticzMqttUpdate(void)
+{
+  if (domoticz_subscribe && (Settings.domoticz_update_timer || domoticz_update_timer)) {
+    domoticz_update_timer--;
+    if (domoticz_update_timer <= 0) {
+      domoticz_update_timer = Settings.domoticz_update_timer;
+      for (uint32_t i = 1; i <= devices_present; i++) {
+#ifdef USE_SHUTTER
+        if (domoticz_is_shutter)
+        {
+
+            break;
+        }
+#endif
+#ifdef USE_SONOFF_IFAN
+        if (IsModuleIfan() && (i > 1)) {
+          MqttPublishDomoticzFanState();
+          break;
+        } else {
+#endif
+          MqttPublishDomoticzPowerState(i);
+#ifdef USE_SONOFF_IFAN
+        }
+#endif
+      }
+    }
+  }
+}
+
+void DomoticzMqttSubscribe(void)
+{
+  uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
+  for (uint32_t i = 0; i < maxdev; i++) {
+    if (Settings.domoticz_relay_idx[i]) {
+      domoticz_subscribe = true;
+    }
+  }
+
+  if (domoticz_subscribe) {
+    char stopic[TOPSZ];
+    snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#"));
+    MqttSubscribe(stopic);
+  }
+}
+# 219 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
+bool DomoticzMqttData(void)
+{
+  domoticz_update_flag = true;
+
+  if (strncasecmp_P(XdrvMailbox.topic, PSTR(DOMOTICZ_OUT_TOPIC), strlen(DOMOTICZ_OUT_TOPIC)) != 0) {
+    return false;
+  }
+
+
+  if (XdrvMailbox.data_len < 20) {
+    return true;
+  }
+  StaticJsonBuffer<400> jsonBuf;
+  JsonObject& domoticz = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!domoticz.success()) {
+    return true;
+  }
+
+
+
+  uint32_t idx = domoticz["idx"];
+  int16_t nvalue = -1;
+  if (domoticz.containsKey("nvalue")) {
+    nvalue = domoticz["nvalue"];
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ "idx %d, nvalue %d"), idx, nvalue);
+
+  bool found = false;
+  if ((idx > 0) && (nvalue >= 0) && (nvalue <= 15)) {
+    uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
+    for (uint32_t i = 0; i < maxdev; i++) {
+      if (idx == Settings.domoticz_relay_idx[i]) {
+        bool iscolordimmer = strcmp_P(domoticz["dtype"],PSTR("Color Switch")) == 0;
+        bool isShutter = strcmp_P(domoticz["dtype"],PSTR("Light/Switch")) == 0 & strncmp_P(domoticz["switchType"],PSTR("Blinds"), 6) == 0;
+
+        char stemp1[10];
+        snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), i +1);
+#ifdef USE_SONOFF_IFAN
+        if (IsModuleIfan() && (1 == i)) {
+          uint8_t svalue = 0;
+          if (domoticz.containsKey("svalue1")) {
+            svalue = domoticz["svalue1"];
+          } else {
+            return true;
+          }
+          svalue = (nvalue == 2) ? svalue / 10 : 0;
+          if (GetFanspeed() == svalue) {
+            return true;
+          }
+          if (TimePassedSince(domoticz_fan_debounce) < 1000) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_FANSPEED));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), svalue);
+          found = true;
+        } else
+#endif
+#ifdef USE_SHUTTER
+        if (isShutter)
+        {
+          if (domoticz.containsKey("nvalue")) {
+            nvalue = domoticz["nvalue"];
+          }
+
+          uint8_t position = 0;
+          if (domoticz.containsKey("svalue1")) {
+            position = domoticz["svalue1"];
+          }
+          if (nvalue != 2) {
+            position = nvalue == 0 ? 0 : 100;
+          }
+
+          snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), position);
+          XdrvMailbox.data_len = position > 99 ? 3 : (position > 9 ? 2 : 1);
+
+          found = true;
+        } else
+#endif
+#ifdef USE_LIGHT
+        if (iscolordimmer && 10 == nvalue) {
+
+          JsonObject& color = domoticz["Color"];
+          uint16_t level = nvalue = domoticz["svalue1"];
+          uint16_t r = color["r"]; r = r * level / 100;
+          uint16_t g = color["g"]; g = g * level / 100;
+          uint16_t b = color["b"]; b = b * level / 100;
+          uint16_t cw = color["cw"]; cw = cw * level / 100;
+          uint16_t ww = color["ww"]; ww = ww * level / 100;
+          uint16_t m = 0;
+          uint16_t t = 0;
+          if (color.containsKey("m")) {
+            m = color["m"];
+            t = color["t"];
+          }
+          if (2 == m) {
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_BACKLOG));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR(D_CMND_COLORTEMPERATURE " %d;" D_CMND_DIMMER " %d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX), level);
+          } else {
+            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
+            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
+          }
+          found = true;
+        }
+        else if ((!iscolordimmer && 2 == nvalue) ||
+                  (iscolordimmer && 15 == nvalue)) {
+          if (domoticz.containsKey("svalue1")) {
+            nvalue = domoticz["svalue1"];
+          } else {
+            return true;
+          }
+          if (light_type && (Settings.light_dimmer == nvalue) && ((power >> i) &1)) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
+          found = true;
+        } else
+#endif
+        if (1 == nvalue || 0 == nvalue) {
+          if (((power >> i) &1) == (power_t)nvalue) {
+            return true;
+          }
+          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_POWER "%s"), (devices_present > 1) ? stemp1 : "");
+          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
+          found = true;
+        }
+        break;
+      }
+    }
+  }
+  if (!found) { return true; }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ D_RECEIVED_TOPIC " %s, " D_DATA " %s"), XdrvMailbox.topic, XdrvMailbox.data);
+
+  domoticz_update_flag = false;
+  return false;
+}
+
+
+
+bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg)
+{
+  bool result = false;
+
+  if (device <= MAX_DOMOTICZ_IDX) {
+    if ((Settings.domoticz_key_idx[device -1] || Settings.domoticz_switch_idx[device -1]) && (svalflg)) {
+      Response_P(PSTR("{\"command\":\"switchlight\",\"idx\":%d,\"switchcmd\":\"%s\"}"),
+        (key) ? Settings.domoticz_switch_idx[device -1] : Settings.domoticz_key_idx[device -1], (state) ? (POWER_TOGGLE == state) ? "Toggle" : "On" : "Off");
+      MqttPublish(domoticz_in_topic);
+      result = true;
+    }
+  }
+  return result;
+}
+# 393 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
+uint8_t DomoticzHumidityState(char *hum)
+{
+  uint8_t h = atoi(hum);
+  return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
+}
+
+void DomoticzSensor(uint8_t idx, char *data)
+{
+  if (Settings.domoticz_sensor_idx[idx]) {
+    char dmess[128];
+
+    memcpy(dmess, mqtt_data, sizeof(dmess));
+    if (DZ_AIRQUALITY == idx) {
+      Response_P(PSTR("{\"idx\":%d,\"nvalue\":%s,\"Battery\":%d,\"RSSI\":%d}"),
+        Settings.domoticz_sensor_idx[idx], data, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    } else {
+      uint8_t nvalue = 0;
+#ifdef USE_SHUTTER
+      if (DZ_SHUTTER == idx) {
+        uint8_t position = atoi(data);
+        nvalue = position < 2 ? 0 : (position == 100 ? 1 : 2);
+      }
+#endif
+      Response_P(DOMOTICZ_MESSAGE,
+        Settings.domoticz_sensor_idx[idx], nvalue, data, DomoticzBatteryQuality(), DomoticzRssiQuality());
+    }
+    MqttPublish(domoticz_in_topic);
+    memcpy(mqtt_data, dmess, sizeof(dmess));
+  }
+}
+
+void DomoticzSensor(uint8_t idx, uint32_t value)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%d"), value);
+  DomoticzSensor(idx, data);
+}
+
+void DomoticzTempHumSensor(char *temp, char *hum)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d"), temp, hum, DomoticzHumidityState(hum));
+  DomoticzSensor(DZ_TEMP_HUM, data);
+}
+
+void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro)
+{
+  char data[32];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d;%s;5"), temp, hum, DomoticzHumidityState(hum), baro);
+  DomoticzSensor(DZ_TEMP_HUM_BARO, data);
+}
+
+void DomoticzSensorPowerEnergy(int power, char *energy)
+{
+  char data[16];
+  snprintf_P(data, sizeof(data), PSTR("%d;%s"), power, energy);
+  DomoticzSensor(DZ_POWER_ENERGY, data);
+}
+
+void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power)
+{
+
+
+
+
+
+  int consumed = power;
+  int produced = 0;
+  if (power < 0) {
+    consumed = 0;
+    produced = -power;
+  }
+  char data[64];
+  snprintf_P(data, sizeof(data), PSTR("%s;%s;%s;%s;%d;%d"), usage1, usage2, return1, return2, consumed, produced);
+  DomoticzSensor(DZ_P1_SMART_METER, data);
+}
+
+
+
+
+
+void CmndDomoticzIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzKeyIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_key_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSwitchIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSensorIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzUpdateTimer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.domoticz_update_timer = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.domoticz_update_timer);
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_DOMOTICZ "dm"
+
+const char S_CONFIGURE_DOMOTICZ[] PROGMEM = D_CONFIGURE_DOMOTICZ;
+
+const char HTTP_BTN_MENU_DOMOTICZ[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_DOMOTICZ "' method='get'><button>" D_CONFIGURE_DOMOTICZ "</button></form></p>";
+
+const char HTTP_FORM_DOMOTICZ[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_DOMOTICZ_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>"
+  "<table>";
+const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' placeholder='0' value='%d'></td></tr>"
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' placeholder='0' value='%d'></td></tr>";
+const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
+  "<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'></td></tr>";
+
+void HandleDomoticzConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_DOMOTICZ);
+
+  if (WebServer->hasArg("save")) {
+    DomoticzSaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  char stemp[40];
+
+  WSContentStart_P(S_CONFIGURE_DOMOTICZ);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_DOMOTICZ);
+  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
+    if (i < devices_present) {
+      WSContentSend_P(HTTP_FORM_DOMOTICZ_RELAY,
+        i +1, i, Settings.domoticz_relay_idx[i],
+        i +1, i, Settings.domoticz_key_idx[i]);
+    }
+    if (pin[GPIO_SWT1 +i] < 99) {
+      WSContentSend_P(HTTP_FORM_DOMOTICZ_SWITCH,
+        i +1, i, Settings.domoticz_switch_idx[i]);
+    }
+#ifdef USE_SONOFF_IFAN
+    if (IsModuleIfan() && (1 == i)) { break; }
+#endif
+  }
+  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
+    WSContentSend_P(HTTP_FORM_DOMOTICZ_SENSOR,
+      i +1, GetTextIndexed(stemp, sizeof(stemp), i, kDomoticzSensors), i, Settings.domoticz_sensor_idx[i]);
+  }
+  WSContentSend_P(HTTP_FORM_DOMOTICZ_TIMER, Settings.domoticz_update_timer);
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void DomoticzSaveSettings(void)
+{
+  char stemp[20];
+  char ssensor_indices[6 * MAX_DOMOTICZ_SNS_IDX];
+  char tmp[100];
+
+  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("r%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_relay_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(stemp, sizeof(stemp), PSTR("k%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_key_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(stemp, sizeof(stemp), PSTR("s%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_switch_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+  }
+  ssensor_indices[0] = '\0';
+  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
+    snprintf_P(stemp, sizeof(stemp), PSTR("l%d"), i);
+    WebGetArg(stemp, tmp, sizeof(tmp));
+    Settings.domoticz_sensor_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
+    snprintf_P(ssensor_indices, sizeof(ssensor_indices), PSTR("%s%s%d"), ssensor_indices, (strlen(ssensor_indices)) ? "," : "", Settings.domoticz_sensor_idx[i]);
+  }
+  WebGetArg("ut", tmp, sizeof(tmp));
+  Settings.domoticz_update_timer = (!strlen(tmp)) ? DOMOTICZ_UPDATE_TIMER : atoi(tmp);
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_DOMOTICZ D_CMND_IDX " %d,%d,%d,%d, " D_CMND_KEYIDX " %d,%d,%d,%d, " D_CMND_SWITCHIDX " %d,%d,%d,%d, " D_CMND_SENSORIDX " %s, " D_CMND_UPDATETIMER " %d"),
+    Settings.domoticz_relay_idx[0], Settings.domoticz_relay_idx[1], Settings.domoticz_relay_idx[2], Settings.domoticz_relay_idx[3],
+    Settings.domoticz_key_idx[0], Settings.domoticz_key_idx[1], Settings.domoticz_key_idx[2], Settings.domoticz_key_idx[3],
+    Settings.domoticz_switch_idx[0], Settings.domoticz_switch_idx[1], Settings.domoticz_switch_idx[2], Settings.domoticz_switch_idx[3],
+    ssensor_indices, Settings.domoticz_update_timer);
+}
+#endif
+
+
+
+
+
+bool Xdrv07(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DomoticzMqttUpdate();
+        break;
+      case FUNC_MQTT_DATA:
+        result = DomoticzMqttData();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_DOMOTICZ);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_DOMOTICZ, HandleDomoticzConfiguration);
+        break;
+#endif
+      case FUNC_MQTT_SUBSCRIBE:
+        DomoticzMqttSubscribe();
+#ifdef USE_SHUTTER
+        if (Settings.domoticz_sensor_idx[DZ_SHUTTER]) { domoticz_is_shutter = true; }
+#endif
+        break;
+      case FUNC_MQTT_INIT:
+        domoticz_update_timer = 2;
+        break;
+      case FUNC_SHOW_SENSOR:
+
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kDomoticzCommands, DomoticzCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
+#ifdef USE_SERIAL_BRIDGE
+
+
+
+
+#define XDRV_08 8
+
+const uint8_t SERIAL_BRIDGE_BUFFER_SIZE = 130;
+
+const char kSerialBridgeCommands[] PROGMEM = "|"
+  D_CMND_SSERIALSEND "|" D_CMND_SBAUDRATE;
+
+void (* const SerialBridgeCommand[])(void) PROGMEM = {
+  &CmndSSerialSend, &CmndSBaudrate };
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *SerialBridgeSerial = nullptr;
+
+unsigned long serial_bridge_polling_window = 0;
+char *serial_bridge_buffer = nullptr;
+int serial_bridge_in_byte_counter = 0;
+bool serial_bridge_active = true;
+bool serial_bridge_raw = false;
+
+void SerialBridgeInput(void)
+{
+  while (SerialBridgeSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = SerialBridgeSerial->read();
+
+    if ((serial_in_byte > 127) && !serial_bridge_raw) {
+      serial_bridge_in_byte_counter = 0;
+      SerialBridgeSerial->flush();
+      return;
+    }
+    if (serial_in_byte || serial_bridge_raw) {
+
+      if ((serial_bridge_in_byte_counter < SERIAL_BRIDGE_BUFFER_SIZE -1) &&
+          ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
+          ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
+            serial_bridge_raw)) {
+        serial_bridge_buffer[serial_bridge_in_byte_counter++] = serial_in_byte;
+        serial_bridge_polling_window = millis();
+      } else {
+        serial_bridge_polling_window = 0;
+        break;
+      }
+    }
+  }
+
+  if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
+    serial_bridge_buffer[serial_bridge_in_byte_counter] = 0;
+    char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
+    bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
+    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
+      (assume_json) ? "" : """",
+      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
+      (assume_json) ? "" : """");
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
+    XdrvRulesProcess();
+    serial_bridge_in_byte_counter = 0;
+  }
+}
+
+
+
+void SerialBridgeInit(void)
+{
+  serial_bridge_active = false;
+  if ((pin[GPIO_SBR_RX] < 99) && (pin[GPIO_SBR_TX] < 99)) {
+    SerialBridgeSerial = new TasmotaSerial(pin[GPIO_SBR_RX], pin[GPIO_SBR_TX]);
+    if (SerialBridgeSerial->begin(Settings.sbaudrate * 300)) {
+      if (SerialBridgeSerial->hardwareSerial()) {
+        ClaimSerial();
+        serial_bridge_buffer = serial_in_buffer;
+      } else {
+        serial_bridge_buffer = (char*)(malloc(SERIAL_BRIDGE_BUFFER_SIZE));
+      }
+      serial_bridge_active = true;
+      SerialBridgeSerial->flush();
+    }
+  }
+}
+
+
+
+
+
+void CmndSSerialSend(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
+    serial_bridge_raw = (XdrvMailbox.index > 3);
+    if (XdrvMailbox.data_len > 0) {
+      if (1 == XdrvMailbox.index) {
+        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
+        SerialBridgeSerial->write("\n");
+      }
+      else if ((2 == XdrvMailbox.index) || (4 == XdrvMailbox.index)) {
+        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
+      }
+      else if (3 == XdrvMailbox.index) {
+        SerialBridgeSerial->write(Unescape(XdrvMailbox.data, &XdrvMailbox.data_len), XdrvMailbox.data_len);
+      }
+      else if (5 == XdrvMailbox.index) {
+        char *p;
+        char stemp[3];
+        uint8_t code;
+
+        char *codes = RemoveSpace(XdrvMailbox.data);
+        int size = strlen(XdrvMailbox.data);
+
+        while (size > 1) {
+          strlcpy(stemp, codes, sizeof(stemp));
+          code = strtol(stemp, &p, 16);
+          SerialBridgeSerial->write(code);
+          size -= 2;
+          codes += 2;
+        }
+      }
+      ResponseCmndDone();
+    }
+  }
+}
+
+void CmndSBaudrate(void)
+{
+  if (XdrvMailbox.payload >= 300) {
+    XdrvMailbox.payload /= 300;
+    Settings.sbaudrate = XdrvMailbox.payload;
+    SerialBridgeSerial->begin(Settings.sbaudrate * 300);
+  }
+  ResponseCmndNumber(Settings.sbaudrate * 300);
+}
+
+
+
+
+
+bool Xdrv08(uint8_t function)
+{
+  bool result = false;
+
+  if (serial_bridge_active) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (SerialBridgeSerial) { SerialBridgeInput(); }
+        break;
+      case FUNC_PRE_INIT:
+        SerialBridgeInit();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSerialBridgeCommands, SerialBridgeCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
+#ifdef USE_TIMERS
+# 39 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
+#define XDRV_09 9
+
+const char kTimerCommands[] PROGMEM = "|"
+  D_CMND_TIMER "|" D_CMND_TIMERS
+#ifdef USE_SUNRISE
+  "|" D_CMND_LATITUDE "|" D_CMND_LONGITUDE
+#endif
+  ;
+
+void (* const TimerCommand[])(void) PROGMEM = {
+  &CmndTimer, &CmndTimers
+#ifdef USE_SUNRISE
+  , &CmndLatitude, &CmndLongitude
+#endif
+  };
+
+uint16_t timer_last_minute = 60;
+int8_t timer_window[MAX_TIMERS] = { 0 };
+
+#ifdef USE_SUNRISE
+# 67 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
+const float pi2 = TWO_PI;
+const float pi = PI;
+const float RAD = DEG_TO_RAD;
+
+float JulianischesDatum(void)
+{
+
+  int Gregor;
+  int Jahr = RtcTime.year;
+  int Monat = RtcTime.month;
+  int Tag = RtcTime.day_of_month;
+
+  if (Monat <= 2) {
+    Monat += 12;
+    Jahr -= 1;
+  }
+  Gregor = (Jahr / 400) - (Jahr / 100) + (Jahr / 4);
+  return 2400000.5f + 365.0f*Jahr - 679004.0f + Gregor + (int)(30.6001f * (Monat +1)) + Tag + 0.5f;
+}
+
+float InPi(float x)
+{
+  int n = (int)(x / pi2);
+  x = x - n*pi2;
+  if (x < 0) x += pi2;
+  return x;
+}
+
+float eps(float T)
+{
+
+  return RAD * (23.43929111f + (-46.8150f*T - 0.00059f*T*T + 0.001813f*T*T*T)/3600.0f);
+}
+
+float BerechneZeitgleichung(float *DK,float T)
+{
+  float RA_Mittel = 18.71506921f + 2400.0513369f*T +(2.5862e-5f - 1.72e-9f*T)*T*T;
+  float M = InPi(pi2 * (0.993133f + 99.997361f*T));
+  float L = InPi(pi2 * (0.7859453f + M/pi2 + (6893.0f*sinf(M)+72.0f*sinf(2.0f*M)+6191.2f*T) / 1296.0e3f));
+  float e = eps(T);
+  float RA = atanf(tanf(L)*cosf(e));
+  if (RA < 0.0) RA += pi;
+  if (L > pi) RA += pi;
+  RA = 24.0*RA/pi2;
+  *DK = asinf(sinf(e)*sinf(L));
+
+  RA_Mittel = 24.0f * InPi(pi2*RA_Mittel/24.0f)/pi2;
+  float dRA = RA_Mittel - RA;
+  if (dRA < -12.0f) dRA += 24.0f;
+  if (dRA > 12.0f) dRA -= 24.0f;
+  dRA = dRA * 1.0027379f;
+  return dRA;
+}
+
+void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down)
+{
+  float JD2000 = 2451545.0f;
+  float JD = JulianischesDatum();
+  float T = (JD - JD2000) / 36525.0f;
+  float DK;
+
+
+
+
+
+
+
+  float h = SUNRISE_DAWN_ANGLE *RAD;
+  float B = (((float)Settings.latitude)/1000000) * RAD;
+  float GeographischeLaenge = ((float)Settings.longitude)/1000000;
+
+
+
+  float Zeitzone = ((float)Rtc.time_timezone) / 60;
+  float Zeitgleichung = BerechneZeitgleichung(&DK, T);
+  float Zeitdifferenz = 12.0f*acosf((sinf(h) - sinf(B)*sinf(DK)) / (cosf(B)*cosf(DK)))/pi;
+  float AufgangOrtszeit = 12.0f - Zeitdifferenz - Zeitgleichung;
+  float UntergangOrtszeit = 12.0f + Zeitdifferenz - Zeitgleichung;
+  float AufgangWeltzeit = AufgangOrtszeit - GeographischeLaenge / 15.0f;
+  float UntergangWeltzeit = UntergangOrtszeit - GeographischeLaenge / 15.0f;
+  float Aufgang = AufgangWeltzeit + Zeitzone;
+  if (Aufgang < 0.0f) {
+    Aufgang += 24.0f;
+  } else {
+    if (Aufgang >= 24.0f) Aufgang -= 24.0f;
+  }
+  float Untergang = UntergangWeltzeit + Zeitzone;
+  if (Untergang < 0.0f) {
+    Untergang += 24.0f;
+  } else {
+    if (Untergang >= 24.0f) Untergang -= 24.0f;
+  }
+  int AufgangMinuten = (int)(60.0f*(Aufgang - (int)Aufgang)+0.5f);
+  int AufgangStunden = (int)Aufgang;
+  if (AufgangMinuten >= 60.0f) {
+    AufgangMinuten -= 60.0f;
+    AufgangStunden++;
+  } else {
+    if (AufgangMinuten < 0.0f) {
+      AufgangMinuten += 60.0f;
+      AufgangStunden--;
+      if (AufgangStunden < 0.0f) AufgangStunden += 24.0f;
+    }
+  }
+  int UntergangMinuten = (int)(60.0f*(Untergang - (int)Untergang)+0.5f);
+  int UntergangStunden = (int)Untergang;
+  if (UntergangMinuten >= 60.0f) {
+    UntergangMinuten -= 60.0f;
+    UntergangStunden++;
+  } else {
+    if (UntergangMinuten<0) {
+      UntergangMinuten += 60.0f;
+      UntergangStunden--;
+      if (UntergangStunden < 0.0f) UntergangStunden += 24.0f;
+    }
+  }
+  *hour_up = AufgangStunden;
+  *minute_up = AufgangMinuten;
+  *hour_down = UntergangStunden;
+  *minute_down = UntergangMinuten;
+}
+
+void ApplyTimerOffsets(Timer *duskdawn)
+{
+  uint8_t hour[2];
+  uint8_t minute[2];
+  Timer stored = (Timer)*duskdawn;
+
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  uint8_t mode = (duskdawn->mode -1) &1;
+  duskdawn->time = (hour[mode] *60) + minute[mode];
+
+
+  uint16_t timeBuffer;
+  if ((uint16_t)stored.time > 719) {
+
+    timeBuffer = (uint16_t)stored.time - 720;
+
+    if (timeBuffer > (uint16_t)duskdawn->time) {
+      timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time);
+      duskdawn->days = duskdawn->days >> 1;
+      duskdawn->days |= (stored.days << 6);
+    } else {
+      timeBuffer = (uint16_t)duskdawn->time - timeBuffer;
+    }
+  } else {
+
+    timeBuffer = (uint16_t)duskdawn->time + (uint16_t)stored.time;
+
+    if (timeBuffer > 1440) {
+      timeBuffer -= 1440;
+      duskdawn->days = duskdawn->days << 1;
+      duskdawn->days |= (stored.days >> 6);
+    }
+  }
+  duskdawn->time = timeBuffer;
+}
+
+String GetSun(uint32_t dawn)
+{
+  char stime[6];
+
+  uint8_t hour[2];
+  uint8_t minute[2];
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  dawn &= 1;
+  snprintf_P(stime, sizeof(stime), PSTR("%02d:%02d"), hour[dawn], minute[dawn]);
+  return String(stime);
+}
+
+uint16_t SunMinutes(uint32_t dawn)
+{
+  uint8_t hour[2];
+  uint8_t minute[2];
+
+  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
+  dawn &= 1;
+  return (hour[dawn] *60) + minute[dawn];
+}
+
+#endif
+
+
+
+void TimerSetRandomWindow(uint32_t index)
+{
+  timer_window[index] = 0;
+  if (Settings.timer[index].window) {
+    timer_window[index] = (random(0, (Settings.timer[index].window << 1) +1)) - Settings.timer[index].window;
+  }
+}
+
+void TimerSetRandomWindows(void)
+{
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) { TimerSetRandomWindow(i); }
+}
+
+void TimerEverySecond(void)
+{
+  if (RtcTime.valid) {
+    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); }
+    if (Settings.flag3.timers_enable &&
+        (uptime > 60) && (RtcTime.minute != timer_last_minute)) {
+      timer_last_minute = RtcTime.minute;
+      int32_t time = (RtcTime.hour *60) + RtcTime.minute;
+      uint8_t days = 1 << (RtcTime.day_of_week -1);
+
+      for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+
+        Timer xtimer = Settings.timer[i];
+#ifdef USE_SUNRISE
+        if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
+          ApplyTimerOffsets(&xtimer);
+        }
+#endif
+        if (xtimer.arm) {
+          int32_t set_time = xtimer.time + timer_window[i];
+          if (set_time < 0) {
+            set_time = abs(timer_window[i]);
+          }
+          if (set_time > 1439) {
+            set_time = xtimer.time - abs(timer_window[i]);
+          }
+          if (set_time > 1439) { set_time = 1439; }
+
+          DEBUG_DRIVER_LOG(PSTR("TIM: Timer %d, Time %d, Window %d, SetTime %d"), i +1, xtimer.time, timer_window[i], set_time);
+
+          if (time == set_time) {
+            if (xtimer.days & days) {
+              Settings.timer[i].arm = xtimer.repeat;
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+              if (POWER_BLINK == xtimer.power) {
+                Response_P(PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1);
+                XdrvRulesProcess();
+              } else
+#endif
+                if (devices_present) { ExecuteCommandPower(xtimer.device +1, xtimer.power, SRC_TIMER); }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void PrepShowTimer(uint32_t index)
+{
+  Timer xtimer = Settings.timer[index -1];
+
+  char days[8] = { 0 };
+  for (uint32_t i = 0; i < 7; i++) {
+    uint8_t mask = 1 << i;
+    snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0));
+  }
+
+  char soutput[80];
+  soutput[0] = '\0';
+  if (devices_present) {
+    snprintf_P(soutput, sizeof(soutput), PSTR(",\"" D_JSON_TIMER_OUTPUT "\":%d"), xtimer.device +1);
+  }
+#ifdef USE_SUNRISE
+  char sign[2] = { 0 };
+  int16_t hour = xtimer.time / 60;
+  if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
+    if (hour > 11) {
+      hour -= 12;
+      sign[0] = '-';
+    }
+  }
+  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%s%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
+    index, xtimer.arm, xtimer.mode, sign, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
+#else
+  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
+    index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
+#endif
+}
+
+
+
+
+
+void CmndTimer(void)
+{
+  uint32_t index = XdrvMailbox.index;
+  if ((index > 0) && (index <= MAX_TIMERS)) {
+    uint32_t error = 0;
+    if (XdrvMailbox.data_len) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_TIMERS)) {
+        if (XdrvMailbox.payload == 0) {
+          Settings.timer[index -1].data = 0;
+        } else {
+          Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data;
+        }
+      } else {
+
+#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
+        if (devices_present) {
+#endif
+          char dataBufUc[XdrvMailbox.data_len + 1];
+          UpperCase(dataBufUc, XdrvMailbox.data);
+          StaticJsonBuffer<256> jsonBuffer;
+          JsonObject& root = jsonBuffer.parseObject(dataBufUc);
+          if (!root.success()) {
+            Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index);
+            error = 1;
+          }
+          else {
+            char parm_uc[10];
+            index--;
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) {
+              Settings.timer[index].arm = (root[parm_uc] != 0);
+            }
+#ifdef USE_SUNRISE
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_MODE))].success()) {
+              Settings.timer[index].mode = (uint8_t)root[parm_uc] & 0x03;
+            }
+#endif
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) {
+              uint16_t itime = 0;
+              int8_t value = 0;
+              uint8_t sign = 0;
+              char time_str[10];
+
+              strlcpy(time_str, root[parm_uc], sizeof(time_str));
+              const char *substr = strtok(time_str, ":");
+              if (substr != nullptr) {
+                if (strchr(substr, '-')) {
+                  sign = 1;
+                  substr++;
+                }
+                value = atoi(substr);
+                if (sign) { value += 12; }
+                if (value > 23) { value = 23; }
+                itime = value * 60;
+                substr = strtok(nullptr, ":");
+                if (substr != nullptr) {
+                  value = atoi(substr);
+                  if (value < 0) { value = 0; }
+                  if (value > 59) { value = 59; }
+                  itime += value;
+                }
+              }
+              Settings.timer[index].time = itime;
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_WINDOW))].success()) {
+              Settings.timer[index].window = (uint8_t)root[parm_uc] & 0x0F;
+              TimerSetRandomWindow(index);
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) {
+
+              Settings.timer[index].days = 0;
+              const char *tday = root[parm_uc];
+              uint8_t i = 0;
+              char ch = *tday++;
+              while ((ch != '\0') && (i < 7)) {
+                if (ch == '-') { ch = '0'; }
+                uint8_t mask = 1 << i++;
+                Settings.timer[index].days |= (ch == '0') ? 0 : mask;
+                ch = *tday++;
+              }
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) {
+              Settings.timer[index].repeat = (root[parm_uc] != 0);
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) {
+              uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F;
+              Settings.timer[index].device = (device < devices_present) ? device : 0;
+            }
+            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) {
+              uint8_t action = (uint8_t)root[parm_uc] & 0x03;
+              Settings.timer[index].power = (devices_present) ? action : 3;
+            }
+
+            index++;
+          }
+
+#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
+        } else {
+          Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index);
+          error = 1;
+        }
+#endif
+      }
+    }
+    if (!error) {
+      Response_P(PSTR("{"));
+      PrepShowTimer(index);
+      ResponseJsonEnd();
+    }
+  }
+}
+
+void CmndTimers(void)
+{
+  if (XdrvMailbox.data_len) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+      Settings.flag3.timers_enable = XdrvMailbox.payload;
+    }
+    if (XdrvMailbox.payload == 2) {
+      Settings.flag3.timers_enable = !Settings.flag3.timers_enable;
+    }
+  }
+
+  ResponseCmndStateText(Settings.flag3.timers_enable);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
+
+  uint32_t jsflg = 0;
+  uint32_t lines = 1;
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    if (!jsflg) {
+      Response_P(PSTR("{\"" D_CMND_TIMERS "%d\":{"), lines++);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg++;
+    PrepShowTimer(i +1);
+    if (jsflg > 3) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS));
+      jsflg = 0;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+
+#ifdef USE_SUNRISE
+void CmndLongitude(void)
+{
+  if (XdrvMailbox.data_len) {
+    Settings.longitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
+  }
+  ResponseCmndFloat((float)(Settings.longitude) /1000000, 6);
+}
+
+void CmndLatitude(void)
+{
+  if (XdrvMailbox.data_len) {
+    Settings.latitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
+  }
+  ResponseCmndFloat((float)(Settings.latitude) /1000000, 6);
+}
+#endif
+
+
+
+
+
+#ifdef USE_WEBSERVER
+#ifdef USE_TIMERS_WEB
+
+#define WEB_HANDLE_TIMER "tm"
+
+const char S_CONFIGURE_TIMER[] PROGMEM = D_CONFIGURE_TIMER;
+
+const char HTTP_BTN_MENU_TIMER[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_TIMER "' method='get'><button>" D_CONFIGURE_TIMER "</button></form></p>";
+
+const char HTTP_TIMER_SCRIPT1[] PROGMEM =
+  "var pt=[],ct=99;"
+  "function ce(i,q){"
+    "var o=document.createElement('option');"
+    "o.textContent=i;"
+    "q.appendChild(o);"
+  "}";
+#ifdef USE_SUNRISE
+const char HTTP_TIMER_SCRIPT2[] PROGMEM =
+  "function gt(){"
+    "var m,p,q;"
+    "m=qs('input[name=\"rd\"]:checked').value;"
+    "p=pt[ct]&0x7FF;"
+    "if(m==0){"
+      "so(0);"
+      "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
+      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+    "}"
+    "if((m==1)||(m==2)){"
+      "so(1);"
+      "q=Math.floor(p/60);"
+      "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}"
+        "else{qs('#dr').selectedIndex=0;}"
+      "if(q<10){q='0'+q;}qs('#ho').value=q;"
+      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+    "}"
+  "}"
+  "function so(b){"
+    "o=qs('#ho');"
+    "e=o.childElementCount;"
+    "if(b==1){"
+      "qs('#dr').style.visibility='';"
+      "if(e>12){for(i=12;i<=23;i++){o.removeChild(o.lastElementChild);}}"
+    "}else{"
+      "qs('#dr').style.visibility='hidden';"
+      "if(e<23){for(i=12;i<=23;i++){ce(i,o);}}"
+    "}"
+  "}";
+#endif
+const char HTTP_TIMER_SCRIPT3[] PROGMEM =
+  "function st(){"
+    "var i,l,m,n,p,s;"
+    "m=0;s=0;"
+    "n=1<<31;if(eb('a0').checked){s|=n;}"
+    "n=1<<15;if(eb('r0').checked){s|=n;}"
+    "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}"
+#ifdef USE_SUNRISE
+    "m=qs('input[name=\"rd\"]:checked').value;"
+    "s|=(qs('input[name=\"rd\"]:checked').value<<29);"
+#endif
+    "if(%d>0){"
+      "i=qs('#d1').selectedIndex;if(i>=0){s|=(i<<23);}"
+      "s|=(qs('#p1').selectedIndex<<27);"
+    "}else{"
+      "s|=3<<27;"
+    "}"
+    "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;"
+    "if(m==0){s|=l;}"
+#ifdef USE_SUNRISE
+    "if((m==1)||(m==2)){"
+      "if(qs('#dr').selectedIndex>0){if(l>0){l+=720;}}"
+      "s|=l&0x7FF;"
+    "}"
+#endif
+    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"
+    "pt[ct]=s;"
+    "eb('t0').value=pt.join();"
+  "}";
+const char HTTP_TIMER_SCRIPT4[] PROGMEM =
+  "function ot(t,e){"
+    "var i,n,o,p,q,s;"
+    "if(ct<99){st();}"
+    "ct=t;"
+    "o=document.getElementsByClassName('tl');"
+    "for(i=0;i<o.length;i++){o[i].style.cssText=\"background:#%06x;color:#%06x;font-weight:normal;\"}"
+    "e.style.cssText=\"background:#%06x;color:#%06x;font-weight:bold;\";"
+    "s=pt[ct];"
+#ifdef USE_SUNRISE
+    "p=(s>>29)&3;eb('b'+p).checked=1;"
+    "gt();"
+#else
+    "p=s&0x7FF;"
+    "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
+    "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
+#endif
+    "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;"
+    "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}"
+    "if(%d>0){"
+      "p=(s>>23)&0xF;qs('#d1').value=p+1;"
+      "p=(s>>27)&3;qs('#p1').selectedIndex=p;"
+    "}"
+    "p=(s>>15)&1;eb('r0').checked=p;"
+    "p=(s>>31)&1;eb('a0').checked=p;"
+  "}";
+const char HTTP_TIMER_SCRIPT5[] PROGMEM =
+  "function it(){"
+    "var b,i,o,s;"
+    "pt=eb('t0').value.split(',').map(Number);"
+    "s='';"
+    "for(i=0;i<%d;i++){"
+      "b='';"
+      "if(0==i){b=\" id='dP'\";}"
+      "s+=\"<button type='button' class='tl' onclick='ot(\"+i+\",this)'\"+b+\">\"+(i+1)+\"</button>\""
+    "}"
+    "eb('bt').innerHTML=s;"
+    "if(%d>0){"
+      "eb('oa').innerHTML=\"<b>" D_TIMER_OUTPUT "</b>&nbsp;<span><select style='width:60px;' id='d1'></select></span>&emsp;<b>" D_TIMER_ACTION "</b>&nbsp;<select style='width:99px;' id='p1'></select>\";"
+      "o=qs('#p1');ce('" D_OFF "',o);ce('" D_ON "',o);ce('" D_TOGGLE "',o);"
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+      "ce('" D_RULE "',o);"
+#else
+      "ce('" D_BLINK "',o);"
+#endif
+    "}else{"
+      "eb('oa').innerHTML=\"<b>" D_TIMER_ACTION "</b> " D_RULE "\";"
+    "}";
+const char HTTP_TIMER_SCRIPT6[] PROGMEM =
+#ifdef USE_SUNRISE
+    "o=qs('#dr');ce('+',o);ce('-',o);"
+#endif
+    "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}"
+    "o=qs('#d1');for(i=0;i<%d;i++){ce(i+1,o);}"
+    "var a='" D_DAY3LIST "';"
+    "s='';for(i=0;i<7;i++){s+=\"<input id='w\"+i+\"' type='checkbox'><b>\"+a.substring(i*3,(i*3)+3)+\"</b> \"}"
+    "eb('ds').innerHTML=s;"
+    "eb('dP').click();"
+  "}"
+  "wl(it);";
+const char HTTP_TIMER_STYLE[] PROGMEM =
+  ".tl{float:left;border-radius:0;border:1px solid #%06x;padding:1px;width:6.25%%;}";
+const char HTTP_FORM_TIMER1[] PROGMEM =
+  "<fieldset style='min-width:470px;text-align:center;'>"
+  "<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>"
+  "<br><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br><br><hr>"
+  "<input id='t0' value='";
+const char HTTP_FORM_TIMER2[] PROGMEM =
+  "' hidden><div id='bt'></div><br><br><br>"
+  "<div id='oa' name='oa'></div><br>"
+  "<div>"
+  "<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;"
+  "<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>"
+  "</div><br>"
+  "<div>";
+#ifdef USE_SUNRISE
+const char HTTP_FORM_TIMER3[] PROGMEM =
+  "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
+  "<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br>"
+  "<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br>"
+  "<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br>"
+  "</fieldset>"
+  "<p></p>"
+  "<span><select style='width:46px;' id='dr'></select></span>"
+  "&nbsp;";
+#else
+const char HTTP_FORM_TIMER3[] PROGMEM =
+  "<b>" D_TIMER_TIME "</b>&nbsp;";
+#endif
+const char HTTP_FORM_TIMER4[] PROGMEM =
+  "<span><select style='width:60px;' id='ho'></select></span>"
+  "&nbsp;" D_HOUR_MINUTE_SEPARATOR "&nbsp;"
+  "<span><select style='width:60px;' id='mi'></select></span>"
+  "&emsp;<b>+/-</b>&nbsp;"
+  "<span><select style='width:60px;' id='mw'></select></span>"
+  "</div><br>"
+  "<div id='ds' name='ds'></div>";
+
+void HandleTimerConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TIMER);
+
+  if (WebServer->hasArg("save")) {
+    TimerSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_TIMER);
+  WSContentSend_P(HTTP_TIMER_SCRIPT1);
+#ifdef USE_SUNRISE
+  WSContentSend_P(HTTP_TIMER_SCRIPT2);
+#endif
+  WSContentSend_P(HTTP_TIMER_SCRIPT3, devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT4, WebColor(COL_TIMER_TAB_BACKGROUND), WebColor(COL_TIMER_TAB_TEXT), WebColor(COL_FORM), WebColor(COL_TEXT), devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT5, MAX_TIMERS, devices_present);
+  WSContentSend_P(HTTP_TIMER_SCRIPT6, devices_present);
+  WSContentSendStyle_P(HTTP_TIMER_STYLE, WebColor(COL_FORM));
+  WSContentSend_P(HTTP_FORM_TIMER1, (Settings.flag3.timers_enable) ? " checked" : "");
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    WSContentSend_P(PSTR("%s%u"), (i > 0) ? "," : "", Settings.timer[i].data);
+  }
+  WSContentSend_P(HTTP_FORM_TIMER2);
+#ifdef USE_SUNRISE
+  WSContentSend_P(HTTP_FORM_TIMER3, 100 + (strlen(D_SUNSET) *12), GetSun(0).c_str(), GetSun(1).c_str());
+#else
+  WSContentSend_P(HTTP_FORM_TIMER3);
+#endif
+  WSContentSend_P(HTTP_FORM_TIMER4);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void TimerSaveSettings(void)
+{
+  char tmp[MAX_TIMERS *12];
+  char message[LOGSZ];
+  Timer timer;
+
+  Settings.flag3.timers_enable = WebServer->hasArg("e0");
+  WebGetArg("t0", tmp, sizeof(tmp));
+  char *p = tmp;
+  snprintf_P(message, sizeof(message), PSTR(D_LOG_MQTT D_CMND_TIMERS " %d"), Settings.flag3.timers_enable);
+  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
+    timer.data = strtol(p, &p, 10);
+    p++;
+    if (timer.time < 1440) {
+      bool flag = (timer.window != Settings.timer[i].window);
+      Settings.timer[i].data = timer.data;
+      if (flag) TimerSetRandomWindow(i);
+    }
+    snprintf_P(message, sizeof(message), PSTR("%s,0x%08X"), message, Settings.timer[i].data);
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, message);
+}
+#endif
+#endif
+
+
+
+
+
+bool Xdrv09(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_PRE_INIT:
+      TimerSetRandomWindows();
+      break;
+#ifdef USE_WEBSERVER
+#ifdef USE_TIMERS_WEB
+    case FUNC_WEB_ADD_BUTTON:
+#if defined(USE_RULES) || defined(USE_SCRIPT)
+      WSContentSend_P(HTTP_BTN_MENU_TIMER);
+#else
+      if (devices_present) { WSContentSend_P(HTTP_BTN_MENU_TIMER); }
+#endif
+      break;
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/" WEB_HANDLE_TIMER, HandleTimerConfiguration);
+      break;
+#endif
+#endif
+    case FUNC_EVERY_SECOND:
+      TimerEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kTimerCommands, TimerCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+#ifdef USE_RULES
+#ifndef USE_SCRIPT
+# 67 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+#define XDRV_10 10
+
+#define D_CMND_RULE "Rule"
+#define D_CMND_RULETIMER "RuleTimer"
+#define D_CMND_EVENT "Event"
+#define D_CMND_VAR "Var"
+#define D_CMND_MEM "Mem"
+#define D_CMND_ADD "Add"
+#define D_CMND_SUB "Sub"
+#define D_CMND_MULT "Mult"
+#define D_CMND_SCALE "Scale"
+#define D_CMND_CALC_RESOLUTION "CalcRes"
+#define D_CMND_SUBSCRIBE "Subscribe"
+#define D_CMND_UNSUBSCRIBE "Unsubscribe"
+#define D_CMND_IF "If"
+
+#define D_JSON_INITIATED "Initiated"
+
+#define COMPARE_OPERATOR_NONE -1
+#define COMPARE_OPERATOR_EQUAL 0
+#define COMPARE_OPERATOR_BIGGER 1
+#define COMPARE_OPERATOR_SMALLER 2
+#define COMPARE_OPERATOR_EXACT_DIVISION 3
+#define COMPARE_OPERATOR_NUMBER_EQUAL 4
+#define COMPARE_OPERATOR_NOT_EQUAL 5
+#define COMPARE_OPERATOR_BIGGER_EQUAL 6
+#define COMPARE_OPERATOR_SMALLER_EQUAL 7
+#define MAXIMUM_COMPARE_OPERATOR COMPARE_OPERATOR_SMALLER_EQUAL
+const char kCompareOperators[] PROGMEM = "=\0>\0<\0|\0==!=>=<=";
+
+#ifdef USE_EXPRESSION
+  #include <LinkedList.h>
+
+  const char kExpressionOperators[] PROGMEM = "+-*/%^\0";
+  #define EXPRESSION_OPERATOR_ADD 0
+  #define EXPRESSION_OPERATOR_SUBTRACT 1
+  #define EXPRESSION_OPERATOR_MULTIPLY 2
+  #define EXPRESSION_OPERATOR_DIVIDEDBY 3
+  #define EXPRESSION_OPERATOR_MODULO 4
+  #define EXPRESSION_OPERATOR_POWER 5
+
+  const uint8_t kExpressionOperatorsPriorities[] PROGMEM = {1, 1, 2, 2, 3, 4};
+  #define MAX_EXPRESSION_OPERATOR_PRIORITY 4
+
+
+  #define LOGIC_OPERATOR_AND 1
+  #define LOGIC_OPERATOR_OR 2
+
+  #define IF_BLOCK_INVALID -1
+  #define IF_BLOCK_ANY 0
+  #define IF_BLOCK_ELSEIF 1
+  #define IF_BLOCK_ELSE 2
+  #define IF_BLOCK_ENDIF 3
+#endif
+
+const char kRulesCommands[] PROGMEM = "|"
+  D_CMND_RULE "|" D_CMND_RULETIMER "|" D_CMND_EVENT "|" D_CMND_VAR "|" D_CMND_MEM "|"
+  D_CMND_ADD "|" D_CMND_SUB "|" D_CMND_MULT "|" D_CMND_SCALE "|" D_CMND_CALC_RESOLUTION
+#ifdef SUPPORT_MQTT_EVENT
+  "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE
+#endif
+#ifdef SUPPORT_IF_STATEMENT
+  "|" D_CMND_IF
+#endif
+  ;
+
+void (* const RulesCommand[])(void) PROGMEM = {
+  &CmndRule, &CmndRuleTimer, &CmndEvent, &CmndVariable, &CmndMemory,
+  &CmndAddition, &CmndSubtract, &CmndMultiply, &CmndScale, &CmndCalcResolution
+#ifdef SUPPORT_MQTT_EVENT
+  , &CmndSubscribe, &CmndUnsubscribe
+#endif
+#ifdef SUPPORT_IF_STATEMENT
+  , &CmndIf
+#endif
+  };
+
+#ifdef SUPPORT_MQTT_EVENT
+  #include <LinkedList.h>
+  typedef struct {
+    String Event;
+    String Topic;
+    String Key;
+  } MQTT_Subscription;
+  LinkedList<MQTT_Subscription> subscriptions;
+#endif
+
+struct RULES {
+  String event_value;
+  unsigned long timer[MAX_RULE_TIMERS] = { 0 };
+  uint32_t triggers[MAX_RULE_SETS] = { 0 };
+  uint8_t trigger_count[MAX_RULE_SETS] = { 0 };
+
+  long new_power = -1;
+  long old_power = -1;
+  long old_dimm = -1;
+
+  uint16_t last_minute = 60;
+  uint16_t vars_event = 0;
+  uint8_t mems_event = 0;
+  bool teleperiod = false;
+
+  char event_data[100];
+} Rules;
+
+char rules_vars[MAX_RULE_VARS][33] = {{ 0 }};
+
+#if (MAX_RULE_VARS>16)
+#error MAX_RULE_VARS is bigger than 16
+#endif
+#if (MAX_RULE_MEMS>16)
+#error MAX_RULE_MEMS is bigger than 16
+#endif
+
+
+
+bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
+{
+
+
+
+
+  bool match = false;
+  char stemp[10];
+
+
+  int pos = rule.indexOf('#');
+  if (pos == -1) { return false; }
+
+  String rule_task = rule.substring(0, pos);
+  if (Rules.teleperiod) {
+    int ppos = rule_task.indexOf("TELE-");
+    if (ppos == -1) { return false; }
+    rule_task = rule.substring(5, pos);
+  }
+
+  String rule_expr = rule.substring(pos +1);
+  String rule_name, rule_param;
+  int8_t compareOperator = parseCompareExpression(rule_expr, rule_name, rule_param);
+
+  char rule_svalue[80] = { 0 };
+  float rule_value = 0;
+  if (compareOperator != COMPARE_OPERATOR_NONE) {
+    for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
+      if (rule_param.startsWith(stemp)) {
+        rule_param = rules_vars[i];
+        break;
+      }
+    }
+    for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
+      if (rule_param.startsWith(stemp)) {
+        rule_param = SettingsText(SET_MEM1 + i);
+        break;
+      }
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIME%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(MinutesPastMidnight());
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%UPTIME%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(MinutesUptime());
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMESTAMP%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = GetDateAndTime(DT_LOCAL).c_str();
+    }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNRISE%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(SunMinutes(0));
+    }
+    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNSET%%"));
+    if (rule_param.startsWith(stemp)) {
+      rule_param = String(SunMinutes(1));
+    }
+#endif
+    rule_param.toUpperCase();
+    strlcpy(rule_svalue, rule_param.c_str(), sizeof(rule_svalue));
+
+    int temp_value = GetStateNumber(rule_svalue);
+    if (temp_value > -1) {
+      rule_value = temp_value;
+    } else {
+      rule_value = CharToFloat((char*)rule_svalue);
+    }
+  }
+
+
+  int rule_name_idx = 0;
+  if ((pos = rule_name.indexOf("[")) > 0) {
+    rule_name_idx = rule_name.substring(pos +1).toInt();
+    if ((rule_name_idx < 1) || (rule_name_idx > 6)) {
+      rule_name_idx = 1;
+    }
+    rule_name = rule_name.substring(0, pos);
+  }
+
+  StaticJsonBuffer<1024> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(event);
+  if (!root.success()) { return false; }
+  if (!root[rule_task].success()) { return false; }
+
+  JsonObject &obj1 = root[rule_task];
+  JsonObject *obj = &obj1;
+  String subtype;
+  uint32_t i = 0;
+  while ((pos = rule_name.indexOf("#")) > 0) {
+    subtype = rule_name.substring(0, pos);
+    if (!(*obj)[subtype].success()) { return false; }
+    JsonObject &obj2 = (*obj)[subtype];
+    obj = &obj2;
+    rule_name = rule_name.substring(pos +1);
+    if (i++ > 10) { return false; }
+  }
+  if (!(*obj)[rule_name].success()) { return false; }
+  const char* str_value;
+  if (rule_name_idx) {
+    str_value = (*obj)[rule_name][rule_name_idx -1];
+  } else {
+    str_value = (*obj)[rule_name];
+  }
+
+
+
+
+  Rules.event_value = str_value;
+
+
+  float value = 0;
+  if (str_value) {
+    value = CharToFloat((char*)str_value);
+    int int_value = int(value);
+    int int_rule_value = int(rule_value);
+    switch (compareOperator) {
+      case COMPARE_OPERATOR_EXACT_DIVISION:
+        match = (int_rule_value && (int_value % int_rule_value) == 0);
+        break;
+      case COMPARE_OPERATOR_EQUAL:
+        match = (!strcasecmp(str_value, rule_svalue));
+        break;
+      case COMPARE_OPERATOR_BIGGER:
+        match = (value > rule_value);
+        break;
+      case COMPARE_OPERATOR_SMALLER:
+        match = (value < rule_value);
+        break;
+      case COMPARE_OPERATOR_NUMBER_EQUAL:
+        match = (value == rule_value);
+        break;
+      case COMPARE_OPERATOR_NOT_EQUAL:
+        match = (value != rule_value);
+        break;
+      case COMPARE_OPERATOR_BIGGER_EQUAL:
+        match = (value >= rule_value);
+        break;
+      case COMPARE_OPERATOR_SMALLER_EQUAL:
+        match = (value <= rule_value);
+        break;
+      default:
+        match = true;
+    }
+  } else match = true;
+
+  if (bitRead(Settings.rule_once, rule_set)) {
+    if (match) {
+      if (!bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set])) {
+        bitSet(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
+      } else {
+        match = false;
+      }
+    } else {
+      bitClear(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
+    }
+  }
+
+  return match;
+}
+# 363 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr)
+{
+  char compare_operator[3];
+  int8_t compare = COMPARE_OPERATOR_NONE;
+  leftExpr = expr;
+  int position;
+  for (int8_t i = MAXIMUM_COMPARE_OPERATOR; i >= 0; i--) {
+    snprintf_P(compare_operator, sizeof(compare_operator), kCompareOperators + (i *2));
+    if ((position = expr.indexOf(compare_operator)) > 0) {
+      compare = i;
+      leftExpr = expr.substring(0, position);
+      leftExpr.trim();
+      rightExpr = expr.substring(position + strlen(compare_operator));
+      rightExpr.trim();
+      break;
+    }
+  }
+  return compare;
+}
+
+void RulesVarReplace(String &commands, const String &sfind, const String &replace)
+{
+
+
+
+  char *find = (char*)sfind.c_str();
+  uint32_t flen = strlen(find);
+
+  String ucommand = commands;
+  ucommand.toUpperCase();
+  char *read_from = (char*)ucommand.c_str();
+  char *write_to = (char*)commands.c_str();
+  char *found_at;
+  while ((found_at = strstr(read_from, find)) != nullptr) {
+    write_to += (found_at - read_from);
+    memmove_P(write_to, find, flen);
+    write_to += flen;
+    read_from = found_at + flen;
+  }
+
+  commands.replace(find, replace);
+}
+
+
+
+bool RuleSetProcess(uint8_t rule_set, String &event_saved)
+{
+  bool serviced = false;
+  char stemp[10];
+
+  delay(0);
+
+
+
+  String rules = Settings.rules[rule_set];
+
+  Rules.trigger_count[rule_set] = 0;
+  int plen = 0;
+  int plen2 = 0;
+  bool stop_all_rules = false;
+  while (true) {
+    rules = rules.substring(plen);
+    rules.trim();
+    if (!rules.length()) { return serviced; }
+
+    String rule = rules;
+    rule.toUpperCase();
+    if (!rule.startsWith("ON ")) { return serviced; }
+
+    int pevt = rule.indexOf(" DO ");
+    if (pevt == -1) { return serviced; }
+    String event_trigger = rule.substring(3, pevt);
+
+    plen = rule.indexOf(" ENDON");
+    plen2 = rule.indexOf(" BREAK");
+    if ((plen == -1) && (plen2 == -1)) { return serviced; }
+
+    if (plen == -1) { plen = 9999; }
+    if (plen2 == -1) { plen2 = 9999; }
+    plen = tmin(plen, plen2);
+
+    String commands = rules.substring(pevt +4, plen);
+    Rules.event_value = "";
+    String event = event_saved;
+
+
+
+    if (RulesRuleMatch(rule_set, event, event_trigger)) {
+      if (plen == plen2) { stop_all_rules = true; }
+      commands.trim();
+      String ucommand = commands;
+      ucommand.toUpperCase();
+
+
+
+      if ((ucommand.indexOf("IF ") == -1) &&
+          (ucommand.indexOf("EVENT ") != -1) &&
+          (ucommand.indexOf("BACKLOG ") == -1)) {
+        commands = "backlog " + commands;
+      }
+
+      RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);
+      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
+        RulesVarReplace(commands, stemp, rules_vars[i]);
+      }
+      for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
+        RulesVarReplace(commands, stemp, SettingsText(SET_MEM1 +i));
+      }
+      RulesVarReplace(commands, F("%TIME%"), String(MinutesPastMidnight()));
+      RulesVarReplace(commands, F("%UPTIME%"), String(MinutesUptime()));
+      RulesVarReplace(commands, F("%TIMESTAMP%"), GetDateAndTime(DT_LOCAL));
+      RulesVarReplace(commands, F("%TOPIC%"), SettingsText(SET_MQTT_TOPIC));
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+      RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
+      RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));
+#endif
+
+      char command[commands.length() +1];
+      strlcpy(command, commands.c_str(), sizeof(command));
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command);
+
+
+
+#ifdef SUPPORT_IF_STATEMENT
+      char *pCmd = command;
+      RulesPreprocessCommand(pCmd);
+#endif
+      ExecuteCommand(command, SRC_RULE);
+      serviced = true;
+      if (stop_all_rules) { return serviced; }
+    }
+    plen += 6;
+    Rules.trigger_count[rule_set]++;
+  }
+  return serviced;
+}
+
+
+
+bool RulesProcessEvent(char *json_event)
+{
+  bool serviced = false;
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("RulesProcessEvent"));
+#endif
+
+  String event_saved = json_event;
+
+
+
+  char *p = strchr(json_event, ':');
+  if ((p != NULL) && !(strchr(++p, ':'))) {
+    event_saved.replace(F(":"), F(":{\"Data\":"));
+    event_saved += F("}");
+
+  }
+  event_saved.toUpperCase();
+
+
+
+  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+    if (strlen(Settings.rules[i]) && bitRead(Settings.rule_enabled, i)) {
+      if (RuleSetProcess(i, event_saved)) { serviced = true; }
+    }
+  }
+  return serviced;
+}
+
+bool RulesProcess(void)
+{
+  return RulesProcessEvent(mqtt_data);
+}
+
+void RulesInit(void)
+{
+  rules_flag.data = 0;
+  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
+    if (Settings.rules[i][0] == '\0') {
+      bitWrite(Settings.rule_enabled, i, 0);
+      bitWrite(Settings.rule_once, i, 0);
+    }
+  }
+  Rules.teleperiod = false;
+}
+
+void RulesEvery50ms(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[120];
+
+    if (-1 == Rules.new_power) { Rules.new_power = power; }
+    if (Rules.new_power != Rules.old_power) {
+      if (Rules.old_power != -1) {
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint8_t new_state = (Rules.new_power >> i) &1;
+          if (new_state != ((Rules.old_power >> i) &1)) {
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"State\":%d}}"), i +1, new_state);
+            RulesProcessEvent(json_event);
+          }
+        }
+      } else {
+
+        for (uint32_t i = 0; i < devices_present; i++) {
+          uint8_t new_state = (Rules.new_power >> i) &1;
+          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"Boot\":%d}}"), i +1, new_state);
+          RulesProcessEvent(json_event);
+        }
+
+        for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+#ifdef USE_TM1638
+          if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
+#else
+          if (pin[GPIO_SWT1 +i] < 99) {
+#endif
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (SwitchState(i)));
+            RulesProcessEvent(json_event);
+          }
+        }
+      }
+      Rules.old_power = Rules.new_power;
+    }
+    else if (Rules.old_dimm != Settings.light_dimmer) {
+      if (Rules.old_dimm != -1) {
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"State\":%d}}"), Settings.light_dimmer);
+      } else {
+
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"Boot\":%d}}"), Settings.light_dimmer);
+      }
+      RulesProcessEvent(json_event);
+      Rules.old_dimm = Settings.light_dimmer;
+    }
+    else if (Rules.event_data[0]) {
+      char *event;
+      char *parameter;
+      event = strtok_r(Rules.event_data, "=", &parameter);
+      if (event) {
+        event = Trim(event);
+        if (parameter) {
+          parameter = Trim(parameter);
+        } else {
+          parameter = event + strlen(event);
+        }
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Event\":{\"%s\":\"%s\"}}"), event, parameter);
+        Rules.event_data[0] ='\0';
+        RulesProcessEvent(json_event);
+      } else {
+        Rules.event_data[0] ='\0';
+      }
+    }
+    else if (Rules.vars_event || Rules.mems_event){
+      if (Rules.vars_event) {
+        for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+          if (bitRead(Rules.vars_event, i)) {
+            bitClear(Rules.vars_event, i);
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Var%d\":{\"State\":%s}}"), i+1, rules_vars[i]);
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+      }
+      if (Rules.mems_event) {
+        for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
+          if (bitRead(Rules.mems_event, i)) {
+            bitClear(Rules.mems_event, i);
+            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Mem%d\":{\"State\":%s}}"), i+1, SettingsText(SET_MEM1 +i));
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+      }
+    }
+    else if (rules_flag.data) {
+      uint16_t mask = 1;
+      for (uint32_t i = 0; i < MAX_RULES_FLAG; i++) {
+        if (rules_flag.data & mask) {
+          rules_flag.data ^= mask;
+          json_event[0] = '\0';
+          switch (i) {
+            case 0: strncpy_P(json_event, PSTR("{\"System\":{\"Boot\":1}}"), sizeof(json_event)); break;
+            case 1: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Initialized\":%d}}"), MinutesPastMidnight()); break;
+            case 2: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Set\":%d}}"), MinutesPastMidnight()); break;
+            case 3: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Connected\":1}}"), sizeof(json_event)); break;
+            case 4: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
+            case 5: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Connected\":1}}"), sizeof(json_event)); break;
+            case 6: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
+            case 7: strncpy_P(json_event, PSTR("{\"HTTP\":{\"Initialized\":1}}"), sizeof(json_event)); break;
+#ifdef USE_SHUTTER
+            case 8: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moved\":1}}"), sizeof(json_event)); break;
+            case 9: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moving\":1}}"), sizeof(json_event)); break;
+#endif
+          }
+          if (json_event[0]) {
+            RulesProcessEvent(json_event);
+            break;
+          }
+        }
+        mask <<= 1;
+      }
+    }
+  }
+}
+
+uint8_t rules_xsns_index = 0;
+
+void RulesEvery100ms(void)
+{
+  if (Settings.rule_enabled && (uptime > 4)) {
+    mqtt_data[0] = '\0';
+    int tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, rules_xsns_index);
+    tele_period = tele_period_save;
+    if (strlen(mqtt_data)) {
+      mqtt_data[0] = '{';
+      ResponseJsonEnd();
+      RulesProcess();
+    }
+  }
+}
+
+void RulesEverySecond(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[120];
+
+    if (RtcTime.valid) {
+      if ((uptime > 60) && (RtcTime.minute != Rules.last_minute)) {
+        Rules.last_minute = RtcTime.minute;
+        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Minute\":%d}}"), MinutesPastMidnight());
+        RulesProcessEvent(json_event);
+      }
+    }
+    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
+      if (Rules.timer[i] != 0L) {
+        if (TimeReached(Rules.timer[i])) {
+          Rules.timer[i] = 0L;
+          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1);
+          RulesProcessEvent(json_event);
+        }
+      }
+    }
+  }
+}
+
+void RulesSaveBeforeRestart(void)
+{
+  if (Settings.rule_enabled) {
+    char json_event[32];
+
+    strncpy_P(json_event, PSTR("{\"System\":{\"Save\":1}}"), sizeof(json_event));
+    RulesProcessEvent(json_event);
+  }
+}
+
+void RulesSetPower(void)
+{
+  Rules.new_power = XdrvMailbox.index;
+}
+
+void RulesTeleperiod(void)
+{
+  Rules.teleperiod = true;
+  RulesProcess();
+  Rules.teleperiod = false;
+}
+
+#ifdef SUPPORT_MQTT_EVENT
+# 744 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool RulesMqttData(void)
+{
+  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
+    return false;
+  }
+  bool serviced = false;
+  String sTopic = XdrvMailbox.topic;
+  String sData = XdrvMailbox.data;
+
+  MQTT_Subscription event_item;
+
+  for (uint32_t index = 0; index < subscriptions.size(); index++) {
+    event_item = subscriptions.get(index);
+
+
+    if (sTopic.startsWith(event_item.Topic)) {
+
+      serviced = true;
+      String value;
+      if (event_item.Key.length() == 0) {
+        value = sData;
+      } else {
+        StaticJsonBuffer<500> jsonBuf;
+        JsonObject& jsonData = jsonBuf.parseObject(sData);
+        String key1 = event_item.Key;
+        String key2;
+        if (!jsonData.success()) break;
+        int dot;
+        if ((dot = key1.indexOf('.')) > 0) {
+          key2 = key1.substring(dot+1);
+          key1 = key1.substring(0, dot);
+          if (!jsonData[key1][key2].success()) break;
+          value = (const char *)jsonData[key1][key2];
+        } else {
+          if (!jsonData[key1].success()) break;
+          value = (const char *)jsonData[key1];
+        }
+      }
+      value.trim();
+
+      snprintf_P(Rules.event_data, sizeof(Rules.event_data), PSTR("%s=%s"), event_item.Event.c_str(), value.c_str());
+    }
+  }
+  return serviced;
+}
+# 806 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+void CmndSubscribe(void)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (XdrvMailbox.data_len > 0) {
+    char parameters[XdrvMailbox.data_len+1];
+    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
+    parameters[XdrvMailbox.data_len] = '\0';
+    String event_name, topic, key;
+
+    char * pos = strtok(parameters, ",");
+    if (pos) {
+      event_name = Trim(pos);
+      pos = strtok(nullptr, ",");
+      if (pos) {
+        topic = Trim(pos);
+        pos = strtok(nullptr, ",");
+        if (pos) {
+          key = Trim(pos);
+        }
+      }
+    }
+
+    event_name.toUpperCase();
+    if (event_name.length() > 0 && topic.length() > 0) {
+
+      for (uint32_t index=0; index < subscriptions.size(); index++) {
+        if (subscriptions.get(index).Event.equals(event_name)) {
+
+          String stopic = subscriptions.get(index).Topic + "/#";
+          MqttUnsubscribe(stopic.c_str());
+          subscriptions.remove(index);
+          break;
+        }
+      }
+
+      if (!topic.endsWith("#")) {
+        if (topic.endsWith("/")) {
+          topic.concat("#");
+        } else {
+          topic.concat("/#");
+        }
+      }
+
+
+      subscription_item.Event = event_name;
+      subscription_item.Topic = topic.substring(0, topic.length() - 2);
+      subscription_item.Key = key;
+      subscriptions.add(subscription_item);
+
+      MqttSubscribe(topic.c_str());
+      events.concat(event_name + "," + topic
+        + (key.length()>0 ? "," : "")
+        + key);
+    } else {
+      events = D_JSON_WRONG_PARAMETERS;
+    }
+  } else {
+
+    for (uint32_t index=0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      events.concat(subscription_item.Event + "," + subscription_item.Topic
+        + (subscription_item.Key.length()>0 ? "," : "")
+        + subscription_item.Key + "; ");
+    }
+  }
+  ResponseCmndChar(events.c_str());
+}
+# 886 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+void CmndUnsubscribe(void)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (XdrvMailbox.data_len > 0) {
+    for (uint32_t index = 0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      if (subscription_item.Event.equalsIgnoreCase(XdrvMailbox.data)) {
+        String stopic = subscription_item.Topic + "/#";
+        MqttUnsubscribe(stopic.c_str());
+        events = subscription_item.Event;
+        subscriptions.remove(index);
+        break;
+      }
+    }
+  } else {
+
+    String stopic;
+    while (subscriptions.size() > 0) {
+      events.concat(subscriptions.get(0).Event + "; ");
+      stopic = subscriptions.get(0).Topic + "/#";
+      MqttUnsubscribe(stopic.c_str());
+      subscriptions.remove(0);
+    }
+  }
+  ResponseCmndChar(events.c_str());
+}
+
+#endif
+
+#ifdef USE_EXPRESSION
+# 928 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+char * findClosureBracket(char * pStart)
+{
+  char * pointer = pStart + 1;
+
+  bool bFindClosures = false;
+  uint8_t matchClosures = 1;
+  while (*pointer)
+  {
+    if (*pointer == ')') {
+      matchClosures--;
+      if (matchClosures == 0) {
+        bFindClosures = true;
+        break;
+      }
+    } else if (*pointer == '(') {
+      matchClosures++;
+    }
+    pointer++;
+  }
+  if (bFindClosures) {
+    return pointer;
+  } else {
+    return nullptr;
+  }
+}
+# 967 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextNumber(char * &pNumber, float &value)
+{
+  bool bSucceed = false;
+  String sNumber = "";
+  if (*pNumber == '-') {
+    sNumber = "-";
+    pNumber++;
+  }
+  while (*pNumber) {
+    if (isdigit(*pNumber) || (*pNumber == '.')) {
+      sNumber += *pNumber;
+      pNumber++;
+    } else {
+      break;
+    }
+  }
+  if (sNumber.length() > 0) {
+    value = CharToFloat(sNumber.c_str());
+    bSucceed = true;
+  }
+  return bSucceed;
+}
+# 1003 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextVariableValue(char * &pVarname, float &value)
+{
+  bool succeed = true;
+  value = 0;
+  String sVarName = "";
+  while (*pVarname) {
+    if (isalpha(*pVarname) || isdigit(*pVarname)) {
+      sVarName.concat(*pVarname);
+      pVarname++;
+    } else {
+      break;
+    }
+  }
+  sVarName.toUpperCase();
+  if (sVarName.startsWith(F("VAR"))) {
+    int index = sVarName.substring(3).toInt();
+    if (index > 0 && index <= MAX_RULE_VARS) {
+      value = CharToFloat(rules_vars[index -1]);
+    }
+  } else if (sVarName.startsWith(F("MEM"))) {
+    int index = sVarName.substring(3).toInt();
+    if (index > 0 && index <= MAX_RULE_MEMS) {
+      value = CharToFloat(SettingsText(SET_MEM1 + index -1));
+    }
+  } else if (sVarName.equals(F("TIME"))) {
+    value = MinutesPastMidnight();
+  } else if (sVarName.equals(F("UPTIME"))) {
+    value = MinutesUptime();
+  } else if (sVarName.equals(F("UTCTIME"))) {
+    value = UtcTime();
+  } else if (sVarName.equals(F("LOCALTIME"))) {
+    value = LocalTime();
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+  } else if (sVarName.equals(F("SUNRISE"))) {
+    value = SunMinutes(0);
+  } else if (sVarName.equals(F("SUNSET"))) {
+    value = SunMinutes(1);
+#endif
+  } else {
+    succeed = false;
+  }
+
+  return succeed;
+}
+# 1065 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextObjectValue(char * &pointer, float &value)
+{
+  bool bSucceed = false;
+  while (*pointer)
+  {
+    if (isspace(*pointer)) {
+      pointer++;
+      continue;
+    }
+    if (isdigit(*pointer) || (*pointer) == '-') {
+      bSucceed = findNextNumber(pointer, value);
+      break;
+    } else if (isalpha(*pointer)) {
+      bSucceed = findNextVariableValue(pointer, value);
+      break;
+    } else if (*pointer == '(') {
+      char * closureBracket = findClosureBracket(pointer);
+      if (closureBracket != nullptr) {
+        value = evaluateExpression(pointer+1, closureBracket - pointer - 1);
+        pointer = closureBracket + 1;
+        bSucceed = true;
+      }
+      break;
+    } else {
+      break;
+    }
+  }
+  return bSucceed;
+}
+# 1109 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextOperator(char * &pointer, int8_t &op)
+{
+  bool bSucceed = false;
+  while (*pointer)
+  {
+    if (isspace(*pointer)) {
+      pointer++;
+      continue;
+    }
+    op = EXPRESSION_OPERATOR_ADD;
+    const char *pch = kExpressionOperators;
+    char ch;
+    while ((ch = pgm_read_byte(pch++)) != '\0') {
+      if (ch == *pointer) {
+        bSucceed = true;
+        pointer++;
+        break;
+      }
+      op++;
+    }
+    break;
+  }
+  return bSucceed;
+}
+# 1146 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+float calculateTwoValues(float v1, float v2, uint8_t op)
+{
+  switch (op)
+  {
+    case EXPRESSION_OPERATOR_ADD:
+      return v1 + v2;
+    case EXPRESSION_OPERATOR_SUBTRACT:
+      return v1 - v2;
+    case EXPRESSION_OPERATOR_MULTIPLY:
+      return v1 * v2;
+    case EXPRESSION_OPERATOR_DIVIDEDBY:
+      return (0 == v2) ? 0 : (v1 / v2);
+    case EXPRESSION_OPERATOR_MODULO:
+      return (0 == v2) ? 0 : (int(v1) % int(v2));
+    case EXPRESSION_OPERATOR_POWER:
+      return FastPrecisePow(v1, v2);
+  }
+  return 0;
+}
+# 1199 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+float evaluateExpression(const char * expression, unsigned int len)
+{
+  char expbuf[len + 1];
+  memcpy(expbuf, expression, len);
+  expbuf[len] = '\0';
+  char * scan_pointer = expbuf;
+
+  LinkedList<float> object_values;
+  LinkedList<int8_t> operators;
+  int8_t op;
+  float va;
+
+  if (findNextObjectValue(scan_pointer, va)) {
+    object_values.add(va);
+  } else {
+    return 0;
+  }
+  while (*scan_pointer)
+  {
+    if (findNextOperator(scan_pointer, op)
+        && *scan_pointer
+        && findNextObjectValue(scan_pointer, va))
+    {
+      operators.add(op);
+      object_values.add(va);
+    } else {
+
+      break;
+    }
+  }
+
+
+
+  for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) {
+    int index = 0;
+    while (index < operators.size()) {
+      if (priority == pgm_read_byte(kExpressionOperatorsPriorities + operators.get(index))) {
+
+        va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index));
+
+        object_values.set(index, va);
+      } else {
+        index++;
+      }
+    }
+  }
+  return object_values.get(0);
+}
+#endif
+
+#ifdef SUPPORT_IF_STATEMENT
+void CmndIf(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    char parameters[XdrvMailbox.data_len+1];
+    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
+    parameters[XdrvMailbox.data_len] = '\0';
+    ProcessIfStatement(parameters);
+  }
+  ResponseCmndDone();
+}
+# 1273 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool evaluateComparisonExpression(const char *expression, int len)
+{
+  bool bResult = true;
+  char expbuf[len + 1];
+  memcpy(expbuf, expression, len);
+  expbuf[len] = '\0';
+  String compare_expression = expbuf;
+  String leftExpr, rightExpr;
+  int8_t compareOp = parseCompareExpression(compare_expression, leftExpr, rightExpr);
+
+  double leftValue = evaluateExpression(leftExpr.c_str(), leftExpr.length());
+  double rightValue = evaluateExpression(rightExpr.c_str(), rightExpr.length());
+  switch (compareOp) {
+    case COMPARE_OPERATOR_EXACT_DIVISION:
+      bResult = (rightValue != 0 && leftValue == int(leftValue)
+          && rightValue == int(rightValue) && (int(leftValue) % int(rightValue)) == 0);
+      break;
+    case COMPARE_OPERATOR_EQUAL:
+      bResult = leftExpr.equalsIgnoreCase(rightExpr);
+      break;
+    case COMPARE_OPERATOR_BIGGER:
+      bResult = (leftValue > rightValue);
+      break;
+    case COMPARE_OPERATOR_SMALLER:
+      bResult = (leftValue < rightValue);
+      break;
+    case COMPARE_OPERATOR_NUMBER_EQUAL:
+      bResult = (leftValue == rightValue);
+      break;
+    case COMPARE_OPERATOR_NOT_EQUAL:
+      bResult = (leftValue != rightValue);
+      break;
+    case COMPARE_OPERATOR_BIGGER_EQUAL:
+      bResult = (leftValue >= rightValue);
+      break;
+    case COMPARE_OPERATOR_SMALLER_EQUAL:
+      bResult = (leftValue <= rightValue);
+      break;
+  }
+  return bResult;
+}
+# 1329 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextLogicOperator(char * &pointer, int8_t &op)
+{
+  bool bSucceed = false;
+  while (*pointer && isspace(*pointer)) {
+
+    pointer++;
+  }
+  if (*pointer) {
+    if (strncasecmp_P(pointer, PSTR("AND "), 4) == 0) {
+      op = LOGIC_OPERATOR_AND;
+      pointer += 4;
+      bSucceed = true;
+    } else if (strncasecmp_P(pointer, PSTR("OR "), 3) == 0) {
+      op = LOGIC_OPERATOR_OR;
+      pointer += 3;
+      bSucceed = true;
+    }
+  }
+  return bSucceed;
+}
+# 1366 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool findNextLogicObjectValue(char * &pointer, bool &value)
+{
+  bool bSucceed = false;
+  while (*pointer && isspace(*pointer)) {
+
+    pointer++;
+  }
+  char * pExpr = pointer;
+  while (*pointer) {
+    if (isalpha(*pointer)
+       && (strncasecmp_P(pointer, PSTR("AND "), 4) == 0
+       || strncasecmp_P(pointer, PSTR("OR "), 3) == 0))
+    {
+      value = evaluateComparisonExpression(pExpr, pointer - pExpr);
+      bSucceed = true;
+      break;
+    } else if (*pointer == '(') {
+      char * closureBracket = findClosureBracket(pointer);
+      if (closureBracket != nullptr) {
+        value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 1);
+        pointer = closureBracket + 1;
+        bSucceed = true;
+      }
+      break;
+    }
+    pointer++;
+  }
+  if (!bSucceed && pointer > pExpr) {
+
+    value = evaluateComparisonExpression(pExpr, pointer - pExpr);
+    bSucceed = true;
+  }
+  return bSucceed;
+}
+# 1415 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+bool evaluateLogicalExpression(const char * expression, int len)
+{
+  bool bResult = false;
+
+  char expbuff[len + 1];
+  memcpy(expbuff, expression, len);
+  expbuff[len] = '\0';
+
+
+  char * pointer = expbuff;
+  LinkedList<bool> values;
+  LinkedList<int8_t> logicOperators;
+
+  bool bValue;
+  if (findNextLogicObjectValue(pointer, bValue)) {
+    values.add(bValue);
+  } else {
+    return false;
+  }
+  int8_t op;
+  while (*pointer) {
+    if (findNextLogicOperator(pointer, op)
+      && (*pointer) && findNextLogicObjectValue(pointer, bValue))
+    {
+      logicOperators.add(op);
+      values.add(bValue);
+    } else {
+      break;
+    }
+  }
+
+  int index = 0;
+  while (index < logicOperators.size()) {
+    if (logicOperators.get(index) == LOGIC_OPERATOR_AND) {
+      values.set(index, values.get(index) && values.get(index+1));
+      values.remove(index + 1);
+      logicOperators.remove(index);
+    } else {
+      index++;
+    }
+  }
+
+  index = 0;
+  while (index < logicOperators.size()) {
+    if (logicOperators.get(index) == LOGIC_OPERATOR_OR) {
+      values.set(index, values.get(index) || values.get(index+1));
+      values.remove(index + 1);
+      logicOperators.remove(index);
+    } else {
+      index++;
+    }
+  }
+  return values.get(0);
+}
+# 1486 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type)
+{
+  int8_t foundBlock = IF_BLOCK_INVALID;
+
+  const char * word;
+  while (*pointer) {
+    if (!isalpha(*pointer)) {
+      pointer++;
+      continue;
+    }
+    word = pointer;
+    while (*pointer && isalpha(*pointer)) {
+      pointer++;
+    }
+    lenWord = pointer - word;
+
+    if (2 == lenWord && 0 == strncasecmp_P(word, PSTR("IF"), 2)) {
+
+
+      if (findIfBlock(pointer, lenWord, IF_BLOCK_ENDIF) != IF_BLOCK_ENDIF) {
+
+        break;
+      }
+    } else if ( (IF_BLOCK_ENDIF == block_type || IF_BLOCK_ANY == block_type)
+      && (5 == lenWord) && (0 == strncasecmp_P(word, PSTR("ENDIF"), 5)))
+    {
+
+      foundBlock = IF_BLOCK_ENDIF;
+      break;
+    } else if ( (IF_BLOCK_ELSEIF == block_type || IF_BLOCK_ANY == block_type)
+      && (6 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSEIF"), 6)))
+    {
+
+      foundBlock = IF_BLOCK_ELSEIF;
+      break;
+    } else if ( (IF_BLOCK_ELSE == block_type || IF_BLOCK_ANY == block_type)
+      && (4 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSE"), 4)))
+    {
+
+      foundBlock = IF_BLOCK_ELSE;
+      break;
+    }
+  }
+  return foundBlock;
+}
+# 1543 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+void ExecuteCommandBlock(const char * commands, int len)
+{
+  char cmdbuff[len + 1];
+  memcpy(cmdbuff, commands, len);
+  cmdbuff[len] = '\0';
+
+
+  char oneCommand[len + 1];
+  int insertPosition = 0;
+  char * pos = cmdbuff;
+  int lenEndBlock = 0;
+  while (*pos) {
+    if (isspace(*pos) || '\x1e' == *pos || ';' == *pos) {
+      pos++;
+      continue;
+    }
+    if (strncasecmp_P(pos, PSTR("BACKLOG "), 8) == 0) {
+
+      pos += 8;
+      continue;
+    }
+    if (strncasecmp_P(pos, PSTR("IF "), 3) == 0) {
+
+
+      char *pEndif = pos + 3;
+      if (IF_BLOCK_ENDIF != findIfBlock(pEndif, lenEndBlock, IF_BLOCK_ENDIF)) {
+
+        break;
+      }
+
+      memcpy(oneCommand, pos, pEndif - pos);
+      oneCommand[pEndif - pos] = '\0';
+      pos = pEndif;
+    } else {
+
+      char *pEndOfCommand = strpbrk(pos, "\x1e;");
+      if (NULL == pEndOfCommand) {
+        pEndOfCommand = pos + strlen(pos);
+      }
+      memcpy(oneCommand, pos, pEndOfCommand - pos);
+      oneCommand[pEndOfCommand - pos] = '\0';
+      pos = pEndOfCommand;
+    }
+
+
+    String sCurrentCommand = oneCommand;
+    sCurrentCommand.trim();
+    if (sCurrentCommand.length() > 0
+      && backlog.size() < MAX_BACKLOG && !backlog_mutex)
+    {
+
+      backlog_mutex = true;
+      backlog.add(insertPosition, sCurrentCommand);
+      backlog_mutex = false;
+      insertPosition++;
+    }
+  }
+  return;
+}
+# 1613 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+void ProcessIfStatement(const char* statements)
+{
+  String conditionExpression;
+  int len = strlen(statements);
+  char statbuff[len + 1];
+  memcpy(statbuff, statements, len + 1);
+  char *pos = statbuff;
+  int lenEndBlock = 0;
+  while (true) {
+
+
+    while (*pos && *pos != '(') {
+      pos++;
+    }
+    if (0 == *pos) { break; }
+    char * posEnd = findClosureBracket(pos);
+
+    if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) {
+
+      char * cmdBlockStart = posEnd + 1;
+      char * cmdBlockEnd = cmdBlockStart;
+      int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ANY);
+      if (IF_BLOCK_INVALID == nextBlock) {
+
+        break;
+      }
+      ExecuteCommandBlock(cmdBlockStart, cmdBlockEnd - cmdBlockStart - lenEndBlock);
+      pos = cmdBlockEnd;
+      break;
+    } else {
+      pos = posEnd + 1;
+      int8_t nextBlock = findIfBlock(pos, lenEndBlock, IF_BLOCK_ANY);
+      if (IF_BLOCK_ELSEIF == nextBlock) {
+
+        continue;
+      } else if (IF_BLOCK_ELSE == nextBlock) {
+
+        char * cmdBlockEnd = pos;
+        int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ENDIF);
+        if (IF_BLOCK_ENDIF != nextBlock) {
+
+          break;
+        }
+        ExecuteCommandBlock(pos, cmdBlockEnd - pos - lenEndBlock);
+        break;
+      } else {
+
+        break;
+      }
+    }
+  }
+}
+# 1677 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
+void RulesPreprocessCommand(char *pCommands)
+{
+  char * cmd = pCommands;
+  int lenEndBlock = 0;
+  while (*cmd) {
+
+    if (';' == *cmd || isspace(*cmd)) {
+      cmd++;
+    }
+    else if (strncasecmp_P(cmd, PSTR("IF "), 3) == 0) {
+
+      char * pIfStart = cmd;
+      char * pIfEnd = pIfStart + 3;
+
+      if (IF_BLOCK_ENDIF == findIfBlock(pIfEnd, lenEndBlock, IF_BLOCK_ENDIF)) {
+
+        cmd = pIfEnd;
+
+
+        while (pIfStart < pIfEnd) {
+          if (';' == *pIfStart)
+            *pIfStart = '\x1e';
+          pIfStart++;
+        }
+      }
+      else {
+        break;
+      }
+    }
+    else {
+      while (*cmd && ';' != *cmd) {
+        cmd++;
+      }
+    }
+  }
+  return;
+}
+#endif
+
+
+
+
+
+void CmndRule(void)
+{
+  uint8_t index = XdrvMailbox.index;
+  if ((index > 0) && (index <= MAX_RULE_SETS)) {
+    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(Settings.rules[index -1]))) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 10)) {
+        switch (XdrvMailbox.payload) {
+        case 0:
+        case 1:
+          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
+          break;
+        case 2:
+          bitWrite(Settings.rule_enabled, index -1, bitRead(Settings.rule_enabled, index -1) ^1);
+          break;
+        case 4:
+        case 5:
+          bitWrite(Settings.rule_once, index -1, XdrvMailbox.payload &1);
+          break;
+        case 6:
+          bitWrite(Settings.rule_once, index -1, bitRead(Settings.rule_once, index -1) ^1);
+          break;
+        case 8:
+        case 9:
+          bitWrite(Settings.rule_stop, index -1, XdrvMailbox.payload &1);
+          break;
+        case 10:
+          bitWrite(Settings.rule_stop, index -1, bitRead(Settings.rule_stop, index -1) ^1);
+          break;
+        }
+      } else {
+        int offset = 0;
+        if ('+' == XdrvMailbox.data[0]) {
+          offset = strlen(Settings.rules[index -1]);
+          if (XdrvMailbox.data_len < (sizeof(Settings.rules[index -1]) - offset -1)) {
+            XdrvMailbox.data[0] = ' ';
+          } else {
+            offset = -1;
+          }
+        }
+        if (offset != -1) {
+          strlcpy(Settings.rules[index -1] + offset, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(Settings.rules[index -1]));
+        }
+      }
+      Rules.triggers[index -1] = 0;
+    }
+    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s%d\":\"%s\",\"Once\":\"%s\",\"StopOnError\":\"%s\",\"Free\":%d,\"Rules\":\"%s\"}"),
+      XdrvMailbox.command, index, GetStateText(bitRead(Settings.rule_enabled, index -1)), GetStateText(bitRead(Settings.rule_once, index -1)),
+      GetStateText(bitRead(Settings.rule_stop, index -1)), sizeof(Settings.rules[index -1]) - strlen(Settings.rules[index -1]) -1, Settings.rules[index -1]);
+  }
+}
+
+void CmndRuleTimer(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_TIMERS)) {
+    if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+      float timer_set = evaluateExpression(XdrvMailbox.data, XdrvMailbox.data_len);
+      Rules.timer[XdrvMailbox.index -1] = (timer_set > 0) ? millis() + (1000 * timer_set) : 0;
+#else
+      Rules.timer[XdrvMailbox.index -1] = (XdrvMailbox.payload > 0) ? millis() + (1000 * XdrvMailbox.payload) : 0;
+#endif
+    }
+    mqtt_data[0] = '\0';
+    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
+      ResponseAppend_P(PSTR("%c\"T%d\":%d"), (i) ? ',' : '{', i +1, (Rules.timer[i]) ? (Rules.timer[i] - millis()) / 1000 : 0);
+    }
+    ResponseJsonEnd();
+  }
+}
+
+void CmndEvent(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    strlcpy(Rules.event_data, XdrvMailbox.data, sizeof(Rules.event_data));
+  }
+  ResponseCmndDone();
+}
+
+void CmndVariable(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (!XdrvMailbox.usridx) {
+      mqtt_data[0] = '\0';
+      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
+        ResponseAppend_P(PSTR("%c\"Var%d\":\"%s\""), (i) ? ',' : '{', i +1, rules_vars[i]);
+      }
+      ResponseJsonEnd();
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+        if (XdrvMailbox.data[0] == '=') {
+          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+        } else {
+          strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
+        }
+#else
+        strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
+#endif
+        bitSet(Rules.vars_event, XdrvMailbox.index -1);
+      }
+      ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+    }
+  }
+}
+
+void CmndMemory(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_MEMS)) {
+    if (!XdrvMailbox.usridx) {
+      ResponseCmndAll(SET_MEM1, MAX_RULE_MEMS);
+    } else {
+      if (XdrvMailbox.data_len > 0) {
+#ifdef USE_EXPRESSION
+        if (XdrvMailbox.data[0] == '=') {
+          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, SettingsText(SET_MEM1 + XdrvMailbox.index -1));
+        } else {
+          SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+        }
+#else
+        SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
+#endif
+        bitSet(Rules.mems_event, XdrvMailbox.index -1);
+      }
+      ResponseCmndIdxChar(SettingsText(SET_MEM1 + XdrvMailbox.index -1));
+    }
+  }
+}
+
+void CmndCalcResolution(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
+    Settings.flag2.calc_resolution = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.calc_resolution);
+}
+
+void CmndAddition(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) + CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndSubtract(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) - CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndMultiply(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) * CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+      bitSet(Rules.vars_event, XdrvMailbox.index -1);
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndScale(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
+    if (XdrvMailbox.data_len > 0) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len +1];
+
+        float valueIN = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        float fromLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        float fromHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        float toLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4));
+        float toHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 5));
+        float value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
+        dtostrfd(value, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
+        bitSet(Rules.vars_event, XdrvMailbox.index -1);
+      }
+    }
+    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
+  }
+}
+
+float map_double(float x, float in_min, float in_max, float out_min, float out_max)
+{
+  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+
+
+
+
+bool Xdrv10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_50_MSECOND:
+      RulesEvery50ms();
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      RulesEvery100ms();
+      break;
+    case FUNC_EVERY_SECOND:
+      RulesEverySecond();
+      break;
+    case FUNC_SET_POWER:
+      RulesSetPower();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kRulesCommands, RulesCommand);
+      break;
+    case FUNC_RULES_PROCESS:
+      result = RulesProcess();
+      break;
+    case FUNC_SAVE_BEFORE_RESTART:
+      RulesSaveBeforeRestart();
+      break;
+#ifdef SUPPORT_MQTT_EVENT
+    case FUNC_MQTT_DATA:
+      result = RulesMqttData();
+      break;
+#endif
+    case FUNC_PRE_INIT:
+      RulesInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+#ifdef USE_SCRIPT
+#ifndef USE_RULES
+# 40 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+#define XDRV_10 10
+#define XI2C_37 37
+
+#define SCRIPT_DEBUG 0
+
+
+#ifndef MAXVARS
+#define MAXVARS 50
+#endif
+#ifndef MAXSVARS
+#define MAXSVARS 5
+#endif
+#define MAXNVARS MAXVARS-MAXSVARS
+
+#define MAXFILT 5
+#define SCRIPT_SVARSIZE 20
+#define SCRIPT_MAXSSIZE 48
+#define SCRIPT_EOL '\n'
+#define SCRIPT_FLOAT_PRECISION 2
+#define PMEM_SIZE sizeof(Settings.script_pram)
+#define SCRIPT_MAXPERM (PMEM_SIZE)-4/sizeof(float)
+#define MAX_SCRIPT_SIZE MAX_RULE_SIZE*MAX_RULE_SETS
+
+
+#define EPOCH_OFFSET 1546300800
+
+enum {OPER_EQU=1,OPER_PLS,OPER_MIN,OPER_MUL,OPER_DIV,OPER_PLSEQU,OPER_MINEQU,OPER_MULEQU,OPER_DIVEQU,OPER_EQUEQU,OPER_NOTEQU,OPER_GRTEQU,OPER_LOWEQU,OPER_GRT,OPER_LOW,OPER_PERC,OPER_XOR,OPER_AND,OPER_OR,OPER_ANDEQU,OPER_OREQU,OPER_XOREQU,OPER_PERCEQU};
+enum {SCRIPT_LOGLEVEL=1,SCRIPT_TELEPERIOD};
+
+#ifdef USE_SCRIPT_FATFS
+#include <SPI.h>
+#include <SD.h>
+#ifndef FAT_SCRIPT_SIZE
+#define FAT_SCRIPT_SIZE 4096
+#endif
+#define FAT_SCRIPT_NAME "script.txt"
+#if USE_LONG_FILE_NAMES==1
+#warning ("FATFS long filenames not supported");
+#endif
+#if USE_STANDARD_SPI_LIBRARY==0
+#warning ("FATFS standard spi should be used");
+#endif
+#endif
+
+#ifdef SUPPORT_MQTT_EVENT
+  #include <LinkedList.h>
+  typedef struct {
+    String Event;
+    String Topic;
+    String Key;
+  } MQTT_Subscription;
+  LinkedList<MQTT_Subscription> subscriptions;
+#endif
+
+#ifdef USE_DISPLAY
+#ifdef USE_TOUCH_BUTTONS
+#include <renderer.h>
+extern VButton *buttons[MAXBUTTONS];
+#endif
+#endif
+
+typedef union {
+  uint8_t data;
+  struct {
+    uint8_t is_string : 1;
+    uint8_t is_permanent : 1;
+    uint8_t is_timer : 1;
+    uint8_t is_autoinc : 1;
+    uint8_t changed : 1;
+    uint8_t settable : 1;
+    uint8_t is_filter : 1;
+    uint8_t constant : 1;
+  };
+} SCRIPT_TYPE;
+
+struct T_INDEX {
+  uint8_t index;
+  SCRIPT_TYPE bits;
+};
+
+struct M_FILT {
+  uint8_t numvals;
+  uint8_t index;
+  float maccu;
+  float rbuff[1];
+};
+
+typedef union {
+  uint8_t data;
+  struct {
+      uint8_t nutu8 : 1;
+      uint8_t nutu7 : 1;
+      uint8_t nutu6 : 1;
+      uint8_t nutu5 : 1;
+      uint8_t nutu4 : 1;
+      uint8_t nutu3 : 1;
+      uint8_t is_dir : 1;
+      uint8_t is_open : 1;
+  };
+} FILE_FLAGS;
+
+#define SFS_MAX 4
+
+struct SCRIPT_MEM {
+    float *fvars;
+    float *s_fvars;
+    struct T_INDEX *type;
+    struct M_FILT *mfilt;
+    char *glob_vnp;
+    uint8_t *vnp_offset;
+    char *glob_snp;
+    char *scriptptr;
+    char *section_ptr;
+    char *scriptptr_bu;
+    char *script_ram;
+    uint16_t script_size;
+    uint8_t *script_pram;
+    uint16_t script_pram_size;
+    uint8_t numvars;
+    void *script_mem;
+    uint16_t script_mem_size;
+    uint8_t script_dprec;
+    uint8_t var_not_found;
+    uint8_t glob_error;
+    uint8_t max_ssize;
+    uint8_t script_loglevel;
+    uint8_t flags;
+#ifdef USE_SCRIPT_FATFS
+    File files[SFS_MAX];
+    FILE_FLAGS file_flags[SFS_MAX];
+    uint8_t script_sd_found;
+    char flink[2][14];
+#endif
+} glob_script_mem;
+
+
+int16_t last_findex;
+uint8_t tasm_cmd_activ=0;
+uint8_t fast_script=0;
+uint32_t script_lastmillis;
+
+
+#ifdef USE_BUTTON_EVENT
+int8_t script_button[MAX_KEYS];
+#endif
+
+char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo);
+char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo);
+char *ForceStringVar(char *lp,char *dstr);
+void send_download(void);
+uint8_t reject(char *name);
+
+void ScriptEverySecond(void) {
+
+  if (bitRead(Settings.rule_enabled, 0)) {
+    struct T_INDEX *vtp=glob_script_mem.type;
+    float delta=(millis()-script_lastmillis)/1000;
+    script_lastmillis=millis();
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_timer) {
+
+        float *fp=&glob_script_mem.fvars[vtp[count].index];
+        if (*fp>0) {
+
+          *fp-=delta;
+          if (*fp<0) *fp=0;
+        }
+      }
+      if (vtp[count].bits.is_autoinc) {
+
+        float *fp=&glob_script_mem.fvars[vtp[count].index];
+        if (*fp>=0) {
+          *fp+=delta;
+        }
+      }
+    }
+    Run_Scripter(">S",2,0);
+  }
+}
+
+void RulesTeleperiod(void) {
+  if (bitRead(Settings.rule_enabled, 0) && mqtt_data[0]) Run_Scripter(">T",2, mqtt_data);
+}
+
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+
+#include <Eeprom24C128_256.h>
+#define EEPROM_ADDRESS 0x50
+
+#ifndef EEP_SCRIPT_SIZE
+#define EEP_SCRIPT_SIZE 4095
+#endif
+
+
+static Eeprom24C128_256 eeprom(EEPROM_ADDRESS);
+
+#define EEP_WRITE(A,B,C) eeprom.writeBytes(A,B,(uint8_t*)C);
+
+#define EEP_READ(A,B,C) eeprom.readBytes(A,B,(uint8_t*)C);
+#endif
+#endif
+
+#define SCRIPT_SKIP_SPACES while (*lp==' ' || *lp=='\t') lp++;
+#define SCRIPT_SKIP_EOL while (*lp==SCRIPT_EOL) lp++;
+
+
+int16_t Init_Scripter(void) {
+char *script;
+
+    script=glob_script_mem.script_ram;
+
+
+    uint16_t lines=0,nvars=0,svars=0,vars=0;
+    char *lp=script;
+    char vnames[MAXVARS*10];
+    char *vnames_p=vnames;
+    char *vnp[MAXVARS];
+    char **vnp_p=vnp;
+    char strings[MAXSVARS*SCRIPT_MAXSSIZE];
+    struct M_FILT mfilt[MAXFILT];
+
+    char *strings_p=strings;
+    char *snp[MAXSVARS];
+    char **snp_p=snp;
+    uint8_t numperm=0,numflt=0,count;
+
+    glob_script_mem.max_ssize=SCRIPT_SVARSIZE;
+    glob_script_mem.scriptptr=0;
+
+    if (!*script) return -999;
+
+    float fvalues[MAXVARS];
+    struct T_INDEX vtypes[MAXVARS];
+    char init=0;
+    while (1) {
+
+
+        SCRIPT_SKIP_SPACES
+
+        if (*lp=='\n' || *lp=='\r') goto next_line;
+
+        if (*lp==';') goto next_line;
+        if (init) {
+
+            if (*lp=='>') {
+                init=0;
+                break;
+            }
+            char *op=strchr(lp,'=');
+            if (op) {
+                vtypes[vars].bits.data=0;
+
+                if (*lp=='p' && *(lp+1)==':') {
+                    lp+=2;
+                    if (numperm<SCRIPT_MAXPERM) {
+                      vtypes[vars].bits.is_permanent=1;
+                      numperm++;
+                    }
+                } else {
+                    vtypes[vars].bits.is_permanent=0;
+                }
+                if (*lp=='t' && *(lp+1)==':') {
+                    lp+=2;
+                    vtypes[vars].bits.is_timer=1;
+                } else {
+                    vtypes[vars].bits.is_timer=0;
+                }
+                if (*lp=='i' && *(lp+1)==':') {
+                    lp+=2;
+                    vtypes[vars].bits.is_autoinc=1;
+                } else {
+                    vtypes[vars].bits.is_autoinc=0;
+                }
+                if ((*lp=='m' || *lp=='M') && *(lp+1)==':') {
+                    uint8_t flg=*lp;
+                    lp+=2;
+                    if (flg=='M') mfilt[numflt].numvals=8;
+                    else mfilt[numflt].numvals=5;
+                    vtypes[vars].bits.is_filter=1;
+                    mfilt[numflt].index=0;
+                    if (flg=='M') {
+                      mfilt[numflt].numvals|=0x80;
+                    }
+                    vtypes[vars].index=numflt;
+                    numflt++;
+                    if (numflt>MAXFILT) {
+                      return -6;
+                    }
+                } else {
+                    vtypes[vars].bits.is_filter=0;
+                }
+                *vnp_p++=vnames_p;
+                while (lp<op) {
+                    *vnames_p++=*lp++;
+                }
+                *vnames_p++=0;
+
+                op++;
+                if (*op!='"') {
+                    float fv;
+                    if (*op=='0' && *(op+1)=='x') {
+                      op+=2;
+                      fv=strtol(op,&op,16);
+                    } else {
+                      fv=CharToFloat(op);
+                    }
+                    fvalues[nvars]=fv;
+                    vtypes[vars].bits.is_string=0;
+                    if (!vtypes[vars].bits.is_filter) vtypes[vars].index=nvars;
+                    nvars++;
+                    if (nvars>MAXNVARS) {
+                      return -1;
+                    }
+                    if (vtypes[vars].bits.is_filter) {
+                      while (isdigit(*op) || *op=='.' || *op=='-') {
+                        op++;
+                      }
+                      while (*op==' ') op++;
+                      if (isdigit(*op)) {
+
+                        uint8_t flen=atoi(op);
+                        mfilt[numflt-1].numvals&=0x80;
+                        mfilt[numflt-1].numvals|=flen&0x7f;
+                      }
+                    }
+
+                } else {
+
+                    op++;
+                    *snp_p++=strings_p;
+                    while (*op!='\"') {
+                      if (*op==SCRIPT_EOL) break;
+                      *strings_p++=*op++;
+                    }
+                    *strings_p++=0;
+                    vtypes[vars].bits.is_string=1;
+                    vtypes[vars].index=svars;
+                    svars++;
+                    if (svars>MAXSVARS) {
+                      return -2;
+                    }
+                }
+                vars++;
+                if (vars>MAXVARS) {
+                  return -3;
+                }
+            }
+        } else {
+            if (!strncmp(lp,">D",2)) {
+              lp+=2;
+              SCRIPT_SKIP_SPACES
+              if (isdigit(*lp)) {
+                uint8_t ssize=atoi(lp)+1;
+                if (ssize<10 || ssize>SCRIPT_MAXSSIZE) ssize=SCRIPT_MAXSSIZE;
+                glob_script_mem.max_ssize=ssize;
+              }
+              init=1;
+            }
+        }
+
+    next_line:
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+    }
+
+    uint16_t fsize=0;
+    for (count=0; count<numflt; count++) {
+      fsize+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
+    }
+
+
+    uint16_t script_mem_size=
+
+    (sizeof(float)*nvars)+
+    (sizeof(float)*nvars)+
+
+    (vnames_p-vnames)+
+
+    (sizeof(uint8_t)*vars)+
+
+    (glob_script_mem.max_ssize*svars)+
+
+    (sizeof(struct T_INDEX)*vars)+
+    fsize;
+
+    script_mem_size+=16;
+    uint8_t *script_mem;
+    script_mem=(uint8_t*)calloc(script_mem_size,1);
+    if (!script_mem) {
+      return -4;
+    }
+    glob_script_mem.script_mem=script_mem;
+    glob_script_mem.script_mem_size=script_mem_size;
+
+
+
+    glob_script_mem.fvars=(float*)script_mem;
+    uint16_t size=sizeof(float)*nvars;
+    memcpy(script_mem,fvalues,size);
+    script_mem+=size;
+    glob_script_mem.s_fvars=(float*)script_mem;
+    size=sizeof(float)*nvars;
+    memcpy(script_mem,fvalues,size);
+    script_mem+=size;
+
+    glob_script_mem.mfilt=(struct M_FILT*)script_mem;
+    script_mem+=fsize;
+
+
+    glob_script_mem.type=(struct T_INDEX*)script_mem;
+    size=sizeof(struct T_INDEX)*vars;
+    memcpy(script_mem,vtypes,size);
+    script_mem+=size;
+
+
+    char *namep=(char*)script_mem;
+    glob_script_mem.glob_vnp=(char*)script_mem;
+    size=vnames_p-vnames;
+    memcpy(script_mem,vnames,size);
+    script_mem+=size;
+
+    glob_script_mem.vnp_offset=(uint8_t*)script_mem;
+    size=vars*sizeof(uint8_t);
+    script_mem+=size;
+
+
+    char *snamep=(char*)script_mem;
+    glob_script_mem.glob_snp=(char*)script_mem;
+    size=glob_script_mem.max_ssize*svars;
+
+    script_mem+=size;
+
+
+    uint16_t index=0;
+    uint8_t *cp=glob_script_mem.vnp_offset;
+    for (count=0;count<vars;count++) {
+        *cp++=index;
+        while (*namep) {
+            index++;
+            namep++;
+        }
+        namep++;
+        index++;
+        if (index>255) {
+          free(glob_script_mem.script_mem);
+          return -5;
+        }
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Script: nv=%d, tv=%d, vns=%d, ram=%d"), nvars, svars, index, glob_script_mem.script_mem_size);
+
+
+    char *cp1=glob_script_mem.glob_snp;
+    char *sp=strings;
+    for (count=0; count<svars;count++) {
+        strcpy(cp1,sp);
+        sp+=strlen(sp)+1;
+        cp1+=glob_script_mem.max_ssize;
+    }
+
+
+    uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+    for (count=0; count<numflt; count++) {
+      struct M_FILT *mflp=(struct M_FILT*)mp;
+      mflp->numvals=mfilt[count].numvals;
+      mp+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
+    }
+
+    glob_script_mem.numvars=vars;
+    glob_script_mem.script_dprec=SCRIPT_FLOAT_PRECISION;
+    glob_script_mem.script_loglevel=LOG_LEVEL_INFO;
+
+
+#if SCRIPT_DEBUG>2
+    struct T_INDEX *dvtp=glob_script_mem.type;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (dvtp[count].bits.is_string) {
+
+      } else {
+        char string[32];
+        dtostrfd(glob_script_mem.fvars[dvtp[count].index],glob_script_mem.script_dprec,string);
+        toLog(string);
+      }
+    }
+#endif
+
+
+    float *fp=(float*)glob_script_mem.script_pram;
+    struct T_INDEX *vtp=glob_script_mem.type;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
+        uint8_t index=vtp[count].index;
+        if (!isnan(*fp)) {
+          glob_script_mem.fvars[index]=*fp;
+        } else {
+          *fp=glob_script_mem.fvars[index];
+        }
+        fp++;
+      }
+    }
+    sp=(char*)fp;
+    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+      if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
+        uint8_t index=vtp[count].index;
+        char *dp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
+        uint8_t slen=strlen(sp);
+        strlcpy(dp,sp,glob_script_mem.max_ssize);
+        sp+=slen+1;
+      }
+    }
+
+
+#ifdef USE_SCRIPT_FATFS
+    if (!glob_script_mem.script_sd_found) {
+      if (SD.begin(USE_SCRIPT_FATFS)) {
+        glob_script_mem.script_sd_found=1;
+      } else {
+        glob_script_mem.script_sd_found=0;
+      }
+    }
+    for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
+      glob_script_mem.file_flags[cnt].is_open=0;
+    }
+#endif
+
+#if SCRIPT_DEBUG>0
+    ClaimSerial();
+    SetSerialBaudrate(9600);
+#endif
+
+
+    glob_script_mem.scriptptr=lp-1;
+    glob_script_mem.scriptptr_bu=glob_script_mem.scriptptr;
+    return 0;
+
+}
+
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+void ws2812_set_array(float *array ,uint8_t len) {
+
+  Ws2812ForceSuspend();
+  for (uint8_t cnt=0;cnt<len;cnt++) {
+    if (cnt>Settings.light_pixels) break;
+    uint32_t col=array[cnt];
+    Ws2812SetColor(cnt+1,col>>16,col>>8,col,0);
+  }
+  Ws2812ForceUpdate();
+}
+#endif
+#endif
+
+#define NUM_RES 0xfe
+#define STR_RES 0xfd
+#define VAR_NV 0xff
+
+#define NTYPE 0
+#define STYPE 0x80
+
+#ifndef FLT_MAX
+#define FLT_MAX 99999999
+#endif
+
+float median_array(float *array,uint8_t len) {
+    uint8_t ind[len];
+    uint8_t mind=0,index=0,flg;
+    float min=FLT_MAX;
+
+    for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
+        for (uint8_t mcnt=0; mcnt<len; mcnt++) {
+            flg=0;
+            for (uint8_t icnt=0; icnt<index; icnt++) {
+                if (ind[icnt]==mcnt) {
+                    flg=1;
+                }
+            }
+            if (!flg) {
+                if (array[mcnt]<min) {
+                    min=array[mcnt];
+                    mind=mcnt;
+                }
+            }
+        }
+        ind[index]=mind;
+        index++;
+        min=FLT_MAX;
+    }
+    return array[ind[len/2]];
+}
+
+
+float *Get_MFAddr(uint8_t index,uint8_t *len) {
+  *len=0;
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        *len=mflp->numvals&0x7f;
+        return mflp->rbuff;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+
+float Get_MFVal(uint8_t index,uint8_t bind) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        uint8_t maxind=mflp->numvals&0x7f;
+        if (!bind) {
+          return mflp->index;
+        }
+        if (bind<1 || bind>maxind) bind=maxind;
+        return mflp->rbuff[bind-1];
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+void Set_MFVal(uint8_t index,uint8_t bind,float val) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+        uint8_t maxind=mflp->numvals&0x7f;
+        if (!bind) {
+          mflp->index=val;
+        } else {
+          if (bind<1 || bind>maxind) bind=maxind;
+          mflp->rbuff[bind-1]=val;
+        }
+        return;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+}
+
+
+float Get_MFilter(uint8_t index) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+      if (mflp->numvals&0x80) {
+
+        return mflp->maccu/(mflp->numvals&0x7f);
+      } else {
+
+        return median_array(mflp->rbuff,mflp->numvals);
+      }
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+  return 0;
+}
+
+void Set_MFilter(uint8_t index, float invar) {
+  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
+  for (uint8_t count=0; count<MAXFILT; count++) {
+    struct M_FILT *mflp=(struct M_FILT*)mp;
+    if (count==index) {
+      if (mflp->numvals&0x80) {
+
+        mflp->maccu-=mflp->rbuff[mflp->index];
+        mflp->maccu+=invar;
+        mflp->rbuff[mflp->index]=invar;
+        mflp->index++;
+        if (mflp->index>=(mflp->numvals&0x7f)) mflp->index=0;
+      } else {
+
+        mflp->rbuff[mflp->index]=invar;
+        mflp->index++;
+        if (mflp->index>=mflp->numvals) mflp->index=0;
+      }
+      break;
+    }
+    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
+  }
+}
+
+#define MEDIAN_SIZE 5
+#define MEDIAN_FILTER_NUM 2
+
+struct MEDIAN_FILTER {
+float buffer[MEDIAN_SIZE];
+int8_t index;
+} script_mf[MEDIAN_FILTER_NUM];
+
+float DoMedian5(uint8_t index, float in) {
+
+  if (index>=MEDIAN_FILTER_NUM) index=0;
+
+  struct MEDIAN_FILTER* mf=&script_mf[index];
+  mf->buffer[mf->index]=in;
+  mf->index++;
+  if (mf->index>=MEDIAN_SIZE) mf->index=0;
+  return median_array(mf->buffer,MEDIAN_SIZE);
+}
+
+#ifdef USE_LIGHT
+
+uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
+float r = 0, g = 0, b = 0;
+struct HSV {
+ float H;
+ float S;
+ float V;
+} hsv;
+
+hsv.H=hue;
+hsv.S=(float)saturation/100.0;
+hsv.V=(float)value/100.0;
+
+if (hsv.S == 0) {
+  r = hsv.V;
+  g = hsv.V;
+  b = hsv.V;
+ } else {
+  int i;
+  float f, p, q, t;
+
+  if (hsv.H == 360)
+   hsv.H = 0;
+  else
+   hsv.H = hsv.H / 60;
+
+  i = (int)trunc(hsv.H);
+  f = hsv.H - i;
+
+  p = hsv.V * (1.0 - hsv.S);
+  q = hsv.V * (1.0 - (hsv.S * f));
+  t = hsv.V * (1.0 - (hsv.S * (1.0 - f)));
+
+  switch (i)
+  {
+  case 0:
+   r = hsv.V;
+   g = t;
+   b = p;
+   break;
+
+  case 1:
+   r = q;
+   g = hsv.V;
+   b = p;
+   break;
+
+  case 2:
+   r = p;
+   g = hsv.V;
+   b = t;
+   break;
+
+  case 3:
+   r = p;
+   g = q;
+   b = hsv.V;
+   break;
+
+  case 4:
+   r = t;
+   g = p;
+   b = hsv.V;
+   break;
+
+  default:
+   r = hsv.V;
+   g = p;
+   b = q;
+   break;
+  }
+
+ }
+
+  uint8_t ir,ig,ib;
+  ir=r*255;
+  ig=g*255;
+  ib=b*255;
+
+ uint32_t rgb=(ir<<16)|(ig<<8)|ib;
+ return rgb;
+}
+#endif
+
+
+
+
+char *isvar(char *lp, uint8_t *vtype,struct T_INDEX *tind,float *fp,char *sp,JsonObject *jo) {
+    uint16_t count,len=0;
+    uint8_t nres=0;
+    char vname[32];
+    float fvar=0;
+    tind->index=0;
+    tind->bits.data=0;
+
+    if (isdigit(*lp) || (*lp=='-' && isdigit(*(lp+1))) || *lp=='.') {
+
+        if (fp) {
+          if (*lp=='0' && *(lp+1)=='x') {
+            lp+=2;
+            *fp=strtol(lp,0,16);
+          } else {
+            *fp=CharToFloat(lp);
+          }
+        }
+        if (*lp=='-') lp++;
+        while (isdigit(*lp) || *lp=='.') {
+          if (*lp==0 || *lp==SCRIPT_EOL) break;
+          lp++;
+        }
+        tind->bits.constant=1;
+        tind->bits.is_string=0;
+        *vtype=NUM_RES;
+        return lp;
+    }
+    if (*lp=='"') {
+      lp++;
+      while (*lp!='"') {
+        if (*lp==0 || *lp==SCRIPT_EOL) break;
+        uint8_t iob=*lp;
+        if (iob=='\\') {
+          lp++;
+          if (*lp=='t') {
+            iob='\t';
+          } else if (*lp=='n') {
+            iob='\n';
+          } else if (*lp=='r') {
+            iob='\r';
+          } else if (*lp=='\\') {
+            iob='\\';
+          } else {
+            lp--;
+          }
+          if (sp) *sp++=iob;
+        } else {
+          if (sp) *sp++=iob;
+        }
+        lp++;
+      }
+      if (sp) *sp=0;
+      *vtype=STR_RES;
+      tind->bits.constant=1;
+      tind->bits.is_string=1;
+      return lp+1;
+    }
+
+    if (*lp=='-') {
+
+      nres=1;
+      lp++;
+    }
+
+    const char *term="\n\r ])=+-/*%><!^&|}";
+    for (count=0; count<sizeof(vname); count++) {
+        char iob=lp[count];
+        if (!iob || strchr(term,iob)) {
+            vname[count]=0;
+            break;
+        }
+        vname[count]=iob;
+        len+=1;
+    }
+
+    if (!vname[0]) {
+
+      *vtype=VAR_NV;
+      tind->index=VAR_NV;
+      glob_script_mem.var_not_found=1;
+      return lp;
+    }
+
+    struct T_INDEX *vtp=glob_script_mem.type;
+    char dvnam[32];
+    strcpy (dvnam,vname);
+    uint8_t olen=len;
+    last_findex=-1;
+    char *ja=strchr(dvnam,'[');
+    if (ja) {
+      *ja=0;
+      ja++;
+      olen=strlen(dvnam);
+    }
+    for (count=0; count<glob_script_mem.numvars; count++) {
+        char *cp=glob_script_mem.glob_vnp+glob_script_mem.vnp_offset[count];
+        uint8_t slen=strlen(cp);
+        if (slen==olen && *cp==dvnam[0]) {
+            if (!strncmp(cp,dvnam,olen)) {
+                uint8_t index=vtp[count].index;
+                *tind=vtp[count];
+                tind->index=count;
+                if (vtp[count].bits.is_string==0) {
+                    *vtype=NTYPE|index;
+                    if (vtp[count].bits.is_filter) {
+                      if (ja) {
+                        lp+=olen+1;
+                        lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+                        last_findex=fvar;
+                        fvar=Get_MFVal(index,fvar);
+                        len=1;
+                      } else {
+                        fvar=Get_MFilter(index);
+                      }
+                    } else {
+                      fvar=glob_script_mem.fvars[index];
+                    }
+                    if (nres) fvar=-fvar;
+                    if (fp) *fp=fvar;
+                } else {
+                    *vtype=STYPE|index;
+                    if (sp) strlcpy(sp,glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize),SCRIPT_MAXSSIZE);
+                }
+                return lp+len;
+            }
+        }
+    }
+
+    if (jo) {
+
+      const char* str_value;
+      uint8_t aindex;
+      String vn;
+      char *ja=strchr(vname,'[');
+      if (ja) {
+
+        *ja=0;
+        ja++;
+
+        float fvar;
+        GetNumericResult(ja,OPER_EQU,&fvar,0);
+        aindex=fvar;
+        if (aindex<1 || aindex>6) aindex=1;
+        aindex--;
+      }
+      if (jo->success()) {
+        char *subtype=strchr(vname,'#');
+        char *subtype2;
+        if (subtype) {
+          *subtype=0;
+          subtype++;
+          subtype2=strchr(subtype,'#');
+          if (subtype2) {
+            *subtype2=0;
+            *subtype2++;
+          }
+        }
+        vn=vname;
+        str_value = (*jo)[vn];
+        if ((*jo)[vn].success()) {
+          if (subtype) {
+            JsonObject &jobj1=(*jo)[vn];
+            if (jobj1.success()) {
+              vn=subtype;
+              jo=&jobj1;
+              str_value = (*jo)[vn];
+              if ((*jo)[vn].success()) {
+
+                if (subtype2) {
+                  JsonObject &jobj2=(*jo)[vn];
+                  if ((*jo)[vn].success()) {
+                    vn=subtype2;
+                    jo=&jobj2;
+                    str_value = (*jo)[vn];
+                    if ((*jo)[vn].success()) {
+                      goto skip;
+                    } else {
+                      goto chknext;
+                    }
+                  } else {
+                    goto chknext;
+                  }
+                }
+
+                goto skip;
+              }
+            } else {
+              goto chknext;
+            }
+          }
+          skip:
+          if (ja) {
+
+            str_value = (*jo)[vn][aindex];
+          }
+          if (str_value && *str_value) {
+            if ((*jo).is<char*>(vn)) {
+              if (!strncmp(str_value,"ON",2)) {
+                if (fp) *fp=1;
+                goto nexit;
+              } else if (!strncmp(str_value,"OFF",3)) {
+                if (fp) *fp=0;
+                goto nexit;
+              } else {
+                *vtype=STR_RES;
+                tind->bits.constant=1;
+                tind->bits.is_string=1;
+                if (sp) strlcpy(sp,str_value,SCRIPT_MAXSSIZE);
+                return lp+len;
+              }
+
+            } else {
+              if (fp) {
+                if (!strncmp(vn.c_str(),"Epoch",5)) {
+                  *fp=atoi(str_value)-(uint32_t)EPOCH_OFFSET;
+                } else {
+                  *fp=CharToFloat((char*)str_value);
+                }
+              }
+              nexit:
+              *vtype=NUM_RES;
+              tind->bits.constant=1;
+              tind->bits.is_string=0;
+              return lp+len;
+            }
+          }
+        }
+      }
+    }
+
+chknext:
+    switch (vname[0]) {
+      case 'a':
+#ifdef USE_ANGLE_FUNC
+        if (!strncmp(vname,"acos(",5)) {
+            lp+=5;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+            fvar=acosf(fvar);
+            lp++;
+            len=0;
+            goto exit;
+        }
+#endif
+        break;
+
+      case 'b':
+        if (!strncmp(vname,"boot",4)) {
+          if (rules_flag.system_boot) {
+            rules_flag.system_boot=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+#ifdef USE_BUTTON_EVENT
+        if (!strncmp(vname,"bt[",3)) {
+
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint32_t index=fvar;
+          if (index<1 || index>MAX_KEYS) index=1;
+          fvar=script_button[index-1];
+          script_button[index-1]|=0x80;
+          len++;
+          goto exit;
+        }
+#endif
+        break;
+      case 'c':
+        if (!strncmp(vname,"chg[",4)) {
+
+          struct T_INDEX ind;
+          uint8_t vtype;
+          isvar(vname+4,&vtype,&ind,0,0,0);
+          if (!ind.bits.constant) {
+            uint8_t index=glob_script_mem.type[ind.index].index;
+            if (glob_script_mem.fvars[index]!=glob_script_mem.s_fvars[index]) {
+
+              glob_script_mem.s_fvars[index]=glob_script_mem.fvars[index];
+              fvar=1;
+              len++;
+              goto exit;
+            } else {
+              fvar=0;
+              len++;
+              goto exit;
+            }
+          }
+        }
+        break;
+      case 'd':
+        if (!strncmp(vname,"day",3)) {
+          fvar=RtcTime.day_of_month;
+          goto exit;
+        }
+        break;
+      case 'e':
+        if (!strncmp(vname,"epoch",5)) {
+          fvar=UtcTime()-(uint32_t)EPOCH_OFFSET;
+          goto exit;
+        }
+        break;
+#ifdef USE_SCRIPT_FATFS
+      case 'f':
+        if (!strncmp(vname,"fo(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t mode=fvar;
+          fvar=-1;
+          for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
+            if (!glob_script_mem.file_flags[cnt].is_open) {
+              if (mode==0) {
+                glob_script_mem.files[cnt]=SD.open(str,FILE_READ);
+                if (glob_script_mem.files[cnt].isDirectory()) {
+                  glob_script_mem.files[cnt].rewindDirectory();
+                  glob_script_mem.file_flags[cnt].is_dir=1;
+                } else {
+                  glob_script_mem.file_flags[cnt].is_dir=0;
+                }
+              }
+              else glob_script_mem.files[cnt]=SD.open(str,FILE_WRITE);
+              if (glob_script_mem.files[cnt]) {
+                fvar=cnt;
+                glob_script_mem.file_flags[cnt].is_open=1;
+              } else {
+                AddLog_P(LOG_LEVEL_INFO,PSTR("file open failed"));
+              }
+              break;
+            }
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fc(",3)) {
+          lp+=3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          glob_script_mem.files[ind].close();
+          glob_script_mem.file_flags[ind].is_open=0;
+          fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"ff(",3)) {
+          lp+=3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          glob_script_mem.files[ind].flush();
+          fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fw(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=ForceStringVar(lp,str);
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t ind=fvar;
+          if (ind>=SFS_MAX) ind=SFS_MAX-1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar=glob_script_mem.files[ind].print(str);
+          } else {
+            fvar=0;
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fr(",3)) {
+          lp+=3;
+          struct T_INDEX ind;
+          uint8_t vtype;
+          uint8_t sindex=0;
+          lp=isvar(lp,&vtype,&ind,0,0,0);
+          if (vtype!=VAR_NV) {
+
+            if ((vtype&STYPE)==0) {
+
+                  fvar=0;
+                  goto exit;
+            } else {
+
+              sindex=glob_script_mem.type[ind.index].index;
+            }
+          } else {
+
+              fvar=0;
+              goto exit;
+          }
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          uint8_t find=fvar;
+          if (find>=SFS_MAX) find=SFS_MAX-1;
+          uint8_t index=0;
+          char str[glob_script_mem.max_ssize+1];
+          char *cp=str;
+          if (glob_script_mem.file_flags[find].is_open) {
+            if (glob_script_mem.file_flags[find].is_dir) {
+              while (true) {
+                File entry=glob_script_mem.files[find].openNextFile();
+                if (entry) {
+                  if (!reject((char*)entry.name())) {
+                    strcpy(str,entry.name());
+                    entry.close();
+                    break;
+                  }
+                } else {
+                  *cp=0;
+                  break;
+                }
+                entry.close();
+              }
+              index=strlen(str);
+            } else {
+              while (glob_script_mem.files[find].available()) {
+                uint8_t buf[1];
+                glob_script_mem.files[find].read(buf,1);
+                if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
+                  break;
+                } else {
+                  *cp++=buf[0];
+                  index++;
+                  if (index>=glob_script_mem.max_ssize-1) break;
+                }
+              }
+              *cp=0;
+            }
+          } else {
+            strcpy(str,"file error");
+          }
+          lp++;
+          strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+          fvar=index;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fd(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          SD.remove(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+#ifdef USE_SCRIPT_FATFS_EXT
+        if (!strncmp(vname,"fe(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+
+          File ef=SD.open(str);
+          if (ef) {
+            uint16_t fsiz=ef.size();
+            if (fsiz<2048) {
+              char *script=(char*)calloc(fsiz+16,1);
+              if (script) {
+                ef.read((uint8_t*)script,fsiz);
+                execute_script(script);
+                free(script);
+                fvar=1;
+              }
+            }
+            ef.close();
+          }
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fmd(",4)) {
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          fvar=SD.mkdir(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"frd(",4)) {
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          fvar=SD.rmdir(str);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fx(",3)) {
+          lp+=3;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          if (SD.exists(str)) fvar=1;
+          else fvar=0;
+          lp++;
+          len=0;
+          goto exit;
+        }
+#endif
+        if (!strncmp(vname,"fl1(",4) || !strncmp(vname,"fl2(",4) ) {
+          uint8_t lknum=*(lp+2)&3;
+          lp+=4;
+          char str[glob_script_mem.max_ssize+1];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          if (lknum<1 || lknum>2) lknum=1;
+          strlcpy(glob_script_mem.flink[lknum-1],str,14);
+          lp++;
+          fvar=0;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"fsm",3)) {
+          fvar=glob_script_mem.script_sd_found;
+
+          goto exit;
+        }
+        break;
+
+#endif
+      case 'g':
+        if (!strncmp(vname,"gtmp",4)) {
+          fvar=global_temperature;
+          goto exit;
+        }
+        if (!strncmp(vname,"ghum",4)) {
+          fvar=global_humidity;
+          goto exit;
+        }
+        if (!strncmp(vname,"gprs",4)) {
+          fvar=global_pressure;
+          goto exit;
+        }
+        if (!strncmp(vname,"gtopic",6)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTT_GRP_TOPIC),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        break;
+      case 'h':
+        if (!strncmp(vname,"hours",5)) {
+          fvar=RtcTime.hour;
+          goto exit;
+        }
+        if (!strncmp(vname,"heap",4)) {
+          fvar=ESP.getFreeHeap();
+          goto exit;
+        }
+        if (!strncmp(vname,"hn(",3)) {
+          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
+          if (fvar<0 || fvar>255) fvar=0;
+          lp++;
+          len=0;
+          if (sp) {
+            sprintf(sp,"%02x",(uint8_t)fvar);
+          }
+          goto strexit;
+        }
+        if (!strncmp(vname,"hx(",3)) {
+          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
+          lp++;
+          len=0;
+          if (sp) {
+            sprintf(sp,"%08x",(uint32_t)fvar);
+          }
+          goto strexit;
+        }
+#ifdef USE_LIGHT
+
+        if (!strncmp(vname,"hsvrgb(",7)) {
+          lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0);
+          if (fvar<0 || fvar>360) fvar=0;
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          if (fvar2<0 || fvar2>100) fvar2=0;
+          SCRIPT_SKIP_SPACES
+
+          float fvar3;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
+          if (fvar3<0 || fvar3>100) fvar3=0;
+
+          fvar=HSVToRGB(fvar,fvar2,fvar3);
+
+          lp++;
+          len=0;
+          goto exit;
+        }
+
+#endif
+        break;
+      case 'i':
+        if (!strncmp(vname,"int(",4)) {
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar,0);
+          fvar=floor(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        break;
+      case 'l':
+        if (!strncmp(vname,"loglvl",6)) {
+          fvar=glob_script_mem.script_loglevel;
+          tind->index=SCRIPT_LOGLEVEL;
+  exit_settable:
+          if (fp) *fp=fvar;
+          *vtype=NTYPE;
+          tind->bits.settable=1;
+          tind->bits.is_string=0;
+          return lp+len;
+        }
+        break;
+      case 'm':
+        if (!strncmp(vname,"med(",4)) {
+          float fvar1;
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          fvar=DoMedian5(fvar1,fvar2);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"micros",6)) {
+          fvar=micros();
+          goto exit;
+        }
+        if (!strncmp(vname,"millis",6)) {
+          fvar=millis();
+          goto exit;
+        }
+        if (!strncmp(vname,"mins",4)) {
+          fvar=RtcTime.minute;
+          goto exit;
+        }
+        if (!strncmp(vname,"month",5)) {
+          fvar=RtcTime.month;
+          goto exit;
+        }
+        if (!strncmp(vname,"mqttc",5)) {
+          if (rules_flag.mqtt_connected) {
+            rules_flag.mqtt_connected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"mqttd",5)) {
+          if (rules_flag.mqtt_disconnected) {
+            rules_flag.mqtt_disconnected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"mqtts",5)) {
+          fvar=!global_state.mqtt_down;
+          goto exit;
+        }
+        break;
+      case 'p':
+        if (!strncmp(vname,"pin[",4)) {
+
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          fvar=digitalRead((uint8_t)fvar);
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"pn[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          fvar=pin[(uint8_t)fvar];
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"pd[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint8_t gpiopin=fvar;
+          for (uint8_t i=0;i<GPIO_SENSOR_END;i++) {
+            if (pin[i]==gpiopin) {
+              fvar=i;
+
+              len++;
+              goto exit;
+            }
+          }
+          fvar=999;
+          goto exit;
+        }
+        if (!strncmp(vname,"prefix1",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX1),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"prefix2",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX2),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"prefix3",7)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX3),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"pow(",4)) {
+
+          float fvar1;
+          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          lp++;
+
+          fvar=FastPrecisePow(fvar1,fvar2);
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"pwr[",4)) {
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<=devices_present) {
+            fvar=bitRead(power,index-1);
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+        if (!strncmp(vname,"pc[",3)) {
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<1 || index>MAX_COUNTERS) index=1;
+          fvar=RtcSettings.pulse_counter[index-1];
+          len+=1;
+          goto exit;
+        }
+        break;
+
+      case 'r':
+        if (!strncmp(vname,"ram",3)) {
+          fvar=glob_script_mem.script_mem_size+(glob_script_mem.script_size)+(PMEM_SIZE);
+          goto exit;
+        }
+        break;
+      case 's':
+        if (!strncmp(vname,"secs",4)) {
+          fvar=RtcTime.second;
+          goto exit;
+        }
+        if (!strncmp(vname,"sw[",3)) {
+
+          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
+          fvar=SwitchLastState((uint32_t)fvar);
+
+          len++;
+          goto exit;
+        }
+        if (!strncmp(vname,"stack",5)) {
+          fvar=GetStack();
+          goto exit;
+        }
+        if (!strncmp(vname,"slen",4)) {
+          fvar=strlen(glob_script_mem.script_ram);
+          goto exit;
+        }
+        if (!strncmp(vname,"sl(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          lp++;
+          len=0;
+          fvar=strlen(str);
+          goto exit;
+        }
+        if (!strncmp(vname,"sb(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          SCRIPT_SKIP_SPACES
+          float fvar1;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          lp++;
+          len=0;
+          if (fvar1<0) {
+            fvar1=strlen(str)+fvar1;
+          }
+          memcpy(sp,&str[(uint8_t)fvar1],(uint8_t)fvar2);
+          sp[(uint8_t)fvar2] = '\0';
+          goto strexit;
+        }
+        if (!strncmp(vname,"st(",3)) {
+          lp+=3;
+          char str[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,str,0);
+          while (*lp==' ') lp++;
+          char token[2];
+          token[0]=*lp++;
+          token[1]=0;
+          while (*lp==' ') lp++;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+
+          lp++;
+          len=0;
+          if (sp) {
+
+            char *st=strtok(str,token);
+            if (!st) {
+              *sp=0;
+            } else {
+              for (uint8_t cnt=1; cnt<=fvar; cnt++) {
+                if (cnt==fvar) {
+                  strcpy(sp,st);
+                  break;
+                }
+                st=strtok(NULL,token);
+                if (!st) {
+                  *sp=0;
+                  break;
+                }
+              }
+            }
+          }
+          goto strexit;
+        }
+        if (!strncmp(vname,"s(",2)) {
+          lp+=2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          char str[glob_script_mem.max_ssize+1];
+          dtostrfd(fvar,glob_script_mem.script_dprec,str);
+          if (sp) strlcpy(sp,str,glob_script_mem.max_ssize);
+          lp++;
+          len=0;
+          goto strexit;
+        }
+#if defined(USE_TIMERS) && defined(USE_SUNRISE)
+        if (!strncmp(vname,"sunrise",7)) {
+          fvar=SunMinutes(0);
+          goto exit;
+        }
+        if (!strncmp(vname,"sunset",6)) {
+          fvar=SunMinutes(1);
+          goto exit;
+        }
+#endif
+
+#ifdef USE_SHUTTER
+        if (!strncmp(vname,"sht[",4)) {
+          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<=shutters_present) {
+            fvar=Settings.shutter_position[index-1];
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+#endif
+#ifdef USE_ANGLE_FUNC
+        if (!strncmp(vname,"sin(",4)) {
+          lp+=4;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          fvar=sinf(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+        if (!strncmp(vname,"sqrt(",5)) {
+          lp+=5;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+          fvar=sqrtf(fvar);
+          lp++;
+          len=0;
+          goto exit;
+        }
+#endif
+#ifdef USE_SML_SCRIPT_CMD
+        if (!strncmp(vname,"sml(",4)) {
+          lp+=4;
+          float fvar1;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
+          SCRIPT_SKIP_SPACES
+          float fvar2;
+          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
+          SCRIPT_SKIP_SPACES
+          if (fvar2==0) {
+            float fvar3;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
+            fvar=SML_SetBaud(fvar1,fvar3);
+          } else {
+            char str[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,str,0);
+            fvar=SML_Write(fvar1,str);
+          }
+          lp++;
+          fvar=0;
+          len=0;
+          goto exit;
+        }
+#endif
+        break;
+      case 't':
+        if (!strncmp(vname,"time",4)) {
+          fvar=MinutesPastMidnight();
+          goto exit;
+        }
+        if (!strncmp(vname,"tper",4)) {
+          fvar=Settings.tele_period;
+          tind->index=SCRIPT_TELEPERIOD;
+          goto exit_settable;
+        }
+        if (!strncmp(vname,"tinit",5)) {
+          if (rules_flag.time_init) {
+            rules_flag.time_init=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"tset",4)) {
+          if (rules_flag.time_set) {
+            rules_flag.time_set=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"tstamp",6)) {
+          if (sp) strlcpy(sp,GetDateAndTime(DT_LOCAL).c_str(),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+        if (!strncmp(vname,"topic",5)) {
+          if (sp) strlcpy(sp,SettingsText(SET_MQTT_TOPIC),glob_script_mem.max_ssize);
+          goto strexit;
+        }
+#ifdef USE_DISPLAY
+#ifdef USE_TOUCH_BUTTONS
+        if (!strncmp(vname,"tbut[",5)) {
+          GetNumericResult(vname+5,OPER_EQU,&fvar,0);
+          uint8_t index=fvar;
+          if (index<1 || index>MAXBUTTONS) index=1;
+          index--;
+          if (buttons[index]) {
+            fvar=buttons[index]->vpower&0x80;
+          } else {
+            fvar=-1;
+          }
+          len+=1;
+          goto exit;
+        }
+
+#endif
+#endif
+        break;
+      case 'u':
+        if (!strncmp(vname,"uptime",6)) {
+          fvar=MinutesUptime();
+          goto exit;
+        }
+        if (!strncmp(vname,"upsecs",6)) {
+          fvar=uptime;
+          goto exit;
+        }
+        if (!strncmp(vname,"upd[",4)) {
+
+          struct T_INDEX ind;
+          uint8_t vtype;
+          isvar(vname+4,&vtype,&ind,0,0,0);
+          if (!ind.bits.constant) {
+            if (!ind.bits.changed) {
+              fvar=0;
+              len++;
+              goto exit;
+            } else {
+              glob_script_mem.type[ind.index].bits.changed=0;
+              fvar=1;
+              len++;
+              goto exit;
+            }
+          }
+          goto notfound;
+        }
+        break;
+
+      case 'w':
+        if (!strncmp(vname,"wday",4)) {
+          fvar=RtcTime.day_of_week;
+          goto exit;
+        }
+        if (!strncmp(vname,"wific",5)) {
+          if (rules_flag.wifi_connected) {
+            rules_flag.wifi_connected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"wifid",5)) {
+          if (rules_flag.wifi_disconnected) {
+            rules_flag.wifi_disconnected=0;
+            fvar=1;
+          }
+          goto exit;
+        }
+        if (!strncmp(vname,"wifis",5)) {
+          fvar=!global_state.wifi_down;
+          goto exit;
+        }
+        break;
+      case 'y':
+        if (!strncmp(vname,"year",4)) {
+          fvar=RtcTime.year;
+          goto exit;
+        }
+        break;
+      default:
+        break;
+    }
+
+notfound:
+    if (fp) *fp=0;
+    *vtype=VAR_NV;
+    tind->index=VAR_NV;
+    glob_script_mem.var_not_found=1;
+    return lp;
+
+exit:
+    if (fp) *fp=fvar;
+    *vtype=NUM_RES;
+    tind->bits.constant=1;
+    tind->bits.is_string=0;
+    return lp+len;
+
+strexit:
+    *vtype=STYPE;
+    tind->bits.constant=1;
+    tind->bits.is_string=1;
+    return lp+len;
+}
+
+
+
+char *getop(char *lp, uint8_t *operand) {
+    switch (*lp) {
+        case '=':
+            if (*(lp+1)=='=') {
+                *operand=OPER_EQUEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_EQU;
+                return lp+1;
+            }
+            break;
+        case '+':
+            if (*(lp+1)=='=') {
+                *operand=OPER_PLSEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_PLS;
+                return lp+1;
+            }
+            break;
+        case '-':
+            if (*(lp+1)=='=') {
+                *operand=OPER_MINEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_MIN;
+                return lp+1;
+            }
+            break;
+        case '*':
+            if (*(lp+1)=='=') {
+                *operand=OPER_MULEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_MUL;
+                return lp+1;
+            }
+            break;
+        case '/':
+            if (*(lp+1)=='=') {
+                *operand=OPER_DIVEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_DIV;
+                return lp+1;
+            }
+            break;
+        case '!':
+            if (*(lp+1)=='=') {
+                *operand=OPER_NOTEQU;
+                return lp+2;
+            }
+            break;
+        case '>':
+            if (*(lp+1)=='=') {
+                *operand=OPER_GRTEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_GRT;
+                return lp+1;
+
+            }
+            break;
+        case '<':
+            if (*(lp+1)=='=') {
+                *operand=OPER_LOWEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_LOW;
+                return lp+1;
+            }
+            break;
+        case '%':
+            if (*(lp+1)=='=') {
+                *operand=OPER_PERCEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_PERC;
+                return lp+1;
+            }
+            break;
+        case '^':
+            if (*(lp+1)=='=') {
+                *operand=OPER_XOREQU;
+                return lp+2;
+            } else {
+                *operand=OPER_XOR;
+                return lp+1;
+            }
+            break;
+        case '&':
+            if (*(lp+1)=='=') {
+                *operand=OPER_ANDEQU;
+                return lp+2;
+            } else {
+                *operand=OPER_AND;
+                return lp+1;
+            }
+            break;
+        case '|':
+            if (*(lp+1)=='=') {
+                *operand=OPER_OREQU;
+                return lp+2;
+            } else {
+                *operand=OPER_OR;
+                return lp+1;
+            }
+            break;
+    }
+    *operand=0;
+    return lp;
+}
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t g_cont;
+}
+uint16_t GetStack(void) {
+  register uint32_t *sp asm("a1");
+  return (4 * (sp - g_cont.stack));
+}
+
+#else
+extern "C" {
+#include <cont.h>
+  extern cont_t* g_pcont;
+}
+uint16_t GetStack(void) {
+  register uint32_t *sp asm("a1");
+  return (4 * (sp - g_pcont->stack));
+}
+#endif
+
+char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
+  uint8_t operand=0;
+  uint8_t vtype;
+  char *slp;
+  struct T_INDEX ind;
+  char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
+  while (1) {
+    lp=isvar(lp,&vtype,&ind,0,str1,jo);
+    if (vtype!=STR_RES && !(vtype&STYPE)) {
+
+      glob_script_mem.glob_error=1;
+      return lp;
+    }
+    switch (lastop) {
+        case OPER_EQU:
+          strlcpy(str,str1,sizeof(str));
+          break;
+        case OPER_PLS:
+          strncat(str,str1,sizeof(str));
+          break;
+    }
+    slp=lp;
+    lp=getop(lp,&operand);
+    switch (operand) {
+      case OPER_EQUEQU:
+      case OPER_NOTEQU:
+      case OPER_LOW:
+      case OPER_LOWEQU:
+      case OPER_GRT:
+      case OPER_GRTEQU:
+          lp=slp;
+          strcpy(cp,str);
+          return lp;
+          break;
+      default:
+          break;
+    }
+    lastop=operand;
+    if (!operand) {
+      strcpy(cp,str);
+      return lp;
+    }
+  }
+}
+
+char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo) {
+uint8_t operand=0;
+float fvar1,fvar;
+char *slp;
+uint8_t vtype;
+struct T_INDEX ind;
+    while (1) {
+
+        if (*lp=='(') {
+            lp++;
+            lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
+            lp++;
+
+        } else {
+            lp=isvar(lp,&vtype,&ind,&fvar1,0,jo);
+            if (vtype!=NUM_RES && vtype&STYPE) {
+
+              glob_script_mem.glob_error=1;
+            }
+        }
+        switch (lastop) {
+            case OPER_EQU:
+                fvar=fvar1;
+                break;
+            case OPER_PLS:
+                fvar+=fvar1;
+                break;
+            case OPER_MIN:
+                fvar-=fvar1;
+                break;
+            case OPER_MUL:
+                fvar*=fvar1;
+                break;
+            case OPER_DIV:
+                fvar/=fvar1;
+                break;
+            case OPER_PERC:
+                fvar=fmodf(fvar,fvar1);
+                break;
+            case OPER_XOR:
+                fvar=(uint32_t)fvar^(uint32_t)fvar1;
+                break;
+            case OPER_AND:
+                fvar=(uint32_t)fvar&(uint32_t)fvar1;
+                break;
+            case OPER_OR:
+                fvar=(uint32_t)fvar|(uint32_t)fvar1;
+                break;
+            default:
+                break;
+
+        }
+        slp=lp;
+        lp=getop(lp,&operand);
+        switch (operand) {
+            case OPER_EQUEQU:
+            case OPER_NOTEQU:
+            case OPER_LOW:
+            case OPER_LOWEQU:
+            case OPER_GRT:
+            case OPER_GRTEQU:
+                lp=slp;
+                *fp=fvar;
+                return lp;
+                break;
+            default:
+                break;
+        }
+        lastop=operand;
+        if (!operand) {
+            *fp=fvar;
+            return lp;
+        }
+    }
+}
+
+
+char *ForceStringVar(char *lp,char *dstr) {
+  float fvar;
+  char *slp=lp;
+  glob_script_mem.glob_error=0;
+  lp=GetStringResult(lp,OPER_EQU,dstr,0);
+  if (glob_script_mem.glob_error) {
+
+    lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
+    dtostrfd(fvar,6,dstr);
+    glob_script_mem.glob_error=0;
+  }
+  return lp;
+}
+
+
+void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
+    char *cp;
+    uint16_t count;
+    uint8_t vtype;
+    uint8_t dprec=glob_script_mem.script_dprec;
+    float fvar;
+    cp=srcbuf;
+    struct T_INDEX ind;
+    char string[SCRIPT_MAXSSIZE];
+    dstsize-=2;
+    for (count=0;count<dstsize;count++) {
+        if (*cp=='%') {
+            cp++;
+            if (*cp=='%') {
+              dstbuf[count]=*cp++;
+            } else {
+              if (isdigit(*cp)) {
+                dprec=*cp&0xf;
+                cp++;
+              } else {
+                dprec=glob_script_mem.script_dprec;
+              }
+              cp=isvar(cp,&vtype,&ind,&fvar,string,0);
+              if (vtype!=VAR_NV) {
+
+                if (vtype==NUM_RES || (vtype&STYPE)==0) {
+
+                    dtostrfd(fvar,dprec,string);
+                } else {
+
+                }
+                uint8_t slen=strlen(string);
+                if (count+slen<dstsize-1) {
+                  strcpy(&dstbuf[count],string);
+                  count+=slen-1;
+                }
+                cp++;
+              } else {
+                strcpy(&dstbuf[count],"???");
+                count+=2;
+                while (*cp!='%') {
+                  if (*cp==0 || *cp==SCRIPT_EOL) {
+                    dstbuf[count+1]=0;
+                    return;
+                  }
+                  cp++;
+                }
+                cp++;
+              }
+            }
+        } else {
+            if (*cp=='\\') {
+              cp++;
+              if (*cp=='n') {
+                dstbuf[count]='\n';
+              } else if (*cp=='r') {
+                dstbuf[count]='\r';
+              } else if (*cp=='\\') {
+                dstbuf[count]='\\';
+              } else {
+                dstbuf[count]=*cp;
+              }
+            } else {
+              dstbuf[count]=*cp;
+            }
+            if (*cp==0) {
+                break;
+            }
+            cp++;
+        }
+    }
+    dstbuf[count]=0;
+}
+
+void toLog(const char *str) {
+  if (!str) return;
+  AddLog_P(LOG_LEVEL_INFO, str);
+}
+
+
+void toLogN(const char *cp,uint8_t len) {
+  if (!cp) return;
+  char str[32];
+  if (len>=sizeof(str)) len=len>=sizeof(str);
+  strlcpy(str,cp,len);
+  toSLog(str);
+}
+
+void toLogEOL(const char *s1,const char *str) {
+  if (!str) return;
+  uint8_t index=0;
+  char *cp=log_data;
+  strcpy(cp,s1);
+  cp+=strlen(s1);
+  while (*str) {
+    if (*str==SCRIPT_EOL) break;
+    *cp++=*str++;
+  }
+  *cp=0;
+  AddLog(LOG_LEVEL_INFO);
+}
+
+
+void toSLog(const char *str) {
+  if (!str) return;
+#if SCRIPT_DEBUG>0
+  while (*str) {
+    Serial.write(*str);
+    str++;
+  }
+#endif
+}
+
+char *Evaluate_expression(char *lp,uint8_t and_or, uint8_t *result,JsonObject *jo) {
+  float fvar,*dfvar,fvar1;
+  uint8_t numeric;
+  struct T_INDEX ind;
+  uint8_t vtype=0,lastop;
+  uint8_t res=0;
+  char *llp=lp;
+  char *slp;
+
+  SCRIPT_SKIP_SPACES
+  if (*lp=='(') {
+    uint8_t res=0;
+    uint8_t xand_or=0;
+    lp++;
+
+loop:
+    SCRIPT_SKIP_SPACES
+    lp=Evaluate_expression(lp,xand_or,&res,jo);
+    if (*lp==')') {
+      lp++;
+      goto exit0;
+    }
+
+    SCRIPT_SKIP_SPACES
+    if (!strncmp(lp,"or",2)) {
+      lp+=2;
+      xand_or=1;
+      goto loop;
+    } else if (!strncmp(lp,"and",3)) {
+      lp+=3;
+      xand_or=2;
+      goto loop;
+    }
+exit0:
+    if (!and_or) {
+      *result=res;
+    } else if (and_or==1) {
+      *result|=res;
+    } else {
+      *result&=res;
+    }
+    goto exit10;
+  }
+
+  llp=lp;
+
+  dfvar=&fvar;
+  glob_script_mem.glob_error=0;
+  slp=lp;
+  numeric=1;
+  lp=GetNumericResult(lp,OPER_EQU,dfvar,0);
+  if (glob_script_mem.glob_error==1) {
+
+   char cmpstr[SCRIPT_MAXSSIZE];
+    lp=slp;
+    numeric=0;
+
+    lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
+   lp=getop(lp,&lastop);
+
+    char str[SCRIPT_MAXSSIZE];
+    lp=GetStringResult(lp,OPER_EQU,str,jo);
+    if (lastop==OPER_EQUEQU || lastop==OPER_NOTEQU) {
+      res=strcmp(cmpstr,str);
+      if (lastop==OPER_EQUEQU) res=!res;
+      goto exit;
+    }
+
+  } else {
+
+
+    lp=getop(lp,&lastop);
+    lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
+    switch (lastop) {
+      case OPER_EQUEQU:
+          res=(*dfvar==fvar1);
+          break;
+      case OPER_NOTEQU:
+          res=(*dfvar!=fvar1);
+          break;
+      case OPER_LOW:
+          res=(*dfvar<fvar1);
+          break;
+      case OPER_LOWEQU:
+          res=(*dfvar<=fvar1);
+          break;
+      case OPER_GRT:
+          res=(*dfvar>fvar1);
+          break;
+      case OPER_GRTEQU:
+          res=(*dfvar>=fvar1);
+          break;
+      default:
+
+          break;
+    }
+
+exit:
+    if (!and_or) {
+      *result=res;
+    } else if (and_or==1) {
+      *result|=res;
+    } else {
+      *result&=res;
+    }
+  }
+
+
+exit10:
+#if SCRIPT_DEBUG>0
+  char tbuff[128];
+  sprintf(tbuff,"p1=%d,p2=%d,cmpres=%d,and_or=%d line: ",(int32_t)*dfvar,(int32_t)fvar1,*result,and_or);
+  toLogEOL(tbuff,llp);
+#endif
+  return lp;
+}
+
+
+
+#define IF_NEST 8
+
+int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
+
+    if (tasm_cmd_activ && tlen>0) return 0;
+
+    uint8_t vtype=0,sindex,xflg,floop=0,globvindex,fromscriptcmd=0;
+    int8_t globaindex;
+    struct T_INDEX ind;
+    uint8_t operand,lastop,numeric=1,if_state[IF_NEST],if_exe[IF_NEST],if_result[IF_NEST],and_or,ifstck=0;
+    if_state[ifstck]=0;
+    if_result[ifstck]=0;
+    if_exe[ifstck]=1;
+    char cmpstr[SCRIPT_MAXSSIZE];
+    uint8_t check=0;
+    if (tlen<0) {
+      tlen=abs(tlen);
+      check=1;
+    }
+
+    float *dfvar,*cv_count,cv_max,cv_inc;
+    char *cv_ptr;
+    float fvar=0,fvar1,sysvar,swvar;
+    uint8_t section=0,sysv_type=0,swflg=0;
+
+    if (!glob_script_mem.scriptptr) {
+      return -99;
+    }
+
+    DynamicJsonBuffer jsonBuffer;
+    JsonObject &jobj=jsonBuffer.parseObject(js);
+    JsonObject *jo;
+    if (js) jo=&jobj;
+    else jo=0;
+
+    char *lp=glob_script_mem.scriptptr;
+
+    while (1) {
+
+
+        startline:
+        SCRIPT_SKIP_SPACES
+
+        SCRIPT_SKIP_EOL
+
+        if (*lp==';') goto next_line;
+        if (!*lp) break;
+
+        if (section) {
+
+            if (*lp=='>') {
+                return 0;
+            }
+            if (*lp=='#') {
+                return 0;
+            }
+            glob_script_mem.var_not_found=0;
+
+
+#ifdef IFTHEN_DEBUG
+            char tbuff[128];
+            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
+            toLogEOL(tbuff,lp);
+#endif
+
+
+
+
+            if (!strncmp(lp,"if",2)) {
+                lp+=2;
+                if (ifstck<IF_NEST-1) ifstck++;
+                if_state[ifstck]=1;
+                if_result[ifstck]=0;
+                if (ifstck==1) if_exe[ifstck]=1;
+                else if_exe[ifstck]=if_exe[ifstck-1];
+                and_or=0;
+            } else if (!strncmp(lp,"then",4) && if_state[ifstck]==1) {
+                lp+=4;
+                if_state[ifstck]=2;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+            } else if (!strncmp(lp,"else",4) && if_state[ifstck]==2) {
+                lp+=4;
+                if_state[ifstck]=3;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
+            } else if (!strncmp(lp,"endif",5) && if_state[ifstck]>=2) {
+                lp+=5;
+                if (ifstck>0) {
+                  if_state[ifstck]=0;
+                  ifstck--;
+                }
+                goto next_line;
+            } else if (!strncmp(lp,"or",2) && if_state[ifstck]==1) {
+                lp+=2;
+                and_or=1;
+            } else if (!strncmp(lp,"and",3) && if_state[ifstck]==1) {
+                lp+=3;
+                and_or=2;
+            }
+
+            if (*lp=='{' && if_state[ifstck]==1) {
+              lp+=1;
+              if_state[ifstck]=2;
+              if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+            } else if (*lp=='{' && if_state[ifstck]==3) {
+              lp+=1;
+
+            } else if (*lp=='}' && if_state[ifstck]>=2) {
+              lp++;
+              char *slp=lp;
+              uint8_t iselse=0;
+              for (uint8_t count=0; count<8;count++) {
+                if (*lp=='}') {
+
+                  break;
+                }
+                if (!strncmp(lp,"else",4)) {
+
+                  if_state[ifstck]=3;
+                  if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
+                  lp+=4;
+                  iselse=1;
+                  SCRIPT_SKIP_SPACES
+                  if (*lp=='{') lp++;
+                  break;
+                }
+                lp++;
+              }
+              if (!iselse) {
+                lp=slp;
+
+                if (ifstck>0) {
+                  if_state[ifstck]=0;
+                  ifstck--;
+                }
+                goto next_line;
+              }
+            }
+
+            if (!strncmp(lp,"for",3)) {
+
+
+              lp+=3;
+              SCRIPT_SKIP_SPACES
+              lp=isvar(lp,&vtype,&ind,0,0,0);
+              if ((vtype!=VAR_NV) && (vtype&STYPE)==0) {
+
+                  uint8_t index=glob_script_mem.type[ind.index].index;
+                  cv_count=&glob_script_mem.fvars[index];
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,cv_count,0);
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,&cv_max,0);
+                  SCRIPT_SKIP_SPACES
+                  lp=GetNumericResult(lp,OPER_EQU,&cv_inc,0);
+
+                  cv_ptr=lp;
+                  floop=1;
+              } else {
+
+                  toLogEOL("for error",lp);
+              }
+            } else if (!strncmp(lp,"next",4) && floop>0) {
+
+              *cv_count+=cv_inc;
+              if (*cv_count<=cv_max) {
+                lp=cv_ptr;
+              } else {
+                lp+=4;
+                floop=0;
+              }
+            }
+
+            if (!strncmp(lp,"switch",6)) {
+              lp+=6;
+              SCRIPT_SKIP_SPACES
+              char *slp=lp;
+              lp=GetNumericResult(lp,OPER_EQU,&swvar,0);
+              if (glob_script_mem.glob_error==1) {
+
+                lp=slp;
+
+                lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
+                swflg=0x81;
+              } else {
+                swflg=1;
+              }
+            } else if (!strncmp(lp,"case",4) && swflg>0) {
+              lp+=4;
+              SCRIPT_SKIP_SPACES
+              float cvar;
+              if (!(swflg&0x80)) {
+                lp=GetNumericResult(lp,OPER_EQU,&cvar,0);
+                if (swvar!=cvar) {
+                  swflg=2;
+                } else {
+                  swflg=1;
+                }
+              } else {
+                char str[SCRIPT_MAXSSIZE];
+                lp=GetStringResult(lp,OPER_EQU,str,0);
+                if (!strcmp(cmpstr,str)) {
+                    swflg=0x81;
+                } else {
+                  swflg=0x82;
+                }
+              }
+            } else if (!strncmp(lp,"ends",4) && swflg>0) {
+              lp+=4;
+              swflg=0;
+            }
+            if ((swflg&3)==2) goto next_line;
+
+            SCRIPT_SKIP_SPACES
+
+            if (*lp==SCRIPT_EOL) {
+             goto next_line;
+            }
+
+
+            if (!if_exe[ifstck] && if_state[ifstck]!=1) goto next_line;
+
+#ifdef IFTHEN_DEBUG
+            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d execute line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
+            toLogEOL(tbuff,lp);
+#endif
+
+            if (!strncmp(lp,"break",5)) {
+              if (floop) {
+
+                floop=0;
+              } else {
+                section=0;
+              }
+              break;
+            } else if (!strncmp(lp,"dp",2) && isdigit(*(lp+2))) {
+              lp+=2;
+
+              glob_script_mem.script_dprec=atoi(lp);
+              goto next_line;
+            } else if (!strncmp(lp,"delay(",6)) {
+              lp+=5;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              delay(fvar);
+              goto next_line;
+            } else if (!strncmp(lp,"spinm(",6)) {
+              lp+=6;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t pinnr=fvar;
+              SCRIPT_SKIP_SPACES
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t mode=fvar;
+              pinMode(pinnr,mode&3);
+              goto next_line;
+            } else if (!strncmp(lp,"spin(",5)) {
+              lp+=5;
+
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t pinnr=fvar;
+              SCRIPT_SKIP_SPACES
+              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
+              int8_t mode=fvar;
+              digitalWrite(pinnr,mode&1);
+              goto next_line;
+            } else if (!strncmp(lp,"svars(",5)) {
+              lp+=5;
+
+              Scripter_save_pvars();
+              goto next_line;
+            }
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+            else if (!strncmp(lp,"ws2812(",7)) {
+              lp+=7;
+              lp=isvar(lp,&vtype,&ind,0,0,0);
+              if (vtype!=VAR_NV) {
+
+                uint8_t index=glob_script_mem.type[ind.index].index;
+                if ((vtype&STYPE)==0) {
+
+                  if (glob_script_mem.type[index].bits.is_filter) {
+                    uint8_t len=0;
+                    float *fa=Get_MFAddr(index,&len);
+
+                    if (fa && len) ws2812_set_array(fa,len);
+                  }
+                }
+              }
+              goto next_line;
+            }
+#endif
+#endif
+
+            else if (!strncmp(lp,"=>",2) || !strncmp(lp,"->",2) || !strncmp(lp,"+>",2) || !strncmp(lp,"print",5)) {
+
+                uint8_t sflag=0,pflg=0,svmqtt,swll;
+                if (*lp=='p') {
+                 pflg=1;
+                 lp+=5;
+                }
+                else {
+                  if (*lp=='-') sflag=1;
+                  if (*lp=='+') sflag=2;
+                  lp+=2;
+                }
+                char *slp=lp;
+                SCRIPT_SKIP_SPACES
+                #define SCRIPT_CMDMEM 512
+                char *cmdmem=(char*)malloc(SCRIPT_CMDMEM);
+                if (cmdmem) {
+                  char *cmd=cmdmem;
+                  uint16_t count;
+                  for (count=0; count<SCRIPT_CMDMEM/2-2; count++) {
+
+                    if (!*lp || *lp=='\r' || *lp=='\n') {
+                        cmd[count]=0;
+                        break;
+                    }
+                    cmd[count]=*lp++;
+                  }
+
+
+                  char *tmp=cmdmem+SCRIPT_CMDMEM/2;
+                  Replace_Cmd_Vars(cmd,tmp,SCRIPT_CMDMEM/2);
+
+
+                  if (!strncmp(tmp,"print",5) || pflg) {
+                    if (pflg) toLog(tmp);
+                    else toLog(&tmp[5]);
+                  } else {
+                    if (!sflag) {
+                      tasm_cmd_activ=1;
+                      AddLog_P2(glob_script_mem.script_loglevel&0x7f, PSTR("Script: performs \"%s\""), tmp);
+                    } else if (sflag==2) {
+
+                    } else {
+                      tasm_cmd_activ=1;
+                      svmqtt=Settings.flag.mqtt_enabled;
+                      swll=Settings.weblog_level;
+                      Settings.flag.mqtt_enabled=0;
+                      Settings.weblog_level=0;
+                    }
+                    ExecuteCommand((char*)tmp, SRC_RULE);
+                    tasm_cmd_activ=0;
+                    if (sflag==1) {
+                      Settings.flag.mqtt_enabled=svmqtt;
+                      Settings.weblog_level=swll;
+                    }
+                  }
+                  if (cmdmem) free(cmdmem);
+                }
+                lp=slp;
+                goto next_line;
+            } else if (!strncmp(lp,"=#",2)) {
+
+                lp+=1;
+                char *slp=lp;
+                uint8_t plen=0;
+                while (*lp) {
+                  if (*lp=='\n'|| *lp=='\r'|| *lp=='(') {
+                    break;
+                  }
+                  lp++;
+                  plen++;
+                }
+                if (fromscriptcmd) {
+                  char *sp=glob_script_mem.scriptptr;
+                  glob_script_mem.scriptptr=glob_script_mem.scriptptr_bu;
+                  Run_Scripter(slp,plen,0);
+                  glob_script_mem.scriptptr=sp;
+                } else {
+                  Run_Scripter(slp,plen,0);
+                }
+                lp=slp;
+                goto next_line;
+            } else if (!strncmp(lp,"=(",2)) {
+                lp+=2;
+                char str[128];
+                str[0]='>';
+                lp=GetStringResult(lp,OPER_EQU,&str[1],0);
+                lp++;
+                execute_script(str);
+            }
+
+
+            if (if_state[ifstck]==1) {
+
+              lp=Evaluate_expression(lp,and_or,&if_result[ifstck],jo);
+              SCRIPT_SKIP_SPACES
+              if (*lp=='{' && if_state[ifstck]==1) {
+                lp+=1;
+                if_state[ifstck]=2;
+                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
+              }
+              goto next_line;
+            } else {
+              lp=isvar(lp,&vtype,&ind,&sysvar,0,0);
+              if (vtype!=VAR_NV) {
+
+                  globvindex=ind.index;
+                  globaindex=last_findex;
+                  uint8_t index=glob_script_mem.type[ind.index].index;
+                  if ((vtype&STYPE)==0) {
+
+                      if (ind.bits.settable || ind.bits.is_filter) {
+                        dfvar=&sysvar;
+                        if (ind.bits.settable) {
+                          sysv_type=ind.index;
+                        } else {
+                          sysv_type=0;
+                        }
+
+                      } else {
+                        dfvar=&glob_script_mem.fvars[index];
+                        sysv_type=0;
+                      }
+                      numeric=1;
+                      lp=getop(lp,&lastop);
+                      char *slp=lp;
+                      glob_script_mem.glob_error=0;
+                      lp=GetNumericResult(lp,OPER_EQU,&fvar,jo);
+                      if (glob_script_mem.glob_error==1) {
+
+
+                        lp=isvar(slp,&vtype,&ind,0,cmpstr,jo);
+                        fvar=CharToFloat(cmpstr);
+                      }
+                      switch (lastop) {
+                          case OPER_EQU:
+                              if (glob_script_mem.var_not_found) {
+                                if (!js) toLogEOL("var not found: ",lp);
+                                goto next_line;
+                              }
+                              *dfvar=fvar;
+                              break;
+                          case OPER_PLSEQU:
+                              *dfvar+=fvar;
+                              break;
+                          case OPER_MINEQU:
+                              *dfvar-=fvar;
+                              break;
+                          case OPER_MULEQU:
+                              *dfvar*=fvar;
+                              break;
+                          case OPER_DIVEQU:
+                              *dfvar/=fvar;
+                              break;
+                          case OPER_PERCEQU:
+                              *dfvar=fmodf(*dfvar,fvar);
+                              break;
+                          case OPER_ANDEQU:
+                              *dfvar=(uint32_t)*dfvar&(uint32_t)fvar;
+                              break;
+                          case OPER_OREQU:
+                              *dfvar=(uint32_t)*dfvar|(uint32_t)fvar;
+                              break;
+                          case OPER_XOREQU:
+                              *dfvar=(uint32_t)*dfvar^(uint32_t)fvar;
+                              break;
+                          default:
+
+                              break;
+                      }
+
+                      glob_script_mem.type[globvindex].bits.changed=1;
+                      if (glob_script_mem.type[globvindex].bits.is_filter) {
+                        if (globaindex>=0) {
+                          Set_MFVal(glob_script_mem.type[globvindex].index,globaindex,*dfvar);
+                        } else {
+                          Set_MFilter(glob_script_mem.type[globvindex].index,*dfvar);
+                        }
+                      }
+
+                      if (sysv_type) {
+                        switch (sysv_type) {
+                          case SCRIPT_LOGLEVEL:
+                            glob_script_mem.script_loglevel=*dfvar;
+                            break;
+                          case SCRIPT_TELEPERIOD:
+                            if (*dfvar<10) *dfvar=10;
+                            if (*dfvar>300) *dfvar=300;
+                            Settings.tele_period=*dfvar;
+                            break;
+                        }
+                        sysv_type=0;
+                      }
+                  } else {
+
+                    numeric=0;
+                    sindex=index;
+
+                    char str[SCRIPT_MAXSSIZE];
+                    lp=getop(lp,&lastop);
+                    char *slp=lp;
+                    glob_script_mem.glob_error=0;
+                    lp=GetStringResult(lp,OPER_EQU,str,jo);
+                    if (!js && glob_script_mem.glob_error) {
+
+                      lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
+                      dtostrfd(fvar,6,str);
+                      glob_script_mem.glob_error=0;
+                    }
+
+                    if (!glob_script_mem.var_not_found) {
+
+                      glob_script_mem.type[globvindex].bits.changed=1;
+                      if (lastop==OPER_EQU) {
+                        strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+                      } else if (lastop==OPER_PLSEQU) {
+                        strncat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
+                      }
+                    }
+                  }
+
+            }
+            SCRIPT_SKIP_SPACES
+            if (*lp=='{' && if_state[ifstck]==3) {
+              lp+=1;
+
+            }
+            goto next_line;
+          }
+        } else {
+
+            if (*lp=='>' && tlen==1) {
+
+              lp++;
+              section=1;
+              fromscriptcmd=1;
+              goto startline;
+            }
+            if (!strncmp(lp,type,tlen)) {
+
+                section=1;
+                glob_script_mem.section_ptr=lp;
+                if (check) {
+                  return 99;
+                }
+
+                char *ctype=(char*)type;
+                if (*ctype=='#') {
+
+                  ctype+=tlen;
+                  if (*ctype=='(' && *(lp+tlen)=='(') {
+                    float fparam;
+                    numeric=1;
+                    glob_script_mem.glob_error=0;
+                    GetNumericResult((char*)ctype,OPER_EQU,&fparam,0);
+                    if (glob_script_mem.glob_error==1) {
+
+                      numeric=0;
+
+                      GetStringResult((char*)ctype+1,OPER_EQU,cmpstr,0);
+                    }
+                    lp+=tlen;
+                    if (*lp=='(') {
+
+                      lp++;
+                      lp=isvar(lp,&vtype,&ind,0,0,0);
+                      if (vtype!=VAR_NV) {
+
+                        uint8_t index=glob_script_mem.type[ind.index].index;
+                        if ((vtype&STYPE)==0) {
+
+                            dfvar=&glob_script_mem.fvars[index];
+                            if (numeric) {
+                              *dfvar=fparam;
+                            } else {
+
+                              *dfvar=CharToFloat(cmpstr);
+                            }
+                        } else {
+
+                            sindex=index;
+                            if (!numeric) {
+                              strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),cmpstr,glob_script_mem.max_ssize);
+                            } else {
+
+                              dtostrfd(fparam,6,glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize));
+                            }
+                        }
+                      }
+                    }
+                  } else {
+                    lp+=tlen;
+                    if (*ctype=='(' || (*lp!=SCRIPT_EOL && *lp!='?')) {
+
+                      section=0;
+                    }
+                  }
+                }
+            }
+        }
+
+    next_line:
+        if (*lp==SCRIPT_EOL) {
+          lp++;
+        } else {
+          lp = strchr(lp, SCRIPT_EOL);
+          if (!lp) {
+            if (section) {
+              return 0;
+            } else {
+              return -1;
+            }
+          }
+          lp++;
+        }
+    }
+    return -1;
+}
+
+uint8_t script_xsns_index = 0;
+
+
+void ScripterEvery100ms(void) {
+
+  if (Settings.rule_enabled && (uptime > 4)) {
+    mqtt_data[0] = '\0';
+    uint16_t script_tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, script_xsns_index);
+    tele_period = script_tele_period_save;
+    if (strlen(mqtt_data)) {
+      mqtt_data[0] = '{';
+      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data);
+      Run_Scripter(">T",2, mqtt_data);
+    }
+  }
+  if (fast_script==99) Run_Scripter(">F",2,0);
+}
+
+
+
+
+void Scripter_save_pvars(void) {
+  int16_t mlen=0;
+  float *fp=(float*)glob_script_mem.script_pram;
+  mlen+=sizeof(float);
+  struct T_INDEX *vtp=glob_script_mem.type;
+  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+    if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
+      uint8_t index=vtp[count].index;
+      mlen+=sizeof(float);
+      if (mlen>PMEM_SIZE) {
+        vtp[count].bits.is_permanent=0;
+        return;
+      }
+      *fp++=glob_script_mem.fvars[index];
+    }
+  }
+  char *cp=(char*)fp;
+  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
+    if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
+      uint8_t index=vtp[count].index;
+      char *sp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
+      uint8_t slen=strlen(sp);
+      mlen+=slen+1;
+      if (mlen>PMEM_SIZE) {
+        vtp[count].bits.is_permanent=0;
+        return;
+      }
+      strcpy(cp,sp);
+      cp+=slen+1;
+    }
+  }
+}
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_SCRIPT "s10"
+
+const char S_CONFIGURE_SCRIPT[] PROGMEM = D_CONFIGURE_SCRIPT;
+
+const char HTTP_BTN_MENU_RULES[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form></p>";
+
+
+const char HTTP_FORM_SCRIPT[] PROGMEM =
+    "<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>"
+    "<form method='post' action='" WEB_HANDLE_SCRIPT "'>";
+
+const char HTTP_FORM_SCRIPT1[] PROGMEM =
+    "<div style='text-align:right' id='charNum'> </div>"
+    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>" D_SCRIPT_ENABLE "</b><br/>"
+    "<br><textarea  id='t1' name='t1' rows='8' cols='80' maxlength='%d' style='font-size: 12pt' >";
+
+const char HTTP_FORM_SCRIPT1b[] PROGMEM =
+    "</textarea>"
+    "<script type='text/javascript'>"
+    "eb('charNum').innerHTML='-';"
+    "var ta=eb('t1');"
+    "ta.addEventListener('keydown',function(e){"
+    "e = e || window.event;"
+    "var ml=this.getAttribute('maxlength');"
+    "var cl=this.value.length;"
+    "if(cl>=ml){"
+    "eb('charNum').innerHTML='" D_SCRIPT_CHARS_NO_MORE "';"
+    "}else{"
+    "eb('charNum').innerHTML=ml-cl+' " D_SCRIPT_CHARS_LEFT "';"
+    "}"
+
+#if 0
+
+    "if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.which === 86) {"
+
+      "var paste = window.clipboardData.getData('Text');"
+
+
+      "var out=\"\";"
+      "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
+      "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
+      "allLines.forEach((line) => {"
+        "if(line.length>0) {"
+          "if(line.charAt(0)!=';'){"
+            "out+=line+'\\n';"
+          "}"
+        "}"
+      "});"
+      "alert(out);"
+    "}"
+#endif
+
+    "return true;"
+    "});"
+
+
+
+#ifdef SCRIPT_STRIP_COMMENTS
+    "ta.addEventListener('paste',function(e){"
+      "let paste = (e.clipboardData || window.clipboardData).getData('text');"
+      "var ml=this.getAttribute('maxlength');"
+      "if(paste.length>=ml){"
+        "var out=\"\";"
+        "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
+        "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
+        "allLines.forEach((line) => {"
+          "if(line.length>0) {"
+            "if(line.charAt(0)!=';'){"
+              "out+=line+'\\n';"
+            "}"
+          "}"
+        "});"
+        "event.preventDefault();"
+        "eb('t1').textContent=out;"
+      "}"
+# 3145 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+    "});"
+
+
+#endif
+
+    "</script>";
+
+const char HTTP_SCRIPT_FORM_END[] PROGMEM =
+      "<br/>"
+      "<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ta' class='button bgrn'>" D_SAVE "</button>"
+      "</form></fieldset>";
+
+#ifdef USE_SCRIPT_FATFS
+const char HTTP_FORM_SCRIPT1c[] PROGMEM =
+    "<button name='d%d' type='submit' class='button bgrn'>" D_SCRIPT_DOWNLOAD " '%s'</button>";
+#ifdef SDCARD_DIR
+const char HTTP_FORM_SCRIPT1d[] PROGMEM =
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SDCARD_DIR "</button>";
+#else
+const char HTTP_FORM_SCRIPT1d[] PROGMEM =
+    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SCRIPT_UPLOAD_FILES "</button>";
+#endif
+
+#ifdef SDCARD_DIR
+const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_DIR;
+#else
+const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_UPLOAD;
+#endif
+
+const char HTTP_FORM_FILE_UPLOAD[] PROGMEM =
+"<div id='f1' name='f1' style='display:block;'>"
+"<fieldset><legend><b>&nbsp;%s" "&nbsp;</b></legend>";
+const char HTTP_FORM_FILE_UPG[] PROGMEM =
+"<form method='post' action='u3' enctype='multipart/form-data'>"
+"<br/><input type='file' name='u3'><br/>"
+"<br/><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>";
+
+const char HTTP_FORM_FILE_UPGb[] PROGMEM =
+"</fieldset>"
+"</div>"
+"<div id='f2' name='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
+
+const char HTTP_FORM_SDC_DIRa[] PROGMEM =
+"<div style='text-align:left'>";
+const char HTTP_FORM_SDC_DIRb[] PROGMEM =
+ "<pre><a href='%s' file='%s'>%s</a>    %d</pre>";
+const char HTTP_FORM_SDC_DIRd[] PROGMEM =
+"<pre><a href='%s' file='%s'>%s</a></pre>";
+const char HTTP_FORM_SDC_DIRc[] PROGMEM =
+"</div>";
+const char HTTP_FORM_SDC_HREF[] PROGMEM =
+"http://%s/upl?download=%s/%s";
+#endif
+
+
+
+#ifdef USE_SCRIPT_FATFS
+
+#if USE_LONG_FILE_NAMES>0
+#undef REJCMPL
+#define REJCMPL 6
+#else
+#undef REJCMPL
+#define REJCMPL 8
+#endif
+
+uint8_t reject(char *name) {
+
+  if (*name=='_') return 1;
+  if (*name=='.') return 1;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+  if (!strncasecmp(name,"SPOTLI~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"TRASHE~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"FSEVEN~1",REJCMPL)) return 1;
+  if (!strncasecmp(name,"SYSTEM~1",REJCMPL)) return 1;
+#else
+  if (!strcasecmp(name,"SPOTLI~1")) return 1;
+  if (!strcasecmp(name,"TRASHE~1")) return 1;
+  if (!strcasecmp(name,"FSEVEN~1")) return 1;
+  if (!strcasecmp(name,"SYSTEM~1")) return 1;
+#endif
+  return 0;
+}
+
+void ListDir(char *path, uint8_t depth) {
+  char name[32];
+  char npath[128];
+  char format[12];
+  sprintf(format,"%%-%ds",24-depth);
+
+  File dir=SD.open(path);
+  if (dir) {
+    dir.rewindDirectory();
+    if (strlen(path)>1) {
+      snprintf_P(npath,sizeof(npath),PSTR("http://%s/upl?download=%s"),WiFi.localIP().toString().c_str(),path);
+      for (uint8_t cnt=strlen(npath)-1;cnt>0;cnt--) {
+        if (npath[cnt]=='/') {
+          if (npath[cnt-1]=='=') npath[cnt+1]=0;
+          else npath[cnt]=0;
+          break;
+        }
+      }
+      WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,path,"..");
+    }
+    while (true) {
+      File entry=dir.openNextFile();
+      if (!entry) {
+        break;
+      }
+      char *pp=path;
+      if (!*(pp+1)) pp++;
+      char *cp=name;
+
+      if (reject((char*)entry.name())) goto fclose;
+
+      for (uint8_t cnt=0;cnt<depth;cnt++) {
+        *cp++='-';
+      }
+
+      sprintf(cp,format,entry.name());
+      if (entry.isDirectory()) {
+        snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
+        WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,entry.name(),name);
+        uint8_t plen=strlen(path);
+        if (plen>1) {
+          strcat(path,"/");
+        }
+        strcat(path,entry.name());
+        ListDir(path,depth+4);
+        path[plen]=0;
+      } else {
+          snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
+          WSContentSend_P(HTTP_FORM_SDC_DIRb,npath,entry.name(),name,entry.size());
+      }
+      fclose:
+      entry.close();
+    }
+    dir.close();
+  }
+}
+
+char path[48];
+
+void Script_FileUploadConfiguration(void)
+{
+  uint8_t depth=0;
+  strcpy(path,"/");
+
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("download")) {
+    String stmp = WebServer->arg("download");
+    char *cp=(char*)stmp.c_str();
+    if (DownloadFile(cp)) {
+
+      strcpy(path,cp);
+    }
+  }
+
+  WSContentStart_P(S_SCRIPT_FILE_UPLOAD);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
+  WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
+#ifdef SDCARD_DIR
+  WSContentSend_P(HTTP_FORM_SDC_DIRa);
+  if (glob_script_mem.script_sd_found) {
+    ListDir(path,depth);
+  }
+  WSContentSend_P(HTTP_FORM_SDC_DIRc);
+#endif
+  WSContentSend_P(HTTP_FORM_FILE_UPGb);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+  Web.upload_error = 0;
+}
+
+File upload_file;
+
+void ScriptFileUploadSuccess(void) {
+  WSContentStart_P(S_INFORMATION);
+  WSContentSendStyle();
+  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
+  WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br/>"), WebColor(COL_TEXT_SUCCESS));
+  WSContentSend_P(PSTR("</div><br/>"));
+  WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),"/upl",D_UPL_DONE);
+
+  WSContentStop();
+}
+
+
+
+void script_upload(void) {
+
+
+
+  HTTPUpload& upload = WebServer->upload();
+  if (upload.status == UPLOAD_FILE_START) {
+    char npath[48];
+    sprintf(npath,"%s/%s",path,upload.filename.c_str());
+    SD.remove(npath);
+    upload_file=SD.open(npath,FILE_WRITE);
+    if (!upload_file) Web.upload_error=1;
+  } else if(upload.status == UPLOAD_FILE_WRITE) {
+    if (upload_file) upload_file.write(upload.buf,upload.currentSize);
+  } else if(upload.status == UPLOAD_FILE_END) {
+    if (upload_file) upload_file.close();
+    if (Web.upload_error) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: upload error"));
+    }
+  } else {
+    Web.upload_error=1;
+    WebServer->send(500, "text/plain", "500: couldn't create file");
+  }
+}
+
+uint8_t DownloadFile(char *file) {
+  File download_file;
+  WiFiClient download_Client;
+
+    if (!SD.exists(file)) {
+      AddLog_P(LOG_LEVEL_INFO,PSTR("file not found"));
+      return 0;
+    }
+
+    download_file=SD.open(file,FILE_READ);
+    if (!download_file) {
+      AddLog_P(LOG_LEVEL_INFO,PSTR("could not open file"));
+      return 0;
+    }
+
+    if (download_file.isDirectory()) {
+      download_file.close();
+      return 1;
+    }
+
+    uint32_t flen=download_file.size();
+
+    download_Client = WebServer->client();
+    WebServer->setContentLength(flen);
+
+    char attachment[100];
+    char *cp;
+    for (uint8_t cnt=strlen(file); cnt>=0; cnt--) {
+      if (file[cnt]=='/') {
+        cp=&file[cnt+1];
+        break;
+      }
+    }
+    snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=%s"),cp);
+    WebServer->sendHeader(F("Content-Disposition"), attachment);
+    WSSend(200, CT_STREAM, "");
+
+    uint8_t buff[512];
+    uint16_t bread;
+
+
+    uint8_t cnt=0;
+    while (download_file.available()) {
+      bread=download_file.read(buff,sizeof(buff));
+      uint16_t bw=download_Client.write((const char*)buff,bread);
+      if (!bw) break;
+      cnt++;
+      if (cnt>7) {
+        cnt=0;
+        if (glob_script_mem.script_loglevel&0x80) {
+
+          loop();
+        }
+      }
+    }
+    download_file.close();
+    download_Client.stop();
+    return 0;
+}
+
+#endif
+
+
+void HandleScriptTextareaConfiguration(void) {
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("save")) {
+    ScriptSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+}
+
+void HandleScriptConfiguration(void) {
+
+    if (!HttpCheckPriviledgedAccess()) { return; }
+
+    AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_SCRIPT);
+
+#ifdef USE_SCRIPT_FATFS
+    if (WebServer->hasArg("d1")) {
+      DownloadFile(glob_script_mem.flink[0]);
+    }
+    if (WebServer->hasArg("d2")) {
+      DownloadFile(glob_script_mem.flink[1]);
+    }
+    if (WebServer->hasArg("upl")) {
+      Script_FileUploadConfiguration();
+    }
+#endif
+
+    WSContentStart_P(S_CONFIGURE_SCRIPT);
+    WSContentSendStyle();
+    WSContentSend_P(HTTP_FORM_SCRIPT);
+
+
+#ifdef xSCRIPT_STRIP_COMMENTS
+    uint16_t ssize=glob_script_mem.script_size;
+    if (bitRead(Settings.rule_enabled, 1)) ssize*=2;
+    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",ssize);
+#else
+    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",glob_script_mem.script_size);
+#endif
+
+
+    if (glob_script_mem.script_ram[0]) {
+      _WSContentSend(glob_script_mem.script_ram);
+    }
+    WSContentSend_P(HTTP_FORM_SCRIPT1b);
+
+#ifdef USE_SCRIPT_FATFS
+    if (glob_script_mem.script_sd_found) {
+      WSContentSend_P(HTTP_FORM_SCRIPT1d);
+      if (glob_script_mem.flink[0][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,1,glob_script_mem.flink[0]);
+      if (glob_script_mem.flink[1][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,2,glob_script_mem.flink[1]);
+    }
+#endif
+
+    WSContentSend_P(HTTP_SCRIPT_FORM_END);
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentStop();
+  }
+
+
+void ScriptSaveSettings(void) {
+
+  if (WebServer->hasArg("c1")) {
+    bitWrite(Settings.rule_enabled,0,1);
+  } else {
+    bitWrite(Settings.rule_enabled,0,0);
+  }
+
+
+  String str = WebServer->arg("t1");
+
+  if (*str.c_str()) {
+
+    str.replace("\r\n","\n");
+    str.replace("\r","\n");
+
+#ifdef xSCRIPT_STRIP_COMMENTS
+    if (bitRead(Settings.rule_enabled, 1)) {
+      char *sp=(char*)str.c_str();
+      char *sp1=sp;
+      char *dp=sp;
+      uint8_t flg=0;
+      while (*sp) {
+        while (*sp==' ') sp++;
+        sp1=sp;
+        sp=strchr(sp,'\n');
+        if (!sp) {
+          flg=1;
+        } else {
+          *sp=0;
+        }
+        if (*sp1!=';') {
+          uint8_t slen=strlen(sp1);
+          if (slen) {
+            strcpy(dp,sp1);
+            dp+=slen;
+            *dp++='\n';
+          }
+        }
+        if (flg) {
+          *dp=0;
+          break;
+        }
+        sp++;
+      }
+    }
+#endif
+
+    strlcpy(glob_script_mem.script_ram,str.c_str(), glob_script_mem.script_size);
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+    if (glob_script_mem.flags&1) {
+      EEP_WRITE(0,EEP_SCRIPT_SIZE,glob_script_mem.script_ram);
+    }
+#endif
+#endif
+
+#ifdef USE_SCRIPT_FATFS
+    if (glob_script_mem.flags&1) {
+      SD.remove(FAT_SCRIPT_NAME);
+      File file=SD.open(FAT_SCRIPT_NAME,FILE_WRITE);
+      file.write(glob_script_mem.script_ram,FAT_SCRIPT_SIZE);
+      file.close();
+    }
+#endif
+
+  }
+
+  if (glob_script_mem.script_mem) {
+    Scripter_save_pvars();
+    free(glob_script_mem.script_mem);
+    glob_script_mem.script_mem=0;
+    glob_script_mem.script_mem_size=0;
+  }
+
+  if (bitRead(Settings.rule_enabled, 0)) {
+    int16_t res=Init_Scripter();
+    if (res) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
+      return;
+    }
+    Run_Scripter(">B",2,0);
+    fast_script=Run_Scripter(">F",-2,0);
+  }
+}
+
+#endif
+
+
+#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+
+
+#define HUE_DEV_MVNUM 5
+#define HUE_DEV_NSIZE 16
+struct HUE_SCRIPT {
+  char name[HUE_DEV_NSIZE];
+  uint8_t type;
+  uint8_t index[HUE_DEV_MVNUM];
+  uint8_t vindex[HUE_DEV_MVNUM];
+} hue_script[32];
+
+
+const char SCRIPT_HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
+  "{\"state\":"
+  "{\"on\":{state},"
+  "{light_status}"
+  "\"alert\":\"none\","
+  "\"effect\":\"none\","
+  "\"reachable\":true}"
+  ",\"type\":\"{type}\","
+  "\"name\":\"{j1\","
+  "\"modelid\":\"{m1}\","
+  "\"uniqueid\":\"{j2\","
+  "\"swversion\":\"5.50.1.19085\"}";
+# 3624 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+const char SCRIPT_HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
+"{\"state\":{"
+"\"presence\":{state},"
+"\"lastupdated\":\"2017-10-01T12:37:30\""
+"},"
+"\"swupdate\":{"
+"\"state\":\"noupdates\","
+"\"lastinstall\": null"
+"},"
+"\"config\":{"
+"\"on\":true,"
+"\"battery\":100,"
+"\"reachable\":true,"
+"\"alert\":\"none\","
+"\"ledindication\":false,"
+"\"usertest\":false,"
+"\"sensitivity\":2,"
+"\"sensitivitymax\":2,"
+"\"pending\":[]"
+"},"
+"\"name\":\"{j1\","
+"\"type\":\"ZLLPresence\","
+"\"modelid\":\"SML001\","
+"\"manufacturername\":\"Philips\","
+"\"swversion\":\"6.1.0.18912\","
+"\"uniqueid\":\"{j2\""
+"}";
+# 3705 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+void Script_HueStatus(String *response, uint16_t hue_devs) {
+
+  if (hue_script[hue_devs].type=='p') {
+    *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2);
+    response->replace("{j1",hue_script[hue_devs].name);
+    response->replace("{j2", GetHueDeviceId(hue_devs));
+    uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
+    response->replace("{state}", (pwr ? "true" : "false"));
+    return;
+  }
+
+  *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON1);
+  uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
+  response->replace("{state}", (pwr ? "true" : "false"));
+  String light_status = "";
+  if (hue_script[hue_devs].index[1]>0) {
+
+    light_status += "\"bri\":";
+    uint32_t bri=glob_script_mem.fvars[hue_script[hue_devs].index[1]-1];
+    if (bri > 254) bri = 254;
+    if (bri < 1) bri = 1;
+    light_status += String(bri);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[2]>0) {
+
+    uint32_t hue=glob_script_mem.fvars[hue_script[hue_devs].index[2]-1];
+
+    light_status += "\"hue\":";
+    light_status += String(hue);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[3]>0) {
+
+    uint32_t sat=glob_script_mem.fvars[hue_script[hue_devs].index[3]-1] ;
+    if (sat > 254) sat = 254;
+    if (sat < 1) sat = 1;
+    light_status += "\"sat\":";
+    light_status += String(sat);
+    light_status += ",";
+  }
+  if (hue_script[hue_devs].index[4]>0) {
+
+    uint32_t ct=glob_script_mem.fvars[hue_script[hue_devs].index[4]-1];
+    light_status += "\"ct\":";
+    light_status += String(ct);
+    light_status += ",";
+  }
+
+  float temp;
+  switch (hue_script[hue_devs].type) {
+    case 'C':
+      response->replace("{type}","Color Ligh");
+      response->replace("{m1","LST001");
+      break;
+    case 'D':
+      response->replace("{type}","Dimmable Light");
+      response->replace("{m1","LWB004");
+      break;
+    case 'T':
+      response->replace("{type}","Color Temperature Light");
+      response->replace("{m1","LTW011");
+      break;
+    case 'E':
+      response->replace("{type}","Extended color light");
+      response->replace("{m1","LCT007");
+      break;
+    case 'S':
+      response->replace("{type}","On/Off light");
+      response->replace("{m1","LCT007");
+      break;
+    default:
+      response->replace("{type}","color light");
+      response->replace("{m1","LST001");
+      break;
+  }
+
+  response->replace("{light_status}", light_status);
+  response->replace("{j1",hue_script[hue_devs].name);
+  response->replace("{j2", GetHueDeviceId(hue_devs));
+
+}
+
+void Script_Check_Hue(String *response) {
+  if (!bitRead(Settings.rule_enabled, 0)) return;
+
+  uint8_t hue_script_found=Run_Scripter(">H",-2,0);
+  if (hue_script_found!=99) return;
+
+  char line[128];
+  char tmp[128];
+  uint8_t hue_devs=0;
+  uint8_t vindex=0;
+  char *cp;
+  char *lp=glob_script_mem.section_ptr+2;
+  while (lp) {
+    SCRIPT_SKIP_SPACES
+    while (*lp==SCRIPT_EOL) {
+     lp++;
+    }
+    if (!*lp || *lp=='#' || *lp=='>') {
+        break;
+    }
+    if (*lp!=';') {
+
+      memcpy(line,lp,sizeof(line));
+      line[sizeof(line)-1]=0;
+      cp=line;
+      for (uint32_t i=0; i<sizeof(line); i++) {
+        if (!*cp || *cp=='\n' || *cp=='\r') {
+          *cp=0;
+          break;
+        }
+        cp++;
+      }
+      Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+
+
+      cp=tmp;
+      cp=strchr(cp,',');
+      if (!cp) break;
+      *cp=0;
+
+      strlcpy(hue_script[hue_devs].name,tmp,HUE_DEV_NSIZE);
+      cp++;
+      while (*cp==' ') cp++;
+
+      hue_script[hue_devs].type=*cp;
+
+      for (vindex=0;vindex<HUE_DEV_MVNUM;vindex++) {
+        hue_script[hue_devs].index[vindex]=0;
+      }
+      vindex=0;
+      while (1) {
+        cp=strchr(cp,',');
+        if (!cp) break;
+
+        cp++;
+        while (*cp==' ') cp++;
+
+        vindex==0xff;
+        if (!strncmp(cp,"on=",3)) {
+          cp+=3;
+          vindex=0;
+        } else if (!strncmp(cp,"bri=",4)) {
+          cp+=4;
+          vindex=1;
+        } else if (!strncmp(cp,"hue=",4)) {
+          cp+=4;
+          vindex=2;
+        } else if (!strncmp(cp,"sat=",4)) {
+          cp+=4;
+          vindex=3;
+        } else if (!strncmp(cp,"ct=",3)) {
+          cp+=3;
+          vindex=4;
+        } else {
+
+          vindex==0xff;
+          break;
+        }
+        if (vindex!=0xff) {
+          struct T_INDEX ind;
+          uint8_t vtype;
+          char vname[16];
+          for (uint32_t cnt=0;cnt<sizeof(vname)-1;cnt++) {
+            if (*cp==',' || *cp==0) {
+              vname[cnt]=0;
+              break;
+            }
+            vname[cnt]=*cp++;
+          }
+          isvar(vname,&vtype,&ind,0,0,0);
+          if (vtype!=VAR_NV) {
+
+            if (vtype==NUM_RES || (vtype&STYPE)==0) {
+              hue_script[hue_devs].vindex[vindex]=ind.index;
+              hue_script[hue_devs].index[vindex]=glob_script_mem.type[ind.index].index+1;
+            } else {
+
+            }
+          }
+        }
+      }
+
+      if (response) {
+        if (devices_present) {
+          *response+=",\"";
+        }
+        else {
+          if (hue_devs>0) *response+=",\"";
+        }
+        *response+=String(EncodeLightId(hue_devs+devices_present+1))+"\":";
+        Script_HueStatus(response,hue_devs);
+      }
+
+      hue_devs++;
+    }
+    if (*lp==SCRIPT_EOL) {
+      lp++;
+    } else {
+      lp = strchr(lp, SCRIPT_EOL);
+      if (!lp) break;
+      lp++;
+    }
+  }
+#if 0
+  if (response) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Hue: %d"), hue_devs);
+    toLog(">>>>");
+    toLog(response->c_str());
+    toLog(response->c_str()+LOGSZ);
+  }
+#endif
+}
+
+const char sHUE_LIGHT_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+
+const char sHUE_SENSOR_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+
+const char sHUE_ERROR_JSON[] PROGMEM =
+  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
+
+
+
+void Script_Handle_Hue(String *path) {
+  String response;
+  int code = 200;
+  uint16_t tmp = 0;
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint16_t ct = 0;
+  bool resp = false;
+
+  uint8_t device = DecodeLightId(atoi(path->c_str()));
+  uint8_t index = device-devices_present-1;
+
+  if (WebServer->args()) {
+    response = "[";
+
+    StaticJsonBuffer<400> jsonBuffer;
+    JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
+    if (hue_json.containsKey("on")) {
+
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "on");
+
+      bool on = hue_json["on"];
+      switch(on)
+      {
+        case false : glob_script_mem.fvars[hue_script[index].index[0]-1]=0;
+                     response.replace("{re", "false");
+                     break;
+        case true : glob_script_mem.fvars[hue_script[index].index[0]-1]=1;
+                     response.replace("{re", "true");
+                     break;
+      }
+      glob_script_mem.type[hue_script[index].vindex[0]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("bri")) {
+      tmp = hue_json["bri"];
+      bri=tmp;
+      if (254 <= bri) { bri = 255; }
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "bri");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[1]-1]=bri;
+      glob_script_mem.type[hue_script[index].vindex[1]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("xy")) {
+      float x, y;
+      x = hue_json["xy"][0];
+      y = hue_json["xy"][1];
+      const String &x_str = hue_json["xy"][0];
+      const String &y_str = hue_json["xy"][1];
+      uint8_t rr,gg,bb;
+      LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
+      LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(device));
+      response.replace("{cm", "xy");
+      response.replace("{re", "[" + x_str + "," + y_str + "]");
+      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
+      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
+      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
+      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
+      resp = true;
+    }
+
+    if (hue_json.containsKey("hue")) {
+      tmp = hue_json["hue"];
+
+
+      hue=tmp;
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "hue");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
+      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("sat")) {
+      tmp = hue_json["sat"];
+      sat=tmp;
+      if (254 <= sat) { sat = 255; }
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "sat");
+      response.replace("{re", String(tmp));
+      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
+      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
+      resp = true;
+    }
+    if (hue_json.containsKey("ct")) {
+      ct = hue_json["ct"];
+      if (resp) { response += ","; }
+      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
+      response.replace("{id", String(EncodeLightId(device)));
+      response.replace("{cm", "ct");
+      response.replace("{re", String(ct));
+      glob_script_mem.fvars[hue_script[index].index[4]-1]=ct;
+      glob_script_mem.type[hue_script[index].vindex[4]].bits.changed=1;
+      resp = true;
+    }
+    response += "]";
+
+  } else {
+    response = FPSTR(sHUE_ERROR_JSON);
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
+  WSSend(code, CT_JSON, response);
+  if (resp) {
+    Run_Scripter(">E",2,0);
+  }
+}
+#endif
+
+
+#ifdef USE_SCRIPT_SUB_COMMAND
+bool Script_SubCmd(void) {
+  if (!bitRead(Settings.rule_enabled, 0)) return false;
+
+  if (tasm_cmd_activ) return false;
+
+  char command[CMDSZ];
+  strlcpy(command,XdrvMailbox.topic,CMDSZ);
+  uint32_t pl=XdrvMailbox.payload;
+  char pld[64];
+  strlcpy(pld,XdrvMailbox.data,sizeof(pld));
+
+  char cmdbuff[128];
+  char *cp=cmdbuff;
+  *cp++='#';
+  strcpy(cp,XdrvMailbox.topic);
+  uint8_t tlen=strlen(XdrvMailbox.topic);
+  cp+=tlen;
+  if (XdrvMailbox.index > 0) {
+    *cp++=XdrvMailbox.index|0x30;
+    tlen++;
+  }
+  if ((XdrvMailbox.payload>0) || (XdrvMailbox.data_len>0)) {
+    *cp++='(';
+    strncpy(cp,XdrvMailbox.data,XdrvMailbox.data_len);
+    cp+=XdrvMailbox.data_len;
+    *cp++=')';
+    *cp=0;
+  }
+
+  uint32_t res=Run_Scripter(cmdbuff,tlen+1,0);
+
+  if (res) return false;
+  else {
+    if (pl>=0) {
+      Response_P(S_JSON_COMMAND_NVALUE, command, pl);
+    } else {
+      Response_P(S_JSON_COMMAND_SVALUE, command, pld);
+    }
+  }
+  return true;
+}
+#endif
+
+void execute_script(char *script) {
+  char *svd_sp=glob_script_mem.scriptptr;
+  strcat(script,"\n#");
+  glob_script_mem.scriptptr=script;
+  Run_Scripter(">",1,0);
+  glob_script_mem.scriptptr=svd_sp;
+}
+#define D_CMND_SCRIPT "Script"
+#define D_CMND_SUBSCRIBE "Subscribe"
+#define D_CMND_UNSUBSCRIBE "Unsubscribe"
+
+enum ScriptCommands { CMND_SCRIPT,CMND_SUBSCRIBE, CMND_UNSUBSCRIBE };
+const char kScriptCommands[] PROGMEM = D_CMND_SCRIPT "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE;
+
+bool ScriptCommand(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t index = XdrvMailbox.index;
+
+  if (tasm_cmd_activ) return false;
+
+  int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kScriptCommands);
+  if (-1 == command_code) {
+    serviced = false;
+  }
+  else if ((CMND_SCRIPT == command_code) && (index > 0)) {
+
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
+      switch (XdrvMailbox.payload) {
+        case 0:
+        case 1:
+          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
+          break;
+#ifdef xSCRIPT_STRIP_COMMENTS
+        case 2:
+          bitWrite(Settings.rule_enabled, 1,0);
+          break;
+        case 3:
+          bitWrite(Settings.rule_enabled, 1,1);
+          break;
+#endif
+      }
+    } else {
+      if ('>' == XdrvMailbox.data[0]) {
+
+        snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\"}"),command,XdrvMailbox.data);
+        if (bitRead(Settings.rule_enabled, 0)) {
+          for (uint8_t count=0; count<XdrvMailbox.data_len; count++) {
+            if (XdrvMailbox.data[count]==';') XdrvMailbox.data[count]='\n';
+          }
+          execute_script(XdrvMailbox.data);
+        }
+      }
+      return serviced;
+    }
+    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Free\":%d}"),command, GetStateText(bitRead(Settings.rule_enabled,0)),glob_script_mem.script_size-strlen(glob_script_mem.script_ram));
+#ifdef SUPPORT_MQTT_EVENT
+  } else if (CMND_SUBSCRIBE == command_code) {
+      String result = ScriptSubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
+      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
+    } else if (CMND_UNSUBSCRIBE == command_code) {
+      String result = ScriptUnsubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
+      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
+#endif
+  }
+  return serviced;
+}
+
+
+#ifdef USE_SCRIPT_FATFS
+
+uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
+  return (year - 1980) << 9 | month << 5 | day;
+}
+uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
+  return hour << 11 | minute << 5 | second >> 1;
+}
+
+void dateTime(uint16_t* date, uint16_t* time) {
+
+  *date = xFAT_DATE(RtcTime.year,RtcTime.month, RtcTime.day_of_month);
+
+  *time = xFAT_TIME(RtcTime.hour,RtcTime.minute,RtcTime.second);
+}
+
+#endif
+
+
+
+#ifdef SUPPORT_MQTT_EVENT
+# 4199 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+bool ScriptMqttData(void)
+{
+  bool serviced = false;
+
+  toLog(XdrvMailbox.data);
+  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
+    return false;
+  }
+  String sTopic = XdrvMailbox.topic;
+  String sData = XdrvMailbox.data;
+
+  MQTT_Subscription event_item;
+
+  for (uint32_t index = 0; index < subscriptions.size(); index++) {
+    event_item = subscriptions.get(index);
+
+
+    if (sTopic.startsWith(event_item.Topic)) {
+
+      serviced = true;
+      String value;
+      String lkey;
+      if (event_item.Key.length() == 0) {
+        value = sData;
+      } else {
+        StaticJsonBuffer<400> jsonBuf;
+        JsonObject& jsonData = jsonBuf.parseObject(sData);
+        String key1 = event_item.Key;
+        String key2;
+        if (!jsonData.success()) break;
+        int dot;
+        if ((dot = key1.indexOf('.')) > 0) {
+          key2 = key1.substring(dot+1);
+          key1 = key1.substring(0, dot);
+          lkey=key2;
+          if (!jsonData[key1][key2].success()) break;
+          value = (const char *)jsonData[key1][key2];
+        } else {
+          if (!jsonData[key1].success()) break;
+          value = (const char *)jsonData[key1];
+          lkey=key1;
+        }
+      }
+      value.trim();
+      char sbuffer[128];
+
+      if (!strncmp(lkey.c_str(),"Epoch",5)) {
+        uint32_t ep=atoi(value.c_str())-(uint32_t)EPOCH_OFFSET;
+        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(),ep);
+      } else {
+        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str());
+      }
+
+      execute_script(sbuffer);
+    }
+  }
+  return serviced;
+}
+# 4274 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+String ScriptSubscribe(const char *data, int data_len)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (data_len > 0) {
+    char parameters[data_len+1];
+    memcpy(parameters, data, data_len);
+    parameters[data_len] = '\0';
+    String event_name, topic, key;
+
+    char * pos = strtok(parameters, ",");
+    if (pos) {
+      event_name = Trim(pos);
+      pos = strtok(nullptr, ",");
+      if (pos) {
+        topic = Trim(pos);
+        pos = strtok(nullptr, ",");
+        if (pos) {
+          key = Trim(pos);
+        }
+      }
+    }
+
+
+    if (event_name.length() > 0 && topic.length() > 0) {
+
+      for (uint32_t index=0; index < subscriptions.size(); index++) {
+        if (subscriptions.get(index).Event.equals(event_name)) {
+
+          String stopic = subscriptions.get(index).Topic + "/#";
+          MqttUnsubscribe(stopic.c_str());
+          subscriptions.remove(index);
+          break;
+        }
+      }
+
+      if (!topic.endsWith("#")) {
+        if (topic.endsWith("/")) {
+          topic.concat("#");
+        } else {
+          topic.concat("/#");
+        }
+      }
+
+
+      subscription_item.Event = event_name;
+      subscription_item.Topic = topic.substring(0, topic.length() - 2);
+      subscription_item.Key = key;
+      subscriptions.add(subscription_item);
+
+      MqttSubscribe(topic.c_str());
+      events.concat(event_name + "," + topic
+        + (key.length()>0 ? "," : "")
+        + key);
+    } else {
+      events = D_JSON_WRONG_PARAMETERS;
+    }
+  } else {
+
+    for (uint32_t index=0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      events.concat(subscription_item.Event + "," + subscription_item.Topic
+        + (subscription_item.Key.length()>0 ? "," : "")
+        + subscription_item.Key + "; ");
+    }
+  }
+  return events;
+}
+# 4354 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
+String ScriptUnsubscribe(const char * data, int data_len)
+{
+  MQTT_Subscription subscription_item;
+  String events;
+  if (data_len > 0) {
+    for (uint32_t index = 0; index < subscriptions.size(); index++) {
+      subscription_item = subscriptions.get(index);
+      if (subscription_item.Event.equalsIgnoreCase(data)) {
+        String stopic = subscription_item.Topic + "/#";
+        MqttUnsubscribe(stopic.c_str());
+        events = subscription_item.Event;
+        subscriptions.remove(index);
+        break;
+      }
+    }
+  } else {
+
+    String stopic;
+    while (subscriptions.size() > 0) {
+      events.concat(subscriptions.get(0).Event + "; ");
+      stopic = subscriptions.get(0).Topic + "/#";
+      MqttUnsubscribe(stopic.c_str());
+      subscriptions.remove(0);
+    }
+  }
+  return events;
+}
+#endif
+
+
+
+#ifdef USE_SCRIPT_WEB_DISPLAY
+
+void Script_Check_HTML_Setvars(void) {
+
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  if (WebServer->hasArg("sv")) {
+    String stmp = WebServer->arg("sv");
+    char cmdbuf[64];
+    memset(cmdbuf,0,sizeof(cmdbuf));
+    char *cp=cmdbuf;
+    *cp++='>';
+    strncpy(cp,stmp.c_str(),sizeof(cmdbuf)-1);
+    char *cp1=strchr(cp,'_');
+    if (!cp1) return;
+    *cp1=0;
+    char vname[32];
+    strncpy(vname,cp,sizeof(vname));
+    *cp1='=';
+    cp1++;
+
+    struct T_INDEX ind;
+    uint8_t vtype;
+    isvar(vname,&vtype,&ind,0,0,0);
+    if (vtype!=NUM_RES && vtype&STYPE) {
+
+      uint8_t tlen=strlen(cp1);
+      memmove(cp1+1,cp1,tlen);
+      *cp1='\"';
+      *(cp1+tlen+1)='\"';
+    }
+
+
+    execute_script(cmdbuf);
+    Run_Scripter(">E",2,0);
+  }
+}
+
+
+const char SCRIPT_MSG_BUTTONa[] PROGMEM =
+  "<button type='submit' style=\"width:%d%%\" onclick='seva(%d,\"%s\")'>%s</button>";
+
+const char SCRIPT_MSG_BUTTONa_TBL[] PROGMEM =
+  "<td style=\"width:%d%%\"><button type='submit' onclick='seva(%d,\"%s\")'>%s</button></td>";
+
+const char SCRIPT_MSG_BUTTONb[] PROGMEM =
+  "<img width=\"%d%%\"></img>";
+
+const char SCRIPT_MSG_BUT_START[] PROGMEM =
+  "<div>";
+const char SCRIPT_MSG_BUT_START_TBL[] PROGMEM =
+  "<table style='width:100%%'><tr>";
+
+const char SCRIPT_MSG_BUT_STOP[] PROGMEM =
+  "</div>";
+const char SCRIPT_MSG_BUT_STOP_TBL[] PROGMEM =
+  "</tr></table>";
+
+const char SCRIPT_MSG_SLIDER[] PROGMEM =
+  "<div><span class='p'>%s</span><center><b>%s</b><span class='q'>%s</span></div>"
+  "<div><input type='range' min='%d' max='%d' value='%d' onchange='seva(value,\"%s\")'></div>";
+
+const char SCRIPT_MSG_CHKBOX[] PROGMEM =
+  "<div><center><label><b>%s</b><input type='checkbox' %s onchange='seva(%d,\"%s\")'></label></div>";
+
+const char SCRIPT_MSG_TEXTINP[] PROGMEM =
+  "<div><center><label><b>%s</b><input type='text'  value='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
+
+const char SCRIPT_MSG_NUMINP[] PROGMEM =
+  "<div><center><label><b>%s</b><input  min='%s' max='%s' step='%s' value='%s' type='number' style='width:200px' onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
+
+
+void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen) {
+uint32_t cnt;
+  for (cnt=0;cnt<blen-1;cnt++) {
+    if (*sp==' ' || *sp==')') {
+      break;
+    }
+    nbuf[cnt]=*sp++;
+  }
+  nbuf[cnt]=0;
+}
+
+void ScriptWebShow(void) {
+  uint8_t web_script=Run_Scripter(">W",-2,0);
+  if (web_script==99) {
+    char line[128];
+    char tmp[128];
+    uint8_t optflg=0;
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        char *lin=line;
+        if (*lin=='@') {
+          lin++;
+          optflg=1;
+        } else {
+          optflg=0;
+        }
+
+        if (!strncmp(lin,"sl(",3)) {
+
+          char *lp=lin;
+          float min;
+          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
+          SCRIPT_SKIP_SPACES
+
+          float max;
+          lp=GetNumericResult(lp,OPER_EQU,&max,0);
+          SCRIPT_SKIP_SPACES
+          float val;
+          char *slp=lp;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char left[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,left,0);
+          SCRIPT_SKIP_SPACES
+          char mid[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,mid,0);
+          SCRIPT_SKIP_SPACES
+          char right[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,right,0);
+          SCRIPT_SKIP_SPACES
+
+          WSContentSend_PD(SCRIPT_MSG_SLIDER,left,mid,right,(uint32_t)min,(uint32_t)max,(uint32_t)val,vname);
+
+
+        } else if (!strncmp(lin,"ck(",3)) {
+          char *lp=lin+3;
+          char *slp=lp;
+          float val;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+          const char *cp;
+          uint8_t uval;
+          if (val>0) {
+            cp="checked='checked'";
+            uval=0;
+          } else {
+            cp="";
+            uval=1;
+          }
+          WSContentSend_PD(SCRIPT_MSG_CHKBOX,label,(char*)cp,uval,vname);
+
+        } else if (!strncmp(lin,"bu(",3)) {
+          char *lp=lin+3;
+          uint8_t bcnt=0;
+          char *found=lin;
+          while (bcnt<4) {
+            found=strstr(found,"bu(");
+            if (!found) break;
+            found+=3;
+            bcnt++;
+          }
+          uint8_t proz=100/bcnt;
+          if (!optflg && bcnt>1) proz-=2;
+          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_START_TBL);
+          else WSContentSend_PD(SCRIPT_MSG_BUT_START);
+          for (uint32_t cnt=0;cnt<bcnt;cnt++) {
+            float val;
+            char *slp=lp;
+            lp=GetNumericResult(lp,OPER_EQU,&val,0);
+            SCRIPT_SKIP_SPACES
+
+            char vname[16];
+            ScriptGetVarname(vname,slp,sizeof(vname));
+
+            SCRIPT_SKIP_SPACES
+            char ontxt[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,ontxt,0);
+            SCRIPT_SKIP_SPACES
+            char offtxt[SCRIPT_MAXSSIZE];
+            lp=GetStringResult(lp,OPER_EQU,offtxt,0);
+
+            char *cp;
+            uint8_t uval;
+            if (val>0) {
+              cp=ontxt;
+              uval=0;
+            } else {
+              cp=offtxt;
+              uval=1;
+            }
+            if (bcnt>1 && cnt==bcnt-1) {
+              if (!optflg) proz+=2;
+            }
+            if (!optflg) {
+              WSContentSend_PD(SCRIPT_MSG_BUTTONa,proz,uval,vname,cp);
+            } else {
+              WSContentSend_PD(SCRIPT_MSG_BUTTONa_TBL,proz,uval,vname,cp);
+            }
+            if (bcnt>1 && cnt<bcnt-1) {
+              if (!optflg) WSContentSend_PD(SCRIPT_MSG_BUTTONb,2);
+            }
+            lp+=4;
+          }
+          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_STOP_TBL);
+          else WSContentSend_PD(SCRIPT_MSG_BUT_STOP);
+        } else if (!strncmp(lin,"tx(",3)) {
+          char *lp=lin+3;
+          char *slp=lp;
+          char str[SCRIPT_MAXSSIZE];
+          lp=ForceStringVar(lp,str);
+          SCRIPT_SKIP_SPACES
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          WSContentSend_PD(SCRIPT_MSG_TEXTINP,label,str,vname);
+
+        } else if (!strncmp(lin,"nm(",3)) {
+          char *lp=lin;
+          float min;
+          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
+          SCRIPT_SKIP_SPACES
+          float max;
+          lp=GetNumericResult(lp,OPER_EQU,&max,0);
+          SCRIPT_SKIP_SPACES
+          float step;
+          lp=GetNumericResult(lp,OPER_EQU,&step,0);
+          SCRIPT_SKIP_SPACES
+          float val;
+          char *slp=lp;
+          lp=GetNumericResult(lp,OPER_EQU,&val,0);
+          SCRIPT_SKIP_SPACES
+          char vname[16];
+          ScriptGetVarname(vname,slp,sizeof(vname));
+
+          char label[SCRIPT_MAXSSIZE];
+          lp=GetStringResult(lp,OPER_EQU,label,0);
+
+          char vstr[16],minstr[16],maxstr[16],stepstr[16];
+          dtostrfd(val,4,vstr);
+          dtostrfd(min,4,minstr);
+          dtostrfd(max,4,maxstr);
+          dtostrfd(step,4,stepstr);
+          WSContentSend_PD(SCRIPT_MSG_NUMINP,label,minstr,maxstr,stepstr,vstr,vname);
+
+        } else {
+          Replace_Cmd_Vars(lin,tmp,sizeof(tmp));
+          if (optflg) {
+            WSContentSend_PD(PSTR("<div>%s</div>"),tmp);
+          } else {
+            WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
+          }
+        }
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  }
+}
+#endif
+
+
+#ifdef USE_SENDMAIL
+void script_send_email_body(BearSSL::WiFiClientSecure_light *client) {
+uint8_t msect=Run_Scripter(">m",-2,0);
+  if (msect==99) {
+    char line[128];
+    char tmp[128];
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+        client->println(tmp);
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  } else {
+    client->println("*");
+  }
+}
+#endif
+
+#ifdef USE_SCRIPT_JSON_EXPORT
+void ScriptJsonAppend(void) {
+  uint8_t web_script=Run_Scripter(">J",-2,0);
+  if (web_script==99) {
+    char line[128];
+    char tmp[128];
+    char *lp=glob_script_mem.section_ptr+2;
+    while (lp) {
+      while (*lp==SCRIPT_EOL) {
+       lp++;
+      }
+      if (!*lp || *lp=='#' || *lp=='>') {
+          break;
+      }
+      if (*lp!=';') {
+
+        memcpy(line,lp,sizeof(line));
+        line[sizeof(line)-1]=0;
+        char *cp=line;
+        for (uint32_t i=0; i<sizeof(line); i++) {
+          if (!*cp || *cp=='\n' || *cp=='\r') {
+            *cp=0;
+            break;
+          }
+          cp++;
+        }
+        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
+        ResponseAppend_P(PSTR("%s"),tmp);
+      }
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+  }
+}
+#endif
+
+
+
+
+
+
+bool Xdrv10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_PRE_INIT:
+
+      glob_script_mem.script_ram=Settings.rules[0];
+      glob_script_mem.script_size=MAX_SCRIPT_SIZE;
+      glob_script_mem.flags=0;
+      glob_script_mem.script_pram=(uint8_t*)Settings.script_pram[0];
+      glob_script_mem.script_pram_size=PMEM_SIZE;
+
+#ifdef USE_BUTTON_EVENT
+      for (uint32_t cnt=0;cnt<MAX_KEYS;cnt++) {
+        script_button[cnt]=-1;
+      }
+#endif
+
+#ifdef USE_24C256
+#ifndef USE_SCRIPT_FATFS
+   if (I2cEnabled(XI2C_37)) {
+     if (I2cSetDevice(EEPROM_ADDRESS)) {
+
+          char *script;
+          script=(char*)calloc(EEP_SCRIPT_SIZE+4,1);
+          if (!script) break;
+          glob_script_mem.script_ram=script;
+          glob_script_mem.script_size=EEP_SCRIPT_SIZE;
+          EEP_READ(0,EEP_SCRIPT_SIZE,script);
+          if (*script==0xff) {
+            memset(script,EEP_SCRIPT_SIZE,0);
+          }
+          script[EEP_SCRIPT_SIZE-1]=0;
+
+          glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
+          glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
+
+          glob_script_mem.flags=1;
+          I2cSetActiveFound(EEPROM_ADDRESS, "EEPROM");
+        }
+      }
+#endif
+#endif
+
+#ifdef USE_SCRIPT_FATFS
+      if (SD.begin(USE_SCRIPT_FATFS)) {
+        glob_script_mem.script_sd_found=1;
+        char *script;
+        script=(char*)calloc(FAT_SCRIPT_SIZE+4,1);
+        if (!script) break;
+        glob_script_mem.script_ram=script;
+        glob_script_mem.script_size=FAT_SCRIPT_SIZE;
+        if (SD.exists(FAT_SCRIPT_NAME)) {
+          File file=SD.open(FAT_SCRIPT_NAME,FILE_READ);
+          file.read((uint8_t*)script,FAT_SCRIPT_SIZE);
+          file.close();
+        }
+        script[FAT_SCRIPT_SIZE-1]=0;
+
+        glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
+        glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
+
+        glob_script_mem.flags=1;
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
+
+        SdFile::dateTimeCallback(dateTime);
+#endif
+
+      } else {
+        glob_script_mem.script_sd_found=0;
+      }
+#endif
+
+
+      { uint32_t ptr=(uint32_t)glob_script_mem.script_pram;
+      ptr&=0xfffffffc;
+      ptr+=4;
+      glob_script_mem.script_pram=(uint8_t*)ptr;
+      glob_script_mem.script_pram_size-=4;
+      }
+
+      if (bitRead(Settings.rule_enabled, 0)) Init_Scripter();
+      break;
+    case FUNC_INIT:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        Run_Scripter(">B",2,0);
+        fast_script=Run_Scripter(">F",-2,0);
+#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+        Script_Check_Hue(0);
+#endif
+      }
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      ScripterEvery100ms();
+      break;
+    case FUNC_EVERY_SECOND:
+      ScriptEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = ScriptCommand();
+      break;
+    case FUNC_SET_POWER:
+#ifdef SCRIPT_POWER_SECTION
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">P",2,0);
+#else
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,0);
+#endif
+      break;
+    case FUNC_RULES_PROCESS:
+      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,mqtt_data);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_ADD_BUTTON:
+      WSContentSend_P(HTTP_BTN_MENU_RULES);
+      break;
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/" WEB_HANDLE_SCRIPT, HandleScriptConfiguration);
+      WebServer->on("/ta",HTTP_POST, HandleScriptTextareaConfiguration);
+
+#ifdef USE_SCRIPT_FATFS
+      WebServer->on("/u3", HTTP_POST,[]() { WebServer->sendHeader("Location","/u3");WebServer->send(303);},script_upload);
+      WebServer->on("/u3", HTTP_GET,ScriptFileUploadSuccess);
+      WebServer->on("/upl", HTTP_GET,Script_FileUploadConfiguration);
+#endif
+      break;
+#endif
+    case FUNC_SAVE_BEFORE_RESTART:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        Run_Scripter(">R",2,0);
+        Scripter_save_pvars();
+      }
+      break;
+#ifdef SUPPORT_MQTT_EVENT
+    case FUNC_MQTT_DATA:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        result = ScriptMqttData();
+      }
+      break;
+#endif
+#ifdef USE_SCRIPT_WEB_DISPLAY
+    case FUNC_WEB_SENSOR:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        ScriptWebShow();
+      }
+      break;
+#endif
+
+#ifdef USE_SCRIPT_JSON_EXPORT
+    case FUNC_JSON_APPEND:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        ScriptJsonAppend();
+      }
+      break;
+#endif
+
+#ifdef USE_BUTTON_EVENT
+    case FUNC_BUTTON_PRESSED:
+      if (bitRead(Settings.rule_enabled, 0)) {
+        if ((script_button[XdrvMailbox.index]&1)!=(XdrvMailbox.payload&1)) {
+          script_button[XdrvMailbox.index]=XdrvMailbox.payload;
+          Run_Scripter(">b",2,0);
+        }
+      }
+      break;
+#endif
+
+  }
+  return result;
+}
+
+
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
+#ifdef USE_KNX
+# 51 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
+#define XDRV_11 11
+
+#include <esp-knx-ip.h>
+
+address_t KNX_physs_addr;
+address_t KNX_addr;
+
+#define KNX_Empty 255
+
+#define TOGGLE_INHIBIT_TIME 15
+
+float last_temp;
+float last_hum;
+uint8_t toggle_inhibit;
+
+typedef struct __device_parameters
+{
+  uint8_t type;
+
+
+
+
+  bool show;
+
+  bool last_state;
+
+  callback_id_t CB_id;
+
+
+
+
+
+} device_parameters_t;
+
+
+device_parameters_t device_param[] = {
+  { 1, false, false, KNX_Empty },
+  { 2, false, false, KNX_Empty },
+  { 3, false, false, KNX_Empty },
+  { 4, false, false, KNX_Empty },
+  { 5, false, false, KNX_Empty },
+  { 6, false, false, KNX_Empty },
+  { 7, false, false, KNX_Empty },
+  { 8, false, false, KNX_Empty },
+  { 9, false, false, KNX_Empty },
+  { 10, false, false, KNX_Empty },
+  { 11, false, false, KNX_Empty },
+  { 12, false, false, KNX_Empty },
+  { 13, false, false, KNX_Empty },
+  { 14, false, false, KNX_Empty },
+  { 15, false, false, KNX_Empty },
+  { 16, false, false, KNX_Empty },
+  { KNX_TEMPERATURE, false, false, KNX_Empty },
+  { KNX_HUMIDITY , false, false, KNX_Empty },
+  { KNX_ENERGY_VOLTAGE , false, false, KNX_Empty },
+  { KNX_ENERGY_CURRENT , false, false, KNX_Empty },
+  { KNX_ENERGY_POWER , false, false, KNX_Empty },
+  { KNX_ENERGY_POWERFACTOR , false, false, KNX_Empty },
+  { KNX_ENERGY_DAILY , false, false, KNX_Empty },
+  { KNX_ENERGY_START , false, false, KNX_Empty },
+  { KNX_ENERGY_TOTAL , false, false, KNX_Empty },
+  { KNX_SLOT1 , false, false, KNX_Empty },
+  { KNX_SLOT2 , false, false, KNX_Empty },
+  { KNX_SLOT3 , false, false, KNX_Empty },
+  { KNX_SLOT4 , false, false, KNX_Empty },
+  { KNX_SLOT5 , false, false, KNX_Empty },
+  { KNX_Empty, false, false, KNX_Empty}
+};
+
+
+const char * device_param_ga[] = {
+  D_TIMER_OUTPUT " 1",
+  D_TIMER_OUTPUT " 2",
+  D_TIMER_OUTPUT " 3",
+  D_TIMER_OUTPUT " 4",
+  D_TIMER_OUTPUT " 5",
+  D_TIMER_OUTPUT " 6",
+  D_TIMER_OUTPUT " 7",
+  D_TIMER_OUTPUT " 8",
+  D_SENSOR_BUTTON " 1",
+  D_SENSOR_BUTTON " 2",
+  D_SENSOR_BUTTON " 3",
+  D_SENSOR_BUTTON " 4",
+  D_SENSOR_BUTTON " 5",
+  D_SENSOR_BUTTON " 6",
+  D_SENSOR_BUTTON " 7",
+  D_SENSOR_BUTTON " 8",
+  D_TEMPERATURE ,
+  D_HUMIDITY ,
+  D_VOLTAGE ,
+  D_CURRENT ,
+  D_POWERUSAGE ,
+  D_POWER_FACTOR ,
+  D_ENERGY_TODAY ,
+  D_ENERGY_YESTERDAY ,
+  D_ENERGY_TOTAL ,
+  D_KNX_TX_SLOT " 1",
+  D_KNX_TX_SLOT " 2",
+  D_KNX_TX_SLOT " 3",
+  D_KNX_TX_SLOT " 4",
+  D_KNX_TX_SLOT " 5",
+  nullptr
+};
+
+
+const char *device_param_cb[] = {
+  D_TIMER_OUTPUT " 1",
+  D_TIMER_OUTPUT " 2",
+  D_TIMER_OUTPUT " 3",
+  D_TIMER_OUTPUT " 4",
+  D_TIMER_OUTPUT " 5",
+  D_TIMER_OUTPUT " 6",
+  D_TIMER_OUTPUT " 7",
+  D_TIMER_OUTPUT " 8",
+  D_TIMER_OUTPUT " 1 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 2 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 3 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 4 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 5 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 6 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 7 " D_BUTTON_TOGGLE,
+  D_TIMER_OUTPUT " 8 " D_BUTTON_TOGGLE,
+  D_REPLY " " D_TEMPERATURE,
+  D_REPLY " " D_HUMIDITY,
+  D_REPLY " " D_VOLTAGE ,
+  D_REPLY " " D_CURRENT ,
+  D_REPLY " " D_POWERUSAGE ,
+  D_REPLY " " D_POWER_FACTOR ,
+  D_REPLY " " D_ENERGY_TODAY ,
+  D_REPLY " " D_ENERGY_YESTERDAY ,
+  D_REPLY " " D_ENERGY_TOTAL ,
+  D_KNX_RX_SLOT " 1",
+  D_KNX_RX_SLOT " 2",
+  D_KNX_RX_SLOT " 3",
+  D_KNX_RX_SLOT " 4",
+  D_KNX_RX_SLOT " 5",
+  nullptr
+};
+
+
+#define D_PRFX_KNX "Knx"
+#define D_CMND_KNXTXCMND "Tx_Cmnd"
+#define D_CMND_KNXTXVAL "Tx_Val"
+#define D_CMND_KNX_ENABLED "_Enabled"
+#define D_CMND_KNX_ENHANCED "_Enhanced"
+#define D_CMND_KNX_PA "_PA"
+#define D_CMND_KNX_GA "_GA"
+#define D_CMND_KNX_CB "_CB"
+
+const char kKnxCommands[] PROGMEM = D_PRFX_KNX "|"
+  D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB ;
+
+void (* const KnxCommand[])(void) PROGMEM = {
+  &CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb };
+
+uint8_t KNX_GA_Search( uint8_t param, uint8_t start = 0 )
+{
+  for (uint32_t i = start; i < Settings.knx_GA_registered; ++i)
+  {
+    if ( Settings.knx_GA_param[i] == param )
+    {
+      if ( Settings.knx_GA_addr[i] != 0 )
+      {
+         if ( i >= start ) { return i; }
+      }
+    }
+  }
+  return KNX_Empty;
+}
+
+
+uint8_t KNX_CB_Search( uint8_t param, uint8_t start = 0 )
+{
+  for (uint32_t i = start; i < Settings.knx_CB_registered; ++i)
+  {
+    if ( Settings.knx_CB_param[i] == param )
+    {
+      if ( Settings.knx_CB_addr[i] != 0 )
+      {
+         if ( i >= start ) { return i; }
+      }
+    }
+  }
+  return KNX_Empty;
+}
+
+
+void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF )
+{
+
+  if ( Settings.knx_GA_registered >= MAX_KNX_GA ) { return; }
+  if ( GA_FNUM == 0 && GA_AREA == 0 && GA_FDEF == 0 ) { return; }
+
+
+  Settings.knx_GA_param[Settings.knx_GA_registered] = GAop;
+  KNX_addr.ga.area = GA_FNUM;
+  KNX_addr.ga.line = GA_AREA;
+  KNX_addr.ga.member = GA_FDEF;
+  Settings.knx_GA_addr[Settings.knx_GA_registered] = KNX_addr.value;
+
+  Settings.knx_GA_registered++;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " GA #%d: %s " D_TO " %d/%d/%d"),
+   Settings.knx_GA_registered,
+   device_param_ga[GAop-1],
+   GA_FNUM, GA_AREA, GA_FDEF );
+}
+
+
+void KNX_DEL_GA( uint8_t GAnum )
+{
+
+  uint8_t dest_offset = 0;
+  uint8_t src_offset = 0;
+  uint8_t len = 0;
+
+
+  Settings.knx_GA_param[GAnum-1] = 0;
+
+  if (GAnum == 1)
+  {
+
+    src_offset = 1;
+
+
+
+    len = (Settings.knx_GA_registered - 1);
+  }
+  else if (GAnum == Settings.knx_GA_registered)
+  {
+
+  }
+  else
+  {
+
+
+
+
+    dest_offset = GAnum -1 ;
+    src_offset = dest_offset + 1;
+    len = (Settings.knx_GA_registered - GAnum);
+  }
+
+  if (len > 0)
+  {
+    memmove(Settings.knx_GA_param + dest_offset, Settings.knx_GA_param + src_offset, len * sizeof(uint8_t));
+    memmove(Settings.knx_GA_addr + dest_offset, Settings.knx_GA_addr + src_offset, len * sizeof(uint16_t));
+  }
+
+  Settings.knx_GA_registered--;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " GA #%d"),
+    GAnum );
+}
+
+
+void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF )
+{
+
+  if ( Settings.knx_CB_registered >= MAX_KNX_CB ) { return; }
+  if ( CB_FNUM == 0 && CB_AREA == 0 && CB_FDEF == 0 ) { return; }
+
+
+  if ( device_param[CBop-1].CB_id == KNX_Empty )
+  {
+
+    device_param[CBop-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[CBop-1]);
+
+
+
+
+  }
+
+  Settings.knx_CB_param[Settings.knx_CB_registered] = CBop;
+  KNX_addr.ga.area = CB_FNUM;
+  KNX_addr.ga.line = CB_AREA;
+  KNX_addr.ga.member = CB_FDEF;
+  Settings.knx_CB_addr[Settings.knx_CB_registered] = KNX_addr.value;
+
+  knx.callback_assign( device_param[CBop-1].CB_id, KNX_addr );
+
+  Settings.knx_CB_registered++;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " CB #%d: %d/%d/%d " D_TO " %s"),
+   Settings.knx_CB_registered,
+   CB_FNUM, CB_AREA, CB_FDEF,
+   device_param_cb[CBop-1] );
+}
+
+
+void KNX_DEL_CB( uint8_t CBnum )
+{
+  uint8_t oldparam = Settings.knx_CB_param[CBnum-1];
+  uint8_t dest_offset = 0;
+  uint8_t src_offset = 0;
+  uint8_t len = 0;
+
+
+  knx.callback_unassign(CBnum-1);
+  Settings.knx_CB_param[CBnum-1] = 0;
+
+  if (CBnum == 1)
+  {
+
+    src_offset = 1;
+
+
+
+    len = (Settings.knx_CB_registered - 1);
+  }
+  else if (CBnum == Settings.knx_CB_registered)
+  {
+
+  }
+  else
+  {
+
+
+
+
+    dest_offset = CBnum -1 ;
+    src_offset = dest_offset + 1;
+    len = (Settings.knx_CB_registered - CBnum);
+  }
+
+  if (len > 0)
+  {
+    memmove(Settings.knx_CB_param + dest_offset, Settings.knx_CB_param + src_offset, len * sizeof(uint8_t));
+    memmove(Settings.knx_CB_addr + dest_offset, Settings.knx_CB_addr + src_offset, len * sizeof(uint16_t));
+  }
+
+  Settings.knx_CB_registered--;
+
+
+  if ( KNX_CB_Search( oldparam ) == KNX_Empty ) {
+    knx.callback_deregister( device_param[oldparam-1].CB_id );
+    device_param[oldparam-1].CB_id = KNX_Empty;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " CB #%d"), CBnum );
+}
+
+
+bool KNX_CONFIG_NOT_MATCH(void)
+{
+
+  for (uint32_t i = 0; i < KNX_MAX_device_param; ++i)
+  {
+    if ( !device_param[i].show ) {
+
+
+
+      if ( KNX_GA_Search(i+1) != KNX_Empty ) { return true; }
+
+      if ( i < 8 )
+      {
+        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
+        if ( KNX_CB_Search(i+9) != KNX_Empty ) { return true; }
+      }
+
+      if ( i > 15 )
+      {
+        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
+      }
+    }
+  }
+
+
+  for (uint32_t i = 0; i < Settings.knx_GA_registered; ++i)
+  {
+    if ( Settings.knx_GA_param[i] != 0 )
+    {
+      if ( Settings.knx_GA_addr[i] == 0 )
+      {
+         return true;
+      }
+    }
+  }
+  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
+  {
+    if ( Settings.knx_CB_param[i] != 0 )
+    {
+      if ( Settings.knx_CB_addr[i] == 0 )
+      {
+         return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+
+void KNXStart(void)
+{
+  knx.start(nullptr);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_START));
+}
+
+
+void KNX_INIT(void)
+{
+
+  if (Settings.knx_GA_registered > MAX_KNX_GA) { Settings.knx_GA_registered = MAX_KNX_GA; }
+  if (Settings.knx_CB_registered > MAX_KNX_CB) { Settings.knx_CB_registered = MAX_KNX_CB; }
+
+
+  KNX_physs_addr.value = Settings.knx_physsical_addr;
+  knx.physical_address_set( KNX_physs_addr );
+# 472 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
+  for (uint32_t i = 0; i < devices_present; ++i)
+  {
+    device_param[i].show = true;
+  }
+  for (uint32_t i = GPIO_SWT1; i < GPIO_SWT4 + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1 + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_KEY1; i < GPIO_KEY4 + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1 + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_SWT1_NP; i < GPIO_SWT4_NP + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1_NP + 8].show = true; }
+  }
+  for (uint32_t i = GPIO_KEY1_NP; i < GPIO_KEY4_NP + 1; ++i)
+  {
+    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1_NP + 8].show = true; }
+  }
+  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+#ifdef USE_DS18x20
+  if (GetUsedInModule(GPIO_DSB, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
+#endif
+  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
+
+#if defined(USE_ENERGY_SENSOR)
+
+  if ( energy_flg != ENERGY_NONE ) {
+    device_param[KNX_ENERGY_POWER-1].show = true;
+    device_param[KNX_ENERGY_DAILY-1].show = true;
+    device_param[KNX_ENERGY_START-1].show = true;
+    device_param[KNX_ENERGY_TOTAL-1].show = true;
+    device_param[KNX_ENERGY_VOLTAGE-1].show = true;
+    device_param[KNX_ENERGY_CURRENT-1].show = true;
+    device_param[KNX_ENERGY_POWERFACTOR-1].show = true;
+  }
+#endif
+
+#ifdef USE_RULES
+  device_param[KNX_SLOT1-1].show = true;
+  device_param[KNX_SLOT2-1].show = true;
+  device_param[KNX_SLOT3-1].show = true;
+  device_param[KNX_SLOT4-1].show = true;
+  device_param[KNX_SLOT5-1].show = true;
+#endif
+
+
+  if (KNX_CONFIG_NOT_MATCH()) {
+    Settings.knx_GA_registered = 0;
+    Settings.knx_CB_registered = 0;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " " D_KNX_PARAMETERS));
+  }
+
+
+
+
+  uint8_t j;
+  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
+  {
+    j = Settings.knx_CB_param[i];
+    if ( j > 0 )
+    {
+      device_param[j-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[j-1]);
+
+
+
+      KNX_addr.value = Settings.knx_CB_addr[i];
+      knx.callback_assign( device_param[j-1].CB_id, KNX_addr );
+    }
+  }
+}
+
+
+void KNX_CB_Action(message_t const &msg, void *arg)
+{
+  device_parameters_t *chan = (device_parameters_t *)arg;
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  char tempchar[33];
+
+  if (msg.data_len == 1) {
+
+    tempchar[0] = msg.data[0];
+    tempchar[1] = '\0';
+  } else {
+
+    float tempvar = knx.data_to_2byte_float(msg.data);
+    dtostrfd(tempvar,2,tempchar);
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX D_RECEIVED_FROM " %d.%d.%d " D_COMMAND " %s: %s " D_TO " %s"),
+   msg.received_on.ga.area, msg.received_on.ga.line, msg.received_on.ga.member,
+   (msg.ct == KNX_CT_WRITE) ? D_KNX_COMMAND_WRITE : (msg.ct == KNX_CT_READ) ? D_KNX_COMMAND_READ : D_KNX_COMMAND_OTHER,
+   tempchar,
+   device_param_cb[(chan->type)-1]);
+
+  switch (msg.ct)
+  {
+    case KNX_CT_WRITE:
+      if (chan->type < 9)
+      {
+        ExecuteCommandPower(chan->type, msg.data[0], SRC_KNX);
+      }
+      else if (chan->type < 17)
+      {
+        if (!toggle_inhibit) {
+          ExecuteCommandPower((chan->type) -8, POWER_TOGGLE, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#ifdef USE_RULES
+      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
+      {
+        if (!toggle_inhibit) {
+          char command[25];
+          if (msg.data_len == 1) {
+
+            snprintf_P(command, sizeof(command), PSTR("event KNXRX_CMND%d=%d"), ((chan->type) - KNX_SLOT1 + 1 ), msg.data[0]);
+          } else {
+
+            snprintf_P(command, sizeof(command), PSTR("event KNXRX_VAL%d=%s"), ((chan->type) - KNX_SLOT1 + 1 ), tempchar);
+          }
+          ExecuteCommand(command, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#endif
+      break;
+
+    case KNX_CT_READ:
+      if (chan->type < 9)
+      {
+        knx.answer_1bit(msg.received_on, chan->last_state);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_1bit(msg.received_on, chan->last_state);
+          knx.answer_1bit(msg.received_on, chan->last_state);
+        }
+      }
+      else if (chan->type == KNX_TEMPERATURE)
+      {
+        knx.answer_2byte_float(msg.received_on, last_temp);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_2byte_float(msg.received_on, last_temp);
+          knx.answer_2byte_float(msg.received_on, last_temp);
+        }
+      }
+      else if (chan->type == KNX_HUMIDITY)
+      {
+        knx.answer_2byte_float(msg.received_on, last_hum);
+        if (Settings.flag.knx_enable_enhancement) {
+          knx.answer_2byte_float(msg.received_on, last_hum);
+          knx.answer_2byte_float(msg.received_on, last_hum);
+        }
+      }
+#ifdef USE_RULES
+      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
+      {
+        if (!toggle_inhibit) {
+          char command[25];
+          snprintf_P(command, sizeof(command), PSTR("event KNXRX_REQ%d"), ((chan->type) - KNX_SLOT1 + 1 ) );
+          ExecuteCommand(command, SRC_KNX);
+          if (Settings.flag.knx_enable_enhancement) {
+            toggle_inhibit = TOGGLE_INHIBIT_TIME;
+          }
+        }
+      }
+#endif
+      break;
+  }
+}
+
+
+void KnxUpdatePowerState(uint8_t device, power_t state)
+{
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  device_param[device -1].last_state = bitRead(state, device -1);
+
+
+  uint8_t i = KNX_GA_Search(device);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+     device_param_ga[device -1], device_param[device -1].last_state,
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(device, i + 1);
+  }
+}
+
+
+void KnxSendButtonPower(void)
+{
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
+  uint32_t device = XdrvMailbox.payload & 0xFF;
+  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
+# 693 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
+  uint8_t i = KNX_GA_Search(device + 8);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_1bit(KNX_addr, !(state == 0));
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_1bit(KNX_addr, !(state == 0));
+      knx.write_1bit(KNX_addr, !(state == 0));
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+     device_param_ga[device + 7], !(state == 0),
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(device + 8, i + 1);
+  }
+
+}
+
+
+void KnxSensor(uint8_t sensor_type, float value)
+{
+  if (sensor_type == KNX_TEMPERATURE)
+  {
+    last_temp = value;
+  } else if (sensor_type == KNX_HUMIDITY)
+  {
+    last_hum = value;
+  }
+
+  if (!(Settings.flag.knx_enabled)) { return; }
+
+  uint8_t i = KNX_GA_Search(sensor_type);
+  while ( i != KNX_Empty ) {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    knx.write_2byte_float(KNX_addr, value);
+    if (Settings.flag.knx_enable_enhancement) {
+      knx.write_2byte_float(KNX_addr, value);
+      knx.write_2byte_float(KNX_addr, value);
+    }
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "),
+     device_param_ga[sensor_type -1],
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+    i = KNX_GA_Search(sensor_type, i+1);
+  }
+}
+
+
+
+
+
+
+#ifdef USE_WEBSERVER
+#ifdef USE_KNX_WEB_MENU
+const char S_CONFIGURE_KNX[] PROGMEM = D_CONFIGURE_KNX;
+
+const char HTTP_BTN_MENU_KNX[] PROGMEM =
+  "<p><form action='kn' method='get'><button>" D_CONFIGURE_KNX "</button></form></p>";
+
+const char HTTP_FORM_KNX[] PROGMEM =
+  "<fieldset style='min-width:530px;'>"
+  "<legend style='text-align:left;'><b>&nbsp;" D_KNX_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='kn'>"
+  "<br><center>"
+  "<b>" D_KNX_PHYSICAL_ADDRESS " </b>"
+  "<input style='width:12%%;' type='number' name='area' min='0' max='15' value='%d'> . "
+  "<input style='width:12%%;' type='number' name='line' min='0' max='15' value='%d'> . "
+  "<input style='width:12%%;' type='number' name='member' min='0' max='255' value='%d'>"
+  "<br><br>" D_KNX_PHYSICAL_ADDRESS_NOTE "<br><br>"
+  "<input id='b1' type='checkbox'";
+
+const char HTTP_FORM_KNX1[] PROGMEM =
+  "><b>" D_KNX_ENABLE "</b>&emsp;<input id='b2' type='checkbox'";
+
+const char HTTP_FORM_KNX2[] PROGMEM =
+  "><b>" D_KNX_ENHANCEMENT "</b><br></center><br>"
+
+  "<fieldset><center>"
+  "<b>" D_KNX_GROUP_ADDRESS_TO_WRITE "</b><hr>"
+
+  "<select name='GAop' style='width:25%%;'>";
+
+const char HTTP_FORM_KNX_OPT[] PROGMEM =
+  "<option value='%d'>%s</option>";
+
+const char HTTP_FORM_KNX_GA[] PROGMEM =
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='31' value='0'> / "
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='7' value='0'> / "
+  "<input style='width:12%%;' type='number' id='%s' min='0' max='255' value='0'> ";
+
+const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM =
+  "<button type='submit' onclick='%s()' %s name='btn_add' value='%d' style='width:18%%;'>" D_ADD "</button><br><br>"
+  "<table style='width:80%%; font-size: 14px;'><col width='250'><col width='30'>";
+
+const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM =
+  "<tr><td><b>%s -> %d / %d / %d </b></td>"
+  "<td><button type='submit' name='btn_del_ga' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
+
+const char HTTP_FORM_KNX3[] PROGMEM =
+  "</table></center></fieldset><br>"
+  "<fieldset><form method='post' action='kn'><center>"
+  "<b>" D_KNX_GROUP_ADDRESS_TO_READ "</b><hr>";
+
+const char HTTP_FORM_KNX4[] PROGMEM =
+  "-> <select name='CBop' style='width:25%%;'>";
+
+const char HTTP_FORM_KNX_ADD_TABLE_ROW2[] PROGMEM =
+  "<tr><td><b>%d / %d / %d -> %s</b></td>"
+  "<td><button type='submit' name='btn_del_cb' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
+
+void HandleKNXConfiguration(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_KNX);
+
+  char tmp[100];
+  String stmp;
+
+  if ( WebServer->hasArg("save") ) {
+    KNX_Save_Settings();
+    HandleConfiguration();
+  }
+  else
+  {
+    if ( WebServer->hasArg("btn_add") ) {
+      if ( WebServer->arg("btn_add") == "1" ) {
+
+        stmp = WebServer->arg("GAop");
+        uint8_t GAop = stmp.toInt();
+        stmp = WebServer->arg("GA_FNUM");
+        uint8_t GA_FNUM = stmp.toInt();
+        stmp = WebServer->arg("GA_AREA");
+        uint8_t GA_AREA = stmp.toInt();
+        stmp = WebServer->arg("GA_FDEF");
+        uint8_t GA_FDEF = stmp.toInt();
+
+        if (GAop) {
+          KNX_ADD_GA( GAop, GA_FNUM, GA_AREA, GA_FDEF );
+        }
+      }
+      else
+      {
+
+        stmp = WebServer->arg("CBop");
+        uint8_t CBop = stmp.toInt();
+        stmp = WebServer->arg("CB_FNUM");
+        uint8_t CB_FNUM = stmp.toInt();
+        stmp = WebServer->arg("CB_AREA");
+        uint8_t CB_AREA = stmp.toInt();
+        stmp = WebServer->arg("CB_FDEF");
+        uint8_t CB_FDEF = stmp.toInt();
+
+        if (CBop) {
+          KNX_ADD_CB( CBop, CB_FNUM, CB_AREA, CB_FDEF );
+        }
+      }
+    }
+    else if ( WebServer->hasArg("btn_del_ga") )
+    {
+
+      stmp = WebServer->arg("btn_del_ga");
+      uint8_t GA_NUM = stmp.toInt();
+
+      KNX_DEL_GA(GA_NUM);
+
+    }
+    else if ( WebServer->hasArg("btn_del_cb") )
+    {
+
+      stmp = WebServer->arg("btn_del_cb");
+      uint8_t CB_NUM = stmp.toInt();
+
+      KNX_DEL_CB(CB_NUM);
+
+    }
+
+    WSContentStart_P(S_CONFIGURE_KNX);
+    WSContentSend_P(
+      PSTR("function GAwarning()"
+          "{"
+            "var GA_FNUM=eb('GA_FNUM');"
+            "var GA_AREA=eb('GA_AREA');"
+            "var GA_FDEF=eb('GA_FDEF');"
+            "if(GA_FNUM!=null&&GA_FNUM.value=='0'&&GA_AREA.value=='0'&&GA_FDEF.value=='0'){"
+              "alert('" D_KNX_WARNING "');"
+            "}"
+          "}"
+          "function CBwarning()"
+          "{"
+            "var CB_FNUM=eb('CB_FNUM');"
+            "var CB_AREA=eb('CB_AREA');"
+            "var CB_FDEF=eb('CB_FDEF');"
+            "if(CB_FNUM!=null&&CB_FNUM.value=='0'&&CB_AREA.value=='0'&&CB_FDEF.value=='0'){"
+              "alert('" D_KNX_WARNING "');"
+            "}"
+          "}"));
+    WSContentSendStyle();
+    KNX_physs_addr.value = Settings.knx_physsical_addr;
+    WSContentSend_P(HTTP_FORM_KNX, KNX_physs_addr.pa.area, KNX_physs_addr.pa.line, KNX_physs_addr.pa.member);
+    if ( Settings.flag.knx_enabled ) { WSContentSend_P(PSTR(" checked")); }
+    WSContentSend_P(HTTP_FORM_KNX1);
+    if ( Settings.flag.knx_enable_enhancement ) { WSContentSend_P(PSTR(" checked")); }
+
+    WSContentSend_P(HTTP_FORM_KNX2);
+    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
+    {
+      if ( device_param[i].show )
+      {
+        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_ga[i]);
+      }
+    }
+    WSContentSend_P(PSTR("</select> -> "));
+    WSContentSend_P(HTTP_FORM_KNX_GA, "GA_FNUM", "GA_AREA", "GA_FDEF");
+    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "GAwarning", (Settings.knx_GA_registered < MAX_KNX_GA) ? "" : "disabled", 1);
+    for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
+    {
+      if ( Settings.knx_GA_param[i] )
+      {
+        KNX_addr.value = Settings.knx_GA_addr[i];
+        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW, device_param_ga[Settings.knx_GA_param[i]-1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, i +1);
+      }
+    }
+
+    WSContentSend_P(HTTP_FORM_KNX3);
+    WSContentSend_P(HTTP_FORM_KNX_GA, "CB_FNUM", "CB_AREA", "CB_FDEF");
+    WSContentSend_P(HTTP_FORM_KNX4);
+
+    uint8_t j;
+    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
+    {
+
+      if ( (i > 8) && (i < 16) ) { j=i-8; } else { j=i; }
+      if ( i == 8 ) { j = 0; }
+      if ( device_param[j].show )
+      {
+        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_cb[i]);
+      }
+    }
+    WSContentSend_P(PSTR("</select> "));
+    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "CBwarning", (Settings.knx_CB_registered < MAX_KNX_CB) ? "" : "disabled", 2);
+
+    for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
+    {
+      if ( Settings.knx_CB_param[i] )
+      {
+        KNX_addr.value = Settings.knx_CB_addr[i];
+        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW2, KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, device_param_cb[Settings.knx_CB_param[i]-1], i +1);
+      }
+    }
+    WSContentSend_P(PSTR("</table></center></fieldset>"));
+    WSContentSend_P(HTTP_FORM_END);
+    WSContentSpaceButton(BUTTON_CONFIGURATION);
+    WSContentStop();
+  }
+
+}
+
+
+void KNX_Save_Settings(void)
+{
+  String stmp;
+  address_t KNX_addr;
+
+  Settings.flag.knx_enabled = WebServer->hasArg("b1");
+  Settings.flag.knx_enable_enhancement = WebServer->hasArg("b2");
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ENABLED ": %d, " D_KNX_ENHANCEMENT ": %d"),
+   Settings.flag.knx_enabled, Settings.flag.knx_enable_enhancement );
+
+  stmp = WebServer->arg("area");
+  KNX_addr.pa.area = stmp.toInt();
+  stmp = WebServer->arg("line");
+  KNX_addr.pa.line = stmp.toInt();
+  stmp = WebServer->arg("member");
+  KNX_addr.pa.member = stmp.toInt();
+  Settings.knx_physsical_addr = KNX_addr.value;
+  knx.physical_address_set( KNX_addr );
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_KNX_PHYSICAL_ADDRESS ": %d.%d.%d "),
+   KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA: %d"),
+   Settings.knx_GA_registered );
+  for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
+  {
+    KNX_addr.value = Settings.knx_GA_addr[i];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"),
+     i+1, device_param_ga[Settings.knx_GA_param[i]-1],
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB: %d"),
+   Settings.knx_CB_registered );
+  for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
+  {
+    KNX_addr.value = Settings.knx_CB_addr[i];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"),
+     i+1,
+     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member,
+     device_param_cb[Settings.knx_CB_param[i]-1] );
+  }
+}
+
+#endif
+#endif
+
+
+
+
+
+void CmndKnxTxCmnd(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
+
+
+
+    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
+    while ( i != KNX_Empty ) {
+      KNX_addr.value = Settings.knx_GA_addr[i];
+      knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+      if (Settings.flag.knx_enable_enhancement) {
+        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
+      }
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
+       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], !(XdrvMailbox.payload == 0),
+       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
+    }
+    ResponseCmndIdxChar (XdrvMailbox.data );
+  }
+}
+
+void CmndKnxTxVal(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
+
+
+
+    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
+    while ( i != KNX_Empty ) {
+      KNX_addr.value = Settings.knx_GA_addr[i];
+
+      float tempvar = CharToFloat(XdrvMailbox.data);
+      dtostrfd(tempvar,2,XdrvMailbox.data);
+
+      knx.write_2byte_float(KNX_addr, tempvar);
+      if (Settings.flag.knx_enable_enhancement) {
+        knx.write_2byte_float(KNX_addr, tempvar);
+        knx.write_2byte_float(KNX_addr, tempvar);
+      }
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d.%d.%d"),
+       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
+       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
+
+      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
+    }
+    ResponseCmndIdxChar (XdrvMailbox.data );
+  }
+}
+
+void CmndKnxEnabled(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    Settings.flag.knx_enabled = XdrvMailbox.payload;
+  }
+  ResponseCmndChar (GetStateText(Settings.flag.knx_enabled) );
+}
+
+void CmndKnxEnhanced(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    Settings.flag.knx_enable_enhancement = XdrvMailbox.payload;
+  }
+  ResponseCmndChar (GetStateText(Settings.flag.knx_enable_enhancement) );
+}
+
+void CmndKnxPa(void)
+{
+  if (XdrvMailbox.data_len) {
+    if (strstr(XdrvMailbox.data, ".") != nullptr) {
+      char sub_string[XdrvMailbox.data_len];
+
+      int pa_area = atoi(subStr(sub_string, XdrvMailbox.data, ".", 1));
+      int pa_line = atoi(subStr(sub_string, XdrvMailbox.data, ".", 2));
+      int pa_member = atoi(subStr(sub_string, XdrvMailbox.data, ".", 3));
+
+      if ( ((pa_area == 0) && (pa_line == 0) && (pa_member == 0))
+            || (pa_area > 15) || (pa_line > 15) || (pa_member > 255) ) {
+              Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+              return;
+      }
+
+      KNX_addr.pa.area = pa_area;
+      KNX_addr.pa.line = pa_line;
+      KNX_addr.pa.member = pa_member;
+      Settings.knx_physsical_addr = KNX_addr.value;
+    }
+  }
+  KNX_addr.value = Settings.knx_physsical_addr;
+  Response_P (PSTR("{\"%s\":\"%d.%d.%d\"}"),
+    XdrvMailbox.command, KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
+}
+
+void CmndKnxGa(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_GA)) {
+    if (XdrvMailbox.data_len) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len];
+
+        int ga_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        int ga_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        int ga_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        int ga_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+
+        if ( ((ga_area == 0) && (ga_line == 0) && (ga_member == 0))
+          || (ga_area > 31) || (ga_line > 7) || (ga_member > 255)
+          || (ga_option < 0) || ((ga_option > KNX_MAX_device_param ) && (ga_option != KNX_Empty))
+          || (!device_param[ga_option-1].show) ) {
+               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+               return;
+        }
+
+        KNX_addr.ga.area = ga_area;
+        KNX_addr.ga.line = ga_line;
+        KNX_addr.ga.member = ga_member;
+
+        if ( XdrvMailbox.index > Settings.knx_GA_registered ) {
+          Settings.knx_GA_registered ++;
+          XdrvMailbox.index = Settings.knx_GA_registered;
+        }
+
+        Settings.knx_GA_addr[XdrvMailbox.index -1] = KNX_addr.value;
+        Settings.knx_GA_param[XdrvMailbox.index -1] = ga_option;
+      } else {
+        if ( (XdrvMailbox.payload <= Settings.knx_GA_registered) && (XdrvMailbox.payload > 0) ) {
+          XdrvMailbox.index = XdrvMailbox.payload;
+        } else {
+          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+          return;
+        }
+      }
+      if ( XdrvMailbox.index <= Settings.knx_GA_registered ) {
+        KNX_addr.value = Settings.knx_GA_addr[XdrvMailbox.index -1];
+        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
+          XdrvMailbox.command, XdrvMailbox.index, device_param_ga[Settings.knx_GA_param[XdrvMailbox.index-1]-1],
+          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+      }
+    } else {
+      ResponseCmndNumber (Settings.knx_GA_registered );
+    }
+  }
+}
+
+void CmndKnxCb(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_CB)) {
+    if (XdrvMailbox.data_len) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len];
+
+        int cb_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+        int cb_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+        int cb_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        int cb_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+
+        if ( ((cb_area == 0) && (cb_line == 0) && (cb_member == 0))
+          || (cb_area > 31) || (cb_line > 7) || (cb_member > 255)
+          || (cb_option < 0) || ((cb_option > KNX_MAX_device_param ) && (cb_option != KNX_Empty))
+          || (!device_param[cb_option-1].show) ) {
+               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+               return;
+        }
+
+        KNX_addr.ga.area = cb_area;
+        KNX_addr.ga.line = cb_line;
+        KNX_addr.ga.member = cb_member;
+
+        if ( XdrvMailbox.index > Settings.knx_CB_registered ) {
+          Settings.knx_CB_registered ++;
+          XdrvMailbox.index = Settings.knx_CB_registered;
+        }
+
+        Settings.knx_CB_addr[XdrvMailbox.index -1] = KNX_addr.value;
+        Settings.knx_CB_param[XdrvMailbox.index -1] = cb_option;
+      } else {
+        if ( (XdrvMailbox.payload <= Settings.knx_CB_registered) && (XdrvMailbox.payload > 0) ) {
+          XdrvMailbox.index = XdrvMailbox.payload;
+        } else {
+          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
+          return;
+        }
+      }
+      if ( XdrvMailbox.index <= Settings.knx_CB_registered ) {
+        KNX_addr.value = Settings.knx_CB_addr[XdrvMailbox.index -1];
+        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
+          XdrvMailbox.command, XdrvMailbox.index, device_param_cb[Settings.knx_CB_param[XdrvMailbox.index-1]-1],
+          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
+      }
+    } else {
+      ResponseCmndNumber (Settings.knx_CB_registered );
+    }
+  }
+}
+
+
+
+
+
+bool Xdrv11(uint8_t function)
+{
+  bool result = false;
+    switch (function) {
+      case FUNC_LOOP:
+        if (!global_state.wifi_down) { knx.loop(); }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (toggle_inhibit) {
+          toggle_inhibit--;
+        }
+        break;
+      case FUNC_ANY_KEY:
+        KnxSendButtonPower();
+        break;
+#ifdef USE_WEBSERVER
+#ifdef USE_KNX_WEB_MENU
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_KNX);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/kn", HandleKNXConfiguration);
+        break;
+#endif
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kKnxCommands, KnxCommand);
+        break;
+      case FUNC_PRE_INIT:
+        KNX_INIT();
+        break;
+
+
+    }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_12_home_assistant.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_12_home_assistant.ino"
+#ifdef USE_HOME_ASSISTANT
+
+#define XDRV_12 12
+
+
+const char kHAssJsonSensorTypes[] PROGMEM =
+  D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
+  D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
+  D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
+  D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
+const char kHAssJsonSensorUnits[] PROGMEM =
+  "|||"
+  "W|%|A|Cm|Hz|%|LX|"
+  "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
+  "W|KWh|KWh|V|Kg|KWh";
+const char kHAssJsonSensorDevCla[] PROGMEM =
+  "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
+  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
+  "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
+  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
+  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
+
+
+const char HASS_DISCOVER_SENSOR[] PROGMEM =
+    ",\"unit_of_meas\":\"%s\",\"%s\","
+    "\"frc_upd\":true,"
+    "\"val_tpl\":\"{{value_json['%s']['%s']";
+
+const char HASS_DISCOVER_BASE[] PROGMEM =
+    "{\"name\":\"%s\","
+    "\"stat_t\":\"%s\","
+    "\"avty_t\":\"%s\","
+    "\"pl_avail\":\"" D_ONLINE "\","
+    "\"pl_not_avail\":\"" D_OFFLINE "\"";
+
+const char HASS_DISCOVER_RELAY[] PROGMEM =
+    ",\"cmd_t\":\"%s\","
+    "\"val_tpl\":\"{{value_json.%s}}\","
+    "\"pl_off\":\"%s\","
+    "\"pl_on\":\"%s\"";
+
+const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
+    ",\"value_template\":\"{%%if is_state(entity_id,\\\"off\\\")-%%}ON{%%-endif%%}\","
+    "\"off_delay\":1";
+
+const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
+    ",\"value_template\":\"{{value_json.%s}}\","
+    "\"frc_upd\":true,"
+    "\"pl_on\":\"%s\","
+    "\"pl_off\":\"%s\"";
+
+const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
+    ",\"bri_cmd_t\":\"%s\","
+    "\"bri_stat_t\":\"%s\","
+    "\"bri_scl\":100,"
+    "\"on_cmd_type\":\"%s\","
+    "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
+
+const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
+    ",\"rgb_cmd_t\":\"%s2\","
+    "\"rgb_stat_t\":\"%s\","
+    "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
+
+const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
+    ",\"whit_val_cmd_t\":\"%s\","
+    "\"whit_val_stat_t\":\"%s\","
+    "\"white_value_scale\":100,"
+    "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
+
+const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
+    ",\"clr_temp_cmd_t\":\"%s\","
+    "\"clr_temp_stat_t\":\"%s\","
+    "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
+
+const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
+    ",\"fx_cmd_t\":\"%s\","
+    "\"fx_stat_t\":\"%s\","
+    "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
+    "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]";
+
+const char HASS_DISCOVER_SENSOR_HASS_STATUS[] PROGMEM =
+    ",\"json_attributes_topic\":\"%s\","
+    "\"unit_of_meas\":\" \","
+    "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\","
+    "\"ic\":\"mdi:information-outline\"";
+
+const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]],"
+    "\"name\":\"%s\","
+    "\"model\":\"%s\","
+    "\"sw_version\":\"%s%s\","
+    "\"manufacturer\":\"Tasmota\"}";
+
+const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
+    ",\"uniq_id\":\"%s\","
+    "\"device\":{\"identifiers\":[\"%06X\"],"
+    "\"connections\":[[\"mac\",\"%s\"]]}";
+
+uint8_t hass_init_step = 0;
+uint8_t hass_mode = 0;
+int hass_tele_period = 0;
+
+void TryResponseAppend_P(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  char dummy[2];
+  int dlen = vsnprintf_P(dummy, 1, format, args);
+
+  int mlen = strlen(mqtt_data);
+  int slen = sizeof(mqtt_data) - 1 - mlen;
+  if (dlen >= slen)
+  {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: MQTT discovery failed due to too long topic or friendly name. "
+                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"),
+              dlen, slen);
+    va_start(args, format);
+    vsnprintf_P(log_data, sizeof(log_data), format, args);
+    AddLog(LOG_LEVEL_ERROR);
+  }
+  else
+  {
+    va_start(args, format);
+    vsnprintf_P(mqtt_data + mlen, slen, format, args);
+  }
+  va_end(args);
+}
+
+void HAssAnnounceRelayLight(void)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char stemp3[TOPSZ];
+  char unique_id[30];
+  bool is_light = false;
+  bool is_topic_light = false;
+
+  for (uint32_t i = 1; i <= MAX_RELAYS; i++)
+  {
+    is_light = ((i == devices_present) && (light_type));
+    is_topic_light = Settings.flag.hass_light || is_light;
+
+    mqtt_data[0] = '\0';
+
+
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "RL" : "LI", i);
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
+               (is_topic_light) ? "switch" : "light", unique_id);
+    MqttPublish(stopic, true);
+
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "LI" : "RL", i);
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
+               (is_topic_light) ? "light" : "switch", unique_id);
+
+    if (Settings.flag.hass_discovery && (i <= devices_present))
+    {
+      char name[33 + 2];
+      char value_template[33];
+      char prefix[TOPSZ];
+      char *command_topic = stemp1;
+      char *state_topic = stemp2;
+      char *availability_topic = stemp3;
+
+      if (i > MAX_FRIENDLYNAMES)
+      {
+        snprintf_P(name, sizeof(name), PSTR("%s %d"), SettingsText(SET_FRIENDLYNAME1), i);
+      }
+      else
+      {
+        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 + i - 1));
+      }
+      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable);
+      GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
+      GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
+      GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+      TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
+      TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+#ifdef USE_LIGHT
+      if (is_light)
+      {
+        char *brightness_command_topic = stemp1;
+
+        GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
+        strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3));
+        TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
+
+        if (Light.subtype >= LST_RGB)
+        {
+          char *rgb_command_topic = stemp1;
+
+          GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_COLOR, rgb_command_topic, state_topic);
+
+          char *effect_command_topic = stemp1;
+          GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
+        }
+        if (LST_RGBW == Light.subtype)
+        {
+          char *white_temp_command_topic = stemp1;
+
+          GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
+        }
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
+        {
+          char *color_temp_command_topic = stemp1;
+
+          GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
+          TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
+        }
+      }
+#endif
+      TryResponseAppend_P(PSTR("}"));
+    }
+    MqttPublish(stopic, true);
+  }
+}
+
+void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle)
+{
+
+
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+  mqtt_data[0] = '\0';
+
+
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key ? "SW" : "BTN", device + 1);
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
+
+  if (Settings.flag.hass_discovery && present)
+  {
+    char name[33 + 6];
+    char value_template[33];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+    char jsoname[8];
+
+    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key ? "Switch" : "Button", device + 1);
+    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
+    GetPowerDevice(value_template, device + 1, sizeof(value_template),
+                   key + Settings.flag.device_index_enable);
+    GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+    if (toggle) {
+      if (!key) {
+        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE);
+      } else {
+        TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
+    }
+    TryResponseAppend_P(PSTR("}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssAnnounceSwitches(void)
+{
+  char sw_topic[TOPSZ];
+
+
+  char *tmp = SettingsText(SET_MQTT_SWITCH_TOPIC);
+  Format(sw_topic, tmp, sizeof(sw_topic));
+  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0)
+  {
+    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++)
+    {
+      uint8_t switch_present = 0;
+      uint8_t toggle = 1;
+
+      if (pin[GPIO_SWT1 + switch_index] < 99)
+      {
+        switch_present = 1;
+      }
+
+
+      if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
+          Settings.flag3.button_switch_force_local ||
+          !strcmp(mqtt_topic, sw_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), sw_topic))
+      {
+        toggle = 0;
+      }
+      HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 1, toggle);
+    }
+  }
+}
+
+void HAssAnnounceButtons(void)
+{
+  char key_topic[TOPSZ];
+
+
+  char *tmp = SettingsText(SET_MQTT_BUTTON_TOPIC);
+  Format(key_topic, tmp, sizeof(key_topic));
+  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0)
+  {
+    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++)
+    {
+      uint8_t button_present = 0;
+      uint8_t toggle = 1;
+
+      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)))
+      {
+        button_present = 1;
+      }
+      else
+      {
+        if (pin[GPIO_KEY1 + button_index] < 99)
+        {
+          button_present = 1;
+        }
+      }
+
+
+      if (Settings.flag3.button_switch_force_local ||
+          !strcmp(mqtt_topic, key_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic))
+      {
+        toggle = 0;
+      }
+      HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 0, toggle);
+    }
+  }
+}
+
+void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+  mqtt_data[0] = '\0';
+
+  char subname[20];
+  NoAlNumToUnderscore(subname, MultiSubName);
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
+
+  if (Settings.flag.hass_discovery)
+  {
+    char name[33 + 42];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+
+    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
+    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
+    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
+
+    char jname[32];
+    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
+    if (sensor_index > -1) {
+      char param1[20];
+      GetTextIndexed(param1, sizeof(param1), sensor_index, kHAssJsonSensorUnits);
+      switch (sensor_index) {
+        case 0:
+          snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit());
+          break;
+        case 1:
+        case 2:
+          snprintf_P(param1, sizeof(param1), PSTR("%s"), PressureUnit().c_str());
+          break;
+      }
+      char param2[50];
+      GetTextIndexed(param2, sizeof(param2), sensor_index, kHAssJsonSensorDevCla);
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
+      if (subidx) {
+        TryResponseAppend_P(PSTR("[%d]"), subqty -1);
+      }
+    } else {
+      TryResponseAppend_P(HASS_DISCOVER_SENSOR, " ", "ic\":\"mdi:eye", sensorname, subsensortype);
+    }
+    TryResponseAppend_P(PSTR("}}\"}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssAnnounceSensors(void)
+{
+  uint8_t hass_xsns_index = 0;
+  bool is_sensor = true;
+  uint8_t subqty = 0;
+  do
+  {
+    mqtt_data[0] = '\0';
+    int tele_period_save = tele_period;
+    tele_period = 2;
+    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index);
+    tele_period = tele_period_save;
+
+    char sensordata[512];
+    strlcpy(sensordata, mqtt_data, sizeof(sensordata));
+
+    if (strlen(sensordata))
+    {
+      sensordata[0] = '{';
+      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);
+
+
+
+      StaticJsonBuffer<500> jsonBuffer;
+      JsonObject &root = jsonBuffer.parseObject(sensordata);
+      if (!root.success())
+      {
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: jsonBuffer failed to parse '%s'"), sensordata);
+        continue;
+      }
+      for (auto sensor : root)
+      {
+        const char *sensorname = sensor.key;
+        JsonObject &sensors = sensor.value.as<JsonObject>();
+        if (!sensors.success())
+        {
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: JsonObject failed to parse '%s'"), sensordata);
+          continue;
+        }
+        for (auto subsensor : sensors)
+        {
+
+          if (subsensor.value.is<JsonArray&>()) {
+            JsonArray& subsensors = subsensor.value.as<JsonArray&>();
+            subqty = subsensors.size();
+            char MultiSubName[20];
+            for (int i = 1; i <= subqty; i++) {
+              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s %d"), subsensor.key, i);
+              HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
+            }
+          } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}
+        }
+      }
+    }
+    yield();
+  } while (hass_xsns_index != 0);
+}
+
+void HAssAnnounceStatusSensor(void)
+{
+  char stopic[TOPSZ];
+  char stemp1[TOPSZ];
+  char stemp2[TOPSZ];
+  char unique_id[30];
+
+
+  mqtt_data[0] = '\0';
+
+
+  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_status"), ESP.getChipId());
+  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
+
+  if (Settings.flag.hass_discovery)
+  {
+    char name[33 + 7];
+    char prefix[TOPSZ];
+    char *state_topic = stemp1;
+    char *availability_topic = stemp2;
+
+    snprintf_P(name, sizeof(name), PSTR("%s status"), SettingsText(SET_FRIENDLYNAME1));
+    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
+    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
+
+    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
+    TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
+    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
+                        SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
+
+    TryResponseAppend_P(PSTR("}"));
+  }
+  MqttPublish(stopic, true);
+}
+
+void HAssPublishStatus(void)
+{
+  Response_P(PSTR("{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\","
+                  "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
+                  "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
+                  "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
+                  "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
+                  "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
+             my_version, my_image, GetBuildDateAndTime().c_str(), ESP.getSdkVersion(), ModuleName().c_str(),
+             GetResetReason().c_str(), GetUptime().c_str(), WifiLinkCount(), WifiDowntime().c_str(), MqttConnectCount(),
+             Settings.bootcount, Settings.save_flag, WiFi.localIP().toString().c_str(),
+             WifiGetRssiAsQuality(WiFi.RSSI()), loop_load_avg);
+  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_HASS_STATE));
+}
+
+void HAssDiscovery(void)
+{
+
+  if (Settings.flag.hass_discovery)
+  {
+    Settings.flag.mqtt_response = 0;
+    Settings.flag.decimal_text = 1;
+    Settings.flag3.hass_tele_on_power = 1;
+    Settings.light_scheme = 0;
+  }
+
+  if (Settings.flag.hass_discovery || (1 == hass_mode))
+  {
+
+    HAssAnnounceRelayLight();
+
+
+    HAssAnnounceButtons();
+
+
+    HAssAnnounceSwitches();
+
+
+    HAssAnnounceSensors();
+
+
+    HAssAnnounceStatusSensor();
+  }
+}
+
+void HAssDiscover(void)
+{
+  hass_mode = 1;
+  hass_init_step = 1;
+}
+
+void HAssAnyKey(void)
+{
+  if (!Settings.flag.hass_discovery)
+  {
+    return;
+  }
+
+  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
+  uint32_t device = XdrvMailbox.payload & 0xFF;
+  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
+
+  char scommand[CMDSZ];
+  snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);
+  char stopic[TOPSZ];
+
+  GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+  Response_P(S_JSON_COMMAND_SVALUE, PSTR(D_RSLT_STATE), GetStateText(state));
+  MqttPublish(stopic);
+}
+
+
+
+
+
+bool Xdrv12(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag.mqtt_enabled)
+  {
+    switch (function)
+    {
+    case FUNC_EVERY_SECOND:
+      if (hass_init_step)
+      {
+        hass_init_step--;
+        if (!hass_init_step)
+        {
+          HAssDiscovery();
+        }
+      }
+      else if (Settings.flag.hass_discovery && Settings.tele_period)
+      {
+        hass_tele_period++;
+        if (hass_tele_period >= Settings.tele_period)
+        {
+          hass_tele_period = 0;
+
+          mqtt_data[0] = '\0';
+          HAssPublishStatus();
+        }
+      }
+      break;
+    case FUNC_ANY_KEY:
+      HAssAnyKey();
+      break;
+    case FUNC_MQTT_INIT:
+      hass_mode = 0;
+      hass_init_step = 2;
+      break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
+#if defined(USE_I2C) || defined(USE_SPI)
+#ifdef USE_DISPLAY
+
+#define XDRV_13 13
+
+#include <renderer.h>
+#include <FT6236.h>
+
+Renderer *renderer;
+
+enum ColorType { COLOR_BW, COLOR_COLOR };
+
+#ifndef MAXBUTTONS
+#define MAXBUTTONS 16
+#endif
+
+#ifdef USE_TOUCH_BUTTONS
+VButton *buttons[MAXBUTTONS];
+#endif
+
+
+
+uint16_t fg_color = 1;
+uint16_t bg_color = 0;
+uint8_t color_type = COLOR_BW;
+uint8_t auto_draw=1;
+
+const uint8_t DISPLAY_MAX_DRIVERS = 16;
+const uint8_t DISPLAY_MAX_COLS = 44;
+const uint8_t DISPLAY_MAX_ROWS = 32;
+
+const uint8_t DISPLAY_LOG_ROWS = 32;
+
+#define D_PRFX_DISPLAY "Display"
+#define D_CMND_DISP_ADDRESS "Address"
+#define D_CMND_DISP_COLS "Cols"
+#define D_CMND_DISP_DIMMER "Dimmer"
+#define D_CMND_DISP_MODE "Mode"
+#define D_CMND_DISP_MODEL "Model"
+#define D_CMND_DISP_REFRESH "Refresh"
+#define D_CMND_DISP_ROWS "Rows"
+#define D_CMND_DISP_SIZE "Size"
+#define D_CMND_DISP_FONT "Font"
+#define D_CMND_DISP_ROTATE "Rotate"
+#define D_CMND_DISP_TEXT "Text"
+#define D_CMND_DISP_WIDTH "Width"
+#define D_CMND_DISP_HEIGHT "Height"
+
+enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_EVERY_50_MSECOND, FUNC_DISPLAY_EVERY_SECOND,
+                     FUNC_DISPLAY_MODEL, FUNC_DISPLAY_MODE, FUNC_DISPLAY_POWER,
+                     FUNC_DISPLAY_CLEAR, FUNC_DISPLAY_DRAW_FRAME,
+                     FUNC_DISPLAY_DRAW_HLINE, FUNC_DISPLAY_DRAW_VLINE, FUNC_DISPLAY_DRAW_LINE,
+                     FUNC_DISPLAY_DRAW_CIRCLE, FUNC_DISPLAY_FILL_CIRCLE,
+                     FUNC_DISPLAY_DRAW_RECTANGLE, FUNC_DISPLAY_FILL_RECTANGLE,
+                     FUNC_DISPLAY_TEXT_SIZE, FUNC_DISPLAY_FONT_SIZE, FUNC_DISPLAY_ROTATION, FUNC_DISPLAY_DRAW_STRING, FUNC_DISPLAY_ONOFF };
+
+enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
+
+const char kDisplayCommands[] PROGMEM = D_PRFX_DISPLAY "|"
+  "|" D_CMND_DISP_MODEL "|" D_CMND_DISP_WIDTH "|" D_CMND_DISP_HEIGHT "|" D_CMND_DISP_MODE "|" D_CMND_DISP_REFRESH "|"
+  D_CMND_DISP_DIMMER "|" D_CMND_DISP_COLS "|" D_CMND_DISP_ROWS "|" D_CMND_DISP_SIZE "|" D_CMND_DISP_FONT "|"
+  D_CMND_DISP_ROTATE "|" D_CMND_DISP_TEXT "|" D_CMND_DISP_ADDRESS ;
+
+void (* const DisplayCommand[])(void) PROGMEM = {
+  &CmndDisplay, &CmndDisplayModel, &CmndDisplayWidth, &CmndDisplayHeight, &CmndDisplayMode, &CmndDisplayRefresh,
+  &CmndDisplayDimmer, &CmndDisplayColumns, &CmndDisplayRows, &CmndDisplaySize, &CmndDisplayFont,
+  &CmndDisplayRotate, &CmndDisplayText, &CmndDisplayAddress };
+
+char *dsp_str;
+
+uint16_t dsp_x;
+uint16_t dsp_y;
+uint16_t dsp_x2;
+uint16_t dsp_y2;
+uint16_t dsp_rad;
+uint16_t dsp_color;
+int16_t dsp_len;
+int16_t disp_xpos = 0;
+int16_t disp_ypos = 0;
+
+uint8_t disp_power = 0;
+uint8_t disp_device = 0;
+uint8_t disp_refresh = 1;
+uint8_t disp_autodraw = 1;
+uint8_t dsp_init;
+uint8_t dsp_font;
+uint8_t dsp_flag;
+uint8_t dsp_on;
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+char **disp_log_buffer;
+char **disp_screen_buffer;
+char disp_temp[2];
+char disp_pres[5];
+
+uint8_t disp_log_buffer_cols = 0;
+uint8_t disp_log_buffer_idx = 0;
+uint8_t disp_log_buffer_ptr = 0;
+uint8_t disp_screen_buffer_cols = 0;
+uint8_t disp_screen_buffer_rows = 0;
+bool disp_subscribed = false;
+
+#endif
+
+
+
+void DisplayInit(uint8_t mode)
+{
+  if (renderer) {
+    renderer->DisplayInit(mode, Settings.display_size, Settings.display_rotate, Settings.display_font);
+  }
+  else {
+    dsp_init = mode;
+    XdspCall(FUNC_DISPLAY_INIT);
+  }
+}
+
+void DisplayClear(void)
+{
+  XdspCall(FUNC_DISPLAY_CLEAR);
+}
+
+void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_len = len;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_HLINE);
+}
+
+void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_len = len;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_VLINE);
+}
+
+void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_LINE);
+}
+
+void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_rad = rad;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_CIRCLE);
+}
+
+void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_rad = rad;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_FILL_CIRCLE);
+}
+
+void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_DRAW_RECTANGLE);
+}
+
+void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_x2 = x2;
+  dsp_y2 = y2;
+  dsp_color = color;
+  XdspCall(FUNC_DISPLAY_FILL_RECTANGLE);
+}
+
+void DisplayDrawFrame(void)
+{
+  XdspCall(FUNC_DISPLAY_DRAW_FRAME);
+}
+
+void DisplaySetSize(uint8_t size)
+{
+  Settings.display_size = size &3;
+  XdspCall(FUNC_DISPLAY_TEXT_SIZE);
+}
+
+void DisplaySetFont(uint8_t font)
+{
+  Settings.display_font = font &3;
+  XdspCall(FUNC_DISPLAY_FONT_SIZE);
+}
+
+void DisplaySetRotation(uint8_t rotation)
+{
+  Settings.display_rotate = rotation &3;
+  XdspCall(FUNC_DISPLAY_ROTATION);
+}
+
+void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  dsp_x = x;
+  dsp_y = y;
+  dsp_str = str;
+  dsp_color = color;
+  dsp_flag = flag;
+  XdspCall(FUNC_DISPLAY_DRAW_STRING);
+}
+
+void DisplayOnOff(uint8_t on)
+{
+  dsp_on = on;
+  XdspCall(FUNC_DISPLAY_ONOFF);
+}
+
+
+
+
+uint8_t fatoiv(char *cp,float *res) {
+  uint8_t index=0;
+  *res=CharToFloat(cp);
+  while (*cp) {
+    if ((*cp>='0' && *cp<='9') || (*cp=='-') || (*cp=='.')) {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+uint8_t atoiv(char *cp, int16_t *res)
+{
+  uint8_t index = 0;
+  *res = atoi(cp);
+  while (*cp) {
+    if ((*cp>='0' && *cp<='9') || (*cp=='-')) {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+uint8_t atoiV(char *cp, uint16_t *res)
+{
+  uint8_t index = 0;
+  *res = atoi(cp);
+  while (*cp) {
+    if (*cp>='0' && *cp<='9') {
+      cp++;
+      index++;
+    } else {
+      break;
+    }
+  }
+  return index;
+}
+
+
+void alignright(char *string) {
+  uint16_t slen=strlen(string);
+  uint16_t len=slen;
+  while (len) {
+
+    if (string[len-1]!=' ') {
+      break;
+    }
+    len--;
+  }
+  uint16_t diff=slen-len;
+  if (diff>0) {
+
+    memmove(&string[diff],string,len);
+    memset(string,' ',diff);
+  }
+}
+
+char *get_string(char *buff,uint8_t len,char *cp) {
+uint8_t index=0;
+  while (*cp!=':') {
+    buff[index]=*cp++;
+    index++;
+    if (index>=len) break;
+  }
+  buff[index]=0;
+  cp++;
+  return cp;
+}
+
+#define ESCAPE_CHAR '~'
+
+
+uint32_t decode_te(char *line) {
+  uint32_t skip = 0;
+  char sbuf[3],*cp;
+  while (*line) {
+    if (*line==ESCAPE_CHAR) {
+      cp=line+1;
+      if (*cp!=0 && *cp==ESCAPE_CHAR) {
+
+        memmove(cp,cp+1,strlen(cp));
+        skip++;
+      } else {
+
+        if (strlen(cp)<2) {
+
+          return skip;
+        }
+
+        sbuf[0]=*(cp);
+        sbuf[1]=*(cp+1);
+        sbuf[2]=0;
+        *line=strtol(sbuf,0,16);
+
+        memmove(cp,cp+2,strlen(cp)-1);
+        skip += 2;
+      }
+    }
+    line++;
+  }
+  return skip;
+}
+
+
+
+#define DISPLAY_BUFFER_COLS 128
+
+void DisplayText(void)
+{
+  uint8_t lpos;
+  uint8_t escape = 0;
+  uint8_t var;
+  int16_t lin = 0;
+  int16_t col = 0;
+  int16_t fill = 0;
+  int16_t temp;
+  int16_t temp1;
+  float ftemp;
+
+  char linebuf[DISPLAY_BUFFER_COLS];
+  char *dp = linebuf;
+  char *cp = XdrvMailbox.data;
+
+  memset(linebuf, ' ', sizeof(linebuf));
+  linebuf[sizeof(linebuf)-1] = 0;
+  *dp = 0;
+
+  while (*cp) {
+    if (!escape) {
+
+      if (*cp == '[') {
+        escape = 1;
+        cp++;
+
+        if ((uint32_t)dp - (uint32_t)linebuf) {
+          if (!fill) { *dp = 0; }
+          if (col > 0 && lin > 0) {
+
+            if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
+            else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
+          } else {
+
+            if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+            else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+          }
+          memset(linebuf, ' ', sizeof(linebuf));
+          linebuf[sizeof(linebuf)-1] = 0;
+          dp = linebuf;
+        }
+      } else {
+
+        if (dp < (linebuf + DISPLAY_BUFFER_COLS)) { *dp++ = *cp++; }
+      }
+    } else {
+
+      if (*cp == ']') {
+        escape = 0;
+        cp++;
+      } else {
+
+        switch (*cp++) {
+          case 'z':
+
+            if (!renderer) DisplayClear();
+            else renderer->fillScreen(bg_color);
+            disp_xpos = 0;
+            disp_ypos = 0;
+            col = 0;
+            lin = 0;
+            break;
+          case 'i':
+
+            DisplayInit(DISPLAY_INIT_PARTIAL);
+            break;
+          case 'I':
+
+            DisplayInit(DISPLAY_INIT_FULL);
+            break;
+          case 'o':
+            if (!renderer) {
+              DisplayOnOff(0);
+            } else {
+              renderer->DisplayOnff(0);
+            }
+            break;
+          case 'O':
+            if (!renderer) {
+              DisplayOnOff(1);
+            } else {
+              renderer->DisplayOnff(1);
+            }
+            break;
+          case 'x':
+
+            var = atoiv(cp, &disp_xpos);
+            cp += var;
+            break;
+          case 'y':
+
+            var = atoiv(cp, &disp_ypos);
+            cp += var;
+            break;
+          case 'l':
+
+            var = atoiv(cp, &lin);
+            cp += var;
+
+            break;
+          case 'c':
+
+            var = atoiv(cp, &col);
+            cp += var;
+
+            break;
+          case 'C':
+
+            if (*cp=='i') {
+
+              cp++;
+              var = atoiv(cp, &temp);
+              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
+            } else {
+
+              var = fatoiv(cp,&ftemp);
+            }
+            fg_color=ftemp;
+            cp += var;
+            if (renderer) renderer->setTextColor(fg_color,bg_color);
+            break;
+          case 'B':
+
+            if (*cp=='i') {
+
+              cp++;
+              var = atoiv(cp, &temp);
+              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
+            } else {
+              var = fatoiv(cp,&ftemp);
+            }
+            bg_color=ftemp;
+            cp += var;
+            if (renderer) renderer->setTextColor(fg_color,bg_color);
+            break;
+          case 'p':
+
+            var = atoiv(cp, &fill);
+            cp += var;
+            linebuf[fill] = 0;
+            break;
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+          case 'P':
+            { char *ep=strchr(cp,':');
+             if (ep) {
+               *ep=0;
+               ep++;
+               Draw_RGB_Bitmap(cp,disp_xpos,disp_ypos);
+               cp=ep;
+             }
+            }
+            break;
+#endif
+          case 'h':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (temp < 0) {
+              if (renderer) renderer->writeFastHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
+              else DisplayDrawHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
+            } else {
+              if (renderer) renderer->writeFastHLine(disp_xpos, disp_ypos, temp, fg_color);
+              else DisplayDrawHLine(disp_xpos, disp_ypos, temp, fg_color);
+            }
+            disp_xpos += temp;
+            break;
+          case 'v':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (temp < 0) {
+              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
+              else DisplayDrawVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
+            } else {
+              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos, temp, fg_color);
+              else DisplayDrawVLine(disp_xpos, disp_ypos, temp, fg_color);
+            }
+            disp_ypos += temp;
+            break;
+          case 'L':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->writeLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            disp_xpos += temp;
+            disp_ypos += temp1;
+            break;
+          case 'k':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (renderer) renderer->drawCircle(disp_xpos, disp_ypos, temp, fg_color);
+            else DisplayDrawCircle(disp_xpos, disp_ypos, temp, fg_color);
+            break;
+          case 'K':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color);
+            else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color);
+            break;
+          case 'r':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->drawRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            break;
+          case 'R':
+
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            if (renderer) renderer->fillRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            else DisplayDrawFilledRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
+            break;
+          case 'u':
+
+            { int16_t rad;
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &rad);
+            cp += var;
+            if (renderer) renderer->drawRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
+
+            }
+            break;
+          case 'U':
+
+            { int16_t rad;
+            var = atoiv(cp, &temp);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &temp1);
+            cp += var;
+            cp++;
+            var = atoiv(cp, &rad);
+            cp += var;
+            if (renderer) renderer->fillRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
+
+            }
+            break;
+
+          case 't':
+            if (*cp=='S') {
+              cp++;
+              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
+                snprintf_P(dp, 9, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+                dp += 8;
+              }
+            } else {
+              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -5) {
+                snprintf_P(dp, 6, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute);
+                dp += 5;
+              }
+            }
+            break;
+          case 'T':
+            if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
+              snprintf_P(dp, 9, PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year%2000);
+              dp += 8;
+            }
+            break;
+          case 'd':
+
+            if (renderer) renderer->Updateframe();
+            else DisplayDrawFrame();
+            break;
+          case 'D':
+
+            auto_draw=*cp&3;
+            if (renderer) renderer->setDrawMode(auto_draw>>1);
+            cp += 1;
+            break;
+          case 's':
+
+            if (renderer) renderer->setTextSize(*cp&7);
+            else DisplaySetSize(*cp&3);
+            cp += 1;
+            break;
+          case 'f':
+
+            if (renderer) renderer->setTextFont(*cp&7);
+            else DisplaySetFont(*cp&7);
+            cp += 1;
+            break;
+          case 'a':
+
+            if (renderer) renderer->setRotation(*cp&3);
+            else DisplaySetRotation(*cp&3);
+            cp+=1;
+            break;
+
+#ifdef USE_GRAPH
+          case 'G':
+
+            if (*cp=='d') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&temp1);
+              cp+=var;
+              RedrawGraph(temp,temp1);
+              break;
+            }
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+            if (*cp=='s') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+
+              char bbuff[128];
+              cp=get_string(bbuff,sizeof(bbuff),cp);
+              Save_graph(temp,bbuff);
+              break;
+            }
+            if (*cp=='r') {
+              cp++;
+              var=atoiv(cp,&temp);
+              cp+=var;
+              cp++;
+
+              char bbuff[128];
+              cp=get_string(bbuff,sizeof(bbuff),cp);
+              Restore_graph(temp,bbuff);
+              break;
+            }
+#endif
+            { int16_t num,gxp,gyp,gxs,gys,dec,icol;
+              float ymin,ymax;
+              var=atoiv(cp,&num);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gxp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gyp);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gxs);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&gys);
+              cp+=var;
+              cp++;
+              var=atoiv(cp,&dec);
+              cp+=var;
+              cp++;
+              var=fatoiv(cp,&ymin);
+              cp+=var;
+              cp++;
+              var=fatoiv(cp,&ymax);
+              cp+=var;
+              if (color_type==COLOR_COLOR) {
+
+                cp++;
+                var=atoiv(cp,&icol);
+                cp+=var;
+              } else {
+                icol=0;
+              }
+              DefineGraph(num,gxp,gyp,gxs,gys,dec,ymin,ymax,icol);
+            }
+            break;
+          case 'g':
+              { float temp;
+                int16_t num;
+                var=atoiv(cp,&num);
+                cp+=var;
+                cp++;
+                var=fatoiv(cp,&temp);
+                cp+=var;
+                AddValue(num,temp);
+              }
+            break;
+#endif
+
+#ifdef USE_AWATCH
+          case 'w':
+              var = atoiv(cp, &temp);
+              cp += var;
+              DrawAClock(temp);
+              break;
+#endif
+
+#ifdef USE_TOUCH_BUTTONS
+          case 'b':
+          { int16_t num,gxp,gyp,gxs,gys,outline,fill,textcolor,textsize;
+            var=atoiv(cp,&num);
+            cp+=var;
+            cp++;
+            uint8_t bflags=num>>8;
+            num=num%MAXBUTTONS;
+            var=atoiv(cp,&gxp);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gyp);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gxs);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&gys);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&outline);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&fill);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&textcolor);
+            cp+=var;
+            cp++;
+            var=atoiv(cp,&textsize);
+            cp+=var;
+            cp++;
+
+            char bbuff[32];
+            cp=get_string(bbuff,sizeof(bbuff),cp);
+
+            if (buttons[num]) {
+              delete buttons[num];
+            }
+            if (renderer) {
+              buttons[num]= new VButton();
+              if (buttons[num]) {
+                buttons[num]->vpower=bflags;
+                buttons[num]->initButtonUL(renderer,gxp,gyp,gxs,gys,renderer->GetColorFromIndex(outline),\
+                renderer->GetColorFromIndex(fill),renderer->GetColorFromIndex(textcolor),bbuff,textsize);
+                if (!bflags) {
+
+                  buttons[num]->xdrawButton(bitRead(power,num));
+                } else {
+
+                  buttons[num]->vpower&=0x7f;
+                  buttons[num]->xdrawButton(buttons[num]->vpower&0x80);
+                }
+              }
+            }
+          }
+          break;
+#endif
+          default:
+
+            Response_P(PSTR("Unknown Escape"));
+            goto exit;
+            break;
+        }
+      }
+    }
+  }
+  exit:
+
+    dp -= decode_te(linebuf);
+    if ((uint32_t)dp - (uint32_t)linebuf) {
+      if (!fill) {
+        *dp = 0;
+      } else {
+        linebuf[abs(fill)] = 0;
+      }
+      if (fill<0) {
+
+        alignright(linebuf);
+      }
+      if (col > 0 && lin > 0) {
+
+        if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
+        else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
+      } else {
+
+        if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+        else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
+      }
+    }
+
+    if (auto_draw&1) {
+      if (renderer) renderer->Updateframe();
+      else DisplayDrawFrame();
+    }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void DisplayClearScreenBuffer(void)
+{
+  if (disp_screen_buffer_cols) {
+    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+      memset(disp_screen_buffer[i], 0, disp_screen_buffer_cols);
+    }
+  }
+}
+
+void DisplayFreeScreenBuffer(void)
+{
+  if (disp_screen_buffer != nullptr) {
+    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+      if (disp_screen_buffer[i] != nullptr) { free(disp_screen_buffer[i]); }
+    }
+    free(disp_screen_buffer);
+    disp_screen_buffer_cols = 0;
+    disp_screen_buffer_rows = 0;
+  }
+}
+
+void DisplayAllocScreenBuffer(void)
+{
+  if (!disp_screen_buffer_cols) {
+    disp_screen_buffer_rows = Settings.display_rows;
+    disp_screen_buffer = (char**)malloc(sizeof(*disp_screen_buffer) * disp_screen_buffer_rows);
+    if (disp_screen_buffer != nullptr) {
+      for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
+        disp_screen_buffer[i] = (char*)malloc(sizeof(*disp_screen_buffer[i]) * (Settings.display_cols[0] +1));
+        if (disp_screen_buffer[i] == nullptr) {
+          DisplayFreeScreenBuffer();
+          break;
+        }
+      }
+    }
+    if (disp_screen_buffer != nullptr) {
+      disp_screen_buffer_cols = Settings.display_cols[0] +1;
+      DisplayClearScreenBuffer();
+    }
+  }
+}
+
+void DisplayReAllocScreenBuffer(void)
+{
+  DisplayFreeScreenBuffer();
+  DisplayAllocScreenBuffer();
+}
+
+void DisplayFillScreen(uint32_t line)
+{
+  uint32_t len = disp_screen_buffer_cols - strlen(disp_screen_buffer[line]);
+  if (len) {
+    memset(disp_screen_buffer[line] + strlen(disp_screen_buffer[line]), 0x20, len);
+    disp_screen_buffer[line][disp_screen_buffer_cols -1] = 0;
+  }
+}
+
+
+
+void DisplayClearLogBuffer(void)
+{
+  if (disp_log_buffer_cols) {
+    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+      memset(disp_log_buffer[i], 0, disp_log_buffer_cols);
+    }
+  }
+}
+
+void DisplayFreeLogBuffer(void)
+{
+  if (disp_log_buffer != nullptr) {
+    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+      if (disp_log_buffer[i] != nullptr) { free(disp_log_buffer[i]); }
+    }
+    free(disp_log_buffer);
+    disp_log_buffer_cols = 0;
+  }
+}
+
+void DisplayAllocLogBuffer(void)
+{
+  if (!disp_log_buffer_cols) {
+    disp_log_buffer = (char**)malloc(sizeof(*disp_log_buffer) * DISPLAY_LOG_ROWS);
+    if (disp_log_buffer != nullptr) {
+      for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
+        disp_log_buffer[i] = (char*)malloc(sizeof(*disp_log_buffer[i]) * (Settings.display_cols[0] +1));
+        if (disp_log_buffer[i] == nullptr) {
+          DisplayFreeLogBuffer();
+          break;
+        }
+      }
+    }
+    if (disp_log_buffer != nullptr) {
+      disp_log_buffer_cols = Settings.display_cols[0] +1;
+      DisplayClearLogBuffer();
+    }
+  }
+}
+
+void DisplayReAllocLogBuffer(void)
+{
+  DisplayFreeLogBuffer();
+  DisplayAllocLogBuffer();
+}
+
+void DisplayLogBufferAdd(char* txt)
+{
+  if (disp_log_buffer_cols) {
+    strlcpy(disp_log_buffer[disp_log_buffer_idx], txt, disp_log_buffer_cols);
+    disp_log_buffer_idx++;
+    if (DISPLAY_LOG_ROWS == disp_log_buffer_idx) { disp_log_buffer_idx = 0; }
+  }
+}
+
+char* DisplayLogBuffer(char temp_code)
+{
+  char* result = nullptr;
+  if (disp_log_buffer_cols) {
+    if (disp_log_buffer_idx != disp_log_buffer_ptr) {
+      result = disp_log_buffer[disp_log_buffer_ptr];
+      disp_log_buffer_ptr++;
+      if (DISPLAY_LOG_ROWS == disp_log_buffer_ptr) { disp_log_buffer_ptr = 0; }
+
+      char *pch = strchr(result, '~');
+      if (pch != nullptr) { result[pch - result] = temp_code; }
+    }
+  }
+  return result;
+}
+
+void DisplayLogBufferInit(void)
+{
+  if (Settings.display_mode) {
+    disp_log_buffer_idx = 0;
+    disp_log_buffer_ptr = 0;
+    disp_refresh = Settings.display_refresh;
+
+    snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%c"), TempUnit());
+    snprintf_P(disp_pres, sizeof(disp_pres), PressureUnit().c_str());
+
+    DisplayReAllocLogBuffer();
+
+    char buffer[40];
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_VERSION " %s%s"), my_version, my_image);
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR("Display mode %d"), Settings.display_mode);
+    DisplayLogBufferAdd(buffer);
+
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_CMND_HOSTNAME " %s"), my_hostname);
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_SSID " %s"), SettingsText(SET_STASSID1 + Settings.sta_active));
+    DisplayLogBufferAdd(buffer);
+    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_MAC " %s"), WiFi.macAddress().c_str());
+    DisplayLogBufferAdd(buffer);
+    if (!global_state.wifi_down) {
+      snprintf_P(buffer, sizeof(buffer), PSTR("IP %s"), WiFi.localIP().toString().c_str());
+      DisplayLogBufferAdd(buffer);
+      snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_RSSI " %d%%"), WifiGetRssiAsQuality(WiFi.RSSI()));
+      DisplayLogBufferAdd(buffer);
+    }
+  }
+}
+
+
+
+
+
+enum SensorQuantity {
+  JSON_TEMPERATURE,
+  JSON_HUMIDITY, JSON_LIGHT, JSON_NOISE, JSON_AIRQUALITY,
+  JSON_PRESSURE, JSON_PRESSUREATSEALEVEL,
+  JSON_ILLUMINANCE,
+  JSON_GAS,
+  JSON_YESTERDAY, JSON_TOTAL, JSON_TODAY,
+  JSON_PERIOD,
+  JSON_POWERFACTOR, JSON_COUNTER, JSON_ANALOG_INPUT, JSON_UV_LEVEL,
+  JSON_CURRENT,
+  JSON_VOLTAGE,
+  JSON_POWERUSAGE,
+  JSON_CO2,
+  JSON_FREQUENCY };
+const char kSensorQuantity[] PROGMEM =
+  D_JSON_TEMPERATURE "|"
+  D_JSON_HUMIDITY "|" D_JSON_LIGHT "|" D_JSON_NOISE "|" D_JSON_AIRQUALITY "|"
+  D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
+  D_JSON_ILLUMINANCE "|"
+  D_JSON_GAS "|"
+  D_JSON_YESTERDAY "|" D_JSON_TOTAL "|" D_JSON_TODAY "|"
+  D_JSON_PERIOD "|"
+  D_JSON_POWERFACTOR "|" D_JSON_COUNTER "|" D_JSON_ANALOG_INPUT "|" D_JSON_UV_LEVEL "|"
+  D_JSON_CURRENT "|"
+  D_JSON_VOLTAGE "|"
+  D_JSON_POWERUSAGE "|"
+  D_JSON_CO2 "|"
+  D_JSON_FREQUENCY ;
+
+void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value)
+{
+  char quantity[TOPSZ];
+  char buffer[Settings.display_cols[0] +1];
+  char spaces[Settings.display_cols[0]];
+  char source[Settings.display_cols[0] - Settings.display_cols[1]];
+  char svalue[Settings.display_cols[1] +1];
+
+#ifdef USE_DEBUG_DRIVER
+  ShowFreeMem(PSTR("DisplayJsonValue"));
+#endif
+
+  memset(spaces, 0x20, sizeof(spaces));
+  spaces[sizeof(spaces) -1] = '\0';
+  snprintf_P(source, sizeof(source), PSTR("%s%s%s%s"), topic, (strlen(topic))?"/":"", mkey, spaces);
+
+  int quantity_code = GetCommandCode(quantity, sizeof(quantity), mkey, kSensorQuantity);
+  if ((-1 == quantity_code) || !strcmp_P(mkey, S_RSLT_POWER)) {
+    return;
+  }
+  if (JSON_TEMPERATURE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s~%s"), value, disp_temp);
+  }
+  else if ((quantity_code >= JSON_HUMIDITY) && (quantity_code <= JSON_AIRQUALITY)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%%"), value);
+  }
+  else if ((quantity_code >= JSON_PRESSURE) && (quantity_code <= JSON_PRESSUREATSEALEVEL)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s"), value, disp_pres);
+  }
+  else if (JSON_ILLUMINANCE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_LUX), value);
+  }
+  else if (JSON_GAS == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOOHM), value);
+  }
+  else if ((quantity_code >= JSON_YESTERDAY) && (quantity_code <= JSON_TODAY)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOWATTHOUR), value);
+  }
+  else if (JSON_PERIOD == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATTHOUR), value);
+  }
+  else if ((quantity_code >= JSON_POWERFACTOR) && (quantity_code <= JSON_UV_LEVEL)) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), value);
+  }
+  else if (JSON_CURRENT == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_AMPERE), value);
+  }
+  else if (JSON_VOLTAGE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_VOLT), value);
+  }
+  else if (JSON_POWERUSAGE == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATT), value);
+  }
+  else if (JSON_CO2 == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_PARTS_PER_MILLION), value);
+  }
+  else if (JSON_FREQUENCY == quantity_code) {
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_HERTZ), value);
+  }
+  snprintf_P(buffer, sizeof(buffer), PSTR("%s %s"), source, svalue);
+
+
+
+  DisplayLogBufferAdd(buffer);
+}
+
+void DisplayAnalyzeJson(char *topic, char *json)
+{
+# 1145 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
+  String jsonStr = json;
+
+  StaticJsonBuffer<1024> jsonBuf;
+  JsonObject &root = jsonBuf.parseObject(jsonStr);
+  if (root.success()) {
+
+    const char *unit;
+    unit = root[D_JSON_TEMPERATURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), unit);
+    }
+    unit = root[D_JSON_PRESSURE_UNIT];
+    if (unit) {
+      snprintf_P(disp_pres, sizeof(disp_pres), PSTR("%s"), unit);
+    }
+
+    for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) {
+      JsonVariant value = it->value;
+      if (value.is<JsonObject>()) {
+        JsonObject& Object2 = value;
+        for (JsonObject::iterator it2 = Object2.begin(); it2 != Object2.end(); ++it2) {
+          JsonVariant value2 = it2->value;
+          if (value2.is<JsonObject>()) {
+            JsonObject& Object3 = value2;
+            for (JsonObject::iterator it3 = Object3.begin(); it3 != Object3.end(); ++it3) {
+              const char* value = it3->value;
+              if (value != nullptr) {
+                DisplayJsonValue(topic, it->key, it3->key, value);
+              }
+            }
+          } else {
+            const char* value = it2->value;
+            if (value != nullptr) {
+              DisplayJsonValue(topic, it->key, it2->key, value);
+            }
+          }
+        }
+      } else {
+        const char* value = it->value;
+        if (value != nullptr) {
+          DisplayJsonValue(topic, it->key, it->key, value);
+        }
+      }
+    }
+  }
+}
+
+void DisplayMqttSubscribe(void)
+{
+
+
+
+
+
+
+  if (Settings.display_model && (Settings.display_mode &0x04)) {
+
+    char stopic[TOPSZ];
+    char ntopic[TOPSZ];
+
+    ntopic[0] = '\0';
+    strlcpy(stopic, SettingsText(SET_MQTT_FULLTOPIC), sizeof(stopic));
+    char *tp = strtok(stopic, "/");
+    while (tp != nullptr) {
+      if (!strcmp_P(tp, MQTT_TOKEN_PREFIX)) {
+        break;
+      }
+      strncat_P(ntopic, PSTR("+/"), sizeof(ntopic) - strlen(ntopic) -1);
+      tp = strtok(nullptr, "/");
+    }
+    strncat(ntopic, SettingsText(SET_MQTTPREFIX3), sizeof(ntopic) - strlen(ntopic) -1);
+    strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1);
+    MqttSubscribe(ntopic);
+    disp_subscribed = true;
+  } else {
+    disp_subscribed = false;
+  }
+}
+
+bool DisplayMqttData(void)
+{
+  if (disp_subscribed) {
+    char stopic[TOPSZ];
+
+    snprintf_P(stopic, sizeof(stopic) , PSTR("%s/"), SettingsText(SET_MQTTPREFIX3));
+    char *tp = strstr(XdrvMailbox.topic, stopic);
+    if (tp) {
+      if (Settings.display_mode &0x04) {
+        tp = tp + strlen(stopic);
+        char *topic = strtok(tp, "/");
+        DisplayAnalyzeJson(topic, XdrvMailbox.data);
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+void DisplayLocalSensor(void)
+{
+  if ((Settings.display_mode &0x02) && (0 == tele_period)) {
+    char no_topic[1] = { 0 };
+
+    DisplayAnalyzeJson(no_topic, mqtt_data);
+  }
+}
+
+#endif
+
+
+
+
+
+void DisplayInitDriver(void)
+{
+  XdspCall(FUNC_DISPLAY_INIT_DRIVER);
+
+  if (renderer) {
+    renderer->setTextFont(Settings.display_font);
+    renderer->setTextSize(Settings.display_size);
+  }
+
+
+
+
+  if (Settings.display_model) {
+    devices_present++;
+    disp_device = devices_present;
+
+#ifndef USE_DISPLAY_MODES1TO5
+    Settings.display_mode = 0;
+#else
+    DisplayLogBufferInit();
+#endif
+  }
+}
+
+void DisplaySetPower(void)
+{
+  disp_power = bitRead(XdrvMailbox.index, disp_device -1);
+
+
+
+  if (Settings.display_model) {
+    if (!renderer) {
+      XdspCall(FUNC_DISPLAY_POWER);
+    } else {
+      renderer->DisplayOnff(disp_power);
+    }
+  }
+}
+
+
+
+
+
+void CmndDisplay(void)
+{
+  Response_P(PSTR("{\"" D_PRFX_DISPLAY "\":{\"" D_CMND_DISP_MODEL "\":%d,\"" D_CMND_DISP_WIDTH "\":%d,\"" D_CMND_DISP_HEIGHT "\":%d,\""
+    D_CMND_DISP_MODE "\":%d,\"" D_CMND_DISP_DIMMER "\":%d,\"" D_CMND_DISP_SIZE "\":%d,\"" D_CMND_DISP_FONT "\":%d,\""
+    D_CMND_DISP_ROTATE "\":%d,\"" D_CMND_DISP_REFRESH "\":%d,\"" D_CMND_DISP_COLS "\":[%d,%d],\"" D_CMND_DISP_ROWS "\":%d}}"),
+    Settings.display_model, Settings.display_width, Settings.display_height,
+    Settings.display_mode, Settings.display_dimmer, Settings.display_size, Settings.display_font,
+    Settings.display_rotate, Settings.display_refresh, Settings.display_cols[0], Settings.display_cols[1], Settings.display_rows);
+}
+
+void CmndDisplayModel(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < DISPLAY_MAX_DRIVERS)) {
+    uint32_t last_display_model = Settings.display_model;
+    Settings.display_model = XdrvMailbox.payload;
+    if (XdspCall(FUNC_DISPLAY_MODEL)) {
+      restart_flag = 2;
+    } else {
+      Settings.display_model = last_display_model;
+    }
+  }
+  ResponseCmndNumber(Settings.display_model);
+}
+
+void CmndDisplayWidth(void)
+{
+  if (XdrvMailbox.payload > 0) {
+    if (XdrvMailbox.payload != Settings.display_width) {
+      Settings.display_width = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndNumber(Settings.display_width);
+}
+
+void CmndDisplayHeight(void)
+{
+  if (XdrvMailbox.payload > 0) {
+    if (XdrvMailbox.payload != Settings.display_height) {
+      Settings.display_height = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+  }
+  ResponseCmndNumber(Settings.display_height);
+}
+
+void CmndDisplayMode(void)
+{
+#ifdef USE_DISPLAY_MODES1TO5
+
+
+
+
+
+
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    uint32_t last_display_mode = Settings.display_mode;
+    Settings.display_mode = XdrvMailbox.payload;
+
+    if (disp_subscribed != (Settings.display_mode &0x04)) {
+      restart_flag = 2;
+    } else {
+      if (last_display_mode && !Settings.display_mode) {
+        DisplayInit(DISPLAY_INIT_MODE);
+        if (renderer) renderer->fillScreen(bg_color);
+        else DisplayClear();
+      } else {
+        DisplayLogBufferInit();
+        DisplayInit(DISPLAY_INIT_MODE);
+      }
+    }
+  }
+#endif
+  ResponseCmndNumber(Settings.display_mode);
+}
+
+void CmndDisplayDimmer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+    Settings.display_dimmer = ((XdrvMailbox.payload +1) * 100) / 666;
+    if (Settings.display_dimmer && !(disp_power)) {
+      ExecuteCommandPower(disp_device, POWER_ON, SRC_DISPLAY);
+    }
+    else if (!Settings.display_dimmer && disp_power) {
+      ExecuteCommandPower(disp_device, POWER_OFF, SRC_DISPLAY);
+    }
+    if (renderer) renderer->dim(Settings.display_dimmer);
+  }
+  ResponseCmndNumber(Settings.display_dimmer);
+}
+
+void CmndDisplaySize(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 4)) {
+    Settings.display_size = XdrvMailbox.payload;
+    if (renderer) renderer->setTextSize(Settings.display_size);
+    else DisplaySetSize(Settings.display_size);
+  }
+  ResponseCmndNumber(Settings.display_size);
+}
+
+void CmndDisplayFont(void)
+{
+  if ((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 4)) {
+    Settings.display_font = XdrvMailbox.payload;
+    if (renderer) renderer->setTextFont(Settings.display_font);
+    else DisplaySetFont(Settings.display_font);
+  }
+  ResponseCmndNumber(Settings.display_font);
+}
+
+void CmndDisplayRotate(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
+    if (Settings.display_rotate != XdrvMailbox.payload) {
+# 1428 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
+      Settings.display_rotate = XdrvMailbox.payload;
+      DisplayInit(DISPLAY_INIT_MODE);
+#ifdef USE_DISPLAY_MODES1TO5
+      DisplayLogBufferInit();
+#endif
+    }
+  }
+  ResponseCmndNumber(Settings.display_rotate);
+}
+
+void CmndDisplayText(void)
+{
+  if (disp_device && XdrvMailbox.data_len > 0) {
+#ifndef USE_DISPLAY_MODES1TO5
+    DisplayText();
+#else
+    if (!Settings.display_mode) {
+      DisplayText();
+    } else {
+      DisplayLogBufferAdd(XdrvMailbox.data);
+    }
+#endif
+    ResponseCmndChar(XdrvMailbox.data);
+  }
+}
+
+void CmndDisplayAddress(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 8)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
+      Settings.display_address[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    ResponseCmndIdxNumber(Settings.display_address[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDisplayRefresh(void)
+{
+  if ((XdrvMailbox.payload >= 1) && (XdrvMailbox.payload <= 7)) {
+    Settings.display_refresh = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.display_refresh);
+}
+
+void CmndDisplayColumns(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_COLS)) {
+      Settings.display_cols[XdrvMailbox.index -1] = XdrvMailbox.payload;
+#ifdef USE_DISPLAY_MODES1TO5
+      if (1 == XdrvMailbox.index) {
+        DisplayLogBufferInit();
+        DisplayReAllocScreenBuffer();
+      }
+#endif
+    }
+    ResponseCmndIdxNumber(Settings.display_cols[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDisplayRows(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_ROWS)) {
+    Settings.display_rows = XdrvMailbox.payload;
+#ifdef USE_DISPLAY_MODES1TO5
+    DisplayLogBufferInit();
+    DisplayReAllocScreenBuffer();
+#endif
+  }
+  ResponseCmndNumber(Settings.display_rows);
+}
+
+
+
+
+
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp) {
+  if (!renderer) return;
+
+
+  File fp;
+  fp=SD.open(file,FILE_READ);
+  if (!fp) return;
+  uint16_t xsize;
+  fp.read((uint8_t*)&xsize,2);
+  uint16_t ysize;
+  fp.read((uint8_t*)&ysize,2);
+
+#if 1
+#define XBUFF 128
+  uint16_t xdiv=xsize/XBUFF;
+  renderer->setAddrWindow(xp,yp,xp+xsize,yp+ysize);
+  for(int16_t j=0; j<ysize; j++) {
+    for(int16_t i=0; i<xsize; i+=XBUFF) {
+      uint16_t rgb[XBUFF];
+      uint16_t len=fp.read((uint8_t*)rgb,XBUFF*2);
+      if (len>=2) renderer->pushColors(rgb,len/2,true);
+    }
+    OsWatchLoop();
+  }
+  renderer->setAddrWindow(0,0,0,0);
+#else
+  for(int16_t j=0; j<ysize; j++) {
+    for(int16_t i=0; i<xsize; i++ ) {
+      uint16_t rgb;
+      uint8_t res=fp.read((uint8_t*)&rgb,2);
+      if (!res) break;
+      renderer->writePixel(xp+i,yp,rgb);
+    }
+    delay(0);
+    OsWatchLoop();
+    yp++;
+  }
+#endif
+  fp.close();
+}
+#endif
+
+#ifdef USE_AWATCH
+#define MINUTE_REDUCT 4
+
+#ifndef pi
+#define pi 3.14159265359
+#endif
+
+
+void DrawAClock(uint16_t rad) {
+    if (!renderer) return;
+    float frad=rad;
+    uint16_t hred=frad/3.0;
+    renderer->fillCircle(disp_xpos, disp_ypos, rad, bg_color);
+    renderer->drawCircle(disp_xpos, disp_ypos, rad, fg_color);
+    renderer->fillCircle(disp_xpos, disp_ypos, 4, fg_color);
+    for (uint8_t count=0; count<60; count+=5) {
+      float p1=((float)count*(pi/30)-(pi/2));
+      uint8_t len;
+      if ((count%15)==0) {
+        len=4;
+      } else {
+        len=2;
+      }
+      renderer->writeLine(disp_xpos+((float)(rad-len)*cosf(p1)), disp_ypos+((float)(rad-len)*sinf(p1)), disp_xpos+(frad*cosf(p1)), disp_ypos+(frad*sinf(p1)), fg_color);
+    }
+
+
+    float hour=((float)RtcTime.hour*60.0+(float)RtcTime.minute)/60.0;
+    float temp=(hour*(pi/6.0)-(pi/2.0));
+    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-hred)*cosf(temp),disp_ypos+(frad-hred)*sinf(temp), fg_color);
+
+
+    temp=((float)RtcTime.minute*(pi/30.0)-(pi/2.0));
+    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-MINUTE_REDUCT)*cosf(temp),disp_ypos+(frad-MINUTE_REDUCT)*sinf(temp), fg_color);
+}
+#endif
+
+
+#ifdef USE_GRAPH
+
+typedef union {
+  uint8_t data;
+  struct {
+      uint8_t overlay : 1;
+      uint8_t draw : 1;
+      uint8_t nu3 : 1;
+      uint8_t nu4 : 1;
+      uint8_t nu5 : 1;
+      uint8_t nu6 : 1;
+      uint8_t nu7 : 1;
+      uint8_t nu8 : 1;
+  };
+} GFLAGS;
+
+struct GRAPH {
+  uint16_t xp;
+  uint16_t yp;
+  uint16_t xs;
+  uint16_t ys;
+  float ymin;
+  float ymax;
+  float range;
+  uint32_t x_time;
+  uint32_t last_ms;
+  uint32_t last_ms_redrawn;
+  int16_t decimation;
+  uint16_t dcnt;
+  uint32_t summ;
+  uint16_t xcnt;
+  uint8_t *values;
+  uint8_t xticks;
+  uint8_t yticks;
+  uint8_t last_val;
+  uint8_t color_index;
+  GFLAGS flags;
+};
+
+
+struct GRAPH *graph[NUM_GRAPHS];
+
+#define TICKLEN 4
+void ClrGraph(uint16_t num) {
+  struct GRAPH *gp=graph[num];
+
+  uint16_t xticks=gp->xticks;
+  uint16_t yticks=gp->yticks;
+  uint16_t count;
+
+
+  if (gp->flags.overlay) return;
+
+  renderer->fillRect(gp->xp+1,gp->yp+1,gp->xs-2,gp->ys-2,bg_color);
+
+  if (xticks) {
+    float cxp=gp->xp,xd=(float)gp->xs/(float)xticks;
+    for (count=0; count<xticks; count++) {
+      renderer->writeFastVLine(cxp,gp->yp+gp->ys-TICKLEN,TICKLEN,fg_color);
+      cxp+=xd;
+    }
+  }
+  if (yticks) {
+    if (gp->ymin<0 && gp->ymax>0) {
+
+      float cxp=0;
+      float czp=gp->yp+(gp->ymax/gp->range);
+      while (cxp<gp->xs) {
+        renderer->writeFastHLine(gp->xp+cxp,czp,2,fg_color);
+        cxp+=6.0;
+      }
+
+      float cyp=0,yd=gp->ys/yticks;
+      for (count=0; count<yticks; count++) {
+        if ((czp-cyp)>gp->yp) {
+          renderer->writeFastHLine(gp->xp,czp-cyp,TICKLEN,fg_color);
+          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp-cyp,TICKLEN,fg_color);
+        }
+        if ((czp+cyp)<(gp->yp+gp->ys)) {
+          renderer->writeFastHLine(gp->xp,czp+cyp,TICKLEN,fg_color);
+          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp+cyp,TICKLEN,fg_color);
+        }
+        cyp+=yd;
+      }
+    } else {
+      float cyp=gp->yp,yd=gp->ys/yticks;
+      for (count=0; count<yticks; count++) {
+        renderer->writeFastHLine(gp->xp,cyp,TICKLEN,fg_color);
+        renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,cyp,TICKLEN,fg_color);
+        cyp+=yd;
+      }
+    }
+  }
+}
+
+
+void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol) {
+  if (!renderer) return;
+  uint8_t rflg=0;
+  if (xs<0) {
+    rflg=1;
+    xs=abs(xs);
+  }
+  struct GRAPH *gp;
+  uint16_t count;
+  uint16_t index=num%NUM_GRAPHS;
+  if (!graph[index]) {
+    gp=(struct GRAPH*)calloc(sizeof(struct GRAPH),1);
+    if (!gp) return;
+    graph[index]=gp;
+  } else {
+    gp=graph[index];
+    if (rflg) {
+      RedrawGraph(index,1);
+      return;
+    }
+  }
+
+
+  gp->xticks=(num>>4)&0x3f;
+  gp->yticks=(num>>10)&0x3f;
+  gp->xp=xp;
+  gp->yp=yp;
+  gp->xs=xs;
+  gp->ys=ys;
+  if (!dec) dec=1;
+  gp->decimation=dec;
+  if (dec>0) {
+
+    gp->x_time=((float)dec*60000.0)/(float)xs;
+    gp->last_ms=millis()+gp->x_time;
+  }
+  gp->ymin=ymin;
+  gp->ymax=ymax;
+  gp->range=(ymax-ymin)/ys;
+  gp->xcnt=0;
+  gp->dcnt=0;
+  gp->summ=0;
+  if (gp->values) free(gp->values);
+  gp->values=(uint8_t*) calloc(1,xs+2);
+  if (!gp->values) {
+    free(gp);
+    graph[index]=0;
+    return;
+  }
+
+  gp->values[0]=0;
+
+  gp->last_ms_redrawn=millis();
+
+  if (!icol) icol=1;
+  gp->color_index=icol;
+  gp->flags.overlay=0;
+  gp->flags.draw=1;
+
+
+  if (index>0) {
+    for (uint8_t count=0; count<index; count++) {
+      if (graph[count]) {
+
+
+        struct GRAPH *gp1=graph[count];
+        if ((gp->xp==gp1->xp) && (gp->yp==gp1->yp)) {
+          gp->flags.overlay=1;
+          break;
+        }
+      }
+    }
+  }
+
+
+  renderer->drawRect(xp,yp,xs,ys,fg_color);
+
+  ClrGraph(index);
+
+}
+
+
+void DisplayCheckGraph() {
+  int16_t count;
+  struct GRAPH *gp;
+  for (count=0;count<NUM_GRAPHS;count++) {
+    gp=graph[count];
+    if (gp) {
+      if (gp->decimation>0) {
+
+        while (millis()>gp->last_ms) {
+          gp->last_ms+=gp->x_time;
+          uint8_t val;
+          if (gp->dcnt) {
+            val=gp->summ/gp->dcnt;
+            gp->dcnt=0;
+            gp->summ=0;
+            gp->last_val=val;
+          } else {
+            val=gp->last_val;
+          }
+          AddGraph(count,val);
+        }
+      }
+    }
+  }
+}
+
+
+#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
+#include <SD.h>
+
+void Save_graph(uint8_t num, char *path) {
+  if (!renderer) return;
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  File fp;
+  SD.remove(path);
+  fp=SD.open(path,FILE_WRITE);
+  if (!fp) return;
+  char str[32];
+  sprintf_P(str,PSTR("%d\t%d\t%d\t"),gp->xcnt,gp->xs,gp->ys);
+  fp.print(str);
+  dtostrfd(gp->ymin,2,str);
+  fp.print(str);
+  fp.print("\t");
+  dtostrfd(gp->ymax,2,str);
+  fp.print(str);
+  fp.print("\t");
+  for (uint32_t count=0;count<gp->xs;count++) {
+    dtostrfd(gp->values[count],0,str);
+    fp.print(str);
+    fp.print("\t");
+  }
+  fp.print("\n");
+  fp.close();
+}
+void Restore_graph(uint8_t num, char *path) {
+  if (!renderer) return;
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  File fp;
+  fp=SD.open(path,FILE_READ);
+  if (!fp) return;
+  char vbuff[32];
+  char *cp=vbuff;
+  uint8_t buf[2];
+  uint8_t findex=0;
+
+  for (uint32_t count=0;count<=gp->xs+4;count++) {
+    cp=vbuff;
+    findex=0;
+    while (fp.available()) {
+      fp.read(buf,1);
+      if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
+        break;
+      } else {
+        *cp++=buf[0];
+        findex++;
+        if (findex>=sizeof(vbuff)-1) break;
+      }
+    }
+    *cp=0;
+    if (count<=4) {
+      if (count==0) gp->xcnt=atoi(vbuff);
+    } else {
+      gp->values[count-5]=atoi(vbuff);
+    }
+  }
+  fp.close();
+  RedrawGraph(num,1);
+}
+#endif
+
+void RedrawGraph(uint8_t num, uint8_t flags) {
+  uint16_t index=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[index];
+  if (!gp) return;
+  if (!flags) {
+    gp->flags.draw=0;
+    return;
+  }
+  if (!renderer) return;
+
+  gp->flags.draw=1;
+  uint16_t linecol=fg_color;
+
+  if (color_type==COLOR_COLOR) {
+    linecol=renderer->GetColorFromIndex(gp->color_index);
+  }
+
+  if (!gp->flags.overlay) {
+
+    renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
+
+    ClrGraph(index);
+  }
+
+  for (uint16_t count=0;count<gp->xs-1;count++) {
+    renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
+  }
+}
+
+
+void AddGraph(uint8_t num,uint8_t val) {
+  struct GRAPH *gp=graph[num];
+  if (!renderer) return;
+
+  uint16_t linecol=fg_color;
+  if (color_type==COLOR_COLOR) {
+    linecol=renderer->GetColorFromIndex(gp->color_index);
+  }
+  gp->xcnt++;
+  if (gp->xcnt>gp->xs) {
+    gp->xcnt=gp->xs;
+    int16_t count;
+
+    for (count=0;count<gp->xs-1;count++) {
+      gp->values[count]=gp->values[count+1];
+    }
+    gp->values[gp->xcnt-1]=val;
+
+    if (!gp->flags.draw) return;
+
+
+    if (millis()-gp->last_ms_redrawn>1000) {
+      gp->last_ms_redrawn=millis();
+
+      if (!gp->flags.overlay) {
+
+        renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
+
+        ClrGraph(num);
+      }
+
+      for (count=0;count<gp->xs-1;count++) {
+        renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
+      }
+    }
+  } else {
+
+    gp->values[gp->xcnt]=val;
+    if (!gp->flags.draw) return;
+    renderer->writeLine(gp->xp+gp->xcnt-1,gp->yp+gp->ys-gp->values[gp->xcnt-1]-1,gp->xp+gp->xcnt,gp->yp+gp->ys-gp->values[gp->xcnt]-1,linecol);
+  }
+}
+
+
+
+void AddValue(uint8_t num,float fval) {
+
+  num=num%NUM_GRAPHS;
+  struct GRAPH *gp=graph[num];
+  if (!gp) return;
+
+  if (fval>gp->ymax) fval=gp->ymax;
+  if (fval<gp->ymin) fval=gp->ymin;
+
+  int16_t val;
+  val=(fval-gp->ymin)/gp->range;
+
+  if (val>gp->ys-1) val=gp->ys-1;
+  if (val<0) val=0;
+
+
+  gp->summ+=val;
+  gp->dcnt++;
+
+
+  if (gp->decimation<0) {
+    if (gp->dcnt>=-gp->decimation) {
+      gp->dcnt=0;
+
+      val=gp->summ/-gp->decimation;
+      gp->summ=0;
+
+      AddGraph(num,val);
+    }
+  }
+}
+#endif
+
+
+
+
+
+bool Xdrv13(uint8_t function)
+{
+  bool result = false;
+
+  if ((i2c_flg || spi_flg || soft_spi_flg) && XdspPresent()) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        DisplayInitDriver();
+#ifdef USE_GRAPH
+        for (uint8_t count=0;count<NUM_GRAPHS;count++) {
+          graph[count]=0;
+        }
+#endif
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (Settings.display_model) { XdspCall(FUNC_DISPLAY_EVERY_50_MSECOND); }
+        break;
+      case FUNC_SET_POWER:
+        DisplaySetPower();
+        break;
+      case FUNC_EVERY_SECOND:
+#ifdef USE_GRAPH
+        DisplayCheckGraph();
+#endif
+
+#ifdef USE_DISPLAY_MODES1TO5
+        if (Settings.display_model && Settings.display_mode) { XdspCall(FUNC_DISPLAY_EVERY_SECOND); }
+#endif
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_MQTT_SUBSCRIBE:
+        DisplayMqttSubscribe();
+        break;
+      case FUNC_MQTT_DATA:
+        result = DisplayMqttData();
+        break;
+      case FUNC_SHOW_SENSOR:
+        DisplayLocalSensor();
+        break;
+#endif
+      case FUNC_COMMAND:
+        result = DecodeCommand(kDisplayCommands, DisplayCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
+# 64 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
+#ifdef USE_MP3_PLAYER
+
+
+
+
+
+#define XDRV_14 14
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *MP3Player;
+
+
+
+
+
+#define D_CMND_MP3 "MP3"
+
+const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}";
+const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}";
+const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC";
+
+
+
+
+
+enum MP3_Commands {
+  CMND_MP3_TRACK,
+  CMND_MP3_PLAY,
+  CMND_MP3_PAUSE,
+  CMND_MP3_STOP,
+  CMND_MP3_VOLUME,
+  CMND_MP3_EQ,
+  CMND_MP3_DEVICE,
+  CMND_MP3_RESET,
+  CMND_MP3_DAC };
+
+
+
+
+
+
+#define MP3_CMD_RESET_VALUE 0
+
+#define MP3_CMD_TRACK 0x03
+#define MP3_CMD_PLAY 0x0d
+#define MP3_CMD_PAUSE 0x0e
+#define MP3_CMD_STOP 0x16
+#define MP3_CMD_VOLUME 0x06
+#define MP3_CMD_EQ 0x07
+#define MP3_CMD_DEVICE 0x09
+#define MP3_CMD_RESET 0x0C
+#define MP3_CMD_DAC 0x1A
+
+
+
+
+
+
+uint16_t MP3_Checksum(uint8_t *array)
+{
+  uint16_t checksum = 0;
+  for (uint32_t i = 0; i < 6; i++) {
+    checksum += array[i];
+  }
+  checksum = checksum^0xffff;
+  return (checksum+1);
+}
+
+
+
+
+
+
+void MP3PlayerInit(void) {
+  MP3Player = new TasmotaSerial(-1, pin[GPIO_MP3_DFR562]);
+
+  if (MP3Player->begin(9600)) {
+    MP3Player->flush();
+    delay(1000);
+    MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE);
+    delay(3000);
+    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
+  }
+  return;
+}
+# 159 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
+void MP3_CMD(uint8_t mp3cmd,uint16_t val) {
+  uint8_t i = 0;
+  uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef};
+  cmd[3] = mp3cmd;
+  cmd[4] = 0;
+  cmd[5] = val>>8;
+  cmd[6] = val;
+  uint16_t chks = MP3_Checksum(&cmd[1]);
+  cmd[7] = chks>>8;
+  cmd[8] = chks;
+  MP3Player->write(cmd, sizeof(cmd));
+  delay(1000);
+  if (mp3cmd == MP3_CMD_RESET) {
+    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
+  }
+  return;
+}
+
+
+
+
+
+bool MP3PlayerCmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_MP3);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands);
+
+    switch (command_code) {
+      case CMND_MP3_TRACK:
+      case CMND_MP3_VOLUME:
+      case CMND_MP3_EQ:
+      case CMND_MP3_DEVICE:
+      case CMND_MP3_DAC:
+
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); }
+          if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); }
+          if (command_code == CMND_MP3_DAC) { MP3_CMD(MP3_CMD_DAC, XdrvMailbox.payload); }
+        }
+        Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_MP3_PLAY:
+      case CMND_MP3_PAUSE:
+      case CMND_MP3_STOP:
+      case CMND_MP3_RESET:
+
+        if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); }
+        if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); }
+        if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); }
+        if (command_code == CMND_MP3_RESET) { MP3_CMD(MP3_CMD_RESET, 0); }
+        Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload);
+        break;
+      default:
+
+       serviced = false;
+     break;
+    }
+  } else {
+    return false;
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xdrv14(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_MP3_DFR562] < 99) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        MP3PlayerInit();
+        break;
+      case FUNC_COMMAND:
+        result = MP3PlayerCmd();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_15_pca9685.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_15_pca9685.ino"
+#ifdef USE_I2C
+#ifdef USE_PCA9685
+
+
+
+
+
+
+#define XDRV_15 15
+#define XI2C_01 1
+
+#define PCA9685_REG_MODE1 0x00
+#define PCA9685_REG_LED0_ON_L 0x06
+#define PCA9685_REG_PRE_SCALE 0xFE
+
+#ifndef USE_PCA9685_ADDR
+  #define USE_PCA9685_ADDR 0x40
+#endif
+#ifndef USE_PCA9685_FREQ
+  #define USE_PCA9685_FREQ 50
+#endif
+
+bool pca9685_detected = false;
+uint16_t pca9685_freq = USE_PCA9685_FREQ;
+uint16_t pca9685_pin_pwm_value[16];
+
+void PCA9685_Detect(void)
+{
+  if (I2cActive(USE_PCA9685_ADDR)) { return; }
+
+  uint8_t buffer;
+  if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
+    I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x20);
+    if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
+      if (0x20 == buffer) {
+        pca9685_detected = true;
+        I2cSetActiveFound(USE_PCA9685_ADDR, "PCA9685");
+        PCA9685_Reset();
+      }
+    }
+  }
+}
+
+void PCA9685_Reset(void)
+{
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x80);
+  PCA9685_SetPWMfreq(USE_PCA9685_FREQ);
+  for (uint32_t pin=0;pin<16;pin++) {
+    PCA9685_SetPWM(pin,0,false);
+    pca9685_pin_pwm_value[pin] = 0;
+  }
+  Response_P(PSTR("{\"PCA9685\":{\"RESET\":\"OK\"}}"));
+}
+
+void PCA9685_SetPWMfreq(double freq) {
+
+
+
+
+  if (freq > 23 && freq < 1527) {
+   pca9685_freq=freq;
+  } else {
+   pca9685_freq=50;
+  }
+  uint8_t pre_scale_osc = round(25000000/(4096*pca9685_freq))-1;
+  if (1526 == pca9685_freq) pre_scale_osc=0xFF;
+  uint8_t current_mode1 = I2cRead8(USE_PCA9685_ADDR, PCA9685_REG_MODE1);
+  uint8_t sleep_mode1 = (current_mode1&0x7F) | 0x10;
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, sleep_mode1);
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_PRE_SCALE, pre_scale_osc);
+  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, current_mode1 | 0xA0);
+}
+
+void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off) {
+  uint8_t led_reg = PCA9685_REG_LED0_ON_L + 4 * pin;
+  uint32_t led_data = 0;
+  I2cWrite8(USE_PCA9685_ADDR, led_reg, on);
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+1, (on >> 8));
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+2, off);
+  I2cWrite8(USE_PCA9685_ADDR, led_reg+3, (off >> 8));
+}
+
+void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted) {
+  if (4096 == pwm) {
+    PCA9685_SetPWM_Reg(pin, 4096, 0);
+  } else {
+    PCA9685_SetPWM_Reg(pin, 0, pwm);
+  }
+  pca9685_pin_pwm_value[pin] = pwm;
+}
+
+bool PCA9685_Command(void)
+{
+  bool serviced = true;
+  bool validpin = false;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"STATUS")) { PCA9685_OutputTelemetry(false); return serviced; }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) {
+    if (paramcount > 1) {
+      uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((new_freq >= 24) && (new_freq <= 1526)) {
+        PCA9685_SetPWMfreq(new_freq);
+        Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i, \"Result\":\"OK\"}}"),new_freq);
+        return serviced;
+      }
+    } else {
+      Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i}}"),pca9685_freq);
+      return serviced;
+    }
+  }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWM")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (paramcount > 2) {
+        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "ON")) {
+          PCA9685_SetPWM(pin, 4096, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,4096);
+          serviced = true;
+          return serviced;
+        }
+        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "OFF")) {
+          PCA9685_SetPWM(pin, 0, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,0);
+          serviced = true;
+          return serviced;
+        }
+        uint16_t pwm = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+        if ((pin >= 0 && pin <= 15) && (pwm >= 0 && pwm <= 4096)) {
+          PCA9685_SetPWM(pin, pwm, false);
+          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,pwm);
+          serviced = true;
+          return serviced;
+        }
+      }
+    }
+  }
+  return serviced;
+}
+
+void PCA9685_OutputTelemetry(bool telemetry)
+{
+  ResponseTime_P(PSTR(",\"PCA9685\":{\"PWM_FREQ\":%i,"),pca9685_freq);
+  for (uint32_t pin=0;pin<16;pin++) {
+    ResponseAppend_P(PSTR("\"PWM%i\":%i,"),pin,pca9685_pin_pwm_value[pin]);
+  }
+  ResponseAppend_P(PSTR("\"END\":1}}"));
+  if (telemetry) {
+    MqttPublishTeleSensor();
+  }
+}
+
+bool Xdrv15(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_01)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    PCA9685_Detect();
+  }
+  else if (pca9685_detected) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        if (tele_period == 0) {
+          PCA9685_OutputTelemetry(true);
+        }
+        break;
+      case FUNC_COMMAND_DRIVER:
+        if (XDRV_15 == XdrvMailbox.index) {
+          result = PCA9685_Command();
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+#ifdef USE_LIGHT
+#ifdef USE_TUYA_MCU
+
+#define XDRV_16 16
+#define XNRG_16 16
+
+#ifndef TUYA_DIMMER_ID
+#define TUYA_DIMMER_ID 0
+#endif
+
+#define TUYA_CMD_HEARTBEAT 0x00
+#define TUYA_CMD_QUERY_PRODUCT 0x01
+#define TUYA_CMD_MCU_CONF 0x02
+#define TUYA_CMD_WIFI_STATE 0x03
+#define TUYA_CMD_WIFI_RESET 0x04
+#define TUYA_CMD_WIFI_SELECT 0x05
+#define TUYA_CMD_SET_DP 0x06
+#define TUYA_CMD_STATE 0x07
+#define TUYA_CMD_QUERY_STATE 0x08
+
+#define TUYA_LOW_POWER_CMD_WIFI_STATE 0x02
+#define TUYA_LOW_POWER_CMD_WIFI_RESET 0x03
+#define TUYA_LOW_POWER_CMD_WIFI_CONFIG 0x04
+#define TUYA_LOW_POWER_CMD_STATE 0x05
+
+#define TUYA_TYPE_BOOL 0x01
+#define TUYA_TYPE_VALUE 0x02
+#define TUYA_TYPE_STRING 0x03
+#define TUYA_TYPE_ENUM 0x04
+
+#define TUYA_BUFFER_SIZE 256
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *TuyaSerial = nullptr;
+
+struct TUYA {
+  uint16_t new_dim = 0;
+  bool ignore_dim = false;
+  uint8_t cmd_status = 0;
+  uint8_t cmd_checksum = 0;
+  uint8_t data_len = 0;
+  uint8_t wifi_state = -2;
+  uint8_t heartbeat_timer = 0;
+#ifdef USE_ENERGY_SENSOR
+  uint32_t lastPowerCheckTime = 0;
+#endif
+  char *buffer = nullptr;
+  int byte_counter = 0;
+  bool low_power_mode = false;
+  bool send_success_next_second = false;
+} Tuya;
+
+
+enum TuyaSupportedFunctions {
+  TUYA_MCU_FUNC_NONE,
+  TUYA_MCU_FUNC_SWT1 = 1,
+  TUYA_MCU_FUNC_SWT2,
+  TUYA_MCU_FUNC_SWT3,
+  TUYA_MCU_FUNC_SWT4,
+  TUYA_MCU_FUNC_REL1 = 11,
+  TUYA_MCU_FUNC_REL2,
+  TUYA_MCU_FUNC_REL3,
+  TUYA_MCU_FUNC_REL4,
+  TUYA_MCU_FUNC_REL5,
+  TUYA_MCU_FUNC_REL6,
+  TUYA_MCU_FUNC_REL7,
+  TUYA_MCU_FUNC_REL8,
+  TUYA_MCU_FUNC_DIMMER = 21,
+  TUYA_MCU_FUNC_POWER = 31,
+  TUYA_MCU_FUNC_CURRENT,
+  TUYA_MCU_FUNC_VOLTAGE,
+  TUYA_MCU_FUNC_BATTERY_STATE,
+  TUYA_MCU_FUNC_BATTERY_PERCENTAGE,
+  TUYA_MCU_FUNC_REL1_INV = 41,
+  TUYA_MCU_FUNC_REL2_INV,
+  TUYA_MCU_FUNC_REL3_INV,
+  TUYA_MCU_FUNC_REL4_INV,
+  TUYA_MCU_FUNC_REL5_INV,
+  TUYA_MCU_FUNC_REL6_INV,
+  TUYA_MCU_FUNC_REL7_INV,
+  TUYA_MCU_FUNC_REL8_INV,
+  TUYA_MCU_FUNC_LOWPOWER_MODE = 51,
+  TUYA_MCU_FUNC_LAST = 255
+};
+
+const char kTuyaCommand[] PROGMEM = "|"
+  D_CMND_TUYA_MCU "|" D_CMND_TUYA_MCU_SEND_STATE;
+
+void (* const TuyaCommand[])(void) PROGMEM = {
+  &CmndTuyaMcu, &CmndTuyaSend
+};
+# 127 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
+void CmndTuyaSend(void) {
+  if (XdrvMailbox.index > 4) {
+    return;
+  }
+  if (XdrvMailbox.index == 0) {
+    TuyaRequestState();
+  } else {
+    if (XdrvMailbox.data_len > 0) {
+      char *p;
+      char *data;
+      uint8_t i = 0;
+      uint8_t dpId = 0;
+      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
+        if ( i == 0) {
+          dpId = strtoul(str, nullptr, 0);
+        } else {
+          data = str;
+        }
+        i++;
+      }
+
+      if (1 == XdrvMailbox.index) {
+        TuyaSendBool(dpId, strtoul(data, nullptr, 0));
+      } else if (2 == XdrvMailbox.index) {
+        TuyaSendValue(dpId, strtoull(data, nullptr, 0));
+      } else if (3 == XdrvMailbox.index) {
+        TuyaSendString(dpId, data);
+      } else if (4 == XdrvMailbox.index) {
+        TuyaSendEnum(dpId, strtoul(data, nullptr, 0));
+      }
+    }
+  }
+  ResponseCmndDone();
+}
+
+
+
+
+
+
+
+void CmndTuyaMcu(void) {
+  if (XdrvMailbox.data_len > 0) {
+    char *p;
+    uint8_t i = 0;
+    uint8_t parm[3] = { 0 };
+    for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
+      parm[i] = strtoul(str, nullptr, 0);
+      i++;
+    }
+
+    if (TuyaFuncIdValid(parm[0])) {
+      TuyaAddMcuFunc(parm[0], parm[1]);
+      restart_flag = 2;
+    } else {
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR("TYA: TuyaMcu Invalid function id=%d"), parm[0]);
+    }
+
+  }
+
+  Response_P(PSTR("{\"" D_CMND_TUYA_MCU "\":["));
+  bool added = false;
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].fnid != 0) {
+      if (added) {
+        ResponseAppend_P(PSTR(","));
+      }
+      ResponseAppend_P(PSTR("{\"fnId\":%d,\"dpId\":%d}" ), Settings.tuya_fnid_map[i].fnid, Settings.tuya_fnid_map[i].dpid);
+      added = true;
+    }
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+
+
+
+
+void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId) {
+  bool added = false;
+
+  if (fnId == 0 || dpId == 0) {
+    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+      if ((dpId > 0 && Settings.tuya_fnid_map[i].dpid == dpId) || (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].fnid == fnId)) {
+        Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
+        Settings.tuya_fnid_map[i].dpid = 0;
+        break;
+      }
+    }
+  } else {
+    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+      if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].dpid == 0 || Settings.tuya_fnid_map[i].fnid == fnId || Settings.tuya_fnid_map[i].fnid == 0) {
+        if (!added) {
+          Settings.tuya_fnid_map[i].fnid = fnId;
+          Settings.tuya_fnid_map[i].dpid = dpId;
+          added = true;
+        } else if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].fnid == fnId) {
+          Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
+          Settings.tuya_fnid_map[i].dpid = 0;
+        }
+      }
+    }
+  }
+  UpdateDevices();
+}
+
+void UpdateDevices() {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    uint8_t fnId = Settings.tuya_fnid_map[i].fnid;
+    if (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].dpid > 0) {
+
+      if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
+        bitClear(rel_inverted, fnId - TUYA_MCU_FUNC_REL1);
+      } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
+        bitSet(rel_inverted, fnId - TUYA_MCU_FUNC_REL1_INV);
+      }
+
+    }
+  }
+}
+
+inline bool TuyaFuncIdValid(uint8_t fnId) {
+  return (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) ||
+  (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) ||
+    fnId == TUYA_MCU_FUNC_DIMMER ||
+    (fnId >= TUYA_MCU_FUNC_POWER && fnId <= TUYA_MCU_FUNC_VOLTAGE) ||
+    (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) ||
+    (fnId == TUYA_MCU_FUNC_LOWPOWER_MODE);
+}
+
+uint8_t TuyaGetFuncId(uint8_t dpid) {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].dpid == dpid) {
+      return Settings.tuya_fnid_map[i].fnid;
+    }
+  }
+  return TUYA_MCU_FUNC_NONE;
+}
+
+uint8_t TuyaGetDpId(uint8_t fnId) {
+  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
+    if (Settings.tuya_fnid_map[i].fnid == fnId) {
+      return Settings.tuya_fnid_map[i].dpid;
+    }
+  }
+  return 0;
+}
+
+void TuyaSendCmd(uint8_t cmd, uint8_t payload[] = nullptr, uint16_t payload_len = 0)
+{
+  uint8_t checksum = (0xFF + cmd + (payload_len >> 8) + (payload_len & 0xFF));
+  TuyaSerial->write(0x55);
+  TuyaSerial->write(0xAA);
+  TuyaSerial->write((uint8_t)0x00);
+  TuyaSerial->write(cmd);
+  TuyaSerial->write(payload_len >> 8);
+  TuyaSerial->write(payload_len & 0xFF);
+  snprintf_P(log_data, sizeof(log_data), PSTR("TYA: Send \"55aa00%02x%02x%02x"), cmd, payload_len >> 8, payload_len & 0xFF);
+  for (uint32_t i = 0; i < payload_len; ++i) {
+    TuyaSerial->write(payload[i]);
+    checksum += payload[i];
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, payload[i]);
+  }
+  TuyaSerial->write(checksum);
+  TuyaSerial->flush();
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x\""), log_data, checksum);
+  AddLog(LOG_LEVEL_DEBUG);
+}
+
+void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value)
+{
+  uint16_t payload_len = 4;
+  uint8_t payload_buffer[8];
+  payload_buffer[0] = id;
+  payload_buffer[1] = type;
+  switch (type) {
+    case TUYA_TYPE_BOOL:
+    case TUYA_TYPE_ENUM:
+      payload_len += 1;
+      payload_buffer[2] = 0x00;
+      payload_buffer[3] = 0x01;
+      payload_buffer[4] = value[0];
+      break;
+    case TUYA_TYPE_VALUE:
+      payload_len += 4;
+      payload_buffer[2] = 0x00;
+      payload_buffer[3] = 0x04;
+      payload_buffer[4] = value[3];
+      payload_buffer[5] = value[2];
+      payload_buffer[6] = value[1];
+      payload_buffer[7] = value[0];
+      break;
+
+  }
+
+  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
+}
+
+void TuyaSendBool(uint8_t id, bool value)
+{
+  TuyaSendState(id, TUYA_TYPE_BOOL, (uint8_t*)&value);
+}
+
+void TuyaSendValue(uint8_t id, uint32_t value)
+{
+  TuyaSendState(id, TUYA_TYPE_VALUE, (uint8_t*)(&value));
+}
+
+void TuyaSendEnum(uint8_t id, uint32_t value)
+{
+  TuyaSendState(id, TUYA_TYPE_ENUM, (uint8_t*)(&value));
+}
+
+void TuyaSendString(uint8_t id, char data[]) {
+
+  uint16_t len = strlen(data);
+  uint16_t payload_len = 4 + len;
+  uint8_t payload_buffer[payload_len];
+  payload_buffer[0] = id;
+  payload_buffer[1] = TUYA_TYPE_STRING;
+  payload_buffer[2] = len >> 8;
+  payload_buffer[3] = len & 0xFF;
+
+  for (uint16_t i = 0; i < len; i++) {
+    payload_buffer[4+i] = data[i];
+  }
+
+  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
+}
+
+bool TuyaSetPower(void)
+{
+  bool status = false;
+
+  uint8_t rpower = XdrvMailbox.index;
+  int16_t source = XdrvMailbox.payload;
+
+  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1 + active_device - 1);
+  if (dpid == 0) dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1_INV + active_device - 1);
+
+  if (source != SRC_SWITCH && TuyaSerial) {
+    TuyaSendBool(dpid, bitRead(rpower, active_device-1) ^ bitRead(rel_inverted, active_device-1));
+    status = true;
+  }
+  return status;
+}
+
+bool TuyaSetChannels(void)
+{
+  LightSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
+  delay(20);
+  return true;
+}
+
+void LightSerialDuty(uint16_t duty)
+{
+  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_DIMMER);
+  if (duty > 0 && !Tuya.ignore_dim && TuyaSerial && dpid > 0) {
+    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
+    if (duty < Settings.dimmer_hw_min) { duty = Settings.dimmer_hw_min; }
+    if (Tuya.new_dim != duty) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim value=%d (id=%d)"), duty, dpid);
+      TuyaSendValue(dpid, duty);
+    }
+  } else if (dpid > 0) {
+    Tuya.ignore_dim = false;
+    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim skipped value=%d"), duty);
+  } else {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Cannot set dimmer. Dimmer Id unknown"));
+  }
+}
+
+void TuyaRequestState(void)
+{
+  if (TuyaSerial) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Read MCU state"));
+
+    TuyaSendCmd(TUYA_CMD_QUERY_STATE);
+  }
+}
+
+void TuyaResetWifi(void)
+{
+  if (!Settings.flag.button_restrict) {
+    char scmnd[20];
+    snprintf_P(scmnd, sizeof(scmnd), D_CMND_WIFICONFIG " %d", 2);
+    ExecuteCommand(scmnd, SRC_BUTTON);
+  }
+}
+
+void TuyaProcessStatePacket(void) {
+  char scmnd[20];
+  uint8_t dpidStart = 6;
+  uint8_t fnId;
+  uint16_t dpDataLen;
+
+  while (dpidStart + 4 < Tuya.byte_counter) {
+    dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+    fnId = TuyaGetFuncId(Tuya.buffer[dpidStart]);
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[dpidStart]);
+
+      if (Tuya.buffer[dpidStart + 1] == 1) {
+
+        if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
+          if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
+          if (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
+            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4] ^ 1, SRC_SWITCH);
+          }
+        } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[dpidStart + 4], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
+
+          if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[dpidStart + 4]) {
+            SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[dpidStart + 4]);
+            SwitchHandler(1);
+          }
+        }
+
+      }
+      else if (Tuya.buffer[dpidStart + 1] == 2) {
+        bool tuya_energy_enabled = (XNRG_16 == energy_flg);
+        uint16_t packetValue = Tuya.buffer[dpidStart + 6] << 8 | Tuya.buffer[dpidStart + 7];
+        if (fnId == TUYA_MCU_FUNC_DIMMER) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
+          Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
+          if ((power || Settings.flag3.tuya_apply_o20) &&
+              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
+            Tuya.ignore_dim = true;
+
+            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
+            ExecuteCommand(scmnd, SRC_SWITCH);
+          }
+        }
+
+  #ifdef USE_ENERGY_SENSOR
+        else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
+          Energy.voltage[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
+          Energy.current[0] = (float)packetValue / 1000;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[dpidStart], packetValue);
+        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
+          Energy.active_power[0] = (float)packetValue / 10;
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[dpidStart], packetValue);
+
+          if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
+            Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
+            EnergyUpdateToday();
+          }
+          Tuya.lastPowerCheckTime = Rtc.utc_time;
+        }
+  #endif
+
+      }
+
+
+    dpidStart += dpDataLen + 4;
+  }
+}
+
+void TuyaLowPowerModePacketProcess(void) {
+  switch (Tuya.buffer[3]) {
+    case TUYA_CMD_QUERY_PRODUCT:
+      TuyaHandleProductInfoPacket();
+      TuyaSetWifiLed();
+      break;
+
+    case TUYA_LOW_POWER_CMD_STATE:
+      TuyaProcessStatePacket();
+      Tuya.send_success_next_second = true;
+      break;
+  }
+
+}
+
+void TuyaHandleProductInfoPacket(void) {
+  uint16_t dataLength = Tuya.buffer[4] << 8 | Tuya.buffer[5];
+  char *data = &Tuya.buffer[6];
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("TYA: MCU Product ID: %.*s"), dataLength, data);
+}
+
+void TuyaSendLowPowerSuccessIfNeeded(void) {
+  uint8_t success = 1;
+
+  if (Tuya.send_success_next_second) {
+    TuyaSendCmd(TUYA_LOW_POWER_CMD_STATE, &success, 1);
+    Tuya.send_success_next_second = false;
+  }
+}
+
+void TuyaNormalPowerModePacketProcess(void)
+{
+  switch (Tuya.buffer[3]) {
+    case TUYA_CMD_QUERY_PRODUCT:
+      TuyaHandleProductInfoPacket();
+      TuyaSendCmd(TUYA_CMD_MCU_CONF);
+      break;
+
+    case TUYA_CMD_HEARTBEAT:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Heartbeat"));
+      if (Tuya.buffer[6] == 0) {
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Detected MCU restart"));
+        Tuya.wifi_state = -2;
+      }
+      break;
+
+    case TUYA_CMD_STATE:
+      TuyaProcessStatePacket();
+      break;
+
+    case TUYA_CMD_WIFI_RESET:
+    case TUYA_CMD_WIFI_SELECT:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi Reset"));
+      TuyaResetWifi();
+      break;
+
+    case TUYA_CMD_WIFI_STATE:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi LED set ACK"));
+      Tuya.wifi_state = TuyaGetTuyaWifiState();
+      break;
+
+    case TUYA_CMD_MCU_CONF:
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX MCU configuration Mode=%d"), Tuya.buffer[5]);
+
+      if (Tuya.buffer[5] == 2) {
+        uint8_t led1_gpio = Tuya.buffer[6];
+        uint8_t key1_gpio = Tuya.buffer[7];
+        bool key1_set = false;
+        bool led1_set = false;
+        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          if (Settings.my_gp.io[i] == GPIO_LED1) led1_set = true;
+          else if (Settings.my_gp.io[i] == GPIO_KEY1) key1_set = true;
+        }
+        if (!Settings.my_gp.io[led1_gpio] && !led1_set) {
+          Settings.my_gp.io[led1_gpio] = GPIO_LED1;
+          restart_flag = 2;
+        }
+        if (!Settings.my_gp.io[key1_gpio] && !key1_set) {
+          Settings.my_gp.io[key1_gpio] = GPIO_KEY1;
+          restart_flag = 2;
+        }
+      }
+      TuyaRequestState();
+      break;
+
+    default:
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX unknown command"));
+  }
+}
+
+
+
+
+
+bool TuyaModuleSelected(void)
+{
+  if (!(pin[GPIO_TUYA_RX] < 99) || !(pin[GPIO_TUYA_TX] < 99)) {
+    pin[GPIO_TUYA_TX] = 1;
+    pin[GPIO_TUYA_RX] = 3;
+    Settings.my_gp.io[1] = GPIO_TUYA_TX;
+    Settings.my_gp.io[3] = GPIO_TUYA_RX;
+    restart_flag = 2;
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) == 0 && TUYA_DIMMER_ID > 0) {
+    TuyaAddMcuFunc(TUYA_MCU_FUNC_DIMMER, TUYA_DIMMER_ID);
+  }
+
+  bool relaySet = false;
+
+  for (uint8_t i = 0 ; i < MAX_TUYA_FUNCTIONS; i++) {
+    if ((Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
+    (Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
+      relaySet = true;
+      devices_present++;
+    }
+  }
+
+  if (!relaySet) {
+    TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
+    devices_present++;
+    SettingsSaveAll();
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) != 0) {
+    light_type = LT_SERIAL1;
+  } else {
+    light_type = LT_BASIC;
+  }
+
+  if (TuyaGetDpId(TUYA_MCU_FUNC_LOWPOWER_MODE) != 0) {
+    Tuya.low_power_mode = true;
+    Settings.flag3.fast_power_cycle_disable = true;
+  }
+
+  UpdateDevices();
+  return true;
+}
+
+void TuyaInit(void)
+{
+  Tuya.buffer = (char*)(malloc(TUYA_BUFFER_SIZE));
+  if (Tuya.buffer != nullptr) {
+    TuyaSerial = new TasmotaSerial(pin[GPIO_TUYA_RX], pin[GPIO_TUYA_TX], 2);
+    if (TuyaSerial->begin(9600)) {
+      if (TuyaSerial->hardwareSerial()) { ClaimSerial(); }
+
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Request MCU configuration"));
+
+      TuyaSendCmd(TUYA_CMD_QUERY_PRODUCT);
+    }
+  }
+  Tuya.heartbeat_timer = 0;
+}
+
+void TuyaSerialInput(void)
+{
+  while (TuyaSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = TuyaSerial->read();
+
+    if (serial_in_byte == 0x55) {
+      Tuya.cmd_status = 1;
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+      Tuya.cmd_checksum += serial_in_byte;
+    }
+    else if (Tuya.cmd_status == 1 && serial_in_byte == 0xAA) {
+      Tuya.cmd_status = 2;
+
+      Tuya.byte_counter = 0;
+      Tuya.buffer[Tuya.byte_counter++] = 0x55;
+      Tuya.buffer[Tuya.byte_counter++] = 0xAA;
+      Tuya.cmd_checksum = 0xFF;
+    }
+    else if (Tuya.cmd_status == 2) {
+      if (Tuya.byte_counter == 5) {
+        Tuya.cmd_status = 3;
+        Tuya.data_len = serial_in_byte;
+      }
+      Tuya.cmd_checksum += serial_in_byte;
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+    }
+    else if ((Tuya.cmd_status == 3) && (Tuya.byte_counter == (6 + Tuya.data_len)) && (Tuya.cmd_checksum == serial_in_byte)) {
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+
+      char hex_char[(Tuya.byte_counter * 2) + 2];
+      uint16_t len = Tuya.buffer[4] << 8 | Tuya.buffer[5];
+      Response_P(PSTR("{\"" D_JSON_TUYA_MCU_RECEIVED "\":{\"Data\":\"%s\",\"Cmnd\":%d"), ToHex_P((unsigned char*)Tuya.buffer, Tuya.byte_counter, hex_char, sizeof(hex_char)), Tuya.buffer[3]);
+
+      if (len > 0) {
+        ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
+        if (TUYA_CMD_STATE == Tuya.buffer[3]) {
+
+
+          uint8_t dpidStart = 6;
+          while (dpidStart + 4 < Tuya.byte_counter) {
+            uint8_t dpId = Tuya.buffer[dpidStart];
+            uint8_t dpDataType = Tuya.buffer[dpidStart + 1];
+            uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
+            const unsigned char *dpData = (unsigned char*)&Tuya.buffer[dpidStart + 4];
+            const char *dpHexData = ToHex_P(dpData, dpDataLen, hex_char, sizeof(hex_char));
+
+            if (TUYA_CMD_STATE == Tuya.buffer[3]) {
+              ResponseAppend_P(PSTR(",\"DpType%uId%u\":"), dpDataType, dpId);
+              if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
+                ResponseAppend_P(PSTR("%u"), dpData[0]);
+              } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
+                uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
+                ResponseAppend_P(PSTR("%u"), dpValue);
+              } else if (TUYA_TYPE_STRING == dpDataType) {
+                ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
+              } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
+                ResponseAppend_P(PSTR("%u"), dpData[0]);
+              } else {
+                ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
+              }
+            }
+
+            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), dpId, dpId, dpDataType, dpHexData);
+            if (TUYA_TYPE_STRING == dpDataType) {
+              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, dpData);
+            }
+            ResponseAppend_P(PSTR("}"));
+            dpidStart += dpDataLen + 4;
+          }
+        }
+      }
+
+      ResponseAppend_P(PSTR("}}"));
+
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_TUYA_MCU_RECEIVED));
+      } else {
+        AddLog_P(LOG_LEVEL_DEBUG, mqtt_data);
+      }
+      XdrvRulesProcess();
+
+      if (!Tuya.low_power_mode) {
+        TuyaNormalPowerModePacketProcess();
+      } else {
+        TuyaLowPowerModePacketProcess();
+      }
+
+      Tuya.byte_counter = 0;
+      Tuya.cmd_status = 0;
+      Tuya.cmd_checksum = 0;
+      Tuya.data_len = 0;
+    }
+    else if (Tuya.byte_counter < TUYA_BUFFER_SIZE -1) {
+      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
+      Tuya.cmd_checksum += serial_in_byte;
+    } else {
+      Tuya.byte_counter = 0;
+      Tuya.cmd_status = 0;
+      Tuya.cmd_checksum = 0;
+      Tuya.data_len = 0;
+    }
+  }
+}
+
+bool TuyaButtonPressed(void)
+{
+  if (!XdrvMailbox.index && ((PRESSED == XdrvMailbox.payload) && (NOT_PRESSED == Button.last_state[XdrvMailbox.index]))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Reset GPIO triggered"));
+    TuyaResetWifi();
+    return true;
+  }
+  return false;
+}
+
+uint8_t TuyaGetTuyaWifiState(void) {
+
+  uint8_t wifi_state = 0x02;
+  switch(WifiState()){
+    case WIFI_MANAGER:
+      wifi_state = 0x01;
+      break;
+    case WIFI_RESTART:
+      wifi_state = 0x03;
+      break;
+  }
+
+  if (MqttIsConnected()) {
+    wifi_state = 0x04;
+  }
+
+  return wifi_state;
+}
+
+void TuyaSetWifiLed(void)
+{
+  Tuya.wifi_state = TuyaGetTuyaWifiState();
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Set WiFi LED %d (%d)"), Tuya.wifi_state, WifiState());
+
+  if (Tuya.low_power_mode) {
+    TuyaSendCmd(TUYA_LOW_POWER_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
+  } else {
+    TuyaSendCmd(TUYA_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
+  }
+}
+
+#ifdef USE_ENERGY_SENSOR
+
+
+
+
+bool Xnrg16(uint8_t function)
+{
+  bool result = false;
+
+  if (TUYA_DIMMER == my_module_type) {
+    if (FUNC_PRE_INIT == function) {
+      if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0) {
+        if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0) {
+          Energy.current_available = false;
+        }
+        if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0) {
+          Energy.voltage_available = false;
+        }
+        energy_flg = XNRG_16;
+      }
+    }
+  }
+  return result;
+}
+#endif
+
+
+
+
+
+bool Xdrv16(uint8_t function)
+{
+  bool result = false;
+
+  if (TUYA_DIMMER == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (TuyaSerial) { TuyaSerialInput(); }
+        break;
+      case FUNC_MODULE_INIT:
+        result = TuyaModuleSelected();
+        break;
+      case FUNC_PRE_INIT:
+        TuyaInit();
+        break;
+      case FUNC_SET_DEVICE_POWER:
+        result = TuyaSetPower();
+        break;
+      case FUNC_BUTTON_PRESSED:
+        result = TuyaButtonPressed();
+        break;
+      case FUNC_EVERY_SECOND:
+        if (TuyaSerial && Tuya.wifi_state != TuyaGetTuyaWifiState()) { TuyaSetWifiLed(); }
+        if (!Tuya.low_power_mode) {
+          Tuya.heartbeat_timer++;
+          if (Tuya.heartbeat_timer > 10) {
+            Tuya.heartbeat_timer = 0;
+            TuyaSendCmd(TUYA_CMD_HEARTBEAT);
+          }
+        } else {
+            TuyaSendLowPowerSuccessIfNeeded();
+        }
+        break;
+      case FUNC_SET_CHANNELS:
+        result = TuyaSetChannels();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kTuyaCommand, TuyaCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_17_rcswitch.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_17_rcswitch.ino"
+#ifdef USE_RC_SWITCH
+
+
+
+
+#define XDRV_17 17
+
+#define D_JSON_RF_PROTOCOL "Protocol"
+#define D_JSON_RF_BITS "Bits"
+#define D_JSON_RF_DATA "Data"
+
+#define D_CMND_RFSEND "RFSend"
+#define D_JSON_RF_PULSE "Pulse"
+#define D_JSON_RF_REPEAT "Repeat"
+
+const char kRfSendCommands[] PROGMEM = "|"
+  D_CMND_RFSEND;
+
+void (* const RfSendCommand[])(void) PROGMEM = {
+  &CmndRfSend };
+
+#include <RCSwitch.h>
+
+RCSwitch mySwitch = RCSwitch();
+
+#define RF_TIME_AVOID_DUPLICATE 1000
+
+uint32_t rf_lasttime = 0;
+
+void RfReceiveCheck(void)
+{
+  if (mySwitch.available()) {
+
+    unsigned long data = mySwitch.getReceivedValue();
+    unsigned int bits = mySwitch.getReceivedBitlength();
+    int protocol = mySwitch.getReceivedProtocol();
+    int delay = mySwitch.getReceivedDelay();
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFR: Data 0x%lX (%u), Bits %d, Protocol %d, Delay %d"), data, data, bits, protocol, delay);
+
+    uint32_t now = millis();
+    if ((now - rf_lasttime > RF_TIME_AVOID_DUPLICATE) && (data > 0)) {
+      rf_lasttime = now;
+
+      char stemp[16];
+      if (Settings.flag.rf_receive_decimal) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%u"), (uint32_t)data);
+      } else {
+        snprintf_P(stemp, sizeof(stemp), PSTR("\"0x%lX\""), (uint32_t)data);
+      }
+      ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_RF_DATA "\":%s,\"" D_JSON_RF_BITS "\":%d,\"" D_JSON_RF_PROTOCOL "\":%d,\"" D_JSON_RF_PULSE "\":%d}}"),
+        stemp, bits, protocol, delay);
+      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
+      XdrvRulesProcess();
+#ifdef USE_DOMOTICZ
+      DomoticzSensor(DZ_COUNT, data);
+#endif
+    }
+    mySwitch.resetAvailable();
+  }
+}
+
+void RfInit(void)
+{
+  if (pin[GPIO_RFSEND] < 99) {
+    mySwitch.enableTransmit(pin[GPIO_RFSEND]);
+  }
+  if (pin[GPIO_RFRECV] < 99) {
+    pinMode( pin[GPIO_RFRECV], INPUT);
+    mySwitch.enableReceive(pin[GPIO_RFRECV]);
+  }
+}
+
+
+
+
+
+void CmndRfSend(void)
+{
+  bool error = false;
+
+  if (XdrvMailbox.data_len) {
+    unsigned long data = 0;
+    unsigned int bits = 24;
+    int protocol = 1;
+    int repeat = 10;
+    int pulse = 350;
+
+    char dataBufUc[XdrvMailbox.data_len + 1];
+    UpperCase(dataBufUc, XdrvMailbox.data);
+    StaticJsonBuffer<150> jsonBuf;
+    JsonObject &root = jsonBuf.parseObject(dataBufUc);
+    if (root.success()) {
+
+      char parm_uc[10];
+      data = strtoul(root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_DATA))], nullptr, 0);
+      bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_BITS))];
+      protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PROTOCOL))];
+      repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_REPEAT))];
+      pulse = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PULSE))];
+    } else {
+
+      char *p;
+      uint8_t i = 0;
+      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 5; str = strtok_r(nullptr, ", ", &p)) {
+        switch (i++) {
+        case 0:
+          data = strtoul(str, nullptr, 0);
+          break;
+        case 1:
+          bits = atoi(str);
+          break;
+        case 2:
+          protocol = atoi(str);
+          break;
+        case 3:
+          repeat = atoi(str);
+          break;
+        case 4:
+          pulse = atoi(str);
+        }
+      }
+    }
+
+    if (!protocol) { protocol = 1; }
+    mySwitch.setProtocol(protocol);
+    if (!pulse) { pulse = 350; }
+    mySwitch.setPulseLength(pulse);
+    if (!repeat) { repeat = 10; }
+    mySwitch.setRepeatTransmit(repeat);
+    if (!bits) { bits = 24; }
+    if (data) {
+      mySwitch.send(data, bits);
+      ResponseCmndDone();
+    } else {
+      error = true;
+    }
+  } else {
+    error = true;
+  }
+  if (error) {
+    Response_P(PSTR("{\"" D_CMND_RFSEND "\":\"" D_JSON_NO " " D_JSON_RF_DATA ", " D_JSON_RF_BITS ", " D_JSON_RF_PROTOCOL ", " D_JSON_RF_REPEAT " " D_JSON_OR " " D_JSON_RF_PULSE "\"}"));
+  }
+}
+
+
+
+
+
+bool Xdrv17(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_RFSEND] < 99) || (pin[GPIO_RFRECV] < 99)) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (pin[GPIO_RFRECV] < 99) {
+          RfReceiveCheck();
+        }
+        break;
+      case FUNC_COMMAND:
+        if (pin[GPIO_RFSEND] < 99) {
+          result = DecodeCommand(kRfSendCommands, RfSendCommand);
+        }
+        break;
+      case FUNC_INIT:
+        RfInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
+#ifdef USE_LIGHT
+#ifdef USE_ARMTRONIX_DIMMERS
+
+
+
+
+
+
+
+#define XDRV_18 18
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *ArmtronixSerial = nullptr;
+
+struct ARMTRONIX {
+  bool ignore_dim = false;
+  int8_t wifi_state = -2;
+  int8_t dim_state[2];
+  int8_t knob_state[2];
+} Armtronix;
+
+
+
+
+
+bool ArmtronixSetChannels(void)
+{
+  LightSerial2Duty(((uint8_t*)XdrvMailbox.data)[0], ((uint8_t*)XdrvMailbox.data)[1]);
+  return true;
+}
+
+void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
+{
+  if (ArmtronixSerial && !Armtronix.ignore_dim) {
+    duty1 = ((float)duty1)/2.575757;
+    duty2 = ((float)duty2)/2.575757;
+    Armtronix.dim_state[0] = duty1;
+    Armtronix.dim_state[1] = duty2;
+    ArmtronixSerial->print("Dimmer1:");
+    ArmtronixSerial->print(duty1);
+    ArmtronixSerial->print("\nDimmer2:");
+    ArmtronixSerial->println(duty2);
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Serial Packet Dim Values=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
+
+  } else {
+    Armtronix.ignore_dim = false;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Dim Level skipped due to already set. Value=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
+
+  }
+}
+
+void ArmtronixRequestState(void)
+{
+  if (ArmtronixSerial) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("ARM: Request MCU state"));
+    ArmtronixSerial->println("Status");
+
+  }
+}
+
+
+
+
+
+bool ArmtronixModuleSelected(void)
+{
+  devices_present++;
+  light_type = LT_SERIAL2;
+  return true;
+}
+
+void ArmtronixInit(void)
+{
+  Armtronix.dim_state[0] = -1;
+  Armtronix.dim_state[1] = -1;
+  Armtronix.knob_state[0] = -1;
+  Armtronix.knob_state[1] = -1;
+  ArmtronixSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+  if (ArmtronixSerial->begin(115200)) {
+    if (ArmtronixSerial->hardwareSerial()) { ClaimSerial(); }
+    ArmtronixSerial->println("Status");
+  }
+}
+
+void ArmtronixSerialInput(void)
+{
+  String answer;
+  int8_t newDimState[2];
+  uint8_t temp;
+  int commaIndex;
+  char scmnd[20];
+  if (ArmtronixSerial->available()) {
+    yield();
+    answer = ArmtronixSerial->readStringUntil('\n');
+    if (answer.substring(0,7) == "Status:") {
+      commaIndex = 6;
+      for (uint32_t i =0; i<2; i++) {
+        newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+        if (newDimState[i] != Armtronix.dim_state[i]) {
+          temp = ((float)newDimState[i])*1.01010101010101;
+          Armtronix.dim_state[i] = newDimState[i];
+          Armtronix.ignore_dim = true;
+          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_CHANNEL "%d %d"),i+1, temp);
+          ExecuteCommand(scmnd,SRC_SWITCH);
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd );
+        }
+        commaIndex = answer.indexOf(',',commaIndex+1);
+      }
+      Armtronix.knob_state[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+      commaIndex = answer.indexOf(',',commaIndex+1);
+      Armtronix.knob_state[1] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
+    }
+  }
+}
+
+void ArmtronixSetWifiLed(void)
+{
+  uint8_t wifi_state = 0x02;
+
+  switch (WifiState()) {
+    case WIFI_MANAGER:
+      wifi_state = 0x01;
+      break;
+    case WIFI_RESTART:
+      wifi_state = 0x03;
+      break;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Set WiFi LED to state %d (%d)"), wifi_state, WifiState());
+
+  char state = '0' + ((wifi_state & 1) > 0);
+  ArmtronixSerial->print("Setled:");
+  ArmtronixSerial->write(state);
+  ArmtronixSerial->write(',');
+  state = '0' + ((wifi_state & 2) > 0);
+  ArmtronixSerial->write(state);
+  ArmtronixSerial->write(10);
+  Armtronix.wifi_state = WifiState();
+}
+
+
+
+
+
+bool Xdrv18(uint8_t function)
+{
+  bool result = false;
+
+  if (ARMTRONIX_DIMMERS == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (ArmtronixSerial) { ArmtronixSerialInput(); }
+        break;
+      case FUNC_MODULE_INIT:
+        result = ArmtronixModuleSelected();
+        break;
+      case FUNC_INIT:
+        ArmtronixInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        if (ArmtronixSerial) {
+          if (Armtronix.wifi_state!=WifiState()) { ArmtronixSetWifiLed(); }
+          if (uptime &1) {
+            ArmtronixSerial->println("Status");
+          }
+        }
+        break;
+      case FUNC_SET_CHANNELS:
+        result = ArmtronixSetChannels();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
+#ifdef USE_LIGHT
+#ifdef USE_PS_16_DZ
+
+
+
+
+#define XDRV_19 19
+
+#define PS16DZ_BUFFER_SIZE 80
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PS16DZSerial = nullptr;
+
+struct PS16DZ {
+  char *rx_buffer = nullptr;
+  int byte_counter = 0;
+  uint8_t dimmer = 0;
+} Ps16dz;
+
+
+
+
+
+void PS16DZSerialSend(const char *tx_buffer)
+{
+
+
+  PS16DZSerial->print(tx_buffer);
+  PS16DZSerial->write(0x1B);
+  PS16DZSerial->flush();
+}
+
+void PS16DZSerialSendOk(void)
+{
+  char tx_buffer[16];
+  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+SEND=ok"));
+  PS16DZSerialSend(tx_buffer);
+}
+
+
+
+
+void PS16DZSerialSendUpdateCommand(void)
+{
+  uint8_t light_state_dimmer = light_state.getDimmer();
+
+  light_state_dimmer = (light_state_dimmer < Settings.dimmer_hw_min) ? Settings.dimmer_hw_min : light_state_dimmer;
+  light_state_dimmer = (light_state_dimmer > Settings.dimmer_hw_max) ? Settings.dimmer_hw_max : light_state_dimmer;
+
+  char tx_buffer[80];
+  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"bright\":%d"),
+    LocalTime(), millis()%1000, power?"on":"off", light_state_dimmer);
+
+  PS16DZSerialSend(tx_buffer);
+}
+
+
+
+
+
+void PS16DZSerialInput(void)
+{
+  char scmnd[20];
+  while (PS16DZSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = PS16DZSerial->read();
+    if (serial_in_byte != 0x1B) {
+      if (Ps16dz.byte_counter >= PS16DZ_BUFFER_SIZE - 1) {
+        memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
+        Ps16dz.byte_counter = 0;
+      }
+      if (Ps16dz.byte_counter || (!Ps16dz.byte_counter && ('A' == serial_in_byte))) {
+        Ps16dz.rx_buffer[Ps16dz.byte_counter++] = serial_in_byte;
+      }
+    } else {
+      Ps16dz.rx_buffer[Ps16dz.byte_counter++] = 0x00;
+
+
+
+
+      if (!strncmp(Ps16dz.rx_buffer+3, "RESULT", 6)) {
+
+      }
+      else if (!strncmp(Ps16dz.rx_buffer+3, "UPDATE", 6)) {
+
+        char *end_str;
+        char *string = Ps16dz.rx_buffer+10;
+        char *token = strtok_r(string, ",", &end_str);
+
+        bool is_switch_change = false;
+        bool is_brightness_change = false;
+
+        while (token != nullptr) {
+          char* end_token;
+          char* token2 = strtok_r(token, ":", &end_token);
+          char* token3 = strtok_r(nullptr, ":", &end_token);
+
+          if (!strncmp(token2, "\"switch\"", 8)) {
+            bool switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
+
+
+
+            is_switch_change = (switch_state != power);
+            if (is_switch_change) {
+              ExecuteCommandPower(1, switch_state, SRC_SWITCH);
+            }
+          }
+          else if (!strncmp(token2, "\"bright\"", 8)) {
+            Ps16dz.dimmer = atoi(token3);
+
+
+
+            is_brightness_change = Ps16dz.dimmer != Settings.light_dimmer;
+            if (power && (Ps16dz.dimmer > 0) && is_brightness_change) {
+              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Ps16dz.dimmer);
+              ExecuteCommand(scmnd, SRC_SWITCH);
+            }
+          }
+          else if (!strncmp(token2, "\"sequence\"", 10)) {
+
+
+
+          }
+          token = strtok_r(nullptr, ",", &end_str);
+        }
+
+        if (!is_brightness_change) {
+
+
+
+          PS16DZSerialSendOk();
+        }
+      }
+      else if (!strncmp(Ps16dz.rx_buffer+3, "SETTING", 7)) {
+
+
+        if (!Settings.flag.button_restrict) {
+          int state = WIFI_MANAGER;
+          if (!strncmp(Ps16dz.rx_buffer+10, "=exit", 5)) { state = WIFI_RETRY; }
+          if (state != Settings.sta_config) {
+            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " %d"), state);
+            ExecuteCommand(scmnd, SRC_BUTTON);
+          }
+        }
+      }
+      memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
+      Ps16dz.byte_counter = 0;
+    }
+  }
+}
+
+bool PS16DZSerialSendUpdateCommandIfRequired(void)
+{
+  if (!PS16DZSerial) { return true; }
+
+  bool is_switch_change = (XdrvMailbox.payload != SRC_SWITCH);
+  bool is_brightness_change = (light_state.getDimmer() != Ps16dz.dimmer);
+
+  if (is_switch_change || is_brightness_change) {
+    PS16DZSerialSendUpdateCommand();
+  }
+
+  return true;
+}
+
+void PS16DZInit(void)
+{
+  Ps16dz.rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
+  if (Ps16dz.rx_buffer != nullptr) {
+    PS16DZSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+    if (PS16DZSerial->begin(19200)) {
+      if (PS16DZSerial->hardwareSerial()) { ClaimSerial(); }
+    }
+  }
+}
+
+bool PS16DZModuleSelected(void)
+{
+  devices_present++;
+  light_type = LT_SERIAL1;
+
+  return true;
+}
+
+
+
+
+
+bool Xdrv19(uint8_t function)
+{
+  bool result = false;
+
+  if (PS_16_DZ == my_module_type) {
+    switch (function) {
+      case FUNC_LOOP:
+        if (PS16DZSerial) { PS16DZSerialInput(); }
+        break;
+      case FUNC_SET_DEVICE_POWER:
+      case FUNC_SET_CHANNELS:
+        result = PS16DZSerialSendUpdateCommandIfRequired();
+        break;
+      case FUNC_INIT:
+        PS16DZInit();
+        break;
+      case FUNC_MODULE_INIT:
+        result = PS16DZModuleSelected();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
+#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
+# 31 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
+#define XDRV_20 20
+
+const char HUE_RESPONSE[] PROGMEM =
+  "HTTP/1.1 200 OK\r\n"
+  "HOST: 239.255.255.250:1900\r\n"
+  "CACHE-CONTROL: max-age=100\r\n"
+  "EXT:\r\n"
+  "LOCATION: http://%s:80/description.xml\r\n"
+  "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.24.0\r\n"
+  "hue-bridgeid: %s\r\n";
+const char HUE_ST1[] PROGMEM =
+  "ST: upnp:rootdevice\r\n"
+  "USN: uuid:%s::upnp:rootdevice\r\n"
+  "\r\n";
+const char HUE_ST2[] PROGMEM =
+  "ST: uuid:%s\r\n"
+  "USN: uuid:%s\r\n"
+  "\r\n";
+const char HUE_ST3[] PROGMEM =
+  "ST: urn:schemas-upnp-org:device:basic:1\r\n"
+  "USN: uuid:%s\r\n"
+  "\r\n";
+
+String HueBridgeId(void)
+{
+  String temp = WiFi.macAddress();
+  temp.replace(":", "");
+  String bridgeid = temp.substring(0, 6) + "FFFE" + temp.substring(6);
+  return bridgeid;
+}
+
+String HueSerialnumber(void)
+{
+  String serial = WiFi.macAddress();
+  serial.replace(":", "");
+  serial.toLowerCase();
+  return serial;
+}
+
+String HueUuid(void)
+{
+  String uuid = F("f6543a06-da50-11ba-8d8f-");
+  uuid += HueSerialnumber();
+  return uuid;
+}
+
+void HueRespondToMSearch(void)
+{
+  char message[TOPSZ];
+
+  TickerMSearch.detach();
+  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
+    char response[320];
+    snprintf_P(response, sizeof(response), HUE_RESPONSE, WiFi.localIP().toString().c_str(), HueBridgeId().c_str());
+    int len = strlen(response);
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST1, HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST2, HueUuid().c_str(), HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(response + len, sizeof(response) - len, HUE_ST3, HueUuid().c_str());
+    PortUdp.write(response);
+    PortUdp.endPacket();
+
+    snprintf_P(message, sizeof(message), PSTR(D_3_RESPONSE_PACKETS_SENT));
+  } else {
+    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
+  }
+
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
+    message, udp_remote_ip.toString().c_str(), udp_remote_port);
+
+  udp_response_mutex = false;
+}
+
+
+
+
+
+const char HUE_DESCRIPTION_XML[] PROGMEM =
+  "<?xml version=\"1.0\"?>"
+  "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">"
+  "<specVersion>"
+    "<major>1</major>"
+    "<minor>0</minor>"
+  "</specVersion>"
+
+  "<URLBase>http://{x1:80/</URLBase>"
+  "<device>"
+    "<deviceType>urn:schemas-upnp-org:device:Basic:1</deviceType>"
+    "<friendlyName>Amazon-Echo-HA-Bridge ({x1)</friendlyName>"
+
+    "<manufacturer>Royal Philips Electronics</manufacturer>"
+    "<manufacturerURL>http://www.philips.com</manufacturerURL>"
+    "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
+    "<modelName>Philips hue bridge 2012</modelName>"
+    "<modelNumber>929000226503</modelNumber>"
+    "<serialNumber>{x3</serialNumber>"
+    "<UDN>uuid:{x2</UDN>"
+  "</device>"
+  "</root>\r\n"
+  "\r\n";
+const char HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
+  "{\"on\":{state},"
+  "{light_status}"
+  "\"alert\":\"none\","
+  "\"effect\":\"none\","
+  "\"reachable\":true}";
+const char HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
+  ",\"type\":\"Extended color light\","
+  "\"name\":\"{j1\","
+  "\"modelid\":\"LCT007\","
+  "\"uniqueid\":\"{j2\","
+  "\"swversion\":\"5.50.1.19085\"}";
+const char HUE_GROUP0_STATUS_JSON[] PROGMEM =
+  "{\"name\":\"Group 0\","
+   "\"lights\":[{l1],"
+   "\"type\":\"LightGroup\","
+   "\"action\":";
+
+const char HueConfigResponse_JSON[] PROGMEM =
+  "{\"name\":\"Philips hue\","
+   "\"mac\":\"{ma\","
+   "\"dhcp\":true,"
+   "\"ipaddress\":\"{ip\","
+   "\"netmask\":\"{ms\","
+   "\"gateway\":\"{gw\","
+   "\"proxyaddress\":\"none\","
+   "\"proxyport\":0,"
+   "\"bridgeid\":\"{br\","
+   "\"UTC\":\"{dt\","
+   "\"whitelist\":{\"{id\":{"
+     "\"last use date\":\"{dt\","
+     "\"create date\":\"{dt\","
+     "\"name\":\"Remote\"}},"
+   "\"swversion\":\"01041302\","
+   "\"apiversion\":\"1.17.0\","
+   "\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
+   "\"linkbutton\":false,"
+   "\"portalservices\":false"
+  "}";
+const char HUE_LIGHT_RESPONSE_JSON[] PROGMEM =
+  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
+const char HUE_ERROR_JSON[] PROGMEM =
+  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
+
+
+
+String GetHueDeviceId(uint8_t id)
+{
+  String deviceid = WiFi.macAddress() + F(":00:11-") + String(id);
+  deviceid.toLowerCase();
+  return deviceid;
+}
+
+String GetHueUserId(void)
+{
+  char userid[7];
+
+  snprintf_P(userid, sizeof(userid), PSTR("%03x"), ESP.getChipId());
+  return String(userid);
+}
+
+void HandleUpnpSetupHue(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_HUE_BRIDGE_SETUP));
+  String description_xml = FPSTR(HUE_DESCRIPTION_XML);
+  description_xml.replace("{x1", WiFi.localIP().toString());
+  description_xml.replace("{x2", HueUuid());
+  description_xml.replace("{x3", HueSerialnumber());
+  WSSend(200, CT_XML, description_xml);
+}
+
+void HueNotImplemented(String *path)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API_NOT_IMPLEMENTED " (%s)"), path->c_str());
+
+  WSSend(200, CT_JSON, "{}");
+}
+
+void HueConfigResponse(String *response)
+{
+  *response += FPSTR(HueConfigResponse_JSON);
+  response->replace("{ma", WiFi.macAddress());
+  response->replace("{ip", WiFi.localIP().toString());
+  response->replace("{ms", WiFi.subnetMask().toString());
+  response->replace("{gw", WiFi.gatewayIP().toString());
+  response->replace("{br", HueBridgeId());
+  response->replace("{dt", GetDateAndTime(DT_UTC));
+  response->replace("{id", GetHueUserId());
+}
+
+void HueConfig(String *path)
+{
+  String response = "";
+  HueConfigResponse(&response);
+  WSSend(200, CT_JSON, response);
+}
+
+
+
+bool g_gotct = false;
+
+
+
+
+uint16_t prev_hue = 0;
+uint8_t prev_sat = 0;
+uint8_t prev_bri = 254;
+uint16_t prev_ct = 254;
+char prev_x_str[24] = "\0";
+char prev_y_str[24] = "\0";
+
+uint8_t getLocalLightSubtype(uint8_t device) {
+  if (light_type) {
+    if (device >= Light.device) {
+      if (Settings.flag3.pwm_multi_channels) {
+        return LST_SINGLE;
+      } else {
+        return Light.subtype;
+      }
+    } else {
+      return LST_NONE;
+    }
+  } else {
+    return LST_NONE;
+  }
+}
+
+void HueLightStatus1(uint8_t device, String *response)
+{
+  uint16_t ct = 0;
+  uint8_t color_mode;
+  String light_status = "";
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint32_t echo_gen = findEchoGeneration();
+
+
+  uint8_t local_light_subtype = getLocalLightSubtype(device);
+
+  bri = LightGetBri(device);
+  if (bri > 254) bri = 254;
+  if (bri < 1) bri = 1;
+
+#ifdef USE_SHUTTER
+  if (ShutterState(device)) {
+    bri = (float)((Settings.shutter_options[device-1] & 1) ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
+  }
+#endif
+
+  if (light_type) {
+    light_state.getHSB(&hue, &sat, nullptr);
+
+    if ((bri > prev_bri ? bri - prev_bri : prev_bri - bri) < 1)
+      bri = prev_bri;
+
+    if (sat > 254) sat = 254;
+    if ((sat > prev_sat ? sat - prev_sat : prev_sat - sat) < 1) {
+      sat = prev_sat;
+    } else {
+      prev_x_str[0] = prev_y_str[0] = 0;
+    }
+
+    hue = changeUIntScale(hue, 0, 359, 0, 65535);
+    if ((hue > prev_hue ? hue - prev_hue : prev_hue - hue) < 400) {
+      hue = prev_hue;
+    } else {
+      prev_x_str[0] = prev_y_str[0] = 0;
+    }
+
+    color_mode = light_state.getColorMode();
+    ct = light_state.getCT();
+    if (LCM_RGB == color_mode) { g_gotct = false; }
+    if (LCM_CT == color_mode) { g_gotct = true; }
+
+
+
+    if ((ct > prev_ct ? ct - prev_ct : prev_ct - ct) < 1)
+      ct = prev_ct;
+
+
+
+  }
+
+  *response += FPSTR(HUE_LIGHTS_STATUS_JSON1);
+  response->replace("{state}", (power & (1 << (device-1))) ? "true" : "false");
+
+  if ((1 == echo_gen) || (LST_SINGLE <= local_light_subtype)) {
+    light_status += "\"bri\":";
+    light_status += String(bri);
+    light_status += ",";
+  }
+  if (LST_COLDWARM <= local_light_subtype) {
+    light_status += F("\"colormode\":\"");
+    light_status += (g_gotct ? "ct" : "hs");
+    light_status += "\",";
+  }
+  if (LST_RGB <= local_light_subtype) {
+    if (prev_x_str[0] && prev_y_str[0]) {
+      light_status += "\"xy\":[";
+      light_status += prev_x_str;
+      light_status += ",";
+      light_status += prev_y_str;
+      light_status += "],";
+    } else {
+      float x, y;
+        light_state.getXY(&x, &y);
+      light_status += "\"xy\":[";
+      light_status += String(x, 5);
+      light_status += ",";
+      light_status += String(y, 5);
+      light_status += "],";
+    }
+    light_status += "\"hue\":";
+    light_status += String(hue);
+    light_status += ",";
+
+    light_status += "\"sat\":";
+    light_status += String(sat);
+    light_status += ",";
+  }
+  if (LST_COLDWARM == local_light_subtype || LST_RGBW <= local_light_subtype) {
+    light_status += "\"ct\":";
+    light_status += String(ct > 0 ? ct : 284);
+    light_status += ",";
+  }
+  response->replace("{light_status}", light_status);
+}
+
+
+
+bool HueActive(uint8_t device) {
+  if (device > MAX_FRIENDLYNAMES) { device = MAX_FRIENDLYNAMES; }
+  return '$' != *SettingsText(SET_FRIENDLYNAME1 +device -1);
+}
+
+void HueLightStatus2(uint8_t device, String *response)
+{
+  *response += FPSTR(HUE_LIGHTS_STATUS_JSON2);
+  if (device <= MAX_FRIENDLYNAMES) {
+    response->replace("{j1", SettingsText(SET_FRIENDLYNAME1 +device -1));
+  } else {
+    char fname[33];
+    strcpy(fname, SettingsText(SET_FRIENDLYNAME1 + MAX_FRIENDLYNAMES -1));
+    uint32_t fname_len = strlen(fname);
+    if (fname_len > 30) { fname_len = 30; }
+    fname[fname_len++] = '-';
+    if (device - MAX_FRIENDLYNAMES < 10) {
+      fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
+    } else {
+      fname[fname_len++] = 'A' + device - MAX_FRIENDLYNAMES - 10;
+    }
+    fname[fname_len] = 0x00;
+
+    response->replace("{j1", fname);
+  }
+  response->replace("{j2", GetHueDeviceId(device));
+}
+
+
+
+
+uint32_t EncodeLightId(uint8_t relay_id)
+{
+  uint8_t mac[6];
+  WiFi.macAddress(mac);
+  uint32_t id = 0;
+
+  if (relay_id >= 32) {
+    relay_id = 0;
+  }
+  if (relay_id > 15) {
+    id = (1 << 28);
+  }
+
+  id |= (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (relay_id & 0xF);
+  return id;
+}
+
+
+
+uint32_t DecodeLightId(uint32_t hue_id) {
+  uint8_t relay_id = hue_id & 0xF;
+  if (hue_id & (1 << 28)) {
+    relay_id += 16;
+  }
+  if (0 == relay_id) {
+    relay_id = 32;
+  }
+  return relay_id;
+}
+
+static const char * FIRST_GEN_UA[] = {
+  "AEOBC",
+};
+
+
+uint32_t findEchoGeneration(void) {
+
+  String user_agent = WebServer->header("User-Agent");
+  uint32_t gen = 2;
+
+  for (uint32_t i = 0; i < sizeof(FIRST_GEN_UA)/sizeof(char*); i++) {
+    if (user_agent.indexOf(FIRST_GEN_UA[i]) >= 0) {
+      gen = 1;
+      break;
+    }
+  }
+  if (0 == user_agent.length()) {
+    gen = 1;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, D_LOG_HTTP D_HUE " User-Agent: %s, gen=%d", user_agent.c_str(), gen);
+
+  return gen;
+}
+
+void HueGlobalConfig(String *path) {
+  String response;
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  path->remove(0,1);
+  response = F("{\"lights\":{");
+  bool appending = false;
+  for (uint32_t i = 1; i <= maxhue; i++) {
+    if (HueActive(i)) {
+      if (appending) { response += ","; }
+      response += "\"";
+      response += EncodeLightId(i);
+      response += F("\":{\"state\":");
+      HueLightStatus1(i, &response);
+      HueLightStatus2(i, &response);
+      appending = true;
+    }
+  }
+  response += F("},\"groups\":{},\"schedules\":{},\"config\":");
+  HueConfigResponse(&response);
+  response += "}";
+  WSSend(200, CT_JSON, response);
+}
+
+void HueAuthentication(String *path)
+{
+  char response[38];
+
+  snprintf_P(response, sizeof(response), PSTR("[{\"success\":{\"username\":\"%s\"}}]"), GetHueUserId().c_str());
+  WSSend(200, CT_JSON, response);
+}
+
+void HueLights(String *path)
+{
+
+
+
+  String response;
+  int code = 200;
+  uint16_t tmp = 0;
+  uint16_t hue = 0;
+  uint8_t sat = 0;
+  uint8_t bri = 254;
+  uint16_t ct = 0;
+  bool resp = false;
+  bool on = false;
+  bool change = false;
+  uint8_t device = 1;
+  uint8_t local_light_subtype = Light.subtype;
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  path->remove(0,path->indexOf("/lights"));
+  if (path->endsWith("/lights")) {
+    response = "{";
+    bool appending = false;
+    for (uint32_t i = 1; i <= maxhue; i++) {
+      if (HueActive(i)) {
+        if (appending) { response += ","; }
+        response += "\"";
+        response += EncodeLightId(i);
+        response += F("\":{\"state\":");
+        HueLightStatus1(i, &response);
+        HueLightStatus2(i, &response);
+        appending = true;
+      }
+    }
+#ifdef USE_SCRIPT_HUE
+    Script_Check_Hue(&response);
+#endif
+    response += "}";
+  }
+  else if (path->endsWith("/state")) {
+    path->remove(0,8);
+    path->remove(path->indexOf("/state"));
+    device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT_HUE
+    if (device>devices_present) {
+      return Script_Handle_Hue(path);
+    }
+#endif
+
+    if ((device < 1) || (device > maxhue)) {
+      device = 1;
+    }
+    local_light_subtype = getLocalLightSubtype(device);
+
+    if (WebServer->args()) {
+      response = "[";
+
+      StaticJsonBuffer<400> jsonBuffer;
+      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
+      if (hue_json.containsKey("on")) {
+
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(EncodeLightId(device)));
+        response.replace("{cm", "on");
+
+#ifdef USE_SHUTTER
+        if (ShutterState(device)) {
+          if (!change) {
+            on = hue_json["on"];
+            bri = on ? 1.0f : 0.0f;
+            change = true;
+          }
+          response.replace("{re", on ? "true" : "false");
+        } else {
+#endif
+          on = hue_json["on"];
+          switch(on)
+          {
+            case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
+                        response.replace("{re", "false");
+                        break;
+            case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
+                        response.replace("{re", "true");
+                        break;
+            default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
+                        break;
+          }
+          resp = true;
+#ifdef USE_SHUTTER
+        }
+#endif
+      }
+
+      if (light_type && (local_light_subtype >= LST_SINGLE)) {
+        if (!Settings.flag3.pwm_multi_channels) {
+          light_state.getHSB(&hue, &sat, nullptr);
+          bri = light_state.getBri();
+          ct = light_state.getCT();
+          uint8_t color_mode = light_state.getColorMode();
+          if (LCM_RGB == color_mode) { g_gotct = false; }
+          if (LCM_CT == color_mode) { g_gotct = true; }
+
+        } else {
+          bri = LightGetBri(device);
+        }
+      }
+      prev_x_str[0] = prev_y_str[0] = 0;
+
+      if (hue_json.containsKey("bri")) {
+        tmp = hue_json["bri"];
+        prev_bri = bri = tmp;
+
+        if (254 <= bri) { bri = 255; }
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "bri");
+        response.replace("{re", String(tmp));
+        if (LST_SINGLE <= Light.subtype) {
+          change = true;
+        }
+        resp = true;
+      }
+
+
+      if (hue_json.containsKey("xy")) {
+        float x, y;
+        x = hue_json["xy"][0];
+        y = hue_json["xy"][1];
+        const String &x_str = hue_json["xy"][0];
+        const String &y_str = hue_json["xy"][1];
+        x_str.toCharArray(prev_x_str, sizeof(prev_x_str));
+        y_str.toCharArray(prev_y_str, sizeof(prev_y_str));
+
+        uint8_t rr,gg,bb;
+        LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
+        LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
+        prev_hue = changeUIntScale(hue, 0, 359, 0, 65535);
+        prev_sat = (sat > 254 ? 254 : sat);
+
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "xy");
+        response.replace("{re", "[" + x_str + "," + y_str + "]");
+        g_gotct = false;
+        resp = true;
+        change = true;
+      }
+      if (hue_json.containsKey("hue")) {
+        tmp = hue_json["hue"];
+        prev_hue = tmp;
+
+        hue = changeUIntScale(tmp, 0, 65535, 0, 359);
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "hue");
+        response.replace("{re", String(tmp));
+        if (LST_RGB <= Light.subtype) {
+          g_gotct = false;
+          change = true;
+        }
+        resp = true;
+      }
+      if (hue_json.containsKey("sat")) {
+        tmp = hue_json["sat"];
+        prev_sat = sat = tmp;
+
+        if (254 <= sat) { sat = 255; }
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "sat");
+        response.replace("{re", String(tmp));
+        if (LST_RGB <= Light.subtype) {
+          g_gotct = false;
+          change = true;
+        }
+        resp = true;
+      }
+      if (hue_json.containsKey("ct")) {
+        ct = hue_json["ct"];
+        prev_ct = ct;
+        if (resp) { response += ","; }
+        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
+        response.replace("{id", String(device));
+        response.replace("{cm", "ct");
+        response.replace("{re", String(ct));
+        if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
+          g_gotct = true;
+          change = true;
+        }
+        resp = true;
+      }
+      if (change) {
+#ifdef USE_SHUTTER
+        if (ShutterState(device)) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_options[device-1] & 1);
+          ShutterSetPosition(device, bri * 100.0f );
+        } else
+#endif
+        if (light_type && (local_light_subtype > LST_NONE)) {
+          if (!Settings.flag3.pwm_multi_channels) {
+            if (g_gotct) {
+              light_controller.changeCTB(ct, bri);
+            } else {
+              light_controller.changeHSB(hue, sat, bri);
+            }
+            LightPreparePower();
+          } else {
+            LightSetBri(device, bri);
+          }
+          if (LST_COLDWARM <= local_light_subtype) {
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
+          } else {
+            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_DIMMER));
+          }
+          XdrvRulesProcess();
+        }
+        change = false;
+      }
+      response += "]";
+      if (2 == response.length()) {
+        response = FPSTR(HUE_ERROR_JSON);
+      }
+    }
+    else {
+      response = FPSTR(HUE_ERROR_JSON);
+    }
+  }
+  else if(path->indexOf("/lights/") >= 0) {
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "/lights path=%s", path->c_str());
+    path->remove(0,8);
+    device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT_HUE
+    if (device>devices_present) {
+      Script_HueStatus(&response,device-devices_present-1);
+      goto exit;
+}
+#endif
+
+    if ((device < 1) || (device > maxhue)) {
+      device = 1;
+    }
+    response += F("{\"state\":");
+    HueLightStatus1(device, &response);
+    HueLightStatus2(device, &response);
+  }
+  else {
+    response = "{}";
+    code = 406;
+  }
+  exit:
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
+  WSSend(code, CT_JSON, response);
+}
+
+void HueGroups(String *path)
+{
+
+
+
+  String response = "{}";
+  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
+
+  if (path->endsWith("/0")) {
+    response = FPSTR(HUE_GROUP0_STATUS_JSON);
+    String lights = F("\"1\"");
+    for (uint32_t i = 2; i <= maxhue; i++) {
+      lights += ",\"";
+      lights += EncodeLightId(i);
+      lights += "\"";
+    }
+    response.replace("{l1", lights);
+    HueLightStatus1(1, &response);
+    response += F("}");
+  }
+
+  WSSend(200, CT_JSON, response);
+}
+
+void HandleHueApi(String *path)
+{
+# 784 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
+  uint8_t args = 0;
+
+  path->remove(0, 4);
+  uint16_t apilen = path->length();
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API " (%s)"), path->c_str());
+  for (args = 0; args < WebServer->args(); args++) {
+    String json = WebServer->arg(args);
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_POST_ARGS " (%s)"), json.c_str());
+  }
+
+  if (path->endsWith("/invalid/")) {}
+  else if (!apilen) HueAuthentication(path);
+  else if (path->endsWith("/")) HueAuthentication(path);
+  else if (path->endsWith("/config")) HueConfig(path);
+  else if (path->indexOf("/lights") >= 0) HueLights(path);
+  else if (path->indexOf("/groups") >= 0) HueGroups(path);
+  else if (path->endsWith("/schedules")) HueNotImplemented(path);
+  else if (path->endsWith("/sensors")) HueNotImplemented(path);
+  else if (path->endsWith("/scenes")) HueNotImplemented(path);
+  else if (path->endsWith("/rules")) HueNotImplemented(path);
+  else if (path->endsWith("/resourcelinks")) HueNotImplemented(path);
+  else HueGlobalConfig(path);
+}
+
+
+
+
+
+bool Xdrv20(uint8_t function)
+{
+  bool result = false;
+
+#ifdef USE_SCRIPT_HUE
+  if ((EMUL_HUE == Settings.flag2.emulation)) {
+#else
+  if (devices_present && (EMUL_HUE == Settings.flag2.emulation)) {
+#endif
+    switch (function) {
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/description.xml", HandleUpnpSetupHue);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_21_wemo.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_21_wemo.ino"
+#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined (USE_EMULATION_WEMO)
+
+
+
+
+#define XDRV_21 21
+
+const char WEMO_MSEARCH[] PROGMEM =
+  "HTTP/1.1 200 OK\r\n"
+  "CACHE-CONTROL: max-age=86400\r\n"
+  "DATE: Fri, 15 Apr 2016 04:56:29 GMT\r\n"
+  "EXT:\r\n"
+  "LOCATION: http://%s:80/setup.xml\r\n"
+  "OPT: \"http://schemas.upnp.org/upnp/1/0/\"; ns=01\r\n"
+  "01-NLS: b9200ebb-736d-4b93-bf03-835149d13983\r\n"
+  "SERVER: Unspecified, UPnP/1.0, Unspecified\r\n"
+  "ST: %s\r\n"
+  "USN: uuid:%s::%s\r\n"
+  "X-User-Agent: redsonic\r\n"
+  "\r\n";
+
+String WemoSerialnumber(void)
+{
+  char serial[16];
+
+  snprintf_P(serial, sizeof(serial), PSTR("201612K%08X"), ESP.getChipId());
+  return String(serial);
+}
+
+String WemoUuid(void)
+{
+  char uuid[27];
+
+  snprintf_P(uuid, sizeof(uuid), PSTR("Socket-1_0-%s"), WemoSerialnumber().c_str());
+  return String(uuid);
+}
+
+void WemoRespondToMSearch(int echo_type)
+{
+  char message[TOPSZ];
+
+  TickerMSearch.detach();
+  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
+    char type[24];
+    if (1 == echo_type) {
+      strcpy_P(type, URN_BELKIN_DEVICE_CAP);
+    } else {
+      strcpy_P(type, UPNP_ROOTDEVICE);
+    }
+    char response[400];
+    snprintf_P(response, sizeof(response), WEMO_MSEARCH, WiFi.localIP().toString().c_str(), type, WemoUuid().c_str(), type);
+    PortUdp.write(response);
+    PortUdp.endPacket();
+    snprintf_P(message, sizeof(message), PSTR(D_RESPONSE_SENT));
+  } else {
+    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
+  }
+
+  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
+    echo_type, message, udp_remote_ip.toString().c_str(), udp_remote_port);
+
+  udp_response_mutex = false;
+}
+
+
+
+
+
+const char WEMO_EVENTSERVICE_XML[] PROGMEM =
+  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
+    "<actionList>"
+      "<action>"
+        "<name>SetBinaryState</name>"
+        "<argumentList>"
+          "<argument>"
+            "<retval/>"
+            "<name>BinaryState</name>"
+            "<relatedStateVariable>BinaryState</relatedStateVariable>"
+            "<direction>in</direction>"
+          "</argument>"
+        "</argumentList>"
+      "</action>"
+      "<action>"
+        "<name>GetBinaryState</name>"
+        "<argumentList>"
+          "<argument>"
+            "<retval/>"
+            "<name>BinaryState</name>"
+            "<relatedStateVariable>BinaryState</relatedStateVariable>"
+            "<direction>out</direction>"
+          "</argument>"
+        "</argumentList>"
+      "</action>"
+    "</actionList>"
+    "<serviceStateTable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>BinaryState</name>"
+        "<dataType>bool</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>level</name>"
+        "<dataType>string</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+    "</serviceStateTable>"
+  "</scpd>\r\n\r\n";
+
+const char WEMO_METASERVICE_XML[] PROGMEM =
+  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
+    "<specVersion>"
+      "<major>1</major>"
+      "<minor>0</minor>"
+    "</specVersion>"
+    "<actionList>"
+      "<action>"
+        "<name>GetMetaInfo</name>"
+        "<argumentList>"
+          "<retval />"
+          "<name>GetMetaInfo</name>"
+          "<relatedStateVariable>MetaInfo</relatedStateVariable>"
+          "<direction>in</direction>"
+        "</argumentList>"
+      "</action>"
+    "</actionList>"
+    "<serviceStateTable>"
+      "<stateVariable sendEvents=\"yes\">"
+        "<name>MetaInfo</name>"
+        "<dataType>string</dataType>"
+        "<defaultValue>0</defaultValue>"
+      "</stateVariable>"
+    "</serviceStateTable>"
+  "</scpd>\r\n\r\n";
+
+const char WEMO_RESPONSE_STATE_SOAP[] PROGMEM =
+  "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+    "<s:Body>"
+      "<u:%cetBinaryStateResponse xmlns:u=\"urn:Belkin:service:basicevent:1\">"
+        "<BinaryState>%d</BinaryState>"
+      "</u:%cetBinaryStateResponse>"
+    "</s:Body>"
+  "</s:Envelope>\r\n";
+
+const char WEMO_SETUP_XML[] PROGMEM =
+  "<?xml version=\"1.0\"?>"
+  "<root xmlns=\"urn:Belkin:device-1-0\">"
+    "<device>"
+      "<deviceType>urn:Belkin:device:controllee:1</deviceType>"
+      "<friendlyName>{x1</friendlyName>"
+      "<manufacturer>Belkin International Inc.</manufacturer>"
+      "<modelName>Socket</modelName>"
+      "<modelNumber>3.1415</modelNumber>"
+      "<UDN>uuid:{x2</UDN>"
+      "<serialNumber>{x3</serialNumber>"
+      "<binaryState>0</binaryState>"
+      "<serviceList>"
+        "<service>"
+          "<serviceType>urn:Belkin:service:basicevent:1</serviceType>"
+          "<serviceId>urn:Belkin:serviceId:basicevent1</serviceId>"
+          "<controlURL>/upnp/control/basicevent1</controlURL>"
+          "<eventSubURL>/upnp/event/basicevent1</eventSubURL>"
+          "<SCPDURL>/eventservice.xml</SCPDURL>"
+        "</service>"
+        "<service>"
+          "<serviceType>urn:Belkin:service:metainfo:1</serviceType>"
+          "<serviceId>urn:Belkin:serviceId:metainfo1</serviceId>"
+          "<controlURL>/upnp/control/metainfo1</controlURL>"
+          "<eventSubURL>/upnp/event/metainfo1</eventSubURL>"
+          "<SCPDURL>/metainfoservice.xml</SCPDURL>"
+        "</service>"
+      "</serviceList>"
+    "</device>"
+  "</root>\r\n";
+
+
+
+void HandleUpnpEvent(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_BASIC_EVENT));
+
+  char event[500];
+  strlcpy(event, WebServer->arg(0).c_str(), sizeof(event));
+
+
+
+
+  char state = 'G';
+  if (strstr_P(event, PSTR("SetBinaryState")) != nullptr) {
+    state = 'S';
+    uint8_t power = POWER_TOGGLE;
+    if (strstr_P(event, PSTR("State>1</Binary")) != nullptr) {
+      power = POWER_ON;
+    }
+    else if (strstr_P(event, PSTR("State>0</Binary")) != nullptr) {
+      power = POWER_OFF;
+    }
+    if (power != POWER_TOGGLE) {
+      uint8_t device = (light_type) ? devices_present : 1;
+      ExecuteCommandPower(device, power, SRC_WEMO);
+    }
+  }
+
+  snprintf_P(event, sizeof(event), WEMO_RESPONSE_STATE_SOAP, state, bitRead(power, devices_present -1), state);
+  WSSend(200, CT_XML, event);
+}
+
+void HandleUpnpService(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_EVENT_SERVICE));
+
+  WSSend(200, CT_PLAIN, FPSTR(WEMO_EVENTSERVICE_XML));
+}
+
+void HandleUpnpMetaService(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_META_SERVICE));
+
+  WSSend(200, CT_PLAIN, FPSTR(WEMO_METASERVICE_XML));
+}
+
+void HandleUpnpSetupWemo(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_SETUP));
+
+  String setup_xml = FPSTR(WEMO_SETUP_XML);
+  setup_xml.replace("{x1", SettingsText(SET_FRIENDLYNAME1));
+  setup_xml.replace("{x2", WemoUuid());
+  setup_xml.replace("{x3", WemoSerialnumber());
+  WSSend(200, CT_XML, setup_xml);
+}
+
+
+
+
+
+bool Xdrv21(uint8_t function)
+{
+  bool result = false;
+
+  if (devices_present && (EMUL_WEMO == Settings.flag2.emulation)) {
+    switch (function) {
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/upnp/control/basicevent1", HTTP_POST, HandleUpnpEvent);
+        WebServer->on("/eventservice.xml", HandleUpnpService);
+        WebServer->on("/metainfoservice.xml", HandleUpnpMetaService);
+        WebServer->on("/setup.xml", HandleUpnpSetupWemo);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+#ifdef USE_SONOFF_IFAN
+
+
+
+
+#define XDRV_22 22
+
+const uint8_t MAX_FAN_SPEED = 4;
+
+const uint8_t kIFan02Speed[MAX_FAN_SPEED] = { 0x00, 0x01, 0x03, 0x05 };
+const uint8_t kIFan03Speed[MAX_FAN_SPEED +2] = { 0x00, 0x01, 0x03, 0x04, 0x05, 0x06 };
+const uint8_t kIFan03Sequence[MAX_FAN_SPEED][MAX_FAN_SPEED] = {{0, 2, 2, 2}, {0, 1, 2, 4}, {1, 1, 2, 5}, {4, 4, 5, 3}};
+
+const char kSonoffIfanCommands[] PROGMEM = "|"
+  D_CMND_FANSPEED;
+
+void (* const SonoffIfanCommand[])(void) PROGMEM = {
+  &CmndFanspeed };
+
+uint8_t ifan_fanspeed_timer = 0;
+uint8_t ifan_fanspeed_goal = 0;
+bool ifan_receive_flag = false;
+bool ifan_restart_flag = true;
+
+
+
+bool IsModuleIfan(void)
+{
+  return ((SONOFF_IFAN02 == my_module_type) || (SONOFF_IFAN03 == my_module_type));
+}
+
+uint8_t MaxFanspeed(void)
+{
+  return MAX_FAN_SPEED;
+}
+
+uint8_t GetFanspeed(void)
+{
+  if (ifan_fanspeed_timer) {
+    return ifan_fanspeed_goal;
+  } else {
+
+
+
+
+
+
+    uint8_t fanspeed = (uint8_t)(power &0xF) >> 1;
+    if (fanspeed) { fanspeed = (fanspeed >> 1) +1; }
+    return fanspeed;
+  }
+}
+
+
+
+void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence)
+{
+  ifan_fanspeed_timer = 0;
+  ifan_fanspeed_goal = fanspeed;
+
+  uint8_t fanspeed_now = GetFanspeed();
+
+  if (fanspeed == fanspeed_now) { return; }
+
+  uint8_t fans = kIFan02Speed[fanspeed];
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (sequence) {
+      fanspeed = kIFan03Sequence[fanspeed_now][ifan_fanspeed_goal];
+      if (fanspeed != ifan_fanspeed_goal) {
+        if (0 == fanspeed_now) {
+          ifan_fanspeed_timer = 20;
+        } else {
+          ifan_fanspeed_timer = 2;
+        }
+      }
+    }
+    fans = kIFan03Speed[fanspeed];
+  }
+  for (uint32_t i = 2; i < 5; i++) {
+    uint8_t state = (fans &1) + POWER_OFF_NO_STATE;
+    ExecuteCommandPower(i, state, SRC_IGNORE);
+    fans >>= 1;
+  }
+
+#ifdef USE_DOMOTICZ
+  if (sequence) { DomoticzUpdateFanState(); }
+#endif
+}
+
+
+
+void SonoffIfanReceived(void)
+{
+  char svalue[32];
+
+  uint8_t mode = serial_in_buffer[3];
+  uint8_t action = serial_in_buffer[6];
+
+  if (4 == mode) {
+    if (action < 4) {
+
+
+
+
+      if (action != GetFanspeed()) {
+        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), action);
+        ExecuteCommand(svalue, SRC_REMOTE);
+#ifdef USE_BUZZER
+        BuzzerEnabledBeep((action) ? action : 1, (action) ? 1 : 4);
+#endif
+      }
+    } else {
+
+      ExecuteCommandPower(1, POWER_TOGGLE, SRC_REMOTE);
+    }
+  }
+  if (6 == mode) {
+
+    Settings.flag3.buzzer_enable = !Settings.flag3.buzzer_enable;
+  }
+  if (7 == mode) {
+
+#ifdef USE_BUZZER
+    BuzzerEnabledBeep(4, 1);
+#endif
+  }
+
+
+
+  serial_in_buffer[5] = 0;
+  serial_in_buffer[6] = 0;
+  for (uint32_t i = 0; i < 7; i++) {
+    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+}
+
+bool SonoffIfanSerialInput(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (0xAA == serial_in_byte) {
+      serial_in_byte_counter = 0;
+      ifan_receive_flag = true;
+    }
+    if (ifan_receive_flag) {
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+      if (serial_in_byte_counter == 8) {
+# 176 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
+        AddLogSerial(LOG_LEVEL_DEBUG);
+        uint8_t crc = 0;
+        for (uint32_t i = 2; i < 7; i++) {
+          crc += serial_in_buffer[i];
+        }
+        if (crc == serial_in_buffer[7]) {
+          SonoffIfanReceived();
+          ifan_receive_flag = false;
+          return true;
+        }
+      }
+      serial_in_byte = 0;
+    }
+    return false;
+  }
+}
+
+
+
+
+
+void CmndFanspeed(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    if ('-' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = (int16_t)GetFanspeed() -1;
+      if (XdrvMailbox.payload < 0) { XdrvMailbox.payload = MAX_FAN_SPEED -1; }
+    }
+    else if ('+' == XdrvMailbox.data[0]) {
+      XdrvMailbox.payload = GetFanspeed() +1;
+      if (XdrvMailbox.payload > MAX_FAN_SPEED -1) { XdrvMailbox.payload = 0; }
+    }
+  }
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_FAN_SPEED)) {
+    SonoffIFanSetFanspeed(XdrvMailbox.payload, true);
+  }
+  ResponseCmndNumber(GetFanspeed());
+}
+
+
+
+bool SonoffIfanInit(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    SetSerial(9600, TS_SERIAL_8N1);
+  }
+  return false;
+}
+
+void SonoffIfanUpdate(void)
+{
+  if (SONOFF_IFAN03 == my_module_type) {
+    if (ifan_fanspeed_timer) {
+      ifan_fanspeed_timer--;
+      if (!ifan_fanspeed_timer) {
+        SonoffIFanSetFanspeed(ifan_fanspeed_goal, false);
+      }
+    }
+  }
+
+  if (ifan_restart_flag && (4 == uptime) && (SONOFF_IFAN02 == my_module_type)) {
+    ifan_restart_flag = false;
+    SetDevicePower(1, SRC_RETRY);
+    SetDevicePower(power, SRC_RETRY);
+  }
+}
+
+
+
+
+
+bool Xdrv22(uint8_t function)
+{
+  bool result = false;
+
+  if (IsModuleIfan()) {
+    switch (function) {
+      case FUNC_EVERY_250_MSECOND:
+        SonoffIfanUpdate();
+        break;
+      case FUNC_SERIAL:
+        result = SonoffIfanSerialInput();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kSonoffIfanCommands, SonoffIfanCommand);
+        break;
+      case FUNC_MODULE_INIT:
+        result = SonoffIfanInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+#ifdef USE_ZIGBEE
+
+#define OCCUPANCY "Occupancy"
+
+typedef uint64_t Z_IEEEAddress;
+typedef uint16_t Z_ShortAddress;
+
+enum ZnpCommandType {
+  Z_POLL = 0x00,
+  Z_SREQ = 0x20,
+  Z_AREQ = 0x40,
+  Z_SRSP = 0x60
+};
+
+enum ZnpSubsystem {
+  Z_RPC_Error = 0x00,
+  Z_SYS = 0x01,
+  Z_MAC = 0x02,
+  Z_NWK = 0x03,
+  Z_AF = 0x04,
+  Z_ZDO = 0x05,
+  Z_SAPI = 0x06,
+  Z_UTIL = 0x07,
+  Z_DEBUG = 0x08,
+  Z_APP = 0x09
+};
+
+
+enum SysCommand {
+  SYS_RESET = 0x00,
+  SYS_PING = 0x01,
+  SYS_VERSION = 0x02,
+  SYS_SET_EXTADDR = 0x03,
+  SYS_GET_EXTADDR = 0x04,
+  SYS_RAM_READ = 0x05,
+  SYS_RAM_WRITE = 0x06,
+  SYS_OSAL_NV_ITEM_INIT = 0x07,
+  SYS_OSAL_NV_READ = 0x08,
+  SYS_OSAL_NV_WRITE = 0x09,
+  SYS_OSAL_START_TIMER = 0x0A,
+  SYS_OSAL_STOP_TIMER = 0x0B,
+  SYS_RANDOM = 0x0C,
+  SYS_ADC_READ = 0x0D,
+  SYS_GPIO = 0x0E,
+  SYS_STACK_TUNE = 0x0F,
+  SYS_SET_TIME = 0x10,
+  SYS_GET_TIME = 0x11,
+  SYS_OSAL_NV_DELETE = 0x12,
+  SYS_OSAL_NV_LENGTH = 0x13,
+  SYS_TEST_RF = 0x40,
+  SYS_TEST_LOOPBACK = 0x41,
+  SYS_RESET_IND = 0x80,
+  SYS_OSAL_TIMER_EXPIRED = 0x81,
+};
+
+enum SapiCommand {
+  SAPI_START_REQUEST = 0x00,
+  SAPI_BIND_DEVICE = 0x01,
+  SAPI_ALLOW_BIND = 0x02,
+  SAPI_SEND_DATA_REQUEST = 0x03,
+  SAPI_READ_CONFIGURATION = 0x04,
+  SAPI_WRITE_CONFIGURATION = 0x05,
+  SAPI_GET_DEVICE_INFO = 0x06,
+  SAPI_FIND_DEVICE_REQUEST = 0x07,
+  SAPI_PERMIT_JOINING_REQUEST = 0x08,
+  SAPI_SYSTEM_RESET = 0x09,
+  SAPI_START_CONFIRM = 0x80,
+  SAPI_BIND_CONFIRM = 0x81,
+  SAPI_ALLOW_BIND_CONFIRM = 0x82,
+  SAPI_SEND_DATA_CONFIRM = 0x83,
+  SAPI_FIND_DEVICE_CONFIRM = 0x85,
+  SAPI_RECEIVE_DATA_INDICATION = 0x87,
+};
+enum Z_configuration {
+  CONF_EXTADDR = 0x01,
+  CONF_BOOTCOUNTER = 0x02,
+  CONF_STARTUP_OPTION = 0x03,
+  CONF_START_DELAY = 0x04,
+  CONF_NIB = 0x21,
+  CONF_DEVICE_LIST = 0x22,
+  CONF_ADDRMGR = 0x23,
+  CONF_POLL_RATE = 0x24,
+  CONF_QUEUED_POLL_RATE = 0x25,
+  CONF_RESPONSE_POLL_RATE = 0x26,
+  CONF_REJOIN_POLL_RATE = 0x27,
+  CONF_DATA_RETRIES = 0x28,
+  CONF_POLL_FAILURE_RETRIES = 0x29,
+  CONF_STACK_PROFILE = 0x2A,
+  CONF_INDIRECT_MSG_TIMEOUT = 0x2B,
+  CONF_ROUTE_EXPIRY_TIME = 0x2C,
+  CONF_EXTENDED_PAN_ID = 0x2D,
+  CONF_BCAST_RETRIES = 0x2E,
+  CONF_PASSIVE_ACK_TIMEOUT = 0x2F,
+  CONF_BCAST_DELIVERY_TIME = 0x30,
+  CONF_NWK_MODE = 0x31,
+  CONF_CONCENTRATOR_ENABLE = 0x32,
+  CONF_CONCENTRATOR_DISCOVERY = 0x33,
+  CONF_CONCENTRATOR_RADIUS = 0x34,
+  CONF_CONCENTRATOR_RC = 0x36,
+  CONF_NWK_MGR_MODE = 0x37,
+  CONF_SRC_RTG_EXPIRY_TIME = 0x38,
+  CONF_ROUTE_DISCOVERY_TIME = 0x39,
+  CONF_NWK_ACTIVE_KEY_INFO = 0x3A,
+  CONF_NWK_ALTERN_KEY_INFO = 0x3B,
+  CONF_ROUTER_OFF_ASSOC_CLEANUP = 0x3C,
+  CONF_NWK_LEAVE_REQ_ALLOWED = 0x3D,
+  CONF_NWK_CHILD_AGE_ENABLE = 0x3E,
+  CONF_DEVICE_LIST_KA_TIMEOUT = 0x3F,
+  CONF_BINDING_TABLE = 0x41,
+  CONF_GROUP_TABLE = 0x42,
+  CONF_APS_FRAME_RETRIES = 0x43,
+  CONF_APS_ACK_WAIT_DURATION = 0x44,
+  CONF_APS_ACK_WAIT_MULTIPLIER = 0x45,
+  CONF_BINDING_TIME = 0x46,
+  CONF_APS_USE_EXT_PANID = 0x47,
+  CONF_APS_USE_INSECURE_JOIN = 0x48,
+  CONF_COMMISSIONED_NWK_ADDR = 0x49,
+  CONF_APS_NONMEMBER_RADIUS = 0x4B,
+  CONF_APS_LINK_KEY_TABLE = 0x4C,
+  CONF_APS_DUPREJ_TIMEOUT_INC = 0x4D,
+  CONF_APS_DUPREJ_TIMEOUT_COUNT = 0x4E,
+  CONF_APS_DUPREJ_TABLE_SIZE = 0x4F,
+  CONF_DIAGNOSTIC_STATS = 0x50,
+  CONF_SECURITY_LEVEL = 0x61,
+  CONF_PRECFGKEY = 0x62,
+  CONF_PRECFGKEYS_ENABLE = 0x63,
+  CONF_SECURITY_MODE = 0x64,
+  CONF_SECURE_PERMIT_JOIN = 0x65,
+  CONF_APS_LINK_KEY_TYPE = 0x66,
+  CONF_APS_ALLOW_R19_SECURITY = 0x67,
+  CONF_IMPLICIT_CERTIFICATE = 0x69,
+  CONF_DEVICE_PRIVATE_KEY = 0x6A,
+  CONF_CA_PUBLIC_KEY = 0x6B,
+  CONF_KE_MAX_DEVICES = 0x6C,
+  CONF_USE_DEFAULT_TCLK = 0x6D,
+  CONF_RNG_COUNTER = 0x6F,
+  CONF_RANDOM_SEED = 0x70,
+  CONF_TRUSTCENTER_ADDR = 0x71,
+  CONF_USERDESC = 0x81,
+  CONF_NWKKEY = 0x82,
+  CONF_PANID = 0x83,
+  CONF_CHANLIST = 0x84,
+  CONF_LEAVE_CTRL = 0x85,
+  CONF_SCAN_DURATION = 0x86,
+  CONF_LOGICAL_TYPE = 0x87,
+  CONF_NWKMGR_MIN_TX = 0x88,
+  CONF_NWKMGR_ADDR = 0x89,
+  CONF_ZDO_DIRECT_CB = 0x8F,
+  CONF_TCLK_TABLE_START = 0x0101,
+  ZNP_HAS_CONFIGURED = 0xF00
+};
+# 210 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+enum Z_Status {
+  Z_Success = 0x00,
+  Z_Failure = 0x01,
+  Z_InvalidParameter = 0x02,
+  Z_MemError = 0x03,
+  Z_Created = 0x09,
+  Z_BufferFull = 0x11
+};
+
+enum Z_App_Profiles {
+  Z_PROF_IPM = 0x0101,
+  Z_PROF_HA = 0x0104,
+  Z_PROF_CBA = 0x0105,
+  Z_PROF_TA = 0x0107,
+  Z_PROF_PHHC = 0x0108,
+  Z_PROF_AMI = 0x0109,
+};
+
+enum Z_Device_Ids {
+  Z_DEVID_CONF_TOOL = 0x0005,
+# 262 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+};
+# 275 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
+enum AfCommand : uint8_t {
+  AF_REGISTER = 0x00,
+  AF_DATA_REQUEST = 0x01,
+  AF_DATA_REQUEST_EXT = 0x02,
+  AF_DATA_REQUEST_SRC_RTG = 0x03,
+  AF_INTER_PAN_CTL = 0x10,
+  AF_DATA_STORE = 0x11,
+  AF_DATA_RETRIEVE = 0x12,
+  AF_APSF_CONFIG_SET = 0x13,
+  AF_DATA_CONFIRM = 0x80,
+  AF_REFLECT_ERROR = 0x83,
+  AF_INCOMING_MSG = 0x81,
+  AF_INCOMING_MSG_EXT = 0x82
+};
+
+
+enum : uint8_t {
+  ZDO_NWK_ADDR_REQ = 0x00,
+  ZDO_IEEE_ADDR_REQ = 0x01,
+  ZDO_NODE_DESC_REQ = 0x02,
+  ZDO_POWER_DESC_REQ = 0x03,
+  ZDO_SIMPLE_DESC_REQ = 0x04,
+  ZDO_ACTIVE_EP_REQ = 0x05,
+  ZDO_MATCH_DESC_REQ = 0x06,
+  ZDO_COMPLEX_DESC_REQ = 0x07,
+  ZDO_USER_DESC_REQ = 0x08,
+  ZDO_DEVICE_ANNCE = 0x0A,
+  ZDO_USER_DESC_SET = 0x0B,
+  ZDO_SERVER_DISC_REQ = 0x0C,
+  ZDO_END_DEVICE_BIND_REQ = 0x20,
+  ZDO_BIND_REQ = 0x21,
+  ZDO_UNBIND_REQ = 0x22,
+  ZDO_SET_LINK_KEY = 0x23,
+  ZDO_REMOVE_LINK_KEY = 0x24,
+  ZDO_GET_LINK_KEY = 0x25,
+  ZDO_MGMT_NWK_DISC_REQ = 0x30,
+  ZDO_MGMT_LQI_REQ = 0x31,
+  ZDO_MGMT_RTQ_REQ = 0x32,
+  ZDO_MGMT_BIND_REQ = 0x33,
+  ZDO_MGMT_LEAVE_REQ = 0x34,
+  ZDO_MGMT_DIRECT_JOIN_REQ = 0x35,
+  ZDO_MGMT_PERMIT_JOIN_REQ = 0x36,
+  ZDO_MGMT_NWK_UPDATE_REQ = 0x37,
+  ZDO_MSG_CB_REGISTER = 0x3E,
+  ZDO_MGS_CB_REMOVE = 0x3F,
+  ZDO_STARTUP_FROM_APP = 0x40,
+  ZDO_AUTO_FIND_DESTINATION = 0x41,
+  ZDO_EXT_REMOVE_GROUP = 0x47,
+  ZDO_EXT_REMOVE_ALL_GROUP = 0x48,
+  ZDO_EXT_FIND_ALL_GROUPS_ENDPOINT = 0x49,
+  ZDO_EXT_FIND_GROUP = 0x4A,
+  ZDO_EXT_ADD_GROUP = 0x4B,
+  ZDO_EXT_COUNT_ALL_GROUPS = 0x4C,
+  ZDO_NWK_ADDR_RSP = 0x80,
+  ZDO_IEEE_ADDR_RSP = 0x81,
+  ZDO_NODE_DESC_RSP = 0x82,
+  ZDO_POWER_DESC_RSP = 0x83,
+  ZDO_SIMPLE_DESC_RSP = 0x84,
+  ZDO_ACTIVE_EP_RSP = 0x85,
+  ZDO_MATCH_DESC_RSP = 0x86,
+  ZDO_COMPLEX_DESC_RSP = 0x87,
+  ZDO_USER_DESC_RSP = 0x88,
+  ZDO_USER_DESC_CONF = 0x89,
+  ZDO_SERVER_DISC_RSP = 0x8A,
+  ZDO_END_DEVICE_BIND_RSP = 0xA0,
+  ZDO_BIND_RSP = 0xA1,
+  ZDO_UNBIND_RSP = 0xA2,
+  ZDO_MGMT_NWK_DISC_RSP = 0xB0,
+  ZDO_MGMT_LQI_RSP = 0xB1,
+  ZDO_MGMT_RTG_RSP = 0xB2,
+  ZDO_MGMT_BIND_RSP = 0xB3,
+  ZDO_MGMT_LEAVE_RSP = 0xB4,
+  ZDO_MGMT_DIRECT_JOIN_RSP = 0xB5,
+  ZDO_MGMT_PERMIT_JOIN_RSP = 0xB6,
+  ZDO_STATE_CHANGE_IND = 0xC0,
+  ZDO_END_DEVICE_ANNCE_IND = 0xC1,
+  ZDO_MATCH_DESC_RSP_SENT = 0xC2,
+  ZDO_STATUS_ERROR_RSP = 0xC3,
+  ZDO_SRC_RTG_IND = 0xC4,
+  ZDO_LEAVE_IND = 0xC9,
+  ZDO_TC_DEV_IND = 0xCA,
+  ZDO_PERMIT_JOIN_IND = 0xCB,
+  ZDO_MSG_CB_INCOMING = 0xFF
+};
+
+
+enum ZdoStates {
+  ZDO_DEV_HOLD = 0x00,
+  ZDO_DEV_INIT = 0x01,
+  ZDO_DEV_NWK_DISC = 0x02,
+  ZDO_DEV_NWK_JOINING = 0x03,
+  ZDO_DEV_NWK_REJOIN = 0x04,
+  ZDO_DEV_END_DEVICE_UNAUTH = 0x05,
+  ZDO_DEV_END_DEVICE = 0x06,
+  ZDO_DEV_ROUTER = 0x07,
+  ZDO_DEV_COORD_STARTING = 0x08,
+  ZDO_DEV_ZB_COORD = 0x09,
+  ZDO_DEV_NWK_ORPHAN = 0x0A,
+};
+
+
+enum Z_Util {
+  Z_UTIL_GET_DEVICE_INFO = 0x00,
+  Z_UTIL_GET_NV_INFO = 0x01,
+  Z_UTIL_SET_PANID = 0x02,
+  Z_UTIL_SET_CHANNELS = 0x03,
+  Z_UTIL_SET_SECLEVEL = 0x04,
+  Z_UTIL_SET_PRECFGKEY = 0x05,
+  Z_UTIL_CALLBACK_SUB_CMD = 0x06,
+  Z_UTIL_KEY_EVENT = 0x07,
+  Z_UTIL_TIME_ALIVE = 0x09,
+  Z_UTIL_LED_CONTROL = 0x0A,
+  Z_UTIL_TEST_LOOPBACK = 0x10,
+  Z_UTIL_DATA_REQ = 0x11,
+  Z_UTIL_SRC_MATCH_ENABLE = 0x20,
+  Z_UTIL_SRC_MATCH_ADD_ENTRY = 0x21,
+  Z_UTIL_SRC_MATCH_DEL_ENTRY = 0x22,
+  Z_UTIL_SRC_MATCH_CHECK_SRC_ADDR = 0x23,
+  Z_UTIL_SRC_MATCH_ACK_ALL_PENDING = 0x24,
+  Z_UTIL_SRC_MATCH_CHECK_ALL_PENDING = 0x25,
+  Z_UTIL_ADDRMGR_EXT_ADDR_LOOKUP = 0x40,
+  Z_UTIL_ADDRMGR_NWK_ADDR_LOOKUP = 0x41,
+  Z_UTIL_APSME_LINK_KEY_DATA_GET = 0x44,
+  Z_UTIL_APSME_LINK_KEY_NV_ID_GET = 0x45,
+  Z_UTIL_ASSOC_COUNT = 0x48,
+  Z_UTIL_ASSOC_FIND_DEVICE = 0x49,
+  Z_UTIL_ASSOC_GET_WITH_ADDRESS = 0x4A,
+  Z_UTIL_APSME_REQUEST_KEY_CMD = 0x4B,
+  Z_UTIL_ZCL_KEY_EST_INIT_EST = 0x80,
+  Z_UTIL_ZCL_KEY_EST_SIGN = 0x81,
+  Z_UTIL_UTIL_SYNC_REQ = 0xE0,
+  Z_UTIL_ZCL_KEY_ESTABLISH_IND = 0xE1
+};
+
+enum ZCL_Global_Commands {
+  ZCL_READ_ATTRIBUTES = 0x00,
+  ZCL_READ_ATTRIBUTES_RESPONSE = 0x01,
+  ZCL_WRITE_ATTRIBUTES = 0x02,
+  ZCL_WRITE_ATTRIBUTES_UNDIVIDED = 0x03,
+  ZCL_WRITE_ATTRIBUTES_RESPONSE = 0x04,
+  ZCL_WRITE_ATTRIBUTES_NORESPONSE = 0x05,
+  ZCL_CONFIGURE_REPORTING = 0x06,
+  ZCL_CONFIGURE_REPORTING_RESPONSE = 0x07,
+  ZCL_READ_REPORTING_CONFIGURATION = 0x08,
+  ZCL_READ_REPORTING_CONFIGURATION_RESPONSE = 0x09,
+  ZCL_REPORT_ATTRIBUTES = 0x0a,
+  ZCL_DEFAULT_RESPONSE = 0x0b,
+  ZCL_DISCOVER_ATTRIBUTES = 0x0c,
+  ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d
+
+};
+
+const uint16_t Z_ProfileIds[] PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
+const char Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
+#ifdef USE_ZIGBEE
+
+
+
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId);
+
+
+
+JsonVariant &getCaseInsensitive(const JsonObject &json, const char *needle) {
+
+  if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle))) {
+    return *(JsonVariant*)nullptr;
+  }
+
+  for (auto kv : json) {
+    const char *key = kv.key;
+    JsonVariant &value = kv.value;
+
+    if (0 == strcasecmp_P(key, needle)) {
+      return value;
+    }
+  }
+
+  return *(JsonVariant*)nullptr;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+#ifdef USE_ZIGBEE
+
+#ifndef ZIGBEERECEIVED
+#define ZIGBEERECEIVED 1
+#endif
+
+#include <vector>
+#include <map>
+
+#ifndef ZIGBEE_SAVE_DELAY_SECONDS
+#define ZIGBEE_SAVE_DELAY_SECONDS 10;
+#endif
+const uint16_t kZigbeeSaveDelaySeconds = ZIGBEE_SAVE_DELAY_SECONDS;
+
+typedef int32_t (*Z_DeviceTimer)(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
+
+typedef struct Z_Device {
+  uint16_t shortaddr;
+  uint64_t longaddr;
+  uint32_t firstSeen;
+  uint32_t lastSeen;
+  String manufacturerId;
+  String modelId;
+  String friendlyName;
+  std::vector<uint32_t> endpoints;
+  std::vector<uint32_t> clusters_in;
+  std::vector<uint32_t> clusters_out;
+
+  uint32_t timer;
+  uint16_t cluster;
+  uint16_t endpoint;
+  uint32_t value;
+  Z_DeviceTimer func;
+
+  DynamicJsonBuffer *json_buffer;
+  JsonObject *json;
+
+  uint8_t seqNumber;
+} Z_Device;
+
+
+
+
+
+
+
+class Z_Devices {
+public:
+  Z_Devices() {};
+
+
+
+
+
+
+  uint16_t isKnownShortAddr(uint16_t shortaddr) const;
+  uint16_t isKnownLongAddr(uint64_t longaddr) const;
+  uint16_t isKnownIndex(uint32_t index) const;
+  uint16_t isKnownFriendlyName(const char * name) const;
+
+  uint64_t getDeviceLongAddr(uint16_t shortaddr) const;
+
+
+
+  void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
+
+
+  void addEndoint(uint16_t shortaddr, uint8_t endpoint);
+
+
+  void addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId);
+
+
+  void addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out);
+
+  uint8_t findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster);
+
+  void setManufId(uint16_t shortaddr, const char * str);
+  void setModelId(uint16_t shortaddr, const char * str);
+  void setFriendlyName(uint16_t shortaddr, const char * str);
+  const String * getFriendlyName(uint16_t) const;
+
+
+  void updateLastSeen(uint16_t shortaddr);
+
+
+  uint8_t getNextSeqNumber(uint16_t shortaddr);
+
+
+  String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
+
+
+  void resetTimer(uint32_t shortaddr);
+  void setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func);
+  void runTimer(void);
+
+
+  void jsonClear(uint16_t shortaddr);
+  void jsonAppend(uint16_t shortaddr, const JsonObject &values);
+  const JsonObject *jsonGet(uint16_t shortaddr);
+  void jsonPublishFlush(uint16_t shortaddr);
+  bool jsonIsConflict(uint16_t shortaddr, const JsonObject &values);
+  void jsonPublishNow(uint16_t shortaddr, JsonObject &values);
+
+
+  size_t devicesSize(void) const {
+    return _devices.size();
+  }
+  const Z_Device &devicesAt(size_t i) const {
+    return _devices.at(i);
+  }
+
+
+  bool removeDevice(uint16_t shortaddr);
+
+
+  void dirty(void);
+  void clean(void);
+
+
+  uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
+
+private:
+  std::vector<Z_Device> _devices = {};
+  uint32_t _saveTimer = 0;
+  uint8_t _seqNumber = 0;
+
+  template < typename T>
+  static bool findInVector(const std::vector<T> & vecOfElements, const T & element);
+
+  template < typename T>
+  static int32_t findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element);
+
+
+  static int32_t findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t element);
+
+  Z_Device & getShortAddr(uint16_t shortaddr);
+  const Z_Device & getShortAddrConst(uint16_t shortaddr) const ;
+  Z_Device & getLongAddr(uint64_t longaddr);
+
+  int32_t findShortAddr(uint16_t shortaddr) const;
+  int32_t findLongAddr(uint64_t longaddr) const;
+  int32_t findFriendlyName(const char * name) const;
+
+  void _updateLastSeen(Z_Device &device) {
+    if (&device != nullptr) {
+      device.lastSeen = Rtc.utc_time;
+    }
+  };
+
+
+  Z_Device & createDeviceEntry(uint16_t shortaddr, uint64_t longaddr = 0);
+};
+
+Z_Devices zigbee_devices = Z_Devices();
+
+
+uint64_t localIEEEAddr = 0;
+
+
+template < typename T>
+bool Z_Devices::findInVector(const std::vector<T> & vecOfElements, const T & element) {
+
+ auto it = std::find(vecOfElements.begin(), vecOfElements.end(), element);
+
+ if (it != vecOfElements.end()) {
+  return true;
+ } else {
+  return false;
+ }
+}
+
+template < typename T>
+int32_t Z_Devices::findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element) {
+
+
+  int32_t found = 0;
+  for (auto &elem : vecOfElements) {
+    if ( ((elem >> 16) & 0xFF) == element) { return found; }
+    found++;
+  }
+
+  return -1;
+}
+# 214 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t cluster) {
+  int32_t found = 0;
+  for (auto &elem : vecOfElements) {
+    if ((elem & 0xFFFF) == cluster) { return found; }
+    found++;
+  }
+  return -1;
+}
+
+
+
+
+
+Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
+  if (!shortaddr && !longaddr) { return *(Z_Device*) nullptr; }
+  Z_Device device = { shortaddr, longaddr,
+                      Rtc.utc_time, Rtc.utc_time,
+                      String(),
+                      String(),
+                      String(),
+                      std::vector<uint32_t>(),
+                      std::vector<uint32_t>(),
+                      std::vector<uint32_t>(),
+                      0,0,0,0,
+                      nullptr,
+                      nullptr, nullptr,
+                      0,
+                      };
+  device.json_buffer = new DynamicJsonBuffer();
+  _devices.push_back(device);
+  dirty();
+  return _devices.back();
+}
+# 256 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findShortAddr(uint16_t shortaddr) const {
+  if (!shortaddr) { return -1; }
+  int32_t found = 0;
+  if (shortaddr) {
+    for (auto &elem : _devices) {
+      if (elem.shortaddr == shortaddr) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+# 275 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findLongAddr(uint64_t longaddr) const {
+  if (!longaddr) { return -1; }
+  int32_t found = 0;
+  if (longaddr) {
+    for (auto &elem : _devices) {
+      if (elem.longaddr == longaddr) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+# 294 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+int32_t Z_Devices::findFriendlyName(const char * name) const {
+  if (!name) { return -1; }
+  size_t name_len = strlen(name);
+  int32_t found = 0;
+  if (name_len) {
+    for (auto &elem : _devices) {
+      if (elem.friendlyName == name) { return found; }
+      found++;
+    }
+  }
+  return -1;
+}
+
+
+uint16_t Z_Devices::isKnownShortAddr(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownLongAddr(uint64_t longaddr) const {
+  int32_t found = findLongAddr(longaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownIndex(uint32_t index) const {
+  if (index < devicesSize()) {
+    const Z_Device & device = devicesAt(index);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
+  if ((!name) || (0 == strlen(name))) { return 0xFFFF; }
+  int32_t found = findFriendlyName(name);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    return device.shortaddr;
+  } else {
+    return 0;
+  }
+}
+
+uint64_t Z_Devices::getDeviceLongAddr(uint16_t shortaddr) const {
+  const Z_Device & device = getShortAddrConst(shortaddr);
+  return device.longaddr;
+}
+
+
+
+
+Z_Device & Z_Devices::getShortAddr(uint16_t shortaddr) {
+  if (!shortaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return _devices[found];
+  }
+
+  return createDeviceEntry(shortaddr, 0);
+}
+
+const Z_Device & Z_Devices::getShortAddrConst(uint16_t shortaddr) const {
+  if (!shortaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    return _devices[found];
+  }
+  return *((Z_Device*)nullptr);
+}
+
+
+Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
+  if (!longaddr) { return *(Z_Device*) nullptr; }
+  int32_t found = findLongAddr(longaddr);
+  if (found > 0) {
+    return _devices[found];
+  }
+  return createDeviceEntry(0, longaddr);
+}
+
+
+bool Z_Devices::removeDevice(uint16_t shortaddr) {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    _devices.erase(_devices.begin() + found);
+    dirty();
+    return true;
+  }
+  return false;
+}
+
+
+
+
+
+
+void Z_Devices::updateDevice(uint16_t shortaddr, uint64_t longaddr) {
+  int32_t s_found = findShortAddr(shortaddr);
+  int32_t l_found = findLongAddr(longaddr);
+
+  if ((s_found >= 0) && (l_found >= 0)) {
+    if (s_found == l_found) {
+      updateLastSeen(shortaddr);
+    } else {
+
+      _devices[l_found].shortaddr = shortaddr;
+
+      _devices.erase(_devices.begin() + s_found);
+      updateLastSeen(shortaddr);
+      dirty();
+    }
+  } else if (s_found >= 0) {
+
+
+    _devices[s_found].longaddr = longaddr;
+    updateLastSeen(shortaddr);
+    dirty();
+  } else if (l_found >= 0) {
+
+    _devices[l_found].shortaddr = shortaddr;
+    dirty();
+  } else {
+
+    if (shortaddr || longaddr) {
+      createDeviceEntry(shortaddr, longaddr);
+    }
+  }
+}
+
+
+
+
+void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
+  if (!shortaddr) { return; }
+  uint32_t ep_profile = (endpoint << 16);
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (findEndpointInVector(device.endpoints, endpoint) < 0) {
+    device.endpoints.push_back(ep_profile);
+    dirty();
+  }
+}
+
+void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId) {
+  if (!shortaddr) { return; }
+  uint32_t ep_profile = (endpoint << 16) | profileId;
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  int32_t found = findEndpointInVector(device.endpoints, endpoint);
+  if (found < 0) {
+    device.endpoints.push_back(ep_profile);
+    dirty();
+  } else {
+    if (device.endpoints[found] != ep_profile) {
+      device.endpoints[found] = ep_profile;
+      dirty();
+    }
+  }
+}
+
+void Z_Devices::addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out) {
+  if (!shortaddr) { return; }
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  uint32_t ep_cluster = (endpoint << 16) | cluster;
+  if (!out) {
+    if (!findInVector(device.clusters_in, ep_cluster)) {
+      device.clusters_in.push_back(ep_cluster);
+      dirty();
+    }
+  } else {
+    if (!findInVector(device.clusters_out, ep_cluster)) {
+      device.clusters_out.push_back(ep_cluster);
+      dirty();
+    }
+  }
+}
+
+
+
+uint8_t Z_Devices::findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster){
+  int32_t short_found = findShortAddr(shortaddr);
+  if (short_found < 0) return 0;
+  Z_Device &device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return 0; }
+  int32_t found = findClusterEndpoint(device.clusters_in, cluster);
+  if (found >= 0) {
+    return (device.clusters_in[found] >> 16) & 0xFF;
+  } else {
+    return 0;
+  }
+}
+
+
+void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.manufacturerId.equals(str)) {
+    dirty();
+  }
+  device.manufacturerId = str;
+}
+void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.modelId.equals(str)) {
+    dirty();
+  }
+  device.modelId = str;
+}
+void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+  if (!device.friendlyName.equals(str)) {
+    dirty();
+  }
+  device.friendlyName = str;
+}
+
+const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    if (device.friendlyName.length() > 0) {
+      return &device.friendlyName;
+    }
+  }
+  return nullptr;
+}
+
+
+void Z_Devices::updateLastSeen(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  _updateLastSeen(device);
+}
+
+
+uint8_t Z_Devices::getNextSeqNumber(uint16_t shortaddr) {
+  int32_t short_found = findShortAddr(shortaddr);
+  if (short_found >= 0) {
+    Z_Device &device = getShortAddr(shortaddr);
+    device.seqNumber += 1;
+    return device.seqNumber;
+  } else {
+    _seqNumber += 1;
+    return _seqNumber;
+  }
+}
+
+
+
+
+void Z_Devices::resetTimer(uint32_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  device.timer = 0;
+  device.func = nullptr;
+}
+
+
+void Z_Devices::setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+
+  device.cluster = cluster;
+  device.endpoint = endpoint;
+  device.value = value;
+  device.func = func;
+  device.timer = wait_ms + millis();
+}
+
+
+void Z_Devices::runTimer(void) {
+  for (std::vector<Z_Device>::iterator it = _devices.begin(); it != _devices.end(); ++it) {
+    Z_Device &device = *it;
+    uint16_t shortaddr = device.shortaddr;
+
+    uint32_t timer = device.timer;
+    if ((timer) && TimeReached(timer)) {
+      device.timer = 0;
+
+      (*device.func)(device.shortaddr, device.cluster, device.endpoint, device.value);
+    }
+  }
+
+  if ((_saveTimer) && TimeReached(_saveTimer)) {
+    saveZigbeeDevices();
+    _saveTimer = 0;
+  }
+}
+
+void Z_Devices::jsonClear(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+
+  device.json = nullptr;
+  device.json_buffer->clear();
+}
+
+void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val) {
+  to.remove(key);
+
+  if (val.is<char*>()) {
+    String sval = val.as<String>();
+    to.set(key, sval);
+  } else if (val.is<JsonArray>()) {
+    JsonArray &nested_arr = to.createNestedArray(key);
+    CopyJsonArray(nested_arr, val.as<JsonArray>());
+  } else if (val.is<JsonObject>()) {
+    JsonObject &nested_obj = to.createNestedObject(key);
+    CopyJsonObject(nested_obj, val.as<JsonObject>());
+  } else {
+    to.set(key, val);
+  }
+}
+
+void CopyJsonArray(JsonArray &to, const JsonArray &arr) {
+  for (auto v : arr) {
+    if (v.is<char*>()) {
+      String sval = v.as<String>();
+      to.add(sval);
+    } else if (v.is<JsonArray>()) {
+    } else if (v.is<JsonObject>()) {
+    } else {
+      to.add(v);
+    }
+  }
+}
+
+void CopyJsonObject(JsonObject &to, const JsonObject &from) {
+  for (auto kv : from) {
+    String key_string = kv.key;
+    JsonVariant &val = kv.value;
+
+    CopyJsonVariant(to, key_string, val);
+  }
+}
+
+
+bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return false; }
+  if (&values == nullptr) { return false; }
+
+  if (nullptr == device.json) {
+    return false;
+  }
+
+  for (auto kv : values) {
+    String key_string = kv.key;
+
+    if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {
+      if (device.json->containsKey(kv.key)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  if (&values == nullptr) { return; }
+
+  if (nullptr == device.json) {
+    device.json = &(device.json_buffer->createObject());
+  }
+
+  char sa[8];
+  snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
+  device.json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
+
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  if (fname) {
+    device.json->set(F(D_JSON_ZIGBEE_NAME), (char*)fname->c_str());
+  }
+
+
+  CopyJsonObject(*device.json, values);
+}
+
+const JsonObject *Z_Devices::jsonGet(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return nullptr; }
+  return device.json;
+}
+
+void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
+  Z_Device & device = getShortAddr(shortaddr);
+  if (&device == nullptr) { return; }
+  JsonObject * json = device.json;
+  if (json == nullptr) { return; }
+
+  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
+  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);
+# 718 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
+  if (use_fname) {
+    json->remove(F(D_JSON_ZIGBEE_NAME));
+  } else {
+    json->remove(F(D_JSON_ZIGBEE_DEVICE));
+  }
+
+  String msg = "";
+  json->printTo(msg);
+  zigbee_devices.jsonClear(shortaddr);
+
+  if (use_fname) {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+#if ZIGBEERECEIVED
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+#endif
+  } else {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+#if ZIGBEERECEIVED
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+    XdrvRulesProcess();
+#endif
+  }
+
+
+}
+
+void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
+  jsonPublishFlush(shortaddr);
+  jsonAppend(shortaddr, values);
+  jsonPublishFlush(shortaddr);
+}
+
+void Z_Devices::dirty(void) {
+  _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
+}
+void Z_Devices::clean(void) {
+  _saveTimer = 0;
+}
+
+
+
+
+
+
+uint16_t Z_Devices::parseDeviceParam(const char * param, bool short_must_be_known) const {
+  if (nullptr == param) { return 0; }
+  size_t param_len = strlen(param);
+  char dataBuf[param_len + 1];
+  strcpy(dataBuf, param);
+  RemoveSpace(dataBuf);
+  uint16_t shortaddr = 0;
+
+  if (strlen(dataBuf) < 4) {
+
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 99)) {
+      shortaddr = zigbee_devices.isKnownIndex(XdrvMailbox.payload - 1);
+    }
+  } else if ((dataBuf[0] == '0') && (dataBuf[1] == 'x')) {
+
+    if (strlen(dataBuf) < 18) {
+
+      shortaddr = strtoull(dataBuf, nullptr, 0);
+      if (short_must_be_known) {
+        shortaddr = zigbee_devices.isKnownShortAddr(shortaddr);
+      }
+
+    } else {
+
+      uint64_t longaddr = strtoull(dataBuf, nullptr, 0);
+      shortaddr = zigbee_devices.isKnownLongAddr(longaddr);
+    }
+  } else {
+
+    shortaddr = zigbee_devices.isKnownFriendlyName(dataBuf);
+  }
+
+  return shortaddr;
+}
+
+
+
+
+
+String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
+  DynamicJsonBuffer jsonBuffer;
+  JsonArray& json = jsonBuffer.createArray();
+  JsonArray& devices = json;
+
+  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it) {
+    const Z_Device& device = *it;
+    uint16_t shortaddr = device.shortaddr;
+    char hex[22];
+
+
+    if ((status_shortaddr) && (status_shortaddr != shortaddr)) { continue; }
+
+    JsonObject& dev = devices.createNestedObject();
+
+    snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), shortaddr);
+    dev[F(D_JSON_ZIGBEE_DEVICE)] = hex;
+
+    if (device.friendlyName.length() > 0) {
+      dev[F(D_JSON_ZIGBEE_NAME)] = device.friendlyName;
+    }
+
+    if (2 <= dump_mode) {
+      hex[0] = '0';
+      hex[1] = 'x';
+      Uint64toHex(device.longaddr, &hex[2], 64);
+      dev[F("IEEEAddr")] = hex;
+      if (device.modelId.length() > 0) {
+        dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
+      }
+      if (device.manufacturerId.length() > 0) {
+        dev[F("Manufacturer")] = device.manufacturerId;
+      }
+    }
+
+
+    if (3 <= dump_mode) {
+      JsonObject& dev_endpoints = dev.createNestedObject(F("Endpoints"));
+      for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
+        uint32_t ep_profile = *ite;
+        uint8_t endpoint = (ep_profile >> 16) & 0xFF;
+        uint16_t profileId = ep_profile & 0xFFFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonObject& ep = dev_endpoints.createNestedObject(hex);
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), profileId);
+        ep[F("ProfileId")] = hex;
+
+        int32_t found = -1;
+        for (uint32_t i = 0; i < sizeof(Z_ProfileIds) / sizeof(Z_ProfileIds[0]); i++) {
+          if (pgm_read_word(&Z_ProfileIds[i]) == profileId) {
+            found = i;
+            break;
+          }
+        }
+        if (found > 0) {
+          GetTextIndexed(hex, sizeof(hex), found, Z_ProfileNames);
+          ep[F("ProfileIdName")] = hex;
+        }
+
+        ep.createNestedArray(F("ClustersIn"));
+        ep.createNestedArray(F("ClustersOut"));
+      }
+
+      for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
+        uint16_t cluster = *itc & 0xFFFF;
+        uint8_t endpoint = (*itc >> 16) & 0xFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersIn")];
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
+        cluster_arr.add(hex);
+      }
+
+      for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
+        uint16_t cluster = *itc & 0xFFFF;
+        uint8_t endpoint = (*itc >> 16) & 0xFF;
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
+        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersOut")];
+
+        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
+        cluster_arr.add(hex);
+      }
+    }
+  }
+  String payload = "";
+  payload.reserve(200);
+  json.printTo(payload);
+  return payload;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+#ifdef USE_ZIGBEE
+# 50 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
+const static uint16_t z_spi_start_sector = 0xFF;
+const static uint8_t* z_spi_start = (uint8_t*) 0x402FF000;
+const static uint8_t* z_dev_start = z_spi_start + 0x0800;
+const static size_t z_spi_len = 0x1000;
+const static size_t z_block_offset = 0x0800;
+const static size_t z_block_len = 0x0800;
+
+class z_flashdata_t {
+public:
+  uint32_t name;
+  uint16_t len;
+  uint16_t reserved;
+};
+
+const static uint32_t ZIGB_NAME = 0x3167697A;
+const static size_t Z_MAX_FLASH = z_block_len - sizeof(z_flashdata_t);
+
+
+const uint16_t Z_ClusterNumber[] PROGMEM = {
+  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+  0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+  0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+  0x0100, 0x0101, 0x0102,
+  0x0201, 0x0202, 0x0203, 0x0204,
+  0x0300, 0x0301,
+  0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406,
+  0x0500, 0x0501, 0x0502,
+  0x0700, 0x0701, 0x0702,
+  0x0B00, 0x0B01, 0x0B02, 0x0B03, 0x0B04, 0x0B05,
+  0x1000,
+  0xFC0F,
+};
+
+
+uint16_t fromClusterCode(uint8_t c) {
+  if (c >= sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0])) {
+    return 0xFFFF;
+  }
+  return pgm_read_word(&Z_ClusterNumber[c]);
+}
+
+
+uint8_t toClusterCode(uint16_t c) {
+  for (uint32_t i = 0; i < sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0]); i++) {
+    if (c == pgm_read_word(&Z_ClusterNumber[i])) {
+      return i;
+    }
+  }
+  return 0xFF;
+}
+
+class SBuffer hibernateDevice(const struct Z_Device &device) {
+  SBuffer buf(128);
+
+  buf.add8(0x00);
+  buf.add16(device.shortaddr);
+  buf.add64(device.longaddr);
+  uint32_t endpoints = device.endpoints.size();
+  if (endpoints > 254) { endpoints = 254; }
+  buf.add8(endpoints);
+
+  for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
+    uint32_t ep_profile = *ite;
+    uint8_t endpoint = (ep_profile >> 16) & 0xFF;
+    uint16_t profileId = ep_profile & 0xFFFF;
+
+    buf.add8(endpoint);
+    buf.add16(profileId);
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);
+
+    for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
+      uint16_t cluster = *itc & 0xFFFF;
+      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
+
+      if (endpoint == c_endpoint) {
+        uint8_t clusterCode = toClusterCode(cluster);
+        if (0xFF != clusterCode) { buf.add8(clusterCode); }
+      }
+    }
+    buf.add8(0xFF);
+  }
+
+
+  size_t model_len = device.modelId.length();
+  if (model_len > 32) { model_len = 32; }
+  buf.addBuffer(device.modelId.c_str(), model_len);
+  buf.add8(0x00);
+
+
+  size_t manuf_len = device.manufacturerId.length();
+  if (manuf_len > 32) {manuf_len = 32; }
+  buf.addBuffer(device.manufacturerId.c_str(), manuf_len);
+  buf.add8(0x00);
+
+
+  size_t frname_len = device.friendlyName.length();
+  if (frname_len > 32) {frname_len = 32; }
+  buf.addBuffer(device.friendlyName.c_str(), frname_len);
+  buf.add8(0x00);
+
+
+  buf.set8(0, buf.len());
+
+  return buf;
+}
+
+class SBuffer hibernateDevices(void) {
+  SBuffer buf(2048);
+
+  size_t devices_size = zigbee_devices.devicesSize();
+  if (devices_size > 32) { devices_size = 32; }
+  buf.add8(devices_size);
+
+  for (uint32_t i = 0; i < devices_size; i++) {
+    const Z_Device & device = zigbee_devices.devicesAt(i);
+    const SBuffer buf_device = hibernateDevice(device);
+    buf.addBuffer(buf_device);
+  }
+
+  size_t buf_len = buf.len();
+  if (buf_len > 2040) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Devices list too big to fit in Flash (%d)"), buf_len);
+  }
+
+
+  char *hex_char = (char*) malloc((buf_len * 2) + 2);
+  if (hex_char) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZbFlashStore %s"),
+                                    ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
+    free(hex_char);
+  }
+
+  return buf;
+}
+
+void hidrateDevices(const SBuffer &buf) {
+  uint32_t buf_len = buf.len();
+  if (buf_len <= 10) { return; }
+
+  uint32_t k = 0;
+  uint32_t num_devices = buf.get8(k++);
+
+  for (uint32_t i = 0; (i < num_devices) && (k < buf_len); i++) {
+    uint32_t dev_record_len = buf.get8(k);
+
+    SBuffer buf_d = buf.subBuffer(k, dev_record_len);
+
+    uint32_t d = 1;
+    uint16_t shortaddr = buf_d.get16(d); d += 2;
+    uint64_t longaddr = buf_d.get64(d); d += 8;
+    zigbee_devices.updateDevice(shortaddr, longaddr);
+
+    uint32_t endpoints = buf_d.get8(d++);
+    for (uint32_t j = 0; j < endpoints; j++) {
+      uint8_t ep = buf_d.get8(d++);
+      uint16_t ep_profile = buf_d.get16(d); d += 2;
+      zigbee_devices.addEndointProfile(shortaddr, ep, ep_profile);
+
+
+      while (d < dev_record_len) {
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), false);
+      }
+
+      while (d < dev_record_len) {
+        uint8_t ep_cluster = buf_d.get8(d++);
+        if (0xFF == ep_cluster) { break; }
+        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), true);
+      }
+    }
+
+
+    char empty[] = "";
+
+
+    uint32_t s_len = buf_d.strlen_s(d);
+    char *ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setModelId(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setManufId(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    s_len = buf_d.strlen_s(d);
+    ptr = s_len ? buf_d.charptr(d) : empty;
+    zigbee_devices.setFriendlyName(shortaddr, ptr);
+    d += s_len + 1;
+
+
+    k += dev_record_len;
+  }
+}
+
+void loadZigbeeDevices(void) {
+  z_flashdata_t flashdata;
+  memcpy_P(&flashdata, z_dev_start, sizeof(z_flashdata_t));
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "Zigbee signature in Flash: %08X - %d"), flashdata.name, flashdata.len);
+
+
+  if ((flashdata.name == ZIGB_NAME) && (flashdata.len > 0)) {
+    uint16_t buf_len = flashdata.len;
+
+    SBuffer buf(buf_len);
+    buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
+    hidrateDevices(buf);
+    zigbee_devices.clean();
+  } else {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
+  }
+}
+
+void saveZigbeeDevices(void) {
+  SBuffer buf = hibernateDevices();
+  size_t buf_len = buf.len();
+  if (buf_len > Z_MAX_FLASH) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Buffer too big to fit in Flash (%d bytes)"), buf_len);
+    return;
+  }
+
+
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+  z_flashdata_t *flashdata = (z_flashdata_t*)(spi_buffer + z_block_offset);
+  flashdata->name = ZIGB_NAME;
+  flashdata->len = buf_len;
+  flashdata->reserved = 0;
+
+  memcpy(spi_buffer + z_block_offset + sizeof(z_flashdata_t), buf.getBuffer(), buf_len);
+
+
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
+}
+
+
+void eraseZigbeeDevices(void) {
+  zigbee_devices.clean();
+
+  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
+  if (!spi_buffer) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
+    return;
+  }
+
+  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+
+
+  memset(spi_buffer + z_block_offset, 0xFF, z_block_len);
+
+
+  if (ESP.flashEraseSector(z_spi_start_sector)) {
+    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
+  }
+
+  free(spi_buffer);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (0x%08X - %d bytes)"), z_dev_start, z_block_len);
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+#ifdef USE_ZIGBEE
+
+
+
+
+
+typedef union ZCLHeaderFrameControl_t {
+  struct {
+    uint8_t frame_type : 2;
+    uint8_t manuf_specific : 1;
+    uint8_t direction : 1;
+    uint8_t disable_def_resp : 1;
+    uint8_t reserved : 3;
+  } b;
+  uint32_t d8;
+} ZCLHeaderFrameControl_t;
+
+
+class ZCLFrame {
+public:
+
+  ZCLFrame(uint8_t frame_control, uint16_t manuf_code, uint8_t transact_seq, uint8_t cmd_id,
+    const char *buf, size_t buf_len, uint16_t clusterid, uint16_t groupid,
+    uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+    uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+    uint32_t timestamp):
+    _cmd_id(cmd_id), _manuf_code(manuf_code), _transact_seq(transact_seq),
+    _payload(buf_len ? buf_len : 250),
+    _cluster_id(clusterid), _group_id(groupid),
+    _srcaddr(srcaddr), _srcendpoint(srcendpoint), _dstendpoint(dstendpoint), _wasbroadcast(wasbroadcast),
+    _linkquality(linkquality), _securityuse(securityuse), _seqnumber(seqnumber),
+    _timestamp(timestamp)
+    {
+      _frame_control.d8 = frame_control;
+      _payload.addBuffer(buf, buf_len);
+    };
+
+
+  void log(void) {
+    char hex_char[_payload.len()*2+2];
+  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
+    Response_P(PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
+                    "\"groupid\":%d," "\"clusterid\":%d," "\"srcaddr\":\"0x%04X\","
+                    "\"srcendpoint\":%d," "\"dstendpoint\":%d," "\"wasbroadcast\":%d,"
+                    "\"" D_CMND_ZIGBEE_LINKQUALITY "\":%d," "\"securityuse\":%d," "\"seqnumber\":%d,"
+                    "\"timestamp\":%d,"
+                    "\"fc\":\"0x%02X\",\"manuf\":\"0x%04X\",\"transact\":%d,"
+                    "\"cmdid\":\"0x%02X\",\"payload\":\"%s\"}}"),
+                    _group_id, _cluster_id, _srcaddr,
+                    _srcendpoint, _dstendpoint, _wasbroadcast,
+                    _linkquality, _securityuse, _seqnumber,
+                    _timestamp,
+                    _frame_control, _manuf_code, _transact_seq, _cmd_id,
+                    hex_char);
+    if (Settings.flag3.tuya_serial_mqtt_publish) {
+      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+      XdrvRulesProcess();
+    } else {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+    }
+  }
+
+  static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
+                                uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
+                                uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
+                                uint32_t timestamp) {
+    uint32_t i = offset;
+    ZCLHeaderFrameControl_t frame_control;
+    uint16_t manuf_code = 0;
+    uint8_t transact_seq;
+    uint8_t cmd_id;
+
+    frame_control.d8 = buf.get8(i++);
+    if (frame_control.b.manuf_specific) {
+      manuf_code = buf.get16(i);
+      i += 2;
+    }
+    transact_seq = buf.get8(i++);
+    cmd_id = buf.get8(i++);
+    ZCLFrame zcl_frame(frame_control.d8, manuf_code, transact_seq, cmd_id,
+                       (const char *)(buf.buf() + i), len + offset - i,
+                       clusterid, groupid,
+                       srcaddr, srcendpoint, dstendpoint, wasbroadcast,
+                       linkquality, securityuse, seqnumber,
+                       timestamp);
+    return zcl_frame;
+  }
+
+  bool isClusterSpecificCommand(void) {
+    return _frame_control.b.frame_type & 1;
+  }
+
+  static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
+  void parseRawAttributes(JsonObject& json, uint8_t offset = 0);
+  void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
+  void parseClusterSpecificCommand(JsonObject& json, uint8_t offset = 0);
+  void postProcessAttributes(uint16_t shortaddr, JsonObject& json);
+
+  inline void setGroupId(uint16_t groupid) {
+    _group_id = groupid;
+  }
+
+  inline void setClusterId(uint16_t clusterid) {
+    _cluster_id = clusterid;
+  }
+
+  inline uint8_t getCmdId(void) const {
+    return _cmd_id;
+  }
+
+  inline uint16_t getClusterId(void) const {
+    return _cluster_id;
+  }
+
+  inline uint16_t getSrcEndpoint(void) const {
+    return _srcendpoint;
+  }
+
+  const SBuffer &getPayload(void) const {
+    return _payload;
+  }
+
+  uint16_t getManufCode(void) const {
+    return _manuf_code;
+  }
+
+private:
+  ZCLHeaderFrameControl_t _frame_control = { .d8 = 0 };
+  uint16_t _manuf_code = 0;
+  uint8_t _transact_seq = 0;
+  uint8_t _cmd_id = 0;
+  uint16_t _cluster_id = 0;
+  uint16_t _group_id = 0;
+  SBuffer _payload;
+
+  uint16_t _srcaddr;
+  uint8_t _srcendpoint;
+  uint8_t _dstendpoint;
+  uint8_t _wasbroadcast;
+  uint8_t _linkquality;
+  uint8_t _securityuse;
+  uint8_t _seqnumber;
+  uint32_t _timestamp;
+};
+
+
+
+
+
+
+uint8_t toPercentageCR2032(uint32_t voltage) {
+  uint32_t percentage;
+  if (voltage < 2100) {
+      percentage = 0;
+  } else if (voltage < 2440) {
+      percentage = 6 - ((2440 - voltage) * 6) / 340;
+  } else if (voltage < 2740) {
+      percentage = 18 - ((2740 - voltage) * 12) / 300;
+  } else if (voltage < 2900) {
+      percentage = 42 - ((2900 - voltage) * 24) / 160;
+  } else if (voltage < 3000) {
+      percentage = 100 - ((3000 - voltage) * 58) / 100;
+  } else if (voltage >= 3000) {
+      percentage = 100;
+  }
+  return percentage;
+}
+
+
+uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
+                              uint32_t offset, uint32_t len) {
+
+  uint32_t i = offset;
+  uint32_t attrtype = buf.get8(i++);
+
+
+  json[attrid_str] = (char*) nullptr;
+
+
+  switch (attrtype) {
+    case 0x00:
+    case 0xFF:
+      break;
+    case 0x10:
+      {
+        uint8_t val_bool = buf.get8(i++);
+        if (0xFF != val_bool) {
+          json[attrid_str] = (bool) (val_bool ? true : false);
+        }
+      }
+      break;
+    case 0x20:
+      {
+        uint8_t uint8_val = buf.get8(i);
+        i += 1;
+        if (0xFF != uint8_val) {
+          json[attrid_str] = uint8_val;
+        }
+      }
+      break;
+    case 0x21:
+      {
+        uint16_t uint16_val = buf.get16(i);
+        i += 2;
+        if (0xFFFF != uint16_val) {
+          json[attrid_str] = uint16_val;
+        }
+      }
+      break;
+    case 0x23:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        i += 4;
+        if (0xFFFFFFFF != uint32_val) {
+          json[attrid_str] = uint32_val;
+        }
+      }
+      break;
+
+    case 0x24:
+    case 0x25:
+    case 0x26:
+    case 0x27:
+      {
+        uint8_t len = attrtype - 0x1F;
+
+        char hex[2*len+1];
+        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+        json[attrid_str] = hex;
+        i += len;
+      }
+      break;
+    case 0x28:
+      {
+        int8_t int8_val = buf.get8(i);
+        i += 1;
+        if (0x80 != int8_val) {
+          json[attrid_str] = int8_val;
+        }
+      }
+      break;
+    case 0x29:
+      {
+        int16_t int16_val = buf.get16(i);
+        i += 2;
+        if (0x8000 != int16_val) {
+          json[attrid_str] = int16_val;
+        }
+      }
+      break;
+    case 0x2B:
+      {
+        int32_t int32_val = buf.get32(i);
+        i += 4;
+        if (0x80000000 != int32_val) {
+          json[attrid_str] = int32_val;
+        }
+      }
+      break;
+
+    case 0x2C:
+    case 0x2D:
+    case 0x2E:
+    case 0x2F:
+      {
+        uint8_t len = attrtype - 0x27;
+
+        char hex[2*len+1];
+        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+        json[attrid_str] = hex;
+        i += len;
+      }
+      break;
+
+    case 0x41:
+    case 0x42:
+    case 0x43:
+    case 0x44:
+
+      {
+        bool parse_as_string = true;
+        uint32_t len = (attrtype <= 0x42) ? buf.get8(i) : buf.get16(i);
+        i += (attrtype <= 0x42) ? 1 : 2;
+        if (i + len > buf.len()) {
+          len = buf.len() - i;
+        }
+
+
+        if ((0x41 == attrtype) || (0x43 == attrtype)) { parse_as_string = false; }
+# 318 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+        if (parse_as_string) {
+          char str[len+1];
+          strncpy(str, buf.charptr(i), len);
+          str[len] = 0x00;
+          json[attrid_str] = str;
+        } else {
+
+          char hex[2*len+1];
+          ToHex_P(buf.buf(i), len, hex, sizeof(hex));
+          json[attrid_str] = hex;
+        }
+
+        i += len;
+        break;
+      }
+      i += buf.get8(i) + 1;
+      break;
+
+    case 0x08:
+    case 0x18:
+      {
+        uint8_t uint8_val = buf.get8(i);
+        i += 1;
+        json[attrid_str] = uint8_val;
+      }
+      break;
+    case 0x09:
+    case 0x19:
+      {
+        uint16_t uint16_val = buf.get16(i);
+        i += 2;
+        json[attrid_str] = uint16_val;
+      }
+      break;
+    case 0x0B:
+    case 0x1B:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        i += 4;
+        json[attrid_str] = uint32_val;
+      }
+      break;
+
+    case 0x30:
+    case 0x31:
+      i += attrtype - 0x2F;
+      break;
+
+
+    case 0x39:
+      {
+        uint32_t uint32_val = buf.get32(i);
+        float * float_val = (float*) &uint32_val;
+        i += 4;
+        json[attrid_str] = *float_val;
+      }
+      break;
+
+    case 0xE0:
+    case 0xE1:
+    case 0xE2:
+      i += 4;
+      break;
+
+    case 0xE8:
+    case 0xE9:
+      i += 2;
+      break;
+    case 0xEA:
+      i += 4;
+      break;
+
+    case 0xF0:
+      i += 8;
+      break;
+    case 0xF1:
+      i += 16;
+      break;
+
+
+    case 0x0A:
+    case 0x0C:
+    case 0x0D:
+    case 0x0E:
+    case 0x0F:
+      i += attrtype - 0x07;
+      break;
+
+    case 0x1A:
+    case 0x1C:
+    case 0x1D:
+    case 0x1E:
+    case 0x1F:
+      i += attrtype - 0x17;
+      break;
+
+    case 0x38:
+      i += 2;
+      break;
+    case 0x3A:
+      {
+        uint64_t uint64_val = buf.get64(i);
+        double * double_val = (double*) &uint64_val;
+        i += 8;
+        json[attrid_str] = *double_val;
+      }
+      break;
+  }
+
+
+
+
+
+
+  return i - offset;
+}
+
+
+void ZCLFrame::generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len) {
+  uint32_t suffix = 1;
+
+  snprintf_P(key, key_len, PSTR("%04X/%04X"), cluster, attr);
+  while (json.containsKey(key)) {
+    suffix++;
+    snprintf_P(key, key_len, PSTR("%04X/%04X+%d"), cluster, attr, suffix);
+  }
+}
+
+
+void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
+  uint32_t i = offset;
+  uint32_t len = _payload.len();
+
+  while (len >= i + 3) {
+    uint16_t attrid = _payload.get16(i);
+    i += 2;
+
+    char key[16];
+    generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
+
+
+    if ((0x0000 == _cluster_id) && (0xFF01 == attrid)) {
+      if (0x42 == _payload.get8(i)) {
+        _payload.set8(i, 0x41);
+      }
+    }
+    i += parseSingleAttribute(json, key, _payload, i, len);
+  }
+}
+
+
+void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
+  uint32_t i = offset;
+  uint32_t len = _payload.len();
+
+  while (len - i >= 4) {
+    uint16_t attrid = _payload.get16(i);
+    i += 2;
+    uint8_t status = _payload.get8(i++);
+
+    if (0 == status) {
+      char key[16];
+      generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
+
+      i += parseSingleAttribute(json, key, _payload, i, len);
+    }
+  }
+}
+
+
+
+void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
+  convertClusterSpecific(json, _cluster_id, _cmd_id, _frame_control.b.direction, _payload);
+}
+
+
+
+
+typedef int32_t (*Z_AttrConverter)(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
+typedef struct Z_AttributeConverter {
+  uint16_t cluster;
+  uint16_t attribute;
+  const char * name;
+  Z_AttrConverter func;
+} Z_AttributeConverter;
+
+
+const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
+  { 0x0000, 0x0000, "ZCLVersion", &Z_Copy },
+  { 0x0000, 0x0001, "AppVersion", &Z_Copy },
+  { 0x0000, 0x0002, "StackVersion", &Z_Copy },
+  { 0x0000, 0x0003, "HWVersion", &Z_Copy },
+  { 0x0000, 0x0004, "Manufacturer", &Z_ManufKeep },
+  { 0x0000, 0x0005, D_JSON_MODEL D_JSON_ID, &Z_ModelKeep },
+  { 0x0000, 0x0006, "DateCode", &Z_Copy },
+  { 0x0000, 0x0007, "PowerSource", &Z_Copy },
+  { 0x0000, 0x4000, "SWBuildID", &Z_Copy },
+  { 0x0000, 0xFFFF, nullptr, &Z_Remove },
+
+  { 0x0000, 0xFF01, nullptr, &Z_AqaraSensor },
+
+
+  { 0x0001, 0x0000, "MainsVoltage", &Z_Copy },
+  { 0x0001, 0x0001, "MainsFrequency", &Z_Copy },
+  { 0x0001, 0x0020, "BatteryVoltage", &Z_Copy },
+  { 0x0001, 0x0021, "BatteryPercentageRemaining",&Z_Copy },
+
+
+  { 0x0002, 0x0000, "CurrentTemperature", &Z_Copy },
+  { 0x0002, 0x0001, "MinTempExperienced", &Z_Copy },
+  { 0x0002, 0x0002, "MaxTempExperienced", &Z_Copy },
+  { 0x0002, 0x0003, "OverTempTotalDwell", &Z_Copy },
+
+
+  { 0x0006, 0x0000, "Power", &Z_Copy },
+  { 0x0006, 0x8000, "Power", &Z_Copy },
+
+
+  { 0x0007, 0x0000, "SwitchType", &Z_Copy },
+
+
+  { 0x0008, 0x0000, "Dimmer", &Z_Copy },
+# 548 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+  { 0x0009, 0x0000, "AlarmCount", &Z_Copy },
+
+  { 0x000A, 0x0000, "Time", &Z_Copy },
+  { 0x000A, 0x0001, "TimeStatus", &Z_Copy },
+  { 0x000A, 0x0002, "TimeZone", &Z_Copy },
+  { 0x000A, 0x0003, "DstStart", &Z_Copy },
+  { 0x000A, 0x0004, "DstStart", &Z_Copy },
+  { 0x000A, 0x0005, "DstShift", &Z_Copy },
+  { 0x000A, 0x0006, "StandardTime", &Z_Copy },
+  { 0x000A, 0x0007, "LocalTime", &Z_Copy },
+  { 0x000A, 0x0008, "LastSetTime", &Z_Copy },
+  { 0x000A, 0x0009, "ValidUntilTime", &Z_Copy },
+
+  { 0x000B, 0x0000, "LocationType", &Z_Copy },
+  { 0x000B, 0x0000, "LocationMethod", &Z_Copy },
+  { 0x000B, 0x0000, "LocationAge", &Z_Copy },
+  { 0x000B, 0x0000, "QualityMeasure", &Z_Copy },
+  { 0x000B, 0x0000, "NumberOfDevices", &Z_Copy },
+
+  { 0x000C, 0x0004, "ActiveText", &Z_Copy },
+  { 0x000C, 0x001C, "Description", &Z_Copy },
+  { 0x000C, 0x002E, "InactiveText", &Z_Copy },
+  { 0x000C, 0x0041, "MaxPresentValue", &Z_Copy },
+  { 0x000C, 0x0045, "MinPresentValue", &Z_Copy },
+  { 0x000C, 0x0051, "OutOfService", &Z_Copy },
+  { 0x000C, 0x0055, "AqaraRotate", &Z_Copy },
+  { 0x000C, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x000C, 0x0067, "Reliability", &Z_Copy },
+  { 0x000C, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x000C, 0x006A, "Resolution", &Z_Copy },
+  { 0x000C, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x000C, 0x0075, "EngineeringUnits", &Z_Copy },
+  { 0x000C, 0x0100, "ApplicationType", &Z_Copy },
+  { 0x000C, 0xFF05, "Aqara_FF05", &Z_Copy },
+
+  { 0x0010, 0x0004, "ActiveText", &Z_Copy },
+  { 0x0010, 0x001C, "Description", &Z_Copy },
+  { 0x0010, 0x002E, "InactiveText", &Z_Copy },
+  { 0x0010, 0x0042, "MinimumOffTime", &Z_Copy },
+  { 0x0010, 0x0043, "MinimumOnTime", &Z_Copy },
+  { 0x0010, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0010, 0x0054, "Polarity", &Z_Copy },
+  { 0x0010, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0010, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0010, 0x0067, "Reliability", &Z_Copy },
+  { 0x0010, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0010, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0010, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0011, 0x0004, "ActiveText", &Z_Copy },
+  { 0x0011, 0x001C, "Description", &Z_Copy },
+  { 0x0011, 0x002E, "InactiveText", &Z_Copy },
+  { 0x0011, 0x0042, "MinimumOffTime", &Z_Copy },
+  { 0x0011, 0x0043, "MinimumOnTime", &Z_Copy },
+  { 0x0011, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0011, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0011, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0011, 0x0067, "Reliability", &Z_Copy },
+  { 0x0011, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0011, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0011, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0012, 0x000E, "StateText", &Z_Copy },
+  { 0x0012, 0x001C, "Description", &Z_Copy },
+  { 0x0012, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0012, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0012, 0x0055, "PresentValue", &Z_AqaraCube },
+  { 0x0012, 0x0067, "Reliability", &Z_Copy },
+  { 0x0012, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0012, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0013, 0x000E, "StateText", &Z_Copy },
+  { 0x0013, 0x001C, "Description", &Z_Copy },
+  { 0x0013, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0013, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0013, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0013, 0x0057, "PriorityArray", &Z_Copy },
+  { 0x0013, 0x0067, "Reliability", &Z_Copy },
+  { 0x0013, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0013, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0013, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x0014, 0x000E, "StateText", &Z_Copy },
+  { 0x0014, 0x001C, "Description", &Z_Copy },
+  { 0x0014, 0x004A, "NumberOfStates", &Z_Copy },
+  { 0x0014, 0x0051, "OutOfService", &Z_Copy },
+  { 0x0014, 0x0055, "PresentValue", &Z_Copy },
+  { 0x0014, 0x0067, "Reliability", &Z_Copy },
+  { 0x0014, 0x0068, "RelinquishDefault", &Z_Copy },
+  { 0x0014, 0x006F, "StatusFlags", &Z_Copy },
+  { 0x0014, 0x0100, "ApplicationType", &Z_Copy },
+
+  { 0x001A, 0x0000, "TotalProfileNum", &Z_Copy },
+  { 0x001A, 0x0001, "MultipleScheduling", &Z_Copy },
+  { 0x001A, 0x0002, "EnergyFormatting", &Z_Copy },
+  { 0x001A, 0x0003, "EnergyRemote", &Z_Copy },
+  { 0x001A, 0x0004, "ScheduleMode", &Z_Copy },
+
+  { 0x0020, 0x0000, "CheckinInterval", &Z_Copy },
+  { 0x0020, 0x0001, "LongPollInterval", &Z_Copy },
+  { 0x0020, 0x0002, "ShortPollInterval", &Z_Copy },
+  { 0x0020, 0x0003, "FastPollTimeout", &Z_Copy },
+  { 0x0020, 0x0004, "CheckinIntervalMin", &Z_Copy },
+  { 0x0020, 0x0005, "LongPollIntervalMin", &Z_Copy },
+  { 0x0020, 0x0006, "FastPollTimeoutMax", &Z_Copy },
+
+  { 0x0100, 0x0000, "PhysicalClosedLimit", &Z_Copy },
+  { 0x0100, 0x0001, "MotorStepSize", &Z_Copy },
+  { 0x0100, 0x0002, "Status", &Z_Copy },
+  { 0x0100, 0x0010, "ClosedLimit", &Z_Copy },
+  { 0x0100, 0x0011, "Mode", &Z_Copy },
+
+  { 0x0101, 0x0000, "LockState", &Z_Copy },
+  { 0x0101, 0x0001, "LockType", &Z_Copy },
+  { 0x0101, 0x0002, "ActuatorEnabled", &Z_Copy },
+  { 0x0101, 0x0003, "DoorState", &Z_Copy },
+  { 0x0101, 0x0004, "DoorOpenEvents", &Z_Copy },
+  { 0x0101, 0x0005, "DoorClosedEvents", &Z_Copy },
+  { 0x0101, 0x0006, "OpenPeriod", &Z_Copy },
+
+  { 0x0101, 0x0055, "AqaraVibrationMode", &Z_AqaraVibration },
+  { 0x0101, 0x0503, "AqaraVibrationsOrAngle", &Z_Copy },
+  { 0x0101, 0x0505, "AqaraVibration505", &Z_Copy },
+  { 0x0101, 0x0508, "AqaraAccelerometer", &Z_AqaraVibration },
+
+  { 0x0102, 0x0000, "WindowCoveringType", &Z_Copy },
+  { 0x0102, 0x0001, "PhysicalClosedLimitLift",&Z_Copy },
+  { 0x0102, 0x0002, "PhysicalClosedLimitTilt",&Z_Copy },
+  { 0x0102, 0x0003, "CurrentPositionLift", &Z_Copy },
+  { 0x0102, 0x0004, "CurrentPositionTilt", &Z_Copy },
+  { 0x0102, 0x0005, "NumberofActuationsLift",&Z_Copy },
+  { 0x0102, 0x0006, "NumberofActuationsTilt",&Z_Copy },
+  { 0x0102, 0x0007, "ConfigStatus", &Z_Copy },
+  { 0x0102, 0x0008, "CurrentPositionLiftPercentage",&Z_Copy },
+  { 0x0102, 0x0009, "CurrentPositionTiltPercentage",&Z_Copy },
+  { 0x0102, 0x0010, "InstalledOpenLimitLift",&Z_Copy },
+  { 0x0102, 0x0011, "InstalledClosedLimitLift",&Z_Copy },
+  { 0x0102, 0x0012, "InstalledOpenLimitTilt", &Z_Copy },
+  { 0x0102, 0x0013, "InstalledClosedLimitTilt", &Z_Copy },
+  { 0x0102, 0x0014, "VelocityLift",&Z_Copy },
+  { 0x0102, 0x0015, "AccelerationTimeLift",&Z_Copy },
+  { 0x0102, 0x0016, "DecelerationTimeLift", &Z_Copy },
+  { 0x0102, 0x0017, "Mode",&Z_Copy },
+  { 0x0102, 0x0018, "IntermediateSetpointsLift",&Z_Copy },
+  { 0x0102, 0x0019, "IntermediateSetpointsTilt",&Z_Copy },
+
+
+  { 0x0300, 0x0000, "Hue", &Z_Copy },
+  { 0x0300, 0x0001, "Sat", &Z_Copy },
+  { 0x0300, 0x0002, "RemainingTime", &Z_Copy },
+  { 0x0300, 0x0003, "X", &Z_Copy },
+  { 0x0300, 0x0004, "Y", &Z_Copy },
+  { 0x0300, 0x0005, "DriftCompensation", &Z_Copy },
+  { 0x0300, 0x0006, "CompensationText", &Z_Copy },
+  { 0x0300, 0x0007, "CT", &Z_Copy },
+  { 0x0300, 0x0008, "ColorMode", &Z_Copy },
+  { 0x0300, 0x0010, "NumberOfPrimaries", &Z_Copy },
+  { 0x0300, 0x0011, "Primary1X", &Z_Copy },
+  { 0x0300, 0x0012, "Primary1Y", &Z_Copy },
+  { 0x0300, 0x0013, "Primary1Intensity", &Z_Copy },
+  { 0x0300, 0x0015, "Primary2X", &Z_Copy },
+  { 0x0300, 0x0016, "Primary2Y", &Z_Copy },
+  { 0x0300, 0x0017, "Primary2Intensity", &Z_Copy },
+  { 0x0300, 0x0019, "Primary3X", &Z_Copy },
+  { 0x0300, 0x001A, "Primary3Y", &Z_Copy },
+  { 0x0300, 0x001B, "Primary3Intensity", &Z_Copy },
+  { 0x0300, 0x0030, "WhitePointX", &Z_Copy },
+  { 0x0300, 0x0031, "WhitePointY", &Z_Copy },
+  { 0x0300, 0x0032, "ColorPointRX", &Z_Copy },
+  { 0x0300, 0x0033, "ColorPointRY", &Z_Copy },
+  { 0x0300, 0x0034, "ColorPointRIntensity", &Z_Copy },
+  { 0x0300, 0x0036, "ColorPointGX", &Z_Copy },
+  { 0x0300, 0x0037, "ColorPointGY", &Z_Copy },
+  { 0x0300, 0x0038, "ColorPointGIntensity", &Z_Copy },
+  { 0x0300, 0x003A, "ColorPointBX", &Z_Copy },
+  { 0x0300, 0x003B, "ColorPointBY", &Z_Copy },
+  { 0x0300, 0x003C, "ColorPointBIntensity", &Z_Copy },
+
+
+  { 0x0400, 0x0000, D_JSON_ILLUMINANCE, &Z_Copy },
+  { 0x0400, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0400, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0400, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0400, 0x0004, "LightSensorType", &Z_Copy },
+  { 0x0400, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0401, 0x0000, "LevelStatus", &Z_Copy },
+  { 0x0401, 0x0001, "LightSensorType", &Z_Copy },
+  { 0x0401, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0402, 0x0000, D_JSON_TEMPERATURE, &Z_FloatDiv100 },
+  { 0x0402, 0x0001, "MinMeasuredValue", &Z_FloatDiv100 },
+  { 0x0402, 0x0002, "MaxMeasuredValue", &Z_FloatDiv100 },
+  { 0x0402, 0x0003, "Tolerance", &Z_FloatDiv100 },
+  { 0x0402, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0403, 0x0000, D_JSON_PRESSURE_UNIT, &Z_AddPressureUnit },
+  { 0x0403, 0x0000, D_JSON_PRESSURE, &Z_Copy },
+  { 0x0403, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0403, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0403, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0403, 0x0010, "ScaledValue", &Z_Copy },
+  { 0x0403, 0x0011, "MinScaledValue", &Z_Copy },
+  { 0x0403, 0x0012, "MaxScaledValue", &Z_Copy },
+  { 0x0403, 0x0013, "ScaledTolerance", &Z_Copy },
+  { 0x0403, 0x0014, "Scale", &Z_Copy },
+  { 0x0403, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0404, 0x0000, D_JSON_FLOWRATE, &Z_FloatDiv10 },
+  { 0x0404, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0404, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0404, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0404, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0405, 0x0000, D_JSON_HUMIDITY, &Z_FloatDiv100 },
+  { 0x0405, 0x0001, "MinMeasuredValue", &Z_Copy },
+  { 0x0405, 0x0002, "MaxMeasuredValue", &Z_Copy },
+  { 0x0405, 0x0003, "Tolerance", &Z_Copy },
+  { 0x0405, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0406, 0x0000, OCCUPANCY, &Z_Copy },
+  { 0x0406, 0x0001, "OccupancySensorType", &Z_Copy },
+  { 0x0406, 0xFFFF, nullptr, &Z_Remove },
+
+
+  { 0x0B01, 0x0000, "CompanyName", &Z_Copy },
+  { 0x0B01, 0x0001, "MeterTypeID", &Z_Copy },
+  { 0x0B01, 0x0004, "DataQualityID", &Z_Copy },
+  { 0x0B01, 0x0005, "CustomerName", &Z_Copy },
+  { 0x0B01, 0x0006, "Model", &Z_Copy },
+  { 0x0B01, 0x0007, "PartNumber", &Z_Copy },
+  { 0x0B01, 0x000A, "SoftwareRevision", &Z_Copy },
+  { 0x0B01, 0x000C, "POD", &Z_Copy },
+  { 0x0B01, 0x000D, "AvailablePower", &Z_Copy },
+  { 0x0B01, 0x000E, "PowerThreshold", &Z_Copy },
+
+
+  { 0x0B05, 0x0000, "NumberOfResets", &Z_Copy },
+  { 0x0B05, 0x0001, "PersistentMemoryWrites",&Z_Copy },
+  { 0x0B05, 0x011C, "LastMessageLQI", &Z_Copy },
+  { 0x0B05, 0x011D, "LastMessageRSSI", &Z_Copy },
+
+};
+
+
+
+int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  zigbee_devices.setManufId(shortaddr, value.as<const char*>());
+  return 1;
+}
+
+int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  zigbee_devices.setModelId(shortaddr, value.as<const char*>());
+  return 1;
+}
+
+
+
+int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  return 1;
+}
+
+
+int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  return 1;
+}
+
+
+int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = F(D_UNIT_PRESSURE);
+  return 0;
+}
+
+
+int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = ((float)value) / 100.0f;
+  return 1;
+}
+
+int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = ((float)value) / 10.0f;
+  return 1;
+}
+
+
+int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+  json[F(OCCUPANCY)] = 0;
+  zigbee_devices.jsonPublishNow(shortaddr, json);
+}
+
+
+int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = value;
+  int32_t val = value;
+  const __FlashStringHelper *aqara_cube = F("AqaraCube");
+  const __FlashStringHelper *aqara_cube_side = F("AqaraCubeSide");
+  const __FlashStringHelper *aqara_cube_from_side = F("AqaraCubeFromSide");
+
+  switch (val) {
+    case 0:
+      json[aqara_cube] = F("shake");
+      break;
+    case 2:
+      json[aqara_cube] = F("wakeup");
+      break;
+    case 3:
+      json[aqara_cube] = F("fall");
+      break;
+    case 64 ... 127:
+      json[aqara_cube] = F("flip90");
+      json[aqara_cube_side] = val % 8;
+      json[aqara_cube_from_side] = (val - 64) / 8;
+      break;
+    case 128 ... 132:
+      json[aqara_cube] = F("flip180");
+      json[aqara_cube_side] = val - 128;
+      break;
+    case 256 ... 261:
+      json[aqara_cube] = F("slide");
+      json[aqara_cube_side] = val - 256;
+      break;
+    case 512 ... 517:
+      json[aqara_cube] = F("tap");
+      json[aqara_cube_side] = val - 512;
+      break;
+  }
+# 905 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
+  return 1;
+}
+
+
+int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+
+  switch (attr) {
+    case 0x0055:
+      {
+        int32_t ivalue = value;
+        const __FlashStringHelper * svalue;
+        switch (ivalue) {
+          case 1: svalue = F("vibrate"); break;
+          case 2: svalue = F("tilt"); break;
+          case 3: svalue = F("drop"); break;
+          default: svalue = F("unknown"); break;
+        }
+        json[new_name] = svalue;
+      }
+      break;
+
+
+
+
+    case 0x0508:
+      {
+
+
+        String hex = value;
+        SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+        int16_t x, y, z;
+        z = buf2.get16(0);
+        y = buf2.get16(2);
+        x = buf2.get16(4);
+        JsonArray& xyz = json.createNestedArray(new_name);
+        xyz.add(x);
+        xyz.add(y);
+        xyz.add(z);
+
+        float X = x;
+        float Y = y;
+        float Z = z;
+        int32_t Angle_X = 0.5f + atanf(X/sqrtf(z*z+y*y)) * f_180pi;
+        int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(x*x+z*z)) * f_180pi;
+        int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(x*x+y*y)) * f_180pi;
+
+
+
+        JsonArray& angles = json.createNestedArray(F("AqaraAngles"));
+        angles.add(Angle_X);
+        angles.add(Angle_Y);
+        angles.add(Angle_Z);
+      }
+      break;
+  }
+  return 1;
+}
+
+int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  String hex = value;
+  SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+  uint32_t i = 0;
+  uint32_t len = buf2.len();
+  char tmp[] = "tmp";
+
+  JsonVariant sub_value;
+
+  while (len - i >= 2) {
+    uint8_t attrid = buf2.get8(i++);
+
+    i += parseSingleAttribute(json, tmp, buf2, i, len);
+    float val = json[tmp];
+    json.remove(tmp);
+    if (0x01 == attrid) {
+      json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
+      json[F("Battery")] = toPercentageCR2032(val);
+    } else if (0 == zcl->getManufCode()) {
+
+      if (0x64 == attrid) {
+        json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
+      } else if (0x65 == attrid) {
+        json[F(D_JSON_HUMIDITY)] = val / 100.0f;
+      } else if (0x66 == attrid) {
+        json[F(D_JSON_PRESSURE)] = val / 100.0f;
+        json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);
+      } else if (0x01 == attrid) {
+        json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
+        json[F("Battery")] = toPercentageCR2032(val);
+      }
+    } else if (0x115F == zcl->getManufCode()) {
+
+      json[F("AqaraUnknown")] = val;
+    }
+  }
+  return 1;
+}
+
+
+void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
+
+  for (auto kv : json) {
+    String key_string = kv.key;
+    const char * key = key_string.c_str();
+    JsonVariant& value = kv.value;
+
+    char * delimiter = strchr(key, '/');
+    char * delimiter2 = strchr(key, '+');
+    if (delimiter) {
+      uint16_t attribute;
+      uint16_t suffix = 1;
+      uint16_t cluster = strtoul(key, &delimiter, 16);
+      if (!delimiter2) {
+        attribute = strtoul(delimiter+1, nullptr, 16);
+      } else {
+        attribute = strtoul(delimiter+1, &delimiter2, 16);
+        suffix = strtoul(delimiter2+1, nullptr, 10);
+      }
+
+
+      for (uint32_t i = 0; i < sizeof(Z_PostProcess) / sizeof(Z_PostProcess[0]); i++) {
+        const Z_AttributeConverter *converter = &Z_PostProcess[i];
+        uint16_t conv_cluster = pgm_read_word(&converter->cluster);
+        uint16_t conv_attribute = pgm_read_word(&converter->attribute);
+
+        if ((conv_cluster == cluster) &&
+            ((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) {
+          String new_name_str = converter->name;
+          if (suffix > 1) { new_name_str += suffix; }
+          int32_t drop = (*converter->func)(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute);
+          if (drop) {
+            json.remove(key);
+          }
+
+        }
+      }
+    }
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
+#ifdef USE_ZIGBEE
+
+typedef struct Z_CommandConverter {
+  const char * tasmota_cmd;
+  uint16_t cluster;
+  uint8_t cmd;
+  uint8_t direction;
+  const char * param;
+} Z_CommandConverter;
+
+typedef struct Z_XYZ_Var {
+  uint32_t x = 0;
+  uint32_t y = 0;
+  uint32_t z = 0;
+  uint8_t x_type = 0;
+  uint8_t y_type = 0;
+  uint8_t z_type = 0;
+} Z_XYZ_Var;
+
+
+const Z_CommandConverter Z_Commands[] = {
+
+  { "AddGroup", 0x0004, 0x00, 0x01, "xxxx00" },
+  { "ViewGroup", 0x0004, 0x01, 0x01, "xxxx" },
+  { "GetGroup", 0x0004, 0x02, 0x01, "01xxxx" },
+  { "GetAllGroups", 0x0004, 0x02, 0x01, "00" },
+  { "RemoveGroup", 0x0004, 0x03, 0x01, "xxxx" },
+  { "RemoveAllGroups",0x0004, 0x04, 0x01, "" },
+
+  { "Power", 0x0006, 0xFF, 0x01, "" },
+  { "Dimmer", 0x0008, 0x04, 0x01, "xx0A00" },
+  { "Dimmer+", 0x0008, 0x06, 0x01, "001902" },
+  { "Dimmer-", 0x0008, 0x06, 0x01, "011902" },
+  { "DimmerStop", 0x0008, 0x03, 0x01, "" },
+  { "ResetAlarm", 0x0009, 0x00, 0x01, "xxyyyy" },
+  { "ResetAllAlarms", 0x0009, 0x01, 0x01, "" },
+  { "Hue", 0x0300, 0x00, 0x01, "xx000A00" },
+  { "Sat", 0x0300, 0x03, 0x01, "xx0A00" },
+  { "HueSat", 0x0300, 0x06, 0x01, "xxyy0A00" },
+  { "Color", 0x0300, 0x07, 0x01, "xxxxyyyy0A00" },
+  { "CT", 0x0300, 0x0A, 0x01, "xxxx0A00" },
+  { "ShutterOpen", 0x0102, 0x00, 0x01, "" },
+  { "ShutterClose", 0x0102, 0x01, 0x01, "" },
+  { "ShutterStop", 0x0102, 0x02, 0x01, "" },
+  { "ShutterLift", 0x0102, 0x05, 0x01, "xx" },
+  { "ShutterTilt", 0x0102, 0x08, 0x01, "xx" },
+  { "Shutter", 0x0102, 0xFF, 0x01, "" },
+
+  { "Occupancy", 0xEF00, 0x01, 0x01, "xx"},
+
+  { "Dimmer", 0x0008, 0x00, 0x01, "xx" },
+  { "DimmerMove", 0x0008, 0x01, 0x01, "xx0A" },
+  { "DimmerStep", 0x0008, 0x02, 0x01, "xx190A00" },
+  { "DimmerMove", 0x0008, 0x05, 0x01, "xx0A" },
+  { "Dimmer+", 0x0008, 0x06, 0x01, "00" },
+  { "Dimmer-", 0x0008, 0x06, 0x01, "01" },
+  { "DimmerStop", 0x0008, 0x07, 0x01, "" },
+  { "HueMove", 0x0300, 0x01, 0x01, "xx19" },
+  { "HueStep", 0x0300, 0x02, 0x01, "xx190A00" },
+  { "SatMove", 0x0300, 0x04, 0x01, "xx19" },
+  { "SatStep", 0x0300, 0x05, 0x01, "xx190A" },
+  { "ColorMove", 0x0300, 0x08, 0x01, "xxxxyyyy" },
+  { "ColorStep", 0x0300, 0x09, 0x01, "xxxxyyyy0A00" },
+
+  { "ArrowClick", 0x0005, 0x07, 0x01, "xx" },
+  { "ArrowHold", 0x0005, 0x08, 0x01, "xx" },
+  { "ArrowRelease", 0x0005, 0x09, 0x01, "" },
+
+  { "ZoneStatusChange",0x0500, 0x00, 0x02, "xxxxyyzz" },
+
+  { "AddGroupResp", 0x0004, 0x00, 0x02, "xxyyyy" },
+  { "ViewGroupResp", 0x0004, 0x01, 0x02, "xxyyyy" },
+  { "GetGroupResp", 0x0004, 0x02, 0x02, "xxyyzzzz" },
+  { "RemoveGroup", 0x0004, 0x03, 0x02, "xxyyyy" },
+};
+
+
+#define ZLE(x) ((x) & 0xFF), ((x) >> 8)
+
+
+const uint8_t CLUSTER_0006[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };
+const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };
+
+
+int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  size_t attrs_len = 0;
+  const uint8_t* attrs = nullptr;
+
+  switch (cluster) {
+    case 0x0006:
+      attrs = CLUSTER_0006;
+      attrs_len = sizeof(CLUSTER_0006);
+      break;
+    case 0x0008:
+      attrs = CLUSTER_0008;
+      attrs_len = sizeof(CLUSTER_0008);
+      break;
+    case 0x0009:
+      attrs = CLUSTER_0009;
+      attrs_len = sizeof(CLUSTER_0009);
+      break;
+    case 0x0300:
+      attrs = CLUSTER_0300;
+      attrs_len = sizeof(CLUSTER_0300);
+      break;
+  }
+  if (attrs) {
+    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true , zigbee_devices.getNextSeqNumber(shortaddr));
+  }
+}
+
+
+void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
+  uint32_t wait_ms = 0;
+
+  switch (cluster) {
+    case 0x0006:
+    case 0x0009:
+      wait_ms = 200;
+      break;
+    case 0x0008:
+    case 0x0300:
+      wait_ms = 1050;
+      break;
+    case 0x0102:
+      wait_ms = 10000;
+      break;
+  }
+  if (wait_ms) {
+    zigbee_devices.setTimer(shortaddr, wait_ms, cluster, endpoint, 0 , &Z_ReadAttrCallback);
+  }
+}
+
+
+inline bool isXYZ(char c) {
+  return (c >= 'x') && (c <= 'z');
+}
+
+
+
+
+inline int8_t hexValue(char c) {
+  if ((c >= '0') && (c <= '9')) {
+    return c - '0';
+  }
+  if ((c >= 'A') && (c <= 'F')) {
+    return 10 + c - 'A';
+  }
+  if ((c >= 'a') && (c <= 'f')) {
+    return 10 + c - 'a';
+  }
+  return -1;
+}
+
+
+uint32_t parseHex_P(const char **data, size_t max_len = 8) {
+  uint32_t ret = 0;
+  for (uint32_t i = 0; i < max_len; i++) {
+    int8_t v = hexValue(pgm_read_byte(*data));
+    if (v < 0) { break; }
+    ret = (ret << 4) | v;
+    *data += 1;
+  }
+  return ret;
+}
+
+
+
+
+
+void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz) {
+  const char *p = model;
+  uint32_t v = 0;
+  char c = pgm_read_byte(p);
+  while (c) {
+    char c1 = pgm_read_byte(p+1);
+    if (!c1) { break; }
+    if (isXYZ(c) && (c == c1) && (v < payload.len())) {
+      uint8_t val = payload.get8(v);
+      switch (c) {
+        case 'x':
+          xyz->x = xyz->x | (val << (xyz->x_type * 8));
+          xyz->x_type++;
+          break;
+        case 'y':
+          xyz->y = xyz->y | (val << (xyz->y_type * 8));
+          xyz->y_type++;
+          break;
+        case 'z':
+          xyz->z = xyz->z | (val << (xyz->z_type * 8));
+          xyz->z_type++;
+          break;
+      }
+    }
+    p += 2;
+    v++;
+    c = pgm_read_byte(p);
+  }
+}
+# 231 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
+void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload) {
+  size_t hex_char_len = payload.len()*2+2;
+  char *hex_char = (char*) malloc(hex_char_len);
+  if (!hex_char) { return; }
+  ToHex_P((unsigned char*)payload.getBuffer(), payload.len(), hex_char, hex_char_len);
+
+  const __FlashStringHelper* command_name = nullptr;
+  Z_XYZ_Var xyz;
+
+
+  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
+    const Z_CommandConverter *conv = &Z_Commands[i];
+    if (conv->cluster == cluster) {
+
+      if ((0xFF == conv->cmd) || (cmd == conv->cmd)) {
+
+        if ((direction && (conv->direction & 0x02)) || (!direction && (conv->direction & 0x01))) {
+
+
+
+
+          const char * p = conv->param;
+
+          bool match = true;
+          for (uint8_t i = 0; i < payload.len(); i++) {
+            const char c1 = pgm_read_byte(p);
+            const char c2 = pgm_read_byte(p+1);
+
+            if ((0x00 == c1) || isXYZ(c1)) {
+              break;
+            }
+            const char * p2 = p;
+            uint32_t nextbyte = parseHex_P(&p2, 2);
+
+            if (nextbyte != payload.get8(i)) {
+              match = false;
+              break;
+            }
+            p += 2;
+          }
+          if (match) {
+            command_name = (const __FlashStringHelper*) conv->tasmota_cmd;
+            parseXYZ(conv->param, payload, &xyz);
+            if (0xFF == conv->cmd) {
+
+              xyz.z = xyz.y;
+              xyz.z_type = xyz.y_type;
+              xyz.y = xyz.x;
+              xyz.y_type = xyz.x_type;
+              xyz.x = cmd;
+              xyz.x_type = 1;
+            }
+            break;
+          }
+        }
+      }
+    }
+  }
+
+
+
+
+  char attrid_str[12];
+  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X%c%02X"), cluster, direction ? '<' : '!', cmd);
+  json[attrid_str] = hex_char;
+  free(hex_char);
+
+  if (command_name) {
+    if (0 == xyz.x_type) {
+      json[command_name] = true;
+    } else if (0 == xyz.y_type) {
+      json[command_name] = xyz.x;
+    } else {
+
+      JsonArray &arr = json.createNestedArray(command_name);
+      arr.add(xyz.x);
+      arr.add(xyz.y);
+      if (xyz.z_type) {
+        arr.add(xyz.z);
+      }
+    }
+  }
+}
+
+
+
+
+const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd) {
+  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
+    const Z_CommandConverter *conv = &Z_Commands[i];
+    if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
+      *cluster = conv->cluster;
+      *cmd = conv->cmd;
+      return (const __FlashStringHelper*) conv->param;
+    }
+  }
+
+  return nullptr;
+}
+
+
+inline char hexDigit(uint32_t h) {
+  uint32_t nybble = h & 0x0F;
+  return (nybble > 9) ? 'A' - 10 + nybble : '0' + nybble;
+}
+
+
+String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z) {
+  size_t len = strlen_P(zcl_cmd_P);
+  char zcl_cmd[len+1];
+  strcpy_P(zcl_cmd, zcl_cmd_P);
+
+  char *p = zcl_cmd;
+  while (*p) {
+    if (isXYZ(*p) && (*p == *(p+1))) {
+      uint8_t val;
+      switch (*p) {
+        case 'x':
+          val = x & 0xFF;
+          x = x >> 8;
+          break;
+        case 'y':
+          val = y & 0xFF;
+          y = y >> 8;
+          break;
+        case 'z':
+          val = z & 0xFF;
+          z = z >> 8;
+          break;
+      }
+      *p = hexDigit(val >> 4);
+      *(p+1) = hexDigit(val);
+      p++;
+    }
+    p++;
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SendZCLCommand_P: zcl_cmd = %s"), zcl_cmd);
+
+  return String(zcl_cmd);
+}
+
+const char kZ_Alias[] PROGMEM = "OFF|" D_OFF "|" D_FALSE "|" D_STOP "|" "OPEN" "|"
+                                "ON|" D_ON "|" D_TRUE "|" D_START "|" "CLOSE" "|"
+                                "TOGGLE|" D_TOGGLE "|"
+                                "ALL" ;
+
+const uint8_t kZ_Numbers[] PROGMEM = { 0,0,0,0,0,
+                                       1,1,1,1,1,
+                                       2,2,
+                                       255 };
+
+
+uint32_t ZigbeeAliasOrNumber(const char *state_text) {
+  char command[16];
+  int state_number = GetCommandCode(command, sizeof(command), state_text, kZ_Alias);
+  if (state_number >= 0) {
+
+    return pgm_read_byte(kZ_Numbers + state_number);
+  } else {
+
+    return strtoul(state_text, nullptr, 0);
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+#ifdef USE_ZIGBEE
+
+
+
+const uint8_t ZIGBEE_STATUS_OK = 0;
+const uint8_t ZIGBEE_STATUS_BOOT = 1;
+const uint8_t ZIGBEE_STATUS_RESET_CONF = 2;
+const uint8_t ZIGBEE_STATUS_STARTING = 3;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_CLOSE = 20;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_60 = 21;
+const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_XX = 22;
+const uint8_t ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;
+const uint8_t ZIGBEE_STATUS_NODE_DESC = 31;
+const uint8_t ZIGBEE_STATUS_ACTIVE_EP = 32;
+const uint8_t ZIGBEE_STATUS_SIMPLE_DESC = 33;
+const uint8_t ZIGBEE_STATUS_DEVICE_INDICATION = 34;
+const uint8_t ZIGBEE_STATUS_DEVICE_IEEE = 35;
+const uint8_t ZIGBEE_STATUS_CC_VERSION = 50;
+const uint8_t ZIGBEE_STATUS_CC_INFO = 51;
+const uint8_t ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;
+const uint8_t ZIGBEE_STATUS_ABORT = 99;
+
+typedef int32_t (*ZB_Func)(uint8_t value);
+typedef int32_t (*ZB_RecvMsgFunc)(int32_t res, const class SBuffer &buf);
+
+typedef union Zigbee_Instruction {
+  struct {
+    uint8_t i;
+    uint8_t d8;
+    uint16_t d16;
+  } i;
+  const void *p;
+
+
+
+} Zigbee_Instruction;
+
+
+
+
+typedef struct Zigbee_Instruction_Type {
+  uint8_t instr;
+  uint8_t data;
+} Zigbee_Instruction_Type;
+
+enum Zigbee_StateMachine_Instruction_Set {
+
+  ZGB_INSTR_4_BYTES = 0,
+  ZGB_INSTR_NOOP = 0,
+  ZGB_INSTR_LABEL,
+  ZGB_INSTR_GOTO,
+  ZGB_INSTR_ON_ERROR_GOTO,
+  ZGB_INSTR_ON_TIMEOUT_GOTO,
+  ZGB_INSTR_WAIT,
+  ZGB_INSTR_WAIT_FOREVER,
+  ZGB_INSTR_STOP,
+
+
+  ZGB_INSTR_8_BYTES = 0x80,
+  ZGB_INSTR_CALL = 0x80,
+  ZGB_INSTR_LOG,
+  ZGB_INSTR_MQTT_STATE,
+  ZGB_INSTR_SEND,
+  ZGB_INSTR_WAIT_UNTIL,
+  ZGB_INSTR_WAIT_RECV,
+  ZGB_ON_RECV_UNEXPECTED,
+
+
+  ZGB_INSTR_12_BYTES = 0xF0,
+  ZGB_INSTR_WAIT_RECV_CALL,
+};
+
+#define ZI_NOOP() { .i = { ZGB_INSTR_NOOP, 0x00, 0x0000} },
+#define ZI_LABEL(x) { .i = { ZGB_INSTR_LABEL, (x), 0x0000} },
+#define ZI_GOTO(x) { .i = { ZGB_INSTR_GOTO, (x), 0x0000} },
+#define ZI_ON_ERROR_GOTO(x) { .i = { ZGB_INSTR_ON_ERROR_GOTO, (x), 0x0000} },
+#define ZI_ON_TIMEOUT_GOTO(x) { .i = { ZGB_INSTR_ON_TIMEOUT_GOTO, (x), 0x0000} },
+#define ZI_WAIT(x) { .i = { ZGB_INSTR_WAIT, 0x00, (x)} },
+#define ZI_WAIT_FOREVER() { .i = { ZGB_INSTR_WAIT_FOREVER, 0x00, 0x0000} },
+#define ZI_STOP(x) { .i = { ZGB_INSTR_STOP, (x), 0x0000} },
+
+#define ZI_CALL(f,x) { .i = { ZGB_INSTR_CALL, (x), 0x0000} }, { .p = (const void*)(f) },
+#define ZI_LOG(x,m) { .i = { ZGB_INSTR_LOG, (x), 0x0000 } }, { .p = ((const void*)(m)) },
+#define ZI_MQTT_STATE(x,m) { .i = { ZGB_INSTR_MQTT_STATE, (x), 0x0000 } }, { .p = ((const void*)(m)) },
+#define ZI_ON_RECV_UNEXPECTED(f) { .i = { ZGB_ON_RECV_UNEXPECTED, 0x00, 0x0000} }, { .p = (const void*)(f) },
+#define ZI_SEND(m) { .i = { ZGB_INSTR_SEND, sizeof(m), 0x0000} }, { .p = (const void*)(m) },
+#define ZI_WAIT_RECV(x,m) { .i = { ZGB_INSTR_WAIT_RECV, sizeof(m), (x)} }, { .p = (const void*)(m) },
+#define ZI_WAIT_UNTIL(x,m) { .i = { ZGB_INSTR_WAIT_UNTIL, sizeof(m), (x)} }, { .p = (const void*)(m) },
+#define ZI_WAIT_RECV_FUNC(x,m,f) { .i = { ZGB_INSTR_WAIT_RECV_CALL, sizeof(m), (x)} }, { .p = (const void*)(m) }, { .p = (const void*)(f) },
+
+
+const uint8_t ZIGBEE_LABEL_START = 10;
+const uint8_t ZIGBEE_LABEL_READY = 20;
+const uint8_t ZIGBEE_LABEL_MAIN_LOOP = 21;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_CLOSE = 30;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60 = 31;
+const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX = 32;
+
+const uint8_t ZIGBEE_LABEL_ABORT = 99;
+const uint8_t ZIGBEE_LABEL_UNSUPPORTED_VERSION = 98;
+
+struct ZigbeeStatus {
+  bool active = true;
+  bool state_machine = false;
+  bool state_waiting = false;
+  bool state_no_timeout = false;
+  bool ready = false;
+  uint8_t on_error_goto = ZIGBEE_LABEL_ABORT;
+  uint8_t on_timeout_goto = ZIGBEE_LABEL_ABORT;
+  int16_t pc = 0;
+  uint32_t next_timeout = 0;
+
+  uint8_t *recv_filter = nullptr;
+  bool recv_until = false;
+  size_t recv_filter_len = 0;
+  ZB_RecvMsgFunc recv_func = nullptr;
+  ZB_RecvMsgFunc recv_unexpected = nullptr;
+
+  bool init_phase = true;
+};
+struct ZigbeeStatus zigbee;
+
+SBuffer *zigbee_buffer = nullptr;
+
+
+
+
+
+#define Z_B0(a) (uint8_t)( ((a) ) & 0xFF )
+#define Z_B1(a) (uint8_t)( ((a) >> 8) & 0xFF )
+#define Z_B2(a) (uint8_t)( ((a) >> 16) & 0xFF )
+#define Z_B3(a) (uint8_t)( ((a) >> 24) & 0xFF )
+#define Z_B4(a) (uint8_t)( ((a) >> 32) & 0xFF )
+#define Z_B5(a) (uint8_t)( ((a) >> 40) & 0xFF )
+#define Z_B6(a) (uint8_t)( ((a) >> 48) & 0xFF )
+#define Z_B7(a) (uint8_t)( ((a) >> 56) & 0xFF )
+
+#define ZBM(n,x...) const uint8_t n[] PROGMEM = { x };
+
+#define USE_ZIGBEE_CHANNEL_MASK (1 << (USE_ZIGBEE_CHANNEL))
+
+
+
+ZBM(ZBS_RESET, Z_AREQ | Z_SYS, SYS_RESET, 0x00 )
+ZBM(ZBR_RESET, Z_AREQ | Z_SYS, SYS_RESET_IND )
+
+ZBM(ZBS_VERSION, Z_SREQ | Z_SYS, SYS_VERSION )
+ZBM(ZBR_VERSION, Z_SRSP | Z_SYS, SYS_VERSION )
+
+
+ZBM(ZBS_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_READ, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8, 0x00 )
+ZBM(ZBR_ZNPHC, Z_SRSP | Z_SYS, SYS_OSAL_NV_READ, Z_Success, 0x01 , 0x55)
+
+
+ZBM(ZBS_PAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PANID )
+ZBM(ZBR_PAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PANID, 0x02 ,
+              Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
+
+ZBM(ZBS_EXTPAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_EXTENDED_PAN_ID )
+ZBM(ZBR_EXTPAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_EXTENDED_PAN_ID,
+                0x08 ,
+                Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
+                Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID),
+                )
+
+ZBM(ZBS_CHANN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_CHANLIST )
+ZBM(ZBR_CHANN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_CHANLIST,
+               0x04 ,
+               Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
+               )
+
+ZBM(ZBS_PFGK, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEY )
+ZBM(ZBR_PFGK, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEY,
+              0x10 ,
+              Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
+              Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
+              Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
+              Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
+
+                                                               )
+
+ZBM(ZBS_PFGKEN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEYS_ENABLE )
+ZBM(ZBR_PFGKEN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEYS_ENABLE,
+                0x01 , 0x00 )
+
+
+
+ZBM(ZBR_W_OK, Z_SRSP | Z_SAPI, SAPI_WRITE_CONFIGURATION, Z_Success )
+ZBM(ZBR_WNV_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_WRITE, Z_Success )
+
+
+ZBM(ZBS_FACTRES, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x02 )
+
+ZBM(ZBS_W_PAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PANID, 0x02 , Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
+
+ZBM(ZBS_W_EXTPAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_EXTENDED_PAN_ID, 0x08 ,
+                  Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
+                  Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID)
+                  )
+
+ZBM(ZBS_W_CHANN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_CHANLIST, 0x04 ,
+                Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
+                                           )
+
+ZBM(ZBS_W_LOGTYP, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_LOGICAL_TYPE, 0x01 , 0x00 )
+
+ZBM(ZBS_W_PFGK, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEY,
+                0x10 ,
+                Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
+                Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
+                Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
+                Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
+
+                                                                 )
+
+ZBM(ZBS_W_PFGKEN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEYS_ENABLE, 0x01 , 0x00 )
+
+ZBM(ZBS_WNV_SECMODE, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(CONF_TCLK_TABLE_START), Z_B1(CONF_TCLK_TABLE_START),
+                      0x00 , 0x20 ,
+                      0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+                      0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c,
+                      0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39,
+                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+
+ZBM(ZBS_W_ZDODCB, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_ZDO_DIRECT_CB, 0x01 , 0x01 )
+
+ZBM(ZBS_WNV_INITZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_ITEM_INIT, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8,
+                       0x01, 0x00 , 0x01 , 0x00 )
+
+
+ZBM(ZBR_WNV_INIT_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_ITEM_INIT )
+
+
+ZBM(ZBS_WNV_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(ZNP_HAS_CONFIGURED), Z_B1(ZNP_HAS_CONFIGURED),
+                   0x00 , 0x01 , 0x55 )
+
+ZBM(ZBS_STARTUPFROMAPP, Z_SREQ | Z_ZDO, ZDO_STARTUP_FROM_APP, 100, 0 )
+ZBM(ZBR_STARTUPFROMAPP, Z_SRSP | Z_ZDO, ZDO_STARTUP_FROM_APP )
+ZBM(AREQ_STARTUPFROMAPP, Z_AREQ | Z_ZDO, ZDO_STATE_CHANGE_IND, ZDO_DEV_ZB_COORD )
+
+ZBM(ZBS_GETDEVICEINFO, Z_SREQ | Z_UTIL, Z_UTIL_GET_DEVICE_INFO )
+ZBM(ZBR_GETDEVICEINFO, Z_SRSP | Z_UTIL, Z_UTIL_GET_DEVICE_INFO, Z_Success )
+# 272 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+ZBM(ZBS_ZDO_NODEDESCREQ, Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ, 0x00, 0x00 , 0x00, 0x00 )
+ZBM(ZBR_ZDO_NODEDESCREQ, Z_SRSP | Z_ZDO, ZDO_NODE_DESC_REQ, Z_Success )
+
+ZBM(AREQ_ZDO_NODEDESCRSP, Z_AREQ | Z_ZDO, ZDO_NODE_DESC_RSP)
+# 290 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
+ZBM(ZBS_ZDO_ACTIVEEPREQ, Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ, 0x00, 0x00, 0x00, 0x00)
+ZBM(ZBR_ZDO_ACTIVEEPREQ, Z_SRSP | Z_ZDO, ZDO_ACTIVE_EP_REQ, Z_Success)
+ZBM(ZBR_ZDO_ACTIVEEPRSP_NONE, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
+    0x00, 0x00 , 0x00 )
+ZBM(ZBR_ZDO_ACTIVEEPRSP_OK, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
+    0x00, 0x00 , 0x02 , 0x0B, 0x01 )
+
+
+ZBM(ZBS_AF_REGISTER01, Z_SREQ | Z_AF, AF_REGISTER, 0x01 , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
+                        0x05, 0x00 , 0x00 , 0x00 ,
+                        0x00 , 0x00 )
+ZBM(ZBR_AF_REGISTER, Z_SRSP | Z_AF, AF_REGISTER, Z_Success)
+ZBM(ZBS_AF_REGISTER0B, Z_SREQ | Z_AF, AF_REGISTER, 0x0B , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
+                        0x05, 0x00 , 0x00 , 0x00 ,
+                        0x00 , 0x00 )
+
+ZBM(ZBS_PERMITJOINREQ_CLOSE, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x02 ,
+                              0x00, 0x00 , 0x00 , 0x00 )
+ZBM(ZBS_PERMITJOINREQ_OPEN_60, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
+                              0xFC, 0xFF , 60 , 0x00 )
+ZBM(ZBS_PERMITJOINREQ_OPEN_XX, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
+                              0xFC, 0xFF , 0xFF , 0x00 )
+ZBM(ZBR_PERMITJOINREQ, Z_SRSP | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, Z_Success)
+ZBM(ZBR_PERMITJOIN_AREQ_CLOSE, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0x00 )
+ZBM(ZBR_PERMITJOIN_AREQ_OPEN_60, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 60 )
+ZBM(ZBR_PERMITJOIN_AREQ_OPEN_FF, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0xFF )
+ZBM(ZBR_PERMITJOIN_AREQ_RSP, Z_AREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_RSP, 0x00, 0x00 , Z_Success )
+
+static const Zigbee_Instruction zb_prog[] PROGMEM = {
+  ZI_LABEL(0)
+    ZI_NOOP()
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_ON_TIMEOUT_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_ON_RECV_UNEXPECTED(&Z_Recv_Default)
+    ZI_WAIT(10500)
+    ZI_ON_ERROR_GOTO(50)
+
+
+
+    ZI_SEND(ZBS_RESET)
+    ZI_WAIT_RECV_FUNC(5000, ZBR_RESET, &Z_Reboot)
+    ZI_WAIT(100)
+    ZI_LOG(LOG_LEVEL_DEBUG, D_LOG_ZIGBEE "checking device configuration")
+    ZI_SEND(ZBS_ZNPHC)
+    ZI_WAIT_RECV(2000, ZBR_ZNPHC)
+    ZI_SEND(ZBS_VERSION)
+    ZI_WAIT_RECV_FUNC(2000, ZBR_VERSION, &Z_ReceiveCheckVersion)
+    ZI_SEND(ZBS_PAN)
+    ZI_WAIT_RECV(1000, ZBR_PAN)
+    ZI_SEND(ZBS_EXTPAN)
+    ZI_WAIT_RECV(1000, ZBR_EXTPAN)
+    ZI_SEND(ZBS_CHANN)
+    ZI_WAIT_RECV(1000, ZBR_CHANN)
+    ZI_SEND(ZBS_PFGK)
+    ZI_WAIT_RECV(1000, ZBR_PFGK)
+    ZI_SEND(ZBS_PFGKEN)
+    ZI_WAIT_RECV(1000, ZBR_PFGKEN)
+
+
+
+  ZI_LABEL(ZIGBEE_LABEL_START)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_STARTING, "Configured, starting coordinator")
+
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+
+
+ZI_SEND(ZBS_STARTUPFROMAPP)
+    ZI_WAIT_RECV(2000, ZBR_STARTUPFROMAPP)
+    ZI_WAIT_UNTIL(10000, AREQ_STARTUPFROMAPP)
+    ZI_SEND(ZBS_GETDEVICEINFO)
+    ZI_WAIT_RECV_FUNC(2000, ZBR_GETDEVICEINFO, &Z_ReceiveDeviceInfo)
+
+    ZI_SEND(ZBS_ZDO_NODEDESCREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_NODEDESCREQ)
+    ZI_WAIT_UNTIL(5000, AREQ_ZDO_NODEDESCRSP)
+    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_NONE)
+    ZI_SEND(ZBS_AF_REGISTER01)
+    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
+    ZI_SEND(ZBS_AF_REGISTER0B)
+    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
+
+
+    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_OK)
+    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+    ZI_WAIT_UNTIL(1000, ZBR_PERMITJOIN_AREQ_RSP)
+
+
+
+
+
+
+  ZI_LABEL(ZIGBEE_LABEL_READY)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_OK, "Started")
+    ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "Zigbee started")
+    ZI_CALL(&Z_State_Ready, 1)
+    ZI_CALL(&Z_Load_Devices, 0)
+  ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
+    ZI_WAIT_FOREVER()
+    ZI_GOTO(ZIGBEE_LABEL_READY)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_60)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX)
+
+    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_XX)
+    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
+
+  ZI_LABEL(50)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_RESET_CONF, "Reseting configuration")
+
+    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
+    ZI_SEND(ZBS_FACTRES)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_RESET)
+    ZI_WAIT_RECV(5000, ZBR_RESET)
+    ZI_SEND(ZBS_W_PAN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_EXTPAN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_CHANN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_LOGTYP)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_PFGK)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_W_PFGKEN)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+    ZI_SEND(ZBS_WNV_SECMODE)
+    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
+    ZI_SEND(ZBS_W_ZDODCB)
+    ZI_WAIT_RECV(1000, ZBR_W_OK)
+
+    ZI_SEND(ZBS_WNV_INITZNPHC)
+    ZI_WAIT_RECV_FUNC(1000, ZBR_WNV_INIT_OK, &Z_CheckNVWrite)
+    ZI_SEND(ZBS_WNV_ZNPHC)
+    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
+
+
+    ZI_GOTO(ZIGBEE_LABEL_START)
+
+  ZI_LABEL(ZIGBEE_LABEL_UNSUPPORTED_VERSION)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_UNSUPPORTED_VERSION, "Only ZNP 1.2 is currently supported")
+    ZI_GOTO(ZIGBEE_LABEL_ABORT)
+
+  ZI_LABEL(ZIGBEE_LABEL_ABORT)
+    ZI_MQTT_STATE(ZIGBEE_STATUS_ABORT, "Abort")
+    ZI_LOG(LOG_LEVEL_ERROR, D_LOG_ZIGBEE "Abort")
+    ZI_STOP(ZIGBEE_LABEL_ABORT)
+};
+
+uint8_t ZigbeeGetInstructionSize(uint8_t instr) {
+  if (instr >= ZGB_INSTR_12_BYTES) {
+    return 3;
+  } else if (instr >= ZGB_INSTR_8_BYTES) {
+    return 2;
+  } else {
+    return 1;
+  }
+}
+
+void ZigbeeGotoLabel(uint8_t label) {
+
+  uint16_t goto_pc = 0xFFFF;
+  uint8_t cur_instr = 0;
+  uint8_t cur_d8 = 0;
+  uint8_t cur_instr_len = 1;
+
+  for (uint32_t i = 0; i < sizeof(zb_prog)/sizeof(zb_prog[0]); i += cur_instr_len) {
+    const Zigbee_Instruction *cur_instr_line = &zb_prog[i];
+    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
+    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
+
+
+    if (ZGB_INSTR_LABEL == cur_instr) {
+
+      if (label == cur_d8) {
+
+        zigbee.pc = i;
+        zigbee.state_machine = true;
+        zigbee.state_waiting = false;
+        return;
+      }
+    }
+
+    cur_instr_len = ZigbeeGetInstructionSize(cur_instr);
+  }
+
+
+  AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Goto label not found, label=%d pc=%d"), label, zigbee.pc);
+  if (ZIGBEE_LABEL_ABORT != label) {
+
+    ZigbeeGotoLabel(ZIGBEE_LABEL_ABORT);
+  } else {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Label Abort (%d) not present, aborting Zigbee"), ZIGBEE_LABEL_ABORT);
+    zigbee.state_machine = false;
+    zigbee.active = false;
+  }
+}
+
+void ZigbeeStateMachine_Run(void) {
+  uint8_t cur_instr = 0;
+  uint8_t cur_d8 = 0;
+  uint16_t cur_d16 = 0;
+  const void* cur_ptr1 = nullptr;
+  const void* cur_ptr2 = nullptr;
+  uint32_t now = millis();
+
+  if (zigbee.state_waiting) {
+
+    if ((zigbee.next_timeout) && (now > zigbee.next_timeout)) {
+
+      if (!zigbee.state_no_timeout) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "timeout, goto label %d"), zigbee.on_timeout_goto);
+        ZigbeeGotoLabel(zigbee.on_timeout_goto);
+      } else {
+        zigbee.state_waiting = false;
+      }
+    }
+  }
+
+  while ((zigbee.state_machine) && (!zigbee.state_waiting)) {
+
+    zigbee.recv_filter = nullptr;
+    zigbee.recv_func = nullptr;
+    zigbee.recv_until = false;
+    zigbee.state_no_timeout = false;
+
+    if (zigbee.pc > (sizeof(zb_prog)/sizeof(zb_prog[0]))) {
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Invalid pc: %d, aborting"), zigbee.pc);
+      zigbee.pc = -1;
+    }
+    if (zigbee.pc < 0) {
+      zigbee.state_machine = false;
+      return;
+    }
+
+
+
+    const Zigbee_Instruction *cur_instr_line = &zb_prog[zigbee.pc];
+    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
+    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
+    cur_d16 = pgm_read_word(&cur_instr_line->i.d16);
+    if (cur_instr >= ZGB_INSTR_8_BYTES) {
+      cur_instr_line++;
+      cur_ptr1 = cur_instr_line->p;
+    }
+    if (cur_instr >= ZGB_INSTR_12_BYTES) {
+      cur_instr_line++;
+      cur_ptr2 = cur_instr_line->p;
+    }
+
+    zigbee.pc += ZigbeeGetInstructionSize(cur_instr);
+
+    switch (cur_instr) {
+      case ZGB_INSTR_NOOP:
+      case ZGB_INSTR_LABEL:
+        break;
+      case ZGB_INSTR_GOTO:
+        ZigbeeGotoLabel(cur_d8);
+        break;
+      case ZGB_INSTR_ON_ERROR_GOTO:
+        zigbee.on_error_goto = cur_d8;
+        break;
+      case ZGB_INSTR_ON_TIMEOUT_GOTO:
+        zigbee.on_timeout_goto = cur_d8;
+        break;
+      case ZGB_INSTR_WAIT:
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        zigbee.state_no_timeout = true;
+        break;
+      case ZGB_INSTR_WAIT_FOREVER:
+        zigbee.next_timeout = 0;
+        zigbee.state_waiting = true;
+
+        break;
+      case ZGB_INSTR_STOP:
+        zigbee.state_machine = false;
+        if (cur_d8) {
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Stopping (%d)"), cur_d8);
+        }
+        break;
+      case ZGB_INSTR_CALL:
+        if (cur_ptr1) {
+          uint32_t res;
+          res = (*((ZB_Func)cur_ptr1))(cur_d8);
+          if (res > 0) {
+            ZigbeeGotoLabel(res);
+            continue;
+          } else if (res == 0) {
+
+          } else if (res == -1) {
+
+          } else {
+            ZigbeeGotoLabel(zigbee.on_error_goto);
+            continue;
+          }
+        }
+        break;
+      case ZGB_INSTR_LOG:
+        AddLog_P(cur_d8, (char*) cur_ptr1);
+        break;
+      case ZGB_INSTR_MQTT_STATE:
+        Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{\"Status\":%d,\"Message\":\"%s\"}}"),
+                          cur_d8, (char*) cur_ptr1);
+       MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+       XdrvRulesProcess();
+        break;
+      case ZGB_INSTR_SEND:
+        ZigbeeZNPSend((uint8_t*) cur_ptr1, cur_d8 );
+        break;
+      case ZGB_INSTR_WAIT_UNTIL:
+        zigbee.recv_until = true;
+      case ZGB_INSTR_WAIT_RECV:
+        zigbee.recv_filter = (uint8_t *) cur_ptr1;
+        zigbee.recv_filter_len = cur_d8;
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        break;
+      case ZGB_ON_RECV_UNEXPECTED:
+        zigbee.recv_unexpected = (ZB_RecvMsgFunc) cur_ptr1;
+        break;
+      case ZGB_INSTR_WAIT_RECV_CALL:
+        zigbee.recv_filter = (uint8_t *) cur_ptr1;
+        zigbee.recv_filter_len = cur_d8;
+        zigbee.recv_func = (ZB_RecvMsgFunc) cur_ptr2;
+        zigbee.next_timeout = now + cur_d16;
+        zigbee.state_waiting = true;
+        break;
+    }
+  }
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+#ifdef USE_ZIGBEE
+
+int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
+
+
+
+
+
+
+
+  Z_IEEEAddress long_adr = buf.get64(3);
+  Z_ShortAddress short_adr = buf.get16(11);
+  uint8_t device_type = buf.get8(13);
+  uint8_t device_state = buf.get8(14);
+  uint8_t device_associated = buf.get8(15);
+
+
+  localIEEEAddr = long_adr;
+
+  char hex[20];
+  Uint64toHex(long_adr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"DeviceType\":%d,\"DeviceState\":%d"
+                  ",\"NumAssocDevices\":%d"),
+                  ZIGBEE_STATUS_CC_INFO, hex, short_adr, device_type, device_state,
+                  device_associated);
+
+  if (device_associated > 0) {
+    uint idx = 16;
+    ResponseAppend_P(PSTR(",\"AssocDevicesList\":["));
+    for (uint32_t i = 0; i < device_associated; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(idx));
+      idx += 2;
+    }
+    ResponseAppend_P(PSTR("]"));
+  }
+
+  ResponseJsonEnd();
+  ResponseJsonEnd();
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  return res;
+}
+
+int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf) {
+
+
+
+  uint8_t status = buf.get8(2);
+  if ((0x00 == status) || (0x09 == status)) {
+    return 0;
+  } else {
+    return -2;
+  }
+}
+
+const char Z_RebootReason[] PROGMEM = "Power-up|External|Watchdog";
+
+int32_t Z_Reboot(int32_t res, class SBuffer &buf) {
+
+
+
+  uint8_t reason = buf.get8(2);
+  uint8_t transport_rev = buf.get8(3);
+  uint8_t product_id = buf.get8(4);
+  uint8_t major_rel = buf.get8(5);
+  uint8_t minor_rel = buf.get8(6);
+  uint8_t hw_rev = buf.get8(7);
+  char reason_str[12];
+
+  if (reason > 3) { reason = 3; }
+  GetTextIndexed(reason_str, sizeof(reason_str), reason, Z_RebootReason);
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"Message\":\"%s\",\"RestartReason\":\"%s\""
+                  ",\"MajorRel\":%d,\"MinorRel\":%d}}"),
+                  ZIGBEE_STATUS_BOOT, "CC2530 booted", reason_str,
+                  major_rel, minor_rel);
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
+   return 0;
+  } else {
+    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
+  }
+}
+
+int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf) {
+# 122 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
+  uint8_t major_rel = buf.get8(4);
+  uint8_t minor_rel = buf.get8(5);
+  uint8_t maint_rel = buf.get8(6);
+  uint32_t revision = buf.get32(7);
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"MajorRel\":%d,\"MinorRel\":%d"
+                  ",\"MaintRel\":%d,\"Revision\":%d}}"),
+                  ZIGBEE_STATUS_CC_VERSION, major_rel, minor_rel,
+                  maint_rel, revision);
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+
+  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
+   return 0;
+  } else {
+    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
+  }
+}
+
+bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match) {
+  if ( (pgm_read_byte(&match[0]) == buf.get8(0)) &&
+       (pgm_read_byte(&match[1]) == buf.get8(1)) ) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
+
+  uint8_t duration = buf.get8(2);
+  uint8_t status_code;
+  const char* message;
+
+  if (0xFF == duration) {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_XX;
+    message = PSTR("Enable Pairing mode until next boot");
+  } else if (duration > 0) {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_60;
+    message = PSTR("Enable Pairing mode for %d seconds");
+  } else {
+    status_code = ZIGBEE_STATUS_PERMITJOIN_CLOSE;
+    message = PSTR("Disable Pairing mode");
+  }
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"Message\":\""),
+                  status_code);
+  ResponseAppend_P(message, duration);
+  ResponseAppend_P(PSTR("\"}}"));
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
+  XdrvRulesProcess();
+  return -1;
+}
+
+
+void Z_SendIEEEAddrReq(uint16_t shortaddr) {
+  uint8_t IEEEAddrReq[] = { Z_SREQ | Z_ZDO, ZDO_IEEE_ADDR_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), 0x00, 0x00 };
+
+  ZigbeeZNPSend(IEEEAddrReq, sizeof(IEEEAddrReq));
+}
+
+
+void Z_SendActiveEpReq(uint16_t shortaddr) {
+  uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
+
+  ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
+
+
+
+
+
+}
+
+
+void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint) {
+  uint8_t SimpleDescReq[] = { Z_SREQ | Z_ZDO, ZDO_SIMPLE_DESC_REQ,
+              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr),
+              endpoint };
+
+  ZigbeeZNPSend(SimpleDescReq, sizeof(SimpleDescReq));
+}
+
+const char* Z_DeviceType[] = { "Coordinator", "Router", "End Device", "Unknown" };
+int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t logicalType = buf.get8(7);
+  uint8_t apsFlags = buf.get8(8);
+  uint8_t MACCapabilityFlags = buf.get8(9);
+  uint16_t manufacturerCapabilities = buf.get16(10);
+  uint8_t maxBufferSize = buf.get8(12);
+  uint16_t maxInTransferSize = buf.get16(13);
+  uint16_t serverMask = buf.get16(15);
+  uint16_t maxOutTransferSize = buf.get16(17);
+  uint8_t descriptorCapabilities = buf.get8(19);
+
+  if (0 == status) {
+    zigbee_devices.updateLastSeen(nwkAddr);
+
+    uint8_t deviceType = logicalType & 0x7;
+    if (deviceType > 3) { deviceType = 3; }
+    bool complexDescriptorAvailable = (logicalType & 0x08) ? 1 : 0;
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"NodeType\":\"%s\",\"ComplexDesc\":%s}}"),
+                    ZIGBEE_STATUS_NODE_DESC, Z_DeviceType[deviceType],
+                    complexDescriptorAvailable ? "true" : "false"
+                    );
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+  }
+
+  return -1;
+}
+
+int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t activeEpCount = buf.get8(7);
+  uint8_t* activeEpList = (uint8_t*) buf.charptr(8);
+
+
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    zigbee_devices.addEndoint(nwkAddr, activeEpList[i]);
+  }
+
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    Z_SendSimpleDescReq(nwkAddr, activeEpList[i]);
+  }
+
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"ActiveEndpoints\":["),
+                  ZIGBEE_STATUS_ACTIVE_EP);
+  for (uint32_t i = 0; i < activeEpCount; i++) {
+    if (i > 0) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(PSTR("\"0x%02X\""), activeEpList[i]);
+  }
+  ResponseAppend_P(PSTR("]}}"));
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+  return -1;
+}
+
+void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid) {
+  SBuffer buf(100);
+  buf.add8(Z_SREQ | Z_AF);
+  buf.add8(AF_DATA_REQUEST);
+  buf.add16(shortaddr);
+  buf.add8(endpoint);
+  buf.add8(0x01);
+  buf.add16(clusterid);
+  buf.add8(transacid);
+  buf.add8(0x30);
+  buf.add8(0x1E);
+
+  buf.add8(3 + 2*sizeof(uint16_t));
+  buf.add8(0x00);
+  buf.add8(transacid);
+  buf.add8(ZCL_READ_ATTRIBUTES);
+  buf.add16(0x0004);
+  buf.add16(0x0005);
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+}
+
+
+int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
+
+  Z_ShortAddress srcAddr = buf.get16(2);
+  uint8_t status = buf.get8(4);
+  Z_ShortAddress nwkAddr = buf.get16(5);
+  uint8_t lenDescriptor = buf.get8(7);
+  uint8_t endpoint = buf.get8(8);
+  uint16_t profileId = buf.get16(9);
+  uint16_t deviceId = buf.get16(11);
+  uint8_t deviceVersion = buf.get8(13);
+  uint8_t numInCluster = buf.get8(14);
+  uint8_t numOutCluster = buf.get8(15 + numInCluster*2);
+
+  if (0 == status) {
+    zigbee_devices.addEndointProfile(nwkAddr, endpoint, profileId);
+    for (uint32_t i = 0; i < numInCluster; i++) {
+      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(15 + i*2), false);
+    }
+    for (uint32_t i = 0; i < numOutCluster; i++) {
+      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(16 + numInCluster*2 + i*2), true);
+    }
+
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"Endpoint\":\"0x%02X\""
+                    ",\"ProfileId\":\"0x%04X\",\"DeviceId\":\"0x%04X\",\"DeviceVersion\":%d"
+                    "\"InClusters\":["),
+                    ZIGBEE_STATUS_SIMPLE_DESC, endpoint,
+                    profileId, deviceId, deviceVersion);
+    for (uint32_t i = 0; i < numInCluster; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(15 + i*2));
+    }
+    ResponseAppend_P(PSTR("],\"OutClusters\":["));
+    for (uint32_t i = 0; i < numOutCluster; i++) {
+      if (i > 0) { ResponseAppend_P(PSTR(",")); }
+      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(16 + numInCluster*2 + i*2));
+    }
+    ResponseAppend_P(PSTR("]}}"));
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+
+    uint8_t cluster = zigbee_devices.findClusterEndpointIn(nwkAddr, 0x0000);
+    if (cluster) {
+      Z_SendAFInfoRequest(nwkAddr, cluster, 0x0000, 0x01);
+    }
+  }
+  return -1;
+}
+
+int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
+  uint8_t status = buf.get8(2);
+  Z_IEEEAddress ieeeAddr = buf.get64(3);
+  Z_ShortAddress nwkAddr = buf.get16(11);
+
+
+
+  if (0 == status) {
+    zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
+    char hex[20];
+    Uint64toHex(ieeeAddr, hex, 64);
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                    "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                    "}}"),
+                    ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
+                    );
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+
+    const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
+    if (friendlyName) {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, friendlyName->c_str());
+    } else {
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\"}}"), nwkAddr);
+    }
+
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    XdrvRulesProcess();
+  }
+  return -1;
+}
+
+int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
+  Z_ShortAddress srcAddr = buf.get16(2);
+  Z_ShortAddress nwkAddr = buf.get16(4);
+  Z_IEEEAddress ieeeAddr = buf.get64(6);
+  uint8_t capabilities = buf.get8(14);
+
+  zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
+
+  char hex[20];
+  Uint64toHex(ieeeAddr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"PowerSource\":%s,\"ReceiveWhenIdle\":%s,\"Security\":%s}}"),
+                  ZIGBEE_STATUS_DEVICE_ANNOUNCE, hex, nwkAddr,
+                  (capabilities & 0x04) ? "true" : "false",
+                  (capabilities & 0x08) ? "true" : "false",
+                  (capabilities & 0x40) ? "true" : "false"
+                  );
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+  Z_SendActiveEpReq(nwkAddr);
+  return -1;
+}
+
+
+int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf) {
+  Z_ShortAddress srcAddr = buf.get16(2);
+  Z_IEEEAddress ieeeAddr = buf.get64(4);
+  Z_ShortAddress parentNw = buf.get16(12);
+
+  zigbee_devices.updateDevice(srcAddr, ieeeAddr);
+
+  char hex[20];
+  Uint64toHex(ieeeAddr, hex, 64);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  ",\"ParentNetwork\":\"0x%04X\"}}"),
+                  ZIGBEE_STATUS_DEVICE_INDICATION, hex, srcAddr, parentNw
+                  );
+
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+
+  return -1;
+}
+
+
+
+const uint32_t OCCUPANCY_TIMEOUT = 90 * 1000;
+
+void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json) {
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(*json, PSTR(OCCUPANCY));
+  if (nullptr != &val_endpoint) {
+    uint32_t occupancy = strToUInt(val_endpoint);
+
+    if (occupancy) {
+      zigbee_devices.setTimer(shortaddr, OCCUPANCY_TIMEOUT, cluster, endpoint, 0, &Z_OccupancyCallback);
+    }
+  }
+}
+
+
+
+int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
+  const JsonObject *json = zigbee_devices.jsonGet(shortaddr);
+  if (json == nullptr) { return 0; }
+
+  Z_AqaraOccupancy(shortaddr, cluster, endpoint, json);
+
+  zigbee_devices.jsonPublishFlush(shortaddr);
+  return 1;
+}
+
+int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
+  uint16_t groupid = buf.get16(2);
+  uint16_t clusterid = buf.get16(4);
+  Z_ShortAddress srcaddr = buf.get16(6);
+  uint8_t srcendpoint = buf.get8(8);
+  uint8_t dstendpoint = buf.get8(9);
+  uint8_t wasbroadcast = buf.get8(10);
+  uint8_t linkquality = buf.get8(11);
+  uint8_t securityuse = buf.get8(12);
+  uint32_t timestamp = buf.get32(13);
+  uint8_t seqnumber = buf.get8(17);
+
+  bool defer_attributes = false;
+
+  zigbee_devices.updateLastSeen(srcaddr);
+  ZCLFrame zcl_received = ZCLFrame::parseRawFrame(buf, 19, buf.get8(18), clusterid, groupid,
+                              srcaddr,
+                              srcendpoint, dstendpoint, wasbroadcast,
+                              linkquality, securityuse, seqnumber,
+                              timestamp);
+  zcl_received.log();
+  char shortaddr[8];
+  snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%04X"), srcaddr);
+
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+
+  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
+    zcl_received.parseRawAttributes(json);
+    if (clusterid) { defer_attributes = true; }
+  } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
+    zcl_received.parseReadAttributes(json);
+  } else if (zcl_received.isClusterSpecificCommand()) {
+    zcl_received.parseClusterSpecificCommand(json);
+  }
+  String msg("");
+  msg.reserve(100);
+  json.printTo(msg);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
+
+  zcl_received.postProcessAttributes(srcaddr, json);
+
+  json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
+
+  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
+
+  if (defer_attributes) {
+
+    if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
+
+      zigbee_devices.jsonPublishFlush(srcaddr);
+    } else {
+      zigbee_devices.jsonAppend(srcaddr, json);
+      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
+    }
+  } else {
+
+    zigbee_devices.jsonPublishNow(srcaddr, json);
+  }
+  return -1;
+}
+
+typedef struct Z_Dispatcher {
+  const uint8_t* match;
+  ZB_RecvMsgFunc func;
+} Z_Dispatcher;
+
+
+ZBM(AREQ_AF_INCOMING_MESSAGE, Z_AREQ | Z_AF, AF_INCOMING_MSG)
+ZBM(AREQ_END_DEVICE_ANNCE_IND, Z_AREQ | Z_ZDO, ZDO_END_DEVICE_ANNCE_IND)
+ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)
+ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )
+ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)
+ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)
+ZBM(AREQ_ZDO_IEEE_ADDR_RSP, Z_AREQ | Z_ZDO, ZDO_IEEE_ADDR_RSP)
+
+const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
+  { AREQ_AF_INCOMING_MESSAGE, &Z_ReceiveAfIncomingMessage },
+  { AREQ_END_DEVICE_ANNCE_IND, &Z_ReceiveEndDeviceAnnonce },
+  { AREQ_END_DEVICE_TC_DEV_IND, &Z_ReceiveTCDevInd },
+  { AREQ_PERMITJOIN_OPEN_XX, &Z_ReceivePermitJoinStatus },
+  { AREQ_ZDO_NODEDESCRSP, &Z_ReceiveNodeDesc },
+  { AREQ_ZDO_ACTIVEEPRSP, &Z_ReceiveActiveEp },
+  { AREQ_ZDO_SIMPLEDESCRSP, &Z_ReceiveSimpleDesc },
+  { AREQ_ZDO_IEEE_ADDR_RSP, &Z_ReceiveIEEEAddr },
+};
+
+int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
+
+  if (zigbee.init_phase) {
+
+   return -1;
+  } else {
+    for (uint32_t i = 0; i < sizeof(Z_DispatchTable)/sizeof(Z_Dispatcher); i++) {
+      if (Z_ReceiveMatchPrefix(buf, Z_DispatchTable[i].match)) {
+        (*Z_DispatchTable[i].func)(res, buf);
+      }
+    }
+    return -1;
+  }
+}
+
+int32_t Z_Load_Devices(uint8_t value) {
+
+  loadZigbeeDevices();
+  return 0;
+}
+
+int32_t Z_State_Ready(uint8_t value) {
+  zigbee.init_phase = false;
+  return 0;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+#ifdef USE_ZIGBEE
+
+#define XDRV_23 23
+
+const uint32_t ZIGBEE_BUFFER_SIZE = 256;
+const uint8_t ZIGBEE_SOF = 0xFE;
+const uint8_t ZIGBEE_SOF_ALT = 0xFF;
+
+#include <TasmotaSerial.h>
+TasmotaSerial *ZigbeeSerial = nullptr;
+
+
+const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"
+  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
+  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
+
+const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"
+  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
+  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
+  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
+  D_CMND_ZIGBEE_PING ;
+
+void (* const ZigbeeCommand[])(void) PROGMEM = {
+  &CmndZbZNPSend, &CmndZbPermitJoin,
+  &CmndZbStatus, &CmndZbReset, &CmndZbSend,
+  &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
+  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind,
+  &CmndZbPing,
+  };
+
+int32_t ZigbeeProcessInput(class SBuffer &buf) {
+  if (!zigbee.state_machine) { return -1; }
+
+
+  bool recv_filter_match = true;
+  bool recv_prefix_match = false;
+  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
+    if (zigbee.recv_filter_len >= 2) {
+      recv_prefix_match = false;
+      if ( (pgm_read_byte(&zigbee.recv_filter[0]) == buf.get8(0)) &&
+           (pgm_read_byte(&zigbee.recv_filter[1]) == buf.get8(1)) ) {
+        recv_prefix_match = true;
+      }
+    }
+
+    for (uint32_t i = 0; i < zigbee.recv_filter_len; i++) {
+      if (pgm_read_byte(&zigbee.recv_filter[i]) != buf.get8(i)) {
+        recv_filter_match = false;
+        break;
+      }
+    }
+
+
+  }
+
+
+  int32_t res = -1;
+
+
+
+
+
+  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
+    if (!recv_prefix_match) {
+      res = -1;
+    } else {
+      if (recv_filter_match) {
+        res = 0;
+      } else {
+        if (zigbee.recv_until) {
+          res = -1;
+        } else {
+          res = -2;
+        }
+      }
+    }
+  } else {
+    res = -1;
+  }
+
+  if (recv_prefix_match) {
+    if (zigbee.recv_func) {
+      res = (*zigbee.recv_func)(res, buf);
+    }
+  }
+  if (-1 == res) {
+
+    if (zigbee.recv_unexpected) {
+      res = (*zigbee.recv_unexpected)(res, buf);
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: res = %d"), res);
+
+
+  if (0 == res) {
+
+    zigbee.state_waiting = false;
+  } else if (res > 0) {
+    ZigbeeGotoLabel(res);
+  } else if (-1 == res) {
+
+
+  } else {
+
+    ZigbeeGotoLabel(zigbee.on_error_goto);
+  }
+}
+
+void ZigbeeInput(void)
+{
+ static uint32_t zigbee_polling_window = 0;
+ static uint8_t fcs = ZIGBEE_SOF;
+ static uint32_t zigbee_frame_len = 5;
+# 145 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+  while (ZigbeeSerial->available()) {
+    yield();
+    uint8_t zigbee_in_byte = ZigbeeSerial->read();
+
+
+  if (0 == zigbee_buffer->len()) {
+   zigbee_frame_len = 5;
+   fcs = ZIGBEE_SOF;
+
+
+
+      if (ZIGBEE_SOF_ALT == zigbee_in_byte) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
+        zigbee_in_byte = ZIGBEE_SOF;
+      }
+  }
+
+    if ((0 == zigbee_buffer->len()) && (ZIGBEE_SOF != zigbee_in_byte)) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput discarding byte %02X"), zigbee_in_byte);
+      continue;
+    }
+
+    if (zigbee_buffer->len() < zigbee_frame_len) {
+   zigbee_buffer->add8(zigbee_in_byte);
+      zigbee_polling_window = millis();
+   fcs ^= zigbee_in_byte;
+    }
+
+  if (zigbee_buffer->len() >= zigbee_frame_len) {
+      zigbee_polling_window = 0;
+      break;
+    }
+
+
+    if (02 == zigbee_buffer->len()) {
+
+      uint8_t len_byte = zigbee_buffer->get8(1);
+      if (len_byte > 250) len_byte = 250;
+
+      zigbee_frame_len = len_byte + 5;
+    }
+  }
+
+  if (zigbee_buffer->len() && (millis() > (zigbee_polling_window + ZIGBEE_POLLING))) {
+    char hex_char[(zigbee_buffer->len() * 2) + 2];
+  ToHex_P((unsigned char*)zigbee_buffer->getBuffer(), zigbee_buffer->len(), hex_char, sizeof(hex_char));
+
+    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Bytes follow_read_metric = %0d"), ZigbeeSerial->getLoopReadMetric());
+
+  if (zigbee_buffer->len() != zigbee_frame_len) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received frame of wrong size %s, len %d, expected %d"), hex_char, zigbee_buffer->len(), zigbee_frame_len);
+  } else if (0x00 != fcs) {
+
+      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received bad FCS frame %s, %d"), hex_char, fcs);
+  } else {
+
+
+
+   SBuffer znp_buffer = zigbee_buffer->subBuffer(2, zigbee_frame_len - 3);
+
+   ToHex_P((unsigned char*)znp_buffer.getBuffer(), znp_buffer.len(), hex_char, sizeof(hex_char));
+      Response_P(PSTR("{\"" D_JSON_ZIGBEEZNPRECEIVED "\":\"%s\"}"), hex_char);
+      if (Settings.flag3.tuya_serial_mqtt_publish) {
+        MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
+        XdrvRulesProcess();
+      } else {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
+      }
+
+      ZigbeeProcessInput(znp_buffer);
+  }
+  zigbee_buffer->setLen(0);
+  }
+}
+
+
+
+void ZigbeeInit(void)
+{
+  zigbee.active = false;
+  if ((pin[GPIO_ZIGBEE_RX] < 99) && (pin[GPIO_ZIGBEE_TX] < 99)) {
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
+
+    ZigbeeSerial = new TasmotaSerial(pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX], seriallog_level ? 1 : 2, 0, 256);
+    ZigbeeSerial->begin(115200);
+    if (ZigbeeSerial->hardwareSerial()) {
+      ClaimSerial();
+      uint32_t aligned_buffer = ((uint32_t)serial_in_buffer + 3) & ~3;
+   zigbee_buffer = new PreAllocatedSBuffer(sizeof(serial_in_buffer) - 3, (char*) aligned_buffer);
+  } else {
+   zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
+  }
+    zigbee.active = true;
+  zigbee.init_phase = true;
+    zigbee.state_machine = true;
+    ZigbeeSerial->flush();
+  }
+}
+
+
+
+
+
+uint32_t strToUInt(const JsonVariant &val) {
+
+  if (val.is<unsigned int>()) {
+    return val.as<unsigned int>();
+  } else {
+    if (val.is<const char*>()) {
+      String sval = val.as<String>();
+      return strtoull(sval.c_str(), nullptr, 0);
+    }
+  }
+  return 0;
+}
+
+const unsigned char ZIGBEE_FACTORY_RESET[] PROGMEM =
+  { Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x01 };
+
+
+void CmndZbReset(void) {
+  if (ZigbeeSerial) {
+    switch (XdrvMailbox.payload) {
+    case 1:
+      ZigbeeZNPSend(ZIGBEE_FACTORY_RESET, sizeof(ZIGBEE_FACTORY_RESET));
+      eraseZigbeeDevices();
+      restart_flag = 2;
+      ResponseCmndChar(D_JSON_ZIGBEE_CC2530 " " D_JSON_RESET_AND_RESTARTING);
+      break;
+    default:
+      ResponseCmndChar(D_JSON_ONE_TO_RESET);
+    }
+  }
+}
+
+void CmndZbZNPSendOrReceive(bool send)
+{
+  if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
+    uint8_t code;
+
+    char *codes = RemoveSpace(XdrvMailbox.data);
+    int32_t size = strlen(XdrvMailbox.data);
+
+  SBuffer buf((size+1)/2);
+
+    while (size > 1) {
+      char stemp[3];
+      strlcpy(stemp, codes, sizeof(stemp));
+      code = strtol(stemp, nullptr, 16);
+   buf.add8(code);
+      size -= 2;
+      codes += 2;
+    }
+    if (send) {
+      ZigbeeZNPSend(buf.getBuffer(), buf.len());
+    } else {
+      ZigbeeProcessInput(buf);
+    }
+  }
+  ResponseCmndDone();
+}
+
+
+void CmndZbZNPReceive(void)
+{
+  CmndZbZNPSendOrReceive(false);
+}
+
+void CmndZbZNPSend(void)
+{
+  CmndZbZNPSendOrReceive(true);
+}
+
+void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
+ if ((len < 2) || (len > 252)) {
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_JSON_ZIGBEEZNPSENT ": bad message len %d"), len);
+  return;
+ }
+ uint8_t data_len = len - 2;
+
+  if (ZigbeeSerial) {
+  uint8_t fcs = data_len;
+
+  ZigbeeSerial->write(ZIGBEE_SOF);
+
+  ZigbeeSerial->write(data_len);
+
+  for (uint32_t i = 0; i < len; i++) {
+   uint8_t b = pgm_read_byte(msg + i);
+   ZigbeeSerial->write(b);
+   fcs ^= b;
+
+  }
+  ZigbeeSerial->write(fcs);
+
+  }
+
+ char hex_char[(len * 2) + 2];
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZNPSENT " %s"),
+                                 ToHex_P(msg, len, hex_char, sizeof(hex_char)));
+}
+
+void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId) {
+  SBuffer buf(25+len);
+  buf.add8(Z_SREQ | Z_AF);
+  buf.add8(AF_DATA_REQUEST);
+  buf.add16(dtsAddr);
+  buf.add8(endpoint);
+  buf.add8(0x01);
+  buf.add16(clusterId);
+  buf.add8(transacId);
+  buf.add8(0x30);
+  buf.add8(0x1E);
+
+  buf.add8(3 + len);
+  buf.add8((needResponse ? 0x00 : 0x10) | (clusterSpecific ? 0x01 : 0x00));
+  buf.add8(transacId);
+  buf.add8(cmdId);
+  if (len > 0) {
+    buf.addBuffer(msg, len);
+  }
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+}
+
+void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
+                       uint16_t cluster, uint8_t cmd, const char *param) {
+  size_t size = param ? strlen(param) : 0;
+  SBuffer buf((size+2)/2);
+
+  if (param) {
+    while (*param) {
+      uint8_t code = parseHex_P(&param, 2);
+      buf.add8(code);
+    }
+  }
+
+  if (0 == endpoint) {
+
+    endpoint = zigbee_devices.findClusterEndpointIn(dstAddr, cluster);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
+    dstAddr, cluster, endpoint, cmd, param);
+
+  if (0 == endpoint) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
+    return;
+  }
+
+
+  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len(), false, zigbee_devices.getNextSeqNumber(dstAddr));
+
+  if (clusterSpecific) {
+    zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
+  }
+  ResponseCmndDone();
+}
+
+void CmndZbSend(void) {
+# 419 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+  static char delim[] = ", ";
+  uint16_t device = 0xFFFF;
+  uint8_t endpoint = 0x00;
+
+  uint16_t cluster = 0;
+  uint8_t cmd = 0;
+  String cmd_str = "";
+
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
+  if (nullptr != &val_cmd) {
+
+
+
+    if (val_cmd.is<JsonObject>()) {
+
+      JsonObject &cmd_obj = val_cmd.as<JsonObject&>();
+      int32_t cmd_size = cmd_obj.size();
+      if (cmd_size > 1) {
+        Response_P(PSTR("Only 1 command allowed (%d)"), cmd_size);
+        return;
+      } else if (1 == cmd_size) {
+
+        JsonObject::iterator it = cmd_obj.begin();
+        String key = it->key;
+        JsonVariant& value = it->value;
+        uint32_t x = 0, y = 0, z = 0;
+        uint16_t cmd_var;
+
+        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &cluster, &cmd_var);
+        if (tasmota_cmd) {
+          cmd_str = tasmota_cmd;
+        } else {
+          Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str());
+          return;
+        }
+
+
+        if (value.is<bool>()) {
+          x = value.as<bool>() ? 1 : 0;
+        } else if (value.is<unsigned int>()) {
+          x = value.as<unsigned int>();
+        } else {
+
+          const char *s_const = value.as<const char*>();
+          if (s_const != nullptr) {
+            char s[strlen(s_const)+1];
+            strcpy(s, s_const);
+            if ((nullptr != s) && (0x00 != *s)) {
+              char *sval = strtok(s, delim);
+              if (sval) {
+                x = ZigbeeAliasOrNumber(sval);
+                sval = strtok(nullptr, delim);
+                if (sval) {
+                  y = ZigbeeAliasOrNumber(sval);
+                  sval = strtok(nullptr, delim);
+                  if (sval) {
+                    z = ZigbeeAliasOrNumber(sval);
+                  }
+                }
+              }
+            }
+          }
+        }
+
+
+        if (0xFF == cmd_var) {
+          cmd = x;
+          x = y;
+          y = z;
+        } else {
+          cmd = cmd_var;
+        }
+        cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);
+
+      } else {
+
+      }
+    } else if (val_cmd.is<char*>()) {
+
+      cmd_str = val_cmd.as<String>();
+    } else {
+
+    }
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%04X!%02X/%s\"}"),
+              device, endpoint, cluster, cmd, cmd_str.c_str());
+    zigbeeZCLSendStr(device, endpoint, true, cluster, cmd, cmd_str.c_str());
+  } else {
+    Response_P(PSTR("Missing zigbee 'Send'"));
+    return;
+  }
+
+}
+
+ZBM(ZBS_BIND_REQ, Z_SREQ | Z_ZDO, ZDO_BIND_REQ,
+      0,0,
+      0,0,0,0,0,0,0,0,
+      0x00,
+      0x00, 0x00,
+      0x03,
+      0,0,0,0,0,0,0,0,
+      0x01
+)
+
+void CmndZbBind(void) {
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+
+  uint16_t device = 0xFFFF;
+  uint8_t endpoint = 0x00;
+  uint16_t cluster = 0;
+  uint32_t group = 0xFFFFFFFF;
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
+
+
+
+  SBuffer buf(sizeof(ZBS_BIND_REQ));
+  buf.add8(Z_SREQ | Z_ZDO);
+  buf.add8(ZDO_BIND_REQ);
+  buf.add16(device);
+  buf.add64(zigbee_devices.getDeviceLongAddr(device));
+  buf.add8(endpoint);
+  buf.add16(cluster);
+  buf.add8(0x03);
+  buf.add64(localIEEEAddr);
+  buf.add8(0x01);
+
+  ZigbeeZNPSend(buf.getBuffer(), buf.len());
+
+  ResponseCmndDone();
+}
+
+
+void CmndZbProbe(void) {
+  CmndZbProbeOrPing(true);
+}
+
+void CmndZbProbeOrPing(boolean probe) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+
+  Z_SendIEEEAddrReq(shortaddr);
+  if (probe) {
+    Z_SendActiveEpReq(shortaddr);
+  }
+  ResponseCmndDone();
+}
+
+
+void CmndZbPing(void) {
+  CmndZbProbeOrPing(false);
+}
+
+
+void CmndZbName(void) {
+
+
+
+
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+
+
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+  if (p == nullptr) {
+    const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
+  } else {
+    zigbee_devices.setFriendlyName(shortaddr, p);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, p);
+  }
+}
+
+
+void CmndZbForget(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+
+  if (zigbee_devices.removeDevice(shortaddr)) {
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Unknown device");
+  }
+}
+
+
+void CmndZbSave(void) {
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+  saveZigbeeDevices();
+
+  ResponseCmndDone();
+}
+
+
+void CmndZbRead(void) {
+
+
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  DynamicJsonBuffer jsonBuf;
+  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
+  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
+
+
+  uint16_t device = 0xFFFF;
+  uint16_t cluster = 0x0000;
+  uint8_t endpoint = 0x00;
+  size_t attrs_len = 0;
+  uint8_t* attrs = nullptr;
+
+  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
+  if (nullptr != &val_device) {
+    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+  }
+  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
+
+  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
+  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
+  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
+  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+
+  const JsonVariant &val_attr = getCaseInsensitive(json, PSTR("Read"));
+  if (nullptr != &val_attr) {
+    uint16_t val = strToUInt(val_attr);
+    if (val_attr.is<JsonArray>()) {
+      JsonArray& attr_arr = val_attr;
+      attrs_len = attr_arr.size() * 2;
+      attrs = new uint8_t[attrs_len];
+
+      uint32_t i = 0;
+      for (auto value : attr_arr) {
+        uint16_t val = strToUInt(value);
+        attrs[i++] = val & 0xFF;
+        attrs[i++] = val >> 8;
+      }
+    } else {
+      attrs_len = 2;
+      attrs = new uint8_t[attrs_len];
+      attrs[0] = val & 0xFF;
+      attrs[1] = val >> 8;
+    }
+  }
+
+  if (0 == endpoint) {
+    endpoint = zigbee_devices.findClusterEndpointIn(device, cluster);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
+  }
+
+  if ((0 != endpoint) && (attrs_len > 0)) {
+    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true , zigbee_devices.getNextSeqNumber(device));
+    ResponseCmndDone();
+  } else {
+    ResponseCmndChar("Missing parameters");
+  }
+
+  if (attrs) { delete[] attrs; }
+}
+
+
+void CmndZbPermitJoin(void)
+{
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+  uint32_t payload = XdrvMailbox.payload;
+  if (payload < 0) { payload = 0; }
+  if ((99 != payload) && (payload > 1)) { payload = 1; }
+
+  if (1 == payload) {
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60);
+  } else if (99 == payload){
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX);
+  } else {
+    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE);
+  }
+  ResponseCmndDone();
+}
+
+void CmndZbStatus(void) {
+  if (ZigbeeSerial) {
+    if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+    uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
+    if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+    if (XdrvMailbox.payload > 0) {
+      if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+    }
+
+    String dump = zigbee_devices.dump(XdrvMailbox.index, shortaddr);
+    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
+  }
+}
+
+
+
+
+
+bool Xdrv23(uint8_t function)
+{
+  bool result = false;
+
+  if (zigbee.active) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (!zigbee.init_phase) {
+          zigbee_devices.runTimer();
+        }
+        break;
+      case FUNC_LOOP:
+        if (ZigbeeSerial) { ZigbeeInput(); }
+    if (zigbee.state_machine) {
+
+          ZigbeeStateMachine_Run();
+    }
+        break;
+      case FUNC_PRE_INIT:
+        ZigbeeInit();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kZbCommands, ZigbeeCommand);
+        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
+#ifdef USE_BUZZER
+
+
+
+
+#define XDRV_24 24
+
+struct BUZZER {
+  uint32_t tune = 0;
+  uint32_t tune_reload = 0;
+  bool active = true;
+  bool enable = false;
+  uint8_t inverted = 0;
+  uint8_t count = 0;
+  uint8_t mode = 0;
+  uint8_t set[2];
+  uint8_t duration;
+  uint8_t state = 0;
+} Buzzer;
+
+
+
+void BuzzerOff(void)
+{
+  DigitalWrite(GPIO_BUZZER, Buzzer.inverted);
+}
+
+
+void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode)
+{
+  Buzzer.set[0] = off;
+  Buzzer.set[1] = on;
+  Buzzer.duration = 1;
+  Buzzer.tune_reload = 0;
+  Buzzer.mode = mode;
+
+  if (tune) {
+    uint32_t tune1 = tune;
+    uint32_t tune2 = tune;
+    for (uint32_t i = 0; i < 32; i++) {
+      if (!(tune2 & 0x80000000)) {
+        tune2 <<= 1;
+      } else {
+        Buzzer.tune_reload <<= 1;
+        Buzzer.tune_reload |= tune1 & 1;
+        tune1 >>= 1;
+      }
+    }
+    Buzzer.tune = Buzzer.tune_reload;
+  }
+  Buzzer.count = count * 2;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BUZ: %d(%d),%d,%d,0x%08X(0x%08X)"), count, Buzzer.count, on, off, tune, Buzzer.tune);
+
+  Buzzer.enable = (Buzzer.count > 0);
+  if (!Buzzer.enable) {
+    BuzzerOff();
+  }
+}
+
+void BuzzerSetStateToLed(uint32_t state)
+{
+  if (Buzzer.enable && (2 == Buzzer.mode)) {
+    Buzzer.state = (state != 0);
+    DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
+  }
+}
+
+void BuzzerBeep(uint32_t count)
+{
+  BuzzerBeep(count, 1, 1, 0, 0);
+}
+
+void BuzzerEnabledBeep(uint32_t count, uint32_t duration)
+{
+  if (Settings.flag3.buzzer_enable) {
+    BuzzerBeep(count, duration, 1, 0, 0);
+  }
+}
+
+
+
+bool BuzzerPinState(void)
+{
+  if (XdrvMailbox.index == GPIO_BUZZER_INV) {
+    Buzzer.inverted = 1;
+    XdrvMailbox.index -= (GPIO_BUZZER_INV - GPIO_BUZZER);
+    return true;
+  }
+  return false;
+}
+
+void BuzzerInit(void)
+{
+  if (pin[GPIO_BUZZER] < 99) {
+    pinMode(pin[GPIO_BUZZER], OUTPUT);
+    BuzzerOff();
+  } else {
+    Buzzer.active = false;
+  }
+}
+
+void BuzzerEvery100mSec(void)
+{
+  if (Buzzer.enable && (Buzzer.mode != 2)) {
+    if (Buzzer.count) {
+      if (Buzzer.duration) {
+        Buzzer.duration--;
+        if (!Buzzer.duration) {
+          if (Buzzer.tune) {
+            Buzzer.state = Buzzer.tune & 1;
+            Buzzer.tune >>= 1;
+          } else {
+            Buzzer.tune = Buzzer.tune_reload;
+            Buzzer.count -= (Buzzer.tune_reload) ? 2 : 1;
+            Buzzer.state = Buzzer.count & 1;
+            if (Buzzer.mode) {
+              Buzzer.count |= 2;
+            }
+          }
+          Buzzer.duration = Buzzer.set[Buzzer.state];
+        }
+      }
+      DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
+    } else {
+      Buzzer.enable = false;
+    }
+  }
+}
+
+
+
+
+
+const char kBuzzerCommands[] PROGMEM = "|"
+  "Buzzer" ;
+
+void (* const BuzzerCommand[])(void) PROGMEM = {
+  &CmndBuzzer };
+
+void CmndBuzzer(void)
+{
+# 174 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
+  if (XdrvMailbox.data_len > 0) {
+    if (XdrvMailbox.payload != 0) {
+      uint32_t parm[4] = { 0 };
+      uint32_t mode = 0;
+      ParseParameters(4, parm);
+      if (XdrvMailbox.payload <= 0) {
+        parm[0] = 1;
+        mode = -XdrvMailbox.payload;
+      }
+      for (uint32_t i = 1; i < 3; i++) {
+        if (parm[i] < 1) { parm[i] = 1; }
+      }
+      BuzzerBeep(parm[0], parm[1], parm[2], parm[3], mode);
+    } else {
+      BuzzerBeep(0);
+    }
+  } else {
+    BuzzerBeep(1);
+  }
+  ResponseCmndDone();
+}
+
+
+
+
+
+bool Xdrv24(uint8_t function)
+{
+  bool result = false;
+
+  if (Buzzer.active) {
+    switch (function) {
+      case FUNC_EVERY_100_MSECOND:
+        BuzzerEvery100mSec();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kBuzzerCommands, BuzzerCommand);
+        break;
+      case FUNC_PRE_INIT:
+        BuzzerInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = BuzzerPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
+# 21 "S:/Development/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
+#ifdef USE_A4988_STEPPER
+
+
+
+
+#define XDRV_25 25
+
+#include <A4988_Stepper.h>
+
+short A4988_dir_pin = pin[GPIO_MAX];
+short A4988_stp_pin = pin[GPIO_MAX];
+short A4988_ms1_pin = pin[GPIO_MAX];
+short A4988_ms2_pin = pin[GPIO_MAX];
+short A4988_ms3_pin = pin[GPIO_MAX];
+short A4988_ena_pin = pin[GPIO_MAX];
+int A4988_spr = 0;
+float A4988_rpm = 0;
+short A4988_mis = 0;
+
+A4988_Stepper* myA4988 = nullptr;
+
+void A4988Init(void)
+{
+  A4988_dir_pin = pin[GPIO_A4988_DIR];
+  A4988_stp_pin = pin[GPIO_A4988_STP];
+  A4988_ena_pin = pin[GPIO_A4988_ENA];
+  A4988_ms1_pin = pin[GPIO_A4988_MS1];
+  A4988_ms2_pin = pin[GPIO_A4988_MS2];
+  A4988_ms3_pin = pin[GPIO_A4988_MS3];
+  A4988_spr = 200;
+  A4988_rpm = 30;
+  A4988_mis = 1;
+
+  myA4988 = new A4988_Stepper( A4988_spr
+                            , A4988_rpm
+                            , A4988_mis
+                            , A4988_dir_pin
+                            , A4988_stp_pin
+                            , A4988_ena_pin
+                            , A4988_ms1_pin
+                            , A4988_ms2_pin
+                            , A4988_ms3_pin );
+}
+
+const char kA4988Commands[] PROGMEM = "Motor|"
+  "Move|Rotate|Turn|MIS|SPR|RPM";
+
+void (* const A4988Command[])(void) PROGMEM = {
+  &CmndDoMove,&CmndDoRotate,&CmndDoTurn,&CmndSetMIS,&CmndSetSPR,&CmndSetRPM};
+
+void CmndDoMove(void) {
+  if (XdrvMailbox.data_len > 0) {
+    long stepsPlease = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->doMove(stepsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndDoRotate(void) {
+  if (XdrvMailbox.data_len > 0) {
+    long degrsPlease = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->doRotate(degrsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndDoTurn(void) {
+  if (XdrvMailbox.data_len > 0) {
+    float turnsPlease = strtod(XdrvMailbox.data,nullptr);
+    myA4988->doTurn(turnsPlease);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetMIS(void) {
+  if ((pin[GPIO_A4988_MS1] < 99) && (pin[GPIO_A4988_MS2] < 99) && (pin[GPIO_A4988_MS3] < 99) && (XdrvMailbox.data_len > 0)) {
+    short newMIS = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setMIS(newMIS);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetSPR(void) {
+  if (XdrvMailbox.data_len > 0) {
+    int newSPR = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setSPR(newSPR);
+    ResponseCmndDone();
+  }
+}
+
+void CmndSetRPM(void) {
+  if (XdrvMailbox.data_len > 0) {
+    short newRPM = strtoul(XdrvMailbox.data,nullptr,10);
+    myA4988->setRPM(newRPM);
+    ResponseCmndDone();
+  }
+}
+
+
+
+
+bool Xdrv25(uint8_t function)
+{
+  bool result = false;
+  if ((pin[GPIO_A4988_DIR] < 99) && (pin[GPIO_A4988_STP] < 99)) {
+    switch (function) {
+      case FUNC_INIT:
+        A4988Init();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kA4988Commands, A4988Command);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
+#ifdef USE_LIGHT
+#ifdef USE_ARILUX_RF
+
+
+
+
+#define XDRV_26 26
+
+const uint32_t ARILUX_RF_TIME_AVOID_DUPLICATE = 1000;
+
+const uint8_t ARILUX_RF_MAX_CHANGES = 51;
+const uint32_t ARILUX_RF_SEPARATION_LIMIT = 4300;
+const uint32_t ARILUX_RF_RECEIVE_TOLERANCE = 60;
+
+struct ARILUX {
+  unsigned int rf_timings[ARILUX_RF_MAX_CHANGES];
+
+  unsigned long rf_received_value = 0;
+  unsigned long rf_last_received_value = 0;
+  unsigned long rf_last_time = 0;
+  unsigned long rf_lasttime = 0;
+
+  unsigned int rf_change_count = 0;
+  unsigned int rf_repeat_count = 0;
+
+  uint8_t rf_toggle = 0;
+} Arilux;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+#ifndef USE_WS2812_DMA
+void AriluxRfInterrupt(void) ICACHE_RAM_ATTR;
+#endif
+#endif
+
+void AriluxRfInterrupt(void)
+{
+  unsigned long time = micros();
+  unsigned int duration = time - Arilux.rf_lasttime;
+
+  if (duration > ARILUX_RF_SEPARATION_LIMIT) {
+    if (abs(duration - Arilux.rf_timings[0]) < 200) {
+      Arilux.rf_repeat_count++;
+      if (Arilux.rf_repeat_count == 2) {
+        unsigned long code = 0;
+        const unsigned int delay = Arilux.rf_timings[0] / 31;
+        const unsigned int delayTolerance = delay * ARILUX_RF_RECEIVE_TOLERANCE / 100;
+        for (unsigned int i = 1; i < Arilux.rf_change_count -1; i += 2) {
+          code <<= 1;
+          if (abs(Arilux.rf_timings[i] - (delay *3)) < delayTolerance && abs(Arilux.rf_timings[i +1] - delay) < delayTolerance) {
+            code |= 1;
+          }
+        }
+        if (Arilux.rf_change_count > 49) {
+          Arilux.rf_received_value = code;
+        }
+        Arilux.rf_repeat_count = 0;
+      }
+    }
+    Arilux.rf_change_count = 0;
+  }
+  if (Arilux.rf_change_count >= ARILUX_RF_MAX_CHANGES) {
+    Arilux.rf_change_count = 0;
+    Arilux.rf_repeat_count = 0;
+  }
+  Arilux.rf_timings[Arilux.rf_change_count++] = duration;
+  Arilux.rf_lasttime = time;
+}
+
+void AriluxRfHandler(void)
+{
+  unsigned long now = millis();
+  if (Arilux.rf_received_value && !((Arilux.rf_received_value == Arilux.rf_last_received_value) && (now - Arilux.rf_last_time < ARILUX_RF_TIME_AVOID_DUPLICATE))) {
+    Arilux.rf_last_received_value = Arilux.rf_received_value;
+    Arilux.rf_last_time = now;
+
+    uint16_t hostcode = Arilux.rf_received_value >> 8 & 0xFFFF;
+    if (Settings.rf_code[1][6] == Settings.rf_code[1][7]) {
+      Settings.rf_code[1][6] = hostcode >> 8 & 0xFF;
+      Settings.rf_code[1][7] = hostcode & 0xFF;
+    }
+    uint16_t stored_hostcode = Settings.rf_code[1][6] << 8 | Settings.rf_code[1][7];
+
+    DEBUG_DRIVER_LOG(PSTR(D_LOG_RFR D_HOST D_CODE " 0x%04X, " D_RECEIVED " 0x%06X"), stored_hostcode, Arilux.rf_received_value);
+
+    if (hostcode == stored_hostcode) {
+      char command[33];
+      char value = '-';
+      command[0] = '\0';
+      uint8_t keycode = Arilux.rf_received_value & 0xFF;
+      switch (keycode) {
+        case 1:
+        case 3:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_POWER " %d"), (1 == keycode) ? 1 : 0);
+          break;
+        case 2:
+          Arilux.rf_toggle++;
+          Arilux.rf_toggle &= 0x3;
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), 200 + Arilux.rf_toggle);
+          break;
+        case 4:
+          value = '+';
+        case 7:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_SPEED " %c"), value);
+          break;
+        case 5:
+          value = '+';
+        case 8:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_SCHEME " %c"), value);
+          break;
+        case 6:
+          value = '+';
+        case 9:
+          snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %c"), value);
+          break;
+        default: {
+          if ((keycode >= 10) && (keycode <= 21)) {
+            snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), keycode -9);
+          }
+        }
+      }
+      if (strlen(command)) {
+        ExecuteCommand(command, SRC_LIGHT);
+      }
+    }
+  }
+  Arilux.rf_received_value = 0;
+}
+
+void AriluxRfInit(void)
+{
+  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
+    if (Settings.last_module != Settings.module) {
+      Settings.rf_code[1][6] = 0;
+      Settings.rf_code[1][7] = 0;
+      Settings.last_module = Settings.module;
+    }
+    Arilux.rf_received_value = 0;
+
+    digitalWrite(pin[GPIO_ARIRFSEL], 0);
+    attachInterrupt(pin[GPIO_ARIRFRCV], AriluxRfInterrupt, CHANGE);
+  }
+}
+
+void AriluxRfDisable(void)
+{
+  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
+    detachInterrupt(pin[GPIO_ARIRFRCV]);
+    digitalWrite(pin[GPIO_ARIRFSEL], 1);
+  }
+}
+
+
+
+
+
+bool Xdrv26(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_50_MSECOND:
+      if (pin[GPIO_ARIRFRCV] < 99) { AriluxRfHandler(); }
+      break;
+    case FUNC_EVERY_SECOND:
+      if (10 == uptime) { AriluxRfInit(); }
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
+#ifdef USE_SHUTTER
+
+
+
+
+#define XDRV_27 27
+
+#define D_SHUTTER "SHUTTER"
+
+const uint16_t MOTOR_STOP_TIME = 500;
+const uint8_t steps_per_second = 20;
+
+uint8_t calibrate_pos[6] = {0,30,50,70,90,100};
+uint16_t messwerte[5] = {30,50,70,90,100};
+uint16_t last_execute_step;
+
+enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
+
+const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
+  D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION "|"
+  D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
+  D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
+  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME;
+
+void (* const ShutterCommand[])(void) PROGMEM = {
+  &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
+  &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
+  &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
+  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
+
+  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d}";
+  const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
+
+#include <Ticker.h>
+
+Ticker TickerShutter;
+
+struct SHUTTER {
+  power_t mask = 0;
+  power_t old_power = 0;
+  power_t switched_relay = 0;
+  uint32_t time[MAX_SHUTTERS];
+  int32_t open_max[MAX_SHUTTERS];
+  int32_t target_position[MAX_SHUTTERS];
+  int32_t start_position[MAX_SHUTTERS];
+  int32_t real_position[MAX_SHUTTERS];
+  uint16_t open_time[MAX_SHUTTERS];
+  uint16_t close_time[MAX_SHUTTERS];
+  uint16_t close_velocity[MAX_SHUTTERS];
+  int8_t direction[MAX_SHUTTERS];
+  uint8_t mode = 0;
+  int16_t motordelay[MAX_SHUTTERS];
+  int16_t pwm_frequency[MAX_SHUTTERS];
+  uint16_t max_pwm_frequency = 1000;
+  uint16_t max_close_pwm_frequency[MAX_SHUTTERS];
+  uint8_t skip_relay_change;
+  int32_t accelerator[MAX_SHUTTERS];
+} Shutter;
+
+void ShutterLogPos(uint32_t i)
+{
+  char stemp2[10];
+  dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
+    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency[i]);
+}
+
+void ShutterRtc50mS(void)
+{
+  for (uint8_t i = 0; i < shutters_present; i++) {
+    Shutter.time[i]++;
+    if (Shutter.accelerator[i]) {
+
+      Shutter.pwm_frequency[i] += Shutter.accelerator[i];
+      Shutter.pwm_frequency[i] = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency[i]));
+      analogWriteFreq(Shutter.pwm_frequency[i]);
+      analogWrite(pin[GPIO_PWM1+i], 50);
+    }
+  }
+}
+
+#define SHT_DIV_ROUND(__A,__B) (((__A) + (__B)/2) / (__B))
+
+int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
+{
+ if (Settings.shutter_set50percent[index] != 50) {
+    return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
+ } else {
+    uint32_t realpos;
+
+    for (uint32_t j = 0; j < 5; j++) {
+      if (0 == Settings.shuttercoeff[j][index]) {
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
+        for (uint32_t k = 0; k < 5; k++) {
+          Settings.shuttercoeff[k][index] = SHT_DIV_ROUND(calibrate_pos[k+1] * 1000, calibrate_pos[5]);
+        }
+      }
+    }
+    for (uint32_t i = 0; i < 5; i++) {
+      if ((percent * 10) >= Settings.shuttercoeff[i][index]) {
+        realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
+
+      } else {
+        if (0 == i) {
+          realpos = SHT_DIV_ROUND(SHT_DIV_ROUND(percent * Shutter.open_max[index] * calibrate_pos[i+1], Settings.shuttercoeff[i][index]), 10);
+        } else {
+
+
+          realpos += SHT_DIV_ROUND(SHT_DIV_ROUND((percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]), Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), 100);
+        }
+        break;
+      }
+    }
+  return realpos;
+ }
+}
+
+uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
+{
+ if (Settings.shutter_set50percent[index] != 50) {
+  return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
+ } else {
+    uint16_t realpercent;
+
+    for (uint32_t i = 0; i < 5; i++) {
+      if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
+        realpercent = SHT_DIV_ROUND(Settings.shuttercoeff[i][index], 10);
+
+      } else {
+        if (0 == i) {
+          realpercent = SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * Settings.shuttercoeff[i][index], calibrate_pos[i+1]), Shutter.open_max[index]);
+        } else {
+
+
+
+          realpercent += SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), (calibrate_pos[i+1] - calibrate_pos[i])), Shutter.open_max[index]) ;
+        }
+        break;
+      }
+    }
+    return realpercent;
+  }
+}
+
+void ShutterInit(void)
+{
+  shutters_present = 0;
+  Shutter.mask = 0;
+
+  Shutter.old_power = power;
+  bool relay_in_interlock = false;
+
+
+  if (Settings.shutter_startrelay[MAX_SHUTTERS] == 0) {
+     Shutter.max_pwm_frequency = Settings.shuttercoeff[4][3] > 0 ? Settings.shuttercoeff[4][3] : Shutter.max_pwm_frequency;
+  }
+  for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+
+    Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i == 0? 1 : Settings.shutter_startrelay[i]);
+    if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
+      shutters_present++;
+
+
+      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1) ;
+
+      for (uint32_t j = 0; j < MAX_INTERLOCKS * Settings.flag.interlock; j++) {
+
+        if (Settings.interlock[j] && (Settings.interlock[j] & Shutter.mask)) {
+
+          relay_in_interlock = true;
+        }
+      }
+      if (relay_in_interlock) {
+        if (Settings.pulse_timer[i] > 0) {
+          Shutter.mode = SHT_PULSE_OPEN__PULSE_CLOSE;
+        } else {
+          Shutter.mode = SHT_OFF_OPEN__OFF_CLOSE;
+        }
+      } else {
+        Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
+        if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
+          Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
+          Shutter.pwm_frequency[i] = 0;
+          Shutter.accelerator[i] = 0;
+          analogWriteFreq(Shutter.pwm_frequency[i]);
+          analogWrite(pin[GPIO_PWM1+i], 50);
+        }
+      }
+
+      TickerShutter.attach_ms(50, ShutterRtc50mS );
+
+      Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] > 0) ? Settings.shutter_set50percent[i] : 50;
+
+
+      Shutter.open_time[i] = (Settings.shutter_opentime[i] > 0) ? Settings.shutter_opentime[i] : 100;
+      Shutter.close_time[i] = (Settings.shutter_closetime[i] > 0) ? Settings.shutter_closetime[i] : 100;
+
+
+      Shutter.open_max[i] = 200 * Shutter.open_time[i];
+      Shutter.close_velocity[i] = Shutter.open_max[i] / Shutter.close_time[i] / 2 ;
+      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i] / Shutter.close_time[i];
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d Closefreq: %d"),i, Shutter.max_close_pwm_frequency[i]);
+
+
+      if (Settings.shutter_set50percent[i] != 50) {
+       Settings.shuttercoeff[1][i] = Shutter.open_max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
+       Settings.shuttercoeff[0][i] = Shutter.open_max[i] - (Settings.shuttercoeff[1][i] * 100);
+       Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
+      }
+      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1);
+
+      Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
+
+      Shutter.start_position[i] = Shutter.target_position[i] = Shutter.real_position[i];
+      Shutter.motordelay[i] = Settings.shutter_motordelay[i];
+
+      char shutter_open_chr[10];
+      dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
+      char shutter_close_chr[10];
+      dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, end stop time enabled %d, shuttermode %d, motordelay %d"),
+        i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
+        Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
+        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, (Settings.shutter_options[i]&4) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
+
+    } else {
+
+      break;
+    }
+    ShutterLimitRealAndTargetPositions(i);
+    Settings.shutter_accuracy = 1;
+  }
+}
+
+void ShutterReportPosition(bool always)
+{
+  Response_P(PSTR("{"));
+  for (uint32_t i = 0; i < shutters_present; i++) {
+
+    uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
+    if (Shutter.direction[i] != 0) {
+      rules_flag.shutter_moving = 1;
+      ShutterLogPos(i);
+    }
+    if (i) { ResponseAppend_P(PSTR(",")); }
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i], ShutterRealToPercentPosition(Shutter.target_position[i], i));
+  }
+  ResponseJsonEnd();
+  if (always || (rules_flag.shutter_moving)) {
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
+  }
+
+
+}
+
+void ShutterLimitRealAndTargetPositions(uint32_t i) {
+  if (Shutter.real_position[i]<0) Shutter.real_position[i] = 0;
+  if (Shutter.real_position[i]>Shutter.open_max[i]) Shutter.real_position[i] = Shutter.open_max[i];
+  if (Shutter.target_position[i]<0) Shutter.target_position[i] = 0;
+  if (Shutter.target_position[i]>Shutter.open_max[i]) Shutter.target_position[i] = Shutter.open_max[i];
+}
+
+void ShutterUpdatePosition(void)
+{
+
+  char scommand[CMDSZ];
+  char stopic[TOPSZ];
+
+  for (uint32_t i = 0; i < shutters_present; i++) {
+    if (Shutter.direction[i] != 0) {
+      int32_t stop_position_delta = 20;
+      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+
+
+        Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+
+        int32_t max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
+        int32_t max_freq_change_per_sec = Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
+        int32_t min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
+        int32_t velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
+        int32_t minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency * Shutter.direction[i] ;
+
+        int32_t next_possible_stop = Shutter.real_position[i] + minstopway ;
+        stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+
+
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
+                                      Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
+
+        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
+
+            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop) ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
+
+        } else if ( Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] == max_frequency) {
+          Shutter.accelerator[i] = 0;
+        }
+      } else {
+        Shutter.real_position[i] = Shutter.start_position[i] + ( (Shutter.time[i] - Shutter.motordelay[i]) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
+      }
+      if ( Shutter.real_position[i] * Shutter.direction[i] + stop_position_delta >= Shutter.target_position[i] * Shutter.direction[i] ) {
+
+
+        uint8_t cur_relay = Settings.shutter_startrelay[i] + (Shutter.direction[i] == 1 ? 0 : 1) ;
+        int16_t missing_steps;
+
+        switch (Shutter.mode) {
+          case SHT_PULSE_OPEN__PULSE_CLOSE:
+
+            if (SRC_PULSETIMER == last_source || SRC_SHUTTER == last_source || SRC_WEBGUI == last_source) {
+              ExecuteCommandPower(cur_relay, 1, SRC_SHUTTER);
+            } else {
+              last_source = SRC_SHUTTER;
+            }
+          break;
+          case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
+            missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
+
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency[i]);
+            Shutter.accelerator[i] = 0;
+            Shutter.pwm_frequency[i] = Shutter.pwm_frequency[i] > 250 ? 250 : Shutter.pwm_frequency[i];
+            analogWriteFreq(Shutter.pwm_frequency[i]);
+            analogWrite(pin[GPIO_PWM1+i], 50);
+            Shutter.pwm_frequency[i] = 0;
+            analogWriteFreq(Shutter.pwm_frequency[i]);
+            while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
+              delay(1);
+            }
+            analogWrite(pin[GPIO_PWM1+i], 0);
+            Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
+
+            if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
+              ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+              ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
+            }
+          break;
+          case SHT_OFF_ON__OPEN_CLOSE:
+          if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
+            ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+            ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
+          }
+          break;
+          case SHT_OFF_OPEN__OFF_CLOSE:
+
+            if ((1 << (cur_relay-1)) & power) {
+
+              ExecuteCommandPower(cur_relay, 0, SRC_SHUTTER);
+            }
+          break;
+        }
+        ShutterLimitRealAndTargetPositions(i);
+        Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
+
+        ShutterLogPos(i);
+
+        Shutter.start_position[i] = Shutter.real_position[i];
+
+
+        snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i+1);
+        GetTopic_P(stopic, STAT, mqtt_topic, scommand);
+        Response_P("%d", (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
+        MqttPublish(stopic, Settings.flag.mqtt_power_retain);
+
+        Shutter.direction[i] = 0;
+        ShutterReportPosition(true);
+        rules_flag.shutter_moved = 1;
+        XdrvRulesProcess();
+      }
+    }
+  }
+}
+
+bool ShutterState(uint32_t device)
+{
+  device--;
+  device &= 3;
+  return (Settings.flag3.shutter_mode &&
+          (Shutter.mask & (1 << (Settings.shutter_startrelay[device]-1))) );
+}
+
+void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
+{
+
+  if ( ( (1 == direction) && ((Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2) )
+     || ( (-1 == direction) && (Shutter.real_position[i] / Shutter.close_velocity[i] <= 2)) ) {
+    Shutter.skip_relay_change = 1;
+  } else {
+    if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+      Shutter.pwm_frequency[i] = 0;
+      analogWriteFreq(Shutter.pwm_frequency[i]);
+      analogWrite(pin[GPIO_PWM1+i], 0);
+
+      if (pin[GPIO_CNTR1+i] < 99) {
+        RtcSettings.pulse_counter[i] = 0;
+      }
+      Shutter.accelerator[i] = Shutter.max_pwm_frequency / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Ramp up: %d"), Shutter.accelerator[i]);
+    }
+    Shutter.target_position[i] = target_pos;
+    Shutter.start_position[i] = Shutter.real_position[i];
+    Shutter.time[i] = 0;
+    Shutter.skip_relay_change = 0;
+    Shutter.direction[i] = direction;
+
+  }
+
+}
+
+void ShutterWaitForMotorStop(uint32_t i)
+{
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
+  if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+    if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
+
+      while (Shutter.pwm_frequency[i] > 0) {
+
+        Shutter.pwm_frequency[i] = tmax(Shutter.pwm_frequency[i]-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
+
+        analogWriteFreq(Shutter.pwm_frequency[i]);
+        analogWrite(pin[GPIO_PWM1+i], 50);
+        delay(50);
+      }
+      analogWrite(pin[GPIO_PWM1+i], 0);
+      Shutter.real_position[i] = ShutterCounterBasedPosition(i);
+    } else {
+      ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
+      delay(MOTOR_STOP_TIME);
+    }
+  } else {
+    delay(MOTOR_STOP_TIME);
+  }
+}
+
+int32_t ShutterCounterBasedPosition(uint32_t i)
+{
+  return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
+}
+
+void ShutterRelayChanged(void)
+{
+
+
+
+
+  char stemp1[10];
+
+ for (uint32_t i = 0; i < shutters_present; i++) {
+  power_t powerstate_local = (power >> (Settings.shutter_startrelay[i] -1)) & 3;
+
+    uint8 manual_relays_changed = ((Shutter.switched_relay >> (Settings.shutter_startrelay[i] -1)) & 3) && SRC_SHUTTER != last_source && SRC_PULSETIMER != last_source ;
+
+    if (manual_relays_changed) {
+
+      ShutterLimitRealAndTargetPositions(i);
+      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
+        ShutterWaitForMotorStop(i);
+    switch (powerstate_local) {
+     case 1:
+            ShutterStartInit(i, 1, Shutter.open_max[i]);
+       break;
+     case 3:
+       ShutterStartInit(i, -1, 0);
+       break;
+     default:
+
+       Shutter.target_position[i] = Shutter.real_position[i];
+      }
+   } else {
+        if (Shutter.direction[i] != 0 && (!powerstate_local || (powerstate_local && Shutter.mode == SHT_PULSE_OPEN__PULSE_CLOSE))) {
+     Shutter.target_position[i] = Shutter.real_position[i];
+     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Switch OFF motor. Target: %ld, source: %s, powerstate_local %ld, Shutter.switched_relay %d, manual change %d"), i+1, Shutter.target_position[i], GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), powerstate_local,Shutter.switched_relay,manual_relays_changed);
+    } else {
+     last_source = SRC_SHUTTER;
+     if (powerstate_local == 2) {
+
+            ShutterWaitForMotorStop(i);
+       ShutterStartInit(i, -1, 0);
+     } else {
+
+            ShutterWaitForMotorStop(i);
+       ShutterStartInit(i, 1, Shutter.open_max[i]);
+     }
+    }
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Target: %ld, powerstatelocal %d"), i+1, Shutter.target_position[i], powerstate_local);
+   }
+  }
+ }
+}
+
+bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
+
+  uint32 min_shutterbutton_hold_timer = -1;
+  for (uint32_t i = 0; i < MAX_KEYS; i++) {
+    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
+      min_shutterbutton_hold_timer = Button.hold_timer[i];
+  }
+  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
+}
+
+void ShutterButtonHandler(void)
+{
+  uint8_t buttonState = SHT_NOT_PRESSED;
+  uint8_t button = XdrvMailbox.payload;
+  uint8_t press_index;
+  uint32_t button_index = XdrvMailbox.index;
+  uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
+
+  uint16_t loops_per_second = 1000 / Settings.button_debounce;
+  if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
+    if (Settings.flag.button_single) {
+        buttonState = SHT_PRESSED_MULTI;
+        press_index = 1;
+    } else {
+      if ((Shutter.direction[shutter_index]) && (Button.press_counter[button_index]==0)) {
+        buttonState = SHT_PRESSED_IMMEDIATE;
+        press_index = 1;
+        Button.press_counter[button_index] = 99;
+      } else {
+        Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+      }
+    }
+    blinks = 201;
+  }
+
+  if (NOT_PRESSED == button) {
+    Button.hold_timer[button_index] = 0;
+  } else {
+    Button.hold_timer[button_index]++;
+    if (!Settings.flag.button_single) {
+      if (Settings.param[P_HOLD_IGNORE] > 0) {
+        if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+          Button.hold_timer[button_index] = 0;
+          Button.press_counter[button_index] = 0;
+        }
+      }
+      if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {
+
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
+
+          for (uint32_t i = 0; i < MAX_KEYS; i++)
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
+              Button.press_counter[i] = 99;
+          press_index = 0;
+          buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
+        }
+        if (Button.press_counter[button_index]<99) {
+          press_index = 0;
+          buttonState = SHT_PRESSED_HOLD;
+        }
+        Button.press_counter[button_index] = 0;
+      }
+      if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {
+
+        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
+
+          press_index = 0;
+          buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
+        }
+      }
+    }
+  }
+
+  if (!Settings.flag.button_single) {
+    if (Button.window_timer[button_index]) {
+      Button.window_timer[button_index]--;
+    } else {
+      if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
+        if (Button.press_counter[button_index]<99) {
+
+          uint32 min_shutterbutton_press_counter = -1;
+          for (uint32_t i = 0; i < MAX_KEYS; i++) {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
+              min_shutterbutton_press_counter = Button.press_counter[i];
+            }
+
+          }
+          if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
+
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
+            press_index = Button.press_counter[button_index];
+            for (uint32_t i = 0; i < MAX_KEYS; i++)
+              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
+                Button.press_counter[i] = 99;
+            buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
+          }
+          if ((buttonState != SHT_PRESSED_MULTI_SIMULTANEOUS) && (Button.press_counter[button_index]<99)) {
+
+            press_index = Button.press_counter[button_index];
+            buttonState = SHT_PRESSED_MULTI;
+          }
+        }
+        Button.press_counter[button_index] = 0;
+      }
+    }
+  }
+
+ if (buttonState != SHT_NOT_PRESSED) {
+   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
+     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) {
+
+       char scmnd[20];
+       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
+     if (!Settings.flag.button_restrict) {
+       char scmnd[20];
+       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+       ExecuteCommand(scmnd, SRC_BUTTON);
+       return;
+     }
+   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
+      if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
+        uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
+        if (pos_press_index>3) pos_press_index=3;
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, pos_press_index+1);
+        XdrvMailbox.index = shutter_index +1;
+        last_source = SRC_BUTTON;
+        XdrvMailbox.data_len = 0;
+        char databuf[1] = "";
+        XdrvMailbox.data = databuf;
+        XdrvMailbox.command = NULL;
+        if (buttonState == SHT_PRESSED_IMMEDIATE) {
+          XdrvMailbox.payload = XdrvMailbox.index;
+          CmndShutterStop();
+        } else {
+          uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
+          if (position) {
+            if (Shutter.direction[shutter_index]) {
+              XdrvMailbox.payload = XdrvMailbox.index;
+              CmndShutterStop();
+            } else {
+              XdrvMailbox.payload = position = (position-1)<<1;
+              CmndShutterPosition();
+              if (Settings.shutter_button[button_index] & ((0x01<<26)<<pos_press_index)) {
+
+                char scommand[CMDSZ];
+                char stopic[TOPSZ];
+                for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
+                  if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
+                    snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
+                    GetGroupTopic_P(stopic, scommand);
+                    Response_P("%d", position);
+                    MqttPublish(stopic, false);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    Response_P(PSTR("{"));
+    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
+    ResponseJsonEnd();
+    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    XdrvRulesProcess();
+  }
+}
+
+void ShutterSetPosition(uint32_t device, uint32_t position)
+{
+  char svalue[32];
+  snprintf_P(svalue, sizeof(svalue), PSTR(D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION "%d %d"), device, position);
+  ExecuteCommand(svalue, SRC_IGNORE);
+}
+
+
+
+
+
+void CmndShutterOpen(void)
+{
+
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+    XdrvMailbox.index = XdrvMailbox.payload;
+  }
+  XdrvMailbox.payload = 100;
+  last_source = SRC_WEBGUI;
+  CmndShutterPosition();
+}
+
+void CmndShutterClose(void)
+{
+
+  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+    XdrvMailbox.index = XdrvMailbox.payload;
+  }
+  XdrvMailbox.payload = 0;
+  XdrvMailbox.data_len = 0;
+  last_source = SRC_WEBGUI;
+  CmndShutterPosition();
+}
+
+void CmndShutterStop(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
+        XdrvMailbox.index = XdrvMailbox.payload;
+      }
+      uint32_t i = XdrvMailbox.index -1;
+      if (Shutter.direction[i] != 0) {
+
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
+
+        int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
+        XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
+
+        last_source = SRC_WEBGUI;
+        CmndShutterPosition();
+      } else {
+        if (XdrvMailbox.command)
+          ResponseCmndDone();
+      }
+    } else {
+      if (XdrvMailbox.command)
+        ResponseCmndIdxChar("Locked");
+    }
+  }
+}
+
+void CmndShutterPosition(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
+      uint32_t index = XdrvMailbox.index-1;
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
+
+
+
+      if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
+
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
+          CmndShutterOpen();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
+          CmndShutterClose();
+          return;
+        }
+        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
+          XdrvMailbox.payload = -99;
+          CmndShutterStop();
+          return;
+        }
+      }
+
+      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter.real_position[index], index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
+
+      target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
+      if (XdrvMailbox.payload != -99) {
+
+        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
+
+
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
+      }
+      if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
+        if (Settings.shutter_options[index] & 4) {
+          if (0 == target_pos_percent) Shutter.target_position[index] -= 1 * 2000;
+          if (100 == target_pos_percent) Shutter.target_position[index] += 1 * 2000;
+        }
+        int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
+        if (Shutter.direction[index] == -new_shutterdirection) {
+
+          if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
+
+            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
+            delay(100);
+          } else {
+            if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
+              ShutterWaitForMotorStop(index);
+            }
+          }
+        }
+        if (Shutter.direction[index] != new_shutterdirection) {
+          if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
+
+            ShutterWaitForMotorStop(index);
+            ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            if (Shutter.skip_relay_change == 0) {
+
+              ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
+
+              ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
+            }
+          } else {
+
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
+            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
+            if (Shutter.skip_relay_change == 0) {
+              ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
+            }
+
+          }
+          Shutter.switched_relay = 0;
+        }
+      } else {
+        target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
+        ShutterReportPosition(true);
+      }
+      XdrvMailbox.index = index +1;
+      if (XdrvMailbox.command)
+        ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
+    } else {
+      ShutterReportPosition(true);
+      if (XdrvMailbox.command)
+        ResponseCmndIdxChar("Locked");
+    }
+  }
+}
+
+void CmndShutterOpenTime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_opentime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_opentime[XdrvMailbox.index -1]) / 10, 1, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterCloseTime(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_closetime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_closetime[XdrvMailbox.index -1]) / 10, 1, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterMotorDelay(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      Settings.shutter_motordelay[XdrvMailbox.index -1] = (uint16_t)(steps_per_second * CharToFloat(XdrvMailbox.data));
+      ShutterInit();
+    }
+    char time_chr[10];
+    dtostrfd((float)(Settings.shutter_motordelay[XdrvMailbox.index -1]) / steps_per_second, 2, time_chr);
+    ResponseCmndIdxChar(time_chr);
+  }
+}
+
+void CmndShutterRelay(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 64)) {
+      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      if (XdrvMailbox.payload > 0) {
+        Shutter.mask |= 3 << (XdrvMailbox.payload - 1);
+      } else {
+        Shutter.mask ^= 3 << (Settings.shutter_startrelay[XdrvMailbox.index -1] - 1);
+      }
+      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      ShutterInit();
+
+    }
+    ResponseCmndIdxNumber(Settings.shutter_startrelay[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndShutterButton(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
+    uint32_t setting = 0;
+# 912 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
+    if (XdrvMailbox.data_len > 0) {
+        uint32_t i = 0;
+        uint32_t button_index = 0;
+        bool done = false;
+        bool isShortCommand = false;
+        char *str_ptr;
+
+        char data_copy[strlen(XdrvMailbox.data) +1];
+        strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
+
+        for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
+          int field;
+          if (str[0] == '-') {
+            field = -1;
+          } else {
+            field = atoi(str);
+          }
+          switch (i) {
+            case 0:
+              if ((field >= -1) && (field<=4)) {
+                button_index = (field<=0)?(-1):field;
+                done = (button_index==-1);
+              } else
+                done = true;
+            break;
+            case 1:
+              if (!strcmp_P(str, PSTR("up"))) {
+                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20);
+                isShortCommand = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("down"))) {
+                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20);
+                isShortCommand = true;
+                break;
+              } else if (!strcmp_P(str, PSTR("updown"))) {
+                setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
+                isShortCommand = true;
+                break;
+              }
+            case 2:
+              if (isShortCommand) {
+                if ((field==1) && (setting & (0x3F<<(2+6*3))))
+
+                  setting |= (0x3<<29);
+                done = true;
+                break;
+              }
+            case 3:
+            case 4:
+              if ((field >= -1) && (field<=100))
+                setting |= (((field>>1)+1)<<(i*6 + (2-6)));
+            break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+              if (field==1)
+                setting |= (1<<(i + (26-5)));
+            break;
+          }
+          if (done) break;
+        }
+
+        if (button_index) {
+          if (button_index==-1) {
+
+            for (uint32_t i=0 ; i < MAX_KEYS ; i++)
+              if ((Settings.shutter_button[i]&0x3) == (XdrvMailbox.index-1))
+                Settings.shutter_button[i] = 0;
+          } else {
+            if (setting) {
+
+              setting |= (1<<31);
+              setting |= (XdrvMailbox.index-1) & 0x3;
+            }
+            Settings.shutter_button[button_index-1] = setting;
+          }
+        }
+      }
+      char setting_chr[30*MAX_KEYS] = "-", *setting_chr_ptr = setting_chr;
+      for (uint32_t i=0 ; i < MAX_KEYS ; i++) {
+        setting = Settings.shutter_button[i];
+        if ((setting&(1<<31)) && ((setting&0x3) == (XdrvMailbox.index-1))) {
+          if (*setting_chr_ptr == 0)
+            setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|"));
+          setting_chr_ptr += snprintf_P(setting_chr_ptr, 2, PSTR("%d"), i+1);
+
+          for (uint32_t j=0 ; j < 4 ; j++) {
+            int8_t pos = (((setting>> (2+6*j))&(0x3f))-1)<<1;
+            if (pos>=0)
+              setting_chr_ptr += snprintf_P(setting_chr_ptr, 5, PSTR(" %d"), pos);
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+          for (uint32_t j=0 ; j < 5 ; j++) {
+            bool mqtt = ((setting>>(26+j))&(0x01)!=0);
+            if (mqtt)
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" 1"));
+            else
+              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
+          }
+        }
+      }
+      ResponseCmndIdxChar(setting_chr);
+   }
+}
+
+void CmndShutterSetHalfway(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
+      Settings.shutter_set50percent[XdrvMailbox.index -1] = (Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
+      ShutterInit();
+    }
+  ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndShutterFrequency(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) {
+    Shutter.max_pwm_frequency = XdrvMailbox.payload;
+    if (shutters_present < 4) {
+      Settings.shuttercoeff[4][3] = Shutter.max_pwm_frequency;
+    }
+    ShutterInit();
+    ResponseCmndNumber(XdrvMailbox.payload);
+  } else {
+    ResponseCmndNumber(Shutter.max_pwm_frequency);
+  }
+}
+
+void CmndShutterSetClose(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    Shutter.real_position[XdrvMailbox.index -1] = 0;
+    ShutterStartInit(XdrvMailbox.index -1, 0, 0);
+    Settings.shutter_position[XdrvMailbox.index -1] = 0;
+    ResponseCmndIdxChar(D_CONFIGURATION_RESET);
+  }
+}
+
+void CmndShutterInvert(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(1);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (1);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 1 : 0);
+  }
+}
+
+void CmndShutterCalibration(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.data_len > 0) {
+      uint32_t i = 0;
+      char *str_ptr;
+
+      char data_copy[strlen(XdrvMailbox.data) +1];
+      strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
+
+      for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
+        int field = atoi(str);
+
+
+        if ((field <= 0) || (field > 30000) || ( (i>0) && (field <= messwerte[i-1]) ) ) {
+          break;
+        }
+        messwerte[i] = field;
+      }
+      for (i = 0; i < 5; i++) {
+        Settings.shuttercoeff[i][XdrvMailbox.index -1] = SHT_DIV_ROUND((uint32_t)messwerte[i] * 1000, messwerte[4]);
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
+      }
+      ShutterInit();
+      ResponseCmndIdxChar(XdrvMailbox.data);
+    } else {
+      char setting_chr[30] = "0";
+      snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);
+      ResponseCmndIdxChar(setting_chr);
+    }
+  }
+}
+
+void CmndShutterLock(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(2);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (2);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 2) ? 1 : 0);
+  }
+}
+
+void CmndShutterEnableEndStopTime(void) {
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
+    if (XdrvMailbox.payload == 0) {
+      Settings.shutter_options[XdrvMailbox.index -1] &= ~(4);
+    } else if (XdrvMailbox.payload == 1) {
+      Settings.shutter_options[XdrvMailbox.index -1] |= (4);
+    }
+    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 4) ? 1 : 0);
+  }
+}
+
+
+
+
+
+bool Xdrv27(uint8_t function)
+{
+  bool result = false;
+
+  if (Settings.flag3.shutter_mode) {
+    switch (function) {
+      case FUNC_PRE_INIT:
+        ShutterInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        ShutterUpdatePosition();
+        break;
+      case FUNC_EVERY_SECOND:
+
+        ShutterReportPosition(false);
+        break;
+
+      case FUNC_COMMAND:
+        result = DecodeCommand(kShutterCommands, ShutterCommand);
+        break;
+      case FUNC_JSON_APPEND:
+        for (uint8_t i = 0; i < shutters_present; i++) {
+          uint8_t position = (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
+          ResponseAppend_P(",");
+          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
+#ifdef USE_DOMOTICZ
+          if ((0 == tele_period) && (0 == i)) {
+             DomoticzSensor(DZ_SHUTTER, position);
+          }
+#endif
+        }
+        break;
+      case FUNC_SET_POWER:
+        char stemp1[10];
+
+        Shutter.switched_relay = XdrvMailbox.index ^ Shutter.old_power;
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Switched relay: %d by %s"), Shutter.switched_relay,GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource));
+        ShutterRelayChanged();
+        Shutter.old_power = XdrvMailbox.index;
+      break;
+      case FUNC_SET_DEVICE_POWER:
+        if (Shutter.skip_relay_change ) {
+          uint8_t i;
+          for (i = 0; i < devices_present; i++) {
+            if (Shutter.switched_relay &1) {
+              break;
+            }
+            Shutter.switched_relay >>= 1;
+          }
+
+          result = true;
+          Shutter.skip_relay_change = 0;
+          AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Skipping switch off relay %d"),i);
+          ExecuteCommandPower(i+1, 0, SRC_SHUTTER);
+        }
+      break;
+      case FUNC_BUTTON_PRESSED:
+        if (Settings.shutter_button[XdrvMailbox.index] & (1<<31)) {
+          ShutterButtonHandler();
+          result = true;
+        }
+      break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_28_pcf8574.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_28_pcf8574.ino"
+#ifdef USE_I2C
+#ifdef USE_PCF8574
+
+
+
+
+
+
+
+#define XDRV_28 28
+#define XI2C_02 2
+
+#define PCF8574_ADDR1 0x20
+#define PCF8574_ADDR2 0x38
+
+struct PCF8574 {
+  int error;
+  uint8_t pin[64];
+  uint8_t address[MAX_PCF8574];
+  uint8_t pin_mask[MAX_PCF8574] = { 0 };
+  uint8_t max_connected_ports = 0;
+  uint8_t max_devices = 0;
+  char stype[9];
+  bool type = false;
+} Pcf8574;
+
+void Pcf8574SwitchRelay(void)
+{
+  for (uint32_t i = 0; i < devices_present; i++) {
+    uint8_t relay_state = bitRead(XdrvMailbox.index, i);
+
+
+
+    if (Pcf8574.max_devices > 0 && Pcf8574.pin[i] < 99) {
+      uint8_t board = Pcf8574.pin[i]>>3;
+      uint8_t oldpinmask = Pcf8574.pin_mask[board];
+      uint8_t _val = bitRead(rel_inverted, i) ? !relay_state : relay_state;
+
+
+
+      if (_val) {
+        Pcf8574.pin_mask[board] |= _val << (Pcf8574.pin[i]&0x7);
+      } else {
+        Pcf8574.pin_mask[board] &= ~(1 << (Pcf8574.pin[i]&0x7));
+      }
+      if (oldpinmask != Pcf8574.pin_mask[board]) {
+        Wire.beginTransmission(Pcf8574.address[board]);
+        Wire.write(Pcf8574.pin_mask[board]);
+        Pcf8574.error = Wire.endTransmission();
+      }
+
+    }
+  }
+}
+
+void Pcf8574Init(void)
+{
+  uint8_t pcf8574_address = PCF8574_ADDR1;
+  while ((Pcf8574.max_devices < MAX_PCF8574) && (pcf8574_address < PCF8574_ADDR2 +8)) {
+
+
+
+    if (I2cSetDevice(pcf8574_address)) {
+      Pcf8574.type = true;
+
+      Pcf8574.address[Pcf8574.max_devices] = pcf8574_address;
+      Pcf8574.max_devices++;
+
+      strcpy(Pcf8574.stype, "PCF8574");
+      if (pcf8574_address >= PCF8574_ADDR2) {
+        strcpy(Pcf8574.stype, "PCF8574A");
+      }
+      I2cSetActiveFound(pcf8574_address, Pcf8574.stype);
+    }
+
+    pcf8574_address++;
+#ifdef USE_MCP230xx_ADDR
+    if (USE_MCP230xx_ADDR == pcf8574_address) {
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
+      pcf8574_address++;
+    }
+#endif
+    if ((PCF8574_ADDR1 +7) == pcf8574_address) {
+      pcf8574_address = PCF8574_ADDR2 +1;
+    }
+  }
+  if (Pcf8574.type) {
+    for (uint32_t i = 0; i < sizeof(Pcf8574.pin); i++) {
+      Pcf8574.pin[i] = 99;
+    }
+    devices_present = devices_present - Pcf8574.max_connected_ports;
+    Pcf8574.max_connected_ports = 0;
+    for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PCF: Device %d config 0x%02x"), idx +1, Settings.pcf8574_config[idx]);
+
+      for (uint32_t i = 0; i < 8; i++) {
+        uint8_t _result = Settings.pcf8574_config[idx] >> i &1;
+
+        if (_result > 0) {
+          Pcf8574.pin[devices_present] = i + 8 * idx;
+          bitWrite(rel_inverted, devices_present, Settings.flag3.pcf8574_ports_inverted);
+          devices_present++;
+          Pcf8574.max_connected_ports++;
+        }
+      }
+    }
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Total devices %d, PCF8574 output ports %d"), Pcf8574.max_devices, Pcf8574.max_connected_ports);
+  }
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#define WEB_HANDLE_PCF8574 "pcf"
+
+const char HTTP_BTN_MENU_PCF8574[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_PCF8574 "' method='get'><button>" D_CONFIGURE_PCF8574 "</button></form></p>";
+
+const char HTTP_FORM_I2C_PCF8574_1[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_PCF8574_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='get' action='" WEB_HANDLE_PCF8574 "'>"
+  "<p><input id='b1' name='b1' type='checkbox'%s><b>" D_INVERT_PORTS "</b></p><hr/>";
+
+const char HTTP_FORM_I2C_PCF8574_2[] PROGMEM =
+  "<tr><td><b>" D_DEVICE " %d " D_PORT " %d</b></td><td style='width:100px'><select id='i2cs%d' name='i2cs%d'>"
+  "<option%s value='0'>" D_DEVICE_INPUT "</option>"
+  "<option%s value='1'>" D_DEVICE_OUTPUT "</option>"
+  "</select></td></tr>";
+
+void HandlePcf8574(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_CONFIGURE_PCF8574));
+
+  if (WebServer->hasArg("save")) {
+    Pcf8574SaveSettings();
+    WebRestart(1);
+    return;
+  }
+
+  WSContentStart_P(D_CONFIGURE_PCF8574);
+  WSContentSendStyle();
+  WSContentSend_P(HTTP_FORM_I2C_PCF8574_1, (Settings.flag3.pcf8574_ports_inverted) ? " checked" : "");
+  WSContentSend_P(HTTP_TABLE100);
+  for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
+    for (uint32_t idx2 = 0; idx2 < 8; idx2++) {
+      uint8_t helper = 1 << idx2;
+      WSContentSend_P(HTTP_FORM_I2C_PCF8574_2,
+        idx +1, idx2,
+        idx2 + 8*idx,
+        idx2 + 8*idx,
+        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 0) ? " selected " : " ",
+        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 1) ? " selected " : " "
+      );
+    }
+  }
+  WSContentSend_P(PSTR("</table>"));
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void Pcf8574SaveSettings(void)
+{
+  char stemp[7];
+  char tmp[100];
+
+
+
+  Settings.flag3.pcf8574_ports_inverted = WebServer->hasArg("b1");
+  for (byte idx = 0; idx < Pcf8574.max_devices; idx++) {
+    byte count=0;
+    byte n = Settings.pcf8574_config[idx];
+    while(n!=0) {
+      n = n&(n-1);
+      count++;
+    }
+    if (count <= devices_present) {
+      devices_present = devices_present - count;
+    }
+    for (byte i = 0; i < 8; i++) {
+      snprintf_P(stemp, sizeof(stemp), PSTR("i2cs%d"), i+8*idx);
+      WebGetArg(stemp, tmp, sizeof(tmp));
+      byte _value = (!strlen(tmp)) ? 0 : atoi(tmp);
+      if (_value) {
+        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] | 1 << i;
+        devices_present++;
+        Pcf8574.max_connected_ports++;
+      } else {
+        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] & ~(1 << i );
+      }
+    }
+
+
+
+  }
+}
+#endif
+
+
+
+
+
+bool Xdrv28(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_02)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_PRE_INIT == function) {
+    Pcf8574Init();
+  }
+  else if (Pcf8574.type) {
+    switch (function) {
+      case FUNC_SET_POWER:
+        Pcf8574SwitchRelay();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_PCF8574);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_PCF8574, HandlePcf8574);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+#ifdef USE_DEEPSLEEP
+# 31 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
+#define XDRV_29 29
+
+#define D_PRFX_DEEPSLEEP "DeepSleep"
+#define D_CMND_DEEPSLEEP_TIME "Time"
+
+const uint32_t DEEPSLEEP_MAX = 10 * 366 * 24 * 60 * 60;
+const uint32_t DEEPSLEEP_MAX_CYCLE = 60 * 60;
+const uint32_t DEEPSLEEP_MIN_TIME = 5;
+const uint32_t DEEPSLEEP_START_COUNTDOWN = 4;
+
+const char kDeepsleepCommands[] PROGMEM = D_PRFX_DEEPSLEEP "|"
+  D_CMND_DEEPSLEEP_TIME ;
+
+void (* const DeepsleepCommand[])(void) PROGMEM = {
+  &CmndDeepsleepTime };
+
+uint32_t deepsleep_sleeptime = 0;
+uint8_t deepsleep_flag = 0;
+
+bool DeepSleepEnabled(void)
+{
+  if ((Settings.deepsleep < 10) || (Settings.deepsleep > DEEPSLEEP_MAX)) {
+    Settings.deepsleep = 0;
+    return false;
+  }
+
+  if (pin[GPIO_DEEPSLEEP] < 99) {
+    pinMode(pin[GPIO_DEEPSLEEP], INPUT_PULLUP);
+    return (digitalRead(pin[GPIO_DEEPSLEEP]));
+  }
+
+  return true;
+}
+
+void DeepSleepReInit(void)
+{
+  if ((ResetReason() == REASON_DEEP_SLEEP_AWAKE) && DeepSleepEnabled()) {
+    if ((RtcSettings.ultradeepsleep > DEEPSLEEP_MAX_CYCLE) && (RtcSettings.ultradeepsleep < 1700000000)) {
+
+      RtcSettings.ultradeepsleep = RtcSettings.ultradeepsleep - DEEPSLEEP_MAX_CYCLE;
+      AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Remain DeepSleep %d"), RtcSettings.ultradeepsleep);
+      RtcSettingsSave();
+      RtcRebootReset();
+      ESP.deepSleep(100 * RtcSettings.deepsleep_slip * (DEEPSLEEP_MAX_CYCLE < RtcSettings.ultradeepsleep ? DEEPSLEEP_MAX_CYCLE : RtcSettings.ultradeepsleep), WAKE_RF_DEFAULT);
+      yield();
+
+    }
+  }
+
+  RtcSettings.ultradeepsleep = 0;
+}
+
+void DeepSleepPrepare(void)
+{
+
+
+
+
+  if ((RtcSettings.nextwakeup == 0) ||
+      (RtcSettings.deepsleep_slip < 9000) ||
+      (RtcSettings.deepsleep_slip > 11000) ||
+      (RtcSettings.nextwakeup > (UtcTime() + Settings.deepsleep))) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Reset wrong settings wakeup: %ld, slip %ld"), RtcSettings.nextwakeup, RtcSettings.deepsleep_slip );
+    RtcSettings.nextwakeup = 0;
+    RtcSettings.deepsleep_slip = 10000;
+  }
+
+
+
+  int16_t timeslip = (int16_t)(RtcSettings.nextwakeup + millis() / 1000 - UtcTime()) * 10;
+
+
+
+  timeslip = (timeslip < -(int32_t)Settings.deepsleep) ? 0 : (timeslip > (int32_t)Settings.deepsleep) ? 0 : 1;
+  if (timeslip) {
+    RtcSettings.deepsleep_slip = (Settings.deepsleep + RtcSettings.nextwakeup - UtcTime()) * RtcSettings.deepsleep_slip / tmax((Settings.deepsleep - (millis() / 1000)),5);
+
+    RtcSettings.deepsleep_slip = tmin(tmax(RtcSettings.deepsleep_slip, 9000), 11000);
+    RtcSettings.nextwakeup += Settings.deepsleep;
+  }
+
+
+
+  if (RtcSettings.nextwakeup <= (UtcTime() - DEEPSLEEP_MIN_TIME)) {
+
+    RtcSettings.nextwakeup += (((UtcTime() + DEEPSLEEP_MIN_TIME - RtcSettings.nextwakeup) / Settings.deepsleep) + 1) * Settings.deepsleep;
+  }
+
+  String dt = GetDT(RtcSettings.nextwakeup + LocalTime() - UtcTime());
+
+
+  deepsleep_sleeptime = tmin((uint32_t)DEEPSLEEP_MAX_CYCLE ,RtcSettings.nextwakeup - UtcTime());
+
+
+  Response_P(PSTR("{\"" D_PRFX_DEEPSLEEP "\":{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%d}}"), (char*)dt.c_str(), RtcSettings.nextwakeup);
+  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_STATUS));
+
+
+
+}
+
+void DeepSleepStart(void)
+{
+  AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Sleeping"));
+
+  WifiShutdown();
+  RtcSettings.ultradeepsleep = RtcSettings.nextwakeup - UtcTime();
+  RtcSettingsSave();
+
+  ESP.deepSleep(100 * RtcSettings.deepsleep_slip * deepsleep_sleeptime);
+  yield();
+}
+
+void DeepSleepEverySecond(void)
+{
+  if (!deepsleep_flag) { return; }
+
+  if (DeepSleepEnabled()) {
+    if (DEEPSLEEP_START_COUNTDOWN == deepsleep_flag) {
+      SettingsSaveAll();
+      DeepSleepPrepare();
+    }
+    deepsleep_flag--;
+    if (deepsleep_flag <= 0) {
+      DeepSleepStart();
+    }
+  } else {
+    deepsleep_flag = 0;
+  }
+}
+
+
+
+
+
+void CmndDeepsleepTime(void)
+{
+  if ((0 == XdrvMailbox.payload) ||
+     ((XdrvMailbox.payload > 10) && (XdrvMailbox.payload < DEEPSLEEP_MAX))) {
+    Settings.deepsleep = XdrvMailbox.payload;
+    RtcSettings.nextwakeup = 0;
+    deepsleep_flag = (0 == XdrvMailbox.payload) ? 0 : DEEPSLEEP_START_COUNTDOWN;
+    if (deepsleep_flag) {
+      if (!Settings.tele_period) {
+        Settings.tele_period = TELE_PERIOD;
+      }
+    }
+  }
+  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.deepsleep);
+}
+
+
+
+
+
+bool Xdrv29(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_SECOND:
+      DeepSleepEverySecond();
+      break;
+    case FUNC_AFTER_TELEPERIOD:
+        if (DeepSleepEnabled() && !deepsleep_flag && (Settings.tele_period == 10 || Settings.tele_period == 300 || UpTime() > Settings.tele_period)) {
+        deepsleep_flag = DEEPSLEEP_START_COUNTDOWN;
+      }
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kDeepsleepCommands, DeepsleepCommand);
+      break;
+    case FUNC_PRE_INIT:
+      DeepSleepReInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+#ifdef USE_LIGHT
+#ifdef USE_EXS_DIMMER
+
+
+
+
+
+
+
+#define XDRV_30 30
+
+#define EXS_GATE_1_ON 0x20
+#define EXS_GATE_1_OFF 0x21
+#define EXS_DIMM_1_ON 0x22
+#define EXS_DIMM_1_OFF 0x23
+#define EXS_DIMM_1_TBL 0x24
+#define EXS_DIMM_1_VAL 0x25
+#define EXS_GATE_2_ON 0x30
+#define EXS_GATE_2_OFF 0x31
+#define EXS_DIMM_2_ON 0x32
+#define EXS_DIMM_2_OFF 0x33
+#define EXS_DIMM_2_TBL 0x34
+#define EXS_DIMM_2_VAL 0x35
+#define EXS_GATES_ON 0x40
+#define EXS_GATES_OFF 0x41
+#define EXS_DIMMS_ON 0x50
+#define EXS_DIMMS_OFF 0x51
+#define EXS_CH_LOCK 0x60
+#define EXS_GET_VALUES 0xFA
+#define EXS_WRITE_EE 0xFC
+#define EXS_READ_EE 0xFD
+#define EXS_GET_VERSION 0xFE
+#define EXS_RESET 0xFF
+
+#define EXS_BUFFER_SIZE 256
+#define EXS_ACK_TIMEOUT 200
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *ExsSerial = nullptr;
+
+typedef struct
+{
+  uint8_t on = 0;
+  uint8_t bright_tbl = 0;
+  uint8_t dimm = 0;
+  uint8_t impuls_start = 0;
+  uint32_t impuls_len = 0;
+} CHANNEL;
+
+typedef struct
+{
+  uint8_t version_major = 0;
+  uint8_t version_minor = 0;
+  CHANNEL channel[2];
+  uint8_t gate_lock = 0;
+} DIMMER;
+
+struct EXS
+{
+  uint8_t *buffer = nullptr;
+  int byte_counter = 0;
+  int cmd_status = 0;
+  uint8_t power = 0;
+  uint8_t dimm[2] = {0, 0};
+  DIMMER dimmer;
+} Exs;
+
+
+
+
+
+uint8_t crc8(const uint8_t *p, uint8_t len)
+{
+  const uint8_t table[] = {
+      0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
+      0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D};
+
+  const uint8_t table_rev[] = {
+      0x00, 0x70, 0xE0, 0x90, 0xC1, 0xB1, 0x21, 0x51,
+      0x83, 0xF3, 0x63, 0x13, 0x42, 0x32, 0xA2, 0xD2};
+
+  uint8_t offset;
+  uint8_t temp, crc8_temp;
+  uint8_t crc8 = 0;
+
+  for (int i = 0; i < len; i++)
+  {
+    temp = *(p + i);
+    offset = temp ^ crc8;
+    offset >>= 4;
+    crc8_temp = crc8 & 0x0f;
+    crc8 = crc8_temp ^ table_rev[offset];
+    offset = crc8 ^ temp;
+    offset &= 0x0f;
+    crc8_temp = crc8 & 0xf0;
+    crc8 = crc8_temp ^ table[offset];
+  }
+  return crc8 ^ 0x55;
+}
+
+void ExsSerialSend(const uint8_t data[] = nullptr, uint16_t len = 0)
+{
+  int retries = 3;
+  char rc;
+
+#ifdef EXS_DEBUG
+  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: Tx Packet: \""));
+  for (uint32_t i = 0; i < len; i++)
+  {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, data[i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
+  AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+  while (retries)
+  {
+    retries--;
+
+    ExsSerial->write(data, len);
+    ExsSerial->flush();
+
+
+    uint32_t snd_time = millis();
+    while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
+           (!ExsSerial->available()))
+      ;
+
+    if (!ExsSerial->available())
+    {
+
+#ifdef EXS_DEBUG
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR("ESX: serial send timeout"));
+#endif
+      continue;
+    }
+
+    rc = ExsSerial->read();
+    if (rc == 0xFF)
+      break;
+  }
+}
+
+void ExsSendCmd(uint8_t cmd, uint8_t value)
+{
+  uint8_t buffer[8];
+  uint16_t len;
+
+  buffer[0] = 0x7b;
+  buffer[3] = cmd;
+
+  switch (cmd)
+  {
+  case EXS_GATE_1_ON:
+  case EXS_GATE_1_OFF:
+  case EXS_DIMM_1_ON:
+  case EXS_DIMM_1_OFF:
+  case EXS_GATE_2_ON:
+  case EXS_GATE_2_OFF:
+  case EXS_DIMM_2_ON:
+  case EXS_DIMM_2_OFF:
+  case EXS_GATES_ON:
+  case EXS_GATES_OFF:
+  case EXS_DIMMS_ON:
+  case EXS_DIMMS_OFF:
+  case EXS_GET_VALUES:
+  case EXS_GET_VERSION:
+  case EXS_RESET:
+    buffer[2] = 1;
+    len = 4;
+    break;
+
+  case EXS_CH_LOCK:
+  case EXS_DIMM_1_TBL:
+  case EXS_DIMM_1_VAL:
+  case EXS_DIMM_2_TBL:
+  case EXS_DIMM_2_VAL:
+    buffer[2] = 2;
+    buffer[4] = value;
+    len = 5;
+    break;
+  }
+  buffer[1] = crc8(&buffer[3], buffer[2]);
+
+  ExsSerialSend(buffer, len);
+}
+
+uint8_t ExsSetPower(uint8_t device, uint8_t power)
+{
+  Exs.dimmer.channel[device].dimm = power;
+  ExsSendCmd(EXS_DIMM_1_ON + 0x10 * device + power ^ 1, 0);
+}
+
+uint8_t ExsSetBri(uint8_t device, uint8_t bri)
+{
+  Exs.dimmer.channel[device].bright_tbl = bri;
+  ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * device, bri);
+}
+
+uint8_t ExsSyncState(uint8_t device)
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Channel %d Power Want %d, Is %d"),
+            device, bitRead(Exs.power, device), Exs.dimmer.channel[device].dimm);
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Set Channel %d Brightness Want %d, Is %d"),
+            device, Exs.dimm[device], Exs.dimmer.channel[device].bright_tbl);
+#endif
+
+  if (bitRead(Exs.power, device) &&
+      Exs.dimm[device] != Exs.dimmer.channel[device].bright_tbl) {
+    ExsSetBri(device, Exs.dimm[device]);
+  }
+
+  if (!Exs.dimm[device]) {
+    Exs.dimmer.channel[device].dimm = 0;
+  } else if (Exs.dimmer.channel[device].dimm != bitRead(Exs.power, device)) {
+    ExsSetPower(device, bitRead(Exs.power, device));
+  }
+}
+
+bool ExsSyncState()
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Serial %p, Cmd %d"), ExsSerial, Exs.cmd_status);
+#endif
+
+  if (!ExsSerial || Exs.cmd_status != 0)
+    return false;
+
+  ExsSyncState(0);
+  ExsSyncState(1);
+}
+
+void ExsDebugState()
+{
+#ifdef EXS_DEBUG
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: MCU v%d.%d, c0: On:%d,Dim:%d,Tbl:%d(%d%%), c1: On:%d,Dim:%d,Tbl:%d(%d%%), ChLock: %d"),
+              Exs.dimmer.version_major, Exs.dimmer.version_minor,
+              Exs.dimmer.channel[0].on, Exs.dimmer.channel[0].dimm,
+              Exs.dimmer.channel[0].bright_tbl,
+              changeUIntScale(Exs.dimmer.channel[0].bright_tbl, 0, 255, 0, 100),
+              Exs.dimmer.channel[1].on, Exs.dimmer.channel[1].dimm,
+              Exs.dimmer.channel[1].bright_tbl,
+              changeUIntScale(Exs.dimmer.channel[1].bright_tbl, 0, 255, 0, 100),
+              Exs.dimmer.gate_lock);
+#endif
+}
+
+void ExsPacketProcess(void)
+{
+  uint8_t len = Exs.buffer[1];
+  uint8_t cmd = Exs.buffer[2];
+
+  switch (cmd)
+  {
+  case EXS_GET_VALUES:
+# 294 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+    if (len > 9)
+    {
+      Exs.dimmer.version_major = Exs.buffer[3];
+      Exs.dimmer.version_minor = Exs.buffer[4];
+
+
+      Exs.dimmer.channel[0].on = Exs.buffer[6];
+      Exs.dimmer.channel[0].dimm = Exs.buffer[6];
+      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[7];
+
+
+      Exs.dimmer.channel[1].on = Exs.buffer[9];
+      Exs.dimmer.channel[1].dimm = Exs.buffer[9];
+      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[10];
+
+      Exs.dimmer.gate_lock = Exs.buffer[11];
+    }
+    else
+# 327 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
+    {
+      Exs.dimmer.version_major = 1;
+      Exs.dimmer.version_minor = 0;
+
+
+      Exs.dimmer.channel[0].on = Exs.buffer[4] - 48;
+      Exs.dimmer.channel[0].dimm = Exs.buffer[4] - 48;
+      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[5] - 48;
+
+
+      Exs.dimmer.channel[1].on = Exs.buffer[7] - 48;
+      Exs.dimmer.channel[1].dimm = Exs.buffer[7] - 48;
+      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[8] - 48;
+
+      Exs.dimmer.gate_lock = Exs.buffer[9] - 48;
+    }
+
+    ExsDebugState();
+    ExsSyncState();
+    ExsDebugState();
+    break;
+  default:
+    break;
+  }
+}
+
+
+
+bool ExsModuleSelected(void)
+{
+  Settings.light_correction = 0;
+  Settings.flag.mqtt_serial = 0;
+  Settings.flag3.pwm_multi_channels = 1;
+  SetSeriallog(LOG_LEVEL_NONE);
+
+  devices_present = +2;
+  light_type = LT_SERIAL2;
+  return true;
+}
+
+bool ExsSetChannels(void)
+{
+#ifdef EXS_DEBUG
+  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: SetChannels: \""));
+  for (int i = 0; i < XdrvMailbox.data_len; i++)
+  {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, ((uint8_t *)XdrvMailbox.data)[i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
+  AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+  Exs.dimm[0] = ((uint8_t *)XdrvMailbox.data)[0];
+  Exs.dimm[1] = ((uint8_t *)XdrvMailbox.data)[1];
+  return ExsSyncState();
+}
+
+bool ExsSetPower(void)
+{
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Set Power, Device %d, Power 0x%02x"),
+            active_device, XdrvMailbox.index);
+
+  Exs.power = XdrvMailbox.index;
+  return ExsSyncState();
+}
+
+void EsxMcuStart(void)
+{
+  int retries = 3;
+
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Request MCU configuration, PIN %d to Low"), pin[GPIO_EXS_ENABLE]);
+#endif
+
+  pinMode(pin[GPIO_EXS_ENABLE], OUTPUT);
+  digitalWrite(pin[GPIO_EXS_ENABLE], LOW);
+
+  delay(1);
+
+  while (ExsSerial->available())
+  {
+
+    ExsSerial->read();
+  }
+}
+
+void ExsInit(void)
+{
+#ifdef EXS_DEBUG
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Starting Tx %d Rx %d"), pin[GPIO_TXD], pin[GPIO_RXD]);
+#endif
+
+  Exs.buffer = (uint8_t *)malloc(EXS_BUFFER_SIZE);
+  if (Exs.buffer != nullptr)
+  {
+    ExsSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
+    if (ExsSerial->begin(9600))
+    {
+      if (ExsSerial->hardwareSerial())
+      {
+        ClaimSerial();
+      }
+      ExsSerial->flush();
+      EsxMcuStart();
+      ExsSendCmd(EXS_CH_LOCK, 0);
+      ExsSendCmd(EXS_GET_VALUES, 0);
+   }
+  }
+}
+
+void ExsSerialInput(void)
+{
+  while (ExsSerial->available())
+  {
+    yield();
+    uint8_t serial_in_byte = ExsSerial->read();
+
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Serial In Byte 0x%02x"), serial_in_byte);
+
+    if (Exs.cmd_status == 0 &&
+        serial_in_byte == 0x7B)
+    {
+      Exs.cmd_status = 1;
+      Exs.byte_counter = 0;
+    }
+    else if (Exs.byte_counter >= EXS_BUFFER_SIZE)
+    {
+      Exs.cmd_status = 0;
+    }
+    else if (Exs.cmd_status == 1)
+    {
+      Exs.buffer[Exs.byte_counter++] = serial_in_byte;
+
+      if (Exs.byte_counter > 2 && Exs.byte_counter == Exs.buffer[1] + 2)
+      {
+        uint8_t crc = crc8(&Exs.buffer[2], Exs.buffer[1]);
+
+
+        Exs.cmd_status = 0;
+
+#ifdef EXS_DEBUG
+        snprintf_P(log_data, sizeof(log_data), PSTR("EXS: RX Packet: \""));
+        for (uint32_t i = 0; i < Exs.byte_counter; i++)
+        {
+          snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, Exs.buffer[i]);
+        }
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s\", CRC: 0x%02x"), log_data, crc);
+        AddLog(LOG_LEVEL_DEBUG_MORE);
+#endif
+
+        if (Exs.buffer[0] == crc)
+        {
+          ExsSerial->write(0xFF);
+          ExsPacketProcess();
+        }
+        else
+        {
+          ExsSerial->write(0x00);
+        }
+
+      }
+    }
+  }
+}
+
+
+
+
+
+#ifdef EXS_MCU_CMNDS
+
+#define D_PRFX_EXS "Exs"
+#define D_CMND_EXS_DIMM "Dimm"
+#define D_CMND_EXS_DIMM_TBL "DimmTbl"
+#define D_CMND_EXS_DIMM_VAL "DimmVal"
+#define D_CMND_EXS_DIMMS "Dimms"
+#define D_CMND_EXS_CH_LOCK "ChLock"
+#define D_CMND_EXS_STATE "State"
+
+const char kExsCommands[] PROGMEM = D_PRFX_EXS "|"
+  D_CMND_EXS_DIMM "|" D_CMND_EXS_DIMM_TBL "|" D_CMND_EXS_DIMM_VAL "|"
+  D_CMND_EXS_DIMMS "|" D_CMND_EXS_CH_LOCK "|"
+  D_CMND_EXS_STATE;
+
+void (* const ExsCommand[])(void) PROGMEM = {
+  &CmndExsDimm, &CmndExsDimmTbl, &CmndExsDimmVal,
+  &CmndExsDimms, &CmndExsChLock,
+  &CmndExsState };
+
+void CmndExsDimm(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1)) {
+    ExsSendCmd(EXS_DIMM_1_ON + 0x10 * (XdrvMailbox.index - 1) +
+               XdrvMailbox.payload ^ 1, 0);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimmTbl(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
+    ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * (XdrvMailbox.index - 1),
+               XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimmVal(void)
+{
+  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
+      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
+    ExsSendCmd(EXS_DIMM_1_VAL + 0x10 * (XdrvMailbox.index - 1),
+               XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsDimms(void)
+{
+  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
+    ExsSendCmd(EXS_DIMMS_ON + XdrvMailbox.payload ^ 1, 0);
+  }
+  CmndExsState();
+}
+
+void CmndExsChLock(void)
+{
+  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
+    ExsSendCmd(EXS_CH_LOCK, XdrvMailbox.payload);
+  }
+  CmndExsState();
+}
+
+void CmndExsState(void)
+{
+  ExsSendCmd(EXS_GET_VALUES, 0);
+
+
+  uint32_t snd_time = millis();
+  while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
+         (!ExsSerial->available()))
+    ;
+  ExsSerialInput();
+
+  Response_P(PSTR("{\"" D_CMND_EXS_STATE "\":{"));
+  ResponseAppend_P(PSTR("\"McuVersion\":\"%d.%d\","
+                        "\"Channels\":["),
+                   Exs.dimmer.version_major, Exs.dimmer.version_minor);
+
+  for (uint32_t i = 0; i < 2; i++) {
+    if (i != 0) {
+      ResponseAppend_P(PSTR(","));
+    }
+    ResponseAppend_P(PSTR("{\"On\":\"%d\","
+                          "\"BrightProz\":\"%d\","
+                          "\"BrightTab\":\"%d\","
+                          "\"Dimm\":\"%d\"}"),
+                     Exs.dimmer.channel[i].on,
+                     changeUIntScale(Exs.dimmer.channel[i].bright_tbl, 0, 255, 0, 100),
+                     Exs.dimmer.channel[i].bright_tbl,
+                     Exs.dimmer.channel[i].dimm);
+  }
+  ResponseAppend_P(PSTR("],"));
+  ResponseAppend_P(PSTR("\"GateLock\":\"%d\""), Exs.dimmer.gate_lock);
+  ResponseJsonEndEnd();
+}
+
+#endif
+
+
+
+
+
+bool Xdrv30(uint8_t function)
+{
+  bool result = false;
+
+  if (EXS_DIMMER == my_module_type)
+  {
+    switch (function)
+    {
+    case FUNC_LOOP:
+      if (ExsSerial)
+        ExsSerialInput();
+      break;
+    case FUNC_MODULE_INIT:
+      result = ExsModuleSelected();
+      break;
+    case FUNC_INIT:
+      ExsInit();
+      break;
+    case FUNC_SET_DEVICE_POWER:
+      result = ExsSetPower();
+      break;
+    case FUNC_SET_CHANNELS:
+      result = ExsSetChannels();
+      break;
+#ifdef EXS_MCU_CMNDS
+    case FUNC_COMMAND:
+      result = DecodeCommand(kExsCommands, ExsCommand);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
+#ifdef USE_TASMOTA_SLAVE
+
+
+
+
+#define XDRV_31 31
+
+#define CONST_STK_CRC_EOP 0x20
+
+#define CMND_STK_GET_SYNC 0x30
+#define CMND_STK_SET_DEVICE 0x42
+#define CMND_STK_SET_DEVICE_EXT 0x45
+#define CMND_STK_ENTER_PROGMODE 0x50
+#define CMND_STK_LEAVE_PROGMODE 0x51
+#define CMND_STK_LOAD_ADDRESS 0x55
+#define CMND_STK_PROG_PAGE 0x64
+
+
+
+
+
+#define CMND_START 0xFC
+#define CMND_END 0xFD
+
+#define CMND_FEATURES 0x01
+#define CMND_JSON 0x02
+#define CMND_FUNC_EVERY_SECOND 0x03
+#define CMND_FUNC_EVERY_100_MSECOND 0x04
+#define CMND_SLAVE_SEND 0x05
+#define CMND_PUBLISH_TELE 0x06
+#define CMND_EXECUTE_CMND 0x07
+
+#define PARAM_DATA_START 0xFE
+#define PARAM_DATA_END 0xFF
+
+#include <TasmotaSerial.h>
+
+
+
+
+
+class SimpleHexParse {
+  public:
+   SimpleHexParse(void);
+   uint8_t parseLine(char *hexline);
+   uint8_t ptr_l = 0;
+   uint8_t ptr_h = 0;
+   bool PageIsReady = false;
+   bool firstrun = true;
+   bool EndOfFile = false;
+   uint8_t FlashPage[128];
+   uint8_t FlashPageIdx = 0;
+   uint8_t layoverBuffer[16];
+   uint8_t layoverIdx = 0;
+   uint8_t getByte(char *hexline, uint8_t idx);
+};
+
+SimpleHexParse::SimpleHexParse(void)
+{
+
+}
+
+uint8_t SimpleHexParse::parseLine(char *hexline)
+{
+  if (layoverIdx) {
+    memcpy(&FlashPage[0], &layoverBuffer[0], layoverIdx);
+    FlashPageIdx = layoverIdx;
+    layoverIdx = 0;
+  }
+  uint8_t len = getByte(hexline, 1);
+  uint8_t addr_h = getByte(hexline, 2);
+  uint8_t addr_l = getByte(hexline, 3);
+  uint8_t rectype = getByte(hexline, 4);
+  for (uint8_t idx = 0; idx < len; idx++) {
+       if (FlashPageIdx < 128) {
+         FlashPage[FlashPageIdx] = getByte(hexline, idx+5);
+         FlashPageIdx++;
+       } else {
+         layoverBuffer[layoverIdx] = getByte(hexline, idx+5);
+         layoverIdx++;
+       }
+  }
+  if (1 == rectype) {
+    EndOfFile = true;
+    while (FlashPageIdx < 128) {
+      FlashPage[FlashPageIdx] = 0xFF;
+      FlashPageIdx++;
+    }
+  }
+  if (FlashPageIdx == 128) {
+    if (firstrun) {
+      firstrun = false;
+    } else {
+      ptr_l += 0x40;
+      if (ptr_l == 0) {
+        ptr_l = 0;
+        ptr_h++;
+      }
+    }
+    firstrun = false;
+    PageIsReady = true;
+  }
+  return 0;
+}
+
+uint8_t SimpleHexParse::getByte(char* hexline, uint8_t idx)
+{
+ char buff[3];
+ buff[3] = '\0';
+ memcpy(&buff, &hexline[(idx*2)-1], 2);
+ return strtol(buff, 0, 16);
+}
+
+
+
+
+
+struct TSLAVE {
+  uint32_t spi_hex_size = 0;
+  uint32_t spi_sector_counter = 0;
+  uint8_t spi_sector_cursor = 0;
+  uint8_t inverted = LOW;
+  bool type = false;
+  bool flashing = false;
+  bool SerialEnabled = false;
+  uint8_t waitstate = 0;
+  bool unsupported = false;
+} TSlave;
+
+typedef union {
+  uint32_t data;
+  struct {
+    uint32_t func_json_append : 1;
+    uint32_t func_every_second : 1;
+    uint32_t func_every_100_msecond : 1;
+    uint32_t func_slave_send : 1;
+    uint32_t spare4 : 1;
+    uint32_t spare5 : 1;
+    uint32_t spare6 : 1;
+    uint32_t spare7 : 1;
+    uint32_t spare8 : 1;
+    uint32_t spare9 : 1;
+    uint32_t spare10 : 1;
+    uint32_t spare11 : 1;
+    uint32_t spare12 : 1;
+    uint32_t spare13 : 1;
+    uint32_t spare14 : 1;
+    uint32_t spare15 : 1;
+    uint32_t spare16 : 1;
+    uint32_t spare17 : 1;
+    uint32_t spare18 : 1;
+    uint32_t spare19 : 1;
+    uint32_t spare20 : 1;
+    uint32_t spare21 : 1;
+    uint32_t spare22 : 1;
+    uint32_t spare23 : 1;
+    uint32_t spare24 : 1;
+    uint32_t spare25 : 1;
+    uint32_t spare26 : 1;
+    uint32_t spare27 : 1;
+    uint32_t spare28 : 1;
+    uint32_t spare29 : 1;
+    uint32_t spare30 : 1;
+    uint32_t spare31 : 1;
+  };
+} TSlaveFeatureCfg;
+
+
+
+
+
+
+struct TSLAVE_FEATURES {
+  uint32_t features_version;
+  TSlaveFeatureCfg features;
+} TSlaveSettings;
+
+struct TSLAVE_COMMAND {
+  uint8_t command;
+  uint8_t parameter;
+  uint8_t unused2;
+  uint8_t unused3;
+} TSlaveCommand;
+
+TasmotaSerial *TasmotaSlave_Serial;
+
+uint32_t TasmotaSlave_FlashStart(void)
+{
+  return (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 2;
+}
+
+uint8_t TasmotaSlave_UpdateInit(void)
+{
+  TSlave.spi_hex_size = 0;
+  TSlave.spi_sector_counter = TasmotaSlave_FlashStart();
+  TSlave.spi_sector_cursor = 0;
+  return 0;
+}
+
+void TasmotaSlave_Reset(void)
+{
+  if (TSlave.SerialEnabled) {
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
+    delay(1);
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], TSlave.inverted);
+    delay(1);
+    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
+    delay(5);
+  }
+}
+
+uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout)
+{
+  int timer = 0;
+  while (timer < timeout) {
+    if (TasmotaSlave_Serial->available() >= dataCount) {
+      return 1;
+    }
+    delay(1);
+    timer++;
+  }
+  return 0;
+}
+
+uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count)
+{
+  TasmotaSlave_Serial->write(bytes, count);
+  TasmotaSlave_waitForSerialData(2, 250);
+  uint8_t sync = TasmotaSlave_Serial->read();
+  uint8_t ok = TasmotaSlave_Serial->read();
+  if ((sync == 0x14) && (ok == 0x10)) {
+    return 1;
+  }
+  return 0;
+}
+
+uint8_t TasmotaSlave_execCmd(uint8_t cmd)
+{
+  uint8_t bytes[] = { cmd, CONST_STK_CRC_EOP };
+  return TasmotaSlave_sendBytes(bytes, 2);
+}
+
+uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count)
+{
+  uint8_t bytes[32];
+  bytes[0] = cmd;
+  int i = 0;
+  while (i < count) {
+    bytes[i + 1] = params[i];
+    i++;
+  }
+  bytes[i + 1] = CONST_STK_CRC_EOP;
+  return TasmotaSlave_sendBytes(bytes, i + 2);
+}
+
+uint8_t TasmotaSlave_exitProgMode(void)
+{
+  return TasmotaSlave_execCmd(CMND_STK_LEAVE_PROGMODE);
+}
+
+uint8_t TasmotaSlave_SetupFlash(void)
+{
+  uint8_t ProgParams[] = {0x86, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00};
+  uint8_t ExtProgParams[] = {0x05, 0x04, 0xd7, 0xc2, 0x00};
+  TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_FLASH_SPEED);
+  if (TasmotaSlave_Serial->hardwareSerial()) {
+    ClaimSerial();
+  }
+
+  TasmotaSlave_Reset();
+
+  uint8_t timeout = 0;
+  uint8_t no_error = 0;
+  while (50 > timeout) {
+    if (TasmotaSlave_execCmd(CMND_STK_GET_SYNC)) {
+      timeout = 200;
+      no_error = 1;
+    }
+    timeout++;
+    delay(1);
+  }
+  if (no_error) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Found bootloader"));
+  } else {
+    no_error = 0;
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Bootloader could not be found"));
+  }
+  if (no_error) {
+    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE, ProgParams, sizeof(ProgParams))) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (1)"));
+    }
+  }
+  if (no_error) {
+    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE_EXT, ExtProgParams, sizeof(ExtProgParams))) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (2)"));
+    }
+  }
+  if (no_error) {
+    if (TasmotaSlave_execCmd(CMND_STK_ENTER_PROGMODE)) {
+    } else {
+      no_error = 0;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Failed to put bootloader into programming mode"));
+    }
+  }
+  return no_error;
+}
+
+uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo)
+{
+  uint8_t params[] = { adrLo, adrHi };
+  return TasmotaSlave_execParam(CMND_STK_LOAD_ADDRESS, params, sizeof(params));
+}
+
+void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data)
+{
+  uint8_t Header[] = {CMND_STK_PROG_PAGE, 0x00, 0x80, 0x46};
+  TasmotaSlave_loadAddress(addr_h, addr_l);
+  TasmotaSlave_Serial->write(Header, 4);
+  for (int i = 0; i < 128; i++) {
+    TasmotaSlave_Serial->write(data[i]);
+  }
+  TasmotaSlave_Serial->write(CONST_STK_CRC_EOP);
+  TasmotaSlave_waitForSerialData(2, 250);
+  TasmotaSlave_Serial->read();
+  TasmotaSlave_Serial->read();
+}
+
+void TasmotaSlave_Flash(void)
+{
+  bool reading = true;
+  uint32_t read = 0;
+  uint32_t processed = 0;
+  char thishexline[50];
+  uint8_t position = 0;
+  char* flash_buffer;
+
+  SimpleHexParse hexParse = SimpleHexParse();
+
+  if (!TasmotaSlave_SetupFlash()) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flashing aborted!"));
+    TSlave.flashing = false;
+    restart_flag = 2;
+    return;
+  }
+
+  flash_buffer = new char[SPI_FLASH_SEC_SIZE];
+  uint32_t flash_start = TasmotaSlave_FlashStart() * SPI_FLASH_SEC_SIZE;
+  while (reading) {
+    ESP.flashRead(flash_start + read, (uint32_t*)flash_buffer, SPI_FLASH_SEC_SIZE);
+    read = read + SPI_FLASH_SEC_SIZE;
+    if (read >= TSlave.spi_hex_size) {
+      reading = false;
+    }
+    for (uint32_t ca = 0; ca < SPI_FLASH_SEC_SIZE; ca++) {
+      processed++;
+      if ((processed <= TSlave.spi_hex_size) && (!hexParse.EndOfFile)) {
+        if (':' == flash_buffer[ca]) {
+          position = 0;
+        }
+        if (0x0D == flash_buffer[ca]) {
+          thishexline[position] = 0;
+          hexParse.parseLine(thishexline);
+          if (hexParse.PageIsReady) {
+            TasmotaSlave_FlashPage(hexParse.ptr_h, hexParse.ptr_l, hexParse.FlashPage);
+            hexParse.PageIsReady = false;
+            hexParse.FlashPageIdx = 0;
+          }
+        } else {
+          if (0x0A != flash_buffer[ca]) {
+            thishexline[position] = flash_buffer[ca];
+            position++;
+          }
+        }
+      }
+    }
+  }
+  TasmotaSlave_exitProgMode();
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flash done!"));
+  TSlave.flashing = false;
+  restart_flag = 2;
+}
+
+void TasmotaSlave_SetFlagFlashing(bool value)
+{
+  TSlave.flashing = value;
+}
+
+bool TasmotaSlave_GetFlagFlashing(void)
+{
+  return TSlave.flashing;
+}
+
+void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size)
+{
+  if (0 == TSlave.spi_sector_cursor) {
+    ESP.flashEraseSector(TSlave.spi_sector_counter);
+  }
+  TSlave.spi_sector_cursor++;
+  ESP.flashWrite((TSlave.spi_sector_counter * SPI_FLASH_SEC_SIZE) + ((TSlave.spi_sector_cursor-1)*2048), (uint32_t*)buf, size);
+  TSlave.spi_hex_size = TSlave.spi_hex_size + size;
+  if (2 == TSlave.spi_sector_cursor) {
+    TSlave.spi_sector_cursor = 0;
+    TSlave.spi_sector_counter++;
+  }
+}
+
+void TasmotaSlave_Init(void)
+{
+  if (TSlave.type) {
+    return;
+  }
+  if (10 > TSlave.waitstate) {
+    TSlave.waitstate++;
+    return;
+  }
+  if (!TSlave.SerialEnabled) {
+    if ((pin[GPIO_TASMOTASLAVE_RXD] < 99) && (pin[GPIO_TASMOTASLAVE_TXD] < 99) &&
+        ((pin[GPIO_TASMOTASLAVE_RST] < 99) || (pin[GPIO_TASMOTASLAVE_RST_INV] < 99))) {
+      TasmotaSlave_Serial = new TasmotaSerial(pin[GPIO_TASMOTASLAVE_RXD], pin[GPIO_TASMOTASLAVE_TXD], 1, 0, 200);
+      if (TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_SERIAL_SPEED)) {
+        if (TasmotaSlave_Serial->hardwareSerial()) {
+          ClaimSerial();
+        }
+        TasmotaSlave_Serial->setTimeout(50);
+        if (pin[GPIO_TASMOTASLAVE_RST_INV] < 99) {
+          pin[GPIO_TASMOTASLAVE_RST] = pin[GPIO_TASMOTASLAVE_RST_INV];
+          pin[GPIO_TASMOTASLAVE_RST_INV] = 99;
+          TSlave.inverted = HIGH;
+        }
+        pinMode(pin[GPIO_TASMOTASLAVE_RST], OUTPUT);
+        TSlave.SerialEnabled = true;
+        TasmotaSlave_Reset();
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Enabled"));
+      }
+    }
+  }
+  if (TSlave.SerialEnabled) {
+    TasmotaSlave_sendCmnd(CMND_FEATURES, 0);
+    char buffer[32];
+    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer));
+    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer));
+    memcpy(&TSlaveSettings, &buffer, sizeof(TSlaveSettings));
+    if (20191129 == TSlaveSettings.features_version) {
+      TSlave.type = true;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u"), TSlaveSettings.features_version);
+    } else {
+      if ((!TSlave.unsupported) && (TSlaveSettings.features_version > 0)) {
+        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u not supported!"), TSlaveSettings.features_version);
+        TSlave.unsupported = true;
+      }
+    }
+  }
+}
+
+void TasmotaSlave_Show(void)
+{
+  if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
+    char buffer[100];
+    TasmotaSlave_sendCmnd(CMND_JSON, 0);
+    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer)-1);
+    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer)-1);
+    buffer[len] = '\0';
+    ResponseAppend_P(PSTR(",\"TasmotaSlave\":%s"), buffer);
+  }
+}
+
+void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param)
+{
+  TSlaveCommand.command = cmnd;
+  TSlaveCommand.parameter = param;
+  char buffer[sizeof(TSlaveCommand)+2];
+  buffer[0] = CMND_START;
+  memcpy(&buffer[1], &TSlaveCommand, sizeof(TSlaveCommand));
+  buffer[sizeof(TSlaveCommand)+1] = CMND_END;
+  for (uint8_t ca = 0; ca < sizeof(buffer); ca++) {
+    TasmotaSlave_Serial->write(buffer[ca]);
+  }
+}
+
+#define D_PRFX_SLAVE "Slave"
+#define D_CMND_SLAVE_RESET "Reset"
+#define D_CMND_SLAVE_SEND "Send"
+
+const char kTasmotaSlaveCommands[] PROGMEM = D_PRFX_SLAVE "|"
+  D_CMND_SLAVE_RESET "|" D_CMND_SLAVE_SEND;
+
+void (* const TasmotaSlaveCommand[])(void) PROGMEM = {
+  &CmndTasmotaSlaveReset, &CmndTasmotaSlaveSend };
+
+void CmndTasmotaSlaveReset(void)
+{
+  TasmotaSlave_Reset();
+  TSlave.type = false;
+  TSlave.waitstate = 7;
+  TSlave.unsupported = false;
+  ResponseCmndDone();
+}
+
+void CmndTasmotaSlaveSend(void)
+{
+  if (0 < XdrvMailbox.data_len) {
+    TasmotaSlave_sendCmnd(CMND_SLAVE_SEND, XdrvMailbox.data_len);
+    TasmotaSlave_Serial->write(char(PARAM_DATA_START));
+    for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
+      TasmotaSlave_Serial->write(XdrvMailbox.data[idx]);
+    }
+    TasmotaSlave_Serial->write(char(PARAM_DATA_END));
+  }
+  ResponseCmndDone();
+}
+
+void TasmotaSlave_ProcessIn(void)
+{
+  uint8_t cmnd = TasmotaSlave_Serial->read();
+  switch (cmnd) {
+    case CMND_START:
+      TasmotaSlave_waitForSerialData(sizeof(TSlaveCommand),50);
+      uint8_t buffer[sizeof(TSlaveCommand)];
+      for (uint8_t idx = 0; idx < sizeof(TSlaveCommand); idx++) {
+        buffer[idx] = TasmotaSlave_Serial->read();
+      }
+      TasmotaSlave_Serial->read();
+      memcpy(&TSlaveCommand, &buffer, sizeof(TSlaveCommand));
+      char inbuf[TSlaveCommand.parameter+1];
+      TasmotaSlave_waitForSerialData(TSlaveCommand.parameter, 50);
+      TasmotaSlave_Serial->read();
+      for (uint8_t idx = 0; idx < TSlaveCommand.parameter; idx++) {
+        inbuf[idx] = TasmotaSlave_Serial->read();
+      }
+      TasmotaSlave_Serial->read();
+      inbuf[TSlaveCommand.parameter] = '\0';
+
+      if (CMND_PUBLISH_TELE == TSlaveCommand.command) {
+        Response_P(PSTR("{\"TasmotaSlave\":"));
+        ResponseAppend_P("%s", inbuf);
+        ResponseJsonEnd();
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+        XdrvRulesProcess();
+      }
+      if (CMND_EXECUTE_CMND == TSlaveCommand.command) {
+        ExecuteCommand(inbuf, SRC_IGNORE);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+
+
+
+
+
+bool Xdrv31(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_100_MSECOND:
+      if (TSlave.type) {
+        if (TasmotaSlave_Serial->available()) {
+          TasmotaSlave_ProcessIn();
+        }
+        if (TSlaveSettings.features.func_every_100_msecond) {
+          TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_100_MSECOND, 0);
+        }
+      }
+      break;
+    case FUNC_EVERY_SECOND:
+      if ((TSlave.type) && (TSlaveSettings.features.func_every_second)) {
+        TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_SECOND, 0);
+      }
+      TasmotaSlave_Init();
+      break;
+    case FUNC_JSON_APPEND:
+      if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
+        TasmotaSlave_Show();
+      }
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kTasmotaSlaveCommands, TasmotaSlaveCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_32_hotplug.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_32_hotplug.ino"
+#ifdef USE_HOTPLUG
+
+
+
+
+
+
+
+#define XDRV_32 32
+
+const uint32_t HOTPLUG_MAX = 254;
+
+const char kHotPlugCommands[] PROGMEM = "|"
+  D_CMND_HOTPLUG;
+
+void (* const HotPlugCommand[])(void) PROGMEM = {
+  &CmndHotPlugTime };
+
+struct {
+
+  bool enabled = false;
+  uint8_t timeout = 0;
+} Hotplug;
+
+void HotPlugInit(void)
+{
+
+  if (Settings.hotplug_scan == 0xFF) { Settings.hotplug_scan = 0; }
+  if (Settings.hotplug_scan != 0) {
+    Hotplug.enabled = true;
+    Hotplug.timeout = 1;
+  } else
+    Hotplug.enabled = false;
+}
+
+void HotPlugEverySecond(void)
+{
+  if (Hotplug.enabled) {
+    if (Hotplug.timeout == 0) {
+      XsnsCall(FUNC_HOTPLUG_SCAN);
+      Hotplug.timeout = Settings.hotplug_scan;
+    }
+    Hotplug.timeout--;
+  }
+}
+
+
+
+
+
+void CmndHotPlugTime(void)
+{
+  if (XdrvMailbox.payload <= HOTPLUG_MAX) {
+    Settings.hotplug_scan = XdrvMailbox.payload;
+    HotPlugInit();
+  }
+  ResponseCmndNumber(Settings.hotplug_scan);
+}
+
+
+
+
+
+bool Xdrv32(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_SECOND:
+      HotPlugEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kHotPlugCommands, HotPlugCommand);
+      break;
+    case FUNC_PRE_INIT:
+      HotPlugInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
+# 30 "S:/Development/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
+#ifdef USE_SPI
+#ifdef USE_NRF24
+
+
+
+
+
+
+
+#define XDRV_33 33
+
+#define MOSI 13
+#define MISO 12
+#define SCK 14
+
+#include <SPI.h>
+#include <RF24.h>
+
+const char NRF24type[] PROGMEM = "NRF24";
+
+const char HTTP_NRF24[] PROGMEM =
+ "{s}%sL01%c: " "{m}started{e}";
+
+struct {
+  uint8_t chipType = 0;
+} NRF24;
+
+
+
+RF24 NRF24radio;
+
+bool NRF24initRadio()
+{
+  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+  NRF24radio.powerUp();
+
+  if(NRF24radio.isChipConnected()){
+    DEBUG_DRIVER_LOG(PSTR("NRF24 chip connected"));
+    return true;
+  }
+  DEBUG_DRIVER_LOG(PSTR("NRF24 chip NOT !!!! connected"));
+  return false;
+}
+
+bool NRF24Detect(void)
+{
+  if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
+    SPI.pins(SCK,MOSI,MISO,-1);
+    if(NRF24initRadio()){
+      NRF24.chipType = 32;
+     AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01 initialized"));
+      if(NRF24radio.isPVariant()){
+        NRF24.chipType = 43;
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01+ detected"));
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool Xdrv33(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    result = NRF24Detect();
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
+#ifdef USE_I2C
+#ifdef USE_WEMOS_MOTOR_V1
+# 45 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
+#define XDRV_34 34
+#define XI2C_44 44
+
+#ifndef WEMOS_MOTOR_V1_ADDR
+#define WEMOS_MOTOR_V1_ADDR 0x30
+#endif
+#ifndef WEMOS_MOTOR_V1_FREQ
+#define WEMOS_MOTOR_V1_FREQ 1000
+#endif
+
+#define MOTOR_A 0
+#define MOTOR_B 1
+
+#define SHORT_BRAKE 0
+#define CCW 1
+#define CW 2
+#define STOP 3
+#define STANDBY 4
+
+struct WMOTORV1 {
+  bool detected = false;
+  uint8_t motor;
+} WMotorV1;
+
+void WMotorV1Detect(void)
+{
+  if (I2cSetDevice(WEMOS_MOTOR_V1_ADDR)) {
+    WMotorV1.detected = true;
+    I2cSetActiveFound(WEMOS_MOTOR_V1_ADDR, "WEMOS_MOTOR_V1");
+    WMotorV1Reset();
+  }
+}
+
+void WMotorV1Reset(void)
+{
+
+  WMotorV1SetFrequency(WEMOS_MOTOR_V1_FREQ);
+}
+
+void WMotorV1SetFrequency(uint32_t freq)
+{
+  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
+  Wire.write(((byte)(freq >> 16)) & (byte)0x0f);
+  Wire.write((byte)(freq >> 16));
+  Wire.write((byte)(freq >> 8));
+  Wire.write((byte)freq);
+  Wire.endTransmission();
+
+}
+
+void WMotorV1SetMotor(uint8_t motor, uint8_t dir, float pwm_val)
+{
+  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
+  Wire.write(motor | (byte)0x10);
+  Wire.write(dir);
+
+  uint16_t _pwm_val = uint16_t(pwm_val * 100);
+  if (_pwm_val > 10000) {
+    _pwm_val = 10000;
+  }
+
+  Wire.write((byte)(_pwm_val >> 8));
+  Wire.write((byte)_pwm_val);
+  Wire.endTransmission();
+
+}
+
+bool WMotorV1Command(void)
+{
+  uint8_t args_count = 0;
+
+  if (XdrvMailbox.data_len > 0) {
+    args_count = 1;
+  } else {
+    return false;
+  }
+
+  for (uint32_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
+    if (' ' == XdrvMailbox.data[idx]) {
+      XdrvMailbox.data[idx] = ',';
+    }
+    if (',' == XdrvMailbox.data[idx]) {
+      args_count++;
+    }
+  }
+  UpperCase(XdrvMailbox.data, XdrvMailbox.data);
+
+  char *command = strtok(XdrvMailbox.data, ",");
+
+  if (strcmp(command, "RESET") == 0) {
+    WMotorV1Reset();
+    Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"RESET\":\"OK\"}}"));
+    return true;
+  }
+
+  if (strcmp(command, "SETMOTOR") == 0) {
+    if (args_count >= 3) {
+
+      int motor = atoi(strtok(NULL, ","));
+      int dir = atoi(strtok(NULL, ","));
+      int duty = 100;
+      if (args_count == 4) {
+        duty = atoi(strtok(NULL, ","));
+      }
+
+      WMotorV1SetMotor(motor, dir, duty);
+      Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"SETMOTOR\":\"OK\"}}"));
+      return true;
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool Xdrv34(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_44)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    WMotorV1Detect();
+  }
+  else if (WMotorV1.detected) {
+    switch (function) {
+      case FUNC_COMMAND_DRIVER:
+        if (XI2C_44 == XdrvMailbox.index) {
+          result = WMotorV1Command();
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
+# 22 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
+#ifdef DEBUG_THEO
+#ifndef USE_DEBUG_DRIVER
+#define USE_DEBUG_DRIVER 
+#endif
+#endif
+
+#ifdef USE_DEBUG_DRIVER
+
+
+
+
+
+
+#define XDRV_99 99
+
+#ifndef CPU_LOAD_CHECK
+#define CPU_LOAD_CHECK 1
+#endif
+
+
+
+
+
+#define D_CMND_CFGDUMP "CfgDump"
+#define D_CMND_CFGPEEK "CfgPeek"
+#define D_CMND_CFGPOKE "CfgPoke"
+#define D_CMND_CFGSHOW "CfgShow"
+#define D_CMND_CFGXOR "CfgXor"
+#define D_CMND_CPUCHECK "CpuChk"
+#define D_CMND_EXCEPTION "Exception"
+#define D_CMND_FLASHDUMP "FlashDump"
+#define D_CMND_FLASHMODE "FlashMode"
+#define D_CMND_FREEMEM "FreeMem"
+#define D_CMND_HELP "Help"
+#define D_CMND_RTCDUMP "RtcDump"
+#define D_CMND_SETSENSOR "SetSensor"
+#define D_CMND_I2CWRITE "I2CWrite"
+#define D_CMND_I2CREAD "I2CRead"
+#define D_CMND_I2CSTRETCH "I2CStretch"
+#define D_CMND_I2CCLOCK "I2CClock"
+
+const char kDebugCommands[] PROGMEM = "|"
+  D_CMND_CFGDUMP "|" D_CMND_CFGPEEK "|" D_CMND_CFGPOKE "|"
+#ifdef USE_WEBSERVER
+  D_CMND_CFGXOR "|"
+#endif
+  D_CMND_CPUCHECK "|"
+#ifdef DEBUG_THEO
+  D_CMND_EXCEPTION "|"
+#endif
+  D_CMND_FLASHDUMP "|" D_CMND_FLASHMODE "|" D_CMND_FREEMEM"|" D_CMND_HELP "|" D_CMND_RTCDUMP "|" D_CMND_SETSENSOR "|"
+#ifdef USE_I2C
+  D_CMND_I2CWRITE "|" D_CMND_I2CREAD "|" D_CMND_I2CSTRETCH "|" D_CMND_I2CCLOCK
+#endif
+  ;
+
+void (* const DebugCommand[])(void) PROGMEM = {
+  &CmndCfgDump, &CmndCfgPeek, &CmndCfgPoke,
+#ifdef USE_WEBSERVER
+  &CmndCfgXor,
+#endif
+  &CmndCpuCheck,
+#ifdef DEBUG_THEO
+  &CmndException,
+#endif
+  &CmndFlashDump, &CmndFlashMode, &CmndFreemem, &CmndHelp, &CmndRtcDump, &CmndSetSensor,
+#ifdef USE_I2C
+  &CmndI2cWrite, &CmndI2cRead, &CmndI2cStretch, &CmndI2cClock
+#endif
+  };
+
+uint32_t CPU_loops = 0;
+uint32_t CPU_last_millis = 0;
+uint32_t CPU_last_loop_time = 0;
+uint8_t CPU_load_check = 0;
+uint8_t CPU_show_freemem = 0;
+
+
+
+#ifdef DEBUG_THEO
+void ExceptionTest(uint8_t type)
+{
+# 145 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
+  if (1 == type) {
+    char svalue[10];
+    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7);
+  }
+# 159 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
+  if (2 == type) {
+    while(1) delay(1000);
+  }
+}
+
+#endif
+
+
+
+void CpuLoadLoop(void)
+{
+  CPU_last_loop_time = millis();
+  if (CPU_load_check && CPU_last_millis) {
+    CPU_loops ++;
+    if ((CPU_last_millis + (CPU_load_check *1000)) <= CPU_last_loop_time) {
+#if defined(F_CPU) && (F_CPU == 160000000L)
+      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *800) );
+      CPU_loops = CPU_loops / CPU_load_check;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(160MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
+#else
+      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *400) );
+      CPU_loops = CPU_loops / CPU_load_check;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(80MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
+#endif
+      CPU_last_millis = CPU_last_loop_time;
+      CPU_loops = 0;
+    }
+  }
+}
+
+
+
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
+
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t g_cont;
+}
+
+void DebugFreeMem(void)
+{
+  register uint32_t *sp asm("a1");
+
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_cont.stack), XdrvMailbox.data);
+}
+
+#else
+
+
+
+
+extern "C" {
+#include <cont.h>
+  extern cont_t* g_pcont;
+}
+
+void DebugFreeMem(void)
+{
+  register uint32_t *sp asm("a1");
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_pcont->stack), XdrvMailbox.data);
+}
+
+#endif
+
+
+
+void DebugRtcDump(char* parms)
+{
+  #define CFG_COLS 16
+
+  uint16_t idx;
+  uint16_t maxrow;
+  uint16_t row;
+  uint16_t col;
+  char *p;
+# 246 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
+  uint8_t buffer[768];
+
+  system_rtc_mem_read(0, (uint32_t*)&buffer, sizeof(buffer));
+
+  maxrow = ((sizeof(buffer)+CFG_COLS)/CFG_COLS);
+
+  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
+  uint16_t mrow = strtol(p, &p, 10);
+
+
+
+  if (0 == mrow) {
+    mrow = 8;
+  }
+  if (srow > maxrow) {
+    srow = maxrow - mrow;
+  }
+  if (mrow < (maxrow - srow)) {
+    maxrow = srow + mrow;
+  }
+
+  for (row = srow; row < maxrow; row++) {
+    idx = row * CFG_COLS;
+    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
+    for (col = 0; col < CFG_COLS; col++) {
+      if (!(col%4)) {
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
+      }
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+    for (col = 0; col < CFG_COLS; col++) {
+
+
+
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
+    AddLog(LOG_LEVEL_INFO);
+  }
+}
+
+
+
+void DebugCfgDump(char* parms)
+{
+  #define CFG_COLS 16
+
+  uint16_t idx;
+  uint16_t maxrow;
+  uint16_t row;
+  uint16_t col;
+  char *p;
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  maxrow = ((sizeof(SYSCFG)+CFG_COLS)/CFG_COLS);
+
+  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
+  uint16_t mrow = strtol(p, &p, 10);
+
+
+
+  if (0 == mrow) {
+    mrow = 8;
+  }
+  if (srow > maxrow) {
+    srow = maxrow - mrow;
+  }
+  if (mrow < (maxrow - srow)) {
+    maxrow = srow + mrow;
+  }
+
+  for (row = srow; row < maxrow; row++) {
+    idx = row * CFG_COLS;
+    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
+    for (col = 0; col < CFG_COLS; col++) {
+      if (!(col%4)) {
+        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
+      }
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+    for (col = 0; col < CFG_COLS; col++) {
+
+
+
+      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
+    }
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
+    AddLog(LOG_LEVEL_INFO);
+    delay(1);
+  }
+}
+
+void DebugCfgPeek(char* parms)
+{
+  char *p;
+
+  uint16_t address = strtol(parms, &p, 16);
+  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
+  address = (address >> 2) << 2;
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  uint8_t data8 = buffer[address];
+  uint16_t data16 = (buffer[address +1] << 8) + buffer[address];
+  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + data16;
+
+  snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), address);
+  for (uint32_t i = 0; i < 4; i++) {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[address +i]);
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
+  for (uint32_t i = 0; i < 4; i++) {
+    snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[address +i] > 0x20) && (buffer[address +i] < 0x7F)) ? (char)buffer[address +i] : ' ');
+  }
+  snprintf_P(log_data, sizeof(log_data), PSTR("%s| 0x%02X (%d), 0x%04X (%d), 0x%0LX (%lu)"), log_data, data8, data8, data16, data16, data32, data32);
+  AddLog(LOG_LEVEL_INFO);
+}
+
+void DebugCfgPoke(char* parms)
+{
+  char *p;
+
+  uint16_t address = strtol(parms, &p, 16);
+  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
+  address = (address >> 2) << 2;
+
+  uint32_t data = strtol(p, &p, 16);
+
+  uint8_t *buffer = (uint8_t *) &Settings;
+  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
+
+  uint8_t *nbuffer = (uint8_t *) &data;
+  for (uint32_t i = 0; i < 4; i++) { buffer[address +i] = nbuffer[+i]; }
+
+  uint32_t ndata32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("%03X: 0x%0LX (%lu) poked to 0x%0LX (%lu)"), address, data32, data32, ndata32, ndata32);
+}
+
+void SetFlashMode(uint8_t mode)
+{
+  uint8_t *_buffer;
+  uint32_t address;
+
+  address = 0;
+  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
+
+  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
+    if (_buffer[2] != mode) {
+      _buffer[2] = mode;
+      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
+        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
+      }
+    }
+  }
+  delete[] _buffer;
+}
+
+
+
+
+
+void CmndHelp(void)
+{
+  AddLog_P(LOG_LEVEL_INFO, PSTR("HLP: "), kDebugCommands);
+  ResponseCmndDone();
+}
+
+void CmndRtcDump(void)
+{
+  DebugRtcDump(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgDump(void)
+{
+  DebugCfgDump(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgPeek(void)
+{
+  DebugCfgPeek(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+void CmndCfgPoke(void)
+{
+  DebugCfgPoke(XdrvMailbox.data);
+  ResponseCmndDone();
+}
+
+#ifdef USE_WEBSERVER
+void CmndCfgXor(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    Web.config_xor_on_set = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Web.config_xor_on_set);
+}
+#endif
+
+#ifdef DEBUG_THEO
+void CmndException(void)
+{
+  if (XdrvMailbox.data_len > 0) { ExceptionTest(XdrvMailbox.payload); }
+  ResponseCmndDone();
+}
+#endif
+
+void CmndCpuCheck(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    CPU_load_check = XdrvMailbox.payload;
+    CPU_last_millis = CPU_last_loop_time;
+  }
+  ResponseCmndNumber(CPU_load_check);
+}
+
+void CmndFreemem(void)
+{
+  if (XdrvMailbox.data_len > 0) {
+    CPU_show_freemem = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(CPU_show_freemem);
+}
+
+void CmndSetSensor(void)
+{
+  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
+    if (XdrvMailbox.payload >= 0) {
+      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
+      if (1 == XdrvMailbox.payload) {
+        restart_flag = 2;
+      }
+    }
+    Response_P(PSTR("{\"" D_CMND_SETSENSOR "\":"));
+    XsnsSensorState();
+    ResponseJsonEnd();
+  }
+}
+
+void CmndFlashMode(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
+    SetFlashMode(XdrvMailbox.payload);
+  }
+  ResponseCmndNumber(ESP.getFlashChipMode());
+}
+
+uint32_t DebugSwap32(uint32_t x) {
+ return ((x << 24) & 0xff000000 ) |
+  ((x << 8) & 0x00ff0000 ) |
+  ((x >> 8) & 0x0000ff00 ) |
+  ((x >> 24) & 0x000000ff );
+}
+
+void CmndFlashDump(void)
+{
+
+
+
+  const uint32_t flash_start = 0x40200000;
+  const uint8_t bytes_per_cols = 0x20;
+  const uint32_t max = (SPIFFS_END + 5) * SPI_FLASH_SEC_SIZE;
+
+  uint32_t start = flash_start;
+  uint32_t rows = 8;
+
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= (max - bytes_per_cols))) {
+    start += (XdrvMailbox.payload &0x7FFFFFFC);
+
+    char *p;
+    uint32_t is_payload = strtol(XdrvMailbox.data, &p, 16);
+    rows = strtol(p, &p, 10);
+    if (0 == rows) { rows = 8; }
+  }
+  uint32_t end = start + (rows * bytes_per_cols);
+  if ((end - flash_start) > max) {
+    end = flash_start + max;
+  }
+
+  for (uint32_t pos = start; pos < end; pos += bytes_per_cols) {
+    uint32_t* values = (uint32_t*)(pos);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("%06X:  %08X %08X %08X %08X  %08X %08X %08X %08X"), pos - flash_start,
+      DebugSwap32(values[0]), DebugSwap32(values[1]), DebugSwap32(values[2]), DebugSwap32(values[3]),
+      DebugSwap32(values[4]), DebugSwap32(values[5]), DebugSwap32(values[6]), DebugSwap32(values[7]));
+  }
+  ResponseCmndDone();
+}
+
+#ifdef USE_I2C
+void CmndI2cWrite(void)
+{
+
+  if (i2c_flg) {
+    char* parms = XdrvMailbox.data;
+    uint8_t buffer[100];
+    uint32_t index = 0;
+
+    char *p;
+    char *data = strtok_r(parms, " ,", &p);
+    while (data != NULL && index < sizeof(buffer)) {
+      buffer[index++] = strtol(data, nullptr, 16);
+      data = strtok_r(nullptr, " ,", &p);
+    }
+
+    if (index > 1) {
+      AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
+
+      Wire.beginTransmission(buffer[0]);
+      for (uint32_t i = 1; i < index; i++) {
+        Wire.write(buffer[i]);
+      }
+      int result = Wire.endTransmission();
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("I2C: Result %d"), result);
+    }
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cRead(void)
+{
+
+  if (i2c_flg) {
+    char* parms = XdrvMailbox.data;
+    uint8_t buffer[100];
+    uint32_t index = 0;
+
+    char *p;
+    char *data = strtok_r(parms, " ,", &p);
+    while (data != NULL && index < sizeof(buffer)) {
+      buffer[index++] = strtol(data, nullptr, 16);
+      data = strtok_r(nullptr, " ,", &p);
+    }
+
+    if (index > 0) {
+      uint8_t size = 1;
+      if (index > 1) {
+        size = buffer[1];
+      }
+      Wire.requestFrom(buffer[0], size);
+      index = 0;
+      while (Wire.available() && index < sizeof(buffer)) {
+        buffer[index++] = Wire.read();
+      }
+      if (index > 0) {
+        AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
+      }
+    }
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cStretch(void)
+{
+  if (i2c_flg && (XdrvMailbox.payload > 0)) {
+    Wire.setClockStretchLimit(XdrvMailbox.payload);
+  }
+  ResponseCmndDone();
+}
+
+void CmndI2cClock(void)
+{
+  if (i2c_flg && (XdrvMailbox.payload > 0)) {
+    Wire.setClock(XdrvMailbox.payload);
+  }
+  ResponseCmndDone();
+}
+#endif
+
+
+
+
+
+bool Xdrv99(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      CpuLoadLoop();
+      break;
+    case FUNC_FREE_MEM:
+      if (CPU_show_freemem) { DebugFreeMem(); }
+      break;
+    case FUNC_PRE_INIT:
+      CPU_last_millis = millis();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kDebugCommands, DebugCommand);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdrv_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdrv_interface.ino"
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xdrv_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xdrv_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XDRV_01
+  &Xdrv01,
+#endif
+
+#ifdef XDRV_02
+  &Xdrv02,
+#endif
+
+#ifdef XDRV_03
+  &Xdrv03,
+#endif
+
+#ifdef XDRV_04
+  &Xdrv04,
+#endif
+
+#ifdef XDRV_05
+  &Xdrv05,
+#endif
+
+#ifdef XDRV_06
+  &Xdrv06,
+#endif
+
+#ifdef XDRV_07
+  &Xdrv07,
+#endif
+
+#ifdef XDRV_08
+  &Xdrv08,
+#endif
+
+#ifdef XDRV_09
+  &Xdrv09,
+#endif
+
+#ifdef XDRV_10
+  &Xdrv10,
+#endif
+
+#ifdef XDRV_11
+  &Xdrv11,
+#endif
+
+#ifdef XDRV_12
+  &Xdrv12,
+#endif
+
+#ifdef XDRV_13
+  &Xdrv13,
+#endif
+
+#ifdef XDRV_14
+  &Xdrv14,
+#endif
+
+#ifdef XDRV_15
+  &Xdrv15,
+#endif
+
+#ifdef XDRV_16
+  &Xdrv16,
+#endif
+
+#ifdef XDRV_17
+  &Xdrv17,
+#endif
+
+#ifdef XDRV_18
+  &Xdrv18,
+#endif
+
+#ifdef XDRV_19
+  &Xdrv19,
+#endif
+
+#ifdef XDRV_20
+  &Xdrv20,
+#endif
+
+#ifdef XDRV_21
+  &Xdrv21,
+#endif
+
+#ifdef XDRV_22
+  &Xdrv22,
+#endif
+
+#ifdef XDRV_23
+  &Xdrv23,
+#endif
+
+#ifdef XDRV_24
+  &Xdrv24,
+#endif
+
+#ifdef XDRV_25
+  &Xdrv25,
+#endif
+
+#ifdef XDRV_26
+  &Xdrv26,
+#endif
+
+#ifdef XDRV_27
+  &Xdrv27,
+#endif
+
+#ifdef XDRV_28
+  &Xdrv28,
+#endif
+
+#ifdef XDRV_29
+  &Xdrv29,
+#endif
+
+#ifdef XDRV_30
+  &Xdrv30,
+#endif
+
+#ifdef XDRV_31
+  &Xdrv31,
+#endif
+
+#ifdef XDRV_32
+  &Xdrv32,
+#endif
+
+#ifdef XDRV_33
+  &Xdrv33,
+#endif
+
+#ifdef XDRV_34
+  &Xdrv34,
+#endif
+
+#ifdef XDRV_35
+  &Xdrv35,
+#endif
+
+#ifdef XDRV_36
+  &Xdrv36,
+#endif
+
+#ifdef XDRV_37
+  &Xdrv37,
+#endif
+
+#ifdef XDRV_38
+  &Xdrv38,
+#endif
+
+#ifdef XDRV_39
+  &Xdrv39,
+#endif
+
+#ifdef XDRV_40
+  &Xdrv40,
+#endif
+
+#ifdef XDRV_41
+  &Xdrv41,
+#endif
+
+#ifdef XDRV_42
+  &Xdrv42,
+#endif
+
+#ifdef XDRV_43
+  &Xdrv43,
+#endif
+
+#ifdef XDRV_44
+  &Xdrv44,
+#endif
+
+#ifdef XDRV_45
+  &Xdrv45,
+#endif
+
+#ifdef XDRV_46
+  &Xdrv46,
+#endif
+
+#ifdef XDRV_47
+  &Xdrv47,
+#endif
+
+#ifdef XDRV_48
+  &Xdrv48,
+#endif
+
+#ifdef XDRV_49
+  &Xdrv49,
+#endif
+
+#ifdef XDRV_50
+  &Xdrv50,
+#endif
+
+#ifdef XDRV_51
+  &Xdrv51,
+#endif
+
+#ifdef XDRV_52
+  &Xdrv52,
+#endif
+
+#ifdef XDRV_53
+  &Xdrv53,
+#endif
+
+#ifdef XDRV_54
+  &Xdrv54,
+#endif
+
+#ifdef XDRV_55
+  &Xdrv55,
+#endif
+
+#ifdef XDRV_56
+  &Xdrv56,
+#endif
+
+#ifdef XDRV_57
+  &Xdrv57,
+#endif
+
+#ifdef XDRV_58
+  &Xdrv58,
+#endif
+
+#ifdef XDRV_59
+  &Xdrv59,
+#endif
+
+#ifdef XDRV_60
+  &Xdrv60,
+#endif
+
+#ifdef XDRV_61
+  &Xdrv61,
+#endif
+
+#ifdef XDRV_62
+  &Xdrv62,
+#endif
+
+#ifdef XDRV_63
+  &Xdrv63,
+#endif
+
+#ifdef XDRV_64
+  &Xdrv64,
+#endif
+
+#ifdef XDRV_65
+  &Xdrv65,
+#endif
+
+#ifdef XDRV_66
+  &Xdrv66,
+#endif
+
+#ifdef XDRV_67
+  &Xdrv67,
+#endif
+
+#ifdef XDRV_68
+  &Xdrv68,
+#endif
+
+#ifdef XDRV_69
+  &Xdrv69,
+#endif
+
+#ifdef XDRV_70
+  &Xdrv70,
+#endif
+
+#ifdef XDRV_71
+  &Xdrv71,
+#endif
+
+#ifdef XDRV_72
+  &Xdrv72,
+#endif
+
+#ifdef XDRV_73
+  &Xdrv73,
+#endif
+
+#ifdef XDRV_74
+  &Xdrv74,
+#endif
+
+#ifdef XDRV_75
+  &Xdrv75,
+#endif
+
+#ifdef XDRV_76
+  &Xdrv76,
+#endif
+
+#ifdef XDRV_77
+  &Xdrv77,
+#endif
+
+#ifdef XDRV_78
+  &Xdrv78,
+#endif
+
+#ifdef XDRV_79
+  &Xdrv79,
+#endif
+
+#ifdef XDRV_80
+  &Xdrv80,
+#endif
+
+#ifdef XDRV_81
+  &Xdrv81,
+#endif
+
+#ifdef XDRV_82
+  &Xdrv82,
+#endif
+
+#ifdef XDRV_83
+  &Xdrv83,
+#endif
+
+#ifdef XDRV_84
+  &Xdrv84,
+#endif
+
+#ifdef XDRV_85
+  &Xdrv85,
+#endif
+
+#ifdef XDRV_86
+  &Xdrv86,
+#endif
+
+#ifdef XDRV_87
+  &Xdrv87,
+#endif
+
+#ifdef XDRV_88
+  &Xdrv88,
+#endif
+
+#ifdef XDRV_89
+  &Xdrv89,
+#endif
+
+#ifdef XDRV_90
+  &Xdrv90,
+#endif
+
+#ifdef XDRV_91
+  &Xdrv91,
+#endif
+
+#ifdef XDRV_92
+  &Xdrv92,
+#endif
+
+#ifdef XDRV_93
+  &Xdrv93,
+#endif
+
+#ifdef XDRV_94
+  &Xdrv94,
+#endif
+
+#ifdef XDRV_95
+  &Xdrv95,
+#endif
+
+#ifdef XDRV_96
+  &Xdrv96,
+#endif
+
+#ifdef XDRV_97
+  &Xdrv97,
+#endif
+
+#ifdef XDRV_98
+  &Xdrv98,
+#endif
+
+#ifdef XDRV_99
+  &Xdrv99
+#endif
+};
+
+const uint8_t xdrv_present = sizeof(xdrv_func_ptr) / sizeof(xdrv_func_ptr[0]);
+
+
+
+
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kXdrvList[] PROGMEM = {
+#else
+const uint8_t kXdrvList[] = {
+#endif
+
+#ifdef XDRV_01
+  XDRV_01,
+#endif
+
+#ifdef XDRV_02
+  XDRV_02,
+#endif
+
+#ifdef XDRV_03
+  XDRV_03,
+#endif
+
+#ifdef XDRV_04
+  XDRV_04,
+#endif
+
+#ifdef XDRV_05
+  XDRV_05,
+#endif
+
+#ifdef XDRV_06
+  XDRV_06,
+#endif
+
+#ifdef XDRV_07
+  XDRV_07,
+#endif
+
+#ifdef XDRV_08
+  XDRV_08,
+#endif
+
+#ifdef XDRV_09
+  XDRV_09,
+#endif
+
+#ifdef XDRV_10
+  XDRV_10,
+#endif
+
+#ifdef XDRV_11
+  XDRV_11,
+#endif
+
+#ifdef XDRV_12
+  XDRV_12,
+#endif
+
+#ifdef XDRV_13
+  XDRV_13,
+#endif
+
+#ifdef XDRV_14
+  XDRV_14,
+#endif
+
+#ifdef XDRV_15
+  XDRV_15,
+#endif
+
+#ifdef XDRV_16
+  XDRV_16,
+#endif
+
+#ifdef XDRV_17
+  XDRV_17,
+#endif
+
+#ifdef XDRV_18
+  XDRV_18,
+#endif
+
+#ifdef XDRV_19
+  XDRV_19,
+#endif
+
+#ifdef XDRV_20
+  XDRV_20,
+#endif
+
+#ifdef XDRV_21
+  XDRV_21,
+#endif
+
+#ifdef XDRV_22
+  XDRV_22,
+#endif
+
+#ifdef XDRV_23
+  XDRV_23,
+#endif
+
+#ifdef XDRV_24
+  XDRV_24,
+#endif
+
+#ifdef XDRV_25
+  XDRV_25,
+#endif
+
+#ifdef XDRV_26
+  XDRV_26,
+#endif
+
+#ifdef XDRV_27
+  XDRV_27,
+#endif
+
+#ifdef XDRV_28
+  XDRV_28,
+#endif
+
+#ifdef XDRV_29
+  XDRV_29,
+#endif
+
+#ifdef XDRV_30
+  XDRV_30,
+#endif
+
+#ifdef XDRV_31
+  XDRV_31,
+#endif
+
+#ifdef XDRV_32
+  XDRV_32,
+#endif
+
+#ifdef XDRV_33
+  XDRV_33,
+#endif
+
+#ifdef XDRV_34
+  XDRV_34,
+#endif
+
+#ifdef XDRV_35
+  XDRV_35,
+#endif
+
+#ifdef XDRV_36
+  XDRV_36,
+#endif
+
+#ifdef XDRV_37
+  XDRV_37,
+#endif
+
+#ifdef XDRV_38
+  XDRV_38,
+#endif
+
+#ifdef XDRV_39
+  XDRV_39,
+#endif
+
+#ifdef XDRV_40
+  XDRV_40,
+#endif
+
+#ifdef XDRV_41
+  XDRV_41,
+#endif
+
+#ifdef XDRV_42
+  XDRV_42,
+#endif
+
+#ifdef XDRV_43
+  XDRV_43,
+#endif
+
+#ifdef XDRV_44
+  XDRV_44,
+#endif
+
+#ifdef XDRV_45
+  XDRV_45,
+#endif
+
+#ifdef XDRV_46
+  XDRV_46,
+#endif
+
+#ifdef XDRV_47
+  XDRV_47,
+#endif
+
+#ifdef XDRV_48
+  XDRV_48,
+#endif
+
+#ifdef XDRV_49
+  XDRV_49,
+#endif
+
+#ifdef XDRV_50
+  XDRV_50,
+#endif
+
+#ifdef XDRV_51
+  XDRV_51,
+#endif
+
+#ifdef XDRV_52
+  XDRV_52,
+#endif
+
+#ifdef XDRV_53
+  XDRV_53,
+#endif
+
+#ifdef XDRV_54
+  XDRV_54,
+#endif
+
+#ifdef XDRV_55
+  XDRV_55,
+#endif
+
+#ifdef XDRV_56
+  XDRV_56,
+#endif
+
+#ifdef XDRV_57
+  XDRV_57,
+#endif
+
+#ifdef XDRV_58
+  XDRV_58,
+#endif
+
+#ifdef XDRV_59
+  XDRV_59,
+#endif
+
+#ifdef XDRV_60
+  XDRV_60,
+#endif
+
+#ifdef XDRV_61
+  XDRV_61,
+#endif
+
+#ifdef XDRV_62
+  XDRV_62,
+#endif
+
+#ifdef XDRV_63
+  XDRV_63,
+#endif
+
+#ifdef XDRV_64
+  XDRV_64,
+#endif
+
+#ifdef XDRV_65
+  XDRV_65,
+#endif
+
+#ifdef XDRV_66
+  XDRV_66,
+#endif
+
+#ifdef XDRV_67
+  XDRV_67,
+#endif
+
+#ifdef XDRV_68
+  XDRV_68,
+#endif
+
+#ifdef XDRV_69
+  XDRV_69,
+#endif
+
+#ifdef XDRV_70
+  XDRV_70,
+#endif
+
+#ifdef XDRV_71
+  XDRV_71,
+#endif
+
+#ifdef XDRV_72
+  XDRV_72,
+#endif
+
+#ifdef XDRV_73
+  XDRV_73,
+#endif
+
+#ifdef XDRV_74
+  XDRV_74,
+#endif
+
+#ifdef XDRV_75
+  XDRV_75,
+#endif
+
+#ifdef XDRV_76
+  XDRV_76,
+#endif
+
+#ifdef XDRV_77
+  XDRV_77,
+#endif
+
+#ifdef XDRV_78
+  XDRV_78,
+#endif
+
+#ifdef XDRV_79
+  XDRV_79,
+#endif
+
+#ifdef XDRV_80
+  XDRV_80,
+#endif
+
+#ifdef XDRV_81
+  XDRV_81,
+#endif
+
+#ifdef XDRV_82
+  XDRV_82,
+#endif
+
+#ifdef XDRV_83
+  XDRV_83,
+#endif
+
+#ifdef XDRV_84
+  XDRV_84,
+#endif
+
+#ifdef XDRV_85
+  XDRV_85,
+#endif
+
+#ifdef XDRV_86
+  XDRV_86,
+#endif
+
+#ifdef XDRV_87
+  XDRV_87,
+#endif
+
+#ifdef XDRV_88
+  XDRV_88,
+#endif
+
+#ifdef XDRV_89
+  XDRV_89,
+#endif
+
+#ifdef XDRV_90
+  XDRV_90,
+#endif
+
+#ifdef XDRV_91
+  XDRV_91,
+#endif
+
+#ifdef XDRV_92
+  XDRV_92,
+#endif
+
+#ifdef XDRV_93
+  XDRV_93,
+#endif
+
+#ifdef XDRV_94
+  XDRV_94,
+#endif
+
+#ifdef XDRV_95
+  XDRV_95,
+#endif
+
+#ifdef XDRV_96
+  XDRV_96,
+#endif
+
+#ifdef XDRV_97
+  XDRV_97,
+#endif
+
+#ifdef XDRV_98
+  XDRV_98,
+#endif
+
+#ifdef XDRV_99
+  XDRV_99
+#endif
+};
+
+
+
+void XsnsDriverState(void)
+{
+  ResponseAppend_P(PSTR(",\"Drivers\":\""));
+  for (uint32_t i = 0; i < sizeof(kXdrvList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t driverid = pgm_read_byte(kXdrvList + i);
+#else
+    uint32_t driverid = kXdrvList[i];
+#endif
+    ResponseAppend_P(PSTR("%s%d"), (i) ? "," : "", driverid);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+
+
+bool XdrvRulesProcess(void)
+{
+  return XdrvCallDriver(10, FUNC_RULES_PROCESS);
+}
+
+#ifdef USE_DEBUG_DRIVER
+void ShowFreeMem(const char *where)
+{
+  char stemp[30];
+  snprintf_P(stemp, sizeof(stemp), where);
+  XdrvMailbox.data = stemp;
+  XdrvCall(FUNC_FREE_MEM);
+}
+#endif
+
+
+
+
+
+bool XdrvCallDriver(uint32_t driver, uint8_t Function)
+{
+  for (uint32_t x = 0; x < xdrv_present; x++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t listed = pgm_read_byte(kXdrvList + x);
+#else
+    uint32_t listed = kXdrvList[x];
+#endif
+    if (driver == listed) {
+      return xdrv_func_ptr[x](Function);
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool XdrvCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
+
+  for (uint32_t x = 0; x < xdrv_present; x++) {
+    result = xdrv_func_ptr[x](Function);
+
+    if (result && ((FUNC_COMMAND == Function) ||
+                   (FUNC_COMMAND_DRIVER == Function) ||
+                   (FUNC_MQTT_DATA == Function) ||
+                   (FUNC_RULES_PROCESS == Function) ||
+                   (FUNC_BUTTON_PRESSED == Function) ||
+                   (FUNC_SERIAL == Function) ||
+                   (FUNC_MODULE_INIT == Function) ||
+                   (FUNC_SET_CHANNELS == Function) ||
+                   (FUNC_PIN_STATE == Function) ||
+                   (FUNC_SET_DEVICE_POWER == Function)
+                  )) {
+      break;
+    }
+  }
+
+  return result;
+}
+# 1 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_LCD
+
+#define XDSP_01 1
+#define XI2C_03 3
+
+#define LCD_ADDRESS1 0x27
+#define LCD_ADDRESS2 0x3F
+
+#include <Wire.h>
+#include <LiquidCrystal_I2C.h>
+
+LiquidCrystal_I2C *lcd;
+
+
+
+void LcdInitMode(void)
+{
+  lcd->init();
+  lcd->clear();
+}
+
+void LcdInit(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      LcdInitMode();
+#ifdef USE_DISPLAY_MODES1TO5
+      DisplayClearScreenBuffer();
+#endif
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void LcdInitDriver(void)
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(LCD_ADDRESS1)) {
+      Settings.display_address[0] = LCD_ADDRESS1;
+      Settings.display_model = XDSP_01;
+    }
+    else if (I2cSetDevice(LCD_ADDRESS2)) {
+      Settings.display_address[0] = LCD_ADDRESS2;
+      Settings.display_model = XDSP_01;
+    }
+  }
+
+  if (XDSP_01 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "LCD");
+
+    Settings.display_width = Settings.display_cols[0];
+    Settings.display_height = Settings.display_rows;
+    lcd = new LiquidCrystal_I2C(Settings.display_address[0], Settings.display_cols[0], Settings.display_rows);
+
+#ifdef USE_DISPLAY_MODES1TO5
+    DisplayAllocScreenBuffer();
+#endif
+
+    LcdInitMode();
+  }
+}
+
+void LcdDrawStringAt(void)
+{
+  if (dsp_flag) {
+    dsp_x--;
+    dsp_y--;
+  }
+  lcd->setCursor(dsp_x, dsp_y);
+  lcd->print(dsp_str);
+}
+
+void LcdDisplayOnOff(uint8_t on)
+{
+  if (on) {
+    lcd->backlight();
+  } else {
+    lcd->noBacklight();
+  }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void LcdCenter(uint8_t row, char* txt)
+{
+  char line[Settings.display_cols[0] +2];
+
+  int len = strlen(txt);
+  int offset = 0;
+  if (len >= Settings.display_cols[0]) {
+    len = Settings.display_cols[0];
+  } else {
+    offset = (Settings.display_cols[0] - len) / 2;
+  }
+  memset(line, 0x20, Settings.display_cols[0]);
+  line[Settings.display_cols[0]] = 0;
+  for (uint32_t i = 0; i < len; i++) {
+    line[offset +i] = txt[i];
+  }
+  lcd->setCursor(0, row);
+  lcd->print(line);
+}
+
+bool LcdPrintLog(void)
+{
+  bool result = false;
+
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\337');
+    if (txt != nullptr) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      for (uint32_t i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        lcd->setCursor(0, i);
+        lcd->print(disp_screen_buffer[i +1]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      lcd->setCursor(0, last_row);
+      lcd->print(disp_screen_buffer[last_row]);
+
+      result = true;
+    }
+  }
+  return result;
+}
+
+void LcdTime(void)
+{
+  char line[Settings.display_cols[0] +1];
+
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  LcdCenter(0, line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  LcdCenter(1, line);
+}
+
+void LcdRefresh(void)
+{
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        LcdTime();
+        break;
+      case 2:
+      case 4:
+        LcdPrintLog();
+        break;
+      case 3:
+      case 5: {
+        if (!LcdPrintLog()) { LcdTime(); }
+        break;
+      }
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp01(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_03)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    LcdInitDriver();
+  }
+  else if (XDSP_01 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_INIT:
+        LcdInit(dsp_init);
+        break;
+      case FUNC_DISPLAY_POWER:
+        LcdDisplayOnOff(disp_power);
+        break;
+      case FUNC_DISPLAY_CLEAR:
+        lcd->clear();
+        break;
+# 238 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
+      case FUNC_DISPLAY_DRAW_STRING:
+        LcdDrawStringAt();
+        break;
+      case FUNC_DISPLAY_ONOFF:
+        LcdDisplayOnOff(dsp_on);
+        break;
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        LcdRefresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_02_ssd1306.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_02_ssd1306.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SSD1306
+
+#define XDSP_02 2
+#define XI2C_04 4
+
+#define OLED_RESET 4
+
+#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
+
+#define OLED_ADDRESS1 0x3C
+#define OLED_ADDRESS2 0x3D
+
+#define OLED_BUFFER_COLS 40
+#define OLED_BUFFER_ROWS 16
+
+#define OLED_FONT_WIDTH 6
+#define OLED_FONT_HEIGTH 8
+
+#include <Wire.h>
+#include <renderer.h>
+#include <Adafruit_SSD1306.h>
+
+Adafruit_SSD1306 *oled1306;
+
+extern uint8_t *buffer;
+
+
+
+void SSD1306InitDriver(void)
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(OLED_ADDRESS1)) {
+      Settings.display_address[0] = OLED_ADDRESS1;
+      Settings.display_model = XDSP_02;
+    }
+    else if (I2cSetDevice(OLED_ADDRESS2)) {
+      Settings.display_address[0] = OLED_ADDRESS2;
+      Settings.display_model = XDSP_02;
+    }
+  }
+
+  if (XDSP_02 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "SSD1306");
+
+    if ((Settings.display_width != 64) && (Settings.display_width != 96) && (Settings.display_width != 128)) {
+      Settings.display_width = 128;
+    }
+    if ((Settings.display_height != 16) && (Settings.display_height != 32) && (Settings.display_height != 48) && (Settings.display_height != 64)) {
+      Settings.display_height = 64;
+    }
+
+    uint8_t reset_pin = -1;
+    if (pin[GPIO_OLED_RESET] < 99) {
+      reset_pin = pin[GPIO_OLED_RESET];
+    }
+
+
+    if (buffer) { free(buffer); }
+    buffer = (unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1);
+    if (!buffer) { return; }
+
+
+
+    oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin);
+    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], reset_pin >= 0);
+    renderer = oled1306;
+    renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+    renderer->setTextFont(0);
+    renderer->setTextSize(2);
+    renderer->setCursor(20,20);
+    renderer->println(F("SSD1306"));
+    renderer->Updateframe();
+    renderer->DisplayOnff(1);
+#endif
+
+  }
+}
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void Ssd1306PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void Ssd1306Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(Settings.display_size);
+  renderer->setTextFont(Settings.display_font);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void Ssd1306Refresh(void)
+{
+  if (!renderer) return;
+
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        Ssd1306Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        Ssd1306PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp02(byte function)
+{
+  if (!I2cEnabled(XI2C_04)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    SSD1306InitDriver();
+  }
+  else if (XDSP_02 == Settings.display_model) {
+    switch (function) {
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        Ssd1306Refresh();
+        break;
+#endif
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_03_matrix.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_03_matrix.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_MATRIX
+
+#define XDSP_03 3
+#define XI2C_05 5
+
+#define MTX_MAX_SCREEN_BUFFER 80
+
+#include <Wire.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_LEDBackpack.h>
+
+Adafruit_8x8matrix *matrix[8];
+uint8_t mtx_matrices = 0;
+uint8_t mtx_state = 0;
+uint8_t mtx_counter = 0;
+int16_t mtx_x = 0;
+int16_t mtx_y = 0;
+
+
+char *mtx_buffer = nullptr;
+
+uint8_t mtx_mode = 0;
+uint8_t mtx_loop = 0;
+uint8_t mtx_done = 0;
+
+
+
+void MatrixWrite(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->writeDisplay();
+  }
+}
+
+void MatrixClear(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+  }
+  MatrixWrite();
+}
+
+void MatrixFixed(char* txt)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+    matrix[i]->setCursor(-i *8, 0);
+    matrix[i]->print(txt);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+  }
+  MatrixWrite();
+}
+
+void MatrixCenter(char* txt)
+{
+  int offset;
+
+  int len = strlen(txt);
+  offset = (len < 8) ? offset = ((mtx_matrices *8) - (len *6)) / 2 : 0;
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->clear();
+    matrix[i]->setCursor(-(i *8)+offset, 0);
+    matrix[i]->print(txt);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+  }
+  MatrixWrite();
+}
+
+void MatrixScrollLeft(char* txt, int loop)
+{
+  switch (mtx_state) {
+  case 1:
+    mtx_state = 2;
+
+    mtx_x = 8 * mtx_matrices;
+
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), txt);
+
+    disp_refresh = Settings.display_refresh;
+  case 2:
+  disp_refresh--;
+    if (!disp_refresh) {
+      disp_refresh = Settings.display_refresh;
+      for (uint32_t i = 0; i < mtx_matrices; i++) {
+        matrix[i]->clear();
+        matrix[i]->setCursor(mtx_x - i *8, 0);
+        matrix[i]->print(txt);
+        matrix[i]->setBrightness(Settings.display_dimmer);
+      }
+      MatrixWrite();
+
+      mtx_x--;
+      int16_t len = strlen(txt);
+      if (mtx_x < -(len *6)) { mtx_state = loop; }
+    }
+    break;
+  }
+}
+
+void MatrixScrollUp(char* txt, int loop)
+{
+  int wordcounter = 0;
+  char tmpbuf[200];
+  char *words[100];
+
+
+
+  char separators[] = " /";
+
+  switch (mtx_state) {
+  case 1:
+    mtx_state = 2;
+
+    mtx_y = 8;
+    mtx_counter = 0;
+    disp_refresh = Settings.display_refresh;
+  case 2:
+    disp_refresh--;
+    if (!disp_refresh) {
+      disp_refresh = Settings.display_refresh;
+      strlcpy(tmpbuf, txt, sizeof(tmpbuf));
+      char *p = strtok(tmpbuf, separators);
+      while (p != nullptr && wordcounter < 40) {
+        words[wordcounter++] = p;
+        p = strtok(nullptr, separators);
+      }
+      for (uint32_t i = 0; i < mtx_matrices; i++) {
+        matrix[i]->clear();
+        for (uint32_t j = 0; j < wordcounter; j++) {
+          matrix[i]->setCursor(-i *8, mtx_y + (j *8));
+          matrix[i]->println(words[j]);
+        }
+        matrix[i]->setBrightness(Settings.display_dimmer);
+      }
+      MatrixWrite();
+      if (((mtx_y %8) == 0) && mtx_counter) {
+        mtx_counter--;
+      } else {
+        mtx_y--;
+        mtx_counter = STATES * 1;
+      }
+      if (mtx_y < -(wordcounter *8)) { mtx_state = loop; }
+    }
+    break;
+  }
+}
+
+
+
+void MatrixInitMode(void)
+{
+  for (uint32_t i = 0; i < mtx_matrices; i++) {
+    matrix[i]->setRotation(Settings.display_rotate);
+    matrix[i]->setBrightness(Settings.display_dimmer);
+    matrix[i]->blinkRate(0);
+    matrix[i]->setTextWrap(false);
+
+
+    matrix[i]->cp437(true);
+  }
+  MatrixClear();
+}
+
+void MatrixInit(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      MatrixInitMode();
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void MatrixInitDriver(void)
+{
+  mtx_buffer = (char*)(malloc(MTX_MAX_SCREEN_BUFFER));
+  if (mtx_buffer != nullptr) {
+    if (!Settings.display_model) {
+      if (I2cSetDevice(Settings.display_address[1])) {
+        Settings.display_model = XDSP_03;
+      }
+    }
+
+    if (XDSP_03 == Settings.display_model) {
+      mtx_state = 1;
+      for (mtx_matrices = 0; mtx_matrices < 8; mtx_matrices++) {
+        if (Settings.display_address[mtx_matrices]) {
+          I2cSetActiveFound(Settings.display_address[mtx_matrices], "8x8Matrix");
+          matrix[mtx_matrices] = new Adafruit_8x8matrix();
+          matrix[mtx_matrices]->begin(Settings.display_address[mtx_matrices]);
+        } else {
+          break;
+        }
+      }
+
+      Settings.display_width = mtx_matrices * 8;
+      Settings.display_height = 8;
+
+      MatrixInitMode();
+    }
+  }
+}
+
+void MatrixOnOff(void)
+{
+  if (!disp_power) { MatrixClear(); }
+}
+
+void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  strlcpy(mtx_buffer, str, MTX_MAX_SCREEN_BUFFER);
+  mtx_mode = x &1;
+  mtx_loop = y &1;
+  if (!mtx_state) { mtx_state = 1; }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void MatrixPrintLog(uint8_t direction)
+{
+  char* txt = (!mtx_done) ? DisplayLogBuffer('\370') : mtx_buffer;
+  if (txt != nullptr) {
+    if (!mtx_state) { mtx_state = 1; }
+
+    if (!mtx_done) {
+
+      uint8_t space = 0;
+      uint8_t max_cols = (disp_log_buffer_cols < MTX_MAX_SCREEN_BUFFER) ? disp_log_buffer_cols : MTX_MAX_SCREEN_BUFFER;
+      mtx_buffer[0] = '\0';
+      uint8_t i = 0;
+      while ((txt[i] != '\0') && (i < max_cols)) {
+        if (txt[i] == ' ') {
+          space++;
+        } else {
+          space = 0;
+        }
+        if (space < 2) {
+          strncat(mtx_buffer, (const char*)txt +i, (strlen(mtx_buffer) < MTX_MAX_SCREEN_BUFFER -1) ? 1 : 0);
+        }
+        i++;
+      }
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), mtx_buffer);
+
+      mtx_done = 1;
+    }
+
+    if (direction) {
+      MatrixScrollUp(mtx_buffer, 0);
+    } else {
+      MatrixScrollLeft(mtx_buffer, 0);
+    }
+    if (!mtx_state) { mtx_done = 0; }
+  } else {
+    char disp_time[9];
+
+    snprintf_P(disp_time, sizeof(disp_time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+    MatrixFixed(disp_time);
+  }
+}
+
+#endif
+
+void MatrixRefresh(void)
+{
+  if (disp_power) {
+    switch (Settings.display_mode) {
+      case 0: {
+        switch (mtx_mode) {
+          case 0:
+            MatrixScrollLeft(mtx_buffer, mtx_loop);
+            break;
+          case 1:
+            MatrixScrollUp(mtx_buffer, mtx_loop);
+            break;
+        }
+        break;
+      }
+#ifdef USE_DISPLAY_MODES1TO5
+      case 2: {
+        char disp_date[9];
+        snprintf_P(disp_date, sizeof(disp_date), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year -2000);
+        MatrixFixed(disp_date);
+        break;
+      }
+      case 3: {
+        char disp_day[10];
+        snprintf_P(disp_day, sizeof(disp_day), PSTR("%d %s"), RtcTime.day_of_month, RtcTime.name_of_month);
+        MatrixCenter(disp_day);
+        break;
+      }
+      case 4:
+        MatrixPrintLog(0);
+        break;
+      case 1:
+      case 5:
+        MatrixPrintLog(1);
+        break;
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xdsp03(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_05)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    MatrixInitDriver();
+  }
+  else if (XDSP_03 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_INIT:
+        MatrixInit(dsp_init);
+        break;
+      case FUNC_DISPLAY_EVERY_50_MSECOND:
+        MatrixRefresh();
+        break;
+      case FUNC_DISPLAY_POWER:
+        MatrixOnOff();
+        break;
+      case FUNC_DISPLAY_DRAW_STRING:
+        MatrixDrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_04_ili9341.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_04_ili9341.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_ILI9341
+
+#define XDSP_04 4
+
+#define TFT_TOP 16
+#define TFT_BOTTOM 16
+#define TFT_FONT_WIDTH 6
+#define TFT_FONT_HEIGTH 8
+
+#include <SPI.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_ILI9341.h>
+
+Adafruit_ILI9341 *tft;
+
+uint16_t tft_scroll;
+
+
+
+void Ili9341InitMode(void)
+{
+  tft->setRotation(Settings.display_rotate);
+  tft->invertDisplay(0);
+  tft->fillScreen(ILI9341_BLACK);
+  tft->setTextWrap(false);
+  tft->cp437(true);
+  if (!Settings.display_mode) {
+    tft->setCursor(0, 0);
+    tft->setTextColor(ILI9341_WHITE, ILI9341_BLACK);
+    tft->setTextSize(1);
+  } else {
+    tft->setScrollMargins(TFT_TOP, TFT_BOTTOM);
+    tft->setCursor(0, 0);
+    tft->setTextColor(ILI9341_YELLOW, ILI9341_BLACK);
+    tft->setTextSize(2);
+
+
+    tft_scroll = TFT_TOP;
+  }
+}
+
+void Ili9341Init(uint8_t mode)
+{
+  switch(mode) {
+    case DISPLAY_INIT_MODE:
+      Ili9341InitMode();
+#ifdef USE_DISPLAY_MODES1TO5
+      if (Settings.display_rotate) {
+        DisplayClearScreenBuffer();
+      }
+#endif
+      break;
+    case DISPLAY_INIT_PARTIAL:
+    case DISPLAY_INIT_FULL:
+      break;
+  }
+}
+
+void Ili9341InitDriver(void)
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_04;
+  }
+
+  if (XDSP_04 == Settings.display_model) {
+    if (Settings.display_width != ILI9341_TFTWIDTH) {
+      Settings.display_width = ILI9341_TFTWIDTH;
+    }
+    if (Settings.display_height != ILI9341_TFTHEIGHT) {
+      Settings.display_height = ILI9341_TFTHEIGHT;
+    }
+    tft = new Adafruit_ILI9341(pin[GPIO_SPI_CS], pin[GPIO_SPI_DC]);
+    tft->begin();
+
+#ifdef USE_DISPLAY_MODES1TO5
+    if (Settings.display_rotate) {
+      DisplayAllocScreenBuffer();
+    }
+#endif
+
+    Ili9341InitMode();
+  }
+}
+
+void Ili9341Clear(void)
+{
+  tft->fillScreen(ILI9341_BLACK);
+  tft->setCursor(0, 0);
+}
+
+void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
+{
+  uint16_t active_color = ILI9341_WHITE;
+
+  tft->setTextSize(Settings.display_size);
+  if (!flag) {
+    tft->setCursor(x, y);
+  } else {
+    tft->setCursor((x-1) * TFT_FONT_WIDTH * Settings.display_size, (y-1) * TFT_FONT_HEIGTH * Settings.display_size);
+  }
+  if (color) { active_color = color; }
+  tft->setTextColor(active_color, ILI9341_BLACK);
+  tft->println(str);
+}
+
+void Ili9341DisplayOnOff(uint8_t on)
+{
+
+
+  if (pin[GPIO_BACKLIGHT] < 99) {
+    pinMode(pin[GPIO_BACKLIGHT], OUTPUT);
+    digitalWrite(pin[GPIO_BACKLIGHT], on);
+  }
+}
+
+void Ili9341OnOff(void)
+{
+  Ili9341DisplayOnOff(disp_power);
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void Ili9341PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (Settings.display_rotate) {
+      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+    }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != nullptr) {
+      uint8_t size = Settings.display_size;
+      uint16_t theight = size * TFT_FONT_HEIGTH;
+
+      tft->setTextSize(size);
+      tft->setTextColor(ILI9341_CYAN, ILI9341_BLACK);
+      if (!Settings.display_rotate) {
+        tft->setCursor(0, tft_scroll);
+        tft->fillRect(0, tft_scroll, tft->width(), theight, ILI9341_BLACK);
+        tft->print(txt);
+        tft_scroll += theight;
+        if (tft_scroll >= (tft->height() - TFT_BOTTOM)) {
+          tft_scroll = TFT_TOP;
+        }
+        tft->scrollTo(tft_scroll);
+      } else {
+        uint8_t last_row = Settings.display_rows -1;
+
+        tft_scroll = theight;
+        tft->setCursor(0, tft_scroll);
+        for (uint32_t i = 0; i < last_row; i++) {
+          strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+
+          tft->print(disp_screen_buffer[i]);
+          tft_scroll += theight;
+          tft->setCursor(0, tft_scroll);
+          delay(1);
+        }
+        strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+        DisplayFillScreen(last_row);
+        tft->print(disp_screen_buffer[last_row]);
+      }
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
+    }
+  }
+}
+
+void Ili9341Refresh(void)
+{
+  if (Settings.display_mode) {
+    char tftdt[Settings.display_cols[0] +1];
+    char date4[11];
+    char space[Settings.display_cols[0] - 17];
+    char time[9];
+
+    tft->setTextSize(2);
+    tft->setTextColor(ILI9341_YELLOW, ILI9341_RED);
+    tft->setCursor(0, 0);
+
+    snprintf_P(date4, sizeof(date4), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+    memset(space, 0x20, sizeof(space));
+    space[sizeof(space) -1] = '\0';
+    snprintf_P(time, sizeof(time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+    snprintf_P(tftdt, sizeof(tftdt), PSTR("%s%s%s"), date4, space, time);
+
+    tft->print(tftdt);
+
+    switch (Settings.display_mode) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        Ili9341PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp04(uint8_t function)
+{
+  bool result = false;
+
+  if (spi_flg) {
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      Ili9341InitDriver();
+    }
+    else if (XDSP_04 == Settings.display_model) {
+
+      if (!dsp_color) { dsp_color = ILI9341_WHITE; }
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+        case FUNC_DISPLAY_INIT:
+          Ili9341Init(dsp_init);
+          break;
+        case FUNC_DISPLAY_POWER:
+          Ili9341OnOff();
+          break;
+        case FUNC_DISPLAY_CLEAR:
+          Ili9341Clear();
+          break;
+        case FUNC_DISPLAY_DRAW_HLINE:
+          tft->writeFastHLine(dsp_x, dsp_y, dsp_len, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_VLINE:
+          tft->writeFastVLine(dsp_x, dsp_y, dsp_len, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_LINE:
+          tft->writeLine(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_CIRCLE:
+          tft->drawCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
+          break;
+        case FUNC_DISPLAY_FILL_CIRCLE:
+          tft->fillCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
+          break;
+        case FUNC_DISPLAY_DRAW_RECTANGLE:
+          tft->drawRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+        case FUNC_DISPLAY_FILL_RECTANGLE:
+          tft->fillRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
+          break;
+
+
+
+        case FUNC_DISPLAY_TEXT_SIZE:
+          tft->setTextSize(Settings.display_size);
+          break;
+        case FUNC_DISPLAY_FONT_SIZE:
+
+          break;
+        case FUNC_DISPLAY_DRAW_STRING:
+          Ili9341DrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
+          break;
+        case FUNC_DISPLAY_ONOFF:
+          Ili9341DisplayOnOff(dsp_on);
+          break;
+        case FUNC_DISPLAY_ROTATION:
+          tft->setRotation(Settings.display_rotate);
+          break;
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          Ili9341Refresh();
+          break;
+#endif
+      }
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_EPAPER_29
+
+#define XDSP_05 5
+
+#define EPD_TOP 12
+#define EPD_FONT_HEIGTH 12
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+
+#define USE_TINY_FONT 
+
+#include <epd2in9.h>
+#include <epdpaint.h>
+
+
+extern uint8_t *buffer;
+uint16_t epd_scroll;
+
+Epd *epd;
+
+
+
+void EpdInitDriver29()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_05;
+  }
+
+  if (XDSP_05 == Settings.display_model) {
+    if (Settings.display_width != EPD_WIDTH) {
+      Settings.display_width = EPD_WIDTH;
+    }
+    if (Settings.display_height != EPD_HEIGHT) {
+      Settings.display_height = EPD_HEIGHT;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((EPD_WIDTH * EPD_HEIGHT) / 8,1);
+    if (!buffer) return;
+
+
+    epd = new Epd(EPD_WIDTH,EPD_HEIGHT);
+
+
+    if ((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CLK] < 99) && (pin[GPIO_SPI_MOSI] < 99)) {
+      epd->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: HardSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SPI_CS], pin[GPIO_SPI_CLK], pin[GPIO_SPI_MOSI]);
+    }
+    else if ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_MOSI] < 99)) {
+      epd->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: SoftSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SSPI_CS], pin[GPIO_SSPI_SCLK], pin[GPIO_SSPI_MOSI]);
+    } else {
+      free(buffer);
+      return;
+    }
+
+    renderer = epd;
+    epd->Init(DISPLAY_INIT_FULL);
+    epd->Init(DISPLAY_INIT_PARTIAL);
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(1);
+    renderer->DrawStringAt(50, 50, "Waveshare E-Paper Display!", COLORED,0);
+    renderer->Updateframe();
+    delay(1000);
+    renderer->fillScreen(0);
+#endif
+
+  }
+}
+
+
+
+
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+#define EPD_FONT_HEIGTH 12
+void EpdPrintLog29(void)
+{
+
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+
+      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+
+    char* txt = DisplayLogBuffer('\040');
+    if (txt != nullptr) {
+      uint8_t size = Settings.display_size;
+      uint16_t theight = size * EPD_FONT_HEIGTH;
+
+      renderer->setTextFont(size);
+      uint8_t last_row = Settings.display_rows -1;
+
+
+      epd_scroll = 0;
+      for (uint32_t i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[i], COLORED, 0);
+        epd_scroll += theight;
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+      renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[last_row], COLORED, 0);
+
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
+    }
+  }
+}
+
+void EpdRefresh29(void)
+{
+  if (Settings.display_mode) {
+
+    if (!renderer) return;
+# 165 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
+    switch (Settings.display_mode) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        EpdPrintLog29();
+        renderer->Updateframe();
+        break;
+    }
+
+
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp05(uint8_t function)
+{
+  bool result = false;
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      EpdInitDriver29();
+    }
+    else if (XDSP_05 == Settings.display_model) {
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          EpdRefresh29();
+          break;
+#endif
+      }
+    }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_06_epaper_42.ino"
+# 21 "S:/Development/Tasmota/tasmota/xdsp_06_epaper_42.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_EPAPER_42
+
+#define XDSP_06 6
+
+#define COLORED42 1
+#define UNCOLORED42 0
+
+
+
+#define USE_TINY_FONT 
+
+#include <epd4in2.h>
+#include <epdpaint.h>
+
+extern uint8_t *buffer;
+
+Epd42 *epd42;
+
+
+
+
+void EpdInitDriver42()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_06;
+  }
+
+  if (XDSP_06 == Settings.display_model) {
+
+    if (Settings.display_width != EPD_WIDTH42) {
+      Settings.display_width = EPD_WIDTH42;
+    }
+    if (Settings.display_height != EPD_HEIGHT42) {
+      Settings.display_height = EPD_HEIGHT42;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((EPD_WIDTH42 * EPD_HEIGHT42) / 8,1);
+    if (!buffer) return;
+
+
+    epd42 = new Epd42(EPD_WIDTH42,EPD_HEIGHT42);
+
+    #ifdef USE_SPI
+        if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)) {
+          epd42->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+        } else {
+          free(buffer);
+          return;
+        }
+    #else
+        if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
+          epd42->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+        } else {
+          free(buffer);
+          return;
+        }
+    #endif
+
+    renderer = epd42;
+
+    epd42->Init();
+
+    renderer->fillScreen(0);
+
+
+    epd42->Init(DISPLAY_INIT_FULL);
+
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+    epd42->ClearFrame();
+    renderer->Updateframe();
+    delay(3000);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->DrawStringAt(50, 140, "Waveshare E-Paper!", COLORED42,0);
+    renderer->Updateframe();
+    delay(350);
+    renderer->fillScreen(0);
+#endif
+
+  }
+}
+
+
+
+
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void EpdRefresh42()
+{
+  if (Settings.display_mode) {
+
+  }
+}
+
+#endif
+
+
+
+
+
+
+bool Xdsp06(uint8_t function)
+{
+  bool result = false;
+
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      EpdInitDriver42();
+    }
+    else if (XDSP_06 == Settings.display_model) {
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+
+#ifdef USE_DISPLAY_MODES1TO5
+        case FUNC_DISPLAY_EVERY_SECOND:
+          EpdRefresh42();
+          break;
+#endif
+      }
+    }
+  return result;
+}
+
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_07_sh1106.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_07_sh1106.ino"
+#ifdef USE_I2C
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SH1106
+
+#define OLED_RESET 4
+
+#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
+
+extern uint8_t *buffer;
+
+#define XDSP_07 7
+#define XI2C_06 6
+
+#define OLED_ADDRESS1 0x3C
+#define OLED_ADDRESS2 0x3D
+
+#define OLED_BUFFER_COLS 40
+#define OLED_BUFFER_ROWS 16
+
+#define OLED_FONT_WIDTH 6
+#define OLED_FONT_HEIGTH 8
+
+#include <Wire.h>
+#include <renderer.h>
+#include <Adafruit_SH1106.h>
+
+Adafruit_SH1106 *oled1106;
+
+
+
+
+void SH1106InitDriver()
+{
+  if (!Settings.display_model) {
+    if (I2cSetDevice(OLED_ADDRESS1)) {
+      Settings.display_address[0] = OLED_ADDRESS1;
+      Settings.display_model = XDSP_07;
+    }
+    else if (I2cSetDevice(OLED_ADDRESS2)) {
+      Settings.display_address[0] = OLED_ADDRESS2;
+      Settings.display_model = XDSP_07;
+    }
+  }
+
+  if (XDSP_07 == Settings.display_model) {
+    I2cSetActiveFound(Settings.display_address[0], "SH1106");
+
+    if (Settings.display_width != SH1106_LCDWIDTH) {
+      Settings.display_width = SH1106_LCDWIDTH;
+    }
+    if (Settings.display_height != SH1106_LCDHEIGHT) {
+      Settings.display_height = SH1106_LCDHEIGHT;
+    }
+
+
+    if (buffer) free(buffer);
+    buffer=(unsigned char*)calloc((SH1106_LCDWIDTH * SH1106_LCDHEIGHT) / 8,1);
+    if (!buffer) return;
+
+
+    oled1106 = new Adafruit_SH1106(SH1106_LCDWIDTH,SH1106_LCDHEIGHT);
+    renderer=oled1106;
+    renderer->Begin(SH1106_SWITCHCAPVCC, Settings.display_address[0],0);
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->setTextColor(1,0);
+
+#ifdef SHOW_SPLASH
+    renderer->setTextFont(0);
+    renderer->setTextSize(2);
+    renderer->setCursor(20,20);
+    renderer->println(F("SH1106"));
+    renderer->Updateframe();
+    renderer->DisplayOnff(1);
+#endif
+  }
+}
+
+
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void SH1106PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void SH1106Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(Settings.display_size);
+  renderer->setTextFont(Settings.display_font);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void SH1106Refresh(void)
+{
+  if (!renderer) return;
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        SH1106Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        SH1106PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xdsp07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_06)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+    SH1106InitDriver();
+  }
+  else if (XDSP_07 == Settings.display_model) {
+
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        SH1106Refresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_08_ILI9488.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_08_ILI9488.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_ILI9488
+
+#define XDSP_08 8
+#define XI2C_38 38
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+#define FT6236_address 0x38
+
+
+
+#define USE_TINY_FONT 
+
+
+#include <ILI9488.h>
+#include <FT6236.h>
+
+TouchLocation ili9488_pLoc;
+uint8_t ili9488_ctouch_counter = 0;
+
+
+#define BACKPLANE_PIN 2
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+ILI9488 *ili9488;
+
+#ifdef USE_TOUCH_BUTTONS
+extern VButton *buttons[];
+#endif
+
+extern const uint16_t picture[];
+uint8_t FT6236_found;
+
+
+
+void ILI9488_InitDriver()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_08;
+  }
+
+  if (XDSP_08 == Settings.display_model) {
+
+    if (Settings.display_width != ILI9488_TFTWIDTH) {
+      Settings.display_width = ILI9488_TFTWIDTH;
+    }
+    if (Settings.display_height != ILI9488_TFTHEIGHT) {
+      Settings.display_height = ILI9488_TFTHEIGHT;
+    }
+
+
+    buffer=NULL;
+
+
+    fg_color = ILI9488_WHITE;
+    bg_color = ILI9488_BLACK;
+
+    uint8_t bppin=BACKPLANE_PIN;
+    if (pin[GPIO_BACKLIGHT]<99) {
+      bppin=pin[GPIO_BACKLIGHT];
+    }
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
+      ili9488 = new ILI9488(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK],bppin);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
+        ili9488 = new ILI9488(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK],bppin);
+      } else {
+        return;
+      }
+    }
+
+    SPI.begin();
+    ili9488->begin();
+    renderer = ili9488;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(ILI9488_WHITE,ILI9488_BLACK);
+    renderer->DrawStringAt(50, 50, "ILI9488 TFT Display!", ILI9488_WHITE,0);
+    delay(1000);
+
+
+#endif
+
+    color_type = COLOR_COLOR;
+
+
+    if (I2cEnabled(XI2C_38) && I2cSetDevice(FT6236_address)) {
+      FT6236begin(FT6236_address);
+      FT6236_found=1;
+      I2cSetActiveFound(FT6236_address, "FT6236");
+    } else {
+      FT6236_found=0;
+    }
+
+  }
+}
+
+#ifdef USE_TOUCH_BUTTONS
+void ILI9488_MQTT(uint8_t count,const char *cp) {
+  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
+  MqttPublishTeleSensor();
+}
+
+void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) {
+  buttons[count]->xdrawButton(pwr);
+  if (pwr) buttons[count]->vpower|=0x80;
+  else buttons[count]->vpower&=0x7f;
+}
+
+void FT6236Check() {
+uint16_t temp;
+uint8_t rbutt=0,vbutt=0;
+ili9488_ctouch_counter++;
+if (2 == ili9488_ctouch_counter) {
+
+  ili9488_ctouch_counter=0;
+  if (FT6236readTouchLocation(&ili9488_pLoc,1)) {
+
+    if (renderer) {
+      uint8_t rot=renderer->getRotation();
+      switch (rot) {
+        case 0:
+          temp=ili9488_pLoc.y;
+          ili9488_pLoc.y=renderer->height()-ili9488_pLoc.x;
+          ili9488_pLoc.x=temp;
+          break;
+        case 1:
+          break;
+        case 2:
+          break;
+        case 3:
+          temp=ili9488_pLoc.y;
+          ili9488_pLoc.y=ili9488_pLoc.x;
+          ili9488_pLoc.x=renderer->width()-temp;
+          break;
+      }
+
+      for (uint8_t count=0; count<MAXBUTTONS; count++) {
+        if (buttons[count]) {
+            uint8_t bflags=buttons[count]->vpower&0x7f;
+            if (buttons[count]->contains(ili9488_pLoc.x,ili9488_pLoc.y)) {
+
+                buttons[count]->press(true);
+                if (buttons[count]->justPressed()) {
+                  if (!bflags) {
+                    uint8_t pwr=bitRead(power,rbutt);
+                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
+                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
+                      ILI9488_RDW_BUTT(count,!pwr);
+                    }
+                  } else {
+
+                    const char *cp;
+                    if (bflags==1) {
+
+                      buttons[count]->vpower^=0x80;
+                      cp="TBT";
+                    } else {
+
+                      buttons[count]->vpower|=0x80;
+                      cp="PBT";
+                    }
+                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+                    ILI9488_MQTT(count,cp);
+                  }
+                }
+            }
+            if (!bflags) {
+              rbutt++;
+            } else {
+              vbutt++;
+            }
+        }
+      }
+    }
+  } else {
+
+    for (uint8_t count=0; count<MAXBUTTONS; count++) {
+      if (buttons[count]) {
+        uint8_t bflags=buttons[count]->vpower&0x7f;
+        buttons[count]->press(false);
+        if (buttons[count]->justReleased()) {
+          uint8_t bflags=buttons[count]->vpower&0x7f;
+          if (bflags>0) {
+            if (bflags>1) {
+
+              buttons[count]->vpower&=0x7f;
+              ILI9488_MQTT(count,"PBT");
+            }
+            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+          }
+        }
+        if (!bflags) {
+
+          uint8_t pwr=bitRead(power,rbutt);
+          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
+          if (pwr!=vpwr) {
+            ILI9488_RDW_BUTT(count,pwr);
+          }
+          rbutt++;
+        }
+      }
+    }
+    ili9488_pLoc.x=0;
+    ili9488_pLoc.y=0;
+  }
+}
+}
+#endif
+
+
+
+
+bool Xdsp08(uint8_t function)
+{
+  bool result = false;
+
+    if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      ILI9488_InitDriver();
+    }
+    else if (XDSP_08 == Settings.display_model) {
+
+      switch (function) {
+        case FUNC_DISPLAY_MODEL:
+          result = true;
+          break;
+        case FUNC_DISPLAY_EVERY_50_MSECOND:
+#ifdef USE_TOUCH_BUTTONS
+          if (FT6236_found) FT6236Check();
+#endif
+          break;
+      }
+    }
+
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_09_SSD1351.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_09_SSD1351.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_SSD1351
+
+#define XDSP_09 9
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+
+
+#define USE_TINY_FONT 
+
+#include <SSD1351.h>
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+SSD1351 *ssd1351;
+
+
+
+void SSD1351_InitDriver() {
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_09;
+  }
+
+  if (XDSP_09 == Settings.display_model) {
+
+    if (Settings.display_width != SSD1351_WIDTH) {
+      Settings.display_width = SSD1351_WIDTH;
+    }
+    if (Settings.display_height != SSD1351_HEIGHT) {
+      Settings.display_height = SSD1351_HEIGHT;
+    }
+
+    buffer=0;
+
+
+    fg_color = SSD1351_WHITE;
+    bg_color = SSD1351_BLACK;
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
+      ssd1351 = new SSD1351(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)){
+        ssd1351 = new SSD1351(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
+      } else {
+        return;
+      }
+    }
+
+    delay(100);
+    SPI.begin();
+    ssd1351->begin();
+    renderer = ssd1351;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->dim(Settings.display_dimmer);
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(SSD1351_WHITE,SSD1351_BLACK);
+    renderer->DrawStringAt(10, 60, "SSD1351", SSD1351_RED,0);
+    delay(1000);
+
+#endif
+    color_type = COLOR_COLOR;
+  }
+}
+
+#ifdef USE_DISPLAY_MODES1TO5
+
+void SSD1351PrintLog(void)
+{
+  disp_refresh--;
+  if (!disp_refresh) {
+    disp_refresh = Settings.display_refresh;
+    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
+
+    char* txt = DisplayLogBuffer('\370');
+    if (txt != NULL) {
+      uint8_t last_row = Settings.display_rows -1;
+
+      renderer->clearDisplay();
+      renderer->setTextSize(Settings.display_size);
+      renderer->setCursor(0,0);
+      for (byte i = 0; i < last_row; i++) {
+        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
+        renderer->println(disp_screen_buffer[i]);
+      }
+      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
+      DisplayFillScreen(last_row);
+
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
+
+      renderer->println(disp_screen_buffer[last_row]);
+      renderer->Updateframe();
+    }
+  }
+}
+
+void SSD1351Time(void)
+{
+  char line[12];
+
+  renderer->clearDisplay();
+  renderer->setTextSize(2);
+  renderer->setCursor(0, 0);
+  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
+  renderer->println(line);
+  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
+  renderer->println(line);
+  renderer->Updateframe();
+}
+
+void SSD1351Refresh(void)
+{
+  if (Settings.display_mode) {
+    switch (Settings.display_mode) {
+      case 1:
+        SSD1351Time();
+        break;
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        SSD1351PrintLog();
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+bool Xdsp09(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      SSD1351_InitDriver();
+  }
+  else if (XDSP_09 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+#ifdef USE_DISPLAY_MODES1TO5
+      case FUNC_DISPLAY_EVERY_SECOND:
+        SSD1351Refresh();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
+#ifdef USE_SPI
+#ifdef USE_DISPLAY
+#ifdef USE_DISPLAY_RA8876
+
+#define XDSP_10 10
+#define XI2C_39 39
+
+#define COLORED 1
+#define UNCOLORED 0
+
+
+#define FT5316_address 0x38
+
+
+
+#define USE_TINY_FONT 
+
+#include <RA8876.h>
+#include <FT6236.h>
+
+TouchLocation ra8876_pLoc;
+uint8_t ra8876_ctouch_counter = 0;
+
+#ifdef USE_TOUCH_BUTTONS
+extern VButton *buttons[];
+#endif
+
+extern uint8_t *buffer;
+extern uint8_t color_type;
+RA8876 *ra8876;
+
+uint8_t FT5316_found;
+
+
+void RA8876_InitDriver()
+{
+  if (!Settings.display_model) {
+    Settings.display_model = XDSP_10;
+  }
+
+  if (XDSP_10 == Settings.display_model) {
+
+    if (Settings.display_width != RA8876_TFTWIDTH) {
+      Settings.display_width = RA8876_TFTWIDTH;
+    }
+    if (Settings.display_height != RA8876_TFTHEIGHT) {
+      Settings.display_height = RA8876_TFTHEIGHT;
+    }
+    buffer=0;
+
+
+    fg_color = RA8876_WHITE;
+    bg_color = RA8876_BLACK;
+
+
+    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]==13) && (pin[GPIO_SSPI_MISO]==12) && (pin[GPIO_SSPI_SCLK]==14)) {
+      ra8876 = new RA8876(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_MISO],pin[GPIO_SSPI_SCLK],pin[GPIO_BACKLIGHT]);
+    } else {
+      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]==13) && (pin[GPIO_SPI_MISO]==12) && (pin[GPIO_SPI_CLK]==14)) {
+        ra8876 = new RA8876(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_MISO],pin[GPIO_SPI_CLK],pin[GPIO_BACKLIGHT]);
+      } else {
+        return;
+      }
+    }
+
+    ra8876->begin();
+    renderer = ra8876;
+    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
+    renderer->dim(Settings.display_dimmer);
+
+
+#ifdef SHOW_SPLASH
+
+    renderer->setTextFont(2);
+    renderer->setTextColor(RA8876_WHITE,RA8876_BLACK);
+    renderer->DrawStringAt(600, 300, "RA8876", RA8876_RED,0);
+    delay(1000);
+
+#endif
+    color_type = COLOR_COLOR;
+
+    if (I2cEnabled(XI2C_39) && I2cSetDevice(FT5316_address)) {
+      FT6236begin(FT5316_address);
+      FT5316_found=1;
+      I2cSetActiveFound(FT5316_address, "FT5316");
+    } else {
+      FT5316_found=0;
+    }
+
+  }
+}
+
+#ifdef USE_TOUCH_BUTTONS
+void RA8876_MQTT(uint8_t count,const char *cp) {
+  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
+  MqttPublishTeleSensor();
+}
+
+void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) {
+  buttons[count]->xdrawButton(pwr);
+  if (pwr) buttons[count]->vpower|=0x80;
+  else buttons[count]->vpower&=0x7f;
+}
+
+
+void FT5316Check() {
+uint16_t temp;
+uint8_t rbutt=0,vbutt=0;
+ra8876_ctouch_counter++;
+if (2 == ra8876_ctouch_counter) {
+
+  ra8876_ctouch_counter=0;
+
+  if (FT6236readTouchLocation(&ra8876_pLoc,1)) {
+    ra8876_pLoc.x=ra8876_pLoc.x*RA8876_TFTWIDTH/800;
+    ra8876_pLoc.y=ra8876_pLoc.y*RA8876_TFTHEIGHT/480;
+
+
+    if (renderer) {
+
+
+      ra8876_pLoc.x=RA8876_TFTWIDTH-ra8876_pLoc.x;
+      ra8876_pLoc.y=RA8876_TFTHEIGHT-ra8876_pLoc.y;
+# 170 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
+      for (uint8_t count=0; count<MAXBUTTONS; count++) {
+        if (buttons[count]) {
+            uint8_t bflags=buttons[count]->vpower&0x7f;
+            if (buttons[count]->contains(ra8876_pLoc.x,ra8876_pLoc.y)) {
+
+                buttons[count]->press(true);
+                if (buttons[count]->justPressed()) {
+                  if (!bflags) {
+
+                    uint8_t pwr=bitRead(power,rbutt);
+                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
+                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
+                      RA8876_RDW_BUTT(count,!pwr);
+                    }
+                  } else {
+
+                    const char *cp;
+                    if (bflags==1) {
+
+                      buttons[count]->vpower^=0x80;
+                      cp="TBT";
+                    } else {
+
+                      buttons[count]->vpower|=0x80;
+                      cp="PBT";
+                    }
+                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+                    RA8876_MQTT(count,cp);
+                  }
+                }
+            }
+            if (!bflags) {
+              rbutt++;
+            } else {
+              vbutt++;
+            }
+        }
+      }
+    }
+  } else {
+
+    for (uint8_t count=0; count<MAXBUTTONS; count++) {
+      if (buttons[count]) {
+        uint8_t bflags=buttons[count]->vpower&0x7f;
+        buttons[count]->press(false);
+        if (buttons[count]->justReleased()) {
+          if (bflags>0) {
+            if (bflags>1) {
+
+              buttons[count]->vpower&=0x7f;
+              RA8876_MQTT(count,"PBT");
+            }
+            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
+          }
+        }
+        if (!bflags) {
+
+          uint8_t pwr=bitRead(power,rbutt);
+          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
+          if (pwr!=vpwr) {
+            RA8876_RDW_BUTT(count,pwr);
+          }
+          rbutt++;
+        }
+      }
+    }
+    ra8876_pLoc.x=0;
+    ra8876_pLoc.y=0;
+  }
+}
+}
+#endif
+# 426 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
+bool Xdsp10(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_DISPLAY_INIT_DRIVER == function) {
+      RA8876_InitDriver();
+  }
+  else if (XDSP_10 == Settings.display_model) {
+    switch (function) {
+      case FUNC_DISPLAY_MODEL:
+        result = true;
+        break;
+      case FUNC_DISPLAY_EVERY_50_MSECOND:
+#ifdef USE_TOUCH_BUTTONS
+        if (FT5316_found) FT5316Check();
+#endif
+        break;
+    }
+  }
+  return result;
+}
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
+#ifdef USE_DISPLAY
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xdsp_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xdsp_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XDSP_01
+  &Xdsp01,
+#endif
+
+#ifdef XDSP_02
+  &Xdsp02,
+#endif
+
+#ifdef XDSP_03
+  &Xdsp03,
+#endif
+
+#ifdef XDSP_04
+  &Xdsp04,
+#endif
+
+#ifdef XDSP_05
+  &Xdsp05,
+#endif
+
+#ifdef XDSP_06
+  &Xdsp06,
+#endif
+
+#ifdef XDSP_07
+  &Xdsp07,
+#endif
+
+#ifdef XDSP_08
+  &Xdsp08,
+#endif
+
+#ifdef XDSP_09
+  &Xdsp09,
+#endif
+
+#ifdef XDSP_10
+  &Xdsp10,
+#endif
+
+#ifdef XDSP_11
+  &Xdsp11,
+#endif
+
+#ifdef XDSP_12
+  &Xdsp12,
+#endif
+
+#ifdef XDSP_13
+  &Xdsp13,
+#endif
+
+#ifdef XDSP_14
+  &Xdsp14,
+#endif
+
+#ifdef XDSP_15
+  &Xdsp15,
+#endif
+
+#ifdef XDSP_16
+  &Xdsp16
+#endif
+};
+
+const uint8_t xdsp_present = sizeof(xdsp_func_ptr) / sizeof(xdsp_func_ptr[0]);
+# 117 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
+uint8_t XdspPresent(void)
+{
+  return xdsp_present;
+}
+
+bool XdspCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("DSP: %d"), Function);
+
+  for (uint32_t x = 0; x < xdsp_present; x++) {
+    result = xdsp_func_ptr[x](Function);
+
+    if (result && (FUNC_DISPLAY_MODEL == Function)) {
+      break;
+    }
+  }
+
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
+#ifdef USE_LIGHT
+#ifdef USE_WS2812
+# 38 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
+#define XLGT_01 1
+
+const uint8_t WS2812_SCHEMES = 8;
+
+const char kWs2812Commands[] PROGMEM = "|"
+  D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH ;
+
+void (* const Ws2812Command[])(void) PROGMEM = {
+  &CmndLed, &CmndPixels, &CmndRotation, &CmndWidth };
+
+#include <NeoPixelBus.h>
+
+#if (USE_WS2812_CTYPE == NEO_GRB)
+  typedef NeoGrbFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_BRG)
+  typedef NeoBrgFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_RBG)
+  typedef NeoRbgFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_RGBW)
+  typedef NeoRgbwFeature selectedNeoFeatureType;
+#elif (USE_WS2812_CTYPE == NEO_GRBW)
+  typedef NeoGrbwFeature selectedNeoFeatureType;
+#else
+  typedef NeoRgbFeature selectedNeoFeatureType;
+#endif
+
+#ifdef USE_WS2812_DMA
+
+
+#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
+  typedef NeoEsp8266DmaWs2812xMethod selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
+  typedef NeoEsp8266DmaSk6812Method selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_APA106)
+  typedef NeoEsp8266DmaApa106Method selectedNeoSpeedType;
+#else
+  typedef NeoEsp8266Dma800KbpsMethod selectedNeoSpeedType;
+#endif
+
+#else
+
+
+#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
+  typedef NeoEsp8266BitBangWs2812xMethod selectedNeoSpeedType;
+#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
+  typedef NeoEsp8266BitBangSk6812Method selectedNeoSpeedType;
+#else
+  typedef NeoEsp8266BitBang800KbpsMethod selectedNeoSpeedType;
+#endif
+
+#endif
+
+NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType> *strip = nullptr;
+
+struct WsColor {
+  uint8_t red, green, blue;
+};
+
+struct ColorScheme {
+  WsColor* colors;
+  uint8_t count;
+};
+
+WsColor kIncandescent[2] = { 255,140,20, 0,0,0 };
+WsColor kRgb[3] = { 255,0,0, 0,255,0, 0,0,255 };
+WsColor kChristmas[2] = { 255,0,0, 0,255,0 };
+WsColor kHanukkah[2] = { 0,0,255, 255,255,255 };
+WsColor kwanzaa[3] = { 255,0,0, 0,0,0, 0,255,0 };
+WsColor kRainbow[7] = { 255,0,0, 255,128,0, 255,255,0, 0,255,0, 0,0,255, 128,0,255, 255,0,255 };
+WsColor kFire[3] = { 255,0,0, 255,102,0, 255,192,0 };
+ColorScheme kSchemes[WS2812_SCHEMES -1] = {
+  kIncandescent, 2,
+  kRgb, 3,
+  kChristmas, 2,
+  kHanukkah, 2,
+  kwanzaa, 3,
+  kRainbow, 7,
+  kFire, 3 };
+
+uint8_t kWidth[5] = {
+    1,
+    2,
+    4,
+    8,
+  255 };
+uint8_t kWsRepeat[5] = {
+    8,
+    6,
+    4,
+    2,
+    1 };
+
+struct WS2812 {
+  uint8_t show_next = 1;
+  uint8_t scheme_offset = 0;
+  bool suspend_update = false;
+} Ws2812;
+
+
+
+void Ws2812StripShow(void)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+#else
+  RgbColor c;
+#endif
+
+  if (Settings.light_correction) {
+    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+      c = strip->GetPixelColor(i);
+      c.R = ledGamma(c.R);
+      c.G = ledGamma(c.G);
+      c.B = ledGamma(c.B);
+#if (USE_WS2812_CTYPE > NEO_3LED)
+      c.W = ledGamma(c.W);
+#endif
+      strip->SetPixelColor(i, c);
+    }
+  }
+  strip->Show();
+}
+
+int mod(int a, int b)
+{
+   int ret = a % b;
+   if (ret < 0) ret += b;
+   return ret;
+}
+
+void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor color;
+#else
+  RgbColor color;
+#endif
+
+  uint32_t mod_position = mod(position, (int)Settings.light_pixels);
+
+  color = strip->GetPixelColor(mod_position);
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  color.R = tmin(color.R + ((hand_color.red / dimmer) * offset), 255);
+  color.G = tmin(color.G + ((hand_color.green / dimmer) * offset), 255);
+  color.B = tmin(color.B + ((hand_color.blue / dimmer) * offset), 255);
+  strip->SetPixelColor(mod_position, color);
+}
+
+void Ws2812UpdateHand(int position, uint32_t index)
+{
+  uint32_t width = Settings.light_width;
+  if (index < WS_MARKER) { width = Settings.ws_width[index]; }
+  if (!width) { return; }
+
+  position = (position + Settings.light_rotation) % Settings.light_pixels;
+
+  if (Settings.flag.ws_clock_reverse) {
+    position = Settings.light_pixels -position;
+  }
+  WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] };
+
+  Ws2812UpdatePixelColor(position, hand_color, 1);
+
+  uint32_t range = ((width -1) / 2) +1;
+  for (uint32_t h = 1; h < range; h++) {
+    float offset = (float)(range - h) / (float)range;
+    Ws2812UpdatePixelColor(position -h, hand_color, offset);
+    Ws2812UpdatePixelColor(position +h, hand_color, offset);
+  }
+}
+
+void Ws2812Clock(void)
+{
+  strip->ClearTo(0);
+  int clksize = 60000 / (int)Settings.light_pixels;
+
+  Ws2812UpdateHand((RtcTime.second * 1000) / clksize, WS_SECOND);
+  Ws2812UpdateHand((RtcTime.minute * 1000) / clksize, WS_MINUTE);
+  Ws2812UpdateHand((((RtcTime.hour % 12) * 5000) + ((RtcTime.minute * 1000) / 12 )) / clksize, WS_HOUR);
+  if (Settings.ws_color[WS_MARKER][WS_RED] + Settings.ws_color[WS_MARKER][WS_GREEN] + Settings.ws_color[WS_MARKER][WS_BLUE]) {
+    for (uint32_t i = 0; i < 12; i++) {
+      Ws2812UpdateHand((i * 5000) / clksize, WS_MARKER);
+    }
+  }
+
+  Ws2812StripShow();
+}
+
+void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i)
+{
+
+
+
+
+  ColorScheme scheme = kSchemes[schemenr];
+  uint32_t curRange = i / range;
+  uint32_t rangeIndex = i % range;
+  uint32_t colorIndex = rangeIndex / gradRange;
+  uint32_t start = colorIndex;
+  uint32_t end = colorIndex +1;
+  if (curRange % 2 != 0) {
+    start = (scheme.count -1) - start;
+    end = (scheme.count -1) - end;
+  }
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  float fmyRed = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].red, scheme.colors[end].red) / dimmer;
+  float fmyGrn = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].green, scheme.colors[end].green) / dimmer;
+  float fmyBlu = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].blue, scheme.colors[end].blue) / dimmer;
+  mColor->red = (uint8_t)fmyRed;
+  mColor->green = (uint8_t)fmyGrn;
+  mColor->blue = (uint8_t)fmyBlu;
+}
+
+void Ws2812Gradient(uint32_t schemenr)
+{
+
+
+
+
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+  c.W = 0;
+#else
+  RgbColor c;
+#endif
+
+  ColorScheme scheme = kSchemes[schemenr];
+  if (scheme.count < 2) { return; }
+
+  uint32_t repeat = kWsRepeat[Settings.light_width];
+  uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat);
+  uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1));
+  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
+  uint32_t offset = speed > 0 ? Light.strip_timer_counter / speed : 0;
+
+  WsColor oldColor, currentColor;
+  Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset);
+  currentColor = oldColor;
+  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+    if (kWsRepeat[Settings.light_width] > 1) {
+      Ws2812GradientColor(schemenr, &currentColor, range, gradRange, i +offset);
+    }
+    if (Settings.light_speed > 0) {
+
+      c.R = map(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red);
+      c.G = map(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green);
+      c.B = map(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue);
+    }
+    else {
+
+      c.R = currentColor.red;
+      c.G = currentColor.green;
+      c.B = currentColor.blue;
+    }
+    strip->SetPixelColor(i, c);
+    oldColor = currentColor;
+  }
+  Ws2812StripShow();
+}
+
+void Ws2812Bars(uint32_t schemenr)
+{
+
+
+
+
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor c;
+  c.W = 0;
+#else
+  RgbColor c;
+#endif
+
+  ColorScheme scheme = kSchemes[schemenr];
+
+  uint32_t maxSize = Settings.light_pixels / scheme.count;
+  if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; }
+
+  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
+  uint32_t offset = (speed > 0) ? Light.strip_timer_counter / speed : 0;
+
+  WsColor mcolor[scheme.count];
+  memcpy(mcolor, scheme.colors, sizeof(mcolor));
+  float dimmer = 100 / (float)Settings.light_dimmer;
+  for (uint32_t i = 0; i < scheme.count; i++) {
+    float fmyRed = (float)mcolor[i].red / dimmer;
+    float fmyGrn = (float)mcolor[i].green / dimmer;
+    float fmyBlu = (float)mcolor[i].blue / dimmer;
+    mcolor[i].red = (uint8_t)fmyRed;
+    mcolor[i].green = (uint8_t)fmyGrn;
+    mcolor[i].blue = (uint8_t)fmyBlu;
+  }
+  uint32_t colorIndex = offset % scheme.count;
+  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+    if (maxSize) { colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; }
+    c.R = mcolor[colorIndex].red;
+    c.G = mcolor[colorIndex].green;
+    c.B = mcolor[colorIndex].blue;
+    strip->SetPixelColor(i, c);
+  }
+  Ws2812StripShow();
+}
+
+void Ws2812Clear(void)
+{
+  strip->ClearTo(0);
+  strip->Show();
+  Ws2812.show_next = 1;
+}
+
+void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white)
+{
+#if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor lcolor;
+  lcolor.W = white;
+#else
+  RgbColor lcolor;
+#endif
+
+  lcolor.R = red;
+  lcolor.G = green;
+  lcolor.B = blue;
+  if (led) {
+    strip->SetPixelColor(led -1, lcolor);
+  } else {
+
+    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
+      strip->SetPixelColor(i, lcolor);
+    }
+  }
+
+  if (!Ws2812.suspend_update) {
+    strip->Show();
+    Ws2812.show_next = 1;
+  }
+}
+
+char* Ws2812GetColor(uint32_t led, char* scolor)
+{
+  uint8_t sl_ledcolor[4];
+
+ #if (USE_WS2812_CTYPE > NEO_3LED)
+  RgbwColor lcolor = strip->GetPixelColor(led -1);
+  sl_ledcolor[3] = lcolor.W;
+ #else
+  RgbColor lcolor = strip->GetPixelColor(led -1);
+ #endif
+  sl_ledcolor[0] = lcolor.R;
+  sl_ledcolor[1] = lcolor.G;
+  sl_ledcolor[2] = lcolor.B;
+  scolor[0] = '\0';
+  for (uint32_t i = 0; i < Light.subtype; i++) {
+    if (Settings.flag.decimal_text) {
+      snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
+    } else {
+      snprintf_P(scolor, 25, PSTR("%s%02X"), scolor, sl_ledcolor[i]);
+    }
+  }
+  return scolor;
+}
+
+
+
+
+
+void Ws2812ForceSuspend (void)
+{
+  Ws2812.suspend_update = true;
+}
+
+void Ws2812ForceUpdate (void)
+{
+  Ws2812.suspend_update = false;
+  strip->Show();
+  Ws2812.show_next = 1;
+}
+
+
+
+bool Ws2812SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2], cur_col[3]);
+
+  return true;
+}
+
+void Ws2812ShowScheme(void)
+{
+  uint32_t scheme = Settings.light_scheme - Ws2812.scheme_offset;
+
+  switch (scheme) {
+    case 0:
+      if ((1 == state_250mS) || (Ws2812.show_next)) {
+        Ws2812Clock();
+        Ws2812.show_next = 0;
+      }
+      break;
+    default:
+      if (1 == Settings.light_fade) {
+        Ws2812Gradient(scheme -1);
+      } else {
+        Ws2812Bars(scheme -1);
+      }
+      Ws2812.show_next = 1;
+      break;
+  }
+}
+
+void Ws2812ModuleSelected(void)
+{
+  if (pin[GPIO_WS2812] < 99) {
+
+
+    strip = new NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
+    strip->Begin();
+
+    Ws2812Clear();
+
+    Ws2812.scheme_offset = Light.max_scheme +1;
+    Light.max_scheme += WS2812_SCHEMES;
+
+#if (USE_WS2812_CTYPE > NEO_3LED)
+    light_type = LT_RGBW;
+#else
+    light_type = LT_RGB;
+#endif
+    light_flg = XLGT_01;
+  }
+}
+
+
+
+void CmndLed(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) {
+    if (XdrvMailbox.data_len > 0) {
+      char *p;
+      uint16_t idx = XdrvMailbox.index;
+      Ws2812ForceSuspend();
+      for (char *color = strtok_r(XdrvMailbox.data, " ", &p); color; color = strtok_r(nullptr, " ", &p)) {
+        if (LightColorEntry(color, strlen(color))) {
+          Ws2812SetColor(idx, Light.entry_color[0], Light.entry_color[1], Light.entry_color[2], Light.entry_color[3]);
+          idx++;
+          if (idx > Settings.light_pixels) { break; }
+        } else {
+          break;
+        }
+      }
+      Ws2812ForceUpdate();
+    }
+    char scolor[LIGHT_COLOR_SIZE];
+    ResponseCmndIdxChar(Ws2812GetColor(XdrvMailbox.index, scolor));
+  }
+}
+
+void CmndPixels(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= WS2812_MAX_LEDS)) {
+    Settings.light_pixels = XdrvMailbox.payload;
+    Settings.light_rotation = 0;
+    Ws2812Clear();
+    Light.update = true;
+  }
+  ResponseCmndNumber(Settings.light_pixels);
+}
+
+void CmndRotation(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < Settings.light_pixels)) {
+    Settings.light_rotation = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.light_rotation);
+}
+
+void CmndWidth(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
+    if (1 == XdrvMailbox.index) {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) {
+        Settings.light_width = XdrvMailbox.payload;
+      }
+      ResponseCmndNumber(Settings.light_width);
+    } else {
+      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32)) {
+        Settings.ws_width[XdrvMailbox.index -2] = XdrvMailbox.payload;
+      }
+      ResponseCmndIdxNumber(Settings.ws_width[XdrvMailbox.index -2]);
+    }
+  }
+}
+
+
+
+
+
+bool Xlgt01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Ws2812SetChannels();
+      break;
+    case FUNC_SET_SCHEME:
+      Ws2812ShowScheme();
+      break;
+    case FUNC_COMMAND:
+      result = DecodeCommand(kWs2812Commands, Ws2812Command);
+      break;
+    case FUNC_MODULE_INIT:
+      Ws2812ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_02_my92x1.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_02_my92x1.ino"
+#ifdef USE_LIGHT
+#ifdef USE_MY92X1
+
+
+
+
+#define XLGT_02 2
+
+struct MY92X1 {
+  uint8_t pdi_pin = 0;
+  uint8_t pdcki_pin = 0;
+  uint8_t model = 0;
+} My92x1;
+
+extern "C" {
+  void os_delay_us(unsigned int);
+}
+
+void LightDiPulse(uint8_t times)
+{
+  for (uint32_t i = 0; i < times; i++) {
+    digitalWrite(My92x1.pdi_pin, HIGH);
+    digitalWrite(My92x1.pdi_pin, LOW);
+  }
+}
+
+void LightDckiPulse(uint8_t times)
+{
+  for (uint32_t i = 0; i < times; i++) {
+    digitalWrite(My92x1.pdcki_pin, HIGH);
+    digitalWrite(My92x1.pdcki_pin, LOW);
+  }
+}
+
+void LightMy92x1Write(uint8_t data)
+{
+  for (uint32_t i = 0; i < 4; i++) {
+    digitalWrite(My92x1.pdcki_pin, LOW);
+    digitalWrite(My92x1.pdi_pin, (data & 0x80));
+    digitalWrite(My92x1.pdcki_pin, HIGH);
+    data = data << 1;
+    digitalWrite(My92x1.pdi_pin, (data & 0x80));
+    digitalWrite(My92x1.pdcki_pin, LOW);
+    digitalWrite(My92x1.pdi_pin, LOW);
+    data = data << 1;
+  }
+}
+
+void LightMy92x1Init(void)
+{
+  uint8_t chips[3] = { 1, 2, 2 };
+
+  LightDckiPulse(chips[My92x1.model] * 32);
+  os_delay_us(12);
+
+
+  LightDiPulse(12);
+  os_delay_us(12);
+  for (uint32_t n = 0; n < chips[My92x1.model]; n++) {
+    LightMy92x1Write(0x18);
+  }
+  os_delay_us(12);
+
+
+  LightDiPulse(16);
+  os_delay_us(12);
+}
+
+void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c)
+{
+  uint8_t channels[3] = { 4, 6, 6 };
+
+  uint8_t duty[3][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 },
+                        { duty_w, duty_c, 0, duty_g, duty_r, duty_b },
+                        { duty_r, duty_g, duty_b, duty_w, duty_w, duty_w }};
+
+  os_delay_us(12);
+  for (uint32_t channel = 0; channel < channels[My92x1.model]; channel++) {
+    LightMy92x1Write(duty[My92x1.model][channel]);
+  }
+  os_delay_us(12);
+  LightDiPulse(8);
+  os_delay_us(12);
+}
+
+
+
+bool My92x1SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
+
+  return true;
+}
+
+void My92x1ModuleSelected(void)
+{
+  if ((pin[GPIO_DCKI] < 99) && (pin[GPIO_DI] < 99)) {
+    My92x1.pdi_pin = pin[GPIO_DI];
+    My92x1.pdcki_pin = pin[GPIO_DCKI];
+
+    pinMode(My92x1.pdi_pin, OUTPUT);
+    pinMode(My92x1.pdcki_pin, OUTPUT);
+    digitalWrite(My92x1.pdi_pin, LOW);
+    digitalWrite(My92x1.pdcki_pin, LOW);
+
+    My92x1.model = 2;
+    light_type = LT_RGBW;
+    if (AILIGHT == my_module_type) {
+      My92x1.model = 0;
+
+    }
+    else if (SONOFF_B1 == my_module_type) {
+      My92x1.model = 1;
+      light_type = LT_RGBWC;
+    }
+
+    LightMy92x1Init();
+
+    light_flg = XLGT_02;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: MY29x1 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = My92x1SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      My92x1ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SM16716
+
+
+
+
+
+
+
+#define XLGT_03 3
+
+#define D_LOG_SM16716 "SM16716: "
+
+struct SM16716 {
+  uint8_t pin_clk = 0;
+  uint8_t pin_dat = 0;
+  uint8_t pin_sel = 0;
+  bool enabled = false;
+} Sm16716;
+
+void SM16716_SendBit(uint8_t v)
+{
+
+
+
+
+
+  digitalWrite(Sm16716.pin_dat, (v != 0) ? HIGH : LOW);
+
+  digitalWrite(Sm16716.pin_clk, HIGH);
+
+  digitalWrite(Sm16716.pin_clk, LOW);
+}
+
+void SM16716_SendByte(uint8_t v)
+{
+  uint8_t mask;
+
+  for (mask = 0x80; mask; mask >>= 1) {
+    SM16716_SendBit(v & mask);
+  }
+}
+
+void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
+{
+  if (Sm16716.pin_sel < 99) {
+    bool should_enable = (duty_r | duty_g | duty_b);
+    if (!Sm16716.enabled && should_enable) {
+      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color on"));
+      Sm16716.enabled = true;
+      digitalWrite(Sm16716.pin_sel, HIGH);
+
+
+      delayMicroseconds(1000);
+      SM16716_Init();
+    }
+    else if (Sm16716.enabled && !should_enable) {
+      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color off"));
+      Sm16716.enabled = false;
+      digitalWrite(Sm16716.pin_sel, LOW);
+    }
+  }
+  DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "Update; rgb=%02x%02x%02x"), duty_r, duty_g, duty_b);
+
+
+  SM16716_SendBit(1);
+  SM16716_SendByte(duty_r);
+  SM16716_SendByte(duty_g);
+  SM16716_SendByte(duty_b);
+
+
+
+
+
+  SM16716_SendBit(0);
+  SM16716_SendByte(0);
+  SM16716_SendByte(0);
+  SM16716_SendByte(0);
+}
+# 111 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
+void SM16716_Init(void)
+{
+  for (uint32_t t_init = 0; t_init < 50; ++t_init) {
+    SM16716_SendBit(0);
+  }
+}
+
+
+
+bool Sm16716SetChannels(void)
+{
+# 132 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+
+  SM16716_Update(cur_col[0], cur_col[1], cur_col[2]);
+
+  return true;
+}
+
+void Sm16716ModuleSelected(void)
+{
+  if ((pin[GPIO_SM16716_CLK] < 99) && (pin[GPIO_SM16716_DAT] < 99)) {
+    Sm16716.pin_clk = pin[GPIO_SM16716_CLK];
+    Sm16716.pin_dat = pin[GPIO_SM16716_DAT];
+    Sm16716.pin_sel = pin[GPIO_SM16716_SEL];
+# 157 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
+    pinMode(Sm16716.pin_clk, OUTPUT);
+    digitalWrite(Sm16716.pin_clk, LOW);
+
+    pinMode(Sm16716.pin_dat, OUTPUT);
+    digitalWrite(Sm16716.pin_dat, LOW);
+
+    if (Sm16716.pin_sel < 99) {
+      pinMode(Sm16716.pin_sel, OUTPUT);
+      digitalWrite(Sm16716.pin_sel, LOW);
+
+    } else {
+
+      SM16716_Init();
+    }
+
+    LightPwmOffset(LST_RGB);
+    light_type += LST_RGB;
+    light_flg = XLGT_03;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM16716 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt03(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Sm16716SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      Sm16716ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SM2135
+
+
+
+
+
+
+#define XLGT_04 4
+
+#define SM2135_ADDR_MC 0xC0
+#define SM2135_ADDR_CH 0xC1
+#define SM2135_ADDR_R 0xC2
+#define SM2135_ADDR_G 0xC3
+#define SM2135_ADDR_B 0xC4
+#define SM2135_ADDR_C 0xC5
+#define SM2135_ADDR_W 0xC6
+
+#define SM2135_RGB 0x00
+#define SM2135_CW 0x80
+
+#define SM2135_10MA 0x00
+#define SM2135_15MA 0x01
+#define SM2135_20MA 0x02
+#define SM2135_25MA 0x03
+#define SM2135_30MA 0x04
+#define SM2135_35MA 0x05
+#define SM2135_40MA 0x06
+#define SM2135_45MA 0x07
+#define SM2135_50MA 0x08
+#define SM2135_55MA 0x09
+#define SM2135_60MA 0x0A
+
+
+const uint8_t SM2135_CURRENT = (SM2135_20MA << 4) | SM2135_15MA;
+
+struct SM2135 {
+  uint8_t clk = 0;
+  uint8_t data = 0;
+} Sm2135;
+
+uint8_t Sm2135Write(uint8_t data)
+{
+  for (uint32_t i = 0; i < 8; i++) {
+    digitalWrite(Sm2135.clk, LOW);
+    digitalWrite(Sm2135.data, (data & 0x80));
+    digitalWrite(Sm2135.clk, HIGH);
+    data = data << 1;
+  }
+  digitalWrite(Sm2135.clk, LOW);
+  digitalWrite(Sm2135.data, HIGH);
+  pinMode(Sm2135.data, INPUT);
+  digitalWrite(Sm2135.clk, HIGH);
+  uint8_t ack = digitalRead(Sm2135.data);
+  pinMode(Sm2135.data, OUTPUT);
+  return ack;
+}
+
+void Sm2135Send(uint8_t *buffer, uint8_t size)
+{
+  digitalWrite(Sm2135.data, LOW);
+  for (uint32_t i = 0; i < size; i++) {
+    Sm2135Write(buffer[i]);
+  }
+  digitalWrite(Sm2135.clk, LOW);
+  digitalWrite(Sm2135.clk, HIGH);
+  digitalWrite(Sm2135.data, HIGH);
+}
+
+
+
+bool Sm2135SetChannels(void)
+{
+  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
+  uint8_t data[6];
+
+  if ((0 == cur_col[0]) && (0 == cur_col[1]) && (0 == cur_col[2])) {
+# 106 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
+    data[0] = SM2135_ADDR_MC;
+    data[1] = SM2135_CURRENT;
+    data[2] = SM2135_CW;
+    Sm2135Send(data, 3);
+    delay(1);
+    data[0] = SM2135_ADDR_C;
+    data[1] = cur_col[4];
+    data[2] = cur_col[3];
+    Sm2135Send(data, 3);
+  } else {
+
+
+
+
+
+
+
+    data[0] = SM2135_ADDR_MC;
+    data[1] = SM2135_CURRENT;
+    data[2] = SM2135_RGB;
+    data[3] = cur_col[1];
+    data[4] = cur_col[0];
+    data[5] = cur_col[2];
+    Sm2135Send(data, 6);
+  }
+
+  return true;
+}
+
+void Sm2135ModuleSelected(void)
+{
+  if ((pin[GPIO_SM2135_CLK] < 99) && (pin[GPIO_SM2135_DAT] < 99)) {
+    Sm2135.clk = pin[GPIO_SM2135_CLK];
+    Sm2135.data = pin[GPIO_SM2135_DAT];
+
+    pinMode(Sm2135.data, OUTPUT);
+    digitalWrite(Sm2135.data, HIGH);
+    pinMode(Sm2135.clk, OUTPUT);
+    digitalWrite(Sm2135.clk, HIGH);
+
+    light_type = LT_RGBWC;
+    light_flg = XLGT_04;
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM2135 Found"));
+  }
+}
+
+
+
+
+
+bool Xlgt04(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = Sm2135SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      Sm2135ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
+#ifdef USE_LIGHT
+#ifdef USE_SONOFF_L1
+
+
+
+
+#define XLGT_05 5
+
+#define SONOFF_L1_BUFFER_SIZE 140
+
+#define SONOFF_L1_MODE_COLORFUL 1
+#define SONOFF_L1_MODE_COLORFUL_GRADIENT 2
+#define SONOFF_L1_MODE_COLORFUL_BREATH 3
+#define SONOFF_L1_MODE_DIY_GRADIENT 4
+#define SONOFF_L1_MODE_DIY_PULSE 5
+#define SONOFF_L1_MODE_DIY_BREATH 6
+#define SONOFF_L1_MODE_DIY_STROBE 7
+#define SONOFF_L1_MODE_RGB_GRADIENT 8
+#define SONOFF_L1_MODE_RGB_PULSE 9
+#define SONOFF_L1_MODE_RGB_BREATH 10
+#define SONOFF_L1_MODE_RGB_STROBE 11
+#define SONOFF_L1_MODE_SYNC_TO_MUSIC 12
+
+struct SNFL1 {
+  uint32_t unlock = 0;
+  bool receive_ready = true;
+} Snfl1;
+
+
+
+void SnfL1Send(const char *buffer)
+{
+
+
+  Serial.print(buffer);
+  Serial.write(0x1B);
+  Serial.flush();
+}
+
+void SnfL1SerialSendOk(void)
+{
+  char buffer[16];
+  snprintf_P(buffer, sizeof(buffer), PSTR("AT+SEND=ok"));
+
+  SnfL1Send(buffer);
+}
+
+bool SnfL1SerialInput(void)
+{
+  if (serial_in_byte != 0x1B) {
+    if (serial_in_byte_counter >= 140) {
+      serial_in_byte_counter = 0;
+    }
+    if (serial_in_byte_counter || (!serial_in_byte_counter && ('A' == serial_in_byte))) {
+      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+    }
+  } else {
+    serial_in_buffer[serial_in_byte_counter++] = 0x00;
+
+
+
+
+
+
+    if (!strncmp(serial_in_buffer +3, "RESULT", 6)) {
+      Snfl1.receive_ready = true;
+    }
+    else if (!strncmp(serial_in_buffer +3, "UPDATE", 6)) {
+      char cmnd_dimmer[20];
+      char cmnd_color[20];
+      char *end_str;
+      char *string = serial_in_buffer +10;
+      char *token = strtok_r(string, ",", &end_str);
+
+      bool color_updated[3] = { false, false, false };
+      uint8_t current_color[3];
+      memcpy(current_color, Settings.light_color, 3);
+
+      bool switch_state = false;
+      bool is_power_change = false;
+      bool is_color_change = false;
+      bool is_brightness_change = false;
+
+      while (token != nullptr) {
+        char* end_token;
+        char* token2 = strtok_r(token, ":", &end_token);
+        char* token3 = strtok_r(nullptr, ":", &end_token);
+
+        if (!strncmp(token2, "\"sequence\"", 10)) {
+
+
+
+          token = nullptr;
+        }
+
+        else if (!strncmp(token2, "\"switch\"", 8)) {
+          switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
+
+
+
+          is_power_change = (switch_state != Light.power);
+        }
+
+        else if (!strncmp(token2, "\"color", 6)) {
+          char color_channel_name = token2[6];
+          int color_index;
+          switch(color_channel_name)
+          {
+            case 'R': color_index = 0;
+              break;
+            case 'G': color_index = 1;
+              break;
+            case 'B': color_index = 2;
+              break;
+          }
+          int color_value = atoi(token3);
+          current_color[color_index] = color_value;
+          color_updated[color_index] = true;
+
+          bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
+          if (all_color_channels_updated) {
+
+
+
+
+
+            is_color_change = (Light.power && (memcmp(current_color, Settings.light_color, 3) != 0));
+          }
+          snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), current_color[0], current_color[1], current_color[2]);
+        }
+
+        else if (!strncmp(token2, "\"bright\"", 8)) {
+          uint8_t dimmer = atoi(token3);
+
+
+
+          is_brightness_change = (Light.power && (dimmer > 0) && (dimmer != Settings.light_dimmer));
+          snprintf_P(cmnd_dimmer, sizeof(cmnd_dimmer), PSTR(D_CMND_DIMMER " %d"), dimmer);
+        }
+
+        token = strtok_r(nullptr, ",", &end_str);
+      }
+
+      if (is_power_change) {
+        if (Settings.light_scheme > 0) {
+          if (!switch_state) {
+            char cmnd_scheme[20];
+            snprintf_P(cmnd_scheme, sizeof(cmnd_scheme), PSTR(D_CMND_SCHEME " 0"));
+            ExecuteCommand(cmnd_scheme, SRC_SWITCH);
+          }
+        } else {
+          ExecuteCommandPower(1, switch_state, SRC_SWITCH);
+        }
+      }
+      else if (is_brightness_change) {
+        ExecuteCommand(cmnd_dimmer, SRC_SWITCH);
+      }
+      else if (Light.power && is_color_change) {
+        if (0 == Settings.light_scheme) {
+          if (Settings.light_fade) {
+            char cmnd_fade[20];
+            snprintf_P(cmnd_fade, sizeof(cmnd_fade), PSTR(D_CMND_FADE " 0"));
+            ExecuteCommand(cmnd_fade, SRC_SWITCH);
+          }
+          ExecuteCommand(cmnd_color, SRC_SWITCH);
+        }
+      }
+    }
+
+    SnfL1SerialSendOk();
+
+    return true;
+  }
+  serial_in_byte = 0;
+  return false;
+}
+
+
+
+bool SnfL1SetChannels(void)
+{
+  if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) {
+
+    uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
+
+    char buffer[140];
+    snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"),
+      LocalTime(), millis()%1000,
+      Light.power ? "on" : "off",
+      scale_col[0], scale_col[1], scale_col[2],
+      light_state.getDimmer(),
+      SONOFF_L1_MODE_COLORFUL);
+
+    SnfL1Send(buffer);
+
+    Snfl1.unlock = millis() + 500;
+    Snfl1.receive_ready = false;
+  }
+  return true;
+}
+
+void SnfL1ModuleSelected(void)
+{
+  if (SONOFF_L1 == my_module_type) {
+    if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
+      SetSerial(19200, TS_SERIAL_8N1);
+
+      light_type = LT_RGB;
+      light_flg = XLGT_05;
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Sonoff L1 Found"));
+    }
+  }
+}
+
+
+
+
+
+bool Xlgt05(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SERIAL:
+      result = SnfL1SerialInput();
+      break;
+    case FUNC_SET_CHANNELS:
+      result = SnfL1SetChannels();
+      break;
+    case FUNC_MODULE_INIT:
+      SnfL1ModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xlgt_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xlgt_interface.ino"
+#ifdef USE_LIGHT
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xlgt_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xlgt_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XLGT_01
+  &Xlgt01,
+#endif
+
+#ifdef XLGT_02
+  &Xlgt02,
+#endif
+
+#ifdef XLGT_03
+  &Xlgt03,
+#endif
+
+#ifdef XLGT_04
+  &Xlgt04,
+#endif
+
+#ifdef XLGT_05
+  &Xlgt05,
+#endif
+
+#ifdef XLGT_06
+  &Xlgt06,
+#endif
+
+#ifdef XLGT_07
+  &Xlgt07,
+#endif
+
+#ifdef XLGT_08
+  &Xlgt08,
+#endif
+
+#ifdef XLGT_09
+  &Xlgt09,
+#endif
+
+#ifdef XLGT_10
+  &Xlgt10,
+#endif
+
+#ifdef XLGT_11
+  &Xlgt11,
+#endif
+
+#ifdef XLGT_12
+  &Xlgt12,
+#endif
+
+#ifdef XLGT_13
+  &Xlgt13,
+#endif
+
+#ifdef XLGT_14
+  &Xlgt14,
+#endif
+
+#ifdef XLGT_15
+  &Xlgt15,
+#endif
+
+#ifdef XLGT_16
+  &Xlgt16
+#endif
+};
+
+const uint8_t xlgt_present = sizeof(xlgt_func_ptr) / sizeof(xlgt_func_ptr[0]);
+
+uint8_t xlgt_active = 0;
+
+bool XlgtCall(uint8_t function)
+{
+  DEBUG_TRACE_LOG(PSTR("LGT: %d"), function);
+
+  if (FUNC_MODULE_INIT == function) {
+    for (uint32_t x = 0; x < xlgt_present; x++) {
+      xlgt_func_ptr[x](function);
+      if (light_flg) {
+        xlgt_active = x;
+        return true;
+      }
+    }
+  }
+  else if (light_flg) {
+    return xlgt_func_ptr[xlgt_active](function);
+  }
+  return false;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_01_hlw8012.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_01_hlw8012.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_HLW8012
+
+
+
+
+
+
+#define XNRG_01 1
+
+
+#define HLW_PREF 10000
+#define HLW_UREF 2200
+#define HLW_IREF 4545
+
+
+#define HJL_PREF 1362
+#define HJL_UREF 822
+#define HJL_IREF 3300
+
+#define HLW_POWER_PROBE_TIME 10
+#define HLW_SAMPLE_COUNT 10
+
+
+
+struct HLW {
+#ifdef HLW_DEBUG
+  unsigned long debug[HLW_SAMPLE_COUNT];
+#endif
+  unsigned long cf_pulse_length = 0;
+  unsigned long cf_pulse_last_time = 0;
+  unsigned long cf_power_pulse_length = 0;
+
+  unsigned long cf1_pulse_length = 0;
+  unsigned long cf1_pulse_last_time = 0;
+  unsigned long cf1_summed_pulse_length = 0;
+  unsigned long cf1_pulse_counter = 0;
+  unsigned long cf1_voltage_pulse_length = 0;
+  unsigned long cf1_current_pulse_length = 0;
+
+  unsigned long energy_period_counter = 0;
+
+  unsigned long power_ratio = 0;
+  unsigned long voltage_ratio = 0;
+  unsigned long current_ratio = 0;
+
+  uint8_t model_type = 0;
+  uint8_t cf1_timer = 0;
+  uint8_t power_retry = 0;
+  bool select_ui_flag = false;
+  bool ui_flag = true;
+  bool load_off = true;
+} Hlw;
+
+
+#ifndef USE_WS2812_DMA
+void HlwCfInterrupt(void) ICACHE_RAM_ATTR;
+void HlwCf1Interrupt(void) ICACHE_RAM_ATTR;
+#endif
+
+void HlwCfInterrupt(void)
+{
+  unsigned long us = micros();
+
+  if (Hlw.load_off) {
+    Hlw.cf_pulse_last_time = us;
+    Hlw.load_off = false;
+  } else {
+    Hlw.cf_pulse_length = us - Hlw.cf_pulse_last_time;
+    Hlw.cf_pulse_last_time = us;
+    Hlw.energy_period_counter++;
+  }
+  Energy.data_valid[0] = 0;
+}
+
+void HlwCf1Interrupt(void)
+{
+  unsigned long us = micros();
+
+  Hlw.cf1_pulse_length = us - Hlw.cf1_pulse_last_time;
+  Hlw.cf1_pulse_last_time = us;
+  if ((Hlw.cf1_timer > 2) && (Hlw.cf1_timer < 8)) {
+    Hlw.cf1_summed_pulse_length += Hlw.cf1_pulse_length;
+#ifdef HLW_DEBUG
+    Hlw.debug[Hlw.cf1_pulse_counter] = Hlw.cf1_pulse_length;
+#endif
+    Hlw.cf1_pulse_counter++;
+    if (HLW_SAMPLE_COUNT == Hlw.cf1_pulse_counter) {
+      Hlw.cf1_timer = 8;
+    }
+  }
+  Energy.data_valid[0] = 0;
+}
+
+
+
+void HlwEvery200ms(void)
+{
+  unsigned long cf1_pulse_length = 0;
+  unsigned long hlw_w = 0;
+  unsigned long hlw_u = 0;
+  unsigned long hlw_i = 0;
+
+  if (micros() - Hlw.cf_pulse_last_time > (HLW_POWER_PROBE_TIME * 1000000)) {
+    Hlw.cf_pulse_length = 0;
+    Hlw.load_off = true;
+  }
+  Hlw.cf_power_pulse_length = Hlw.cf_pulse_length;
+
+  if (Hlw.cf_power_pulse_length && Energy.power_on && !Hlw.load_off) {
+    hlw_w = (Hlw.power_ratio * Settings.energy_power_calibration) / Hlw.cf_power_pulse_length ;
+    Energy.active_power[0] = (float)hlw_w / 10;
+    Hlw.power_retry = 1;
+  } else {
+    if (Hlw.power_retry) {
+      Hlw.power_retry--;
+    } else {
+      Energy.active_power[0] = 0;
+    }
+  }
+
+  if (pin[GPIO_NRG_CF1] < 99) {
+    Hlw.cf1_timer++;
+    if (Hlw.cf1_timer >= 8) {
+      Hlw.cf1_timer = 0;
+      Hlw.select_ui_flag = (Hlw.select_ui_flag) ? false : true;
+      DigitalWrite(GPIO_NRG_SEL, Hlw.select_ui_flag);
+
+      if (Hlw.cf1_pulse_counter) {
+        cf1_pulse_length = Hlw.cf1_summed_pulse_length / Hlw.cf1_pulse_counter;
+      }
+
+#ifdef HLW_DEBUG
+
+      char stemp[100];
+      stemp[0] = '\0';
+      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
+        snprintf_P(stemp, sizeof(stemp), PSTR("%s %d"), stemp, Hlw.debug[i]);
+      }
+      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
+        for (uint32_t j = i + 1; j < Hlw.cf1_pulse_counter; j++) {
+          if (Hlw.debug[i] > Hlw.debug[j]) {
+            std::swap(Hlw.debug[i], Hlw.debug[j]);
+          }
+        }
+      }
+      unsigned long median = Hlw.debug[(Hlw.cf1_pulse_counter +1) / 2];
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("NRG: power %d, ui %d, cnt %d, smpl%s, sum %d, mean %d, median %d"),
+        Hlw.cf_power_pulse_length , Hlw.select_ui_flag, Hlw.cf1_pulse_counter, stemp, Hlw.cf1_summed_pulse_length, cf1_pulse_length, median);
+#endif
+
+      if (Hlw.select_ui_flag == Hlw.ui_flag) {
+        Hlw.cf1_voltage_pulse_length = cf1_pulse_length;
+
+        if (Hlw.cf1_voltage_pulse_length && Energy.power_on) {
+          hlw_u = (Hlw.voltage_ratio * Settings.energy_voltage_calibration) / Hlw.cf1_voltage_pulse_length ;
+          Energy.voltage[0] = (float)hlw_u / 10;
+        } else {
+          Energy.voltage[0] = 0;
+        }
+
+      } else {
+        Hlw.cf1_current_pulse_length = cf1_pulse_length;
+
+        if (Hlw.cf1_current_pulse_length && Energy.active_power[0]) {
+          hlw_i = (Hlw.current_ratio * Settings.energy_current_calibration) / Hlw.cf1_current_pulse_length;
+          Energy.current[0] = (float)hlw_i / 1000;
+        } else {
+          Energy.current[0] = 0;
+        }
+
+      }
+      Hlw.cf1_summed_pulse_length = 0;
+      Hlw.cf1_pulse_counter = 0;
+    }
+  }
+}
+
+void HlwEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    Hlw.cf1_voltage_pulse_length = 0;
+    Hlw.cf1_current_pulse_length = 0;
+    Hlw.cf_power_pulse_length = 0;
+  } else {
+    unsigned long hlw_len;
+
+    if (Hlw.energy_period_counter) {
+      hlw_len = 10000 / Hlw.energy_period_counter;
+      Hlw.energy_period_counter = 0;
+      if (hlw_len) {
+        Energy.kWhtoday_delta += ((Hlw.power_ratio * Settings.energy_power_calibration) / hlw_len) / 36;
+        EnergyUpdateToday();
+      }
+    }
+  }
+}
+
+void HlwSnsInit(void)
+{
+  if (!Settings.energy_power_calibration || (4975 == Settings.energy_power_calibration)) {
+    Settings.energy_power_calibration = HLW_PREF_PULSE;
+    Settings.energy_voltage_calibration = HLW_UREF_PULSE;
+    Settings.energy_current_calibration = HLW_IREF_PULSE;
+  }
+
+  if (Hlw.model_type) {
+    Hlw.power_ratio = HJL_PREF;
+    Hlw.voltage_ratio = HJL_UREF;
+    Hlw.current_ratio = HJL_IREF;
+  } else {
+    Hlw.power_ratio = HLW_PREF;
+    Hlw.voltage_ratio = HLW_UREF;
+    Hlw.current_ratio = HLW_IREF;
+  }
+
+  if (pin[GPIO_NRG_SEL] < 99) {
+    pinMode(pin[GPIO_NRG_SEL], OUTPUT);
+    digitalWrite(pin[GPIO_NRG_SEL], Hlw.select_ui_flag);
+  }
+  if (pin[GPIO_NRG_CF1] < 99) {
+    pinMode(pin[GPIO_NRG_CF1], INPUT_PULLUP);
+    attachInterrupt(pin[GPIO_NRG_CF1], HlwCf1Interrupt, FALLING);
+  }
+  pinMode(pin[GPIO_HLW_CF], INPUT_PULLUP);
+  attachInterrupt(pin[GPIO_HLW_CF], HlwCfInterrupt, FALLING);
+}
+
+void HlwDrvInit(void)
+{
+  Hlw.model_type = 0;
+  if (pin[GPIO_HJL_CF] < 99) {
+    pin[GPIO_HLW_CF] = pin[GPIO_HJL_CF];
+    pin[GPIO_HJL_CF] = 99;
+    Hlw.model_type = 1;
+  }
+
+  if (pin[GPIO_HLW_CF] < 99) {
+
+    Hlw.ui_flag = true;
+    if (pin[GPIO_NRG_SEL_INV] < 99) {
+      pin[GPIO_NRG_SEL] = pin[GPIO_NRG_SEL_INV];
+      pin[GPIO_NRG_SEL_INV] = 99;
+      Hlw.ui_flag = false;
+    }
+
+    if (pin[GPIO_NRG_CF1] < 99) {
+      if (99 == pin[GPIO_NRG_SEL]) {
+        Energy.current_available = false;
+      }
+    } else {
+      Energy.current_available = false;
+      Energy.voltage_available = false;
+    }
+
+    energy_flg = XNRG_01;
+  }
+}
+
+bool HlwCommand(void)
+{
+  bool serviced = true;
+
+  if ((CMND_POWERCAL == Energy.command_code) || (CMND_VOLTAGECAL == Energy.command_code) || (CMND_CURRENTCAL == Energy.command_code)) {
+
+  }
+  else if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf_power_pulse_length ) {
+      Settings.energy_power_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf_power_pulse_length ) / Hlw.power_ratio;
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf1_voltage_pulse_length ) {
+      Settings.energy_voltage_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf1_voltage_pulse_length ) / Hlw.voltage_ratio;
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Hlw.cf1_current_pulse_length) {
+      Settings.energy_current_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data)) * Hlw.cf1_current_pulse_length) / Hlw.current_ratio;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg01(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_200_MSECOND:
+      HlwEvery200ms();
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      HlwEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = HlwCommand();
+      break;
+    case FUNC_INIT:
+      HlwSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      HlwDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_02_cse7766.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_02_cse7766.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_CSE7766
+
+
+
+
+
+
+
+#define XNRG_02 2
+
+#define CSE_MAX_INVALID_POWER 128
+
+#define CSE_NOT_CALIBRATED 0xAA
+
+#define CSE_PULSES_NOT_INITIALIZED -1
+
+#define CSE_PREF 1000
+#define CSE_UREF 100
+
+#define CSE_BUFFER_SIZE 25
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *CseSerial = nullptr;
+
+struct CSE {
+  long voltage_cycle = 0;
+  long current_cycle = 0;
+  long power_cycle = 0;
+  long power_cycle_first = 0;
+  long cf_pulses = 0;
+  long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
+
+  int byte_counter = 0;
+  uint8_t *rx_buffer = nullptr;
+  uint8_t power_invalid = 0;
+  bool received = false;
+} Cse;
+
+void CseReceived(void)
+{
+
+
+
+
+
+
+  uint8_t header = Cse.rx_buffer[0];
+  if ((header & 0xFC) == 0xFC) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Abnormal hardware"));
+    return;
+  }
+
+
+  if (HLW_UREF_PULSE == Settings.energy_voltage_calibration) {
+    long voltage_coefficient = 191200;
+    if (CSE_NOT_CALIBRATED != header) {
+      voltage_coefficient = Cse.rx_buffer[2] << 16 | Cse.rx_buffer[3] << 8 | Cse.rx_buffer[4];
+    }
+    Settings.energy_voltage_calibration = voltage_coefficient / CSE_UREF;
+  }
+  if (HLW_IREF_PULSE == Settings.energy_current_calibration) {
+    long current_coefficient = 16140;
+    if (CSE_NOT_CALIBRATED != header) {
+      current_coefficient = Cse.rx_buffer[8] << 16 | Cse.rx_buffer[9] << 8 | Cse.rx_buffer[10];
+    }
+    Settings.energy_current_calibration = current_coefficient;
+  }
+  if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
+    long power_coefficient = 5364000;
+    if (CSE_NOT_CALIBRATED != header) {
+      power_coefficient = Cse.rx_buffer[14] << 16 | Cse.rx_buffer[15] << 8 | Cse.rx_buffer[16];
+    }
+    Settings.energy_power_calibration = power_coefficient / CSE_PREF;
+  }
+
+  uint8_t adjustement = Cse.rx_buffer[20];
+  Cse.voltage_cycle = Cse.rx_buffer[5] << 16 | Cse.rx_buffer[6] << 8 | Cse.rx_buffer[7];
+  Cse.current_cycle = Cse.rx_buffer[11] << 16 | Cse.rx_buffer[12] << 8 | Cse.rx_buffer[13];
+  Cse.power_cycle = Cse.rx_buffer[17] << 16 | Cse.rx_buffer[18] << 8 | Cse.rx_buffer[19];
+  Cse.cf_pulses = Cse.rx_buffer[21] << 8 | Cse.rx_buffer[22];
+
+  if (Energy.power_on) {
+    if (adjustement & 0x40) {
+      Energy.voltage[0] = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)Cse.voltage_cycle;
+    }
+    if (adjustement & 0x10) {
+      Cse.power_invalid = 0;
+      if ((header & 0xF2) == 0xF2) {
+        Energy.active_power[0] = 0;
+      } else {
+        if (0 == Cse.power_cycle_first) { Cse.power_cycle_first = Cse.power_cycle; }
+        if (Cse.power_cycle_first != Cse.power_cycle) {
+          Cse.power_cycle_first = -1;
+          Energy.active_power[0] = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)Cse.power_cycle;
+        } else {
+          Energy.active_power[0] = 0;
+        }
+      }
+    } else {
+      if (Cse.power_invalid < Settings.param[P_CSE7766_INVALID_POWER]) {
+        Cse.power_invalid++;
+      } else {
+        Cse.power_cycle_first = 0;
+        Energy.active_power[0] = 0;
+      }
+    }
+    if (adjustement & 0x20) {
+      if (0 == Energy.active_power[0]) {
+        Energy.current[0] = 0;
+      } else {
+        Energy.current[0] = (float)Settings.energy_current_calibration / (float)Cse.current_cycle;
+      }
+    }
+  } else {
+    Cse.power_cycle_first = 0;
+    Energy.voltage[0] = 0;
+    Energy.active_power[0] = 0;
+    Energy.current[0] = 0;
+  }
+}
+
+bool CseSerialInput(void)
+{
+  while (CseSerial->available()) {
+    yield();
+    uint8_t serial_in_byte = CseSerial->read();
+
+    if (Cse.received) {
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
+      if (24 == Cse.byte_counter) {
+
+        AddLogBuffer(LOG_LEVEL_DEBUG_MORE, Cse.rx_buffer, 24);
+
+        uint8_t checksum = 0;
+        for (uint32_t i = 2; i < 23; i++) { checksum += Cse.rx_buffer[i]; }
+        if (checksum == Cse.rx_buffer[23]) {
+          Energy.data_valid[0] = 0;
+          CseReceived();
+          Cse.received = false;
+          return true;
+        } else {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
+          do {
+            memmove(Cse.rx_buffer, Cse.rx_buffer +1, 24);
+            Cse.byte_counter--;
+          } while ((Cse.byte_counter > 2) && (0x5A != Cse.rx_buffer[1]));
+          if (0x5A != Cse.rx_buffer[1]) {
+            Cse.received = false;
+            Cse.byte_counter = 0;
+          }
+        }
+      }
+    } else {
+      if ((0x5A == serial_in_byte) && (1 == Cse.byte_counter)) {
+        Cse.received = true;
+      } else {
+        Cse.byte_counter = 0;
+      }
+      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
+    }
+  }
+}
+
+
+
+void CseEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    Cse.voltage_cycle = 0;
+    Cse.current_cycle = 0;
+    Cse.power_cycle = 0;
+  } else {
+    long cf_frequency = 0;
+
+    if (CSE_PULSES_NOT_INITIALIZED == Cse.cf_pulses_last_time) {
+      Cse.cf_pulses_last_time = Cse.cf_pulses;
+    } else {
+      if (Cse.cf_pulses < Cse.cf_pulses_last_time) {
+        cf_frequency = (65536 - Cse.cf_pulses_last_time) + Cse.cf_pulses;
+      } else {
+        cf_frequency = Cse.cf_pulses - Cse.cf_pulses_last_time;
+      }
+      if (cf_frequency && Energy.active_power[0]) {
+        unsigned long delta = (cf_frequency * Settings.energy_power_calibration) / 36;
+
+
+
+        if (delta <= (4000*100/36) * 10 ) {
+          Cse.cf_pulses_last_time = Cse.cf_pulses;
+          Energy.kWhtoday_delta += delta;
+        }
+        else {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Load overflow"));
+          Cse.cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
+        }
+        EnergyUpdateToday();
+      }
+    }
+  }
+}
+
+void CseSnsInit(void)
+{
+
+
+  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], -1, 1);
+  if (CseSerial->begin(4800, 2)) {
+    if (CseSerial->hardwareSerial()) {
+      SetSerial(4800, TS_SERIAL_8E1);
+      ClaimSerial();
+    }
+    if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
+      Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;
+    }
+    Cse.power_invalid = Settings.param[P_CSE7766_INVALID_POWER];
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void CseDrvInit(void)
+{
+  Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
+  if (Cse.rx_buffer != nullptr) {
+
+    if (pin[GPIO_CSE7766_RX] < 99) {
+      energy_flg = XNRG_02;
+    }
+  }
+}
+
+bool CseCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.power_cycle) {
+      Settings.energy_power_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.power_cycle) / CSE_PREF;
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.voltage_cycle) {
+      Settings.energy_voltage_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.voltage_cycle) / CSE_UREF;
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Cse.current_cycle) {
+      Settings.energy_current_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.current_cycle) / 1000;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      if (CseSerial) { CseSerialInput(); }
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      CseEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = CseCommand();
+      break;
+    case FUNC_INIT:
+      CseSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      CseDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM004T
+# 31 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+#define XNRG_03 3
+
+const uint32_t PZEM_STABILIZE = 30;
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PzemSerial = nullptr;
+
+#define PZEM_VOLTAGE (uint8_t)0xB0
+#define RESP_VOLTAGE (uint8_t)0xA0
+
+#define PZEM_CURRENT (uint8_t)0xB1
+#define RESP_CURRENT (uint8_t)0xA1
+
+#define PZEM_POWER (uint8_t)0xB2
+#define RESP_POWER (uint8_t)0xA2
+
+#define PZEM_ENERGY (uint8_t)0xB3
+#define RESP_ENERGY (uint8_t)0xA3
+
+#define PZEM_SET_ADDRESS (uint8_t)0xB4
+#define RESP_SET_ADDRESS (uint8_t)0xA4
+
+#define PZEM_POWER_ALARM (uint8_t)0xB5
+#define RESP_POWER_ALARM (uint8_t)0xA5
+
+#define PZEM_DEFAULT_READ_TIMEOUT 500
+
+
+
+struct PZEM {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t read_state = 0;
+  uint8_t phase = 0;
+  uint8_t address = 0;
+} Pzem;
+
+struct PZEMCommand {
+  uint8_t command;
+  uint8_t addr[4];
+  uint8_t data;
+  uint8_t crc;
+};
+
+uint8_t PzemCrc(uint8_t *data)
+{
+  uint16_t crc = 0;
+  for (uint32_t i = 0; i < sizeof(PZEMCommand) -1; i++) {
+    crc += *data++;
+  }
+  return (uint8_t)(crc & 0xFF);
+}
+
+void PzemSend(uint8_t cmd)
+{
+  PZEMCommand pzem;
+
+  pzem.command = cmd;
+  pzem.addr[0] = 192;
+  pzem.addr[1] = 168;
+  pzem.addr[2] = 1;
+  pzem.addr[3] = ((PZEM_SET_ADDRESS == cmd) && Pzem.address) ? Pzem.address : 1 + Pzem.phase;
+  pzem.data = 0;
+
+  uint8_t *bytes = (uint8_t*)&pzem;
+  pzem.crc = PzemCrc(bytes);
+
+  PzemSerial->flush();
+  PzemSerial->write(bytes, sizeof(pzem));
+
+  Pzem.address = 0;
+}
+
+bool PzemReceiveReady(void)
+{
+  return PzemSerial->available() >= (int)sizeof(PZEMCommand);
+}
+
+bool PzemRecieve(uint8_t resp, float *data)
+{
+# 124 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
+  uint8_t buffer[sizeof(PZEMCommand)] = { 0 };
+
+  unsigned long start = millis();
+  uint8_t len = 0;
+  while ((len < sizeof(PZEMCommand)) && (millis() - start < PZEM_DEFAULT_READ_TIMEOUT)) {
+    if (PzemSerial->available() > 0) {
+      uint8_t c = (uint8_t)PzemSerial->read();
+      if (!len && ((c & 0xF8) != 0xA0)) {
+        continue;
+      }
+      buffer[len++] = c;
+    }
+  }
+
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, len);
+
+  if (len != sizeof(PZEMCommand)) {
+
+    return false;
+  }
+  if (buffer[6] != PzemCrc(buffer)) {
+
+    return false;
+  }
+  if (buffer[0] != resp) {
+
+    return false;
+  }
+
+  switch (resp) {
+    case RESP_VOLTAGE:
+      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 10.0);
+      break;
+    case RESP_CURRENT:
+      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 100.0);
+      break;
+    case RESP_POWER:
+      *data = (float)(buffer[1] << 8) + buffer[2];
+      break;
+    case RESP_ENERGY:
+      *data = (float)((uint32_t)buffer[1] << 16) + ((uint16_t)buffer[2] << 8) + buffer[3];
+      break;
+  }
+  return true;
+}
+
+
+
+const uint8_t pzem_commands[] { PZEM_SET_ADDRESS, PZEM_VOLTAGE, PZEM_CURRENT, PZEM_POWER, PZEM_ENERGY };
+const uint8_t pzem_responses[] { RESP_SET_ADDRESS, RESP_VOLTAGE, RESP_CURRENT, RESP_POWER, RESP_ENERGY };
+
+void PzemEvery250ms(void)
+{
+  bool data_ready = PzemReceiveReady();
+
+  if (data_ready) {
+    float value = 0;
+    if (PzemRecieve(pzem_responses[Pzem.read_state], &value)) {
+      Energy.data_valid[Pzem.phase] = 0;
+      switch (Pzem.read_state) {
+        case 1:
+          Energy.voltage[Pzem.phase] = value;
+          break;
+        case 2:
+          Energy.current[Pzem.phase] = value;
+          break;
+        case 3:
+          Energy.active_power[Pzem.phase] = value;
+          break;
+        case 4:
+          Pzem.energy += value;
+          if (Pzem.phase == Energy.phase_count -1) {
+            if (Pzem.energy > Pzem.last_energy) {
+              if (uptime > PZEM_STABILIZE) {
+                EnergyUpdateTotal(Pzem.energy, false);
+              }
+              Pzem.last_energy = Pzem.energy;
+            }
+            Pzem.energy = 0;
+          }
+          break;
+      }
+      Pzem.read_state++;
+      if (5 == Pzem.read_state) {
+        Pzem.read_state = 1;
+      }
+
+
+    }
+  }
+
+  if (0 == Pzem.send_retry || data_ready) {
+    if (1 == Pzem.read_state) {
+      if (0 == Pzem.phase) {
+        Pzem.phase = Energy.phase_count -1;
+      } else {
+        Pzem.phase--;
+      }
+
+
+    }
+
+    if (Pzem.address) {
+      Pzem.read_state = 0;
+    }
+
+    Pzem.send_retry = 5;
+    PzemSend(pzem_commands[Pzem.read_state]);
+  }
+  else {
+    Pzem.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == Pzem.send_retry) && (uptime < PZEM_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemSnsInit(void)
+{
+
+  PzemSerial = new TasmotaSerial(pin[GPIO_PZEM004_RX], pin[GPIO_PZEM0XX_TX], 1);
+  if (PzemSerial->begin(9600)) {
+    if (PzemSerial->hardwareSerial()) {
+      ClaimSerial();
+    }
+    Energy.phase_count = 3;
+    Pzem.phase = 0;
+    Pzem.read_state = 1;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemDrvInit(void)
+{
+  if ((pin[GPIO_PZEM004_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_03;
+  }
+}
+
+bool PzemCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
+      Pzem.address = XdrvMailbox.payload;
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg03(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (PzemSerial && (uptime > 4)) { PzemEvery250ms(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemCommand();
+      break;
+    case FUNC_INIT:
+      PzemSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_MCP39F501
+
+
+
+
+
+
+
+#define XNRG_04 4
+
+#define MCP_BAUDRATE 4800
+#define MCP_TIMEOUT 4
+#define MCP_CALIBRATION_TIMEOUT 2
+
+#define MCP_CALIBRATE_POWER 0x001
+#define MCP_CALIBRATE_VOLTAGE 0x002
+#define MCP_CALIBRATE_CURRENT 0x004
+#define MCP_CALIBRATE_FREQUENCY 0x008
+#define MCP_SINGLE_WIRE_FLAG 0x100
+
+#define MCP_START_FRAME 0xA5
+#define MCP_ACK_FRAME 0x06
+#define MCP_ERROR_NAK 0x15
+#define MCP_ERROR_CRC 0x51
+
+#define MCP_SINGLE_WIRE 0xAB
+
+#define MCP_SET_ADDRESS 0x41
+
+#define MCP_READ 0x4E
+#define MCP_READ_16 0x52
+#define MCP_READ_32 0x44
+
+#define MCP_WRITE 0x4D
+#define MCP_WRITE_16 0x57
+#define MCP_WRITE_32 0x45
+
+#define MCP_SAVE_REGISTERS 0x53
+
+#define MCP_CALIBRATION_BASE 0x0028
+#define MCP_CALIBRATION_LEN 52
+
+#define MCP_FREQUENCY_REF_BASE 0x0094
+#define MCP_FREQUENCY_GAIN_BASE 0x00AE
+#define MCP_FREQUENCY_LEN 4
+
+#define MCP_BUFFER_SIZE 60
+
+#include <TasmotaSerial.h>
+TasmotaSerial *McpSerial = nullptr;
+
+typedef struct mcp_cal_registers_type {
+  uint16_t gain_current_rms;
+  uint16_t gain_voltage_rms;
+  uint16_t gain_active_power;
+  uint16_t gain_reactive_power;
+  sint32_t offset_current_rms;
+  sint32_t offset_active_power;
+  sint32_t offset_reactive_power;
+  sint16_t dc_offset_current;
+  sint16_t phase_compensation;
+  uint16_t apparent_power_divisor;
+
+  uint32_t system_configuration;
+  uint16_t dio_configuration;
+  uint32_t range;
+
+  uint32_t calibration_current;
+  uint16_t calibration_voltage;
+  uint32_t calibration_active_power;
+  uint32_t calibration_reactive_power;
+  uint16_t accumulation_interval;
+} mcp_cal_registers_type;
+
+char *mcp_buffer = nullptr;
+unsigned long mcp_window = 0;
+unsigned long mcp_kWhcounter = 0;
+uint32_t mcp_system_configuration = 0x03000000;
+uint32_t mcp_active_power;
+
+
+uint32_t mcp_current_rms;
+uint16_t mcp_voltage_rms;
+uint16_t mcp_line_frequency;
+
+uint8_t mcp_address = 0;
+uint8_t mcp_calibration_active = 0;
+uint8_t mcp_init = 0;
+uint8_t mcp_timeout = 0;
+uint8_t mcp_calibrate = 0;
+uint8_t mcp_byte_counter = 0;
+
+
+
+
+
+
+uint8_t McpChecksum(uint8_t *data)
+{
+  uint8_t checksum = 0;
+  uint8_t offset = 0;
+  uint8_t len = data[1] -1;
+
+  for (uint32_t i = offset; i < len; i++) { checksum += data[i]; }
+  return checksum;
+}
+
+unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size)
+{
+ unsigned long result = 0;
+ unsigned long pow = 1;
+
+ for (uint32_t i = 0; i < size; i++) {
+  result = result + (uint8_t)data[offset + i] * pow;
+  pow = pow * 256;
+ }
+ return result;
+}
+
+void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size)
+{
+ for (uint32_t i = 0; i < size; i++) {
+  data[offset + i] = ((value >> (i * 8)) & 0xFF);
+ }
+}
+
+void McpSend(uint8_t *data)
+{
+  if (mcp_timeout) { return; }
+  mcp_timeout = MCP_TIMEOUT;
+
+  data[0] = MCP_START_FRAME;
+  data[data[1] -1] = McpChecksum(data);
+
+
+
+  for (uint32_t i = 0; i < data[1]; i++) {
+    McpSerial->write(data[i]);
+  }
+}
+
+
+
+void McpGetAddress(void)
+{
+  uint8_t data[] = { MCP_START_FRAME, 7, MCP_SET_ADDRESS, 0x00, 0x26, MCP_READ_16, 0x00 };
+
+  McpSend(data);
+}
+
+void McpAddressReceive(void)
+{
+
+  mcp_address = mcp_buffer[3];
+}
+
+
+
+void McpGetCalibration(void)
+{
+  if (mcp_calibration_active) { return; }
+  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
+
+  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, (MCP_CALIBRATION_BASE >> 8) & 0xFF, MCP_CALIBRATION_BASE & 0xFF, MCP_READ, MCP_CALIBRATION_LEN, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseCalibration(void)
+{
+  bool action = false;
+  mcp_cal_registers_type cal_registers;
+
+
+  cal_registers.gain_current_rms = McpExtractInt(mcp_buffer, 2, 2);
+  cal_registers.gain_voltage_rms = McpExtractInt(mcp_buffer, 4, 2);
+  cal_registers.gain_active_power = McpExtractInt(mcp_buffer, 6, 2);
+  cal_registers.gain_reactive_power = McpExtractInt(mcp_buffer, 8, 2);
+  cal_registers.offset_current_rms = McpExtractInt(mcp_buffer, 10, 4);
+  cal_registers.offset_active_power = McpExtractInt(mcp_buffer, 14, 4);
+  cal_registers.offset_reactive_power = McpExtractInt(mcp_buffer, 18, 4);
+  cal_registers.dc_offset_current = McpExtractInt(mcp_buffer, 22, 2);
+  cal_registers.phase_compensation = McpExtractInt(mcp_buffer, 24, 2);
+  cal_registers.apparent_power_divisor = McpExtractInt(mcp_buffer, 26, 2);
+
+  cal_registers.system_configuration = McpExtractInt(mcp_buffer, 28, 4);
+  cal_registers.dio_configuration = McpExtractInt(mcp_buffer, 32, 2);
+  cal_registers.range = McpExtractInt(mcp_buffer, 34, 4);
+
+  cal_registers.calibration_current = McpExtractInt(mcp_buffer, 38, 4);
+  cal_registers.calibration_voltage = McpExtractInt(mcp_buffer, 42, 2);
+  cal_registers.calibration_active_power = McpExtractInt(mcp_buffer, 44, 4);
+  cal_registers.calibration_reactive_power = McpExtractInt(mcp_buffer, 48, 4);
+  cal_registers.accumulation_interval = McpExtractInt(mcp_buffer, 52, 2);
+
+  if (mcp_calibrate & MCP_CALIBRATE_POWER) {
+    cal_registers.calibration_active_power = Settings.energy_power_calibration;
+    if (McpCalibrationCalc(&cal_registers, 16)) { action = true; }
+  }
+  if (mcp_calibrate & MCP_CALIBRATE_VOLTAGE) {
+    cal_registers.calibration_voltage = Settings.energy_voltage_calibration;
+    if (McpCalibrationCalc(&cal_registers, 0)) { action = true; }
+  }
+  if (mcp_calibrate & MCP_CALIBRATE_CURRENT) {
+    cal_registers.calibration_current = Settings.energy_current_calibration;
+    if (McpCalibrationCalc(&cal_registers, 8)) { action = true; }
+  }
+  mcp_timeout = 0;
+  if (action) { McpSetCalibration(&cal_registers); }
+
+  mcp_calibrate = 0;
+
+  Settings.energy_power_calibration = cal_registers.calibration_active_power;
+  Settings.energy_voltage_calibration = cal_registers.calibration_voltage;
+  Settings.energy_current_calibration = cal_registers.calibration_current;
+
+  mcp_system_configuration = cal_registers.system_configuration;
+
+  if (mcp_system_configuration & MCP_SINGLE_WIRE_FLAG) {
+    mcp_system_configuration &= ~MCP_SINGLE_WIRE_FLAG;
+   McpSetSystemConfiguration(2);
+  }
+}
+
+bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift)
+{
+  uint32_t measured;
+  uint32_t expected;
+  uint16_t *gain;
+  uint32_t new_gain;
+
+  if (range_shift == 0) {
+    measured = mcp_voltage_rms;
+    expected = cal_registers->calibration_voltage;
+    gain = &(cal_registers->gain_voltage_rms);
+  } else if (range_shift == 8) {
+    measured = mcp_current_rms;
+    expected = cal_registers->calibration_current;
+    gain = &(cal_registers->gain_current_rms);
+  } else if (range_shift == 16) {
+    measured = mcp_active_power;
+    expected = cal_registers->calibration_active_power;
+    gain = &(cal_registers->gain_active_power);
+  } else {
+    return false;
+  }
+
+  if (measured == 0) {
+    return false;
+  }
+
+  uint32_t range = (cal_registers->range >> range_shift) & 0xFF;
+
+calc:
+  new_gain = (*gain) * expected / measured;
+
+  if (new_gain < 25000) {
+    range++;
+    if (measured > 6) {
+      measured = measured / 2;
+      goto calc;
+    }
+  }
+
+  if (new_gain > 55000) {
+    range--;
+    measured = measured * 2;
+    goto calc;
+  }
+
+  *gain = new_gain;
+  uint32_t old_range = (cal_registers->range >> range_shift) & 0xFF;
+  cal_registers->range = cal_registers->range ^ (old_range << range_shift);
+  cal_registers->range = cal_registers->range | (range << range_shift);
+
+  return true;
+}
+
+
+
+
+
+
+void McpSetCalibration(struct mcp_cal_registers_type *cal_registers)
+{
+  uint8_t data[7 + MCP_CALIBRATION_LEN + 2 + 1];
+
+  data[1] = sizeof(data);
+  data[2] = MCP_SET_ADDRESS;
+  data[3] = (MCP_CALIBRATION_BASE >> 8) & 0xFF;
+  data[4] = (MCP_CALIBRATION_BASE >> 0) & 0xFF;
+
+  data[5] = MCP_WRITE;
+  data[6] = MCP_CALIBRATION_LEN;
+
+  McpSetInt(cal_registers->gain_current_rms, data, 0+7, 2);
+  McpSetInt(cal_registers->gain_voltage_rms, data, 2+7, 2);
+  McpSetInt(cal_registers->gain_active_power, data, 4+7, 2);
+  McpSetInt(cal_registers->gain_reactive_power, data, 6+7, 2);
+  McpSetInt(cal_registers->offset_current_rms, data, 8+7, 4);
+  McpSetInt(cal_registers->offset_active_power, data, 12+7, 4);
+  McpSetInt(cal_registers->offset_reactive_power, data, 16+7, 4);
+  McpSetInt(cal_registers->dc_offset_current, data, 20+7, 2);
+  McpSetInt(cal_registers->phase_compensation, data, 22+7, 2);
+  McpSetInt(cal_registers->apparent_power_divisor, data, 24+7, 2);
+
+  McpSetInt(cal_registers->system_configuration, data, 26+7, 4);
+  McpSetInt(cal_registers->dio_configuration, data, 30+7, 2);
+  McpSetInt(cal_registers->range, data, 32+7, 4);
+
+  McpSetInt(cal_registers->calibration_current, data, 36+7, 4);
+  McpSetInt(cal_registers->calibration_voltage, data, 40+7, 2);
+  McpSetInt(cal_registers->calibration_active_power, data, 42+7, 4);
+  McpSetInt(cal_registers->calibration_reactive_power, data, 46+7, 4);
+  McpSetInt(cal_registers->accumulation_interval, data, 50+7, 2);
+
+  data[MCP_CALIBRATION_LEN+7] = MCP_SAVE_REGISTERS;
+  data[MCP_CALIBRATION_LEN+8] = mcp_address;
+
+  McpSend(data);
+}
+
+
+
+void McpSetSystemConfiguration(uint16 interval)
+{
+
+  uint8_t data[17];
+
+  data[ 1] = sizeof(data);
+  data[ 2] = MCP_SET_ADDRESS;
+  data[ 3] = 0x00;
+  data[ 4] = 0x42;
+  data[ 5] = MCP_WRITE_32;
+  data[ 6] = (mcp_system_configuration >> 24) & 0xFF;
+  data[ 7] = (mcp_system_configuration >> 16) & 0xFF;
+  data[ 8] = (mcp_system_configuration >> 8) & 0xFF;
+  data[ 9] = (mcp_system_configuration >> 0) & 0xFF;
+  data[10] = MCP_SET_ADDRESS;
+  data[11] = 0x00;
+  data[12] = 0x5A;
+  data[13] = MCP_WRITE_16;
+  data[14] = (interval >> 8) & 0xFF;
+  data[15] = (interval >> 0) & 0xFF;
+
+  McpSend(data);
+}
+
+
+
+void McpGetFrequency(void)
+{
+  if (mcp_calibration_active) { return; }
+  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
+
+  uint8_t data[] = { MCP_START_FRAME, 11, MCP_SET_ADDRESS, (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF, MCP_FREQUENCY_REF_BASE & 0xFF, MCP_READ_16,
+                                          MCP_SET_ADDRESS, (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF, MCP_FREQUENCY_GAIN_BASE & 0xFF, MCP_READ_16, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseFrequency(void)
+{
+
+  uint16_t line_frequency_ref = mcp_buffer[2] * 256 + mcp_buffer[3];
+  uint16_t gain_line_frequency = mcp_buffer[4] * 256 + mcp_buffer[5];
+
+  if (mcp_calibrate & MCP_CALIBRATE_FREQUENCY) {
+    line_frequency_ref = Settings.energy_frequency_calibration;
+
+    if ((0xFFFF == mcp_line_frequency) || (0 == gain_line_frequency)) {
+      mcp_line_frequency = 50000;
+      gain_line_frequency = 0x8000;
+    }
+    gain_line_frequency = gain_line_frequency * line_frequency_ref / mcp_line_frequency;
+
+    mcp_timeout = 0;
+    McpSetFrequency(line_frequency_ref, gain_line_frequency);
+  }
+
+  Settings.energy_frequency_calibration = line_frequency_ref;
+
+  mcp_calibrate = 0;
+}
+
+void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency)
+{
+
+  uint8_t data[17];
+
+  data[ 1] = sizeof(data);
+  data[ 2] = MCP_SET_ADDRESS;
+  data[ 3] = (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF;
+  data[ 4] = (MCP_FREQUENCY_REF_BASE >> 0) & 0xFF;
+
+  data[ 5] = MCP_WRITE_16;
+  data[ 6] = (line_frequency_ref >> 8) & 0xFF;
+  data[ 7] = (line_frequency_ref >> 0) & 0xFF;
+
+  data[ 8] = MCP_SET_ADDRESS;
+  data[ 9] = (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF;
+  data[10] = (MCP_FREQUENCY_GAIN_BASE >> 0) & 0xFF;
+
+  data[11] = MCP_WRITE_16;
+  data[12] = (gain_line_frequency >> 8) & 0xFF;
+  data[13] = (gain_line_frequency >> 0) & 0xFF;
+
+  data[14] = MCP_SAVE_REGISTERS;
+  data[15] = mcp_address;
+
+  McpSend(data);
+}
+
+
+
+void McpGetData(void)
+{
+  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, 0x00, 0x04, MCP_READ, 22, 0x00 };
+
+  McpSend(data);
+}
+
+void McpParseData(void)
+{
+
+
+
+
+
+  mcp_current_rms = McpExtractInt(mcp_buffer, 2, 4);
+  mcp_voltage_rms = McpExtractInt(mcp_buffer, 6, 2);
+  mcp_active_power = McpExtractInt(mcp_buffer, 8, 4);
+
+
+  mcp_line_frequency = McpExtractInt(mcp_buffer, 22, 2);
+
+  if (Energy.power_on) {
+    Energy.data_valid[0] = 0;
+    Energy.frequency[0] = (float)mcp_line_frequency / 1000;
+    Energy.voltage[0] = (float)mcp_voltage_rms / 10;
+    Energy.active_power[0] = (float)mcp_active_power / 100;
+    if (0 == Energy.active_power[0]) {
+      Energy.current[0] = 0;
+    } else {
+      Energy.current[0] = (float)mcp_current_rms / 10000;
+    }
+  } else {
+    Energy.data_valid[0] = ENERGY_WATCHDOG;
+  }
+}
+
+
+
+void McpSerialInput(void)
+{
+  while ((McpSerial->available()) && (mcp_byte_counter < MCP_BUFFER_SIZE)) {
+    yield();
+    mcp_buffer[mcp_byte_counter++] = McpSerial->read();
+    mcp_window = millis();
+  }
+
+
+  if ((mcp_byte_counter) && (millis() - mcp_window > (24000 / MCP_BAUDRATE) +1)) {
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, (uint8_t*)mcp_buffer, mcp_byte_counter);
+
+    if (MCP_BUFFER_SIZE == mcp_byte_counter) {
+
+    }
+    else if (1 == mcp_byte_counter) {
+      if (MCP_ERROR_CRC == mcp_buffer[0]) {
+
+        mcp_timeout = 0;
+      }
+      else if (MCP_ERROR_NAK == mcp_buffer[0]) {
+
+        mcp_timeout = 0;
+      }
+    }
+    else if (MCP_ACK_FRAME == mcp_buffer[0]) {
+      if (mcp_byte_counter == mcp_buffer[1]) {
+
+        if (McpChecksum((uint8_t *)mcp_buffer) != mcp_buffer[mcp_byte_counter -1]) {
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("MCP: " D_CHECKSUM_FAILURE));
+        } else {
+          if (5 == mcp_buffer[1]) { McpAddressReceive(); }
+          if (25 == mcp_buffer[1]) { McpParseData(); }
+          if (MCP_CALIBRATION_LEN + 3 == mcp_buffer[1]) { McpParseCalibration(); }
+          if (MCP_FREQUENCY_LEN + 3 == mcp_buffer[1]) { McpParseFrequency(); }
+        }
+
+      }
+      mcp_timeout = 0;
+    }
+    else if (MCP_SINGLE_WIRE == mcp_buffer[0]) {
+      mcp_timeout = 0;
+    }
+
+    mcp_byte_counter = 0;
+    McpSerial->flush();
+  }
+}
+
+
+
+void McpEverySecond(void)
+{
+  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
+    mcp_voltage_rms = 0;
+    mcp_current_rms = 0;
+    mcp_active_power = 0;
+    mcp_line_frequency = 0;
+  }
+
+  if (mcp_active_power) {
+    Energy.kWhtoday_delta += ((mcp_active_power * 10) / 36);
+    EnergyUpdateToday();
+  }
+
+  if (mcp_timeout) {
+    mcp_timeout--;
+  }
+  else if (mcp_calibration_active) {
+    mcp_calibration_active--;
+  }
+  else if (mcp_init) {
+    if (2 == mcp_init) {
+      McpGetCalibration();
+    }
+    else if (1 == mcp_init) {
+      McpGetFrequency();
+    }
+    mcp_init--;
+  }
+  else if (!mcp_address) {
+    McpGetAddress();
+  }
+  else {
+    McpGetData();
+  }
+}
+
+void McpSnsInit(void)
+{
+
+  McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1);
+  if (McpSerial->begin(MCP_BAUDRATE)) {
+    if (McpSerial->hardwareSerial()) {
+      ClaimSerial();
+      mcp_buffer = serial_in_buffer;
+    } else {
+      mcp_buffer = (char*)(malloc(MCP_BUFFER_SIZE));
+    }
+    DigitalWrite(GPIO_MCP39F5_RST, 1);
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void McpDrvInit(void)
+{
+  if ((pin[GPIO_MCP39F5_RX] < 99) && (pin[GPIO_MCP39F5_TX] < 99)) {
+    if (pin[GPIO_MCP39F5_RST] < 99) {
+      pinMode(pin[GPIO_MCP39F5_RST], OUTPUT);
+      digitalWrite(pin[GPIO_MCP39F5_RST], 0);
+    }
+    mcp_calibrate = 0;
+    mcp_timeout = 2;
+    mcp_init = 2;
+    energy_flg = XNRG_04;
+  }
+}
+
+bool McpCommand(void)
+{
+  bool serviced = true;
+  unsigned long value = 0;
+
+  if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_active_power) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 100);
+      if ((value > 100) && (value < 200000)) {
+        Settings.energy_power_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_POWER;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_voltage_rms) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
+      if ((value > 1000) && (value < 2600)) {
+        Settings.energy_voltage_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_VOLTAGE;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_current_rms) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
+      if ((value > 100) && (value < 80000)) {
+        Settings.energy_current_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_CURRENT;
+        McpGetCalibration();
+      }
+    }
+  }
+  else if (CMND_FREQUENCYSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && mcp_line_frequency) {
+      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 1000);
+      if ((value > 45000) && (value < 65000)) {
+        Settings.energy_frequency_calibration = value;
+        mcp_calibrate |= MCP_CALIBRATE_FREQUENCY;
+        McpGetFrequency();
+      }
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg04(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_LOOP:
+      if (McpSerial) { McpSerialInput(); }
+      break;
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (McpSerial) { McpEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = McpCommand();
+      break;
+    case FUNC_INIT:
+      McpSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      McpDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM_AC
+# 33 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
+#define XNRG_05 5
+
+const uint8_t PZEM_AC_DEVICE_ADDRESS = 0x01;
+const uint32_t PZEM_AC_STABILIZE = 30;
+
+#include <TasmotaModbus.h>
+TasmotaModbus *PzemAcModbus;
+
+struct PZEMAC {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t phase = 0;
+  uint8_t address = 0;
+  uint8_t address_step = ADDR_IDLE;
+} PzemAc;
+
+void PzemAcEverySecond(void)
+{
+  bool data_ready = PzemAcModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[30];
+
+    uint8_t registers = 10;
+    if (ADDR_RECEIVE == PzemAc.address_step) {
+      registers = 2;
+      PzemAc.address_step--;
+    }
+    uint8_t error = PzemAcModbus->ReceiveBuffer(buffer, registers);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemAcModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAC: PzemAc %d error %d"), PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, error);
+    } else {
+      Energy.data_valid[PzemAc.phase] = 0;
+      if (10 == registers) {
+
+
+
+
+
+        Energy.voltage[PzemAc.phase] = (float)((buffer[3] << 8) + buffer[4]) / 10.0;
+        Energy.current[PzemAc.phase] = (float)((buffer[7] << 24) + (buffer[8] << 16) + (buffer[5] << 8) + buffer[6]) / 1000.0;
+        Energy.active_power[PzemAc.phase] = (float)((buffer[11] << 24) + (buffer[12] << 16) + (buffer[9] << 8) + buffer[10]) / 10.0;
+        Energy.frequency[PzemAc.phase] = (float)((buffer[17] << 8) + buffer[18]) / 10.0;
+        Energy.power_factor[PzemAc.phase] = (float)((buffer[19] << 8) + buffer[20]) / 100.0;
+
+        PzemAc.energy += (float)((buffer[15] << 24) + (buffer[16] << 16) + (buffer[13] << 8) + buffer[14]);
+        if (PzemAc.phase == Energy.phase_count -1) {
+          if (PzemAc.energy > PzemAc.last_energy) {
+            if (uptime > PZEM_AC_STABILIZE) {
+              EnergyUpdateTotal(PzemAc.energy, false);
+            }
+            PzemAc.last_energy = PzemAc.energy;
+          }
+          PzemAc.energy = 0;
+        }
+
+      }
+    }
+  }
+
+  if (0 == PzemAc.send_retry || data_ready) {
+    if (0 == PzemAc.phase) {
+      PzemAc.phase = Energy.phase_count -1;
+    } else {
+      PzemAc.phase--;
+    }
+    PzemAc.send_retry = ENERGY_WATCHDOG;
+    if (ADDR_SEND == PzemAc.address_step) {
+      PzemAcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemAc.address);
+      PzemAc.address_step--;
+    } else {
+      PzemAcModbus->Send(PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, 0x04, 0, 10);
+    }
+  }
+  else {
+    PzemAc.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == PzemAc.send_retry) && (uptime < PZEM_AC_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemAcSnsInit(void)
+{
+  PzemAcModbus = new TasmotaModbus(pin[GPIO_PZEM016_RX], pin[GPIO_PZEM0XX_TX]);
+  uint8_t result = PzemAcModbus->Begin(9600);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.phase_count = 3;
+    PzemAc.phase = 0;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemAcDrvInit(void)
+{
+  if ((pin[GPIO_PZEM016_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_05;
+  }
+}
+
+bool PzemAcCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    PzemAc.address = XdrvMailbox.payload;
+    PzemAc.address_step = ADDR_SEND;
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg05(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { PzemAcEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemAcCommand();
+      break;
+    case FUNC_INIT:
+      PzemAcSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemAcDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_PZEM_DC
+# 32 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
+#define XNRG_06 6
+
+const uint8_t PZEM_DC_DEVICE_ADDRESS = 0x01;
+const uint32_t PZEM_DC_STABILIZE = 30;
+
+#include <TasmotaModbus.h>
+TasmotaModbus *PzemDcModbus;
+
+struct PZEMDC {
+  float energy = 0;
+  float last_energy = 0;
+  uint8_t send_retry = 0;
+  uint8_t channel = 0;
+  uint8_t address = 0;
+  uint8_t address_step = ADDR_IDLE;
+} PzemDc;
+
+void PzemDcEverySecond(void)
+{
+  bool data_ready = PzemDcModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[26];
+
+    uint8_t registers = 8;
+    if (ADDR_RECEIVE == PzemDc.address_step) {
+      registers = 2;
+      PzemDc.address_step--;
+    }
+    uint8_t error = PzemDcModbus->ReceiveBuffer(buffer, registers);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemDcModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PDC: PzemDc %d error %d"), PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, error);
+    } else {
+      Energy.data_valid[PzemDc.channel] = 0;
+      if (8 == registers) {
+
+
+
+
+
+        Energy.voltage[PzemDc.channel] = (float)((buffer[3] << 8) + buffer[4]) / 100.0;
+        Energy.current[PzemDc.channel] = (float)((buffer[5] << 8) + buffer[6]) / 100.0;
+        Energy.active_power[PzemDc.channel] = (float)((buffer[9] << 24) + (buffer[10] << 16) + (buffer[7] << 8) + buffer[8]) / 10.0;
+
+        PzemDc.energy += (float)((buffer[13] << 24) + (buffer[14] << 16) + (buffer[11] << 8) + buffer[12]);
+        if (PzemDc.channel == Energy.phase_count -1) {
+          if (PzemDc.energy > PzemDc.last_energy) {
+            if (uptime > PZEM_DC_STABILIZE) {
+              EnergyUpdateTotal(PzemDc.energy, false);
+            }
+            PzemDc.last_energy = PzemDc.energy;
+          }
+          PzemDc.energy = 0;
+        }
+      }
+    }
+  }
+
+  if (0 == PzemDc.send_retry || data_ready) {
+    if (0 == PzemDc.channel) {
+      PzemDc.channel = Energy.phase_count -1;
+    } else {
+      PzemDc.channel--;
+    }
+    PzemDc.send_retry = ENERGY_WATCHDOG;
+    if (ADDR_SEND == PzemDc.address_step) {
+      PzemDcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemDc.address);
+      PzemDc.address_step--;
+    } else {
+      PzemDcModbus->Send(PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, 0x04, 0, 8);
+    }
+  }
+  else {
+    PzemDc.send_retry--;
+    if ((Energy.phase_count > 1) && (0 == PzemDc.send_retry) && (uptime < PZEM_DC_STABILIZE)) {
+      Energy.phase_count--;
+    }
+  }
+}
+
+void PzemDcSnsInit(void)
+{
+  PzemDcModbus = new TasmotaModbus(pin[GPIO_PZEM017_RX], pin[GPIO_PZEM0XX_TX]);
+  uint8_t result = PzemDcModbus->Begin(9600, 2);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.type_dc = true;
+    Energy.phase_count = 3;
+    PzemDc.channel = 0;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void PzemDcDrvInit(void)
+{
+  if ((pin[GPIO_PZEM017_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
+    energy_flg = XNRG_06;
+  }
+}
+
+bool PzemDcCommand(void)
+{
+  bool serviced = true;
+
+  if (CMND_MODULEADDRESS == Energy.command_code) {
+    PzemDc.address = XdrvMailbox.payload;
+    PzemDc.address_step = ADDR_SEND;
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg06(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { PzemDcEverySecond(); }
+      break;
+    case FUNC_COMMAND:
+      result = PzemDcCommand();
+      break;
+    case FUNC_INIT:
+      PzemDcSnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      PzemDcDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
+#ifdef USE_I2C
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_ADE7953
+# 31 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
+#define XNRG_07 7
+#define XI2C_07 7
+
+#define ADE7953_PREF 1540
+#define ADE7953_UREF 26000
+#define ADE7953_IREF 10000
+
+#define ADE7953_ADDR 0x38
+
+const uint16_t Ade7953Registers[] {
+  0x31B,
+  0x313,
+  0x311,
+  0x315,
+  0x31A,
+  0x312,
+  0x310,
+  0x314,
+  0x31C,
+  0x10E
+};
+
+struct Ade7953 {
+  uint32_t voltage_rms = 0;
+  uint32_t period = 0;
+  uint32_t current_rms[2] = { 0, 0 };
+  uint32_t active_power[2] = { 0, 0 };
+  uint8_t init_step = 0;
+} Ade7953;
+
+int Ade7953RegSize(uint16_t reg)
+{
+  int size = 0;
+  switch ((reg >> 8) & 0x0F) {
+    case 0x03:
+      size++;
+    case 0x02:
+      size++;
+    case 0x01:
+      size++;
+    case 0x00:
+    case 0x07:
+    case 0x08:
+      size++;
+  }
+  return size;
+}
+
+void Ade7953Write(uint16_t reg, uint32_t val)
+{
+  int size = Ade7953RegSize(reg);
+  if (size) {
+    Wire.beginTransmission(ADE7953_ADDR);
+    Wire.write((reg >> 8) & 0xFF);
+    Wire.write(reg & 0xFF);
+    while (size--) {
+      Wire.write((val >> (8 * size)) & 0xFF);
+    }
+    Wire.endTransmission();
+    delayMicroseconds(5);
+  }
+}
+
+int32_t Ade7953Read(uint16_t reg)
+{
+ uint32_t response = 0;
+
+  int size = Ade7953RegSize(reg);
+  if (size) {
+    Wire.beginTransmission(ADE7953_ADDR);
+    Wire.write((reg >> 8) & 0xFF);
+    Wire.write(reg & 0xFF);
+    Wire.endTransmission(0);
+    Wire.requestFrom(ADE7953_ADDR, size);
+    if (size <= Wire.available()) {
+      for (uint32_t i = 0; i < size; i++) {
+        response = response << 8 | Wire.read();
+      }
+    }
+  }
+ return response;
+}
+
+void Ade7953Init(void)
+{
+  Ade7953Write(0x102, 0x0004);
+  Ade7953Write(0x0FE, 0x00AD);
+  Ade7953Write(0x120, 0x0030);
+}
+
+void Ade7953GetData(void)
+{
+  int32_t reg[2][4];
+  for (uint32_t i = 0; i < sizeof(Ade7953Registers)/sizeof(uint16_t); i++) {
+    int32_t value = Ade7953Read(Ade7953Registers[i]);
+    if (8 == i) {
+      Ade7953.voltage_rms = value;
+    } else if (9 == i) {
+      Ade7953.period = value;
+    } else {
+      reg[i >> 2][i &3] = value;
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: %d, %d, [%d, %d, %d, %d], [%d, %d, %d, %d]"),
+    Ade7953.voltage_rms, Ade7953.period,
+    reg[0][0], reg[0][1], reg[0][2], reg[0][3],
+    reg[1][0], reg[1][1], reg[1][2], reg[1][3]);
+
+  uint32_t apparent_power[2] = { 0, 0 };
+  uint32_t reactive_power[2] = { 0, 0 };
+
+  for (uint32_t channel = 0; channel < 2; channel++) {
+    Ade7953.current_rms[channel] = reg[channel][0];
+    if (Ade7953.current_rms[channel] < 2000) {
+      Ade7953.current_rms[channel] = 0;
+      Ade7953.active_power[channel] = 0;
+    } else {
+      Ade7953.active_power[channel] = abs(reg[channel][1]);
+      apparent_power[channel] = abs(reg[channel][2]);
+      reactive_power[channel] = abs(reg[channel][3]);
+    }
+  }
+
+  uint32_t current_rms_sum = Ade7953.current_rms[0] + Ade7953.current_rms[1];
+  uint32_t active_power_sum = Ade7953.active_power[0] + Ade7953.active_power[1];
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ADE: U %d, C %d, I %d + %d = %d, P %d + %d = %d"),
+    Ade7953.voltage_rms, Ade7953.period,
+    Ade7953.current_rms[0], Ade7953.current_rms[1], current_rms_sum,
+    Ade7953.active_power[0], Ade7953.active_power[1], active_power_sum);
+
+  if (Energy.power_on) {
+    Energy.voltage[0] = (float)Ade7953.voltage_rms / Settings.energy_voltage_calibration;
+    Energy.frequency[0] = 223750.0f / ( (float)Ade7953.period + 1);
+
+    for (uint32_t channel = 0; channel < 2; channel++) {
+      Energy.data_valid[channel] = 0;
+      Energy.active_power[channel] = (float)Ade7953.active_power[channel] / (Settings.energy_power_calibration / 10);
+      Energy.reactive_power[channel] = (float)reactive_power[channel] / (Settings.energy_power_calibration / 10);
+      Energy.apparent_power[channel] = (float)apparent_power[channel] / (Settings.energy_power_calibration / 10);
+      if (0 == Energy.active_power[channel]) {
+        Energy.current[channel] = 0;
+      } else {
+        Energy.current[channel] = (float)Ade7953.current_rms[channel] / (Settings.energy_current_calibration * 10);
+      }
+    }
+  } else {
+    Energy.data_valid[0] = ENERGY_WATCHDOG;
+    Energy.data_valid[1] = ENERGY_WATCHDOG;
+  }
+
+  if (active_power_sum) {
+    Energy.kWhtoday_delta += ((active_power_sum * (100000 / (Settings.energy_power_calibration / 10))) / 3600);
+    EnergyUpdateToday();
+  }
+}
+
+void Ade7953EnergyEverySecond(void)
+{
+ if (Ade7953.init_step) {
+    if (1 == Ade7953.init_step) {
+      Ade7953Init();
+   }
+    Ade7953.init_step--;
+ } else {
+  Ade7953GetData();
+ }
+}
+
+void Ade7953DrvInit(void)
+{
+  if (pin[GPIO_ADE7953_IRQ] < 99) {
+    delay(100);
+    if (I2cSetDevice(ADE7953_ADDR)) {
+      if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
+        Settings.energy_power_calibration = ADE7953_PREF;
+        Settings.energy_voltage_calibration = ADE7953_UREF;
+        Settings.energy_current_calibration = ADE7953_IREF;
+      }
+      I2cSetActiveFound(ADE7953_ADDR, "ADE7953");
+      Ade7953.init_step = 2;
+
+      Energy.phase_count = 2;
+      Energy.voltage_common = true;
+
+      energy_flg = XNRG_07;
+    }
+  }
+}
+
+bool Ade7953Command(void)
+{
+  bool serviced = true;
+
+  uint32_t channel = (2 == XdrvMailbox.index) ? 1 : 0;
+  uint32_t value = (uint32_t)(CharToFloat(XdrvMailbox.data) * 100);
+
+  if (CMND_POWERCAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_PREF; }
+
+  }
+  else if (CMND_VOLTAGECAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_UREF; }
+
+  }
+  else if (CMND_CURRENTCAL == Energy.command_code) {
+    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_IREF; }
+
+  }
+  else if (CMND_POWERSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.active_power[channel]) {
+      if ((value > 100) && (value < 200000)) {
+        Settings.energy_power_calibration = (Ade7953.active_power[channel] * 1000) / value;
+      }
+    }
+  }
+  else if (CMND_VOLTAGESET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.voltage_rms) {
+      if ((value > 10000) && (value < 26000)) {
+        Settings.energy_voltage_calibration = (Ade7953.voltage_rms * 100) / value;
+      }
+    }
+  }
+  else if (CMND_CURRENTSET == Energy.command_code) {
+    if (XdrvMailbox.data_len && Ade7953.current_rms[channel]) {
+      if ((value > 2000) && (value < 1000000)) {
+        Settings.energy_current_calibration = ((Ade7953.current_rms[channel] * 100) / value) * 100;
+      }
+    }
+  }
+  else serviced = false;
+
+  return serviced;
+}
+
+
+
+
+
+bool Xnrg07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_07)) { return false; }
+
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      Ade7953EnergyEverySecond();
+      break;
+    case FUNC_COMMAND:
+      result = Ade7953Command();
+      break;
+    case FUNC_PRE_INIT:
+      Ade7953DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_08_sdm120.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_08_sdm120.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SDM120
+
+
+
+
+
+
+#define XNRG_08 8
+
+
+#ifndef SDM120_SPEED
+  #define SDM120_SPEED 2400
+#endif
+
+#ifndef SDM120_ADDR
+  #define SDM120_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Sdm120Modbus;
+
+const uint8_t sdm120_table = 8;
+const uint8_t sdm220_table = 13;
+
+const uint16_t sdm120_start_addresses[] {
+  0x0000,
+  0x0006,
+  0x000C,
+  0x0012,
+  0x0018,
+  0x001E,
+  0x0046,
+  0x0156,
+
+  0X0048,
+  0X004A,
+  0X004C,
+  0X004E,
+  0X0024
+};
+
+struct SDM120 {
+  float total_active = 0;
+  float import_active = NAN;
+  float import_reactive = 0;
+  float export_reactive = 0;
+  float phase_angle = 0;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+  uint8_t start_address_count = sdm220_table;
+} Sdm120;
+
+
+
+void SDM120Every250ms(void)
+{
+  bool data_ready = Sdm120Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Sdm120Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm120Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM120 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Sdm120.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.current[0] = value;
+          break;
+
+        case 2:
+          Energy.active_power[0] = value;
+          break;
+
+        case 3:
+          Energy.apparent_power[0] = value;
+          break;
+
+        case 4:
+          Energy.reactive_power[0] = value;
+          break;
+
+        case 5:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 6:
+          Energy.frequency[0] = value;
+          break;
+
+        case 7:
+          Sdm120.total_active = value;
+          break;
+
+        case 8:
+          Sdm120.import_active = value;
+          break;
+
+        case 9:
+          Energy.export_active = value;
+          break;
+
+        case 10:
+          Sdm120.import_reactive = value;
+          break;
+
+        case 11:
+          Sdm120.export_reactive = value;
+          break;
+
+        case 12:
+          Sdm120.phase_angle = value;
+          break;
+      }
+
+      Sdm120.read_state++;
+      if (Sdm120.read_state == Sdm120.start_address_count) {
+        Sdm120.read_state = 0;
+
+        if (Sdm120.start_address_count > sdm120_table) {
+          if (!isnan(Sdm120.import_active)) {
+            Sdm120.total_active = Sdm120.import_active;
+          } else {
+            Sdm120.start_address_count = sdm120_table;
+          }
+        }
+        EnergyUpdateTotal(Sdm120.total_active, true);
+      }
+    }
+  }
+
+  if (0 == Sdm120.send_retry || data_ready) {
+    Sdm120.send_retry = 5;
+    Sdm120Modbus->Send(SDM120_ADDR, 0x04, sdm120_start_addresses[Sdm120.read_state], 2);
+  } else {
+    Sdm120.send_retry--;
+  }
+}
+
+void Sdm120SnsInit(void)
+{
+  Sdm120Modbus = new TasmotaModbus(pin[GPIO_SDM120_RX], pin[GPIO_SDM120_TX]);
+  uint8_t result = Sdm120Modbus->Begin(SDM120_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Sdm120DrvInit(void)
+{
+  if ((pin[GPIO_SDM120_RX] < 99) && (pin[GPIO_SDM120_TX] < 99)) {
+    energy_flg = XNRG_08;
+  }
+}
+
+void Sdm220Reset(void)
+{
+  if (isnan(Sdm120.import_active)) { return; }
+
+  Sdm120.import_active = 0;
+  Sdm120.import_reactive = 0;
+  Sdm120.export_reactive = 0;
+  Sdm120.phase_angle = 0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_SDM220[] PROGMEM =
+  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  "{s}" D_EXPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  "{s}" D_PHASE_ANGLE "{m}%s " D_UNIT_ANGLE "{e}";
+#endif
+
+void Sdm220Show(bool json)
+{
+  if (isnan(Sdm120.import_active)) { return; }
+
+  char import_active_chr[FLOATSZ];
+  dtostrfd(Sdm120.import_active, Settings.flag2.energy_resolution, import_active_chr);
+  char import_reactive_chr[FLOATSZ];
+  dtostrfd(Sdm120.import_reactive, Settings.flag2.energy_resolution, import_reactive_chr);
+  char export_reactive_chr[FLOATSZ];
+  dtostrfd(Sdm120.export_reactive, Settings.flag2.energy_resolution, export_reactive_chr);
+  char phase_angle_chr[FLOATSZ];
+  dtostrfd(Sdm120.phase_angle, 2, phase_angle_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_ACTIVE "\":%s,\"" D_JSON_IMPORT_REACTIVE "\":%s,\"" D_JSON_EXPORT_REACTIVE "\":%s,\"" D_JSON_PHASE_ANGLE "\":%s"),
+      import_active_chr, import_reactive_chr, export_reactive_chr, phase_angle_chr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_ENERGY_SDM220, import_reactive_chr, export_reactive_chr, phase_angle_chr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg08(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { SDM120Every250ms(); }
+      break;
+    case FUNC_JSON_APPEND:
+      Sdm220Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Sdm220Show(0);
+      break;
+#endif
+    case FUNC_ENERGY_RESET:
+      Sdm220Reset();
+      break;
+    case FUNC_INIT:
+      Sdm120SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Sdm120DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_DDS2382
+
+
+
+
+
+
+#define XNRG_09 9
+
+#ifndef DDS2382_SPEED
+#define DDS2382_SPEED 9600
+#endif
+#ifndef DDS2382_ADDR
+#define DDS2382_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Dds2382Modbus;
+
+uint8_t Dds2382_send_retry = 0;
+
+void Dds2382EverySecond(void)
+{
+  bool data_ready = Dds2382Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[46];
+
+    uint32_t error = Dds2382Modbus->ReceiveBuffer(buffer, 18);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Dds2382Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "DDS2382 response error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+# 67 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
+      Energy.voltage[0] = (float)((buffer[27] << 8) + buffer[28]) / 10.0;
+      Energy.current[0] = (float)((buffer[29] << 8) + buffer[30]) / 100.0;
+      Energy.active_power[0] = (float)((buffer[31] << 8) + buffer[32]);
+      Energy.reactive_power[0] = (float)((buffer[33] << 8) + buffer[34]);
+      Energy.power_factor[0] = (float)((buffer[35] << 8) + buffer[36]) / 1000.0;
+      Energy.frequency[0] = (float)((buffer[37] << 8) + buffer[38]) / 100.0;
+      uint8_t offset = 11;
+      if (Settings.flag3.dds2382_model) {
+        offset = 19;
+      }
+      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;
+      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;
+
+      EnergyUpdateTotal(import_active, true);
+    }
+  }
+
+  if (0 == Dds2382_send_retry || data_ready) {
+    Dds2382_send_retry = 5;
+    Dds2382Modbus->Send(DDS2382_ADDR, 0x03, 0, 18);
+  } else {
+    Dds2382_send_retry--;
+  }
+}
+
+void Dds2382SnsInit(void)
+{
+  Dds2382Modbus = new TasmotaModbus(pin[GPIO_DDS2382_RX], pin[GPIO_DDS2382_TX]);
+  uint8_t result = Dds2382Modbus->Begin(DDS2382_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Dds2382DrvInit(void)
+{
+  if ((pin[GPIO_DDS2382_RX] < 99) && (pin[GPIO_DDS2382_TX] < 99)) {
+    energy_flg = XNRG_09;
+  }
+}
+
+
+
+
+
+bool Xnrg09(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_ENERGY_EVERY_SECOND:
+      if (uptime > 4) { Dds2382EverySecond(); }
+      break;
+    case FUNC_INIT:
+      Dds2382SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Dds2382DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_10_sdm630.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_10_sdm630.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SDM630
+
+
+
+
+
+
+#define XNRG_10 10
+
+
+#ifndef SDM630_SPEED
+  #define SDM630_SPEED 9600
+#endif
+
+#ifndef SDM630_ADDR
+  #define SDM630_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Sdm630Modbus;
+
+const uint16_t sdm630_start_addresses[] {
+  0x0000,
+  0x0002,
+  0x0004,
+  0x0006,
+  0x0008,
+  0x000A,
+  0x000C,
+  0x000E,
+  0x0010,
+  0x0018,
+  0x001A,
+  0x001C,
+  0x001E,
+  0x0020,
+  0x0022,
+  0x0156
+};
+
+struct SDM630 {
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+} Sdm630;
+
+
+
+void SDM630Every250ms(void)
+{
+  bool data_ready = Sdm630Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Sdm630Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm630Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM630 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+      Energy.data_valid[1] = 0;
+      Energy.data_valid[2] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Sdm630.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.voltage[1] = value;
+          break;
+
+        case 2:
+          Energy.voltage[2] = value;
+          break;
+
+        case 3:
+          Energy.current[0] = value;
+          break;
+
+        case 4:
+          Energy.current[1] = value;
+          break;
+
+        case 5:
+          Energy.current[2] = value;
+          break;
+
+        case 6:
+          Energy.active_power[0] = value;
+          break;
+
+        case 7:
+          Energy.active_power[1] = value;
+          break;
+
+        case 8:
+          Energy.active_power[2] = value;
+          break;
+
+        case 9:
+          Energy.reactive_power[0] = value;
+          break;
+
+        case 10:
+          Energy.reactive_power[1] = value;
+          break;
+
+        case 11:
+          Energy.reactive_power[2] = value;
+          break;
+
+        case 12:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 13:
+          Energy.power_factor[1] = value;
+          break;
+
+        case 14:
+          Energy.power_factor[2] = value;
+          break;
+
+        case 15:
+          EnergyUpdateTotal(value, true);
+          break;
+      }
+
+      Sdm630.read_state++;
+      if (sizeof(sdm630_start_addresses)/2 == Sdm630.read_state) {
+        Sdm630.read_state = 0;
+      }
+    }
+  }
+
+  if (0 == Sdm630.send_retry || data_ready) {
+    Sdm630.send_retry = 5;
+    Sdm630Modbus->Send(SDM630_ADDR, 0x04, sdm630_start_addresses[Sdm630.read_state], 2);
+  } else {
+    Sdm630.send_retry--;
+  }
+}
+
+void Sdm630SnsInit(void)
+{
+  Sdm630Modbus = new TasmotaModbus(pin[GPIO_SDM630_RX], pin[GPIO_SDM630_TX]);
+  uint8_t result = Sdm630Modbus->Begin(SDM630_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+    Energy.phase_count = 3;
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Sdm630DrvInit(void)
+{
+  if ((pin[GPIO_SDM630_RX] < 99) && (pin[GPIO_SDM630_TX] < 99)) {
+    energy_flg = XNRG_10;
+  }
+}
+
+
+
+
+
+bool Xnrg10(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { SDM630Every250ms(); }
+      break;
+    case FUNC_INIT:
+      Sdm630SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Sdm630DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_11_ddsu666.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_11_ddsu666.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_DDSU666
+
+
+
+
+#define XNRG_11 11
+
+
+#ifndef DDSU666_SPEED
+  #define DDSU666_SPEED 9600
+#endif
+
+#ifndef DDSU666_ADDR
+  #define DDSU666_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *Ddsu666Modbus;
+
+const uint16_t Ddsu666_start_addresses[] {
+  0x2000,
+  0x2002,
+  0x2004,
+  0x2006,
+  0x200A,
+  0x200E,
+  0X4000,
+  0X400A,
+};
+
+struct DDSU666 {
+  float import_active = NAN;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+} Ddsu666;
+
+
+
+void DDSU666Every250ms(void)
+{
+  bool data_ready = Ddsu666Modbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+
+    uint32_t error = Ddsu666Modbus->ReceiveBuffer(buffer, 2);
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Ddsu666Modbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: Ddsu666 error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+
+
+
+
+      float value;
+      ((uint8_t*)&value)[3] = buffer[3];
+      ((uint8_t*)&value)[2] = buffer[4];
+      ((uint8_t*)&value)[1] = buffer[5];
+      ((uint8_t*)&value)[0] = buffer[6];
+
+      switch(Ddsu666.read_state) {
+        case 0:
+          Energy.voltage[0] = value;
+          break;
+
+        case 1:
+          Energy.current[0] = value;
+          break;
+
+        case 2:
+          Energy.active_power[0] = value * 1000;
+          break;
+
+        case 3:
+          Energy.reactive_power[0] = value * 1000;
+          break;
+
+        case 4:
+          Energy.power_factor[0] = value;
+          break;
+
+        case 5:
+          Energy.frequency[0] = value;
+          break;
+
+        case 6:
+          Ddsu666.import_active = value;
+          break;
+
+        case 7:
+          Energy.export_active = value;
+          break;
+      }
+
+      Ddsu666.read_state++;
+
+      if (Ddsu666.read_state == 8) {
+        Ddsu666.read_state = 0;
+        EnergyUpdateTotal(Ddsu666.import_active, true);
+      }
+    }
+  }
+
+  if (0 == Ddsu666.send_retry || data_ready) {
+    Ddsu666.send_retry = 5;
+    Ddsu666Modbus->Send(DDSU666_ADDR, 0x04, Ddsu666_start_addresses[Ddsu666.read_state], 2);
+  } else {
+    Ddsu666.send_retry--;
+  }
+}
+
+void Ddsu666SnsInit(void)
+{
+  Ddsu666Modbus = new TasmotaModbus(pin[GPIO_DDSU666_RX], pin[GPIO_DDSU666_TX]);
+  uint8_t result = Ddsu666Modbus->Begin(DDSU666_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void Ddsu666DrvInit(void)
+{
+  if ((pin[GPIO_DDSU666_RX] < 99) && (pin[GPIO_DDSU666_TX] < 99)) {
+    energy_flg = XNRG_11;
+  }
+}
+
+
+
+
+
+bool Xnrg11(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { DDSU666Every250ms(); }
+      break;
+    case FUNC_INIT:
+      Ddsu666SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      Ddsu666DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_12_solaxX1.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_12_solaxX1.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_SOLAX_X1
+
+
+
+
+#define XNRG_12 12
+
+#ifndef SOLAXX1_SPEED
+#define SOLAXX1_SPEED 9600
+#endif
+
+#define INVERTER_ADDRESS 0x0A
+
+#define D_SOLAX_X1 "SolaxX1"
+
+#include <TasmotaSerial.h>
+
+enum solaxX1_Error
+{
+  solaxX1_ERR_NO_ERROR,
+  solaxX1_ERR_CRC_ERROR
+};
+
+union {
+  uint32_t ErrMessage;
+  struct {
+
+    uint8_t TzProtectFault:1;
+    uint8_t MainsLostFault:1;
+    uint8_t GridVoltFault:1;
+    uint8_t GridFreqFault:1;
+    uint8_t PLLLostFault:1;
+    uint8_t BusVoltFault:1;
+    uint8_t ErrBit06:1;
+    uint8_t OciFault:1;
+
+    uint8_t Dci_OCP_Fault:1;
+    uint8_t ResidualCurrentFault:1;
+    uint8_t PvVoltFault:1;
+    uint8_t Ac10Mins_Voltage_Fault:1;
+    uint8_t IsolationFault:1;
+    uint8_t TemperatureOverFault:1;
+    uint8_t FanFault:1;
+    uint8_t ErrBit15:1;
+
+    uint8_t SpiCommsFault:1;
+    uint8_t SciCommsFault:1;
+    uint8_t ErrBit18:1;
+    uint8_t InputConfigFault:1;
+    uint8_t EepromFault:1;
+    uint8_t RelayFault:1;
+    uint8_t SampleConsistenceFault:1;
+    uint8_t ResidualCurrent_DeviceFault:1;
+
+    uint8_t ErrBit24:1;
+    uint8_t ErrBit25:1;
+    uint8_t ErrBit26:1;
+    uint8_t ErrBit27:1;
+    uint8_t ErrBit28:1;
+    uint8_t DCI_DeviceFault:1;
+    uint8_t OtherDeviceFault:1;
+    uint8_t ErrBit31:1;
+  };
+} ErrCode;
+
+const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE;
+
+const char kSolaxError[] PROGMEM =
+  D_SOLAX_ERROR_0 "|" D_SOLAX_ERROR_1 "|" D_SOLAX_ERROR_2 "|" D_SOLAX_ERROR_3 "|" D_SOLAX_ERROR_4 "|" D_SOLAX_ERROR_5 "|"
+  D_SOLAX_ERROR_6 "|" D_SOLAX_ERROR_7 "|" D_SOLAX_ERROR_8;
+
+
+
+TasmotaSerial *solaxX1Serial;
+
+uint8_t solaxX1_Init = 1;
+
+struct SOLAXX1 {
+  float temperature = 0;
+  float energy_today = 0;
+  float dc1_voltage = 0;
+  float dc2_voltage = 0;
+  float dc1_current = 0;
+  float dc2_current = 0;
+  float energy_total = 0;
+  float runtime_total = 0;
+  float dc1_power = 0;
+  float dc2_power = 0;
+
+  uint8_t status = 0;
+  uint32_t errorCode = 0;
+} solaxX1;
+
+union {
+  uint8_t status;
+  struct {
+    uint8_t freeBit7:1;
+    uint8_t freeBit6:1;
+    uint8_t freeBit5:1;
+    uint8_t queryOffline:1;
+    uint8_t queryOfflineSend:1;
+    uint8_t hasAddress:1;
+    uint8_t inverterAddressSend:1;
+    uint8_t inverterSnReceived:1;
+  };
+} protocolStatus;
+
+uint8_t header[2] = {0xAA, 0x55};
+uint8_t source[2] = {0x00, 0x00};
+uint8_t destination[2] = {0x00, 0x00};
+uint8_t controlCode[1] = {0x00};
+uint8_t functionCode[1] = {0x00};
+uint8_t dataLength[1] = {0x00};
+uint8_t data[16] = {0};
+
+uint8_t message[30];
+
+
+
+bool solaxX1_RS485ReceiveReady(void)
+{
+  return (solaxX1Serial->available() > 1);
+}
+
+void solaxX1_RS485Send(uint16_t msgLen)
+{
+  memcpy(message, header, 2);
+  memcpy(message + 2, source, 2);
+  memcpy(message + 4, destination, 2);
+  memcpy(message + 6, controlCode, 1);
+  memcpy(message + 7, functionCode, 1);
+  memcpy(message + 8, dataLength, 1);
+  memcpy(message + 9, data, sizeof(data));
+  uint16_t crc = solaxX1_calculateCRC(message, msgLen);
+
+  while (solaxX1Serial->available() > 0)
+  {
+    solaxX1Serial->read();
+  }
+
+  solaxX1Serial->flush();
+  solaxX1Serial->write(message, msgLen);
+  solaxX1Serial->write(highByte(crc));
+  solaxX1Serial->write(lowByte(crc));
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, message, msgLen);
+}
+
+uint8_t solaxX1_RS485Receive(uint8_t *value)
+{
+  uint8_t len = 0;
+
+  while (solaxX1Serial->available() > 0)
+  {
+    value[len++] = (uint8_t)solaxX1Serial->read();
+  }
+
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, value, len);
+
+  uint16_t crc = solaxX1_calculateCRC(value, len - 2);
+
+  if (value[len - 1] == lowByte(crc) && value[len - 2] == highByte(crc))
+  {
+    return solaxX1_ERR_NO_ERROR;
+  }
+  else
+  {
+    return solaxX1_ERR_CRC_ERROR;
+  }
+}
+
+uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen)
+{
+  uint8_t i;
+  uint16_t wChkSum;
+  wChkSum = 0;
+
+  for (i = 0; i < bLen; i++)
+  {
+    wChkSum = wChkSum + bExternTxPackage[i];
+  }
+  return wChkSum;
+}
+
+void solaxX1_SendInverterAddress(void)
+{
+  source[0] = 0x00;
+  destination[0] = 0x00;
+  destination[1] = 0x00;
+  controlCode[0] = 0x10;
+  functionCode[0] = 0x01;
+  dataLength[0] = 0x0F;
+  data[14] = INVERTER_ADDRESS;
+  solaxX1_RS485Send(24);
+}
+
+void solaxX1_QueryLiveData(void)
+{
+  source[0] = 0x01;
+  destination[0] = 0x00;
+  destination[1] = INVERTER_ADDRESS;
+  controlCode[0] = 0x11;
+  functionCode[0] = 0x02;
+  dataLength[0] = 0x00;
+  solaxX1_RS485Send(9);
+}
+
+uint8_t solaxX1_ParseErrorCode(uint32_t code){
+  ErrCode.ErrMessage = code;
+
+  if (code == 0) return 0;
+  if (ErrCode.MainsLostFault) return 1;
+  if (ErrCode.GridVoltFault) return 2;
+  if (ErrCode.GridFreqFault) return 3;
+  if (ErrCode.PvVoltFault) return 4;
+  if (ErrCode.IsolationFault) return 5;
+  if (ErrCode.TemperatureOverFault) return 6;
+  if (ErrCode.FanFault) return 7;
+  if (ErrCode.OtherDeviceFault) return 8;
+}
+
+
+
+uint8_t solaxX1_send_retry = 0;
+uint8_t solaxX1_nodata_count = 0;
+
+void solaxX1250MSecond(void)
+{
+  uint8_t value[61] = {0};
+  bool data_ready = solaxX1_RS485ReceiveReady();
+
+  if (protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
+  {
+    if (data_ready)
+    {
+      uint8_t error = solaxX1_RS485Receive(value);
+      if (error)
+      {
+        DEBUG_SENSOR_LOG(PSTR("SX1: Data response CRC error"));
+      }
+      else
+      {
+        solaxX1_nodata_count = 0;
+        solaxX1_send_retry = 12;
+        Energy.data_valid[0] = 0;
+
+        solaxX1.temperature = (float)((value[9] << 8) | value[10]);
+        solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f;
+        solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f;
+        solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f;
+        solaxX1.dc1_current = (float)((value[17] << 8) | value[18]) * 0.1f;
+        solaxX1.dc2_current = (float)((value[19] << 8) | value[20]) * 0.1f;
+        Energy.current[0] = (float)((value[21] << 8) | value[22]) * 0.1f;
+        Energy.voltage[0] = (float)((value[23] << 8) | value[24]) * 0.1f;
+        Energy.frequency[0] = (float)((value[25] << 8) | value[26]) * 0.01f;
+        Energy.active_power[0] = (float)((value[27] << 8) | value[28]);
+
+        solaxX1.energy_total = (float)((value[31] << 8) | (value[32] << 8) | (value[33] << 8) | value[34]) * 0.1f;
+        solaxX1.runtime_total = (float)((value[35] << 8) | (value[36] << 8) | (value[37] << 8) | value[38]);
+        solaxX1.status = (uint8_t)((value[39] << 8) | value[40]);
+
+
+
+
+
+
+
+        solaxX1.errorCode = (uint32_t)((value[58] << 8) | (value[57] << 8) | (value[56] << 8) | value[55]);
+
+        solaxX1.dc1_power = solaxX1.dc1_voltage * solaxX1.dc1_current;
+        solaxX1.dc2_power = solaxX1.dc2_voltage * solaxX1.dc2_current;
+
+        solaxX1_QueryLiveData();
+        EnergyUpdateTotal(solaxX1.energy_total, true);
+      }
+    }
+
+    if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) {
+      solaxX1_send_retry = 12;
+      solaxX1_QueryLiveData();
+    }
+
+
+
+    if (255 == solaxX1_nodata_count) {
+      solaxX1_nodata_count = 0;
+      solaxX1_send_retry = 12;
+    }
+  }
+  else
+  {
+    if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); }
+    if (solaxX1_nodata_count < 10 * 4)
+    {
+      solaxX1_nodata_count++;
+    }
+    else if (255 != solaxX1_nodata_count)
+    {
+
+      solaxX1_nodata_count = 255;
+      solaxX1_send_retry = 12;
+      protocolStatus.status = 0b00001000;
+      Energy.data_valid[0] = ENERGY_WATCHDOG;
+
+      solaxX1.temperature = solaxX1.dc1_voltage = solaxX1.dc2_voltage = solaxX1.dc1_current = solaxX1.dc2_current = solaxX1.dc1_power = 0;
+      solaxX1.dc2_power = solaxX1.status = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0;
+
+    }
+  }
+
+  if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
+  {
+    if (data_ready)
+    {
+
+      if (protocolStatus.inverterAddressSend)
+      {
+        uint8_t error = solaxX1_RS485Receive(value);
+        if (error)
+        {
+          DEBUG_SENSOR_LOG(PSTR("SX1: Address confirmation response CRC error"));
+        }
+        else
+        {
+          if (value[6] == 0x10 && value[7] == 0x81 && value[9] == 0x06)
+          {
+            DEBUG_SENSOR_LOG(PSTR("SX1: Set hasAddress"));
+            protocolStatus.status = 0b00100000;
+          }
+        }
+      }
+
+
+      if (protocolStatus.queryOfflineSend)
+      {
+        uint8_t error = solaxX1_RS485Receive(value);
+        if (error)
+        {
+          DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline response CRC error"));
+        }
+        else
+        {
+
+          if (value[6] == 0x10 && value[7] == 0x80 && protocolStatus.inverterSnReceived == false)
+          {
+            for (uint8_t i = 9; i <= 22; i++)
+            {
+              data[i - 9] = value[i];
+            }
+            solaxX1_SendInverterAddress();
+            protocolStatus.status = 0b1100000;
+            DEBUG_SENSOR_LOG(PSTR("SX1: Set inverterSnReceived and inverterAddressSend"));
+          }
+        }
+      }
+    }
+
+    if (solaxX1_send_retry == 0)
+    {
+      if (protocolStatus.queryOfflineSend)
+      {
+        protocolStatus.status = 0b00001000;
+        DEBUG_SENSOR_LOG(PSTR("SX1: Set Query Offline"));
+      }
+      solaxX1_send_retry = 12;
+    }
+
+
+    if (protocolStatus.queryOffline)
+    {
+
+      source[0] = 0x01;
+      destination[1] = 0x00;
+      controlCode[0] = 0x10;
+      functionCode[0] = 0x00;
+      dataLength[0] = 0x00;
+      solaxX1_RS485Send(9);
+      protocolStatus.status = 0b00010000;
+      DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline Send"));
+    }
+  }
+
+  if (!data_ready)
+    solaxX1_send_retry--;
+}
+
+void solaxX1SnsInit(void)
+{
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init"));
+  DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]);
+  protocolStatus.status = 0b00100000;
+
+  solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1);
+  if (solaxX1Serial->begin(SOLAXX1_SPEED)) {
+    if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void solaxX1DrvInit(void)
+{
+  if ((pin[GPIO_SOLAXX1_RX] < 99) && (pin[GPIO_SOLAXX1_TX] < 99)) {
+    energy_flg = XNRG_12;
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_solaxX1_DATA1[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_SOLAR_POWER "{m}%s " D_UNIT_WATT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV1_POWER "{m}%s " D_UNIT_WATT "{e}";
+#ifdef SOLAXX1_PV2
+const char HTTP_SNS_solaxX1_DATA2[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_PV2_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV2_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+    "{s}" D_SOLAX_X1 " " D_PV2_POWER "{m}%s " D_UNIT_WATT "{e}";
+#endif
+const char HTTP_SNS_solaxX1_DATA3[] PROGMEM =
+    "{s}" D_SOLAX_X1 " " D_UPTIME "{m}%s " D_UNIT_HOUR "{e}"
+    "{s}" D_SOLAX_X1 " " D_STATUS "{m}%s"
+    "{s}" D_SOLAX_X1 " " D_ERROR "{m}%s";
+#endif
+
+void solaxX1Show(bool json)
+{
+  char solar_power[33];
+  dtostrfd(solaxX1.dc1_power + solaxX1.dc2_power, Settings.flag2.wattage_resolution, solar_power);
+  char pv1_voltage[33];
+  dtostrfd(solaxX1.dc1_voltage, Settings.flag2.voltage_resolution, pv1_voltage);
+  char pv1_current[33];
+  dtostrfd(solaxX1.dc1_current, Settings.flag2.current_resolution, pv1_current);
+  char pv1_power[33];
+  dtostrfd(solaxX1.dc1_power, Settings.flag2.wattage_resolution, pv1_power);
+#ifdef SOLAXX1_PV2
+  char pv2_voltage[33];
+  dtostrfd(solaxX1.dc2_voltage, Settings.flag2.voltage_resolution, pv2_voltage);
+  char pv2_current[33];
+  dtostrfd(solaxX1.dc2_current, Settings.flag2.current_resolution, pv2_current);
+  char pv2_power[33];
+  dtostrfd(solaxX1.dc2_power, Settings.flag2.wattage_resolution, pv2_power);
+#endif
+  char temperature[33];
+  dtostrfd(solaxX1.temperature, Settings.flag2.temperature_resolution, temperature);
+  char runtime[33];
+  dtostrfd(solaxX1.runtime_total, 0, runtime);
+  char status[33];
+  GetTextIndexed(status, sizeof(status), solaxX1.status, kSolaxMode);
+
+  if (json)
+  {
+    ResponseAppend_P(PSTR(",\"" D_JSON_SOLAR_POWER "\":%s,\"" D_JSON_PV1_VOLTAGE "\":%s,\"" D_JSON_PV1_CURRENT "\":%s,\"" D_JSON_PV1_POWER "\":%s"),
+                                solar_power, pv1_voltage, pv1_current, pv1_power);
+#ifdef SOLAXX1_PV2
+    ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"),
+                                pv2_voltage, pv2_current, pv2_power);
+#endif
+    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"),
+                                temperature, runtime, status, solaxX1.errorCode);
+
+#ifdef USE_WEBSERVER
+  }
+  else
+  {
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA1, solar_power, pv1_voltage, pv1_current, pv1_power);
+#ifdef SOLAXX1_PV2
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA2, pv2_voltage, pv2_current, pv2_power);
+#endif
+    WSContentSend_PD(HTTP_SNS_TEMP, D_SOLAX_X1, temperature, TempUnit());
+    char errorCodeString[33];
+    WSContentSend_PD(HTTP_SNS_solaxX1_DATA3, runtime, status,
+      GetTextIndexed(errorCodeString, sizeof(errorCodeString), solaxX1_ParseErrorCode(solaxX1.errorCode), kSolaxError));
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg12(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) { solaxX1250MSecond(); }
+      break;
+    case FUNC_JSON_APPEND:
+      solaxX1Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      solaxX1Show(0);
+      break;
+#endif
+    case FUNC_INIT:
+      solaxX1SnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      solaxX1DrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+#ifdef USE_ENERGY_SENSOR
+#ifdef USE_LE01MR
+# 71 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+#define XNRG_13 13
+
+
+#ifndef LE01MR_SPEED
+  #define LE01MR_SPEED 2400
+#endif
+
+#ifndef LE01MR_ADDR
+  #define LE01MR_ADDR 1
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *FifLEModbus;
+
+const uint8_t le01mr_table_sz = 9;
+
+const uint16_t le01mr_register_addresses[] {
+
+  0x0130,
+  0x0131,
+  0x0158,
+  0x0139,
+  0x0140,
+  0x0148,
+  0x0150,
+  0xA000,
+  0xA01E
+};
+
+struct LE01MR {
+  float total_active = 0;
+  float total_reactive = 0;
+  uint8_t read_state = 0;
+  uint8_t send_retry = 0;
+  uint8_t start_address_count = le01mr_table_sz;
+} Le01mr;
+
+
+
+void FifLEEvery250ms(void)
+{
+  bool data_ready = FifLEModbus->ReceiveReady();
+
+  if (data_ready) {
+    uint8_t buffer[14];
+    uint8_t reg_count = 2;
+    if (Le01mr.read_state < 3) {
+      reg_count=1;
+    }
+
+    uint32_t error = FifLEModbus->ReceiveBuffer(buffer, reg_count);
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, FifLEModbus->ReceiveCount());
+
+    if (error) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
+    } else {
+      Energy.data_valid[0] = 0;
+# 146 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
+      uint32_t value_buff = 0;
+
+      if (Le01mr.read_state >= 0 && Le01mr.read_state < 3) {
+        value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
+      } else {
+        value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
+      }
+
+      switch(Le01mr.read_state) {
+        case 0:
+          Energy.frequency[0] = value_buff * 0.01f;
+          break;
+
+        case 1:
+          Energy.voltage[0] = value_buff * 0.01f;
+          break;
+
+        case 2:
+          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f;
+          break;
+
+        case 3:
+          Energy.current[0] = value_buff * 0.001f;
+          break;
+
+        case 4:
+          Energy.active_power[0] = value_buff * 1.0f;
+          break;
+
+        case 5:
+          Energy.reactive_power[0] = value_buff * 1.0f;
+          break;
+
+        case 6:
+          Energy.apparent_power[0] = value_buff * 1.0f;
+          break;
+
+        case 7:
+          Le01mr.total_active = value_buff * 0.01f;
+          break;
+
+        case 8:
+          Le01mr.total_reactive = value_buff * 0.01f;
+          break;
+      }
+
+      Le01mr.read_state++;
+      if (Le01mr.read_state == Le01mr.start_address_count) {
+        Le01mr.read_state = 0;
+
+        EnergyUpdateTotal(Le01mr.total_active, true);
+      }
+    }
+  }
+
+  if (0 == Le01mr.send_retry || data_ready) {
+    uint8_t reg_count = 2;
+
+    Le01mr.send_retry = 5;
+
+    if (Le01mr.read_state < 3) reg_count=1;
+
+    FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
+  } else {
+    Le01mr.send_retry--;
+  }
+}
+
+void FifLESnsInit(void)
+{
+  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_TX]);
+  uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
+  if (result) {
+    if (2 == result) { ClaimSerial(); }
+  } else {
+    energy_flg = ENERGY_NONE;
+  }
+}
+
+void FifLEDrvInit(void)
+{
+  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_TX] < 99)) {
+    energy_flg = XNRG_13;
+  }
+}
+
+void FifLEReset(void)
+{
+  Le01mr.total_active = 0;
+  Le01mr.total_reactive = 0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_ENERGY_LE01MR[] PROGMEM =
+  "{s}" D_TOTAL_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_TOTAL_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
+  ;
+#endif
+
+void FifLEShow(bool json)
+{
+  char total_reactive_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
+  char total_active_chr[FLOATSZ];
+  dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
+      total_active_chr, total_reactive_chr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_active_chr, total_reactive_chr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xnrg13(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_250_MSECOND:
+      if (uptime > 4) {
+          FifLEEvery250ms();
+      }
+      break;
+    case FUNC_JSON_APPEND:
+      FifLEShow(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      FifLEShow(0);
+      break;
+#endif
+    case FUNC_ENERGY_RESET:
+      FifLEReset();
+      break;
+    case FUNC_INIT:
+      FifLESnsInit();
+      break;
+    case FUNC_PRE_INIT:
+      FifLEDrvInit();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xnrg_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xnrg_interface.ino"
+#ifdef USE_ENERGY_SENSOR
+
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xnrg_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XNRG_01
+  &Xnrg01,
+#endif
+
+#ifdef XNRG_02
+  &Xnrg02,
+#endif
+
+#ifdef XNRG_03
+  &Xnrg03,
+#endif
+
+#ifdef XNRG_04
+  &Xnrg04,
+#endif
+
+#ifdef XNRG_05
+  &Xnrg05,
+#endif
+
+#ifdef XNRG_06
+  &Xnrg06,
+#endif
+
+#ifdef XNRG_07
+  &Xnrg07,
+#endif
+
+#ifdef XNRG_08
+  &Xnrg08,
+#endif
+
+#ifdef XNRG_09
+  &Xnrg09,
+#endif
+
+#ifdef XNRG_10
+  &Xnrg10,
+#endif
+
+#ifdef XNRG_11
+  &Xnrg11,
+#endif
+
+#ifdef XNRG_12
+  &Xnrg12,
+#endif
+
+#ifdef XNRG_13
+  &Xnrg13,
+#endif
+
+#ifdef XNRG_14
+  &Xnrg14,
+#endif
+
+#ifdef XNRG_15
+  &Xnrg15,
+#endif
+
+#ifdef XNRG_16
+  &Xnrg16
+#endif
+};
+
+const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]);
+
+uint8_t xnrg_active = 0;
+
+bool XnrgCall(uint8_t function)
+{
+  DEBUG_TRACE_LOG(PSTR("NRG: %d"), function);
+
+  if (FUNC_PRE_INIT == function) {
+    for (uint32_t x = 0; x < xnrg_present; x++) {
+      xnrg_func_ptr[x](function);
+      if (energy_flg) {
+        xnrg_active = x;
+        return true;
+      }
+    }
+  }
+  else if (energy_flg) {
+    return xnrg_func_ptr[xnrg_active](function);
+  }
+  return false;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_01_counter.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_01_counter.ino"
+#ifdef USE_COUNTER
+
+
+
+
+#define XSNS_01 1
+
+#define D_PRFX_COUNTER "Counter"
+#define D_CMND_COUNTERTYPE "Type"
+#define D_CMND_COUNTERDEBOUNCE "Debounce"
+
+const char kCounterCommands[] PROGMEM = D_PRFX_COUNTER "|"
+  "|" D_CMND_COUNTERTYPE "|" D_CMND_COUNTERDEBOUNCE ;
+
+void (* const CounterCommand[])(void) PROGMEM = {
+  &CmndCounter, &CmndCounterType, &CmndCounterDebounce };
+
+struct COUNTER {
+  uint32_t timer[MAX_COUNTERS];
+  uint8_t no_pullup = 0;
+  bool any_counter = false;
+} Counter;
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void CounterUpdate(uint8_t index) ICACHE_RAM_ATTR;
+void CounterUpdate1(void) ICACHE_RAM_ATTR;
+void CounterUpdate2(void) ICACHE_RAM_ATTR;
+void CounterUpdate3(void) ICACHE_RAM_ATTR;
+void CounterUpdate4(void) ICACHE_RAM_ATTR;
+#endif
+
+void CounterUpdate(uint8_t index)
+{
+  uint32_t time = micros();
+  uint32_t debounce_time = time - Counter.timer[index];
+  if (debounce_time > Settings.pulse_counter_debounce * 1000) {
+    Counter.timer[index] = time;
+    if (bitRead(Settings.pulse_counter_type, index)) {
+      RtcSettings.pulse_counter[index] = debounce_time;
+    } else {
+      RtcSettings.pulse_counter[index]++;
+    }
+  }
+}
+
+void CounterUpdate1(void)
+{
+  CounterUpdate(0);
+}
+
+void CounterUpdate2(void)
+{
+  CounterUpdate(1);
+}
+
+void CounterUpdate3(void)
+{
+  CounterUpdate(2);
+}
+
+void CounterUpdate4(void)
+{
+  CounterUpdate(3);
+}
+
+
+
+bool CounterPinState(void)
+{
+  if ((XdrvMailbox.index >= GPIO_CNTR1_NP) && (XdrvMailbox.index < (GPIO_CNTR1_NP + MAX_COUNTERS))) {
+    bitSet(Counter.no_pullup, XdrvMailbox.index - GPIO_CNTR1_NP);
+    XdrvMailbox.index -= (GPIO_CNTR1_NP - GPIO_CNTR1);
+    return true;
+  }
+  return false;
+}
+
+void CounterInit(void)
+{
+  typedef void (*function) () ;
+  function counter_callbacks[] = { CounterUpdate1, CounterUpdate2, CounterUpdate3, CounterUpdate4 };
+
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      Counter.any_counter = true;
+      pinMode(pin[GPIO_CNTR1 +i], bitRead(Counter.no_pullup, i) ? INPUT : INPUT_PULLUP);
+      attachInterrupt(pin[GPIO_CNTR1 +i], counter_callbacks[i], FALLING);
+    }
+  }
+}
+
+void CounterEverySecond(void)
+{
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      if (bitRead(Settings.pulse_counter_type, i)) {
+        uint32_t time = micros() - Counter.timer[i];
+        if (time > 4200000000) {
+          RtcSettings.pulse_counter[i] = 4200000000;
+        }
+      }
+    }
+  }
+}
+
+void CounterSaveState(void)
+{
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
+    }
+  }
+}
+
+void CounterShow(bool json)
+{
+  bool header = false;
+  uint8_t dsxflg = 0;
+  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
+    if (pin[GPIO_CNTR1 +i] < 99) {
+      char counter[33];
+      if (bitRead(Settings.pulse_counter_type, i)) {
+        dtostrfd((double)RtcSettings.pulse_counter[i] / 1000000, 6, counter);
+      } else {
+        dsxflg++;
+        snprintf_P(counter, sizeof(counter), PSTR("%lu"), RtcSettings.pulse_counter[i]);
+      }
+
+      if (json) {
+        if (!header) {
+          ResponseAppend_P(PSTR(",\"COUNTER\":{"));
+        }
+        ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
+        header = true;
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (1 == dsxflg)) {
+          DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]);
+          dsxflg++;
+        }
+#endif
+        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
+          RtcSettings.pulse_counter[i] = 0;
+        }
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),
+          i +1, counter, (bitRead(Settings.pulse_counter_type, i)) ? " " D_UNIT_SECOND : "");
+#endif
+      }
+    }
+  }
+  if (header) {
+    ResponseJsonEnd();
+  }
+}
+
+
+
+
+
+void CmndCounter(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
+    if ((XdrvMailbox.data_len > 0) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
+      if ((XdrvMailbox.data[0] == '-') || (XdrvMailbox.data[0] == '+')) {
+        RtcSettings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
+        Settings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
+      } else {
+        RtcSettings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
+        Settings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      }
+    }
+    ResponseCmndIdxNumber(RtcSettings.pulse_counter[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndCounterType(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
+    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
+      bitWrite(Settings.pulse_counter_type, XdrvMailbox.index -1, XdrvMailbox.payload &1);
+      RtcSettings.pulse_counter[XdrvMailbox.index -1] = 0;
+      Settings.pulse_counter[XdrvMailbox.index -1] = 0;
+    }
+    ResponseCmndIdxNumber(bitRead(Settings.pulse_counter_type, XdrvMailbox.index -1));
+  }
+}
+
+void CmndCounterDebounce(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
+    Settings.pulse_counter_debounce = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.pulse_counter_debounce);
+}
+
+
+
+
+
+bool Xsns01(uint8_t function)
+{
+  bool result = false;
+
+  if (Counter.any_counter) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        CounterEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        CounterShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        CounterShow(0);
+        break;
+#endif
+      case FUNC_SAVE_BEFORE_RESTART:
+      case FUNC_SAVE_AT_MIDNIGHT:
+        CounterSaveState();
+        break;
+      case FUNC_COMMAND:
+        result = DecodeCommand(kCounterCommands, CounterCommand);
+        break;
+    }
+  } else {
+    switch (function) {
+      case FUNC_INIT:
+        CounterInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = CounterPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
+#ifndef USE_ADC_VCC
+
+
+
+
+#define XSNS_02 2
+
+#define TO_CELSIUS(x) ((x) - 273.15)
+#define TO_KELVIN(x) ((x) + 273.15)
+
+
+#define ANALOG_V33 3.3
+#define ANALOG_T0 TO_KELVIN(25.0)
+
+
+
+
+
+#define ANALOG_NTC_BRIDGE_RESISTANCE 32000
+#define ANALOG_NTC_RESISTANCE 10000
+#define ANALOG_NTC_B_COEFFICIENT 3350
+
+
+
+
+
+#define ANALOG_LDR_BRIDGE_RESISTANCE 10000
+#define ANALOG_LDR_LUX_CALC_SCALAR 12518931
+#define ANALOG_LDR_LUX_CALC_EXPONENT -1.4050
+# 58 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
+#define ANALOG_CT_FLAGS 0
+#define ANALOG_CT_MULTIPLIER 2146
+#define ANALOG_CT_VOLTAGE 2300
+
+#define CT_FLAG_ENERGY_RESET (1 << 0)
+
+struct {
+  float temperature = 0;
+  float current = 0;
+  float energy = 0;
+  uint32_t previous_millis = 0;
+  uint16_t last_value = 0;
+} Adc;
+
+void AdcInit(void)
+{
+  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000)) {
+    if (ADC0_TEMP == my_adc0) {
+
+      Settings.adc_param_type = ADC0_TEMP;
+      Settings.adc_param1 = ANALOG_NTC_BRIDGE_RESISTANCE;
+      Settings.adc_param2 = ANALOG_NTC_RESISTANCE;
+      Settings.adc_param3 = ANALOG_NTC_B_COEFFICIENT * 10000;
+    }
+    else if (ADC0_LIGHT == my_adc0) {
+      Settings.adc_param_type = ADC0_LIGHT;
+      Settings.adc_param1 = ANALOG_LDR_BRIDGE_RESISTANCE;
+      Settings.adc_param2 = ANALOG_LDR_LUX_CALC_SCALAR;
+      Settings.adc_param3 = ANALOG_LDR_LUX_CALC_EXPONENT * 10000;
+    }
+    else if (ADC0_RANGE == my_adc0) {
+      Settings.adc_param_type = ADC0_RANGE;
+      Settings.adc_param1 = 0;
+      Settings.adc_param2 = 1023;
+      Settings.adc_param3 = 0;
+      Settings.adc_param4 = 100;
+    }
+    else if (ADC0_CT_POWER == my_adc0) {
+      Settings.adc_param_type = ADC0_CT_POWER;
+      Settings.adc_param1 = ANALOG_CT_FLAGS;
+      Settings.adc_param2 = ANALOG_CT_MULTIPLIER;
+      Settings.adc_param3 = ANALOG_CT_VOLTAGE;
+    }
+  }
+}
+
+uint16_t AdcRead(uint8_t factor)
+{
+
+
+
+
+
+  uint8_t samples = 1 << factor;
+  uint16_t analog = 0;
+  for (uint32_t i = 0; i < samples; i++) {
+    analog += analogRead(A0);
+    delay(1);
+  }
+  analog >>= factor;
+  return analog;
+}
+
+#ifdef USE_RULES
+void AdcEvery250ms(void)
+{
+  if (ADC0_INPUT == my_adc0) {
+    uint16_t new_value = AdcRead(5);
+    if ((new_value < Adc.last_value -10) || (new_value > Adc.last_value +10)) {
+      Adc.last_value = new_value;
+      uint16_t value = Adc.last_value / 10;
+      Response_P(PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value);
+      XdrvRulesProcess();
+    }
+  }
+}
+#endif
+
+uint16_t AdcGetLux(void)
+{
+  int adc = AdcRead(2);
+
+  double resistorVoltage = ((double)adc / 1023) * ANALOG_V33;
+  double ldrVoltage = ANALOG_V33 - resistorVoltage;
+  double ldrResistance = ldrVoltage / resistorVoltage * (double)Settings.adc_param1;
+  double ldrLux = (double)Settings.adc_param2 * FastPrecisePow(ldrResistance, (double)Settings.adc_param3 / 10000);
+
+  return (uint16_t)ldrLux;
+}
+
+uint16_t AdcGetRange(void)
+{
+
+
+
+  int adc = AdcRead(2);
+  double adcrange = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
+  return (uint16_t)adcrange;
+}
+
+void AdcGetCurrentPower(uint8_t factor)
+{
+
+
+
+
+
+  uint8_t samples = 1 << factor;
+  uint16_t analog = 0;
+  uint16_t analog_min = 1023;
+  uint16_t analog_max = 0;
+  for (uint32_t i = 0; i < samples; i++) {
+    analog = analogRead(A0);
+    if (analog < analog_min) {
+      analog_min = analog;
+    }
+    if (analog > analog_max) {
+      analog_max = analog;
+    }
+    delay(1);
+  }
+
+  Adc.current = (float)(analog_max-analog_min) * ((float)(Settings.adc_param2) / 100000);
+  float power = Adc.current * (float)(Settings.adc_param3) / 10;
+  uint32_t current_millis = millis();
+  Adc.energy = Adc.energy + ((power * (current_millis - Adc.previous_millis)) / 3600000000);
+  Adc.previous_millis = current_millis;
+}
+
+void AdcEverySecond(void)
+{
+  if (ADC0_TEMP == my_adc0) {
+    int adc = AdcRead(2);
+
+    double Rt = (adc * Settings.adc_param1) / (1024.0 * ANALOG_V33 - (double)adc);
+    double BC = (double)Settings.adc_param3 / 10000;
+    double T = BC / (BC / ANALOG_T0 + TaylorLog(Rt / (double)Settings.adc_param2));
+    Adc.temperature = ConvertTemp(TO_CELSIUS(T));
+  }
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
+  }
+}
+
+void AdcShow(bool json)
+{
+  if (ADC0_INPUT == my_adc0) {
+    uint16_t analog = AdcRead(5);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"ANALOG\":{\"A0\":%d}"), analog);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ANALOG, "", 0, analog);
+#endif
+    }
+  }
+
+  else if (ADC0_TEMP == my_adc0) {
+    char temperature[33];
+    dtostrfd(Adc.temperature, Settings.flag2.temperature_resolution, temperature);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMP, "ANALOG", temperature);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_TEMP, temperature);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Adc.temperature);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
+#endif
+    }
+  }
+
+  else if (ADC0_LIGHT == my_adc0) {
+    uint16_t adc_light = AdcGetLux();
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_ILLUMINANCE, "ANALOG", adc_light);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, adc_light);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, "", adc_light);
+#endif
+    }
+  }
+
+  else if (ADC0_RANGE == my_adc0) {
+    uint16_t adc_range = AdcGetRange();
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_RANGE, "ANALOG", adc_range);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_RANGE, "", adc_range);
+#endif
+    }
+  }
+
+  else if (ADC0_CT_POWER == my_adc0) {
+    AdcGetCurrentPower(5);
+
+    float voltage = (float)(Settings.adc_param3) / 10;
+    char voltage_chr[FLOATSZ];
+    dtostrfd(voltage, Settings.flag2.voltage_resolution, voltage_chr);
+    char current_chr[FLOATSZ];
+    dtostrfd(Adc.current, Settings.flag2.current_resolution, current_chr);
+    char power_chr[FLOATSZ];
+    dtostrfd(voltage * Adc.current, Settings.flag2.wattage_resolution, power_chr);
+    char energy_chr[FLOATSZ];
+    dtostrfd(Adc.energy, Settings.flag2.energy_resolution, energy_chr);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"ANALOG\":{\"" D_JSON_ENERGY "\":%s,\"" D_JSON_POWERUSAGE "\":%s,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s}"),
+        energy_chr, power_chr, voltage_chr, current_chr);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_POWER_ENERGY, power_chr);
+        DomoticzSensor(DZ_VOLTAGE, voltage_chr);
+        DomoticzSensor(DZ_CURRENT, current_chr);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_VOLTAGE, voltage_chr);
+      WSContentSend_PD(HTTP_SNS_CURRENT, current_chr);
+      WSContentSend_PD(HTTP_SNS_POWER, power_chr);
+      WSContentSend_PD(HTTP_SNS_ENERGY_TOTAL, energy_chr);
+#endif
+    }
+  }
+
+}
+
+
+
+
+
+const char kAdcCommands[] PROGMEM = "|"
+  D_CMND_ADC "|" D_CMND_ADCS "|" D_CMND_ADCPARAM;
+
+void (* const AdcCommand[])(void) PROGMEM = {
+  &CmndAdc, &CmndAdcs, &CmndAdcParam };
+
+void CmndAdc(void)
+{
+  if (ValidAdc() && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < ADC0_END)) {
+    Settings.my_adc0 = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  char stemp1[TOPSZ];
+  Response_P(PSTR("{\"" D_CMND_ADC "0\":{\"%d\":\"%s\"}}"), Settings.my_adc0, GetTextIndexed(stemp1, sizeof(stemp1), Settings.my_adc0, kAdc0Names));
+}
+
+void CmndAdcs(void)
+{
+  Response_P(PSTR("{\"" D_CMND_ADCS "\":{"));
+  bool jsflg = false;
+  char stemp1[TOPSZ];
+  for (uint32_t i = 0; i < ADC0_END; i++) {
+    if (jsflg) {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    ResponseAppend_P(PSTR("\"%d\":\"%s\""), i, GetTextIndexed(stemp1, sizeof(stemp1), i, kAdc0Names));
+  }
+  ResponseJsonEndEnd();
+}
+
+void CmndAdcParam(void)
+{
+  if (XdrvMailbox.data_len) {
+    if ((ADC0_TEMP == XdrvMailbox.payload) ||
+        (ADC0_LIGHT == XdrvMailbox.payload) ||
+        (ADC0_RANGE == XdrvMailbox.payload) ||
+        (ADC0_CT_POWER == XdrvMailbox.payload)) {
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        char sub_string[XdrvMailbox.data_len +1];
+
+
+
+        Settings.adc_param_type = XdrvMailbox.payload;
+        Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+        Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
+        if (ADC0_RANGE == XdrvMailbox.payload) {
+          Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
+          Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
+        } else {
+          Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
+        }
+        if (ADC0_CT_POWER == XdrvMailbox.payload) {
+          if ((Settings.adc_param1 & CT_FLAG_ENERGY_RESET) > 0) {
+            Adc.energy = 0;
+            Settings.adc_param1 ^= CT_FLAG_ENERGY_RESET;
+          }
+        }
+      } else {
+
+
+
+
+        Settings.adc_param_type = 0;
+        AdcInit();
+      }
+    }
+  }
+
+
+  Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
+  if (ADC0_RANGE == my_adc0) {
+    ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
+  } else {
+    int value = Settings.adc_param3;
+    uint8_t precision;
+    for (precision = 4; precision > 0; precision--) {
+      if (value % 10) { break; }
+      value /= 10;
+    }
+    char param3[33];
+    dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
+    ResponseAppend_P(PSTR(",%s"), param3);
+  }
+  ResponseAppend_P(PSTR("]}"));
+}
+
+
+
+
+
+bool Xsns02(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_COMMAND:
+      result = DecodeCommand(kAdcCommands, AdcCommand);
+      break;
+    default:
+      if ((ADC0_INPUT == my_adc0) ||
+          (ADC0_TEMP == my_adc0) ||
+          (ADC0_LIGHT == my_adc0) ||
+          (ADC0_RANGE == my_adc0) ||
+          (ADC0_CT_POWER == my_adc0)) {
+        switch (function) {
+#ifdef USE_RULES
+          case FUNC_EVERY_250_MSECOND:
+            AdcEvery250ms();
+            break;
+#endif
+          case FUNC_EVERY_SECOND:
+            AdcEverySecond();
+            break;
+          case FUNC_INIT:
+            AdcInit();
+            break;
+          case FUNC_JSON_APPEND:
+            AdcShow(1);
+            break;
+#ifdef USE_WEBSERVER
+          case FUNC_WEB_SENSOR:
+            AdcShow(0);
+            break;
+#endif
+        }
+      }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
+#ifdef USE_SONOFF_SC
+# 57 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
+#define XSNS_04 4
+
+uint16_t sc_value[5] = { 0 };
+
+void SonoffScSend(const char *data)
+{
+  Serial.write(data);
+  Serial.write('\x1B');
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_TRANSMIT " %s"), data);
+}
+
+void SonoffScInit(void)
+{
+
+  SonoffScSend("AT+START");
+
+}
+
+void SonoffScSerialInput(char *rcvstat)
+{
+  char *p;
+  char *str;
+  uint16_t value[5] = { 0 };
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_RECEIVED " %s"), rcvstat);
+
+  if (!strncasecmp_P(rcvstat, PSTR("AT+UPDATE="), 10)) {
+    int8_t i = -1;
+    for (str = strtok_r(rcvstat, ":", &p); str && i < 5; str = strtok_r(nullptr, ":", &p)) {
+      value[i++] = atoi(str);
+    }
+    if (value[0] > 0) {
+      for (uint32_t i = 0; i < 5; i++) {
+        sc_value[i] = value[i];
+      }
+      sc_value[2] = (11 - sc_value[2]) * 10;
+      sc_value[3] *= 10;
+      sc_value[4] = (11 - sc_value[4]) * 10;
+      SonoffScSend("AT+SEND=ok");
+    } else {
+      SonoffScSend("AT+SEND=fail");
+    }
+  }
+  else if (!strcasecmp_P(rcvstat, PSTR("AT+STATUS?"))) {
+    SonoffScSend("AT+STATUS=4");
+  }
+}
+
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SCPLUS[] PROGMEM =
+  "{s}" D_LIGHT "{m}%d%%{e}{s}" D_NOISE "{m}%d%%{e}{s}" D_AIR_QUALITY "{m}%d%%{e}";
+#endif
+
+void SonoffScShow(bool json)
+{
+  if (sc_value[0] > 0) {
+    float t = ConvertTemp(sc_value[1]);
+    float h = ConvertHumidity(sc_value[0]);
+
+    char temperature[33];
+    dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SonoffSC\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_LIGHT "\":%d,\"" D_JSON_NOISE "\":%d,\"" D_JSON_AIRQUALITY "\":%d}"),
+        temperature, humidity, sc_value[2], sc_value[3], sc_value[4]);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+        DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]);
+        DomoticzSensor(DZ_COUNT, sc_value[3]);
+        DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20));
+      }
+#endif
+
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, t);
+        KnxSensor(KNX_HUMIDITY, h);
+      }
+#endif
+
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, "", humidity);
+      WSContentSend_PD(HTTP_SNS_SCPLUS, sc_value[2], sc_value[3], sc_value[4]);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns04(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_SC == my_module_type) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        SonoffScShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SonoffScShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        SonoffScInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
+#ifdef USE_DS18x20
+
+
+
+
+#define XSNS_05 5
+
+
+
+#define DS18S20_CHIPID 0x10
+#define DS1822_CHIPID 0x22
+#define DS18B20_CHIPID 0x28
+#define MAX31850_CHIPID 0x3B
+
+#define W1_SKIP_ROM 0xCC
+#define W1_CONVERT_TEMP 0x44
+#define W1_WRITE_EEPROM 0x48
+#define W1_WRITE_SCRATCHPAD 0x4E
+#define W1_READ_SCRATCHPAD 0xBE
+
+#define DS18X20_MAX_SENSORS 8
+
+const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
+
+uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
+
+struct DS18X20STRUCT {
+  uint8_t address[8];
+  uint8_t index;
+  uint8_t valid;
+  float temperature;
+} ds18x20_sensor[DS18X20_MAX_SENSORS];
+uint8_t ds18x20_sensors = 0;
+uint8_t ds18x20_pin = 0;
+uint8_t ds18x20_pin_out = 0;
+bool ds18x20_dual_mode = false;
+char ds18x20_types[12];
+#ifdef W1_PARASITE_POWER
+uint8_t ds18x20_sensor_curr = 0;
+unsigned long w1_power_until = 0;
+#endif
+
+
+
+
+
+#define W1_MATCH_ROM 0x55
+#define W1_SEARCH_ROM 0xF0
+
+uint8_t onewire_last_discrepancy = 0;
+uint8_t onewire_last_family_discrepancy = 0;
+bool onewire_last_device_flag = false;
+unsigned char onewire_rom_id[8] = { 0 };
+
+
+
+uint8_t OneWireReset(void)
+{
+  uint8_t retries = 125;
+
+  if (!ds18x20_dual_mode) {
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    pinMode(ds18x20_pin, OUTPUT);
+    digitalWrite(ds18x20_pin, LOW);
+    delayMicroseconds(480);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+  } else {
+    digitalWrite(ds18x20_pin_out, HIGH);
+    do {
+      if (--retries == 0) {
+        return 0;
+      }
+      delayMicroseconds(2);
+    } while (!digitalRead(ds18x20_pin));
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(480);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
+  delayMicroseconds(70);
+  uint8_t r = !digitalRead(ds18x20_pin);
+  delayMicroseconds(410);
+  return r;
+}
+
+void OneWireWriteBit(uint8_t v)
+{
+  static const uint8_t delay_low[2] = { 65, 10 };
+  static const uint8_t delay_high[2] = { 5, 55 };
+
+  v &= 1;
+  if (!ds18x20_dual_mode) {
+    digitalWrite(ds18x20_pin, LOW);
+    pinMode(ds18x20_pin, OUTPUT);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin, HIGH);
+  } else {
+    digitalWrite(ds18x20_pin_out, LOW);
+    delayMicroseconds(delay_low[v]);
+    digitalWrite(ds18x20_pin_out, HIGH);
+  }
+  delayMicroseconds(delay_high[v]);
+}
+# 150 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
+void OneWireReadBit1(void)
+{
+  pinMode(ds18x20_pin, OUTPUT);
+  digitalWrite(ds18x20_pin, LOW);
+  delayMicroseconds(3);
+  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+}
+
+void OneWireReadBit2(void)
+{
+  digitalWrite(ds18x20_pin_out, LOW);
+  delayMicroseconds(3);
+  digitalWrite(ds18x20_pin_out, HIGH);
+}
+
+uint8_t OneWireReadBit(void)
+{
+  if (!ds18x20_dual_mode) {
+    OneWireReadBit1();
+  } else {
+    OneWireReadBit2();
+  }
+  delayMicroseconds(10);
+  uint8_t r = digitalRead(ds18x20_pin);
+  delayMicroseconds(53);
+  return r;
+}
+
+
+
+void OneWireWrite(uint8_t v)
+{
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    OneWireWriteBit((bit_mask & v) ? 1 : 0);
+  }
+}
+
+uint8_t OneWireRead(void)
+{
+  uint8_t r = 0;
+
+  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
+    if (OneWireReadBit()) {
+      r |= bit_mask;
+    }
+  }
+  return r;
+}
+
+void OneWireSelect(const uint8_t rom[8])
+{
+  OneWireWrite(W1_MATCH_ROM);
+  for (uint32_t i = 0; i < 8; i++) {
+    OneWireWrite(rom[i]);
+  }
+}
+
+void OneWireResetSearch(void)
+{
+  onewire_last_discrepancy = 0;
+  onewire_last_device_flag = false;
+  onewire_last_family_discrepancy = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    onewire_rom_id[i] = 0;
+  }
+}
+
+uint8_t OneWireSearch(uint8_t *newAddr)
+{
+  uint8_t id_bit_number = 1;
+  uint8_t last_zero = 0;
+  uint8_t rom_byte_number = 0;
+  uint8_t search_result = 0;
+  uint8_t id_bit;
+  uint8_t cmp_id_bit;
+  unsigned char rom_byte_mask = 1;
+  unsigned char search_direction;
+
+  if (!onewire_last_device_flag) {
+    if (!OneWireReset()) {
+      onewire_last_discrepancy = 0;
+      onewire_last_device_flag = false;
+      onewire_last_family_discrepancy = 0;
+      return false;
+    }
+    OneWireWrite(W1_SEARCH_ROM);
+    do {
+      id_bit = OneWireReadBit();
+      cmp_id_bit = OneWireReadBit();
+
+      if ((id_bit == 1) && (cmp_id_bit == 1)) {
+        break;
+      } else {
+        if (id_bit != cmp_id_bit) {
+          search_direction = id_bit;
+        } else {
+          if (id_bit_number < onewire_last_discrepancy) {
+            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
+          } else {
+            search_direction = (id_bit_number == onewire_last_discrepancy);
+          }
+          if (search_direction == 0) {
+            last_zero = id_bit_number;
+            if (last_zero < 9) {
+              onewire_last_family_discrepancy = last_zero;
+            }
+          }
+        }
+        if (search_direction == 1) {
+          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
+        } else {
+          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
+        }
+        OneWireWriteBit(search_direction);
+        id_bit_number++;
+        rom_byte_mask <<= 1;
+        if (rom_byte_mask == 0) {
+          rom_byte_number++;
+          rom_byte_mask = 1;
+        }
+      }
+    } while (rom_byte_number < 8);
+    if (!(id_bit_number < 65)) {
+      onewire_last_discrepancy = last_zero;
+      if (onewire_last_discrepancy == 0) {
+        onewire_last_device_flag = true;
+      }
+      search_result = true;
+    }
+  }
+  if (!search_result || !onewire_rom_id[0]) {
+    onewire_last_discrepancy = 0;
+    onewire_last_device_flag = false;
+    onewire_last_family_discrepancy = 0;
+    search_result = false;
+  }
+  for (uint32_t i = 0; i < 8; i++) {
+    newAddr[i] = onewire_rom_id[i];
+  }
+  return search_result;
+}
+
+bool OneWireCrc8(uint8_t *addr)
+{
+  uint8_t crc = 0;
+  uint8_t len = 8;
+
+  while (len--) {
+    uint8_t inbyte = *addr++;
+    for (uint32_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x01;
+      crc >>= 1;
+      if (mix) {
+        crc ^= 0x8C;
+      }
+      inbyte >>= 1;
+    }
+  }
+  return (crc == *addr);
+}
+
+
+
+void Ds18x20Init(void)
+{
+  uint64_t ids[DS18X20_MAX_SENSORS];
+
+  ds18x20_pin = pin[GPIO_DSB];
+
+  if (pin[GPIO_DSB_OUT] < 99) {
+    ds18x20_pin_out = pin[GPIO_DSB_OUT];
+    ds18x20_dual_mode = true;
+    pinMode(ds18x20_pin_out, OUTPUT);
+    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
+  }
+
+  OneWireResetSearch();
+
+  ds18x20_sensors = 0;
+  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
+    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
+      break;
+    }
+    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
+       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
+        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
+      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
+      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];
+      for (uint32_t j = 6; j > 0; j--) {
+        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
+      }
+      ds18x20_sensors++;
+    }
+  }
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
+      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {
+        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
+      }
+    }
+  }
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
+}
+
+void Ds18x20Convert(void)
+{
+  OneWireReset();
+#ifdef W1_PARASITE_POWER
+
+  if (++ds18x20_sensor_curr >= ds18x20_sensors)
+    ds18x20_sensor_curr = 0;
+  OneWireSelect(ds18x20_sensor[ds18x20_sensor_curr].address);
+#else
+  OneWireWrite(W1_SKIP_ROM);
+#endif
+  OneWireWrite(W1_CONVERT_TEMP);
+
+}
+
+bool Ds18x20Read(uint8_t sensor)
+{
+  uint8_t data[9];
+  int8_t sign = 1;
+
+  uint8_t index = ds18x20_sensor[sensor].index;
+  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
+  for (uint32_t retry = 0; retry < 3; retry++) {
+    OneWireReset();
+    OneWireSelect(ds18x20_sensor[index].address);
+    OneWireWrite(W1_READ_SCRATCHPAD);
+    for (uint32_t i = 0; i < 9; i++) {
+      data[i] = OneWireRead();
+    }
+    if (OneWireCrc8(data)) {
+      switch(ds18x20_sensor[index].address[0]) {
+        case DS18S20_CHIPID: {
+          if (data[1] > 0x80) {
+            data[0] = (~data[0]) +1;
+            sign = -1;
+          }
+          float temp9 = (float)(data[0] >> 1) * sign;
+          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case DS1822_CHIPID:
+        case DS18B20_CHIPID: {
+          if (data[4] != 0x7F) {
+            data[4] = 0x7F;
+            OneWireReset();
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_SCRATCHPAD);
+            OneWireWrite(data[2]);
+            OneWireWrite(data[3]);
+            OneWireWrite(data[4]);
+            OneWireSelect(ds18x20_sensor[index].address);
+            OneWireWrite(W1_WRITE_EEPROM);
+#ifdef W1_PARASITE_POWER
+            w1_power_until = millis() + 10;
+#endif
+          }
+          uint16_t temp12 = (data[1] << 8) + data[0];
+          if (temp12 > 2047) {
+            temp12 = (~temp12) +1;
+            sign = -1;
+          }
+          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+        case MAX31850_CHIPID: {
+          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
+          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);
+          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
+          return true;
+        }
+      }
+    }
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
+  return false;
+}
+
+void Ds18x20Name(uint8_t sensor)
+{
+  uint8_t index = sizeof(ds18x20_chipids);
+  while (index) {
+    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
+      break;
+    }
+    index--;
+  }
+  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
+  if (ds18x20_sensors > 1) {
+    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
+  }
+}
+
+
+
+void Ds18x20EverySecond(void)
+{
+  if (!ds18x20_sensors) { return; }
+
+#ifdef W1_PARASITE_POWER
+
+  unsigned long now = millis();
+  if (now < w1_power_until)
+    return;
+#endif
+  if (uptime & 1
+#ifdef W1_PARASITE_POWER
+
+      || ds18x20_sensors >= 2
+#endif
+  ) {
+
+    Ds18x20Convert();
+  } else {
+    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+
+      if (!Ds18x20Read(i)) {
+        Ds18x20Name(i);
+        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
+#ifdef USE_DS18x20_RECONFIGURE
+        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
+          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
+          Ds18x20Init();
+        }
+#endif
+      }
+    }
+  }
+}
+
+void Ds18x20Show(bool json)
+{
+  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
+    uint8_t index = ds18x20_sensor[i].index;
+
+    if (ds18x20_sensor[index].valid) {
+      char temperature[33];
+      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
+
+      Ds18x20Name(i);
+
+      if (json) {
+        char address[17];
+        for (uint32_t j = 0; j < 6; j++) {
+          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);
+        }
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == i)) {
+          DomoticzSensor(DZ_TEMP, temperature);
+        }
+#endif
+#ifdef USE_KNX
+        if ((0 == tele_period) && (0 == i)) {
+          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
+        }
+#endif
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
+#endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool Xsns05(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_DSB] < 99) {
+    switch (function) {
+      case FUNC_INIT:
+        Ds18x20Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        Ds18x20EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Ds18x20Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ds18x20Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
+#ifdef USE_DHT_OLD
+# 29 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint32_t dht_max_cycles;
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+void DhtReadPrep(void)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+  }
+}
+
+int32_t DhtExpectPulse(uint8_t sensor, bool level)
+{
+  int32_t count = 0;
+
+  while (digitalRead(Dht[sensor].pin) == level) {
+    if (count++ >= (int32_t)dht_max_cycles) {
+      return -1;
+    }
+  }
+  return count;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  int32_t cycles[80];
+  uint8_t error = 0;
+
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+
+
+
+  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+    Dht[sensor].lastresult = 0;
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+    delay(250);
+  }
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  if (GPIO_SI7021 == Dht[sensor].type) {
+    delayMicroseconds(500);
+  } else {
+    delay(20);
+  }
+
+  noInterrupts();
+  if (!dht_dual_mode) {
+    digitalWrite(Dht[sensor].pin, HIGH);
+    delayMicroseconds(40);
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+    delayMicroseconds(40);
+  }
+  delayMicroseconds(10);
+  if (-1 == DhtExpectPulse(sensor, LOW)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    error = 1;
+  }
+  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    error = 1;
+  }
+  else {
+    for (uint32_t i = 0; i < 80; i += 2) {
+      cycles[i] = DhtExpectPulse(sensor, LOW);
+      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
+    }
+  }
+  interrupts();
+
+  if (error) { return false; }
+
+  for (uint32_t i = 0; i < 40; ++i) {
+    int32_t lowCycles = cycles[2*i];
+    int32_t highCycles = cycles[2*i+1];
+    if ((-1 == lowCycles) || (-1 == highCycles)) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      return false;
+    }
+    dht_data[i/8] <<= 1;
+    if (highCycles > lowCycles) {
+      dht_data[i / 8] |= 1;
+    }
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    dht_max_cycles = microsecondsToClockCycles(1000);
+
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+#ifdef USE_DHT_V2
+# 29 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint32_t dht_max_cycles;
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+void DhtReadPrep(void)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[i].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+  }
+}
+
+int32_t DhtExpectPulse(uint8_t sensor, bool level)
+{
+  int32_t count = 0;
+
+  while (digitalRead(Dht[sensor].pin) == level) {
+    if (count++ >= (int32_t)dht_max_cycles) {
+      return -1;
+    }
+  }
+  return count;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  int32_t cycles[80];
+  uint8_t error = 0;
+
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+    Dht[sensor].lastresult = 0;
+    if (!dht_dual_mode) {
+      digitalWrite(Dht[sensor].pin, HIGH);
+    } else {
+      digitalWrite(dht_pin_out, HIGH);
+    }
+    delay(250);
+  }
+
+
+  noInterrupts();
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_SI7021:
+# 114 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+      delayMicroseconds(500);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(40);
+      break;
+
+    case GPIO_DHT22:
+# 133 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+      delayMicroseconds(1100);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30);
+      break;
+
+    case GPIO_DHT11:
+# 151 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
+    default:
+
+      delay(20);
+      if (!dht_dual_mode) {
+        digitalWrite(Dht[sensor].pin, HIGH);
+      } else {
+        digitalWrite(dht_pin_out, HIGH);
+      }
+      delayMicroseconds(30);
+      break;
+  }
+
+
+  pinMode(Dht[sensor].pin, INPUT_PULLUP);
+
+  if (-1 == DhtExpectPulse(sensor, LOW)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    error = 1;
+  }
+  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    error = 1;
+  }
+  else {
+    for (uint32_t i = 0; i < 80; i += 2) {
+      cycles[i] = DhtExpectPulse(sensor, LOW);
+      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
+    }
+  }
+  interrupts();
+  if (error) { return false; }
+
+
+  for (uint32_t i = 0; i < 40; ++i) {
+    int32_t lowCycles = cycles[2*i];
+    int32_t highCycles = cycles[2*i+1];
+    if ((-1 == lowCycles) || (-1 == highCycles)) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      return false;
+    }
+    dht_data[i/8] <<= 1;
+    if (highCycles > lowCycles) {
+      dht_data[i / 8] |= 1;
+    }
+  }
+
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    dht_max_cycles = microsecondsToClockCycles(1000);
+
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v2) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+    DhtReadPrep();
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
+#ifdef USE_DHT_V3
+# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint8_t sensor, int level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+int DhtReadDat(uint8_t sensor)
+{
+  uint8_t result = 0;
+  for (uint32_t i = 0; i < 8; i++) {
+    if (!DhtExpectPulse(sensor, HIGH)) { return -1; }
+
+    delayMicroseconds(35);
+    if (digitalRead(Dht[sensor].pin)) {
+      result |= (1 << (7 - i));
+    }
+
+    if (!DhtExpectPulse(sensor, LOW)) { return -1; }
+  }
+  return result;
+}
+
+bool DhtRead(uint8_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+
+      delayMicroseconds(20);
+      break;
+  }
+
+  noInterrupts();
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, HIGH)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
+    return false;
+  }
+  if (!DhtExpectPulse(sensor, LOW)) {
+    interrupts();
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
+    return false;
+  }
+
+  int data = 0;
+  for (uint32_t i = 0; i < 5; i++) {
+    data = DhtReadDat(sensor);
+    if (-1 == data) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
+      break;
+    }
+    dht_data[i] = data;
+  }
+  interrupts();
+  if (-1 == data) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint8_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v3) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+
+
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
+#ifdef USE_DHT_V4
+# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  char stype[12];
+  uint32_t lastreadtime;
+  uint8_t lastresult;
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtExpectPulse(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (micros() > timeout) { return false; }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(20);
+      break;
+  }
+
+  uint32_t level = 9;
+  noInterrupts();
+  for (uint32_t i = 0; i < 3; i++) {
+    level = i &1;
+    if (!DhtExpectPulse(sensor, level)) { break; }
+    level = 9;
+  }
+  if (9 == level) {
+    int data = 0;
+    for (uint32_t i = 0; i < 5; i++) {
+      data = 0;
+      for (uint32_t j = 0; j < 8; j++) {
+        level = 1;
+        if (!DhtExpectPulse(sensor, level)) { break; }
+
+        delayMicroseconds(35);
+        if (digitalRead(Dht[sensor].pin)) {
+          data |= (1 << (7 - j));
+        }
+
+        level = 0;
+        if (!DhtExpectPulse(sensor, level)) { break; }
+        level = 9;
+      }
+      if (level < 2) { break; }
+
+      dht_data[i] = data;
+    }
+  }
+  interrupts();
+  if (level < 2) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE), (0 == level) ? D_START_SIGNAL_LOW : D_START_SIGNAL_HIGH);
+    return false;
+  }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  return true;
+}
+
+void DhtReadTempHum(uint32_t sensor)
+{
+  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
+    Dht[sensor].t = NAN;
+    Dht[sensor].h = NAN;
+  }
+  if (DhtRead(sensor)) {
+    switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      Dht[sensor].h = dht_data[0];
+      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        Dht[sensor].t *= -1;
+      }
+      break;
+    }
+    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
+    if (Dht[sensor].h > 100) { Dht[sensor].h = 100.0; }
+    if (Dht[sensor].h < 0) { Dht[sensor].h = 0.0; }
+    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
+    Dht[sensor].lastresult = 0;
+  } else {
+    Dht[sensor].lastresult++;
+  }
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastreadtime = 0;
+      Dht[i].lastresult = 0;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v4) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+  } else {
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+
+      DhtReadTempHum(i);
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
+#ifdef USE_DHT
+# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
+#define XSNS_06 6
+
+#define DHT_MAX_SENSORS 4
+#define DHT_MAX_RETRY 8
+
+uint8_t dht_data[5];
+uint8_t dht_sensors = 0;
+uint8_t dht_pin_out = 0;
+bool dht_active = true;
+bool dht_dual_mode = false;
+
+struct DHTSTRUCT {
+  uint8_t pin;
+  uint8_t type;
+  uint8_t lastresult;
+  char stype[12];
+  float t = NAN;
+  float h = NAN;
+} Dht[DHT_MAX_SENSORS];
+
+bool DhtWaitState(uint32_t sensor, uint32_t level)
+{
+  unsigned long timeout = micros() + 100;
+  while (digitalRead(Dht[sensor].pin) != level) {
+    if (TimeReachedUsec(timeout)) {
+      PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE),
+        (level) ? D_START_SIGNAL_HIGH : D_START_SIGNAL_LOW);
+      return false;
+    }
+    delayMicroseconds(1);
+  }
+  return true;
+}
+
+bool DhtRead(uint32_t sensor)
+{
+  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, OUTPUT);
+    digitalWrite(Dht[sensor].pin, LOW);
+  } else {
+    digitalWrite(dht_pin_out, LOW);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      delay(19);
+      break;
+    case GPIO_DHT22:
+      delay(2);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(500);
+      break;
+  }
+
+  if (!dht_dual_mode) {
+    pinMode(Dht[sensor].pin, INPUT_PULLUP);
+  } else {
+    digitalWrite(dht_pin_out, HIGH);
+  }
+
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+    case GPIO_DHT22:
+      delayMicroseconds(50);
+      break;
+    case GPIO_SI7021:
+      delayMicroseconds(20);
+      break;
+  }
+# 133 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
+  uint32_t i = 0;
+  noInterrupts();
+  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
+    for (i = 0; i < 40; i++) {
+      if (!DhtWaitState(sensor, 1)) { break; }
+      delayMicroseconds(35);
+      if (digitalRead(Dht[sensor].pin)) {
+        dht_data[i / 8] |= (1 << (7 - i % 8));
+      }
+      if (!DhtWaitState(sensor, 0)) { break; }
+    }
+  }
+  interrupts();
+  if (i < 40) { return false; }
+
+  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
+  if (dht_data[4] != checksum) {
+    char hex_char[15];
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
+      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
+    return false;
+  }
+
+  float temperature = NAN;
+  float humidity = NAN;
+  switch (Dht[sensor].type) {
+    case GPIO_DHT11:
+      humidity = dht_data[0];
+      temperature = dht_data[2] + ((float)dht_data[3] * 0.1f);
+      break;
+    case GPIO_DHT22:
+    case GPIO_SI7021:
+      humidity = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
+      temperature = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
+      if (dht_data[2] & 0x80) {
+        temperature *= -1;
+      }
+      break;
+  }
+  if (isnan(temperature) || isnan(humidity)) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
+    return false;
+  }
+
+  if (humidity > 100) { humidity = 100.0; }
+  if (humidity < 0) { humidity = 0.1; }
+  Dht[sensor].h = ConvertHumidity(humidity);
+  Dht[sensor].t = ConvertTemp(temperature);
+  Dht[sensor].lastresult = 0;
+
+  return true;
+}
+
+
+
+bool DhtPinState()
+{
+  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
+    if (dht_sensors < DHT_MAX_SENSORS) {
+      Dht[dht_sensors].pin = XdrvMailbox.payload;
+      Dht[dht_sensors].type = XdrvMailbox.index;
+      dht_sensors++;
+      XdrvMailbox.index = GPIO_DHT11;
+    } else {
+      XdrvMailbox.index = 0;
+    }
+    return true;
+  }
+  return false;
+}
+
+void DhtInit(void)
+{
+  if (dht_sensors) {
+    if (pin[GPIO_DHT11_OUT] < 99) {
+      dht_pin_out = pin[GPIO_DHT11_OUT];
+      dht_dual_mode = true;
+      dht_sensors = 1;
+      pinMode(dht_pin_out, OUTPUT);
+    }
+
+    for (uint32_t i = 0; i < dht_sensors; i++) {
+      pinMode(Dht[i].pin, INPUT_PULLUP);
+      Dht[i].lastresult = DHT_MAX_RETRY;
+      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
+      if (dht_sensors > 1) {
+        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
+      }
+    }
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v5) " D_SENSORS_FOUND " %d"), dht_sensors);
+  } else {
+    dht_active = false;
+  }
+}
+
+void DhtEverySecond(void)
+{
+  if (uptime &1) {
+    for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
+
+      if (!DhtRead(sensor)) {
+        Dht[sensor].lastresult++;
+        if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
+          Dht[sensor].t = NAN;
+          Dht[sensor].h = NAN;
+        }
+      }
+    }
+  }
+}
+
+void DhtShow(bool json)
+{
+  for (uint32_t i = 0; i < dht_sensors; i++) {
+    char temperature[33];
+    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period) && (0 == i)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if ((0 == tele_period) && (0 == i)) {
+        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
+        KnxSensor(KNX_HUMIDITY, Dht[i].h);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns06(uint8_t function)
+{
+  bool result = false;
+
+  if (dht_active) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DhtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        DhtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        DhtShow(0);
+        break;
+#endif
+      case FUNC_INIT:
+        DhtInit();
+        break;
+      case FUNC_PIN_STATE:
+        result = DhtPinState();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
+#ifdef USE_I2C
+#ifdef USE_SHT
+# 31 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
+#define XSNS_07 7
+#define XI2C_08 8
+
+enum {
+  SHT1X_CMD_MEASURE_TEMP = B00000011,
+  SHT1X_CMD_MEASURE_RH = B00000101,
+  SHT1X_CMD_SOFT_RESET = B00011110
+};
+
+uint8_t sht_sda_pin;
+uint8_t sht_scl_pin;
+uint8_t sht_type = 0;
+char sht_types[] = "SHT1X";
+uint8_t sht_valid = 0;
+float sht_temperature = 0;
+float sht_humidity = 0;
+
+bool ShtReset(void)
+{
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+  pinMode(sht_scl_pin, OUTPUT);
+  delay(11);
+  for (uint32_t i = 0; i < 9; i++) {
+    digitalWrite(sht_scl_pin, HIGH);
+    digitalWrite(sht_scl_pin, LOW);
+  }
+  bool success = ShtSendCommand(SHT1X_CMD_SOFT_RESET);
+  delay(11);
+  return success;
+}
+
+bool ShtSendCommand(const uint8_t cmd)
+{
+  pinMode(sht_sda_pin, OUTPUT);
+
+  digitalWrite(sht_sda_pin, HIGH);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_sda_pin, LOW);
+  digitalWrite(sht_scl_pin, LOW);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_sda_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+
+  shiftOut(sht_sda_pin, sht_scl_pin, MSBFIRST, cmd);
+
+  bool ackerror = false;
+  digitalWrite(sht_scl_pin, HIGH);
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+  if (digitalRead(sht_sda_pin) != LOW) {
+    ackerror = true;
+  }
+  digitalWrite(sht_scl_pin, LOW);
+  delayMicroseconds(1);
+  if (digitalRead(sht_sda_pin) != HIGH) {
+    ackerror = true;
+  }
+  if (ackerror) {
+
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_DID_NOT_ACK_COMMAND));
+  }
+  return (!ackerror);
+}
+
+bool ShtAwaitResult(void)
+{
+
+  for (uint32_t i = 0; i < 16; i++) {
+    if (LOW == digitalRead(sht_sda_pin)) {
+      return true;
+    }
+    delay(20);
+  }
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_BUSY));
+
+  return false;
+}
+
+int ShtReadData(void)
+{
+  int val = 0;
+
+
+  val = shiftIn(sht_sda_pin, sht_scl_pin, 8);
+  val <<= 8;
+
+  pinMode(sht_sda_pin, OUTPUT);
+  digitalWrite(sht_sda_pin, LOW);
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+  pinMode(sht_sda_pin, INPUT_PULLUP);
+
+  val |= shiftIn(sht_sda_pin, sht_scl_pin, 8);
+
+  digitalWrite(sht_scl_pin, HIGH);
+  digitalWrite(sht_scl_pin, LOW);
+  return val;
+}
+
+bool ShtRead(void)
+{
+  if (sht_valid) { sht_valid--; }
+  if (!ShtReset()) { return false; }
+  if (!ShtSendCommand(SHT1X_CMD_MEASURE_TEMP)) { return false; }
+  if (!ShtAwaitResult()) { return false; }
+  float tempRaw = ShtReadData();
+  if (!ShtSendCommand(SHT1X_CMD_MEASURE_RH)) { return false; }
+  if (!ShtAwaitResult()) { return false; }
+  float humRaw = ShtReadData();
+
+
+  const float d1 = -39.7;
+  const float d2 = 0.01;
+  sht_temperature = d1 + (tempRaw * d2);
+  const float c1 = -2.0468;
+  const float c2 = 0.0367;
+  const float c3 = -1.5955E-6;
+  const float t1 = 0.01;
+  const float t2 = 0.00008;
+  float rhLinear = c1 + c2 * humRaw + c3 * humRaw * humRaw;
+  sht_humidity = (sht_temperature - 25) * (t1 + t2 * humRaw) + rhLinear;
+  sht_temperature = ConvertTemp(sht_temperature);
+  ConvertHumidity(sht_humidity);
+
+  sht_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void ShtDetect(void)
+{
+  sht_sda_pin = pin[GPIO_I2C_SDA];
+  sht_scl_pin = pin[GPIO_I2C_SCL];
+  if (ShtRead()) {
+    sht_type = 1;
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C D_SHT1X_FOUND));
+  } else {
+    Wire.begin(sht_sda_pin, sht_scl_pin);
+    sht_type = 0;
+  }
+}
+
+void ShtEverySecond(void)
+{
+  if (!(uptime %4)) {
+
+    if (!ShtRead()) {
+      AddLogMissed(sht_types, sht_valid);
+    }
+  }
+}
+
+void ShtShow(bool json)
+{
+  if (sht_valid) {
+    char temperature[33];
+    dtostrfd(sht_temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(sht_humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, sht_types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, sht_temperature);
+        KnxSensor(KNX_HUMIDITY, sht_humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, sht_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, sht_types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns07(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_08)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    ShtDetect();
+  }
+  else if (sht_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        ShtEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        ShtShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        ShtShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
+#ifdef USE_I2C
+#ifdef USE_HTU
+# 30 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
+#define XSNS_08 8
+#define XI2C_09 9
+
+#define HTU21_ADDR 0x40
+
+#define SI7013_CHIPID 0x0D
+#define SI7020_CHIPID 0x14
+#define SI7021_CHIPID 0x15
+#define HTU21_CHIPID 0x32
+
+#define HTU21_READTEMP 0xE3
+#define HTU21_READHUM 0xE5
+#define HTU21_WRITEREG 0xE6
+#define HTU21_READREG 0xE7
+#define HTU21_RESET 0xFE
+#define HTU21_HEATER_WRITE 0x51
+#define HTU21_HEATER_READ 0x11
+#define HTU21_SERIAL2_READ1 0xFC
+#define HTU21_SERIAL2_READ2 0xC9
+
+#define HTU21_HEATER_ON 0x04
+#define HTU21_HEATER_OFF 0xFB
+
+#define HTU21_RES_RH12_T14 0x00
+#define HTU21_RES_RH8_T12 0x01
+#define HTU21_RES_RH10_T13 0x80
+#define HTU21_RES_RH11_T11 0x81
+
+#define HTU21_CRC8_POLYNOM 0x13100
+
+const char kHtuTypes[] PROGMEM = "HTU21|SI7013|SI7020|SI7021|T/RH?";
+
+uint8_t htu_address;
+uint8_t htu_type = 0;
+uint8_t htu_delay_temp;
+uint8_t htu_delay_humidity = 50;
+uint8_t htu_valid = 0;
+float htu_temperature = 0;
+float htu_humidity = 0;
+char htu_types[7];
+
+uint8_t HtuCheckCrc8(uint16_t data)
+{
+  for (uint32_t bit = 0; bit < 16; bit++) {
+    if (data & 0x8000) {
+      data = (data << 1) ^ HTU21_CRC8_POLYNOM;
+    } else {
+      data <<= 1;
+    }
+  }
+  return data >>= 8;
+}
+
+uint8_t HtuReadDeviceId(void)
+{
+  uint16_t deviceID = 0;
+  uint8_t checksum = 0;
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_SERIAL2_READ1);
+  Wire.write(HTU21_SERIAL2_READ2);
+  Wire.endTransmission();
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  deviceID = Wire.read() << 8;
+  deviceID |= Wire.read();
+  checksum = Wire.read();
+  if (HtuCheckCrc8(deviceID) == checksum) {
+    deviceID = deviceID >> 8;
+  } else {
+    deviceID = 0;
+  }
+  return (uint8_t)deviceID;
+}
+
+void HtuSetResolution(uint8_t resolution)
+{
+  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
+  current &= 0x7E;
+  current |= resolution;
+  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
+}
+
+void HtuReset(void)
+{
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_RESET);
+  Wire.endTransmission();
+  delay(15);
+}
+
+void HtuHeater(uint8_t heater)
+{
+  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
+
+  switch(heater)
+  {
+    case HTU21_HEATER_ON : current |= heater;
+                            break;
+    case HTU21_HEATER_OFF : current &= heater;
+                            break;
+    default : current &= heater;
+                            break;
+  }
+  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
+}
+
+void HtuInit(void)
+{
+  HtuReset();
+  HtuHeater(HTU21_HEATER_OFF);
+  HtuSetResolution(HTU21_RES_RH12_T14);
+}
+
+bool HtuRead(void)
+{
+  uint8_t checksum = 0;
+  uint16_t sensorval = 0;
+
+  if (htu_valid) { htu_valid--; }
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_READTEMP);
+  if (Wire.endTransmission() != 0) { return false; }
+  delay(htu_delay_temp);
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  if (3 == Wire.available()) {
+    sensorval = Wire.read() << 8;
+    sensorval |= Wire.read();
+    checksum = Wire.read();
+  }
+  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
+
+  htu_temperature = ConvertTemp(0.002681 * (float)sensorval - 46.85);
+
+  Wire.beginTransmission(HTU21_ADDR);
+  Wire.write(HTU21_READHUM);
+  if (Wire.endTransmission() != 0) { return false; }
+  delay(htu_delay_humidity);
+
+  Wire.requestFrom(HTU21_ADDR, 3);
+  if (3 <= Wire.available()) {
+    sensorval = Wire.read() << 8;
+    sensorval |= Wire.read();
+    checksum = Wire.read();
+  }
+  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
+
+  sensorval ^= 0x02;
+  htu_humidity = 0.001907 * (float)sensorval - 6;
+  if (htu_humidity > 100) { htu_humidity = 100.0; }
+  if (htu_humidity < 0) { htu_humidity = 0.01; }
+
+  if ((0.00 == htu_humidity) && (0.00 == htu_temperature)) {
+    htu_humidity = 0.0;
+  }
+  if ((htu_temperature > 0.00) && (htu_temperature < 80.00)) {
+    htu_humidity = (-0.15) * (25 - htu_temperature) + htu_humidity;
+  }
+  ConvertHumidity(htu_humidity);
+
+  htu_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void HtuDetect(void)
+{
+  htu_address = HTU21_ADDR;
+  if (I2cActive(htu_address)) { return; }
+
+  htu_type = HtuReadDeviceId();
+  if (htu_type) {
+    uint8_t index = 0;
+    HtuInit();
+    switch (htu_type) {
+      case HTU21_CHIPID:
+        htu_delay_temp = 50;
+        htu_delay_humidity = 16;
+        break;
+      case SI7021_CHIPID:
+        index++;
+      case SI7020_CHIPID:
+        index++;
+      case SI7013_CHIPID:
+        index++;
+        htu_delay_temp = 12;
+        htu_delay_humidity = 23;
+        break;
+      default:
+        index = 4;
+        htu_delay_temp = 50;
+        htu_delay_humidity = 23;
+    }
+    GetTextIndexed(htu_types, sizeof(htu_types), index, kHtuTypes);
+    I2cSetActiveFound(htu_address, htu_types);
+  }
+}
+
+void HtuEverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!HtuRead()) {
+      AddLogMissed(htu_types, htu_valid);
+    }
+  }
+}
+
+void HtuShow(bool json)
+{
+  if (htu_valid) {
+    char temperature[33];
+    dtostrfd(htu_temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(htu_humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, htu_types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, htu_temperature);
+        KnxSensor(KNX_HUMIDITY, htu_humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, htu_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, htu_types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns08(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_09)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    HtuDetect();
+  }
+  else if (htu_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        HtuEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        HtuShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HtuShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
+#ifdef USE_I2C
+#ifdef USE_BMP
+# 30 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
+#define XSNS_09 9
+#define XI2C_10 10
+
+#define BMP_ADDR1 0x76
+#define BMP_ADDR2 0x77
+
+#define BMP180_CHIPID 0x55
+#define BMP280_CHIPID 0x58
+#define BME280_CHIPID 0x60
+#define BME680_CHIPID 0x61
+
+#define BMP_REGISTER_CHIPID 0xD0
+
+#define BMP_REGISTER_RESET 0xE0
+
+#define BMP_CMND_RESET 0xB6
+
+#define BMP_MAX_SENSORS 2
+
+const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
+
+typedef struct {
+  uint8_t bmp_address;
+  char bmp_name[7];
+  uint8_t bmp_type;
+  uint8_t bmp_model;
+#ifdef USE_BME680
+  uint8_t bme680_state;
+  float bmp_gas_resistance;
+#endif
+  float bmp_temperature;
+  float bmp_pressure;
+  float bmp_humidity;
+} bmp_sensors_t;
+
+uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 };
+uint8_t bmp_count = 0;
+uint8_t bmp_once = 1;
+
+bmp_sensors_t *bmp_sensors = nullptr;
+
+
+
+
+
+#define BMP180_REG_CONTROL 0xF4
+#define BMP180_REG_RESULT 0xF6
+#define BMP180_TEMPERATURE 0x2E
+#define BMP180_PRESSURE3 0xF4
+
+#define BMP180_AC1 0xAA
+#define BMP180_AC2 0xAC
+#define BMP180_AC3 0xAE
+#define BMP180_AC4 0xB0
+#define BMP180_AC5 0xB2
+#define BMP180_AC6 0xB4
+#define BMP180_VB1 0xB6
+#define BMP180_VB2 0xB8
+#define BMP180_MB 0xBA
+#define BMP180_MC 0xBC
+#define BMP180_MD 0xBE
+
+#define BMP180_OSS 3
+
+typedef struct {
+  int16_t cal_ac1;
+  int16_t cal_ac2;
+  int16_t cal_ac3;
+  int16_t cal_b1;
+  int16_t cal_b2;
+  int16_t cal_mc;
+  int16_t cal_md;
+  uint16_t cal_ac4;
+  uint16_t cal_ac5;
+  uint16_t cal_ac6;
+} bmp180_cal_data_t;
+
+bmp180_cal_data_t *bmp180_cal_data = nullptr;
+
+bool Bmp180Calibration(uint8_t bmp_idx)
+{
+  if (!bmp180_cal_data) {
+    bmp180_cal_data = (bmp180_cal_data_t*)malloc(BMP_MAX_SENSORS * sizeof(bmp180_cal_data_t));
+  }
+  if (!bmp180_cal_data) { return false; }
+
+  bmp180_cal_data[bmp_idx].cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
+  bmp180_cal_data[bmp_idx].cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
+  bmp180_cal_data[bmp_idx].cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
+  bmp180_cal_data[bmp_idx].cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
+  bmp180_cal_data[bmp_idx].cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
+  bmp180_cal_data[bmp_idx].cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
+  bmp180_cal_data[bmp_idx].cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
+  bmp180_cal_data[bmp_idx].cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
+  bmp180_cal_data[bmp_idx].cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
+  bmp180_cal_data[bmp_idx].cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
+
+
+  if (!bmp180_cal_data[bmp_idx].cal_ac1 |
+      !bmp180_cal_data[bmp_idx].cal_ac2 |
+      !bmp180_cal_data[bmp_idx].cal_ac3 |
+      !bmp180_cal_data[bmp_idx].cal_ac4 |
+      !bmp180_cal_data[bmp_idx].cal_ac5 |
+      !bmp180_cal_data[bmp_idx].cal_ac6 |
+      !bmp180_cal_data[bmp_idx].cal_b1 |
+      !bmp180_cal_data[bmp_idx].cal_b2 |
+      !bmp180_cal_data[bmp_idx].cal_mc |
+      !bmp180_cal_data[bmp_idx].cal_md) {
+    return false;
+  }
+
+  if ((bmp180_cal_data[bmp_idx].cal_ac1 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac2 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac3 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac4 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac5 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_ac6 == 0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_b1 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_b2 == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_mc == (int16_t)0xFFFF) |
+      (bmp180_cal_data[bmp_idx].cal_md == (int16_t)0xFFFF)) {
+    return false;
+  }
+  return true;
+}
+
+void Bmp180Read(uint8_t bmp_idx)
+{
+  if (!bmp180_cal_data) { return; }
+
+  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_TEMPERATURE);
+  delay(5);
+  int ut = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
+  int32_t xt1 = (ut - (int32_t)bmp180_cal_data[bmp_idx].cal_ac6) * ((int32_t)bmp180_cal_data[bmp_idx].cal_ac5) >> 15;
+  int32_t xt2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_mc << 11) / (xt1 + (int32_t)bmp180_cal_data[bmp_idx].cal_md);
+  int32_t bmp180_b5 = xt1 + xt2;
+  bmp_sensors[bmp_idx].bmp_temperature = ((bmp180_b5 + 8) >> 4) / 10.0;
+
+  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_PRESSURE3);
+  delay(2 + (4 << BMP180_OSS));
+  uint32_t up = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
+  up >>= (8 - BMP180_OSS);
+
+  int32_t b6 = bmp180_b5 - 4000;
+  int32_t x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b2 * ((b6 * b6) >> 12)) >> 11;
+  int32_t x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac2 * b6) >> 11;
+  int32_t x3 = x1 + x2;
+  int32_t b3 = ((((int32_t)bmp180_cal_data[bmp_idx].cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
+
+  x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac3 * b6) >> 13;
+  x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b1 * ((b6 * b6) >> 12)) >> 16;
+  x3 = ((x1 + x2) + 2) >> 2;
+  uint32_t b4 = ((uint32_t)bmp180_cal_data[bmp_idx].cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
+  uint32_t b7 = ((uint32_t)up - b3) * (uint32_t)(50000UL >> BMP180_OSS);
+
+  int32_t p;
+  if (b7 < 0x80000000) {
+    p = (b7 * 2) / b4;
+  }
+  else {
+    p = (b7 / b4) * 2;
+  }
+  x1 = (p >> 8) * (p >> 8);
+  x1 = (x1 * 3038) >> 16;
+  x2 = (-7357 * p) >> 16;
+  p += ((x1 + x2 + (int32_t)3791) >> 4);
+  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 100.0;
+}
+
+
+
+
+
+
+
+#define BME280_REGISTER_CONTROLHUMID 0xF2
+#define BME280_REGISTER_CONTROL 0xF4
+#define BME280_REGISTER_CONFIG 0xF5
+#define BME280_REGISTER_PRESSUREDATA 0xF7
+#define BME280_REGISTER_TEMPDATA 0xFA
+#define BME280_REGISTER_HUMIDDATA 0xFD
+
+#define BME280_REGISTER_DIG_T1 0x88
+#define BME280_REGISTER_DIG_T2 0x8A
+#define BME280_REGISTER_DIG_T3 0x8C
+#define BME280_REGISTER_DIG_P1 0x8E
+#define BME280_REGISTER_DIG_P2 0x90
+#define BME280_REGISTER_DIG_P3 0x92
+#define BME280_REGISTER_DIG_P4 0x94
+#define BME280_REGISTER_DIG_P5 0x96
+#define BME280_REGISTER_DIG_P6 0x98
+#define BME280_REGISTER_DIG_P7 0x9A
+#define BME280_REGISTER_DIG_P8 0x9C
+#define BME280_REGISTER_DIG_P9 0x9E
+#define BME280_REGISTER_DIG_H1 0xA1
+#define BME280_REGISTER_DIG_H2 0xE1
+#define BME280_REGISTER_DIG_H3 0xE3
+#define BME280_REGISTER_DIG_H4 0xE4
+#define BME280_REGISTER_DIG_H5 0xE5
+#define BME280_REGISTER_DIG_H6 0xE7
+
+typedef struct {
+  uint16_t dig_T1;
+  int16_t dig_T2;
+  int16_t dig_T3;
+  uint16_t dig_P1;
+  int16_t dig_P2;
+  int16_t dig_P3;
+  int16_t dig_P4;
+  int16_t dig_P5;
+  int16_t dig_P6;
+  int16_t dig_P7;
+  int16_t dig_P8;
+  int16_t dig_P9;
+  int16_t dig_H2;
+  int16_t dig_H4;
+  int16_t dig_H5;
+  uint8_t dig_H1;
+  uint8_t dig_H3;
+  int8_t dig_H6;
+} Bme280CalibrationData_t;
+
+Bme280CalibrationData_t *Bme280CalibrationData = nullptr;
+
+bool Bmx280Calibrate(uint8_t bmp_idx)
+{
+
+
+  if (!Bme280CalibrationData) {
+    Bme280CalibrationData = (Bme280CalibrationData_t*)malloc(BMP_MAX_SENSORS * sizeof(Bme280CalibrationData_t));
+  }
+  if (!Bme280CalibrationData) { return false; }
+
+  Bme280CalibrationData[bmp_idx].dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
+  Bme280CalibrationData[bmp_idx].dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
+  Bme280CalibrationData[bmp_idx].dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
+  Bme280CalibrationData[bmp_idx].dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
+  Bme280CalibrationData[bmp_idx].dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
+  Bme280CalibrationData[bmp_idx].dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
+  Bme280CalibrationData[bmp_idx].dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
+  Bme280CalibrationData[bmp_idx].dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
+  Bme280CalibrationData[bmp_idx].dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
+  Bme280CalibrationData[bmp_idx].dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
+  Bme280CalibrationData[bmp_idx].dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
+  Bme280CalibrationData[bmp_idx].dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
+  if (BME280_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
+    Bme280CalibrationData[bmp_idx].dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
+    Bme280CalibrationData[bmp_idx].dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
+    Bme280CalibrationData[bmp_idx].dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
+    Bme280CalibrationData[bmp_idx].dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
+    Bme280CalibrationData[bmp_idx].dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
+    Bme280CalibrationData[bmp_idx].dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x00);
+
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROLHUMID, 0x01);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONFIG, 0xA0);
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x27);
+  } else {
+    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0xB7);
+  }
+
+  return true;
+}
+
+void Bme280Read(uint8_t bmp_idx)
+{
+  if (!Bme280CalibrationData) { return; }
+
+  int32_t adc_T = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_TEMPDATA);
+  adc_T >>= 4;
+
+  int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1 << 1))) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_T2)) >> 11;
+  int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1))) >> 12) *
+    ((int32_t)Bme280CalibrationData[bmp_idx].dig_T3)) >> 14;
+  int32_t t_fine = vart1 + vart2;
+  float T = (t_fine * 5 + 128) >> 8;
+  bmp_sensors[bmp_idx].bmp_temperature = T / 100.0;
+
+  int32_t adc_P = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_PRESSUREDATA);
+  adc_P >>= 4;
+
+  int64_t var1 = ((int64_t)t_fine) - 128000;
+  int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P6;
+  var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P5) << 17);
+  var2 = var2 + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P4) << 35);
+  var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P2) << 12);
+  var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData[bmp_idx].dig_P1) >> 33;
+  if (0 == var1) {
+    return;
+  }
+  int64_t p = 1048576 - adc_P;
+  p = (((p << 31) - var2) * 3125) / var1;
+  var1 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P9) * (p >> 13) * (p >> 13)) >> 25;
+  var2 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P8) * p) >> 19;
+  p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P7) << 4);
+  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 25600.0;
+
+  if (BMP280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { return; }
+
+  int32_t adc_H = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_HUMIDDATA);
+
+  int32_t v_x1_u32r = (t_fine - ((int32_t)76800));
+  v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData[bmp_idx].dig_H4) << 20) -
+    (((int32_t)Bme280CalibrationData[bmp_idx].dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
+    (((((((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H6)) >> 10) *
+    (((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
+    ((int32_t)2097152)) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H2) + 8192) >> 14));
+  v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) *
+    ((int32_t)Bme280CalibrationData[bmp_idx].dig_H1)) >> 4));
+  v_x1_u32r = (v_x1_u32r < 0) ? 0 : v_x1_u32r;
+  v_x1_u32r = (v_x1_u32r > 419430400) ? 419430400 : v_x1_u32r;
+  float h = (v_x1_u32r >> 12);
+  bmp_sensors[bmp_idx].bmp_humidity = h / 1024.0;
+}
+
+#ifdef USE_BME680
+
+
+
+
+#include <bme680.h>
+
+struct bme680_dev *gas_sensor = nullptr;
+
+static void BmeDelayMs(uint32_t ms)
+{
+  delay(ms);
+}
+
+bool Bme680Init(uint8_t bmp_idx)
+{
+  if (!gas_sensor) {
+    gas_sensor = (bme680_dev*)malloc(BMP_MAX_SENSORS * sizeof(bme680_dev));
+  }
+  if (!gas_sensor) { return false; }
+
+  gas_sensor[bmp_idx].dev_id = bmp_sensors[bmp_idx].bmp_address;
+  gas_sensor[bmp_idx].intf = BME680_I2C_INTF;
+  gas_sensor[bmp_idx].read = &I2cReadBuffer;
+  gas_sensor[bmp_idx].write = &I2cWriteBuffer;
+  gas_sensor[bmp_idx].delay_ms = BmeDelayMs;
+
+
+
+  gas_sensor[bmp_idx].amb_temp = 25;
+
+  int8_t rslt = BME680_OK;
+  rslt = bme680_init(&gas_sensor[bmp_idx]);
+  if (rslt != BME680_OK) { return false; }
+
+
+  gas_sensor[bmp_idx].tph_sett.os_hum = BME680_OS_2X;
+  gas_sensor[bmp_idx].tph_sett.os_pres = BME680_OS_4X;
+  gas_sensor[bmp_idx].tph_sett.os_temp = BME680_OS_8X;
+  gas_sensor[bmp_idx].tph_sett.filter = BME680_FILTER_SIZE_3;
+
+
+  gas_sensor[bmp_idx].gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
+
+  gas_sensor[bmp_idx].gas_sett.heatr_temp = 320;
+  gas_sensor[bmp_idx].gas_sett.heatr_dur = 150;
+
+
+
+  gas_sensor[bmp_idx].power_mode = BME680_FORCED_MODE;
+
+
+  uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
+
+
+  rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor[bmp_idx]);
+  if (rslt != BME680_OK) { return false; }
+
+  bmp_sensors[bmp_idx].bme680_state = 0;
+
+  return true;
+}
+
+void Bme680Read(uint8_t bmp_idx)
+{
+  if (!gas_sensor) { return; }
+
+  int8_t rslt = BME680_OK;
+
+  if (BME680_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
+    if (0 == bmp_sensors[bmp_idx].bme680_state) {
+
+      rslt = bme680_set_sensor_mode(&gas_sensor[bmp_idx]);
+      if (rslt != BME680_OK) { return; }
+
+
+
+
+
+
+
+      bmp_sensors[bmp_idx].bme680_state = 1;
+    } else {
+      bmp_sensors[bmp_idx].bme680_state = 0;
+
+      struct bme680_field_data data;
+      rslt = bme680_get_sensor_data(&data, &gas_sensor[bmp_idx]);
+      if (rslt != BME680_OK) { return; }
+
+      bmp_sensors[bmp_idx].bmp_temperature = data.temperature / 100.0;
+      bmp_sensors[bmp_idx].bmp_humidity = data.humidity / 1000.0;
+      bmp_sensors[bmp_idx].bmp_pressure = data.pressure / 100.0;
+
+      if (data.status & BME680_GASM_VALID_MSK) {
+        bmp_sensors[bmp_idx].bmp_gas_resistance = data.gas_resistance / 1000.0;
+      } else {
+        bmp_sensors[bmp_idx].bmp_gas_resistance = 0;
+      }
+    }
+  }
+  return;
+}
+
+#endif
+
+
+
+void BmpDetect(void)
+{
+  int bmp_sensor_size = BMP_MAX_SENSORS * sizeof(bmp_sensors_t);
+  if (!bmp_sensors) {
+    bmp_sensors = (bmp_sensors_t*)malloc(bmp_sensor_size);
+  }
+  if (!bmp_sensors) { return; }
+  memset(bmp_sensors, 0, bmp_sensor_size);
+
+  for (uint32_t i = 0; i < BMP_MAX_SENSORS; i++) {
+    if (I2cActive(bmp_addresses[i])) { continue; }
+    uint8_t bmp_type = I2cRead8(bmp_addresses[i], BMP_REGISTER_CHIPID);
+    if (bmp_type) {
+      bmp_sensors[bmp_count].bmp_address = bmp_addresses[i];
+      bmp_sensors[bmp_count].bmp_type = bmp_type;
+      bmp_sensors[bmp_count].bmp_model = 0;
+
+      bool success = false;
+      switch (bmp_type) {
+        case BMP180_CHIPID:
+          success = Bmp180Calibration(bmp_count);
+          break;
+        case BME280_CHIPID:
+          bmp_sensors[bmp_count].bmp_model++;
+        case BMP280_CHIPID:
+          bmp_sensors[bmp_count].bmp_model++;
+          success = Bmx280Calibrate(bmp_count);
+          break;
+#ifdef USE_BME680
+        case BME680_CHIPID:
+          bmp_sensors[bmp_count].bmp_model = 3;
+          success = Bme680Init(bmp_count);
+          break;
+#endif
+      }
+      if (success) {
+        GetTextIndexed(bmp_sensors[bmp_count].bmp_name, sizeof(bmp_sensors[bmp_count].bmp_name), bmp_sensors[bmp_count].bmp_model, kBmpTypes);
+        I2cSetActiveFound(bmp_sensors[bmp_count].bmp_address, bmp_sensors[bmp_count].bmp_name);
+        bmp_count++;
+      }
+    }
+  }
+}
+
+void BmpRead(void)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    switch (bmp_sensors[bmp_idx].bmp_type) {
+      case BMP180_CHIPID:
+        Bmp180Read(bmp_idx);
+        break;
+      case BMP280_CHIPID:
+      case BME280_CHIPID:
+        Bme280Read(bmp_idx);
+        break;
+#ifdef USE_BME680
+      case BME680_CHIPID:
+        Bme680Read(bmp_idx);
+        break;
+#endif
+    }
+  }
+  ConvertTemp(bmp_sensors[0].bmp_temperature);
+  ConvertHumidity(bmp_sensors[0].bmp_humidity);
+}
+
+void BmpShow(bool json)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    if (bmp_sensors[bmp_idx].bmp_type) {
+      float bmp_sealevel = 0.0;
+      if (bmp_sensors[bmp_idx].bmp_pressure != 0.0) {
+        bmp_sealevel = (bmp_sensors[bmp_idx].bmp_pressure / FastPrecisePow(1.0 - ((float)Settings.altitude / 44330.0), 5.255)) - 21.6;
+        bmp_sealevel = ConvertPressure(bmp_sealevel);
+      }
+      float bmp_temperature = ConvertTemp(bmp_sensors[bmp_idx].bmp_temperature);
+      float bmp_pressure = ConvertPressure(bmp_sensors[bmp_idx].bmp_pressure);
+
+      char name[10];
+      strlcpy(name, bmp_sensors[bmp_idx].bmp_name, sizeof(name));
+      if (bmp_count > 1) {
+        snprintf_P(name, sizeof(name), PSTR("%s%c%02X"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_address);
+      }
+
+      char temperature[33];
+      dtostrfd(bmp_temperature, Settings.flag2.temperature_resolution, temperature);
+      char pressure[33];
+      dtostrfd(bmp_pressure, Settings.flag2.pressure_resolution, pressure);
+      char sea_pressure[33];
+      dtostrfd(bmp_sealevel, Settings.flag2.pressure_resolution, sea_pressure);
+      char humidity[33];
+      dtostrfd(bmp_sensors[bmp_idx].bmp_humidity, Settings.flag2.humidity_resolution, humidity);
+#ifdef USE_BME680
+      char gas_resistance[33];
+      dtostrfd(bmp_sensors[bmp_idx].bmp_gas_resistance, 2, gas_resistance);
+#endif
+
+      if (json) {
+        char json_humidity[40];
+        snprintf_P(json_humidity, sizeof(json_humidity), PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+        char json_sealevel[40];
+        snprintf_P(json_sealevel, sizeof(json_sealevel), PSTR(",\"" D_JSON_PRESSUREATSEALEVEL "\":%s"), sea_pressure);
+#ifdef USE_BME680
+        char json_gas[40];
+        snprintf_P(json_gas, sizeof(json_gas), PSTR(",\"" D_JSON_GAS "\":%s"), gas_resistance);
+
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s%s}"),
+          name,
+          temperature,
+          (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "",
+          pressure,
+          (Settings.altitude != 0) ? json_sealevel : "",
+          (bmp_sensors[bmp_idx].bmp_model >= 3) ? json_gas : "");
+#else
+        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s}"),
+          name, temperature, (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : "");
+#endif
+
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == bmp_idx)) {
+          DomoticzTempHumPressureSensor(temperature, humidity, pressure);
+#ifdef USE_BME680
+          if (bmp_sensors[bmp_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp_sensors[bmp_idx].bmp_gas_resistance); }
+#endif
+        }
+#endif
+
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, bmp_temperature);
+          KnxSensor(KNX_HUMIDITY, bmp_sensors[bmp_idx].bmp_humidity);
+        }
+#endif
+
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, name, temperature, TempUnit());
+        if (bmp_sensors[bmp_idx].bmp_model >= 2) {
+          WSContentSend_PD(HTTP_SNS_HUM, name, humidity);
+        }
+        WSContentSend_PD(HTTP_SNS_PRESSURE, name, pressure, PressureUnit().c_str());
+        if (Settings.altitude != 0) {
+          WSContentSend_PD(HTTP_SNS_SEAPRESSURE, name, sea_pressure, PressureUnit().c_str());
+        }
+#ifdef USE_BME680
+        if (bmp_sensors[bmp_idx].bmp_model >= 3) {
+          WSContentSend_PD(PSTR("{s}%s " D_GAS "{m}%s " D_UNIT_KILOOHM "{e}"), name, gas_resistance);
+        }
+#endif
+
+#endif
+      }
+    }
+  }
+}
+
+#ifdef USE_DEEPSLEEP
+
+void BMP_EnterSleep(void)
+{
+  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
+    switch (bmp_sensors[bmp_idx].bmp_type) {
+      case BMP180_CHIPID:
+      case BMP280_CHIPID:
+      case BME280_CHIPID:
+        I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP_REGISTER_RESET, BMP_CMND_RESET);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+#endif
+
+
+
+
+
+bool Xsns09(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_10)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    BmpDetect();
+  }
+  else if (bmp_count) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        BmpRead();
+        break;
+      case FUNC_JSON_APPEND:
+        BmpShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        BmpShow(0);
+        break;
+#endif
+#ifdef USE_DEEPSLEEP
+      case FUNC_SAVE_BEFORE_RESTART:
+        BMP_EnterSleep();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_10_bh1750.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_10_bh1750.ino"
+#ifdef USE_I2C
+#ifdef USE_BH1750
+
+
+
+
+
+
+#define XSNS_10 10
+#define XI2C_11 11
+
+#define BH1750_ADDR1 0x23
+#define BH1750_ADDR2 0x5C
+
+#define BH1750_CONTINUOUS_HIGH_RES_MODE 0x10
+
+uint8_t bh1750_address;
+uint8_t bh1750_addresses[] = { BH1750_ADDR1, BH1750_ADDR2 };
+uint8_t bh1750_type = 0;
+uint8_t bh1750_valid = 0;
+uint16_t bh1750_illuminance = 0;
+char bh1750_types[] = "BH1750";
+
+bool Bh1750Read(void)
+{
+  if (bh1750_valid) { bh1750_valid--; }
+
+  if (2 != Wire.requestFrom(bh1750_address, (uint8_t)2)) { return false; }
+  uint8_t msb = Wire.read();
+  uint8_t lsb = Wire.read();
+  bh1750_illuminance = ((msb << 8) | lsb) / 1.2;
+  bh1750_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Bh1750Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(bh1750_addresses); i++) {
+    bh1750_address = bh1750_addresses[i];
+    if (I2cActive(bh1750_address)) { continue; }
+    Wire.beginTransmission(bh1750_address);
+    Wire.write(BH1750_CONTINUOUS_HIGH_RES_MODE);
+    if (!Wire.endTransmission()) {
+      I2cSetActiveFound(bh1750_address, bh1750_types);
+      bh1750_type = 1;
+      break;
+    }
+  }
+}
+
+void Bh1750EverySecond(void)
+{
+
+  if (!Bh1750Read()) {
+    AddLogMissed(bh1750_types, bh1750_valid);
+  }
+}
+
+void Bh1750Show(bool json)
+{
+  if (bh1750_valid) {
+    if (json) {
+      ResponseAppend_P(JSON_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, bh1750_illuminance);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns10(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_11)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Bh1750Detect();
+  }
+  else if (bh1750_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Bh1750EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Bh1750Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Bh1750Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_11_veml6070.ino"
+# 89 "S:/Development/Tasmota/tasmota/xsns_11_veml6070.ino"
+#ifdef USE_I2C
+#ifdef USE_VEML6070
+
+
+
+
+
+
+#define XSNS_11 11
+#define XI2C_12 12
+
+#define VEML6070_ADDR_H 0x39
+#define VEML6070_ADDR_L 0x38
+#define VEML6070_INTEGRATION_TIME 3
+#define VEML6070_ENABLE 1
+#define VEML6070_DISABLE 0
+#define VEML6070_RSET_DEFAULT 270000
+#define VEML6070_UV_MAX_INDEX 15
+#define VEML6070_UV_MAX_DEFAULT 11
+#define VEML6070_POWER_COEFFCIENT 0.025
+#define VEML6070_TABLE_COEFFCIENT 32.86270591
+
+
+
+
+
+const char kVemlTypes[] PROGMEM = "VEML6070";
+double uv_risk_map[VEML6070_UV_MAX_INDEX] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+double uvrisk = 0;
+double uvpower = 0;
+uint16_t uvlevel = 0;
+uint8_t veml6070_addr_low = VEML6070_ADDR_L;
+uint8_t veml6070_addr_high = VEML6070_ADDR_H;
+uint8_t itime = VEML6070_INTEGRATION_TIME;
+uint8_t veml6070_type = 0;
+char veml6070_name[9];
+char str_uvrisk_text[10];
+
+
+
+void Veml6070Detect(void)
+{
+  if (I2cActive(VEML6070_ADDR_L)) { return; }
+
+
+  Wire.beginTransmission(VEML6070_ADDR_L);
+  Wire.write((itime << 2) | 0x02);
+  uint8_t status = Wire.endTransmission();
+
+  if (!status) {
+    veml6070_type = 1;
+    Veml6070UvTableInit();
+    uint8_t veml_model = 0;
+    GetTextIndexed(veml6070_name, sizeof(veml6070_name), veml_model, kVemlTypes);
+    I2cSetActiveFound(VEML6070_ADDR_L, veml6070_name);
+  }
+}
+
+
+
+void Veml6070UvTableInit(void)
+{
+
+  for (uint32_t i = 0; i < VEML6070_UV_MAX_INDEX; i++) {
+#ifdef USE_VEML6070_RSET
+    if ( (USE_VEML6070_RSET >= 220000) && (USE_VEML6070_RSET <= 1000000) ) {
+      uv_risk_map[i] = ( (USE_VEML6070_RSET / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+    } else {
+      uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor error %d"), USE_VEML6070_RSET);
+    }
+#else
+    uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor default used %d"), VEML6070_RSET_DEFAULT);
+#endif
+  }
+}
+
+
+
+void Veml6070EverySecond(void)
+{
+
+  Veml6070ModeCmd(1);
+  uvlevel = Veml6070ReadUv();
+  uvrisk = Veml6070UvRiskLevel(uvlevel);
+  uvpower = Veml6070UvPower(uvrisk);
+  Veml6070ModeCmd(0);
+}
+
+
+
+void Veml6070ModeCmd(bool mode_cmd)
+{
+
+
+  Wire.beginTransmission(VEML6070_ADDR_L);
+  Wire.write((mode_cmd << 0) | 0x02 | (itime << 2));
+  uint8_t status = Wire.endTransmission();
+
+  if (!status) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 mode_cmd"));
+  }
+}
+
+
+
+uint16_t Veml6070ReadUv(void)
+{
+  uint16_t uv_raw = 0;
+
+  if (Wire.requestFrom(VEML6070_ADDR_H, 1) != 1) {
+    return -1;
+  }
+  uv_raw = Wire.read();
+  uv_raw <<= 8;
+
+  if (Wire.requestFrom(VEML6070_ADDR_L, 1) != 1) {
+    return -1;
+  }
+  uv_raw |= Wire.read();
+
+  return uv_raw;
+}
+
+
+
+double Veml6070UvRiskLevel(uint16_t uv_level)
+{
+  double risk = 0;
+  if (uv_level < uv_risk_map[VEML6070_UV_MAX_INDEX-1]) {
+    risk = (double)uv_level / uv_risk_map[0];
+
+    if ( (risk >= 0) && (risk <= 2.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_1); }
+    else if ( (risk >= 3.0) && (risk <= 5.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_2); }
+    else if ( (risk >= 6.0) && (risk <= 7.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_3); }
+    else if ( (risk >= 8.0) && (risk <= 10.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_4); }
+    else if ( (risk >= 11.0) && (risk <= 12.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_5); }
+    else if ( (risk >= 13.0) && (risk <= 25.0) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_6); }
+    else { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7); }
+    return risk;
+  } else {
+
+    snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7);
+    return ( risk = 99 );
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 out of range %d"), risk);
+  }
+}
+
+
+
+double Veml6070UvPower(double uvrisk)
+{
+
+  double power = 0;
+  return ( power = VEML6070_POWER_COEFFCIENT * uvrisk );
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+#ifdef USE_VEML6070_SHOW_RAW
+  const char HTTP_SNS_UV_LEVEL[] PROGMEM = "{s}VEML6070 " D_UV_LEVEL "{m}%s " D_UNIT_INCREMENTS "{e}";
+#endif
+
+  const char HTTP_SNS_UV_INDEX[] PROGMEM = "{s}VEML6070 " D_UV_INDEX "{m}%s %s{e}";
+  const char HTTP_SNS_UV_POWER[] PROGMEM = "{s}VEML6070 " D_UV_POWER "{m}%s " D_UNIT_WATT_METER_QUADRAT "{e}";
+#endif
+
+
+
+void Veml6070Show(bool json)
+{
+
+  char str_uvlevel[33];
+  dtostrfd((double)uvlevel, 0, str_uvlevel);
+  char str_uvrisk[33];
+  dtostrfd(uvrisk, 2, str_uvrisk);
+  char str_uvpower[33];
+  dtostrfd(uvpower, 3, str_uvpower);
+  if (json) {
+#ifdef USE_VEML6070_SHOW_RAW
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_LEVEL "\":%s,\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
+      veml6070_name, str_uvlevel, str_uvrisk, str_uvrisk_text, str_uvpower);
+#else
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
+      veml6070_name, str_uvrisk, str_uvrisk_text, str_uvpower);
+#endif
+#ifdef USE_DOMOTICZ
+  if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, uvlevel); }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+#ifdef USE_VEML6070_SHOW_RAW
+    WSContentSend_PD(HTTP_SNS_UV_LEVEL, str_uvlevel);
+#endif
+    WSContentSend_PD(HTTP_SNS_UV_INDEX, str_uvrisk, str_uvrisk_text);
+    WSContentSend_PD(HTTP_SNS_UV_POWER, str_uvpower);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns11(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_12)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Veml6070Detect();
+  }
+  else if (veml6070_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Veml6070EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Veml6070Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Veml6070Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
+#ifdef USE_I2C
+#ifdef USE_ADS1115
+# 43 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
+#define XSNS_12 12
+#define XI2C_13 13
+
+#define ADS1115_ADDRESS_ADDR_GND 0x48
+#define ADS1115_ADDRESS_ADDR_VDD 0x49
+#define ADS1115_ADDRESS_ADDR_SDA 0x4A
+#define ADS1115_ADDRESS_ADDR_SCL 0x4B
+
+#define ADS1115_CONVERSIONDELAY (8)
+
+
+
+
+#define ADS1115_REG_POINTER_MASK (0x03)
+#define ADS1115_REG_POINTER_CONVERT (0x00)
+#define ADS1115_REG_POINTER_CONFIG (0x01)
+#define ADS1115_REG_POINTER_LOWTHRESH (0x02)
+#define ADS1115_REG_POINTER_HITHRESH (0x03)
+
+
+
+
+#define ADS1115_REG_CONFIG_OS_MASK (0x8000)
+#define ADS1115_REG_CONFIG_OS_SINGLE (0x8000)
+#define ADS1115_REG_CONFIG_OS_BUSY (0x0000)
+#define ADS1115_REG_CONFIG_OS_NOTBUSY (0x8000)
+
+#define ADS1115_REG_CONFIG_MUX_MASK (0x7000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_0_1 (0x0000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_0_3 (0x1000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_1_3 (0x2000)
+#define ADS1115_REG_CONFIG_MUX_DIFF_2_3 (0x3000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_0 (0x4000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_1 (0x5000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_2 (0x6000)
+#define ADS1115_REG_CONFIG_MUX_SINGLE_3 (0x7000)
+
+#define ADS1115_REG_CONFIG_PGA_MASK (0x0E00)
+#define ADS1115_REG_CONFIG_PGA_6_144V (0x0000)
+#define ADS1115_REG_CONFIG_PGA_4_096V (0x0200)
+#define ADS1115_REG_CONFIG_PGA_2_048V (0x0400)
+#define ADS1115_REG_CONFIG_PGA_1_024V (0x0600)
+#define ADS1115_REG_CONFIG_PGA_0_512V (0x0800)
+#define ADS1115_REG_CONFIG_PGA_0_256V (0x0A00)
+
+#define ADS1115_REG_CONFIG_MODE_MASK (0x0100)
+#define ADS1115_REG_CONFIG_MODE_CONTIN (0x0000)
+#define ADS1115_REG_CONFIG_MODE_SINGLE (0x0100)
+
+#define ADS1115_REG_CONFIG_DR_MASK (0x00E0)
+#define ADS1115_REG_CONFIG_DR_128SPS (0x0000)
+#define ADS1115_REG_CONFIG_DR_250SPS (0x0020)
+#define ADS1115_REG_CONFIG_DR_490SPS (0x0040)
+#define ADS1115_REG_CONFIG_DR_920SPS (0x0060)
+#define ADS1115_REG_CONFIG_DR_1600SPS (0x0080)
+#define ADS1115_REG_CONFIG_DR_2400SPS (0x00A0)
+#define ADS1115_REG_CONFIG_DR_3300SPS (0x00C0)
+#define ADS1115_REG_CONFIG_DR_6000SPS (0x00E0)
+
+#define ADS1115_REG_CONFIG_CMODE_MASK (0x0010)
+#define ADS1115_REG_CONFIG_CMODE_TRAD (0x0000)
+#define ADS1115_REG_CONFIG_CMODE_WINDOW (0x0010)
+
+#define ADS1115_REG_CONFIG_CPOL_MASK (0x0008)
+#define ADS1115_REG_CONFIG_CPOL_ACTVLOW (0x0000)
+#define ADS1115_REG_CONFIG_CPOL_ACTVHI (0x0008)
+
+#define ADS1115_REG_CONFIG_CLAT_MASK (0x0004)
+#define ADS1115_REG_CONFIG_CLAT_NONLAT (0x0000)
+#define ADS1115_REG_CONFIG_CLAT_LATCH (0x0004)
+
+#define ADS1115_REG_CONFIG_CQUE_MASK (0x0003)
+#define ADS1115_REG_CONFIG_CQUE_1CONV (0x0000)
+#define ADS1115_REG_CONFIG_CQUE_2CONV (0x0001)
+#define ADS1115_REG_CONFIG_CQUE_4CONV (0x0002)
+#define ADS1115_REG_CONFIG_CQUE_NONE (0x0003)
+
+struct ADS1115 {
+  uint8_t count = 0;
+  uint8_t address;
+  uint8_t addresses[4] = { ADS1115_ADDRESS_ADDR_GND, ADS1115_ADDRESS_ADDR_VDD, ADS1115_ADDRESS_ADDR_SDA, ADS1115_ADDRESS_ADDR_SCL };
+  uint8_t found[4] = {false,false,false,false};
+} Ads1115;
+
+
+
+void Ads1115StartComparator(uint8_t channel, uint16_t mode)
+{
+
+  uint16_t config = mode |
+                    ADS1115_REG_CONFIG_CQUE_NONE |
+                    ADS1115_REG_CONFIG_CLAT_NONLAT |
+                    ADS1115_REG_CONFIG_PGA_6_144V |
+                    ADS1115_REG_CONFIG_CPOL_ACTVLOW |
+                    ADS1115_REG_CONFIG_CMODE_TRAD |
+                    ADS1115_REG_CONFIG_DR_6000SPS;
+
+
+  config |= (ADS1115_REG_CONFIG_MUX_SINGLE_0 + (0x1000 * channel));
+
+
+  I2cWrite16(Ads1115.address, ADS1115_REG_POINTER_CONFIG, config);
+}
+
+int16_t Ads1115GetConversion(uint8_t channel)
+{
+  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_SINGLE);
+
+  delay(ADS1115_CONVERSIONDELAY);
+
+  I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
+
+  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_CONTIN);
+  delay(ADS1115_CONVERSIONDELAY);
+
+  uint16_t res = I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
+  return (int16_t)res;
+}
+
+
+
+void Ads1115Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(Ads1115.addresses); i++) {
+    if (!Ads1115.found[i]) {
+      Ads1115.address = Ads1115.addresses[i];
+      if (I2cActive(Ads1115.address)) { continue; }
+      uint16_t buffer;
+      if (I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONVERT) &&
+          I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONFIG)) {
+        Ads1115StartComparator(i, ADS1115_REG_CONFIG_MODE_CONTIN);
+        I2cSetActiveFound(Ads1115.address, "ADS1115");
+        Ads1115.found[i] = 1;
+        Ads1115.count++;
+      }
+    }
+  }
+}
+
+void Ads1115Show(bool json)
+{
+  int16_t values[4];
+
+  for (uint32_t t = 0; t < sizeof(Ads1115.addresses); t++) {
+
+    if (Ads1115.found[t]) {
+
+      uint8_t old_address = Ads1115.address;
+      Ads1115.address = Ads1115.addresses[t];
+      for (uint32_t i = 0; i < 4; i++) {
+        values[i] = Ads1115GetConversion(i);
+
+      }
+      Ads1115.address = old_address;
+
+      char label[15];
+      if (1 == Ads1115.count) {
+
+        snprintf_P(label, sizeof(label), PSTR("ADS1115"));
+      } else {
+
+        snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
+      }
+
+      if (json) {
+        ResponseAppend_P(PSTR(",\"%s\":{"), label);
+        for (uint32_t i = 0; i < 4; i++) {
+          ResponseAppend_P(PSTR("%s\"A%d\":%d"), (0 == i) ? "" : ",", i, values[i]);
+        }
+        ResponseJsonEnd();
+      }
+#ifdef USE_WEBSERVER
+      else {
+        for (uint32_t i = 0; i < 4; i++) {
+          WSContentSend_PD(HTTP_SNS_ANALOG, label, i, values[i]);
+        }
+      }
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns12(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_13)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Ads1115Detect();
+  }
+  else if (Ads1115.count) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        Ads1115Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ads1115Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
+#ifdef USE_I2C
+#ifdef USE_INA219
+# 30 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
+#define XSNS_13 13
+#define XI2C_14 14
+
+#define INA219_ADDRESS1 (0x40)
+#define INA219_ADDRESS2 (0x41)
+#define INA219_ADDRESS3 (0x44)
+#define INA219_ADDRESS4 (0x45)
+
+#define INA219_READ (0x01)
+#define INA219_REG_CONFIG (0x00)
+
+#define INA219_CONFIG_RESET (0x8000)
+
+#define INA219_CONFIG_BVOLTAGERANGE_MASK (0x2000)
+#define INA219_CONFIG_BVOLTAGERANGE_16V (0x0000)
+#define INA219_CONFIG_BVOLTAGERANGE_32V (0x2000)
+
+#define INA219_CONFIG_GAIN_MASK (0x1800)
+#define INA219_CONFIG_GAIN_1_40MV (0x0000)
+#define INA219_CONFIG_GAIN_2_80MV (0x0800)
+#define INA219_CONFIG_GAIN_4_160MV (0x1000)
+#define INA219_CONFIG_GAIN_8_320MV (0x1800)
+
+#define INA219_CONFIG_BADCRES_MASK (0x0780)
+#define INA219_CONFIG_BADCRES_9BIT (0x0080)
+#define INA219_CONFIG_BADCRES_10BIT (0x0100)
+#define INA219_CONFIG_BADCRES_11BIT (0x0200)
+#define INA219_CONFIG_BADCRES_12BIT (0x0400)
+
+#define INA219_CONFIG_SADCRES_MASK (0x0078)
+#define INA219_CONFIG_SADCRES_9BIT_1S_84US (0x0000)
+#define INA219_CONFIG_SADCRES_10BIT_1S_148US (0x0008)
+#define INA219_CONFIG_SADCRES_11BIT_1S_276US (0x0010)
+#define INA219_CONFIG_SADCRES_12BIT_1S_532US (0x0018)
+#define INA219_CONFIG_SADCRES_12BIT_2S_1060US (0x0048)
+#define INA219_CONFIG_SADCRES_12BIT_4S_2130US (0x0050)
+#define INA219_CONFIG_SADCRES_12BIT_8S_4260US (0x0058)
+#define INA219_CONFIG_SADCRES_12BIT_16S_8510US (0x0060)
+#define INA219_CONFIG_SADCRES_12BIT_32S_17MS (0x0068)
+#define INA219_CONFIG_SADCRES_12BIT_64S_34MS (0x0070)
+#define INA219_CONFIG_SADCRES_12BIT_128S_69MS (0x0078)
+
+#define INA219_CONFIG_MODE_MASK (0x0007)
+#define INA219_CONFIG_MODE_POWERDOWN (0x0000)
+#define INA219_CONFIG_MODE_SVOLT_TRIGGERED (0x0001)
+#define INA219_CONFIG_MODE_BVOLT_TRIGGERED (0x0002)
+#define INA219_CONFIG_MODE_SANDBVOLT_TRIGGERED (0x0003)
+#define INA219_CONFIG_MODE_ADCOFF (0x0004)
+#define INA219_CONFIG_MODE_SVOLT_CONTINUOUS (0x0005)
+#define INA219_CONFIG_MODE_BVOLT_CONTINUOUS (0x0006)
+#define INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS (0x0007)
+
+#define INA219_REG_SHUNTVOLTAGE (0x01)
+#define INA219_REG_BUSVOLTAGE (0x02)
+#define INA219_REG_POWER (0x03)
+#define INA219_REG_CURRENT (0x04)
+#define INA219_REG_CALIBRATION (0x05)
+
+uint8_t ina219_type[4] = {0,0,0,0};
+uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
+
+uint32_t ina219_cal_value = 0;
+
+uint32_t ina219_current_divider_ma = 0;
+
+uint8_t ina219_valid[4] = {0,0,0,0};
+float ina219_voltage[4] = {0,0,0,0};
+float ina219_current[4] = {0,0,0,0};
+char ina219_types[] = "INA219";
+uint8_t ina219_count = 0;
+
+bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
+{
+  uint16_t config = 0;
+
+  switch (mode &3) {
+    case 0:
+    case 3:
+      ina219_cal_value = 4096;
+      ina219_current_divider_ma = 10;
+      config = INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+    case 1:
+      ina219_cal_value = 10240;
+      ina219_current_divider_ma = 25;
+      config |= INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+    case 2:
+      ina219_cal_value = 8192;
+      ina219_current_divider_ma = 20;
+      config |= INA219_CONFIG_BVOLTAGERANGE_16V | INA219_CONFIG_GAIN_1_40MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+      break;
+  }
+
+  bool success = I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
+  if (success) {
+
+    I2cWrite16(addr, INA219_REG_CONFIG, config);
+  }
+  return success;
+}
+
+float Ina219GetShuntVoltage_mV(uint16_t addr)
+{
+
+  int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
+
+  return value * 0.01;
+}
+
+float Ina219GetBusVoltage_V(uint16_t addr)
+{
+
+
+  int16_t value = (int16_t)(((uint16_t)I2cReadS16(addr, INA219_REG_BUSVOLTAGE) >> 3) * 4);
+
+  return value * 0.001;
+}
+
+float Ina219GetCurrent_mA(uint16_t addr)
+{
+
+
+
+  I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
+
+
+  float value = I2cReadS16(addr, INA219_REG_CURRENT);
+  value /= ina219_current_divider_ma;
+
+  return value;
+}
+
+bool Ina219Read(void)
+{
+  for (int i=0; i<sizeof(ina219_type); i++) {
+    if (!ina219_type[i]) { continue; }
+    uint16_t addr = ina219_addresses[i];
+    ina219_voltage[i] = Ina219GetBusVoltage_V(addr) + (Ina219GetShuntVoltage_mV(addr) / 1000);
+    ina219_current[i] = Ina219GetCurrent_mA(addr) / 1000;
+    ina219_valid[i] = SENSOR_MAX_MISS;
+
+  }
+  return true;
+}
+# 184 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
+bool Ina219CommandSensor(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+    Settings.ina219_mode = XdrvMailbox.payload;
+    restart_flag = 2;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_13, Settings.ina219_mode);
+
+  return true;
+}
+
+
+
+void Ina219Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(ina219_type); i++) {
+    uint16_t addr = ina219_addresses[i];
+    if (I2cActive(addr)) { continue; }
+    if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
+      I2cSetActiveFound(addr, ina219_types);
+      ina219_type[i] = 1;
+      ina219_count++;
+    }
+  }
+}
+
+void Ina219EverySecond(void)
+{
+
+  Ina219Read();
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_INA219_DATA[] PROGMEM =
+  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
+#endif
+
+void Ina219Show(bool json)
+{
+  int num_found=0;
+  for (int i=0; i<sizeof(ina219_type); i++)
+    if (ina219_type[i] && ina219_valid[i])
+      num_found++;
+
+  int sensor_num = 0;
+  for (int i=0; i<sizeof(ina219_type); i++) {
+    if (!ina219_type[i] || !ina219_valid[i])
+      continue;
+    sensor_num++;
+
+    char voltage[16];
+    dtostrfd(ina219_voltage[i], Settings.flag2.voltage_resolution, voltage);
+    char current[16];
+    dtostrfd(ina219_current[i], Settings.flag2.current_resolution, current);
+    char power[16];
+    dtostrfd(ina219_voltage[i] * ina219_current[i], Settings.flag2.wattage_resolution, power);
+    char name[16];
+    if (num_found>1)
+      snprintf_P(name, sizeof(name), PSTR("%s%c%d"), ina219_types, IndexSeparator(), sensor_num);
+    else
+      snprintf_P(name, sizeof(name), PSTR("%s"), ina219_types);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%02x,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
+                       name, ina219_addresses[i], voltage, current, power);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, voltage);
+        DomoticzSensor(DZ_CURRENT, current);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_INA219_DATA, name, voltage, name, current, name, power);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns13(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_14)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Ina219Detect();
+  }
+  else if (ina219_count) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_13 == XdrvMailbox.index) {
+          result = Ina219CommandSensor();
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        Ina219EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Ina219Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Ina219Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_14_sht3x.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_14_sht3x.ino"
+#ifdef USE_I2C
+#ifdef USE_SHT3X
+
+
+
+
+
+
+#define XSNS_14 14
+#define XI2C_15 15
+
+#define SHT3X_ADDR_GND 0x44
+#define SHT3X_ADDR_VDD 0x45
+#define SHTC3_ADDR 0x70
+
+#define SHT3X_MAX_SENSORS 3
+
+const char kShtTypes[] PROGMEM = "SHT3X|SHT3X|SHTC3";
+uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD, SHTC3_ADDR };
+
+uint8_t sht3x_count = 0;
+struct SHT3XSTRUCT {
+  uint8_t address;
+  char types[6];
+} sht3x_sensors[SHT3X_MAX_SENSORS];
+
+bool Sht3xRead(float &t, float &h, uint8_t sht3x_address)
+{
+  unsigned int data[6];
+
+  t = NAN;
+  h = NAN;
+
+  Wire.beginTransmission(sht3x_address);
+  if (SHTC3_ADDR == sht3x_address) {
+    Wire.write(0x35);
+    Wire.write(0x17);
+    Wire.endTransmission();
+    Wire.beginTransmission(sht3x_address);
+    Wire.write(0x78);
+    Wire.write(0x66);
+  } else {
+    Wire.write(0x2C);
+    Wire.write(0x06);
+  }
+  if (Wire.endTransmission() != 0) {
+    return false;
+  }
+  delay(30);
+  Wire.requestFrom(sht3x_address, (uint8_t)6);
+  for (uint32_t i = 0; i < 6; i++) {
+    data[i] = Wire.read();
+  };
+  t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45);
+  h = ConvertHumidity((float)((((data[3] << 8) | data[4]) * 100) / 65535.0));
+  return (!isnan(t) && !isnan(h) && (h != 0));
+}
+
+
+
+void Sht3xDetect(void)
+{
+  for (uint32_t i = 0; i < SHT3X_MAX_SENSORS; i++) {
+    if (I2cActive(sht3x_addresses[i])) { continue; }
+    float t;
+    float h;
+    if (Sht3xRead(t, h, sht3x_addresses[i])) {
+      sht3x_sensors[sht3x_count].address = sht3x_addresses[i];
+      GetTextIndexed(sht3x_sensors[sht3x_count].types, sizeof(sht3x_sensors[sht3x_count].types), i, kShtTypes);
+      I2cSetActiveFound(sht3x_sensors[sht3x_count].address, sht3x_sensors[sht3x_count].types);
+      sht3x_count++;
+    }
+  }
+}
+
+void Sht3xShow(bool json)
+{
+  for (uint32_t i = 0; i < sht3x_count; i++) {
+    float t;
+    float h;
+    if (Sht3xRead(t, h, sht3x_sensors[i].address)) {
+      char temperature[33];
+      dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+      char humidity[33];
+      dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
+      char types[11];
+      snprintf_P(types, sizeof(types), PSTR("%s%c0x%02X"), sht3x_sensors[i].types, IndexSeparator(), sht3x_sensors[i].address);
+
+      if (json) {
+        ResponseAppend_P(JSON_SNS_TEMPHUM, types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+        if ((0 == tele_period) && (0 == i)) {
+          DomoticzTempHumSensor(temperature, humidity);
+        }
+#endif
+
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, t);
+        KnxSensor(KNX_HUMIDITY, h);
+      }
+#endif
+
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
+        WSContentSend_PD(HTTP_SNS_HUM, types, humidity);
+#endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool Xsns14(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_15)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Sht3xDetect();
+  }
+  else if (sht3x_count) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        Sht3xShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sht3xShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+#ifdef USE_MHZ19
+# 33 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+#define XSNS_15 15
+
+enum MhzFilterOptions {MHZ19_FILTER_OFF, MHZ19_FILTER_OFF_ALLSAMPLES, MHZ19_FILTER_FAST, MHZ19_FILTER_MEDIUM, MHZ19_FILTER_SLOW};
+
+#define MHZ19_FILTER_OPTION MHZ19_FILTER_FAST
+# 58 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+#include <TasmotaSerial.h>
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#define MHZ19_READ_TIMEOUT 400
+#define MHZ19_RETRY_COUNT 8
+
+TasmotaSerial *MhzSerial;
+
+const char kMhzModels[] PROGMEM = "|B";
+
+const char ABC_ENABLED[] = "ABC is Enabled";
+const char ABC_DISABLED[] = "ABC is Disabled";
+
+enum MhzCommands { MHZ_CMND_READPPM, MHZ_CMND_ABCENABLE, MHZ_CMND_ABCDISABLE, MHZ_CMND_ZEROPOINT, MHZ_CMND_RESET, MHZ_CMND_RANGE_1000, MHZ_CMND_RANGE_2000, MHZ_CMND_RANGE_3000, MHZ_CMND_RANGE_5000 };
+const uint8_t kMhzCommands[][4] PROGMEM = {
+
+  {0x86,0x00,0x00,0x00},
+  {0x79,0xA0,0x00,0x00},
+  {0x79,0x00,0x00,0x00},
+  {0x87,0x00,0x00,0x00},
+  {0x8D,0x00,0x00,0x00},
+  {0x99,0x00,0x03,0xE8},
+  {0x99,0x00,0x07,0xD0},
+  {0x99,0x00,0x0B,0xB8},
+  {0x99,0x00,0x13,0x88}};
+
+uint8_t mhz_type = 1;
+uint16_t mhz_last_ppm = 0;
+uint8_t mhz_filter = MHZ19_FILTER_OPTION;
+bool mhz_abc_must_apply = false;
+
+float mhz_temperature = 0;
+uint8_t mhz_retry = MHZ19_RETRY_COUNT;
+uint8_t mhz_received = 0;
+uint8_t mhz_state = 0;
+
+
+
+uint8_t MhzCalculateChecksum(uint8_t *array)
+{
+  uint8_t checksum = 0;
+  for (uint32_t i = 1; i < 8; i++) {
+    checksum += array[i];
+  }
+  checksum = 255 - checksum;
+  return (checksum +1);
+}
+
+size_t MhzSendCmd(uint8_t command_id)
+{
+  uint8_t mhz_send[9] = { 0 };
+
+  mhz_send[0] = 0xFF;
+  mhz_send[1] = 0x01;
+  memcpy_P(&mhz_send[2], kMhzCommands[command_id], sizeof(uint16_t));
+
+
+
+
+  memcpy_P(&mhz_send[6], kMhzCommands[command_id] + sizeof(uint16_t), sizeof(uint16_t));
+  mhz_send[8] = MhzCalculateChecksum(mhz_send);
+
+
+
+  return MhzSerial->write(mhz_send, sizeof(mhz_send));
+}
+
+
+
+bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s)
+{
+  if (1 == s) {
+    return false;
+  }
+  if (mhz_last_ppm < 400 || mhz_last_ppm > 5000) {
+
+
+    mhz_last_ppm = ppm;
+    return true;
+  }
+  int32_t difference = ppm - mhz_last_ppm;
+  if (s > 0 && s < 64 && mhz_filter != MHZ19_FILTER_OFF) {
+# 154 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+    difference *= s;
+    difference /= 64;
+  }
+  if (MHZ19_FILTER_OFF == mhz_filter) {
+    if (s != 0 && s != 64) {
+      return false;
+    }
+  } else {
+    difference >>= (mhz_filter -1);
+  }
+  mhz_last_ppm = static_cast<uint16_t>(mhz_last_ppm + difference);
+  return true;
+}
+
+void MhzEverySecond(void)
+{
+  mhz_state++;
+  if (8 == mhz_state) {
+    mhz_state = 0;
+
+    if (mhz_retry) {
+      mhz_retry--;
+      if (!mhz_retry) {
+        mhz_last_ppm = 0;
+        mhz_temperature = 0;
+      }
+    }
+
+    MhzSerial->flush();
+    MhzSendCmd(MHZ_CMND_READPPM);
+    mhz_received = 0;
+  }
+
+  if ((mhz_state > 2) && !mhz_received) {
+    uint8_t mhz_response[9];
+
+    unsigned long start = millis();
+    uint8_t counter = 0;
+    while (((millis() - start) < MHZ19_READ_TIMEOUT) && (counter < 9)) {
+      if (MhzSerial->available() > 0) {
+        mhz_response[counter++] = MhzSerial->read();
+      } else {
+        delay(5);
+      }
+    }
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, mhz_response, counter);
+
+    if (counter < 9) {
+
+      return;
+    }
+
+    uint8_t crc = MhzCalculateChecksum(mhz_response);
+    if (mhz_response[8] != crc) {
+
+      return;
+    }
+    if (0xFF != mhz_response[0] || 0x86 != mhz_response[1]) {
+
+      return;
+    }
+
+    mhz_received = 1;
+
+    uint16_t u = (mhz_response[6] << 8) | mhz_response[7];
+    if (15000 == u) {
+      if (Settings.SensorBits1.mhz19b_abc_disable) {
+
+
+        mhz_abc_must_apply = true;
+      }
+    } else {
+      uint16_t ppm = (mhz_response[2] << 8) | mhz_response[3];
+      mhz_temperature = ConvertTemp((float)mhz_response[4] - 40);
+      uint8_t s = mhz_response[5];
+      mhz_type = (s) ? 1 : 2;
+      if (MhzCheckAndApplyFilter(ppm, s)) {
+        mhz_retry = MHZ19_RETRY_COUNT;
+        LightSetSignal(CO2_LOW, CO2_HIGH, mhz_last_ppm);
+
+        if (0 == s || 64 == s) {
+          if (mhz_abc_must_apply) {
+            mhz_abc_must_apply = false;
+            if (!Settings.SensorBits1.mhz19b_abc_disable) {
+              MhzSendCmd(MHZ_CMND_ABCENABLE);
+            } else {
+              MhzSendCmd(MHZ_CMND_ABCDISABLE);
+            }
+          }
+        }
+
+      }
+    }
+
+  }
+}
+# 266 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
+#define D_JSON_RANGE_1000 "1000 ppm range"
+#define D_JSON_RANGE_2000 "2000 ppm range"
+#define D_JSON_RANGE_3000 "3000 ppm range"
+#define D_JSON_RANGE_5000 "5000 ppm range"
+
+bool MhzCommandSensor(void)
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      Settings.SensorBits1.mhz19b_abc_disable = true;
+      MhzSendCmd(MHZ_CMND_ABCDISABLE);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
+      break;
+    case 1:
+      Settings.SensorBits1.mhz19b_abc_disable = false;
+      MhzSendCmd(MHZ_CMND_ABCENABLE);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
+      break;
+    case 2:
+      MhzSendCmd(MHZ_CMND_ZEROPOINT);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_ZERO_POINT_CALIBRATION);
+      break;
+    case 9:
+      MhzSendCmd(MHZ_CMND_RESET);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RESET);
+      break;
+    case 1000:
+      MhzSendCmd(MHZ_CMND_RANGE_1000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_1000);
+      break;
+    case 2000:
+      MhzSendCmd(MHZ_CMND_RANGE_2000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_2000);
+      break;
+    case 3000:
+      MhzSendCmd(MHZ_CMND_RANGE_3000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_3000);
+      break;
+    case 5000:
+      MhzSendCmd(MHZ_CMND_RANGE_5000);
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_5000);
+      break;
+    default:
+      if (!Settings.SensorBits1.mhz19b_abc_disable) {
+        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
+      } else {
+        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
+      }
+  }
+
+  return serviced;
+}
+
+
+
+void MhzInit(void)
+{
+  mhz_type = 0;
+  if ((pin[GPIO_MHZ_RXD] < 99) && (pin[GPIO_MHZ_TXD] < 99)) {
+    MhzSerial = new TasmotaSerial(pin[GPIO_MHZ_RXD], pin[GPIO_MHZ_TXD], 1);
+    if (MhzSerial->begin(9600)) {
+      if (MhzSerial->hardwareSerial()) { ClaimSerial(); }
+      mhz_type = 1;
+    }
+
+  }
+}
+
+void MhzShow(bool json)
+{
+  char types[7] = "MHZ19B";
+  char temperature[33];
+  dtostrfd(mhz_temperature, Settings.flag2.temperature_resolution, temperature);
+  char model[3];
+  GetTextIndexed(model, sizeof(model), mhz_type -1, kMhzModels);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_MODEL "\":\"%s\",\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s}"), types, model, mhz_last_ppm, temperature);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) {
+      DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm);
+      DomoticzSensor(DZ_TEMP, temperature);
+    }
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, types, mhz_last_ppm);
+    WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns15(uint8_t function)
+{
+  bool result = false;
+
+  if (mhz_type) {
+    switch (function) {
+      case FUNC_INIT:
+        MhzInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        MhzEverySecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_15 == XdrvMailbox.index) {
+          result = MhzCommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MhzShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MhzShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
+#ifdef USE_I2C
+#ifdef USE_TSL2561
+# 30 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
+#define XSNS_16 16
+#define XI2C_16 16
+
+#include <Tsl2561Util.h>
+
+Tsl2561 Tsl(Wire);
+
+uint8_t tsl2561_type = 0;
+uint8_t tsl2561_valid = 0;
+uint32_t tsl2561_milliLux = 0;
+char tsl2561_types[] = "TSL2561";
+
+bool Tsl2561Read(void)
+{
+  if (tsl2561_valid) { tsl2561_valid--; }
+
+  uint8_t id;
+  bool gain;
+  Tsl2561::exposure_t exposure;
+  uint16_t scaledFull, scaledIr;
+  uint32_t full, ir;
+
+    if (Tsl.on()) {
+      if (Tsl.id(id)
+        && Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr)
+        && Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr)
+        && Tsl2561Util::milliLux(full, ir, tsl2561_milliLux, Tsl2561::packageCS(id))) {
+      } else{
+        tsl2561_milliLux = 0;
+      }
+    }
+  tsl2561_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+void Tsl2561Detect(void)
+{
+  if (I2cSetDevice(0x29) || I2cSetDevice(0x39) || I2cSetDevice(0x49)) {
+    uint8_t id;
+    Tsl.begin();
+    if (!Tsl.id(id)) return;
+    if (Tsl.on()) {
+      tsl2561_type = 1;
+      I2cSetActiveFound(Tsl.address(), tsl2561_types);
+    }
+  }
+}
+
+void Tsl2561EverySecond(void)
+{
+  if (!(uptime %2)) {
+
+    if (!Tsl2561Read()) {
+      AddLogMissed(tsl2561_types, tsl2561_valid);
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TSL2561[] PROGMEM =
+  "{s}TSL2561 " D_ILLUMINANCE "{m}%u.%03u " D_UNIT_LUX "{e}";
+#endif
+
+void Tsl2561Show(bool json)
+{
+  if (tsl2561_valid) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"),
+        tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, (tsl2561_milliLux + 500) / 1000); }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TSL2561, tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns16(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_16)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Tsl2561Detect();
+  }
+  else if (tsl2561_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Tsl2561EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Tsl2561Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tsl2561Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
+#ifdef USE_SENSEAIR
+# 29 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
+#define XSNS_17 17
+
+#define SENSEAIR_MODBUS_SPEED 9600
+#define SENSEAIR_DEVICE_ADDRESS 0xFE
+#define SENSEAIR_READ_REGISTER 0x04
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#include <TasmotaModbus.h>
+TasmotaModbus *SenseairModbus;
+
+const char kSenseairTypes[] PROGMEM = "Kx0|S8";
+
+uint8_t senseair_type = 1;
+char senseair_types[7];
+
+uint16_t senseair_co2 = 0;
+float senseair_temperature = 0;
+float senseair_humidity = 0;
+
+
+
+const uint8_t start_addresses[] { 0x1A, 0x00, 0x03, 0x04, 0x05, 0x1C, 0x0A };
+
+uint8_t senseair_read_state = 0;
+uint8_t senseair_send_retry = 0;
+
+void Senseair250ms(void)
+{
+
+
+
+
+    uint16_t value = 0;
+    bool data_ready = SenseairModbus->ReceiveReady();
+
+    if (data_ready) {
+      uint8_t error = SenseairModbus->Receive16BitRegister(&value);
+      if (error) {
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir response error %d"), error);
+      } else {
+        switch(senseair_read_state) {
+          case 0:
+            senseair_type = 2;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir type id low %04X"), value);
+            break;
+          case 1:
+            if (value) {
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir error %04X"), value);
+            }
+            break;
+          case 2:
+            senseair_co2 = value;
+            LightSetSignal(CO2_LOW, CO2_HIGH, senseair_co2);
+            break;
+          case 3:
+            senseair_temperature = ConvertTemp((float)value / 100);
+            break;
+          case 4:
+            senseair_humidity = ConvertHumidity((float)value / 100);
+            break;
+          case 5:
+          {
+            bool relay_state = value >> 8 & 1;
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir relay state %d"), relay_state);
+            break;
+          }
+          case 6:
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir temp adjustment %d"), value);
+            break;
+        }
+      }
+      senseair_read_state++;
+      if (2 == senseair_type) {
+        if (3 == senseair_read_state) {
+          senseair_read_state = 1;
+        }
+      } else {
+        if (sizeof(start_addresses) == senseair_read_state) {
+          senseair_read_state = 1;
+        }
+      }
+    }
+
+    if (0 == senseair_send_retry || data_ready) {
+      senseair_send_retry = 5;
+      SenseairModbus->Send(SENSEAIR_DEVICE_ADDRESS, SENSEAIR_READ_REGISTER, (uint16_t)start_addresses[senseair_read_state], 1);
+    } else {
+      senseair_send_retry--;
+    }
+
+
+}
+
+
+
+void SenseairInit(void)
+{
+  senseair_type = 0;
+  if ((pin[GPIO_SAIR_RX] < 99) && (pin[GPIO_SAIR_TX] < 99)) {
+    SenseairModbus = new TasmotaModbus(pin[GPIO_SAIR_RX], pin[GPIO_SAIR_TX]);
+    uint8_t result = SenseairModbus->Begin(SENSEAIR_MODBUS_SPEED);
+    if (result) {
+      if (2 == result) { ClaimSerial(); }
+      senseair_type = 1;
+    }
+  }
+}
+
+void SenseairShow(bool json)
+{
+  char temperature[33];
+  dtostrfd(senseair_temperature, Settings.flag2.temperature_resolution, temperature);
+  char humidity[33];
+  dtostrfd(senseair_humidity, Settings.flag2.temperature_resolution, humidity);
+  GetTextIndexed(senseair_types, sizeof(senseair_types), senseair_type -1, kSenseairTypes);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d"), senseair_types, senseair_co2);
+    if (senseair_type != 2) {
+      ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s"), temperature, humidity);
+    }
+    ResponseJsonEnd();
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, senseair_co2);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, senseair_types, senseair_co2);
+    if (senseair_type != 2) {
+      WSContentSend_PD(HTTP_SNS_TEMP, senseair_types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, senseair_types, humidity);
+    }
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns17(uint8_t function)
+{
+  bool result = false;
+
+  if (senseair_type) {
+    switch (function) {
+      case FUNC_INIT:
+        SenseairInit();
+        break;
+      case FUNC_EVERY_250_MSECOND:
+        Senseair250ms();
+        break;
+      case FUNC_JSON_APPEND:
+        SenseairShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SenseairShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
+#ifdef USE_PMS5003
+# 31 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
+#define XSNS_18 18
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PmsSerial;
+
+uint8_t pms_type = 1;
+uint8_t pms_valid = 0;
+
+struct pmsX003data {
+  uint16_t framelen;
+  uint16_t pm10_standard, pm25_standard, pm100_standard;
+  uint16_t pm10_env, pm25_env, pm100_env;
+#ifdef PMS_MODEL_PMS3003
+  uint16_t reserved1, reserved2, reserved3;
+#else
+  uint16_t particles_03um, particles_05um, particles_10um, particles_25um, particles_50um, particles_100um;
+  uint16_t unused;
+#endif
+  uint16_t checksum;
+} pms_data;
+
+
+
+bool PmsReadData(void)
+{
+  if (! PmsSerial->available()) {
+    return false;
+  }
+  while ((PmsSerial->peek() != 0x42) && PmsSerial->available()) {
+    PmsSerial->read();
+  }
+#ifdef PMS_MODEL_PMS3003
+  if (PmsSerial->available() < 22) {
+#else
+  if (PmsSerial->available() < 32) {
+#endif
+    return false;
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  uint8_t buffer[22];
+  PmsSerial->readBytes(buffer, 22);
+#else
+  uint8_t buffer[32];
+  PmsSerial->readBytes(buffer, 32);
+#endif
+  uint16_t sum = 0;
+  PmsSerial->flush();
+
+#ifdef PMS_MODEL_PMS3003
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 22);
+#else
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 32);
+#endif
+
+
+#ifdef PMS_MODEL_PMS3003
+  for (uint32_t i = 0; i < 20; i++) {
+#else
+  for (uint32_t i = 0; i < 30; i++) {
+#endif
+    sum += buffer[i];
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  uint16_t buffer_u16[10];
+  for (uint32_t i = 0; i < 10; i++) {
+#else
+  uint16_t buffer_u16[15];
+  for (uint32_t i = 0; i < 15; i++) {
+#endif
+    buffer_u16[i] = buffer[2 + i*2 + 1];
+    buffer_u16[i] += (buffer[2 + i*2] << 8);
+  }
+#ifdef PMS_MODEL_PMS3003
+  if (sum != buffer_u16[9]) {
+#else
+  if (sum != buffer_u16[14]) {
+#endif
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("PMS: " D_CHECKSUM_FAILURE));
+    return false;
+  }
+
+#ifdef PMS_MODEL_PMS3003
+  memcpy((void *)&pms_data, (void *)buffer_u16, 20);
+#else
+  memcpy((void *)&pms_data, (void *)buffer_u16, 30);
+#endif
+  pms_valid = 10;
+
+  return true;
+}
+
+
+
+void PmsSecond(void)
+{
+  if (PmsReadData()) {
+    pms_valid = 10;
+  } else {
+    if (pms_valid) {
+      pms_valid--;
+    }
+  }
+}
+
+
+
+void PmsInit(void)
+{
+  pms_type = 0;
+  if (pin[GPIO_PMS5003] < 99) {
+    PmsSerial = new TasmotaSerial(pin[GPIO_PMS5003], -1, 1);
+    if (PmsSerial->begin(9600)) {
+      if (PmsSerial->hardwareSerial()) { ClaimSerial(); }
+      pms_type = 1;
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+#ifdef PMS_MODEL_PMS3003
+const char HTTP_PMS3003_SNS[] PROGMEM =
+
+
+
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#else
+const char HTTP_PMS5003_SNS[] PROGMEM =
+
+
+
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.3 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
+  "{s}PMS5003 " D_PARTICALS_BEYOND " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}";
+#endif
+#endif
+
+void PmsShow(bool json)
+{
+  if (pms_valid) {
+    if (json) {
+#ifdef PMS_MODEL_PMS3003
+      ResponseAppend_P(PSTR(",\"PMS3003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d}"),
+        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
+#else
+      ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"),
+        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
+        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
+#endif
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_COUNT, pms_data.pm10_env);
+        DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env);
+        DomoticzSensor(DZ_CURRENT, pms_data.pm100_env);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+
+#ifdef PMS_MODEL_PMS3003
+        WSContentSend_PD(HTTP_PMS3003_SNS,
+
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
+#else
+        WSContentSend_PD(HTTP_PMS5003_SNS,
+
+        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
+        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
+#endif
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns18(uint8_t function)
+{
+  bool result = false;
+
+  if (pms_type) {
+    switch (function) {
+      case FUNC_INIT:
+        PmsInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        PmsSecond();
+        break;
+      case FUNC_JSON_APPEND:
+        PmsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        PmsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_19_mgs.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_19_mgs.ino"
+#ifdef USE_I2C
+#ifdef USE_MGS
+
+
+
+
+
+
+
+#define XSNS_19 19
+#define XI2C_17 17
+
+#ifndef MGS_SENSOR_ADDR
+#define MGS_SENSOR_ADDR 0x04
+#endif
+
+#include "MutichannelGasSensor.h"
+
+bool mgs_detected = false;
+
+void MGSInit(void) {
+  gas.begin(MGS_SENSOR_ADDR);
+}
+
+void MGSPrepare(void)
+{
+  if (I2cActive(MGS_SENSOR_ADDR)) { return; }
+
+  gas.begin(MGS_SENSOR_ADDR);
+  if (!gas.isError()) {
+    I2cSetActiveFound(MGS_SENSOR_ADDR, "MultiGas");
+    mgs_detected = true;
+  }
+}
+
+char* measure_gas(int gas_type, char* buffer)
+{
+  float f = gas.calcGas(gas_type);
+  dtostrfd(f, 2, buffer);
+  return buffer;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_MGS_GAS[] PROGMEM = "{s}MGS %s{m}%s " D_UNIT_PARTS_PER_MILLION "{e}";
+#endif
+
+void MGSShow(bool json)
+{
+  char buffer[33];
+  if (json) {
+    ResponseAppend_P(PSTR(",\"MGS\":{\"NH3\":%s"), measure_gas(NH3, buffer));
+    ResponseAppend_P(PSTR(",\"CO\":%s"), measure_gas(CO, buffer));
+    ResponseAppend_P(PSTR(",\"NO2\":%s"), measure_gas(NO2, buffer));
+    ResponseAppend_P(PSTR(",\"C3H8\":%s"), measure_gas(C3H8, buffer));
+    ResponseAppend_P(PSTR(",\"C4H10\":%s"), measure_gas(C4H10, buffer));
+    ResponseAppend_P(PSTR(",\"CH4\":%s"), measure_gas(GAS_CH4, buffer));
+    ResponseAppend_P(PSTR(",\"H2\":%s"), measure_gas(H2, buffer));
+    ResponseAppend_P(PSTR(",\"C2H5OH\":%s}"), measure_gas(C2H5OH, buffer));
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_MGS_GAS, "NH3", measure_gas(NH3, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "CO", measure_gas(CO, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "NO2", measure_gas(NO2, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C3H8", measure_gas(C3H8, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C4H10", measure_gas(C4H10, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "CH4", measure_gas(GAS_CH4, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "H2", measure_gas(H2, buffer));
+    WSContentSend_PD(HTTP_MGS_GAS, "C2H5OH", measure_gas(C2H5OH, buffer));
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns19(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_17)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MGSPrepare();
+  }
+  else if (mgs_detected) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        MGSShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MGSShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
+#ifdef USE_NOVA_SDS
+# 30 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
+#define XSNS_20 20
+
+#include <TasmotaSerial.h>
+
+#ifndef STARTING_OFFSET
+#define STARTING_OFFSET 30
+#endif
+#if STARTING_OFFSET < 10
+#error "Please set STARTING_OFFSET >= 10"
+#endif
+#ifndef NOVA_SDS_RECDATA_TIMEOUT
+#define NOVA_SDS_RECDATA_TIMEOUT 150
+#endif
+#ifndef NOVA_SDS_DEVICE_ID
+#define NOVA_SDS_DEVICE_ID 0xFFFF
+#endif
+
+TasmotaSerial *NovaSdsSerial;
+
+uint8_t novasds_type = 1;
+uint8_t novasds_valid = 0;
+uint8_t cont_mode = 1;
+
+struct sds011data {
+  uint16_t pm100;
+  uint16_t pm25;
+} novasds_data;
+uint16_t pm100_sum;
+uint16_t pm25_sum;
+
+
+#define NOVA_SDS_REPORTING_MODE 2
+#define NOVA_SDS_QUERY_DATA 4
+#define NOVA_SDS_SET_DEVICE_ID 5
+#define NOVA_SDS_SLEEP_AND_WORK 6
+#define NOVA_SDS_WORKING_PERIOD 8
+#define NOVA_SDS_CHECK_FIRMWARE_VER 7
+  #define NOVA_SDS_QUERY_MODE 0
+  #define NOVA_SDS_SET_MODE 1
+  #define NOVA_SDS_REPORT_ACTIVE 0
+  #define NOVA_SDS_REPORT_QUERY 1
+  #define NOVA_SDS_SLEEP 0
+  #define NOVA_SDS_WORK 1
+
+
+bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer)
+{
+  uint8_t novasds_cmnd[19] = {0xAA, 0xB4, byte1, byte2, byte3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (uint8_t)(sensorid & 0xFF), (uint8_t)((sensorid>>8) & 0xFF), 0x00, 0xAB};
+
+
+  for (uint32_t i = 2; i < 17; i++) {
+    novasds_cmnd[17] += novasds_cmnd[i];
+  }
+
+
+
+
+
+  NovaSdsSerial->write(novasds_cmnd, sizeof(novasds_cmnd));
+  NovaSdsSerial->flush();
+
+
+  unsigned long cmndtime = millis();
+  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( ! NovaSdsSerial->available() ) );
+  if ( ! NovaSdsSerial->available() ) {
+
+    return false;
+  }
+  uint8_t recbuf[10];
+  memset(recbuf, 0, sizeof(recbuf));
+
+  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( NovaSdsSerial->available() > 0) && (0xAA != (recbuf[0] = NovaSdsSerial->read())) );
+  if ( 0xAA != recbuf[0] ) {
+
+    return false;
+  }
+
+
+  NovaSdsSerial->readBytes(&recbuf[1], 9);
+  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, recbuf, sizeof(recbuf));
+
+  if ( nullptr != buffer ) {
+
+    memcpy(buffer, recbuf, sizeof(recbuf));
+  }
+
+
+  if ((0xAB != recbuf[9] ) || (recbuf[8] != ((recbuf[2] + recbuf[3] + recbuf[4] + recbuf[5] + recbuf[6] + recbuf[7]) & 0xFF))) {
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR("SDS: " D_CHECKSUM_FAILURE));
+    return false;
+  }
+
+  return true;
+}
+
+void NovaSdsSetWorkPeriod(void)
+{
+
+    NovaSdsCommand(NOVA_SDS_WORKING_PERIOD, NOVA_SDS_SET_MODE, 0, NOVA_SDS_DEVICE_ID, nullptr);
+
+    NovaSdsCommand(NOVA_SDS_REPORTING_MODE, NOVA_SDS_SET_MODE, NOVA_SDS_REPORT_QUERY, NOVA_SDS_DEVICE_ID, nullptr);
+}
+
+bool NovaSdsReadData(void)
+{
+  uint8_t d[10];
+  if ( ! NovaSdsCommand(NOVA_SDS_QUERY_DATA, 0, 0, NOVA_SDS_DEVICE_ID, d) ) {
+    return false;
+  }
+  novasds_data.pm25 = (d[2] + 256 * d[3]);
+  novasds_data.pm100 = (d[4] + 256 * d[5]);
+
+  return true;
+}
+
+
+
+void NovaSdsSecond(void)
+{
+  if (!novasds_valid)
+  {
+    NovaSdsSetWorkPeriod();
+    novasds_valid=1;
+  }
+  if((Settings.tele_period - Settings.novasds_startingoffset <= 0))
+  {
+    if(!cont_mode)
+    {
+      cont_mode = 1;
+      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
+    }
+  }
+  else
+    cont_mode = 0;
+
+  if(tele_period == Settings.tele_period - Settings.novasds_startingoffset && !cont_mode)
+  {
+    NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
+  }
+  if(tele_period >= Settings.tele_period-5 && tele_period <= Settings.tele_period-2)
+  {
+    if(!(NovaSdsReadData())) novasds_valid=0;
+    pm100_sum += novasds_data.pm100;
+    pm25_sum += novasds_data.pm25;
+  }
+  if(tele_period == Settings.tele_period-1)
+  {
+    novasds_data.pm100 = pm100_sum >> 2;
+    novasds_data.pm25 = pm25_sum >> 2;
+    if(!cont_mode)
+      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_SLEEP, NOVA_SDS_DEVICE_ID, nullptr);
+    pm100_sum = pm25_sum = 0;
+  }
+}
+
+
+
+
+
+
+
+bool NovaSdsCommandSensor(void)
+{
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 256)) {
+    if( XdrvMailbox.payload < 10 ) Settings.novasds_startingoffset = 10;
+    else Settings.novasds_startingoffset = XdrvMailbox.payload;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_20, Settings.novasds_startingoffset);
+
+  return true;
+}
+
+void NovaSdsInit(void)
+{
+  novasds_type = 0;
+  if (pin[GPIO_SDS0X1_RX] < 99 && pin[GPIO_SDS0X1_TX] < 99) {
+    NovaSdsSerial = new TasmotaSerial(pin[GPIO_SDS0X1_RX], pin[GPIO_SDS0X1_TX], 1);
+    if (NovaSdsSerial->begin(9600)) {
+      if (NovaSdsSerial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      novasds_type = 1;
+      NovaSdsSetWorkPeriod();
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SDS0X1_SNS[] PROGMEM =
+  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#endif
+
+void NovaSdsShow(bool json)
+{
+  if (novasds_valid) {
+    float pm10f = (float)(novasds_data.pm100) / 10.0f;
+    float pm2_5f = (float)(novasds_data.pm25) / 10.0f;
+    char pm10[33];
+    dtostrfd(pm10f, 1, pm10);
+    char pm2_5[33];
+    dtostrfd(pm2_5f, 1, pm2_5);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), pm2_5, pm10);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, pm2_5);
+        DomoticzSensor(DZ_CURRENT, pm10);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SDS0X1_SNS, pm2_5, pm10);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns20(uint8_t function)
+{
+  bool result = false;
+
+  if (novasds_type) {
+    switch (function) {
+      case FUNC_INIT:
+        NovaSdsInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        NovaSdsSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_20 == XdrvMailbox.index) {
+          result = NovaSdsCommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        NovaSdsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        NovaSdsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
+#ifdef USE_I2C
+#ifdef USE_SGP30
+# 30 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
+#define XSNS_21 21
+#define XI2C_18 18
+
+#define SGP30_ADDRESS 0x58
+
+#include "Adafruit_SGP30.h"
+Adafruit_SGP30 sgp;
+
+bool sgp30_type = false;
+bool sgp30_ready = false;
+float sgp30_abshum;
+
+
+
+void sgp30_Init(void)
+{
+  if (I2cActive(SGP30_ADDRESS)) { return; }
+
+  if (sgp.begin()) {
+    sgp30_type = true;
+
+    I2cSetActiveFound(SGP30_ADDRESS, "SGP30");
+  }
+}
+
+
+#define POW_FUNC FastPrecisePow
+
+float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit) {
+
+
+
+
+
+  float temp = NAN;
+  const float mw = 18.01534;
+  const float r = 8.31447215;
+
+  if (isnan(temperature) || isnan(humidity) ) {
+    return NAN;
+  }
+
+  if (tempUnit != 'C') {
+    temperature = (temperature - 32.0) * (5.0 / 9.0);
+  }
+
+  temp = POW_FUNC(2.718281828, (17.67 * temperature) / (temperature + 243.5));
+
+
+  return (6.112 * temp * humidity * mw) / ((273.15 + temperature) * r);
+}
+
+#define SAVE_PERIOD 30
+
+void Sgp30Update(void)
+{
+  sgp30_ready = false;
+  if (!sgp.IAQmeasure()) {
+    return;
+  }
+  if (global_update && (global_humidity > 0) && (global_temperature != 9999)) {
+
+    sgp30_abshum=sgp30_AbsoluteHumidity(global_temperature,global_humidity,TempUnit());
+    sgp.setHumidity(sgp30_abshum*1000);
+  }
+  sgp30_ready = true;
+
+
+  if (!(uptime%SAVE_PERIOD)) {
+
+    uint16_t TVOC_base;
+    uint16_t eCO2_base;
+
+    if (!sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) return;
+
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SGP30[] PROGMEM =
+  "{s}SGP30 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
+  "{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
+const char HTTP_SNS_AHUM[] PROGMEM = "{s}SGP30 Abs Humidity{m}%s g/m3{e}";
+#endif
+
+#define D_JSON_AHUM "aHumidity"
+
+void Sgp30Show(bool json)
+{
+  if (sgp30_ready) {
+    char abs_hum[33];
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC);
+      if (global_update && global_humidity>0 && global_temperature!=9999) {
+
+        dtostrfd(sgp30_abshum,4,abs_hum);
+        ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum);
+      }
+      ResponseJsonEnd();
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC);
+      if (global_update) {
+        WSContentSend_PD(HTTP_SNS_AHUM, abs_hum);
+      }
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns21(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_18)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    sgp30_Init();
+  }
+  else if (sgp30_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Sgp30Update();
+        break;
+      case FUNC_JSON_APPEND:
+        Sgp30Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sgp30Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
+#ifdef USE_SR04
+
+#include <NewPing.h>
+#include <TasmotaSerial.h>
+# 32 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
+#define XSNS_22 22
+
+uint8_t sr04_type = 1;
+int sr04_echo_pin = 0;
+int sr04_trig_pin = 0;
+real64_t distance;
+
+NewPing* sonar = nullptr;
+TasmotaSerial* sonar_serial = nullptr;
+
+
+
+uint8_t Sr04TModeDetect(void)
+{
+  sr04_type = 0;
+  if (pin[GPIO_SR04_ECHO]>=99) return sr04_type;
+
+  sr04_echo_pin = pin[GPIO_SR04_ECHO];
+  sr04_trig_pin = (pin[GPIO_SR04_TRIG] < 99) ? pin[GPIO_SR04_TRIG] : -1;
+  sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
+
+  if (sonar_serial->begin(9600,1)) {
+    DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode"));
+
+    if (sr04_trig_pin!=-1) {
+        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;
+    } else {
+        sr04_type = 2;
+    }
+  } else {
+    sr04_type = 1;
+  }
+
+  if (sr04_type < 2) {
+      delete sonar_serial;
+      sonar_serial = nullptr;
+      sonar = new NewPing(sr04_trig_pin, sr04_echo_pin, 300);
+  } else {
+    if (sonar_serial->hardwareSerial()) {
+      ClaimSerial();
+    }
+  }
+
+  AddLog_P2(LOG_LEVEL_INFO,PSTR("SR04: Mode %d"), sr04_type);
+  return sr04_type;
+}
+
+uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third)
+{
+  uint16_t ret = first;
+  if (first > second) {
+    first = second;
+    second = ret;
+  }
+
+  if (third < first) {
+    return first;
+  } else if (third > second) {
+    return second;
+  } else {
+    return third;
+  }
+}
+
+uint16_t Sr04TMode3Distance() {
+
+    sonar_serial->write(0x55);
+    sonar_serial->flush();
+
+    return Sr04TMode2Distance();
+}
+
+uint16_t Sr04TMode2Distance(void)
+{
+  sonar_serial->setTimeout(300);
+  const char startByte = 0xff;
+
+  if (!sonar_serial->find(startByte)) {
+
+      return NO_ECHO;
+  }
+
+  delay(5);
+
+  uint8_t crc = sonar_serial->read();
+
+  uint16_t distance = ((uint16_t)crc) << 8;
+
+
+  distance += sonar_serial->read();
+  crc += distance & 0x00ff;
+  crc += 0x00FF;
+
+
+  if (crc != sonar_serial->read()) {
+    AddLog_P2(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error."));
+    return NO_ECHO;
+  }
+
+  return distance;
+}
+
+void Sr04TReading(void) {
+
+  if (sonar_serial==nullptr && sonar==nullptr) {
+    Sr04TModeDetect();
+  }
+
+  switch (sr04_type) {
+      case 3:
+        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10;
+        break;
+      case 2:
+
+        while(sonar_serial->available()) sonar_serial->read();
+        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode2Distance(),Sr04TMode2Distance(),Sr04TMode2Distance()))/10;
+        break;
+      case 1:
+        distance = (real64_t)(sonar->ping_median(5))/ US_ROUNDTRIP_CM;
+        break;
+      default:
+        distance = NO_ECHO;
+  }
+
+  return;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_DISTANCE[] PROGMEM =
+  "{s}SR04 " D_DISTANCE "{m}%s" D_UNIT_CENTIMETER "{e}";
+#endif
+
+void Sr04Show(bool json)
+{
+
+  if (distance != 0) {
+    char distance_chr[33];
+    dtostrfd(distance, 3, distance_chr);
+
+    if(json) {
+      ResponseAppend_P(PSTR(",\"SR04\":{\"" D_JSON_DISTANCE "\":%s}"), distance_chr);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_COUNT, distance_chr);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_DISTANCE, distance_chr);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns22(uint8_t function)
+{
+  bool result = false;
+
+  if (sr04_type) {
+    switch (function) {
+      case FUNC_INIT:
+        result = (pin[GPIO_SR04_ECHO]<99);
+        break;
+      case FUNC_EVERY_SECOND:
+        Sr04TReading();
+        result = true;
+        break;
+      case FUNC_JSON_APPEND:
+        Sr04Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Sr04Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
+#ifdef USE_I2C
+#ifdef USE_SI1145
+# 30 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
+#define XSNS_24 24
+#define XI2C_19 19
+
+#define SI114X_ADDR 0X60
+
+
+
+#define SI114X_QUERY 0X80
+#define SI114X_SET 0XA0
+#define SI114X_NOP 0X00
+#define SI114X_RESET 0X01
+#define SI114X_BUSADDR 0X02
+#define SI114X_PS_FORCE 0X05
+#define SI114X_GET_CAL 0X12
+#define SI114X_ALS_FORCE 0X06
+#define SI114X_PSALS_FORCE 0X07
+#define SI114X_PS_PAUSE 0X09
+#define SI114X_ALS_PAUSE 0X0A
+#define SI114X_PSALS_PAUSE 0X0B
+#define SI114X_PS_AUTO 0X0D
+#define SI114X_ALS_AUTO 0X0E
+#define SI114X_PSALS_AUTO 0X0F
+
+
+
+#define SI114X_PART_ID 0X00
+#define SI114X_REV_ID 0X01
+#define SI114X_SEQ_ID 0X02
+#define SI114X_INT_CFG 0X03
+#define SI114X_IRQ_ENABLE 0X04
+#define SI114X_IRQ_MODE1 0x05
+#define SI114X_IRQ_MODE2 0x06
+#define SI114X_HW_KEY 0X07
+#define SI114X_MEAS_RATE0 0X08
+#define SI114X_MEAS_RATE1 0X09
+#define SI114X_PS_RATE 0X0A
+#define SI114X_PS_LED21 0X0F
+#define SI114X_PS_LED3 0X10
+#define SI114X_UCOEFF0 0X13
+#define SI114X_UCOEFF1 0X14
+#define SI114X_UCOEFF2 0X15
+#define SI114X_UCOEFF3 0X16
+#define SI114X_WR 0X17
+#define SI114X_COMMAND 0X18
+#define SI114X_RESPONSE 0X20
+#define SI114X_IRQ_STATUS 0X21
+#define SI114X_ALS_VIS_DATA0 0X22
+#define SI114X_ALS_VIS_DATA1 0X23
+#define SI114X_ALS_IR_DATA0 0X24
+#define SI114X_ALS_IR_DATA1 0X25
+#define SI114X_PS1_DATA0 0X26
+#define SI114X_PS1_DATA1 0X27
+#define SI114X_PS2_DATA0 0X28
+#define SI114X_PS2_DATA1 0X29
+#define SI114X_PS3_DATA0 0X2A
+#define SI114X_PS3_DATA1 0X2B
+#define SI114X_AUX_DATA0_UVINDEX0 0X2C
+#define SI114X_AUX_DATA1_UVINDEX1 0X2D
+#define SI114X_RD 0X2E
+#define SI114X_CHIP_STAT 0X30
+
+
+
+#define SI114X_CHLIST 0X01
+#define SI114X_CHLIST_ENUV 0x80
+#define SI114X_CHLIST_ENAUX 0x40
+#define SI114X_CHLIST_ENALSIR 0x20
+#define SI114X_CHLIST_ENALSVIS 0x10
+#define SI114X_CHLIST_ENPS1 0x01
+#define SI114X_CHLIST_ENPS2 0x02
+#define SI114X_CHLIST_ENPS3 0x04
+
+#define SI114X_PSLED12_SELECT 0X02
+#define SI114X_PSLED3_SELECT 0X03
+
+#define SI114X_PS_ENCODE 0X05
+#define SI114X_ALS_ENCODE 0X06
+
+#define SI114X_PS1_ADCMUX 0X07
+#define SI114X_PS2_ADCMUX 0X08
+#define SI114X_PS3_ADCMUX 0X09
+
+#define SI114X_PS_ADC_COUNTER 0X0A
+#define SI114X_PS_ADC_GAIN 0X0B
+#define SI114X_PS_ADC_MISC 0X0C
+
+#define SI114X_ALS_IR_ADC_MUX 0X0E
+#define SI114X_AUX_ADC_MUX 0X0F
+
+#define SI114X_ALS_VIS_ADC_COUNTER 0X10
+#define SI114X_ALS_VIS_ADC_GAIN 0X11
+#define SI114X_ALS_VIS_ADC_MISC 0X12
+
+#define SI114X_LED_REC 0X1C
+
+#define SI114X_ALS_IR_ADC_COUNTER 0X1D
+#define SI114X_ALS_IR_ADC_GAIN 0X1E
+#define SI114X_ALS_IR_ADC_MISC 0X1F
+
+
+
+
+#define SI114X_ADCMUX_SMALL_IR 0x00
+#define SI114X_ADCMUX_VISIABLE 0x02
+#define SI114X_ADCMUX_LARGE_IR 0x03
+#define SI114X_ADCMUX_NO 0x06
+#define SI114X_ADCMUX_GND 0x25
+#define SI114X_ADCMUX_TEMPERATURE 0x65
+#define SI114X_ADCMUX_VDD 0x75
+
+#define SI114X_PSLED12_SELECT_PS1_NONE 0x00
+#define SI114X_PSLED12_SELECT_PS1_LED1 0x01
+#define SI114X_PSLED12_SELECT_PS1_LED2 0x02
+#define SI114X_PSLED12_SELECT_PS1_LED3 0x04
+#define SI114X_PSLED12_SELECT_PS2_NONE 0x00
+#define SI114X_PSLED12_SELECT_PS2_LED1 0x10
+#define SI114X_PSLED12_SELECT_PS2_LED2 0x20
+#define SI114X_PSLED12_SELECT_PS2_LED3 0x40
+#define SI114X_PSLED3_SELECT_PS2_NONE 0x00
+#define SI114X_PSLED3_SELECT_PS2_LED1 0x10
+#define SI114X_PSLED3_SELECT_PS2_LED2 0x20
+#define SI114X_PSLED3_SELECT_PS2_LED3 0x40
+
+#define SI114X_ADC_GAIN_DIV1 0X00
+#define SI114X_ADC_GAIN_DIV2 0X01
+#define SI114X_ADC_GAIN_DIV4 0X02
+#define SI114X_ADC_GAIN_DIV8 0X03
+#define SI114X_ADC_GAIN_DIV16 0X04
+#define SI114X_ADC_GAIN_DIV32 0X05
+
+#define SI114X_LED_CURRENT_5MA 0X01
+#define SI114X_LED_CURRENT_11MA 0X02
+#define SI114X_LED_CURRENT_22MA 0X03
+#define SI114X_LED_CURRENT_45MA 0X04
+
+#define SI114X_ADC_COUNTER_1ADCCLK 0X00
+#define SI114X_ADC_COUNTER_7ADCCLK 0X01
+#define SI114X_ADC_COUNTER_15ADCCLK 0X02
+#define SI114X_ADC_COUNTER_31ADCCLK 0X03
+#define SI114X_ADC_COUNTER_63ADCCLK 0X04
+#define SI114X_ADC_COUNTER_127ADCCLK 0X05
+#define SI114X_ADC_COUNTER_255ADCCLK 0X06
+#define SI114X_ADC_COUNTER_511ADCCLK 0X07
+
+#define SI114X_ADC_MISC_LOWRANGE 0X00
+#define SI114X_ADC_MISC_HIGHRANGE 0X20
+#define SI114X_ADC_MISC_ADC_NORMALPROXIMITY 0X00
+#define SI114X_ADC_MISC_ADC_RAWADC 0X04
+
+#define SI114X_INT_CFG_INTOE 0X01
+
+#define SI114X_IRQEN_ALS 0x01
+#define SI114X_IRQEN_PS1 0x04
+#define SI114X_IRQEN_PS2 0x08
+#define SI114X_IRQEN_PS3 0x10
+
+uint16_t si1145_visible;
+uint16_t si1145_infrared;
+uint16_t si1145_uvindex;
+
+bool si1145_type = false;
+uint8_t si1145_valid = 0;
+
+
+
+uint8_t Si1145ReadByte(uint8_t reg)
+{
+  return I2cRead8(SI114X_ADDR, reg);
+}
+
+uint16_t Si1145ReadHalfWord(uint8_t reg)
+{
+  return I2cRead16LE(SI114X_ADDR, reg);
+}
+
+bool Si1145WriteByte(uint8_t reg, uint16_t val)
+{
+  I2cWrite8(SI114X_ADDR, reg, val);
+}
+
+uint8_t Si1145WriteParamData(uint8_t p, uint8_t v)
+{
+  Si1145WriteByte(SI114X_WR, v);
+  Si1145WriteByte(SI114X_COMMAND, p | SI114X_SET);
+  return Si1145ReadByte(SI114X_RD);
+}
+
+
+
+bool Si1145Present(void)
+{
+  return (Si1145ReadByte(SI114X_PART_ID) == 0X45);
+}
+
+void Si1145Reset(void)
+{
+  Si1145WriteByte(SI114X_MEAS_RATE0, 0);
+  Si1145WriteByte(SI114X_MEAS_RATE1, 0);
+  Si1145WriteByte(SI114X_IRQ_ENABLE, 0);
+  Si1145WriteByte(SI114X_IRQ_MODE1, 0);
+  Si1145WriteByte(SI114X_IRQ_MODE2, 0);
+  Si1145WriteByte(SI114X_INT_CFG, 0);
+  Si1145WriteByte(SI114X_IRQ_STATUS, 0xFF);
+
+  Si1145WriteByte(SI114X_COMMAND, SI114X_RESET);
+  delay(10);
+  Si1145WriteByte(SI114X_HW_KEY, 0x17);
+  delay(10);
+}
+
+void Si1145DeInit(void)
+{
+
+
+  Si1145WriteByte(SI114X_UCOEFF0, 0x29);
+  Si1145WriteByte(SI114X_UCOEFF1, 0x89);
+  Si1145WriteByte(SI114X_UCOEFF2, 0x02);
+  Si1145WriteByte(SI114X_UCOEFF3, 0x00);
+  Si1145WriteParamData(SI114X_CHLIST, SI114X_CHLIST_ENUV | SI114X_CHLIST_ENALSIR | SI114X_CHLIST_ENALSVIS | SI114X_CHLIST_ENPS1);
+
+
+
+  Si1145WriteParamData(SI114X_PS1_ADCMUX, SI114X_ADCMUX_LARGE_IR);
+  Si1145WriteByte(SI114X_PS_LED21, SI114X_LED_CURRENT_22MA);
+  Si1145WriteParamData(SI114X_PSLED12_SELECT, SI114X_PSLED12_SELECT_PS1_LED1);
+
+
+
+  Si1145WriteParamData(SI114X_PS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_PS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_PS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE | SI114X_ADC_MISC_ADC_RAWADC);
+
+
+
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_ALS_VIS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
+
+
+
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
+  Si1145WriteParamData(SI114X_ALS_IR_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
+
+
+
+  Si1145WriteByte(SI114X_INT_CFG, SI114X_INT_CFG_INTOE);
+  Si1145WriteByte(SI114X_IRQ_ENABLE, SI114X_IRQEN_ALS);
+
+
+
+  Si1145WriteByte(SI114X_MEAS_RATE0, 0xFF);
+  Si1145WriteByte(SI114X_COMMAND, SI114X_PSALS_AUTO);
+}
+
+bool Si1145Begin(void)
+{
+  if (!Si1145Present()) { return false; }
+
+  Si1145Reset();
+  Si1145DeInit();
+  return true;
+}
+
+
+uint16_t Si1145ReadUV(void)
+{
+  return Si1145ReadHalfWord(SI114X_AUX_DATA0_UVINDEX0);
+}
+
+
+uint16_t Si1145ReadVisible(void)
+{
+  return Si1145ReadHalfWord(SI114X_ALS_VIS_DATA0);
+}
+
+
+uint16_t Si1145ReadIR(void)
+{
+  return Si1145ReadHalfWord(SI114X_ALS_IR_DATA0);
+}
+
+
+
+bool Si1145Read(void)
+{
+  if (si1145_valid) { si1145_valid--; }
+
+  if (!Si1145Present()) { return false; }
+
+  si1145_visible = Si1145ReadVisible();
+  si1145_infrared = Si1145ReadIR();
+  si1145_uvindex = Si1145ReadUV();
+  si1145_valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+void Si1145Detect(void)
+{
+  if (I2cActive(SI114X_ADDR)) { return; }
+
+  if (Si1145Begin()) {
+    si1145_type = true;
+    I2cSetActiveFound(SI114X_ADDR, "SI1145");
+  }
+}
+
+void Si1145Update(void)
+{
+  if (!Si1145Read()) {
+    AddLogMissed("SI1145", si1145_valid);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SI1145[] PROGMEM =
+  "{s}SI1145 " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}"
+  "{s}SI1145 " D_INFRARED "{m}%d " D_UNIT_LUX "{e}"
+  "{s}SI1145 " D_UV_INDEX "{m}%d.%d{e}";
+#endif
+
+void Si1145Show(bool json)
+{
+  if (si1145_valid) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"SI1145\":{\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_INFRARED "\":%d,\"" D_JSON_UV_INDEX "\":%d.%d}"),
+        si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, si1145_visible);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_SI1145, si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns24(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_19)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Si1145Detect();
+  }
+  else if (si1145_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Si1145Update();
+        break;
+      case FUNC_JSON_APPEND:
+        Si1145Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Si1145Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
+#ifdef USE_I2C
+#ifdef USE_LM75AD
+# 31 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
+#define XSNS_26 26
+#define XI2C_20 20
+
+#define LM75AD_ADDRESS1 0x48
+#define LM75AD_ADDRESS2 0x49
+#define LM75AD_ADDRESS3 0x4A
+#define LM75AD_ADDRESS4 0x4B
+#define LM75AD_ADDRESS5 0x4C
+#define LM75AD_ADDRESS6 0x4D
+#define LM75AD_ADDRESS7 0x4E
+#define LM75AD_ADDRESS8 0x4F
+
+#define LM75_TEMP_REGISTER 0x00
+#define LM75_CONF_REGISTER 0x01
+#define LM75_THYST_REGISTER 0x02
+#define LM75_TOS_REGISTER 0x03
+
+bool lm75ad_type = false;
+uint8_t lm75ad_address;
+uint8_t lm75ad_addresses[] = { LM75AD_ADDRESS1, LM75AD_ADDRESS2, LM75AD_ADDRESS3, LM75AD_ADDRESS4, LM75AD_ADDRESS5, LM75AD_ADDRESS6, LM75AD_ADDRESS7, LM75AD_ADDRESS8 };
+
+void LM75ADDetect(void)
+{
+  for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
+    lm75ad_address = lm75ad_addresses[i];
+    if (I2cActive(lm75ad_address)) {
+      continue; }
+    if (!I2cSetDevice(lm75ad_address)) {
+      break;
+    }
+    uint16_t buffer;
+    if (I2cValidRead16(&buffer, lm75ad_address, LM75_THYST_REGISTER)) {
+      if (buffer == 0x4B00) {
+        lm75ad_type = true;
+        I2cSetActiveFound(lm75ad_address, "LM75AD");
+        break;
+      }
+    }
+  }
+}
+
+float LM75ADGetTemp(void)
+{
+  int16_t sign = 1;
+
+  uint16_t t = I2cRead16(lm75ad_address, LM75_TEMP_REGISTER);
+  if (t & 0x8000) {
+    t = (~t) +0x20;
+    sign = -1;
+  }
+  t = t >> 5;
+  return ConvertTemp(sign * t * 0.125);
+}
+
+void LM75ADShow(bool json)
+{
+  float t = LM75ADGetTemp();
+  char temperature[33];
+  dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"LM75AD\":{\"" D_JSON_TEMPERATURE "\":%s}"), temperature);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TEMP, "LM75AD", temperature, TempUnit());
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns26(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_20)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    LM75ADDetect();
+  }
+  else if (lm75ad_type) {
+    switch (function) {
+      case FUNC_JSON_APPEND:
+        LM75ADShow(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        LM75ADShow(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+# 28 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+#ifdef USE_I2C
+#ifdef USE_APDS9960
+# 39 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+#define XSNS_27 27
+#define XI2C_21 21
+
+#if defined(USE_SHT) || defined(USE_VEML6070) || defined(USE_TSL2561)
+  #warning **** Turned off conflicting drivers SHT and VEML6070 ****
+  #ifdef USE_SHT
+  #undef USE_SHT
+  #endif
+  #ifdef USE_VEML6070
+  #undef USE_VEML6070
+  #endif
+  #ifdef USE_TSL2561
+  #undef USE_TSL2561
+  #endif
+#endif
+
+#define APDS9960_I2C_ADDR 0x39
+
+#define APDS9960_CHIPID_1 0xAB
+#define APDS9960_CHIPID_2 0x9C
+
+#define APDS9930_CHIPID_1 0x12
+#define APDS9930_CHIPID_2 0x39
+
+
+#define GESTURE_THRESHOLD_OUT 10
+#define GESTURE_SENSITIVITY_1 50
+#define GESTURE_SENSITIVITY_2 20
+
+uint8_t APDS9960addr;
+uint8_t APDS9960type = 0;
+char APDS9960stype[] = "APDS9960";
+char currentGesture[6];
+uint8_t gesture_mode = 1;
+
+
+volatile uint8_t recovery_loop_counter = 0;
+#define APDS9960_LONG_RECOVERY 50
+#define APDS9960_MAX_GESTURE_CYCLES 50
+bool APDS9960_overload = false;
+
+#ifdef USE_WEBSERVER
+const char HTTP_APDS_9960_SNS[] PROGMEM =
+  "{s}" "Red" "{m}%s{e}"
+  "{s}" "Green" "{m}%s{e}"
+  "{s}" "Blue" "{m}%s{e}"
+  "{s}" "Ambient" "{m}%s " D_UNIT_LUX "{e}"
+  "{s}" "CCT" "{m}%s " "K" "{e}"
+  "{s}" "Proximity" "{m}%s{e}";
+#endif
+# 97 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+#define FIFO_PAUSE_TIME 30
+
+
+#define APDS9960_ENABLE 0x80
+#define APDS9960_ATIME 0x81
+#define APDS9960_WTIME 0x83
+#define APDS9960_AILTL 0x84
+#define APDS9960_AILTH 0x85
+#define APDS9960_AIHTL 0x86
+#define APDS9960_AIHTH 0x87
+#define APDS9960_PILT 0x89
+#define APDS9960_PIHT 0x8B
+#define APDS9960_PERS 0x8C
+#define APDS9960_CONFIG1 0x8D
+#define APDS9960_PPULSE 0x8E
+#define APDS9960_CONTROL 0x8F
+#define APDS9960_CONFIG2 0x90
+#define APDS9960_ID 0x92
+#define APDS9960_STATUS 0x93
+#define APDS9960_CDATAL 0x94
+#define APDS9960_CDATAH 0x95
+#define APDS9960_RDATAL 0x96
+#define APDS9960_RDATAH 0x97
+#define APDS9960_GDATAL 0x98
+#define APDS9960_GDATAH 0x99
+#define APDS9960_BDATAL 0x9A
+#define APDS9960_BDATAH 0x9B
+#define APDS9960_PDATA 0x9C
+#define APDS9960_POFFSET_UR 0x9D
+#define APDS9960_POFFSET_DL 0x9E
+#define APDS9960_CONFIG3 0x9F
+#define APDS9960_GPENTH 0xA0
+#define APDS9960_GEXTH 0xA1
+#define APDS9960_GCONF1 0xA2
+#define APDS9960_GCONF2 0xA3
+#define APDS9960_GOFFSET_U 0xA4
+#define APDS9960_GOFFSET_D 0xA5
+#define APDS9960_GOFFSET_L 0xA7
+#define APDS9960_GOFFSET_R 0xA9
+#define APDS9960_GPULSE 0xA6
+#define APDS9960_GCONF3 0xAA
+#define APDS9960_GCONF4 0xAB
+#define APDS9960_GFLVL 0xAE
+#define APDS9960_GSTATUS 0xAF
+#define APDS9960_IFORCE 0xE4
+#define APDS9960_PICLEAR 0xE5
+#define APDS9960_CICLEAR 0xE6
+#define APDS9960_AICLEAR 0xE7
+#define APDS9960_GFIFO_U 0xFC
+#define APDS9960_GFIFO_D 0xFD
+#define APDS9960_GFIFO_L 0xFE
+#define APDS9960_GFIFO_R 0xFF
+
+
+#define APDS9960_PON 0b00000001
+#define APDS9960_AEN 0b00000010
+#define APDS9960_PEN 0b00000100
+#define APDS9960_WEN 0b00001000
+#define APSD9960_AIEN 0b00010000
+#define APDS9960_PIEN 0b00100000
+#define APDS9960_GEN 0b01000000
+#define APDS9960_GVALID 0b00000001
+
+
+#define OFF 0
+#define ON 1
+
+
+#define POWER 0
+#define AMBIENT_LIGHT 1
+#define PROXIMITY 2
+#define WAIT 3
+#define AMBIENT_LIGHT_INT 4
+#define PROXIMITY_INT 5
+#define GESTURE 6
+#define ALL 7
+
+
+#define LED_DRIVE_100MA 0
+#define LED_DRIVE_50MA 1
+#define LED_DRIVE_25MA 2
+#define LED_DRIVE_12_5MA 3
+
+
+#define PGAIN_1X 0
+#define PGAIN_2X 1
+#define PGAIN_4X 2
+#define PGAIN_8X 3
+
+
+#define AGAIN_1X 0
+#define AGAIN_4X 1
+#define AGAIN_16X 2
+#define AGAIN_64X 3
+
+
+#define GGAIN_1X 0
+#define GGAIN_2X 1
+#define GGAIN_4X 2
+#define GGAIN_8X 3
+
+
+#define LED_BOOST_100 0
+#define LED_BOOST_150 1
+#define LED_BOOST_200 2
+#define LED_BOOST_300 3
+
+
+#define GWTIME_0MS 0
+#define GWTIME_2_8MS 1
+#define GWTIME_5_6MS 2
+#define GWTIME_8_4MS 3
+#define GWTIME_14_0MS 4
+#define GWTIME_22_4MS 5
+#define GWTIME_30_8MS 6
+#define GWTIME_39_2MS 7
+
+
+#define DEFAULT_ATIME 0xdb
+#define DEFAULT_WTIME 246
+#define DEFAULT_PROX_PPULSE 0x87
+#define DEFAULT_GESTURE_PPULSE 0x89
+#define DEFAULT_POFFSET_UR 0
+#define DEFAULT_POFFSET_DL 0
+#define DEFAULT_CONFIG1 0x60
+#define DEFAULT_LDRIVE LED_DRIVE_100MA
+#define DEFAULT_PGAIN PGAIN_4X
+#define DEFAULT_AGAIN AGAIN_4X
+#define DEFAULT_PILT 0
+#define DEFAULT_PIHT 50
+#define DEFAULT_AILT 0xFFFF
+#define DEFAULT_AIHT 0
+#define DEFAULT_PERS 0x11
+#define DEFAULT_CONFIG2 0x01
+#define DEFAULT_CONFIG3 0
+#define DEFAULT_GPENTH 40
+#define DEFAULT_GEXTH 30
+#define DEFAULT_GCONF1 0x40
+#define DEFAULT_GGAIN GGAIN_4X
+#define DEFAULT_GLDRIVE LED_DRIVE_100MA
+#define DEFAULT_GWTIME GWTIME_2_8MS
+#define DEFAULT_GOFFSET 0
+#define DEFAULT_GPULSE 0xC9
+#define DEFAULT_GCONF3 0
+#define DEFAULT_GIEN 0
+
+#define ERROR 0xFF
+
+
+enum {
+  DIR_NONE,
+  DIR_LEFT,
+  DIR_RIGHT,
+  DIR_UP,
+  DIR_DOWN,
+  DIR_ALL
+};
+
+
+enum {
+  APDS9960_NA_STATE,
+  APDS9960_ALL_STATE
+};
+
+
+typedef struct gesture_data_type {
+    uint8_t u_data[32];
+    uint8_t d_data[32];
+    uint8_t l_data[32];
+    uint8_t r_data[32];
+    uint8_t index;
+    uint8_t total_gestures;
+    uint8_t in_threshold;
+    uint8_t out_threshold;
+} gesture_data_type;
+
+
+ gesture_data_type gesture_data_;
+ int16_t gesture_ud_delta_ = 0;
+ int16_t gesture_lr_delta_ = 0;
+ int16_t gesture_ud_count_ = 0;
+ int16_t gesture_lr_count_ = 0;
+ int16_t gesture_state_ = 0;
+ int16_t gesture_motion_ = DIR_NONE;
+
+ typedef struct color_data_type {
+    uint16_t a;
+    uint16_t r;
+    uint16_t g;
+    uint16_t b;
+    uint8_t p;
+    uint16_t cct;
+    uint16_t lux;
+ } color_data_type;
+
+ color_data_type color_data;
+ uint8_t APDS9960_aTime = DEFAULT_ATIME;
+# 306 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ bool wireWriteByte(uint8_t val)
+ {
+     Wire.beginTransmission(APDS9960_I2C_ADDR);
+     Wire.write(val);
+     if( Wire.endTransmission() != 0 ) {
+         return false;
+     }
+
+     return true;
+ }
+# 325 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+int8_t wireReadDataBlock( uint8_t reg,
+                                        uint8_t *val,
+                                        uint16_t len)
+{
+    unsigned char i = 0;
+
+
+    if (!wireWriteByte(reg)) {
+        return -1;
+    }
+
+
+    Wire.requestFrom(APDS9960_I2C_ADDR, len);
+    while (Wire.available()) {
+        if (i >= len) {
+            return -1;
+        }
+        val[i] = Wire.read();
+        i++;
+    }
+
+    return i;
+}
+
+
+
+
+
+
+
+void calculateColorTemperature(void)
+{
+  float X, Y, Z;
+  float xc, yc;
+  float n;
+  float cct;
+
+
+
+
+
+  X = (-0.14282F * color_data.r) + (1.54924F * color_data.g) + (-0.95641F * color_data.b);
+  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b);
+  Z = (-0.68202F * color_data.r) + (0.77073F * color_data.g) + ( 0.56332F * color_data.b);
+
+
+  xc = (X) / (X + Y + Z);
+  yc = (Y) / (X + Y + Z);
+
+
+  n = (xc - 0.3320F) / (0.1858F - yc);
+
+
+  color_data.cct = (449.0F * FastPrecisePowf(n, 3)) + (3525.0F * FastPrecisePowf(n, 2)) + (6823.3F * n) + 5520.33F;
+
+  return;
+}
+# 392 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProxIntLowThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT) ;
+     return val;
+ }
+
+
+
+
+
+
+  void setProxIntLowThresh(uint8_t threshold)
+  {
+        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold);
+  }
+
+
+
+
+
+
+ uint8_t getProxIntHighThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
+     return val;
+ }
+
+
+
+
+
+
+
+ void setProxIntHighThresh(uint8_t threshold)
+   {
+         I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold);
+   }
+# 448 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getLEDDrive(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
+
+     val = (val >> 6) & 0b00000011;
+
+     return val;
+ }
+# 471 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setLEDDrive(uint8_t drive)
+  {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+      drive &= 0b00000011;
+      drive = drive << 6;
+      val &= 0b00111111;
+      val |= drive;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+  }
+# 500 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProximityGain(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
+
+     val = (val >> 2) & 0b00000011;
+
+     return val;
+ }
+# 523 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setProximityGain(uint8_t drive)
+ {
+     uint8_t val;
+
+
+   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+     drive &= 0b00000011;
+     drive = drive << 2;
+     val &= 0b11110011;
+     val |= drive;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+ }
+# 564 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+  void setAmbientLightGain(uint8_t drive)
+  {
+      uint8_t val;
+
+
+      val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
+
+
+      drive &= 0b00000011;
+      val &= 0b11111100;
+      val |= drive;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
+  }
+# 591 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getLEDBoost(void)
+ {
+     uint8_t val;
+
+
+   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
+
+
+     val = (val >> 4) & 0b00000011;
+
+     return val;
+ }
+# 615 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setLEDBoost(uint8_t boost)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
+
+     boost &= 0b00000011;
+     boost = boost << 4;
+     val &= 0b11001111;
+     val |= boost;
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getProxGainCompEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     val = (val >> 5) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+  void setProxGainCompEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 5;
+     val &= 0b11011111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
+ }
+# 683 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getProxPhotoMask(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     val &= 0b00001111;
+
+     return val;
+ }
+# 708 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setProxPhotoMask(uint8_t mask)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
+
+
+     mask &= 0b00001111;
+     val &= 0b11110000;
+     val |= mask;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getGestureEnterThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GPENTH) ;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureEnterThresh(uint8_t threshold)
+ {
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPENTH, threshold) ;
+
+ }
+
+
+
+
+
+
+ uint8_t getGestureExitThresh(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GEXTH) ;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureExitThresh(uint8_t threshold)
+ {
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GEXTH, threshold) ;
+ }
+# 786 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureGain(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val = (val >> 5) & 0b00000011;
+
+     return val;
+ }
+# 810 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureGain(uint8_t gain)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     gain &= 0b00000011;
+     gain = gain << 5;
+     val &= 0b10011111;
+     val |= gain;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+# 838 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureLEDDrive(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val = (val >> 3) & 0b00000011;
+
+     return val;
+ }
+# 862 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureLEDDrive(uint8_t drive)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     drive &= 0b00000011;
+     drive = drive << 3;
+     val &= 0b11100111;
+     val |= drive;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+# 894 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ uint8_t getGestureWaitTime(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     val &= 0b00000111;
+
+     return val;
+ }
+# 922 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void setGestureWaitTime(uint8_t time)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
+
+
+     time &= 0b00000111;
+     val &= 0b11111000;
+     val |= time;
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
+ }
+
+
+
+
+
+
+ void getLightIntLowThreshold(uint16_t &threshold)
+ {
+     uint8_t val_byte;
+     threshold = 0;
+
+
+     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AILTL) ;
+     threshold = val_byte;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_byte) ;
+     threshold = threshold + ((uint16_t)val_byte << 8);
+ }
+
+
+
+
+
+
+
+   void setLightIntLowThreshold(uint16_t threshold)
+   {
+       uint8_t val_low;
+       uint8_t val_high;
+
+
+       val_low = threshold & 0x00FF;
+       val_high = (threshold & 0xFF00) >> 8;
+
+
+       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTL, val_low) ;
+
+
+       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_high) ;
+
+   }
+
+
+
+
+
+
+
+ void getLightIntHighThreshold(uint16_t &threshold)
+ {
+     uint8_t val_byte;
+     threshold = 0;
+
+
+     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AIHTL);
+     threshold = val_byte;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_byte) ;
+     threshold = threshold + ((uint16_t)val_byte << 8);
+ }
+
+
+
+
+
+
+  void setLightIntHighThreshold(uint16_t threshold)
+  {
+      uint8_t val_low;
+      uint8_t val_high;
+
+
+      val_low = threshold & 0x00FF;
+      val_high = (threshold & 0xFF00) >> 8;
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTL, val_low);
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_high) ;
+  }
+
+
+
+
+
+
+
+ void getProximityIntLowThreshold(uint8_t &threshold)
+ {
+     threshold = 0;
+
+
+     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT);
+
+ }
+
+
+
+
+
+
+ void setProximityIntLowThreshold(uint8_t threshold)
+ {
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold) ;
+ }
+# 1055 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+ void getProximityIntHighThreshold(uint8_t &threshold)
+ {
+     threshold = 0;
+
+
+     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
+
+ }
+
+
+
+
+
+
+ void setProximityIntHighThreshold(uint8_t threshold)
+ {
+
+
+   I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold) ;
+ }
+
+
+
+
+
+
+ uint8_t getAmbientLightIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     val = (val >> 4) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setAmbientLightIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE);
+
+
+     enable &= 0b00000001;
+     enable = enable << 4;
+     val &= 0b11101111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getProximityIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     val = (val >> 5) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setProximityIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 5;
+     val &= 0b11011111;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
+ }
+
+
+
+
+
+
+ uint8_t getGestureIntEnable(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     val = (val >> 1) & 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureIntEnable(uint8_t enable)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     enable &= 0b00000001;
+     enable = enable << 1;
+     val &= 0b11111101;
+     val |= enable;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
+ }
+
+
+
+
+
+ void clearAmbientLightInt(void)
+ {
+     uint8_t throwaway;
+     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AICLEAR);
+ }
+
+
+
+
+
+ void clearProximityInt(void)
+ {
+     uint8_t throwaway;
+     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PICLEAR) ;
+
+ }
+
+
+
+
+
+
+ uint8_t getGestureMode(void)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     val &= 0b00000001;
+
+     return val;
+ }
+
+
+
+
+
+
+ void setGestureMode(uint8_t mode)
+ {
+     uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
+
+
+     mode &= 0b00000001;
+     val &= 0b11111110;
+     val |= mode;
+
+
+     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
+ }
+
+
+bool APDS9960_init(void)
+{
+
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, DEFAULT_ATIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, DEFAULT_WTIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_PROX_PPULSE) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_UR, DEFAULT_POFFSET_UR) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_DL, DEFAULT_POFFSET_DL) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG1, DEFAULT_CONFIG1) ;
+
+    setLEDDrive(DEFAULT_LDRIVE);
+
+    setProximityGain(DEFAULT_PGAIN);
+
+    setAmbientLightGain(DEFAULT_AGAIN);
+
+    setProxIntLowThresh(DEFAULT_PILT) ;
+
+    setProxIntHighThresh(DEFAULT_PIHT);
+
+    setLightIntLowThreshold(DEFAULT_AILT) ;
+
+    setLightIntHighThreshold(DEFAULT_AIHT) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PERS, DEFAULT_PERS) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, DEFAULT_CONFIG2) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, DEFAULT_CONFIG3) ;
+
+
+    setGestureEnterThresh(DEFAULT_GPENTH);
+
+    setGestureExitThresh(DEFAULT_GEXTH) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF1, DEFAULT_GCONF1) ;
+
+    setGestureGain(DEFAULT_GGAIN) ;
+
+    setGestureLEDDrive(DEFAULT_GLDRIVE) ;
+
+    setGestureWaitTime(DEFAULT_GWTIME) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_U, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_D, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_L, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_R, DEFAULT_GOFFSET) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPULSE, DEFAULT_GPULSE) ;
+
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF3, DEFAULT_GCONF3) ;
+
+    setGestureIntEnable(DEFAULT_GIEN);
+
+    disablePower();
+
+    return true;
+}
+# 1333 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+uint8_t getMode(void)
+{
+    uint8_t enable_value;
+
+
+     enable_value = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
+
+    return enable_value;
+}
+
+
+
+
+
+
+
+void setMode(uint8_t mode, uint8_t enable)
+{
+    uint8_t reg_val;
+
+
+    reg_val = getMode();
+
+
+
+    enable = enable & 0x01;
+    if( mode >= 0 && mode <= 6 ) {
+        if (enable) {
+            reg_val |= (1 << mode);
+        } else {
+            reg_val &= ~(1 << mode);
+        }
+    } else if( mode == ALL ) {
+        if (enable) {
+            reg_val = 0x7F;
+        } else {
+            reg_val = 0x00;
+        }
+    }
+
+
+      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, reg_val) ;
+}
+
+
+
+
+
+
+void enableLightSensor(void)
+{
+
+    setAmbientLightGain(DEFAULT_AGAIN);
+    setAmbientLightIntEnable(0);
+    enablePower() ;
+    setMode(AMBIENT_LIGHT, 1) ;
+}
+
+
+
+
+
+void disableLightSensor(void)
+{
+    setAmbientLightIntEnable(0) ;
+    setMode(AMBIENT_LIGHT, 0) ;
+}
+
+
+
+
+
+
+void enableProximitySensor(void)
+{
+
+    setProximityGain(DEFAULT_PGAIN);
+    setLEDDrive(DEFAULT_LDRIVE) ;
+    setProximityIntEnable(0) ;
+    enablePower();
+    setMode(PROXIMITY, 1) ;
+}
+
+
+
+
+
+void disableProximitySensor(void)
+{
+ setProximityIntEnable(0) ;
+  setMode(PROXIMITY, 0) ;
+}
+
+
+
+
+
+
+void enableGestureSensor(void)
+{
+
+
+
+
+
+
+
+    resetGestureParameters();
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, 0xFF) ;
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_GESTURE_PPULSE) ;
+    setLEDBoost(LED_BOOST_100);
+    setGestureIntEnable(0) ;
+    setGestureMode(1);
+    enablePower() ;
+    setMode(WAIT, 1) ;
+    setMode(PROXIMITY, 1) ;
+    setMode(GESTURE, 1);
+}
+
+
+
+
+
+void disableGestureSensor(void)
+{
+    resetGestureParameters();
+    setGestureIntEnable(0) ;
+    setGestureMode(0) ;
+    setMode(GESTURE, 0) ;
+}
+
+
+
+
+
+
+bool isGestureAvailable(void)
+{
+    uint8_t val;
+
+
+     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS) ;
+
+
+    val &= APDS9960_GVALID;
+
+
+    if( val == 1) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+
+
+
+
+int16_t readGesture(void)
+{
+    uint8_t fifo_level = 0;
+    uint8_t bytes_read = 0;
+    uint8_t fifo_data[128];
+    uint8_t gstatus;
+    uint16_t motion;
+    uint16_t i;
+    uint8_t gesture_loop_counter = 0;
+
+
+    if( !isGestureAvailable() || !(getMode() & 0b01000001) ) {
+        return DIR_NONE;
+    }
+
+
+    while(1) {
+        if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){
+          disableGestureSensor();
+          APDS9960_overload = true;
+          AddLog_P(LOG_LEVEL_DEBUG, PSTR("Sensor overload"));
+        }
+        gesture_loop_counter += 1;
+
+        delay(FIFO_PAUSE_TIME);
+
+
+       gstatus = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS);
+
+
+        if( (gstatus & APDS9960_GVALID) == APDS9960_GVALID ) {
+
+
+            fifo_level = I2cRead8(APDS9960_I2C_ADDR,APDS9960_GFLVL) ;
+
+
+            if( fifo_level > 0) {
+                bytes_read = wireReadDataBlock( APDS9960_GFIFO_U,
+                                                (uint8_t*)fifo_data,
+                                                (fifo_level * 4) );
+                if( bytes_read == -1 ) {
+                    return ERROR;
+                }
+
+
+                if( bytes_read >= 4 ) {
+                    for( i = 0; i < bytes_read; i += 4 ) {
+                        gesture_data_.u_data[gesture_data_.index] = \
+                                                            fifo_data[i + 0];
+                        gesture_data_.d_data[gesture_data_.index] = \
+                                                            fifo_data[i + 1];
+                        gesture_data_.l_data[gesture_data_.index] = \
+                                                            fifo_data[i + 2];
+                        gesture_data_.r_data[gesture_data_.index] = \
+                                                            fifo_data[i + 3];
+                        gesture_data_.index++;
+                        gesture_data_.total_gestures++;
+                    }
+
+                    if( processGestureData() ) {
+                        if( decodeGesture() ) {
+
+                        }
+                    }
+
+                    gesture_data_.index = 0;
+                    gesture_data_.total_gestures = 0;
+                }
+            }
+        } else {
+
+
+            delay(FIFO_PAUSE_TIME);
+            decodeGesture();
+            motion = gesture_motion_;
+            resetGestureParameters();
+            return motion;
+        }
+    }
+}
+
+
+
+
+
+void enablePower(void)
+{
+    setMode(POWER, 1) ;
+}
+
+
+
+
+
+void disablePower(void)
+{
+    setMode(POWER, 0) ;
+}
+# 1600 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+void readAllColorAndProximityData(void)
+{
+  if (I2cReadBuffer(APDS9960_I2C_ADDR, APDS9960_CDATAL, (uint8_t *) &color_data, (uint16_t)9))
+  {
+
+
+  }
+}
+# 1616 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+void resetGestureParameters(void)
+{
+    gesture_data_.index = 0;
+    gesture_data_.total_gestures = 0;
+
+    gesture_ud_delta_ = 0;
+    gesture_lr_delta_ = 0;
+
+    gesture_ud_count_ = 0;
+    gesture_lr_count_ = 0;
+
+    gesture_state_ = 0;
+    gesture_motion_ = DIR_NONE;
+}
+
+
+
+
+
+
+bool processGestureData(void)
+{
+    uint8_t u_first = 0;
+    uint8_t d_first = 0;
+    uint8_t l_first = 0;
+    uint8_t r_first = 0;
+    uint8_t u_last = 0;
+    uint8_t d_last = 0;
+    uint8_t l_last = 0;
+    uint8_t r_last = 0;
+    uint16_t ud_ratio_first;
+    uint16_t lr_ratio_first;
+    uint16_t ud_ratio_last;
+    uint16_t lr_ratio_last;
+    uint16_t ud_delta;
+    uint16_t lr_delta;
+    uint16_t i;
+
+
+    if( gesture_data_.total_gestures <= 4 ) {
+        return false;
+    }
+
+
+    if( (gesture_data_.total_gestures <= 32) && \
+        (gesture_data_.total_gestures > 0) ) {
+
+
+        for( i = 0; i < gesture_data_.total_gestures; i++ ) {
+            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
+
+                u_first = gesture_data_.u_data[i];
+                d_first = gesture_data_.d_data[i];
+                l_first = gesture_data_.l_data[i];
+                r_first = gesture_data_.r_data[i];
+                break;
+            }
+        }
+
+
+        if( (u_first == 0) || (d_first == 0) || \
+            (l_first == 0) || (r_first == 0) ) {
+
+            return false;
+        }
+
+        for( i = gesture_data_.total_gestures - 1; i >= 0; i-- ) {
+
+            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
+                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
+
+                u_last = gesture_data_.u_data[i];
+                d_last = gesture_data_.d_data[i];
+                l_last = gesture_data_.l_data[i];
+                r_last = gesture_data_.r_data[i];
+                break;
+            }
+        }
+    }
+
+
+    ud_ratio_first = ((u_first - d_first) * 100) / (u_first + d_first);
+    lr_ratio_first = ((l_first - r_first) * 100) / (l_first + r_first);
+    ud_ratio_last = ((u_last - d_last) * 100) / (u_last + d_last);
+    lr_ratio_last = ((l_last - r_last) * 100) / (l_last + r_last);
+
+
+    ud_delta = ud_ratio_last - ud_ratio_first;
+    lr_delta = lr_ratio_last - lr_ratio_first;
+
+
+    gesture_ud_delta_ += ud_delta;
+    gesture_lr_delta_ += lr_delta;
+
+
+    if( gesture_ud_delta_ >= GESTURE_SENSITIVITY_1 ) {
+        gesture_ud_count_ = 1;
+    } else if( gesture_ud_delta_ <= -GESTURE_SENSITIVITY_1 ) {
+        gesture_ud_count_ = -1;
+    } else {
+        gesture_ud_count_ = 0;
+    }
+
+
+    if( gesture_lr_delta_ >= GESTURE_SENSITIVITY_1 ) {
+        gesture_lr_count_ = 1;
+    } else if( gesture_lr_delta_ <= -GESTURE_SENSITIVITY_1 ) {
+        gesture_lr_count_ = -1;
+    } else {
+        gesture_lr_count_ = 0;
+    }
+    return false;
+}
+
+
+
+
+
+
+bool decodeGesture(void)
+{
+
+
+    if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 0) ) {
+        gesture_motion_ = DIR_UP;
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 0) ) {
+        gesture_motion_ = DIR_DOWN;
+    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == 1) ) {
+        gesture_motion_ = DIR_RIGHT;
+    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == -1) ) {
+        gesture_motion_ = DIR_LEFT;
+    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_UP;
+        } else {
+            gesture_motion_ = DIR_RIGHT;
+        }
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == -1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_DOWN;
+        } else {
+            gesture_motion_ = DIR_LEFT;
+        }
+    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == -1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_UP;
+        } else {
+            gesture_motion_ = DIR_LEFT;
+        }
+    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 1) ) {
+        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
+            gesture_motion_ = DIR_DOWN;
+        } else {
+            gesture_motion_ = DIR_RIGHT;
+        }
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+void handleGesture(void) {
+    if (isGestureAvailable() ) {
+    switch (readGesture()) {
+      case DIR_UP:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("UP"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up"));
+        break;
+      case DIR_DOWN:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("DOWN"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down"));
+        break;
+      case DIR_LEFT:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LEFT"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
+        break;
+      case DIR_RIGHT:
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("RIGHT"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
+        break;
+      default:
+      if(APDS9960_overload)
+      {
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LONG"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
+      }
+      else{
+        AddLog_P(LOG_LEVEL_DEBUG, PSTR("NONE"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
+      }
+    }
+    MqttPublishSensor();
+  }
+}
+
+void APDS9960_adjustATime(void)
+{
+
+  I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);
+
+
+  if (color_data.a < (uint16_t)20){
+    APDS9960_aTime = 0x40;
+  }
+  else if (color_data.a < (uint16_t)40){
+    APDS9960_aTime = 0x80;
+  }
+  else if (color_data.a < (uint16_t)50){
+    APDS9960_aTime = DEFAULT_ATIME;
+  }
+  else if (color_data.a < (uint16_t)70){
+    APDS9960_aTime = 0xc0;
+  }
+  if (color_data.a < 200){
+    APDS9960_aTime = 0xe9;
+  }
+
+
+
+  else{
+    APDS9960_aTime = 0xff;
+  }
+
+
+  I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, APDS9960_aTime);
+  enablePower();
+  enableLightSensor();
+  delay(20);
+}
+
+
+void APDS9960_loop(void)
+{
+  if (recovery_loop_counter > 0){
+    recovery_loop_counter -= 1;
+  }
+  if (recovery_loop_counter == 1 && APDS9960_overload){
+    enableGestureSensor();
+    APDS9960_overload = false;
+    Response_P(PSTR("{\"Gesture\":\"On\"}"));
+    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+    gesture_mode = 1;
+  }
+
+  if (gesture_mode) {
+      if (recovery_loop_counter == 0){
+      handleGesture();
+
+        if (APDS9960_overload)
+        {
+        disableGestureSensor();
+        recovery_loop_counter = APDS9960_LONG_RECOVERY;
+        Response_P(PSTR("{\"Gesture\":\"Off\"}"));
+        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
+        gesture_mode = 0;
+        }
+      }
+  }
+}
+
+void APDS9960_detect(void)
+{
+  if (APDS9960type || I2cActive(APDS9960_I2C_ADDR)) { return; }
+
+  APDS9960type = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ID);
+  if (APDS9960type == APDS9960_CHIPID_1 || APDS9960type == APDS9960_CHIPID_2) {
+    if (APDS9960_init()) {
+      I2cSetActiveFound(APDS9960_I2C_ADDR, APDS9960stype);
+
+      enableProximitySensor();
+      enableGestureSensor();
+    } else {
+      APDS9960type = 0;
+    }
+  } else {
+    APDS9960type = 0;
+  }
+  currentGesture[0] = '\0';
+}
+
+
+
+
+
+void APDS9960_show(bool json)
+{
+  if (!APDS9960type) { return; }
+
+  if (!gesture_mode && !APDS9960_overload) {
+    char red_chr[10];
+    char green_chr[10];
+    char blue_chr[10];
+    char ambient_chr[10];
+    char cct_chr[10];
+    char prox_chr[10];
+
+    readAllColorAndProximityData();
+
+    sprintf (ambient_chr, "%u", color_data.a/4);
+    sprintf (red_chr, "%u", color_data.r);
+    sprintf (green_chr, "%u", color_data.g);
+    sprintf (blue_chr, "%u", color_data.b );
+    sprintf (prox_chr, "%u", color_data.p );
+
+
+
+
+
+    calculateColorTemperature();
+    sprintf (cct_chr, "%u", color_data.cct);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"CCT\":%s,\"Proximity\":%s}"),
+        APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr);
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_APDS_9960_SNS, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr );
+#endif
+    }
+  }
+  else {
+    if (json && (currentGesture[0] != '\0' )) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":1}"), APDS9960stype, currentGesture);
+      currentGesture[0] = '\0';
+    }
+  }
+}
+# 1961 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
+bool APDS9960CommandSensor(void)
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      disableGestureSensor();
+      gesture_mode = 0;
+      enableLightSensor();
+      APDS9960_overload = false;
+      break;
+    case 1:
+      if (APDS9960type) {
+        setGestureGain(DEFAULT_GGAIN);
+        setProximityGain(DEFAULT_PGAIN);
+        disableLightSensor();
+        enableGestureSensor();
+        gesture_mode = 1;
+      }
+      break;
+    case 2:
+      if (APDS9960type) {
+        setGestureGain(GGAIN_2X);
+        setProximityGain(PGAIN_2X);
+        disableLightSensor();
+        enableGestureSensor();
+        gesture_mode = 1;
+      }
+      break;
+    default:
+      int temp_aTime = (uint8_t)XdrvMailbox.payload;
+      if (temp_aTime > 2 && temp_aTime < 256){
+        disablePower();
+        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, temp_aTime);
+        enablePower();
+        enableLightSensor();
+      }
+    break;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_27, GetStateText(gesture_mode));
+
+  return serviced;
+}
+
+
+
+
+
+bool Xsns27(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_21)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    APDS9960_detect();
+  }
+  else if (APDS9960type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+          APDS9960_loop();
+          break;
+      case FUNC_COMMAND_SENSOR:
+          if (XSNS_27 == XdrvMailbox.index) {
+          result = APDS9960CommandSensor();
+          }
+          break;
+      case FUNC_JSON_APPEND:
+          APDS9960_show(1);
+          break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        APDS9960_show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
+#ifdef USE_TM1638
+
+
+
+
+
+
+#define XSNS_28 28
+
+#define TM1638_COLOR_NONE 0
+#define TM1638_COLOR_RED 1
+#define TM1638_COLOR_GREEN 2
+
+#define TM1638_CLOCK_DELAY 1
+
+uint8_t tm1638_type = 1;
+uint8_t tm1638_clock_pin = 0;
+uint8_t tm1638_data_pin = 0;
+uint8_t tm1638_strobe_pin = 0;
+uint8_t tm1638_displays = 8;
+uint8_t tm1638_active_display = 1;
+uint8_t tm1638_intensity = 0;
+uint8_t tm1638_state = 0;
+
+
+
+
+
+
+void Tm16XXSend(uint8_t data)
+{
+ for (uint32_t i = 0; i < 8; i++) {
+    digitalWrite(tm1638_data_pin, !!(data & (1 << i)));
+    digitalWrite(tm1638_clock_pin, LOW);
+    delayMicroseconds(TM1638_CLOCK_DELAY);
+    digitalWrite(tm1638_clock_pin, HIGH);
+  }
+}
+
+void Tm16XXSendCommand(uint8_t cmd)
+{
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(cmd);
+  digitalWrite(tm1638_strobe_pin, HIGH);
+}
+
+void TM16XXSendData(uint8_t address, uint8_t data)
+{
+  Tm16XXSendCommand(0x44);
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(0xC0 | address);
+  Tm16XXSend(data);
+  digitalWrite(tm1638_strobe_pin, HIGH);
+}
+
+uint8_t Tm16XXReceive(void)
+{
+  uint8_t temp = 0;
+
+
+  pinMode(tm1638_data_pin, INPUT);
+  digitalWrite(tm1638_data_pin, HIGH);
+
+  for (uint32_t i = 0; i < 8; ++i) {
+    digitalWrite(tm1638_clock_pin, LOW);
+    delayMicroseconds(TM1638_CLOCK_DELAY);
+    temp |= digitalRead(tm1638_data_pin) << i;
+    digitalWrite(tm1638_clock_pin, HIGH);
+  }
+
+
+  pinMode(tm1638_data_pin, OUTPUT);
+  digitalWrite(tm1638_data_pin, LOW);
+
+  return temp;
+}
+
+
+
+void Tm16XXClearDisplay(void)
+{
+  for (uint32_t i = 0; i < tm1638_displays; i++) {
+    TM16XXSendData(i << 1, 0);
+  }
+}
+
+void Tm1638SetLED(uint8_t color, uint8_t pos)
+{
+  TM16XXSendData((pos << 1) + 1, color);
+}
+
+void Tm1638SetLEDs(word leds)
+{
+  for (uint32_t i = 0; i < tm1638_displays; i++) {
+    uint8_t color = 0;
+
+    if ((leds & (1 << i)) != 0) {
+      color |= TM1638_COLOR_RED;
+    }
+
+    if ((leds & (1 << (i + 8))) != 0) {
+      color |= TM1638_COLOR_GREEN;
+    }
+
+    Tm1638SetLED(color, i);
+  }
+}
+
+uint8_t Tm1638GetButtons(void)
+{
+  uint8_t keys = 0;
+
+  digitalWrite(tm1638_strobe_pin, LOW);
+  Tm16XXSend(0x42);
+  for (uint32_t i = 0; i < 4; i++) {
+    keys |= Tm16XXReceive() << i;
+  }
+  digitalWrite(tm1638_strobe_pin, HIGH);
+
+  return keys;
+}
+
+
+
+void TmInit(void)
+{
+  tm1638_type = 0;
+  if ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99)) {
+    tm1638_clock_pin = pin[GPIO_TM16CLK];
+    tm1638_data_pin = pin[GPIO_TM16DIO];
+    tm1638_strobe_pin = pin[GPIO_TM16STB];
+
+    pinMode(tm1638_data_pin, OUTPUT);
+    pinMode(tm1638_clock_pin, OUTPUT);
+    pinMode(tm1638_strobe_pin, OUTPUT);
+
+    digitalWrite(tm1638_strobe_pin, HIGH);
+    digitalWrite(tm1638_clock_pin, HIGH);
+
+    Tm16XXSendCommand(0x40);
+    Tm16XXSendCommand(0x80 | (tm1638_active_display ? 8 : 0) | tmin(7, tm1638_intensity));
+
+    digitalWrite(tm1638_strobe_pin, LOW);
+    Tm16XXSend(0xC0);
+    for (uint32_t i = 0; i < 16; i++) {
+      Tm16XXSend(0x00);
+    }
+    digitalWrite(tm1638_strobe_pin, HIGH);
+
+    tm1638_type = 1;
+    tm1638_state = 1;
+  }
+}
+
+void TmLoop(void)
+{
+  if (tm1638_state) {
+    uint8_t buttons = Tm1638GetButtons();
+    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
+      SwitchSetVirtual(i, (buttons &1) ^1);
+      uint8_t color = (SwitchGetVirtual(i)) ? TM1638_COLOR_NONE : TM1638_COLOR_RED;
+      Tm1638SetLED(color, i);
+      buttons >>= 1;
+    }
+    SwitchHandler(1);
+  }
+}
+# 201 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
+bool Xsns28(uint8_t function)
+{
+  bool result = false;
+
+  if (tm1638_type) {
+    switch (function) {
+      case FUNC_INIT:
+        TmInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        TmLoop();
+        break;
+# 223 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+#ifdef USE_I2C
+#ifdef USE_MCP230xx
+# 31 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
+#define XSNS_29 29
+#define XI2C_22 22
+
+
+
+
+
+uint8_t MCP230xx_IODIR = 0x00;
+uint8_t MCP230xx_GPINTEN = 0x02;
+uint8_t MCP230xx_IOCON = 0x05;
+uint8_t MCP230xx_GPPU = 0x06;
+uint8_t MCP230xx_INTF = 0x07;
+uint8_t MCP230xx_INTCAP = 0x08;
+uint8_t MCP230xx_GPIO = 0x09;
+
+uint8_t mcp230xx_type = 0;
+uint8_t mcp230xx_pincount = 0;
+uint8_t mcp230xx_int_en = 0;
+uint8_t mcp230xx_int_prio_counter = 0;
+uint8_t mcp230xx_int_counter_en = 0;
+uint8_t mcp230xx_int_retainer_en = 0;
+uint8_t mcp230xx_int_sec_counter = 0;
+
+uint8_t mcp230xx_int_report_defer_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+uint16_t mcp230xx_int_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+uint8_t mcp230xx_int_retainer[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+unsigned long int_millis[16];
+
+const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL_UP\":\"%s\",\"INT_MODE\":\"%s\",\"STATE\":\"%s\"}}";
+
+const char MCP230XX_INTCFG_RESPONSE[] PROGMEM = "{\"MCP230xx_INT%s\":{\"D_%i\":%i}}";
+
+#ifdef USE_MCP230xx_OUTPUT
+const char MCP230XX_CMND_RESPONSE[] PROGMEM = "{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"}}";
+#endif
+
+void MCP230xx_CheckForIntCounter(void) {
+  uint8_t en = 0;
+  for (uint32_t ca=0;ca<16;ca++) {
+    if (Settings.mcp230xx_config[ca].int_count_en) {
+      en=1;
+    }
+  }
+  if (!Settings.mcp230xx_int_timer) en=0;
+  mcp230xx_int_counter_en=en;
+  if (!mcp230xx_int_counter_en) {
+    for (uint32_t ca=0;ca<16;ca++) {
+      mcp230xx_int_counter[ca] = 0;
+    }
+  }
+}
+
+void MCP230xx_CheckForIntRetainer(void) {
+  uint8_t en = 0;
+  for (uint32_t ca=0;ca<16;ca++) {
+    if (Settings.mcp230xx_config[ca].int_retain_flag) {
+      en=1;
+    }
+  }
+  mcp230xx_int_retainer_en=en;
+  if (!mcp230xx_int_retainer_en) {
+    for (uint32_t ca=0;ca<16;ca++) {
+      mcp230xx_int_retainer[ca] = 0;
+    }
+  }
+}
+
+const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) {
+#ifdef USE_MCP230xx_OUTPUT
+if ((6 == pinmod) && (statu < 2)) { statu = abs(statu-1); }
+#endif
+  switch (statu) {
+    case 0:
+      return "OFF";
+      break;
+    case 1:
+      return "ON";
+      break;
+#ifdef USE_MCP230xx_OUTPUT
+    case 2:
+      return "TOGGLE";
+      break;
+#endif
+  }
+  return "";
+}
+
+const char* IntModeTxt(uint8_t intmo) {
+  switch (intmo) {
+    case 0:
+      return "ALL";
+      break;
+    case 1:
+      return "EVENT";
+      break;
+    case 2:
+      return "TELE";
+      break;
+    case 3:
+      return "DISABLED";
+      break;
+  }
+  return "";
+}
+
+uint8_t MCP230xx_readGPIO(uint8_t port) {
+  return I2cRead8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port);
+}
+
+void MCP230xx_ApplySettings(void)
+{
+  uint8_t int_en = 0;
+  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
+    uint8_t reg_gppu = 0;
+    uint8_t reg_gpinten = 0;
+    uint8_t reg_iodir = 0xFF;
+#ifdef USE_MCP230xx_OUTPUT
+    uint8_t reg_portpins = 0x00;
+#endif
+    for (uint32_t idx = 0; idx < 8; idx++) {
+      switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) {
+        case 0 ... 1:
+          reg_iodir |= (1 << idx);
+          break;
+        case 2 ... 4:
+          reg_iodir |= (1 << idx);
+          reg_gpinten |= (1 << idx);
+          int_en = 1;
+          break;
+#ifdef USE_MCP230xx_OUTPUT
+        case 5 ... 6:
+          reg_iodir &= ~(1 << idx);
+          if (Settings.flag.save_state) {
+            reg_portpins |= (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].saved_state << idx);
+          } else {
+            if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
+              reg_portpins |= (1 << idx);
+            }
+          }
+          break;
+#endif
+        default:
+          break;
+      }
+#ifdef USE_MCP230xx_OUTPUT
+      if ((Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) {
+        reg_gppu |= (1 << idx);
+      }
+#else
+      if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
+        reg_gppu |= (1 << idx);
+      }
+#endif
+    }
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPPU+mcp230xx_port, reg_gppu);
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten);
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IODIR+mcp230xx_port, reg_iodir);
+#ifdef USE_MCP230xx_OUTPUT
+    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO+mcp230xx_port, reg_portpins);
+#endif
+  }
+  for (uint32_t idx=0;idx<mcp230xx_pincount;idx++) {
+    int_millis[idx]=millis();
+  }
+  mcp230xx_int_en = int_en;
+  MCP230xx_CheckForIntCounter();
+  MCP230xx_CheckForIntRetainer();
+}
+
+void MCP230xx_Detect(void)
+{
+  if (I2cActive(USE_MCP230xx_ADDR)) { return; }
+
+  uint8_t buffer;
+
+  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x80);
+  if (I2cValidRead8(&buffer, USE_MCP230xx_ADDR, MCP230xx_IOCON)) {
+    if (0x00 == buffer) {
+      mcp230xx_type = 1;
+      I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23008");
+      mcp230xx_pincount = 8;
+      MCP230xx_ApplySettings();
+    } else {
+      if (0x80 == buffer) {
+        mcp230xx_type = 2;
+        I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23017");
+        mcp230xx_pincount = 16;
+
+        I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x00);
+
+        MCP230xx_GPINTEN = 0x04;
+        MCP230xx_GPPU = 0x0C;
+        MCP230xx_INTF = 0x0E;
+        MCP230xx_INTCAP = 0x10;
+        MCP230xx_GPIO = 0x12;
+        MCP230xx_ApplySettings();
+      }
+    }
+  }
+}
+
+void MCP230xx_CheckForInterrupt(void) {
+  uint8_t intf;
+  uint8_t mcp230xx_intcap = 0;
+  uint8_t report_int;
+  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
+    if (I2cValidRead8(&intf,USE_MCP230xx_ADDR,MCP230xx_INTF+mcp230xx_port)) {
+      if (intf > 0) {
+        if (I2cValidRead8(&mcp230xx_intcap, USE_MCP230xx_ADDR, MCP230xx_INTCAP+mcp230xx_port)) {
+          for (uint32_t intp = 0; intp < 8; intp++) {
+            if ((intf >> intp) & 0x01) {
+              report_int = 0;
+              if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode > 1) {
+                switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode) {
+                  case 2:
+                    report_int = 1;
+                    break;
+                  case 3:
+                    if (((mcp230xx_intcap >> intp) & 0x01) == 0) report_int = 1;
+                    break;
+                  case 4:
+                    if (((mcp230xx_intcap >> intp) & 0x01) == 1) report_int = 1;
+                    break;
+                  default:
+                    break;
+                }
+
+                if ((mcp230xx_int_counter_en) && (report_int)) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
+                    mcp230xx_int_counter[intp+(mcp230xx_port*8)]++;
+                  }
+                }
+
+                if (report_int) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
+                    mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]++;
+                    if (mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)] >= Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
+                      mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]=0;
+                    } else {
+                      report_int = 0;
+                    }
+                  }
+                }
+
+                if (report_int) {
+                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_retain_flag) {
+                    mcp230xx_int_retainer[intp+(mcp230xx_port*8)] = 1;
+                    report_int = 0;
+                  }
+                }
+                if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
+                  report_int = 0;
+                }
+                if (report_int) {
+                  bool int_tele = false;
+                  bool int_event = false;
+                  unsigned long millis_now = millis();
+                  unsigned long millis_since_last_int = millis_now - int_millis[intp+(mcp230xx_port*8)];
+                  int_millis[intp+(mcp230xx_port*8)]=millis_now;
+                  switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_mode) {
+                    case 0:
+                      int_tele=true;
+                      int_event=true;
+                      break;
+                    case 1:
+                      int_event=true;
+                      break;
+                    case 2:
+                      int_tele=true;
+                      break;
+                  }
+                  if (int_tele) {
+                    ResponseTime_P(PSTR(",\"MCP230XX_INT\":{\"D%i\":%i,\"MS\":%lu}}"),
+                      intp+(mcp230xx_port*8), ((mcp230xx_intcap >> intp) & 0x01),millis_since_last_int);
+                    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("MCP230XX_INT"));
+                  }
+                  if (int_event) {
+                    char command[19];
+                    sprintf(command,"event MCPINT_D%i=%i",intp+(mcp230xx_port*8),((mcp230xx_intcap >> intp) & 0x01));
+                    ExecuteCommand(command, SRC_RULE);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void MCP230xx_Show(bool json)
+{
+  if (json) {
+    uint8_t gpio = MCP230xx_readGPIO(0);
+    ResponseAppend_P(PSTR(",\"MCP230XX\":{\"D0\":%i,\"D1\":%i,\"D2\":%i,\"D3\":%i,\"D4\":%i,\"D5\":%i,\"D6\":%i,\"D7\":%i"),
+                (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
+    if (2 == mcp230xx_type) {
+      gpio = MCP230xx_readGPIO(1);
+      ResponseAppend_P(PSTR(",\"D8\":%i,\"D9\":%i,\"D10\":%i,\"D11\":%i,\"D12\":%i,\"D13\":%i,\"D14\":%i,\"D15\":%i"),
+                  (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
+    }
+    ResponseJsonEnd();
+  }
+}
+
+#ifdef USE_MCP230xx_OUTPUT
+
+void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
+  uint8_t portpins;
+  uint8_t port = 0;
+  uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode;
+  uint8_t interlock = Settings.flag.interlock;
+  int pinadd = (pin % 2)+1-(3*(pin % 2));
+  char cmnd[7], stt[4];
+  if (pin > 7) { port = 1; }
+  portpins = MCP230xx_readGPIO(port);
+  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
+    if (pinstate < 2) {
+      if (6 == pinmo) {
+        if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins |= (1 << (pin+pinadd-(port*8))),portpins &= ~(1 << (pin-(port*8)));
+      } else {
+        if (pinstate) portpins &= ~(1 << (pin+pinadd-(port*8))),portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
+      }
+    } else {
+      if (6 == pinmo) {
+      portpins |= (1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
+      } else {
+      portpins &= ~(1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
+      }
+    }
+  } else {
+    if (pinstate < 2) {
+      if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
+    } else {
+      portpins ^= (1 << (pin-(port*8)));
+    }
+  }
+  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port, portpins);
+  if (Settings.flag.save_state) {
+    Settings.mcp230xx_config[pin].saved_state=portpins>>(pin-(port*8))&1;
+    Settings.mcp230xx_config[pin+pinadd].saved_state=portpins>>(pin+pinadd-(port*8))&1;
+  }
+  sprintf(cmnd,ConvertNumTxt(pinstate, pinmo));
+  sprintf(stt,ConvertNumTxt((portpins >> (pin-(port*8))&1), pinmo));
+  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
+    char stt1[4];
+    sprintf(stt1,ConvertNumTxt((portpins >> (pin+pinadd-(port*8))&1), pinmo));
+    Response_P(PSTR("{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"},\"S29cmnd_D%i\":{\"STATE\":\"%s\"}}"),pin, cmnd, stt, pin+pinadd, stt1);
+  } else {
+    Response_P(MCP230XX_CMND_RESPONSE, pin, cmnd, stt);
+  }
+}
+
+#endif
+
+void MCP230xx_Reset(uint8_t pinmode) {
+  uint8_t pullup = 0;
+  if ((pinmode > 1) && (pinmode < 5)) { pullup=1; }
+  for (uint32_t pinx=0;pinx<16;pinx++) {
+    Settings.mcp230xx_config[pinx].pinmode=pinmode;
+    Settings.mcp230xx_config[pinx].pullup=pullup;
+    Settings.mcp230xx_config[pinx].saved_state=0;
+    if ((pinmode > 1) && (pinmode < 5)) {
+      Settings.mcp230xx_config[pinx].int_report_mode=0;
+    } else {
+      Settings.mcp230xx_config[pinx].int_report_mode=3;
+    }
+    Settings.mcp230xx_config[pinx].int_report_defer=0;
+    Settings.mcp230xx_config[pinx].int_count_en=0;
+    Settings.mcp230xx_config[pinx].int_retain_flag=0;
+    Settings.mcp230xx_config[pinx].spare13=0;
+    Settings.mcp230xx_config[pinx].spare14=0;
+    Settings.mcp230xx_config[pinx].spare15=0;
+  }
+  Settings.mcp230xx_int_prio = 0;
+  Settings.mcp230xx_int_timer = 0;
+  MCP230xx_ApplySettings();
+  char pulluptxt[7];
+  char intmodetxt[9];
+  sprintf(pulluptxt,ConvertNumTxt(pullup));
+  uint8_t intmode = 3;
+  if ((pinmode > 1) && (pinmode < 5)) { intmode = 0; }
+  sprintf(intmodetxt,IntModeTxt(intmode));
+  Response_P(MCP230XX_SENSOR_RESPONSE,99,pinmode,pulluptxt,intmodetxt,"");
+}
+
+bool MCP230xx_Command(void)
+{
+  bool serviced = true;
+  bool validpin = false;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { MCP230xx_Reset(1); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET1")) { MCP230xx_Reset(1); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET2")) { MCP230xx_Reset(2); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET3")) { MCP230xx_Reset(3); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET4")) { MCP230xx_Reset(4); return serviced; }
+#ifdef USE_MCP230xx_OUTPUT
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET5")) { MCP230xx_Reset(5); return serviced; }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET6")) { MCP230xx_Reset(6); return serviced; }
+#endif
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTPRI")) {
+    if (paramcount > 1) {
+      uint8_t intpri = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((intpri >= 0) && (intpri <= 20)) {
+        Settings.mcp230xx_int_prio = intpri;
+        Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
+        return serviced;
+      }
+    } else {
+      Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTTIMER")) {
+    if (paramcount > 1) {
+      uint8_t inttim = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if ((inttim >= 0) && (inttim <= 3600)) {
+        Settings.mcp230xx_int_timer = inttim;
+        MCP230xx_CheckForIntCounter();
+        Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
+        return serviced;
+      }
+    } else {
+      Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTDEF")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t intdef = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((intdef >= 0) && (intdef <= 15)) {
+            Settings.mcp230xx_config[pin].int_report_defer=intdef;
+            if (Settings.mcp230xx_config[pin].int_count_en) {
+              Settings.mcp230xx_config[pin].int_count_en=0;
+              MCP230xx_CheckForIntCounter();
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTCNT for pin D%i"),pin);
+            }
+            Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTCNT")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t intcnt = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((intcnt >= 0) && (intcnt <= 1)) {
+            Settings.mcp230xx_config[pin].int_count_en=intcnt;
+            if (Settings.mcp230xx_config[pin].int_report_defer) {
+              Settings.mcp230xx_config[pin].int_report_defer=0;
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTDEF for pin D%i"),pin);
+            }
+            if (Settings.mcp230xx_config[pin].int_report_mode < 3) {
+              Settings.mcp230xx_config[pin].int_report_mode=3;
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled immediate interrupt/telemetry reporting for pin D%i"),pin);
+            }
+            if ((Settings.mcp230xx_config[pin].int_count_en) && (!Settings.mcp230xx_int_timer)) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - INTCNT enabled for pin D%i but global INTTIMER is disabled!"),pin);
+            }
+            MCP230xx_CheckForIntCounter();
+            Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTRETAIN")) {
+    if (paramcount > 1) {
+      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+      if (pin < mcp230xx_pincount) {
+        if (pin == 0) {
+          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
+        } else {
+          validpin = true;
+        }
+      }
+      if (validpin) {
+        if (paramcount > 2) {
+          uint8_t int_retain = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+          if ((int_retain >= 0) && (int_retain <= 1)) {
+            Settings.mcp230xx_config[pin].int_retain_flag=int_retain;
+            Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
+            MCP230xx_CheckForIntRetainer();
+            return serviced;
+          } else {
+            serviced=false;
+            return serviced;
+          }
+        } else {
+          Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
+          return serviced;
+        }
+      }
+      serviced = false;
+      return serviced;
+    } else {
+      serviced = false;
+      return serviced;
+    }
+  }
+
+  uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
+
+  if (pin < mcp230xx_pincount) {
+    if (0 == pin) {
+      if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1), "0")) validpin=true;
+    } else {
+      validpin=true;
+    }
+  }
+  if (validpin && (paramcount > 1)) {
+    if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "?")) {
+      uint8_t port = 0;
+      if (pin > 7) { port = 1; }
+      uint8_t portdata = MCP230xx_readGPIO(port);
+      char pulluptxtr[7],pinstatustxtr[7];
+      char intmodetxt[9];
+      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
+      sprintf(pulluptxtr,ConvertNumTxt(Settings.mcp230xx_config[pin].pullup));
+#ifdef USE_MCP230xx_OUTPUT
+      uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode;
+      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod));
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,intmodetxt,pinstatustxtr);
+#else
+      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1));
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,intmodetxt,pinstatustxtr);
+#endif
+      return serviced;
+    }
+#ifdef USE_MCP230xx_OUTPUT
+    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
+      uint8_t pincmd = Settings.mcp230xx_config[pin].pinmode - 5;
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "ON")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "1"))) {
+        MCP230xx_SetOutPin(pin,abs(pincmd-1));
+        return serviced;
+      }
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "OFF")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0"))) {
+        MCP230xx_SetOutPin(pin,pincmd);
+        return serviced;
+      }
+      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "T")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "2"))) {
+        MCP230xx_SetOutPin(pin,2);
+        return serviced;
+      }
+    }
+#endif
+    uint8_t pinmode = 0;
+    uint8_t pullup = 0;
+    uint8_t intmode = 0;
+    if (paramcount > 1) {
+      pinmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
+    }
+    if (paramcount > 2) {
+      pullup = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
+    }
+    if (paramcount > 3) {
+      intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
+    }
+#ifdef USE_MCP230xx_OUTPUT
+    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2) && (paramcount > 2)) {
+#else
+    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2) && (paramcount > 2)) {
+#endif
+      Settings.mcp230xx_config[pin].pinmode=pinmode;
+      Settings.mcp230xx_config[pin].pullup=pullup;
+      if ((pinmode > 1) && (pinmode < 5)) {
+        if ((intmode >= 0) && (intmode <= 3)) {
+          Settings.mcp230xx_config[pin].int_report_mode=intmode;
+        }
+      } else {
+        Settings.mcp230xx_config[pin].int_report_mode=3;
+      }
+      MCP230xx_ApplySettings();
+      uint8_t port = 0;
+      if (pin > 7) { port = 1; }
+      uint8_t portdata = MCP230xx_readGPIO(port);
+      char pulluptxtc[7], pinstatustxtc[7];
+      char intmodetxt[9];
+      sprintf(pulluptxtc,ConvertNumTxt(pullup));
+      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
+#ifdef USE_MCP230xx_OUTPUT
+      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1,Settings.mcp230xx_config[pin].pinmode));
+#else
+      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1));
+#endif
+      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmode,pulluptxtc,intmodetxt,pinstatustxtc);
+      return serviced;
+    }
+  } else {
+    serviced=false;
+    return serviced;
+  }
+  return serviced;
+}
+
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+
+const char HTTP_SNS_MCP230xx_OUTPUT[] PROGMEM = "{s}MCP230XX D%d{m}%s{e}";
+
+void MCP230xx_UpdateWebData(void)
+{
+  uint8_t gpio1 = MCP230xx_readGPIO(0);
+  uint8_t gpio2 = 0;
+  if (2 == mcp230xx_type) {
+    gpio2 = MCP230xx_readGPIO(1);
+  }
+  uint16_t gpio = (gpio2 << 8) + gpio1;
+  for (uint32_t pin = 0; pin < mcp230xx_pincount; pin++) {
+    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
+      char stt[7];
+      sprintf(stt,ConvertNumTxt((gpio>>pin)&1,Settings.mcp230xx_config[pin].pinmode));
+      WSContentSend_PD(HTTP_SNS_MCP230xx_OUTPUT, pin, stt);
+    }
+  }
+}
+
+#endif
+
+#ifdef USE_MCP230xx_OUTPUT
+
+void MCP230xx_OutputTelemetry(void)
+{
+  uint8_t outputcount = 0;
+  uint16_t gpiototal = 0;
+  uint8_t gpioa = 0;
+  uint8_t gpiob = 0;
+  gpioa=MCP230xx_readGPIO(0);
+  if (2 == mcp230xx_type) { gpiob=MCP230xx_readGPIO(1); }
+  gpiototal=((uint16_t)gpiob << 8) | gpioa;
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].pinmode >= 5) outputcount++;
+  }
+  if (outputcount) {
+    char stt[7];
+    ResponseTime_P(PSTR(",\"MCP230_OUT\":{"));
+    for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+      if (Settings.mcp230xx_config[pinx].pinmode >= 5) {
+        sprintf(stt,ConvertNumTxt(((gpiototal>>pinx)&1),Settings.mcp230xx_config[pinx].pinmode));
+        ResponseAppend_P(PSTR("\"OUT_D%i\":\"%s\","),pinx,stt);
+      }
+    }
+    ResponseAppend_P(PSTR("\"END\":1}}"));
+    MqttPublishTeleSensor();
+  }
+}
+
+#endif
+
+void MCP230xx_Interrupt_Counter_Report(void) {
+  ResponseTime_P(PSTR(",\"MCP230_INTTIMER\":{"));
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].int_count_en) {
+      ResponseAppend_P(PSTR("\"INTCNT_D%i\":%i,"),pinx,mcp230xx_int_counter[pinx]);
+      mcp230xx_int_counter[pinx]=0;
+    }
+  }
+  ResponseAppend_P(PSTR("\"END\":1}}"));
+  MqttPublishTeleSensor();
+  mcp230xx_int_sec_counter = 0;
+}
+
+void MCP230xx_Interrupt_Retain_Report(void) {
+  uint16_t retainresult = 0;
+  ResponseTime_P(PSTR(",\"MCP_INTRETAIN\":{"));
+  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
+    if (Settings.mcp230xx_config[pinx].int_retain_flag) {
+      ResponseAppend_P(PSTR("\"D%i\":%i,"),pinx,mcp230xx_int_retainer[pinx]);
+      retainresult |= (((mcp230xx_int_retainer[pinx])&1) << pinx);
+      mcp230xx_int_retainer[pinx]=0;
+    }
+  }
+  ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult);
+  MqttPublishTeleSensor();
+}
+
+
+
+
+
+bool Xsns29(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_22)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+      MCP230xx_Detect();
+  }
+  else if (mcp230xx_type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        if (mcp230xx_int_en) {
+          mcp230xx_int_prio_counter++;
+          if ((mcp230xx_int_prio_counter) >= (Settings.mcp230xx_int_prio)) {
+            MCP230xx_CheckForInterrupt();
+            mcp230xx_int_prio_counter=0;
+          }
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        if (mcp230xx_int_counter_en) {
+          mcp230xx_int_sec_counter++;
+          if (mcp230xx_int_sec_counter >= Settings.mcp230xx_int_timer) {
+            MCP230xx_Interrupt_Counter_Report();
+          }
+        }
+        if (tele_period == 0) {
+          if (mcp230xx_int_retainer_en) {
+            MCP230xx_Interrupt_Retain_Report();
+          }
+#ifdef USE_MCP230xx_OUTPUT
+          MCP230xx_OutputTelemetry();
+#endif
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MCP230xx_Show(1);
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_29 == XdrvMailbox.index) {
+          result = MCP230xx_Command();
+        }
+        break;
+#ifdef USE_WEBSERVER
+#ifdef USE_MCP230xx_OUTPUT
+#ifdef USE_MCP230xx_DISPLAYOUTPUT
+      case FUNC_WEB_SENSOR:
+        MCP230xx_UpdateWebData();
+        break;
+#endif
+#endif
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+# 46 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+#ifdef USE_I2C
+#ifdef USE_MPR121
+
+
+
+
+
+#define XSNS_30 30
+#define XI2C_23 23
+
+
+
+
+
+
+
+#define MPR121_ELEX_REG 0x00
+
+
+#define MPR121_MHDR_REG 0x2B
+
+
+#define MPR121_MHDR_VAL 0x01
+
+
+#define MPR121_NHDR_REG 0x2C
+
+
+#define MPR121_NHDR_VAL 0x01
+
+
+#define MPR121_NCLR_REG 0x2D
+
+
+#define MPR121_NCLR_VAL 0x0E
+
+
+#define MPR121_MHDF_REG 0x2F
+
+
+#define MPR121_MHDF_VAL 0x01
+
+
+#define MPR121_NHDF_REG 0x30
+
+
+#define MPR121_NHDF_VAL 0x05
+
+
+#define MPR121_NCLF_REG 0x31
+
+
+#define MPR121_NCLF_VAL 0x01
+
+
+#define MPR121_MHDPROXR_REG 0x36
+
+
+#define MPR121_MHDPROXR_VAL 0x3F
+
+
+#define MPR121_NHDPROXR_REG 0x37
+
+
+#define MPR121_NHDPROXR_VAL 0x5F
+
+
+#define MPR121_NCLPROXR_REG 0x38
+
+
+#define MPR121_NCLPROXR_VAL 0x04
+
+
+#define MPR121_FDLPROXR_REG 0x39
+
+
+#define MPR121_FDLPROXR_VAL 0x00
+
+
+#define MPR121_MHDPROXF_REG 0x3A
+
+
+#define MPR121_MHDPROXF_VAL 0x01
+
+
+#define MPR121_NHDPROXF_REG 0x3B
+
+
+#define MPR121_NHDPROXF_VAL 0x01
+
+
+#define MPR121_NCLPROXF_REG 0x3C
+
+
+#define MPR121_NCLPROXF_VAL 0x1F
+
+
+#define MPR121_FDLPROXF_REG 0x3D
+
+
+#define MPR121_FDLPROXF_VAL 0x04
+
+
+#define MPR121_E0TTH_REG 0x41
+
+
+#define MPR121_E0TTH_VAL 12
+
+
+#define MPR121_E0RTH_REG 0x42
+
+
+#define MPR121_E0RTH_VAL 6
+
+
+#define MPR121_CDT_REG 0x5D
+
+
+#define MPR121_CDT_VAL 0x20
+
+
+#define MPR121_ECR_REG 0x5E
+
+
+#define MPR121_ECR_VAL 0x8F
+
+
+
+#define MPR121_SRST_REG 0x80
+
+
+#define MPR121_SRST_VAL 0x63
+
+
+#define BITC(sensor,position) ((pS->current[sensor] >> position) & 1)
+
+
+#define BITP(sensor,position) ((pS->previous[sensor] >> position) & 1)
+# 195 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+typedef struct mpr121 mpr121;
+struct mpr121 {
+ const uint8_t i2c_addr[4] = { 0x5A, 0x5B, 0x5C, 0x5D };
+ const char id[4] = { 'A', 'B', 'C', 'D' };
+ bool connected[4] = { false, false, false, false };
+ bool running[4] = { false, false, false, false };
+ uint16_t current[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
+ uint16_t previous[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
+};
+
+bool mpr21_found = false;
+# 217 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+void Mpr121Init(struct mpr121 *pS, bool initial)
+{
+
+ for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
+
+    if (initial && I2cActive(pS->i2c_addr[i])) { continue; }
+
+
+  pS->connected[i] = (I2cWrite8(pS->i2c_addr[i], MPR121_SRST_REG, MPR121_SRST_VAL)
+        && (0x24 == I2cRead8(pS->i2c_addr[i], 0x5D)));
+  if (pS->connected[i]) {
+
+
+      mpr21_found = true;
+   char device_name[16];
+   snprintf_P(device_name, sizeof(device_name), PSTR("MPR121(%c)"), pS->id[i]);
+      I2cSetActiveFound(pS->i2c_addr[i], device_name);
+
+
+   for (uint32_t j = 0; j < 13; j++) {
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_E0TTH_REG + 2 * j, MPR121_E0TTH_VAL);
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_E0RTH_REG + 2 * j, MPR121_E0RTH_VAL);
+   }
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDR_REG, MPR121_MHDR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDR_REG, MPR121_NHDR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLR_REG, MPR121_NCLR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDF_REG, MPR121_MHDF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDF_REG, MPR121_NHDF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLF_REG, MPR121_NCLF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXR_REG, MPR121_MHDPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXR_REG, MPR121_NHDPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXR_REG, MPR121_NCLPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXR_REG, MPR121_FDLPROXR_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXF_REG, MPR121_MHDPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXF_REG, MPR121_NHDPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXF_REG, MPR121_NCLPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXF_REG, MPR121_FDLPROXF_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_CDT_REG, MPR121_CDT_VAL);
+
+
+   I2cWrite8(pS->i2c_addr[i], MPR121_ECR_REG, MPR121_ECR_VAL);
+
+
+   pS->running[i] = (0x00 != I2cRead8(pS->i2c_addr[i], MPR121_ECR_REG));
+
+   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_I2C "MPR121%c: %sRunning"), pS->id[i], (pS->running[i]) ? "" : "NOT");
+
+  } else {
+
+
+   pS->running[i] = false;
+  }
+ }
+
+
+ if (!(pS->connected[0] || pS->connected[1] || pS->connected[2]
+       || pS->connected[3])) {
+  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C "MPR121: No sensors found"));
+ }
+}
+# 326 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+void Mpr121Show(struct mpr121 *pS, uint8_t function)
+{
+
+
+ for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
+
+
+  if (pS->connected[i]) {
+
+
+   if (!I2cValidRead16LE(&pS->current[i], pS->i2c_addr[i], MPR121_ELEX_REG)) {
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Cannot read data!"), pS->id[i]);
+    Mpr121Init(pS, false);
+    return;
+   }
+
+   if (BITC(i, 15)) {
+
+
+    I2cWrite8(pS->i2c_addr[i], MPR121_ELEX_REG, 0x00);
+    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Excess current detected! Fix circuits if it happens repeatedly! Soft-resetting MPR121 ..."), pS->id[i]);
+    Mpr121Init(pS, false);
+    return;
+   }
+  }
+
+  if (pS->running[i]) {
+
+
+   if (FUNC_JSON_APPEND == function) {
+    ResponseAppend_P(PSTR(",\"MPR121%c\":{"), pS->id[i]);
+   }
+
+   for (uint32_t j = 0; j < 13; j++) {
+
+
+    if ((FUNC_EVERY_50_MSECOND == function)
+        && (BITC(i, j) != BITP(i, j))) {
+     Response_P(PSTR("{\"MPR121%c\":{\"Button%i\":%i}}"), pS->id[i], j, BITC(i, j));
+     MqttPublishPrefixTopic_P(RESULT_OR_STAT, mqtt_data);
+    }
+
+#ifdef USE_WEBSERVER
+    if (FUNC_WEB_SENSOR == function) {
+     WSContentSend_PD(PSTR("{s}MPR121%c Button%d{m}%d{e}"), pS->id[i], j, BITC(i, j));
+    }
+#endif
+
+
+    if (FUNC_JSON_APPEND == function) {
+     ResponseAppend_P(PSTR("%s\"Button%i\":%i"), (j > 0 ? "," : ""), j, BITC(i, j));
+    }
+   }
+
+
+   pS->previous[i] = pS->current[i];
+
+
+   if (FUNC_JSON_APPEND == function) {
+        ResponseJsonEnd();
+   }
+  }
+ }
+}
+# 410 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
+bool Xsns30(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_23)) { return false; }
+
+ bool result = false;
+
+
+ static struct mpr121 mpr121;
+
+  if (FUNC_INIT == function) {
+
+  Mpr121Init(&mpr121, true);
+  }
+  else if (mpr21_found) {
+
+  switch (function) {
+
+
+  case FUNC_EVERY_50_MSECOND:
+   Mpr121Show(&mpr121, FUNC_EVERY_50_MSECOND);
+   break;
+
+
+  case FUNC_JSON_APPEND:
+   Mpr121Show(&mpr121, FUNC_JSON_APPEND);
+   break;
+
+#ifdef USE_WEBSERVER
+
+  case FUNC_WEB_SENSOR:
+   Mpr121Show(&mpr121, FUNC_WEB_SENSOR);
+   break;
+#endif
+  }
+ }
+
+ return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
+#ifdef USE_I2C
+#ifdef USE_CCS811
+# 30 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
+#define XSNS_31 31
+#define XI2C_24 24
+
+#define EVERYNSECONDS 5
+
+#include "Adafruit_CCS811.h"
+
+Adafruit_CCS811 ccs;
+uint8_t CCS811_ready = 0;
+uint8_t CCS811_type = 0;;
+uint16_t eCO2;
+uint16_t TVOC;
+uint8_t tcnt = 0;
+uint8_t ecnt = 0;
+
+
+
+void CCS811Detect(void)
+{
+  if (I2cActive(CCS811_ADDRESS)) { return; }
+
+  if (!ccs.begin(CCS811_ADDRESS)) {
+    CCS811_type = 1;
+    I2cSetActiveFound(CCS811_ADDRESS, "CCS811");
+  }
+}
+
+void CCS811Update(void)
+{
+  tcnt++;
+  if (tcnt >= EVERYNSECONDS) {
+    tcnt = 0;
+    CCS811_ready = 0;
+    if (ccs.available()) {
+      if (!ccs.readData()){
+        TVOC = ccs.getTVOC();
+        eCO2 = ccs.geteCO2();
+        CCS811_ready = 1;
+        if (global_update && global_humidity>0 && global_temperature!=9999) { ccs.setEnvironmentalData((uint8_t)global_humidity, global_temperature); }
+        ecnt = 0;
+      }
+    } else {
+
+      ecnt++;
+      if (ecnt > 6) {
+
+        ccs.begin(CCS811_ADDRESS);
+      }
+    }
+  }
+}
+
+const char HTTP_SNS_CCS811[] PROGMEM =
+  "{s}CCS811 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
+  "{s}CCS811 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
+
+void CCS811Show(bool json)
+{
+  if (CCS811_ready) {
+    if (json) {
+      ResponseAppend_P(PSTR(",\"CCS811\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), eCO2,TVOC);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, eCO2);
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_CCS811, eCO2, TVOC);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns31(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_24)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    CCS811Detect();
+  }
+  else if (CCS811_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        CCS811Update();
+        break;
+      case FUNC_JSON_APPEND:
+        CCS811Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        CCS811Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
+#ifdef USE_I2C
+#ifdef USE_MPU6050
+# 30 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
+#define XSNS_32 32
+#define XI2C_25 25
+
+#define D_SENSOR_MPU6050 "MPU6050"
+
+#define MPU_6050_ADDR_AD0_LOW 0x68
+#define MPU_6050_ADDR_AD0_HIGH 0x69
+
+uint8_t MPU_6050_address;
+uint8_t MPU_6050_addresses[] = { MPU_6050_ADDR_AD0_LOW, MPU_6050_ADDR_AD0_HIGH };
+uint8_t MPU_6050_found;
+
+int16_t MPU_6050_ax = 0, MPU_6050_ay = 0, MPU_6050_az = 0;
+int16_t MPU_6050_gx = 0, MPU_6050_gy = 0, MPU_6050_gz = 0;
+int16_t MPU_6050_temperature = 0;
+
+#ifdef USE_MPU6050_DMP
+  #include "MPU6050_6Axis_MotionApps20.h"
+  #include "I2Cdev.h"
+  #include <helper_3dmath.h>
+  typedef struct MPU6050_DMP{
+  uint8_t devStatus;
+  uint16_t packetSize;
+  uint16_t fifoCount;
+  uint8_t fifoBuffer[64];
+  Quaternion q;
+  VectorInt16 aa;
+  VectorInt16 aaReal;
+  VectorFloat gravity;
+  float euler[3];
+  float yawPitchRoll[3];
+  } MPU6050_DMP;
+
+  MPU6050_DMP MPU6050_dmp;
+#else
+  #include <MPU6050.h>
+#endif
+MPU6050 mpu6050;
+
+void MPU_6050PerformReading(void)
+{
+#ifdef USE_MPU6050_DMP
+    mpu6050.resetFIFO();
+    MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
+    while (MPU6050_dmp.fifoCount < MPU6050_dmp.packetSize) MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
+    mpu6050.getFIFOBytes(MPU6050_dmp.fifoBuffer, MPU6050_dmp.packetSize);
+    MPU6050_dmp.fifoCount -= MPU6050_dmp.packetSize;
+
+    mpu6050.dmpGetQuaternion(&MPU6050_dmp.q, MPU6050_dmp.fifoBuffer);
+    mpu6050.dmpGetEuler(MPU6050_dmp.euler, &MPU6050_dmp.q);
+    mpu6050.dmpGetAccel(&MPU6050_dmp.aa, MPU6050_dmp.fifoBuffer);
+    mpu6050.dmpGetGravity(&MPU6050_dmp.gravity, &MPU6050_dmp.q);
+    mpu6050.dmpGetLinearAccel(&MPU6050_dmp.aaReal, &MPU6050_dmp.aa, &MPU6050_dmp.gravity);
+    mpu6050.dmpGetYawPitchRoll(MPU6050_dmp.yawPitchRoll, &MPU6050_dmp.q, &MPU6050_dmp.gravity);
+    MPU_6050_gx = MPU6050_dmp.euler[0] * 180/M_PI;
+    MPU_6050_gy = MPU6050_dmp.euler[1] * 180/M_PI;
+    MPU_6050_gz = MPU6050_dmp.euler[2] * 180/M_PI;
+    MPU_6050_ax = MPU6050_dmp.aaReal.x;
+    MPU_6050_ay = MPU6050_dmp.aaReal.y;
+    MPU_6050_az = MPU6050_dmp.aaReal.z;
+#else
+  mpu6050.getMotion6(
+    &MPU_6050_ax,
+    &MPU_6050_ay,
+    &MPU_6050_az,
+    &MPU_6050_gx,
+    &MPU_6050_gy,
+    &MPU_6050_gz
+  );
+#endif
+  MPU_6050_temperature = mpu6050.getTemperature();
+}
+# 119 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
+void MPU_6050Detect(void)
+{
+  for (uint32_t i = 0; i < sizeof(MPU_6050_addresses); i++)
+  {
+    MPU_6050_address = MPU_6050_addresses[i];
+    if (!I2cSetDevice(MPU_6050_address)) { break; }
+    mpu6050.setAddr(MPU_6050_addresses[i]);
+
+#ifdef USE_MPU6050_DMP
+    MPU6050_dmp.devStatus = mpu6050.dmpInitialize();
+    mpu6050.setXGyroOffset(220);
+    mpu6050.setYGyroOffset(76);
+    mpu6050.setZGyroOffset(-85);
+    mpu6050.setZAccelOffset(1788);
+    if (MPU6050_dmp.devStatus == 0) {
+      mpu6050.setDMPEnabled(true);
+      MPU6050_dmp.packetSize = mpu6050.dmpGetFIFOPacketSize();
+      MPU_6050_found = true;
+    }
+#else
+    mpu6050.initialize();
+    MPU_6050_found = mpu6050.testConnection();
+#endif
+    Settings.flag2.axis_resolution = 2;
+  }
+
+  if (MPU_6050_found) {
+    I2cSetActiveFound(MPU_6050_address, D_SENSOR_MPU6050);
+  }
+}
+
+#define D_YAW "Yaw"
+#define D_PITCH "Pitch"
+#define D_ROLL "Roll"
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_AXIS[] PROGMEM =
+  "{s}" D_SENSOR_MPU6050 " " D_AX_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_AY_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_AZ_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GX_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GY_AXIS "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_GZ_AXIS "{m}%s{e}";
+#ifdef USE_MPU6050_DMP
+const char HTTP_SNS_YPR[] PROGMEM =
+  "{s}" D_SENSOR_MPU6050 " " D_YAW "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_PITCH "{m}%s{e}"
+  "{s}" D_SENSOR_MPU6050 " " D_ROLL "{m}%s{e}";
+#endif
+#endif
+
+#define D_JSON_AXIS_AX "AccelXAxis"
+#define D_JSON_AXIS_AY "AccelYAxis"
+#define D_JSON_AXIS_AZ "AccelZAxis"
+#define D_JSON_AXIS_GX "GyroXAxis"
+#define D_JSON_AXIS_GY "GyroYAxis"
+#define D_JSON_AXIS_GZ "GyroZAxis"
+#define D_JSON_YAW "Yaw"
+#define D_JSON_PITCH "Pitch"
+#define D_JSON_ROLL "Roll"
+
+void MPU_6050Show(bool json)
+{
+  MPU_6050PerformReading();
+
+  double tempConv = (MPU_6050_temperature / 340.0 + 35.53);
+  char temperature[33];
+  dtostrfd(tempConv, Settings.flag2.temperature_resolution, temperature);
+  char axis_ax[33];
+  dtostrfd(MPU_6050_ax, Settings.flag2.axis_resolution, axis_ax);
+  char axis_ay[33];
+  dtostrfd(MPU_6050_ay, Settings.flag2.axis_resolution, axis_ay);
+  char axis_az[33];
+  dtostrfd(MPU_6050_az, Settings.flag2.axis_resolution, axis_az);
+  char axis_gx[33];
+  dtostrfd(MPU_6050_gx, Settings.flag2.axis_resolution, axis_gx);
+  char axis_gy[33];
+  dtostrfd(MPU_6050_gy, Settings.flag2.axis_resolution, axis_gy);
+  char axis_gz[33];
+  dtostrfd(MPU_6050_gz, Settings.flag2.axis_resolution, axis_gz);
+#ifdef USE_MPU6050_DMP
+  char axis_yaw[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[0] / PI * 180.0, Settings.flag2.axis_resolution, axis_yaw);
+  char axis_pitch[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[1] / PI * 180.0, Settings.flag2.axis_resolution, axis_pitch);
+  char axis_roll[33];
+  dtostrfd(MPU6050_dmp.yawPitchRoll[2] / PI * 180.0, Settings.flag2.axis_resolution, axis_roll);
+#endif
+
+  if (json) {
+    char json_axis_ax[25];
+    snprintf_P(json_axis_ax, sizeof(json_axis_ax), PSTR(",\"" D_JSON_AXIS_AX "\":%s"), axis_ax);
+    char json_axis_ay[25];
+    snprintf_P(json_axis_ay, sizeof(json_axis_ay), PSTR(",\"" D_JSON_AXIS_AY "\":%s"), axis_ay);
+    char json_axis_az[25];
+    snprintf_P(json_axis_az, sizeof(json_axis_az), PSTR(",\"" D_JSON_AXIS_AZ "\":%s"), axis_az);
+    char json_axis_gx[25];
+    snprintf_P(json_axis_gx, sizeof(json_axis_gx), PSTR(",\"" D_JSON_AXIS_GX "\":%s"), axis_gx);
+    char json_axis_gy[25];
+    snprintf_P(json_axis_gy, sizeof(json_axis_gy), PSTR(",\"" D_JSON_AXIS_GY "\":%s"), axis_gy);
+    char json_axis_gz[25];
+    snprintf_P(json_axis_gz, sizeof(json_axis_gz), PSTR(",\"" D_JSON_AXIS_GZ "\":%s"), axis_gz);
+#ifdef USE_MPU6050_DMP
+    char json_ypr_y[25];
+    snprintf_P(json_ypr_y, sizeof(json_ypr_y), PSTR(",\"" D_JSON_YAW "\":%s"), axis_yaw);
+    char json_ypr_p[25];
+    snprintf_P(json_ypr_p, sizeof(json_ypr_p), PSTR(",\"" D_JSON_PITCH "\":%s"), axis_pitch);
+    char json_ypr_r[25];
+    snprintf_P(json_ypr_r, sizeof(json_ypr_r), PSTR(",\"" D_JSON_ROLL "\":%s"), axis_roll);
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s%s%s%s}"),
+      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz,
+      json_ypr_y, json_ypr_p, json_ypr_r);
+#else
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s}"),
+      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz);
+#endif
+#ifdef USE_DOMOTICZ
+    DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TEMP, D_SENSOR_MPU6050, temperature, TempUnit());
+    WSContentSend_PD(HTTP_SNS_AXIS, axis_ax, axis_ay, axis_az, axis_gx, axis_gy, axis_gz);
+#ifdef USE_MPU6050_DMP
+    WSContentSend_PD(HTTP_SNS_YPR, axis_yaw, axis_pitch, axis_roll);
+#endif
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns32(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_25)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MPU_6050Detect();
+  }
+  else if (MPU_6050_found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        if (tele_period == Settings.tele_period -3) {
+          MPU_6050PerformReading();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MPU_6050Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MPU_6050Show(0);
+        MPU_6050PerformReading();
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
+#ifdef USE_I2C
+#ifdef USE_DS3231
+# 35 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
+#define XSNS_33 33
+#define XI2C_26 26
+
+
+#ifndef USE_RTC_ADDR
+#define USE_RTC_ADDR 0x68
+#endif
+
+
+#define RTC_SECONDS 0x00
+#define RTC_MINUTES 0x01
+#define RTC_HOURS 0x02
+#define RTC_DAY 0x03
+#define RTC_DATE 0x04
+#define RTC_MONTH 0x05
+#define RTC_YEAR 0x06
+#define RTC_CONTROL 0x0E
+#define RTC_STATUS 0x0F
+
+#define OSF 7
+#define EOSC 7
+#define BBSQW 6
+#define CONV 5
+#define RS2 4
+#define RS1 3
+#define INTCN 2
+
+
+#define HR1224 6
+#define CENTURY 7
+#define DYDT 6
+bool ds3231ReadStatus = false;
+bool ds3231WriteStatus = false;
+bool DS3231chipDetected = false;
+
+
+
+
+void DS3231Detect(void)
+{
+  if (I2cActive(USE_RTC_ADDR)) { return; }
+
+  if (I2cValidRead(USE_RTC_ADDR, RTC_STATUS, 1)) {
+    I2cSetActiveFound(USE_RTC_ADDR, "DS3231");
+    DS3231chipDetected = true;
+  }
+}
+
+
+
+
+uint8_t bcd2dec(uint8_t n)
+{
+  return n - 6 * (n >> 4);
+}
+
+
+
+
+uint8_t dec2bcd(uint8_t n)
+{
+  return n + 6 * (n / 10);
+}
+
+
+
+
+uint32_t ReadFromDS3231(void)
+{
+  TIME_T tm;
+  tm.second = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_SECONDS));
+  tm.minute = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MINUTES));
+  tm.hour = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_HOURS) & ~_BV(HR1224));
+  tm.day_of_week = I2cRead8(USE_RTC_ADDR, RTC_DAY);
+  tm.day_of_month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_DATE));
+  tm.month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MONTH) & ~_BV(CENTURY));
+  tm.year = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_YEAR));
+  return MakeTime(tm);
+}
+
+
+
+void SetDS3231Time (uint32_t epoch_time) {
+  TIME_T tm;
+  BreakTime(epoch_time, tm);
+  I2cWrite8(USE_RTC_ADDR, RTC_SECONDS, dec2bcd(tm.second));
+  I2cWrite8(USE_RTC_ADDR, RTC_MINUTES, dec2bcd(tm.minute));
+  I2cWrite8(USE_RTC_ADDR, RTC_HOURS, dec2bcd(tm.hour));
+  I2cWrite8(USE_RTC_ADDR, RTC_DAY, tm.day_of_week);
+  I2cWrite8(USE_RTC_ADDR, RTC_DATE, dec2bcd(tm.day_of_month));
+  I2cWrite8(USE_RTC_ADDR, RTC_MONTH, dec2bcd(tm.month));
+  I2cWrite8(USE_RTC_ADDR, RTC_YEAR, dec2bcd(tm.year));
+  I2cWrite8(USE_RTC_ADDR, RTC_STATUS, I2cRead8(USE_RTC_ADDR, RTC_STATUS) & ~_BV(OSF));
+}
+
+void DS3231EverySecond(void)
+{
+  TIME_T tmpTime;
+  if (!ds3231ReadStatus && Rtc.utc_time < START_VALID_TIME ) {
+    ntp_force_sync = true;
+    Rtc.utc_time = ReadFromDS3231();
+
+
+    BreakTime(Rtc.utc_time, tmpTime);
+    if (Rtc.utc_time < START_VALID_TIME ) {
+      ds3231ReadStatus = true;
+    }
+    RtcTime.year = tmpTime.year + 1970;
+    Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
+    Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Set time from DS3231 to RTC (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
+    if (Rtc.local_time < START_VALID_TIME) {
+      rules_flag.time_init = 1;
+    } else {
+      rules_flag.time_set = 1;
+    }
+  }
+  else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs(Rtc.utc_time - ReadFromDS3231()) > 60) {
+    AddLog_P2(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
+                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
+    SetDS3231Time (Rtc.utc_time);
+    ds3231WriteStatus = true;
+  }
+}
+
+
+
+
+
+bool Xsns33(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_26)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    DS3231Detect();
+  }
+  else if (DS3231chipDetected) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        DS3231EverySecond();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
+#ifdef USE_HX711
+# 35 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
+#define XSNS_34 34
+
+#ifndef HX_MAX_WEIGHT
+#define HX_MAX_WEIGHT 20000
+#endif
+#ifndef HX_REFERENCE
+#define HX_REFERENCE 250
+#endif
+#ifndef HX_SCALE
+#define HX_SCALE 120
+#endif
+
+#define HX_TIMEOUT 120
+#define HX_SAMPLES 10
+#define HX_CAL_TIMEOUT 15
+
+#define HX_GAIN_128 1
+#define HX_GAIN_32 2
+#define HX_GAIN_64 3
+
+#define D_JSON_WEIGHT_REF "WeightRef"
+#define D_JSON_WEIGHT_CAL "WeightCal"
+#define D_JSON_WEIGHT_MAX "WeightMax"
+#define D_JSON_WEIGHT_ITEM "WeightItem"
+#define D_JSON_WEIGHT_CHANGE "WeightChange"
+#define D_JSON_WEIGHT_RAW "WeightRaw"
+#define D_JSON_WEIGHT_DELTA "WeightDelta"
+
+enum HxCalibrationSteps { HX_CAL_END, HX_CAL_LIMBO, HX_CAL_FINISH, HX_CAL_FAIL, HX_CAL_DONE, HX_CAL_FIRST, HX_CAL_RESET, HX_CAL_START };
+
+const char kHxCalibrationStates[] PROGMEM = D_HX_CAL_FAIL "|" D_HX_CAL_DONE "|" D_HX_CAL_REFERENCE "|" D_HX_CAL_REMOVE;
+
+struct HX {
+  long weight = 0;
+  long raw = 0;
+  long last_weight = 0;
+  long sum_weight = 0;
+  long sum_raw = 0;
+  long offset = 0;
+  long scale = 1;
+  long weight_diff = 0;
+  uint8_t type = 1;
+  uint8_t sample_count = 0;
+  uint8_t calibrate_step = HX_CAL_END;
+  uint8_t calibrate_timer = 0;
+  uint8_t calibrate_msg = 0;
+  uint8_t pin_sck;
+  uint8_t pin_dout;
+  bool tare_flg = false;
+  bool weight_changed = false;
+  uint16_t weight_delta = 4;
+} Hx;
+
+
+
+bool HxIsReady(uint16_t timeout)
+{
+
+  uint32_t start = millis();
+  while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) { yield(); }
+  return (digitalRead(Hx.pin_dout) == LOW);
+}
+
+long HxRead(void)
+{
+  if (!HxIsReady(HX_TIMEOUT)) { return -1; }
+
+  uint8_t data[3] = { 0 };
+  uint8_t filler = 0x00;
+
+
+  data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+  data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+  data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
+
+
+  for (unsigned int i = 0; i < HX_GAIN_128; i++) {
+    digitalWrite(Hx.pin_sck, HIGH);
+    digitalWrite(Hx.pin_sck, LOW);
+  }
+
+
+  if (data[2] & 0x80) { filler = 0xFF; }
+
+
+  unsigned long value = ( static_cast<unsigned long>(filler) << 24
+                        | static_cast<unsigned long>(data[2]) << 16
+                        | static_cast<unsigned long>(data[1]) << 8
+                        | static_cast<unsigned long>(data[0]) );
+
+  return static_cast<long>(value);
+}
+
+
+
+void HxResetPart(void)
+{
+  Hx.tare_flg = true;
+  Hx.sum_weight = 0;
+  Hx.sample_count = 0;
+  Hx.last_weight = 0;
+}
+
+void HxReset(void)
+{
+  HxResetPart();
+  Settings.energy_frequency_calibration = 0;
+}
+
+void HxCalibrationStateTextJson(uint8_t msg_id)
+{
+  char cal_text[30];
+
+  Hx.calibrate_msg = msg_id;
+  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
+
+  if (msg_id < 3) { MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("Sensor34")); }
+}
+
+void SetWeightDelta()
+{
+
+  if (Settings.weight_change == 0) {
+    Hx.weight_delta = 4;
+    return;
+  }
+
+
+  if (Settings.weight_change > 100) {
+    Hx.weight_delta = (Settings.weight_change - 100) * 10 + 100;
+    return;
+  }
+
+
+  Hx.weight_delta = Settings.weight_change - 1;
+}
+# 192 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
+bool HxCommand(void)
+{
+  bool serviced = true;
+  bool show_parms = false;
+  char sub_string[XdrvMailbox.data_len +1];
+
+  for (uint32_t ca = 0; ca < XdrvMailbox.data_len; ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+  }
+
+  switch (XdrvMailbox.payload) {
+    case 1:
+      HxReset();
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, "Reset");
+      break;
+    case 2:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+      }
+      Hx.scale = 1;
+      HxReset();
+      Hx.calibrate_step = HX_CAL_START;
+      Hx.calibrate_timer = 1;
+      HxCalibrationStateTextJson(3);
+      break;
+    case 3:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+      }
+      show_parms = true;
+      break;
+    case 4:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_calibration = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+        Hx.scale = Settings.weight_calibration;
+      }
+      show_parms = true;
+      break;
+    case 5:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_max = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) / 1000;
+      }
+      show_parms = true;
+      break;
+    case 6:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.weight_item = (unsigned long)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 10);
+      }
+      show_parms = true;
+      break;
+    case 7:
+      Settings.energy_frequency_calibration = Hx.weight;
+      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, D_JSON_DONE);
+      break;
+    case 8:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+        Settings.SensorBits1.hx711_json_weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) & 1;
+      }
+      show_parms = true;
+      break;
+    case 9:
+      if (strstr(XdrvMailbox.data, ",") != nullptr) {
+ Settings.weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
+ SetWeightDelta();
+      }
+      show_parms = true;
+      break;
+    default:
+      show_parms = true;
+  }
+
+  if (show_parms) {
+    char item[33];
+    dtostrfd((float)Settings.weight_item / 10, 1, item);
+    Response_P(PSTR("{\"Sensor34\":{\"" D_JSON_WEIGHT_REF "\":%d,\"" D_JSON_WEIGHT_CAL "\":%d,\"" D_JSON_WEIGHT_MAX "\":%d,\""
+      D_JSON_WEIGHT_ITEM "\":%s,\"" D_JSON_WEIGHT_CHANGE "\":%s,\"" D_JSON_WEIGHT_DELTA "\":%d}}"),
+        Settings.weight_reference, Settings.weight_calibration, Settings.weight_max * 1000,
+        item, GetStateText(Settings.SensorBits1.hx711_json_weight_change), Settings.weight_change);
+  }
+
+  return serviced;
+}
+
+
+
+long HxWeight(void)
+{
+  return (Hx.calibrate_step < HX_CAL_FAIL) ? Hx.weight : 0;
+}
+
+void HxInit(void)
+{
+  Hx.type = 0;
+  if ((pin[GPIO_HX711_DAT] < 99) && (pin[GPIO_HX711_SCK] < 99)) {
+    Hx.pin_sck = pin[GPIO_HX711_SCK];
+    Hx.pin_dout = pin[GPIO_HX711_DAT];
+
+    pinMode(Hx.pin_sck, OUTPUT);
+    pinMode(Hx.pin_dout, INPUT);
+
+    digitalWrite(Hx.pin_sck, LOW);
+
+    SetWeightDelta();
+
+    if (HxIsReady(8 * HX_TIMEOUT)) {
+      if (!Settings.weight_max) { Settings.weight_max = HX_MAX_WEIGHT / 1000; }
+      if (!Settings.weight_calibration) { Settings.weight_calibration = HX_SCALE; }
+      if (!Settings.weight_reference) { Settings.weight_reference = HX_REFERENCE; }
+      Hx.scale = Settings.weight_calibration;
+      HxRead();
+      HxResetPart();
+      Hx.type = 1;
+    }
+  }
+}
+
+void HxEvery100mSecond(void)
+{
+  long raw = HxRead();
+  Hx.sum_raw += raw;
+  Hx.sum_weight += raw;
+
+  Hx.sample_count++;
+  if (HX_SAMPLES == Hx.sample_count) {
+    long average = Hx.sum_weight / Hx.sample_count;
+    long raw_average = Hx.sum_raw / Hx.sample_count;
+    long value = average - Hx.offset;
+    Hx.weight = value / Hx.scale;
+    Hx.raw = raw_average / Hx.scale;
+    if (Hx.weight < 0) {
+      if (Settings.energy_frequency_calibration) {
+        long difference = Settings.energy_frequency_calibration + Hx.weight;
+        Hx.last_weight = difference;
+        if (difference < 0) { HxReset(); }
+      }
+      Hx.weight = 0;
+    } else {
+      Hx.last_weight = Settings.energy_frequency_calibration;
+    }
+
+    if (Hx.tare_flg) {
+      Hx.tare_flg = false;
+      Hx.offset = average;
+    }
+
+    if (Hx.calibrate_step) {
+      Hx.calibrate_timer--;
+
+      if (HX_CAL_START == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
+      }
+      else if (HX_CAL_RESET == Hx.calibrate_step) {
+        if (Hx.calibrate_timer) {
+          if (Hx.weight < (long)Settings.weight_reference) {
+            Hx.calibrate_step--;
+            Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
+            HxCalibrationStateTextJson(2);
+          }
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+      else if (HX_CAL_FIRST == Hx.calibrate_step) {
+        if (Hx.calibrate_timer) {
+          if (Hx.weight > (long)Settings.weight_reference) {
+            Hx.calibrate_step--;
+          }
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+      else if (HX_CAL_DONE == Hx.calibrate_step) {
+        if (Hx.weight > (long)Settings.weight_reference) {
+          Hx.calibrate_step = HX_CAL_FINISH;
+          Settings.weight_calibration = Hx.weight / Settings.weight_reference;
+          Hx.weight = 0;
+          HxCalibrationStateTextJson(1);
+        } else {
+          Hx.calibrate_step = HX_CAL_FAIL;
+        }
+      }
+
+      if (HX_CAL_FAIL == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.tare_flg = true;
+        HxCalibrationStateTextJson(0);
+      }
+      if (HX_CAL_FINISH == Hx.calibrate_step) {
+        Hx.calibrate_step--;
+        Hx.calibrate_timer = 3 * (10 / HX_SAMPLES);
+        Hx.scale = Settings.weight_calibration;
+      }
+
+      if (!Hx.calibrate_timer) {
+        Hx.calibrate_step = HX_CAL_END;
+      }
+    } else {
+      Hx.weight += Hx.last_weight;
+
+      if (Settings.SensorBits1.hx711_json_weight_change) {
+        if (abs(Hx.weight - Hx.weight_diff) > Hx.weight_delta) {
+          Hx.weight_diff = Hx.weight;
+          Hx.weight_changed = true;
+        }
+        else if (Hx.weight_changed && (Hx.weight == Hx.weight_diff)) {
+          mqtt_data[0] = '\0';
+          ResponseAppendTime();
+          HxShow(true);
+          ResponseJsonEnd();
+          MqttPublishTeleSensor();
+          Hx.weight_changed = false;
+        }
+      }
+    }
+
+    Hx.sum_weight = 0;
+    Hx.sum_raw = 0;
+    Hx.sample_count = 0;
+  }
+}
+
+void HxSaveBeforeRestart(void)
+{
+  Settings.energy_frequency_calibration = Hx.weight;
+  Hx.sample_count = HX_SAMPLES +1;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_HX711_WEIGHT[] PROGMEM =
+  "{s}HX711 " D_WEIGHT "{m}%s " D_UNIT_KILOGRAM "{e}";
+const char HTTP_HX711_COUNT[] PROGMEM =
+  "{s}HX711 " D_COUNT "{m}%d{e}";
+const char HTTP_HX711_CAL[] PROGMEM =
+  "{s}HX711 %s{m}{e}";
+#endif
+
+void HxShow(bool json)
+{
+  char scount[30] = { 0 };
+
+  uint16_t count = 0;
+  float weight = 0;
+  if (Hx.calibrate_step < HX_CAL_FAIL) {
+    if (Hx.weight && Settings.weight_item) {
+      count = (Hx.weight * 10) / Settings.weight_item;
+      if (count > 1) {
+        snprintf_P(scount, sizeof(scount), PSTR(",\"" D_JSON_COUNT "\":%d"), count);
+      }
+    }
+    weight = (float)Hx.weight / 1000;
+  }
+  char weight_chr[33];
+  dtostrfd(weight, Settings.flag2.weight_resolution, weight_chr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"HX711\":{\"" D_JSON_WEIGHT "\":%s%s, \"" D_JSON_WEIGHT_RAW "\":%d}"), weight_chr, scount, Hx.raw);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_HX711_WEIGHT, weight_chr);
+    if (count > 1) {
+      WSContentSend_PD(HTTP_HX711_COUNT, count);
+    }
+    if (Hx.calibrate_step) {
+      char cal_text[30];
+      WSContentSend_PD(HTTP_HX711_CAL, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
+    }
+#endif
+  }
+}
+
+#ifdef USE_WEBSERVER
+#ifdef USE_HX711_GUI
+
+
+
+
+#define WEB_HANDLE_HX711 "s34"
+
+const char S_CONFIGURE_HX711[] PROGMEM = D_CONFIGURE_HX711;
+
+const char HTTP_BTN_MENU_MAIN_HX711[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button name='reset'>" D_RESET_HX711 "</button></form></p>";
+
+const char HTTP_BTN_MENU_HX711[] PROGMEM =
+  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button>" D_CONFIGURE_HX711 "</button></form></p>";
+
+const char HTTP_FORM_HX711[] PROGMEM =
+  "<fieldset><legend><b>&nbsp;" D_CALIBRATION "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
+  "<p><b>" D_REFERENCE_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' step='0.001' id='p1' placeholder='0' value='%s'></p>"
+  "<br><button name='calibrate' type='submit'>" D_CALIBRATE "</button>"
+  "</form>"
+  "</fieldset><br><br>"
+
+  "<fieldset><legend><b>&nbsp;" D_HX711_PARAMETERS "&nbsp;</b></legend>"
+  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
+  "<p><b>" D_ITEM_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' max='6.5535' step='0.0001' id='p2' placeholder='0.0' value='%s'></p>";
+
+void HandleHxAction(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_HX711);
+
+  if (WebServer->hasArg("save")) {
+    HxSaveSettings();
+    HandleConfiguration();
+    return;
+  }
+
+  char stemp1[20];
+
+  if (WebServer->hasArg("reset")) {
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 1"));
+    ExecuteWebCommand(stemp1, SRC_WEBGUI);
+
+    HandleRoot();
+    return;
+  }
+
+  if (WebServer->hasArg("calibrate")) {
+    WebGetArg("p1", stemp1, sizeof(stemp1));
+    Settings.weight_reference = (!strlen(stemp1)) ? 0 : (unsigned long)(CharToFloat(stemp1) * 1000);
+
+    HxLogUpdates();
+
+    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 2"));
+    ExecuteWebCommand(stemp1, SRC_WEBGUI);
+
+    HandleRoot();
+    return;
+  }
+
+  WSContentStart_P(S_CONFIGURE_HX711);
+  WSContentSendStyle();
+  dtostrfd((float)Settings.weight_reference / 1000, 3, stemp1);
+  char stemp2[20];
+  dtostrfd((float)Settings.weight_item / 10000, 4, stemp2);
+  WSContentSend_P(HTTP_FORM_HX711, stemp1, stemp2);
+  WSContentSend_P(HTTP_FORM_END);
+  WSContentSpaceButton(BUTTON_CONFIGURATION);
+  WSContentStop();
+}
+
+void HxSaveSettings(void)
+{
+  char tmp[100];
+
+  WebGetArg("p2", tmp, sizeof(tmp));
+  Settings.weight_item = (!strlen(tmp)) ? 0 : (unsigned long)(CharToFloat(tmp) * 10000);
+
+  HxLogUpdates();
+}
+
+void HxLogUpdates(void)
+{
+  char weigth_ref_chr[33];
+  dtostrfd((float)Settings.weight_reference / 1000, Settings.flag2.weight_resolution, weigth_ref_chr);
+  char weigth_item_chr[33];
+  dtostrfd((float)Settings.weight_item / 10000, 4, weigth_item_chr);
+
+  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_JSON_WEIGHT_REF " %s, " D_JSON_WEIGHT_ITEM " %s"), weigth_ref_chr, weigth_item_chr);
+}
+
+#endif
+#endif
+
+
+
+
+
+bool Xsns34(uint8_t function)
+{
+  bool result = false;
+
+  if (Hx.type) {
+    switch (function) {
+      case FUNC_EVERY_100_MSECOND:
+        HxEvery100mSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_34 == XdrvMailbox.index) {
+          result = HxCommand();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        HxShow(1);
+        break;
+      case FUNC_SAVE_BEFORE_RESTART:
+        HxSaveBeforeRestart();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HxShow(0);
+        break;
+#ifdef USE_HX711_GUI
+      case FUNC_WEB_ADD_MAIN_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_MAIN_HX711);
+        break;
+      case FUNC_WEB_ADD_BUTTON:
+        WSContentSend_P(HTTP_BTN_MENU_HX711);
+        break;
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/" WEB_HANDLE_HX711, HandleHxAction);
+        break;
+#endif
+#endif
+      case FUNC_INIT:
+        HxInit();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
+#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
+#if defined(USE_TX20_WIND_SENSOR) && defined(USE_TX23_WIND_SENSOR)
+#undef USE_TX20_WIND_SENSOR
+#warning **** use USE_TX20_WIND_SENSOR or USE_TX23_WIND_SENSOR but not both together, TX20 disabled ****
+#endif
+# 41 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
+#define XSNS_35 35
+
+#define TX2X_BIT_TIME 1220
+#define TX2X_RESET_VALUES 60
+
+
+
+extern "C" {
+#include "gpio.h"
+}
+
+#ifdef USE_TX20_WIND_SENSOR
+  #define D_TX2x_NAME "TX20"
+#else
+  #define D_TX2x_NAME "TX23"
+#endif
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TX2X[] PROGMEM =
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s (%s&deg;){e}";
+#endif
+
+const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
+                                       D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
+                                       D_TX20_EAST "|"
+                                       D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
+                                       D_TX20_SOUTH "|"
+                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
+                                       D_TX20_WEST "|"
+                                       D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
+                                       D_TX20_NORTH D_TX20_WEST "|"
+                                       D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
+
+uint8_t tx2x_sa = 0;
+uint8_t tx2x_sb = 0;
+uint8_t tx2x_sd = 0;
+uint8_t tx2x_se = 0;
+uint16_t tx2x_sc = 0;
+uint16_t tx2x_sf = 0;
+
+float tx2x_wind_speed_kmh = 0;
+float tx2x_wind_speed_max = 0;
+float tx2x_wind_speed_avg = 0;
+float tx2x_wind_sum = 0;
+int tx2x_count = 0;
+uint8_t tx2x_wind_direction = 0;
+
+bool tx2x_available = false;
+
+#ifdef USE_TX23_WIND_SENSOR
+uint8_t tx23_stage = 0;
+#endif
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void TX2xStartRead(void) ICACHE_RAM_ATTR;
+#endif
+
+void TX2xStartRead(void)
+{
+# 135 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
+#ifdef USE_TX23_WIND_SENSOR
+  if (0!=tx23_stage)
+  {
+    if ((2==tx23_stage) || (3==tx23_stage))
+    {
+#endif
+      tx2x_available = false;
+
+      tx2x_sa = 0;
+      tx2x_sb = 0;
+      tx2x_sd = 0;
+      tx2x_se = 0;
+      tx2x_sc = 0;
+      tx2x_sf = 0;
+
+      delayMicroseconds(TX2X_BIT_TIME / 2);
+
+      for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
+        uint8_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
+#ifdef USE_TX23_WIND_SENSOR
+        if (bitcount > 41 - 5) {
+
+          tx2x_sa = (tx2x_sa << 1) | (dpin);
+        } else if (bitcount > 41 - 5 - 4) {
+
+          tx2x_sb = tx2x_sb >> 1 | ((dpin) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12) {
+
+          tx2x_sc = tx2x_sc >> 1 | ((dpin) << 11);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
+
+          tx2x_sd = tx2x_sd >> 1 | ((dpin) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
+
+          tx2x_se = tx2x_se >> 1 | ((dpin ^ 1) << 3);
+        } else {
+
+          tx2x_sf = tx2x_sf >> 1 | ((dpin ^ 1) << 11);
+        }
+#else
+        if (bitcount > 41 - 5) {
+
+          tx2x_sa = (tx2x_sa << 1) | (dpin ^ 1);
+        } else if (bitcount > 41 - 5 - 4) {
+
+          tx2x_sb = tx2x_sb >> 1 | ((dpin ^ 1) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12) {
+
+          tx2x_sc = tx2x_sc >> 1 | ((dpin ^ 1) << 11);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
+
+          tx2x_sd = tx2x_sd >> 1 | ((dpin ^ 1) << 3);
+        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
+
+          tx2x_se = tx2x_se >> 1 | (dpin << 3);
+        } else {
+
+          tx2x_sf = tx2x_sf >> 1 | (dpin << 11);
+        }
+#endif
+        delayMicroseconds(TX2X_BIT_TIME);
+      }
+
+      uint8_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
+      chk &= 0xf;
+
+#ifdef USE_TX23_WIND_SENSOR
+
+      if ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
+        tx2x_available = true;
+      }
+#else
+      if ((chk == tx2x_sd) && (tx2x_sc < 511)) {
+        tx2x_available = true;
+      }
+#endif
+#ifdef USE_TX23_WIND_SENSOR
+    }
+    tx23_stage++;
+  }
+#endif
+
+
+
+  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX2X_TXD_BLACK]);
+}
+
+void Tx2xReset(void)
+{
+    tx2x_count = 0;
+    tx2x_wind_sum = 0;
+    tx2x_wind_speed_max = 0;
+}
+
+void Tx2xRead(void)
+{
+#ifdef USE_TX23_WIND_SENSOR
+
+
+  if ((uptime % 3)==0) {
+
+
+    tx23_stage = 0;
+    pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
+    digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
+  } else if ((uptime % 3)==1) {
+
+
+    tx23_stage = 1;
+    pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT_PULLUP);
+  }
+#endif
+  if (0==Settings.tele_period && !(uptime % TX2X_RESET_VALUES)) {
+    Tx2xReset();
+  }
+  else if (tx2x_available) {
+
+    tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+    if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
+      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+    }
+    tx2x_count++;
+    tx2x_wind_sum += tx2x_wind_speed_kmh;
+    tx2x_wind_speed_avg = tx2x_wind_sum / tx2x_count;
+    tx2x_wind_direction = tx2x_sb;
+  }
+}
+
+void Tx2xInit(void)
+{
+#ifdef USE_TX23_WIND_SENSOR
+  tx23_stage = 0;
+  pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
+  digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
+#else
+  pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT);
+#endif
+  attachInterrupt(pin[GPIO_TX2X_TXD_BLACK], TX2xStartRead, RISING);
+}
+
+void Tx2xShow(bool json)
+{
+  char wind_speed_string[33];
+  dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
+  char wind_speed_max_string[33];
+  dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
+  char wind_speed_avg_string[33];
+  dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
+  char wind_direction_string[4];
+  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx2x_wind_direction, kTx2xDirections);
+  char wind_direction_degree[33];
+  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
+      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
+    Tx2xReset();
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_TX2X, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns35(uint8_t function)
+{
+  bool result = false;
+
+  if (pin[GPIO_TX2X_TXD_BLACK] < 99) {
+    switch (function) {
+      case FUNC_INIT:
+        Tx2xInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        Tx2xRead();
+        break;
+      case FUNC_JSON_APPEND:
+        Tx2xShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tx2xShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
+# 22 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
+#ifdef USE_I2C
+#ifdef USE_MGC3130
+# 35 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
+#define XSNS_36 36
+#define XI2C_27 27
+
+#warning **** MGC3130: It is recommended to disable all unneeded I2C-drivers ****
+
+#define MGC3130_I2C_ADDR 0x42
+
+#define MGC3130_xfer pin[GPIO_MGC3130_XFER]
+#define MGC3130_reset pin[GPIO_MGC3130_RESET]
+
+
+bool MGC3130_type = false;
+char MGC3130stype[] = "MGC3130";
+
+
+#define MGC3130_SYSTEM_STATUS 0x15
+#define MGC3130_REQUEST_MSG 0x06
+#define MGC3130_FW_VERSION 0x83
+#define MGC3130_SET_RUNTIME 0xA2
+#define MGC3130_SENSOR_DATA 0x91
+
+
+#define MGC3130_GESTURE_GARBAGE 1
+#define MGC3130_FLICK_WEST_EAST 2
+#define MGC3130_FLICK_EAST_WEST 3
+#define MGC3130_FLICK_SOUTH_NORTH 4
+#define MGC3130_FLICK_NORTH_SOUTH 5
+#define MGC3130_CIRCLE_CLOCKWISE 6
+#define MGC3130_CIRCLE_CCLOCKWISE 7
+
+#define MGC3130_MIN_ROTVALUE 0
+#define MGC3130_MAX_ROTVALUE 1023
+#define MGC3130_MIN_ZVALUE 32768
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_MGC_3130_SNS[] PROGMEM =
+  "{s}" "%s" "{m}%s{e}"
+  "{s}" "HwRev" "{m}%u.%u{e}"
+  "{s}" "loaderVer" "{m}%u.%u{e}"
+  "{s}" "platVer" "{m}%u{e}";
+#endif
+
+
+
+
+
+
+
+#pragma pack(1)
+union MGC3130_Union{
+  uint8_t buffer[132];
+  struct
+  {
+
+    uint8_t msgSize;
+    uint8_t flag;
+    uint8_t counter;
+    uint8_t id;
+
+    struct {
+        uint8_t DSPStatus:1;
+        uint8_t gestureInfo:1;
+        uint8_t touchInfo:1;
+        uint8_t airWheelInfo:1;
+        uint8_t xyzPosition:1;
+        uint8_t noisePower:1;
+        uint8_t reserved:2;
+        uint8_t electrodeConfiguration:3;
+        uint8_t CICData:1;
+        uint8_t SDData:1;
+        uint16_t reserved2:3;
+    } outputConfigMask;
+    uint8_t timestamp;
+    struct {
+        uint8_t positionValid:1;
+        uint8_t airWheelValid:1;
+        uint8_t rawDataValid:1;
+        uint8_t noisePowerValid:1;
+        uint8_t environmentalNoise:1;
+        uint8_t clipping:1;
+        uint8_t reserved:1;
+        uint8_t DSPRunning:1;
+    } systemInfo;
+    uint16_t dspInfo;
+    struct {
+        uint8_t gestureCode:8;
+        uint8_t reserved:4;
+        uint8_t gestureType:4;
+        uint8_t edgeFlick:1;
+        uint16_t reserved2:14;
+        uint8_t gestureInProgress:1;
+    } gestureInfo;
+    struct {
+        uint8_t touchSouth:1;
+        uint8_t touchWest:1;
+        uint8_t touchNorth:1;
+        uint8_t touchEast:1;
+        uint8_t touchCentre:1;
+        uint8_t tapSouth:1;
+        uint8_t tapWest:1;
+        uint8_t tapNorth:1;
+        uint8_t tapEast :1;
+        uint8_t tapCentre:1;
+        uint8_t doubleTapSouth:1;
+        uint8_t doubleTapWest:1;
+        uint8_t doubleTapNorth:1;
+        uint8_t doubleTapEast:1;
+        uint8_t doubleTapCentre:1;
+        uint8_t reserved:1;
+        uint8_t touchCounter;
+        uint8_t reserved2;
+    } touchInfo;
+    int8_t airWheel;
+    uint8_t reserved;
+    uint16_t x;
+    uint16_t y;
+    uint16_t z;
+    float noisePower;
+    float CICData[4];
+    float SDData[4];
+  } out;
+  struct {
+    uint8_t header[3];
+
+    uint8_t valid;
+    uint8_t hwRev[2];
+    uint8_t parameterStartAddr;
+    uint8_t loaderVersion[2];
+    uint8_t loaderPlatform;
+    uint8_t fwStartAddr;
+    char fwVersion[120];
+  } fw;
+  struct{
+    uint8_t id;
+    uint8_t size;
+    uint16_t error;
+    uint32_t reserved;
+    uint32_t reserved1;
+  } status;
+} MGC_data;
+#pragma pack()
+
+char MGC3130_currentGesture[12];
+
+int8_t MGC3130_delta, MGC3130_lastrotation = 0;
+int16_t MGC3130_rotValue, MGC3130_lastSentRotValue = 0;
+
+uint16_t MGC3130_lastSentX, MGC3130_lastSentY, MGC3130_lastSentZ = 0;
+
+uint8_t hwRev[2], loaderVersion[2], loaderPlatform = 0;
+char MGC3130_firmwareInfo[20];
+
+uint8_t MGC3130_touchTimeout = 0;
+uint16_t MGC3130_touchCounter = 1;
+uint32_t MGC3130_touchTimeStamp = millis();
+bool MGC3130_triggeredByTouch = false;
+
+uint8_t MGC3130_mode = 1;
+
+
+
+uint8_t MGC3130autoCal[] = {0x10, 0x00, 0x00, 0xA2, 0x80, 0x00 , 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF};
+uint8_t MGC3130disableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
+uint8_t MGC3130enableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
+
+void MGC3130_handleSensorData(){
+      if ( MGC_data.out.outputConfigMask.touchInfo && MGC3130_touchTimeout == 0){
+        if (MGC3130_handleTouch()){
+            MGC3130_triggeredByTouch = true;
+            MqttPublishSensor();
+        }
+      }
+
+      if(MGC3130_mode == 1){
+        if( MGC_data.out.outputConfigMask.gestureInfo && MGC_data.out.gestureInfo.gestureCode > 0){
+          MGC3130_handleGesture();
+          MqttPublishSensor();
+        }
+      }
+      if(MGC3130_mode == 2){
+        if(MGC_data.out.outputConfigMask.airWheelInfo && MGC_data.out.systemInfo.airWheelValid){
+          MGC3130_handleAirWheel();
+          MqttPublishSensor();
+        }
+      }
+      if(MGC3130_mode == 3){
+        if(MGC_data.out.systemInfo.positionValid && (MGC_data.out.z > MGC3130_MIN_ZVALUE)){
+          MqttPublishSensor();
+        }
+      }
+}
+
+void MGC3130_sendMessage(uint8_t data[], uint8_t length){
+   Wire.beginTransmission(MGC3130_I2C_ADDR);
+    Wire.write(data,length);
+   Wire.endTransmission();
+    delay(2);
+    MGC3130_receiveMessage();
+}
+
+
+void MGC3130_handleGesture(){
+
+  char edge[5];
+  if (MGC_data.out.gestureInfo.edgeFlick){
+    snprintf_P(edge, sizeof(edge), PSTR("ED_"));
+  }
+  else{
+    snprintf_P(edge, sizeof(edge), PSTR(""));
+  }
+  switch(MGC_data.out.gestureInfo.gestureCode){
+    case MGC3130_GESTURE_GARBAGE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("NONE"));
+    break;
+    case MGC3130_FLICK_WEST_EAST:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_WE"), edge);
+    break;
+    case MGC3130_FLICK_EAST_WEST:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_EW"), edge);
+    break;
+    case MGC3130_FLICK_SOUTH_NORTH:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_SN"), edge);
+    break;
+    case MGC3130_FLICK_NORTH_SOUTH:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_NS"), edge);
+    break;
+    case MGC3130_CIRCLE_CLOCKWISE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CW"));
+    break;
+    case MGC3130_CIRCLE_CCLOCKWISE:
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CCW"));
+    break;
+  }
+
+}
+
+bool MGC3130_handleTouch(){
+
+  bool success = false;
+    if (MGC_data.out.touchInfo.doubleTapCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_C"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_E"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_N"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_W"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.doubleTapSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_S"));
+    MGC3130_touchTimeout = 5;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    if (MGC_data.out.touchInfo.tapCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_C"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_E"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_N"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_W"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.tapSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_S"));
+    MGC3130_touchTimeout = 2;
+    success = true;
+    MGC3130_touchCounter = 1;
+    }
+    else if (MGC_data.out.touchInfo.touchCentre && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_C"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchEast && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_E"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchNorth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_N"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchWest && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_W"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+    else if (MGC_data.out.touchInfo.touchSouth && !success){
+
+    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_S"));
+    success = true;
+    MGC3130_touchCounter++;
+    }
+
+  return success;
+}
+
+void MGC3130_handleAirWheel(){
+  MGC3130_delta = MGC_data.out.airWheel - MGC3130_lastrotation;
+  MGC3130_lastrotation = MGC_data.out.airWheel;
+
+      MGC3130_rotValue = MGC3130_rotValue + MGC3130_delta;
+      if(MGC3130_rotValue < MGC3130_MIN_ROTVALUE){
+        MGC3130_rotValue = MGC3130_MIN_ROTVALUE;
+      }
+      if(MGC3130_rotValue > MGC3130_MAX_ROTVALUE){
+        MGC3130_rotValue = MGC3130_MAX_ROTVALUE;
+      }
+}
+
+void MGC3130_handleSystemStatus(){
+
+}
+
+bool MGC3130_receiveMessage(){
+  if(MGC3130_readData()){
+      switch(MGC_data.out.id){
+        case MGC3130_SENSOR_DATA:
+          MGC3130_handleSensorData();
+          break;
+        case MGC3130_SYSTEM_STATUS:
+          MGC3130_handleSystemStatus();
+          break;
+        case MGC3130_FW_VERSION:
+          hwRev[0] = MGC_data.fw.hwRev[1];
+          hwRev[1] = MGC_data.fw.hwRev[0];
+          loaderVersion[0] = MGC_data.fw.loaderVersion[0];
+          loaderVersion[1] = MGC_data.fw.loaderVersion[1];
+          loaderPlatform = MGC_data.fw.loaderPlatform;
+          snprintf_P(MGC3130_firmwareInfo, sizeof(MGC3130_firmwareInfo), PSTR("FW: %s"), MGC_data.fw.fwVersion);
+          MGC3130_firmwareInfo[20] = '\0';
+
+          break;
+      }
+    return true;
+  }
+  return false;
+}
+
+bool MGC3130_readData()
+{
+  bool success = false;
+  if (!digitalRead(MGC3130_xfer)){
+    pinMode(MGC3130_xfer, OUTPUT);
+    digitalWrite(MGC3130_xfer, LOW);
+    Wire.requestFrom(MGC3130_I2C_ADDR, (uint16_t)32);
+
+    MGC_data.buffer[0] = 4;
+    unsigned char i = 0;
+    while(Wire.available() && (i < MGC_data.buffer[0])){
+      MGC_data.buffer[i] = Wire.read();
+      i++;
+      }
+    digitalWrite(MGC3130_xfer, HIGH);
+    pinMode(MGC3130_xfer, INPUT);
+    success = true;
+  }
+  return success;
+}
+
+void MGC3130_nextMode(){
+  if (MGC3130_mode < 3){
+    MGC3130_mode++;
+  }
+  else{
+    MGC3130_mode = 1;
+  }
+  switch(MGC3130_mode){
+    case 1:
+    MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+    case 2:
+    MGC3130_sendMessage(MGC3130enableAirwheel,16);
+    break;
+    case 3:
+    MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+  }
+}
+
+void MGC3130_loop()
+{
+  if(MGC3130_touchTimeout > 0){
+    MGC3130_touchTimeout--;
+  }
+  MGC3130_receiveMessage();
+}
+
+void MGC3130_detect(void)
+{
+  if (MGC3130_type || I2cActive(MGC3130_I2C_ADDR)) { return; }
+
+  pinMode(MGC3130_xfer, INPUT_PULLUP);
+  pinMode(MGC3130_reset, OUTPUT);
+  digitalWrite(MGC3130_reset, LOW);
+  delay(10);
+  digitalWrite(MGC3130_reset, HIGH);
+  delay(50);
+
+  if (MGC3130_receiveMessage()) {
+    I2cSetActiveFound(MGC3130_I2C_ADDR, MGC3130stype);
+    MGC3130_currentGesture[0] = '\0';
+    MGC3130_type = true;
+  }
+}
+
+
+
+
+
+void MGC3130_show(bool json)
+{
+  if (!MGC3130_type) { return; }
+
+  char status_chr[2];
+  if (MGC_data.out.systemInfo.DSPRunning) {
+    sprintf (status_chr, "1");
+  }
+  else{
+    sprintf (status_chr, "0");
+  }
+
+  if (json) {
+    if (MGC3130_mode == 3 && !MGC3130_triggeredByTouch) {
+      if (MGC_data.out.systemInfo.positionValid && !(MGC_data.out.x == MGC3130_lastSentX && MGC_data.out.y == MGC3130_lastSentY && MGC_data.out.z == MGC3130_lastSentZ)) {
+        ResponseAppend_P(PSTR(",\"%s\":{\"X\":%u,\"Y\":%u,\"Z\":%u}"),
+          MGC3130stype, MGC_data.out.x/64, MGC_data.out.y/64, (MGC_data.out.z-(uint16_t)MGC3130_MIN_ZVALUE)/64);
+        MGC3130_lastSentX = MGC_data.out.x;
+        MGC3130_lastSentY = MGC_data.out.y;
+        MGC3130_lastSentZ = MGC_data.out.z;
+      }
+    }
+    MGC3130_triggeredByTouch = false;
+
+    if (MGC3130_mode == 2) {
+      if (MGC_data.out.systemInfo.airWheelValid && (MGC3130_rotValue != MGC3130_lastSentRotValue)) {
+        ResponseAppend_P(PSTR(",\"%s\":{\"AW\":%i}"), MGC3130stype, MGC3130_rotValue);
+        MGC3130_lastSentRotValue = MGC3130_rotValue;
+      }
+    }
+
+    if (MGC3130_currentGesture[0] != '\0') {
+      if (millis() - MGC3130_touchTimeStamp > 220 ) {
+        MGC3130_touchCounter = 1;
+      }
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), MGC3130stype, MGC3130_currentGesture, MGC3130_touchCounter);
+      MGC3130_currentGesture[0] = '\0';
+      MGC3130_touchTimeStamp = millis();
+    }
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_MGC_3130_SNS, MGC3130stype, status_chr, hwRev[0], hwRev[1], loaderVersion[0], loaderVersion[1], loaderPlatform );
+#endif
+  }
+}
+# 557 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
+bool MGC3130CommandSensor()
+{
+  bool serviced = true;
+
+  switch (XdrvMailbox.payload) {
+    case 0:
+      MGC3130_nextMode();
+      break;
+    case 1:
+      MGC3130_mode = 1;
+      MGC3130_sendMessage(MGC3130disableAirwheel,16);
+      break;
+    case 2:
+      MGC3130_mode = 2;
+      MGC3130_sendMessage(MGC3130enableAirwheel,16);
+      break;
+    case 3:
+      MGC3130_mode = 3;
+      MGC3130_sendMessage(MGC3130disableAirwheel,16);
+    break;
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns36(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_27)) { return false; }
+
+  bool result = false;
+
+  if ((FUNC_INIT == function) && (pin[GPIO_MGC3130_XFER] < 99) && (pin[GPIO_MGC3130_RESET] < 99)) {
+    MGC3130_detect();
+  }
+  else if (MGC3130_type) {
+    switch (function) {
+      case FUNC_EVERY_50_MSECOND:
+        MGC3130_loop();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_36 == XdrvMailbox.index) {
+          result = MGC3130CommandSensor();
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        MGC3130_show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MGC3130_show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#ifdef USE_RF_SENSOR
+# 33 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define XSNS_37 37
+
+
+
+
+#define RFSNS_VALID_WINDOW 1800
+
+#define RFSNS_LOOPS_PER_MILLI 1900
+#define RFSNS_RAW_BUFFER_SIZE 180
+#define RFSNS_MIN_RAW_PULSES 112
+
+#define RFSNS_MIN_PULSE_LENGTH 300
+#define RFSNS_RAWSIGNAL_SAMPLE 50
+#define RFSNS_SIGNAL_TIMEOUT 10
+#define RFSNS_SIGNAL_REPEAT_TIME 500
+
+typedef struct RawSignalStruct
+{
+  int Number;
+  uint8_t Repeats;
+  uint8_t Multiply;
+  unsigned long Time;
+  uint8_t Pulses[RFSNS_RAW_BUFFER_SIZE+2];
+
+} raw_signal_t;
+
+raw_signal_t *rfsns_raw_signal = nullptr;
+uint8_t rfsns_rf_bit;
+uint8_t rfsns_rf_port;
+uint8_t rfsns_any_sensor = 0;
+
+
+
+
+
+bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal)
+{
+  uint8_t Fbit = digitalPinToBitMask(DataPin);
+  uint8_t Fport = digitalPinToPort(DataPin);
+  uint8_t FstateMask = (StateSignal ? Fbit : 0);
+
+  if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
+    const unsigned long LoopsPerMilli = RFSNS_LOOPS_PER_MILLI;
+
+
+
+
+
+
+    unsigned long PulseLength = 0;
+    if (rfsns_raw_signal->Time) {
+      if (rfsns_raw_signal->Repeats && (rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) {
+        PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
+        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && (PulseLength > micros())) {
+          if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
+            PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
+          }
+        }
+        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && ((*portInputRegister(Fport) & Fbit) != FstateMask));
+      }
+    }
+
+    int RawCodeLength = 1;
+    bool Ftoggle = false;
+    unsigned long numloops = 0;
+    unsigned long maxloops = RFSNS_SIGNAL_TIMEOUT * LoopsPerMilli;
+    rfsns_raw_signal->Multiply = RFSNS_RAWSIGNAL_SAMPLE;
+    do {
+      numloops = 0;
+      while(((*portInputRegister(Fport) & Fbit) == FstateMask) ^ Ftoggle) {
+        if (numloops++ == maxloops) { break; }
+      }
+      PulseLength = (numloops *1000) / LoopsPerMilli;
+      if (PulseLength < RFSNS_MIN_PULSE_LENGTH) { break; }
+      Ftoggle = !Ftoggle;
+      rfsns_raw_signal->Pulses[RawCodeLength++] = PulseLength / (unsigned long)rfsns_raw_signal->Multiply;
+    }
+    while(RawCodeLength < RFSNS_RAW_BUFFER_SIZE && numloops <= maxloops);
+
+    if ((RawCodeLength >= RFSNS_MIN_RAW_PULSES) && (RawCodeLength < RFSNS_RAW_BUFFER_SIZE -1)) {
+      rfsns_raw_signal->Repeats = 0;
+      rfsns_raw_signal->Number = RawCodeLength -1;
+      rfsns_raw_signal->Pulses[rfsns_raw_signal->Number] = 0;
+      rfsns_raw_signal->Time = millis();
+      return true;
+    }
+    else
+      rfsns_raw_signal->Number = 0;
+  }
+
+  return false;
+}
+
+#ifdef USE_THEO_V2
+# 149 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define RFSNS_THEOV2_MAX_CHANNEL 2
+
+#define RFSNS_THEOV2_PULSECOUNT 114
+#define RFSNS_THEOV2_RF_PULSE_MID 1000
+
+typedef struct {
+  uint32_t time;
+  int16_t temp;
+  uint16_t lux;
+  uint8_t volt;
+} theo_v2_t1_t;
+
+typedef struct {
+  uint32_t time;
+  int16_t temp;
+  uint16_t hum;
+  uint8_t volt;
+} theo_v2_t2_t;
+
+theo_v2_t1_t *rfsns_theo_v2_t1 = nullptr;
+theo_v2_t2_t *rfsns_theo_v2_t2 = nullptr;
+
+void RfSnsInitTheoV2(void)
+{
+  rfsns_theo_v2_t1 = (theo_v2_t1_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t1_t));
+  rfsns_theo_v2_t2 = (theo_v2_t2_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t2_t));
+  rfsns_any_sensor++;
+}
+
+void RfSnsAnalyzeTheov2(void)
+{
+  if (rfsns_raw_signal->Number != RFSNS_THEOV2_PULSECOUNT) { return; }
+
+  uint8_t Checksum;
+  uint8_t Channel;
+  uint8_t Type;
+  uint8_t Voltage;
+  int Payload1;
+  int Payload2;
+
+  uint8_t b, bytes, bits, id;
+
+  uint8_t idx = 3;
+  uint8_t chksum = 0;
+  for (bytes = 0; bytes < 7; bytes++) {
+    b = 0;
+    for (bits = 0; bits <= 7; bits++)
+    {
+      if ((rfsns_raw_signal->Pulses[idx] * rfsns_raw_signal->Multiply) > RFSNS_THEOV2_RF_PULSE_MID) {
+        b |= 1 << bits;
+      }
+      idx += 2;
+    }
+    if (bytes > 0) { chksum += b; }
+
+    switch (bytes) {
+    case 0:
+      Checksum = b;
+      break;
+    case 1:
+      id = b;
+      Channel = b & 0x7;
+      Type = (b >> 3) & 0x1f;
+      break;
+    case 2:
+      Voltage = b;
+      break;
+    case 3:
+      Payload1 = b;
+      break;
+    case 4:
+      Payload1 = (b << 8) | Payload1;
+      break;
+    case 5:
+      Payload2 = b;
+      break;
+    case 6:
+      Payload2 = (b << 8) | Payload2;
+      break;
+    }
+  }
+
+  if (Checksum != chksum) { return; }
+  if ((Channel == 0) || (Channel > RFSNS_THEOV2_MAX_CHANNEL)) { return; }
+  Channel--;
+
+  rfsns_raw_signal->Repeats = 1;
+
+  int Payload3 = Voltage & 0x3f;
+
+  switch (Type) {
+  case 1:
+    rfsns_theo_v2_t1[Channel].time = LocalTime();
+    rfsns_theo_v2_t1[Channel].volt = Payload3;
+    rfsns_theo_v2_t1[Channel].temp = Payload1;
+    rfsns_theo_v2_t1[Channel].lux = Payload2;
+    break;
+  case 2:
+    rfsns_theo_v2_t2[Channel].time = LocalTime();
+    rfsns_theo_v2_t2[Channel].volt = Payload3;
+    rfsns_theo_v2_t2[Channel].temp = Payload1;
+    rfsns_theo_v2_t2[Channel].hum = Payload2;
+    break;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: TheoV2, ChkCalc %d, Chksum %d, id %d, Type %d, Ch %d, Volt %d, BattLo %d, Pld1 %d, Pld2 %d"),
+    chksum, Checksum, id, Type, Channel +1, Payload3, (Voltage & 0x80) >> 7, Payload1, Payload2);
+}
+
+void RfSnsTheoV2Show(bool json)
+{
+  bool sensor_once = false;
+
+  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
+    if (rfsns_theo_v2_t1[i].time) {
+      char sensor[10];
+      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T1C%d"), i +1);
+      char voltage[33];
+      dtostrfd((float)rfsns_theo_v2_t1[i].volt / 10, 1, voltage);
+
+      if (rfsns_theo_v2_t1[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED "\":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, GetDT(rfsns_theo_v2_t1[i].time).c_str(), voltage);
+        }
+      } else {
+        char temperature[33];
+        dtostrfd(ConvertTemp((float)rfsns_theo_v2_t1[i].temp / 100), Settings.flag2.temperature_resolution, temperature);
+
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, temperature, rfsns_theo_v2_t1[i].lux, voltage);
+#ifdef USE_DOMOTICZ
+          if ((0 == tele_period) && !sensor_once) {
+            DomoticzSensor(DZ_TEMP, temperature);
+            DomoticzSensor(DZ_ILLUMINANCE, rfsns_theo_v2_t1[i].lux);
+            sensor_once = true;
+          }
+#endif
+#ifdef USE_WEBSERVER
+        } else {
+          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
+          WSContentSend_PD(HTTP_SNS_ILLUMINANCE, sensor, rfsns_theo_v2_t1[i].lux);
+#endif
+        }
+      }
+    }
+  }
+
+  sensor_once = false;
+  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
+    if (rfsns_theo_v2_t2[i].time) {
+      char sensor[10];
+      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T2C%d"), i +1);
+      char voltage[33];
+      dtostrfd((float)rfsns_theo_v2_t2[i].volt / 10, 1, voltage);
+
+      if (rfsns_theo_v2_t2[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED" \":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, GetDT(rfsns_theo_v2_t2[i].time).c_str(), voltage);
+        }
+      } else {
+        float temp = ConvertTemp((float)rfsns_theo_v2_t2[i].temp / 100);
+        float humi = ConvertHumidity((float)rfsns_theo_v2_t2[i].hum / 100);
+        char temperature[33];
+        dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
+        char humidity[33];
+        dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
+
+        if (json) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_VOLTAGE "\":%s}"),
+            sensor, temperature, humidity, voltage);
+          if ((0 == tele_period) && !sensor_once) {
+#ifdef USE_DOMOTICZ
+            DomoticzTempHumSensor(temperature, humidity);
+#endif
+#ifdef USE_KNX
+            KnxSensor(KNX_TEMPERATURE, temp);
+            KnxSensor(KNX_HUMIDITY, humi);
+#endif
+            sensor_once = true;
+          }
+#ifdef USE_WEBSERVER
+        } else {
+          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
+          WSContentSend_PD(HTTP_SNS_HUM, sensor, humidity);
+#endif
+        }
+      }
+    }
+  }
+}
+
+#endif
+
+#ifdef USE_ALECTO_V2
+# 392 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
+#define RFSNS_DKW2012_PULSECOUNT 176
+#define RFSNS_ACH2010_MIN_PULSECOUNT 160
+#define RFSNS_ACH2010_MAX_PULSECOUNT 160
+
+#define D_ALECTOV2 "AlectoV2"
+
+const char kAlectoV2Directions[] PROGMEM = D_TX20_NORTH "|"
+                                           D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
+                                           D_TX20_EAST "|"
+                                           D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
+                                           D_TX20_SOUTH "|"
+                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
+                                           D_TX20_WEST "|"
+                                           D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
+                                           D_TX20_NORTH D_TX20_WEST "|"
+                                           D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
+
+typedef struct {
+  uint32_t time;
+  float temp;
+  float rain;
+  float wind;
+  float gust;
+  uint8_t type;
+  uint8_t humi;
+  uint8_t wdir;
+} alecto_v2_t;
+
+alecto_v2_t *rfsns_alecto_v2 = nullptr;
+uint16_t rfsns_alecto_rain_base = 0;
+
+void RfSnsInitAlectoV2(void)
+{
+  rfsns_alecto_v2 = (alecto_v2_t*)malloc(sizeof(alecto_v2_t));
+  rfsns_any_sensor++;
+}
+
+void RfSnsAnalyzeAlectov2()
+{
+  if (!(((rfsns_raw_signal->Number >= RFSNS_ACH2010_MIN_PULSECOUNT) &&
+         (rfsns_raw_signal->Number <= RFSNS_ACH2010_MAX_PULSECOUNT)) || (rfsns_raw_signal->Number == RFSNS_DKW2012_PULSECOUNT))) { return; }
+
+  uint8_t c = 0;
+  uint8_t rfbit;
+  uint8_t data[9] = { 0 };
+  uint8_t msgtype = 0;
+  uint8_t rc = 0;
+  int temp;
+  uint8_t checksum = 0;
+  uint8_t checksumcalc = 0;
+  uint8_t maxidx = 8;
+  unsigned long atime;
+  float factor;
+  char buf1[16];
+
+  if (rfsns_raw_signal->Number > RFSNS_ACH2010_MAX_PULSECOUNT) { maxidx = 9; }
+
+  uint8_t idx = maxidx;
+  for (uint32_t x = rfsns_raw_signal->Number; x > 0; x = x-2) {
+    if (rfsns_raw_signal->Pulses[x-1] * rfsns_raw_signal->Multiply < 0x300) {
+      rfbit = 0x80;
+    } else {
+      rfbit = 0;
+    }
+    data[idx] = (data[idx] >> 1) | rfbit;
+    c++;
+    if (c == 8) {
+      if (idx == 0) { break; }
+      c = 0;
+      idx--;
+    }
+  }
+
+  checksum = data[maxidx];
+  checksumcalc = RfSnsAlectoCRC8(data, maxidx);
+
+  msgtype = (data[0] >> 4) & 0xf;
+  rc = (data[0] << 4) | (data[1] >> 4);
+
+  if (checksum != checksumcalc) { return; }
+  if ((msgtype != 10) && (msgtype != 5)) { return; }
+
+  rfsns_raw_signal->Repeats = 1;
+
+
+
+
+
+  factor = 1.22;
+
+
+
+
+
+  rfsns_alecto_v2->time = LocalTime();
+  rfsns_alecto_v2->type = (RFSNS_DKW2012_PULSECOUNT == rfsns_raw_signal->Number);
+  rfsns_alecto_v2->temp = (float)(((data[1] & 0x3) * 256 + data[2]) - 400) / 10;
+  rfsns_alecto_v2->humi = data[3];
+  uint16_t rain = (data[6] * 256) + data[7];
+
+  if (rain < rfsns_alecto_rain_base) { rfsns_alecto_rain_base = rain; }
+  if (rfsns_alecto_rain_base > 0) {
+    rfsns_alecto_v2->rain += ((float)rain - rfsns_alecto_rain_base) * 0.30;
+  }
+  rfsns_alecto_rain_base = rain;
+  rfsns_alecto_v2->wind = (float)data[4] * factor;
+  rfsns_alecto_v2->gust = (float)data[5] * factor;
+  if (rfsns_alecto_v2->type) {
+    rfsns_alecto_v2->wdir = data[8] & 0xf;
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: " D_ALECTOV2 ", ChkCalc %d, Chksum %d, rc %d, Temp %d, Hum %d, Rain %d, Wind %d, Gust %d, Dir %d, Factor %s"),
+    checksumcalc, checksum, rc, ((data[1] & 0x3) * 256 + data[2]) - 400, data[3], (data[6] * 256) + data[7], data[4], data[5], data[8] & 0xf, dtostrfd(factor, 3, buf1));
+}
+
+void RfSnsAlectoResetRain(void)
+{
+  if ((RtcTime.hour == 0) && (RtcTime.minute == 0) && (RtcTime.second == 5)) {
+    rfsns_alecto_v2->rain = 0;
+  }
+}
+
+
+
+
+
+
+
+uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len)
+{
+  uint8_t crc = 0;
+  while (len--) {
+    uint8_t inbyte = *addr++;
+    for (uint32_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x80;
+      crc <<= 1;
+      if (mix) { crc ^= 0x31; }
+      inbyte <<= 1;
+    }
+  }
+  return crc;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_ALECTOV2[] PROGMEM =
+  "{s}" D_ALECTOV2 " " D_RAIN "{m}%s " D_UNIT_MILLIMETER "{e}"
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}";
+const char HTTP_SNS_ALECTOV2_WDIR[] PROGMEM =
+  "{s}" D_ALECTOV2 " " D_TX20_WIND_DIRECTION "{m}%s{e}";
+#endif
+
+void RfSnsAlectoV2Show(bool json)
+{
+  if (rfsns_alecto_v2->time) {
+    if (rfsns_alecto_v2->time < LocalTime() - RFSNS_VALID_WINDOW) {
+      if (json) {
+        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_RFRECEIVED "\":\"%s\"}"), GetDT(rfsns_alecto_v2->time).c_str());
+      }
+    } else {
+      float temp = ConvertTemp(rfsns_alecto_v2->temp);
+      char temperature[33];
+      dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
+      float humi = ConvertHumidity((float)rfsns_alecto_v2->humi);
+      char humidity[33];
+      dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
+      char rain[33];
+      dtostrfd(rfsns_alecto_v2->rain, 2, rain);
+      char wind[33];
+      dtostrfd(rfsns_alecto_v2->wind, 2, wind);
+      char gust[33];
+      dtostrfd(rfsns_alecto_v2->gust, 2, gust);
+      char wdir[4];
+      char direction[20];
+      if (rfsns_alecto_v2->type) {
+        GetTextIndexed(wdir, sizeof(wdir), rfsns_alecto_v2->wdir, kAlectoV2Directions);
+        snprintf_P(direction, sizeof(direction), PSTR(",\"Direction\":\"%s\""), wdir);
+      }
+
+      if (json) {
+        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"Rain\":%s,\"Wind\":%s,\"Gust\":%s%s}"),
+          temperature, humidity, rain, wind, gust, (rfsns_alecto_v2->type) ? direction : "");
+        if (0 == tele_period) {
+#ifdef USE_DOMOTICZ
+
+
+
+
+#endif
+        }
+#ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_TEMP, D_ALECTOV2, temperature, TempUnit());
+        WSContentSend_PD(HTTP_SNS_HUM, D_ALECTOV2, humidity);
+        WSContentSend_PD(HTTP_SNS_ALECTOV2, rain, wind, gust);
+        if (rfsns_alecto_v2->type) {
+          WSContentSend_PD(HTTP_SNS_ALECTOV2_WDIR, wdir);
+        }
+#endif
+      }
+    }
+  }
+}
+#endif
+
+void RfSnsInit(void)
+{
+  rfsns_raw_signal = (raw_signal_t*)(malloc(sizeof(raw_signal_t)));
+  if (rfsns_raw_signal) {
+    memset(rfsns_raw_signal, 0, sizeof(raw_signal_t));
+#ifdef USE_THEO_V2
+    RfSnsInitTheoV2();
+#endif
+#ifdef USE_ALECTO_V2
+    RfSnsInitAlectoV2();
+#endif
+    if (rfsns_any_sensor) {
+      rfsns_rf_bit = digitalPinToBitMask(pin[GPIO_RF_SENSOR]);
+      rfsns_rf_port = digitalPinToPort(pin[GPIO_RF_SENSOR]);
+      pinMode(pin[GPIO_RF_SENSOR], INPUT);
+    } else {
+      free(rfsns_raw_signal);
+      rfsns_raw_signal = nullptr;
+    }
+  }
+}
+
+void RfSnsAnalyzeRawSignal(void)
+{
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: Pulses %d"), (int)rfsns_raw_signal->Number);
+
+#ifdef USE_THEO_V2
+    RfSnsAnalyzeTheov2();
+#endif
+#ifdef USE_ALECTO_V2
+    RfSnsAnalyzeAlectov2();
+#endif
+}
+
+void RfSnsEverySecond(void)
+{
+#ifdef USE_ALECTO_V2
+  RfSnsAlectoResetRain();
+#endif
+}
+
+void RfSnsShow(bool json)
+{
+#ifdef USE_THEO_V2
+  RfSnsTheoV2Show(json);
+#endif
+#ifdef USE_ALECTO_V2
+  RfSnsAlectoV2Show(json);
+#endif
+}
+
+
+
+
+
+bool Xsns37(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_RF_SENSOR] < 99) && (FUNC_INIT == function)) {
+    RfSnsInit();
+  }
+  else if (rfsns_raw_signal) {
+    switch (function) {
+      case FUNC_LOOP:
+        if ((*portInputRegister(rfsns_rf_port) &rfsns_rf_bit) == rfsns_rf_bit) {
+          if (RfSnsFetchSignal(pin[GPIO_RF_SENSOR], HIGH)) {
+            RfSnsAnalyzeRawSignal();
+          }
+        }
+        sleep = 0;
+        break;
+      case FUNC_EVERY_SECOND:
+        RfSnsEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        RfSnsShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        RfSnsShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
+#ifdef USE_AZ7798
+
+#define XSNS_38 38
+# 112 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
+#include <TasmotaSerial.h>
+
+#ifndef CO2_LOW
+#define CO2_LOW 800
+#endif
+#ifndef CO2_HIGH
+#define CO2_HIGH 1200
+#endif
+
+#define AZ_READ_TIMEOUT 400
+
+#define AZ_CLOCK_UPDATE_INTERVAL (24UL * 60 * 60)
+#define AZ_EPOCH (946684800UL)
+
+TasmotaSerial *AzSerial;
+
+const char ktype[] = "AZ7798";
+uint8_t az_type = 1;
+uint16_t az_co2 = 0;
+double az_temperature = 0;
+double az_humidity = 0;
+uint8_t az_received = 0;
+uint8_t az_state = 0;
+unsigned long az_clock_update = 10;
+
+
+
+void AzEverySecond(void)
+{
+  unsigned long start = millis();
+
+  az_state++;
+  if (5 == az_state) {
+    az_state = 0;
+
+    AzSerial->flush();
+    AzSerial->write(":\r", 2);
+    az_received = 0;
+
+    uint8_t az_response[32];
+    uint8_t counter = 0;
+    uint8_t i, j;
+    uint8_t response_substr[16];
+
+    do {
+      if (AzSerial->available() > 0) {
+        az_response[counter] = AzSerial->read();
+        if(az_response[counter] == 0x0d) { az_received = 1; }
+        counter++;
+      } else {
+        delay(5);
+      }
+    } while(((millis() - start) < AZ_READ_TIMEOUT) && (counter < sizeof(az_response)) && !az_received);
+
+    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, az_response, counter);
+
+    if (!az_received) {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 comms timeout"));
+      return;
+    }
+
+    i = 0;
+    while((az_response[i] != 'T') && (i < counter)) {i++;}
+    if(az_response[i] != 'T') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find start of response"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != 'C') && (az_response[i] != 'F') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if((az_response[i] != 'C') && (az_response[i] != 'F')){
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of temperature"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_temperature = CharToFloat((char*)response_substr);
+    if(az_response[i] == 'C') {
+      az_temperature = ConvertTemp((float)az_temperature);
+    } else {
+      az_temperature = ConvertTemp((az_temperature - 32) / 1.8);
+    }
+    i++;
+    if(az_response[i] != ':') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error first delimiter"));
+      return;
+    }
+    i++;
+    if(az_response[i] != 'C') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of CO2"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != 'p') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if(az_response[i] != 'p') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of CO2"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_co2 = atoi((char*)response_substr);
+    LightSetSignal(CO2_LOW, CO2_HIGH, az_co2);
+    i += 3;
+    if(az_response[i] != ':') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error second delimiter"));
+      return;
+    }
+    i++;
+    if(az_response[i] != 'H') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of humidity"));
+      return;
+    }
+    i++;
+    j = 0;
+
+    while((az_response[i] != '%') && (i < counter)) {
+      response_substr[j++] = az_response[i++];
+    }
+    if(az_response[i] != '%') {
+      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of humidity"));
+      return;
+    }
+    response_substr[j] = 0;
+    az_humidity = ConvertHumidity(CharToFloat((char*)response_substr));
+  }
+
+
+  if ((az_clock_update == 0) && (LocalTime() > AZ_EPOCH)) {
+    char tmpString[16];
+    sprintf(tmpString, "C %d\r", (int)(LocalTime() - AZ_EPOCH));
+    AzSerial->write(tmpString);
+
+    do {
+      if (AzSerial->available() > 0) {
+        if(AzSerial->read() == 0x0d) { break; }
+      } else {
+        delay(5);
+      }
+    } while(((millis() - start) < AZ_READ_TIMEOUT));
+    az_clock_update = AZ_CLOCK_UPDATE_INTERVAL;
+    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 clock updated"));
+  } else {
+    az_clock_update--;
+  }
+}
+
+
+
+void AzInit(void)
+{
+  az_type = 0;
+  if ((pin[GPIO_AZ_RXD] < 99) && (pin[GPIO_AZ_TXD] < 99)) {
+    AzSerial = new TasmotaSerial(pin[GPIO_AZ_RXD], pin[GPIO_AZ_TXD], 1);
+    if (AzSerial->begin(9600)) {
+      if (AzSerial->hardwareSerial()) { ClaimSerial(); }
+      az_type = 1;
+    }
+  }
+}
+
+void AzShow(bool json)
+{
+  char temperature[33];
+  dtostrfd(az_temperature, Settings.flag2.temperature_resolution, temperature);
+  char humidity[33];
+  dtostrfd(az_humidity, Settings.flag2.humidity_resolution, humidity);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"), ktype, az_co2, temperature, humidity);
+#ifdef USE_DOMOTICZ
+    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, az_co2);
+#endif
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_CO2, ktype, az_co2);
+    WSContentSend_PD(HTTP_SNS_TEMP, ktype, temperature, TempUnit());
+    WSContentSend_PD(HTTP_SNS_HUM, ktype, humidity);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns38(uint8_t function)
+{
+  bool result = false;
+
+  if(az_type){
+    switch (function) {
+      case FUNC_INIT:
+        AzInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        AzEverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        AzShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        AzShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_39_max31855.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_39_max31855.ino"
+#ifdef USE_MAX31855
+
+#define XSNS_39 39
+
+bool initialized = false;
+
+struct MAX31855_ResultStruct{
+    uint8_t ErrorCode;
+    float ProbeTemperature;
+    float ReferenceTemperature;
+} MAX31855_Result;
+
+void MAX31855_Init(void){
+    if(initialized)
+        return;
+
+
+    pinMode(pin[GPIO_MAX31855CS], OUTPUT);
+    pinMode(pin[GPIO_MAX31855CLK], OUTPUT);
+    pinMode(pin[GPIO_MAX31855DO], INPUT);
+
+
+    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
+    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+
+    initialized = true;
+}
+
+
+
+
+
+void MAX31855_GetResult(void){
+    int32_t RawData = MAX31855_ShiftIn(32);
+    uint8_t probeerror = RawData & 0x7;
+
+    MAX31855_Result.ErrorCode = probeerror;
+    MAX31855_Result.ReferenceTemperature = MAX31855_GetReferenceTemperature(RawData);
+    if(probeerror)
+        MAX31855_Result.ProbeTemperature = NAN;
+    else
+        MAX31855_Result.ProbeTemperature = MAX31855_GetProbeTemperature(RawData);
+}
+
+
+
+
+
+
+float MAX31855_GetProbeTemperature(int32_t RawData){
+    if(RawData & 0x80000000)
+        RawData = (RawData >> 18) | 0xFFFFC000;
+    else
+        RawData >>= 18;
+
+    float result = (RawData * 0.25);
+
+    return ConvertTemp(result);
+}
+
+
+
+
+
+float MAX31855_GetReferenceTemperature(int32_t RawData){
+    if(RawData & 0x8000)
+        RawData = (RawData >> 4) | 0xFFFFF000;
+    else
+        RawData = (RawData >> 4) & 0x00000FFF;
+
+    float result = (RawData * 0.0625);
+
+    return ConvertTemp(result);
+}
+
+
+
+
+
+int32_t MAX31855_ShiftIn(uint8_t Length){
+    int32_t dataIn = 0;
+
+    digitalWrite(pin[GPIO_MAX31855CS], LOW);
+    delayMicroseconds(1);
+
+    for (uint32_t i = 0; i < Length; i++)
+    {
+        digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+        delayMicroseconds(1);
+        dataIn <<= 1;
+        if(digitalRead(pin[GPIO_MAX31855DO]))
+            dataIn |= 1;
+        digitalWrite(pin[GPIO_MAX31855CLK], HIGH);
+        delayMicroseconds(1);
+    }
+
+    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
+    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
+    return dataIn;
+}
+
+void MAX31855_Show(bool Json){
+    char probetemp[33];
+    char referencetemp[33];
+    dtostrfd(MAX31855_Result.ProbeTemperature, Settings.flag2.temperature_resolution, probetemp);
+    dtostrfd(MAX31855_Result.ReferenceTemperature, Settings.flag2.temperature_resolution, referencetemp);
+
+    if(Json){
+        ResponseAppend_P(PSTR(",\"MAX31855\":{\"" D_JSON_PROBETEMPERATURE "\":%s,\"" D_JSON_REFERENCETEMPERATURE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
+          probetemp, referencetemp, MAX31855_Result.ErrorCode);
+#ifdef USE_DOMOTICZ
+        if (0 == tele_period) {
+          DomoticzSensor(DZ_TEMP, probetemp);
+        }
+#endif
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, MAX31855_Result.ProbeTemperature);
+        }
+#endif
+    } else {
+#ifdef USE_WEBSERVER
+        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31855", probetemp, TempUnit());
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns39(uint8_t function)
+{
+  bool result = false;
+  if((pin[GPIO_MAX31855CS] < 99) && (pin[GPIO_MAX31855CLK] < 99) && (pin[GPIO_MAX31855DO] < 99)){
+
+    switch (function) {
+      case FUNC_INIT:
+        MAX31855_Init();
+        break;
+      case FUNC_EVERY_SECOND:
+        MAX31855_GetResult();
+        break;
+      case FUNC_JSON_APPEND:
+        MAX31855_Show(true);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MAX31855_Show(false);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
+#ifdef USE_PN532_HSU
+
+#define XSNS_40 40
+
+#include <TasmotaSerial.h>
+
+TasmotaSerial *PN532_Serial;
+
+#define PN532_INVALID_ACK -1
+#define PN532_TIMEOUT -2
+#define PN532_INVALID_FRAME -3
+#define PN532_NO_SPACE -4
+
+#define PN532_PREAMBLE 0x00
+#define PN532_STARTCODE1 0x00
+#define PN532_STARTCODE2 0xFF
+#define PN532_POSTAMBLE 0x00
+
+#define PN532_HOSTTOPN532 0xD4
+#define PN532_PN532TOHOST 0xD5
+
+#define PN532_ACK_WAIT_TIME 0x0A
+
+#define PN532_COMMAND_GETFIRMWAREVERSION 0x02
+#define PN532_COMMAND_SAMCONFIGURATION 0x14
+#define PN532_COMMAND_RFCONFIGURATION 0x32
+#define PN532_COMMAND_INDATAEXCHANGE 0x40
+#define PN532_COMMAND_INLISTPASSIVETARGET 0x4A
+
+#define PN532_MIFARE_ISO14443A 0x00
+#define MIFARE_CMD_READ 0x30
+#define MIFARE_CMD_AUTH_A 0x60
+#define MIFARE_CMD_AUTH_B 0x61
+#define MIFARE_CMD_WRITE 0xA0
+
+uint8_t pn532_model = 0;
+uint8_t pn532_command = 0;
+uint8_t pn532_scantimer = 0;
+
+uint8_t pn532_packetbuffer[64];
+
+#ifdef USE_PN532_DATA_FUNCTION
+uint8_t pn532_function = 0;
+uint8_t pn532_newdata[16];
+uint8_t pn532_newdata_len = 0;
+#endif
+
+void PN532_Init(void)
+{
+  if ((pin[GPIO_PN532_RXD] < 99) && (pin[GPIO_PN532_TXD] < 99)) {
+    PN532_Serial = new TasmotaSerial(pin[GPIO_PN532_RXD], pin[GPIO_PN532_TXD], 1);
+    if (PN532_Serial->begin(115200)) {
+      if (PN532_Serial->hardwareSerial()) { ClaimSerial(); }
+      PN532_wakeup();
+      uint32_t ver = PN532_getFirmwareVersion();
+      if (ver) {
+        PN532_setPassiveActivationRetries(0xFF);
+        PN532_SAMConfig();
+        pn532_model = 1;
+        AddLog_P2(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected (V%u.%u)",(ver>>16) & 0xFF, (ver>>8) & 0xFF);
+      }
+    }
+  }
+}
+
+int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout)
+{
+  int read_bytes = 0;
+  int ret;
+  unsigned long start_millis;
+  while (read_bytes < len) {
+    start_millis = millis();
+    do {
+      ret = PN532_Serial->read();
+      if (ret >= 0) {
+        break;
+      }
+    } while((timeout == 0) || ((millis()- start_millis ) < timeout));
+
+    if (ret < 0) {
+      if (read_bytes) {
+        return read_bytes;
+      } else {
+        return PN532_TIMEOUT;
+      }
+    }
+    buf[read_bytes] = (uint8_t)ret;
+    read_bytes++;
+  }
+  return read_bytes;
+}
+
+int8_t PN532_readAckFrame(void)
+{
+  const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
+  uint8_t ackBuf[sizeof(PN532_ACK)];
+
+  if (PN532_receive(ackBuf, sizeof(PN532_ACK), PN532_ACK_WAIT_TIME) <= 0) {
+    return PN532_TIMEOUT;
+  }
+
+  if (memcmp(&ackBuf, &PN532_ACK, sizeof(PN532_ACK))) {
+    return PN532_INVALID_ACK;
+  }
+  return 0;
+}
+
+int8_t PN532_writeCommand(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0)
+{
+
+  PN532_Serial->flush();
+
+  pn532_command = header[0];
+  PN532_Serial->write((uint8_t)PN532_PREAMBLE);
+  PN532_Serial->write((uint8_t)PN532_STARTCODE1);
+  PN532_Serial->write(PN532_STARTCODE2);
+
+  uint8_t length = hlen + blen + 1;
+  PN532_Serial->write(length);
+  PN532_Serial->write(~length + 1);
+
+  PN532_Serial->write(PN532_HOSTTOPN532);
+  uint8_t sum = PN532_HOSTTOPN532;
+
+  PN532_Serial->write(header, hlen);
+  for (uint32_t i = 0; i < hlen; i++) {
+    sum += header[i];
+  }
+
+  PN532_Serial->write(body, blen);
+  for (uint32_t i = 0; i < blen; i++) {
+    sum += body[i];
+  }
+
+  uint8_t checksum = ~sum + 1;
+  PN532_Serial->write(checksum);
+  PN532_Serial->write((uint8_t)PN532_POSTAMBLE);
+
+  return PN532_readAckFrame();
+}
+
+int16_t PN532_readResponse(uint8_t buf[], uint8_t len, uint16_t timeout = 50)
+{
+  uint8_t tmp[3];
+
+
+  if (PN532_receive(tmp, 3, timeout)<=0) {
+    return PN532_TIMEOUT;
+  }
+  if (0 != tmp[0] || 0!= tmp[1] || 0xFF != tmp[2]) {
+    return PN532_INVALID_FRAME;
+  }
+
+
+  uint8_t length[2];
+  if (PN532_receive(length, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+
+  if (0 != (uint8_t)(length[0] + length[1])) {
+    return PN532_INVALID_FRAME;
+  }
+  length[0] -= 2;
+  if (length[0] > len) {
+    return PN532_NO_SPACE;
+  }
+
+
+  uint8_t cmd = pn532_command + 1;
+  if (PN532_receive(tmp, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+  if (PN532_PN532TOHOST != tmp[0] || cmd != tmp[1]) {
+    return PN532_INVALID_FRAME;
+  }
+
+  if (PN532_receive(buf, length[0], timeout) != length[0]) {
+    return PN532_TIMEOUT;
+  }
+
+  uint8_t sum = PN532_PN532TOHOST + cmd;
+  for (uint32_t i=0; i<length[0]; i++) {
+    sum += buf[i];
+  }
+
+
+  if (PN532_receive(tmp, 2, timeout) <= 0) {
+    return PN532_TIMEOUT;
+  }
+  if (0 != (uint8_t)(sum + tmp[0]) || 0 != tmp[1]) {
+    return PN532_INVALID_FRAME;
+  }
+
+  return length[0];
+}
+
+uint32_t PN532_getFirmwareVersion(void)
+{
+  uint32_t response;
+
+  pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
+
+  if (PN532_writeCommand(pn532_packetbuffer, 1)) {
+    return 0;
+  }
+
+
+  int16_t status = PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+  if (0 > status) {
+    return 0;
+  }
+
+  response = pn532_packetbuffer[0];
+  response <<= 8;
+  response |= pn532_packetbuffer[1];
+  response <<= 8;
+  response |= pn532_packetbuffer[2];
+  response <<= 8;
+  response |= pn532_packetbuffer[3];
+
+  return response;
+}
+
+void PN532_wakeup(void)
+{
+  uint8_t wakeup[5] = {0x55, 0x55, 0, 0, 0 };
+  PN532_Serial->write(wakeup,sizeof(wakeup));
+
+
+  PN532_Serial->flush();
+}
+
+bool PN532_readPassiveTargetID(uint8_t cardbaudrate, uint8_t *uid, uint8_t *uidLength, uint16_t timeout = 50)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
+  pn532_packetbuffer[1] = 1;
+  pn532_packetbuffer[2] = cardbaudrate;
+  if (PN532_writeCommand(pn532_packetbuffer, 3)) {
+    return 0x0;
+  }
+
+  if (PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer), timeout) < 0) {
+    return 0x0;
+  }
+# 274 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
+  if (pn532_packetbuffer[0] != 1) {
+    return 0;
+  }
+
+  uint16_t sens_res = pn532_packetbuffer[2];
+  sens_res <<= 8;
+  sens_res |= pn532_packetbuffer[3];
+
+
+  *uidLength = pn532_packetbuffer[5];
+
+  for (uint32_t i = 0; i < pn532_packetbuffer[5]; i++) {
+    uid[i] = pn532_packetbuffer[6 + i];
+  }
+
+  return 1;
+}
+
+bool PN532_setPassiveActivationRetries(uint8_t maxRetries)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
+  pn532_packetbuffer[1] = 5;
+  pn532_packetbuffer[2] = 0xFF;
+  pn532_packetbuffer[3] = 0x01;
+  pn532_packetbuffer[4] = maxRetries;
+  if (PN532_writeCommand(pn532_packetbuffer, 5)) {
+    return 0;
+  }
+  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+bool PN532_SAMConfig(void)
+{
+  pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
+  pn532_packetbuffer[1] = 0x01;
+  pn532_packetbuffer[2] = 0x14;
+  pn532_packetbuffer[3] = 0x00;
+  if (PN532_writeCommand(pn532_packetbuffer, 4)) {
+    return false;
+  }
+  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+#ifdef USE_PN532_DATA_FUNCTION
+
+uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData)
+{
+    uint8_t i;
+    uint8_t _key[6];
+    uint8_t _uid[7];
+    uint8_t _uidLen;
+
+
+    memcpy(&_key, keyData, 6);
+    memcpy(&_uid, uid, uidLen);
+    _uidLen = uidLen;
+
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
+    pn532_packetbuffer[3] = blockNumber;
+    memcpy(&pn532_packetbuffer[4], &_key, 6);
+    for (i = 0; i < _uidLen; i++) {
+        pn532_packetbuffer[10 + i] = _uid[i];
+    }
+
+    if (PN532_writeCommand(pn532_packetbuffer, 10 + _uidLen)) { return 0; }
+
+
+    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+
+
+
+    if (pn532_packetbuffer[0] != 0x00) {
+
+        return 0;
+    }
+
+    return 1;
+}
+
+uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data)
+{
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = MIFARE_CMD_READ;
+    pn532_packetbuffer[3] = blockNumber;
+
+
+    if (PN532_writeCommand(pn532_packetbuffer, 4)) {
+        return 0;
+    }
+
+
+    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
+
+
+    if (pn532_packetbuffer[0] != 0x00) {
+        return 0;
+    }
+
+
+
+    memcpy (data, &pn532_packetbuffer[1], 16);
+
+    return 1;
+}
+
+uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data)
+{
+
+    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
+    pn532_packetbuffer[1] = 1;
+    pn532_packetbuffer[2] = MIFARE_CMD_WRITE;
+    pn532_packetbuffer[3] = blockNumber;
+    memcpy(&pn532_packetbuffer[4], data, 16);
+
+
+    if (PN532_writeCommand(pn532_packetbuffer, 20)) {
+        return 0;
+    }
+
+
+    return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
+}
+
+#endif
+
+void PN532_ScanForTag(void)
+{
+  if (!pn532_model) { return; }
+  uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
+  uint8_t uid_len = 0;
+  uint8_t card_data[16];
+  bool erase_success = false;
+  bool set_success = false;
+  if (PN532_readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uid_len)) {
+      char uids[15];
+
+#ifdef USE_PN532_DATA_FUNCTION
+      char card_datas[34];
+#endif
+
+      ToHex_P((unsigned char*)uid, uid_len, uids, sizeof(uids));
+
+#ifdef USE_PN532_DATA_FUNCTION
+      if (uid_len == 4) {
+        uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+        if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) {
+          if (mifareclassic_ReadDataBlock(1, card_data)) {
+#ifdef USE_PN532_DATA_RAW
+            memcpy(&card_datas,&card_data,sizeof(card_data));
+#else
+            for (uint32_t i = 0;i < sizeof(card_data);i++) {
+              if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) {
+                card_datas[i] = char(card_data[i]);
+              } else {
+                card_datas[i] = '\0';
+              }
+            }
+#endif
+          }
+          if (pn532_function == 1) {
+            for (uint32_t i = 0;i<16;i++) {
+              card_data[i] = 0x00;
+            }
+            if (mifareclassic_WriteDataBlock(1, card_data)) {
+              erase_success = true;
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase success"));
+              memcpy(&card_datas,&card_data,sizeof(card_data));
+            }
+          }
+          if (pn532_function == 2) {
+#ifdef USE_PN532_DATA_RAW
+            memcpy(&card_data,&pn532_newdata,sizeof(card_data));
+            if (mifareclassic_WriteDataBlock(1, card_data)) {
+              set_success = true;
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
+              memcpy(&card_datas,&card_data,sizeof(card_data));
+            }
+#else
+            bool IsAlphaNumeric = true;
+            for (uint32_t i = 0;i < pn532_newdata_len;i++) {
+              if ((!isalpha(pn532_newdata[i])) && (!isdigit(pn532_newdata[i]))) {
+                IsAlphaNumeric = false;
+              }
+            }
+            if (IsAlphaNumeric) {
+              memcpy(&card_data,&pn532_newdata,pn532_newdata_len);
+              card_data[pn532_newdata_len] = '\0';
+              if (mifareclassic_WriteDataBlock(1, card_data)) {
+                set_success = true;
+                AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
+                memcpy(&card_datas,&card_data,sizeof(card_data));
+              }
+            } else {
+              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data must be alphanumeric"));
+            }
+#endif
+          }
+        } else {
+          sprintf(card_datas,"AUTHFAIL");
+        }
+      }
+      switch (pn532_function) {
+        case 0x01:
+          if (!erase_success) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase fail - exiting erase mode"));
+          }
+          break;
+        case 0x02:
+          if (!set_success) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Write failed - exiting set mode"));
+          }
+        default:
+          break;
+      }
+      pn532_function = 0;
+#endif
+
+#ifdef USE_PN532_DATA_FUNCTION
+      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\", \"DATA\":\"%s\"}}"), uids, card_datas);
+#else
+      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids);
+#endif
+
+      MqttPublishTeleSensor();
+
+#ifdef USE_PN532_CAUSE_EVENTS
+
+      char command[71];
+#ifdef USE_PN532_DATA_FUNCTION
+      sprintf(command,"backlog event PN532_UID=%s;event PN532_DATA=%s",uids,card_datas);
+#else
+      sprintf(command,"event PN532_UID=%s",uids);
+#endif
+      ExecuteCommand(command, SRC_RULE);
+#endif
+
+      pn532_scantimer = 7;
+  }
+}
+
+#ifdef USE_PN532_DATA_FUNCTION
+
+bool PN532_Command(void)
+{
+  bool serviced = true;
+  uint8_t paramcount = 0;
+  if (XdrvMailbox.data_len > 0) {
+    paramcount=1;
+  } else {
+    serviced = false;
+    return serviced;
+  }
+  char sub_string[XdrvMailbox.data_len];
+  char sub_string_tmp[XdrvMailbox.data_len];
+  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
+    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
+    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
+  }
+  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"E")) {
+    pn532_function = 1;
+    AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be erased"));
+    ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"E\"}}"));
+    return serviced;
+  }
+  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"S")) {
+    if (paramcount > 1) {
+      if (XdrvMailbox.data[XdrvMailbox.data_len-1] == ',') {
+        serviced = false;
+        return serviced;
+      }
+      sprintf(sub_string_tmp,subStr(sub_string, XdrvMailbox.data, ",", 2));
+      pn532_newdata_len = strlen(sub_string_tmp);
+      if (pn532_newdata_len > 15) { pn532_newdata_len = 15; }
+      memcpy(&pn532_newdata,&sub_string_tmp,pn532_newdata_len);
+      pn532_newdata[pn532_newdata_len] = 0x00;
+      pn532_function = 2;
+      AddLog_P2(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be set to '%s'"), pn532_newdata);
+      ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"S\"}}"));
+      return serviced;
+    }
+  }
+}
+
+#endif
+
+bool Xsns40(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_INIT:
+      PN532_Init();
+      result = true;
+      break;
+    case FUNC_EVERY_50_MSECOND:
+      break;
+    case FUNC_EVERY_100_MSECOND:
+      break;
+    case FUNC_EVERY_250_MSECOND:
+      if (pn532_scantimer > 0) {
+        pn532_scantimer--;
+      } else {
+        PN532_ScanForTag();
+      }
+      break;
+    case FUNC_EVERY_SECOND:
+      break;
+#ifdef USE_PN532_DATA_FUNCTION
+    case FUNC_COMMAND_SENSOR:
+      if (XSNS_40 == XdrvMailbox.index) {
+        result = PN532_Command();
+      }
+      break;
+#endif
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_41_max44009.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_41_max44009.ino"
+#ifdef USE_I2C
+#ifdef USE_MAX44009
+
+
+
+
+
+
+#define XSNS_41 41
+#define XI2C_28 28
+
+#define MAX44009_ADDR1 0x4A
+#define MAX44009_ADDR2 0x4B
+#define MAX44009_NO_REGISTERS 8
+#define REG_CONFIG 0x02
+#define REG_LUMINANCE 0x03
+#define REG_LOWER_THRESHOLD 0x06
+#define REG_THRESHOLD_TIMER 0x07
+
+#define MAX44009_CONTINUOUS_AUTO_MODE 0x80
+
+uint8_t max44009_address;
+uint8_t max44009_addresses[] = { MAX44009_ADDR1, MAX44009_ADDR2, 0 };
+uint8_t max44009_found = 0;
+uint8_t max44009_valid = 0;
+float max44009_illuminance = 0;
+char max44009_types[] = "MAX44009";
+
+bool Max4409Read_lum(void)
+{
+  max44009_valid = 0;
+  uint8_t regdata[2];
+
+
+  if (I2cValidRead16((uint16_t *)&regdata, max44009_address, REG_LUMINANCE)) {
+    int exponent = (regdata[0] & 0xF0) >> 4;
+    int mantissa = ((regdata[0] & 0x0F) << 4) | (regdata[1] & 0x0F);
+    max44009_illuminance = (float)(((0x00000001 << exponent) * (float)mantissa) * 0.045);
+    max44009_valid = 1;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+
+
+void Max4409Detect(void)
+{
+  uint8_t buffer1;
+  uint8_t buffer2;
+  for (uint32_t i = 0; 0 != max44009_addresses[i]; i++) {
+
+    max44009_address = max44009_addresses[i];
+    if (I2cActive(max44009_address)) { continue; }
+
+    if ((I2cValidRead8(&buffer1, max44009_address, REG_LOWER_THRESHOLD)) &&
+        (I2cValidRead8(&buffer2, max44009_address, REG_THRESHOLD_TIMER))) {
+
+      if ((0x00 == buffer1) &&
+          (0xFF == buffer2)) {
+
+
+
+        Wire.beginTransmission(max44009_address);
+
+
+        Wire.write(REG_CONFIG);
+        Wire.write(MAX44009_CONTINUOUS_AUTO_MODE);
+        if (0 == Wire.endTransmission()) {
+          I2cSetActiveFound(max44009_address, max44009_types);
+          max44009_found = 1;
+          break;
+        }
+      }
+    }
+  }
+}
+
+void Max4409EverySecond(void)
+{
+  Max4409Read_lum();
+}
+
+void Max4409Show(bool json)
+{
+  char illum_str[8];
+
+  if (max44009_valid) {
+
+
+
+    uint8_t prec = 0;
+    if (10 > max44009_illuminance ) {
+      prec = 3;
+    } else if (100 > max44009_illuminance) {
+      prec = 2;
+    } else if (1000 > max44009_illuminance) {
+      prec = 1;
+    }
+    dtostrf(max44009_illuminance, sizeof(illum_str) -1, prec, illum_str);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%s}"), max44009_types, illum_str);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_ILLUMINANCE, illum_str);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+
+      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, max44009_types, (int)max44009_illuminance);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns41(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_28)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Max4409Detect();
+  }
+  else if (max44009_found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Max4409EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Max4409Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Max4409Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_42_scd30.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_42_scd30.ino"
+#ifdef USE_I2C
+#ifdef USE_SCD30
+
+#define XSNS_42 42
+#define XI2C_29 29
+
+
+
+#define SCD30_ADDRESS 0x61
+
+#define SCD30_MAX_MISSED_READS 3
+#define SCD30_STATE_NO_ERROR 0
+#define SCD30_STATE_ERROR_DATA_CRC 1
+#define SCD30_STATE_ERROR_READ_MEAS 2
+#define SCD30_STATE_ERROR_SOFT_RESET 3
+#define SCD30_STATE_ERROR_I2C_RESET 4
+#define SCD30_STATE_ERROR_UNKNOWN 5
+
+#include "Arduino.h"
+#include <FrogmoreScd30.h>
+
+#define D_CMND_SCD30 "SCD30"
+
+const char S_JSON_SCD30_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d}";
+const char S_JSON_SCD30_COMMAND_NFW_VALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d.%d}";
+const char S_JSON_SCD30_COMMAND[] PROGMEM = "{\"" D_CMND_SCD30 "%s\"}";
+const char kSCD30_Commands[] PROGMEM = "Alt|Auto|Cal|FW|Int|Pres|TOff";
+
+
+
+
+
+enum SCD30_Commands {
+  CMND_SCD30_ALTITUDE,
+  CMND_SCD30_AUTOMODE,
+  CMND_SCD30_CALIBRATE,
+  CMND_SCD30_FW,
+  CMND_SCD30_INTERVAL,
+  CMND_SCD30_PRESSURE,
+  CMND_SCD30_TEMPOFFSET
+};
+
+FrogmoreScd30 scd30;
+
+bool scd30Found = false;
+bool scd30IsDataValid = false;
+int scd30ErrorState = SCD30_STATE_NO_ERROR;
+uint16_t scd30Interval_sec;
+int scd30Loop_count = 0;
+int scd30DataNotAvailable_count = 0;
+int scd30GoodMeas_count = 0;
+int scd30Reset_count = 0;
+int scd30CrcError_count = 0;
+int scd30Co2Zero_count = 0;
+int i2cReset_count = 0;
+uint16_t scd30_CO2 = 0;
+uint16_t scd30_CO2EAvg = 0;
+float scd30_Humid = 0.0;
+float scd30_Temp = 0.0;
+
+void Scd30Detect(void)
+{
+  if (I2cActive(SCD30_ADDRESS)) { return; }
+
+  scd30.begin();
+
+  uint8_t major = 0;
+  uint8_t minor = 0;
+  if (scd30.getFirmwareVersion(&major, &minor)) { return; }
+  uint16_t interval_sec;
+  if (scd30.getMeasurementInterval(&scd30Interval_sec)) { return; }
+  if (scd30.beginMeasuring()) { return; }
+
+  I2cSetActiveFound(SCD30_ADDRESS, "SCD30");
+  scd30Found = true;
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SCD: FW v%d.%d"), major, minor);
+}
+
+
+void Scd30Update(void)
+{
+  scd30Loop_count++;
+  if (scd30Loop_count > (scd30Interval_sec - 1)) {
+    int error = 0;
+    switch (scd30ErrorState) {
+      case SCD30_STATE_NO_ERROR: {
+        error = scd30.readMeasurement(&scd30_CO2, &scd30_CO2EAvg, &scd30_Temp, &scd30_Humid);
+        switch (error) {
+          case ERROR_SCD30_NO_ERROR:
+            scd30Loop_count = 0;
+            scd30IsDataValid = true;
+            scd30GoodMeas_count++;
+            break;
+
+          case ERROR_SCD30_NO_DATA:
+            scd30DataNotAvailable_count++;
+            break;
+
+          case ERROR_SCD30_CRC_ERROR:
+            scd30ErrorState = SCD30_STATE_ERROR_DATA_CRC;
+            scd30CrcError_count++;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CRC error, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
+              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+#endif
+            break;
+
+          case ERROR_SCD30_CO2_ZERO:
+            scd30Co2Zero_count++;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CO2 zero, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
+              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+#endif
+            break;
+
+          default: {
+            scd30ErrorState = SCD30_STATE_ERROR_READ_MEAS;
+#ifdef SCD30_DEBUG
+            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: Update: ReadMeasurement error: 0x%lX, counter: %ld"), error, scd30Loop_count);
+#endif
+             return;
+          }
+          break;
+        }
+      }
+      break;
+
+      case SCD30_STATE_ERROR_DATA_CRC: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: got CRC error, try again, counter: %ld"), scd30Loop_count);
+#endif
+        scd30ErrorState = ERROR_SCD30_NO_ERROR;
+      }
+      break;
+
+      case SCD30_STATE_ERROR_READ_MEAS: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: not answering, sending soft reset, counter: %ld"), scd30Loop_count);
+#endif
+        scd30Reset_count++;
+        error = scd30.softReset();
+        if (error) {
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: resetting got error: 0x%lX"), error);
+#endif
+          error >>= 8;
+          if (error == 4) {
+            scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
+          } else {
+            scd30ErrorState = SCD30_STATE_ERROR_UNKNOWN;
+          }
+        } else {
+          scd30ErrorState = ERROR_SCD30_NO_ERROR;
+        }
+      }
+      break;
+
+      case SCD30_STATE_ERROR_SOFT_RESET: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
+          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
+        AddLog_P(LOG_LEVEL_ERROR, PSTR("SCD30: clearing i2c bus"));
+#endif
+        i2cReset_count++;
+        error = scd30.clearI2CBus();
+        if (error) {
+          scd30ErrorState = SCD30_STATE_ERROR_I2C_RESET;
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error clearing i2c bus: 0x%lX"), error);
+#endif
+        } else {
+          scd30ErrorState = ERROR_SCD30_NO_ERROR;
+        }
+      }
+      break;
+
+      default: {
+
+#ifdef SCD30_DEBUG
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: unknown error state: 0x%lX"), scd30ErrorState);
+#endif
+        scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
+      }
+    }
+
+    if (scd30Loop_count > (SCD30_MAX_MISSED_READS * scd30Interval_sec)) {
+      scd30IsDataValid = false;
+    }
+  }
+}
+
+
+int Scd30GetCommand(int command_code, uint16_t *pvalue)
+{
+  switch (command_code)
+  {
+    case CMND_SCD30_ALTITUDE:
+      return scd30.getAltitudeCompensation(pvalue);
+      break;
+
+    case CMND_SCD30_AUTOMODE:
+      return scd30.getCalibrationType(pvalue);
+      break;
+
+    case CMND_SCD30_CALIBRATE:
+      return scd30.getForcedRecalibrationFactor(pvalue);
+      break;
+
+    case CMND_SCD30_INTERVAL:
+      return scd30.getMeasurementInterval(pvalue);
+      break;
+
+    case CMND_SCD30_PRESSURE:
+      return scd30.getAmbientPressure(pvalue);
+      break;
+
+    case CMND_SCD30_TEMPOFFSET:
+      return scd30.getTemperatureOffset(pvalue);
+      break;
+
+      default:
+
+      break;
+  }
+}
+
+int Scd30SetCommand(int command_code, uint16_t value)
+{
+  switch (command_code)
+  {
+    case CMND_SCD30_ALTITUDE:
+      return scd30.setAltitudeCompensation(value);
+      break;
+
+    case CMND_SCD30_AUTOMODE:
+      return scd30.setCalibrationType(value);
+      break;
+
+    case CMND_SCD30_CALIBRATE:
+      return scd30.setForcedRecalibrationFactor(value);
+      break;
+
+    case CMND_SCD30_INTERVAL:
+    {
+      int error = scd30.setMeasurementInterval(value);
+      if (!error)
+      {
+        scd30Interval_sec = value;
+      }
+
+      return error;
+    }
+      break;
+
+    case CMND_SCD30_PRESSURE:
+      return scd30.setAmbientPressure(value);
+      break;
+
+    case CMND_SCD30_TEMPOFFSET:
+      return scd30.setTemperatureOffset(value);
+      break;
+
+      default:
+
+      break;
+  }
+}
+
+
+
+
+
+bool Scd30CommandSensor()
+{
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t prefix_len = strlen(D_CMND_SCD30);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_SCD30), prefix_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + prefix_len, kSCD30_Commands);
+
+    switch (command_code) {
+      case CMND_SCD30_ALTITUDE:
+      case CMND_SCD30_AUTOMODE:
+      case CMND_SCD30_CALIBRATE:
+      case CMND_SCD30_INTERVAL:
+      case CMND_SCD30_PRESSURE:
+      case CMND_SCD30_TEMPOFFSET:
+      {
+        uint16_t value = 0;
+        if (XdrvMailbox.data_len > 0)
+        {
+          value = XdrvMailbox.payload;
+          Scd30SetCommand(command_code, value);
+        }
+        else
+        {
+          Scd30GetCommand(command_code, &value);
+        }
+
+        Response_P(S_JSON_SCD30_COMMAND_NVALUE, command, value);
+      }
+        break;
+
+      case CMND_SCD30_FW:
+      {
+        uint8_t major = 0;
+        uint8_t minor = 0;
+        int error;
+        error = scd30.getFirmwareVersion(&major, &minor);
+        if (error)
+        {
+#ifdef SCD30_DEBUG
+          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error getting FW version: 0x%lX"), error);
+#endif
+          serviced = false;
+        }
+        else
+        {
+          Response_P(S_JSON_SCD30_COMMAND_NFW_VALUE, command, major, minor);
+        }
+      }
+        break;
+
+      default:
+
+        serviced = false;
+      break;
+    }
+  }
+  return serviced;
+}
+
+void Scd30Show(bool json)
+{
+  if (scd30IsDataValid)
+  {
+    char humidity[10];
+    dtostrfd(ConvertHumidity(scd30_Humid), Settings.flag2.humidity_resolution, humidity);
+    char temperature[10];
+    dtostrfd(ConvertTemp(scd30_Temp), Settings.flag2.temperature_resolution, temperature);
+
+    if (json) {
+
+      ResponseAppend_P(PSTR(",\"SCD30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"),
+        scd30_CO2, scd30_CO2EAvg, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period)
+      {
+        DomoticzSensor(DZ_AIRQUALITY, scd30_CO2);
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_CO2EAVG, "SCD30", scd30_CO2EAvg);
+      WSContentSend_PD(HTTP_SNS_CO2, "SCD30", scd30_CO2);
+      WSContentSend_PD(HTTP_SNS_TEMP, "SCD30", temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, "SCD30", humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns42(byte function)
+{
+  if (!I2cEnabled(XI2C_29)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Scd30Detect();
+  }
+  else if (scd30Found) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Scd30Update();
+        break;
+      case FUNC_COMMAND:
+        result = Scd30CommandSensor();
+        break;
+      case FUNC_JSON_APPEND:
+        Scd30Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Scd30Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
+#ifdef USE_HRE
+# 49 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
+#define XSNS_43 43
+
+enum hre_states {
+   hre_idle,
+   hre_sync,
+   hre_syncing,
+   hre_read,
+   hre_reading,
+   hre_sleep,
+   hre_sleeping
+};
+
+hre_states hre_state = hre_idle;
+
+float hre_usage = 0;
+float hre_rate = 0;
+uint32_t hre_usage_time = 0;
+
+int hre_read_errors = 0;
+bool hre_good = false;
+
+
+
+int hreReadBit()
+{
+   digitalWrite(pin[GPIO_HRE_CLOCK], HIGH);
+   delay(1);
+   int bit = digitalRead(pin[GPIO_HRE_DATA]);
+   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
+   delay(1);
+   return bit;
+}
+
+
+
+char hreReadChar(int &parity_errors)
+{
+
+   hreReadBit();
+
+   unsigned ch=0;
+   int sum=0;
+   for (uint32_t i=0; i<7; i++)
+   {
+      int b = hreReadBit();
+      ch |= b << i;
+      sum += b;
+   }
+
+
+   if ( (sum & 0x1) != hreReadBit())
+      parity_errors++;
+
+
+   hreReadBit();
+
+   return ch;
+}
+
+void hreInit(void)
+{
+   hre_read_errors = 0;
+   hre_good = false;
+
+   pinMode(pin[GPIO_HRE_CLOCK], OUTPUT);
+   pinMode(pin[GPIO_HRE_DATA], INPUT);
+
+
+
+   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
+
+   hre_state = hre_sync;
+}
+
+
+void hreEvery50ms(void)
+{
+   static int sync_counter = 0;
+   static int sync_run = 0;
+
+   static uint32_t curr_start = 0;
+   static int read_counter = 0;
+   static int parity_errors = 0;
+   static char buff[46];
+
+   static char ch;
+   static size_t i;
+
+   switch (hre_state)
+   {
+      case hre_sync:
+         if (uptime < 10)
+            break;
+         sync_run = 0;
+         sync_counter = 0;
+         hre_state = hre_syncing;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_syncing"));
+         break;
+
+      case hre_syncing:
+
+
+         for (uint32_t i=0; i<20; i++)
+         {
+            if (hreReadBit())
+               sync_run++;
+            else
+               sync_run = 0;
+            if (sync_run == 62)
+            {
+               hre_state = hre_read;
+               break;
+            }
+            sync_counter++;
+         }
+
+         if (sync_counter > 1000)
+         {
+            hre_state = hre_sleep;
+            AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE D_ERROR));
+         }
+         break;
+
+
+      case hre_read:
+         AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "sync_run:%d, sync_counter:%d"), sync_run, sync_counter);
+         read_counter = 0;
+         parity_errors = 0;
+         curr_start = uptime;
+         memset(buff, 0, sizeof(buff));
+         hre_state = hre_reading;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_reading"));
+
+
+
+
+
+      case hre_reading:
+
+         buff[read_counter++] = hreReadChar(parity_errors);
+         buff[read_counter++] = hreReadChar(parity_errors);
+
+         if (read_counter == 46)
+         {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "pe:%d, re:%d, buff:%s"),
+                      parity_errors, hre_read_errors, buff);
+            if (parity_errors == 0)
+            {
+               float curr_usage;
+               curr_usage = 0.01 * atol(buff+24);
+               if (hre_usage_time)
+               {
+                  double dt = 1.666e-2 * (curr_start - hre_usage_time);
+                  hre_rate = (curr_usage - hre_usage)/dt;
+               }
+               hre_usage = curr_usage;
+               hre_usage_time = curr_start;
+               hre_good = true;
+
+               hre_state = hre_sleep;
+            }
+            else
+            {
+               hre_read_errors++;
+               hre_state = hre_sleep;
+            }
+         }
+         break;
+
+      case hre_sleep:
+         hre_usage_time = curr_start;
+         hre_state = hre_sleeping;
+         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_sleeping"));
+
+      case hre_sleeping:
+
+
+         if (uptime - hre_usage_time >= 27)
+            hre_state = hre_sync;
+   }
+}
+
+void hreShow(boolean json)
+{
+   if (!hre_good)
+      return;
+
+   const char *id = "HRE";
+
+   char usage[16];
+   char rate[16];
+   dtostrfd(hre_usage, 2, usage);
+   dtostrfd(hre_rate, 3, rate);
+
+   if (json)
+   {
+      ResponseAppend_P(JSON_SNS_GNGPM, id, usage, rate);
+#ifdef USE_WEBSERVER
+   }
+   else
+   {
+      WSContentSend_PD(HTTP_SNS_GALLONS, id, usage);
+      WSContentSend_PD(HTTP_SNS_GPM, id, rate);
+#endif
+   }
+}
+
+
+
+
+
+bool Xsns43(byte function)
+{
+
+   if (pin[GPIO_HRE_CLOCK] >= 99 || pin[GPIO_HRE_DATA] >= 99)
+      return false;
+
+   switch (function)
+   {
+      case FUNC_INIT:
+         hreInit();
+         break;
+      case FUNC_EVERY_50_MSECOND:
+         hreEvery50ms();
+         break;
+      case FUNC_EVERY_SECOND:
+         break;
+      case FUNC_JSON_APPEND:
+         hreShow(1);
+         break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+         hreShow(0);
+         break;
+#endif
+   }
+   return false;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_44_sps30.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_44_sps30.ino"
+#ifdef USE_I2C
+#ifdef USE_SPS30
+
+#define XSNS_44 44
+#define XI2C_30 30
+
+#define SPS30_ADDR 0x69
+
+#include <Wire.h>
+#include <twi.h>
+
+uint8_t sps30_ready = 0;
+uint8_t sps30_running;
+
+struct SPS30 {
+  float PM1_0;
+  float PM2_5;
+  float PM4_0;
+  float PM10;
+  float NCPM0_5;
+  float NCPM1_0;
+  float NCPM2_5;
+  float NCPM4_0;
+  float NCPM10;
+  float TYPSIZ;
+} sps30_result;
+
+#define SPS_CMD_START_MEASUREMENT 0x0010
+#define SPS_CMD_START_MEASUREMENT_ARG 0x0300
+#define SPS_CMD_STOP_MEASUREMENT 0x0104
+#define SPS_CMD_READ_MEASUREMENT 0x0300
+#define SPS_CMD_GET_DATA_READY 0x0202
+#define SPS_CMD_AUTOCLEAN_INTERVAL 0x8004
+#define SPS_CMD_CLEAN 0x5607
+#define SPS_CMD_GET_ACODE 0xd025
+#define SPS_CMD_GET_SERIAL 0xd033
+#define SPS_CMD_RESET 0xd304
+#define SPS_WRITE_DELAY_US 20000
+#define SPS_MAX_SERIAL_LEN 32
+
+uint8_t sps30_calc_CRC(uint8_t *data) {
+    uint8_t crc = 0xFF;
+    for (uint32_t i = 0; i < 2; i++) {
+        crc ^= data[i];
+        for (uint32_t bit = 8; bit > 0; --bit) {
+            if(crc & 0x80) {
+                crc = (crc << 1) ^ 0x31u;
+            } else {
+                crc = (crc << 1);
+            }
+        }
+    }
+    return crc;
+}
+
+void CmdClean(void);
+
+unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
+
+void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen) {
+unsigned char cmdb[2];
+uint8_t tmp[3];
+uint8_t index=0;
+memset(data,0,dlen);
+uint8_t twi_buff[64];
+
+  Wire.beginTransmission(SPS30_ADDR);
+  cmdb[0]=cmd>>8;
+  cmdb[1]=cmd;
+  Wire.write(cmdb,2);
+  Wire.endTransmission();
+
+
+  dlen/=2;
+  dlen*=3;
+
+  twi_readFrom(SPS30_ADDR,twi_buff,dlen,1);
+
+  uint8_t bind=0;
+  while (bind<dlen) {
+    tmp[0] = twi_buff[bind++];
+    tmp[1] = twi_buff[bind++];
+    tmp[2] = twi_buff[bind++];
+    if (sps30_calc_CRC(tmp)!=tmp[2]) {
+
+      index+=2;
+    } else {
+      data[index++]=tmp[0];
+      data[index++]=tmp[1];
+    }
+  }
+}
+
+void sps30_cmd(uint16_t cmd) {
+unsigned char cmdb[6];
+  Wire.beginTransmission(SPS30_ADDR);
+  cmdb[0]=cmd>>8;
+  cmdb[1]=cmd;
+
+  if (cmd==SPS_CMD_START_MEASUREMENT) {
+    cmdb[2]=SPS_CMD_START_MEASUREMENT_ARG>>8;
+    cmdb[3]=SPS_CMD_START_MEASUREMENT_ARG&0xff;
+    cmdb[4]=sps30_calc_CRC(&cmdb[2]);
+    Wire.write(cmdb,5);
+  } else {
+    Wire.write(cmdb,2);
+  }
+  Wire.endTransmission();
+}
+
+void SPS30_Detect(void)
+{
+  if (!I2cSetDevice(SPS30_ADDR)) { return; }
+  I2cSetActiveFound(SPS30_ADDR, "SPS30");
+
+  uint8_t dcode[32];
+  sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode));
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode);
+  sps30_cmd(SPS_CMD_START_MEASUREMENT);
+  sps30_running = 1;
+  sps30_ready = 1;
+}
+
+#define D_UNIT_PM "ug/m3"
+#define D_UNIT_NCPM "#/m3"
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_PM "{e}";
+const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_NCPM "{e}";
+const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
+#endif
+
+#define PMDP 2
+
+#define SPS30_HOURS Settings.sps30_inuse_hours
+
+
+
+void SPS30_Every_Second() {
+  if (!sps30_running) return;
+
+  if (uptime%10==0) {
+    uint8_t vars[sizeof(float)*10];
+    sps30_get_data(SPS_CMD_READ_MEASUREMENT,vars,sizeof(vars));
+    float *fp=&sps30_result.PM1_0;
+
+    typedef union {
+    uint8_t array[4];
+    float value;
+    } ByteToFloat;
+
+    ByteToFloat conv;
+
+    for (uint32_t count=0; count<10; count++) {
+      for (uint32_t i = 0; i < 4; i++){
+        conv.array[3-i] = vars[count*sizeof(float)+i];
+      }
+      *fp++=conv.value;
+    }
+  }
+
+  if (uptime%3600==0 && uptime>60) {
+
+
+    SPS30_HOURS++;
+    if (SPS30_HOURS>(7*24)) {
+      CmdClean();
+      SPS30_HOURS=0;
+    }
+  }
+
+}
+
+void SPS30_Show(bool json)
+{
+  if (!sps30_running) { return; }
+
+  char str[64];
+  if (json) {
+    dtostrfd(sps30_result.PM1_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str);
+    dtostrfd(sps30_result.PM2_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM2_5" "\":%s"), str);
+    dtostrfd(sps30_result.PM4_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM4_0" "\":%s"), str);
+    dtostrfd(sps30_result.PM10,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "PM10" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM0_5" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM1_0" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM2_5" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM4_0" "\":%s"), str);
+    dtostrfd(sps30_result.NCPM10,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "NCPM10" "\":%s"), str);
+    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
+    ResponseAppend_P(PSTR(",\"" "TYPSIZ" "\":%s}"), str);
+
+#ifdef USE_WEBSERVER
+  } else {
+    dtostrfd(sps30_result.PM1_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 1.0",str);
+    dtostrfd(sps30_result.PM2_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 2.5",str);
+    dtostrfd(sps30_result.PM4_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 4.0",str);
+    dtostrfd(sps30_result.PM10,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 10",str);
+    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 0.5",str);
+    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 1.0",str);
+    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 2.5",str);
+    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 4.0",str);
+    dtostrfd(sps30_result.NCPM10,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 10",str);
+    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
+    WSContentSend_PD(HTTP_SNS_SPS30_c,str);
+#endif
+  }
+}
+
+void CmdClean(void)
+{
+  sps30_cmd(SPS_CMD_CLEAN);
+  ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
+  MqttPublishTeleSensor();
+}
+
+bool SPS30_cmd(void)
+{
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp=='c') {
+
+        CmdClean();
+      } else if (*cp=='0' || *cp=='1') {
+        sps30_running=*cp&1;
+        sps30_cmd(sps30_running?SPS_CMD_START_MEASUREMENT:SPS_CMD_STOP_MEASUREMENT);
+      } else {
+        serviced=false;
+      }
+  }
+  Response_P(PSTR("{\"SPS30\":\"%s\"}"), sps30_running?"running":"stopped");
+
+  return serviced;
+}
+
+
+
+
+
+bool Xsns44(byte function)
+{
+  if (!I2cEnabled(XI2C_30)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    SPS30_Detect();
+  }
+  else if (sps30_ready) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        SPS30_Every_Second();
+        break;
+      case FUNC_JSON_APPEND:
+        SPS30_Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SPS30_Show(0);
+        break;
+  #endif
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_44 == XdrvMailbox.index) {
+          result = SPS30_cmd();
+        }
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_45_vl53l0x.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_45_vl53l0x.ino"
+#ifdef USE_I2C
+#ifdef USE_VL53L0X
+
+#define XSNS_45 45
+#define XI2C_31 31
+
+#include <Wire.h>
+#include "VL53L0X.h"
+VL53L0X sensor;
+
+uint8_t vl53l0x_ready = 0;
+uint16_t vl53l0x_distance;
+uint16_t Vl53l0_buffer[5];
+uint8_t Vl53l0_index;
+
+
+
+void Vl53l0Detect(void)
+{
+  if (!I2cSetDevice(0x29)) { return; }
+
+  if (!sensor.init()) { return; }
+
+  I2cSetActiveFound(sensor.getAddress(), "VL53L0X");
+
+  sensor.setTimeout(500);
+
+
+
+
+
+  sensor.startContinuous();
+  vl53l0x_ready = 1;
+
+  Vl53l0_index=0;
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_VL53L0X[] PROGMEM =
+ "{s}VL53L0X " D_DISTANCE "{m}%d" D_UNIT_MILLIMETER "{e}";
+#endif
+
+#define USE_VL_MEDIAN 
+
+void Vl53l0Every_250MSecond(void)
+{
+  uint16_t tbuff[5],tmp;
+  uint8_t flag;
+
+
+  uint16_t dist = sensor.readRangeContinuousMillimeters();
+  if (dist==0 || dist>2000) {
+    dist=9999;
+  }
+
+#ifdef USE_VL_MEDIAN
+
+  Vl53l0_buffer[Vl53l0_index]=dist;
+  Vl53l0_index++;
+  if (Vl53l0_index>=5) Vl53l0_index=0;
+
+
+  memmove(tbuff,Vl53l0_buffer,sizeof(tbuff));
+  for (byte ocnt=0; ocnt<5; ocnt++) {
+    flag=0;
+    for (byte count=0; count<4; count++) {
+      if (tbuff[count]>tbuff[count+1]) {
+        tmp=tbuff[count];
+        tbuff[count]=tbuff[count+1];
+        tbuff[count+1]=tmp;
+        flag=1;
+      }
+    }
+    if (!flag) break;
+  }
+  vl53l0x_distance=tbuff[2];
+#else
+  vl53l0x_distance=dist;
+#endif
+}
+
+void Vl53l0Show(boolean json)
+{
+  if (json) {
+    ResponseAppend_P(PSTR(",\"VL53L0X\":{\"" D_JSON_DISTANCE "\":%d}"), vl53l0x_distance);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_SNS_VL53L0X, vl53l0x_distance);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns45(byte function)
+{
+  if (!I2cEnabled(XI2C_31)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Vl53l0Detect();
+  }
+  else if (vl53l0x_ready) {
+    switch (function) {
+      case FUNC_EVERY_250_MSECOND:
+        Vl53l0Every_250MSecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Vl53l0Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Vl53l0Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_46_MLX90614.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_46_MLX90614.ino"
+#ifdef USE_I2C
+#ifdef USE_MLX90614
+
+#define XSNS_46 46
+#define XI2C_32 32
+
+#define I2_ADR_IRT 0x5a
+
+#define MLX90614_RAWIR1 0x04
+#define MLX90614_RAWIR2 0x05
+#define MLX90614_TA 0x06
+#define MLX90614_TOBJ1 0x07
+#define MLX90614_TOBJ2 0x08
+
+struct {
+  union {
+    uint16_t value;
+    uint32_t i2c_buf;
+    };
+  float obj_temp;
+  float amb_temp;
+  bool ready = false;
+} mlx90614;
+
+void MLX90614_Init(void)
+{
+  if (!I2cSetDevice(I2_ADR_IRT)) { return; }
+  I2cSetActiveFound(I2_ADR_IRT, "MLX90614");
+  mlx90614.ready = true;
+}
+
+void MLX90614_Every_Second(void)
+{
+    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT, MLX90614_TOBJ1);
+    if (mlx90614.value & 0x8000) {
+      mlx90614.obj_temp = -999;
+    } else {
+      mlx90614.obj_temp = ((float)mlx90614.value * 0.02) - 273.15;
+    }
+    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT,MLX90614_TA);
+    if (mlx90614.value & 0x8000) {
+      mlx90614.amb_temp = -999;
+    } else {
+      mlx90614.amb_temp = ((float)mlx90614.value * 0.02) - 273.15;
+    }
+}
+
+#ifdef USE_WEBSERVER
+ const char HTTP_IRTMP[] PROGMEM =
+  "{s}MXL90614 " "OBJ-" D_TEMPERATURE "{m}%s C" "{e}"
+  "{s}MXL90614 " "AMB-" D_TEMPERATURE "{m}%s C" "{e}";
+#endif
+
+void MLX90614_Show(uint8_t json)
+{
+  char obj_tstr[16];
+  dtostrfd(mlx90614.obj_temp, Settings.flag2.temperature_resolution, obj_tstr);
+  char amb_tstr[16];
+  dtostrfd(mlx90614.amb_temp, Settings.flag2.temperature_resolution, amb_tstr);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"MLX90614\":{\"OBJTMP\":%s,\"AMBTMP\":%s}"), obj_tstr, amb_tstr);
+#ifdef USE_WEBSERVER
+  } else {
+    WSContentSend_PD(HTTP_IRTMP, obj_tstr, amb_tstr);
+#endif
+  }
+}
+
+
+
+
+
+bool Xsns46(byte function)
+{
+  if (!I2cEnabled(XI2C_32)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    MLX90614_Init();
+  }
+  else if (mlx90614.ready) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        MLX90614_Every_Second();
+        break;
+      case FUNC_JSON_APPEND:
+        MLX90614_Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MLX90614_Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_47_max31865.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_47_max31865.ino"
+#ifdef USE_MAX31865
+
+#ifndef USE_SPI
+#error "MAX31865 requires USE_SPI enabled"
+#endif
+
+#include "Adafruit_MAX31865.h"
+
+#define XSNS_47 47
+
+#if MAX31865_PTD_WIRES == 4
+  #define PTD_WIRES MAX31865_4WIRE
+#elif MAX31865_PTD_WIRES == 3
+  #define PTD_WIRES MAX31865_3WIRE
+#else
+  #define PTD_WIRES MAX31865_2WIRE
+#endif
+
+int8_t init_status = 0;
+
+Adafruit_MAX31865 max31865;
+
+struct MAX31865_Result_Struct {
+    uint8_t ErrorCode;
+    uint16_t Rtd;
+    float PtdResistance;
+    float PtdTemp;
+} MAX31865_Result;
+
+void MAX31865_Init(void){
+    if(init_status)
+        return;
+
+  max31865.setPins(
+    pin[GPIO_SSPI_CS],
+    pin[GPIO_SSPI_MOSI],
+    pin[GPIO_SSPI_MISO],
+    pin[GPIO_SSPI_SCLK]
+  );
+
+  if(max31865.begin(PTD_WIRES))
+    init_status = 1;
+  else
+    init_status = -1;
+}
+
+
+
+
+
+void MAX31865_GetResult(void){
+    uint16_t rtd;
+
+    rtd = max31865.readRTD();
+    MAX31865_Result.Rtd = rtd;
+    MAX31865_Result.PtdResistance = max31865.rtd_to_resistance(rtd, MAX31865_REF_RES);
+    MAX31865_Result.PtdTemp = max31865.rtd_to_temperature(rtd, MAX31865_PTD_RES, MAX31865_REF_RES) + MAX31865_PTD_BIAS;
+}
+
+void MAX31865_Show(bool Json){
+    char temperature[33];
+    char resistance[33];
+
+    dtostrfd(MAX31865_Result.PtdResistance, Settings.flag2.temperature_resolution, resistance);
+    dtostrfd(MAX31865_Result.PtdTemp, Settings.flag2.temperature_resolution, temperature);
+
+    if(Json){
+        ResponseAppend_P(PSTR(",\"MAX31865\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RESISTANCE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
+          temperature, resistance, MAX31865_Result.ErrorCode);
+#ifdef USE_DOMOTICZ
+        if (0 == tele_period) {
+          DomoticzSensor(DZ_TEMP, temperature);
+        }
+#endif
+#ifdef USE_KNX
+        if (0 == tele_period) {
+          KnxSensor(KNX_TEMPERATURE, MAX31865_Result.PtdTemp);
+        }
+#endif
+    } else {
+#ifdef USE_WEBSERVER
+        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31865", temperature, TempUnit());
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns47(uint8_t function)
+{
+  bool result = false;
+  if((pin[GPIO_SSPI_MISO] < 99) && (pin[GPIO_SSPI_MOSI] < 99) &&
+     (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_CS] < 99)) {
+
+    switch (function) {
+      case FUNC_INIT:
+        MAX31865_Init();
+        break;
+
+      case FUNC_EVERY_SECOND:
+        MAX31865_GetResult();
+        break;
+
+      case FUNC_JSON_APPEND:
+        MAX31865_Show(true);
+        break;
+
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MAX31865_Show(false);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
+# 35 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
+#ifdef USE_I2C
+#ifdef USE_CHIRP
+# 47 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
+#define XSNS_48 48
+#define XI2C_33 33
+
+#define CHIRP_MAX_SENSOR_COUNT 3
+
+#define CHIRP_ADDR_STANDARD 0x20
+
+
+
+
+
+#define D_CMND_CHIRP "CHIRP"
+
+const char S_JSON_CHIRP_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_CHIRP "%s\":%d}";
+const char S_JSON_CHIRP_COMMAND[] PROGMEM = "{\"" D_CMND_CHIRP "%s\"}";
+const char kCHIRP_Commands[] PROGMEM = "Select|Set|Scan|Reset|Sleep|Wake";
+
+const char kChirpTypes[] PROGMEM = "CHIRP";
+
+
+
+
+
+enum CHIRP_Commands {
+  CMND_CHIRP_SELECT,
+  CMND_CHIRP_SET,
+  CMND_CHIRP_SCAN,
+  CMND_CHIRP_RESET,
+  CMND_CHIRP_SLEEP,
+  CMND_CHIRP_WAKE };
+
+
+
+
+
+
+#define CHIRP_GET_CAPACITANCE 0x00
+#define CHIRP_SET_ADDRESS 0x01
+#define CHIRP_GET_ADDRESS 0x02
+#define CHIRP_MEASURE_LIGHT 0x03
+#define CHIRP_GET_LIGHT 0x04
+#define CHIRP_GET_TEMPERATURE 0x05
+#define CHIRP_RESET 0x06
+#define CHIRP_GET_VERSION 0x07
+#define CHIRP_SLEEP 0x08
+#define CHIRP_GET_BUSY 0x09
+
+
+
+
+
+void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg) {
+  Wire.beginTransmission(addr);
+  Wire.write(reg);
+  Wire.endTransmission();
+}
+
+uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr) {
+  Wire.requestFrom(addr,(uint8_t)2);
+  uint16_t t = Wire.read() << 8;
+  t = t | Wire.read();
+  return t;
+}
+
+
+
+
+
+uint8_t chirp_current = 0;
+uint8_t chirp_found_sensors = 0;
+
+char chirp_name[7];
+uint8_t chirp_next_job = 0;
+uint32_t chirp_timeout_count = 0;
+
+#pragma pack(1)
+struct ChirpSensor_t{
+    uint16_t moisture = 0;
+    uint16_t light = 0;
+    int16_t temperature = 0;
+    uint8_t version = 0;
+    uint8_t address:7;
+    uint8_t explicitSleep:1;
+};
+#pragma pack()
+
+ChirpSensor_t chirp_sensor[CHIRP_MAX_SENSOR_COUNT];
+
+
+
+void ChirpReset(uint8_t addr) {
+    ChirpWriteI2CRegister(addr, CHIRP_RESET);
+}
+
+
+
+void ChirpResetAll(void) {
+    for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+      if (chirp_sensor[i].version) {
+        ChirpReset(chirp_sensor[i].address);
+        }
+    }
+}
+
+
+void ChirpClockSet() {
+    Wire.setClockStretchLimit(4000);
+    Wire.setClock(50000);
+}
+
+
+
+void ChirpSleep(uint8_t addr) {
+    ChirpWriteI2CRegister(addr, CHIRP_SLEEP);
+}
+# 185 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
+void ChirpSelect(uint8_t sensor) {
+  if(sensor < chirp_found_sensors) {
+    chirp_current = sensor;
+    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u now active."), chirp_current);
+  }
+  if (sensor == 255) {
+    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u active at address 0x%x."), chirp_current, chirp_sensor[chirp_current].address);
+  }
+}
+
+
+
+uint8_t ChirpReadVersion(uint8_t addr) {
+  return (I2cRead8(addr, CHIRP_GET_VERSION));
+}
+
+
+
+bool ChirpSet(uint8_t addr) {
+  if(addr < 128){
+    if (I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr)){
+      if(chirp_sensor[chirp_current].version>0x25 && chirp_sensor[chirp_current].version != 255){
+        delay(5);
+        I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr);
+
+      }
+      DEBUG_SENSOR_LOG(PSTR("CHIRP: Wrote adress %u "), addr);
+      ChirpReset(chirp_sensor[chirp_current].address);
+      chirp_sensor[chirp_current].address = addr;
+      chirp_timeout_count = 10;
+      chirp_next_job = 0;
+      if(chirp_sensor[chirp_current].version == 255){
+          AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: wrote new address %u, please power off device"), addr);
+          chirp_sensor[chirp_current].version == 0;
+      }
+      return true;
+    }
+  }
+  AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: address %u incorrect and not used"), addr);
+  return false;
+}
+
+
+
+bool ChirpScan()
+{
+  ChirpClockSet();
+  chirp_found_sensors = 0;
+  for (uint8_t address = 1; address <= 127; address++) {
+    chirp_sensor[chirp_found_sensors].version = 0;
+    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
+    delay(2);
+    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
+    if (chirp_sensor[chirp_found_sensors].version > 0) {
+      I2cSetActiveFound(address, "CHIRP");
+      if (chirp_found_sensors<CHIRP_MAX_SENSOR_COUNT) {
+        chirp_sensor[chirp_found_sensors].address = address;
+        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CHIRP: fw %x"), chirp_sensor[chirp_found_sensors].version);
+      }
+      chirp_found_sensors++;
+    }
+  }
+
+  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Found %u CHIRP sensor(s)."), chirp_found_sensors);
+  return (chirp_found_sensors > 0);
+}
+
+
+
+void ChirpDetect(void)
+{
+  if (chirp_next_job > 0) { return; }
+
+  DEBUG_SENSOR_LOG(PSTR("CHIRP: scan will start ..."));
+  if (ChirpScan()) {
+    uint8_t chirp_model = 0;
+    GetTextIndexed(chirp_name, sizeof(chirp_name), chirp_model, kChirpTypes);
+  }
+}
+
+
+void ChirpServiceAllSensors(uint8_t job){
+  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+    if (chirp_sensor[i].version && !chirp_sensor[i].explicitSleep) {
+      DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare for sensor at address 0x%x"), chirp_sensor[i].address);
+      switch(job){
+        case 0:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_CAPACITANCE);
+        break;
+        case 1:
+        chirp_sensor[i].moisture = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        case 2:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_TEMPERATURE);
+        break;
+        case 3:
+        chirp_sensor[i].temperature = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        case 4:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_MEASURE_LIGHT);
+        break;
+        case 5:
+        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_LIGHT);
+        break;
+        case 6:
+        chirp_sensor[i].light = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
+        break;
+        default:
+        break;
+      }
+    }
+  }
+}
+
+
+
+void ChirpEvery100MSecond(void)
+{
+
+  if(chirp_timeout_count == 0) {
+      switch(chirp_next_job) {
+          case 0:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: reset all"));
+          ChirpResetAll();
+          chirp_timeout_count = 10;
+          chirp_next_job++;
+          break;
+          case 1:
+
+
+          chirp_next_job++;
+          break;
+          case 2:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read"));
+          ChirpServiceAllSensors(0);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 3:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read"));
+          ChirpServiceAllSensors(1);
+          chirp_next_job++;
+          break;
+          case 4:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read - 2nd"));
+          ChirpServiceAllSensors(0);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 5:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read - 2nd"));
+          ChirpServiceAllSensors(1);
+          chirp_next_job++;
+          break;
+          case 6:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read"));
+          ChirpServiceAllSensors(2);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 7:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read"));
+          ChirpServiceAllSensors(3);
+          chirp_next_job++;
+          break;
+          case 8:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read - 2nd"));
+          ChirpServiceAllSensors(2);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 9:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read - 2nd"));
+          ChirpServiceAllSensors(3);
+          chirp_next_job++;
+          break;
+          case 10:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: start light measure process"));
+          ChirpServiceAllSensors(4);
+          chirp_timeout_count = 90;
+          chirp_next_job++;
+          break;
+          case 11:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare light read"));
+          ChirpServiceAllSensors(5);
+          chirp_timeout_count = 11;
+          chirp_next_job++;
+          break;
+          case 12:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish light read"));
+          ChirpServiceAllSensors(6);
+          chirp_next_job++;
+          break;
+          case 13:
+          DEBUG_SENSOR_LOG(PSTR("CHIRP: paused, waiting for TELE"));
+          break;
+          case 14:
+          if (Settings.tele_period > 16){
+              chirp_timeout_count = (Settings.tele_period - 17) * 10;
+              DEBUG_SENSOR_LOG(PSTR("CHIRP: timeout 1/10 sec: %u, tele: %u"), chirp_timeout_count, Settings.tele_period);
+            }
+          else{
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: TELEPERIOD must be > 16 seconds !"));
+
+          }
+          chirp_next_job = 1;
+          break;
+      }
+  }
+  else {
+      chirp_timeout_count--;
+  }
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+
+const char HTTP_SNS_DARKNESS[] PROGMEM = "{s} " D_JSON_DARKNESS "{m}%s %%{e}";
+const char HTTP_SNS_CHIRPVER[] PROGMEM = "{s} CHIRP-sensor %u at address{m}0x%x{e}"
+                                         "{s} FW-version{m}%s {e}"; ;
+const char HTTP_SNS_CHIRPSLEEP[] PROGMEM = "{s} {m} is sleeping ...{e}";
+#endif
+
+
+
+void ChirpShow(bool json)
+{
+  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
+    if (chirp_sensor[i].version) {
+
+      char str_temperature[33];
+      double t_temperature = ((double) chirp_sensor[i].temperature )/10.0;
+      dtostrfd(t_temperature, Settings.flag2.temperature_resolution, str_temperature);
+      char str_light[33];
+      dtostrfd(chirp_sensor[i].light, 0, str_light);
+      char str_version[7];
+      if(chirp_sensor[i].version == 0xff){
+        strncpy_P(str_version, PSTR("Chirp!"), sizeof(str_version));
+      }
+      else{
+        sprintf(str_version, "%x", chirp_sensor[i].version);
+      }
+
+      if (json) {
+        if(!chirp_sensor[i].explicitSleep) {
+          ResponseAppend_P(PSTR(",\"%s%u\":{\"" D_JSON_MOISTURE "\":%d"), chirp_name, i, chirp_sensor[i].moisture);
+          if(chirp_sensor[i].temperature!=-1){
+            ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s"),str_temperature);
+          }
+          ResponseAppend_P(PSTR(",\"" D_JSON_DARKNESS "\":%s}"),str_light);
+        }
+        else {
+          ResponseAppend_P(PSTR(",\"%s%u\":{\"sleeping\"}"),chirp_name, i);
+        }
+  #ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        char str_moisture[33];
+        dtostrfd(chirp_sensor[i].moisture, 0, str_moisture);
+        DomoticzTempHumSensor(str_temperature, str_moisture);
+        DomoticzSensor(DZ_ILLUMINANCE,chirp_sensor[i].light);
+      }
+  #endif
+  #ifdef USE_WEBSERVER
+      } else {
+        WSContentSend_PD(HTTP_SNS_CHIRPVER, i, chirp_sensor[i].address, str_version);
+        if (chirp_sensor[i].explicitSleep){
+          WSContentSend_PD(HTTP_SNS_CHIRPSLEEP);
+        }
+        else {
+          WSContentSend_PD(HTTP_SNS_MOISTURE, "", chirp_sensor[i].moisture);
+          WSContentSend_PD(HTTP_SNS_DARKNESS, str_light);
+          if (chirp_sensor[i].temperature!=-1) {
+            WSContentSend_PD(HTTP_SNS_TEMP, "", str_temperature, TempUnit());
+          }
+        }
+
+  #endif
+      }
+    }
+  }
+}
+
+
+
+
+
+bool ChirpCmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_CHIRP);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_CHIRP), disp_len)) {
+    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kCHIRP_Commands);
+
+    switch (command_code) {
+      case CMND_CHIRP_SELECT:
+      case CMND_CHIRP_SET:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(XdrvMailbox.payload); }
+          if (command_code == CMND_CHIRP_SET) { ChirpSet((uint8_t)XdrvMailbox.payload); }
+        Response_P(S_JSON_CHIRP_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        }
+        else {
+          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(255); }
+        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
+        }
+        break;
+      case CMND_CHIRP_SCAN:
+      case CMND_CHIRP_SLEEP:
+      case CMND_CHIRP_WAKE:
+      case CMND_CHIRP_RESET:
+        if (command_code == CMND_CHIRP_SCAN) { chirp_next_job = 0;
+                                                    ChirpDetect(); }
+        if (command_code == CMND_CHIRP_SLEEP) { chirp_sensor[chirp_current].explicitSleep = true;
+                                                    ChirpSleep(chirp_sensor[chirp_current].address); }
+        if (command_code == CMND_CHIRP_WAKE) { chirp_sensor[chirp_current].explicitSleep = false;
+                                                    ChirpReadVersion(chirp_sensor[chirp_current].address); }
+        if (command_code == CMND_CHIRP_RESET) { ChirpReset(chirp_sensor[chirp_current].address); }
+        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
+        break;
+      default:
+
+        serviced = false;
+      break;
+    }
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns48(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_33)) { return false; }
+
+  bool result = false;
+
+  switch (function) {
+    case FUNC_EVERY_100_MSECOND:
+      if(chirp_found_sensors > 0){
+        ChirpEvery100MSecond();
+      }
+      break;
+    case FUNC_COMMAND:
+      result = ChirpCmd();
+      break;
+    case FUNC_JSON_APPEND:
+      ChirpShow(1);
+      chirp_next_job = 14;
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      ChirpShow(0);
+      break;
+#endif
+    case FUNC_INIT:
+      ChirpDetect();
+      break;
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
+# 31 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
+#ifdef USE_I2C
+#ifdef USE_PAJ7620
+
+
+
+
+
+
+#define XSNS_50 50
+#define XI2C_34 34
+
+#define PAJ7620_ADDR 0x73
+
+#define PAJ7620_BANK_SEL 0xEF
+
+
+
+#define PAJ7620_GET_GESTURE 0x43
+#define PAJ7620_PROXIMITY_AVG_Y 0x6c
+
+#define PAJ7620_OBJECT_CENTER_X 0xad
+#define PAJ7620_OBJECT_CENTER_Y 0xaf
+
+#define PAJ7620_DOWN 1
+#define PAJ7620_UP 2
+#define PAJ7620_RIGHT 4
+#define PAJ7620_LEFT 8
+#define PAJ7620_NEAR 16
+#define PAJ7620_FAR 32
+#define PAJ7620_CW 64
+#define PAJ7620_CCW 128
+
+
+
+
+const uint8_t PAJ7620initRegisterArray[][2] PROGMEM = {
+  {0xEF,0x00},
+ {0x32,0x29}, {0x33,0x01}, {0x34,0x00}, {0x35,0x01}, {0x36,0x00}, {0x37,0x07}, {0x38,0x17}, {0x39,0x06},
+ {0x3A,0x12}, {0x3F,0x00}, {0x40,0x02}, {0x41,0xFF}, {0x42,0x01}, {0x46,0x2D}, {0x47,0x0F}, {0x48,0x3C},
+ {0x49,0x00}, {0x4A,0x1E}, {0x4B,0x00}, {0x4C,0x20}, {0x4D,0x00}, {0x4E,0x1A}, {0x4F,0x14}, {0x50,0x00},
+ {0x51,0x10}, {0x52,0x00}, {0x5C,0x02}, {0x5D,0x00}, {0x5E,0x10}, {0x5F,0x3F}, {0x60,0x27}, {0x61,0x28},
+ {0x62,0x00}, {0x63,0x03}, {0x64,0xF7}, {0x65,0x03}, {0x66,0xD9}, {0x67,0x03}, {0x68,0x01}, {0x69,0xC8},
+ {0x6A,0x40}, {0x6D,0x04}, {0x6E,0x00}, {0x6F,0x00}, {0x70,0x80}, {0x71,0x00}, {0x72,0x00}, {0x73,0x00},
+ {0x74,0xF0}, {0x75,0x00}, {0x80,0x42}, {0x81,0x44}, {0x82,0x04}, {0x83,0x20}, {0x84,0x20}, {0x85,0x00},
+ {0x86,0x10}, {0x87,0x00}, {0x88,0x05}, {0x89,0x18}, {0x8A,0x10}, {0x8B,0x01}, {0x8C,0x37}, {0x8D,0x00},
+ {0x8E,0xF0}, {0x8F,0x81}, {0x90,0x06}, {0x91,0x06}, {0x92,0x1E}, {0x93,0x0D}, {0x94,0x0A}, {0x95,0x0A},
+ {0x96,0x0C}, {0x97,0x05}, {0x98,0x0A}, {0x99,0x41}, {0x9A,0x14}, {0x9B,0x0A}, {0x9C,0x3F}, {0x9D,0x33},
+ {0x9E,0xAE}, {0x9F,0xF9}, {0xA0,0x48}, {0xA1,0x13}, {0xA2,0x10}, {0xA3,0x08}, {0xA4,0x30}, {0xA5,0x19},
+ {0xA6,0x10}, {0xA7,0x08}, {0xA8,0x24}, {0xA9,0x04}, {0xAA,0x1E}, {0xAB,0x1E}, {0xCC,0x19}, {0xCD,0x0B},
+ {0xCE,0x13}, {0xCF,0x64}, {0xD0,0x21}, {0xD1,0x0F}, {0xD2,0x88}, {0xE0,0x01}, {0xE1,0x04}, {0xE2,0x41},
+ {0xE3,0xD6}, {0xE4,0x00}, {0xE5,0x0C}, {0xE6,0x0A}, {0xE7,0x00}, {0xE8,0x00}, {0xE9,0x00}, {0xEE,0x07},
+ {0xEF,0x01},
+ {0x00,0x1E}, {0x01,0x1E}, {0x02,0x0F}, {0x03,0x10}, {0x04,0x02}, {0x05,0x00}, {0x06,0xB0}, {0x07,0x04},
+ {0x08,0x0D}, {0x09,0x0E}, {0x0A,0x9C}, {0x0B,0x04}, {0x0C,0x05}, {0x0D,0x0F}, {0x0E,0x02}, {0x0F,0x12},
+ {0x10,0x02}, {0x11,0x02}, {0x12,0x00}, {0x13,0x01}, {0x14,0x05}, {0x15,0x07}, {0x16,0x05}, {0x17,0x07},
+ {0x18,0x01}, {0x19,0x04}, {0x1A,0x05}, {0x1B,0x0C}, {0x1C,0x2A}, {0x1D,0x01}, {0x1E,0x00}, {0x21,0x00},
+ {0x22,0x00}, {0x23,0x00}, {0x25,0x01}, {0x26,0x00}, {0x27,0x39}, {0x28,0x7F}, {0x29,0x08}, {0x30,0x03},
+ {0x31,0x00}, {0x32,0x1A}, {0x33,0x1A}, {0x34,0x07}, {0x35,0x07}, {0x36,0x01}, {0x37,0xFF}, {0x38,0x36},
+ {0x39,0x07}, {0x3A,0x00}, {0x3E,0xFF}, {0x3F,0x00}, {0x40,0x77}, {0x41,0x40}, {0x42,0x00}, {0x43,0x30},
+ {0x44,0xA0}, {0x45,0x5C}, {0x46,0x00}, {0x47,0x00}, {0x48,0x58}, {0x4A,0x1E}, {0x4B,0x1E}, {0x4C,0x00},
+ {0x4D,0x00}, {0x4E,0xA0}, {0x4F,0x80}, {0x50,0x00}, {0x51,0x00}, {0x52,0x00}, {0x53,0x00}, {0x54,0x00},
+ {0x57,0x80}, {0x59,0x10}, {0x5A,0x08}, {0x5B,0x94}, {0x5C,0xE8}, {0x5D,0x08}, {0x5E,0x3D}, {0x5F,0x99},
+ {0x60,0x45}, {0x61,0x40}, {0x63,0x2D}, {0x64,0x02}, {0x65,0x96}, {0x66,0x00}, {0x67,0x97}, {0x68,0x01},
+ {0x69,0xCD}, {0x6A,0x01}, {0x6B,0xB0}, {0x6C,0x04}, {0x6D,0x2C}, {0x6E,0x01}, {0x6F,0x32}, {0x71,0x00},
+ {0x72,0x01}, {0x73,0x35}, {0x74,0x00}, {0x75,0x33}, {0x76,0x31}, {0x77,0x01}, {0x7C,0x84}, {0x7D,0x03},
+ {0x7E,0x01},
+  {0xEF,0x00}
+};
+
+
+
+
+
+const char kPaj7620Directions[] PROGMEM = "Down|Up|Right|Left|Near|Far|CW|CCW";
+
+const uint8_t PAJ7620_PIN[]= {1,2,3,4};
+
+
+
+
+
+char PAJ7620_name[] = "PAJ7620";
+
+uint32_t PAJ7620_timeout_counter = 10;
+uint32_t PAJ7620_next_job = 0;
+uint32_t PAJ7620_mode = 1;
+
+struct {
+  uint8_t current;
+  uint8_t last;
+  uint8_t same;
+  uint8_t unfinished;
+} PAJ7620_gesture;
+
+bool PAJ7620_finished_gesture = false;
+char PAJ7620_currentGestureName[6];
+
+struct{
+  uint8_t x;
+  uint8_t y;
+  uint8_t last_x;
+  uint8_t last_y;
+  uint8_t proximity;
+  uint8_t last_proximity;
+  uint8_t corner;
+  struct {
+    uint8_t step:3;
+    uint8_t countdown:3;
+    uint8_t valid:1;
+    } PIN;
+} PAJ7620_state;
+
+
+
+
+
+void PAJ7620SelectBank(uint8_t bank)
+{
+  I2cWrite(PAJ7620_ADDR, PAJ7620_BANK_SEL, bank &1, 1);
+}
+
+
+
+void PAJ7620DecodeGesture(void)
+{
+  uint32_t index = 0;
+  switch (PAJ7620_gesture.current) {
+    case PAJ7620_LEFT:
+      index++;
+    case PAJ7620_RIGHT:
+      index++;
+    case PAJ7620_UP:
+      index++;
+    case PAJ7620_DOWN:
+      if (PAJ7620_gesture.unfinished) {
+        PAJ7620_finished_gesture = true;
+        break;
+      }
+      PAJ7620_gesture.unfinished = PAJ7620_gesture.current;
+      PAJ7620_timeout_counter = 5;
+      break;
+    case PAJ7620_NEAR:
+      index = 4;
+      PAJ7620_finished_gesture = true;
+      PAJ7620_timeout_counter = 25;
+      break;
+    case PAJ7620_FAR:
+      index = 5;
+      PAJ7620_finished_gesture = true;
+      PAJ7620_timeout_counter = 25;
+      break;
+    case PAJ7620_CW:
+      index = 6;
+      PAJ7620_finished_gesture = true;
+      break;
+    case PAJ7620_CCW:
+      index = 7;
+      PAJ7620_finished_gesture = true;
+      break;
+    default:
+      index = 8;
+      if (PAJ7620_gesture.unfinished) {
+        PAJ7620_finished_gesture = true;
+      }
+      break;
+  }
+  if (index < 8) {
+    GetTextIndexed(PAJ7620_currentGestureName, sizeof(PAJ7620_currentGestureName), index, kPaj7620Directions);
+  }
+
+  if (PAJ7620_finished_gesture) {
+    if (PAJ7620_gesture.unfinished) {
+      if ((PAJ7620_gesture.current != PAJ7620_NEAR) && (PAJ7620_gesture.current != PAJ7620_FAR)) {
+        PAJ7620_gesture.current = PAJ7620_gesture.unfinished;
+      }
+    }
+    if (PAJ7620_gesture.current == PAJ7620_gesture.last) {
+      PAJ7620_gesture.same++;
+    } else {
+      PAJ7620_gesture.same = 1;
+    }
+    PAJ7620_gesture.last = PAJ7620_gesture.current;
+    PAJ7620_finished_gesture = false;
+    PAJ7620_gesture.unfinished = 0;
+    PAJ7620_timeout_counter += 3;
+    MqttPublishSensor();
+  }
+}
+
+
+
+void PAJ7620ReadGesture(void)
+{
+  switch (PAJ7620_mode) {
+    case 1:
+      PAJ7620_gesture.current = I2cRead8(PAJ7620_ADDR,PAJ7620_GET_GESTURE);
+      if ((PAJ7620_gesture.current > 0) || PAJ7620_gesture.unfinished) {
+        DEBUG_SENSOR_LOG(PSTR("PAJ: gesture: %u"), PAJ7620_gesture.current);
+        PAJ7620DecodeGesture();
+      }
+      break;
+    case 2:
+      PAJ7620_state.proximity = I2cRead8(PAJ7620_ADDR, PAJ7620_PROXIMITY_AVG_Y);
+      if ((PAJ7620_state.proximity > 0) || (PAJ7620_state.last_proximity > 0)) {
+        if (PAJ7620_state.proximity != PAJ7620_state.last_proximity) {
+          PAJ7620_state.last_proximity = PAJ7620_state.proximity;
+          DEBUG_SENSOR_LOG(PSTR("PAJ: Proximity: %u"), PAJ7620_state.proximity);
+          MqttPublishSensor();
+        }
+      }
+      break;
+    case 3:
+    case 4:
+    case 5:
+      PAJ7620_state.x = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_X);
+      PAJ7620_state.y = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_Y);
+      if ((PAJ7620_state.y > 0) && (PAJ7620_state.x > 0)) {
+        if ((PAJ7620_state.y != PAJ7620_state.last_y) || (PAJ7620_state.x != PAJ7620_state.last_x)) {
+          PAJ7620_state.last_y = PAJ7620_state.y;
+          PAJ7620_state.last_x = PAJ7620_state.x;
+          DEBUG_SENSOR_LOG(PSTR("PAJ: x: %u   y: %u"), PAJ7620_state.x, PAJ7620_state.y);
+
+          PAJ7620_state.corner = 0;
+
+
+
+          switch (PAJ7620_state.y) {
+            case 0: case 1: case 2: case 3: case 4: case 5:
+              PAJ7620_state.corner = 3;
+              break;
+            case 9: case 10: case 11: case 12: case 13: case 14:
+              PAJ7620_state.corner = 1;
+              break;
+          }
+          if (PAJ7620_state.corner != 0) {
+            switch (PAJ7620_state.x) {
+              case 0: case 1: case 2: case 3: case 4: case 5:
+                break;
+              case 9: case 10: case 11: case 12: case 13: case 14:
+                PAJ7620_state.corner++;
+                break;
+              default:
+                PAJ7620_state.corner = 0;
+                break;
+            }
+          }
+          DEBUG_SENSOR_LOG(PSTR("PAJ: corner: %u"), PAJ7620_state.corner);
+
+          if (PAJ7620_state.PIN.countdown == 0) {
+            PAJ7620_state.PIN.step = 0;
+            PAJ7620_state.PIN.valid = 0;
+          }
+          if (!PAJ7620_state.PIN.step) {
+            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
+              PAJ7620_state.PIN.step = 1;
+              PAJ7620_state.PIN.countdown = 7;
+            }
+          } else {
+            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
+              PAJ7620_state.PIN.step += 1;
+              PAJ7620_state.PIN.countdown = 7;
+            } else {
+              PAJ7620_state.PIN.countdown -= 1;
+            }
+          }
+          if (PAJ7620_state.PIN.step == 4) {
+            PAJ7620_state.PIN.valid = 1;
+            DEBUG_SENSOR_LOG(PSTR("PAJ: PIN valid!!"));
+            PAJ7620_state.PIN.countdown = 0;
+          }
+          MqttPublishSensor();
+        }
+      }
+      break;
+  }
+}
+
+
+
+void PAJ7620Detect(void)
+{
+  if (I2cActive(PAJ7620_ADDR)) { return; }
+
+  PAJ7620SelectBank(0);
+  PAJ7620SelectBank(0);
+  uint16_t PAJ7620_id = I2cRead16LE(PAJ7620_ADDR,0);
+ uint8_t PAJ7620_ver = I2cRead8(PAJ7620_ADDR,2);
+  if (0x7620 == PAJ7620_id) {
+    I2cSetActiveFound(PAJ7620_ADDR, PAJ7620_name);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAJ: ID: 0x%x and VER: %u"), PAJ7620_id, PAJ7620_ver);
+    PAJ7620_next_job = 1;
+  }
+  else {
+    DEBUG_SENSOR_LOG(PSTR("PAJ: sensor not found, false ID 0x%x"), PAJ7620_id);
+  }
+}
+
+
+
+void PAJ7620Init(void)
+{
+  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor start %u"),millis());
+  union{
+    uint32_t raw;
+    uint8_t reg_val[4];
+  } buf;
+
+  for (uint32_t i = 0; i < (sizeof(PAJ7620initRegisterArray) / 2); i += 2)
+ {
+    buf.raw = pgm_read_dword(PAJ7620initRegisterArray + i);
+    DEBUG_SENSOR_LOG("PAJ: %x %x %x %x",buf.reg_val[0],buf.reg_val[1],buf.reg_val[2],buf.reg_val[3]);
+    I2cWrite(PAJ7620_ADDR, buf.reg_val[0], buf.reg_val[1], 1);
+    I2cWrite(PAJ7620_ADDR, buf.reg_val[2], buf.reg_val[3], 1);
+ }
+  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor done %u"),millis());
+  PAJ7620_next_job = 2;
+}
+
+
+
+void PAJ7620Loop(void)
+{
+  if (0 == PAJ7620_timeout_counter) {
+    switch (PAJ7620_next_job) {
+      case 1:
+        PAJ7620Init();
+        break;
+      case 2:
+        if (PAJ7620_mode != 0) {
+          PAJ7620ReadGesture();
+        }
+        break;
+    }
+  } else {
+    PAJ7620_timeout_counter--;
+  }
+}
+
+
+
+void PAJ7620Show(bool json)
+{
+  if (json) {
+    if (PAJ7620_currentGestureName[0] != '\0' ) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), PAJ7620_name, PAJ7620_currentGestureName, PAJ7620_gesture.same);
+      PAJ7620_currentGestureName[0] = '\0';
+      return;
+    }
+    switch (PAJ7620_mode) {
+      case 2:
+        ResponseAppend_P(PSTR(",\"%s\":{\"Proximity\":%u}"), PAJ7620_name, PAJ7620_state.proximity);
+        break;
+      case 3:
+        if (PAJ7620_state.corner > 0) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"Corner\":%u}"), PAJ7620_name, PAJ7620_state.corner);
+        }
+        break;
+      case 4:
+        if (PAJ7620_state.PIN.valid) {
+          ResponseAppend_P(PSTR(",\"%s\":{\"PIN\":%u}"), PAJ7620_name, 1);
+          PAJ7620_state.PIN.valid = 0;
+        }
+        break;
+      case 5:
+        ResponseAppend_P(PSTR(",\"%s\":{\"x\":%u,\"y\":%u}"), PAJ7620_name, PAJ7620_state.x, PAJ7620_state.y);
+        break;
+    }
+  }
+}
+# 411 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
+bool PAJ7620CommandSensor(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
+    PAJ7620_mode = XdrvMailbox.payload;
+  }
+  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_50, PAJ7620_mode);
+
+  return true;
+}
+
+
+
+
+
+bool Xsns50(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_34)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    PAJ7620Detect();
+  }
+  else if (PAJ7620_next_job) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_50 == XdrvMailbox.index){
+          result = PAJ7620CommandSensor();
+        }
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        PAJ7620Loop();
+        break;
+      case FUNC_JSON_APPEND:
+        PAJ7620Show(1);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_51_rdm6300.ino"
+# 21 "S:/Development/Tasmota/tasmota/xsns_51_rdm6300.ino"
+#ifdef USE_RDM6300
+
+#define XSNS_51 51
+
+#define RDM6300_BAUDRATE 9600
+
+#include <TasmotaSerial.h>
+
+#define RDM_TIMEOUT 100
+char rdm_uid_str[10];
+
+
+#define RDM6300_BLOCK 2*10
+
+uint8_t rdm_blcnt;
+TasmotaSerial *RDM6300_Serial = nullptr;
+
+void RDM6300_Init() {
+  if (pin[GPIO_RDM6300_RX] < 99) {
+    RDM6300_Serial = new TasmotaSerial(pin[GPIO_RDM6300_RX],-1,1);
+    if (RDM6300_Serial->begin(RDM6300_BAUDRATE)) {
+      if (RDM6300_Serial->hardwareSerial()) {
+        ClaimSerial();
+      }
+    }
+  }
+  rdm_blcnt=0;
+}
+
+
+void RDM6300_ScanForTag() {
+  char rdm_buffer[14];
+  uint8_t rdm_index;
+  uint8_t rdm_array[6];
+
+  if (!RDM6300_Serial) return;
+
+  if (rdm_blcnt>0) {
+    rdm_blcnt--;
+    while (RDM6300_Serial->available()) RDM6300_Serial->read();
+    return;
+  }
+
+  if (RDM6300_Serial->available()) {
+
+    char c=RDM6300_Serial->read();
+    if (c!=2) return;
+
+
+    rdm_index=0;
+    uint32_t cmillis=millis();
+    while (1) {
+      if (RDM6300_Serial->available()) {
+        char c=RDM6300_Serial->read();
+        if (c==3) {
+
+          break;
+        }
+        rdm_buffer[rdm_index++]=c;
+        if (rdm_index>13) {
+
+          return;
+        }
+      }
+      if ((millis()-cmillis)>RDM_TIMEOUT) {
+
+        return;
+      }
+    }
+
+
+    rdm_blcnt=RDM6300_BLOCK;
+
+
+    rm6300_hstring_to_array(rdm_array,sizeof(rdm_array),rdm_buffer);
+    uint8_t accu=0;
+    for (uint8_t count=0;count<5;count++) {
+      accu^=rdm_array[count];
+    }
+    if (accu!=rdm_array[5]) {
+
+      return;
+    }
+
+
+    memcpy(rdm_uid_str,&rdm_buffer[2],8);
+    rdm_uid_str[9]=0;
+
+    ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str);
+    MqttPublishTeleSensor();
+
+
+
+
+
+  }
+
+
+}
+
+uint8_t rm6300_hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
+  }
+  return rVal;
+}
+
+
+void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[])
+{
+  char *cp=buffer;
+  for (uint8_t i = 0; i < len; i++) {
+    uint8_t val = rm6300_hexnibble(*cp++) << 4;
+    array[i]= val | rm6300_hexnibble(*cp++);
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_RDM6300[] PROGMEM =
+ "{s}RDM6300 " "UID" "{m}%s" "{e}";
+
+void RDM6300_Show(void) {
+  if (!RDM6300_Serial) return;
+  if (!rdm_uid_str[0]) strcpy(rdm_uid_str,"????");
+  WSContentSend_PD(HTTP_RDM6300,rdm_uid_str);
+}
+#endif
+
+
+
+
+
+bool Xsns51(byte function)
+{
+  bool result = false;
+
+    switch (function) {
+      case FUNC_INIT:
+        RDM6300_Init();
+        break;
+      case FUNC_EVERY_100_MSECOND:
+        RDM6300_ScanForTag();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        RDM6300_Show();
+        break;
+#endif
+    }
+    return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
+#ifdef USE_IBEACON
+
+
+
+#define XSNS_52 52
+
+#include <TasmotaSerial.h>
+
+#define HM17_BAUDRATE 9600
+
+#define IBEACON_DEBUG 
+
+
+#define HM17_V110 
+
+
+
+#define IB_TIMEOUT_INTERVAL 30
+
+#define IB_UPDATE_TIME_INTERVAL 10
+
+TasmotaSerial *IBEACON_Serial = nullptr;
+
+
+uint8_t hm17_found,hm17_cmd,hm17_flag;
+
+#ifdef IBEACON_DEBUG
+uint8_t hm17_debug=0;
+#endif
+
+
+
+#define HM17_BSIZ 128
+char hm17_sbuffer[HM17_BSIZ];
+uint8_t hm17_sindex,hm17_result,hm17_scanning,hm17_connecting;
+uint32_t hm17_lastms;
+char ib_mac[14];
+
+
+#if 1
+uint8_t ib_upd_interval,ib_tout_interval;
+#define IB_UPDATE_TIME ib_upd_interval
+#define IB_TIMEOUT_TIME ib_tout_interval
+#else
+#undef IB_UPDATE_TIME
+#undef IB_TIMEOUT_TIME
+#define IB_UPDATE_TIME Settings.ib_upd_interval
+#define IB_TIMEOUT_TIME Settings.ib_tout_interval
+#endif
+
+enum {HM17_TEST,HM17_ROLE,HM17_IMME,HM17_DISI,HM17_IBEA,HM17_SCAN,HM17_DISC,HM17_RESET,HM17_RENEW,HM17_CON};
+#define HM17_SUCESS 99
+
+struct IBEACON {
+  char FACID[8];
+  char UID[32];
+  char MAJOR[4];
+  char MINOR[4];
+  char PWR[2];
+  char MAC[12];
+  char RSSI[4];
+};
+
+#define MAX_IBEACONS 16
+
+struct IBEACON_UID {
+  char MAC[12];
+  char RSSI[4];
+  uint8_t FLAGS;
+  uint8_t TIME;
+} ibeacons[MAX_IBEACONS];
+
+
+void IBEACON_Init() {
+
+  hm17_found=0;
+
+
+  if ((pin[GPIO_IBEACON_RX] < 99) && (pin[GPIO_IBEACON_TX] < 99)) {
+    IBEACON_Serial = new TasmotaSerial(pin[GPIO_IBEACON_RX], pin[GPIO_IBEACON_TX],1);
+    if (IBEACON_Serial->begin(HM17_BAUDRATE)) {
+      if (IBEACON_Serial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      hm17_sendcmd(HM17_TEST);
+      hm17_lastms=millis();
+
+      IB_UPDATE_TIME=IB_UPDATE_TIME_INTERVAL;
+      IB_TIMEOUT_TIME=IB_TIMEOUT_INTERVAL;
+    }
+  }
+}
+
+void hm17_every_second(void) {
+  if (!IBEACON_Serial) return;
+
+  if (hm17_found) {
+    if (IB_UPDATE_TIME && (uptime%IB_UPDATE_TIME==0)) {
+      if (hm17_cmd!=99) {
+        if (hm17_flag&2) {
+          ib_sendbeep();
+        } else {
+          if (!hm17_connecting) {
+            hm17_sendcmd(HM17_DISI);
+          }
+        }
+      }
+    }
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (ibeacons[cnt].FLAGS) {
+        ibeacons[cnt].TIME++;
+        if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) {
+          ibeacons[cnt].FLAGS=0;
+          ibeacon_mqtt(ibeacons[cnt].MAC,"0000");
+        }
+      }
+    }
+  } else {
+    if (uptime%20==0) {
+      hm17_sendcmd(HM17_TEST);
+    }
+  }
+}
+
+void hm17_sbclr(void) {
+  memset(hm17_sbuffer,0,HM17_BSIZ);
+  hm17_sindex=0;
+  IBEACON_Serial->flush();
+}
+
+void hm17_sendcmd(uint8_t cmd) {
+  hm17_sbclr();
+  hm17_cmd=cmd;
+#ifdef IBEACON_DEBUG
+  if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("hm17cmd %d"),cmd);
+#endif
+  switch (cmd) {
+    case HM17_TEST:
+      IBEACON_Serial->write("AT");
+      break;
+    case HM17_ROLE:
+      IBEACON_Serial->write("AT+ROLE1");
+      break;
+    case HM17_IMME:
+      IBEACON_Serial->write("AT+IMME1");
+      break;
+    case HM17_DISI:
+      IBEACON_Serial->write("AT+DISI?");
+      hm17_scanning=1;
+      break;
+    case HM17_IBEA:
+      IBEACON_Serial->write("AT+IBEA1");
+      break;
+    case HM17_RESET:
+      IBEACON_Serial->write("AT+RESET");
+      break;
+    case HM17_RENEW:
+      IBEACON_Serial->write("AT+RENEW");
+      break;
+    case HM17_SCAN:
+      IBEACON_Serial->write("AT+SCAN5");
+      break;
+    case HM17_DISC:
+      IBEACON_Serial->write("AT+DISC?");
+      hm17_scanning=1;
+      break;
+    case HM17_CON:
+      IBEACON_Serial->write((const uint8_t*)"AT+CON",6);
+      IBEACON_Serial->write((const uint8_t*)ib_mac,12);
+      hm17_connecting=1;
+      break;
+  }
+}
+
+uint32_t ibeacon_add(struct IBEACON *ib) {
+
+  if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) {
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (ibeacons[cnt].FLAGS) {
+        if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) {
+
+          memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
+          ibeacons[cnt].TIME=0;
+          return 1;
+        }
+      }
+    }
+    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+      if (!ibeacons[cnt].FLAGS) {
+        memcpy(ibeacons[cnt].MAC,ib->MAC,12);
+        memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
+        ibeacons[cnt].FLAGS=1;
+        ibeacons[cnt].TIME=0;
+        return 1;
+      }
+    }
+  }
+  return 0;
+}
+
+void hm17_decode(void) {
+  struct IBEACON ib;
+  switch (hm17_cmd) {
+    case HM17_TEST:
+      if (!strncmp(hm17_sbuffer,"OK",2)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("AT OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+        hm17_found=1;
+      }
+      break;
+    case HM17_ROLE:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("ROLE OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_IMME:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IMME OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_IBEA:
+      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IBEA OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_SCAN:
+        if (!strncmp(hm17_sbuffer,"OK+Set:5",8)) {
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("SCAN OK"));
+#endif
+          hm17_sbclr();
+          hm17_result=HM17_SUCESS;
+        }
+        break;
+    case HM17_RESET:
+      if (!strncmp(hm17_sbuffer,"OK+RESET",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RESET OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_RENEW:
+      if (!strncmp(hm17_sbuffer,"OK+RENEW",8)) {
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RENEW OK"));
+#endif
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+      }
+      break;
+    case HM17_CON:
+      if (!strncmp(hm17_sbuffer,"OK+CONNA",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNA OK"));
+#endif
+        hm17_connecting=2;
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+CONNE",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNE ERROR"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+CONNF",8)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNF ERROR"));
+#endif
+        break;
+      }
+      if (hm17_connecting==2 && !strncmp(hm17_sbuffer,"OK+CONN",7)) {
+        hm17_sbclr();
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONN OK"));
+#endif
+        hm17_connecting=3;
+        hm17_sendcmd(HM17_TEST);
+        hm17_connecting=0;
+        break;
+      }
+      break;
+
+    case HM17_DISI:
+    case HM17_DISC:
+      if (!strncmp(hm17_sbuffer,"OK+DISCS",8)) {
+        hm17_sbclr();
+        hm17_result=1;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCS OK"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISIS",8)) {
+        hm17_sbclr();
+        hm17_result=1;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISIS OK"));
+#endif
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISCE",8)) {
+        hm17_sbclr();
+        hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCE OK"));
+#endif
+        hm17_scanning=0;
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+NAME:",8)) {
+        if (hm17_sbuffer[hm17_sindex-1]=='\n') {
+          hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) {
+            AddLog_P2(LOG_LEVEL_INFO, PSTR("NAME OK"));
+            AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+          }
+#endif
+          hm17_sbclr();
+        }
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DIS0:",8)) {
+        if (hm17_cmd==HM17_DISI) {
+#ifdef HM17_V110
+          goto hm17_v110;
+#endif
+        } else {
+          if (hm17_sindex==20) {
+            hm17_result=HM17_SUCESS;
+#ifdef IBEACON_DEBUG
+            if (hm17_debug) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+            }
+#endif
+            hm17_sbclr();
+          }
+        }
+        break;
+      }
+      if (!strncmp(hm17_sbuffer,"OK+DISC:",8)) {
+hm17_v110:
+        if (hm17_cmd==HM17_DISI) {
+          if (hm17_sindex==78) {
+#ifdef IBEACON_DEBUG
+            if (hm17_debug) {
+              AddLog_P2(LOG_LEVEL_INFO, PSTR("DISC: OK"));
+
+              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+            }
+#endif
+            memcpy(ib.FACID,&hm17_sbuffer[8],8);
+            memcpy(ib.UID,&hm17_sbuffer[8+8+1],32);
+            memcpy(ib.MAJOR,&hm17_sbuffer[8+8+1+32+1],4);
+            memcpy(ib.MINOR,&hm17_sbuffer[8+8+1+32+1+4],4);
+            memcpy(ib.PWR,&hm17_sbuffer[8+8+1+32+1+4+4],2);
+            memcpy(ib.MAC,&hm17_sbuffer[8+8+1+32+1+4+4+2+1],12);
+            memcpy(ib.RSSI,&hm17_sbuffer[8+8+1+32+1+4+4+2+1+12+1],4);
+
+            if (ibeacon_add(&ib)) {
+              ibeacon_mqtt(ib.MAC,ib.RSSI);
+            }
+            hm17_sbclr();
+            hm17_result=1;
+          }
+        } else {
+#ifdef IBEACON_DEBUG
+          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
+#endif
+        }
+        break;
+      }
+  }
+}
+
+void IBEACON_loop() {
+
+  if (!IBEACON_Serial) return;
+
+uint32_t difftime=millis()-hm17_lastms;
+
+  while (IBEACON_Serial->available()) {
+    hm17_lastms=millis();
+
+    if (hm17_sindex<HM17_BSIZ) {
+      hm17_sbuffer[hm17_sindex]=IBEACON_Serial->read();
+      hm17_sindex++;
+      hm17_decode();
+    } else {
+      hm17_sindex=0;
+      break;
+    }
+  }
+
+  if (hm17_cmd==99) {
+   if (hm17_sindex>=HM17_BSIZ-2 || (hm17_sindex && (difftime>100))) {
+     AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),hm17_sbuffer);
+     hm17_sbclr();
+   }
+  }
+
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_IBEACON[] PROGMEM =
+ "{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}";
+
+void IBEACON_Show(void) {
+char mac[14];
+char rssi[6];
+
+  for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
+    if (ibeacons[cnt].FLAGS) {
+      memcpy(mac,ibeacons[cnt].MAC,12);
+      mac[12]=0;
+      memcpy(rssi,ibeacons[cnt].RSSI,4);
+      rssi[4]=0;
+      WSContentSend_PD(HTTP_IBEACON,mac,rssi);
+    }
+  }
+
+}
+#endif
+# 485 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
+bool xsns52_cmd(void) {
+  bool serviced = true;
+  const char S_JSON_IBEACON[] = "{\"" D_CMND_SENSOR "%d\":%s:%d}";
+  const char S_JSON_IBEACON1[] = "{\"" D_CMND_SENSOR "%d\":%s:%s}";
+  uint16_t len=XdrvMailbox.data_len;
+  if (len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp>='0' && *cp<='8') {
+        hm17_sendcmd(*cp&7);
+        Response_P(S_JSON_IBEACON, XSNS_52,"hm17cmd",*cp&7);
+      } else if (*cp=='s') {
+        cp++;
+        len--;
+        while (*cp==' ') {
+          len--;
+          cp++;
+        }
+        IBEACON_Serial->write((uint8_t*)cp,len);
+        hm17_cmd=99;
+        Response_P(S_JSON_IBEACON1, XSNS_52,"hm17cmd",cp);
+      } else if (*cp=='u') {
+        cp++;
+        if (*cp) IB_UPDATE_TIME=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"uintv",IB_UPDATE_TIME);
+      } else if (*cp=='t') {
+        cp++;
+        if (*cp) IB_TIMEOUT_TIME=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"lintv",IB_TIMEOUT_TIME);
+      } else if (*cp=='c') {
+        for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) ibeacons[cnt].FLAGS=0;
+        Response_P(S_JSON_IBEACON1, XSNS_52,"clr list","");
+      }
+#ifdef IBEACON_DEBUG
+      else if (*cp=='d') {
+        cp++;
+        if (*cp) hm17_debug=atoi(cp);
+        Response_P(S_JSON_IBEACON, XSNS_52,"debug",hm17_debug);
+      }
+#endif
+  } else {
+    serviced=false;
+  }
+  return serviced;
+}
+
+#define D_CMND_IBEACON "IBEACON"
+
+bool ibeacon_cmd(void) {
+  ib_mac[0]=0;
+  int16_t rssi=0;
+  const char S_JSON_IBEACON[] = "{\"" D_CMND_IBEACON "_%s_RSSI\":%d}";
+  uint8_t cmd_len = strlen(D_CMND_IBEACON);
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_IBEACON), cmd_len)) {
+
+    rssi = XdrvMailbox.payload;
+    if (rssi==99) {
+      memcpy(ib_mac,XdrvMailbox.topic+cmd_len+1,12);
+      ib_mac[12]=0;
+      if (hm17_scanning) {
+
+        hm17_flag|=2;
+      } else {
+        ib_sendbeep();
+      }
+    }
+    Response_P(S_JSON_IBEACON,ib_mac,rssi);
+    return true;
+  }
+  return false;
+}
+
+void ib_sendbeep(void) {
+  hm17_flag=0;
+  hm17_sendcmd(HM17_CON);
+}
+
+void ibeacon_mqtt(const char *mac,const char *rssi) {
+  char s_mac[14];
+  char s_rssi[6];
+  memcpy(s_mac,mac,12);
+  s_mac[12]=0;
+  memcpy(s_rssi,rssi,4);
+  s_rssi[4]=0;
+  int16_t n_rssi=atoi(s_rssi);
+  ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi);
+  MqttPublishTeleSensor();
+}
+
+
+
+
+
+
+bool Xsns52(byte function)
+{
+  bool result = false;
+
+    switch (function) {
+      case FUNC_INIT:
+        IBEACON_Init();
+        break;
+      case FUNC_LOOP:
+        IBEACON_loop();
+        break;
+      case FUNC_EVERY_SECOND:
+        hm17_every_second();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_52 == XdrvMailbox.index) {
+          result = xsns52_cmd();
+        }
+        break;
+      case FUNC_COMMAND:
+        result=ibeacon_cmd();
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        if (hm17_found) IBEACON_Show();
+        break;
+#endif
+    }
+    return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+# 24 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+#ifdef USE_SML_M
+
+#define XSNS_53 53
+
+
+#define SML_BAUDRATE 9600
+# 45 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+#include <TasmotaSerial.h>
+
+
+#define SPECIAL_SS 
+
+
+
+
+
+#if MY_LANGUAGE==de-DE
+
+#define D_TPWRIN "Verbrauch"
+#define D_TPWROUT "Einspeisung"
+#define D_TPWRCURR "Aktueller Verbrauch"
+#define D_TPWRCURR1 "Verbrauch P1"
+#define D_TPWRCURR2 "Verbrauch P2"
+#define D_TPWRCURR3 "Verbrauch P3"
+#define D_Strom_L1 "Strom L1"
+#define D_Strom_L2 "Strom L2"
+#define D_Strom_L3 "Strom L3"
+#define D_Spannung_L1 "Spannung L1"
+#define D_Spannung_L2 "Spannung L2"
+#define D_Spannung_L3 "Spannung L3"
+#define D_METERNR "Zähler Nr"
+#define D_METERSID "Service ID"
+#define D_GasIN "Zählerstand"
+#define D_H2oIN "Zählerstand"
+#define D_StL1L2L3 "Ströme L1+L2+L3"
+#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
+
+#else
+
+#undef D_TPWRIN
+#undef D_TPWROUT
+#undef D_TPWRCURR
+#undef D_TPWRCURR1
+#undef D_TPWRCURR2
+#undef D_TPWRCURR3
+#undef D_Strom_L1
+#undef D_Strom_L2
+#undef D_Strom_L3
+#undef D_Spannung_L1
+#undef D_Spannung_L2
+#undef D_Spannung_L3
+#undef D_METERNR
+#undef D_METERSID
+#undef D_GasIN
+#undef D_H2oIN
+#undef D_StL1L2L3
+#undef D_SpL1L2L3
+
+#define D_TPWRIN "Total-In"
+#define D_TPWROUT "Total-Out"
+#define D_TPWRCURR "Current-In/Out"
+#define D_TPWRCURR1 "Current-In p1"
+#define D_TPWRCURR2 "Current-In p2"
+#define D_TPWRCURR3 "Current-In p3"
+#define D_Strom_L1 "Current L1"
+#define D_Strom_L2 "Current L2"
+#define D_Strom_L3 "Current L3"
+#define D_Spannung_L1 "Voltage L1"
+#define D_Spannung_L2 "Voltage L2"
+#define D_Spannung_L3 "Voltage L3"
+#define D_METERNR "Meter_number"
+#define D_METERSID "Service ID"
+#define D_GasIN "Counter"
+#define D_H2oIN "Counter"
+#define D_StL1L2L3 "Current L1+L2+L3"
+#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
+
+#endif
+
+
+
+#define DJ_TPWRIN "Total_in"
+#define DJ_TPWROUT "Total_out"
+#define DJ_TPWRCURR "Power_curr"
+#define DJ_TPWRCURR1 "Power_p1"
+#define DJ_TPWRCURR2 "Power_p2"
+#define DJ_TPWRCURR3 "Power_p3"
+#define DJ_CURR1 "Curr_p1"
+#define DJ_CURR2 "Curr_p2"
+#define DJ_CURR3 "Curr_p3"
+#define DJ_VOLT1 "Volt_p1"
+#define DJ_VOLT2 "Volt_p2"
+#define DJ_VOLT3 "Volt_p3"
+#define DJ_METERNR "Meter_number"
+#define DJ_METERSID "Meter_id"
+#define DJ_CSUM "Curr_summ"
+#define DJ_VAVG "Volt_avg"
+#define DJ_COUNTER "Count"
+
+struct METER_DESC {
+  uint8_t srcpin;
+  uint8_t type;
+  uint16_t flag;
+  int32_t params;
+  char prefix[8];
+  int8_t trxpin;
+  uint8_t tsecs;
+  char *txmem;
+  uint8_t index;
+  uint8_t max_index;
+};
+
+
+
+
+
+
+#define EHZ161_0 1
+#define EHZ161_1 2
+#define EHZ363 3
+#define EHZH 4
+#define EDL300 5
+#define Q3B 6
+#define COMBO3 7
+#define COMBO2 8
+#define COMBO3a 9
+#define Q3B_V1 10
+#define EHZ363_2 11
+#define COMBO3b 12
+#define WGS_COMBO 13
+#define EBZD_G 14
+
+
+#define METER EHZ161_1
+
+
+#if METER==EHZ161_0
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
+"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
+"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
+"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+
+
+#if METER==EHZ161_1
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZ363
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZH
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+
+
+#if METER==EDL300
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+#if METER==EBZD_G
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"strom",-1,1,0}};
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
+
+"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100600100ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+
+#if METER==Q3B
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
+#endif
+
+#if METER==COMBO3
+
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
+  [1]={14,'s',0,SML_BAUDRATE,"SML",-1,1,0},
+  [2]={4,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
+"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
+"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
+"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"2,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"3,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+#if METER==COMBO2
+
+#undef METERS_USED
+#define METERS_USED 2
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
+  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+
+"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+#if METER==COMBO3a
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
+  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0},
+  [2]={1,'o',0,SML_BAUDRATE,"OBIS3",-1,1,0}};
+
+
+const uint8_t meter[]=
+"1,=h --- Zähler Nr 1 ---|"
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"2,=h --- Zähler Nr 2 ---|"
+"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+"3,=h --- Zähler Nr 3 ---|"
+"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"3,=d 10 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+
+#endif
+
+
+
+#if METER==Q3B_V1
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+[0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,=d 1 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+
+#if METER==EHZ363_2
+#undef METERS_USED
+#define METERS_USED 1
+struct METER_DESC const meter_desc[METERS_USED]={
+[0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+
+"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+
+"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
+
+"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
+
+"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+
+"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
+#endif
+
+
+#if METER==COMBO3b
+#undef METERS_USED
+#define METERS_USED 3
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
+  [1]={14,'c',0,50,"Gas"},
+  [2]={1,'c',0,10,"Wasser"}};
+
+
+const uint8_t meter[]=
+"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
+"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
+"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
+"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
+
+
+"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",2|"
+
+"3,1-0:1.8.0*255(@100," D_H2oIN ",cbm," DJ_COUNTER ",2";
+#endif
+
+
+#if METER==WGS_COMBO
+#undef METERS_USED
+#define METERS_USED 3
+
+struct METER_DESC const meter_desc[METERS_USED]={
+  [0]={1,'c',0,10,"H20",-1,1,0},
+  [1]={4,'c',0,50,"GAS",-1,1,0},
+  [2]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
+
+const uint8_t meter[]=
+
+
+"1,1-0:1.8.0*255(@10000," D_H2oIN ",cbm," DJ_COUNTER ",4|"
+
+
+"2,=h==================|"
+"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",3|"
+
+"3,=h==================|"
+
+"3,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",3|"
+"3,=h==================|"
+
+"3,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",2|"
+"3,=h -------------------------------|"
+"3,=m 10+11+12 @100," D_StL1L2L3 ",A," DJ_CSUM ",2|"
+
+"3,=m 13+14+15/#3 @100," D_SpL1L2L3 ",V," DJ_VAVG ",2|"
+"3,=h==================|"
+
+"3,77070100240700ff@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",2|"
+
+"3,77070100380700ff@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",2|"
+
+"3,770701004c0700ff@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",2|"
+"3,=h -------------------------------|"
+
+"3,770701001f0700ff@100," D_Strom_L1 ",A," DJ_CURR1 ",2|"
+
+"3,77070100330700ff@100," D_Strom_L2 ",A," DJ_CURR2 ",2|"
+
+"3,77070100470700ff@100," D_Strom_L3 ",A," DJ_CURR3 ",2|"
+"3,=h -------------------------------|"
+
+"3,77070100200700ff@100," D_Spannung_L1 ",V," DJ_VOLT1 ",2|"
+
+"3,77070100340700ff@100," D_Spannung_L2 ",V," DJ_VOLT2 ",2|"
+
+"3,77070100480700ff@100," D_Spannung_L3 ",V," DJ_VOLT3 ",2|"
+"3,=h==================|"
+
+"3,77070100000009ff@#," D_METERSID ",," DJ_METERSID ",0|"
+"3,=h--------------------------------";
+#endif
+# 499 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+#define USE_SML_MEDIAN_FILTER 
+
+
+#ifndef SML_MAX_VARS
+#define SML_MAX_VARS 20
+#endif
+
+
+#define MAX_METERS 5
+double meter_vars[SML_MAX_VARS];
+
+#define MAX_DVARS MAX_METERS*2
+double dvalues[MAX_DVARS];
+uint32_t dtimes[MAX_DVARS];
+uint8_t meters_used;
+
+struct METER_DESC const *meter_desc_p;
+const uint8_t *meter_p;
+uint8_t meter_spos[MAX_METERS];
+
+
+TasmotaSerial *meter_ss[MAX_METERS];
+
+
+#define SML_BSIZ 48
+uint8_t smltbuf[MAX_METERS][SML_BSIZ];
+
+
+#define METER_ID_SIZE 24
+char meter_id[MAX_METERS][METER_ID_SIZE];
+
+#define EBUS_SYNC 0xaa
+#define EBUS_ESC 0xa9
+
+uint8_t sml_send_blocks;
+uint8_t sml_100ms_cnt;
+uint8_t sml_desc_cnt;
+
+#ifdef USE_SML_MEDIAN_FILTER
+
+#define MEDIAN_SIZE 5
+struct SML_MEDIAN_FILTER {
+double buffer[MEDIAN_SIZE];
+int8_t index;
+} sml_mf[SML_MAX_VARS];
+
+#ifndef FLT_MAX
+#define FLT_MAX 99999999
+#endif
+
+double sml_median_array(double *array,uint8_t len) {
+      uint8_t ind[len];
+      uint8_t mind=0,index=0,flg;
+      double min=FLT_MAX;
+
+      for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
+          for (uint8_t mcnt=0; mcnt<len; mcnt++) {
+              flg=0;
+              for (uint8_t icnt=0; icnt<index; icnt++) {
+                  if (ind[icnt]==mcnt) {
+                      flg=1;
+                  }
+              }
+              if (!flg) {
+                  if (array[mcnt]<min) {
+                      min=array[mcnt];
+                      mind=mcnt;
+                  }
+              }
+          }
+          ind[index]=mind;
+          index++;
+          min=FLT_MAX;
+      }
+      return array[ind[len/2]];
+  }
+
+
+
+double sml_median(struct SML_MEDIAN_FILTER* mf, double in) {
+
+
+  mf->buffer[mf->index]=in;
+  mf->index++;
+  if (mf->index>=MEDIAN_SIZE) mf->index=0;
+
+  return sml_median_array(mf->buffer,MEDIAN_SIZE);
+# 603 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+}
+#endif
+
+#ifdef ANALOG_OPTO_SENSOR
+
+uint8_t ads1115_up;
+
+
+#define SAMPLE_BIT (0x8000)
+
+#define ADS1115_COMP_QUEUE_SHIFT 0
+#define ADS1115_COMP_LATCH_SHIFT 2
+#define ADS1115_COMP_POLARITY_SHIFT 3
+#define ADS1115_COMP_MODE_SHIFT 4
+#define ADS1115_DATA_RATE_SHIFT 5
+#define ADS1115_MODE_SHIFT 8
+#define ADS1115_PGA_SHIFT 9
+#define ADS1115_MUX_SHIFT 12
+
+enum ads1115_comp_queue {
+ ADS1115_COMP_QUEUE_AFTER_ONE = 0,
+ ADS1115_COMP_QUEUE_AFTER_TWO = 0x1 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_AFTER_FOUR = 0x2 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_DISABLE = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
+ ADS1115_COMP_QUEUE_MASK = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
+};
+
+enum ads1115_comp_latch {
+ ADS1115_COMP_LATCH_NO = 0,
+ ADS1115_COMP_LATCH_YES = 1 << ADS1115_COMP_LATCH_SHIFT,
+ ADS1115_COMP_LATCH_MASK = 1 << ADS1115_COMP_LATCH_SHIFT,
+};
+
+enum ads1115_comp_polarity {
+ ADS1115_COMP_POLARITY_ACTIVE_LOW = 0,
+ ADS1115_COMP_POLARITY_ACTIVE_HIGH = 1 << ADS1115_COMP_POLARITY_SHIFT,
+ ADS1115_COMP_POLARITY_MASK = 1 << ADS1115_COMP_POLARITY_SHIFT,
+};
+
+enum ads1115_comp_mode {
+ ADS1115_COMP_MODE_WINDOW = 0,
+ ADS1115_COMP_MODE_HYSTERESIS = 1 << ADS1115_COMP_MODE_SHIFT,
+ ADS1115_COMP_MODE_MASK = 1 << ADS1115_COMP_MODE_SHIFT,
+};
+
+enum ads1115_data_rate {
+ ADS1115_DATA_RATE_8_SPS = 0,
+ ADS1115_DATA_RATE_16_SPS = 0x1 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_32_SPS = 0x2 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_64_SPS = 0x3 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_128_SPS = 0x4 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_250_SPS = 0x5 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_475_SPS = 0x6 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_860_SPS = 0x7 << ADS1115_DATA_RATE_SHIFT,
+ ADS1115_DATA_RATE_MASK = 0x7 << ADS1115_DATA_RATE_SHIFT,
+};
+
+enum ads1115_mode {
+ ADS1115_MODE_CONTINUOUS = 0,
+ ADS1115_MODE_SINGLE_SHOT = 1 << ADS1115_MODE_SHIFT,
+ ADS1115_MODE_MASK = 1 << ADS1115_MODE_SHIFT,
+};
+
+enum ads1115_pga {
+ ADS1115_PGA_TWO_THIRDS = 0,
+ ADS1115_PGA_ONE = 0x1 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_TWO = 0x2 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_FOUR = 0x3 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_EIGHT = 0x4 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_SIXTEEN = 0x5 << ADS1115_PGA_SHIFT,
+ ADS1115_PGA_MASK = 0x7 << ADS1115_PGA_SHIFT,
+};
+
+
+enum ads1115_mux {
+ ADS1115_MUX_DIFF_AIN0_AIN1 = 0,
+ ADS1115_MUX_DIFF_AIN0_AIN3 = 0x1 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_DIFF_AIN1_AIN3 = 0x2 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_DIFF_AIN2_AIN3 = 0x3 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN0 = 0x4 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN1 = 0x5 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN2 = 0x6 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_GND_AIN3 = 0x7 << ADS1115_MUX_SHIFT,
+ ADS1115_MUX_MASK = 0x7 << ADS1115_MUX_SHIFT,
+};
+
+class ADS1115 {
+public:
+ ADS1115(uint8_t address = 0x48);
+
+ void begin();
+ uint8_t trigger_sample();
+ uint8_t reset();
+ bool is_sample_in_progress();
+ int16_t read_sample();
+ float sample_to_float(int16_t val);
+ float read_sample_float();
+
+ void set_comp_queue(enum ads1115_comp_queue val) { set_config(val, ADS1115_COMP_QUEUE_MASK); }
+ void set_comp_latching(enum ads1115_comp_latch val) { set_config(val, ADS1115_COMP_LATCH_MASK); }
+ void set_comp_polarity(enum ads1115_comp_polarity val) { set_config(val, ADS1115_COMP_POLARITY_MASK); }
+ void set_comp_mode(enum ads1115_comp_mode val) { set_config(val, ADS1115_COMP_MODE_MASK); }
+ void set_data_rate(enum ads1115_data_rate val) { set_config(val, ADS1115_DATA_RATE_MASK); }
+ void set_mode(enum ads1115_mode val) { set_config(val, ADS1115_MODE_MASK); }
+ void set_pga(enum ads1115_pga val) { set_config(val, ADS1115_PGA_MASK); m_voltage_range = val >> ADS1115_PGA_SHIFT; }
+ void set_mux(enum ads1115_mux val) { set_config(val, ADS1115_MUX_MASK); }
+
+private:
+ void set_config(uint16_t val, uint16_t mask) {
+  m_config = (m_config & ~mask) | val;
+ }
+
+ uint8_t write_register(uint8_t reg, uint16_t val);
+ uint16_t read_register(uint8_t reg);
+
+ uint8_t m_address;
+ uint16_t m_config;
+ int m_voltage_range;
+};
+
+
+enum ads1115_register {
+ ADS1115_REGISTER_CONVERSION = 0,
+ ADS1115_REGISTER_CONFIG = 1,
+ ADS1115_REGISTER_LOW_THRESH = 2,
+ ADS1115_REGISTER_HIGH_THRESH = 3,
+};
+
+#define FACTOR 32768.0
+static float ranges[] = { 6.144 / FACTOR, 4.096 / FACTOR, 2.048 / FACTOR, 1.024 / FACTOR, 0.512 / FACTOR, 0.256 / FACTOR};
+
+ADS1115::ADS1115(uint8_t address)
+{
+        m_address = address;
+        m_config = ADS1115_COMP_QUEUE_AFTER_ONE |
+                   ADS1115_COMP_LATCH_NO |
+                   ADS1115_COMP_POLARITY_ACTIVE_LOW |
+                   ADS1115_COMP_MODE_WINDOW |
+                   ADS1115_DATA_RATE_128_SPS |
+                   ADS1115_MODE_SINGLE_SHOT |
+                   ADS1115_MUX_GND_AIN0;
+        set_pga(ADS1115_PGA_ONE);
+}
+
+uint8_t ADS1115::write_register(uint8_t reg, uint16_t val)
+{
+        Wire.beginTransmission(m_address);
+        Wire.write(reg);
+        Wire.write(val>>8);
+        Wire.write(val & 0xFF);
+        return Wire.endTransmission();
+}
+
+uint16_t ADS1115::read_register(uint8_t reg)
+{
+        Wire.beginTransmission(m_address);
+        Wire.write(reg);
+        Wire.endTransmission();
+
+        uint8_t result = Wire.requestFrom((int)m_address, 2, 1);
+        if (result != 2) {
+          return 0;
+        }
+
+        uint16_t val;
+
+        val = Wire.read() << 8;
+        val |= Wire.read();
+        return val;
+}
+
+void ADS1115::begin()
+{
+        Wire.begin();
+}
+
+uint8_t ADS1115::trigger_sample()
+{
+        return write_register(ADS1115_REGISTER_CONFIG, m_config | SAMPLE_BIT);
+}
+
+uint8_t ADS1115::reset()
+{
+ Wire.beginTransmission(0);
+ Wire.write(0x6);
+ return Wire.endTransmission();
+}
+
+bool ADS1115::is_sample_in_progress()
+{
+ uint16_t val = read_register(ADS1115_REGISTER_CONFIG);
+ return (val & SAMPLE_BIT) == 0;
+}
+
+int16_t ADS1115::read_sample()
+{
+        return read_register(ADS1115_REGISTER_CONVERSION);
+}
+
+float ADS1115::sample_to_float(int16_t val)
+{
+ return val * ranges[m_voltage_range];
+}
+
+float ADS1115::read_sample_float()
+{
+ return sample_to_float(read_sample());
+}
+
+ADS1115 adc;
+
+void ADS1115_init(void) {
+
+  ads1115_up=0;
+  if (!i2c_flg) return;
+
+  adc.begin();
+  adc.set_data_rate(ADS1115_DATA_RATE_128_SPS);
+  adc.set_mode(ADS1115_MODE_CONTINUOUS);
+  adc.set_mux(ADS1115_MUX_DIFF_AIN0_AIN3);
+  adc.set_pga(ADS1115_PGA_TWO);
+
+  int16_t val = adc.read_sample();
+  ads1115_up=1;
+}
+
+#endif
+
+char sml_start;
+uint8_t dump2log=0;
+
+#define SML_SAVAILABLE Serial_available()
+#define SML_SREAD Serial_read()
+#define SML_SPEAK Serial_peek()
+
+bool Serial_available() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->available();
+}
+
+uint8_t Serial_read() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->read();
+}
+
+uint8_t Serial_peek() {
+  uint8_t num=dump2log&7;
+  if (num<1 || num>meters_used) num=1;
+  return meter_ss[num-1]->peek();
+}
+
+uint8_t sml_logindex;
+
+void Dump2log(void) {
+
+int16_t index=0,hcnt=0;
+uint32_t d_lastms;
+uint8_t dchars[16];
+
+
+
+  if (dump2log&8) {
+
+    while (SML_SAVAILABLE) {
+      log_data[index]=':';
+      index++;
+      log_data[index]=' ';
+      index++;
+      d_lastms=millis();
+      while ((millis()-d_lastms)<40) {
+        if (SML_SAVAILABLE) {
+          uint8_t c=SML_SREAD;
+          sprintf(&log_data[index],"%02x ",c);
+          dchars[hcnt]=c;
+          index+=3;
+          hcnt++;
+          if (hcnt>15) {
+
+            log_data[index]='=';
+            index++;
+            log_data[index]='>';
+            index++;
+            log_data[index]=' ';
+            index++;
+            for (uint8_t ccnt=0; ccnt<16; ccnt++) {
+              if (isprint(dchars[ccnt])) {
+                log_data[index]=dchars[ccnt];
+              } else {
+                log_data[index]=' ';
+              }
+              index++;
+            }
+            break;
+          }
+        }
+      }
+      if (index>0) {
+        log_data[index]=0;
+        AddLog(LOG_LEVEL_INFO);
+        index=0;
+        hcnt=0;
+      }
+    }
+  } else {
+    if (meter_desc_p[(dump2log&7)-1].type=='o') {
+
+      while (SML_SAVAILABLE) {
+        char c=SML_SREAD&0x7f;
+        if (c=='\n' || c=='\r') {
+          log_data[sml_logindex]=0;
+          AddLog(LOG_LEVEL_INFO);
+          sml_logindex=2;
+          log_data[0]=':';
+          log_data[1]=' ';
+          break;
+        }
+        log_data[sml_logindex]=c;
+        if (sml_logindex<sizeof(log_data)-2) {
+          sml_logindex++;
+        }
+      }
+    } else {
+
+      index=0;
+      log_data[index]=':';
+      index++;
+      log_data[index]=' ';
+      index++;
+      d_lastms=millis();
+      while ((millis()-d_lastms)<40) {
+        if (SML_SAVAILABLE) {
+          unsigned char c;
+          if (meter_desc_p[(dump2log&7)-1].type=='e') {
+
+            c=SML_SREAD;
+            sprintf(&log_data[index],"%02x ",c);
+            index+=3;
+            if (c==EBUS_SYNC) break;
+          } else {
+
+            if (sml_start==0x77) {
+              sml_start=0;
+            } else {
+              c=SML_SPEAK;
+              if (c==0x77) {
+                sml_start=c;
+                break;
+              }
+            }
+            c=SML_SREAD;
+            sprintf(&log_data[index],"%02x ",c);
+            index+=3;
+          }
+        }
+      }
+      if (index>2) {
+        log_data[index]=0;
+        AddLog(LOG_LEVEL_INFO);
+      }
+    }
+  }
+}
+
+
+uint8_t *skip_sml(uint8_t *cp,int16_t *res) {
+    uint8_t len,len1,type;
+    len=*cp&0xf;
+    type=*cp&0x70;
+    if (type==0x70) {
+
+
+        cp++;
+        while (len--) {
+            len1=*cp&0x0f;
+            cp+=len1;
+        }
+         *res=0;
+    } else {
+
+        *res=(signed char)*(cp+1);
+        cp+=len;
+    }
+    return cp;
+}
+
+
+
+double sml_getvalue(unsigned char *cp,uint8_t index) {
+uint8_t len,unit,type;
+int16_t scaler,result;
+int64_t value;
+double dval;
+
+
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+
+  cp=skip_sml(cp,&result);
+  scaler=result;
+
+  type=*cp&0x70;
+  len=*cp&0x0f;
+  cp++;
+    if (type==0x50 || type==0x60) {
+
+        uint64_t uvalue=0;
+        uint8_t nlen=len;
+        while (--nlen) {
+            uvalue<<=8;
+            uvalue|=*cp++;
+        }
+        if (type==0x50) {
+
+            switch (len-1) {
+                case 1:
+
+                    value=(signed char)uvalue;
+                    break;
+                case 2:
+
+#ifdef DWS74_BUG
+                    if (scaler==-2) {
+                      value=(uint32_t)uvalue;
+                    } else {
+                      value=(int16_t)uvalue;
+                    }
+#else
+                    value=(int16_t)uvalue;
+#endif
+                    break;
+                case 3:
+                case 4:
+
+                    value=(int32_t)uvalue;
+                    break;
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+
+                    value=(int64_t)uvalue;
+                    break;
+            }
+        } else {
+
+            value=uvalue;
+        }
+
+    } else {
+        if (!(type&0xf0)) {
+
+
+
+            if (len==9) {
+
+                cp++;
+                uint32_t s1,s2;
+                s1=*cp<<16|*(cp+1)<<8|*(cp+2);
+                cp+=4;
+                s2=*cp<<16|*(cp+1)<<8|*(cp+2);
+                sprintf(&meter_id[index][0],"%u-%u",s1,s2);
+            } else {
+
+                char *str=&meter_id[index][0];
+                for (type=0; type<len-1; type++) {
+                    sprintf(str,"%02x",*cp++);
+                    str+=2;
+                }
+            }
+            value=0;
+        } else {
+            value=999999;
+            scaler=0;
+        }
+    }
+    dval=value;
+    if (scaler==-1) {
+      dval/=10;
+    } else if (scaler==-2) {
+      dval/=100;
+    } else if (scaler==-3) {
+      dval/=1000;
+    } else if (scaler==-4) {
+      dval/=10000;
+    } else if (scaler==1) {
+      dval*=10;
+    } else if (scaler==2) {
+      dval*=100;
+    } else if (scaler==3) {
+      dval*=1000;
+    }
+    return dval;
+}
+
+uint8_t hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    chr=toupper(chr);
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+  }
+  return rVal;
+}
+
+uint8_t sb_counter;
+
+
+double CharToDouble(const char *str)
+{
+
+  char strbuf[24];
+
+  strlcpy(strbuf, str, sizeof(strbuf));
+  char *pt = strbuf;
+  while ((*pt != '\0') && isblank(*pt)) { pt++; }
+
+  signed char sign = 1;
+  if (*pt == '-') { sign = -1; }
+  if (*pt == '-' || *pt=='+') { pt++; }
+
+  double left = 0;
+  if (*pt != '.') {
+    left = atoi(pt);
+    while (isdigit(*pt)) { pt++; }
+  }
+
+  double right = 0;
+  if (*pt == '.') {
+    pt++;
+    right = atoi(pt);
+    while (isdigit(*pt)) {
+      pt++;
+      right /= 10.0;
+    }
+  }
+
+  double result = left + right;
+  if (sign < 0) {
+    return -result;
+  }
+  return result;
+}
+
+
+
+void ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
+    short count,count1;
+    for (count=0; count<len; count++) {
+        if (ebus_buffer[count]==EBUS_ESC) {
+
+            ebus_buffer[count]+=ebus_buffer[count+1];
+
+            count++;
+            for (count1=count; count1<len; count1++) {
+                ebus_buffer[count1]=ebus_buffer[count1+1];
+            }
+        }
+    }
+
+}
+
+uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) {
+ uint8_t crc;
+ uint8_t polynom;
+ int i;
+
+ crc = crc_init;
+ for (i = 0; i < 8; i++) {
+  if (crc & 0x80) {
+   polynom = (uint8_t) 0x9B;
+  }
+  else {
+   polynom = (uint8_t) 0;
+  }
+  crc = (uint8_t)((crc & ~0x80) << 1);
+  if (data & 0x80) {
+   crc = (uint8_t)(crc | 1) ;
+  }
+  crc = (uint8_t)(crc ^ polynom);
+  data = (uint8_t)(data << 1);
+ }
+ return (crc);
+}
+
+
+uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen ) {
+ uint16_t i;
+ uint8_t Crc = 0;
+ for(i = 0 ; i < DataLen ; ++i, ++Data ) {
+      Crc = ebus_crc8( *Data, Crc );
+   }
+   return Crc;
+}
+
+void sml_empty_receiver(uint32_t meters) {
+  while (meter_ss[meters]->available()) {
+    meter_ss[meters]->read();
+  }
+}
+
+
+void sml_shift_in(uint32_t meters,uint32_t shard) {
+  uint32_t count;
+  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') {
+
+    for (count=0; count<SML_BSIZ-1; count++) {
+      smltbuf[meters][count]=smltbuf[meters][count+1];
+    }
+  }
+  uint8_t iob=(uint8_t)meter_ss[meters]->read();
+
+  if (meter_desc_p[meters].type=='o') {
+    smltbuf[meters][SML_BSIZ-1]=iob&0x7f;
+  } else if (meter_desc_p[meters].type=='s') {
+    smltbuf[meters][SML_BSIZ-1]=iob;
+  } else if (meter_desc_p[meters].type=='r') {
+    smltbuf[meters][SML_BSIZ-1]=iob;
+  } else if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M') {
+    smltbuf[meters][meter_spos[meters]] = iob;
+    meter_spos[meters]++;
+    if (meter_spos[meters]>=9) {
+      SML_Decode(meters);
+      sml_empty_receiver(meters);
+      meter_spos[meters]=0;
+    }
+  } else if (meter_desc_p[meters].type=='p') {
+    smltbuf[meters][meter_spos[meters]] = iob;
+    meter_spos[meters]++;
+    if (meter_spos[meters]>=7) {
+      SML_Decode(meters);
+      sml_empty_receiver(meters);
+      meter_spos[meters]=0;
+    }
+  } else {
+    if (iob==EBUS_SYNC) {
+
+
+      if (meter_spos[meters]>4+5) {
+
+        uint8_t tlen=smltbuf[meters][4]+5;
+
+        if (smltbuf[meters][tlen]=ebus_CalculateCRC(smltbuf[meters],tlen)) {
+            ebus_esc(smltbuf[meters],tlen);
+            SML_Decode(meters);
+        } else {
+
+
+        }
+      }
+      meter_spos[meters]=0;
+      return;
+    }
+  smltbuf[meters][meter_spos[meters]] = iob;
+  meter_spos[meters]++;
+  if (meter_spos[meters]>=SML_BSIZ) {
+   meter_spos[meters]=0;
+  }
+  }
+  sb_counter++;
+  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') SML_Decode(meters);
+}
+
+
+
+void SML_Poll(void) {
+uint32_t meters;
+
+    for (meters=0; meters<meters_used; meters++) {
+      if (meter_desc_p[meters].type!='c') {
+
+        while (meter_ss[meters]->available()) {
+          sml_shift_in(meters,0);
+        }
+      }
+    }
+}
+
+
+void SML_Decode(uint8_t index) {
+  const char *mp=(const char*)meter_p;
+  int8_t mindex;
+  uint8_t *cp;
+  uint8_t dindex=0,vindex=0;
+  delay(0);
+  while (mp != NULL) {
+
+
+
+    mindex=((*mp)&7)-1;
+
+    if (mindex<0 || mindex>=meters_used) mindex=0;
+    mp+=2;
+    if (*mp=='=' && *(mp+1)=='h') {
+      mp = strchr(mp, '|');
+      if (mp) mp++;
+      continue;
+    }
+
+    if (index!=mindex) goto nextsect;
+
+
+    cp=&smltbuf[mindex][0];
+
+
+    if (*mp=='=') {
+
+      mp++;
+
+      if (*mp=='m' && !sb_counter) {
+
+
+        mp++;
+        while (*mp==' ') mp++;
+
+        double dvar;
+        uint8_t opr;
+        uint32_t ind;
+        ind=atoi(mp);
+        while (*mp>='0' && *mp<='9') mp++;
+        if (ind<1 || ind>SML_MAX_VARS) ind=1;
+        dvar=meter_vars[ind-1];
+        for (uint8_t p=0;p<5;p++) {
+          if (*mp=='@') {
+
+            meter_vars[vindex]=dvar;
+            mp++;
+            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            break;
+          }
+          opr=*mp;
+          mp++;
+          uint8_t iflg=0;
+          if (*mp=='#') {
+            iflg=1;
+            mp++;
+          }
+          ind=atoi(mp);
+          while (*mp>='0' && *mp<='9') mp++;
+          if (ind<1 || ind>SML_MAX_VARS) ind=1;
+          switch (opr) {
+              case '+':
+                if (iflg) dvar+=ind;
+                else dvar+=meter_vars[ind-1];
+                break;
+              case '-':
+                if (iflg) dvar-=ind;
+                else dvar-=meter_vars[ind-1];
+                break;
+              case '*':
+                if (iflg) dvar*=ind;
+                else dvar*=meter_vars[ind-1];
+                break;
+              case '/':
+                if (iflg) dvar/=ind;
+                else dvar/=meter_vars[ind-1];
+                break;
+          }
+          while (*mp==' ') mp++;
+          if (*mp=='@') {
+
+            meter_vars[vindex]=dvar;
+            mp++;
+            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            break;
+          }
+        }
+      } else if (*mp=='d') {
+
+        if (dindex<MAX_DVARS) {
+
+          mp++;
+          while (*mp==' ') mp++;
+          uint8_t ind=atoi(mp);
+          while (*mp>='0' && *mp<='9') mp++;
+          if (ind<1 || ind>SML_MAX_VARS) ind=1;
+          uint32_t delay=atoi(mp)*1000;
+          uint32_t dtime=millis()-dtimes[dindex];
+          if (dtime>delay) {
+
+            dtimes[dindex]=millis();
+            double vdiff = meter_vars[ind-1]-dvalues[dindex];
+            dvalues[dindex]=meter_vars[ind-1];
+            meter_vars[vindex]=(double)360000.0*vdiff/((double)dtime/10000.0);
+
+            mp=strchr(mp,'@');
+            if (mp) {
+              mp++;
+              SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+            }
+          }
+          dindex++;
+        }
+      } else if (*mp=='h') {
+
+        mp = strchr(mp, '|');
+        if (mp) mp++;
+        continue;
+      }
+    } else {
+
+      uint8_t found=1;
+      uint32_t ebus_dval=99;
+      float mbus_dval=99;
+      while (*mp!='@') {
+        if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
+          if (*mp++!=*cp++) {
+            found=0;
+          }
+        } else {
+          if (meter_desc_p[mindex].type=='s') {
+
+            uint8_t val = hexnibble(*mp++) << 4;
+            val |= hexnibble(*mp++);
+            if (val!=*cp++) {
+              found=0;
+            }
+          } else {
+
+
+            if (*mp=='x' && *(mp+1)=='x') {
+
+              mp+=2;
+              cp++;
+            } else if (!strncmp(mp,"UUuuUUuu",8)) {
+              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              ebus_dval=val;
+              mbus_dval=val;
+              mp+=8;
+              cp+=4;
+            } else if (*mp=='U' && *(mp+1)=='U' && *(mp+2)=='u' && *(mp+3)=='u'){
+              uint16_t val = cp[1]|(cp[0]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (!strncmp(mp,"SSssSSss",8)) {
+              int32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              ebus_dval=val;
+              mbus_dval=val;
+              mp+=8;
+              cp+=4;
+            } else if (*mp=='u' && *(mp+1)=='u' && *(mp+2)=='U' && *(mp+3)=='U'){
+              uint16_t val = cp[0]|(cp[1]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (*mp=='u' && *(mp+1)=='u') {
+              uint8_t val = *cp++;
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=2;
+            } else if (*mp=='s' && *(mp+1)=='s' && *(mp+2)=='S' && *(mp+3)=='S') {
+              int16_t val = *cp|(*(cp+1)<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            } else if (*mp=='S' && *(mp+1)=='S' && *(mp+2)=='s' && *(mp+3)=='s') {
+              int16_t val = cp[1]|(cp[0]<<8);
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=4;
+              cp+=2;
+            }
+            else if (*mp=='s' && *(mp+1)=='s') {
+              int8_t val = *cp++;
+              mbus_dval=val;
+              ebus_dval=val;
+              mp+=2;
+            }
+            else if (!strncmp(mp,"ffffffff",8)) {
+              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
+              float *fp=(float*)&val;
+              ebus_dval=*fp;
+              mbus_dval=*fp;
+              mp+=8;
+              cp+=4;
+            }
+            else if (!strncmp(mp,"FFffFFff",8)) {
+
+              uint32_t val= (cp[1]<<0)|(cp[0]<<8)|(cp[3]<<16)|(cp[2]<<24);
+              float *fp=(float*)&val;
+              ebus_dval=*fp;
+              mbus_dval=*fp;
+              mp+=8;
+              cp+=4;
+            }
+            else if (!strncmp(mp,"eeeeee",6)) {
+              uint32_t val=(cp[0]<<16)|(cp[1]<<8)|(cp[2]<<0);
+              mbus_dval=val;
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"vvvvvv",6)) {
+              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/10.0);
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"cccccc",6)) {
+              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/100.0);
+              mp+=6;
+              cp+=3;
+            }
+            else if (!strncmp(mp,"pppp",4)) {
+              mbus_dval=(float)((cp[0]<<8)|cp[1]);
+              mp+=4;
+              cp+=2;
+            }
+            else {
+              uint8_t val = hexnibble(*mp++) << 4;
+              val |= hexnibble(*mp++);
+              if (val!=*cp++) {
+                found=0;
+              }
+            }
+          }
+        }
+      }
+      if (found) {
+
+        mp++;
+        if (*mp=='#') {
+
+          mp++;
+          if (meter_desc_p[mindex].type=='o') {
+            for (uint8_t p=0;p<METER_ID_SIZE;p++) {
+              if (*cp==*mp) {
+                meter_id[mindex][p]=0;
+                break;
+              }
+              meter_id[mindex][p]=*cp++;
+            }
+          } else {
+            sml_getvalue(cp,mindex);
+          }
+        } else {
+          double dval;
+          if (meter_desc_p[mindex].type!='e' && meter_desc_p[mindex].type!='r' && meter_desc_p[mindex].type!='m' && meter_desc_p[mindex].type!='M' && meter_desc_p[mindex].type!='p') {
+
+            if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
+              dval=CharToDouble((char*)cp);
+            } else {
+              dval=sml_getvalue(cp,mindex);
+            }
+          } else {
+
+            if (*mp=='b') {
+              mp++;
+              uint8_t shift=*mp&7;
+              ebus_dval>>=shift;
+              ebus_dval&=1;
+              mp+=2;
+            }
+            if (*mp=='i') {
+
+              mp++;
+              uint8_t mb_index=strtol((char*)mp,(char**)&mp,10);
+              if (mb_index!=meter_desc_p[mindex].index) {
+                goto nextsect;
+              }
+              uint16_t crc = MBUS_calculateCRC(&smltbuf[mindex][0],7);
+              if (lowByte(crc)!=smltbuf[mindex][7]) goto nextsect;
+              if (highByte(crc)!=smltbuf[mindex][8]) goto nextsect;
+              dval=mbus_dval;
+
+              mp++;
+            } else {
+              if (meter_desc_p[mindex].type=='p') {
+                uint8_t crc = SML_PzemCrc(&smltbuf[mindex][0],6);
+                if (crc!=smltbuf[mindex][6]) goto nextsect;
+                dval=mbus_dval;
+              } else {
+                dval=ebus_dval;
+              }
+            }
+
+          }
+#ifdef USE_SML_MEDIAN_FILTER
+          if (meter_desc_p[mindex].flag&16) {
+            meter_vars[vindex]=sml_median(&sml_mf[vindex],dval);
+          } else {
+            meter_vars[vindex]=dval;
+          }
+#else
+          meter_vars[vindex]=dval;
+#endif
+
+
+          double fac=CharToDouble((char*)mp);
+          meter_vars[vindex]/=fac;
+          SML_Immediate_MQTT((const char*)mp,vindex,mindex);
+        }
+      }
+    }
+nextsect:
+
+    if (vindex<SML_MAX_VARS-1) {
+      vindex++;
+    }
+    mp = strchr(mp, '|');
+    if (mp) mp++;
+  }
+}
+
+
+void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
+  char tpowstr[32];
+  char jname[24];
+
+
+  char *cp=strchr(mp,',');
+  if (cp) {
+    cp++;
+
+    cp=strchr(cp,',');
+    if (cp) {
+      cp++;
+
+      cp=strchr(cp,',');
+      if (cp) {
+        cp++;
+
+        for (uint8_t count=0;count<sizeof(jname);count++) {
+          if (*cp==',') {
+            jname[count]=0;
+            break;
+          }
+          jname[count]=*cp++;
+        }
+        cp++;
+        uint8_t dp=atoi(cp);
+        if (dp&0x10) {
+
+          dtostrfd(meter_vars[index],dp&0xf,tpowstr);
+          ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr);
+          MqttPublishTeleSensor();
+        }
+      }
+    }
+  }
+}
+
+
+void SML_Show(boolean json) {
+  int8_t count,mindex,cindex=0;
+  char tpowstr[32];
+  char name[24];
+  char unit[8];
+  char jname[24];
+  int8_t index=0,mid=0;
+  char *mp=(char*)meter_p;
+  char *cp;
+
+
+
+    int8_t lastmind=((*mp)&7)-1;
+    if (lastmind<0 || lastmind>=meters_used) lastmind=0;
+    while (mp != NULL) {
+
+        mindex=((*mp)&7)-1;
+        if (mindex<0 || mindex>=meters_used) mindex=0;
+        mp+=2;
+        if (*mp=='=' && *(mp+1)=='h') {
+          mp+=2;
+
+          if (json) {
+            mp = strchr(mp, '|');
+            if (mp) mp++;
+            continue;
+          }
+
+          uint8_t i;
+          for (i=0;i<sizeof(tpowstr)-2;i++) {
+            if (*mp=='|' || *mp==0) break;
+            tpowstr[i]=*mp++;
+          }
+          tpowstr[i]=0;
+
+
+          WSContentSend_PD(PSTR("{s}%s{e}"),tpowstr);
+
+          mp--;
+          mp = strchr(mp, '|');
+          if (mp) mp++;
+          continue;
+        }
+
+        cp=strchr(mp,'@');
+        if (cp) {
+          cp++;
+          if (*cp=='#') {
+
+            sprintf(tpowstr,"\"%s\"",&meter_id[mindex][0]);
+            mid=1;
+          } else {
+            mid=0;
+          }
+
+          cp=strchr(cp,',');
+          if (cp) {
+
+            cp++;
+            for (count=0;count<sizeof(name);count++) {
+              if (*cp==',') {
+                name[count]=0;
+                break;
+              }
+              name[count]=*cp++;
+            }
+            cp++;
+
+            for (count=0;count<sizeof(unit);count++) {
+              if (*cp==',') {
+                unit[count]=0;
+                break;
+              }
+              unit[count]=*cp++;
+            }
+            cp++;
+
+            for (count=0;count<sizeof(jname);count++) {
+              if (*cp==',') {
+                jname[count]=0;
+                break;
+              }
+              jname[count]=*cp++;
+            }
+
+            cp++;
+
+            if (!mid) {
+              uint8_t dp=atoi(cp)&0xf;
+              dtostrfd(meter_vars[index],dp,tpowstr);
+            }
+
+            if (json) {
+
+              if (index==0) {
+
+                ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+              }
+              else {
+                if (lastmind!=mindex) {
+
+
+                  ResponseAppend_P(PSTR("}"));
+
+
+                  ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
+                  lastmind=mindex;
+                } else {
+
+                  ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
+                }
+              }
+            } else {
+
+
+              WSContentSend_PD(PSTR("{s}%s %s: {m}%s %s{e}"),meter_desc_p[mindex].prefix,name,tpowstr,unit);
+            }
+          }
+        }
+        if (index<SML_MAX_VARS-1) {
+          index++;
+        }
+
+        mp = strchr(cp, '|');
+        if (mp) mp++;
+    }
+    if (json) {
+
+
+     ResponseAppend_P(PSTR("}"));
+   } else {
+
+   }
+# 1802 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+}
+
+struct SML_COUNTER {
+  uint8_t sml_cnt_debounce;
+  uint8_t sml_cnt_old_state;
+  uint32_t sml_cnt_last_ts;
+  uint32_t sml_counter_ltime;
+  uint16_t sml_debounce;
+
+#ifdef ANALOG_OPTO_SENSOR
+  int16_t ana_curr;
+  int16_t ana_max;
+  int16_t ana_min;
+  int16_t ana_cmpl;
+  int16_t ana_cmph;
+#endif
+} sml_counters[MAX_COUNTERS];
+
+
+#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
+void SML_CounterUpd(uint8_t index) ICACHE_RAM_ATTR;
+void SML_CounterUpd1(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd2(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd3(void) ICACHE_RAM_ATTR;
+void SML_CounterUpd4(void) ICACHE_RAM_ATTR;
+#endif
+
+void SML_CounterUpd(uint8_t index) {
+
+  uint8_t level=digitalRead(meter_desc_p[sml_counters[index].sml_cnt_old_state].srcpin);
+  if (!level) {
+
+    uint32_t ltime=millis()-sml_counters[index].sml_counter_ltime;
+    sml_counters[index].sml_counter_ltime=millis();
+    if (ltime>sml_counters[index].sml_debounce) {
+      RtcSettings.pulse_counter[index]++;
+      InjektCounterValue(sml_counters[index].sml_cnt_old_state,RtcSettings.pulse_counter[index]);
+    }
+  } else {
+
+    sml_counters[index].sml_counter_ltime=millis();
+  }
+}
+
+void SML_CounterUpd1(void) {
+  SML_CounterUpd(0);
+}
+
+void SML_CounterUpd2(void) {
+  SML_CounterUpd(1);
+}
+
+void SML_CounterUpd3(void) {
+  SML_CounterUpd(2);
+}
+
+void SML_CounterUpd4(void) {
+  SML_CounterUpd(3);
+}
+
+#ifdef USE_SCRIPT
+struct METER_DESC script_meter_desc[MAX_METERS];
+uint8_t *script_meter;
+#endif
+
+#ifndef METER_DEF_SIZE
+#define METER_DEF_SIZE 3000
+#endif
+
+bool Gpio_used(uint8_t gpiopin) {
+  for (uint16_t i=0;i<GPIO_SENSOR_END;i++) {
+    if (pin[i]==gpiopin) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void SML_Init(void) {
+  meters_used=METERS_USED;
+  meter_desc_p=meter_desc;
+  meter_p=meter;
+
+  sml_desc_cnt=0;
+
+  for (uint32_t cnt=0;cnt<SML_MAX_VARS;cnt++) {
+    meter_vars[cnt]=0;
+  }
+
+  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
+    meter_spos[cnt]=0;
+  }
+
+#ifdef USE_SCRIPT
+
+  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
+    if (script_meter_desc[cnt].txmem) {
+     free(script_meter_desc[cnt].txmem);
+     script_meter_desc[cnt].txmem=0;
+    }
+  }
+
+  uint8_t meter_script=Run_Scripter(">M",-2,0);
+  if (meter_script==99) {
+
+    if (script_meter) free(script_meter);
+    script_meter=0;
+    uint8_t *tp=0;
+    uint16_t index=0;
+    uint8_t section=0;
+    uint8_t srcpin=0;
+    char *lp=glob_script_mem.scriptptr;
+    sml_send_blocks=0;
+    while (lp) {
+      if (!section) {
+        if (*lp=='>' && *(lp+1)=='M') {
+          lp+=2;
+          meters_used=strtol(lp,0,10);
+          section=1;
+          uint32_t mlen=0;
+          for (uint32_t cnt=0;cnt<METER_DEF_SIZE-1;cnt++) {
+            if (lp[cnt]=='\n' && lp[cnt+1]=='#') {
+              mlen=cnt+3;
+              break;
+            }
+          }
+          if (mlen==0) return;
+          script_meter=(uint8_t*)calloc(mlen,1);
+          if (!script_meter) {
+            goto dddef_exit;
+          }
+          tp=script_meter;
+          goto next_line;
+        }
+      }
+      else {
+        if (!*lp || *lp=='#' || *lp=='>') {
+          if (*(tp-1)=='|') *(tp-1)=0;
+          break;
+        }
+        if (*lp=='+') {
+
+
+          lp++;
+          index=*lp&7;
+          lp+=2;
+          if (index<1 || index>meters_used) goto next_line;
+          index--;
+          srcpin=strtol(lp,&lp,10);
+          if (Gpio_used(srcpin)) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR("gpio rx double define!"));
+dddef_exit:
+            if (script_meter) free(script_meter);
+            script_meter=0;
+            meters_used=METERS_USED;
+            goto init10;
+          }
+          script_meter_desc[index].srcpin=srcpin;
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].type=*lp;
+          lp+=2;
+          script_meter_desc[index].flag=strtol(lp,&lp,10);
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].params=strtol(lp,&lp,10);
+          if (*lp!=',') goto next_line;
+          lp++;
+          script_meter_desc[index].prefix[7]=0;
+          for (uint32_t cnt=0; cnt<8; cnt++) {
+            if (*lp==SCRIPT_EOL || *lp==',') {
+              script_meter_desc[index].prefix[cnt]=0;
+              break;
+            }
+            script_meter_desc[index].prefix[cnt]=*lp++;
+          }
+          if (*lp==',') {
+            lp++;
+            script_meter_desc[index].trxpin=strtol(lp,&lp,10);
+            if (Gpio_used(script_meter_desc[index].trxpin)) {
+              AddLog_P(LOG_LEVEL_INFO, PSTR("gpio tx double define!"));
+              goto dddef_exit;
+            }
+            if (*lp!=',') goto next_line;
+            lp++;
+            script_meter_desc[index].tsecs=strtol(lp,&lp,10);
+            if (*lp==',') {
+              lp++;
+              char txbuff[256];
+              uint32_t txlen=0,tx_entries=1;
+              for (uint32_t cnt=0; cnt<sizeof(txbuff); cnt++) {
+                if (*lp==SCRIPT_EOL) {
+                  txbuff[cnt]=0;
+                  txlen=cnt;
+                  break;
+                }
+                if (*lp==',') tx_entries++;
+                txbuff[cnt]=*lp++;
+              }
+              if (txlen) {
+                script_meter_desc[index].txmem=(char*)calloc(txlen+2,1);
+                if (script_meter_desc[index].txmem) {
+                  strcpy(script_meter_desc[index].txmem,txbuff);
+                }
+                script_meter_desc[index].index=0;
+                script_meter_desc[index].max_index=tx_entries;
+                sml_send_blocks++;
+              }
+            }
+          }
+          if (*lp==SCRIPT_EOL) lp--;
+          goto next_line;
+        }
+
+        if (*lp=='-' || isdigit(*lp)) {
+
+
+          if (*lp=='-') lp++;
+          uint8_t mnum=strtol(lp,0,10);
+          if (mnum<1 || mnum>meters_used) goto next_line;
+          while (1) {
+            if (*lp==SCRIPT_EOL) {
+              if (*(tp-1)!='|') *tp++='|';
+              goto next_line;
+            }
+            *tp++=*lp++;
+            index++;
+            if (index>=METER_DEF_SIZE) break;
+          }
+        }
+
+      }
+
+next_line:
+      if (*lp==SCRIPT_EOL) {
+        lp++;
+      } else {
+        lp = strchr(lp, SCRIPT_EOL);
+        if (!lp) break;
+        lp++;
+      }
+    }
+    *tp=0;
+    meter_desc_p=script_meter_desc;
+    meter_p=script_meter;
+  }
+#endif
+
+init10:
+  typedef void (*function)();
+  function counter_callbacks[] = {SML_CounterUpd1,SML_CounterUpd2,SML_CounterUpd3,SML_CounterUpd4};
+  uint8_t cindex=0;
+
+  for (byte i = 0; i < MAX_COUNTERS; i++) {
+      RtcSettings.pulse_counter[i]=Settings.pulse_counter[i];
+      sml_counters[i].sml_cnt_last_ts=millis();
+  }
+  for (uint8_t meters=0; meters<meters_used; meters++) {
+    if (meter_desc_p[meters].type=='c') {
+        if (meter_desc_p[meters].flag&2) {
+
+#ifdef ANALOG_OPTO_SENSOR
+          ADS1115_init();
+          sml_counters[cindex].ana_max=-32768;
+          sml_counters[cindex].ana_min=+32767;
+#endif
+        } else {
+
+          if (meter_desc_p[meters].flag&1) {
+            pinMode(meter_desc_p[meters].srcpin,INPUT_PULLUP);
+          } else {
+            pinMode(meter_desc_p[meters].srcpin,INPUT);
+          }
+
+          if (meter_desc_p[meters].params<=0) {
+
+            attachInterrupt(meter_desc_p[meters].srcpin, counter_callbacks[cindex], CHANGE);
+            sml_counters[cindex].sml_cnt_old_state=meters;
+            sml_counters[cindex].sml_debounce=-meter_desc_p[meters].params;
+          }
+          InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+          cindex++;
+        }
+    } else {
+
+#ifdef SPECIAL_SS
+        if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M' || meter_desc_p[meters].type=='p') {
+          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
+        } else {
+          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1);
+        }
+#else
+        meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
+#endif
+        if (meter_ss[meters]->begin(meter_desc_p[meters].params)) {
+          meter_ss[meters]->flush();
+        }
+        if (meter_ss[meters]->hardwareSerial()) {
+          if (meter_desc_p[meters].type=='M') {
+            Serial.begin(meter_desc_p[meters].params, SERIAL_8E1);
+          }
+          ClaimSerial();
+        }
+
+    }
+  }
+
+}
+
+
+#ifdef USE_SML_SCRIPT_CMD
+uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+  if (meter_ss[meter]->begin(br)) {
+    meter_ss[meter]->flush();
+  }
+  if (meter_ss[meter]->hardwareSerial()) {
+    if (meter_desc_p[meter].type=='M') {
+      Serial.begin(br, SERIAL_8E1);
+    }
+  }
+  return 1;
+}
+
+uint32_t SML_Write(uint32_t meter,char *hstr) {
+  if (meter<1 || meter>meters_used) return 0;
+  meter--;
+  if (!meter_ss[meter]) return 0;
+  SML_Send_Seq(meter,hstr);
+  return 1;
+}
+#endif
+
+
+void SetDBGLed(uint8_t srcpin, uint8_t ledpin) {
+    pinMode(ledpin, OUTPUT);
+    if (digitalRead(srcpin)) {
+      digitalWrite(ledpin,LOW);
+    } else {
+      digitalWrite(ledpin,HIGH);
+    }
+}
+
+
+void SML_Counter_Poll(void) {
+uint16_t meters,cindex=0;
+uint32_t ctime=millis();
+
+  for (meters=0; meters<meters_used; meters++) {
+    if (meter_desc_p[meters].type=='c') {
+
+      if (meter_desc_p[meters].params>0) {
+        if (ctime-sml_counters[cindex].sml_cnt_last_ts>meter_desc_p[meters].params) {
+          sml_counters[cindex].sml_cnt_last_ts=ctime;
+
+          if (meter_desc_p[meters].flag&2) {
+
+#ifdef ANALOG_OPTO_SENSOR
+            if (ads1115_up) {
+              int16_t val = adc.read_sample();
+              if (val>sml_counters[cindex].ana_max) sml_counters[cindex].ana_max=val;
+              if (val<sml_counters[cindex].ana_min) sml_counters[cindex].ana_min=val;
+              sml_counters[cindex].ana_curr=val;
+              int16_t range=sml_counters[cindex].ana_max-sml_counters[cindex].ana_min;
+            }
+#endif
+          } else {
+
+            uint8_t state;
+            sml_counters[cindex].sml_cnt_debounce<<=1;
+            sml_counters[cindex].sml_cnt_debounce|=(digitalRead(meter_desc_p[meters].srcpin)&1)|0x80;
+            if (sml_counters[cindex].sml_cnt_debounce==0xc0) {
+
+              state=1;
+            } else {
+
+              state=0;
+            }
+            if (sml_counters[cindex].sml_cnt_old_state!=state) {
+
+              sml_counters[cindex].sml_cnt_old_state=state;
+              if (state==0) {
+
+                RtcSettings.pulse_counter[cindex]++;
+                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+              }
+            }
+          }
+        }
+#ifdef DEBUG_CNT_LED1
+        if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
+#endif
+#ifdef DEBUG_CNT_LED2
+        if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
+#endif
+      } else {
+        if (ctime-sml_counters[cindex].sml_cnt_last_ts>10) {
+          sml_counters[cindex].sml_cnt_last_ts=ctime;
+#ifdef DEBUG_CNT_LED1
+          if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
+#endif
+#ifdef DEBUG_CNT_LED2
+          if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
+#endif
+        }
+      }
+      cindex++;
+    }
+  }
+}
+
+#ifdef USE_SCRIPT
+char *SML_Get_Sequence(char *cp,uint32_t index) {
+  if (!index) return cp;
+  uint32_t cindex=0;
+  while (cp) {
+    cp=strchr(cp,',');
+    if (cp) {
+      cp++;
+      cindex++;
+      if (cindex==index) {
+        return cp;
+      }
+    }
+  }
+}
+
+void SML_Check_Send(void) {
+  sml_100ms_cnt++;
+  char *cp;
+  for (uint32_t cnt=sml_desc_cnt; cnt<meters_used; cnt++) {
+    if (script_meter_desc[cnt].trxpin>=0 && script_meter_desc[cnt].txmem) {
+      if ((sml_100ms_cnt%script_meter_desc[cnt].tsecs)==0) {
+        if (script_meter_desc[cnt].max_index>1) {
+          script_meter_desc[cnt].index++;
+          if (script_meter_desc[cnt].index>=script_meter_desc[cnt].max_index) {
+            script_meter_desc[cnt].index=0;
+            sml_desc_cnt++;
+          }
+          cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
+
+        } else {
+          cp=script_meter_desc[cnt].txmem;
+
+          sml_desc_cnt++;
+        }
+
+        SML_Send_Seq(cnt,cp);
+        if (sml_desc_cnt>=meters_used) {
+          sml_desc_cnt=0;
+        }
+        break;
+      }
+    } else {
+      sml_desc_cnt++;
+    }
+
+    if (sml_desc_cnt>=meters_used) {
+      sml_desc_cnt=0;
+    }
+  }
+}
+
+uint8_t sml_hexnibble(char chr) {
+  uint8_t rVal = 0;
+  if (isdigit(chr)) {
+    rVal = chr - '0';
+  } else {
+    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
+    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
+  }
+  return rVal;
+}
+
+
+void SML_Send_Seq(uint32_t meter,char *seq) {
+  uint8_t sbuff[32];
+  uint8_t *ucp=sbuff,slen=0;
+  char *cp=seq;
+  while (*cp) {
+    if (!*cp || !*(cp+1)) break;
+    if (*cp==',') break;
+    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
+    cp+=2;
+    *ucp++=iob;
+    slen++;
+    if (slen>=sizeof(sbuff)) break;
+  }
+  if (script_meter_desc[meter].type=='m' || script_meter_desc[meter].type=='M') {
+    *ucp++=0;
+    *ucp++=2;
+
+    uint16_t crc = MBUS_calculateCRC(sbuff,6);
+    *ucp++=lowByte(crc);
+    *ucp++=highByte(crc);
+    slen+=4;
+  }
+  if (script_meter_desc[meter].type=='o') {
+    for (uint32_t cnt=0;cnt<slen;cnt++) {
+      sbuff[cnt]|=(CalcEvenParity(sbuff[cnt])<<7);
+    }
+  }
+  if (script_meter_desc[meter].type=='p') {
+    *ucp++=0xc0;
+    *ucp++=0xa8;
+    *ucp++=1;
+    *ucp++=1;
+    *ucp++=0;
+    *ucp++=SML_PzemCrc(sbuff,6);
+    slen+=6;
+  }
+  meter_ss[meter]->write(sbuff,slen);
+}
+#endif
+
+uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num) {
+  uint16_t crc, flag;
+  crc = 0xFFFF;
+  for (uint32_t i = 0; i < num; i++) {
+    crc ^= frame[i];
+    for (uint32_t j = 8; j; j--) {
+      if ((crc & 0x0001) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
+
+uint8_t SML_PzemCrc(uint8_t *data, uint8_t len) {
+  uint16_t crc = 0;
+  for (uint32_t i = 0; i < len; i++) crc += *data++;
+  return (uint8_t)(crc & 0xFF);
+}
+
+
+uint8_t CalcEvenParity(uint8_t data) {
+uint8_t parity=0;
+
+  while(data) {
+    parity^=(data &1);
+    data>>=1;
+  }
+  return parity;
+}
+# 2361 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+bool XSNS_53_cmd(void) {
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+      char *cp=XdrvMailbox.data;
+      if (*cp=='d') {
+
+        cp++;
+        uint8_t index=atoi(cp);
+        if ((index&7)>meters_used) index=1;
+        if (index>0 && meter_desc_p[(index&7)-1].type=='c') {
+          index=0;
+        }
+        dump2log=index;
+        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"dump: %d\"}}"),dump2log);
+      } else if (*cp=='c') {
+
+          cp++;
+          uint8_t index=*cp&7;
+          if (index<1 || index>MAX_COUNTERS) index=1;
+          cp++;
+          while (*cp==' ') cp++;
+          if (isdigit(*cp)) {
+            uint32_t cval=atoi(cp);
+            while (isdigit(*cp)) cp++;
+            RtcSettings.pulse_counter[index-1]=cval;
+            uint8_t cindex=0;
+            for (uint8_t meters=0; meters<meters_used; meters++) {
+              if (meter_desc_p[meters].type=='c') {
+                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+                cindex++;
+              }
+            }
+          }
+          ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"counter%d: %d\"}}"),index,RtcSettings.pulse_counter[index-1]);
+      } else if (*cp=='r') {
+
+        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"restart\"}}"));
+        SML_CounterSaveState();
+        SML_Init();
+      } else {
+        serviced=false;
+      }
+  }
+  return serviced;
+}
+
+void InjektCounterValue(uint8_t meter,uint32_t counter) {
+  sprintf((char*)&smltbuf[meter][0],"1-0:1.8.0*255(%d)",counter);
+  SML_Decode(meter);
+}
+
+void SML_CounterSaveState(void) {
+  for (byte i = 0; i < MAX_COUNTERS; i++) {
+      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
+  }
+}
+# 2425 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
+bool Xsns53(byte function) {
+  bool result = false;
+    switch (function) {
+      case FUNC_INIT:
+        SML_Init();
+        break;
+      case FUNC_LOOP:
+        SML_Counter_Poll();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        if (dump2log) Dump2log();
+        else SML_Poll();
+        break;
+#ifdef USE_SCRIPT
+      case FUNC_EVERY_100_MSECOND:
+        SML_Check_Send();
+        break;
+#endif
+      case FUNC_JSON_APPEND:
+        SML_Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        SML_Show(0);
+        break;
+#endif
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_53 == XdrvMailbox.index) {
+          result = XSNS_53_cmd();
+        }
+        break;
+      case FUNC_SAVE_BEFORE_RESTART:
+      case FUNC_SAVE_AT_MIDNIGHT:
+        SML_CounterSaveState();
+        break;
+    }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+#ifdef USE_I2C
+#ifdef USE_INA226
+# 70 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+#define XSNS_54 54
+#define XI2C_35 35
+
+#define INA226_MAX_ADDRESSES 4
+#define INA226_ADDRESS1 (0x40)
+#define INA226_ADDRESS2 (0x41)
+#define INA226_ADDRESS3 (0x44)
+#define INA226_ADDRESS4 (0x45)
+
+#define INA226_REG_CONFIG (0x00)
+#define INA226_RES_CONFIG (0x4127)
+#define INA226_DEF_CONFIG (0x42FF)
+#define INA226_CONFIG_RESET (0x8000)
+
+#define INA226_REG_SHUNTVOLTAGE (0x01)
+#define INA226_REG_BUSVOLTAGE (0x02)
+#define INA226_REG_POWER (0x03)
+#define INA226_REG_CURRENT (0x04)
+#define INA226_REG_CALIBRATION (0x05)
+
+
+typedef struct Ina226SlaveInfo_tag {
+  uint8_t address;
+  uint16_t calibrationValue;
+  uint16_t config;
+  uint8_t present : 1;
+  float i_lsb;
+} Ina226SlaveInfo_t;
+
+
+
+
+
+static const uint8_t PROGMEM probeAddresses[INA226_MAX_ADDRESSES] = {INA226_ADDRESS1, INA226_ADDRESS2, INA226_ADDRESS3, INA226_ADDRESS4};
+
+
+
+
+
+
+static char Ina226Str[] = "INA226";
+static uint8_t slavesFound = 0;
+static uint8_t schedule_reinit = 0;
+static Ina226SlaveInfo_t slaveInfo[4] = {0};
+
+static float voltages[4];
+static float currents[4];
+static float powers[4];
+
+
+
+
+
+
+static void _debug_fval(const char *str, float fval, uint8_t prec = 4 )
+{
+  char fstr[32];
+  dtostrfd(fval, prec, fstr);
+  AddLog_P2( LOG_LEVEL_DEBUG, PSTR("%s: %s"), str, fstr );
+}
+# 138 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+static uint32_t _expand_r_shunt(uint16_t compact_r_shunt)
+{
+
+  uint32_t r_shunt_uohms = (compact_r_shunt & 0x8000) ?
+  (((uint32_t)(compact_r_shunt & 0x7FFF)) * 1000ul) :
+  (compact_r_shunt & 0x7FFF);
+  return r_shunt_uohms;
+}
+
+
+
+
+
+void Ina226SetCalibration(uint8_t slaveIndex)
+{
+
+Ina226SlaveInfo_t *si = slaveInfo + slaveIndex;
+
+I2cWrite16( si->address, INA226_REG_CALIBRATION, si->calibrationValue);
+
+}
+
+
+
+
+
+
+bool Ina226TestPresence(uint8_t device)
+{
+
+
+
+  uint16_t config = I2cRead16( slaveInfo[device].address, INA226_REG_CONFIG );
+
+
+  if (config != slaveInfo[device].config)
+    return false;
+
+  return true;
+
+}
+
+void Ina226ResetActive(void)
+{
+  Ina226SlaveInfo_t *p = slaveInfo;
+
+  for (uint32_t i = 0; i < INA226_MAX_ADDRESSES; i++) {
+    p = &slaveInfo[i];
+
+    uint8_t addr = p->address;
+    if (addr) {
+      I2cResetActive(addr);
+    }
+  }
+}
+
+
+
+
+
+void Ina226Init()
+{
+  uint32_t i;
+
+  slavesFound = 0;
+
+  Ina226SlaveInfo_t *p = slaveInfo;
+# 215 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+  for (i = 0; i < 4; i++){
+    *p = {0};
+  }
+
+
+
+
+
+  for (i = 0; i < INA226_MAX_ADDRESSES; i++){
+    uint8_t addr = pgm_read_byte(probeAddresses + i);
+
+    if (I2cActive(addr)) { continue; }
+
+
+
+
+    if (!Settings.ina226_i_fs[i])
+      continue;
+
+
+
+
+
+
+    if (!I2cWrite16( addr, INA226_REG_CONFIG, INA226_CONFIG_RESET)){
+
+      AddLog_P2( LOG_LEVEL_DEBUG, "No INA226 at address: %02X", addr);
+      continue;
+    }
+
+
+
+    uint16_t config = I2cRead16( addr, INA226_REG_CONFIG );
+
+
+    if (INA226_RES_CONFIG != config)
+      continue;
+
+
+    config = INA226_DEF_CONFIG;
+
+
+    if (!I2cWrite16( addr, INA226_REG_CONFIG, config))
+        continue;
+
+
+    p = &slaveInfo[i];
+
+    p->address = addr;
+
+    p->config = config;
+
+
+    p->i_lsb = (((float) Settings.ina226_i_fs[i])/10.0f)/32768.0f;
+
+
+
+    uint32_t r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[i]);
+
+
+
+    p->calibrationValue = ((uint16_t) (0.00512/(p->i_lsb * r_shunt_uohms/1000000.0f)));
+
+    p->present = true;
+
+
+    Ina226SetCalibration(i);
+
+    I2cSetActiveFound(addr, Ina226Str);
+
+    slavesFound++;
+  }
+}
+
+
+
+
+
+float Ina226ReadBus_v(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_bus_v = I2cReadS16( addr, INA226_REG_BUSVOLTAGE);
+
+  float result = ((float) reg_bus_v) * 0.00125f;
+
+  return result;
+
+}
+
+
+
+
+
+float Ina226ReadShunt_i(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_CURRENT);
+
+  float result = ((float) reg_shunt_i) * slaveInfo[device].i_lsb;
+
+  return result;
+}
+
+
+
+
+
+float Ina226ReadPower_w(uint8_t device)
+{
+  uint8_t addr = slaveInfo[device].address;
+  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_POWER);
+
+  float result = ((float) reg_shunt_i) * (slaveInfo[device].i_lsb * 25.0);
+
+  return result;
+}
+
+
+
+
+
+
+void Ina226Read(uint8_t device)
+{
+
+  voltages[device] = Ina226ReadBus_v(device);
+  currents[device] = Ina226ReadShunt_i(device);
+  powers[device] = Ina226ReadPower_w(device);
+
+
+
+
+}
+
+
+
+
+
+void Ina226EverySecond()
+{
+
+  for (uint8_t device = 0; device < INA226_MAX_ADDRESSES; device++){
+
+    if (slavesFound && slaveInfo[device].present && Ina226TestPresence(device)){
+      Ina226Read(device);
+    }
+    else {
+        powers[device] = currents[device] = voltages[device] = 0.0f;
+
+
+
+
+
+
+        slaveInfo[device].present = false;
+    }
+  }
+}
+
+
+
+
+
+bool Ina226CommandSensor()
+{
+  bool serviced = true;
+  bool show_config = false;
+  char param_str[64];
+  char *cp, *params[4];
+  uint8_t i, param_count, device, p1 = XdrvMailbox.payload;
+  uint32_t r_shunt_uohms;
+  uint16_t compact_r_shunt_uohms;
+
+
+
+
+
+  if (XdrvMailbox.data_len > 62){
+    return false;
+  }
+
+  strncpy(param_str, XdrvMailbox.data, XdrvMailbox.data_len + 1);
+  param_str[XdrvMailbox.data_len] = 0;
+
+
+  for (cp = param_str, i = 0, param_count = 0; *cp && (i < XdrvMailbox.data_len + 1) && (param_count <= 3); i++)
+    if (param_str[i] == ' ' || param_str[i] == ',' || param_str[i] == 0){
+      param_str[i] = 0;
+      params[param_count] = cp;
+
+      param_count++;
+      cp = param_str + i + 1;
+    }
+
+
+  if (p1 < 10 || p1 >= 50){
+
+    switch (p1){
+      case 1:
+        Ina226ResetActive();
+        Ina226Init();
+        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"SlavesFound\":%d}}"),slavesFound);
+        break;
+
+      case 2:
+        restart_flag = 2;
+        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"Restart_flag\":%d}}"),restart_flag);
+        break;
+
+      default:
+        serviced = false;
+    }
+  }
+  else if (p1 < 50){
+
+    device = (p1 / 10) - 1;
+    switch (p1 % 10){
+      case 0:
+        show_config = true;
+        break;
+
+      case 1:
+        r_shunt_uohms = (uint32_t) ((CharToFloat(params[1])) * 1000000.0f);
+
+
+
+        if (r_shunt_uohms > 32767){
+          uint32_t r_shunt_mohms = r_shunt_uohms/1000UL;
+          Settings.ina226_r_shunt[device] = (uint16_t) (r_shunt_mohms | 0x8000);
+        }
+        else
+          Settings.ina226_r_shunt[device] = (uint16_t) r_shunt_uohms;
+
+
+        show_config = true;
+        break;
+
+      case 2:
+        Settings.ina226_i_fs[device] = (uint16_t) ((CharToFloat(params[1])) * 10.0f);
+
+        show_config = true;
+        break;
+
+
+      default:
+        serviced = false;
+        break;
+    }
+  }
+  else
+    serviced = false;
+
+  if (show_config) {
+    char shunt_r_str[16];
+    char fs_i_str[16];
+
+
+    r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[device]);
+    dtostrfd(((float)r_shunt_uohms)/1000000.0f, 6, shunt_r_str);
+
+    dtostrfd(((float)Settings.ina226_i_fs[device])/10.0f, 1, fs_i_str);
+
+    Response_P(PSTR("{\"Sensor54-device-settings-%d\":{\"SHUNT_R\":%s,\"FS_I\":%s}}"),
+      device + 1, shunt_r_str, fs_i_str);
+  }
+
+  return serviced;
+}
+
+
+
+
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_INA226_DATA[] PROGMEM =
+  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
+  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
+  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
+#endif
+
+void Ina226Show(bool json)
+{
+  int i, num_found;
+  for (num_found = 0, i = 0; i < INA226_MAX_ADDRESSES; i++) {
+
+    if (!slaveInfo[i].present)
+      continue;
+
+    num_found++;
+
+    char voltage[16];
+    dtostrfd(voltages[i], Settings.flag2.voltage_resolution, voltage);
+    char current[16];
+    dtostrfd(currents[i], Settings.flag2.current_resolution, current);
+    char power[16];
+    dtostrfd(powers[i], Settings.flag2.wattage_resolution, power);
+    char name[16];
+    snprintf_P(name, sizeof(name), PSTR("INA226%c%d"),IndexSeparator(), i + 1);
+
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%d,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
+                       name, i, voltage, current, power);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, voltage);
+        DomoticzSensor(DZ_CURRENT, current);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_INA226_DATA, name, voltage, name, current, name, power);
+#endif
+    }
+
+  }
+
+}
+# 546 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
+bool Xsns54(byte callback_id)
+{
+  if (!I2cEnabled(XI2C_35)) { return false; }
+
+
+  bool result = false;
+
+
+  switch (callback_id) {
+    case FUNC_EVERY_SECOND:
+      Ina226EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      Ina226Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Ina226Show(0);
+      break;
+#endif
+    case FUNC_COMMAND_SENSOR:
+      if (XSNS_54 == XdrvMailbox.index) {
+        result = Ina226CommandSensor();
+      }
+      break;
+    case FUNC_INIT:
+      Ina226Init();
+      break;
+  }
+
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
+#ifdef USE_I2C
+#ifdef USE_HIH6
+# 33 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
+#define XSNS_55 55
+#define XI2C_36 36
+
+#define HIH6_ADDR 0x27
+
+struct HIH6 {
+  float temperature = 0;
+  float humidity = 0;
+  uint8_t valid = 0;
+  uint8_t type = 0;
+  char types[4] = "HIH";
+} Hih6;
+
+bool Hih6Read(void)
+{
+  Wire.beginTransmission(HIH6_ADDR);
+  if (Wire.endTransmission() != 0) { return false; }
+
+  delay(40);
+
+  uint8_t data[4];
+  Wire.requestFrom(HIH6_ADDR, 4);
+  if (4 == Wire.available()) {
+    data[0] = Wire.read();
+    data[1] = Wire.read();
+    data[2] = Wire.read();
+    data[3] = Wire.read();
+  } else { return false; }
+
+
+
+  Hih6.humidity = ConvertHumidity(((float)(((data[0] & 0x3F) << 8) | data[1]) * 100.0) / 16383.0);
+
+  int temp = ((data[2] << 8) | (data[3] & 0xFC)) / 4;
+  Hih6.temperature = ConvertTemp(((float)temp / 16384.0) * 165.0 - 40.0);
+
+  Hih6.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Hih6Detect(void)
+{
+  if (I2cActive(HIH6_ADDR)) { return; }
+
+  if (uptime < 2) { delay(20); }
+  Hih6.type = Hih6Read();
+  if (Hih6.type) {
+    I2cSetActiveFound(HIH6_ADDR, Hih6.types);
+  }
+}
+
+void Hih6EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!Hih6Read()) {
+      AddLogMissed(Hih6.types, Hih6.valid);
+    }
+  }
+}
+
+void Hih6Show(bool json)
+{
+  if (Hih6.valid) {
+    char temperature[33];
+    dtostrfd(Hih6.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Hih6.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Hih6.types, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Hih6.temperature);
+        KnxSensor(KNX_HUMIDITY, Hih6.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Hih6.types, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Hih6.types, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns55(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_36)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Hih6Detect();
+  }
+  else if (Hih6.type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Hih6EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Hih6Show(1);
+        break;
+  #ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Hih6Show(0);
+        break;
+  #endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
+# 21 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
+#ifdef USE_HPMA
+# 31 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
+#define XSNS_56 56
+
+#include <hpma115S0.h>
+#include <TasmotaSerial.h>
+
+TasmotaSerial *HpmaSerial;
+HPMA115S0 *hpma115S0;
+
+uint8_t hpma_type = 1;
+uint8_t hpma_valid = 0;
+
+struct hpmadata {
+  unsigned int pm10;
+  unsigned int pm2_5;
+} hpma_data;
+
+
+
+void HpmaSecond(void)
+{
+  unsigned int pm2_5, pm10;
+
+
+
+
+  if (hpma115S0->ReadParticleMeasurement(&pm2_5, &pm10)) {
+    hpma_data.pm2_5 = pm2_5;
+    hpma_data.pm10 = pm10;
+    hpma_valid = 1;
+  }
+
+}
+
+void HpmaInit(void)
+{
+  hpma_type = 0;
+  if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
+    HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
+    hpma115S0 = new HPMA115S0(*HpmaSerial);
+
+    if (HpmaSerial->begin(9600)) {
+      if (HpmaSerial->hardwareSerial()) {
+        ClaimSerial();
+      }
+      hpma_type = 1;
+      hpma115S0->Init();
+      hpma115S0->StartParticleMeasurement();
+    }
+  }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_HPMA_SNS[] PROGMEM =
+  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
+  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
+#endif
+
+void HpmaShow(bool json)
+{
+  if (hpma_valid) {
+    char pm10[33];
+    snprintf_P(pm10, 33, PSTR("%d"), hpma_data.pm10);
+    char pm2_5[33];
+    snprintf_P(pm2_5, 33, PSTR("%d"), hpma_data.pm2_5);
+
+    if (json) {
+      ResponseAppend_P(PSTR(",\"HPMA\":{\"PM2.5\":%d,\"PM10\":%d}"), hpma_data.pm2_5, hpma_data.pm10);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) {
+        DomoticzSensor(DZ_VOLTAGE, pm2_5);
+        DomoticzSensor(DZ_CURRENT, pm10);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_HPMA_SNS, pm2_5, pm10);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns56(uint8_t function)
+{
+  bool result = false;
+
+  if (hpma_type) {
+    switch (function) {
+      case FUNC_INIT:
+        HpmaInit();
+        break;
+      case FUNC_EVERY_SECOND:
+        HpmaSecond();
+        break;
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_56 == XdrvMailbox.index) {
+          return true;
+        }
+        break;
+      case FUNC_JSON_APPEND:
+        HpmaShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HpmaShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_57_tsl2591.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_57_tsl2591.ino"
+#ifdef USE_I2C
+#ifdef USE_TSL2591
+
+
+
+
+
+
+
+#define XSNS_57 57
+#define XI2C_40 40
+
+#define TSL2591_ADDRESS 0x29
+
+#include <Adafruit_TSL2591.h>
+
+Adafruit_TSL2591 tsl = Adafruit_TSL2591();
+
+uint8_t tsl2591_type = 0;
+uint8_t tsl2591_valid = 0;
+float tsl2591_lux = 0;
+
+void Tsl2591Init(void)
+{
+
+  if (I2cSetDevice(0x29)) {
+    if (tsl.begin()) {
+      tsl.setGain(TSL2591_GAIN_MED);
+      tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
+      tsl2591_type = 1;
+      I2cSetActiveFound(TSL2591_ADDRESS, "TSL2591");
+    }
+  }
+}
+
+bool Tsl2591Read(void)
+{
+  uint32_t lum = tsl.getFullLuminosity();
+  uint16_t ir, full;
+  ir = lum >> 16;
+  full = lum & 0xFFFF;
+  tsl2591_lux = tsl.calculateLux(full, ir);
+  tsl2591_valid = 1;
+}
+
+void Tsl2591EverySecond(void)
+{
+  Tsl2591Read();
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TSL2591[] PROGMEM =
+  "{s}TSL2591 " D_ILLUMINANCE "{m}%s " D_UNIT_LUX "{e}";
+#endif
+
+void Tsl2591Show(bool json)
+{
+  if (tsl2591_valid) {
+    char lux_str[10];
+    dtostrf(tsl2591_lux, sizeof(lux_str)-1, 3, lux_str);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"TSL2591\":{\"" D_JSON_ILLUMINANCE "\":%s}"), lux_str);
+#ifdef USE_DOMOTICZ
+      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, tsl2591_lux); }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TSL2591, lux_str);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns57(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_40)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Tsl2591Init();
+  }
+  else if (tsl2591_type) {
+    switch (function) {
+      case FUNC_EVERY_SECOND:
+        Tsl2591EverySecond();
+        break;
+      case FUNC_JSON_APPEND:
+        Tsl2591Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        Tsl2591Show(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_58_dht12.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_58_dht12.ino"
+#ifdef USE_I2C
+#ifdef USE_DHT12
+
+
+
+
+
+
+#define XSNS_58 58
+#define XI2C_41 41
+
+#define DHT12_ADDR 0x5C
+
+struct DHT12 {
+  float temperature = NAN;
+  float humidity = NAN;
+  uint8_t valid = 0;
+  uint8_t count = 0;
+  char name[6] = "DHT12";
+} Dht12;
+
+bool Dht12Read(void)
+{
+  if (Dht12.valid) { Dht12.valid--; }
+
+  Wire.beginTransmission(DHT12_ADDR);
+  Wire.write(0);
+  if (Wire.endTransmission() != 0) { return false; }
+
+  delay(50);
+
+  Wire.requestFrom(DHT12_ADDR, 5);
+  delay(5);
+  uint8_t humidity = Wire.read();
+  uint8_t humidityTenth = Wire.read();
+  uint8_t temp = Wire.read();
+  uint8_t tempTenth = Wire.read();
+  uint8_t checksum = Wire.read();
+
+  Dht12.humidity = ConvertHumidity( (float) humidity + (float) humidityTenth/(float) 10.0 );
+  Dht12.temperature = ConvertTemp( (float) temp + (float) tempTenth/(float) 10.0 );
+
+  if (isnan(Dht12.temperature) || isnan(Dht12.humidity)) { return false; }
+
+  Dht12.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+void Dht12Detect(void)
+{
+  if (I2cActive(DHT12_ADDR)) { return; }
+
+  if (Dht12Read()) {
+    I2cSetActiveFound(DHT12_ADDR, Dht12.name);
+    Dht12.count = 1;
+  }
+}
+
+void Dht12EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!Dht12Read()) {
+      AddLogMissed(Dht12.name, Dht12.valid);
+    }
+  }
+}
+
+void Dht12Show(bool json)
+{
+  if (Dht12.valid) {
+    char temperature[33];
+    dtostrfd(Dht12.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(Dht12.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht12.name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, Dht12.temperature);
+        KnxSensor(KNX_HUMIDITY, Dht12.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, Dht12.name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, Dht12.name, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns58(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_41)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Dht12Detect();
+  }
+  else if (Dht12.count) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      Dht12EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      Dht12Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Dht12Show(0);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_59_ds1624.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_59_ds1624.ino"
+#ifdef USE_I2C
+#ifdef USE_DS1624
+
+
+
+
+
+
+
+#define XSNS_59 59
+#define XI2C_42 42
+
+#define DS1624_MEM_REGISTER 0x17
+#define DS1624_CONF_REGISTER 0xAC
+#define DS1624_TEMP_REGISTER 0xAA
+#define DS1624_START_REGISTER 0xEE
+#define DS1624_STOP_REGISTER 0x22
+
+#define DS1621_COUNTER_REGISTER 0xA8
+#define DS1621_SLOPE_REGISTER 0xA9
+
+#define DS1621_CFG_1SHOT (1<<0)
+#define DS1621_CFG_DONE (1<<7)
+
+enum {
+  DS1624_TYPE_DS1624,
+  DS1624_TYPE_DS1621
+};
+
+#define DS1624_MAX_SENSORS 8
+
+bool ds1624_init = false;
+
+struct {
+  float value;
+  uint8_t type;
+  int errcnt;
+  int misscnt;
+  bool valid;
+  char name[9];
+} ds1624_sns[DS1624_MAX_SENSORS];
+
+uint32_t DS1624_Idx2Addr(uint32_t idx) {
+  return 0x48 + idx;
+}
+
+int DS1624_Restart(uint8_t config, uint32_t idx) {
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if ((config & 1) == 1) {
+    config &= ~(DS1621_CFG_DONE|DS1621_CFG_1SHOT);
+    I2cWrite8(addr, DS1624_CONF_REGISTER, config);
+    delay(10);
+    AddLog_P2(LOG_LEVEL_ERROR, "%s addr %x is reset, reconfig: %x", ds1624_sns[idx].name, addr, config);
+  }
+  I2cValidRead(addr, DS1624_START_REGISTER, 1);
+}
+
+void DS1624_HotPlugUp(uint32_t idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+
+  if (I2cActive(addr)) { return; }
+  if (!I2cSetDevice(addr)) { return; }
+
+  uint8_t config;
+  if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    uint8_t tmp;
+    ds1624_sns[idx].type = (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER)) ? DS1624_TYPE_DS1624 : DS1624_TYPE_DS1621;
+
+    snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS162%c%c%d"),
+      (ds1624_sns[idx].type == DS1624_TYPE_DS1621) ? '1' : '4', IndexSeparator(), idx);
+    I2cSetActiveFound(addr, ds1624_sns[idx].name);
+
+    ds1624_sns[idx].valid = true;
+    ds1624_sns[idx].errcnt = 0;
+    ds1624_sns[idx].misscnt = 0;
+    DS1624_Restart(config,idx);
+    AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
+  }
+}
+
+void DS1624_HotPlugDown(int idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+  if (!I2cActive(addr)) { return; }
+  I2cResetActive(addr);
+  ds1624_sns[idx].valid = false;
+  AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
+}
+
+bool DS1624GetTemp(float *value, int idx)
+{
+  uint32_t addr = DS1624_Idx2Addr(idx);
+
+  uint8_t config;
+  if (!I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
+    ds1624_sns[idx].misscnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s device missing (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].misscnt);
+    return false;
+  }
+  ds1624_sns[idx].misscnt=0;
+  if (config & (DS1621_CFG_1SHOT|DS1621_CFG_DONE)) {
+    ds1624_sns[idx].errcnt++;
+    AddLog_P2(LOG_LEVEL_INFO, "%s config error, restart... (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].errcnt);
+    DS1624_Restart(config, idx);
+    return false;
+  }
+
+  uint16_t t;
+  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
+  if (ds1624_sns[idx].type == DS1624_TYPE_DS1624) {
+    *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
+  } else {
+
+    *value = ((float)(int8_t)(t>>8));
+    uint8_t remain;
+    if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
+    uint8_t perc;
+    if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
+    float fix=(float)(perc - remain)/(float)perc;
+    *value+=fix;
+  }
+  ds1624_sns[idx].errcnt=0;
+  config &= ~(DS1621_CFG_DONE);
+  I2cWrite8(addr, DS1624_CONF_REGISTER, config);
+  return true;
+}
+
+void DS1624HotPlugScan(void)
+{
+  uint16_t t;
+
+  for (uint32_t idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
+    uint32_t addr = DS1624_Idx2Addr(idx);
+    if (I2cActive(addr) && !ds1624_sns[idx].valid) {
+      continue;
+    }
+    if (ds1624_sns[idx].valid) {
+      if ((ds1624_sns[idx].misscnt>2)||(ds1624_sns[idx].errcnt>2)) {
+        DS1624_HotPlugDown(idx);
+        continue;
+      }
+    }
+    DS1624_HotPlugUp(idx);
+  }
+}
+
+void DS1624EverySecond(void)
+{
+  float t;
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
+    if (!DS1624GetTemp(&t, i)) { continue; }
+    ds1624_sns[i].value = ConvertTemp(t);
+  }
+}
+
+void DS1624Show(bool json)
+{
+  char temperature[33];
+  bool once = true;
+
+  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
+    if (!ds1624_sns[i].valid) { continue; }
+
+    dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
+    if (json) {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
+      if ((0 == tele_period) && once) {
+#ifdef USE_DOMOTICZ
+        DomoticzSensor(DZ_TEMP, temperature);
+#endif
+#ifdef USE_KNX
+        KnxSensor(KNX_TEMPERATURE, temperature);
+#endif
+        once = false;
+      }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns59(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_42)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    if (!ds1624_init) {
+      memset(ds1624_sns, 0, sizeof(ds1624_sns));
+      ds1624_init = true;
+      DS1624HotPlugScan();
+    }
+  }
+  switch (function) {
+    case FUNC_HOTPLUG_SCAN:
+      DS1624HotPlugScan();
+      break;
+    case FUNC_EVERY_SECOND:
+      DS1624EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      DS1624Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      DS1624Show(0);
+      break;
+#endif
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
+#ifdef USE_GPS
+# 113 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
+#define XSNS_60 60
+
+#include "NTPServer.h"
+#include "NTPPacket.h"
+
+
+
+
+
+#define D_CMND_UBX "UBX"
+
+const char S_JSON_UBX_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_UBX "%s\":%d}";
+
+const char kUBXTypes[] PROGMEM = "UBX";
+
+#define UBX_LAT_LON_THRESHOLD 1000
+
+#define UBX_SERIAL_BUFFER_SIZE 256
+#define UBX_TCP_PORT 1234
+
+
+
+
+
+const char UBLOX_INIT[] PROGMEM = {
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x24,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x2B,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x02,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x32,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x39,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x04,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x40,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x05,0x00,0x00,0x00,0x00,0x00,0x01,0x05,0x47,
+
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xDC,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xB9,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0xC0,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92,
+
+
+
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x13,0xBE,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x01,0x00,0x00,0x00,0x00,0x14,0xC5,
+  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97,
+
+
+
+
+
+
+};
+
+char UBX_name[4];
+
+struct UBX_t {
+  const char UBX_HEADER[2] = { 0xB5, 0x62 };
+  const char NAV_POSLLH_HEADER[2] = { 0x01, 0x02 };
+  const char NAV_STATUS_HEADER[2] = { 0x01, 0x03 };
+  const char NAV_TIME_HEADER[2] = { 0x01, 0x21 };
+
+  struct entry_t {
+          int32_t lat;
+          int32_t lon;
+          uint32_t time;
+    };
+
+  union {
+    entry_t values;
+    uint8_t bytes[sizeof(entry_t)];
+    } rec_buffer;
+
+  struct POLL_MSG {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t zero;
+  };
+
+  struct NAV_POSLLH {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    int32_t lon;
+    int32_t lat;
+    int32_t alt;
+    int32_t hMSL;
+    uint32_t hAcc;
+    uint32_t vAcc;
+    };
+
+  struct NAV_STATUS {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    uint8_t gpsFix;
+    uint8_t flags;
+    uint8_t fixStat;
+    uint8_t flags2;
+    uint32_t ttff;
+    uint32_t msss;
+    };
+
+  struct NAV_TIME_UTC {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint32_t iTOW;
+    uint32_t tAcc;
+    int32_t nano;
+    uint16_t year;
+    uint8_t month;
+    uint8_t day;
+    uint8_t hour;
+    uint8_t min;
+    uint8_t sec;
+    struct {
+      uint8_t UTC:1;
+      uint8_t WKN:1;
+      uint8_t TOW:1;
+      uint8_t padding:5;
+      } valid;
+    };
+
+  struct CFG_RATE {
+    uint8_t cls;
+    uint8_t id;
+    uint16_t len;
+    uint16_t measRate;
+    uint16_t navRate;
+    uint16_t timeRef;
+    char CK[2];
+    };
+
+  struct {
+    uint32_t last_iTOW;
+    int32_t last_alt;
+    uint32_t last_hAcc;
+    uint32_t last_vAcc;
+    uint8_t gpsFix;
+    uint8_t non_empty_loops;
+    uint16_t log_interval;
+  } state;
+
+  struct {
+    uint32_t init:1;
+    uint32_t filter_noise:1;
+    uint32_t send_when_new:1;
+    uint32_t send_UI_only:1;
+    uint32_t runningNTP:1;
+    uint32_t forceUTCupdate:1;
+    uint32_t runningVPort:1;
+
+  } mode;
+
+  union {
+    NAV_POSLLH navPosllh;
+    NAV_STATUS navStatus;
+    NAV_TIME_UTC navTime;
+    POLL_MSG pollMsg;
+    CFG_RATE cfgRate;
+    } Message;
+
+  uint8_t TCPbuf[UBX_SERIAL_BUFFER_SIZE];
+  size_t TCPbufSize;
+} UBX;
+
+enum UBXMsgType {
+  MT_NONE,
+  MT_NAV_POSLLH,
+  MT_NAV_STATUS,
+  MT_NAV_TIME,
+  MT_POLL
+};
+
+#ifdef USE_FLOG
+FLOG *Flog = nullptr;
+#endif
+TasmotaSerial *UBXSerial;
+
+NtpServer timeServer(PortUdp);
+
+WiFiServer vPortServer(UBX_TCP_PORT);
+WiFiClient vPortClient;
+
+
+
+
+
+void UBXcalcChecksum(char* CK, size_t msgSize)
+{
+  memset(CK, 0, 2);
+  for (int i = 0; i < msgSize; i++) {
+    CK[0] += ((char*)(&UBX.Message))[i];
+    CK[1] += CK[0];
+  }
+}
+
+bool UBXcompareMsgHeader(const char* msgHeader)
+{
+  char* ptr = (char*)(&UBX.Message);
+  return ptr[0] == msgHeader[0] && ptr[1] == msgHeader[1];
+}
+
+void UBXinitCFG(void)
+{
+  for (uint32_t i = 0; i < sizeof(UBLOX_INIT); i++) {
+    UBXSerial->write( pgm_read_byte(UBLOX_INIT+i) );
+  }
+  DEBUG_SENSOR_LOG(PSTR("UBX: turn off NMEA"));
+}
+
+void UBXTriggerTele(void)
+{
+  mqtt_data[0] = '\0';
+  if (MqttShowSensor()) {
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+#ifdef USE_RULES
+    RulesTeleperiod();
+#endif
+  }
+}
+
+
+
+void UBXDetect(void)
+{
+  UBX.mode.init = 0;
+  if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
+    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, UBX_SERIAL_BUFFER_SIZE);
+    if (UBXSerial->begin(9600)) {
+      DEBUG_SENSOR_LOG(PSTR("UBX: started serial"));
+      if (UBXSerial->hardwareSerial()) {
+        ClaimSerial();
+        DEBUG_SENSOR_LOG(PSTR("UBX: claim HW"));
+      }
+    }
+  }
+  else {
+    return;
+  }
+
+  UBXinitCFG();
+  UBX.mode.init = 1;
+
+#ifdef USE_FLOG
+  if (!Flog) {
+    Flog = new FLOG;
+    Flog->init();
+  }
+#endif
+
+  UBX.state.log_interval = 10;
+  UBX.mode.send_UI_only = true;
+  UBXTriggerTele();
+}
+
+uint32_t UBXprocessGPS()
+{
+  static uint32_t fpos = 0;
+  static char checksum[2];
+  static uint8_t currentMsgType = MT_NONE;
+  static size_t payloadSize = sizeof(UBX.Message);
+
+
+  uint32_t data_bytes = 0;
+  while ( UBXSerial->available() ) {
+    data_bytes++;
+    byte c = UBXSerial->read();
+    if (UBX.mode.runningVPort){
+      UBX.TCPbuf[data_bytes-1] = c;
+      UBX.TCPbufSize = data_bytes;
+    }
+    if ( fpos < 2 ) {
+
+      if ( c == UBX.UBX_HEADER[fpos] ) {
+        fpos++;
+      } else {
+        fpos = 0;
+      }
+    } else {
+
+
+
+
+
+      if ( (fpos-2) < payloadSize ) {
+        ((char*)(&UBX.Message))[fpos-2] = c;
+      }
+      fpos++;
+
+      if ( fpos == 4 ) {
+
+
+        if ( UBXcompareMsgHeader(UBX.NAV_POSLLH_HEADER) ) {
+          currentMsgType = MT_NAV_POSLLH;
+          payloadSize = sizeof(UBX_t::NAV_POSLLH);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_POSLLH"));
+        }
+        else if ( UBXcompareMsgHeader(UBX.NAV_STATUS_HEADER) ) {
+          currentMsgType = MT_NAV_STATUS;
+          payloadSize = sizeof(UBX_t::NAV_STATUS);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_STATUS"));
+        }
+        else if ( UBXcompareMsgHeader(UBX.NAV_TIME_HEADER) ) {
+          currentMsgType = MT_NAV_TIME;
+          payloadSize = sizeof(UBX_t::NAV_TIME_UTC);
+          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_TIME_UTC"));
+        }
+        else {
+
+          fpos = 0;
+          continue;
+        }
+      }
+
+      if ( fpos == (payloadSize+2) ) {
+
+
+        UBXcalcChecksum(checksum, payloadSize);
+      }
+      else if ( fpos == (payloadSize+3) ) {
+
+
+        if ( c != checksum[0] ) {
+
+          fpos = 0;
+        }
+      }
+      else if ( fpos == (payloadSize+4) ) {
+
+
+        fpos = 0;
+        if ( c == checksum[1] ) {
+
+          return currentMsgType;
+        }
+      }
+      else if ( fpos > (payloadSize+4) ) {
+
+
+        fpos = 0;
+      }
+    }
+  }
+
+  if (data_bytes!=0) {
+    UBX.state.non_empty_loops++;
+    DEBUG_SENSOR_LOG(PSTR("UBX: got %u bytes, non-empty-loop: %u"), data_bytes, UBX.state.non_empty_loops);
+  } else {
+    UBX.state.non_empty_loops = 0;
+  }
+  return MT_NONE;
+}
+
+
+
+
+
+#ifdef USE_FLOG
+void UBXsendHeader(void)
+{
+  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+  WebServer->sendHeader(F("Content-Disposition"), F("attachment; filename=TASMOTA.gpx"));
+  WSSend(200, CT_STREAM, F(
+    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\r\n"
+    "<GPX version=\"1.1\" creator=\"TASMOTA\" xmlns=\"http://www.topografix.com/GPX/1/1\" \r\n"
+    "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n"
+    "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\r\n"
+    "<trk>\r\n<trkseg>\r\n"));
+}
+
+void UBXsendRecord(uint8_t *buf)
+{
+ char record[100];
+ char stime[32];
+ UBX_t::entry_t *entry = (UBX_t::entry_t*)buf;
+ snprintf_P(stime, sizeof(stime), GetDT(entry->time).c_str());
+ char lat[12];
+ char lon[12];
+ dtostrfd((double)entry->lat/10000000.0f,7,lat);
+ dtostrfd((double)entry->lon/10000000.0f,7,lon);
+ snprintf_P(record, sizeof(record),PSTR("<trkpt\n\t lat=\"%s\" lon=\"%s\">\n\t<time>%s</time>\n</trkpt>\n"),lat ,lon, stime);
+
+ WebServer->sendContent_P(record);
+}
+
+void UBXsendFooter(void)
+{
+  WebServer->sendContent(F("</trkseg>\n</trk>\n</gpx>"));
+  WebServer->sendContent("");
+  Rtc.user_time_entry = false;
+}
+
+
+
+void UBXsendFile(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+  Flog->startDownload(sizeof(UBX.rec_buffer),UBXsendHeader,UBXsendRecord,UBXsendFooter);
+}
+#endif
+
+
+
+void UBXSetRate(uint16_t interval)
+{
+  UBX.Message.cfgRate.cls = 0x06;
+  UBX.Message.cfgRate.id = 0x08;
+  UBX.Message.cfgRate.len = 6;
+  uint32_t measRate = (1000*(uint32_t)interval);
+  if (measRate > 0xffff) {
+    measRate = 0xffff;
+  }
+  UBX.Message.cfgRate.measRate = (uint16_t)measRate;
+  UBX.Message.cfgRate.navRate = 1;
+  UBX.Message.cfgRate.timeRef = 1;
+  UBXcalcChecksum(UBX.Message.cfgRate.CK, sizeof(UBX.Message.cfgRate)-sizeof(UBX.Message.cfgRate.CK));
+  DEBUG_SENSOR_LOG(PSTR("UBX: requested interval: %u seconds measRate: %u ms"), interval, UBX.Message.cfgRate.measRate);
+  UBXSerial->write(UBX.UBX_HEADER[0]);
+  UBXSerial->write(UBX.UBX_HEADER[1]);
+  for (uint32_t i =0; i<sizeof(UBX.Message.cfgRate); i++) {
+    UBXSerial->write(((uint8_t*)(&UBX.Message.cfgRate))[i]);
+    DEBUG_SENSOR_LOG(PSTR("UBX: cfgRate byte %u: %x"), i, ((uint8_t*)(&UBX.Message.cfgRate))[i]);
+  }
+  UBX.state.log_interval = 10*interval;
+}
+
+void UBXSelectMode(uint16_t mode)
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: set mode to %u"),mode);
+  switch(mode){
+#ifdef USE_FLOG
+    case 0:
+      Flog->mode = 0;
+      break;
+    case 1:
+      Flog->mode = 1;
+      break;
+    case 2:
+      UBX.mode.filter_noise = true;
+      break;
+    case 3:
+      UBX.mode.filter_noise = false;
+      break;
+    case 4:
+      Flog->startRecording(true);
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - appending"));
+      break;
+    case 5:
+      Flog->startRecording(false);
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - new log"));
+      break;
+    case 6:
+      if(Flog->recording == true){
+        Flog->stopRecording();
+      }
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: stop recording"));
+      break;
+#endif
+    case 7:
+      UBX.mode.send_when_new = 1;
+      break;
+    case 8:
+      UBX.mode.send_when_new = 0;
+      break;
+    case 9:
+      if (timeServer.beginListening()) {
+        UBX.mode.runningNTP = true;
+      }
+      break;
+    case 10:
+      UBX.mode.runningNTP = false;
+      break;
+    case 11:
+      UBX.mode.forceUTCupdate = true;
+      break;
+    case 12:
+      UBX.mode.forceUTCupdate = false;
+      break;
+    case 13:
+      Settings.latitude = UBX.rec_buffer.values.lat/10;
+      Settings.longitude = UBX.rec_buffer.values.lon/10;
+      break;
+    case 14:
+      vPortServer.begin();
+      UBX.mode.runningVPort = 1;
+      break;
+    case 15:
+
+      UBX.mode.runningVPort = 0;
+      break;
+    default:
+      if (mode>1000 && mode <1066) {
+
+        UBXSetRate(mode-1000);
+      }
+      break;
+  }
+  UBX.mode.send_UI_only = true;
+  UBXTriggerTele();
+}
+
+
+
+bool UBXHandlePOSLLH()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: iTOW: %u"),UBX.Message.navPosllh.iTOW);
+  if (UBX.state.gpsFix>1) {
+    if (UBX.mode.filter_noise) {
+      if ((UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat<abs(UBX_LAT_LON_THRESHOLD))||(UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon<abs(UBX_LAT_LON_THRESHOLD))) {
+        DEBUG_SENSOR_LOG(PSTR("UBX: Diff lat: %u lon: %u "),UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat, UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon);
+        return false;
+      }
+    }
+    UBX.rec_buffer.values.lat = UBX.Message.navPosllh.lat;
+    UBX.rec_buffer.values.lon = UBX.Message.navPosllh.lon;
+    DEBUG_SENSOR_LOG(PSTR("UBX: lat/lon: %i / %i"), UBX.rec_buffer.values.lat, UBX.rec_buffer.values.lon);
+    DEBUG_SENSOR_LOG(PSTR("UBX: hAcc: %d"), UBX.Message.navPosllh.hAcc);
+    UBX.state.last_iTOW = UBX.Message.navPosllh.iTOW;
+    UBX.state.last_alt = UBX.Message.navPosllh.alt;
+    UBX.state.last_vAcc = UBX.Message.navPosllh.vAcc;
+    UBX.state.last_hAcc = UBX.Message.navPosllh.hAcc;
+    if (UBX.mode.send_when_new) {
+      UBXTriggerTele();
+    }
+    return true;
+  } else {
+    DEBUG_SENSOR_LOG(PSTR("UBX: no valid position data"));
+  }
+  return false;
+}
+
+void UBXHandleSTATUS()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: gpsFix: %u, valid: %u"), UBX.Message.navStatus.gpsFix, (UBX.Message.navStatus.flags)&1);
+  if ((UBX.Message.navStatus.flags)&1) {
+    UBX.state.gpsFix = UBX.Message.navStatus.gpsFix;
+  } else {
+    UBX.state.gpsFix = 0;
+  }
+}
+
+void UBXHandleTIME()
+{
+  DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time: %u-%u-%u %u:%u:%u"), UBX.Message.navTime.year, UBX.Message.navTime.month ,UBX.Message.navTime.day,UBX.Message.navTime.hour,UBX.Message.navTime.min,UBX.Message.navTime.sec);
+  if (UBX.Message.navTime.valid.UTC == 1) {
+    DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time is valid"));
+    if (Rtc.user_time_entry == false || UBX.mode.forceUTCupdate) {
+      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: UTC-Time is valid, set system time"));
+      TIME_T gpsTime;
+      gpsTime.year = UBX.Message.navTime.year - 1970;
+      gpsTime.month = UBX.Message.navTime.month;
+      gpsTime.day_of_month = UBX.Message.navTime.day;
+      gpsTime.hour = UBX.Message.navTime.hour;
+      gpsTime.minute = UBX.Message.navTime.min;
+      gpsTime.second = UBX.Message.navTime.sec;
+      Rtc.utc_time = MakeTime(gpsTime);
+      Rtc.user_time_entry = true;
+    }
+  }
+}
+
+void UBXHandleOther(void)
+{
+  if (UBX.state.non_empty_loops>6) {
+    if(UBX.mode.runningVPort) return;
+    UBXinitCFG();
+    AddLog_P(LOG_LEVEL_ERROR, PSTR("UBX: possible device-reset, will re-init"));
+    UBXSerial->flush();
+    UBX.state.non_empty_loops = 0;
+  }
+}
+
+
+
+void UBXLoop50msec(void)
+{
+
+  if (UBX.mode.runningVPort){
+    if(!vPortClient.connected()) {
+      vPortClient = vPortServer.available();
+    }
+    while(vPortClient.available()) {
+      byte _newByte = vPortClient.read();
+      UBXSerial->write(_newByte);
+    }
+
+    if (UBX.TCPbufSize!=0){
+      vPortClient.write((char*)UBX.TCPbuf, UBX.TCPbufSize);
+      UBX.TCPbufSize = 0;
+    }
+  }
+
+  if(UBX.mode.runningNTP){
+    timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
+  }
+}
+
+void UBXLoop(void)
+{
+  static uint16_t counter;
+  static bool new_position;
+
+  uint32_t msgType = UBXprocessGPS();
+
+  switch(msgType){
+    case MT_NAV_POSLLH:
+      new_position = UBXHandlePOSLLH();
+      break;
+    case MT_NAV_STATUS:
+      UBXHandleSTATUS();
+      break;
+    case MT_NAV_TIME:
+      UBXHandleTIME();
+      break;
+    default:
+      UBXHandleOther();
+      break;
+  }
+
+#ifdef USE_FLOG
+  if (counter>UBX.state.log_interval) {
+    if (Flog->recording && new_position) {
+      UBX.rec_buffer.values.time = Rtc.local_time;
+      Flog->addToBuffer(UBX.rec_buffer.bytes, sizeof(UBX.rec_buffer.bytes));
+      counter = 0;
+    }
+  }
+#endif
+
+  counter++;
+}
+
+
+
+
+#ifdef USE_WEBSERVER
+
+
+#ifdef USE_FLOG
+#ifdef DEBUG_TASMOTA_SENSOR
+  const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} FLOG with %u sectors: {m}%u bytes{e}"
+                                          "{s} FLOG next sector for REC: {m} %u {e}"
+                                          "{s} %u sector(s) with data at sector: {m} %u {e}";
+  const char HTTP_SNS_FLOGREC[] PROGMEM = "{s} RECORDING (bytes in buffer) {m}%u{e}";
+#endif
+
+  const char HTTP_SNS_FLOG[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} Flash-Log {m} %s{e}";
+  const char kFLOG_STATE0[] PROGMEM = "ready";
+  const char kFLOG_STATE1[] PROGMEM = "recording";
+  const char * kFLOG_STATE[] ={kFLOG_STATE0, kFLOG_STATE1};
+
+  const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>";
+
+#endif
+  const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s} NTP server {m}active{e}";
+
+  const char HTTP_SNS_GPS[] PROGMEM = "{s} GPS latitude {m}%s{e}"
+                                      "{s} GPS longitude {m}%s{e}"
+                                      "{s} GPS altitude {m}%s   m{e}"
+                                      "{s} GPS hor. Accuracy {m}%s   m{e}"
+                                      "{s} GPS vert. Accuracy {m}%s   m{e}"
+                                      "{s} GPS sat-fix status {m}%s{e}";
+
+  const char kGPSFix0[] PROGMEM = "no fix";
+  const char kGPSFix1[] PROGMEM = "dead reckoning only";
+  const char kGPSFix2[] PROGMEM = "2D-fix";
+  const char kGPSFix3[] PROGMEM = "3D-fix";
+  const char kGPSFix4[] PROGMEM = "GPS + dead reckoning combined";
+  const char kGPSFix5[] PROGMEM = "Time only fix";
+  const char * kGPSFix[] PROGMEM ={kGPSFix0, kGPSFix1, kGPSFix2, kGPSFix3, kGPSFix4, kGPSFix5};
+
+
+
+
+#endif
+
+
+
+void UBXShow(bool json)
+{
+  char lat[12];
+  char lon[12];
+  char alt[12];
+  char hAcc[12];
+  char vAcc[12];
+  dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
+  dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
+  dtostrfd((double)UBX.state.last_alt/1000.0f,3,alt);
+  dtostrfd((double)UBX.state.last_vAcc/1000.0f,3,hAcc);
+  dtostrfd((double)UBX.state.last_hAcc/1000.0f,3,vAcc);
+
+  if (json) {
+    ResponseAppend_P(PSTR(",\"GPS\":{"));
+    if (UBX.mode.send_UI_only) {
+      uint32_t i = UBX.state.log_interval / 10;
+      ResponseAppend_P(PSTR("\"fil\":%u,\"int\":%u}"), UBX.mode.filter_noise, i);
+    } else {
+      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"alt\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, alt, hAcc, vAcc);
+    }
+#ifdef USE_FLOG
+    ResponseAppend_P(PSTR(",\"FLOG\":{\"rec\":%u,\"mode\":%u,\"sec\":%u}"), Flog->recording, Flog->mode, Flog->sectors_left);
+#endif
+    UBX.mode.send_UI_only = false;
+#ifdef USE_WEBSERVER
+  } else {
+      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, alt, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
+
+#ifdef DEBUG_TASMOTA_SENSOR
+#ifdef USE_FLOG
+    WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector);
+    if (Flog->recording) {
+      WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8);
+    }
+#endif
+#endif
+#ifdef USE_FLOG
+    if (Flog->ready) {
+      WSContentSend_P(HTTP_SNS_FLOG,kFLOG_STATE[Flog->recording]);
+    }
+    if (!Flog->recording && Flog->found_saved_data) {
+      WSContentSend_P(HTTP_BTN_FLOG_DL);
+    }
+#endif
+    if (UBX.mode.runningNTP) {
+      WSContentSend_P(HTTP_SNS_NTPSERVER);
+    }
+#endif
+  }
+}
+
+
+
+
+
+bool UBXCmd(void)
+{
+  bool serviced = true;
+  if (XdrvMailbox.data_len > 0) {
+    UBXSelectMode(XdrvMailbox.payload);
+    Response_P(S_JSON_UBX_COMMAND_NVALUE, XdrvMailbox.command, XdrvMailbox.payload);
+  }
+  return serviced;
+}
+
+
+
+
+
+bool Xsns60(uint8_t function)
+{
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    UBXDetect();
+  }
+
+  if (UBX.mode.init) {
+    switch (function) {
+      case FUNC_COMMAND_SENSOR:
+        if (XSNS_60 == XdrvMailbox.index) {
+          result = UBXCmd();
+        }
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        UBXLoop50msec();
+        break;
+      case FUNC_EVERY_100_MSECOND:
+#ifdef USE_FLOG
+        if (!Flog->running_download)
+#endif
+        {
+          UBXLoop();
+        }
+        break;
+#ifdef USE_FLOG
+      case FUNC_WEB_ADD_HANDLER:
+        WebServer->on("/UBX", UBXsendFile);
+        break;
+#endif
+      case FUNC_JSON_APPEND:
+        UBXShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+#ifdef USE_FLOG
+        if (!Flog->running_download)
+#endif
+        {
+          UBXShow(0);
+        }
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+# 38 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+#ifdef USE_SPI
+#ifdef USE_NRF24
+#ifdef USE_MIBLE
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  #define MINRF_LOG_BUFFER(x) MINRFshowBuffer(x);
+#else
+  #define MINRF_LOG_BUFFER(x)
+#endif
+# 56 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+#define XSNS_61 61
+
+#include <vector>
+
+#define FLORA 1
+#define MJ_HT_V1 2
+#define LYWSD02 3
+#define LYWSD03 4
+#define CGG1 5
+
+const uint16_t kMINRFSlaveID[5]={ 0x0098,
+                                  0x01aa,
+                                  0x045b,
+                                  0x055b,
+                                  0x0347
+                                  };
+
+const char kMINRFSlaveType1[] PROGMEM = "Flora";
+const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
+const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
+const char kMINRFSlaveType5[] PROGMEM = "CGG1";
+const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4,kMINRFSlaveType5};
+
+
+const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
+const uint32_t kMINRFMJPDU[3] = {0x4760cd66,0xdbcc0cd3,0x33048df5};
+const uint32_t kMINRFL2PDU[3] = {0x3eaa057d,0xef3b0730,0x71da7646};
+
+const uint32_t kMINRFL3PDU[3] = {0x4760cb78,0xdbcc0acd,0x33048beb};
+const uint32_t kMINRFCGPDU[3] = {0x4760cd6e,0xdbcc0cdb,0x33048dfd};
+
+
+const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};
+const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};
+
+
+#pragma pack(1)
+struct MJ_HT_V1Header_t {
+  uint8_t padding[3];
+  uint8_t mesSize;
+  uint8_t padding2;
+  uint16_t uuid;
+  uint16_t type;
+  uint8_t padding3[2];
+  uint8_t counter;
+  uint8_t serial[6];
+  uint8_t mode;
+  uint8_t padding5;
+  uint8_t effectiveDataLength;
+  };
+
+struct FlowerHeader_t {
+  uint8_t padding[4];
+  uint8_t padding2;
+  uint16_t uuid;
+  uint8_t mesSize;
+  uint8_t padding22;
+  uint16_t uuid2;
+  uint16_t type;
+  uint8_t padding3[2];
+  uint8_t counter;
+  uint8_t serial[6];
+  uint8_t padding4;
+  uint8_t mode;
+  };
+
+union floraPacket_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } T;
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint32_t data:24;
+  } L;
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint8_t data;
+  } M;
+  struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } F;
+};
+
+union MJ_HT_V1Packet_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t temp;
+      uint16_t hum;
+  } TH;
+      struct {
+      uint8_t padding[3];
+      uint8_t serial[6];
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint8_t battery;
+  } B;
+
+};
+
+union LYWSD02Packet_t {
+  struct {
+      uint16_t idWord;
+      uint8_t padding;
+      uint8_t serial[6];
+      uint8_t padding4;
+      uint8_t mode;
+      uint8_t valueTen;
+      uint8_t effectiveDataLength;
+      uint16_t data;
+  } TH;
+};
+
+struct bleAdvPacket_t {
+  uint8_t pduType;
+  uint8_t payloadSize;
+  uint8_t mac[6];
+  union {
+    uint8_t payload[24];
+    MJ_HT_V1Header_t header;
+    FlowerHeader_t flowerHeader;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+        uint8_t hum_lb;
+    } TH;
+    struct {
+        uint8_t padding[21];
+        uint16_t temp;
+    } T;
+    struct {
+        uint8_t padding[21];
+        uint16_t hum;
+    } H;
+    struct {
+        uint8_t padding[21];
+        uint8_t battery;
+    } B;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+    } F_T;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+        uint8_t data2;
+    } F_L;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint8_t data;
+    } F_M;
+    struct {
+        uint8_t padding[2];
+        uint8_t mode;
+        uint16_t size;
+        uint16_t data;
+    } F_F;
+  };
+};
+
+union FIFO_t{
+  bleAdvPacket_t bleAdv;
+  floraPacket_t floraPacket;
+  MJ_HT_V1Packet_t MJ_HT_V1Packet;
+  LYWSD02Packet_t LYWSD02Packet;
+  uint8_t raw[32];
+};
+
+#pragma pack(0)
+
+struct {
+  const uint8_t channel[3] = {37,38,39};
+  const uint8_t frequency[3] = { 2,26,80};
+
+  uint16_t timer;
+  uint8_t currentChan=0;
+  FIFO_t buffer;
+  uint8_t packetMode;
+
+#ifdef DEBUG_TASMOTA_SENSOR
+  uint8_t streamBuffer[sizeof(buffer)];
+  uint8_t lsfrBuffer[sizeof(buffer)];
+#endif
+
+} MINRF;
+
+struct mi_sensor_t{
+  uint8_t type;
+  uint8_t serial[6];
+  uint8_t showedUp;
+  float temp;
+  union {
+    struct {
+      float moisture;
+      float fertility;
+      uint32_t lux;
+    };
+    struct {
+      float hum;
+      uint8_t bat;
+    };
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+
+
+
+bool MINRFinitBLE(uint8_t _mode)
+{
+  if (MINRF.timer%1000 == 0){
+    NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
+    NRF24radio.setAutoAck(false);
+    NRF24radio.setDataRate(RF24_1MBPS);
+    NRF24radio.disableCRC();
+    NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+    NRF24radio.setRetries(0,0);
+    NRF24radio.setPALevel(RF24_PA_MIN);
+    NRF24radio.setAddressWidth(4);
+
+
+    NRF24radio.powerUp();
+  }
+  if(NRF24radio.isChipConnected()){
+
+    MINRFchangePacketModeTo(_mode);
+    return true;
+  }
+
+  return false;
+}
+
+void MINRFhopChannel()
+{
+  MINRF.currentChan++;
+  if(MINRF.currentChan >= sizeof(MINRF.channel)) {
+    MINRF.currentChan = 0;
+  }
+  NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
+}
+
+
+
+
+
+
+
+bool MINRFreceivePacket(void)
+{
+  if(!NRF24radio.available()) {
+    return false;
+  }
+  while(NRF24radio.available()) {
+
+
+    NRF24radio.read( &MINRF.buffer, sizeof(MINRF.buffer) );
+#ifdef DEBUG_TASMOTA_SENSOR
+    memcpy(&MINRF.streamBuffer, &MINRF.buffer, sizeof(MINRF.buffer));
+#endif
+    MINRFswapbuf( sizeof(MINRF.buffer) );
+
+
+
+    switch (MINRF.packetMode) {
+      case 0:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), MINRF.channel[MINRF.currentChan] | 0x40);
+      break;
+      case 1:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
+      break;
+      case 2:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
+      break;
+      case 3:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
+      break;
+      case 4:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
+      break;
+      case 5:
+      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
+      break;
+    }
+
+
+  }
+
+  return true;
+}
+
+#ifdef DEBUG_TASMOTA_SENSOR
+void MINRFshowBuffer(uint8_t (&buf)[32]){
+
+
+
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
+                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
+  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
+  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
+  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
+  );
+}
+#endif
+
+
+
+
+
+
+void MINRFswapbuf(uint8_t len)
+{
+  uint8_t* buf = (uint8_t*)&MINRF.buffer;
+  while(len--) {
+    uint8_t a = *buf;
+    uint8_t v = 0;
+    if (a & 0x80) v |= 0x01;
+    if (a & 0x40) v |= 0x02;
+    if (a & 0x20) v |= 0x04;
+    if (a & 0x10) v |= 0x08;
+    if (a & 0x08) v |= 0x10;
+    if (a & 0x04) v |= 0x20;
+    if (a & 0x02) v |= 0x40;
+    if (a & 0x01) v |= 0x80;
+    *(buf++) = v;
+  }
+}
+# 430 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
+{
+  while(len--) {
+    uint8_t res = 0;
+
+    for (uint8_t i = 1; i; i <<= 1) {
+      if (lfsr & 0x01) {
+        lfsr ^= 0x88;
+        res |= i;
+      }
+      lfsr >>= 1;
+    }
+    *(buf++) ^= res;
+#ifdef DEBUG_TASMOTA_SENSOR
+    MINRF.lsfrBuffer[31-len] = lfsr;
+#endif
+  }
+}
+
+void MINRFreverseMAC(uint8_t _mac[]){
+  uint8_t _reversedMAC[6];
+  for (uint8_t i=0; i<6; i++){
+    _reversedMAC[5-i] = _mac[i];
+  }
+  memcpy(_mac,_reversedMAC, sizeof(_reversedMAC));
+}
+
+
+
+
+
+
+void MINRFchangePacketModeTo(uint8_t _mode) {
+  uint32_t (_nextchannel) = MINRF.currentChan+1;
+  if (_nextchannel>2) _nextchannel=0;
+
+  switch(_mode){
+    case 0:
+      NRF24radio.openReadingPipe(0,0x6B7D9171);
+    break;
+    case 1:
+      NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]);
+    break;
+    case 2:
+      NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]);
+    break;
+    case 3:
+      NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);
+    break;
+    case 4:
+      if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
+      NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);
+    break;
+    case 5:
+      NRF24radio.openReadingPipe(0,kMINRFCGPDU[_nextchannel]);
+    break;
+  }
+
+  MINRF.packetMode = _mode;
+}
+# 498 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
+uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint16_t _type){
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: will test ID-type: %x"), _type);
+  bool _success = false;
+  for (uint32_t i=0;i<5;i++){
+    if(_type == kMINRFSlaveID[i]){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID is type %u"), i);
+      _type = i+1;
+      _success = true;
+    }
+    else {
+      DEBUG_SENSOR_LOG(PSTR("MINRF: ID-type is not: %x"),kMINRFSlaveID[i]);
+    }
+  }
+  if(!_success) return 0xff;
+
+  DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){
+        MIBLEsensors.at(i).showedUp++;
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MINRF i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
+    DEBUG_SENSOR_LOG(PSTR("MINRF n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MINRF: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0x00ffffff;
+      break;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+
+
+
+
+
+void MINRFpurgeFakeSensors(void){
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(MIBLEsensors.at(i).showedUp<3){
+      DEBUG_SENSOR_LOG(PSTR("MINRF: remove FAKE sensor at slot: %u"), i);
+      MIBLEsensors.erase(MIBLEsensors.begin()+i);
+    }
+  }
+}
+
+
+void MINRFhandleFloraPacket(void){
+  if(MINRF.buffer.floraPacket.T.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, MINRF.buffer.floraPacket.T.idWord);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.floraPacket.L.mode) {
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.T.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MINRF.buffer.floraPacket.T.data );
+    break;
+    case 7:
+    if(true){
+        MIBLEsensors.at(_slot).lux=MINRF.buffer.floraPacket.L.data;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U24: %x Lux"), MINRF.buffer.floraPacket.L.data);
+    break;
+    case 8:
+    _tempFloat =(float)MINRF.buffer.floraPacket.M.data;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).moisture=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MINRF.buffer.floraPacket.M.data);
+    break;
+    case 9:
+    _tempFloat=(float)(MINRF.buffer.floraPacket.F.data);
+    if(_tempFloat<65535){
+        MIBLEsensors.at(_slot).fertility=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MINRF.buffer.floraPacket.F.data);
+    break;
+  }
+}
+
+void MINRFhandleMJ_HT_V1Packet(void){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
+void MINRFhandleLYWSD02Packet(void){
+  if(MINRF.buffer.LYWSD02Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected LYWSD02-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.LYWSD02Packet.TH.mode) {
+    case 4:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+    case 6:
+    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
+    if(_tempFloat<101){
+        MIBLEsensors.at(_slot).hum=_tempFloat;
+    }
+    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MINRF.buffer.LYWSD02Packet.TH.data );
+    break;
+  }
+}
+
+void MINRFhandleLYWSD03Packet(void){
+
+  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+    if(_slot==0xff) return;
+
+  MINRF_LOG_BUFFER(MINRF.streamBuffer);
+  MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+  MINRF_LOG_BUFFER(MINRF.buffer.raw);
+}
+
+void MINRFhandleCGG1Packet(void){
+  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected CGG1-packet"));
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    return;
+  }
+  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
+  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord);
+  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
+  if(_slot==0xff) return;
+
+  static float _tempFloat;
+  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
+    case 0x0d:
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: temp updated"));
+    }
+    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
+    if(_tempFloat<100){
+        MIBLEsensors.at(_slot).hum = _tempFloat;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: hum updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
+    break;
+    case 0x0a:
+    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
+        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
+        DEBUG_SENSOR_LOG(PSTR("CGG1: bat updated"));
+    }
+    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
+    break;
+  }
+}
+
+
+
+
+
+void MINRF_EVERY_50_MSECOND() {
+
+  if(MINRF.timer>6000){
+    DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
+    MINRFpurgeFakeSensors();
+    MINRF.timer=0;
+  }
+  MINRF.timer++;
+
+  if (!MINRFreceivePacket()){
+
+  }
+
+  else if(MINRF.buffer.bleAdv.header.uuid==0xfe95){
+    MINRF_LOG_BUFFER(MINRF.streamBuffer);
+    MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
+    MINRF_LOG_BUFFER(MINRF.buffer.raw);
+    DEBUG_SENSOR_LOG(PSTR("MINRF: Type: %x"), MINRF.buffer.bleAdv.header.type);
+    switch(MINRF.buffer.bleAdv.header.type){
+      case 0x2050:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: MJ_HT_V1 Packet"));
+      break;
+      case 0x1613:case 0x1614:case 0x1615:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: Flora Packet"));
+      break;
+      default:
+      DEBUG_SENSOR_LOG(PSTR("MINRF: unknown Packet"));
+      break;
+    }
+  }
+  else if (MINRF.packetMode == FLORA){
+    MINRFhandleFloraPacket();
+  }
+  else if (MINRF.packetMode == MJ_HT_V1){
+    MINRFhandleMJ_HT_V1Packet();
+  }
+  else if (MINRF.packetMode == LYWSD02){
+    MINRFhandleLYWSD02Packet();
+  }
+  else if (MINRF.packetMode == LYWSD03){
+    MINRFhandleLYWSD03Packet();
+  }
+  else if (MINRF.packetMode == CGG1){
+    MINRFhandleCGG1Packet();
+  }
+  if (MINRF.packetMode == CGG1){
+    MINRFinitBLE(1);
+  }
+  else {
+    MINRFinitBLE(++MINRF.packetMode);
+  }
+
+  MINRFhopChannel();
+  NRF24radio.startListening();
+}
+
+
+
+
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_MINRF_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_MINRF_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
+
+void MINRFShow(bool json)
+{
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      if(MIBLEsensors.at(i).showedUp < 3){
+        DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+        break;
+        }
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kMINRFSlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
+    }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        if(MIBLEsensors.at(i).showedUp < 3){
+          DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
+          break;
+          }
+        WSContentSend_PD(HTTP_MINRF_HL);
+        WSContentSend_PD(HTTP_MINRF_MAC, kMINRFSlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kMINRFSlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          if(MIBLEsensors.at(i).lux!=0x00ffffff){
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_MINRF_FLORA_DATA, kMINRFSlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kMINRFSlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
+        }
+      }
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns61(uint8_t function)
+{
+  bool result = false;
+
+  if (NRF24.chipType) {
+    switch (function) {
+      case FUNC_INIT:
+        MINRFinitBLE(1);
+        AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: started"));
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        MINRF_EVERY_50_MSECOND();
+        break;
+      case FUNC_JSON_APPEND:
+        MINRFShow(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        MINRFShow(0);
+        break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+# 30 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+#ifdef USE_HM10
+
+#define XSNS_62 62
+
+#include <TasmotaSerial.h>
+#include <vector>
+
+TasmotaSerial *HM10Serial;
+#define HM10_BAUDRATE 115200
+
+#define HM10_MAX_TASK_NUMBER 12
+uint8_t HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];
+
+#define HM10_MAX_RX_BUF 512
+char HM10_RX_STRING[HM10_MAX_RX_BUF] = {0};
+
+struct {
+  uint8_t current_task_delay;
+  uint8_t last_command;
+  uint16_t firmware;
+  uint32_t period;
+  uint32_t serialSpeed;
+  union {
+    uint32_t time;
+    uint8_t timebuf[4];
+  };
+  struct {
+    uint32_t init:1;
+    uint32_t pending_task:1;
+    uint32_t connected:1;
+    uint32_t subscribed:1;
+    uint32_t awaitingHT:1;
+    uint32_t awaitingB:1;
+
+  } mode;
+  struct {
+    uint8_t sensor;
+
+  } state;
+} HM10;
+
+#pragma pack(1)
+struct {
+  uint16_t temp;
+  uint8_t hum;
+} LYWSD0x_HT;
+#pragma pack(0)
+
+struct mi_sensor_t{
+  uint8_t type;
+  uint8_t serial[6];
+  uint8_t showedUp;
+  float temp;
+  union {
+    struct {
+      float moisture;
+      float fertility;
+      uint16_t lux;
+    };
+    struct {
+      float hum;
+      uint8_t bat;
+    };
+  };
+};
+
+std::vector<mi_sensor_t> MIBLEsensors;
+
+
+
+
+
+#define D_CMND_HM10 "HM10"
+
+const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
+const char S_JSON_HM10_COMMAND[] PROGMEM = "{\"" D_CMND_HM10 "%s%s\"}";
+const char kHM10_Commands[] PROGMEM = "Scan|AT|Period|Baud|Time";
+
+#define FLORA 1
+#define MJ_HT_V1 2
+#define LYWSD02 3
+#define LYWSD03MMC 4
+
+uint8_t kHM10SlaveID[4][3] = { 0xC4,0x7C,0x8D,
+                                0x58,0x2D,0x34,
+                                0xE7,0x2E,0x00,
+                                0xA4,0xC1,0x38,
+                                };
+
+const char kHM10SlaveType1[] PROGMEM = "Flora";
+const char kHM10SlaveType2[] PROGMEM = "MJ_HT_V1";
+const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
+const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
+const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
+
+
+
+
+
+enum HM10_Commands {
+  CMND_HM10_DISC_SCAN,
+  CMND_HM10_AT,
+  CMND_HM10_PERIOD,
+  CMND_HM10_BAUD,
+  CMND_HM10_TIME
+  };
+
+
+
+
+
+#define TASK_HM10_NOTASK 0
+#define TASK_HM10_ROLE1 1
+#define TASK_HM10_IMME1 2
+#define TASK_HM10_RENEW 3
+#define TASK_HM10_RESET 4
+#define TASK_HM10_DISC 5
+#define TASK_HM10_CONN 6
+#define TASK_HM10_VERSION 7
+#define TASK_HM10_NAME 8
+#define TASK_HM10_FEEDBACK 9
+#define TASK_HM10_DISCONN 10
+#define TASK_HM10_SUB_L3 11
+#define TASK_HM10_READ_HT 12
+#define TASK_HM10_FINDALLCHARS 13
+#define TASK_HM10_UN_L3 14
+#define TASK_HM10_DELAY_SUB 15
+#define TASK_HM10_READ_BT_L3 16
+#define TASK_HM10_SUB_L2 17
+#define TASK_HM10_UN_L2 18
+#define TASK_HM10_READ_BT_L2 19
+#define TASK_HM10_TIME_L2 20
+
+#define TASK_HM10_DONE 99
+
+
+
+
+
+void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
+                          HM10_TASK_LIST[slot][0] = task;
+                          HM10_TASK_LIST[slot][1] = delay;
+                          HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;
+                          HM10.current_task_delay = HM10_TASK_LIST[0][1];
+}
+
+void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
+                          HM10.last_command = HM10_TASK_LIST[slot][0];
+                          HM10_TASK_LIST[slot][0] = task;
+}
+
+
+
+
+
+void HM10_Reset(void) { HM10_Launchtask(TASK_HM10_DISCONN,0,1);
+                          HM10_Launchtask(TASK_HM10_ROLE1,1,1);
+                          HM10_Launchtask(TASK_HM10_IMME1,2,1);
+                          HM10_Launchtask(TASK_HM10_RESET,3,1);
+                          HM10_Launchtask(TASK_HM10_VERSION,4,10);
+                          HM10_Launchtask(TASK_HM10_DISC,5,50);
+                          }
+
+void HM10_Discovery_Scan(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,1);
+                          HM10_Launchtask(TASK_HM10_DISC,1,1);
+                          }
+
+void HM10_Read_LYWSD03(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
+                          HM10_Launchtask(TASK_HM10_SUB_L3,2,20);
+                          HM10_Launchtask(TASK_HM10_UN_L3,3,80);
+                          HM10_Launchtask(TASK_HM10_READ_BT_L3,4,5);
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
+                          }
+
+void HM10_Read_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_CONN,0,1);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
+                          HM10_Launchtask(TASK_HM10_SUB_L2,2,20);
+                          HM10_Launchtask(TASK_HM10_UN_L2,3,80);
+                          HM10_Launchtask(TASK_HM10_READ_BT_L2,4,5);
+                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
+                          }
+
+void HM10_Time_LYWSD02(void) {
+                          HM10_Launchtask(TASK_HM10_DISCONN,0,0);
+                          HM10_Launchtask(TASK_HM10_CONN,1,5);
+                          HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);
+                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);
+                          HM10_Launchtask(TASK_HM10_DISCONN,4,5);
+                          }
+# 231 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
+  if(_type==0xff){
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: will test MAC-type"));
+    for (uint32_t i=0;i<4;i++){
+      if(memcmp(_serial,kHM10SlaveID+i,3)==0){
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC is type %u"), i);
+        _type = i+1;
+      }
+      else {
+        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC-type is unknown"));
+      }
+    }
+  }
+  if(_type==0xff) return _type;
+
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
+  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
+    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
+      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
+      if(MIBLEsensors.at(i).showedUp < 3){
+        MIBLEsensors.at(i).showedUp++;
+      }
+      return i;
+    }
+    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[0], _serial[1], _serial[2],_serial[3],_serial[4],_serial[5]);
+  }
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
+  mi_sensor_t _newSensor;
+  memcpy(_newSensor.serial,_serial, sizeof(_serial));
+  _newSensor.type = _type;
+  _newSensor.showedUp = 1;
+  _newSensor.temp =-1000.0f;
+  switch (_type)
+    {
+    case 1:
+      _newSensor.moisture =-1000.0f;
+      _newSensor.fertility =-1000.0f;
+      _newSensor.lux = 0xffff;
+      break;
+    case 2: case 3: case 4:
+      _newSensor.hum=-1.0f;
+      _newSensor.bat=0xff;
+      break;
+    default:
+      break;
+    }
+  MIBLEsensors.push_back(_newSensor);
+  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
+  return MIBLEsensors.size()-1;
+};
+
+
+
+
+
+
+
+void HM10SerialInit(void) {
+  HM10.mode.init = false;
+  HM10.serialSpeed = HM10_BAUDRATE;
+  HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
+  if (HM10Serial->begin(HM10.serialSpeed)) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
+    if (HM10Serial->hardwareSerial()) {
+      ClaimSerial();
+      DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
+    }
+    HM10_Reset();
+    HM10.mode.pending_task = 1;
+    HM10.mode.init = 1;
+    HM10.period = Settings.tele_period;
+    DEBUG_SENSOR_LOG(PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
+  }
+  return;
+}
+# 315 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
+void HM10MACStringToBytes(const char* string, uint8_t _mac[]) {
+    uint32_t index = 0;
+    while (index < 12) {
+        char c = string[index];
+        uint32_t value = 0;
+        if(c >= '0' && c <= '9')
+          value = (c - '0');
+        else if (c >= 'A' && c <= 'F')
+          value = (10 + (c - 'A'));
+        _mac[(index/2)] += value << (((index + 1) % 2) * 4);
+
+        index++;
+    }
+    DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_mac[0],_mac[1],_mac[2],_mac[3],_mac[4],_mac[5]);
+}
+
+
+
+
+
+
+void HM10ParseResponse(char *buf) {
+    if (!strncmp(buf,"OK",2)) {
+       DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
+     }
+    if (!strncmp(buf,"HMSoft",6)) {
+      const char* _fw = "000";
+      memcpy((void *)_fw,(void *)(buf+8),3);
+      HM10.firmware = atoi(_fw);
+      DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
+      return;
+     }
+    char * _pos = strstr(buf, "IS0:");
+    if(_pos) {
+      const char* _mac = "000000000000";
+      memcpy((void *)_mac,(void *)(_pos+4),12);
+      DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
+      uint8_t _newMacArray[6] = {0};
+      HM10MACStringToBytes(_mac, _newMacArray);
+      DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
+      MIBLEgetSensorSlot(_newMacArray, 0xff);
+    }
+    if (strstr(buf, "LOST")){
+      HM10.mode.connected = false;
+    }
+    else {
+      DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
+    }
+}
+
+void HM10readTempHum(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0 && _buf[1] != 0){
+    memcpy(&LYWSD0x_HT,(void *)_buf,3);
+    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD0x_HT.temp,LYWSD0x_HT.hum);
+    uint32_t _slot = HM10.state.sensor;
+
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    static float _tempFloat;
+    _tempFloat=(float)(LYWSD0x_HT.temp)/100.0f;
+    if(_tempFloat<60){
+        MIBLEsensors.at(_slot).temp=_tempFloat;
+        HM10.mode.awaitingHT = false;
+        HM10.current_task_delay = 0;
+    }
+    _tempFloat=(float)LYWSD0x_HT.hum;
+    if(_tempFloat<100){
+      MIBLEsensors.at(_slot).hum = _tempFloat;
+      DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
+    }
+  }
+}
+
+bool HM10readBat(char *_buf){
+  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
+  if(_buf[0] != 0){
+    DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
+    uint32_t _slot = HM10.state.sensor;
+    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
+    if(_buf[0]<101){
+        MIBLEsensors.at(_slot).bat=_buf[0];
+        return true;
+    }
+  }
+  return false;
+}
+
+
+
+
+
+bool HM10SerialHandleFeedback(){
+  bool success = false;
+  uint32_t i = 0;
+  char ret[HM10_MAX_RX_BUF] = {0};
+
+
+  while(HM10Serial->available()) {
+
+    if(i<HM10_MAX_RX_BUF){
+      ret[i] = HM10Serial->read();
+    }
+    i++;
+    success = true;
+  }
+  if(HM10.mode.awaitingHT) {
+    if (HM10.mode.connected) HM10readTempHum(ret);
+  }
+  else if(HM10.mode.awaitingB) {
+    if (HM10.mode.connected) {
+      if (HM10readBat(ret)){
+        HM10.mode.awaitingB = false;
+        HM10.current_task_delay = 0;
+      }
+    }
+  }
+  else if(success) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
+    HM10ParseResponse(ret);
+  }
+  else {
+
+  }
+  return success;
+}
+
+
+
+
+
+void HM10_TaskEvery100ms(){
+  if (HM10.current_task_delay == 0) {
+    uint8_t i = 0;
+    bool runningTaskLoop = true;
+    while (runningTaskLoop) {
+      switch(HM10_TASK_LIST[i][0]) {
+        case TASK_HM10_ROLE1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+ROLE1");
+          break;
+        case TASK_HM10_IMME1:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+IMME1");
+          break;
+        case TASK_HM10_DISC:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start discovery"),D_CMND_HM10);
+          HM10.current_task_delay = 35;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+DISC?");
+          break;
+        case TASK_HM10_VERSION:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+VERR?");
+          break;
+        case TASK_HM10_NAME:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NAME?");
+          break;
+        case TASK_HM10_CONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s connect"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          char _con[20];
+          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
+          HM10Serial->write(_con);
+          HM10.mode.awaitingB = false;
+          HM10.mode.connected = true;
+          break;
+        case TASK_HM10_DISCONN:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT");
+          break;
+        case TASK_HM10_RESET:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
+          HM10Serial->write("AT+RESET");
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_SUB_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 25;
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON0037");
+          break;
+        case TASK_HM10_UN_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.awaitingHT = false;
+          HM10Serial->write("AT+NOTIFYOFF0037");
+          break;
+        case TASK_HM10_SUB_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 25;
+          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+NOTIFY_ON003C");
+          break;
+        case TASK_HM10_UN_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.mode.awaitingHT = false;
+          HM10Serial->write("AT+NOTIFYOFF003C");
+          break;
+        case TASK_HM10_TIME_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set time"),D_CMND_HM10);
+          HM10.current_task_delay = 5;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10.time = Rtc.utc_time;
+          HM10Serial->write("AT+SEND_DATAWR002F");
+          HM10Serial->write(HM10.timebuf,4);
+          HM10Serial->write(Rtc.time_timezone / 60);
+          AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s Time-string: %x%x%x%x%x"),D_CMND_HM10, HM10.timebuf[0],HM10.timebuf[1],HM10.timebuf[2],HM10.timebuf[3],(Rtc.time_timezone /60));
+          break;
+        case TASK_HM10_READ_HT:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
+          HM10.current_task_delay = 0;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA0036?");
+          HM10.mode.awaitingHT = true;
+          break;
+        case TASK_HM10_READ_BT_L3:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA003A?");
+          HM10.mode.awaitingB = true;
+          break;
+        case TASK_HM10_READ_BT_L2:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0043"),D_CMND_HM10);
+          HM10.current_task_delay = 2;
+          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
+          runningTaskLoop = false;
+          HM10Serial->write("AT+READDATA0043?");
+          HM10.mode.awaitingB = true;
+          break;
+
+
+
+
+
+
+
+        case TASK_HM10_FEEDBACK:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_DELAY_SUB:
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start reading"),D_CMND_HM10);
+          HM10SerialHandleFeedback();
+          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
+          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
+          HM10.mode.awaitingHT = true;
+          runningTaskLoop = false;
+          break;
+        case TASK_HM10_DONE:
+
+
+          if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {
+            DEBUG_SENSOR_LOG(PSTR("%sno Tasks left"),D_CMND_HM10);
+            DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
+            for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {
+              DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
+              HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;
+              HM10_TASK_LIST[j][1] = 0;
+            }
+            runningTaskLoop = false;
+            HM10.mode.pending_task = 0;
+            break;
+          }
+      }
+      i++;
+    }
+  }
+  else {
+    HM10.current_task_delay--;
+  }
+}
+
+
+
+
+
+
+void HM10EverySecond(){
+  if(HM10.firmware == 0) return;
+  if(HM10.mode.pending_task == 1) return;
+  if (MIBLEsensors.size()==0) return;
+
+  static uint32_t _counter = 0;
+  static uint32_t _nextSensorSlot = 0;
+  if(_counter==0) {
+    HM10.state.sensor = _nextSensorSlot;
+    _nextSensorSlot++;
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_LYWSD03();
+    }
+    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD02) {
+      HM10.mode.pending_task = 1;
+      HM10_Read_LYWSD02();
+    }
+    if (HM10.state.sensor==MIBLEsensors.size()-1) {
+      _nextSensorSlot= 0;
+      _counter++;
+    }
+    DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
+  }
+  else _counter++;
+  if (_counter>HM10.period) _counter = 0;
+}
+
+bool HM10Cmd(void) {
+  char command[CMDSZ];
+  bool serviced = true;
+  uint8_t disp_len = strlen(D_CMND_HM10);
+
+  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_HM10), disp_len)) {
+    uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kHM10_Commands);
+    switch (command_code) {
+      case CMND_HM10_PERIOD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_PERIOD) { HM10.period = XdrvMailbox.payload; }
+        }
+        else {
+          if (command_code == CMND_HM10_PERIOD) XdrvMailbox.payload = HM10.period;
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_BAUD:
+        if (XdrvMailbox.data_len > 0) {
+          if (command_code == CMND_HM10_BAUD) {
+            HM10.serialSpeed = XdrvMailbox.payload;
+            HM10Serial->begin(HM10.serialSpeed);
+            }
+        }
+        else {
+          if (command_code == CMND_HM10_BAUD) XdrvMailbox.payload = HM10.serialSpeed;
+        }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_TIME:
+        if (XdrvMailbox.data_len > 0) {
+          if(MIBLEsensors.size()>XdrvMailbox.payload){
+            if(MIBLEsensors.at(XdrvMailbox.payload).type == LYWSD02){
+              HM10.state.sensor = XdrvMailbox.payload;
+              HM10_Time_LYWSD02();
+              }
+            }
+          }
+        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
+        break;
+      case CMND_HM10_AT:
+        HM10Serial->write("AT");
+        if (strlen(XdrvMailbox.data)!=0) {
+          HM10Serial->write("+");
+          HM10Serial->write(XdrvMailbox.data);
+          Response_P(S_JSON_HM10_COMMAND, ":AT+",XdrvMailbox.data);
+        }
+        else Response_P(S_JSON_HM10_COMMAND, ":AT",XdrvMailbox.data);
+        break;
+      case CMND_HM10_DISC_SCAN:
+        if (command_code == CMND_HM10_DISC_SCAN) { HM10_Discovery_Scan(); }
+        Response_P(S_JSON_HM10_COMMAND, command, "");
+        break;
+      default:
+
+       serviced = false;
+     break;
+    }
+  } else {
+    return false;
+  }
+  return serviced;
+}
+
+
+
+
+
+
+const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
+const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
+const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
+const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
+const char HTTP_HM10_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
+
+void HM10Show(bool json)
+{
+  if (json) {
+    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+      char slave[33];
+      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+      char temperature[33];
+      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+
+      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          char lux[33];
+          char moisture[33];
+          char fertility[33];
+          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
+          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
+          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          char humidity[33];
+          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
+          }
+        }
+        ResponseAppend_P(PSTR("}"));
+    }
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_HM10, HM10.firmware);
+      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
+        WSContentSend_PD(HTTP_HM10_HL);
+        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
+        if(MIBLEsensors.at(i).temp!=-1000.0f){
+          char temperature[33];
+          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
+          WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
+        }
+        if (MIBLEsensors.at(i).type==FLORA){
+          if(MIBLEsensors.at(i).lux!=0xffff){
+            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
+          }
+          if(MIBLEsensors.at(i).moisture!=-1000.0f){
+            WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
+          }
+          if(MIBLEsensors.at(i).fertility!=-1000.0f){
+            char fertility[33];
+            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
+            WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
+          }
+        }
+        if (MIBLEsensors.at(i).type>FLORA){
+          if(MIBLEsensors.at(i).hum!=-1.0f){
+            char humidity[33];
+            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
+            WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
+          }
+          if(MIBLEsensors.at(i).bat!=0xff){
+            WSContentSend_PD(HTTP_BATTERY, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
+          }
+        }
+      }
+#endif
+    }
+}
+
+
+
+
+
+bool Xsns62(uint8_t function)
+{
+  bool result = false;
+
+  if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) {
+    switch (function) {
+      case FUNC_INIT:
+        HM10SerialInit();
+        break;
+      case FUNC_EVERY_50_MSECOND:
+        HM10SerialHandleFeedback();
+       break;
+      case FUNC_EVERY_100_MSECOND:
+        if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
+          HM10_TaskEvery100ms();
+        }
+        break;
+      case FUNC_EVERY_SECOND:
+        HM10EverySecond();
+        break;
+      case FUNC_COMMAND:
+        result = HM10Cmd();
+        break;
+      case FUNC_JSON_APPEND:
+        HM10Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+        HM10Show(0);
+        break;
+#endif
+      }
+  }
+  return result;
+}
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_63_aht1x.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_63_aht1x.ino"
+#ifdef USE_I2C
+#ifdef USE_AHT1x
+
+
+
+
+
+
+#define XSNS_63 63
+#define XI2C_43 43
+
+#define AHT10_ADDR 0x38
+
+uint8_t eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
+uint8_t eSensorNormalCmd[3] = {0xA8, 0x00, 0x00};
+uint8_t eSensorMeasureCmd[3] = {0xAC, 0x33, 0x00};
+uint8_t eSensorResetCmd = 0xBA;
+
+struct AHT10 {
+  float humidity = NAN;
+  float temperature = NAN;
+  uint8_t valid = 0;
+  uint8_t count = 0;
+  char name[6] = "AHT1x";
+} AHT10;
+
+bool AHT10Read(void)
+{
+  if (AHT10.valid) { AHT10.valid--; }
+
+  uint8_t data[6];
+
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorMeasureCmd, 3);
+  Wire.endTransmission();
+  delay(100);
+
+  Wire.requestFrom(AHT10_ADDR, 6);
+  for (uint32_t i = 0; Wire.available() > 0; i++) {
+    data[i] = Wire.read();
+  }
+
+  uint32_t result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
+  uint32_t result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
+
+  float humidity = result_h * 100 / 1048576;
+  float temperature = ((200 * result_t) / 1048576) - 50;
+
+  if (isnan(temperature) || isnan(humidity)) { return false; }
+
+  AHT10.humidity = ConvertHumidity(humidity);
+  AHT10.temperature = ConvertTemp(temperature);
+
+  AHT10.valid = SENSOR_MAX_MISS;
+  return true;
+}
+
+
+
+bool AHT10Init(void)
+{
+  Wire.begin(AHT10_ADDR);
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorCalibrateCmd, 3);
+  Wire.endTransmission();
+
+  delay(500);
+
+  return (0x08 == (AHT10ReadStatus() & 0x68));
+}
+
+uint8_t AHT10ReadStatus(void)
+{
+  Wire.requestFrom(AHT10_ADDR, 1);
+  uint8_t result = Wire.read();
+  return result;
+}
+
+void AHT10Reset(void)
+{
+  Wire.beginTransmission(AHT10_ADDR);
+  Wire.write(eSensorResetCmd);
+  Wire.endTransmission();
+  delay(20);
+}
+
+
+
+void AHT10Detect(void)
+{
+  if (I2cActive(AHT10_ADDR)) { return; }
+
+  if (AHT10Init()) {
+    I2cSetActiveFound(AHT10_ADDR, AHT10.name);
+    AHT10.count = 1;
+  }
+}
+
+void AHT10EverySecond(void)
+{
+  if (uptime &1) {
+
+    if (!AHT10Read()) {
+      AddLogMissed(AHT10.name, AHT10.valid);
+    }
+  }
+}
+
+void AHT10Show(bool json)
+{
+  if (AHT10.valid) {
+    char temperature[33];
+    dtostrfd(AHT10.temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(AHT10.humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json) {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, AHT10.name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period)) {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif
+#ifdef USE_KNX
+      if (0 == tele_period) {
+        KnxSensor(KNX_TEMPERATURE, AHT10.temperature);
+        KnxSensor(KNX_HUMIDITY, AHT10.humidity);
+      }
+#endif
+#ifdef USE_WEBSERVER
+    } else {
+      WSContentSend_PD(HTTP_SNS_TEMP, AHT10.name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, AHT10.name, humidity);
+#endif
+    }
+  }
+}
+
+
+
+
+
+bool Xsns63(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_43)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    AHT10Detect();
+  }
+  else if (AHT10.count) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      AHT10EverySecond();
+      break;
+    case FUNC_JSON_APPEND:
+      AHT10Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      AHT10Show(0);
+      break;
+#endif
+    }
+  }
+  return result;
+}
+
+#endif
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
+# 22 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
+#ifdef USE_PROMETHEUS
+
+
+
+
+#define XSNS_91 91
+
+void HandleMetrics(void)
+{
+  if (!HttpCheckPriviledgedAccess()) { return; }
+
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR("Prometheus"));
+
+  WSContentBegin(200, CT_PLAIN);
+
+
+  char parameter[FLOATSZ];
+
+  if (global_temperature != 9999) {
+    dtostrfd(global_temperature, Settings.flag2.temperature_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_temperature gauge\nglobal_temperature %s\n"), parameter);
+  }
+  if (global_humidity != 0) {
+    dtostrfd(global_humidity, Settings.flag2.humidity_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_humidity gauge\nglobal_humidity %s\n"), parameter);
+  }
+  if (global_pressure != 0) {
+    dtostrfd(global_pressure, Settings.flag2.pressure_resolution, parameter);
+    WSContentSend_P(PSTR("# TYPE global_pressure gauge\nglobal_pressure %s\n"), parameter);
+  }
+
+#ifdef USE_ENERGY_SENSOR
+  dtostrfd(Energy.voltage[0], Settings.flag2.voltage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE voltage gauge\nvoltage %s\n"), parameter);
+  dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
+  dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE active_power gauge\nactive_power %s\n"), parameter);
+  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
+  dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
+  WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
+#endif
+# 80 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
+  WSContentEnd();
+}
+
+
+
+
+
+bool Xsns91(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_WEB_ADD_HANDLER:
+      WebServer->on("/metrics", HandleMetrics);
+      break;
+  }
+  return result;
+}
+
+#endif
+# 1 "S:/Development/Tasmota/tasmota/xsns_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xsns_interface.ino"
+#ifdef XFUNC_PTR_IN_ROM
+bool (* const xsns_func_ptr[])(uint8_t) PROGMEM = {
+#else
+bool (* const xsns_func_ptr[])(uint8_t) = {
+#endif
+
+#ifdef XSNS_01
+  &Xsns01,
+#endif
+
+#ifdef XSNS_02
+  &Xsns02,
+#endif
+
+#ifdef XSNS_03
+  &Xsns03,
+#endif
+
+#ifdef XSNS_04
+  &Xsns04,
+#endif
+
+#ifdef XSNS_05
+  &Xsns05,
+#endif
+
+#ifdef XSNS_06
+  &Xsns06,
+#endif
+
+#ifdef XSNS_07
+  &Xsns07,
+#endif
+
+#ifdef XSNS_08
+  &Xsns08,
+#endif
+
+#ifdef XSNS_09
+  &Xsns09,
+#endif
+
+#ifdef XSNS_10
+  &Xsns10,
+#endif
+
+#ifdef XSNS_11
+  &Xsns11,
+#endif
+
+#ifdef XSNS_12
+  &Xsns12,
+#endif
+
+#ifdef XSNS_13
+  &Xsns13,
+#endif
+
+#ifdef XSNS_14
+  &Xsns14,
+#endif
+
+#ifdef XSNS_15
+  &Xsns15,
+#endif
+
+#ifdef XSNS_16
+  &Xsns16,
+#endif
+
+#ifdef XSNS_17
+  &Xsns17,
+#endif
+
+#ifdef XSNS_18
+  &Xsns18,
+#endif
+
+#ifdef XSNS_19
+  &Xsns19,
+#endif
+
+#ifdef XSNS_20
+  &Xsns20,
+#endif
+
+#ifdef XSNS_21
+  &Xsns21,
+#endif
+
+#ifdef XSNS_22
+  &Xsns22,
+#endif
+
+#ifdef XSNS_23
+  &Xsns23,
+#endif
+
+#ifdef XSNS_24
+  &Xsns24,
+#endif
+
+#ifdef XSNS_25
+  &Xsns25,
+#endif
+
+#ifdef XSNS_26
+  &Xsns26,
+#endif
+
+#ifdef XSNS_27
+  &Xsns27,
+#endif
+
+#ifdef XSNS_28
+  &Xsns28,
+#endif
+
+#ifdef XSNS_29
+  &Xsns29,
+#endif
+
+#ifdef XSNS_30
+  &Xsns30,
+#endif
+
+#ifdef XSNS_31
+  &Xsns31,
+#endif
+
+#ifdef XSNS_32
+  &Xsns32,
+#endif
+
+#ifdef XSNS_33
+  &Xsns33,
+#endif
+
+#ifdef XSNS_34
+  &Xsns34,
+#endif
+
+#ifdef XSNS_35
+  &Xsns35,
+#endif
+
+#ifdef XSNS_36
+  &Xsns36,
+#endif
+
+#ifdef XSNS_37
+  &Xsns37,
+#endif
+
+#ifdef XSNS_38
+  &Xsns38,
+#endif
+
+#ifdef XSNS_39
+  &Xsns39,
+#endif
+
+#ifdef XSNS_40
+  &Xsns40,
+#endif
+
+#ifdef XSNS_41
+  &Xsns41,
+#endif
+
+#ifdef XSNS_42
+  &Xsns42,
+#endif
+
+#ifdef XSNS_43
+  &Xsns43,
+#endif
+
+#ifdef XSNS_44
+  &Xsns44,
+#endif
+
+#ifdef XSNS_45
+  &Xsns45,
+#endif
+
+#ifdef XSNS_46
+  &Xsns46,
+#endif
+
+#ifdef XSNS_47
+  &Xsns47,
+#endif
+
+#ifdef XSNS_48
+  &Xsns48,
+#endif
+
+#ifdef XSNS_49
+  &Xsns49,
+#endif
+
+#ifdef XSNS_50
+  &Xsns50,
+#endif
+
+#ifdef XSNS_51
+  &Xsns51,
+#endif
+
+#ifdef XSNS_52
+  &Xsns52,
+#endif
+
+#ifdef XSNS_53
+  &Xsns53,
+#endif
+
+#ifdef XSNS_54
+  &Xsns54,
+#endif
+
+#ifdef XSNS_55
+  &Xsns55,
+#endif
+
+#ifdef XSNS_56
+  &Xsns56,
+#endif
+
+#ifdef XSNS_57
+  &Xsns57,
+#endif
+
+#ifdef XSNS_58
+  &Xsns58,
+#endif
+
+#ifdef XSNS_59
+  &Xsns59,
+#endif
+
+#ifdef XSNS_60
+  &Xsns60,
+#endif
+
+#ifdef XSNS_61
+  &Xsns61,
+#endif
+
+#ifdef XSNS_62
+  &Xsns62,
+#endif
+
+#ifdef XSNS_63
+  &Xsns63,
+#endif
+
+#ifdef XSNS_64
+  &Xsns64,
+#endif
+
+#ifdef XSNS_65
+  &Xsns65,
+#endif
+
+#ifdef XSNS_66
+  &Xsns66,
+#endif
+
+#ifdef XSNS_67
+  &Xsns67,
+#endif
+
+#ifdef XSNS_68
+  &Xsns68,
+#endif
+
+#ifdef XSNS_69
+  &Xsns69,
+#endif
+
+#ifdef XSNS_70
+  &Xsns70,
+#endif
+
+#ifdef XSNS_71
+  &Xsns71,
+#endif
+
+#ifdef XSNS_72
+  &Xsns72,
+#endif
+
+#ifdef XSNS_73
+  &Xsns73,
+#endif
+
+#ifdef XSNS_74
+  &Xsns74,
+#endif
+
+#ifdef XSNS_75
+  &Xsns75,
+#endif
+
+#ifdef XSNS_76
+  &Xsns76,
+#endif
+
+#ifdef XSNS_77
+  &Xsns77,
+#endif
+
+#ifdef XSNS_78
+  &Xsns78,
+#endif
+
+#ifdef XSNS_79
+  &Xsns79,
+#endif
+
+#ifdef XSNS_80
+  &Xsns80,
+#endif
+
+#ifdef XSNS_81
+  &Xsns81,
+#endif
+
+#ifdef XSNS_82
+  &Xsns82,
+#endif
+
+#ifdef XSNS_83
+  &Xsns83,
+#endif
+
+#ifdef XSNS_84
+  &Xsns84,
+#endif
+
+#ifdef XSNS_85
+  &Xsns85,
+#endif
+
+#ifdef XSNS_86
+  &Xsns86,
+#endif
+
+#ifdef XSNS_87
+  &Xsns87,
+#endif
+
+#ifdef XSNS_88
+  &Xsns88,
+#endif
+
+#ifdef XSNS_89
+  &Xsns89,
+#endif
+
+#ifdef XSNS_90
+  &Xsns90,
+#endif
+
+#ifdef XSNS_91
+  &Xsns91,
+#endif
+
+#ifdef XSNS_92
+  &Xsns92,
+#endif
+
+#ifdef XSNS_93
+  &Xsns93,
+#endif
+
+#ifdef XSNS_94
+  &Xsns94,
+#endif
+
+#ifdef XSNS_95
+  &Xsns95,
+#endif
+
+#ifdef XSNS_96
+  &Xsns96,
+#endif
+
+#ifdef XSNS_97
+  &Xsns97,
+#endif
+
+#ifdef XSNS_98
+  &Xsns98,
+#endif
+
+#ifdef XSNS_99
+  &Xsns99
+#endif
+};
+
+const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]);
+
+
+
+
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kXsnsList[] PROGMEM = {
+#else
+const uint8_t kXsnsList[] = {
+#endif
+
+#ifdef XSNS_01
+  XSNS_01,
+#endif
+
+#ifdef XSNS_02
+  XSNS_02,
+#endif
+
+#ifdef XSNS_03
+  XSNS_03,
+#endif
+
+#ifdef XSNS_04
+  XSNS_04,
+#endif
+
+#ifdef XSNS_05
+  XSNS_05,
+#endif
+
+#ifdef XSNS_06
+  XSNS_06,
+#endif
+
+#ifdef XSNS_07
+  XSNS_07,
+#endif
+
+#ifdef XSNS_08
+  XSNS_08,
+#endif
+
+#ifdef XSNS_09
+  XSNS_09,
+#endif
+
+#ifdef XSNS_10
+  XSNS_10,
+#endif
+
+#ifdef XSNS_11
+  XSNS_11,
+#endif
+
+#ifdef XSNS_12
+  XSNS_12,
+#endif
+
+#ifdef XSNS_13
+  XSNS_13,
+#endif
+
+#ifdef XSNS_14
+  XSNS_14,
+#endif
+
+#ifdef XSNS_15
+  XSNS_15,
+#endif
+
+#ifdef XSNS_16
+  XSNS_16,
+#endif
+
+#ifdef XSNS_17
+  XSNS_17,
+#endif
+
+#ifdef XSNS_18
+  XSNS_18,
+#endif
+
+#ifdef XSNS_19
+  XSNS_19,
+#endif
+
+#ifdef XSNS_20
+  XSNS_20,
+#endif
+
+#ifdef XSNS_21
+  XSNS_21,
+#endif
+
+#ifdef XSNS_22
+  XSNS_22,
+#endif
+
+#ifdef XSNS_23
+  XSNS_23,
+#endif
+
+#ifdef XSNS_24
+  XSNS_24,
+#endif
+
+#ifdef XSNS_25
+  XSNS_25,
+#endif
+
+#ifdef XSNS_26
+  XSNS_26,
+#endif
+
+#ifdef XSNS_27
+  XSNS_27,
+#endif
+
+#ifdef XSNS_28
+  XSNS_28,
+#endif
+
+#ifdef XSNS_29
+  XSNS_29,
+#endif
+
+#ifdef XSNS_30
+  XSNS_30,
+#endif
+
+#ifdef XSNS_31
+  XSNS_31,
+#endif
+
+#ifdef XSNS_32
+  XSNS_32,
+#endif
+
+#ifdef XSNS_33
+  XSNS_33,
+#endif
+
+#ifdef XSNS_34
+  XSNS_34,
+#endif
+
+#ifdef XSNS_35
+  XSNS_35,
+#endif
+
+#ifdef XSNS_36
+  XSNS_36,
+#endif
+
+#ifdef XSNS_37
+  XSNS_37,
+#endif
+
+#ifdef XSNS_38
+  XSNS_38,
+#endif
+
+#ifdef XSNS_39
+  XSNS_39,
+#endif
+
+#ifdef XSNS_40
+  XSNS_40,
+#endif
+
+#ifdef XSNS_41
+  XSNS_41,
+#endif
+
+#ifdef XSNS_42
+  XSNS_42,
+#endif
+
+#ifdef XSNS_43
+  XSNS_43,
+#endif
+
+#ifdef XSNS_44
+  XSNS_44,
+#endif
+
+#ifdef XSNS_45
+  XSNS_45,
+#endif
+
+#ifdef XSNS_46
+  XSNS_46,
+#endif
+
+#ifdef XSNS_47
+  XSNS_47,
+#endif
+
+#ifdef XSNS_48
+  XSNS_48,
+#endif
+
+#ifdef XSNS_49
+  XSNS_49,
+#endif
+
+#ifdef XSNS_50
+  XSNS_50,
+#endif
+
+#ifdef XSNS_51
+  XSNS_51,
+#endif
+
+#ifdef XSNS_52
+  XSNS_52,
+#endif
+
+#ifdef XSNS_53
+  XSNS_53,
+#endif
+
+#ifdef XSNS_54
+  XSNS_54,
+#endif
+
+#ifdef XSNS_55
+  XSNS_55,
+#endif
+
+#ifdef XSNS_56
+  XSNS_56,
+#endif
+
+#ifdef XSNS_57
+  XSNS_57,
+#endif
+
+#ifdef XSNS_58
+  XSNS_58,
+#endif
+
+#ifdef XSNS_59
+  XSNS_59,
+#endif
+
+#ifdef XSNS_60
+  XSNS_60,
+#endif
+
+#ifdef XSNS_61
+  XSNS_61,
+#endif
+
+#ifdef XSNS_62
+  XSNS_62,
+#endif
+
+#ifdef XSNS_63
+  XSNS_63,
+#endif
+
+#ifdef XSNS_64
+  XSNS_64,
+#endif
+
+#ifdef XSNS_65
+  XSNS_65,
+#endif
+
+#ifdef XSNS_66
+  XSNS_66,
+#endif
+
+#ifdef XSNS_67
+  XSNS_67,
+#endif
+
+#ifdef XSNS_68
+  XSNS_68,
+#endif
+
+#ifdef XSNS_69
+  XSNS_69,
+#endif
+
+#ifdef XSNS_70
+  XSNS_70,
+#endif
+
+#ifdef XSNS_71
+  XSNS_71,
+#endif
+
+#ifdef XSNS_72
+  XSNS_72,
+#endif
+
+#ifdef XSNS_73
+  XSNS_73,
+#endif
+
+#ifdef XSNS_74
+  XSNS_74,
+#endif
+
+#ifdef XSNS_75
+  XSNS_75,
+#endif
+
+#ifdef XSNS_76
+  XSNS_76,
+#endif
+
+#ifdef XSNS_77
+  XSNS_77,
+#endif
+
+#ifdef XSNS_78
+  XSNS_78,
+#endif
+
+#ifdef XSNS_79
+  XSNS_79,
+#endif
+
+#ifdef XSNS_80
+  XSNS_80,
+#endif
+
+#ifdef XSNS_81
+  XSNS_81,
+#endif
+
+#ifdef XSNS_82
+  XSNS_82,
+#endif
+
+#ifdef XSNS_83
+  XSNS_83,
+#endif
+
+#ifdef XSNS_84
+  XSNS_84,
+#endif
+
+#ifdef XSNS_85
+  XSNS_85,
+#endif
+
+#ifdef XSNS_86
+  XSNS_86,
+#endif
+
+#ifdef XSNS_87
+  XSNS_87,
+#endif
+
+#ifdef XSNS_88
+  XSNS_88,
+#endif
+
+#ifdef XSNS_89
+  XSNS_89,
+#endif
+
+#ifdef XSNS_90
+  XSNS_90,
+#endif
+
+#ifdef XSNS_91
+  XSNS_91,
+#endif
+
+#ifdef XSNS_92
+  XSNS_92,
+#endif
+
+#ifdef XSNS_93
+  XSNS_93,
+#endif
+
+#ifdef XSNS_94
+  XSNS_94,
+#endif
+
+#ifdef XSNS_95
+  XSNS_95,
+#endif
+
+#ifdef XSNS_96
+  XSNS_96,
+#endif
+
+#ifdef XSNS_97
+  XSNS_97,
+#endif
+
+#ifdef XSNS_98
+  XSNS_98,
+#endif
+
+#ifdef XSNS_99
+  XSNS_99
+#endif
+};
+
+
+
+bool XsnsEnabled(uint32_t sns_index)
+{
+  if (sns_index < sizeof(kXsnsList)) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t index = pgm_read_byte(kXsnsList + sns_index);
+#else
+    uint32_t index = kXsnsList[sns_index];
+#endif
+    return bitRead(Settings.sensors[index / 32], index % 32);
+  }
+  return true;
+}
+
+void XsnsSensorState(void)
+{
+  ResponseAppend_P(PSTR("\""));
+  for (uint32_t i = 0; i < sizeof(kXsnsList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t sensorid = pgm_read_byte(kXsnsList + i);
+#else
+    uint32_t sensorid = kXsnsList[i];
+#endif
+    bool disabled = false;
+    if (sensorid < MAX_XSNS_DRIVERS) {
+      disabled = !bitRead(Settings.sensors[sensorid / 32], sensorid % 32);
+    }
+    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", sensorid);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+
+
+
+
+bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index)
+{
+  xsns_index++;
+  if (xsns_index == xsns_present) { xsns_index = 0; }
+
+#ifndef USE_DEBUG_DRIVER
+  if (FUNC_WEB_SENSOR == Function) {
+#endif
+    uint32_t max_disabled = xsns_present;
+    while (!XsnsEnabled(xsns_index) && max_disabled--) {
+      xsns_index++;
+      if (xsns_index == xsns_present) { xsns_index = 0; }
+    }
+#ifndef USE_DEBUG_DRIVER
+  }
+#endif
+
+  return xsns_func_ptr[xsns_index](Function);
+}
+
+bool XsnsCall(uint8_t Function)
+{
+  bool result = false;
+
+  DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
+
+#ifdef PROFILE_XSNS_EVERY_SECOND
+  uint32_t profile_start_millis = millis();
+#endif
+
+  for (uint32_t x = 0; x < xsns_present; x++) {
+#ifdef USE_DEBUG_DRIVER
+    if (XsnsEnabled(x)) {
+#endif
+
+      if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(x)) { continue; }
+
+#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
+      uint32_t profile_start_millis = millis();
+#endif
+      result = xsns_func_ptr[x](Function);
+
+#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
+      uint32_t profile_millis = millis() - profile_start_millis;
+      if (profile_millis) {
+        if (FUNC_EVERY_SECOND == Function) {
+          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d to Sensor %d took %u mS"), uptime, Function, x, profile_millis);
+        }
+      }
+#endif
+
+      if (result && ((FUNC_COMMAND == Function) ||
+                     (FUNC_PIN_STATE == Function) ||
+                     (FUNC_COMMAND_SENSOR == Function)
+                    )) {
+        break;
+      }
+#ifdef USE_DEBUG_DRIVER
+    }
+#endif
+  }
+
+#ifdef PROFILE_XSNS_EVERY_SECOND
+  uint32_t profile_millis = millis() - profile_start_millis;
+  if (profile_millis) {
+    if (FUNC_EVERY_SECOND == Function) {
+      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d took %u mS"), uptime, Function, profile_millis);
+    }
+  }
+#endif
+
+  return result;
+}
+# 1 "S:/Development/Tasmota/tasmota/xx2c_interface.ino"
+# 20 "S:/Development/Tasmota/tasmota/xx2c_interface.ino"
+#ifdef USE_I2C
+
+#ifdef XFUNC_PTR_IN_ROM
+const uint8_t kI2cList[] PROGMEM = {
+#else
+const uint8_t kI2cList[] = {
+#endif
+
+#ifdef XI2C_01
+  XI2C_01,
+#endif
+
+#ifdef XI2C_02
+  XI2C_02,
+#endif
+
+#ifdef XI2C_03
+  XI2C_03,
+#endif
+
+#ifdef XI2C_04
+  XI2C_04,
+#endif
+
+#ifdef XI2C_05
+  XI2C_05,
+#endif
+
+#ifdef XI2C_06
+  XI2C_06,
+#endif
+
+#ifdef XI2C_07
+  XI2C_07,
+#endif
+
+#ifdef XI2C_08
+  XI2C_08,
+#endif
+
+#ifdef XI2C_09
+  XI2C_09,
+#endif
+
+#ifdef XI2C_10
+  XI2C_10,
+#endif
+
+#ifdef XI2C_11
+  XI2C_11,
+#endif
+
+#ifdef XI2C_12
+  XI2C_12,
+#endif
+
+#ifdef XI2C_13
+  XI2C_13,
+#endif
+
+#ifdef XI2C_14
+  XI2C_14,
+#endif
+
+#ifdef XI2C_15
+  XI2C_15,
+#endif
+
+#ifdef XI2C_16
+  XI2C_16,
+#endif
+
+#ifdef XI2C_17
+  XI2C_17,
+#endif
+
+#ifdef XI2C_18
+  XI2C_18,
+#endif
+
+#ifdef XI2C_19
+  XI2C_19,
+#endif
+
+#ifdef XI2C_20
+  XI2C_20,
+#endif
+
+#ifdef XI2C_21
+  XI2C_21,
+#endif
+
+#ifdef XI2C_22
+  XI2C_22,
+#endif
+
+#ifdef XI2C_23
+  XI2C_23,
+#endif
+
+#ifdef XI2C_24
+  XI2C_24,
+#endif
+
+#ifdef XI2C_25
+  XI2C_25,
+#endif
+
+#ifdef XI2C_26
+  XI2C_26,
+#endif
+
+#ifdef XI2C_27
+  XI2C_27,
+#endif
+
+#ifdef XI2C_28
+  XI2C_28,
+#endif
+
+#ifdef XI2C_29
+  XI2C_29,
+#endif
+
+#ifdef XI2C_30
+  XI2C_30,
+#endif
+
+#ifdef XI2C_31
+  XI2C_31,
+#endif
+
+#ifdef XI2C_32
+  XI2C_32,
+#endif
+
+#ifdef XI2C_33
+  XI2C_33,
+#endif
+
+#ifdef XI2C_34
+  XI2C_34,
+#endif
+
+#ifdef XI2C_35
+  XI2C_35,
+#endif
+
+#ifdef XI2C_36
+  XI2C_36,
+#endif
+
+#ifdef XI2C_37
+  XI2C_37,
+#endif
+
+#ifdef XI2C_38
+  XI2C_38,
+#endif
+
+#ifdef XI2C_39
+  XI2C_39,
+#endif
+
+#ifdef XI2C_40
+  XI2C_40,
+#endif
+
+#ifdef XI2C_41
+  XI2C_41,
+#endif
+
+#ifdef XI2C_42
+  XI2C_42,
+#endif
+
+#ifdef XI2C_43
+  XI2C_43,
+#endif
+
+#ifdef XI2C_44
+  XI2C_44,
+#endif
+
+#ifdef XI2C_45
+  XI2C_45,
+#endif
+
+#ifdef XI2C_46
+  XI2C_46,
+#endif
+
+#ifdef XI2C_47
+  XI2C_47,
+#endif
+
+#ifdef XI2C_48
+  XI2C_48,
+#endif
+
+#ifdef XI2C_49
+  XI2C_49,
+#endif
+
+#ifdef XI2C_50
+  XI2C_50,
+#endif
+
+#ifdef XI2C_51
+  XI2C_51,
+#endif
+
+#ifdef XI2C_52
+  XI2C_52,
+#endif
+
+#ifdef XI2C_53
+  XI2C_53,
+#endif
+
+#ifdef XI2C_54
+  XI2C_54,
+#endif
+
+#ifdef XI2C_55
+  XI2C_55,
+#endif
+
+#ifdef XI2C_56
+  XI2C_56,
+#endif
+
+#ifdef XI2C_57
+  XI2C_57,
+#endif
+
+#ifdef XI2C_58
+  XI2C_58,
+#endif
+
+#ifdef XI2C_59
+  XI2C_59,
+#endif
+
+#ifdef XI2C_60
+  XI2C_60,
+#endif
+
+#ifdef XI2C_61
+  XI2C_61,
+#endif
+
+#ifdef XI2C_62
+  XI2C_62,
+#endif
+
+#ifdef XI2C_63
+  XI2C_63,
+#endif
+
+#ifdef XI2C_64
+  XI2C_64,
+#endif
+
+#ifdef XI2C_65
+  XI2C_65,
+#endif
+
+#ifdef XI2C_66
+  XI2C_66,
+#endif
+
+#ifdef XI2C_67
+  XI2C_67,
+#endif
+
+#ifdef XI2C_68
+  XI2C_68,
+#endif
+
+#ifdef XI2C_69
+  XI2C_69,
+#endif
+
+#ifdef XI2C_70
+  XI2C_70,
+#endif
+
+#ifdef XI2C_71
+  XI2C_71,
+#endif
+
+#ifdef XI2C_72
+  XI2C_72,
+#endif
+
+#ifdef XI2C_73
+  XI2C_73,
+#endif
+
+#ifdef XI2C_74
+  XI2C_74,
+#endif
+
+#ifdef XI2C_75
+  XI2C_75,
+#endif
+
+#ifdef XI2C_76
+  XI2C_76,
+#endif
+
+#ifdef XI2C_77
+  XI2C_77,
+#endif
+
+#ifdef XI2C_78
+  XI2C_78,
+#endif
+
+#ifdef XI2C_79
+  XI2C_79,
+#endif
+
+#ifdef XI2C_80
+  XI2C_80,
+#endif
+
+#ifdef XI2C_81
+  XI2C_81,
+#endif
+
+#ifdef XI2C_82
+  XI2C_82,
+#endif
+
+#ifdef XI2C_83
+  XI2C_83,
+#endif
+
+#ifdef XI2C_84
+  XI2C_84,
+#endif
+
+#ifdef XI2C_85
+  XI2C_85,
+#endif
+
+#ifdef XI2C_86
+  XI2C_86,
+#endif
+
+#ifdef XI2C_87
+  XI2C_87,
+#endif
+
+#ifdef XI2C_88
+  XI2C_88,
+#endif
+
+#ifdef XI2C_89
+  XI2C_89,
+#endif
+
+#ifdef XI2C_90
+  XI2C_90,
+#endif
+
+#ifdef XI2C_91
+  XI2C_91,
+#endif
+
+#ifdef XI2C_92
+  XI2C_92,
+#endif
+
+#ifdef XI2C_93
+  XI2C_93,
+#endif
+
+#ifdef XI2C_94
+  XI2C_94,
+#endif
+
+#ifdef XI2C_95
+  XI2C_95,
+#endif
+
+#ifdef XI2C_96
+  XI2C_96
+#endif
+};
+
+
+
+bool I2cEnabled(uint32_t i2c_index)
+{
+  return (i2c_flg && bitRead(Settings.i2c_drivers[i2c_index / 32], i2c_index % 32));
+}
+
+void I2cDriverState(void)
+{
+  ResponseAppend_P(PSTR("\""));
+  for (uint32_t i = 0; i < sizeof(kI2cList); i++) {
+#ifdef XFUNC_PTR_IN_ROM
+    uint32_t i2c_driver_id = pgm_read_byte(kI2cList + i);
+#else
+    uint32_t i2c_driver_id = kI2cList[i];
+#endif
+    bool disabled = false;
+    if (i2c_driver_id < MAX_I2C_DRIVERS) {
+      disabled = !bitRead(Settings.i2c_drivers[i2c_driver_id / 32], i2c_driver_id % 32);
+    }
+    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", i2c_driver_id);
+  }
+  ResponseAppend_P(PSTR("\""));
+}
+
+#endif
\ No newline at end of file

From 13eaa3c814e9f41fad073ac86ae95d9492d3df95 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 19:10:57 -0600
Subject: [PATCH 324/403] Disable debugging

---
 tasmota/support_device_groups.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 7036169e8..c94ea2f57 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -22,7 +22,7 @@
 */
 #ifdef USE_DEVICE_GROUPS
 
-#define DEVICE_GROUPS_DEBUG
+//#define DEVICE_GROUPS_DEBUG
 
 extern bool udp_connected;
 

From 486354fd7313dedec43fba293f3ace93bb224f22 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 20:31:49 -0600
Subject: [PATCH 325/403] Remove tasmota.ino.cpp

---
 tasmota/tasmota.ino.cpp | 78659 --------------------------------------
 1 file changed, 78659 deletions(-)
 delete mode 100644 tasmota/tasmota.ino.cpp

diff --git a/tasmota/tasmota.ino.cpp b/tasmota/tasmota.ino.cpp
deleted file mode 100644
index 8f8387ba2..000000000
--- a/tasmota/tasmota.ino.cpp
+++ /dev/null
@@ -1,78659 +0,0 @@
-# 1 "C:\\Users\\pcdie\\AppData\\Local\\Temp\\tmpnb0ml5sg"
-#include <Arduino.h>
-# 1 "S:/Development/Tasmota/tasmota/tasmota.ino"
-# 29 "S:/Development/Tasmota/tasmota/tasmota.ino"
-#include <core_version.h>
-#include "tasmota_version.h"
-#include "tasmota.h"
-#include "my_user_config.h"
-#ifdef USE_MQTT_TLS
-  #include <t_bearssl.h>
-#endif
-#include "tasmota_post.h"
-#include "i18n.h"
-#include "tasmota_template.h"
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_4_0
-#include "lwip/init.h"
-#if LWIP_VERSION_MAJOR != 1
-  #error Please use stable lwIP v1.4
-#endif
-#endif
-
-
-#include <ESP8266HTTPClient.h>
-#include <ESP8266httpUpdate.h>
-#include <StreamString.h>
-#include <ArduinoJson.h>
-#ifdef USE_ARDUINO_OTA
-  #include <ArduinoOTA.h>
-  #ifndef USE_DISCOVERY
-  #define USE_DISCOVERY
-  #endif
-#endif
-#ifdef USE_DISCOVERY
-  #include <ESP8266mDNS.h>
-#endif
-#ifdef USE_I2C
-  #include <Wire.h>
-#endif
-#ifdef USE_SPI
-  #include <SPI.h>
-#endif
-
-
-#include "settings.h"
-
-
-
-
-
-WiFiUDP PortUdp;
-
-unsigned long feature_drv1;
-unsigned long feature_drv2;
-unsigned long feature_sns1;
-unsigned long feature_sns2;
-unsigned long feature5;
-unsigned long feature6;
-unsigned long serial_polling_window = 0;
-unsigned long state_second = 0;
-unsigned long state_50msecond = 0;
-unsigned long state_100msecond = 0;
-unsigned long state_250msecond = 0;
-unsigned long pulse_timer[MAX_PULSETIMERS] = { 0 };
-unsigned long blink_timer = 0;
-unsigned long backlog_delay = 0;
-power_t power = 0;
-power_t last_power = 0;
-power_t blink_power;
-power_t blink_mask = 0;
-power_t blink_powersave;
-power_t latching_power = 0;
-power_t rel_inverted = 0;
-int serial_in_byte_counter = 0;
-int ota_state_flag = 0;
-int ota_result = 0;
-int restart_flag = 0;
-int wifi_state_flag = WIFI_RESTART;
-int blinks = 201;
-uint32_t uptime = 0;
-uint32_t loop_load_avg = 0;
-uint32_t global_update = 0;
-uint32_t web_log_index = 1;
-float global_temperature = 9999;
-float global_humidity = 0;
-float global_pressure = 0;
-uint16_t tele_period = 9999;
-uint16_t blink_counter = 0;
-uint16_t seriallog_timer = 0;
-uint16_t syslog_timer = 0;
-int16_t save_data_counter;
-RulesBitfield rules_flag;
-uint8_t mqtt_cmnd_blocked = 0;
-uint8_t mqtt_cmnd_blocked_reset = 0;
-uint8_t state_250mS = 0;
-uint8_t latching_relay_pulse = 0;
-uint8_t sleep;
-uint8_t blinkspeed = 1;
-uint8_t pin[GPIO_MAX];
-uint8_t active_device = 1;
-uint8_t leds_present = 0;
-uint8_t led_inverted = 0;
-uint8_t led_power = 0;
-uint8_t ledlnk_inverted = 0;
-uint8_t pwm_inverted = 0;
-uint8_t energy_flg = 0;
-uint8_t light_flg = 0;
-uint8_t light_type = 0;
-uint8_t serial_in_byte;
-uint8_t ota_retry_counter = OTA_ATTEMPTS;
-uint8_t devices_present = 0;
-uint8_t seriallog_level;
-uint8_t syslog_level;
-uint8_t my_module_type;
-uint8_t my_adc0;
-uint8_t last_source = 0;
-uint8_t shutters_present = 0;
-uint8_t prepped_loglevel = 0;
-
-bool serial_local = false;
-bool fallback_topic_flag = false;
-bool backlog_mutex = false;
-bool interlock_mutex = false;
-bool stop_flash_rotate = false;
-bool blinkstate = false;
-
-bool pwm_present = false;
-bool i2c_flg = false;
-bool spi_flg = false;
-bool soft_spi_flg = false;
-bool ntp_force_sync = false;
-bool is_8285 = false;
-myio my_module;
-gpio_flag my_module_flag;
-StateBitfield global_state;
-char my_version[33];
-char my_image[33];
-char my_hostname[33];
-char mqtt_client[TOPSZ];
-char mqtt_topic[TOPSZ];
-char serial_in_buffer[INPUT_BUFFER_SIZE];
-char mqtt_data[MESSZ];
-char log_data[LOGSZ];
-char web_log[WEB_LOG_SIZE] = {'\0'};
-#ifdef SUPPORT_IF_STATEMENT
-  #include <LinkedList.h>
-  LinkedList<String> backlog;
-  #define BACKLOG_EMPTY (backlog.size() == 0)
-#else
-  uint8_t backlog_index = 0;
-  uint8_t backlog_pointer = 0;
-  String backlog[MAX_BACKLOG];
-  #define BACKLOG_EMPTY (backlog_pointer == backlog_index)
-#endif
-void setup(void);
-void BacklogLoop(void);
-void loop(void);
-uint16_t SendMail(char *buffer);
-uint32_t GetRtcSettingsCrc(void);
-void RtcSettingsSave(void);
-void RtcSettingsLoad(void);
-bool RtcSettingsValid(void);
-uint32_t GetRtcRebootCrc(void);
-void RtcRebootSave(void);
-void RtcRebootReset(void);
-void RtcRebootLoad(void);
-bool RtcRebootValid(void);
-void SetFlashModeDout(void);
-bool VersionCompatible(void);
-void SettingsBufferFree(void);
-bool SettingsBufferAlloc(void);
-uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size);
-uint16_t GetSettingsCrc(void);
-uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size);
-uint32_t GetSettingsCrc32(void);
-void SettingsSaveAll(void);
-void UpdateQuickPowerCycle(bool update);
-uint32_t GetSettingsTextLen(void);
-bool SettingsUpdateText(uint32_t index, const char* replace_me);
-char* SettingsText(uint32_t index);
-uint32_t GetSettingsAddress(void);
-void SettingsSave(uint8_t rotate);
-void SettingsLoad(void);
-void EspErase(uint32_t start_sector, uint32_t end_sector);
-void SettingsErase(uint8_t type);
-void SettingsSdkErase(void);
-void SettingsSdkWifiErase(void);
-void SettingsDefault(void);
-void SettingsDefaultSet1(void);
-void SettingsDefaultSet2(void);
-void SettingsResetStd(void);
-void SettingsResetDst(void);
-void SettingsDefaultWebColor(void);
-void SettingsEnableAllI2cDrivers(void);
-void SettingsDelta(void);
-void OsWatchTicker(void);
-void OsWatchInit(void);
-void OsWatchLoop(void);
-bool OsWatchBlockedLoop(void);
-uint32_t ResetReason(void);
-String GetResetReason(void);
-size_t strchrspn(const char *str1, int character);
-char* subStr(char* dest, char* str, const char *delim, int index);
-float CharToFloat(const char *str);
-int TextToInt(char *str);
-char* ulltoa(unsigned long long value, char *str, int radix);
-char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween);
-char* Uint64toHex(uint64_t value, char *str, uint16_t bits);
-char* dtostrfd(double number, unsigned char prec, char *s);
-char* Unescape(char* buffer, uint32_t* size);
-char* RemoveSpace(char* p);
-char* ReplaceCommaWithDot(char* p);
-char* LowerCase(char* dest, const char* source);
-char* UpperCase(char* dest, const char* source);
-char* UpperCase_P(char* dest, const char* source);
-char* Trim(char* p);
-char* RemoveAllSpaces(char* p);
-char* NoAlNumToUnderscore(char* dest, const char* source);
-char IndexSeparator(void);
-void SetShortcutDefault(void);
-uint8_t Shortcut(void);
-bool ValidIpAddress(const char* str);
-bool ParseIp(uint32_t* addr, const char* str);
-uint32_t ParseParameters(uint32_t count, uint32_t *params);
-bool NewerVersion(char* version_str);
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option);
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size);
-void GetEspHardwareType(void);
-String GetDeviceHardware(void);
-float ConvertTemp(float c);
-float ConvertTempToCelsius(float c);
-char TempUnit(void);
-float ConvertHumidity(float h);
-float ConvertPressure(float p);
-String PressureUnit(void);
-void ResetGlobalValues(void);
-uint32_t SqrtInt(uint32_t num);
-uint32_t RoundSqrtInt(uint32_t num);
-char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack);
-int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack);
-int GetStateNumber(char *state_text);
-String GetSerialConfig(void);
-void SetSerialBegin();
-void SetSerialConfig(uint32_t serial_config);
-void SetSerialBaudrate(uint32_t baudrate);
-void SetSerial(uint32_t baudrate, uint32_t serial_config);
-void ClaimSerial(void);
-void SerialSendRaw(char *codes);
-uint32_t GetHash(const char *buffer, size_t size);
-void ShowSource(uint32_t source);
-void WebHexCode(uint32_t i, const char* code);
-uint32_t WebColor(uint32_t i);
-char* ResponseGetTime(uint32_t format, char* time_str);
-int Response_P(const char* format, ...);
-int ResponseTime_P(const char* format, ...);
-int ResponseAppend_P(const char* format, ...);
-int ResponseAppendTimeFormat(uint32_t format);
-int ResponseAppendTime(void);
-int ResponseJsonEnd(void);
-int ResponseJsonEndEnd(void);
-void DigitalWrite(uint32_t gpio_pin, uint32_t state);
-uint8_t ModuleNr(void);
-bool ValidTemplateModule(uint32_t index);
-bool ValidModule(uint32_t index);
-String AnyModuleName(uint32_t index);
-String ModuleName(void);
-void ModuleGpios(myio *gp);
-gpio_flag ModuleFlag(void);
-void ModuleDefault(uint32_t module);
-void SetModuleType(void);
-bool FlashPin(uint32_t pin);
-uint8_t ValidPin(uint32_t pin, uint32_t gpio);
-bool ValidGPIO(uint32_t pin, uint32_t gpio);
-bool ValidAdc(void);
-bool GetUsedInModule(uint32_t val, uint8_t *arr);
-bool JsonTemplate(const char* dataBuf);
-void TemplateJson(void);
-inline int32_t TimeDifference(uint32_t prev, uint32_t next);
-int32_t TimePassedSince(uint32_t timestamp);
-bool TimeReached(uint32_t timer);
-void SetNextTimeInterval(unsigned long& timer, const unsigned long step);
-int32_t TimePassedSinceUsec(uint32_t timestamp);
-bool TimeReachedUsec(uint32_t timer);
-bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size);
-bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg);
-bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg);
-uint8_t I2cRead8(uint8_t addr, uint8_t reg);
-uint16_t I2cRead16(uint8_t addr, uint8_t reg);
-int16_t I2cReadS16(uint8_t addr, uint8_t reg);
-uint16_t I2cRead16LE(uint8_t addr, uint8_t reg);
-int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg);
-int32_t I2cRead24(uint8_t addr, uint8_t reg);
-bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size);
-bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val);
-bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val);
-int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
-int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len);
-void I2cScan(char *devs, unsigned int devs_len);
-void I2cSetActiveFound(uint32_t addr, const char *types);
-bool I2cActive(uint32_t addr);
-bool I2cSetDevice(uint32_t addr);
-void SetSeriallog(uint32_t loglevel);
-void SetSyslog(uint32_t loglevel);
-void GetLog(uint32_t idx, char** entry_pp, size_t* len_p);
-void Syslog(void);
-void AddLog(uint32_t loglevel);
-void AddLog_P(uint32_t loglevel, const char *formatP);
-void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2);
-void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...);
-void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...);
-void AddLog_Debug(PGM_P formatP, ...);
-void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count);
-void AddLogSerial(uint32_t loglevel);
-void AddLogMissed(char *sensor, uint32_t misses);
-void ButtonPullupFlag(uint8 button_bit);
-void ButtonInvertFlag(uint8 button_bit);
-void ButtonInit(void);
-uint8_t ButtonSerial(uint8_t serial_in_byte);
-void ButtonHandler(void);
-void ButtonLoop(void);
-void ResponseCmndNumber(int value);
-void ResponseCmndFloat(float value, uint32_t decimals);
-void ResponseCmndIdxNumber(int value);
-void ResponseCmndChar(const char* value);
-void ResponseCmndStateText(uint32_t value);
-void ResponseCmndDone(void);
-void ResponseCmndIdxChar(const char* value);
-void ResponseCmndAll(uint32_t text_index, uint32_t count);
-void ExecuteCommand(const char *cmnd, uint32_t source);
-void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len);
-void CmndBacklog(void);
-void CmndDelay(void);
-void CmndPower(void);
-void CmndStatus(void);
-void CmndState(void);
-void CmndTempOffset(void);
-void CmndSleep(void);
-void CmndUpgrade(void);
-void CmndOtaUrl(void);
-void CmndSeriallog(void);
-void CmndRestart(void);
-void CmndPowerOnState(void);
-void CmndPulsetime(void);
-void CmndBlinktime(void);
-void CmndBlinkcount(void);
-void CmndSavedata(void);
-void CmndSetoption(void);
-void CmndTemperatureResolution(void);
-void CmndHumidityResolution(void);
-void CmndPressureResolution(void);
-void CmndPowerResolution(void);
-void CmndVoltageResolution(void);
-void CmndFrequencyResolution(void);
-void CmndCurrentResolution(void);
-void CmndEnergyResolution(void);
-void CmndWeightResolution(void);
-void CmndModule(void);
-void CmndModules(void);
-void CmndGpio(void);
-void CmndGpios(void);
-void CmndTemplate(void);
-void CmndPwm(void);
-void CmndPwmfrequency(void);
-void CmndPwmrange(void);
-void CmndButtonDebounce(void);
-void CmndSwitchDebounce(void);
-void CmndBaudrate(void);
-void CmndSerialConfig(void);
-void CmndSerialSend(void);
-void CmndSerialDelimiter(void);
-void CmndSyslog(void);
-void CmndLoghost(void);
-void CmndLogport(void);
-void CmndIpAddress(void);
-void CmndNtpServer(void);
-void CmndAp(void);
-void CmndSsid(void);
-void CmndPassword(void);
-void CmndHostname(void);
-void CmndWifiConfig(void);
-void CmndFriendlyname(void);
-void CmndSwitchMode(void);
-void CmndInterlock(void);
-void CmndTeleperiod(void);
-void CmndReset(void);
-void CmndTime(void);
-void CmndTimezone(void);
-void CmndTimeStdDst(uint32_t ts);
-void CmndTimeStd(void);
-void CmndTimeDst(void);
-void CmndAltitude(void);
-void CmndLedPower(void);
-void CmndLedState(void);
-void CmndLedMask(void);
-void CmndWifiPower(void);
-void CmndI2cScan(void);
-void CmndI2cDriver(void);
-void CmndDevGroupShare(void);
-void CmndSensor(void);
-void CmndDriver(void);
-void CmndCrash(void);
-void CmndWDT(void);
-void CmndBlockedLoop(void);
-void CrashDumpClear(void);
-bool CrashFlag(void);
-void CrashDump(void);
-void DeviceGroupsInit(void);
-bool DeviceGroupItemShared(bool incoming, uint8_t item);
-void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * label);
-void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...);
-void ProcessDeviceGroupMessage(char * packet, int packet_length);
-void DeviceGroupsLoop(void);
-static bool spiflash_is_ready(void);
-static void spi_write_enable(void);
-bool EsptoolEraseSector(uint32_t sector);
-void EsptoolErase(uint32_t start_sector, uint32_t end_sector);
-void GetFeatures(void);
-float fmodf(float x, float y);
-double FastPrecisePow(double a, double b);
-float FastPrecisePowf(const float x, const float y);
-double TaylorLog(double x);
-inline float sinf(float x);
-inline float cosf(float x);
-inline float tanf(float x);
-inline float atanf(float x);
-inline float asinf(float x);
-inline float acosf(float x);
-inline float sqrtf(float x);
-inline float powf(float x, float y);
-float cos_52s(float x);
-float cos_52(float x);
-float sin_52(float x);
-float tan_56s(float x);
-float tan_56(float x);
-float atan_66s(float x);
-float atan_66(float x);
-float asinf1(float x);
-float acosf1(float x);
-float sqrt1(const float x);
-uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
-                                       uint16_t ito_min, uint16_t ito_max);
-void* memchr(const void* ptr, int value, size_t num);
-size_t strcspn(const char *str1, const char *str2);
-char* strpbrk(const char *s1, const char *s2);
-void* memmove_P(void *dest, const void *src, size_t n);
-void update_rotary(void);
-bool RotaryButtonPressed(void);
-void RotaryInit(void);
-void RotaryHandler(void);
-void RotaryLoop(void);
-uint32_t UtcTime(void);
-uint32_t LocalTime(void);
-uint32_t Midnight(void);
-bool MidnightNow(void);
-bool IsDst(void);
-String GetBuildDateAndTime(void);
-String GetMinuteTime(uint32_t minutes);
-String GetTimeZone(void);
-String GetDuration(uint32_t time);
-String GetDT(uint32_t time);
-String GetDateAndTime(uint8_t time_type);
-uint32_t UpTime(void);
-uint32_t MinutesUptime(void);
-String GetUptime(void);
-uint32_t MinutesPastMidnight(void);
-void BreakTime(uint32_t time_input, TIME_T &tm);
-uint32_t MakeTime(TIME_T &tm);
-uint32_t RuleToTime(TimeRule r, int yr);
-void RtcSecond(void);
-void RtcSetTime(uint32_t epoch);
-void RtcInit(void);
-String GetStatistics(void);
-String GetStatistics(void);
-void SwitchPullupFlag(uint16 switch_bit);
-void SwitchSetVirtual(uint32_t index, uint8_t state);
-uint8_t SwitchGetVirtual(uint32_t index);
-uint8_t SwitchLastState(uint32_t index);
-bool SwitchState(uint32_t index);
-void SwitchProbe(void);
-void SwitchInit(void);
-void SwitchHandler(uint8_t mode);
-void SwitchLoop(void);
-char* Format(char* output, const char* input, int size);
-char* GetOtaUrl(char *otaurl, size_t otaurl_size);
-char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic);
-char* GetGroupTopic_P(char *stopic, const char* subtopic);
-char* GetFallbackTopic_P(char *stopic, const char* subtopic);
-char* GetStateText(uint32_t state);
-void SetLatchingRelay(power_t lpower, uint32_t state);
-void SetDevicePower(power_t rpower, uint32_t source);
-void RestorePower(bool publish_power, uint32_t source);
-void SetAllPower(uint32_t state, uint32_t source);
-void SetPowerOnState(void);
-void SetLedPowerIdx(uint32_t led, uint32_t state);
-void SetLedPower(uint32_t state);
-void SetLedPowerAll(uint32_t state);
-void SetLedLink(uint32_t state);
-void SetPulseTimer(uint32_t index, uint32_t time);
-uint32_t GetPulseTimer(uint32_t index);
-bool SendKey(uint32_t key, uint32_t device, uint32_t state);
-void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source);
-void StopAllPowerBlink(void);
-void MqttShowPWMState(void);
-void MqttShowState(void);
-void MqttPublishTeleState(void);
-bool MqttShowSensor(void);
-void MqttPublishSensor(void);
-void PerformEverySecond(void);
-void Every100mSeconds(void);
-void Every250mSeconds(void);
-void ArduinoOTAInit(void);
-void ArduinoOtaLoop(void);
-void SerialInput(void);
-void GpioInit(void);
-bool UdpDisconnect(void);
-bool UdpConnect(void);
-void PollUdp(void);
-int WifiGetRssiAsQuality(int rssi);
-bool WifiConfigCounter(void);
-void WifiConfig(uint8_t type);
-void WifiSetMode(WiFiMode_t wifi_mode);
-void WiFiSetSleepMode(void);
-void WifiBegin(uint8_t flag, uint8_t channel);
-void WifiBeginAfterScan(void);
-uint16_t WifiLinkCount(void);
-String WifiDowntime(void);
-void WifiSetState(uint8_t state);
-bool WifiCheckIPv6(void);
-String WifiGetIPv6(void);
-bool WifiCheckIPAddrStatus(void);
-void WifiCheckIp(void);
-void WifiCheck(uint8_t param);
-int WifiState(void);
-String WifiGetOutputPower(void);
-void WifiSetOutputPower(void);
-void WifiConnect(void);
-void WifiDisconnect(void);
-void WifiShutdown(void);
-void EspRestart(void);
-static void WebGetArg(const char* arg, char* out, size_t max);
-static bool WifiIsInManagerMode();
-void ShowWebSource(uint32_t source);
-void ExecuteWebCommand(char* svalue, uint32_t source);
-void StartWebserver(int type, IPAddress ipweb);
-void StopWebserver(void);
-void WifiManagerBegin(bool reset_only);
-void PollDnsWebserver(void);
-bool WebAuthenticate(void);
-void HttpHeaderCors(void);
-void WSHeaderSend(void);
-void WSSend(int code, int ctype, const String& content);
-void WSContentBegin(int code, int ctype);
-void _WSContentSend(const String& content);
-void WSContentFlush(void);
-void _WSContentSendBuffer(void);
-void WSContentSend_P(const char* formatP, ...);
-void WSContentSend_PD(const char* formatP, ...);
-void WSContentStart_P(const char* title, bool auth);
-void WSContentStart_P(const char* title);
-void WSContentSendStyle_P(const char* formatP, ...);
-void WSContentSendStyle(void);
-void WSContentButton(uint32_t title_index);
-void WSContentSpaceButton(uint32_t title_index);
-void WSContentEnd(void);
-void WSContentStop(void);
-void WebRestart(uint32_t type);
-void HandleWifiLogin(void);
-void WebSliderColdWarm(void);
-void HandleRoot(void);
-bool HandleRootStatusRefresh(void);
-int32_t IsShutterWebButton(uint32_t idx);
-void HandleConfiguration(void);
-void HandleTemplateConfiguration(void);
-void TemplateSaveSettings(void);
-void HandleModuleConfiguration(void);
-void ModuleSaveSettings(void);
-String HtmlEscape(const String unescaped);
-void HandleWifiConfiguration(void);
-void WifiSaveSettings(void);
-void HandleLoggingConfiguration(void);
-void LoggingSaveSettings(void);
-void HandleOtherConfiguration(void);
-void OtherSaveSettings(void);
-void HandleBackupConfiguration(void);
-void HandleResetConfiguration(void);
-void HandleRestoreConfiguration(void);
-void HandleInformation(void);
-void HandleUpgradeFirmware(void);
-void HandleUpgradeFirmwareStart(void);
-void HandleUploadDone(void);
-void HandleUploadLoop(void);
-void HandlePreflightRequest(void);
-void HandleHttpCommand(void);
-void HandleConsole(void);
-void HandleConsoleRefresh(void);
-void HandleNotFound(void);
-bool CaptivePortal(void);
-String UrlEncode(const String& text);
-int WebSend(char *buffer);
-bool JsonWebColor(const char* dataBuf);
-void CmndEmulation(void);
-void CmndSendmail(void);
-void CmndWebServer(void);
-void CmndWebPassword(void);
-void CmndWeblog(void);
-void CmndWebRefresh(void);
-void CmndWebSend(void);
-void CmndWebColor(void);
-void CmndWebSensor(void);
-void CmndWebButton(void);
-void CmndCors(void);
-bool Xdrv01(uint8_t function);
-bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value);
-void MakeValidMqtt(uint32_t option, char* str);
-void MqttDiscoverServer(void);
-void MqttInit(void);
-bool MqttIsConnected(void);
-void MqttDisconnect(void);
-void MqttSubscribeLib(const char *topic);
-void MqttUnsubscribeLib(const char *topic);
-bool MqttPublishLib(const char* topic, bool retained);
-void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len);
-void MqttRetryCounter(uint8_t value);
-void MqttSubscribe(const char *topic);
-void MqttUnsubscribe(const char *topic);
-void MqttPublishLogging(const char *mxtime);
-void MqttPublish(const char* topic, bool retained);
-void MqttPublish(const char* topic);
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained);
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic);
-void MqttPublishTeleSensor(void);
-void MqttPublishPowerState(uint32_t device);
-void MqttPublishAllPowerState(void);
-void MqttPublishPowerBlinkState(uint32_t device);
-uint16_t MqttConnectCount(void);
-void MqttDisconnected(int state);
-void MqttConnected(void);
-void MqttReconnect(void);
-void MqttCheck(void);
-void CmndMqttFingerprint(void);
-void CmndMqttUser(void);
-void CmndMqttPassword(void);
-void CmndMqttlog(void);
-void CmndMqttHost(void);
-void CmndMqttPort(void);
-void CmndMqttRetry(void);
-void CmndStateText(void);
-void CmndMqttClient(void);
-void CmndFullTopic(void);
-void CmndPrefix(void);
-void CmndPublish(void);
-void CmndGroupTopic(void);
-void CmndTopic(void);
-void CmndButtonTopic(void);
-void CmndSwitchTopic(void);
-void CmndButtonRetain(void);
-void CmndSwitchRetain(void);
-void CmndPowerRetain(void);
-void CmndSensorRetain(void);
-inline void TlsEraseBuffer(uint8_t *buffer);
-void loadTlsDir(void);
-void CmndTlsKey(void);
-uint32_t bswap32(uint32_t x);
-void CmndTlsDump(void);
-void HandleMqttConfiguration(void);
-void MqttSaveSettings(void);
-bool Xdrv02(uint8_t function);
-bool EnergyTariff1Active();
-void EnergyUpdateToday(void);
-void EnergyUpdateTotal(float value, bool kwh);
-void Energy200ms(void);
-void EnergySaveState(void);
-bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag);
-void EnergyMarginCheck(void);
-void EnergyMqttShow(void);
-void EnergyEverySecond(void);
-void EnergyCommandCalResponse(uint32_t nvalue);
-void CmndEnergyReset(void);
-void CmndTariff(void);
-void CmndPowerCal(void);
-void CmndVoltageCal(void);
-void CmndCurrentCal(void);
-void CmndPowerSet(void);
-void CmndVoltageSet(void);
-void CmndCurrentSet(void);
-void CmndFrequencySet(void);
-void CmndModuleAddress(void);
-void CmndPowerDelta(void);
-void CmndPowerLow(void);
-void CmndPowerHigh(void);
-void CmndVoltageLow(void);
-void CmndVoltageHigh(void);
-void CmndCurrentLow(void);
-void CmndCurrentHigh(void);
-void CmndMaxPower(void);
-void CmndMaxPowerHold(void);
-void CmndMaxPowerWindow(void);
-void CmndSafePower(void);
-void CmndSafePowerHold(void);
-void CmndSafePowerWindow(void);
-void CmndMaxEnergy(void);
-void CmndMaxEnergyStart(void);
-void EnergySnsInit(void);
-void EnergyShow(bool json);
-bool Xdrv03(uint8_t function);
-bool Xsns03(uint8_t function);
-power_t LightPower(void);
-power_t LightPowerIRAM(void);
-uint8_t LightDevice(void);
-static uint32_t min3(uint32_t a, uint32_t b, uint32_t c);
-uint16_t change8to10(uint8_t v);
-uint8_t change10to8(uint16_t v);
-uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr);
-uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr);
-uint16_t ledGamma10_10(uint16_t v);
-uint16_t ledGamma10(uint8_t v);
-uint8_t ledGamma(uint8_t v);
-void LightPwmOffset(uint32_t offset);
-bool LightModuleInit(void);
-void LightInit(void);
-void LightUpdateColorMapping(void);
-uint8_t LightGetDimmer(uint8_t dimmer);
-void LightSetDimmer(uint8_t dimmer);
-void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri);
-void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
-uint8_t LightGetBri(uint8_t device);
-void LightSetBri(uint8_t device, uint8_t bri);
-void LightSetColorTemp(uint16_t ct);
-uint16_t LightGetColorTemp(void);
-void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value);
-void LightPowerOn(void);
-void LightState(uint8_t append);
-void LightCycleColor(int8_t direction);
-void LightSetPower(void);
-void LightAnimate(void);
-bool isChannelGammaCorrected(uint32_t channel);
-uint16_t fadeGamma(uint32_t channel, uint16_t v);
-uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg);
-bool LightApplyFade(void);
-void LightApplyPower(uint8_t new_color[LST_MAX], power_t power);
-void LightSetOutputs(const uint16_t *cur_col_10);
-void calcGammaMultiChannels(uint16_t cur_col_10[5]);
-void calcGammaBulbs(uint16_t cur_col_10[5]);
-void LightSendDeviceGroupStatus();
-void LightHandleDeviceGroupRequest();
-bool LightColorEntry(char *buffer, uint32_t buffer_length);
-void CmndSupportColor(void);
-void CmndColor(void);
-void CmndWhite(void);
-void CmndChannel(void);
-void CmndHsbColor(void);
-void CmndScheme(void);
-void CmndWakeup(void);
-void CmndColorTemperature(void);
-void CmndDimmer(void);
-void CmndDimmerRange(void);
-void CmndLedTable(void);
-void CmndRgbwwTable(void);
-void CmndFade(void);
-void CmndSpeed(void);
-void CmndWakeupDuration(void);
-void CmndUndocA(void);
-bool Xdrv04(uint8_t function);
-void IrSendInit(void);
-void IrReceiveUpdateThreshold(void);
-void IrReceiveInit(void);
-void IrReceiveCheck(void);
-uint32_t IrRemoteCmndIrSendJson(void);
-void CmndIrSend(void);
-void IrRemoteCmndResponse(uint32_t error);
-bool Xdrv05(uint8_t function);
-void IrSendInit(void);
-uint8_t reverseBitsInByte(uint8_t b);
-uint64_t reverseBitsInBytes64(uint64_t b);
-void IrReceiveUpdateThreshold(void);
-void IrReceiveInit(void);
-String sendIRJsonState(const struct decode_results &results);
-void IrReceiveCheck(void);
-String listSupportedProtocols(bool hvac);
-uint32_t IrRemoteCmndIrHvacJson(void);
-void CmndIrHvac(void);
-uint32_t IrRemoteCmndIrSendJson(void);
-uint32_t IrRemoteCmndIrSendRaw(void);
-void CmndIrSend(void);
-void IrRemoteCmndResponse(uint32_t error);
-bool Xdrv05(uint8_t function);
-ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size);
-ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size);
-ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len);
-ssize_t rf_decode_and_write(uint8_t *record, size_t size);
-ssize_t rf_search_and_write(uint8_t *buf, size_t size);
-uint8_t rf_erase_flash(void);
-uint8_t SnfBrUpdateInit(void);
-void SonoffBridgeReceivedRaw(void);
-void SonoffBridgeLearnFailed(void);
-void SonoffBridgeReceived(void);
-bool SonoffBridgeSerialInput(void);
-void SonoffBridgeSendCommand(uint8_t code);
-void SonoffBridgeSendAck(void);
-void SonoffBridgeSendCode(uint32_t code);
-void SonoffBridgeSend(uint8_t idx, uint8_t key);
-void SonoffBridgeLearn(uint8_t key);
-void CmndRfBridge(void);
-void CmndRfKey(void);
-void CmndRfRaw(void);
-bool Xdrv06(uint8_t function);
-int DomoticzBatteryQuality(void);
-int DomoticzRssiQuality(void);
-void MqttPublishDomoticzFanState(void);
-void DomoticzUpdateFanState(void);
-void MqttPublishDomoticzPowerState(uint8_t device);
-void DomoticzUpdatePowerState(uint8_t device);
-void DomoticzMqttUpdate(void);
-void DomoticzMqttSubscribe(void);
-bool DomoticzMqttData(void);
-bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg);
-uint8_t DomoticzHumidityState(char *hum);
-void DomoticzSensor(uint8_t idx, char *data);
-void DomoticzSensor(uint8_t idx, uint32_t value);
-void DomoticzTempHumSensor(char *temp, char *hum);
-void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro);
-void DomoticzSensorPowerEnergy(int power, char *energy);
-void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power);
-void CmndDomoticzIdx(void);
-void CmndDomoticzKeyIdx(void);
-void CmndDomoticzSwitchIdx(void);
-void CmndDomoticzSensorIdx(void);
-void CmndDomoticzUpdateTimer(void);
-void HandleDomoticzConfiguration(void);
-void DomoticzSaveSettings(void);
-bool Xdrv07(uint8_t function);
-void SerialBridgeInput(void);
-void SerialBridgeInit(void);
-void CmndSSerialSend(void);
-void CmndSBaudrate(void);
-bool Xdrv08(uint8_t function);
-float JulianischesDatum(void);
-float InPi(float x);
-float eps(float T);
-float BerechneZeitgleichung(float *DK,float T);
-void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down);
-void ApplyTimerOffsets(Timer *duskdawn);
-String GetSun(uint32_t dawn);
-uint16_t SunMinutes(uint32_t dawn);
-void TimerSetRandomWindow(uint32_t index);
-void TimerSetRandomWindows(void);
-void TimerEverySecond(void);
-void PrepShowTimer(uint32_t index);
-void CmndTimer(void);
-void CmndTimers(void);
-void CmndLongitude(void);
-void CmndLatitude(void);
-void HandleTimerConfiguration(void);
-void TimerSaveSettings(void);
-bool Xdrv09(uint8_t function);
-bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule);
-int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr);
-void RulesVarReplace(String &commands, const String &sfind, const String &replace);
-bool RuleSetProcess(uint8_t rule_set, String &event_saved);
-bool RulesProcessEvent(char *json_event);
-bool RulesProcess(void);
-void RulesInit(void);
-void RulesEvery50ms(void);
-void RulesEvery100ms(void);
-void RulesEverySecond(void);
-void RulesSaveBeforeRestart(void);
-void RulesSetPower(void);
-void RulesTeleperiod(void);
-bool RulesMqttData(void);
-void CmndSubscribe(void);
-void CmndUnsubscribe(void);
-bool findNextNumber(char * &pNumber, float &value);
-bool findNextVariableValue(char * &pVarname, float &value);
-bool findNextObjectValue(char * &pointer, float &value);
-bool findNextOperator(char * &pointer, int8_t &op);
-float calculateTwoValues(float v1, float v2, uint8_t op);
-float evaluateExpression(const char * expression, unsigned int len);
-void CmndIf(void);
-bool evaluateComparisonExpression(const char *expression, int len);
-bool findNextLogicOperator(char * &pointer, int8_t &op);
-bool findNextLogicObjectValue(char * &pointer, bool &value);
-bool evaluateLogicalExpression(const char * expression, int len);
-int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type);
-void ExecuteCommandBlock(const char * commands, int len);
-void ProcessIfStatement(const char* statements);
-void RulesPreprocessCommand(char *pCommands);
-void CmndRule(void);
-void CmndRuleTimer(void);
-void CmndEvent(void);
-void CmndVariable(void);
-void CmndMemory(void);
-void CmndCalcResolution(void);
-void CmndAddition(void);
-void CmndSubtract(void);
-void CmndMultiply(void);
-void CmndScale(void);
-float map_double(float x, float in_min, float in_max, float out_min, float out_max);
-bool Xdrv10(uint8_t function);
-void ScriptEverySecond(void);
-void RulesTeleperiod(void);
-int16_t Init_Scripter(void);
-void ws2812_set_array(float *array ,uint8_t len);
-float median_array(float *array,uint8_t len);
-float Get_MFVal(uint8_t index,uint8_t bind);
-void Set_MFVal(uint8_t index,uint8_t bind,float val);
-float Get_MFilter(uint8_t index);
-void Set_MFilter(uint8_t index, float invar);
-float DoMedian5(uint8_t index, float in);
-uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value);
-uint16_t GetStack(void);
-uint16_t GetStack(void);
-void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize);
-void toLog(const char *str);
-void toLogN(const char *cp,uint8_t len);
-void toLogEOL(const char *s1,const char *str);
-void toSLog(const char *str);
-int16_t Run_Scripter(const char *type, int8_t tlen, char *js);
-void ScripterEvery100ms(void);
-void Scripter_save_pvars(void);
-void ListDir(char *path, uint8_t depth);
-void Script_FileUploadConfiguration(void);
-void ScriptFileUploadSuccess(void);
-void script_upload(void);
-uint8_t DownloadFile(char *file);
-void HandleScriptTextareaConfiguration(void);
-void HandleScriptConfiguration(void);
-void ScriptSaveSettings(void);
-void Script_HueStatus(String *response, uint16_t hue_devs);
-void Script_Check_Hue(String *response);
-void Script_Handle_Hue(String *path);
-bool Script_SubCmd(void);
-void execute_script(char *script);
-bool ScriptCommand(void);
-uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day);
-uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second);
-void dateTime(uint16_t* date, uint16_t* time);
-bool ScriptMqttData(void);
-String ScriptSubscribe(const char *data, int data_len);
-String ScriptUnsubscribe(const char * data, int data_len);
-void Script_Check_HTML_Setvars(void);
-void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen);
-void ScriptWebShow(void);
-void ScriptJsonAppend(void);
-bool Xdrv10(uint8_t function);
-void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF );
-void KNX_DEL_GA( uint8_t GAnum );
-void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF );
-void KNX_DEL_CB( uint8_t CBnum );
-bool KNX_CONFIG_NOT_MATCH(void);
-void KNXStart(void);
-void KNX_INIT(void);
-void KNX_CB_Action(message_t const &msg, void *arg);
-void KnxUpdatePowerState(uint8_t device, power_t state);
-void KnxSendButtonPower(void);
-void KnxSensor(uint8_t sensor_type, float value);
-void HandleKNXConfiguration(void);
-void KNX_Save_Settings(void);
-void CmndKnxTxCmnd(void);
-void CmndKnxTxVal(void);
-void CmndKnxEnabled(void);
-void CmndKnxEnhanced(void);
-void CmndKnxPa(void);
-void CmndKnxGa(void);
-void CmndKnxCb(void);
-bool Xdrv11(uint8_t function);
-void TryResponseAppend_P(const char *format, ...);
-void HAssAnnounceRelayLight(void);
-void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle);
-void HAssAnnounceSwitches(void);
-void HAssAnnounceButtons(void);
-void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx);
-void HAssAnnounceSensors(void);
-void HAssAnnounceStatusSensor(void);
-void HAssPublishStatus(void);
-void HAssDiscovery(void);
-void HAssDiscover(void);
-void HAssAnyKey(void);
-bool Xdrv12(uint8_t function);
-void DisplayInit(uint8_t mode);
-void DisplayClear(void);
-void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
-void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color);
-void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
-void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color);
-void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color);
-void DisplayDrawFrame(void);
-void DisplaySetSize(uint8_t size);
-void DisplaySetFont(uint8_t font);
-void DisplaySetRotation(uint8_t rotation);
-void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void DisplayOnOff(uint8_t on);
-uint8_t fatoiv(char *cp,float *res);
-uint8_t atoiv(char *cp, int16_t *res);
-uint8_t atoiV(char *cp, uint16_t *res);
-void alignright(char *string);
-uint32_t decode_te(char *line);
-void DisplayText(void);
-void DisplayClearScreenBuffer(void);
-void DisplayFreeScreenBuffer(void);
-void DisplayAllocScreenBuffer(void);
-void DisplayReAllocScreenBuffer(void);
-void DisplayFillScreen(uint32_t line);
-void DisplayClearLogBuffer(void);
-void DisplayFreeLogBuffer(void);
-void DisplayAllocLogBuffer(void);
-void DisplayReAllocLogBuffer(void);
-void DisplayLogBufferAdd(char* txt);
-char* DisplayLogBuffer(char temp_code);
-void DisplayLogBufferInit(void);
-void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value);
-void DisplayAnalyzeJson(char *topic, char *json);
-void DisplayMqttSubscribe(void);
-bool DisplayMqttData(void);
-void DisplayLocalSensor(void);
-void DisplayInitDriver(void);
-void DisplaySetPower(void);
-void CmndDisplay(void);
-void CmndDisplayModel(void);
-void CmndDisplayWidth(void);
-void CmndDisplayHeight(void);
-void CmndDisplayMode(void);
-void CmndDisplayDimmer(void);
-void CmndDisplaySize(void);
-void CmndDisplayFont(void);
-void CmndDisplayRotate(void);
-void CmndDisplayText(void);
-void CmndDisplayAddress(void);
-void CmndDisplayRefresh(void);
-void CmndDisplayColumns(void);
-void CmndDisplayRows(void);
-void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp);
-void DrawAClock(uint16_t rad);
-void ClrGraph(uint16_t num);
-void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol);
-void DisplayCheckGraph();
-void Save_graph(uint8_t num, char *path);
-void Restore_graph(uint8_t num, char *path);
-void RedrawGraph(uint8_t num, uint8_t flags);
-void AddGraph(uint8_t num,uint8_t val);
-void AddValue(uint8_t num,float fval);
-bool Xdrv13(uint8_t function);
-uint16_t MP3_Checksum(uint8_t *array);
-void MP3PlayerInit(void);
-void MP3_CMD(uint8_t mp3cmd,uint16_t val);
-bool MP3PlayerCmd(void);
-bool Xdrv14(uint8_t function);
-void PCA9685_Detect(void);
-void PCA9685_Reset(void);
-void PCA9685_SetPWMfreq(double freq);
-void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off);
-void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted);
-bool PCA9685_Command(void);
-void PCA9685_OutputTelemetry(bool telemetry);
-bool Xdrv15(uint8_t function);
-void CmndTuyaSend(void);
-void CmndTuyaMcu(void);
-void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId);
-void UpdateDevices();
-inline bool TuyaFuncIdValid(uint8_t fnId);
-uint8_t TuyaGetFuncId(uint8_t dpid);
-uint8_t TuyaGetDpId(uint8_t fnId);
-void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value);
-void TuyaSendBool(uint8_t id, bool value);
-void TuyaSendValue(uint8_t id, uint32_t value);
-void TuyaSendEnum(uint8_t id, uint32_t value);
-void TuyaSendString(uint8_t id, char data[]);
-bool TuyaSetPower(void);
-bool TuyaSetChannels(void);
-void LightSerialDuty(uint16_t duty);
-void TuyaRequestState(void);
-void TuyaResetWifi(void);
-void TuyaProcessStatePacket(void);
-void TuyaLowPowerModePacketProcess(void);
-void TuyaHandleProductInfoPacket(void);
-void TuyaSendLowPowerSuccessIfNeeded(void);
-void TuyaNormalPowerModePacketProcess(void);
-bool TuyaModuleSelected(void);
-void TuyaInit(void);
-void TuyaSerialInput(void);
-bool TuyaButtonPressed(void);
-uint8_t TuyaGetTuyaWifiState(void);
-void TuyaSetWifiLed(void);
-bool Xnrg16(uint8_t function);
-bool Xdrv16(uint8_t function);
-void RfReceiveCheck(void);
-void RfInit(void);
-void CmndRfSend(void);
-bool Xdrv17(uint8_t function);
-bool ArmtronixSetChannels(void);
-void LightSerial2Duty(uint8_t duty1, uint8_t duty2);
-void ArmtronixRequestState(void);
-bool ArmtronixModuleSelected(void);
-void ArmtronixInit(void);
-void ArmtronixSerialInput(void);
-void ArmtronixSetWifiLed(void);
-bool Xdrv18(uint8_t function);
-void PS16DZSerialSend(const char *tx_buffer);
-void PS16DZSerialSendOk(void);
-void PS16DZSerialSendUpdateCommand(void);
-void PS16DZSerialInput(void);
-bool PS16DZSerialSendUpdateCommandIfRequired(void);
-void PS16DZInit(void);
-bool PS16DZModuleSelected(void);
-bool Xdrv19(uint8_t function);
-String HueBridgeId(void);
-String HueSerialnumber(void);
-String HueUuid(void);
-void HueRespondToMSearch(void);
-String GetHueDeviceId(uint8_t id);
-String GetHueUserId(void);
-void HandleUpnpSetupHue(void);
-void HueNotImplemented(String *path);
-void HueConfigResponse(String *response);
-void HueConfig(String *path);
-uint8_t getLocalLightSubtype(uint8_t device);
-void HueLightStatus1(uint8_t device, String *response);
-bool HueActive(uint8_t device);
-void HueLightStatus2(uint8_t device, String *response);
-uint32_t EncodeLightId(uint8_t relay_id);
-uint32_t DecodeLightId(uint32_t hue_id);
-uint32_t findEchoGeneration(void);
-void HueGlobalConfig(String *path);
-void HueAuthentication(String *path);
-void HueLights(String *path);
-void HueGroups(String *path);
-void HandleHueApi(String *path);
-bool Xdrv20(uint8_t function);
-String WemoSerialnumber(void);
-String WemoUuid(void);
-void WemoRespondToMSearch(int echo_type);
-void HandleUpnpEvent(void);
-void HandleUpnpService(void);
-void HandleUpnpMetaService(void);
-void HandleUpnpSetupWemo(void);
-bool Xdrv21(uint8_t function);
-bool IsModuleIfan(void);
-uint8_t MaxFanspeed(void);
-uint8_t GetFanspeed(void);
-void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence);
-void SonoffIfanReceived(void);
-bool SonoffIfanSerialInput(void);
-void CmndFanspeed(void);
-bool SonoffIfanInit(void);
-void SonoffIfanUpdate(void);
-bool Xdrv22(uint8_t function);
-void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val);
-void CopyJsonArray(JsonArray &to, const JsonArray &arr);
-void CopyJsonObject(JsonObject &to, const JsonObject &from);
-uint16_t fromClusterCode(uint8_t c);
-uint8_t toClusterCode(uint16_t c);
-class SBuffer hibernateDevice(const struct Z_Device &device);
-class SBuffer hibernateDevices(void);
-void hidrateDevices(const SBuffer &buf);
-void loadZigbeeDevices(void);
-void saveZigbeeDevices(void);
-void eraseZigbeeDevices(void);
-uint8_t toPercentageCR2032(uint32_t voltage);
-uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
-                              uint32_t offset, uint32_t len);
-int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint);
-inline bool isXYZ(char c);
-inline int8_t hexValue(char c);
-void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz);
-void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload);
-const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd);
-inline char hexDigit(uint32_t h);
-String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z);
-uint32_t ZigbeeAliasOrNumber(const char *state_text);
-uint8_t ZigbeeGetInstructionSize(uint8_t instr);
-void ZigbeeGotoLabel(uint8_t label);
-void ZigbeeStateMachine_Run(void);
-int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf);
-int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf);
-int32_t Z_Reboot(int32_t res, class SBuffer &buf);
-int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf);
-bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match);
-int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf);
-void Z_SendIEEEAddrReq(uint16_t shortaddr);
-void Z_SendActiveEpReq(uint16_t shortaddr);
-void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint);
-int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf);
-void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid);
-int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf);
-int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf);
-void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json);
-int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf);
-int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf);
-int32_t Z_Load_Devices(uint8_t value);
-int32_t Z_State_Ready(uint8_t value);
-int32_t ZigbeeProcessInput(class SBuffer &buf);
-void ZigbeeInput(void);
-void ZigbeeInit(void);
-uint32_t strToUInt(const JsonVariant &val);
-void CmndZbReset(void);
-void CmndZbZNPSendOrReceive(bool send);
-void CmndZbZNPReceive(void);
-void CmndZbZNPSend(void);
-void ZigbeeZNPSend(const uint8_t *msg, size_t len);
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
-                       uint16_t cluster, uint8_t cmd, const char *param);
-void CmndZbSend(void);
-void CmndZbBind(void);
-void CmndZbProbe(void);
-void CmndZbProbeOrPing(boolean probe);
-void CmndZbPing(void);
-void CmndZbName(void);
-void CmndZbForget(void);
-void CmndZbSave(void);
-void CmndZbRead(void);
-void CmndZbPermitJoin(void);
-void CmndZbStatus(void);
-bool Xdrv23(uint8_t function);
-void BuzzerOff(void);
-void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode);
-void BuzzerSetStateToLed(uint32_t state);
-void BuzzerBeep(uint32_t count);
-void BuzzerEnabledBeep(uint32_t count, uint32_t duration);
-bool BuzzerPinState(void);
-void BuzzerInit(void);
-void BuzzerEvery100mSec(void);
-void CmndBuzzer(void);
-bool Xdrv24(uint8_t function);
-void A4988Init(void);
-void CmndDoMove(void);
-void CmndDoRotate(void);
-void CmndDoTurn(void);
-void CmndSetMIS(void);
-void CmndSetSPR(void);
-void CmndSetRPM(void);
-bool Xdrv25(uint8_t function);
-void AriluxRfInterrupt(void);
-void AriluxRfHandler(void);
-void AriluxRfInit(void);
-void AriluxRfDisable(void);
-bool Xdrv26(uint8_t function);
-void ShutterLogPos(uint32_t i);
-void ShutterRtc50mS(void);
-int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index);
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index);
-void ShutterInit(void);
-void ShutterReportPosition(bool always);
-void ShutterLimitRealAndTargetPositions(uint32_t i);
-void ShutterUpdatePosition(void);
-bool ShutterState(uint32_t device);
-void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos);
-void ShutterWaitForMotorStop(uint32_t i);
-int32_t ShutterCounterBasedPosition(uint32_t i);
-void ShutterRelayChanged(void);
-bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index);
-void ShutterButtonHandler(void);
-void ShutterSetPosition(uint32_t device, uint32_t position);
-void CmndShutterOpen(void);
-void CmndShutterClose(void);
-void CmndShutterStop(void);
-void CmndShutterPosition(void);
-void CmndShutterOpenTime(void);
-void CmndShutterCloseTime(void);
-void CmndShutterMotorDelay(void);
-void CmndShutterRelay(void);
-void CmndShutterButton(void);
-void CmndShutterSetHalfway(void);
-void CmndShutterFrequency(void);
-void CmndShutterSetClose(void);
-void CmndShutterInvert(void);
-void CmndShutterCalibration(void);
-void CmndShutterLock(void);
-void CmndShutterEnableEndStopTime(void);
-bool Xdrv27(uint8_t function);
-void Pcf8574SwitchRelay(void);
-void Pcf8574Init(void);
-void HandlePcf8574(void);
-void Pcf8574SaveSettings(void);
-bool Xdrv28(uint8_t function);
-bool DeepSleepEnabled(void);
-void DeepSleepReInit(void);
-void DeepSleepPrepare(void);
-void DeepSleepStart(void);
-void DeepSleepEverySecond(void);
-void CmndDeepsleepTime(void);
-bool Xdrv29(uint8_t function);
-uint8_t crc8(const uint8_t *p, uint8_t len);
-void ExsSendCmd(uint8_t cmd, uint8_t value);
-uint8_t ExsSetPower(uint8_t device, uint8_t power);
-uint8_t ExsSetBri(uint8_t device, uint8_t bri);
-uint8_t ExsSyncState(uint8_t device);
-bool ExsSyncState();
-void ExsDebugState();
-void ExsPacketProcess(void);
-bool ExsModuleSelected(void);
-bool ExsSetChannels(void);
-bool ExsSetPower(void);
-void EsxMcuStart(void);
-void ExsInit(void);
-void ExsSerialInput(void);
-void CmndExsDimm(void);
-void CmndExsDimmTbl(void);
-void CmndExsDimmVal(void);
-void CmndExsDimms(void);
-void CmndExsChLock(void);
-void CmndExsState(void);
-bool Xdrv30(uint8_t function);
-uint32_t TasmotaSlave_FlashStart(void);
-uint8_t TasmotaSlave_UpdateInit(void);
-void TasmotaSlave_Reset(void);
-uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout);
-uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count);
-uint8_t TasmotaSlave_execCmd(uint8_t cmd);
-uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count);
-uint8_t TasmotaSlave_exitProgMode(void);
-uint8_t TasmotaSlave_SetupFlash(void);
-uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo);
-void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data);
-void TasmotaSlave_Flash(void);
-void TasmotaSlave_SetFlagFlashing(bool value);
-bool TasmotaSlave_GetFlagFlashing(void);
-void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size);
-void TasmotaSlave_Init(void);
-void TasmotaSlave_Show(void);
-void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param);
-void CmndTasmotaSlaveReset(void);
-void CmndTasmotaSlaveSend(void);
-void TasmotaSlave_ProcessIn(void);
-bool Xdrv31(uint8_t function);
-void HotPlugInit(void);
-void HotPlugEverySecond(void);
-void CmndHotPlugTime(void);
-bool Xdrv32(uint8_t function);
-bool NRF24initRadio();
-bool NRF24Detect(void);
-bool Xdrv33(uint8_t function);
-void WMotorV1Detect(void);
-void WMotorV1Reset(void);
-void WMotorV1SetFrequency(uint32_t freq);
-void WMotorV1SetMotor(uint8_t motor, uint8_t dir, float pwm_val);
-bool WMotorV1Command(void);
-bool Xdrv34(uint8_t function);
-void ExceptionTest(uint8_t type);
-void CpuLoadLoop(void);
-void DebugFreeMem(void);
-void DebugFreeMem(void);
-void DebugRtcDump(char* parms);
-void DebugCfgDump(char* parms);
-void DebugCfgPeek(char* parms);
-void DebugCfgPoke(char* parms);
-void SetFlashMode(uint8_t mode);
-void CmndHelp(void);
-void CmndRtcDump(void);
-void CmndCfgDump(void);
-void CmndCfgPeek(void);
-void CmndCfgPoke(void);
-void CmndCfgXor(void);
-void CmndException(void);
-void CmndCpuCheck(void);
-void CmndFreemem(void);
-void CmndSetSensor(void);
-void CmndFlashMode(void);
-uint32_t DebugSwap32(uint32_t x);
-void CmndFlashDump(void);
-void CmndI2cWrite(void);
-void CmndI2cRead(void);
-void CmndI2cStretch(void);
-void CmndI2cClock(void);
-bool Xdrv99(uint8_t function);
-void XsnsDriverState(void);
-bool XdrvRulesProcess(void);
-void ShowFreeMem(const char *where);
-bool XdrvCallDriver(uint32_t driver, uint8_t Function);
-bool XdrvCall(uint8_t Function);
-void LcdInitMode(void);
-void LcdInit(uint8_t mode);
-void LcdInitDriver(void);
-void LcdDrawStringAt(void);
-void LcdDisplayOnOff(uint8_t on);
-void LcdCenter(uint8_t row, char* txt);
-bool LcdPrintLog(void);
-void LcdTime(void);
-void LcdRefresh(void);
-bool Xdsp01(uint8_t function);
-void SSD1306InitDriver(void);
-void Ssd1306PrintLog(void);
-void Ssd1306Time(void);
-void Ssd1306Refresh(void);
-bool Xdsp02(byte function);
-void MatrixWrite(void);
-void MatrixClear(void);
-void MatrixFixed(char* txt);
-void MatrixCenter(char* txt);
-void MatrixScrollLeft(char* txt, int loop);
-void MatrixScrollUp(char* txt, int loop);
-void MatrixInitMode(void);
-void MatrixInit(uint8_t mode);
-void MatrixInitDriver(void);
-void MatrixOnOff(void);
-void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void MatrixPrintLog(uint8_t direction);
-void MatrixRefresh(void);
-bool Xdsp03(uint8_t function);
-void Ili9341InitMode(void);
-void Ili9341Init(uint8_t mode);
-void Ili9341InitDriver(void);
-void Ili9341Clear(void);
-void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag);
-void Ili9341DisplayOnOff(uint8_t on);
-void Ili9341OnOff(void);
-void Ili9341PrintLog(void);
-void Ili9341Refresh(void);
-bool Xdsp04(uint8_t function);
-void EpdInitDriver29();
-void EpdPrintLog29(void);
-void EpdRefresh29(void);
-bool Xdsp05(uint8_t function);
-void EpdInitDriver42();
-void EpdRefresh42();
-bool Xdsp06(uint8_t function);
-void SH1106InitDriver();
-void SH1106PrintLog(void);
-void SH1106Time(void);
-void SH1106Refresh(void);
-bool Xdsp07(uint8_t function);
-void ILI9488_InitDriver();
-void ILI9488_MQTT(uint8_t count,const char *cp);
-void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr);
-void FT6236Check();
-bool Xdsp08(uint8_t function);
-void SSD1351_InitDriver();
-void SSD1351PrintLog(void);
-void SSD1351Time(void);
-void SSD1351Refresh(void);
-bool Xdsp09(uint8_t function);
-void RA8876_InitDriver();
-void RA8876_MQTT(uint8_t count,const char *cp);
-void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr);
-void FT5316Check();
-bool Xdsp10(uint8_t function);
-uint8_t XdspPresent(void);
-bool XdspCall(uint8_t Function);
-void Ws2812StripShow(void);
-int mod(int a, int b);
-void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset);
-void Ws2812UpdateHand(int position, uint32_t index);
-void Ws2812Clock(void);
-void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i);
-void Ws2812Gradient(uint32_t schemenr);
-void Ws2812Bars(uint32_t schemenr);
-void Ws2812Clear(void);
-void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
-char* Ws2812GetColor(uint32_t led, char* scolor);
-void Ws2812ForceSuspend (void);
-void Ws2812ForceUpdate (void);
-bool Ws2812SetChannels(void);
-void Ws2812ShowScheme(void);
-void Ws2812ModuleSelected(void);
-void CmndLed(void);
-void CmndPixels(void);
-void CmndRotation(void);
-void CmndWidth(void);
-bool Xlgt01(uint8_t function);
-void LightDiPulse(uint8_t times);
-void LightDckiPulse(uint8_t times);
-void LightMy92x1Write(uint8_t data);
-void LightMy92x1Init(void);
-void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c);
-bool My92x1SetChannels(void);
-void My92x1ModuleSelected(void);
-bool Xlgt02(uint8_t function);
-void SM16716_SendBit(uint8_t v);
-void SM16716_SendByte(uint8_t v);
-void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b);
-void SM16716_Init(void);
-bool Sm16716SetChannels(void);
-void Sm16716ModuleSelected(void);
-bool Xlgt03(uint8_t function);
-uint8_t Sm2135Write(uint8_t data);
-void Sm2135Send(uint8_t *buffer, uint8_t size);
-bool Sm2135SetChannels(void);
-void Sm2135ModuleSelected(void);
-bool Xlgt04(uint8_t function);
-void SnfL1Send(const char *buffer);
-void SnfL1SerialSendOk(void);
-bool SnfL1SerialInput(void);
-bool SnfL1SetChannels(void);
-void SnfL1ModuleSelected(void);
-bool Xlgt05(uint8_t function);
-bool XlgtCall(uint8_t function);
-void HlwCfInterrupt(void);
-void HlwCf1Interrupt(void);
-void HlwEvery200ms(void);
-void HlwEverySecond(void);
-void HlwSnsInit(void);
-void HlwDrvInit(void);
-bool HlwCommand(void);
-bool Xnrg01(uint8_t function);
-void CseReceived(void);
-bool CseSerialInput(void);
-void CseEverySecond(void);
-void CseSnsInit(void);
-void CseDrvInit(void);
-bool CseCommand(void);
-bool Xnrg02(uint8_t function);
-uint8_t PzemCrc(uint8_t *data);
-void PzemSend(uint8_t cmd);
-bool PzemReceiveReady(void);
-bool PzemRecieve(uint8_t resp, float *data);
-void PzemEvery250ms(void);
-void PzemSnsInit(void);
-void PzemDrvInit(void);
-bool PzemCommand(void);
-bool Xnrg03(uint8_t function);
-uint8_t McpChecksum(uint8_t *data);
-unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size);
-void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size);
-void McpSend(uint8_t *data);
-void McpGetAddress(void);
-void McpAddressReceive(void);
-void McpGetCalibration(void);
-void McpParseCalibration(void);
-bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift);
-void McpSetCalibration(struct mcp_cal_registers_type *cal_registers);
-void McpSetSystemConfiguration(uint16 interval);
-void McpGetFrequency(void);
-void McpParseFrequency(void);
-void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency);
-void McpGetData(void);
-void McpParseData(void);
-void McpSerialInput(void);
-void McpEverySecond(void);
-void McpSnsInit(void);
-void McpDrvInit(void);
-bool McpCommand(void);
-bool Xnrg04(uint8_t function);
-void PzemAcEverySecond(void);
-void PzemAcSnsInit(void);
-void PzemAcDrvInit(void);
-bool PzemAcCommand(void);
-bool Xnrg05(uint8_t function);
-void PzemDcEverySecond(void);
-void PzemDcSnsInit(void);
-void PzemDcDrvInit(void);
-bool PzemDcCommand(void);
-bool Xnrg06(uint8_t function);
-int Ade7953RegSize(uint16_t reg);
-void Ade7953Write(uint16_t reg, uint32_t val);
-int32_t Ade7953Read(uint16_t reg);
-void Ade7953Init(void);
-void Ade7953GetData(void);
-void Ade7953EnergyEverySecond(void);
-void Ade7953DrvInit(void);
-bool Ade7953Command(void);
-bool Xnrg07(uint8_t function);
-void SDM120Every250ms(void);
-void Sdm120SnsInit(void);
-void Sdm120DrvInit(void);
-void Sdm220Reset(void);
-void Sdm220Show(bool json);
-bool Xnrg08(uint8_t function);
-void Dds2382EverySecond(void);
-void Dds2382SnsInit(void);
-void Dds2382DrvInit(void);
-bool Xnrg09(uint8_t function);
-void SDM630Every250ms(void);
-void Sdm630SnsInit(void);
-void Sdm630DrvInit(void);
-bool Xnrg10(uint8_t function);
-void DDSU666Every250ms(void);
-void Ddsu666SnsInit(void);
-void Ddsu666DrvInit(void);
-bool Xnrg11(uint8_t function);
-bool solaxX1_RS485ReceiveReady(void);
-void solaxX1_RS485Send(uint16_t msgLen);
-uint8_t solaxX1_RS485Receive(uint8_t *value);
-uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen);
-void solaxX1_SendInverterAddress(void);
-void solaxX1_QueryLiveData(void);
-uint8_t solaxX1_ParseErrorCode(uint32_t code);
-void solaxX1250MSecond(void);
-void solaxX1SnsInit(void);
-void solaxX1DrvInit(void);
-void solaxX1Show(bool json);
-bool Xnrg12(uint8_t function);
-void FifLEEvery250ms(void);
-void FifLESnsInit(void);
-void FifLEDrvInit(void);
-void FifLEReset(void);
-void FifLEShow(bool json);
-bool Xnrg13(uint8_t function);
-bool XnrgCall(uint8_t function);
-void CounterUpdate(uint8_t index);
-void CounterUpdate1(void);
-void CounterUpdate2(void);
-void CounterUpdate3(void);
-void CounterUpdate4(void);
-bool CounterPinState(void);
-void CounterInit(void);
-void CounterEverySecond(void);
-void CounterSaveState(void);
-void CounterShow(bool json);
-void CmndCounter(void);
-void CmndCounterType(void);
-void CmndCounterDebounce(void);
-bool Xsns01(uint8_t function);
-void AdcInit(void);
-uint16_t AdcRead(uint8_t factor);
-void AdcEvery250ms(void);
-uint16_t AdcGetLux(void);
-uint16_t AdcGetRange(void);
-void AdcGetCurrentPower(uint8_t factor);
-void AdcEverySecond(void);
-void AdcShow(bool json);
-void CmndAdc(void);
-void CmndAdcs(void);
-void CmndAdcParam(void);
-bool Xsns02(uint8_t function);
-void SonoffScSend(const char *data);
-void SonoffScInit(void);
-void SonoffScSerialInput(char *rcvstat);
-void SonoffScShow(bool json);
-bool Xsns04(uint8_t function);
-uint8_t OneWireReset(void);
-void OneWireWriteBit(uint8_t v);
-void OneWireReadBit1(void);
-void OneWireReadBit2(void);
-uint8_t OneWireReadBit(void);
-void OneWireWrite(uint8_t v);
-uint8_t OneWireRead(void);
-void OneWireSelect(const uint8_t rom[8]);
-void OneWireResetSearch(void);
-uint8_t OneWireSearch(uint8_t *newAddr);
-bool OneWireCrc8(uint8_t *addr);
-void Ds18x20Init(void);
-void Ds18x20Convert(void);
-bool Ds18x20Read(uint8_t sensor);
-void Ds18x20Name(uint8_t sensor);
-void Ds18x20EverySecond(void);
-void Ds18x20Show(bool json);
-bool Xsns05(uint8_t function);
-void DhtReadPrep(void);
-int32_t DhtExpectPulse(uint8_t sensor, bool level);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-void DhtReadPrep(void);
-int32_t DhtExpectPulse(uint8_t sensor, bool level);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtExpectPulse(uint8_t sensor, int level);
-int DhtReadDat(uint8_t sensor);
-bool DhtRead(uint8_t sensor);
-void DhtReadTempHum(uint8_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtExpectPulse(uint32_t sensor, uint32_t level);
-bool DhtRead(uint32_t sensor);
-void DhtReadTempHum(uint32_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool DhtWaitState(uint32_t sensor, uint32_t level);
-bool DhtRead(uint32_t sensor);
-bool DhtPinState();
-void DhtInit(void);
-void DhtEverySecond(void);
-void DhtShow(bool json);
-bool Xsns06(uint8_t function);
-bool ShtReset(void);
-bool ShtSendCommand(const uint8_t cmd);
-bool ShtAwaitResult(void);
-int ShtReadData(void);
-bool ShtRead(void);
-void ShtDetect(void);
-void ShtEverySecond(void);
-void ShtShow(bool json);
-bool Xsns07(uint8_t function);
-uint8_t HtuCheckCrc8(uint16_t data);
-uint8_t HtuReadDeviceId(void);
-void HtuSetResolution(uint8_t resolution);
-void HtuReset(void);
-void HtuHeater(uint8_t heater);
-void HtuInit(void);
-bool HtuRead(void);
-void HtuDetect(void);
-void HtuEverySecond(void);
-void HtuShow(bool json);
-bool Xsns08(uint8_t function);
-bool Bmp180Calibration(uint8_t bmp_idx);
-void Bmp180Read(uint8_t bmp_idx);
-bool Bmx280Calibrate(uint8_t bmp_idx);
-void Bme280Read(uint8_t bmp_idx);
-static void BmeDelayMs(uint32_t ms);
-bool Bme680Init(uint8_t bmp_idx);
-void Bme680Read(uint8_t bmp_idx);
-void BmpDetect(void);
-void BmpRead(void);
-void BmpShow(bool json);
-void BMP_EnterSleep(void);
-bool Xsns09(uint8_t function);
-bool Bh1750Read(void);
-void Bh1750Detect(void);
-void Bh1750EverySecond(void);
-void Bh1750Show(bool json);
-bool Xsns10(uint8_t function);
-void Veml6070Detect(void);
-void Veml6070UvTableInit(void);
-void Veml6070EverySecond(void);
-void Veml6070ModeCmd(bool mode_cmd);
-uint16_t Veml6070ReadUv(void);
-double Veml6070UvRiskLevel(uint16_t uv_level);
-double Veml6070UvPower(double uvrisk);
-void Veml6070Show(bool json);
-bool Xsns11(uint8_t function);
-void Ads1115StartComparator(uint8_t channel, uint16_t mode);
-int16_t Ads1115GetConversion(uint8_t channel);
-void Ads1115Detect(void);
-void Ads1115Show(bool json);
-bool Xsns12(uint8_t function);
-bool Ina219SetCalibration(uint8_t mode, uint16_t addr);
-float Ina219GetShuntVoltage_mV(uint16_t addr);
-float Ina219GetBusVoltage_V(uint16_t addr);
-float Ina219GetCurrent_mA(uint16_t addr);
-bool Ina219Read(void);
-bool Ina219CommandSensor(void);
-void Ina219Detect(void);
-void Ina219EverySecond(void);
-void Ina219Show(bool json);
-bool Xsns13(uint8_t function);
-bool Sht3xRead(float &t, float &h, uint8_t sht3x_address);
-void Sht3xDetect(void);
-void Sht3xShow(bool json);
-bool Xsns14(uint8_t function);
-uint8_t MhzCalculateChecksum(uint8_t *array);
-size_t MhzSendCmd(uint8_t command_id);
-bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s);
-void MhzEverySecond(void);
-bool MhzCommandSensor(void);
-void MhzInit(void);
-void MhzShow(bool json);
-bool Xsns15(uint8_t function);
-bool Tsl2561Read(void);
-void Tsl2561Detect(void);
-void Tsl2561EverySecond(void);
-void Tsl2561Show(bool json);
-bool Xsns16(uint8_t function);
-void Senseair250ms(void);
-void SenseairInit(void);
-void SenseairShow(bool json);
-bool Xsns17(uint8_t function);
-bool PmsReadData(void);
-void PmsSecond(void);
-void PmsInit(void);
-void PmsShow(bool json);
-bool Xsns18(uint8_t function);
-void MGSInit(void);
-void MGSPrepare(void);
-char* measure_gas(int gas_type, char* buffer);
-void MGSShow(bool json);
-bool Xsns19(uint8_t function);
-bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer);
-void NovaSdsSetWorkPeriod(void);
-bool NovaSdsReadData(void);
-void NovaSdsSecond(void);
-bool NovaSdsCommandSensor(void);
-void NovaSdsInit(void);
-void NovaSdsShow(bool json);
-bool Xsns20(uint8_t function);
-void sgp30_Init(void);
-float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit);
-void Sgp30Update(void);
-void Sgp30Show(bool json);
-bool Xsns21(uint8_t function);
-uint8_t Sr04TModeDetect(void);
-uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third);
-uint16_t Sr04TMode3Distance();
-uint16_t Sr04TMode2Distance(void);
-void Sr04TReading(void);
-void Sr04Show(bool json);
-bool Xsns22(uint8_t function);
-uint8_t Si1145ReadByte(uint8_t reg);
-uint16_t Si1145ReadHalfWord(uint8_t reg);
-bool Si1145WriteByte(uint8_t reg, uint16_t val);
-uint8_t Si1145WriteParamData(uint8_t p, uint8_t v);
-bool Si1145Present(void);
-void Si1145Reset(void);
-void Si1145DeInit(void);
-bool Si1145Begin(void);
-uint16_t Si1145ReadUV(void);
-uint16_t Si1145ReadVisible(void);
-uint16_t Si1145ReadIR(void);
-bool Si1145Read(void);
-void Si1145Detect(void);
-void Si1145Update(void);
-void Si1145Show(bool json);
-bool Xsns24(uint8_t function);
-void LM75ADDetect(void);
-float LM75ADGetTemp(void);
-void LM75ADShow(bool json);
-bool Xsns26(uint8_t function);
-int8_t wireReadDataBlock( uint8_t reg,
-                                        uint8_t *val,
-                                        uint16_t len);
-void calculateColorTemperature(void);
-bool APDS9960_init(void);
-uint8_t getMode(void);
-void setMode(uint8_t mode, uint8_t enable);
-void enableLightSensor(void);
-void disableLightSensor(void);
-void enableProximitySensor(void);
-void disableProximitySensor(void);
-void enableGestureSensor(void);
-void disableGestureSensor(void);
-bool isGestureAvailable(void);
-int16_t readGesture(void);
-void enablePower(void);
-void disablePower(void);
-void readAllColorAndProximityData(void);
-void resetGestureParameters(void);
-bool processGestureData(void);
-bool decodeGesture(void);
-void handleGesture(void);
-void APDS9960_adjustATime(void);
-void APDS9960_loop(void);
-void APDS9960_detect(void);
-void APDS9960_show(bool json);
-bool APDS9960CommandSensor(void);
-bool Xsns27(uint8_t function);
-void Tm16XXSend(uint8_t data);
-void Tm16XXSendCommand(uint8_t cmd);
-void TM16XXSendData(uint8_t address, uint8_t data);
-uint8_t Tm16XXReceive(void);
-void Tm16XXClearDisplay(void);
-void Tm1638SetLED(uint8_t color, uint8_t pos);
-void Tm1638SetLEDs(word leds);
-uint8_t Tm1638GetButtons(void);
-void TmInit(void);
-void TmLoop(void);
-bool Xsns28(uint8_t function);
-void MCP230xx_CheckForIntCounter(void);
-void MCP230xx_CheckForIntRetainer(void);
-const char* IntModeTxt(uint8_t intmo);
-uint8_t MCP230xx_readGPIO(uint8_t port);
-void MCP230xx_ApplySettings(void);
-void MCP230xx_Detect(void);
-void MCP230xx_CheckForInterrupt(void);
-void MCP230xx_Show(bool json);
-void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate);
-void MCP230xx_Reset(uint8_t pinmode);
-bool MCP230xx_Command(void);
-void MCP230xx_UpdateWebData(void);
-void MCP230xx_OutputTelemetry(void);
-void MCP230xx_Interrupt_Counter_Report(void);
-void MCP230xx_Interrupt_Retain_Report(void);
-bool Xsns29(uint8_t function);
-void Mpr121Init(struct mpr121 *pS, bool initial);
-void Mpr121Show(struct mpr121 *pS, uint8_t function);
-bool Xsns30(uint8_t function);
-void CCS811Detect(void);
-void CCS811Update(void);
-void CCS811Show(bool json);
-bool Xsns31(uint8_t function);
-void MPU_6050PerformReading(void);
-void MPU_6050Detect(void);
-void MPU_6050Show(bool json);
-bool Xsns32(uint8_t function);
-void DS3231Detect(void);
-uint8_t bcd2dec(uint8_t n);
-uint8_t dec2bcd(uint8_t n);
-uint32_t ReadFromDS3231(void);
-void SetDS3231Time (uint32_t epoch_time);
-void DS3231EverySecond(void);
-bool Xsns33(uint8_t function);
-bool HxIsReady(uint16_t timeout);
-long HxRead(void);
-void HxResetPart(void);
-void HxReset(void);
-void HxCalibrationStateTextJson(uint8_t msg_id);
-void SetWeightDelta();
-bool HxCommand(void);
-long HxWeight(void);
-void HxInit(void);
-void HxEvery100mSecond(void);
-void HxSaveBeforeRestart(void);
-void HxShow(bool json);
-void HandleHxAction(void);
-void HxSaveSettings(void);
-void HxLogUpdates(void);
-bool Xsns34(uint8_t function);
-void TX2xStartRead(void);
-void Tx2xReset(void);
-void Tx2xRead(void);
-void Tx2xInit(void);
-void Tx2xShow(bool json);
-bool Xsns35(uint8_t function);
-void MGC3130_handleSensorData();
-void MGC3130_sendMessage(uint8_t data[], uint8_t length);
-void MGC3130_handleGesture();
-bool MGC3130_handleTouch();
-void MGC3130_handleAirWheel();
-void MGC3130_handleSystemStatus();
-bool MGC3130_receiveMessage();
-bool MGC3130_readData();
-void MGC3130_nextMode();
-void MGC3130_loop();
-void MGC3130_detect(void);
-void MGC3130_show(bool json);
-bool MGC3130CommandSensor();
-bool Xsns36(uint8_t function);
-bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal);
-void RfSnsInitTheoV2(void);
-void RfSnsAnalyzeTheov2(void);
-void RfSnsTheoV2Show(bool json);
-void RfSnsInitAlectoV2(void);
-void RfSnsAnalyzeAlectov2();
-void RfSnsAlectoResetRain(void);
-uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len);
-void RfSnsAlectoV2Show(bool json);
-void RfSnsInit(void);
-void RfSnsAnalyzeRawSignal(void);
-void RfSnsEverySecond(void);
-void RfSnsShow(bool json);
-bool Xsns37(uint8_t function);
-void AzEverySecond(void);
-void AzInit(void);
-void AzShow(bool json);
-bool Xsns38(uint8_t function);
-void MAX31855_Init(void);
-void MAX31855_GetResult(void);
-float MAX31855_GetProbeTemperature(int32_t RawData);
-float MAX31855_GetReferenceTemperature(int32_t RawData);
-int32_t MAX31855_ShiftIn(uint8_t Length);
-void MAX31855_Show(bool Json);
-bool Xsns39(uint8_t function);
-void PN532_Init(void);
-int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout);
-int8_t PN532_readAckFrame(void);
-uint32_t PN532_getFirmwareVersion(void);
-void PN532_wakeup(void);
-bool PN532_setPassiveActivationRetries(uint8_t maxRetries);
-bool PN532_SAMConfig(void);
-uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData);
-uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data);
-uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data);
-void PN532_ScanForTag(void);
-bool PN532_Command(void);
-bool Xsns40(uint8_t function);
-bool Max4409Read_lum(void);
-void Max4409Detect(void);
-void Max4409EverySecond(void);
-void Max4409Show(bool json);
-bool Xsns41(uint8_t function);
-void Scd30Detect(void);
-void Scd30Update(void);
-int Scd30GetCommand(int command_code, uint16_t *pvalue);
-int Scd30SetCommand(int command_code, uint16_t value);
-bool Scd30CommandSensor();
-void Scd30Show(bool json);
-bool Xsns42(byte function);
-int hreReadBit();
-char hreReadChar(int &parity_errors);
-void hreInit(void);
-void hreEvery50ms(void);
-void hreShow(boolean json);
-bool Xsns43(byte function);
-uint8_t sps30_calc_CRC(uint8_t *data);
-void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen);
-void sps30_cmd(uint16_t cmd);
-void SPS30_Detect(void);
-void SPS30_Every_Second();
-void SPS30_Show(bool json);
-bool SPS30_cmd(void);
-bool Xsns44(byte function);
-void Vl53l0Detect(void);
-void Vl53l0Every_250MSecond(void);
-void Vl53l0Show(boolean json);
-bool Xsns45(byte function);
-void MLX90614_Init(void);
-void MLX90614_Every_Second(void);
-void MLX90614_Show(uint8_t json);
-bool Xsns46(byte function);
-void MAX31865_Init(void);
-void MAX31865_GetResult(void);
-void MAX31865_Show(bool Json);
-bool Xsns47(uint8_t function);
-void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg);
-uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr);
-void ChirpReset(uint8_t addr);
-void ChirpResetAll(void);
-void ChirpClockSet();
-void ChirpSleep(uint8_t addr);
-void ChirpSelect(uint8_t sensor);
-uint8_t ChirpReadVersion(uint8_t addr);
-bool ChirpSet(uint8_t addr);
-bool ChirpScan();
-void ChirpDetect(void);
-void ChirpServiceAllSensors(uint8_t job);
-void ChirpEvery100MSecond(void);
-void ChirpShow(bool json);
-bool ChirpCmd(void);
-bool Xsns48(uint8_t function);
-void PAJ7620SelectBank(uint8_t bank);
-void PAJ7620DecodeGesture(void);
-void PAJ7620ReadGesture(void);
-void PAJ7620Detect(void);
-void PAJ7620Init(void);
-void PAJ7620Loop(void);
-void PAJ7620Show(bool json);
-bool PAJ7620CommandSensor(void);
-bool Xsns50(uint8_t function);
-void RDM6300_Init();
-void RDM6300_ScanForTag();
-uint8_t rm6300_hexnibble(char chr);
-void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[]);
-void RDM6300_Show(void);
-bool Xsns51(byte function);
-void IBEACON_Init();
-void hm17_every_second(void);
-void hm17_sbclr(void);
-void hm17_sendcmd(uint8_t cmd);
-uint32_t ibeacon_add(struct IBEACON *ib);
-void hm17_decode(void);
-void IBEACON_loop();
-void IBEACON_Show(void);
-bool xsns52_cmd(void);
-bool ibeacon_cmd(void);
-void ib_sendbeep(void);
-void ibeacon_mqtt(const char *mac,const char *rssi);
-bool Xsns52(byte function);
-double sml_median_array(double *array,uint8_t len);
-double sml_median(struct SML_MEDIAN_FILTER* mf, double in);
-void ADS1115_init(void);
-bool Serial_available();
-uint8_t Serial_read();
-uint8_t Serial_peek();
-void Dump2log(void);
-double sml_getvalue(unsigned char *cp,uint8_t index);
-uint8_t hexnibble(char chr);
-double CharToDouble(const char *str);
-void ebus_esc(uint8_t *ebus_buffer, unsigned char len);
-uint8_t ebus_crc8(uint8_t data, uint8_t crc_init);
-uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen );
-void sml_empty_receiver(uint32_t meters);
-void sml_shift_in(uint32_t meters,uint32_t shard);
-void SML_Poll(void);
-void SML_Decode(uint8_t index);
-void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex);
-void SML_Show(boolean json);
-void SML_CounterUpd(uint8_t index);
-void SML_CounterUpd1(void);
-void SML_CounterUpd2(void);
-void SML_CounterUpd3(void);
-void SML_CounterUpd4(void);
-bool Gpio_used(uint8_t gpiopin);
-void SML_Init(void);
-uint32_t SML_SetBaud(uint32_t meter, uint32_t br);
-uint32_t SML_Write(uint32_t meter,char *hstr);
-void SetDBGLed(uint8_t srcpin, uint8_t ledpin);
-void SML_Counter_Poll(void);
-void SML_Check_Send(void);
-uint8_t sml_hexnibble(char chr);
-void SML_Send_Seq(uint32_t meter,char *seq);
-uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num);
-uint8_t SML_PzemCrc(uint8_t *data, uint8_t len);
-uint8_t CalcEvenParity(uint8_t data);
-bool XSNS_53_cmd(void);
-void InjektCounterValue(uint8_t meter,uint32_t counter);
-void SML_CounterSaveState(void);
-bool Xsns53(byte function);
-static uint32_t _expand_r_shunt(uint16_t compact_r_shunt);
-void Ina226SetCalibration(uint8_t slaveIndex);
-bool Ina226TestPresence(uint8_t device);
-void Ina226ResetActive(void);
-void Ina226Init();
-float Ina226ReadBus_v(uint8_t device);
-float Ina226ReadShunt_i(uint8_t device);
-float Ina226ReadPower_w(uint8_t device);
-void Ina226Read(uint8_t device);
-void Ina226EverySecond();
-bool Ina226CommandSensor();
-void Ina226Show(bool json);
-bool Xsns54(byte callback_id);
-bool Hih6Read(void);
-void Hih6Detect(void);
-void Hih6EverySecond(void);
-void Hih6Show(bool json);
-bool Xsns55(uint8_t function);
-void HpmaSecond(void);
-void HpmaInit(void);
-void HpmaShow(bool json);
-bool Xsns56(uint8_t function);
-void Tsl2591Init(void);
-bool Tsl2591Read(void);
-void Tsl2591EverySecond(void);
-void Tsl2591Show(bool json);
-bool Xsns57(uint8_t function);
-bool Dht12Read(void);
-void Dht12Detect(void);
-void Dht12EverySecond(void);
-void Dht12Show(bool json);
-bool Xsns58(uint8_t function);
-uint32_t DS1624_Idx2Addr(uint32_t idx);
-int DS1624_Restart(uint8_t config, uint32_t idx);
-void DS1624_HotPlugUp(uint32_t idx);
-void DS1624_HotPlugDown(int idx);
-bool DS1624GetTemp(float *value, int idx);
-void DS1624HotPlugScan(void);
-void DS1624EverySecond(void);
-void DS1624Show(bool json);
-bool Xsns59(uint8_t function);
-void UBXcalcChecksum(char* CK, size_t msgSize);
-bool UBXcompareMsgHeader(const char* msgHeader);
-void UBXinitCFG(void);
-void UBXTriggerTele(void);
-void UBXDetect(void);
-uint32_t UBXprocessGPS();
-void UBXsendHeader(void);
-void UBXsendRecord(uint8_t *buf);
-void UBXsendFooter(void);
-void UBXsendFile(void);
-void UBXSetRate(uint16_t interval);
-void UBXSelectMode(uint16_t mode);
-bool UBXHandlePOSLLH();
-void UBXHandleSTATUS();
-void UBXHandleTIME();
-void UBXHandleOther(void);
-void UBXLoop50msec(void);
-void UBXLoop(void);
-void UBXShow(bool json);
-bool UBXCmd(void);
-bool Xsns60(uint8_t function);
-bool MINRFinitBLE(uint8_t _mode);
-void MINRFhopChannel();
-bool MINRFreceivePacket(void);
-void MINRFswapbuf(uint8_t len);
-void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr);
-void MINRFreverseMAC(uint8_t _mac[]);
-void MINRFchangePacketModeTo(uint8_t _mode);
-void MINRFpurgeFakeSensors(void);
-void MINRFhandleFloraPacket(void);
-void MINRFhandleMJ_HT_V1Packet(void);
-void MINRFhandleLYWSD02Packet(void);
-void MINRFhandleLYWSD03Packet(void);
-void MINRFhandleCGG1Packet(void);
-void MINRF_EVERY_50_MSECOND();
-void MINRFShow(bool json);
-bool Xsns61(uint8_t function);
-void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay);
-void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot);
-void HM10_Reset(void);
-void HM10_Discovery_Scan(void);
-void HM10_Read_LYWSD03(void);
-void HM10_Read_LYWSD02(void);
-void HM10_Time_LYWSD02(void);
-void HM10SerialInit(void);
-void HM10MACStringToBytes(const char* string, uint8_t _mac[]);
-void HM10ParseResponse(char *buf);
-void HM10readTempHum(char *_buf);
-bool HM10readBat(char *_buf);
-bool HM10SerialHandleFeedback();
-void HM10_TaskEvery100ms();
-void HM10EverySecond();
-bool HM10Cmd(void);
-void HM10Show(bool json);
-bool Xsns62(uint8_t function);
-bool AHT10Read(void);
-bool AHT10Init(void);
-uint8_t AHT10ReadStatus(void);
-void AHT10Reset(void);
-void AHT10Detect(void);
-void AHT10EverySecond(void);
-void AHT10Show(bool json);
-bool Xsns63(uint8_t function);
-void HandleMetrics(void);
-bool Xsns91(uint8_t function);
-bool XsnsEnabled(uint32_t sns_index);
-void XsnsSensorState(void);
-bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index);
-bool XsnsCall(uint8_t Function);
-bool I2cEnabled(uint32_t i2c_index);
-void I2cDriverState(void);
-#line 184 "S:/Development/Tasmota/tasmota/tasmota.ino"
-void setup(void)
-{
-  global_state.data = 3;
-
-  RtcRebootLoad();
-  if (!RtcRebootValid()) {
-    RtcReboot.fast_reboot_count = 0;
-  }
-  RtcReboot.fast_reboot_count++;
-  RtcRebootSave();
-
-  Serial.begin(APP_BAUDRATE);
-  seriallog_level = LOG_LEVEL_INFO;
-
-  snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff);
-  if (VERSION & 0xff) {
-    snprintf_P(my_version, sizeof(my_version), PSTR("%s.%d"), my_version, VERSION & 0xff);
-  }
-
-  snprintf_P(my_image, sizeof(my_image), PSTR("(%s)"), CODE_IMAGE_STR);
-
-  SettingsLoad();
-  SettingsDelta();
-
-  OsWatchInit();
-
-  GetFeatures();
-
-  if (1 == RtcReboot.fast_reboot_count) {
-    UpdateQuickPowerCycle(true);
-    XdrvCall(FUNC_SETTINGS_OVERRIDE);
-  }
-
-
-  seriallog_level = Settings.seriallog_level;
-  seriallog_timer = SERIALLOG_TIMER;
-  syslog_level = Settings.syslog_level;
-  stop_flash_rotate = Settings.flag.stop_flash_rotate;
-  save_data_counter = Settings.save_data;
-  sleep = Settings.sleep;
-#ifndef USE_EMULATION
-  Settings.flag2.emulation = 0;
-#else
-#ifndef USE_EMULATION_WEMO
-  if (EMUL_WEMO == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
-#endif
-#ifndef USE_EMULATION_HUE
-  if (EMUL_HUE == Settings.flag2.emulation) { Settings.flag2.emulation = 0; }
-#endif
-#endif
-
-  if (Settings.param[P_BOOT_LOOP_OFFSET]) {
-
-    if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET]) {
-      Settings.flag3.user_esp8285_enable = 0;
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +1) {
-        for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-          if (bitRead(Settings.rule_stop, i)) {
-            bitWrite(Settings.rule_enabled, i, 0);
-          }
-        }
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +2) {
-        Settings.rule_enabled = 0;
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +3) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          Settings.my_gp.io[i] = GPIO_NONE;
-        }
-        Settings.my_adc0 = ADC0_NONE;
-      }
-      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +4) {
-        Settings.module = SONOFF_BASIC;
-
-      }
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
-    }
-  }
-
-  Format(mqtt_client, SettingsText(SET_MQTT_CLIENT), sizeof(mqtt_client));
-  Format(mqtt_topic, SettingsText(SET_MQTT_TOPIC), sizeof(mqtt_topic));
-  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME), mqtt_topic, ESP.getChipId() & 0x1FFF);
-  } else {
-    snprintf_P(my_hostname, sizeof(my_hostname)-1, SettingsText(SET_HOSTNAME));
-  }
-
-  GetEspHardwareType();
-  GpioInit();
-
-
-
-  WifiConnect();
-
-  SetPowerOnState();
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE), PROJECT, SettingsText(SET_FRIENDLYNAME1), my_version, my_image);
-#ifdef FIRMWARE_MINIMAL
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_WARNING_MINIMAL_VERSION));
-#endif
-
-  memcpy_P(log_data, VERSION_MARKER, 1);
-
-  RtcInit();
-
-#ifdef USE_ARDUINO_OTA
-  ArduinoOTAInit();
-#endif
-
-  XdrvCall(FUNC_INIT);
-  XsnsCall(FUNC_INIT);
-}
-
-void BacklogLoop(void)
-{
-  if (TimeReached(backlog_delay)) {
-    if (!BACKLOG_EMPTY && !backlog_mutex) {
-#ifdef SUPPORT_IF_STATEMENT
-      backlog_mutex = true;
-      String cmd = backlog.shift();
-      backlog_mutex = false;
-      ExecuteCommand((char*)cmd.c_str(), SRC_BACKLOG);
-#else
-      backlog_mutex = true;
-      ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
-      backlog_pointer++;
-      if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
-      backlog_mutex = false;
-#endif
-    }
-  }
-}
-
-void loop(void)
-{
-  uint32_t my_sleep = millis();
-
-  XdrvCall(FUNC_LOOP);
-  XsnsCall(FUNC_LOOP);
-
-  OsWatchLoop();
-
-  ButtonLoop();
-  SwitchLoop();
-#ifdef ROTARY_V1
-  RotaryLoop();
-#endif
-#ifdef USE_DEVICE_GROUPS
-  DeviceGroupsLoop();
-#endif
-  BacklogLoop();
-
-  if (TimeReached(state_50msecond)) {
-    SetNextTimeInterval(state_50msecond, 50);
-    XdrvCall(FUNC_EVERY_50_MSECOND);
-    XsnsCall(FUNC_EVERY_50_MSECOND);
-  }
-  if (TimeReached(state_100msecond)) {
-    SetNextTimeInterval(state_100msecond, 100);
-    Every100mSeconds();
-    XdrvCall(FUNC_EVERY_100_MSECOND);
-    XsnsCall(FUNC_EVERY_100_MSECOND);
-  }
-  if (TimeReached(state_250msecond)) {
-    SetNextTimeInterval(state_250msecond, 250);
-    Every250mSeconds();
-    XdrvCall(FUNC_EVERY_250_MSECOND);
-    XsnsCall(FUNC_EVERY_250_MSECOND);
-  }
-  if (TimeReached(state_second)) {
-    SetNextTimeInterval(state_second, 1000);
-    PerformEverySecond();
-    XdrvCall(FUNC_EVERY_SECOND);
-    XsnsCall(FUNC_EVERY_SECOND);
-  }
-
-  if (!serial_local) { SerialInput(); }
-
-#ifdef USE_ARDUINO_OTA
-  ArduinoOtaLoop();
-#endif
-
-  uint32_t my_activity = millis() - my_sleep;
-
-  if (Settings.flag3.sleep_normal) {
-
-    delay(sleep);
-  } else {
-    if (my_activity < (uint32_t)sleep) {
-      delay((uint32_t)sleep - my_activity);
-    } else {
-      if (global_state.wifi_down) {
-        delay(my_activity /2);
-      }
-    }
-  }
-
-  if (!my_activity) { my_activity++; }
-  uint32_t loop_delay = sleep;
-  if (!loop_delay) { loop_delay++; }
-  uint32_t loops_per_second = 1000 / loop_delay;
-  uint32_t this_cycle_ratio = 100 * my_activity / loop_delay;
-  loop_load_avg = loop_load_avg - (loop_load_avg / loops_per_second) + (this_cycle_ratio / loops_per_second);
-}
-# 1 "S:/Development/Tasmota/tasmota/sendemail.ino"
-#ifdef USE_SENDMAIL
-
-#include "sendemail.h"
-# 25 "S:/Development/Tasmota/tasmota/sendemail.ino"
-#ifndef SEND_MAIL_MINRAM
-#define SEND_MAIL_MINRAM 12*1024
-#endif
-
-#define xPSTR(a) a
-
-uint16_t SendMail(char *buffer) {
-  char *params,*oparams;
-  const char *mserv;
-  uint16_t port;
-  const char *user;
-  const char *pstr;
-  const char *passwd;
-  const char *from;
-  const char *to;
-  const char *subject;
-  const char *cmd;
-  char auth=0;
-  uint16_t status=1;
-  SendEmail *mail=0;
-  uint16_t blen;
-  char *endcmd;
-
-
-
-  uint16_t mem=ESP.getFreeHeap();
-  if (mem<SEND_MAIL_MINRAM) {
-    return 4;
-  }
-
-  while (*buffer==' ') buffer++;
-
-  if (*buffer!='[') {
-      goto exit;
-  }
-
-  buffer++;
-
-  endcmd=strchr(buffer,']');
-  if (!endcmd) {
-    goto exit;
-  }
-
-
-  blen=(uint32_t)endcmd-(uint32_t)buffer;
-  oparams=(char*)calloc(blen+2,1);
-  if (!oparams) return 4;
-  params=oparams;
-  strncpy(oparams,buffer,blen+2);
-  oparams[blen]=0;
-
-  cmd=endcmd+1;
-
-  #ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("mailsize: %d"),blen);
-  #endif
-
-  mserv=strtok(params,":");
-  if (!mserv) {
-      goto exit;
-  }
-
-
-  pstr=strtok(NULL,":");
-  if (!pstr) {
-      goto exit;
-  }
-
-#ifdef EMAIL_PORT
-  if (*pstr=='*') {
-    port=EMAIL_PORT;
-  } else {
-    port=atoi(pstr);
-  }
-#else
-  port=atoi(pstr);
-#endif
-
-  user=strtok(NULL,":");
-  if (!user) {
-      goto exit;
-  }
-
-  passwd=strtok(NULL,":");
-  if (!passwd) {
-      goto exit;
-  }
-
-  from=strtok(NULL,":");
-  if (!from) {
-      goto exit;
-  }
-
-  to=strtok(NULL,":");
-  if (!to) {
-      goto exit;
-  }
-
-  subject=strtok(NULL,"]");
-  if (!subject) {
-      goto exit;
-  }
-
-
-#ifdef EMAIL_USER
-  if (*user=='*') {
-    user=xPSTR(EMAIL_USER);
-  }
-#endif
-#ifdef EMAIL_PASSWORD
-  if (*passwd=='*') {
-    passwd=xPSTR(EMAIL_PASSWORD);
-  }
-#endif
-#ifdef EMAIL_SERVER
-  if (*mserv=='*') {
-    mserv=xPSTR(EMAIL_SERVER);
-  }
-#endif
-
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %d - %s - %s"),mserv,port,user,passwd);
-#endif
-
-
-#ifndef MAIL_TIMEOUT
-  #define MAIL_TIMEOUT 2000
-#endif
-  mail = new SendEmail(mserv,port,user,passwd, MAIL_TIMEOUT, auth);
-
-#ifdef EMAIL_FROM
-  if (*from=='*') {
-    from=xPSTR(EMAIL_FROM);
-  }
-#endif
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s - %s - %s - %s"),from,to,subject,cmd);
-#endif
-
-  if (mail) {
-    bool result=mail->send(from,to,subject,cmd);
-    delete mail;
-    if (result==true) status=0;
-  }
-
-exit:
-  if (oparams) free(oparams);
-  return status;
-}
-
-void script_send_email_body(BearSSL::WiFiClientSecure_light *client);
-
-
-SendEmail::SendEmail(const String& host, const int port, const String& user, const String& passwd, const int timeout, const int auth_used) :
-    host(host), port(port), user(user), passwd(passwd), timeout(timeout), ssl(ssl), auth_used(auth_used), client(new BearSSL::WiFiClientSecure_light(1024,1024)) {
-}
-
-String SendEmail::readClient() {
-  delay(0);
-  String r = client->readStringUntil('\n');
-
-  r.trim();
-  while (client->available()) {
-    delay(0);
-    r += client->readString();
-  }
-  return r;
-}
-
-bool SendEmail::send(const String& from, const String& to, const String& subject, const char *msg) {
-bool status=false;
-String buffer;
-
-  if (!host.length()) {
-    return status;
-  }
-
-  client->setTimeout(timeout);
-
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("Connecting: %s on port %d"),host.c_str(),port);
-#endif
-
-  if (!client->connect(host.c_str(), port)) {
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P(LOG_LEVEL_INFO, PSTR("Connection failed"));
-#endif
-    goto exit;
-  }
-
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("220"))) {
-    goto exit;
-  }
-
-  buffer = F("EHLO ");
-  buffer += client->localIP().toString();
-
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-  if (user.length()>0 && passwd.length()>0 ) {
-
-    buffer = F("AUTH LOGIN");
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("334")))
-    {
-      goto exit;
-    }
-    base64 b;
-    buffer = b.encode(user);
-
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("334"))) {
-      goto exit;
-    }
-    buffer = b.encode(passwd);
-    client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-    if (!buffer.startsWith(F("235"))) {
-      goto exit;
-    }
-  }
-
-
-  buffer = F("MAIL FROM:");
-  buffer += from;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-  buffer = F("RCPT TO:");
-  buffer += to;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("250"))) {
-    goto exit;
-  }
-
-  buffer = F("DATA");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = readClient();
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  if (!buffer.startsWith(F("354"))) {
-    goto exit;
-  }
-  buffer = F("From: ");
-  buffer += from;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = F("To: ");
-  buffer += to;
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-  buffer = F("Subject: ");
-  buffer += subject;
-  buffer += F("\r\n");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-#ifdef USE_SCRIPT
-  if (*msg=='*' && *(msg+1)==0) {
-    script_send_email_body(client);
-  } else {
-    client->println(msg);
-  }
-#else
-  client->println(msg);
-#endif
-  client->println('.');
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-  buffer = F("QUIT");
-  client->println(buffer);
-#ifdef DEBUG_EMAIL_PORT
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
-#endif
-
-  status=true;
-exit:
-
-  return status;
-}
-
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/settings.ino"
-# 20 "S:/Development/Tasmota/tasmota/settings.ino"
-#ifndef DOMOTICZ_UPDATE_TIMER
-#define DOMOTICZ_UPDATE_TIMER 0
-#endif
-
-#ifndef EMULATION
-#define EMULATION EMUL_NONE
-#endif
-
-#ifndef MTX_ADDRESS1
-#define MTX_ADDRESS1 0
-#endif
-#ifndef MTX_ADDRESS2
-#define MTX_ADDRESS2 0
-#endif
-#ifndef MTX_ADDRESS3
-#define MTX_ADDRESS3 0
-#endif
-#ifndef MTX_ADDRESS4
-#define MTX_ADDRESS4 0
-#endif
-#ifndef MTX_ADDRESS5
-#define MTX_ADDRESS5 0
-#endif
-#ifndef MTX_ADDRESS6
-#define MTX_ADDRESS6 0
-#endif
-#ifndef MTX_ADDRESS7
-#define MTX_ADDRESS7 0
-#endif
-#ifndef MTX_ADDRESS8
-#define MTX_ADDRESS8 0
-#endif
-
-#ifndef HOME_ASSISTANT_DISCOVERY_ENABLE
-#define HOME_ASSISTANT_DISCOVERY_ENABLE 0
-#endif
-
-#ifndef LATITUDE
-#define LATITUDE 48.858360
-#endif
-#ifndef LONGITUDE
-#define LONGITUDE 2.294442
-#endif
-
-#ifndef WORKING_PERIOD
-#define WORKING_PERIOD 5
-#endif
-
-#ifndef COLOR_TEXT
-#define COLOR_TEXT "#000"
-#endif
-#ifndef COLOR_BACKGROUND
-#define COLOR_BACKGROUND "#fff"
-#endif
-#ifndef COLOR_FORM
-#define COLOR_FORM "#f2f2f2"
-#endif
-#ifndef COLOR_INPUT_TEXT
-#define COLOR_INPUT_TEXT "#000"
-#endif
-#ifndef COLOR_INPUT
-#define COLOR_INPUT "#fff"
-#endif
-#ifndef COLOR_CONSOLE_TEXT
-#define COLOR_CONSOLE_TEXT "#000"
-#endif
-#ifndef COLOR_CONSOLE
-#define COLOR_CONSOLE "#fff"
-#endif
-#ifndef COLOR_TEXT_WARNING
-#define COLOR_TEXT_WARNING "#f00"
-#endif
-#ifndef COLOR_TEXT_SUCCESS
-#define COLOR_TEXT_SUCCESS "#008000"
-#endif
-#ifndef COLOR_BUTTON_TEXT
-#define COLOR_BUTTON_TEXT "#fff"
-#endif
-#ifndef COLOR_BUTTON
-#define COLOR_BUTTON "#1fa3ec"
-#endif
-#ifndef COLOR_BUTTON_HOVER
-#define COLOR_BUTTON_HOVER "#0e70a4"
-#endif
-#ifndef COLOR_BUTTON_RESET
-#define COLOR_BUTTON_RESET "#d43535"
-#endif
-#ifndef COLOR_BUTTON_RESET_HOVER
-#define COLOR_BUTTON_RESET_HOVER "#931f1f"
-#endif
-#ifndef COLOR_BUTTON_SAVE
-#define COLOR_BUTTON_SAVE "#47c266"
-#endif
-#ifndef COLOR_BUTTON_SAVE_HOVER
-#define COLOR_BUTTON_SAVE_HOVER "#5aaf6f"
-#endif
-#ifndef COLOR_TIMER_TAB_TEXT
-#define COLOR_TIMER_TAB_TEXT "#fff"
-#endif
-#ifndef COLOR_TIMER_TAB_BACKGROUND
-#define COLOR_TIMER_TAB_BACKGROUND "#999"
-#endif
-#ifndef COLOR_TITLE_TEXT
-#define COLOR_TITLE_TEXT COLOR_TEXT
-#endif
-#ifndef IR_RCV_MIN_UNKNOWN_SIZE
-#define IR_RCV_MIN_UNKNOWN_SIZE 6
-#endif
-#ifndef ENERGY_OVERTEMP
-#define ENERGY_OVERTEMP 90
-#endif
-#ifndef DEFAULT_DIMMER_MAX
-#define DEFAULT_DIMMER_MAX 100
-#endif
-#ifndef DEFAULT_DIMMER_MIN
-#define DEFAULT_DIMMER_MIN 0
-#endif
-#ifndef DEFAULT_LIGHT_DIMMER
-#define DEFAULT_LIGHT_DIMMER 10
-#endif
-#ifndef DEFAULT_LIGHT_COMPONENT
-#define DEFAULT_LIGHT_COMPONENT 255
-#endif
-#ifndef CORS_ENABLED_ALL
-#define CORS_ENABLED_ALL "*"
-#endif
-
-
-enum WebColors {
-  COL_TEXT, COL_BACKGROUND, COL_FORM,
-  COL_INPUT_TEXT, COL_INPUT, COL_CONSOLE_TEXT, COL_CONSOLE,
-  COL_TEXT_WARNING, COL_TEXT_SUCCESS,
-  COL_BUTTON_TEXT, COL_BUTTON, COL_BUTTON_HOVER, COL_BUTTON_RESET, COL_BUTTON_RESET_HOVER, COL_BUTTON_SAVE, COL_BUTTON_SAVE_HOVER,
-  COL_TIMER_TAB_TEXT, COL_TIMER_TAB_BACKGROUND, COL_TITLE,
-  COL_LAST };
-
-const char kWebColors[] PROGMEM =
-  COLOR_TEXT "|" COLOR_BACKGROUND "|" COLOR_FORM "|"
-  COLOR_INPUT_TEXT "|" COLOR_INPUT "|" COLOR_CONSOLE_TEXT "|" COLOR_CONSOLE "|"
-  COLOR_TEXT_WARNING "|" COLOR_TEXT_SUCCESS "|"
-  COLOR_BUTTON_TEXT "|" COLOR_BUTTON "|" COLOR_BUTTON_HOVER "|" COLOR_BUTTON_RESET "|" COLOR_BUTTON_RESET_HOVER "|" COLOR_BUTTON_SAVE "|" COLOR_BUTTON_SAVE_HOVER "|"
-  COLOR_TIMER_TAB_TEXT "|" COLOR_TIMER_TAB_BACKGROUND "|" COLOR_TITLE_TEXT;
-
-enum TasmotaSerialConfig {
-  TS_SERIAL_5N1, TS_SERIAL_6N1, TS_SERIAL_7N1, TS_SERIAL_8N1,
-  TS_SERIAL_5N2, TS_SERIAL_6N2, TS_SERIAL_7N2, TS_SERIAL_8N2,
-  TS_SERIAL_5E1, TS_SERIAL_6E1, TS_SERIAL_7E1, TS_SERIAL_8E1,
-  TS_SERIAL_5E2, TS_SERIAL_6E2, TS_SERIAL_7E2, TS_SERIAL_8E2,
-  TS_SERIAL_5O1, TS_SERIAL_6O1, TS_SERIAL_7O1, TS_SERIAL_8O1,
-  TS_SERIAL_5O2, TS_SERIAL_6O2, TS_SERIAL_7O2, TS_SERIAL_8O2 };
-
-const uint8_t kTasmotaSerialConfig[] PROGMEM = {
-  SERIAL_5N1, SERIAL_6N1, SERIAL_7N1, SERIAL_8N1,
-  SERIAL_5N2, SERIAL_6N2, SERIAL_7N2, SERIAL_8N2,
-  SERIAL_5E1, SERIAL_6E1, SERIAL_7E1, SERIAL_8E1,
-  SERIAL_5E2, SERIAL_6E2, SERIAL_7E2, SERIAL_8E2,
-  SERIAL_5O1, SERIAL_6O1, SERIAL_7O1, SERIAL_8O1,
-  SERIAL_5O2, SERIAL_6O2, SERIAL_7O2, SERIAL_8O2
-};
-
-
-
-
-
-const uint16_t RTC_MEM_VALID = 0xA55A;
-
-uint32_t rtc_settings_crc = 0;
-
-uint32_t GetRtcSettingsCrc(void)
-{
-  uint32_t crc = 0;
-  uint8_t *bytes = (uint8_t*)&RtcSettings;
-
-  for (uint32_t i = 0; i < sizeof(RTCMEM); i++) {
-    crc += bytes[i]*(i+1);
-  }
-  return crc;
-}
-
-void RtcSettingsSave(void)
-{
-  if (GetRtcSettingsCrc() != rtc_settings_crc) {
-    RtcSettings.valid = RTC_MEM_VALID;
-    ESP.rtcUserMemoryWrite(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
-    rtc_settings_crc = GetRtcSettingsCrc();
-  }
-}
-
-void RtcSettingsLoad(void)
-{
-  ESP.rtcUserMemoryRead(100, (uint32_t*)&RtcSettings, sizeof(RTCMEM));
-  if (RtcSettings.valid != RTC_MEM_VALID) {
-    memset(&RtcSettings, 0, sizeof(RTCMEM));
-    RtcSettings.valid = RTC_MEM_VALID;
-    RtcSettings.energy_kWhtoday = Settings.energy_kWhtoday;
-    RtcSettings.energy_kWhtotal = Settings.energy_kWhtotal;
-    RtcSettings.energy_usage = Settings.energy_usage;
-    for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-      RtcSettings.pulse_counter[i] = Settings.pulse_counter[i];
-    }
-    RtcSettings.power = Settings.power;
-    RtcSettingsSave();
-  }
-  rtc_settings_crc = GetRtcSettingsCrc();
-}
-
-bool RtcSettingsValid(void)
-{
-  return (RTC_MEM_VALID == RtcSettings.valid);
-}
-
-
-
-uint32_t rtc_reboot_crc = 0;
-
-uint32_t GetRtcRebootCrc(void)
-{
-  uint32_t crc = 0;
-  uint8_t *bytes = (uint8_t*)&RtcReboot;
-
-  for (uint32_t i = 0; i < sizeof(RTCRBT); i++) {
-    crc += bytes[i]*(i+1);
-  }
-  return crc;
-}
-
-void RtcRebootSave(void)
-{
-  if (GetRtcRebootCrc() != rtc_reboot_crc) {
-    RtcReboot.valid = RTC_MEM_VALID;
-    ESP.rtcUserMemoryWrite(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
-    rtc_reboot_crc = GetRtcRebootCrc();
-  }
-}
-
-void RtcRebootReset(void)
-{
-  RtcReboot.fast_reboot_count = 0;
-  RtcRebootSave();
-}
-
-void RtcRebootLoad(void)
-{
-  ESP.rtcUserMemoryRead(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));
-  if (RtcReboot.valid != RTC_MEM_VALID) {
-    memset(&RtcReboot, 0, sizeof(RTCRBT));
-    RtcReboot.valid = RTC_MEM_VALID;
-
-    RtcRebootSave();
-  }
-  rtc_reboot_crc = GetRtcRebootCrc();
-}
-
-bool RtcRebootValid(void)
-{
-  return (RTC_MEM_VALID == RtcReboot.valid);
-}
-# 299 "S:/Development/Tasmota/tasmota/settings.ino"
-extern "C" {
-#include "spi_flash.h"
-}
-#include "eboot_command.h"
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-
-extern "C" uint32_t _SPIFFS_end;
-
-const uint32_t SPIFFS_END = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#else
-
-#if AUTOFLASHSIZE
-
-#include "flash_hal.h"
-
-
-const uint32_t SPIFFS_END = (FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#else
-
-extern "C" uint32_t _FS_end;
-
-const uint32_t SPIFFS_END = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
-
-#endif
-
-#endif
-
-
-const uint32_t SETTINGS_LOCATION = SPIFFS_END;
-
-const uint8_t CFG_ROTATES = 8;
-
-uint32_t settings_location = SETTINGS_LOCATION;
-uint32_t settings_crc32 = 0;
-uint8_t *settings_buffer = nullptr;
-
-
-
-
-
-void SetFlashModeDout(void)
-{
-  uint8_t *_buffer;
-  uint32_t address;
-
-  eboot_command ebcmd;
-  eboot_command_read(&ebcmd);
-  address = ebcmd.args[0];
-  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
-
-  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
-    if (_buffer[2] != 3) {
-      _buffer[2] = 3;
-      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
-        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
-      }
-    }
-  }
-  delete[] _buffer;
-}
-
-bool VersionCompatible(void)
-{
-  if (Settings.flag3.compatibility_check) {
-    return true;
-  }
-
-  eboot_command ebcmd;
-  eboot_command_read(&ebcmd);
-  uint32_t start_address = ebcmd.args[0];
-  uint32_t end_address = start_address + (ebcmd.args[2] & 0xFFFFF000) + FLASH_SECTOR_SIZE;
-  uint32_t* buffer = new uint32_t[FLASH_SECTOR_SIZE / 4];
-
-  uint32_t version[3] = { 0 };
-  bool found = false;
-  for (uint32_t address = start_address; address < end_address; address = address + FLASH_SECTOR_SIZE) {
-    ESP.flashRead(address, (uint32_t*)buffer, FLASH_SECTOR_SIZE);
-    if ((address == start_address) && (0x1F == (buffer[0] & 0xFF))) {
-      version[1] = 0xFFFFFFFF;
-      found = true;
-    } else {
-      for (uint32_t i = 0; i < (FLASH_SECTOR_SIZE / 4); i++) {
-        version[0] = version[1];
-        version[1] = version[2];
-        version[2] = buffer[i];
-        if ((MARKER_START == version[0]) && (MARKER_END == version[2])) {
-          found = true;
-          break;
-        }
-      }
-    }
-    if (found) { break; }
-  }
-  delete[] buffer;
-
-  if (!found) { version[1] = 0; }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: Version 0x%08X, Compatible 0x%08X"), version[1], VERSION_COMPATIBLE);
-
-  if (version[1] < VERSION_COMPATIBLE) {
-    uint32_t eboot_magic = 0;
-    ESP.rtcUserMemoryWrite(0, (uint32_t*)&eboot_magic, sizeof(eboot_magic));
-    return false;
-  }
-
-  return true;
-}
-
-void SettingsBufferFree(void)
-{
-  if (settings_buffer != nullptr) {
-    free(settings_buffer);
-    settings_buffer = nullptr;
-  }
-}
-
-bool SettingsBufferAlloc(void)
-{
-  SettingsBufferFree();
-  if (!(settings_buffer = (uint8_t *)malloc(sizeof(Settings)))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_UPLOAD_ERR_2));
-    return false;
-  }
-  return true;
-}
-
-uint16_t GetCfgCrc16(uint8_t *bytes, uint32_t size)
-{
-  uint16_t crc = 0;
-
-  for (uint32_t i = 0; i < size; i++) {
-    if ((i < 14) || (i > 15)) { crc += bytes[i]*(i+1); }
-  }
-  return crc;
-}
-
-uint16_t GetSettingsCrc(void)
-{
-
-  uint32_t size = ((Settings.version < 0x06060007) || (Settings.version > 0x0606000A)) ? 3584 : sizeof(SYSCFG);
-  return GetCfgCrc16((uint8_t*)&Settings, size);
-}
-
-uint32_t GetCfgCrc32(uint8_t *bytes, uint32_t size)
-{
-
-  uint32_t crc = 0;
-
-  while (size--) {
-    crc ^= *bytes++;
-    for (uint32_t j = 0; j < 8; j++) {
-      crc = (crc >> 1) ^ (-int(crc & 1) & 0xEDB88320);
-    }
-  }
-  return ~crc;
-}
-
-uint32_t GetSettingsCrc32(void)
-{
-  return GetCfgCrc32((uint8_t*)&Settings, sizeof(SYSCFG) -4);
-}
-
-void SettingsSaveAll(void)
-{
-  if (Settings.flag.save_state) {
-    Settings.power = power;
-  } else {
-    Settings.power = 0;
-  }
-  XsnsCall(FUNC_SAVE_BEFORE_RESTART);
-  XdrvCall(FUNC_SAVE_BEFORE_RESTART);
-  SettingsSave(0);
-}
-
-
-
-
-
-void UpdateQuickPowerCycle(bool update)
-{
-  if (Settings.flag3.fast_power_cycle_disable) { return; }
-
-  uint32_t pc_register;
-  uint32_t pc_location = SETTINGS_LOCATION - CFG_ROTATES;
-
-  ESP.flashRead(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-  if (update && ((pc_register & 0xFFFFFFF0) == 0xFFA55AB0)) {
-    uint32_t counter = ((pc_register & 0xF) << 1) & 0xF;
-    if (0 == counter) {
-      SettingsErase(3);
-      EspRestart();
-    } else {
-      pc_register = 0xFFA55AB0 | counter;
-      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Flag %02X"), counter);
-    }
-  }
-  else if (pc_register != 0xFFA55ABF) {
-    pc_register = 0xFFA55ABF;
-
-    if (ESP.flashEraseSector(pc_location)) {
-      ESP.flashWrite(pc_location * SPI_FLASH_SEC_SIZE, (uint32*)&pc_register, sizeof(pc_register));
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("QPC: Reset"));
-  }
-}
-
-
-
-
-
-uint32_t GetSettingsTextLen(void)
-{
-  char* position = Settings.text_pool;
-  for (uint32_t size = 0; size < SET_MAX; size++) {
-    while (*position++ != '\0') { }
-  }
-  return position - Settings.text_pool;
-}
-
-bool SettingsUpdateText(uint32_t index, const char* replace_me)
-{
-  if (index >= SET_MAX) {
-    return false;
-  }
-
-
-  uint32_t replace_len = strlen(replace_me);
-  char replace[replace_len +1];
-  memcpy(replace, replace_me, sizeof(replace));
-
-  uint32_t start_pos = 0;
-  uint32_t end_pos = 0;
-  char* position = Settings.text_pool;
-  for (uint32_t size = 0; size < SET_MAX; size++) {
-    while (*position++ != '\0') { }
-    if (1 == index) {
-      start_pos = position - Settings.text_pool;
-    }
-    else if (0 == index) {
-      end_pos = position - Settings.text_pool -1;
-    }
-    index--;
-  }
-  uint32_t char_len = position - Settings.text_pool;
-
-  uint32_t current_len = end_pos - start_pos;
-  int diff = replace_len - current_len;
-
-
-
-
-  int too_long = (char_len + diff) - settings_text_size;
-  if (too_long > 0) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_CONFIG "Text overflow by %d char(s)"), too_long);
-    return false;
-  }
-
-  if (diff != 0) {
-
-    memmove_P(Settings.text_pool + start_pos + replace_len, Settings.text_pool + end_pos, char_len - end_pos);
-  }
-
-  memmove_P(Settings.text_pool + start_pos, replace, replace_len);
-
-  memset(Settings.text_pool + char_len + diff, 0x00, settings_text_size - char_len - diff);
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG "CR %d/%d"), GetSettingsTextLen(), settings_text_size);
-
-  return true;
-}
-
-char* SettingsText(uint32_t index)
-{
-  char* position = Settings.text_pool;
-
-  if (index >= SET_MAX) {
-    position += settings_text_size -1;
-  } else {
-    for (;index > 0; index--) {
-      while (*position++ != '\0') { }
-    }
-  }
-  return position;
-}
-
-
-
-
-
-uint32_t GetSettingsAddress(void)
-{
-  return settings_location * SPI_FLASH_SEC_SIZE;
-}
-
-void SettingsSave(uint8_t rotate)
-{
-# 607 "S:/Development/Tasmota/tasmota/settings.ino"
-#ifndef FIRMWARE_MINIMAL
-  if ((GetSettingsCrc32() != settings_crc32) || rotate) {
-    if (1 == rotate) {
-      stop_flash_rotate = 1;
-    }
-    if (2 == rotate) {
-      settings_location = SETTINGS_LOCATION +1;
-    }
-    if (stop_flash_rotate) {
-      settings_location = SETTINGS_LOCATION;
-    } else {
-      settings_location--;
-      if (settings_location <= (SETTINGS_LOCATION - CFG_ROTATES)) {
-        settings_location = SETTINGS_LOCATION;
-      }
-    }
-
-    Settings.save_flag++;
-    if (UtcTime() > START_VALID_TIME) {
-      Settings.cfg_timestamp = UtcTime();
-    } else {
-      Settings.cfg_timestamp++;
-    }
-    Settings.cfg_size = sizeof(SYSCFG);
-    Settings.cfg_crc = GetSettingsCrc();
-    Settings.cfg_crc32 = GetSettingsCrc32();
-
-    if (ESP.flashEraseSector(settings_location)) {
-      ESP.flashWrite(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-    }
-
-    if (!stop_flash_rotate && rotate) {
-      for (uint32_t i = 1; i < CFG_ROTATES; i++) {
-        ESP.flashEraseSector(settings_location -i);
-        delay(1);
-      }
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_CONFIG D_SAVED_TO_FLASH_AT " %X, " D_COUNT " %d, " D_BYTES " %d"), settings_location, Settings.save_flag, sizeof(SYSCFG));
-
-    settings_crc32 = Settings.cfg_crc32;
-  }
-#endif
-  RtcSettingsSave();
-}
-
-void SettingsLoad(void)
-{
-
-  struct SYSCFGH {
-    uint16_t cfg_holder;
-    uint16_t cfg_size;
-    unsigned long save_flag;
-  } _SettingsH;
-  unsigned long save_flag = 0;
-
-  settings_location = 0;
-  uint32_t flash_location = SETTINGS_LOCATION +1;
-  uint16_t cfg_holder = 0;
-  for (uint32_t i = 0; i < CFG_ROTATES; i++) {
-    flash_location--;
-    ESP.flashRead(flash_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-
-    bool valid = false;
-    if (Settings.version > 0x06000000) {
-      bool almost_valid = (Settings.cfg_crc32 == GetSettingsCrc32());
-      if (Settings.version < 0x0606000B) {
-        almost_valid = (Settings.cfg_crc == GetSettingsCrc());
-      }
-
-      if (almost_valid && (0 == cfg_holder)) { cfg_holder = Settings.cfg_holder; }
-      valid = (cfg_holder == Settings.cfg_holder);
-    } else {
-      ESP.flashRead((flash_location -1) * SPI_FLASH_SEC_SIZE, (uint32*)&_SettingsH, sizeof(SYSCFGH));
-      valid = (Settings.cfg_holder == _SettingsH.cfg_holder);
-    }
-    if (valid) {
-      if (Settings.save_flag > save_flag) {
-        save_flag = Settings.save_flag;
-        settings_location = flash_location;
-        if (Settings.flag.stop_flash_rotate && (0 == i)) {
-          break;
-        }
-      }
-    }
-
-    delay(1);
-  }
-  if (settings_location > 0) {
-    ESP.flashRead(settings_location * SPI_FLASH_SEC_SIZE, (uint32*)&Settings, sizeof(SYSCFG));
-    AddLog_P2(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_LOADED_FROM_FLASH_AT " %X, " D_COUNT " %lu"), settings_location, Settings.save_flag);
-  }
-
-#ifndef FIRMWARE_MINIMAL
-  if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) {
-    SettingsDefault();
-  }
-  settings_crc32 = GetSettingsCrc32();
-#endif
-
-  RtcSettingsLoad();
-}
-
-void EspErase(uint32_t start_sector, uint32_t end_sector)
-{
-  bool serial_output = (LOG_LEVEL_DEBUG_MORE <= seriallog_level);
-  for (uint32_t sector = start_sector; sector < end_sector; sector++) {
-
-    bool result = ESP.flashEraseSector(sector);
-
-
-
-    if (serial_output) {
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-      Serial.printf(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n", sector, (result) ? D_OK : D_ERROR);
-#else
-      Serial.printf_P(PSTR(D_LOG_APPLICATION D_ERASED_SECTOR " %d %s\n"), sector, (result) ? D_OK : D_ERROR);
-#endif
-      delay(10);
-    } else {
-      yield();
-    }
-    OsWatchLoop();
-  }
-}
-
-void SettingsErase(uint8_t type)
-{
-# 750 "S:/Development/Tasmota/tasmota/settings.ino"
-#ifndef FIRMWARE_MINIMAL
-  uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
-  uint32_t _sectorEnd = ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE;
-  if (1 == type) {
-
-    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;
-  }
-  else if (2 == type) {
-    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
-    _sectorEnd = SETTINGS_LOCATION +1;
-  }
-  else if (3 == type) {
-    _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;
-    _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;
-  }
-#ifdef USE_WIFI_SDK_ERASE
-  else if (4 == type) {
-    _sectorStart = SETTINGS_LOCATION +1;
-    _sectorEnd = _sectorStart +1;
-  }
-  else if (5 == type) {
-    _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;
-    _sectorEnd = _sectorStart +1;
-  }
-#endif
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
-
-
-  EsptoolErase(_sectorStart, _sectorEnd);
-#endif
-}
-
-void SettingsSdkErase(void)
-{
-  WiFi.disconnect(false);
-  SettingsErase(1);
-  delay(1000);
-}
-
-#ifdef USE_WIFI_SDK_ERASE
-void SettingsSdkWifiErase(void)
-{
-  WiFi.disconnect(false);
-  SettingsErase(4);
-  SettingsErase(5);
-  delay(200);
-}
-#endif
-
-
-
-void SettingsDefault(void)
-{
-  AddLog_P(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG D_USE_DEFAULTS));
-  SettingsDefaultSet1();
-  SettingsDefaultSet2();
-  SettingsSave(2);
-}
-
-void SettingsDefaultSet1(void)
-{
-  memset(&Settings, 0x00, sizeof(SYSCFG));
-
-  Settings.cfg_holder = (uint16_t)CFG_HOLDER;
-  Settings.cfg_size = sizeof(SYSCFG);
-
-  Settings.version = VERSION;
-
-
-}
-
-void SettingsDefaultSet2(void)
-{
-  memset((char*)&Settings +16, 0x00, sizeof(SYSCFG) -16);
-
-  Settings.flag.stop_flash_rotate = APP_FLASH_CYCLE;
-  Settings.flag.global_state = APP_ENABLE_LEDLINK;
-  Settings.flag3.sleep_normal = APP_NORMAL_SLEEP;
-  Settings.flag3.no_power_feedback = APP_NO_RELAY_SCAN;
-  Settings.flag3.fast_power_cycle_disable = APP_DISABLE_POWERCYCLE;
-  Settings.flag3.bootcount_update = DEEPSLEEP_BOOTCOUNT;
-  Settings.flag3.compatibility_check = OTA_COMPATIBILITY;
-  Settings.save_data = SAVE_DATA;
-  Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
-  Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
-  Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
-  Settings.sleep = APP_SLEEP;
-  if (Settings.sleep < 50) {
-    Settings.sleep = 50;
-  }
-
-
-
-  Settings.interlock[0] = 0xFF;
-  Settings.module = MODULE;
-  ModuleDefault(WEMOS);
-
-  SettingsUpdateText(SET_FRIENDLYNAME1, FRIENDLY_NAME);
-  SettingsUpdateText(SET_FRIENDLYNAME2, FRIENDLY_NAME"2");
-  SettingsUpdateText(SET_FRIENDLYNAME3, FRIENDLY_NAME"3");
-  SettingsUpdateText(SET_FRIENDLYNAME4, FRIENDLY_NAME"4");
-  SettingsUpdateText(SET_OTAURL, OTA_URL);
-
-
-  Settings.flag.save_state = SAVE_STATE;
-  Settings.power = APP_POWER;
-  Settings.poweronstate = APP_POWERON_STATE;
-  Settings.blinktime = APP_BLINKTIME;
-  Settings.blinkcount = APP_BLINKCOUNT;
-  Settings.ledstate = APP_LEDSTATE;
-  Settings.ledmask = APP_LEDMASK;
-  Settings.pulse_timer[0] = APP_PULSETIME;
-
-
-
-  Settings.serial_config = TS_SERIAL_8N1;
-  Settings.baudrate = APP_BAUDRATE / 300;
-  Settings.sbaudrate = SOFT_BAUDRATE / 300;
-  Settings.serial_delimiter = 0xff;
-  Settings.seriallog_level = SERIAL_LOG_LEVEL;
-
-
-  Settings.flag3.use_wifi_scan = WIFI_SCAN_AT_RESTART;
-  Settings.flag3.use_wifi_rescan = WIFI_SCAN_REGULARLY;
-  Settings.wifi_output_power = 170;
-  ParseIp(&Settings.ip_address[0], WIFI_IP_ADDRESS);
-  ParseIp(&Settings.ip_address[1], WIFI_GATEWAY);
-  ParseIp(&Settings.ip_address[2], WIFI_SUBNETMASK);
-  ParseIp(&Settings.ip_address[3], WIFI_DNS);
-  Settings.sta_config = WIFI_CONFIG_TOOL;
-
-  SettingsUpdateText(SET_STASSID1, STA_SSID1);
-  SettingsUpdateText(SET_STASSID2, STA_SSID2);
-  SettingsUpdateText(SET_STAPWD1, STA_PASS1);
-  SettingsUpdateText(SET_STAPWD2, STA_PASS2);
-  SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-
-
-  SettingsUpdateText(SET_SYSLOG_HOST, SYS_LOG_HOST);
-  Settings.syslog_port = SYS_LOG_PORT;
-  Settings.syslog_level = SYS_LOG_LEVEL;
-
-
-  Settings.flag2.emulation = EMULATION;
-  Settings.flag3.gui_hostname_ip = GUI_SHOW_HOSTNAME;
-  Settings.flag3.mdns_enabled = MDNS_ENABLED;
-  Settings.webserver = WEB_SERVER;
-  Settings.weblog_level = WEB_LOG_LEVEL;
-  SettingsUpdateText(SET_WEBPWD, WEB_PASSWORD);
-  SettingsUpdateText(SET_CORS, CORS_DOMAIN);
-
-
-  Settings.flag.button_restrict = KEY_DISABLE_MULTIPRESS;
-  Settings.flag.button_swap = KEY_SWAP_DOUBLE_PRESS;
-  Settings.flag.button_single = KEY_ONLY_SINGLE_PRESS;
-  Settings.param[P_HOLD_TIME] = KEY_HOLD_TIME;
-
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) { Settings.switchmode[i] = SWITCH_MODE; }
-
-
-  Settings.flag.mqtt_enabled = MQTT_USE;
-  Settings.flag.mqtt_response = MQTT_RESULT_COMMAND;
-  Settings.flag.mqtt_offline = MQTT_LWT_MESSAGE;
-  Settings.flag.mqtt_power_retain = MQTT_POWER_RETAIN;
-  Settings.flag.mqtt_button_retain = MQTT_BUTTON_RETAIN;
-  Settings.flag.mqtt_switch_retain = MQTT_SWITCH_RETAIN;
-  Settings.flag.mqtt_sensor_retain = MQTT_SENSOR_RETAIN;
-
-  Settings.flag.device_index_enable = MQTT_POWER_FORMAT;
-  Settings.flag3.time_append_timezone = MQTT_APPEND_TIMEZONE;
-  Settings.flag3.button_switch_force_local = MQTT_BUTTON_SWITCH_FORCE_LOCAL;
-  Settings.flag3.no_hold_retain = MQTT_NO_HOLD_RETAIN;
-  Settings.flag3.use_underscore = MQTT_INDEX_SEPARATOR;
-  Settings.flag3.grouptopic_mode = MQTT_GROUPTOPIC_FORMAT;
-  SettingsUpdateText(SET_MQTT_HOST, MQTT_HOST);
-  Settings.mqtt_port = MQTT_PORT;
-  SettingsUpdateText(SET_MQTT_CLIENT, MQTT_CLIENT_ID);
-  SettingsUpdateText(SET_MQTT_USER, MQTT_USER);
-  SettingsUpdateText(SET_MQTT_PWD, MQTT_PASS);
-  SettingsUpdateText(SET_MQTT_TOPIC, MQTT_TOPIC);
-  SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC);
-  SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC);
-  SettingsUpdateText(SET_MQTT_GRP_TOPIC, MQTT_GRPTOPIC);
-  SettingsUpdateText(SET_MQTT_FULLTOPIC, MQTT_FULLTOPIC);
-  Settings.mqtt_retry = MQTT_RETRY_SECS;
-  SettingsUpdateText(SET_MQTTPREFIX1, SUB_PREFIX);
-  SettingsUpdateText(SET_MQTTPREFIX2, PUB_PREFIX);
-  SettingsUpdateText(SET_MQTTPREFIX3, PUB_PREFIX2);
-  SettingsUpdateText(SET_STATE_TXT1, MQTT_STATUS_OFF);
-  SettingsUpdateText(SET_STATE_TXT2, MQTT_STATUS_ON);
-  SettingsUpdateText(SET_STATE_TXT3, MQTT_CMND_TOGGLE);
-  SettingsUpdateText(SET_STATE_TXT4, MQTT_CMND_HOLD);
-  char fingerprint[60];
-  strlcpy(fingerprint, MQTT_FINGERPRINT1, sizeof(fingerprint));
-  char *p = fingerprint;
-  for (uint32_t i = 0; i < 20; i++) {
-    Settings.mqtt_fingerprint[0][i] = strtol(p, &p, 16);
-  }
-  strlcpy(fingerprint, MQTT_FINGERPRINT2, sizeof(fingerprint));
-  p = fingerprint;
-  for (uint32_t i = 0; i < 20; i++) {
-    Settings.mqtt_fingerprint[1][i] = strtol(p, &p, 16);
-  }
-  Settings.tele_period = TELE_PERIOD;
-  Settings.mqttlog_level = MQTT_LOG_LEVEL;
-
-
-  Settings.flag.no_power_on_check = ENERGY_VOLTAGE_ALWAYS;
-  Settings.flag2.current_resolution = 3;
-
-
-  Settings.flag2.energy_resolution = ENERGY_RESOLUTION;
-  Settings.flag3.dds2382_model = ENERGY_DDS2382_MODE;
-  Settings.flag3.hardware_energy_total = ENERGY_HARDWARE_TOTALS;
-  Settings.param[P_MAX_POWER_RETRY] = MAX_POWER_RETRY;
-
-  Settings.energy_power_calibration = HLW_PREF_PULSE;
-  Settings.energy_voltage_calibration = HLW_UREF_PULSE;
-  Settings.energy_current_calibration = HLW_IREF_PULSE;
-# 980 "S:/Development/Tasmota/tasmota/settings.ino"
-  Settings.energy_max_power_limit_hold = MAX_POWER_HOLD;
-  Settings.energy_max_power_limit_window = MAX_POWER_WINDOW;
-
-  Settings.energy_max_power_safe_limit_hold = SAFE_POWER_HOLD;
-  Settings.energy_max_power_safe_limit_window = SAFE_POWER_WINDOW;
-
-
-
-  RtcSettings.energy_kWhtotal = 0;
-
-  memset((char*)&RtcSettings.energy_usage, 0x00, sizeof(RtcSettings.energy_usage));
-  Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
-
-
-  Settings.flag.ir_receive_decimal = IR_DATA_RADIX;
-  Settings.flag3.receive_raw = IR_ADD_RAW_DATA;
-  Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
-
-
-  Settings.flag.rf_receive_decimal = RF_DATA_RADIX;
-
-  memcpy_P(Settings.rf_code[0], kDefaultRfCode, 9);
-
-
-  Settings.domoticz_update_timer = DOMOTICZ_UPDATE_TIMER;
-# 1015 "S:/Development/Tasmota/tasmota/settings.ino"
-  Settings.flag.temperature_conversion = TEMP_CONVERSION;
-  Settings.flag.pressure_conversion = PRESSURE_CONVERSION;
-  Settings.flag2.pressure_resolution = PRESSURE_RESOLUTION;
-  Settings.flag2.humidity_resolution = HUMIDITY_RESOLUTION;
-  Settings.flag2.temperature_resolution = TEMP_RESOLUTION;
-  Settings.flag3.ds18x20_internal_pullup = DS18X20_PULL_UP;
-  Settings.flag3.counter_reset_on_tele = COUNTER_RESET;
-
-
-
-
-
-
-  Settings.flag2.calc_resolution = CALC_RESOLUTION;
-
-
-  Settings.flag3.timers_enable = TIMERS_ENABLED;
-
-
-  Settings.flag.hass_light = HASS_AS_LIGHT;
-  Settings.flag.hass_discovery = HOME_ASSISTANT_DISCOVERY_ENABLE;
-  Settings.flag3.hass_tele_on_power = TELE_ON_POWER;
-
-
-  Settings.flag.knx_enabled = KNX_ENABLED;
-  Settings.flag.knx_enable_enhancement = KNX_ENHANCED;
-
-
-  Settings.flag.pwm_control = LIGHT_MODE;
-  Settings.flag.ws_clock_reverse = LIGHT_CLOCK_DIRECTION;
-  Settings.flag.light_signal = LIGHT_PAIRS_CO2;
-  Settings.flag.not_power_linked = LIGHT_POWER_CONTROL;
-  Settings.flag.decimal_text = LIGHT_COLOR_RADIX;
-  Settings.flag3.pwm_multi_channels = LIGHT_CHANNEL_MODE;
-  Settings.flag3.slider_dimmer_stay_on = LIGHT_SLIDER_POWER;
-  Settings.flag4.alexa_ct_range = LIGHT_ALEXA_CT_RANGE;
-
-  Settings.pwm_frequency = PWM_FREQ;
-  Settings.pwm_range = PWM_RANGE;
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    Settings.light_color[i] = DEFAULT_LIGHT_COMPONENT;
-
-  }
-  Settings.light_correction = 1;
-  Settings.light_dimmer = DEFAULT_LIGHT_DIMMER;
-
-  Settings.light_speed = 1;
-
-  Settings.light_width = 1;
-
-  Settings.light_pixels = WS2812_LEDS;
-
-  Settings.ws_width[WS_SECOND] = 1;
-  Settings.ws_color[WS_SECOND][WS_RED] = 255;
-
-  Settings.ws_color[WS_SECOND][WS_BLUE] = 255;
-  Settings.ws_width[WS_MINUTE] = 3;
-
-  Settings.ws_color[WS_MINUTE][WS_GREEN] = 255;
-
-  Settings.ws_width[WS_HOUR] = 5;
-  Settings.ws_color[WS_HOUR][WS_RED] = 255;
-
-
-
-  Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
-  Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
-
-
-
-  Settings.display_mode = 1;
-  Settings.display_refresh = 2;
-  Settings.display_rows = 2;
-  Settings.display_cols[0] = 16;
-  Settings.display_cols[1] = 8;
-  Settings.display_dimmer = 1;
-  Settings.display_size = 1;
-  Settings.display_font = 1;
-
-  Settings.display_address[0] = MTX_ADDRESS1;
-  Settings.display_address[1] = MTX_ADDRESS2;
-  Settings.display_address[2] = MTX_ADDRESS3;
-  Settings.display_address[3] = MTX_ADDRESS4;
-  Settings.display_address[4] = MTX_ADDRESS5;
-  Settings.display_address[5] = MTX_ADDRESS6;
-  Settings.display_address[6] = MTX_ADDRESS7;
-  Settings.display_address[7] = MTX_ADDRESS8;
-
-
-  if (((APP_TIMEZONE > -14) && (APP_TIMEZONE < 15)) || (99 == APP_TIMEZONE)) {
-    Settings.timezone = APP_TIMEZONE;
-    Settings.timezone_minutes = 0;
-  } else {
-    Settings.timezone = APP_TIMEZONE / 60;
-    Settings.timezone_minutes = abs(APP_TIMEZONE % 60);
-  }
-  SettingsUpdateText(SET_NTPSERVER1, NTP_SERVER1);
-  SettingsUpdateText(SET_NTPSERVER2, NTP_SERVER2);
-  SettingsUpdateText(SET_NTPSERVER3, NTP_SERVER3);
-  for (uint32_t i = 0; i < MAX_NTP_SERVERS; i++) {
-    SettingsUpdateText(SET_NTPSERVER1 +i, ReplaceCommaWithDot(SettingsText(SET_NTPSERVER1 +i)));
-  }
-  Settings.latitude = (int)((double)LATITUDE * 1000000);
-  Settings.longitude = (int)((double)LONGITUDE * 1000000);
-  SettingsResetStd();
-  SettingsResetDst();
-
-  Settings.button_debounce = KEY_DEBOUNCE_TIME;
-  Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
-
-  for (uint32_t j = 0; j < 5; j++) {
-    Settings.rgbwwTable[j] = 255;
-  }
-
-  Settings.novasds_startingoffset = STARTING_OFFSET;
-
-  SettingsDefaultWebColor();
-
-  memset(&Settings.monitors, 0xFF, 20);
-  SettingsEnableAllI2cDrivers();
-
-
-  Settings.flag3.tuya_apply_o20 = TUYA_SETOPTION_20;
-  Settings.flag3.tuya_serial_mqtt_publish = MQTT_TUYA_RECEIVED;
-
-  Settings.flag3.buzzer_enable = BUZZER_ENABLE;
-  Settings.flag3.shutter_mode = SHUTTER_SUPPORT;
-  Settings.flag3.pcf8574_ports_inverted = PCF8574_INVERT_PORTS;
-  Settings.flag4.zigbee_use_names = ZIGBEE_FRIENDLY_NAMES;
-}
-
-
-
-void SettingsResetStd(void)
-{
-  Settings.tflag[0].hemis = TIME_STD_HEMISPHERE;
-  Settings.tflag[0].week = TIME_STD_WEEK;
-  Settings.tflag[0].dow = TIME_STD_DAY;
-  Settings.tflag[0].month = TIME_STD_MONTH;
-  Settings.tflag[0].hour = TIME_STD_HOUR;
-  Settings.toffset[0] = TIME_STD_OFFSET;
-}
-
-void SettingsResetDst(void)
-{
-  Settings.tflag[1].hemis = TIME_DST_HEMISPHERE;
-  Settings.tflag[1].week = TIME_DST_WEEK;
-  Settings.tflag[1].dow = TIME_DST_DAY;
-  Settings.tflag[1].month = TIME_DST_MONTH;
-  Settings.tflag[1].hour = TIME_DST_HOUR;
-  Settings.toffset[1] = TIME_DST_OFFSET;
-}
-
-void SettingsDefaultWebColor(void)
-{
-  char scolor[10];
-  for (uint32_t i = 0; i < COL_LAST; i++) {
-    WebHexCode(i, GetTextIndexed(scolor, sizeof(scolor), i, kWebColors));
-  }
-}
-
-void SettingsEnableAllI2cDrivers(void)
-{
-  Settings.i2c_drivers[0] = 0xFFFFFFFF;
-  Settings.i2c_drivers[1] = 0xFFFFFFFF;
-  Settings.i2c_drivers[2] = 0xFFFFFFFF;
-}
-
-
-
-void SettingsDelta(void)
-{
-  if (Settings.version != VERSION) {
-    if (Settings.version < 0x06000000) {
-      Settings.cfg_size = sizeof(SYSCFG);
-      Settings.cfg_crc = GetSettingsCrc();
-    }
-    if (Settings.version < 0x06000002) {
-      for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-        if (i < 4) {
-          Settings.switchmode[i] = Settings.interlock[i];
-        } else {
-          Settings.switchmode[i] = SWITCH_MODE;
-        }
-      }
-      for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-        if (Settings.my_gp.io[i] >= GPIO_SWT5) {
-          Settings.my_gp.io[i] += 4;
-        }
-      }
-    }
-    if (Settings.version < 0x06000003) {
-      Settings.flag.mqtt_serial_raw = 0;
-      Settings.flag.pressure_conversion = 0;
-      Settings.flag3.data = 0;
-    }
-    if (Settings.version < 0x06010103) {
-      Settings.flag3.timers_enable = 1;
-    }
-    if (Settings.version < 0x0601010C) {
-      Settings.button_debounce = KEY_DEBOUNCE_TIME;
-      Settings.switch_debounce = SWITCH_DEBOUNCE_TIME;
-    }
-    if (Settings.version < 0x0602010A) {
-      for (uint32_t j = 0; j < 5; j++) {
-        Settings.rgbwwTable[j] = 255;
-      }
-    }
-    if (Settings.version < 0x06030002) {
-      Settings.timezone_minutes = 0;
-    }
-    if (Settings.version < 0x06030004) {
-      memset(&Settings.monitors, 0xFF, 20);
-    }
-    if (Settings.version < 0x0603000E) {
-      Settings.flag2.calc_resolution = CALC_RESOLUTION;
-    }
-    if (Settings.version < 0x0603000F) {
-      if (Settings.sleep < 50) {
-        Settings.sleep = 50;
-      }
-    }
-    if (Settings.version < 0x06040105) {
-      Settings.flag3.mdns_enabled = MDNS_ENABLED;
-      Settings.param[P_MDNS_DELAYED_START] = 0;
-    }
-    if (Settings.version < 0x0604010B) {
-      Settings.interlock[0] = 0xFF;
-      for (uint32_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
-    }
-    if (Settings.version < 0x0604010D) {
-      Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
-    }
-    if (Settings.version < 0x06040110) {
-      ModuleDefault(WEMOS);
-    }
-    if (Settings.version < 0x06040113) {
-      Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
-    }
-    if (Settings.version < 0x06050003) {
-      Settings.novasds_startingoffset = STARTING_OFFSET;
-    }
-    if (Settings.version < 0x06050006) {
-      SettingsDefaultWebColor();
-    }
-    if (Settings.version < 0x06050007) {
-      Settings.ledmask = APP_LEDMASK;
-    }
-    if (Settings.version < 0x0605000A) {
-      Settings.my_adc0 = ADC0_NONE;
-    }
-    if (Settings.version < 0x0605000D) {
-      Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE;
-    }
-    if (Settings.version < 0x06060001) {
-      Settings.param[P_OVER_TEMP] = ENERGY_OVERTEMP;
-    }
-    if (Settings.version < 0x06060007) {
-      memset((char*)&Settings +0xE00, 0x00, sizeof(SYSCFG) -0xE00);
-    }
-    if (Settings.version < 0x06060008) {
-
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        Settings.param[P_ex_DIMMER_MAX] = 100;
-      } else {
-        Settings.param[P_ex_DIMMER_MAX] = 255;
-      }
-    }
-    if (Settings.version < 0x06060009) {
-      Settings.baudrate = APP_BAUDRATE / 300;
-      Settings.sbaudrate = SOFT_BAUDRATE / 300;
-    }
-    if (Settings.version < 0x0606000A) {
-      uint8_t tuyaindex = 0;
-      if (Settings.param[P_BACKLOG_DELAY] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 21;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_BACKLOG_DELAY];
-        tuyaindex++;
-      } else if (Settings.flag3.fast_power_cycle_disable == 1) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 11;
-        Settings.tuya_fnid_map[tuyaindex].dpid = 1;
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_RELAYS] > 0) {
-        for (uint8_t i = 0 ; i < Settings.param[P_ex_TUYA_RELAYS]; i++) {
-          Settings.tuya_fnid_map[tuyaindex].fnid = 12 + i;
-          Settings.tuya_fnid_map[tuyaindex].dpid = i + 2;
-          tuyaindex++;
-        }
-      }
-      if (Settings.param[P_ex_TUYA_POWER_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 31;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_POWER_ID];
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_VOLTAGE_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 33;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_VOLTAGE_ID];
-        tuyaindex++;
-      }
-      if (Settings.param[P_ex_TUYA_CURRENT_ID] > 0) {
-        Settings.tuya_fnid_map[tuyaindex].fnid = 32;
-        Settings.tuya_fnid_map[tuyaindex].dpid = Settings.param[P_ex_TUYA_CURRENT_ID];
-      }
-    }
-    if (Settings.version < 0x0606000C) {
-      memset((char*)&Settings +0x1D6, 0x00, 16);
-    }
-    if (Settings.version < 0x0606000F) {
-      Settings.ex_shutter_accuracy = 0;
-      Settings.ex_mqttlog_level = MQTT_LOG_LEVEL;
-    }
-    if (Settings.version < 0x06060011) {
-      Settings.param[P_BACKLOG_DELAY] = MIN_BACKLOG_DELAY;
-    }
-    if (Settings.version < 0x06060012) {
-      Settings.dimmer_hw_min = DEFAULT_DIMMER_MIN;
-      Settings.dimmer_hw_max = DEFAULT_DIMMER_MAX;
-      if (TUYA_DIMMER == Settings.module) {
-        if (Settings.flag3.ex_tuya_dimmer_min_limit) {
-          Settings.dimmer_hw_min = 25;
-        } else {
-          Settings.dimmer_hw_min = 1;
-        }
-        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
-      }
-      else if (PS_16_DZ == Settings.module) {
-        Settings.dimmer_hw_min = 10;
-        Settings.dimmer_hw_max = Settings.param[P_ex_DIMMER_MAX];
-      }
-    }
-    if (Settings.version < 0x06060014) {
-# 1359 "S:/Development/Tasmota/tasmota/settings.ino"
-      Settings.flag3.fast_power_cycle_disable = 0;
-      Settings.energy_power_delta = Settings.ex_energy_power_delta;
-      Settings.ex_energy_power_delta = 0;
-    }
-    if (Settings.version < 0x06060015) {
-      if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
-        Settings.ex_sta_config = WIFI_MANAGER;
-      }
-    }
-
-    if (Settings.version < 0x07000002) {
-      Settings.web_color2[0][0] = Settings.web_color[0][0];
-      Settings.web_color2[0][1] = Settings.web_color[0][1];
-      Settings.web_color2[0][2] = Settings.web_color[0][2];
-    }
-    if (Settings.version < 0x07000003) {
-      SettingsEnableAllI2cDrivers();
-    }
-    if (Settings.version < 0x07000004) {
-      Settings.ex_wifi_output_power = 170;
-    }
-    if (Settings.version < 0x07010202) {
-      Settings.ex_serial_config = TS_SERIAL_8N1;
-    }
-    if (Settings.version < 0x07010204) {
-      if (Settings.flag3.ex_cors_enabled == 1) {
-        strlcpy(Settings.ex_cors_domain, CORS_ENABLED_ALL, sizeof(Settings.ex_cors_domain));
-      } else {
-        Settings.ex_cors_domain[0] = 0;
-      }
-    }
-    if (Settings.version < 0x07010205) {
-      Settings.seriallog_level = Settings.ex_seriallog_level;
-      Settings.sta_config = Settings.ex_sta_config;
-      Settings.sta_active = Settings.ex_sta_active;
-      memcpy((char*)&Settings.rule_stop, (char*)&Settings.ex_rule_stop, 47);
-    }
-    if (Settings.version < 0x07010206) {
-      Settings.flag4 = Settings.ex_flag4;
-      Settings.mqtt_port = Settings.ex_mqtt_port;
-      memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);
-    }
-
-    if (Settings.version < 0x08000000) {
-      char temp[strlen(Settings.text_pool) +1]; strncpy(temp, Settings.text_pool, sizeof(temp));
-      char temp21[strlen(Settings.ex_mqtt_prefix[0]) +1]; strncpy(temp21, Settings.ex_mqtt_prefix[0], sizeof(temp21));
-      char temp22[strlen(Settings.ex_mqtt_prefix[1]) +1]; strncpy(temp22, Settings.ex_mqtt_prefix[1], sizeof(temp22));
-      char temp23[strlen(Settings.ex_mqtt_prefix[2]) +1]; strncpy(temp23, Settings.ex_mqtt_prefix[2], sizeof(temp23));
-      char temp31[strlen(Settings.ex_sta_ssid[0]) +1]; strncpy(temp31, Settings.ex_sta_ssid[0], sizeof(temp31));
-      char temp32[strlen(Settings.ex_sta_ssid[1]) +1]; strncpy(temp32, Settings.ex_sta_ssid[1], sizeof(temp32));
-      char temp41[strlen(Settings.ex_sta_pwd[0]) +1]; strncpy(temp41, Settings.ex_sta_pwd[0], sizeof(temp41));
-      char temp42[strlen(Settings.ex_sta_pwd[1]) +1]; strncpy(temp42, Settings.ex_sta_pwd[1], sizeof(temp42));
-      char temp5[strlen(Settings.ex_hostname) +1]; strncpy(temp5, Settings.ex_hostname, sizeof(temp5));
-      char temp6[strlen(Settings.ex_syslog_host) +1]; strncpy(temp6, Settings.ex_syslog_host, sizeof(temp6));
-      char temp7[strlen(Settings.ex_mqtt_host) +1]; strncpy(temp7, Settings.ex_mqtt_host, sizeof(temp7));
-      char temp8[strlen(Settings.ex_mqtt_client) +1]; strncpy(temp8, Settings.ex_mqtt_client, sizeof(temp8));
-      char temp9[strlen(Settings.ex_mqtt_user) +1]; strncpy(temp9, Settings.ex_mqtt_user, sizeof(temp9));
-      char temp10[strlen(Settings.ex_mqtt_pwd) +1]; strncpy(temp10, Settings.ex_mqtt_pwd, sizeof(temp10));
-      char temp11[strlen(Settings.ex_mqtt_topic) +1]; strncpy(temp11, Settings.ex_mqtt_topic, sizeof(temp11));
-      char temp12[strlen(Settings.ex_button_topic) +1]; strncpy(temp12, Settings.ex_button_topic, sizeof(temp12));
-      char temp13[strlen(Settings.ex_mqtt_grptopic) +1]; strncpy(temp13, Settings.ex_mqtt_grptopic, sizeof(temp13));
-
-      memset(Settings.text_pool, 0x00, settings_text_size);
-      SettingsUpdateText(SET_OTAURL, temp);
-      SettingsUpdateText(SET_MQTTPREFIX1, temp21);
-      SettingsUpdateText(SET_MQTTPREFIX2, temp22);
-      SettingsUpdateText(SET_MQTTPREFIX3, temp23);
-      SettingsUpdateText(SET_STASSID1, temp31);
-      SettingsUpdateText(SET_STASSID2, temp32);
-      SettingsUpdateText(SET_STAPWD1, temp41);
-      SettingsUpdateText(SET_STAPWD2, temp42);
-      SettingsUpdateText(SET_HOSTNAME, temp5);
-      SettingsUpdateText(SET_SYSLOG_HOST, temp6);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-      if (!strlen(Settings.ex_mqtt_user)) {
-        SettingsUpdateText(SET_MQTT_HOST, temp7);
-        SettingsUpdateText(SET_MQTT_USER, temp9);
-      } else {
-        char aws_mqtt_host[66];
-        snprintf_P(aws_mqtt_host, sizeof(aws_mqtt_host), PSTR("%s%s"), temp9, temp7);
-        SettingsUpdateText(SET_MQTT_HOST, aws_mqtt_host);
-        SettingsUpdateText(SET_MQTT_USER, "");
-      }
-#else
-      SettingsUpdateText(SET_MQTT_HOST, temp7);
-      SettingsUpdateText(SET_MQTT_USER, temp9);
-#endif
-      SettingsUpdateText(SET_MQTT_CLIENT, temp8);
-      SettingsUpdateText(SET_MQTT_PWD, temp10);
-      SettingsUpdateText(SET_MQTT_TOPIC, temp11);
-      SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, temp12);
-      SettingsUpdateText(SET_MQTT_GRP_TOPIC, temp13);
-
-      SettingsUpdateText(SET_WEBPWD, Settings.ex_web_password);
-      SettingsUpdateText(SET_CORS, Settings.ex_cors_domain);
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, Settings.ex_mqtt_fulltopic);
-      SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, Settings.ex_switch_topic);
-      SettingsUpdateText(SET_STATE_TXT1, Settings.ex_state_text[0]);
-      SettingsUpdateText(SET_STATE_TXT2, Settings.ex_state_text[1]);
-      SettingsUpdateText(SET_STATE_TXT3, Settings.ex_state_text[2]);
-      SettingsUpdateText(SET_STATE_TXT4, Settings.ex_state_text[3]);
-      SettingsUpdateText(SET_NTPSERVER1, Settings.ex_ntp_server[0]);
-      SettingsUpdateText(SET_NTPSERVER2, Settings.ex_ntp_server[1]);
-      SettingsUpdateText(SET_NTPSERVER3, Settings.ex_ntp_server[2]);
-      SettingsUpdateText(SET_MEM1, Settings.script_pram[0]);
-      SettingsUpdateText(SET_MEM2, Settings.script_pram[1]);
-      SettingsUpdateText(SET_MEM3, Settings.script_pram[2]);
-      SettingsUpdateText(SET_MEM4, Settings.script_pram[3]);
-      SettingsUpdateText(SET_MEM5, Settings.script_pram[4]);
-      SettingsUpdateText(SET_FRIENDLYNAME1, Settings.ex_friendlyname[0]);
-      SettingsUpdateText(SET_FRIENDLYNAME2, Settings.ex_friendlyname[1]);
-      SettingsUpdateText(SET_FRIENDLYNAME3, Settings.ex_friendlyname[2]);
-      SettingsUpdateText(SET_FRIENDLYNAME4, Settings.ex_friendlyname[3]);
-    }
-
-    Settings.version = VERSION;
-    SettingsSave(1);
-  }
-}
-# 1 "S:/Development/Tasmota/tasmota/support.ino"
-# 20 "S:/Development/Tasmota/tasmota/support.ino"
-IPAddress syslog_host_addr;
-uint32_t syslog_host_hash = 0;
-
-extern "C" {
-extern struct rst_info resetInfo;
-}
-
-
-
-
-
-#include <Ticker.h>
-
-Ticker tickerOSWatch;
-
-const uint32_t OSWATCH_RESET_TIME = 120;
-
-static unsigned long oswatch_last_loop_time;
-uint8_t oswatch_blocked_loop = 0;
-
-#ifndef USE_WS2812_DMA
-
-#endif
-
-#ifdef USE_KNX
-bool knx_started = false;
-#endif
-
-void OsWatchTicker(void)
-{
-  uint32_t t = millis();
-  uint32_t last_run = abs(t - oswatch_last_loop_time);
-
-#ifdef DEBUG_THEO
-  int32_t rssi = WiFi.RSSI();
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d %% (%d dBm), last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(rssi), rssi, last_run);
-#endif
-  if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
-
-    RtcSettings.oswatch_blocked_loop = 1;
-    RtcSettingsSave();
-
-
-
-
-
-    volatile uint32_t dummy;
-    dummy = *((uint32_t*) 0x00000000);
-  }
-}
-
-void OsWatchInit(void)
-{
-  oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
-  RtcSettings.oswatch_blocked_loop = 0;
-  oswatch_last_loop_time = millis();
-  tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
-}
-
-void OsWatchLoop(void)
-{
-  oswatch_last_loop_time = millis();
-
-}
-
-bool OsWatchBlockedLoop(void)
-{
-  return oswatch_blocked_loop;
-}
-
-uint32_t ResetReason(void)
-{
-# 102 "S:/Development/Tasmota/tasmota/support.ino"
-  return resetInfo.reason;
-}
-
-String GetResetReason(void)
-{
-  if (oswatch_blocked_loop) {
-    char buff[32];
-    strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
-    return String(buff);
-  } else {
-    return ESP.getResetReason();
-  }
-}
-
-
-
-
-
-
-size_t strchrspn(const char *str1, int character)
-{
-  size_t ret = 0;
-  char *start = (char*)str1;
-  char *end = strchr(str1, character);
-  if (end) ret = end - start;
-  return ret;
-}
-
-
-char* subStr(char* dest, char* str, const char *delim, int index)
-{
-  char *act;
-  char *sub = nullptr;
-  char *ptr;
-  int i;
-
-
-  strncpy(dest, str, strlen(str)+1);
-  for (i = 1, act = dest; i <= index; i++, act = nullptr) {
-    sub = strtok_r(act, delim, &ptr);
-    if (sub == nullptr) break;
-  }
-  sub = Trim(sub);
-  return sub;
-}
-
-float CharToFloat(const char *str)
-{
-
-  char strbuf[24];
-
-  strlcpy(strbuf, str, sizeof(strbuf));
-  char *pt = strbuf;
-  while ((*pt != '\0') && isblank(*pt)) { pt++; }
-
-  signed char sign = 1;
-  if (*pt == '-') { sign = -1; }
-  if (*pt == '-' || *pt=='+') { pt++; }
-
-  float left = 0;
-  if (*pt != '.') {
-    left = atoi(pt);
-    while (isdigit(*pt)) { pt++; }
-  }
-
-  float right = 0;
-  if (*pt == '.') {
-    pt++;
-    right = atoi(pt);
-    while (isdigit(*pt)) {
-      pt++;
-      right /= 10.0f;
-    }
-  }
-
-  float result = left + right;
-  if (sign < 0) {
-    return -result;
-  }
-  return result;
-}
-
-int TextToInt(char *str)
-{
-  char *p;
-  uint8_t radix = 10;
-  if ('#' == str[0]) {
-    radix = 16;
-    str++;
-  }
-  return strtol(str, &p, radix);
-}
-
-char* ulltoa(unsigned long long value, char *str, int radix)
-{
-  char digits[64];
-  char *dst = str;
-  int i = 0;
-
-
-
-  do {
-    int n = value % radix;
-    digits[i++] = (n < 10) ? (char)n+'0' : (char)n-10+'A';
-    value /= radix;
-  } while (value != 0);
-
-  while (i > 0) { *dst++ = digits[--i]; }
-
-  *dst = 0;
-  return str;
-}
-
-
-
-char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween)
-{
-
-
-
-  static const char * hex = "0123456789ABCDEF";
-  int between = (inbetween) ? 3 : 2;
-  const unsigned char * pin = in;
-  char * pout = out;
-  for (; pin < in+insz; pout += between, pin++) {
-    pout[0] = hex[(pgm_read_byte(pin)>>4) & 0xF];
-    pout[1] = hex[ pgm_read_byte(pin) & 0xF];
-    if (inbetween) { pout[2] = inbetween; }
-    if (pout + 3 - out > outsz) { break; }
-  }
-  pout[(inbetween && insz) ? -1 : 0] = 0;
-  return out;
-}
-
-char* Uint64toHex(uint64_t value, char *str, uint16_t bits)
-{
-  ulltoa(value, str, 16);
-
-  int fill = 8;
-  if ((bits > 3) && (bits < 65)) {
-    fill = bits / 4;
-    if (bits % 4) { fill++; }
-  }
-  int len = strlen(str);
-  fill -= len;
-  if (fill > 0) {
-    memmove(str + fill, str, len +1);
-    memset(str, '0', fill);
-  }
-  return str;
-}
-
-char* dtostrfd(double number, unsigned char prec, char *s)
-{
-  if ((isnan(number)) || (isinf(number))) {
-    strcpy(s, "null");
-    return s;
-  } else {
-    return dtostrf(number, 1, prec, s);
-  }
-}
-
-char* Unescape(char* buffer, uint32_t* size)
-{
-  uint8_t* read = (uint8_t*)buffer;
-  uint8_t* write = (uint8_t*)buffer;
-  int32_t start_size = *size;
-  int32_t end_size = *size;
-  uint8_t che = 0;
-
-
-
-  while (start_size > 0) {
-    uint8_t ch = *read++;
-    start_size--;
-    if (ch != '\\') {
-      *write++ = ch;
-    } else {
-      if (start_size > 0) {
-        uint8_t chi = *read++;
-        start_size--;
-        end_size--;
-        switch (chi) {
-          case '\\': che = '\\'; break;
-          case 'a': che = '\a'; break;
-          case 'b': che = '\b'; break;
-          case 'e': che = '\e'; break;
-          case 'f': che = '\f'; break;
-          case 'n': che = '\n'; break;
-          case 'r': che = '\r'; break;
-          case 's': che = ' '; break;
-          case 't': che = '\t'; break;
-          case 'v': che = '\v'; break;
-          case 'x': {
-            uint8_t* start = read;
-            che = (uint8_t)strtol((const char*)read, (char**)&read, 16);
-            start_size -= (uint16_t)(read - start);
-            end_size -= (uint16_t)(read - start);
-            break;
-          }
-          case '"': che = '\"'; break;
-
-          default : {
-            che = chi;
-            *write++ = ch;
-            end_size++;
-          }
-        }
-        *write++ = che;
-      }
-    }
-  }
-  *size = end_size;
-  *write++ = 0;
-
-
-  return buffer;
-}
-
-char* RemoveSpace(char* p)
-{
-  char* write = p;
-  char* read = p;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    if (!isspace(ch)) {
-      *write++ = ch;
-    }
-  }
-
-  return p;
-}
-
-char* ReplaceCommaWithDot(char* p)
-{
-  char* write = (char*)p;
-  char* read = (char*)p;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    if (ch == ',') {
-      ch = '.';
-    }
-    *write++ = ch;
-  }
-  return p;
-}
-
-char* LowerCase(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = tolower(ch);
-  }
-  return dest;
-}
-
-char* UpperCase(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = toupper(ch);
-  }
-  return dest;
-}
-
-char* UpperCase_P(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = pgm_read_byte(read++);
-    *write++ = toupper(ch);
-  }
-  return dest;
-}
-
-char* Trim(char* p)
-{
-  while ((*p != '\0') && isblank(*p)) { p++; }
-  char* q = p + strlen(p) -1;
-  while ((q >= p) && isblank(*q)) { q--; }
-  q++;
-  *q = '\0';
-  return p;
-}
-
-char* RemoveAllSpaces(char* p)
-{
-
-  char *cursor = p;
-  uint32_t offset = 0;
-  while (1) {
-    *cursor = *(cursor + offset);
-    if ((' ' == *cursor) || ('\t' == *cursor) || ('\n' == *cursor)) {
-      offset++;
-    } else {
-      if (0 == *cursor) { break; }
-      cursor++;
-    }
-  }
-  return p;
-}
-
-char* NoAlNumToUnderscore(char* dest, const char* source)
-{
-  char* write = dest;
-  const char* read = source;
-  char ch = '.';
-
-  while (ch != '\0') {
-    ch = *read++;
-    *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_';
-  }
-  return dest;
-}
-
-char IndexSeparator(void)
-{
-
-
-
-
-
-
-  if (Settings.flag3.use_underscore) {
-    return '_';
-  } else {
-    return '-';
-  }
-}
-
-void SetShortcutDefault(void)
-{
-  if ('\0' != XdrvMailbox.data[0]) {
-    XdrvMailbox.data[0] = '0' + SC_DEFAULT;
-    XdrvMailbox.data[1] = '\0';
-  }
-}
-
-uint8_t Shortcut(void)
-{
-  uint8_t result = 10;
-
-  if ('\0' == XdrvMailbox.data[1]) {
-    if (('"' == XdrvMailbox.data[0]) || ('0' == XdrvMailbox.data[0])) {
-      result = SC_CLEAR;
-    } else {
-      result = atoi(XdrvMailbox.data);
-      if (0 == result) {
-        result = 10;
-      }
-    }
-  }
-  return result;
-}
-
-bool ValidIpAddress(const char* str)
-{
-  const char* p = str;
-
-  while (*p && ((*p == '.') || ((*p >= '0') && (*p <= '9')))) { p++; }
-  return (*p == '\0');
-}
-
-bool ParseIp(uint32_t* addr, const char* str)
-{
-  uint8_t *part = (uint8_t*)addr;
-  uint8_t i;
-
-  *addr = 0;
-  for (i = 0; i < 4; i++) {
-    part[i] = strtoul(str, nullptr, 10);
-    str = strchr(str, '.');
-    if (str == nullptr || *str == '\0') {
-      break;
-    }
-    str++;
-  }
-  return (3 == i);
-}
-
-uint32_t ParseParameters(uint32_t count, uint32_t *params)
-{
-  char *p;
-  uint32_t i = 0;
-  for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < count; str = strtok_r(nullptr, ", ", &p), i++) {
-    params[i] = strtoul(str, nullptr, 0);
-  }
-  return i;
-}
-
-
-bool NewerVersion(char* version_str)
-{
-  uint32_t version = 0;
-  uint32_t i = 0;
-  char *str_ptr;
-
-  char version_dup[strlen(version_str) +1];
-  strncpy(version_dup, version_str, sizeof(version_dup));
-
-  for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) {
-    int field = atoi(str);
-
-    if ((field < 0) || (field > 255)) {
-      return false;
-    }
-
-    version = (version << 8) + field;
-
-    if ((2 == i) && isalpha(str[strlen(str)-1])) {
-      field = str[strlen(str)-1] & 0x1f;
-      version = (version << 8) + field;
-      i++;
-    }
-  }
-
-
-  if ((i < 2) || (i > sizeof(VERSION))) {
-    return false;
-  }
-
-
-  while (i < sizeof(VERSION)) {
-    version <<= 8;
-    i++;
-  }
-
-  return (version > VERSION);
-}
-
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size, uint32_t option)
-{
-  strncpy_P(dest, S_RSLT_POWER, size);
-  if ((devices_present + option) > 1) {
-    char sidx[8];
-    snprintf_P(sidx, sizeof(sidx), PSTR("%d"), idx);
-    strncat(dest, sidx, size - strlen(dest) -1);
-  }
-  return dest;
-}
-
-char* GetPowerDevice(char* dest, uint32_t idx, size_t size)
-{
-  return GetPowerDevice(dest, idx, size, 0);
-}
-
-void GetEspHardwareType(void)
-{
-
-  uint32_t efuse1 = *(uint32_t*)(0x3FF00050);
-  uint32_t efuse2 = *(uint32_t*)(0x3FF00054);
-
-
-
-  is_8285 = ( (efuse1 & (1 << 4)) || (efuse2 & (1 << 16)) );
-  if (is_8285 && (ESP.getFlashChipRealSize() > 1048576)) {
-    is_8285 = false;
-  }
-}
-
-String GetDeviceHardware(void)
-{
-  char buff[10];
-  if (is_8285) {
-    strcpy_P(buff, PSTR("ESP8285"));
-  } else {
-    strcpy_P(buff, PSTR("ESP8266EX"));
-  }
-  return String(buff);
-}
-
-float ConvertTemp(float c)
-{
-  float result = c;
-
-  global_update = uptime;
-  global_temperature = c;
-
-  if (!isnan(c) && Settings.flag.temperature_conversion) {
-    result = c * 1.8 + 32;
-  }
-  result = result + (0.1 * Settings.temp_comp);
-  return result;
-}
-
-float ConvertTempToCelsius(float c)
-{
-  float result = c;
-
-  if (!isnan(c) && Settings.flag.temperature_conversion) {
-    result = (c - 32) / 1.8;
-  }
-  result = result + (0.1 * Settings.temp_comp);
-  return result;
-}
-
-char TempUnit(void)
-{
-  return (Settings.flag.temperature_conversion) ? 'F' : 'C';
-}
-
-float ConvertHumidity(float h)
-{
-  global_update = uptime;
-  global_humidity = h;
-
-  return h;
-}
-
-float ConvertPressure(float p)
-{
-  float result = p;
-
-  global_update = uptime;
-  global_pressure = p;
-
-  if (!isnan(p) && Settings.flag.pressure_conversion) {
-    result = p * 0.75006375541921;
-  }
-  return result;
-}
-
-String PressureUnit(void)
-{
-  return (Settings.flag.pressure_conversion) ? String(D_UNIT_MILLIMETER_MERCURY) : String(D_UNIT_PRESSURE);
-}
-
-void ResetGlobalValues(void)
-{
-  if ((uptime - global_update) > GLOBAL_VALUES_VALID) {
-    global_update = 0;
-    global_temperature = 9999;
-    global_humidity = 0;
-    global_pressure = 0;
-  }
-}
-
-uint32_t SqrtInt(uint32_t num)
-{
-  if (num <= 1) {
-    return num;
-  }
-
-  uint32_t x = num / 2;
-  uint32_t y;
-  do {
-    y = (x + num / x) / 2;
-    if (y >= x) {
-      return x;
-    }
-    x = y;
-  } while (true);
-}
-
-uint32_t RoundSqrtInt(uint32_t num)
-{
-  uint32_t s = SqrtInt(4 * num);
-  if (s & 1) {
-    s++;
-  }
-  return s / 2;
-}
-
-char* GetTextIndexed(char* destination, size_t destination_size, uint32_t index, const char* haystack)
-{
-
-
-  char* write = destination;
-  const char* read = haystack;
-
-  index++;
-  while (index--) {
-    size_t size = destination_size -1;
-    write = destination;
-    char ch = '.';
-    while ((ch != '\0') && (ch != '|')) {
-      ch = pgm_read_byte(read++);
-      if (size && (ch != '|')) {
-        *write++ = ch;
-        size--;
-      }
-    }
-    if (0 == ch) {
-      if (index) {
-        write = destination;
-      }
-      break;
-    }
-  }
-  *write = '\0';
-  return destination;
-}
-
-int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack)
-{
-
-
-  int result = -1;
-  const char* read = haystack;
-  char* write = destination;
-
-  while (true) {
-    result++;
-    size_t size = destination_size -1;
-    write = destination;
-    char ch = '.';
-    while ((ch != '\0') && (ch != '|')) {
-      ch = pgm_read_byte(read++);
-      if (size && (ch != '|')) {
-        *write++ = ch;
-        size--;
-      }
-    }
-    *write = '\0';
-    if (!strcasecmp(needle, destination)) {
-      break;
-    }
-    if (0 == ch) {
-      result = -1;
-      break;
-    }
-  }
-  return result;
-}
-
-bool DecodeCommand(const char* haystack, void (* const MyCommand[])(void))
-{
-  GetTextIndexed(XdrvMailbox.command, CMDSZ, 0, haystack);
-  int prefix_length = strlen(XdrvMailbox.command);
-  if (prefix_length) {
-    char prefix[prefix_length +1];
-    snprintf_P(prefix, sizeof(prefix), XdrvMailbox.topic);
-    if (strcasecmp(prefix, XdrvMailbox.command)) {
-      return false;
-    }
-  }
-  int command_code = GetCommandCode(XdrvMailbox.command + prefix_length, CMDSZ, XdrvMailbox.topic + prefix_length, haystack);
-  if (command_code > 0) {
-    XdrvMailbox.command_code = command_code -1;
-    MyCommand[XdrvMailbox.command_code]();
-    return true;
-  }
-  return false;
-}
-
-const char kOptions[] PROGMEM = "OFF|" D_OFF "|FALSE|" D_FALSE "|STOP|" D_STOP "|" D_CELSIUS "|"
-                                "ON|" D_ON "|TRUE|" D_TRUE "|START|" D_START "|" D_FAHRENHEIT "|" D_USER "|"
-                                "TOGGLE|" D_TOGGLE "|" D_ADMIN "|"
-                                "BLINK|" D_BLINK "|"
-                                "BLINKOFF|" D_BLINKOFF "|"
-                                "ALL" ;
-
-const uint8_t sNumbers[] PROGMEM = { 0,0,0,0,0,0,0,
-                                     1,1,1,1,1,1,1,1,
-                                     2,2,2,
-                                     3,3,
-                                     4,4,
-                                     255 };
-
-int GetStateNumber(char *state_text)
-{
-  char command[CMDSZ];
-  int state_number = GetCommandCode(command, sizeof(command), state_text, kOptions);
-  if (state_number >= 0) {
-    state_number = pgm_read_byte(sNumbers + state_number);
-  }
-  return state_number;
-}
-
-String GetSerialConfig(void)
-{
-
-
-
-
-
-  const char kParity[] = "NEOI";
-
-  char config[4];
-  config[0] = '5' + (Settings.serial_config & 0x3);
-  config[1] = kParity[(Settings.serial_config >> 3) & 0x3];
-  config[2] = '1' + ((Settings.serial_config >> 2) & 0x1);
-  config[3] = '\0';
-  return String(config);
-}
-
-void SetSerialBegin()
-{
-  uint32_t baudrate = Settings.baudrate * 300;
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), baudrate);
-  Serial.flush();
-  Serial.begin(baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config));
-}
-
-void SetSerialConfig(uint32_t serial_config)
-{
-  if (serial_config > TS_SERIAL_8O2) {
-    serial_config = TS_SERIAL_8N1;
-  }
-  if (serial_config != Settings.serial_config) {
-    Settings.serial_config = serial_config;
-    SetSerialBegin();
-  }
-}
-
-void SetSerialBaudrate(uint32_t baudrate)
-{
-  Settings.baudrate = baudrate / 300;
-  if (Serial.baudRate() != baudrate) {
-    SetSerialBegin();
-  }
-}
-
-void SetSerial(uint32_t baudrate, uint32_t serial_config)
-{
-  Settings.flag.mqtt_serial = 0;
-  Settings.serial_config = serial_config;
-  Settings.baudrate = baudrate / 300;
-  SetSeriallog(LOG_LEVEL_NONE);
-  SetSerialBegin();
-}
-
-void ClaimSerial(void)
-{
-  serial_local = true;
-  AddLog_P(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial"));
-  SetSeriallog(LOG_LEVEL_NONE);
-  Settings.baudrate = Serial.baudRate() / 300;
-}
-
-void SerialSendRaw(char *codes)
-{
-  char *p;
-  char stemp[3];
-  uint8_t code;
-
-  int size = strlen(codes);
-
-  while (size > 1) {
-    strlcpy(stemp, codes, sizeof(stemp));
-    code = strtol(stemp, &p, 16);
-    Serial.write(code);
-    size -= 2;
-    codes += 2;
-  }
-}
-
-uint32_t GetHash(const char *buffer, size_t size)
-{
-  uint32_t hash = 0;
-  for (uint32_t i = 0; i <= size; i++) {
-    hash += (uint8_t)*buffer++ * (i +1);
-  }
-  return hash;
-}
-
-void ShowSource(uint32_t source)
-{
-  if ((source > 0) && (source < SRC_MAX)) {
-    char stemp1[20];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource));
-  }
-}
-
-void WebHexCode(uint32_t i, const char* code)
-{
-  char scolor[10];
-
-  strlcpy(scolor, code, sizeof(scolor));
-  char* p = scolor;
-  if ('#' == p[0]) { p++; }
-
-  if (3 == strlen(p)) {
-    p[6] = p[3];
-    p[5] = p[2];
-    p[4] = p[2];
-    p[3] = p[1];
-    p[2] = p[1];
-    p[1] = p[0];
-  }
-
-  uint32_t color = strtol(p, nullptr, 16);
-
-
-
-
-
-
-  uint32_t j = sizeof(Settings.web_color) / 3;
-# 917 "S:/Development/Tasmota/tasmota/support.ino"
-  if (i >= j) {
-
-    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
-  }
-  Settings.web_color[i][0] = (color >> 16) & 0xFF;
-  Settings.web_color[i][1] = (color >> 8) & 0xFF;
-  Settings.web_color[i][2] = color & 0xFF;
-}
-
-uint32_t WebColor(uint32_t i)
-{
-  uint32_t j = sizeof(Settings.web_color) / 3;
-
-
-
-
-  if (i >= j) {
-
-    i += ((((uint8_t*)&Settings.web_color2 - (uint8_t*)&Settings.web_color) / 3) - j);
-  }
-  uint32_t tcolor = (Settings.web_color[i][0] << 16) | (Settings.web_color[i][1] << 8) | Settings.web_color[i][2];
-
-  return tcolor;
-}
-
-
-
-
-
-const uint16_t TIMESZ = 100;
-
-char* ResponseGetTime(uint32_t format, char* time_str)
-{
-  switch (format) {
-  case 1:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%u"), GetDateAndTime(DT_LOCAL).c_str(), UtcTime());
-    break;
-  case 2:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":%u"), UtcTime());
-    break;
-  default:
-    snprintf_P(time_str, TIMESZ, PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
-  }
-  return time_str;
-}
-
-int Response_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), format, args);
-  va_end(args);
-  return len;
-}
-
-int ResponseTime_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-
-  ResponseGetTime(Settings.flag2.time_format, mqtt_data);
-
-  int mlen = strlen(mqtt_data);
-  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
-  va_end(args);
-  return len + mlen;
-}
-
-int ResponseAppend_P(const char* format, ...)
-{
-
-  va_list args;
-  va_start(args, format);
-  int mlen = strlen(mqtt_data);
-  int len = vsnprintf_P(mqtt_data + mlen, sizeof(mqtt_data) - mlen, format, args);
-  va_end(args);
-  return len + mlen;
-}
-
-int ResponseAppendTimeFormat(uint32_t format)
-{
-  char time_str[TIMESZ];
-  return ResponseAppend_P(ResponseGetTime(format, time_str));
-}
-
-int ResponseAppendTime(void)
-{
-  return ResponseAppendTimeFormat(Settings.flag2.time_format);
-}
-
-int ResponseJsonEnd(void)
-{
-  return ResponseAppend_P(PSTR("}"));
-}
-
-int ResponseJsonEndEnd(void)
-{
-  return ResponseAppend_P(PSTR("}}"));
-}
-
-
-
-
-
-void DigitalWrite(uint32_t gpio_pin, uint32_t state)
-{
-  if (pin[gpio_pin] < 99) {
-    digitalWrite(pin[gpio_pin], state &1);
-  }
-}
-
-uint8_t ModuleNr(void)
-{
-
-
-  return (USER_MODULE == Settings.module) ? 0 : Settings.module +1;
-}
-
-bool ValidTemplateModule(uint32_t index)
-{
-  for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
-    if (index == pgm_read_byte(kModuleNiceList + i)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool ValidModule(uint32_t index)
-{
-  if (index == USER_MODULE) { return true; }
-  return ValidTemplateModule(index);
-}
-
-String AnyModuleName(uint32_t index)
-{
-  if (USER_MODULE == index) {
-    return String(Settings.user_template.name);
-  } else {
-    return FPSTR(kModules[index].name);
-  }
-}
-
-String ModuleName(void)
-{
-  return AnyModuleName(Settings.module);
-}
-
-void ModuleGpios(myio *gp)
-{
-  uint8_t *dest = (uint8_t *)gp;
-  memset(dest, GPIO_NONE, sizeof(myio));
-
-  uint8_t src[sizeof(mycfgio)];
-  if (USER_MODULE == Settings.module) {
-    memcpy(&src, &Settings.user_template.gp, sizeof(mycfgio));
-  } else {
-    memcpy_P(&src, &kModules[Settings.module].gp, sizeof(mycfgio));
-  }
-
-
-
-
-  uint32_t j = 0;
-  for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-    if (6 == i) { j = 9; }
-    if (8 == i) { j = 12; }
-    dest[j] = src[i];
-    j++;
-  }
-
-
-
-}
-
-gpio_flag ModuleFlag(void)
-{
-  gpio_flag flag;
-
-  if (USER_MODULE == Settings.module) {
-    flag = Settings.user_template.flag;
-  } else {
-    memcpy_P(&flag, &kModules[Settings.module].flag, sizeof(gpio_flag));
-  }
-
-  return flag;
-}
-
-void ModuleDefault(uint32_t module)
-{
-  if (USER_MODULE == module) { module = WEMOS; }
-  Settings.user_template_base = module;
-  memcpy_P(&Settings.user_template, &kModules[module], sizeof(mytmplt));
-}
-
-void SetModuleType(void)
-{
-  my_module_type = (USER_MODULE == Settings.module) ? Settings.user_template_base : Settings.module;
-}
-
-bool FlashPin(uint32_t pin)
-{
-  return (((pin > 5) && (pin < 9)) || (11 == pin));
-}
-
-uint8_t ValidPin(uint32_t pin, uint32_t gpio)
-{
-  if (FlashPin(pin)) {
-    return GPIO_NONE;
-  }
-
-
-  if ((WEMOS == Settings.module) && !Settings.flag3.user_esp8285_enable) {
-    if ((pin == 9) || (pin == 10)) {
-      return GPIO_NONE;
-    }
-  }
-
-  return gpio;
-}
-
-bool ValidGPIO(uint32_t pin, uint32_t gpio)
-{
-  return (GPIO_USER == ValidPin(pin, gpio));
-}
-
-bool ValidAdc(void)
-{
-  gpio_flag flag = ModuleFlag();
-  uint32_t template_adc0 = flag.data &15;
-  return (ADC0_USER == template_adc0);
-}
-
-bool GetUsedInModule(uint32_t val, uint8_t *arr)
-{
-  int offset = 0;
-
-  if (!val) { return false; }
-
-  if ((val >= GPIO_KEY1) && (val < GPIO_KEY1 + MAX_KEYS)) {
-    offset = (GPIO_KEY1_NP - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_NP) && (val < GPIO_KEY1_NP + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_NP - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_INV) && (val < GPIO_KEY1_INV + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_INV - GPIO_KEY1);
-  }
-  if ((val >= GPIO_KEY1_INV_NP) && (val < GPIO_KEY1_INV_NP + MAX_KEYS)) {
-    offset = -(GPIO_KEY1_INV_NP - GPIO_KEY1);
-  }
-
-  if ((val >= GPIO_SWT1) && (val < GPIO_SWT1 + MAX_SWITCHES)) {
-    offset = (GPIO_SWT1_NP - GPIO_SWT1);
-  }
-  if ((val >= GPIO_SWT1_NP) && (val < GPIO_SWT1_NP + MAX_SWITCHES)) {
-    offset = -(GPIO_SWT1_NP - GPIO_SWT1);
-  }
-
-  if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
-    offset = (GPIO_REL1_INV - GPIO_REL1);
-  }
-  if ((val >= GPIO_REL1_INV) && (val < GPIO_REL1_INV + MAX_RELAYS)) {
-    offset = -(GPIO_REL1_INV - GPIO_REL1);
-  }
-
-  if ((val >= GPIO_LED1) && (val < GPIO_LED1 + MAX_LEDS)) {
-    offset = (GPIO_LED1_INV - GPIO_LED1);
-  }
-  if ((val >= GPIO_LED1_INV) && (val < GPIO_LED1_INV + MAX_LEDS)) {
-    offset = -(GPIO_LED1_INV - GPIO_LED1);
-  }
-
-  if ((val >= GPIO_PWM1) && (val < GPIO_PWM1 + MAX_PWMS)) {
-    offset = (GPIO_PWM1_INV - GPIO_PWM1);
-  }
-  if ((val >= GPIO_PWM1_INV) && (val < GPIO_PWM1_INV + MAX_PWMS)) {
-    offset = -(GPIO_PWM1_INV - GPIO_PWM1);
-  }
-
-  if ((val >= GPIO_CNTR1) && (val < GPIO_CNTR1 + MAX_COUNTERS)) {
-    offset = (GPIO_CNTR1_NP - GPIO_CNTR1);
-  }
-  if ((val >= GPIO_CNTR1_NP) && (val < GPIO_CNTR1_NP + MAX_COUNTERS)) {
-    offset = -(GPIO_CNTR1_NP - GPIO_CNTR1);
-  }
-
-  for (uint32_t i = 0; i < MAX_GPIO_PIN; i++) {
-    if (arr[i] == val) { return true; }
-    if (arr[i] == val + offset) { return true; }
-  }
-  return false;
-}
-
-bool JsonTemplate(const char* dataBuf)
-{
-
-
-  if (strlen(dataBuf) < 9) { return false; }
-
-  StaticJsonBuffer<350> jb;
-  JsonObject& obj = jb.parseObject(dataBuf);
-  if (!obj.success()) { return false; }
-
-
-  const char* name = obj[D_JSON_NAME];
-  if (name != nullptr) {
-    strlcpy(Settings.user_template.name, name, sizeof(Settings.user_template.name));
-  }
-  if (obj[D_JSON_GPIO].success()) {
-    for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-      Settings.user_template.gp.io[i] = obj[D_JSON_GPIO][i] | 0;
-    }
-  }
-  if (obj[D_JSON_FLAG].success()) {
-    uint8_t flag = obj[D_JSON_FLAG] | 0;
-    memcpy(&Settings.user_template.flag, &flag, sizeof(gpio_flag));
-  }
-  if (obj[D_JSON_BASE].success()) {
-    uint8_t base = obj[D_JSON_BASE];
-    if ((0 == base) || !ValidTemplateModule(base -1)) { base = 18; }
-    Settings.user_template_base = base -1;
-  }
-  return true;
-}
-
-void TemplateJson(void)
-{
-  Response_P(PSTR("{\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), Settings.user_template.name);
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    ResponseAppend_P(PSTR("%s%d"), (i>0)?",":"", Settings.user_template.gp.io[i]);
-  }
-  ResponseAppend_P(PSTR("],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), Settings.user_template.flag, Settings.user_template_base +1);
-}
-
-
-
-
-
-inline int32_t TimeDifference(uint32_t prev, uint32_t next)
-{
-  return ((int32_t) (next - prev));
-}
-
-int32_t TimePassedSince(uint32_t timestamp)
-{
-
-
-  return TimeDifference(timestamp, millis());
-}
-
-bool TimeReached(uint32_t timer)
-{
-
-  const long passed = TimePassedSince(timer);
-  return (passed >= 0);
-}
-
-void SetNextTimeInterval(unsigned long& timer, const unsigned long step)
-{
-  timer += step;
-  const long passed = TimePassedSince(timer);
-  if (passed < 0) { return; }
-  if (static_cast<unsigned long>(passed) > step) {
-
-    timer = millis() + step;
-    return;
-  }
-
-  timer = millis() + (step - passed);
-}
-
-int32_t TimePassedSinceUsec(uint32_t timestamp)
-{
-  return TimeDifference(timestamp, micros());
-}
-
-bool TimeReachedUsec(uint32_t timer)
-{
-
-  const long passed = TimePassedSinceUsec(timer);
-  return (passed >= 0);
-}
-
-
-
-
-
-#ifdef USE_I2C
-const uint8_t I2C_RETRY_COUNTER = 3;
-
-uint32_t i2c_active[4] = { 0 };
-uint32_t i2c_buffer = 0;
-
-bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size)
-{
-  uint8_t retry = I2C_RETRY_COUNTER;
-  bool status = false;
-
-  i2c_buffer = 0;
-  while (!status && retry) {
-    Wire.beginTransmission(addr);
-    Wire.write(reg);
-    if (0 == Wire.endTransmission(false)) {
-      Wire.requestFrom((int)addr, (int)size);
-      if (Wire.available() == size) {
-        for (uint32_t i = 0; i < size; i++) {
-          i2c_buffer = i2c_buffer << 8 | Wire.read();
-        }
-        status = true;
-      }
-    }
-    retry--;
-  }
-  return status;
-}
-
-bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 1);
-  *data = (uint8_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 2);
-  *data = (uint16_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 2);
-  *data = (int16_t)i2c_buffer;
-  return status;
-}
-
-bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg)
-{
-  uint16_t ldata;
-  bool status = I2cValidRead16(&ldata, addr, reg);
-  *data = (ldata >> 8) | (ldata << 8);
-  return status;
-}
-
-bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg)
-{
-  uint16_t ldata;
-  bool status = I2cValidRead16LE(&ldata, addr, reg);
-  *data = (int16_t)ldata;
-  return status;
-}
-
-bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg)
-{
-  bool status = I2cValidRead(addr, reg, 3);
-  *data = i2c_buffer;
-  return status;
-}
-
-uint8_t I2cRead8(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 1);
-  return (uint8_t)i2c_buffer;
-}
-
-uint16_t I2cRead16(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  return (uint16_t)i2c_buffer;
-}
-
-int16_t I2cReadS16(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  return (int16_t)i2c_buffer;
-}
-
-uint16_t I2cRead16LE(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 2);
-  uint16_t temp = (uint16_t)i2c_buffer;
-  return (temp >> 8) | (temp << 8);
-}
-
-int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg)
-{
-  return (int16_t)I2cRead16LE(addr, reg);
-}
-
-int32_t I2cRead24(uint8_t addr, uint8_t reg)
-{
-  I2cValidRead(addr, reg, 3);
-  return i2c_buffer;
-}
-
-bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size)
-{
-  uint8_t x = I2C_RETRY_COUNTER;
-
-  do {
-    Wire.beginTransmission((uint8_t)addr);
-    Wire.write(reg);
-    uint8_t bytes = size;
-    while (bytes--) {
-      Wire.write((val >> (8 * bytes)) & 0xFF);
-    }
-    x--;
-  } while (Wire.endTransmission(true) != 0 && x != 0);
-  return (x);
-}
-
-bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val)
-{
-   return I2cWrite(addr, reg, val, 1);
-}
-
-bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val)
-{
-   return I2cWrite(addr, reg, val, 2);
-}
-
-int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
-{
-  Wire.beginTransmission((uint8_t)addr);
-  Wire.write((uint8_t)reg);
-  Wire.endTransmission();
-  if (len != Wire.requestFrom((uint8_t)addr, (uint8_t)len)) {
-    return 1;
-  }
-  while (len--) {
-    *reg_data = (uint8_t)Wire.read();
-    reg_data++;
-  }
-  return 0;
-}
-
-int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len)
-{
-  Wire.beginTransmission((uint8_t)addr);
-  Wire.write((uint8_t)reg);
-  while (len--) {
-    Wire.write(*reg_data);
-    reg_data++;
-  }
-  Wire.endTransmission();
-  return 0;
-}
-
-void I2cScan(char *devs, unsigned int devs_len)
-{
-
-
-
-
-
-
-
-  uint8_t error = 0;
-  uint8_t address = 0;
-  uint8_t any = 0;
-
-  snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_DEVICES_FOUND_AT));
-  for (address = 1; address <= 127; address++) {
-    Wire.beginTransmission(address);
-    error = Wire.endTransmission();
-    if (0 == error) {
-      any = 1;
-      snprintf_P(devs, devs_len, PSTR("%s 0x%02x"), devs, address);
-    }
-    else if (error != 2) {
-      any = 2;
-      snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"Error %d at 0x%02x"), error, address);
-      break;
-    }
-  }
-  if (any) {
-    strncat(devs, "\"}", devs_len - strlen(devs) -1);
-  }
-  else {
-    snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_NO_DEVICES_FOUND "\"}"));
-  }
-}
-
-void I2cResetActive(uint32_t addr, uint32_t count = 1)
-{
-  addr &= 0x7F;
-  count &= 0x7F;
-  while (count-- && (addr < 128)) {
-    i2c_active[addr / 32] &= ~(1 << (addr % 32));
-    addr++;
-  }
-
-}
-
-void I2cSetActive(uint32_t addr, uint32_t count = 1)
-{
-  addr &= 0x7F;
-  count &= 0x7F;
-  while (count-- && (addr < 128)) {
-    i2c_active[addr / 32] |= (1 << (addr % 32));
-    addr++;
-  }
-
-}
-
-void I2cSetActiveFound(uint32_t addr, const char *types)
-{
-  I2cSetActive(addr);
-  AddLog_P2(LOG_LEVEL_INFO, S_LOG_I2C_FOUND_AT, types, addr);
-}
-
-bool I2cActive(uint32_t addr)
-{
-  addr &= 0x7F;
-  if (i2c_active[addr / 32] & (1 << (addr % 32))) {
-    return true;
-  }
-  return false;
-}
-
-bool I2cSetDevice(uint32_t addr)
-{
-  addr &= 0x7F;
-  if (I2cActive(addr)) {
-    return false;
-  }
-  Wire.beginTransmission((uint8_t)addr);
-  return (0 == Wire.endTransmission());
-}
-#endif
-# 1560 "S:/Development/Tasmota/tasmota/support.ino"
-void SetSeriallog(uint32_t loglevel)
-{
-  Settings.seriallog_level = loglevel;
-  seriallog_level = loglevel;
-  seriallog_timer = 0;
-}
-
-void SetSyslog(uint32_t loglevel)
-{
-  Settings.syslog_level = loglevel;
-  syslog_level = loglevel;
-  syslog_timer = 0;
-}
-
-#ifdef USE_WEBSERVER
-void GetLog(uint32_t idx, char** entry_pp, size_t* len_p)
-{
-  char* entry_p = nullptr;
-  size_t len = 0;
-
-  if (idx) {
-    char* it = web_log;
-    do {
-      uint32_t cur_idx = *it;
-      it++;
-      size_t tmp = strchrspn(it, '\1');
-      tmp++;
-      if (cur_idx == idx) {
-        len = tmp;
-        entry_p = it;
-        break;
-      }
-      it += tmp;
-    } while (it < web_log + WEB_LOG_SIZE && *it != '\0');
-  }
-  *entry_pp = entry_p;
-  *len_p = len;
-}
-#endif
-
-void Syslog(void)
-{
-
-
-  uint32_t current_hash = GetHash(SettingsText(SET_SYSLOG_HOST), strlen(SettingsText(SET_SYSLOG_HOST)));
-  if (syslog_host_hash != current_hash) {
-    syslog_host_hash = current_hash;
-    WiFi.hostByName(SettingsText(SET_SYSLOG_HOST), syslog_host_addr);
-  }
-  if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
-    char syslog_preamble[64];
-    snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);
-    memmove(log_data + strlen(syslog_preamble), log_data, sizeof(log_data) - strlen(syslog_preamble));
-    log_data[sizeof(log_data) -1] = '\0';
-    memcpy(log_data, syslog_preamble, strlen(syslog_preamble));
-    PortUdp.write(log_data, strlen(log_data));
-    PortUdp.endPacket();
-    delay(1);
-  } else {
-    syslog_level = 0;
-    syslog_timer = SYSLOG_TIMER;
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_HOST_NOT_FOUND ". " D_RETRY_IN " %d " D_UNIT_SECOND), SYSLOG_TIMER);
-  }
-}
-
-void AddLog(uint32_t loglevel)
-{
-  char mxtime[10];
-
-  snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
-
-  if (loglevel <= seriallog_level) {
-    Serial.printf("%s%s\r\n", mxtime, log_data);
-  }
-#ifdef USE_WEBSERVER
-  if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
-
-
-    web_log_index &= 0xFF;
-    if (!web_log_index) web_log_index++;
-    while (web_log_index == web_log[0] ||
-           strlen(web_log) + strlen(log_data) + 13 > WEB_LOG_SIZE)
-    {
-      char* it = web_log;
-      it++;
-      it += strchrspn(it, '\1');
-      it++;
-      memmove(web_log, it, WEB_LOG_SIZE -(it-web_log));
-    }
-    snprintf_P(web_log, sizeof(web_log), PSTR("%s%c%s%s\1"), web_log, web_log_index++, mxtime, log_data);
-    web_log_index &= 0xFF;
-    if (!web_log_index) web_log_index++;
-  }
-#endif
-  if (Settings.flag.mqtt_enabled &&
-      !global_state.mqtt_down &&
-      (loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
-
-  if (!global_state.wifi_down &&
-      (loglevel <= syslog_level)) { Syslog(); }
-}
-
-void AddLog_P(uint32_t loglevel, const char *formatP)
-{
-  snprintf_P(log_data, sizeof(log_data), formatP);
-  AddLog(loglevel);
-}
-
-void AddLog_P(uint32_t loglevel, const char *formatP, const char *formatP2)
-{
-  char message[sizeof(log_data)];
-
-  snprintf_P(log_data, sizeof(log_data), formatP);
-  snprintf_P(message, sizeof(message), formatP2);
-  strncat(log_data, message, sizeof(log_data) - strlen(log_data) -1);
-  AddLog(loglevel);
-}
-
-void PrepLog_P2(uint32_t loglevel, PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  prepped_loglevel = loglevel;
-}
-
-void AddLog_P2(uint32_t loglevel, PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  AddLog(loglevel);
-}
-
-void AddLog_Debug(PGM_P formatP, ...)
-{
-  va_list arg;
-  va_start(arg, formatP);
-  vsnprintf_P(log_data, sizeof(log_data), formatP, arg);
-  va_end(arg);
-
-  AddLog(LOG_LEVEL_DEBUG);
-}
-
-void AddLogBuffer(uint32_t loglevel, uint8_t *buffer, uint32_t count)
-{
-# 1722 "S:/Development/Tasmota/tasmota/support.ino"
-  char hex_char[(count * 3) + 2];
-  AddLog_P2(loglevel, PSTR("DMP: %s"), ToHex_P(buffer, count, hex_char, sizeof(hex_char), ' '));
-}
-
-void AddLogSerial(uint32_t loglevel)
-{
-  AddLogBuffer(loglevel, (uint8_t*)serial_in_buffer, serial_in_byte_counter);
-}
-
-void AddLogMissed(char *sensor, uint32_t misses)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SNS: %s missed %d"), sensor, SENSOR_MAX_MISS - misses);
-}
-# 1 "S:/Development/Tasmota/tasmota/support_button.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_button.ino"
-#define BUTTON_V1 
-#ifdef BUTTON_V1
-
-
-
-
-#define MAX_BUTTON_COMMANDS 5
-const char kCommands[] PROGMEM =
-  D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_WIFICONFIG " 2|" D_CMND_RESTART " 1|" D_CMND_UPGRADE " 1";
-
-struct BUTTON {
-  unsigned long debounce = 0;
-  uint16_t hold_timer[MAX_KEYS] = { 0 };
-  uint16_t dual_code = 0;
-
-  uint8_t last_state[MAX_KEYS] = { NOT_PRESSED, NOT_PRESSED, NOT_PRESSED, NOT_PRESSED };
-  uint8_t window_timer[MAX_KEYS] = { 0 };
-  uint8_t press_counter[MAX_KEYS] = { 0 };
-
-  uint8_t dual_receive_count = 0;
-  uint8_t no_pullup_mask = 0;
-  uint8_t inverted_mask = 0;
-  uint8_t present = 0;
-  uint8_t adc = 99;
-} Button;
-
-
-
-void ButtonPullupFlag(uint8 button_bit)
-{
-  bitSet(Button.no_pullup_mask, button_bit);
-}
-
-void ButtonInvertFlag(uint8 button_bit)
-{
-  bitSet(Button.inverted_mask, button_bit);
-}
-
-void ButtonInit(void)
-{
-  Button.present = 0;
-  for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if (pin[GPIO_KEY1 +i] < 99) {
-      Button.present++;
-      pinMode(pin[GPIO_KEY1 +i], bitRead(Button.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_KEY1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
-    }
-#ifndef USE_ADC_VCC
-    else if ((99 == Button.adc) && ((ADC0_BUTTON == my_adc0) || (ADC0_BUTTON_INV == my_adc0))) {
-      Button.present++;
-      Button.adc = i;
-    }
-#endif
-  }
-}
-
-uint8_t ButtonSerial(uint8_t serial_in_byte)
-{
-  if (Button.dual_receive_count) {
-    Button.dual_receive_count--;
-    if (Button.dual_receive_count) {
-      Button.dual_code = (Button.dual_code << 8) | serial_in_byte;
-      serial_in_byte = 0;
-    } else {
-      if (serial_in_byte != 0xA1) {
-        Button.dual_code = 0;
-      }
-    }
-  }
-  if (0xA0 == serial_in_byte) {
-    serial_in_byte = 0;
-    Button.dual_code = 0;
-    Button.dual_receive_count = 3;
-  }
-
-  return serial_in_byte;
-}
-# 108 "S:/Development/Tasmota/tasmota/support_button.ino"
-void ButtonHandler(void)
-{
-  if (uptime < 4) { return; }
-
-  uint8_t hold_time_extent = IMMINENT_RESET_FACTOR;
-  uint16_t loops_per_second = 1000 / Settings.button_debounce;
-  char scmnd[20];
-
-
-
-  for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
-    uint8_t button = NOT_PRESSED;
-    uint8_t button_present = 0;
-
-    if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type))) {
-      button_present = 1;
-      if (Button.dual_code) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON " " D_CODE " %04X"), Button.dual_code);
-        button = PRESSED;
-        if (0xF500 == Button.dual_code) {
-          Button.hold_timer[button_index] = (loops_per_second * Settings.param[P_HOLD_TIME] / 10) -1;
-          hold_time_extent = 1;
-        }
-        Button.dual_code = 0;
-      }
-    }
-    else if (pin[GPIO_KEY1 +button_index] < 99) {
-      button_present = 1;
-      button = (digitalRead(pin[GPIO_KEY1 +button_index]) != bitRead(Button.inverted_mask, button_index));
-    }
-#ifndef USE_ADC_VCC
-    if (Button.adc == button_index) {
-      button_present = 1;
-      if (ADC0_BUTTON_INV == my_adc0) {
-        button = (AdcRead(1) < 128);
-      }
-      else if (ADC0_BUTTON == my_adc0) {
-        button = (AdcRead(1) > 128);
-      }
-    }
-#endif
-
-    if (button_present) {
-      XdrvMailbox.index = button_index;
-      XdrvMailbox.payload = button;
-      if (XdrvCall(FUNC_BUTTON_PRESSED)) {
-
-      }
-      else if (SONOFF_4CHPRO == my_module_type) {
-        if (Button.hold_timer[button_index]) { Button.hold_timer[button_index]--; }
-
-        bool button_pressed = false;
-        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_10), button_index +1);
-          Button.hold_timer[button_index] = loops_per_second;
-          button_pressed = true;
-        }
-        if ((NOT_PRESSED == button) && (PRESSED == Button.last_state[button_index])) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_LEVEL_01), button_index +1);
-          if (!Button.hold_timer[button_index]) { button_pressed = true; }
-        }
-        if (button_pressed) {
-          if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
-            ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
-          }
-        }
-      }
-      else {
-        if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-          if (Settings.flag.button_single) {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1);
-            if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {
-              ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);
-            }
-          } else {
-            Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_MULTI_PRESS " %d"), button_index +1, Button.press_counter[button_index]);
-            Button.window_timer[button_index] = loops_per_second / 2;
-          }
-          blinks = 201;
-        }
-
-        if (NOT_PRESSED == button) {
-          Button.hold_timer[button_index] = 0;
-        } else {
-          Button.hold_timer[button_index]++;
-          if (Settings.flag.button_single) {
-            if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
-
-              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_SETOPTION "13 0"));
-              ExecuteCommand(scmnd, SRC_BUTTON);
-            }
-          } else {
-            if (Settings.flag.button_restrict) {
-              if (Settings.param[P_HOLD_IGNORE] > 0) {
-                if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
-                  Button.hold_timer[button_index] = 0;
-                  Button.press_counter[button_index] = 0;
-                  DEBUG_CORE_LOG(PSTR("BTN: " D_BUTTON "%d cancel by " D_CMND_SETOPTION "40 %d"), button_index +1, Settings.param[P_HOLD_IGNORE]);
-                }
-              }
-              if (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10) {
-                Button.press_counter[button_index] = 0;
-                SendKey(KEY_BUTTON, button_index +1, POWER_HOLD);
-              }
-            } else {
-              if (Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10) {
-                Button.press_counter[button_index] = 0;
-                snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-                ExecuteCommand(scmnd, SRC_BUTTON);
-              }
-            }
-          }
-        }
-
-        if (!Settings.flag.button_single) {
-          if (Button.window_timer[button_index]) {
-            Button.window_timer[button_index]--;
-          } else {
-            if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0) && (Button.press_counter[button_index] < MAX_BUTTON_COMMANDS +3)) {
-              bool single_press = false;
-              if (Button.press_counter[button_index] < 3) {
-                if ((SONOFF_DUAL_R2 == my_module_type) || (SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-                  single_press = true;
-                } else {
-                  single_press = (Settings.flag.button_swap +1 == Button.press_counter[button_index]);
-                  if ((1 == Button.present) && (2 == devices_present)) {
-                    if (Settings.flag.button_swap) {
-                      Button.press_counter[button_index] = (single_press) ? 1 : 2;
-                    }
-                  } else {
-                    Button.press_counter[button_index] = 1;
-                  }
-                }
-              }
-#if defined(USE_LIGHT) && defined(ROTARY_V1)
-              if (!((0 == button_index) && RotaryButtonPressed())) {
-#endif
-                if (single_press && SendKey(KEY_BUTTON, button_index + Button.press_counter[button_index], POWER_TOGGLE)) {
-
-                } else {
-                  if (Button.press_counter[button_index] < 3) {
-                    if (WifiState() > WIFI_RESTART) {
-                      restart_flag = 1;
-                    } else {
-                      ExecuteCommandPower(button_index + Button.press_counter[button_index], POWER_TOGGLE, SRC_BUTTON);
-                    }
-                  } else {
-                    if (!Settings.flag.button_restrict) {
-                      GetTextIndexed(scmnd, sizeof(scmnd), Button.press_counter[button_index] -3, kCommands);
-                      ExecuteCommand(scmnd, SRC_BUTTON);
-                    }
-                  }
-                }
-#if defined(USE_LIGHT) && defined(ROTARY_V1)
-              }
-#endif
-              Button.press_counter[button_index] = 0;
-            }
-          }
-        }
-      }
-    }
-    Button.last_state[button_index] = button;
-  }
-}
-
-void ButtonLoop(void)
-{
-  if (Button.present) {
-    if (TimeReached(Button.debounce)) {
-      SetNextTimeInterval(Button.debounce, Settings.button_debounce);
-      ButtonHandler();
-    }
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_command.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_command.ino"
-const char kTasmotaCommands[] PROGMEM = "|"
-  D_CMND_BACKLOG "|" D_CMND_DELAY "|" D_CMND_POWER "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|"
-  D_CMND_SERIALLOG "|" D_CMND_RESTART "|" D_CMND_POWERONSTATE "|" D_CMND_PULSETIME "|" D_CMND_BLINKTIME "|" D_CMND_BLINKCOUNT "|" D_CMND_SAVEDATA "|"
-  D_CMND_SETOPTION "|" D_CMND_TEMPERATURE_RESOLUTION "|" D_CMND_HUMIDITY_RESOLUTION "|" D_CMND_PRESSURE_RESOLUTION "|" D_CMND_POWER_RESOLUTION "|"
-  D_CMND_VOLTAGE_RESOLUTION "|" D_CMND_FREQUENCY_RESOLUTION "|" D_CMND_CURRENT_RESOLUTION "|" D_CMND_ENERGY_RESOLUTION "|" D_CMND_WEIGHT_RESOLUTION "|"
-  D_CMND_MODULE "|" D_CMND_MODULES "|" D_CMND_GPIO "|" D_CMND_GPIOS "|" D_CMND_TEMPLATE "|" D_CMND_PWM "|" D_CMND_PWMFREQUENCY "|" D_CMND_PWMRANGE "|"
-  D_CMND_BUTTONDEBOUNCE "|" D_CMND_SWITCHDEBOUNCE "|" D_CMND_SYSLOG "|" D_CMND_LOGHOST "|" D_CMND_LOGPORT "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALCONFIG "|"
-  D_CMND_SERIALDELIMITER "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|"
-  D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_INTERLOCK "|" D_CMND_TELEPERIOD "|" D_CMND_RESET "|" D_CMND_TIME "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|"
-  D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_LEDMASK "|" D_CMND_WIFIPOWER "|" D_CMND_TEMPOFFSET "|"
-#ifdef USE_I2C
-  D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
-#endif
-#ifdef USE_DEVICE_GROUPS
-  D_CMND_DEVGROUP_SHARE "|"
-#endif
-  D_CMND_SENSOR "|" D_CMND_DRIVER;
-
-void (* const TasmotaCommand[])(void) PROGMEM = {
-  &CmndBacklog, &CmndDelay, &CmndPower, &CmndStatus, &CmndState, &CmndSleep, &CmndUpgrade, &CmndUpgrade, &CmndOtaUrl,
-  &CmndSeriallog, &CmndRestart, &CmndPowerOnState, &CmndPulsetime, &CmndBlinktime, &CmndBlinkcount, &CmndSavedata,
-  &CmndSetoption, &CmndTemperatureResolution, &CmndHumidityResolution, &CmndPressureResolution, &CmndPowerResolution,
-  &CmndVoltageResolution, &CmndFrequencyResolution, &CmndCurrentResolution, &CmndEnergyResolution, &CmndWeightResolution,
-  &CmndModule, &CmndModules, &CmndGpio, &CmndGpios, &CmndTemplate, &CmndPwm, &CmndPwmfrequency, &CmndPwmrange,
-  &CmndButtonDebounce, &CmndSwitchDebounce, &CmndSyslog, &CmndLoghost, &CmndLogport, &CmndSerialSend, &CmndBaudrate, &CmndSerialConfig,
-  &CmndSerialDelimiter, &CmndIpAddress, &CmndNtpServer, &CmndAp, &CmndSsid, &CmndPassword, &CmndHostname, &CmndWifiConfig,
-  &CmndFriendlyname, &CmndSwitchMode, &CmndInterlock, &CmndTeleperiod, &CmndReset, &CmndTime, &CmndTimezone, &CmndTimeStd,
-  &CmndTimeDst, &CmndAltitude, &CmndLedPower, &CmndLedState, &CmndLedMask, &CmndWifiPower, &CmndTempOffset,
-#ifdef USE_I2C
-  &CmndI2cScan, CmndI2cDriver,
-#endif
-#ifdef USE_DEVICE_GROUPS
-  &CmndDevGroupShare,
-#endif
-  &CmndSensor, &CmndDriver };
-
-const char kWifiConfig[] PROGMEM =
-  D_WCFG_0_RESTART "||" D_WCFG_2_WIFIMANAGER "||" D_WCFG_4_RETRY "|" D_WCFG_5_WAIT "|" D_WCFG_6_SERIAL "|" D_WCFG_7_WIFIMANAGER_RESET_ONLY;
-
-
-
-void ResponseCmndNumber(int value)
-{
-  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, value);
-}
-
-void ResponseCmndFloat(float value, uint32_t decimals)
-{
-  char stemp1[TOPSZ];
-  dtostrfd(value, decimals, stemp1);
-  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp1);
-}
-
-void ResponseCmndIdxNumber(int value)
-{
-  Response_P(S_JSON_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
-}
-
-void ResponseCmndChar(const char* value)
-{
-  Response_P(S_JSON_COMMAND_SVALUE, XdrvMailbox.command, value);
-}
-
-void ResponseCmndStateText(uint32_t value)
-{
-  ResponseCmndChar(GetStateText(value));
-}
-
-void ResponseCmndDone(void)
-{
-  ResponseCmndChar(D_JSON_DONE);
-}
-
-void ResponseCmndIdxChar(const char* value)
-{
-  Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, XdrvMailbox.index, value);
-}
-
-void ResponseCmndAll(uint32_t text_index, uint32_t count)
-{
-  mqtt_data[0] = '\0';
-  for (uint32_t i = 0; i < count; i++) {
-    ResponseAppend_P(PSTR("%c\"%s%d\":\"%s\""), (i) ? ',' : '{', XdrvMailbox.command, i +1, SettingsText(text_index +i));
-  }
-  ResponseJsonEnd();
-}
-
-
-
-void ExecuteCommand(const char *cmnd, uint32_t source)
-{
-
-
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("ExecuteCommand"));
-#endif
-  ShowSource(source);
-
-  const char *pos = cmnd;
-  while (*pos && isspace(*pos)) {
-    pos++;
-  }
-
-  const char *start = pos;
-
-  while (*pos && (isalpha(*pos) || isdigit(*pos) || '_' == *pos || '/' == *pos)) {
-    if ('/' == *pos) {
-      start = pos + 1;
-    }
-    pos++;
-  }
-  if ('\0' == *start || pos <= start) {
-    return;
-  }
-
-  uint32_t size = pos - start;
-  char stopic[size + 2];
-  stopic[0] = '/';
-  memcpy(stopic+1, start, size);
-  stopic[size+1] = '\0';
-
-  char svalue[strlen(pos) +1];
-  strlcpy(svalue, pos, sizeof(svalue));
-  CommandHandler(stopic, svalue, strlen(svalue));
-}
-# 154 "S:/Development/Tasmota/tasmota/support_command.ino"
-void CommandHandler(char* topicBuf, char* dataBuf, uint32_t data_len)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("CommandHandler"));
-#endif
-
-  while (*dataBuf && isspace(*dataBuf)) {
-    dataBuf++;
-    data_len--;
-  }
-
-  bool grpflg = (strstr(topicBuf, SettingsText(SET_MQTT_GRP_TOPIC)) != nullptr);
-
-  char stemp1[TOPSZ];
-  GetFallbackTopic_P(stemp1, "");
-  fallback_topic_flag = (!strncmp(topicBuf, stemp1, strlen(stemp1)));
-
-  char *type = strrchr(topicBuf, '/');
-
-  uint32_t index = 1;
-  bool user_index = false;
-  if (type != nullptr) {
-    type++;
-    uint32_t i;
-    for (i = 0; i < strlen(type); i++) {
-      type[i] = toupper(type[i]);
-    }
-    while (isdigit(type[i-1])) {
-      i--;
-    }
-    if (i < strlen(type)) {
-      index = atoi(type +i);
-      user_index = true;
-    }
-    type[i] = '\0';
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CMD: " D_GROUP " %d, " D_INDEX " %d, " D_COMMAND " \"%s\", " D_DATA " \"%s\""), grpflg, index, type, dataBuf);
-
-  if (type != nullptr) {
-    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_ERROR "\"}"));
-
-    if (Settings.ledstate &0x02) { blinks++; }
-
-    if (!strcmp(dataBuf,"?")) { data_len = 0; }
-
-    char *p;
-    int32_t payload = strtol(dataBuf, &p, 0);
-    if (p == dataBuf) { payload = -99; }
-    int temp_payload = GetStateNumber(dataBuf);
-    if (temp_payload > -1) { payload = temp_payload; }
-
-    DEBUG_CORE_LOG(PSTR("CMD: Payload %d"), payload);
-
-
-    backlog_delay = millis() + Settings.param[P_BACKLOG_DELAY];
-
-    char command[CMDSZ] = { 0 };
-    XdrvMailbox.command = command;
-    XdrvMailbox.index = index;
-    XdrvMailbox.data_len = data_len;
-    XdrvMailbox.payload = payload;
-    XdrvMailbox.grpflg = grpflg;
-    XdrvMailbox.usridx = user_index;
-    XdrvMailbox.topic = type;
-    XdrvMailbox.data = dataBuf;
-
-#ifdef USE_SCRIPT_SUB_COMMAND
-
-    if (!Script_SubCmd()) {
-      if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
-        if (!XdrvCall(FUNC_COMMAND)) {
-          if (!XsnsCall(FUNC_COMMAND)) {
-            type = nullptr;
-          }
-        }
-      }
-    }
-#else
-    if (!DecodeCommand(kTasmotaCommands, TasmotaCommand)) {
-      if (!XdrvCall(FUNC_COMMAND)) {
-        if (!XsnsCall(FUNC_COMMAND)) {
-          type = nullptr;
-        }
-      }
-    }
-#endif
-
-  }
-
-  if (type == nullptr) {
-    blinks = 201;
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_COMMAND));
-    Response_P(PSTR("{\"" D_JSON_COMMAND "\":\"" D_JSON_UNKNOWN "\"}"));
-    type = (char*)stemp1;
-  }
-
-  if (mqtt_data[0] != '\0') {
-     MqttPublishPrefixTopic_P(RESULT_OR_STAT, type);
-     XdrvRulesProcess();
-  }
-  fallback_topic_flag = false;
-}
-
-
-
-void CmndBacklog(void)
-{
-  if (XdrvMailbox.data_len) {
-
-#ifdef SUPPORT_IF_STATEMENT
-    char *blcommand = strtok(XdrvMailbox.data, ";");
-    while ((blcommand != nullptr) && (backlog.size() < MAX_BACKLOG))
-#else
-    uint32_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer;
-    bl_pointer--;
-    char *blcommand = strtok(XdrvMailbox.data, ";");
-    while ((blcommand != nullptr) && (backlog_index != bl_pointer))
-#endif
-    {
-      while(true) {
-        blcommand = Trim(blcommand);
-        if (!strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) {
-          blcommand += strlen(D_CMND_BACKLOG);
-        } else {
-          break;
-        }
-      }
-      if (*blcommand != '\0') {
-#ifdef SUPPORT_IF_STATEMENT
-        if (backlog.size() < MAX_BACKLOG) {
-          backlog.add(blcommand);
-        }
-#else
-        backlog[backlog_index] = String(blcommand);
-        backlog_index++;
-        if (backlog_index >= MAX_BACKLOG) backlog_index = 0;
-#endif
-      }
-      blcommand = strtok(nullptr, ";");
-    }
-
-    mqtt_data[0] = '\0';
-  } else {
-    bool blflag = BACKLOG_EMPTY;
-#ifdef SUPPORT_IF_STATEMENT
-    backlog.clear();
-#else
-    backlog_pointer = backlog_index;
-#endif
-    ResponseCmndChar(blflag ? D_JSON_EMPTY : D_JSON_ABORTED);
-  }
-}
-
-void CmndDelay(void)
-{
-  if ((XdrvMailbox.payload >= (MIN_BACKLOG_DELAY / 100)) && (XdrvMailbox.payload <= 3600)) {
-    backlog_delay = millis() + (100 * XdrvMailbox.payload);
-  }
-  uint32_t bl_delay = 0;
-  long bl_delta = TimePassedSince(backlog_delay);
-  if (bl_delta < 0) { bl_delay = (bl_delta *-1) / 100; }
-  ResponseCmndNumber(bl_delay);
-}
-
-void CmndPower(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= devices_present)) {
-    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_BLINK_STOP)) {
-      XdrvMailbox.payload = POWER_SHOW_STATE;
-    }
-
-    ExecuteCommandPower(XdrvMailbox.index, XdrvMailbox.payload, SRC_IGNORE);
-    mqtt_data[0] = '\0';
-  }
-  else if (0 == XdrvMailbox.index) {
-    if ((XdrvMailbox.payload < POWER_OFF) || (XdrvMailbox.payload > POWER_TOGGLE)) {
-      XdrvMailbox.payload = POWER_SHOW_STATE;
-    }
-    SetAllPower(XdrvMailbox.payload, SRC_IGNORE);
-    mqtt_data[0] = '\0';
-  }
-}
-
-void CmndStatus(void)
-{
-  uint32_t payload = ((XdrvMailbox.payload < 0) || (XdrvMailbox.payload > MAX_STATUS)) ? 99 : XdrvMailbox.payload;
-
-  uint32_t option = STAT;
-  char stemp[200];
-  char stemp2[TOPSZ];
-
-
-
-
-
-  if ((!Settings.flag.mqtt_enabled) && (6 == payload)) { payload = 99; }
-  if (!energy_flg && (9 == payload)) { payload = 99; }
-  if (!CrashFlag() && (12 == payload)) { payload = 99; }
-
-  if ((0 == payload) || (99 == payload)) {
-    uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) { maxfn = 1; }
-#endif
-    stemp[0] = '\0';
-    for (uint32_t i = 0; i < maxfn; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%s%s\"%s\"" ), stemp, (i > 0 ? "," : ""), SettingsText(SET_FRIENDLYNAME1 +i));
-    }
-    stemp2[0] = '\0';
-    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-      snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%s%d" ), stemp2, (i > 0 ? "," : ""), Settings.switchmode[i]);
-    }
-    Response_P(PSTR("{\"" D_CMND_STATUS "\":{\"" D_CMND_MODULE "\":%d,\"" D_CMND_FRIENDLYNAME "\":[%s],\"" D_CMND_TOPIC "\":\"%s\",\""
-                          D_CMND_BUTTONTOPIC "\":\"%s\",\"" D_CMND_POWER "\":%d,\"" D_CMND_POWERONSTATE "\":%d,\"" D_CMND_LEDSTATE "\":%d,\""
-                          D_CMND_LEDMASK "\":\"%04X\",\"" D_CMND_SAVEDATA "\":%d,\"" D_JSON_SAVESTATE "\":%d,\"" D_CMND_SWITCHTOPIC "\":\"%s\",\""
-                          D_CMND_SWITCHMODE "\":[%s],\"" D_CMND_BUTTONRETAIN "\":%d,\"" D_CMND_SWITCHRETAIN "\":%d,\"" D_CMND_SENSORRETAIN "\":%d,\"" D_CMND_POWERRETAIN "\":%d}}"),
-                          ModuleNr(), stemp, mqtt_topic,
-                          SettingsText(SET_MQTT_BUTTON_TOPIC), power, Settings.poweronstate, Settings.ledstate,
-                          Settings.ledmask, Settings.save_data,
-                          Settings.flag.save_state,
-                          SettingsText(SET_MQTT_SWITCH_TOPIC),
-                          stemp2,
-                          Settings.flag.mqtt_button_retain,
-                          Settings.flag.mqtt_switch_retain,
-                          Settings.flag.mqtt_sensor_retain,
-                          Settings.flag.mqtt_power_retain);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS));
-  }
-
-  if ((0 == payload) || (1 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS1_PARAMETER "\":{\"" D_JSON_BAUDRATE "\":%d,\"" D_CMND_SERIALCONFIG "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\",\"" D_CMND_OTAURL "\":\"%s\",\""
-                          D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\",\"" D_JSON_STARTUPUTC "\":\"%s\",\"" D_CMND_SLEEP "\":%d,\""
-                          D_JSON_CONFIG_HOLDER "\":%d,\"" D_JSON_BOOTCOUNT "\":%d,\"BCResetTime\":\"%s\",\"" D_JSON_SAVECOUNT "\":%d,\"" D_JSON_SAVEADDRESS "\":\"%X\"}}"),
-                          Settings.baudrate * 300, GetSerialConfig().c_str(), SettingsText(SET_MQTT_GRP_TOPIC), SettingsText(SET_OTAURL),
-                          GetResetReason().c_str(), GetUptime().c_str(), GetDateAndTime(DT_RESTART).c_str(), Settings.sleep,
-                          Settings.cfg_holder, Settings.bootcount, GetDateAndTime(DT_BOOTCOUNT).c_str(), Settings.save_flag, GetSettingsAddress());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "1"));
-  }
-
-  if ((0 == payload) || (2 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS2_FIRMWARE "\":{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\",\""
-                          D_JSON_BOOTVERSION "\":%d,\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
-                          "\"Hardware\":\"%s\""
-                          "%s}}"),
-                          my_version, my_image, GetBuildDateAndTime().c_str(),
-                          ESP.getBootVersion(), ESP.getSdkVersion(),
-                          GetDeviceHardware().c_str(),
-                          GetStatistics().c_str());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "2"));
-  }
-
-  if ((0 == payload) || (3 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_MQTTLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\""
-                          D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\""
-                          D_JSON_RESOLUTION "\":\"%08X\",\"" D_CMND_SETOPTION "\":[\"%08X\",\"%s\",\"%08X\",\"%08X\"]}}"),
-                          Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level,
-                          SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), Settings.tele_period,
-                          Settings.flag2.data, Settings.flag.data, ToHex_P((unsigned char*)Settings.param, PARAM8_SIZE, stemp2, sizeof(stemp2)),
-                          Settings.flag3.data, Settings.flag4.data);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
-  }
-
-  if ((0 == payload) || (4 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS4_MEMORY "\":{\"" D_JSON_PROGRAMSIZE "\":%d,\"" D_JSON_FREEMEMORY "\":%d,\"" D_JSON_HEAPSIZE "\":%d,\""
-                          D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d,\"" D_JSON_FLASHCHIPID "\":\"%06X\",\"" D_JSON_FLASHMODE "\":%d,\""
-                          D_JSON_FEATURES "\":[\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\",\"%08X\"]"),
-                          ESP.getSketchSize()/1024, ESP.getFreeSketchSpace()/1024, ESP.getFreeHeap()/1024,
-                          ESP.getFlashChipSize()/1024, ESP.getFlashChipRealSize()/1024, ESP.getFlashChipId(), ESP.getFlashChipMode(),
-                          LANGUAGE_LCID, feature_drv1, feature_drv2, feature_sns1, feature_sns2, feature5, feature6);
-    XsnsDriverState();
-    ResponseAppend_P(PSTR(",\"Sensors\":"));
-    XsnsSensorState();
-    ResponseJsonEndEnd();
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "4"));
-  }
-
-  if ((0 == payload) || (5 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"" D_JSON_GATEWAY "\":\"%s\",\""
-                          D_JSON_SUBNETMASK "\":\"%s\",\"" D_JSON_DNSSERVER "\":\"%s\",\"" D_JSON_MAC "\":\"%s\",\""
-                          D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"),
-                          my_hostname, WiFi.localIP().toString().c_str(), IPAddress(Settings.ip_address[1]).toString().c_str(),
-                          IPAddress(Settings.ip_address[2]).toString().c_str(), IPAddress(Settings.ip_address[3]).toString().c_str(), WiFi.macAddress().c_str(),
-                          Settings.webserver, Settings.sta_config, WifiGetOutputPower().c_str());
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "5"));
-  }
-
-  if (((0 == payload) || (6 == payload)) && Settings.flag.mqtt_enabled) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS6_MQTT "\":{\"" D_CMND_MQTTHOST "\":\"%s\",\"" D_CMND_MQTTPORT "\":%d,\"" D_CMND_MQTTCLIENT D_JSON_MASK "\":\"%s\",\""
-                          D_CMND_MQTTCLIENT "\":\"%s\",\"" D_CMND_MQTTUSER "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,\"MAX_PACKET_SIZE\":%d,\"KEEPALIVE\":%d}}"),
-                          SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT),
-                          mqtt_client, SettingsText(SET_MQTT_USER), MqttConnectCount(), MQTT_MAX_PACKET_SIZE, MQTT_KEEPALIVE);
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "6"));
-  }
-
-  if ((0 == payload) || (7 == payload)) {
-    if (99 == Settings.timezone) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%d" ), Settings.timezone);
-    } else {
-      snprintf_P(stemp, sizeof(stemp), PSTR("\"%s\"" ), GetTimeZone().c_str());
-    }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
-                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s,\"" D_JSON_SUNRISE "\":\"%s\",\"" D_JSON_SUNSET "\":\"%s\"}}"),
-                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
-                          GetDateAndTime(DT_STD).c_str(), stemp, GetSun(0).c_str(), GetSun(1).c_str());
-#else
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS7_TIME "\":{\"" D_JSON_UTC_TIME "\":\"%s\",\"" D_JSON_LOCAL_TIME "\":\"%s\",\"" D_JSON_STARTDST "\":\"%s\",\""
-                          D_JSON_ENDDST "\":\"%s\",\"" D_CMND_TIMEZONE "\":%s}}"),
-                          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_LOCALNOTZ).c_str(), GetDateAndTime(DT_DST).c_str(),
-                          GetDateAndTime(DT_STD).c_str(), stemp);
-#endif
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "7"));
-  }
-
-#if defined(USE_ENERGY_SENSOR) && defined(USE_ENERGY_MARGIN_DETECTION)
-  if (energy_flg) {
-    if ((0 == payload) || (9 == payload)) {
-      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS9_MARGIN "\":{\"" D_CMND_POWERDELTA "\":%d,\"" D_CMND_POWERLOW "\":%d,\"" D_CMND_POWERHIGH "\":%d,\""
-                            D_CMND_VOLTAGELOW "\":%d,\"" D_CMND_VOLTAGEHIGH "\":%d,\"" D_CMND_CURRENTLOW "\":%d,\"" D_CMND_CURRENTHIGH "\":%d}}"),
-                            Settings.energy_power_delta, Settings.energy_min_power, Settings.energy_max_power,
-                            Settings.energy_min_voltage, Settings.energy_max_voltage, Settings.energy_min_current, Settings.energy_max_current);
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "9"));
-    }
-  }
-#endif
-
-  if ((0 == payload) || (8 == payload) || (10 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS10_SENSOR "\":"));
-    MqttShowSensor();
-    ResponseJsonEnd();
-    if (8 == payload) {
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "8"));
-    } else {
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "10"));
-    }
-  }
-
-  if ((0 == payload) || (11 == payload)) {
-    Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS11_STATUS "\":"));
-    MqttShowState();
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "11"));
-  }
-
-  if (CrashFlag()) {
-    if ((0 == payload) || (12 == payload)) {
-      Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS12_STATUS "\":"));
-      CrashDump();
-      ResponseJsonEnd();
-      MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "12"));
-    }
-  }
-
-#ifdef USE_SCRIPT_STATUS
-  if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">U",2,mqtt_data);
-#endif
-  mqtt_data[0] = '\0';
-}
-
-void CmndState(void)
-{
-  mqtt_data[0] = '\0';
-  MqttShowState();
-  if (Settings.flag3.hass_tele_on_power) {
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
-  }
-#ifdef USE_HOME_ASSISTANT
-  if (Settings.flag.hass_discovery) {
-    HAssPublishStatus();
-  }
-#endif
-}
-
-void CmndTempOffset(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    int value = (int)(CharToFloat(XdrvMailbox.data) * 10);
-    if ((value > -127) && (value < 127)) {
-      Settings.temp_comp = value;
-    }
-  }
-  ResponseCmndFloat((float)(Settings.temp_comp) / 10, 1);
-}
-
-void CmndSleep(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 251)) {
-    Settings.sleep = XdrvMailbox.payload;
-    sleep = XdrvMailbox.payload;
-    WiFiSetSleepMode();
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.sleep, sleep);
-
-}
-
-void CmndUpgrade(void)
-{
-
-
-
-
-  if (((1 == XdrvMailbox.data_len) && (1 == XdrvMailbox.payload)) || ((XdrvMailbox.data_len >= 3) && NewerVersion(XdrvMailbox.data))) {
-    ota_state_flag = 3;
-    char stemp1[TOPSZ];
-    Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, my_version, GetOtaUrl(stemp1, sizeof(stemp1)));
-  } else {
-    Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, my_version);
-  }
-}
-
-void CmndOtaUrl(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_OTAURL, (SC_DEFAULT == Shortcut()) ? OTA_URL : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_OTAURL));
-}
-
-void CmndSeriallog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.flag.mqtt_serial = 0;
-    SetSeriallog(XdrvMailbox.payload);
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, seriallog_level);
-}
-
-void CmndRestart(void)
-{
-  switch (XdrvMailbox.payload) {
-  case 1:
-    restart_flag = 2;
-    ResponseCmndChar(D_JSON_RESTARTING);
-    break;
-  case -1:
-    CmndCrash();
-    break;
-  case -2:
-    CmndWDT();
-    break;
-  case -3:
-    CmndBlockedLoop();
-    break;
-  case 99:
-    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
-    EspRestart();
-    break;
-  default:
-    ResponseCmndChar(D_JSON_ONE_TO_RESTART);
-  }
-}
-
-void CmndPowerOnState(void)
-{
-  if (my_module_type != MOTOR) {
-
-
-
-
-
-
-
-    if ((XdrvMailbox.payload >= POWER_ALL_OFF) && (XdrvMailbox.payload <= POWER_ALL_OFF_PULSETIME_ON)) {
-      Settings.poweronstate = XdrvMailbox.payload;
-      if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-        for (uint32_t i = 1; i <= devices_present; i++) {
-          ExecuteCommandPower(i, POWER_ON, SRC_IGNORE);
-        }
-      }
-    }
-    ResponseCmndNumber(Settings.poweronstate);
-  }
-}
-
-void CmndPulsetime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PULSETIMERS)) {
-    uint32_t items = 1;
-    if (!XdrvMailbox.usridx && !XdrvMailbox.data_len) {
-      items = MAX_PULSETIMERS;
-    } else {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
-        Settings.pulse_timer[XdrvMailbox.index -1] = XdrvMailbox.payload;
-        SetPulseTimer(XdrvMailbox.index -1, XdrvMailbox.payload);
-      }
-    }
-    mqtt_data[0] = '\0';
-    for (uint32_t i = 0; i < items; i++) {
-      uint32_t index = (1 == items) ? XdrvMailbox.index : i +1;
-      ResponseAppend_P(PSTR("%c\"%s%d\":{\"" D_JSON_SET "\":%d,\"" D_JSON_REMAINING "\":%d}"),
-        (i) ? ',' : '{',
-        XdrvMailbox.command, index,
-        Settings.pulse_timer[index -1], GetPulseTimer(index -1));
-    }
-    ResponseJsonEnd();
-  }
-}
-
-void CmndBlinktime(void)
-{
-  if ((XdrvMailbox.payload > 1) && (XdrvMailbox.payload <= 3600)) {
-    Settings.blinktime = XdrvMailbox.payload;
-    if (blink_timer > 0) { blink_timer = millis() + (100 * XdrvMailbox.payload); }
-  }
-  ResponseCmndNumber(Settings.blinktime);
-}
-
-void CmndBlinkcount(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.blinkcount = XdrvMailbox.payload;
-    if (blink_counter) { blink_counter = Settings.blinkcount *2; }
-  }
-  ResponseCmndNumber(Settings.blinkcount);
-}
-
-void CmndSavedata(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3600)) {
-    Settings.save_data = XdrvMailbox.payload;
-    save_data_counter = Settings.save_data;
-  }
-  SettingsSaveAll();
-  char stemp1[TOPSZ];
-  if (Settings.save_data > 1) {
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(D_JSON_EVERY " %d " D_UNIT_SECOND), Settings.save_data);
-  }
-  ResponseCmndChar((Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data));
-}
-
-void CmndSetoption(void)
-{
-  if (XdrvMailbox.index < 114) {
-    uint32_t ptype;
-    uint32_t pindex;
-    if (XdrvMailbox.index <= 31) {
-      ptype = 2;
-      pindex = XdrvMailbox.index;
-    }
-    else if (XdrvMailbox.index <= 49) {
-      ptype = 1;
-      pindex = XdrvMailbox.index -32;
-    }
-    else if (XdrvMailbox.index <= 81) {
-      ptype = 3;
-      pindex = XdrvMailbox.index -50;
-    }
-    else {
-      ptype = 4;
-      pindex = XdrvMailbox.index -82;
-    }
-
-    if (XdrvMailbox.payload >= 0) {
-      if (1 == ptype) {
-        uint32_t param_low = 0;
-        uint32_t param_high = 255;
-        switch (pindex) {
-          case P_HOLD_TIME:
-          case P_MAX_POWER_RETRY:
-            param_low = 1;
-            param_high = 250;
-            break;
-        }
-        if ((XdrvMailbox.payload >= param_low) && (XdrvMailbox.payload <= param_high)) {
-          Settings.param[pindex] = XdrvMailbox.payload;
-#ifdef USE_LIGHT
-          if (P_RGB_REMAP == pindex) {
-            LightUpdateColorMapping();
-            restart_flag = 2;
-          }
-#endif
-#if (defined(USE_IR_REMOTE) && defined(USE_IR_RECEIVE)) || defined(USE_IR_REMOTE_FULL)
-          if (P_IR_UNKNOW_THRESHOLD == pindex) {
-            IrReceiveUpdateThreshold();
-          }
-#endif
-        } else {
-          ptype = 99;
-        }
-      } else {
-        if (XdrvMailbox.payload <= 1) {
-          if (2 == ptype) {
-            switch (pindex) {
-              case 5:
-              case 6:
-              case 7:
-              case 9:
-              case 14:
-              case 22:
-              case 23:
-              case 25:
-              case 27:
-                ptype = 99;
-                break;
-              case 3:
-              case 15:
-                restart_flag = 2;
-              default:
-                bitWrite(Settings.flag.data, pindex, XdrvMailbox.payload);
-            }
-            if (12 == pindex) {
-              stop_flash_rotate = XdrvMailbox.payload;
-              SettingsSave(2);
-            }
-  #ifdef USE_HOME_ASSISTANT
-            if ((19 == pindex) || (30 == pindex)) {
-              HAssDiscover();
-            }
-  #endif
-          }
-          else if (3 == ptype) {
-            bitWrite(Settings.flag3.data, pindex, XdrvMailbox.payload);
-            switch (pindex) {
-              case 5:
-                if (0 == XdrvMailbox.payload) {
-                  restart_flag = 2;
-                }
-                break;
-              case 10:
-                WiFiSetSleepMode();
-                break;
-              case 18:
-              case 25:
-                restart_flag = 2;
-                break;
-            }
-          }
-          else if (4 == ptype) {
-            bitWrite(Settings.flag4.data, pindex, XdrvMailbox.payload);
-          }
-        } else {
-          ptype = 99;
-        }
-      }
-    }
-
-    if (ptype < 99) {
-      if (1 == ptype) {
-        ResponseCmndIdxNumber(Settings.param[pindex]);
-      } else {
-        uint32_t flag = Settings.flag.data;
-        if (3 == ptype) {
-          flag = Settings.flag3.data;
-        }
-        else if (4 == ptype) {
-          flag = Settings.flag4.data;
-        }
-        ResponseCmndIdxChar(GetStateText(bitRead(flag, pindex)));
-      }
-    }
-  }
-}
-
-void CmndTemperatureResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.temperature_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.temperature_resolution);
-}
-
-void CmndHumidityResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.humidity_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.humidity_resolution);
-}
-
-void CmndPressureResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.pressure_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.pressure_resolution);
-}
-
-void CmndPowerResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.wattage_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.wattage_resolution);
-}
-
-void CmndVoltageResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.voltage_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.voltage_resolution);
-}
-
-void CmndFrequencyResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.frequency_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.frequency_resolution);
-}
-
-void CmndCurrentResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.current_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.current_resolution);
-}
-
-void CmndEnergyResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    Settings.flag2.energy_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.energy_resolution);
-}
-
-void CmndWeightResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    Settings.flag2.weight_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.weight_resolution);
-}
-
-void CmndModule(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAXMODULE)) {
-    bool present = false;
-    if (0 == XdrvMailbox.payload) {
-      XdrvMailbox.payload = USER_MODULE;
-      present = true;
-    } else {
-      XdrvMailbox.payload--;
-      present = ValidTemplateModule(XdrvMailbox.payload);
-    }
-    if (present) {
-      Settings.last_module = Settings.module;
-      Settings.module = XdrvMailbox.payload;
-      SetModuleType();
-      if (Settings.last_module != XdrvMailbox.payload) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          Settings.my_gp.io[i] = GPIO_NONE;
-        }
-      }
-      restart_flag = 2;
-    }
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, ModuleNr(), ModuleName().c_str());
-}
-
-void CmndModules(void)
-{
-  uint32_t midx = USER_MODULE;
-  uint32_t lines = 1;
-  bool jsflg = false;
-  for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
-    if (i > 0) { midx = pgm_read_byte(kModuleNiceList + i -1); }
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_MODULES "%d\":{"), lines);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    uint32_t j = i ? midx +1 : 0;
-    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), j, AnyModuleName(midx).c_str()) > (LOGSZ - TOPSZ)) || (i == sizeof(kModuleNiceList))) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
-      jsflg = false;
-      lines++;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-void CmndGpio(void)
-{
-  if (XdrvMailbox.index < sizeof(Settings.my_gp)) {
-    myio cmodule;
-    ModuleGpios(&cmodule);
-    if (ValidGPIO(XdrvMailbox.index, cmodule.io[XdrvMailbox.index]) && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < GPIO_SENSOR_END)) {
-      bool present = false;
-      for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-        uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-        if (midx == XdrvMailbox.payload) { present = true; }
-      }
-      if (present) {
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          if (ValidGPIO(i, cmodule.io[i]) && (Settings.my_gp.io[i] == XdrvMailbox.payload)) {
-            Settings.my_gp.io[i] = GPIO_NONE;
-          }
-        }
-        Settings.my_gp.io[XdrvMailbox.index] = XdrvMailbox.payload;
-        restart_flag = 2;
-      }
-    }
-    Response_P(PSTR("{"));
-    bool jsflg = false;
-    for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-      if (ValidGPIO(i, cmodule.io[i]) || ((GPIO_USER == XdrvMailbox.payload) && !FlashPin(i))) {
-        if (jsflg) { ResponseAppend_P(PSTR(",")); }
-        jsflg = true;
-        uint8_t sensor_type = Settings.my_gp.io[i];
-        if (!ValidGPIO(i, cmodule.io[i])) {
-          sensor_type = cmodule.io[i];
-          if (GPIO_USER == sensor_type) {
-            sensor_type = GPIO_NONE;
-          }
-        }
-        uint8_t sensor_name_idx = sensor_type;
-        const char *sensor_names = kSensorNames;
-        if (sensor_type > GPIO_FIX_START) {
-          sensor_name_idx = sensor_type - GPIO_FIX_START -1;
-          sensor_names = kSensorNamesFixed;
-        }
-        char stemp1[TOPSZ];
-        ResponseAppend_P(PSTR("\"" D_CMND_GPIO "%d\":{\"%d\":\"%s\"}"),
-          i, sensor_type, GetTextIndexed(stemp1, sizeof(stemp1), sensor_name_idx, sensor_names));
-      }
-    }
-    if (jsflg) {
-      ResponseJsonEnd();
-    } else {
-      ResponseCmndChar(D_JSON_NOT_SUPPORTED);
-    }
-  }
-}
-
-void CmndGpios(void)
-{
-  myio cmodule;
-  ModuleGpios(&cmodule);
-  uint32_t lines = 1;
-  bool jsflg = false;
-  for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-    uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-    if ((XdrvMailbox.payload != 255) && GetUsedInModule(midx, cmodule.io)) { continue; }
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_GPIOS "%d\":{"), lines);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    char stemp1[TOPSZ];
-    if ((ResponseAppend_P(PSTR("\"%d\":\"%s\""), midx, GetTextIndexed(stemp1, sizeof(stemp1), midx, kSensorNames)) > (LOGSZ - TOPSZ)) || (i == sizeof(kGpioNiceList) -1)) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, UpperCase(XdrvMailbox.command, XdrvMailbox.command));
-      jsflg = false;
-      lines++;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-void CmndTemplate(void)
-{
-
-  bool error = false;
-
-  if (strstr(XdrvMailbox.data, "{") == nullptr) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= MAXMODULE)) {
-      XdrvMailbox.payload--;
-      if (ValidTemplateModule(XdrvMailbox.payload)) {
-        ModuleDefault(XdrvMailbox.payload);
-        if (USER_MODULE == Settings.module) { restart_flag = 2; }
-      }
-    }
-    else if (0 == XdrvMailbox.payload) {
-      if (Settings.module != USER_MODULE) {
-        ModuleDefault(Settings.module);
-      }
-    }
-    else if (255 == XdrvMailbox.payload) {
-      if (Settings.module != USER_MODULE) {
-        ModuleDefault(Settings.module);
-      }
-      snprintf_P(Settings.user_template.name, sizeof(Settings.user_template.name), PSTR("Merged"));
-      uint32_t j = 0;
-      for (uint32_t i = 0; i < sizeof(mycfgio); i++) {
-        if (6 == i) { j = 9; }
-        if (8 == i) { j = 12; }
-        if (my_module.io[j] > GPIO_NONE) {
-          Settings.user_template.gp.io[i] = my_module.io[j];
-        }
-        j++;
-      }
-    }
-  }
-  else {
-    if (JsonTemplate(XdrvMailbox.data)) {
-      if (USER_MODULE == Settings.module) { restart_flag = 2; }
-    } else {
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      error = true;
-    }
-  }
-  if (!error) { TemplateJson(); }
-}
-
-void CmndPwm(void)
-{
-  if (pwm_present && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_PWMS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= Settings.pwm_range) && (pin[GPIO_PWM1 + XdrvMailbox.index -1] < 99)) {
-      Settings.pwm_value[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      analogWrite(pin[GPIO_PWM1 + XdrvMailbox.index -1], bitRead(pwm_inverted, XdrvMailbox.index -1) ? Settings.pwm_range - XdrvMailbox.payload : XdrvMailbox.payload);
-    }
-    Response_P(PSTR("{"));
-    MqttShowPWMState();
-    ResponseJsonEnd();
-  }
-}
-
-void CmndPwmfrequency(void)
-{
-  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload >= PWM_MIN) && (XdrvMailbox.payload <= PWM_MAX))) {
-    Settings.pwm_frequency = (1 == XdrvMailbox.payload) ? PWM_FREQ : XdrvMailbox.payload;
-    analogWriteFreq(Settings.pwm_frequency);
-  }
-  ResponseCmndNumber(Settings.pwm_frequency);
-}
-
-void CmndPwmrange(void)
-{
-  if ((1 == XdrvMailbox.payload) || ((XdrvMailbox.payload > 254) && (XdrvMailbox.payload < 1024))) {
-    Settings.pwm_range = (1 == XdrvMailbox.payload) ? PWM_RANGE : XdrvMailbox.payload;
-    for (uint32_t i = 0; i < MAX_PWMS; i++) {
-      if (Settings.pwm_value[i] > Settings.pwm_range) {
-        Settings.pwm_value[i] = Settings.pwm_range;
-      }
-    }
-    analogWriteRange(Settings.pwm_range);
-  }
-  ResponseCmndNumber(Settings.pwm_range);
-}
-
-void CmndButtonDebounce(void)
-{
-  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
-    Settings.button_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.button_debounce);
-}
-
-void CmndSwitchDebounce(void)
-{
-  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
-    Settings.switch_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.switch_debounce);
-}
-
-void CmndBaudrate(void)
-{
-  if (XdrvMailbox.payload >= 300) {
-    XdrvMailbox.payload /= 300;
-    uint32_t baudrate = (XdrvMailbox.payload & 0xFFFF) * 300;
-    SetSerialBaudrate(baudrate);
-  }
-  ResponseCmndNumber(Settings.baudrate * 300);
-}
-
-void CmndSerialConfig(void)
-{
-
-
-
-
-  if (XdrvMailbox.data_len > 0) {
-    if (XdrvMailbox.data_len < 3) {
-      if ((XdrvMailbox.payload >= TS_SERIAL_5N1) && (XdrvMailbox.payload <= TS_SERIAL_8O2)) {
-        SetSerialConfig(XdrvMailbox.payload);
-      }
-    }
-    else if ((XdrvMailbox.payload >= 5) && (XdrvMailbox.payload <= 8)) {
-      uint8_t serial_config = XdrvMailbox.payload -5;
-
-      bool valid = true;
-      char parity = (XdrvMailbox.data[1] & 0xdf);
-      if ('E' == parity) {
-        serial_config += 0x08;
-      }
-      else if ('O' == parity) {
-        serial_config += 0x10;
-      }
-      else if ('N' != parity) {
-        valid = false;
-      }
-
-      if ('2' == XdrvMailbox.data[2]) {
-        serial_config += 0x04;
-      }
-      else if ('1' != XdrvMailbox.data[2]) {
-        valid = false;
-      }
-
-      if (valid) {
-        SetSerialConfig(serial_config);
-      }
-    }
-  }
-  ResponseCmndChar(GetSerialConfig().c_str());
-}
-
-void CmndSerialSend(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
-    SetSeriallog(LOG_LEVEL_NONE);
-    Settings.flag.mqtt_serial = 1;
-    Settings.flag.mqtt_serial_raw = (XdrvMailbox.index > 3) ? 1 : 0;
-    if (XdrvMailbox.data_len > 0) {
-      if (1 == XdrvMailbox.index) {
-        Serial.printf("%s\n", XdrvMailbox.data);
-      }
-      else if (2 == XdrvMailbox.index || 4 == XdrvMailbox.index) {
-        for (uint32_t i = 0; i < XdrvMailbox.data_len; i++) {
-          Serial.write(XdrvMailbox.data[i]);
-        }
-      }
-      else if (3 == XdrvMailbox.index) {
-        uint32_t dat_len = XdrvMailbox.data_len;
-        Serial.printf("%s", Unescape(XdrvMailbox.data, &dat_len));
-      }
-      else if (5 == XdrvMailbox.index) {
-        SerialSendRaw(RemoveSpace(XdrvMailbox.data));
-      }
-      ResponseCmndDone();
-    }
-  }
-}
-
-void CmndSerialDelimiter(void)
-{
-  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload < 256)) {
-    if (XdrvMailbox.payload > 0) {
-      Settings.serial_delimiter = XdrvMailbox.payload;
-    } else {
-      uint32_t dat_len = XdrvMailbox.data_len;
-      Unescape(XdrvMailbox.data, &dat_len);
-      Settings.serial_delimiter = XdrvMailbox.data[0];
-    }
-  }
-  ResponseCmndNumber(Settings.serial_delimiter);
-}
-
-void CmndSyslog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    SetSyslog(XdrvMailbox.payload);
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.syslog_level, syslog_level);
-}
-
-void CmndLoghost(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_SYSLOG_HOST, (SC_DEFAULT == Shortcut()) ? SYS_LOG_HOST : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_SYSLOG_HOST));
-}
-
-void CmndLogport(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.syslog_port = (1 == XdrvMailbox.payload) ? SYS_LOG_PORT : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.syslog_port);
-}
-
-void CmndIpAddress(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    uint32_t address;
-    if (ParseIp(&address, XdrvMailbox.data)) {
-      Settings.ip_address[XdrvMailbox.index -1] = address;
-
-    }
-    char stemp1[TOPSZ];
-    snprintf_P(stemp1, sizeof(stemp1), PSTR(" (%s)"), WiFi.localIP().toString().c_str());
-    Response_P(S_JSON_COMMAND_INDEX_SVALUE_SVALUE, XdrvMailbox.command, XdrvMailbox.index, IPAddress(Settings.ip_address[XdrvMailbox.index -1]).toString().c_str(), (1 == XdrvMailbox.index) ? stemp1:"");
-  }
-}
-
-void CmndNtpServer(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_NTP_SERVERS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_NTPSERVER1, MAX_NTP_SERVERS);
-    } else {
-      uint32_t ntp_server = SET_NTPSERVER1 + XdrvMailbox.index -1;
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(ntp_server,
-          (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? NTP_SERVER1 : (2 == XdrvMailbox.index) ? NTP_SERVER2 : NTP_SERVER3 : XdrvMailbox.data);
-        SettingsUpdateText(ntp_server, ReplaceCommaWithDot(SettingsText(ntp_server)));
-
-        ntp_force_sync = true;
-      }
-      ResponseCmndIdxChar(SettingsText(ntp_server));
-    }
-  }
-}
-
-void CmndAp(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    switch (XdrvMailbox.payload) {
-    case 0:
-      Settings.sta_active ^= 1;
-      break;
-    case 1:
-    case 2:
-      Settings.sta_active = XdrvMailbox.payload -1;
-    }
-    restart_flag = 2;
-  }
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active));
-}
-
-void CmndSsid(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SSIDS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_STASSID1, MAX_SSIDS);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(SET_STASSID1 + XdrvMailbox.index -1,
-                (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_SSID1 : STA_SSID2 : XdrvMailbox.data);
-        Settings.sta_active = XdrvMailbox.index -1;
-        restart_flag = 2;
-      }
-      ResponseCmndIdxChar(SettingsText(SET_STASSID1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndPassword(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    if ((XdrvMailbox.data_len > 4) || (SC_CLEAR == Shortcut()) || (SC_DEFAULT == Shortcut())) {
-      SettingsUpdateText(SET_STAPWD1 + XdrvMailbox.index -1,
-              (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? STA_PASS1 : STA_PASS2 : XdrvMailbox.data);
-      Settings.sta_active = XdrvMailbox.index -1;
-      restart_flag = 2;
-      ResponseCmndIdxChar(SettingsText(SET_STAPWD1 + XdrvMailbox.index -1));
-    } else {
-      Response_P(S_JSON_COMMAND_INDEX_ASTERISK, XdrvMailbox.command, XdrvMailbox.index);
-    }
-  }
-}
-
-void CmndHostname(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    SettingsUpdateText(SET_HOSTNAME, (SC_DEFAULT == Shortcut()) ? WIFI_HOSTNAME : XdrvMailbox.data);
-    if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-      SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-    }
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_HOSTNAME));
-}
-
-void CmndWifiConfig(void)
-{
-  if ((XdrvMailbox.payload >= WIFI_RESTART) && (XdrvMailbox.payload < MAX_WIFI_OPTION)) {
-    if ((EX_WIFI_SMARTCONFIG == XdrvMailbox.payload) || (EX_WIFI_WPSCONFIG == XdrvMailbox.payload)) {
-      XdrvMailbox.payload = WIFI_MANAGER;
-    }
-    Settings.sta_config = XdrvMailbox.payload;
-    wifi_state_flag = Settings.sta_config;
-    if (WifiState() > WIFI_RESTART) {
-      restart_flag = 2;
-    }
-  }
-  char stemp1[TOPSZ];
-  Response_P(S_JSON_COMMAND_NVALUE_SVALUE, XdrvMailbox.command, Settings.sta_config, GetTextIndexed(stemp1, sizeof(stemp1), Settings.sta_config, kWifiConfig));
-}
-
-void CmndFriendlyname(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_FRIENDLYNAMES)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_FRIENDLYNAME1, MAX_FRIENDLYNAMES);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        char stemp1[TOPSZ];
-        if (1 == XdrvMailbox.index) {
-          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME));
-        } else {
-          snprintf_P(stemp1, sizeof(stemp1), PSTR(FRIENDLY_NAME "%d"), XdrvMailbox.index);
-        }
-        SettingsUpdateText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : (SC_DEFAULT == Shortcut()) ? stemp1 : XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_FRIENDLYNAME1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndSwitchMode(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SWITCHES)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_SWITCH_OPTION)) {
-      Settings.switchmode[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.switchmode[XdrvMailbox.index-1]);
-  }
-}
-
-void CmndInterlock(void)
-{
-
-  uint32_t max_relays = devices_present;
-  if (light_type) { max_relays--; }
-  if (max_relays > sizeof(Settings.interlock[0]) * 8) { max_relays = sizeof(Settings.interlock[0]) * 8; }
-  if (max_relays > 1) {
-    if (XdrvMailbox.data_len > 0) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
-        char *group;
-        char *q;
-        uint32_t group_index = 0;
-        power_t relay_mask = 0;
-        for (group = strtok_r(XdrvMailbox.data, " ", &q); group && group_index < MAX_INTERLOCKS; group = strtok_r(nullptr, " ", &q)) {
-          char *str;
-          char *p;
-          for (str = strtok_r(group, ",", &p); str; str = strtok_r(nullptr, ",", &p)) {
-            int pbit = atoi(str);
-            if ((pbit > 0) && (pbit <= max_relays)) {
-              pbit--;
-              if (!bitRead(relay_mask, pbit)) {
-                bitSet(relay_mask, pbit);
-                bitSet(Settings.interlock[group_index], pbit);
-              }
-            }
-          }
-          group_index++;
-        }
-        for (uint32_t i = 0; i < group_index; i++) {
-          uint32_t minimal_bits = 0;
-          for (uint32_t j = 0; j < max_relays; j++) {
-            if (bitRead(Settings.interlock[i], j)) { minimal_bits++; }
-          }
-          if (minimal_bits < 2) { Settings.interlock[i] = 0; }
-        }
-      } else {
-        Settings.flag.interlock = XdrvMailbox.payload &1;
-        if (Settings.flag.interlock) {
-          SetDevicePower(power, SRC_IGNORE);
-        }
-      }
-#ifdef USE_SHUTTER
-      if (Settings.flag3.shutter_mode) {
-        ShutterInit();
-      }
-#endif
-    }
-    Response_P(PSTR("{\"" D_CMND_INTERLOCK "\":\"%s\",\"" D_JSON_GROUPS "\":\""), GetStateText(Settings.flag.interlock));
-    uint32_t anygroup = 0;
-    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-      if (Settings.interlock[i]) {
-        anygroup++;
-        ResponseAppend_P(PSTR("%s"), (anygroup > 1) ? " " : "");
-        uint32_t anybit = 0;
-        power_t mask = 1;
-        for (uint32_t j = 0; j < max_relays; j++) {
-          if (Settings.interlock[i] & mask) {
-            anybit++;
-            ResponseAppend_P(PSTR("%s%d"), (anybit > 1) ? "," : "", j +1);
-          }
-          mask <<= 1;
-        }
-      }
-    }
-    if (!anygroup) {
-      for (uint32_t j = 1; j <= max_relays; j++) {
-        ResponseAppend_P(PSTR("%s%d"), (j > 1) ? "," : "", j);
-      }
-    }
-    ResponseAppend_P(PSTR("\"}"));
-  } else {
-    Settings.flag.interlock = 0;
-    ResponseCmndStateText(Settings.flag.interlock);
-  }
-}
-
-void CmndTeleperiod(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.tele_period = (1 == XdrvMailbox.payload) ? TELE_PERIOD : XdrvMailbox.payload;
-    if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) Settings.tele_period = 10;
-    tele_period = Settings.tele_period;
-  }
-  ResponseCmndNumber(Settings.tele_period);
-}
-
-void CmndReset(void)
-{
-  switch (XdrvMailbox.payload) {
-  case 1:
-    restart_flag = 211;
-    ResponseCmndChar(D_JSON_RESET_AND_RESTARTING);
-    break;
-  case 2 ... 6:
-    restart_flag = 210 + XdrvMailbox.payload;
-    Response_P(PSTR("{\"" D_CMND_RESET "\":\"" D_JSON_ERASE ", " D_JSON_RESET_AND_RESTARTING "\"}"));
-    break;
-  case 99:
-    Settings.bootcount = 0;
-    Settings.bootcount_reset_time = 0;
-    ResponseCmndDone();
-    break;
-  default:
-    ResponseCmndChar(D_JSON_ONE_TO_RESET);
-  }
-}
-
-void CmndTime(void)
-{
-
-
-
-
-
-
-
-  uint32_t format = Settings.flag2.time_format;
-  if (XdrvMailbox.data_len > 0) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
-      Settings.flag2.time_format = XdrvMailbox.payload -1;
-      format = Settings.flag2.time_format;
-    } else {
-      format = 1;
-      RtcSetTime(XdrvMailbox.payload);
-    }
-  }
-  mqtt_data[0] = '\0';
-  ResponseAppendTimeFormat(format);
-  ResponseJsonEnd();
-}
-
-void CmndTimezone(void)
-{
-  if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.payload >= -13)) {
-    Settings.timezone = XdrvMailbox.payload;
-    Settings.timezone_minutes = 0;
-    if (XdrvMailbox.payload < 15) {
-      char *p = strtok (XdrvMailbox.data, ":");
-      if (p) {
-        p = strtok (nullptr, ":");
-        if (p) {
-          Settings.timezone_minutes = strtol(p, nullptr, 10);
-          if (Settings.timezone_minutes > 59) { Settings.timezone_minutes = 59; }
-        }
-      }
-    } else {
-      Settings.timezone = 99;
-    }
-    ntp_force_sync = true;
-  }
-  if (99 == Settings.timezone) {
-    ResponseCmndNumber(Settings.timezone);
-  } else {
-    char stemp1[TOPSZ];
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("%+03d:%02d"), Settings.timezone, Settings.timezone_minutes);
-    ResponseCmndChar(stemp1);
-  }
-}
-
-void CmndTimeStdDst(uint32_t ts)
-{
-
-  if (XdrvMailbox.data_len > 0) {
-    if (strstr(XdrvMailbox.data, ",") != nullptr) {
-      uint32_t tpos = 0;
-      int value = 0;
-      char *p = XdrvMailbox.data;
-      char *q = p;
-      while (p && (tpos < 7)) {
-        if (p > q) {
-          if (1 == tpos) { Settings.tflag[ts].hemis = value &1; }
-          if (2 == tpos) { Settings.tflag[ts].week = (value < 0) ? 0 : (value > 4) ? 4 : value; }
-          if (3 == tpos) { Settings.tflag[ts].month = (value < 1) ? 1 : (value > 12) ? 12 : value; }
-          if (4 == tpos) { Settings.tflag[ts].dow = (value < 1) ? 1 : (value > 7) ? 7 : value; }
-          if (5 == tpos) { Settings.tflag[ts].hour = (value < 0) ? 0 : (value > 23) ? 23 : value; }
-          if (6 == tpos) { Settings.toffset[ts] = (value < -900) ? -900 : (value > 900) ? 900 : value; }
-        }
-        p = Trim(p);
-        if (tpos && (*p == ',')) { p++; }
-        p = Trim(p);
-        q = p;
-        value = strtol(p, &p, 10);
-        tpos++;
-      }
-      ntp_force_sync = true;
-    } else {
-      if (0 == XdrvMailbox.payload) {
-        if (0 == ts) {
-          SettingsResetStd();
-        } else {
-          SettingsResetDst();
-        }
-      }
-      ntp_force_sync = true;
-    }
-  }
-  Response_P(PSTR("{\"%s\":{\"Hemisphere\":%d,\"Week\":%d,\"Month\":%d,\"Day\":%d,\"Hour\":%d,\"Offset\":%d}}"),
-    XdrvMailbox.command, Settings.tflag[ts].hemis, Settings.tflag[ts].week, Settings.tflag[ts].month, Settings.tflag[ts].dow, Settings.tflag[ts].hour, Settings.toffset[ts]);
-}
-
-void CmndTimeStd(void)
-{
-  CmndTimeStdDst(0);
-}
-
-void CmndTimeDst(void)
-{
-  CmndTimeStdDst(1);
-}
-
-void CmndAltitude(void)
-{
-  if ((XdrvMailbox.data_len > 0) && ((XdrvMailbox.payload >= -30000) && (XdrvMailbox.payload <= 30000))) {
-    Settings.altitude = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.altitude);
-}
-
-void CmndLedPower(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_LEDS)) {
-    if (99 == pin[GPIO_LEDLNK]) { XdrvMailbox.index = 1; }
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-      Settings.ledstate &= 8;
-      uint32_t mask = 1 << (XdrvMailbox.index -1);
-      switch (XdrvMailbox.payload) {
-      case 0:
-        led_power &= (0xFF ^ mask);
-        Settings.ledstate = 0;
-        break;
-      case 1:
-        led_power |= mask;
-        Settings.ledstate = 8;
-        break;
-      case 2:
-        led_power ^= mask;
-        Settings.ledstate ^= 8;
-        break;
-      }
-      blinks = 0;
-      if (99 == pin[GPIO_LEDLNK]) {
-        SetLedPower(Settings.ledstate &8);
-      } else {
-        SetLedPowerIdx(XdrvMailbox.index -1, (led_power & mask));
-      }
-    }
-    bool state = bitRead(led_power, XdrvMailbox.index -1);
-    if (99 == pin[GPIO_LEDLNK]) {
-      state = bitRead(Settings.ledstate, 3);
-    }
-    ResponseCmndIdxChar(GetStateText(state));
-  }
-}
-
-void CmndLedState(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_LED_OPTION)) {
-    Settings.ledstate = XdrvMailbox.payload;
-    if (!Settings.ledstate) {
-      SetLedPowerAll(0);
-      SetLedLink(0);
-    }
-  }
-  ResponseCmndNumber(Settings.ledstate);
-}
-
-void CmndLedMask(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Settings.ledmask = XdrvMailbox.payload;
-  }
-  char stemp1[TOPSZ];
-  snprintf_P(stemp1, sizeof(stemp1), PSTR("%d (0x%04X)"), Settings.ledmask, Settings.ledmask);
-  ResponseCmndChar(stemp1);
-}
-
-void CmndWifiPower(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Settings.wifi_output_power = (uint8_t)(CharToFloat(XdrvMailbox.data) * 10);
-    if (Settings.wifi_output_power > 205) {
-      Settings.wifi_output_power = 205;
-    }
-    WifiSetOutputPower();
-  }
-  ResponseCmndChar(WifiGetOutputPower().c_str());
-}
-
-#ifdef USE_I2C
-void CmndI2cScan(void)
-{
-  if (i2c_flg) {
-    I2cScan(mqtt_data, sizeof(mqtt_data));
-  }
-}
-
-void CmndI2cDriver(void)
-{
-  if (XdrvMailbox.index < MAX_I2C_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.i2c_drivers[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-      restart_flag = 2;
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_I2CDRIVER "\":"));
-  I2cDriverState();
-  ResponseJsonEnd();
-}
-#endif
-
-#ifdef USE_DEVICE_GROUPS
-void CmndDevGroupShare(void)
-{
-  uint32_t parm[2] = { Settings.device_group_share_in, Settings.device_group_share_out };
-  ParseParameters(2, parm);
-  Settings.device_group_share_in = parm[0];
-  Settings.device_group_share_out = parm[1];
-  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%x,\"Out\":%x}}"), Settings.device_group_share_in, Settings.device_group_share_out);
-}
-#endif
-
-void CmndSensor(void)
-{
-  XsnsCall(FUNC_COMMAND_SENSOR);
-}
-
-void CmndDriver(void)
-{
-  XdrvCall(FUNC_COMMAND_DRIVER);
-}
-# 1 "S:/Development/Tasmota/tasmota/support_crash_recorder.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_crash_recorder.ino"
-const uint32_t crash_magic = 0x53415400;
-const uint32_t crash_rtc_offset = 32;
-const uint32_t crash_dump_max_len = 31;
-
-
-
-
-
-
-extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack, uint32_t stack_end )
-{
-  uint32_t addr_written = 0;
-  uint32_t value;
-
-  for (uint32_t i = stack; i < stack_end; i += 4) {
-    value = *((uint32_t*) i);
-    if ((value >= 0x40000000) && (value < 0x40300000)) {
-      ESP.rtcUserMemoryWrite(crash_rtc_offset + addr_written, (uint32_t*)&value, sizeof(value));
-      addr_written++;
-      if (addr_written >= crash_dump_max_len) { break; }
-    }
-  }
-  value = crash_magic + addr_written;
-  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-}
-
-
-void CmndCrash(void)
-{
-  volatile uint32_t dummy;
-  dummy = *((uint32_t*) 0x00000000);
-}
-
-
-void CmndWDT(void)
-{
-  volatile uint32_t dummy = 0;
-  while (1) {
-    dummy++;
-  }
-}
-
-
-void CmndBlockedLoop(void)
-{
-  while (1) {
-    delay(1000);
-  }
-}
-
-
-void CrashDumpClear(void)
-{
-  uint32_t value = 0;
-  ESP.rtcUserMemoryWrite(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-}
-
-
-
-
-
-bool CrashFlag(void)
-{
-  return ((ResetReason() == REASON_EXCEPTION_RST) || (ResetReason() == REASON_SOFT_WDT_RST) || oswatch_blocked_loop);
-}
-
-void CrashDump(void)
-{
-  ResponseAppend_P(PSTR("{\"Exception\":%d,\"Reason\":\"%s\",\"EPC\":[\"%08x\",\"%08x\",\"%08x\"],\"EXCVADDR\":\"%08x\",\"DEPC\":\"%08x\""),
-    resetInfo.exccause,
-    GetResetReason().c_str(),
-    resetInfo.epc1,
-    resetInfo.epc2,
-    resetInfo.epc3,
-    resetInfo.excvaddr,
-    resetInfo.depc);
-
-  uint32_t value;
-  ESP.rtcUserMemoryRead(crash_rtc_offset + crash_dump_max_len, (uint32_t*)&value, sizeof(value));
-  if (crash_magic == (value & 0xFFFFFF00)) {
-    ResponseAppend_P(PSTR(",\"CallChain\":["));
-    uint32_t count = value & 0x3F;
-    for (uint32_t i = 0; i < count; i++) {
-      ESP.rtcUserMemoryRead(crash_rtc_offset +i, (uint32_t*)&value, sizeof(value));
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"%08x\""), value);
-    }
-    ResponseAppend_P(PSTR("]"));
-  }
-
-  ResponseJsonEnd();
-}
-# 1 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
-# 23 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
-#ifdef USE_DEVICE_GROUPS
-
-
-
-extern bool udp_connected;
-
-struct device_group_member {
-  struct device_group_member * flink;
-  IPAddress ip_address;
-  uint32_t timeout_time;
-  uint16_t received_sequence;
-  uint16_t acked_sequence;
-};
-
-struct device_group {
-  uint32_t next_ack_check_time;
-  uint16_t last_full_status_sequence;
-  uint16_t message_length;
-  uint8_t message_header_length;
-  uint8_t initial_status_requests_remaining;
-  bool local;
-  char group_name[TOPSZ];
-  char message[128];
-  uint8_t group_member_count;
-  struct device_group_member * device_group_members;
-};
-
-struct device_group * device_groups;
-uint16_t outgoing_sequence = 0;
-bool device_groups_initialized = false;
-bool device_groups_initialization_failed = false;
-bool building_status_message = false;
-bool processing_remote_device_message = false;
-bool waiting_for_acks;
-bool udp_was_connected = false;
-
-void DeviceGroupsInit(void)
-{
-
-  device_groups = (struct device_group *)calloc(device_group_count, sizeof(struct device_group));
-  if (device_groups == nullptr) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating %u-element device group array"), device_group_count);
-    device_groups_initialization_failed = true;
-    return;
-  }
-
-  for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
-    struct device_group * device_group = &device_groups[device_group_index];
-    strcpy(device_group->group_name, SettingsText((device_group_index == 0 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + device_group_index - 1)));
-    device_group->message_header_length = sprintf_P(device_group->message, PSTR("%s%s HTTP/1.1\n\n"), kDeviceGroupMessage, device_group->group_name);
-    device_group->last_full_status_sequence = -1;
-  }
-
-  device_groups[0].local = true;
-
-
-  if (!Settings.device_group_share_in && !Settings.device_group_share_out) {
-    Settings.device_group_share_in = Settings.device_group_share_out = 0xffffffff;
-  }
-
-  device_groups_initialized = true;
-}
-
-char * IPAddressToString(const IPAddress& ip_address)
-{
-  static char buffer[16];
-  sprintf_P(buffer, PSTR("%u.%u.%u.%u"), ip_address[0], ip_address[1], ip_address[2], ip_address[3]);
-  return buffer;
-}
-
-
-bool DeviceGroupItemShared(bool incoming, uint8_t item)
-{
-  uint8_t mask = 0;
-  switch (item) {
-    case DGR_ITEM_LIGHT_BRI:
-      mask = DGR_SHARE_LIGHT_BRI;
-      break;
-    case DGR_ITEM_POWER:
-      mask = DGR_SHARE_POWER;
-      break;
-    case DGR_ITEM_LIGHT_SCHEME:
-      mask = DGR_SHARE_LIGHT_SCHEME;
-      break;
-    case DGR_ITEM_LIGHT_FIXED_COLOR:
-    case DGR_ITEM_LIGHT_CHANNELS:
-      mask = DGR_SHARE_LIGHT_COLOR;
-      break;
-    case DGR_ITEM_LIGHT_FADE:
-    case DGR_ITEM_LIGHT_SPEED:
-      mask = DGR_SHARE_LIGHT_FADE;
-      break;
-    case DGR_ITEM_BRI_MIN:
-      mask = DGR_SHARE_BRI_MIN;
-      break;
-  }
-  return (!mask || ((incoming ? Settings.device_group_share_in : Settings.device_group_share_out) & mask));
-}
-
-void SendDeviceGroupPacket(IPAddress ip, char * packet, int len, const char * label)
-{
-  for (int attempt = 1; attempt <= 5; attempt++) {
-    if (PortUdp.beginPacket(ip, 1900)) {
-      PortUdp.write(packet, len);
-      if (PortUdp.endPacket()) return;
-    }
-    delay(10);
-  }
-  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error sending %s packet"), label);
-}
-
-void _SendDeviceGroupMessage(uint8_t device_group_index, DeviceGroupMessageType message_type, ...)
-{
-
-  if (!Settings.flag4.device_groups_enabled) return;
-
-
-  if (!udp_connected) return;
-
-
-  if (processing_remote_device_message) return;
-
-
-  device_group * device_group = &device_groups[device_group_index];
-
-
-  if (device_group->initial_status_requests_remaining) return;
-
-
-
-
-  char * message_ptr = &device_group->message[device_group->message_header_length];
-  if (message_type == DGR_MSGTYP_FULL_STATUS) {
-
-
-
-    building_status_message = true;
-
-
-    if (!++outgoing_sequence) outgoing_sequence = 1;
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s full status packet"), device_group->group_name);
-#endif
-    device_group->message_length = 0;
-    SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_POWER, power);
-    XdrvMailbox.command_code = DGR_ITEM_STATUS;
-    XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
-    building_status_message = false;
-
-
-    if (!device_group->message_length) {
-      if (!--outgoing_sequence) outgoing_sequence = -1;
-      return;
-    }
-    device_group->last_full_status_sequence = outgoing_sequence;
-
-
-    *(message_ptr + 2) |= DGR_FLAG_FULL_STATUS;
-  }
-
-  else {
-    bool shared;
-    uint8_t item;
-    uint32_t value;
-    uint8_t * value_ptr;
-    va_list ap;
-
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Building device group %s packet"), device_group->group_name);
-#endif
-    uint16_t original_sequence = outgoing_sequence;
-    if (!building_status_message && message_type != DGR_MSGTYP_PARTIAL_UPDATE && !++outgoing_sequence) outgoing_sequence = 1;
-    *message_ptr++ = outgoing_sequence & 0xff;
-    *message_ptr++ = outgoing_sequence >> 8;
-
-    value = 0;
-    if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME)
-      value |= DGR_FLAG_MORE_TO_COME;
-    else if (message_type == DGR_MSGTYP_UPDATE_DIRECT)
-      value |= DGR_FLAG_DIRECT;
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">sequence=%u, flags=%u"), outgoing_sequence, value);
-#endif
-    *message_ptr++ = value & 0xff;
-    *message_ptr++ = value >> 8;
-    char * first_item_ptr = message_ptr;
-
-
-
-
-
-    if (device_group->message_length) {
-      uint8_t item_array[32];
-      int item_index = 0;
-      int kept_item_count = 0;
-
-
-      va_start(ap, message_type);
-      while ((item = va_arg(ap, int))) {
-        item_array[item_index++] = item;
-        if (item <= DGR_ITEM_MAX_32BIT)
-          va_arg(ap, int);
-        else if (item <= DGR_ITEM_MAX_STRING)
-          va_arg(ap, char *);
-        else {
-          switch (item) {
-            case DGR_ITEM_LIGHT_CHANNELS:
-              va_arg(ap, uint8_t *) ;
-              break;
-          }
-        }
-      }
-      va_end(ap);
-      item_array[item_index] = 0;
-
-
-
-      char * previous_message_ptr = message_ptr;
-      while (item = *previous_message_ptr++) {
-
-
-        for (item_index = 0; item_array[item_index]; item_index++) {
-          if (item_array[item_index] == item) break;
-        }
-
-
-        if (item_array[item_index]) {
-          if (item <= DGR_ITEM_MAX_32BIT) {
-            previous_message_ptr++;
-            if (item > DGR_ITEM_MAX_8BIT) {
-              previous_message_ptr++;
-              if (item > DGR_ITEM_MAX_16BIT) {
-                previous_message_ptr++;
-                previous_message_ptr++;
-              }
-            }
-          }
-          else if (item <= DGR_ITEM_MAX_STRING)
-            previous_message_ptr += *previous_message_ptr++;
-          else {
-            switch (item) {
-              case DGR_ITEM_LIGHT_CHANNELS:
-                previous_message_ptr += 5;
-                break;
-            }
-          }
-        }
-
-
-        else {
-          *message_ptr++ = item;
-          if (item <= DGR_ITEM_MAX_32BIT) {
-            *message_ptr++ = *previous_message_ptr++;
-            if (item > DGR_ITEM_MAX_8BIT) {
-              *message_ptr++ = *previous_message_ptr++;
-              if (item > DGR_ITEM_MAX_16BIT) {
-                *message_ptr++ = *previous_message_ptr++;
-                *message_ptr++ = *previous_message_ptr++;
-              }
-            }
-          }
-          else if (item <= DGR_ITEM_MAX_STRING) {
-            *message_ptr++ = value = *previous_message_ptr++;
-            memmove(message_ptr, previous_message_ptr, value);
-            previous_message_ptr += value;
-            message_ptr += value;
-          }
-          else {
-            switch (item) {
-              case DGR_ITEM_LIGHT_CHANNELS:
-                memmove(message_ptr, previous_message_ptr, 5);
-                previous_message_ptr += 5;
-                message_ptr += 5;
-                break;
-            }
-          }
-          kept_item_count++;
-        }
-      }
-#ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%u items carried over from previous update"), kept_item_count);
-#endif
-    }
-
-
-    va_start(ap, message_type);
-    while ((item = va_arg(ap, int))) {
-      shared = DeviceGroupItemShared(false, item);
-      if (shared) *message_ptr++ = item;
-      if (item <= DGR_ITEM_MAX_32BIT) {
-        value = va_arg(ap, int);
-        if (shared) {
-#ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u"), item, value);
-#endif
-          *message_ptr++ = value & 0xff;
-          if (item > DGR_ITEM_MAX_8BIT) {
-            value >>= 8;
-            *message_ptr++ = value & 0xff;
-          }
-          if (item > DGR_ITEM_MAX_16BIT) {
-            value >>= 8;
-            *message_ptr++ = value & 0xff;
-            *message_ptr++ = value >> 8;
-          }
-        }
-      }
-      else if (item <= DGR_ITEM_MAX_STRING) {
-        value_ptr = va_arg(ap, uint8_t *);
-        if (shared) {
-          value = strlen((const char *)value_ptr);
-#ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%s"), item, value_ptr);
-#endif
-          *message_ptr++ = value;
-          memcpy(message_ptr, value_ptr, value);
-          message_ptr += value;
-        }
-      }
-      else {
-        switch (item) {
-          case DGR_ITEM_LIGHT_CHANNELS:
-            value_ptr = va_arg(ap, uint8_t *);
-            if (shared) {
-#ifdef DEVICE_GROUPS_DEBUG
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(">item=%u, value=%u,%u,%u,%u,%u"), item, *value_ptr, *(value_ptr + 1), *(value_ptr + 2), *(value_ptr + 3), *(value_ptr + 4));
-#endif
-              memmove(message_ptr, value_ptr, 5);
-              message_ptr += 5;
-            }
-            break;
-        }
-      }
-    }
-    va_end(ap);
-
-
-
-    if (message_ptr == first_item_ptr) {
-      outgoing_sequence = original_sequence;
-      return;
-    }
-
-
-    *message_ptr++ = 0;
-    device_group->message_length = message_ptr - device_group->message;
-
-
-    if (building_status_message || message_type == DGR_MSGTYP_PARTIAL_UPDATE) return;
-  }
-
-
-#ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via multicast, sequence=%u"), device_group->message_length, device_group->group_name, device_group->message[device_group->message_header_length] | device_group->message[device_group->message_header_length + 1] << 8);
-#endif
-  SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Multicast"));
-  device_group->next_ack_check_time = millis() + 100;
-
-  if (message_type == DGR_MSGTYP_UPDATE_MORE_TO_COME) {
-    for (struct device_group_member * device_group_member = device_group->device_group_members; device_group_member != nullptr; device_group_member = device_group_member->flink) {
-      device_group_member->acked_sequence = outgoing_sequence;
-    }
-  }
-  else {
-    waiting_for_acks = true;
-  }
-}
-
-void ProcessDeviceGroupMessage(char * packet, int packet_length)
-{
-
-  char * message_group_name = packet + sizeof(DEVICE_GROUP_MESSAGE) - 1;
-  char * message_ptr = strchr(message_group_name, ' ');
-  if (message_ptr == nullptr) return;
-  *message_ptr = 0;
-
-
-  struct device_group * device_group;
-  uint32_t device_group_index = 0;
-  for (;;) {
-    device_group = &device_groups[device_group_index];
-    if (!strcmp(message_group_name, device_group->group_name)) break;
-    if (++device_group_index >= device_group_count) return;
-  }
-  *message_ptr++ = ' ';
-
-
-  IPAddress remote_ip = PortUdp.remoteIP();
-  struct device_group_member * * flink = &device_group->device_group_members;
-  struct device_group_member * device_group_member;
-  for (;;) {
-    device_group_member = *flink;
-    if (!device_group_member) {
-      device_group_member = (struct device_group_member *)calloc(1, sizeof(struct device_group_member));
-      if (device_group_member == nullptr) {
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: error allocating device group member block"));
-        return;
-      }
-#ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: adding member %s (%p)"), IPAddressToString(remote_ip), device_group_member);
-#endif
-      device_group_member->ip_address = remote_ip;
-      *flink = device_group_member;
-      break;
-    }
-    else if (device_group_member->ip_address == remote_ip) {
-      break;
-    }
-    flink = &device_group_member->flink;
-  }
-
-
-  message_ptr = strstr_P(message_ptr, PSTR("\n\n"));
-  if (message_ptr == nullptr) return;
-  message_ptr += 2;
-
-  bool light_fade;
-  uint16_t flags;
-  uint16_t item;
-  uint16_t message_sequence;
-  int32_t value;
-
-
-  if (packet_length - (message_ptr - packet) < 4) goto badmsg;
-  message_sequence = *message_ptr++;
-  message_sequence |= *message_ptr++ << 8;
-  flags = *message_ptr++;
-  flags |= *message_ptr++ << 8;
-#ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Received device group %s packet from %s: sequence=%u, flags=%u"), device_group->group_name, IPAddressToString(remote_ip), message_sequence, flags);
-#endif
-
-
-
-  if (flags == DGR_FLAG_ACK) {
-    if (message_sequence > device_group_member->acked_sequence || device_group_member->acked_sequence - message_sequence < 64536) {
-      device_group_member->acked_sequence = message_sequence;
-    }
-    device_group_member->timeout_time = 0;
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<ack"));
-#endif
-    return;
-  }
-
-
-  if (!(flags & DGR_FLAG_MORE_TO_COME)) {
-    *(message_ptr - 2) = DGR_FLAG_ACK;
-    *(message_ptr - 1) = 0;
-    SendDeviceGroupPacket(remote_ip, packet, message_ptr - packet, PSTR("Ack"));
-  }
-
-
-
-  if ((flags & DGR_FLAG_STATUS_REQUEST)) {
-    if ((flags & DGR_FLAG_RESET) || device_group_member->acked_sequence != device_group->last_full_status_sequence) {
-      _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
-    }
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<status request"));
-#endif
-    return;
-  }
-
-
-  if (message_sequence < device_group_member->received_sequence && device_group_member->received_sequence - message_sequence > 64536) {
-#ifdef DEVICE_GROUPS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<old message"));
-#endif
-    return;
-  }
-  device_group_member->received_sequence = message_sequence;
-
-
-
-  processing_remote_device_message = true;
-# 512 "S:/Development/Tasmota/tasmota/support_device_groups.ino"
-  XdrvMailbox.command = nullptr;
-  XdrvMailbox.index = flags;
-  light_fade = Settings.light_fade;
-  if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
-
-  for (;;) {
-    if (packet_length - (message_ptr - packet) < 1) goto badmsg;
-    item = *message_ptr++;
-    if (!item) break;
-
-#ifdef DEVICE_GROUPS_DEBUG
-    switch (item) {
-      case DGR_ITEM_LIGHT_FADE:
-      case DGR_ITEM_LIGHT_SPEED:
-      case DGR_ITEM_LIGHT_BRI:
-      case DGR_ITEM_LIGHT_SCHEME:
-      case DGR_ITEM_LIGHT_FIXED_COLOR:
-      case DGR_ITEM_BRI_MIN:
-      case DGR_ITEM_BRI_PRESET_LOW:
-      case DGR_ITEM_BRI_PRESET_HIGH:
-      case DGR_ITEM_BRI_POWER_ON:
-      case DGR_ITEM_POWER:
-      case DGR_ITEM_LIGHT_CHANNELS:
-        break;
-      default:
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));
-    }
-#endif
-
-    XdrvMailbox.command_code = item;
-    if (item <= DGR_ITEM_LAST_32BIT) {
-      value = *message_ptr++;
-      if (item > DGR_ITEM_MAX_8BIT) {
-        value |= *message_ptr++ << 8;
-        if (item > DGR_ITEM_MAX_16BIT) {
-          value |= *message_ptr++ << 16;
-          value |= *message_ptr++ << 24;
-        }
-      }
-      else if (item == DGR_ITEM_LIGHT_FADE) {
-        light_fade = value;
-      }
-#ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u"), item, value);
-#endif
-      XdrvMailbox.payload = value;
-    }
-    else if (item <= DGR_ITEM_MAX_STRING) {
-      value = *message_ptr++;
-      if (value >= packet_length - (message_ptr - packet)) goto badmsg;
-#ifdef DEVICE_GROUPS_DEBUG
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%.*s"), item, value, message_ptr);
-#endif
-      XdrvMailbox.data_len = value;
-      XdrvMailbox.data = message_ptr;
-      message_ptr += value;
-    }
-    else {
-      switch (item) {
-        case DGR_ITEM_LIGHT_CHANNELS:
-#ifdef DEVICE_GROUPS_DEBUG
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u,%u,%u,%u,%u"), item, *message_ptr, *(message_ptr + 1), *(message_ptr + 2), *(message_ptr + 3), *(message_ptr + 4));
-#endif
-          XdrvMailbox.data = message_ptr;
-          message_ptr += 5;
-          break;
-      }
-    }
-
-    if (DeviceGroupItemShared(true, item)) {
-      if (item == DGR_ITEM_POWER) {
-        for (uint32_t i = 0; i < devices_present; i++) {
-          uint32_t mask = 1 << i;
-          bool on = (value & mask);
-          if (on != (power & mask)) ExecuteCommandPower(i + 1, (on ? POWER_ON : POWER_OFF), SRC_REMOTE);
-        }
-      }
-      else {
-        XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
-      }
-    }
-  }
-
-  XdrvMailbox.command_code = DGR_ITEM_EOL;
-  XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
-  Settings.light_fade = light_fade;
-
-  processing_remote_device_message = false;
-#ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<processed"));
-#endif
-  return;
-
-badmsg:
-  AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: malformed message received from %s"), IPAddressToString(remote_ip));
-#ifdef DEVICE_GROUPS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("packet_length=%u, offset=%u"), packet_length, message_ptr - packet);
-#endif
-  processing_remote_device_message = false;
-}
-
-void DeviceGroupsLoop(void)
-{
-  if (!Settings.flag4.device_groups_enabled) return;
-  if (udp_connected) {
-    if (!udp_was_connected) {
-      udp_was_connected = true;
-
-      if (!device_groups_initialized) DeviceGroupsInit();
-      if (device_groups_initialization_failed) return;
-
-      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
-        device_group * device_group = &device_groups[device_group_index];
-        char * message_ptr = &device_group->message[device_group->message_header_length];
-        if (!++outgoing_sequence) outgoing_sequence = 1;
-        *message_ptr++ = outgoing_sequence & 0xff;
-        *message_ptr++ = outgoing_sequence >> 8;
-        *message_ptr++ = DGR_FLAG_RESET | DGR_FLAG_STATUS_REQUEST;
-        *message_ptr++ = 0;
-        device_group->message_length = message_ptr - device_group->message;
-        device_group->initial_status_requests_remaining = 5;
-        device_group->next_ack_check_time = millis() + 1000;
-      }
-
-      waiting_for_acks = true;
-    }
-
-    if (device_groups_initialization_failed) return;
-
-    if (waiting_for_acks) {
-      uint32_t now = millis();
-      waiting_for_acks = false;
-      for (uint32_t device_group_index = 0; device_group_index < device_group_count; device_group_index++) {
-        device_group * device_group = &device_groups[device_group_index];
-        if (device_group->next_ack_check_time) {
-          if (device_group->next_ack_check_time <= now) {
-            if (device_group->initial_status_requests_remaining) {
-#ifdef DEVICE_GROUPS_DEBUG
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending initial status request for group %s"), device_group->group_name);
-#endif
-              if (--device_group->initial_status_requests_remaining) {
-                SendDeviceGroupPacket(IPAddress(239,255,255,250), device_group->message, device_group->message_length, PSTR("Initial"));
-                device_group->message[device_group->message_header_length + 2] = DGR_FLAG_STATUS_REQUEST;
-                device_group->next_ack_check_time = now + 200;
-                waiting_for_acks = true;
-              }
-              else {
-                device_group->next_ack_check_time = 0;
-                _SendDeviceGroupMessage(device_group_index, DGR_MSGTYP_FULL_STATUS);
-              }
-            }
-            else {
-              bool acked = true;
-              struct device_group_member ** flink = &device_group->device_group_members;
-              struct device_group_member * device_group_member;
-              while ((device_group_member = *flink)) {
-                if (device_group_member->acked_sequence != outgoing_sequence) {
-
-                  if (device_group_member->timeout_time && device_group_member->timeout_time < now) {
-#ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: removing member %s (%p)"), IPAddressToString(device_group_member->ip_address), device_group_member);
-#endif
-                    *flink = device_group_member->flink;
-                    free(device_group_member);
-                  }
-                  else {
-#ifdef DEVICE_GROUPS_DEBUG
-                    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DGR: sending %u-byte device group %s packet via unicast to %s, sequence %u, last message acked=%u"), device_group->message_length, device_group->group_name, IPAddressToString(device_group_member->ip_address), outgoing_sequence, device_group_member->acked_sequence);
-#endif
-                    SendDeviceGroupPacket(device_group_member->ip_address, device_group->message, device_group->message_length, PSTR("Unicast"));
-                    if (!device_group_member->timeout_time) device_group_member->timeout_time = now + 15000;
-                    acked = false;
-                    flink = &device_group_member->flink;
-                  }
-                }
-                else {
-                  flink = &device_group_member->flink;
-                }
-              }
-              if (acked) {
-                device_group->next_ack_check_time = 0;
-                device_group->message_length = 0;
-              }
-              else {
-                device_group->next_ack_check_time = now + 500;
-                waiting_for_acks = true;
-              }
-            }
-          }
-          else {
-            waiting_for_acks = true;
-          }
-        }
-      }
-    }
-  }
-  else {
-    udp_was_connected = false;
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_esptool.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_esptool.ino"
-#define USE_ESPTOOL 
-#ifdef USE_ESPTOOL
-
-
-
-
-
-
-
-#define READ_REG(REG) (*((volatile uint32_t *)(REG)))
-#define WRITE_REG(REG,VAL) *((volatile uint32_t *)(REG)) = (VAL)
-#define REG_SET_MASK(reg,mask) WRITE_REG((reg), (READ_REG(reg)|(mask)))
-
-#define SPI_BASE_REG 0x60000200
-
-#define SPI_CMD_REG (SPI_BASE_REG + 0x00)
-#define SPI_FLASH_RDSR (1<<27)
-#define SPI_FLASH_SE (1<<24)
-#define SPI_FLASH_BE (1<<23)
-#define SPI_FLASH_WREN (1<<30)
-
-#define SPI_ADDR_REG (SPI_BASE_REG + 0x04)
-#define SPI_CTRL_REG (SPI_BASE_REG + 0x08)
-#define SPI_RD_STATUS_REG (SPI_BASE_REG + 0x10)
-#define SPI_W0_REG (SPI_BASE_REG + 0x40)
-#define SPI_EXT2_REG (SPI_BASE_REG + 0xF8)
-
-#define SPI_ST 0x7
-
-
-#define SECTORS_PER_BLOCK (FLASH_BLOCK_SIZE / SPI_FLASH_SEC_SIZE)
-
-
-static const uint32_t STATUS_WIP_BIT = (1 << 0);
-
-
-inline static void spi_wait_ready(void)
-{
-  while((READ_REG(SPI_EXT2_REG) & SPI_ST)) { }
-}
-
-
-
-static bool spiflash_is_ready(void)
-{
-  spi_wait_ready();
-  WRITE_REG(SPI_RD_STATUS_REG, 0);
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_RDSR);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-  uint32_t status_value = READ_REG(SPI_RD_STATUS_REG);
-  return (status_value & STATUS_WIP_BIT) == 0;
-}
-
-static void spi_write_enable(void)
-{
-  while(!spiflash_is_ready()) { }
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_WREN);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-}
-
-bool EsptoolEraseSector(uint32_t sector)
-{
-  spi_write_enable();
-  spi_wait_ready();
-
-  WRITE_REG(SPI_ADDR_REG, (sector * SPI_FLASH_SEC_SIZE) & 0xffffff);
-  WRITE_REG(SPI_CMD_REG, SPI_FLASH_SE);
-  while(READ_REG(SPI_CMD_REG) != 0) { }
-  while(!spiflash_is_ready()) { }
-
-  return true;
-}
-
-void EsptoolErase(uint32_t start_sector, uint32_t end_sector)
-{
-  int next_erase_sector = start_sector;
-  int remaining_erase_sector = end_sector - start_sector;
-
-  while (remaining_erase_sector > 0) {
-    spi_write_enable();
-
-    uint32_t command = SPI_FLASH_SE;
-    uint32_t sectors_to_erase = 1;
-    if (remaining_erase_sector >= SECTORS_PER_BLOCK &&
-        next_erase_sector % SECTORS_PER_BLOCK == 0) {
-      command = SPI_FLASH_BE;
-      sectors_to_erase = SECTORS_PER_BLOCK;
-    }
-    uint32_t addr = next_erase_sector * SPI_FLASH_SEC_SIZE;
-
-    spi_wait_ready();
-    WRITE_REG(SPI_ADDR_REG, addr & 0xffffff);
-    WRITE_REG(SPI_CMD_REG, command);
-    while(READ_REG(SPI_CMD_REG) != 0) { }
-    remaining_erase_sector -= sectors_to_erase;
-    next_erase_sector += sectors_to_erase;
-
-    while (!spiflash_is_ready()) { }
-    yield();
-    OsWatchLoop();
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_features.ino"
-# 24 "S:/Development/Tasmota/tasmota/support_features.ino"
-void GetFeatures(void)
-{
-  feature_drv1 = 0x00000000;
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  feature_drv1 |= 0x00000001;
-#endif
-#ifdef USE_LIGHT
-  feature_drv1 |= 0x00000002;
-#endif
-#ifdef USE_I2C
-  feature_drv1 |= 0x00000004;
-#endif
-#ifdef USE_SPI
-  feature_drv1 |= 0x00000008;
-#endif
-#ifdef USE_DISCOVERY
-  feature_drv1 |= 0x00000010;
-#endif
-#ifdef USE_ARDUINO_OTA
-  feature_drv1 |= 0x00000020;
-#endif
-#ifdef USE_MQTT_TLS
-  feature_drv1 |= 0x00000040;
-#endif
-#ifdef USE_WEBSERVER
-  feature_drv1 |= 0x00000080;
-#endif
-#ifdef WEBSERVER_ADVERTISE
-  feature_drv1 |= 0x00000100;
-#endif
-#ifdef USE_EMULATION_HUE
-  feature_drv1 |= 0x00000200;
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_PUBSUBCLIENT)
-  feature_drv1 |= 0x00000400;
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_TASMOTAMQTT)
-
-#endif
-#if (MQTT_LIBRARY_TYPE == MQTT_ESPMQTTARDUINO)
-
-#endif
-#ifdef MQTT_HOST_DISCOVERY
-  feature_drv1 |= 0x00002000;
-#endif
-#ifdef USE_ARILUX_RF
-  feature_drv1 |= 0x00004000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_WS2812)
-  feature_drv1 |= 0x00008000;
-#endif
-#ifdef USE_WS2812_DMA
-  feature_drv1 |= 0x00010000;
-#endif
-#if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL)
-  feature_drv1 |= 0x00020000;
-#endif
-#ifdef USE_IR_HVAC
-  feature_drv1 |= 0x00040000;
-#endif
-#ifdef USE_IR_RECEIVE
-  feature_drv1 |= 0x00080000;
-#endif
-#ifdef USE_DOMOTICZ
-  feature_drv1 |= 0x00100000;
-#endif
-#ifdef USE_DISPLAY
-  feature_drv1 |= 0x00200000;
-#endif
-#ifdef USE_HOME_ASSISTANT
-  feature_drv1 |= 0x00400000;
-#endif
-#ifdef USE_SERIAL_BRIDGE
-  feature_drv1 |= 0x00800000;
-#endif
-#ifdef USE_TIMERS
-  feature_drv1 |= 0x01000000;
-#endif
-#ifdef USE_SUNRISE
-  feature_drv1 |= 0x02000000;
-#endif
-#ifdef USE_TIMERS_WEB
-  feature_drv1 |= 0x04000000;
-#endif
-#ifdef USE_RULES
-  feature_drv1 |= 0x08000000;
-#endif
-#ifdef USE_KNX
-  feature_drv1 |= 0x10000000;
-#endif
-#ifdef USE_WPS
-  feature_drv1 |= 0x20000000;
-#endif
-#ifdef USE_SMARTCONFIG
-  feature_drv1 |= 0x40000000;
-#endif
-#ifdef USE_ENERGY_POWER_LIMIT
-  feature_drv1 |= 0x80000000;
-#endif
-
-
-
-  feature_drv2 = 0x00000000;
-
-#ifdef USE_CONFIG_OVERRIDE
-  feature_drv2 |= 0x00000001;
-#endif
-#ifdef FIRMWARE_MINIMAL
-  feature_drv2 |= 0x00000002;
-#endif
-#ifdef FIRMWARE_SENSORS
-  feature_drv2 |= 0x00000004;
-#endif
-#ifdef FIRMWARE_CLASSIC
-  feature_drv2 |= 0x00000008;
-#endif
-#ifdef FIRMWARE_KNX_NO_EMULATION
-  feature_drv2 |= 0x00000010;
-#endif
-#ifdef USE_DISPLAY_MODES1TO5
-  feature_drv2 |= 0x00000020;
-#endif
-#ifdef USE_DISPLAY_GRAPH
-  feature_drv2 |= 0x00000040;
-#endif
-#ifdef USE_DISPLAY_LCD
-  feature_drv2 |= 0x00000080;
-#endif
-#ifdef USE_DISPLAY_SSD1306
-  feature_drv2 |= 0x00000100;
-#endif
-#ifdef USE_DISPLAY_MATRIX
-  feature_drv2 |= 0x00000200;
-#endif
-#ifdef USE_DISPLAY_ILI9341
-  feature_drv2 |= 0x00000400;
-#endif
-#ifdef USE_DISPLAY_EPAPER_29
-  feature_drv2 |= 0x00000800;
-#endif
-#ifdef USE_DISPLAY_SH1106
-  feature_drv2 |= 0x00001000;
-#endif
-#ifdef USE_MP3_PLAYER
-  feature_drv2 |= 0x00002000;
-#endif
-#ifdef USE_PCA9685
-  feature_drv2 |= 0x00004000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_TUYA_MCU)
-  feature_drv2 |= 0x00008000;
-#endif
-#ifdef USE_RC_SWITCH
-  feature_drv2 |= 0x00010000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_ARMTRONIX_DIMMERS)
-  feature_drv2 |= 0x00020000;
-#endif
-#if defined(USE_LIGHT) && defined(USE_SM16716)
-  feature_drv2 |= 0x00040000;
-#endif
-#ifdef USE_SCRIPT
-  feature_drv2 |= 0x00080000;
-#endif
-#ifdef USE_EMULATION_WEMO
-  feature_drv2 |= 0x00100000;
-#endif
-#ifdef USE_SONOFF_IFAN
-  feature_drv2 |= 0x00200000;
-#endif
-#ifdef USE_ZIGBEE
-  feature_drv2 |= 0x00400000;
-#endif
-#ifdef NO_EXTRA_4K_HEAP
-  feature_drv2 |= 0x00800000;
-#endif
-#ifdef VTABLES_IN_IRAM
-  feature_drv2 |= 0x01000000;
-#endif
-#ifdef VTABLES_IN_DRAM
-  feature_drv2 |= 0x02000000;
-#endif
-#ifdef VTABLES_IN_FLASH
-  feature_drv2 |= 0x04000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
-  feature_drv2 |= 0x08000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-  feature_drv2 |= 0x10000000;
-#endif
-#ifdef PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-  feature_drv2 |= 0x20000000;
-#endif
-#ifdef DEBUG_THEO
-  feature_drv2 |= 0x40000000;
-#endif
-#ifdef USE_DEBUG_DRIVER
-  feature_drv2 |= 0x80000000;
-#endif
-
-
-
-  feature_sns1 = 0x00000000;
-
-#ifdef USE_COUNTER
-  feature_sns1 |= 0x00000001;
-#endif
-#ifdef USE_ADC_VCC
-  feature_sns1 |= 0x00000002;
-#endif
-#ifdef USE_ENERGY_SENSOR
-  feature_sns1 |= 0x00000004;
-#endif
-#ifdef USE_PZEM004T
-  feature_sns1 |= 0x00000008;
-#endif
-#ifdef USE_DS18B20
-  feature_sns1 |= 0x00000010;
-#endif
-#ifdef USE_DS18x20_LEGACY
-  feature_sns1 |= 0x00000020;
-#endif
-#ifdef USE_DS18x20
-  feature_sns1 |= 0x00000040;
-#endif
-#ifdef USE_DHT
-  feature_sns1 |= 0x00000080;
-#endif
-#ifdef USE_SHT
-  feature_sns1 |= 0x00000100;
-#endif
-#ifdef USE_HTU
-  feature_sns1 |= 0x00000200;
-#endif
-#ifdef USE_BMP
-  feature_sns1 |= 0x00000400;
-#endif
-#ifdef USE_BME680
-  feature_sns1 |= 0x00000800;
-#endif
-#ifdef USE_BH1750
-  feature_sns1 |= 0x00001000;
-#endif
-#ifdef USE_VEML6070
-  feature_sns1 |= 0x00002000;
-#endif
-#ifdef USE_ADS1115_I2CDEV
-  feature_sns1 |= 0x00004000;
-#endif
-#ifdef USE_ADS1115
-  feature_sns1 |= 0x00008000;
-#endif
-#ifdef USE_INA219
-  feature_sns1 |= 0x00010000;
-#endif
-#ifdef USE_SHT3X
-  feature_sns1 |= 0x00020000;
-#endif
-#ifdef USE_MHZ19
-  feature_sns1 |= 0x00040000;
-#endif
-#ifdef USE_TSL2561
-  feature_sns1 |= 0x00080000;
-#endif
-#ifdef USE_SENSEAIR
-  feature_sns1 |= 0x00100000;
-#endif
-#ifdef USE_PMS5003
-  feature_sns1 |= 0x00200000;
-#endif
-#ifdef USE_MGS
-  feature_sns1 |= 0x00400000;
-#endif
-#ifdef USE_NOVA_SDS
-  feature_sns1 |= 0x00800000;
-#endif
-#ifdef USE_SGP30
-  feature_sns1 |= 0x01000000;
-#endif
-#ifdef USE_SR04
-  feature_sns1 |= 0x02000000;
-#endif
-#ifdef USE_SDM120
-  feature_sns1 |= 0x04000000;
-#endif
-#ifdef USE_SI1145
-  feature_sns1 |= 0x08000000;
-#endif
-#ifdef USE_SDM630
-  feature_sns1 |= 0x10000000;
-#endif
-#ifdef USE_LM75AD
-  feature_sns1 |= 0x20000000;
-#endif
-#ifdef USE_APDS9960
-  feature_sns1 |= 0x40000000;
-#endif
-#ifdef USE_TM1638
-  feature_sns1 |= 0x80000000;
-#endif
-
-
-
-  feature_sns2 = 0x00000000;
-
-#ifdef USE_MCP230xx
-  feature_sns2 |= 0x00000001;
-#endif
-#ifdef USE_MPR121
-  feature_sns2 |= 0x00000002;
-#endif
-#ifdef USE_CCS811
-  feature_sns2 |= 0x00000004;
-#endif
-#ifdef USE_MPU6050
-  feature_sns2 |= 0x00000008;
-#endif
-#ifdef USE_MCP230xx_OUTPUT
-  feature_sns2 |= 0x00000010;
-#endif
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-  feature_sns2 |= 0x00000020;
-#endif
-#ifdef USE_HLW8012
-  feature_sns2 |= 0x00000040;
-#endif
-#ifdef USE_CSE7766
-  feature_sns2 |= 0x00000080;
-#endif
-#ifdef USE_MCP39F501
-  feature_sns2 |= 0x00000100;
-#endif
-#ifdef USE_PZEM_AC
-  feature_sns2 |= 0x00000200;
-#endif
-#ifdef USE_DS3231
-  feature_sns2 |= 0x00000400;
-#endif
-#ifdef USE_HX711
-  feature_sns2 |= 0x00000800;
-#endif
-#ifdef USE_PZEM_DC
-  feature_sns2 |= 0x00001000;
-#endif
-#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
-  feature_sns2 |= 0x00002000;
-#endif
-#ifdef USE_MGC3130
-  feature_sns2 |= 0x00004000;
-#endif
-#ifdef USE_RF_SENSOR
-  feature_sns2 |= 0x00008000;
-#endif
-#ifdef USE_THEO_V2
-  feature_sns2 |= 0x00010000;
-#endif
-#ifdef USE_ALECTO_V2
-  feature_sns2 |= 0x00020000;
-#endif
-#ifdef USE_AZ7798
-  feature_sns2 |= 0x00040000;
-#endif
-#ifdef USE_MAX31855
-  feature_sns2 |= 0x00080000;
-#endif
-#ifdef USE_PN532_HSU
-  feature_sns2 |= 0x00100000;
-#endif
-#ifdef USE_MAX44009
-  feature_sns2 |= 0x00200000;
-#endif
-#ifdef USE_SCD30
-  feature_sns2 |= 0x00400000;
-#endif
-#ifdef USE_HRE
-  feature_sns2 |= 0x00800000;
-#endif
-#ifdef USE_ADE7953
-  feature_sns2 |= 0x01000000;
-#endif
-#ifdef USE_SPS30
-  feature_sns2 |= 0x02000000;
-#endif
-#ifdef USE_VL53L0X
-  feature_sns2 |= 0x04000000;
-#endif
-#ifdef USE_MLX90614
-  feature_sns2 |= 0x08000000;
-#endif
-#ifdef USE_MAX31865
-  feature_sns2 |= 0x10000000;
-#endif
-#ifdef USE_CHIRP
-  feature_sns2 |= 0x20000000;
-#endif
-#ifdef USE_SOLAX_X1
-  feature_sns2 |= 0x40000000;
-#endif
-#ifdef USE_PAJ7620
-  feature_sns2 |= 0x80000000;
-#endif
-
-
-
-  feature5 = 0x00000000;
-
-#ifdef USE_BUZZER
-  feature5 |= 0x00000001;
-#endif
-#ifdef USE_RDM6300
-  feature5 |= 0x00000002;
-#endif
-#ifdef USE_IBEACON
-  feature5 |= 0x00000004;
-#endif
-#ifdef USE_SML_M
-  feature5 |= 0x00000008;
-#endif
-#ifdef USE_INA226
-  feature5 |= 0x00000010;
-#endif
-#ifdef USE_A4988_STEPPER
-  feature5 |= 0x00000020;
-#endif
-#ifdef USE_DDS2382
-  feature5 |= 0x00000040;
-#endif
-#ifdef USE_SM2135
-  feature5 |= 0x00000080;
-#endif
-#ifdef USE_SHUTTER
-  feature5 |= 0x00000100;
-#endif
-#ifdef USE_PCF8574
-  feature5 |= 0x00000200;
-#endif
-#ifdef USE_DDSU666
-  feature5 |= 0x00000400;
-#endif
-#ifdef USE_DEEPSLEEP
-  feature5 |= 0x00000800;
-#endif
-#ifdef USE_SONOFF_SC
-  feature5 |= 0x00001000;
-#endif
-#ifdef USE_SONOFF_RF
-  feature5 |= 0x00002000;
-#endif
-#ifdef USE_SONOFF_L1
-  feature5 |= 0x00004000;
-#endif
-#ifdef USE_EXS_DIMMER
-  feature5 |= 0x00008000;
-#endif
-#ifdef USE_ARDUINO_SLAVE
-  feature5 |= 0x00010000;
-#endif
-#ifdef USE_HIH6
-  feature5 |= 0x00020000;
-#endif
-#ifdef USE_HPMA
-  feature5 |= 0x00040000;
-#endif
-#ifdef USE_TSL2591
-  feature5 |= 0x00080000;
-#endif
-#ifdef USE_DHT12
-  feature5 |= 0x00100000;
-#endif
-#ifdef USE_DS1624
-  feature5 |= 0x00200000;
-#endif
-#ifdef USE_GPS
-  feature5 |= 0x00400000;
-#endif
-#ifdef USE_HOTPLUG
-  feature5 |= 0x00800000;
-#endif
-#ifdef USE_NRF24
-  feature5 |= 0x01000000;
-#endif
-#ifdef USE_MIBLE
-  feature5 |= 0x02000000;
-#endif
-#ifdef USE_HM10
-  feature5 |= 0x04000000;
-#endif
-#ifdef USE_LE01MR
-  feature5 |= 0x08000000;
-#endif
-#ifdef USE_AHT1x
-  feature5 |= 0x10000000;
-#endif
-#ifdef USE_WEMOS_MOTOR_V1
-  feature5 |= 0x20000000;
-#endif
-
-
-
-
-
-
-  feature6 = 0x00000000;
-# 570 "S:/Development/Tasmota/tasmota/support_features.ino"
-}
-# 1 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
-# 39 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
-#ifdef USE_FLOG
-
-class FLOG
-
-#define MAGIC_WORD_FL 0x464c
-
-{
-
-struct header_t{
-    uint16_t magic_word;
-    uint16_t padding;
-    uint32_t physical_start_sector:10;
-    uint32_t number:10;
-    uint32_t buf_pointer:12;
-    };
-
-private:
-void _readSector(uint8_t one_sector);
-void _eraseSector(uint8_t one_sector);
-void _writeSector(uint8_t one_sector);
-void _clearBuffer(void);
-void _searchSaves(void);
-void _findFirstErasedSector(void);
-void _showBuffer(void);
-void _initBuffer(void);
-void _saveBufferToSector(void);
-header_t _saved_header;
-
-public:
-  uint32_t size;
-  uint32_t start;
-  uint32_t end;
-  uint16_t num_sectors;
-
-  uint16_t first_erased_sector;
-  uint16_t current_sector;
-
-  uint16_t bytes_left;
-  uint16_t sectors_left;
-
-  uint8_t mode = 0;
-  bool found_saved_data = false;
-  bool ready = false;
-  bool running_download = false;
-  bool recording = false;
-
-  union sector_t{
-  uint32_t dword_buffer[FLASH_SECTOR_SIZE/4];
-  uint8_t byte_buffer[FLASH_SECTOR_SIZE];
-  header_t header;
-  } sector;
-
-  void init(void);
-  void addToBuffer(uint8_t src[], uint32_t size);
-  void startRecording(bool append);
-  void stopRecording(void);
-
-  typedef void (*CallbackNoArgs) ();
-  typedef void (*CallbackWithArgs) (uint8_t *_record);
-
-  void startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter);
-};
-
-extern "C" uint32_t _SPIFFS_start;
-extern "C" uint32_t _FS_start;
-
-
-
-
-void FLOG::init(void)
-{
-DEBUG_SENSOR_LOG(PSTR("FLOG: init ..."));
-size = ESP.getSketchSize();
-
-start = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-end = (uint32_t)&_SPIFFS_start - 0x40200000;
-#else
-end = (uint32_t)&_FS_start - 0x40200000;
-#endif
-num_sectors = (end - start)/FLASH_SECTOR_SIZE;
-DEBUG_SENSOR_LOG(PSTR("FLOG: size: 0x%lx, start: 0x%lx, end: 0x%lx, num_sectors(dec): %lu"), size, start, end, num_sectors );
-_findFirstErasedSector();
-if(first_erased_sector == 0xffff){
-    _eraseSector(0);
-    first_erased_sector = 0;
-}
-_searchSaves();
-_initBuffer();
-ready = true;
-}
-# 142 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
-void FLOG::_readSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: read sector number: %u" ), one_sector);
-  ESP.flashRead(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
-}
-
-
-
-
-
-void FLOG::_eraseSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: erasing sector number: %u" ), one_sector);
-  ESP.flashEraseSector((start/FLASH_SECTOR_SIZE)+one_sector);
-}
-
-
-
-
-
-void FLOG::_writeSector(uint8_t one_sector){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to sector number: %u" ), one_sector);
-  ESP.flashWrite(start+(one_sector * FLASH_SECTOR_SIZE),(uint32_t *)&sector.dword_buffer, FLASH_SECTOR_SIZE);
-}
-
-
-
-
-void FLOG::_clearBuffer(){
-  for (uint32_t i = sizeof(sector.header)/4; i<(sizeof(sector.dword_buffer)/4); i++){
-      sector.dword_buffer[i] = 0;
-  }
-  sector.header.buf_pointer = sizeof(sector.header);
-
-}
-
-
-
-
-void FLOG::_saveBufferToSector(){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: write buffer to current sector: %u" ),current_sector);
-  _writeSector(current_sector);
-  if(current_sector == num_sectors){
-    current_sector = 0;
-  }
-  else{
-    current_sector++;
-  }
-  _eraseSector(current_sector);
-  _clearBuffer();
-  sector.header.number++;
-  DEBUG_SENSOR_LOG(PSTR("FLOG: new sector header number: %u" ),sector.header.number);
-}
-
-
-
-
-
-void FLOG::_findFirstErasedSector(){
-  for (uint32_t i = 0; i<num_sectors; i++){
-    bool success = true;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: read sector: %u"), i);
-    _readSector(i);
-    for (uint32_t j = 0; j<(sizeof(sector.dword_buffer)/4); j++){
-      if(sector.dword_buffer[j]!=0xffffffff){
-
-        success = false;
-      }
-    }
-    if(success){
-      first_erased_sector = i;
-      sector.header.physical_start_sector = i;
-      current_sector = i;
-      DEBUG_SENSOR_LOG(PSTR("FLOG: first erased sector: %u, now init ..."), first_erased_sector);
-      return;
-    }
-  }
-  DEBUG_SENSOR_LOG(PSTR("FLOG: no erased sector found"));
-  first_erased_sector = 0xffff;
-}
-
-
-
-
-void FLOG::_searchSaves(void){
-
-  found_saved_data = false;
-  uint32_t s;
-  if(first_erased_sector==0){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: sector 0 was erased before, examine sector: %u"), num_sectors);
-    s = num_sectors;
-  }
-  else{
-    s = first_erased_sector-1;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: examine sector: %u"), s);
-  }
-  _readSector(s);
-  if(sector.header.magic_word!=MAGIC_WORD_FL){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
-    return;
-  }
-  sectors_left = sector.header.number + 1;
-  _saved_header = sector.header;
-  s = sector.header.physical_start_sector;
-  DEBUG_SENSOR_LOG(PSTR("FLOG: will check pysical start sector: %u"), s);
-  _readSector(s);
-  _showBuffer();
-  if(sector.header.magic_word!=MAGIC_WORD_FL){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: wrong magic number, no saved data found"));
-    sectors_left = 0;
-    return;
-  }
-  if(sector.header.number==0){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: possible saved data found"));
-    found_saved_data = true;
-  }
-  else{
-    DEBUG_SENSOR_LOG(PSTR("FLOG: number: %u should be 0"), sector.header.number);
-    sectors_left = 0;
-  }
-}
-
-
-
-
-void FLOG::_initBuffer(void){
-  if(!found_saved_data){
-    sector.header.physical_start_sector = (uint16_t)first_erased_sector;
-  }
-  DEBUG_SENSOR_LOG(PSTR("FLOG: init header"));
-  sector.header.magic_word = MAGIC_WORD_FL;
-  sector.header.number = 0;
-  sector.header.buf_pointer = (uint16_t)sizeof(sector.header);
-  current_sector = first_erased_sector;
-  ready = true;
-  _clearBuffer();
-}
-
-
-
-
-void FLOG::_showBuffer(void){
-  DEBUG_SENSOR_LOG(PSTR("FLOG: Header: %c %c"), sector.byte_buffer[0],sector.byte_buffer[1]);
-  DEBUG_SENSOR_LOG(PSTR("FLOG: V_Start_sector: %u, sector number: %u, pointer: %u "), sector.header.physical_start_sector, sector.header.number, sector.header.buf_pointer);
-  uint32_t j = 0;
-  for (uint32_t i = sector.header.buf_pointer-16; i<(sizeof(sector.byte_buffer)); i+=8){
-
-      DEBUG_SENSOR_LOG(PSTR("FLOG: buffer: %u %u %u %u %u %u %u %u  "), sector.byte_buffer[i], sector.byte_buffer[i+1], sector.byte_buffer[i+2], sector.byte_buffer[i+3], sector.byte_buffer[i+4], sector.byte_buffer[i+5], sector.byte_buffer[i+6], sector.byte_buffer[i+7]);
-      j++;
-      if(j>3){
-        break;
-      }
-  }
-}
-
-
-
-
-
-
-
-void FLOG::addToBuffer(uint8_t src[], uint32_t size){
-    if(mode == 0){
-      if(sector.header.number == num_sectors && !ready){
-        return;
-      }
-    }
-  if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
-
-
-
-    memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
-    sector.header.buf_pointer+=size;
-
-  }
-  else{
-    DEBUG_SENSOR_LOG(PSTR("FLOG: save buffer to flash sector: %u"), current_sector);
-    DEBUG_SENSOR_LOG(PSTR("FLOG: current buf_pointer: %u"), sector.header.buf_pointer);
-    _saveBufferToSector();
-    sectors_left++;
-
-    if((FLASH_SECTOR_SIZE-sector.header.buf_pointer-sizeof(sector.header))>size){
-      memcpy(sector.byte_buffer + sector.header.buf_pointer, src, size);
-      sector.header.buf_pointer+=size;
-    }
-  }
-}
-
-
-
-
-
-
-void FLOG::startRecording(bool append){
-    if(recording){
-        DEBUG_SENSOR_LOG(PSTR("FLOG: already recording"));
-        return;
-    }
-    recording = true;
-    DEBUG_SENSOR_LOG(PSTR("FLOG: start recording"));
-    _initBuffer();
-    if(!found_saved_data) {
-      append = false;
-    }
-    if(append){
-        sector.header.number = _saved_header.number+1;
-        sector.header.physical_start_sector = _saved_header.physical_start_sector;
-    }
-    else{
-        sector.header.physical_start_sector = (uint16_t)first_erased_sector;
-        found_saved_data = false;
-        sectors_left = 0;
-    }
-  }
-
-
-
-
-
-void FLOG::stopRecording(void){
-      _saveBufferToSector();
-      _findFirstErasedSector();
-      _searchSaves();
-      _initBuffer();
-      recording = false;
-      found_saved_data = true;
-  }
-# 381 "S:/Development/Tasmota/tasmota/support_flash_log.ino"
-  void FLOG::startDownload(size_t size, CallbackNoArgs sendHeader, CallbackWithArgs sendRecord, CallbackNoArgs sendFooter){
-
-  _readSector(sector.header.physical_start_sector);
-  uint32_t next_sector = sector.header.physical_start_sector;
-  bytes_left = sector.header.buf_pointer - sizeof(sector.header);
-  DEBUG_SENSOR_LOG(PSTR("FLOG: create file for download, will process %u bytes"), bytes_left);
-  running_download = true;
-
-  sendHeader();
-
-  while(sectors_left){
-    DEBUG_SENSOR_LOG(PSTR("FLOG: next sector: %u"), next_sector);
-
-    uint32_t k = sizeof(sector.header);
-    while(bytes_left){
-
-      uint8_t *_record_start = (uint8_t*)&sector.byte_buffer[k];
-
-      sendRecord(_record_start);
-      if(k%128 == 0){
-
-        OsWatchLoop();
-        delay(sleep);
-        }
-      k+=size;
-      if(bytes_left>7){
-        bytes_left-=size;
-      }
-      else{
-        bytes_left = 0;
-        DEBUG_SENSOR_LOG(PSTR("FLOG: Flog->bytes_left not dividable by 8 ??????"));
-        }
-      }
-    next_sector++;
-    if(next_sector>num_sectors){
-      next_sector = 0;
-    }
-    sectors_left--;
-    _readSector(next_sector);
-    bytes_left = sector.header.buf_pointer - sizeof(sector.header);
-    OsWatchLoop();
-    delay(sleep);
-  }
-  running_download = false;
-
-  sendFooter();
-
-  _searchSaves();
-  _initBuffer();
-  }
-
- #endif
-# 1 "S:/Development/Tasmota/tasmota/support_float.ino"
-# 23 "S:/Development/Tasmota/tasmota/support_float.ino"
-float fmodf(float x, float y)
-{
-
-  union {float f; uint32_t i;} ux = {x}, uy = {y};
-  int ex = ux.i>>23 & 0xff;
-  int ey = uy.i>>23 & 0xff;
-  uint32_t sx = ux.i & 0x80000000;
-  uint32_t i;
-  uint32_t uxi = ux.i;
-
-  if (uy.i<<1 == 0 || isnan(y) || ex == 0xff)
-    return (x*y)/(x*y);
-  if (uxi<<1 <= uy.i<<1) {
-    if (uxi<<1 == uy.i<<1)
-      return 0*x;
-    return x;
-  }
-
-
-  if (!ex) {
-    for (i = uxi<<9; i>>31 == 0; ex--, i <<= 1);
-    uxi <<= -ex + 1;
-  } else {
-    uxi &= -1U >> 9;
-    uxi |= 1U << 23;
-  }
-  if (!ey) {
-    for (i = uy.i<<9; i>>31 == 0; ey--, i <<= 1);
-    uy.i <<= -ey + 1;
-  } else {
-    uy.i &= -1U >> 9;
-    uy.i |= 1U << 23;
-  }
-
-
-  for (; ex > ey; ex--) {
-    i = uxi - uy.i;
-    if (i >> 31 == 0) {
-      if (i == 0)
-        return 0*x;
-      uxi = i;
-    }
-    uxi <<= 1;
-  }
-  i = uxi - uy.i;
-  if (i >> 31 == 0) {
-    if (i == 0)
-      return 0*x;
-    uxi = i;
-  }
-  for (; uxi>>23 == 0; uxi <<= 1, ex--);
-
-
-  if (ex > 0) {
-    uxi -= 1U << 23;
-    uxi |= (uint32_t)ex << 23;
-  } else {
-    uxi >>= -ex + 1;
-  }
-  uxi |= sx;
-  ux.i = uxi;
-  return ux.f;
-}
-
-
-double FastPrecisePow(double a, double b)
-{
-
-
-  int e = abs((int)b);
-  union {
-    double d;
-    int x[2];
-  } u = { a };
-  u.x[1] = (int)((b - e) * (u.x[1] - 1072632447) + 1072632447);
-  u.x[0] = 0;
-
-
-  double r = 1.0;
-  while (e) {
-    if (e & 1) {
-      r *= a;
-    }
-    a *= a;
-    e >>= 1;
-  }
-  return r * u.d;
-}
-
-float FastPrecisePowf(const float x, const float y)
-{
-
-  return (float)FastPrecisePow(x, y);
-}
-
-double TaylorLog(double x)
-{
-
-
-  if (x <= 0.0) { return NAN; }
-  double z = (x + 1) / (x - 1);
-  double step = ((x - 1) * (x - 1)) / ((x + 1) * (x + 1));
-  double totalValue = 0;
-  double powe = 1;
-  for (uint32_t count = 0; count < 10; count++) {
-    z *= step;
-    double y = (1 / powe) * z;
-    totalValue = totalValue + y;
-    powe = powe + 2;
-  }
-  totalValue *= 2;
-# 144 "S:/Development/Tasmota/tasmota/support_float.ino"
-  return totalValue;
-}
-# 154 "S:/Development/Tasmota/tasmota/support_float.ino"
-inline float sinf(float x) { return sin_52(x); }
-inline float cosf(float x) { return cos_52(x); }
-inline float tanf(float x) { return tan_56(x); }
-inline float atanf(float x) { return atan_66(x); }
-inline float asinf(float x) { return asinf1(x); }
-inline float acosf(float x) { return acosf1(x); }
-inline float sqrtf(float x) { return sqrt1(x); }
-inline float powf(float x, float y) { return FastPrecisePow(x, y); }
-
-
-double const f_pi = 3.1415926535897932384626433;
-double const f_twopi = 2.0 * f_pi;
-double const f_two_over_pi = 2.0 / f_pi;
-double const f_halfpi = f_pi / 2.0;
-double const f_threehalfpi = 3.0 * f_pi / 2.0;
-double const f_four_over_pi = 4.0 / f_pi;
-double const f_qtrpi = f_pi / 4.0;
-double const f_sixthpi = f_pi / 6.0;
-double const f_tansixthpi = tan(f_sixthpi);
-double const f_twelfthpi = f_pi / 12.0;
-double const f_tantwelfthpi = tan(f_twelfthpi);
-float const f_180pi = 180 / f_pi;
-# 194 "S:/Development/Tasmota/tasmota/support_float.ino"
-float cos_52s(float x)
-{
-  const float c1 = 0.9999932946;
-  const float c2 = -0.4999124376;
-  const float c3 = 0.0414877472;
-  const float c4 = -0.0012712095;
-
-  float x2 = x * x;
-  return (c1 + x2 * (c2 + x2 * (c3 + c4 * x2)));
-}
-
-
-
-
-
-
-float cos_52(float x)
-{
-  x = fmodf(x, f_twopi);
-  if (x < 0) { x = -x; }
-  int quad = int(x * (float)f_two_over_pi);
-  switch (quad) {
-    case 0: return cos_52s(x);
-    case 1: return -cos_52s((float)f_pi - x);
-    case 2: return -cos_52s(x-(float)f_pi);
-    case 3: return cos_52s((float)f_twopi - x);
-  }
-}
-
-
-
-
-float sin_52(float x)
-{
-  return cos_52((float)f_halfpi - x);
-}
-# 247 "S:/Development/Tasmota/tasmota/support_float.ino"
-float tan_56s(float x)
-{
-  const float c1 = -3.16783027;
-  const float c2 = 0.134516124;
-  const float c3 = -4.033321984;
-
-  float x2 = x * x;
-  return (x * (c1 + c2 * x2) / (c3 + x2));
-}
-# 267 "S:/Development/Tasmota/tasmota/support_float.ino"
-float tan_56(float x)
-{
-  x = fmodf(x, (float)f_twopi);
-  int octant = int(x * (float)f_four_over_pi);
-  switch (octant){
-    case 0: return tan_56s(x * (float)f_four_over_pi);
-    case 1: return 1.0f / tan_56s(((float)f_halfpi - x) * (float)f_four_over_pi);
-    case 2: return -1.0f / tan_56s((x-(float)f_halfpi) * (float)f_four_over_pi);
-    case 3: return - tan_56s(((float)f_pi - x) * (float)f_four_over_pi);
-    case 4: return tan_56s((x-(float)f_pi) * (float)f_four_over_pi);
-    case 5: return 1.0f / tan_56s(((float)f_threehalfpi - x) * (float)f_four_over_pi);
-    case 6: return -1.0f / tan_56s((x-(float)f_threehalfpi) * (float)f_four_over_pi);
-    case 7: return - tan_56s(((float)f_twopi - x) * (float)f_four_over_pi);
-  }
-}
-# 296 "S:/Development/Tasmota/tasmota/support_float.ino"
-float atan_66s(float x)
-{
-  const float c1 = 1.6867629106;
-  const float c2 = 0.4378497304;
-  const float c3 = 1.6867633134;
-
-  float x2 = x * x;
-  return (x * (c1 + x2 * c2) / (c3 + x2));
-}
-
-
-
-
-
-float atan_66(float x)
-{
-  float y;
-  bool complement= false;
-  bool region= false;
-  bool sign= false;
-
-  if (x < 0) {
-    x = -x;
-    sign = true;
-  }
-  if (x > 1.0) {
-    x = 1.0 / x;
-    complement = true;
-  }
-  if (x > (float)f_tantwelfthpi) {
-    x = (x - (float)f_tansixthpi) / (1 + (float)f_tansixthpi * x);
-    region = true;
-  }
-
-  y = atan_66s(x);
-  if (region) { y += (float)f_sixthpi; }
-  if (complement) { y = (float)f_halfpi-y; }
-  if (sign) { y = -y; }
-  return (y);
-}
-
-float asinf1(float x)
-{
-  float d = 1.0f - x * x;
-  if (d < 0.0f) { return NAN; }
-  return 2 * atan_66(x / (1 + sqrt1(d)));
-}
-
-float acosf1(float x)
-{
-  float d = 1.0f - x * x;
-  if (d < 0.0f) { return NAN; }
-  float y = asinf1(sqrt1(d));
-  if (x >= 0.0f) {
-    return y;
-  } else {
-    return (float)f_pi - y;
-  }
-}
-
-
-float sqrt1(const float x)
-{
-  union {
-    int i;
-    float x;
-  } u;
-  u.x = x;
-  u.i = (1 << 29) + (u.i >> 1) - (1 << 22);
-
-
-
-
-  u.x = u.x + x / u.x;
-  u.x = 0.25f * u.x + x / u.x;
-
-  return u.x;
-}
-# 387 "S:/Development/Tasmota/tasmota/support_float.ino"
-uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
-                                       uint16_t ito_min, uint16_t ito_max) {
-
-  if (ifrom_min >= ifrom_max) {
-    if (ito_min > ito_max) {
-      return ito_max;
-    } else {
-      return ito_min;
-    }
-  }
-
-  uint32_t num = inum;
-  uint32_t from_min = ifrom_min;
-  uint32_t from_max = ifrom_max;
-  uint32_t to_min = ito_min;
-  uint32_t to_max = ito_max;
-
-
-  num = (num > from_max ? from_max : (num < from_min ? from_min : num));
-
-
-  if (to_min > to_max) {
-
-    num = (from_max - num) + from_min;
-    to_min = ito_max;
-    to_max = ito_min;
-  }
-
-  uint32_t numerator = (num - from_min) * (to_max - to_min);
-  uint32_t result;
-  if (numerator >= 0x80000000L) {
-
-    result = numerator / (from_max - from_min) + to_min;
-  } else {
-    result = (((numerator * 2) / (from_max - from_min)) + 1) / 2 + to_min;
-  }
-  return (uint32_t) (result > to_max ? to_max : (result < to_min ? to_min : result));
-}
-# 1 "S:/Development/Tasmota/tasmota/support_legacy_cores.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_legacy_cores.ino"
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-
-
-
-
-
-void* memchr(const void* ptr, int value, size_t num)
-{
-  unsigned char *p = (unsigned char*)ptr;
-  while (num--) {
-    if (*p != (unsigned char)value) {
-      p++;
-    } else {
-      return p;
-    }
-  }
-  return 0;
-}
-
-
-
-size_t strcspn(const char *str1, const char *str2)
-{
-  size_t ret = 0;
-  while (*str1) {
-    if (strchr(str2, *str1)) {
-      return ret;
-    } else {
-      str1++;
-      ret++;
-    }
-  }
-  return ret;
-}
-
-
-
-char* strpbrk(const char *s1, const char *s2)
-{
-  while(*s1) {
-    if (strchr(s2, *s1++)) {
-      return (char*)--s1;
-    }
-  }
-  return 0;
-}
-
-
-
-#ifndef __LONG_LONG_MAX__
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#endif
-#ifndef ULLONG_MAX
-#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1)
-#endif
-
-unsigned long long strtoull(const char *__restrict nptr, char **__restrict endptr, int base)
-{
-  const char *s = nptr;
-  char c;
-  do { c = *s++; } while (isspace((unsigned char)c));
-
-  int neg = 0;
-  if (c == '-') {
-    neg = 1;
-    c = *s++;
-  } else {
-    if (c == '+') {
-      c = *s++;
-    }
-  }
-
-  if ((base == 0 || base == 16) && (c == '0') && (*s == 'x' || *s == 'X')) {
-    c = s[1];
-    s += 2;
-    base = 16;
-  }
-  if (base == 0) { base = (c == '0') ? 8 : 10; }
-
-  unsigned long long acc = 0;
-  int any = 0;
-  if (base > 1 && base < 37) {
-    unsigned long long cutoff = ULLONG_MAX / base;
-    int cutlim = ULLONG_MAX % base;
-    for ( ; ; c = *s++) {
-      if (c >= '0' && c <= '9')
-        c -= '0';
-      else if (c >= 'A' && c <= 'Z')
-        c -= 'A' - 10;
-      else if (c >= 'a' && c <= 'z')
-        c -= 'a' - 10;
-      else
-        break;
-
-      if (c >= base)
-        break;
-
-      if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-        any = -1;
-      else {
-        any = 1;
-        acc *= base;
-        acc += c;
-      }
-    }
-    if (any < 0) {
-      acc = ULLONG_MAX;
-    }
-    else if (any && neg) {
-      acc = -acc;
-    }
-  }
-
-  if (endptr != nullptr) { *endptr = (char *)(any ? s - 1 : nptr); }
-
-  return acc;
-}
-
-#endif
-
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0) || defined(ARDUINO_ESP8266_RELEASE_2_5_1) || defined(ARDUINO_ESP8266_RELEASE_2_5_2)
-
-
-
-
-
-void* memmove_P(void *dest, const void *src, size_t n)
-{
-  if (src > (void*)0x40000000) {
-    return memcpy_P(dest, src, n);
-  } else {
-    return memmove(dest, src, n);
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_rotary.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_rotary.ino"
-#ifdef USE_LIGHT
-
-#ifdef ROTARY_V1
-
-
-
-
-struct ROTARY {
-  unsigned long debounce = 0;
-  uint8_t present = 0;
-  uint8_t state = 0;
-  uint8_t position = 128;
-  uint8_t last_position = 128;
-  uint8_t interrupts_in_use_count = 0;
-  uint8_t changed = 0;
-} Rotary;
-
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void update_rotary(void) ICACHE_RAM_ATTR;
-#endif
-
-void update_rotary(void)
-{
-  if (MI_DESK_LAMP == my_module_type) {
-    if (LightPowerIRAM()) {
-
-
-
-
-      uint8_t s = Rotary.state & 3;
-      if (digitalRead(pin[GPIO_ROT1A])) { s |= 4; }
-      if (digitalRead(pin[GPIO_ROT1B])) { s |= 8; }
-      switch (s) {
-        case 0: case 5: case 10: case 15:
-          break;
-        case 1: case 7: case 8: case 14:
-          Rotary.position++; break;
-        case 2: case 4: case 11: case 13:
-          Rotary.position--; break;
-        case 3: case 12:
-          Rotary.position = Rotary.position + 2; break;
-        default:
-          Rotary.position = Rotary.position - 2; break;
-      }
-      Rotary.state = (s >> 2);
-    }
-  }
-}
-
-bool RotaryButtonPressed(void)
-{
-  if ((MI_DESK_LAMP == my_module_type) && (Rotary.changed) && LightPower()) {
-    Rotary.changed = 0;
-    return true;
-  }
-  return false;
-}
-
-void RotaryInit(void)
-{
-  Rotary.present = 0;
-  if ((pin[GPIO_ROT1A] < 99) && (pin[GPIO_ROT1B] < 99)) {
-    Rotary.present++;
-    pinMode(pin[GPIO_ROT1A], INPUT_PULLUP);
-    pinMode(pin[GPIO_ROT1B], INPUT_PULLUP);
-
-
-
-
-    if ((pin[GPIO_ROT1A] < 6) || (pin[GPIO_ROT1A] > 11)) {
-      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1A]), update_rotary, CHANGE);
-      Rotary.interrupts_in_use_count++;
-    }
-    if ((pin[GPIO_ROT1B] < 6) || (pin[GPIO_ROT1B] > 11)) {
-      attachInterrupt(digitalPinToInterrupt(pin[GPIO_ROT1B]), update_rotary, CHANGE);
-      Rotary.interrupts_in_use_count++;
-    }
-  }
-}
-
-
-
-
-
-void RotaryHandler(void)
-{
-  if (Rotary.interrupts_in_use_count < 2) {
-    noInterrupts();
-    update_rotary();
-  } else {
-    noInterrupts();
-  }
-  if (Rotary.last_position != Rotary.position) {
-    if (MI_DESK_LAMP == my_module_type) {
-      if (Button.hold_timer[0]) {
-        Rotary.changed = 1;
-
-        int16_t t = LightGetColorTemp();
-        t = t + (Rotary.position - Rotary.last_position);
-        if (t < 153) {
-          t = 153;
-        }
-        if (t > 500) {
-          t = 500;
-        }
-        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), Rotary.position - Rotary.last_position);
-        LightSetColorTemp((uint16_t)t);
-      } else {
-        int8_t d = Settings.light_dimmer;
-        d = d + (Rotary.position - Rotary.last_position);
-        if (d < 1) {
-          d = 1;
-        }
-        if (d > 100) {
-          d = 100;
-        }
-        DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), Rotary.position - Rotary.last_position);
-
-        LightSetDimmer((uint8_t)d);
-        Settings.light_dimmer = d;
-      }
-    }
-    Rotary.last_position = 128;
-    Rotary.position = 128;
-  }
-  interrupts();
-}
-
-void RotaryLoop(void)
-{
-  if (Rotary.present) {
-    if (TimeReached(Rotary.debounce)) {
-      SetNextTimeInterval(Rotary.debounce, Settings.button_debounce);
-      RotaryHandler();
-    }
-  }
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_rtc.ino"
-# 25 "S:/Development/Tasmota/tasmota/support_rtc.ino"
-const uint32_t SECS_PER_MIN = 60UL;
-const uint32_t SECS_PER_HOUR = 3600UL;
-const uint32_t SECS_PER_DAY = SECS_PER_HOUR * 24UL;
-const uint32_t MINS_PER_HOUR = 60UL;
-
-#define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
-
-extern "C" {
-#include "sntp.h"
-}
-#include <Ticker.h>
-
-Ticker TickerRtc;
-
-static const uint8_t kDaysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-static const char kMonthNamesEnglish[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
-
-struct RTC {
-  uint32_t utc_time = 0;
-  uint32_t local_time = 0;
-  uint32_t daylight_saving_time = 0;
-  uint32_t standard_time = 0;
-  uint32_t ntp_time = 0;
-  uint32_t midnight = 0;
-  uint32_t restart_time = 0;
-  int32_t time_timezone = 0;
-  uint8_t ntp_sync_minute = 0;
-  bool midnight_now = false;
-  bool user_time_entry = false;
-} Rtc;
-
-uint32_t UtcTime(void)
-{
-  return Rtc.utc_time;
-}
-
-uint32_t LocalTime(void)
-{
-  return Rtc.local_time;
-}
-
-uint32_t Midnight(void)
-{
-  return Rtc.midnight;
-}
-
-bool MidnightNow(void)
-{
-  if (Rtc.midnight_now) {
-    Rtc.midnight_now = false;
-    return true;
-  }
-  return false;
-}
-
-bool IsDst(void)
-{
-  if (Rtc.time_timezone == Settings.toffset[1]) {
-    return true;
-  }
-  return false;
-}
-
-String GetBuildDateAndTime(void)
-{
-
-  char bdt[21];
-  char *p;
-  char mdate[] = __DATE__;
-  char *smonth = mdate;
-  int day = 0;
-  int year = 0;
-
-
-  uint8_t i = 0;
-  for (char *str = strtok_r(mdate, " ", &p); str && i < 3; str = strtok_r(nullptr, " ", &p)) {
-    switch (i++) {
-    case 0:
-      smonth = str;
-      break;
-    case 1:
-      day = atoi(str);
-      break;
-    case 2:
-      year = atoi(str);
-    }
-  }
-  int month = (strstr(kMonthNamesEnglish, smonth) -kMonthNamesEnglish) /3 +1;
-  snprintf_P(bdt, sizeof(bdt), PSTR("%d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%s"), year, month, day, __TIME__);
-  return String(bdt);
-}
-
-String GetMinuteTime(uint32_t minutes)
-{
-  char tm[6];
-  snprintf_P(tm, sizeof(tm), PSTR("%02d:%02d"), minutes / 60, minutes % 60);
-
-  return String(tm);
-}
-
-String GetTimeZone(void)
-{
-  char tz[7];
-  snprintf_P(tz, sizeof(tz), PSTR("%+03d:%02d"), Rtc.time_timezone / 60, abs(Rtc.time_timezone % 60));
-
-  return String(tz);
-}
-
-String GetDuration(uint32_t time)
-{
-  char dt[16];
-
-  TIME_T ut;
-  BreakTime(time, ut);
-
-
-
-
-
-
-  snprintf_P(dt, sizeof(dt), PSTR("%dT%02d:%02d:%02d"), ut.days, ut.hour, ut.minute, ut.second);
-
-  return String(dt);
-}
-
-String GetDT(uint32_t time)
-{
-
-
-  char dt[20];
-  TIME_T tmpTime;
-
-  BreakTime(time, tmpTime);
-  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
-    tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
-
-  return String(dt);
-}
-# 175 "S:/Development/Tasmota/tasmota/support_rtc.ino"
-String GetDateAndTime(uint8_t time_type)
-{
-
-  uint32_t time = Rtc.local_time;
-
-  switch (time_type) {
-    case DT_UTC:
-      time = Rtc.utc_time;
-      break;
-
-
-
-    case DT_DST:
-      time = Rtc.daylight_saving_time;
-      break;
-    case DT_STD:
-      time = Rtc.standard_time;
-      break;
-    case DT_RESTART:
-      if (Rtc.restart_time == 0) {
-        return "";
-      }
-      time = Rtc.restart_time;
-      break;
-    case DT_ENERGY:
-      time = Settings.energy_kWhtotal_time;
-      break;
-    case DT_BOOTCOUNT:
-      time = Settings.bootcount_reset_time;
-      break;
-  }
-  String dt = GetDT(time);
-  if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {
-    dt += GetTimeZone();
-  }
-  return dt;
-}
-
-uint32_t UpTime(void)
-{
-  if (Rtc.restart_time) {
-    return Rtc.utc_time - Rtc.restart_time;
-  } else {
-    return uptime;
-  }
-}
-
-uint32_t MinutesUptime(void)
-{
-  return (UpTime() / 60);
-}
-
-String GetUptime(void)
-{
-  return GetDuration(UpTime());
-}
-
-uint32_t MinutesPastMidnight(void)
-{
-  uint32_t minutes = 0;
-
-  if (RtcTime.valid) {
-    minutes = (RtcTime.hour *60) + RtcTime.minute;
-  }
-  return minutes;
-}
-
-void BreakTime(uint32_t time_input, TIME_T &tm)
-{
-
-
-
-
-  uint8_t year;
-  uint8_t month;
-  uint8_t month_length;
-  uint32_t time;
-  unsigned long days;
-
-  time = time_input;
-  tm.second = time % 60;
-  time /= 60;
-  tm.minute = time % 60;
-  time /= 60;
-  tm.hour = time % 24;
-  time /= 24;
-  tm.days = time;
-  tm.day_of_week = ((time + 4) % 7) + 1;
-
-  year = 0;
-  days = 0;
-  while((unsigned)(days += (LEAP_YEAR(year) ? 366 : 365)) <= time) {
-    year++;
-  }
-  tm.year = year;
-
-  days -= LEAP_YEAR(year) ? 366 : 365;
-  time -= days;
-  tm.day_of_year = time;
-
-  for (month = 0; month < 12; month++) {
-    if (1 == month) {
-      if (LEAP_YEAR(year)) {
-        month_length = 29;
-      } else {
-        month_length = 28;
-      }
-    } else {
-      month_length = kDaysInMonth[month];
-    }
-
-    if (time >= month_length) {
-      time -= month_length;
-    } else {
-      break;
-    }
-  }
-  strlcpy(tm.name_of_month, kMonthNames + (month *3), 4);
-  tm.month = month + 1;
-  tm.day_of_month = time + 1;
-  tm.valid = (time_input > START_VALID_TIME);
-}
-
-uint32_t MakeTime(TIME_T &tm)
-{
-
-
-
-  int i;
-  uint32_t seconds;
-
-
-  seconds = tm.year * (SECS_PER_DAY * 365);
-  for (i = 0; i < tm.year; i++) {
-    if (LEAP_YEAR(i)) {
-      seconds += SECS_PER_DAY;
-    }
-  }
-
-
-  for (i = 1; i < tm.month; i++) {
-    if ((2 == i) && LEAP_YEAR(tm.year)) {
-      seconds += SECS_PER_DAY * 29;
-    } else {
-      seconds += SECS_PER_DAY * kDaysInMonth[i-1];
-    }
-  }
-  seconds+= (tm.day_of_month - 1) * SECS_PER_DAY;
-  seconds+= tm.hour * SECS_PER_HOUR;
-  seconds+= tm.minute * SECS_PER_MIN;
-  seconds+= tm.second;
-  return seconds;
-}
-
-uint32_t RuleToTime(TimeRule r, int yr)
-{
-  TIME_T tm;
-  uint32_t t;
-  uint8_t m;
-  uint8_t w;
-
-  m = r.month;
-  w = r.week;
-  if (0 == w) {
-    if (++m > 12) {
-      m = 1;
-      yr++;
-    }
-    w = 1;
-  }
-
-  tm.hour = r.hour;
-  tm.minute = 0;
-  tm.second = 0;
-  tm.day_of_month = 1;
-  tm.month = m;
-  tm.year = yr - 1970;
-  t = MakeTime(tm);
-  BreakTime(t, tm);
-  t += (7 * (w - 1) + (r.dow - tm.day_of_week + 7) % 7) * SECS_PER_DAY;
-  if (0 == r.week) {
-    t -= 7 * SECS_PER_DAY;
-  }
-  return t;
-}
-
-void RtcSecond(void)
-{
-  TIME_T tmpTime;
-
-  if (!Rtc.user_time_entry && !global_state.wifi_down) {
-    uint8_t uptime_minute = (uptime / 60) % 60;
-    if ((Rtc.ntp_sync_minute > 59) && (uptime_minute > 2)) {
-      Rtc.ntp_sync_minute = 1;
-    }
-    uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ;
-    if ( (((offset == RtcTime.second) && ( (RtcTime.year < 2016) ||
-                                           (Rtc.ntp_sync_minute == uptime_minute))) ||
-                                            ntp_force_sync ) ) {
-      Rtc.ntp_time = sntp_get_current_timestamp();
-      if (Rtc.ntp_time > START_VALID_TIME) {
-        ntp_force_sync = false;
-        Rtc.utc_time = Rtc.ntp_time;
-        Rtc.ntp_sync_minute = 60;
-        if (Rtc.restart_time == 0) {
-          Rtc.restart_time = Rtc.utc_time - uptime;
-        }
-        BreakTime(Rtc.utc_time, tmpTime);
-        RtcTime.year = tmpTime.year + 1970;
-        Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
-        Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
-
-
-        PrepLog_P2(LOG_LEVEL_DEBUG, PSTR("NTP: " D_UTC_TIME " %s, " D_DST_TIME " %s, " D_STD_TIME " %s"),
-          GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
-
-        if (Rtc.local_time < START_VALID_TIME) {
-          rules_flag.time_init = 1;
-        } else {
-          rules_flag.time_set = 1;
-        }
-      } else {
-        Rtc.ntp_sync_minute++;
-      }
-    }
-  }
-
-  Rtc.utc_time++;
-  Rtc.local_time = Rtc.utc_time;
-  if (Rtc.local_time > START_VALID_TIME) {
-    int16_t timezone_minutes = Settings.timezone_minutes;
-    if (Settings.timezone < 0) { timezone_minutes *= -1; }
-    Rtc.time_timezone = (Settings.timezone * SECS_PER_HOUR) + (timezone_minutes * SECS_PER_MIN);
-    if (99 == Settings.timezone) {
-      int32_t dstoffset = Settings.toffset[1] * SECS_PER_MIN;
-      int32_t stdoffset = Settings.toffset[0] * SECS_PER_MIN;
-      if (Settings.tflag[1].hemis) {
-
-        if ((Rtc.utc_time >= (Rtc.standard_time - dstoffset)) && (Rtc.utc_time < (Rtc.daylight_saving_time - stdoffset))) {
-          Rtc.time_timezone = stdoffset;
-        } else {
-          Rtc.time_timezone = dstoffset;
-        }
-      } else {
-
-        if ((Rtc.utc_time >= (Rtc.daylight_saving_time - stdoffset)) && (Rtc.utc_time < (Rtc.standard_time - dstoffset))) {
-          Rtc.time_timezone = dstoffset;
-        } else {
-          Rtc.time_timezone = stdoffset;
-        }
-      }
-    }
-    Rtc.local_time += Rtc.time_timezone;
-    Rtc.time_timezone /= 60;
-    if (!Settings.energy_kWhtotal_time) {
-      Settings.energy_kWhtotal_time = Rtc.local_time;
-    }
-    if (Settings.bootcount_reset_time < START_VALID_TIME) {
-      Settings.bootcount_reset_time = Rtc.local_time;
-    }
-  }
-
-  BreakTime(Rtc.local_time, RtcTime);
-  if (RtcTime.valid) {
-    if (!Rtc.midnight) {
-      Rtc.midnight = Rtc.local_time - (RtcTime.hour * 3600) - (RtcTime.minute * 60) - RtcTime.second;
-    }
-    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) {
-      Rtc.midnight = Rtc.local_time;
-      Rtc.midnight_now = true;
-    }
-  }
-
-  RtcTime.year += 1970;
-}
-
-void RtcSetTime(uint32_t epoch)
-{
-  if (epoch < START_VALID_TIME) {
-    Rtc.user_time_entry = false;
-    ntp_force_sync = true;
-    sntp_init();
-  } else {
-    sntp_stop();
-    Rtc.user_time_entry = true;
-    Rtc.utc_time = epoch -1;
-  }
-  RtcSecond();
-}
-
-void RtcInit(void)
-{
-  sntp_setservername(0, SettingsText(SET_NTPSERVER1));
-  sntp_setservername(1, SettingsText(SET_NTPSERVER2));
-  sntp_setservername(2, SettingsText(SET_NTPSERVER3));
-  sntp_stop();
-  sntp_set_timezone(0);
-  sntp_init();
-  Rtc.utc_time = 0;
-  BreakTime(Rtc.utc_time, RtcTime);
-  TickerRtc.attach(1, RtcSecond);
-}
-# 1 "S:/Development/Tasmota/tasmota/support_static_buffer.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_static_buffer.ino"
-typedef struct SBuffer_impl {
-  uint16_t size;
-  uint16_t len;
-  uint8_t buf[];
-} SBuffer_impl;
-
-
-
-typedef class SBuffer {
-
-protected:
-  SBuffer(void) {
-
-  }
-
-public:
-  SBuffer(const size_t size) {
-    _buf = (SBuffer_impl*) new char[size+4];
-    _buf->size = size;
-    _buf->len = 0;
-
-  }
-
-  inline size_t getSize(void) const { return _buf->size; }
-  inline size_t size(void) const { return _buf->size; }
-  inline size_t getLen(void) const { return _buf->len; }
-  inline size_t len(void) const { return _buf->len; }
-  inline uint8_t *getBuffer(void) const { return _buf->buf; }
-  inline uint8_t *buf(size_t i = 0) const { return &_buf->buf[i]; }
-  inline char *charptr(size_t i = 0) const { return (char*) &_buf->buf[i]; }
-
-  virtual ~SBuffer(void) {
-    delete[] _buf;
-  }
-
-  inline void setLen(const size_t len) {
-    uint16_t old_len = _buf->len;
-    _buf->len = (len <= _buf->size) ? len : _buf->size;
-    if (old_len < _buf->len) {
-      memset((void*) &_buf->buf[old_len], 0, _buf->len - old_len);
-    }
-  }
-
-  void set8(const size_t offset, const uint8_t data) {
-    if (offset < _buf->len) {
-      _buf->buf[offset] = data;
-    }
-  }
-
-  size_t add8(const uint8_t data) {
-    if (_buf->len < _buf->size) {
-      _buf->buf[_buf->len++] = data;
-    }
-    return _buf->len;
-  }
-  size_t add16(const uint16_t data) {
-    if (_buf->len < _buf->size - 1) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-    }
-    return _buf->len;
-  }
-  size_t add32(const uint32_t data) {
-    if (_buf->len < _buf->size - 3) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-      _buf->buf[_buf->len++] = data >> 16;
-      _buf->buf[_buf->len++] = data >> 24;
-    }
-    return _buf->len;
-  }
-  size_t add64(const uint64_t data) {
-    if (_buf->len < _buf->size - 7) {
-      _buf->buf[_buf->len++] = data;
-      _buf->buf[_buf->len++] = data >> 8;
-      _buf->buf[_buf->len++] = data >> 16;
-      _buf->buf[_buf->len++] = data >> 24;
-      _buf->buf[_buf->len++] = data >> 32;
-      _buf->buf[_buf->len++] = data >> 40;
-      _buf->buf[_buf->len++] = data >> 48;
-      _buf->buf[_buf->len++] = data >> 56;
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const SBuffer &buf2) {
-    if (len() + buf2.len() <= size()) {
-      for (uint32_t i = 0; i < buf2.len(); i++) {
-        _buf->buf[_buf->len++] = buf2.buf()[i];
-      }
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const uint8_t *buf2, size_t len2) {
-    if (len() + len2 <= size()) {
-      for (uint32_t i = 0; i < len2; i++) {
-        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
-      }
-    }
-    return _buf->len;
-  }
-
-  size_t addBuffer(const char *buf2, size_t len2) {
-    if (len() + len2 <= size()) {
-      for (uint32_t i = 0; i < len2; i++) {
-        _buf->buf[_buf->len++] = pgm_read_byte(&buf2[i]);
-      }
-    }
-    return _buf->len;
-  }
-
-  uint8_t get8(size_t offset) const {
-    if (offset < _buf->len) {
-      return _buf->buf[offset];
-    } else {
-      return 0;
-    }
-  }
-  uint8_t read8(const size_t offset) const {
-    if (offset < len()) {
-      return _buf->buf[offset];
-    }
-    return 0;
-  }
-  uint16_t get16(const size_t offset) const {
-    if (offset < len() - 1) {
-      return _buf->buf[offset] | (_buf->buf[offset+1] << 8);
-    }
-    return 0;
-  }
-  uint32_t get32(const size_t offset) const {
-    if (offset < len() - 3) {
-      return _buf->buf[offset] | (_buf->buf[offset+1] << 8) |
-            (_buf->buf[offset+2] << 16) | (_buf->buf[offset+3] << 24);
-    }
-    return 0;
-  }
-  uint64_t get64(const size_t offset) const {
-    if (offset < len() - 7) {
-      return (uint64_t)_buf->buf[offset] | ((uint64_t)_buf->buf[offset+1] << 8) |
-            ((uint64_t)_buf->buf[offset+2] << 16) | ((uint64_t)_buf->buf[offset+3] << 24) |
-            ((uint64_t)_buf->buf[offset+4] << 32) | ((uint64_t)_buf->buf[offset+5] << 40) |
-            ((uint64_t)_buf->buf[offset+6] << 48) | ((uint64_t)_buf->buf[offset+7] << 56);
-    }
-    return 0;
-  }
-
-
-  inline size_t strlen(const size_t offset) const {
-    return strnlen((const char*) &_buf->buf[offset], len() - offset);
-  }
-
-  size_t strlen_s(const size_t offset) const {
-    size_t slen = this->strlen(offset);
-    if (slen == len() - offset) {
-      return 0;
-    } else {
-      return slen;
-    }
-  }
-
-  SBuffer subBuffer(const size_t start, size_t len) const {
-    if (start >= _buf->len) {
-      len = 0;
-    } else if (start + len > _buf->len) {
-      len = _buf->len - start;
-    }
-
-    SBuffer buf2(len);
-    memcpy(buf2.buf(), buf()+start, len);
-    buf2._buf->len = len;
-    return buf2;
-  }
-
-  static SBuffer SBufferFromHex(const char *hex, size_t len) {
-    size_t buf_len = (len + 3) / 2;
-    SBuffer buf2(buf_len);
-    uint8_t val;
-
-    for (; len > 1; len -= 2) {
-      val = asc2byte(*hex++) << 4;
-      val |= asc2byte(*hex++);
-      buf2.add8(val);
-    }
-    return buf2;
-  }
-
-protected:
-
-  static uint8_t asc2byte(char chr) {
-    uint8_t rVal = 0;
-    if (isdigit(chr)) { rVal = chr - '0'; }
-    else if (chr >= 'A' && chr <= 'F') { rVal = chr + 10 - 'A'; }
-    else if (chr >= 'a' && chr <= 'f') { rVal = chr + 10 - 'a'; }
-    return rVal;
-  }
-
-  static void unHex(const char* in, uint8_t *out, size_t len) {
-  }
-
-protected:
-  SBuffer_impl * _buf;
-
-} SBuffer;
-
-typedef class PreAllocatedSBuffer : public SBuffer {
-
-public:
-  PreAllocatedSBuffer(const size_t size, void * buffer) {
-    _buf = (SBuffer_impl*) buffer;
-    _buf->size = size - 4;
-    _buf->len = 0;
-  }
-
-  ~PreAllocatedSBuffer(void) {
-
-    _buf = nullptr;
-  }
-} PreAllocatedSBuffer;
-# 1 "S:/Development/Tasmota/tasmota/support_statistics.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_statistics.ino"
-#define USE_STATS_CODE 
-
-#ifdef USE_STATS_CODE
-
-
-
-
-String GetStatistics(void)
-{
-  char data[40];
-  snprintf_P(data, sizeof(data), PSTR(",\"CR\":\"%d/%d\""), GetSettingsTextLen(), settings_text_size);
-  return String(data);
-}
-
-#else
-
-String GetStatistics(void)
-{
-  return String("");
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_switch.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_switch.ino"
-#define SWITCH_V2 
-#ifdef SWITCH_V2
-
-
-
-
-
-
-const uint8_t SWITCH_PROBE_INTERVAL = 10;
-
-#include <Ticker.h>
-
-Ticker TickerSwitch;
-
-struct SWITCH {
-  unsigned long debounce = 0;
-  uint16_t no_pullup_mask = 0;
-  uint8_t state[MAX_SWITCHES] = { 0 };
-  uint8_t last_state[MAX_SWITCHES];
-  uint8_t hold_timer[MAX_SWITCHES] = { 0 };
-  uint8_t virtual_state[MAX_SWITCHES];
-  uint8_t present = 0;
-} Switch;
-
-
-
-void SwitchPullupFlag(uint16 switch_bit)
-{
-  bitSet(Switch.no_pullup_mask, switch_bit);
-}
-
-void SwitchSetVirtual(uint32_t index, uint8_t state)
-{
-  Switch.virtual_state[index] = state;
-}
-
-uint8_t SwitchGetVirtual(uint32_t index)
-{
-  return Switch.virtual_state[index];
-}
-
-uint8_t SwitchLastState(uint32_t index)
-{
-  return Switch.last_state[index];
-}
-
-bool SwitchState(uint32_t index)
-{
-  uint32_t switchmode = Settings.switchmode[index];
-  return ((FOLLOW_INV == switchmode) ||
-          (PUSHBUTTON_INV == switchmode) ||
-          (PUSHBUTTONHOLD_INV == switchmode) ||
-          (FOLLOWMULTI_INV == switchmode) ||
-          (PUSHHOLDMULTI_INV == switchmode)
-         ) ^ Switch.last_state[index];
-}
-
-
-
-void SwitchProbe(void)
-{
-  if (uptime < 4) { return; }
-
-  uint8_t state_filter = Settings.switch_debounce / SWITCH_PROBE_INTERVAL;
-  uint8_t force_high = (Settings.switch_debounce % 50) &1;
-  uint8_t force_low = (Settings.switch_debounce % 50) &2;
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    if (pin[GPIO_SWT1 +i] < 99) {
-
-      if (1 == digitalRead(pin[GPIO_SWT1 +i])) {
-
-        if (force_high) {
-          if (1 == Switch.virtual_state[i]) {
-            Switch.state[i] = state_filter;
-          }
-        }
-
-        if (Switch.state[i] < state_filter) {
-          Switch.state[i]++;
-          if (state_filter == Switch.state[i]) {
-            Switch.virtual_state[i] = 1;
-          }
-        }
-      } else {
-
-        if (force_low) {
-          if (0 == Switch.virtual_state[i]) {
-            Switch.state[i] = 0;
-          }
-        }
-
-        if (Switch.state[i] > 0) {
-          Switch.state[i]--;
-          if (0 == Switch.state[i]) {
-            Switch.virtual_state[i] = 0;
-          }
-        }
-      }
-    }
-  }
-  TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe);
-}
-
-void SwitchInit(void)
-{
-  Switch.present = 0;
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    Switch.last_state[i] = 1;
-    if (pin[GPIO_SWT1 +i] < 99) {
-      Switch.present++;
-      pinMode(pin[GPIO_SWT1 +i], bitRead(Switch.no_pullup_mask, i) ? INPUT : ((16 == pin[GPIO_SWT1 +i]) ? INPUT_PULLDOWN_16 : INPUT_PULLUP));
-      Switch.last_state[i] = digitalRead(pin[GPIO_SWT1 +i]);
-    }
-    Switch.virtual_state[i] = Switch.last_state[i];
-  }
-  if (Switch.present) { TickerSwitch.attach_ms(SWITCH_PROBE_INTERVAL, SwitchProbe); }
-}
-
-
-
-
-
-void SwitchHandler(uint8_t mode)
-{
-  if (uptime < 4) { return; }
-
-  uint16_t loops_per_second = 1000 / Settings.switch_debounce;
-
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-    if ((pin[GPIO_SWT1 +i] < 99) || (mode)) {
-      uint8_t button = Switch.virtual_state[i];
-      uint8_t switchflag = POWER_TOGGLE +1;
-
-      if (Switch.hold_timer[i]) {
-        Switch.hold_timer[i]--;
-        if (0 == Switch.hold_timer[i]) {
-
-          switch (Settings.switchmode[i]) {
-            case TOGGLEMULTI:
-              switchflag = POWER_TOGGLE;
-              break;
-            case FOLLOWMULTI:
-              switchflag = button &1;
-              break;
-            case FOLLOWMULTI_INV:
-              switchflag = ~button &1;
-              break;
-            case PUSHHOLDMULTI:
-              if (NOT_PRESSED == button){
-                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
-              }
-              else
-                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
-              break;
-            case PUSHHOLDMULTI_INV:
-              if (PRESSED == button){
-                Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 25;
-                SendKey(KEY_SWITCH, i +1, POWER_INCREMENT);
-              }
-              else
-                SendKey(KEY_SWITCH, i +1, POWER_CLEAR);
-              break;
-          default:
-            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
-            break;
-          }
-        }
-      }
-
-
-
-      if (button != Switch.last_state[i]) {
-        switch (Settings.switchmode[i]) {
-        case TOGGLE:
-        case PUSHBUTTON_TOGGLE:
-          switchflag = POWER_TOGGLE;
-          break;
-        case FOLLOW:
-          switchflag = button &1;
-          break;
-        case FOLLOW_INV:
-          switchflag = ~button &1;
-          break;
-        case PUSHBUTTON:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTON_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTONHOLD:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case PUSHBUTTONHOLD_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;
-          }
-          break;
-        case TOGGLEMULTI:
-        case FOLLOWMULTI:
-        case FOLLOWMULTI_INV:
-          if (Switch.hold_timer[i]) {
-            Switch.hold_timer[i] = 0;
-            SendKey(KEY_SWITCH, i +1, POWER_HOLD);
-          } else {
-            Switch.hold_timer[i] = loops_per_second / 2;
-          }
-          break;
-        case PUSHHOLDMULTI:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i]!=0)
-              SendKey(KEY_SWITCH, i +1, POWER_INV);
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
-              switchflag = POWER_TOGGLE;
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          break;
-        case PUSHHOLDMULTI_INV:
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i]!=0)
-              SendKey(KEY_SWITCH, i +1, POWER_INV);
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            if(Switch.hold_timer[i] > loops_per_second * Settings.param[P_HOLD_TIME] / 25)
-              switchflag = POWER_TOGGLE;
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
-          }
-          break;
-        }
-        Switch.last_state[i] = button;
-      }
-      if (switchflag <= POWER_TOGGLE) {
-        if (!SendKey(KEY_SWITCH, i +1, switchflag)) {
-          ExecuteCommandPower(i +1, switchflag, SRC_SWITCH);
-        }
-      }
-    }
-  }
-}
-
-void SwitchLoop(void)
-{
-  if (Switch.present) {
-    if (TimeReached(Switch.debounce)) {
-      SetNextTimeInterval(Switch.debounce, Settings.switch_debounce);
-      SwitchHandler(0);
-    }
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-const char kSleepMode[] PROGMEM = "Dynamic|Normal";
-const char kPrefixes[] PROGMEM = D_CMND "|" D_STAT "|" D_TELE;
-
-char* Format(char* output, const char* input, int size)
-{
-  char *token;
-  uint32_t digits = 0;
-
-  if (strstr(input, "%") != nullptr) {
-    strlcpy(output, input, size);
-    token = strtok(output, "%");
-    if (strstr(input, "%") == input) {
-      output[0] = '\0';
-    } else {
-      token = strtok(nullptr, "");
-    }
-    if (token != nullptr) {
-      digits = atoi(token);
-      if (digits) {
-        char tmp[size];
-        if (strchr(token, 'd')) {
-          snprintf_P(tmp, size, PSTR("%s%c0%dd"), output, '%', digits);
-          snprintf_P(output, size, tmp, ESP.getChipId() & 0x1fff);
-        } else {
-          snprintf_P(tmp, size, PSTR("%s%c0%dX"), output, '%', digits);
-          snprintf_P(output, size, tmp, ESP.getChipId());
-        }
-      } else {
-        if (strchr(token, 'd')) {
-          snprintf_P(output, size, PSTR("%s%d"), output, ESP.getChipId());
-          digits = 8;
-        }
-      }
-    }
-  }
-  if (!digits) {
-    strlcpy(output, input, size);
-  }
-  return output;
-}
-
-char* GetOtaUrl(char *otaurl, size_t otaurl_size)
-{
-  if (strstr(SettingsText(SET_OTAURL), "%04d") != nullptr) {
-    snprintf(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId() & 0x1fff);
-  }
-  else if (strstr(SettingsText(SET_OTAURL), "%d") != nullptr) {
-    snprintf_P(otaurl, otaurl_size, SettingsText(SET_OTAURL), ESP.getChipId());
-  }
-  else {
-    strlcpy(otaurl, SettingsText(SET_OTAURL), otaurl_size);
-  }
-
-  return otaurl;
-}
-
-char* GetTopic_P(char *stopic, uint32_t prefix, char *topic, const char* subtopic)
-{
-# 88 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-  char romram[CMDSZ];
-  String fulltopic;
-
-  snprintf_P(romram, sizeof(romram), subtopic);
-  if (fallback_topic_flag || (prefix > 3)) {
-    bool fallback = (prefix < 8);
-    prefix &= 3;
-    char stemp[11];
-    fulltopic = GetTextIndexed(stemp, sizeof(stemp), prefix, kPrefixes);
-    fulltopic += F("/");
-    if (fallback) {
-      fulltopic += mqtt_client;
-      fulltopic += F("_fb");
-    } else {
-      fulltopic += topic;
-    }
-  } else {
-    fulltopic = SettingsText(SET_MQTT_FULLTOPIC);
-    if ((0 == prefix) && (-1 == fulltopic.indexOf(FPSTR(MQTT_TOKEN_PREFIX)))) {
-      fulltopic += F("/");
-      fulltopic += FPSTR(MQTT_TOKEN_PREFIX);
-    }
-    for (uint32_t i = 0; i < MAX_MQTT_PREFIXES; i++) {
-      if (!strlen(SettingsText(SET_MQTTPREFIX1 + i))) {
-        char temp[TOPSZ];
-        SettingsUpdateText(SET_MQTTPREFIX1 + i, GetTextIndexed(temp, sizeof(temp), i, kPrefixes));
-      }
-    }
-    fulltopic.replace(FPSTR(MQTT_TOKEN_PREFIX), SettingsText(SET_MQTTPREFIX1 + prefix));
-
-    fulltopic.replace(FPSTR(MQTT_TOKEN_TOPIC), topic);
-    fulltopic.replace(F("%hostname%"), my_hostname);
-    String token_id = WiFi.macAddress();
-    token_id.replace(":", "");
-    fulltopic.replace(F("%id%"), token_id);
-  }
-  fulltopic.replace(F("#"), "");
-  fulltopic.replace(F("//"), "/");
-  if (!fulltopic.endsWith("/")) {
-    fulltopic += "/";
-  }
-  snprintf_P(stopic, TOPSZ, PSTR("%s%s"), fulltopic.c_str(), romram);
-  return stopic;
-}
-
-char* GetGroupTopic_P(char *stopic, const char* subtopic)
-{
-
-
-  return GetTopic_P(stopic, (Settings.flag3.grouptopic_mode) ? CMND +8 : CMND, SettingsText(SET_MQTT_GRP_TOPIC), subtopic);
-}
-
-char* GetFallbackTopic_P(char *stopic, const char* subtopic)
-{
-  return GetTopic_P(stopic, CMND +4, nullptr, subtopic);
-}
-
-char* GetStateText(uint32_t state)
-{
-  if (state >= MAX_STATE_TEXT) {
-    state = 1;
-  }
-  return SettingsText(SET_STATE_TXT1 + state);
-}
-
-
-
-void SetLatchingRelay(power_t lpower, uint32_t state)
-{
-
-
-
-
-
-  if (state && !latching_relay_pulse) {
-    latching_power = lpower;
-    latching_relay_pulse = 2;
-  }
-
-  for (uint32_t i = 0; i < devices_present; i++) {
-    uint32_t port = (i << 1) + ((latching_power >> i) &1);
-    DigitalWrite(GPIO_REL1 +port, bitRead(rel_inverted, port) ? !state : state);
-  }
-}
-
-void SetDevicePower(power_t rpower, uint32_t source)
-{
-  ShowSource(source);
-  last_source = source;
-
-  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-    power = (1 << devices_present) -1;
-    rpower = power;
-  }
-
-  if (Settings.flag.interlock) {
-    for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-      power_t mask = 1;
-      uint32_t count = 0;
-      for (uint32_t j = 0; j < devices_present; j++) {
-        if ((Settings.interlock[i] & mask) && (rpower & mask)) {
-          count++;
-        }
-        mask <<= 1;
-      }
-      if (count > 1) {
-        mask = ~Settings.interlock[i];
-        power &= mask;
-        rpower &= mask;
-      }
-    }
-  }
-
-  if (rpower) {
-    last_power = rpower;
-  }
-
-  XdrvMailbox.index = rpower;
-  XdrvCall(FUNC_SET_POWER);
-
-  XdrvMailbox.index = rpower;
-  XdrvMailbox.payload = source;
-  if (XdrvCall(FUNC_SET_DEVICE_POWER)) {
-
-  }
-  else if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-    Serial.write(0xA0);
-    Serial.write(0x04);
-    Serial.write(rpower &0xFF);
-    Serial.write(0xA1);
-    Serial.write('\n');
-    Serial.flush();
-  }
-  else if (EXS_RELAY == my_module_type) {
-    SetLatchingRelay(rpower, 1);
-  }
-  else {
-    for (uint32_t i = 0; i < devices_present; i++) {
-      power_t state = rpower &1;
-      if (i < MAX_RELAYS) {
-        DigitalWrite(GPIO_REL1 +i, bitRead(rel_inverted, i) ? !state : state);
-      }
-      rpower >>= 1;
-    }
-  }
-}
-
-void RestorePower(bool publish_power, uint32_t source)
-{
-  if (power != last_power) {
-    power = last_power;
-    SetDevicePower(power, source);
-    if (publish_power) {
-      MqttPublishAllPowerState();
-    }
-  }
-}
-
-void SetAllPower(uint32_t state, uint32_t source)
-{
-# 256 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-  bool publish_power = true;
-  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
-    state &= 3;
-    publish_power = false;
-  }
-  if ((state >= POWER_OFF) && (state <= POWER_TOGGLE)) {
-    power_t all_on = (1 << devices_present) -1;
-    switch (state) {
-    case POWER_OFF:
-      power = 0;
-      break;
-    case POWER_ON:
-      power = all_on;
-      break;
-    case POWER_TOGGLE:
-      power ^= all_on;
-    }
-    SetDevicePower(power, source);
-  }
-  if (publish_power) {
-    MqttPublishAllPowerState();
-  }
-}
-
-void SetPowerOnState(void)
-{
-  if (MOTOR == my_module_type) {
-    Settings.poweronstate = POWER_ALL_ON;
-  }
-  if (POWER_ALL_ALWAYS_ON == Settings.poweronstate) {
-    SetDevicePower(1, SRC_RESTART);
-  } else {
-    if ((ResetReason() == REASON_DEFAULT_RST) || (ResetReason() == REASON_EXT_SYS_RST)) {
-      switch (Settings.poweronstate) {
-      case POWER_ALL_OFF:
-      case POWER_ALL_OFF_PULSETIME_ON:
-        power = 0;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_ON:
-        power = (1 << devices_present) -1;
-        SetDevicePower(power, SRC_RESTART);
-        break;
-      case POWER_ALL_SAVED_TOGGLE:
-        power = (Settings.power & ((1 << devices_present) -1)) ^ POWER_MASK;
-        if (Settings.flag.save_state) {
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      case POWER_ALL_SAVED:
-        power = Settings.power & ((1 << devices_present) -1);
-        if (Settings.flag.save_state) {
-          SetDevicePower(power, SRC_RESTART);
-        }
-        break;
-      }
-    } else {
-      power = Settings.power & ((1 << devices_present) -1);
-      if (Settings.flag.save_state) {
-        SetDevicePower(power, SRC_RESTART);
-      }
-    }
-  }
-
-
-  for (uint32_t i = 0; i < devices_present; i++) {
-    if (!Settings.flag3.no_power_feedback) {
-      if ((i < MAX_RELAYS) && (pin[GPIO_REL1 +i] < 99)) {
-        bitWrite(power, i, digitalRead(pin[GPIO_REL1 +i]) ^ bitRead(rel_inverted, i));
-      }
-    }
-    if ((i < MAX_PULSETIMERS) && (bitRead(power, i) || (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate))) {
-      SetPulseTimer(i, Settings.pulse_timer[i]);
-    }
-  }
-  blink_powersave = power;
-}
-
-void SetLedPowerIdx(uint32_t led, uint32_t state)
-{
-  if ((99 == pin[GPIO_LEDLNK]) && (0 == led)) {
-    if (pin[GPIO_LED2] < 99) {
-      led = 1;
-    }
-  }
-  if (pin[GPIO_LED1 + led] < 99) {
-    uint32_t mask = 1 << led;
-    if (state) {
-      state = 1;
-      led_power |= mask;
-    } else {
-      led_power &= (0xFF ^ mask);
-    }
-    DigitalWrite(GPIO_LED1 + led, bitRead(led_inverted, led) ? !state : state);
-  }
-#ifdef USE_BUZZER
-  if (led == 0) {
-    BuzzerSetStateToLed(state);
-  }
-#endif
-}
-
-void SetLedPower(uint32_t state)
-{
-  if (99 == pin[GPIO_LEDLNK]) {
-    SetLedPowerIdx(0, state);
-  } else {
-    power_t mask = 1;
-    for (uint32_t i = 0; i < leds_present; i++) {
-      bool tstate = (power & mask);
-      SetLedPowerIdx(i, tstate);
-      mask <<= 1;
-    }
-  }
-}
-
-void SetLedPowerAll(uint32_t state)
-{
-  for (uint32_t i = 0; i < leds_present; i++) {
-    SetLedPowerIdx(i, state);
-  }
-}
-
-void SetLedLink(uint32_t state)
-{
-  uint32_t led_pin = pin[GPIO_LEDLNK];
-  uint32_t led_inv = ledlnk_inverted;
-  if (99 == led_pin) {
-    led_pin = pin[GPIO_LED1];
-    led_inv = bitRead(led_inverted, 0);
-  }
-  if (led_pin < 99) {
-    if (state) { state = 1; }
-    digitalWrite(led_pin, (led_inv) ? !state : state);
-  }
-#ifdef USE_BUZZER
-  BuzzerSetStateToLed(state);
-#endif
-}
-
-void SetPulseTimer(uint32_t index, uint32_t time)
-{
-  pulse_timer[index] = (time > 111) ? millis() + (1000 * (time - 100)) : (time > 0) ? millis() + (100 * time) : 0L;
-}
-
-uint32_t GetPulseTimer(uint32_t index)
-{
-  long time = TimePassedSince(pulse_timer[index]);
-  if (time < 0) {
-    time *= -1;
-    return (time > 11100) ? (time / 1000) + 100 : (time > 0) ? time / 100 : 0;
-  }
-  return 0;
-}
-
-
-
-bool SendKey(uint32_t key, uint32_t device, uint32_t state)
-{
-# 423 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-  char stopic[TOPSZ];
-  char scommand[CMDSZ];
-  char key_topic[TOPSZ];
-  bool result = false;
-
-  char *tmp = (key) ? SettingsText(SET_MQTT_SWITCH_TOPIC) : SettingsText(SET_MQTT_BUTTON_TOPIC);
-  Format(key_topic, tmp, sizeof(key_topic));
-  if (Settings.flag.mqtt_enabled && MqttIsConnected() && (strlen(key_topic) != 0) && strcmp(key_topic, "0")) {
-    if (!key && (device > devices_present)) {
-      device = 1;
-    }
-    GetTopic_P(stopic, CMND, key_topic,
-               GetPowerDevice(scommand, device, sizeof(scommand), (key + Settings.flag.device_index_enable)));
-    if (CLEAR_RETAIN == state) {
-      mqtt_data[0] = '\0';
-    } else {
-      if ((Settings.flag3.button_switch_force_local ||
-           !strcmp(mqtt_topic, key_topic) ||
-           !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic)) &&
-          (POWER_TOGGLE == state)) {
-        state = ~(power >> (device -1)) &1;
-      }
-      snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(state));
-    }
-#ifdef USE_DOMOTICZ
-    if (!(DomoticzSendKey(key, device, state, strlen(mqtt_data)))) {
-#endif
-      MqttPublish(stopic, ((key) ? Settings.flag.mqtt_switch_retain
-                                 : Settings.flag.mqtt_button_retain) &&
-                                 (state != POWER_HOLD || !Settings.flag3.no_hold_retain));
-#ifdef USE_DOMOTICZ
-    }
-#endif
-    result = !Settings.flag3.button_switch_force_local;
-  } else {
-    Response_P(PSTR("{\"%s%d\":{\"State\":%d}}"), (key) ? "Switch" : "Button", device, state);
-    result = XdrvRulesProcess();
-  }
-  int32_t payload_save = XdrvMailbox.payload;
-  XdrvMailbox.payload = key << 16 | state << 8 | device;
-  XdrvCall(FUNC_ANY_KEY);
-  XdrvMailbox.payload = payload_save;
-  return result;
-}
-
-void ExecuteCommandPower(uint32_t device, uint32_t state, uint32_t source)
-{
-# 483 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) {
-    blink_mask &= 1;
-    Settings.flag.interlock = 0;
-    Settings.pulse_timer[1] = 0;
-    Settings.pulse_timer[2] = 0;
-    Settings.pulse_timer[3] = 0;
-  }
-#endif
-
-  bool publish_power = true;
-  if ((state >= POWER_OFF_NO_STATE) && (state <= POWER_TOGGLE_NO_STATE)) {
-    state &= 3;
-    publish_power = false;
-  }
-
-  if ((device < 1) || (device > devices_present)) {
-    device = 1;
-  }
-  active_device = device;
-
-  if (device <= MAX_PULSETIMERS) {
-    SetPulseTimer(device -1, 0);
-  }
-  power_t mask = 1 << (device -1);
-  if (state <= POWER_TOGGLE) {
-    if ((blink_mask & mask)) {
-      blink_mask &= (POWER_MASK ^ mask);
-      MqttPublishPowerBlinkState(device);
-    }
-
-    if (Settings.flag.interlock &&
-        !interlock_mutex &&
-        ((POWER_ON == state) || ((POWER_TOGGLE == state) && !(power & mask)))
-       ) {
-      interlock_mutex = true;
-      for (uint32_t i = 0; i < MAX_INTERLOCKS; i++) {
-        if (Settings.interlock[i] & mask) {
-          for (uint32_t j = 0; j < devices_present; j++) {
-            power_t imask = 1 << j;
-            if ((Settings.interlock[i] & imask) && (power & imask) && (mask != imask)) {
-              ExecuteCommandPower(j +1, POWER_OFF, SRC_IGNORE);
-              delay(50);
-            }
-          }
-          break;
-        }
-      }
-      interlock_mutex = false;
-    }
-
-    switch (state) {
-    case POWER_OFF: {
-      power &= (POWER_MASK ^ mask);
-      break; }
-    case POWER_ON:
-      power |= mask;
-      break;
-    case POWER_TOGGLE:
-      power ^= mask;
-    }
-#ifdef USE_DEVICE_GROUPS
-    if (SRC_REMOTE != source && SRC_RETRY != source) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_POWER, power);
-#endif
-    SetDevicePower(power, source);
-#ifdef USE_DOMOTICZ
-    DomoticzUpdatePowerState(device);
-#endif
-#ifdef USE_KNX
-    KnxUpdatePowerState(device, power);
-#endif
-    if (publish_power && Settings.flag3.hass_tele_on_power) {
-      MqttPublishTeleState();
-    }
-    if (device <= MAX_PULSETIMERS) {
-      SetPulseTimer(device -1, (((POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? ~power : power) & mask) ? Settings.pulse_timer[device -1] : 0);
-    }
-  }
-  else if (POWER_BLINK == state) {
-    if (!(blink_mask & mask)) {
-      blink_powersave = (blink_powersave & (POWER_MASK ^ mask)) | (power & mask);
-      blink_power = (power >> (device -1))&1;
-    }
-    blink_timer = millis() + 100;
-    blink_counter = ((!Settings.blinkcount) ? 64000 : (Settings.blinkcount *2)) +1;
-    blink_mask |= mask;
-    MqttPublishPowerBlinkState(device);
-    return;
-  }
-  else if (POWER_BLINK_STOP == state) {
-    bool flag = (blink_mask & mask);
-    blink_mask &= (POWER_MASK ^ mask);
-    MqttPublishPowerBlinkState(device);
-    if (flag) {
-      ExecuteCommandPower(device, (blink_powersave >> (device -1))&1, SRC_IGNORE);
-    }
-    return;
-  }
-  if (publish_power) {
-    MqttPublishPowerState(device);
-  }
-}
-
-void StopAllPowerBlink(void)
-{
-  power_t mask;
-
-  for (uint32_t i = 1; i <= devices_present; i++) {
-    mask = 1 << (i -1);
-    if (blink_mask & mask) {
-      blink_mask &= (POWER_MASK ^ mask);
-      MqttPublishPowerBlinkState(i);
-      ExecuteCommandPower(i, (blink_powersave >> (i -1))&1, SRC_IGNORE);
-    }
-  }
-}
-
-void MqttShowPWMState(void)
-{
-  ResponseAppend_P(PSTR("\"" D_CMND_PWM "\":{"));
-  bool first = true;
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    if (pin[GPIO_PWM1 + i] < 99) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_PWM "%d\":%d"), first ? "" : ",", i+1, Settings.pwm_value[i]);
-      first = false;
-    }
-  }
-  ResponseJsonEnd();
-}
-
-void MqttShowState(void)
-{
-  char stemp1[TOPSZ];
-
-  ResponseAppendTime();
-  ResponseAppend_P(PSTR(",\"" D_JSON_UPTIME "\":\"%s\",\"UptimeSec\":%u"), GetUptime().c_str(), UpTime());
-
-#ifdef USE_ADC_VCC
-  dtostrfd((double)ESP.getVcc()/1000, 3, stemp1);
-  ResponseAppend_P(PSTR(",\"" D_JSON_VCC "\":%s"), stemp1);
-#endif
-
-  ResponseAppend_P(PSTR(",\"" D_JSON_HEAPSIZE "\":%d,\"SleepMode\":\"%s\",\"Sleep\":%u,\"LoadAvg\":%u,\"MqttCount\":%u"),
-    ESP.getFreeHeap()/1024, GetTextIndexed(stemp1, sizeof(stemp1), Settings.flag3.sleep_normal, kSleepMode),
-    sleep, loop_load_avg, MqttConnectCount());
-
-  for (uint32_t i = 1; i <= devices_present; i++) {
-#ifdef USE_LIGHT
-    if ((LightDevice()) && (i >= LightDevice())) {
-      if (i == LightDevice()) { LightState(1); }
-    } else {
-#endif
-      ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable),
-                                               GetStateText(bitRead(power, i-1)));
-#ifdef USE_SONOFF_IFAN
-      if (IsModuleIfan()) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_FANSPEED "\":%d"), GetFanspeed());
-        break;
-      }
-#endif
-#ifdef USE_LIGHT
-    }
-#endif
-  }
-
-  if (pwm_present) {
-    ResponseAppend_P(PSTR(","));
-    MqttShowPWMState();
-  }
-
-  int32_t rssi = WiFi.RSSI();
-  ResponseAppend_P(PSTR(",\"" D_JSON_WIFI "\":{\"" D_JSON_AP "\":%d,\"" D_JSON_SSID "\":\"%s\",\"" D_JSON_BSSID "\":\"%s\",\"" D_JSON_CHANNEL "\":%d,\"" D_JSON_RSSI "\":%d,\"" D_JSON_SIGNAL "\":%d,\"" D_JSON_LINK_COUNT "\":%d,\"" D_JSON_DOWNTIME "\":\"%s\"}}"),
-    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WiFi.BSSIDstr().c_str(), WiFi.channel(),
-    WifiGetRssiAsQuality(rssi), rssi, WifiLinkCount(), WifiDowntime().c_str());
-}
-
-void MqttPublishTeleState(void)
-{
-  mqtt_data[0] = '\0';
-  MqttShowState();
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_STATE), MQTT_TELE_RETAIN);
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-  RulesTeleperiod();
-#endif
-}
-
-bool MqttShowSensor(void)
-{
-  ResponseAppendTime();
-
-  int json_data_start = strlen(mqtt_data);
-  for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-#ifdef USE_TM1638
-    if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
-#else
-    if (pin[GPIO_SWT1 +i] < 99) {
-#endif
-      ResponseAppend_P(PSTR(",\"" D_JSON_SWITCH "%d\":\"%s\""), i +1, GetStateText(SwitchState(i)));
-    }
-  }
-  XsnsCall(FUNC_JSON_APPEND);
-  XdrvCall(FUNC_JSON_APPEND);
-
-  bool json_data_available = (strlen(mqtt_data) - json_data_start);
-  if (strstr_P(mqtt_data, PSTR(D_JSON_PRESSURE)) != nullptr) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_PRESSURE_UNIT "\":\"%s\""), PressureUnit().c_str());
-  }
-  if (strstr_P(mqtt_data, PSTR(D_JSON_TEMPERATURE)) != nullptr) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
-  }
-  ResponseJsonEnd();
-
-  if (json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }
-  return json_data_available;
-}
-
-void MqttPublishSensor(void)
-{
-  mqtt_data[0] = '\0';
-  if (MqttShowSensor()) {
-    MqttPublishTeleSensor();
-  }
-}
-# 714 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-void PerformEverySecond(void)
-{
-  uptime++;
-
-  if (POWER_CYCLE_TIME == uptime) {
-    UpdateQuickPowerCycle(false);
-  }
-
-  if (BOOT_LOOP_TIME == uptime) {
-    RtcRebootReset();
-
-#ifdef USE_DEEPSLEEP
-    if (!(DeepSleepEnabled() && !Settings.flag3.bootcount_update)) {
-#endif
-      Settings.bootcount++;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BOOT_COUNT " %d"), Settings.bootcount);
-#ifdef USE_DEEPSLEEP
-    }
-#endif
-  }
-
-  if (mqtt_cmnd_blocked_reset) {
-    mqtt_cmnd_blocked_reset--;
-    if (!mqtt_cmnd_blocked_reset) {
-      mqtt_cmnd_blocked = 0;
-    }
-  }
-
-  if (seriallog_timer) {
-    seriallog_timer--;
-    if (!seriallog_timer) {
-      if (seriallog_level) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SERIAL_LOGGING_DISABLED));
-      }
-      seriallog_level = 0;
-    }
-  }
-
-  if (syslog_timer) {
-    syslog_timer--;
-    if (!syslog_timer) {
-      syslog_level = Settings.syslog_level;
-      if (Settings.syslog_level) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_SYSLOG_LOGGING_REENABLED));
-      }
-    }
-  }
-
-  ResetGlobalValues();
-
-  if (Settings.tele_period) {
-    if (tele_period >= 9999) {
-      if (!global_state.wifi_down) {
-        tele_period = 0;
-      }
-    } else {
-      tele_period++;
-      if (tele_period >= Settings.tele_period) {
-        tele_period = 0;
-
-        MqttPublishTeleState();
-
-        mqtt_data[0] = '\0';
-        if (MqttShowSensor()) {
-          MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-          RulesTeleperiod();
-#endif
-        }
-
-        XdrvCall(FUNC_AFTER_TELEPERIOD);
-      }
-    }
-  }
-}
-
-
-
-
-
-void Every100mSeconds(void)
-{
-
-  power_t power_now;
-
-  if (prepped_loglevel) {
-    AddLog(prepped_loglevel);
-    prepped_loglevel = 0;
-  }
-
-  if (latching_relay_pulse) {
-    latching_relay_pulse--;
-    if (!latching_relay_pulse) SetLatchingRelay(0, 0);
-  }
-
-  for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
-    if (pulse_timer[i] != 0L) {
-      if (TimeReached(pulse_timer[i])) {
-        pulse_timer[i] = 0L;
-        ExecuteCommandPower(i +1, (POWER_ALL_OFF_PULSETIME_ON == Settings.poweronstate) ? POWER_ON : POWER_OFF, SRC_PULSETIMER);
-      }
-    }
-  }
-
-  if (blink_mask) {
-    if (TimeReached(blink_timer)) {
-      SetNextTimeInterval(blink_timer, 100 * Settings.blinktime);
-      blink_counter--;
-      if (!blink_counter) {
-        StopAllPowerBlink();
-      } else {
-        blink_power ^= 1;
-        power_now = (power & (POWER_MASK ^ blink_mask)) | ((blink_power) ? blink_mask : 0);
-        SetDevicePower(power_now, SRC_IGNORE);
-      }
-    }
-  }
-}
-
-
-
-
-
-void Every250mSeconds(void)
-{
-
-
-  uint32_t blinkinterval = 1;
-
-  state_250mS++;
-  state_250mS &= 0x3;
-
-  if (!Settings.flag.global_state) {
-    if (global_state.data) {
-      if (global_state.mqtt_down) { blinkinterval = 7; }
-      if (global_state.wifi_down) { blinkinterval = 3; }
-      blinks = 201;
-    }
-  }
-  if (blinks || restart_flag || ota_state_flag) {
-    if (restart_flag || ota_state_flag) {
-      blinkstate = true;
-    } else {
-      blinkspeed--;
-      if (!blinkspeed) {
-        blinkspeed = blinkinterval;
-        blinkstate ^= 1;
-      }
-    }
-    if ((!(Settings.ledstate &0x08)) && ((Settings.ledstate &0x06) || (blinks > 200) || (blinkstate))) {
-      SetLedLink(blinkstate);
-    }
-    if (!blinkstate) {
-      blinks--;
-      if (200 == blinks) blinks = 0;
-    }
-  }
-  if (Settings.ledstate &1 && (pin[GPIO_LEDLNK] < 99 || !(blinks || restart_flag || ota_state_flag)) ) {
-    bool tstate = power & Settings.ledmask;
-    if ((SONOFF_TOUCH == my_module_type) || (SONOFF_T11 == my_module_type) || (SONOFF_T12 == my_module_type) || (SONOFF_T13 == my_module_type)) {
-      tstate = (!power) ? 1 : 0;
-    }
-    SetLedPower(tstate);
-  }
-
-
-
-
-
-  switch (state_250mS) {
-  case 0:
-    if (ota_state_flag && BACKLOG_EMPTY) {
-      ota_state_flag--;
-      if (2 == ota_state_flag) {
-        RtcSettings.ota_loader = 0;
-        ota_retry_counter = OTA_ATTEMPTS;
-        ESPhttpUpdate.rebootOnUpdate(false);
-        SettingsSave(1);
-      }
-      if (ota_state_flag <= 0) {
-#ifdef USE_WEBSERVER
-        if (Settings.webserver) StopWebserver();
-#endif
-#ifdef USE_ARILUX_RF
-        AriluxRfDisable();
-#endif
-        ota_state_flag = 92;
-        ota_result = 0;
-        ota_retry_counter--;
-        if (ota_retry_counter) {
-          strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
-#ifndef FIRMWARE_MINIMAL
-          if (RtcSettings.ota_loader) {
-# 919 "S:/Development/Tasmota/tasmota/support_tasmota.ino"
-            char *bch = strrchr(mqtt_data, '/');
-            if (bch == nullptr) { bch = mqtt_data; }
-
-            char *ech = strrchr(bch, '.');
-            if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
-              char *fch = ech;
-              *fch = '\0';
-              ech = strrchr(bch, '.');
-              *fch = '.';
-            }
-            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
-            char ota_url_type[strlen(ech) +1];
-            strncpy(ota_url_type, ech, sizeof(ota_url_type));
-
-            char *pch = strrchr(bch, '-');
-            if (pch == nullptr) { pch = ech; }
-            *pch = '\0';
-            snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type);
-          }
-#endif
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(mqtt_data));
-#else
-
-          WiFiClient OTAclient;
-          ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, mqtt_data));
-#endif
-          if (!ota_result) {
-#ifndef FIRMWARE_MINIMAL
-            int ota_error = ESPhttpUpdate.getLastError();
-            DEBUG_CORE_LOG(PSTR("OTA: Error %d"), ota_error);
-            if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
-              RtcSettings.ota_loader = 1;
-            }
-#endif
-            ota_state_flag = 2;
-          }
-        }
-      }
-      if (90 == ota_state_flag) {
-        ota_state_flag = 0;
-        Response_P(PSTR("{\"" D_CMND_UPGRADE "\":\""));
-        if (ota_result) {
-
-          if (!VersionCompatible()) {
-            ResponseAppend_P(PSTR(D_JSON_FAILED " " D_UPLOAD_ERR_14));
-          } else {
-            ResponseAppend_P(PSTR(D_JSON_SUCCESSFUL ". " D_JSON_RESTARTING));
-            restart_flag = 2;
-          }
-        } else {
-          ResponseAppend_P(PSTR(D_JSON_FAILED " %s"), ESPhttpUpdate.getLastErrorString().c_str());
-        }
-        ResponseAppend_P(PSTR("\"}"));
-
-        MqttPublishPrefixTopic_P(STAT, PSTR(D_CMND_UPGRADE));
-      }
-    }
-    break;
-  case 1:
-    if (MidnightNow()) {
-      XsnsCall(FUNC_SAVE_AT_MIDNIGHT);
-    }
-    if (save_data_counter && BACKLOG_EMPTY) {
-      save_data_counter--;
-      if (save_data_counter <= 0) {
-        if (Settings.flag.save_state) {
-          power_t mask = POWER_MASK;
-          for (uint32_t i = 0; i < MAX_PULSETIMERS; i++) {
-            if ((Settings.pulse_timer[i] > 0) && (Settings.pulse_timer[i] < 30)) {
-              mask &= ~(1 << i);
-            }
-          }
-          if (!((Settings.power &mask) == (power &mask))) {
-            Settings.power = power;
-          }
-        } else {
-          Settings.power = 0;
-        }
-        SettingsSave(0);
-        save_data_counter = Settings.save_data;
-      }
-    }
-    if (restart_flag && BACKLOG_EMPTY) {
-      if ((214 == restart_flag) || (215 == restart_flag) || (216 == restart_flag)) {
-
-        char storage_ssid1[strlen(SettingsText(SET_STASSID1)) +1];
-        strncpy(storage_ssid1, SettingsText(SET_STASSID1), sizeof(storage_ssid1));
-        char storage_ssid2[strlen(SettingsText(SET_STASSID2)) +1];
-        strncpy(storage_ssid2, SettingsText(SET_STASSID2), sizeof(storage_ssid2));
-        char storage_pass1[strlen(SettingsText(SET_STAPWD1)) +1];
-        strncpy(storage_pass1, SettingsText(SET_STAPWD1), sizeof(storage_pass1));
-        char storage_pass2[strlen(SettingsText(SET_STAPWD2)) +1];
-        strncpy(storage_pass2, SettingsText(SET_STAPWD2), sizeof(storage_pass2));
-
-        char storage_mqtthost[strlen(SettingsText(SET_MQTT_HOST)) +1];
-        strncpy(storage_mqtthost, SettingsText(SET_MQTT_HOST), sizeof(storage_mqtthost));
-        char storage_mqttuser[strlen(SettingsText(SET_MQTT_USER)) +1];
-        strncpy(storage_mqttuser, SettingsText(SET_MQTT_USER), sizeof(storage_mqttuser));
-        char storage_mqttpwd[strlen(SettingsText(SET_MQTT_PWD)) +1];
-        strncpy(storage_mqttpwd, SettingsText(SET_MQTT_PWD), sizeof(storage_mqttpwd));
-        char storage_mqtttopic[strlen(SettingsText(SET_MQTT_TOPIC)) +1];
-        strncpy(storage_mqtttopic, SettingsText(SET_MQTT_TOPIC), sizeof(storage_mqtttopic));
-        uint16_t mqtt_port = Settings.mqtt_port;
-
-
-
-
-        if ((215 == restart_flag) || (216 == restart_flag)) {
-          SettingsErase(0);
-        }
-        SettingsDefault();
-
-        SettingsUpdateText(SET_STASSID1, storage_ssid1);
-        SettingsUpdateText(SET_STASSID2, storage_ssid2);
-        SettingsUpdateText(SET_STAPWD1, storage_pass1);
-        SettingsUpdateText(SET_STAPWD2, storage_pass2);
-        if (216 == restart_flag) {
-
-          SettingsUpdateText(SET_MQTT_HOST, storage_mqtthost);
-          SettingsUpdateText(SET_MQTT_USER, storage_mqttuser);
-          SettingsUpdateText(SET_MQTT_PWD, storage_mqttpwd);
-          SettingsUpdateText(SET_MQTT_TOPIC, storage_mqtttopic);
-          Settings.mqtt_port = mqtt_port;
-        }
-        restart_flag = 2;
-      }
-      else if (213 == restart_flag) {
-        SettingsSdkErase();
-        restart_flag = 2;
-      }
-      else if (212 == restart_flag) {
-        SettingsErase(0);
-        restart_flag = 211;
-      }
-      if (211 == restart_flag) {
-        SettingsDefault();
-        restart_flag = 2;
-      }
-      if (2 == restart_flag) {
-        SettingsSaveAll();
-      }
-      restart_flag--;
-      if (restart_flag <= 0) {
-        AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
-        EspRestart();
-      }
-    }
-    break;
-  case 2:
-    WifiCheck(wifi_state_flag);
-    wifi_state_flag = WIFI_RESTART;
-    break;
-  case 3:
-    if (!global_state.wifi_down) { MqttCheck(); }
-    break;
-  }
-}
-
-#ifdef USE_ARDUINO_OTA
-
-
-
-
-
-
-
-bool arduino_ota_triggered = false;
-uint16_t arduino_ota_progress_dot_count = 0;
-
-void ArduinoOTAInit(void)
-{
-  ArduinoOTA.setPort(8266);
-  ArduinoOTA.setHostname(my_hostname);
-  if (strlen(SettingsText(SET_WEBPWD))) {
-    ArduinoOTA.setPassword(SettingsText(SET_WEBPWD));
-  }
-
-  ArduinoOTA.onStart([]()
-  {
-    SettingsSave(1);
-#ifdef USE_WEBSERVER
-    if (Settings.webserver) { StopWebserver(); }
-#endif
-#ifdef USE_ARILUX_RF
-    AriluxRfDisable();
-#endif
-    if (Settings.flag.mqtt_enabled) {
-      MqttDisconnect();
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_UPLOAD_STARTED));
-    arduino_ota_triggered = true;
-    arduino_ota_progress_dot_count = 0;
-    delay(100);
-  });
-
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
-  {
-    if ((LOG_LEVEL_DEBUG <= seriallog_level)) {
-      arduino_ota_progress_dot_count++;
-      Serial.printf(".");
-      if (!(arduino_ota_progress_dot_count % 80)) { Serial.println(); }
-    }
-  });
-
-  ArduinoOTA.onError([](ota_error_t error)
-  {
-
-
-
-
-    char error_str[100];
-
-    if ((LOG_LEVEL_DEBUG <= seriallog_level) && arduino_ota_progress_dot_count) { Serial.println(); }
-    switch (error) {
-      case OTA_BEGIN_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_2), sizeof(error_str)); break;
-      case OTA_RECEIVE_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_5), sizeof(error_str)); break;
-      case OTA_END_ERROR: strncpy_P(error_str, PSTR(D_UPLOAD_ERR_7), sizeof(error_str)); break;
-      default:
-        snprintf_P(error_str, sizeof(error_str), PSTR(D_UPLOAD_ERROR_CODE " %d"), error);
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA  %s. " D_RESTARTING), error_str);
-    EspRestart();
-  });
-
-  ArduinoOTA.onEnd([]()
-  {
-    if ((LOG_LEVEL_DEBUG <= seriallog_level)) { Serial.println(); }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_SUCCESSFUL ". " D_RESTARTING));
-    EspRestart();
- });
-
-  ArduinoOTA.begin();
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD "Arduino OTA " D_ENABLED " " D_PORT " 8266"));
-}
-
-void ArduinoOtaLoop(void)
-{
-  MDNS.update();
-  ArduinoOTA.handle();
-
-  while (arduino_ota_triggered) { ArduinoOTA.handle(); }
-}
-#endif
-
-
-
-void SerialInput(void)
-{
-  while (Serial.available()) {
-
-    delay(0);
-    serial_in_byte = Serial.read();
-
-
-
-
-    if ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)) {
-      serial_in_byte = ButtonSerial(serial_in_byte);
-    }
-
-
-
-    if (XdrvCall(FUNC_SERIAL)) {
-      serial_in_byte_counter = 0;
-      Serial.flush();
-      return;
-    }
-
-
-
-    if (serial_in_byte > 127 && !Settings.flag.mqtt_serial_raw) {
-      serial_in_byte_counter = 0;
-      Serial.flush();
-      return;
-    }
-    if (!Settings.flag.mqtt_serial) {
-      if (isprint(serial_in_byte)) {
-        if (serial_in_byte_counter < INPUT_BUFFER_SIZE -1) {
-          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-        } else {
-          serial_in_byte_counter = 0;
-        }
-      }
-    } else {
-      if (serial_in_byte || Settings.flag.mqtt_serial_raw) {
-        if ((serial_in_byte_counter < INPUT_BUFFER_SIZE -1) &&
-            ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
-            ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
-              Settings.flag.mqtt_serial_raw)) {
-          serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-          serial_polling_window = millis();
-        } else {
-          serial_polling_window = 0;
-          break;
-        }
-      }
-    }
-
-#ifdef USE_SONOFF_SC
-
-
-
-    if (SONOFF_SC == my_module_type) {
-      if (serial_in_byte == '\x1B') {
-        serial_in_buffer[serial_in_byte_counter] = 0;
-        SonoffScSerialInput(serial_in_buffer);
-        serial_in_byte_counter = 0;
-        Serial.flush();
-        return;
-      }
-    } else
-#endif
-
-
-    if (!Settings.flag.mqtt_serial && (serial_in_byte == '\n')) {
-      serial_in_buffer[serial_in_byte_counter] = 0;
-      seriallog_level = (Settings.seriallog_level < LOG_LEVEL_INFO) ? (uint8_t)LOG_LEVEL_INFO : Settings.seriallog_level;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), serial_in_buffer);
-      ExecuteCommand(serial_in_buffer, SRC_SERIAL);
-      serial_in_byte_counter = 0;
-      serial_polling_window = 0;
-      Serial.flush();
-      return;
-    }
-  }
-
-  if (Settings.flag.mqtt_serial && serial_in_byte_counter && (millis() > (serial_polling_window + SERIAL_POLLING))) {
-    serial_in_buffer[serial_in_byte_counter] = 0;
-    char hex_char[(serial_in_byte_counter * 2) + 2];
-    bool assume_json = (!Settings.flag.mqtt_serial_raw && (serial_in_buffer[0] == '{'));
-    Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s%s%s}"),
-      (assume_json) ? "" : """",
-      (Settings.flag.mqtt_serial_raw) ? ToHex_P((unsigned char*)serial_in_buffer, serial_in_byte_counter, hex_char, sizeof(hex_char)) : serial_in_buffer,
-      (assume_json) ? "" : """");
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SERIALRECEIVED));
-    XdrvRulesProcess();
-    serial_in_byte_counter = 0;
-  }
-}
-
-
-
-void GpioInit(void)
-{
-  uint32_t mpin;
-
-  if (!ValidModule(Settings.module)) {
-    uint32_t module = MODULE;
-    if (!ValidModule(MODULE)) { module = SONOFF_BASIC; }
-    Settings.module = module;
-    Settings.last_module = module;
-  }
-  SetModuleType();
-
-  if (Settings.module != Settings.last_module) {
-    Settings.baudrate = APP_BAUDRATE / 300;
-    Settings.serial_config = TS_SERIAL_8N1;
-  }
-
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    if ((Settings.user_template.gp.io[i] >= GPIO_SENSOR_END) && (Settings.user_template.gp.io[i] < GPIO_USER)) {
-      Settings.user_template.gp.io[i] = GPIO_USER;
-    }
-  }
-
-  myio def_gp;
-  ModuleGpios(&def_gp);
-  for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-    if ((Settings.my_gp.io[i] >= GPIO_SENSOR_END) && (Settings.my_gp.io[i] < GPIO_USER)) {
-      Settings.my_gp.io[i] = GPIO_NONE;
-    }
-    else if (Settings.my_gp.io[i] > GPIO_NONE) {
-      my_module.io[i] = Settings.my_gp.io[i];
-    }
-    if ((def_gp.io[i] > GPIO_NONE) && (def_gp.io[i] < GPIO_USER)) {
-      my_module.io[i] = def_gp.io[i];
-    }
-  }
-  if ((Settings.my_adc0 >= ADC0_END) && (Settings.my_adc0 < ADC0_USER)) {
-    Settings.my_adc0 = ADC0_NONE;
-  }
-  else if (Settings.my_adc0 > ADC0_NONE) {
-    my_adc0 = Settings.my_adc0;
-  }
-  my_module_flag = ModuleFlag();
-  uint32_t template_adc0 = my_module_flag.data &15;
-  if ((template_adc0 > ADC0_NONE) && (template_adc0 < ADC0_USER)) {
-    my_adc0 = template_adc0;
-  }
-
-  for (uint32_t i = 0; i < GPIO_MAX; i++) {
-    pin[i] = 99;
-  }
-  for (uint32_t i = 0; i < sizeof(my_module.io); i++) {
-    mpin = ValidPin(i, my_module.io[i]);
-
-    DEBUG_CORE_LOG(PSTR("INI: gpio pin %d, mpin %d"), i, mpin);
-
-    if (mpin) {
-      XdrvMailbox.index = mpin;
-      XdrvMailbox.payload = i;
-
-      if ((mpin >= GPIO_SWT1_NP) && (mpin < (GPIO_SWT1_NP + MAX_SWITCHES))) {
-        SwitchPullupFlag(mpin - GPIO_SWT1_NP);
-        mpin -= (GPIO_SWT1_NP - GPIO_SWT1);
-      }
-      else if ((mpin >= GPIO_KEY1_NP) && (mpin < (GPIO_KEY1_NP + MAX_KEYS))) {
-        ButtonPullupFlag(mpin - GPIO_KEY1_NP);
-        mpin -= (GPIO_KEY1_NP - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_KEY1_INV) && (mpin < (GPIO_KEY1_INV + MAX_KEYS))) {
-        ButtonInvertFlag(mpin - GPIO_KEY1_INV);
-        mpin -= (GPIO_KEY1_INV - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_KEY1_INV_NP) && (mpin < (GPIO_KEY1_INV_NP + MAX_KEYS))) {
-        ButtonPullupFlag(mpin - GPIO_KEY1_INV_NP);
-        ButtonInvertFlag(mpin - GPIO_KEY1_INV_NP);
-        mpin -= (GPIO_KEY1_INV_NP - GPIO_KEY1);
-      }
-      else if ((mpin >= GPIO_REL1_INV) && (mpin < (GPIO_REL1_INV + MAX_RELAYS))) {
-        bitSet(rel_inverted, mpin - GPIO_REL1_INV);
-        mpin -= (GPIO_REL1_INV - GPIO_REL1);
-      }
-      else if ((mpin >= GPIO_LED1_INV) && (mpin < (GPIO_LED1_INV + MAX_LEDS))) {
-        bitSet(led_inverted, mpin - GPIO_LED1_INV);
-        mpin -= (GPIO_LED1_INV - GPIO_LED1);
-      }
-      else if (mpin == GPIO_LEDLNK_INV) {
-        ledlnk_inverted = 1;
-        mpin -= (GPIO_LEDLNK_INV - GPIO_LEDLNK);
-      }
-      else if ((mpin >= GPIO_PWM1_INV) && (mpin < (GPIO_PWM1_INV + MAX_PWMS))) {
-        bitSet(pwm_inverted, mpin - GPIO_PWM1_INV);
-        mpin -= (GPIO_PWM1_INV - GPIO_PWM1);
-      }
-      else if (XdrvCall(FUNC_PIN_STATE)) {
-        mpin = XdrvMailbox.index;
-      }
-      else if (XsnsCall(FUNC_PIN_STATE)) {
-        mpin = XdrvMailbox.index;
-      };
-    }
-    if (mpin) pin[mpin] = i;
-  }
-
-  if ((2 == pin[GPIO_TXD]) || (H801 == my_module_type)) { Serial.set_tx(2); }
-
-  analogWriteRange(Settings.pwm_range);
-  analogWriteFreq(Settings.pwm_frequency);
-
-#ifdef USE_SPI
-  spi_flg = ((((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CS] > 14)) || (pin[GPIO_SPI_CS] < 12)) || (((pin[GPIO_SPI_DC] < 99) && (pin[GPIO_SPI_DC] > 14)) || (pin[GPIO_SPI_DC] < 12)));
-  if (spi_flg) {
-    for (uint32_t i = 0; i < GPIO_MAX; i++) {
-      if ((pin[i] >= 12) && (pin[i] <=14)) pin[i] = 99;
-    }
-    my_module.io[12] = GPIO_SPI_MISO;
-    pin[GPIO_SPI_MISO] = 12;
-    my_module.io[13] = GPIO_SPI_MOSI;
-    pin[GPIO_SPI_MOSI] = 13;
-    my_module.io[14] = GPIO_SPI_CLK;
-    pin[GPIO_SPI_CLK] = 14;
-  }
-  soft_spi_flg = ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && ((pin[GPIO_SSPI_MOSI] < 99) || (pin[GPIO_SSPI_MOSI] < 99)));
-#endif
-
-#ifdef USE_I2C
-  i2c_flg = ((pin[GPIO_I2C_SCL] < 99) && (pin[GPIO_I2C_SDA] < 99));
-  if (i2c_flg) {
-    Wire.begin(pin[GPIO_I2C_SDA], pin[GPIO_I2C_SCL]);
-  }
-#endif
-
-  devices_present = 0;
-  light_type = LT_BASIC;
-  if (XdrvCall(FUNC_MODULE_INIT)) {
-
-  }
-  else if (YTF_IR_BRIDGE == my_module_type) {
-    ClaimSerial();
-
-  }
-  else if (SONOFF_DUAL == my_module_type) {
-    devices_present = 2;
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-  else if (CH4 == my_module_type) {
-    devices_present = 4;
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-#ifdef USE_SONOFF_SC
-  else if (SONOFF_SC == my_module_type) {
-    SetSerial(19200, TS_SERIAL_8N1);
-  }
-#endif
-
-  for (uint32_t i = 0; i < MAX_PWMS; i++) {
-    if (pin[GPIO_PWM1 +i] < 99) {
-      pinMode(pin[GPIO_PWM1 +i], OUTPUT);
-      if (light_type) {
-
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range : 0);
-      } else {
-        pwm_present = true;
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - Settings.pwm_value[i] : Settings.pwm_value[i]);
-      }
-    }
-  }
-
-  for (uint32_t i = 0; i < MAX_RELAYS; i++) {
-    if (pin[GPIO_REL1 +i] < 99) {
-      pinMode(pin[GPIO_REL1 +i], OUTPUT);
-      devices_present++;
-      if (EXS_RELAY == my_module_type) {
-        digitalWrite(pin[GPIO_REL1 +i], bitRead(rel_inverted, i) ? 1 : 0);
-        if (i &1) { devices_present--; }
-      }
-    }
-  }
-
-  for (uint32_t i = 0; i < MAX_LEDS; i++) {
-    if (pin[GPIO_LED1 +i] < 99) {
-#ifdef USE_ARILUX_RF
-      if ((3 == i) && (leds_present < 2) && (99 == pin[GPIO_ARIRFSEL])) {
-        pin[GPIO_ARIRFSEL] = pin[GPIO_LED4];
-        pin[GPIO_LED4] = 99;
-      } else {
-#endif
-        pinMode(pin[GPIO_LED1 +i], OUTPUT);
-        leds_present++;
-        digitalWrite(pin[GPIO_LED1 +i], bitRead(led_inverted, i));
-#ifdef USE_ARILUX_RF
-      }
-#endif
-    }
-  }
-  if (pin[GPIO_LEDLNK] < 99) {
-    pinMode(pin[GPIO_LEDLNK], OUTPUT);
-    digitalWrite(pin[GPIO_LEDLNK], ledlnk_inverted);
-  }
-
-  ButtonInit();
-  SwitchInit();
-#ifdef ROTARY_V1
-  RotaryInit();
-#endif
-
-  SetLedPower(Settings.ledstate &8);
-  SetLedLink(Settings.ledstate &8);
-
-  XdrvCall(FUNC_PRE_INIT);
-}
-# 1 "S:/Development/Tasmota/tasmota/support_udp.ino"
-# 20 "S:/Development/Tasmota/tasmota/support_udp.ino"
-#ifdef USE_EMULATION
-
-#define UDP_BUFFER_SIZE 200
-#define UDP_MSEARCH_SEND_DELAY 1500
-
-#include <Ticker.h>
-Ticker TickerMSearch;
-
-IPAddress udp_remote_ip;
-uint16_t udp_remote_port;
-
-bool udp_connected = false;
-bool udp_response_mutex = false;
-
-
-
-
-
-const char URN_BELKIN_DEVICE[] PROGMEM = "urn:belkin:device:**";
-const char URN_BELKIN_DEVICE_CAP[] PROGMEM = "urn:Belkin:device:**";
-const char UPNP_ROOTDEVICE[] PROGMEM = "upnp:rootdevice";
-const char SSDPSEARCH_ALL[] PROGMEM = "ssdpsearch:all";
-const char SSDP_ALL[] PROGMEM = "ssdp:all";
-
-
-
-
-
-bool UdpDisconnect(void)
-{
-  if (udp_connected) {
-    PortUdp.flush();
-    WiFiUDP::stopAll();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_MULTICAST_DISABLED));
-    udp_connected = false;
-  }
-  return udp_connected;
-}
-
-bool UdpConnect(void)
-{
-  if (!udp_connected) {
-
-    if (PortUdp.beginMulticast(WiFi.localIP(), IPAddress(239,255,255,250), 1900)) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_REJOINED));
-      udp_response_mutex = false;
-      udp_connected = true;
-    } else {
-      AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP D_MULTICAST_JOIN_FAILED));
-      udp_connected = false;
-    }
-  }
-  return udp_connected;
-}
-
-void PollUdp(void)
-{
-  if (udp_connected) {
-    while (PortUdp.parsePacket()) {
-      char packet_buffer[UDP_BUFFER_SIZE];
-
-      int len = PortUdp.read(packet_buffer, UDP_BUFFER_SIZE -1);
-      packet_buffer[len] = 0;
-
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("UDP: Packet (%d)"), len);
-
-
-
-      if (Settings.flag2.emulation) {
-#ifdef USE_SCRIPT_HUE
-        if (!udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
-#else
-        if (devices_present && !udp_response_mutex && (strstr_P(packet_buffer, PSTR("M-SEARCH")) != nullptr)) {
-#endif
-          udp_response_mutex = true;
-
-          udp_remote_ip = PortUdp.remoteIP();
-          udp_remote_port = PortUdp.remotePort();
-
-
-
-
-          uint32_t response_delay = UDP_MSEARCH_SEND_DELAY + ((millis() &0x7) * 100);
-
-          LowerCase(packet_buffer, packet_buffer);
-          RemoveSpace(packet_buffer);
-
-#ifdef USE_EMULATION_WEMO
-          if (EMUL_WEMO == Settings.flag2.emulation) {
-            if (strstr_P(packet_buffer, URN_BELKIN_DEVICE) != nullptr) {
-              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 1);
-              return;
-            }
-            else if ((strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
-                    (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-                    (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-              TickerMSearch.attach_ms(response_delay, WemoRespondToMSearch, 2);
-              return;
-            }
-          }
-#endif
-
-#ifdef USE_EMULATION_HUE
-          if (EMUL_HUE == Settings.flag2.emulation) {
-            if ((strstr_P(packet_buffer, PSTR(":device:basic:1")) != nullptr) ||
-                (strstr_P(packet_buffer, UPNP_ROOTDEVICE) != nullptr) ||
-                (strstr_P(packet_buffer, SSDPSEARCH_ALL) != nullptr) ||
-                (strstr_P(packet_buffer, SSDP_ALL) != nullptr)) {
-              TickerMSearch.attach_ms(response_delay, HueRespondToMSearch);
-              return;
-            }
-          }
-#endif
-
-          udp_response_mutex = false;
-          continue;
-        }
-      }
-
-#ifdef USE_DEVICE_GROUPS
-      if (Settings.flag4.device_groups_enabled && !strncmp_P(packet_buffer, kDeviceGroupMessage, sizeof(DEVICE_GROUP_MESSAGE) - 1)) {
-        ProcessDeviceGroupMessage(packet_buffer, len);
-      }
-#endif
-    }
-    optimistic_yield(100);
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/support_wifi.ino"
-# 24 "S:/Development/Tasmota/tasmota/support_wifi.ino"
-#ifndef WIFI_RSSI_THRESHOLD
-#define WIFI_RSSI_THRESHOLD 10
-#endif
-#ifndef WIFI_RESCAN_MINUTES
-#define WIFI_RESCAN_MINUTES 44
-#endif
-
-const uint8_t WIFI_CONFIG_SEC = 180;
-const uint8_t WIFI_CHECK_SEC = 20;
-const uint8_t WIFI_RETRY_OFFSET_SEC = 20;
-
-#include <ESP8266WiFi.h>
-#if LWIP_IPV6
-#include <AddrList.h>
-#endif
-
-struct WIFI {
-  uint32_t last_event = 0;
-  uint32_t downtime = 0;
-  uint16_t link_count = 0;
-  uint8_t counter;
-  uint8_t retry_init;
-  uint8_t retry;
-  uint8_t status;
-  uint8_t config_type = 0;
-  uint8_t config_counter = 0;
-  uint8_t mdns_begun = 0;
-  uint8_t scan_state;
-  uint8_t bssid[6];
-  int8_t best_network_db;
-} Wifi;
-
-int WifiGetRssiAsQuality(int rssi)
-{
-  int quality = 0;
-
-  if (rssi <= -100) {
-    quality = 0;
-  } else if (rssi >= -50) {
-    quality = 100;
-  } else {
-    quality = 2 * (rssi + 100);
-  }
-  return quality;
-}
-
-bool WifiConfigCounter(void)
-{
-  if (Wifi.config_counter) {
-    Wifi.config_counter = WIFI_CONFIG_SEC;
-  }
-  return (Wifi.config_counter);
-}
-
-void WifiConfig(uint8_t type)
-{
-  if (!Wifi.config_type) {
-    if ((WIFI_RETRY == type) || (WIFI_WAIT == type)) { return; }
-#ifdef USE_EMULATION
-    UdpDisconnect();
-#endif
-    WiFi.disconnect();
-    Wifi.config_type = type;
-
-#ifndef USE_WEBSERVER
-    if (WIFI_MANAGER == Wifi.config_type) {
-      Wifi.config_type = WIFI_SERIAL;
-    }
-#endif
-
-    Wifi.config_counter = WIFI_CONFIG_SEC;
-    Wifi.counter = Wifi.config_counter +5;
-    blinks = 1999;
-    if (WIFI_RESTART == Wifi.config_type) {
-      restart_flag = 2;
-    }
-    else if (WIFI_SERIAL == Wifi.config_type) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_6_SERIAL " " D_ACTIVE_FOR_3_MINUTES));
-    }
-#ifdef USE_WEBSERVER
-    else if (WIFI_MANAGER == Wifi.config_type || WIFI_MANAGER_RESET_ONLY == Wifi.config_type) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_2_WIFIMANAGER " " D_ACTIVE_FOR_3_MINUTES));
-      WifiManagerBegin(WIFI_MANAGER_RESET_ONLY == Wifi.config_type);
-    }
-#endif
-  }
-}
-
-void WifiSetMode(WiFiMode_t wifi_mode)
-{
-  if (WiFi.getMode() == wifi_mode) { return; }
-
-  if (wifi_mode != WIFI_OFF) {
-
-    WiFi.forceSleepWake();
-    delay(100);
-  }
-
-  uint32_t retry = 2;
-  while (!WiFi.mode(wifi_mode) && retry--) {
-    AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR("Retry set Mode..."));
-    delay(100);
-  }
-
-  if (wifi_mode == WIFI_OFF) {
-    delay(1000);
-    WiFi.forceSleepBegin();
-    delay(1);
-  } else {
-    delay(30);
-  }
-}
-
-void WiFiSetSleepMode(void)
-{
-# 152 "S:/Development/Tasmota/tasmota/support_wifi.ino"
-#if defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-#else
-  if (sleep && Settings.flag3.sleep_normal) {
-    WiFi.setSleepMode(WIFI_LIGHT_SLEEP);
-  } else {
-    WiFi.setSleepMode(WIFI_MODEM_SLEEP);
-  }
-#endif
-  WifiSetOutputPower();
-}
-
-void WifiBegin(uint8_t flag, uint8_t channel)
-{
-  const char kWifiPhyMode[] = " BGN";
-
-#ifdef USE_EMULATION
-  UdpDisconnect();
-#endif
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_PATCH_ISSUE_2186));
-
-  WifiSetMode(WIFI_OFF);
-#endif
-
-  WiFi.persistent(false);
-  WiFi.disconnect(true);
-  delay(200);
-
-  WifiSetMode(WIFI_STA);
-  WiFiSetSleepMode();
-
-
-  if (!WiFi.getAutoConnect()) { WiFi.setAutoConnect(true); }
-
-  switch (flag) {
-  case 0:
-  case 1:
-    Settings.sta_active = flag;
-    break;
-  case 2:
-    Settings.sta_active ^= 1;
-  }
-  if (!strlen(SettingsText(SET_STASSID1 + Settings.sta_active))) {
-    Settings.sta_active ^= 1;
-  }
-  if (Settings.ip_address[0]) {
-    WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]);
-  }
-  WiFi.hostname(my_hostname);
-
-  char stemp[40] = { 0 };
-  if (channel) {
-    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active), channel, Wifi.bssid);
-
-    char hex_char[18];
-    snprintf_P(stemp, sizeof(stemp), PSTR(" Channel %d BSSId %s"), channel, ToHex_P((unsigned char*)Wifi.bssid, 6, hex_char, sizeof(hex_char), ':'));
-  } else {
-    WiFi.begin(SettingsText(SET_STASSID1 + Settings.sta_active), SettingsText(SET_STAPWD1 + Settings.sta_active));
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s%s " D_IN_MODE " 11%c " D_AS " %s..."),
-    Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), stemp, kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
-
-#if LWIP_IPV6
-  for (bool configured = false; !configured;) {
-    uint16_t cfgcnt = 0;
-    for (auto addr : addrList) {
-      if ((configured = !addr.isLocal() && addr.isV6()) || cfgcnt==30) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI "Got IPv6 global address %s"), addr.toString().c_str());
-        break;
-      }
-      delay(500);
-      cfgcnt++;
-    }
-  }
-#endif
-}
-
-void WifiBeginAfterScan(void)
-{
-
-  if (0 == Wifi.scan_state) { return; }
-
-  if (1 == Wifi.scan_state) {
-    memset((void*) &Wifi.bssid, 0, sizeof(Wifi.bssid));
-    Wifi.best_network_db = -127;
-    Wifi.scan_state = 3;
-  }
-
-  if (2 == Wifi.scan_state) {
-    uint8_t* bssid = WiFi.BSSID();
-    memcpy((void*) &Wifi.bssid, (void*) bssid, sizeof(Wifi.bssid));
-    Wifi.best_network_db = WiFi.RSSI();
-    if (Wifi.best_network_db < -WIFI_RSSI_THRESHOLD) {
-      Wifi.best_network_db += WIFI_RSSI_THRESHOLD;
-    }
-    Wifi.scan_state = 3;
-  }
-
-  if (3 == Wifi.scan_state) {
-    if (WiFi.scanComplete() != WIFI_SCAN_RUNNING) {
-      WiFi.scanNetworks(true);
-      Wifi.scan_state++;
-      AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR("Network (re)scan started..."));
-      return;
-    }
-  }
-  int8_t wifi_scan_result = WiFi.scanComplete();
-
-  if (4 == Wifi.scan_state) {
-    if (wifi_scan_result != WIFI_SCAN_RUNNING) {
-      Wifi.scan_state++;
-    }
-  }
-
-  if (5 == Wifi.scan_state) {
-    int32_t channel = 0;
-    int8_t ap = 3;
-    uint8_t last_bssid[6];
-    memcpy((void*) &last_bssid, (void*) &Wifi.bssid, sizeof(last_bssid));
-
-    if (wifi_scan_result > 0) {
-
-      for (uint32_t i = 0; i < wifi_scan_result; ++i) {
-
-        String ssid_scan;
-        int32_t rssi_scan;
-        uint8_t sec_scan;
-        uint8_t* bssid_scan;
-        int32_t chan_scan;
-        bool hidden_scan;
-
-        WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, bssid_scan, chan_scan, hidden_scan);
-
-        bool known = false;
-        uint32_t j;
-        for (j = 0; j < MAX_SSIDS; j++) {
-          if (ssid_scan == SettingsText(SET_STASSID1 + j)) {
-            known = true;
-            if (rssi_scan > Wifi.best_network_db) {
-              if (sec_scan == ENC_TYPE_NONE || SettingsText(SET_STAPWD1 + j)) {
-                Wifi.best_network_db = (int8_t)rssi_scan;
-                channel = chan_scan;
-                ap = j;
-                memcpy((void*) &Wifi.bssid, (void*) bssid_scan, sizeof(Wifi.bssid));
-              }
-            }
-            break;
-          }
-        }
-        char hex_char[18];
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Network %d, AP%c, SSId %s, Channel %d, BSSId %s, RSSI %d, Encryption %d"),
-          i,
-          (known) ? (j) ? '2' : '1' : '-',
-          ssid_scan.c_str(),
-          chan_scan,
-          ToHex_P((unsigned char*)bssid_scan, 6, hex_char, sizeof(hex_char), ':'),
-          rssi_scan,
-          (sec_scan == ENC_TYPE_NONE) ? 0 : 1);
-        delay(0);
-      }
-      WiFi.scanDelete();
-      delay(0);
-    }
-    Wifi.scan_state = 0;
-
-    for (uint32_t i = 0; i < sizeof(Wifi.bssid); i++) {
-      if (last_bssid[i] != Wifi.bssid[i]) {
-        WifiBegin(ap, channel);
-        break;
-      }
-    }
-  }
-}
-
-uint16_t WifiLinkCount(void)
-{
-  return Wifi.link_count;
-}
-
-String WifiDowntime(void)
-{
-  return GetDuration(Wifi.downtime);
-}
-
-void WifiSetState(uint8_t state)
-{
-  if (state == global_state.wifi_down) {
-    if (state) {
-      rules_flag.wifi_connected = 1;
-      Wifi.link_count++;
-      Wifi.downtime += UpTime() - Wifi.last_event;
-    } else {
-      rules_flag.wifi_disconnected = 1;
-      Wifi.last_event = UpTime();
-    }
-  }
-  global_state.wifi_down = state ^1;
-}
-
-#if LWIP_IPV6
-bool WifiCheckIPv6(void)
-{
-  bool ipv6_global=false;
-
-  for (auto a : addrList) {
-    if(!a.isLocal() && a.isV6()) ipv6_global=true;
-  }
-  return ipv6_global;
-}
-
-String WifiGetIPv6(void)
-{
-  for (auto a : addrList) {
-    if(!a.isLocal() && a.isV6()) return a.toString();
-  }
-  return "";
-}
-
-bool WifiCheckIPAddrStatus(void)
-{
-  bool ip_global=false;
-
-  for (auto a : addrList) {
-    if(!a.isLocal()) ip_global=true;
-  }
-  return ip_global;
-}
-#endif
-
-void WifiCheckIp(void)
-{
-#if LWIP_IPV6
-  if(WifiCheckIPAddrStatus()) {
-    Wifi.status = WL_CONNECTED;
-#else
-  if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
-#endif
-    WifiSetState(1);
-    Wifi.counter = WIFI_CHECK_SEC;
-    Wifi.retry = Wifi.retry_init;
-    if (Wifi.status != WL_CONNECTED) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECTED));
-
-      Settings.ip_address[1] = (uint32_t)WiFi.gatewayIP();
-      Settings.ip_address[2] = (uint32_t)WiFi.subnetMask();
-      Settings.ip_address[3] = (uint32_t)WiFi.dnsIP();
-    }
-    Wifi.status = WL_CONNECTED;
-#ifdef USE_DISCOVERY
-#ifdef WEBSERVER_ADVERTISE
-    if (2 == Wifi.mdns_begun) {
-      MDNS.update();
-      AddLog_P(LOG_LEVEL_DEBUG_MORE, D_LOG_MDNS, "MDNS.update");
-    }
-#endif
-#endif
-  } else {
-    WifiSetState(0);
-    uint8_t wifi_config_tool = Settings.sta_config;
-    Wifi.status = WiFi.status();
-    switch (Wifi.status) {
-      case WL_CONNECTED:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
-        Wifi.status = 0;
-        Wifi.retry = Wifi.retry_init;
-        break;
-      case WL_NO_SSID_AVAIL:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
-        if (WIFI_WAIT == Settings.sta_config) {
-          Wifi.retry = Wifi.retry_init;
-        } else {
-          if (Wifi.retry > (Wifi.retry_init / 2)) {
-            Wifi.retry = Wifi.retry_init / 2;
-          }
-          else if (Wifi.retry) {
-            Wifi.retry = 0;
-          }
-        }
-        break;
-      case WL_CONNECT_FAILED:
-        AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
-        if (Wifi.retry > (Wifi.retry_init / 2)) {
-          Wifi.retry = Wifi.retry_init / 2;
-        }
-        else if (Wifi.retry) {
-          Wifi.retry = 0;
-        }
-        break;
-      default:
-        if (!Wifi.retry || ((Wifi.retry_init / 2) == Wifi.retry)) {
-          AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
-        } else {
-          if (!strlen(SettingsText(SET_STASSID1)) && !strlen(SettingsText(SET_STASSID2))) {
-            wifi_config_tool = WIFI_MANAGER;
-            Wifi.retry = 0;
-          } else {
-            AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION));
-          }
-        }
-    }
-    if (Wifi.retry) {
-      if (Settings.flag3.use_wifi_scan) {
-        if (Wifi.retry_init == Wifi.retry) {
-          Wifi.scan_state = 1;
-        }
-      } else {
-        if (Wifi.retry_init == Wifi.retry) {
-          WifiBegin(3, 0);
-        }
-        if ((Settings.sta_config != WIFI_WAIT) && ((Wifi.retry_init / 2) == Wifi.retry)) {
-          WifiBegin(2, 0);
-        }
-      }
-      Wifi.counter = 1;
-      Wifi.retry--;
-    } else {
-      WifiConfig(wifi_config_tool);
-      Wifi.counter = 1;
-      Wifi.retry = Wifi.retry_init;
-    }
-  }
-}
-
-void WifiCheck(uint8_t param)
-{
-  Wifi.counter--;
-  switch (param) {
-  case WIFI_SERIAL:
-  case WIFI_MANAGER:
-    WifiConfig(param);
-    break;
-  default:
-    if (Wifi.config_counter) {
-      Wifi.config_counter--;
-      Wifi.counter = Wifi.config_counter +5;
-      if (Wifi.config_counter) {
-        if (!Wifi.config_counter) {
-          if (strlen(WiFi.SSID().c_str())) {
-            SettingsUpdateText(SET_STASSID1, WiFi.SSID().c_str());
-          }
-          if (strlen(WiFi.psk().c_str())) {
-            SettingsUpdateText(SET_STAPWD1, WiFi.psk().c_str());
-          }
-          Settings.sta_active = 0;
-          AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_WCFG_2_WIFIMANAGER D_CMND_SSID "1 %s"), SettingsText(SET_STASSID1));
-        }
-      }
-      if (!Wifi.config_counter) {
-
-        restart_flag = 2;
-      }
-    } else {
-      if (Wifi.scan_state) { WifiBeginAfterScan(); }
-
-      if (Wifi.counter <= 0) {
-        AddLog_P(LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CHECKING_CONNECTION));
-        Wifi.counter = WIFI_CHECK_SEC;
-        WifiCheckIp();
-      }
-#if LWIP_IPV6
-      if (WifiCheckIPAddrStatus()) {
-#else
-      if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0) && !Wifi.config_type) {
-#endif
-        WifiSetState(1);
-
-        if (Settings.flag3.use_wifi_rescan) {
-          if (!(uptime % (60 * WIFI_RESCAN_MINUTES))) {
-            Wifi.scan_state = 2;
-          }
-        }
-
-#ifdef FIRMWARE_MINIMAL
-        if (1 == RtcSettings.ota_loader) {
-          RtcSettings.ota_loader = 0;
-          ota_state_flag = 3;
-        }
-#endif
-
-#ifdef USE_DISCOVERY
-        if (Settings.flag3.mdns_enabled) {
-          if (!Wifi.mdns_begun) {
-
-
-
-
-
-              Wifi.mdns_begun = (uint8_t)MDNS.begin(my_hostname);
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s"), (Wifi.mdns_begun) ? D_INITIALIZED : D_FAILED);
-
-          }
-        }
-#endif
-
-#ifdef USE_WEBSERVER
-        if (Settings.webserver) {
-          StartWebserver(Settings.webserver, WiFi.localIP());
-#ifdef USE_DISCOVERY
-#ifdef WEBSERVER_ADVERTISE
-          if (1 == Wifi.mdns_begun) {
-            Wifi.mdns_begun = 2;
-            MDNS.addService("http", "tcp", WEB_PORT);
-          }
-#endif
-#endif
-        } else {
-          StopWebserver();
-        }
-#ifdef USE_EMULATION
-#ifdef USE_DEVICE_GROUPS
-        if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { UdpConnect(); }
-#else
-      if (Settings.flag2.emulation) { UdpConnect(); }
-#endif
-#endif
-#endif
-
-#ifdef USE_KNX
-        if (!knx_started && Settings.flag.knx_enabled) {
-          KNXStart();
-          knx_started = true;
-        }
-#endif
-
-      } else {
-        WifiSetState(0);
-#ifdef USE_EMULATION
-        UdpDisconnect();
-#endif
-        Wifi.mdns_begun = 0;
-#ifdef USE_KNX
-        knx_started = false;
-#endif
-      }
-    }
-  }
-}
-
-int WifiState(void)
-{
-  int state = -1;
-
-  if (!global_state.wifi_down) { state = WIFI_RESTART; }
-  if (Wifi.config_type) { state = Wifi.config_type; }
-  return state;
-}
-
-String WifiGetOutputPower(void)
-{
-  char stemp1[TOPSZ];
-  dtostrfd((float)(Settings.wifi_output_power) / 10, 1, stemp1);
-  return String(stemp1);
-}
-
-void WifiSetOutputPower(void)
-{
-  WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
-}
-
-void WifiConnect(void)
-{
-  WifiSetState(0);
-  WifiSetOutputPower();
-  WiFi.persistent(false);
-  Wifi.status = 0;
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
-  Wifi.retry = Wifi.retry_init;
-  Wifi.counter = 1;
-}
-
-
-
-void WifiDisconnect(void)
-{
-#ifdef USE_WIFI_SDK_ERASE
-  SettingsSdkWifiErase();
-#else
-
-  WiFi.persistent(true);
-  ETS_UART_INTR_DISABLE();
-  wifi_station_disconnect();
-  ETS_UART_INTR_ENABLE();
-  WiFi.persistent(false);
-  delay(100);
-#endif
-}
-
-void WifiShutdown(void)
-{
-  delay(100);
-  if (Settings.flag.mqtt_enabled) {
-    MqttDisconnect();
-  }
-  WifiDisconnect();
-}
-
-void EspRestart(void)
-{
-  WifiShutdown();
-  CrashDumpClear();
-
-  ESP.reset();
-}
-# 1 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
-# 24 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
-#ifdef USE_MQTT_TLS_CA_CERT
-
-#ifndef USE_MQTT_AWS_IOT
-# 38 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
-static const unsigned char PROGMEM TA0_DN[] = {
- 0x30, 0x4A, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
- 0x02, 0x55, 0x53, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0A,
- 0x13, 0x0D, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
- 0x79, 0x70, 0x74, 0x31, 0x23, 0x30, 0x21, 0x06, 0x03, 0x55, 0x04, 0x03,
- 0x13, 0x1A, 0x4C, 0x65, 0x74, 0x27, 0x73, 0x20, 0x45, 0x6E, 0x63, 0x72,
- 0x79, 0x70, 0x74, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6F, 0x72, 0x69, 0x74,
- 0x79, 0x20, 0x58, 0x33
-};
-
-static const unsigned char PROGMEM TA0_RSA_N[] = {
- 0x9C, 0xD3, 0x0C, 0xF0, 0x5A, 0xE5, 0x2E, 0x47, 0xB7, 0x72, 0x5D, 0x37,
- 0x83, 0xB3, 0x68, 0x63, 0x30, 0xEA, 0xD7, 0x35, 0x26, 0x19, 0x25, 0xE1,
- 0xBD, 0xBE, 0x35, 0xF1, 0x70, 0x92, 0x2F, 0xB7, 0xB8, 0x4B, 0x41, 0x05,
- 0xAB, 0xA9, 0x9E, 0x35, 0x08, 0x58, 0xEC, 0xB1, 0x2A, 0xC4, 0x68, 0x87,
- 0x0B, 0xA3, 0xE3, 0x75, 0xE4, 0xE6, 0xF3, 0xA7, 0x62, 0x71, 0xBA, 0x79,
- 0x81, 0x60, 0x1F, 0xD7, 0x91, 0x9A, 0x9F, 0xF3, 0xD0, 0x78, 0x67, 0x71,
- 0xC8, 0x69, 0x0E, 0x95, 0x91, 0xCF, 0xFE, 0xE6, 0x99, 0xE9, 0x60, 0x3C,
- 0x48, 0xCC, 0x7E, 0xCA, 0x4D, 0x77, 0x12, 0x24, 0x9D, 0x47, 0x1B, 0x5A,
- 0xEB, 0xB9, 0xEC, 0x1E, 0x37, 0x00, 0x1C, 0x9C, 0xAC, 0x7B, 0xA7, 0x05,
- 0xEA, 0xCE, 0x4A, 0xEB, 0xBD, 0x41, 0xE5, 0x36, 0x98, 0xB9, 0xCB, 0xFD,
- 0x6D, 0x3C, 0x96, 0x68, 0xDF, 0x23, 0x2A, 0x42, 0x90, 0x0C, 0x86, 0x74,
- 0x67, 0xC8, 0x7F, 0xA5, 0x9A, 0xB8, 0x52, 0x61, 0x14, 0x13, 0x3F, 0x65,
- 0xE9, 0x82, 0x87, 0xCB, 0xDB, 0xFA, 0x0E, 0x56, 0xF6, 0x86, 0x89, 0xF3,
- 0x85, 0x3F, 0x97, 0x86, 0xAF, 0xB0, 0xDC, 0x1A, 0xEF, 0x6B, 0x0D, 0x95,
- 0x16, 0x7D, 0xC4, 0x2B, 0xA0, 0x65, 0xB2, 0x99, 0x04, 0x36, 0x75, 0x80,
- 0x6B, 0xAC, 0x4A, 0xF3, 0x1B, 0x90, 0x49, 0x78, 0x2F, 0xA2, 0x96, 0x4F,
- 0x2A, 0x20, 0x25, 0x29, 0x04, 0xC6, 0x74, 0xC0, 0xD0, 0x31, 0xCD, 0x8F,
- 0x31, 0x38, 0x95, 0x16, 0xBA, 0xA8, 0x33, 0xB8, 0x43, 0xF1, 0xB1, 0x1F,
- 0xC3, 0x30, 0x7F, 0xA2, 0x79, 0x31, 0x13, 0x3D, 0x2D, 0x36, 0xF8, 0xE3,
- 0xFC, 0xF2, 0x33, 0x6A, 0xB9, 0x39, 0x31, 0xC5, 0xAF, 0xC4, 0x8D, 0x0D,
- 0x1D, 0x64, 0x16, 0x33, 0xAA, 0xFA, 0x84, 0x29, 0xB6, 0xD4, 0x0B, 0xC0,
- 0xD8, 0x7D, 0xC3, 0x93
-};
-
-static const unsigned char TA0_RSA_E[] = {
- 0x01, 0x00, 0x01
-};
-
-static const br_x509_trust_anchor PROGMEM LetsEncryptX3CrossSigned_TA = {
- { (unsigned char *)TA0_DN, sizeof TA0_DN },
- BR_X509_TA_CA,
- {
-  BR_KEYTYPE_RSA,
-  { .rsa = {
-   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
-   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
-  } }
- }
-};
-
-#define TAs_NUM 1
-
-#endif
-
-#ifdef USE_MQTT_AWS_IOT
-# 106 "S:/Development/Tasmota/tasmota/tasmota_ca.ino"
-const unsigned char PROGMEM TA0_DN[] = {
- 0x30, 0x39, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
- 0x02, 0x55, 0x53, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x0A,
- 0x13, 0x06, 0x41, 0x6D, 0x61, 0x7A, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17,
- 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x41, 0x6D, 0x61, 0x7A, 0x6F,
- 0x6E, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x20, 0x43, 0x41, 0x20, 0x31
-};
-
-const unsigned char PROGMEM TA0_RSA_N[] = {
- 0xB2, 0x78, 0x80, 0x71, 0xCA, 0x78, 0xD5, 0xE3, 0x71, 0xAF, 0x47, 0x80,
- 0x50, 0x74, 0x7D, 0x6E, 0xD8, 0xD7, 0x88, 0x76, 0xF4, 0x99, 0x68, 0xF7,
- 0x58, 0x21, 0x60, 0xF9, 0x74, 0x84, 0x01, 0x2F, 0xAC, 0x02, 0x2D, 0x86,
- 0xD3, 0xA0, 0x43, 0x7A, 0x4E, 0xB2, 0xA4, 0xD0, 0x36, 0xBA, 0x01, 0xBE,
- 0x8D, 0xDB, 0x48, 0xC8, 0x07, 0x17, 0x36, 0x4C, 0xF4, 0xEE, 0x88, 0x23,
- 0xC7, 0x3E, 0xEB, 0x37, 0xF5, 0xB5, 0x19, 0xF8, 0x49, 0x68, 0xB0, 0xDE,
- 0xD7, 0xB9, 0x76, 0x38, 0x1D, 0x61, 0x9E, 0xA4, 0xFE, 0x82, 0x36, 0xA5,
- 0xE5, 0x4A, 0x56, 0xE4, 0x45, 0xE1, 0xF9, 0xFD, 0xB4, 0x16, 0xFA, 0x74,
- 0xDA, 0x9C, 0x9B, 0x35, 0x39, 0x2F, 0xFA, 0xB0, 0x20, 0x50, 0x06, 0x6C,
- 0x7A, 0xD0, 0x80, 0xB2, 0xA6, 0xF9, 0xAF, 0xEC, 0x47, 0x19, 0x8F, 0x50,
- 0x38, 0x07, 0xDC, 0xA2, 0x87, 0x39, 0x58, 0xF8, 0xBA, 0xD5, 0xA9, 0xF9,
- 0x48, 0x67, 0x30, 0x96, 0xEE, 0x94, 0x78, 0x5E, 0x6F, 0x89, 0xA3, 0x51,
- 0xC0, 0x30, 0x86, 0x66, 0xA1, 0x45, 0x66, 0xBA, 0x54, 0xEB, 0xA3, 0xC3,
- 0x91, 0xF9, 0x48, 0xDC, 0xFF, 0xD1, 0xE8, 0x30, 0x2D, 0x7D, 0x2D, 0x74,
- 0x70, 0x35, 0xD7, 0x88, 0x24, 0xF7, 0x9E, 0xC4, 0x59, 0x6E, 0xBB, 0x73,
- 0x87, 0x17, 0xF2, 0x32, 0x46, 0x28, 0xB8, 0x43, 0xFA, 0xB7, 0x1D, 0xAA,
- 0xCA, 0xB4, 0xF2, 0x9F, 0x24, 0x0E, 0x2D, 0x4B, 0xF7, 0x71, 0x5C, 0x5E,
- 0x69, 0xFF, 0xEA, 0x95, 0x02, 0xCB, 0x38, 0x8A, 0xAE, 0x50, 0x38, 0x6F,
- 0xDB, 0xFB, 0x2D, 0x62, 0x1B, 0xC5, 0xC7, 0x1E, 0x54, 0xE1, 0x77, 0xE0,
- 0x67, 0xC8, 0x0F, 0x9C, 0x87, 0x23, 0xD6, 0x3F, 0x40, 0x20, 0x7F, 0x20,
- 0x80, 0xC4, 0x80, 0x4C, 0x3E, 0x3B, 0x24, 0x26, 0x8E, 0x04, 0xAE, 0x6C,
- 0x9A, 0xC8, 0xAA, 0x0D
-};
-
-static const unsigned char PROGMEM TA0_RSA_E[] = {
- 0x01, 0x00, 0x01
-};
-
-const br_x509_trust_anchor PROGMEM AmazonRootCA1_TA = {
- { (unsigned char *)TA0_DN, sizeof TA0_DN },
- BR_X509_TA_CA,
- {
-  BR_KEYTYPE_RSA,
-  { .rsa = {
-   (unsigned char *)TA0_RSA_N, sizeof TA0_RSA_N,
-   (unsigned char *)TA0_RSA_E, sizeof TA0_RSA_E,
-  } }
- }
-};
-
-#define TAs_NUM 1
-
-#endif
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
-#ifdef USE_WEBSERVER
-
-
-
-
-
-
-
-#define XDRV_01 1
-
-#ifndef WIFI_SOFT_AP_CHANNEL
-#define WIFI_SOFT_AP_CHANNEL 1
-#endif
-
-const uint16_t CHUNKED_BUFFER_SIZE = 400;
-
-const uint16_t HTTP_REFRESH_TIME = 2345;
-#define HTTP_RESTART_RECONNECT_TIME 9000
-#define HTTP_OTA_RESTART_RECONNECT_TIME 20000
-
-#include <ESP8266WebServer.h>
-#include <DNSServer.h>
-
-#ifdef USE_RF_FLASH
-uint8_t *efm8bb1_update = nullptr;
-#endif
-
-enum UploadTypes { UPL_TASMOTA, UPL_SETTINGS, UPL_EFM8BB1, UPL_TASMOTASLAVE };
-
-static const char * HEADER_KEYS[] = { "User-Agent", };
-
-const char HTTP_HEADER[] PROGMEM =
-  "<!DOCTYPE html><html lang=\"" D_HTML_LANGUAGE "\" class=\"\">"
-  "<head>"
-  "<meta charset='utf-8'>"
-  "<meta name=\"viewport\" content=\"width=device-width,initial-scale=1,user-scalable=no\"/>"
-  "<title>%s - %s</title>"
-
-  "<script>"
-  "var x=null,lt,to,tp,pc='';"
-
-#ifdef USE_JAVASCRIPT_ES6
-
-  "eb=s=>document.getElementById(s);"
-  "qs=s=>document.querySelector(s);"
-  "sp=i=>eb(i).type=(eb(i).type==='text'?'password':'text');"
-  "wl=f=>window.addEventListener('load',f);"
-  ;
-#else
-  "function eb(s){"
-    "return document.getElementById(s);"
-  "}"
-  "function qs(s){"
-    "return document.querySelector(s);"
-  "}"
-  "function sp(i){"
-    "eb(i).type=(eb(i).type==='text'?'password':'text');"
-  "}"
-  "function wl(f){"
-    "window.addEventListener('load',f);"
-  "}";
-#endif
-
-const char HTTP_SCRIPT_COUNTER[] PROGMEM =
-  "var cn=180;"
-  "function u(){"
-    "if(cn>=0){"
-      "eb('t').innerHTML='" D_RESTART_IN " '+cn+' " D_SECONDS "';"
-      "cn--;"
-      "setTimeout(u,1000);"
-    "}"
-  "}"
-  "wl(u);";
-
-const char HTTP_SCRIPT_ROOT[] PROGMEM =
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  "var rfsh=1;"
-  "function la(p){"
-    "var a='';"
-    "if(la.arguments.length==1){"
-      "a=p;"
-      "clearTimeout(lt);"
-    "}"
-    "if(x!=null){x.abort();}"
-    "x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(x.readyState==4&&x.status==200){"
-        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
-        "eb('l1').innerHTML=s;"
-      "}"
-    "};"
-    "if (rfsh) {"
-      "x.open('GET','.?m=1'+a,true);"
-      "x.send();"
-      "lt=setTimeout(la,%d);"
-    "}"
-  "}"
-  "function seva(par,ivar){"
-    "la('&sv='+ivar+'_'+par);"
-  "}"
-  "function siva(par,ivar){"
-    "rfsh=1;"
-    "la('&sv='+ivar+'_'+par);"
-    "rfsh=0;"
-  "}"
-  "function pr(f){"
-    "if (f) {"
-      "lt=setTimeout(la,%d);"
-      "rfsh=1;"
-    "} else {"
-      "clearTimeout(lt);"
-      "rfsh=0;"
-    "}"
-  "}";
-#else
-  "function la(p){"
-    "var a='';"
-    "if(la.arguments.length==1){"
-      "a=p;"
-      "clearTimeout(lt);"
-    "}"
-    "if(x!=null){x.abort();}"
-    "x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(x.readyState==4&&x.status==200){"
-        "var s=x.responseText.replace(/{t}/g,\"<table style='width:100%%'>\").replace(/{s}/g,\"<tr><th>\").replace(/{m}/g,\"</th><td>\").replace(/{e}/g,\"</td></tr>\").replace(/{c}/g,\"%%'><div style='text-align:center;font-weight:\");"
-        "eb('l1').innerHTML=s;"
-      "}"
-    "};"
-    "x.open('GET','.?m=1'+a,true);"
-    "x.send();"
-    "lt=setTimeout(la,%d);"
-  "}";
-#endif
-
-const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM =
-  "function lc(v,i,p){"
-    "if(eb('s')){"
-      "if(v=='h'||v=='d'){"
-        "var sl=eb('sl4').value;"
-        "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';"
-      "}"
-    "}"
-    "la('&'+v+i+'='+p);"
-  "}"
-  "wl(la);";
-
-const char HTTP_SCRIPT_WIFI[] PROGMEM =
-  "function c(l){"
-    "eb('s1').value=l.innerText||l.textContent;"
-    "eb('p1').focus();"
-  "}";
-
-const char HTTP_SCRIPT_RELOAD[] PROGMEM =
-  "setTimeout(function(){location.href='.';}," STR(HTTP_RESTART_RECONNECT_TIME) ");";
-
-
-const char HTTP_SCRIPT_RELOAD_OTA[] PROGMEM =
-  "setTimeout(function(){location.href='.';}," STR(HTTP_OTA_RESTART_RECONNECT_TIME) ");";
-
-const char HTTP_SCRIPT_CONSOL[] PROGMEM =
-  "var sn=0,id=0;"
-  "function l(p){"
-    "var c,o='',t;"
-    "clearTimeout(lt);"
-    "t=eb('t1');"
-    "if(p==1){"
-      "c=eb('c1');"
-      "o='&c1='+encodeURIComponent(c.value);"
-      "c.value='';"
-      "t.scrollTop=99999;"
-      "sn=t.scrollTop;"
-    "}"
-    "if(t.scrollTop>=sn){"
-      "if(x!=null){x.abort();}"
-      "x=new XMLHttpRequest();"
-      "x.onreadystatechange=function(){"
-        "if(x.readyState==4&&x.status==200){"
-          "var z,d;"
-          "d=x.responseText.split(/}1/);"
-          "id=d.shift();"
-          "if(d.shift()==0){t.value='';}"
-          "z=d.shift();"
-          "if(z.length>0){t.value+=z;}"
-          "t.scrollTop=99999;"
-          "sn=t.scrollTop;"
-        "}"
-      "};"
-      "x.open('GET','cs?c2='+id+o,true);"
-      "x.send();"
-    "}"
-    "lt=setTimeout(l,%d);"
-    "return false;"
-  "}"
-  "wl(l);";
-
-const char HTTP_MODULE_TEMPLATE_REPLACE[] PROGMEM =
-  "}2%d'>%s (%d}3";
-
-const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
-  "var os;"
-  "function sk(s,g){"
-    "var o=os.replace(/}2/g,\"<option value='\").replace(/}3/g,\")</option>\");"
-    "eb('g'+g).innerHTML=o;"
-    "eb('g'+g).value=s;"
-  "}"
-  "function ld(u,f){"
-    "var x=new XMLHttpRequest();"
-    "x.onreadystatechange=function(){"
-      "if(this.readyState==4&&this.status==200){"
-        "f(this);"
-      "}"
-    "};"
-    "x.open('GET',u,true);"
-    "x.send();"
-  "}";
-
-const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
-  "var c;"
-  "function x1(b){"
-    "var i,j,g,k,o;"
-    "o=b.responseText.split(/}1/);"
-    "k=o.shift();"
-    "if(eb('s1').value==''){"
-      "eb('s1').value=k;"
-    "}"
-    "os=o.shift();"
-    "as=o.shift();"
-    "g=o.shift().split(',');"
-    "j=0;"
-    "for(i=0;i<13;i++){"
-      "if(6==i){j=9;}"
-      "if(8==i){j=12;}"
-      "sk(g[i],j);"
-      "j++;"
-    "}"
-    "g=o.shift();"
-    "os=as;"
-    "sk(g&15,17);"
-    "g>>=4;"
-    "for(i=0;i<" STR(GPIO_FLAG_USED) ";i++){"
-      "p=(g>>i)&1;"
-      "eb('c'+i).checked=p;"
-    "}"
-    "if(" STR(USER_MODULE) "==c){"
-      "g=o.shift();"
-      "eb('g99').value=g;"
-    "}"
-  "}"
-  "function st(t){"
-    "c=t;"
-    "var a='tp?t='+t;"
-    "ld(a,x1);"
-  "}"
-
-  "function x2(a){"
-    "os=a.responseText;"
-    "sk(17,99);"
-    "st(" STR(USER_MODULE) ");"
-  "}"
-
-#ifdef USE_JAVASCRIPT_ES6
-  "sl=()=>ld('tp?m=1',x2);"
-#else
-  "function sl(){"
-    "ld('tp?m=1',x2);"
-  "}"
-#endif
-
-  "wl(sl);";
-
-const char HTTP_SCRIPT_MODULE1[] PROGMEM =
-  "function x1(a){"
-    "os=a.responseText;"
-    "sk(%d,99);"
-  "}"
-  "function x2(b){"
-    "os=b.responseText;";
-const char HTTP_SCRIPT_MODULE2[] PROGMEM =
-  "}"
-  "function x3(a){"
-    "os=a.responseText;"
-    "sk(%d,17);"
-  "}"
-  "function sl(){"
-    "ld('md?m=1',x1);"
-    "ld('md?g=1',x2);"
-    "if(eb('g17')){"
-      "ld('md?a=1',x3);"
-    "}"
-  "}"
-  "wl(sl);";
-
-const char HTTP_SCRIPT_INFO_BEGIN[] PROGMEM =
-  "function i(){"
-    "var s,o=\"";
-const char HTTP_SCRIPT_INFO_END[] PROGMEM =
-    "\";"
-    "s=o.replace(/}1/g,\"</td></tr><tr><th>\").replace(/}2/g,\"</th><td>\");"
-    "eb('i').innerHTML=s;"
-  "}"
-  "wl(i);";
-
-const char HTTP_HEAD_LAST_SCRIPT[] PROGMEM =
-  "function jd(){"
-    "var t=0,i=document.querySelectorAll('input,button,textarea,select');"
-    "while(i.length>=t){"
-      "if(i[t]){"
-        "i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];"
-      "}"
-      "t++;"
-    "}"
-  "}"
-  "wl(jd);"
-  "</script>";
-
-const char HTTP_HEAD_STYLE1[] PROGMEM =
-  "<style>"
-  "div,fieldset,input,select{padding:5px;font-size:1em;}"
-  "fieldset{background:#%06x;}"
-  "p{margin:0.5em 0;}"
-  "input{width:100%%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#%06x;color:#%06x;}"
-  "input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
-  "input[type=range]{width:99%%;}"
-  "select{width:100%%;background:#%06x;color:#%06x;}"
-  "textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}"
-  "body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}"
-  "td{padding:0px;}";
-const char HTTP_HEAD_STYLE2[] PROGMEM =
-  "button{border:0;border-radius:0.3rem;background:#%06x;color:#%06x;line-height:2.4rem;font-size:1.2rem;width:100%%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}"
-  "button:hover{background:#%06x;}"
-  ".bred{background:#%06x;}"
-  ".bred:hover{background:#%06x;}"
-  ".bgrn{background:#%06x;}"
-  ".bgrn:hover{background:#%06x;}"
-  "a{color:#%06x;text-decoration:none;}"
-  ".p{float:left;text-align:left;}"
-  ".q{float:right;text-align:right;}"
-  ".r{border-radius:0.3em;padding:2px;margin:6px 2px;}";
-const char HTTP_HEAD_STYLE3[] PROGMEM =
-  "</style>"
-
-  "</head>"
-  "<body>"
-  "<div style='text-align:left;display:inline-block;color:#%06x;min-width:340px;'>"
-#ifdef FIRMWARE_MINIMAL
-  "<div style='text-align:center;color:#%06x;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
-#endif
-  "<div style='text-align:center;color:#%06x;'><noscript>" D_NOSCRIPT "<br></noscript>"
-#ifdef LANGUAGE_MODULE_NAME
-  "<h3>" D_MODULE " %s</h3>"
-#else
-  "<h3>%s " D_MODULE "</h3>"
-#endif
-  "<h2>%s</h2>";
-
-const char HTTP_MSG_SLIDER_GRADIENT[] PROGMEM =
-  "<div id='%s' class='r' style='background-image:linear-gradient(to right,%s,%s);'>"
-  "<input id='sl%d' type='range' min='%d' max='%d' value='%d' onchange='lc(\"%c\",%d,value)'>"
-  "</div>";
-const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
-  "<div><span class='p'>" D_CLOSE "</span><span class='q'>" D_OPEN "</span></div>"
-  "<div><input type='range' min='0' max='100' value='%d' onchange='lc(\"u\",%d,value)'></div>";
-
-const char HTTP_MSG_RSTRT[] PROGMEM =
-  "<br><div style='text-align:center;'>" D_DEVICE_WILL_RESTART "</div><br>";
-
-const char HTTP_FORM_LOGIN[] PROGMEM =
-  "<fieldset>"
-  "<form method='post' action='/'>"
-  "<p><b>" D_USER "</b><br><input name='USER1' placeholder='" D_USER "'></p>"
-  "<p><b>" D_PASSWORD "</b><br><input name='PASS1' type='password' placeholder='" D_PASSWORD "'></p>"
-  "<br>"
-  "<button>" D_OK "</button>"
-  "</form></fieldset>";
-
-const char HTTP_FORM_TEMPLATE[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='tp'>";
-const char HTTP_FORM_TEMPLATE_FLAG[] PROGMEM =
-  "<p></p>"
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE_FLAGS "&nbsp;</b></legend><p>"
-
-  "</p></fieldset>";
-
-const char HTTP_FORM_MODULE[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='md'>"
-  "<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99'></select><br>"
-  "<br><table>";
-
-const char HTTP_FORM_WIFI[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_WIFI_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='wi'>"
-  "<p><b>" D_AP1_SSID "</b> (" STA_SSID1 ")<br><input id='s1' placeholder='" STA_SSID1 "' value='%s'></p>"
-  "<p><b>" D_AP1_PASSWORD "</b><input type='checkbox' onclick='sp(\"p1\")'><br><input id='p1' type='password' placeholder='" D_AP1_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_AP2_SSID "</b> (" STA_SSID2 ")<br><input id='s2' placeholder='" STA_SSID2 "' value='%s'></p>"
-  "<p><b>" D_AP2_PASSWORD "</b><input type='checkbox' onclick='sp(\"p2\")'><br><input id='p2' type='password' placeholder='" D_AP2_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_HOSTNAME "</b> (%s)<br><input id='h' placeholder='%s' value='%s'></p>"
-  "<p><b>" D_CORS_DOMAIN "</b><input id='c' placeholder='" CORS_DOMAIN "' value='%s'></p>";
-
-const char HTTP_FORM_LOG1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_LOGGING_PARAMETERS "&nbsp;</b>"
-  "</legend><form method='get' action='lg'>";
-const char HTTP_FORM_LOG2[] PROGMEM =
-  "<p><b>" D_SYSLOG_HOST "</b> (" SYS_LOG_HOST ")<br><input id='lh' placeholder='" SYS_LOG_HOST "' value='%s'></p>"
-  "<p><b>" D_SYSLOG_PORT "</b> (" STR(SYS_LOG_PORT) ")<br><input id='lp' placeholder='" STR(SYS_LOG_PORT) "' value='%d'></p>"
-  "<p><b>" D_TELEMETRY_PERIOD "</b> (" STR(TELE_PERIOD) ")<br><input id='lt' placeholder='" STR(TELE_PERIOD) "' value='%d'></p>";
-
-const char HTTP_FORM_OTHER[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_OTHER_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='co'>"
-  "<p></p>"
-  "<fieldset><legend><b>&nbsp;" D_TEMPLATE "&nbsp;</b></legend>"
-  "<p><input id='t1' placeholder='" D_TEMPLATE "' value='%s'></p>"
-  "<p><input id='t2' type='checkbox'%s><b>" D_ACTIVATE "</b></p>"
-  "</fieldset>"
-  "<br>"
-  "<b>" D_WEB_ADMIN_PASSWORD "</b><input type='checkbox' onclick='sp(\"wp\")'><br><input id='wp' type='password' placeholder='" D_WEB_ADMIN_PASSWORD "' value='" D_ASTERISK_PWD "'><br>"
-  "<br>"
-  "<input id='b1' type='checkbox'%s><b>" D_MQTT_ENABLE "</b><br>"
-  "<br>";
-
-const char HTTP_FORM_END[] PROGMEM =
-  "<br>"
-  "<button name='save' type='submit' class='button bgrn'>" D_SAVE "</button>"
-  "</form></fieldset>";
-
-const char HTTP_FORM_RST[] PROGMEM =
-  "<div id='f1' style='display:block;'>"
-  "<fieldset><legend><b>&nbsp;" D_RESTORE_CONFIGURATION "&nbsp;</b></legend>";
-const char HTTP_FORM_UPG[] PROGMEM =
-  "<div id='f1' style='display:block;'>"
-  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_WEBSERVER "&nbsp;</b></legend>"
-  "<form method='get' action='u1'>"
-  "<br><b>" D_OTA_URL "</b><br><input id='o' placeholder='OTA_URL' value='%s'><br>"
-  "<br><button type='submit'>" D_START_UPGRADE "</button></form>"
-  "</fieldset><br><br>"
-  "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_FILE_UPLOAD "&nbsp;</b></legend>";
-const char HTTP_FORM_RST_UPG[] PROGMEM =
-  "<form method='post' action='u2' enctype='multipart/form-data'>"
-  "<br><input type='file' name='u2'><br>"
-  "<br><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>"
-  "</fieldset>"
-  "</div>"
-  "<div id='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
-
-const char HTTP_FORM_CMND[] PROGMEM =
-  "<br><textarea readonly id='t1' cols='340' wrap='off'></textarea><br><br>"
-  "<form method='get' onsubmit='return l(1);'>"
-  "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
-
-  "</form>";
-
-const char HTTP_TABLE100[] PROGMEM =
-  "<table style='width:100%%'>";
-
-const char HTTP_COUNTER[] PROGMEM =
-  "<br><div id='t' style='text-align:center;'></div>";
-
-const char HTTP_END[] PROGMEM =
-  "<div style='text-align:right;font-size:11px;'><hr/><a href='https://bit.ly/tasmota' target='_blank' style='color:#aaa;'>Tasmota %s " D_BY " Theo Arends</a></div>"
-  "</div>"
-  "</body>"
-  "</html>";
-
-const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button onclick='la(\"&o=%d\");'>%s%s</button></td>";
-const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";
-
-enum ButtonTitle {
-  BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
-  BUTTON_MAIN, BUTTON_CONFIGURATION, BUTTON_INFORMATION, BUTTON_FIRMWARE_UPGRADE, BUTTON_CONSOLE,
-  BUTTON_MODULE, BUTTON_WIFI, BUTTON_LOGGING, BUTTON_OTHER, BUTTON_TEMPLATE, BUTTON_BACKUP, BUTTON_RESTORE };
-const char kButtonTitle[] PROGMEM =
-  D_RESTART "|" D_RESET_CONFIGURATION "|"
-  D_MAIN_MENU "|" D_CONFIGURATION "|" D_INFORMATION "|" D_FIRMWARE_UPGRADE "|" D_CONSOLE "|"
-  D_CONFIGURE_MODULE "|" D_CONFIGURE_WIFI"|" D_CONFIGURE_LOGGING "|" D_CONFIGURE_OTHER "|" D_CONFIGURE_TEMPLATE "|" D_BACKUP_CONFIGURATION "|" D_RESTORE_CONFIGURATION;
-const char kButtonAction[] PROGMEM =
-  ".|rt|"
-  ".|cn|in|up|cs|"
-  "md|wi|lg|co|tp|dl|rs";
-const char kButtonConfirm[] PROGMEM = D_CONFIRM_RESTART "|" D_CONFIRM_RESET_CONFIGURATION;
-
-enum CTypes { CT_HTML, CT_PLAIN, CT_XML, CT_JSON, CT_STREAM };
-const char kContentTypes[] PROGMEM = "text/html|text/plain|text/xml|application/json|application/octet-stream";
-
-const char kLoggingOptions[] PROGMEM = D_SERIAL_LOG_LEVEL "|" D_WEB_LOG_LEVEL "|" D_MQTT_LOG_LEVEL "|" D_SYS_LOG_LEVEL;
-const char kLoggingLevels[] PROGMEM = D_NONE "|" D_ERROR "|" D_INFO "|" D_DEBUG "|" D_MORE_DEBUG;
-
-const char kEmulationOptions[] PROGMEM = D_NONE "|" D_BELKIN_WEMO "|" D_HUE_BRIDGE;
-
-const char kUploadErrors[] PROGMEM =
-  D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9
-#ifdef USE_RF_FLASH
-  "|" D_UPLOAD_ERR_10 "|" D_UPLOAD_ERR_11 "|" D_UPLOAD_ERR_12 "|" D_UPLOAD_ERR_13
-#endif
-  "|" D_UPLOAD_ERR_14
-  ;
-
-const uint16_t DNS_PORT = 53;
-enum HttpOptions {HTTP_OFF, HTTP_USER, HTTP_ADMIN, HTTP_MANAGER, HTTP_MANAGER_RESET_ONLY};
-
-DNSServer *DnsServer;
-ESP8266WebServer *WebServer;
-
-struct WEB {
-  String chunk_buffer = "";
-  bool reset_web_log_flag = false;
-  uint8_t state = HTTP_OFF;
-  uint8_t upload_error = 0;
-  uint8_t upload_file_type;
-  uint8_t upload_progress_dot_count;
-  uint8_t config_block_count = 0;
-  uint8_t config_xor_on = 0;
-  uint8_t config_xor_on_set = CONFIG_FILE_XOR;
-} Web;
-
-
-static void WebGetArg(const char* arg, char* out, size_t max)
-{
-  String s = WebServer->arg(arg);
-  strlcpy(out, s.c_str(), max);
-
-}
-
-static bool WifiIsInManagerMode(){
-  return (HTTP_MANAGER == Web.state || HTTP_MANAGER_RESET_ONLY == Web.state);
-}
-
-void ShowWebSource(uint32_t source)
-{
-  if ((source > 0) && (source < SRC_MAX)) {
-    char stemp1[20];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SRC: %s from %s"), GetTextIndexed(stemp1, sizeof(stemp1), source, kCommandSource), WebServer->client().remoteIP().toString().c_str());
-  }
-}
-
-void ExecuteWebCommand(char* svalue, uint32_t source)
-{
-  ShowWebSource(source);
-  last_source = source;
-  ExecuteCommand(svalue, SRC_IGNORE);
-}
-
-void StartWebserver(int type, IPAddress ipweb)
-{
-  if (!Settings.web_refresh) { Settings.web_refresh = HTTP_REFRESH_TIME; }
-  if (!Web.state) {
-    if (!WebServer) {
-      WebServer = new ESP8266WebServer((HTTP_MANAGER == type || HTTP_MANAGER_RESET_ONLY == type) ? 80 : WEB_PORT);
-      WebServer->on("/", HandleRoot);
-      WebServer->onNotFound(HandleNotFound);
-      WebServer->on("/up", HandleUpgradeFirmware);
-      WebServer->on("/u1", HandleUpgradeFirmwareStart);
-      WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop);
-      WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest);
-      WebServer->on("/cs", HTTP_GET, HandleConsole);
-      WebServer->on("/cs", HTTP_OPTIONS, HandlePreflightRequest);
-      WebServer->on("/cm", HandleHttpCommand);
-#ifndef FIRMWARE_MINIMAL
-      WebServer->on("/cn", HandleConfiguration);
-      WebServer->on("/md", HandleModuleConfiguration);
-      WebServer->on("/wi", HandleWifiConfiguration);
-      WebServer->on("/lg", HandleLoggingConfiguration);
-      WebServer->on("/tp", HandleTemplateConfiguration);
-      WebServer->on("/co", HandleOtherConfiguration);
-      WebServer->on("/dl", HandleBackupConfiguration);
-      WebServer->on("/rs", HandleRestoreConfiguration);
-      WebServer->on("/rt", HandleResetConfiguration);
-      WebServer->on("/in", HandleInformation);
-      XdrvCall(FUNC_WEB_ADD_HANDLER);
-      XsnsCall(FUNC_WEB_ADD_HANDLER);
-#endif
-    }
-    Web.reset_web_log_flag = false;
-
-
-
-    WebServer->collectHeaders(HEADER_KEYS, sizeof(HEADER_KEYS)/sizeof(char*));
-
-    WebServer->begin();
-  }
-  if (Web.state != type) {
-#if LWIP_IPV6
-    String ipv6_addr = WifiGetIPv6();
-    if(ipv6_addr!="") AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s and IPv6 global address %s "), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str(),ipv6_addr.c_str());
-    else AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
-#else
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_ACTIVE_ON " %s%s " D_WITH_IP_ADDRESS " %s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "", ipweb.toString().c_str());
-#endif
-    rules_flag.http_init = 1;
-  }
-  if (type) { Web.state = type; }
-}
-
-void StopWebserver(void)
-{
-  if (Web.state) {
-    WebServer->close();
-    Web.state = HTTP_OFF;
-    AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_HTTP D_WEBSERVER_STOPPED));
-  }
-}
-
-void WifiManagerBegin(bool reset_only)
-{
-
-  if (!global_state.wifi_down) {
-
-    WifiSetMode(WIFI_AP_STA);
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION));
-  } else {
-
-    WifiSetMode(WIFI_AP);
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_WIFIMANAGER_SET_ACCESSPOINT));
-  }
-
-  StopWebserver();
-
-  DnsServer = new DNSServer();
-
-  int channel = WIFI_SOFT_AP_CHANNEL;
-  if ((channel < 1) || (channel > 13)) { channel = 1; }
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-
-  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0);
-#else
-
-  WiFi.softAP(my_hostname, WIFI_AP_PASSPHRASE, channel, 0, 1);
-#endif
-
-  delay(500);
-
-  DnsServer->setErrorReplyCode(DNSReplyCode::NoError);
-  DnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
-
-  StartWebserver((reset_only ? HTTP_MANAGER_RESET_ONLY : HTTP_MANAGER), WiFi.softAPIP());
-}
-
-void PollDnsWebserver(void)
-{
-  if (DnsServer) { DnsServer->processNextRequest(); }
-  if (WebServer) { WebServer->handleClient(); }
-}
-
-
-
-bool WebAuthenticate(void)
-{
-  if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) {
-    return WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD));
-  } else {
-    return true;
-  }
-}
-
-bool HttpCheckPriviledgedAccess(bool autorequestauth = true)
-{
-  if (HTTP_USER == Web.state) {
-    HandleRoot();
-    return false;
-  }
-  if (autorequestauth && !WebAuthenticate()) {
-    WebServer->requestAuthentication();
-    return false;
-  }
-  return true;
-}
-
-void HttpHeaderCors(void)
-{
-  if (strlen(SettingsText(SET_CORS))) {
-    WebServer->sendHeader(F("Access-Control-Allow-Origin"), SettingsText(SET_CORS));
-  }
-}
-
-void WSHeaderSend(void)
-{
-  WebServer->sendHeader(F("Cache-Control"), F("no-cache, no-store, must-revalidate"));
-  WebServer->sendHeader(F("Pragma"), F("no-cache"));
-  WebServer->sendHeader(F("Expires"), F("-1"));
-  HttpHeaderCors();
-}
-
-
-
-
-
-void WSSend(int code, int ctype, const String& content)
-{
-  char ct[25];
-  WebServer->send(code, GetTextIndexed(ct, sizeof(ct), ctype, kContentTypes), content);
-}
-
-
-
-
-
-void WSContentBegin(int code, int ctype)
-{
-  WebServer->client().flush();
-  WSHeaderSend();
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  WebServer->sendHeader(F("Accept-Ranges"),F("none"));
-  WebServer->sendHeader(F("Transfer-Encoding"),F("chunked"));
-#endif
-  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-  WSSend(code, ctype, "");
-  Web.chunk_buffer = "";
-}
-
-void _WSContentSend(const String& content)
-{
-  size_t len = content.length();
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  const char * footer = "\r\n";
-  char chunk_size[11];
-  sprintf(chunk_size, "%x\r\n", len);
-  WebServer->sendContent(String() + chunk_size + content + footer);
-#else
-  WebServer->sendContent(content);
-#endif
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("WSContentSend"));
-#endif
-  DEBUG_CORE_LOG(PSTR("WEB: Chunk size %d"), len);
-}
-
-void WSContentFlush(void)
-{
-  if (Web.chunk_buffer.length() > 0) {
-    _WSContentSend(Web.chunk_buffer);
-    Web.chunk_buffer = "";
-  }
-}
-
-void _WSContentSendBuffer(void)
-{
-  int len = strlen(mqtt_data);
-
-  if (0 == len) {
-    return;
-  }
-  else if (len == sizeof(mqtt_data)) {
-    AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: Content too large"));
-  }
-  else if (len < CHUNKED_BUFFER_SIZE) {
-    Web.chunk_buffer += mqtt_data;
-    len = Web.chunk_buffer.length();
-  }
-
-  if (len >= CHUNKED_BUFFER_SIZE) {
-    WSContentFlush();
-  }
-  if (strlen(mqtt_data) >= CHUNKED_BUFFER_SIZE) {
-    _WSContentSend(mqtt_data);
-  }
-}
-
-void WSContentSend_P(const char* formatP, ...)
-{
-
-  va_list arg;
-  va_start(arg, formatP);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-  va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-  _WSContentSendBuffer();
-}
-
-void WSContentSend_PD(const char* formatP, ...)
-{
-
-  va_list arg;
-  va_start(arg, formatP);
-  int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-  va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-  if (D_DECIMAL_SEPARATOR[0] != '.') {
-    for (uint32_t i = 0; i < len; i++) {
-      if ('.' == mqtt_data[i]) {
-        mqtt_data[i] = D_DECIMAL_SEPARATOR[0];
-      }
-    }
-  }
-
-  _WSContentSendBuffer();
-}
-
-void WSContentStart_P(const char* title, bool auth)
-{
-  if (auth && strlen(SettingsText(SET_WEBPWD)) && !WebServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD))) {
-    return WebServer->requestAuthentication();
-  }
-
-  WSContentBegin(200, CT_HTML);
-
-  if (title != nullptr) {
-    char ctitle[strlen_P(title) +1];
-    strcpy_P(ctitle, title);
-    WSContentSend_P(HTTP_HEADER, SettingsText(SET_FRIENDLYNAME1), ctitle);
-  }
-}
-
-void WSContentStart_P(const char* title)
-{
-  WSContentStart_P(title, true);
-}
-
-void WSContentSendStyle_P(const char* formatP, ...)
-{
-  if (WifiIsInManagerMode()) {
-    if (WifiConfigCounter()) {
-      WSContentSend_P(HTTP_SCRIPT_COUNTER);
-    }
-  }
-  WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
-
-  WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
-                  WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
-  WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
-                  WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
-                  WebColor(COL_BUTTON));
-  if (formatP != nullptr) {
-
-    va_list arg;
-    va_start(arg, formatP);
-    int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
-    va_end(arg);
-
-#ifdef DEBUG_TASMOTA_CORE
-  if (len > (sizeof(mqtt_data) -1)) {
-    mqtt_data[33] = '\0';
-    DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
-  }
-#endif
-
-    _WSContentSendBuffer();
-  }
-  WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT),
-#ifdef FIRMWARE_MINIMAL
-    WebColor(COL_TEXT_WARNING),
-#endif
-    WebColor(COL_TITLE),
-    ModuleName().c_str(), SettingsText(SET_FRIENDLYNAME1));
-  if (Settings.flag3.gui_hostname_ip) {
-    bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0);
-    bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0);
-    WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"),
-      my_hostname,
-      (Wifi.mdns_begun) ? ".local" : "",
-      (lip) ? WiFi.localIP().toString().c_str() : "",
-      (lip && sip) ? ", " : "",
-      (sip) ? WiFi.softAPIP().toString().c_str() : "");
-  }
-  WSContentSend_P(PSTR("</div>"));
-}
-
-void WSContentSendStyle(void)
-{
-  WSContentSendStyle_P(nullptr);
-}
-
-void WSContentButton(uint32_t title_index)
-{
-  char action[4];
-  char title[100];
-
-  if (title_index <= BUTTON_RESET_CONFIGURATION) {
-    char confirm[100];
-    WSContentSend_P(PSTR("<p><form action='%s' method='get' onsubmit='return confirm(\"%s\");'><button name='%s' class='button bred'>%s</button></form></p>"),
-      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
-      GetTextIndexed(confirm, sizeof(confirm), title_index, kButtonConfirm),
-      (!title_index) ? "rst" : "non",
-      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
-  } else {
-    WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),
-      GetTextIndexed(action, sizeof(action), title_index, kButtonAction),
-      GetTextIndexed(title, sizeof(title), title_index, kButtonTitle));
-  }
-}
-
-void WSContentSpaceButton(uint32_t title_index)
-{
-  WSContentSend_P(PSTR("<div></div>"));
-  WSContentButton(title_index);
-}
-
-void WSContentEnd(void)
-{
-  WSContentFlush();
-  _WSContentSend("");
-  WebServer->client().stop();
-}
-
-void WSContentStop(void)
-{
-  if (WifiIsInManagerMode()) {
-    if (WifiConfigCounter()) {
-      WSContentSend_P(HTTP_COUNTER);
-    }
-  }
-  WSContentSend_P(HTTP_END, my_version);
-  WSContentEnd();
-}
-
-
-
-void WebRestart(uint32_t type)
-{
-
-
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
-
-  bool reset_only = (HTTP_MANAGER_RESET_ONLY == Web.state);
-
-  WSContentStart_P((type) ? S_SAVE_CONFIGURATION : S_RESTART, !reset_only);
-  WSContentSend_P(HTTP_SCRIPT_RELOAD);
-  WSContentSendStyle();
-  if (type) {
-    WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_CONFIGURATION_SAVED "</b><br>"));
-    if (2 == type) {
-      WSContentSend_P(PSTR("<br>" D_TRYING_TO_CONNECT "<br>"));
-    }
-    WSContentSend_P(PSTR("</div>"));
-  }
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  if (HTTP_MANAGER == Web.state || reset_only) {
-    Web.state = HTTP_ADMIN;
-  } else {
-    WSContentSpaceButton(BUTTON_MAIN);
-  }
-  WSContentStop();
-
-  ShowWebSource(SRC_WEBGUI);
-  restart_flag = 2;
-}
-
-
-
-void HandleWifiLogin(void)
-{
-  WSContentStart_P(S_CONFIGURE_WIFI, false);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_LOGIN);
-
-  if (HTTP_MANAGER_RESET_ONLY == Web.state) {
-    WSContentSpaceButton(BUTTON_RESTART);
-#ifndef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
-#endif
-  }
-
-  WSContentStop();
-}
-
-void WebSliderColdWarm(void)
-{
-  WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-    "a",
-    "#fff", "#ff0",
-    1,
-    153, 500,
-    LightGetColorTemp(),
-    't', 0);
-}
-
-void HandleRoot(void)
-{
-  if (CaptivePortal()) { return; }
-
-  if (WebServer->hasArg("rst")) {
-    WebRestart(0);
-    return;
-  }
-
-  if (WifiIsInManagerMode()) {
-#ifndef FIRMWARE_MINIMAL
-    if (strlen(SettingsText(SET_WEBPWD)) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1")) && HTTP_MANAGER_RESET_ONLY != Web.state) {
-      HandleWifiLogin();
-    } else {
-      if (!strlen(SettingsText(SET_WEBPWD)) || (((WebServer->arg("USER1") == WEB_USERNAME ) && (WebServer->arg("PASS1") == SettingsText(SET_WEBPWD) )) || HTTP_MANAGER_RESET_ONLY == Web.state)) {
-        HandleWifiConfiguration();
-      } else {
-
-        HandleWifiLogin();
-      }
-    }
-#endif
-    return;
-  }
-
-  if (HandleRootStatusRefresh()) {
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU);
-
-  char stemp[33];
-
-  WSContentStart_P(S_MAIN_MENU);
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh, Settings.web_refresh);
-#else
-  WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh);
-#endif
-  WSContentSend_P(HTTP_SCRIPT_ROOT_PART2);
-
-  WSContentSendStyle();
-
-  WSContentSend_P(PSTR("<div id='l1' name='l1'></div>"));
-  if (devices_present) {
-#ifdef USE_LIGHT
-    if (light_type) {
-      uint8_t light_subtype = light_type &7;
-      if (!Settings.flag3.pwm_multi_channels) {
-        bool split_white = ((LST_RGBW <= light_subtype) && (devices_present > 1));
-
-        if ((LST_COLDWARM == light_subtype) || ((LST_RGBCW == light_subtype) && !split_white)) {
-          WebSliderColdWarm();
-        }
-
-        if (light_subtype > 2) {
-          uint16_t hue;
-          uint8_t sat;
-          LightGetHSB(&hue, &sat, nullptr);
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "b",
-            "#800", "#f00 5%,#ff0 20%,#0f0 35%,#0ff 50%,#00f 65%,#f0f 80%,#f00 95%,#800",
-            2,
-            1, 359,
-            hue,
-            'h', 0);
-
-          uint8_t dcolor = changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255);
-          char scolor[8];
-          snprintf_P(scolor, sizeof(scolor), PSTR("#%02X%02X%02X"), dcolor, dcolor, dcolor);
-          uint8_t red, green, blue;
-          LightHsToRgb(hue, 255, &red, &green, &blue);
-          snprintf_P(stemp, sizeof(stemp), PSTR("#%02X%02X%02X"), red, green, blue);
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "s",
-            scolor, stemp,
-            3,
-            0, 100,
-            changeUIntScale(sat, 0, 255, 0, 100),
-            'n', 0);
-        }
-
-        WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-          "c",
-          "#000", "#fff",
-          4,
-          Settings.flag3.slider_dimmer_stay_on, 100,
-          Settings.light_dimmer,
-          'd', 0);
-
-        if (split_white) {
-          if (LST_RGBCW == light_subtype) {
-            WebSliderColdWarm();
-          }
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            "f",
-            "#000", "#fff",
-            5,
-            Settings.flag3.slider_dimmer_stay_on, 100,
-            LightGetDimmer(2),
-            'w', 0);
-        }
-      } else {
-        uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype;
-        stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0';
-        for (uint32_t i = 0; i < pwm_channels; i++) {
-          stemp[1]++;
-
-          WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,
-            stemp,
-            "#000", "#fff",
-            i+1,
-            1, 100,
-            changeUIntScale(Settings.light_color[i], 0, 255, 0, 100),
-            'e', i+1);
-        }
-      }
-    }
-#endif
-#ifdef USE_SHUTTER
-    if (Settings.flag3.shutter_mode) {
-      for (uint32_t i = 0; i < shutters_present; i++) {
-        WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, Settings.shutter_position[i], i+1);
-      }
-    }
-#endif
-    WSContentSend_P(HTTP_TABLE100);
-    WSContentSend_P(PSTR("<tr>"));
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      WSContentSend_P(HTTP_DEVICE_CONTROL, 36, 1,
-        (strlen(SettingsText(SET_BUTTON1))) ? SettingsText(SET_BUTTON1) : D_BUTTON_TOGGLE,
-        "");
-      for (uint32_t i = 0; i < MaxFanspeed(); i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i);
-        WSContentSend_P(HTTP_DEVICE_CONTROL, 16, i +2,
-          (strlen(SettingsText(SET_BUTTON2 + i))) ? SettingsText(SET_BUTTON2 + i) : stemp,
-          "");
-      }
-    } else {
-#endif
-      for (uint32_t idx = 1; idx <= devices_present; idx++) {
-        bool set_button = ((idx <= MAX_BUTTON_TEXT) && strlen(SettingsText(SET_BUTTON1 + idx -1)));
-#ifdef USE_SHUTTER
-        int32_t ShutterWebButton;
-        if (ShutterWebButton = IsShutterWebButton(idx)) {
-          WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-            (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((Settings.shutter_options[abs(ShutterWebButton)-1] & 2) ? "-" : ((ShutterWebButton>0) ? "▲" : "▼")),
-            "");
-          continue;
-        }
-#endif
-        snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx);
-        WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / devices_present, idx,
-          (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : (devices_present < 5) ? D_BUTTON_TOGGLE : "",
-          (set_button) ? "" : (devices_present > 1) ? stemp : "");
-      }
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-#ifdef USE_SONOFF_RF
-  if (SONOFF_BRIDGE == my_module_type) {
-    WSContentSend_P(HTTP_TABLE100);
-    WSContentSend_P(PSTR("<tr>"));
-    uint32_t idx = 0;
-    for (uint32_t i = 0; i < 4; i++) {
-      if (idx > 0) { WSContentSend_P(PSTR("</tr><tr>")); }
-      for (uint32_t j = 0; j < 4; j++) {
-        idx++;
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), idx);
-        WSContentSend_P(PSTR("<td style='width:25%%'><button onclick='la(\"&k=%d\");'>%s</button></td>"), idx,
-          (strlen(SettingsText(SET_BUTTON1 + idx -1))) ? SettingsText(SET_BUTTON1 + idx -1) : stemp);
-      }
-    }
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-#endif
-
-#ifndef FIRMWARE_MINIMAL
-  XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
-  XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
-#endif
-
-  if (HTTP_ADMIN == Web.state) {
-#ifdef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_FIRMWARE_UPGRADE);
-#else
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentButton(BUTTON_INFORMATION);
-    WSContentButton(BUTTON_FIRMWARE_UPGRADE);
-#endif
-    WSContentButton(BUTTON_CONSOLE);
-    WSContentButton(BUTTON_RESTART);
-  }
-  WSContentStop();
-}
-
-bool HandleRootStatusRefresh(void)
-{
-  if (!WebAuthenticate()) {
-    WebServer->requestAuthentication();
-    return true;
-  }
-
-  if (!WebServer->hasArg("m")) {
-    return false;
-  }
-
-  #ifdef USE_SCRIPT_WEB_DISPLAY
-    Script_Check_HTML_Setvars();
-  #endif
-
-  char tmp[8];
-  char svalue[32];
-  char webindex[5];
-
-  WebGetArg("o", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    ShowWebSource(SRC_WEBGUI);
-    uint32_t device = atoi(tmp);
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      if (device < 2) {
-        ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE);
-      } else {
-        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), device -2);
-        ExecuteCommand(svalue, SRC_WEBGUI);
-      }
-    } else {
-#endif
-#ifdef USE_SHUTTER
-      int32_t ShutterWebButton;
-      if (ShutterWebButton = IsShutterWebButton(device)) {
-        snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), abs(ShutterWebButton), (ShutterWebButton>0) ? PSTR(D_CMND_SHUTTER_TOGGLEUP) : PSTR(D_CMND_SHUTTER_TOGGLEDOWN));
-        ExecuteWebCommand(svalue, SRC_WEBGUI);
-      } else {
-#endif
-        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
-#ifdef USE_SHUTTER
-      }
-#endif
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-  }
-  WebGetArg("d0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("w0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-  for (uint32_t j = 1; j <= pwm_channels; j++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    if (strlen(tmp)) {
-      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp);
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-  }
-  WebGetArg("t0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_COLORTEMPERATURE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("h0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "1 %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-  WebGetArg("n0", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "2 %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-#ifdef USE_SHUTTER
-  for (uint32_t j = 1; j <= shutters_present; j++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    if (strlen(tmp)) {
-      snprintf_P(svalue, sizeof(svalue), PSTR("ShutterPosition%d %s"), j, tmp);
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-  }
-#endif
-#ifdef USE_SONOFF_RF
-  WebGetArg("k", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_RFKEY "%s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-  }
-#endif
-  WSContentBegin(200, CT_HTML);
-  WSContentSend_P(PSTR("{t}"));
-  XsnsCall(FUNC_WEB_SENSOR);
-#ifdef USE_SCRIPT_WEB_DISPLAY
-  XdrvCall(FUNC_WEB_SENSOR);
-#endif
-
-  WSContentSend_P(PSTR("</table>"));
-
-  if (devices_present) {
-    WSContentSend_P(PSTR("{t}<tr>"));
-    uint32_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32;
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) {
-      WSContentSend_P(HTTP_DEVICE_STATE, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
-      uint32_t fanspeed = GetFanspeed();
-      snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fanspeed);
-      WSContentSend_P(HTTP_DEVICE_STATE, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
-    } else {
-#endif
-      for (uint32_t idx = 1; idx <= devices_present; idx++) {
-        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1));
-        WSContentSend_P(HTTP_DEVICE_STATE, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
-      }
-#ifdef USE_SONOFF_IFAN
-    }
-#endif
-    WSContentSend_P(PSTR("</tr></table>"));
-  }
-  WSContentEnd();
-
-  return true;
-}
-
-#ifdef USE_SHUTTER
-int32_t IsShutterWebButton(uint32_t idx) {
-
-  int32_t ShutterWebButton = 0;
-  if (Settings.flag3.shutter_mode) {
-    for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-      if (Settings.shutter_startrelay[i] && ((Settings.shutter_startrelay[i] == idx) || (Settings.shutter_startrelay[i] == (idx-1)))) {
-        ShutterWebButton = (Settings.shutter_startrelay[i] == idx) ? (i+1): (-1-i);
-        break;
-      }
-    }
-  }
-  return ShutterWebButton;
-}
-#endif
-
-
-
-#ifndef FIRMWARE_MINIMAL
-
-void HandleConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION);
-
-  WSContentStart_P(S_CONFIGURATION);
-  WSContentSendStyle();
-
-  WSContentButton(BUTTON_MODULE);
-  WSContentButton(BUTTON_WIFI);
-
-  XdrvCall(FUNC_WEB_ADD_BUTTON);
-  XsnsCall(FUNC_WEB_ADD_BUTTON);
-
-  WSContentButton(BUTTON_LOGGING);
-  WSContentButton(BUTTON_OTHER);
-  WSContentButton(BUTTON_TEMPLATE);
-
-  WSContentSpaceButton(BUTTON_RESET_CONFIGURATION);
-  WSContentButton(BUTTON_BACKUP);
-  WSContentButton(BUTTON_RESTORE);
-
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-
-
-
-void HandleTemplateConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    TemplateSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[30];
-
-  if (WebServer->hasArg("m")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t i = 0; i < sizeof(kModuleNiceList); i++) {
-      uint32_t midx = pgm_read_byte(kModuleNiceList + i);
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
-    }
-    WSContentEnd();
-    return;
-  }
-
-  WebGetArg("t", stemp, sizeof(stemp));
-  if (strlen(stemp)) {
-    uint32_t module = atoi(stemp);
-    uint32_t module_save = Settings.module;
-    Settings.module = module;
-    myio cmodule;
-    ModuleGpios(&cmodule);
-    gpio_flag flag = ModuleFlag();
-    Settings.module = module_save;
-
-    WSContentBegin(200, CT_PLAIN);
-    WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str());
-    for (uint32_t i = 0; i < sizeof(kGpioNiceList); i++) {
-      if (1 == i) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);
-      }
-      uint32_t midx = pgm_read_byte(kGpioNiceList + i);
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-    }
-    WSContentSend_P(PSTR("}1"));
-
-    for (uint32_t i = 0; i < ADC0_END; i++) {
-      if (1 == i) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, ADC0_USER, D_SENSOR_USER, ADC0_USER);
-      }
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, i, GetTextIndexed(stemp, sizeof(stemp), i, kAdc0Names), i);
-    }
-    WSContentSend_P(PSTR("}1"));
-
-    for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-      if ((i < 6) || ((i > 8) && (i != 11))) {
-        WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", cmodule.io[i]);
-      }
-    }
-    WSContentSend_P(PSTR("}1%d}1%d"), flag, Settings.user_template_base);
-    WSContentEnd();
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TEMPLATE);
-
-  WSContentStart_P(S_CONFIGURE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_TEMPLATE);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_TEMPLATE);
-  WSContentSend_P(HTTP_TABLE100);
-  WSContentSend_P(PSTR("<tr><td><b>" D_TEMPLATE_NAME "</b></td><td style='width:200px'><input id='s1' placeholder='" D_TEMPLATE_NAME "'></td></tr>"
-                       "<tr><td><b>" D_BASE_TYPE "</b></td><td><select id='g99' onchange='st(this.value)'></select></td></tr>"
-                       "</table>"
-                       "<hr/>"));
-  WSContentSend_P(HTTP_TABLE100);
-  for (uint32_t i = 0; i < 17; i++) {
-    if ((i < 6) || ((i > 8) && (i != 11))) {
-      WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_GPIO "%d</font></b></td><td%s><select id='g%d'></select></td></tr>"),
-        ((9==i)||(10==i)) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? " style='width:200px'" : "", i);
-    }
-  }
-  WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_ADC "0</font></b></td><td><select id='g17'></select></td></tr>"), WebColor(COL_TEXT));
-  WSContentSend_P(PSTR("</table>"));
-  gpio_flag flag = ModuleFlag();
-  if (flag.data > ADC0_USER) {
-    WSContentSend_P(HTTP_FORM_TEMPLATE_FLAG);
-  }
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void TemplateSaveSettings(void)
-{
-  char tmp[sizeof(Settings.user_template.name)];
-  char webindex[5];
-  char svalue[128];
-
-  WebGetArg("s1", tmp, sizeof(tmp));
-  snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " {\"" D_JSON_NAME "\":\"%s\",\"" D_JSON_GPIO "\":["), tmp);
-
-  uint32_t j = 0;
-  for (uint32_t i = 0; i < sizeof(Settings.user_template.gp); i++) {
-    if (6 == i) { j = 9; }
-    if (8 == i) { j = 12; }
-    snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), j);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    uint8_t gpio = atoi(tmp);
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s%d"), svalue, (i>0)?",":"", gpio);
-    j++;
-  }
-
-  WebGetArg("g17", tmp, sizeof(tmp));
-  uint32_t flag = atoi(tmp);
-  for (uint32_t i = 0; i < GPIO_FLAG_USED; i++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("c%d"), i);
-    uint32_t state = WebServer->hasArg(webindex) << i +4;
-    flag += state;
-  }
-  WebGetArg("g99", tmp, sizeof(tmp));
-  uint32_t base = atoi(tmp) +1;
-
-  snprintf_P(svalue, sizeof(svalue), PSTR("%s],\"" D_JSON_FLAG "\":%d,\"" D_JSON_BASE "\":%d}"), svalue, flag, base);
-  ExecuteWebCommand(svalue, SRC_WEBGUI);
-}
-
-
-
-void HandleModuleConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    ModuleSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[30];
-  uint32_t midx;
-  myio cmodule;
-  ModuleGpios(&cmodule);
-
-  if (WebServer->hasArg("m")) {
-    WSContentBegin(200, CT_PLAIN);
-    uint32_t vidx = 0;
-    for (uint32_t i = 0; i <= sizeof(kModuleNiceList); i++) {
-      if (0 == i) {
-        midx = USER_MODULE;
-        vidx = 0;
-      } else {
-        midx = pgm_read_byte(kModuleNiceList + i -1);
-        vidx = midx +1;
-      }
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
-    }
-    WSContentEnd();
-    return;
-  }
-
-  if (WebServer->hasArg("g")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t j = 0; j < sizeof(kGpioNiceList); j++) {
-      midx = pgm_read_byte(kGpioNiceList + j);
-      if (!GetUsedInModule(midx, cmodule.io)) {
-        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-      }
-    }
-    WSContentEnd();
-    return;
-  }
-
-#ifndef USE_ADC_VCC
-  if (WebServer->hasArg("a")) {
-    WSContentBegin(200, CT_PLAIN);
-    for (uint32_t j = 0; j < ADC0_END; j++) {
-      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, j, GetTextIndexed(stemp, sizeof(stemp), j, kAdc0Names), j);
-    }
-    WSContentEnd();
-    return;
-  }
-#endif
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MODULE);
-
-  WSContentStart_P(S_CONFIGURE_MODULE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE_TEMPLATE);
-  WSContentSend_P(HTTP_SCRIPT_MODULE1, Settings.module);
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (ValidGPIO(i, cmodule.io[i])) {
-      WSContentSend_P(PSTR("sk(%d,%d);"), my_module.io[i], i);
-    }
-  }
-  WSContentSend_P(HTTP_SCRIPT_MODULE2, Settings.my_adc0);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_MODULE, AnyModuleName(MODULE).c_str());
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (ValidGPIO(i, cmodule.io[i])) {
-      snprintf_P(stemp, 3, PINS_WEMOS +i*2);
-      char sesp8285[40];
-      snprintf_P(sesp8285, sizeof(sesp8285), PSTR("<font color='#%06x'>ESP8285</font>"), WebColor(COL_TEXT_WARNING));
-      WSContentSend_P(PSTR("<tr><td style='width:190px'>%s <b>" D_GPIO "%d</b> %s</td><td style='width:176px'><select id='g%d'></select></td></tr>"),
-        (WEMOS==my_module_type)?stemp:"", i, (0==i)? D_SENSOR_BUTTON "1":(1==i)? D_SERIAL_OUT :(3==i)? D_SERIAL_IN :((9==i)||(10==i))? sesp8285 :(12==i)? D_SENSOR_RELAY "1":(13==i)? D_SENSOR_LED "1i":(14==i)? D_SENSOR :"", i);
-    }
-  }
-#ifndef USE_ADC_VCC
-  if (ValidAdc()) {
-    WSContentSend_P(PSTR("<tr><td>%s <b>" D_ADC "0</b></td><td style='width:176px'><select id='g17'></select></td></tr>"), (WEMOS==my_module_type)?"A0":"");
-  }
-#endif
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void ModuleSaveSettings(void)
-{
-  char tmp[8];
-  char webindex[5];
-
-  WebGetArg("g99", tmp, sizeof(tmp));
-  uint32_t new_module = (!strlen(tmp)) ? MODULE : atoi(tmp);
-  Settings.last_module = Settings.module;
-  Settings.module = new_module;
-  SetModuleType();
-  myio cmodule;
-  ModuleGpios(&cmodule);
-  String gpios = "";
-  for (uint32_t i = 0; i < sizeof(cmodule); i++) {
-    if (Settings.last_module != new_module) {
-      Settings.my_gp.io[i] = GPIO_NONE;
-    } else {
-      if (ValidGPIO(i, cmodule.io[i])) {
-        snprintf_P(webindex, sizeof(webindex), PSTR("g%d"), i);
-        WebGetArg(webindex, tmp, sizeof(tmp));
-        Settings.my_gp.io[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-        gpios += F(", " D_GPIO ); gpios += String(i); gpios += F(" "); gpios += String(Settings.my_gp.io[i]);
-      }
-    }
-  }
-#ifndef USE_ADC_VCC
-  WebGetArg("g17", tmp, sizeof(tmp));
-  Settings.my_adc0 = (!strlen(tmp)) ? 0 : atoi(tmp);
-  gpios += F(", " D_ADC "0 "); gpios += String(Settings.my_adc0);
-#endif
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MODULE "%s " D_CMND_MODULE "%s"), ModuleName().c_str(), gpios.c_str());
-}
-
-
-
-const char kUnescapeCode[] = "&><\"\'";
-const char kEscapeCode[] PROGMEM = "&amp;|&gt;|&lt;|&quot;|&apos;";
-
-String HtmlEscape(const String unescaped) {
-  char escaped[10];
-  size_t ulen = unescaped.length();
-  String result = "";
-  for (size_t i = 0; i < ulen; i++) {
-    char c = unescaped[i];
-    char *p = strchr(kUnescapeCode, c);
-    if (p != nullptr) {
-      result += GetTextIndexed(escaped, sizeof(escaped), p - kUnescapeCode, kEscapeCode);
-    } else {
-      result += c;
-    }
-  }
-  return result;
-}
-
-
-const char kEncryptionType[] PROGMEM = "|||" D_WPA_PSK "||" D_WPA2_PSK "|" D_WEP "||" D_NONE "|" D_AUTO;
-
-void HandleWifiConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI);
-
-  if (WebServer->hasArg("save") && HTTP_MANAGER_RESET_ONLY != Web.state) {
-    WifiSaveSettings();
-    WebRestart(2);
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_WIFI, !WifiIsInManagerMode());
-  WSContentSend_P(HTTP_SCRIPT_WIFI);
-  WSContentSendStyle();
-
-  if (HTTP_MANAGER_RESET_ONLY != Web.state) {
-    if (WebServer->hasArg("scan")) {
-#ifdef USE_EMULATION
-      UdpDisconnect();
-#endif
-      int n = WiFi.scanNetworks();
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI D_SCAN_DONE));
-
-      if (0 == n) {
-        AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, S_NO_NETWORKS_FOUND);
-        WSContentSend_P(S_NO_NETWORKS_FOUND);
-        WSContentSend_P(PSTR(". " D_REFRESH_TO_SCAN_AGAIN "."));
-      } else {
-
-        int indices[n];
-        for (uint32_t i = 0; i < n; i++) {
-          indices[i] = i;
-        }
-
-
-        for (uint32_t i = 0; i < n; i++) {
-          for (uint32_t j = i + 1; j < n; j++) {
-            if (WiFi.RSSI(indices[j]) > WiFi.RSSI(indices[i])) {
-              std::swap(indices[i], indices[j]);
-            }
-          }
-        }
-
-
-        String cssid;
-        for (uint32_t i = 0; i < n; i++) {
-          if (-1 == indices[i]) { continue; }
-          cssid = WiFi.SSID(indices[i]);
-          uint32_t cschn = WiFi.channel(indices[i]);
-          for (uint32_t j = i + 1; j < n; j++) {
-            if ((cssid == WiFi.SSID(indices[j])) && (cschn == WiFi.channel(indices[j]))) {
-              DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
-              indices[j] = -1;
-            }
-          }
-        }
-
-
-        for (uint32_t i = 0; i < n; i++) {
-          if (-1 == indices[i]) { continue; }
-          int32_t rssi = WiFi.RSSI(indices[i])
-          DEBUG_CORE_LOG(PSTR(D_LOG_WIFI D_SSID " %s, " D_BSSID " %s, " D_CHANNEL " %d, " D_RSSI " %d"),
-            WiFi.SSID(indices[i]).c_str(), WiFi.BSSIDstr(indices[i]).c_str(), WiFi.channel(indices[i]), rssi);
-          int quality = WifiGetRssiAsQuality(rssi);
-          int auth = WiFi.encryptionType(indices[i]);
-          char encryption[20];
-          WSContentSend_P(PSTR("<div><a href='#p' onclick='c(this)'>%s</a>&nbsp;(%d)&nbsp<span class='q'>%s %d%% (%d dBm)</span></div>"),
-            HtmlEscape(WiFi.SSID(indices[i])).c_str(),
-            WiFi.channel(indices[i]),
-            GetTextIndexed(encryption, sizeof(encryption), auth +1, kEncryptionType),
-            quality, rssi
-          );
-          delay(0);
-
-        }
-        WSContentSend_P(PSTR("<br>"));
-      }
-    } else {
-      WSContentSend_P(PSTR("<div><a href='/wi?scan='>" D_SCAN_FOR_WIFI_NETWORKS "</a></div><br>"));
-    }
-
-
-    WSContentSend_P(HTTP_FORM_WIFI, SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), WIFI_HOSTNAME, WIFI_HOSTNAME, SettingsText(SET_HOSTNAME), SettingsText(SET_CORS));
-    WSContentSend_P(HTTP_FORM_END);
-  }
-
-  if (WifiIsInManagerMode()) {
-#ifndef FIRMWARE_MINIMAL
-    WSContentSpaceButton(BUTTON_RESTORE);
-    WSContentButton(BUTTON_RESET_CONFIGURATION);
-#endif
-    WSContentSpaceButton(BUTTON_RESTART);
-  } else {
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-  }
-  WSContentStop();
-}
-
-void WifiSaveSettings(void)
-{
-  char tmp[TOPSZ];
-
-  WebGetArg("h", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_HOSTNAME, (!strlen(tmp)) ? WIFI_HOSTNAME : tmp);
-  if (strstr(SettingsText(SET_HOSTNAME), "%") != nullptr) {
-    SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
-  }
-  WebGetArg("c", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_CORS, (!strlen(tmp)) ? CORS_DOMAIN : tmp);
-  WebGetArg("s1", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STASSID1, (!strlen(tmp)) ? STA_SSID1 : tmp);
-  WebGetArg("s2", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STASSID2, (!strlen(tmp)) ? STA_SSID2 : tmp);
-  WebGetArg("p1", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STAPWD1, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD1) : tmp);
-  WebGetArg("p2", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_STAPWD2, (!strlen(tmp)) ? "" : (strlen(tmp) < 5) ? SettingsText(SET_STAPWD2) : tmp);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_HOSTNAME " %s, " D_CMND_SSID "1 %s, " D_CMND_SSID "2 %s, " D_CMND_CORS " %s"),
-    SettingsText(SET_HOSTNAME), SettingsText(SET_STASSID1), SettingsText(SET_STASSID2), SettingsText(SET_CORS));
-}
-
-
-
-void HandleLoggingConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING);
-
-  if (WebServer->hasArg("save")) {
-    LoggingSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_LOGGING);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_LOG1);
-  char stemp1[45];
-  char stemp2[32];
-  uint8_t dlevel[4] = { LOG_LEVEL_INFO, LOG_LEVEL_INFO, LOG_LEVEL_NONE, LOG_LEVEL_NONE };
-  for (uint32_t idx = 0; idx < 4; idx++) {
-    if ((2==idx) && !Settings.flag.mqtt_enabled) { continue; }
-    uint32_t llevel = (0==idx)?Settings.seriallog_level:(1==idx)?Settings.weblog_level:(2==idx)?Settings.mqttlog_level:Settings.syslog_level;
-    WSContentSend_P(PSTR("<p><b>%s</b> (%s)<br><select id='l%d'>"),
-      GetTextIndexed(stemp1, sizeof(stemp1), idx, kLoggingOptions),
-      GetTextIndexed(stemp2, sizeof(stemp2), dlevel[idx], kLoggingLevels),
-      idx);
-    for (uint32_t i = LOG_LEVEL_NONE; i <= LOG_LEVEL_DEBUG_MORE; i++) {
-      WSContentSend_P(PSTR("<option%s value='%d'>%d %s</option>"),
-        (i == llevel) ? " selected" : "", i, i,
-        GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
-    }
-    WSContentSend_P(PSTR("</select></p>"));
-  }
-  WSContentSend_P(HTTP_FORM_LOG2, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void LoggingSaveSettings(void)
-{
-  char tmp[TOPSZ];
-
-  WebGetArg("l0", tmp, sizeof(tmp));
-  SetSeriallog((!strlen(tmp)) ? SERIAL_LOG_LEVEL : atoi(tmp));
-  WebGetArg("l1", tmp, sizeof(tmp));
-  Settings.weblog_level = (!strlen(tmp)) ? WEB_LOG_LEVEL : atoi(tmp);
-  WebGetArg("l2", tmp, sizeof(tmp));
-  Settings.mqttlog_level = (!strlen(tmp)) ? MQTT_LOG_LEVEL : atoi(tmp);
-  WebGetArg("l3", tmp, sizeof(tmp));
-  SetSyslog((!strlen(tmp)) ? SYS_LOG_LEVEL : atoi(tmp));
-  WebGetArg("lh", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_SYSLOG_HOST, (!strlen(tmp)) ? SYS_LOG_HOST : tmp);
-  WebGetArg("lp", tmp, sizeof(tmp));
-  Settings.syslog_port = (!strlen(tmp)) ? SYS_LOG_PORT : atoi(tmp);
-  WebGetArg("lt", tmp, sizeof(tmp));
-  Settings.tele_period = (!strlen(tmp)) ? TELE_PERIOD : atoi(tmp);
-  if ((Settings.tele_period > 0) && (Settings.tele_period < 10)) {
-    Settings.tele_period = 10;
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_LOG D_CMND_SERIALLOG " %d, " D_CMND_WEBLOG " %d, " D_CMND_MQTTLOG " %d, " D_CMND_SYSLOG " %d, " D_CMND_LOGHOST " %s, " D_CMND_LOGPORT " %d, " D_CMND_TELEPERIOD " %d"),
-    Settings.seriallog_level, Settings.weblog_level, Settings.mqttlog_level, Settings.syslog_level, SettingsText(SET_SYSLOG_HOST), Settings.syslog_port, Settings.tele_period);
-}
-
-
-
-void HandleOtherConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER);
-
-  if (WebServer->hasArg("save")) {
-    OtherSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_OTHER);
-  WSContentSendStyle();
-
-  TemplateJson();
-  char stemp[strlen(mqtt_data) +1];
-  strlcpy(stemp, mqtt_data, sizeof(stemp));
-  WSContentSend_P(HTTP_FORM_OTHER, stemp, (USER_MODULE == Settings.module) ? " checked disabled" : "", (Settings.flag.mqtt_enabled) ? " checked" : "");
-
-  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) { maxfn = 1; }
-#endif
-  for (uint32_t i = 0; i < maxfn; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i +1);
-    WSContentSend_P(PSTR("<b>" D_FRIENDLY_NAME " %d</b> (" FRIENDLY_NAME "%s)<br><input id='a%d' placeholder='" FRIENDLY_NAME "%s' value='%s'><p></p>"),
-      i +1,
-      (i) ? stemp : "",
-      i,
-      (i) ? stemp : "",
-      SettingsText(SET_FRIENDLYNAME1 + i));
-  }
-
-#ifdef USE_EMULATION
-  WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));
-  for (uint32_t i = 0; i < EMUL_MAX; i++) {
-#ifndef USE_EMULATION_WEMO
-    if (i == EMUL_WEMO) { i++; }
-#endif
-#ifndef USE_EMULATION_HUE
-    if (i == EMUL_HUE) { i++; }
-#endif
-    if (i < EMUL_MAX) {
-      WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br>"),
-        i, i,
-        (i == Settings.flag2.emulation) ? " checked" : "",
-        GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
-        (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
-    }
-  }
-  WSContentSend_P(PSTR("</p></fieldset>"));
-#endif
-
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void OtherSaveSettings(void)
-{
-  char tmp[TOPSZ];
-  char webindex[5];
-  char friendlyname[TOPSZ];
-  char message[LOGSZ];
-
-  WebGetArg("wp", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
-  Settings.flag.mqtt_enabled = WebServer->hasArg("b1");
-#ifdef USE_EMULATION
-  WebGetArg("b2", tmp, sizeof(tmp));
-  Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
-#endif
-
-  snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);
-  for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("a%d"), i);
-    WebGetArg(webindex, tmp, sizeof(tmp));
-    snprintf_P(friendlyname, sizeof(friendlyname), PSTR(FRIENDLY_NAME"%d"), i +1);
-    SettingsUpdateText(SET_FRIENDLYNAME1 +i, (!strlen(tmp)) ? (i) ? friendlyname : FRIENDLY_NAME : tmp);
-    snprintf_P(message, sizeof(message), PSTR("%s%s %s"), message, (i) ? "," : "", SettingsText(SET_FRIENDLYNAME1 +i));
-  }
-  AddLog_P(LOG_LEVEL_INFO, message);
-
-  WebGetArg("t1", tmp, sizeof(tmp));
-  if (strlen(tmp)) {
-    char svalue[128];
-    snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp);
-    ExecuteWebCommand(svalue, SRC_WEBGUI);
-
-    if (WebServer->hasArg("t2")) {
-      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0"));
-      ExecuteWebCommand(svalue, SRC_WEBGUI);
-    }
-
-  }
-}
-
-
-
-void HandleBackupConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION));
-
-  if (!SettingsBufferAlloc()) { return; }
-
-  WiFiClient myClient = WebServer->client();
-  WebServer->setContentLength(sizeof(Settings));
-
-  char attachment[TOPSZ];
-
-
-
-
-  char hostname[sizeof(my_hostname)];
-  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(hostname, my_hostname), my_version);
-
-  WebServer->sendHeader(F("Content-Disposition"), attachment);
-
-  WSSend(200, CT_STREAM, "");
-
-  uint32_t cfg_crc32 = Settings.cfg_crc32;
-  Settings.cfg_crc32 = GetSettingsCrc32();
-
-  memcpy(settings_buffer, &Settings, sizeof(Settings));
-  if (Web.config_xor_on_set) {
-    for (uint32_t i = 2; i < sizeof(Settings); i++) {
-      settings_buffer[i] ^= (Web.config_xor_on_set +i);
-    }
-  }
-
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  size_t written = myClient.write((const char*)settings_buffer, sizeof(Settings));
-  if (written < sizeof(Settings)) {
-    myClient.write((const char*)settings_buffer +written, sizeof(Settings) -written);
-  }
-#else
-  myClient.write((const char*)settings_buffer, sizeof(Settings));
-#endif
-
-  SettingsBufferFree();
-
-  Settings.cfg_crc32 = cfg_crc32;
-}
-
-
-
-void HandleResetConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess(!WifiIsInManagerMode())) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESET_CONFIGURATION);
-
-  WSContentStart_P(S_RESET_CONFIGURATION, !WifiIsInManagerMode());
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'>" D_CONFIGURATION_RESET "</div>"));
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  char command[CMDSZ];
-  snprintf_P(command, sizeof(command), PSTR(D_CMND_RESET " 1"));
-  ExecuteWebCommand(command, SRC_WEBGUI);
-}
-
-void HandleRestoreConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION);
-
-  WSContentStart_P(S_RESTORE_CONFIGURATION);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_RST);
-  WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
-  if (WifiIsInManagerMode()) {
-    WSContentSpaceButton(BUTTON_MAIN);
-  } else {
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-  }
-  WSContentStop();
-
-  Web.upload_error = 0;
-  Web.upload_file_type = UPL_SETTINGS;
-}
-
-
-
-void HandleInformation(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION);
-
-  char stopic[TOPSZ];
-
-  int freeMem = ESP.getFreeHeap();
-
-  WSContentStart_P(S_INFORMATION);
-
-
-
-  WSContentSend_P(HTTP_SCRIPT_INFO_BEGIN);
-  WSContentSend_P(PSTR("<table style='width:100%%'><tr><th>"));
-  WSContentSend_P(PSTR(D_PROGRAM_VERSION "}2%s%s"), my_version, my_image);
-  WSContentSend_P(PSTR("}1" D_BUILD_DATE_AND_TIME "}2%s"), GetBuildDateAndTime().c_str());
-  WSContentSend_P(PSTR("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/%s"), ESP.getSdkVersion());
-  WSContentSend_P(PSTR("}1" D_UPTIME "}2%s"), GetUptime().c_str());
-  WSContentSend_P(PSTR("}1" D_FLASH_WRITE_COUNT "}2%d at 0x%X"), Settings.save_flag, GetSettingsAddress());
-  WSContentSend_P(PSTR("}1" D_BOOT_COUNT "}2%d"), Settings.bootcount);
-  WSContentSend_P(PSTR("}1" D_RESTART_REASON "}2%s"), GetResetReason().c_str());
-  uint32_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present;
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan()) { maxfn = 1; }
-#endif
-  for (uint32_t i = 0; i < maxfn; i++) {
-    WSContentSend_P(PSTR("}1" D_FRIENDLY_NAME " %d}2%s"), i +1, SettingsText(SET_FRIENDLYNAME1 +i));
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  int32_t rssi = WiFi.RSSI();
-  WSContentSend_P(PSTR("}1" D_AP "%d " D_SSID " (" D_RSSI ")}2%s (%d%%, %d dBm)"), Settings.sta_active +1, SettingsText(SET_STASSID1 + Settings.sta_active), WifiGetRssiAsQuality(rssi), rssi);
-  WSContentSend_P(PSTR("}1" D_HOSTNAME "}2%s%s"), my_hostname, (Wifi.mdns_begun) ? ".local" : "");
-#if LWIP_IPV6
-    String ipv6_addr = WifiGetIPv6();
-    if(ipv6_addr != ""){
-      WSContentSend_P(PSTR("}1 IPv6 Address }2%s"), ipv6_addr.c_str());
-    }
-#endif
-  if (static_cast<uint32_t>(WiFi.localIP()) != 0) {
-    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.localIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), IPAddress(Settings.ip_address[1]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_SUBNET_MASK "}2%s"), IPAddress(Settings.ip_address[2]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_DNS_SERVER "}2%s"), IPAddress(Settings.ip_address[3]).toString().c_str());
-    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.macAddress().c_str());
-  }
-  if (static_cast<uint32_t>(WiFi.softAPIP()) != 0) {
-    WSContentSend_P(PSTR("}1" D_IP_ADDRESS "}2%s"), WiFi.softAPIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_GATEWAY "}2%s"), WiFi.softAPIP().toString().c_str());
-    WSContentSend_P(PSTR("}1" D_MAC_ADDRESS "}2%s"), WiFi.softAPmacAddress().c_str());
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  if (Settings.flag.mqtt_enabled) {
-    WSContentSend_P(PSTR("}1" D_MQTT_HOST "}2%s"), SettingsText(SET_MQTT_HOST));
-    WSContentSend_P(PSTR("}1" D_MQTT_PORT "}2%d"), Settings.mqtt_port);
-    WSContentSend_P(PSTR("}1" D_MQTT_USER "}2%s"), SettingsText(SET_MQTT_USER));
-    WSContentSend_P(PSTR("}1" D_MQTT_CLIENT "}2%s"), mqtt_client);
-    WSContentSend_P(PSTR("}1" D_MQTT_TOPIC "}2%s"), SettingsText(SET_MQTT_TOPIC));
-
-    WSContentSend_P(PSTR("}1" D_MQTT_GROUP_TOPIC "}2%s"), GetGroupTopic_P(stopic, ""));
-    WSContentSend_P(PSTR("}1" D_MQTT_FULL_TOPIC "}2%s"), GetTopic_P(stopic, CMND, mqtt_topic, ""));
-    WSContentSend_P(PSTR("}1" D_MQTT " " D_FALLBACK_TOPIC "}2%s"), GetFallbackTopic_P(stopic, ""));
-  } else {
-    WSContentSend_P(PSTR("}1" D_MQTT "}2" D_DISABLED));
-  }
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-
-#ifdef USE_EMULATION
-  WSContentSend_P(PSTR("}1" D_EMULATION "}2%s"), GetTextIndexed(stopic, sizeof(stopic), Settings.flag2.emulation, kEmulationOptions));
-#else
-  WSContentSend_P(PSTR("}1" D_EMULATION "}2" D_DISABLED));
-#endif
-
-#ifdef USE_DISCOVERY
-  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2%s"), (Settings.flag3.mdns_enabled) ? D_ENABLED : D_DISABLED);
-  if (Settings.flag3.mdns_enabled) {
-#ifdef WEBSERVER_ADVERTISE
-    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_WEB_SERVER));
-#else
-    WSContentSend_P(PSTR("}1" D_MDNS_ADVERTISE "}2" D_DISABLED));
-#endif
-  }
-#else
-  WSContentSend_P(PSTR("}1" D_MDNS_DISCOVERY "}2" D_DISABLED));
-#endif
-
-  WSContentSend_P(PSTR("}1}2&nbsp;"));
-  WSContentSend_P(PSTR("}1" D_ESP_CHIP_ID "}2%d"), ESP.getChipId());
-  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_ID "}20x%06X"), ESP.getFlashChipId());
-  WSContentSend_P(PSTR("}1" D_FLASH_CHIP_SIZE "}2%dkB"), ESP.getFlashChipRealSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_PROGRAM_FLASH_SIZE "}2%dkB"), ESP.getFlashChipSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_PROGRAM_SIZE "}2%dkB"), ESP.getSketchSize() / 1024);
-  WSContentSend_P(PSTR("}1" D_FREE_PROGRAM_SPACE "}2%dkB"), ESP.getFreeSketchSpace() / 1024);
-  WSContentSend_P(PSTR("}1" D_FREE_MEMORY "}2%dkB"), freeMem / 1024);
-  WSContentSend_P(PSTR("</td></tr></table>"));
-
-  WSContentSend_P(HTTP_SCRIPT_INFO_END);
-  WSContentSendStyle();
-
-  WSContentSend_P(PSTR("<style>td{padding:0px 5px;}</style>"
-                       "<div id='i' name='i'></div>"));
-
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-#endif
-
-
-
-void HandleUpgradeFirmware(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE);
-
-  WSContentStart_P(S_FIRMWARE_UPGRADE);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_UPG, SettingsText(SET_OTAURL));
-  WSContentSend_P(HTTP_FORM_RST_UPG, D_UPGRADE);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  Web.upload_error = 0;
-  Web.upload_file_type = UPL_TASMOTA;
-}
-
-void HandleUpgradeFirmwareStart(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  char command[TOPSZ + 10];
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED));
-  WifiConfigCounter();
-
-  char otaurl[TOPSZ];
-  WebGetArg("o", otaurl, sizeof(otaurl));
-  if (strlen(otaurl)) {
-    snprintf_P(command, sizeof(command), PSTR(D_CMND_OTAURL " %s"), otaurl);
-    ExecuteWebCommand(command, SRC_WEBGUI);
-  }
-
-  WSContentStart_P(S_INFORMATION);
-  WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPGRADE_STARTED " ...</b></div>"));
-  WSContentSend_P(HTTP_MSG_RSTRT);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-
-  snprintf_P(command, sizeof(command), PSTR(D_CMND_UPGRADE " 1"));
-  ExecuteWebCommand(command, SRC_WEBGUI);
-}
-
-void HandleUploadDone(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE));
-
-  char error[100];
-
-  WifiConfigCounter();
-  restart_flag = 0;
-  MqttRetryCounter(0);
-
-  WSContentStart_P(S_INFORMATION);
-  if (!Web.upload_error) {
-    WSContentSend_P(HTTP_SCRIPT_RELOAD_OTA);
-  }
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
-  if (Web.upload_error) {
-    WSContentSend_P(PSTR("%06x'>" D_FAILED "</font></b><br><br>"), WebColor(COL_TEXT_WARNING));
-#ifdef USE_RF_FLASH
-    if (Web.upload_error < 15) {
-#else
-    if ((Web.upload_error < 10) || (14 == Web.upload_error)) {
-      if (14 == Web.upload_error) { Web.upload_error = 10; }
-#endif
-      GetTextIndexed(error, sizeof(error), Web.upload_error -1, kUploadErrors);
-    } else {
-      snprintf_P(error, sizeof(error), PSTR(D_UPLOAD_ERROR_CODE " %d"), Web.upload_error);
-    }
-    WSContentSend_P(error);
-    DEBUG_CORE_LOG(PSTR("UPL: %s"), error);
-    stop_flash_rotate = Settings.flag.stop_flash_rotate;
-  } else {
-    WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br>"), WebColor(COL_TEXT_SUCCESS));
-    WSContentSend_P(HTTP_MSG_RSTRT);
-    ShowWebSource(SRC_WEBGUI);
-#ifdef USE_TASMOTA_SLAVE
-    if (TasmotaSlave_GetFlagFlashing()) {
-      restart_flag = 0;
-    } else {
-      restart_flag = 2;
-    }
-#else
-    restart_flag = 2;
-#endif
-  }
-  SettingsBufferFree();
-  WSContentSend_P(PSTR("</div><br>"));
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-#ifdef USE_TASMOTA_SLAVE
-  if (TasmotaSlave_GetFlagFlashing()) {
-    TasmotaSlave_Flash();
-  }
-#endif
-}
-
-void HandleUploadLoop(void)
-{
-
-  bool _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level);
-
-  if (HTTP_USER == Web.state) { return; }
-  if (Web.upload_error) {
-    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
-    return;
-  }
-
-  HTTPUpload& upload = WebServer->upload();
-
-  if (UPLOAD_FILE_START == upload.status) {
-    restart_flag = 60;
-    if (0 == upload.filename.c_str()[0]) {
-      Web.upload_error = 1;
-      return;
-    }
-    SettingsSave(1);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s ..."), upload.filename.c_str());
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (!SettingsBufferAlloc()) {
-        Web.upload_error = 2;
-        return;
-      }
-    } else {
-      MqttRetryCounter(60);
-#ifdef USE_EMULATION
-      UdpDisconnect();
-#endif
-#ifdef USE_ARILUX_RF
-      AriluxRfDisable();
-#endif
-      if (Settings.flag.mqtt_enabled) {
-        MqttDisconnect();
-      }
-      uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-      if (!Update.begin(maxSketchSpace)) {
-
-
-
-
-
-
-        Web.upload_error = 2;
-        return;
-      }
-    }
-    Web.upload_progress_dot_count = 0;
-  } else if (!Web.upload_error && (UPLOAD_FILE_WRITE == upload.status)) {
-    if (0 == upload.totalSize) {
-      if (UPL_SETTINGS == Web.upload_file_type) {
-        Web.config_block_count = 0;
-      }
-      else {
-#ifdef USE_RF_FLASH
-        if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) {
-          Update.end();
-          Web.upload_file_type = UPL_EFM8BB1;
-
-          Web.upload_error = SnfBrUpdateInit();
-          if (Web.upload_error != 0) { return; }
-        } else
-#endif
-#ifdef USE_TASMOTA_SLAVE
-        if ((WEMOS == my_module_type) && (upload.buf[0] == ':')) {
-          Update.end();
-          Web.upload_file_type = UPL_TASMOTASLAVE;
-          Web.upload_error = TasmotaSlave_UpdateInit();
-          if (Web.upload_error != 0) { return; }
-        } else
-#endif
-        {
-          if ((upload.buf[0] != 0xE9) && (upload.buf[0] != 0x1F)) {
-            Web.upload_error = 3;
-            return;
-          }
-          if (0xE9 == upload.buf[0]) {
-            uint32_t bin_flash_size = ESP.magicFlashChipSize((upload.buf[3] & 0xf0) >> 4);
-            if (bin_flash_size > ESP.getFlashChipRealSize()) {
-              Web.upload_error = 4;
-              return;
-            }
-
-          }
-        }
-      }
-    }
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (!Web.upload_error) {
-        if (upload.currentSize > (sizeof(Settings) - (Web.config_block_count * HTTP_UPLOAD_BUFLEN))) {
-          Web.upload_error = 9;
-          return;
-        }
-        memcpy(settings_buffer + (Web.config_block_count * HTTP_UPLOAD_BUFLEN), upload.buf, upload.currentSize);
-        Web.config_block_count++;
-      }
-    }
-#ifdef USE_RF_FLASH
-    else if (UPL_EFM8BB1 == Web.upload_file_type) {
-      if (efm8bb1_update != nullptr) {
-        ssize_t result = rf_glue_remnant_with_new_data_and_write(efm8bb1_update, upload.buf, upload.currentSize);
-        free(efm8bb1_update);
-        efm8bb1_update = nullptr;
-        if (result != 0) {
-          Web.upload_error = abs(result);
-          return;
-        }
-      }
-      ssize_t result = rf_search_and_write(upload.buf, upload.currentSize);
-      if (result < 0) {
-        Web.upload_error = abs(result);
-        return;
-      } else if (result > 0) {
-        if ((size_t)result > upload.currentSize) {
-
-          Web.upload_error = 9;
-          return;
-        }
-
-        size_t remnant_sz = upload.currentSize - result;
-        efm8bb1_update = (uint8_t *) malloc(remnant_sz + 1);
-        if (efm8bb1_update == nullptr) {
-          Web.upload_error = 2;
-          return;
-        }
-        memcpy(efm8bb1_update, upload.buf + result, remnant_sz);
-
-        efm8bb1_update[remnant_sz] = '\0';
-      }
-    }
-#endif
-#ifdef USE_TASMOTA_SLAVE
-    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
-      TasmotaSlave_WriteBuffer(upload.buf, upload.currentSize);
-    }
-#endif
-    else {
-      if (!Web.upload_error && (Update.write(upload.buf, upload.currentSize) != upload.currentSize)) {
-        Web.upload_error = 5;
-        return;
-      }
-      if (_serialoutput) {
-        Serial.printf(".");
-        Web.upload_progress_dot_count++;
-        if (!(Web.upload_progress_dot_count % 80)) { Serial.println(); }
-      }
-    }
-  } else if(!Web.upload_error && (UPLOAD_FILE_END == upload.status)) {
-    if (_serialoutput && (Web.upload_progress_dot_count % 80)) {
-      Serial.println();
-    }
-    if (UPL_SETTINGS == Web.upload_file_type) {
-      if (Web.config_xor_on_set) {
-        for (uint32_t i = 2; i < sizeof(Settings); i++) {
-          settings_buffer[i] ^= (Web.config_xor_on_set +i);
-        }
-      }
-      bool valid_settings = false;
-      unsigned long buffer_version = settings_buffer[11] << 24 | settings_buffer[10] << 16 | settings_buffer[9] << 8 | settings_buffer[8];
-      if (buffer_version > 0x06000000) {
-        uint32_t buffer_size = settings_buffer[3] << 8 | settings_buffer[2];
-        if (buffer_version > 0x0606000A) {
-          uint32_t buffer_crc32 = settings_buffer[4095] << 24 | settings_buffer[4094] << 16 | settings_buffer[4093] << 8 | settings_buffer[4092];
-          valid_settings = (GetCfgCrc32(settings_buffer, buffer_size -4) == buffer_crc32);
-        } else {
-          uint16_t buffer_crc16 = settings_buffer[15] << 8 | settings_buffer[14];
-          valid_settings = (GetCfgCrc16(settings_buffer, buffer_size) == buffer_crc16);
-        }
-      } else {
-        valid_settings = (settings_buffer[0] == CONFIG_FILE_SIGN);
-      }
-      if (valid_settings) {
-        SettingsDefaultSet2();
-        memcpy((char*)&Settings +16, settings_buffer +16, sizeof(Settings) -16);
-        Settings.version = buffer_version;
-        SettingsBufferFree();
-      } else {
-        Web.upload_error = 8;
-        return;
-      }
-    }
-#ifdef USE_RF_FLASH
-    else if (UPL_EFM8BB1 == Web.upload_file_type) {
-
-      Web.upload_file_type = UPL_TASMOTA;
-    }
-#endif
-#ifdef USE_TASMOTA_SLAVE
-    else if (UPL_TASMOTASLAVE == Web.upload_file_type) {
-
-      TasmotaSlave_SetFlagFlashing(true);
-      Web.upload_file_type = UPL_TASMOTA;
-    }
-#endif
-    else {
-      if (!Update.end(true)) {
-        if (_serialoutput) { Update.printError(Serial); }
-        Web.upload_error = 6;
-        return;
-      }
-      if (!VersionCompatible()) {
-        Web.upload_error = 14;
-        return;
-      }
-    }
-    if (!Web.upload_error) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_SUCCESSFUL " %u bytes. " D_RESTARTING), upload.totalSize);
-    }
-  } else if (UPLOAD_FILE_ABORTED == upload.status) {
-    restart_flag = 0;
-    MqttRetryCounter(0);
-    Web.upload_error = 7;
-    if (UPL_TASMOTA == Web.upload_file_type) { Update.end(); }
-  }
-  delay(0);
-}
-
-
-
-void HandlePreflightRequest(void)
-{
-  HttpHeaderCors();
-  WebServer->sendHeader(F("Access-Control-Allow-Methods"), F("GET, POST"));
-  WebServer->sendHeader(F("Access-Control-Allow-Headers"), F("authorization"));
-  WSSend(200, CT_HTML, "");
-}
-
-
-
-void HandleHttpCommand(void)
-{
-  if (!HttpCheckPriviledgedAccess(false)) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND));
-
-  bool valid = true;
-  if (strlen(SettingsText(SET_WEBPWD))) {
-    char tmp1[33];
-    WebGetArg("user", tmp1, sizeof(tmp1));
-    char tmp2[strlen(SettingsText(SET_WEBPWD)) +1];
-    WebGetArg("password", tmp2, sizeof(tmp2));
-    if (!(!strcmp(tmp1, WEB_USERNAME) && !strcmp(tmp2, SettingsText(SET_WEBPWD)))) { valid = false; }
-  }
-
-  WSContentBegin(200, CT_JSON);
-  if (valid) {
-    uint32_t curridx = web_log_index;
-    String svalue = WebServer->arg("cmnd");
-    if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
-      ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCOMMAND);
-      if (web_log_index != curridx) {
-        uint32_t counter = curridx;
-        WSContentSend_P(PSTR("{"));
-        bool cflg = false;
-        do {
-          char* tmp;
-          size_t len;
-          GetLog(counter, &tmp, &len);
-          if (len) {
-
-            char* JSON = (char*)memchr(tmp, '{', len);
-            if (JSON) {
-              size_t JSONlen = len - (JSON - tmp);
-              if (JSONlen > sizeof(mqtt_data)) { JSONlen = sizeof(mqtt_data); }
-              char stemp[JSONlen];
-              strlcpy(stemp, JSON +1, JSONlen -2);
-              WSContentSend_P(PSTR("%s%s"), (cflg) ? "," : "", stemp);
-              cflg = true;
-            }
-          }
-          counter++;
-          counter &= 0xFF;
-          if (!counter) counter++;
-        } while (counter != web_log_index);
-        WSContentSend_P(PSTR("}"));
-      } else {
-        WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENABLE_WEBLOG_FOR_RESPONSE "\"}"));
-      }
-    } else {
-      WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENTER_COMMAND " cmnd=\"}"));
-    }
-  } else {
-    WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_NEED_USER_AND_PASSWORD "\"}"));
-  }
-  WSContentEnd();
-}
-
-
-
-void HandleConsole(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("c2")) {
-    HandleConsoleRefresh();
-    return;
-  }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE);
-
-  WSContentStart_P(S_CONSOLE);
-  WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings.web_refresh);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_CMND);
-  WSContentSpaceButton(BUTTON_MAIN);
-  WSContentStop();
-}
-
-void HandleConsoleRefresh(void)
-{
-  bool cflg = true;
-  uint32_t counter = 0;
-
-  String svalue = WebServer->arg("c1");
-  if (svalue.length() && (svalue.length() < MQTT_MAX_PACKET_SIZE)) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), svalue.c_str());
-    ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCONSOLE);
-  }
-
-  char stmp[8];
-  WebGetArg("c2", stmp, sizeof(stmp));
-  if (strlen(stmp)) { counter = atoi(stmp); }
-
-  WSContentBegin(200, CT_PLAIN);
-  WSContentSend_P(PSTR("%d}1%d}1"), web_log_index, Web.reset_web_log_flag);
-  if (!Web.reset_web_log_flag) {
-    counter = 0;
-    Web.reset_web_log_flag = true;
-  }
-  if (counter != web_log_index) {
-    if (!counter) {
-      counter = web_log_index;
-      cflg = false;
-    }
-    do {
-      char* tmp;
-      size_t len;
-      GetLog(counter, &tmp, &len);
-      if (len) {
-        if (len > sizeof(mqtt_data) -2) { len = sizeof(mqtt_data); }
-        char stemp[len +1];
-        strlcpy(stemp, tmp, len);
-        WSContentSend_P(PSTR("%s%s"), (cflg) ? "\n" : "", stemp);
-        cflg = true;
-      }
-      counter++;
-      counter &= 0xFF;
-      if (!counter) { counter++; }
-    } while (counter != web_log_index);
-  }
-  WSContentSend_P(PSTR("}1"));
-  WSContentEnd();
-}
-
-
-
-void HandleNotFound(void)
-{
-
-
-  if (CaptivePortal()) { return; }
-
-#ifdef USE_EMULATION
-#ifdef USE_EMULATION_HUE
-  String path = WebServer->uri();
-  if ((EMUL_HUE == Settings.flag2.emulation) && (path.startsWith("/api"))) {
-    HandleHueApi(&path);
-  } else
-#endif
-#endif
-  {
-    WSContentBegin(404, CT_PLAIN);
-    WSContentSend_P(PSTR(D_FILE_NOT_FOUND "\n\nURI: %s\nMethod: %s\nArguments: %d\n"), WebServer->uri().c_str(), (WebServer->method() == HTTP_GET) ? "GET" : "POST", WebServer->args());
-    for (uint32_t i = 0; i < WebServer->args(); i++) {
-      WSContentSend_P(PSTR(" %s: %s\n"), WebServer->argName(i).c_str(), WebServer->arg(i).c_str());
-    }
-    WSContentEnd();
-  }
-}
-
-
-bool CaptivePortal(void)
-{
-
-  if ((WifiIsInManagerMode()) && !ValidIpAddress(WebServer->hostHeader().c_str())) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_REDIRECTED));
-
-    WebServer->sendHeader(F("Location"), String("http://") + WebServer->client().localIP().toString(), true);
-    WSSend(302, CT_PLAIN, "");
-    WebServer->client().stop();
-    return true;
-  }
-  return false;
-}
-
-
-
-String UrlEncode(const String& text)
-{
-  const char hex[] = "0123456789ABCDEF";
-
- String encoded = "";
- int len = text.length();
- int i = 0;
- while (i < len) {
-  char decodedChar = text.charAt(i++);
-# 2674 "S:/Development/Tasmota/tasmota/xdrv_01_webserver.ino"
-    if ((' ' == decodedChar) || ('+' == decodedChar)) {
-      encoded += '%';
-   encoded += hex[decodedChar >> 4];
-   encoded += hex[decodedChar & 0xF];
-    } else {
-      encoded += decodedChar;
-    }
-
- }
- return encoded;
-}
-
-int WebSend(char *buffer)
-{
-
-
-
-
-
-  char *host;
-  char *user;
-  char *password;
-  char *command;
-  int status = 1;
-
-
-  host = strtok_r(buffer, "]", &command);
-  if (host && command) {
-    RemoveSpace(host);
-    host++;
-    host = strtok_r(host, ",", &user);
-    String url = F("http://");
-    url += host;
-
-    command = Trim(command);
-    if (command[0] != '/') {
-      url += F("/cm?");
-      if (user) {
-        user = strtok_r(user, ":", &password);
-        if (user && password) {
-          char userpass[200];
-          snprintf_P(userpass, sizeof(userpass), PSTR("user=%s&password=%s&"), user, password);
-          url += userpass;
-        }
-      }
-      url += F("cmnd=");
-    }
-    url += command;
-
-    DEBUG_CORE_LOG(PSTR("WEB: Uri |%s|"), url.c_str());
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-    HTTPClient http;
-    if (http.begin(UrlEncode(url))) {
-#else
-    WiFiClient http_client;
-    HTTPClient http;
-    if (http.begin(http_client, UrlEncode(url))) {
-#endif
-      int http_code = http.GET();
-      if (http_code > 0) {
-        if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) {
-#ifdef USE_WEBSEND_RESPONSE
-
-          const char* read = http.getString().c_str();
-          uint32_t j = 0;
-          char text = '.';
-          while (text != '\0') {
-            text = *read++;
-            if (text > 31) {
-              mqtt_data[j++] = text;
-              if (j == sizeof(mqtt_data) -2) { break; }
-            }
-          }
-          mqtt_data[j] = '\0';
-          MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WEBSEND));
-#ifdef USE_SCRIPT
-extern uint8_t tasm_cmd_activ;
-
-          tasm_cmd_activ=0;
-          XdrvRulesProcess();
-#endif
-#endif
-        }
-        status = 0;
-      } else {
-        status = 2;
-      }
-      http.end();
-    } else {
-      status = 3;
-    }
-  }
-  return status;
-}
-
-bool JsonWebColor(const char* dataBuf)
-{
-
-
-
-
-
-  char dataBufLc[strlen(dataBuf) +1];
-  LowerCase(dataBufLc, dataBuf);
-  RemoveSpace(dataBufLc);
-  if (strlen(dataBufLc) < 9) { return false; }
-
-  StaticJsonBuffer<450> jb;
-  JsonObject& obj = jb.parseObject(dataBufLc);
-  if (!obj.success()) { return false; }
-
-  char parm_lc[10];
-  if (obj[LowerCase(parm_lc, D_CMND_WEBCOLOR)].success()) {
-    for (uint32_t i = 0; i < COL_LAST; i++) {
-      const char* color = obj[parm_lc][i];
-      if (color != nullptr) {
-        WebHexCode(i, color);
-      }
-    }
-  }
-  return true;
-}
-
-const char kWebSendStatus[] PROGMEM = D_JSON_DONE "|" D_JSON_WRONG_PARAMETERS "|" D_JSON_CONNECT_FAILED "|" D_JSON_HOST_NOT_FOUND "|" D_JSON_MEMORY_ERROR;
-
-const char kWebCommands[] PROGMEM = "|"
-#ifdef USE_EMULATION
-  D_CMND_EMULATION "|"
-#endif
-#ifdef USE_SENDMAIL
-  D_CMND_SENDMAIL "|"
-#endif
-  D_CMND_WEBSERVER "|" D_CMND_WEBPASSWORD "|" D_CMND_WEBLOG "|" D_CMND_WEBREFRESH "|" D_CMND_WEBSEND "|" D_CMND_WEBCOLOR "|"
-  D_CMND_WEBSENSOR "|" D_CMND_WEBBUTTON "|" D_CMND_CORS;
-
-void (* const WebCommand[])(void) PROGMEM = {
-#ifdef USE_EMULATION
-  &CmndEmulation,
-#endif
-#ifdef USE_SENDMAIL
-  &CmndSendmail,
-#endif
-  &CmndWebServer, &CmndWebPassword, &CmndWeblog, &CmndWebRefresh, &CmndWebSend, &CmndWebColor,
-  &CmndWebSensor, &CmndWebButton, &CmndCors };
-
-
-
-
-
-#ifdef USE_EMULATION
-void CmndEmulation(void)
-{
-#if defined(USE_EMULATION_WEMO) && defined(USE_EMULATION_HUE)
-  if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
-#else
-#ifndef USE_EMULATION_WEMO
-  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_HUE == XdrvMailbox.payload)) {
-#endif
-#ifndef USE_EMULATION_HUE
-  if ((EMUL_NONE == XdrvMailbox.payload) || (EMUL_WEMO == XdrvMailbox.payload)) {
-#endif
-#endif
-    Settings.flag2.emulation = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  ResponseCmndNumber(Settings.flag2.emulation);
-}
-#endif
-
-#ifdef USE_SENDMAIL
-void CmndSendmail(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    uint8_t result = SendMail(XdrvMailbox.data);
-    char stemp1[20];
-    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
-  }
-}
-#endif
-
-
-void CmndWebServer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    Settings.webserver = XdrvMailbox.payload;
-  }
-  if (Settings.webserver) {
-    Response_P(PSTR("{\"" D_CMND_WEBSERVER "\":\"" D_JSON_ACTIVE_FOR " %s " D_JSON_ON_DEVICE " %s " D_JSON_WITH_IP_ADDRESS " %s\"}"),
-      (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
-  } else {
-    ResponseCmndStateText(0);
-  }
-}
-
-void CmndWebPassword(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_WEBPWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
-    ResponseCmndChar(SettingsText(SET_WEBPWD));
-  } else {
-    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
-  }
-}
-
-void CmndWeblog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.weblog_level = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.weblog_level);
-}
-
-void CmndWebRefresh(void)
-{
-  if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload <= 10000)) {
-    Settings.web_refresh = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.web_refresh);
-}
-
-void CmndWebSend(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    uint32_t result = WebSend(XdrvMailbox.data);
-    char stemp1[20];
-    ResponseCmndChar(GetTextIndexed(stemp1, sizeof(stemp1), result, kWebSendStatus));
-  }
-}
-
-void CmndWebColor(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      if ((XdrvMailbox.data_len > 3) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= COL_LAST)) {
-        WebHexCode(XdrvMailbox.index -1, XdrvMailbox.data);
-      }
-      else if (0 == XdrvMailbox.payload) {
-        SettingsDefaultWebColor();
-      }
-    }
-    else {
-      JsonWebColor(XdrvMailbox.data);
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_WEBCOLOR "\":["));
-  for (uint32_t i = 0; i < COL_LAST; i++) {
-    if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(PSTR("\"#%06x\""), WebColor(i));
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-void CmndWebSensor(void)
-{
-  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-    }
-  }
-  Response_P(PSTR("{\"" D_CMND_WEBSENSOR "\":"));
-  XsnsSensorState();
-  ResponseJsonEnd();
-}
-
-void CmndWebButton(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_BUTTON_TEXT)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_BUTTON1, MAX_BUTTON_TEXT);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        SettingsUpdateText(SET_BUTTON1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_BUTTON1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndCors(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_CORS, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? WEB_PASSWORD : XdrvMailbox.data);
-  }
-  ResponseCmndChar(SettingsText(SET_CORS));
-}
-
-
-
-
-
-bool Xdrv01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      PollDnsWebserver();
-#ifdef USE_EMULATION
-#ifdef USE_DEVICE_GROUPS
-      if (Settings.flag2.emulation || Settings.flag4.device_groups_enabled) { PollUdp(); }
-#else
-      if (Settings.flag2.emulation) { PollUdp(); }
-#endif
-#endif
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kWebCommands, WebCommand);
-      break;
-  }
-  return result;
-}
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
-#define XDRV_02 2
-
-
-
-#ifdef USE_MQTT_TLS
-  #include "WiFiClientSecureLightBearSSL.h"
-  BearSSL::WiFiClientSecure_light *tlsClient;
-#else
-  WiFiClient EspClient;
-#endif
-
-const char kMqttCommands[] PROGMEM = "|"
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  D_CMND_MQTTFINGERPRINT "|"
-#endif
-  D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|"
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  D_CMND_TLSKEY "|"
-#endif
-  D_CMND_MQTTHOST "|" D_CMND_MQTTPORT "|" D_CMND_MQTTRETRY "|" D_CMND_STATETEXT "|" D_CMND_MQTTCLIENT "|"
-  D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|"
-  D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_SENSORRETAIN ;
-
-void (* const MqttCommand[])(void) PROGMEM = {
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  &CmndMqttFingerprint,
-#endif
-  &CmndMqttUser, &CmndMqttPassword,
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  &CmndTlsKey,
-#endif
-  &CmndMqttHost, &CmndMqttPort, &CmndMqttRetry, &CmndStateText, &CmndMqttClient,
-  &CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog,
-  &CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain, &CmndSensorRetain };
-
-struct MQTT {
-  uint16_t connect_count = 0;
-  uint16_t retry_counter = 1;
-  uint8_t initial_connection_state = 2;
-  bool connected = false;
-  bool allowed = false;
-} Mqtt;
-
-#ifdef USE_MQTT_TLS
-
-#ifdef USE_MQTT_AWS_IOT
-#include <base64.hpp>
-
-const br_ec_private_key *AWS_IoT_Private_Key = nullptr;
-const br_x509_certificate *AWS_IoT_Client_Certificate = nullptr;
-
-class tls_entry_t {
-public:
-  uint32_t name;
-  uint16_t start;
-  uint16_t len;
-};
-
-const static uint32_t TLS_NAME_SKEY = 0x2079656B;
-const static uint32_t TLS_NAME_CRT = 0x20747263;
-
-class tls_dir_t {
-public:
-  tls_entry_t entry[4];
-};
-
-tls_dir_t tls_dir;
-
-#endif
-
-
-
-
-bool is_fingerprint_mono_value(uint8_t finger[20], uint8_t value) {
- for (uint32_t i = 0; i<20; i++) {
-  if (finger[i] != value) {
-   return false;
-  }
- }
- return true;
-}
-#endif
-
-void MakeValidMqtt(uint32_t option, char* str)
-{
-
-
-  uint32_t i = 0;
-  while (str[i] > 0) {
-
-    if ((str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
-      if (option) {
-        uint32_t j = i;
-        while (str[j] > 0) {
-          str[j] = str[j +1];
-          j++;
-        }
-        i--;
-      } else {
-        str[i] = '_';
-      }
-    }
-    i++;
-  }
-}
-
-#ifdef USE_DISCOVERY
-#ifdef MQTT_HOST_DISCOVERY
-void MqttDiscoverServer(void)
-{
-  if (!Wifi.mdns_begun) { return; }
-
-  int n = MDNS.queryService("mqtt", "tcp");
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
-
-  if (n > 0) {
-    uint32_t i = 0;
-#ifdef MDNS_HOSTNAME
-    for (i = n; i > 0; i--) {
-      if (!strcmp(MDNS.hostname(i).c_str(), MDNS_HOSTNAME)) {
-        break;
-      }
-    }
-#endif
-    SettingsUpdateText(SET_MQTT_HOST, MDNS.IP(i).toString().c_str());
-    Settings.mqtt_port = MDNS.port(i);
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"), MDNS.hostname(i).c_str(), SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
-  }
-}
-#endif
-#endif
-# 163 "S:/Development/Tasmota/tasmota/xdrv_02_mqtt.ino"
-#include <PubSubClient.h>
-
-
-#if (MQTT_MAX_PACKET_SIZE -TOPSZ -7) < MIN_MESSZ
-  #error "MQTT_MAX_PACKET_SIZE is too small in libraries/PubSubClient/src/PubSubClient.h, increase it to at least 1200"
-#endif
-
-#ifdef USE_MQTT_TLS
-PubSubClient MqttClient;
-#else
-PubSubClient MqttClient(EspClient);
-#endif
-
-void MqttInit(void)
-{
-#ifdef USE_MQTT_TLS
-  tlsClient = new BearSSL::WiFiClientSecure_light(1024,1024);
-
-#ifdef USE_MQTT_AWS_IOT
-  loadTlsDir();
-  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
-                             AWS_IoT_Private_Key,
-                             0xFFFF , 0);
-#endif
-
-#ifdef USE_MQTT_TLS_CA_CERT
-#ifdef USE_MQTT_AWS_IOT
-  tlsClient->setTrustAnchor(&AmazonRootCA1_TA);
-#else
-  tlsClient->setTrustAnchor(&LetsEncryptX3CrossSigned_TA);
-#endif
-#endif
-
-  MqttClient.setClient(*tlsClient);
-#endif
-}
-
-bool MqttIsConnected(void)
-{
-  return MqttClient.connected();
-}
-
-void MqttDisconnect(void)
-{
-  MqttClient.disconnect();
-}
-
-void MqttSubscribeLib(const char *topic)
-{
-  MqttClient.subscribe(topic);
-  MqttClient.loop();
-}
-
-void MqttUnsubscribeLib(const char *topic)
-{
-  MqttClient.unsubscribe(topic);
-  MqttClient.loop();
-}
-
-bool MqttPublishLib(const char* topic, bool retained)
-{
-
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-    char *str = strstr(topic, SettingsText(SET_MQTTPREFIX1));
-    if (str == topic) {
-      mqtt_cmnd_blocked_reset = 4;
-      mqtt_cmnd_blocked++;
-    }
-  }
-
-  bool result = MqttClient.publish(topic, mqtt_data, retained);
-  yield();
-  return result;
-}
-
-void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("MqttDataHandler"));
-#endif
-
-
-  if (data_len >= MQTT_MAX_PACKET_SIZE) { return; }
-
-
-  if (!strcmp(SettingsText(SET_MQTTPREFIX1), SettingsText(SET_MQTTPREFIX2))) {
-    char *str = strstr(mqtt_topic, SettingsText(SET_MQTTPREFIX1));
-    if ((str == mqtt_topic) && mqtt_cmnd_blocked) {
-      mqtt_cmnd_blocked--;
-      return;
-    }
-  }
-
-
-  char topic[TOPSZ];
-  strlcpy(topic, mqtt_topic, sizeof(topic));
-  mqtt_data[data_len] = 0;
-  char data[data_len +1];
-  memcpy(data, mqtt_data, sizeof(data));
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_MQTT D_RECEIVED_TOPIC " \"%s\", " D_DATA_SIZE " %d, " D_DATA " \"%s\""), topic, data_len, data);
-
-
-
-  XdrvMailbox.index = strlen(topic);
-  XdrvMailbox.data_len = data_len;
-  XdrvMailbox.topic = topic;
-  XdrvMailbox.data = (char*)data;
-  if (XdrvCall(FUNC_MQTT_DATA)) { return; }
-
-  ShowSource(SRC_MQTT);
-
-  CommandHandler(topic, data, data_len);
-}
-
-
-
-void MqttRetryCounter(uint8_t value)
-{
-  Mqtt.retry_counter = value;
-}
-
-void MqttSubscribe(const char *topic)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_SUBSCRIBE_TO " %s"), topic);
-  MqttSubscribeLib(topic);
-}
-
-void MqttUnsubscribe(const char *topic)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT D_UNSUBSCRIBE_FROM " %s"), topic);
-  MqttUnsubscribeLib(topic);
-}
-
-void MqttPublishLogging(const char *mxtime)
-{
-  char saved_mqtt_data[strlen(mqtt_data) +1];
-  memcpy(saved_mqtt_data, mqtt_data, sizeof(saved_mqtt_data));
-
-
-  Response_P(PSTR("%s%s"), mxtime, log_data);
-  char stopic[TOPSZ];
-  GetTopic_P(stopic, STAT, mqtt_topic, PSTR("LOGGING"));
-  MqttPublishLib(stopic, false);
-
-  memcpy(mqtt_data, saved_mqtt_data, sizeof(saved_mqtt_data));
-}
-
-void MqttPublish(const char* topic, bool retained)
-{
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("MqttPublish"));
-#endif
-
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT) || defined(MQTT_NO_RETAIN)
-
-
-
-  retained = false;
-#endif
-
-  char sretained[CMDSZ];
-  sretained[0] = '\0';
-  char slog_type[20];
-  snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_RESULT));
-
-  if (Settings.flag.mqtt_enabled) {
-    if (MqttPublishLib(topic, retained)) {
-      snprintf_P(slog_type, sizeof(slog_type), PSTR(D_LOG_MQTT));
-      if (retained) {
-        snprintf_P(sretained, sizeof(sretained), PSTR(" (" D_RETAINED ")"));
-      }
-    }
-  }
-
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s = %s"), slog_type, (Settings.flag.mqtt_enabled) ? topic : strrchr(topic,'/')+1, mqtt_data);
-  if (strlen(log_data) >= (sizeof(log_data) - strlen(sretained) -1)) {
-    log_data[sizeof(log_data) - strlen(sretained) -5] = '\0';
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s ..."), log_data);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%s"), log_data, sretained);
-  AddLog(LOG_LEVEL_INFO);
-
-  if (Settings.ledstate &0x04) {
-    blinks++;
-  }
-}
-
-void MqttPublish(const char* topic)
-{
-  MqttPublish(topic, false);
-}
-
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic, bool retained)
-{
-
-
-
-
-
-
-
-  char romram[64];
-  char stopic[TOPSZ];
-
-  snprintf_P(romram, sizeof(romram), ((prefix > 3) && !Settings.flag.mqtt_response) ? S_RSLT_RESULT : subtopic);
-  for (uint32_t i = 0; i < strlen(romram); i++) {
-    romram[i] = toupper(romram[i]);
-  }
-  prefix &= 3;
-  GetTopic_P(stopic, prefix, mqtt_topic, romram);
-  MqttPublish(stopic, retained);
-
-#ifdef USE_MQTT_AWS_IOT
-  if ((prefix > 0) && (Settings.flag4.awsiot_shadow)) {
-
-    char *topic = SettingsText(SET_MQTT_TOPIC);
-    char topic2[strlen(topic)+1];
-    strcpy(topic2, topic);
-
-    char *s = topic2;
-    while (*s) {
-      if ('/' == *s) {
-        *s = '_';
-      }
-      s++;
-    }
-
-    snprintf_P(romram, sizeof(romram), PSTR("$aws/things/%s/shadow/update"), topic2);
-
-
-    char *mqtt_save = (char*) malloc(strlen(mqtt_data)+1);
-    if (!mqtt_save) { return; }
-    strcpy(mqtt_save, mqtt_data);
-    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"state\":{\"reported\":%s}}"), mqtt_save);
-    free(mqtt_save);
-
-    bool result = MqttClient.publish(romram, mqtt_data, false);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Updated shadow: %s"), romram);
-    yield();
-  }
-#endif
-}
-
-void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)
-{
-  MqttPublishPrefixTopic_P(prefix, subtopic, false);
-}
-
-void MqttPublishTeleSensor(void)
-{
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-  XdrvRulesProcess();
-}
-
-void MqttPublishPowerState(uint32_t device)
-{
-  char stopic[TOPSZ];
-  char scommand[33];
-
-  if ((device < 1) || (device > devices_present)) { device = 1; }
-
-#ifdef USE_SONOFF_IFAN
-  if (IsModuleIfan() && (device > 1)) {
-    if (GetFanspeed() < MaxFanspeed()) {
-#ifdef USE_DOMOTICZ
-      DomoticzUpdateFanState();
-#endif
-      snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED));
-      GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
-      Response_P(S_JSON_COMMAND_NVALUE, scommand, GetFanspeed());
-      MqttPublish(stopic);
-    }
-  } else {
-#endif
-    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable);
-    GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT);
-    Response_P(S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1)));
-    MqttPublish(stopic);
-
-    GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-    Response_P(GetStateText(bitRead(power, device -1)));
-    MqttPublish(stopic, Settings.flag.mqtt_power_retain);
-#ifdef USE_SONOFF_IFAN
-  }
-#endif
-}
-
-void MqttPublishAllPowerState(void)
-{
-  for (uint32_t i = 1; i <= devices_present; i++) {
-    MqttPublishPowerState(i);
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan()) { break; }
-#endif
-  }
-}
-
-void MqttPublishPowerBlinkState(uint32_t device)
-{
-  char scommand[33];
-
-  if ((device < 1) || (device > devices_present)) {
-    device = 1;
-  }
-  Response_P(PSTR("{\"%s\":\"" D_JSON_BLINK " %s\"}"),
-    GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable), GetStateText(bitRead(blink_mask, device -1)));
-
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, S_RSLT_POWER);
-}
-
-
-
-uint16_t MqttConnectCount(void)
-{
-  return Mqtt.connect_count;
-}
-
-void MqttDisconnected(int state)
-{
-  Mqtt.connected = false;
-  Mqtt.retry_counter = Settings.mqtt_retry;
-
-  MqttClient.disconnect();
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CONNECT_FAILED_TO " %s:%d, rc %d. " D_RETRY_IN " %d " D_UNIT_SECOND), SettingsText(SET_MQTT_HOST), Settings.mqtt_port, state, Mqtt.retry_counter);
-  rules_flag.mqtt_disconnected = 1;
-}
-
-void MqttConnected(void)
-{
-  char stopic[TOPSZ];
-
-  if (Mqtt.allowed) {
-    AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_CONNECTED));
-    Mqtt.connected = true;
-    Mqtt.retry_counter = 0;
-    Mqtt.connect_count++;
-
-    GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
-    Response_P(PSTR(D_ONLINE));
-    MqttPublish(stopic, true);
-
-
-    mqtt_data[0] = '\0';
-    MqttPublishPrefixTopic_P(CMND, S_RSLT_POWER);
-
-    GetTopic_P(stopic, CMND, mqtt_topic, PSTR("#"));
-    MqttSubscribe(stopic);
-    if (strstr_P(SettingsText(SET_MQTT_FULLTOPIC), MQTT_TOKEN_TOPIC) != nullptr) {
-      GetGroupTopic_P(stopic, PSTR("#"));
-      MqttSubscribe(stopic);
-      GetFallbackTopic_P(stopic, PSTR("#"));
-      MqttSubscribe(stopic);
-    }
-
-    XdrvCall(FUNC_MQTT_SUBSCRIBE);
-  }
-
-  if (Mqtt.initial_connection_state) {
-    char stopic2[TOPSZ];
-    Response_P(PSTR("{\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_FALLBACKTOPIC "\":\"%s\",\"" D_CMND_GROUPTOPIC "\":\"%s\"}"),
-      ModuleName().c_str(), my_version, my_image, GetFallbackTopic_P(stopic, ""), GetGroupTopic_P(stopic2, ""));
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "1"));
-#ifdef USE_WEBSERVER
-    if (Settings.webserver) {
-#if LWIP_IPV6
-      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\",\"IPv6Address\":\"%s\"}"),
-        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str(),WifiGetIPv6().c_str());
-#else
-      Response_P(PSTR("{\"" D_JSON_WEBSERVER_MODE "\":\"%s\",\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%s\"}"),
-        (2 == Settings.webserver) ? D_ADMIN : D_USER, my_hostname, WiFi.localIP().toString().c_str());
-#endif
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "2"));
-    }
-#endif
-    Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":"));
-    if (CrashFlag()) {
-      CrashDump();
-    } else {
-      ResponseAppend_P(PSTR("\"%s\""), GetResetReason().c_str());
-    }
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "3"));
-    MqttPublishAllPowerState();
-    if (Settings.tele_period) {
-      tele_period = Settings.tele_period -5;
-    }
-    rules_flag.system_boot = 1;
-    XdrvCall(FUNC_MQTT_INIT);
-  }
-  Mqtt.initial_connection_state = 0;
-
-  global_state.mqtt_down = 0;
-  if (Settings.flag.mqtt_enabled) {
-    rules_flag.mqtt_connected = 1;
-  }
-}
-
-void MqttReconnect(void)
-{
-  char stopic[TOPSZ];
-
-  Mqtt.allowed = Settings.flag.mqtt_enabled;
-  if (Mqtt.allowed) {
-#ifdef USE_DISCOVERY
-#ifdef MQTT_HOST_DISCOVERY
-    MqttDiscoverServer();
-#endif
-#endif
-    if (!strlen(SettingsText(SET_MQTT_HOST)) || !Settings.mqtt_port) {
-      Mqtt.allowed = false;
-    }
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-    if (!AWS_IoT_Private_Key || !AWS_IoT_Client_Certificate) {
-      Mqtt.allowed = false;
-    }
-#endif
-  }
-  if (!Mqtt.allowed) {
-    MqttConnected();
-    return;
-  }
-
-#ifdef USE_EMULATION
-  UdpDisconnect();
-#endif
-
-  AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR(D_ATTEMPTING_CONNECTION));
-
-  Mqtt.connected = false;
-  Mqtt.retry_counter = Settings.mqtt_retry;
-  global_state.mqtt_down = 1;
-
-  char *mqtt_user = nullptr;
-  char *mqtt_pwd = nullptr;
-  if (strlen(SettingsText(SET_MQTT_USER))) {
-    mqtt_user = SettingsText(SET_MQTT_USER);
-  }
-  if (strlen(SettingsText(SET_MQTT_PWD))) {
-    mqtt_pwd = SettingsText(SET_MQTT_PWD);
-  }
-
-  GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
-  Response_P(S_OFFLINE);
-
-  if (MqttClient.connected()) { MqttClient.disconnect(); }
-#ifdef USE_MQTT_TLS
-  tlsClient->stop();
-#else
-  EspClient = WiFiClient();
-  MqttClient.setClient(EspClient);
-#endif
-
-  if (2 == Mqtt.initial_connection_state) {
-    Mqtt.initial_connection_state = 1;
-  }
-
-  MqttClient.setCallback(MqttDataHandler);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-  tlsClient->setClientECCert(AWS_IoT_Client_Certificate,
-                             AWS_IoT_Private_Key,
-                             0xFFFF , 0);
-#endif
-  MqttClient.setServer(SettingsText(SET_MQTT_HOST), Settings.mqtt_port);
-
-  uint32_t mqtt_connect_time = millis();
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  bool allow_all_fingerprints = false;
-  bool learn_fingerprint1 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0x00);
-  bool learn_fingerprint2 = is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0x00);
-  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[0], 0xff);
-  allow_all_fingerprints |= is_fingerprint_mono_value(Settings.mqtt_fingerprint[1], 0xff);
-  allow_all_fingerprints |= learn_fingerprint1;
-  allow_all_fingerprints |= learn_fingerprint2;
-  tlsClient->setPubKeyFingerprint(Settings.mqtt_fingerprint[0], Settings.mqtt_fingerprint[1], allow_all_fingerprints);
-#endif
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "AWS IoT endpoint: %s"), SettingsText(SET_MQTT_HOST));
-  if (MqttClient.connect(mqtt_client, nullptr, nullptr, stopic, 1, false, mqtt_data, MQTT_CLEAN_SESSION)) {
-#else
-  if (MqttClient.connect(mqtt_client, mqtt_user, mqtt_pwd, stopic, 1, true, mqtt_data, MQTT_CLEAN_SESSION)) {
-#endif
-#ifdef USE_MQTT_TLS
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connected in %d ms, max ThunkStack used %d"),
-      millis() - mqtt_connect_time, tlsClient->getMaxThunkStackUse());
-    if (!tlsClient->getMFLNStatus()) {
-      AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("MFLN not supported by TLS server"));
-    }
-#ifndef USE_MQTT_TLS_CA_CERT
-
-    char buf_fingerprint[64];
-    ToHex_P((unsigned char *)tlsClient->getRecvPubKeyFingerprint(), 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
-
-    if (learn_fingerprint1 || learn_fingerprint2) {
-
-      bool fingerprint_matched = false;
-      const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
-      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[0], 20)) {
-        fingerprint_matched = true;
-      }
-      if (0 == memcmp(recv_fingerprint, Settings.mqtt_fingerprint[1], 20)) {
-        fingerprint_matched = true;
-      }
-      if (!fingerprint_matched) {
-
-        if (learn_fingerprint1) {
-          memcpy(Settings.mqtt_fingerprint[0], recv_fingerprint, 20);
-        }
-        if (learn_fingerprint2) {
-          memcpy(Settings.mqtt_fingerprint[1], recv_fingerprint, 20);
-        }
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
-
-        SettingsSaveAll();
-      }
-    }
-#endif
-#endif
-    MqttConnected();
-  } else {
-#ifdef USE_MQTT_TLS
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "TLS connection error: %d"), tlsClient->getLastError());
-#endif
-    MqttDisconnected(MqttClient.state());
-  }
-}
-
-void MqttCheck(void)
-{
-  if (Settings.flag.mqtt_enabled) {
-    if (!MqttIsConnected()) {
-      global_state.mqtt_down = 1;
-      if (!Mqtt.retry_counter) {
-        MqttReconnect();
-      } else {
-        Mqtt.retry_counter--;
-      }
-    } else {
-      global_state.mqtt_down = 0;
-    }
-  } else {
-    global_state.mqtt_down = 0;
-    if (Mqtt.initial_connection_state) {
-      MqttReconnect();
-    }
-  }
-}
-
-
-
-
-
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-void CmndMqttFingerprint(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    char fingerprint[60];
-    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(fingerprint))) {
-      strlcpy(fingerprint, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? (1 == XdrvMailbox.index) ? MQTT_FINGERPRINT1 : MQTT_FINGERPRINT2 : XdrvMailbox.data, sizeof(fingerprint));
-      char *p = fingerprint;
-      for (uint32_t i = 0; i < 20; i++) {
-        Settings.mqtt_fingerprint[XdrvMailbox.index -1][i] = strtol(p, &p, 16);
-      }
-      restart_flag = 2;
-    }
-    ResponseCmndIdxChar(ToHex_P((unsigned char *)Settings.mqtt_fingerprint[XdrvMailbox.index -1], 20, fingerprint, sizeof(fingerprint), ' '));
-  }
-}
-#endif
-
-void CmndMqttUser(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_USER, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_USER : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_USER));
-}
-
-void CmndMqttPassword(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_PWD, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_PASS : XdrvMailbox.data);
-    ResponseCmndChar(SettingsText(SET_MQTT_PWD));
-    restart_flag = 2;
-  } else {
-    Response_P(S_JSON_COMMAND_ASTERISK, XdrvMailbox.command);
-  }
-}
-
-void CmndMqttlog(void)
-{
-  if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {
-    Settings.mqttlog_level = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.mqttlog_level);
-}
-
-void CmndMqttHost(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    SettingsUpdateText(SET_MQTT_HOST, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? MQTT_HOST : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_HOST));
-}
-
-void CmndMqttPort(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 65536)) {
-    Settings.mqtt_port = (1 == XdrvMailbox.payload) ? MQTT_PORT : XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  ResponseCmndNumber(Settings.mqtt_port);
-}
-
-void CmndMqttRetry(void)
-{
-  if ((XdrvMailbox.payload >= MQTT_RETRY_SECS) && (XdrvMailbox.payload < 32001)) {
-    Settings.mqtt_retry = XdrvMailbox.payload;
-    Mqtt.retry_counter = Settings.mqtt_retry;
-  }
-  ResponseCmndNumber(Settings.mqtt_retry);
-}
-
-void CmndStateText(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_STATE_TEXT)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_STATE_TXT1, MAX_STATE_TEXT);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        for (uint32_t i = 0; i <= XdrvMailbox.data_len; i++) {
-          if (XdrvMailbox.data[i] == ' ') XdrvMailbox.data[i] = '_';
-        }
-        SettingsUpdateText(SET_STATE_TXT1 + XdrvMailbox.index -1, XdrvMailbox.data);
-      }
-      ResponseCmndIdxChar(GetStateText(XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndMqttClient(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    SettingsUpdateText(SET_MQTT_CLIENT, (SC_DEFAULT == Shortcut()) ? MQTT_CLIENT_ID : XdrvMailbox.data);
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_CLIENT));
-}
-
-void CmndFullTopic(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    MakeValidMqtt(1, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    char stemp1[TOPSZ];
-    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1));
-    if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) {
-      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
-      SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp1);
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_FULLTOPIC));
-}
-
-void CmndPrefix(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_MQTT_PREFIXES)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_MQTTPREFIX1, MAX_MQTT_PREFIXES);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-        MakeValidMqtt(0, XdrvMailbox.data);
-        SettingsUpdateText(SET_MQTTPREFIX1 + XdrvMailbox.index -1,
-          (SC_DEFAULT == Shortcut()) ? (1==XdrvMailbox.index) ? SUB_PREFIX : (2==XdrvMailbox.index) ? PUB_PREFIX : PUB_PREFIX2 : XdrvMailbox.data);
-        restart_flag = 2;
-      }
-      ResponseCmndIdxChar(SettingsText(SET_MQTTPREFIX1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndPublish(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    char *payload_part;
-    char *mqtt_part = strtok_r(XdrvMailbox.data, " ", &payload_part);
-    if (mqtt_part) {
-      char stemp1[TOPSZ];
-      strlcpy(stemp1, mqtt_part, sizeof(stemp1));
-      if ((payload_part != nullptr) && strlen(payload_part)) {
-        strlcpy(mqtt_data, payload_part, sizeof(mqtt_data));
-      } else {
-        mqtt_data[0] = '\0';
-      }
-      MqttPublish(stemp1, (XdrvMailbox.index == 2));
-
-      mqtt_data[0] = '\0';
-    }
-  }
-}
-
-void CmndGroupTopic(void)
-{
-#ifdef USE_DEVICE_GROUPS
-  uint32_t settings_text_index = (XdrvMailbox.index <= 1 ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2);
-#endif
-  if (XdrvMailbox.data_len > 0) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-#ifdef USE_DEVICE_GROUPS
-    SettingsUpdateText(settings_text_index, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
-#else
-    SettingsUpdateText(SET_MQTT_GRP_TOPIC, (SC_DEFAULT == Shortcut()) ? MQTT_GRPTOPIC : XdrvMailbox.data);
-#endif
-    restart_flag = 2;
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_GRP_TOPIC));
-}
-
-void CmndTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    char stemp1[TOPSZ];
-    strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1));
-    if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) {
-      Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_LWT), true);
-      SettingsUpdateText(SET_MQTT_TOPIC, stemp1);
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_TOPIC));
-}
-
-void CmndButtonTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    switch (Shortcut()) {
-      case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break;
-      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, mqtt_topic); break;
-      case SC_USER: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, MQTT_BUTTON_TOPIC); break;
-      default: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, XdrvMailbox.data);
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_BUTTON_TOPIC));
-}
-
-void CmndSwitchTopic(void)
-{
-  if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) {
-    MakeValidMqtt(0, XdrvMailbox.data);
-    if (!strcmp(XdrvMailbox.data, mqtt_client)) { SetShortcutDefault(); }
-    switch (Shortcut()) {
-      case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break;
-      case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, mqtt_topic); break;
-      case SC_USER: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, MQTT_SWITCH_TOPIC); break;
-      default: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, XdrvMailbox.data);
-    }
-  }
-  ResponseCmndChar(SettingsText(SET_MQTT_SWITCH_TOPIC));
-}
-
-void CmndButtonRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      for (uint32_t i = 1; i <= MAX_KEYS; i++) {
-        SendKey(KEY_BUTTON, i, CLEAR_RETAIN);
-      }
-    }
-    Settings.flag.mqtt_button_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_button_retain);
-}
-
-void CmndSwitchRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      for (uint32_t i = 1; i <= MAX_SWITCHES; i++) {
-        SendKey(KEY_SWITCH, i, CLEAR_RETAIN);
-      }
-    }
-    Settings.flag.mqtt_switch_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_switch_retain);
-}
-
-void CmndPowerRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      char stemp1[TOPSZ];
-      char scommand[CMDSZ];
-      for (uint32_t i = 1; i <= devices_present; i++) {
-        GetTopic_P(stemp1, STAT, mqtt_topic, GetPowerDevice(scommand, i, sizeof(scommand), Settings.flag.device_index_enable));
-        mqtt_data[0] = '\0';
-        MqttPublish(stemp1, Settings.flag.mqtt_power_retain);
-      }
-    }
-    Settings.flag.mqtt_power_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_power_retain);
-}
-
-void CmndSensorRetain(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    if (!XdrvMailbox.payload) {
-      mqtt_data[0] = '\0';
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_ENERGY), Settings.flag.mqtt_sensor_retain);
-    }
-    Settings.flag.mqtt_sensor_retain = XdrvMailbox.payload;
-  }
-  ResponseCmndStateText(Settings.flag.mqtt_sensor_retain);
-}
-
-
-
-
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-
-
-
-const static uint16_t tls_spi_start_sector = 0xFF;
-const static uint8_t* tls_spi_start = (uint8_t*) 0x402FF000;
-const static size_t tls_spi_len = 0x1000;
-const static size_t tls_block_offset = 0x0400;
-const static size_t tls_block_len = 0x0400;
-const static size_t tls_obj_store_offset = tls_block_offset + sizeof(tls_dir_t);
-
-
-inline void TlsEraseBuffer(uint8_t *buffer) {
-  memset(buffer + tls_block_offset, 0xFF, tls_block_len);
-}
-
-
-
-static br_ec_private_key EC = {
- 23,
- nullptr, 0
-};
-
-static br_x509_certificate CHAIN[] = {
- { nullptr, 0 }
-};
-
-
-
-void loadTlsDir(void) {
-  memcpy_P(&tls_dir, tls_spi_start + tls_block_offset, sizeof(tls_dir));
-
-
-  if ((TLS_NAME_SKEY == tls_dir.entry[0].name) && (tls_dir.entry[0].len > 0)) {
-    EC.x = (unsigned char *)(tls_spi_start + tls_obj_store_offset + tls_dir.entry[0].start);
-    EC.xlen = tls_dir.entry[0].len;
-    AWS_IoT_Private_Key = &EC;
-  } else {
-    AWS_IoT_Private_Key = nullptr;
-  }
-  if ((TLS_NAME_CRT == tls_dir.entry[1].name) && (tls_dir.entry[1].len > 0)) {
-    CHAIN[0].data = (unsigned char *) (tls_spi_start + tls_obj_store_offset + tls_dir.entry[1].start);
-    CHAIN[0].data_len = tls_dir.entry[1].len;
-    AWS_IoT_Client_Certificate = CHAIN;
-  } else {
-    AWS_IoT_Client_Certificate = nullptr;
-  }
-
-}
-
-const char ALLOCATE_ERROR[] PROGMEM = "TLSKey " D_JSON_ERROR ": cannot allocate buffer.";
-
-void CmndTlsKey(void) {
-#ifdef DEBUG_DUMP_TLS
-  if (0 == XdrvMailbox.index){
-    CmndTlsDump();
-  }
-#endif
-  if ((XdrvMailbox.index >= 1) && (XdrvMailbox.index <= 2)) {
-    tls_dir_t *tls_dir_write;
-
-    if (XdrvMailbox.data_len > 0) {
-
-      uint8_t *spi_buffer = (uint8_t*) malloc(tls_spi_len);
-      if (!spi_buffer) {
-        AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
-        return;
-      }
-      memcpy_P(spi_buffer, tls_spi_start, tls_spi_len);
-
-
-      RemoveAllSpaces(XdrvMailbox.data);
-
-
-      uint32_t bin_len = decode_base64_length((unsigned char*)XdrvMailbox.data);
-      uint8_t *bin_buf = nullptr;
-      if (bin_len > 0) {
-        bin_buf = (uint8_t*) malloc(bin_len + 4);
-        if (!bin_buf) {
-          AddLog_P(LOG_LEVEL_ERROR, ALLOCATE_ERROR);
-          free(spi_buffer);
-          return;
-        }
-      }
-
-
-      if (bin_len > 0) {
-        decode_base64((unsigned char*)XdrvMailbox.data, bin_buf);
-      }
-
-
-      tls_dir_write = (tls_dir_t*) (spi_buffer + tls_block_offset);
-
-      if (1 == XdrvMailbox.index) {
-
-
-        TlsEraseBuffer(spi_buffer);
-        if (bin_len > 0) {
-          if (bin_len != 32) {
-
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate must be 32 bytes: %d."), bin_len);
-            free(spi_buffer);
-            free(bin_buf);
-            return;
-          }
-          tls_entry_t *entry = &tls_dir_write->entry[0];
-          entry->name = TLS_NAME_SKEY;
-          entry->start = 0;
-          entry->len = bin_len;
-          memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
-        } else {
-
-        }
-      } else if (2 == XdrvMailbox.index) {
-
-        if (TLS_NAME_SKEY != tls_dir.entry[0].name) {
-
-          AddLog_P(LOG_LEVEL_INFO, PSTR("TLSKey: cannot store Cert if no Key previously stored."));
-          free(spi_buffer);
-          free(bin_buf);
-          return;
-        }
-        if (bin_len <= 256) {
-
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("TLSKey: Certificate length too short: %d."), bin_len);
-          free(spi_buffer);
-          free(bin_buf);
-          return;
-        }
-        tls_entry_t *entry = &tls_dir_write->entry[1];
-        entry->name = TLS_NAME_CRT;
-        entry->start = (tls_dir_write->entry[0].start + tls_dir_write->entry[0].len + 3) & ~0x03;
-        entry->len = bin_len;
-        memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len);
-      }
-
-      if (ESP.flashEraseSector(tls_spi_start_sector)) {
-        ESP.flashWrite(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-      }
-      free(spi_buffer);
-      free(bin_buf);
-    }
-
-    loadTlsDir();
-    Response_P(PSTR("{\"%s1\":%d,\"%s2\":%d}"),
-      XdrvMailbox.command, AWS_IoT_Private_Key ? tls_dir.entry[0].len : -1,
-      XdrvMailbox.command, AWS_IoT_Client_Certificate ? tls_dir.entry[1].len : -1);
-  }
-}
-
-#ifdef DEBUG_DUMP_TLS
-
-uint32_t bswap32(uint32_t x) {
- return ((x << 24) & 0xff000000 ) |
-  ((x << 8) & 0x00ff0000 ) |
-  ((x >> 8) & 0x0000ff00 ) |
-  ((x >> 24) & 0x000000ff );
-}
-void CmndTlsDump(void) {
-  uint32_t start = (uint32_t)tls_spi_start + tls_block_offset;
-  uint32_t end = start + tls_block_len -1;
-  for (uint32_t pos = start; pos < end; pos += 0x10) {
-    uint32_t* values = (uint32_t*)(pos);
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-    Serial.printf("%08x:  %08x %08x %08x %08x\n", pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
-#else
-    Serial.printf_P(PSTR("%08x:  %08x %08x %08x %08x\n"), pos, bswap32(values[0]), bswap32(values[1]), bswap32(values[2]), bswap32(values[3]));
-#endif
-  }
-}
-#endif
-#endif
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_MQTT "mq"
-
-const char S_CONFIGURE_MQTT[] PROGMEM = D_CONFIGURE_MQTT;
-
-const char HTTP_BTN_MENU_MQTT[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_MQTT "' method='get'><button>" D_CONFIGURE_MQTT "</button></form></p>";
-
-const char HTTP_FORM_MQTT1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_MQTT_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='" WEB_HANDLE_MQTT "'>"
-  "<p><b>" D_HOST "</b> (" MQTT_HOST ")<br><input id='mh' placeholder='" MQTT_HOST" ' value='%s'></p>"
-  "<p><b>" D_PORT "</b> (" STR(MQTT_PORT) ")<br><input id='ml' placeholder='" STR(MQTT_PORT) "' value='%d'></p>"
-  "<p><b>" D_CLIENT "</b> (%s)<br><input id='mc' placeholder='%s' value='%s'></p>";
-const char HTTP_FORM_MQTT2[] PROGMEM =
-  "<p><b>" D_USER "</b> (" MQTT_USER ")<br><input id='mu' placeholder='" MQTT_USER "' value='%s'></p>"
-  "<p><b>" D_PASSWORD "</b><input type='checkbox' onclick='sp(\"mp\")'><br><input id='mp' type='password' placeholder='" D_PASSWORD "' value='" D_ASTERISK_PWD "'></p>"
-  "<p><b>" D_TOPIC "</b> = %%topic%% (%s)<br><input id='mt' placeholder='%s' value='%s'></p>"
-  "<p><b>" D_FULL_TOPIC "</b> (%s)<br><input id='mf' placeholder='%s' value='%s'></p>";
-
-void HandleMqttConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT);
-
-  if (WebServer->hasArg("save")) {
-    MqttSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char str[TOPSZ];
-
-  WSContentStart_P(S_CONFIGURE_MQTT);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_MQTT1,
-    SettingsText(SET_MQTT_HOST),
-    Settings.mqtt_port,
-    Format(str, MQTT_CLIENT_ID, sizeof(str)), MQTT_CLIENT_ID, SettingsText(SET_MQTT_CLIENT));
-  WSContentSend_P(HTTP_FORM_MQTT2,
-    (!strlen(SettingsText(SET_MQTT_USER))) ? "0" : SettingsText(SET_MQTT_USER),
-    Format(str, MQTT_TOPIC, sizeof(str)), MQTT_TOPIC, SettingsText(SET_MQTT_TOPIC),
-    MQTT_FULLTOPIC, MQTT_FULLTOPIC, SettingsText(SET_MQTT_FULLTOPIC));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void MqttSaveSettings(void)
-{
-  char tmp[TOPSZ];
-  char stemp[TOPSZ];
-  char stemp2[TOPSZ];
-
-  WebGetArg("mt", tmp, sizeof(tmp));
-  strlcpy(stemp, (!strlen(tmp)) ? MQTT_TOPIC : tmp, sizeof(stemp));
-  MakeValidMqtt(0, stemp);
-  WebGetArg("mf", tmp, sizeof(tmp));
-  strlcpy(stemp2, (!strlen(tmp)) ? MQTT_FULLTOPIC : tmp, sizeof(stemp2));
-  MakeValidMqtt(1, stemp2);
-  if ((strcmp(stemp, SettingsText(SET_MQTT_TOPIC))) || (strcmp(stemp2, SettingsText(SET_MQTT_FULLTOPIC)))) {
-    Response_P((Settings.flag.mqtt_offline) ? S_OFFLINE : "");
-    MqttPublishPrefixTopic_P(TELE, S_LWT, true);
-  }
-  SettingsUpdateText(SET_MQTT_TOPIC, stemp);
-  SettingsUpdateText(SET_MQTT_FULLTOPIC, stemp2);
-  WebGetArg("mh", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_HOST, (!strlen(tmp)) ? MQTT_HOST : (!strcmp(tmp,"0")) ? "" : tmp);
-  WebGetArg("ml", tmp, sizeof(tmp));
-  Settings.mqtt_port = (!strlen(tmp)) ? MQTT_PORT : atoi(tmp);
-  WebGetArg("mc", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_CLIENT, (!strlen(tmp)) ? MQTT_CLIENT_ID : tmp);
-#if defined(USE_MQTT_TLS) && defined(USE_MQTT_AWS_IOT)
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
-    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
-#else
-  WebGetArg("mu", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_USER, (!strlen(tmp)) ? MQTT_USER : (!strcmp(tmp,"0")) ? "" : tmp);
-  WebGetArg("mp", tmp, sizeof(tmp));
-  SettingsUpdateText(SET_MQTT_PWD, (!strlen(tmp)) ? "" : (!strcmp(tmp, D_ASTERISK_PWD)) ? SettingsText(SET_MQTT_PWD) : tmp);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT D_CMND_MQTTHOST " %s, " D_CMND_MQTTPORT " %d, " D_CMND_MQTTCLIENT " %s, " D_CMND_MQTTUSER " %s, " D_CMND_TOPIC " %s, " D_CMND_FULLTOPIC " %s"),
-    SettingsText(SET_MQTT_HOST), Settings.mqtt_port, SettingsText(SET_MQTT_CLIENT), SettingsText(SET_MQTT_USER), SettingsText(SET_MQTT_TOPIC), SettingsText(SET_MQTT_FULLTOPIC));
-#endif
-}
-#endif
-
-
-
-
-
-bool Xdrv02(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        MqttInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        MqttClient.loop();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_MQTT);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_MQTT, HandleMqttConfiguration);
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kMqttCommands, MqttCommand);
-        break;
-    }
-  }
-  return result;
-}
-# 1 "S:/Development/Tasmota/tasmota/xdrv_03_energy.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_03_energy.ino"
-#ifdef USE_ENERGY_SENSOR
-
-
-
-
-#define XDRV_03 3
-#define XSNS_03 3
-
-
-
-
-#define ENERGY_NONE 0
-#define ENERGY_WATCHDOG 4
-
-#include <Ticker.h>
-
-#define D_CMND_POWERCAL "PowerCal"
-#define D_CMND_VOLTAGECAL "VoltageCal"
-#define D_CMND_CURRENTCAL "CurrentCal"
-#define D_CMND_TARIFF "Tariff"
-#define D_CMND_MODULEADDRESS "ModuleAddress"
-
-enum EnergyCommands {
-  CMND_POWERCAL, CMND_VOLTAGECAL, CMND_CURRENTCAL,
-  CMND_POWERSET, CMND_VOLTAGESET, CMND_CURRENTSET, CMND_FREQUENCYSET, CMND_MODULEADDRESS };
-
-const char kEnergyCommands[] PROGMEM = "|"
-  D_CMND_POWERCAL "|" D_CMND_VOLTAGECAL "|" D_CMND_CURRENTCAL "|"
-  D_CMND_POWERSET "|" D_CMND_VOLTAGESET "|" D_CMND_CURRENTSET "|" D_CMND_FREQUENCYSET "|" D_CMND_MODULEADDRESS "|"
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  D_CMND_POWERDELTA "|" D_CMND_POWERLOW "|" D_CMND_POWERHIGH "|" D_CMND_VOLTAGELOW "|" D_CMND_VOLTAGEHIGH "|" D_CMND_CURRENTLOW "|" D_CMND_CURRENTHIGH "|"
-#ifdef USE_ENERGY_POWER_LIMIT
-  D_CMND_MAXENERGY "|" D_CMND_MAXENERGYSTART "|"
-  D_CMND_MAXPOWER "|" D_CMND_MAXPOWERHOLD "|" D_CMND_MAXPOWERWINDOW "|"
-  D_CMND_SAFEPOWER "|" D_CMND_SAFEPOWERHOLD "|" D_CMND_SAFEPOWERWINDOW "|"
-#endif
-#endif
-  D_CMND_ENERGYRESET "|" D_CMND_TARIFF ;
-
-void (* const EnergyCommand[])(void) PROGMEM = {
-  &CmndPowerCal, &CmndVoltageCal, &CmndCurrentCal,
-  &CmndPowerSet, &CmndVoltageSet, &CmndCurrentSet, &CmndFrequencySet, &CmndModuleAddress,
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  &CmndPowerDelta, &CmndPowerLow, &CmndPowerHigh, &CmndVoltageLow, &CmndVoltageHigh, &CmndCurrentLow, &CmndCurrentHigh,
-#ifdef USE_ENERGY_POWER_LIMIT
-  &CmndMaxEnergy, &CmndMaxEnergyStart,
-  &CmndMaxPower, &CmndMaxPowerHold, &CmndMaxPowerWindow,
-  &CmndSafePower, &CmndSafePowerHold, &CmndSafePowerWindow,
-#endif
-#endif
-  &CmndEnergyReset, &CmndTariff };
-
-const char kEnergyPhases[] PROGMEM = "|%s / %s|%s / %s / %s||[%s,%s]|[%s,%s,%s]";
-
-struct ENERGY {
-  float voltage[3] = { 0, 0, 0 };
-  float current[3] = { 0, 0, 0 };
-  float active_power[3] = { 0, 0, 0 };
-  float apparent_power[3] = { NAN, NAN, NAN };
-  float reactive_power[3] = { NAN, NAN, NAN };
-  float power_factor[3] = { NAN, NAN, NAN };
-  float frequency[3] = { NAN, NAN, NAN };
-
-  float start_energy = 0;
-  float daily = 0;
-  float total = 0;
-  float export_active = NAN;
-
-  unsigned long kWhtoday_delta = 0;
-  unsigned long kWhtoday_offset = 0;
-  unsigned long kWhtoday;
-  unsigned long period = 0;
-
-  uint8_t fifth_second = 0;
-  uint8_t command_code = 0;
-  uint8_t data_valid[3] = { 0, 0, 0 };
-
-  uint8_t phase_count = 1;
-  bool voltage_common = false;
-
-  bool voltage_available = true;
-  bool current_available = true;
-
-  bool type_dc = false;
-  bool power_on = true;
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  uint16_t power_history[3] = { 0 };
-  uint8_t power_steady_counter = 8;
-  bool power_delta = false;
-  bool min_power_flag = false;
-  bool max_power_flag = false;
-  bool min_voltage_flag = false;
-  bool max_voltage_flag = false;
-  bool min_current_flag = false;
-  bool max_current_flag = false;
-
-#ifdef USE_ENERGY_POWER_LIMIT
-  uint16_t mplh_counter = 0;
-  uint16_t mplw_counter = 0;
-  uint8_t mplr_counter = 0;
-  uint8_t max_energy_state = 0;
-#endif
-#endif
-} Energy;
-
-Ticker ticker_energy;
-
-
-
-bool EnergyTariff1Active()
-{
-  uint8_t dst = 0;
-  if (IsDst() && (Settings.tariff[0][1] != Settings.tariff[1][1])) {
-    dst = 1;
-  }
-  if (Settings.tariff[0][dst] != Settings.tariff[1][dst]) {
-    if (Settings.flag3.energy_weekend && ((RtcTime.day_of_week == 1) ||
-                                          (RtcTime.day_of_week == 7))) {
-      return true;
-    }
-    uint32_t minutes = MinutesPastMidnight();
-    if (Settings.tariff[0][dst] > Settings.tariff[1][dst]) {
-
-      return ((minutes >= Settings.tariff[0][dst]) || (minutes < Settings.tariff[1][dst]));
-    } else {
-
-      return ((minutes >= Settings.tariff[0][dst]) && (minutes < Settings.tariff[1][dst]));
-    }
-  } else {
-    return false;
-  }
-}
-
-void EnergyUpdateToday(void)
-{
-  if (Energy.kWhtoday_delta > 1000) {
-    unsigned long delta = Energy.kWhtoday_delta / 1000;
-    Energy.kWhtoday_delta -= (delta * 1000);
-    Energy.kWhtoday += delta;
-  }
-
-  RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset + Energy.kWhtoday;
-  Energy.daily = (float)(RtcSettings.energy_kWhtoday) / 100000;
-  Energy.total = (float)(RtcSettings.energy_kWhtotal + RtcSettings.energy_kWhtoday) / 100000;
-
-  if (RtcTime.valid){
-
-    uint32_t energy_diff = (uint32_t)(Energy.total * 100000) - RtcSettings.energy_usage.last_usage_kWhtotal;
-    RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 100000);
-
-    uint32_t return_diff = 0;
-    if (!isnan(Energy.export_active)) {
-      return_diff = (uint32_t)(Energy.export_active * 100000) - RtcSettings.energy_usage.last_return_kWhtotal;
-      RtcSettings.energy_usage.last_return_kWhtotal = (uint32_t)(Energy.export_active * 100000);
-    }
-
-    if (EnergyTariff1Active()) {
-      RtcSettings.energy_usage.usage1_kWhtotal += energy_diff;
-      RtcSettings.energy_usage.return1_kWhtotal += return_diff;
-    } else {
-      RtcSettings.energy_usage.usage2_kWhtotal += energy_diff;
-      RtcSettings.energy_usage.return2_kWhtotal += return_diff;
-    }
-  }
-}
-
-void EnergyUpdateTotal(float value, bool kwh)
-{
-
-
-
-
-  uint32_t multiplier = (kwh) ? 100000 : 100;
-
-  if (0 == Energy.start_energy || (value < Energy.start_energy)) {
-    Energy.start_energy = value;
-  }
-  else if (value != Energy.start_energy) {
-    Energy.kWhtoday = (unsigned long)((value - Energy.start_energy) * multiplier);
-  }
-
-  if ((Energy.total < (value - 0.01)) &&
-      Settings.flag3.hardware_energy_total) {
-    RtcSettings.energy_kWhtotal = (unsigned long)((value * multiplier) - Energy.kWhtoday_offset - Energy.kWhtoday);
-    Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-    Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
-    Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
-
-  }
-  EnergyUpdateToday();
-}
-
-
-
-void Energy200ms(void)
-{
-  Energy.power_on = (power != 0) | Settings.flag.no_power_on_check;
-
-  Energy.fifth_second++;
-  if (5 == Energy.fifth_second) {
-    Energy.fifth_second = 0;
-
-    XnrgCall(FUNC_ENERGY_EVERY_SECOND);
-
-    if (RtcTime.valid) {
-      if (LocalTime() == Midnight()) {
-        Settings.energy_kWhyesterday = RtcSettings.energy_kWhtoday;
-
-        RtcSettings.energy_kWhtotal += RtcSettings.energy_kWhtoday;
-        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-        Energy.kWhtoday = 0;
-        Energy.kWhtoday_offset = 0;
-        RtcSettings.energy_kWhtoday = 0;
-        Energy.start_energy = 0;
-
-        Energy.kWhtoday_delta = 0;
-        Energy.period = Energy.kWhtoday;
-        EnergyUpdateToday();
-#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
-        Energy.max_energy_state = 3;
-#endif
-      }
-#if defined(USE_ENERGY_MARGIN_DETECTION) && defined(USE_ENERGY_POWER_LIMIT)
-      if ((RtcTime.hour == Settings.energy_max_energy_start) && (3 == Energy.max_energy_state )) {
-        Energy.max_energy_state = 0;
-      }
-#endif
-
-    }
-  }
-
-  XnrgCall(FUNC_EVERY_200_MSECOND);
-}
-
-void EnergySaveState(void)
-{
-  Settings.energy_kWhdoy = (RtcTime.valid) ? RtcTime.day_of_year : 0;
-
-  Settings.energy_kWhtoday = RtcSettings.energy_kWhtoday;
-  Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-
-  Settings.energy_usage = RtcSettings.energy_usage;
-}
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-bool EnergyMargin(bool type, uint16_t margin, uint16_t value, bool &flag, bool &save_flag)
-{
-  bool change;
-
-  if (!margin) return false;
-  change = save_flag;
-  if (type) {
-    flag = (value > margin);
-  } else {
-    flag = (value < margin);
-  }
-  save_flag = flag;
-  return (change != save_flag);
-}
-
-void EnergyMarginCheck(void)
-{
-  if (Energy.power_steady_counter) {
-    Energy.power_steady_counter--;
-    return;
-  }
-
-  uint16_t energy_power_u = (uint16_t)(Energy.active_power[0]);
-
-  if (Settings.energy_power_delta) {
-    uint16_t delta = abs(Energy.power_history[0] - energy_power_u);
-    if (delta > 0) {
-      if (Settings.energy_power_delta < 101) {
-        uint16_t min_power = (Energy.power_history[0] > energy_power_u) ? energy_power_u : Energy.power_history[0];
-        if (0 == min_power) { min_power++; }
-        if (((delta * 100) / min_power) > Settings.energy_power_delta) {
-          Energy.power_delta = true;
-        }
-      } else {
-        if (delta > (Settings.energy_power_delta -100)) {
-          Energy.power_delta = true;
-        }
-      }
-      if (Energy.power_delta) {
-        Energy.power_history[1] = Energy.active_power[0];
-        Energy.power_history[2] = Energy.active_power[0];
-      }
-    }
-  }
-  Energy.power_history[0] = Energy.power_history[1];
-  Energy.power_history[1] = Energy.power_history[2];
-  Energy.power_history[2] = energy_power_u;
-
-  if (Energy.power_on && (Settings.energy_min_power || Settings.energy_max_power || Settings.energy_min_voltage || Settings.energy_max_voltage || Settings.energy_min_current || Settings.energy_max_current)) {
-    uint16_t energy_voltage_u = (uint16_t)(Energy.voltage[0]);
-    uint16_t energy_current_u = (uint16_t)(Energy.current[0] * 1000);
-
-    DEBUG_DRIVER_LOG(PSTR("NRG: W %d, U %d, I %d"), energy_power_u, energy_voltage_u, energy_current_u);
-
-    Response_P(PSTR("{"));
-    bool flag;
-    bool jsonflg = false;
-    if (EnergyMargin(false, Settings.energy_min_power, energy_power_u, flag, Energy.min_power_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_power, energy_power_u, flag, Energy.max_power_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_POWERHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(false, Settings.energy_min_voltage, energy_voltage_u, flag, Energy.min_voltage_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGELOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_voltage, energy_voltage_u, flag, Energy.max_voltage_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_VOLTAGEHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(false, Settings.energy_min_current, energy_current_u, flag, Energy.min_current_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTLOW "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (EnergyMargin(true, Settings.energy_max_current, energy_current_u, flag, Energy.max_current_flag)) {
-      ResponseAppend_P(PSTR("%s\"" D_CMND_CURRENTHIGH "\":\"%s\""), (jsonflg)?",":"", GetStateText(flag));
-      jsonflg = true;
-    }
-    if (jsonflg) {
-      ResponseJsonEnd();
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN);
-      EnergyMqttShow();
-    }
-  }
-
-#ifdef USE_ENERGY_POWER_LIMIT
-
-  if (Settings.energy_max_power_limit) {
-    if (Energy.active_power[0] > Settings.energy_max_power_limit) {
-      if (!Energy.mplh_counter) {
-        Energy.mplh_counter = Settings.energy_max_power_limit_hold;
-      } else {
-        Energy.mplh_counter--;
-        if (!Energy.mplh_counter) {
-          ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHED "\":%d}"), energy_power_u);
-          MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-          EnergyMqttShow();
-          SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
-          if (!Energy.mplr_counter) {
-            Energy.mplr_counter = Settings.param[P_MAX_POWER_RETRY] +1;
-          }
-          Energy.mplw_counter = Settings.energy_max_power_limit_window;
-        }
-      }
-    }
-    else if (power && (energy_power_u <= Settings.energy_max_power_limit)) {
-      Energy.mplh_counter = 0;
-      Energy.mplr_counter = 0;
-      Energy.mplw_counter = 0;
-    }
-    if (!power) {
-      if (Energy.mplw_counter) {
-        Energy.mplw_counter--;
-      } else {
-        if (Energy.mplr_counter) {
-          Energy.mplr_counter--;
-          if (Energy.mplr_counter) {
-            ResponseTime_P(PSTR(",\"" D_JSON_POWERMONITOR "\":\"%s\"}"), GetStateText(1));
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_POWERMONITOR));
-            RestorePower(true, SRC_MAXPOWER);
-          } else {
-            ResponseTime_P(PSTR(",\"" D_JSON_MAXPOWERREACHEDRETRY "\":\"%s\"}"), GetStateText(0));
-            MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-            EnergyMqttShow();
-            SetAllPower(POWER_ALL_OFF, SRC_MAXPOWER);
-          }
-        }
-      }
-    }
-  }
-
-
-  if (Settings.energy_max_energy) {
-    uint16_t energy_daily_u = (uint16_t)(Energy.daily * 1000);
-    if (!Energy.max_energy_state && (RtcTime.hour == Settings.energy_max_energy_start)) {
-      Energy.max_energy_state = 1;
-      ResponseTime_P(PSTR(",\"" D_JSON_ENERGYMONITOR "\":\"%s\"}"), GetStateText(1));
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_JSON_ENERGYMONITOR));
-      RestorePower(true, SRC_MAXENERGY);
-    }
-    else if ((1 == Energy.max_energy_state ) && (energy_daily_u >= Settings.energy_max_energy)) {
-      Energy.max_energy_state = 2;
-      char stemp[FLOATSZ];
-      dtostrfd(Energy.daily, 3, stemp);
-      ResponseTime_P(PSTR(",\"" D_JSON_MAXENERGYREACHED "\":%s}"), stemp);
-      MqttPublishPrefixTopic_P(STAT, S_RSLT_WARNING);
-      EnergyMqttShow();
-      SetAllPower(POWER_ALL_OFF, SRC_MAXENERGY);
-    }
-  }
-#endif
-
-  if (Energy.power_delta) { EnergyMqttShow(); }
-}
-
-void EnergyMqttShow(void)
-{
-
-  int tele_period_save = tele_period;
-  tele_period = 2;
-  mqtt_data[0] = '\0';
-  ResponseAppendTime();
-  EnergyShow(true);
-  tele_period = tele_period_save;
-  ResponseJsonEnd();
-  MqttPublishTeleSensor();
-  Energy.power_delta = false;
-}
-#endif
-
-void EnergyEverySecond(void)
-{
-
-  if (global_update) {
-    if (power && (global_temperature != 9999) && (global_temperature > Settings.param[P_OVER_TEMP])) {
-      SetAllPower(POWER_ALL_OFF, SRC_OVERTEMP);
-    }
-  }
-
-
-  uint32_t data_valid = Energy.phase_count;
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    if (Energy.data_valid[i] <= ENERGY_WATCHDOG) {
-      Energy.data_valid[i]++;
-      if (Energy.data_valid[i] > ENERGY_WATCHDOG) {
-
-        Energy.voltage[i] = 0;
-        Energy.current[i] = 0;
-        Energy.active_power[i] = 0;
-        if (!isnan(Energy.apparent_power[i])) { Energy.apparent_power[i] = 0; }
-        if (!isnan(Energy.reactive_power[i])) { Energy.reactive_power[i] = 0; }
-        if (!isnan(Energy.frequency[i])) { Energy.frequency[i] = 0; }
-        if (!isnan(Energy.power_factor[i])) { Energy.power_factor[i] = 0; }
-
-        data_valid--;
-      }
-    }
-  }
-  if (!data_valid) {
-    if (!isnan(Energy.export_active)) { Energy.export_active = 0; }
-    Energy.start_energy = 0;
-
-    XnrgCall(FUNC_ENERGY_RESET);
-  }
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-  EnergyMarginCheck();
-#endif
-}
-
-
-
-
-
-void EnergyCommandCalResponse(uint32_t nvalue)
-{
-  snprintf_P(XdrvMailbox.command, CMDSZ, PSTR("%sCal"), XdrvMailbox.command);
-  ResponseCmndNumber(nvalue);
-}
-
-void CmndEnergyReset(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 3)) {
-    char *p;
-    unsigned long lnum = strtoul(XdrvMailbox.data, &p, 10);
-    if (p != XdrvMailbox.data) {
-      switch (XdrvMailbox.index) {
-      case 1:
-
-        Energy.kWhtoday_offset = lnum *100;
-        Energy.kWhtoday = 0;
-        Energy.kWhtoday_delta = 0;
-        Energy.start_energy = 0;
-        Energy.period = Energy.kWhtoday_offset;
-        Settings.energy_kWhtoday = Energy.kWhtoday_offset;
-        RtcSettings.energy_kWhtoday = Energy.kWhtoday_offset;
-        Energy.daily = (float)Energy.kWhtoday_offset / 100000;
-        if (!RtcSettings.energy_kWhtotal && !Energy.kWhtoday_offset) {
-          Settings.energy_kWhtotal_time = LocalTime();
-        }
-        break;
-      case 2:
-
-        Settings.energy_kWhyesterday = lnum *100;
-        break;
-      case 3:
-
-        RtcSettings.energy_kWhtotal = lnum *100;
-        Settings.energy_kWhtotal = RtcSettings.energy_kWhtotal;
-
-        Settings.energy_kWhtotal_time = (!Energy.kWhtoday_offset) ? LocalTime() : Midnight();
-        RtcSettings.energy_usage.last_usage_kWhtotal = (uint32_t)(Energy.total * 1000);
-        break;
-      }
-    }
-  }
-  else if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
-    uint32_t values[2] = { 0 };
-    uint32_t position = ParseParameters(2, values);
-    values[0] *= 100;
-    values[1] *= 100;
-
-    switch (XdrvMailbox.index)
-    {
-      case 4:
-
-        if (position > 0) {
-          RtcSettings.energy_usage.usage1_kWhtotal = values[0];
-        }
-        if (position > 1) {
-          RtcSettings.energy_usage.usage2_kWhtotal = values[1];
-        }
-        Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
-        Settings.energy_usage.usage2_kWhtotal = RtcSettings.energy_usage.usage2_kWhtotal;
-        break;
-      case 5:
-
-        if (position > 0) {
-          RtcSettings.energy_usage.return1_kWhtotal = values[0];
-        }
-        if (position > 1) {
-          RtcSettings.energy_usage.return2_kWhtotal = values[1];
-        }
-        Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
-        Settings.energy_usage.return2_kWhtotal = RtcSettings.energy_usage.return2_kWhtotal;
-        break;
-      }
-  }
-
-  Energy.total = (float)(RtcSettings.energy_kWhtotal + Energy.kWhtoday_offset + Energy.kWhtoday) / 100000;
-
-  char energy_total_chr[FLOATSZ];
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr);
-  char energy_daily_chr[FLOATSZ];
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
-  char energy_yesterday_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
-
-  char energy_usage1_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage1_chr);
-  char energy_usage2_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_usage2_chr);
-  char energy_return1_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return1_chr);
-  char energy_return2_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_return2_chr);
-
-  Response_P(PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s,\"" D_JSON_USAGE "\":[%s,%s],\"" D_JSON_EXPORT "\":[%s,%s]}}"),
-    XdrvMailbox.command, energy_total_chr, energy_yesterday_chr, energy_daily_chr, energy_usage1_chr, energy_usage2_chr, energy_return1_chr, energy_return2_chr);
-}
-
-void CmndTariff(void)
-{
-
-
-
-
-
-
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    uint32_t tariff = XdrvMailbox.index -1;
-    uint32_t time_type = 0;
-    char *p;
-    char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-    while ((str != nullptr) && (time_type < 2)) {
-      char *q;
-      uint32_t value = strtol(str, &q, 10);
-      Settings.tariff[tariff][time_type] = value;
-      if (value < 24) {
-        Settings.tariff[tariff][time_type] *= 60;
-        char *minute = strtok_r(nullptr, ":", &q);
-        if (minute) {
-          value = strtol(minute, nullptr, 10);
-          if (value > 59) {
-            value = 59;
-          }
-          Settings.tariff[tariff][time_type] += value;
-        }
-      }
-      if (Settings.tariff[tariff][time_type] > 1439) {
-        Settings.tariff[tariff][time_type] = 1439;
-      }
-      str = strtok_r(nullptr, ", ", &p);
-      time_type++;
-    }
-  }
-  else if (XdrvMailbox.index == 9) {
-    Settings.flag3.energy_weekend = XdrvMailbox.payload & 1;
-  }
-  Response_P(PSTR("{\"%s\":{\"Off-Peak\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Standard\":{\"STD\":\"%s\",\"DST\":\"%s\"},\"Weekend\":\"%s\"}}"),
-    XdrvMailbox.command,
-    GetMinuteTime(Settings.tariff[0][0]).c_str(),GetMinuteTime(Settings.tariff[0][1]).c_str(),
-    GetMinuteTime(Settings.tariff[1][0]).c_str(),GetMinuteTime(Settings.tariff[1][1]).c_str(),
-    GetStateText(Settings.flag3.energy_weekend));
-}
-
-void CmndPowerCal(void)
-{
-  Energy.command_code = CMND_POWERCAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_power_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_power_calibration);
-  }
-}
-
-void CmndVoltageCal(void)
-{
-  Energy.command_code = CMND_VOLTAGECAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_voltage_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_voltage_calibration);
-  }
-}
-
-void CmndCurrentCal(void)
-{
-  Energy.command_code = CMND_CURRENTCAL;
-  if (XnrgCall(FUNC_COMMAND)) {
-    if ((XdrvMailbox.payload > 999) && (XdrvMailbox.payload < 32001)) {
-      Settings.energy_current_calibration = XdrvMailbox.payload;
-    }
-    ResponseCmndNumber(Settings.energy_current_calibration);
-  }
-}
-
-void CmndPowerSet(void)
-{
-  Energy.command_code = CMND_POWERSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_power_calibration);
-  }
-}
-
-void CmndVoltageSet(void)
-{
-  Energy.command_code = CMND_VOLTAGESET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_voltage_calibration);
-  }
-}
-
-void CmndCurrentSet(void)
-{
-  Energy.command_code = CMND_CURRENTSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_current_calibration);
-  }
-}
-
-void CmndFrequencySet(void)
-{
-  Energy.command_code = CMND_FREQUENCYSET;
-  if (XnrgCall(FUNC_COMMAND)) {
-    EnergyCommandCalResponse(Settings.energy_frequency_calibration);
-  }
-}
-
-void CmndModuleAddress(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4) && (1 == Energy.phase_count)) {
-    Energy.command_code = CMND_MODULEADDRESS;
-    if (XnrgCall(FUNC_COMMAND)) {
-      ResponseCmndDone();
-    }
-  }
-}
-
-#ifdef USE_ENERGY_MARGIN_DETECTION
-void CmndPowerDelta(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32000)) {
-    Settings.energy_power_delta = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_power_delta);
-}
-
-void CmndPowerLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_min_power = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_power);
-}
-
-void CmndPowerHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power);
-}
-
-void CmndVoltageLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
-    Settings.energy_min_voltage = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_voltage);
-}
-
-void CmndVoltageHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 501)) {
-    Settings.energy_max_voltage = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_voltage);
-}
-
-void CmndCurrentLow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
-    Settings.energy_min_current = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_min_current);
-}
-
-void CmndCurrentHigh(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 16001)) {
-    Settings.energy_max_current = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_current);
-}
-
-#ifdef USE_ENERGY_POWER_LIMIT
-void CmndMaxPower(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit);
-}
-
-void CmndMaxPowerHold(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit_hold = (1 == XdrvMailbox.payload) ? MAX_POWER_HOLD : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit_hold);
-}
-
-void CmndMaxPowerWindow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_limit_window = (1 == XdrvMailbox.payload) ? MAX_POWER_WINDOW : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_limit_window);
-}
-
-void CmndSafePower(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_safe_limit = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit);
-}
-
-void CmndSafePowerHold(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_power_safe_limit_hold = (1 == XdrvMailbox.payload) ? SAFE_POWER_HOLD : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit_hold);
-}
-
-void CmndSafePowerWindow(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 1440)) {
-    Settings.energy_max_power_safe_limit_window = (1 == XdrvMailbox.payload) ? SAFE_POWER_WINDOW : XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_power_safe_limit_window);
-}
-
-void CmndMaxEnergy(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.energy_max_energy = XdrvMailbox.payload;
-    Energy.max_energy_state = 3;
-  }
-  ResponseCmndNumber(Settings.energy_max_energy);
-}
-
-void CmndMaxEnergyStart(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 24)) {
-    Settings.energy_max_energy_start = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.energy_max_energy_start);
-}
-#endif
-#endif
-
-void EnergySnsInit(void)
-{
-  XnrgCall(FUNC_INIT);
-
-  if (energy_flg) {
-    if (RtcSettingsValid()) {
-      Energy.kWhtoday_offset = RtcSettings.energy_kWhtoday;
-    }
-    else if (RtcTime.day_of_year == Settings.energy_kWhdoy) {
-      Energy.kWhtoday_offset = Settings.energy_kWhtoday;
-    }
-    else {
-      Energy.kWhtoday_offset = 0;
-    }
-    Energy.kWhtoday = 0;
-    Energy.kWhtoday_delta = 0;
-    Energy.period = Energy.kWhtoday_offset;
-    EnergyUpdateToday();
-    ticker_energy.attach_ms(200, Energy200ms);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_SNS1[] PROGMEM =
-  "{s}" D_POWERUSAGE_APPARENT "{m}%s " D_UNIT_VA "{e}"
-  "{s}" D_POWERUSAGE_REACTIVE "{m}%s " D_UNIT_VAR "{e}"
-  "{s}" D_POWER_FACTOR "{m}%s{e}";
-
-const char HTTP_ENERGY_SNS2[] PROGMEM =
-  "{s}" D_ENERGY_TODAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_YESTERDAY "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_TOTAL "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
-
-const char HTTP_ENERGY_SNS3[] PROGMEM =
-  "{s}" D_EXPORT_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}";
-#endif
-
-char* EnergyFormatIndex(char* result, char* input, bool json, uint32_t index, bool single = false)
-{
-  char layout[16];
-  GetTextIndexed(layout, sizeof(layout), (index -1) + (3 * json), kEnergyPhases);
-  switch (index) {
-    case 2:
-      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ);
-      break;
-    case 3:
-      snprintf_P(result, FLOATSZ *3, layout, input, input + FLOATSZ, input + FLOATSZ + FLOATSZ);
-      break;
-    default:
-      snprintf_P(result, FLOATSZ *3, input);
-  }
-  return result;
-}
-
-char* EnergyFormat(char* result, char* input, bool json, bool single = false)
-{
-  uint8_t index = (single) ? 1 : Energy.phase_count;
-  return EnergyFormatIndex(result, input, json, index, single);
-}
-
-void EnergyShow(bool json)
-{
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    if (Energy.voltage_common) {
-      Energy.voltage[i] = Energy.voltage[0];
-    }
-  }
-
-  float power_factor_knx = Energy.power_factor[0];
-
-  char apparent_power_chr[Energy.phase_count][FLOATSZ];
-  char reactive_power_chr[Energy.phase_count][FLOATSZ];
-  char power_factor_chr[Energy.phase_count][FLOATSZ];
-  char frequency_chr[Energy.phase_count][FLOATSZ];
-  if (!Energy.type_dc) {
-    if (Energy.current_available && Energy.voltage_available) {
-      for (uint32_t i = 0; i < Energy.phase_count; i++) {
-        float apparent_power = Energy.apparent_power[i];
-        if (isnan(apparent_power)) {
-          apparent_power = Energy.voltage[i] * Energy.current[i];
-        }
-        if (apparent_power < Energy.active_power[i]) {
-          Energy.active_power[i] = apparent_power;
-        }
-
-        float power_factor = Energy.power_factor[i];
-        if (isnan(power_factor)) {
-          power_factor = (Energy.active_power[i] && apparent_power) ? Energy.active_power[i] / apparent_power : 0;
-          if (power_factor > 1) {
-            power_factor = 1;
-          }
-        }
-        if (0 == i) { power_factor_knx = power_factor; }
-
-        float reactive_power = Energy.reactive_power[i];
-        if (isnan(reactive_power)) {
-          reactive_power = 0;
-          uint32_t difference = ((uint32_t)(apparent_power * 100) - (uint32_t)(Energy.active_power[i] * 100)) / 10;
-          if ((Energy.current[i] > 0.005) && ((difference > 15) || (difference > (uint32_t)(apparent_power * 100 / 1000)))) {
-
-
-            reactive_power = (float)(RoundSqrtInt((uint32_t)(apparent_power * apparent_power * 100) - (uint32_t)(Energy.active_power[i] * Energy.active_power[i] * 100))) / 10;
-          }
-        }
-
-        dtostrfd(apparent_power, Settings.flag2.wattage_resolution, apparent_power_chr[i]);
-        dtostrfd(reactive_power, Settings.flag2.wattage_resolution, reactive_power_chr[i]);
-        dtostrfd(power_factor, 2, power_factor_chr[i]);
-      }
-    }
-    for (uint32_t i = 0; i < Energy.phase_count; i++) {
-      float frequency = Energy.frequency[i];
-      if (isnan(Energy.frequency[i])) {
-        frequency = 0;
-      }
-      dtostrfd(frequency, Settings.flag2.frequency_resolution, frequency_chr[i]);
-    }
-  }
-
-  char voltage_chr[Energy.phase_count][FLOATSZ];
-  char current_chr[Energy.phase_count][FLOATSZ];
-  char active_power_chr[Energy.phase_count][FLOATSZ];
-  for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    dtostrfd(Energy.voltage[i], Settings.flag2.voltage_resolution, voltage_chr[i]);
-    dtostrfd(Energy.current[i], Settings.flag2.current_resolution, current_chr[i]);
-    dtostrfd(Energy.active_power[i], Settings.flag2.wattage_resolution, active_power_chr[i]);
-  }
-
-  char energy_daily_chr[FLOATSZ];
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, energy_daily_chr);
-  char energy_yesterday_chr[FLOATSZ];
-  dtostrfd((float)Settings.energy_kWhyesterday / 100000, Settings.flag2.energy_resolution, energy_yesterday_chr);
-
-  char energy_total_chr[3][FLOATSZ];
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, energy_total_chr[0]);
-  char export_active_chr[3][FLOATSZ];
-  dtostrfd(Energy.export_active, Settings.flag2.energy_resolution, export_active_chr[0]);
-  uint8_t energy_total_fields = 1;
-
-  if (Settings.tariff[0][0] != Settings.tariff[1][0]) {
-    dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[1]);
-    dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100000, Settings.flag2.energy_resolution, energy_total_chr[2]);
-    dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[1]);
-    dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100000, Settings.flag2.energy_resolution, export_active_chr[2]);
-    energy_total_fields = 3;
-  }
-
-  char value_chr[FLOATSZ *3];
-  char value2_chr[FLOATSZ *3];
-  char value3_chr[FLOATSZ *3];
-
-  if (json) {
-    bool show_energy_period = (0 == tele_period);
-
-    ResponseAppend_P(PSTR(",\"" D_RSLT_ENERGY "\":{\"" D_JSON_TOTAL_START_TIME "\":\"%s\",\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s"),
-      GetDateAndTime(DT_ENERGY).c_str(),
-      EnergyFormatIndex(value_chr, energy_total_chr[0], json, energy_total_fields),
-      energy_yesterday_chr,
-      energy_daily_chr);
-
-    if (!isnan(Energy.export_active)) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_EXPORT_ACTIVE "\":%s"),
-        EnergyFormatIndex(value_chr, export_active_chr[0], json, energy_total_fields));
-    }
-
-    if (show_energy_period) {
-      float energy = 0;
-      if (Energy.period) {
-        energy = (float)(RtcSettings.energy_kWhtoday - Energy.period) / 100;
-      }
-      Energy.period = RtcSettings.energy_kWhtoday;
-      char energy_period_chr[FLOATSZ];
-      dtostrfd(energy, Settings.flag2.wattage_resolution, energy_period_chr);
-      ResponseAppend_P(PSTR(",\"" D_JSON_PERIOD "\":%s"), energy_period_chr);
-    }
-    ResponseAppend_P(PSTR(",\"" D_JSON_POWERUSAGE "\":%s"),
-      EnergyFormat(value_chr, active_power_chr[0], json));
-    if (!Energy.type_dc) {
-      if (Energy.current_available && Energy.voltage_available) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_APPARENT_POWERUSAGE "\":%s,\"" D_JSON_REACTIVE_POWERUSAGE "\":%s,\"" D_JSON_POWERFACTOR "\":%s"),
-          EnergyFormat(value_chr, apparent_power_chr[0], json),
-          EnergyFormat(value2_chr, reactive_power_chr[0], json),
-          EnergyFormat(value3_chr, power_factor_chr[0], json));
-      }
-      if (!isnan(Energy.frequency[0])) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_FREQUENCY "\":%s"),
-          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
-      }
-    }
-    if (Energy.voltage_available) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_VOLTAGE "\":%s"),
-        EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
-    }
-    if (Energy.current_available) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_CURRENT "\":%s"),
-        EnergyFormat(value_chr, current_chr[0], json));
-    }
-    XnrgCall(FUNC_JSON_APPEND);
-    ResponseJsonEnd();
-
-#ifdef USE_DOMOTICZ
-    if (show_energy_period) {
-      dtostrfd(Energy.total * 1000, 1, energy_total_chr[0]);
-      DomoticzSensorPowerEnergy((int)Energy.active_power[0], energy_total_chr[0]);
-
-      dtostrfd((float)RtcSettings.energy_usage.usage1_kWhtotal / 100, 1, energy_total_chr[1]);
-      dtostrfd((float)RtcSettings.energy_usage.usage2_kWhtotal / 100, 1, energy_total_chr[2]);
-      dtostrfd((float)RtcSettings.energy_usage.return1_kWhtotal / 100, 1, export_active_chr[1]);
-      dtostrfd((float)RtcSettings.energy_usage.return2_kWhtotal / 100, 1, export_active_chr[2]);
-      DomoticzSensorP1SmartMeter(energy_total_chr[1], energy_total_chr[2], export_active_chr[1], export_active_chr[2], (int)Energy.active_power[0]);
-
-      if (Energy.voltage_available) {
-        DomoticzSensor(DZ_VOLTAGE, voltage_chr[0]);
-      }
-      if (Energy.current_available) {
-        DomoticzSensor(DZ_CURRENT, current_chr[0]);
-      }
-    }
-#endif
-#ifdef USE_KNX
-    if (show_energy_period) {
-      if (Energy.voltage_available) {
-        KnxSensor(KNX_ENERGY_VOLTAGE, Energy.voltage[0]);
-      }
-      if (Energy.current_available) {
-        KnxSensor(KNX_ENERGY_CURRENT, Energy.current[0]);
-      }
-      KnxSensor(KNX_ENERGY_POWER, Energy.active_power[0]);
-      if (!Energy.type_dc) {
-        KnxSensor(KNX_ENERGY_POWERFACTOR, power_factor_knx);
-      }
-      KnxSensor(KNX_ENERGY_DAILY, Energy.daily);
-      KnxSensor(KNX_ENERGY_TOTAL, Energy.total);
-      KnxSensor(KNX_ENERGY_START, Energy.start_energy);
-    }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    if (Energy.voltage_available) {
-      WSContentSend_PD(HTTP_SNS_VOLTAGE, EnergyFormat(value_chr, voltage_chr[0], json, Energy.voltage_common));
-    }
-    if (Energy.current_available) {
-      WSContentSend_PD(HTTP_SNS_CURRENT, EnergyFormat(value_chr, current_chr[0], json));
-    }
-    WSContentSend_PD(HTTP_SNS_POWER, EnergyFormat(value_chr, active_power_chr[0], json));
-    if (!Energy.type_dc) {
-      if (Energy.current_available && Energy.voltage_available) {
-        WSContentSend_PD(HTTP_ENERGY_SNS1, EnergyFormat(value_chr, apparent_power_chr[0], json),
-                                           EnergyFormat(value2_chr, reactive_power_chr[0], json),
-                                           EnergyFormat(value3_chr, power_factor_chr[0], json));
-      }
-      if (!isnan(Energy.frequency[0])) {
-        WSContentSend_PD(PSTR("{s}" D_FREQUENCY "{m}%s " D_UNIT_HERTZ "{e}"),
-          EnergyFormat(value_chr, frequency_chr[0], json, Energy.voltage_common));
-      }
-    }
-    WSContentSend_PD(HTTP_ENERGY_SNS2, energy_daily_chr, energy_yesterday_chr, energy_total_chr[0]);
-    if (!isnan(Energy.export_active)) {
-      WSContentSend_PD(HTTP_ENERGY_SNS3, export_active_chr[0]);
-    }
-
-    XnrgCall(FUNC_WEB_SENSOR);
-#endif
-  }
-}
-
-
-
-
-
-bool Xdrv03(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_PRE_INIT == function) {
-    energy_flg = ENERGY_NONE;
-    XnrgCall(FUNC_PRE_INIT);
-  }
-  else if (energy_flg) {
-    switch (function) {
-      case FUNC_LOOP:
-        XnrgCall(FUNC_LOOP);
-        break;
-      case FUNC_EVERY_250_MSECOND:
-        XnrgCall(FUNC_EVERY_250_MSECOND);
-        break;
-      case FUNC_SERIAL:
-        result = XnrgCall(FUNC_SERIAL);
-        break;
-#ifdef USE_ENERGY_MARGIN_DETECTION
-      case FUNC_SET_POWER:
-        Energy.power_steady_counter = 2;
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kEnergyCommands, EnergyCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-bool Xsns03(uint8_t function)
-{
-  bool result = false;
-
-  if (energy_flg) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        EnergyEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        EnergyShow(true);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        EnergyShow(false);
-        break;
-#endif
-      case FUNC_SAVE_BEFORE_RESTART:
-        EnergySaveState();
-        break;
-      case FUNC_INIT:
-        EnergySnsInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-#ifdef USE_LIGHT
-# 124 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-#define XDRV_04 4
-
-
-enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX };
-
-const uint8_t LIGHT_COLOR_SIZE = 25;
-
-const char kLightCommands[] PROGMEM = "|"
-  D_CMND_COLOR "|" D_CMND_COLORTEMPERATURE "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_LEDTABLE "|" D_CMND_FADE "|"
-  D_CMND_RGBWWTABLE "|" D_CMND_SCHEME "|" D_CMND_SPEED "|" D_CMND_WAKEUP "|" D_CMND_WAKEUPDURATION "|"
-  D_CMND_WHITE "|" D_CMND_CHANNEL "|" D_CMND_HSBCOLOR "|UNDOCA" ;
-
-void (* const LightCommand[])(void) PROGMEM = {
-  &CmndColor, &CmndColorTemperature, &CmndDimmer, &CmndDimmerRange, &CmndLedTable, &CmndFade,
-  &CmndRgbwwTable, &CmndScheme, &CmndSpeed, &CmndWakeup, &CmndWakeupDuration,
-  &CmndWhite, &CmndChannel, &CmndHsbColor, &CmndUndocA };
-
-
-enum LightColorModes {
-  LCM_RGB = 1, LCM_CT = 2, LCM_BOTH = 3 };
-
-struct LRgbColor {
-  uint8_t R, G, B;
-};
-const uint8_t MAX_FIXED_COLOR = 12;
-const LRgbColor kFixedColor[MAX_FIXED_COLOR] PROGMEM =
-  { 255,0,0, 0,255,0, 0,0,255, 228,32,0, 0,228,32, 0,32,228, 188,64,0, 0,160,96, 160,32,240, 255,255,0, 255,0,170, 255,255,255 };
-
-struct LWColor {
-  uint8_t W;
-};
-const uint8_t MAX_FIXED_WHITE = 4;
-const LWColor kFixedWhite[MAX_FIXED_WHITE] PROGMEM = { 0, 255, 128, 32 };
-
-struct LCwColor {
-  uint8_t C, W;
-};
-const uint8_t MAX_FIXED_COLD_WARM = 4;
-const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
-
-
-const uint16_t CT_MIN = 153;
-const uint16_t CT_MAX = 500;
-
-const uint16_t CT_MIN_ALEXA = 200;
-const uint16_t CT_MAX_ALEXA = 380;
-
-
-
-
-
-
-typedef struct gamma_table_t {
-  uint16_t to_src;
-  uint16_t to_gamma;
-} gamma_table_t;
-
-const gamma_table_t gamma_table[] = {
-  { 1, 1 },
-  { 4, 1 },
-  { 209, 13 },
-  { 312, 41 },
-  { 457, 106 },
-  { 626, 261 },
-  { 762, 450 },
-  { 895, 703 },
-  { 1023, 1023 },
-  { 0xFFFF, 0xFFFF }
-};
-
-
-const gamma_table_t gamma_table_fast[] = {
-  { 384, 192 },
-  { 768, 576 },
-  { 1023, 1023 },
-  { 0xFFFF, 0xFFFF }
-};
-# 248 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-struct LIGHT {
-  uint32_t strip_timer_counter = 0;
-  power_t power = 0;
-
-  uint16_t wakeup_counter = 0;
-
-  uint8_t entry_color[LST_MAX];
-  uint8_t current_color[LST_MAX];
-  uint8_t new_color[LST_MAX];
-  uint8_t last_color[LST_MAX];
-  uint8_t color_remap[LST_MAX];
-
-  uint8_t wheel = 0;
-  uint8_t random = 0;
-  uint8_t subtype = 0;
-  uint8_t device = 0;
-  uint8_t old_power = 1;
-  uint8_t wakeup_active = 0;
-  uint8_t wakeup_dimmer = 0;
-  uint8_t fixed_color_index = 1;
-  uint8_t pwm_offset = 0;
-  uint8_t max_scheme = LS_MAX -1;
-
-  bool update = true;
-  bool pwm_multi_channels = false;
-
-  bool fade_initialized = false;
-  bool fade_running = false;
-  uint16_t fade_start_10[LST_MAX] = {0,0,0,0,0};
-  uint16_t fade_cur_10[LST_MAX];
-  uint16_t fade_end_10[LST_MAX];
-  uint16_t fade_duration = 0;
-  uint32_t fade_start = 0;
-} Light;
-
-power_t LightPower(void)
-{
-  return Light.power;
-}
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-power_t LightPowerIRAM(void) ICACHE_RAM_ATTR;
-#endif
-
-power_t LightPowerIRAM(void)
-{
-  return Light.power;
-}
-
-uint8_t LightDevice(void)
-{
-  return Light.device;
-}
-
-static uint32_t min3(uint32_t a, uint32_t b, uint32_t c) {
-  return (a < b && a < c) ? a : (b < c) ? b : c;
-}
-# 344 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-class LightStateClass {
-  private:
-    uint16_t _hue = 0;
-    uint8_t _sat = 255;
-    uint8_t _briRGB = 255;
-
-    uint8_t _r = 255;
-    uint8_t _g = 255;
-    uint8_t _b = 255;
-
-    uint8_t _subtype = 0;
-    uint16_t _ct = CT_MIN;
-    uint8_t _wc = 255;
-    uint8_t _ww = 0;
-    uint8_t _briCT = 255;
-
-    uint8_t _color_mode = LCM_RGB;
-
-
-
-
-
-    uint16_t _ct_min_range = CT_MIN;
-    uint16_t _ct_max_range = CT_MAX;
-
-  public:
-    LightStateClass() {
-
-    }
-
-    void setSubType(uint8_t sub_type) {
-      _subtype = sub_type;
-    }
-# 386 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-    uint8_t setColorMode(uint8_t cm) {
-      uint8_t prev_cm = _color_mode;
-      if (cm < LCM_RGB) { cm = LCM_RGB; }
-      if (cm > LCM_BOTH) { cm = LCM_BOTH; }
-      uint8_t maxbri = (_briRGB >= _briCT) ? _briRGB : _briCT;
-
-      switch (_subtype) {
-        case LST_COLDWARM:
-          _color_mode = LCM_CT;
-          break;
-
-        case LST_NONE:
-        case LST_SINGLE:
-        case LST_RGB:
-        default:
-          _color_mode = LCM_RGB;
-          break;
-
-        case LST_RGBW:
-        case LST_RGBCW:
-          _color_mode = cm;
-          break;
-      }
-      if (LCM_RGB == _color_mode) {
-        _briCT = 0;
-        if (0 == _briRGB) { _briRGB = maxbri; }
-      }
-      if (LCM_CT == _color_mode) {
-        _briRGB = 0;
-        if (0 == _briCT) { _briCT = maxbri; }
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setColorMode prev_cm (%d) req_cm (%d) new_cm (%d)", prev_cm, cm, _color_mode);
-#endif
-      return prev_cm;
-    }
-
-    inline uint8_t getColorMode() {
-      return _color_mode;
-    }
-
-    void addRGBMode() {
-      setColorMode(_color_mode | LCM_RGB);
-    }
-    void addCTMode() {
-      setColorMode(_color_mode | LCM_CT);
-    }
-
-
-    void getRGB(uint8_t *r, uint8_t *g, uint8_t *b) {
-      if (r) { *r = _r; }
-      if (g) { *g = _g; }
-      if (b) { *b = _b; }
-    }
-
-
-
-    void getCW(uint8_t *rc, uint8_t *rw) {
-      if (rc) { *rc = _wc; }
-      if (rw) { *rw = _ww; }
-    }
-
-
-    void getActualRGBCW(uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *c, uint8_t *w) {
-      bool rgb_channels_on = _color_mode & LCM_RGB;
-      bool ct_channels_on = _color_mode & LCM_CT;
-
-      if (r) { *r = rgb_channels_on ? changeUIntScale(_r, 0, 255, 0, _briRGB) : 0; }
-      if (g) { *g = rgb_channels_on ? changeUIntScale(_g, 0, 255, 0, _briRGB) : 0; }
-      if (b) { *b = rgb_channels_on ? changeUIntScale(_b, 0, 255, 0, _briRGB) : 0; }
-
-      if (c) { *c = ct_channels_on ? changeUIntScale(_wc, 0, 255, 0, _briCT) : 0; }
-      if (w) { *w = ct_channels_on ? changeUIntScale(_ww, 0, 255, 0, _briCT) : 0; }
-    }
-
-    uint8_t getChannels(uint8_t *channels) {
-      getActualRGBCW(&channels[0], &channels[1], &channels[2], &channels[3], &channels[4]);
-    }
-
-    void getChannelsRaw(uint8_t *channels) {
-      channels[0] = _r;
-      channels[1] = _g;
-      channels[2] = _b;
-      channels[3] = _wc;
-      channels[4] = _ww;
-    }
-
-    void getHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
-      if (hue) { *hue = _hue; }
-      if (sat) { *sat = _sat; }
-      if (bri) { *bri = _briRGB; }
-    }
-
-
-    uint8_t getBri(void) {
-
-      return (_briRGB >= _briCT) ? _briRGB : _briCT;
-    }
-
-
-    inline uint8_t getBriCT() {
-      return _briCT;
-    }
-
-    static inline uint8_t DimmerToBri(uint8_t dimmer) {
-      return changeUIntScale(dimmer, 0, 100, 0, 255);
-    }
-    static uint8_t BriToDimmer(uint8_t bri) {
-      uint8_t dimmer = changeUIntScale(bri, 0, 255, 0, 100);
-
-      if ((dimmer == 0) && (bri > 0)) { dimmer = 1; }
-      return dimmer;
-    }
-
-    uint8_t getDimmer(uint32_t mode = 0) {
-      uint8_t bri;
-      switch (mode) {
-        case 1:
-          bri = getBriRGB();
-          break;
-        case 2:
-          bri = getBriCT();
-          break;
-        default:
-          bri = getBri();
-          break;
-      }
-      return BriToDimmer(bri);
-    }
-
-    inline uint16_t getCT() const {
-      return _ct;
-    }
-
-
-    uint16_t getCT10bits() const {
-      return changeUIntScale(_ct, _ct_min_range, _ct_max_range, 0, 1023);
-    }
-
-    inline void setCTRange(uint16_t ct_min_range, uint16_t ct_max_range) {
-      _ct_min_range = ct_min_range;
-      _ct_max_range = ct_max_range;
-    }
-
-    inline void getCTRange(uint16_t *ct_min_range, uint16_t *ct_max_range) const {
-      if (ct_min_range) { *ct_min_range = _ct_min_range; }
-      if (ct_max_range) { *ct_max_range = _ct_max_range; }
-    }
-
-
-    void getXY(float *x, float *y) {
-      RgbToXy(_r, _g, _b, x, y);
-    }
-
-
-
-    void setBri(uint8_t bri) {
-      setBriRGB(_color_mode & LCM_RGB ? bri : 0);
-      setBriCT(_color_mode & LCM_CT ? bri : 0);
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setBri RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-    }
-
-
-    uint8_t setBriRGB(uint8_t bri_rgb) {
-      uint8_t prev_bri = _briRGB;
-      _briRGB = bri_rgb;
-      if (bri_rgb > 0) { addRGBMode(); }
-      return prev_bri;
-    }
-
-
-    uint8_t setBriCT(uint8_t bri_ct) {
-      uint8_t prev_bri = _briCT;
-      _briCT = bri_ct;
-      if (bri_ct > 0) { addCTMode(); }
-      return prev_bri;
-    }
-
-    inline uint8_t getBriRGB() {
-      return _briRGB;
-    }
-
-    void setDimmer(uint8_t dimmer) {
-      setBri(DimmerToBri(dimmer));
-    }
-
-    void setCT(uint16_t ct) {
-      if (0 == ct) {
-
-        setColorMode(LCM_RGB);
-      } else {
-        ct = (ct < CT_MIN ? CT_MIN : (ct > CT_MAX ? CT_MAX : ct));
-        _ww = changeUIntScale(ct, _ct_min_range, _ct_max_range, 0, 255);
-        _wc = 255 - _ww;
-        _ct = ct;
-        addCTMode();
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCT RGB raw (%d %d %d) HS (%d %d) briRGB (%d) briCT (%d) CT (%d)", _r, _g, _b, _hue, _sat, _briRGB, _briCT, _ct);
-#endif
-    }
-# 604 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-    void setCW(uint8_t c, uint8_t w, bool free_range = false) {
-      uint16_t max = (w > c) ? w : c;
-      uint16_t sum = c + w;
-
-      if (0 == max) {
-        _briCT = 0;
-        setColorMode(LCM_RGB);
-      } else {
-        if (!free_range) {
-
-          _ww = changeUIntScale(w, 0, sum, 0, 255);
-          _wc = 255 - _ww;
-        } else {
-          _ww = changeUIntScale(w, 0, max, 0, 255);
-          _wc = changeUIntScale(c, 0, max, 0, 255);
-        }
-        _ct = changeUIntScale(w, 0, sum, _ct_min_range, _ct_max_range);
-        addCTMode();
-        if (_color_mode & LCM_CT) { _briCT = free_range ? max : (sum > 255 ? 255 : sum); }
-      }
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setCW CW (%d %d) CT (%d) briCT (%d)", c, w, _ct, _briCT);
-#endif
-    }
-
-
-    uint8_t setRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
-      uint16_t hue;
-      uint8_t sat;
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB input (%d %d %d)", r, g, b);
-#endif
-
-      uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
-
-      if (0 == max) {
-        r = g = b = 255;
-        setColorMode(LCM_CT);
-      } else {
-        if (255 > max) {
-
-          r = changeUIntScale(r, 0, max, 0, 255);
-          g = changeUIntScale(g, 0, max, 0, 255);
-          b = changeUIntScale(b, 0, max, 0, 255);
-        }
-        addRGBMode();
-      }
-      if (!keep_bri) {
-        _briRGB = (_color_mode & LCM_RGB) ? max : 0;
-      }
-
-      RgbToHsb(r, g, b, &hue, &sat, nullptr);
-      _r = r;
-      _g = g;
-      _b = b;
-      _hue = hue;
-      _sat = sat;
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setRGB RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-      return max;
-    }
-
-    void setHS(uint16_t hue, uint8_t sat) {
-      uint8_t r, g, b;
-      HsToRgb(hue, sat, &r, &g, &b);
-      _r = r;
-      _g = g;
-      _b = b;
-      _hue = hue;
-      _sat = sat;
-      addRGBMode();
-#ifdef DEBUG_LIGHT
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS HS (%d %d) rgb (%d %d %d)", hue, sat, r, g, b);
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setHS RGB raw (%d %d %d) HS (%d %d) bri (%d)", _r, _g, _b, _hue, _sat, _briRGB);
-#endif
-  }
-
-
-
-  void setChannelsRaw(uint8_t *channels) {
-    _r = channels[0];
-    _g = channels[1];
-    _b = channels[2];
-    _wc = channels[3];
-    _ww = channels[4];
-}
-
-
-
-
-  void setChannels(uint8_t *channels) {
-    setRGB(channels[0], channels[1], channels[2]);
-    setCW(channels[3], channels[4], true);
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels (%d %d %d %d %d)",
-      channels[0], channels[1], channels[2], channels[3], channels[4]);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightStateClass::setChannels CT (%d) briRGB (%d) briCT (%d)", _ct, _briRGB, _briCT);
-#endif
-  }
-
-
-    static void RgbToHsb(uint8_t r, uint8_t g, uint8_t b, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri);
-    static void HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b);
-    static void RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y);
-    static void XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb);
-
-};
-# 720 "S:/Development/Tasmota/tasmota/xdrv_04_light.ino"
-void LightStateClass::RgbToHsb(uint8_t ir, uint8_t ig, uint8_t ib, uint16_t *r_hue, uint8_t *r_sat, uint8_t *r_bri) {
-  uint32_t r = ir;
-  uint32_t g = ig;
-  uint32_t b = ib;
-  uint32_t max = (r > g && r > b) ? r : (g > b) ? g : b;
-  uint32_t min = (r < g && r < b) ? r : (g < b) ? g : b;
-  uint32_t d = max - min;
-
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = max;
-
-  if (d != 0) {
-    sat = changeUIntScale(d, 0, max, 0, 255);
-    if (r == max) {
-      hue = (g > b) ? changeUIntScale(g-b,0,d,0,60) : 360 - changeUIntScale(b-g,0,d,0,60);
-    } else if (g == max) {
-      hue = (b > r) ? 120 + changeUIntScale(b-r,0,d,0,60) : 120 - changeUIntScale(r-b,0,d,0,60);
-    } else {
-      hue = (r > g) ? 240 + changeUIntScale(r-g,0,d,0,60) : 240 - changeUIntScale(g-r,0,d,0,60);
-    }
-    hue = hue % 360;
-  }
-
-  if (r_hue) *r_hue = hue;
-  if (r_sat) *r_sat = sat;
-  if (r_bri) *r_bri = bri;
-
-}
-
-void LightStateClass::HsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
-  uint32_t r = 255;
-  uint32_t g = 255;
-  uint32_t b = 255;
-
-  hue = hue % 360;
-
-  if (sat > 0) {
-    uint32_t i = hue / 60;
-    uint32_t f = hue % 60;
-    uint32_t q = 255 - changeUIntScale(f, 0, 60, 0, sat);
-    uint32_t p = 255 - sat;
-    uint32_t t = 255 - changeUIntScale(60 - f, 0, 60, 0, sat);
-
-    switch (i) {
-      case 0:
-
-        g = t;
-        b = p;
-        break;
-      case 1:
-        r = q;
-
-        b = p;
-        break;
-      case 2:
-        r = p;
-
-        b = t;
-        break;
-      case 3:
-        r = p;
-        g = q;
-
-        break;
-      case 4:
-        r = t;
-        g = p;
-
-        break;
-      default:
-
-        g = p;
-        b = q;
-        break;
-      }
-    }
-  if (r_r) *r_r = r;
-  if (r_g) *r_g = g;
-  if (r_b) *r_b = b;
-}
-
-#define POW FastPrecisePowf
-
-void LightStateClass::RgbToXy(uint8_t i_r, uint8_t i_g, uint8_t i_b, float *r_x, float *r_y) {
-  float x = 0.31271f;
-  float y = 0.32902f;
-
-  if (i_r + i_b + i_g > 0) {
-    float r = (float)i_r / 255.0f;
-    float g = (float)i_g / 255.0f;
-    float b = (float)i_b / 255.0f;
-
-
-    r = (r > 0.04045f) ? POW((r + 0.055f) / (1.0f + 0.055f), 2.4f) : (r / 12.92f);
-    g = (g > 0.04045f) ? POW((g + 0.055f) / (1.0f + 0.055f), 2.4f) : (g / 12.92f);
-    b = (b > 0.04045f) ? POW((b + 0.055f) / (1.0f + 0.055f), 2.4f) : (b / 12.92f);
-
-
-
-    float X = r * 0.649926f + g * 0.103455f + b * 0.197109f;
-    float Y = r * 0.234327f + g * 0.743075f + b * 0.022598f;
-    float Z = r * 0.000000f + g * 0.053077f + b * 1.035763f;
-
-    x = X / (X + Y + Z);
-    y = Y / (X + Y + Z);
-
-  }
-  if (r_x) *r_x = x;
-  if (r_y) *r_y = y;
-}
-
-void LightStateClass::XyToRgb(float x, float y, uint8_t *rr, uint8_t *rg, uint8_t *rb)
-{
-  x = (x > 0.99f ? 0.99f : (x < 0.01f ? 0.01f : x));
-  y = (y > 0.99f ? 0.99f : (y < 0.01f ? 0.01f : y));
-  float z = 1.0f - x - y;
-
-  float X = x / y;
-  float Z = z / y;
-
-
-
-  float r = X * 3.2406f - 1.5372f - Z * 0.4986f;
-  float g = -X * 0.9689f + 1.8758f + Z * 0.0415f;
-  float b = X * 0.0557f - 0.2040f + Z * 1.0570f;
-  float max = (r > g && r > b) ? r : (g > b) ? g : b;
-  r = r / max;
-  g = g / max;
-  b = b / max;
-  r = (r <= 0.0031308f) ? 12.92f * r : 1.055f * POW(r, (1.0f / 2.4f)) - 0.055f;
-  g = (g <= 0.0031308f) ? 12.92f * g : 1.055f * POW(g, (1.0f / 2.4f)) - 0.055f;
-  b = (b <= 0.0031308f) ? 12.92f * b : 1.055f * POW(b, (1.0f / 2.4f)) - 0.055f;
-
-
-
-
-
-  int32_t ir = r * 255.0f + 0.5f;
-  int32_t ig = g * 255.0f + 0.5f;
-  int32_t ib = b * 255.0f + 0.5f;
-  if (rr) { *rr = (ir > 255 ? 255: (ir < 0 ? 0 : ir)); }
-  if (rg) { *rg = (ig > 255 ? 255: (ig < 0 ? 0 : ig)); }
-  if (rb) { *rb = (ib > 255 ? 255: (ib < 0 ? 0 : ib)); }
-}
-
-class LightControllerClass {
-private:
-  LightStateClass *_state;
-
-
-  bool _ct_rgb_linked = true;
-  bool _pwm_multi_channels = false;
-
-public:
-  LightControllerClass(LightStateClass& state) {
-    _state = &state;
-  }
-
-  void setSubType(uint8_t sub_type) {
-    _state->setSubType(sub_type);
-  }
-
-  inline bool setCTRGBLinked(bool ct_rgb_linked) {
-    bool prev = _ct_rgb_linked;
-    if (_pwm_multi_channels) {
-      _ct_rgb_linked = false;
-    } else {
-      _ct_rgb_linked = ct_rgb_linked;
-    }
-    return prev;
-  }
-
-  void setAlexaCTRange(bool alexa_ct_range) {
-
-    if (alexa_ct_range) {
-      _state->setCTRange(CT_MIN_ALEXA, CT_MAX_ALEXA);
-    } else {
-      _state->setCTRange(CT_MIN, CT_MAX);
-    }
-  }
-
-  inline bool isCTRGBLinked() {
-    return _ct_rgb_linked;
-  }
-
-  inline bool setPWMMultiChannel(bool pwm_multi_channels) {
-    bool prev = _pwm_multi_channels;
-    _pwm_multi_channels = pwm_multi_channels;
-    if (pwm_multi_channels) setCTRGBLinked(false);
-    return prev;
-  }
-
-  inline bool isPWMMultiChannel(void) {
-    return _pwm_multi_channels;
-  }
-
-#ifdef DEBUG_LIGHT
-  void debugLogs() {
-    uint8_t r,g,b,c,w;
-    _state->getActualRGBCW(&r,&g,&b,&c,&w);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs rgb (%d %d %d) cw (%d %d)",
-      r, g, b, c, w);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::debugLogs lightCurrent (%d %d %d %d %d)",
-      Light.current_color[0], Light.current_color[1], Light.current_color[2],
-      Light.current_color[3], Light.current_color[4]);
-  }
-#endif
-
-  void loadSettings() {
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings Settings.light_color (%d %d %d %d %d - %d)",
-      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
-      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::loadSettings light_type/sub (%d %d)",
-      light_type, Light.subtype);
-#endif
-    if (_pwm_multi_channels) {
-      _state->setChannelsRaw(Settings.light_color);
-    } else {
-
-      _state->setCW(Settings.light_color[3], Settings.light_color[4], true);
-      _state->setRGB(Settings.light_color[0], Settings.light_color[1], Settings.light_color[2]);
-
-
-
-      uint8_t bri = _state->DimmerToBri(Settings.light_dimmer);
-      if (Settings.light_color[0] + Settings.light_color[1] + Settings.light_color[2] > 0) {
-
-
-        if ( (DEFAULT_LIGHT_COMPONENT == Settings.light_color[0]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[1]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[2]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[3]) &&
-             (DEFAULT_LIGHT_COMPONENT == Settings.light_color[4]) &&
-             (DEFAULT_LIGHT_DIMMER == Settings.light_dimmer) ) {
-          _state->setColorMode(LCM_RGB);
-        }
-        _state->setBriRGB(bri);
-      } else {
-        _state->setBriCT(bri);
-      }
-    }
-  }
-
-  void changeCTB(uint16_t new_ct, uint8_t briCT) {
-
-
-
-
-
-
-    if ((LST_COLDWARM != Light.subtype) && (LST_RGBW > Light.subtype)) {
-      return;
-    }
-    _state->setCT(new_ct);
-    _state->setBriCT(briCT);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
-    saveSettings();
-    calcLevels();
-
-  }
-
-  void changeDimmer(uint8_t dimmer, uint32_t mode = 0) {
-    uint8_t bri = changeUIntScale(dimmer, 0, 100, 0, 255);
-    switch (mode) {
-      case 1:
-        changeBriRGB(bri);
-        if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-        break;
-      case 2:
-        changeBriCT(bri);
-        if (_ct_rgb_linked) { _state->setColorMode(LCM_CT); }
-        break;
-      default:
-        changeBri(bri);
-        break;
-    }
-  }
-
-  void changeBri(uint8_t bri) {
-    _state->setBri(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeBriRGB(uint8_t bri) {
-    _state->setBriRGB(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeBriCT(uint8_t bri) {
-    _state->setBriCT(bri);
-    saveSettings();
-    calcLevels();
-  }
-
-  void changeRGB(uint8_t r, uint8_t g, uint8_t b, bool keep_bri = false) {
-    _state->setRGB(r, g, b, keep_bri);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-    saveSettings();
-    calcLevels();
-  }
-
-
-
-  void calcLevels(uint8_t *current_color = nullptr) {
-    uint8_t r,g,b,c,w,briRGB,briCT;
-    if (current_color == nullptr) { current_color = Light.current_color; }
-
-    if (_pwm_multi_channels) {
-      _state->getChannelsRaw(current_color);
-      return;
-    }
-
-    _state->getActualRGBCW(&r,&g,&b,&c,&w);
-    briRGB = _state->getBriRGB();
-    briCT = _state->getBriCT();
-
-    current_color[0] = current_color[1] = current_color[2] = 0;
-    current_color[3] = current_color[4] = 0;
-    switch (Light.subtype) {
-      case LST_NONE:
-        current_color[0] = 255;
-        break;
-      case LST_SINGLE:
-        current_color[0] = briRGB;
-        break;
-      case LST_COLDWARM:
-        current_color[0] = c;
-        current_color[1] = w;
-        break;
-      case LST_RGBW:
-      case LST_RGBCW:
-        if (LST_RGBCW == Light.subtype) {
-          current_color[3] = c;
-          current_color[4] = w;
-        } else {
-          current_color[3] = briCT;
-        }
-
-      case LST_RGB:
-        current_color[0] = r;
-        current_color[1] = g;
-        current_color[2] = b;
-        break;
-    }
-  }
-
-  void changeHSB(uint16_t hue, uint8_t sat, uint8_t briRGB) {
-    _state->setHS(hue, sat);
-    _state->setBriRGB(briRGB);
-    if (_ct_rgb_linked) { _state->setColorMode(LCM_RGB); }
-    saveSettings();
-    calcLevels();
-  }
-
-
-  void saveSettings() {
-    if (Light.pwm_multi_channels) {
-
-      _state->getChannelsRaw(Settings.light_color);
-      Settings.light_dimmer = 100;
-    } else {
-      uint8_t cm = _state->getColorMode();
-
-      memset(&Settings.light_color[0], 0, sizeof(Settings.light_color));
-      if (LCM_RGB & cm) {
-        _state->getRGB(&Settings.light_color[0], &Settings.light_color[1], &Settings.light_color[2]);
-        Settings.light_dimmer = _state->BriToDimmer(_state->getBriRGB());
-
-        if (LCM_BOTH == cm) {
-
-          _state->getActualRGBCW(nullptr, nullptr, nullptr, &Settings.light_color[3], &Settings.light_color[4]);
-        }
-      } else if (LCM_CT == cm) {
-        _state->getCW(&Settings.light_color[3], &Settings.light_color[4]);
-        Settings.light_dimmer = _state->BriToDimmer(_state->getBriCT());
-      }
-    }
-#ifdef DEBUG_LIGHT
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightControllerClass::saveSettings Settings.light_color (%d %d %d %d %d - %d)",
-      Settings.light_color[0], Settings.light_color[1], Settings.light_color[2],
-      Settings.light_color[3], Settings.light_color[4], Settings.light_dimmer);
-#endif
-  }
-
-
-
-
-  void changeChannels(uint8_t *channels) {
-    if (Light.pwm_multi_channels) {
-      _state->setChannelsRaw(channels);
-    } else if (LST_COLDWARM == Light.subtype) {
-
-      uint8_t remapped_channels[5] = {0,0,0,channels[0],channels[1]};
-      _state->setChannels(remapped_channels);
-    } else {
-      _state->setChannels(channels);
-    }
-
-    saveSettings();
-    calcLevels();
-  }
-};
-
-
-
-LightStateClass light_state = LightStateClass();
-LightControllerClass light_controller = LightControllerClass(light_state);
-
-
-
-
-
-uint16_t change8to10(uint8_t v) {
-  return changeUIntScale(v, 0, 255, 0, 1023);
-}
-
-uint8_t change10to8(uint16_t v) {
-  return (0 == v) ? 0 : changeUIntScale(v, 4, 1023, 1, 255);
-}
-
-
-
-
-
-uint16_t ledGamma_internal(uint16_t v, const struct gamma_table_t *gt_ptr) {
-  uint16_t from_src = 0;
-  uint16_t from_gamma = 0;
-
-  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
-    uint16_t to_src = gt->to_src;
-    uint16_t to_gamma = gt->to_gamma;
-    if (v <= to_src) {
-      return changeUIntScale(v, from_src, to_src, from_gamma, to_gamma);
-    }
-    from_src = to_src;
-    from_gamma = to_gamma;
-  }
-}
-
-uint16_t ledGammaReverse_internal(uint16_t vg, const struct gamma_table_t *gt_ptr) {
-  uint16_t from_src = 0;
-  uint16_t from_gamma = 0;
-
-  for (const gamma_table_t *gt = gt_ptr; ; gt++) {
-    uint16_t to_src = gt->to_src;
-    uint16_t to_gamma = gt->to_gamma;
-    if (vg <= to_gamma) {
-      return changeUIntScale(vg, from_gamma, to_gamma, from_src, to_src);
-    }
-    from_src = to_src;
-    from_gamma = to_gamma;
-  }
-}
-
-
-uint16_t ledGamma10_10(uint16_t v) {
-  return ledGamma_internal(v, gamma_table);
-}
-
-uint16_t ledGamma10(uint8_t v) {
-  return ledGamma10_10(change8to10(v));
-}
-
-
-uint8_t ledGamma(uint8_t v) {
-  return change10to8(ledGamma10(v));
-}
-
-
-
-void LightPwmOffset(uint32_t offset)
-{
-  Light.pwm_offset = offset;
-}
-
-bool LightModuleInit(void)
-{
-  light_type = LT_BASIC;
-
-  if (Settings.flag.pwm_control) {
-    for (uint32_t i = 0; i < MAX_PWMS; i++) {
-      if (pin[GPIO_PWM1 +i] < 99) { light_type++; }
-    }
-  }
-
-  light_flg = 0;
-  if (XlgtCall(FUNC_MODULE_INIT)) {
-
-  }
-  else if (SONOFF_BN == my_module_type) {
-    light_type = LT_PWM1;
-  }
-  else if (SONOFF_LED == my_module_type) {
-    if (!my_module.io[4]) {
-      pinMode(4, OUTPUT);
-      digitalWrite(4, LOW);
-    }
-    if (!my_module.io[5]) {
-      pinMode(5, OUTPUT);
-      digitalWrite(5, LOW);
-    }
-    if (!my_module.io[14]) {
-      pinMode(14, OUTPUT);
-      digitalWrite(14, LOW);
-    }
-    light_type = LT_PWM2;
-  }
-
-  if (light_type > LT_BASIC) {
-    devices_present++;
-  }
-
-
-  if (Settings.flag3.pwm_multi_channels) {
-    uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-    if (0 == pwm_channels) { pwm_channels = 1; }
-    devices_present += pwm_channels - 1;
-  } else if ((Settings.param[P_RGB_REMAP] & 128) && (LST_RGBW <= (light_type & 7))) {
-
-    devices_present++;
-  }
-
-  return (light_type > LT_BASIC);
-}
-
-void LightInit(void)
-{
-  Light.device = devices_present;
-  Light.subtype = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-  Light.pwm_multi_channels = Settings.flag3.pwm_multi_channels;
-
-  if (LST_RGBW <= Light.subtype) {
-
-
-    bool ct_rgb_linked = !(Settings.param[P_RGB_REMAP] & 128);
-    light_controller.setCTRGBLinked(ct_rgb_linked);
-  }
-
-  if ((LST_SINGLE <= Light.subtype) && Light.pwm_multi_channels) {
-
-    light_controller.setPWMMultiChannel(true);
-    Light.device = devices_present - Light.subtype + 1;
-  } else if (!light_controller.isCTRGBLinked()) {
-
-    Light.device--;
-  }
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightInit Light.pwm_multi_channels=%d Light.subtype=%d Light.device=%d devices_present=%d",
-    Light.pwm_multi_channels, Light.subtype, Light.device, devices_present);
-#endif
-
-  light_controller.setSubType(Light.subtype);
-  light_controller.loadSettings();
-  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
-
-  if (LST_SINGLE == Light.subtype) {
-    Settings.light_color[0] = 255;
-  }
-  if (light_type < LT_PWM6) {
-    for (uint32_t i = 0; i < light_type; i++) {
-      Settings.pwm_value[i] = 0;
-      if (pin[GPIO_PWM1 +i] < 99) {
-        pinMode(pin[GPIO_PWM1 +i], OUTPUT);
-      }
-    }
-    if (pin[GPIO_ARIRFRCV] < 99) {
-      if (pin[GPIO_ARIRFSEL] < 99) {
-        pinMode(pin[GPIO_ARIRFSEL], OUTPUT);
-        digitalWrite(pin[GPIO_ARIRFSEL], 1);
-      }
-    }
-  }
-
-  uint32_t max_scheme = Light.max_scheme;
-  if (Light.subtype < LST_RGB) {
-    max_scheme = LS_POWER;
-  }
-  if ((LS_WAKEUP == Settings.light_scheme) || (Settings.light_scheme > max_scheme)) {
-    Settings.light_scheme = LS_POWER;
-  }
-  Light.power = 0;
-  Light.update = true;
-  Light.wakeup_active = 0;
-
-  LightUpdateColorMapping();
-}
-
-void LightUpdateColorMapping(void)
-{
-  uint8_t param = Settings.param[P_RGB_REMAP] & 127;
-  if (param > 119){ param = 0; }
-
-  uint8_t tmp[] = {0,1,2,3,4};
-  Light.color_remap[0] = tmp[param / 24];
-  for (uint32_t i = param / 24; i<4; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 24;
-  Light.color_remap[1] = tmp[(param / 6)];
-  for (uint32_t i = param / 6; i<3; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 6;
-  Light.color_remap[2] = tmp[(param / 2)];
-  for (uint32_t i = param / 2; i<2; ++i){
-    tmp[i] = tmp[i+1];
-  }
-  param = param % 2;
-  Light.color_remap[3] = tmp[param];
-  Light.color_remap[4] = tmp[1-param];
-
-  Light.update = true;
-
-}
-
-uint8_t LightGetDimmer(uint8_t dimmer) {
-  return light_state.getDimmer(dimmer);
-}
-
-void LightSetDimmer(uint8_t dimmer) {
-  light_controller.changeDimmer(dimmer);
-}
-
-void LightGetHSB(uint16_t *hue, uint8_t *sat, uint8_t *bri) {
-  light_state.getHSB(hue, sat, bri);
-}
-
-void LightHsToRgb(uint16_t hue, uint8_t sat, uint8_t *r_r, uint8_t *r_g, uint8_t *r_b) {
-  light_state.HsToRgb(hue, sat, r_r, r_g, r_b);
-}
-
-
-uint8_t LightGetBri(uint8_t device) {
-  uint8_t bri = 254;
-  if (Light.pwm_multi_channels) {
-    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
-      bri = Light.current_color[device - Light.device];
-    }
-  } else if (light_controller.isCTRGBLinked()) {
-    if (device == Light.device) {
-      bri = light_state.getBri();
-    }
-  } else {
-    if (device == Light.device) {
-      bri = light_state.getBriRGB();
-    } else if (device == Light.device + 1) {
-      bri = light_state.getBriCT();
-    }
-  }
-  return bri;
-}
-
-
-void LightSetBri(uint8_t device, uint8_t bri) {
-  if (Light.pwm_multi_channels) {
-    if ((device >= Light.device) && (device < Light.device + LST_MAX) && (device <= devices_present)) {
-      Light.current_color[device - Light.device] = bri;
-      light_controller.changeChannels(Light.current_color);
-    }
-  } else if (light_controller.isCTRGBLinked()) {
-    if (device == Light.device) {
-      light_controller.changeBri(bri);
-    }
-  } else {
-    if (device == Light.device) {
-      light_controller.changeBriRGB(bri);
-    } else if (device == Light.device + 1) {
-      light_controller.changeBriCT(bri);
-    }
-  }
-}
-
-void LightSetColorTemp(uint16_t ct)
-{
-
-
-
-
-
-
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
-    return;
-  }
-  light_controller.changeCTB(ct, light_state.getBriCT());
-}
-
-uint16_t LightGetColorTemp(void)
-{
-
-  if ((LST_COLDWARM != Light.subtype) && (LST_RGBCW != Light.subtype)) {
-    return 0;
-  }
-  return (light_state.getColorMode() & LCM_CT) ? light_state.getCT() : 0;
-}
-
-void LightSetSignal(uint16_t lo, uint16_t hi, uint16_t value)
-{
-
-
-
-  if (Settings.flag.light_signal) {
-    uint16_t signal = changeUIntScale(value, lo, hi, 0, 255);
-
-    light_controller.changeRGB(signal, 255 - signal, 0, true);
-    Settings.light_scheme = 0;
-    if (0 == light_state.getBri()) {
-      light_controller.changeBri(50);
-    }
-  }
-}
-
-
-char* LightGetColor(char* scolor, boolean force_hex = false)
-{
-  light_controller.calcLevels();
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < Light.subtype; i++) {
-    if (!force_hex && Settings.flag.decimal_text) {
-      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Light.current_color[i]);
-    } else {
-      snprintf_P(scolor, LIGHT_COLOR_SIZE, PSTR("%s%02X"), scolor, Light.current_color[i]);
-    }
-  }
-  return scolor;
-}
-
-void LightPowerOn(void)
-{
-  if (light_state.getBri() && !(Light.power)) {
-    ExecuteCommandPower(Light.device, POWER_ON, SRC_LIGHT);
-  }
-}
-
-void LightState(uint8_t append)
-{
-  char scolor[LIGHT_COLOR_SIZE];
-  char scommand[33];
-  bool unlinked = !light_controller.isCTRGBLinked() && (Light.subtype >= LST_RGBW);
-
-  if (append) {
-    ResponseAppend_P(PSTR(","));
-  } else {
-    Response_P(PSTR("{"));
-  }
-  if (!Light.pwm_multi_channels) {
-    if (unlinked) {
-
-      ResponseAppend_P(PSTR("\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"
-                           ",\"" D_RSLT_POWER "%d\":\"%s\",\"" D_CMND_DIMMER "%d\":%d"),
-                            Light.device, GetStateText(Light.power & 1), Light.device, light_state.getDimmer(1),
-                            Light.device + 1, GetStateText(Light.power & 2 ? 1 : 0), Light.device + 1, light_state.getDimmer(2));
-    } else {
-      GetPowerDevice(scommand, Light.device, sizeof(scommand), Settings.flag.device_index_enable);
-      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_DIMMER "\":%d"), scommand, GetStateText(Light.power & 1),
-                      light_state.getDimmer());
-    }
-
-
-    if (Light.subtype > LST_SINGLE) {
-      ResponseAppend_P(PSTR(",\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
-      if (LST_RGB <= Light.subtype) {
-        uint16_t hue;
-        uint8_t sat, bri;
-        light_state.getHSB(&hue, &sat, &bri);
-        sat = changeUIntScale(sat, 0, 255, 0, 100);
-        bri = changeUIntScale(bri, 0, 255, 0, 100);
-
-        ResponseAppend_P(PSTR(",\"" D_CMND_HSBCOLOR "\":\"%d,%d,%d\""), hue,sat,bri);
-      }
-
-      if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_WHITE "\":%d"), light_state.getDimmer(2));
-      }
-
-      if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_COLORTEMPERATURE "\":%d"), light_state.getCT());
-      }
-
-      ResponseAppend_P(PSTR(",\"" D_CMND_CHANNEL "\":[" ));
-      for (uint32_t i = 0; i < Light.subtype; i++) {
-        uint8_t channel_raw = Light.current_color[i];
-        uint8_t channel = changeUIntScale(channel_raw,0,255,0,100);
-
-        if ((0 == channel) && (channel_raw > 0)) { channel = 1; }
-        ResponseAppend_P(PSTR("%s%d" ), (i > 0 ? "," : ""), channel);
-      }
-      ResponseAppend_P(PSTR("]"));
-    }
-
-    if (append) {
-      if (Light.subtype >= LST_RGB) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_SCHEME "\":%d"), Settings.light_scheme);
-      }
-      if (Light.max_scheme > LS_MAX) {
-        ResponseAppend_P(PSTR(",\"" D_CMND_WIDTH "\":%d"), Settings.light_width);
-      }
-      ResponseAppend_P(PSTR(",\"" D_CMND_FADE "\":\"%s\",\"" D_CMND_SPEED "\":%d,\"" D_CMND_LEDTABLE "\":\"%s\""),
-        GetStateText(Settings.light_fade), Settings.light_speed, GetStateText(Settings.light_correction));
-    }
-  } else {
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      GetPowerDevice(scommand, Light.device + i, sizeof(scommand), 1);
-      uint32_t light_power_masked = Light.power & (1 << i);
-      light_power_masked = light_power_masked ? 1 : 0;
-      ResponseAppend_P(PSTR("\"%s\":\"%s\",\"" D_CMND_CHANNEL "%d\":%d,"), scommand, GetStateText(light_power_masked), Light.device + i,
-        changeUIntScale(Light.current_color[i], 0, 255, 0, 100));
-    }
-    ResponseAppend_P(PSTR("\"" D_CMND_COLOR "\":\"%s\""), LightGetColor(scolor));
-  }
-
-  if (!append) {
-    ResponseJsonEnd();
-  }
-}
-
-void LightPreparePower(power_t channels = 0xFFFFFFFF) {
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower power=%d Light.power=%d", power, Light.power);
-#endif
-
-  if (Light.pwm_multi_channels) {
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      if (bitRead(channels, i)) {
-
-        if ((Light.current_color[i]) && (!bitRead(Light.power, i))) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device + i, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else {
-
-          if ((0 == Light.current_color[i]) && bitRead(Light.power, i)) {
-            ExecuteCommandPower(Light.device + i, POWER_OFF_NO_STATE, SRC_LIGHT);
-          }
-        }
-  #ifdef USE_DOMOTICZ
-        DomoticzUpdatePowerState(Light.device + i);
-  #endif
-      }
-    }
-  } else {
-    if (light_controller.isCTRGBLinked()) {
-      if (light_state.getBri() && !(Light.power)) {
-        if (!Settings.flag.not_power_linked) {
-          ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
-        }
-      } else if (!light_state.getBri() && Light.power) {
-        ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
-      }
-    } else {
-
-      if (channels & 1) {
-        if (light_state.getBriRGB() && !(Light.power & 1)) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else if (!light_state.getBriRGB() && (Light.power & 1)) {
-          ExecuteCommandPower(Light.device, POWER_OFF_NO_STATE, SRC_LIGHT);
-        }
-      }
-
-      if (channels & 2) {
-        if (light_state.getBriCT() && !(Light.power & 2)) {
-          if (!Settings.flag.not_power_linked) {
-            ExecuteCommandPower(Light.device + 1, POWER_ON_NO_STATE, SRC_LIGHT);
-          }
-        } else if (!light_state.getBriCT() && (Light.power & 2)) {
-          ExecuteCommandPower(Light.device + 1, POWER_OFF_NO_STATE, SRC_LIGHT);
-        }
-      }
-    }
-#ifdef USE_DOMOTICZ
-    DomoticzUpdatePowerState(Light.device);
-#endif
-  }
-
-  if (Settings.flag3.hass_tele_on_power) {
-    MqttPublishTeleState();
-  }
-
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG, "LightPreparePower End power=%d Light.power=%d", power, Light.power);
-#endif
-  Light.power = power >> (Light.device - 1);
-  LightState(0);
-}
-
-void LightCycleColor(int8_t direction)
-{
-  if (Light.strip_timer_counter % (Settings.light_speed * 2)) {
-    return;
-  }
-
-  if (0 == direction) {
-    if (Light.random == Light.wheel) {
-      Light.random = random(255);
-
-      uint8_t my_dir = (Light.random < Light.wheel -128) ? 1 :
-                       (Light.random < Light.wheel ) ? 0 :
-                       (Light.random > Light.wheel +128) ? 0 : 1;
-      Light.random = (Light.random & 0xFE) | my_dir;
-
-
-    }
-
-    direction = (Light.random &0x01) ? 1 : -1;
-  }
-  Light.wheel += direction;
-  uint16_t hue = changeUIntScale(Light.wheel, 0, 255, 0, 359);
-
-
-
-  uint8_t sat;
-  light_state.getHSB(nullptr, &sat, nullptr);
-  light_state.setHS(hue, sat);
-  light_controller.calcLevels(Light.new_color);
-}
-
-void LightSetPower(void)
-{
-
-  Light.old_power = Light.power;
-
-  uint32_t mask = 1;
-  if (Light.pwm_multi_channels) {
-    mask = (1 << Light.subtype) - 1;
-  } else if (!light_controller.isCTRGBLinked()) {
-    mask = 3;
-  }
-  uint32_t shift = Light.device - 1;
-
-
-
-
-
-  Light.power = (XdrvMailbox.index & (mask << shift)) >> shift;
-  if (Light.wakeup_active) {
-    Light.wakeup_active--;
-  }
-#ifdef DEBUG_LIGHT
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, "LightSetPower XdrvMailbox.index=%d Light.old_power=%d Light.power=%d mask=%d shift=%d",
-    XdrvMailbox.index, Light.old_power, Light.power, mask, shift);
-#endif
-  if (Light.power != Light.old_power) {
-    Light.update = true;
-  }
-  LightAnimate();
-}
-
-
-
-
-void LightAnimate(void)
-{
-  uint16_t light_still_on = 0;
-  bool power_off = false;
-
-
-  light_controller.setAlexaCTRange(Settings.flag4.alexa_ct_range);
-  Light.strip_timer_counter++;
-
-
-
-  if (Light.power || Light.fade_running) {
-    if (Settings.sleep > PWM_MAX_SLEEP) {
-      sleep = PWM_MAX_SLEEP;
-    } else {
-      sleep = Settings.sleep;
-    }
-  } else {
-    sleep = Settings.sleep;
-  }
-
-  if (!Light.power) {
-    Light.strip_timer_counter = 0;
-    if (Settings.light_scheme >= LS_MAX) {
-      power_off = true;
-    }
-  } else {
-    switch (Settings.light_scheme) {
-      case LS_POWER:
-        light_controller.calcLevels(Light.new_color);
-        break;
-      case LS_WAKEUP:
-        if (2 == Light.wakeup_active) {
-          Light.wakeup_active = 1;
-          for (uint32_t i = 0; i < Light.subtype; i++) {
-            Light.new_color[i] = 0;
-          }
-          Light.wakeup_counter = 0;
-          Light.wakeup_dimmer = 0;
-        }
-        Light.wakeup_counter++;
-        if (Light.wakeup_counter > ((Settings.light_wakeup * STATES) / Settings.light_dimmer)) {
-          Light.wakeup_counter = 0;
-          Light.wakeup_dimmer++;
-          if (Light.wakeup_dimmer <= Settings.light_dimmer) {
-            light_state.setDimmer(Light.wakeup_dimmer);
-            light_controller.calcLevels();
-            for (uint32_t i = 0; i < Light.subtype; i++) {
-              Light.new_color[i] = Light.current_color[i];
-            }
-          } else {
-
-
-
-
-            Response_P(PSTR("{\"" D_CMND_WAKEUP "\":\"" D_JSON_DONE "\""));
-            LightState(1);
-            ResponseJsonEnd();
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_WAKEUP));
-            XdrvRulesProcess();
-
-            Light.wakeup_active = 0;
-            Settings.light_scheme = LS_POWER;
-          }
-        }
-        break;
-      case LS_CYCLEUP:
-        LightCycleColor(1);
-        break;
-      case LS_CYCLEDN:
-        LightCycleColor(-1);
-        break;
-      case LS_RANDOM:
-        LightCycleColor(0);
-        break;
-      default:
-        XlgtCall(FUNC_SET_SCHEME);
-    }
-  }
-
-  if ((Settings.light_scheme < LS_MAX) || power_off) {
-
-
-    LightApplyPower(Light.new_color, Light.power);
-
-
-
-
-
-
-
-    if (memcmp(Light.last_color, Light.new_color, Light.subtype)) {
-      Light.update = true;
-    }
-    if (Light.update) {
-#ifdef USE_DEVICE_GROUPS
-      if (Light.power) LightSendDeviceGroupStatus();
-#endif
-
-      uint16_t cur_col_10[LST_MAX];
-      Light.update = false;
-
-
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        Light.last_color[i] = Light.new_color[i];
-
-        cur_col_10[i] = change8to10(Light.new_color[i]);
-      }
-
-      if (Light.pwm_multi_channels) {
-        calcGammaMultiChannels(cur_col_10);
-      } else {
-        calcGammaBulbs(cur_col_10);
-
-
-
-        if ((LST_RGBW <= Light.subtype) && (0 == Settings.rgbwwTable[4]) && (0 == cur_col_10[3]+cur_col_10[4])) {
-          uint32_t min_rgb_10 = min3(cur_col_10[0], cur_col_10[1], cur_col_10[2]);
-          for (uint32_t i=0; i<3; i++) {
-
-            uint32_t adjust10 = change8to10(Settings.rgbwwTable[i]);
-            cur_col_10[i] = changeUIntScale(cur_col_10[i] - min_rgb_10, 0, 1023, 0, adjust10);
-          }
-
-
-          uint32_t adjust_w_10 = changeUIntScale(Settings.rgbwwTable[3], 0, 255, 0, 1023);
-          uint32_t white_10 = changeUIntScale(min_rgb_10, 0, 1023, 0, adjust_w_10);
-          if (LST_RGBW == Light.subtype) {
-
-            cur_col_10[3] = white_10;
-          } else {
-
-            uint32_t ct = light_state.getCT10bits();
-            cur_col_10[4] = changeUIntScale(ct, 0, 1023, 0, white_10);
-            cur_col_10[3] = white_10 - cur_col_10[4];
-          }
-        }
-      }
-
-
-      if (0 != Settings.rgbwwTable[4]) {
-        for (uint32_t i = 0; i<Light.subtype; i++) {
-          uint32_t adjust = change8to10(Settings.rgbwwTable[i]);
-          cur_col_10[i] = changeUIntScale(cur_col_10[i], 0, 1023, 0, adjust);
-        }
-      }
-
-
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-
-        cur_col_10[i] = (cur_col_10[i] > 0) ? changeUIntScale(cur_col_10[i], 1, 1023, 1, Settings.pwm_range) : 0;
-      }
-
-
-      uint16_t orig_col_10bits[LST_MAX];
-      memcpy(orig_col_10bits, cur_col_10, sizeof(orig_col_10bits));
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
-      }
-
-      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) {
-
-        memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
-
-        LightSetOutputs(cur_col_10);
-        Light.fade_initialized = true;
-      } else {
-        if (Light.fade_running) {
-
-          memcpy(Light.fade_start_10, Light.fade_cur_10, sizeof(Light.fade_start_10));
-        }
-        memcpy(Light.fade_end_10, cur_col_10, sizeof(Light.fade_start_10));
-        Light.fade_running = true;
-        Light.fade_duration = 0;
-        Light.fade_start = 0;
-
-      }
-    }
-    if (Light.fade_running) {
-      if (LightApplyFade()) {
-
-
-
-        LightSetOutputs(Light.fade_cur_10);
-      }
-    }
-  }
-}
-
-bool isChannelGammaCorrected(uint32_t channel) {
-  if (!Settings.light_correction) { return false; }
-  if (channel >= Light.subtype) { return false; }
-
-  if (PHILIPS == my_module_type) {
-    if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }
-    if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }
-  }
-  return true;
-}
-
-
-uint16_t fadeGamma(uint32_t channel, uint16_t v) {
-  if (isChannelGammaCorrected(channel)) {
-    return ledGamma_internal(v, gamma_table_fast);
-  } else {
-    return v;
-  }
-}
-uint16_t fadeGammaReverse(uint32_t channel, uint16_t vg) {
-  if (isChannelGammaCorrected(channel)) {
-    return ledGammaReverse_internal(vg, gamma_table_fast);
-  } else {
-    return vg;
-  }
-}
-
-bool LightApplyFade(void) {
-  static uint32_t last_millis = 0;
-  uint32_t now = millis();
-
-  if ((now - last_millis) <= 5) {
-    return false;
-  }
-  last_millis = now;
-
-
-  if (0 == Light.fade_duration) {
-    Light.fade_start = now;
-
-    uint32_t distance = 0;
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      int32_t channel_distance = fadeGammaReverse(i, Light.fade_end_10[i]) - fadeGammaReverse(i, Light.fade_start_10[i]);
-      if (channel_distance < 0) { channel_distance = - channel_distance; }
-      if (channel_distance > distance) { distance = channel_distance; }
-    }
-    if (distance > 0) {
-
-
-
-      Light.fade_duration = (distance * Settings.light_speed * 500) / 1023;
-      if (Settings.save_data) {
-
-        uint32_t delay_seconds = 1 + (Light.fade_duration + 999) / 1000;
-
-        if (save_data_counter < delay_seconds) {
-          save_data_counter = delay_seconds;
-        }
-      }
-    } else {
-
-      Light.fade_running = false;
-    }
-  }
-
-  uint16_t fade_current = now - Light.fade_start;
-  if (fade_current <= Light.fade_duration) {
-
-    for (uint32_t i = 0; i < Light.subtype; i++) {
-      Light.fade_cur_10[i] = fadeGamma(i,
-                                changeUIntScale(fadeGammaReverse(i, fade_current),
-                                             0, Light.fade_duration,
-                                             fadeGammaReverse(i, Light.fade_start_10[i]),
-                                             fadeGammaReverse(i, Light.fade_end_10[i])));
-
-
-
-    }
-  } else {
-
-
-    Light.fade_running = false;
-    Light.fade_start = 0;
-    Light.fade_duration = 0;
-
-    memcpy(Light.fade_cur_10, Light.fade_end_10, sizeof(Light.fade_end_10));
-
-    memcpy(Light.fade_start_10, Light.fade_end_10, sizeof(Light.fade_start_10));
-  }
-  return true;
-}
-
-
-
-void LightApplyPower(uint8_t new_color[LST_MAX], power_t power) {
-
-  if (Light.pwm_multi_channels) {
-
-    for (uint32_t i = 0; i < LST_MAX; i++) {
-      if (0 == bitRead(power,i)) {
-        new_color[i] = 0;
-      }
-    }
-
-
-
-
-
-  } else {
-    if (!light_controller.isCTRGBLinked()) {
-
-      if (0 == (power & 1)) {
-        new_color[0] = new_color[1] = new_color[2] = 0;
-      }
-      if (0 == (power & 2)) {
-        new_color[3] = new_color[4] = 0;
-      }
-    } else if (!power) {
-      for (uint32_t i = 0; i < LST_MAX; i++) {
-        new_color[i] = 0;
-      }
-    }
-  }
-}
-
-void LightSetOutputs(const uint16_t *cur_col_10) {
-
-  if (light_type < LT_PWM6) {
-    for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) {
-      if (pin[GPIO_PWM1 +i] < 99) {
-
-        analogWrite(pin[GPIO_PWM1 +i], bitRead(pwm_inverted, i) ? Settings.pwm_range - cur_col_10[(i + Light.pwm_offset)] : cur_col_10[(i + Light.pwm_offset)]);
-      }
-    }
-  }
-
-
-
-
-  uint8_t cur_col[LST_MAX];
-  for (uint32_t i = 0; i < LST_MAX; i++) {
-    cur_col[i] = change10to8(cur_col_10[i]);
-  }
-
-
-  uint8_t scale_col[3];
-  uint32_t max = (cur_col[0] > cur_col[1] && cur_col[0] > cur_col[2]) ? cur_col[0] : (cur_col[1] > cur_col[2]) ? cur_col[1] : cur_col[2];
-  for (uint32_t i = 0; i < 3; i++) {
-    scale_col[i] = (0 == max) ? 255 : (255 > max) ? changeUIntScale(cur_col[i], 0, max, 0, 255) : cur_col[i];
-  }
-
-  char *tmp_data = XdrvMailbox.data;
-  char *tmp_topic = XdrvMailbox.topic;
-  XdrvMailbox.data = (char*)cur_col;
-  XdrvMailbox.topic = (char*)scale_col;
-  if (XlgtCall(FUNC_SET_CHANNELS)) { }
-  else if (XdrvCall(FUNC_SET_CHANNELS)) { }
-  XdrvMailbox.data = tmp_data;
-  XdrvMailbox.topic = tmp_topic;
-}
-
-
-void calcGammaMultiChannels(uint16_t cur_col_10[5]) {
-
-  if (Settings.light_correction) {
-    for (uint32_t i = 0; i < LST_MAX; i++) {
-      cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
-    }
-  }
-}
-
-void calcGammaBulbs(uint16_t cur_col_10[5]) {
-
-
-
-  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-
-    uint32_t cw1 = Light.subtype - 1;
-    uint32_t cw0 = Light.subtype - 2;
-    uint16_t white_bri10 = cur_col_10[cw0] + cur_col_10[cw1];
-    uint16_t white_bri10_1023 = (white_bri10 > 1023) ? 1023 : white_bri10;
-
-    if (PHILIPS == my_module_type) {
-
-      cur_col_10[cw1] = light_state.getCT10bits();
-
-      if (Settings.light_correction) {
-        cur_col_10[cw0] = ledGamma10_10(white_bri10_1023);
-      } else {
-        cur_col_10[cw0] = white_bri10_1023;
-      }
-    } else if (Settings.light_correction) {
-
-      if (white_bri10 <= 1031) {
-
-        uint16_t white_bri_gamma10 = ledGamma10_10(white_bri10_1023);
-
-        cur_col_10[cw0] = changeUIntScale(cur_col_10[cw0], 0, white_bri10_1023, 0, white_bri_gamma10);
-        cur_col_10[cw1] = changeUIntScale(cur_col_10[cw1], 0, white_bri10_1023, 0, white_bri_gamma10);
-      } else {
-        cur_col_10[cw0] = ledGamma10_10(cur_col_10[cw0]);
-        cur_col_10[cw1] = ledGamma10_10(cur_col_10[cw1]);
-      }
-    }
-  }
-
-  if (Settings.light_correction) {
-
-    if (LST_RGB <= Light.subtype) {
-      for (uint32_t i = 0; i < 3; i++) {
-        cur_col_10[i] = ledGamma10_10(cur_col_10[i]);
-      }
-    }
-
-    if ((LST_SINGLE == Light.subtype) || (LST_RGBW == Light.subtype)) {
-      cur_col_10[Light.subtype - 1] = ledGamma10_10(cur_col_10[Light.subtype - 1]);
-    }
-  }
-}
-
-#ifdef USE_DEVICE_GROUPS
-void LightSendDeviceGroupStatus()
-{
-  uint8_t channels[LST_MAX];
-  light_state.getChannels(channels);
-  SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme, DGR_ITEM_LIGHT_CHANNELS, channels,
-    DGR_ITEM_LIGHT_BRI, (power ? light_state.getBri() : 0));
-}
-
-void LightHandleDeviceGroupRequest()
-{
-  static bool send_state = false;
-  uint32_t value = XdrvMailbox.payload;
-  switch (XdrvMailbox.command_code) {
-    case DGR_ITEM_EOL:
-      LightAnimate();
-      if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
-        light_controller.saveSettings();
-        if (Settings.flag3.hass_tele_on_power) {
-          MqttPublishTeleState();
-        }
-        send_state = false;
-      }
-      break;
-    case DGR_ITEM_LIGHT_BRI:
-      if (light_state.getBri() != value) {
-        light_controller.changeBri(value);
-        send_state = true;
-      }
-      break;
-    case DGR_ITEM_LIGHT_SCHEME:
-      if (Settings.light_scheme != value) {
-        Settings.light_scheme = value;
-        send_state = true;
-      }
-      break;
-    case DGR_ITEM_LIGHT_CHANNELS:
-      light_controller.changeChannels((uint8_t *)XdrvMailbox.data);
-      send_state = true;
-      break;
-    case DGR_ITEM_LIGHT_FIXED_COLOR:
-      {
-        power_t save_power = Light.power;
-        if (value) {
-          bool save_decimal_text = Settings.flag.decimal_text;
-          char str[16];
-          XdrvMailbox.index = 2;
-          XdrvMailbox.data_len = sprintf_P(str, PSTR("%u"), value);
-          XdrvMailbox.data = str;
-          CmndSupportColor();
-          Settings.flag.decimal_text = save_decimal_text;
-        }
-        else {
-          Light.fixed_color_index = 0;
-          XdrvMailbox.index = 1;
-          XdrvMailbox.payload = light_state.BriToDimmer(light_state.getBri());
-          CmndWhite();
-        }
-        if (Light.power != save_power) {
-          XdrvMailbox.index = save_power;
-          LightSetPower();
-        }
-        send_state = true;
-      }
-      break;
-    case DGR_ITEM_LIGHT_SPEED:
-      if (Settings.light_speed != value && value > 0 && value <= 40) {
-        Settings.light_speed = value;
-        send_state = true;
-      }
-      break;
-    case DGR_ITEM_STATUS:
-      SendLocalDeviceGroupMessage(DGR_MSGTYP_PARTIAL_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
-        DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
-      LightSendDeviceGroupStatus();
-      break;
-  }
-}
-#endif
-
-
-
-
-
-bool LightColorEntry(char *buffer, uint32_t buffer_length)
-{
-  char scolor[10];
-  char *p;
-  char *str;
-  uint32_t entry_type = 0;
-  uint8_t value = Light.fixed_color_index;
-
-  if (buffer[0] == '#') {
-    buffer++;
-    buffer_length--;
-  }
-
-  if (Light.subtype >= LST_RGB) {
-    char option = (1 == buffer_length) ? buffer[0] : '\0';
-    if (('+' == option) && (Light.fixed_color_index < MAX_FIXED_COLOR)) {
-      value++;
-    }
-    else if (('-' == option) && (Light.fixed_color_index > 1)) {
-      value--;
-    } else {
-      value = atoi(buffer);
-    }
-  }
-
-  memset(&Light.entry_color, 0x00, sizeof(Light.entry_color));
-
-  while ((buffer_length > 0) && ('=' == buffer[buffer_length - 1])) {
-    buffer_length--;
-    memcpy(&Light.entry_color, &Light.current_color, sizeof(Light.entry_color));
-  }
-  if (strstr(buffer, ",") != nullptr) {
-    int8_t i = 0;
-    for (str = strtok_r(buffer, ",", &p); str && i < 6; str = strtok_r(nullptr, ",", &p)) {
-      if (i < LST_MAX) {
-        Light.entry_color[i++] = atoi(str);
-      }
-    }
-    entry_type = 2;
-  }
-  else if (((2 * Light.subtype) == buffer_length) || (buffer_length > 3)) {
-    for (uint32_t i = 0; i < tmin((uint)(buffer_length / 2), sizeof(Light.entry_color)); i++) {
-      strlcpy(scolor, buffer + (i *2), 3);
-      Light.entry_color[i] = (uint8_t)strtol(scolor, &p, 16);
-    }
-    entry_type = 1;
-  }
-  else if ((Light.subtype >= LST_RGB) && (value > 0) && (value <= MAX_FIXED_COLOR)) {
-    Light.fixed_color_index = value;
-    memcpy_P(&Light.entry_color, &kFixedColor[value -1], 3);
-    entry_type = 1;
-  }
-  else if ((value > 199) && (value <= 199 + MAX_FIXED_COLD_WARM)) {
-    if (LST_RGBW == Light.subtype) {
-      memcpy_P(&Light.entry_color[3], &kFixedWhite[value -200], 1);
-      entry_type = 1;
-    }
-    else if (LST_COLDWARM == Light.subtype) {
-      memcpy_P(&Light.entry_color, &kFixedColdWarm[value -200], 2);
-      entry_type = 1;
-    }
-    else if (LST_RGBCW == Light.subtype) {
-      memcpy_P(&Light.entry_color[3], &kFixedColdWarm[value -200], 2);
-      entry_type = 1;
-    }
-  }
-  if (entry_type) {
-    Settings.flag.decimal_text = entry_type -1;
-  }
-  return (entry_type);
-}
-
-
-
-void CmndSupportColor(void)
-{
-  bool valid_entry = false;
-  bool coldim = false;
-
-  if (XdrvMailbox.data_len > 0) {
-    valid_entry = LightColorEntry(XdrvMailbox.data, XdrvMailbox.data_len);
-    if (valid_entry) {
-      if (XdrvMailbox.index <= 2) {
-        uint32_t old_bri = light_state.getBri();
-
-        light_controller.changeChannels(Light.entry_color);
-        if (2 == XdrvMailbox.index) {
-
-          light_controller.changeBri(old_bri);
-        }
-
-        Settings.light_scheme = 0;
-        coldim = true;
-      } else {
-        for (uint32_t i = 0; i < LST_RGB; i++) {
-          Settings.ws_color[XdrvMailbox.index -3][i] = Light.entry_color[i];
-        }
-      }
-    }
-  }
-  char scolor[LIGHT_COLOR_SIZE];
-  if (!valid_entry && (XdrvMailbox.index <= 2)) {
-    ResponseCmndChar(LightGetColor(scolor));
-  }
-  if (XdrvMailbox.index >= 3) {
-    scolor[0] = '\0';
-    for (uint32_t i = 0; i < LST_RGB; i++) {
-      if (Settings.flag.decimal_text) {
-        snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.ws_color[XdrvMailbox.index -3][i]);
-      } else {
-        snprintf_P(scolor, sizeof(scolor), PSTR("%s%02X"), scolor, Settings.ws_color[XdrvMailbox.index -3][i]);
-      }
-    }
-    ResponseCmndIdxChar(scolor);
-  }
-  if (coldim) {
-    LightPreparePower();
-  }
-}
-
-void CmndColor(void)
-{
-
-
-
-
-
-
-
-  if ((Light.subtype > LST_SINGLE) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= 6)) {
-    CmndSupportColor();
-  }
-}
-
-void CmndWhite(void)
-{
-
-
-  if (Light.pwm_multi_channels) { return; }
-  if ( ((Light.subtype >= LST_RGBW) || (LST_COLDWARM == Light.subtype)) && (XdrvMailbox.index == 1)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      light_controller.changeDimmer(XdrvMailbox.payload, 2);
-      LightPreparePower(2);
-    } else {
-      ResponseCmndNumber(light_state.getDimmer(2));
-    }
-  }
-}
-
-void CmndChannel(void)
-{
-
-
-
-
-  if ((XdrvMailbox.index >= Light.device) && (XdrvMailbox.index < Light.device + Light.subtype )) {
-    uint32_t light_index = XdrvMailbox.index - Light.device;
-    power_t coldim = 0;
-
-
-    if (1 == XdrvMailbox.data_len) {
-      uint8_t channel = changeUIntScale(Light.current_color[light_index],0,255,0,100);
-      if ('+' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (channel > 89) ? 100 : channel + 10;
-      } else if ('-' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (channel < 11) ? 1 : channel - 10;
-      }
-    }
-
-
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      Light.current_color[light_index] = changeUIntScale(XdrvMailbox.payload,0,100,0,255);
-      if (Light.pwm_multi_channels) {
-        coldim = 1 << light_index;
-      } else {
-        if (light_controller.isCTRGBLinked()) {
-
-          if ((light_index < 3) && (light_controller.isCTRGBLinked())) {
-            Light.current_color[3] = Light.current_color[4] = 0;
-          } else {
-            Light.current_color[0] = Light.current_color[1] = Light.current_color[2] = 0;
-          }
-          coldim = 1;
-        } else {
-          if (light_index < 3) { coldim = 1; }
-          else { coldim = 2; }
-        }
-      }
-      light_controller.changeChannels(Light.current_color);
-    }
-    ResponseCmndIdxNumber(changeUIntScale(Light.current_color[light_index],0,255,0,100));
-    if (coldim) {
-      LightPreparePower(coldim);
-    }
-  }
-}
-
-void CmndHsbColor(void)
-{
-
-
-
-
-
-
-
-  if (Light.subtype >= LST_RGB) {
-    if (XdrvMailbox.data_len > 0) {
-      uint16_t c_hue;
-      uint8_t c_sat;
-      light_state.getHSB(&c_hue, &c_sat, nullptr);
-      uint32_t HSB[3];
-      HSB[0] = c_hue;
-      HSB[1] = c_sat;
-      HSB[2] = light_state.getBriRGB();
-      if ((2 == XdrvMailbox.index) || (3 == XdrvMailbox.index)) {
-        if ((uint32_t)XdrvMailbox.payload > 100) { XdrvMailbox.payload = 100; }
-        HSB[XdrvMailbox.index-1] = changeUIntScale(XdrvMailbox.payload, 0, 100, 0, 255);
-      } else {
-        uint32_t paramcount = ParseParameters(3, HSB);
-        if (HSB[0] > 360) { HSB[0] = 360; }
-        for (uint32_t i = 1; i < paramcount; i++) {
-          if (HSB[i] > 100) { HSB[i] == 100; }
-          HSB[i] = changeUIntScale(HSB[i], 0, 100, 0, 255);
-        }
-      }
-      light_controller.changeHSB(HSB[0], HSB[1], HSB[2]);
-      LightPreparePower(1);
-    } else {
-      LightState(0);
-    }
-  }
-}
-
-void CmndScheme(void)
-{
-
-
-
-
-
-  if (Light.subtype >= LST_RGB) {
-    uint32_t max_scheme = Light.max_scheme;
-
-    if (1 == XdrvMailbox.data_len) {
-      if (('+' == XdrvMailbox.data[0]) && (Settings.light_scheme < max_scheme)) {
-        XdrvMailbox.payload = Settings.light_scheme + ((0 == Settings.light_scheme) ? 2 : 1);
-      }
-      else if (('-' == XdrvMailbox.data[0]) && (Settings.light_scheme > 0)) {
-        XdrvMailbox.payload = Settings.light_scheme - ((2 == Settings.light_scheme) ? 2 : 1);
-      }
-    }
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= max_scheme)) {
-      uint32_t parm[2];
-      if (ParseParameters(2, parm) > 1) {
-        Light.wheel = parm[1];
-      }
-      Settings.light_scheme = XdrvMailbox.payload;
-#ifdef USE_DEVICE_GROUPS
-      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SCHEME, Settings.light_scheme);
-#endif
-      if (LS_WAKEUP == Settings.light_scheme) {
-        Light.wakeup_active = 3;
-      }
-      LightPowerOn();
-      Light.strip_timer_counter = 0;
-
-      if (Settings.flag3.hass_tele_on_power) {
-        MqttPublishTeleState();
-      }
-    }
-    ResponseCmndNumber(Settings.light_scheme);
-  }
-}
-
-void CmndWakeup(void)
-{
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    light_controller.changeDimmer(XdrvMailbox.payload);
-  }
-  Light.wakeup_active = 3;
-  Settings.light_scheme = LS_WAKEUP;
-  LightPowerOn();
-  ResponseCmndChar(D_JSON_STARTED);
-}
-
-void CmndColorTemperature(void)
-{
-
-
-
-
-  if (Light.pwm_multi_channels) { return; }
-  if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
-    uint32_t ct = light_state.getCT();
-    if (1 == XdrvMailbox.data_len) {
-      if ('+' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct > (CT_MAX-34)) ? CT_MAX : ct + 34;
-      }
-      else if ('-' == XdrvMailbox.data[0]) {
-        XdrvMailbox.payload = (ct < (CT_MIN+34)) ? CT_MIN : ct - 34;
-      }
-    }
-    if ((XdrvMailbox.payload >= CT_MIN) && (XdrvMailbox.payload <= CT_MAX)) {
-      light_controller.changeCTB(XdrvMailbox.payload, light_state.getBriCT());
-      LightPreparePower(2);
-    } else {
-      ResponseCmndNumber(ct);
-    }
-  }
-}
-
-void CmndDimmer(void)
-{
-
-
-
-
-
-
-  uint32_t dimmer;
-  if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
-
-  if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
-    dimmer = light_state.getDimmer();
-  } else {
-    dimmer = light_state.getDimmer(XdrvMailbox.index);
-  }
-
-  if (1 == XdrvMailbox.data_len) {
-    if ('+' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (dimmer > 89) ? 100 : dimmer + 10;
-    } else if ('-' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (dimmer < 11) ? 1 : dimmer - 10;
-    }
-  }
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    if (light_controller.isCTRGBLinked()) {
-
-      light_controller.changeDimmer(XdrvMailbox.payload);
-      LightPreparePower();
-    } else {
-      if (0 != XdrvMailbox.index) {
-        light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
-        LightPreparePower(1 << (XdrvMailbox.index - 1));
-      } else {
-
-        light_controller.changeDimmer(XdrvMailbox.payload, 1);
-        light_controller.changeDimmer(XdrvMailbox.payload, 2);
-        LightPreparePower();
-      }
-    }
-    Light.update = true;
-  } else {
-    ResponseCmndNumber(dimmer);
-  }
-}
-
-void CmndDimmerRange(void)
-{
-
-
-  if (XdrvMailbox.data_len > 0) {
-    uint32_t parm[2];
-    parm[0] = Settings.dimmer_hw_min;
-    parm[1] = Settings.dimmer_hw_max;
-    ParseParameters(2, parm);
-    if (parm[0] < parm[1]) {
-      Settings.dimmer_hw_min = parm[0];
-      Settings.dimmer_hw_max = parm[1];
-    } else {
-      Settings.dimmer_hw_min = parm[1];
-      Settings.dimmer_hw_max = parm[0];
-    }
-    restart_flag = 2;
-  }
-  Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
-}
-
-void CmndLedTable(void)
-{
-
-
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    switch (XdrvMailbox.payload) {
-    case 0:
-    case 1:
-      Settings.light_correction = XdrvMailbox.payload;
-      break;
-    case 2:
-      Settings.light_correction ^= 1;
-      break;
-    }
-    Light.update = true;
-  }
-  ResponseCmndStateText(Settings.light_correction);
-}
-
-void CmndRgbwwTable(void)
-{
-
-
-  if ((XdrvMailbox.data_len > 0)) {
-    uint32_t parm[LST_RGBCW -1];
-    uint32_t parmcount = ParseParameters(LST_RGBCW, parm);
-    for (uint32_t i = 0; i < parmcount; i++) {
-      Settings.rgbwwTable[i] = parm[i];
-    }
-    Light.update = true;
-  }
-  char scolor[LIGHT_COLOR_SIZE];
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < LST_RGBCW; i++) {
-    snprintf_P(scolor, sizeof(scolor), PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", Settings.rgbwwTable[i]);
-  }
-  ResponseCmndChar(scolor);
-}
-
-void CmndFade(void)
-{
-
-
-
-
-  switch (XdrvMailbox.payload) {
-  case 0:
-  case 1:
-    Settings.light_fade = XdrvMailbox.payload;
-    break;
-  case 2:
-    Settings.light_fade ^= 1;
-    break;
-  }
-#ifdef USE_DEVICE_GROUPS
-  if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
-#endif
-  if (!Settings.light_fade) { Light.fade_running = false; }
-  ResponseCmndStateText(Settings.light_fade);
-}
-
-void CmndSpeed(void)
-{
-
-
-
-
-  if (1 == XdrvMailbox.data_len) {
-    if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
-      XdrvMailbox.payload = Settings.light_speed - 1;
-    }
-    else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) {
-      XdrvMailbox.payload = Settings.light_speed + 1;
-    }
-  }
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
-    Settings.light_speed = XdrvMailbox.payload;
-#ifdef USE_DEVICE_GROUPS
-    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
-#endif
-  }
-  ResponseCmndNumber(Settings.light_speed);
-}
-
-void CmndWakeupDuration(void)
-{
-
-
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3001)) {
-    Settings.light_wakeup = XdrvMailbox.payload;
-    Light.wakeup_active = 0;
-  }
-  ResponseCmndNumber(Settings.light_wakeup);
-}
-
-void CmndUndocA(void)
-{
-
-  char scolor[LIGHT_COLOR_SIZE];
-  LightGetColor(scolor, true);
-  scolor[6] = '\0';
-  Response_P(PSTR("%s,%d,%d,%d,%d,%d"), scolor, Settings.light_fade, Settings.light_correction, Settings.light_scheme, Settings.light_speed, Settings.light_width);
-  MqttPublishPrefixTopic_P(STAT, XdrvMailbox.topic);
-  mqtt_data[0] = '\0';
-}
-
-
-
-
-
-bool Xdrv04(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_MODULE_INIT == function) {
-    return LightModuleInit();
-  }
-  else if (light_type) {
-    switch (function) {
-      case FUNC_SERIAL:
-        result = XlgtCall(FUNC_SERIAL);
-        break;
-      case FUNC_LOOP:
-        if (Light.fade_running) {
-          if (LightApplyFade()) {
-            LightSetOutputs(Light.fade_cur_10);
-          }
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        LightAnimate();
-        break;
-#ifdef USE_DEVICE_GROUPS
-      case FUNC_DEVICE_GROUP_REQUEST:
-        LightHandleDeviceGroupRequest();
-        break;
-#endif
-      case FUNC_SET_POWER:
-        LightSetPower();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kLightCommands, LightCommand);
-        if (!result) {
-          result = XlgtCall(FUNC_COMMAND);
-        }
-        break;
-      case FUNC_PRE_INIT:
-        LightInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_05_irremote.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_05_irremote.ino"
-#if defined(USE_IR_REMOTE) && !defined(USE_IR_REMOTE_FULL)
-
-
-
-
-#define XDRV_05 5
-
-#include <IRremoteESP8266.h>
-
-enum IrErrors { IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND };
-
-const char kIrRemoteCommands[] PROGMEM = "|" D_CMND_IRSEND ;
-
-
-void (* const IrRemoteCommand[])(void) PROGMEM = {
-  &CmndIrSend };
-
-
-static const uint8_t MAX_STANDARD_IR = NEC;
-const char kIrRemoteProtocols[] PROGMEM = "UNKNOWN|RC5|RC6|NEC";
-
-
-
-
-
-#include <IRsend.h>
-
-IRsend *irsend = nullptr;
-bool irsend_active = false;
-
-void IrSendInit(void)
-{
-  irsend = new IRsend(pin[GPIO_IRSEND]);
-  irsend->begin();
-}
-
-#ifdef USE_IR_RECEIVE
-
-
-
-
-const bool IR_RCV_SAVE_BUFFER = false;
-const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
-
-#include <IRrecv.h>
-
-IRrecv *irrecv = nullptr;
-
-unsigned long ir_lasttime = 0;
-
-void IrReceiveUpdateThreshold(void)
-{
-  if (irrecv != nullptr) {
-    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
-    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  }
-}
-
-void IrReceiveInit(void)
-{
-
-  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_RCV_BUFFER_SIZE, IR_RCV_TIMEOUT, IR_RCV_SAVE_BUFFER);
-  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  irrecv->enableIRIn();
-
-
-}
-
-void IrReceiveCheck(void)
-{
-  char sirtype[8];
-  int8_t iridx = 0;
-
-  decode_results results;
-
-  if (irrecv->decode(&results)) {
-    char hvalue[65];
-
-    iridx = results.decode_type;
-    if ((iridx < 0) || (iridx > MAX_STANDARD_IR)) { iridx = 0; }
-
-    if (iridx) {
-      if (results.bits > 64) {
-
-        uint32_t digits2 = results.bits / 8;
-        if (results.bits % 8) { digits2++; }
-        ToHex_P((unsigned char*)results.state, digits2, hvalue, sizeof(hvalue));
-      } else {
-        Uint64toHex(results.value, hvalue, results.bits);
-      }
-    } else {
-      Uint64toHex(results.value, hvalue, 32);
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_IRR "Echo %d, RawLen %d, Overflow %d, Bits %d, Value 0x%s, Decode %d"),
-              irsend_active, results.rawlen, results.overflow, results.bits, hvalue, results.decode_type);
-
-    unsigned long now = millis();
-
-    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
-      ir_lasttime = now;
-
-      char svalue[64];
-      if (Settings.flag.ir_receive_decimal) {
-        ulltoa(results.value, svalue, 10);
-      } else {
-        snprintf_P(svalue, sizeof(svalue), PSTR("\"0x%s\""), hvalue);
-      }
-      ResponseTime_P(PSTR(",\"" D_JSON_IRRECEIVED "\":{\"" D_JSON_IR_PROTOCOL "\":\"%s\",\"" D_JSON_IR_BITS "\":%d"),
-        GetTextIndexed(sirtype, sizeof(sirtype), iridx, kIrRemoteProtocols), results.bits);
-      if (iridx) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_DATA "\":%s"), svalue);
-      } else {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_HASH "\":%s"), svalue);
-      }
-
-      if (Settings.flag3.receive_raw) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
-        uint16_t i;
-        for (i = 1; i < results.rawlen; i++) {
-          if (i > 1) { ResponseAppend_P(PSTR(",")); }
-          uint32_t usecs;
-          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
-            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
-          }
-          ResponseAppend_P(PSTR("%d"), usecs);
-          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
-        }
-        uint16_t extended_length = results.rawlen - 1;
-        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
-          uint32_t usecs = results.rawbuf[j] * kRawTick;
-
-          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
-        }
-        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
-      }
-
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
-
-      XdrvRulesProcess();
-#ifdef USE_DOMOTICZ
-      if (iridx) {
-        unsigned long value = results.value | (iridx << 28);
-        DomoticzSensor(DZ_COUNT, value);
-      }
-#endif
-    }
-
-    irrecv->resume();
-  }
-}
-#endif
-
-
-
-
-
-uint32_t IrRemoteCmndIrSendJson(void)
-{
-
-
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) {
-    return IE_INVALID_JSON;
-  }
-
-  StaticJsonBuffer<140> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(dataBufUc);
-  if (!root.success()) {
-    return IE_INVALID_JSON;
-  }
-
-
-
-  char parm_uc[10];
-  const char *protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_PROTOCOL))];
-  uint16_t bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS))];
-  uint64_t data = strtoull(root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA))], nullptr, 0);
-  uint16_t repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT))];
-
-  if (XdrvMailbox.index > repeat + 1) {
-    repeat = XdrvMailbox.index - 1;
-  }
-  if (!(protocol && bits)) {
-    return IE_SYNTAX_IRSEND;
-  }
-
-  char protocol_text[20];
-  int protocol_code = GetCommandCode(protocol_text, sizeof(protocol_text), protocol, kIrRemoteProtocols);
-
-  char dvalue[64];
-  char hvalue[20];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol_text %s, protocol %s, bits %d, data %s (0x%s), repeat %d, protocol_code %d"),
-    protocol_text, protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat, protocol_code);
-
-  irsend_active = true;
-  switch (protocol_code) {
-#ifdef USE_IR_SEND_RC5
-    case RC5:
-      irsend->sendRC5(data, bits, repeat); break;
-#endif
-#ifdef USE_IR_SEND_RC6
-    case RC6:
-      irsend->sendRC6(data, bits, repeat); break;
-#endif
-#ifdef USE_IR_SEND_NEC
-    case NEC:
-      irsend->sendNEC(data, (bits > NEC_BITS) ? NEC_BITS : bits, repeat); break;
-#endif
-    default:
-      irsend_active = false;
-      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
-  }
-
-  return IE_NO_ERROR;
-}
-
-void CmndIrSend(void)
-{
-  uint8_t error = IE_SYNTAX_IRSEND;
-
-  if (XdrvMailbox.data_len) {
-
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      error = IE_INVALID_JSON;
-    } else {
-      error = IrRemoteCmndIrSendJson();
-    }
-  }
-  IrRemoteCmndResponse(error);
-}
-
-void IrRemoteCmndResponse(uint32_t error)
-{
-  switch (error) {
-    case IE_INVALID_RAWDATA:
-      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
-      break;
-    case IE_INVALID_JSON:
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      break;
-    case IE_SYNTAX_IRSEND:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_PROTOCOL ", " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
-      break;
-    default:
-      ResponseCmndDone();
-  }
-}
-
-
-
-
-
-bool Xdrv05(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        if (pin[GPIO_IRSEND] < 99) {
-          IrSendInit();
-        }
-#ifdef USE_IR_RECEIVE
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveInit();
-        }
-#endif
-        break;
-      case FUNC_EVERY_50_MSECOND:
-#ifdef USE_IR_RECEIVE
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveCheck();
-        }
-#endif
-        irsend_active = false;
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_IRSEND] < 99) {
-          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_05_irremote_full.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_05_irremote_full.ino"
-#ifdef USE_IR_REMOTE_FULL
-
-
-
-
-#define XDRV_05 5
-
-#include <IRremoteESP8266.h>
-#include <IRsend.h>
-#include <IRrecv.h>
-#include <IRutils.h>
-#include <IRac.h>
-
-enum IrErrors { IE_RESPONSE_PROVIDED, IE_NO_ERROR, IE_INVALID_RAWDATA, IE_INVALID_JSON, IE_SYNTAX_IRSEND, IE_SYNTAX_IRHVAC,
-                IE_UNSUPPORTED_HVAC, IE_UNSUPPORTED_PROTOCOL };
-
-const char kIrRemoteCommands[] PROGMEM = "|"
-  D_CMND_IRHVAC "|" D_CMND_IRSEND ;
-
-void (* const IrRemoteCommand[])(void) PROGMEM = {
-  &CmndIrHvac, &CmndIrSend };
-
-
-
-
-
-IRsend *irsend = nullptr;
-bool irsend_active = false;
-
-void IrSendInit(void)
-{
-  irsend = new IRsend(pin[GPIO_IRSEND]);
-  irsend->begin();
-}
-
-
-
-uint8_t reverseBitsInByte(uint8_t b) {
-   b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
-   b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
-   b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
-   return b;
-}
-
-
-uint64_t reverseBitsInBytes64(uint64_t b) {
-  union {
-    uint8_t b[8];
-    uint64_t i;
-  } a;
-  a.i = b;
-  for (uint32_t i=0; i<8; i++) {
-    a.b[i] = reverseBitsInByte(a.b[i]);
-  }
-  return a.i;
-}
-
-
-
-
-
-const bool IR_FULL_RCV_SAVE_BUFFER = false;
-const uint32_t IR_TIME_AVOID_DUPLICATE = 500;
-
-
-
-
-const uint16_t IR_FULL_BUFFER_SIZE = 1024;
-
-
-
-const uint8_t IR__FULL_RCV_TIMEOUT = 50;
-
-IRrecv *irrecv = nullptr;
-
-unsigned long ir_lasttime = 0;
-
-void IrReceiveUpdateThreshold(void)
-{
-  if (irrecv != nullptr) {
-    if (Settings.param[P_IR_UNKNOW_THRESHOLD] < 6) { Settings.param[P_IR_UNKNOW_THRESHOLD] = 6; }
-    irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  }
-}
-
-void IrReceiveInit(void)
-{
-
-  irrecv = new IRrecv(pin[GPIO_IRRECV], IR_FULL_BUFFER_SIZE, IR__FULL_RCV_TIMEOUT, IR_FULL_RCV_SAVE_BUFFER);
-  irrecv->setUnknownThreshold(Settings.param[P_IR_UNKNOW_THRESHOLD]);
-  irrecv->enableIRIn();
-}
-
-String sendACJsonState(const stdAc::state_t &state) {
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-  json[D_JSON_IRHVAC_VENDOR] = typeToString(state.protocol);
-  json[D_JSON_IRHVAC_MODEL] = state.model;
-  json[D_JSON_IRHVAC_POWER] = IRac::boolToString(state.power);
-  json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(state.mode);
-
-  if (state.mode == stdAc::opmode_t::kOff || !state.power) {
-    json[D_JSON_IRHVAC_MODE] = IRac::opmodeToString(stdAc::opmode_t::kOff);
-    json[D_JSON_IRHVAC_POWER] = IRac::boolToString(false);
-  }
-  json[D_JSON_IRHVAC_CELSIUS] = IRac::boolToString(state.celsius);
-  if (floorf(state.degrees) == state.degrees) {
-    json[D_JSON_IRHVAC_TEMP] = floorf(state.degrees);
-  } else {
-    json[D_JSON_IRHVAC_TEMP] = RawJson(String(state.degrees, 1));
-  }
-  json[D_JSON_IRHVAC_FANSPEED] = IRac::fanspeedToString(state.fanspeed);
-  json[D_JSON_IRHVAC_SWINGV] = IRac::swingvToString(state.swingv);
-  json[D_JSON_IRHVAC_SWINGH] = IRac::swinghToString(state.swingh);
-  json[D_JSON_IRHVAC_QUIET] = IRac::boolToString(state.quiet);
-  json[D_JSON_IRHVAC_TURBO] = IRac::boolToString(state.turbo);
-  json[D_JSON_IRHVAC_ECONO] = IRac::boolToString(state.econo);
-  json[D_JSON_IRHVAC_LIGHT] = IRac::boolToString(state.light);
-  json[D_JSON_IRHVAC_FILTER] = IRac::boolToString(state.filter);
-  json[D_JSON_IRHVAC_CLEAN] = IRac::boolToString(state.clean);
-  json[D_JSON_IRHVAC_BEEP] = IRac::boolToString(state.beep);
-  json[D_JSON_IRHVAC_SLEEP] = state.sleep;
-
-  String payload = "";
-  payload.reserve(200);
-  json.printTo(payload);
-  return payload;
-}
-
-String sendIRJsonState(const struct decode_results &results) {
-  String json("{");
-  json += "\"" D_JSON_IR_PROTOCOL "\":\"";
-  json += typeToString(results.decode_type);
-  json += "\",\"" D_JSON_IR_BITS "\":";
-  json += results.bits;
-
-  if (hasACState(results.decode_type)) {
-    json += ",\"" D_JSON_IR_DATA "\":\"0x";
-    json += resultToHexidecimal(&results);
-    json += "\"";
-  } else {
-    if (UNKNOWN != results.decode_type) {
-      json += ",\"" D_JSON_IR_DATA "\":";
-    } else {
-      json += ",\"" D_JSON_IR_HASH "\":";
-    }
-    if (Settings.flag.ir_receive_decimal) {
-      char svalue[32];
-      ulltoa(results.value, svalue, 10);
-      json += svalue;
-    } else {
-      char hvalue[64];
-      if (UNKNOWN != results.decode_type) {
-        Uint64toHex(results.value, hvalue, results.bits);
-        json += "\"0x";
-        json += hvalue;
-        json += "\",\"" D_JSON_IR_DATALSB "\":\"0x";
-        Uint64toHex(reverseBitsInBytes64(results.value), hvalue, results.bits);
-        json += hvalue;
-        json += "\"";
-      } else {
-        Uint64toHex(results.value, hvalue, 32);
-        json += "\"0x";
-        json += hvalue;
-        json += "\"";
-      }
-    }
-  }
-  json += ",\"" D_JSON_IR_REPEAT "\":";
-  json += results.repeat;
-
-  stdAc::state_t ac_result;
-  if (IRAcUtils::decodeToState(&results, &ac_result, nullptr)) {
-
-    json += ",\"" D_CMND_IRHVAC "\":";
-    json += sendACJsonState(ac_result);
-  }
-
-  return json;
-}
-
-void IrReceiveCheck(void)
-{
-  decode_results results;
-
-  if (irrecv->decode(&results)) {
-    uint32_t now = millis();
-
-
-    if (!irsend_active && (now - ir_lasttime > IR_TIME_AVOID_DUPLICATE)) {
-      ir_lasttime = now;
-      Response_P(PSTR("{\"" D_JSON_IRRECEIVED "\":%s"), sendIRJsonState(results).c_str());
-
-      if (Settings.flag3.receive_raw) {
-        ResponseAppend_P(PSTR(",\"" D_JSON_IR_RAWDATA "\":["));
-        uint16_t i;
-        for (i = 1; i < results.rawlen; i++) {
-          if (i > 1) { ResponseAppend_P(PSTR(",")); }
-          uint32_t usecs;
-          for (usecs = results.rawbuf[i] * kRawTick; usecs > UINT16_MAX; usecs -= UINT16_MAX) {
-            ResponseAppend_P(PSTR("%d,0,"), UINT16_MAX);
-          }
-          ResponseAppend_P(PSTR("%d"), usecs);
-          if (strlen(mqtt_data) > sizeof(mqtt_data) - 40) { break; }
-        }
-        uint16_t extended_length = results.rawlen - 1;
-        for (uint32_t j = 0; j < results.rawlen - 1; j++) {
-          uint32_t usecs = results.rawbuf[j] * kRawTick;
-
-          extended_length += (usecs / (UINT16_MAX + 1)) * 2;
-        }
-        ResponseAppend_P(PSTR("],\"" D_JSON_IR_RAWDATA "Info\":[%d,%d,%d]"), extended_length, i -1, results.overflow);
-      }
-
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_IRRECEIVED));
-
-      XdrvRulesProcess();
-    }
-
-    irrecv->resume();
-  }
-}
-
-
-
-
-
-
-
-String listSupportedProtocols(bool hvac) {
-  String l("");
-  bool first = true;
-  for (uint32_t i = UNUSED + 1; i <= kLastDecodeType; i++) {
-    bool found = false;
-    if (hvac) {
-      found = IRac::isProtocolSupported((decode_type_t)i);
-    } else {
-      found = (IRsend::defaultBits((decode_type_t)i) > 0) && (!IRac::isProtocolSupported((decode_type_t)i));
-    }
-    if (found) {
-      if (first) {
-        first = false;
-      } else {
-        l += "|";
-      }
-      l += typeToString((decode_type_t)i);
-    }
-  }
-  return l;
-}
-
-
-const stdAc::fanspeed_t IrHvacFanSpeed[] PROGMEM = { stdAc::fanspeed_t::kAuto,
-                      stdAc::fanspeed_t::kMin, stdAc::fanspeed_t::kLow,stdAc::fanspeed_t::kMedium,
-                      stdAc::fanspeed_t::kHigh, stdAc::fanspeed_t::kMax };
-
-uint32_t IrRemoteCmndIrHvacJson(void)
-{
-  stdAc::state_t state, prev;
-  char parm_uc[12];
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
-
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(dataBufUc);
-  if (!json.success()) { return IE_INVALID_JSON; }
-
-
-  state.protocol = decode_type_t::UNKNOWN;
-  state.model = 1;
-  state.mode = stdAc::opmode_t::kAuto;
-  state.power = false;
-  state.celsius = true;
-  state.degrees = 21.0f;
-  state.fanspeed = stdAc::fanspeed_t::kMedium;
-  state.swingv = stdAc::swingv_t::kOff;
-  state.swingh = stdAc::swingh_t::kOff;
-  state.light = false;
-  state.beep = false;
-  state.econo = false;
-  state.filter = false;
-  state.turbo = false;
-  state.quiet = false;
-  state.sleep = -1;
-  state.clean = false;
-  state.clock = -1;
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
-  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
-  if (json.containsKey(parm_uc)) { state.protocol = strToDecodeType(json[parm_uc]); }
-  if (decode_type_t::UNKNOWN == state.protocol) { return IE_UNSUPPORTED_HVAC; }
-  if (!IRac::isProtocolSupported(state.protocol)) { return IE_UNSUPPORTED_HVAC; }
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FANSPEED));
-  if (json.containsKey(parm_uc)) {
-    uint32_t fan_speed = json[parm_uc];
-    if ((fan_speed >= 1) && (fan_speed <= 5)) {
-      state.fanspeed = (stdAc::fanspeed_t) pgm_read_byte(&IrHvacFanSpeed[fan_speed]);
-    } else {
-      state.fanspeed = IRac::strToFanspeed(json[parm_uc]);
-    }
-  }
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODEL));
-  if (json.containsKey(parm_uc)) { state.model = IRac::strToModel(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_MODE));
-  if (json.containsKey(parm_uc)) { state.mode = IRac::strToOpmode(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGV));
-  if (json.containsKey(parm_uc)) { state.swingv = IRac::strToSwingV(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SWINGH));
-  if (json.containsKey(parm_uc)) { state.swingh = IRac::strToSwingH(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TEMP));
-  if (json.containsKey(parm_uc)) { state.degrees = json[parm_uc]; }
-
-
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_POWER));
-  if (json.containsKey(parm_uc)) { state.power = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CELSIUS));
-  if (json.containsKey(parm_uc)) { state.celsius = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_LIGHT));
-  if (json.containsKey(parm_uc)) { state.light = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_BEEP));
-  if (json.containsKey(parm_uc)) { state.beep = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_ECONO));
-  if (json.containsKey(parm_uc)) { state.econo = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_FILTER));
-  if (json.containsKey(parm_uc)) { state.filter = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_TURBO));
-  if (json.containsKey(parm_uc)) { state.turbo = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_QUIET));
-  if (json.containsKey(parm_uc)) { state.quiet = IRac::strToBool(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_CLEAN));
-  if (json.containsKey(parm_uc)) { state.clean = IRac::strToBool(json[parm_uc]); }
-
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_SLEEP));
-  if (json[parm_uc]) { state.sleep = json[parm_uc]; }
-
-
-  IRac ac(pin[GPIO_IRSEND]);
-  bool success = ac.sendAc(state, &prev);
-  if (!success) { return IE_SYNTAX_IRHVAC; }
-
-  Response_P(PSTR("{\"" D_CMND_IRHVAC "\":%s}"), sendACJsonState(state).c_str());
-  return IE_RESPONSE_PROVIDED;
-}
-
-void CmndIrHvac(void)
-{
-  uint8_t error = IE_SYNTAX_IRHVAC;
-
-  if (XdrvMailbox.data_len) {
-    error = IrRemoteCmndIrHvacJson();
-  }
-  if (error != IE_RESPONSE_PROVIDED) { IrRemoteCmndResponse(error); }
-}
-
-
-
-
-
-uint32_t IrRemoteCmndIrSendJson(void)
-{
-  char parm_uc[12];
-
-
-
-  char dataBufUc[XdrvMailbox.data_len + 1];
-  UpperCase(dataBufUc, XdrvMailbox.data);
-  RemoveSpace(dataBufUc);
-  if (strlen(dataBufUc) < 8) { return IE_INVALID_JSON; }
-
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(dataBufUc);
-  if (!json.success()) { return IE_INVALID_JSON; }
-
-
-
-  decode_type_t protocol = decode_type_t::UNKNOWN;
-  uint16_t bits = 0;
-  uint64_t data;
-  uint8_t repeat = 0;
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_VENDOR));
-  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IRHVAC_PROTOCOL));
-  if (json.containsKey(parm_uc)) { protocol = strToDecodeType(json[parm_uc]); }
-  if (decode_type_t::UNKNOWN == protocol) { return IE_UNSUPPORTED_PROTOCOL; }
-
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_BITS));
-  if (json.containsKey(parm_uc)) { bits = json[parm_uc]; }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_REPEAT));
-  if (json.containsKey(parm_uc)) { repeat = json[parm_uc]; }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATALSB));
-  if (json.containsKey(parm_uc)) { data = reverseBitsInBytes64(strtoull(json[parm_uc], nullptr, 0)); }
-  UpperCase_P(parm_uc, PSTR(D_JSON_IR_DATA));
-  if (json.containsKey(parm_uc)) { data = strtoull(json[parm_uc], nullptr, 0); }
-  if (0 == bits) { return IE_SYNTAX_IRSEND; }
-
-
-  if (XdrvMailbox.index > repeat + 1) { repeat = XdrvMailbox.index - 1; }
-
-  char dvalue[32];
-  char hvalue[32];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("IRS: protocol %d, bits %d, data 0x%s (%s), repeat %d"),
-    protocol, bits, ulltoa(data, dvalue, 10), Uint64toHex(data, hvalue, bits), repeat);
-
-  irsend_active = true;
-  bool success = irsend->send(protocol, data, bits, repeat);
-
-  if (!success) {
-      irsend_active = false;
-      ResponseCmndChar(D_JSON_PROTOCOL_NOT_SUPPORTED);
-  }
-  return IE_NO_ERROR;
-}
-
-uint32_t IrRemoteCmndIrSendRaw(void)
-{
-
-
-
-
-
-
-
-  char *p;
-  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-  if (p == nullptr) {
-    return IE_INVALID_RAWDATA;
-  }
-
-
-  uint16_t repeat = XdrvMailbox.index > 0 ? XdrvMailbox.index - 1 : 0;
-
-  uint16_t freq = atoi(str);
-  if (!freq && (*str != '0')) {
-    uint16_t count = 0;
-    char *q = p;
-    for (; *q; count += (*q++ == ','));
-    if (count < 2) {
-      return IE_INVALID_RAWDATA;
-    }
-
-    uint16_t parm[count];
-    for (uint32_t i = 0; i < count; i++) {
-      parm[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      if (!parm[i]) {
-        if (!i) {
-          parm[0] = 38000;
-        } else {
-          return IE_INVALID_RAWDATA;
-        }
-      }
-    }
-
-    uint16_t i = 0;
-    if (count < 4) {
-
-      uint16_t mark = parm[1] *2;
-      if (3 == count) {
-        if (parm[2] < parm[1]) {
-
-          mark = parm[1] * parm[2];
-        } else {
-
-          mark = parm[2];
-        }
-      }
-      uint16_t raw_array[strlen(p)];
-      for (; *p; *p++) {
-        if (*p == '0') {
-          raw_array[i++] = parm[1];
-        }
-        else if (*p == '1') {
-          raw_array[i++] = mark;
-        }
-      }
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, i, parm[0]);
-        if (r < repeat) {
-          irsend->space(40000);
-        }
-      }
-    }
-    else if (6 == count) {
-
-      uint16_t raw_array[strlen(p)*2+3];
-      raw_array[i++] = parm[1];
-      raw_array[i++] = parm[2];
-      uint32_t inter_message_32 = (parm[1] + parm[2]) * 3;
-      uint16_t inter_message = (inter_message_32 > 65000) ? 65000 : inter_message_32;
-      for (; *p; *p++) {
-        if (*p == '0') {
-          raw_array[i++] = parm[3];
-          raw_array[i++] = parm[4];
-        }
-        else if (*p == '1') {
-          raw_array[i++] = parm[3];
-          raw_array[i++] = parm[5];
-        }
-      }
-      raw_array[i++] = parm[3];
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, i, parm[0]);
-        if (r < repeat) {
-          irsend->space(inter_message);
-        }
-      }
-    }
-    else {
-      return IE_INVALID_RAWDATA;
-    }
-  } else {
-    if (!freq) { freq = 38000; }
-    uint16_t count = 0;
-    char *q = p;
-    for (; *q; count += (*q++ == ','));
-    if (0 == count) {
-      return IE_INVALID_RAWDATA;
-    }
-
-
-    count++;
-    if (count < 200) {
-      uint16_t raw_array[count];
-      for (uint32_t i = 0; i < count; i++) {
-        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      }
-
-
-
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, count, freq);
-      }
-    } else {
-      uint16_t *raw_array = reinterpret_cast<uint16_t*>(malloc(count * sizeof(uint16_t)));
-      if (raw_array == nullptr) {
-        return IE_INVALID_RAWDATA;
-      }
-
-      for (uint32_t i = 0; i < count; i++) {
-        raw_array[i] = strtol(strtok_r(nullptr, ", ", &p), nullptr, 0);
-      }
-
-
-
-      irsend_active = true;
-      for (uint32_t r = 0; r <= repeat; r++) {
-        irsend->sendRaw(raw_array, count, freq);
-      }
-      free(raw_array);
-    }
-  }
-
-  return IE_NO_ERROR;
-}
-
-void CmndIrSend(void)
-{
-  uint8_t error = IE_SYNTAX_IRSEND;
-
-  if (XdrvMailbox.data_len) {
-    if (strstr(XdrvMailbox.data, "{") == nullptr) {
-      error = IrRemoteCmndIrSendRaw();
-    } else {
-      error = IrRemoteCmndIrSendJson();
-    }
-  }
-  IrRemoteCmndResponse(error);
-}
-
-void IrRemoteCmndResponse(uint32_t error)
-{
-  switch (error) {
-    case IE_INVALID_RAWDATA:
-      ResponseCmndChar(D_JSON_INVALID_RAWDATA);
-      break;
-    case IE_INVALID_JSON:
-      ResponseCmndChar(D_JSON_INVALID_JSON);
-      break;
-    case IE_SYNTAX_IRSEND:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_NO " " D_JSON_IR_BITS " " D_JSON_OR " " D_JSON_IR_DATA "\"}"));
-      break;
-    case IE_SYNTAX_IRHVAC:
-      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR ", " D_JSON_IRHVAC_MODE " " D_JSON_OR " " D_JSON_IRHVAC_FANSPEED "\"}"));
-      break;
-    case IE_UNSUPPORTED_HVAC:
-      Response_P(PSTR("{\"" D_CMND_IRHVAC "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_VENDOR " (%s)\"}"), listSupportedProtocols(true).c_str());
-      break;
-    case IE_UNSUPPORTED_PROTOCOL:
-      Response_P(PSTR("{\"" D_CMND_IRSEND "\":\"" D_JSON_WRONG " " D_JSON_IRHVAC_PROTOCOL " (%s)\"}"), listSupportedProtocols(false).c_str());
-      break;
-    default:
-      ResponseCmndDone();
-  }
-}
-
-
-
-
-
-bool Xdrv05(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_IRSEND] < 99) || (pin[GPIO_IRRECV] < 99)) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        if (pin[GPIO_IRSEND] < 99) {
-          IrSendInit();
-        }
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveInit();
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (pin[GPIO_IRRECV] < 99) {
-          IrReceiveCheck();
-        }
-        irsend_active = false;
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_IRSEND] < 99) {
-          result = DecodeCommand(kIrRemoteCommands, IrRemoteCommand);
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_06_snfbridge.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_06_snfbridge.ino"
-#ifdef USE_SONOFF_RF
-
-
-
-
-#define XDRV_06 6
-
-const uint32_t SFB_TIME_AVOID_DUPLICATE = 2000;
-
-enum SonoffBridgeCommands {
-  CMND_RFSYNC, CMND_RFLOW, CMND_RFHIGH, CMND_RFHOST, CMND_RFCODE };
-
-const char kSonoffBridgeCommands[] PROGMEM = "|"
-  D_CMND_RFSYNC "|" D_CMND_RFLOW "|" D_CMND_RFHIGH "|" D_CMND_RFHOST "|" D_CMND_RFCODE "|" D_CMND_RFKEY "|" D_CMND_RFRAW;
-
-void (* const SonoffBridgeCommand[])(void) PROGMEM = {
-  &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfBridge, &CmndRfKey, &CmndRfRaw };
-
-struct SONOFFBRIDGE {
-  uint32_t last_received_id = 0;
-  uint32_t last_send_code = 0;
-  uint32_t last_time = 0;
-  uint32_t last_learn_time = 0;
-  uint8_t receive_flag = 0;
-  uint8_t receive_raw_flag = 0;
-  uint8_t learn_key = 1;
-  uint8_t learn_active = 0;
-  uint8_t expected_bytes = 0;
-} SnfBridge;
-
-#ifdef USE_RF_FLASH
-
-
-
-
-
-
-
-#include "ihx.h"
-#include "c2.h"
-
-const ssize_t RF_RECORD_NO_START_FOUND = -1;
-const ssize_t RF_RECORD_NO_END_FOUND = -2;
-
-ssize_t rf_find_hex_record_start(uint8_t *buf, size_t size)
-{
-  for (size_t i = 0; i < size; i++) {
-    if (buf[i] == ':') {
-      return i;
-    }
-  }
-  return RF_RECORD_NO_START_FOUND;
-}
-
-ssize_t rf_find_hex_record_end(uint8_t *buf, size_t size)
-{
-  for (size_t i = 0; i < size; i++) {
-    if (buf[i] == '\n') {
-      return i;
-    }
-  }
-  return RF_RECORD_NO_END_FOUND;
-}
-
-ssize_t rf_glue_remnant_with_new_data_and_write(const uint8_t *remnant_data, uint8_t *new_data, size_t new_data_len)
-{
-  ssize_t record_start;
-  ssize_t record_end;
-  ssize_t glue_record_sz;
-  uint8_t *glue_buf;
-  ssize_t result;
-
-  if (remnant_data[0] != ':') { return -8; }
-
-
-  record_end = rf_find_hex_record_end(new_data, new_data_len);
-  record_start = rf_find_hex_record_start(new_data, new_data_len);
-
-
-
-
-  if ((record_start != RF_RECORD_NO_START_FOUND) && (record_start < record_end)) {
-    return -8;
-  }
-
-  glue_record_sz = strlen((const char *) remnant_data) + record_end;
-
-  glue_buf = (uint8_t *) malloc(glue_record_sz);
-  if (glue_buf == nullptr) { return -2; }
-
-
-  memcpy(glue_buf, remnant_data, strlen((const char *) remnant_data));
-  memcpy(glue_buf + strlen((const char *) remnant_data), new_data, record_end);
-
-  result = rf_decode_and_write(glue_buf, glue_record_sz);
-  free(glue_buf);
-  return result;
-}
-
-ssize_t rf_decode_and_write(uint8_t *record, size_t size)
-{
-  uint8_t err = ihx_decode(record, size);
-  if (err != IHX_SUCCESS) { return -13; }
-
-  ihx_t *h = (ihx_t *) record;
-  if (h->record_type == IHX_RT_DATA) {
-    int retries = 5;
-    uint16_t address = h->address_high * 0x100 + h->address_low;
-
-    do {
-      err = c2_programming_init();
-      err = c2_block_write(address, h->data, h->len);
-    } while (err != C2_SUCCESS && retries--);
-  } else if (h->record_type == IHX_RT_END_OF_FILE) {
-
-    err = c2_reset();
-  }
-
-  if (err != C2_SUCCESS) { return -12; }
-
-  return 0;
-}
-
-ssize_t rf_search_and_write(uint8_t *buf, size_t size)
-{
-
-  ssize_t rec_end;
-  ssize_t rec_start;
-  ssize_t err;
-
-  for (size_t i = 0; i < size; i++) {
-
-    rec_start = rf_find_hex_record_start(buf + i, size - i);
-    if (rec_start == RF_RECORD_NO_START_FOUND) {
-
-      return -8;
-    }
-
-
-    rec_start += i;
-    rec_end = rf_find_hex_record_end(buf + rec_start, size - rec_start);
-    if (rec_end == RF_RECORD_NO_END_FOUND) {
-
-      return rec_start;
-    }
-
-
-    rec_end += rec_start;
-
-    err = rf_decode_and_write(buf + rec_start, rec_end - rec_start);
-    if (err < 0) { return err; }
-    i = rec_end;
-  }
-
-  return 0;
-}
-
-uint8_t rf_erase_flash(void)
-{
-  uint8_t err;
-
-  for (uint32_t i = 0; i < 4; i++) {
-    err = c2_programming_init();
-    if (err != C2_SUCCESS) {
-      return 10;
-    }
-    err = c2_device_erase();
-    if (err != C2_SUCCESS) {
-      if (i < 3) {
-        c2_reset();
-      } else {
-        return 11;
-      }
-    } else {
-      break;
-    }
-  }
-  return 0;
-}
-
-uint8_t SnfBrUpdateInit(void)
-{
-  pinMode(PIN_C2CK, OUTPUT);
-  pinMode(PIN_C2D, INPUT);
-
-  return rf_erase_flash();
-}
-#endif
-
-
-
-void SonoffBridgeReceivedRaw(void)
-{
-
-  uint8_t buckets = 0;
-
-  if (0xB1 == serial_in_buffer[1]) { buckets = serial_in_buffer[2] << 1; }
-
-  ResponseTime_P(PSTR(",\"" D_CMND_RFRAW "\":{\"" D_JSON_DATA "\":\""));
-  for (uint32_t i = 0; i < serial_in_byte_counter; i++) {
-    ResponseAppend_P(PSTR("%02X"), serial_in_buffer[i]);
-    if (0xB1 == serial_in_buffer[1]) {
-      if ((i > 3) && buckets) { buckets--; }
-      if ((i < 3) || (buckets % 2) || (i == serial_in_byte_counter -2)) {
-        ResponseAppend_P(PSTR(" "));
-      }
-    }
-  }
-  ResponseAppend_P(PSTR("\"}}"));
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_CMND_RFRAW));
-
-  XdrvRulesProcess();
-}
-
-
-
-void SonoffBridgeLearnFailed(void)
-{
-  SnfBridge.learn_active = 0;
-  Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARN_FAILED);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
-}
-
-void SonoffBridgeReceived(void)
-{
-  uint16_t sync_time = 0;
-  uint16_t low_time = 0;
-  uint16_t high_time = 0;
-  uint32_t received_id = 0;
-  char rfkey[8];
-  char stemp[16];
-
-  AddLogSerial(LOG_LEVEL_DEBUG);
-
-  if (0xA2 == serial_in_buffer[0]) {
-    SonoffBridgeLearnFailed();
-  }
-  else if (0xA3 == serial_in_buffer[0]) {
-    SnfBridge.learn_active = 0;
-    low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
-    high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
-    if (low_time && high_time) {
-      for (uint32_t i = 0; i < 9; i++) {
-        Settings.rf_code[SnfBridge.learn_key][i] = serial_in_buffer[i +1];
-      }
-      Response_P(S_JSON_COMMAND_INDEX_SVALUE, D_CMND_RFKEY, SnfBridge.learn_key, D_JSON_LEARNED);
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_RFKEY));
-    } else {
-      SonoffBridgeLearnFailed();
-    }
-  }
-  else if (0xA4 == serial_in_buffer[0]) {
-    if (SnfBridge.learn_active) {
-      SonoffBridgeLearnFailed();
-    } else {
-      sync_time = serial_in_buffer[1] << 8 | serial_in_buffer[2];
-      low_time = serial_in_buffer[3] << 8 | serial_in_buffer[4];
-      high_time = serial_in_buffer[5] << 8 | serial_in_buffer[6];
-      received_id = serial_in_buffer[7] << 16 | serial_in_buffer[8] << 8 | serial_in_buffer[9];
-
-      unsigned long now = millis();
-      if (!((received_id == SnfBridge.last_received_id) && (now - SnfBridge.last_time < SFB_TIME_AVOID_DUPLICATE))) {
-        SnfBridge.last_received_id = received_id;
-        SnfBridge.last_time = now;
-        strncpy_P(rfkey, PSTR("\"" D_JSON_NONE "\""), sizeof(rfkey));
-        for (uint32_t i = 1; i <= 16; i++) {
-          if (Settings.rf_code[i][0]) {
-            uint32_t send_id = Settings.rf_code[i][6] << 16 | Settings.rf_code[i][7] << 8 | Settings.rf_code[i][8];
-            if (send_id == received_id) {
-              snprintf_P(rfkey, sizeof(rfkey), PSTR("%d"), i);
-              break;
-            }
-          }
-        }
-        if (Settings.flag.rf_receive_decimal) {
-          snprintf_P(stemp, sizeof(stemp), PSTR("%u"), received_id);
-        } else {
-          snprintf_P(stemp, sizeof(stemp), PSTR("\"%06X\""), received_id);
-        }
-        ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":%s,\"" D_CMND_RFKEY "\":%s}}"),
-          sync_time, low_time, high_time, stemp, rfkey);
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
-        XdrvRulesProcess();
-  #ifdef USE_DOMOTICZ
-        DomoticzSensor(DZ_COUNT, received_id);
-  #endif
-      }
-    }
-  }
-}
-
-bool SonoffBridgeSerialInput(void)
-{
-
-  static int8_t receive_len = 0;
-
-  if (SnfBridge.receive_flag) {
-    if (SnfBridge.receive_raw_flag) {
-      if (!serial_in_byte_counter) {
-        serial_in_buffer[serial_in_byte_counter++] = 0xAA;
-      }
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if (serial_in_byte_counter == 3) {
-        if ((0xA6 == serial_in_buffer[1]) || (0xAB == serial_in_buffer[1])) {
-          receive_len = serial_in_buffer[2] + 4;
-        }
-      }
-      if ((!receive_len && (0x55 == serial_in_byte)) || (receive_len && (serial_in_byte_counter == receive_len))) {
-        SonoffBridgeReceivedRaw();
-        SnfBridge.receive_flag = 0;
-        return 1;
-      }
-    }
-    else if (!((0 == serial_in_byte_counter) && (0 == serial_in_byte))) {
-      if (0 == serial_in_byte_counter) {
-        SnfBridge.expected_bytes = 2;
-        if (serial_in_byte >= 0xA3) {
-          SnfBridge.expected_bytes = 11;
-        }
-        if (serial_in_byte == 0xA6) {
-          SnfBridge.expected_bytes = 0;
-          serial_in_buffer[serial_in_byte_counter++] = 0xAA;
-          SnfBridge.receive_raw_flag = 1;
-        }
-      }
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if ((SnfBridge.expected_bytes == serial_in_byte_counter) && (0x55 == serial_in_byte)) {
-        SonoffBridgeReceived();
-        SnfBridge.receive_flag = 0;
-        return 1;
-      }
-    }
-    serial_in_byte = 0;
-  }
-  if (0xAA == serial_in_byte) {
-    serial_in_byte_counter = 0;
-    serial_in_byte = 0;
-    SnfBridge.receive_flag = 1;
-    receive_len = 0;
-  }
-  return 0;
-}
-
-void SonoffBridgeSendCommand(uint8_t code)
-{
-  Serial.write(0xAA);
-  Serial.write(code);
-  Serial.write(0x55);
-}
-
-void SonoffBridgeSendAck(void)
-{
-  Serial.write(0xAA);
-  Serial.write(0xA0);
-  Serial.write(0x55);
-}
-
-void SonoffBridgeSendCode(uint32_t code)
-{
-  Serial.write(0xAA);
-  Serial.write(0xA5);
-  for (uint32_t i = 0; i < 6; i++) {
-    Serial.write(Settings.rf_code[0][i]);
-  }
-  Serial.write((code >> 16) & 0xff);
-  Serial.write((code >> 8) & 0xff);
-  Serial.write(code & 0xff);
-  Serial.write(0x55);
-  Serial.flush();
-}
-
-void SonoffBridgeSend(uint8_t idx, uint8_t key)
-{
-  uint8_t code;
-
-  key--;
-  Serial.write(0xAA);
-  Serial.write(0xA5);
-  for (uint32_t i = 0; i < 8; i++) {
-    Serial.write(Settings.rf_code[idx][i]);
-  }
-  if (0 == idx) {
-    code = (0x10 << (key >> 2)) | (1 << (key & 3));
-  } else {
-    code = Settings.rf_code[idx][8];
-  }
-  Serial.write(code);
-  Serial.write(0x55);
-  Serial.flush();
-#ifdef USE_DOMOTICZ
-
-
-#endif
-}
-
-void SonoffBridgeLearn(uint8_t key)
-{
-  SnfBridge.learn_key = key;
-  SnfBridge.learn_active = 1;
-  SnfBridge.last_learn_time = millis();
-  Serial.write(0xAA);
-  Serial.write(0xA1);
-  Serial.write(0x55);
-}
-
-
-
-
-
-void CmndRfBridge(void)
-{
-  char *p;
-  char stemp [10];
-  uint32_t code = 0;
-  uint8_t radix = 10;
-
-  uint32_t set_index = XdrvMailbox.command_code *2;
-
-  if (XdrvMailbox.data[0] == '#') {
-    XdrvMailbox.data++;
-    XdrvMailbox.data_len--;
-    radix = 16;
-  }
-
-  if (XdrvMailbox.data_len) {
-    code = strtol(XdrvMailbox.data, &p, radix);
-    if (code) {
-      if (CMND_RFCODE == XdrvMailbox.command_code) {
-        SnfBridge.last_send_code = code;
-        SonoffBridgeSendCode(code);
-      } else {
-        if (1 == XdrvMailbox.payload) {
-          code = pgm_read_byte(kDefaultRfCode + set_index) << 8 | pgm_read_byte(kDefaultRfCode + set_index +1);
-        }
-        uint8_t msb = code >> 8;
-        uint8_t lsb = code & 0xFF;
-        if ((code > 0) && (code < 0x7FFF) && (msb != 0x55) && (lsb != 0x55)) {
-          Settings.rf_code[0][set_index] = msb;
-          Settings.rf_code[0][set_index +1] = lsb;
-        }
-      }
-    }
-  }
-  if (CMND_RFCODE == XdrvMailbox.command_code) {
-    code = SnfBridge.last_send_code;
-  } else {
-    code = Settings.rf_code[0][set_index] << 8 | Settings.rf_code[0][set_index +1];
-  }
-  if (10 == radix) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("%d"), code);
-  } else {
-    snprintf_P(stemp, sizeof(stemp), PSTR("\"#%06X\""), code);
-  }
-  Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, stemp);
-}
-
-void CmndRfKey(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 16)) {
-    unsigned long now = millis();
-    if ((!SnfBridge.learn_active) || (now - SnfBridge.last_learn_time > 60100)) {
-      SnfBridge.learn_active = 0;
-      if (2 == XdrvMailbox.payload) {
-        SonoffBridgeLearn(XdrvMailbox.index);
-        ResponseCmndIdxChar(D_JSON_START_LEARNING);
-      }
-      else if (3 == XdrvMailbox.payload) {
-        Settings.rf_code[XdrvMailbox.index][0] = 0;
-        ResponseCmndIdxChar(D_JSON_SET_TO_DEFAULT);
-      }
-      else if (4 == XdrvMailbox.payload) {
-        for (uint32_t i = 0; i < 6; i++) {
-          Settings.rf_code[XdrvMailbox.index][i] = Settings.rf_code[0][i];
-        }
-        Settings.rf_code[XdrvMailbox.index][6] = (SnfBridge.last_send_code >> 16) & 0xff;
-        Settings.rf_code[XdrvMailbox.index][7] = (SnfBridge.last_send_code >> 8) & 0xff;
-        Settings.rf_code[XdrvMailbox.index][8] = SnfBridge.last_send_code & 0xff;
-        ResponseCmndIdxChar(D_JSON_SAVED);
-      } else if (5 == XdrvMailbox.payload) {
-        uint8_t key = XdrvMailbox.index;
-        uint8_t index = (0 == Settings.rf_code[key][0]) ? 0 : key;
-        uint16_t sync_time = (Settings.rf_code[index][0] << 8) | Settings.rf_code[index][1];
-        uint16_t low_time = (Settings.rf_code[index][2] << 8) | Settings.rf_code[index][3];
-        uint16_t high_time = (Settings.rf_code[index][4] << 8) | Settings.rf_code[index][5];
-        uint32_t code = (Settings.rf_code[index][6] << 16) | (Settings.rf_code[index][7] << 8);
-        if (0 == index) {
-          key--;
-          code |= (uint8_t)((0x10 << (key >> 2)) | (1 << (key & 3)));
-        } else {
-          code |= Settings.rf_code[index][8];
-        }
-        Response_P(PSTR("{\"%s%d\":{\"" D_JSON_SYNC "\":%d,\"" D_JSON_LOW "\":%d,\"" D_JSON_HIGH "\":%d,\"" D_JSON_DATA "\":\"%06X\"}}"),
-                   XdrvMailbox.command, XdrvMailbox.index, sync_time, low_time, high_time, code);
-      } else {
-        if ((1 == XdrvMailbox.payload) || (0 == Settings.rf_code[XdrvMailbox.index][0])) {
-          SonoffBridgeSend(0, XdrvMailbox.index);
-          ResponseCmndIdxChar(D_JSON_DEFAULT_SENT);
-        } else {
-          SonoffBridgeSend(XdrvMailbox.index, 0);
-          ResponseCmndIdxChar(D_JSON_LEARNED_SENT);
-        }
-      }
-    } else {
-      Response_P(S_JSON_COMMAND_INDEX_SVALUE, XdrvMailbox.command, SnfBridge.learn_key, D_JSON_LEARNING_ACTIVE);
-    }
-  }
-}
-
-void CmndRfRaw(void)
-{
-  if (XdrvMailbox.data_len) {
-    if (XdrvMailbox.data_len < 6) {
-      switch (XdrvMailbox.payload) {
-      case 0:
-        SonoffBridgeSendCommand(0xA7);
-      case 1:
-        SnfBridge.receive_raw_flag = XdrvMailbox.payload;
-        break;
-      case 166:
-      case 167:
-      case 169:
-      case 176:
-      case 177:
-      case 255:
-        SonoffBridgeSendCommand(XdrvMailbox.payload);
-        SnfBridge.receive_raw_flag = 1;
-        break;
-      case 192:
-        char beep[] = "AAC000C055\0";
-        SerialSendRaw(beep);
-        break;
-      }
-    } else {
-      SerialSendRaw(RemoveSpace(XdrvMailbox.data));
-      SnfBridge.receive_raw_flag = 1;
-    }
-  }
-  ResponseCmndStateText(SnfBridge.receive_raw_flag);
-}
-
-
-
-
-
-bool Xdrv06(uint8_t function)
-{
-  bool result = false;
-
-  if (SONOFF_BRIDGE == my_module_type) {
-    switch (function) {
-      case FUNC_SERIAL:
-        result = SonoffBridgeSerialInput();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSonoffBridgeCommands, SonoffBridgeCommand);
-        break;
-      case FUNC_INIT:
-        SnfBridge.receive_raw_flag = 0;
-        SonoffBridgeSendCommand(0xA7);
-        break;
-      case FUNC_PRE_INIT:
-        SetSerial(19200, TS_SERIAL_8N1);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
-#ifdef USE_DOMOTICZ
-
-#define XDRV_07 7
-
-#define D_PRFX_DOMOTICZ "Domoticz"
-#define D_CMND_IDX "Idx"
-#define D_CMND_KEYIDX "KeyIdx"
-#define D_CMND_SWITCHIDX "SwitchIdx"
-#define D_CMND_SENSORIDX "SensorIdx"
-#define D_CMND_UPDATETIMER "UpdateTimer"
-
-const char kDomoticzCommands[] PROGMEM = D_PRFX_DOMOTICZ "|"
-  D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
-
-void (* const DomoticzCommand[])(void) PROGMEM = {
-  &CmndDomoticzIdx, &CmndDomoticzKeyIdx, &CmndDomoticzSwitchIdx, &CmndDomoticzSensorIdx, &CmndDomoticzUpdateTimer };
-
-const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}";
-
-#if MAX_DOMOTICZ_SNS_IDX < DZ_MAX_SENSORS
-  #error "Domoticz: Too many sensors or change settings.h layout"
-#endif
-
-const char kDomoticzSensors[] PROGMEM =
-  D_DOMOTICZ_TEMP "|" D_DOMOTICZ_TEMP_HUM "|" D_DOMOTICZ_TEMP_HUM_BARO "|" D_DOMOTICZ_POWER_ENERGY "|" D_DOMOTICZ_ILLUMINANCE "|"
-  D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY "|" D_DOMOTICZ_P1_SMART_METER "|" D_DOMOTICZ_SHUTTER ;
-
-char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC;
-
-int domoticz_update_timer = 0;
-uint32_t domoticz_fan_debounce = 0;
-bool domoticz_subscribe = false;
-bool domoticz_update_flag = true;
-
-#ifdef USE_SHUTTER
-bool domoticz_is_shutter = false;
-#endif
-
-int DomoticzBatteryQuality(void)
-{
-
-
-
-
-  int quality = 100;
-
-#ifdef USE_ADC_VCC
-  uint16_t voltage = ESP.getVcc();
-  if (voltage <= 2600) {
-    quality = 0;
-  } else if (voltage >= 4600) {
-    quality = 200;
-  } else {
-    quality = (voltage - 2600) / 10;
-  }
-#endif
-  return quality;
-}
-
-int DomoticzRssiQuality(void)
-{
-
-
-  return WifiGetRssiAsQuality(WiFi.RSSI()) / 10;
-}
-
-#ifdef USE_SONOFF_IFAN
-void MqttPublishDomoticzFanState(void)
-{
-  if (Settings.flag.mqtt_enabled && Settings.domoticz_relay_idx[1]) {
-    char svalue[8];
-
-    int fan_speed = GetFanspeed();
-    snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fan_speed * 10);
-    Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[1], (0 == fan_speed) ? 0 : 2, svalue, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    MqttPublish(domoticz_in_topic);
-
-    domoticz_fan_debounce = millis();
-  }
-}
-
-void DomoticzUpdateFanState(void)
-{
-  if (domoticz_update_flag) {
-    MqttPublishDomoticzFanState();
-  }
-  domoticz_update_flag = true;
-}
-#endif
-
-void MqttPublishDomoticzPowerState(uint8_t device)
-{
-  if (Settings.flag.mqtt_enabled) {
-    if ((device < 1) || (device > devices_present)) { device = 1; }
-    if (Settings.domoticz_relay_idx[device -1]) {
-#ifdef USE_SHUTTER
-      if (domoticz_is_shutter) {
-
-      } else {
-#endif
-#ifdef USE_SONOFF_IFAN
-      if (IsModuleIfan() && (device > 1)) {
-
-      } else {
-#endif
-        char svalue[8];
-
-        snprintf_P(svalue, sizeof(svalue), PSTR("%d"), Settings.light_dimmer);
-        Response_P(DOMOTICZ_MESSAGE, (int)Settings.domoticz_relay_idx[device -1], (power & (1 << (device -1))) ? 1 : 0, (light_type) ? svalue : "", DomoticzBatteryQuality(), DomoticzRssiQuality());
-        MqttPublish(domoticz_in_topic);
-#ifdef USE_SONOFF_IFAN
-      }
-#endif
-#ifdef USE_SHUTTER
-      }
-#endif
-    }
-  }
-}
-
-void DomoticzUpdatePowerState(uint8_t device)
-{
-  if (domoticz_update_flag) {
-    MqttPublishDomoticzPowerState(device);
-  }
-  domoticz_update_flag = true;
-}
-
-void DomoticzMqttUpdate(void)
-{
-  if (domoticz_subscribe && (Settings.domoticz_update_timer || domoticz_update_timer)) {
-    domoticz_update_timer--;
-    if (domoticz_update_timer <= 0) {
-      domoticz_update_timer = Settings.domoticz_update_timer;
-      for (uint32_t i = 1; i <= devices_present; i++) {
-#ifdef USE_SHUTTER
-        if (domoticz_is_shutter)
-        {
-
-            break;
-        }
-#endif
-#ifdef USE_SONOFF_IFAN
-        if (IsModuleIfan() && (i > 1)) {
-          MqttPublishDomoticzFanState();
-          break;
-        } else {
-#endif
-          MqttPublishDomoticzPowerState(i);
-#ifdef USE_SONOFF_IFAN
-        }
-#endif
-      }
-    }
-  }
-}
-
-void DomoticzMqttSubscribe(void)
-{
-  uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
-  for (uint32_t i = 0; i < maxdev; i++) {
-    if (Settings.domoticz_relay_idx[i]) {
-      domoticz_subscribe = true;
-    }
-  }
-
-  if (domoticz_subscribe) {
-    char stopic[TOPSZ];
-    snprintf_P(stopic, sizeof(stopic), PSTR(DOMOTICZ_OUT_TOPIC "/#"));
-    MqttSubscribe(stopic);
-  }
-}
-# 219 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
-bool DomoticzMqttData(void)
-{
-  domoticz_update_flag = true;
-
-  if (strncasecmp_P(XdrvMailbox.topic, PSTR(DOMOTICZ_OUT_TOPIC), strlen(DOMOTICZ_OUT_TOPIC)) != 0) {
-    return false;
-  }
-
-
-  if (XdrvMailbox.data_len < 20) {
-    return true;
-  }
-  StaticJsonBuffer<400> jsonBuf;
-  JsonObject& domoticz = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!domoticz.success()) {
-    return true;
-  }
-
-
-
-  uint32_t idx = domoticz["idx"];
-  int16_t nvalue = -1;
-  if (domoticz.containsKey("nvalue")) {
-    nvalue = domoticz["nvalue"];
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ "idx %d, nvalue %d"), idx, nvalue);
-
-  bool found = false;
-  if ((idx > 0) && (nvalue >= 0) && (nvalue <= 15)) {
-    uint8_t maxdev = (devices_present > MAX_DOMOTICZ_IDX) ? MAX_DOMOTICZ_IDX : devices_present;
-    for (uint32_t i = 0; i < maxdev; i++) {
-      if (idx == Settings.domoticz_relay_idx[i]) {
-        bool iscolordimmer = strcmp_P(domoticz["dtype"],PSTR("Color Switch")) == 0;
-        bool isShutter = strcmp_P(domoticz["dtype"],PSTR("Light/Switch")) == 0 & strncmp_P(domoticz["switchType"],PSTR("Blinds"), 6) == 0;
-
-        char stemp1[10];
-        snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), i +1);
-#ifdef USE_SONOFF_IFAN
-        if (IsModuleIfan() && (1 == i)) {
-          uint8_t svalue = 0;
-          if (domoticz.containsKey("svalue1")) {
-            svalue = domoticz["svalue1"];
-          } else {
-            return true;
-          }
-          svalue = (nvalue == 2) ? svalue / 10 : 0;
-          if (GetFanspeed() == svalue) {
-            return true;
-          }
-          if (TimePassedSince(domoticz_fan_debounce) < 1000) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_FANSPEED));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), svalue);
-          found = true;
-        } else
-#endif
-#ifdef USE_SHUTTER
-        if (isShutter)
-        {
-          if (domoticz.containsKey("nvalue")) {
-            nvalue = domoticz["nvalue"];
-          }
-
-          uint8_t position = 0;
-          if (domoticz.containsKey("svalue1")) {
-            position = domoticz["svalue1"];
-          }
-          if (nvalue != 2) {
-            position = nvalue == 0 ? 0 : 100;
-          }
-
-          snprintf_P(XdrvMailbox.topic, TOPSZ, PSTR("/" D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), position);
-          XdrvMailbox.data_len = position > 99 ? 3 : (position > 9 ? 2 : 1);
-
-          found = true;
-        } else
-#endif
-#ifdef USE_LIGHT
-        if (iscolordimmer && 10 == nvalue) {
-
-          JsonObject& color = domoticz["Color"];
-          uint16_t level = nvalue = domoticz["svalue1"];
-          uint16_t r = color["r"]; r = r * level / 100;
-          uint16_t g = color["g"]; g = g * level / 100;
-          uint16_t b = color["b"]; b = b * level / 100;
-          uint16_t cw = color["cw"]; cw = cw * level / 100;
-          uint16_t ww = color["ww"]; ww = ww * level / 100;
-          uint16_t m = 0;
-          uint16_t t = 0;
-          if (color.containsKey("m")) {
-            m = color["m"];
-            t = color["t"];
-          }
-          if (2 == m) {
-            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_BACKLOG));
-            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR(D_CMND_COLORTEMPERATURE " %d;" D_CMND_DIMMER " %d"), changeUIntScale(t, 0, 255, CT_MIN, CT_MAX), level);
-          } else {
-            snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_COLOR));
-            snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%02x%02x%02x%02x%02x"), r, g, b, cw, ww);
-          }
-          found = true;
-        }
-        else if ((!iscolordimmer && 2 == nvalue) ||
-                  (iscolordimmer && 15 == nvalue)) {
-          if (domoticz.containsKey("svalue1")) {
-            nvalue = domoticz["svalue1"];
-          } else {
-            return true;
-          }
-          if (light_type && (Settings.light_dimmer == nvalue) && ((power >> i) &1)) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_DIMMER));
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
-          found = true;
-        } else
-#endif
-        if (1 == nvalue || 0 == nvalue) {
-          if (((power >> i) &1) == (power_t)nvalue) {
-            return true;
-          }
-          snprintf_P(XdrvMailbox.topic, XdrvMailbox.index, PSTR("/" D_CMND_POWER "%s"), (devices_present > 1) ? stemp1 : "");
-          snprintf_P(XdrvMailbox.data, XdrvMailbox.data_len, PSTR("%d"), nvalue);
-          found = true;
-        }
-        break;
-      }
-    }
-  }
-  if (!found) { return true; }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_DOMOTICZ D_RECEIVED_TOPIC " %s, " D_DATA " %s"), XdrvMailbox.topic, XdrvMailbox.data);
-
-  domoticz_update_flag = false;
-  return false;
-}
-
-
-
-bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg)
-{
-  bool result = false;
-
-  if (device <= MAX_DOMOTICZ_IDX) {
-    if ((Settings.domoticz_key_idx[device -1] || Settings.domoticz_switch_idx[device -1]) && (svalflg)) {
-      Response_P(PSTR("{\"command\":\"switchlight\",\"idx\":%d,\"switchcmd\":\"%s\"}"),
-        (key) ? Settings.domoticz_switch_idx[device -1] : Settings.domoticz_key_idx[device -1], (state) ? (POWER_TOGGLE == state) ? "Toggle" : "On" : "Off");
-      MqttPublish(domoticz_in_topic);
-      result = true;
-    }
-  }
-  return result;
-}
-# 393 "S:/Development/Tasmota/tasmota/xdrv_07_domoticz.ino"
-uint8_t DomoticzHumidityState(char *hum)
-{
-  uint8_t h = atoi(hum);
-  return (!h) ? 0 : (h < 40) ? 2 : (h > 70) ? 3 : 1;
-}
-
-void DomoticzSensor(uint8_t idx, char *data)
-{
-  if (Settings.domoticz_sensor_idx[idx]) {
-    char dmess[128];
-
-    memcpy(dmess, mqtt_data, sizeof(dmess));
-    if (DZ_AIRQUALITY == idx) {
-      Response_P(PSTR("{\"idx\":%d,\"nvalue\":%s,\"Battery\":%d,\"RSSI\":%d}"),
-        Settings.domoticz_sensor_idx[idx], data, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    } else {
-      uint8_t nvalue = 0;
-#ifdef USE_SHUTTER
-      if (DZ_SHUTTER == idx) {
-        uint8_t position = atoi(data);
-        nvalue = position < 2 ? 0 : (position == 100 ? 1 : 2);
-      }
-#endif
-      Response_P(DOMOTICZ_MESSAGE,
-        Settings.domoticz_sensor_idx[idx], nvalue, data, DomoticzBatteryQuality(), DomoticzRssiQuality());
-    }
-    MqttPublish(domoticz_in_topic);
-    memcpy(mqtt_data, dmess, sizeof(dmess));
-  }
-}
-
-void DomoticzSensor(uint8_t idx, uint32_t value)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%d"), value);
-  DomoticzSensor(idx, data);
-}
-
-void DomoticzTempHumSensor(char *temp, char *hum)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d"), temp, hum, DomoticzHumidityState(hum));
-  DomoticzSensor(DZ_TEMP_HUM, data);
-}
-
-void DomoticzTempHumPressureSensor(char *temp, char *hum, char *baro)
-{
-  char data[32];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%d;%s;5"), temp, hum, DomoticzHumidityState(hum), baro);
-  DomoticzSensor(DZ_TEMP_HUM_BARO, data);
-}
-
-void DomoticzSensorPowerEnergy(int power, char *energy)
-{
-  char data[16];
-  snprintf_P(data, sizeof(data), PSTR("%d;%s"), power, energy);
-  DomoticzSensor(DZ_POWER_ENERGY, data);
-}
-
-void DomoticzSensorP1SmartMeter(char *usage1, char *usage2, char *return1, char *return2, int power)
-{
-
-
-
-
-
-  int consumed = power;
-  int produced = 0;
-  if (power < 0) {
-    consumed = 0;
-    produced = -power;
-  }
-  char data[64];
-  snprintf_P(data, sizeof(data), PSTR("%s;%s;%s;%s;%d;%d"), usage1, usage2, return1, return2, consumed, produced);
-  DomoticzSensor(DZ_P1_SMART_METER, data);
-}
-
-
-
-
-
-void CmndDomoticzIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzKeyIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_key_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzSwitchIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzSensorIdx(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
-    if (XdrvMailbox.payload >= 0) {
-      Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDomoticzUpdateTimer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-    Settings.domoticz_update_timer = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.domoticz_update_timer);
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_DOMOTICZ "dm"
-
-const char S_CONFIGURE_DOMOTICZ[] PROGMEM = D_CONFIGURE_DOMOTICZ;
-
-const char HTTP_BTN_MENU_DOMOTICZ[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_DOMOTICZ "' method='get'><button>" D_CONFIGURE_DOMOTICZ "</button></form></p>";
-
-const char HTTP_FORM_DOMOTICZ[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_DOMOTICZ_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>"
-  "<table>";
-const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' placeholder='0' value='%d'></td></tr>"
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' placeholder='0' value='%d'></td></tr>";
-const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
-  "<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'></td></tr>";
-
-void HandleDomoticzConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_DOMOTICZ);
-
-  if (WebServer->hasArg("save")) {
-    DomoticzSaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  char stemp[40];
-
-  WSContentStart_P(S_CONFIGURE_DOMOTICZ);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_DOMOTICZ);
-  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
-    if (i < devices_present) {
-      WSContentSend_P(HTTP_FORM_DOMOTICZ_RELAY,
-        i +1, i, Settings.domoticz_relay_idx[i],
-        i +1, i, Settings.domoticz_key_idx[i]);
-    }
-    if (pin[GPIO_SWT1 +i] < 99) {
-      WSContentSend_P(HTTP_FORM_DOMOTICZ_SWITCH,
-        i +1, i, Settings.domoticz_switch_idx[i]);
-    }
-#ifdef USE_SONOFF_IFAN
-    if (IsModuleIfan() && (1 == i)) { break; }
-#endif
-  }
-  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
-    WSContentSend_P(HTTP_FORM_DOMOTICZ_SENSOR,
-      i +1, GetTextIndexed(stemp, sizeof(stemp), i, kDomoticzSensors), i, Settings.domoticz_sensor_idx[i]);
-  }
-  WSContentSend_P(HTTP_FORM_DOMOTICZ_TIMER, Settings.domoticz_update_timer);
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void DomoticzSaveSettings(void)
-{
-  char stemp[20];
-  char ssensor_indices[6 * MAX_DOMOTICZ_SNS_IDX];
-  char tmp[100];
-
-  for (uint32_t i = 0; i < MAX_DOMOTICZ_IDX; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("r%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_relay_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(stemp, sizeof(stemp), PSTR("k%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_key_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(stemp, sizeof(stemp), PSTR("s%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_switch_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-  }
-  ssensor_indices[0] = '\0';
-  for (uint32_t i = 0; i < DZ_MAX_SENSORS; i++) {
-    snprintf_P(stemp, sizeof(stemp), PSTR("l%d"), i);
-    WebGetArg(stemp, tmp, sizeof(tmp));
-    Settings.domoticz_sensor_idx[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
-    snprintf_P(ssensor_indices, sizeof(ssensor_indices), PSTR("%s%s%d"), ssensor_indices, (strlen(ssensor_indices)) ? "," : "", Settings.domoticz_sensor_idx[i]);
-  }
-  WebGetArg("ut", tmp, sizeof(tmp));
-  Settings.domoticz_update_timer = (!strlen(tmp)) ? DOMOTICZ_UPDATE_TIMER : atoi(tmp);
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_DOMOTICZ D_CMND_IDX " %d,%d,%d,%d, " D_CMND_KEYIDX " %d,%d,%d,%d, " D_CMND_SWITCHIDX " %d,%d,%d,%d, " D_CMND_SENSORIDX " %s, " D_CMND_UPDATETIMER " %d"),
-    Settings.domoticz_relay_idx[0], Settings.domoticz_relay_idx[1], Settings.domoticz_relay_idx[2], Settings.domoticz_relay_idx[3],
-    Settings.domoticz_key_idx[0], Settings.domoticz_key_idx[1], Settings.domoticz_key_idx[2], Settings.domoticz_key_idx[3],
-    Settings.domoticz_switch_idx[0], Settings.domoticz_switch_idx[1], Settings.domoticz_switch_idx[2], Settings.domoticz_switch_idx[3],
-    ssensor_indices, Settings.domoticz_update_timer);
-}
-#endif
-
-
-
-
-
-bool Xdrv07(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DomoticzMqttUpdate();
-        break;
-      case FUNC_MQTT_DATA:
-        result = DomoticzMqttData();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_DOMOTICZ);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_DOMOTICZ, HandleDomoticzConfiguration);
-        break;
-#endif
-      case FUNC_MQTT_SUBSCRIBE:
-        DomoticzMqttSubscribe();
-#ifdef USE_SHUTTER
-        if (Settings.domoticz_sensor_idx[DZ_SHUTTER]) { domoticz_is_shutter = true; }
-#endif
-        break;
-      case FUNC_MQTT_INIT:
-        domoticz_update_timer = 2;
-        break;
-      case FUNC_SHOW_SENSOR:
-
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kDomoticzCommands, DomoticzCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_08_serial_bridge.ino"
-#ifdef USE_SERIAL_BRIDGE
-
-
-
-
-#define XDRV_08 8
-
-const uint8_t SERIAL_BRIDGE_BUFFER_SIZE = 130;
-
-const char kSerialBridgeCommands[] PROGMEM = "|"
-  D_CMND_SSERIALSEND "|" D_CMND_SBAUDRATE;
-
-void (* const SerialBridgeCommand[])(void) PROGMEM = {
-  &CmndSSerialSend, &CmndSBaudrate };
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *SerialBridgeSerial = nullptr;
-
-unsigned long serial_bridge_polling_window = 0;
-char *serial_bridge_buffer = nullptr;
-int serial_bridge_in_byte_counter = 0;
-bool serial_bridge_active = true;
-bool serial_bridge_raw = false;
-
-void SerialBridgeInput(void)
-{
-  while (SerialBridgeSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = SerialBridgeSerial->read();
-
-    if ((serial_in_byte > 127) && !serial_bridge_raw) {
-      serial_bridge_in_byte_counter = 0;
-      SerialBridgeSerial->flush();
-      return;
-    }
-    if (serial_in_byte || serial_bridge_raw) {
-
-      if ((serial_bridge_in_byte_counter < SERIAL_BRIDGE_BUFFER_SIZE -1) &&
-          ((isprint(serial_in_byte) && (128 == Settings.serial_delimiter)) ||
-          ((serial_in_byte != Settings.serial_delimiter) && (128 != Settings.serial_delimiter)) ||
-            serial_bridge_raw)) {
-        serial_bridge_buffer[serial_bridge_in_byte_counter++] = serial_in_byte;
-        serial_bridge_polling_window = millis();
-      } else {
-        serial_bridge_polling_window = 0;
-        break;
-      }
-    }
-  }
-
-  if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
-    serial_bridge_buffer[serial_bridge_in_byte_counter] = 0;
-    char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
-    bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
-    Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":%s%s%s}"),
-      (assume_json) ? "" : """",
-      (serial_bridge_raw) ? ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)) : serial_bridge_buffer,
-      (assume_json) ? "" : """");
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
-    XdrvRulesProcess();
-    serial_bridge_in_byte_counter = 0;
-  }
-}
-
-
-
-void SerialBridgeInit(void)
-{
-  serial_bridge_active = false;
-  if ((pin[GPIO_SBR_RX] < 99) && (pin[GPIO_SBR_TX] < 99)) {
-    SerialBridgeSerial = new TasmotaSerial(pin[GPIO_SBR_RX], pin[GPIO_SBR_TX]);
-    if (SerialBridgeSerial->begin(Settings.sbaudrate * 300)) {
-      if (SerialBridgeSerial->hardwareSerial()) {
-        ClaimSerial();
-        serial_bridge_buffer = serial_in_buffer;
-      } else {
-        serial_bridge_buffer = (char*)(malloc(SERIAL_BRIDGE_BUFFER_SIZE));
-      }
-      serial_bridge_active = true;
-      SerialBridgeSerial->flush();
-    }
-  }
-}
-
-
-
-
-
-void CmndSSerialSend(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 5)) {
-    serial_bridge_raw = (XdrvMailbox.index > 3);
-    if (XdrvMailbox.data_len > 0) {
-      if (1 == XdrvMailbox.index) {
-        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
-        SerialBridgeSerial->write("\n");
-      }
-      else if ((2 == XdrvMailbox.index) || (4 == XdrvMailbox.index)) {
-        SerialBridgeSerial->write(XdrvMailbox.data, XdrvMailbox.data_len);
-      }
-      else if (3 == XdrvMailbox.index) {
-        SerialBridgeSerial->write(Unescape(XdrvMailbox.data, &XdrvMailbox.data_len), XdrvMailbox.data_len);
-      }
-      else if (5 == XdrvMailbox.index) {
-        char *p;
-        char stemp[3];
-        uint8_t code;
-
-        char *codes = RemoveSpace(XdrvMailbox.data);
-        int size = strlen(XdrvMailbox.data);
-
-        while (size > 1) {
-          strlcpy(stemp, codes, sizeof(stemp));
-          code = strtol(stemp, &p, 16);
-          SerialBridgeSerial->write(code);
-          size -= 2;
-          codes += 2;
-        }
-      }
-      ResponseCmndDone();
-    }
-  }
-}
-
-void CmndSBaudrate(void)
-{
-  if (XdrvMailbox.payload >= 300) {
-    XdrvMailbox.payload /= 300;
-    Settings.sbaudrate = XdrvMailbox.payload;
-    SerialBridgeSerial->begin(Settings.sbaudrate * 300);
-  }
-  ResponseCmndNumber(Settings.sbaudrate * 300);
-}
-
-
-
-
-
-bool Xdrv08(uint8_t function)
-{
-  bool result = false;
-
-  if (serial_bridge_active) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (SerialBridgeSerial) { SerialBridgeInput(); }
-        break;
-      case FUNC_PRE_INIT:
-        SerialBridgeInit();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSerialBridgeCommands, SerialBridgeCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
-#ifdef USE_TIMERS
-# 39 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
-#define XDRV_09 9
-
-const char kTimerCommands[] PROGMEM = "|"
-  D_CMND_TIMER "|" D_CMND_TIMERS
-#ifdef USE_SUNRISE
-  "|" D_CMND_LATITUDE "|" D_CMND_LONGITUDE
-#endif
-  ;
-
-void (* const TimerCommand[])(void) PROGMEM = {
-  &CmndTimer, &CmndTimers
-#ifdef USE_SUNRISE
-  , &CmndLatitude, &CmndLongitude
-#endif
-  };
-
-uint16_t timer_last_minute = 60;
-int8_t timer_window[MAX_TIMERS] = { 0 };
-
-#ifdef USE_SUNRISE
-# 67 "S:/Development/Tasmota/tasmota/xdrv_09_timers.ino"
-const float pi2 = TWO_PI;
-const float pi = PI;
-const float RAD = DEG_TO_RAD;
-
-float JulianischesDatum(void)
-{
-
-  int Gregor;
-  int Jahr = RtcTime.year;
-  int Monat = RtcTime.month;
-  int Tag = RtcTime.day_of_month;
-
-  if (Monat <= 2) {
-    Monat += 12;
-    Jahr -= 1;
-  }
-  Gregor = (Jahr / 400) - (Jahr / 100) + (Jahr / 4);
-  return 2400000.5f + 365.0f*Jahr - 679004.0f + Gregor + (int)(30.6001f * (Monat +1)) + Tag + 0.5f;
-}
-
-float InPi(float x)
-{
-  int n = (int)(x / pi2);
-  x = x - n*pi2;
-  if (x < 0) x += pi2;
-  return x;
-}
-
-float eps(float T)
-{
-
-  return RAD * (23.43929111f + (-46.8150f*T - 0.00059f*T*T + 0.001813f*T*T*T)/3600.0f);
-}
-
-float BerechneZeitgleichung(float *DK,float T)
-{
-  float RA_Mittel = 18.71506921f + 2400.0513369f*T +(2.5862e-5f - 1.72e-9f*T)*T*T;
-  float M = InPi(pi2 * (0.993133f + 99.997361f*T));
-  float L = InPi(pi2 * (0.7859453f + M/pi2 + (6893.0f*sinf(M)+72.0f*sinf(2.0f*M)+6191.2f*T) / 1296.0e3f));
-  float e = eps(T);
-  float RA = atanf(tanf(L)*cosf(e));
-  if (RA < 0.0) RA += pi;
-  if (L > pi) RA += pi;
-  RA = 24.0*RA/pi2;
-  *DK = asinf(sinf(e)*sinf(L));
-
-  RA_Mittel = 24.0f * InPi(pi2*RA_Mittel/24.0f)/pi2;
-  float dRA = RA_Mittel - RA;
-  if (dRA < -12.0f) dRA += 24.0f;
-  if (dRA > 12.0f) dRA -= 24.0f;
-  dRA = dRA * 1.0027379f;
-  return dRA;
-}
-
-void DuskTillDawn(uint8_t *hour_up,uint8_t *minute_up, uint8_t *hour_down, uint8_t *minute_down)
-{
-  float JD2000 = 2451545.0f;
-  float JD = JulianischesDatum();
-  float T = (JD - JD2000) / 36525.0f;
-  float DK;
-
-
-
-
-
-
-
-  float h = SUNRISE_DAWN_ANGLE *RAD;
-  float B = (((float)Settings.latitude)/1000000) * RAD;
-  float GeographischeLaenge = ((float)Settings.longitude)/1000000;
-
-
-
-  float Zeitzone = ((float)Rtc.time_timezone) / 60;
-  float Zeitgleichung = BerechneZeitgleichung(&DK, T);
-  float Zeitdifferenz = 12.0f*acosf((sinf(h) - sinf(B)*sinf(DK)) / (cosf(B)*cosf(DK)))/pi;
-  float AufgangOrtszeit = 12.0f - Zeitdifferenz - Zeitgleichung;
-  float UntergangOrtszeit = 12.0f + Zeitdifferenz - Zeitgleichung;
-  float AufgangWeltzeit = AufgangOrtszeit - GeographischeLaenge / 15.0f;
-  float UntergangWeltzeit = UntergangOrtszeit - GeographischeLaenge / 15.0f;
-  float Aufgang = AufgangWeltzeit + Zeitzone;
-  if (Aufgang < 0.0f) {
-    Aufgang += 24.0f;
-  } else {
-    if (Aufgang >= 24.0f) Aufgang -= 24.0f;
-  }
-  float Untergang = UntergangWeltzeit + Zeitzone;
-  if (Untergang < 0.0f) {
-    Untergang += 24.0f;
-  } else {
-    if (Untergang >= 24.0f) Untergang -= 24.0f;
-  }
-  int AufgangMinuten = (int)(60.0f*(Aufgang - (int)Aufgang)+0.5f);
-  int AufgangStunden = (int)Aufgang;
-  if (AufgangMinuten >= 60.0f) {
-    AufgangMinuten -= 60.0f;
-    AufgangStunden++;
-  } else {
-    if (AufgangMinuten < 0.0f) {
-      AufgangMinuten += 60.0f;
-      AufgangStunden--;
-      if (AufgangStunden < 0.0f) AufgangStunden += 24.0f;
-    }
-  }
-  int UntergangMinuten = (int)(60.0f*(Untergang - (int)Untergang)+0.5f);
-  int UntergangStunden = (int)Untergang;
-  if (UntergangMinuten >= 60.0f) {
-    UntergangMinuten -= 60.0f;
-    UntergangStunden++;
-  } else {
-    if (UntergangMinuten<0) {
-      UntergangMinuten += 60.0f;
-      UntergangStunden--;
-      if (UntergangStunden < 0.0f) UntergangStunden += 24.0f;
-    }
-  }
-  *hour_up = AufgangStunden;
-  *minute_up = AufgangMinuten;
-  *hour_down = UntergangStunden;
-  *minute_down = UntergangMinuten;
-}
-
-void ApplyTimerOffsets(Timer *duskdawn)
-{
-  uint8_t hour[2];
-  uint8_t minute[2];
-  Timer stored = (Timer)*duskdawn;
-
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  uint8_t mode = (duskdawn->mode -1) &1;
-  duskdawn->time = (hour[mode] *60) + minute[mode];
-
-
-  uint16_t timeBuffer;
-  if ((uint16_t)stored.time > 719) {
-
-    timeBuffer = (uint16_t)stored.time - 720;
-
-    if (timeBuffer > (uint16_t)duskdawn->time) {
-      timeBuffer = 1440 - (timeBuffer - (uint16_t)duskdawn->time);
-      duskdawn->days = duskdawn->days >> 1;
-      duskdawn->days |= (stored.days << 6);
-    } else {
-      timeBuffer = (uint16_t)duskdawn->time - timeBuffer;
-    }
-  } else {
-
-    timeBuffer = (uint16_t)duskdawn->time + (uint16_t)stored.time;
-
-    if (timeBuffer > 1440) {
-      timeBuffer -= 1440;
-      duskdawn->days = duskdawn->days << 1;
-      duskdawn->days |= (stored.days >> 6);
-    }
-  }
-  duskdawn->time = timeBuffer;
-}
-
-String GetSun(uint32_t dawn)
-{
-  char stime[6];
-
-  uint8_t hour[2];
-  uint8_t minute[2];
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  dawn &= 1;
-  snprintf_P(stime, sizeof(stime), PSTR("%02d:%02d"), hour[dawn], minute[dawn]);
-  return String(stime);
-}
-
-uint16_t SunMinutes(uint32_t dawn)
-{
-  uint8_t hour[2];
-  uint8_t minute[2];
-
-  DuskTillDawn(&hour[0], &minute[0], &hour[1], &minute[1]);
-  dawn &= 1;
-  return (hour[dawn] *60) + minute[dawn];
-}
-
-#endif
-
-
-
-void TimerSetRandomWindow(uint32_t index)
-{
-  timer_window[index] = 0;
-  if (Settings.timer[index].window) {
-    timer_window[index] = (random(0, (Settings.timer[index].window << 1) +1)) - Settings.timer[index].window;
-  }
-}
-
-void TimerSetRandomWindows(void)
-{
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) { TimerSetRandomWindow(i); }
-}
-
-void TimerEverySecond(void)
-{
-  if (RtcTime.valid) {
-    if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); }
-    if (Settings.flag3.timers_enable &&
-        (uptime > 60) && (RtcTime.minute != timer_last_minute)) {
-      timer_last_minute = RtcTime.minute;
-      int32_t time = (RtcTime.hour *60) + RtcTime.minute;
-      uint8_t days = 1 << (RtcTime.day_of_week -1);
-
-      for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-
-        Timer xtimer = Settings.timer[i];
-#ifdef USE_SUNRISE
-        if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
-          ApplyTimerOffsets(&xtimer);
-        }
-#endif
-        if (xtimer.arm) {
-          int32_t set_time = xtimer.time + timer_window[i];
-          if (set_time < 0) {
-            set_time = abs(timer_window[i]);
-          }
-          if (set_time > 1439) {
-            set_time = xtimer.time - abs(timer_window[i]);
-          }
-          if (set_time > 1439) { set_time = 1439; }
-
-          DEBUG_DRIVER_LOG(PSTR("TIM: Timer %d, Time %d, Window %d, SetTime %d"), i +1, xtimer.time, timer_window[i], set_time);
-
-          if (time == set_time) {
-            if (xtimer.days & days) {
-              Settings.timer[i].arm = xtimer.repeat;
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-              if (POWER_BLINK == xtimer.power) {
-                Response_P(PSTR("{\"Clock\":{\"Timer\":%d}}"), i +1);
-                XdrvRulesProcess();
-              } else
-#endif
-                if (devices_present) { ExecuteCommandPower(xtimer.device +1, xtimer.power, SRC_TIMER); }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-void PrepShowTimer(uint32_t index)
-{
-  Timer xtimer = Settings.timer[index -1];
-
-  char days[8] = { 0 };
-  for (uint32_t i = 0; i < 7; i++) {
-    uint8_t mask = 1 << i;
-    snprintf(days, sizeof(days), "%s%d", days, ((xtimer.days & mask) > 0));
-  }
-
-  char soutput[80];
-  soutput[0] = '\0';
-  if (devices_present) {
-    snprintf_P(soutput, sizeof(soutput), PSTR(",\"" D_JSON_TIMER_OUTPUT "\":%d"), xtimer.device +1);
-  }
-#ifdef USE_SUNRISE
-  char sign[2] = { 0 };
-  int16_t hour = xtimer.time / 60;
-  if ((1 == xtimer.mode) || (2 == xtimer.mode)) {
-    if (hour > 11) {
-      hour -= 12;
-      sign[0] = '-';
-    }
-  }
-  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_MODE "\":%d,\"" D_JSON_TIMER_TIME "\":\"%s%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
-    index, xtimer.arm, xtimer.mode, sign, hour, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
-#else
-  ResponseAppend_P(PSTR("\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_WINDOW "\":%d,\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d%s,\"" D_JSON_TIMER_ACTION "\":%d}"),
-    index, xtimer.arm, xtimer.time / 60, xtimer.time % 60, xtimer.window, days, xtimer.repeat, soutput, xtimer.power);
-#endif
-}
-
-
-
-
-
-void CmndTimer(void)
-{
-  uint32_t index = XdrvMailbox.index;
-  if ((index > 0) && (index <= MAX_TIMERS)) {
-    uint32_t error = 0;
-    if (XdrvMailbox.data_len) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAX_TIMERS)) {
-        if (XdrvMailbox.payload == 0) {
-          Settings.timer[index -1].data = 0;
-        } else {
-          Settings.timer[index -1].data = Settings.timer[XdrvMailbox.payload -1].data;
-        }
-      } else {
-
-#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
-        if (devices_present) {
-#endif
-          char dataBufUc[XdrvMailbox.data_len + 1];
-          UpperCase(dataBufUc, XdrvMailbox.data);
-          StaticJsonBuffer<256> jsonBuffer;
-          JsonObject& root = jsonBuffer.parseObject(dataBufUc);
-          if (!root.success()) {
-            Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_INVALID_JSON "\"}"), index);
-            error = 1;
-          }
-          else {
-            char parm_uc[10];
-            index--;
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ARM))].success()) {
-              Settings.timer[index].arm = (root[parm_uc] != 0);
-            }
-#ifdef USE_SUNRISE
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_MODE))].success()) {
-              Settings.timer[index].mode = (uint8_t)root[parm_uc] & 0x03;
-            }
-#endif
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_TIME))].success()) {
-              uint16_t itime = 0;
-              int8_t value = 0;
-              uint8_t sign = 0;
-              char time_str[10];
-
-              strlcpy(time_str, root[parm_uc], sizeof(time_str));
-              const char *substr = strtok(time_str, ":");
-              if (substr != nullptr) {
-                if (strchr(substr, '-')) {
-                  sign = 1;
-                  substr++;
-                }
-                value = atoi(substr);
-                if (sign) { value += 12; }
-                if (value > 23) { value = 23; }
-                itime = value * 60;
-                substr = strtok(nullptr, ":");
-                if (substr != nullptr) {
-                  value = atoi(substr);
-                  if (value < 0) { value = 0; }
-                  if (value > 59) { value = 59; }
-                  itime += value;
-                }
-              }
-              Settings.timer[index].time = itime;
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_WINDOW))].success()) {
-              Settings.timer[index].window = (uint8_t)root[parm_uc] & 0x0F;
-              TimerSetRandomWindow(index);
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DAYS))].success()) {
-
-              Settings.timer[index].days = 0;
-              const char *tday = root[parm_uc];
-              uint8_t i = 0;
-              char ch = *tday++;
-              while ((ch != '\0') && (i < 7)) {
-                if (ch == '-') { ch = '0'; }
-                uint8_t mask = 1 << i++;
-                Settings.timer[index].days |= (ch == '0') ? 0 : mask;
-                ch = *tday++;
-              }
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) {
-              Settings.timer[index].repeat = (root[parm_uc] != 0);
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) {
-              uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F;
-              Settings.timer[index].device = (device < devices_present) ? device : 0;
-            }
-            if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_ACTION))].success()) {
-              uint8_t action = (uint8_t)root[parm_uc] & 0x03;
-              Settings.timer[index].power = (devices_present) ? action : 3;
-            }
-
-            index++;
-          }
-
-#if defined(USE_RULES)==0 && defined(USE_SCRIPT)==0
-        } else {
-          Response_P(PSTR("{\"" D_CMND_TIMER "%d\":\"" D_JSON_TIMER_NO_DEVICE "\"}"), index);
-          error = 1;
-        }
-#endif
-      }
-    }
-    if (!error) {
-      Response_P(PSTR("{"));
-      PrepShowTimer(index);
-      ResponseJsonEnd();
-    }
-  }
-}
-
-void CmndTimers(void)
-{
-  if (XdrvMailbox.data_len) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-      Settings.flag3.timers_enable = XdrvMailbox.payload;
-    }
-    if (XdrvMailbox.payload == 2) {
-      Settings.flag3.timers_enable = !Settings.flag3.timers_enable;
-    }
-  }
-
-  ResponseCmndStateText(Settings.flag3.timers_enable);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
-
-  uint32_t jsflg = 0;
-  uint32_t lines = 1;
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    if (!jsflg) {
-      Response_P(PSTR("{\"" D_CMND_TIMERS "%d\":{"), lines++);
-    } else {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg++;
-    PrepShowTimer(i +1);
-    if (jsflg > 3) {
-      ResponseJsonEndEnd();
-      MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_TIMERS));
-      jsflg = 0;
-    }
-  }
-  mqtt_data[0] = '\0';
-}
-
-#ifdef USE_SUNRISE
-void CmndLongitude(void)
-{
-  if (XdrvMailbox.data_len) {
-    Settings.longitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
-  }
-  ResponseCmndFloat((float)(Settings.longitude) /1000000, 6);
-}
-
-void CmndLatitude(void)
-{
-  if (XdrvMailbox.data_len) {
-    Settings.latitude = (int)(CharToFloat(XdrvMailbox.data) *1000000);
-  }
-  ResponseCmndFloat((float)(Settings.latitude) /1000000, 6);
-}
-#endif
-
-
-
-
-
-#ifdef USE_WEBSERVER
-#ifdef USE_TIMERS_WEB
-
-#define WEB_HANDLE_TIMER "tm"
-
-const char S_CONFIGURE_TIMER[] PROGMEM = D_CONFIGURE_TIMER;
-
-const char HTTP_BTN_MENU_TIMER[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_TIMER "' method='get'><button>" D_CONFIGURE_TIMER "</button></form></p>";
-
-const char HTTP_TIMER_SCRIPT1[] PROGMEM =
-  "var pt=[],ct=99;"
-  "function ce(i,q){"
-    "var o=document.createElement('option');"
-    "o.textContent=i;"
-    "q.appendChild(o);"
-  "}";
-#ifdef USE_SUNRISE
-const char HTTP_TIMER_SCRIPT2[] PROGMEM =
-  "function gt(){"
-    "var m,p,q;"
-    "m=qs('input[name=\"rd\"]:checked').value;"
-    "p=pt[ct]&0x7FF;"
-    "if(m==0){"
-      "so(0);"
-      "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
-      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-    "}"
-    "if((m==1)||(m==2)){"
-      "so(1);"
-      "q=Math.floor(p/60);"
-      "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}"
-        "else{qs('#dr').selectedIndex=0;}"
-      "if(q<10){q='0'+q;}qs('#ho').value=q;"
-      "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-    "}"
-  "}"
-  "function so(b){"
-    "o=qs('#ho');"
-    "e=o.childElementCount;"
-    "if(b==1){"
-      "qs('#dr').style.visibility='';"
-      "if(e>12){for(i=12;i<=23;i++){o.removeChild(o.lastElementChild);}}"
-    "}else{"
-      "qs('#dr').style.visibility='hidden';"
-      "if(e<23){for(i=12;i<=23;i++){ce(i,o);}}"
-    "}"
-  "}";
-#endif
-const char HTTP_TIMER_SCRIPT3[] PROGMEM =
-  "function st(){"
-    "var i,l,m,n,p,s;"
-    "m=0;s=0;"
-    "n=1<<31;if(eb('a0').checked){s|=n;}"
-    "n=1<<15;if(eb('r0').checked){s|=n;}"
-    "for(i=0;i<7;i++){n=1<<(16+i);if(eb('w'+i).checked){s|=n;}}"
-#ifdef USE_SUNRISE
-    "m=qs('input[name=\"rd\"]:checked').value;"
-    "s|=(qs('input[name=\"rd\"]:checked').value<<29);"
-#endif
-    "if(%d>0){"
-      "i=qs('#d1').selectedIndex;if(i>=0){s|=(i<<23);}"
-      "s|=(qs('#p1').selectedIndex<<27);"
-    "}else{"
-      "s|=3<<27;"
-    "}"
-    "l=((qs('#ho').selectedIndex*60)+qs('#mi').selectedIndex)&0x7FF;"
-    "if(m==0){s|=l;}"
-#ifdef USE_SUNRISE
-    "if((m==1)||(m==2)){"
-      "if(qs('#dr').selectedIndex>0){if(l>0){l+=720;}}"
-      "s|=l&0x7FF;"
-    "}"
-#endif
-    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"
-    "pt[ct]=s;"
-    "eb('t0').value=pt.join();"
-  "}";
-const char HTTP_TIMER_SCRIPT4[] PROGMEM =
-  "function ot(t,e){"
-    "var i,n,o,p,q,s;"
-    "if(ct<99){st();}"
-    "ct=t;"
-    "o=document.getElementsByClassName('tl');"
-    "for(i=0;i<o.length;i++){o[i].style.cssText=\"background:#%06x;color:#%06x;font-weight:normal;\"}"
-    "e.style.cssText=\"background:#%06x;color:#%06x;font-weight:bold;\";"
-    "s=pt[ct];"
-#ifdef USE_SUNRISE
-    "p=(s>>29)&3;eb('b'+p).checked=1;"
-    "gt();"
-#else
-    "p=s&0x7FF;"
-    "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"
-    "q=p%%60;if(q<10){q='0'+q;}qs('#mi').value=q;"
-#endif
-    "q=(s>>11)&0xF;if(q<10){q='0'+q;}qs('#mw').value=q;"
-    "for(i=0;i<7;i++){p=(s>>(16+i))&1;eb('w'+i).checked=p;}"
-    "if(%d>0){"
-      "p=(s>>23)&0xF;qs('#d1').value=p+1;"
-      "p=(s>>27)&3;qs('#p1').selectedIndex=p;"
-    "}"
-    "p=(s>>15)&1;eb('r0').checked=p;"
-    "p=(s>>31)&1;eb('a0').checked=p;"
-  "}";
-const char HTTP_TIMER_SCRIPT5[] PROGMEM =
-  "function it(){"
-    "var b,i,o,s;"
-    "pt=eb('t0').value.split(',').map(Number);"
-    "s='';"
-    "for(i=0;i<%d;i++){"
-      "b='';"
-      "if(0==i){b=\" id='dP'\";}"
-      "s+=\"<button type='button' class='tl' onclick='ot(\"+i+\",this)'\"+b+\">\"+(i+1)+\"</button>\""
-    "}"
-    "eb('bt').innerHTML=s;"
-    "if(%d>0){"
-      "eb('oa').innerHTML=\"<b>" D_TIMER_OUTPUT "</b>&nbsp;<span><select style='width:60px;' id='d1'></select></span>&emsp;<b>" D_TIMER_ACTION "</b>&nbsp;<select style='width:99px;' id='p1'></select>\";"
-      "o=qs('#p1');ce('" D_OFF "',o);ce('" D_ON "',o);ce('" D_TOGGLE "',o);"
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-      "ce('" D_RULE "',o);"
-#else
-      "ce('" D_BLINK "',o);"
-#endif
-    "}else{"
-      "eb('oa').innerHTML=\"<b>" D_TIMER_ACTION "</b> " D_RULE "\";"
-    "}";
-const char HTTP_TIMER_SCRIPT6[] PROGMEM =
-#ifdef USE_SUNRISE
-    "o=qs('#dr');ce('+',o);ce('-',o);"
-#endif
-    "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#mi');for(i=0;i<=59;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#mw');for(i=0;i<=15;i++){ce((i<10)?('0'+i):i,o);}"
-    "o=qs('#d1');for(i=0;i<%d;i++){ce(i+1,o);}"
-    "var a='" D_DAY3LIST "';"
-    "s='';for(i=0;i<7;i++){s+=\"<input id='w\"+i+\"' type='checkbox'><b>\"+a.substring(i*3,(i*3)+3)+\"</b> \"}"
-    "eb('ds').innerHTML=s;"
-    "eb('dP').click();"
-  "}"
-  "wl(it);";
-const char HTTP_TIMER_STYLE[] PROGMEM =
-  ".tl{float:left;border-radius:0;border:1px solid #%06x;padding:1px;width:6.25%%;}";
-const char HTTP_FORM_TIMER1[] PROGMEM =
-  "<fieldset style='min-width:470px;text-align:center;'>"
-  "<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>"
-  "<br><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br><br><hr>"
-  "<input id='t0' value='";
-const char HTTP_FORM_TIMER2[] PROGMEM =
-  "' hidden><div id='bt'></div><br><br><br>"
-  "<div id='oa' name='oa'></div><br>"
-  "<div>"
-  "<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;"
-  "<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>"
-  "</div><br>"
-  "<div>";
-#ifdef USE_SUNRISE
-const char HTTP_FORM_TIMER3[] PROGMEM =
-  "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
-  "<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br>"
-  "<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br>"
-  "<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br>"
-  "</fieldset>"
-  "<p></p>"
-  "<span><select style='width:46px;' id='dr'></select></span>"
-  "&nbsp;";
-#else
-const char HTTP_FORM_TIMER3[] PROGMEM =
-  "<b>" D_TIMER_TIME "</b>&nbsp;";
-#endif
-const char HTTP_FORM_TIMER4[] PROGMEM =
-  "<span><select style='width:60px;' id='ho'></select></span>"
-  "&nbsp;" D_HOUR_MINUTE_SEPARATOR "&nbsp;"
-  "<span><select style='width:60px;' id='mi'></select></span>"
-  "&emsp;<b>+/-</b>&nbsp;"
-  "<span><select style='width:60px;' id='mw'></select></span>"
-  "</div><br>"
-  "<div id='ds' name='ds'></div>";
-
-void HandleTimerConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_TIMER);
-
-  if (WebServer->hasArg("save")) {
-    TimerSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_TIMER);
-  WSContentSend_P(HTTP_TIMER_SCRIPT1);
-#ifdef USE_SUNRISE
-  WSContentSend_P(HTTP_TIMER_SCRIPT2);
-#endif
-  WSContentSend_P(HTTP_TIMER_SCRIPT3, devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT4, WebColor(COL_TIMER_TAB_BACKGROUND), WebColor(COL_TIMER_TAB_TEXT), WebColor(COL_FORM), WebColor(COL_TEXT), devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT5, MAX_TIMERS, devices_present);
-  WSContentSend_P(HTTP_TIMER_SCRIPT6, devices_present);
-  WSContentSendStyle_P(HTTP_TIMER_STYLE, WebColor(COL_FORM));
-  WSContentSend_P(HTTP_FORM_TIMER1, (Settings.flag3.timers_enable) ? " checked" : "");
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    WSContentSend_P(PSTR("%s%u"), (i > 0) ? "," : "", Settings.timer[i].data);
-  }
-  WSContentSend_P(HTTP_FORM_TIMER2);
-#ifdef USE_SUNRISE
-  WSContentSend_P(HTTP_FORM_TIMER3, 100 + (strlen(D_SUNSET) *12), GetSun(0).c_str(), GetSun(1).c_str());
-#else
-  WSContentSend_P(HTTP_FORM_TIMER3);
-#endif
-  WSContentSend_P(HTTP_FORM_TIMER4);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void TimerSaveSettings(void)
-{
-  char tmp[MAX_TIMERS *12];
-  char message[LOGSZ];
-  Timer timer;
-
-  Settings.flag3.timers_enable = WebServer->hasArg("e0");
-  WebGetArg("t0", tmp, sizeof(tmp));
-  char *p = tmp;
-  snprintf_P(message, sizeof(message), PSTR(D_LOG_MQTT D_CMND_TIMERS " %d"), Settings.flag3.timers_enable);
-  for (uint32_t i = 0; i < MAX_TIMERS; i++) {
-    timer.data = strtol(p, &p, 10);
-    p++;
-    if (timer.time < 1440) {
-      bool flag = (timer.window != Settings.timer[i].window);
-      Settings.timer[i].data = timer.data;
-      if (flag) TimerSetRandomWindow(i);
-    }
-    snprintf_P(message, sizeof(message), PSTR("%s,0x%08X"), message, Settings.timer[i].data);
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, message);
-}
-#endif
-#endif
-
-
-
-
-
-bool Xdrv09(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_PRE_INIT:
-      TimerSetRandomWindows();
-      break;
-#ifdef USE_WEBSERVER
-#ifdef USE_TIMERS_WEB
-    case FUNC_WEB_ADD_BUTTON:
-#if defined(USE_RULES) || defined(USE_SCRIPT)
-      WSContentSend_P(HTTP_BTN_MENU_TIMER);
-#else
-      if (devices_present) { WSContentSend_P(HTTP_BTN_MENU_TIMER); }
-#endif
-      break;
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/" WEB_HANDLE_TIMER, HandleTimerConfiguration);
-      break;
-#endif
-#endif
-    case FUNC_EVERY_SECOND:
-      TimerEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kTimerCommands, TimerCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-#ifdef USE_RULES
-#ifndef USE_SCRIPT
-# 67 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-#define XDRV_10 10
-
-#define D_CMND_RULE "Rule"
-#define D_CMND_RULETIMER "RuleTimer"
-#define D_CMND_EVENT "Event"
-#define D_CMND_VAR "Var"
-#define D_CMND_MEM "Mem"
-#define D_CMND_ADD "Add"
-#define D_CMND_SUB "Sub"
-#define D_CMND_MULT "Mult"
-#define D_CMND_SCALE "Scale"
-#define D_CMND_CALC_RESOLUTION "CalcRes"
-#define D_CMND_SUBSCRIBE "Subscribe"
-#define D_CMND_UNSUBSCRIBE "Unsubscribe"
-#define D_CMND_IF "If"
-
-#define D_JSON_INITIATED "Initiated"
-
-#define COMPARE_OPERATOR_NONE -1
-#define COMPARE_OPERATOR_EQUAL 0
-#define COMPARE_OPERATOR_BIGGER 1
-#define COMPARE_OPERATOR_SMALLER 2
-#define COMPARE_OPERATOR_EXACT_DIVISION 3
-#define COMPARE_OPERATOR_NUMBER_EQUAL 4
-#define COMPARE_OPERATOR_NOT_EQUAL 5
-#define COMPARE_OPERATOR_BIGGER_EQUAL 6
-#define COMPARE_OPERATOR_SMALLER_EQUAL 7
-#define MAXIMUM_COMPARE_OPERATOR COMPARE_OPERATOR_SMALLER_EQUAL
-const char kCompareOperators[] PROGMEM = "=\0>\0<\0|\0==!=>=<=";
-
-#ifdef USE_EXPRESSION
-  #include <LinkedList.h>
-
-  const char kExpressionOperators[] PROGMEM = "+-*/%^\0";
-  #define EXPRESSION_OPERATOR_ADD 0
-  #define EXPRESSION_OPERATOR_SUBTRACT 1
-  #define EXPRESSION_OPERATOR_MULTIPLY 2
-  #define EXPRESSION_OPERATOR_DIVIDEDBY 3
-  #define EXPRESSION_OPERATOR_MODULO 4
-  #define EXPRESSION_OPERATOR_POWER 5
-
-  const uint8_t kExpressionOperatorsPriorities[] PROGMEM = {1, 1, 2, 2, 3, 4};
-  #define MAX_EXPRESSION_OPERATOR_PRIORITY 4
-
-
-  #define LOGIC_OPERATOR_AND 1
-  #define LOGIC_OPERATOR_OR 2
-
-  #define IF_BLOCK_INVALID -1
-  #define IF_BLOCK_ANY 0
-  #define IF_BLOCK_ELSEIF 1
-  #define IF_BLOCK_ELSE 2
-  #define IF_BLOCK_ENDIF 3
-#endif
-
-const char kRulesCommands[] PROGMEM = "|"
-  D_CMND_RULE "|" D_CMND_RULETIMER "|" D_CMND_EVENT "|" D_CMND_VAR "|" D_CMND_MEM "|"
-  D_CMND_ADD "|" D_CMND_SUB "|" D_CMND_MULT "|" D_CMND_SCALE "|" D_CMND_CALC_RESOLUTION
-#ifdef SUPPORT_MQTT_EVENT
-  "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE
-#endif
-#ifdef SUPPORT_IF_STATEMENT
-  "|" D_CMND_IF
-#endif
-  ;
-
-void (* const RulesCommand[])(void) PROGMEM = {
-  &CmndRule, &CmndRuleTimer, &CmndEvent, &CmndVariable, &CmndMemory,
-  &CmndAddition, &CmndSubtract, &CmndMultiply, &CmndScale, &CmndCalcResolution
-#ifdef SUPPORT_MQTT_EVENT
-  , &CmndSubscribe, &CmndUnsubscribe
-#endif
-#ifdef SUPPORT_IF_STATEMENT
-  , &CmndIf
-#endif
-  };
-
-#ifdef SUPPORT_MQTT_EVENT
-  #include <LinkedList.h>
-  typedef struct {
-    String Event;
-    String Topic;
-    String Key;
-  } MQTT_Subscription;
-  LinkedList<MQTT_Subscription> subscriptions;
-#endif
-
-struct RULES {
-  String event_value;
-  unsigned long timer[MAX_RULE_TIMERS] = { 0 };
-  uint32_t triggers[MAX_RULE_SETS] = { 0 };
-  uint8_t trigger_count[MAX_RULE_SETS] = { 0 };
-
-  long new_power = -1;
-  long old_power = -1;
-  long old_dimm = -1;
-
-  uint16_t last_minute = 60;
-  uint16_t vars_event = 0;
-  uint8_t mems_event = 0;
-  bool teleperiod = false;
-
-  char event_data[100];
-} Rules;
-
-char rules_vars[MAX_RULE_VARS][33] = {{ 0 }};
-
-#if (MAX_RULE_VARS>16)
-#error MAX_RULE_VARS is bigger than 16
-#endif
-#if (MAX_RULE_MEMS>16)
-#error MAX_RULE_MEMS is bigger than 16
-#endif
-
-
-
-bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
-{
-
-
-
-
-  bool match = false;
-  char stemp[10];
-
-
-  int pos = rule.indexOf('#');
-  if (pos == -1) { return false; }
-
-  String rule_task = rule.substring(0, pos);
-  if (Rules.teleperiod) {
-    int ppos = rule_task.indexOf("TELE-");
-    if (ppos == -1) { return false; }
-    rule_task = rule.substring(5, pos);
-  }
-
-  String rule_expr = rule.substring(pos +1);
-  String rule_name, rule_param;
-  int8_t compareOperator = parseCompareExpression(rule_expr, rule_name, rule_param);
-
-  char rule_svalue[80] = { 0 };
-  float rule_value = 0;
-  if (compareOperator != COMPARE_OPERATOR_NONE) {
-    for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
-      if (rule_param.startsWith(stemp)) {
-        rule_param = rules_vars[i];
-        break;
-      }
-    }
-    for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
-      if (rule_param.startsWith(stemp)) {
-        rule_param = SettingsText(SET_MEM1 + i);
-        break;
-      }
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIME%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(MinutesPastMidnight());
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%UPTIME%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(MinutesUptime());
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMESTAMP%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = GetDateAndTime(DT_LOCAL).c_str();
-    }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNRISE%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(SunMinutes(0));
-    }
-    snprintf_P(stemp, sizeof(stemp), PSTR("%%SUNSET%%"));
-    if (rule_param.startsWith(stemp)) {
-      rule_param = String(SunMinutes(1));
-    }
-#endif
-    rule_param.toUpperCase();
-    strlcpy(rule_svalue, rule_param.c_str(), sizeof(rule_svalue));
-
-    int temp_value = GetStateNumber(rule_svalue);
-    if (temp_value > -1) {
-      rule_value = temp_value;
-    } else {
-      rule_value = CharToFloat((char*)rule_svalue);
-    }
-  }
-
-
-  int rule_name_idx = 0;
-  if ((pos = rule_name.indexOf("[")) > 0) {
-    rule_name_idx = rule_name.substring(pos +1).toInt();
-    if ((rule_name_idx < 1) || (rule_name_idx > 6)) {
-      rule_name_idx = 1;
-    }
-    rule_name = rule_name.substring(0, pos);
-  }
-
-  StaticJsonBuffer<1024> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(event);
-  if (!root.success()) { return false; }
-  if (!root[rule_task].success()) { return false; }
-
-  JsonObject &obj1 = root[rule_task];
-  JsonObject *obj = &obj1;
-  String subtype;
-  uint32_t i = 0;
-  while ((pos = rule_name.indexOf("#")) > 0) {
-    subtype = rule_name.substring(0, pos);
-    if (!(*obj)[subtype].success()) { return false; }
-    JsonObject &obj2 = (*obj)[subtype];
-    obj = &obj2;
-    rule_name = rule_name.substring(pos +1);
-    if (i++ > 10) { return false; }
-  }
-  if (!(*obj)[rule_name].success()) { return false; }
-  const char* str_value;
-  if (rule_name_idx) {
-    str_value = (*obj)[rule_name][rule_name_idx -1];
-  } else {
-    str_value = (*obj)[rule_name];
-  }
-
-
-
-
-  Rules.event_value = str_value;
-
-
-  float value = 0;
-  if (str_value) {
-    value = CharToFloat((char*)str_value);
-    int int_value = int(value);
-    int int_rule_value = int(rule_value);
-    switch (compareOperator) {
-      case COMPARE_OPERATOR_EXACT_DIVISION:
-        match = (int_rule_value && (int_value % int_rule_value) == 0);
-        break;
-      case COMPARE_OPERATOR_EQUAL:
-        match = (!strcasecmp(str_value, rule_svalue));
-        break;
-      case COMPARE_OPERATOR_BIGGER:
-        match = (value > rule_value);
-        break;
-      case COMPARE_OPERATOR_SMALLER:
-        match = (value < rule_value);
-        break;
-      case COMPARE_OPERATOR_NUMBER_EQUAL:
-        match = (value == rule_value);
-        break;
-      case COMPARE_OPERATOR_NOT_EQUAL:
-        match = (value != rule_value);
-        break;
-      case COMPARE_OPERATOR_BIGGER_EQUAL:
-        match = (value >= rule_value);
-        break;
-      case COMPARE_OPERATOR_SMALLER_EQUAL:
-        match = (value <= rule_value);
-        break;
-      default:
-        match = true;
-    }
-  } else match = true;
-
-  if (bitRead(Settings.rule_once, rule_set)) {
-    if (match) {
-      if (!bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set])) {
-        bitSet(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
-      } else {
-        match = false;
-      }
-    } else {
-      bitClear(Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
-    }
-  }
-
-  return match;
-}
-# 363 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-int8_t parseCompareExpression(String &expr, String &leftExpr, String &rightExpr)
-{
-  char compare_operator[3];
-  int8_t compare = COMPARE_OPERATOR_NONE;
-  leftExpr = expr;
-  int position;
-  for (int8_t i = MAXIMUM_COMPARE_OPERATOR; i >= 0; i--) {
-    snprintf_P(compare_operator, sizeof(compare_operator), kCompareOperators + (i *2));
-    if ((position = expr.indexOf(compare_operator)) > 0) {
-      compare = i;
-      leftExpr = expr.substring(0, position);
-      leftExpr.trim();
-      rightExpr = expr.substring(position + strlen(compare_operator));
-      rightExpr.trim();
-      break;
-    }
-  }
-  return compare;
-}
-
-void RulesVarReplace(String &commands, const String &sfind, const String &replace)
-{
-
-
-
-  char *find = (char*)sfind.c_str();
-  uint32_t flen = strlen(find);
-
-  String ucommand = commands;
-  ucommand.toUpperCase();
-  char *read_from = (char*)ucommand.c_str();
-  char *write_to = (char*)commands.c_str();
-  char *found_at;
-  while ((found_at = strstr(read_from, find)) != nullptr) {
-    write_to += (found_at - read_from);
-    memmove_P(write_to, find, flen);
-    write_to += flen;
-    read_from = found_at + flen;
-  }
-
-  commands.replace(find, replace);
-}
-
-
-
-bool RuleSetProcess(uint8_t rule_set, String &event_saved)
-{
-  bool serviced = false;
-  char stemp[10];
-
-  delay(0);
-
-
-
-  String rules = Settings.rules[rule_set];
-
-  Rules.trigger_count[rule_set] = 0;
-  int plen = 0;
-  int plen2 = 0;
-  bool stop_all_rules = false;
-  while (true) {
-    rules = rules.substring(plen);
-    rules.trim();
-    if (!rules.length()) { return serviced; }
-
-    String rule = rules;
-    rule.toUpperCase();
-    if (!rule.startsWith("ON ")) { return serviced; }
-
-    int pevt = rule.indexOf(" DO ");
-    if (pevt == -1) { return serviced; }
-    String event_trigger = rule.substring(3, pevt);
-
-    plen = rule.indexOf(" ENDON");
-    plen2 = rule.indexOf(" BREAK");
-    if ((plen == -1) && (plen2 == -1)) { return serviced; }
-
-    if (plen == -1) { plen = 9999; }
-    if (plen2 == -1) { plen2 = 9999; }
-    plen = tmin(plen, plen2);
-
-    String commands = rules.substring(pevt +4, plen);
-    Rules.event_value = "";
-    String event = event_saved;
-
-
-
-    if (RulesRuleMatch(rule_set, event, event_trigger)) {
-      if (plen == plen2) { stop_all_rules = true; }
-      commands.trim();
-      String ucommand = commands;
-      ucommand.toUpperCase();
-
-
-
-      if ((ucommand.indexOf("IF ") == -1) &&
-          (ucommand.indexOf("EVENT ") != -1) &&
-          (ucommand.indexOf("BACKLOG ") == -1)) {
-        commands = "backlog " + commands;
-      }
-
-      RulesVarReplace(commands, F("%VALUE%"), Rules.event_value);
-      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%%VAR%d%%"), i +1);
-        RulesVarReplace(commands, stemp, rules_vars[i]);
-      }
-      for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1);
-        RulesVarReplace(commands, stemp, SettingsText(SET_MEM1 +i));
-      }
-      RulesVarReplace(commands, F("%TIME%"), String(MinutesPastMidnight()));
-      RulesVarReplace(commands, F("%UPTIME%"), String(MinutesUptime()));
-      RulesVarReplace(commands, F("%TIMESTAMP%"), GetDateAndTime(DT_LOCAL));
-      RulesVarReplace(commands, F("%TOPIC%"), SettingsText(SET_MQTT_TOPIC));
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-      RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
-      RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));
-#endif
-
-      char command[commands.length() +1];
-      strlcpy(command, commands.c_str(), sizeof(command));
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("RUL: %s performs \"%s\""), event_trigger.c_str(), command);
-
-
-
-#ifdef SUPPORT_IF_STATEMENT
-      char *pCmd = command;
-      RulesPreprocessCommand(pCmd);
-#endif
-      ExecuteCommand(command, SRC_RULE);
-      serviced = true;
-      if (stop_all_rules) { return serviced; }
-    }
-    plen += 6;
-    Rules.trigger_count[rule_set]++;
-  }
-  return serviced;
-}
-
-
-
-bool RulesProcessEvent(char *json_event)
-{
-  bool serviced = false;
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("RulesProcessEvent"));
-#endif
-
-  String event_saved = json_event;
-
-
-
-  char *p = strchr(json_event, ':');
-  if ((p != NULL) && !(strchr(++p, ':'))) {
-    event_saved.replace(F(":"), F(":{\"Data\":"));
-    event_saved += F("}");
-
-  }
-  event_saved.toUpperCase();
-
-
-
-  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-    if (strlen(Settings.rules[i]) && bitRead(Settings.rule_enabled, i)) {
-      if (RuleSetProcess(i, event_saved)) { serviced = true; }
-    }
-  }
-  return serviced;
-}
-
-bool RulesProcess(void)
-{
-  return RulesProcessEvent(mqtt_data);
-}
-
-void RulesInit(void)
-{
-  rules_flag.data = 0;
-  for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
-    if (Settings.rules[i][0] == '\0') {
-      bitWrite(Settings.rule_enabled, i, 0);
-      bitWrite(Settings.rule_once, i, 0);
-    }
-  }
-  Rules.teleperiod = false;
-}
-
-void RulesEvery50ms(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[120];
-
-    if (-1 == Rules.new_power) { Rules.new_power = power; }
-    if (Rules.new_power != Rules.old_power) {
-      if (Rules.old_power != -1) {
-        for (uint32_t i = 0; i < devices_present; i++) {
-          uint8_t new_state = (Rules.new_power >> i) &1;
-          if (new_state != ((Rules.old_power >> i) &1)) {
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"State\":%d}}"), i +1, new_state);
-            RulesProcessEvent(json_event);
-          }
-        }
-      } else {
-
-        for (uint32_t i = 0; i < devices_present; i++) {
-          uint8_t new_state = (Rules.new_power >> i) &1;
-          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Power%d\":{\"Boot\":%d}}"), i +1, new_state);
-          RulesProcessEvent(json_event);
-        }
-
-        for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-#ifdef USE_TM1638
-          if ((pin[GPIO_SWT1 +i] < 99) || ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99))) {
-#else
-          if (pin[GPIO_SWT1 +i] < 99) {
-#endif
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"" D_JSON_SWITCH "%d\":{\"Boot\":%d}}"), i +1, (SwitchState(i)));
-            RulesProcessEvent(json_event);
-          }
-        }
-      }
-      Rules.old_power = Rules.new_power;
-    }
-    else if (Rules.old_dimm != Settings.light_dimmer) {
-      if (Rules.old_dimm != -1) {
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"State\":%d}}"), Settings.light_dimmer);
-      } else {
-
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Dimmer\":{\"Boot\":%d}}"), Settings.light_dimmer);
-      }
-      RulesProcessEvent(json_event);
-      Rules.old_dimm = Settings.light_dimmer;
-    }
-    else if (Rules.event_data[0]) {
-      char *event;
-      char *parameter;
-      event = strtok_r(Rules.event_data, "=", &parameter);
-      if (event) {
-        event = Trim(event);
-        if (parameter) {
-          parameter = Trim(parameter);
-        } else {
-          parameter = event + strlen(event);
-        }
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Event\":{\"%s\":\"%s\"}}"), event, parameter);
-        Rules.event_data[0] ='\0';
-        RulesProcessEvent(json_event);
-      } else {
-        Rules.event_data[0] ='\0';
-      }
-    }
-    else if (Rules.vars_event || Rules.mems_event){
-      if (Rules.vars_event) {
-        for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-          if (bitRead(Rules.vars_event, i)) {
-            bitClear(Rules.vars_event, i);
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Var%d\":{\"State\":%s}}"), i+1, rules_vars[i]);
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-      }
-      if (Rules.mems_event) {
-        for (uint32_t i = 0; i < MAX_RULE_MEMS; i++) {
-          if (bitRead(Rules.mems_event, i)) {
-            bitClear(Rules.mems_event, i);
-            snprintf_P(json_event, sizeof(json_event), PSTR("{\"Mem%d\":{\"State\":%s}}"), i+1, SettingsText(SET_MEM1 +i));
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-      }
-    }
-    else if (rules_flag.data) {
-      uint16_t mask = 1;
-      for (uint32_t i = 0; i < MAX_RULES_FLAG; i++) {
-        if (rules_flag.data & mask) {
-          rules_flag.data ^= mask;
-          json_event[0] = '\0';
-          switch (i) {
-            case 0: strncpy_P(json_event, PSTR("{\"System\":{\"Boot\":1}}"), sizeof(json_event)); break;
-            case 1: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Initialized\":%d}}"), MinutesPastMidnight()); break;
-            case 2: snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Set\":%d}}"), MinutesPastMidnight()); break;
-            case 3: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Connected\":1}}"), sizeof(json_event)); break;
-            case 4: strncpy_P(json_event, PSTR("{\"MQTT\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
-            case 5: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Connected\":1}}"), sizeof(json_event)); break;
-            case 6: strncpy_P(json_event, PSTR("{\"WIFI\":{\"Disconnected\":1}}"), sizeof(json_event)); break;
-            case 7: strncpy_P(json_event, PSTR("{\"HTTP\":{\"Initialized\":1}}"), sizeof(json_event)); break;
-#ifdef USE_SHUTTER
-            case 8: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moved\":1}}"), sizeof(json_event)); break;
-            case 9: strncpy_P(json_event, PSTR("{\"SHUTTER\":{\"Moving\":1}}"), sizeof(json_event)); break;
-#endif
-          }
-          if (json_event[0]) {
-            RulesProcessEvent(json_event);
-            break;
-          }
-        }
-        mask <<= 1;
-      }
-    }
-  }
-}
-
-uint8_t rules_xsns_index = 0;
-
-void RulesEvery100ms(void)
-{
-  if (Settings.rule_enabled && (uptime > 4)) {
-    mqtt_data[0] = '\0';
-    int tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, rules_xsns_index);
-    tele_period = tele_period_save;
-    if (strlen(mqtt_data)) {
-      mqtt_data[0] = '{';
-      ResponseJsonEnd();
-      RulesProcess();
-    }
-  }
-}
-
-void RulesEverySecond(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[120];
-
-    if (RtcTime.valid) {
-      if ((uptime > 60) && (RtcTime.minute != Rules.last_minute)) {
-        Rules.last_minute = RtcTime.minute;
-        snprintf_P(json_event, sizeof(json_event), PSTR("{\"Time\":{\"Minute\":%d}}"), MinutesPastMidnight());
-        RulesProcessEvent(json_event);
-      }
-    }
-    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
-      if (Rules.timer[i] != 0L) {
-        if (TimeReached(Rules.timer[i])) {
-          Rules.timer[i] = 0L;
-          snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1);
-          RulesProcessEvent(json_event);
-        }
-      }
-    }
-  }
-}
-
-void RulesSaveBeforeRestart(void)
-{
-  if (Settings.rule_enabled) {
-    char json_event[32];
-
-    strncpy_P(json_event, PSTR("{\"System\":{\"Save\":1}}"), sizeof(json_event));
-    RulesProcessEvent(json_event);
-  }
-}
-
-void RulesSetPower(void)
-{
-  Rules.new_power = XdrvMailbox.index;
-}
-
-void RulesTeleperiod(void)
-{
-  Rules.teleperiod = true;
-  RulesProcess();
-  Rules.teleperiod = false;
-}
-
-#ifdef SUPPORT_MQTT_EVENT
-# 744 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool RulesMqttData(void)
-{
-  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
-    return false;
-  }
-  bool serviced = false;
-  String sTopic = XdrvMailbox.topic;
-  String sData = XdrvMailbox.data;
-
-  MQTT_Subscription event_item;
-
-  for (uint32_t index = 0; index < subscriptions.size(); index++) {
-    event_item = subscriptions.get(index);
-
-
-    if (sTopic.startsWith(event_item.Topic)) {
-
-      serviced = true;
-      String value;
-      if (event_item.Key.length() == 0) {
-        value = sData;
-      } else {
-        StaticJsonBuffer<500> jsonBuf;
-        JsonObject& jsonData = jsonBuf.parseObject(sData);
-        String key1 = event_item.Key;
-        String key2;
-        if (!jsonData.success()) break;
-        int dot;
-        if ((dot = key1.indexOf('.')) > 0) {
-          key2 = key1.substring(dot+1);
-          key1 = key1.substring(0, dot);
-          if (!jsonData[key1][key2].success()) break;
-          value = (const char *)jsonData[key1][key2];
-        } else {
-          if (!jsonData[key1].success()) break;
-          value = (const char *)jsonData[key1];
-        }
-      }
-      value.trim();
-
-      snprintf_P(Rules.event_data, sizeof(Rules.event_data), PSTR("%s=%s"), event_item.Event.c_str(), value.c_str());
-    }
-  }
-  return serviced;
-}
-# 806 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-void CmndSubscribe(void)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (XdrvMailbox.data_len > 0) {
-    char parameters[XdrvMailbox.data_len+1];
-    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
-    parameters[XdrvMailbox.data_len] = '\0';
-    String event_name, topic, key;
-
-    char * pos = strtok(parameters, ",");
-    if (pos) {
-      event_name = Trim(pos);
-      pos = strtok(nullptr, ",");
-      if (pos) {
-        topic = Trim(pos);
-        pos = strtok(nullptr, ",");
-        if (pos) {
-          key = Trim(pos);
-        }
-      }
-    }
-
-    event_name.toUpperCase();
-    if (event_name.length() > 0 && topic.length() > 0) {
-
-      for (uint32_t index=0; index < subscriptions.size(); index++) {
-        if (subscriptions.get(index).Event.equals(event_name)) {
-
-          String stopic = subscriptions.get(index).Topic + "/#";
-          MqttUnsubscribe(stopic.c_str());
-          subscriptions.remove(index);
-          break;
-        }
-      }
-
-      if (!topic.endsWith("#")) {
-        if (topic.endsWith("/")) {
-          topic.concat("#");
-        } else {
-          topic.concat("/#");
-        }
-      }
-
-
-      subscription_item.Event = event_name;
-      subscription_item.Topic = topic.substring(0, topic.length() - 2);
-      subscription_item.Key = key;
-      subscriptions.add(subscription_item);
-
-      MqttSubscribe(topic.c_str());
-      events.concat(event_name + "," + topic
-        + (key.length()>0 ? "," : "")
-        + key);
-    } else {
-      events = D_JSON_WRONG_PARAMETERS;
-    }
-  } else {
-
-    for (uint32_t index=0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      events.concat(subscription_item.Event + "," + subscription_item.Topic
-        + (subscription_item.Key.length()>0 ? "," : "")
-        + subscription_item.Key + "; ");
-    }
-  }
-  ResponseCmndChar(events.c_str());
-}
-# 886 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-void CmndUnsubscribe(void)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (XdrvMailbox.data_len > 0) {
-    for (uint32_t index = 0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      if (subscription_item.Event.equalsIgnoreCase(XdrvMailbox.data)) {
-        String stopic = subscription_item.Topic + "/#";
-        MqttUnsubscribe(stopic.c_str());
-        events = subscription_item.Event;
-        subscriptions.remove(index);
-        break;
-      }
-    }
-  } else {
-
-    String stopic;
-    while (subscriptions.size() > 0) {
-      events.concat(subscriptions.get(0).Event + "; ");
-      stopic = subscriptions.get(0).Topic + "/#";
-      MqttUnsubscribe(stopic.c_str());
-      subscriptions.remove(0);
-    }
-  }
-  ResponseCmndChar(events.c_str());
-}
-
-#endif
-
-#ifdef USE_EXPRESSION
-# 928 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-char * findClosureBracket(char * pStart)
-{
-  char * pointer = pStart + 1;
-
-  bool bFindClosures = false;
-  uint8_t matchClosures = 1;
-  while (*pointer)
-  {
-    if (*pointer == ')') {
-      matchClosures--;
-      if (matchClosures == 0) {
-        bFindClosures = true;
-        break;
-      }
-    } else if (*pointer == '(') {
-      matchClosures++;
-    }
-    pointer++;
-  }
-  if (bFindClosures) {
-    return pointer;
-  } else {
-    return nullptr;
-  }
-}
-# 967 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextNumber(char * &pNumber, float &value)
-{
-  bool bSucceed = false;
-  String sNumber = "";
-  if (*pNumber == '-') {
-    sNumber = "-";
-    pNumber++;
-  }
-  while (*pNumber) {
-    if (isdigit(*pNumber) || (*pNumber == '.')) {
-      sNumber += *pNumber;
-      pNumber++;
-    } else {
-      break;
-    }
-  }
-  if (sNumber.length() > 0) {
-    value = CharToFloat(sNumber.c_str());
-    bSucceed = true;
-  }
-  return bSucceed;
-}
-# 1003 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextVariableValue(char * &pVarname, float &value)
-{
-  bool succeed = true;
-  value = 0;
-  String sVarName = "";
-  while (*pVarname) {
-    if (isalpha(*pVarname) || isdigit(*pVarname)) {
-      sVarName.concat(*pVarname);
-      pVarname++;
-    } else {
-      break;
-    }
-  }
-  sVarName.toUpperCase();
-  if (sVarName.startsWith(F("VAR"))) {
-    int index = sVarName.substring(3).toInt();
-    if (index > 0 && index <= MAX_RULE_VARS) {
-      value = CharToFloat(rules_vars[index -1]);
-    }
-  } else if (sVarName.startsWith(F("MEM"))) {
-    int index = sVarName.substring(3).toInt();
-    if (index > 0 && index <= MAX_RULE_MEMS) {
-      value = CharToFloat(SettingsText(SET_MEM1 + index -1));
-    }
-  } else if (sVarName.equals(F("TIME"))) {
-    value = MinutesPastMidnight();
-  } else if (sVarName.equals(F("UPTIME"))) {
-    value = MinutesUptime();
-  } else if (sVarName.equals(F("UTCTIME"))) {
-    value = UtcTime();
-  } else if (sVarName.equals(F("LOCALTIME"))) {
-    value = LocalTime();
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-  } else if (sVarName.equals(F("SUNRISE"))) {
-    value = SunMinutes(0);
-  } else if (sVarName.equals(F("SUNSET"))) {
-    value = SunMinutes(1);
-#endif
-  } else {
-    succeed = false;
-  }
-
-  return succeed;
-}
-# 1065 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextObjectValue(char * &pointer, float &value)
-{
-  bool bSucceed = false;
-  while (*pointer)
-  {
-    if (isspace(*pointer)) {
-      pointer++;
-      continue;
-    }
-    if (isdigit(*pointer) || (*pointer) == '-') {
-      bSucceed = findNextNumber(pointer, value);
-      break;
-    } else if (isalpha(*pointer)) {
-      bSucceed = findNextVariableValue(pointer, value);
-      break;
-    } else if (*pointer == '(') {
-      char * closureBracket = findClosureBracket(pointer);
-      if (closureBracket != nullptr) {
-        value = evaluateExpression(pointer+1, closureBracket - pointer - 1);
-        pointer = closureBracket + 1;
-        bSucceed = true;
-      }
-      break;
-    } else {
-      break;
-    }
-  }
-  return bSucceed;
-}
-# 1109 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextOperator(char * &pointer, int8_t &op)
-{
-  bool bSucceed = false;
-  while (*pointer)
-  {
-    if (isspace(*pointer)) {
-      pointer++;
-      continue;
-    }
-    op = EXPRESSION_OPERATOR_ADD;
-    const char *pch = kExpressionOperators;
-    char ch;
-    while ((ch = pgm_read_byte(pch++)) != '\0') {
-      if (ch == *pointer) {
-        bSucceed = true;
-        pointer++;
-        break;
-      }
-      op++;
-    }
-    break;
-  }
-  return bSucceed;
-}
-# 1146 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-float calculateTwoValues(float v1, float v2, uint8_t op)
-{
-  switch (op)
-  {
-    case EXPRESSION_OPERATOR_ADD:
-      return v1 + v2;
-    case EXPRESSION_OPERATOR_SUBTRACT:
-      return v1 - v2;
-    case EXPRESSION_OPERATOR_MULTIPLY:
-      return v1 * v2;
-    case EXPRESSION_OPERATOR_DIVIDEDBY:
-      return (0 == v2) ? 0 : (v1 / v2);
-    case EXPRESSION_OPERATOR_MODULO:
-      return (0 == v2) ? 0 : (int(v1) % int(v2));
-    case EXPRESSION_OPERATOR_POWER:
-      return FastPrecisePow(v1, v2);
-  }
-  return 0;
-}
-# 1199 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-float evaluateExpression(const char * expression, unsigned int len)
-{
-  char expbuf[len + 1];
-  memcpy(expbuf, expression, len);
-  expbuf[len] = '\0';
-  char * scan_pointer = expbuf;
-
-  LinkedList<float> object_values;
-  LinkedList<int8_t> operators;
-  int8_t op;
-  float va;
-
-  if (findNextObjectValue(scan_pointer, va)) {
-    object_values.add(va);
-  } else {
-    return 0;
-  }
-  while (*scan_pointer)
-  {
-    if (findNextOperator(scan_pointer, op)
-        && *scan_pointer
-        && findNextObjectValue(scan_pointer, va))
-    {
-      operators.add(op);
-      object_values.add(va);
-    } else {
-
-      break;
-    }
-  }
-
-
-
-  for (int32_t priority = MAX_EXPRESSION_OPERATOR_PRIORITY; priority>0; priority--) {
-    int index = 0;
-    while (index < operators.size()) {
-      if (priority == pgm_read_byte(kExpressionOperatorsPriorities + operators.get(index))) {
-
-        va = calculateTwoValues(object_values.get(index), object_values.remove(index + 1), operators.remove(index));
-
-        object_values.set(index, va);
-      } else {
-        index++;
-      }
-    }
-  }
-  return object_values.get(0);
-}
-#endif
-
-#ifdef SUPPORT_IF_STATEMENT
-void CmndIf(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    char parameters[XdrvMailbox.data_len+1];
-    memcpy(parameters, XdrvMailbox.data, XdrvMailbox.data_len);
-    parameters[XdrvMailbox.data_len] = '\0';
-    ProcessIfStatement(parameters);
-  }
-  ResponseCmndDone();
-}
-# 1273 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool evaluateComparisonExpression(const char *expression, int len)
-{
-  bool bResult = true;
-  char expbuf[len + 1];
-  memcpy(expbuf, expression, len);
-  expbuf[len] = '\0';
-  String compare_expression = expbuf;
-  String leftExpr, rightExpr;
-  int8_t compareOp = parseCompareExpression(compare_expression, leftExpr, rightExpr);
-
-  double leftValue = evaluateExpression(leftExpr.c_str(), leftExpr.length());
-  double rightValue = evaluateExpression(rightExpr.c_str(), rightExpr.length());
-  switch (compareOp) {
-    case COMPARE_OPERATOR_EXACT_DIVISION:
-      bResult = (rightValue != 0 && leftValue == int(leftValue)
-          && rightValue == int(rightValue) && (int(leftValue) % int(rightValue)) == 0);
-      break;
-    case COMPARE_OPERATOR_EQUAL:
-      bResult = leftExpr.equalsIgnoreCase(rightExpr);
-      break;
-    case COMPARE_OPERATOR_BIGGER:
-      bResult = (leftValue > rightValue);
-      break;
-    case COMPARE_OPERATOR_SMALLER:
-      bResult = (leftValue < rightValue);
-      break;
-    case COMPARE_OPERATOR_NUMBER_EQUAL:
-      bResult = (leftValue == rightValue);
-      break;
-    case COMPARE_OPERATOR_NOT_EQUAL:
-      bResult = (leftValue != rightValue);
-      break;
-    case COMPARE_OPERATOR_BIGGER_EQUAL:
-      bResult = (leftValue >= rightValue);
-      break;
-    case COMPARE_OPERATOR_SMALLER_EQUAL:
-      bResult = (leftValue <= rightValue);
-      break;
-  }
-  return bResult;
-}
-# 1329 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextLogicOperator(char * &pointer, int8_t &op)
-{
-  bool bSucceed = false;
-  while (*pointer && isspace(*pointer)) {
-
-    pointer++;
-  }
-  if (*pointer) {
-    if (strncasecmp_P(pointer, PSTR("AND "), 4) == 0) {
-      op = LOGIC_OPERATOR_AND;
-      pointer += 4;
-      bSucceed = true;
-    } else if (strncasecmp_P(pointer, PSTR("OR "), 3) == 0) {
-      op = LOGIC_OPERATOR_OR;
-      pointer += 3;
-      bSucceed = true;
-    }
-  }
-  return bSucceed;
-}
-# 1366 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool findNextLogicObjectValue(char * &pointer, bool &value)
-{
-  bool bSucceed = false;
-  while (*pointer && isspace(*pointer)) {
-
-    pointer++;
-  }
-  char * pExpr = pointer;
-  while (*pointer) {
-    if (isalpha(*pointer)
-       && (strncasecmp_P(pointer, PSTR("AND "), 4) == 0
-       || strncasecmp_P(pointer, PSTR("OR "), 3) == 0))
-    {
-      value = evaluateComparisonExpression(pExpr, pointer - pExpr);
-      bSucceed = true;
-      break;
-    } else if (*pointer == '(') {
-      char * closureBracket = findClosureBracket(pointer);
-      if (closureBracket != nullptr) {
-        value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 1);
-        pointer = closureBracket + 1;
-        bSucceed = true;
-      }
-      break;
-    }
-    pointer++;
-  }
-  if (!bSucceed && pointer > pExpr) {
-
-    value = evaluateComparisonExpression(pExpr, pointer - pExpr);
-    bSucceed = true;
-  }
-  return bSucceed;
-}
-# 1415 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-bool evaluateLogicalExpression(const char * expression, int len)
-{
-  bool bResult = false;
-
-  char expbuff[len + 1];
-  memcpy(expbuff, expression, len);
-  expbuff[len] = '\0';
-
-
-  char * pointer = expbuff;
-  LinkedList<bool> values;
-  LinkedList<int8_t> logicOperators;
-
-  bool bValue;
-  if (findNextLogicObjectValue(pointer, bValue)) {
-    values.add(bValue);
-  } else {
-    return false;
-  }
-  int8_t op;
-  while (*pointer) {
-    if (findNextLogicOperator(pointer, op)
-      && (*pointer) && findNextLogicObjectValue(pointer, bValue))
-    {
-      logicOperators.add(op);
-      values.add(bValue);
-    } else {
-      break;
-    }
-  }
-
-  int index = 0;
-  while (index < logicOperators.size()) {
-    if (logicOperators.get(index) == LOGIC_OPERATOR_AND) {
-      values.set(index, values.get(index) && values.get(index+1));
-      values.remove(index + 1);
-      logicOperators.remove(index);
-    } else {
-      index++;
-    }
-  }
-
-  index = 0;
-  while (index < logicOperators.size()) {
-    if (logicOperators.get(index) == LOGIC_OPERATOR_OR) {
-      values.set(index, values.get(index) || values.get(index+1));
-      values.remove(index + 1);
-      logicOperators.remove(index);
-    } else {
-      index++;
-    }
-  }
-  return values.get(0);
-}
-# 1486 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-int8_t findIfBlock(char * &pointer, int &lenWord, int8_t block_type)
-{
-  int8_t foundBlock = IF_BLOCK_INVALID;
-
-  const char * word;
-  while (*pointer) {
-    if (!isalpha(*pointer)) {
-      pointer++;
-      continue;
-    }
-    word = pointer;
-    while (*pointer && isalpha(*pointer)) {
-      pointer++;
-    }
-    lenWord = pointer - word;
-
-    if (2 == lenWord && 0 == strncasecmp_P(word, PSTR("IF"), 2)) {
-
-
-      if (findIfBlock(pointer, lenWord, IF_BLOCK_ENDIF) != IF_BLOCK_ENDIF) {
-
-        break;
-      }
-    } else if ( (IF_BLOCK_ENDIF == block_type || IF_BLOCK_ANY == block_type)
-      && (5 == lenWord) && (0 == strncasecmp_P(word, PSTR("ENDIF"), 5)))
-    {
-
-      foundBlock = IF_BLOCK_ENDIF;
-      break;
-    } else if ( (IF_BLOCK_ELSEIF == block_type || IF_BLOCK_ANY == block_type)
-      && (6 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSEIF"), 6)))
-    {
-
-      foundBlock = IF_BLOCK_ELSEIF;
-      break;
-    } else if ( (IF_BLOCK_ELSE == block_type || IF_BLOCK_ANY == block_type)
-      && (4 == lenWord) && (0 == strncasecmp_P(word, PSTR("ELSE"), 4)))
-    {
-
-      foundBlock = IF_BLOCK_ELSE;
-      break;
-    }
-  }
-  return foundBlock;
-}
-# 1543 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-void ExecuteCommandBlock(const char * commands, int len)
-{
-  char cmdbuff[len + 1];
-  memcpy(cmdbuff, commands, len);
-  cmdbuff[len] = '\0';
-
-
-  char oneCommand[len + 1];
-  int insertPosition = 0;
-  char * pos = cmdbuff;
-  int lenEndBlock = 0;
-  while (*pos) {
-    if (isspace(*pos) || '\x1e' == *pos || ';' == *pos) {
-      pos++;
-      continue;
-    }
-    if (strncasecmp_P(pos, PSTR("BACKLOG "), 8) == 0) {
-
-      pos += 8;
-      continue;
-    }
-    if (strncasecmp_P(pos, PSTR("IF "), 3) == 0) {
-
-
-      char *pEndif = pos + 3;
-      if (IF_BLOCK_ENDIF != findIfBlock(pEndif, lenEndBlock, IF_BLOCK_ENDIF)) {
-
-        break;
-      }
-
-      memcpy(oneCommand, pos, pEndif - pos);
-      oneCommand[pEndif - pos] = '\0';
-      pos = pEndif;
-    } else {
-
-      char *pEndOfCommand = strpbrk(pos, "\x1e;");
-      if (NULL == pEndOfCommand) {
-        pEndOfCommand = pos + strlen(pos);
-      }
-      memcpy(oneCommand, pos, pEndOfCommand - pos);
-      oneCommand[pEndOfCommand - pos] = '\0';
-      pos = pEndOfCommand;
-    }
-
-
-    String sCurrentCommand = oneCommand;
-    sCurrentCommand.trim();
-    if (sCurrentCommand.length() > 0
-      && backlog.size() < MAX_BACKLOG && !backlog_mutex)
-    {
-
-      backlog_mutex = true;
-      backlog.add(insertPosition, sCurrentCommand);
-      backlog_mutex = false;
-      insertPosition++;
-    }
-  }
-  return;
-}
-# 1613 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-void ProcessIfStatement(const char* statements)
-{
-  String conditionExpression;
-  int len = strlen(statements);
-  char statbuff[len + 1];
-  memcpy(statbuff, statements, len + 1);
-  char *pos = statbuff;
-  int lenEndBlock = 0;
-  while (true) {
-
-
-    while (*pos && *pos != '(') {
-      pos++;
-    }
-    if (0 == *pos) { break; }
-    char * posEnd = findClosureBracket(pos);
-
-    if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) {
-
-      char * cmdBlockStart = posEnd + 1;
-      char * cmdBlockEnd = cmdBlockStart;
-      int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ANY);
-      if (IF_BLOCK_INVALID == nextBlock) {
-
-        break;
-      }
-      ExecuteCommandBlock(cmdBlockStart, cmdBlockEnd - cmdBlockStart - lenEndBlock);
-      pos = cmdBlockEnd;
-      break;
-    } else {
-      pos = posEnd + 1;
-      int8_t nextBlock = findIfBlock(pos, lenEndBlock, IF_BLOCK_ANY);
-      if (IF_BLOCK_ELSEIF == nextBlock) {
-
-        continue;
-      } else if (IF_BLOCK_ELSE == nextBlock) {
-
-        char * cmdBlockEnd = pos;
-        int8_t nextBlock = findIfBlock(cmdBlockEnd, lenEndBlock, IF_BLOCK_ENDIF);
-        if (IF_BLOCK_ENDIF != nextBlock) {
-
-          break;
-        }
-        ExecuteCommandBlock(pos, cmdBlockEnd - pos - lenEndBlock);
-        break;
-      } else {
-
-        break;
-      }
-    }
-  }
-}
-# 1677 "S:/Development/Tasmota/tasmota/xdrv_10_rules.ino"
-void RulesPreprocessCommand(char *pCommands)
-{
-  char * cmd = pCommands;
-  int lenEndBlock = 0;
-  while (*cmd) {
-
-    if (';' == *cmd || isspace(*cmd)) {
-      cmd++;
-    }
-    else if (strncasecmp_P(cmd, PSTR("IF "), 3) == 0) {
-
-      char * pIfStart = cmd;
-      char * pIfEnd = pIfStart + 3;
-
-      if (IF_BLOCK_ENDIF == findIfBlock(pIfEnd, lenEndBlock, IF_BLOCK_ENDIF)) {
-
-        cmd = pIfEnd;
-
-
-        while (pIfStart < pIfEnd) {
-          if (';' == *pIfStart)
-            *pIfStart = '\x1e';
-          pIfStart++;
-        }
-      }
-      else {
-        break;
-      }
-    }
-    else {
-      while (*cmd && ';' != *cmd) {
-        cmd++;
-      }
-    }
-  }
-  return;
-}
-#endif
-
-
-
-
-
-void CmndRule(void)
-{
-  uint8_t index = XdrvMailbox.index;
-  if ((index > 0) && (index <= MAX_RULE_SETS)) {
-    if ((XdrvMailbox.data_len > 0) && (XdrvMailbox.data_len < sizeof(Settings.rules[index -1]))) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 10)) {
-        switch (XdrvMailbox.payload) {
-        case 0:
-        case 1:
-          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
-          break;
-        case 2:
-          bitWrite(Settings.rule_enabled, index -1, bitRead(Settings.rule_enabled, index -1) ^1);
-          break;
-        case 4:
-        case 5:
-          bitWrite(Settings.rule_once, index -1, XdrvMailbox.payload &1);
-          break;
-        case 6:
-          bitWrite(Settings.rule_once, index -1, bitRead(Settings.rule_once, index -1) ^1);
-          break;
-        case 8:
-        case 9:
-          bitWrite(Settings.rule_stop, index -1, XdrvMailbox.payload &1);
-          break;
-        case 10:
-          bitWrite(Settings.rule_stop, index -1, bitRead(Settings.rule_stop, index -1) ^1);
-          break;
-        }
-      } else {
-        int offset = 0;
-        if ('+' == XdrvMailbox.data[0]) {
-          offset = strlen(Settings.rules[index -1]);
-          if (XdrvMailbox.data_len < (sizeof(Settings.rules[index -1]) - offset -1)) {
-            XdrvMailbox.data[0] = ' ';
-          } else {
-            offset = -1;
-          }
-        }
-        if (offset != -1) {
-          strlcpy(Settings.rules[index -1] + offset, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(Settings.rules[index -1]));
-        }
-      }
-      Rules.triggers[index -1] = 0;
-    }
-    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s%d\":\"%s\",\"Once\":\"%s\",\"StopOnError\":\"%s\",\"Free\":%d,\"Rules\":\"%s\"}"),
-      XdrvMailbox.command, index, GetStateText(bitRead(Settings.rule_enabled, index -1)), GetStateText(bitRead(Settings.rule_once, index -1)),
-      GetStateText(bitRead(Settings.rule_stop, index -1)), sizeof(Settings.rules[index -1]) - strlen(Settings.rules[index -1]) -1, Settings.rules[index -1]);
-  }
-}
-
-void CmndRuleTimer(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_TIMERS)) {
-    if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-      float timer_set = evaluateExpression(XdrvMailbox.data, XdrvMailbox.data_len);
-      Rules.timer[XdrvMailbox.index -1] = (timer_set > 0) ? millis() + (1000 * timer_set) : 0;
-#else
-      Rules.timer[XdrvMailbox.index -1] = (XdrvMailbox.payload > 0) ? millis() + (1000 * XdrvMailbox.payload) : 0;
-#endif
-    }
-    mqtt_data[0] = '\0';
-    for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
-      ResponseAppend_P(PSTR("%c\"T%d\":%d"), (i) ? ',' : '{', i +1, (Rules.timer[i]) ? (Rules.timer[i] - millis()) / 1000 : 0);
-    }
-    ResponseJsonEnd();
-  }
-}
-
-void CmndEvent(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    strlcpy(Rules.event_data, XdrvMailbox.data, sizeof(Rules.event_data));
-  }
-  ResponseCmndDone();
-}
-
-void CmndVariable(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (!XdrvMailbox.usridx) {
-      mqtt_data[0] = '\0';
-      for (uint32_t i = 0; i < MAX_RULE_VARS; i++) {
-        ResponseAppend_P(PSTR("%c\"Var%d\":\"%s\""), (i) ? ',' : '{', i +1, rules_vars[i]);
-      }
-      ResponseJsonEnd();
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-        if (XdrvMailbox.data[0] == '=') {
-          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-        } else {
-          strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
-        }
-#else
-        strlcpy(rules_vars[XdrvMailbox.index -1], ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data, sizeof(rules_vars[XdrvMailbox.index -1]));
-#endif
-        bitSet(Rules.vars_event, XdrvMailbox.index -1);
-      }
-      ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-    }
-  }
-}
-
-void CmndMemory(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_MEMS)) {
-    if (!XdrvMailbox.usridx) {
-      ResponseCmndAll(SET_MEM1, MAX_RULE_MEMS);
-    } else {
-      if (XdrvMailbox.data_len > 0) {
-#ifdef USE_EXPRESSION
-        if (XdrvMailbox.data[0] == '=') {
-          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, SettingsText(SET_MEM1 + XdrvMailbox.index -1));
-        } else {
-          SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-        }
-#else
-        SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
-#endif
-        bitSet(Rules.mems_event, XdrvMailbox.index -1);
-      }
-      ResponseCmndIdxChar(SettingsText(SET_MEM1 + XdrvMailbox.index -1));
-    }
-  }
-}
-
-void CmndCalcResolution(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
-    Settings.flag2.calc_resolution = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.flag2.calc_resolution);
-}
-
-void CmndAddition(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) + CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndSubtract(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) - CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndMultiply(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      float tempvar = CharToFloat(rules_vars[XdrvMailbox.index -1]) * CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-      bitSet(Rules.vars_event, XdrvMailbox.index -1);
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndScale(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_RULE_VARS)) {
-    if (XdrvMailbox.data_len > 0) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len +1];
-
-        float valueIN = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        float fromLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        float fromHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        float toLow = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4));
-        float toHigh = CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 5));
-        float value = map_double(valueIN, fromLow, fromHigh, toLow, toHigh);
-        dtostrfd(value, Settings.flag2.calc_resolution, rules_vars[XdrvMailbox.index -1]);
-        bitSet(Rules.vars_event, XdrvMailbox.index -1);
-      }
-    }
-    ResponseCmndIdxChar(rules_vars[XdrvMailbox.index -1]);
-  }
-}
-
-float map_double(float x, float in_min, float in_max, float out_min, float out_max)
-{
-  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-}
-
-
-
-
-
-bool Xdrv10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_50_MSECOND:
-      RulesEvery50ms();
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      RulesEvery100ms();
-      break;
-    case FUNC_EVERY_SECOND:
-      RulesEverySecond();
-      break;
-    case FUNC_SET_POWER:
-      RulesSetPower();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kRulesCommands, RulesCommand);
-      break;
-    case FUNC_RULES_PROCESS:
-      result = RulesProcess();
-      break;
-    case FUNC_SAVE_BEFORE_RESTART:
-      RulesSaveBeforeRestart();
-      break;
-#ifdef SUPPORT_MQTT_EVENT
-    case FUNC_MQTT_DATA:
-      result = RulesMqttData();
-      break;
-#endif
-    case FUNC_PRE_INIT:
-      RulesInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-#ifdef USE_SCRIPT
-#ifndef USE_RULES
-# 40 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-#define XDRV_10 10
-#define XI2C_37 37
-
-#define SCRIPT_DEBUG 0
-
-
-#ifndef MAXVARS
-#define MAXVARS 50
-#endif
-#ifndef MAXSVARS
-#define MAXSVARS 5
-#endif
-#define MAXNVARS MAXVARS-MAXSVARS
-
-#define MAXFILT 5
-#define SCRIPT_SVARSIZE 20
-#define SCRIPT_MAXSSIZE 48
-#define SCRIPT_EOL '\n'
-#define SCRIPT_FLOAT_PRECISION 2
-#define PMEM_SIZE sizeof(Settings.script_pram)
-#define SCRIPT_MAXPERM (PMEM_SIZE)-4/sizeof(float)
-#define MAX_SCRIPT_SIZE MAX_RULE_SIZE*MAX_RULE_SETS
-
-
-#define EPOCH_OFFSET 1546300800
-
-enum {OPER_EQU=1,OPER_PLS,OPER_MIN,OPER_MUL,OPER_DIV,OPER_PLSEQU,OPER_MINEQU,OPER_MULEQU,OPER_DIVEQU,OPER_EQUEQU,OPER_NOTEQU,OPER_GRTEQU,OPER_LOWEQU,OPER_GRT,OPER_LOW,OPER_PERC,OPER_XOR,OPER_AND,OPER_OR,OPER_ANDEQU,OPER_OREQU,OPER_XOREQU,OPER_PERCEQU};
-enum {SCRIPT_LOGLEVEL=1,SCRIPT_TELEPERIOD};
-
-#ifdef USE_SCRIPT_FATFS
-#include <SPI.h>
-#include <SD.h>
-#ifndef FAT_SCRIPT_SIZE
-#define FAT_SCRIPT_SIZE 4096
-#endif
-#define FAT_SCRIPT_NAME "script.txt"
-#if USE_LONG_FILE_NAMES==1
-#warning ("FATFS long filenames not supported");
-#endif
-#if USE_STANDARD_SPI_LIBRARY==0
-#warning ("FATFS standard spi should be used");
-#endif
-#endif
-
-#ifdef SUPPORT_MQTT_EVENT
-  #include <LinkedList.h>
-  typedef struct {
-    String Event;
-    String Topic;
-    String Key;
-  } MQTT_Subscription;
-  LinkedList<MQTT_Subscription> subscriptions;
-#endif
-
-#ifdef USE_DISPLAY
-#ifdef USE_TOUCH_BUTTONS
-#include <renderer.h>
-extern VButton *buttons[MAXBUTTONS];
-#endif
-#endif
-
-typedef union {
-  uint8_t data;
-  struct {
-    uint8_t is_string : 1;
-    uint8_t is_permanent : 1;
-    uint8_t is_timer : 1;
-    uint8_t is_autoinc : 1;
-    uint8_t changed : 1;
-    uint8_t settable : 1;
-    uint8_t is_filter : 1;
-    uint8_t constant : 1;
-  };
-} SCRIPT_TYPE;
-
-struct T_INDEX {
-  uint8_t index;
-  SCRIPT_TYPE bits;
-};
-
-struct M_FILT {
-  uint8_t numvals;
-  uint8_t index;
-  float maccu;
-  float rbuff[1];
-};
-
-typedef union {
-  uint8_t data;
-  struct {
-      uint8_t nutu8 : 1;
-      uint8_t nutu7 : 1;
-      uint8_t nutu6 : 1;
-      uint8_t nutu5 : 1;
-      uint8_t nutu4 : 1;
-      uint8_t nutu3 : 1;
-      uint8_t is_dir : 1;
-      uint8_t is_open : 1;
-  };
-} FILE_FLAGS;
-
-#define SFS_MAX 4
-
-struct SCRIPT_MEM {
-    float *fvars;
-    float *s_fvars;
-    struct T_INDEX *type;
-    struct M_FILT *mfilt;
-    char *glob_vnp;
-    uint8_t *vnp_offset;
-    char *glob_snp;
-    char *scriptptr;
-    char *section_ptr;
-    char *scriptptr_bu;
-    char *script_ram;
-    uint16_t script_size;
-    uint8_t *script_pram;
-    uint16_t script_pram_size;
-    uint8_t numvars;
-    void *script_mem;
-    uint16_t script_mem_size;
-    uint8_t script_dprec;
-    uint8_t var_not_found;
-    uint8_t glob_error;
-    uint8_t max_ssize;
-    uint8_t script_loglevel;
-    uint8_t flags;
-#ifdef USE_SCRIPT_FATFS
-    File files[SFS_MAX];
-    FILE_FLAGS file_flags[SFS_MAX];
-    uint8_t script_sd_found;
-    char flink[2][14];
-#endif
-} glob_script_mem;
-
-
-int16_t last_findex;
-uint8_t tasm_cmd_activ=0;
-uint8_t fast_script=0;
-uint32_t script_lastmillis;
-
-
-#ifdef USE_BUTTON_EVENT
-int8_t script_button[MAX_KEYS];
-#endif
-
-char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo);
-char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo);
-char *ForceStringVar(char *lp,char *dstr);
-void send_download(void);
-uint8_t reject(char *name);
-
-void ScriptEverySecond(void) {
-
-  if (bitRead(Settings.rule_enabled, 0)) {
-    struct T_INDEX *vtp=glob_script_mem.type;
-    float delta=(millis()-script_lastmillis)/1000;
-    script_lastmillis=millis();
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_timer) {
-
-        float *fp=&glob_script_mem.fvars[vtp[count].index];
-        if (*fp>0) {
-
-          *fp-=delta;
-          if (*fp<0) *fp=0;
-        }
-      }
-      if (vtp[count].bits.is_autoinc) {
-
-        float *fp=&glob_script_mem.fvars[vtp[count].index];
-        if (*fp>=0) {
-          *fp+=delta;
-        }
-      }
-    }
-    Run_Scripter(">S",2,0);
-  }
-}
-
-void RulesTeleperiod(void) {
-  if (bitRead(Settings.rule_enabled, 0) && mqtt_data[0]) Run_Scripter(">T",2, mqtt_data);
-}
-
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-
-#include <Eeprom24C128_256.h>
-#define EEPROM_ADDRESS 0x50
-
-#ifndef EEP_SCRIPT_SIZE
-#define EEP_SCRIPT_SIZE 4095
-#endif
-
-
-static Eeprom24C128_256 eeprom(EEPROM_ADDRESS);
-
-#define EEP_WRITE(A,B,C) eeprom.writeBytes(A,B,(uint8_t*)C);
-
-#define EEP_READ(A,B,C) eeprom.readBytes(A,B,(uint8_t*)C);
-#endif
-#endif
-
-#define SCRIPT_SKIP_SPACES while (*lp==' ' || *lp=='\t') lp++;
-#define SCRIPT_SKIP_EOL while (*lp==SCRIPT_EOL) lp++;
-
-
-int16_t Init_Scripter(void) {
-char *script;
-
-    script=glob_script_mem.script_ram;
-
-
-    uint16_t lines=0,nvars=0,svars=0,vars=0;
-    char *lp=script;
-    char vnames[MAXVARS*10];
-    char *vnames_p=vnames;
-    char *vnp[MAXVARS];
-    char **vnp_p=vnp;
-    char strings[MAXSVARS*SCRIPT_MAXSSIZE];
-    struct M_FILT mfilt[MAXFILT];
-
-    char *strings_p=strings;
-    char *snp[MAXSVARS];
-    char **snp_p=snp;
-    uint8_t numperm=0,numflt=0,count;
-
-    glob_script_mem.max_ssize=SCRIPT_SVARSIZE;
-    glob_script_mem.scriptptr=0;
-
-    if (!*script) return -999;
-
-    float fvalues[MAXVARS];
-    struct T_INDEX vtypes[MAXVARS];
-    char init=0;
-    while (1) {
-
-
-        SCRIPT_SKIP_SPACES
-
-        if (*lp=='\n' || *lp=='\r') goto next_line;
-
-        if (*lp==';') goto next_line;
-        if (init) {
-
-            if (*lp=='>') {
-                init=0;
-                break;
-            }
-            char *op=strchr(lp,'=');
-            if (op) {
-                vtypes[vars].bits.data=0;
-
-                if (*lp=='p' && *(lp+1)==':') {
-                    lp+=2;
-                    if (numperm<SCRIPT_MAXPERM) {
-                      vtypes[vars].bits.is_permanent=1;
-                      numperm++;
-                    }
-                } else {
-                    vtypes[vars].bits.is_permanent=0;
-                }
-                if (*lp=='t' && *(lp+1)==':') {
-                    lp+=2;
-                    vtypes[vars].bits.is_timer=1;
-                } else {
-                    vtypes[vars].bits.is_timer=0;
-                }
-                if (*lp=='i' && *(lp+1)==':') {
-                    lp+=2;
-                    vtypes[vars].bits.is_autoinc=1;
-                } else {
-                    vtypes[vars].bits.is_autoinc=0;
-                }
-                if ((*lp=='m' || *lp=='M') && *(lp+1)==':') {
-                    uint8_t flg=*lp;
-                    lp+=2;
-                    if (flg=='M') mfilt[numflt].numvals=8;
-                    else mfilt[numflt].numvals=5;
-                    vtypes[vars].bits.is_filter=1;
-                    mfilt[numflt].index=0;
-                    if (flg=='M') {
-                      mfilt[numflt].numvals|=0x80;
-                    }
-                    vtypes[vars].index=numflt;
-                    numflt++;
-                    if (numflt>MAXFILT) {
-                      return -6;
-                    }
-                } else {
-                    vtypes[vars].bits.is_filter=0;
-                }
-                *vnp_p++=vnames_p;
-                while (lp<op) {
-                    *vnames_p++=*lp++;
-                }
-                *vnames_p++=0;
-
-                op++;
-                if (*op!='"') {
-                    float fv;
-                    if (*op=='0' && *(op+1)=='x') {
-                      op+=2;
-                      fv=strtol(op,&op,16);
-                    } else {
-                      fv=CharToFloat(op);
-                    }
-                    fvalues[nvars]=fv;
-                    vtypes[vars].bits.is_string=0;
-                    if (!vtypes[vars].bits.is_filter) vtypes[vars].index=nvars;
-                    nvars++;
-                    if (nvars>MAXNVARS) {
-                      return -1;
-                    }
-                    if (vtypes[vars].bits.is_filter) {
-                      while (isdigit(*op) || *op=='.' || *op=='-') {
-                        op++;
-                      }
-                      while (*op==' ') op++;
-                      if (isdigit(*op)) {
-
-                        uint8_t flen=atoi(op);
-                        mfilt[numflt-1].numvals&=0x80;
-                        mfilt[numflt-1].numvals|=flen&0x7f;
-                      }
-                    }
-
-                } else {
-
-                    op++;
-                    *snp_p++=strings_p;
-                    while (*op!='\"') {
-                      if (*op==SCRIPT_EOL) break;
-                      *strings_p++=*op++;
-                    }
-                    *strings_p++=0;
-                    vtypes[vars].bits.is_string=1;
-                    vtypes[vars].index=svars;
-                    svars++;
-                    if (svars>MAXSVARS) {
-                      return -2;
-                    }
-                }
-                vars++;
-                if (vars>MAXVARS) {
-                  return -3;
-                }
-            }
-        } else {
-            if (!strncmp(lp,">D",2)) {
-              lp+=2;
-              SCRIPT_SKIP_SPACES
-              if (isdigit(*lp)) {
-                uint8_t ssize=atoi(lp)+1;
-                if (ssize<10 || ssize>SCRIPT_MAXSSIZE) ssize=SCRIPT_MAXSSIZE;
-                glob_script_mem.max_ssize=ssize;
-              }
-              init=1;
-            }
-        }
-
-    next_line:
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-    }
-
-    uint16_t fsize=0;
-    for (count=0; count<numflt; count++) {
-      fsize+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
-    }
-
-
-    uint16_t script_mem_size=
-
-    (sizeof(float)*nvars)+
-    (sizeof(float)*nvars)+
-
-    (vnames_p-vnames)+
-
-    (sizeof(uint8_t)*vars)+
-
-    (glob_script_mem.max_ssize*svars)+
-
-    (sizeof(struct T_INDEX)*vars)+
-    fsize;
-
-    script_mem_size+=16;
-    uint8_t *script_mem;
-    script_mem=(uint8_t*)calloc(script_mem_size,1);
-    if (!script_mem) {
-      return -4;
-    }
-    glob_script_mem.script_mem=script_mem;
-    glob_script_mem.script_mem_size=script_mem_size;
-
-
-
-    glob_script_mem.fvars=(float*)script_mem;
-    uint16_t size=sizeof(float)*nvars;
-    memcpy(script_mem,fvalues,size);
-    script_mem+=size;
-    glob_script_mem.s_fvars=(float*)script_mem;
-    size=sizeof(float)*nvars;
-    memcpy(script_mem,fvalues,size);
-    script_mem+=size;
-
-    glob_script_mem.mfilt=(struct M_FILT*)script_mem;
-    script_mem+=fsize;
-
-
-    glob_script_mem.type=(struct T_INDEX*)script_mem;
-    size=sizeof(struct T_INDEX)*vars;
-    memcpy(script_mem,vtypes,size);
-    script_mem+=size;
-
-
-    char *namep=(char*)script_mem;
-    glob_script_mem.glob_vnp=(char*)script_mem;
-    size=vnames_p-vnames;
-    memcpy(script_mem,vnames,size);
-    script_mem+=size;
-
-    glob_script_mem.vnp_offset=(uint8_t*)script_mem;
-    size=vars*sizeof(uint8_t);
-    script_mem+=size;
-
-
-    char *snamep=(char*)script_mem;
-    glob_script_mem.glob_snp=(char*)script_mem;
-    size=glob_script_mem.max_ssize*svars;
-
-    script_mem+=size;
-
-
-    uint16_t index=0;
-    uint8_t *cp=glob_script_mem.vnp_offset;
-    for (count=0;count<vars;count++) {
-        *cp++=index;
-        while (*namep) {
-            index++;
-            namep++;
-        }
-        namep++;
-        index++;
-        if (index>255) {
-          free(glob_script_mem.script_mem);
-          return -5;
-        }
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Script: nv=%d, tv=%d, vns=%d, ram=%d"), nvars, svars, index, glob_script_mem.script_mem_size);
-
-
-    char *cp1=glob_script_mem.glob_snp;
-    char *sp=strings;
-    for (count=0; count<svars;count++) {
-        strcpy(cp1,sp);
-        sp+=strlen(sp)+1;
-        cp1+=glob_script_mem.max_ssize;
-    }
-
-
-    uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-    for (count=0; count<numflt; count++) {
-      struct M_FILT *mflp=(struct M_FILT*)mp;
-      mflp->numvals=mfilt[count].numvals;
-      mp+=sizeof(struct M_FILT)+((mfilt[count].numvals&0x7f)-1)*sizeof(float);
-    }
-
-    glob_script_mem.numvars=vars;
-    glob_script_mem.script_dprec=SCRIPT_FLOAT_PRECISION;
-    glob_script_mem.script_loglevel=LOG_LEVEL_INFO;
-
-
-#if SCRIPT_DEBUG>2
-    struct T_INDEX *dvtp=glob_script_mem.type;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (dvtp[count].bits.is_string) {
-
-      } else {
-        char string[32];
-        dtostrfd(glob_script_mem.fvars[dvtp[count].index],glob_script_mem.script_dprec,string);
-        toLog(string);
-      }
-    }
-#endif
-
-
-    float *fp=(float*)glob_script_mem.script_pram;
-    struct T_INDEX *vtp=glob_script_mem.type;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
-        uint8_t index=vtp[count].index;
-        if (!isnan(*fp)) {
-          glob_script_mem.fvars[index]=*fp;
-        } else {
-          *fp=glob_script_mem.fvars[index];
-        }
-        fp++;
-      }
-    }
-    sp=(char*)fp;
-    for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-      if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
-        uint8_t index=vtp[count].index;
-        char *dp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
-        uint8_t slen=strlen(sp);
-        strlcpy(dp,sp,glob_script_mem.max_ssize);
-        sp+=slen+1;
-      }
-    }
-
-
-#ifdef USE_SCRIPT_FATFS
-    if (!glob_script_mem.script_sd_found) {
-      if (SD.begin(USE_SCRIPT_FATFS)) {
-        glob_script_mem.script_sd_found=1;
-      } else {
-        glob_script_mem.script_sd_found=0;
-      }
-    }
-    for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
-      glob_script_mem.file_flags[cnt].is_open=0;
-    }
-#endif
-
-#if SCRIPT_DEBUG>0
-    ClaimSerial();
-    SetSerialBaudrate(9600);
-#endif
-
-
-    glob_script_mem.scriptptr=lp-1;
-    glob_script_mem.scriptptr_bu=glob_script_mem.scriptptr;
-    return 0;
-
-}
-
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-void ws2812_set_array(float *array ,uint8_t len) {
-
-  Ws2812ForceSuspend();
-  for (uint8_t cnt=0;cnt<len;cnt++) {
-    if (cnt>Settings.light_pixels) break;
-    uint32_t col=array[cnt];
-    Ws2812SetColor(cnt+1,col>>16,col>>8,col,0);
-  }
-  Ws2812ForceUpdate();
-}
-#endif
-#endif
-
-#define NUM_RES 0xfe
-#define STR_RES 0xfd
-#define VAR_NV 0xff
-
-#define NTYPE 0
-#define STYPE 0x80
-
-#ifndef FLT_MAX
-#define FLT_MAX 99999999
-#endif
-
-float median_array(float *array,uint8_t len) {
-    uint8_t ind[len];
-    uint8_t mind=0,index=0,flg;
-    float min=FLT_MAX;
-
-    for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
-        for (uint8_t mcnt=0; mcnt<len; mcnt++) {
-            flg=0;
-            for (uint8_t icnt=0; icnt<index; icnt++) {
-                if (ind[icnt]==mcnt) {
-                    flg=1;
-                }
-            }
-            if (!flg) {
-                if (array[mcnt]<min) {
-                    min=array[mcnt];
-                    mind=mcnt;
-                }
-            }
-        }
-        ind[index]=mind;
-        index++;
-        min=FLT_MAX;
-    }
-    return array[ind[len/2]];
-}
-
-
-float *Get_MFAddr(uint8_t index,uint8_t *len) {
-  *len=0;
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        *len=mflp->numvals&0x7f;
-        return mflp->rbuff;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-
-float Get_MFVal(uint8_t index,uint8_t bind) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        uint8_t maxind=mflp->numvals&0x7f;
-        if (!bind) {
-          return mflp->index;
-        }
-        if (bind<1 || bind>maxind) bind=maxind;
-        return mflp->rbuff[bind-1];
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-void Set_MFVal(uint8_t index,uint8_t bind,float val) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-        uint8_t maxind=mflp->numvals&0x7f;
-        if (!bind) {
-          mflp->index=val;
-        } else {
-          if (bind<1 || bind>maxind) bind=maxind;
-          mflp->rbuff[bind-1]=val;
-        }
-        return;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-}
-
-
-float Get_MFilter(uint8_t index) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-      if (mflp->numvals&0x80) {
-
-        return mflp->maccu/(mflp->numvals&0x7f);
-      } else {
-
-        return median_array(mflp->rbuff,mflp->numvals);
-      }
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-  return 0;
-}
-
-void Set_MFilter(uint8_t index, float invar) {
-  uint8_t *mp=(uint8_t*)glob_script_mem.mfilt;
-  for (uint8_t count=0; count<MAXFILT; count++) {
-    struct M_FILT *mflp=(struct M_FILT*)mp;
-    if (count==index) {
-      if (mflp->numvals&0x80) {
-
-        mflp->maccu-=mflp->rbuff[mflp->index];
-        mflp->maccu+=invar;
-        mflp->rbuff[mflp->index]=invar;
-        mflp->index++;
-        if (mflp->index>=(mflp->numvals&0x7f)) mflp->index=0;
-      } else {
-
-        mflp->rbuff[mflp->index]=invar;
-        mflp->index++;
-        if (mflp->index>=mflp->numvals) mflp->index=0;
-      }
-      break;
-    }
-    mp+=sizeof(struct M_FILT)+((mflp->numvals&0x7f)-1)*sizeof(float);
-  }
-}
-
-#define MEDIAN_SIZE 5
-#define MEDIAN_FILTER_NUM 2
-
-struct MEDIAN_FILTER {
-float buffer[MEDIAN_SIZE];
-int8_t index;
-} script_mf[MEDIAN_FILTER_NUM];
-
-float DoMedian5(uint8_t index, float in) {
-
-  if (index>=MEDIAN_FILTER_NUM) index=0;
-
-  struct MEDIAN_FILTER* mf=&script_mf[index];
-  mf->buffer[mf->index]=in;
-  mf->index++;
-  if (mf->index>=MEDIAN_SIZE) mf->index=0;
-  return median_array(mf->buffer,MEDIAN_SIZE);
-}
-
-#ifdef USE_LIGHT
-
-uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
-float r = 0, g = 0, b = 0;
-struct HSV {
- float H;
- float S;
- float V;
-} hsv;
-
-hsv.H=hue;
-hsv.S=(float)saturation/100.0;
-hsv.V=(float)value/100.0;
-
-if (hsv.S == 0) {
-  r = hsv.V;
-  g = hsv.V;
-  b = hsv.V;
- } else {
-  int i;
-  float f, p, q, t;
-
-  if (hsv.H == 360)
-   hsv.H = 0;
-  else
-   hsv.H = hsv.H / 60;
-
-  i = (int)trunc(hsv.H);
-  f = hsv.H - i;
-
-  p = hsv.V * (1.0 - hsv.S);
-  q = hsv.V * (1.0 - (hsv.S * f));
-  t = hsv.V * (1.0 - (hsv.S * (1.0 - f)));
-
-  switch (i)
-  {
-  case 0:
-   r = hsv.V;
-   g = t;
-   b = p;
-   break;
-
-  case 1:
-   r = q;
-   g = hsv.V;
-   b = p;
-   break;
-
-  case 2:
-   r = p;
-   g = hsv.V;
-   b = t;
-   break;
-
-  case 3:
-   r = p;
-   g = q;
-   b = hsv.V;
-   break;
-
-  case 4:
-   r = t;
-   g = p;
-   b = hsv.V;
-   break;
-
-  default:
-   r = hsv.V;
-   g = p;
-   b = q;
-   break;
-  }
-
- }
-
-  uint8_t ir,ig,ib;
-  ir=r*255;
-  ig=g*255;
-  ib=b*255;
-
- uint32_t rgb=(ir<<16)|(ig<<8)|ib;
- return rgb;
-}
-#endif
-
-
-
-
-char *isvar(char *lp, uint8_t *vtype,struct T_INDEX *tind,float *fp,char *sp,JsonObject *jo) {
-    uint16_t count,len=0;
-    uint8_t nres=0;
-    char vname[32];
-    float fvar=0;
-    tind->index=0;
-    tind->bits.data=0;
-
-    if (isdigit(*lp) || (*lp=='-' && isdigit(*(lp+1))) || *lp=='.') {
-
-        if (fp) {
-          if (*lp=='0' && *(lp+1)=='x') {
-            lp+=2;
-            *fp=strtol(lp,0,16);
-          } else {
-            *fp=CharToFloat(lp);
-          }
-        }
-        if (*lp=='-') lp++;
-        while (isdigit(*lp) || *lp=='.') {
-          if (*lp==0 || *lp==SCRIPT_EOL) break;
-          lp++;
-        }
-        tind->bits.constant=1;
-        tind->bits.is_string=0;
-        *vtype=NUM_RES;
-        return lp;
-    }
-    if (*lp=='"') {
-      lp++;
-      while (*lp!='"') {
-        if (*lp==0 || *lp==SCRIPT_EOL) break;
-        uint8_t iob=*lp;
-        if (iob=='\\') {
-          lp++;
-          if (*lp=='t') {
-            iob='\t';
-          } else if (*lp=='n') {
-            iob='\n';
-          } else if (*lp=='r') {
-            iob='\r';
-          } else if (*lp=='\\') {
-            iob='\\';
-          } else {
-            lp--;
-          }
-          if (sp) *sp++=iob;
-        } else {
-          if (sp) *sp++=iob;
-        }
-        lp++;
-      }
-      if (sp) *sp=0;
-      *vtype=STR_RES;
-      tind->bits.constant=1;
-      tind->bits.is_string=1;
-      return lp+1;
-    }
-
-    if (*lp=='-') {
-
-      nres=1;
-      lp++;
-    }
-
-    const char *term="\n\r ])=+-/*%><!^&|}";
-    for (count=0; count<sizeof(vname); count++) {
-        char iob=lp[count];
-        if (!iob || strchr(term,iob)) {
-            vname[count]=0;
-            break;
-        }
-        vname[count]=iob;
-        len+=1;
-    }
-
-    if (!vname[0]) {
-
-      *vtype=VAR_NV;
-      tind->index=VAR_NV;
-      glob_script_mem.var_not_found=1;
-      return lp;
-    }
-
-    struct T_INDEX *vtp=glob_script_mem.type;
-    char dvnam[32];
-    strcpy (dvnam,vname);
-    uint8_t olen=len;
-    last_findex=-1;
-    char *ja=strchr(dvnam,'[');
-    if (ja) {
-      *ja=0;
-      ja++;
-      olen=strlen(dvnam);
-    }
-    for (count=0; count<glob_script_mem.numvars; count++) {
-        char *cp=glob_script_mem.glob_vnp+glob_script_mem.vnp_offset[count];
-        uint8_t slen=strlen(cp);
-        if (slen==olen && *cp==dvnam[0]) {
-            if (!strncmp(cp,dvnam,olen)) {
-                uint8_t index=vtp[count].index;
-                *tind=vtp[count];
-                tind->index=count;
-                if (vtp[count].bits.is_string==0) {
-                    *vtype=NTYPE|index;
-                    if (vtp[count].bits.is_filter) {
-                      if (ja) {
-                        lp+=olen+1;
-                        lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-                        last_findex=fvar;
-                        fvar=Get_MFVal(index,fvar);
-                        len=1;
-                      } else {
-                        fvar=Get_MFilter(index);
-                      }
-                    } else {
-                      fvar=glob_script_mem.fvars[index];
-                    }
-                    if (nres) fvar=-fvar;
-                    if (fp) *fp=fvar;
-                } else {
-                    *vtype=STYPE|index;
-                    if (sp) strlcpy(sp,glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize),SCRIPT_MAXSSIZE);
-                }
-                return lp+len;
-            }
-        }
-    }
-
-    if (jo) {
-
-      const char* str_value;
-      uint8_t aindex;
-      String vn;
-      char *ja=strchr(vname,'[');
-      if (ja) {
-
-        *ja=0;
-        ja++;
-
-        float fvar;
-        GetNumericResult(ja,OPER_EQU,&fvar,0);
-        aindex=fvar;
-        if (aindex<1 || aindex>6) aindex=1;
-        aindex--;
-      }
-      if (jo->success()) {
-        char *subtype=strchr(vname,'#');
-        char *subtype2;
-        if (subtype) {
-          *subtype=0;
-          subtype++;
-          subtype2=strchr(subtype,'#');
-          if (subtype2) {
-            *subtype2=0;
-            *subtype2++;
-          }
-        }
-        vn=vname;
-        str_value = (*jo)[vn];
-        if ((*jo)[vn].success()) {
-          if (subtype) {
-            JsonObject &jobj1=(*jo)[vn];
-            if (jobj1.success()) {
-              vn=subtype;
-              jo=&jobj1;
-              str_value = (*jo)[vn];
-              if ((*jo)[vn].success()) {
-
-                if (subtype2) {
-                  JsonObject &jobj2=(*jo)[vn];
-                  if ((*jo)[vn].success()) {
-                    vn=subtype2;
-                    jo=&jobj2;
-                    str_value = (*jo)[vn];
-                    if ((*jo)[vn].success()) {
-                      goto skip;
-                    } else {
-                      goto chknext;
-                    }
-                  } else {
-                    goto chknext;
-                  }
-                }
-
-                goto skip;
-              }
-            } else {
-              goto chknext;
-            }
-          }
-          skip:
-          if (ja) {
-
-            str_value = (*jo)[vn][aindex];
-          }
-          if (str_value && *str_value) {
-            if ((*jo).is<char*>(vn)) {
-              if (!strncmp(str_value,"ON",2)) {
-                if (fp) *fp=1;
-                goto nexit;
-              } else if (!strncmp(str_value,"OFF",3)) {
-                if (fp) *fp=0;
-                goto nexit;
-              } else {
-                *vtype=STR_RES;
-                tind->bits.constant=1;
-                tind->bits.is_string=1;
-                if (sp) strlcpy(sp,str_value,SCRIPT_MAXSSIZE);
-                return lp+len;
-              }
-
-            } else {
-              if (fp) {
-                if (!strncmp(vn.c_str(),"Epoch",5)) {
-                  *fp=atoi(str_value)-(uint32_t)EPOCH_OFFSET;
-                } else {
-                  *fp=CharToFloat((char*)str_value);
-                }
-              }
-              nexit:
-              *vtype=NUM_RES;
-              tind->bits.constant=1;
-              tind->bits.is_string=0;
-              return lp+len;
-            }
-          }
-        }
-      }
-    }
-
-chknext:
-    switch (vname[0]) {
-      case 'a':
-#ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname,"acos(",5)) {
-            lp+=5;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-            fvar=acosf(fvar);
-            lp++;
-            len=0;
-            goto exit;
-        }
-#endif
-        break;
-
-      case 'b':
-        if (!strncmp(vname,"boot",4)) {
-          if (rules_flag.system_boot) {
-            rules_flag.system_boot=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-#ifdef USE_BUTTON_EVENT
-        if (!strncmp(vname,"bt[",3)) {
-
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint32_t index=fvar;
-          if (index<1 || index>MAX_KEYS) index=1;
-          fvar=script_button[index-1];
-          script_button[index-1]|=0x80;
-          len++;
-          goto exit;
-        }
-#endif
-        break;
-      case 'c':
-        if (!strncmp(vname,"chg[",4)) {
-
-          struct T_INDEX ind;
-          uint8_t vtype;
-          isvar(vname+4,&vtype,&ind,0,0,0);
-          if (!ind.bits.constant) {
-            uint8_t index=glob_script_mem.type[ind.index].index;
-            if (glob_script_mem.fvars[index]!=glob_script_mem.s_fvars[index]) {
-
-              glob_script_mem.s_fvars[index]=glob_script_mem.fvars[index];
-              fvar=1;
-              len++;
-              goto exit;
-            } else {
-              fvar=0;
-              len++;
-              goto exit;
-            }
-          }
-        }
-        break;
-      case 'd':
-        if (!strncmp(vname,"day",3)) {
-          fvar=RtcTime.day_of_month;
-          goto exit;
-        }
-        break;
-      case 'e':
-        if (!strncmp(vname,"epoch",5)) {
-          fvar=UtcTime()-(uint32_t)EPOCH_OFFSET;
-          goto exit;
-        }
-        break;
-#ifdef USE_SCRIPT_FATFS
-      case 'f':
-        if (!strncmp(vname,"fo(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t mode=fvar;
-          fvar=-1;
-          for (uint8_t cnt=0;cnt<SFS_MAX;cnt++) {
-            if (!glob_script_mem.file_flags[cnt].is_open) {
-              if (mode==0) {
-                glob_script_mem.files[cnt]=SD.open(str,FILE_READ);
-                if (glob_script_mem.files[cnt].isDirectory()) {
-                  glob_script_mem.files[cnt].rewindDirectory();
-                  glob_script_mem.file_flags[cnt].is_dir=1;
-                } else {
-                  glob_script_mem.file_flags[cnt].is_dir=0;
-                }
-              }
-              else glob_script_mem.files[cnt]=SD.open(str,FILE_WRITE);
-              if (glob_script_mem.files[cnt]) {
-                fvar=cnt;
-                glob_script_mem.file_flags[cnt].is_open=1;
-              } else {
-                AddLog_P(LOG_LEVEL_INFO,PSTR("file open failed"));
-              }
-              break;
-            }
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fc(",3)) {
-          lp+=3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          glob_script_mem.files[ind].close();
-          glob_script_mem.file_flags[ind].is_open=0;
-          fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"ff(",3)) {
-          lp+=3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          glob_script_mem.files[ind].flush();
-          fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fw(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=ForceStringVar(lp,str);
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t ind=fvar;
-          if (ind>=SFS_MAX) ind=SFS_MAX-1;
-          if (glob_script_mem.file_flags[ind].is_open) {
-            fvar=glob_script_mem.files[ind].print(str);
-          } else {
-            fvar=0;
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fr(",3)) {
-          lp+=3;
-          struct T_INDEX ind;
-          uint8_t vtype;
-          uint8_t sindex=0;
-          lp=isvar(lp,&vtype,&ind,0,0,0);
-          if (vtype!=VAR_NV) {
-
-            if ((vtype&STYPE)==0) {
-
-                  fvar=0;
-                  goto exit;
-            } else {
-
-              sindex=glob_script_mem.type[ind.index].index;
-            }
-          } else {
-
-              fvar=0;
-              goto exit;
-          }
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          uint8_t find=fvar;
-          if (find>=SFS_MAX) find=SFS_MAX-1;
-          uint8_t index=0;
-          char str[glob_script_mem.max_ssize+1];
-          char *cp=str;
-          if (glob_script_mem.file_flags[find].is_open) {
-            if (glob_script_mem.file_flags[find].is_dir) {
-              while (true) {
-                File entry=glob_script_mem.files[find].openNextFile();
-                if (entry) {
-                  if (!reject((char*)entry.name())) {
-                    strcpy(str,entry.name());
-                    entry.close();
-                    break;
-                  }
-                } else {
-                  *cp=0;
-                  break;
-                }
-                entry.close();
-              }
-              index=strlen(str);
-            } else {
-              while (glob_script_mem.files[find].available()) {
-                uint8_t buf[1];
-                glob_script_mem.files[find].read(buf,1);
-                if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
-                  break;
-                } else {
-                  *cp++=buf[0];
-                  index++;
-                  if (index>=glob_script_mem.max_ssize-1) break;
-                }
-              }
-              *cp=0;
-            }
-          } else {
-            strcpy(str,"file error");
-          }
-          lp++;
-          strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-          fvar=index;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fd(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          SD.remove(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-#ifdef USE_SCRIPT_FATFS_EXT
-        if (!strncmp(vname,"fe(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-
-          File ef=SD.open(str);
-          if (ef) {
-            uint16_t fsiz=ef.size();
-            if (fsiz<2048) {
-              char *script=(char*)calloc(fsiz+16,1);
-              if (script) {
-                ef.read((uint8_t*)script,fsiz);
-                execute_script(script);
-                free(script);
-                fvar=1;
-              }
-            }
-            ef.close();
-          }
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fmd(",4)) {
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          fvar=SD.mkdir(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"frd(",4)) {
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          fvar=SD.rmdir(str);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fx(",3)) {
-          lp+=3;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          if (SD.exists(str)) fvar=1;
-          else fvar=0;
-          lp++;
-          len=0;
-          goto exit;
-        }
-#endif
-        if (!strncmp(vname,"fl1(",4) || !strncmp(vname,"fl2(",4) ) {
-          uint8_t lknum=*(lp+2)&3;
-          lp+=4;
-          char str[glob_script_mem.max_ssize+1];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          if (lknum<1 || lknum>2) lknum=1;
-          strlcpy(glob_script_mem.flink[lknum-1],str,14);
-          lp++;
-          fvar=0;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"fsm",3)) {
-          fvar=glob_script_mem.script_sd_found;
-
-          goto exit;
-        }
-        break;
-
-#endif
-      case 'g':
-        if (!strncmp(vname,"gtmp",4)) {
-          fvar=global_temperature;
-          goto exit;
-        }
-        if (!strncmp(vname,"ghum",4)) {
-          fvar=global_humidity;
-          goto exit;
-        }
-        if (!strncmp(vname,"gprs",4)) {
-          fvar=global_pressure;
-          goto exit;
-        }
-        if (!strncmp(vname,"gtopic",6)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTT_GRP_TOPIC),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        break;
-      case 'h':
-        if (!strncmp(vname,"hours",5)) {
-          fvar=RtcTime.hour;
-          goto exit;
-        }
-        if (!strncmp(vname,"heap",4)) {
-          fvar=ESP.getFreeHeap();
-          goto exit;
-        }
-        if (!strncmp(vname,"hn(",3)) {
-          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
-          if (fvar<0 || fvar>255) fvar=0;
-          lp++;
-          len=0;
-          if (sp) {
-            sprintf(sp,"%02x",(uint8_t)fvar);
-          }
-          goto strexit;
-        }
-        if (!strncmp(vname,"hx(",3)) {
-          lp=GetNumericResult(lp+3,OPER_EQU,&fvar,0);
-          lp++;
-          len=0;
-          if (sp) {
-            sprintf(sp,"%08x",(uint32_t)fvar);
-          }
-          goto strexit;
-        }
-#ifdef USE_LIGHT
-
-        if (!strncmp(vname,"hsvrgb(",7)) {
-          lp=GetNumericResult(lp+7,OPER_EQU,&fvar,0);
-          if (fvar<0 || fvar>360) fvar=0;
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          if (fvar2<0 || fvar2>100) fvar2=0;
-          SCRIPT_SKIP_SPACES
-
-          float fvar3;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
-          if (fvar3<0 || fvar3>100) fvar3=0;
-
-          fvar=HSVToRGB(fvar,fvar2,fvar3);
-
-          lp++;
-          len=0;
-          goto exit;
-        }
-
-#endif
-        break;
-      case 'i':
-        if (!strncmp(vname,"int(",4)) {
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar,0);
-          fvar=floor(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        break;
-      case 'l':
-        if (!strncmp(vname,"loglvl",6)) {
-          fvar=glob_script_mem.script_loglevel;
-          tind->index=SCRIPT_LOGLEVEL;
-  exit_settable:
-          if (fp) *fp=fvar;
-          *vtype=NTYPE;
-          tind->bits.settable=1;
-          tind->bits.is_string=0;
-          return lp+len;
-        }
-        break;
-      case 'm':
-        if (!strncmp(vname,"med(",4)) {
-          float fvar1;
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          fvar=DoMedian5(fvar1,fvar2);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"micros",6)) {
-          fvar=micros();
-          goto exit;
-        }
-        if (!strncmp(vname,"millis",6)) {
-          fvar=millis();
-          goto exit;
-        }
-        if (!strncmp(vname,"mins",4)) {
-          fvar=RtcTime.minute;
-          goto exit;
-        }
-        if (!strncmp(vname,"month",5)) {
-          fvar=RtcTime.month;
-          goto exit;
-        }
-        if (!strncmp(vname,"mqttc",5)) {
-          if (rules_flag.mqtt_connected) {
-            rules_flag.mqtt_connected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"mqttd",5)) {
-          if (rules_flag.mqtt_disconnected) {
-            rules_flag.mqtt_disconnected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"mqtts",5)) {
-          fvar=!global_state.mqtt_down;
-          goto exit;
-        }
-        break;
-      case 'p':
-        if (!strncmp(vname,"pin[",4)) {
-
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          fvar=digitalRead((uint8_t)fvar);
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"pn[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          fvar=pin[(uint8_t)fvar];
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"pd[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint8_t gpiopin=fvar;
-          for (uint8_t i=0;i<GPIO_SENSOR_END;i++) {
-            if (pin[i]==gpiopin) {
-              fvar=i;
-
-              len++;
-              goto exit;
-            }
-          }
-          fvar=999;
-          goto exit;
-        }
-        if (!strncmp(vname,"prefix1",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX1),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"prefix2",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX2),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"prefix3",7)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTTPREFIX3),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"pow(",4)) {
-
-          float fvar1;
-          lp=GetNumericResult(lp+4,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          lp++;
-
-          fvar=FastPrecisePow(fvar1,fvar2);
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"pwr[",4)) {
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<=devices_present) {
-            fvar=bitRead(power,index-1);
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-        if (!strncmp(vname,"pc[",3)) {
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<1 || index>MAX_COUNTERS) index=1;
-          fvar=RtcSettings.pulse_counter[index-1];
-          len+=1;
-          goto exit;
-        }
-        break;
-
-      case 'r':
-        if (!strncmp(vname,"ram",3)) {
-          fvar=glob_script_mem.script_mem_size+(glob_script_mem.script_size)+(PMEM_SIZE);
-          goto exit;
-        }
-        break;
-      case 's':
-        if (!strncmp(vname,"secs",4)) {
-          fvar=RtcTime.second;
-          goto exit;
-        }
-        if (!strncmp(vname,"sw[",3)) {
-
-          GetNumericResult(vname+3,OPER_EQU,&fvar,0);
-          fvar=SwitchLastState((uint32_t)fvar);
-
-          len++;
-          goto exit;
-        }
-        if (!strncmp(vname,"stack",5)) {
-          fvar=GetStack();
-          goto exit;
-        }
-        if (!strncmp(vname,"slen",4)) {
-          fvar=strlen(glob_script_mem.script_ram);
-          goto exit;
-        }
-        if (!strncmp(vname,"sl(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          lp++;
-          len=0;
-          fvar=strlen(str);
-          goto exit;
-        }
-        if (!strncmp(vname,"sb(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          SCRIPT_SKIP_SPACES
-          float fvar1;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          lp++;
-          len=0;
-          if (fvar1<0) {
-            fvar1=strlen(str)+fvar1;
-          }
-          memcpy(sp,&str[(uint8_t)fvar1],(uint8_t)fvar2);
-          sp[(uint8_t)fvar2] = '\0';
-          goto strexit;
-        }
-        if (!strncmp(vname,"st(",3)) {
-          lp+=3;
-          char str[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,str,0);
-          while (*lp==' ') lp++;
-          char token[2];
-          token[0]=*lp++;
-          token[1]=0;
-          while (*lp==' ') lp++;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-
-          lp++;
-          len=0;
-          if (sp) {
-
-            char *st=strtok(str,token);
-            if (!st) {
-              *sp=0;
-            } else {
-              for (uint8_t cnt=1; cnt<=fvar; cnt++) {
-                if (cnt==fvar) {
-                  strcpy(sp,st);
-                  break;
-                }
-                st=strtok(NULL,token);
-                if (!st) {
-                  *sp=0;
-                  break;
-                }
-              }
-            }
-          }
-          goto strexit;
-        }
-        if (!strncmp(vname,"s(",2)) {
-          lp+=2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          char str[glob_script_mem.max_ssize+1];
-          dtostrfd(fvar,glob_script_mem.script_dprec,str);
-          if (sp) strlcpy(sp,str,glob_script_mem.max_ssize);
-          lp++;
-          len=0;
-          goto strexit;
-        }
-#if defined(USE_TIMERS) && defined(USE_SUNRISE)
-        if (!strncmp(vname,"sunrise",7)) {
-          fvar=SunMinutes(0);
-          goto exit;
-        }
-        if (!strncmp(vname,"sunset",6)) {
-          fvar=SunMinutes(1);
-          goto exit;
-        }
-#endif
-
-#ifdef USE_SHUTTER
-        if (!strncmp(vname,"sht[",4)) {
-          GetNumericResult(vname+4,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<=shutters_present) {
-            fvar=Settings.shutter_position[index-1];
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-#endif
-#ifdef USE_ANGLE_FUNC
-        if (!strncmp(vname,"sin(",4)) {
-          lp+=4;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          fvar=sinf(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-        if (!strncmp(vname,"sqrt(",5)) {
-          lp+=5;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-          fvar=sqrtf(fvar);
-          lp++;
-          len=0;
-          goto exit;
-        }
-#endif
-#ifdef USE_SML_SCRIPT_CMD
-        if (!strncmp(vname,"sml(",4)) {
-          lp+=4;
-          float fvar1;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar1,0);
-          SCRIPT_SKIP_SPACES
-          float fvar2;
-          lp=GetNumericResult(lp,OPER_EQU,&fvar2,0);
-          SCRIPT_SKIP_SPACES
-          if (fvar2==0) {
-            float fvar3;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar3,0);
-            fvar=SML_SetBaud(fvar1,fvar3);
-          } else {
-            char str[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,str,0);
-            fvar=SML_Write(fvar1,str);
-          }
-          lp++;
-          fvar=0;
-          len=0;
-          goto exit;
-        }
-#endif
-        break;
-      case 't':
-        if (!strncmp(vname,"time",4)) {
-          fvar=MinutesPastMidnight();
-          goto exit;
-        }
-        if (!strncmp(vname,"tper",4)) {
-          fvar=Settings.tele_period;
-          tind->index=SCRIPT_TELEPERIOD;
-          goto exit_settable;
-        }
-        if (!strncmp(vname,"tinit",5)) {
-          if (rules_flag.time_init) {
-            rules_flag.time_init=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"tset",4)) {
-          if (rules_flag.time_set) {
-            rules_flag.time_set=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"tstamp",6)) {
-          if (sp) strlcpy(sp,GetDateAndTime(DT_LOCAL).c_str(),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-        if (!strncmp(vname,"topic",5)) {
-          if (sp) strlcpy(sp,SettingsText(SET_MQTT_TOPIC),glob_script_mem.max_ssize);
-          goto strexit;
-        }
-#ifdef USE_DISPLAY
-#ifdef USE_TOUCH_BUTTONS
-        if (!strncmp(vname,"tbut[",5)) {
-          GetNumericResult(vname+5,OPER_EQU,&fvar,0);
-          uint8_t index=fvar;
-          if (index<1 || index>MAXBUTTONS) index=1;
-          index--;
-          if (buttons[index]) {
-            fvar=buttons[index]->vpower&0x80;
-          } else {
-            fvar=-1;
-          }
-          len+=1;
-          goto exit;
-        }
-
-#endif
-#endif
-        break;
-      case 'u':
-        if (!strncmp(vname,"uptime",6)) {
-          fvar=MinutesUptime();
-          goto exit;
-        }
-        if (!strncmp(vname,"upsecs",6)) {
-          fvar=uptime;
-          goto exit;
-        }
-        if (!strncmp(vname,"upd[",4)) {
-
-          struct T_INDEX ind;
-          uint8_t vtype;
-          isvar(vname+4,&vtype,&ind,0,0,0);
-          if (!ind.bits.constant) {
-            if (!ind.bits.changed) {
-              fvar=0;
-              len++;
-              goto exit;
-            } else {
-              glob_script_mem.type[ind.index].bits.changed=0;
-              fvar=1;
-              len++;
-              goto exit;
-            }
-          }
-          goto notfound;
-        }
-        break;
-
-      case 'w':
-        if (!strncmp(vname,"wday",4)) {
-          fvar=RtcTime.day_of_week;
-          goto exit;
-        }
-        if (!strncmp(vname,"wific",5)) {
-          if (rules_flag.wifi_connected) {
-            rules_flag.wifi_connected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"wifid",5)) {
-          if (rules_flag.wifi_disconnected) {
-            rules_flag.wifi_disconnected=0;
-            fvar=1;
-          }
-          goto exit;
-        }
-        if (!strncmp(vname,"wifis",5)) {
-          fvar=!global_state.wifi_down;
-          goto exit;
-        }
-        break;
-      case 'y':
-        if (!strncmp(vname,"year",4)) {
-          fvar=RtcTime.year;
-          goto exit;
-        }
-        break;
-      default:
-        break;
-    }
-
-notfound:
-    if (fp) *fp=0;
-    *vtype=VAR_NV;
-    tind->index=VAR_NV;
-    glob_script_mem.var_not_found=1;
-    return lp;
-
-exit:
-    if (fp) *fp=fvar;
-    *vtype=NUM_RES;
-    tind->bits.constant=1;
-    tind->bits.is_string=0;
-    return lp+len;
-
-strexit:
-    *vtype=STYPE;
-    tind->bits.constant=1;
-    tind->bits.is_string=1;
-    return lp+len;
-}
-
-
-
-char *getop(char *lp, uint8_t *operand) {
-    switch (*lp) {
-        case '=':
-            if (*(lp+1)=='=') {
-                *operand=OPER_EQUEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_EQU;
-                return lp+1;
-            }
-            break;
-        case '+':
-            if (*(lp+1)=='=') {
-                *operand=OPER_PLSEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_PLS;
-                return lp+1;
-            }
-            break;
-        case '-':
-            if (*(lp+1)=='=') {
-                *operand=OPER_MINEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_MIN;
-                return lp+1;
-            }
-            break;
-        case '*':
-            if (*(lp+1)=='=') {
-                *operand=OPER_MULEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_MUL;
-                return lp+1;
-            }
-            break;
-        case '/':
-            if (*(lp+1)=='=') {
-                *operand=OPER_DIVEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_DIV;
-                return lp+1;
-            }
-            break;
-        case '!':
-            if (*(lp+1)=='=') {
-                *operand=OPER_NOTEQU;
-                return lp+2;
-            }
-            break;
-        case '>':
-            if (*(lp+1)=='=') {
-                *operand=OPER_GRTEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_GRT;
-                return lp+1;
-
-            }
-            break;
-        case '<':
-            if (*(lp+1)=='=') {
-                *operand=OPER_LOWEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_LOW;
-                return lp+1;
-            }
-            break;
-        case '%':
-            if (*(lp+1)=='=') {
-                *operand=OPER_PERCEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_PERC;
-                return lp+1;
-            }
-            break;
-        case '^':
-            if (*(lp+1)=='=') {
-                *operand=OPER_XOREQU;
-                return lp+2;
-            } else {
-                *operand=OPER_XOR;
-                return lp+1;
-            }
-            break;
-        case '&':
-            if (*(lp+1)=='=') {
-                *operand=OPER_ANDEQU;
-                return lp+2;
-            } else {
-                *operand=OPER_AND;
-                return lp+1;
-            }
-            break;
-        case '|':
-            if (*(lp+1)=='=') {
-                *operand=OPER_OREQU;
-                return lp+2;
-            } else {
-                *operand=OPER_OR;
-                return lp+1;
-            }
-            break;
-    }
-    *operand=0;
-    return lp;
-}
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t g_cont;
-}
-uint16_t GetStack(void) {
-  register uint32_t *sp asm("a1");
-  return (4 * (sp - g_cont.stack));
-}
-
-#else
-extern "C" {
-#include <cont.h>
-  extern cont_t* g_pcont;
-}
-uint16_t GetStack(void) {
-  register uint32_t *sp asm("a1");
-  return (4 * (sp - g_pcont->stack));
-}
-#endif
-
-char *GetStringResult(char *lp,uint8_t lastop,char *cp,JsonObject *jo) {
-  uint8_t operand=0;
-  uint8_t vtype;
-  char *slp;
-  struct T_INDEX ind;
-  char str[SCRIPT_MAXSSIZE],str1[SCRIPT_MAXSSIZE];
-  while (1) {
-    lp=isvar(lp,&vtype,&ind,0,str1,jo);
-    if (vtype!=STR_RES && !(vtype&STYPE)) {
-
-      glob_script_mem.glob_error=1;
-      return lp;
-    }
-    switch (lastop) {
-        case OPER_EQU:
-          strlcpy(str,str1,sizeof(str));
-          break;
-        case OPER_PLS:
-          strncat(str,str1,sizeof(str));
-          break;
-    }
-    slp=lp;
-    lp=getop(lp,&operand);
-    switch (operand) {
-      case OPER_EQUEQU:
-      case OPER_NOTEQU:
-      case OPER_LOW:
-      case OPER_LOWEQU:
-      case OPER_GRT:
-      case OPER_GRTEQU:
-          lp=slp;
-          strcpy(cp,str);
-          return lp;
-          break;
-      default:
-          break;
-    }
-    lastop=operand;
-    if (!operand) {
-      strcpy(cp,str);
-      return lp;
-    }
-  }
-}
-
-char *GetNumericResult(char *lp,uint8_t lastop,float *fp,JsonObject *jo) {
-uint8_t operand=0;
-float fvar1,fvar;
-char *slp;
-uint8_t vtype;
-struct T_INDEX ind;
-    while (1) {
-
-        if (*lp=='(') {
-            lp++;
-            lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
-            lp++;
-
-        } else {
-            lp=isvar(lp,&vtype,&ind,&fvar1,0,jo);
-            if (vtype!=NUM_RES && vtype&STYPE) {
-
-              glob_script_mem.glob_error=1;
-            }
-        }
-        switch (lastop) {
-            case OPER_EQU:
-                fvar=fvar1;
-                break;
-            case OPER_PLS:
-                fvar+=fvar1;
-                break;
-            case OPER_MIN:
-                fvar-=fvar1;
-                break;
-            case OPER_MUL:
-                fvar*=fvar1;
-                break;
-            case OPER_DIV:
-                fvar/=fvar1;
-                break;
-            case OPER_PERC:
-                fvar=fmodf(fvar,fvar1);
-                break;
-            case OPER_XOR:
-                fvar=(uint32_t)fvar^(uint32_t)fvar1;
-                break;
-            case OPER_AND:
-                fvar=(uint32_t)fvar&(uint32_t)fvar1;
-                break;
-            case OPER_OR:
-                fvar=(uint32_t)fvar|(uint32_t)fvar1;
-                break;
-            default:
-                break;
-
-        }
-        slp=lp;
-        lp=getop(lp,&operand);
-        switch (operand) {
-            case OPER_EQUEQU:
-            case OPER_NOTEQU:
-            case OPER_LOW:
-            case OPER_LOWEQU:
-            case OPER_GRT:
-            case OPER_GRTEQU:
-                lp=slp;
-                *fp=fvar;
-                return lp;
-                break;
-            default:
-                break;
-        }
-        lastop=operand;
-        if (!operand) {
-            *fp=fvar;
-            return lp;
-        }
-    }
-}
-
-
-char *ForceStringVar(char *lp,char *dstr) {
-  float fvar;
-  char *slp=lp;
-  glob_script_mem.glob_error=0;
-  lp=GetStringResult(lp,OPER_EQU,dstr,0);
-  if (glob_script_mem.glob_error) {
-
-    lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
-    dtostrfd(fvar,6,dstr);
-    glob_script_mem.glob_error=0;
-  }
-  return lp;
-}
-
-
-void Replace_Cmd_Vars(char *srcbuf,char *dstbuf,uint16_t dstsize) {
-    char *cp;
-    uint16_t count;
-    uint8_t vtype;
-    uint8_t dprec=glob_script_mem.script_dprec;
-    float fvar;
-    cp=srcbuf;
-    struct T_INDEX ind;
-    char string[SCRIPT_MAXSSIZE];
-    dstsize-=2;
-    for (count=0;count<dstsize;count++) {
-        if (*cp=='%') {
-            cp++;
-            if (*cp=='%') {
-              dstbuf[count]=*cp++;
-            } else {
-              if (isdigit(*cp)) {
-                dprec=*cp&0xf;
-                cp++;
-              } else {
-                dprec=glob_script_mem.script_dprec;
-              }
-              cp=isvar(cp,&vtype,&ind,&fvar,string,0);
-              if (vtype!=VAR_NV) {
-
-                if (vtype==NUM_RES || (vtype&STYPE)==0) {
-
-                    dtostrfd(fvar,dprec,string);
-                } else {
-
-                }
-                uint8_t slen=strlen(string);
-                if (count+slen<dstsize-1) {
-                  strcpy(&dstbuf[count],string);
-                  count+=slen-1;
-                }
-                cp++;
-              } else {
-                strcpy(&dstbuf[count],"???");
-                count+=2;
-                while (*cp!='%') {
-                  if (*cp==0 || *cp==SCRIPT_EOL) {
-                    dstbuf[count+1]=0;
-                    return;
-                  }
-                  cp++;
-                }
-                cp++;
-              }
-            }
-        } else {
-            if (*cp=='\\') {
-              cp++;
-              if (*cp=='n') {
-                dstbuf[count]='\n';
-              } else if (*cp=='r') {
-                dstbuf[count]='\r';
-              } else if (*cp=='\\') {
-                dstbuf[count]='\\';
-              } else {
-                dstbuf[count]=*cp;
-              }
-            } else {
-              dstbuf[count]=*cp;
-            }
-            if (*cp==0) {
-                break;
-            }
-            cp++;
-        }
-    }
-    dstbuf[count]=0;
-}
-
-void toLog(const char *str) {
-  if (!str) return;
-  AddLog_P(LOG_LEVEL_INFO, str);
-}
-
-
-void toLogN(const char *cp,uint8_t len) {
-  if (!cp) return;
-  char str[32];
-  if (len>=sizeof(str)) len=len>=sizeof(str);
-  strlcpy(str,cp,len);
-  toSLog(str);
-}
-
-void toLogEOL(const char *s1,const char *str) {
-  if (!str) return;
-  uint8_t index=0;
-  char *cp=log_data;
-  strcpy(cp,s1);
-  cp+=strlen(s1);
-  while (*str) {
-    if (*str==SCRIPT_EOL) break;
-    *cp++=*str++;
-  }
-  *cp=0;
-  AddLog(LOG_LEVEL_INFO);
-}
-
-
-void toSLog(const char *str) {
-  if (!str) return;
-#if SCRIPT_DEBUG>0
-  while (*str) {
-    Serial.write(*str);
-    str++;
-  }
-#endif
-}
-
-char *Evaluate_expression(char *lp,uint8_t and_or, uint8_t *result,JsonObject *jo) {
-  float fvar,*dfvar,fvar1;
-  uint8_t numeric;
-  struct T_INDEX ind;
-  uint8_t vtype=0,lastop;
-  uint8_t res=0;
-  char *llp=lp;
-  char *slp;
-
-  SCRIPT_SKIP_SPACES
-  if (*lp=='(') {
-    uint8_t res=0;
-    uint8_t xand_or=0;
-    lp++;
-
-loop:
-    SCRIPT_SKIP_SPACES
-    lp=Evaluate_expression(lp,xand_or,&res,jo);
-    if (*lp==')') {
-      lp++;
-      goto exit0;
-    }
-
-    SCRIPT_SKIP_SPACES
-    if (!strncmp(lp,"or",2)) {
-      lp+=2;
-      xand_or=1;
-      goto loop;
-    } else if (!strncmp(lp,"and",3)) {
-      lp+=3;
-      xand_or=2;
-      goto loop;
-    }
-exit0:
-    if (!and_or) {
-      *result=res;
-    } else if (and_or==1) {
-      *result|=res;
-    } else {
-      *result&=res;
-    }
-    goto exit10;
-  }
-
-  llp=lp;
-
-  dfvar=&fvar;
-  glob_script_mem.glob_error=0;
-  slp=lp;
-  numeric=1;
-  lp=GetNumericResult(lp,OPER_EQU,dfvar,0);
-  if (glob_script_mem.glob_error==1) {
-
-   char cmpstr[SCRIPT_MAXSSIZE];
-    lp=slp;
-    numeric=0;
-
-    lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
-   lp=getop(lp,&lastop);
-
-    char str[SCRIPT_MAXSSIZE];
-    lp=GetStringResult(lp,OPER_EQU,str,jo);
-    if (lastop==OPER_EQUEQU || lastop==OPER_NOTEQU) {
-      res=strcmp(cmpstr,str);
-      if (lastop==OPER_EQUEQU) res=!res;
-      goto exit;
-    }
-
-  } else {
-
-
-    lp=getop(lp,&lastop);
-    lp=GetNumericResult(lp,OPER_EQU,&fvar1,jo);
-    switch (lastop) {
-      case OPER_EQUEQU:
-          res=(*dfvar==fvar1);
-          break;
-      case OPER_NOTEQU:
-          res=(*dfvar!=fvar1);
-          break;
-      case OPER_LOW:
-          res=(*dfvar<fvar1);
-          break;
-      case OPER_LOWEQU:
-          res=(*dfvar<=fvar1);
-          break;
-      case OPER_GRT:
-          res=(*dfvar>fvar1);
-          break;
-      case OPER_GRTEQU:
-          res=(*dfvar>=fvar1);
-          break;
-      default:
-
-          break;
-    }
-
-exit:
-    if (!and_or) {
-      *result=res;
-    } else if (and_or==1) {
-      *result|=res;
-    } else {
-      *result&=res;
-    }
-  }
-
-
-exit10:
-#if SCRIPT_DEBUG>0
-  char tbuff[128];
-  sprintf(tbuff,"p1=%d,p2=%d,cmpres=%d,and_or=%d line: ",(int32_t)*dfvar,(int32_t)fvar1,*result,and_or);
-  toLogEOL(tbuff,llp);
-#endif
-  return lp;
-}
-
-
-
-#define IF_NEST 8
-
-int16_t Run_Scripter(const char *type, int8_t tlen, char *js) {
-
-    if (tasm_cmd_activ && tlen>0) return 0;
-
-    uint8_t vtype=0,sindex,xflg,floop=0,globvindex,fromscriptcmd=0;
-    int8_t globaindex;
-    struct T_INDEX ind;
-    uint8_t operand,lastop,numeric=1,if_state[IF_NEST],if_exe[IF_NEST],if_result[IF_NEST],and_or,ifstck=0;
-    if_state[ifstck]=0;
-    if_result[ifstck]=0;
-    if_exe[ifstck]=1;
-    char cmpstr[SCRIPT_MAXSSIZE];
-    uint8_t check=0;
-    if (tlen<0) {
-      tlen=abs(tlen);
-      check=1;
-    }
-
-    float *dfvar,*cv_count,cv_max,cv_inc;
-    char *cv_ptr;
-    float fvar=0,fvar1,sysvar,swvar;
-    uint8_t section=0,sysv_type=0,swflg=0;
-
-    if (!glob_script_mem.scriptptr) {
-      return -99;
-    }
-
-    DynamicJsonBuffer jsonBuffer;
-    JsonObject &jobj=jsonBuffer.parseObject(js);
-    JsonObject *jo;
-    if (js) jo=&jobj;
-    else jo=0;
-
-    char *lp=glob_script_mem.scriptptr;
-
-    while (1) {
-
-
-        startline:
-        SCRIPT_SKIP_SPACES
-
-        SCRIPT_SKIP_EOL
-
-        if (*lp==';') goto next_line;
-        if (!*lp) break;
-
-        if (section) {
-
-            if (*lp=='>') {
-                return 0;
-            }
-            if (*lp=='#') {
-                return 0;
-            }
-            glob_script_mem.var_not_found=0;
-
-
-#ifdef IFTHEN_DEBUG
-            char tbuff[128];
-            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
-            toLogEOL(tbuff,lp);
-#endif
-
-
-
-
-            if (!strncmp(lp,"if",2)) {
-                lp+=2;
-                if (ifstck<IF_NEST-1) ifstck++;
-                if_state[ifstck]=1;
-                if_result[ifstck]=0;
-                if (ifstck==1) if_exe[ifstck]=1;
-                else if_exe[ifstck]=if_exe[ifstck-1];
-                and_or=0;
-            } else if (!strncmp(lp,"then",4) && if_state[ifstck]==1) {
-                lp+=4;
-                if_state[ifstck]=2;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-            } else if (!strncmp(lp,"else",4) && if_state[ifstck]==2) {
-                lp+=4;
-                if_state[ifstck]=3;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
-            } else if (!strncmp(lp,"endif",5) && if_state[ifstck]>=2) {
-                lp+=5;
-                if (ifstck>0) {
-                  if_state[ifstck]=0;
-                  ifstck--;
-                }
-                goto next_line;
-            } else if (!strncmp(lp,"or",2) && if_state[ifstck]==1) {
-                lp+=2;
-                and_or=1;
-            } else if (!strncmp(lp,"and",3) && if_state[ifstck]==1) {
-                lp+=3;
-                and_or=2;
-            }
-
-            if (*lp=='{' && if_state[ifstck]==1) {
-              lp+=1;
-              if_state[ifstck]=2;
-              if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-            } else if (*lp=='{' && if_state[ifstck]==3) {
-              lp+=1;
-
-            } else if (*lp=='}' && if_state[ifstck]>=2) {
-              lp++;
-              char *slp=lp;
-              uint8_t iselse=0;
-              for (uint8_t count=0; count<8;count++) {
-                if (*lp=='}') {
-
-                  break;
-                }
-                if (!strncmp(lp,"else",4)) {
-
-                  if_state[ifstck]=3;
-                  if (if_exe[ifstck-1]) if_exe[ifstck]=!if_result[ifstck];
-                  lp+=4;
-                  iselse=1;
-                  SCRIPT_SKIP_SPACES
-                  if (*lp=='{') lp++;
-                  break;
-                }
-                lp++;
-              }
-              if (!iselse) {
-                lp=slp;
-
-                if (ifstck>0) {
-                  if_state[ifstck]=0;
-                  ifstck--;
-                }
-                goto next_line;
-              }
-            }
-
-            if (!strncmp(lp,"for",3)) {
-
-
-              lp+=3;
-              SCRIPT_SKIP_SPACES
-              lp=isvar(lp,&vtype,&ind,0,0,0);
-              if ((vtype!=VAR_NV) && (vtype&STYPE)==0) {
-
-                  uint8_t index=glob_script_mem.type[ind.index].index;
-                  cv_count=&glob_script_mem.fvars[index];
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,cv_count,0);
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,&cv_max,0);
-                  SCRIPT_SKIP_SPACES
-                  lp=GetNumericResult(lp,OPER_EQU,&cv_inc,0);
-
-                  cv_ptr=lp;
-                  floop=1;
-              } else {
-
-                  toLogEOL("for error",lp);
-              }
-            } else if (!strncmp(lp,"next",4) && floop>0) {
-
-              *cv_count+=cv_inc;
-              if (*cv_count<=cv_max) {
-                lp=cv_ptr;
-              } else {
-                lp+=4;
-                floop=0;
-              }
-            }
-
-            if (!strncmp(lp,"switch",6)) {
-              lp+=6;
-              SCRIPT_SKIP_SPACES
-              char *slp=lp;
-              lp=GetNumericResult(lp,OPER_EQU,&swvar,0);
-              if (glob_script_mem.glob_error==1) {
-
-                lp=slp;
-
-                lp=isvar(lp,&vtype,&ind,0,cmpstr,0);
-                swflg=0x81;
-              } else {
-                swflg=1;
-              }
-            } else if (!strncmp(lp,"case",4) && swflg>0) {
-              lp+=4;
-              SCRIPT_SKIP_SPACES
-              float cvar;
-              if (!(swflg&0x80)) {
-                lp=GetNumericResult(lp,OPER_EQU,&cvar,0);
-                if (swvar!=cvar) {
-                  swflg=2;
-                } else {
-                  swflg=1;
-                }
-              } else {
-                char str[SCRIPT_MAXSSIZE];
-                lp=GetStringResult(lp,OPER_EQU,str,0);
-                if (!strcmp(cmpstr,str)) {
-                    swflg=0x81;
-                } else {
-                  swflg=0x82;
-                }
-              }
-            } else if (!strncmp(lp,"ends",4) && swflg>0) {
-              lp+=4;
-              swflg=0;
-            }
-            if ((swflg&3)==2) goto next_line;
-
-            SCRIPT_SKIP_SPACES
-
-            if (*lp==SCRIPT_EOL) {
-             goto next_line;
-            }
-
-
-            if (!if_exe[ifstck] && if_state[ifstck]!=1) goto next_line;
-
-#ifdef IFTHEN_DEBUG
-            sprintf(tbuff,"stack=%d,exe=%d,state=%d,cmpres=%d execute line: ",ifstck,if_exe[ifstck],if_state[ifstck],if_result[ifstck]);
-            toLogEOL(tbuff,lp);
-#endif
-
-            if (!strncmp(lp,"break",5)) {
-              if (floop) {
-
-                floop=0;
-              } else {
-                section=0;
-              }
-              break;
-            } else if (!strncmp(lp,"dp",2) && isdigit(*(lp+2))) {
-              lp+=2;
-
-              glob_script_mem.script_dprec=atoi(lp);
-              goto next_line;
-            } else if (!strncmp(lp,"delay(",6)) {
-              lp+=5;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              delay(fvar);
-              goto next_line;
-            } else if (!strncmp(lp,"spinm(",6)) {
-              lp+=6;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t pinnr=fvar;
-              SCRIPT_SKIP_SPACES
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t mode=fvar;
-              pinMode(pinnr,mode&3);
-              goto next_line;
-            } else if (!strncmp(lp,"spin(",5)) {
-              lp+=5;
-
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t pinnr=fvar;
-              SCRIPT_SKIP_SPACES
-              lp=GetNumericResult(lp,OPER_EQU,&fvar,0);
-              int8_t mode=fvar;
-              digitalWrite(pinnr,mode&1);
-              goto next_line;
-            } else if (!strncmp(lp,"svars(",5)) {
-              lp+=5;
-
-              Scripter_save_pvars();
-              goto next_line;
-            }
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-            else if (!strncmp(lp,"ws2812(",7)) {
-              lp+=7;
-              lp=isvar(lp,&vtype,&ind,0,0,0);
-              if (vtype!=VAR_NV) {
-
-                uint8_t index=glob_script_mem.type[ind.index].index;
-                if ((vtype&STYPE)==0) {
-
-                  if (glob_script_mem.type[index].bits.is_filter) {
-                    uint8_t len=0;
-                    float *fa=Get_MFAddr(index,&len);
-
-                    if (fa && len) ws2812_set_array(fa,len);
-                  }
-                }
-              }
-              goto next_line;
-            }
-#endif
-#endif
-
-            else if (!strncmp(lp,"=>",2) || !strncmp(lp,"->",2) || !strncmp(lp,"+>",2) || !strncmp(lp,"print",5)) {
-
-                uint8_t sflag=0,pflg=0,svmqtt,swll;
-                if (*lp=='p') {
-                 pflg=1;
-                 lp+=5;
-                }
-                else {
-                  if (*lp=='-') sflag=1;
-                  if (*lp=='+') sflag=2;
-                  lp+=2;
-                }
-                char *slp=lp;
-                SCRIPT_SKIP_SPACES
-                #define SCRIPT_CMDMEM 512
-                char *cmdmem=(char*)malloc(SCRIPT_CMDMEM);
-                if (cmdmem) {
-                  char *cmd=cmdmem;
-                  uint16_t count;
-                  for (count=0; count<SCRIPT_CMDMEM/2-2; count++) {
-
-                    if (!*lp || *lp=='\r' || *lp=='\n') {
-                        cmd[count]=0;
-                        break;
-                    }
-                    cmd[count]=*lp++;
-                  }
-
-
-                  char *tmp=cmdmem+SCRIPT_CMDMEM/2;
-                  Replace_Cmd_Vars(cmd,tmp,SCRIPT_CMDMEM/2);
-
-
-                  if (!strncmp(tmp,"print",5) || pflg) {
-                    if (pflg) toLog(tmp);
-                    else toLog(&tmp[5]);
-                  } else {
-                    if (!sflag) {
-                      tasm_cmd_activ=1;
-                      AddLog_P2(glob_script_mem.script_loglevel&0x7f, PSTR("Script: performs \"%s\""), tmp);
-                    } else if (sflag==2) {
-
-                    } else {
-                      tasm_cmd_activ=1;
-                      svmqtt=Settings.flag.mqtt_enabled;
-                      swll=Settings.weblog_level;
-                      Settings.flag.mqtt_enabled=0;
-                      Settings.weblog_level=0;
-                    }
-                    ExecuteCommand((char*)tmp, SRC_RULE);
-                    tasm_cmd_activ=0;
-                    if (sflag==1) {
-                      Settings.flag.mqtt_enabled=svmqtt;
-                      Settings.weblog_level=swll;
-                    }
-                  }
-                  if (cmdmem) free(cmdmem);
-                }
-                lp=slp;
-                goto next_line;
-            } else if (!strncmp(lp,"=#",2)) {
-
-                lp+=1;
-                char *slp=lp;
-                uint8_t plen=0;
-                while (*lp) {
-                  if (*lp=='\n'|| *lp=='\r'|| *lp=='(') {
-                    break;
-                  }
-                  lp++;
-                  plen++;
-                }
-                if (fromscriptcmd) {
-                  char *sp=glob_script_mem.scriptptr;
-                  glob_script_mem.scriptptr=glob_script_mem.scriptptr_bu;
-                  Run_Scripter(slp,plen,0);
-                  glob_script_mem.scriptptr=sp;
-                } else {
-                  Run_Scripter(slp,plen,0);
-                }
-                lp=slp;
-                goto next_line;
-            } else if (!strncmp(lp,"=(",2)) {
-                lp+=2;
-                char str[128];
-                str[0]='>';
-                lp=GetStringResult(lp,OPER_EQU,&str[1],0);
-                lp++;
-                execute_script(str);
-            }
-
-
-            if (if_state[ifstck]==1) {
-
-              lp=Evaluate_expression(lp,and_or,&if_result[ifstck],jo);
-              SCRIPT_SKIP_SPACES
-              if (*lp=='{' && if_state[ifstck]==1) {
-                lp+=1;
-                if_state[ifstck]=2;
-                if (if_exe[ifstck-1]) if_exe[ifstck]=if_result[ifstck];
-              }
-              goto next_line;
-            } else {
-              lp=isvar(lp,&vtype,&ind,&sysvar,0,0);
-              if (vtype!=VAR_NV) {
-
-                  globvindex=ind.index;
-                  globaindex=last_findex;
-                  uint8_t index=glob_script_mem.type[ind.index].index;
-                  if ((vtype&STYPE)==0) {
-
-                      if (ind.bits.settable || ind.bits.is_filter) {
-                        dfvar=&sysvar;
-                        if (ind.bits.settable) {
-                          sysv_type=ind.index;
-                        } else {
-                          sysv_type=0;
-                        }
-
-                      } else {
-                        dfvar=&glob_script_mem.fvars[index];
-                        sysv_type=0;
-                      }
-                      numeric=1;
-                      lp=getop(lp,&lastop);
-                      char *slp=lp;
-                      glob_script_mem.glob_error=0;
-                      lp=GetNumericResult(lp,OPER_EQU,&fvar,jo);
-                      if (glob_script_mem.glob_error==1) {
-
-
-                        lp=isvar(slp,&vtype,&ind,0,cmpstr,jo);
-                        fvar=CharToFloat(cmpstr);
-                      }
-                      switch (lastop) {
-                          case OPER_EQU:
-                              if (glob_script_mem.var_not_found) {
-                                if (!js) toLogEOL("var not found: ",lp);
-                                goto next_line;
-                              }
-                              *dfvar=fvar;
-                              break;
-                          case OPER_PLSEQU:
-                              *dfvar+=fvar;
-                              break;
-                          case OPER_MINEQU:
-                              *dfvar-=fvar;
-                              break;
-                          case OPER_MULEQU:
-                              *dfvar*=fvar;
-                              break;
-                          case OPER_DIVEQU:
-                              *dfvar/=fvar;
-                              break;
-                          case OPER_PERCEQU:
-                              *dfvar=fmodf(*dfvar,fvar);
-                              break;
-                          case OPER_ANDEQU:
-                              *dfvar=(uint32_t)*dfvar&(uint32_t)fvar;
-                              break;
-                          case OPER_OREQU:
-                              *dfvar=(uint32_t)*dfvar|(uint32_t)fvar;
-                              break;
-                          case OPER_XOREQU:
-                              *dfvar=(uint32_t)*dfvar^(uint32_t)fvar;
-                              break;
-                          default:
-
-                              break;
-                      }
-
-                      glob_script_mem.type[globvindex].bits.changed=1;
-                      if (glob_script_mem.type[globvindex].bits.is_filter) {
-                        if (globaindex>=0) {
-                          Set_MFVal(glob_script_mem.type[globvindex].index,globaindex,*dfvar);
-                        } else {
-                          Set_MFilter(glob_script_mem.type[globvindex].index,*dfvar);
-                        }
-                      }
-
-                      if (sysv_type) {
-                        switch (sysv_type) {
-                          case SCRIPT_LOGLEVEL:
-                            glob_script_mem.script_loglevel=*dfvar;
-                            break;
-                          case SCRIPT_TELEPERIOD:
-                            if (*dfvar<10) *dfvar=10;
-                            if (*dfvar>300) *dfvar=300;
-                            Settings.tele_period=*dfvar;
-                            break;
-                        }
-                        sysv_type=0;
-                      }
-                  } else {
-
-                    numeric=0;
-                    sindex=index;
-
-                    char str[SCRIPT_MAXSSIZE];
-                    lp=getop(lp,&lastop);
-                    char *slp=lp;
-                    glob_script_mem.glob_error=0;
-                    lp=GetStringResult(lp,OPER_EQU,str,jo);
-                    if (!js && glob_script_mem.glob_error) {
-
-                      lp=GetNumericResult(slp,OPER_EQU,&fvar,0);
-                      dtostrfd(fvar,6,str);
-                      glob_script_mem.glob_error=0;
-                    }
-
-                    if (!glob_script_mem.var_not_found) {
-
-                      glob_script_mem.type[globvindex].bits.changed=1;
-                      if (lastop==OPER_EQU) {
-                        strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-                      } else if (lastop==OPER_PLSEQU) {
-                        strncat(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),str,glob_script_mem.max_ssize);
-                      }
-                    }
-                  }
-
-            }
-            SCRIPT_SKIP_SPACES
-            if (*lp=='{' && if_state[ifstck]==3) {
-              lp+=1;
-
-            }
-            goto next_line;
-          }
-        } else {
-
-            if (*lp=='>' && tlen==1) {
-
-              lp++;
-              section=1;
-              fromscriptcmd=1;
-              goto startline;
-            }
-            if (!strncmp(lp,type,tlen)) {
-
-                section=1;
-                glob_script_mem.section_ptr=lp;
-                if (check) {
-                  return 99;
-                }
-
-                char *ctype=(char*)type;
-                if (*ctype=='#') {
-
-                  ctype+=tlen;
-                  if (*ctype=='(' && *(lp+tlen)=='(') {
-                    float fparam;
-                    numeric=1;
-                    glob_script_mem.glob_error=0;
-                    GetNumericResult((char*)ctype,OPER_EQU,&fparam,0);
-                    if (glob_script_mem.glob_error==1) {
-
-                      numeric=0;
-
-                      GetStringResult((char*)ctype+1,OPER_EQU,cmpstr,0);
-                    }
-                    lp+=tlen;
-                    if (*lp=='(') {
-
-                      lp++;
-                      lp=isvar(lp,&vtype,&ind,0,0,0);
-                      if (vtype!=VAR_NV) {
-
-                        uint8_t index=glob_script_mem.type[ind.index].index;
-                        if ((vtype&STYPE)==0) {
-
-                            dfvar=&glob_script_mem.fvars[index];
-                            if (numeric) {
-                              *dfvar=fparam;
-                            } else {
-
-                              *dfvar=CharToFloat(cmpstr);
-                            }
-                        } else {
-
-                            sindex=index;
-                            if (!numeric) {
-                              strlcpy(glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize),cmpstr,glob_script_mem.max_ssize);
-                            } else {
-
-                              dtostrfd(fparam,6,glob_script_mem.glob_snp+(sindex*glob_script_mem.max_ssize));
-                            }
-                        }
-                      }
-                    }
-                  } else {
-                    lp+=tlen;
-                    if (*ctype=='(' || (*lp!=SCRIPT_EOL && *lp!='?')) {
-
-                      section=0;
-                    }
-                  }
-                }
-            }
-        }
-
-    next_line:
-        if (*lp==SCRIPT_EOL) {
-          lp++;
-        } else {
-          lp = strchr(lp, SCRIPT_EOL);
-          if (!lp) {
-            if (section) {
-              return 0;
-            } else {
-              return -1;
-            }
-          }
-          lp++;
-        }
-    }
-    return -1;
-}
-
-uint8_t script_xsns_index = 0;
-
-
-void ScripterEvery100ms(void) {
-
-  if (Settings.rule_enabled && (uptime > 4)) {
-    mqtt_data[0] = '\0';
-    uint16_t script_tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, script_xsns_index);
-    tele_period = script_tele_period_save;
-    if (strlen(mqtt_data)) {
-      mqtt_data[0] = '{';
-      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}"), mqtt_data);
-      Run_Scripter(">T",2, mqtt_data);
-    }
-  }
-  if (fast_script==99) Run_Scripter(">F",2,0);
-}
-
-
-
-
-void Scripter_save_pvars(void) {
-  int16_t mlen=0;
-  float *fp=(float*)glob_script_mem.script_pram;
-  mlen+=sizeof(float);
-  struct T_INDEX *vtp=glob_script_mem.type;
-  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-    if (vtp[count].bits.is_permanent && !vtp[count].bits.is_string) {
-      uint8_t index=vtp[count].index;
-      mlen+=sizeof(float);
-      if (mlen>PMEM_SIZE) {
-        vtp[count].bits.is_permanent=0;
-        return;
-      }
-      *fp++=glob_script_mem.fvars[index];
-    }
-  }
-  char *cp=(char*)fp;
-  for (uint8_t count=0; count<glob_script_mem.numvars; count++) {
-    if (vtp[count].bits.is_permanent && vtp[count].bits.is_string) {
-      uint8_t index=vtp[count].index;
-      char *sp=glob_script_mem.glob_snp+(index*glob_script_mem.max_ssize);
-      uint8_t slen=strlen(sp);
-      mlen+=slen+1;
-      if (mlen>PMEM_SIZE) {
-        vtp[count].bits.is_permanent=0;
-        return;
-      }
-      strcpy(cp,sp);
-      cp+=slen+1;
-    }
-  }
-}
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_SCRIPT "s10"
-
-const char S_CONFIGURE_SCRIPT[] PROGMEM = D_CONFIGURE_SCRIPT;
-
-const char HTTP_BTN_MENU_RULES[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form></p>";
-
-
-const char HTTP_FORM_SCRIPT[] PROGMEM =
-    "<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>"
-    "<form method='post' action='" WEB_HANDLE_SCRIPT "'>";
-
-const char HTTP_FORM_SCRIPT1[] PROGMEM =
-    "<div style='text-align:right' id='charNum'> </div>"
-    "<input style='width:3%%;' id='c%d' name='c%d' type='checkbox'%s><b>" D_SCRIPT_ENABLE "</b><br/>"
-    "<br><textarea  id='t1' name='t1' rows='8' cols='80' maxlength='%d' style='font-size: 12pt' >";
-
-const char HTTP_FORM_SCRIPT1b[] PROGMEM =
-    "</textarea>"
-    "<script type='text/javascript'>"
-    "eb('charNum').innerHTML='-';"
-    "var ta=eb('t1');"
-    "ta.addEventListener('keydown',function(e){"
-    "e = e || window.event;"
-    "var ml=this.getAttribute('maxlength');"
-    "var cl=this.value.length;"
-    "if(cl>=ml){"
-    "eb('charNum').innerHTML='" D_SCRIPT_CHARS_NO_MORE "';"
-    "}else{"
-    "eb('charNum').innerHTML=ml-cl+' " D_SCRIPT_CHARS_LEFT "';"
-    "}"
-
-#if 0
-
-    "if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.which === 86) {"
-
-      "var paste = window.clipboardData.getData('Text');"
-
-
-      "var out=\"\";"
-      "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
-      "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
-      "allLines.forEach((line) => {"
-        "if(line.length>0) {"
-          "if(line.charAt(0)!=';'){"
-            "out+=line+'\\n';"
-          "}"
-        "}"
-      "});"
-      "alert(out);"
-    "}"
-#endif
-
-    "return true;"
-    "});"
-
-
-
-#ifdef SCRIPT_STRIP_COMMENTS
-    "ta.addEventListener('paste',function(e){"
-      "let paste = (e.clipboardData || window.clipboardData).getData('text');"
-      "var ml=this.getAttribute('maxlength');"
-      "if(paste.length>=ml){"
-        "var out=\"\";"
-        "var re=/\\r\\n|\\n\\r|\\n|\\r/g;"
-        "var allLines=paste.replace(re,\"\\n\").split(\"\\n\");"
-        "allLines.forEach((line) => {"
-          "if(line.length>0) {"
-            "if(line.charAt(0)!=';'){"
-              "out+=line+'\\n';"
-            "}"
-          "}"
-        "});"
-        "event.preventDefault();"
-        "eb('t1').textContent=out;"
-      "}"
-# 3145 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-    "});"
-
-
-#endif
-
-    "</script>";
-
-const char HTTP_SCRIPT_FORM_END[] PROGMEM =
-      "<br/>"
-      "<button name='save' type='submit' formmethod='post' formenctype='multipart/form-data' formaction='/ta' class='button bgrn'>" D_SAVE "</button>"
-      "</form></fieldset>";
-
-#ifdef USE_SCRIPT_FATFS
-const char HTTP_FORM_SCRIPT1c[] PROGMEM =
-    "<button name='d%d' type='submit' class='button bgrn'>" D_SCRIPT_DOWNLOAD " '%s'</button>";
-#ifdef SDCARD_DIR
-const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SDCARD_DIR "</button>";
-#else
-const char HTTP_FORM_SCRIPT1d[] PROGMEM =
-    "<button method='post' name='upl' type='submit' class='button bgrn'>" D_SCRIPT_UPLOAD_FILES "</button>";
-#endif
-
-#ifdef SDCARD_DIR
-const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_DIR;
-#else
-const char S_SCRIPT_FILE_UPLOAD[] PROGMEM = D_SDCARD_UPLOAD;
-#endif
-
-const char HTTP_FORM_FILE_UPLOAD[] PROGMEM =
-"<div id='f1' name='f1' style='display:block;'>"
-"<fieldset><legend><b>&nbsp;%s" "&nbsp;</b></legend>";
-const char HTTP_FORM_FILE_UPG[] PROGMEM =
-"<form method='post' action='u3' enctype='multipart/form-data'>"
-"<br/><input type='file' name='u3'><br/>"
-"<br/><button type='submit' onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.submit();'>" D_START " %s</button></form>";
-
-const char HTTP_FORM_FILE_UPGb[] PROGMEM =
-"</fieldset>"
-"</div>"
-"<div id='f2' name='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED " ...</b></div>";
-
-const char HTTP_FORM_SDC_DIRa[] PROGMEM =
-"<div style='text-align:left'>";
-const char HTTP_FORM_SDC_DIRb[] PROGMEM =
- "<pre><a href='%s' file='%s'>%s</a>    %d</pre>";
-const char HTTP_FORM_SDC_DIRd[] PROGMEM =
-"<pre><a href='%s' file='%s'>%s</a></pre>";
-const char HTTP_FORM_SDC_DIRc[] PROGMEM =
-"</div>";
-const char HTTP_FORM_SDC_HREF[] PROGMEM =
-"http://%s/upl?download=%s/%s";
-#endif
-
-
-
-#ifdef USE_SCRIPT_FATFS
-
-#if USE_LONG_FILE_NAMES>0
-#undef REJCMPL
-#define REJCMPL 6
-#else
-#undef REJCMPL
-#define REJCMPL 8
-#endif
-
-uint8_t reject(char *name) {
-
-  if (*name=='_') return 1;
-  if (*name=='.') return 1;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-  if (!strncasecmp(name,"SPOTLI~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"TRASHE~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"FSEVEN~1",REJCMPL)) return 1;
-  if (!strncasecmp(name,"SYSTEM~1",REJCMPL)) return 1;
-#else
-  if (!strcasecmp(name,"SPOTLI~1")) return 1;
-  if (!strcasecmp(name,"TRASHE~1")) return 1;
-  if (!strcasecmp(name,"FSEVEN~1")) return 1;
-  if (!strcasecmp(name,"SYSTEM~1")) return 1;
-#endif
-  return 0;
-}
-
-void ListDir(char *path, uint8_t depth) {
-  char name[32];
-  char npath[128];
-  char format[12];
-  sprintf(format,"%%-%ds",24-depth);
-
-  File dir=SD.open(path);
-  if (dir) {
-    dir.rewindDirectory();
-    if (strlen(path)>1) {
-      snprintf_P(npath,sizeof(npath),PSTR("http://%s/upl?download=%s"),WiFi.localIP().toString().c_str(),path);
-      for (uint8_t cnt=strlen(npath)-1;cnt>0;cnt--) {
-        if (npath[cnt]=='/') {
-          if (npath[cnt-1]=='=') npath[cnt+1]=0;
-          else npath[cnt]=0;
-          break;
-        }
-      }
-      WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,path,"..");
-    }
-    while (true) {
-      File entry=dir.openNextFile();
-      if (!entry) {
-        break;
-      }
-      char *pp=path;
-      if (!*(pp+1)) pp++;
-      char *cp=name;
-
-      if (reject((char*)entry.name())) goto fclose;
-
-      for (uint8_t cnt=0;cnt<depth;cnt++) {
-        *cp++='-';
-      }
-
-      sprintf(cp,format,entry.name());
-      if (entry.isDirectory()) {
-        snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
-        WSContentSend_P(HTTP_FORM_SDC_DIRd,npath,entry.name(),name);
-        uint8_t plen=strlen(path);
-        if (plen>1) {
-          strcat(path,"/");
-        }
-        strcat(path,entry.name());
-        ListDir(path,depth+4);
-        path[plen]=0;
-      } else {
-          snprintf_P(npath,sizeof(npath),HTTP_FORM_SDC_HREF,WiFi.localIP().toString().c_str(),pp,entry.name());
-          WSContentSend_P(HTTP_FORM_SDC_DIRb,npath,entry.name(),name,entry.size());
-      }
-      fclose:
-      entry.close();
-    }
-    dir.close();
-  }
-}
-
-char path[48];
-
-void Script_FileUploadConfiguration(void)
-{
-  uint8_t depth=0;
-  strcpy(path,"/");
-
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("download")) {
-    String stmp = WebServer->arg("download");
-    char *cp=(char*)stmp.c_str();
-    if (DownloadFile(cp)) {
-
-      strcpy(path,cp);
-    }
-  }
-
-  WSContentStart_P(S_SCRIPT_FILE_UPLOAD);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_FILE_UPLOAD,D_SDCARD_DIR);
-  WSContentSend_P(HTTP_FORM_FILE_UPG, D_SCRIPT_UPLOAD);
-#ifdef SDCARD_DIR
-  WSContentSend_P(HTTP_FORM_SDC_DIRa);
-  if (glob_script_mem.script_sd_found) {
-    ListDir(path,depth);
-  }
-  WSContentSend_P(HTTP_FORM_SDC_DIRc);
-#endif
-  WSContentSend_P(HTTP_FORM_FILE_UPGb);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-  Web.upload_error = 0;
-}
-
-File upload_file;
-
-void ScriptFileUploadSuccess(void) {
-  WSContentStart_P(S_INFORMATION);
-  WSContentSendStyle();
-  WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD " <font color='#"));
-  WSContentSend_P(PSTR("%06x'>" D_SUCCESSFUL "</font></b><br/>"), WebColor(COL_TEXT_SUCCESS));
-  WSContentSend_P(PSTR("</div><br/>"));
-  WSContentSend_P(PSTR("<p><form action='%s' method='get'><button>%s</button></form></p>"),"/upl",D_UPL_DONE);
-
-  WSContentStop();
-}
-
-
-
-void script_upload(void) {
-
-
-
-  HTTPUpload& upload = WebServer->upload();
-  if (upload.status == UPLOAD_FILE_START) {
-    char npath[48];
-    sprintf(npath,"%s/%s",path,upload.filename.c_str());
-    SD.remove(npath);
-    upload_file=SD.open(npath,FILE_WRITE);
-    if (!upload_file) Web.upload_error=1;
-  } else if(upload.status == UPLOAD_FILE_WRITE) {
-    if (upload_file) upload_file.write(upload.buf,upload.currentSize);
-  } else if(upload.status == UPLOAD_FILE_END) {
-    if (upload_file) upload_file.close();
-    if (Web.upload_error) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR("HTP: upload error"));
-    }
-  } else {
-    Web.upload_error=1;
-    WebServer->send(500, "text/plain", "500: couldn't create file");
-  }
-}
-
-uint8_t DownloadFile(char *file) {
-  File download_file;
-  WiFiClient download_Client;
-
-    if (!SD.exists(file)) {
-      AddLog_P(LOG_LEVEL_INFO,PSTR("file not found"));
-      return 0;
-    }
-
-    download_file=SD.open(file,FILE_READ);
-    if (!download_file) {
-      AddLog_P(LOG_LEVEL_INFO,PSTR("could not open file"));
-      return 0;
-    }
-
-    if (download_file.isDirectory()) {
-      download_file.close();
-      return 1;
-    }
-
-    uint32_t flen=download_file.size();
-
-    download_Client = WebServer->client();
-    WebServer->setContentLength(flen);
-
-    char attachment[100];
-    char *cp;
-    for (uint8_t cnt=strlen(file); cnt>=0; cnt--) {
-      if (file[cnt]=='/') {
-        cp=&file[cnt+1];
-        break;
-      }
-    }
-    snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=%s"),cp);
-    WebServer->sendHeader(F("Content-Disposition"), attachment);
-    WSSend(200, CT_STREAM, "");
-
-    uint8_t buff[512];
-    uint16_t bread;
-
-
-    uint8_t cnt=0;
-    while (download_file.available()) {
-      bread=download_file.read(buff,sizeof(buff));
-      uint16_t bw=download_Client.write((const char*)buff,bread);
-      if (!bw) break;
-      cnt++;
-      if (cnt>7) {
-        cnt=0;
-        if (glob_script_mem.script_loglevel&0x80) {
-
-          loop();
-        }
-      }
-    }
-    download_file.close();
-    download_Client.stop();
-    return 0;
-}
-
-#endif
-
-
-void HandleScriptTextareaConfiguration(void) {
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("save")) {
-    ScriptSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-}
-
-void HandleScriptConfiguration(void) {
-
-    if (!HttpCheckPriviledgedAccess()) { return; }
-
-    AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_SCRIPT);
-
-#ifdef USE_SCRIPT_FATFS
-    if (WebServer->hasArg("d1")) {
-      DownloadFile(glob_script_mem.flink[0]);
-    }
-    if (WebServer->hasArg("d2")) {
-      DownloadFile(glob_script_mem.flink[1]);
-    }
-    if (WebServer->hasArg("upl")) {
-      Script_FileUploadConfiguration();
-    }
-#endif
-
-    WSContentStart_P(S_CONFIGURE_SCRIPT);
-    WSContentSendStyle();
-    WSContentSend_P(HTTP_FORM_SCRIPT);
-
-
-#ifdef xSCRIPT_STRIP_COMMENTS
-    uint16_t ssize=glob_script_mem.script_size;
-    if (bitRead(Settings.rule_enabled, 1)) ssize*=2;
-    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",ssize);
-#else
-    WSContentSend_P(HTTP_FORM_SCRIPT1,1,1,bitRead(Settings.rule_enabled,0) ? " checked" : "",glob_script_mem.script_size);
-#endif
-
-
-    if (glob_script_mem.script_ram[0]) {
-      _WSContentSend(glob_script_mem.script_ram);
-    }
-    WSContentSend_P(HTTP_FORM_SCRIPT1b);
-
-#ifdef USE_SCRIPT_FATFS
-    if (glob_script_mem.script_sd_found) {
-      WSContentSend_P(HTTP_FORM_SCRIPT1d);
-      if (glob_script_mem.flink[0][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,1,glob_script_mem.flink[0]);
-      if (glob_script_mem.flink[1][0]) WSContentSend_P(HTTP_FORM_SCRIPT1c,2,glob_script_mem.flink[1]);
-    }
-#endif
-
-    WSContentSend_P(HTTP_SCRIPT_FORM_END);
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentStop();
-  }
-
-
-void ScriptSaveSettings(void) {
-
-  if (WebServer->hasArg("c1")) {
-    bitWrite(Settings.rule_enabled,0,1);
-  } else {
-    bitWrite(Settings.rule_enabled,0,0);
-  }
-
-
-  String str = WebServer->arg("t1");
-
-  if (*str.c_str()) {
-
-    str.replace("\r\n","\n");
-    str.replace("\r","\n");
-
-#ifdef xSCRIPT_STRIP_COMMENTS
-    if (bitRead(Settings.rule_enabled, 1)) {
-      char *sp=(char*)str.c_str();
-      char *sp1=sp;
-      char *dp=sp;
-      uint8_t flg=0;
-      while (*sp) {
-        while (*sp==' ') sp++;
-        sp1=sp;
-        sp=strchr(sp,'\n');
-        if (!sp) {
-          flg=1;
-        } else {
-          *sp=0;
-        }
-        if (*sp1!=';') {
-          uint8_t slen=strlen(sp1);
-          if (slen) {
-            strcpy(dp,sp1);
-            dp+=slen;
-            *dp++='\n';
-          }
-        }
-        if (flg) {
-          *dp=0;
-          break;
-        }
-        sp++;
-      }
-    }
-#endif
-
-    strlcpy(glob_script_mem.script_ram,str.c_str(), glob_script_mem.script_size);
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-    if (glob_script_mem.flags&1) {
-      EEP_WRITE(0,EEP_SCRIPT_SIZE,glob_script_mem.script_ram);
-    }
-#endif
-#endif
-
-#ifdef USE_SCRIPT_FATFS
-    if (glob_script_mem.flags&1) {
-      SD.remove(FAT_SCRIPT_NAME);
-      File file=SD.open(FAT_SCRIPT_NAME,FILE_WRITE);
-      file.write(glob_script_mem.script_ram,FAT_SCRIPT_SIZE);
-      file.close();
-    }
-#endif
-
-  }
-
-  if (glob_script_mem.script_mem) {
-    Scripter_save_pvars();
-    free(glob_script_mem.script_mem);
-    glob_script_mem.script_mem=0;
-    glob_script_mem.script_mem_size=0;
-  }
-
-  if (bitRead(Settings.rule_enabled, 0)) {
-    int16_t res=Init_Scripter();
-    if (res) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
-      return;
-    }
-    Run_Scripter(">B",2,0);
-    fast_script=Run_Scripter(">F",-2,0);
-  }
-}
-
-#endif
-
-
-#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-
-
-#define HUE_DEV_MVNUM 5
-#define HUE_DEV_NSIZE 16
-struct HUE_SCRIPT {
-  char name[HUE_DEV_NSIZE];
-  uint8_t type;
-  uint8_t index[HUE_DEV_MVNUM];
-  uint8_t vindex[HUE_DEV_MVNUM];
-} hue_script[32];
-
-
-const char SCRIPT_HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
-  "{\"state\":"
-  "{\"on\":{state},"
-  "{light_status}"
-  "\"alert\":\"none\","
-  "\"effect\":\"none\","
-  "\"reachable\":true}"
-  ",\"type\":\"{type}\","
-  "\"name\":\"{j1\","
-  "\"modelid\":\"{m1}\","
-  "\"uniqueid\":\"{j2\","
-  "\"swversion\":\"5.50.1.19085\"}";
-# 3624 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-const char SCRIPT_HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
-"{\"state\":{"
-"\"presence\":{state},"
-"\"lastupdated\":\"2017-10-01T12:37:30\""
-"},"
-"\"swupdate\":{"
-"\"state\":\"noupdates\","
-"\"lastinstall\": null"
-"},"
-"\"config\":{"
-"\"on\":true,"
-"\"battery\":100,"
-"\"reachable\":true,"
-"\"alert\":\"none\","
-"\"ledindication\":false,"
-"\"usertest\":false,"
-"\"sensitivity\":2,"
-"\"sensitivitymax\":2,"
-"\"pending\":[]"
-"},"
-"\"name\":\"{j1\","
-"\"type\":\"ZLLPresence\","
-"\"modelid\":\"SML001\","
-"\"manufacturername\":\"Philips\","
-"\"swversion\":\"6.1.0.18912\","
-"\"uniqueid\":\"{j2\""
-"}";
-# 3705 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-void Script_HueStatus(String *response, uint16_t hue_devs) {
-
-  if (hue_script[hue_devs].type=='p') {
-    *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON2);
-    response->replace("{j1",hue_script[hue_devs].name);
-    response->replace("{j2", GetHueDeviceId(hue_devs));
-    uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
-    response->replace("{state}", (pwr ? "true" : "false"));
-    return;
-  }
-
-  *response+=FPSTR(SCRIPT_HUE_LIGHTS_STATUS_JSON1);
-  uint8_t pwr=glob_script_mem.fvars[hue_script[hue_devs].index[0]-1];
-  response->replace("{state}", (pwr ? "true" : "false"));
-  String light_status = "";
-  if (hue_script[hue_devs].index[1]>0) {
-
-    light_status += "\"bri\":";
-    uint32_t bri=glob_script_mem.fvars[hue_script[hue_devs].index[1]-1];
-    if (bri > 254) bri = 254;
-    if (bri < 1) bri = 1;
-    light_status += String(bri);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[2]>0) {
-
-    uint32_t hue=glob_script_mem.fvars[hue_script[hue_devs].index[2]-1];
-
-    light_status += "\"hue\":";
-    light_status += String(hue);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[3]>0) {
-
-    uint32_t sat=glob_script_mem.fvars[hue_script[hue_devs].index[3]-1] ;
-    if (sat > 254) sat = 254;
-    if (sat < 1) sat = 1;
-    light_status += "\"sat\":";
-    light_status += String(sat);
-    light_status += ",";
-  }
-  if (hue_script[hue_devs].index[4]>0) {
-
-    uint32_t ct=glob_script_mem.fvars[hue_script[hue_devs].index[4]-1];
-    light_status += "\"ct\":";
-    light_status += String(ct);
-    light_status += ",";
-  }
-
-  float temp;
-  switch (hue_script[hue_devs].type) {
-    case 'C':
-      response->replace("{type}","Color Ligh");
-      response->replace("{m1","LST001");
-      break;
-    case 'D':
-      response->replace("{type}","Dimmable Light");
-      response->replace("{m1","LWB004");
-      break;
-    case 'T':
-      response->replace("{type}","Color Temperature Light");
-      response->replace("{m1","LTW011");
-      break;
-    case 'E':
-      response->replace("{type}","Extended color light");
-      response->replace("{m1","LCT007");
-      break;
-    case 'S':
-      response->replace("{type}","On/Off light");
-      response->replace("{m1","LCT007");
-      break;
-    default:
-      response->replace("{type}","color light");
-      response->replace("{m1","LST001");
-      break;
-  }
-
-  response->replace("{light_status}", light_status);
-  response->replace("{j1",hue_script[hue_devs].name);
-  response->replace("{j2", GetHueDeviceId(hue_devs));
-
-}
-
-void Script_Check_Hue(String *response) {
-  if (!bitRead(Settings.rule_enabled, 0)) return;
-
-  uint8_t hue_script_found=Run_Scripter(">H",-2,0);
-  if (hue_script_found!=99) return;
-
-  char line[128];
-  char tmp[128];
-  uint8_t hue_devs=0;
-  uint8_t vindex=0;
-  char *cp;
-  char *lp=glob_script_mem.section_ptr+2;
-  while (lp) {
-    SCRIPT_SKIP_SPACES
-    while (*lp==SCRIPT_EOL) {
-     lp++;
-    }
-    if (!*lp || *lp=='#' || *lp=='>') {
-        break;
-    }
-    if (*lp!=';') {
-
-      memcpy(line,lp,sizeof(line));
-      line[sizeof(line)-1]=0;
-      cp=line;
-      for (uint32_t i=0; i<sizeof(line); i++) {
-        if (!*cp || *cp=='\n' || *cp=='\r') {
-          *cp=0;
-          break;
-        }
-        cp++;
-      }
-      Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-
-
-      cp=tmp;
-      cp=strchr(cp,',');
-      if (!cp) break;
-      *cp=0;
-
-      strlcpy(hue_script[hue_devs].name,tmp,HUE_DEV_NSIZE);
-      cp++;
-      while (*cp==' ') cp++;
-
-      hue_script[hue_devs].type=*cp;
-
-      for (vindex=0;vindex<HUE_DEV_MVNUM;vindex++) {
-        hue_script[hue_devs].index[vindex]=0;
-      }
-      vindex=0;
-      while (1) {
-        cp=strchr(cp,',');
-        if (!cp) break;
-
-        cp++;
-        while (*cp==' ') cp++;
-
-        vindex==0xff;
-        if (!strncmp(cp,"on=",3)) {
-          cp+=3;
-          vindex=0;
-        } else if (!strncmp(cp,"bri=",4)) {
-          cp+=4;
-          vindex=1;
-        } else if (!strncmp(cp,"hue=",4)) {
-          cp+=4;
-          vindex=2;
-        } else if (!strncmp(cp,"sat=",4)) {
-          cp+=4;
-          vindex=3;
-        } else if (!strncmp(cp,"ct=",3)) {
-          cp+=3;
-          vindex=4;
-        } else {
-
-          vindex==0xff;
-          break;
-        }
-        if (vindex!=0xff) {
-          struct T_INDEX ind;
-          uint8_t vtype;
-          char vname[16];
-          for (uint32_t cnt=0;cnt<sizeof(vname)-1;cnt++) {
-            if (*cp==',' || *cp==0) {
-              vname[cnt]=0;
-              break;
-            }
-            vname[cnt]=*cp++;
-          }
-          isvar(vname,&vtype,&ind,0,0,0);
-          if (vtype!=VAR_NV) {
-
-            if (vtype==NUM_RES || (vtype&STYPE)==0) {
-              hue_script[hue_devs].vindex[vindex]=ind.index;
-              hue_script[hue_devs].index[vindex]=glob_script_mem.type[ind.index].index+1;
-            } else {
-
-            }
-          }
-        }
-      }
-
-      if (response) {
-        if (devices_present) {
-          *response+=",\"";
-        }
-        else {
-          if (hue_devs>0) *response+=",\"";
-        }
-        *response+=String(EncodeLightId(hue_devs+devices_present+1))+"\":";
-        Script_HueStatus(response,hue_devs);
-      }
-
-      hue_devs++;
-    }
-    if (*lp==SCRIPT_EOL) {
-      lp++;
-    } else {
-      lp = strchr(lp, SCRIPT_EOL);
-      if (!lp) break;
-      lp++;
-    }
-  }
-#if 0
-  if (response) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Hue: %d"), hue_devs);
-    toLog(">>>>");
-    toLog(response->c_str());
-    toLog(response->c_str()+LOGSZ);
-  }
-#endif
-}
-
-const char sHUE_LIGHT_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-
-const char sHUE_SENSOR_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-
-const char sHUE_ERROR_JSON[] PROGMEM =
-  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
-
-
-
-void Script_Handle_Hue(String *path) {
-  String response;
-  int code = 200;
-  uint16_t tmp = 0;
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint16_t ct = 0;
-  bool resp = false;
-
-  uint8_t device = DecodeLightId(atoi(path->c_str()));
-  uint8_t index = device-devices_present-1;
-
-  if (WebServer->args()) {
-    response = "[";
-
-    StaticJsonBuffer<400> jsonBuffer;
-    JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
-    if (hue_json.containsKey("on")) {
-
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "on");
-
-      bool on = hue_json["on"];
-      switch(on)
-      {
-        case false : glob_script_mem.fvars[hue_script[index].index[0]-1]=0;
-                     response.replace("{re", "false");
-                     break;
-        case true : glob_script_mem.fvars[hue_script[index].index[0]-1]=1;
-                     response.replace("{re", "true");
-                     break;
-      }
-      glob_script_mem.type[hue_script[index].vindex[0]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("bri")) {
-      tmp = hue_json["bri"];
-      bri=tmp;
-      if (254 <= bri) { bri = 255; }
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "bri");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[1]-1]=bri;
-      glob_script_mem.type[hue_script[index].vindex[1]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("xy")) {
-      float x, y;
-      x = hue_json["xy"][0];
-      y = hue_json["xy"][1];
-      const String &x_str = hue_json["xy"][0];
-      const String &y_str = hue_json["xy"][1];
-      uint8_t rr,gg,bb;
-      LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
-      LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(device));
-      response.replace("{cm", "xy");
-      response.replace("{re", "[" + x_str + "," + y_str + "]");
-      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
-      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
-      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
-      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
-      resp = true;
-    }
-
-    if (hue_json.containsKey("hue")) {
-      tmp = hue_json["hue"];
-
-
-      hue=tmp;
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "hue");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[2]-1]=hue;
-      glob_script_mem.type[hue_script[index].vindex[2]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("sat")) {
-      tmp = hue_json["sat"];
-      sat=tmp;
-      if (254 <= sat) { sat = 255; }
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "sat");
-      response.replace("{re", String(tmp));
-      glob_script_mem.fvars[hue_script[index].index[3]-1]=sat;
-      glob_script_mem.type[hue_script[index].vindex[3]].bits.changed=1;
-      resp = true;
-    }
-    if (hue_json.containsKey("ct")) {
-      ct = hue_json["ct"];
-      if (resp) { response += ","; }
-      response += FPSTR(sHUE_LIGHT_RESPONSE_JSON);
-      response.replace("{id", String(EncodeLightId(device)));
-      response.replace("{cm", "ct");
-      response.replace("{re", String(ct));
-      glob_script_mem.fvars[hue_script[index].index[4]-1]=ct;
-      glob_script_mem.type[hue_script[index].vindex[4]].bits.changed=1;
-      resp = true;
-    }
-    response += "]";
-
-  } else {
-    response = FPSTR(sHUE_ERROR_JSON);
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
-  WSSend(code, CT_JSON, response);
-  if (resp) {
-    Run_Scripter(">E",2,0);
-  }
-}
-#endif
-
-
-#ifdef USE_SCRIPT_SUB_COMMAND
-bool Script_SubCmd(void) {
-  if (!bitRead(Settings.rule_enabled, 0)) return false;
-
-  if (tasm_cmd_activ) return false;
-
-  char command[CMDSZ];
-  strlcpy(command,XdrvMailbox.topic,CMDSZ);
-  uint32_t pl=XdrvMailbox.payload;
-  char pld[64];
-  strlcpy(pld,XdrvMailbox.data,sizeof(pld));
-
-  char cmdbuff[128];
-  char *cp=cmdbuff;
-  *cp++='#';
-  strcpy(cp,XdrvMailbox.topic);
-  uint8_t tlen=strlen(XdrvMailbox.topic);
-  cp+=tlen;
-  if (XdrvMailbox.index > 0) {
-    *cp++=XdrvMailbox.index|0x30;
-    tlen++;
-  }
-  if ((XdrvMailbox.payload>0) || (XdrvMailbox.data_len>0)) {
-    *cp++='(';
-    strncpy(cp,XdrvMailbox.data,XdrvMailbox.data_len);
-    cp+=XdrvMailbox.data_len;
-    *cp++=')';
-    *cp=0;
-  }
-
-  uint32_t res=Run_Scripter(cmdbuff,tlen+1,0);
-
-  if (res) return false;
-  else {
-    if (pl>=0) {
-      Response_P(S_JSON_COMMAND_NVALUE, command, pl);
-    } else {
-      Response_P(S_JSON_COMMAND_SVALUE, command, pld);
-    }
-  }
-  return true;
-}
-#endif
-
-void execute_script(char *script) {
-  char *svd_sp=glob_script_mem.scriptptr;
-  strcat(script,"\n#");
-  glob_script_mem.scriptptr=script;
-  Run_Scripter(">",1,0);
-  glob_script_mem.scriptptr=svd_sp;
-}
-#define D_CMND_SCRIPT "Script"
-#define D_CMND_SUBSCRIBE "Subscribe"
-#define D_CMND_UNSUBSCRIBE "Unsubscribe"
-
-enum ScriptCommands { CMND_SCRIPT,CMND_SUBSCRIBE, CMND_UNSUBSCRIBE };
-const char kScriptCommands[] PROGMEM = D_CMND_SCRIPT "|" D_CMND_SUBSCRIBE "|" D_CMND_UNSUBSCRIBE;
-
-bool ScriptCommand(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t index = XdrvMailbox.index;
-
-  if (tasm_cmd_activ) return false;
-
-  int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kScriptCommands);
-  if (-1 == command_code) {
-    serviced = false;
-  }
-  else if ((CMND_SCRIPT == command_code) && (index > 0)) {
-
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
-      switch (XdrvMailbox.payload) {
-        case 0:
-        case 1:
-          bitWrite(Settings.rule_enabled, index -1, XdrvMailbox.payload);
-          break;
-#ifdef xSCRIPT_STRIP_COMMENTS
-        case 2:
-          bitWrite(Settings.rule_enabled, 1,0);
-          break;
-        case 3:
-          bitWrite(Settings.rule_enabled, 1,1);
-          break;
-#endif
-      }
-    } else {
-      if ('>' == XdrvMailbox.data[0]) {
-
-        snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\"}"),command,XdrvMailbox.data);
-        if (bitRead(Settings.rule_enabled, 0)) {
-          for (uint8_t count=0; count<XdrvMailbox.data_len; count++) {
-            if (XdrvMailbox.data[count]==';') XdrvMailbox.data[count]='\n';
-          }
-          execute_script(XdrvMailbox.data);
-        }
-      }
-      return serviced;
-    }
-    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Free\":%d}"),command, GetStateText(bitRead(Settings.rule_enabled,0)),glob_script_mem.script_size-strlen(glob_script_mem.script_ram));
-#ifdef SUPPORT_MQTT_EVENT
-  } else if (CMND_SUBSCRIBE == command_code) {
-      String result = ScriptSubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
-      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
-    } else if (CMND_UNSUBSCRIBE == command_code) {
-      String result = ScriptUnsubscribe(XdrvMailbox.data, XdrvMailbox.data_len);
-      Response_P(S_JSON_COMMAND_SVALUE, command, result.c_str());
-#endif
-  }
-  return serviced;
-}
-
-
-#ifdef USE_SCRIPT_FATFS
-
-uint16_t xFAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
-  return (year - 1980) << 9 | month << 5 | day;
-}
-uint16_t xFAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
-  return hour << 11 | minute << 5 | second >> 1;
-}
-
-void dateTime(uint16_t* date, uint16_t* time) {
-
-  *date = xFAT_DATE(RtcTime.year,RtcTime.month, RtcTime.day_of_month);
-
-  *time = xFAT_TIME(RtcTime.hour,RtcTime.minute,RtcTime.second);
-}
-
-#endif
-
-
-
-#ifdef SUPPORT_MQTT_EVENT
-# 4199 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-bool ScriptMqttData(void)
-{
-  bool serviced = false;
-
-  toLog(XdrvMailbox.data);
-  if (XdrvMailbox.data_len < 1 || XdrvMailbox.data_len > 256) {
-    return false;
-  }
-  String sTopic = XdrvMailbox.topic;
-  String sData = XdrvMailbox.data;
-
-  MQTT_Subscription event_item;
-
-  for (uint32_t index = 0; index < subscriptions.size(); index++) {
-    event_item = subscriptions.get(index);
-
-
-    if (sTopic.startsWith(event_item.Topic)) {
-
-      serviced = true;
-      String value;
-      String lkey;
-      if (event_item.Key.length() == 0) {
-        value = sData;
-      } else {
-        StaticJsonBuffer<400> jsonBuf;
-        JsonObject& jsonData = jsonBuf.parseObject(sData);
-        String key1 = event_item.Key;
-        String key2;
-        if (!jsonData.success()) break;
-        int dot;
-        if ((dot = key1.indexOf('.')) > 0) {
-          key2 = key1.substring(dot+1);
-          key1 = key1.substring(0, dot);
-          lkey=key2;
-          if (!jsonData[key1][key2].success()) break;
-          value = (const char *)jsonData[key1][key2];
-        } else {
-          if (!jsonData[key1].success()) break;
-          value = (const char *)jsonData[key1];
-          lkey=key1;
-        }
-      }
-      value.trim();
-      char sbuffer[128];
-
-      if (!strncmp(lkey.c_str(),"Epoch",5)) {
-        uint32_t ep=atoi(value.c_str())-(uint32_t)EPOCH_OFFSET;
-        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=%d\n"), event_item.Event.c_str(),ep);
-      } else {
-        snprintf_P(sbuffer, sizeof(sbuffer), PSTR(">%s=\"%s\"\n"), event_item.Event.c_str(), value.c_str());
-      }
-
-      execute_script(sbuffer);
-    }
-  }
-  return serviced;
-}
-# 4274 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-String ScriptSubscribe(const char *data, int data_len)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (data_len > 0) {
-    char parameters[data_len+1];
-    memcpy(parameters, data, data_len);
-    parameters[data_len] = '\0';
-    String event_name, topic, key;
-
-    char * pos = strtok(parameters, ",");
-    if (pos) {
-      event_name = Trim(pos);
-      pos = strtok(nullptr, ",");
-      if (pos) {
-        topic = Trim(pos);
-        pos = strtok(nullptr, ",");
-        if (pos) {
-          key = Trim(pos);
-        }
-      }
-    }
-
-
-    if (event_name.length() > 0 && topic.length() > 0) {
-
-      for (uint32_t index=0; index < subscriptions.size(); index++) {
-        if (subscriptions.get(index).Event.equals(event_name)) {
-
-          String stopic = subscriptions.get(index).Topic + "/#";
-          MqttUnsubscribe(stopic.c_str());
-          subscriptions.remove(index);
-          break;
-        }
-      }
-
-      if (!topic.endsWith("#")) {
-        if (topic.endsWith("/")) {
-          topic.concat("#");
-        } else {
-          topic.concat("/#");
-        }
-      }
-
-
-      subscription_item.Event = event_name;
-      subscription_item.Topic = topic.substring(0, topic.length() - 2);
-      subscription_item.Key = key;
-      subscriptions.add(subscription_item);
-
-      MqttSubscribe(topic.c_str());
-      events.concat(event_name + "," + topic
-        + (key.length()>0 ? "," : "")
-        + key);
-    } else {
-      events = D_JSON_WRONG_PARAMETERS;
-    }
-  } else {
-
-    for (uint32_t index=0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      events.concat(subscription_item.Event + "," + subscription_item.Topic
-        + (subscription_item.Key.length()>0 ? "," : "")
-        + subscription_item.Key + "; ");
-    }
-  }
-  return events;
-}
-# 4354 "S:/Development/Tasmota/tasmota/xdrv_10_scripter.ino"
-String ScriptUnsubscribe(const char * data, int data_len)
-{
-  MQTT_Subscription subscription_item;
-  String events;
-  if (data_len > 0) {
-    for (uint32_t index = 0; index < subscriptions.size(); index++) {
-      subscription_item = subscriptions.get(index);
-      if (subscription_item.Event.equalsIgnoreCase(data)) {
-        String stopic = subscription_item.Topic + "/#";
-        MqttUnsubscribe(stopic.c_str());
-        events = subscription_item.Event;
-        subscriptions.remove(index);
-        break;
-      }
-    }
-  } else {
-
-    String stopic;
-    while (subscriptions.size() > 0) {
-      events.concat(subscriptions.get(0).Event + "; ");
-      stopic = subscriptions.get(0).Topic + "/#";
-      MqttUnsubscribe(stopic.c_str());
-      subscriptions.remove(0);
-    }
-  }
-  return events;
-}
-#endif
-
-
-
-#ifdef USE_SCRIPT_WEB_DISPLAY
-
-void Script_Check_HTML_Setvars(void) {
-
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  if (WebServer->hasArg("sv")) {
-    String stmp = WebServer->arg("sv");
-    char cmdbuf[64];
-    memset(cmdbuf,0,sizeof(cmdbuf));
-    char *cp=cmdbuf;
-    *cp++='>';
-    strncpy(cp,stmp.c_str(),sizeof(cmdbuf)-1);
-    char *cp1=strchr(cp,'_');
-    if (!cp1) return;
-    *cp1=0;
-    char vname[32];
-    strncpy(vname,cp,sizeof(vname));
-    *cp1='=';
-    cp1++;
-
-    struct T_INDEX ind;
-    uint8_t vtype;
-    isvar(vname,&vtype,&ind,0,0,0);
-    if (vtype!=NUM_RES && vtype&STYPE) {
-
-      uint8_t tlen=strlen(cp1);
-      memmove(cp1+1,cp1,tlen);
-      *cp1='\"';
-      *(cp1+tlen+1)='\"';
-    }
-
-
-    execute_script(cmdbuf);
-    Run_Scripter(">E",2,0);
-  }
-}
-
-
-const char SCRIPT_MSG_BUTTONa[] PROGMEM =
-  "<button type='submit' style=\"width:%d%%\" onclick='seva(%d,\"%s\")'>%s</button>";
-
-const char SCRIPT_MSG_BUTTONa_TBL[] PROGMEM =
-  "<td style=\"width:%d%%\"><button type='submit' onclick='seva(%d,\"%s\")'>%s</button></td>";
-
-const char SCRIPT_MSG_BUTTONb[] PROGMEM =
-  "<img width=\"%d%%\"></img>";
-
-const char SCRIPT_MSG_BUT_START[] PROGMEM =
-  "<div>";
-const char SCRIPT_MSG_BUT_START_TBL[] PROGMEM =
-  "<table style='width:100%%'><tr>";
-
-const char SCRIPT_MSG_BUT_STOP[] PROGMEM =
-  "</div>";
-const char SCRIPT_MSG_BUT_STOP_TBL[] PROGMEM =
-  "</tr></table>";
-
-const char SCRIPT_MSG_SLIDER[] PROGMEM =
-  "<div><span class='p'>%s</span><center><b>%s</b><span class='q'>%s</span></div>"
-  "<div><input type='range' min='%d' max='%d' value='%d' onchange='seva(value,\"%s\")'></div>";
-
-const char SCRIPT_MSG_CHKBOX[] PROGMEM =
-  "<div><center><label><b>%s</b><input type='checkbox' %s onchange='seva(%d,\"%s\")'></label></div>";
-
-const char SCRIPT_MSG_TEXTINP[] PROGMEM =
-  "<div><center><label><b>%s</b><input type='text'  value='%s' style='width:200px'  onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
-
-const char SCRIPT_MSG_NUMINP[] PROGMEM =
-  "<div><center><label><b>%s</b><input  min='%s' max='%s' step='%s' value='%s' type='number' style='width:200px' onfocusin='pr(0)' onfocusout='pr(1)' onchange='siva(value,\"%s\")'></label></div>";
-
-
-void ScriptGetVarname(char *nbuf,char *sp, uint32_t blen) {
-uint32_t cnt;
-  for (cnt=0;cnt<blen-1;cnt++) {
-    if (*sp==' ' || *sp==')') {
-      break;
-    }
-    nbuf[cnt]=*sp++;
-  }
-  nbuf[cnt]=0;
-}
-
-void ScriptWebShow(void) {
-  uint8_t web_script=Run_Scripter(">W",-2,0);
-  if (web_script==99) {
-    char line[128];
-    char tmp[128];
-    uint8_t optflg=0;
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        char *lin=line;
-        if (*lin=='@') {
-          lin++;
-          optflg=1;
-        } else {
-          optflg=0;
-        }
-
-        if (!strncmp(lin,"sl(",3)) {
-
-          char *lp=lin;
-          float min;
-          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
-          SCRIPT_SKIP_SPACES
-
-          float max;
-          lp=GetNumericResult(lp,OPER_EQU,&max,0);
-          SCRIPT_SKIP_SPACES
-          float val;
-          char *slp=lp;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char left[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,left,0);
-          SCRIPT_SKIP_SPACES
-          char mid[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,mid,0);
-          SCRIPT_SKIP_SPACES
-          char right[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,right,0);
-          SCRIPT_SKIP_SPACES
-
-          WSContentSend_PD(SCRIPT_MSG_SLIDER,left,mid,right,(uint32_t)min,(uint32_t)max,(uint32_t)val,vname);
-
-
-        } else if (!strncmp(lin,"ck(",3)) {
-          char *lp=lin+3;
-          char *slp=lp;
-          float val;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-          const char *cp;
-          uint8_t uval;
-          if (val>0) {
-            cp="checked='checked'";
-            uval=0;
-          } else {
-            cp="";
-            uval=1;
-          }
-          WSContentSend_PD(SCRIPT_MSG_CHKBOX,label,(char*)cp,uval,vname);
-
-        } else if (!strncmp(lin,"bu(",3)) {
-          char *lp=lin+3;
-          uint8_t bcnt=0;
-          char *found=lin;
-          while (bcnt<4) {
-            found=strstr(found,"bu(");
-            if (!found) break;
-            found+=3;
-            bcnt++;
-          }
-          uint8_t proz=100/bcnt;
-          if (!optflg && bcnt>1) proz-=2;
-          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_START_TBL);
-          else WSContentSend_PD(SCRIPT_MSG_BUT_START);
-          for (uint32_t cnt=0;cnt<bcnt;cnt++) {
-            float val;
-            char *slp=lp;
-            lp=GetNumericResult(lp,OPER_EQU,&val,0);
-            SCRIPT_SKIP_SPACES
-
-            char vname[16];
-            ScriptGetVarname(vname,slp,sizeof(vname));
-
-            SCRIPT_SKIP_SPACES
-            char ontxt[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,ontxt,0);
-            SCRIPT_SKIP_SPACES
-            char offtxt[SCRIPT_MAXSSIZE];
-            lp=GetStringResult(lp,OPER_EQU,offtxt,0);
-
-            char *cp;
-            uint8_t uval;
-            if (val>0) {
-              cp=ontxt;
-              uval=0;
-            } else {
-              cp=offtxt;
-              uval=1;
-            }
-            if (bcnt>1 && cnt==bcnt-1) {
-              if (!optflg) proz+=2;
-            }
-            if (!optflg) {
-              WSContentSend_PD(SCRIPT_MSG_BUTTONa,proz,uval,vname,cp);
-            } else {
-              WSContentSend_PD(SCRIPT_MSG_BUTTONa_TBL,proz,uval,vname,cp);
-            }
-            if (bcnt>1 && cnt<bcnt-1) {
-              if (!optflg) WSContentSend_PD(SCRIPT_MSG_BUTTONb,2);
-            }
-            lp+=4;
-          }
-          if (optflg) WSContentSend_PD(SCRIPT_MSG_BUT_STOP_TBL);
-          else WSContentSend_PD(SCRIPT_MSG_BUT_STOP);
-        } else if (!strncmp(lin,"tx(",3)) {
-          char *lp=lin+3;
-          char *slp=lp;
-          char str[SCRIPT_MAXSSIZE];
-          lp=ForceStringVar(lp,str);
-          SCRIPT_SKIP_SPACES
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          WSContentSend_PD(SCRIPT_MSG_TEXTINP,label,str,vname);
-
-        } else if (!strncmp(lin,"nm(",3)) {
-          char *lp=lin;
-          float min;
-          lp=GetNumericResult(lp+3,OPER_EQU,&min,0);
-          SCRIPT_SKIP_SPACES
-          float max;
-          lp=GetNumericResult(lp,OPER_EQU,&max,0);
-          SCRIPT_SKIP_SPACES
-          float step;
-          lp=GetNumericResult(lp,OPER_EQU,&step,0);
-          SCRIPT_SKIP_SPACES
-          float val;
-          char *slp=lp;
-          lp=GetNumericResult(lp,OPER_EQU,&val,0);
-          SCRIPT_SKIP_SPACES
-          char vname[16];
-          ScriptGetVarname(vname,slp,sizeof(vname));
-
-          char label[SCRIPT_MAXSSIZE];
-          lp=GetStringResult(lp,OPER_EQU,label,0);
-
-          char vstr[16],minstr[16],maxstr[16],stepstr[16];
-          dtostrfd(val,4,vstr);
-          dtostrfd(min,4,minstr);
-          dtostrfd(max,4,maxstr);
-          dtostrfd(step,4,stepstr);
-          WSContentSend_PD(SCRIPT_MSG_NUMINP,label,minstr,maxstr,stepstr,vstr,vname);
-
-        } else {
-          Replace_Cmd_Vars(lin,tmp,sizeof(tmp));
-          if (optflg) {
-            WSContentSend_PD(PSTR("<div>%s</div>"),tmp);
-          } else {
-            WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
-          }
-        }
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  }
-}
-#endif
-
-
-#ifdef USE_SENDMAIL
-void script_send_email_body(BearSSL::WiFiClientSecure_light *client) {
-uint8_t msect=Run_Scripter(">m",-2,0);
-  if (msect==99) {
-    char line[128];
-    char tmp[128];
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-        client->println(tmp);
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  } else {
-    client->println("*");
-  }
-}
-#endif
-
-#ifdef USE_SCRIPT_JSON_EXPORT
-void ScriptJsonAppend(void) {
-  uint8_t web_script=Run_Scripter(">J",-2,0);
-  if (web_script==99) {
-    char line[128];
-    char tmp[128];
-    char *lp=glob_script_mem.section_ptr+2;
-    while (lp) {
-      while (*lp==SCRIPT_EOL) {
-       lp++;
-      }
-      if (!*lp || *lp=='#' || *lp=='>') {
-          break;
-      }
-      if (*lp!=';') {
-
-        memcpy(line,lp,sizeof(line));
-        line[sizeof(line)-1]=0;
-        char *cp=line;
-        for (uint32_t i=0; i<sizeof(line); i++) {
-          if (!*cp || *cp=='\n' || *cp=='\r') {
-            *cp=0;
-            break;
-          }
-          cp++;
-        }
-        Replace_Cmd_Vars(line,tmp,sizeof(tmp));
-        ResponseAppend_P(PSTR("%s"),tmp);
-      }
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-  }
-}
-#endif
-
-
-
-
-
-
-bool Xdrv10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_PRE_INIT:
-
-      glob_script_mem.script_ram=Settings.rules[0];
-      glob_script_mem.script_size=MAX_SCRIPT_SIZE;
-      glob_script_mem.flags=0;
-      glob_script_mem.script_pram=(uint8_t*)Settings.script_pram[0];
-      glob_script_mem.script_pram_size=PMEM_SIZE;
-
-#ifdef USE_BUTTON_EVENT
-      for (uint32_t cnt=0;cnt<MAX_KEYS;cnt++) {
-        script_button[cnt]=-1;
-      }
-#endif
-
-#ifdef USE_24C256
-#ifndef USE_SCRIPT_FATFS
-   if (I2cEnabled(XI2C_37)) {
-     if (I2cSetDevice(EEPROM_ADDRESS)) {
-
-          char *script;
-          script=(char*)calloc(EEP_SCRIPT_SIZE+4,1);
-          if (!script) break;
-          glob_script_mem.script_ram=script;
-          glob_script_mem.script_size=EEP_SCRIPT_SIZE;
-          EEP_READ(0,EEP_SCRIPT_SIZE,script);
-          if (*script==0xff) {
-            memset(script,EEP_SCRIPT_SIZE,0);
-          }
-          script[EEP_SCRIPT_SIZE-1]=0;
-
-          glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
-          glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
-
-          glob_script_mem.flags=1;
-          I2cSetActiveFound(EEPROM_ADDRESS, "EEPROM");
-        }
-      }
-#endif
-#endif
-
-#ifdef USE_SCRIPT_FATFS
-      if (SD.begin(USE_SCRIPT_FATFS)) {
-        glob_script_mem.script_sd_found=1;
-        char *script;
-        script=(char*)calloc(FAT_SCRIPT_SIZE+4,1);
-        if (!script) break;
-        glob_script_mem.script_ram=script;
-        glob_script_mem.script_size=FAT_SCRIPT_SIZE;
-        if (SD.exists(FAT_SCRIPT_NAME)) {
-          File file=SD.open(FAT_SCRIPT_NAME,FILE_READ);
-          file.read((uint8_t*)script,FAT_SCRIPT_SIZE);
-          file.close();
-        }
-        script[FAT_SCRIPT_SIZE-1]=0;
-
-        glob_script_mem.script_pram=(uint8_t*)Settings.rules[0];
-        glob_script_mem.script_pram_size=MAX_SCRIPT_SIZE;
-
-        glob_script_mem.flags=1;
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
-
-        SdFile::dateTimeCallback(dateTime);
-#endif
-
-      } else {
-        glob_script_mem.script_sd_found=0;
-      }
-#endif
-
-
-      { uint32_t ptr=(uint32_t)glob_script_mem.script_pram;
-      ptr&=0xfffffffc;
-      ptr+=4;
-      glob_script_mem.script_pram=(uint8_t*)ptr;
-      glob_script_mem.script_pram_size-=4;
-      }
-
-      if (bitRead(Settings.rule_enabled, 0)) Init_Scripter();
-      break;
-    case FUNC_INIT:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        Run_Scripter(">B",2,0);
-        fast_script=Run_Scripter(">F",-2,0);
-#if defined(USE_SCRIPT_HUE) && defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-        Script_Check_Hue(0);
-#endif
-      }
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      ScripterEvery100ms();
-      break;
-    case FUNC_EVERY_SECOND:
-      ScriptEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = ScriptCommand();
-      break;
-    case FUNC_SET_POWER:
-#ifdef SCRIPT_POWER_SECTION
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">P",2,0);
-#else
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,0);
-#endif
-      break;
-    case FUNC_RULES_PROCESS:
-      if (bitRead(Settings.rule_enabled, 0)) Run_Scripter(">E",2,mqtt_data);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_ADD_BUTTON:
-      WSContentSend_P(HTTP_BTN_MENU_RULES);
-      break;
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/" WEB_HANDLE_SCRIPT, HandleScriptConfiguration);
-      WebServer->on("/ta",HTTP_POST, HandleScriptTextareaConfiguration);
-
-#ifdef USE_SCRIPT_FATFS
-      WebServer->on("/u3", HTTP_POST,[]() { WebServer->sendHeader("Location","/u3");WebServer->send(303);},script_upload);
-      WebServer->on("/u3", HTTP_GET,ScriptFileUploadSuccess);
-      WebServer->on("/upl", HTTP_GET,Script_FileUploadConfiguration);
-#endif
-      break;
-#endif
-    case FUNC_SAVE_BEFORE_RESTART:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        Run_Scripter(">R",2,0);
-        Scripter_save_pvars();
-      }
-      break;
-#ifdef SUPPORT_MQTT_EVENT
-    case FUNC_MQTT_DATA:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        result = ScriptMqttData();
-      }
-      break;
-#endif
-#ifdef USE_SCRIPT_WEB_DISPLAY
-    case FUNC_WEB_SENSOR:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        ScriptWebShow();
-      }
-      break;
-#endif
-
-#ifdef USE_SCRIPT_JSON_EXPORT
-    case FUNC_JSON_APPEND:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        ScriptJsonAppend();
-      }
-      break;
-#endif
-
-#ifdef USE_BUTTON_EVENT
-    case FUNC_BUTTON_PRESSED:
-      if (bitRead(Settings.rule_enabled, 0)) {
-        if ((script_button[XdrvMailbox.index]&1)!=(XdrvMailbox.payload&1)) {
-          script_button[XdrvMailbox.index]=XdrvMailbox.payload;
-          Run_Scripter(">b",2,0);
-        }
-      }
-      break;
-#endif
-
-  }
-  return result;
-}
-
-
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
-#ifdef USE_KNX
-# 51 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
-#define XDRV_11 11
-
-#include <esp-knx-ip.h>
-
-address_t KNX_physs_addr;
-address_t KNX_addr;
-
-#define KNX_Empty 255
-
-#define TOGGLE_INHIBIT_TIME 15
-
-float last_temp;
-float last_hum;
-uint8_t toggle_inhibit;
-
-typedef struct __device_parameters
-{
-  uint8_t type;
-
-
-
-
-  bool show;
-
-  bool last_state;
-
-  callback_id_t CB_id;
-
-
-
-
-
-} device_parameters_t;
-
-
-device_parameters_t device_param[] = {
-  { 1, false, false, KNX_Empty },
-  { 2, false, false, KNX_Empty },
-  { 3, false, false, KNX_Empty },
-  { 4, false, false, KNX_Empty },
-  { 5, false, false, KNX_Empty },
-  { 6, false, false, KNX_Empty },
-  { 7, false, false, KNX_Empty },
-  { 8, false, false, KNX_Empty },
-  { 9, false, false, KNX_Empty },
-  { 10, false, false, KNX_Empty },
-  { 11, false, false, KNX_Empty },
-  { 12, false, false, KNX_Empty },
-  { 13, false, false, KNX_Empty },
-  { 14, false, false, KNX_Empty },
-  { 15, false, false, KNX_Empty },
-  { 16, false, false, KNX_Empty },
-  { KNX_TEMPERATURE, false, false, KNX_Empty },
-  { KNX_HUMIDITY , false, false, KNX_Empty },
-  { KNX_ENERGY_VOLTAGE , false, false, KNX_Empty },
-  { KNX_ENERGY_CURRENT , false, false, KNX_Empty },
-  { KNX_ENERGY_POWER , false, false, KNX_Empty },
-  { KNX_ENERGY_POWERFACTOR , false, false, KNX_Empty },
-  { KNX_ENERGY_DAILY , false, false, KNX_Empty },
-  { KNX_ENERGY_START , false, false, KNX_Empty },
-  { KNX_ENERGY_TOTAL , false, false, KNX_Empty },
-  { KNX_SLOT1 , false, false, KNX_Empty },
-  { KNX_SLOT2 , false, false, KNX_Empty },
-  { KNX_SLOT3 , false, false, KNX_Empty },
-  { KNX_SLOT4 , false, false, KNX_Empty },
-  { KNX_SLOT5 , false, false, KNX_Empty },
-  { KNX_Empty, false, false, KNX_Empty}
-};
-
-
-const char * device_param_ga[] = {
-  D_TIMER_OUTPUT " 1",
-  D_TIMER_OUTPUT " 2",
-  D_TIMER_OUTPUT " 3",
-  D_TIMER_OUTPUT " 4",
-  D_TIMER_OUTPUT " 5",
-  D_TIMER_OUTPUT " 6",
-  D_TIMER_OUTPUT " 7",
-  D_TIMER_OUTPUT " 8",
-  D_SENSOR_BUTTON " 1",
-  D_SENSOR_BUTTON " 2",
-  D_SENSOR_BUTTON " 3",
-  D_SENSOR_BUTTON " 4",
-  D_SENSOR_BUTTON " 5",
-  D_SENSOR_BUTTON " 6",
-  D_SENSOR_BUTTON " 7",
-  D_SENSOR_BUTTON " 8",
-  D_TEMPERATURE ,
-  D_HUMIDITY ,
-  D_VOLTAGE ,
-  D_CURRENT ,
-  D_POWERUSAGE ,
-  D_POWER_FACTOR ,
-  D_ENERGY_TODAY ,
-  D_ENERGY_YESTERDAY ,
-  D_ENERGY_TOTAL ,
-  D_KNX_TX_SLOT " 1",
-  D_KNX_TX_SLOT " 2",
-  D_KNX_TX_SLOT " 3",
-  D_KNX_TX_SLOT " 4",
-  D_KNX_TX_SLOT " 5",
-  nullptr
-};
-
-
-const char *device_param_cb[] = {
-  D_TIMER_OUTPUT " 1",
-  D_TIMER_OUTPUT " 2",
-  D_TIMER_OUTPUT " 3",
-  D_TIMER_OUTPUT " 4",
-  D_TIMER_OUTPUT " 5",
-  D_TIMER_OUTPUT " 6",
-  D_TIMER_OUTPUT " 7",
-  D_TIMER_OUTPUT " 8",
-  D_TIMER_OUTPUT " 1 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 2 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 3 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 4 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 5 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 6 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 7 " D_BUTTON_TOGGLE,
-  D_TIMER_OUTPUT " 8 " D_BUTTON_TOGGLE,
-  D_REPLY " " D_TEMPERATURE,
-  D_REPLY " " D_HUMIDITY,
-  D_REPLY " " D_VOLTAGE ,
-  D_REPLY " " D_CURRENT ,
-  D_REPLY " " D_POWERUSAGE ,
-  D_REPLY " " D_POWER_FACTOR ,
-  D_REPLY " " D_ENERGY_TODAY ,
-  D_REPLY " " D_ENERGY_YESTERDAY ,
-  D_REPLY " " D_ENERGY_TOTAL ,
-  D_KNX_RX_SLOT " 1",
-  D_KNX_RX_SLOT " 2",
-  D_KNX_RX_SLOT " 3",
-  D_KNX_RX_SLOT " 4",
-  D_KNX_RX_SLOT " 5",
-  nullptr
-};
-
-
-#define D_PRFX_KNX "Knx"
-#define D_CMND_KNXTXCMND "Tx_Cmnd"
-#define D_CMND_KNXTXVAL "Tx_Val"
-#define D_CMND_KNX_ENABLED "_Enabled"
-#define D_CMND_KNX_ENHANCED "_Enhanced"
-#define D_CMND_KNX_PA "_PA"
-#define D_CMND_KNX_GA "_GA"
-#define D_CMND_KNX_CB "_CB"
-
-const char kKnxCommands[] PROGMEM = D_PRFX_KNX "|"
-  D_CMND_KNXTXCMND "|" D_CMND_KNXTXVAL "|" D_CMND_KNX_ENABLED "|" D_CMND_KNX_ENHANCED "|" D_CMND_KNX_PA "|" D_CMND_KNX_GA "|" D_CMND_KNX_CB ;
-
-void (* const KnxCommand[])(void) PROGMEM = {
-  &CmndKnxTxCmnd, &CmndKnxTxVal, &CmndKnxEnabled, &CmndKnxEnhanced, &CmndKnxPa, &CmndKnxGa, &CmndKnxCb };
-
-uint8_t KNX_GA_Search( uint8_t param, uint8_t start = 0 )
-{
-  for (uint32_t i = start; i < Settings.knx_GA_registered; ++i)
-  {
-    if ( Settings.knx_GA_param[i] == param )
-    {
-      if ( Settings.knx_GA_addr[i] != 0 )
-      {
-         if ( i >= start ) { return i; }
-      }
-    }
-  }
-  return KNX_Empty;
-}
-
-
-uint8_t KNX_CB_Search( uint8_t param, uint8_t start = 0 )
-{
-  for (uint32_t i = start; i < Settings.knx_CB_registered; ++i)
-  {
-    if ( Settings.knx_CB_param[i] == param )
-    {
-      if ( Settings.knx_CB_addr[i] != 0 )
-      {
-         if ( i >= start ) { return i; }
-      }
-    }
-  }
-  return KNX_Empty;
-}
-
-
-void KNX_ADD_GA( uint8_t GAop, uint8_t GA_FNUM, uint8_t GA_AREA, uint8_t GA_FDEF )
-{
-
-  if ( Settings.knx_GA_registered >= MAX_KNX_GA ) { return; }
-  if ( GA_FNUM == 0 && GA_AREA == 0 && GA_FDEF == 0 ) { return; }
-
-
-  Settings.knx_GA_param[Settings.knx_GA_registered] = GAop;
-  KNX_addr.ga.area = GA_FNUM;
-  KNX_addr.ga.line = GA_AREA;
-  KNX_addr.ga.member = GA_FDEF;
-  Settings.knx_GA_addr[Settings.knx_GA_registered] = KNX_addr.value;
-
-  Settings.knx_GA_registered++;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " GA #%d: %s " D_TO " %d/%d/%d"),
-   Settings.knx_GA_registered,
-   device_param_ga[GAop-1],
-   GA_FNUM, GA_AREA, GA_FDEF );
-}
-
-
-void KNX_DEL_GA( uint8_t GAnum )
-{
-
-  uint8_t dest_offset = 0;
-  uint8_t src_offset = 0;
-  uint8_t len = 0;
-
-
-  Settings.knx_GA_param[GAnum-1] = 0;
-
-  if (GAnum == 1)
-  {
-
-    src_offset = 1;
-
-
-
-    len = (Settings.knx_GA_registered - 1);
-  }
-  else if (GAnum == Settings.knx_GA_registered)
-  {
-
-  }
-  else
-  {
-
-
-
-
-    dest_offset = GAnum -1 ;
-    src_offset = dest_offset + 1;
-    len = (Settings.knx_GA_registered - GAnum);
-  }
-
-  if (len > 0)
-  {
-    memmove(Settings.knx_GA_param + dest_offset, Settings.knx_GA_param + src_offset, len * sizeof(uint8_t));
-    memmove(Settings.knx_GA_addr + dest_offset, Settings.knx_GA_addr + src_offset, len * sizeof(uint16_t));
-  }
-
-  Settings.knx_GA_registered--;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " GA #%d"),
-    GAnum );
-}
-
-
-void KNX_ADD_CB( uint8_t CBop, uint8_t CB_FNUM, uint8_t CB_AREA, uint8_t CB_FDEF )
-{
-
-  if ( Settings.knx_CB_registered >= MAX_KNX_CB ) { return; }
-  if ( CB_FNUM == 0 && CB_AREA == 0 && CB_FDEF == 0 ) { return; }
-
-
-  if ( device_param[CBop-1].CB_id == KNX_Empty )
-  {
-
-    device_param[CBop-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[CBop-1]);
-
-
-
-
-  }
-
-  Settings.knx_CB_param[Settings.knx_CB_registered] = CBop;
-  KNX_addr.ga.area = CB_FNUM;
-  KNX_addr.ga.line = CB_AREA;
-  KNX_addr.ga.member = CB_FDEF;
-  Settings.knx_CB_addr[Settings.knx_CB_registered] = KNX_addr.value;
-
-  knx.callback_assign( device_param[CBop-1].CB_id, KNX_addr );
-
-  Settings.knx_CB_registered++;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ADD " CB #%d: %d/%d/%d " D_TO " %s"),
-   Settings.knx_CB_registered,
-   CB_FNUM, CB_AREA, CB_FDEF,
-   device_param_cb[CBop-1] );
-}
-
-
-void KNX_DEL_CB( uint8_t CBnum )
-{
-  uint8_t oldparam = Settings.knx_CB_param[CBnum-1];
-  uint8_t dest_offset = 0;
-  uint8_t src_offset = 0;
-  uint8_t len = 0;
-
-
-  knx.callback_unassign(CBnum-1);
-  Settings.knx_CB_param[CBnum-1] = 0;
-
-  if (CBnum == 1)
-  {
-
-    src_offset = 1;
-
-
-
-    len = (Settings.knx_CB_registered - 1);
-  }
-  else if (CBnum == Settings.knx_CB_registered)
-  {
-
-  }
-  else
-  {
-
-
-
-
-    dest_offset = CBnum -1 ;
-    src_offset = dest_offset + 1;
-    len = (Settings.knx_CB_registered - CBnum);
-  }
-
-  if (len > 0)
-  {
-    memmove(Settings.knx_CB_param + dest_offset, Settings.knx_CB_param + src_offset, len * sizeof(uint8_t));
-    memmove(Settings.knx_CB_addr + dest_offset, Settings.knx_CB_addr + src_offset, len * sizeof(uint16_t));
-  }
-
-  Settings.knx_CB_registered--;
-
-
-  if ( KNX_CB_Search( oldparam ) == KNX_Empty ) {
-    knx.callback_deregister( device_param[oldparam-1].CB_id );
-    device_param[oldparam-1].CB_id = KNX_Empty;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " CB #%d"), CBnum );
-}
-
-
-bool KNX_CONFIG_NOT_MATCH(void)
-{
-
-  for (uint32_t i = 0; i < KNX_MAX_device_param; ++i)
-  {
-    if ( !device_param[i].show ) {
-
-
-
-      if ( KNX_GA_Search(i+1) != KNX_Empty ) { return true; }
-
-      if ( i < 8 )
-      {
-        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
-        if ( KNX_CB_Search(i+9) != KNX_Empty ) { return true; }
-      }
-
-      if ( i > 15 )
-      {
-        if ( KNX_CB_Search(i+1) != KNX_Empty ) { return true; }
-      }
-    }
-  }
-
-
-  for (uint32_t i = 0; i < Settings.knx_GA_registered; ++i)
-  {
-    if ( Settings.knx_GA_param[i] != 0 )
-    {
-      if ( Settings.knx_GA_addr[i] == 0 )
-      {
-         return true;
-      }
-    }
-  }
-  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
-  {
-    if ( Settings.knx_CB_param[i] != 0 )
-    {
-      if ( Settings.knx_CB_addr[i] == 0 )
-      {
-         return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-
-void KNXStart(void)
-{
-  knx.start(nullptr);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_START));
-}
-
-
-void KNX_INIT(void)
-{
-
-  if (Settings.knx_GA_registered > MAX_KNX_GA) { Settings.knx_GA_registered = MAX_KNX_GA; }
-  if (Settings.knx_CB_registered > MAX_KNX_CB) { Settings.knx_CB_registered = MAX_KNX_CB; }
-
-
-  KNX_physs_addr.value = Settings.knx_physsical_addr;
-  knx.physical_address_set( KNX_physs_addr );
-# 472 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
-  for (uint32_t i = 0; i < devices_present; ++i)
-  {
-    device_param[i].show = true;
-  }
-  for (uint32_t i = GPIO_SWT1; i < GPIO_SWT4 + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1 + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_KEY1; i < GPIO_KEY4 + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1 + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_SWT1_NP; i < GPIO_SWT4_NP + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_SWT1_NP + 8].show = true; }
-  }
-  for (uint32_t i = GPIO_KEY1_NP; i < GPIO_KEY4_NP + 1; ++i)
-  {
-    if (GetUsedInModule(i, my_module.io)) { device_param[i - GPIO_KEY1_NP + 8].show = true; }
-  }
-  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-#ifdef USE_DS18x20
-  if (GetUsedInModule(GPIO_DSB, my_module.io)) { device_param[KNX_TEMPERATURE-1].show = true; }
-#endif
-  if (GetUsedInModule(GPIO_DHT11, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-  if (GetUsedInModule(GPIO_DHT22, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-  if (GetUsedInModule(GPIO_SI7021, my_module.io)) { device_param[KNX_HUMIDITY-1].show = true; }
-
-#if defined(USE_ENERGY_SENSOR)
-
-  if ( energy_flg != ENERGY_NONE ) {
-    device_param[KNX_ENERGY_POWER-1].show = true;
-    device_param[KNX_ENERGY_DAILY-1].show = true;
-    device_param[KNX_ENERGY_START-1].show = true;
-    device_param[KNX_ENERGY_TOTAL-1].show = true;
-    device_param[KNX_ENERGY_VOLTAGE-1].show = true;
-    device_param[KNX_ENERGY_CURRENT-1].show = true;
-    device_param[KNX_ENERGY_POWERFACTOR-1].show = true;
-  }
-#endif
-
-#ifdef USE_RULES
-  device_param[KNX_SLOT1-1].show = true;
-  device_param[KNX_SLOT2-1].show = true;
-  device_param[KNX_SLOT3-1].show = true;
-  device_param[KNX_SLOT4-1].show = true;
-  device_param[KNX_SLOT5-1].show = true;
-#endif
-
-
-  if (KNX_CONFIG_NOT_MATCH()) {
-    Settings.knx_GA_registered = 0;
-    Settings.knx_CB_registered = 0;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_DELETE " " D_KNX_PARAMETERS));
-  }
-
-
-
-
-  uint8_t j;
-  for (uint32_t i = 0; i < Settings.knx_CB_registered; ++i)
-  {
-    j = Settings.knx_CB_param[i];
-    if ( j > 0 )
-    {
-      device_param[j-1].CB_id = knx.callback_register("", KNX_CB_Action, &device_param[j-1]);
-
-
-
-      KNX_addr.value = Settings.knx_CB_addr[i];
-      knx.callback_assign( device_param[j-1].CB_id, KNX_addr );
-    }
-  }
-}
-
-
-void KNX_CB_Action(message_t const &msg, void *arg)
-{
-  device_parameters_t *chan = (device_parameters_t *)arg;
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  char tempchar[33];
-
-  if (msg.data_len == 1) {
-
-    tempchar[0] = msg.data[0];
-    tempchar[1] = '\0';
-  } else {
-
-    float tempvar = knx.data_to_2byte_float(msg.data);
-    dtostrfd(tempvar,2,tempchar);
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX D_RECEIVED_FROM " %d.%d.%d " D_COMMAND " %s: %s " D_TO " %s"),
-   msg.received_on.ga.area, msg.received_on.ga.line, msg.received_on.ga.member,
-   (msg.ct == KNX_CT_WRITE) ? D_KNX_COMMAND_WRITE : (msg.ct == KNX_CT_READ) ? D_KNX_COMMAND_READ : D_KNX_COMMAND_OTHER,
-   tempchar,
-   device_param_cb[(chan->type)-1]);
-
-  switch (msg.ct)
-  {
-    case KNX_CT_WRITE:
-      if (chan->type < 9)
-      {
-        ExecuteCommandPower(chan->type, msg.data[0], SRC_KNX);
-      }
-      else if (chan->type < 17)
-      {
-        if (!toggle_inhibit) {
-          ExecuteCommandPower((chan->type) -8, POWER_TOGGLE, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#ifdef USE_RULES
-      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
-      {
-        if (!toggle_inhibit) {
-          char command[25];
-          if (msg.data_len == 1) {
-
-            snprintf_P(command, sizeof(command), PSTR("event KNXRX_CMND%d=%d"), ((chan->type) - KNX_SLOT1 + 1 ), msg.data[0]);
-          } else {
-
-            snprintf_P(command, sizeof(command), PSTR("event KNXRX_VAL%d=%s"), ((chan->type) - KNX_SLOT1 + 1 ), tempchar);
-          }
-          ExecuteCommand(command, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#endif
-      break;
-
-    case KNX_CT_READ:
-      if (chan->type < 9)
-      {
-        knx.answer_1bit(msg.received_on, chan->last_state);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_1bit(msg.received_on, chan->last_state);
-          knx.answer_1bit(msg.received_on, chan->last_state);
-        }
-      }
-      else if (chan->type == KNX_TEMPERATURE)
-      {
-        knx.answer_2byte_float(msg.received_on, last_temp);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_2byte_float(msg.received_on, last_temp);
-          knx.answer_2byte_float(msg.received_on, last_temp);
-        }
-      }
-      else if (chan->type == KNX_HUMIDITY)
-      {
-        knx.answer_2byte_float(msg.received_on, last_hum);
-        if (Settings.flag.knx_enable_enhancement) {
-          knx.answer_2byte_float(msg.received_on, last_hum);
-          knx.answer_2byte_float(msg.received_on, last_hum);
-        }
-      }
-#ifdef USE_RULES
-      else if ((chan->type >= KNX_SLOT1) && (chan->type <= KNX_SLOT5))
-      {
-        if (!toggle_inhibit) {
-          char command[25];
-          snprintf_P(command, sizeof(command), PSTR("event KNXRX_REQ%d"), ((chan->type) - KNX_SLOT1 + 1 ) );
-          ExecuteCommand(command, SRC_KNX);
-          if (Settings.flag.knx_enable_enhancement) {
-            toggle_inhibit = TOGGLE_INHIBIT_TIME;
-          }
-        }
-      }
-#endif
-      break;
-  }
-}
-
-
-void KnxUpdatePowerState(uint8_t device, power_t state)
-{
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  device_param[device -1].last_state = bitRead(state, device -1);
-
-
-  uint8_t i = KNX_GA_Search(device);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-      knx.write_1bit(KNX_addr, device_param[device -1].last_state);
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-     device_param_ga[device -1], device_param[device -1].last_state,
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(device, i + 1);
-  }
-}
-
-
-void KnxSendButtonPower(void)
-{
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
-  uint32_t device = XdrvMailbox.payload & 0xFF;
-  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
-# 693 "S:/Development/Tasmota/tasmota/xdrv_11_knx.ino"
-  uint8_t i = KNX_GA_Search(device + 8);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_1bit(KNX_addr, !(state == 0));
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_1bit(KNX_addr, !(state == 0));
-      knx.write_1bit(KNX_addr, !(state == 0));
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-     device_param_ga[device + 7], !(state == 0),
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(device + 8, i + 1);
-  }
-
-}
-
-
-void KnxSensor(uint8_t sensor_type, float value)
-{
-  if (sensor_type == KNX_TEMPERATURE)
-  {
-    last_temp = value;
-  } else if (sensor_type == KNX_HUMIDITY)
-  {
-    last_hum = value;
-  }
-
-  if (!(Settings.flag.knx_enabled)) { return; }
-
-  uint8_t i = KNX_GA_Search(sensor_type);
-  while ( i != KNX_Empty ) {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    knx.write_2byte_float(KNX_addr, value);
-    if (Settings.flag.knx_enable_enhancement) {
-      knx.write_2byte_float(KNX_addr, value);
-      knx.write_2byte_float(KNX_addr, value);
-    }
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s " D_SENT_TO " %d.%d.%d "),
-     device_param_ga[sensor_type -1],
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-    i = KNX_GA_Search(sensor_type, i+1);
-  }
-}
-
-
-
-
-
-
-#ifdef USE_WEBSERVER
-#ifdef USE_KNX_WEB_MENU
-const char S_CONFIGURE_KNX[] PROGMEM = D_CONFIGURE_KNX;
-
-const char HTTP_BTN_MENU_KNX[] PROGMEM =
-  "<p><form action='kn' method='get'><button>" D_CONFIGURE_KNX "</button></form></p>";
-
-const char HTTP_FORM_KNX[] PROGMEM =
-  "<fieldset style='min-width:530px;'>"
-  "<legend style='text-align:left;'><b>&nbsp;" D_KNX_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='kn'>"
-  "<br><center>"
-  "<b>" D_KNX_PHYSICAL_ADDRESS " </b>"
-  "<input style='width:12%%;' type='number' name='area' min='0' max='15' value='%d'> . "
-  "<input style='width:12%%;' type='number' name='line' min='0' max='15' value='%d'> . "
-  "<input style='width:12%%;' type='number' name='member' min='0' max='255' value='%d'>"
-  "<br><br>" D_KNX_PHYSICAL_ADDRESS_NOTE "<br><br>"
-  "<input id='b1' type='checkbox'";
-
-const char HTTP_FORM_KNX1[] PROGMEM =
-  "><b>" D_KNX_ENABLE "</b>&emsp;<input id='b2' type='checkbox'";
-
-const char HTTP_FORM_KNX2[] PROGMEM =
-  "><b>" D_KNX_ENHANCEMENT "</b><br></center><br>"
-
-  "<fieldset><center>"
-  "<b>" D_KNX_GROUP_ADDRESS_TO_WRITE "</b><hr>"
-
-  "<select name='GAop' style='width:25%%;'>";
-
-const char HTTP_FORM_KNX_OPT[] PROGMEM =
-  "<option value='%d'>%s</option>";
-
-const char HTTP_FORM_KNX_GA[] PROGMEM =
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='31' value='0'> / "
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='7' value='0'> / "
-  "<input style='width:12%%;' type='number' id='%s' min='0' max='255' value='0'> ";
-
-const char HTTP_FORM_KNX_ADD_BTN[] PROGMEM =
-  "<button type='submit' onclick='%s()' %s name='btn_add' value='%d' style='width:18%%;'>" D_ADD "</button><br><br>"
-  "<table style='width:80%%; font-size: 14px;'><col width='250'><col width='30'>";
-
-const char HTTP_FORM_KNX_ADD_TABLE_ROW[] PROGMEM =
-  "<tr><td><b>%s -> %d / %d / %d </b></td>"
-  "<td><button type='submit' name='btn_del_ga' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
-
-const char HTTP_FORM_KNX3[] PROGMEM =
-  "</table></center></fieldset><br>"
-  "<fieldset><form method='post' action='kn'><center>"
-  "<b>" D_KNX_GROUP_ADDRESS_TO_READ "</b><hr>";
-
-const char HTTP_FORM_KNX4[] PROGMEM =
-  "-> <select name='CBop' style='width:25%%;'>";
-
-const char HTTP_FORM_KNX_ADD_TABLE_ROW2[] PROGMEM =
-  "<tr><td><b>%d / %d / %d -> %s</b></td>"
-  "<td><button type='submit' name='btn_del_cb' value='%d' class='button bred'> " D_DELETE " </button></td></tr>";
-
-void HandleKNXConfiguration(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_KNX);
-
-  char tmp[100];
-  String stmp;
-
-  if ( WebServer->hasArg("save") ) {
-    KNX_Save_Settings();
-    HandleConfiguration();
-  }
-  else
-  {
-    if ( WebServer->hasArg("btn_add") ) {
-      if ( WebServer->arg("btn_add") == "1" ) {
-
-        stmp = WebServer->arg("GAop");
-        uint8_t GAop = stmp.toInt();
-        stmp = WebServer->arg("GA_FNUM");
-        uint8_t GA_FNUM = stmp.toInt();
-        stmp = WebServer->arg("GA_AREA");
-        uint8_t GA_AREA = stmp.toInt();
-        stmp = WebServer->arg("GA_FDEF");
-        uint8_t GA_FDEF = stmp.toInt();
-
-        if (GAop) {
-          KNX_ADD_GA( GAop, GA_FNUM, GA_AREA, GA_FDEF );
-        }
-      }
-      else
-      {
-
-        stmp = WebServer->arg("CBop");
-        uint8_t CBop = stmp.toInt();
-        stmp = WebServer->arg("CB_FNUM");
-        uint8_t CB_FNUM = stmp.toInt();
-        stmp = WebServer->arg("CB_AREA");
-        uint8_t CB_AREA = stmp.toInt();
-        stmp = WebServer->arg("CB_FDEF");
-        uint8_t CB_FDEF = stmp.toInt();
-
-        if (CBop) {
-          KNX_ADD_CB( CBop, CB_FNUM, CB_AREA, CB_FDEF );
-        }
-      }
-    }
-    else if ( WebServer->hasArg("btn_del_ga") )
-    {
-
-      stmp = WebServer->arg("btn_del_ga");
-      uint8_t GA_NUM = stmp.toInt();
-
-      KNX_DEL_GA(GA_NUM);
-
-    }
-    else if ( WebServer->hasArg("btn_del_cb") )
-    {
-
-      stmp = WebServer->arg("btn_del_cb");
-      uint8_t CB_NUM = stmp.toInt();
-
-      KNX_DEL_CB(CB_NUM);
-
-    }
-
-    WSContentStart_P(S_CONFIGURE_KNX);
-    WSContentSend_P(
-      PSTR("function GAwarning()"
-          "{"
-            "var GA_FNUM=eb('GA_FNUM');"
-            "var GA_AREA=eb('GA_AREA');"
-            "var GA_FDEF=eb('GA_FDEF');"
-            "if(GA_FNUM!=null&&GA_FNUM.value=='0'&&GA_AREA.value=='0'&&GA_FDEF.value=='0'){"
-              "alert('" D_KNX_WARNING "');"
-            "}"
-          "}"
-          "function CBwarning()"
-          "{"
-            "var CB_FNUM=eb('CB_FNUM');"
-            "var CB_AREA=eb('CB_AREA');"
-            "var CB_FDEF=eb('CB_FDEF');"
-            "if(CB_FNUM!=null&&CB_FNUM.value=='0'&&CB_AREA.value=='0'&&CB_FDEF.value=='0'){"
-              "alert('" D_KNX_WARNING "');"
-            "}"
-          "}"));
-    WSContentSendStyle();
-    KNX_physs_addr.value = Settings.knx_physsical_addr;
-    WSContentSend_P(HTTP_FORM_KNX, KNX_physs_addr.pa.area, KNX_physs_addr.pa.line, KNX_physs_addr.pa.member);
-    if ( Settings.flag.knx_enabled ) { WSContentSend_P(PSTR(" checked")); }
-    WSContentSend_P(HTTP_FORM_KNX1);
-    if ( Settings.flag.knx_enable_enhancement ) { WSContentSend_P(PSTR(" checked")); }
-
-    WSContentSend_P(HTTP_FORM_KNX2);
-    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
-    {
-      if ( device_param[i].show )
-      {
-        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_ga[i]);
-      }
-    }
-    WSContentSend_P(PSTR("</select> -> "));
-    WSContentSend_P(HTTP_FORM_KNX_GA, "GA_FNUM", "GA_AREA", "GA_FDEF");
-    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "GAwarning", (Settings.knx_GA_registered < MAX_KNX_GA) ? "" : "disabled", 1);
-    for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
-    {
-      if ( Settings.knx_GA_param[i] )
-      {
-        KNX_addr.value = Settings.knx_GA_addr[i];
-        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW, device_param_ga[Settings.knx_GA_param[i]-1], KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, i +1);
-      }
-    }
-
-    WSContentSend_P(HTTP_FORM_KNX3);
-    WSContentSend_P(HTTP_FORM_KNX_GA, "CB_FNUM", "CB_AREA", "CB_FDEF");
-    WSContentSend_P(HTTP_FORM_KNX4);
-
-    uint8_t j;
-    for (uint32_t i = 0; i < KNX_MAX_device_param ; i++)
-    {
-
-      if ( (i > 8) && (i < 16) ) { j=i-8; } else { j=i; }
-      if ( i == 8 ) { j = 0; }
-      if ( device_param[j].show )
-      {
-        WSContentSend_P(HTTP_FORM_KNX_OPT, device_param[i].type, device_param_cb[i]);
-      }
-    }
-    WSContentSend_P(PSTR("</select> "));
-    WSContentSend_P(HTTP_FORM_KNX_ADD_BTN, "CBwarning", (Settings.knx_CB_registered < MAX_KNX_CB) ? "" : "disabled", 2);
-
-    for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
-    {
-      if ( Settings.knx_CB_param[i] )
-      {
-        KNX_addr.value = Settings.knx_CB_addr[i];
-        WSContentSend_P(HTTP_FORM_KNX_ADD_TABLE_ROW2, KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member, device_param_cb[Settings.knx_CB_param[i]-1], i +1);
-      }
-    }
-    WSContentSend_P(PSTR("</table></center></fieldset>"));
-    WSContentSend_P(HTTP_FORM_END);
-    WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentStop();
-  }
-
-}
-
-
-void KNX_Save_Settings(void)
-{
-  String stmp;
-  address_t KNX_addr;
-
-  Settings.flag.knx_enabled = WebServer->hasArg("b1");
-  Settings.flag.knx_enable_enhancement = WebServer->hasArg("b2");
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_ENABLED ": %d, " D_KNX_ENHANCEMENT ": %d"),
-   Settings.flag.knx_enabled, Settings.flag.knx_enable_enhancement );
-
-  stmp = WebServer->arg("area");
-  KNX_addr.pa.area = stmp.toInt();
-  stmp = WebServer->arg("line");
-  KNX_addr.pa.line = stmp.toInt();
-  stmp = WebServer->arg("member");
-  KNX_addr.pa.member = stmp.toInt();
-  Settings.knx_physsical_addr = KNX_addr.value;
-  knx.physical_address_set( KNX_addr );
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX D_KNX_PHYSICAL_ADDRESS ": %d.%d.%d "),
-   KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA: %d"),
-   Settings.knx_GA_registered );
-  for (uint32_t i = 0; i < Settings.knx_GA_registered ; ++i)
-  {
-    KNX_addr.value = Settings.knx_GA_addr[i];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "GA #%d: %s " D_TO " %d/%d/%d"),
-     i+1, device_param_ga[Settings.knx_GA_param[i]-1],
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB: %d"),
-   Settings.knx_CB_registered );
-  for (uint32_t i = 0; i < Settings.knx_CB_registered ; ++i)
-  {
-    KNX_addr.value = Settings.knx_CB_addr[i];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_KNX "CB #%d: %d/%d/%d " D_TO " %s"),
-     i+1,
-     KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member,
-     device_param_cb[Settings.knx_CB_param[i]-1] );
-  }
-}
-
-#endif
-#endif
-
-
-
-
-
-void CmndKnxTxCmnd(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
-
-
-
-    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
-    while ( i != KNX_Empty ) {
-      KNX_addr.value = Settings.knx_GA_addr[i];
-      knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-      if (Settings.flag.knx_enable_enhancement) {
-        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-        knx.write_1bit(KNX_addr, !(XdrvMailbox.payload == 0));
-      }
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %d " D_SENT_TO " %d.%d.%d"),
-       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], !(XdrvMailbox.payload == 0),
-       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
-    }
-    ResponseCmndIdxChar (XdrvMailbox.data );
-  }
-}
-
-void CmndKnxTxVal(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNXTX_CMNDS) && (XdrvMailbox.data_len > 0) && Settings.flag.knx_enabled) {
-
-
-
-    uint8_t i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1);
-    while ( i != KNX_Empty ) {
-      KNX_addr.value = Settings.knx_GA_addr[i];
-
-      float tempvar = CharToFloat(XdrvMailbox.data);
-      dtostrfd(tempvar,2,XdrvMailbox.data);
-
-      knx.write_2byte_float(KNX_addr, tempvar);
-      if (Settings.flag.knx_enable_enhancement) {
-        knx.write_2byte_float(KNX_addr, tempvar);
-        knx.write_2byte_float(KNX_addr, tempvar);
-      }
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_KNX "%s = %s " D_SENT_TO " %d.%d.%d"),
-       device_param_ga[XdrvMailbox.index + KNX_SLOT1 -2], XdrvMailbox.data,
-       KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member);
-
-      i = KNX_GA_Search(XdrvMailbox.index + KNX_SLOT1 -1, i + 1);
-    }
-    ResponseCmndIdxChar (XdrvMailbox.data );
-  }
-}
-
-void CmndKnxEnabled(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    Settings.flag.knx_enabled = XdrvMailbox.payload;
-  }
-  ResponseCmndChar (GetStateText(Settings.flag.knx_enabled) );
-}
-
-void CmndKnxEnhanced(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
-    Settings.flag.knx_enable_enhancement = XdrvMailbox.payload;
-  }
-  ResponseCmndChar (GetStateText(Settings.flag.knx_enable_enhancement) );
-}
-
-void CmndKnxPa(void)
-{
-  if (XdrvMailbox.data_len) {
-    if (strstr(XdrvMailbox.data, ".") != nullptr) {
-      char sub_string[XdrvMailbox.data_len];
-
-      int pa_area = atoi(subStr(sub_string, XdrvMailbox.data, ".", 1));
-      int pa_line = atoi(subStr(sub_string, XdrvMailbox.data, ".", 2));
-      int pa_member = atoi(subStr(sub_string, XdrvMailbox.data, ".", 3));
-
-      if ( ((pa_area == 0) && (pa_line == 0) && (pa_member == 0))
-            || (pa_area > 15) || (pa_line > 15) || (pa_member > 255) ) {
-              Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-              return;
-      }
-
-      KNX_addr.pa.area = pa_area;
-      KNX_addr.pa.line = pa_line;
-      KNX_addr.pa.member = pa_member;
-      Settings.knx_physsical_addr = KNX_addr.value;
-    }
-  }
-  KNX_addr.value = Settings.knx_physsical_addr;
-  Response_P (PSTR("{\"%s\":\"%d.%d.%d\"}"),
-    XdrvMailbox.command, KNX_addr.pa.area, KNX_addr.pa.line, KNX_addr.pa.member );
-}
-
-void CmndKnxGa(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_GA)) {
-    if (XdrvMailbox.data_len) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len];
-
-        int ga_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        int ga_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        int ga_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        int ga_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-
-        if ( ((ga_area == 0) && (ga_line == 0) && (ga_member == 0))
-          || (ga_area > 31) || (ga_line > 7) || (ga_member > 255)
-          || (ga_option < 0) || ((ga_option > KNX_MAX_device_param ) && (ga_option != KNX_Empty))
-          || (!device_param[ga_option-1].show) ) {
-               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-               return;
-        }
-
-        KNX_addr.ga.area = ga_area;
-        KNX_addr.ga.line = ga_line;
-        KNX_addr.ga.member = ga_member;
-
-        if ( XdrvMailbox.index > Settings.knx_GA_registered ) {
-          Settings.knx_GA_registered ++;
-          XdrvMailbox.index = Settings.knx_GA_registered;
-        }
-
-        Settings.knx_GA_addr[XdrvMailbox.index -1] = KNX_addr.value;
-        Settings.knx_GA_param[XdrvMailbox.index -1] = ga_option;
-      } else {
-        if ( (XdrvMailbox.payload <= Settings.knx_GA_registered) && (XdrvMailbox.payload > 0) ) {
-          XdrvMailbox.index = XdrvMailbox.payload;
-        } else {
-          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-          return;
-        }
-      }
-      if ( XdrvMailbox.index <= Settings.knx_GA_registered ) {
-        KNX_addr.value = Settings.knx_GA_addr[XdrvMailbox.index -1];
-        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
-          XdrvMailbox.command, XdrvMailbox.index, device_param_ga[Settings.knx_GA_param[XdrvMailbox.index-1]-1],
-          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-      }
-    } else {
-      ResponseCmndNumber (Settings.knx_GA_registered );
-    }
-  }
-}
-
-void CmndKnxCb(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_KNX_CB)) {
-    if (XdrvMailbox.data_len) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len];
-
-        int cb_option = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-        int cb_area = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-        int cb_line = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        int cb_member = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-
-        if ( ((cb_area == 0) && (cb_line == 0) && (cb_member == 0))
-          || (cb_area > 31) || (cb_line > 7) || (cb_member > 255)
-          || (cb_option < 0) || ((cb_option > KNX_MAX_device_param ) && (cb_option != KNX_Empty))
-          || (!device_param[cb_option-1].show) ) {
-               Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-               return;
-        }
-
-        KNX_addr.ga.area = cb_area;
-        KNX_addr.ga.line = cb_line;
-        KNX_addr.ga.member = cb_member;
-
-        if ( XdrvMailbox.index > Settings.knx_CB_registered ) {
-          Settings.knx_CB_registered ++;
-          XdrvMailbox.index = Settings.knx_CB_registered;
-        }
-
-        Settings.knx_CB_addr[XdrvMailbox.index -1] = KNX_addr.value;
-        Settings.knx_CB_param[XdrvMailbox.index -1] = cb_option;
-      } else {
-        if ( (XdrvMailbox.payload <= Settings.knx_CB_registered) && (XdrvMailbox.payload > 0) ) {
-          XdrvMailbox.index = XdrvMailbox.payload;
-        } else {
-          Response_P (PSTR("{\"%s\":\"" D_ERROR "\"}"), XdrvMailbox.command );
-          return;
-        }
-      }
-      if ( XdrvMailbox.index <= Settings.knx_CB_registered ) {
-        KNX_addr.value = Settings.knx_CB_addr[XdrvMailbox.index -1];
-        Response_P (PSTR("{\"%s%d\":\"%s, %d/%d/%d\"}"),
-          XdrvMailbox.command, XdrvMailbox.index, device_param_cb[Settings.knx_CB_param[XdrvMailbox.index-1]-1],
-          KNX_addr.ga.area, KNX_addr.ga.line, KNX_addr.ga.member );
-      }
-    } else {
-      ResponseCmndNumber (Settings.knx_CB_registered );
-    }
-  }
-}
-
-
-
-
-
-bool Xdrv11(uint8_t function)
-{
-  bool result = false;
-    switch (function) {
-      case FUNC_LOOP:
-        if (!global_state.wifi_down) { knx.loop(); }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (toggle_inhibit) {
-          toggle_inhibit--;
-        }
-        break;
-      case FUNC_ANY_KEY:
-        KnxSendButtonPower();
-        break;
-#ifdef USE_WEBSERVER
-#ifdef USE_KNX_WEB_MENU
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_KNX);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/kn", HandleKNXConfiguration);
-        break;
-#endif
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kKnxCommands, KnxCommand);
-        break;
-      case FUNC_PRE_INIT:
-        KNX_INIT();
-        break;
-
-
-    }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_12_home_assistant.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_12_home_assistant.ino"
-#ifdef USE_HOME_ASSISTANT
-
-#define XDRV_12 12
-
-
-const char kHAssJsonSensorTypes[] PROGMEM =
-  D_JSON_TEMPERATURE "|" D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
-  D_JSON_APPARENT_POWERUSAGE "|Battery|" D_JSON_CURRENT "|" D_JSON_DISTANCE "|" D_JSON_FREQUENCY "|" D_JSON_HUMIDITY "|" D_JSON_ILLUMINANCE "|"
-  D_JSON_MOISTURE "|PB0.3|PB0.5|PB1|PB2.5|PB5|PB10|PM1|PM2.5|PM10|" D_JSON_POWERFACTOR "|" D_JSON_POWERUSAGE "|"
-  D_JSON_REACTIVE_POWERUSAGE "|" D_JSON_TODAY "|" D_JSON_TOTAL "|" D_JSON_VOLTAGE "|" D_JSON_WEIGHT "|" D_JSON_YESTERDAY;
-const char kHAssJsonSensorUnits[] PROGMEM =
-  "|||"
-  "W|%|A|Cm|Hz|%|LX|"
-  "%|ppd|ppd|ppd|ppd|ppd|ppd|µg/m³|µg/m³|µg/m³||W|"
-  "W|KWh|KWh|V|Kg|KWh";
-const char kHAssJsonSensorDevCla[] PROGMEM =
-  "dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
-  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
-  "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
-  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|"
-  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power";
-
-
-const char HASS_DISCOVER_SENSOR[] PROGMEM =
-    ",\"unit_of_meas\":\"%s\",\"%s\","
-    "\"frc_upd\":true,"
-    "\"val_tpl\":\"{{value_json['%s']['%s']";
-
-const char HASS_DISCOVER_BASE[] PROGMEM =
-    "{\"name\":\"%s\","
-    "\"stat_t\":\"%s\","
-    "\"avty_t\":\"%s\","
-    "\"pl_avail\":\"" D_ONLINE "\","
-    "\"pl_not_avail\":\"" D_OFFLINE "\"";
-
-const char HASS_DISCOVER_RELAY[] PROGMEM =
-    ",\"cmd_t\":\"%s\","
-    "\"val_tpl\":\"{{value_json.%s}}\","
-    "\"pl_off\":\"%s\","
-    "\"pl_on\":\"%s\"";
-
-const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
-    ",\"value_template\":\"{%%if is_state(entity_id,\\\"off\\\")-%%}ON{%%-endif%%}\","
-    "\"off_delay\":1";
-
-const char HASS_DISCOVER_BUTTON_SWITCH_ONOFF[] PROGMEM =
-    ",\"value_template\":\"{{value_json.%s}}\","
-    "\"frc_upd\":true,"
-    "\"pl_on\":\"%s\","
-    "\"pl_off\":\"%s\"";
-
-const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
-    ",\"bri_cmd_t\":\"%s\","
-    "\"bri_stat_t\":\"%s\","
-    "\"bri_scl\":100,"
-    "\"on_cmd_type\":\"%s\","
-    "\"bri_val_tpl\":\"{{value_json." D_CMND_DIMMER "}}\"";
-
-const char HASS_DISCOVER_LIGHT_COLOR[] PROGMEM =
-    ",\"rgb_cmd_t\":\"%s2\","
-    "\"rgb_stat_t\":\"%s\","
-    "\"rgb_val_tpl\":\"{{value_json." D_CMND_COLOR ".split(',')[0:3]|join(',')}}\"";
-
-const char HASS_DISCOVER_LIGHT_WHITE[] PROGMEM =
-    ",\"whit_val_cmd_t\":\"%s\","
-    "\"whit_val_stat_t\":\"%s\","
-    "\"white_value_scale\":100,"
-    "\"whit_val_tpl\":\"{{value_json.Channel[3]}}\"";
-
-const char HASS_DISCOVER_LIGHT_CT[] PROGMEM =
-    ",\"clr_temp_cmd_t\":\"%s\","
-    "\"clr_temp_stat_t\":\"%s\","
-    "\"clr_temp_val_tpl\":\"{{value_json." D_CMND_COLORTEMPERATURE "}}\"";
-
-const char HASS_DISCOVER_LIGHT_SCHEME[] PROGMEM =
-    ",\"fx_cmd_t\":\"%s\","
-    "\"fx_stat_t\":\"%s\","
-    "\"fx_val_tpl\":\"{{value_json." D_CMND_SCHEME "}}\","
-    "\"fx_list\":[\"0\",\"1\",\"2\",\"3\",\"4\"]";
-
-const char HASS_DISCOVER_SENSOR_HASS_STATUS[] PROGMEM =
-    ",\"json_attributes_topic\":\"%s\","
-    "\"unit_of_meas\":\" \","
-    "\"val_tpl\":\"{{value_json['" D_JSON_RSSI "']}}\","
-    "\"ic\":\"mdi:information-outline\"";
-
-const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
-    ",\"uniq_id\":\"%s\","
-    "\"device\":{\"identifiers\":[\"%06X\"],"
-    "\"connections\":[[\"mac\",\"%s\"]],"
-    "\"name\":\"%s\","
-    "\"model\":\"%s\","
-    "\"sw_version\":\"%s%s\","
-    "\"manufacturer\":\"Tasmota\"}";
-
-const char HASS_DISCOVER_DEVICE_INFO_SHORT[] PROGMEM =
-    ",\"uniq_id\":\"%s\","
-    "\"device\":{\"identifiers\":[\"%06X\"],"
-    "\"connections\":[[\"mac\",\"%s\"]]}";
-
-uint8_t hass_init_step = 0;
-uint8_t hass_mode = 0;
-int hass_tele_period = 0;
-
-void TryResponseAppend_P(const char *format, ...)
-{
-  va_list args;
-  va_start(args, format);
-  char dummy[2];
-  int dlen = vsnprintf_P(dummy, 1, format, args);
-
-  int mlen = strlen(mqtt_data);
-  int slen = sizeof(mqtt_data) - 1 - mlen;
-  if (dlen >= slen)
-  {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: MQTT discovery failed due to too long topic or friendly name. "
-                                    "Please shorten topic and friendly name. Failed to format(%u/%u):"),
-              dlen, slen);
-    va_start(args, format);
-    vsnprintf_P(log_data, sizeof(log_data), format, args);
-    AddLog(LOG_LEVEL_ERROR);
-  }
-  else
-  {
-    va_start(args, format);
-    vsnprintf_P(mqtt_data + mlen, slen, format, args);
-  }
-  va_end(args);
-}
-
-void HAssAnnounceRelayLight(void)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char stemp3[TOPSZ];
-  char unique_id[30];
-  bool is_light = false;
-  bool is_topic_light = false;
-
-  for (uint32_t i = 1; i <= MAX_RELAYS; i++)
-  {
-    is_light = ((i == devices_present) && (light_type));
-    is_topic_light = Settings.flag.hass_light || is_light;
-
-    mqtt_data[0] = '\0';
-
-
-    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "RL" : "LI", i);
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
-               (is_topic_light) ? "switch" : "light", unique_id);
-    MqttPublish(stopic, true);
-
-    snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), (is_topic_light) ? "LI" : "RL", i);
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/%s/%s/config"),
-               (is_topic_light) ? "light" : "switch", unique_id);
-
-    if (Settings.flag.hass_discovery && (i <= devices_present))
-    {
-      char name[33 + 2];
-      char value_template[33];
-      char prefix[TOPSZ];
-      char *command_topic = stemp1;
-      char *state_topic = stemp2;
-      char *availability_topic = stemp3;
-
-      if (i > MAX_FRIENDLYNAMES)
-      {
-        snprintf_P(name, sizeof(name), PSTR("%s %d"), SettingsText(SET_FRIENDLYNAME1), i);
-      }
-      else
-      {
-        snprintf_P(name, sizeof(name), SettingsText(SET_FRIENDLYNAME1 + i - 1));
-      }
-      GetPowerDevice(value_template, i, sizeof(value_template), Settings.flag.device_index_enable);
-      GetTopic_P(command_topic, CMND, mqtt_topic, value_template);
-      GetTopic_P(state_topic, TELE, mqtt_topic, D_RSLT_STATE);
-      GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-      Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-      TryResponseAppend_P(HASS_DISCOVER_RELAY, command_topic, value_template, SettingsText(SET_STATE_TXT1), SettingsText(SET_STATE_TXT2));
-      TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-#ifdef USE_LIGHT
-      if (is_light)
-      {
-        char *brightness_command_topic = stemp1;
-
-        GetTopic_P(brightness_command_topic, CMND, mqtt_topic, D_CMND_DIMMER);
-        strncpy_P(stemp3, Settings.flag.not_power_linked ? PSTR("last") : PSTR("brightness"), sizeof(stemp3));
-        TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
-
-        if (Light.subtype >= LST_RGB)
-        {
-          char *rgb_command_topic = stemp1;
-
-          GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_COLOR, rgb_command_topic, state_topic);
-
-          char *effect_command_topic = stemp1;
-          GetTopic_P(effect_command_topic, CMND, mqtt_topic, D_CMND_SCHEME);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
-        }
-        if (LST_RGBW == Light.subtype)
-        {
-          char *white_temp_command_topic = stemp1;
-
-          GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
-        }
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype))
-        {
-          char *color_temp_command_topic = stemp1;
-
-          GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);
-          TryResponseAppend_P(HASS_DISCOVER_LIGHT_CT, color_temp_command_topic, state_topic);
-        }
-      }
-#endif
-      TryResponseAppend_P(PSTR("}"));
-    }
-    MqttPublish(stopic, true);
-  }
-}
-
-void HAssAnnounceButtonSwitch(uint8_t device, char *topic, uint8_t present, uint8_t key, uint8_t toggle)
-{
-
-
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-  mqtt_data[0] = '\0';
-
-
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%d"), ESP.getChipId(), key ? "SW" : "BTN", device + 1);
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/binary_sensor/%s/config"), unique_id);
-
-  if (Settings.flag.hass_discovery && present)
-  {
-    char name[33 + 6];
-    char value_template[33];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-    char jsoname[8];
-
-    snprintf_P(name, sizeof(name), PSTR("%s %s%d"), SettingsText(SET_FRIENDLYNAME1), key ? "Switch" : "Button", device + 1);
-    snprintf_P(jsoname, sizeof(jsoname), PSTR("%s%d"), key ? "SWITCH" : "BUTTON", device + 1);
-    GetPowerDevice(value_template, device + 1, sizeof(value_template),
-                   key + Settings.flag.device_index_enable);
-    GetTopic_P(state_topic, STAT, mqtt_topic, (PSTR("/'%s'"), jsoname));
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-    if (toggle) {
-      if (!key) {
-        TryResponseAppend_P(HASS_DISCOVER_BUTTON_TOGGLE);
-      } else {
-        TryResponseAppend_P(",\"value_template\":\"{%%if is_state(entity_id,\\\"on\\\")-%%}OFF{%%-else-%%}ON{%%-endif%%}\"");
-      }
-    } else {
-      TryResponseAppend_P(HASS_DISCOVER_BUTTON_SWITCH_ONOFF, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
-    }
-    TryResponseAppend_P(PSTR("}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssAnnounceSwitches(void)
-{
-  char sw_topic[TOPSZ];
-
-
-  char *tmp = SettingsText(SET_MQTT_SWITCH_TOPIC);
-  Format(sw_topic, tmp, sizeof(sw_topic));
-  if (!strcmp_P(sw_topic, "0") || strlen(sw_topic) == 0)
-  {
-    for (uint32_t switch_index = 0; switch_index < MAX_SWITCHES; switch_index++)
-    {
-      uint8_t switch_present = 0;
-      uint8_t toggle = 1;
-
-      if (pin[GPIO_SWT1 + switch_index] < 99)
-      {
-        switch_present = 1;
-      }
-
-
-      if (Settings.switchmode[switch_index] == FOLLOW || Settings.switchmode[switch_index] == FOLLOW_INV ||
-          Settings.flag3.button_switch_force_local ||
-          !strcmp(mqtt_topic, sw_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), sw_topic))
-      {
-        toggle = 0;
-      }
-      HAssAnnounceButtonSwitch(switch_index, sw_topic, switch_present, 1, toggle);
-    }
-  }
-}
-
-void HAssAnnounceButtons(void)
-{
-  char key_topic[TOPSZ];
-
-
-  char *tmp = SettingsText(SET_MQTT_BUTTON_TOPIC);
-  Format(key_topic, tmp, sizeof(key_topic));
-  if (!strcmp_P(key_topic, "0") || strlen(key_topic) == 0)
-  {
-    for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++)
-    {
-      uint8_t button_present = 0;
-      uint8_t toggle = 1;
-
-      if (!button_index && ((SONOFF_DUAL == my_module_type) || (CH4 == my_module_type)))
-      {
-        button_present = 1;
-      }
-      else
-      {
-        if (pin[GPIO_KEY1 + button_index] < 99)
-        {
-          button_present = 1;
-        }
-      }
-
-
-      if (Settings.flag3.button_switch_force_local ||
-          !strcmp(mqtt_topic, key_topic) || !strcmp(SettingsText(SET_MQTT_GRP_TOPIC), key_topic))
-      {
-        toggle = 0;
-      }
-      HAssAnnounceButtonSwitch(button_index, key_topic, button_present, 0, toggle);
-    }
-  }
-}
-
-void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const char *MultiSubName, uint8_t subqty, uint8_t subidx)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-  mqtt_data[0] = '\0';
-
-  char subname[20];
-  NoAlNumToUnderscore(subname, MultiSubName);
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);;
-
-  if (Settings.flag.hass_discovery)
-  {
-    char name[33 + 42];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-
-    snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_SENSOR));
-    snprintf_P(name, sizeof(name), PSTR("%s %s %s"), SettingsText(SET_FRIENDLYNAME1), sensorname, MultiSubName);
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId(), WiFi.macAddress().c_str());
-
-    char jname[32];
-    int sensor_index = GetCommandCode(jname, sizeof(jname), subsensortype, kHAssJsonSensorTypes);
-    if (sensor_index > -1) {
-      char param1[20];
-      GetTextIndexed(param1, sizeof(param1), sensor_index, kHAssJsonSensorUnits);
-      switch (sensor_index) {
-        case 0:
-          snprintf_P(param1, sizeof(param1), PSTR("°%c"),TempUnit());
-          break;
-        case 1:
-        case 2:
-          snprintf_P(param1, sizeof(param1), PSTR("%s"), PressureUnit().c_str());
-          break;
-      }
-      char param2[50];
-      GetTextIndexed(param2, sizeof(param2), sensor_index, kHAssJsonSensorDevCla);
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR, param1, param2, sensorname, subsensortype);
-      if (subidx) {
-        TryResponseAppend_P(PSTR("[%d]"), subqty -1);
-      }
-    } else {
-      TryResponseAppend_P(HASS_DISCOVER_SENSOR, " ", "ic\":\"mdi:eye", sensorname, subsensortype);
-    }
-    TryResponseAppend_P(PSTR("}}\"}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssAnnounceSensors(void)
-{
-  uint8_t hass_xsns_index = 0;
-  bool is_sensor = true;
-  uint8_t subqty = 0;
-  do
-  {
-    mqtt_data[0] = '\0';
-    int tele_period_save = tele_period;
-    tele_period = 2;
-    XsnsNextCall(FUNC_JSON_APPEND, hass_xsns_index);
-    tele_period = tele_period_save;
-
-    char sensordata[512];
-    strlcpy(sensordata, mqtt_data, sizeof(sensordata));
-
-    if (strlen(sensordata))
-    {
-      sensordata[0] = '{';
-      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);
-
-
-
-      StaticJsonBuffer<500> jsonBuffer;
-      JsonObject &root = jsonBuffer.parseObject(sensordata);
-      if (!root.success())
-      {
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: jsonBuffer failed to parse '%s'"), sensordata);
-        continue;
-      }
-      for (auto sensor : root)
-      {
-        const char *sensorname = sensor.key;
-        JsonObject &sensors = sensor.value.as<JsonObject>();
-        if (!sensors.success())
-        {
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("HASS: JsonObject failed to parse '%s'"), sensordata);
-          continue;
-        }
-        for (auto subsensor : sensors)
-        {
-
-          if (subsensor.value.is<JsonArray&>()) {
-            JsonArray& subsensors = subsensor.value.as<JsonArray&>();
-            subqty = subsensors.size();
-            char MultiSubName[20];
-            for (int i = 1; i <= subqty; i++) {
-              snprintf_P(MultiSubName, sizeof(MultiSubName), PSTR("%s %d"), subsensor.key, i);
-              HAssAnnounceSensor(sensorname, subsensor.key, MultiSubName, i, 1);
-            }
-          } else { HAssAnnounceSensor(sensorname, subsensor.key, subsensor.key, 0, 0);}
-        }
-      }
-    }
-    yield();
-  } while (hass_xsns_index != 0);
-}
-
-void HAssAnnounceStatusSensor(void)
-{
-  char stopic[TOPSZ];
-  char stemp1[TOPSZ];
-  char stemp2[TOPSZ];
-  char unique_id[30];
-
-
-  mqtt_data[0] = '\0';
-
-
-  snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_status"), ESP.getChipId());
-  snprintf_P(stopic, sizeof(stopic), PSTR(HOME_ASSISTANT_DISCOVERY_PREFIX "/sensor/%s/config"), unique_id);
-
-  if (Settings.flag.hass_discovery)
-  {
-    char name[33 + 7];
-    char prefix[TOPSZ];
-    char *state_topic = stemp1;
-    char *availability_topic = stemp2;
-
-    snprintf_P(name, sizeof(name), PSTR("%s status"), SettingsText(SET_FRIENDLYNAME1));
-    GetTopic_P(state_topic, TELE, mqtt_topic, PSTR(D_RSLT_HASS_STATE));
-    GetTopic_P(availability_topic, TELE, mqtt_topic, S_LWT);
-
-    Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
-    TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
-    TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
-                        SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
-
-    TryResponseAppend_P(PSTR("}"));
-  }
-  MqttPublish(stopic, true);
-}
-
-void HAssPublishStatus(void)
-{
-  Response_P(PSTR("{\"" D_JSON_VERSION "\":\"%s%s\",\"" D_JSON_BUILDDATETIME "\":\"%s\","
-                  "\"" D_JSON_COREVERSION "\":\"" ARDUINO_ESP8266_RELEASE "\",\"" D_JSON_SDKVERSION "\":\"%s\","
-                  "\"" D_CMND_MODULE "\":\"%s\",\"" D_JSON_RESTARTREASON "\":\"%s\",\"" D_JSON_UPTIME "\":\"%s\","
-                  "\"WiFi " D_JSON_LINK_COUNT "\":%d,\"WiFi " D_JSON_DOWNTIME "\":\"%s\",\"" D_JSON_MQTT_COUNT "\":%d,"
-                  "\"" D_JSON_BOOTCOUNT "\":%d,\"" D_JSON_SAVECOUNT "\":%d,\"" D_CMND_IPADDRESS "\":\"%s\","
-                  "\"" D_JSON_RSSI "\":\"%d\",\"LoadAvg\":%lu}"),
-             my_version, my_image, GetBuildDateAndTime().c_str(), ESP.getSdkVersion(), ModuleName().c_str(),
-             GetResetReason().c_str(), GetUptime().c_str(), WifiLinkCount(), WifiDowntime().c_str(), MqttConnectCount(),
-             Settings.bootcount, Settings.save_flag, WiFi.localIP().toString().c_str(),
-             WifiGetRssiAsQuality(WiFi.RSSI()), loop_load_avg);
-  MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_HASS_STATE));
-}
-
-void HAssDiscovery(void)
-{
-
-  if (Settings.flag.hass_discovery)
-  {
-    Settings.flag.mqtt_response = 0;
-    Settings.flag.decimal_text = 1;
-    Settings.flag3.hass_tele_on_power = 1;
-    Settings.light_scheme = 0;
-  }
-
-  if (Settings.flag.hass_discovery || (1 == hass_mode))
-  {
-
-    HAssAnnounceRelayLight();
-
-
-    HAssAnnounceButtons();
-
-
-    HAssAnnounceSwitches();
-
-
-    HAssAnnounceSensors();
-
-
-    HAssAnnounceStatusSensor();
-  }
-}
-
-void HAssDiscover(void)
-{
-  hass_mode = 1;
-  hass_init_step = 1;
-}
-
-void HAssAnyKey(void)
-{
-  if (!Settings.flag.hass_discovery)
-  {
-    return;
-  }
-
-  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
-  uint32_t device = XdrvMailbox.payload & 0xFF;
-  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
-
-  char scommand[CMDSZ];
-  snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);
-  char stopic[TOPSZ];
-
-  GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-  Response_P(S_JSON_COMMAND_SVALUE, PSTR(D_RSLT_STATE), GetStateText(state));
-  MqttPublish(stopic);
-}
-
-
-
-
-
-bool Xdrv12(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag.mqtt_enabled)
-  {
-    switch (function)
-    {
-    case FUNC_EVERY_SECOND:
-      if (hass_init_step)
-      {
-        hass_init_step--;
-        if (!hass_init_step)
-        {
-          HAssDiscovery();
-        }
-      }
-      else if (Settings.flag.hass_discovery && Settings.tele_period)
-      {
-        hass_tele_period++;
-        if (hass_tele_period >= Settings.tele_period)
-        {
-          hass_tele_period = 0;
-
-          mqtt_data[0] = '\0';
-          HAssPublishStatus();
-        }
-      }
-      break;
-    case FUNC_ANY_KEY:
-      HAssAnyKey();
-      break;
-    case FUNC_MQTT_INIT:
-      hass_mode = 0;
-      hass_init_step = 2;
-      break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
-#if defined(USE_I2C) || defined(USE_SPI)
-#ifdef USE_DISPLAY
-
-#define XDRV_13 13
-
-#include <renderer.h>
-#include <FT6236.h>
-
-Renderer *renderer;
-
-enum ColorType { COLOR_BW, COLOR_COLOR };
-
-#ifndef MAXBUTTONS
-#define MAXBUTTONS 16
-#endif
-
-#ifdef USE_TOUCH_BUTTONS
-VButton *buttons[MAXBUTTONS];
-#endif
-
-
-
-uint16_t fg_color = 1;
-uint16_t bg_color = 0;
-uint8_t color_type = COLOR_BW;
-uint8_t auto_draw=1;
-
-const uint8_t DISPLAY_MAX_DRIVERS = 16;
-const uint8_t DISPLAY_MAX_COLS = 44;
-const uint8_t DISPLAY_MAX_ROWS = 32;
-
-const uint8_t DISPLAY_LOG_ROWS = 32;
-
-#define D_PRFX_DISPLAY "Display"
-#define D_CMND_DISP_ADDRESS "Address"
-#define D_CMND_DISP_COLS "Cols"
-#define D_CMND_DISP_DIMMER "Dimmer"
-#define D_CMND_DISP_MODE "Mode"
-#define D_CMND_DISP_MODEL "Model"
-#define D_CMND_DISP_REFRESH "Refresh"
-#define D_CMND_DISP_ROWS "Rows"
-#define D_CMND_DISP_SIZE "Size"
-#define D_CMND_DISP_FONT "Font"
-#define D_CMND_DISP_ROTATE "Rotate"
-#define D_CMND_DISP_TEXT "Text"
-#define D_CMND_DISP_WIDTH "Width"
-#define D_CMND_DISP_HEIGHT "Height"
-
-enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_EVERY_50_MSECOND, FUNC_DISPLAY_EVERY_SECOND,
-                     FUNC_DISPLAY_MODEL, FUNC_DISPLAY_MODE, FUNC_DISPLAY_POWER,
-                     FUNC_DISPLAY_CLEAR, FUNC_DISPLAY_DRAW_FRAME,
-                     FUNC_DISPLAY_DRAW_HLINE, FUNC_DISPLAY_DRAW_VLINE, FUNC_DISPLAY_DRAW_LINE,
-                     FUNC_DISPLAY_DRAW_CIRCLE, FUNC_DISPLAY_FILL_CIRCLE,
-                     FUNC_DISPLAY_DRAW_RECTANGLE, FUNC_DISPLAY_FILL_RECTANGLE,
-                     FUNC_DISPLAY_TEXT_SIZE, FUNC_DISPLAY_FONT_SIZE, FUNC_DISPLAY_ROTATION, FUNC_DISPLAY_DRAW_STRING, FUNC_DISPLAY_ONOFF };
-
-enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
-
-const char kDisplayCommands[] PROGMEM = D_PRFX_DISPLAY "|"
-  "|" D_CMND_DISP_MODEL "|" D_CMND_DISP_WIDTH "|" D_CMND_DISP_HEIGHT "|" D_CMND_DISP_MODE "|" D_CMND_DISP_REFRESH "|"
-  D_CMND_DISP_DIMMER "|" D_CMND_DISP_COLS "|" D_CMND_DISP_ROWS "|" D_CMND_DISP_SIZE "|" D_CMND_DISP_FONT "|"
-  D_CMND_DISP_ROTATE "|" D_CMND_DISP_TEXT "|" D_CMND_DISP_ADDRESS ;
-
-void (* const DisplayCommand[])(void) PROGMEM = {
-  &CmndDisplay, &CmndDisplayModel, &CmndDisplayWidth, &CmndDisplayHeight, &CmndDisplayMode, &CmndDisplayRefresh,
-  &CmndDisplayDimmer, &CmndDisplayColumns, &CmndDisplayRows, &CmndDisplaySize, &CmndDisplayFont,
-  &CmndDisplayRotate, &CmndDisplayText, &CmndDisplayAddress };
-
-char *dsp_str;
-
-uint16_t dsp_x;
-uint16_t dsp_y;
-uint16_t dsp_x2;
-uint16_t dsp_y2;
-uint16_t dsp_rad;
-uint16_t dsp_color;
-int16_t dsp_len;
-int16_t disp_xpos = 0;
-int16_t disp_ypos = 0;
-
-uint8_t disp_power = 0;
-uint8_t disp_device = 0;
-uint8_t disp_refresh = 1;
-uint8_t disp_autodraw = 1;
-uint8_t dsp_init;
-uint8_t dsp_font;
-uint8_t dsp_flag;
-uint8_t dsp_on;
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-char **disp_log_buffer;
-char **disp_screen_buffer;
-char disp_temp[2];
-char disp_pres[5];
-
-uint8_t disp_log_buffer_cols = 0;
-uint8_t disp_log_buffer_idx = 0;
-uint8_t disp_log_buffer_ptr = 0;
-uint8_t disp_screen_buffer_cols = 0;
-uint8_t disp_screen_buffer_rows = 0;
-bool disp_subscribed = false;
-
-#endif
-
-
-
-void DisplayInit(uint8_t mode)
-{
-  if (renderer) {
-    renderer->DisplayInit(mode, Settings.display_size, Settings.display_rotate, Settings.display_font);
-  }
-  else {
-    dsp_init = mode;
-    XdspCall(FUNC_DISPLAY_INIT);
-  }
-}
-
-void DisplayClear(void)
-{
-  XdspCall(FUNC_DISPLAY_CLEAR);
-}
-
-void DisplayDrawHLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_len = len;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_HLINE);
-}
-
-void DisplayDrawVLine(uint16_t x, uint16_t y, int16_t len, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_len = len;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_VLINE);
-}
-
-void DisplayDrawLine(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_LINE);
-}
-
-void DisplayDrawCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_rad = rad;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_CIRCLE);
-}
-
-void DisplayDrawFilledCircle(uint16_t x, uint16_t y, uint16_t rad, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_rad = rad;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_FILL_CIRCLE);
-}
-
-void DisplayDrawRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_DRAW_RECTANGLE);
-}
-
-void DisplayDrawFilledRectangle(uint16_t x, uint16_t y, uint16_t x2, uint16_t y2, uint16_t color)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_x2 = x2;
-  dsp_y2 = y2;
-  dsp_color = color;
-  XdspCall(FUNC_DISPLAY_FILL_RECTANGLE);
-}
-
-void DisplayDrawFrame(void)
-{
-  XdspCall(FUNC_DISPLAY_DRAW_FRAME);
-}
-
-void DisplaySetSize(uint8_t size)
-{
-  Settings.display_size = size &3;
-  XdspCall(FUNC_DISPLAY_TEXT_SIZE);
-}
-
-void DisplaySetFont(uint8_t font)
-{
-  Settings.display_font = font &3;
-  XdspCall(FUNC_DISPLAY_FONT_SIZE);
-}
-
-void DisplaySetRotation(uint8_t rotation)
-{
-  Settings.display_rotate = rotation &3;
-  XdspCall(FUNC_DISPLAY_ROTATION);
-}
-
-void DisplayDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  dsp_x = x;
-  dsp_y = y;
-  dsp_str = str;
-  dsp_color = color;
-  dsp_flag = flag;
-  XdspCall(FUNC_DISPLAY_DRAW_STRING);
-}
-
-void DisplayOnOff(uint8_t on)
-{
-  dsp_on = on;
-  XdspCall(FUNC_DISPLAY_ONOFF);
-}
-
-
-
-
-uint8_t fatoiv(char *cp,float *res) {
-  uint8_t index=0;
-  *res=CharToFloat(cp);
-  while (*cp) {
-    if ((*cp>='0' && *cp<='9') || (*cp=='-') || (*cp=='.')) {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-uint8_t atoiv(char *cp, int16_t *res)
-{
-  uint8_t index = 0;
-  *res = atoi(cp);
-  while (*cp) {
-    if ((*cp>='0' && *cp<='9') || (*cp=='-')) {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-uint8_t atoiV(char *cp, uint16_t *res)
-{
-  uint8_t index = 0;
-  *res = atoi(cp);
-  while (*cp) {
-    if (*cp>='0' && *cp<='9') {
-      cp++;
-      index++;
-    } else {
-      break;
-    }
-  }
-  return index;
-}
-
-
-void alignright(char *string) {
-  uint16_t slen=strlen(string);
-  uint16_t len=slen;
-  while (len) {
-
-    if (string[len-1]!=' ') {
-      break;
-    }
-    len--;
-  }
-  uint16_t diff=slen-len;
-  if (diff>0) {
-
-    memmove(&string[diff],string,len);
-    memset(string,' ',diff);
-  }
-}
-
-char *get_string(char *buff,uint8_t len,char *cp) {
-uint8_t index=0;
-  while (*cp!=':') {
-    buff[index]=*cp++;
-    index++;
-    if (index>=len) break;
-  }
-  buff[index]=0;
-  cp++;
-  return cp;
-}
-
-#define ESCAPE_CHAR '~'
-
-
-uint32_t decode_te(char *line) {
-  uint32_t skip = 0;
-  char sbuf[3],*cp;
-  while (*line) {
-    if (*line==ESCAPE_CHAR) {
-      cp=line+1;
-      if (*cp!=0 && *cp==ESCAPE_CHAR) {
-
-        memmove(cp,cp+1,strlen(cp));
-        skip++;
-      } else {
-
-        if (strlen(cp)<2) {
-
-          return skip;
-        }
-
-        sbuf[0]=*(cp);
-        sbuf[1]=*(cp+1);
-        sbuf[2]=0;
-        *line=strtol(sbuf,0,16);
-
-        memmove(cp,cp+2,strlen(cp)-1);
-        skip += 2;
-      }
-    }
-    line++;
-  }
-  return skip;
-}
-
-
-
-#define DISPLAY_BUFFER_COLS 128
-
-void DisplayText(void)
-{
-  uint8_t lpos;
-  uint8_t escape = 0;
-  uint8_t var;
-  int16_t lin = 0;
-  int16_t col = 0;
-  int16_t fill = 0;
-  int16_t temp;
-  int16_t temp1;
-  float ftemp;
-
-  char linebuf[DISPLAY_BUFFER_COLS];
-  char *dp = linebuf;
-  char *cp = XdrvMailbox.data;
-
-  memset(linebuf, ' ', sizeof(linebuf));
-  linebuf[sizeof(linebuf)-1] = 0;
-  *dp = 0;
-
-  while (*cp) {
-    if (!escape) {
-
-      if (*cp == '[') {
-        escape = 1;
-        cp++;
-
-        if ((uint32_t)dp - (uint32_t)linebuf) {
-          if (!fill) { *dp = 0; }
-          if (col > 0 && lin > 0) {
-
-            if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
-            else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
-          } else {
-
-            if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-            else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-          }
-          memset(linebuf, ' ', sizeof(linebuf));
-          linebuf[sizeof(linebuf)-1] = 0;
-          dp = linebuf;
-        }
-      } else {
-
-        if (dp < (linebuf + DISPLAY_BUFFER_COLS)) { *dp++ = *cp++; }
-      }
-    } else {
-
-      if (*cp == ']') {
-        escape = 0;
-        cp++;
-      } else {
-
-        switch (*cp++) {
-          case 'z':
-
-            if (!renderer) DisplayClear();
-            else renderer->fillScreen(bg_color);
-            disp_xpos = 0;
-            disp_ypos = 0;
-            col = 0;
-            lin = 0;
-            break;
-          case 'i':
-
-            DisplayInit(DISPLAY_INIT_PARTIAL);
-            break;
-          case 'I':
-
-            DisplayInit(DISPLAY_INIT_FULL);
-            break;
-          case 'o':
-            if (!renderer) {
-              DisplayOnOff(0);
-            } else {
-              renderer->DisplayOnff(0);
-            }
-            break;
-          case 'O':
-            if (!renderer) {
-              DisplayOnOff(1);
-            } else {
-              renderer->DisplayOnff(1);
-            }
-            break;
-          case 'x':
-
-            var = atoiv(cp, &disp_xpos);
-            cp += var;
-            break;
-          case 'y':
-
-            var = atoiv(cp, &disp_ypos);
-            cp += var;
-            break;
-          case 'l':
-
-            var = atoiv(cp, &lin);
-            cp += var;
-
-            break;
-          case 'c':
-
-            var = atoiv(cp, &col);
-            cp += var;
-
-            break;
-          case 'C':
-
-            if (*cp=='i') {
-
-              cp++;
-              var = atoiv(cp, &temp);
-              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
-            } else {
-
-              var = fatoiv(cp,&ftemp);
-            }
-            fg_color=ftemp;
-            cp += var;
-            if (renderer) renderer->setTextColor(fg_color,bg_color);
-            break;
-          case 'B':
-
-            if (*cp=='i') {
-
-              cp++;
-              var = atoiv(cp, &temp);
-              if (renderer) ftemp=renderer->GetColorFromIndex(temp);
-            } else {
-              var = fatoiv(cp,&ftemp);
-            }
-            bg_color=ftemp;
-            cp += var;
-            if (renderer) renderer->setTextColor(fg_color,bg_color);
-            break;
-          case 'p':
-
-            var = atoiv(cp, &fill);
-            cp += var;
-            linebuf[fill] = 0;
-            break;
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-          case 'P':
-            { char *ep=strchr(cp,':');
-             if (ep) {
-               *ep=0;
-               ep++;
-               Draw_RGB_Bitmap(cp,disp_xpos,disp_ypos);
-               cp=ep;
-             }
-            }
-            break;
-#endif
-          case 'h':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (temp < 0) {
-              if (renderer) renderer->writeFastHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
-              else DisplayDrawHLine(disp_xpos + temp, disp_ypos, -temp, fg_color);
-            } else {
-              if (renderer) renderer->writeFastHLine(disp_xpos, disp_ypos, temp, fg_color);
-              else DisplayDrawHLine(disp_xpos, disp_ypos, temp, fg_color);
-            }
-            disp_xpos += temp;
-            break;
-          case 'v':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (temp < 0) {
-              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
-              else DisplayDrawVLine(disp_xpos, disp_ypos + temp, -temp, fg_color);
-            } else {
-              if (renderer) renderer->writeFastVLine(disp_xpos, disp_ypos, temp, fg_color);
-              else DisplayDrawVLine(disp_xpos, disp_ypos, temp, fg_color);
-            }
-            disp_ypos += temp;
-            break;
-          case 'L':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->writeLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawLine(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            disp_xpos += temp;
-            disp_ypos += temp1;
-            break;
-          case 'k':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (renderer) renderer->drawCircle(disp_xpos, disp_ypos, temp, fg_color);
-            else DisplayDrawCircle(disp_xpos, disp_ypos, temp, fg_color);
-            break;
-          case 'K':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            if (renderer) renderer->fillCircle(disp_xpos, disp_ypos, temp, fg_color);
-            else DisplayDrawFilledCircle(disp_xpos, disp_ypos, temp, fg_color);
-            break;
-          case 'r':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->drawRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            break;
-          case 'R':
-
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            if (renderer) renderer->fillRect(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            else DisplayDrawFilledRectangle(disp_xpos, disp_ypos, temp, temp1, fg_color);
-            break;
-          case 'u':
-
-            { int16_t rad;
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &rad);
-            cp += var;
-            if (renderer) renderer->drawRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
-
-            }
-            break;
-          case 'U':
-
-            { int16_t rad;
-            var = atoiv(cp, &temp);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &temp1);
-            cp += var;
-            cp++;
-            var = atoiv(cp, &rad);
-            cp += var;
-            if (renderer) renderer->fillRoundRect(disp_xpos, disp_ypos, temp, temp1, rad, fg_color);
-
-            }
-            break;
-
-          case 't':
-            if (*cp=='S') {
-              cp++;
-              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
-                snprintf_P(dp, 9, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-                dp += 8;
-              }
-            } else {
-              if (dp < (linebuf + DISPLAY_BUFFER_COLS) -5) {
-                snprintf_P(dp, 6, PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute);
-                dp += 5;
-              }
-            }
-            break;
-          case 'T':
-            if (dp < (linebuf + DISPLAY_BUFFER_COLS) -8) {
-              snprintf_P(dp, 9, PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year%2000);
-              dp += 8;
-            }
-            break;
-          case 'd':
-
-            if (renderer) renderer->Updateframe();
-            else DisplayDrawFrame();
-            break;
-          case 'D':
-
-            auto_draw=*cp&3;
-            if (renderer) renderer->setDrawMode(auto_draw>>1);
-            cp += 1;
-            break;
-          case 's':
-
-            if (renderer) renderer->setTextSize(*cp&7);
-            else DisplaySetSize(*cp&3);
-            cp += 1;
-            break;
-          case 'f':
-
-            if (renderer) renderer->setTextFont(*cp&7);
-            else DisplaySetFont(*cp&7);
-            cp += 1;
-            break;
-          case 'a':
-
-            if (renderer) renderer->setRotation(*cp&3);
-            else DisplaySetRotation(*cp&3);
-            cp+=1;
-            break;
-
-#ifdef USE_GRAPH
-          case 'G':
-
-            if (*cp=='d') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&temp1);
-              cp+=var;
-              RedrawGraph(temp,temp1);
-              break;
-            }
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-            if (*cp=='s') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-
-              char bbuff[128];
-              cp=get_string(bbuff,sizeof(bbuff),cp);
-              Save_graph(temp,bbuff);
-              break;
-            }
-            if (*cp=='r') {
-              cp++;
-              var=atoiv(cp,&temp);
-              cp+=var;
-              cp++;
-
-              char bbuff[128];
-              cp=get_string(bbuff,sizeof(bbuff),cp);
-              Restore_graph(temp,bbuff);
-              break;
-            }
-#endif
-            { int16_t num,gxp,gyp,gxs,gys,dec,icol;
-              float ymin,ymax;
-              var=atoiv(cp,&num);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gxp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gyp);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gxs);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&gys);
-              cp+=var;
-              cp++;
-              var=atoiv(cp,&dec);
-              cp+=var;
-              cp++;
-              var=fatoiv(cp,&ymin);
-              cp+=var;
-              cp++;
-              var=fatoiv(cp,&ymax);
-              cp+=var;
-              if (color_type==COLOR_COLOR) {
-
-                cp++;
-                var=atoiv(cp,&icol);
-                cp+=var;
-              } else {
-                icol=0;
-              }
-              DefineGraph(num,gxp,gyp,gxs,gys,dec,ymin,ymax,icol);
-            }
-            break;
-          case 'g':
-              { float temp;
-                int16_t num;
-                var=atoiv(cp,&num);
-                cp+=var;
-                cp++;
-                var=fatoiv(cp,&temp);
-                cp+=var;
-                AddValue(num,temp);
-              }
-            break;
-#endif
-
-#ifdef USE_AWATCH
-          case 'w':
-              var = atoiv(cp, &temp);
-              cp += var;
-              DrawAClock(temp);
-              break;
-#endif
-
-#ifdef USE_TOUCH_BUTTONS
-          case 'b':
-          { int16_t num,gxp,gyp,gxs,gys,outline,fill,textcolor,textsize;
-            var=atoiv(cp,&num);
-            cp+=var;
-            cp++;
-            uint8_t bflags=num>>8;
-            num=num%MAXBUTTONS;
-            var=atoiv(cp,&gxp);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gyp);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gxs);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&gys);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&outline);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&fill);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&textcolor);
-            cp+=var;
-            cp++;
-            var=atoiv(cp,&textsize);
-            cp+=var;
-            cp++;
-
-            char bbuff[32];
-            cp=get_string(bbuff,sizeof(bbuff),cp);
-
-            if (buttons[num]) {
-              delete buttons[num];
-            }
-            if (renderer) {
-              buttons[num]= new VButton();
-              if (buttons[num]) {
-                buttons[num]->vpower=bflags;
-                buttons[num]->initButtonUL(renderer,gxp,gyp,gxs,gys,renderer->GetColorFromIndex(outline),\
-                renderer->GetColorFromIndex(fill),renderer->GetColorFromIndex(textcolor),bbuff,textsize);
-                if (!bflags) {
-
-                  buttons[num]->xdrawButton(bitRead(power,num));
-                } else {
-
-                  buttons[num]->vpower&=0x7f;
-                  buttons[num]->xdrawButton(buttons[num]->vpower&0x80);
-                }
-              }
-            }
-          }
-          break;
-#endif
-          default:
-
-            Response_P(PSTR("Unknown Escape"));
-            goto exit;
-            break;
-        }
-      }
-    }
-  }
-  exit:
-
-    dp -= decode_te(linebuf);
-    if ((uint32_t)dp - (uint32_t)linebuf) {
-      if (!fill) {
-        *dp = 0;
-      } else {
-        linebuf[abs(fill)] = 0;
-      }
-      if (fill<0) {
-
-        alignright(linebuf);
-      }
-      if (col > 0 && lin > 0) {
-
-        if (!renderer) DisplayDrawStringAt(col, lin, linebuf, fg_color, 1);
-        else renderer->DrawStringAt(col, lin, linebuf, fg_color, 1);
-      } else {
-
-        if (!renderer) DisplayDrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-        else renderer->DrawStringAt(disp_xpos, disp_ypos, linebuf, fg_color, 0);
-      }
-    }
-
-    if (auto_draw&1) {
-      if (renderer) renderer->Updateframe();
-      else DisplayDrawFrame();
-    }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void DisplayClearScreenBuffer(void)
-{
-  if (disp_screen_buffer_cols) {
-    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-      memset(disp_screen_buffer[i], 0, disp_screen_buffer_cols);
-    }
-  }
-}
-
-void DisplayFreeScreenBuffer(void)
-{
-  if (disp_screen_buffer != nullptr) {
-    for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-      if (disp_screen_buffer[i] != nullptr) { free(disp_screen_buffer[i]); }
-    }
-    free(disp_screen_buffer);
-    disp_screen_buffer_cols = 0;
-    disp_screen_buffer_rows = 0;
-  }
-}
-
-void DisplayAllocScreenBuffer(void)
-{
-  if (!disp_screen_buffer_cols) {
-    disp_screen_buffer_rows = Settings.display_rows;
-    disp_screen_buffer = (char**)malloc(sizeof(*disp_screen_buffer) * disp_screen_buffer_rows);
-    if (disp_screen_buffer != nullptr) {
-      for (uint32_t i = 0; i < disp_screen_buffer_rows; i++) {
-        disp_screen_buffer[i] = (char*)malloc(sizeof(*disp_screen_buffer[i]) * (Settings.display_cols[0] +1));
-        if (disp_screen_buffer[i] == nullptr) {
-          DisplayFreeScreenBuffer();
-          break;
-        }
-      }
-    }
-    if (disp_screen_buffer != nullptr) {
-      disp_screen_buffer_cols = Settings.display_cols[0] +1;
-      DisplayClearScreenBuffer();
-    }
-  }
-}
-
-void DisplayReAllocScreenBuffer(void)
-{
-  DisplayFreeScreenBuffer();
-  DisplayAllocScreenBuffer();
-}
-
-void DisplayFillScreen(uint32_t line)
-{
-  uint32_t len = disp_screen_buffer_cols - strlen(disp_screen_buffer[line]);
-  if (len) {
-    memset(disp_screen_buffer[line] + strlen(disp_screen_buffer[line]), 0x20, len);
-    disp_screen_buffer[line][disp_screen_buffer_cols -1] = 0;
-  }
-}
-
-
-
-void DisplayClearLogBuffer(void)
-{
-  if (disp_log_buffer_cols) {
-    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-      memset(disp_log_buffer[i], 0, disp_log_buffer_cols);
-    }
-  }
-}
-
-void DisplayFreeLogBuffer(void)
-{
-  if (disp_log_buffer != nullptr) {
-    for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-      if (disp_log_buffer[i] != nullptr) { free(disp_log_buffer[i]); }
-    }
-    free(disp_log_buffer);
-    disp_log_buffer_cols = 0;
-  }
-}
-
-void DisplayAllocLogBuffer(void)
-{
-  if (!disp_log_buffer_cols) {
-    disp_log_buffer = (char**)malloc(sizeof(*disp_log_buffer) * DISPLAY_LOG_ROWS);
-    if (disp_log_buffer != nullptr) {
-      for (uint32_t i = 0; i < DISPLAY_LOG_ROWS; i++) {
-        disp_log_buffer[i] = (char*)malloc(sizeof(*disp_log_buffer[i]) * (Settings.display_cols[0] +1));
-        if (disp_log_buffer[i] == nullptr) {
-          DisplayFreeLogBuffer();
-          break;
-        }
-      }
-    }
-    if (disp_log_buffer != nullptr) {
-      disp_log_buffer_cols = Settings.display_cols[0] +1;
-      DisplayClearLogBuffer();
-    }
-  }
-}
-
-void DisplayReAllocLogBuffer(void)
-{
-  DisplayFreeLogBuffer();
-  DisplayAllocLogBuffer();
-}
-
-void DisplayLogBufferAdd(char* txt)
-{
-  if (disp_log_buffer_cols) {
-    strlcpy(disp_log_buffer[disp_log_buffer_idx], txt, disp_log_buffer_cols);
-    disp_log_buffer_idx++;
-    if (DISPLAY_LOG_ROWS == disp_log_buffer_idx) { disp_log_buffer_idx = 0; }
-  }
-}
-
-char* DisplayLogBuffer(char temp_code)
-{
-  char* result = nullptr;
-  if (disp_log_buffer_cols) {
-    if (disp_log_buffer_idx != disp_log_buffer_ptr) {
-      result = disp_log_buffer[disp_log_buffer_ptr];
-      disp_log_buffer_ptr++;
-      if (DISPLAY_LOG_ROWS == disp_log_buffer_ptr) { disp_log_buffer_ptr = 0; }
-
-      char *pch = strchr(result, '~');
-      if (pch != nullptr) { result[pch - result] = temp_code; }
-    }
-  }
-  return result;
-}
-
-void DisplayLogBufferInit(void)
-{
-  if (Settings.display_mode) {
-    disp_log_buffer_idx = 0;
-    disp_log_buffer_ptr = 0;
-    disp_refresh = Settings.display_refresh;
-
-    snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%c"), TempUnit());
-    snprintf_P(disp_pres, sizeof(disp_pres), PressureUnit().c_str());
-
-    DisplayReAllocLogBuffer();
-
-    char buffer[40];
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_VERSION " %s%s"), my_version, my_image);
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR("Display mode %d"), Settings.display_mode);
-    DisplayLogBufferAdd(buffer);
-
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_CMND_HOSTNAME " %s"), my_hostname);
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_SSID " %s"), SettingsText(SET_STASSID1 + Settings.sta_active));
-    DisplayLogBufferAdd(buffer);
-    snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_MAC " %s"), WiFi.macAddress().c_str());
-    DisplayLogBufferAdd(buffer);
-    if (!global_state.wifi_down) {
-      snprintf_P(buffer, sizeof(buffer), PSTR("IP %s"), WiFi.localIP().toString().c_str());
-      DisplayLogBufferAdd(buffer);
-      snprintf_P(buffer, sizeof(buffer), PSTR(D_JSON_RSSI " %d%%"), WifiGetRssiAsQuality(WiFi.RSSI()));
-      DisplayLogBufferAdd(buffer);
-    }
-  }
-}
-
-
-
-
-
-enum SensorQuantity {
-  JSON_TEMPERATURE,
-  JSON_HUMIDITY, JSON_LIGHT, JSON_NOISE, JSON_AIRQUALITY,
-  JSON_PRESSURE, JSON_PRESSUREATSEALEVEL,
-  JSON_ILLUMINANCE,
-  JSON_GAS,
-  JSON_YESTERDAY, JSON_TOTAL, JSON_TODAY,
-  JSON_PERIOD,
-  JSON_POWERFACTOR, JSON_COUNTER, JSON_ANALOG_INPUT, JSON_UV_LEVEL,
-  JSON_CURRENT,
-  JSON_VOLTAGE,
-  JSON_POWERUSAGE,
-  JSON_CO2,
-  JSON_FREQUENCY };
-const char kSensorQuantity[] PROGMEM =
-  D_JSON_TEMPERATURE "|"
-  D_JSON_HUMIDITY "|" D_JSON_LIGHT "|" D_JSON_NOISE "|" D_JSON_AIRQUALITY "|"
-  D_JSON_PRESSURE "|" D_JSON_PRESSUREATSEALEVEL "|"
-  D_JSON_ILLUMINANCE "|"
-  D_JSON_GAS "|"
-  D_JSON_YESTERDAY "|" D_JSON_TOTAL "|" D_JSON_TODAY "|"
-  D_JSON_PERIOD "|"
-  D_JSON_POWERFACTOR "|" D_JSON_COUNTER "|" D_JSON_ANALOG_INPUT "|" D_JSON_UV_LEVEL "|"
-  D_JSON_CURRENT "|"
-  D_JSON_VOLTAGE "|"
-  D_JSON_POWERUSAGE "|"
-  D_JSON_CO2 "|"
-  D_JSON_FREQUENCY ;
-
-void DisplayJsonValue(const char* topic, const char* device, const char* mkey, const char* value)
-{
-  char quantity[TOPSZ];
-  char buffer[Settings.display_cols[0] +1];
-  char spaces[Settings.display_cols[0]];
-  char source[Settings.display_cols[0] - Settings.display_cols[1]];
-  char svalue[Settings.display_cols[1] +1];
-
-#ifdef USE_DEBUG_DRIVER
-  ShowFreeMem(PSTR("DisplayJsonValue"));
-#endif
-
-  memset(spaces, 0x20, sizeof(spaces));
-  spaces[sizeof(spaces) -1] = '\0';
-  snprintf_P(source, sizeof(source), PSTR("%s%s%s%s"), topic, (strlen(topic))?"/":"", mkey, spaces);
-
-  int quantity_code = GetCommandCode(quantity, sizeof(quantity), mkey, kSensorQuantity);
-  if ((-1 == quantity_code) || !strcmp_P(mkey, S_RSLT_POWER)) {
-    return;
-  }
-  if (JSON_TEMPERATURE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s~%s"), value, disp_temp);
-  }
-  else if ((quantity_code >= JSON_HUMIDITY) && (quantity_code <= JSON_AIRQUALITY)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%%"), value);
-  }
-  else if ((quantity_code >= JSON_PRESSURE) && (quantity_code <= JSON_PRESSUREATSEALEVEL)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s%s"), value, disp_pres);
-  }
-  else if (JSON_ILLUMINANCE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_LUX), value);
-  }
-  else if (JSON_GAS == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOOHM), value);
-  }
-  else if ((quantity_code >= JSON_YESTERDAY) && (quantity_code <= JSON_TODAY)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_KILOWATTHOUR), value);
-  }
-  else if (JSON_PERIOD == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATTHOUR), value);
-  }
-  else if ((quantity_code >= JSON_POWERFACTOR) && (quantity_code <= JSON_UV_LEVEL)) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), value);
-  }
-  else if (JSON_CURRENT == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_AMPERE), value);
-  }
-  else if (JSON_VOLTAGE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_VOLT), value);
-  }
-  else if (JSON_POWERUSAGE == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_WATT), value);
-  }
-  else if (JSON_CO2 == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_PARTS_PER_MILLION), value);
-  }
-  else if (JSON_FREQUENCY == quantity_code) {
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s" D_UNIT_HERTZ), value);
-  }
-  snprintf_P(buffer, sizeof(buffer), PSTR("%s %s"), source, svalue);
-
-
-
-  DisplayLogBufferAdd(buffer);
-}
-
-void DisplayAnalyzeJson(char *topic, char *json)
-{
-# 1145 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
-  String jsonStr = json;
-
-  StaticJsonBuffer<1024> jsonBuf;
-  JsonObject &root = jsonBuf.parseObject(jsonStr);
-  if (root.success()) {
-
-    const char *unit;
-    unit = root[D_JSON_TEMPERATURE_UNIT];
-    if (unit) {
-      snprintf_P(disp_temp, sizeof(disp_temp), PSTR("%s"), unit);
-    }
-    unit = root[D_JSON_PRESSURE_UNIT];
-    if (unit) {
-      snprintf_P(disp_pres, sizeof(disp_pres), PSTR("%s"), unit);
-    }
-
-    for (JsonObject::iterator it = root.begin(); it != root.end(); ++it) {
-      JsonVariant value = it->value;
-      if (value.is<JsonObject>()) {
-        JsonObject& Object2 = value;
-        for (JsonObject::iterator it2 = Object2.begin(); it2 != Object2.end(); ++it2) {
-          JsonVariant value2 = it2->value;
-          if (value2.is<JsonObject>()) {
-            JsonObject& Object3 = value2;
-            for (JsonObject::iterator it3 = Object3.begin(); it3 != Object3.end(); ++it3) {
-              const char* value = it3->value;
-              if (value != nullptr) {
-                DisplayJsonValue(topic, it->key, it3->key, value);
-              }
-            }
-          } else {
-            const char* value = it2->value;
-            if (value != nullptr) {
-              DisplayJsonValue(topic, it->key, it2->key, value);
-            }
-          }
-        }
-      } else {
-        const char* value = it->value;
-        if (value != nullptr) {
-          DisplayJsonValue(topic, it->key, it->key, value);
-        }
-      }
-    }
-  }
-}
-
-void DisplayMqttSubscribe(void)
-{
-
-
-
-
-
-
-  if (Settings.display_model && (Settings.display_mode &0x04)) {
-
-    char stopic[TOPSZ];
-    char ntopic[TOPSZ];
-
-    ntopic[0] = '\0';
-    strlcpy(stopic, SettingsText(SET_MQTT_FULLTOPIC), sizeof(stopic));
-    char *tp = strtok(stopic, "/");
-    while (tp != nullptr) {
-      if (!strcmp_P(tp, MQTT_TOKEN_PREFIX)) {
-        break;
-      }
-      strncat_P(ntopic, PSTR("+/"), sizeof(ntopic) - strlen(ntopic) -1);
-      tp = strtok(nullptr, "/");
-    }
-    strncat(ntopic, SettingsText(SET_MQTTPREFIX3), sizeof(ntopic) - strlen(ntopic) -1);
-    strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1);
-    MqttSubscribe(ntopic);
-    disp_subscribed = true;
-  } else {
-    disp_subscribed = false;
-  }
-}
-
-bool DisplayMqttData(void)
-{
-  if (disp_subscribed) {
-    char stopic[TOPSZ];
-
-    snprintf_P(stopic, sizeof(stopic) , PSTR("%s/"), SettingsText(SET_MQTTPREFIX3));
-    char *tp = strstr(XdrvMailbox.topic, stopic);
-    if (tp) {
-      if (Settings.display_mode &0x04) {
-        tp = tp + strlen(stopic);
-        char *topic = strtok(tp, "/");
-        DisplayAnalyzeJson(topic, XdrvMailbox.data);
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-void DisplayLocalSensor(void)
-{
-  if ((Settings.display_mode &0x02) && (0 == tele_period)) {
-    char no_topic[1] = { 0 };
-
-    DisplayAnalyzeJson(no_topic, mqtt_data);
-  }
-}
-
-#endif
-
-
-
-
-
-void DisplayInitDriver(void)
-{
-  XdspCall(FUNC_DISPLAY_INIT_DRIVER);
-
-  if (renderer) {
-    renderer->setTextFont(Settings.display_font);
-    renderer->setTextSize(Settings.display_size);
-  }
-
-
-
-
-  if (Settings.display_model) {
-    devices_present++;
-    disp_device = devices_present;
-
-#ifndef USE_DISPLAY_MODES1TO5
-    Settings.display_mode = 0;
-#else
-    DisplayLogBufferInit();
-#endif
-  }
-}
-
-void DisplaySetPower(void)
-{
-  disp_power = bitRead(XdrvMailbox.index, disp_device -1);
-
-
-
-  if (Settings.display_model) {
-    if (!renderer) {
-      XdspCall(FUNC_DISPLAY_POWER);
-    } else {
-      renderer->DisplayOnff(disp_power);
-    }
-  }
-}
-
-
-
-
-
-void CmndDisplay(void)
-{
-  Response_P(PSTR("{\"" D_PRFX_DISPLAY "\":{\"" D_CMND_DISP_MODEL "\":%d,\"" D_CMND_DISP_WIDTH "\":%d,\"" D_CMND_DISP_HEIGHT "\":%d,\""
-    D_CMND_DISP_MODE "\":%d,\"" D_CMND_DISP_DIMMER "\":%d,\"" D_CMND_DISP_SIZE "\":%d,\"" D_CMND_DISP_FONT "\":%d,\""
-    D_CMND_DISP_ROTATE "\":%d,\"" D_CMND_DISP_REFRESH "\":%d,\"" D_CMND_DISP_COLS "\":[%d,%d],\"" D_CMND_DISP_ROWS "\":%d}}"),
-    Settings.display_model, Settings.display_width, Settings.display_height,
-    Settings.display_mode, Settings.display_dimmer, Settings.display_size, Settings.display_font,
-    Settings.display_rotate, Settings.display_refresh, Settings.display_cols[0], Settings.display_cols[1], Settings.display_rows);
-}
-
-void CmndDisplayModel(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < DISPLAY_MAX_DRIVERS)) {
-    uint32_t last_display_model = Settings.display_model;
-    Settings.display_model = XdrvMailbox.payload;
-    if (XdspCall(FUNC_DISPLAY_MODEL)) {
-      restart_flag = 2;
-    } else {
-      Settings.display_model = last_display_model;
-    }
-  }
-  ResponseCmndNumber(Settings.display_model);
-}
-
-void CmndDisplayWidth(void)
-{
-  if (XdrvMailbox.payload > 0) {
-    if (XdrvMailbox.payload != Settings.display_width) {
-      Settings.display_width = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndNumber(Settings.display_width);
-}
-
-void CmndDisplayHeight(void)
-{
-  if (XdrvMailbox.payload > 0) {
-    if (XdrvMailbox.payload != Settings.display_height) {
-      Settings.display_height = XdrvMailbox.payload;
-      restart_flag = 2;
-    }
-  }
-  ResponseCmndNumber(Settings.display_height);
-}
-
-void CmndDisplayMode(void)
-{
-#ifdef USE_DISPLAY_MODES1TO5
-
-
-
-
-
-
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    uint32_t last_display_mode = Settings.display_mode;
-    Settings.display_mode = XdrvMailbox.payload;
-
-    if (disp_subscribed != (Settings.display_mode &0x04)) {
-      restart_flag = 2;
-    } else {
-      if (last_display_mode && !Settings.display_mode) {
-        DisplayInit(DISPLAY_INIT_MODE);
-        if (renderer) renderer->fillScreen(bg_color);
-        else DisplayClear();
-      } else {
-        DisplayLogBufferInit();
-        DisplayInit(DISPLAY_INIT_MODE);
-      }
-    }
-  }
-#endif
-  ResponseCmndNumber(Settings.display_mode);
-}
-
-void CmndDisplayDimmer(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-    Settings.display_dimmer = ((XdrvMailbox.payload +1) * 100) / 666;
-    if (Settings.display_dimmer && !(disp_power)) {
-      ExecuteCommandPower(disp_device, POWER_ON, SRC_DISPLAY);
-    }
-    else if (!Settings.display_dimmer && disp_power) {
-      ExecuteCommandPower(disp_device, POWER_OFF, SRC_DISPLAY);
-    }
-    if (renderer) renderer->dim(Settings.display_dimmer);
-  }
-  ResponseCmndNumber(Settings.display_dimmer);
-}
-
-void CmndDisplaySize(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 4)) {
-    Settings.display_size = XdrvMailbox.payload;
-    if (renderer) renderer->setTextSize(Settings.display_size);
-    else DisplaySetSize(Settings.display_size);
-  }
-  ResponseCmndNumber(Settings.display_size);
-}
-
-void CmndDisplayFont(void)
-{
-  if ((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 4)) {
-    Settings.display_font = XdrvMailbox.payload;
-    if (renderer) renderer->setTextFont(Settings.display_font);
-    else DisplaySetFont(Settings.display_font);
-  }
-  ResponseCmndNumber(Settings.display_font);
-}
-
-void CmndDisplayRotate(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 4)) {
-    if (Settings.display_rotate != XdrvMailbox.payload) {
-# 1428 "S:/Development/Tasmota/tasmota/xdrv_13_display.ino"
-      Settings.display_rotate = XdrvMailbox.payload;
-      DisplayInit(DISPLAY_INIT_MODE);
-#ifdef USE_DISPLAY_MODES1TO5
-      DisplayLogBufferInit();
-#endif
-    }
-  }
-  ResponseCmndNumber(Settings.display_rotate);
-}
-
-void CmndDisplayText(void)
-{
-  if (disp_device && XdrvMailbox.data_len > 0) {
-#ifndef USE_DISPLAY_MODES1TO5
-    DisplayText();
-#else
-    if (!Settings.display_mode) {
-      DisplayText();
-    } else {
-      DisplayLogBufferAdd(XdrvMailbox.data);
-    }
-#endif
-    ResponseCmndChar(XdrvMailbox.data);
-  }
-}
-
-void CmndDisplayAddress(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 8)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
-      Settings.display_address[XdrvMailbox.index -1] = XdrvMailbox.payload;
-    }
-    ResponseCmndIdxNumber(Settings.display_address[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDisplayRefresh(void)
-{
-  if ((XdrvMailbox.payload >= 1) && (XdrvMailbox.payload <= 7)) {
-    Settings.display_refresh = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.display_refresh);
-}
-
-void CmndDisplayColumns(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_COLS)) {
-      Settings.display_cols[XdrvMailbox.index -1] = XdrvMailbox.payload;
-#ifdef USE_DISPLAY_MODES1TO5
-      if (1 == XdrvMailbox.index) {
-        DisplayLogBufferInit();
-        DisplayReAllocScreenBuffer();
-      }
-#endif
-    }
-    ResponseCmndIdxNumber(Settings.display_cols[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndDisplayRows(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= DISPLAY_MAX_ROWS)) {
-    Settings.display_rows = XdrvMailbox.payload;
-#ifdef USE_DISPLAY_MODES1TO5
-    DisplayLogBufferInit();
-    DisplayReAllocScreenBuffer();
-#endif
-  }
-  ResponseCmndNumber(Settings.display_rows);
-}
-
-
-
-
-
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp) {
-  if (!renderer) return;
-
-
-  File fp;
-  fp=SD.open(file,FILE_READ);
-  if (!fp) return;
-  uint16_t xsize;
-  fp.read((uint8_t*)&xsize,2);
-  uint16_t ysize;
-  fp.read((uint8_t*)&ysize,2);
-
-#if 1
-#define XBUFF 128
-  uint16_t xdiv=xsize/XBUFF;
-  renderer->setAddrWindow(xp,yp,xp+xsize,yp+ysize);
-  for(int16_t j=0; j<ysize; j++) {
-    for(int16_t i=0; i<xsize; i+=XBUFF) {
-      uint16_t rgb[XBUFF];
-      uint16_t len=fp.read((uint8_t*)rgb,XBUFF*2);
-      if (len>=2) renderer->pushColors(rgb,len/2,true);
-    }
-    OsWatchLoop();
-  }
-  renderer->setAddrWindow(0,0,0,0);
-#else
-  for(int16_t j=0; j<ysize; j++) {
-    for(int16_t i=0; i<xsize; i++ ) {
-      uint16_t rgb;
-      uint8_t res=fp.read((uint8_t*)&rgb,2);
-      if (!res) break;
-      renderer->writePixel(xp+i,yp,rgb);
-    }
-    delay(0);
-    OsWatchLoop();
-    yp++;
-  }
-#endif
-  fp.close();
-}
-#endif
-
-#ifdef USE_AWATCH
-#define MINUTE_REDUCT 4
-
-#ifndef pi
-#define pi 3.14159265359
-#endif
-
-
-void DrawAClock(uint16_t rad) {
-    if (!renderer) return;
-    float frad=rad;
-    uint16_t hred=frad/3.0;
-    renderer->fillCircle(disp_xpos, disp_ypos, rad, bg_color);
-    renderer->drawCircle(disp_xpos, disp_ypos, rad, fg_color);
-    renderer->fillCircle(disp_xpos, disp_ypos, 4, fg_color);
-    for (uint8_t count=0; count<60; count+=5) {
-      float p1=((float)count*(pi/30)-(pi/2));
-      uint8_t len;
-      if ((count%15)==0) {
-        len=4;
-      } else {
-        len=2;
-      }
-      renderer->writeLine(disp_xpos+((float)(rad-len)*cosf(p1)), disp_ypos+((float)(rad-len)*sinf(p1)), disp_xpos+(frad*cosf(p1)), disp_ypos+(frad*sinf(p1)), fg_color);
-    }
-
-
-    float hour=((float)RtcTime.hour*60.0+(float)RtcTime.minute)/60.0;
-    float temp=(hour*(pi/6.0)-(pi/2.0));
-    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-hred)*cosf(temp),disp_ypos+(frad-hred)*sinf(temp), fg_color);
-
-
-    temp=((float)RtcTime.minute*(pi/30.0)-(pi/2.0));
-    renderer->writeLine(disp_xpos, disp_ypos,disp_xpos+(frad-MINUTE_REDUCT)*cosf(temp),disp_ypos+(frad-MINUTE_REDUCT)*sinf(temp), fg_color);
-}
-#endif
-
-
-#ifdef USE_GRAPH
-
-typedef union {
-  uint8_t data;
-  struct {
-      uint8_t overlay : 1;
-      uint8_t draw : 1;
-      uint8_t nu3 : 1;
-      uint8_t nu4 : 1;
-      uint8_t nu5 : 1;
-      uint8_t nu6 : 1;
-      uint8_t nu7 : 1;
-      uint8_t nu8 : 1;
-  };
-} GFLAGS;
-
-struct GRAPH {
-  uint16_t xp;
-  uint16_t yp;
-  uint16_t xs;
-  uint16_t ys;
-  float ymin;
-  float ymax;
-  float range;
-  uint32_t x_time;
-  uint32_t last_ms;
-  uint32_t last_ms_redrawn;
-  int16_t decimation;
-  uint16_t dcnt;
-  uint32_t summ;
-  uint16_t xcnt;
-  uint8_t *values;
-  uint8_t xticks;
-  uint8_t yticks;
-  uint8_t last_val;
-  uint8_t color_index;
-  GFLAGS flags;
-};
-
-
-struct GRAPH *graph[NUM_GRAPHS];
-
-#define TICKLEN 4
-void ClrGraph(uint16_t num) {
-  struct GRAPH *gp=graph[num];
-
-  uint16_t xticks=gp->xticks;
-  uint16_t yticks=gp->yticks;
-  uint16_t count;
-
-
-  if (gp->flags.overlay) return;
-
-  renderer->fillRect(gp->xp+1,gp->yp+1,gp->xs-2,gp->ys-2,bg_color);
-
-  if (xticks) {
-    float cxp=gp->xp,xd=(float)gp->xs/(float)xticks;
-    for (count=0; count<xticks; count++) {
-      renderer->writeFastVLine(cxp,gp->yp+gp->ys-TICKLEN,TICKLEN,fg_color);
-      cxp+=xd;
-    }
-  }
-  if (yticks) {
-    if (gp->ymin<0 && gp->ymax>0) {
-
-      float cxp=0;
-      float czp=gp->yp+(gp->ymax/gp->range);
-      while (cxp<gp->xs) {
-        renderer->writeFastHLine(gp->xp+cxp,czp,2,fg_color);
-        cxp+=6.0;
-      }
-
-      float cyp=0,yd=gp->ys/yticks;
-      for (count=0; count<yticks; count++) {
-        if ((czp-cyp)>gp->yp) {
-          renderer->writeFastHLine(gp->xp,czp-cyp,TICKLEN,fg_color);
-          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp-cyp,TICKLEN,fg_color);
-        }
-        if ((czp+cyp)<(gp->yp+gp->ys)) {
-          renderer->writeFastHLine(gp->xp,czp+cyp,TICKLEN,fg_color);
-          renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,czp+cyp,TICKLEN,fg_color);
-        }
-        cyp+=yd;
-      }
-    } else {
-      float cyp=gp->yp,yd=gp->ys/yticks;
-      for (count=0; count<yticks; count++) {
-        renderer->writeFastHLine(gp->xp,cyp,TICKLEN,fg_color);
-        renderer->writeFastHLine(gp->xp+gp->xs-TICKLEN,cyp,TICKLEN,fg_color);
-        cyp+=yd;
-      }
-    }
-  }
-}
-
-
-void DefineGraph(uint16_t num,uint16_t xp,uint16_t yp,int16_t xs,uint16_t ys,int16_t dec,float ymin, float ymax,uint8_t icol) {
-  if (!renderer) return;
-  uint8_t rflg=0;
-  if (xs<0) {
-    rflg=1;
-    xs=abs(xs);
-  }
-  struct GRAPH *gp;
-  uint16_t count;
-  uint16_t index=num%NUM_GRAPHS;
-  if (!graph[index]) {
-    gp=(struct GRAPH*)calloc(sizeof(struct GRAPH),1);
-    if (!gp) return;
-    graph[index]=gp;
-  } else {
-    gp=graph[index];
-    if (rflg) {
-      RedrawGraph(index,1);
-      return;
-    }
-  }
-
-
-  gp->xticks=(num>>4)&0x3f;
-  gp->yticks=(num>>10)&0x3f;
-  gp->xp=xp;
-  gp->yp=yp;
-  gp->xs=xs;
-  gp->ys=ys;
-  if (!dec) dec=1;
-  gp->decimation=dec;
-  if (dec>0) {
-
-    gp->x_time=((float)dec*60000.0)/(float)xs;
-    gp->last_ms=millis()+gp->x_time;
-  }
-  gp->ymin=ymin;
-  gp->ymax=ymax;
-  gp->range=(ymax-ymin)/ys;
-  gp->xcnt=0;
-  gp->dcnt=0;
-  gp->summ=0;
-  if (gp->values) free(gp->values);
-  gp->values=(uint8_t*) calloc(1,xs+2);
-  if (!gp->values) {
-    free(gp);
-    graph[index]=0;
-    return;
-  }
-
-  gp->values[0]=0;
-
-  gp->last_ms_redrawn=millis();
-
-  if (!icol) icol=1;
-  gp->color_index=icol;
-  gp->flags.overlay=0;
-  gp->flags.draw=1;
-
-
-  if (index>0) {
-    for (uint8_t count=0; count<index; count++) {
-      if (graph[count]) {
-
-
-        struct GRAPH *gp1=graph[count];
-        if ((gp->xp==gp1->xp) && (gp->yp==gp1->yp)) {
-          gp->flags.overlay=1;
-          break;
-        }
-      }
-    }
-  }
-
-
-  renderer->drawRect(xp,yp,xs,ys,fg_color);
-
-  ClrGraph(index);
-
-}
-
-
-void DisplayCheckGraph() {
-  int16_t count;
-  struct GRAPH *gp;
-  for (count=0;count<NUM_GRAPHS;count++) {
-    gp=graph[count];
-    if (gp) {
-      if (gp->decimation>0) {
-
-        while (millis()>gp->last_ms) {
-          gp->last_ms+=gp->x_time;
-          uint8_t val;
-          if (gp->dcnt) {
-            val=gp->summ/gp->dcnt;
-            gp->dcnt=0;
-            gp->summ=0;
-            gp->last_val=val;
-          } else {
-            val=gp->last_val;
-          }
-          AddGraph(count,val);
-        }
-      }
-    }
-  }
-}
-
-
-#if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT)
-#include <SD.h>
-
-void Save_graph(uint8_t num, char *path) {
-  if (!renderer) return;
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  File fp;
-  SD.remove(path);
-  fp=SD.open(path,FILE_WRITE);
-  if (!fp) return;
-  char str[32];
-  sprintf_P(str,PSTR("%d\t%d\t%d\t"),gp->xcnt,gp->xs,gp->ys);
-  fp.print(str);
-  dtostrfd(gp->ymin,2,str);
-  fp.print(str);
-  fp.print("\t");
-  dtostrfd(gp->ymax,2,str);
-  fp.print(str);
-  fp.print("\t");
-  for (uint32_t count=0;count<gp->xs;count++) {
-    dtostrfd(gp->values[count],0,str);
-    fp.print(str);
-    fp.print("\t");
-  }
-  fp.print("\n");
-  fp.close();
-}
-void Restore_graph(uint8_t num, char *path) {
-  if (!renderer) return;
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  File fp;
-  fp=SD.open(path,FILE_READ);
-  if (!fp) return;
-  char vbuff[32];
-  char *cp=vbuff;
-  uint8_t buf[2];
-  uint8_t findex=0;
-
-  for (uint32_t count=0;count<=gp->xs+4;count++) {
-    cp=vbuff;
-    findex=0;
-    while (fp.available()) {
-      fp.read(buf,1);
-      if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
-        break;
-      } else {
-        *cp++=buf[0];
-        findex++;
-        if (findex>=sizeof(vbuff)-1) break;
-      }
-    }
-    *cp=0;
-    if (count<=4) {
-      if (count==0) gp->xcnt=atoi(vbuff);
-    } else {
-      gp->values[count-5]=atoi(vbuff);
-    }
-  }
-  fp.close();
-  RedrawGraph(num,1);
-}
-#endif
-
-void RedrawGraph(uint8_t num, uint8_t flags) {
-  uint16_t index=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[index];
-  if (!gp) return;
-  if (!flags) {
-    gp->flags.draw=0;
-    return;
-  }
-  if (!renderer) return;
-
-  gp->flags.draw=1;
-  uint16_t linecol=fg_color;
-
-  if (color_type==COLOR_COLOR) {
-    linecol=renderer->GetColorFromIndex(gp->color_index);
-  }
-
-  if (!gp->flags.overlay) {
-
-    renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
-
-    ClrGraph(index);
-  }
-
-  for (uint16_t count=0;count<gp->xs-1;count++) {
-    renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
-  }
-}
-
-
-void AddGraph(uint8_t num,uint8_t val) {
-  struct GRAPH *gp=graph[num];
-  if (!renderer) return;
-
-  uint16_t linecol=fg_color;
-  if (color_type==COLOR_COLOR) {
-    linecol=renderer->GetColorFromIndex(gp->color_index);
-  }
-  gp->xcnt++;
-  if (gp->xcnt>gp->xs) {
-    gp->xcnt=gp->xs;
-    int16_t count;
-
-    for (count=0;count<gp->xs-1;count++) {
-      gp->values[count]=gp->values[count+1];
-    }
-    gp->values[gp->xcnt-1]=val;
-
-    if (!gp->flags.draw) return;
-
-
-    if (millis()-gp->last_ms_redrawn>1000) {
-      gp->last_ms_redrawn=millis();
-
-      if (!gp->flags.overlay) {
-
-        renderer->drawRect(gp->xp,gp->yp,gp->xs,gp->ys,fg_color);
-
-        ClrGraph(num);
-      }
-
-      for (count=0;count<gp->xs-1;count++) {
-        renderer->writeLine(gp->xp+count,gp->yp+gp->ys-gp->values[count]-1,gp->xp+count+1,gp->yp+gp->ys-gp->values[count+1]-1,linecol);
-      }
-    }
-  } else {
-
-    gp->values[gp->xcnt]=val;
-    if (!gp->flags.draw) return;
-    renderer->writeLine(gp->xp+gp->xcnt-1,gp->yp+gp->ys-gp->values[gp->xcnt-1]-1,gp->xp+gp->xcnt,gp->yp+gp->ys-gp->values[gp->xcnt]-1,linecol);
-  }
-}
-
-
-
-void AddValue(uint8_t num,float fval) {
-
-  num=num%NUM_GRAPHS;
-  struct GRAPH *gp=graph[num];
-  if (!gp) return;
-
-  if (fval>gp->ymax) fval=gp->ymax;
-  if (fval<gp->ymin) fval=gp->ymin;
-
-  int16_t val;
-  val=(fval-gp->ymin)/gp->range;
-
-  if (val>gp->ys-1) val=gp->ys-1;
-  if (val<0) val=0;
-
-
-  gp->summ+=val;
-  gp->dcnt++;
-
-
-  if (gp->decimation<0) {
-    if (gp->dcnt>=-gp->decimation) {
-      gp->dcnt=0;
-
-      val=gp->summ/-gp->decimation;
-      gp->summ=0;
-
-      AddGraph(num,val);
-    }
-  }
-}
-#endif
-
-
-
-
-
-bool Xdrv13(uint8_t function)
-{
-  bool result = false;
-
-  if ((i2c_flg || spi_flg || soft_spi_flg) && XdspPresent()) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        DisplayInitDriver();
-#ifdef USE_GRAPH
-        for (uint8_t count=0;count<NUM_GRAPHS;count++) {
-          graph[count]=0;
-        }
-#endif
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (Settings.display_model) { XdspCall(FUNC_DISPLAY_EVERY_50_MSECOND); }
-        break;
-      case FUNC_SET_POWER:
-        DisplaySetPower();
-        break;
-      case FUNC_EVERY_SECOND:
-#ifdef USE_GRAPH
-        DisplayCheckGraph();
-#endif
-
-#ifdef USE_DISPLAY_MODES1TO5
-        if (Settings.display_model && Settings.display_mode) { XdspCall(FUNC_DISPLAY_EVERY_SECOND); }
-#endif
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_MQTT_SUBSCRIBE:
-        DisplayMqttSubscribe();
-        break;
-      case FUNC_MQTT_DATA:
-        result = DisplayMqttData();
-        break;
-      case FUNC_SHOW_SENSOR:
-        DisplayLocalSensor();
-        break;
-#endif
-      case FUNC_COMMAND:
-        result = DecodeCommand(kDisplayCommands, DisplayCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
-# 64 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
-#ifdef USE_MP3_PLAYER
-
-
-
-
-
-#define XDRV_14 14
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *MP3Player;
-
-
-
-
-
-#define D_CMND_MP3 "MP3"
-
-const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}";
-const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}";
-const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC";
-
-
-
-
-
-enum MP3_Commands {
-  CMND_MP3_TRACK,
-  CMND_MP3_PLAY,
-  CMND_MP3_PAUSE,
-  CMND_MP3_STOP,
-  CMND_MP3_VOLUME,
-  CMND_MP3_EQ,
-  CMND_MP3_DEVICE,
-  CMND_MP3_RESET,
-  CMND_MP3_DAC };
-
-
-
-
-
-
-#define MP3_CMD_RESET_VALUE 0
-
-#define MP3_CMD_TRACK 0x03
-#define MP3_CMD_PLAY 0x0d
-#define MP3_CMD_PAUSE 0x0e
-#define MP3_CMD_STOP 0x16
-#define MP3_CMD_VOLUME 0x06
-#define MP3_CMD_EQ 0x07
-#define MP3_CMD_DEVICE 0x09
-#define MP3_CMD_RESET 0x0C
-#define MP3_CMD_DAC 0x1A
-
-
-
-
-
-
-uint16_t MP3_Checksum(uint8_t *array)
-{
-  uint16_t checksum = 0;
-  for (uint32_t i = 0; i < 6; i++) {
-    checksum += array[i];
-  }
-  checksum = checksum^0xffff;
-  return (checksum+1);
-}
-
-
-
-
-
-
-void MP3PlayerInit(void) {
-  MP3Player = new TasmotaSerial(-1, pin[GPIO_MP3_DFR562]);
-
-  if (MP3Player->begin(9600)) {
-    MP3Player->flush();
-    delay(1000);
-    MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE);
-    delay(3000);
-    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
-  }
-  return;
-}
-# 159 "S:/Development/Tasmota/tasmota/xdrv_14_mp3.ino"
-void MP3_CMD(uint8_t mp3cmd,uint16_t val) {
-  uint8_t i = 0;
-  uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef};
-  cmd[3] = mp3cmd;
-  cmd[4] = 0;
-  cmd[5] = val>>8;
-  cmd[6] = val;
-  uint16_t chks = MP3_Checksum(&cmd[1]);
-  cmd[7] = chks>>8;
-  cmd[8] = chks;
-  MP3Player->write(cmd, sizeof(cmd));
-  delay(1000);
-  if (mp3cmd == MP3_CMD_RESET) {
-    MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME);
-  }
-  return;
-}
-
-
-
-
-
-bool MP3PlayerCmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_MP3);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands);
-
-    switch (command_code) {
-      case CMND_MP3_TRACK:
-      case CMND_MP3_VOLUME:
-      case CMND_MP3_EQ:
-      case CMND_MP3_DEVICE:
-      case CMND_MP3_DAC:
-
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); }
-          if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); }
-          if (command_code == CMND_MP3_DAC) { MP3_CMD(MP3_CMD_DAC, XdrvMailbox.payload); }
-        }
-        Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_MP3_PLAY:
-      case CMND_MP3_PAUSE:
-      case CMND_MP3_STOP:
-      case CMND_MP3_RESET:
-
-        if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); }
-        if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); }
-        if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); }
-        if (command_code == CMND_MP3_RESET) { MP3_CMD(MP3_CMD_RESET, 0); }
-        Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload);
-        break;
-      default:
-
-       serviced = false;
-     break;
-    }
-  } else {
-    return false;
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xdrv14(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_MP3_DFR562] < 99) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        MP3PlayerInit();
-        break;
-      case FUNC_COMMAND:
-        result = MP3PlayerCmd();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_15_pca9685.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_15_pca9685.ino"
-#ifdef USE_I2C
-#ifdef USE_PCA9685
-
-
-
-
-
-
-#define XDRV_15 15
-#define XI2C_01 1
-
-#define PCA9685_REG_MODE1 0x00
-#define PCA9685_REG_LED0_ON_L 0x06
-#define PCA9685_REG_PRE_SCALE 0xFE
-
-#ifndef USE_PCA9685_ADDR
-  #define USE_PCA9685_ADDR 0x40
-#endif
-#ifndef USE_PCA9685_FREQ
-  #define USE_PCA9685_FREQ 50
-#endif
-
-bool pca9685_detected = false;
-uint16_t pca9685_freq = USE_PCA9685_FREQ;
-uint16_t pca9685_pin_pwm_value[16];
-
-void PCA9685_Detect(void)
-{
-  if (I2cActive(USE_PCA9685_ADDR)) { return; }
-
-  uint8_t buffer;
-  if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
-    I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x20);
-    if (I2cValidRead8(&buffer, USE_PCA9685_ADDR, PCA9685_REG_MODE1)) {
-      if (0x20 == buffer) {
-        pca9685_detected = true;
-        I2cSetActiveFound(USE_PCA9685_ADDR, "PCA9685");
-        PCA9685_Reset();
-      }
-    }
-  }
-}
-
-void PCA9685_Reset(void)
-{
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, 0x80);
-  PCA9685_SetPWMfreq(USE_PCA9685_FREQ);
-  for (uint32_t pin=0;pin<16;pin++) {
-    PCA9685_SetPWM(pin,0,false);
-    pca9685_pin_pwm_value[pin] = 0;
-  }
-  Response_P(PSTR("{\"PCA9685\":{\"RESET\":\"OK\"}}"));
-}
-
-void PCA9685_SetPWMfreq(double freq) {
-
-
-
-
-  if (freq > 23 && freq < 1527) {
-   pca9685_freq=freq;
-  } else {
-   pca9685_freq=50;
-  }
-  uint8_t pre_scale_osc = round(25000000/(4096*pca9685_freq))-1;
-  if (1526 == pca9685_freq) pre_scale_osc=0xFF;
-  uint8_t current_mode1 = I2cRead8(USE_PCA9685_ADDR, PCA9685_REG_MODE1);
-  uint8_t sleep_mode1 = (current_mode1&0x7F) | 0x10;
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, sleep_mode1);
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_PRE_SCALE, pre_scale_osc);
-  I2cWrite8(USE_PCA9685_ADDR, PCA9685_REG_MODE1, current_mode1 | 0xA0);
-}
-
-void PCA9685_SetPWM_Reg(uint8_t pin, uint16_t on, uint16_t off) {
-  uint8_t led_reg = PCA9685_REG_LED0_ON_L + 4 * pin;
-  uint32_t led_data = 0;
-  I2cWrite8(USE_PCA9685_ADDR, led_reg, on);
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+1, (on >> 8));
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+2, off);
-  I2cWrite8(USE_PCA9685_ADDR, led_reg+3, (off >> 8));
-}
-
-void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted) {
-  if (4096 == pwm) {
-    PCA9685_SetPWM_Reg(pin, 4096, 0);
-  } else {
-    PCA9685_SetPWM_Reg(pin, 0, pwm);
-  }
-  pca9685_pin_pwm_value[pin] = pwm;
-}
-
-bool PCA9685_Command(void)
-{
-  bool serviced = true;
-  bool validpin = false;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"STATUS")) { PCA9685_OutputTelemetry(false); return serviced; }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) {
-    if (paramcount > 1) {
-      uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((new_freq >= 24) && (new_freq <= 1526)) {
-        PCA9685_SetPWMfreq(new_freq);
-        Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i, \"Result\":\"OK\"}}"),new_freq);
-        return serviced;
-      }
-    } else {
-      Response_P(PSTR("{\"PCA9685\":{\"PWMF\":%i}}"),pca9685_freq);
-      return serviced;
-    }
-  }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWM")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (paramcount > 2) {
-        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "ON")) {
-          PCA9685_SetPWM(pin, 4096, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,4096);
-          serviced = true;
-          return serviced;
-        }
-        if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 3), "OFF")) {
-          PCA9685_SetPWM(pin, 0, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,0);
-          serviced = true;
-          return serviced;
-        }
-        uint16_t pwm = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-        if ((pin >= 0 && pin <= 15) && (pwm >= 0 && pwm <= 4096)) {
-          PCA9685_SetPWM(pin, pwm, false);
-          Response_P(PSTR("{\"PCA9685\":{\"PIN\":%i,\"PWM\":%i}}"),pin,pwm);
-          serviced = true;
-          return serviced;
-        }
-      }
-    }
-  }
-  return serviced;
-}
-
-void PCA9685_OutputTelemetry(bool telemetry)
-{
-  ResponseTime_P(PSTR(",\"PCA9685\":{\"PWM_FREQ\":%i,"),pca9685_freq);
-  for (uint32_t pin=0;pin<16;pin++) {
-    ResponseAppend_P(PSTR("\"PWM%i\":%i,"),pin,pca9685_pin_pwm_value[pin]);
-  }
-  ResponseAppend_P(PSTR("\"END\":1}}"));
-  if (telemetry) {
-    MqttPublishTeleSensor();
-  }
-}
-
-bool Xdrv15(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_01)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    PCA9685_Detect();
-  }
-  else if (pca9685_detected) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        if (tele_period == 0) {
-          PCA9685_OutputTelemetry(true);
-        }
-        break;
-      case FUNC_COMMAND_DRIVER:
-        if (XDRV_15 == XdrvMailbox.index) {
-          result = PCA9685_Command();
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-#ifdef USE_LIGHT
-#ifdef USE_TUYA_MCU
-
-#define XDRV_16 16
-#define XNRG_16 16
-
-#ifndef TUYA_DIMMER_ID
-#define TUYA_DIMMER_ID 0
-#endif
-
-#define TUYA_CMD_HEARTBEAT 0x00
-#define TUYA_CMD_QUERY_PRODUCT 0x01
-#define TUYA_CMD_MCU_CONF 0x02
-#define TUYA_CMD_WIFI_STATE 0x03
-#define TUYA_CMD_WIFI_RESET 0x04
-#define TUYA_CMD_WIFI_SELECT 0x05
-#define TUYA_CMD_SET_DP 0x06
-#define TUYA_CMD_STATE 0x07
-#define TUYA_CMD_QUERY_STATE 0x08
-
-#define TUYA_LOW_POWER_CMD_WIFI_STATE 0x02
-#define TUYA_LOW_POWER_CMD_WIFI_RESET 0x03
-#define TUYA_LOW_POWER_CMD_WIFI_CONFIG 0x04
-#define TUYA_LOW_POWER_CMD_STATE 0x05
-
-#define TUYA_TYPE_BOOL 0x01
-#define TUYA_TYPE_VALUE 0x02
-#define TUYA_TYPE_STRING 0x03
-#define TUYA_TYPE_ENUM 0x04
-
-#define TUYA_BUFFER_SIZE 256
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *TuyaSerial = nullptr;
-
-struct TUYA {
-  uint16_t new_dim = 0;
-  bool ignore_dim = false;
-  uint8_t cmd_status = 0;
-  uint8_t cmd_checksum = 0;
-  uint8_t data_len = 0;
-  uint8_t wifi_state = -2;
-  uint8_t heartbeat_timer = 0;
-#ifdef USE_ENERGY_SENSOR
-  uint32_t lastPowerCheckTime = 0;
-#endif
-  char *buffer = nullptr;
-  int byte_counter = 0;
-  bool low_power_mode = false;
-  bool send_success_next_second = false;
-} Tuya;
-
-
-enum TuyaSupportedFunctions {
-  TUYA_MCU_FUNC_NONE,
-  TUYA_MCU_FUNC_SWT1 = 1,
-  TUYA_MCU_FUNC_SWT2,
-  TUYA_MCU_FUNC_SWT3,
-  TUYA_MCU_FUNC_SWT4,
-  TUYA_MCU_FUNC_REL1 = 11,
-  TUYA_MCU_FUNC_REL2,
-  TUYA_MCU_FUNC_REL3,
-  TUYA_MCU_FUNC_REL4,
-  TUYA_MCU_FUNC_REL5,
-  TUYA_MCU_FUNC_REL6,
-  TUYA_MCU_FUNC_REL7,
-  TUYA_MCU_FUNC_REL8,
-  TUYA_MCU_FUNC_DIMMER = 21,
-  TUYA_MCU_FUNC_POWER = 31,
-  TUYA_MCU_FUNC_CURRENT,
-  TUYA_MCU_FUNC_VOLTAGE,
-  TUYA_MCU_FUNC_BATTERY_STATE,
-  TUYA_MCU_FUNC_BATTERY_PERCENTAGE,
-  TUYA_MCU_FUNC_REL1_INV = 41,
-  TUYA_MCU_FUNC_REL2_INV,
-  TUYA_MCU_FUNC_REL3_INV,
-  TUYA_MCU_FUNC_REL4_INV,
-  TUYA_MCU_FUNC_REL5_INV,
-  TUYA_MCU_FUNC_REL6_INV,
-  TUYA_MCU_FUNC_REL7_INV,
-  TUYA_MCU_FUNC_REL8_INV,
-  TUYA_MCU_FUNC_LOWPOWER_MODE = 51,
-  TUYA_MCU_FUNC_LAST = 255
-};
-
-const char kTuyaCommand[] PROGMEM = "|"
-  D_CMND_TUYA_MCU "|" D_CMND_TUYA_MCU_SEND_STATE;
-
-void (* const TuyaCommand[])(void) PROGMEM = {
-  &CmndTuyaMcu, &CmndTuyaSend
-};
-# 127 "S:/Development/Tasmota/tasmota/xdrv_16_tuyamcu.ino"
-void CmndTuyaSend(void) {
-  if (XdrvMailbox.index > 4) {
-    return;
-  }
-  if (XdrvMailbox.index == 0) {
-    TuyaRequestState();
-  } else {
-    if (XdrvMailbox.data_len > 0) {
-      char *p;
-      char *data;
-      uint8_t i = 0;
-      uint8_t dpId = 0;
-      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
-        if ( i == 0) {
-          dpId = strtoul(str, nullptr, 0);
-        } else {
-          data = str;
-        }
-        i++;
-      }
-
-      if (1 == XdrvMailbox.index) {
-        TuyaSendBool(dpId, strtoul(data, nullptr, 0));
-      } else if (2 == XdrvMailbox.index) {
-        TuyaSendValue(dpId, strtoull(data, nullptr, 0));
-      } else if (3 == XdrvMailbox.index) {
-        TuyaSendString(dpId, data);
-      } else if (4 == XdrvMailbox.index) {
-        TuyaSendEnum(dpId, strtoul(data, nullptr, 0));
-      }
-    }
-  }
-  ResponseCmndDone();
-}
-
-
-
-
-
-
-
-void CmndTuyaMcu(void) {
-  if (XdrvMailbox.data_len > 0) {
-    char *p;
-    uint8_t i = 0;
-    uint8_t parm[3] = { 0 };
-    for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 2; str = strtok_r(nullptr, ", ", &p)) {
-      parm[i] = strtoul(str, nullptr, 0);
-      i++;
-    }
-
-    if (TuyaFuncIdValid(parm[0])) {
-      TuyaAddMcuFunc(parm[0], parm[1]);
-      restart_flag = 2;
-    } else {
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR("TYA: TuyaMcu Invalid function id=%d"), parm[0]);
-    }
-
-  }
-
-  Response_P(PSTR("{\"" D_CMND_TUYA_MCU "\":["));
-  bool added = false;
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].fnid != 0) {
-      if (added) {
-        ResponseAppend_P(PSTR(","));
-      }
-      ResponseAppend_P(PSTR("{\"fnId\":%d,\"dpId\":%d}" ), Settings.tuya_fnid_map[i].fnid, Settings.tuya_fnid_map[i].dpid);
-      added = true;
-    }
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-
-
-
-
-void TuyaAddMcuFunc(uint8_t fnId, uint8_t dpId) {
-  bool added = false;
-
-  if (fnId == 0 || dpId == 0) {
-    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-      if ((dpId > 0 && Settings.tuya_fnid_map[i].dpid == dpId) || (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].fnid == fnId)) {
-        Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
-        Settings.tuya_fnid_map[i].dpid = 0;
-        break;
-      }
-    }
-  } else {
-    for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-      if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].dpid == 0 || Settings.tuya_fnid_map[i].fnid == fnId || Settings.tuya_fnid_map[i].fnid == 0) {
-        if (!added) {
-          Settings.tuya_fnid_map[i].fnid = fnId;
-          Settings.tuya_fnid_map[i].dpid = dpId;
-          added = true;
-        } else if (Settings.tuya_fnid_map[i].dpid == dpId || Settings.tuya_fnid_map[i].fnid == fnId) {
-          Settings.tuya_fnid_map[i].fnid = TUYA_MCU_FUNC_NONE;
-          Settings.tuya_fnid_map[i].dpid = 0;
-        }
-      }
-    }
-  }
-  UpdateDevices();
-}
-
-void UpdateDevices() {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    uint8_t fnId = Settings.tuya_fnid_map[i].fnid;
-    if (fnId > TUYA_MCU_FUNC_NONE && Settings.tuya_fnid_map[i].dpid > 0) {
-
-      if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
-        bitClear(rel_inverted, fnId - TUYA_MCU_FUNC_REL1);
-      } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
-        bitSet(rel_inverted, fnId - TUYA_MCU_FUNC_REL1_INV);
-      }
-
-    }
-  }
-}
-
-inline bool TuyaFuncIdValid(uint8_t fnId) {
-  return (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) ||
-  (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) ||
-    fnId == TUYA_MCU_FUNC_DIMMER ||
-    (fnId >= TUYA_MCU_FUNC_POWER && fnId <= TUYA_MCU_FUNC_VOLTAGE) ||
-    (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) ||
-    (fnId == TUYA_MCU_FUNC_LOWPOWER_MODE);
-}
-
-uint8_t TuyaGetFuncId(uint8_t dpid) {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].dpid == dpid) {
-      return Settings.tuya_fnid_map[i].fnid;
-    }
-  }
-  return TUYA_MCU_FUNC_NONE;
-}
-
-uint8_t TuyaGetDpId(uint8_t fnId) {
-  for (uint8_t i = 0; i < MAX_TUYA_FUNCTIONS; i++) {
-    if (Settings.tuya_fnid_map[i].fnid == fnId) {
-      return Settings.tuya_fnid_map[i].dpid;
-    }
-  }
-  return 0;
-}
-
-void TuyaSendCmd(uint8_t cmd, uint8_t payload[] = nullptr, uint16_t payload_len = 0)
-{
-  uint8_t checksum = (0xFF + cmd + (payload_len >> 8) + (payload_len & 0xFF));
-  TuyaSerial->write(0x55);
-  TuyaSerial->write(0xAA);
-  TuyaSerial->write((uint8_t)0x00);
-  TuyaSerial->write(cmd);
-  TuyaSerial->write(payload_len >> 8);
-  TuyaSerial->write(payload_len & 0xFF);
-  snprintf_P(log_data, sizeof(log_data), PSTR("TYA: Send \"55aa00%02x%02x%02x"), cmd, payload_len >> 8, payload_len & 0xFF);
-  for (uint32_t i = 0; i < payload_len; ++i) {
-    TuyaSerial->write(payload[i]);
-    checksum += payload[i];
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, payload[i]);
-  }
-  TuyaSerial->write(checksum);
-  TuyaSerial->flush();
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x\""), log_data, checksum);
-  AddLog(LOG_LEVEL_DEBUG);
-}
-
-void TuyaSendState(uint8_t id, uint8_t type, uint8_t* value)
-{
-  uint16_t payload_len = 4;
-  uint8_t payload_buffer[8];
-  payload_buffer[0] = id;
-  payload_buffer[1] = type;
-  switch (type) {
-    case TUYA_TYPE_BOOL:
-    case TUYA_TYPE_ENUM:
-      payload_len += 1;
-      payload_buffer[2] = 0x00;
-      payload_buffer[3] = 0x01;
-      payload_buffer[4] = value[0];
-      break;
-    case TUYA_TYPE_VALUE:
-      payload_len += 4;
-      payload_buffer[2] = 0x00;
-      payload_buffer[3] = 0x04;
-      payload_buffer[4] = value[3];
-      payload_buffer[5] = value[2];
-      payload_buffer[6] = value[1];
-      payload_buffer[7] = value[0];
-      break;
-
-  }
-
-  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
-}
-
-void TuyaSendBool(uint8_t id, bool value)
-{
-  TuyaSendState(id, TUYA_TYPE_BOOL, (uint8_t*)&value);
-}
-
-void TuyaSendValue(uint8_t id, uint32_t value)
-{
-  TuyaSendState(id, TUYA_TYPE_VALUE, (uint8_t*)(&value));
-}
-
-void TuyaSendEnum(uint8_t id, uint32_t value)
-{
-  TuyaSendState(id, TUYA_TYPE_ENUM, (uint8_t*)(&value));
-}
-
-void TuyaSendString(uint8_t id, char data[]) {
-
-  uint16_t len = strlen(data);
-  uint16_t payload_len = 4 + len;
-  uint8_t payload_buffer[payload_len];
-  payload_buffer[0] = id;
-  payload_buffer[1] = TUYA_TYPE_STRING;
-  payload_buffer[2] = len >> 8;
-  payload_buffer[3] = len & 0xFF;
-
-  for (uint16_t i = 0; i < len; i++) {
-    payload_buffer[4+i] = data[i];
-  }
-
-  TuyaSendCmd(TUYA_CMD_SET_DP, payload_buffer, payload_len);
-}
-
-bool TuyaSetPower(void)
-{
-  bool status = false;
-
-  uint8_t rpower = XdrvMailbox.index;
-  int16_t source = XdrvMailbox.payload;
-
-  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1 + active_device - 1);
-  if (dpid == 0) dpid = TuyaGetDpId(TUYA_MCU_FUNC_REL1_INV + active_device - 1);
-
-  if (source != SRC_SWITCH && TuyaSerial) {
-    TuyaSendBool(dpid, bitRead(rpower, active_device-1) ^ bitRead(rel_inverted, active_device-1));
-    status = true;
-  }
-  return status;
-}
-
-bool TuyaSetChannels(void)
-{
-  LightSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
-  delay(20);
-  return true;
-}
-
-void LightSerialDuty(uint16_t duty)
-{
-  uint8_t dpid = TuyaGetDpId(TUYA_MCU_FUNC_DIMMER);
-  if (duty > 0 && !Tuya.ignore_dim && TuyaSerial && dpid > 0) {
-    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
-    if (duty < Settings.dimmer_hw_min) { duty = Settings.dimmer_hw_min; }
-    if (Tuya.new_dim != duty) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim value=%d (id=%d)"), duty, dpid);
-      TuyaSendValue(dpid, duty);
-    }
-  } else if (dpid > 0) {
-    Tuya.ignore_dim = false;
-    duty = changeUIntScale(duty, 0, 255, 0, Settings.dimmer_hw_max);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim skipped value=%d"), duty);
-  } else {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Cannot set dimmer. Dimmer Id unknown"));
-  }
-}
-
-void TuyaRequestState(void)
-{
-  if (TuyaSerial) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Read MCU state"));
-
-    TuyaSendCmd(TUYA_CMD_QUERY_STATE);
-  }
-}
-
-void TuyaResetWifi(void)
-{
-  if (!Settings.flag.button_restrict) {
-    char scmnd[20];
-    snprintf_P(scmnd, sizeof(scmnd), D_CMND_WIFICONFIG " %d", 2);
-    ExecuteCommand(scmnd, SRC_BUTTON);
-  }
-}
-
-void TuyaProcessStatePacket(void) {
-  char scmnd[20];
-  uint8_t dpidStart = 6;
-  uint8_t fnId;
-  uint16_t dpDataLen;
-
-  while (dpidStart + 4 < Tuya.byte_counter) {
-    dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-    fnId = TuyaGetFuncId(Tuya.buffer[dpidStart]);
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: fnId=%d is set for dpId=%d"), fnId, Tuya.buffer[dpidStart]);
-
-      if (Tuya.buffer[dpidStart + 1] == 1) {
-
-        if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
-          if ((power || Settings.light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1))) {
-            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);
-          }
-        } else if (fnId >= TUYA_MCU_FUNC_REL1_INV && fnId <= TUYA_MCU_FUNC_REL8_INV) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d-Inverted --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4]?"Off":"On",bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1?"Off":"On");
-          if (Tuya.buffer[dpidStart + 4] != bitRead(power, fnId - TUYA_MCU_FUNC_REL1_INV) ^ 1) {
-            ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1_INV + 1, Tuya.buffer[dpidStart + 4] ^ 1, SRC_SWITCH);
-          }
-        } else if (fnId >= TUYA_MCU_FUNC_SWT1 && fnId <= TUYA_MCU_FUNC_SWT4) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Switch-%d --> MCU State: %d Current State:%d"),fnId - TUYA_MCU_FUNC_SWT1 + 1,Tuya.buffer[dpidStart + 4], SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1));
-
-          if (SwitchGetVirtual(fnId - TUYA_MCU_FUNC_SWT1) != Tuya.buffer[dpidStart + 4]) {
-            SwitchSetVirtual(fnId - TUYA_MCU_FUNC_SWT1, Tuya.buffer[dpidStart + 4]);
-            SwitchHandler(1);
-          }
-        }
-
-      }
-      else if (Tuya.buffer[dpidStart + 1] == 2) {
-        bool tuya_energy_enabled = (XNRG_16 == energy_flg);
-        uint16_t packetValue = Tuya.buffer[dpidStart + 6] << 8 | Tuya.buffer[dpidStart + 7];
-        if (fnId == TUYA_MCU_FUNC_DIMMER) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
-          Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
-          if ((power || Settings.flag3.tuya_apply_o20) &&
-              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
-            Tuya.ignore_dim = true;
-
-            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
-            ExecuteCommand(scmnd, SRC_SWITCH);
-          }
-        }
-
-  #ifdef USE_ENERGY_SENSOR
-        else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_VOLTAGE) {
-          Energy.voltage[0] = (float)packetValue / 10;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Tuya.buffer[dpidStart], packetValue);
-        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_CURRENT) {
-          Energy.current[0] = (float)packetValue / 1000;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Current=%d"), Tuya.buffer[dpidStart], packetValue);
-        } else if (tuya_energy_enabled && fnId == TUYA_MCU_FUNC_POWER) {
-          Energy.active_power[0] = (float)packetValue / 10;
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Active_Power=%d"), Tuya.buffer[dpidStart], packetValue);
-
-          if (Tuya.lastPowerCheckTime != 0 && Energy.active_power[0] > 0) {
-            Energy.kWhtoday += (float)Energy.active_power[0] * (Rtc.utc_time - Tuya.lastPowerCheckTime) / 36;
-            EnergyUpdateToday();
-          }
-          Tuya.lastPowerCheckTime = Rtc.utc_time;
-        }
-  #endif
-
-      }
-
-
-    dpidStart += dpDataLen + 4;
-  }
-}
-
-void TuyaLowPowerModePacketProcess(void) {
-  switch (Tuya.buffer[3]) {
-    case TUYA_CMD_QUERY_PRODUCT:
-      TuyaHandleProductInfoPacket();
-      TuyaSetWifiLed();
-      break;
-
-    case TUYA_LOW_POWER_CMD_STATE:
-      TuyaProcessStatePacket();
-      Tuya.send_success_next_second = true;
-      break;
-  }
-
-}
-
-void TuyaHandleProductInfoPacket(void) {
-  uint16_t dataLength = Tuya.buffer[4] << 8 | Tuya.buffer[5];
-  char *data = &Tuya.buffer[6];
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("TYA: MCU Product ID: %.*s"), dataLength, data);
-}
-
-void TuyaSendLowPowerSuccessIfNeeded(void) {
-  uint8_t success = 1;
-
-  if (Tuya.send_success_next_second) {
-    TuyaSendCmd(TUYA_LOW_POWER_CMD_STATE, &success, 1);
-    Tuya.send_success_next_second = false;
-  }
-}
-
-void TuyaNormalPowerModePacketProcess(void)
-{
-  switch (Tuya.buffer[3]) {
-    case TUYA_CMD_QUERY_PRODUCT:
-      TuyaHandleProductInfoPacket();
-      TuyaSendCmd(TUYA_CMD_MCU_CONF);
-      break;
-
-    case TUYA_CMD_HEARTBEAT:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Heartbeat"));
-      if (Tuya.buffer[6] == 0) {
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Detected MCU restart"));
-        Tuya.wifi_state = -2;
-      }
-      break;
-
-    case TUYA_CMD_STATE:
-      TuyaProcessStatePacket();
-      break;
-
-    case TUYA_CMD_WIFI_RESET:
-    case TUYA_CMD_WIFI_SELECT:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi Reset"));
-      TuyaResetWifi();
-      break;
-
-    case TUYA_CMD_WIFI_STATE:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX WiFi LED set ACK"));
-      Tuya.wifi_state = TuyaGetTuyaWifiState();
-      break;
-
-    case TUYA_CMD_MCU_CONF:
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX MCU configuration Mode=%d"), Tuya.buffer[5]);
-
-      if (Tuya.buffer[5] == 2) {
-        uint8_t led1_gpio = Tuya.buffer[6];
-        uint8_t key1_gpio = Tuya.buffer[7];
-        bool key1_set = false;
-        bool led1_set = false;
-        for (uint32_t i = 0; i < sizeof(Settings.my_gp); i++) {
-          if (Settings.my_gp.io[i] == GPIO_LED1) led1_set = true;
-          else if (Settings.my_gp.io[i] == GPIO_KEY1) key1_set = true;
-        }
-        if (!Settings.my_gp.io[led1_gpio] && !led1_set) {
-          Settings.my_gp.io[led1_gpio] = GPIO_LED1;
-          restart_flag = 2;
-        }
-        if (!Settings.my_gp.io[key1_gpio] && !key1_set) {
-          Settings.my_gp.io[key1_gpio] = GPIO_KEY1;
-          restart_flag = 2;
-        }
-      }
-      TuyaRequestState();
-      break;
-
-    default:
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: RX unknown command"));
-  }
-}
-
-
-
-
-
-bool TuyaModuleSelected(void)
-{
-  if (!(pin[GPIO_TUYA_RX] < 99) || !(pin[GPIO_TUYA_TX] < 99)) {
-    pin[GPIO_TUYA_TX] = 1;
-    pin[GPIO_TUYA_RX] = 3;
-    Settings.my_gp.io[1] = GPIO_TUYA_TX;
-    Settings.my_gp.io[3] = GPIO_TUYA_RX;
-    restart_flag = 2;
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) == 0 && TUYA_DIMMER_ID > 0) {
-    TuyaAddMcuFunc(TUYA_MCU_FUNC_DIMMER, TUYA_DIMMER_ID);
-  }
-
-  bool relaySet = false;
-
-  for (uint8_t i = 0 ; i < MAX_TUYA_FUNCTIONS; i++) {
-    if ((Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1 && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8 ) ||
-    (Settings.tuya_fnid_map[i].fnid >= TUYA_MCU_FUNC_REL1_INV && Settings.tuya_fnid_map[i].fnid <= TUYA_MCU_FUNC_REL8_INV )) {
-      relaySet = true;
-      devices_present++;
-    }
-  }
-
-  if (!relaySet) {
-    TuyaAddMcuFunc(TUYA_MCU_FUNC_REL1, 1);
-    devices_present++;
-    SettingsSaveAll();
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) != 0) {
-    light_type = LT_SERIAL1;
-  } else {
-    light_type = LT_BASIC;
-  }
-
-  if (TuyaGetDpId(TUYA_MCU_FUNC_LOWPOWER_MODE) != 0) {
-    Tuya.low_power_mode = true;
-    Settings.flag3.fast_power_cycle_disable = true;
-  }
-
-  UpdateDevices();
-  return true;
-}
-
-void TuyaInit(void)
-{
-  Tuya.buffer = (char*)(malloc(TUYA_BUFFER_SIZE));
-  if (Tuya.buffer != nullptr) {
-    TuyaSerial = new TasmotaSerial(pin[GPIO_TUYA_RX], pin[GPIO_TUYA_TX], 2);
-    if (TuyaSerial->begin(9600)) {
-      if (TuyaSerial->hardwareSerial()) { ClaimSerial(); }
-
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Request MCU configuration"));
-
-      TuyaSendCmd(TUYA_CMD_QUERY_PRODUCT);
-    }
-  }
-  Tuya.heartbeat_timer = 0;
-}
-
-void TuyaSerialInput(void)
-{
-  while (TuyaSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = TuyaSerial->read();
-
-    if (serial_in_byte == 0x55) {
-      Tuya.cmd_status = 1;
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-      Tuya.cmd_checksum += serial_in_byte;
-    }
-    else if (Tuya.cmd_status == 1 && serial_in_byte == 0xAA) {
-      Tuya.cmd_status = 2;
-
-      Tuya.byte_counter = 0;
-      Tuya.buffer[Tuya.byte_counter++] = 0x55;
-      Tuya.buffer[Tuya.byte_counter++] = 0xAA;
-      Tuya.cmd_checksum = 0xFF;
-    }
-    else if (Tuya.cmd_status == 2) {
-      if (Tuya.byte_counter == 5) {
-        Tuya.cmd_status = 3;
-        Tuya.data_len = serial_in_byte;
-      }
-      Tuya.cmd_checksum += serial_in_byte;
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-    }
-    else if ((Tuya.cmd_status == 3) && (Tuya.byte_counter == (6 + Tuya.data_len)) && (Tuya.cmd_checksum == serial_in_byte)) {
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-
-      char hex_char[(Tuya.byte_counter * 2) + 2];
-      uint16_t len = Tuya.buffer[4] << 8 | Tuya.buffer[5];
-      Response_P(PSTR("{\"" D_JSON_TUYA_MCU_RECEIVED "\":{\"Data\":\"%s\",\"Cmnd\":%d"), ToHex_P((unsigned char*)Tuya.buffer, Tuya.byte_counter, hex_char, sizeof(hex_char)), Tuya.buffer[3]);
-
-      if (len > 0) {
-        ResponseAppend_P(PSTR(",\"CmndData\":\"%s\""), ToHex_P((unsigned char*)&Tuya.buffer[6], len, hex_char, sizeof(hex_char)));
-        if (TUYA_CMD_STATE == Tuya.buffer[3]) {
-
-
-          uint8_t dpidStart = 6;
-          while (dpidStart + 4 < Tuya.byte_counter) {
-            uint8_t dpId = Tuya.buffer[dpidStart];
-            uint8_t dpDataType = Tuya.buffer[dpidStart + 1];
-            uint16_t dpDataLen = Tuya.buffer[dpidStart + 2] << 8 | Tuya.buffer[dpidStart + 3];
-            const unsigned char *dpData = (unsigned char*)&Tuya.buffer[dpidStart + 4];
-            const char *dpHexData = ToHex_P(dpData, dpDataLen, hex_char, sizeof(hex_char));
-
-            if (TUYA_CMD_STATE == Tuya.buffer[3]) {
-              ResponseAppend_P(PSTR(",\"DpType%uId%u\":"), dpDataType, dpId);
-              if (TUYA_TYPE_BOOL == dpDataType && dpDataLen == 1) {
-                ResponseAppend_P(PSTR("%u"), dpData[0]);
-              } else if (TUYA_TYPE_VALUE == dpDataType && dpDataLen == 4) {
-                uint32_t dpValue = (uint32_t)dpData[0] << 24 | (uint32_t)dpData[1] << 16 | (uint32_t)dpData[2] << 8 | (uint32_t)dpData[3] << 0;
-                ResponseAppend_P(PSTR("%u"), dpValue);
-              } else if (TUYA_TYPE_STRING == dpDataType) {
-                ResponseAppend_P(PSTR("\"%.*s\""), dpDataLen, dpData);
-              } else if (TUYA_TYPE_ENUM == dpDataType && dpDataLen == 1) {
-                ResponseAppend_P(PSTR("%u"), dpData[0]);
-              } else {
-                ResponseAppend_P(PSTR("\"0x%s\""), dpHexData);
-              }
-            }
-
-            ResponseAppend_P(PSTR(",\"%d\":{\"DpId\":%d,\"DpIdType\":%d,\"DpIdData\":\"%s\""), dpId, dpId, dpDataType, dpHexData);
-            if (TUYA_TYPE_STRING == dpDataType) {
-              ResponseAppend_P(PSTR(",\"Type3Data\":\"%.*s\""), dpDataLen, dpData);
-            }
-            ResponseAppend_P(PSTR("}"));
-            dpidStart += dpDataLen + 4;
-          }
-        }
-      }
-
-      ResponseAppend_P(PSTR("}}"));
-
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_TUYA_MCU_RECEIVED));
-      } else {
-        AddLog_P(LOG_LEVEL_DEBUG, mqtt_data);
-      }
-      XdrvRulesProcess();
-
-      if (!Tuya.low_power_mode) {
-        TuyaNormalPowerModePacketProcess();
-      } else {
-        TuyaLowPowerModePacketProcess();
-      }
-
-      Tuya.byte_counter = 0;
-      Tuya.cmd_status = 0;
-      Tuya.cmd_checksum = 0;
-      Tuya.data_len = 0;
-    }
-    else if (Tuya.byte_counter < TUYA_BUFFER_SIZE -1) {
-      Tuya.buffer[Tuya.byte_counter++] = serial_in_byte;
-      Tuya.cmd_checksum += serial_in_byte;
-    } else {
-      Tuya.byte_counter = 0;
-      Tuya.cmd_status = 0;
-      Tuya.cmd_checksum = 0;
-      Tuya.data_len = 0;
-    }
-  }
-}
-
-bool TuyaButtonPressed(void)
-{
-  if (!XdrvMailbox.index && ((PRESSED == XdrvMailbox.payload) && (NOT_PRESSED == Button.last_state[XdrvMailbox.index]))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: Reset GPIO triggered"));
-    TuyaResetWifi();
-    return true;
-  }
-  return false;
-}
-
-uint8_t TuyaGetTuyaWifiState(void) {
-
-  uint8_t wifi_state = 0x02;
-  switch(WifiState()){
-    case WIFI_MANAGER:
-      wifi_state = 0x01;
-      break;
-    case WIFI_RESTART:
-      wifi_state = 0x03;
-      break;
-  }
-
-  if (MqttIsConnected()) {
-    wifi_state = 0x04;
-  }
-
-  return wifi_state;
-}
-
-void TuyaSetWifiLed(void)
-{
-  Tuya.wifi_state = TuyaGetTuyaWifiState();
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Set WiFi LED %d (%d)"), Tuya.wifi_state, WifiState());
-
-  if (Tuya.low_power_mode) {
-    TuyaSendCmd(TUYA_LOW_POWER_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
-  } else {
-    TuyaSendCmd(TUYA_CMD_WIFI_STATE, &Tuya.wifi_state, 1);
-  }
-}
-
-#ifdef USE_ENERGY_SENSOR
-
-
-
-
-bool Xnrg16(uint8_t function)
-{
-  bool result = false;
-
-  if (TUYA_DIMMER == my_module_type) {
-    if (FUNC_PRE_INIT == function) {
-      if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0) {
-        if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0) {
-          Energy.current_available = false;
-        }
-        if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0) {
-          Energy.voltage_available = false;
-        }
-        energy_flg = XNRG_16;
-      }
-    }
-  }
-  return result;
-}
-#endif
-
-
-
-
-
-bool Xdrv16(uint8_t function)
-{
-  bool result = false;
-
-  if (TUYA_DIMMER == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (TuyaSerial) { TuyaSerialInput(); }
-        break;
-      case FUNC_MODULE_INIT:
-        result = TuyaModuleSelected();
-        break;
-      case FUNC_PRE_INIT:
-        TuyaInit();
-        break;
-      case FUNC_SET_DEVICE_POWER:
-        result = TuyaSetPower();
-        break;
-      case FUNC_BUTTON_PRESSED:
-        result = TuyaButtonPressed();
-        break;
-      case FUNC_EVERY_SECOND:
-        if (TuyaSerial && Tuya.wifi_state != TuyaGetTuyaWifiState()) { TuyaSetWifiLed(); }
-        if (!Tuya.low_power_mode) {
-          Tuya.heartbeat_timer++;
-          if (Tuya.heartbeat_timer > 10) {
-            Tuya.heartbeat_timer = 0;
-            TuyaSendCmd(TUYA_CMD_HEARTBEAT);
-          }
-        } else {
-            TuyaSendLowPowerSuccessIfNeeded();
-        }
-        break;
-      case FUNC_SET_CHANNELS:
-        result = TuyaSetChannels();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kTuyaCommand, TuyaCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_17_rcswitch.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_17_rcswitch.ino"
-#ifdef USE_RC_SWITCH
-
-
-
-
-#define XDRV_17 17
-
-#define D_JSON_RF_PROTOCOL "Protocol"
-#define D_JSON_RF_BITS "Bits"
-#define D_JSON_RF_DATA "Data"
-
-#define D_CMND_RFSEND "RFSend"
-#define D_JSON_RF_PULSE "Pulse"
-#define D_JSON_RF_REPEAT "Repeat"
-
-const char kRfSendCommands[] PROGMEM = "|"
-  D_CMND_RFSEND;
-
-void (* const RfSendCommand[])(void) PROGMEM = {
-  &CmndRfSend };
-
-#include <RCSwitch.h>
-
-RCSwitch mySwitch = RCSwitch();
-
-#define RF_TIME_AVOID_DUPLICATE 1000
-
-uint32_t rf_lasttime = 0;
-
-void RfReceiveCheck(void)
-{
-  if (mySwitch.available()) {
-
-    unsigned long data = mySwitch.getReceivedValue();
-    unsigned int bits = mySwitch.getReceivedBitlength();
-    int protocol = mySwitch.getReceivedProtocol();
-    int delay = mySwitch.getReceivedDelay();
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFR: Data 0x%lX (%u), Bits %d, Protocol %d, Delay %d"), data, data, bits, protocol, delay);
-
-    uint32_t now = millis();
-    if ((now - rf_lasttime > RF_TIME_AVOID_DUPLICATE) && (data > 0)) {
-      rf_lasttime = now;
-
-      char stemp[16];
-      if (Settings.flag.rf_receive_decimal) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%u"), (uint32_t)data);
-      } else {
-        snprintf_P(stemp, sizeof(stemp), PSTR("\"0x%lX\""), (uint32_t)data);
-      }
-      ResponseTime_P(PSTR(",\"" D_JSON_RFRECEIVED "\":{\"" D_JSON_RF_DATA "\":%s,\"" D_JSON_RF_BITS "\":%d,\"" D_JSON_RF_PROTOCOL "\":%d,\"" D_JSON_RF_PULSE "\":%d}}"),
-        stemp, bits, protocol, delay);
-      MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_RFRECEIVED));
-      XdrvRulesProcess();
-#ifdef USE_DOMOTICZ
-      DomoticzSensor(DZ_COUNT, data);
-#endif
-    }
-    mySwitch.resetAvailable();
-  }
-}
-
-void RfInit(void)
-{
-  if (pin[GPIO_RFSEND] < 99) {
-    mySwitch.enableTransmit(pin[GPIO_RFSEND]);
-  }
-  if (pin[GPIO_RFRECV] < 99) {
-    pinMode( pin[GPIO_RFRECV], INPUT);
-    mySwitch.enableReceive(pin[GPIO_RFRECV]);
-  }
-}
-
-
-
-
-
-void CmndRfSend(void)
-{
-  bool error = false;
-
-  if (XdrvMailbox.data_len) {
-    unsigned long data = 0;
-    unsigned int bits = 24;
-    int protocol = 1;
-    int repeat = 10;
-    int pulse = 350;
-
-    char dataBufUc[XdrvMailbox.data_len + 1];
-    UpperCase(dataBufUc, XdrvMailbox.data);
-    StaticJsonBuffer<150> jsonBuf;
-    JsonObject &root = jsonBuf.parseObject(dataBufUc);
-    if (root.success()) {
-
-      char parm_uc[10];
-      data = strtoul(root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_DATA))], nullptr, 0);
-      bits = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_BITS))];
-      protocol = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PROTOCOL))];
-      repeat = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_REPEAT))];
-      pulse = root[UpperCase_P(parm_uc, PSTR(D_JSON_RF_PULSE))];
-    } else {
-
-      char *p;
-      uint8_t i = 0;
-      for (char *str = strtok_r(XdrvMailbox.data, ", ", &p); str && i < 5; str = strtok_r(nullptr, ", ", &p)) {
-        switch (i++) {
-        case 0:
-          data = strtoul(str, nullptr, 0);
-          break;
-        case 1:
-          bits = atoi(str);
-          break;
-        case 2:
-          protocol = atoi(str);
-          break;
-        case 3:
-          repeat = atoi(str);
-          break;
-        case 4:
-          pulse = atoi(str);
-        }
-      }
-    }
-
-    if (!protocol) { protocol = 1; }
-    mySwitch.setProtocol(protocol);
-    if (!pulse) { pulse = 350; }
-    mySwitch.setPulseLength(pulse);
-    if (!repeat) { repeat = 10; }
-    mySwitch.setRepeatTransmit(repeat);
-    if (!bits) { bits = 24; }
-    if (data) {
-      mySwitch.send(data, bits);
-      ResponseCmndDone();
-    } else {
-      error = true;
-    }
-  } else {
-    error = true;
-  }
-  if (error) {
-    Response_P(PSTR("{\"" D_CMND_RFSEND "\":\"" D_JSON_NO " " D_JSON_RF_DATA ", " D_JSON_RF_BITS ", " D_JSON_RF_PROTOCOL ", " D_JSON_RF_REPEAT " " D_JSON_OR " " D_JSON_RF_PULSE "\"}"));
-  }
-}
-
-
-
-
-
-bool Xdrv17(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_RFSEND] < 99) || (pin[GPIO_RFRECV] < 99)) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (pin[GPIO_RFRECV] < 99) {
-          RfReceiveCheck();
-        }
-        break;
-      case FUNC_COMMAND:
-        if (pin[GPIO_RFSEND] < 99) {
-          result = DecodeCommand(kRfSendCommands, RfSendCommand);
-        }
-        break;
-      case FUNC_INIT:
-        RfInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_18_armtronix_dimmers.ino"
-#ifdef USE_LIGHT
-#ifdef USE_ARMTRONIX_DIMMERS
-
-
-
-
-
-
-
-#define XDRV_18 18
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *ArmtronixSerial = nullptr;
-
-struct ARMTRONIX {
-  bool ignore_dim = false;
-  int8_t wifi_state = -2;
-  int8_t dim_state[2];
-  int8_t knob_state[2];
-} Armtronix;
-
-
-
-
-
-bool ArmtronixSetChannels(void)
-{
-  LightSerial2Duty(((uint8_t*)XdrvMailbox.data)[0], ((uint8_t*)XdrvMailbox.data)[1]);
-  return true;
-}
-
-void LightSerial2Duty(uint8_t duty1, uint8_t duty2)
-{
-  if (ArmtronixSerial && !Armtronix.ignore_dim) {
-    duty1 = ((float)duty1)/2.575757;
-    duty2 = ((float)duty2)/2.575757;
-    Armtronix.dim_state[0] = duty1;
-    Armtronix.dim_state[1] = duty2;
-    ArmtronixSerial->print("Dimmer1:");
-    ArmtronixSerial->print(duty1);
-    ArmtronixSerial->print("\nDimmer2:");
-    ArmtronixSerial->println(duty2);
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Serial Packet Dim Values=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
-
-  } else {
-    Armtronix.ignore_dim = false;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send Dim Level skipped due to already set. Value=%d,%d"), Armtronix.dim_state[0],Armtronix.dim_state[1]);
-
-  }
-}
-
-void ArmtronixRequestState(void)
-{
-  if (ArmtronixSerial) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("ARM: Request MCU state"));
-    ArmtronixSerial->println("Status");
-
-  }
-}
-
-
-
-
-
-bool ArmtronixModuleSelected(void)
-{
-  devices_present++;
-  light_type = LT_SERIAL2;
-  return true;
-}
-
-void ArmtronixInit(void)
-{
-  Armtronix.dim_state[0] = -1;
-  Armtronix.dim_state[1] = -1;
-  Armtronix.knob_state[0] = -1;
-  Armtronix.knob_state[1] = -1;
-  ArmtronixSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-  if (ArmtronixSerial->begin(115200)) {
-    if (ArmtronixSerial->hardwareSerial()) { ClaimSerial(); }
-    ArmtronixSerial->println("Status");
-  }
-}
-
-void ArmtronixSerialInput(void)
-{
-  String answer;
-  int8_t newDimState[2];
-  uint8_t temp;
-  int commaIndex;
-  char scmnd[20];
-  if (ArmtronixSerial->available()) {
-    yield();
-    answer = ArmtronixSerial->readStringUntil('\n');
-    if (answer.substring(0,7) == "Status:") {
-      commaIndex = 6;
-      for (uint32_t i =0; i<2; i++) {
-        newDimState[i] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-        if (newDimState[i] != Armtronix.dim_state[i]) {
-          temp = ((float)newDimState[i])*1.01010101010101;
-          Armtronix.dim_state[i] = newDimState[i];
-          Armtronix.ignore_dim = true;
-          snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_CHANNEL "%d %d"),i+1, temp);
-          ExecuteCommand(scmnd,SRC_SWITCH);
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Send CMND_CHANNEL=%s"), scmnd );
-        }
-        commaIndex = answer.indexOf(',',commaIndex+1);
-      }
-      Armtronix.knob_state[0] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-      commaIndex = answer.indexOf(',',commaIndex+1);
-      Armtronix.knob_state[1] = answer.substring(commaIndex+1,answer.indexOf(',',commaIndex+1)).toInt();
-    }
-  }
-}
-
-void ArmtronixSetWifiLed(void)
-{
-  uint8_t wifi_state = 0x02;
-
-  switch (WifiState()) {
-    case WIFI_MANAGER:
-      wifi_state = 0x01;
-      break;
-    case WIFI_RESTART:
-      wifi_state = 0x03;
-      break;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ARM: Set WiFi LED to state %d (%d)"), wifi_state, WifiState());
-
-  char state = '0' + ((wifi_state & 1) > 0);
-  ArmtronixSerial->print("Setled:");
-  ArmtronixSerial->write(state);
-  ArmtronixSerial->write(',');
-  state = '0' + ((wifi_state & 2) > 0);
-  ArmtronixSerial->write(state);
-  ArmtronixSerial->write(10);
-  Armtronix.wifi_state = WifiState();
-}
-
-
-
-
-
-bool Xdrv18(uint8_t function)
-{
-  bool result = false;
-
-  if (ARMTRONIX_DIMMERS == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (ArmtronixSerial) { ArmtronixSerialInput(); }
-        break;
-      case FUNC_MODULE_INIT:
-        result = ArmtronixModuleSelected();
-        break;
-      case FUNC_INIT:
-        ArmtronixInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        if (ArmtronixSerial) {
-          if (Armtronix.wifi_state!=WifiState()) { ArmtronixSetWifiLed(); }
-          if (uptime &1) {
-            ArmtronixSerial->println("Status");
-          }
-        }
-        break;
-      case FUNC_SET_CHANNELS:
-        result = ArmtronixSetChannels();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_19_ps16dz_dimmer.ino"
-#ifdef USE_LIGHT
-#ifdef USE_PS_16_DZ
-
-
-
-
-#define XDRV_19 19
-
-#define PS16DZ_BUFFER_SIZE 80
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PS16DZSerial = nullptr;
-
-struct PS16DZ {
-  char *rx_buffer = nullptr;
-  int byte_counter = 0;
-  uint8_t dimmer = 0;
-} Ps16dz;
-
-
-
-
-
-void PS16DZSerialSend(const char *tx_buffer)
-{
-
-
-  PS16DZSerial->print(tx_buffer);
-  PS16DZSerial->write(0x1B);
-  PS16DZSerial->flush();
-}
-
-void PS16DZSerialSendOk(void)
-{
-  char tx_buffer[16];
-  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+SEND=ok"));
-  PS16DZSerialSend(tx_buffer);
-}
-
-
-
-
-void PS16DZSerialSendUpdateCommand(void)
-{
-  uint8_t light_state_dimmer = light_state.getDimmer();
-
-  light_state_dimmer = (light_state_dimmer < Settings.dimmer_hw_min) ? Settings.dimmer_hw_min : light_state_dimmer;
-  light_state_dimmer = (light_state_dimmer > Settings.dimmer_hw_max) ? Settings.dimmer_hw_max : light_state_dimmer;
-
-  char tx_buffer[80];
-  snprintf_P(tx_buffer, sizeof(tx_buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"bright\":%d"),
-    LocalTime(), millis()%1000, power?"on":"off", light_state_dimmer);
-
-  PS16DZSerialSend(tx_buffer);
-}
-
-
-
-
-
-void PS16DZSerialInput(void)
-{
-  char scmnd[20];
-  while (PS16DZSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = PS16DZSerial->read();
-    if (serial_in_byte != 0x1B) {
-      if (Ps16dz.byte_counter >= PS16DZ_BUFFER_SIZE - 1) {
-        memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
-        Ps16dz.byte_counter = 0;
-      }
-      if (Ps16dz.byte_counter || (!Ps16dz.byte_counter && ('A' == serial_in_byte))) {
-        Ps16dz.rx_buffer[Ps16dz.byte_counter++] = serial_in_byte;
-      }
-    } else {
-      Ps16dz.rx_buffer[Ps16dz.byte_counter++] = 0x00;
-
-
-
-
-      if (!strncmp(Ps16dz.rx_buffer+3, "RESULT", 6)) {
-
-      }
-      else if (!strncmp(Ps16dz.rx_buffer+3, "UPDATE", 6)) {
-
-        char *end_str;
-        char *string = Ps16dz.rx_buffer+10;
-        char *token = strtok_r(string, ",", &end_str);
-
-        bool is_switch_change = false;
-        bool is_brightness_change = false;
-
-        while (token != nullptr) {
-          char* end_token;
-          char* token2 = strtok_r(token, ":", &end_token);
-          char* token3 = strtok_r(nullptr, ":", &end_token);
-
-          if (!strncmp(token2, "\"switch\"", 8)) {
-            bool switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
-
-
-
-            is_switch_change = (switch_state != power);
-            if (is_switch_change) {
-              ExecuteCommandPower(1, switch_state, SRC_SWITCH);
-            }
-          }
-          else if (!strncmp(token2, "\"bright\"", 8)) {
-            Ps16dz.dimmer = atoi(token3);
-
-
-
-            is_brightness_change = Ps16dz.dimmer != Settings.light_dimmer;
-            if (power && (Ps16dz.dimmer > 0) && is_brightness_change) {
-              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Ps16dz.dimmer);
-              ExecuteCommand(scmnd, SRC_SWITCH);
-            }
-          }
-          else if (!strncmp(token2, "\"sequence\"", 10)) {
-
-
-
-          }
-          token = strtok_r(nullptr, ",", &end_str);
-        }
-
-        if (!is_brightness_change) {
-
-
-
-          PS16DZSerialSendOk();
-        }
-      }
-      else if (!strncmp(Ps16dz.rx_buffer+3, "SETTING", 7)) {
-
-
-        if (!Settings.flag.button_restrict) {
-          int state = WIFI_MANAGER;
-          if (!strncmp(Ps16dz.rx_buffer+10, "=exit", 5)) { state = WIFI_RETRY; }
-          if (state != Settings.sta_config) {
-            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " %d"), state);
-            ExecuteCommand(scmnd, SRC_BUTTON);
-          }
-        }
-      }
-      memset(Ps16dz.rx_buffer, 0, PS16DZ_BUFFER_SIZE);
-      Ps16dz.byte_counter = 0;
-    }
-  }
-}
-
-bool PS16DZSerialSendUpdateCommandIfRequired(void)
-{
-  if (!PS16DZSerial) { return true; }
-
-  bool is_switch_change = (XdrvMailbox.payload != SRC_SWITCH);
-  bool is_brightness_change = (light_state.getDimmer() != Ps16dz.dimmer);
-
-  if (is_switch_change || is_brightness_change) {
-    PS16DZSerialSendUpdateCommand();
-  }
-
-  return true;
-}
-
-void PS16DZInit(void)
-{
-  Ps16dz.rx_buffer = (char*)(malloc(PS16DZ_BUFFER_SIZE));
-  if (Ps16dz.rx_buffer != nullptr) {
-    PS16DZSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-    if (PS16DZSerial->begin(19200)) {
-      if (PS16DZSerial->hardwareSerial()) { ClaimSerial(); }
-    }
-  }
-}
-
-bool PS16DZModuleSelected(void)
-{
-  devices_present++;
-  light_type = LT_SERIAL1;
-
-  return true;
-}
-
-
-
-
-
-bool Xdrv19(uint8_t function)
-{
-  bool result = false;
-
-  if (PS_16_DZ == my_module_type) {
-    switch (function) {
-      case FUNC_LOOP:
-        if (PS16DZSerial) { PS16DZSerialInput(); }
-        break;
-      case FUNC_SET_DEVICE_POWER:
-      case FUNC_SET_CHANNELS:
-        result = PS16DZSerialSendUpdateCommandIfRequired();
-        break;
-      case FUNC_INIT:
-        PS16DZInit();
-        break;
-      case FUNC_MODULE_INIT:
-        result = PS16DZModuleSelected();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
-#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined(USE_EMULATION_HUE) && defined(USE_LIGHT)
-# 31 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
-#define XDRV_20 20
-
-const char HUE_RESPONSE[] PROGMEM =
-  "HTTP/1.1 200 OK\r\n"
-  "HOST: 239.255.255.250:1900\r\n"
-  "CACHE-CONTROL: max-age=100\r\n"
-  "EXT:\r\n"
-  "LOCATION: http://%s:80/description.xml\r\n"
-  "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.24.0\r\n"
-  "hue-bridgeid: %s\r\n";
-const char HUE_ST1[] PROGMEM =
-  "ST: upnp:rootdevice\r\n"
-  "USN: uuid:%s::upnp:rootdevice\r\n"
-  "\r\n";
-const char HUE_ST2[] PROGMEM =
-  "ST: uuid:%s\r\n"
-  "USN: uuid:%s\r\n"
-  "\r\n";
-const char HUE_ST3[] PROGMEM =
-  "ST: urn:schemas-upnp-org:device:basic:1\r\n"
-  "USN: uuid:%s\r\n"
-  "\r\n";
-
-String HueBridgeId(void)
-{
-  String temp = WiFi.macAddress();
-  temp.replace(":", "");
-  String bridgeid = temp.substring(0, 6) + "FFFE" + temp.substring(6);
-  return bridgeid;
-}
-
-String HueSerialnumber(void)
-{
-  String serial = WiFi.macAddress();
-  serial.replace(":", "");
-  serial.toLowerCase();
-  return serial;
-}
-
-String HueUuid(void)
-{
-  String uuid = F("f6543a06-da50-11ba-8d8f-");
-  uuid += HueSerialnumber();
-  return uuid;
-}
-
-void HueRespondToMSearch(void)
-{
-  char message[TOPSZ];
-
-  TickerMSearch.detach();
-  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
-    char response[320];
-    snprintf_P(response, sizeof(response), HUE_RESPONSE, WiFi.localIP().toString().c_str(), HueBridgeId().c_str());
-    int len = strlen(response);
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST1, HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST2, HueUuid().c_str(), HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(response + len, sizeof(response) - len, HUE_ST3, HueUuid().c_str());
-    PortUdp.write(response);
-    PortUdp.endPacket();
-
-    snprintf_P(message, sizeof(message), PSTR(D_3_RESPONSE_PACKETS_SENT));
-  } else {
-    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
-  }
-
-  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_HUE " %s " D_TO " %s:%d"),
-    message, udp_remote_ip.toString().c_str(), udp_remote_port);
-
-  udp_response_mutex = false;
-}
-
-
-
-
-
-const char HUE_DESCRIPTION_XML[] PROGMEM =
-  "<?xml version=\"1.0\"?>"
-  "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">"
-  "<specVersion>"
-    "<major>1</major>"
-    "<minor>0</minor>"
-  "</specVersion>"
-
-  "<URLBase>http://{x1:80/</URLBase>"
-  "<device>"
-    "<deviceType>urn:schemas-upnp-org:device:Basic:1</deviceType>"
-    "<friendlyName>Amazon-Echo-HA-Bridge ({x1)</friendlyName>"
-
-    "<manufacturer>Royal Philips Electronics</manufacturer>"
-    "<manufacturerURL>http://www.philips.com</manufacturerURL>"
-    "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
-    "<modelName>Philips hue bridge 2012</modelName>"
-    "<modelNumber>929000226503</modelNumber>"
-    "<serialNumber>{x3</serialNumber>"
-    "<UDN>uuid:{x2</UDN>"
-  "</device>"
-  "</root>\r\n"
-  "\r\n";
-const char HUE_LIGHTS_STATUS_JSON1[] PROGMEM =
-  "{\"on\":{state},"
-  "{light_status}"
-  "\"alert\":\"none\","
-  "\"effect\":\"none\","
-  "\"reachable\":true}";
-const char HUE_LIGHTS_STATUS_JSON2[] PROGMEM =
-  ",\"type\":\"Extended color light\","
-  "\"name\":\"{j1\","
-  "\"modelid\":\"LCT007\","
-  "\"uniqueid\":\"{j2\","
-  "\"swversion\":\"5.50.1.19085\"}";
-const char HUE_GROUP0_STATUS_JSON[] PROGMEM =
-  "{\"name\":\"Group 0\","
-   "\"lights\":[{l1],"
-   "\"type\":\"LightGroup\","
-   "\"action\":";
-
-const char HueConfigResponse_JSON[] PROGMEM =
-  "{\"name\":\"Philips hue\","
-   "\"mac\":\"{ma\","
-   "\"dhcp\":true,"
-   "\"ipaddress\":\"{ip\","
-   "\"netmask\":\"{ms\","
-   "\"gateway\":\"{gw\","
-   "\"proxyaddress\":\"none\","
-   "\"proxyport\":0,"
-   "\"bridgeid\":\"{br\","
-   "\"UTC\":\"{dt\","
-   "\"whitelist\":{\"{id\":{"
-     "\"last use date\":\"{dt\","
-     "\"create date\":\"{dt\","
-     "\"name\":\"Remote\"}},"
-   "\"swversion\":\"01041302\","
-   "\"apiversion\":\"1.17.0\","
-   "\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
-   "\"linkbutton\":false,"
-   "\"portalservices\":false"
-  "}";
-const char HUE_LIGHT_RESPONSE_JSON[] PROGMEM =
-  "{\"success\":{\"/lights/{id/state/{cm\":{re}}";
-const char HUE_ERROR_JSON[] PROGMEM =
-  "[{\"error\":{\"type\":901,\"address\":\"/\",\"description\":\"Internal Error\"}}]";
-
-
-
-String GetHueDeviceId(uint8_t id)
-{
-  String deviceid = WiFi.macAddress() + F(":00:11-") + String(id);
-  deviceid.toLowerCase();
-  return deviceid;
-}
-
-String GetHueUserId(void)
-{
-  char userid[7];
-
-  snprintf_P(userid, sizeof(userid), PSTR("%03x"), ESP.getChipId());
-  return String(userid);
-}
-
-void HandleUpnpSetupHue(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_HUE_BRIDGE_SETUP));
-  String description_xml = FPSTR(HUE_DESCRIPTION_XML);
-  description_xml.replace("{x1", WiFi.localIP().toString());
-  description_xml.replace("{x2", HueUuid());
-  description_xml.replace("{x3", HueSerialnumber());
-  WSSend(200, CT_XML, description_xml);
-}
-
-void HueNotImplemented(String *path)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API_NOT_IMPLEMENTED " (%s)"), path->c_str());
-
-  WSSend(200, CT_JSON, "{}");
-}
-
-void HueConfigResponse(String *response)
-{
-  *response += FPSTR(HueConfigResponse_JSON);
-  response->replace("{ma", WiFi.macAddress());
-  response->replace("{ip", WiFi.localIP().toString());
-  response->replace("{ms", WiFi.subnetMask().toString());
-  response->replace("{gw", WiFi.gatewayIP().toString());
-  response->replace("{br", HueBridgeId());
-  response->replace("{dt", GetDateAndTime(DT_UTC));
-  response->replace("{id", GetHueUserId());
-}
-
-void HueConfig(String *path)
-{
-  String response = "";
-  HueConfigResponse(&response);
-  WSSend(200, CT_JSON, response);
-}
-
-
-
-bool g_gotct = false;
-
-
-
-
-uint16_t prev_hue = 0;
-uint8_t prev_sat = 0;
-uint8_t prev_bri = 254;
-uint16_t prev_ct = 254;
-char prev_x_str[24] = "\0";
-char prev_y_str[24] = "\0";
-
-uint8_t getLocalLightSubtype(uint8_t device) {
-  if (light_type) {
-    if (device >= Light.device) {
-      if (Settings.flag3.pwm_multi_channels) {
-        return LST_SINGLE;
-      } else {
-        return Light.subtype;
-      }
-    } else {
-      return LST_NONE;
-    }
-  } else {
-    return LST_NONE;
-  }
-}
-
-void HueLightStatus1(uint8_t device, String *response)
-{
-  uint16_t ct = 0;
-  uint8_t color_mode;
-  String light_status = "";
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint32_t echo_gen = findEchoGeneration();
-
-
-  uint8_t local_light_subtype = getLocalLightSubtype(device);
-
-  bri = LightGetBri(device);
-  if (bri > 254) bri = 254;
-  if (bri < 1) bri = 1;
-
-#ifdef USE_SHUTTER
-  if (ShutterState(device)) {
-    bri = (float)((Settings.shutter_options[device-1] & 1) ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
-  }
-#endif
-
-  if (light_type) {
-    light_state.getHSB(&hue, &sat, nullptr);
-
-    if ((bri > prev_bri ? bri - prev_bri : prev_bri - bri) < 1)
-      bri = prev_bri;
-
-    if (sat > 254) sat = 254;
-    if ((sat > prev_sat ? sat - prev_sat : prev_sat - sat) < 1) {
-      sat = prev_sat;
-    } else {
-      prev_x_str[0] = prev_y_str[0] = 0;
-    }
-
-    hue = changeUIntScale(hue, 0, 359, 0, 65535);
-    if ((hue > prev_hue ? hue - prev_hue : prev_hue - hue) < 400) {
-      hue = prev_hue;
-    } else {
-      prev_x_str[0] = prev_y_str[0] = 0;
-    }
-
-    color_mode = light_state.getColorMode();
-    ct = light_state.getCT();
-    if (LCM_RGB == color_mode) { g_gotct = false; }
-    if (LCM_CT == color_mode) { g_gotct = true; }
-
-
-
-    if ((ct > prev_ct ? ct - prev_ct : prev_ct - ct) < 1)
-      ct = prev_ct;
-
-
-
-  }
-
-  *response += FPSTR(HUE_LIGHTS_STATUS_JSON1);
-  response->replace("{state}", (power & (1 << (device-1))) ? "true" : "false");
-
-  if ((1 == echo_gen) || (LST_SINGLE <= local_light_subtype)) {
-    light_status += "\"bri\":";
-    light_status += String(bri);
-    light_status += ",";
-  }
-  if (LST_COLDWARM <= local_light_subtype) {
-    light_status += F("\"colormode\":\"");
-    light_status += (g_gotct ? "ct" : "hs");
-    light_status += "\",";
-  }
-  if (LST_RGB <= local_light_subtype) {
-    if (prev_x_str[0] && prev_y_str[0]) {
-      light_status += "\"xy\":[";
-      light_status += prev_x_str;
-      light_status += ",";
-      light_status += prev_y_str;
-      light_status += "],";
-    } else {
-      float x, y;
-        light_state.getXY(&x, &y);
-      light_status += "\"xy\":[";
-      light_status += String(x, 5);
-      light_status += ",";
-      light_status += String(y, 5);
-      light_status += "],";
-    }
-    light_status += "\"hue\":";
-    light_status += String(hue);
-    light_status += ",";
-
-    light_status += "\"sat\":";
-    light_status += String(sat);
-    light_status += ",";
-  }
-  if (LST_COLDWARM == local_light_subtype || LST_RGBW <= local_light_subtype) {
-    light_status += "\"ct\":";
-    light_status += String(ct > 0 ? ct : 284);
-    light_status += ",";
-  }
-  response->replace("{light_status}", light_status);
-}
-
-
-
-bool HueActive(uint8_t device) {
-  if (device > MAX_FRIENDLYNAMES) { device = MAX_FRIENDLYNAMES; }
-  return '$' != *SettingsText(SET_FRIENDLYNAME1 +device -1);
-}
-
-void HueLightStatus2(uint8_t device, String *response)
-{
-  *response += FPSTR(HUE_LIGHTS_STATUS_JSON2);
-  if (device <= MAX_FRIENDLYNAMES) {
-    response->replace("{j1", SettingsText(SET_FRIENDLYNAME1 +device -1));
-  } else {
-    char fname[33];
-    strcpy(fname, SettingsText(SET_FRIENDLYNAME1 + MAX_FRIENDLYNAMES -1));
-    uint32_t fname_len = strlen(fname);
-    if (fname_len > 30) { fname_len = 30; }
-    fname[fname_len++] = '-';
-    if (device - MAX_FRIENDLYNAMES < 10) {
-      fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
-    } else {
-      fname[fname_len++] = 'A' + device - MAX_FRIENDLYNAMES - 10;
-    }
-    fname[fname_len] = 0x00;
-
-    response->replace("{j1", fname);
-  }
-  response->replace("{j2", GetHueDeviceId(device));
-}
-
-
-
-
-uint32_t EncodeLightId(uint8_t relay_id)
-{
-  uint8_t mac[6];
-  WiFi.macAddress(mac);
-  uint32_t id = 0;
-
-  if (relay_id >= 32) {
-    relay_id = 0;
-  }
-  if (relay_id > 15) {
-    id = (1 << 28);
-  }
-
-  id |= (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (relay_id & 0xF);
-  return id;
-}
-
-
-
-uint32_t DecodeLightId(uint32_t hue_id) {
-  uint8_t relay_id = hue_id & 0xF;
-  if (hue_id & (1 << 28)) {
-    relay_id += 16;
-  }
-  if (0 == relay_id) {
-    relay_id = 32;
-  }
-  return relay_id;
-}
-
-static const char * FIRST_GEN_UA[] = {
-  "AEOBC",
-};
-
-
-uint32_t findEchoGeneration(void) {
-
-  String user_agent = WebServer->header("User-Agent");
-  uint32_t gen = 2;
-
-  for (uint32_t i = 0; i < sizeof(FIRST_GEN_UA)/sizeof(char*); i++) {
-    if (user_agent.indexOf(FIRST_GEN_UA[i]) >= 0) {
-      gen = 1;
-      break;
-    }
-  }
-  if (0 == user_agent.length()) {
-    gen = 1;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, D_LOG_HTTP D_HUE " User-Agent: %s, gen=%d", user_agent.c_str(), gen);
-
-  return gen;
-}
-
-void HueGlobalConfig(String *path) {
-  String response;
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  path->remove(0,1);
-  response = F("{\"lights\":{");
-  bool appending = false;
-  for (uint32_t i = 1; i <= maxhue; i++) {
-    if (HueActive(i)) {
-      if (appending) { response += ","; }
-      response += "\"";
-      response += EncodeLightId(i);
-      response += F("\":{\"state\":");
-      HueLightStatus1(i, &response);
-      HueLightStatus2(i, &response);
-      appending = true;
-    }
-  }
-  response += F("},\"groups\":{},\"schedules\":{},\"config\":");
-  HueConfigResponse(&response);
-  response += "}";
-  WSSend(200, CT_JSON, response);
-}
-
-void HueAuthentication(String *path)
-{
-  char response[38];
-
-  snprintf_P(response, sizeof(response), PSTR("[{\"success\":{\"username\":\"%s\"}}]"), GetHueUserId().c_str());
-  WSSend(200, CT_JSON, response);
-}
-
-void HueLights(String *path)
-{
-
-
-
-  String response;
-  int code = 200;
-  uint16_t tmp = 0;
-  uint16_t hue = 0;
-  uint8_t sat = 0;
-  uint8_t bri = 254;
-  uint16_t ct = 0;
-  bool resp = false;
-  bool on = false;
-  bool change = false;
-  uint8_t device = 1;
-  uint8_t local_light_subtype = Light.subtype;
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  path->remove(0,path->indexOf("/lights"));
-  if (path->endsWith("/lights")) {
-    response = "{";
-    bool appending = false;
-    for (uint32_t i = 1; i <= maxhue; i++) {
-      if (HueActive(i)) {
-        if (appending) { response += ","; }
-        response += "\"";
-        response += EncodeLightId(i);
-        response += F("\":{\"state\":");
-        HueLightStatus1(i, &response);
-        HueLightStatus2(i, &response);
-        appending = true;
-      }
-    }
-#ifdef USE_SCRIPT_HUE
-    Script_Check_Hue(&response);
-#endif
-    response += "}";
-  }
-  else if (path->endsWith("/state")) {
-    path->remove(0,8);
-    path->remove(path->indexOf("/state"));
-    device = DecodeLightId(atoi(path->c_str()));
-
-#ifdef USE_SCRIPT_HUE
-    if (device>devices_present) {
-      return Script_Handle_Hue(path);
-    }
-#endif
-
-    if ((device < 1) || (device > maxhue)) {
-      device = 1;
-    }
-    local_light_subtype = getLocalLightSubtype(device);
-
-    if (WebServer->args()) {
-      response = "[";
-
-      StaticJsonBuffer<400> jsonBuffer;
-      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
-      if (hue_json.containsKey("on")) {
-
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(EncodeLightId(device)));
-        response.replace("{cm", "on");
-
-#ifdef USE_SHUTTER
-        if (ShutterState(device)) {
-          if (!change) {
-            on = hue_json["on"];
-            bri = on ? 1.0f : 0.0f;
-            change = true;
-          }
-          response.replace("{re", on ? "true" : "false");
-        } else {
-#endif
-          on = hue_json["on"];
-          switch(on)
-          {
-            case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
-                        response.replace("{re", "false");
-                        break;
-            case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
-                        response.replace("{re", "true");
-                        break;
-            default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
-                        break;
-          }
-          resp = true;
-#ifdef USE_SHUTTER
-        }
-#endif
-      }
-
-      if (light_type && (local_light_subtype >= LST_SINGLE)) {
-        if (!Settings.flag3.pwm_multi_channels) {
-          light_state.getHSB(&hue, &sat, nullptr);
-          bri = light_state.getBri();
-          ct = light_state.getCT();
-          uint8_t color_mode = light_state.getColorMode();
-          if (LCM_RGB == color_mode) { g_gotct = false; }
-          if (LCM_CT == color_mode) { g_gotct = true; }
-
-        } else {
-          bri = LightGetBri(device);
-        }
-      }
-      prev_x_str[0] = prev_y_str[0] = 0;
-
-      if (hue_json.containsKey("bri")) {
-        tmp = hue_json["bri"];
-        prev_bri = bri = tmp;
-
-        if (254 <= bri) { bri = 255; }
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "bri");
-        response.replace("{re", String(tmp));
-        if (LST_SINGLE <= Light.subtype) {
-          change = true;
-        }
-        resp = true;
-      }
-
-
-      if (hue_json.containsKey("xy")) {
-        float x, y;
-        x = hue_json["xy"][0];
-        y = hue_json["xy"][1];
-        const String &x_str = hue_json["xy"][0];
-        const String &y_str = hue_json["xy"][1];
-        x_str.toCharArray(prev_x_str, sizeof(prev_x_str));
-        y_str.toCharArray(prev_y_str, sizeof(prev_y_str));
-
-        uint8_t rr,gg,bb;
-        LightStateClass::XyToRgb(x, y, &rr, &gg, &bb);
-        LightStateClass::RgbToHsb(rr, gg, bb, &hue, &sat, nullptr);
-        prev_hue = changeUIntScale(hue, 0, 359, 0, 65535);
-        prev_sat = (sat > 254 ? 254 : sat);
-
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "xy");
-        response.replace("{re", "[" + x_str + "," + y_str + "]");
-        g_gotct = false;
-        resp = true;
-        change = true;
-      }
-      if (hue_json.containsKey("hue")) {
-        tmp = hue_json["hue"];
-        prev_hue = tmp;
-
-        hue = changeUIntScale(tmp, 0, 65535, 0, 359);
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "hue");
-        response.replace("{re", String(tmp));
-        if (LST_RGB <= Light.subtype) {
-          g_gotct = false;
-          change = true;
-        }
-        resp = true;
-      }
-      if (hue_json.containsKey("sat")) {
-        tmp = hue_json["sat"];
-        prev_sat = sat = tmp;
-
-        if (254 <= sat) { sat = 255; }
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "sat");
-        response.replace("{re", String(tmp));
-        if (LST_RGB <= Light.subtype) {
-          g_gotct = false;
-          change = true;
-        }
-        resp = true;
-      }
-      if (hue_json.containsKey("ct")) {
-        ct = hue_json["ct"];
-        prev_ct = ct;
-        if (resp) { response += ","; }
-        response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
-        response.replace("{id", String(device));
-        response.replace("{cm", "ct");
-        response.replace("{re", String(ct));
-        if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
-          g_gotct = true;
-          change = true;
-        }
-        resp = true;
-      }
-      if (change) {
-#ifdef USE_SHUTTER
-        if (ShutterState(device)) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_options[device-1] & 1);
-          ShutterSetPosition(device, bri * 100.0f );
-        } else
-#endif
-        if (light_type && (local_light_subtype > LST_NONE)) {
-          if (!Settings.flag3.pwm_multi_channels) {
-            if (g_gotct) {
-              light_controller.changeCTB(ct, bri);
-            } else {
-              light_controller.changeHSB(hue, sat, bri);
-            }
-            LightPreparePower();
-          } else {
-            LightSetBri(device, bri);
-          }
-          if (LST_COLDWARM <= local_light_subtype) {
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_COLOR));
-          } else {
-            MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_DIMMER));
-          }
-          XdrvRulesProcess();
-        }
-        change = false;
-      }
-      response += "]";
-      if (2 == response.length()) {
-        response = FPSTR(HUE_ERROR_JSON);
-      }
-    }
-    else {
-      response = FPSTR(HUE_ERROR_JSON);
-    }
-  }
-  else if(path->indexOf("/lights/") >= 0) {
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, "/lights path=%s", path->c_str());
-    path->remove(0,8);
-    device = DecodeLightId(atoi(path->c_str()));
-
-#ifdef USE_SCRIPT_HUE
-    if (device>devices_present) {
-      Script_HueStatus(&response,device-devices_present-1);
-      goto exit;
-}
-#endif
-
-    if ((device < 1) || (device > maxhue)) {
-      device = 1;
-    }
-    response += F("{\"state\":");
-    HueLightStatus1(device, &response);
-    HueLightStatus2(device, &response);
-  }
-  else {
-    response = "{}";
-    code = 406;
-  }
-  exit:
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
-  WSSend(code, CT_JSON, response);
-}
-
-void HueGroups(String *path)
-{
-
-
-
-  String response = "{}";
-  uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
-
-  if (path->endsWith("/0")) {
-    response = FPSTR(HUE_GROUP0_STATUS_JSON);
-    String lights = F("\"1\"");
-    for (uint32_t i = 2; i <= maxhue; i++) {
-      lights += ",\"";
-      lights += EncodeLightId(i);
-      lights += "\"";
-    }
-    response.replace("{l1", lights);
-    HueLightStatus1(1, &response);
-    response += F("}");
-  }
-
-  WSSend(200, CT_JSON, response);
-}
-
-void HandleHueApi(String *path)
-{
-# 784 "S:/Development/Tasmota/tasmota/xdrv_20_hue.ino"
-  uint8_t args = 0;
-
-  path->remove(0, 4);
-  uint16_t apilen = path->length();
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_API " (%s)"), path->c_str());
-  for (args = 0; args < WebServer->args(); args++) {
-    String json = WebServer->arg(args);
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE_POST_ARGS " (%s)"), json.c_str());
-  }
-
-  if (path->endsWith("/invalid/")) {}
-  else if (!apilen) HueAuthentication(path);
-  else if (path->endsWith("/")) HueAuthentication(path);
-  else if (path->endsWith("/config")) HueConfig(path);
-  else if (path->indexOf("/lights") >= 0) HueLights(path);
-  else if (path->indexOf("/groups") >= 0) HueGroups(path);
-  else if (path->endsWith("/schedules")) HueNotImplemented(path);
-  else if (path->endsWith("/sensors")) HueNotImplemented(path);
-  else if (path->endsWith("/scenes")) HueNotImplemented(path);
-  else if (path->endsWith("/rules")) HueNotImplemented(path);
-  else if (path->endsWith("/resourcelinks")) HueNotImplemented(path);
-  else HueGlobalConfig(path);
-}
-
-
-
-
-
-bool Xdrv20(uint8_t function)
-{
-  bool result = false;
-
-#ifdef USE_SCRIPT_HUE
-  if ((EMUL_HUE == Settings.flag2.emulation)) {
-#else
-  if (devices_present && (EMUL_HUE == Settings.flag2.emulation)) {
-#endif
-    switch (function) {
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/description.xml", HandleUpnpSetupHue);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_21_wemo.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_21_wemo.ino"
-#if defined(USE_WEBSERVER) && defined(USE_EMULATION) && defined (USE_EMULATION_WEMO)
-
-
-
-
-#define XDRV_21 21
-
-const char WEMO_MSEARCH[] PROGMEM =
-  "HTTP/1.1 200 OK\r\n"
-  "CACHE-CONTROL: max-age=86400\r\n"
-  "DATE: Fri, 15 Apr 2016 04:56:29 GMT\r\n"
-  "EXT:\r\n"
-  "LOCATION: http://%s:80/setup.xml\r\n"
-  "OPT: \"http://schemas.upnp.org/upnp/1/0/\"; ns=01\r\n"
-  "01-NLS: b9200ebb-736d-4b93-bf03-835149d13983\r\n"
-  "SERVER: Unspecified, UPnP/1.0, Unspecified\r\n"
-  "ST: %s\r\n"
-  "USN: uuid:%s::%s\r\n"
-  "X-User-Agent: redsonic\r\n"
-  "\r\n";
-
-String WemoSerialnumber(void)
-{
-  char serial[16];
-
-  snprintf_P(serial, sizeof(serial), PSTR("201612K%08X"), ESP.getChipId());
-  return String(serial);
-}
-
-String WemoUuid(void)
-{
-  char uuid[27];
-
-  snprintf_P(uuid, sizeof(uuid), PSTR("Socket-1_0-%s"), WemoSerialnumber().c_str());
-  return String(uuid);
-}
-
-void WemoRespondToMSearch(int echo_type)
-{
-  char message[TOPSZ];
-
-  TickerMSearch.detach();
-  if (PortUdp.beginPacket(udp_remote_ip, udp_remote_port)) {
-    char type[24];
-    if (1 == echo_type) {
-      strcpy_P(type, URN_BELKIN_DEVICE_CAP);
-    } else {
-      strcpy_P(type, UPNP_ROOTDEVICE);
-    }
-    char response[400];
-    snprintf_P(response, sizeof(response), WEMO_MSEARCH, WiFi.localIP().toString().c_str(), type, WemoUuid().c_str(), type);
-    PortUdp.write(response);
-    PortUdp.endPacket();
-    snprintf_P(message, sizeof(message), PSTR(D_RESPONSE_SENT));
-  } else {
-    snprintf_P(message, sizeof(message), PSTR(D_FAILED_TO_SEND_RESPONSE));
-  }
-
-  PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPNP D_WEMO " " D_JSON_TYPE " %d, %s " D_TO " %s:%d"),
-    echo_type, message, udp_remote_ip.toString().c_str(), udp_remote_port);
-
-  udp_response_mutex = false;
-}
-
-
-
-
-
-const char WEMO_EVENTSERVICE_XML[] PROGMEM =
-  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
-    "<actionList>"
-      "<action>"
-        "<name>SetBinaryState</name>"
-        "<argumentList>"
-          "<argument>"
-            "<retval/>"
-            "<name>BinaryState</name>"
-            "<relatedStateVariable>BinaryState</relatedStateVariable>"
-            "<direction>in</direction>"
-          "</argument>"
-        "</argumentList>"
-      "</action>"
-      "<action>"
-        "<name>GetBinaryState</name>"
-        "<argumentList>"
-          "<argument>"
-            "<retval/>"
-            "<name>BinaryState</name>"
-            "<relatedStateVariable>BinaryState</relatedStateVariable>"
-            "<direction>out</direction>"
-          "</argument>"
-        "</argumentList>"
-      "</action>"
-    "</actionList>"
-    "<serviceStateTable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>BinaryState</name>"
-        "<dataType>bool</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>level</name>"
-        "<dataType>string</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-    "</serviceStateTable>"
-  "</scpd>\r\n\r\n";
-
-const char WEMO_METASERVICE_XML[] PROGMEM =
-  "<scpd xmlns=\"urn:Belkin:service-1-0\">"
-    "<specVersion>"
-      "<major>1</major>"
-      "<minor>0</minor>"
-    "</specVersion>"
-    "<actionList>"
-      "<action>"
-        "<name>GetMetaInfo</name>"
-        "<argumentList>"
-          "<retval />"
-          "<name>GetMetaInfo</name>"
-          "<relatedStateVariable>MetaInfo</relatedStateVariable>"
-          "<direction>in</direction>"
-        "</argumentList>"
-      "</action>"
-    "</actionList>"
-    "<serviceStateTable>"
-      "<stateVariable sendEvents=\"yes\">"
-        "<name>MetaInfo</name>"
-        "<dataType>string</dataType>"
-        "<defaultValue>0</defaultValue>"
-      "</stateVariable>"
-    "</serviceStateTable>"
-  "</scpd>\r\n\r\n";
-
-const char WEMO_RESPONSE_STATE_SOAP[] PROGMEM =
-  "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
-    "<s:Body>"
-      "<u:%cetBinaryStateResponse xmlns:u=\"urn:Belkin:service:basicevent:1\">"
-        "<BinaryState>%d</BinaryState>"
-      "</u:%cetBinaryStateResponse>"
-    "</s:Body>"
-  "</s:Envelope>\r\n";
-
-const char WEMO_SETUP_XML[] PROGMEM =
-  "<?xml version=\"1.0\"?>"
-  "<root xmlns=\"urn:Belkin:device-1-0\">"
-    "<device>"
-      "<deviceType>urn:Belkin:device:controllee:1</deviceType>"
-      "<friendlyName>{x1</friendlyName>"
-      "<manufacturer>Belkin International Inc.</manufacturer>"
-      "<modelName>Socket</modelName>"
-      "<modelNumber>3.1415</modelNumber>"
-      "<UDN>uuid:{x2</UDN>"
-      "<serialNumber>{x3</serialNumber>"
-      "<binaryState>0</binaryState>"
-      "<serviceList>"
-        "<service>"
-          "<serviceType>urn:Belkin:service:basicevent:1</serviceType>"
-          "<serviceId>urn:Belkin:serviceId:basicevent1</serviceId>"
-          "<controlURL>/upnp/control/basicevent1</controlURL>"
-          "<eventSubURL>/upnp/event/basicevent1</eventSubURL>"
-          "<SCPDURL>/eventservice.xml</SCPDURL>"
-        "</service>"
-        "<service>"
-          "<serviceType>urn:Belkin:service:metainfo:1</serviceType>"
-          "<serviceId>urn:Belkin:serviceId:metainfo1</serviceId>"
-          "<controlURL>/upnp/control/metainfo1</controlURL>"
-          "<eventSubURL>/upnp/event/metainfo1</eventSubURL>"
-          "<SCPDURL>/metainfoservice.xml</SCPDURL>"
-        "</service>"
-      "</serviceList>"
-    "</device>"
-  "</root>\r\n";
-
-
-
-void HandleUpnpEvent(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_BASIC_EVENT));
-
-  char event[500];
-  strlcpy(event, WebServer->arg(0).c_str(), sizeof(event));
-
-
-
-
-  char state = 'G';
-  if (strstr_P(event, PSTR("SetBinaryState")) != nullptr) {
-    state = 'S';
-    uint8_t power = POWER_TOGGLE;
-    if (strstr_P(event, PSTR("State>1</Binary")) != nullptr) {
-      power = POWER_ON;
-    }
-    else if (strstr_P(event, PSTR("State>0</Binary")) != nullptr) {
-      power = POWER_OFF;
-    }
-    if (power != POWER_TOGGLE) {
-      uint8_t device = (light_type) ? devices_present : 1;
-      ExecuteCommandPower(device, power, SRC_WEMO);
-    }
-  }
-
-  snprintf_P(event, sizeof(event), WEMO_RESPONSE_STATE_SOAP, state, bitRead(power, devices_present -1), state);
-  WSSend(200, CT_XML, event);
-}
-
-void HandleUpnpService(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_EVENT_SERVICE));
-
-  WSSend(200, CT_PLAIN, FPSTR(WEMO_EVENTSERVICE_XML));
-}
-
-void HandleUpnpMetaService(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_META_SERVICE));
-
-  WSSend(200, CT_PLAIN, FPSTR(WEMO_METASERVICE_XML));
-}
-
-void HandleUpnpSetupWemo(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_SETUP));
-
-  String setup_xml = FPSTR(WEMO_SETUP_XML);
-  setup_xml.replace("{x1", SettingsText(SET_FRIENDLYNAME1));
-  setup_xml.replace("{x2", WemoUuid());
-  setup_xml.replace("{x3", WemoSerialnumber());
-  WSSend(200, CT_XML, setup_xml);
-}
-
-
-
-
-
-bool Xdrv21(uint8_t function)
-{
-  bool result = false;
-
-  if (devices_present && (EMUL_WEMO == Settings.flag2.emulation)) {
-    switch (function) {
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/upnp/control/basicevent1", HTTP_POST, HandleUpnpEvent);
-        WebServer->on("/eventservice.xml", HandleUpnpService);
-        WebServer->on("/metainfoservice.xml", HandleUpnpMetaService);
-        WebServer->on("/setup.xml", HandleUpnpSetupWemo);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-#ifdef USE_SONOFF_IFAN
-
-
-
-
-#define XDRV_22 22
-
-const uint8_t MAX_FAN_SPEED = 4;
-
-const uint8_t kIFan02Speed[MAX_FAN_SPEED] = { 0x00, 0x01, 0x03, 0x05 };
-const uint8_t kIFan03Speed[MAX_FAN_SPEED +2] = { 0x00, 0x01, 0x03, 0x04, 0x05, 0x06 };
-const uint8_t kIFan03Sequence[MAX_FAN_SPEED][MAX_FAN_SPEED] = {{0, 2, 2, 2}, {0, 1, 2, 4}, {1, 1, 2, 5}, {4, 4, 5, 3}};
-
-const char kSonoffIfanCommands[] PROGMEM = "|"
-  D_CMND_FANSPEED;
-
-void (* const SonoffIfanCommand[])(void) PROGMEM = {
-  &CmndFanspeed };
-
-uint8_t ifan_fanspeed_timer = 0;
-uint8_t ifan_fanspeed_goal = 0;
-bool ifan_receive_flag = false;
-bool ifan_restart_flag = true;
-
-
-
-bool IsModuleIfan(void)
-{
-  return ((SONOFF_IFAN02 == my_module_type) || (SONOFF_IFAN03 == my_module_type));
-}
-
-uint8_t MaxFanspeed(void)
-{
-  return MAX_FAN_SPEED;
-}
-
-uint8_t GetFanspeed(void)
-{
-  if (ifan_fanspeed_timer) {
-    return ifan_fanspeed_goal;
-  } else {
-
-
-
-
-
-
-    uint8_t fanspeed = (uint8_t)(power &0xF) >> 1;
-    if (fanspeed) { fanspeed = (fanspeed >> 1) +1; }
-    return fanspeed;
-  }
-}
-
-
-
-void SonoffIFanSetFanspeed(uint8_t fanspeed, bool sequence)
-{
-  ifan_fanspeed_timer = 0;
-  ifan_fanspeed_goal = fanspeed;
-
-  uint8_t fanspeed_now = GetFanspeed();
-
-  if (fanspeed == fanspeed_now) { return; }
-
-  uint8_t fans = kIFan02Speed[fanspeed];
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (sequence) {
-      fanspeed = kIFan03Sequence[fanspeed_now][ifan_fanspeed_goal];
-      if (fanspeed != ifan_fanspeed_goal) {
-        if (0 == fanspeed_now) {
-          ifan_fanspeed_timer = 20;
-        } else {
-          ifan_fanspeed_timer = 2;
-        }
-      }
-    }
-    fans = kIFan03Speed[fanspeed];
-  }
-  for (uint32_t i = 2; i < 5; i++) {
-    uint8_t state = (fans &1) + POWER_OFF_NO_STATE;
-    ExecuteCommandPower(i, state, SRC_IGNORE);
-    fans >>= 1;
-  }
-
-#ifdef USE_DOMOTICZ
-  if (sequence) { DomoticzUpdateFanState(); }
-#endif
-}
-
-
-
-void SonoffIfanReceived(void)
-{
-  char svalue[32];
-
-  uint8_t mode = serial_in_buffer[3];
-  uint8_t action = serial_in_buffer[6];
-
-  if (4 == mode) {
-    if (action < 4) {
-
-
-
-
-      if (action != GetFanspeed()) {
-        snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), action);
-        ExecuteCommand(svalue, SRC_REMOTE);
-#ifdef USE_BUZZER
-        BuzzerEnabledBeep((action) ? action : 1, (action) ? 1 : 4);
-#endif
-      }
-    } else {
-
-      ExecuteCommandPower(1, POWER_TOGGLE, SRC_REMOTE);
-    }
-  }
-  if (6 == mode) {
-
-    Settings.flag3.buzzer_enable = !Settings.flag3.buzzer_enable;
-  }
-  if (7 == mode) {
-
-#ifdef USE_BUZZER
-    BuzzerEnabledBeep(4, 1);
-#endif
-  }
-
-
-
-  serial_in_buffer[5] = 0;
-  serial_in_buffer[6] = 0;
-  for (uint32_t i = 0; i < 7; i++) {
-    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
-    Serial.write(serial_in_buffer[i]);
-  }
-}
-
-bool SonoffIfanSerialInput(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (0xAA == serial_in_byte) {
-      serial_in_byte_counter = 0;
-      ifan_receive_flag = true;
-    }
-    if (ifan_receive_flag) {
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-      if (serial_in_byte_counter == 8) {
-# 176 "S:/Development/Tasmota/tasmota/xdrv_22_sonoff_ifan.ino"
-        AddLogSerial(LOG_LEVEL_DEBUG);
-        uint8_t crc = 0;
-        for (uint32_t i = 2; i < 7; i++) {
-          crc += serial_in_buffer[i];
-        }
-        if (crc == serial_in_buffer[7]) {
-          SonoffIfanReceived();
-          ifan_receive_flag = false;
-          return true;
-        }
-      }
-      serial_in_byte = 0;
-    }
-    return false;
-  }
-}
-
-
-
-
-
-void CmndFanspeed(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    if ('-' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = (int16_t)GetFanspeed() -1;
-      if (XdrvMailbox.payload < 0) { XdrvMailbox.payload = MAX_FAN_SPEED -1; }
-    }
-    else if ('+' == XdrvMailbox.data[0]) {
-      XdrvMailbox.payload = GetFanspeed() +1;
-      if (XdrvMailbox.payload > MAX_FAN_SPEED -1) { XdrvMailbox.payload = 0; }
-    }
-  }
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < MAX_FAN_SPEED)) {
-    SonoffIFanSetFanspeed(XdrvMailbox.payload, true);
-  }
-  ResponseCmndNumber(GetFanspeed());
-}
-
-
-
-bool SonoffIfanInit(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    SetSerial(9600, TS_SERIAL_8N1);
-  }
-  return false;
-}
-
-void SonoffIfanUpdate(void)
-{
-  if (SONOFF_IFAN03 == my_module_type) {
-    if (ifan_fanspeed_timer) {
-      ifan_fanspeed_timer--;
-      if (!ifan_fanspeed_timer) {
-        SonoffIFanSetFanspeed(ifan_fanspeed_goal, false);
-      }
-    }
-  }
-
-  if (ifan_restart_flag && (4 == uptime) && (SONOFF_IFAN02 == my_module_type)) {
-    ifan_restart_flag = false;
-    SetDevicePower(1, SRC_RETRY);
-    SetDevicePower(power, SRC_RETRY);
-  }
-}
-
-
-
-
-
-bool Xdrv22(uint8_t function)
-{
-  bool result = false;
-
-  if (IsModuleIfan()) {
-    switch (function) {
-      case FUNC_EVERY_250_MSECOND:
-        SonoffIfanUpdate();
-        break;
-      case FUNC_SERIAL:
-        result = SonoffIfanSerialInput();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kSonoffIfanCommands, SonoffIfanCommand);
-        break;
-      case FUNC_MODULE_INIT:
-        result = SonoffIfanInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-#ifdef USE_ZIGBEE
-
-#define OCCUPANCY "Occupancy"
-
-typedef uint64_t Z_IEEEAddress;
-typedef uint16_t Z_ShortAddress;
-
-enum ZnpCommandType {
-  Z_POLL = 0x00,
-  Z_SREQ = 0x20,
-  Z_AREQ = 0x40,
-  Z_SRSP = 0x60
-};
-
-enum ZnpSubsystem {
-  Z_RPC_Error = 0x00,
-  Z_SYS = 0x01,
-  Z_MAC = 0x02,
-  Z_NWK = 0x03,
-  Z_AF = 0x04,
-  Z_ZDO = 0x05,
-  Z_SAPI = 0x06,
-  Z_UTIL = 0x07,
-  Z_DEBUG = 0x08,
-  Z_APP = 0x09
-};
-
-
-enum SysCommand {
-  SYS_RESET = 0x00,
-  SYS_PING = 0x01,
-  SYS_VERSION = 0x02,
-  SYS_SET_EXTADDR = 0x03,
-  SYS_GET_EXTADDR = 0x04,
-  SYS_RAM_READ = 0x05,
-  SYS_RAM_WRITE = 0x06,
-  SYS_OSAL_NV_ITEM_INIT = 0x07,
-  SYS_OSAL_NV_READ = 0x08,
-  SYS_OSAL_NV_WRITE = 0x09,
-  SYS_OSAL_START_TIMER = 0x0A,
-  SYS_OSAL_STOP_TIMER = 0x0B,
-  SYS_RANDOM = 0x0C,
-  SYS_ADC_READ = 0x0D,
-  SYS_GPIO = 0x0E,
-  SYS_STACK_TUNE = 0x0F,
-  SYS_SET_TIME = 0x10,
-  SYS_GET_TIME = 0x11,
-  SYS_OSAL_NV_DELETE = 0x12,
-  SYS_OSAL_NV_LENGTH = 0x13,
-  SYS_TEST_RF = 0x40,
-  SYS_TEST_LOOPBACK = 0x41,
-  SYS_RESET_IND = 0x80,
-  SYS_OSAL_TIMER_EXPIRED = 0x81,
-};
-
-enum SapiCommand {
-  SAPI_START_REQUEST = 0x00,
-  SAPI_BIND_DEVICE = 0x01,
-  SAPI_ALLOW_BIND = 0x02,
-  SAPI_SEND_DATA_REQUEST = 0x03,
-  SAPI_READ_CONFIGURATION = 0x04,
-  SAPI_WRITE_CONFIGURATION = 0x05,
-  SAPI_GET_DEVICE_INFO = 0x06,
-  SAPI_FIND_DEVICE_REQUEST = 0x07,
-  SAPI_PERMIT_JOINING_REQUEST = 0x08,
-  SAPI_SYSTEM_RESET = 0x09,
-  SAPI_START_CONFIRM = 0x80,
-  SAPI_BIND_CONFIRM = 0x81,
-  SAPI_ALLOW_BIND_CONFIRM = 0x82,
-  SAPI_SEND_DATA_CONFIRM = 0x83,
-  SAPI_FIND_DEVICE_CONFIRM = 0x85,
-  SAPI_RECEIVE_DATA_INDICATION = 0x87,
-};
-enum Z_configuration {
-  CONF_EXTADDR = 0x01,
-  CONF_BOOTCOUNTER = 0x02,
-  CONF_STARTUP_OPTION = 0x03,
-  CONF_START_DELAY = 0x04,
-  CONF_NIB = 0x21,
-  CONF_DEVICE_LIST = 0x22,
-  CONF_ADDRMGR = 0x23,
-  CONF_POLL_RATE = 0x24,
-  CONF_QUEUED_POLL_RATE = 0x25,
-  CONF_RESPONSE_POLL_RATE = 0x26,
-  CONF_REJOIN_POLL_RATE = 0x27,
-  CONF_DATA_RETRIES = 0x28,
-  CONF_POLL_FAILURE_RETRIES = 0x29,
-  CONF_STACK_PROFILE = 0x2A,
-  CONF_INDIRECT_MSG_TIMEOUT = 0x2B,
-  CONF_ROUTE_EXPIRY_TIME = 0x2C,
-  CONF_EXTENDED_PAN_ID = 0x2D,
-  CONF_BCAST_RETRIES = 0x2E,
-  CONF_PASSIVE_ACK_TIMEOUT = 0x2F,
-  CONF_BCAST_DELIVERY_TIME = 0x30,
-  CONF_NWK_MODE = 0x31,
-  CONF_CONCENTRATOR_ENABLE = 0x32,
-  CONF_CONCENTRATOR_DISCOVERY = 0x33,
-  CONF_CONCENTRATOR_RADIUS = 0x34,
-  CONF_CONCENTRATOR_RC = 0x36,
-  CONF_NWK_MGR_MODE = 0x37,
-  CONF_SRC_RTG_EXPIRY_TIME = 0x38,
-  CONF_ROUTE_DISCOVERY_TIME = 0x39,
-  CONF_NWK_ACTIVE_KEY_INFO = 0x3A,
-  CONF_NWK_ALTERN_KEY_INFO = 0x3B,
-  CONF_ROUTER_OFF_ASSOC_CLEANUP = 0x3C,
-  CONF_NWK_LEAVE_REQ_ALLOWED = 0x3D,
-  CONF_NWK_CHILD_AGE_ENABLE = 0x3E,
-  CONF_DEVICE_LIST_KA_TIMEOUT = 0x3F,
-  CONF_BINDING_TABLE = 0x41,
-  CONF_GROUP_TABLE = 0x42,
-  CONF_APS_FRAME_RETRIES = 0x43,
-  CONF_APS_ACK_WAIT_DURATION = 0x44,
-  CONF_APS_ACK_WAIT_MULTIPLIER = 0x45,
-  CONF_BINDING_TIME = 0x46,
-  CONF_APS_USE_EXT_PANID = 0x47,
-  CONF_APS_USE_INSECURE_JOIN = 0x48,
-  CONF_COMMISSIONED_NWK_ADDR = 0x49,
-  CONF_APS_NONMEMBER_RADIUS = 0x4B,
-  CONF_APS_LINK_KEY_TABLE = 0x4C,
-  CONF_APS_DUPREJ_TIMEOUT_INC = 0x4D,
-  CONF_APS_DUPREJ_TIMEOUT_COUNT = 0x4E,
-  CONF_APS_DUPREJ_TABLE_SIZE = 0x4F,
-  CONF_DIAGNOSTIC_STATS = 0x50,
-  CONF_SECURITY_LEVEL = 0x61,
-  CONF_PRECFGKEY = 0x62,
-  CONF_PRECFGKEYS_ENABLE = 0x63,
-  CONF_SECURITY_MODE = 0x64,
-  CONF_SECURE_PERMIT_JOIN = 0x65,
-  CONF_APS_LINK_KEY_TYPE = 0x66,
-  CONF_APS_ALLOW_R19_SECURITY = 0x67,
-  CONF_IMPLICIT_CERTIFICATE = 0x69,
-  CONF_DEVICE_PRIVATE_KEY = 0x6A,
-  CONF_CA_PUBLIC_KEY = 0x6B,
-  CONF_KE_MAX_DEVICES = 0x6C,
-  CONF_USE_DEFAULT_TCLK = 0x6D,
-  CONF_RNG_COUNTER = 0x6F,
-  CONF_RANDOM_SEED = 0x70,
-  CONF_TRUSTCENTER_ADDR = 0x71,
-  CONF_USERDESC = 0x81,
-  CONF_NWKKEY = 0x82,
-  CONF_PANID = 0x83,
-  CONF_CHANLIST = 0x84,
-  CONF_LEAVE_CTRL = 0x85,
-  CONF_SCAN_DURATION = 0x86,
-  CONF_LOGICAL_TYPE = 0x87,
-  CONF_NWKMGR_MIN_TX = 0x88,
-  CONF_NWKMGR_ADDR = 0x89,
-  CONF_ZDO_DIRECT_CB = 0x8F,
-  CONF_TCLK_TABLE_START = 0x0101,
-  ZNP_HAS_CONFIGURED = 0xF00
-};
-# 210 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-enum Z_Status {
-  Z_Success = 0x00,
-  Z_Failure = 0x01,
-  Z_InvalidParameter = 0x02,
-  Z_MemError = 0x03,
-  Z_Created = 0x09,
-  Z_BufferFull = 0x11
-};
-
-enum Z_App_Profiles {
-  Z_PROF_IPM = 0x0101,
-  Z_PROF_HA = 0x0104,
-  Z_PROF_CBA = 0x0105,
-  Z_PROF_TA = 0x0107,
-  Z_PROF_PHHC = 0x0108,
-  Z_PROF_AMI = 0x0109,
-};
-
-enum Z_Device_Ids {
-  Z_DEVID_CONF_TOOL = 0x0005,
-# 262 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-};
-# 275 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_0_constants.ino"
-enum AfCommand : uint8_t {
-  AF_REGISTER = 0x00,
-  AF_DATA_REQUEST = 0x01,
-  AF_DATA_REQUEST_EXT = 0x02,
-  AF_DATA_REQUEST_SRC_RTG = 0x03,
-  AF_INTER_PAN_CTL = 0x10,
-  AF_DATA_STORE = 0x11,
-  AF_DATA_RETRIEVE = 0x12,
-  AF_APSF_CONFIG_SET = 0x13,
-  AF_DATA_CONFIRM = 0x80,
-  AF_REFLECT_ERROR = 0x83,
-  AF_INCOMING_MSG = 0x81,
-  AF_INCOMING_MSG_EXT = 0x82
-};
-
-
-enum : uint8_t {
-  ZDO_NWK_ADDR_REQ = 0x00,
-  ZDO_IEEE_ADDR_REQ = 0x01,
-  ZDO_NODE_DESC_REQ = 0x02,
-  ZDO_POWER_DESC_REQ = 0x03,
-  ZDO_SIMPLE_DESC_REQ = 0x04,
-  ZDO_ACTIVE_EP_REQ = 0x05,
-  ZDO_MATCH_DESC_REQ = 0x06,
-  ZDO_COMPLEX_DESC_REQ = 0x07,
-  ZDO_USER_DESC_REQ = 0x08,
-  ZDO_DEVICE_ANNCE = 0x0A,
-  ZDO_USER_DESC_SET = 0x0B,
-  ZDO_SERVER_DISC_REQ = 0x0C,
-  ZDO_END_DEVICE_BIND_REQ = 0x20,
-  ZDO_BIND_REQ = 0x21,
-  ZDO_UNBIND_REQ = 0x22,
-  ZDO_SET_LINK_KEY = 0x23,
-  ZDO_REMOVE_LINK_KEY = 0x24,
-  ZDO_GET_LINK_KEY = 0x25,
-  ZDO_MGMT_NWK_DISC_REQ = 0x30,
-  ZDO_MGMT_LQI_REQ = 0x31,
-  ZDO_MGMT_RTQ_REQ = 0x32,
-  ZDO_MGMT_BIND_REQ = 0x33,
-  ZDO_MGMT_LEAVE_REQ = 0x34,
-  ZDO_MGMT_DIRECT_JOIN_REQ = 0x35,
-  ZDO_MGMT_PERMIT_JOIN_REQ = 0x36,
-  ZDO_MGMT_NWK_UPDATE_REQ = 0x37,
-  ZDO_MSG_CB_REGISTER = 0x3E,
-  ZDO_MGS_CB_REMOVE = 0x3F,
-  ZDO_STARTUP_FROM_APP = 0x40,
-  ZDO_AUTO_FIND_DESTINATION = 0x41,
-  ZDO_EXT_REMOVE_GROUP = 0x47,
-  ZDO_EXT_REMOVE_ALL_GROUP = 0x48,
-  ZDO_EXT_FIND_ALL_GROUPS_ENDPOINT = 0x49,
-  ZDO_EXT_FIND_GROUP = 0x4A,
-  ZDO_EXT_ADD_GROUP = 0x4B,
-  ZDO_EXT_COUNT_ALL_GROUPS = 0x4C,
-  ZDO_NWK_ADDR_RSP = 0x80,
-  ZDO_IEEE_ADDR_RSP = 0x81,
-  ZDO_NODE_DESC_RSP = 0x82,
-  ZDO_POWER_DESC_RSP = 0x83,
-  ZDO_SIMPLE_DESC_RSP = 0x84,
-  ZDO_ACTIVE_EP_RSP = 0x85,
-  ZDO_MATCH_DESC_RSP = 0x86,
-  ZDO_COMPLEX_DESC_RSP = 0x87,
-  ZDO_USER_DESC_RSP = 0x88,
-  ZDO_USER_DESC_CONF = 0x89,
-  ZDO_SERVER_DISC_RSP = 0x8A,
-  ZDO_END_DEVICE_BIND_RSP = 0xA0,
-  ZDO_BIND_RSP = 0xA1,
-  ZDO_UNBIND_RSP = 0xA2,
-  ZDO_MGMT_NWK_DISC_RSP = 0xB0,
-  ZDO_MGMT_LQI_RSP = 0xB1,
-  ZDO_MGMT_RTG_RSP = 0xB2,
-  ZDO_MGMT_BIND_RSP = 0xB3,
-  ZDO_MGMT_LEAVE_RSP = 0xB4,
-  ZDO_MGMT_DIRECT_JOIN_RSP = 0xB5,
-  ZDO_MGMT_PERMIT_JOIN_RSP = 0xB6,
-  ZDO_STATE_CHANGE_IND = 0xC0,
-  ZDO_END_DEVICE_ANNCE_IND = 0xC1,
-  ZDO_MATCH_DESC_RSP_SENT = 0xC2,
-  ZDO_STATUS_ERROR_RSP = 0xC3,
-  ZDO_SRC_RTG_IND = 0xC4,
-  ZDO_LEAVE_IND = 0xC9,
-  ZDO_TC_DEV_IND = 0xCA,
-  ZDO_PERMIT_JOIN_IND = 0xCB,
-  ZDO_MSG_CB_INCOMING = 0xFF
-};
-
-
-enum ZdoStates {
-  ZDO_DEV_HOLD = 0x00,
-  ZDO_DEV_INIT = 0x01,
-  ZDO_DEV_NWK_DISC = 0x02,
-  ZDO_DEV_NWK_JOINING = 0x03,
-  ZDO_DEV_NWK_REJOIN = 0x04,
-  ZDO_DEV_END_DEVICE_UNAUTH = 0x05,
-  ZDO_DEV_END_DEVICE = 0x06,
-  ZDO_DEV_ROUTER = 0x07,
-  ZDO_DEV_COORD_STARTING = 0x08,
-  ZDO_DEV_ZB_COORD = 0x09,
-  ZDO_DEV_NWK_ORPHAN = 0x0A,
-};
-
-
-enum Z_Util {
-  Z_UTIL_GET_DEVICE_INFO = 0x00,
-  Z_UTIL_GET_NV_INFO = 0x01,
-  Z_UTIL_SET_PANID = 0x02,
-  Z_UTIL_SET_CHANNELS = 0x03,
-  Z_UTIL_SET_SECLEVEL = 0x04,
-  Z_UTIL_SET_PRECFGKEY = 0x05,
-  Z_UTIL_CALLBACK_SUB_CMD = 0x06,
-  Z_UTIL_KEY_EVENT = 0x07,
-  Z_UTIL_TIME_ALIVE = 0x09,
-  Z_UTIL_LED_CONTROL = 0x0A,
-  Z_UTIL_TEST_LOOPBACK = 0x10,
-  Z_UTIL_DATA_REQ = 0x11,
-  Z_UTIL_SRC_MATCH_ENABLE = 0x20,
-  Z_UTIL_SRC_MATCH_ADD_ENTRY = 0x21,
-  Z_UTIL_SRC_MATCH_DEL_ENTRY = 0x22,
-  Z_UTIL_SRC_MATCH_CHECK_SRC_ADDR = 0x23,
-  Z_UTIL_SRC_MATCH_ACK_ALL_PENDING = 0x24,
-  Z_UTIL_SRC_MATCH_CHECK_ALL_PENDING = 0x25,
-  Z_UTIL_ADDRMGR_EXT_ADDR_LOOKUP = 0x40,
-  Z_UTIL_ADDRMGR_NWK_ADDR_LOOKUP = 0x41,
-  Z_UTIL_APSME_LINK_KEY_DATA_GET = 0x44,
-  Z_UTIL_APSME_LINK_KEY_NV_ID_GET = 0x45,
-  Z_UTIL_ASSOC_COUNT = 0x48,
-  Z_UTIL_ASSOC_FIND_DEVICE = 0x49,
-  Z_UTIL_ASSOC_GET_WITH_ADDRESS = 0x4A,
-  Z_UTIL_APSME_REQUEST_KEY_CMD = 0x4B,
-  Z_UTIL_ZCL_KEY_EST_INIT_EST = 0x80,
-  Z_UTIL_ZCL_KEY_EST_SIGN = 0x81,
-  Z_UTIL_UTIL_SYNC_REQ = 0xE0,
-  Z_UTIL_ZCL_KEY_ESTABLISH_IND = 0xE1
-};
-
-enum ZCL_Global_Commands {
-  ZCL_READ_ATTRIBUTES = 0x00,
-  ZCL_READ_ATTRIBUTES_RESPONSE = 0x01,
-  ZCL_WRITE_ATTRIBUTES = 0x02,
-  ZCL_WRITE_ATTRIBUTES_UNDIVIDED = 0x03,
-  ZCL_WRITE_ATTRIBUTES_RESPONSE = 0x04,
-  ZCL_WRITE_ATTRIBUTES_NORESPONSE = 0x05,
-  ZCL_CONFIGURE_REPORTING = 0x06,
-  ZCL_CONFIGURE_REPORTING_RESPONSE = 0x07,
-  ZCL_READ_REPORTING_CONFIGURATION = 0x08,
-  ZCL_READ_REPORTING_CONFIGURATION_RESPONSE = 0x09,
-  ZCL_REPORT_ATTRIBUTES = 0x0a,
-  ZCL_DEFAULT_RESPONSE = 0x0b,
-  ZCL_DISCOVER_ATTRIBUTES = 0x0c,
-  ZCL_DISCOVER_ATTRIBUTES_RESPONSE = 0x0d
-
-};
-
-const uint16_t Z_ProfileIds[] PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
-const char Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_1_headers.ino"
-#ifdef USE_ZIGBEE
-
-
-
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId);
-
-
-
-JsonVariant &getCaseInsensitive(const JsonObject &json, const char *needle) {
-
-  if ((nullptr == &json) || (nullptr == needle) || (0 == pgm_read_byte(needle))) {
-    return *(JsonVariant*)nullptr;
-  }
-
-  for (auto kv : json) {
-    const char *key = kv.key;
-    JsonVariant &value = kv.value;
-
-    if (0 == strcasecmp_P(key, needle)) {
-      return value;
-    }
-  }
-
-  return *(JsonVariant*)nullptr;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-#ifdef USE_ZIGBEE
-
-#ifndef ZIGBEERECEIVED
-#define ZIGBEERECEIVED 1
-#endif
-
-#include <vector>
-#include <map>
-
-#ifndef ZIGBEE_SAVE_DELAY_SECONDS
-#define ZIGBEE_SAVE_DELAY_SECONDS 10;
-#endif
-const uint16_t kZigbeeSaveDelaySeconds = ZIGBEE_SAVE_DELAY_SECONDS;
-
-typedef int32_t (*Z_DeviceTimer)(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value);
-
-typedef struct Z_Device {
-  uint16_t shortaddr;
-  uint64_t longaddr;
-  uint32_t firstSeen;
-  uint32_t lastSeen;
-  String manufacturerId;
-  String modelId;
-  String friendlyName;
-  std::vector<uint32_t> endpoints;
-  std::vector<uint32_t> clusters_in;
-  std::vector<uint32_t> clusters_out;
-
-  uint32_t timer;
-  uint16_t cluster;
-  uint16_t endpoint;
-  uint32_t value;
-  Z_DeviceTimer func;
-
-  DynamicJsonBuffer *json_buffer;
-  JsonObject *json;
-
-  uint8_t seqNumber;
-} Z_Device;
-
-
-
-
-
-
-
-class Z_Devices {
-public:
-  Z_Devices() {};
-
-
-
-
-
-
-  uint16_t isKnownShortAddr(uint16_t shortaddr) const;
-  uint16_t isKnownLongAddr(uint64_t longaddr) const;
-  uint16_t isKnownIndex(uint32_t index) const;
-  uint16_t isKnownFriendlyName(const char * name) const;
-
-  uint64_t getDeviceLongAddr(uint16_t shortaddr) const;
-
-
-
-  void updateDevice(uint16_t shortaddr, uint64_t longaddr = 0);
-
-
-  void addEndoint(uint16_t shortaddr, uint8_t endpoint);
-
-
-  void addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId);
-
-
-  void addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out);
-
-  uint8_t findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster);
-
-  void setManufId(uint16_t shortaddr, const char * str);
-  void setModelId(uint16_t shortaddr, const char * str);
-  void setFriendlyName(uint16_t shortaddr, const char * str);
-  const String * getFriendlyName(uint16_t) const;
-
-
-  void updateLastSeen(uint16_t shortaddr);
-
-
-  uint8_t getNextSeqNumber(uint16_t shortaddr);
-
-
-  String dump(uint32_t dump_mode, uint16_t status_shortaddr = 0) const;
-
-
-  void resetTimer(uint32_t shortaddr);
-  void setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func);
-  void runTimer(void);
-
-
-  void jsonClear(uint16_t shortaddr);
-  void jsonAppend(uint16_t shortaddr, const JsonObject &values);
-  const JsonObject *jsonGet(uint16_t shortaddr);
-  void jsonPublishFlush(uint16_t shortaddr);
-  bool jsonIsConflict(uint16_t shortaddr, const JsonObject &values);
-  void jsonPublishNow(uint16_t shortaddr, JsonObject &values);
-
-
-  size_t devicesSize(void) const {
-    return _devices.size();
-  }
-  const Z_Device &devicesAt(size_t i) const {
-    return _devices.at(i);
-  }
-
-
-  bool removeDevice(uint16_t shortaddr);
-
-
-  void dirty(void);
-  void clean(void);
-
-
-  uint16_t parseDeviceParam(const char * param, bool short_must_be_known = false) const;
-
-private:
-  std::vector<Z_Device> _devices = {};
-  uint32_t _saveTimer = 0;
-  uint8_t _seqNumber = 0;
-
-  template < typename T>
-  static bool findInVector(const std::vector<T> & vecOfElements, const T & element);
-
-  template < typename T>
-  static int32_t findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element);
-
-
-  static int32_t findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t element);
-
-  Z_Device & getShortAddr(uint16_t shortaddr);
-  const Z_Device & getShortAddrConst(uint16_t shortaddr) const ;
-  Z_Device & getLongAddr(uint64_t longaddr);
-
-  int32_t findShortAddr(uint16_t shortaddr) const;
-  int32_t findLongAddr(uint64_t longaddr) const;
-  int32_t findFriendlyName(const char * name) const;
-
-  void _updateLastSeen(Z_Device &device) {
-    if (&device != nullptr) {
-      device.lastSeen = Rtc.utc_time;
-    }
-  };
-
-
-  Z_Device & createDeviceEntry(uint16_t shortaddr, uint64_t longaddr = 0);
-};
-
-Z_Devices zigbee_devices = Z_Devices();
-
-
-uint64_t localIEEEAddr = 0;
-
-
-template < typename T>
-bool Z_Devices::findInVector(const std::vector<T> & vecOfElements, const T & element) {
-
- auto it = std::find(vecOfElements.begin(), vecOfElements.end(), element);
-
- if (it != vecOfElements.end()) {
-  return true;
- } else {
-  return false;
- }
-}
-
-template < typename T>
-int32_t Z_Devices::findEndpointInVector(const std::vector<T> & vecOfElements, uint8_t element) {
-
-
-  int32_t found = 0;
-  for (auto &elem : vecOfElements) {
-    if ( ((elem >> 16) & 0xFF) == element) { return found; }
-    found++;
-  }
-
-  return -1;
-}
-# 214 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findClusterEndpoint(const std::vector<uint32_t> & vecOfElements, uint16_t cluster) {
-  int32_t found = 0;
-  for (auto &elem : vecOfElements) {
-    if ((elem & 0xFFFF) == cluster) { return found; }
-    found++;
-  }
-  return -1;
-}
-
-
-
-
-
-Z_Device & Z_Devices::createDeviceEntry(uint16_t shortaddr, uint64_t longaddr) {
-  if (!shortaddr && !longaddr) { return *(Z_Device*) nullptr; }
-  Z_Device device = { shortaddr, longaddr,
-                      Rtc.utc_time, Rtc.utc_time,
-                      String(),
-                      String(),
-                      String(),
-                      std::vector<uint32_t>(),
-                      std::vector<uint32_t>(),
-                      std::vector<uint32_t>(),
-                      0,0,0,0,
-                      nullptr,
-                      nullptr, nullptr,
-                      0,
-                      };
-  device.json_buffer = new DynamicJsonBuffer();
-  _devices.push_back(device);
-  dirty();
-  return _devices.back();
-}
-# 256 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findShortAddr(uint16_t shortaddr) const {
-  if (!shortaddr) { return -1; }
-  int32_t found = 0;
-  if (shortaddr) {
-    for (auto &elem : _devices) {
-      if (elem.shortaddr == shortaddr) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-# 275 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findLongAddr(uint64_t longaddr) const {
-  if (!longaddr) { return -1; }
-  int32_t found = 0;
-  if (longaddr) {
-    for (auto &elem : _devices) {
-      if (elem.longaddr == longaddr) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-# 294 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-int32_t Z_Devices::findFriendlyName(const char * name) const {
-  if (!name) { return -1; }
-  size_t name_len = strlen(name);
-  int32_t found = 0;
-  if (name_len) {
-    for (auto &elem : _devices) {
-      if (elem.friendlyName == name) { return found; }
-      found++;
-    }
-  }
-  return -1;
-}
-
-
-uint16_t Z_Devices::isKnownShortAddr(uint16_t shortaddr) const {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownLongAddr(uint64_t longaddr) const {
-  int32_t found = findLongAddr(longaddr);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownIndex(uint32_t index) const {
-  if (index < devicesSize()) {
-    const Z_Device & device = devicesAt(index);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint16_t Z_Devices::isKnownFriendlyName(const char * name) const {
-  if ((!name) || (0 == strlen(name))) { return 0xFFFF; }
-  int32_t found = findFriendlyName(name);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    return device.shortaddr;
-  } else {
-    return 0;
-  }
-}
-
-uint64_t Z_Devices::getDeviceLongAddr(uint16_t shortaddr) const {
-  const Z_Device & device = getShortAddrConst(shortaddr);
-  return device.longaddr;
-}
-
-
-
-
-Z_Device & Z_Devices::getShortAddr(uint16_t shortaddr) {
-  if (!shortaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return _devices[found];
-  }
-
-  return createDeviceEntry(shortaddr, 0);
-}
-
-const Z_Device & Z_Devices::getShortAddrConst(uint16_t shortaddr) const {
-  if (!shortaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    return _devices[found];
-  }
-  return *((Z_Device*)nullptr);
-}
-
-
-Z_Device & Z_Devices::getLongAddr(uint64_t longaddr) {
-  if (!longaddr) { return *(Z_Device*) nullptr; }
-  int32_t found = findLongAddr(longaddr);
-  if (found > 0) {
-    return _devices[found];
-  }
-  return createDeviceEntry(0, longaddr);
-}
-
-
-bool Z_Devices::removeDevice(uint16_t shortaddr) {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    _devices.erase(_devices.begin() + found);
-    dirty();
-    return true;
-  }
-  return false;
-}
-
-
-
-
-
-
-void Z_Devices::updateDevice(uint16_t shortaddr, uint64_t longaddr) {
-  int32_t s_found = findShortAddr(shortaddr);
-  int32_t l_found = findLongAddr(longaddr);
-
-  if ((s_found >= 0) && (l_found >= 0)) {
-    if (s_found == l_found) {
-      updateLastSeen(shortaddr);
-    } else {
-
-      _devices[l_found].shortaddr = shortaddr;
-
-      _devices.erase(_devices.begin() + s_found);
-      updateLastSeen(shortaddr);
-      dirty();
-    }
-  } else if (s_found >= 0) {
-
-
-    _devices[s_found].longaddr = longaddr;
-    updateLastSeen(shortaddr);
-    dirty();
-  } else if (l_found >= 0) {
-
-    _devices[l_found].shortaddr = shortaddr;
-    dirty();
-  } else {
-
-    if (shortaddr || longaddr) {
-      createDeviceEntry(shortaddr, longaddr);
-    }
-  }
-}
-
-
-
-
-void Z_Devices::addEndoint(uint16_t shortaddr, uint8_t endpoint) {
-  if (!shortaddr) { return; }
-  uint32_t ep_profile = (endpoint << 16);
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (findEndpointInVector(device.endpoints, endpoint) < 0) {
-    device.endpoints.push_back(ep_profile);
-    dirty();
-  }
-}
-
-void Z_Devices::addEndointProfile(uint16_t shortaddr, uint8_t endpoint, uint16_t profileId) {
-  if (!shortaddr) { return; }
-  uint32_t ep_profile = (endpoint << 16) | profileId;
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  int32_t found = findEndpointInVector(device.endpoints, endpoint);
-  if (found < 0) {
-    device.endpoints.push_back(ep_profile);
-    dirty();
-  } else {
-    if (device.endpoints[found] != ep_profile) {
-      device.endpoints[found] = ep_profile;
-      dirty();
-    }
-  }
-}
-
-void Z_Devices::addCluster(uint16_t shortaddr, uint8_t endpoint, uint16_t cluster, bool out) {
-  if (!shortaddr) { return; }
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  uint32_t ep_cluster = (endpoint << 16) | cluster;
-  if (!out) {
-    if (!findInVector(device.clusters_in, ep_cluster)) {
-      device.clusters_in.push_back(ep_cluster);
-      dirty();
-    }
-  } else {
-    if (!findInVector(device.clusters_out, ep_cluster)) {
-      device.clusters_out.push_back(ep_cluster);
-      dirty();
-    }
-  }
-}
-
-
-
-uint8_t Z_Devices::findClusterEndpointIn(uint16_t shortaddr, uint16_t cluster){
-  int32_t short_found = findShortAddr(shortaddr);
-  if (short_found < 0) return 0;
-  Z_Device &device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return 0; }
-  int32_t found = findClusterEndpoint(device.clusters_in, cluster);
-  if (found >= 0) {
-    return (device.clusters_in[found] >> 16) & 0xFF;
-  } else {
-    return 0;
-  }
-}
-
-
-void Z_Devices::setManufId(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.manufacturerId.equals(str)) {
-    dirty();
-  }
-  device.manufacturerId = str;
-}
-void Z_Devices::setModelId(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.modelId.equals(str)) {
-    dirty();
-  }
-  device.modelId = str;
-}
-void Z_Devices::setFriendlyName(uint16_t shortaddr, const char * str) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-  if (!device.friendlyName.equals(str)) {
-    dirty();
-  }
-  device.friendlyName = str;
-}
-
-const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
-  int32_t found = findShortAddr(shortaddr);
-  if (found >= 0) {
-    const Z_Device & device = devicesAt(found);
-    if (device.friendlyName.length() > 0) {
-      return &device.friendlyName;
-    }
-  }
-  return nullptr;
-}
-
-
-void Z_Devices::updateLastSeen(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  _updateLastSeen(device);
-}
-
-
-uint8_t Z_Devices::getNextSeqNumber(uint16_t shortaddr) {
-  int32_t short_found = findShortAddr(shortaddr);
-  if (short_found >= 0) {
-    Z_Device &device = getShortAddr(shortaddr);
-    device.seqNumber += 1;
-    return device.seqNumber;
-  } else {
-    _seqNumber += 1;
-    return _seqNumber;
-  }
-}
-
-
-
-
-void Z_Devices::resetTimer(uint32_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  device.timer = 0;
-  device.func = nullptr;
-}
-
-
-void Z_Devices::setTimer(uint32_t shortaddr, uint32_t wait_ms, uint16_t cluster, uint16_t endpoint, uint32_t value, Z_DeviceTimer func) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-
-  device.cluster = cluster;
-  device.endpoint = endpoint;
-  device.value = value;
-  device.func = func;
-  device.timer = wait_ms + millis();
-}
-
-
-void Z_Devices::runTimer(void) {
-  for (std::vector<Z_Device>::iterator it = _devices.begin(); it != _devices.end(); ++it) {
-    Z_Device &device = *it;
-    uint16_t shortaddr = device.shortaddr;
-
-    uint32_t timer = device.timer;
-    if ((timer) && TimeReached(timer)) {
-      device.timer = 0;
-
-      (*device.func)(device.shortaddr, device.cluster, device.endpoint, device.value);
-    }
-  }
-
-  if ((_saveTimer) && TimeReached(_saveTimer)) {
-    saveZigbeeDevices();
-    _saveTimer = 0;
-  }
-}
-
-void Z_Devices::jsonClear(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-
-  device.json = nullptr;
-  device.json_buffer->clear();
-}
-
-void CopyJsonVariant(JsonObject &to, const String &key, const JsonVariant &val) {
-  to.remove(key);
-
-  if (val.is<char*>()) {
-    String sval = val.as<String>();
-    to.set(key, sval);
-  } else if (val.is<JsonArray>()) {
-    JsonArray &nested_arr = to.createNestedArray(key);
-    CopyJsonArray(nested_arr, val.as<JsonArray>());
-  } else if (val.is<JsonObject>()) {
-    JsonObject &nested_obj = to.createNestedObject(key);
-    CopyJsonObject(nested_obj, val.as<JsonObject>());
-  } else {
-    to.set(key, val);
-  }
-}
-
-void CopyJsonArray(JsonArray &to, const JsonArray &arr) {
-  for (auto v : arr) {
-    if (v.is<char*>()) {
-      String sval = v.as<String>();
-      to.add(sval);
-    } else if (v.is<JsonArray>()) {
-    } else if (v.is<JsonObject>()) {
-    } else {
-      to.add(v);
-    }
-  }
-}
-
-void CopyJsonObject(JsonObject &to, const JsonObject &from) {
-  for (auto kv : from) {
-    String key_string = kv.key;
-    JsonVariant &val = kv.value;
-
-    CopyJsonVariant(to, key_string, val);
-  }
-}
-
-
-bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return false; }
-  if (&values == nullptr) { return false; }
-
-  if (nullptr == device.json) {
-    return false;
-  }
-
-  for (auto kv : values) {
-    String key_string = kv.key;
-
-    if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {
-      if (device.json->containsKey(kv.key)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void Z_Devices::jsonAppend(uint16_t shortaddr, const JsonObject &values) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  if (&values == nullptr) { return; }
-
-  if (nullptr == device.json) {
-    device.json = &(device.json_buffer->createObject());
-  }
-
-  char sa[8];
-  snprintf_P(sa, sizeof(sa), PSTR("0x%04X"), shortaddr);
-  device.json->set(F(D_JSON_ZIGBEE_DEVICE), sa);
-
-  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
-  if (fname) {
-    device.json->set(F(D_JSON_ZIGBEE_NAME), (char*)fname->c_str());
-  }
-
-
-  CopyJsonObject(*device.json, values);
-}
-
-const JsonObject *Z_Devices::jsonGet(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return nullptr; }
-  return device.json;
-}
-
-void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
-  Z_Device & device = getShortAddr(shortaddr);
-  if (&device == nullptr) { return; }
-  JsonObject * json = device.json;
-  if (json == nullptr) { return; }
-
-  const String * fname = zigbee_devices.getFriendlyName(shortaddr);
-  bool use_fname = (Settings.flag4.zigbee_use_names) && (fname);
-# 718 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_3_devices.ino"
-  if (use_fname) {
-    json->remove(F(D_JSON_ZIGBEE_NAME));
-  } else {
-    json->remove(F(D_JSON_ZIGBEE_DEVICE));
-  }
-
-  String msg = "";
-  json->printTo(msg);
-  zigbee_devices.jsonClear(shortaddr);
-
-  if (use_fname) {
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#if ZIGBEERECEIVED
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#endif
-  } else {
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#if ZIGBEERECEIVED
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#endif
-  }
-
-
-}
-
-void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
-  jsonPublishFlush(shortaddr);
-  jsonAppend(shortaddr, values);
-  jsonPublishFlush(shortaddr);
-}
-
-void Z_Devices::dirty(void) {
-  _saveTimer = kZigbeeSaveDelaySeconds * 1000 + millis();
-}
-void Z_Devices::clean(void) {
-  _saveTimer = 0;
-}
-
-
-
-
-
-
-uint16_t Z_Devices::parseDeviceParam(const char * param, bool short_must_be_known) const {
-  if (nullptr == param) { return 0; }
-  size_t param_len = strlen(param);
-  char dataBuf[param_len + 1];
-  strcpy(dataBuf, param);
-  RemoveSpace(dataBuf);
-  uint16_t shortaddr = 0;
-
-  if (strlen(dataBuf) < 4) {
-
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 99)) {
-      shortaddr = zigbee_devices.isKnownIndex(XdrvMailbox.payload - 1);
-    }
-  } else if ((dataBuf[0] == '0') && (dataBuf[1] == 'x')) {
-
-    if (strlen(dataBuf) < 18) {
-
-      shortaddr = strtoull(dataBuf, nullptr, 0);
-      if (short_must_be_known) {
-        shortaddr = zigbee_devices.isKnownShortAddr(shortaddr);
-      }
-
-    } else {
-
-      uint64_t longaddr = strtoull(dataBuf, nullptr, 0);
-      shortaddr = zigbee_devices.isKnownLongAddr(longaddr);
-    }
-  } else {
-
-    shortaddr = zigbee_devices.isKnownFriendlyName(dataBuf);
-  }
-
-  return shortaddr;
-}
-
-
-
-
-
-String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
-  DynamicJsonBuffer jsonBuffer;
-  JsonArray& json = jsonBuffer.createArray();
-  JsonArray& devices = json;
-
-  for (std::vector<Z_Device>::const_iterator it = _devices.begin(); it != _devices.end(); ++it) {
-    const Z_Device& device = *it;
-    uint16_t shortaddr = device.shortaddr;
-    char hex[22];
-
-
-    if ((status_shortaddr) && (status_shortaddr != shortaddr)) { continue; }
-
-    JsonObject& dev = devices.createNestedObject();
-
-    snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), shortaddr);
-    dev[F(D_JSON_ZIGBEE_DEVICE)] = hex;
-
-    if (device.friendlyName.length() > 0) {
-      dev[F(D_JSON_ZIGBEE_NAME)] = device.friendlyName;
-    }
-
-    if (2 <= dump_mode) {
-      hex[0] = '0';
-      hex[1] = 'x';
-      Uint64toHex(device.longaddr, &hex[2], 64);
-      dev[F("IEEEAddr")] = hex;
-      if (device.modelId.length() > 0) {
-        dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
-      }
-      if (device.manufacturerId.length() > 0) {
-        dev[F("Manufacturer")] = device.manufacturerId;
-      }
-    }
-
-
-    if (3 <= dump_mode) {
-      JsonObject& dev_endpoints = dev.createNestedObject(F("Endpoints"));
-      for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
-        uint32_t ep_profile = *ite;
-        uint8_t endpoint = (ep_profile >> 16) & 0xFF;
-        uint16_t profileId = ep_profile & 0xFFFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonObject& ep = dev_endpoints.createNestedObject(hex);
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), profileId);
-        ep[F("ProfileId")] = hex;
-
-        int32_t found = -1;
-        for (uint32_t i = 0; i < sizeof(Z_ProfileIds) / sizeof(Z_ProfileIds[0]); i++) {
-          if (pgm_read_word(&Z_ProfileIds[i]) == profileId) {
-            found = i;
-            break;
-          }
-        }
-        if (found > 0) {
-          GetTextIndexed(hex, sizeof(hex), found, Z_ProfileNames);
-          ep[F("ProfileIdName")] = hex;
-        }
-
-        ep.createNestedArray(F("ClustersIn"));
-        ep.createNestedArray(F("ClustersOut"));
-      }
-
-      for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
-        uint16_t cluster = *itc & 0xFFFF;
-        uint8_t endpoint = (*itc >> 16) & 0xFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersIn")];
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
-        cluster_arr.add(hex);
-      }
-
-      for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
-        uint16_t cluster = *itc & 0xFFFF;
-        uint8_t endpoint = (*itc >> 16) & 0xFF;
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%02X"), endpoint);
-        JsonArray &cluster_arr = dev_endpoints[hex][F("ClustersOut")];
-
-        snprintf_P(hex, sizeof(hex), PSTR("0x%04X"), cluster);
-        cluster_arr.add(hex);
-      }
-    }
-  }
-  String payload = "";
-  payload.reserve(200);
-  json.printTo(payload);
-  return payload;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-#ifdef USE_ZIGBEE
-# 50 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_4_persistence.ino"
-const static uint16_t z_spi_start_sector = 0xFF;
-const static uint8_t* z_spi_start = (uint8_t*) 0x402FF000;
-const static uint8_t* z_dev_start = z_spi_start + 0x0800;
-const static size_t z_spi_len = 0x1000;
-const static size_t z_block_offset = 0x0800;
-const static size_t z_block_len = 0x0800;
-
-class z_flashdata_t {
-public:
-  uint32_t name;
-  uint16_t len;
-  uint16_t reserved;
-};
-
-const static uint32_t ZIGB_NAME = 0x3167697A;
-const static size_t Z_MAX_FLASH = z_block_len - sizeof(z_flashdata_t);
-
-
-const uint16_t Z_ClusterNumber[] PROGMEM = {
-  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-  0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
-  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-  0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
-  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-  0x0100, 0x0101, 0x0102,
-  0x0201, 0x0202, 0x0203, 0x0204,
-  0x0300, 0x0301,
-  0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406,
-  0x0500, 0x0501, 0x0502,
-  0x0700, 0x0701, 0x0702,
-  0x0B00, 0x0B01, 0x0B02, 0x0B03, 0x0B04, 0x0B05,
-  0x1000,
-  0xFC0F,
-};
-
-
-uint16_t fromClusterCode(uint8_t c) {
-  if (c >= sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0])) {
-    return 0xFFFF;
-  }
-  return pgm_read_word(&Z_ClusterNumber[c]);
-}
-
-
-uint8_t toClusterCode(uint16_t c) {
-  for (uint32_t i = 0; i < sizeof(Z_ClusterNumber)/sizeof(Z_ClusterNumber[0]); i++) {
-    if (c == pgm_read_word(&Z_ClusterNumber[i])) {
-      return i;
-    }
-  }
-  return 0xFF;
-}
-
-class SBuffer hibernateDevice(const struct Z_Device &device) {
-  SBuffer buf(128);
-
-  buf.add8(0x00);
-  buf.add16(device.shortaddr);
-  buf.add64(device.longaddr);
-  uint32_t endpoints = device.endpoints.size();
-  if (endpoints > 254) { endpoints = 254; }
-  buf.add8(endpoints);
-
-  for (std::vector<uint32_t>::const_iterator ite = device.endpoints.begin() ; ite != device.endpoints.end(); ++ite) {
-    uint32_t ep_profile = *ite;
-    uint8_t endpoint = (ep_profile >> 16) & 0xFF;
-    uint16_t profileId = ep_profile & 0xFFFF;
-
-    buf.add8(endpoint);
-    buf.add16(profileId);
-    for (std::vector<uint32_t>::const_iterator itc = device.clusters_in.begin() ; itc != device.clusters_in.end(); ++itc) {
-      uint16_t cluster = *itc & 0xFFFF;
-      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
-
-      if (endpoint == c_endpoint) {
-        uint8_t clusterCode = toClusterCode(cluster);
-        if (0xFF != clusterCode) { buf.add8(clusterCode); }
-      }
-    }
-    buf.add8(0xFF);
-
-    for (std::vector<uint32_t>::const_iterator itc = device.clusters_out.begin() ; itc != device.clusters_out.end(); ++itc) {
-      uint16_t cluster = *itc & 0xFFFF;
-      uint8_t c_endpoint = (*itc >> 16) & 0xFF;
-
-      if (endpoint == c_endpoint) {
-        uint8_t clusterCode = toClusterCode(cluster);
-        if (0xFF != clusterCode) { buf.add8(clusterCode); }
-      }
-    }
-    buf.add8(0xFF);
-  }
-
-
-  size_t model_len = device.modelId.length();
-  if (model_len > 32) { model_len = 32; }
-  buf.addBuffer(device.modelId.c_str(), model_len);
-  buf.add8(0x00);
-
-
-  size_t manuf_len = device.manufacturerId.length();
-  if (manuf_len > 32) {manuf_len = 32; }
-  buf.addBuffer(device.manufacturerId.c_str(), manuf_len);
-  buf.add8(0x00);
-
-
-  size_t frname_len = device.friendlyName.length();
-  if (frname_len > 32) {frname_len = 32; }
-  buf.addBuffer(device.friendlyName.c_str(), frname_len);
-  buf.add8(0x00);
-
-
-  buf.set8(0, buf.len());
-
-  return buf;
-}
-
-class SBuffer hibernateDevices(void) {
-  SBuffer buf(2048);
-
-  size_t devices_size = zigbee_devices.devicesSize();
-  if (devices_size > 32) { devices_size = 32; }
-  buf.add8(devices_size);
-
-  for (uint32_t i = 0; i < devices_size; i++) {
-    const Z_Device & device = zigbee_devices.devicesAt(i);
-    const SBuffer buf_device = hibernateDevice(device);
-    buf.addBuffer(buf_device);
-  }
-
-  size_t buf_len = buf.len();
-  if (buf_len > 2040) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Devices list too big to fit in Flash (%d)"), buf_len);
-  }
-
-
-  char *hex_char = (char*) malloc((buf_len * 2) + 2);
-  if (hex_char) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "ZbFlashStore %s"),
-                                    ToHex_P(buf.getBuffer(), buf_len, hex_char, (buf_len * 2) + 2));
-    free(hex_char);
-  }
-
-  return buf;
-}
-
-void hidrateDevices(const SBuffer &buf) {
-  uint32_t buf_len = buf.len();
-  if (buf_len <= 10) { return; }
-
-  uint32_t k = 0;
-  uint32_t num_devices = buf.get8(k++);
-
-  for (uint32_t i = 0; (i < num_devices) && (k < buf_len); i++) {
-    uint32_t dev_record_len = buf.get8(k);
-
-    SBuffer buf_d = buf.subBuffer(k, dev_record_len);
-
-    uint32_t d = 1;
-    uint16_t shortaddr = buf_d.get16(d); d += 2;
-    uint64_t longaddr = buf_d.get64(d); d += 8;
-    zigbee_devices.updateDevice(shortaddr, longaddr);
-
-    uint32_t endpoints = buf_d.get8(d++);
-    for (uint32_t j = 0; j < endpoints; j++) {
-      uint8_t ep = buf_d.get8(d++);
-      uint16_t ep_profile = buf_d.get16(d); d += 2;
-      zigbee_devices.addEndointProfile(shortaddr, ep, ep_profile);
-
-
-      while (d < dev_record_len) {
-        uint8_t ep_cluster = buf_d.get8(d++);
-        if (0xFF == ep_cluster) { break; }
-        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), false);
-      }
-
-      while (d < dev_record_len) {
-        uint8_t ep_cluster = buf_d.get8(d++);
-        if (0xFF == ep_cluster) { break; }
-        zigbee_devices.addCluster(shortaddr, ep, fromClusterCode(ep_cluster), true);
-      }
-    }
-
-
-    char empty[] = "";
-
-
-    uint32_t s_len = buf_d.strlen_s(d);
-    char *ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setModelId(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    s_len = buf_d.strlen_s(d);
-    ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setManufId(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    s_len = buf_d.strlen_s(d);
-    ptr = s_len ? buf_d.charptr(d) : empty;
-    zigbee_devices.setFriendlyName(shortaddr, ptr);
-    d += s_len + 1;
-
-
-    k += dev_record_len;
-  }
-}
-
-void loadZigbeeDevices(void) {
-  z_flashdata_t flashdata;
-  memcpy_P(&flashdata, z_dev_start, sizeof(z_flashdata_t));
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "Zigbee signature in Flash: %08X - %d"), flashdata.name, flashdata.len);
-
-
-  if ((flashdata.name == ZIGB_NAME) && (flashdata.len > 0)) {
-    uint16_t buf_len = flashdata.len;
-
-    SBuffer buf(buf_len);
-    buf.addBuffer(z_dev_start + sizeof(z_flashdata_t), buf_len);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee devices data in Flash (%d bytes)"), buf_len);
-    hidrateDevices(buf);
-    zigbee_devices.clean();
-  } else {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "No zigbee devices data in Flash"));
-  }
-}
-
-void saveZigbeeDevices(void) {
-  SBuffer buf = hibernateDevices();
-  size_t buf_len = buf.len();
-  if (buf_len > Z_MAX_FLASH) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Buffer too big to fit in Flash (%d bytes)"), buf_len);
-    return;
-  }
-
-
-  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
-  if (!spi_buffer) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
-    return;
-  }
-
-  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-
-  z_flashdata_t *flashdata = (z_flashdata_t*)(spi_buffer + z_block_offset);
-  flashdata->name = ZIGB_NAME;
-  flashdata->len = buf_len;
-  flashdata->reserved = 0;
-
-  memcpy(spi_buffer + z_block_offset + sizeof(z_flashdata_t), buf.getBuffer(), buf_len);
-
-
-  if (ESP.flashEraseSector(z_spi_start_sector)) {
-    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-  }
-
-  free(spi_buffer);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data store in Flash (0x%08X - %d bytes)"), z_dev_start, buf_len);
-}
-
-
-void eraseZigbeeDevices(void) {
-  zigbee_devices.clean();
-
-  uint8_t *spi_buffer = (uint8_t*) malloc(z_spi_len);
-  if (!spi_buffer) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Cannot allocate 4KB buffer"));
-    return;
-  }
-
-  ESP.flashRead(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-
-
-  memset(spi_buffer + z_block_offset, 0xFF, z_block_len);
-
-
-  if (ESP.flashEraseSector(z_spi_start_sector)) {
-    ESP.flashWrite(z_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE);
-  }
-
-  free(spi_buffer);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "Zigbee Devices Data erased (0x%08X - %d bytes)"), z_dev_start, z_block_len);
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-#ifdef USE_ZIGBEE
-
-
-
-
-
-typedef union ZCLHeaderFrameControl_t {
-  struct {
-    uint8_t frame_type : 2;
-    uint8_t manuf_specific : 1;
-    uint8_t direction : 1;
-    uint8_t disable_def_resp : 1;
-    uint8_t reserved : 3;
-  } b;
-  uint32_t d8;
-} ZCLHeaderFrameControl_t;
-
-
-class ZCLFrame {
-public:
-
-  ZCLFrame(uint8_t frame_control, uint16_t manuf_code, uint8_t transact_seq, uint8_t cmd_id,
-    const char *buf, size_t buf_len, uint16_t clusterid, uint16_t groupid,
-    uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
-    uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
-    uint32_t timestamp):
-    _cmd_id(cmd_id), _manuf_code(manuf_code), _transact_seq(transact_seq),
-    _payload(buf_len ? buf_len : 250),
-    _cluster_id(clusterid), _group_id(groupid),
-    _srcaddr(srcaddr), _srcendpoint(srcendpoint), _dstendpoint(dstendpoint), _wasbroadcast(wasbroadcast),
-    _linkquality(linkquality), _securityuse(securityuse), _seqnumber(seqnumber),
-    _timestamp(timestamp)
-    {
-      _frame_control.d8 = frame_control;
-      _payload.addBuffer(buf, buf_len);
-    };
-
-
-  void log(void) {
-    char hex_char[_payload.len()*2+2];
-  ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
-    Response_P(PSTR("{\"" D_JSON_ZIGBEEZCL_RECEIVED "\":{"
-                    "\"groupid\":%d," "\"clusterid\":%d," "\"srcaddr\":\"0x%04X\","
-                    "\"srcendpoint\":%d," "\"dstendpoint\":%d," "\"wasbroadcast\":%d,"
-                    "\"" D_CMND_ZIGBEE_LINKQUALITY "\":%d," "\"securityuse\":%d," "\"seqnumber\":%d,"
-                    "\"timestamp\":%d,"
-                    "\"fc\":\"0x%02X\",\"manuf\":\"0x%04X\",\"transact\":%d,"
-                    "\"cmdid\":\"0x%02X\",\"payload\":\"%s\"}}"),
-                    _group_id, _cluster_id, _srcaddr,
-                    _srcendpoint, _dstendpoint, _wasbroadcast,
-                    _linkquality, _securityuse, _seqnumber,
-                    _timestamp,
-                    _frame_control, _manuf_code, _transact_seq, _cmd_id,
-                    hex_char);
-    if (Settings.flag3.tuya_serial_mqtt_publish) {
-      MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-      XdrvRulesProcess();
-    } else {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
-    }
-  }
-
-  static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid,
-                                uint16_t srcaddr, uint8_t srcendpoint, uint8_t dstendpoint, uint8_t wasbroadcast,
-                                uint8_t linkquality, uint8_t securityuse, uint8_t seqnumber,
-                                uint32_t timestamp) {
-    uint32_t i = offset;
-    ZCLHeaderFrameControl_t frame_control;
-    uint16_t manuf_code = 0;
-    uint8_t transact_seq;
-    uint8_t cmd_id;
-
-    frame_control.d8 = buf.get8(i++);
-    if (frame_control.b.manuf_specific) {
-      manuf_code = buf.get16(i);
-      i += 2;
-    }
-    transact_seq = buf.get8(i++);
-    cmd_id = buf.get8(i++);
-    ZCLFrame zcl_frame(frame_control.d8, manuf_code, transact_seq, cmd_id,
-                       (const char *)(buf.buf() + i), len + offset - i,
-                       clusterid, groupid,
-                       srcaddr, srcendpoint, dstendpoint, wasbroadcast,
-                       linkquality, securityuse, seqnumber,
-                       timestamp);
-    return zcl_frame;
-  }
-
-  bool isClusterSpecificCommand(void) {
-    return _frame_control.b.frame_type & 1;
-  }
-
-  static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
-  void parseRawAttributes(JsonObject& json, uint8_t offset = 0);
-  void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
-  void parseClusterSpecificCommand(JsonObject& json, uint8_t offset = 0);
-  void postProcessAttributes(uint16_t shortaddr, JsonObject& json);
-
-  inline void setGroupId(uint16_t groupid) {
-    _group_id = groupid;
-  }
-
-  inline void setClusterId(uint16_t clusterid) {
-    _cluster_id = clusterid;
-  }
-
-  inline uint8_t getCmdId(void) const {
-    return _cmd_id;
-  }
-
-  inline uint16_t getClusterId(void) const {
-    return _cluster_id;
-  }
-
-  inline uint16_t getSrcEndpoint(void) const {
-    return _srcendpoint;
-  }
-
-  const SBuffer &getPayload(void) const {
-    return _payload;
-  }
-
-  uint16_t getManufCode(void) const {
-    return _manuf_code;
-  }
-
-private:
-  ZCLHeaderFrameControl_t _frame_control = { .d8 = 0 };
-  uint16_t _manuf_code = 0;
-  uint8_t _transact_seq = 0;
-  uint8_t _cmd_id = 0;
-  uint16_t _cluster_id = 0;
-  uint16_t _group_id = 0;
-  SBuffer _payload;
-
-  uint16_t _srcaddr;
-  uint8_t _srcendpoint;
-  uint8_t _dstendpoint;
-  uint8_t _wasbroadcast;
-  uint8_t _linkquality;
-  uint8_t _securityuse;
-  uint8_t _seqnumber;
-  uint32_t _timestamp;
-};
-
-
-
-
-
-
-uint8_t toPercentageCR2032(uint32_t voltage) {
-  uint32_t percentage;
-  if (voltage < 2100) {
-      percentage = 0;
-  } else if (voltage < 2440) {
-      percentage = 6 - ((2440 - voltage) * 6) / 340;
-  } else if (voltage < 2740) {
-      percentage = 18 - ((2740 - voltage) * 12) / 300;
-  } else if (voltage < 2900) {
-      percentage = 42 - ((2900 - voltage) * 24) / 160;
-  } else if (voltage < 3000) {
-      percentage = 100 - ((3000 - voltage) * 58) / 100;
-  } else if (voltage >= 3000) {
-      percentage = 100;
-  }
-  return percentage;
-}
-
-
-uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer &buf,
-                              uint32_t offset, uint32_t len) {
-
-  uint32_t i = offset;
-  uint32_t attrtype = buf.get8(i++);
-
-
-  json[attrid_str] = (char*) nullptr;
-
-
-  switch (attrtype) {
-    case 0x00:
-    case 0xFF:
-      break;
-    case 0x10:
-      {
-        uint8_t val_bool = buf.get8(i++);
-        if (0xFF != val_bool) {
-          json[attrid_str] = (bool) (val_bool ? true : false);
-        }
-      }
-      break;
-    case 0x20:
-      {
-        uint8_t uint8_val = buf.get8(i);
-        i += 1;
-        if (0xFF != uint8_val) {
-          json[attrid_str] = uint8_val;
-        }
-      }
-      break;
-    case 0x21:
-      {
-        uint16_t uint16_val = buf.get16(i);
-        i += 2;
-        if (0xFFFF != uint16_val) {
-          json[attrid_str] = uint16_val;
-        }
-      }
-      break;
-    case 0x23:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        i += 4;
-        if (0xFFFFFFFF != uint32_val) {
-          json[attrid_str] = uint32_val;
-        }
-      }
-      break;
-
-    case 0x24:
-    case 0x25:
-    case 0x26:
-    case 0x27:
-      {
-        uint8_t len = attrtype - 0x1F;
-
-        char hex[2*len+1];
-        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-        json[attrid_str] = hex;
-        i += len;
-      }
-      break;
-    case 0x28:
-      {
-        int8_t int8_val = buf.get8(i);
-        i += 1;
-        if (0x80 != int8_val) {
-          json[attrid_str] = int8_val;
-        }
-      }
-      break;
-    case 0x29:
-      {
-        int16_t int16_val = buf.get16(i);
-        i += 2;
-        if (0x8000 != int16_val) {
-          json[attrid_str] = int16_val;
-        }
-      }
-      break;
-    case 0x2B:
-      {
-        int32_t int32_val = buf.get32(i);
-        i += 4;
-        if (0x80000000 != int32_val) {
-          json[attrid_str] = int32_val;
-        }
-      }
-      break;
-
-    case 0x2C:
-    case 0x2D:
-    case 0x2E:
-    case 0x2F:
-      {
-        uint8_t len = attrtype - 0x27;
-
-        char hex[2*len+1];
-        ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-        json[attrid_str] = hex;
-        i += len;
-      }
-      break;
-
-    case 0x41:
-    case 0x42:
-    case 0x43:
-    case 0x44:
-
-      {
-        bool parse_as_string = true;
-        uint32_t len = (attrtype <= 0x42) ? buf.get8(i) : buf.get16(i);
-        i += (attrtype <= 0x42) ? 1 : 2;
-        if (i + len > buf.len()) {
-          len = buf.len() - i;
-        }
-
-
-        if ((0x41 == attrtype) || (0x43 == attrtype)) { parse_as_string = false; }
-# 318 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-        if (parse_as_string) {
-          char str[len+1];
-          strncpy(str, buf.charptr(i), len);
-          str[len] = 0x00;
-          json[attrid_str] = str;
-        } else {
-
-          char hex[2*len+1];
-          ToHex_P(buf.buf(i), len, hex, sizeof(hex));
-          json[attrid_str] = hex;
-        }
-
-        i += len;
-        break;
-      }
-      i += buf.get8(i) + 1;
-      break;
-
-    case 0x08:
-    case 0x18:
-      {
-        uint8_t uint8_val = buf.get8(i);
-        i += 1;
-        json[attrid_str] = uint8_val;
-      }
-      break;
-    case 0x09:
-    case 0x19:
-      {
-        uint16_t uint16_val = buf.get16(i);
-        i += 2;
-        json[attrid_str] = uint16_val;
-      }
-      break;
-    case 0x0B:
-    case 0x1B:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        i += 4;
-        json[attrid_str] = uint32_val;
-      }
-      break;
-
-    case 0x30:
-    case 0x31:
-      i += attrtype - 0x2F;
-      break;
-
-
-    case 0x39:
-      {
-        uint32_t uint32_val = buf.get32(i);
-        float * float_val = (float*) &uint32_val;
-        i += 4;
-        json[attrid_str] = *float_val;
-      }
-      break;
-
-    case 0xE0:
-    case 0xE1:
-    case 0xE2:
-      i += 4;
-      break;
-
-    case 0xE8:
-    case 0xE9:
-      i += 2;
-      break;
-    case 0xEA:
-      i += 4;
-      break;
-
-    case 0xF0:
-      i += 8;
-      break;
-    case 0xF1:
-      i += 16;
-      break;
-
-
-    case 0x0A:
-    case 0x0C:
-    case 0x0D:
-    case 0x0E:
-    case 0x0F:
-      i += attrtype - 0x07;
-      break;
-
-    case 0x1A:
-    case 0x1C:
-    case 0x1D:
-    case 0x1E:
-    case 0x1F:
-      i += attrtype - 0x17;
-      break;
-
-    case 0x38:
-      i += 2;
-      break;
-    case 0x3A:
-      {
-        uint64_t uint64_val = buf.get64(i);
-        double * double_val = (double*) &uint64_val;
-        i += 8;
-        json[attrid_str] = *double_val;
-      }
-      break;
-  }
-
-
-
-
-
-
-  return i - offset;
-}
-
-
-void ZCLFrame::generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len) {
-  uint32_t suffix = 1;
-
-  snprintf_P(key, key_len, PSTR("%04X/%04X"), cluster, attr);
-  while (json.containsKey(key)) {
-    suffix++;
-    snprintf_P(key, key_len, PSTR("%04X/%04X+%d"), cluster, attr, suffix);
-  }
-}
-
-
-void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  while (len >= i + 3) {
-    uint16_t attrid = _payload.get16(i);
-    i += 2;
-
-    char key[16];
-    generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
-
-
-    if ((0x0000 == _cluster_id) && (0xFF01 == attrid)) {
-      if (0x42 == _payload.get8(i)) {
-        _payload.set8(i, 0x41);
-      }
-    }
-    i += parseSingleAttribute(json, key, _payload, i, len);
-  }
-}
-
-
-void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
-  uint32_t i = offset;
-  uint32_t len = _payload.len();
-
-  while (len - i >= 4) {
-    uint16_t attrid = _payload.get16(i);
-    i += 2;
-    uint8_t status = _payload.get8(i++);
-
-    if (0 == status) {
-      char key[16];
-      generateAttributeName(json, _cluster_id, attrid, key, sizeof(key));
-
-      i += parseSingleAttribute(json, key, _payload, i, len);
-    }
-  }
-}
-
-
-
-void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
-  convertClusterSpecific(json, _cluster_id, _cmd_id, _frame_control.b.direction, _payload);
-}
-
-
-
-
-typedef int32_t (*Z_AttrConverter)(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr);
-typedef struct Z_AttributeConverter {
-  uint16_t cluster;
-  uint16_t attribute;
-  const char * name;
-  Z_AttrConverter func;
-} Z_AttributeConverter;
-
-
-const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
-  { 0x0000, 0x0000, "ZCLVersion", &Z_Copy },
-  { 0x0000, 0x0001, "AppVersion", &Z_Copy },
-  { 0x0000, 0x0002, "StackVersion", &Z_Copy },
-  { 0x0000, 0x0003, "HWVersion", &Z_Copy },
-  { 0x0000, 0x0004, "Manufacturer", &Z_ManufKeep },
-  { 0x0000, 0x0005, D_JSON_MODEL D_JSON_ID, &Z_ModelKeep },
-  { 0x0000, 0x0006, "DateCode", &Z_Copy },
-  { 0x0000, 0x0007, "PowerSource", &Z_Copy },
-  { 0x0000, 0x4000, "SWBuildID", &Z_Copy },
-  { 0x0000, 0xFFFF, nullptr, &Z_Remove },
-
-  { 0x0000, 0xFF01, nullptr, &Z_AqaraSensor },
-
-
-  { 0x0001, 0x0000, "MainsVoltage", &Z_Copy },
-  { 0x0001, 0x0001, "MainsFrequency", &Z_Copy },
-  { 0x0001, 0x0020, "BatteryVoltage", &Z_Copy },
-  { 0x0001, 0x0021, "BatteryPercentageRemaining",&Z_Copy },
-
-
-  { 0x0002, 0x0000, "CurrentTemperature", &Z_Copy },
-  { 0x0002, 0x0001, "MinTempExperienced", &Z_Copy },
-  { 0x0002, 0x0002, "MaxTempExperienced", &Z_Copy },
-  { 0x0002, 0x0003, "OverTempTotalDwell", &Z_Copy },
-
-
-  { 0x0006, 0x0000, "Power", &Z_Copy },
-  { 0x0006, 0x8000, "Power", &Z_Copy },
-
-
-  { 0x0007, 0x0000, "SwitchType", &Z_Copy },
-
-
-  { 0x0008, 0x0000, "Dimmer", &Z_Copy },
-# 548 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-  { 0x0009, 0x0000, "AlarmCount", &Z_Copy },
-
-  { 0x000A, 0x0000, "Time", &Z_Copy },
-  { 0x000A, 0x0001, "TimeStatus", &Z_Copy },
-  { 0x000A, 0x0002, "TimeZone", &Z_Copy },
-  { 0x000A, 0x0003, "DstStart", &Z_Copy },
-  { 0x000A, 0x0004, "DstStart", &Z_Copy },
-  { 0x000A, 0x0005, "DstShift", &Z_Copy },
-  { 0x000A, 0x0006, "StandardTime", &Z_Copy },
-  { 0x000A, 0x0007, "LocalTime", &Z_Copy },
-  { 0x000A, 0x0008, "LastSetTime", &Z_Copy },
-  { 0x000A, 0x0009, "ValidUntilTime", &Z_Copy },
-
-  { 0x000B, 0x0000, "LocationType", &Z_Copy },
-  { 0x000B, 0x0000, "LocationMethod", &Z_Copy },
-  { 0x000B, 0x0000, "LocationAge", &Z_Copy },
-  { 0x000B, 0x0000, "QualityMeasure", &Z_Copy },
-  { 0x000B, 0x0000, "NumberOfDevices", &Z_Copy },
-
-  { 0x000C, 0x0004, "ActiveText", &Z_Copy },
-  { 0x000C, 0x001C, "Description", &Z_Copy },
-  { 0x000C, 0x002E, "InactiveText", &Z_Copy },
-  { 0x000C, 0x0041, "MaxPresentValue", &Z_Copy },
-  { 0x000C, 0x0045, "MinPresentValue", &Z_Copy },
-  { 0x000C, 0x0051, "OutOfService", &Z_Copy },
-  { 0x000C, 0x0055, "AqaraRotate", &Z_Copy },
-  { 0x000C, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x000C, 0x0067, "Reliability", &Z_Copy },
-  { 0x000C, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x000C, 0x006A, "Resolution", &Z_Copy },
-  { 0x000C, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x000C, 0x0075, "EngineeringUnits", &Z_Copy },
-  { 0x000C, 0x0100, "ApplicationType", &Z_Copy },
-  { 0x000C, 0xFF05, "Aqara_FF05", &Z_Copy },
-
-  { 0x0010, 0x0004, "ActiveText", &Z_Copy },
-  { 0x0010, 0x001C, "Description", &Z_Copy },
-  { 0x0010, 0x002E, "InactiveText", &Z_Copy },
-  { 0x0010, 0x0042, "MinimumOffTime", &Z_Copy },
-  { 0x0010, 0x0043, "MinimumOnTime", &Z_Copy },
-  { 0x0010, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0010, 0x0054, "Polarity", &Z_Copy },
-  { 0x0010, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0010, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0010, 0x0067, "Reliability", &Z_Copy },
-  { 0x0010, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0010, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0010, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0011, 0x0004, "ActiveText", &Z_Copy },
-  { 0x0011, 0x001C, "Description", &Z_Copy },
-  { 0x0011, 0x002E, "InactiveText", &Z_Copy },
-  { 0x0011, 0x0042, "MinimumOffTime", &Z_Copy },
-  { 0x0011, 0x0043, "MinimumOnTime", &Z_Copy },
-  { 0x0011, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0011, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0011, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0011, 0x0067, "Reliability", &Z_Copy },
-  { 0x0011, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0011, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0011, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0012, 0x000E, "StateText", &Z_Copy },
-  { 0x0012, 0x001C, "Description", &Z_Copy },
-  { 0x0012, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0012, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0012, 0x0055, "PresentValue", &Z_AqaraCube },
-  { 0x0012, 0x0067, "Reliability", &Z_Copy },
-  { 0x0012, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0012, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0013, 0x000E, "StateText", &Z_Copy },
-  { 0x0013, 0x001C, "Description", &Z_Copy },
-  { 0x0013, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0013, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0013, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0013, 0x0057, "PriorityArray", &Z_Copy },
-  { 0x0013, 0x0067, "Reliability", &Z_Copy },
-  { 0x0013, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0013, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0013, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x0014, 0x000E, "StateText", &Z_Copy },
-  { 0x0014, 0x001C, "Description", &Z_Copy },
-  { 0x0014, 0x004A, "NumberOfStates", &Z_Copy },
-  { 0x0014, 0x0051, "OutOfService", &Z_Copy },
-  { 0x0014, 0x0055, "PresentValue", &Z_Copy },
-  { 0x0014, 0x0067, "Reliability", &Z_Copy },
-  { 0x0014, 0x0068, "RelinquishDefault", &Z_Copy },
-  { 0x0014, 0x006F, "StatusFlags", &Z_Copy },
-  { 0x0014, 0x0100, "ApplicationType", &Z_Copy },
-
-  { 0x001A, 0x0000, "TotalProfileNum", &Z_Copy },
-  { 0x001A, 0x0001, "MultipleScheduling", &Z_Copy },
-  { 0x001A, 0x0002, "EnergyFormatting", &Z_Copy },
-  { 0x001A, 0x0003, "EnergyRemote", &Z_Copy },
-  { 0x001A, 0x0004, "ScheduleMode", &Z_Copy },
-
-  { 0x0020, 0x0000, "CheckinInterval", &Z_Copy },
-  { 0x0020, 0x0001, "LongPollInterval", &Z_Copy },
-  { 0x0020, 0x0002, "ShortPollInterval", &Z_Copy },
-  { 0x0020, 0x0003, "FastPollTimeout", &Z_Copy },
-  { 0x0020, 0x0004, "CheckinIntervalMin", &Z_Copy },
-  { 0x0020, 0x0005, "LongPollIntervalMin", &Z_Copy },
-  { 0x0020, 0x0006, "FastPollTimeoutMax", &Z_Copy },
-
-  { 0x0100, 0x0000, "PhysicalClosedLimit", &Z_Copy },
-  { 0x0100, 0x0001, "MotorStepSize", &Z_Copy },
-  { 0x0100, 0x0002, "Status", &Z_Copy },
-  { 0x0100, 0x0010, "ClosedLimit", &Z_Copy },
-  { 0x0100, 0x0011, "Mode", &Z_Copy },
-
-  { 0x0101, 0x0000, "LockState", &Z_Copy },
-  { 0x0101, 0x0001, "LockType", &Z_Copy },
-  { 0x0101, 0x0002, "ActuatorEnabled", &Z_Copy },
-  { 0x0101, 0x0003, "DoorState", &Z_Copy },
-  { 0x0101, 0x0004, "DoorOpenEvents", &Z_Copy },
-  { 0x0101, 0x0005, "DoorClosedEvents", &Z_Copy },
-  { 0x0101, 0x0006, "OpenPeriod", &Z_Copy },
-
-  { 0x0101, 0x0055, "AqaraVibrationMode", &Z_AqaraVibration },
-  { 0x0101, 0x0503, "AqaraVibrationsOrAngle", &Z_Copy },
-  { 0x0101, 0x0505, "AqaraVibration505", &Z_Copy },
-  { 0x0101, 0x0508, "AqaraAccelerometer", &Z_AqaraVibration },
-
-  { 0x0102, 0x0000, "WindowCoveringType", &Z_Copy },
-  { 0x0102, 0x0001, "PhysicalClosedLimitLift",&Z_Copy },
-  { 0x0102, 0x0002, "PhysicalClosedLimitTilt",&Z_Copy },
-  { 0x0102, 0x0003, "CurrentPositionLift", &Z_Copy },
-  { 0x0102, 0x0004, "CurrentPositionTilt", &Z_Copy },
-  { 0x0102, 0x0005, "NumberofActuationsLift",&Z_Copy },
-  { 0x0102, 0x0006, "NumberofActuationsTilt",&Z_Copy },
-  { 0x0102, 0x0007, "ConfigStatus", &Z_Copy },
-  { 0x0102, 0x0008, "CurrentPositionLiftPercentage",&Z_Copy },
-  { 0x0102, 0x0009, "CurrentPositionTiltPercentage",&Z_Copy },
-  { 0x0102, 0x0010, "InstalledOpenLimitLift",&Z_Copy },
-  { 0x0102, 0x0011, "InstalledClosedLimitLift",&Z_Copy },
-  { 0x0102, 0x0012, "InstalledOpenLimitTilt", &Z_Copy },
-  { 0x0102, 0x0013, "InstalledClosedLimitTilt", &Z_Copy },
-  { 0x0102, 0x0014, "VelocityLift",&Z_Copy },
-  { 0x0102, 0x0015, "AccelerationTimeLift",&Z_Copy },
-  { 0x0102, 0x0016, "DecelerationTimeLift", &Z_Copy },
-  { 0x0102, 0x0017, "Mode",&Z_Copy },
-  { 0x0102, 0x0018, "IntermediateSetpointsLift",&Z_Copy },
-  { 0x0102, 0x0019, "IntermediateSetpointsTilt",&Z_Copy },
-
-
-  { 0x0300, 0x0000, "Hue", &Z_Copy },
-  { 0x0300, 0x0001, "Sat", &Z_Copy },
-  { 0x0300, 0x0002, "RemainingTime", &Z_Copy },
-  { 0x0300, 0x0003, "X", &Z_Copy },
-  { 0x0300, 0x0004, "Y", &Z_Copy },
-  { 0x0300, 0x0005, "DriftCompensation", &Z_Copy },
-  { 0x0300, 0x0006, "CompensationText", &Z_Copy },
-  { 0x0300, 0x0007, "CT", &Z_Copy },
-  { 0x0300, 0x0008, "ColorMode", &Z_Copy },
-  { 0x0300, 0x0010, "NumberOfPrimaries", &Z_Copy },
-  { 0x0300, 0x0011, "Primary1X", &Z_Copy },
-  { 0x0300, 0x0012, "Primary1Y", &Z_Copy },
-  { 0x0300, 0x0013, "Primary1Intensity", &Z_Copy },
-  { 0x0300, 0x0015, "Primary2X", &Z_Copy },
-  { 0x0300, 0x0016, "Primary2Y", &Z_Copy },
-  { 0x0300, 0x0017, "Primary2Intensity", &Z_Copy },
-  { 0x0300, 0x0019, "Primary3X", &Z_Copy },
-  { 0x0300, 0x001A, "Primary3Y", &Z_Copy },
-  { 0x0300, 0x001B, "Primary3Intensity", &Z_Copy },
-  { 0x0300, 0x0030, "WhitePointX", &Z_Copy },
-  { 0x0300, 0x0031, "WhitePointY", &Z_Copy },
-  { 0x0300, 0x0032, "ColorPointRX", &Z_Copy },
-  { 0x0300, 0x0033, "ColorPointRY", &Z_Copy },
-  { 0x0300, 0x0034, "ColorPointRIntensity", &Z_Copy },
-  { 0x0300, 0x0036, "ColorPointGX", &Z_Copy },
-  { 0x0300, 0x0037, "ColorPointGY", &Z_Copy },
-  { 0x0300, 0x0038, "ColorPointGIntensity", &Z_Copy },
-  { 0x0300, 0x003A, "ColorPointBX", &Z_Copy },
-  { 0x0300, 0x003B, "ColorPointBY", &Z_Copy },
-  { 0x0300, 0x003C, "ColorPointBIntensity", &Z_Copy },
-
-
-  { 0x0400, 0x0000, D_JSON_ILLUMINANCE, &Z_Copy },
-  { 0x0400, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0400, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0400, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0400, 0x0004, "LightSensorType", &Z_Copy },
-  { 0x0400, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0401, 0x0000, "LevelStatus", &Z_Copy },
-  { 0x0401, 0x0001, "LightSensorType", &Z_Copy },
-  { 0x0401, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0402, 0x0000, D_JSON_TEMPERATURE, &Z_FloatDiv100 },
-  { 0x0402, 0x0001, "MinMeasuredValue", &Z_FloatDiv100 },
-  { 0x0402, 0x0002, "MaxMeasuredValue", &Z_FloatDiv100 },
-  { 0x0402, 0x0003, "Tolerance", &Z_FloatDiv100 },
-  { 0x0402, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0403, 0x0000, D_JSON_PRESSURE_UNIT, &Z_AddPressureUnit },
-  { 0x0403, 0x0000, D_JSON_PRESSURE, &Z_Copy },
-  { 0x0403, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0403, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0403, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0403, 0x0010, "ScaledValue", &Z_Copy },
-  { 0x0403, 0x0011, "MinScaledValue", &Z_Copy },
-  { 0x0403, 0x0012, "MaxScaledValue", &Z_Copy },
-  { 0x0403, 0x0013, "ScaledTolerance", &Z_Copy },
-  { 0x0403, 0x0014, "Scale", &Z_Copy },
-  { 0x0403, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0404, 0x0000, D_JSON_FLOWRATE, &Z_FloatDiv10 },
-  { 0x0404, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0404, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0404, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0404, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0405, 0x0000, D_JSON_HUMIDITY, &Z_FloatDiv100 },
-  { 0x0405, 0x0001, "MinMeasuredValue", &Z_Copy },
-  { 0x0405, 0x0002, "MaxMeasuredValue", &Z_Copy },
-  { 0x0405, 0x0003, "Tolerance", &Z_Copy },
-  { 0x0405, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0406, 0x0000, OCCUPANCY, &Z_Copy },
-  { 0x0406, 0x0001, "OccupancySensorType", &Z_Copy },
-  { 0x0406, 0xFFFF, nullptr, &Z_Remove },
-
-
-  { 0x0B01, 0x0000, "CompanyName", &Z_Copy },
-  { 0x0B01, 0x0001, "MeterTypeID", &Z_Copy },
-  { 0x0B01, 0x0004, "DataQualityID", &Z_Copy },
-  { 0x0B01, 0x0005, "CustomerName", &Z_Copy },
-  { 0x0B01, 0x0006, "Model", &Z_Copy },
-  { 0x0B01, 0x0007, "PartNumber", &Z_Copy },
-  { 0x0B01, 0x000A, "SoftwareRevision", &Z_Copy },
-  { 0x0B01, 0x000C, "POD", &Z_Copy },
-  { 0x0B01, 0x000D, "AvailablePower", &Z_Copy },
-  { 0x0B01, 0x000E, "PowerThreshold", &Z_Copy },
-
-
-  { 0x0B05, 0x0000, "NumberOfResets", &Z_Copy },
-  { 0x0B05, 0x0001, "PersistentMemoryWrites",&Z_Copy },
-  { 0x0B05, 0x011C, "LastMessageLQI", &Z_Copy },
-  { 0x0B05, 0x011D, "LastMessageRSSI", &Z_Copy },
-
-};
-
-
-
-int32_t Z_ManufKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  zigbee_devices.setManufId(shortaddr, value.as<const char*>());
-  return 1;
-}
-
-int32_t Z_ModelKeep(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  zigbee_devices.setModelId(shortaddr, value.as<const char*>());
-  return 1;
-}
-
-
-
-int32_t Z_Remove(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  return 1;
-}
-
-
-int32_t Z_Copy(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  return 1;
-}
-
-
-int32_t Z_AddPressureUnit(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = F(D_UNIT_PRESSURE);
-  return 0;
-}
-
-
-int32_t Z_FloatDiv100(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = ((float)value) / 100.0f;
-  return 1;
-}
-
-int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = ((float)value) / 10.0f;
-  return 1;
-}
-
-
-int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-  json[F(OCCUPANCY)] = 0;
-  zigbee_devices.jsonPublishNow(shortaddr, json);
-}
-
-
-int32_t Z_AqaraCube(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  json[new_name] = value;
-  int32_t val = value;
-  const __FlashStringHelper *aqara_cube = F("AqaraCube");
-  const __FlashStringHelper *aqara_cube_side = F("AqaraCubeSide");
-  const __FlashStringHelper *aqara_cube_from_side = F("AqaraCubeFromSide");
-
-  switch (val) {
-    case 0:
-      json[aqara_cube] = F("shake");
-      break;
-    case 2:
-      json[aqara_cube] = F("wakeup");
-      break;
-    case 3:
-      json[aqara_cube] = F("fall");
-      break;
-    case 64 ... 127:
-      json[aqara_cube] = F("flip90");
-      json[aqara_cube_side] = val % 8;
-      json[aqara_cube_from_side] = (val - 64) / 8;
-      break;
-    case 128 ... 132:
-      json[aqara_cube] = F("flip180");
-      json[aqara_cube_side] = val - 128;
-      break;
-    case 256 ... 261:
-      json[aqara_cube] = F("slide");
-      json[aqara_cube_side] = val - 256;
-      break;
-    case 512 ... 517:
-      json[aqara_cube] = F("tap");
-      json[aqara_cube_side] = val - 512;
-      break;
-  }
-# 905 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_5_converters.ino"
-  return 1;
-}
-
-
-int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-
-  switch (attr) {
-    case 0x0055:
-      {
-        int32_t ivalue = value;
-        const __FlashStringHelper * svalue;
-        switch (ivalue) {
-          case 1: svalue = F("vibrate"); break;
-          case 2: svalue = F("tilt"); break;
-          case 3: svalue = F("drop"); break;
-          default: svalue = F("unknown"); break;
-        }
-        json[new_name] = svalue;
-      }
-      break;
-
-
-
-
-    case 0x0508:
-      {
-
-
-        String hex = value;
-        SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
-        int16_t x, y, z;
-        z = buf2.get16(0);
-        y = buf2.get16(2);
-        x = buf2.get16(4);
-        JsonArray& xyz = json.createNestedArray(new_name);
-        xyz.add(x);
-        xyz.add(y);
-        xyz.add(z);
-
-        float X = x;
-        float Y = y;
-        float Z = z;
-        int32_t Angle_X = 0.5f + atanf(X/sqrtf(z*z+y*y)) * f_180pi;
-        int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(x*x+z*z)) * f_180pi;
-        int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(x*x+y*y)) * f_180pi;
-
-
-
-        JsonArray& angles = json.createNestedArray(F("AqaraAngles"));
-        angles.add(Angle_X);
-        angles.add(Angle_Y);
-        angles.add(Angle_Z);
-      }
-      break;
-  }
-  return 1;
-}
-
-int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
-  String hex = value;
-  SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
-  uint32_t i = 0;
-  uint32_t len = buf2.len();
-  char tmp[] = "tmp";
-
-  JsonVariant sub_value;
-
-  while (len - i >= 2) {
-    uint8_t attrid = buf2.get8(i++);
-
-    i += parseSingleAttribute(json, tmp, buf2, i, len);
-    float val = json[tmp];
-    json.remove(tmp);
-    if (0x01 == attrid) {
-      json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
-      json[F("Battery")] = toPercentageCR2032(val);
-    } else if (0 == zcl->getManufCode()) {
-
-      if (0x64 == attrid) {
-        json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
-      } else if (0x65 == attrid) {
-        json[F(D_JSON_HUMIDITY)] = val / 100.0f;
-      } else if (0x66 == attrid) {
-        json[F(D_JSON_PRESSURE)] = val / 100.0f;
-        json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);
-      } else if (0x01 == attrid) {
-        json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
-        json[F("Battery")] = toPercentageCR2032(val);
-      }
-    } else if (0x115F == zcl->getManufCode()) {
-
-      json[F("AqaraUnknown")] = val;
-    }
-  }
-  return 1;
-}
-
-
-void ZCLFrame::postProcessAttributes(uint16_t shortaddr, JsonObject& json) {
-
-  for (auto kv : json) {
-    String key_string = kv.key;
-    const char * key = key_string.c_str();
-    JsonVariant& value = kv.value;
-
-    char * delimiter = strchr(key, '/');
-    char * delimiter2 = strchr(key, '+');
-    if (delimiter) {
-      uint16_t attribute;
-      uint16_t suffix = 1;
-      uint16_t cluster = strtoul(key, &delimiter, 16);
-      if (!delimiter2) {
-        attribute = strtoul(delimiter+1, nullptr, 16);
-      } else {
-        attribute = strtoul(delimiter+1, &delimiter2, 16);
-        suffix = strtoul(delimiter2+1, nullptr, 10);
-      }
-
-
-      for (uint32_t i = 0; i < sizeof(Z_PostProcess) / sizeof(Z_PostProcess[0]); i++) {
-        const Z_AttributeConverter *converter = &Z_PostProcess[i];
-        uint16_t conv_cluster = pgm_read_word(&converter->cluster);
-        uint16_t conv_attribute = pgm_read_word(&converter->attribute);
-
-        if ((conv_cluster == cluster) &&
-            ((conv_attribute == attribute) || (conv_attribute == 0xFFFF)) ) {
-          String new_name_str = converter->name;
-          if (suffix > 1) { new_name_str += suffix; }
-          int32_t drop = (*converter->func)(this, shortaddr, json, key, value, new_name_str, conv_cluster, conv_attribute);
-          if (drop) {
-            json.remove(key);
-          }
-
-        }
-      }
-    }
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
-#ifdef USE_ZIGBEE
-
-typedef struct Z_CommandConverter {
-  const char * tasmota_cmd;
-  uint16_t cluster;
-  uint8_t cmd;
-  uint8_t direction;
-  const char * param;
-} Z_CommandConverter;
-
-typedef struct Z_XYZ_Var {
-  uint32_t x = 0;
-  uint32_t y = 0;
-  uint32_t z = 0;
-  uint8_t x_type = 0;
-  uint8_t y_type = 0;
-  uint8_t z_type = 0;
-} Z_XYZ_Var;
-
-
-const Z_CommandConverter Z_Commands[] = {
-
-  { "AddGroup", 0x0004, 0x00, 0x01, "xxxx00" },
-  { "ViewGroup", 0x0004, 0x01, 0x01, "xxxx" },
-  { "GetGroup", 0x0004, 0x02, 0x01, "01xxxx" },
-  { "GetAllGroups", 0x0004, 0x02, 0x01, "00" },
-  { "RemoveGroup", 0x0004, 0x03, 0x01, "xxxx" },
-  { "RemoveAllGroups",0x0004, 0x04, 0x01, "" },
-
-  { "Power", 0x0006, 0xFF, 0x01, "" },
-  { "Dimmer", 0x0008, 0x04, 0x01, "xx0A00" },
-  { "Dimmer+", 0x0008, 0x06, 0x01, "001902" },
-  { "Dimmer-", 0x0008, 0x06, 0x01, "011902" },
-  { "DimmerStop", 0x0008, 0x03, 0x01, "" },
-  { "ResetAlarm", 0x0009, 0x00, 0x01, "xxyyyy" },
-  { "ResetAllAlarms", 0x0009, 0x01, 0x01, "" },
-  { "Hue", 0x0300, 0x00, 0x01, "xx000A00" },
-  { "Sat", 0x0300, 0x03, 0x01, "xx0A00" },
-  { "HueSat", 0x0300, 0x06, 0x01, "xxyy0A00" },
-  { "Color", 0x0300, 0x07, 0x01, "xxxxyyyy0A00" },
-  { "CT", 0x0300, 0x0A, 0x01, "xxxx0A00" },
-  { "ShutterOpen", 0x0102, 0x00, 0x01, "" },
-  { "ShutterClose", 0x0102, 0x01, 0x01, "" },
-  { "ShutterStop", 0x0102, 0x02, 0x01, "" },
-  { "ShutterLift", 0x0102, 0x05, 0x01, "xx" },
-  { "ShutterTilt", 0x0102, 0x08, 0x01, "xx" },
-  { "Shutter", 0x0102, 0xFF, 0x01, "" },
-
-  { "Occupancy", 0xEF00, 0x01, 0x01, "xx"},
-
-  { "Dimmer", 0x0008, 0x00, 0x01, "xx" },
-  { "DimmerMove", 0x0008, 0x01, 0x01, "xx0A" },
-  { "DimmerStep", 0x0008, 0x02, 0x01, "xx190A00" },
-  { "DimmerMove", 0x0008, 0x05, 0x01, "xx0A" },
-  { "Dimmer+", 0x0008, 0x06, 0x01, "00" },
-  { "Dimmer-", 0x0008, 0x06, 0x01, "01" },
-  { "DimmerStop", 0x0008, 0x07, 0x01, "" },
-  { "HueMove", 0x0300, 0x01, 0x01, "xx19" },
-  { "HueStep", 0x0300, 0x02, 0x01, "xx190A00" },
-  { "SatMove", 0x0300, 0x04, 0x01, "xx19" },
-  { "SatStep", 0x0300, 0x05, 0x01, "xx190A" },
-  { "ColorMove", 0x0300, 0x08, 0x01, "xxxxyyyy" },
-  { "ColorStep", 0x0300, 0x09, 0x01, "xxxxyyyy0A00" },
-
-  { "ArrowClick", 0x0005, 0x07, 0x01, "xx" },
-  { "ArrowHold", 0x0005, 0x08, 0x01, "xx" },
-  { "ArrowRelease", 0x0005, 0x09, 0x01, "" },
-
-  { "ZoneStatusChange",0x0500, 0x00, 0x02, "xxxxyyzz" },
-
-  { "AddGroupResp", 0x0004, 0x00, 0x02, "xxyyyy" },
-  { "ViewGroupResp", 0x0004, 0x01, 0x02, "xxyyyy" },
-  { "GetGroupResp", 0x0004, 0x02, 0x02, "xxyyzzzz" },
-  { "RemoveGroup", 0x0004, 0x03, 0x02, "xxyyyy" },
-};
-
-
-#define ZLE(x) ((x) & 0xFF), ((x) >> 8)
-
-
-const uint8_t CLUSTER_0006[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0008[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0009[] = { ZLE(0x0000) };
-const uint8_t CLUSTER_0300[] = { ZLE(0x0000), ZLE(0x0001), ZLE(0x0003), ZLE(0x0004), ZLE(0x0007) };
-
-
-int32_t Z_ReadAttrCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  size_t attrs_len = 0;
-  const uint8_t* attrs = nullptr;
-
-  switch (cluster) {
-    case 0x0006:
-      attrs = CLUSTER_0006;
-      attrs_len = sizeof(CLUSTER_0006);
-      break;
-    case 0x0008:
-      attrs = CLUSTER_0008;
-      attrs_len = sizeof(CLUSTER_0008);
-      break;
-    case 0x0009:
-      attrs = CLUSTER_0009;
-      attrs_len = sizeof(CLUSTER_0009);
-      break;
-    case 0x0300:
-      attrs = CLUSTER_0300;
-      attrs_len = sizeof(CLUSTER_0300);
-      break;
-  }
-  if (attrs) {
-    ZigbeeZCLSend(shortaddr, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true , zigbee_devices.getNextSeqNumber(shortaddr));
-  }
-}
-
-
-void zigbeeSetCommandTimer(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint) {
-  uint32_t wait_ms = 0;
-
-  switch (cluster) {
-    case 0x0006:
-    case 0x0009:
-      wait_ms = 200;
-      break;
-    case 0x0008:
-    case 0x0300:
-      wait_ms = 1050;
-      break;
-    case 0x0102:
-      wait_ms = 10000;
-      break;
-  }
-  if (wait_ms) {
-    zigbee_devices.setTimer(shortaddr, wait_ms, cluster, endpoint, 0 , &Z_ReadAttrCallback);
-  }
-}
-
-
-inline bool isXYZ(char c) {
-  return (c >= 'x') && (c <= 'z');
-}
-
-
-
-
-inline int8_t hexValue(char c) {
-  if ((c >= '0') && (c <= '9')) {
-    return c - '0';
-  }
-  if ((c >= 'A') && (c <= 'F')) {
-    return 10 + c - 'A';
-  }
-  if ((c >= 'a') && (c <= 'f')) {
-    return 10 + c - 'a';
-  }
-  return -1;
-}
-
-
-uint32_t parseHex_P(const char **data, size_t max_len = 8) {
-  uint32_t ret = 0;
-  for (uint32_t i = 0; i < max_len; i++) {
-    int8_t v = hexValue(pgm_read_byte(*data));
-    if (v < 0) { break; }
-    ret = (ret << 4) | v;
-    *data += 1;
-  }
-  return ret;
-}
-
-
-
-
-
-void parseXYZ(const char *model, const SBuffer &payload, struct Z_XYZ_Var *xyz) {
-  const char *p = model;
-  uint32_t v = 0;
-  char c = pgm_read_byte(p);
-  while (c) {
-    char c1 = pgm_read_byte(p+1);
-    if (!c1) { break; }
-    if (isXYZ(c) && (c == c1) && (v < payload.len())) {
-      uint8_t val = payload.get8(v);
-      switch (c) {
-        case 'x':
-          xyz->x = xyz->x | (val << (xyz->x_type * 8));
-          xyz->x_type++;
-          break;
-        case 'y':
-          xyz->y = xyz->y | (val << (xyz->y_type * 8));
-          xyz->y_type++;
-          break;
-        case 'z':
-          xyz->z = xyz->z | (val << (xyz->z_type * 8));
-          xyz->z_type++;
-          break;
-      }
-    }
-    p += 2;
-    v++;
-    c = pgm_read_byte(p);
-  }
-}
-# 231 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_6_commands.ino"
-void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, bool direction, const SBuffer &payload) {
-  size_t hex_char_len = payload.len()*2+2;
-  char *hex_char = (char*) malloc(hex_char_len);
-  if (!hex_char) { return; }
-  ToHex_P((unsigned char*)payload.getBuffer(), payload.len(), hex_char, hex_char_len);
-
-  const __FlashStringHelper* command_name = nullptr;
-  Z_XYZ_Var xyz;
-
-
-  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
-    const Z_CommandConverter *conv = &Z_Commands[i];
-    if (conv->cluster == cluster) {
-
-      if ((0xFF == conv->cmd) || (cmd == conv->cmd)) {
-
-        if ((direction && (conv->direction & 0x02)) || (!direction && (conv->direction & 0x01))) {
-
-
-
-
-          const char * p = conv->param;
-
-          bool match = true;
-          for (uint8_t i = 0; i < payload.len(); i++) {
-            const char c1 = pgm_read_byte(p);
-            const char c2 = pgm_read_byte(p+1);
-
-            if ((0x00 == c1) || isXYZ(c1)) {
-              break;
-            }
-            const char * p2 = p;
-            uint32_t nextbyte = parseHex_P(&p2, 2);
-
-            if (nextbyte != payload.get8(i)) {
-              match = false;
-              break;
-            }
-            p += 2;
-          }
-          if (match) {
-            command_name = (const __FlashStringHelper*) conv->tasmota_cmd;
-            parseXYZ(conv->param, payload, &xyz);
-            if (0xFF == conv->cmd) {
-
-              xyz.z = xyz.y;
-              xyz.z_type = xyz.y_type;
-              xyz.y = xyz.x;
-              xyz.y_type = xyz.x_type;
-              xyz.x = cmd;
-              xyz.x_type = 1;
-            }
-            break;
-          }
-        }
-      }
-    }
-  }
-
-
-
-
-  char attrid_str[12];
-  snprintf_P(attrid_str, sizeof(attrid_str), PSTR("%04X%c%02X"), cluster, direction ? '<' : '!', cmd);
-  json[attrid_str] = hex_char;
-  free(hex_char);
-
-  if (command_name) {
-    if (0 == xyz.x_type) {
-      json[command_name] = true;
-    } else if (0 == xyz.y_type) {
-      json[command_name] = xyz.x;
-    } else {
-
-      JsonArray &arr = json.createNestedArray(command_name);
-      arr.add(xyz.x);
-      arr.add(xyz.y);
-      if (xyz.z_type) {
-        arr.add(xyz.z);
-      }
-    }
-  }
-}
-
-
-
-
-const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd) {
-  for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
-    const Z_CommandConverter *conv = &Z_Commands[i];
-    if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
-      *cluster = conv->cluster;
-      *cmd = conv->cmd;
-      return (const __FlashStringHelper*) conv->param;
-    }
-  }
-
-  return nullptr;
-}
-
-
-inline char hexDigit(uint32_t h) {
-  uint32_t nybble = h & 0x0F;
-  return (nybble > 9) ? 'A' - 10 + nybble : '0' + nybble;
-}
-
-
-String zigbeeCmdAddParams(const char *zcl_cmd_P, uint32_t x, uint32_t y, uint32_t z) {
-  size_t len = strlen_P(zcl_cmd_P);
-  char zcl_cmd[len+1];
-  strcpy_P(zcl_cmd, zcl_cmd_P);
-
-  char *p = zcl_cmd;
-  while (*p) {
-    if (isXYZ(*p) && (*p == *(p+1))) {
-      uint8_t val;
-      switch (*p) {
-        case 'x':
-          val = x & 0xFF;
-          x = x >> 8;
-          break;
-        case 'y':
-          val = y & 0xFF;
-          y = y >> 8;
-          break;
-        case 'z':
-          val = z & 0xFF;
-          z = z >> 8;
-          break;
-      }
-      *p = hexDigit(val >> 4);
-      *(p+1) = hexDigit(val);
-      p++;
-    }
-    p++;
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SendZCLCommand_P: zcl_cmd = %s"), zcl_cmd);
-
-  return String(zcl_cmd);
-}
-
-const char kZ_Alias[] PROGMEM = "OFF|" D_OFF "|" D_FALSE "|" D_STOP "|" "OPEN" "|"
-                                "ON|" D_ON "|" D_TRUE "|" D_START "|" "CLOSE" "|"
-                                "TOGGLE|" D_TOGGLE "|"
-                                "ALL" ;
-
-const uint8_t kZ_Numbers[] PROGMEM = { 0,0,0,0,0,
-                                       1,1,1,1,1,
-                                       2,2,
-                                       255 };
-
-
-uint32_t ZigbeeAliasOrNumber(const char *state_text) {
-  char command[16];
-  int state_number = GetCommandCode(command, sizeof(command), state_text, kZ_Alias);
-  if (state_number >= 0) {
-
-    return pgm_read_byte(kZ_Numbers + state_number);
-  } else {
-
-    return strtoul(state_text, nullptr, 0);
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-#ifdef USE_ZIGBEE
-
-
-
-const uint8_t ZIGBEE_STATUS_OK = 0;
-const uint8_t ZIGBEE_STATUS_BOOT = 1;
-const uint8_t ZIGBEE_STATUS_RESET_CONF = 2;
-const uint8_t ZIGBEE_STATUS_STARTING = 3;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_CLOSE = 20;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_60 = 21;
-const uint8_t ZIGBEE_STATUS_PERMITJOIN_OPEN_XX = 22;
-const uint8_t ZIGBEE_STATUS_DEVICE_ANNOUNCE = 30;
-const uint8_t ZIGBEE_STATUS_NODE_DESC = 31;
-const uint8_t ZIGBEE_STATUS_ACTIVE_EP = 32;
-const uint8_t ZIGBEE_STATUS_SIMPLE_DESC = 33;
-const uint8_t ZIGBEE_STATUS_DEVICE_INDICATION = 34;
-const uint8_t ZIGBEE_STATUS_DEVICE_IEEE = 35;
-const uint8_t ZIGBEE_STATUS_CC_VERSION = 50;
-const uint8_t ZIGBEE_STATUS_CC_INFO = 51;
-const uint8_t ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;
-const uint8_t ZIGBEE_STATUS_ABORT = 99;
-
-typedef int32_t (*ZB_Func)(uint8_t value);
-typedef int32_t (*ZB_RecvMsgFunc)(int32_t res, const class SBuffer &buf);
-
-typedef union Zigbee_Instruction {
-  struct {
-    uint8_t i;
-    uint8_t d8;
-    uint16_t d16;
-  } i;
-  const void *p;
-
-
-
-} Zigbee_Instruction;
-
-
-
-
-typedef struct Zigbee_Instruction_Type {
-  uint8_t instr;
-  uint8_t data;
-} Zigbee_Instruction_Type;
-
-enum Zigbee_StateMachine_Instruction_Set {
-
-  ZGB_INSTR_4_BYTES = 0,
-  ZGB_INSTR_NOOP = 0,
-  ZGB_INSTR_LABEL,
-  ZGB_INSTR_GOTO,
-  ZGB_INSTR_ON_ERROR_GOTO,
-  ZGB_INSTR_ON_TIMEOUT_GOTO,
-  ZGB_INSTR_WAIT,
-  ZGB_INSTR_WAIT_FOREVER,
-  ZGB_INSTR_STOP,
-
-
-  ZGB_INSTR_8_BYTES = 0x80,
-  ZGB_INSTR_CALL = 0x80,
-  ZGB_INSTR_LOG,
-  ZGB_INSTR_MQTT_STATE,
-  ZGB_INSTR_SEND,
-  ZGB_INSTR_WAIT_UNTIL,
-  ZGB_INSTR_WAIT_RECV,
-  ZGB_ON_RECV_UNEXPECTED,
-
-
-  ZGB_INSTR_12_BYTES = 0xF0,
-  ZGB_INSTR_WAIT_RECV_CALL,
-};
-
-#define ZI_NOOP() { .i = { ZGB_INSTR_NOOP, 0x00, 0x0000} },
-#define ZI_LABEL(x) { .i = { ZGB_INSTR_LABEL, (x), 0x0000} },
-#define ZI_GOTO(x) { .i = { ZGB_INSTR_GOTO, (x), 0x0000} },
-#define ZI_ON_ERROR_GOTO(x) { .i = { ZGB_INSTR_ON_ERROR_GOTO, (x), 0x0000} },
-#define ZI_ON_TIMEOUT_GOTO(x) { .i = { ZGB_INSTR_ON_TIMEOUT_GOTO, (x), 0x0000} },
-#define ZI_WAIT(x) { .i = { ZGB_INSTR_WAIT, 0x00, (x)} },
-#define ZI_WAIT_FOREVER() { .i = { ZGB_INSTR_WAIT_FOREVER, 0x00, 0x0000} },
-#define ZI_STOP(x) { .i = { ZGB_INSTR_STOP, (x), 0x0000} },
-
-#define ZI_CALL(f,x) { .i = { ZGB_INSTR_CALL, (x), 0x0000} }, { .p = (const void*)(f) },
-#define ZI_LOG(x,m) { .i = { ZGB_INSTR_LOG, (x), 0x0000 } }, { .p = ((const void*)(m)) },
-#define ZI_MQTT_STATE(x,m) { .i = { ZGB_INSTR_MQTT_STATE, (x), 0x0000 } }, { .p = ((const void*)(m)) },
-#define ZI_ON_RECV_UNEXPECTED(f) { .i = { ZGB_ON_RECV_UNEXPECTED, 0x00, 0x0000} }, { .p = (const void*)(f) },
-#define ZI_SEND(m) { .i = { ZGB_INSTR_SEND, sizeof(m), 0x0000} }, { .p = (const void*)(m) },
-#define ZI_WAIT_RECV(x,m) { .i = { ZGB_INSTR_WAIT_RECV, sizeof(m), (x)} }, { .p = (const void*)(m) },
-#define ZI_WAIT_UNTIL(x,m) { .i = { ZGB_INSTR_WAIT_UNTIL, sizeof(m), (x)} }, { .p = (const void*)(m) },
-#define ZI_WAIT_RECV_FUNC(x,m,f) { .i = { ZGB_INSTR_WAIT_RECV_CALL, sizeof(m), (x)} }, { .p = (const void*)(m) }, { .p = (const void*)(f) },
-
-
-const uint8_t ZIGBEE_LABEL_START = 10;
-const uint8_t ZIGBEE_LABEL_READY = 20;
-const uint8_t ZIGBEE_LABEL_MAIN_LOOP = 21;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_CLOSE = 30;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60 = 31;
-const uint8_t ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX = 32;
-
-const uint8_t ZIGBEE_LABEL_ABORT = 99;
-const uint8_t ZIGBEE_LABEL_UNSUPPORTED_VERSION = 98;
-
-struct ZigbeeStatus {
-  bool active = true;
-  bool state_machine = false;
-  bool state_waiting = false;
-  bool state_no_timeout = false;
-  bool ready = false;
-  uint8_t on_error_goto = ZIGBEE_LABEL_ABORT;
-  uint8_t on_timeout_goto = ZIGBEE_LABEL_ABORT;
-  int16_t pc = 0;
-  uint32_t next_timeout = 0;
-
-  uint8_t *recv_filter = nullptr;
-  bool recv_until = false;
-  size_t recv_filter_len = 0;
-  ZB_RecvMsgFunc recv_func = nullptr;
-  ZB_RecvMsgFunc recv_unexpected = nullptr;
-
-  bool init_phase = true;
-};
-struct ZigbeeStatus zigbee;
-
-SBuffer *zigbee_buffer = nullptr;
-
-
-
-
-
-#define Z_B0(a) (uint8_t)( ((a) ) & 0xFF )
-#define Z_B1(a) (uint8_t)( ((a) >> 8) & 0xFF )
-#define Z_B2(a) (uint8_t)( ((a) >> 16) & 0xFF )
-#define Z_B3(a) (uint8_t)( ((a) >> 24) & 0xFF )
-#define Z_B4(a) (uint8_t)( ((a) >> 32) & 0xFF )
-#define Z_B5(a) (uint8_t)( ((a) >> 40) & 0xFF )
-#define Z_B6(a) (uint8_t)( ((a) >> 48) & 0xFF )
-#define Z_B7(a) (uint8_t)( ((a) >> 56) & 0xFF )
-
-#define ZBM(n,x...) const uint8_t n[] PROGMEM = { x };
-
-#define USE_ZIGBEE_CHANNEL_MASK (1 << (USE_ZIGBEE_CHANNEL))
-
-
-
-ZBM(ZBS_RESET, Z_AREQ | Z_SYS, SYS_RESET, 0x00 )
-ZBM(ZBR_RESET, Z_AREQ | Z_SYS, SYS_RESET_IND )
-
-ZBM(ZBS_VERSION, Z_SREQ | Z_SYS, SYS_VERSION )
-ZBM(ZBR_VERSION, Z_SRSP | Z_SYS, SYS_VERSION )
-
-
-ZBM(ZBS_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_READ, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8, 0x00 )
-ZBM(ZBR_ZNPHC, Z_SRSP | Z_SYS, SYS_OSAL_NV_READ, Z_Success, 0x01 , 0x55)
-
-
-ZBM(ZBS_PAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PANID )
-ZBM(ZBR_PAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PANID, 0x02 ,
-              Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
-
-ZBM(ZBS_EXTPAN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_EXTENDED_PAN_ID )
-ZBM(ZBR_EXTPAN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_EXTENDED_PAN_ID,
-                0x08 ,
-                Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
-                Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID),
-                )
-
-ZBM(ZBS_CHANN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_CHANLIST )
-ZBM(ZBR_CHANN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_CHANLIST,
-               0x04 ,
-               Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
-               )
-
-ZBM(ZBS_PFGK, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEY )
-ZBM(ZBR_PFGK, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEY,
-              0x10 ,
-              Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
-              Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
-              Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
-              Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
-
-                                                               )
-
-ZBM(ZBS_PFGKEN, Z_SREQ | Z_SAPI, SAPI_READ_CONFIGURATION, CONF_PRECFGKEYS_ENABLE )
-ZBM(ZBR_PFGKEN, Z_SRSP | Z_SAPI, SAPI_READ_CONFIGURATION, Z_Success, CONF_PRECFGKEYS_ENABLE,
-                0x01 , 0x00 )
-
-
-
-ZBM(ZBR_W_OK, Z_SRSP | Z_SAPI, SAPI_WRITE_CONFIGURATION, Z_Success )
-ZBM(ZBR_WNV_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_WRITE, Z_Success )
-
-
-ZBM(ZBS_FACTRES, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x02 )
-
-ZBM(ZBS_W_PAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PANID, 0x02 , Z_B0(USE_ZIGBEE_PANID), Z_B1(USE_ZIGBEE_PANID) )
-
-ZBM(ZBS_W_EXTPAN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_EXTENDED_PAN_ID, 0x08 ,
-                  Z_B0(USE_ZIGBEE_EXTPANID), Z_B1(USE_ZIGBEE_EXTPANID), Z_B2(USE_ZIGBEE_EXTPANID), Z_B3(USE_ZIGBEE_EXTPANID),
-                  Z_B4(USE_ZIGBEE_EXTPANID), Z_B5(USE_ZIGBEE_EXTPANID), Z_B6(USE_ZIGBEE_EXTPANID), Z_B7(USE_ZIGBEE_EXTPANID)
-                  )
-
-ZBM(ZBS_W_CHANN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_CHANLIST, 0x04 ,
-                Z_B0(USE_ZIGBEE_CHANNEL_MASK), Z_B1(USE_ZIGBEE_CHANNEL_MASK), Z_B2(USE_ZIGBEE_CHANNEL_MASK), Z_B3(USE_ZIGBEE_CHANNEL_MASK),
-                                           )
-
-ZBM(ZBS_W_LOGTYP, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_LOGICAL_TYPE, 0x01 , 0x00 )
-
-ZBM(ZBS_W_PFGK, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEY,
-                0x10 ,
-                Z_B0(USE_ZIGBEE_PRECFGKEY_L), Z_B1(USE_ZIGBEE_PRECFGKEY_L), Z_B2(USE_ZIGBEE_PRECFGKEY_L), Z_B3(USE_ZIGBEE_PRECFGKEY_L),
-                Z_B4(USE_ZIGBEE_PRECFGKEY_L), Z_B5(USE_ZIGBEE_PRECFGKEY_L), Z_B6(USE_ZIGBEE_PRECFGKEY_L), Z_B7(USE_ZIGBEE_PRECFGKEY_L),
-                Z_B0(USE_ZIGBEE_PRECFGKEY_H), Z_B1(USE_ZIGBEE_PRECFGKEY_H), Z_B2(USE_ZIGBEE_PRECFGKEY_H), Z_B3(USE_ZIGBEE_PRECFGKEY_H),
-                Z_B4(USE_ZIGBEE_PRECFGKEY_H), Z_B5(USE_ZIGBEE_PRECFGKEY_H), Z_B6(USE_ZIGBEE_PRECFGKEY_H), Z_B7(USE_ZIGBEE_PRECFGKEY_H),
-
-                                                                 )
-
-ZBM(ZBS_W_PFGKEN, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_PRECFGKEYS_ENABLE, 0x01 , 0x00 )
-
-ZBM(ZBS_WNV_SECMODE, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(CONF_TCLK_TABLE_START), Z_B1(CONF_TCLK_TABLE_START),
-                      0x00 , 0x20 ,
-                      0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-                      0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c,
-                      0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39,
-                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-
-ZBM(ZBS_W_ZDODCB, Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_ZDO_DIRECT_CB, 0x01 , 0x01 )
-
-ZBM(ZBS_WNV_INITZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_ITEM_INIT, ZNP_HAS_CONFIGURED & 0xFF, ZNP_HAS_CONFIGURED >> 8,
-                       0x01, 0x00 , 0x01 , 0x00 )
-
-
-ZBM(ZBR_WNV_INIT_OK, Z_SRSP | Z_SYS, SYS_OSAL_NV_ITEM_INIT )
-
-
-ZBM(ZBS_WNV_ZNPHC, Z_SREQ | Z_SYS, SYS_OSAL_NV_WRITE, Z_B0(ZNP_HAS_CONFIGURED), Z_B1(ZNP_HAS_CONFIGURED),
-                   0x00 , 0x01 , 0x55 )
-
-ZBM(ZBS_STARTUPFROMAPP, Z_SREQ | Z_ZDO, ZDO_STARTUP_FROM_APP, 100, 0 )
-ZBM(ZBR_STARTUPFROMAPP, Z_SRSP | Z_ZDO, ZDO_STARTUP_FROM_APP )
-ZBM(AREQ_STARTUPFROMAPP, Z_AREQ | Z_ZDO, ZDO_STATE_CHANGE_IND, ZDO_DEV_ZB_COORD )
-
-ZBM(ZBS_GETDEVICEINFO, Z_SREQ | Z_UTIL, Z_UTIL_GET_DEVICE_INFO )
-ZBM(ZBR_GETDEVICEINFO, Z_SRSP | Z_UTIL, Z_UTIL_GET_DEVICE_INFO, Z_Success )
-# 272 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-ZBM(ZBS_ZDO_NODEDESCREQ, Z_SREQ | Z_ZDO, ZDO_NODE_DESC_REQ, 0x00, 0x00 , 0x00, 0x00 )
-ZBM(ZBR_ZDO_NODEDESCREQ, Z_SRSP | Z_ZDO, ZDO_NODE_DESC_REQ, Z_Success )
-
-ZBM(AREQ_ZDO_NODEDESCRSP, Z_AREQ | Z_ZDO, ZDO_NODE_DESC_RSP)
-# 290 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_7_statemachine.ino"
-ZBM(ZBS_ZDO_ACTIVEEPREQ, Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ, 0x00, 0x00, 0x00, 0x00)
-ZBM(ZBR_ZDO_ACTIVEEPREQ, Z_SRSP | Z_ZDO, ZDO_ACTIVE_EP_REQ, Z_Success)
-ZBM(ZBR_ZDO_ACTIVEEPRSP_NONE, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
-    0x00, 0x00 , 0x00 )
-ZBM(ZBR_ZDO_ACTIVEEPRSP_OK, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP, 0x00, 0x00 , Z_Success,
-    0x00, 0x00 , 0x02 , 0x0B, 0x01 )
-
-
-ZBM(ZBS_AF_REGISTER01, Z_SREQ | Z_AF, AF_REGISTER, 0x01 , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
-                        0x05, 0x00 , 0x00 , 0x00 ,
-                        0x00 , 0x00 )
-ZBM(ZBR_AF_REGISTER, Z_SRSP | Z_AF, AF_REGISTER, Z_Success)
-ZBM(ZBS_AF_REGISTER0B, Z_SREQ | Z_AF, AF_REGISTER, 0x0B , Z_B0(Z_PROF_HA), Z_B1(Z_PROF_HA),
-                        0x05, 0x00 , 0x00 , 0x00 ,
-                        0x00 , 0x00 )
-
-ZBM(ZBS_PERMITJOINREQ_CLOSE, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x02 ,
-                              0x00, 0x00 , 0x00 , 0x00 )
-ZBM(ZBS_PERMITJOINREQ_OPEN_60, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
-                              0xFC, 0xFF , 60 , 0x00 )
-ZBM(ZBS_PERMITJOINREQ_OPEN_XX, Z_SREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, 0x0F ,
-                              0xFC, 0xFF , 0xFF , 0x00 )
-ZBM(ZBR_PERMITJOINREQ, Z_SRSP | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_REQ, Z_Success)
-ZBM(ZBR_PERMITJOIN_AREQ_CLOSE, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0x00 )
-ZBM(ZBR_PERMITJOIN_AREQ_OPEN_60, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 60 )
-ZBM(ZBR_PERMITJOIN_AREQ_OPEN_FF, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND, 0xFF )
-ZBM(ZBR_PERMITJOIN_AREQ_RSP, Z_AREQ | Z_ZDO, ZDO_MGMT_PERMIT_JOIN_RSP, 0x00, 0x00 , Z_Success )
-
-static const Zigbee_Instruction zb_prog[] PROGMEM = {
-  ZI_LABEL(0)
-    ZI_NOOP()
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_ON_TIMEOUT_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_ON_RECV_UNEXPECTED(&Z_Recv_Default)
-    ZI_WAIT(10500)
-    ZI_ON_ERROR_GOTO(50)
-
-
-
-    ZI_SEND(ZBS_RESET)
-    ZI_WAIT_RECV_FUNC(5000, ZBR_RESET, &Z_Reboot)
-    ZI_WAIT(100)
-    ZI_LOG(LOG_LEVEL_DEBUG, D_LOG_ZIGBEE "checking device configuration")
-    ZI_SEND(ZBS_ZNPHC)
-    ZI_WAIT_RECV(2000, ZBR_ZNPHC)
-    ZI_SEND(ZBS_VERSION)
-    ZI_WAIT_RECV_FUNC(2000, ZBR_VERSION, &Z_ReceiveCheckVersion)
-    ZI_SEND(ZBS_PAN)
-    ZI_WAIT_RECV(1000, ZBR_PAN)
-    ZI_SEND(ZBS_EXTPAN)
-    ZI_WAIT_RECV(1000, ZBR_EXTPAN)
-    ZI_SEND(ZBS_CHANN)
-    ZI_WAIT_RECV(1000, ZBR_CHANN)
-    ZI_SEND(ZBS_PFGK)
-    ZI_WAIT_RECV(1000, ZBR_PFGK)
-    ZI_SEND(ZBS_PFGKEN)
-    ZI_WAIT_RECV(1000, ZBR_PFGKEN)
-
-
-
-  ZI_LABEL(ZIGBEE_LABEL_START)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_STARTING, "Configured, starting coordinator")
-
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-
-
-ZI_SEND(ZBS_STARTUPFROMAPP)
-    ZI_WAIT_RECV(2000, ZBR_STARTUPFROMAPP)
-    ZI_WAIT_UNTIL(10000, AREQ_STARTUPFROMAPP)
-    ZI_SEND(ZBS_GETDEVICEINFO)
-    ZI_WAIT_RECV_FUNC(2000, ZBR_GETDEVICEINFO, &Z_ReceiveDeviceInfo)
-
-    ZI_SEND(ZBS_ZDO_NODEDESCREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_NODEDESCREQ)
-    ZI_WAIT_UNTIL(5000, AREQ_ZDO_NODEDESCRSP)
-    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_NONE)
-    ZI_SEND(ZBS_AF_REGISTER01)
-    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
-    ZI_SEND(ZBS_AF_REGISTER0B)
-    ZI_WAIT_RECV(1000, ZBR_AF_REGISTER)
-
-
-    ZI_SEND(ZBS_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_RECV(1000, ZBR_ZDO_ACTIVEEPREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_ZDO_ACTIVEEPRSP_OK)
-    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-    ZI_WAIT_UNTIL(1000, ZBR_PERMITJOIN_AREQ_RSP)
-
-
-
-
-
-
-  ZI_LABEL(ZIGBEE_LABEL_READY)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_OK, "Started")
-    ZI_LOG(LOG_LEVEL_INFO, D_LOG_ZIGBEE "Zigbee started")
-    ZI_CALL(&Z_State_Ready, 1)
-    ZI_CALL(&Z_Load_Devices, 0)
-  ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
-    ZI_WAIT_FOREVER()
-    ZI_GOTO(ZIGBEE_LABEL_READY)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_CLOSE)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_60)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX)
-
-    ZI_SEND(ZBS_PERMITJOINREQ_OPEN_XX)
-    ZI_WAIT_RECV(1000, ZBR_PERMITJOINREQ)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_MAIN_LOOP)
-
-  ZI_LABEL(50)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_RESET_CONF, "Reseting configuration")
-
-    ZI_ON_ERROR_GOTO(ZIGBEE_LABEL_ABORT)
-    ZI_SEND(ZBS_FACTRES)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_RESET)
-    ZI_WAIT_RECV(5000, ZBR_RESET)
-    ZI_SEND(ZBS_W_PAN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_EXTPAN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_CHANN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_LOGTYP)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_PFGK)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_W_PFGKEN)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-    ZI_SEND(ZBS_WNV_SECMODE)
-    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
-    ZI_SEND(ZBS_W_ZDODCB)
-    ZI_WAIT_RECV(1000, ZBR_W_OK)
-
-    ZI_SEND(ZBS_WNV_INITZNPHC)
-    ZI_WAIT_RECV_FUNC(1000, ZBR_WNV_INIT_OK, &Z_CheckNVWrite)
-    ZI_SEND(ZBS_WNV_ZNPHC)
-    ZI_WAIT_RECV(1000, ZBR_WNV_OK)
-
-
-    ZI_GOTO(ZIGBEE_LABEL_START)
-
-  ZI_LABEL(ZIGBEE_LABEL_UNSUPPORTED_VERSION)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_UNSUPPORTED_VERSION, "Only ZNP 1.2 is currently supported")
-    ZI_GOTO(ZIGBEE_LABEL_ABORT)
-
-  ZI_LABEL(ZIGBEE_LABEL_ABORT)
-    ZI_MQTT_STATE(ZIGBEE_STATUS_ABORT, "Abort")
-    ZI_LOG(LOG_LEVEL_ERROR, D_LOG_ZIGBEE "Abort")
-    ZI_STOP(ZIGBEE_LABEL_ABORT)
-};
-
-uint8_t ZigbeeGetInstructionSize(uint8_t instr) {
-  if (instr >= ZGB_INSTR_12_BYTES) {
-    return 3;
-  } else if (instr >= ZGB_INSTR_8_BYTES) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-void ZigbeeGotoLabel(uint8_t label) {
-
-  uint16_t goto_pc = 0xFFFF;
-  uint8_t cur_instr = 0;
-  uint8_t cur_d8 = 0;
-  uint8_t cur_instr_len = 1;
-
-  for (uint32_t i = 0; i < sizeof(zb_prog)/sizeof(zb_prog[0]); i += cur_instr_len) {
-    const Zigbee_Instruction *cur_instr_line = &zb_prog[i];
-    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
-    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
-
-
-    if (ZGB_INSTR_LABEL == cur_instr) {
-
-      if (label == cur_d8) {
-
-        zigbee.pc = i;
-        zigbee.state_machine = true;
-        zigbee.state_waiting = false;
-        return;
-      }
-    }
-
-    cur_instr_len = ZigbeeGetInstructionSize(cur_instr);
-  }
-
-
-  AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Goto label not found, label=%d pc=%d"), label, zigbee.pc);
-  if (ZIGBEE_LABEL_ABORT != label) {
-
-    ZigbeeGotoLabel(ZIGBEE_LABEL_ABORT);
-  } else {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Label Abort (%d) not present, aborting Zigbee"), ZIGBEE_LABEL_ABORT);
-    zigbee.state_machine = false;
-    zigbee.active = false;
-  }
-}
-
-void ZigbeeStateMachine_Run(void) {
-  uint8_t cur_instr = 0;
-  uint8_t cur_d8 = 0;
-  uint16_t cur_d16 = 0;
-  const void* cur_ptr1 = nullptr;
-  const void* cur_ptr2 = nullptr;
-  uint32_t now = millis();
-
-  if (zigbee.state_waiting) {
-
-    if ((zigbee.next_timeout) && (now > zigbee.next_timeout)) {
-
-      if (!zigbee.state_no_timeout) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_ZIGBEE "timeout, goto label %d"), zigbee.on_timeout_goto);
-        ZigbeeGotoLabel(zigbee.on_timeout_goto);
-      } else {
-        zigbee.state_waiting = false;
-      }
-    }
-  }
-
-  while ((zigbee.state_machine) && (!zigbee.state_waiting)) {
-
-    zigbee.recv_filter = nullptr;
-    zigbee.recv_func = nullptr;
-    zigbee.recv_until = false;
-    zigbee.state_no_timeout = false;
-
-    if (zigbee.pc > (sizeof(zb_prog)/sizeof(zb_prog[0]))) {
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Invalid pc: %d, aborting"), zigbee.pc);
-      zigbee.pc = -1;
-    }
-    if (zigbee.pc < 0) {
-      zigbee.state_machine = false;
-      return;
-    }
-
-
-
-    const Zigbee_Instruction *cur_instr_line = &zb_prog[zigbee.pc];
-    cur_instr = pgm_read_byte(&cur_instr_line->i.i);
-    cur_d8 = pgm_read_byte(&cur_instr_line->i.d8);
-    cur_d16 = pgm_read_word(&cur_instr_line->i.d16);
-    if (cur_instr >= ZGB_INSTR_8_BYTES) {
-      cur_instr_line++;
-      cur_ptr1 = cur_instr_line->p;
-    }
-    if (cur_instr >= ZGB_INSTR_12_BYTES) {
-      cur_instr_line++;
-      cur_ptr2 = cur_instr_line->p;
-    }
-
-    zigbee.pc += ZigbeeGetInstructionSize(cur_instr);
-
-    switch (cur_instr) {
-      case ZGB_INSTR_NOOP:
-      case ZGB_INSTR_LABEL:
-        break;
-      case ZGB_INSTR_GOTO:
-        ZigbeeGotoLabel(cur_d8);
-        break;
-      case ZGB_INSTR_ON_ERROR_GOTO:
-        zigbee.on_error_goto = cur_d8;
-        break;
-      case ZGB_INSTR_ON_TIMEOUT_GOTO:
-        zigbee.on_timeout_goto = cur_d8;
-        break;
-      case ZGB_INSTR_WAIT:
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        zigbee.state_no_timeout = true;
-        break;
-      case ZGB_INSTR_WAIT_FOREVER:
-        zigbee.next_timeout = 0;
-        zigbee.state_waiting = true;
-
-        break;
-      case ZGB_INSTR_STOP:
-        zigbee.state_machine = false;
-        if (cur_d8) {
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_ZIGBEE "Stopping (%d)"), cur_d8);
-        }
-        break;
-      case ZGB_INSTR_CALL:
-        if (cur_ptr1) {
-          uint32_t res;
-          res = (*((ZB_Func)cur_ptr1))(cur_d8);
-          if (res > 0) {
-            ZigbeeGotoLabel(res);
-            continue;
-          } else if (res == 0) {
-
-          } else if (res == -1) {
-
-          } else {
-            ZigbeeGotoLabel(zigbee.on_error_goto);
-            continue;
-          }
-        }
-        break;
-      case ZGB_INSTR_LOG:
-        AddLog_P(cur_d8, (char*) cur_ptr1);
-        break;
-      case ZGB_INSTR_MQTT_STATE:
-        Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{\"Status\":%d,\"Message\":\"%s\"}}"),
-                          cur_d8, (char*) cur_ptr1);
-       MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-       XdrvRulesProcess();
-        break;
-      case ZGB_INSTR_SEND:
-        ZigbeeZNPSend((uint8_t*) cur_ptr1, cur_d8 );
-        break;
-      case ZGB_INSTR_WAIT_UNTIL:
-        zigbee.recv_until = true;
-      case ZGB_INSTR_WAIT_RECV:
-        zigbee.recv_filter = (uint8_t *) cur_ptr1;
-        zigbee.recv_filter_len = cur_d8;
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        break;
-      case ZGB_ON_RECV_UNEXPECTED:
-        zigbee.recv_unexpected = (ZB_RecvMsgFunc) cur_ptr1;
-        break;
-      case ZGB_INSTR_WAIT_RECV_CALL:
-        zigbee.recv_filter = (uint8_t *) cur_ptr1;
-        zigbee.recv_filter_len = cur_d8;
-        zigbee.recv_func = (ZB_RecvMsgFunc) cur_ptr2;
-        zigbee.next_timeout = now + cur_d16;
-        zigbee.state_waiting = true;
-        break;
-    }
-  }
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-#ifdef USE_ZIGBEE
-
-int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
-
-
-
-
-
-
-
-  Z_IEEEAddress long_adr = buf.get64(3);
-  Z_ShortAddress short_adr = buf.get16(11);
-  uint8_t device_type = buf.get8(13);
-  uint8_t device_state = buf.get8(14);
-  uint8_t device_associated = buf.get8(15);
-
-
-  localIEEEAddr = long_adr;
-
-  char hex[20];
-  Uint64toHex(long_adr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"DeviceType\":%d,\"DeviceState\":%d"
-                  ",\"NumAssocDevices\":%d"),
-                  ZIGBEE_STATUS_CC_INFO, hex, short_adr, device_type, device_state,
-                  device_associated);
-
-  if (device_associated > 0) {
-    uint idx = 16;
-    ResponseAppend_P(PSTR(",\"AssocDevicesList\":["));
-    for (uint32_t i = 0; i < device_associated; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(idx));
-      idx += 2;
-    }
-    ResponseAppend_P(PSTR("]"));
-  }
-
-  ResponseJsonEnd();
-  ResponseJsonEnd();
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  return res;
-}
-
-int32_t Z_CheckNVWrite(int32_t res, class SBuffer &buf) {
-
-
-
-  uint8_t status = buf.get8(2);
-  if ((0x00 == status) || (0x09 == status)) {
-    return 0;
-  } else {
-    return -2;
-  }
-}
-
-const char Z_RebootReason[] PROGMEM = "Power-up|External|Watchdog";
-
-int32_t Z_Reboot(int32_t res, class SBuffer &buf) {
-
-
-
-  uint8_t reason = buf.get8(2);
-  uint8_t transport_rev = buf.get8(3);
-  uint8_t product_id = buf.get8(4);
-  uint8_t major_rel = buf.get8(5);
-  uint8_t minor_rel = buf.get8(6);
-  uint8_t hw_rev = buf.get8(7);
-  char reason_str[12];
-
-  if (reason > 3) { reason = 3; }
-  GetTextIndexed(reason_str, sizeof(reason_str), reason, Z_RebootReason);
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"Message\":\"%s\",\"RestartReason\":\"%s\""
-                  ",\"MajorRel\":%d,\"MinorRel\":%d}}"),
-                  ZIGBEE_STATUS_BOOT, "CC2530 booted", reason_str,
-                  major_rel, minor_rel);
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
-   return 0;
-  } else {
-    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
-  }
-}
-
-int32_t Z_ReceiveCheckVersion(int32_t res, class SBuffer &buf) {
-# 122 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_8_parsers.ino"
-  uint8_t major_rel = buf.get8(4);
-  uint8_t minor_rel = buf.get8(5);
-  uint8_t maint_rel = buf.get8(6);
-  uint32_t revision = buf.get32(7);
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"MajorRel\":%d,\"MinorRel\":%d"
-                  ",\"MaintRel\":%d,\"Revision\":%d}}"),
-                  ZIGBEE_STATUS_CC_VERSION, major_rel, minor_rel,
-                  maint_rel, revision);
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-
-  if ((0x02 == major_rel) && (0x06 == minor_rel)) {
-   return 0;
-  } else {
-    return ZIGBEE_LABEL_UNSUPPORTED_VERSION;
-  }
-}
-
-bool Z_ReceiveMatchPrefix(const class SBuffer &buf, const uint8_t *match) {
-  if ( (pgm_read_byte(&match[0]) == buf.get8(0)) &&
-       (pgm_read_byte(&match[1]) == buf.get8(1)) ) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-int32_t Z_ReceivePermitJoinStatus(int32_t res, const class SBuffer &buf) {
-
-  uint8_t duration = buf.get8(2);
-  uint8_t status_code;
-  const char* message;
-
-  if (0xFF == duration) {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_XX;
-    message = PSTR("Enable Pairing mode until next boot");
-  } else if (duration > 0) {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_OPEN_60;
-    message = PSTR("Enable Pairing mode for %d seconds");
-  } else {
-    status_code = ZIGBEE_STATUS_PERMITJOIN_CLOSE;
-    message = PSTR("Disable Pairing mode");
-  }
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"Message\":\""),
-                  status_code);
-  ResponseAppend_P(message, duration);
-  ResponseAppend_P(PSTR("\"}}"));
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_STATE));
-  XdrvRulesProcess();
-  return -1;
-}
-
-
-void Z_SendIEEEAddrReq(uint16_t shortaddr) {
-  uint8_t IEEEAddrReq[] = { Z_SREQ | Z_ZDO, ZDO_IEEE_ADDR_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), 0x00, 0x00 };
-
-  ZigbeeZNPSend(IEEEAddrReq, sizeof(IEEEAddrReq));
-}
-
-
-void Z_SendActiveEpReq(uint16_t shortaddr) {
-  uint8_t ActiveEpReq[] = { Z_SREQ | Z_ZDO, ZDO_ACTIVE_EP_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr) };
-
-  ZigbeeZNPSend(ActiveEpReq, sizeof(ActiveEpReq));
-
-
-
-
-
-}
-
-
-void Z_SendSimpleDescReq(uint16_t shortaddr, uint8_t endpoint) {
-  uint8_t SimpleDescReq[] = { Z_SREQ | Z_ZDO, ZDO_SIMPLE_DESC_REQ,
-              Z_B0(shortaddr), Z_B1(shortaddr), Z_B0(shortaddr), Z_B1(shortaddr),
-              endpoint };
-
-  ZigbeeZNPSend(SimpleDescReq, sizeof(SimpleDescReq));
-}
-
-const char* Z_DeviceType[] = { "Coordinator", "Router", "End Device", "Unknown" };
-int32_t Z_ReceiveNodeDesc(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t logicalType = buf.get8(7);
-  uint8_t apsFlags = buf.get8(8);
-  uint8_t MACCapabilityFlags = buf.get8(9);
-  uint16_t manufacturerCapabilities = buf.get16(10);
-  uint8_t maxBufferSize = buf.get8(12);
-  uint16_t maxInTransferSize = buf.get16(13);
-  uint16_t serverMask = buf.get16(15);
-  uint16_t maxOutTransferSize = buf.get16(17);
-  uint8_t descriptorCapabilities = buf.get8(19);
-
-  if (0 == status) {
-    zigbee_devices.updateLastSeen(nwkAddr);
-
-    uint8_t deviceType = logicalType & 0x7;
-    if (deviceType > 3) { deviceType = 3; }
-    bool complexDescriptorAvailable = (logicalType & 0x08) ? 1 : 0;
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"NodeType\":\"%s\",\"ComplexDesc\":%s}}"),
-                    ZIGBEE_STATUS_NODE_DESC, Z_DeviceType[deviceType],
-                    complexDescriptorAvailable ? "true" : "false"
-                    );
-
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-  }
-
-  return -1;
-}
-
-int32_t Z_ReceiveActiveEp(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t activeEpCount = buf.get8(7);
-  uint8_t* activeEpList = (uint8_t*) buf.charptr(8);
-
-
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    zigbee_devices.addEndoint(nwkAddr, activeEpList[i]);
-  }
-
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    Z_SendSimpleDescReq(nwkAddr, activeEpList[i]);
-  }
-
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"ActiveEndpoints\":["),
-                  ZIGBEE_STATUS_ACTIVE_EP);
-  for (uint32_t i = 0; i < activeEpCount; i++) {
-    if (i > 0) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(PSTR("\"0x%02X\""), activeEpList[i]);
-  }
-  ResponseAppend_P(PSTR("]}}"));
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-  return -1;
-}
-
-void Z_SendAFInfoRequest(uint16_t shortaddr, uint8_t endpoint, uint16_t clusterid, uint8_t transacid) {
-  SBuffer buf(100);
-  buf.add8(Z_SREQ | Z_AF);
-  buf.add8(AF_DATA_REQUEST);
-  buf.add16(shortaddr);
-  buf.add8(endpoint);
-  buf.add8(0x01);
-  buf.add16(clusterid);
-  buf.add8(transacid);
-  buf.add8(0x30);
-  buf.add8(0x1E);
-
-  buf.add8(3 + 2*sizeof(uint16_t));
-  buf.add8(0x00);
-  buf.add8(transacid);
-  buf.add8(ZCL_READ_ATTRIBUTES);
-  buf.add16(0x0004);
-  buf.add16(0x0005);
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-}
-
-
-int32_t Z_ReceiveSimpleDesc(int32_t res, const class SBuffer &buf) {
-
-  Z_ShortAddress srcAddr = buf.get16(2);
-  uint8_t status = buf.get8(4);
-  Z_ShortAddress nwkAddr = buf.get16(5);
-  uint8_t lenDescriptor = buf.get8(7);
-  uint8_t endpoint = buf.get8(8);
-  uint16_t profileId = buf.get16(9);
-  uint16_t deviceId = buf.get16(11);
-  uint8_t deviceVersion = buf.get8(13);
-  uint8_t numInCluster = buf.get8(14);
-  uint8_t numOutCluster = buf.get8(15 + numInCluster*2);
-
-  if (0 == status) {
-    zigbee_devices.addEndointProfile(nwkAddr, endpoint, profileId);
-    for (uint32_t i = 0; i < numInCluster; i++) {
-      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(15 + i*2), false);
-    }
-    for (uint32_t i = 0; i < numOutCluster; i++) {
-      zigbee_devices.addCluster(nwkAddr, endpoint, buf.get16(16 + numInCluster*2 + i*2), true);
-    }
-
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"Endpoint\":\"0x%02X\""
-                    ",\"ProfileId\":\"0x%04X\",\"DeviceId\":\"0x%04X\",\"DeviceVersion\":%d"
-                    "\"InClusters\":["),
-                    ZIGBEE_STATUS_SIMPLE_DESC, endpoint,
-                    profileId, deviceId, deviceVersion);
-    for (uint32_t i = 0; i < numInCluster; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(15 + i*2));
-    }
-    ResponseAppend_P(PSTR("],\"OutClusters\":["));
-    for (uint32_t i = 0; i < numOutCluster; i++) {
-      if (i > 0) { ResponseAppend_P(PSTR(",")); }
-      ResponseAppend_P(PSTR("\"0x%04X\""), buf.get16(16 + numInCluster*2 + i*2));
-    }
-    ResponseAppend_P(PSTR("]}}"));
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-
-    uint8_t cluster = zigbee_devices.findClusterEndpointIn(nwkAddr, 0x0000);
-    if (cluster) {
-      Z_SendAFInfoRequest(nwkAddr, cluster, 0x0000, 0x01);
-    }
-  }
-  return -1;
-}
-
-int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
-  uint8_t status = buf.get8(2);
-  Z_IEEEAddress ieeeAddr = buf.get64(3);
-  Z_ShortAddress nwkAddr = buf.get16(11);
-
-
-
-  if (0 == status) {
-    zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
-    char hex[20];
-    Uint64toHex(ieeeAddr, hex, 64);
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                    "}}"),
-                    ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
-                    );
-
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-
-    const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
-    if (friendlyName) {
-      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
-                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, friendlyName->c_str());
-    } else {
-      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\"}}"), nwkAddr);
-    }
-
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
-  }
-  return -1;
-}
-
-int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
-  Z_ShortAddress srcAddr = buf.get16(2);
-  Z_ShortAddress nwkAddr = buf.get16(4);
-  Z_IEEEAddress ieeeAddr = buf.get64(6);
-  uint8_t capabilities = buf.get8(14);
-
-  zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
-
-  char hex[20];
-  Uint64toHex(ieeeAddr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"PowerSource\":%s,\"ReceiveWhenIdle\":%s,\"Security\":%s}}"),
-                  ZIGBEE_STATUS_DEVICE_ANNOUNCE, hex, nwkAddr,
-                  (capabilities & 0x04) ? "true" : "false",
-                  (capabilities & 0x08) ? "true" : "false",
-                  (capabilities & 0x40) ? "true" : "false"
-                  );
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-  Z_SendActiveEpReq(nwkAddr);
-  return -1;
-}
-
-
-int32_t Z_ReceiveTCDevInd(int32_t res, const class SBuffer &buf) {
-  Z_ShortAddress srcAddr = buf.get16(2);
-  Z_IEEEAddress ieeeAddr = buf.get64(4);
-  Z_ShortAddress parentNw = buf.get16(12);
-
-  zigbee_devices.updateDevice(srcAddr, ieeeAddr);
-
-  char hex[20];
-  Uint64toHex(ieeeAddr, hex, 64);
-  Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                  ",\"ParentNetwork\":\"0x%04X\"}}"),
-                  ZIGBEE_STATUS_DEVICE_INDICATION, hex, srcAddr, parentNw
-                  );
-
-  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-  XdrvRulesProcess();
-
-  return -1;
-}
-
-
-
-const uint32_t OCCUPANCY_TIMEOUT = 90 * 1000;
-
-void Z_AqaraOccupancy(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, const JsonObject *json) {
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(*json, PSTR(OCCUPANCY));
-  if (nullptr != &val_endpoint) {
-    uint32_t occupancy = strToUInt(val_endpoint);
-
-    if (occupancy) {
-      zigbee_devices.setTimer(shortaddr, OCCUPANCY_TIMEOUT, cluster, endpoint, 0, &Z_OccupancyCallback);
-    }
-  }
-}
-
-
-
-int32_t Z_PublishAttributes(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
-  const JsonObject *json = zigbee_devices.jsonGet(shortaddr);
-  if (json == nullptr) { return 0; }
-
-  Z_AqaraOccupancy(shortaddr, cluster, endpoint, json);
-
-  zigbee_devices.jsonPublishFlush(shortaddr);
-  return 1;
-}
-
-int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
-  uint16_t groupid = buf.get16(2);
-  uint16_t clusterid = buf.get16(4);
-  Z_ShortAddress srcaddr = buf.get16(6);
-  uint8_t srcendpoint = buf.get8(8);
-  uint8_t dstendpoint = buf.get8(9);
-  uint8_t wasbroadcast = buf.get8(10);
-  uint8_t linkquality = buf.get8(11);
-  uint8_t securityuse = buf.get8(12);
-  uint32_t timestamp = buf.get32(13);
-  uint8_t seqnumber = buf.get8(17);
-
-  bool defer_attributes = false;
-
-  zigbee_devices.updateLastSeen(srcaddr);
-  ZCLFrame zcl_received = ZCLFrame::parseRawFrame(buf, 19, buf.get8(18), clusterid, groupid,
-                              srcaddr,
-                              srcendpoint, dstendpoint, wasbroadcast,
-                              linkquality, securityuse, seqnumber,
-                              timestamp);
-  zcl_received.log();
-  char shortaddr[8];
-  snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%04X"), srcaddr);
-
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-
-  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
-    zcl_received.parseRawAttributes(json);
-    if (clusterid) { defer_attributes = true; }
-  } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
-    zcl_received.parseReadAttributes(json);
-  } else if (zcl_received.isClusterSpecificCommand()) {
-    zcl_received.parseClusterSpecificCommand(json);
-  }
-  String msg("");
-  msg.reserve(100);
-  json.printTo(msg);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
-
-  zcl_received.postProcessAttributes(srcaddr, json);
-
-  json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
-
-  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
-
-  if (defer_attributes) {
-
-    if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
-
-      zigbee_devices.jsonPublishFlush(srcaddr);
-    } else {
-      zigbee_devices.jsonAppend(srcaddr, json);
-      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
-    }
-  } else {
-
-    zigbee_devices.jsonPublishNow(srcaddr, json);
-  }
-  return -1;
-}
-
-typedef struct Z_Dispatcher {
-  const uint8_t* match;
-  ZB_RecvMsgFunc func;
-} Z_Dispatcher;
-
-
-ZBM(AREQ_AF_INCOMING_MESSAGE, Z_AREQ | Z_AF, AF_INCOMING_MSG)
-ZBM(AREQ_END_DEVICE_ANNCE_IND, Z_AREQ | Z_ZDO, ZDO_END_DEVICE_ANNCE_IND)
-ZBM(AREQ_END_DEVICE_TC_DEV_IND, Z_AREQ | Z_ZDO, ZDO_TC_DEV_IND)
-ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )
-ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)
-ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)
-ZBM(AREQ_ZDO_IEEE_ADDR_RSP, Z_AREQ | Z_ZDO, ZDO_IEEE_ADDR_RSP)
-
-const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
-  { AREQ_AF_INCOMING_MESSAGE, &Z_ReceiveAfIncomingMessage },
-  { AREQ_END_DEVICE_ANNCE_IND, &Z_ReceiveEndDeviceAnnonce },
-  { AREQ_END_DEVICE_TC_DEV_IND, &Z_ReceiveTCDevInd },
-  { AREQ_PERMITJOIN_OPEN_XX, &Z_ReceivePermitJoinStatus },
-  { AREQ_ZDO_NODEDESCRSP, &Z_ReceiveNodeDesc },
-  { AREQ_ZDO_ACTIVEEPRSP, &Z_ReceiveActiveEp },
-  { AREQ_ZDO_SIMPLEDESCRSP, &Z_ReceiveSimpleDesc },
-  { AREQ_ZDO_IEEE_ADDR_RSP, &Z_ReceiveIEEEAddr },
-};
-
-int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
-
-  if (zigbee.init_phase) {
-
-   return -1;
-  } else {
-    for (uint32_t i = 0; i < sizeof(Z_DispatchTable)/sizeof(Z_Dispatcher); i++) {
-      if (Z_ReceiveMatchPrefix(buf, Z_DispatchTable[i].match)) {
-        (*Z_DispatchTable[i].func)(res, buf);
-      }
-    }
-    return -1;
-  }
-}
-
-int32_t Z_Load_Devices(uint8_t value) {
-
-  loadZigbeeDevices();
-  return 0;
-}
-
-int32_t Z_State_Ready(uint8_t value) {
-  zigbee.init_phase = false;
-  return 0;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-#ifdef USE_ZIGBEE
-
-#define XDRV_23 23
-
-const uint32_t ZIGBEE_BUFFER_SIZE = 256;
-const uint8_t ZIGBEE_SOF = 0xFE;
-const uint8_t ZIGBEE_SOF_ALT = 0xFF;
-
-#include <TasmotaSerial.h>
-TasmotaSerial *ZigbeeSerial = nullptr;
-
-
-const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"
-  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
-  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
-  D_CMND_ZIGBEE_PING ;
-
-const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"
-  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
-  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
-  D_CMND_ZIGBEE_PING ;
-
-void (* const ZigbeeCommand[])(void) PROGMEM = {
-  &CmndZbZNPSend, &CmndZbPermitJoin,
-  &CmndZbStatus, &CmndZbReset, &CmndZbSend,
-  &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
-  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind,
-  &CmndZbPing,
-  };
-
-int32_t ZigbeeProcessInput(class SBuffer &buf) {
-  if (!zigbee.state_machine) { return -1; }
-
-
-  bool recv_filter_match = true;
-  bool recv_prefix_match = false;
-  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
-    if (zigbee.recv_filter_len >= 2) {
-      recv_prefix_match = false;
-      if ( (pgm_read_byte(&zigbee.recv_filter[0]) == buf.get8(0)) &&
-           (pgm_read_byte(&zigbee.recv_filter[1]) == buf.get8(1)) ) {
-        recv_prefix_match = true;
-      }
-    }
-
-    for (uint32_t i = 0; i < zigbee.recv_filter_len; i++) {
-      if (pgm_read_byte(&zigbee.recv_filter[i]) != buf.get8(i)) {
-        recv_filter_match = false;
-        break;
-      }
-    }
-
-
-  }
-
-
-  int32_t res = -1;
-
-
-
-
-
-  if ((zigbee.recv_filter) && (zigbee.recv_filter_len > 0)) {
-    if (!recv_prefix_match) {
-      res = -1;
-    } else {
-      if (recv_filter_match) {
-        res = 0;
-      } else {
-        if (zigbee.recv_until) {
-          res = -1;
-        } else {
-          res = -2;
-        }
-      }
-    }
-  } else {
-    res = -1;
-  }
-
-  if (recv_prefix_match) {
-    if (zigbee.recv_func) {
-      res = (*zigbee.recv_func)(res, buf);
-    }
-  }
-  if (-1 == res) {
-
-    if (zigbee.recv_unexpected) {
-      res = (*zigbee.recv_unexpected)(res, buf);
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "ZbProcessInput: res = %d"), res);
-
-
-  if (0 == res) {
-
-    zigbee.state_waiting = false;
-  } else if (res > 0) {
-    ZigbeeGotoLabel(res);
-  } else if (-1 == res) {
-
-
-  } else {
-
-    ZigbeeGotoLabel(zigbee.on_error_goto);
-  }
-}
-
-void ZigbeeInput(void)
-{
- static uint32_t zigbee_polling_window = 0;
- static uint8_t fcs = ZIGBEE_SOF;
- static uint32_t zigbee_frame_len = 5;
-# 145 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-  while (ZigbeeSerial->available()) {
-    yield();
-    uint8_t zigbee_in_byte = ZigbeeSerial->read();
-
-
-  if (0 == zigbee_buffer->len()) {
-   zigbee_frame_len = 5;
-   fcs = ZIGBEE_SOF;
-
-
-
-      if (ZIGBEE_SOF_ALT == zigbee_in_byte) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput forgiven first byte %02X (only for statistics)"), zigbee_in_byte);
-        zigbee_in_byte = ZIGBEE_SOF;
-      }
-  }
-
-    if ((0 == zigbee_buffer->len()) && (ZIGBEE_SOF != zigbee_in_byte)) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbInput discarding byte %02X"), zigbee_in_byte);
-      continue;
-    }
-
-    if (zigbee_buffer->len() < zigbee_frame_len) {
-   zigbee_buffer->add8(zigbee_in_byte);
-      zigbee_polling_window = millis();
-   fcs ^= zigbee_in_byte;
-    }
-
-  if (zigbee_buffer->len() >= zigbee_frame_len) {
-      zigbee_polling_window = 0;
-      break;
-    }
-
-
-    if (02 == zigbee_buffer->len()) {
-
-      uint8_t len_byte = zigbee_buffer->get8(1);
-      if (len_byte > 250) len_byte = 250;
-
-      zigbee_frame_len = len_byte + 5;
-    }
-  }
-
-  if (zigbee_buffer->len() && (millis() > (zigbee_polling_window + ZIGBEE_POLLING))) {
-    char hex_char[(zigbee_buffer->len() * 2) + 2];
-  ToHex_P((unsigned char*)zigbee_buffer->getBuffer(), zigbee_buffer->len(), hex_char, sizeof(hex_char));
-
-    AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "Bytes follow_read_metric = %0d"), ZigbeeSerial->getLoopReadMetric());
-
-  if (zigbee_buffer->len() != zigbee_frame_len) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received frame of wrong size %s, len %d, expected %d"), hex_char, zigbee_buffer->len(), zigbee_frame_len);
-  } else if (0x00 != fcs) {
-
-      AddLog_P2(LOG_LEVEL_INFO, PSTR(D_JSON_ZIGBEEZNPRECEIVED ": received bad FCS frame %s, %d"), hex_char, fcs);
-  } else {
-
-
-
-   SBuffer znp_buffer = zigbee_buffer->subBuffer(2, zigbee_frame_len - 3);
-
-   ToHex_P((unsigned char*)znp_buffer.getBuffer(), znp_buffer.len(), hex_char, sizeof(hex_char));
-      Response_P(PSTR("{\"" D_JSON_ZIGBEEZNPRECEIVED "\":\"%s\"}"), hex_char);
-      if (Settings.flag3.tuya_serial_mqtt_publish) {
-        MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-        XdrvRulesProcess();
-      } else {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE "%s"), mqtt_data);
-      }
-
-      ZigbeeProcessInput(znp_buffer);
-  }
-  zigbee_buffer->setLen(0);
-  }
-}
-
-
-
-void ZigbeeInit(void)
-{
-  zigbee.active = false;
-  if ((pin[GPIO_ZIGBEE_RX] < 99) && (pin[GPIO_ZIGBEE_TX] < 99)) {
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX]);
-
-    ZigbeeSerial = new TasmotaSerial(pin[GPIO_ZIGBEE_RX], pin[GPIO_ZIGBEE_TX], seriallog_level ? 1 : 2, 0, 256);
-    ZigbeeSerial->begin(115200);
-    if (ZigbeeSerial->hardwareSerial()) {
-      ClaimSerial();
-      uint32_t aligned_buffer = ((uint32_t)serial_in_buffer + 3) & ~3;
-   zigbee_buffer = new PreAllocatedSBuffer(sizeof(serial_in_buffer) - 3, (char*) aligned_buffer);
-  } else {
-   zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
-  }
-    zigbee.active = true;
-  zigbee.init_phase = true;
-    zigbee.state_machine = true;
-    ZigbeeSerial->flush();
-  }
-}
-
-
-
-
-
-uint32_t strToUInt(const JsonVariant &val) {
-
-  if (val.is<unsigned int>()) {
-    return val.as<unsigned int>();
-  } else {
-    if (val.is<const char*>()) {
-      String sval = val.as<String>();
-      return strtoull(sval.c_str(), nullptr, 0);
-    }
-  }
-  return 0;
-}
-
-const unsigned char ZIGBEE_FACTORY_RESET[] PROGMEM =
-  { Z_SREQ | Z_SAPI, SAPI_WRITE_CONFIGURATION, CONF_STARTUP_OPTION, 0x01 , 0x01 };
-
-
-void CmndZbReset(void) {
-  if (ZigbeeSerial) {
-    switch (XdrvMailbox.payload) {
-    case 1:
-      ZigbeeZNPSend(ZIGBEE_FACTORY_RESET, sizeof(ZIGBEE_FACTORY_RESET));
-      eraseZigbeeDevices();
-      restart_flag = 2;
-      ResponseCmndChar(D_JSON_ZIGBEE_CC2530 " " D_JSON_RESET_AND_RESTARTING);
-      break;
-    default:
-      ResponseCmndChar(D_JSON_ONE_TO_RESET);
-    }
-  }
-}
-
-void CmndZbZNPSendOrReceive(bool send)
-{
-  if (ZigbeeSerial && (XdrvMailbox.data_len > 0)) {
-    uint8_t code;
-
-    char *codes = RemoveSpace(XdrvMailbox.data);
-    int32_t size = strlen(XdrvMailbox.data);
-
-  SBuffer buf((size+1)/2);
-
-    while (size > 1) {
-      char stemp[3];
-      strlcpy(stemp, codes, sizeof(stemp));
-      code = strtol(stemp, nullptr, 16);
-   buf.add8(code);
-      size -= 2;
-      codes += 2;
-    }
-    if (send) {
-      ZigbeeZNPSend(buf.getBuffer(), buf.len());
-    } else {
-      ZigbeeProcessInput(buf);
-    }
-  }
-  ResponseCmndDone();
-}
-
-
-void CmndZbZNPReceive(void)
-{
-  CmndZbZNPSendOrReceive(false);
-}
-
-void CmndZbZNPSend(void)
-{
-  CmndZbZNPSendOrReceive(true);
-}
-
-void ZigbeeZNPSend(const uint8_t *msg, size_t len) {
- if ((len < 2) || (len > 252)) {
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_JSON_ZIGBEEZNPSENT ": bad message len %d"), len);
-  return;
- }
- uint8_t data_len = len - 2;
-
-  if (ZigbeeSerial) {
-  uint8_t fcs = data_len;
-
-  ZigbeeSerial->write(ZIGBEE_SOF);
-
-  ZigbeeSerial->write(data_len);
-
-  for (uint32_t i = 0; i < len; i++) {
-   uint8_t b = pgm_read_byte(msg + i);
-   ZigbeeSerial->write(b);
-   fcs ^= b;
-
-  }
-  ZigbeeSerial->write(fcs);
-
-  }
-
- char hex_char[(len * 2) + 2];
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZNPSENT " %s"),
-                                 ToHex_P(msg, len, hex_char, sizeof(hex_char)));
-}
-
-void ZigbeeZCLSend(uint16_t dtsAddr, uint16_t clusterId, uint8_t endpoint, uint8_t cmdId, bool clusterSpecific, const uint8_t *msg, size_t len, bool needResponse, uint8_t transacId) {
-  SBuffer buf(25+len);
-  buf.add8(Z_SREQ | Z_AF);
-  buf.add8(AF_DATA_REQUEST);
-  buf.add16(dtsAddr);
-  buf.add8(endpoint);
-  buf.add8(0x01);
-  buf.add16(clusterId);
-  buf.add8(transacId);
-  buf.add8(0x30);
-  buf.add8(0x1E);
-
-  buf.add8(3 + len);
-  buf.add8((needResponse ? 0x00 : 0x10) | (clusterSpecific ? 0x01 : 0x00));
-  buf.add8(transacId);
-  buf.add8(cmdId);
-  if (len > 0) {
-    buf.addBuffer(msg, len);
-  }
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-}
-
-void zigbeeZCLSendStr(uint16_t dstAddr, uint8_t endpoint, bool clusterSpecific,
-                       uint16_t cluster, uint8_t cmd, const char *param) {
-  size_t size = param ? strlen(param) : 0;
-  SBuffer buf((size+2)/2);
-
-  if (param) {
-    while (*param) {
-      uint8_t code = parseHex_P(&param, 2);
-      buf.add8(code);
-    }
-  }
-
-  if (0 == endpoint) {
-
-    endpoint = zigbee_devices.findClusterEndpointIn(dstAddr, cluster);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: dstAddr 0x%04X, cluster 0x%04X, endpoint 0x%02X, cmd 0x%02X, data %s"),
-    dstAddr, cluster, endpoint, cmd, param);
-
-  if (0 == endpoint) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("ZbSend: unspecified endpoint"));
-    return;
-  }
-
-
-  ZigbeeZCLSend(dstAddr, cluster, endpoint, cmd, clusterSpecific, buf.getBuffer(), buf.len(), false, zigbee_devices.getNextSeqNumber(dstAddr));
-
-  if (clusterSpecific) {
-    zigbeeSetCommandTimer(dstAddr, cluster, endpoint);
-  }
-  ResponseCmndDone();
-}
-
-void CmndZbSend(void) {
-# 419 "S:/Development/Tasmota/tasmota/xdrv_23_zigbee_9_impl.ino"
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-  static char delim[] = ", ";
-  uint16_t device = 0xFFFF;
-  uint8_t endpoint = 0x00;
-
-  uint16_t cluster = 0;
-  uint8_t cmd = 0;
-  String cmd_str = "";
-
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-  const JsonVariant &val_cmd = getCaseInsensitive(json, PSTR("Send"));
-  if (nullptr != &val_cmd) {
-
-
-
-    if (val_cmd.is<JsonObject>()) {
-
-      JsonObject &cmd_obj = val_cmd.as<JsonObject&>();
-      int32_t cmd_size = cmd_obj.size();
-      if (cmd_size > 1) {
-        Response_P(PSTR("Only 1 command allowed (%d)"), cmd_size);
-        return;
-      } else if (1 == cmd_size) {
-
-        JsonObject::iterator it = cmd_obj.begin();
-        String key = it->key;
-        JsonVariant& value = it->value;
-        uint32_t x = 0, y = 0, z = 0;
-        uint16_t cmd_var;
-
-        const __FlashStringHelper* tasmota_cmd = zigbeeFindCommand(key.c_str(), &cluster, &cmd_var);
-        if (tasmota_cmd) {
-          cmd_str = tasmota_cmd;
-        } else {
-          Response_P(PSTR("Unrecognized zigbee command: %s"), key.c_str());
-          return;
-        }
-
-
-        if (value.is<bool>()) {
-          x = value.as<bool>() ? 1 : 0;
-        } else if (value.is<unsigned int>()) {
-          x = value.as<unsigned int>();
-        } else {
-
-          const char *s_const = value.as<const char*>();
-          if (s_const != nullptr) {
-            char s[strlen(s_const)+1];
-            strcpy(s, s_const);
-            if ((nullptr != s) && (0x00 != *s)) {
-              char *sval = strtok(s, delim);
-              if (sval) {
-                x = ZigbeeAliasOrNumber(sval);
-                sval = strtok(nullptr, delim);
-                if (sval) {
-                  y = ZigbeeAliasOrNumber(sval);
-                  sval = strtok(nullptr, delim);
-                  if (sval) {
-                    z = ZigbeeAliasOrNumber(sval);
-                  }
-                }
-              }
-            }
-          }
-        }
-
-
-        if (0xFF == cmd_var) {
-          cmd = x;
-          x = y;
-          y = z;
-        } else {
-          cmd = cmd_var;
-        }
-        cmd_str = zigbeeCmdAddParams(cmd_str.c_str(), x, y, z);
-
-      } else {
-
-      }
-    } else if (val_cmd.is<char*>()) {
-
-      cmd_str = val_cmd.as<String>();
-    } else {
-
-    }
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbCmd_actual: ZigbeeZCLSend {\"device\":\"0x%04X\",\"endpoint\":%d,\"send\":\"%04X!%02X/%s\"}"),
-              device, endpoint, cluster, cmd, cmd_str.c_str());
-    zigbeeZCLSendStr(device, endpoint, true, cluster, cmd, cmd_str.c_str());
-  } else {
-    Response_P(PSTR("Missing zigbee 'Send'"));
-    return;
-  }
-
-}
-
-ZBM(ZBS_BIND_REQ, Z_SREQ | Z_ZDO, ZDO_BIND_REQ,
-      0,0,
-      0,0,0,0,0,0,0,0,
-      0x00,
-      0x00, 0x00,
-      0x03,
-      0,0,0,0,0,0,0,0,
-      0x01
-)
-
-void CmndZbBind(void) {
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-
-  uint16_t device = 0xFFFF;
-  uint8_t endpoint = 0x00;
-  uint16_t cluster = 0;
-  uint32_t group = 0xFFFFFFFF;
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
-  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
-
-
-
-  SBuffer buf(sizeof(ZBS_BIND_REQ));
-  buf.add8(Z_SREQ | Z_ZDO);
-  buf.add8(ZDO_BIND_REQ);
-  buf.add16(device);
-  buf.add64(zigbee_devices.getDeviceLongAddr(device));
-  buf.add8(endpoint);
-  buf.add16(cluster);
-  buf.add8(0x03);
-  buf.add64(localIEEEAddr);
-  buf.add8(0x01);
-
-  ZigbeeZNPSend(buf.getBuffer(), buf.len());
-
-  ResponseCmndDone();
-}
-
-
-void CmndZbProbe(void) {
-  CmndZbProbeOrPing(true);
-}
-
-void CmndZbProbeOrPing(boolean probe) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-
-  Z_SendIEEEAddrReq(shortaddr);
-  if (probe) {
-    Z_SendActiveEpReq(shortaddr);
-  }
-  ResponseCmndDone();
-}
-
-
-void CmndZbPing(void) {
-  CmndZbProbeOrPing(false);
-}
-
-
-void CmndZbName(void) {
-
-
-
-
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-
-
-  char *p;
-  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
-
-
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-  if (p == nullptr) {
-    const String * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
-    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, friendlyName ? friendlyName->c_str() : "");
-  } else {
-    zigbee_devices.setFriendlyName(shortaddr, p);
-    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), shortaddr, p);
-  }
-}
-
-
-void CmndZbForget(void) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-
-
-  if (zigbee_devices.removeDevice(shortaddr)) {
-    ResponseCmndDone();
-  } else {
-    ResponseCmndChar("Unknown device");
-  }
-}
-
-
-void CmndZbSave(void) {
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-
-  saveZigbeeDevices();
-
-  ResponseCmndDone();
-}
-
-
-void CmndZbRead(void) {
-
-
-
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  DynamicJsonBuffer jsonBuf;
-  JsonObject &json = jsonBuf.parseObject(XdrvMailbox.data);
-  if (!json.success()) { ResponseCmndChar(D_JSON_INVALID_JSON); return; }
-
-
-  uint16_t device = 0xFFFF;
-  uint16_t cluster = 0x0000;
-  uint8_t endpoint = 0x00;
-  size_t attrs_len = 0;
-  uint8_t* attrs = nullptr;
-
-  const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
-  if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
-  }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
-  const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
-  if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
-  const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
-  if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
-
-  const JsonVariant &val_attr = getCaseInsensitive(json, PSTR("Read"));
-  if (nullptr != &val_attr) {
-    uint16_t val = strToUInt(val_attr);
-    if (val_attr.is<JsonArray>()) {
-      JsonArray& attr_arr = val_attr;
-      attrs_len = attr_arr.size() * 2;
-      attrs = new uint8_t[attrs_len];
-
-      uint32_t i = 0;
-      for (auto value : attr_arr) {
-        uint16_t val = strToUInt(value);
-        attrs[i++] = val & 0xFF;
-        attrs[i++] = val >> 8;
-      }
-    } else {
-      attrs_len = 2;
-      attrs = new uint8_t[attrs_len];
-      attrs[0] = val & 0xFF;
-      attrs[1] = val >> 8;
-    }
-  }
-
-  if (0 == endpoint) {
-    endpoint = zigbee_devices.findClusterEndpointIn(device, cluster);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ZbSend: guessing endpoint 0x%02X"), endpoint);
-  }
-
-  if ((0 != endpoint) && (attrs_len > 0)) {
-    ZigbeeZCLSend(device, cluster, endpoint, ZCL_READ_ATTRIBUTES, false, attrs, attrs_len, true , zigbee_devices.getNextSeqNumber(device));
-    ResponseCmndDone();
-  } else {
-    ResponseCmndChar("Missing parameters");
-  }
-
-  if (attrs) { delete[] attrs; }
-}
-
-
-void CmndZbPermitJoin(void)
-{
-  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-  uint32_t payload = XdrvMailbox.payload;
-  if (payload < 0) { payload = 0; }
-  if ((99 != payload) && (payload > 1)) { payload = 1; }
-
-  if (1 == payload) {
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_60);
-  } else if (99 == payload){
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_OPEN_XX);
-  } else {
-    ZigbeeGotoLabel(ZIGBEE_LABEL_PERMIT_JOIN_CLOSE);
-  }
-  ResponseCmndDone();
-}
-
-void CmndZbStatus(void) {
-  if (ZigbeeSerial) {
-    if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
-    uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data);
-    if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
-    if (XdrvMailbox.payload > 0) {
-      if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
-    }
-
-    String dump = zigbee_devices.dump(XdrvMailbox.index, shortaddr);
-    Response_P(PSTR("{\"%s%d\":%s}"), XdrvMailbox.command, XdrvMailbox.index, dump.c_str());
-  }
-}
-
-
-
-
-
-bool Xdrv23(uint8_t function)
-{
-  bool result = false;
-
-  if (zigbee.active) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (!zigbee.init_phase) {
-          zigbee_devices.runTimer();
-        }
-        break;
-      case FUNC_LOOP:
-        if (ZigbeeSerial) { ZigbeeInput(); }
-    if (zigbee.state_machine) {
-
-          ZigbeeStateMachine_Run();
-    }
-        break;
-      case FUNC_PRE_INIT:
-        ZigbeeInit();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kZbCommands, ZigbeeCommand);
-        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
-#ifdef USE_BUZZER
-
-
-
-
-#define XDRV_24 24
-
-struct BUZZER {
-  uint32_t tune = 0;
-  uint32_t tune_reload = 0;
-  bool active = true;
-  bool enable = false;
-  uint8_t inverted = 0;
-  uint8_t count = 0;
-  uint8_t mode = 0;
-  uint8_t set[2];
-  uint8_t duration;
-  uint8_t state = 0;
-} Buzzer;
-
-
-
-void BuzzerOff(void)
-{
-  DigitalWrite(GPIO_BUZZER, Buzzer.inverted);
-}
-
-
-void BuzzerBeep(uint32_t count, uint32_t on, uint32_t off, uint32_t tune, uint32_t mode)
-{
-  Buzzer.set[0] = off;
-  Buzzer.set[1] = on;
-  Buzzer.duration = 1;
-  Buzzer.tune_reload = 0;
-  Buzzer.mode = mode;
-
-  if (tune) {
-    uint32_t tune1 = tune;
-    uint32_t tune2 = tune;
-    for (uint32_t i = 0; i < 32; i++) {
-      if (!(tune2 & 0x80000000)) {
-        tune2 <<= 1;
-      } else {
-        Buzzer.tune_reload <<= 1;
-        Buzzer.tune_reload |= tune1 & 1;
-        tune1 >>= 1;
-      }
-    }
-    Buzzer.tune = Buzzer.tune_reload;
-  }
-  Buzzer.count = count * 2;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("BUZ: %d(%d),%d,%d,0x%08X(0x%08X)"), count, Buzzer.count, on, off, tune, Buzzer.tune);
-
-  Buzzer.enable = (Buzzer.count > 0);
-  if (!Buzzer.enable) {
-    BuzzerOff();
-  }
-}
-
-void BuzzerSetStateToLed(uint32_t state)
-{
-  if (Buzzer.enable && (2 == Buzzer.mode)) {
-    Buzzer.state = (state != 0);
-    DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
-  }
-}
-
-void BuzzerBeep(uint32_t count)
-{
-  BuzzerBeep(count, 1, 1, 0, 0);
-}
-
-void BuzzerEnabledBeep(uint32_t count, uint32_t duration)
-{
-  if (Settings.flag3.buzzer_enable) {
-    BuzzerBeep(count, duration, 1, 0, 0);
-  }
-}
-
-
-
-bool BuzzerPinState(void)
-{
-  if (XdrvMailbox.index == GPIO_BUZZER_INV) {
-    Buzzer.inverted = 1;
-    XdrvMailbox.index -= (GPIO_BUZZER_INV - GPIO_BUZZER);
-    return true;
-  }
-  return false;
-}
-
-void BuzzerInit(void)
-{
-  if (pin[GPIO_BUZZER] < 99) {
-    pinMode(pin[GPIO_BUZZER], OUTPUT);
-    BuzzerOff();
-  } else {
-    Buzzer.active = false;
-  }
-}
-
-void BuzzerEvery100mSec(void)
-{
-  if (Buzzer.enable && (Buzzer.mode != 2)) {
-    if (Buzzer.count) {
-      if (Buzzer.duration) {
-        Buzzer.duration--;
-        if (!Buzzer.duration) {
-          if (Buzzer.tune) {
-            Buzzer.state = Buzzer.tune & 1;
-            Buzzer.tune >>= 1;
-          } else {
-            Buzzer.tune = Buzzer.tune_reload;
-            Buzzer.count -= (Buzzer.tune_reload) ? 2 : 1;
-            Buzzer.state = Buzzer.count & 1;
-            if (Buzzer.mode) {
-              Buzzer.count |= 2;
-            }
-          }
-          Buzzer.duration = Buzzer.set[Buzzer.state];
-        }
-      }
-      DigitalWrite(GPIO_BUZZER, (Buzzer.inverted) ? !Buzzer.state : Buzzer.state);
-    } else {
-      Buzzer.enable = false;
-    }
-  }
-}
-
-
-
-
-
-const char kBuzzerCommands[] PROGMEM = "|"
-  "Buzzer" ;
-
-void (* const BuzzerCommand[])(void) PROGMEM = {
-  &CmndBuzzer };
-
-void CmndBuzzer(void)
-{
-# 174 "S:/Development/Tasmota/tasmota/xdrv_24_buzzer.ino"
-  if (XdrvMailbox.data_len > 0) {
-    if (XdrvMailbox.payload != 0) {
-      uint32_t parm[4] = { 0 };
-      uint32_t mode = 0;
-      ParseParameters(4, parm);
-      if (XdrvMailbox.payload <= 0) {
-        parm[0] = 1;
-        mode = -XdrvMailbox.payload;
-      }
-      for (uint32_t i = 1; i < 3; i++) {
-        if (parm[i] < 1) { parm[i] = 1; }
-      }
-      BuzzerBeep(parm[0], parm[1], parm[2], parm[3], mode);
-    } else {
-      BuzzerBeep(0);
-    }
-  } else {
-    BuzzerBeep(1);
-  }
-  ResponseCmndDone();
-}
-
-
-
-
-
-bool Xdrv24(uint8_t function)
-{
-  bool result = false;
-
-  if (Buzzer.active) {
-    switch (function) {
-      case FUNC_EVERY_100_MSECOND:
-        BuzzerEvery100mSec();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kBuzzerCommands, BuzzerCommand);
-        break;
-      case FUNC_PRE_INIT:
-        BuzzerInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = BuzzerPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
-# 21 "S:/Development/Tasmota/tasmota/xdrv_25_A4988_Stepper.ino"
-#ifdef USE_A4988_STEPPER
-
-
-
-
-#define XDRV_25 25
-
-#include <A4988_Stepper.h>
-
-short A4988_dir_pin = pin[GPIO_MAX];
-short A4988_stp_pin = pin[GPIO_MAX];
-short A4988_ms1_pin = pin[GPIO_MAX];
-short A4988_ms2_pin = pin[GPIO_MAX];
-short A4988_ms3_pin = pin[GPIO_MAX];
-short A4988_ena_pin = pin[GPIO_MAX];
-int A4988_spr = 0;
-float A4988_rpm = 0;
-short A4988_mis = 0;
-
-A4988_Stepper* myA4988 = nullptr;
-
-void A4988Init(void)
-{
-  A4988_dir_pin = pin[GPIO_A4988_DIR];
-  A4988_stp_pin = pin[GPIO_A4988_STP];
-  A4988_ena_pin = pin[GPIO_A4988_ENA];
-  A4988_ms1_pin = pin[GPIO_A4988_MS1];
-  A4988_ms2_pin = pin[GPIO_A4988_MS2];
-  A4988_ms3_pin = pin[GPIO_A4988_MS3];
-  A4988_spr = 200;
-  A4988_rpm = 30;
-  A4988_mis = 1;
-
-  myA4988 = new A4988_Stepper( A4988_spr
-                            , A4988_rpm
-                            , A4988_mis
-                            , A4988_dir_pin
-                            , A4988_stp_pin
-                            , A4988_ena_pin
-                            , A4988_ms1_pin
-                            , A4988_ms2_pin
-                            , A4988_ms3_pin );
-}
-
-const char kA4988Commands[] PROGMEM = "Motor|"
-  "Move|Rotate|Turn|MIS|SPR|RPM";
-
-void (* const A4988Command[])(void) PROGMEM = {
-  &CmndDoMove,&CmndDoRotate,&CmndDoTurn,&CmndSetMIS,&CmndSetSPR,&CmndSetRPM};
-
-void CmndDoMove(void) {
-  if (XdrvMailbox.data_len > 0) {
-    long stepsPlease = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->doMove(stepsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndDoRotate(void) {
-  if (XdrvMailbox.data_len > 0) {
-    long degrsPlease = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->doRotate(degrsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndDoTurn(void) {
-  if (XdrvMailbox.data_len > 0) {
-    float turnsPlease = strtod(XdrvMailbox.data,nullptr);
-    myA4988->doTurn(turnsPlease);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetMIS(void) {
-  if ((pin[GPIO_A4988_MS1] < 99) && (pin[GPIO_A4988_MS2] < 99) && (pin[GPIO_A4988_MS3] < 99) && (XdrvMailbox.data_len > 0)) {
-    short newMIS = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setMIS(newMIS);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetSPR(void) {
-  if (XdrvMailbox.data_len > 0) {
-    int newSPR = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setSPR(newSPR);
-    ResponseCmndDone();
-  }
-}
-
-void CmndSetRPM(void) {
-  if (XdrvMailbox.data_len > 0) {
-    short newRPM = strtoul(XdrvMailbox.data,nullptr,10);
-    myA4988->setRPM(newRPM);
-    ResponseCmndDone();
-  }
-}
-
-
-
-
-bool Xdrv25(uint8_t function)
-{
-  bool result = false;
-  if ((pin[GPIO_A4988_DIR] < 99) && (pin[GPIO_A4988_STP] < 99)) {
-    switch (function) {
-      case FUNC_INIT:
-        A4988Init();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kA4988Commands, A4988Command);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_26_ariluxrf.ino"
-#ifdef USE_LIGHT
-#ifdef USE_ARILUX_RF
-
-
-
-
-#define XDRV_26 26
-
-const uint32_t ARILUX_RF_TIME_AVOID_DUPLICATE = 1000;
-
-const uint8_t ARILUX_RF_MAX_CHANGES = 51;
-const uint32_t ARILUX_RF_SEPARATION_LIMIT = 4300;
-const uint32_t ARILUX_RF_RECEIVE_TOLERANCE = 60;
-
-struct ARILUX {
-  unsigned int rf_timings[ARILUX_RF_MAX_CHANGES];
-
-  unsigned long rf_received_value = 0;
-  unsigned long rf_last_received_value = 0;
-  unsigned long rf_last_time = 0;
-  unsigned long rf_lasttime = 0;
-
-  unsigned int rf_change_count = 0;
-  unsigned int rf_repeat_count = 0;
-
-  uint8_t rf_toggle = 0;
-} Arilux;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-#ifndef USE_WS2812_DMA
-void AriluxRfInterrupt(void) ICACHE_RAM_ATTR;
-#endif
-#endif
-
-void AriluxRfInterrupt(void)
-{
-  unsigned long time = micros();
-  unsigned int duration = time - Arilux.rf_lasttime;
-
-  if (duration > ARILUX_RF_SEPARATION_LIMIT) {
-    if (abs(duration - Arilux.rf_timings[0]) < 200) {
-      Arilux.rf_repeat_count++;
-      if (Arilux.rf_repeat_count == 2) {
-        unsigned long code = 0;
-        const unsigned int delay = Arilux.rf_timings[0] / 31;
-        const unsigned int delayTolerance = delay * ARILUX_RF_RECEIVE_TOLERANCE / 100;
-        for (unsigned int i = 1; i < Arilux.rf_change_count -1; i += 2) {
-          code <<= 1;
-          if (abs(Arilux.rf_timings[i] - (delay *3)) < delayTolerance && abs(Arilux.rf_timings[i +1] - delay) < delayTolerance) {
-            code |= 1;
-          }
-        }
-        if (Arilux.rf_change_count > 49) {
-          Arilux.rf_received_value = code;
-        }
-        Arilux.rf_repeat_count = 0;
-      }
-    }
-    Arilux.rf_change_count = 0;
-  }
-  if (Arilux.rf_change_count >= ARILUX_RF_MAX_CHANGES) {
-    Arilux.rf_change_count = 0;
-    Arilux.rf_repeat_count = 0;
-  }
-  Arilux.rf_timings[Arilux.rf_change_count++] = duration;
-  Arilux.rf_lasttime = time;
-}
-
-void AriluxRfHandler(void)
-{
-  unsigned long now = millis();
-  if (Arilux.rf_received_value && !((Arilux.rf_received_value == Arilux.rf_last_received_value) && (now - Arilux.rf_last_time < ARILUX_RF_TIME_AVOID_DUPLICATE))) {
-    Arilux.rf_last_received_value = Arilux.rf_received_value;
-    Arilux.rf_last_time = now;
-
-    uint16_t hostcode = Arilux.rf_received_value >> 8 & 0xFFFF;
-    if (Settings.rf_code[1][6] == Settings.rf_code[1][7]) {
-      Settings.rf_code[1][6] = hostcode >> 8 & 0xFF;
-      Settings.rf_code[1][7] = hostcode & 0xFF;
-    }
-    uint16_t stored_hostcode = Settings.rf_code[1][6] << 8 | Settings.rf_code[1][7];
-
-    DEBUG_DRIVER_LOG(PSTR(D_LOG_RFR D_HOST D_CODE " 0x%04X, " D_RECEIVED " 0x%06X"), stored_hostcode, Arilux.rf_received_value);
-
-    if (hostcode == stored_hostcode) {
-      char command[33];
-      char value = '-';
-      command[0] = '\0';
-      uint8_t keycode = Arilux.rf_received_value & 0xFF;
-      switch (keycode) {
-        case 1:
-        case 3:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_POWER " %d"), (1 == keycode) ? 1 : 0);
-          break;
-        case 2:
-          Arilux.rf_toggle++;
-          Arilux.rf_toggle &= 0x3;
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), 200 + Arilux.rf_toggle);
-          break;
-        case 4:
-          value = '+';
-        case 7:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_SPEED " %c"), value);
-          break;
-        case 5:
-          value = '+';
-        case 8:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_SCHEME " %c"), value);
-          break;
-        case 6:
-          value = '+';
-        case 9:
-          snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %c"), value);
-          break;
-        default: {
-          if ((keycode >= 10) && (keycode <= 21)) {
-            snprintf_P(command, sizeof(command), PSTR(D_CMND_COLOR " %d"), keycode -9);
-          }
-        }
-      }
-      if (strlen(command)) {
-        ExecuteCommand(command, SRC_LIGHT);
-      }
-    }
-  }
-  Arilux.rf_received_value = 0;
-}
-
-void AriluxRfInit(void)
-{
-  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
-    if (Settings.last_module != Settings.module) {
-      Settings.rf_code[1][6] = 0;
-      Settings.rf_code[1][7] = 0;
-      Settings.last_module = Settings.module;
-    }
-    Arilux.rf_received_value = 0;
-
-    digitalWrite(pin[GPIO_ARIRFSEL], 0);
-    attachInterrupt(pin[GPIO_ARIRFRCV], AriluxRfInterrupt, CHANGE);
-  }
-}
-
-void AriluxRfDisable(void)
-{
-  if ((pin[GPIO_ARIRFRCV] < 99) && (pin[GPIO_ARIRFSEL] < 99)) {
-    detachInterrupt(pin[GPIO_ARIRFRCV]);
-    digitalWrite(pin[GPIO_ARIRFSEL], 1);
-  }
-}
-
-
-
-
-
-bool Xdrv26(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_50_MSECOND:
-      if (pin[GPIO_ARIRFRCV] < 99) { AriluxRfHandler(); }
-      break;
-    case FUNC_EVERY_SECOND:
-      if (10 == uptime) { AriluxRfInit(); }
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
-#ifdef USE_SHUTTER
-
-
-
-
-#define XDRV_27 27
-
-#define D_SHUTTER "SHUTTER"
-
-const uint16_t MOTOR_STOP_TIME = 500;
-const uint8_t steps_per_second = 20;
-
-uint8_t calibrate_pos[6] = {0,30,50,70,90,100};
-uint16_t messwerte[5] = {30,50,70,90,100};
-uint16_t last_execute_step;
-
-enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
-enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
-
-const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
-  D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION "|"
-  D_CMND_SHUTTER_OPENTIME "|" D_CMND_SHUTTER_CLOSETIME "|" D_CMND_SHUTTER_RELAY "|"
-  D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
-  D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME;
-
-void (* const ShutterCommand[])(void) PROGMEM = {
-  &CmndShutterOpen, &CmndShutterClose, &CmndShutterStop, &CmndShutterPosition,
-  &CmndShutterOpenTime, &CmndShutterCloseTime, &CmndShutterRelay,
-  &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
-  &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime};
-
-  const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d}";
-  const char JSON_SHUTTER_BUTTON[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Button%d\":%d}";
-
-#include <Ticker.h>
-
-Ticker TickerShutter;
-
-struct SHUTTER {
-  power_t mask = 0;
-  power_t old_power = 0;
-  power_t switched_relay = 0;
-  uint32_t time[MAX_SHUTTERS];
-  int32_t open_max[MAX_SHUTTERS];
-  int32_t target_position[MAX_SHUTTERS];
-  int32_t start_position[MAX_SHUTTERS];
-  int32_t real_position[MAX_SHUTTERS];
-  uint16_t open_time[MAX_SHUTTERS];
-  uint16_t close_time[MAX_SHUTTERS];
-  uint16_t close_velocity[MAX_SHUTTERS];
-  int8_t direction[MAX_SHUTTERS];
-  uint8_t mode = 0;
-  int16_t motordelay[MAX_SHUTTERS];
-  int16_t pwm_frequency[MAX_SHUTTERS];
-  uint16_t max_pwm_frequency = 1000;
-  uint16_t max_close_pwm_frequency[MAX_SHUTTERS];
-  uint8_t skip_relay_change;
-  int32_t accelerator[MAX_SHUTTERS];
-} Shutter;
-
-void ShutterLogPos(uint32_t i)
-{
-  char stemp2[10];
-  dtostrfd((float)Shutter.time[i] / steps_per_second, 2, stemp2);
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter%d Real %d, Start %d, Stop %d, Dir %d, Delay %d, Rtc %s [s], Freq %d"),
-    i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i], stemp2, Shutter.pwm_frequency[i]);
-}
-
-void ShutterRtc50mS(void)
-{
-  for (uint8_t i = 0; i < shutters_present; i++) {
-    Shutter.time[i]++;
-    if (Shutter.accelerator[i]) {
-
-      Shutter.pwm_frequency[i] += Shutter.accelerator[i];
-      Shutter.pwm_frequency[i] = tmax(0,tmin(Shutter.direction[i]==1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i],Shutter.pwm_frequency[i]));
-      analogWriteFreq(Shutter.pwm_frequency[i]);
-      analogWrite(pin[GPIO_PWM1+i], 50);
-    }
-  }
-}
-
-#define SHT_DIV_ROUND(__A,__B) (((__A) + (__B)/2) / (__B))
-
-int32_t ShutterPercentToRealPosition(uint32_t percent, uint32_t index)
-{
- if (Settings.shutter_set50percent[index] != 50) {
-    return (percent <= 5) ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
- } else {
-    uint32_t realpos;
-
-    for (uint32_t j = 0; j < 5; j++) {
-      if (0 == Settings.shuttercoeff[j][index]) {
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SHT: RESET/INIT CALIBRATION MATRIX DIV 0"));
-        for (uint32_t k = 0; k < 5; k++) {
-          Settings.shuttercoeff[k][index] = SHT_DIV_ROUND(calibrate_pos[k+1] * 1000, calibrate_pos[5]);
-        }
-      }
-    }
-    for (uint32_t i = 0; i < 5; i++) {
-      if ((percent * 10) >= Settings.shuttercoeff[i][index]) {
-        realpos = SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i+1], 100);
-
-      } else {
-        if (0 == i) {
-          realpos = SHT_DIV_ROUND(SHT_DIV_ROUND(percent * Shutter.open_max[index] * calibrate_pos[i+1], Settings.shuttercoeff[i][index]), 10);
-        } else {
-
-
-          realpos += SHT_DIV_ROUND(SHT_DIV_ROUND((percent*10 - Settings.shuttercoeff[i-1][index] ) * Shutter.open_max[index] * (calibrate_pos[i+1] - calibrate_pos[i]), Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), 100);
-        }
-        break;
-      }
-    }
-  return realpos;
- }
-}
-
-uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
-{
- if (Settings.shutter_set50percent[index] != 50) {
-  return (Settings.shuttercoeff[2][index] * 5 > realpos) ? SHT_DIV_ROUND(realpos, Settings.shuttercoeff[2][index]) : SHT_DIV_ROUND(realpos-Settings.shuttercoeff[0][index], Settings.shuttercoeff[1][index]);
- } else {
-    uint16_t realpercent;
-
-    for (uint32_t i = 0; i < 5; i++) {
-      if (realpos >= Shutter.open_max[index] * calibrate_pos[i+1] / 100) {
-        realpercent = SHT_DIV_ROUND(Settings.shuttercoeff[i][index], 10);
-
-      } else {
-        if (0 == i) {
-          realpercent = SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * Settings.shuttercoeff[i][index], calibrate_pos[i+1]), Shutter.open_max[index]);
-        } else {
-
-
-
-          realpercent += SHT_DIV_ROUND(SHT_DIV_ROUND((realpos - SHT_DIV_ROUND(Shutter.open_max[index] * calibrate_pos[i], 100)) * 10 * (Settings.shuttercoeff[i][index] - Settings.shuttercoeff[i-1][index]), (calibrate_pos[i+1] - calibrate_pos[i])), Shutter.open_max[index]) ;
-        }
-        break;
-      }
-    }
-    return realpercent;
-  }
-}
-
-void ShutterInit(void)
-{
-  shutters_present = 0;
-  Shutter.mask = 0;
-
-  Shutter.old_power = power;
-  bool relay_in_interlock = false;
-
-
-  if (Settings.shutter_startrelay[MAX_SHUTTERS] == 0) {
-     Shutter.max_pwm_frequency = Settings.shuttercoeff[4][3] > 0 ? Settings.shuttercoeff[4][3] : Shutter.max_pwm_frequency;
-  }
-  for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-
-    Settings.shutter_startrelay[i] = (Settings.shutter_startrelay[i] == 0 && i == 0? 1 : Settings.shutter_startrelay[i]);
-    if (Settings.shutter_startrelay[i] && (Settings.shutter_startrelay[i] < 9)) {
-      shutters_present++;
-
-
-      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1) ;
-
-      for (uint32_t j = 0; j < MAX_INTERLOCKS * Settings.flag.interlock; j++) {
-
-        if (Settings.interlock[j] && (Settings.interlock[j] & Shutter.mask)) {
-
-          relay_in_interlock = true;
-        }
-      }
-      if (relay_in_interlock) {
-        if (Settings.pulse_timer[i] > 0) {
-          Shutter.mode = SHT_PULSE_OPEN__PULSE_CLOSE;
-        } else {
-          Shutter.mode = SHT_OFF_OPEN__OFF_CLOSE;
-        }
-      } else {
-        Shutter.mode = SHT_OFF_ON__OPEN_CLOSE;
-        if ((pin[GPIO_PWM1+i] < 99) && (pin[GPIO_CNTR1+i] < 99)) {
-          Shutter.mode = SHT_OFF_ON__OPEN_CLOSE_STEPPER;
-          Shutter.pwm_frequency[i] = 0;
-          Shutter.accelerator[i] = 0;
-          analogWriteFreq(Shutter.pwm_frequency[i]);
-          analogWrite(pin[GPIO_PWM1+i], 50);
-        }
-      }
-
-      TickerShutter.attach_ms(50, ShutterRtc50mS );
-
-      Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] > 0) ? Settings.shutter_set50percent[i] : 50;
-
-
-      Shutter.open_time[i] = (Settings.shutter_opentime[i] > 0) ? Settings.shutter_opentime[i] : 100;
-      Shutter.close_time[i] = (Settings.shutter_closetime[i] > 0) ? Settings.shutter_closetime[i] : 100;
-
-
-      Shutter.open_max[i] = 200 * Shutter.open_time[i];
-      Shutter.close_velocity[i] = Shutter.open_max[i] / Shutter.close_time[i] / 2 ;
-      Shutter.max_close_pwm_frequency[i] = Shutter.max_pwm_frequency*Shutter.open_time[i] / Shutter.close_time[i];
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d Closefreq: %d"),i, Shutter.max_close_pwm_frequency[i]);
-
-
-      if (Settings.shutter_set50percent[i] != 50) {
-       Settings.shuttercoeff[1][i] = Shutter.open_max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
-       Settings.shuttercoeff[0][i] = Shutter.open_max[i] - (Settings.shuttercoeff[1][i] * 100);
-       Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
-      }
-      Shutter.mask |= 3 << (Settings.shutter_startrelay[i] -1);
-
-      Shutter.real_position[i] = ShutterPercentToRealPosition(Settings.shutter_position[i], i);
-
-      Shutter.start_position[i] = Shutter.target_position[i] = Shutter.real_position[i];
-      Shutter.motordelay[i] = Settings.shutter_motordelay[i];
-
-      char shutter_open_chr[10];
-      dtostrfd((float)Shutter.open_time[i] / 10 , 1, shutter_open_chr);
-      char shutter_close_chr[10];
-      dtostrfd((float)Shutter.close_time[i] / 10, 1, shutter_close_chr);
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100, Close Vel.: %d , Max Way: %d, Opentime %s [s], Closetime %s [s], CoeffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, is locked %d, end stop time enabled %d, shuttermode %d, motordelay %d"),
-        i+1, Settings.shutter_startrelay[i], Shutter.real_position[i], Settings.shutter_position[i], Shutter.close_velocity[i], Shutter.open_max[i], shutter_open_chr, shutter_close_chr,
-        Settings.shuttercoeff[0][i], Settings.shuttercoeff[1][i], Settings.shuttercoeff[2][i], Settings.shuttercoeff[3][i], Settings.shuttercoeff[4][i],
-        Shutter.mask, (Settings.shutter_options[i]&1) ? 1 : 0, (Settings.shutter_options[i]&2) ? 1 : 0, (Settings.shutter_options[i]&4) ? 1 : 0, Shutter.mode, Shutter.motordelay[i]);
-
-    } else {
-
-      break;
-    }
-    ShutterLimitRealAndTargetPositions(i);
-    Settings.shutter_accuracy = 1;
-  }
-}
-
-void ShutterReportPosition(bool always)
-{
-  Response_P(PSTR("{"));
-  for (uint32_t i = 0; i < shutters_present; i++) {
-
-    uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
-    if (Shutter.direction[i] != 0) {
-      rules_flag.shutter_moving = 1;
-      ShutterLogPos(i);
-    }
-    if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i], ShutterRealToPercentPosition(Shutter.target_position[i], i));
-  }
-  ResponseJsonEnd();
-  if (always || (rules_flag.shutter_moving)) {
-    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-    XdrvRulesProcess();
-  }
-
-
-}
-
-void ShutterLimitRealAndTargetPositions(uint32_t i) {
-  if (Shutter.real_position[i]<0) Shutter.real_position[i] = 0;
-  if (Shutter.real_position[i]>Shutter.open_max[i]) Shutter.real_position[i] = Shutter.open_max[i];
-  if (Shutter.target_position[i]<0) Shutter.target_position[i] = 0;
-  if (Shutter.target_position[i]>Shutter.open_max[i]) Shutter.target_position[i] = Shutter.open_max[i];
-}
-
-void ShutterUpdatePosition(void)
-{
-
-  char scommand[CMDSZ];
-  char stopic[TOPSZ];
-
-  for (uint32_t i = 0; i < shutters_present; i++) {
-    if (Shutter.direction[i] != 0) {
-      int32_t stop_position_delta = 20;
-      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-
-
-        Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-
-        int32_t max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
-        int32_t max_freq_change_per_sec = Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-        int32_t min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
-        int32_t velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency * Shutter.direction[i] ;
-
-        int32_t next_possible_stop = Shutter.real_position[i] + minstopway ;
-        stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
-
-
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
-                                      Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
-
-        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
-
-            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop) ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
-
-        } else if ( Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] == max_frequency) {
-          Shutter.accelerator[i] = 0;
-        }
-      } else {
-        Shutter.real_position[i] = Shutter.start_position[i] + ( (Shutter.time[i] - Shutter.motordelay[i]) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
-      }
-      if ( Shutter.real_position[i] * Shutter.direction[i] + stop_position_delta >= Shutter.target_position[i] * Shutter.direction[i] ) {
-
-
-        uint8_t cur_relay = Settings.shutter_startrelay[i] + (Shutter.direction[i] == 1 ? 0 : 1) ;
-        int16_t missing_steps;
-
-        switch (Shutter.mode) {
-          case SHT_PULSE_OPEN__PULSE_CLOSE:
-
-            if (SRC_PULSETIMER == last_source || SRC_SHUTTER == last_source || SRC_WEBGUI == last_source) {
-              ExecuteCommandPower(cur_relay, 1, SRC_SHUTTER);
-            } else {
-              last_source = SRC_SHUTTER;
-            }
-          break;
-          case SHT_OFF_ON__OPEN_CLOSE_STEPPER:
-            missing_steps = ((Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) - RtcSettings.pulse_counter[i];
-
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Remain steps %d, counter %d, freq %d"), missing_steps, RtcSettings.pulse_counter[i] ,Shutter.pwm_frequency[i]);
-            Shutter.accelerator[i] = 0;
-            Shutter.pwm_frequency[i] = Shutter.pwm_frequency[i] > 250 ? 250 : Shutter.pwm_frequency[i];
-            analogWriteFreq(Shutter.pwm_frequency[i]);
-            analogWrite(pin[GPIO_PWM1+i], 50);
-            Shutter.pwm_frequency[i] = 0;
-            analogWriteFreq(Shutter.pwm_frequency[i]);
-            while (RtcSettings.pulse_counter[i] < (uint32_t)(Shutter.target_position[i]-Shutter.start_position[i])*Shutter.direction[i]*Shutter.max_pwm_frequency/2000) {
-              delay(1);
-            }
-            analogWrite(pin[GPIO_PWM1+i], 0);
-            Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
-
-            if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
-              ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-              ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
-            }
-          break;
-          case SHT_OFF_ON__OPEN_CLOSE:
-          if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
-            ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-            ExecuteCommandPower(Settings.shutter_startrelay[i]+1, 0, SRC_SHUTTER);
-          }
-          break;
-          case SHT_OFF_OPEN__OFF_CLOSE:
-
-            if ((1 << (cur_relay-1)) & power) {
-
-              ExecuteCommandPower(cur_relay, 0, SRC_SHUTTER);
-            }
-          break;
-        }
-        ShutterLimitRealAndTargetPositions(i);
-        Settings.shutter_position[i] = ShutterRealToPercentPosition(Shutter.real_position[i], i);
-
-        ShutterLogPos(i);
-
-        Shutter.start_position[i] = Shutter.real_position[i];
-
-
-        snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i+1);
-        GetTopic_P(stopic, STAT, mqtt_topic, scommand);
-        Response_P("%d", (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i]);
-        MqttPublish(stopic, Settings.flag.mqtt_power_retain);
-
-        Shutter.direction[i] = 0;
-        ShutterReportPosition(true);
-        rules_flag.shutter_moved = 1;
-        XdrvRulesProcess();
-      }
-    }
-  }
-}
-
-bool ShutterState(uint32_t device)
-{
-  device--;
-  device &= 3;
-  return (Settings.flag3.shutter_mode &&
-          (Shutter.mask & (1 << (Settings.shutter_startrelay[device]-1))) );
-}
-
-void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
-{
-
-  if ( ( (1 == direction) && ((Shutter.open_max[i] - Shutter.real_position[i]) / 100 <= 2) )
-     || ( (-1 == direction) && (Shutter.real_position[i] / Shutter.close_velocity[i] <= 2)) ) {
-    Shutter.skip_relay_change = 1;
-  } else {
-    if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-      Shutter.pwm_frequency[i] = 0;
-      analogWriteFreq(Shutter.pwm_frequency[i]);
-      analogWrite(pin[GPIO_PWM1+i], 0);
-
-      if (pin[GPIO_CNTR1+i] < 99) {
-        RtcSettings.pulse_counter[i] = 0;
-      }
-      Shutter.accelerator[i] = Shutter.max_pwm_frequency / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Ramp up: %d"), Shutter.accelerator[i]);
-    }
-    Shutter.target_position[i] = target_pos;
-    Shutter.start_position[i] = Shutter.real_position[i];
-    Shutter.time[i] = 0;
-    Shutter.skip_relay_change = 0;
-    Shutter.direction[i] = direction;
-
-  }
-
-}
-
-void ShutterWaitForMotorStop(uint32_t i)
-{
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Wait for Motorstop.."));
-  if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
-    if (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode) {
-
-      while (Shutter.pwm_frequency[i] > 0) {
-
-        Shutter.pwm_frequency[i] = tmax(Shutter.pwm_frequency[i]-((Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i])/(Shutter.motordelay[i]+1)) , 0);
-
-        analogWriteFreq(Shutter.pwm_frequency[i]);
-        analogWrite(pin[GPIO_PWM1+i], 50);
-        delay(50);
-      }
-      analogWrite(pin[GPIO_PWM1+i], 0);
-      Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-    } else {
-      ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
-      delay(MOTOR_STOP_TIME);
-    }
-  } else {
-    delay(MOTOR_STOP_TIME);
-  }
-}
-
-int32_t ShutterCounterBasedPosition(uint32_t i)
-{
-  return ((int32_t)RtcSettings.pulse_counter[i]*Shutter.direction[i]*2000 / Shutter.max_pwm_frequency)+Shutter.start_position[i];
-}
-
-void ShutterRelayChanged(void)
-{
-
-
-
-
-  char stemp1[10];
-
- for (uint32_t i = 0; i < shutters_present; i++) {
-  power_t powerstate_local = (power >> (Settings.shutter_startrelay[i] -1)) & 3;
-
-    uint8 manual_relays_changed = ((Shutter.switched_relay >> (Settings.shutter_startrelay[i] -1)) & 3) && SRC_SHUTTER != last_source && SRC_PULSETIMER != last_source ;
-
-    if (manual_relays_changed) {
-
-      ShutterLimitRealAndTargetPositions(i);
-      if (Shutter.mode == SHT_OFF_ON__OPEN_CLOSE || Shutter.mode == SHT_OFF_ON__OPEN_CLOSE_STEPPER) {
-        ShutterWaitForMotorStop(i);
-    switch (powerstate_local) {
-     case 1:
-            ShutterStartInit(i, 1, Shutter.open_max[i]);
-       break;
-     case 3:
-       ShutterStartInit(i, -1, 0);
-       break;
-     default:
-
-       Shutter.target_position[i] = Shutter.real_position[i];
-      }
-   } else {
-        if (Shutter.direction[i] != 0 && (!powerstate_local || (powerstate_local && Shutter.mode == SHT_PULSE_OPEN__PULSE_CLOSE))) {
-     Shutter.target_position[i] = Shutter.real_position[i];
-     AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Switch OFF motor. Target: %ld, source: %s, powerstate_local %ld, Shutter.switched_relay %d, manual change %d"), i+1, Shutter.target_position[i], GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), powerstate_local,Shutter.switched_relay,manual_relays_changed);
-    } else {
-     last_source = SRC_SHUTTER;
-     if (powerstate_local == 2) {
-
-            ShutterWaitForMotorStop(i);
-       ShutterStartInit(i, -1, 0);
-     } else {
-
-            ShutterWaitForMotorStop(i);
-       ShutterStartInit(i, 1, Shutter.open_max[i]);
-     }
-    }
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Shutter %d: Target: %ld, powerstatelocal %d"), i+1, Shutter.target_position[i], powerstate_local);
-   }
-  }
- }
-}
-
-bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
-
-  uint32 min_shutterbutton_hold_timer = -1;
-  for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
-      min_shutterbutton_hold_timer = Button.hold_timer[i];
-  }
-  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
-}
-
-void ShutterButtonHandler(void)
-{
-  uint8_t buttonState = SHT_NOT_PRESSED;
-  uint8_t button = XdrvMailbox.payload;
-  uint8_t press_index;
-  uint32_t button_index = XdrvMailbox.index;
-  uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
-
-  uint16_t loops_per_second = 1000 / Settings.button_debounce;
-  if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
-    if (Settings.flag.button_single) {
-        buttonState = SHT_PRESSED_MULTI;
-        press_index = 1;
-    } else {
-      if ((Shutter.direction[shutter_index]) && (Button.press_counter[button_index]==0)) {
-        buttonState = SHT_PRESSED_IMMEDIATE;
-        press_index = 1;
-        Button.press_counter[button_index] = 99;
-      } else {
-        Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-      }
-    }
-    blinks = 201;
-  }
-
-  if (NOT_PRESSED == button) {
-    Button.hold_timer[button_index] = 0;
-  } else {
-    Button.hold_timer[button_index]++;
-    if (!Settings.flag.button_single) {
-      if (Settings.param[P_HOLD_IGNORE] > 0) {
-        if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
-          Button.hold_timer[button_index] = 0;
-          Button.press_counter[button_index] = 0;
-        }
-      }
-      if ((Button.press_counter[button_index]<99) && (Button.hold_timer[button_index] == loops_per_second * Settings.param[P_HOLD_TIME] / 10)) {
-
-        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
-
-          for (uint32_t i = 0; i < MAX_KEYS; i++)
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index))
-              Button.press_counter[i] = 99;
-          press_index = 0;
-          buttonState = SHT_PRESSED_HOLD_SIMULTANEOUS;
-        }
-        if (Button.press_counter[button_index]<99) {
-          press_index = 0;
-          buttonState = SHT_PRESSED_HOLD;
-        }
-        Button.press_counter[button_index] = 0;
-      }
-      if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {
-
-        if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
-
-          press_index = 0;
-          buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
-        }
-      }
-    }
-  }
-
-  if (!Settings.flag.button_single) {
-    if (Button.window_timer[button_index]) {
-      Button.window_timer[button_index]--;
-    } else {
-      if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
-        if (Button.press_counter[button_index]<99) {
-
-          uint32 min_shutterbutton_press_counter = -1;
-          for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
-              min_shutterbutton_press_counter = Button.press_counter[i];
-            }
-
-          }
-          if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
-
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
-            press_index = Button.press_counter[button_index];
-            for (uint32_t i = 0; i < MAX_KEYS; i++)
-              if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
-                Button.press_counter[i] = 99;
-            buttonState = SHT_PRESSED_MULTI_SIMULTANEOUS;
-          }
-          if ((buttonState != SHT_PRESSED_MULTI_SIMULTANEOUS) && (Button.press_counter[button_index]<99)) {
-
-            press_index = Button.press_counter[button_index];
-            buttonState = SHT_PRESSED_MULTI;
-          }
-        }
-        Button.press_counter[button_index] = 0;
-      }
-    }
-  }
-
- if (buttonState != SHT_NOT_PRESSED) {
-   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
-     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) {
-
-       char scmnd[20];
-       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-     if (!Settings.flag.button_restrict) {
-       char scmnd[20];
-       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
-      if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
-        uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
-        if (pos_press_index>3) pos_press_index=3;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: shutter %d, button %d = %d (single=1, double=2, tripple=3, hold=4)"), shutter_index+1, button_index+1, pos_press_index+1);
-        XdrvMailbox.index = shutter_index +1;
-        last_source = SRC_BUTTON;
-        XdrvMailbox.data_len = 0;
-        char databuf[1] = "";
-        XdrvMailbox.data = databuf;
-        XdrvMailbox.command = NULL;
-        if (buttonState == SHT_PRESSED_IMMEDIATE) {
-          XdrvMailbox.payload = XdrvMailbox.index;
-          CmndShutterStop();
-        } else {
-          uint8_t position = (Settings.shutter_button[button_index]>>(6*pos_press_index + 2)) & 0x03f;
-          if (position) {
-            if (Shutter.direction[shutter_index]) {
-              XdrvMailbox.payload = XdrvMailbox.index;
-              CmndShutterStop();
-            } else {
-              XdrvMailbox.payload = position = (position-1)<<1;
-              CmndShutterPosition();
-              if (Settings.shutter_button[button_index] & ((0x01<<26)<<pos_press_index)) {
-
-                char scommand[CMDSZ];
-                char stopic[TOPSZ];
-                for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
-                  if ((i==shutter_index) || (Settings.shutter_button[button_index] & (0x01<<30))) {
-                    snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
-                    GetGroupTopic_P(stopic, scommand);
-                    Response_P("%d", position);
-                    MqttPublish(stopic, false);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    Response_P(PSTR("{"));
-    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
-    ResponseJsonEnd();
-    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-    XdrvRulesProcess();
-  }
-}
-
-void ShutterSetPosition(uint32_t device, uint32_t position)
-{
-  char svalue[32];
-  snprintf_P(svalue, sizeof(svalue), PSTR(D_PRFX_SHUTTER D_CMND_SHUTTER_POSITION "%d %d"), device, position);
-  ExecuteCommand(svalue, SRC_IGNORE);
-}
-
-
-
-
-
-void CmndShutterOpen(void)
-{
-
-  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-    XdrvMailbox.index = XdrvMailbox.payload;
-  }
-  XdrvMailbox.payload = 100;
-  last_source = SRC_WEBGUI;
-  CmndShutterPosition();
-}
-
-void CmndShutterClose(void)
-{
-
-  if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-    XdrvMailbox.index = XdrvMailbox.payload;
-  }
-  XdrvMailbox.payload = 0;
-  XdrvMailbox.data_len = 0;
-  last_source = SRC_WEBGUI;
-  CmndShutterPosition();
-}
-
-void CmndShutterStop(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
-      if ((1 == XdrvMailbox.index) && (XdrvMailbox.payload != -99)) {
-        XdrvMailbox.index = XdrvMailbox.payload;
-      }
-      uint32_t i = XdrvMailbox.index -1;
-      if (Shutter.direction[i] != 0) {
-
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Stop moving %d: dir: %d"), XdrvMailbox.index, Shutter.direction[i]);
-
-        int32_t temp_realpos = Shutter.start_position[i] + ( (Shutter.time[i]+10) * (Shutter.direction[i] > 0 ? 100 : -Shutter.close_velocity[i]));
-        XdrvMailbox.payload = ShutterRealToPercentPosition(temp_realpos, i);
-
-        last_source = SRC_WEBGUI;
-        CmndShutterPosition();
-      } else {
-        if (XdrvMailbox.command)
-          ResponseCmndDone();
-      }
-    } else {
-      if (XdrvMailbox.command)
-        ResponseCmndIdxChar("Locked");
-    }
-  }
-}
-
-void CmndShutterPosition(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (!(Settings.shutter_options[XdrvMailbox.index-1] & 2)) {
-      uint32_t index = XdrvMailbox.index-1;
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Pos. in: payload %s (%d), payload %d, idx %d, src %d"), XdrvMailbox.data , XdrvMailbox.data_len, XdrvMailbox.payload , XdrvMailbox.index, last_source );
-
-
-
-      if ((XdrvMailbox.data_len > 1) && (XdrvMailbox.payload <= 0)) {
-
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_UP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_OPEN) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP))) {
-          CmndShutterOpen();
-          return;
-        }
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_DOWN) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_CLOSE) || ((Shutter.direction[index]==0) && !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN))) {
-          CmndShutterClose();
-          return;
-        }
-        if (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_STOP) || ((Shutter.direction[index]) && (!strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEUP) || !strcasecmp(XdrvMailbox.data,D_CMND_SHUTTER_TOGGLEDOWN)))) {
-          XdrvMailbox.payload = -99;
-          CmndShutterStop();
-          return;
-        }
-      }
-
-      int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter.real_position[index], index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
-
-      target_pos_percent = ((Settings.shutter_options[index] & 1) && (SRC_WEBGUI != last_source)) ? 100 - target_pos_percent : target_pos_percent;
-      if (XdrvMailbox.payload != -99) {
-
-        Shutter.target_position[index] = ShutterPercentToRealPosition(target_pos_percent, index);
-
-
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: lastsource %d:, real %d, target %d, payload %d"), last_source, Shutter.real_position[index] ,Shutter.target_position[index],target_pos_percent);
-      }
-      if ( (target_pos_percent >= 0) && (target_pos_percent <= 100) && abs(Shutter.target_position[index] - Shutter.real_position[index] ) / Shutter.close_velocity[index] > 2) {
-        if (Settings.shutter_options[index] & 4) {
-          if (0 == target_pos_percent) Shutter.target_position[index] -= 1 * 2000;
-          if (100 == target_pos_percent) Shutter.target_position[index] += 1 * 2000;
-        }
-        int8_t new_shutterdirection = Shutter.real_position[index] < Shutter.target_position[index] ? 1 : -1;
-        if (Shutter.direction[index] == -new_shutterdirection) {
-
-          if (SHT_PULSE_OPEN__PULSE_CLOSE == Shutter.mode) {
-
-            ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 0 : 1), 1, SRC_SHUTTER);
-            delay(100);
-          } else {
-            if (SHT_OFF_OPEN__OFF_CLOSE == Shutter.mode) {
-              ExecuteCommandPower(Settings.shutter_startrelay[index] + ((new_shutterdirection == 1) ? 1 : 0), 0, SRC_SHUTTER);
-              ShutterWaitForMotorStop(index);
-            }
-          }
-        }
-        if (Shutter.direction[index] != new_shutterdirection) {
-          if ((SHT_OFF_ON__OPEN_CLOSE == Shutter.mode) || (SHT_OFF_ON__OPEN_CLOSE_STEPPER == Shutter.mode)) {
-
-            ShutterWaitForMotorStop(index);
-            ExecuteCommandPower(Settings.shutter_startrelay[index], 0, SRC_SHUTTER);
-            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            if (Shutter.skip_relay_change == 0) {
-
-              ExecuteCommandPower(Settings.shutter_startrelay[index] +1, new_shutterdirection == 1 ? 0 : 1, SRC_SHUTTER);
-
-              ExecuteCommandPower(Settings.shutter_startrelay[index], 1, SRC_SHUTTER);
-            }
-          } else {
-
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Start in dir %d"), Shutter.direction[index]);
-            ShutterStartInit(index, new_shutterdirection, Shutter.target_position[index]);
-            if (Shutter.skip_relay_change == 0) {
-              ExecuteCommandPower(Settings.shutter_startrelay[index] + (new_shutterdirection == 1 ? 0 : 1), 1, SRC_SHUTTER);
-            }
-
-          }
-          Shutter.switched_relay = 0;
-        }
-      } else {
-        target_pos_percent = ShutterRealToPercentPosition(Shutter.real_position[index], index);
-        ShutterReportPosition(true);
-      }
-      XdrvMailbox.index = index +1;
-      if (XdrvMailbox.command)
-        ResponseCmndIdxNumber((Settings.shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent);
-    } else {
-      ShutterReportPosition(true);
-      if (XdrvMailbox.command)
-        ResponseCmndIdxChar("Locked");
-    }
-  }
-}
-
-void CmndShutterOpenTime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_opentime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_opentime[XdrvMailbox.index -1]) / 10, 1, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterCloseTime(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_closetime[XdrvMailbox.index -1] = (uint16_t)(10 * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_closetime[XdrvMailbox.index -1]) / 10, 1, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterMotorDelay(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      Settings.shutter_motordelay[XdrvMailbox.index -1] = (uint16_t)(steps_per_second * CharToFloat(XdrvMailbox.data));
-      ShutterInit();
-    }
-    char time_chr[10];
-    dtostrfd((float)(Settings.shutter_motordelay[XdrvMailbox.index -1]) / steps_per_second, 2, time_chr);
-    ResponseCmndIdxChar(time_chr);
-  }
-}
-
-void CmndShutterRelay(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 64)) {
-      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      if (XdrvMailbox.payload > 0) {
-        Shutter.mask |= 3 << (XdrvMailbox.payload - 1);
-      } else {
-        Shutter.mask ^= 3 << (Settings.shutter_startrelay[XdrvMailbox.index -1] - 1);
-      }
-      Settings.shutter_startrelay[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      ShutterInit();
-
-    }
-    ResponseCmndIdxNumber(Settings.shutter_startrelay[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndShutterButton(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_SHUTTERS)) {
-    uint32_t setting = 0;
-# 912 "S:/Development/Tasmota/tasmota/xdrv_27_shutter.ino"
-    if (XdrvMailbox.data_len > 0) {
-        uint32_t i = 0;
-        uint32_t button_index = 0;
-        bool done = false;
-        bool isShortCommand = false;
-        char *str_ptr;
-
-        char data_copy[strlen(XdrvMailbox.data) +1];
-        strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
-
-        for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < (1+4+4+1); str = strtok_r(nullptr, " ", &str_ptr), i++) {
-          int field;
-          if (str[0] == '-') {
-            field = -1;
-          } else {
-            field = atoi(str);
-          }
-          switch (i) {
-            case 0:
-              if ((field >= -1) && (field<=4)) {
-                button_index = (field<=0)?(-1):field;
-                done = (button_index==-1);
-              } else
-                done = true;
-            break;
-            case 1:
-              if (!strcmp_P(str, PSTR("up"))) {
-                setting |= (((100>>1)+1)<<2) | (((50>>1)+1)<<8) | (((75>>1)+1)<<14) | (((100>>1)+1)<<20);
-                isShortCommand = true;
-                break;
-              } else if (!strcmp_P(str, PSTR("down"))) {
-                setting |= (((0>>1)+1)<<2) | (((50>>1)+1)<<8) | (((25>>1)+1)<<14) | (((0>>1)+1)<<20);
-                isShortCommand = true;
-                break;
-              } else if (!strcmp_P(str, PSTR("updown"))) {
-                setting |= (((100>>1)+1)<<2) | (((0>>1)+1)<<8) | (((50>>1)+1)<<14);
-                isShortCommand = true;
-                break;
-              }
-            case 2:
-              if (isShortCommand) {
-                if ((field==1) && (setting & (0x3F<<(2+6*3))))
-
-                  setting |= (0x3<<29);
-                done = true;
-                break;
-              }
-            case 3:
-            case 4:
-              if ((field >= -1) && (field<=100))
-                setting |= (((field>>1)+1)<<(i*6 + (2-6)));
-            break;
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-            case 9:
-              if (field==1)
-                setting |= (1<<(i + (26-5)));
-            break;
-          }
-          if (done) break;
-        }
-
-        if (button_index) {
-          if (button_index==-1) {
-
-            for (uint32_t i=0 ; i < MAX_KEYS ; i++)
-              if ((Settings.shutter_button[i]&0x3) == (XdrvMailbox.index-1))
-                Settings.shutter_button[i] = 0;
-          } else {
-            if (setting) {
-
-              setting |= (1<<31);
-              setting |= (XdrvMailbox.index-1) & 0x3;
-            }
-            Settings.shutter_button[button_index-1] = setting;
-          }
-        }
-      }
-      char setting_chr[30*MAX_KEYS] = "-", *setting_chr_ptr = setting_chr;
-      for (uint32_t i=0 ; i < MAX_KEYS ; i++) {
-        setting = Settings.shutter_button[i];
-        if ((setting&(1<<31)) && ((setting&0x3) == (XdrvMailbox.index-1))) {
-          if (*setting_chr_ptr == 0)
-            setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|"));
-          setting_chr_ptr += snprintf_P(setting_chr_ptr, 2, PSTR("%d"), i+1);
-
-          for (uint32_t j=0 ; j < 4 ; j++) {
-            int8_t pos = (((setting>> (2+6*j))&(0x3f))-1)<<1;
-            if (pos>=0)
-              setting_chr_ptr += snprintf_P(setting_chr_ptr, 5, PSTR(" %d"), pos);
-            else
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
-          }
-          for (uint32_t j=0 ; j < 5 ; j++) {
-            bool mqtt = ((setting>>(26+j))&(0x01)!=0);
-            if (mqtt)
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" 1"));
-            else
-              setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR(" -"));
-          }
-        }
-      }
-      ResponseCmndIdxChar(setting_chr);
-   }
-}
-
-void CmndShutterSetHalfway(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
-      Settings.shutter_set50percent[XdrvMailbox.index -1] = (Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
-      ShutterInit();
-    }
-  ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 100 - Settings.shutter_set50percent[XdrvMailbox.index -1] : Settings.shutter_set50percent[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndShutterFrequency(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) {
-    Shutter.max_pwm_frequency = XdrvMailbox.payload;
-    if (shutters_present < 4) {
-      Settings.shuttercoeff[4][3] = Shutter.max_pwm_frequency;
-    }
-    ShutterInit();
-    ResponseCmndNumber(XdrvMailbox.payload);
-  } else {
-    ResponseCmndNumber(Shutter.max_pwm_frequency);
-  }
-}
-
-void CmndShutterSetClose(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    Shutter.real_position[XdrvMailbox.index -1] = 0;
-    ShutterStartInit(XdrvMailbox.index -1, 0, 0);
-    Settings.shutter_position[XdrvMailbox.index -1] = 0;
-    ResponseCmndIdxChar(D_CONFIGURATION_RESET);
-  }
-}
-
-void CmndShutterInvert(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(1);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (1);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 1) ? 1 : 0);
-  }
-}
-
-void CmndShutterCalibration(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.data_len > 0) {
-      uint32_t i = 0;
-      char *str_ptr;
-
-      char data_copy[strlen(XdrvMailbox.data) +1];
-      strncpy(data_copy, XdrvMailbox.data, sizeof(data_copy));
-
-      for (char *str = strtok_r(data_copy, " ", &str_ptr); str && i < 5; str = strtok_r(nullptr, " ", &str_ptr), i++) {
-        int field = atoi(str);
-
-
-        if ((field <= 0) || (field > 30000) || ( (i>0) && (field <= messwerte[i-1]) ) ) {
-          break;
-        }
-        messwerte[i] = field;
-      }
-      for (i = 0; i < 5; i++) {
-        Settings.shuttercoeff[i][XdrvMailbox.index -1] = SHT_DIV_ROUND((uint32_t)messwerte[i] * 1000, messwerte[4]);
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Settings.shuttercoeff: %d, i: %d, value: %d, messwert %d"), i,XdrvMailbox.index -1,Settings.shuttercoeff[i][XdrvMailbox.index -1], messwerte[i]);
-      }
-      ShutterInit();
-      ResponseCmndIdxChar(XdrvMailbox.data);
-    } else {
-      char setting_chr[30] = "0";
-      snprintf_P(setting_chr, sizeof(setting_chr), PSTR("%d %d %d %d %d"), Settings.shuttercoeff[0][XdrvMailbox.index -1], Settings.shuttercoeff[1][XdrvMailbox.index -1], Settings.shuttercoeff[2][XdrvMailbox.index -1], Settings.shuttercoeff[3][XdrvMailbox.index -1], Settings.shuttercoeff[4][XdrvMailbox.index -1]);
-      ResponseCmndIdxChar(setting_chr);
-    }
-  }
-}
-
-void CmndShutterLock(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(2);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (2);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 2) ? 1 : 0);
-  }
-}
-
-void CmndShutterEnableEndStopTime(void) {
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= shutters_present)) {
-    if (XdrvMailbox.payload == 0) {
-      Settings.shutter_options[XdrvMailbox.index -1] &= ~(4);
-    } else if (XdrvMailbox.payload == 1) {
-      Settings.shutter_options[XdrvMailbox.index -1] |= (4);
-    }
-    ResponseCmndIdxNumber((Settings.shutter_options[XdrvMailbox.index -1] & 4) ? 1 : 0);
-  }
-}
-
-
-
-
-
-bool Xdrv27(uint8_t function)
-{
-  bool result = false;
-
-  if (Settings.flag3.shutter_mode) {
-    switch (function) {
-      case FUNC_PRE_INIT:
-        ShutterInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        ShutterUpdatePosition();
-        break;
-      case FUNC_EVERY_SECOND:
-
-        ShutterReportPosition(false);
-        break;
-
-      case FUNC_COMMAND:
-        result = DecodeCommand(kShutterCommands, ShutterCommand);
-        break;
-      case FUNC_JSON_APPEND:
-        for (uint8_t i = 0; i < shutters_present; i++) {
-          uint8_t position = (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
-          ResponseAppend_P(",");
-          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
-#ifdef USE_DOMOTICZ
-          if ((0 == tele_period) && (0 == i)) {
-             DomoticzSensor(DZ_SHUTTER, position);
-          }
-#endif
-        }
-        break;
-      case FUNC_SET_POWER:
-        char stemp1[10];
-
-        Shutter.switched_relay = XdrvMailbox.index ^ Shutter.old_power;
-        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Switched relay: %d by %s"), Shutter.switched_relay,GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource));
-        ShutterRelayChanged();
-        Shutter.old_power = XdrvMailbox.index;
-      break;
-      case FUNC_SET_DEVICE_POWER:
-        if (Shutter.skip_relay_change ) {
-          uint8_t i;
-          for (i = 0; i < devices_present; i++) {
-            if (Shutter.switched_relay &1) {
-              break;
-            }
-            Shutter.switched_relay >>= 1;
-          }
-
-          result = true;
-          Shutter.skip_relay_change = 0;
-          AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Skipping switch off relay %d"),i);
-          ExecuteCommandPower(i+1, 0, SRC_SHUTTER);
-        }
-      break;
-      case FUNC_BUTTON_PRESSED:
-        if (Settings.shutter_button[XdrvMailbox.index] & (1<<31)) {
-          ShutterButtonHandler();
-          result = true;
-        }
-      break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_28_pcf8574.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_28_pcf8574.ino"
-#ifdef USE_I2C
-#ifdef USE_PCF8574
-
-
-
-
-
-
-
-#define XDRV_28 28
-#define XI2C_02 2
-
-#define PCF8574_ADDR1 0x20
-#define PCF8574_ADDR2 0x38
-
-struct PCF8574 {
-  int error;
-  uint8_t pin[64];
-  uint8_t address[MAX_PCF8574];
-  uint8_t pin_mask[MAX_PCF8574] = { 0 };
-  uint8_t max_connected_ports = 0;
-  uint8_t max_devices = 0;
-  char stype[9];
-  bool type = false;
-} Pcf8574;
-
-void Pcf8574SwitchRelay(void)
-{
-  for (uint32_t i = 0; i < devices_present; i++) {
-    uint8_t relay_state = bitRead(XdrvMailbox.index, i);
-
-
-
-    if (Pcf8574.max_devices > 0 && Pcf8574.pin[i] < 99) {
-      uint8_t board = Pcf8574.pin[i]>>3;
-      uint8_t oldpinmask = Pcf8574.pin_mask[board];
-      uint8_t _val = bitRead(rel_inverted, i) ? !relay_state : relay_state;
-
-
-
-      if (_val) {
-        Pcf8574.pin_mask[board] |= _val << (Pcf8574.pin[i]&0x7);
-      } else {
-        Pcf8574.pin_mask[board] &= ~(1 << (Pcf8574.pin[i]&0x7));
-      }
-      if (oldpinmask != Pcf8574.pin_mask[board]) {
-        Wire.beginTransmission(Pcf8574.address[board]);
-        Wire.write(Pcf8574.pin_mask[board]);
-        Pcf8574.error = Wire.endTransmission();
-      }
-
-    }
-  }
-}
-
-void Pcf8574Init(void)
-{
-  uint8_t pcf8574_address = PCF8574_ADDR1;
-  while ((Pcf8574.max_devices < MAX_PCF8574) && (pcf8574_address < PCF8574_ADDR2 +8)) {
-
-
-
-    if (I2cSetDevice(pcf8574_address)) {
-      Pcf8574.type = true;
-
-      Pcf8574.address[Pcf8574.max_devices] = pcf8574_address;
-      Pcf8574.max_devices++;
-
-      strcpy(Pcf8574.stype, "PCF8574");
-      if (pcf8574_address >= PCF8574_ADDR2) {
-        strcpy(Pcf8574.stype, "PCF8574A");
-      }
-      I2cSetActiveFound(pcf8574_address, Pcf8574.stype);
-    }
-
-    pcf8574_address++;
-#ifdef USE_MCP230xx_ADDR
-    if (USE_MCP230xx_ADDR == pcf8574_address) {
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Addr: 0x%x reserved for MCP320xx, skipping PCF8574 probe"), pcf8574_address);
-      pcf8574_address++;
-    }
-#endif
-    if ((PCF8574_ADDR1 +7) == pcf8574_address) {
-      pcf8574_address = PCF8574_ADDR2 +1;
-    }
-  }
-  if (Pcf8574.type) {
-    for (uint32_t i = 0; i < sizeof(Pcf8574.pin); i++) {
-      Pcf8574.pin[i] = 99;
-    }
-    devices_present = devices_present - Pcf8574.max_connected_ports;
-    Pcf8574.max_connected_ports = 0;
-    for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PCF: Device %d config 0x%02x"), idx +1, Settings.pcf8574_config[idx]);
-
-      for (uint32_t i = 0; i < 8; i++) {
-        uint8_t _result = Settings.pcf8574_config[idx] >> i &1;
-
-        if (_result > 0) {
-          Pcf8574.pin[devices_present] = i + 8 * idx;
-          bitWrite(rel_inverted, devices_present, Settings.flag3.pcf8574_ports_inverted);
-          devices_present++;
-          Pcf8574.max_connected_ports++;
-        }
-      }
-    }
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("PCF: Total devices %d, PCF8574 output ports %d"), Pcf8574.max_devices, Pcf8574.max_connected_ports);
-  }
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#define WEB_HANDLE_PCF8574 "pcf"
-
-const char HTTP_BTN_MENU_PCF8574[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_PCF8574 "' method='get'><button>" D_CONFIGURE_PCF8574 "</button></form></p>";
-
-const char HTTP_FORM_I2C_PCF8574_1[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_PCF8574_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='get' action='" WEB_HANDLE_PCF8574 "'>"
-  "<p><input id='b1' name='b1' type='checkbox'%s><b>" D_INVERT_PORTS "</b></p><hr/>";
-
-const char HTTP_FORM_I2C_PCF8574_2[] PROGMEM =
-  "<tr><td><b>" D_DEVICE " %d " D_PORT " %d</b></td><td style='width:100px'><select id='i2cs%d' name='i2cs%d'>"
-  "<option%s value='0'>" D_DEVICE_INPUT "</option>"
-  "<option%s value='1'>" D_DEVICE_OUTPUT "</option>"
-  "</select></td></tr>";
-
-void HandlePcf8574(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_CONFIGURE_PCF8574));
-
-  if (WebServer->hasArg("save")) {
-    Pcf8574SaveSettings();
-    WebRestart(1);
-    return;
-  }
-
-  WSContentStart_P(D_CONFIGURE_PCF8574);
-  WSContentSendStyle();
-  WSContentSend_P(HTTP_FORM_I2C_PCF8574_1, (Settings.flag3.pcf8574_ports_inverted) ? " checked" : "");
-  WSContentSend_P(HTTP_TABLE100);
-  for (uint32_t idx = 0; idx < Pcf8574.max_devices; idx++) {
-    for (uint32_t idx2 = 0; idx2 < 8; idx2++) {
-      uint8_t helper = 1 << idx2;
-      WSContentSend_P(HTTP_FORM_I2C_PCF8574_2,
-        idx +1, idx2,
-        idx2 + 8*idx,
-        idx2 + 8*idx,
-        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 0) ? " selected " : " ",
-        ((helper & Settings.pcf8574_config[idx]) >> idx2 == 1) ? " selected " : " "
-      );
-    }
-  }
-  WSContentSend_P(PSTR("</table>"));
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void Pcf8574SaveSettings(void)
-{
-  char stemp[7];
-  char tmp[100];
-
-
-
-  Settings.flag3.pcf8574_ports_inverted = WebServer->hasArg("b1");
-  for (byte idx = 0; idx < Pcf8574.max_devices; idx++) {
-    byte count=0;
-    byte n = Settings.pcf8574_config[idx];
-    while(n!=0) {
-      n = n&(n-1);
-      count++;
-    }
-    if (count <= devices_present) {
-      devices_present = devices_present - count;
-    }
-    for (byte i = 0; i < 8; i++) {
-      snprintf_P(stemp, sizeof(stemp), PSTR("i2cs%d"), i+8*idx);
-      WebGetArg(stemp, tmp, sizeof(tmp));
-      byte _value = (!strlen(tmp)) ? 0 : atoi(tmp);
-      if (_value) {
-        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] | 1 << i;
-        devices_present++;
-        Pcf8574.max_connected_ports++;
-      } else {
-        Settings.pcf8574_config[idx] = Settings.pcf8574_config[idx] & ~(1 << i );
-      }
-    }
-
-
-
-  }
-}
-#endif
-
-
-
-
-
-bool Xdrv28(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_02)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_PRE_INIT == function) {
-    Pcf8574Init();
-  }
-  else if (Pcf8574.type) {
-    switch (function) {
-      case FUNC_SET_POWER:
-        Pcf8574SwitchRelay();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_PCF8574);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_PCF8574, HandlePcf8574);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-#ifdef USE_DEEPSLEEP
-# 31 "S:/Development/Tasmota/tasmota/xdrv_29_deepsleep.ino"
-#define XDRV_29 29
-
-#define D_PRFX_DEEPSLEEP "DeepSleep"
-#define D_CMND_DEEPSLEEP_TIME "Time"
-
-const uint32_t DEEPSLEEP_MAX = 10 * 366 * 24 * 60 * 60;
-const uint32_t DEEPSLEEP_MAX_CYCLE = 60 * 60;
-const uint32_t DEEPSLEEP_MIN_TIME = 5;
-const uint32_t DEEPSLEEP_START_COUNTDOWN = 4;
-
-const char kDeepsleepCommands[] PROGMEM = D_PRFX_DEEPSLEEP "|"
-  D_CMND_DEEPSLEEP_TIME ;
-
-void (* const DeepsleepCommand[])(void) PROGMEM = {
-  &CmndDeepsleepTime };
-
-uint32_t deepsleep_sleeptime = 0;
-uint8_t deepsleep_flag = 0;
-
-bool DeepSleepEnabled(void)
-{
-  if ((Settings.deepsleep < 10) || (Settings.deepsleep > DEEPSLEEP_MAX)) {
-    Settings.deepsleep = 0;
-    return false;
-  }
-
-  if (pin[GPIO_DEEPSLEEP] < 99) {
-    pinMode(pin[GPIO_DEEPSLEEP], INPUT_PULLUP);
-    return (digitalRead(pin[GPIO_DEEPSLEEP]));
-  }
-
-  return true;
-}
-
-void DeepSleepReInit(void)
-{
-  if ((ResetReason() == REASON_DEEP_SLEEP_AWAKE) && DeepSleepEnabled()) {
-    if ((RtcSettings.ultradeepsleep > DEEPSLEEP_MAX_CYCLE) && (RtcSettings.ultradeepsleep < 1700000000)) {
-
-      RtcSettings.ultradeepsleep = RtcSettings.ultradeepsleep - DEEPSLEEP_MAX_CYCLE;
-      AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Remain DeepSleep %d"), RtcSettings.ultradeepsleep);
-      RtcSettingsSave();
-      RtcRebootReset();
-      ESP.deepSleep(100 * RtcSettings.deepsleep_slip * (DEEPSLEEP_MAX_CYCLE < RtcSettings.ultradeepsleep ? DEEPSLEEP_MAX_CYCLE : RtcSettings.ultradeepsleep), WAKE_RF_DEFAULT);
-      yield();
-
-    }
-  }
-
-  RtcSettings.ultradeepsleep = 0;
-}
-
-void DeepSleepPrepare(void)
-{
-
-
-
-
-  if ((RtcSettings.nextwakeup == 0) ||
-      (RtcSettings.deepsleep_slip < 9000) ||
-      (RtcSettings.deepsleep_slip > 11000) ||
-      (RtcSettings.nextwakeup > (UtcTime() + Settings.deepsleep))) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR("DSL: Reset wrong settings wakeup: %ld, slip %ld"), RtcSettings.nextwakeup, RtcSettings.deepsleep_slip );
-    RtcSettings.nextwakeup = 0;
-    RtcSettings.deepsleep_slip = 10000;
-  }
-
-
-
-  int16_t timeslip = (int16_t)(RtcSettings.nextwakeup + millis() / 1000 - UtcTime()) * 10;
-
-
-
-  timeslip = (timeslip < -(int32_t)Settings.deepsleep) ? 0 : (timeslip > (int32_t)Settings.deepsleep) ? 0 : 1;
-  if (timeslip) {
-    RtcSettings.deepsleep_slip = (Settings.deepsleep + RtcSettings.nextwakeup - UtcTime()) * RtcSettings.deepsleep_slip / tmax((Settings.deepsleep - (millis() / 1000)),5);
-
-    RtcSettings.deepsleep_slip = tmin(tmax(RtcSettings.deepsleep_slip, 9000), 11000);
-    RtcSettings.nextwakeup += Settings.deepsleep;
-  }
-
-
-
-  if (RtcSettings.nextwakeup <= (UtcTime() - DEEPSLEEP_MIN_TIME)) {
-
-    RtcSettings.nextwakeup += (((UtcTime() + DEEPSLEEP_MIN_TIME - RtcSettings.nextwakeup) / Settings.deepsleep) + 1) * Settings.deepsleep;
-  }
-
-  String dt = GetDT(RtcSettings.nextwakeup + LocalTime() - UtcTime());
-
-
-  deepsleep_sleeptime = tmin((uint32_t)DEEPSLEEP_MAX_CYCLE ,RtcSettings.nextwakeup - UtcTime());
-
-
-  Response_P(PSTR("{\"" D_PRFX_DEEPSLEEP "\":{\"" D_JSON_TIME "\":\"%s\",\"Epoch\":%d}}"), (char*)dt.c_str(), RtcSettings.nextwakeup);
-  MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_CMND_STATUS));
-
-
-
-}
-
-void DeepSleepStart(void)
-{
-  AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION "Sleeping"));
-
-  WifiShutdown();
-  RtcSettings.ultradeepsleep = RtcSettings.nextwakeup - UtcTime();
-  RtcSettingsSave();
-
-  ESP.deepSleep(100 * RtcSettings.deepsleep_slip * deepsleep_sleeptime);
-  yield();
-}
-
-void DeepSleepEverySecond(void)
-{
-  if (!deepsleep_flag) { return; }
-
-  if (DeepSleepEnabled()) {
-    if (DEEPSLEEP_START_COUNTDOWN == deepsleep_flag) {
-      SettingsSaveAll();
-      DeepSleepPrepare();
-    }
-    deepsleep_flag--;
-    if (deepsleep_flag <= 0) {
-      DeepSleepStart();
-    }
-  } else {
-    deepsleep_flag = 0;
-  }
-}
-
-
-
-
-
-void CmndDeepsleepTime(void)
-{
-  if ((0 == XdrvMailbox.payload) ||
-     ((XdrvMailbox.payload > 10) && (XdrvMailbox.payload < DEEPSLEEP_MAX))) {
-    Settings.deepsleep = XdrvMailbox.payload;
-    RtcSettings.nextwakeup = 0;
-    deepsleep_flag = (0 == XdrvMailbox.payload) ? 0 : DEEPSLEEP_START_COUNTDOWN;
-    if (deepsleep_flag) {
-      if (!Settings.tele_period) {
-        Settings.tele_period = TELE_PERIOD;
-      }
-    }
-  }
-  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.deepsleep);
-}
-
-
-
-
-
-bool Xdrv29(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_SECOND:
-      DeepSleepEverySecond();
-      break;
-    case FUNC_AFTER_TELEPERIOD:
-        if (DeepSleepEnabled() && !deepsleep_flag && (Settings.tele_period == 10 || Settings.tele_period == 300 || UpTime() > Settings.tele_period)) {
-        deepsleep_flag = DEEPSLEEP_START_COUNTDOWN;
-      }
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kDeepsleepCommands, DeepsleepCommand);
-      break;
-    case FUNC_PRE_INIT:
-      DeepSleepReInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-#ifdef USE_LIGHT
-#ifdef USE_EXS_DIMMER
-
-
-
-
-
-
-
-#define XDRV_30 30
-
-#define EXS_GATE_1_ON 0x20
-#define EXS_GATE_1_OFF 0x21
-#define EXS_DIMM_1_ON 0x22
-#define EXS_DIMM_1_OFF 0x23
-#define EXS_DIMM_1_TBL 0x24
-#define EXS_DIMM_1_VAL 0x25
-#define EXS_GATE_2_ON 0x30
-#define EXS_GATE_2_OFF 0x31
-#define EXS_DIMM_2_ON 0x32
-#define EXS_DIMM_2_OFF 0x33
-#define EXS_DIMM_2_TBL 0x34
-#define EXS_DIMM_2_VAL 0x35
-#define EXS_GATES_ON 0x40
-#define EXS_GATES_OFF 0x41
-#define EXS_DIMMS_ON 0x50
-#define EXS_DIMMS_OFF 0x51
-#define EXS_CH_LOCK 0x60
-#define EXS_GET_VALUES 0xFA
-#define EXS_WRITE_EE 0xFC
-#define EXS_READ_EE 0xFD
-#define EXS_GET_VERSION 0xFE
-#define EXS_RESET 0xFF
-
-#define EXS_BUFFER_SIZE 256
-#define EXS_ACK_TIMEOUT 200
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *ExsSerial = nullptr;
-
-typedef struct
-{
-  uint8_t on = 0;
-  uint8_t bright_tbl = 0;
-  uint8_t dimm = 0;
-  uint8_t impuls_start = 0;
-  uint32_t impuls_len = 0;
-} CHANNEL;
-
-typedef struct
-{
-  uint8_t version_major = 0;
-  uint8_t version_minor = 0;
-  CHANNEL channel[2];
-  uint8_t gate_lock = 0;
-} DIMMER;
-
-struct EXS
-{
-  uint8_t *buffer = nullptr;
-  int byte_counter = 0;
-  int cmd_status = 0;
-  uint8_t power = 0;
-  uint8_t dimm[2] = {0, 0};
-  DIMMER dimmer;
-} Exs;
-
-
-
-
-
-uint8_t crc8(const uint8_t *p, uint8_t len)
-{
-  const uint8_t table[] = {
-      0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
-      0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D};
-
-  const uint8_t table_rev[] = {
-      0x00, 0x70, 0xE0, 0x90, 0xC1, 0xB1, 0x21, 0x51,
-      0x83, 0xF3, 0x63, 0x13, 0x42, 0x32, 0xA2, 0xD2};
-
-  uint8_t offset;
-  uint8_t temp, crc8_temp;
-  uint8_t crc8 = 0;
-
-  for (int i = 0; i < len; i++)
-  {
-    temp = *(p + i);
-    offset = temp ^ crc8;
-    offset >>= 4;
-    crc8_temp = crc8 & 0x0f;
-    crc8 = crc8_temp ^ table_rev[offset];
-    offset = crc8 ^ temp;
-    offset &= 0x0f;
-    crc8_temp = crc8 & 0xf0;
-    crc8 = crc8_temp ^ table[offset];
-  }
-  return crc8 ^ 0x55;
-}
-
-void ExsSerialSend(const uint8_t data[] = nullptr, uint16_t len = 0)
-{
-  int retries = 3;
-  char rc;
-
-#ifdef EXS_DEBUG
-  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: Tx Packet: \""));
-  for (uint32_t i = 0; i < len; i++)
-  {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, data[i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
-  AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-  while (retries)
-  {
-    retries--;
-
-    ExsSerial->write(data, len);
-    ExsSerial->flush();
-
-
-    uint32_t snd_time = millis();
-    while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
-           (!ExsSerial->available()))
-      ;
-
-    if (!ExsSerial->available())
-    {
-
-#ifdef EXS_DEBUG
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR("ESX: serial send timeout"));
-#endif
-      continue;
-    }
-
-    rc = ExsSerial->read();
-    if (rc == 0xFF)
-      break;
-  }
-}
-
-void ExsSendCmd(uint8_t cmd, uint8_t value)
-{
-  uint8_t buffer[8];
-  uint16_t len;
-
-  buffer[0] = 0x7b;
-  buffer[3] = cmd;
-
-  switch (cmd)
-  {
-  case EXS_GATE_1_ON:
-  case EXS_GATE_1_OFF:
-  case EXS_DIMM_1_ON:
-  case EXS_DIMM_1_OFF:
-  case EXS_GATE_2_ON:
-  case EXS_GATE_2_OFF:
-  case EXS_DIMM_2_ON:
-  case EXS_DIMM_2_OFF:
-  case EXS_GATES_ON:
-  case EXS_GATES_OFF:
-  case EXS_DIMMS_ON:
-  case EXS_DIMMS_OFF:
-  case EXS_GET_VALUES:
-  case EXS_GET_VERSION:
-  case EXS_RESET:
-    buffer[2] = 1;
-    len = 4;
-    break;
-
-  case EXS_CH_LOCK:
-  case EXS_DIMM_1_TBL:
-  case EXS_DIMM_1_VAL:
-  case EXS_DIMM_2_TBL:
-  case EXS_DIMM_2_VAL:
-    buffer[2] = 2;
-    buffer[4] = value;
-    len = 5;
-    break;
-  }
-  buffer[1] = crc8(&buffer[3], buffer[2]);
-
-  ExsSerialSend(buffer, len);
-}
-
-uint8_t ExsSetPower(uint8_t device, uint8_t power)
-{
-  Exs.dimmer.channel[device].dimm = power;
-  ExsSendCmd(EXS_DIMM_1_ON + 0x10 * device + power ^ 1, 0);
-}
-
-uint8_t ExsSetBri(uint8_t device, uint8_t bri)
-{
-  Exs.dimmer.channel[device].bright_tbl = bri;
-  ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * device, bri);
-}
-
-uint8_t ExsSyncState(uint8_t device)
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Channel %d Power Want %d, Is %d"),
-            device, bitRead(Exs.power, device), Exs.dimmer.channel[device].dimm);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Set Channel %d Brightness Want %d, Is %d"),
-            device, Exs.dimm[device], Exs.dimmer.channel[device].bright_tbl);
-#endif
-
-  if (bitRead(Exs.power, device) &&
-      Exs.dimm[device] != Exs.dimmer.channel[device].bright_tbl) {
-    ExsSetBri(device, Exs.dimm[device]);
-  }
-
-  if (!Exs.dimm[device]) {
-    Exs.dimmer.channel[device].dimm = 0;
-  } else if (Exs.dimmer.channel[device].dimm != bitRead(Exs.power, device)) {
-    ExsSetPower(device, bitRead(Exs.power, device));
-  }
-}
-
-bool ExsSyncState()
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Serial %p, Cmd %d"), ExsSerial, Exs.cmd_status);
-#endif
-
-  if (!ExsSerial || Exs.cmd_status != 0)
-    return false;
-
-  ExsSyncState(0);
-  ExsSyncState(1);
-}
-
-void ExsDebugState()
-{
-#ifdef EXS_DEBUG
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: MCU v%d.%d, c0: On:%d,Dim:%d,Tbl:%d(%d%%), c1: On:%d,Dim:%d,Tbl:%d(%d%%), ChLock: %d"),
-              Exs.dimmer.version_major, Exs.dimmer.version_minor,
-              Exs.dimmer.channel[0].on, Exs.dimmer.channel[0].dimm,
-              Exs.dimmer.channel[0].bright_tbl,
-              changeUIntScale(Exs.dimmer.channel[0].bright_tbl, 0, 255, 0, 100),
-              Exs.dimmer.channel[1].on, Exs.dimmer.channel[1].dimm,
-              Exs.dimmer.channel[1].bright_tbl,
-              changeUIntScale(Exs.dimmer.channel[1].bright_tbl, 0, 255, 0, 100),
-              Exs.dimmer.gate_lock);
-#endif
-}
-
-void ExsPacketProcess(void)
-{
-  uint8_t len = Exs.buffer[1];
-  uint8_t cmd = Exs.buffer[2];
-
-  switch (cmd)
-  {
-  case EXS_GET_VALUES:
-# 294 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-    if (len > 9)
-    {
-      Exs.dimmer.version_major = Exs.buffer[3];
-      Exs.dimmer.version_minor = Exs.buffer[4];
-
-
-      Exs.dimmer.channel[0].on = Exs.buffer[6];
-      Exs.dimmer.channel[0].dimm = Exs.buffer[6];
-      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[7];
-
-
-      Exs.dimmer.channel[1].on = Exs.buffer[9];
-      Exs.dimmer.channel[1].dimm = Exs.buffer[9];
-      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[10];
-
-      Exs.dimmer.gate_lock = Exs.buffer[11];
-    }
-    else
-# 327 "S:/Development/Tasmota/tasmota/xdrv_30_exs_dimmer.ino"
-    {
-      Exs.dimmer.version_major = 1;
-      Exs.dimmer.version_minor = 0;
-
-
-      Exs.dimmer.channel[0].on = Exs.buffer[4] - 48;
-      Exs.dimmer.channel[0].dimm = Exs.buffer[4] - 48;
-      Exs.dimmer.channel[0].bright_tbl = Exs.buffer[5] - 48;
-
-
-      Exs.dimmer.channel[1].on = Exs.buffer[7] - 48;
-      Exs.dimmer.channel[1].dimm = Exs.buffer[7] - 48;
-      Exs.dimmer.channel[1].bright_tbl = Exs.buffer[8] - 48;
-
-      Exs.dimmer.gate_lock = Exs.buffer[9] - 48;
-    }
-
-    ExsDebugState();
-    ExsSyncState();
-    ExsDebugState();
-    break;
-  default:
-    break;
-  }
-}
-
-
-
-bool ExsModuleSelected(void)
-{
-  Settings.light_correction = 0;
-  Settings.flag.mqtt_serial = 0;
-  Settings.flag3.pwm_multi_channels = 1;
-  SetSeriallog(LOG_LEVEL_NONE);
-
-  devices_present = +2;
-  light_type = LT_SERIAL2;
-  return true;
-}
-
-bool ExsSetChannels(void)
-{
-#ifdef EXS_DEBUG
-  snprintf_P(log_data, sizeof(log_data), PSTR("EXS: SetChannels: \""));
-  for (int i = 0; i < XdrvMailbox.data_len; i++)
-  {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, ((uint8_t *)XdrvMailbox.data)[i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s\""), log_data);
-  AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-  Exs.dimm[0] = ((uint8_t *)XdrvMailbox.data)[0];
-  Exs.dimm[1] = ((uint8_t *)XdrvMailbox.data)[1];
-  return ExsSyncState();
-}
-
-bool ExsSetPower(void)
-{
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Set Power, Device %d, Power 0x%02x"),
-            active_device, XdrvMailbox.index);
-
-  Exs.power = XdrvMailbox.index;
-  return ExsSyncState();
-}
-
-void EsxMcuStart(void)
-{
-  int retries = 3;
-
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EXS: Request MCU configuration, PIN %d to Low"), pin[GPIO_EXS_ENABLE]);
-#endif
-
-  pinMode(pin[GPIO_EXS_ENABLE], OUTPUT);
-  digitalWrite(pin[GPIO_EXS_ENABLE], LOW);
-
-  delay(1);
-
-  while (ExsSerial->available())
-  {
-
-    ExsSerial->read();
-  }
-}
-
-void ExsInit(void)
-{
-#ifdef EXS_DEBUG
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Starting Tx %d Rx %d"), pin[GPIO_TXD], pin[GPIO_RXD]);
-#endif
-
-  Exs.buffer = (uint8_t *)malloc(EXS_BUFFER_SIZE);
-  if (Exs.buffer != nullptr)
-  {
-    ExsSerial = new TasmotaSerial(pin[GPIO_RXD], pin[GPIO_TXD], 2);
-    if (ExsSerial->begin(9600))
-    {
-      if (ExsSerial->hardwareSerial())
-      {
-        ClaimSerial();
-      }
-      ExsSerial->flush();
-      EsxMcuStart();
-      ExsSendCmd(EXS_CH_LOCK, 0);
-      ExsSendCmd(EXS_GET_VALUES, 0);
-   }
-  }
-}
-
-void ExsSerialInput(void)
-{
-  while (ExsSerial->available())
-  {
-    yield();
-    uint8_t serial_in_byte = ExsSerial->read();
-
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("EXS: Serial In Byte 0x%02x"), serial_in_byte);
-
-    if (Exs.cmd_status == 0 &&
-        serial_in_byte == 0x7B)
-    {
-      Exs.cmd_status = 1;
-      Exs.byte_counter = 0;
-    }
-    else if (Exs.byte_counter >= EXS_BUFFER_SIZE)
-    {
-      Exs.cmd_status = 0;
-    }
-    else if (Exs.cmd_status == 1)
-    {
-      Exs.buffer[Exs.byte_counter++] = serial_in_byte;
-
-      if (Exs.byte_counter > 2 && Exs.byte_counter == Exs.buffer[1] + 2)
-      {
-        uint8_t crc = crc8(&Exs.buffer[2], Exs.buffer[1]);
-
-
-        Exs.cmd_status = 0;
-
-#ifdef EXS_DEBUG
-        snprintf_P(log_data, sizeof(log_data), PSTR("EXS: RX Packet: \""));
-        for (uint32_t i = 0; i < Exs.byte_counter; i++)
-        {
-          snprintf_P(log_data, sizeof(log_data), PSTR("%s%02x"), log_data, Exs.buffer[i]);
-        }
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s\", CRC: 0x%02x"), log_data, crc);
-        AddLog(LOG_LEVEL_DEBUG_MORE);
-#endif
-
-        if (Exs.buffer[0] == crc)
-        {
-          ExsSerial->write(0xFF);
-          ExsPacketProcess();
-        }
-        else
-        {
-          ExsSerial->write(0x00);
-        }
-
-      }
-    }
-  }
-}
-
-
-
-
-
-#ifdef EXS_MCU_CMNDS
-
-#define D_PRFX_EXS "Exs"
-#define D_CMND_EXS_DIMM "Dimm"
-#define D_CMND_EXS_DIMM_TBL "DimmTbl"
-#define D_CMND_EXS_DIMM_VAL "DimmVal"
-#define D_CMND_EXS_DIMMS "Dimms"
-#define D_CMND_EXS_CH_LOCK "ChLock"
-#define D_CMND_EXS_STATE "State"
-
-const char kExsCommands[] PROGMEM = D_PRFX_EXS "|"
-  D_CMND_EXS_DIMM "|" D_CMND_EXS_DIMM_TBL "|" D_CMND_EXS_DIMM_VAL "|"
-  D_CMND_EXS_DIMMS "|" D_CMND_EXS_CH_LOCK "|"
-  D_CMND_EXS_STATE;
-
-void (* const ExsCommand[])(void) PROGMEM = {
-  &CmndExsDimm, &CmndExsDimmTbl, &CmndExsDimmVal,
-  &CmndExsDimms, &CmndExsChLock,
-  &CmndExsState };
-
-void CmndExsDimm(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1)) {
-    ExsSendCmd(EXS_DIMM_1_ON + 0x10 * (XdrvMailbox.index - 1) +
-               XdrvMailbox.payload ^ 1, 0);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimmTbl(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
-    ExsSendCmd(EXS_DIMM_1_TBL + 0x10 * (XdrvMailbox.index - 1),
-               XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimmVal(void)
-{
-  if ((XdrvMailbox.index == 1 || XdrvMailbox.index == 2) &&
-      (XdrvMailbox.payload > 0 || XdrvMailbox.payload <= 255)) {
-    ExsSendCmd(EXS_DIMM_1_VAL + 0x10 * (XdrvMailbox.index - 1),
-               XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsDimms(void)
-{
-  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
-    ExsSendCmd(EXS_DIMMS_ON + XdrvMailbox.payload ^ 1, 0);
-  }
-  CmndExsState();
-}
-
-void CmndExsChLock(void)
-{
-  if (XdrvMailbox.payload == 0 || XdrvMailbox.payload == 1) {
-    ExsSendCmd(EXS_CH_LOCK, XdrvMailbox.payload);
-  }
-  CmndExsState();
-}
-
-void CmndExsState(void)
-{
-  ExsSendCmd(EXS_GET_VALUES, 0);
-
-
-  uint32_t snd_time = millis();
-  while ((TimePassedSince(snd_time) < EXS_ACK_TIMEOUT) &&
-         (!ExsSerial->available()))
-    ;
-  ExsSerialInput();
-
-  Response_P(PSTR("{\"" D_CMND_EXS_STATE "\":{"));
-  ResponseAppend_P(PSTR("\"McuVersion\":\"%d.%d\","
-                        "\"Channels\":["),
-                   Exs.dimmer.version_major, Exs.dimmer.version_minor);
-
-  for (uint32_t i = 0; i < 2; i++) {
-    if (i != 0) {
-      ResponseAppend_P(PSTR(","));
-    }
-    ResponseAppend_P(PSTR("{\"On\":\"%d\","
-                          "\"BrightProz\":\"%d\","
-                          "\"BrightTab\":\"%d\","
-                          "\"Dimm\":\"%d\"}"),
-                     Exs.dimmer.channel[i].on,
-                     changeUIntScale(Exs.dimmer.channel[i].bright_tbl, 0, 255, 0, 100),
-                     Exs.dimmer.channel[i].bright_tbl,
-                     Exs.dimmer.channel[i].dimm);
-  }
-  ResponseAppend_P(PSTR("],"));
-  ResponseAppend_P(PSTR("\"GateLock\":\"%d\""), Exs.dimmer.gate_lock);
-  ResponseJsonEndEnd();
-}
-
-#endif
-
-
-
-
-
-bool Xdrv30(uint8_t function)
-{
-  bool result = false;
-
-  if (EXS_DIMMER == my_module_type)
-  {
-    switch (function)
-    {
-    case FUNC_LOOP:
-      if (ExsSerial)
-        ExsSerialInput();
-      break;
-    case FUNC_MODULE_INIT:
-      result = ExsModuleSelected();
-      break;
-    case FUNC_INIT:
-      ExsInit();
-      break;
-    case FUNC_SET_DEVICE_POWER:
-      result = ExsSetPower();
-      break;
-    case FUNC_SET_CHANNELS:
-      result = ExsSetChannels();
-      break;
-#ifdef EXS_MCU_CMNDS
-    case FUNC_COMMAND:
-      result = DecodeCommand(kExsCommands, ExsCommand);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_31_tasmota_slave.ino"
-#ifdef USE_TASMOTA_SLAVE
-
-
-
-
-#define XDRV_31 31
-
-#define CONST_STK_CRC_EOP 0x20
-
-#define CMND_STK_GET_SYNC 0x30
-#define CMND_STK_SET_DEVICE 0x42
-#define CMND_STK_SET_DEVICE_EXT 0x45
-#define CMND_STK_ENTER_PROGMODE 0x50
-#define CMND_STK_LEAVE_PROGMODE 0x51
-#define CMND_STK_LOAD_ADDRESS 0x55
-#define CMND_STK_PROG_PAGE 0x64
-
-
-
-
-
-#define CMND_START 0xFC
-#define CMND_END 0xFD
-
-#define CMND_FEATURES 0x01
-#define CMND_JSON 0x02
-#define CMND_FUNC_EVERY_SECOND 0x03
-#define CMND_FUNC_EVERY_100_MSECOND 0x04
-#define CMND_SLAVE_SEND 0x05
-#define CMND_PUBLISH_TELE 0x06
-#define CMND_EXECUTE_CMND 0x07
-
-#define PARAM_DATA_START 0xFE
-#define PARAM_DATA_END 0xFF
-
-#include <TasmotaSerial.h>
-
-
-
-
-
-class SimpleHexParse {
-  public:
-   SimpleHexParse(void);
-   uint8_t parseLine(char *hexline);
-   uint8_t ptr_l = 0;
-   uint8_t ptr_h = 0;
-   bool PageIsReady = false;
-   bool firstrun = true;
-   bool EndOfFile = false;
-   uint8_t FlashPage[128];
-   uint8_t FlashPageIdx = 0;
-   uint8_t layoverBuffer[16];
-   uint8_t layoverIdx = 0;
-   uint8_t getByte(char *hexline, uint8_t idx);
-};
-
-SimpleHexParse::SimpleHexParse(void)
-{
-
-}
-
-uint8_t SimpleHexParse::parseLine(char *hexline)
-{
-  if (layoverIdx) {
-    memcpy(&FlashPage[0], &layoverBuffer[0], layoverIdx);
-    FlashPageIdx = layoverIdx;
-    layoverIdx = 0;
-  }
-  uint8_t len = getByte(hexline, 1);
-  uint8_t addr_h = getByte(hexline, 2);
-  uint8_t addr_l = getByte(hexline, 3);
-  uint8_t rectype = getByte(hexline, 4);
-  for (uint8_t idx = 0; idx < len; idx++) {
-       if (FlashPageIdx < 128) {
-         FlashPage[FlashPageIdx] = getByte(hexline, idx+5);
-         FlashPageIdx++;
-       } else {
-         layoverBuffer[layoverIdx] = getByte(hexline, idx+5);
-         layoverIdx++;
-       }
-  }
-  if (1 == rectype) {
-    EndOfFile = true;
-    while (FlashPageIdx < 128) {
-      FlashPage[FlashPageIdx] = 0xFF;
-      FlashPageIdx++;
-    }
-  }
-  if (FlashPageIdx == 128) {
-    if (firstrun) {
-      firstrun = false;
-    } else {
-      ptr_l += 0x40;
-      if (ptr_l == 0) {
-        ptr_l = 0;
-        ptr_h++;
-      }
-    }
-    firstrun = false;
-    PageIsReady = true;
-  }
-  return 0;
-}
-
-uint8_t SimpleHexParse::getByte(char* hexline, uint8_t idx)
-{
- char buff[3];
- buff[3] = '\0';
- memcpy(&buff, &hexline[(idx*2)-1], 2);
- return strtol(buff, 0, 16);
-}
-
-
-
-
-
-struct TSLAVE {
-  uint32_t spi_hex_size = 0;
-  uint32_t spi_sector_counter = 0;
-  uint8_t spi_sector_cursor = 0;
-  uint8_t inverted = LOW;
-  bool type = false;
-  bool flashing = false;
-  bool SerialEnabled = false;
-  uint8_t waitstate = 0;
-  bool unsupported = false;
-} TSlave;
-
-typedef union {
-  uint32_t data;
-  struct {
-    uint32_t func_json_append : 1;
-    uint32_t func_every_second : 1;
-    uint32_t func_every_100_msecond : 1;
-    uint32_t func_slave_send : 1;
-    uint32_t spare4 : 1;
-    uint32_t spare5 : 1;
-    uint32_t spare6 : 1;
-    uint32_t spare7 : 1;
-    uint32_t spare8 : 1;
-    uint32_t spare9 : 1;
-    uint32_t spare10 : 1;
-    uint32_t spare11 : 1;
-    uint32_t spare12 : 1;
-    uint32_t spare13 : 1;
-    uint32_t spare14 : 1;
-    uint32_t spare15 : 1;
-    uint32_t spare16 : 1;
-    uint32_t spare17 : 1;
-    uint32_t spare18 : 1;
-    uint32_t spare19 : 1;
-    uint32_t spare20 : 1;
-    uint32_t spare21 : 1;
-    uint32_t spare22 : 1;
-    uint32_t spare23 : 1;
-    uint32_t spare24 : 1;
-    uint32_t spare25 : 1;
-    uint32_t spare26 : 1;
-    uint32_t spare27 : 1;
-    uint32_t spare28 : 1;
-    uint32_t spare29 : 1;
-    uint32_t spare30 : 1;
-    uint32_t spare31 : 1;
-  };
-} TSlaveFeatureCfg;
-
-
-
-
-
-
-struct TSLAVE_FEATURES {
-  uint32_t features_version;
-  TSlaveFeatureCfg features;
-} TSlaveSettings;
-
-struct TSLAVE_COMMAND {
-  uint8_t command;
-  uint8_t parameter;
-  uint8_t unused2;
-  uint8_t unused3;
-} TSlaveCommand;
-
-TasmotaSerial *TasmotaSlave_Serial;
-
-uint32_t TasmotaSlave_FlashStart(void)
-{
-  return (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 2;
-}
-
-uint8_t TasmotaSlave_UpdateInit(void)
-{
-  TSlave.spi_hex_size = 0;
-  TSlave.spi_sector_counter = TasmotaSlave_FlashStart();
-  TSlave.spi_sector_cursor = 0;
-  return 0;
-}
-
-void TasmotaSlave_Reset(void)
-{
-  if (TSlave.SerialEnabled) {
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
-    delay(1);
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], TSlave.inverted);
-    delay(1);
-    digitalWrite(pin[GPIO_TASMOTASLAVE_RST], !TSlave.inverted);
-    delay(5);
-  }
-}
-
-uint8_t TasmotaSlave_waitForSerialData(int dataCount, int timeout)
-{
-  int timer = 0;
-  while (timer < timeout) {
-    if (TasmotaSlave_Serial->available() >= dataCount) {
-      return 1;
-    }
-    delay(1);
-    timer++;
-  }
-  return 0;
-}
-
-uint8_t TasmotaSlave_sendBytes(uint8_t* bytes, int count)
-{
-  TasmotaSlave_Serial->write(bytes, count);
-  TasmotaSlave_waitForSerialData(2, 250);
-  uint8_t sync = TasmotaSlave_Serial->read();
-  uint8_t ok = TasmotaSlave_Serial->read();
-  if ((sync == 0x14) && (ok == 0x10)) {
-    return 1;
-  }
-  return 0;
-}
-
-uint8_t TasmotaSlave_execCmd(uint8_t cmd)
-{
-  uint8_t bytes[] = { cmd, CONST_STK_CRC_EOP };
-  return TasmotaSlave_sendBytes(bytes, 2);
-}
-
-uint8_t TasmotaSlave_execParam(uint8_t cmd, uint8_t* params, int count)
-{
-  uint8_t bytes[32];
-  bytes[0] = cmd;
-  int i = 0;
-  while (i < count) {
-    bytes[i + 1] = params[i];
-    i++;
-  }
-  bytes[i + 1] = CONST_STK_CRC_EOP;
-  return TasmotaSlave_sendBytes(bytes, i + 2);
-}
-
-uint8_t TasmotaSlave_exitProgMode(void)
-{
-  return TasmotaSlave_execCmd(CMND_STK_LEAVE_PROGMODE);
-}
-
-uint8_t TasmotaSlave_SetupFlash(void)
-{
-  uint8_t ProgParams[] = {0x86, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00};
-  uint8_t ExtProgParams[] = {0x05, 0x04, 0xd7, 0xc2, 0x00};
-  TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_FLASH_SPEED);
-  if (TasmotaSlave_Serial->hardwareSerial()) {
-    ClaimSerial();
-  }
-
-  TasmotaSlave_Reset();
-
-  uint8_t timeout = 0;
-  uint8_t no_error = 0;
-  while (50 > timeout) {
-    if (TasmotaSlave_execCmd(CMND_STK_GET_SYNC)) {
-      timeout = 200;
-      no_error = 1;
-    }
-    timeout++;
-    delay(1);
-  }
-  if (no_error) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Found bootloader"));
-  } else {
-    no_error = 0;
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Bootloader could not be found"));
-  }
-  if (no_error) {
-    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE, ProgParams, sizeof(ProgParams))) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (1)"));
-    }
-  }
-  if (no_error) {
-    if (TasmotaSlave_execParam(CMND_STK_SET_DEVICE_EXT, ExtProgParams, sizeof(ExtProgParams))) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Could not configure device for programming (2)"));
-    }
-  }
-  if (no_error) {
-    if (TasmotaSlave_execCmd(CMND_STK_ENTER_PROGMODE)) {
-    } else {
-      no_error = 0;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Failed to put bootloader into programming mode"));
-    }
-  }
-  return no_error;
-}
-
-uint8_t TasmotaSlave_loadAddress(uint8_t adrHi, uint8_t adrLo)
-{
-  uint8_t params[] = { adrLo, adrHi };
-  return TasmotaSlave_execParam(CMND_STK_LOAD_ADDRESS, params, sizeof(params));
-}
-
-void TasmotaSlave_FlashPage(uint8_t addr_h, uint8_t addr_l, uint8_t* data)
-{
-  uint8_t Header[] = {CMND_STK_PROG_PAGE, 0x00, 0x80, 0x46};
-  TasmotaSlave_loadAddress(addr_h, addr_l);
-  TasmotaSlave_Serial->write(Header, 4);
-  for (int i = 0; i < 128; i++) {
-    TasmotaSlave_Serial->write(data[i]);
-  }
-  TasmotaSlave_Serial->write(CONST_STK_CRC_EOP);
-  TasmotaSlave_waitForSerialData(2, 250);
-  TasmotaSlave_Serial->read();
-  TasmotaSlave_Serial->read();
-}
-
-void TasmotaSlave_Flash(void)
-{
-  bool reading = true;
-  uint32_t read = 0;
-  uint32_t processed = 0;
-  char thishexline[50];
-  uint8_t position = 0;
-  char* flash_buffer;
-
-  SimpleHexParse hexParse = SimpleHexParse();
-
-  if (!TasmotaSlave_SetupFlash()) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flashing aborted!"));
-    TSlave.flashing = false;
-    restart_flag = 2;
-    return;
-  }
-
-  flash_buffer = new char[SPI_FLASH_SEC_SIZE];
-  uint32_t flash_start = TasmotaSlave_FlashStart() * SPI_FLASH_SEC_SIZE;
-  while (reading) {
-    ESP.flashRead(flash_start + read, (uint32_t*)flash_buffer, SPI_FLASH_SEC_SIZE);
-    read = read + SPI_FLASH_SEC_SIZE;
-    if (read >= TSlave.spi_hex_size) {
-      reading = false;
-    }
-    for (uint32_t ca = 0; ca < SPI_FLASH_SEC_SIZE; ca++) {
-      processed++;
-      if ((processed <= TSlave.spi_hex_size) && (!hexParse.EndOfFile)) {
-        if (':' == flash_buffer[ca]) {
-          position = 0;
-        }
-        if (0x0D == flash_buffer[ca]) {
-          thishexline[position] = 0;
-          hexParse.parseLine(thishexline);
-          if (hexParse.PageIsReady) {
-            TasmotaSlave_FlashPage(hexParse.ptr_h, hexParse.ptr_l, hexParse.FlashPage);
-            hexParse.PageIsReady = false;
-            hexParse.FlashPageIdx = 0;
-          }
-        } else {
-          if (0x0A != flash_buffer[ca]) {
-            thishexline[position] = flash_buffer[ca];
-            position++;
-          }
-        }
-      }
-    }
-  }
-  TasmotaSlave_exitProgMode();
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flash done!"));
-  TSlave.flashing = false;
-  restart_flag = 2;
-}
-
-void TasmotaSlave_SetFlagFlashing(bool value)
-{
-  TSlave.flashing = value;
-}
-
-bool TasmotaSlave_GetFlagFlashing(void)
-{
-  return TSlave.flashing;
-}
-
-void TasmotaSlave_WriteBuffer(uint8_t *buf, size_t size)
-{
-  if (0 == TSlave.spi_sector_cursor) {
-    ESP.flashEraseSector(TSlave.spi_sector_counter);
-  }
-  TSlave.spi_sector_cursor++;
-  ESP.flashWrite((TSlave.spi_sector_counter * SPI_FLASH_SEC_SIZE) + ((TSlave.spi_sector_cursor-1)*2048), (uint32_t*)buf, size);
-  TSlave.spi_hex_size = TSlave.spi_hex_size + size;
-  if (2 == TSlave.spi_sector_cursor) {
-    TSlave.spi_sector_cursor = 0;
-    TSlave.spi_sector_counter++;
-  }
-}
-
-void TasmotaSlave_Init(void)
-{
-  if (TSlave.type) {
-    return;
-  }
-  if (10 > TSlave.waitstate) {
-    TSlave.waitstate++;
-    return;
-  }
-  if (!TSlave.SerialEnabled) {
-    if ((pin[GPIO_TASMOTASLAVE_RXD] < 99) && (pin[GPIO_TASMOTASLAVE_TXD] < 99) &&
-        ((pin[GPIO_TASMOTASLAVE_RST] < 99) || (pin[GPIO_TASMOTASLAVE_RST_INV] < 99))) {
-      TasmotaSlave_Serial = new TasmotaSerial(pin[GPIO_TASMOTASLAVE_RXD], pin[GPIO_TASMOTASLAVE_TXD], 1, 0, 200);
-      if (TasmotaSlave_Serial->begin(USE_TASMOTA_SLAVE_SERIAL_SPEED)) {
-        if (TasmotaSlave_Serial->hardwareSerial()) {
-          ClaimSerial();
-        }
-        TasmotaSlave_Serial->setTimeout(50);
-        if (pin[GPIO_TASMOTASLAVE_RST_INV] < 99) {
-          pin[GPIO_TASMOTASLAVE_RST] = pin[GPIO_TASMOTASLAVE_RST_INV];
-          pin[GPIO_TASMOTASLAVE_RST_INV] = 99;
-          TSlave.inverted = HIGH;
-        }
-        pinMode(pin[GPIO_TASMOTASLAVE_RST], OUTPUT);
-        TSlave.SerialEnabled = true;
-        TasmotaSlave_Reset();
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Enabled"));
-      }
-    }
-  }
-  if (TSlave.SerialEnabled) {
-    TasmotaSlave_sendCmnd(CMND_FEATURES, 0);
-    char buffer[32];
-    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer));
-    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer));
-    memcpy(&TSlaveSettings, &buffer, sizeof(TSlaveSettings));
-    if (20191129 == TSlaveSettings.features_version) {
-      TSlave.type = true;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u"), TSlaveSettings.features_version);
-    } else {
-      if ((!TSlave.unsupported) && (TSlaveSettings.features_version > 0)) {
-        AddLog_P2(LOG_LEVEL_INFO, PSTR("Tasmota Slave Version %u not supported!"), TSlaveSettings.features_version);
-        TSlave.unsupported = true;
-      }
-    }
-  }
-}
-
-void TasmotaSlave_Show(void)
-{
-  if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
-    char buffer[100];
-    TasmotaSlave_sendCmnd(CMND_JSON, 0);
-    TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_START), buffer, sizeof(buffer)-1);
-    uint8_t len = TasmotaSlave_Serial->readBytesUntil(char(PARAM_DATA_END), buffer, sizeof(buffer)-1);
-    buffer[len] = '\0';
-    ResponseAppend_P(PSTR(",\"TasmotaSlave\":%s"), buffer);
-  }
-}
-
-void TasmotaSlave_sendCmnd(uint8_t cmnd, uint8_t param)
-{
-  TSlaveCommand.command = cmnd;
-  TSlaveCommand.parameter = param;
-  char buffer[sizeof(TSlaveCommand)+2];
-  buffer[0] = CMND_START;
-  memcpy(&buffer[1], &TSlaveCommand, sizeof(TSlaveCommand));
-  buffer[sizeof(TSlaveCommand)+1] = CMND_END;
-  for (uint8_t ca = 0; ca < sizeof(buffer); ca++) {
-    TasmotaSlave_Serial->write(buffer[ca]);
-  }
-}
-
-#define D_PRFX_SLAVE "Slave"
-#define D_CMND_SLAVE_RESET "Reset"
-#define D_CMND_SLAVE_SEND "Send"
-
-const char kTasmotaSlaveCommands[] PROGMEM = D_PRFX_SLAVE "|"
-  D_CMND_SLAVE_RESET "|" D_CMND_SLAVE_SEND;
-
-void (* const TasmotaSlaveCommand[])(void) PROGMEM = {
-  &CmndTasmotaSlaveReset, &CmndTasmotaSlaveSend };
-
-void CmndTasmotaSlaveReset(void)
-{
-  TasmotaSlave_Reset();
-  TSlave.type = false;
-  TSlave.waitstate = 7;
-  TSlave.unsupported = false;
-  ResponseCmndDone();
-}
-
-void CmndTasmotaSlaveSend(void)
-{
-  if (0 < XdrvMailbox.data_len) {
-    TasmotaSlave_sendCmnd(CMND_SLAVE_SEND, XdrvMailbox.data_len);
-    TasmotaSlave_Serial->write(char(PARAM_DATA_START));
-    for (uint8_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
-      TasmotaSlave_Serial->write(XdrvMailbox.data[idx]);
-    }
-    TasmotaSlave_Serial->write(char(PARAM_DATA_END));
-  }
-  ResponseCmndDone();
-}
-
-void TasmotaSlave_ProcessIn(void)
-{
-  uint8_t cmnd = TasmotaSlave_Serial->read();
-  switch (cmnd) {
-    case CMND_START:
-      TasmotaSlave_waitForSerialData(sizeof(TSlaveCommand),50);
-      uint8_t buffer[sizeof(TSlaveCommand)];
-      for (uint8_t idx = 0; idx < sizeof(TSlaveCommand); idx++) {
-        buffer[idx] = TasmotaSlave_Serial->read();
-      }
-      TasmotaSlave_Serial->read();
-      memcpy(&TSlaveCommand, &buffer, sizeof(TSlaveCommand));
-      char inbuf[TSlaveCommand.parameter+1];
-      TasmotaSlave_waitForSerialData(TSlaveCommand.parameter, 50);
-      TasmotaSlave_Serial->read();
-      for (uint8_t idx = 0; idx < TSlaveCommand.parameter; idx++) {
-        inbuf[idx] = TasmotaSlave_Serial->read();
-      }
-      TasmotaSlave_Serial->read();
-      inbuf[TSlaveCommand.parameter] = '\0';
-
-      if (CMND_PUBLISH_TELE == TSlaveCommand.command) {
-        Response_P(PSTR("{\"TasmotaSlave\":"));
-        ResponseAppend_P("%s", inbuf);
-        ResponseJsonEnd();
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-        XdrvRulesProcess();
-      }
-      if (CMND_EXECUTE_CMND == TSlaveCommand.command) {
-        ExecuteCommand(inbuf, SRC_IGNORE);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-
-
-
-
-
-bool Xdrv31(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_100_MSECOND:
-      if (TSlave.type) {
-        if (TasmotaSlave_Serial->available()) {
-          TasmotaSlave_ProcessIn();
-        }
-        if (TSlaveSettings.features.func_every_100_msecond) {
-          TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_100_MSECOND, 0);
-        }
-      }
-      break;
-    case FUNC_EVERY_SECOND:
-      if ((TSlave.type) && (TSlaveSettings.features.func_every_second)) {
-        TasmotaSlave_sendCmnd(CMND_FUNC_EVERY_SECOND, 0);
-      }
-      TasmotaSlave_Init();
-      break;
-    case FUNC_JSON_APPEND:
-      if ((TSlave.type) && (TSlaveSettings.features.func_json_append)) {
-        TasmotaSlave_Show();
-      }
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kTasmotaSlaveCommands, TasmotaSlaveCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_32_hotplug.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_32_hotplug.ino"
-#ifdef USE_HOTPLUG
-
-
-
-
-
-
-
-#define XDRV_32 32
-
-const uint32_t HOTPLUG_MAX = 254;
-
-const char kHotPlugCommands[] PROGMEM = "|"
-  D_CMND_HOTPLUG;
-
-void (* const HotPlugCommand[])(void) PROGMEM = {
-  &CmndHotPlugTime };
-
-struct {
-
-  bool enabled = false;
-  uint8_t timeout = 0;
-} Hotplug;
-
-void HotPlugInit(void)
-{
-
-  if (Settings.hotplug_scan == 0xFF) { Settings.hotplug_scan = 0; }
-  if (Settings.hotplug_scan != 0) {
-    Hotplug.enabled = true;
-    Hotplug.timeout = 1;
-  } else
-    Hotplug.enabled = false;
-}
-
-void HotPlugEverySecond(void)
-{
-  if (Hotplug.enabled) {
-    if (Hotplug.timeout == 0) {
-      XsnsCall(FUNC_HOTPLUG_SCAN);
-      Hotplug.timeout = Settings.hotplug_scan;
-    }
-    Hotplug.timeout--;
-  }
-}
-
-
-
-
-
-void CmndHotPlugTime(void)
-{
-  if (XdrvMailbox.payload <= HOTPLUG_MAX) {
-    Settings.hotplug_scan = XdrvMailbox.payload;
-    HotPlugInit();
-  }
-  ResponseCmndNumber(Settings.hotplug_scan);
-}
-
-
-
-
-
-bool Xdrv32(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_SECOND:
-      HotPlugEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kHotPlugCommands, HotPlugCommand);
-      break;
-    case FUNC_PRE_INIT:
-      HotPlugInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
-# 30 "S:/Development/Tasmota/tasmota/xdrv_33_nrf24l01.ino"
-#ifdef USE_SPI
-#ifdef USE_NRF24
-
-
-
-
-
-
-
-#define XDRV_33 33
-
-#define MOSI 13
-#define MISO 12
-#define SCK 14
-
-#include <SPI.h>
-#include <RF24.h>
-
-const char NRF24type[] PROGMEM = "NRF24";
-
-const char HTTP_NRF24[] PROGMEM =
- "{s}%sL01%c: " "{m}started{e}";
-
-struct {
-  uint8_t chipType = 0;
-} NRF24;
-
-
-
-RF24 NRF24radio;
-
-bool NRF24initRadio()
-{
-  NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
-  NRF24radio.powerUp();
-
-  if(NRF24radio.isChipConnected()){
-    DEBUG_DRIVER_LOG(PSTR("NRF24 chip connected"));
-    return true;
-  }
-  DEBUG_DRIVER_LOG(PSTR("NRF24 chip NOT !!!! connected"));
-  return false;
-}
-
-bool NRF24Detect(void)
-{
-  if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_DC]<99)){
-    SPI.pins(SCK,MOSI,MISO,-1);
-    if(NRF24initRadio()){
-      NRF24.chipType = 32;
-     AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01 initialized"));
-      if(NRF24radio.isPVariant()){
-        NRF24.chipType = 43;
-        AddLog_P2(LOG_LEVEL_INFO,PSTR("NRF24L01+ detected"));
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool Xdrv33(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    result = NRF24Detect();
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
-#ifdef USE_I2C
-#ifdef USE_WEMOS_MOTOR_V1
-# 45 "S:/Development/Tasmota/tasmota/xdrv_34_wemos_motor_v1.ino"
-#define XDRV_34 34
-#define XI2C_44 44
-
-#ifndef WEMOS_MOTOR_V1_ADDR
-#define WEMOS_MOTOR_V1_ADDR 0x30
-#endif
-#ifndef WEMOS_MOTOR_V1_FREQ
-#define WEMOS_MOTOR_V1_FREQ 1000
-#endif
-
-#define MOTOR_A 0
-#define MOTOR_B 1
-
-#define SHORT_BRAKE 0
-#define CCW 1
-#define CW 2
-#define STOP 3
-#define STANDBY 4
-
-struct WMOTORV1 {
-  bool detected = false;
-  uint8_t motor;
-} WMotorV1;
-
-void WMotorV1Detect(void)
-{
-  if (I2cSetDevice(WEMOS_MOTOR_V1_ADDR)) {
-    WMotorV1.detected = true;
-    I2cSetActiveFound(WEMOS_MOTOR_V1_ADDR, "WEMOS_MOTOR_V1");
-    WMotorV1Reset();
-  }
-}
-
-void WMotorV1Reset(void)
-{
-
-  WMotorV1SetFrequency(WEMOS_MOTOR_V1_FREQ);
-}
-
-void WMotorV1SetFrequency(uint32_t freq)
-{
-  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
-  Wire.write(((byte)(freq >> 16)) & (byte)0x0f);
-  Wire.write((byte)(freq >> 16));
-  Wire.write((byte)(freq >> 8));
-  Wire.write((byte)freq);
-  Wire.endTransmission();
-
-}
-
-void WMotorV1SetMotor(uint8_t motor, uint8_t dir, float pwm_val)
-{
-  Wire.beginTransmission(WEMOS_MOTOR_V1_ADDR);
-  Wire.write(motor | (byte)0x10);
-  Wire.write(dir);
-
-  uint16_t _pwm_val = uint16_t(pwm_val * 100);
-  if (_pwm_val > 10000) {
-    _pwm_val = 10000;
-  }
-
-  Wire.write((byte)(_pwm_val >> 8));
-  Wire.write((byte)_pwm_val);
-  Wire.endTransmission();
-
-}
-
-bool WMotorV1Command(void)
-{
-  uint8_t args_count = 0;
-
-  if (XdrvMailbox.data_len > 0) {
-    args_count = 1;
-  } else {
-    return false;
-  }
-
-  for (uint32_t idx = 0; idx < XdrvMailbox.data_len; idx++) {
-    if (' ' == XdrvMailbox.data[idx]) {
-      XdrvMailbox.data[idx] = ',';
-    }
-    if (',' == XdrvMailbox.data[idx]) {
-      args_count++;
-    }
-  }
-  UpperCase(XdrvMailbox.data, XdrvMailbox.data);
-
-  char *command = strtok(XdrvMailbox.data, ",");
-
-  if (strcmp(command, "RESET") == 0) {
-    WMotorV1Reset();
-    Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"RESET\":\"OK\"}}"));
-    return true;
-  }
-
-  if (strcmp(command, "SETMOTOR") == 0) {
-    if (args_count >= 3) {
-
-      int motor = atoi(strtok(NULL, ","));
-      int dir = atoi(strtok(NULL, ","));
-      int duty = 100;
-      if (args_count == 4) {
-        duty = atoi(strtok(NULL, ","));
-      }
-
-      WMotorV1SetMotor(motor, dir, duty);
-      Response_P(PSTR("{\"WEMOS_MOTOR_V1\":{\"SETMOTOR\":\"OK\"}}"));
-      return true;
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool Xdrv34(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_44)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    WMotorV1Detect();
-  }
-  else if (WMotorV1.detected) {
-    switch (function) {
-      case FUNC_COMMAND_DRIVER:
-        if (XI2C_44 == XdrvMailbox.index) {
-          result = WMotorV1Command();
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
-# 22 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
-#ifdef DEBUG_THEO
-#ifndef USE_DEBUG_DRIVER
-#define USE_DEBUG_DRIVER 
-#endif
-#endif
-
-#ifdef USE_DEBUG_DRIVER
-
-
-
-
-
-
-#define XDRV_99 99
-
-#ifndef CPU_LOAD_CHECK
-#define CPU_LOAD_CHECK 1
-#endif
-
-
-
-
-
-#define D_CMND_CFGDUMP "CfgDump"
-#define D_CMND_CFGPEEK "CfgPeek"
-#define D_CMND_CFGPOKE "CfgPoke"
-#define D_CMND_CFGSHOW "CfgShow"
-#define D_CMND_CFGXOR "CfgXor"
-#define D_CMND_CPUCHECK "CpuChk"
-#define D_CMND_EXCEPTION "Exception"
-#define D_CMND_FLASHDUMP "FlashDump"
-#define D_CMND_FLASHMODE "FlashMode"
-#define D_CMND_FREEMEM "FreeMem"
-#define D_CMND_HELP "Help"
-#define D_CMND_RTCDUMP "RtcDump"
-#define D_CMND_SETSENSOR "SetSensor"
-#define D_CMND_I2CWRITE "I2CWrite"
-#define D_CMND_I2CREAD "I2CRead"
-#define D_CMND_I2CSTRETCH "I2CStretch"
-#define D_CMND_I2CCLOCK "I2CClock"
-
-const char kDebugCommands[] PROGMEM = "|"
-  D_CMND_CFGDUMP "|" D_CMND_CFGPEEK "|" D_CMND_CFGPOKE "|"
-#ifdef USE_WEBSERVER
-  D_CMND_CFGXOR "|"
-#endif
-  D_CMND_CPUCHECK "|"
-#ifdef DEBUG_THEO
-  D_CMND_EXCEPTION "|"
-#endif
-  D_CMND_FLASHDUMP "|" D_CMND_FLASHMODE "|" D_CMND_FREEMEM"|" D_CMND_HELP "|" D_CMND_RTCDUMP "|" D_CMND_SETSENSOR "|"
-#ifdef USE_I2C
-  D_CMND_I2CWRITE "|" D_CMND_I2CREAD "|" D_CMND_I2CSTRETCH "|" D_CMND_I2CCLOCK
-#endif
-  ;
-
-void (* const DebugCommand[])(void) PROGMEM = {
-  &CmndCfgDump, &CmndCfgPeek, &CmndCfgPoke,
-#ifdef USE_WEBSERVER
-  &CmndCfgXor,
-#endif
-  &CmndCpuCheck,
-#ifdef DEBUG_THEO
-  &CmndException,
-#endif
-  &CmndFlashDump, &CmndFlashMode, &CmndFreemem, &CmndHelp, &CmndRtcDump, &CmndSetSensor,
-#ifdef USE_I2C
-  &CmndI2cWrite, &CmndI2cRead, &CmndI2cStretch, &CmndI2cClock
-#endif
-  };
-
-uint32_t CPU_loops = 0;
-uint32_t CPU_last_millis = 0;
-uint32_t CPU_last_loop_time = 0;
-uint8_t CPU_load_check = 0;
-uint8_t CPU_show_freemem = 0;
-
-
-
-#ifdef DEBUG_THEO
-void ExceptionTest(uint8_t type)
-{
-# 145 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
-  if (1 == type) {
-    char svalue[10];
-    snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7);
-  }
-# 159 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
-  if (2 == type) {
-    while(1) delay(1000);
-  }
-}
-
-#endif
-
-
-
-void CpuLoadLoop(void)
-{
-  CPU_last_loop_time = millis();
-  if (CPU_load_check && CPU_last_millis) {
-    CPU_loops ++;
-    if ((CPU_last_millis + (CPU_load_check *1000)) <= CPU_last_loop_time) {
-#if defined(F_CPU) && (F_CPU == 160000000L)
-      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *800) );
-      CPU_loops = CPU_loops / CPU_load_check;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(160MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
-#else
-      int CPU_load = 100 - ( (CPU_loops*(1 + 30*sleep)) / (CPU_load_check *400) );
-      CPU_loops = CPU_loops / CPU_load_check;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, CPU %d%%(80MHz), Loops/sec %d"), ESP.getFreeHeap(), CPU_load, CPU_loops);
-#endif
-      CPU_last_millis = CPU_last_loop_time;
-      CPU_loops = 0;
-    }
-  }
-}
-
-
-
-#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1)
-
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t g_cont;
-}
-
-void DebugFreeMem(void)
-{
-  register uint32_t *sp asm("a1");
-
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_cont.stack), XdrvMailbox.data);
-}
-
-#else
-
-
-
-
-extern "C" {
-#include <cont.h>
-  extern cont_t* g_pcont;
-}
-
-void DebugFreeMem(void)
-{
-  register uint32_t *sp asm("a1");
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), ESP.getFreeHeap(), 4 * (sp - g_pcont->stack), XdrvMailbox.data);
-}
-
-#endif
-
-
-
-void DebugRtcDump(char* parms)
-{
-  #define CFG_COLS 16
-
-  uint16_t idx;
-  uint16_t maxrow;
-  uint16_t row;
-  uint16_t col;
-  char *p;
-# 246 "S:/Development/Tasmota/tasmota/xdrv_99_debug.ino"
-  uint8_t buffer[768];
-
-  system_rtc_mem_read(0, (uint32_t*)&buffer, sizeof(buffer));
-
-  maxrow = ((sizeof(buffer)+CFG_COLS)/CFG_COLS);
-
-  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
-  uint16_t mrow = strtol(p, &p, 10);
-
-
-
-  if (0 == mrow) {
-    mrow = 8;
-  }
-  if (srow > maxrow) {
-    srow = maxrow - mrow;
-  }
-  if (mrow < (maxrow - srow)) {
-    maxrow = srow + mrow;
-  }
-
-  for (row = srow; row < maxrow; row++) {
-    idx = row * CFG_COLS;
-    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
-    for (col = 0; col < CFG_COLS; col++) {
-      if (!(col%4)) {
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
-      }
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-    for (col = 0; col < CFG_COLS; col++) {
-
-
-
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
-    AddLog(LOG_LEVEL_INFO);
-  }
-}
-
-
-
-void DebugCfgDump(char* parms)
-{
-  #define CFG_COLS 16
-
-  uint16_t idx;
-  uint16_t maxrow;
-  uint16_t row;
-  uint16_t col;
-  char *p;
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  maxrow = ((sizeof(SYSCFG)+CFG_COLS)/CFG_COLS);
-
-  uint16_t srow = strtol(parms, &p, 16) / CFG_COLS;
-  uint16_t mrow = strtol(p, &p, 10);
-
-
-
-  if (0 == mrow) {
-    mrow = 8;
-  }
-  if (srow > maxrow) {
-    srow = maxrow - mrow;
-  }
-  if (mrow < (maxrow - srow)) {
-    maxrow = srow + mrow;
-  }
-
-  for (row = srow; row < maxrow; row++) {
-    idx = row * CFG_COLS;
-    snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), idx);
-    for (col = 0; col < CFG_COLS; col++) {
-      if (!(col%4)) {
-        snprintf_P(log_data, sizeof(log_data), PSTR("%s "), log_data);
-      }
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[idx + col]);
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-    for (col = 0; col < CFG_COLS; col++) {
-
-
-
-      snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[idx + col] > 0x20) && (buffer[idx + col] < 0x7F)) ? (char)buffer[idx + col] : ' ');
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s|"), log_data);
-    AddLog(LOG_LEVEL_INFO);
-    delay(1);
-  }
-}
-
-void DebugCfgPeek(char* parms)
-{
-  char *p;
-
-  uint16_t address = strtol(parms, &p, 16);
-  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
-  address = (address >> 2) << 2;
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  uint8_t data8 = buffer[address];
-  uint16_t data16 = (buffer[address +1] << 8) + buffer[address];
-  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + data16;
-
-  snprintf_P(log_data, sizeof(log_data), PSTR("%03X:"), address);
-  for (uint32_t i = 0; i < 4; i++) {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, buffer[address +i]);
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s |"), log_data);
-  for (uint32_t i = 0; i < 4; i++) {
-    snprintf_P(log_data, sizeof(log_data), PSTR("%s%c"), log_data, ((buffer[address +i] > 0x20) && (buffer[address +i] < 0x7F)) ? (char)buffer[address +i] : ' ');
-  }
-  snprintf_P(log_data, sizeof(log_data), PSTR("%s| 0x%02X (%d), 0x%04X (%d), 0x%0LX (%lu)"), log_data, data8, data8, data16, data16, data32, data32);
-  AddLog(LOG_LEVEL_INFO);
-}
-
-void DebugCfgPoke(char* parms)
-{
-  char *p;
-
-  uint16_t address = strtol(parms, &p, 16);
-  if (address > sizeof(SYSCFG)) address = sizeof(SYSCFG) -4;
-  address = (address >> 2) << 2;
-
-  uint32_t data = strtol(p, &p, 16);
-
-  uint8_t *buffer = (uint8_t *) &Settings;
-  uint32_t data32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
-
-  uint8_t *nbuffer = (uint8_t *) &data;
-  for (uint32_t i = 0; i < 4; i++) { buffer[address +i] = nbuffer[+i]; }
-
-  uint32_t ndata32 = (buffer[address +3] << 24) + (buffer[address +2] << 16) + (buffer[address +1] << 8) + buffer[address];
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("%03X: 0x%0LX (%lu) poked to 0x%0LX (%lu)"), address, data32, data32, ndata32, ndata32);
-}
-
-void SetFlashMode(uint8_t mode)
-{
-  uint8_t *_buffer;
-  uint32_t address;
-
-  address = 0;
-  _buffer = new uint8_t[FLASH_SECTOR_SIZE];
-
-  if (ESP.flashRead(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE)) {
-    if (_buffer[2] != mode) {
-      _buffer[2] = mode;
-      if (ESP.flashEraseSector(address / FLASH_SECTOR_SIZE)) {
-        ESP.flashWrite(address, (uint32_t*)_buffer, FLASH_SECTOR_SIZE);
-      }
-    }
-  }
-  delete[] _buffer;
-}
-
-
-
-
-
-void CmndHelp(void)
-{
-  AddLog_P(LOG_LEVEL_INFO, PSTR("HLP: "), kDebugCommands);
-  ResponseCmndDone();
-}
-
-void CmndRtcDump(void)
-{
-  DebugRtcDump(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgDump(void)
-{
-  DebugCfgDump(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgPeek(void)
-{
-  DebugCfgPeek(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-void CmndCfgPoke(void)
-{
-  DebugCfgPoke(XdrvMailbox.data);
-  ResponseCmndDone();
-}
-
-#ifdef USE_WEBSERVER
-void CmndCfgXor(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    Web.config_xor_on_set = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Web.config_xor_on_set);
-}
-#endif
-
-#ifdef DEBUG_THEO
-void CmndException(void)
-{
-  if (XdrvMailbox.data_len > 0) { ExceptionTest(XdrvMailbox.payload); }
-  ResponseCmndDone();
-}
-#endif
-
-void CmndCpuCheck(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    CPU_load_check = XdrvMailbox.payload;
-    CPU_last_millis = CPU_last_loop_time;
-  }
-  ResponseCmndNumber(CPU_load_check);
-}
-
-void CmndFreemem(void)
-{
-  if (XdrvMailbox.data_len > 0) {
-    CPU_show_freemem = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(CPU_show_freemem);
-}
-
-void CmndSetSensor(void)
-{
-  if (XdrvMailbox.index < MAX_XSNS_DRIVERS) {
-    if (XdrvMailbox.payload >= 0) {
-      bitWrite(Settings.sensors[XdrvMailbox.index / 32], XdrvMailbox.index % 32, XdrvMailbox.payload &1);
-      if (1 == XdrvMailbox.payload) {
-        restart_flag = 2;
-      }
-    }
-    Response_P(PSTR("{\"" D_CMND_SETSENSOR "\":"));
-    XsnsSensorState();
-    ResponseJsonEnd();
-  }
-}
-
-void CmndFlashMode(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 3)) {
-    SetFlashMode(XdrvMailbox.payload);
-  }
-  ResponseCmndNumber(ESP.getFlashChipMode());
-}
-
-uint32_t DebugSwap32(uint32_t x) {
- return ((x << 24) & 0xff000000 ) |
-  ((x << 8) & 0x00ff0000 ) |
-  ((x >> 8) & 0x0000ff00 ) |
-  ((x >> 24) & 0x000000ff );
-}
-
-void CmndFlashDump(void)
-{
-
-
-
-  const uint32_t flash_start = 0x40200000;
-  const uint8_t bytes_per_cols = 0x20;
-  const uint32_t max = (SPIFFS_END + 5) * SPI_FLASH_SEC_SIZE;
-
-  uint32_t start = flash_start;
-  uint32_t rows = 8;
-
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= (max - bytes_per_cols))) {
-    start += (XdrvMailbox.payload &0x7FFFFFFC);
-
-    char *p;
-    uint32_t is_payload = strtol(XdrvMailbox.data, &p, 16);
-    rows = strtol(p, &p, 10);
-    if (0 == rows) { rows = 8; }
-  }
-  uint32_t end = start + (rows * bytes_per_cols);
-  if ((end - flash_start) > max) {
-    end = flash_start + max;
-  }
-
-  for (uint32_t pos = start; pos < end; pos += bytes_per_cols) {
-    uint32_t* values = (uint32_t*)(pos);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("%06X:  %08X %08X %08X %08X  %08X %08X %08X %08X"), pos - flash_start,
-      DebugSwap32(values[0]), DebugSwap32(values[1]), DebugSwap32(values[2]), DebugSwap32(values[3]),
-      DebugSwap32(values[4]), DebugSwap32(values[5]), DebugSwap32(values[6]), DebugSwap32(values[7]));
-  }
-  ResponseCmndDone();
-}
-
-#ifdef USE_I2C
-void CmndI2cWrite(void)
-{
-
-  if (i2c_flg) {
-    char* parms = XdrvMailbox.data;
-    uint8_t buffer[100];
-    uint32_t index = 0;
-
-    char *p;
-    char *data = strtok_r(parms, " ,", &p);
-    while (data != NULL && index < sizeof(buffer)) {
-      buffer[index++] = strtol(data, nullptr, 16);
-      data = strtok_r(nullptr, " ,", &p);
-    }
-
-    if (index > 1) {
-      AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
-
-      Wire.beginTransmission(buffer[0]);
-      for (uint32_t i = 1; i < index; i++) {
-        Wire.write(buffer[i]);
-      }
-      int result = Wire.endTransmission();
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("I2C: Result %d"), result);
-    }
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cRead(void)
-{
-
-  if (i2c_flg) {
-    char* parms = XdrvMailbox.data;
-    uint8_t buffer[100];
-    uint32_t index = 0;
-
-    char *p;
-    char *data = strtok_r(parms, " ,", &p);
-    while (data != NULL && index < sizeof(buffer)) {
-      buffer[index++] = strtol(data, nullptr, 16);
-      data = strtok_r(nullptr, " ,", &p);
-    }
-
-    if (index > 0) {
-      uint8_t size = 1;
-      if (index > 1) {
-        size = buffer[1];
-      }
-      Wire.requestFrom(buffer[0], size);
-      index = 0;
-      while (Wire.available() && index < sizeof(buffer)) {
-        buffer[index++] = Wire.read();
-      }
-      if (index > 0) {
-        AddLogBuffer(LOG_LEVEL_INFO, buffer, index);
-      }
-    }
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cStretch(void)
-{
-  if (i2c_flg && (XdrvMailbox.payload > 0)) {
-    Wire.setClockStretchLimit(XdrvMailbox.payload);
-  }
-  ResponseCmndDone();
-}
-
-void CmndI2cClock(void)
-{
-  if (i2c_flg && (XdrvMailbox.payload > 0)) {
-    Wire.setClock(XdrvMailbox.payload);
-  }
-  ResponseCmndDone();
-}
-#endif
-
-
-
-
-
-bool Xdrv99(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      CpuLoadLoop();
-      break;
-    case FUNC_FREE_MEM:
-      if (CPU_show_freemem) { DebugFreeMem(); }
-      break;
-    case FUNC_PRE_INIT:
-      CPU_last_millis = millis();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kDebugCommands, DebugCommand);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdrv_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdrv_interface.ino"
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xdrv_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xdrv_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XDRV_01
-  &Xdrv01,
-#endif
-
-#ifdef XDRV_02
-  &Xdrv02,
-#endif
-
-#ifdef XDRV_03
-  &Xdrv03,
-#endif
-
-#ifdef XDRV_04
-  &Xdrv04,
-#endif
-
-#ifdef XDRV_05
-  &Xdrv05,
-#endif
-
-#ifdef XDRV_06
-  &Xdrv06,
-#endif
-
-#ifdef XDRV_07
-  &Xdrv07,
-#endif
-
-#ifdef XDRV_08
-  &Xdrv08,
-#endif
-
-#ifdef XDRV_09
-  &Xdrv09,
-#endif
-
-#ifdef XDRV_10
-  &Xdrv10,
-#endif
-
-#ifdef XDRV_11
-  &Xdrv11,
-#endif
-
-#ifdef XDRV_12
-  &Xdrv12,
-#endif
-
-#ifdef XDRV_13
-  &Xdrv13,
-#endif
-
-#ifdef XDRV_14
-  &Xdrv14,
-#endif
-
-#ifdef XDRV_15
-  &Xdrv15,
-#endif
-
-#ifdef XDRV_16
-  &Xdrv16,
-#endif
-
-#ifdef XDRV_17
-  &Xdrv17,
-#endif
-
-#ifdef XDRV_18
-  &Xdrv18,
-#endif
-
-#ifdef XDRV_19
-  &Xdrv19,
-#endif
-
-#ifdef XDRV_20
-  &Xdrv20,
-#endif
-
-#ifdef XDRV_21
-  &Xdrv21,
-#endif
-
-#ifdef XDRV_22
-  &Xdrv22,
-#endif
-
-#ifdef XDRV_23
-  &Xdrv23,
-#endif
-
-#ifdef XDRV_24
-  &Xdrv24,
-#endif
-
-#ifdef XDRV_25
-  &Xdrv25,
-#endif
-
-#ifdef XDRV_26
-  &Xdrv26,
-#endif
-
-#ifdef XDRV_27
-  &Xdrv27,
-#endif
-
-#ifdef XDRV_28
-  &Xdrv28,
-#endif
-
-#ifdef XDRV_29
-  &Xdrv29,
-#endif
-
-#ifdef XDRV_30
-  &Xdrv30,
-#endif
-
-#ifdef XDRV_31
-  &Xdrv31,
-#endif
-
-#ifdef XDRV_32
-  &Xdrv32,
-#endif
-
-#ifdef XDRV_33
-  &Xdrv33,
-#endif
-
-#ifdef XDRV_34
-  &Xdrv34,
-#endif
-
-#ifdef XDRV_35
-  &Xdrv35,
-#endif
-
-#ifdef XDRV_36
-  &Xdrv36,
-#endif
-
-#ifdef XDRV_37
-  &Xdrv37,
-#endif
-
-#ifdef XDRV_38
-  &Xdrv38,
-#endif
-
-#ifdef XDRV_39
-  &Xdrv39,
-#endif
-
-#ifdef XDRV_40
-  &Xdrv40,
-#endif
-
-#ifdef XDRV_41
-  &Xdrv41,
-#endif
-
-#ifdef XDRV_42
-  &Xdrv42,
-#endif
-
-#ifdef XDRV_43
-  &Xdrv43,
-#endif
-
-#ifdef XDRV_44
-  &Xdrv44,
-#endif
-
-#ifdef XDRV_45
-  &Xdrv45,
-#endif
-
-#ifdef XDRV_46
-  &Xdrv46,
-#endif
-
-#ifdef XDRV_47
-  &Xdrv47,
-#endif
-
-#ifdef XDRV_48
-  &Xdrv48,
-#endif
-
-#ifdef XDRV_49
-  &Xdrv49,
-#endif
-
-#ifdef XDRV_50
-  &Xdrv50,
-#endif
-
-#ifdef XDRV_51
-  &Xdrv51,
-#endif
-
-#ifdef XDRV_52
-  &Xdrv52,
-#endif
-
-#ifdef XDRV_53
-  &Xdrv53,
-#endif
-
-#ifdef XDRV_54
-  &Xdrv54,
-#endif
-
-#ifdef XDRV_55
-  &Xdrv55,
-#endif
-
-#ifdef XDRV_56
-  &Xdrv56,
-#endif
-
-#ifdef XDRV_57
-  &Xdrv57,
-#endif
-
-#ifdef XDRV_58
-  &Xdrv58,
-#endif
-
-#ifdef XDRV_59
-  &Xdrv59,
-#endif
-
-#ifdef XDRV_60
-  &Xdrv60,
-#endif
-
-#ifdef XDRV_61
-  &Xdrv61,
-#endif
-
-#ifdef XDRV_62
-  &Xdrv62,
-#endif
-
-#ifdef XDRV_63
-  &Xdrv63,
-#endif
-
-#ifdef XDRV_64
-  &Xdrv64,
-#endif
-
-#ifdef XDRV_65
-  &Xdrv65,
-#endif
-
-#ifdef XDRV_66
-  &Xdrv66,
-#endif
-
-#ifdef XDRV_67
-  &Xdrv67,
-#endif
-
-#ifdef XDRV_68
-  &Xdrv68,
-#endif
-
-#ifdef XDRV_69
-  &Xdrv69,
-#endif
-
-#ifdef XDRV_70
-  &Xdrv70,
-#endif
-
-#ifdef XDRV_71
-  &Xdrv71,
-#endif
-
-#ifdef XDRV_72
-  &Xdrv72,
-#endif
-
-#ifdef XDRV_73
-  &Xdrv73,
-#endif
-
-#ifdef XDRV_74
-  &Xdrv74,
-#endif
-
-#ifdef XDRV_75
-  &Xdrv75,
-#endif
-
-#ifdef XDRV_76
-  &Xdrv76,
-#endif
-
-#ifdef XDRV_77
-  &Xdrv77,
-#endif
-
-#ifdef XDRV_78
-  &Xdrv78,
-#endif
-
-#ifdef XDRV_79
-  &Xdrv79,
-#endif
-
-#ifdef XDRV_80
-  &Xdrv80,
-#endif
-
-#ifdef XDRV_81
-  &Xdrv81,
-#endif
-
-#ifdef XDRV_82
-  &Xdrv82,
-#endif
-
-#ifdef XDRV_83
-  &Xdrv83,
-#endif
-
-#ifdef XDRV_84
-  &Xdrv84,
-#endif
-
-#ifdef XDRV_85
-  &Xdrv85,
-#endif
-
-#ifdef XDRV_86
-  &Xdrv86,
-#endif
-
-#ifdef XDRV_87
-  &Xdrv87,
-#endif
-
-#ifdef XDRV_88
-  &Xdrv88,
-#endif
-
-#ifdef XDRV_89
-  &Xdrv89,
-#endif
-
-#ifdef XDRV_90
-  &Xdrv90,
-#endif
-
-#ifdef XDRV_91
-  &Xdrv91,
-#endif
-
-#ifdef XDRV_92
-  &Xdrv92,
-#endif
-
-#ifdef XDRV_93
-  &Xdrv93,
-#endif
-
-#ifdef XDRV_94
-  &Xdrv94,
-#endif
-
-#ifdef XDRV_95
-  &Xdrv95,
-#endif
-
-#ifdef XDRV_96
-  &Xdrv96,
-#endif
-
-#ifdef XDRV_97
-  &Xdrv97,
-#endif
-
-#ifdef XDRV_98
-  &Xdrv98,
-#endif
-
-#ifdef XDRV_99
-  &Xdrv99
-#endif
-};
-
-const uint8_t xdrv_present = sizeof(xdrv_func_ptr) / sizeof(xdrv_func_ptr[0]);
-
-
-
-
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kXdrvList[] PROGMEM = {
-#else
-const uint8_t kXdrvList[] = {
-#endif
-
-#ifdef XDRV_01
-  XDRV_01,
-#endif
-
-#ifdef XDRV_02
-  XDRV_02,
-#endif
-
-#ifdef XDRV_03
-  XDRV_03,
-#endif
-
-#ifdef XDRV_04
-  XDRV_04,
-#endif
-
-#ifdef XDRV_05
-  XDRV_05,
-#endif
-
-#ifdef XDRV_06
-  XDRV_06,
-#endif
-
-#ifdef XDRV_07
-  XDRV_07,
-#endif
-
-#ifdef XDRV_08
-  XDRV_08,
-#endif
-
-#ifdef XDRV_09
-  XDRV_09,
-#endif
-
-#ifdef XDRV_10
-  XDRV_10,
-#endif
-
-#ifdef XDRV_11
-  XDRV_11,
-#endif
-
-#ifdef XDRV_12
-  XDRV_12,
-#endif
-
-#ifdef XDRV_13
-  XDRV_13,
-#endif
-
-#ifdef XDRV_14
-  XDRV_14,
-#endif
-
-#ifdef XDRV_15
-  XDRV_15,
-#endif
-
-#ifdef XDRV_16
-  XDRV_16,
-#endif
-
-#ifdef XDRV_17
-  XDRV_17,
-#endif
-
-#ifdef XDRV_18
-  XDRV_18,
-#endif
-
-#ifdef XDRV_19
-  XDRV_19,
-#endif
-
-#ifdef XDRV_20
-  XDRV_20,
-#endif
-
-#ifdef XDRV_21
-  XDRV_21,
-#endif
-
-#ifdef XDRV_22
-  XDRV_22,
-#endif
-
-#ifdef XDRV_23
-  XDRV_23,
-#endif
-
-#ifdef XDRV_24
-  XDRV_24,
-#endif
-
-#ifdef XDRV_25
-  XDRV_25,
-#endif
-
-#ifdef XDRV_26
-  XDRV_26,
-#endif
-
-#ifdef XDRV_27
-  XDRV_27,
-#endif
-
-#ifdef XDRV_28
-  XDRV_28,
-#endif
-
-#ifdef XDRV_29
-  XDRV_29,
-#endif
-
-#ifdef XDRV_30
-  XDRV_30,
-#endif
-
-#ifdef XDRV_31
-  XDRV_31,
-#endif
-
-#ifdef XDRV_32
-  XDRV_32,
-#endif
-
-#ifdef XDRV_33
-  XDRV_33,
-#endif
-
-#ifdef XDRV_34
-  XDRV_34,
-#endif
-
-#ifdef XDRV_35
-  XDRV_35,
-#endif
-
-#ifdef XDRV_36
-  XDRV_36,
-#endif
-
-#ifdef XDRV_37
-  XDRV_37,
-#endif
-
-#ifdef XDRV_38
-  XDRV_38,
-#endif
-
-#ifdef XDRV_39
-  XDRV_39,
-#endif
-
-#ifdef XDRV_40
-  XDRV_40,
-#endif
-
-#ifdef XDRV_41
-  XDRV_41,
-#endif
-
-#ifdef XDRV_42
-  XDRV_42,
-#endif
-
-#ifdef XDRV_43
-  XDRV_43,
-#endif
-
-#ifdef XDRV_44
-  XDRV_44,
-#endif
-
-#ifdef XDRV_45
-  XDRV_45,
-#endif
-
-#ifdef XDRV_46
-  XDRV_46,
-#endif
-
-#ifdef XDRV_47
-  XDRV_47,
-#endif
-
-#ifdef XDRV_48
-  XDRV_48,
-#endif
-
-#ifdef XDRV_49
-  XDRV_49,
-#endif
-
-#ifdef XDRV_50
-  XDRV_50,
-#endif
-
-#ifdef XDRV_51
-  XDRV_51,
-#endif
-
-#ifdef XDRV_52
-  XDRV_52,
-#endif
-
-#ifdef XDRV_53
-  XDRV_53,
-#endif
-
-#ifdef XDRV_54
-  XDRV_54,
-#endif
-
-#ifdef XDRV_55
-  XDRV_55,
-#endif
-
-#ifdef XDRV_56
-  XDRV_56,
-#endif
-
-#ifdef XDRV_57
-  XDRV_57,
-#endif
-
-#ifdef XDRV_58
-  XDRV_58,
-#endif
-
-#ifdef XDRV_59
-  XDRV_59,
-#endif
-
-#ifdef XDRV_60
-  XDRV_60,
-#endif
-
-#ifdef XDRV_61
-  XDRV_61,
-#endif
-
-#ifdef XDRV_62
-  XDRV_62,
-#endif
-
-#ifdef XDRV_63
-  XDRV_63,
-#endif
-
-#ifdef XDRV_64
-  XDRV_64,
-#endif
-
-#ifdef XDRV_65
-  XDRV_65,
-#endif
-
-#ifdef XDRV_66
-  XDRV_66,
-#endif
-
-#ifdef XDRV_67
-  XDRV_67,
-#endif
-
-#ifdef XDRV_68
-  XDRV_68,
-#endif
-
-#ifdef XDRV_69
-  XDRV_69,
-#endif
-
-#ifdef XDRV_70
-  XDRV_70,
-#endif
-
-#ifdef XDRV_71
-  XDRV_71,
-#endif
-
-#ifdef XDRV_72
-  XDRV_72,
-#endif
-
-#ifdef XDRV_73
-  XDRV_73,
-#endif
-
-#ifdef XDRV_74
-  XDRV_74,
-#endif
-
-#ifdef XDRV_75
-  XDRV_75,
-#endif
-
-#ifdef XDRV_76
-  XDRV_76,
-#endif
-
-#ifdef XDRV_77
-  XDRV_77,
-#endif
-
-#ifdef XDRV_78
-  XDRV_78,
-#endif
-
-#ifdef XDRV_79
-  XDRV_79,
-#endif
-
-#ifdef XDRV_80
-  XDRV_80,
-#endif
-
-#ifdef XDRV_81
-  XDRV_81,
-#endif
-
-#ifdef XDRV_82
-  XDRV_82,
-#endif
-
-#ifdef XDRV_83
-  XDRV_83,
-#endif
-
-#ifdef XDRV_84
-  XDRV_84,
-#endif
-
-#ifdef XDRV_85
-  XDRV_85,
-#endif
-
-#ifdef XDRV_86
-  XDRV_86,
-#endif
-
-#ifdef XDRV_87
-  XDRV_87,
-#endif
-
-#ifdef XDRV_88
-  XDRV_88,
-#endif
-
-#ifdef XDRV_89
-  XDRV_89,
-#endif
-
-#ifdef XDRV_90
-  XDRV_90,
-#endif
-
-#ifdef XDRV_91
-  XDRV_91,
-#endif
-
-#ifdef XDRV_92
-  XDRV_92,
-#endif
-
-#ifdef XDRV_93
-  XDRV_93,
-#endif
-
-#ifdef XDRV_94
-  XDRV_94,
-#endif
-
-#ifdef XDRV_95
-  XDRV_95,
-#endif
-
-#ifdef XDRV_96
-  XDRV_96,
-#endif
-
-#ifdef XDRV_97
-  XDRV_97,
-#endif
-
-#ifdef XDRV_98
-  XDRV_98,
-#endif
-
-#ifdef XDRV_99
-  XDRV_99
-#endif
-};
-
-
-
-void XsnsDriverState(void)
-{
-  ResponseAppend_P(PSTR(",\"Drivers\":\""));
-  for (uint32_t i = 0; i < sizeof(kXdrvList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t driverid = pgm_read_byte(kXdrvList + i);
-#else
-    uint32_t driverid = kXdrvList[i];
-#endif
-    ResponseAppend_P(PSTR("%s%d"), (i) ? "," : "", driverid);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-
-
-bool XdrvRulesProcess(void)
-{
-  return XdrvCallDriver(10, FUNC_RULES_PROCESS);
-}
-
-#ifdef USE_DEBUG_DRIVER
-void ShowFreeMem(const char *where)
-{
-  char stemp[30];
-  snprintf_P(stemp, sizeof(stemp), where);
-  XdrvMailbox.data = stemp;
-  XdrvCall(FUNC_FREE_MEM);
-}
-#endif
-
-
-
-
-
-bool XdrvCallDriver(uint32_t driver, uint8_t Function)
-{
-  for (uint32_t x = 0; x < xdrv_present; x++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t listed = pgm_read_byte(kXdrvList + x);
-#else
-    uint32_t listed = kXdrvList[x];
-#endif
-    if (driver == listed) {
-      return xdrv_func_ptr[x](Function);
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool XdrvCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("DRV: %d"), Function);
-
-  for (uint32_t x = 0; x < xdrv_present; x++) {
-    result = xdrv_func_ptr[x](Function);
-
-    if (result && ((FUNC_COMMAND == Function) ||
-                   (FUNC_COMMAND_DRIVER == Function) ||
-                   (FUNC_MQTT_DATA == Function) ||
-                   (FUNC_RULES_PROCESS == Function) ||
-                   (FUNC_BUTTON_PRESSED == Function) ||
-                   (FUNC_SERIAL == Function) ||
-                   (FUNC_MODULE_INIT == Function) ||
-                   (FUNC_SET_CHANNELS == Function) ||
-                   (FUNC_PIN_STATE == Function) ||
-                   (FUNC_SET_DEVICE_POWER == Function)
-                  )) {
-      break;
-    }
-  }
-
-  return result;
-}
-# 1 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_LCD
-
-#define XDSP_01 1
-#define XI2C_03 3
-
-#define LCD_ADDRESS1 0x27
-#define LCD_ADDRESS2 0x3F
-
-#include <Wire.h>
-#include <LiquidCrystal_I2C.h>
-
-LiquidCrystal_I2C *lcd;
-
-
-
-void LcdInitMode(void)
-{
-  lcd->init();
-  lcd->clear();
-}
-
-void LcdInit(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      LcdInitMode();
-#ifdef USE_DISPLAY_MODES1TO5
-      DisplayClearScreenBuffer();
-#endif
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void LcdInitDriver(void)
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(LCD_ADDRESS1)) {
-      Settings.display_address[0] = LCD_ADDRESS1;
-      Settings.display_model = XDSP_01;
-    }
-    else if (I2cSetDevice(LCD_ADDRESS2)) {
-      Settings.display_address[0] = LCD_ADDRESS2;
-      Settings.display_model = XDSP_01;
-    }
-  }
-
-  if (XDSP_01 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "LCD");
-
-    Settings.display_width = Settings.display_cols[0];
-    Settings.display_height = Settings.display_rows;
-    lcd = new LiquidCrystal_I2C(Settings.display_address[0], Settings.display_cols[0], Settings.display_rows);
-
-#ifdef USE_DISPLAY_MODES1TO5
-    DisplayAllocScreenBuffer();
-#endif
-
-    LcdInitMode();
-  }
-}
-
-void LcdDrawStringAt(void)
-{
-  if (dsp_flag) {
-    dsp_x--;
-    dsp_y--;
-  }
-  lcd->setCursor(dsp_x, dsp_y);
-  lcd->print(dsp_str);
-}
-
-void LcdDisplayOnOff(uint8_t on)
-{
-  if (on) {
-    lcd->backlight();
-  } else {
-    lcd->noBacklight();
-  }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void LcdCenter(uint8_t row, char* txt)
-{
-  char line[Settings.display_cols[0] +2];
-
-  int len = strlen(txt);
-  int offset = 0;
-  if (len >= Settings.display_cols[0]) {
-    len = Settings.display_cols[0];
-  } else {
-    offset = (Settings.display_cols[0] - len) / 2;
-  }
-  memset(line, 0x20, Settings.display_cols[0]);
-  line[Settings.display_cols[0]] = 0;
-  for (uint32_t i = 0; i < len; i++) {
-    line[offset +i] = txt[i];
-  }
-  lcd->setCursor(0, row);
-  lcd->print(line);
-}
-
-bool LcdPrintLog(void)
-{
-  bool result = false;
-
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\337');
-    if (txt != nullptr) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      for (uint32_t i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        lcd->setCursor(0, i);
-        lcd->print(disp_screen_buffer[i +1]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      lcd->setCursor(0, last_row);
-      lcd->print(disp_screen_buffer[last_row]);
-
-      result = true;
-    }
-  }
-  return result;
-}
-
-void LcdTime(void)
-{
-  char line[Settings.display_cols[0] +1];
-
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  LcdCenter(0, line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  LcdCenter(1, line);
-}
-
-void LcdRefresh(void)
-{
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        LcdTime();
-        break;
-      case 2:
-      case 4:
-        LcdPrintLog();
-        break;
-      case 3:
-      case 5: {
-        if (!LcdPrintLog()) { LcdTime(); }
-        break;
-      }
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp01(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_03)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    LcdInitDriver();
-  }
-  else if (XDSP_01 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_INIT:
-        LcdInit(dsp_init);
-        break;
-      case FUNC_DISPLAY_POWER:
-        LcdDisplayOnOff(disp_power);
-        break;
-      case FUNC_DISPLAY_CLEAR:
-        lcd->clear();
-        break;
-# 238 "S:/Development/Tasmota/tasmota/xdsp_01_lcd.ino"
-      case FUNC_DISPLAY_DRAW_STRING:
-        LcdDrawStringAt();
-        break;
-      case FUNC_DISPLAY_ONOFF:
-        LcdDisplayOnOff(dsp_on);
-        break;
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        LcdRefresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_02_ssd1306.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_02_ssd1306.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SSD1306
-
-#define XDSP_02 2
-#define XI2C_04 4
-
-#define OLED_RESET 4
-
-#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
-
-#define OLED_ADDRESS1 0x3C
-#define OLED_ADDRESS2 0x3D
-
-#define OLED_BUFFER_COLS 40
-#define OLED_BUFFER_ROWS 16
-
-#define OLED_FONT_WIDTH 6
-#define OLED_FONT_HEIGTH 8
-
-#include <Wire.h>
-#include <renderer.h>
-#include <Adafruit_SSD1306.h>
-
-Adafruit_SSD1306 *oled1306;
-
-extern uint8_t *buffer;
-
-
-
-void SSD1306InitDriver(void)
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(OLED_ADDRESS1)) {
-      Settings.display_address[0] = OLED_ADDRESS1;
-      Settings.display_model = XDSP_02;
-    }
-    else if (I2cSetDevice(OLED_ADDRESS2)) {
-      Settings.display_address[0] = OLED_ADDRESS2;
-      Settings.display_model = XDSP_02;
-    }
-  }
-
-  if (XDSP_02 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "SSD1306");
-
-    if ((Settings.display_width != 64) && (Settings.display_width != 96) && (Settings.display_width != 128)) {
-      Settings.display_width = 128;
-    }
-    if ((Settings.display_height != 16) && (Settings.display_height != 32) && (Settings.display_height != 48) && (Settings.display_height != 64)) {
-      Settings.display_height = 64;
-    }
-
-    uint8_t reset_pin = -1;
-    if (pin[GPIO_OLED_RESET] < 99) {
-      reset_pin = pin[GPIO_OLED_RESET];
-    }
-
-
-    if (buffer) { free(buffer); }
-    buffer = (unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1);
-    if (!buffer) { return; }
-
-
-
-    oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin);
-    oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], reset_pin >= 0);
-    renderer = oled1306;
-    renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-    renderer->setTextFont(0);
-    renderer->setTextSize(2);
-    renderer->setCursor(20,20);
-    renderer->println(F("SSD1306"));
-    renderer->Updateframe();
-    renderer->DisplayOnff(1);
-#endif
-
-  }
-}
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void Ssd1306PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void Ssd1306Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(Settings.display_size);
-  renderer->setTextFont(Settings.display_font);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void Ssd1306Refresh(void)
-{
-  if (!renderer) return;
-
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        Ssd1306Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        Ssd1306PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp02(byte function)
-{
-  if (!I2cEnabled(XI2C_04)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    SSD1306InitDriver();
-  }
-  else if (XDSP_02 == Settings.display_model) {
-    switch (function) {
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        Ssd1306Refresh();
-        break;
-#endif
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_03_matrix.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_03_matrix.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_MATRIX
-
-#define XDSP_03 3
-#define XI2C_05 5
-
-#define MTX_MAX_SCREEN_BUFFER 80
-
-#include <Wire.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_LEDBackpack.h>
-
-Adafruit_8x8matrix *matrix[8];
-uint8_t mtx_matrices = 0;
-uint8_t mtx_state = 0;
-uint8_t mtx_counter = 0;
-int16_t mtx_x = 0;
-int16_t mtx_y = 0;
-
-
-char *mtx_buffer = nullptr;
-
-uint8_t mtx_mode = 0;
-uint8_t mtx_loop = 0;
-uint8_t mtx_done = 0;
-
-
-
-void MatrixWrite(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->writeDisplay();
-  }
-}
-
-void MatrixClear(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-  }
-  MatrixWrite();
-}
-
-void MatrixFixed(char* txt)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-    matrix[i]->setCursor(-i *8, 0);
-    matrix[i]->print(txt);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-  }
-  MatrixWrite();
-}
-
-void MatrixCenter(char* txt)
-{
-  int offset;
-
-  int len = strlen(txt);
-  offset = (len < 8) ? offset = ((mtx_matrices *8) - (len *6)) / 2 : 0;
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->clear();
-    matrix[i]->setCursor(-(i *8)+offset, 0);
-    matrix[i]->print(txt);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-  }
-  MatrixWrite();
-}
-
-void MatrixScrollLeft(char* txt, int loop)
-{
-  switch (mtx_state) {
-  case 1:
-    mtx_state = 2;
-
-    mtx_x = 8 * mtx_matrices;
-
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), txt);
-
-    disp_refresh = Settings.display_refresh;
-  case 2:
-  disp_refresh--;
-    if (!disp_refresh) {
-      disp_refresh = Settings.display_refresh;
-      for (uint32_t i = 0; i < mtx_matrices; i++) {
-        matrix[i]->clear();
-        matrix[i]->setCursor(mtx_x - i *8, 0);
-        matrix[i]->print(txt);
-        matrix[i]->setBrightness(Settings.display_dimmer);
-      }
-      MatrixWrite();
-
-      mtx_x--;
-      int16_t len = strlen(txt);
-      if (mtx_x < -(len *6)) { mtx_state = loop; }
-    }
-    break;
-  }
-}
-
-void MatrixScrollUp(char* txt, int loop)
-{
-  int wordcounter = 0;
-  char tmpbuf[200];
-  char *words[100];
-
-
-
-  char separators[] = " /";
-
-  switch (mtx_state) {
-  case 1:
-    mtx_state = 2;
-
-    mtx_y = 8;
-    mtx_counter = 0;
-    disp_refresh = Settings.display_refresh;
-  case 2:
-    disp_refresh--;
-    if (!disp_refresh) {
-      disp_refresh = Settings.display_refresh;
-      strlcpy(tmpbuf, txt, sizeof(tmpbuf));
-      char *p = strtok(tmpbuf, separators);
-      while (p != nullptr && wordcounter < 40) {
-        words[wordcounter++] = p;
-        p = strtok(nullptr, separators);
-      }
-      for (uint32_t i = 0; i < mtx_matrices; i++) {
-        matrix[i]->clear();
-        for (uint32_t j = 0; j < wordcounter; j++) {
-          matrix[i]->setCursor(-i *8, mtx_y + (j *8));
-          matrix[i]->println(words[j]);
-        }
-        matrix[i]->setBrightness(Settings.display_dimmer);
-      }
-      MatrixWrite();
-      if (((mtx_y %8) == 0) && mtx_counter) {
-        mtx_counter--;
-      } else {
-        mtx_y--;
-        mtx_counter = STATES * 1;
-      }
-      if (mtx_y < -(wordcounter *8)) { mtx_state = loop; }
-    }
-    break;
-  }
-}
-
-
-
-void MatrixInitMode(void)
-{
-  for (uint32_t i = 0; i < mtx_matrices; i++) {
-    matrix[i]->setRotation(Settings.display_rotate);
-    matrix[i]->setBrightness(Settings.display_dimmer);
-    matrix[i]->blinkRate(0);
-    matrix[i]->setTextWrap(false);
-
-
-    matrix[i]->cp437(true);
-  }
-  MatrixClear();
-}
-
-void MatrixInit(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      MatrixInitMode();
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void MatrixInitDriver(void)
-{
-  mtx_buffer = (char*)(malloc(MTX_MAX_SCREEN_BUFFER));
-  if (mtx_buffer != nullptr) {
-    if (!Settings.display_model) {
-      if (I2cSetDevice(Settings.display_address[1])) {
-        Settings.display_model = XDSP_03;
-      }
-    }
-
-    if (XDSP_03 == Settings.display_model) {
-      mtx_state = 1;
-      for (mtx_matrices = 0; mtx_matrices < 8; mtx_matrices++) {
-        if (Settings.display_address[mtx_matrices]) {
-          I2cSetActiveFound(Settings.display_address[mtx_matrices], "8x8Matrix");
-          matrix[mtx_matrices] = new Adafruit_8x8matrix();
-          matrix[mtx_matrices]->begin(Settings.display_address[mtx_matrices]);
-        } else {
-          break;
-        }
-      }
-
-      Settings.display_width = mtx_matrices * 8;
-      Settings.display_height = 8;
-
-      MatrixInitMode();
-    }
-  }
-}
-
-void MatrixOnOff(void)
-{
-  if (!disp_power) { MatrixClear(); }
-}
-
-void MatrixDrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  strlcpy(mtx_buffer, str, MTX_MAX_SCREEN_BUFFER);
-  mtx_mode = x &1;
-  mtx_loop = y &1;
-  if (!mtx_state) { mtx_state = 1; }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void MatrixPrintLog(uint8_t direction)
-{
-  char* txt = (!mtx_done) ? DisplayLogBuffer('\370') : mtx_buffer;
-  if (txt != nullptr) {
-    if (!mtx_state) { mtx_state = 1; }
-
-    if (!mtx_done) {
-
-      uint8_t space = 0;
-      uint8_t max_cols = (disp_log_buffer_cols < MTX_MAX_SCREEN_BUFFER) ? disp_log_buffer_cols : MTX_MAX_SCREEN_BUFFER;
-      mtx_buffer[0] = '\0';
-      uint8_t i = 0;
-      while ((txt[i] != '\0') && (i < max_cols)) {
-        if (txt[i] == ' ') {
-          space++;
-        } else {
-          space = 0;
-        }
-        if (space < 2) {
-          strncat(mtx_buffer, (const char*)txt +i, (strlen(mtx_buffer) < MTX_MAX_SCREEN_BUFFER -1) ? 1 : 0);
-        }
-        i++;
-      }
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), mtx_buffer);
-
-      mtx_done = 1;
-    }
-
-    if (direction) {
-      MatrixScrollUp(mtx_buffer, 0);
-    } else {
-      MatrixScrollLeft(mtx_buffer, 0);
-    }
-    if (!mtx_state) { mtx_done = 0; }
-  } else {
-    char disp_time[9];
-
-    snprintf_P(disp_time, sizeof(disp_time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-    MatrixFixed(disp_time);
-  }
-}
-
-#endif
-
-void MatrixRefresh(void)
-{
-  if (disp_power) {
-    switch (Settings.display_mode) {
-      case 0: {
-        switch (mtx_mode) {
-          case 0:
-            MatrixScrollLeft(mtx_buffer, mtx_loop);
-            break;
-          case 1:
-            MatrixScrollUp(mtx_buffer, mtx_loop);
-            break;
-        }
-        break;
-      }
-#ifdef USE_DISPLAY_MODES1TO5
-      case 2: {
-        char disp_date[9];
-        snprintf_P(disp_date, sizeof(disp_date), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%02d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year -2000);
-        MatrixFixed(disp_date);
-        break;
-      }
-      case 3: {
-        char disp_day[10];
-        snprintf_P(disp_day, sizeof(disp_day), PSTR("%d %s"), RtcTime.day_of_month, RtcTime.name_of_month);
-        MatrixCenter(disp_day);
-        break;
-      }
-      case 4:
-        MatrixPrintLog(0);
-        break;
-      case 1:
-      case 5:
-        MatrixPrintLog(1);
-        break;
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xdsp03(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_05)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    MatrixInitDriver();
-  }
-  else if (XDSP_03 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_INIT:
-        MatrixInit(dsp_init);
-        break;
-      case FUNC_DISPLAY_EVERY_50_MSECOND:
-        MatrixRefresh();
-        break;
-      case FUNC_DISPLAY_POWER:
-        MatrixOnOff();
-        break;
-      case FUNC_DISPLAY_DRAW_STRING:
-        MatrixDrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_04_ili9341.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_04_ili9341.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_ILI9341
-
-#define XDSP_04 4
-
-#define TFT_TOP 16
-#define TFT_BOTTOM 16
-#define TFT_FONT_WIDTH 6
-#define TFT_FONT_HEIGTH 8
-
-#include <SPI.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_ILI9341.h>
-
-Adafruit_ILI9341 *tft;
-
-uint16_t tft_scroll;
-
-
-
-void Ili9341InitMode(void)
-{
-  tft->setRotation(Settings.display_rotate);
-  tft->invertDisplay(0);
-  tft->fillScreen(ILI9341_BLACK);
-  tft->setTextWrap(false);
-  tft->cp437(true);
-  if (!Settings.display_mode) {
-    tft->setCursor(0, 0);
-    tft->setTextColor(ILI9341_WHITE, ILI9341_BLACK);
-    tft->setTextSize(1);
-  } else {
-    tft->setScrollMargins(TFT_TOP, TFT_BOTTOM);
-    tft->setCursor(0, 0);
-    tft->setTextColor(ILI9341_YELLOW, ILI9341_BLACK);
-    tft->setTextSize(2);
-
-
-    tft_scroll = TFT_TOP;
-  }
-}
-
-void Ili9341Init(uint8_t mode)
-{
-  switch(mode) {
-    case DISPLAY_INIT_MODE:
-      Ili9341InitMode();
-#ifdef USE_DISPLAY_MODES1TO5
-      if (Settings.display_rotate) {
-        DisplayClearScreenBuffer();
-      }
-#endif
-      break;
-    case DISPLAY_INIT_PARTIAL:
-    case DISPLAY_INIT_FULL:
-      break;
-  }
-}
-
-void Ili9341InitDriver(void)
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_04;
-  }
-
-  if (XDSP_04 == Settings.display_model) {
-    if (Settings.display_width != ILI9341_TFTWIDTH) {
-      Settings.display_width = ILI9341_TFTWIDTH;
-    }
-    if (Settings.display_height != ILI9341_TFTHEIGHT) {
-      Settings.display_height = ILI9341_TFTHEIGHT;
-    }
-    tft = new Adafruit_ILI9341(pin[GPIO_SPI_CS], pin[GPIO_SPI_DC]);
-    tft->begin();
-
-#ifdef USE_DISPLAY_MODES1TO5
-    if (Settings.display_rotate) {
-      DisplayAllocScreenBuffer();
-    }
-#endif
-
-    Ili9341InitMode();
-  }
-}
-
-void Ili9341Clear(void)
-{
-  tft->fillScreen(ILI9341_BLACK);
-  tft->setCursor(0, 0);
-}
-
-void Ili9341DrawStringAt(uint16_t x, uint16_t y, char *str, uint16_t color, uint8_t flag)
-{
-  uint16_t active_color = ILI9341_WHITE;
-
-  tft->setTextSize(Settings.display_size);
-  if (!flag) {
-    tft->setCursor(x, y);
-  } else {
-    tft->setCursor((x-1) * TFT_FONT_WIDTH * Settings.display_size, (y-1) * TFT_FONT_HEIGTH * Settings.display_size);
-  }
-  if (color) { active_color = color; }
-  tft->setTextColor(active_color, ILI9341_BLACK);
-  tft->println(str);
-}
-
-void Ili9341DisplayOnOff(uint8_t on)
-{
-
-
-  if (pin[GPIO_BACKLIGHT] < 99) {
-    pinMode(pin[GPIO_BACKLIGHT], OUTPUT);
-    digitalWrite(pin[GPIO_BACKLIGHT], on);
-  }
-}
-
-void Ili9341OnOff(void)
-{
-  Ili9341DisplayOnOff(disp_power);
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void Ili9341PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (Settings.display_rotate) {
-      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-    }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != nullptr) {
-      uint8_t size = Settings.display_size;
-      uint16_t theight = size * TFT_FONT_HEIGTH;
-
-      tft->setTextSize(size);
-      tft->setTextColor(ILI9341_CYAN, ILI9341_BLACK);
-      if (!Settings.display_rotate) {
-        tft->setCursor(0, tft_scroll);
-        tft->fillRect(0, tft_scroll, tft->width(), theight, ILI9341_BLACK);
-        tft->print(txt);
-        tft_scroll += theight;
-        if (tft_scroll >= (tft->height() - TFT_BOTTOM)) {
-          tft_scroll = TFT_TOP;
-        }
-        tft->scrollTo(tft_scroll);
-      } else {
-        uint8_t last_row = Settings.display_rows -1;
-
-        tft_scroll = theight;
-        tft->setCursor(0, tft_scroll);
-        for (uint32_t i = 0; i < last_row; i++) {
-          strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-
-          tft->print(disp_screen_buffer[i]);
-          tft_scroll += theight;
-          tft->setCursor(0, tft_scroll);
-          delay(1);
-        }
-        strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-        DisplayFillScreen(last_row);
-        tft->print(disp_screen_buffer[last_row]);
-      }
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
-    }
-  }
-}
-
-void Ili9341Refresh(void)
-{
-  if (Settings.display_mode) {
-    char tftdt[Settings.display_cols[0] +1];
-    char date4[11];
-    char space[Settings.display_cols[0] - 17];
-    char time[9];
-
-    tft->setTextSize(2);
-    tft->setTextColor(ILI9341_YELLOW, ILI9341_RED);
-    tft->setCursor(0, 0);
-
-    snprintf_P(date4, sizeof(date4), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-    memset(space, 0x20, sizeof(space));
-    space[sizeof(space) -1] = '\0';
-    snprintf_P(time, sizeof(time), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-    snprintf_P(tftdt, sizeof(tftdt), PSTR("%s%s%s"), date4, space, time);
-
-    tft->print(tftdt);
-
-    switch (Settings.display_mode) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        Ili9341PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp04(uint8_t function)
-{
-  bool result = false;
-
-  if (spi_flg) {
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      Ili9341InitDriver();
-    }
-    else if (XDSP_04 == Settings.display_model) {
-
-      if (!dsp_color) { dsp_color = ILI9341_WHITE; }
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-        case FUNC_DISPLAY_INIT:
-          Ili9341Init(dsp_init);
-          break;
-        case FUNC_DISPLAY_POWER:
-          Ili9341OnOff();
-          break;
-        case FUNC_DISPLAY_CLEAR:
-          Ili9341Clear();
-          break;
-        case FUNC_DISPLAY_DRAW_HLINE:
-          tft->writeFastHLine(dsp_x, dsp_y, dsp_len, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_VLINE:
-          tft->writeFastVLine(dsp_x, dsp_y, dsp_len, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_LINE:
-          tft->writeLine(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_CIRCLE:
-          tft->drawCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
-          break;
-        case FUNC_DISPLAY_FILL_CIRCLE:
-          tft->fillCircle(dsp_x, dsp_y, dsp_rad, dsp_color);
-          break;
-        case FUNC_DISPLAY_DRAW_RECTANGLE:
-          tft->drawRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-        case FUNC_DISPLAY_FILL_RECTANGLE:
-          tft->fillRect(dsp_x, dsp_y, dsp_x2, dsp_y2, dsp_color);
-          break;
-
-
-
-        case FUNC_DISPLAY_TEXT_SIZE:
-          tft->setTextSize(Settings.display_size);
-          break;
-        case FUNC_DISPLAY_FONT_SIZE:
-
-          break;
-        case FUNC_DISPLAY_DRAW_STRING:
-          Ili9341DrawStringAt(dsp_x, dsp_y, dsp_str, dsp_color, dsp_flag);
-          break;
-        case FUNC_DISPLAY_ONOFF:
-          Ili9341DisplayOnOff(dsp_on);
-          break;
-        case FUNC_DISPLAY_ROTATION:
-          tft->setRotation(Settings.display_rotate);
-          break;
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          Ili9341Refresh();
-          break;
-#endif
-      }
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER_29
-
-#define XDSP_05 5
-
-#define EPD_TOP 12
-#define EPD_FONT_HEIGTH 12
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-
-#define USE_TINY_FONT 
-
-#include <epd2in9.h>
-#include <epdpaint.h>
-
-
-extern uint8_t *buffer;
-uint16_t epd_scroll;
-
-Epd *epd;
-
-
-
-void EpdInitDriver29()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_05;
-  }
-
-  if (XDSP_05 == Settings.display_model) {
-    if (Settings.display_width != EPD_WIDTH) {
-      Settings.display_width = EPD_WIDTH;
-    }
-    if (Settings.display_height != EPD_HEIGHT) {
-      Settings.display_height = EPD_HEIGHT;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((EPD_WIDTH * EPD_HEIGHT) / 8,1);
-    if (!buffer) return;
-
-
-    epd = new Epd(EPD_WIDTH,EPD_HEIGHT);
-
-
-    if ((pin[GPIO_SPI_CS] < 99) && (pin[GPIO_SPI_CLK] < 99) && (pin[GPIO_SPI_MOSI] < 99)) {
-      epd->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: HardSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SPI_CS], pin[GPIO_SPI_CLK], pin[GPIO_SPI_MOSI]);
-    }
-    else if ((pin[GPIO_SSPI_CS] < 99) && (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_MOSI] < 99)) {
-      epd->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("EPD: SoftSPI CS %d, CLK %d, MOSI %d"),pin[GPIO_SSPI_CS], pin[GPIO_SSPI_SCLK], pin[GPIO_SSPI_MOSI]);
-    } else {
-      free(buffer);
-      return;
-    }
-
-    renderer = epd;
-    epd->Init(DISPLAY_INIT_FULL);
-    epd->Init(DISPLAY_INIT_PARTIAL);
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(1);
-    renderer->DrawStringAt(50, 50, "Waveshare E-Paper Display!", COLORED,0);
-    renderer->Updateframe();
-    delay(1000);
-    renderer->fillScreen(0);
-#endif
-
-  }
-}
-
-
-
-
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-#define EPD_FONT_HEIGTH 12
-void EpdPrintLog29(void)
-{
-
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-
-      if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-
-    char* txt = DisplayLogBuffer('\040');
-    if (txt != nullptr) {
-      uint8_t size = Settings.display_size;
-      uint16_t theight = size * EPD_FONT_HEIGTH;
-
-      renderer->setTextFont(size);
-      uint8_t last_row = Settings.display_rows -1;
-
-
-      epd_scroll = 0;
-      for (uint32_t i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[i], COLORED, 0);
-        epd_scroll += theight;
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-      renderer->DrawStringAt(0, epd_scroll, disp_screen_buffer[last_row], COLORED, 0);
-
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION "[%s]"), txt);
-    }
-  }
-}
-
-void EpdRefresh29(void)
-{
-  if (Settings.display_mode) {
-
-    if (!renderer) return;
-# 165 "S:/Development/Tasmota/tasmota/xdsp_05_epaper_29.ino"
-    switch (Settings.display_mode) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        EpdPrintLog29();
-        renderer->Updateframe();
-        break;
-    }
-
-
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp05(uint8_t function)
-{
-  bool result = false;
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      EpdInitDriver29();
-    }
-    else if (XDSP_05 == Settings.display_model) {
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          EpdRefresh29();
-          break;
-#endif
-      }
-    }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_06_epaper_42.ino"
-# 21 "S:/Development/Tasmota/tasmota/xdsp_06_epaper_42.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER_42
-
-#define XDSP_06 6
-
-#define COLORED42 1
-#define UNCOLORED42 0
-
-
-
-#define USE_TINY_FONT 
-
-#include <epd4in2.h>
-#include <epdpaint.h>
-
-extern uint8_t *buffer;
-
-Epd42 *epd42;
-
-
-
-
-void EpdInitDriver42()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_06;
-  }
-
-  if (XDSP_06 == Settings.display_model) {
-
-    if (Settings.display_width != EPD_WIDTH42) {
-      Settings.display_width = EPD_WIDTH42;
-    }
-    if (Settings.display_height != EPD_HEIGHT42) {
-      Settings.display_height = EPD_HEIGHT42;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((EPD_WIDTH42 * EPD_HEIGHT42) / 8,1);
-    if (!buffer) return;
-
-
-    epd42 = new Epd42(EPD_WIDTH42,EPD_HEIGHT42);
-
-    #ifdef USE_SPI
-        if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)) {
-          epd42->Begin(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-        } else {
-          free(buffer);
-          return;
-        }
-    #else
-        if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
-          epd42->Begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-        } else {
-          free(buffer);
-          return;
-        }
-    #endif
-
-    renderer = epd42;
-
-    epd42->Init();
-
-    renderer->fillScreen(0);
-
-
-    epd42->Init(DISPLAY_INIT_FULL);
-
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-    epd42->ClearFrame();
-    renderer->Updateframe();
-    delay(3000);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->DrawStringAt(50, 140, "Waveshare E-Paper!", COLORED42,0);
-    renderer->Updateframe();
-    delay(350);
-    renderer->fillScreen(0);
-#endif
-
-  }
-}
-
-
-
-
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void EpdRefresh42()
-{
-  if (Settings.display_mode) {
-
-  }
-}
-
-#endif
-
-
-
-
-
-
-bool Xdsp06(uint8_t function)
-{
-  bool result = false;
-
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      EpdInitDriver42();
-    }
-    else if (XDSP_06 == Settings.display_model) {
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-
-#ifdef USE_DISPLAY_MODES1TO5
-        case FUNC_DISPLAY_EVERY_SECOND:
-          EpdRefresh42();
-          break;
-#endif
-      }
-    }
-  return result;
-}
-
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_07_sh1106.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_07_sh1106.ino"
-#ifdef USE_I2C
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SH1106
-
-#define OLED_RESET 4
-
-#define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str);
-
-extern uint8_t *buffer;
-
-#define XDSP_07 7
-#define XI2C_06 6
-
-#define OLED_ADDRESS1 0x3C
-#define OLED_ADDRESS2 0x3D
-
-#define OLED_BUFFER_COLS 40
-#define OLED_BUFFER_ROWS 16
-
-#define OLED_FONT_WIDTH 6
-#define OLED_FONT_HEIGTH 8
-
-#include <Wire.h>
-#include <renderer.h>
-#include <Adafruit_SH1106.h>
-
-Adafruit_SH1106 *oled1106;
-
-
-
-
-void SH1106InitDriver()
-{
-  if (!Settings.display_model) {
-    if (I2cSetDevice(OLED_ADDRESS1)) {
-      Settings.display_address[0] = OLED_ADDRESS1;
-      Settings.display_model = XDSP_07;
-    }
-    else if (I2cSetDevice(OLED_ADDRESS2)) {
-      Settings.display_address[0] = OLED_ADDRESS2;
-      Settings.display_model = XDSP_07;
-    }
-  }
-
-  if (XDSP_07 == Settings.display_model) {
-    I2cSetActiveFound(Settings.display_address[0], "SH1106");
-
-    if (Settings.display_width != SH1106_LCDWIDTH) {
-      Settings.display_width = SH1106_LCDWIDTH;
-    }
-    if (Settings.display_height != SH1106_LCDHEIGHT) {
-      Settings.display_height = SH1106_LCDHEIGHT;
-    }
-
-
-    if (buffer) free(buffer);
-    buffer=(unsigned char*)calloc((SH1106_LCDWIDTH * SH1106_LCDHEIGHT) / 8,1);
-    if (!buffer) return;
-
-
-    oled1106 = new Adafruit_SH1106(SH1106_LCDWIDTH,SH1106_LCDHEIGHT);
-    renderer=oled1106;
-    renderer->Begin(SH1106_SWITCHCAPVCC, Settings.display_address[0],0);
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->setTextColor(1,0);
-
-#ifdef SHOW_SPLASH
-    renderer->setTextFont(0);
-    renderer->setTextSize(2);
-    renderer->setCursor(20,20);
-    renderer->println(F("SH1106"));
-    renderer->Updateframe();
-    renderer->DisplayOnff(1);
-#endif
-  }
-}
-
-
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void SH1106PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void SH1106Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(Settings.display_size);
-  renderer->setTextFont(Settings.display_font);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void SH1106Refresh(void)
-{
-  if (!renderer) return;
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        SH1106Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        SH1106PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xdsp07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_06)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-    SH1106InitDriver();
-  }
-  else if (XDSP_07 == Settings.display_model) {
-
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        SH1106Refresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_08_ILI9488.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_08_ILI9488.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_ILI9488
-
-#define XDSP_08 8
-#define XI2C_38 38
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-#define FT6236_address 0x38
-
-
-
-#define USE_TINY_FONT 
-
-
-#include <ILI9488.h>
-#include <FT6236.h>
-
-TouchLocation ili9488_pLoc;
-uint8_t ili9488_ctouch_counter = 0;
-
-
-#define BACKPLANE_PIN 2
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-ILI9488 *ili9488;
-
-#ifdef USE_TOUCH_BUTTONS
-extern VButton *buttons[];
-#endif
-
-extern const uint16_t picture[];
-uint8_t FT6236_found;
-
-
-
-void ILI9488_InitDriver()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_08;
-  }
-
-  if (XDSP_08 == Settings.display_model) {
-
-    if (Settings.display_width != ILI9488_TFTWIDTH) {
-      Settings.display_width = ILI9488_TFTWIDTH;
-    }
-    if (Settings.display_height != ILI9488_TFTHEIGHT) {
-      Settings.display_height = ILI9488_TFTHEIGHT;
-    }
-
-
-    buffer=NULL;
-
-
-    fg_color = ILI9488_WHITE;
-    bg_color = ILI9488_BLACK;
-
-    uint8_t bppin=BACKPLANE_PIN;
-    if (pin[GPIO_BACKLIGHT]<99) {
-      bppin=pin[GPIO_BACKLIGHT];
-    }
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
-      ili9488 = new ILI9488(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK],bppin);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)) {
-        ili9488 = new ILI9488(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK],bppin);
-      } else {
-        return;
-      }
-    }
-
-    SPI.begin();
-    ili9488->begin();
-    renderer = ili9488;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(ILI9488_WHITE,ILI9488_BLACK);
-    renderer->DrawStringAt(50, 50, "ILI9488 TFT Display!", ILI9488_WHITE,0);
-    delay(1000);
-
-
-#endif
-
-    color_type = COLOR_COLOR;
-
-
-    if (I2cEnabled(XI2C_38) && I2cSetDevice(FT6236_address)) {
-      FT6236begin(FT6236_address);
-      FT6236_found=1;
-      I2cSetActiveFound(FT6236_address, "FT6236");
-    } else {
-      FT6236_found=0;
-    }
-
-  }
-}
-
-#ifdef USE_TOUCH_BUTTONS
-void ILI9488_MQTT(uint8_t count,const char *cp) {
-  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
-  MqttPublishTeleSensor();
-}
-
-void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) {
-  buttons[count]->xdrawButton(pwr);
-  if (pwr) buttons[count]->vpower|=0x80;
-  else buttons[count]->vpower&=0x7f;
-}
-
-void FT6236Check() {
-uint16_t temp;
-uint8_t rbutt=0,vbutt=0;
-ili9488_ctouch_counter++;
-if (2 == ili9488_ctouch_counter) {
-
-  ili9488_ctouch_counter=0;
-  if (FT6236readTouchLocation(&ili9488_pLoc,1)) {
-
-    if (renderer) {
-      uint8_t rot=renderer->getRotation();
-      switch (rot) {
-        case 0:
-          temp=ili9488_pLoc.y;
-          ili9488_pLoc.y=renderer->height()-ili9488_pLoc.x;
-          ili9488_pLoc.x=temp;
-          break;
-        case 1:
-          break;
-        case 2:
-          break;
-        case 3:
-          temp=ili9488_pLoc.y;
-          ili9488_pLoc.y=ili9488_pLoc.x;
-          ili9488_pLoc.x=renderer->width()-temp;
-          break;
-      }
-
-      for (uint8_t count=0; count<MAXBUTTONS; count++) {
-        if (buttons[count]) {
-            uint8_t bflags=buttons[count]->vpower&0x7f;
-            if (buttons[count]->contains(ili9488_pLoc.x,ili9488_pLoc.y)) {
-
-                buttons[count]->press(true);
-                if (buttons[count]->justPressed()) {
-                  if (!bflags) {
-                    uint8_t pwr=bitRead(power,rbutt);
-                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
-                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
-                      ILI9488_RDW_BUTT(count,!pwr);
-                    }
-                  } else {
-
-                    const char *cp;
-                    if (bflags==1) {
-
-                      buttons[count]->vpower^=0x80;
-                      cp="TBT";
-                    } else {
-
-                      buttons[count]->vpower|=0x80;
-                      cp="PBT";
-                    }
-                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-                    ILI9488_MQTT(count,cp);
-                  }
-                }
-            }
-            if (!bflags) {
-              rbutt++;
-            } else {
-              vbutt++;
-            }
-        }
-      }
-    }
-  } else {
-
-    for (uint8_t count=0; count<MAXBUTTONS; count++) {
-      if (buttons[count]) {
-        uint8_t bflags=buttons[count]->vpower&0x7f;
-        buttons[count]->press(false);
-        if (buttons[count]->justReleased()) {
-          uint8_t bflags=buttons[count]->vpower&0x7f;
-          if (bflags>0) {
-            if (bflags>1) {
-
-              buttons[count]->vpower&=0x7f;
-              ILI9488_MQTT(count,"PBT");
-            }
-            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-          }
-        }
-        if (!bflags) {
-
-          uint8_t pwr=bitRead(power,rbutt);
-          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
-          if (pwr!=vpwr) {
-            ILI9488_RDW_BUTT(count,pwr);
-          }
-          rbutt++;
-        }
-      }
-    }
-    ili9488_pLoc.x=0;
-    ili9488_pLoc.y=0;
-  }
-}
-}
-#endif
-
-
-
-
-bool Xdsp08(uint8_t function)
-{
-  bool result = false;
-
-    if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      ILI9488_InitDriver();
-    }
-    else if (XDSP_08 == Settings.display_model) {
-
-      switch (function) {
-        case FUNC_DISPLAY_MODEL:
-          result = true;
-          break;
-        case FUNC_DISPLAY_EVERY_50_MSECOND:
-#ifdef USE_TOUCH_BUTTONS
-          if (FT6236_found) FT6236Check();
-#endif
-          break;
-      }
-    }
-
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_09_SSD1351.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_09_SSD1351.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_SSD1351
-
-#define XDSP_09 9
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-
-
-#define USE_TINY_FONT 
-
-#include <SSD1351.h>
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-SSD1351 *ssd1351;
-
-
-
-void SSD1351_InitDriver() {
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_09;
-  }
-
-  if (XDSP_09 == Settings.display_model) {
-
-    if (Settings.display_width != SSD1351_WIDTH) {
-      Settings.display_width = SSD1351_WIDTH;
-    }
-    if (Settings.display_height != SSD1351_HEIGHT) {
-      Settings.display_height = SSD1351_HEIGHT;
-    }
-
-    buffer=0;
-
-
-    fg_color = SSD1351_WHITE;
-    bg_color = SSD1351_BLACK;
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]<99) && (pin[GPIO_SSPI_SCLK]<99)){
-      ssd1351 = new SSD1351(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_SCLK]);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]<99) && (pin[GPIO_SPI_CLK]<99)){
-        ssd1351 = new SSD1351(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_CLK]);
-      } else {
-        return;
-      }
-    }
-
-    delay(100);
-    SPI.begin();
-    ssd1351->begin();
-    renderer = ssd1351;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->dim(Settings.display_dimmer);
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(SSD1351_WHITE,SSD1351_BLACK);
-    renderer->DrawStringAt(10, 60, "SSD1351", SSD1351_RED,0);
-    delay(1000);
-
-#endif
-    color_type = COLOR_COLOR;
-  }
-}
-
-#ifdef USE_DISPLAY_MODES1TO5
-
-void SSD1351PrintLog(void)
-{
-  disp_refresh--;
-  if (!disp_refresh) {
-    disp_refresh = Settings.display_refresh;
-    if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
-
-    char* txt = DisplayLogBuffer('\370');
-    if (txt != NULL) {
-      uint8_t last_row = Settings.display_rows -1;
-
-      renderer->clearDisplay();
-      renderer->setTextSize(Settings.display_size);
-      renderer->setCursor(0,0);
-      for (byte i = 0; i < last_row; i++) {
-        strlcpy(disp_screen_buffer[i], disp_screen_buffer[i +1], disp_screen_buffer_cols);
-        renderer->println(disp_screen_buffer[i]);
-      }
-      strlcpy(disp_screen_buffer[last_row], txt, disp_screen_buffer_cols);
-      DisplayFillScreen(last_row);
-
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "[%s]"), disp_screen_buffer[last_row]);
-
-      renderer->println(disp_screen_buffer[last_row]);
-      renderer->Updateframe();
-    }
-  }
-}
-
-void SSD1351Time(void)
-{
-  char line[12];
-
-  renderer->clearDisplay();
-  renderer->setTextSize(2);
-  renderer->setCursor(0, 0);
-  snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second);
-  renderer->println(line);
-  snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year);
-  renderer->println(line);
-  renderer->Updateframe();
-}
-
-void SSD1351Refresh(void)
-{
-  if (Settings.display_mode) {
-    switch (Settings.display_mode) {
-      case 1:
-        SSD1351Time();
-        break;
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        SSD1351PrintLog();
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-bool Xdsp09(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      SSD1351_InitDriver();
-  }
-  else if (XDSP_09 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-#ifdef USE_DISPLAY_MODES1TO5
-      case FUNC_DISPLAY_EVERY_SECOND:
-        SSD1351Refresh();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
-#ifdef USE_SPI
-#ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_RA8876
-
-#define XDSP_10 10
-#define XI2C_39 39
-
-#define COLORED 1
-#define UNCOLORED 0
-
-
-#define FT5316_address 0x38
-
-
-
-#define USE_TINY_FONT 
-
-#include <RA8876.h>
-#include <FT6236.h>
-
-TouchLocation ra8876_pLoc;
-uint8_t ra8876_ctouch_counter = 0;
-
-#ifdef USE_TOUCH_BUTTONS
-extern VButton *buttons[];
-#endif
-
-extern uint8_t *buffer;
-extern uint8_t color_type;
-RA8876 *ra8876;
-
-uint8_t FT5316_found;
-
-
-void RA8876_InitDriver()
-{
-  if (!Settings.display_model) {
-    Settings.display_model = XDSP_10;
-  }
-
-  if (XDSP_10 == Settings.display_model) {
-
-    if (Settings.display_width != RA8876_TFTWIDTH) {
-      Settings.display_width = RA8876_TFTWIDTH;
-    }
-    if (Settings.display_height != RA8876_TFTHEIGHT) {
-      Settings.display_height = RA8876_TFTHEIGHT;
-    }
-    buffer=0;
-
-
-    fg_color = RA8876_WHITE;
-    bg_color = RA8876_BLACK;
-
-
-    if ((pin[GPIO_SSPI_CS]<99) && (pin[GPIO_SSPI_MOSI]==13) && (pin[GPIO_SSPI_MISO]==12) && (pin[GPIO_SSPI_SCLK]==14)) {
-      ra8876 = new RA8876(pin[GPIO_SSPI_CS],pin[GPIO_SSPI_MOSI],pin[GPIO_SSPI_MISO],pin[GPIO_SSPI_SCLK],pin[GPIO_BACKLIGHT]);
-    } else {
-      if ((pin[GPIO_SPI_CS]<99) && (pin[GPIO_SPI_MOSI]==13) && (pin[GPIO_SPI_MISO]==12) && (pin[GPIO_SPI_CLK]==14)) {
-        ra8876 = new RA8876(pin[GPIO_SPI_CS],pin[GPIO_SPI_MOSI],pin[GPIO_SPI_MISO],pin[GPIO_SPI_CLK],pin[GPIO_BACKLIGHT]);
-      } else {
-        return;
-      }
-    }
-
-    ra8876->begin();
-    renderer = ra8876;
-    renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
-    renderer->dim(Settings.display_dimmer);
-
-
-#ifdef SHOW_SPLASH
-
-    renderer->setTextFont(2);
-    renderer->setTextColor(RA8876_WHITE,RA8876_BLACK);
-    renderer->DrawStringAt(600, 300, "RA8876", RA8876_RED,0);
-    delay(1000);
-
-#endif
-    color_type = COLOR_COLOR;
-
-    if (I2cEnabled(XI2C_39) && I2cSetDevice(FT5316_address)) {
-      FT6236begin(FT5316_address);
-      FT5316_found=1;
-      I2cSetActiveFound(FT5316_address, "FT5316");
-    } else {
-      FT5316_found=0;
-    }
-
-  }
-}
-
-#ifdef USE_TOUCH_BUTTONS
-void RA8876_MQTT(uint8_t count,const char *cp) {
-  ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
-  MqttPublishTeleSensor();
-}
-
-void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) {
-  buttons[count]->xdrawButton(pwr);
-  if (pwr) buttons[count]->vpower|=0x80;
-  else buttons[count]->vpower&=0x7f;
-}
-
-
-void FT5316Check() {
-uint16_t temp;
-uint8_t rbutt=0,vbutt=0;
-ra8876_ctouch_counter++;
-if (2 == ra8876_ctouch_counter) {
-
-  ra8876_ctouch_counter=0;
-
-  if (FT6236readTouchLocation(&ra8876_pLoc,1)) {
-    ra8876_pLoc.x=ra8876_pLoc.x*RA8876_TFTWIDTH/800;
-    ra8876_pLoc.y=ra8876_pLoc.y*RA8876_TFTHEIGHT/480;
-
-
-    if (renderer) {
-
-
-      ra8876_pLoc.x=RA8876_TFTWIDTH-ra8876_pLoc.x;
-      ra8876_pLoc.y=RA8876_TFTHEIGHT-ra8876_pLoc.y;
-# 170 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
-      for (uint8_t count=0; count<MAXBUTTONS; count++) {
-        if (buttons[count]) {
-            uint8_t bflags=buttons[count]->vpower&0x7f;
-            if (buttons[count]->contains(ra8876_pLoc.x,ra8876_pLoc.y)) {
-
-                buttons[count]->press(true);
-                if (buttons[count]->justPressed()) {
-                  if (!bflags) {
-
-                    uint8_t pwr=bitRead(power,rbutt);
-                    if (!SendKey(KEY_BUTTON, rbutt+1, POWER_TOGGLE)) {
-                      ExecuteCommandPower(rbutt+1, POWER_TOGGLE, SRC_BUTTON);
-                      RA8876_RDW_BUTT(count,!pwr);
-                    }
-                  } else {
-
-                    const char *cp;
-                    if (bflags==1) {
-
-                      buttons[count]->vpower^=0x80;
-                      cp="TBT";
-                    } else {
-
-                      buttons[count]->vpower|=0x80;
-                      cp="PBT";
-                    }
-                    buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-                    RA8876_MQTT(count,cp);
-                  }
-                }
-            }
-            if (!bflags) {
-              rbutt++;
-            } else {
-              vbutt++;
-            }
-        }
-      }
-    }
-  } else {
-
-    for (uint8_t count=0; count<MAXBUTTONS; count++) {
-      if (buttons[count]) {
-        uint8_t bflags=buttons[count]->vpower&0x7f;
-        buttons[count]->press(false);
-        if (buttons[count]->justReleased()) {
-          if (bflags>0) {
-            if (bflags>1) {
-
-              buttons[count]->vpower&=0x7f;
-              RA8876_MQTT(count,"PBT");
-            }
-            buttons[count]->xdrawButton(buttons[count]->vpower&0x80);
-          }
-        }
-        if (!bflags) {
-
-          uint8_t pwr=bitRead(power,rbutt);
-          uint8_t vpwr=(buttons[count]->vpower&0x80)>>7;
-          if (pwr!=vpwr) {
-            RA8876_RDW_BUTT(count,pwr);
-          }
-          rbutt++;
-        }
-      }
-    }
-    ra8876_pLoc.x=0;
-    ra8876_pLoc.y=0;
-  }
-}
-}
-#endif
-# 426 "S:/Development/Tasmota/tasmota/xdsp_10_RA8876.ino"
-bool Xdsp10(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_DISPLAY_INIT_DRIVER == function) {
-      RA8876_InitDriver();
-  }
-  else if (XDSP_10 == Settings.display_model) {
-    switch (function) {
-      case FUNC_DISPLAY_MODEL:
-        result = true;
-        break;
-      case FUNC_DISPLAY_EVERY_50_MSECOND:
-#ifdef USE_TOUCH_BUTTONS
-        if (FT5316_found) FT5316Check();
-#endif
-        break;
-    }
-  }
-  return result;
-}
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
-#ifdef USE_DISPLAY
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xdsp_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xdsp_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XDSP_01
-  &Xdsp01,
-#endif
-
-#ifdef XDSP_02
-  &Xdsp02,
-#endif
-
-#ifdef XDSP_03
-  &Xdsp03,
-#endif
-
-#ifdef XDSP_04
-  &Xdsp04,
-#endif
-
-#ifdef XDSP_05
-  &Xdsp05,
-#endif
-
-#ifdef XDSP_06
-  &Xdsp06,
-#endif
-
-#ifdef XDSP_07
-  &Xdsp07,
-#endif
-
-#ifdef XDSP_08
-  &Xdsp08,
-#endif
-
-#ifdef XDSP_09
-  &Xdsp09,
-#endif
-
-#ifdef XDSP_10
-  &Xdsp10,
-#endif
-
-#ifdef XDSP_11
-  &Xdsp11,
-#endif
-
-#ifdef XDSP_12
-  &Xdsp12,
-#endif
-
-#ifdef XDSP_13
-  &Xdsp13,
-#endif
-
-#ifdef XDSP_14
-  &Xdsp14,
-#endif
-
-#ifdef XDSP_15
-  &Xdsp15,
-#endif
-
-#ifdef XDSP_16
-  &Xdsp16
-#endif
-};
-
-const uint8_t xdsp_present = sizeof(xdsp_func_ptr) / sizeof(xdsp_func_ptr[0]);
-# 117 "S:/Development/Tasmota/tasmota/xdsp_interface.ino"
-uint8_t XdspPresent(void)
-{
-  return xdsp_present;
-}
-
-bool XdspCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("DSP: %d"), Function);
-
-  for (uint32_t x = 0; x < xdsp_present; x++) {
-    result = xdsp_func_ptr[x](Function);
-
-    if (result && (FUNC_DISPLAY_MODEL == Function)) {
-      break;
-    }
-  }
-
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
-#ifdef USE_LIGHT
-#ifdef USE_WS2812
-# 38 "S:/Development/Tasmota/tasmota/xlgt_01_ws2812.ino"
-#define XLGT_01 1
-
-const uint8_t WS2812_SCHEMES = 8;
-
-const char kWs2812Commands[] PROGMEM = "|"
-  D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH ;
-
-void (* const Ws2812Command[])(void) PROGMEM = {
-  &CmndLed, &CmndPixels, &CmndRotation, &CmndWidth };
-
-#include <NeoPixelBus.h>
-
-#if (USE_WS2812_CTYPE == NEO_GRB)
-  typedef NeoGrbFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_BRG)
-  typedef NeoBrgFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_RBG)
-  typedef NeoRbgFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_RGBW)
-  typedef NeoRgbwFeature selectedNeoFeatureType;
-#elif (USE_WS2812_CTYPE == NEO_GRBW)
-  typedef NeoGrbwFeature selectedNeoFeatureType;
-#else
-  typedef NeoRgbFeature selectedNeoFeatureType;
-#endif
-
-#ifdef USE_WS2812_DMA
-
-
-#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
-  typedef NeoEsp8266DmaWs2812xMethod selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
-  typedef NeoEsp8266DmaSk6812Method selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_APA106)
-  typedef NeoEsp8266DmaApa106Method selectedNeoSpeedType;
-#else
-  typedef NeoEsp8266Dma800KbpsMethod selectedNeoSpeedType;
-#endif
-
-#else
-
-
-#if (USE_WS2812_HARDWARE == NEO_HW_WS2812X)
-  typedef NeoEsp8266BitBangWs2812xMethod selectedNeoSpeedType;
-#elif (USE_WS2812_HARDWARE == NEO_HW_SK6812)
-  typedef NeoEsp8266BitBangSk6812Method selectedNeoSpeedType;
-#else
-  typedef NeoEsp8266BitBang800KbpsMethod selectedNeoSpeedType;
-#endif
-
-#endif
-
-NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType> *strip = nullptr;
-
-struct WsColor {
-  uint8_t red, green, blue;
-};
-
-struct ColorScheme {
-  WsColor* colors;
-  uint8_t count;
-};
-
-WsColor kIncandescent[2] = { 255,140,20, 0,0,0 };
-WsColor kRgb[3] = { 255,0,0, 0,255,0, 0,0,255 };
-WsColor kChristmas[2] = { 255,0,0, 0,255,0 };
-WsColor kHanukkah[2] = { 0,0,255, 255,255,255 };
-WsColor kwanzaa[3] = { 255,0,0, 0,0,0, 0,255,0 };
-WsColor kRainbow[7] = { 255,0,0, 255,128,0, 255,255,0, 0,255,0, 0,0,255, 128,0,255, 255,0,255 };
-WsColor kFire[3] = { 255,0,0, 255,102,0, 255,192,0 };
-ColorScheme kSchemes[WS2812_SCHEMES -1] = {
-  kIncandescent, 2,
-  kRgb, 3,
-  kChristmas, 2,
-  kHanukkah, 2,
-  kwanzaa, 3,
-  kRainbow, 7,
-  kFire, 3 };
-
-uint8_t kWidth[5] = {
-    1,
-    2,
-    4,
-    8,
-  255 };
-uint8_t kWsRepeat[5] = {
-    8,
-    6,
-    4,
-    2,
-    1 };
-
-struct WS2812 {
-  uint8_t show_next = 1;
-  uint8_t scheme_offset = 0;
-  bool suspend_update = false;
-} Ws2812;
-
-
-
-void Ws2812StripShow(void)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-#else
-  RgbColor c;
-#endif
-
-  if (Settings.light_correction) {
-    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-      c = strip->GetPixelColor(i);
-      c.R = ledGamma(c.R);
-      c.G = ledGamma(c.G);
-      c.B = ledGamma(c.B);
-#if (USE_WS2812_CTYPE > NEO_3LED)
-      c.W = ledGamma(c.W);
-#endif
-      strip->SetPixelColor(i, c);
-    }
-  }
-  strip->Show();
-}
-
-int mod(int a, int b)
-{
-   int ret = a % b;
-   if (ret < 0) ret += b;
-   return ret;
-}
-
-void Ws2812UpdatePixelColor(int position, struct WsColor hand_color, float offset)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor color;
-#else
-  RgbColor color;
-#endif
-
-  uint32_t mod_position = mod(position, (int)Settings.light_pixels);
-
-  color = strip->GetPixelColor(mod_position);
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  color.R = tmin(color.R + ((hand_color.red / dimmer) * offset), 255);
-  color.G = tmin(color.G + ((hand_color.green / dimmer) * offset), 255);
-  color.B = tmin(color.B + ((hand_color.blue / dimmer) * offset), 255);
-  strip->SetPixelColor(mod_position, color);
-}
-
-void Ws2812UpdateHand(int position, uint32_t index)
-{
-  uint32_t width = Settings.light_width;
-  if (index < WS_MARKER) { width = Settings.ws_width[index]; }
-  if (!width) { return; }
-
-  position = (position + Settings.light_rotation) % Settings.light_pixels;
-
-  if (Settings.flag.ws_clock_reverse) {
-    position = Settings.light_pixels -position;
-  }
-  WsColor hand_color = { Settings.ws_color[index][WS_RED], Settings.ws_color[index][WS_GREEN], Settings.ws_color[index][WS_BLUE] };
-
-  Ws2812UpdatePixelColor(position, hand_color, 1);
-
-  uint32_t range = ((width -1) / 2) +1;
-  for (uint32_t h = 1; h < range; h++) {
-    float offset = (float)(range - h) / (float)range;
-    Ws2812UpdatePixelColor(position -h, hand_color, offset);
-    Ws2812UpdatePixelColor(position +h, hand_color, offset);
-  }
-}
-
-void Ws2812Clock(void)
-{
-  strip->ClearTo(0);
-  int clksize = 60000 / (int)Settings.light_pixels;
-
-  Ws2812UpdateHand((RtcTime.second * 1000) / clksize, WS_SECOND);
-  Ws2812UpdateHand((RtcTime.minute * 1000) / clksize, WS_MINUTE);
-  Ws2812UpdateHand((((RtcTime.hour % 12) * 5000) + ((RtcTime.minute * 1000) / 12 )) / clksize, WS_HOUR);
-  if (Settings.ws_color[WS_MARKER][WS_RED] + Settings.ws_color[WS_MARKER][WS_GREEN] + Settings.ws_color[WS_MARKER][WS_BLUE]) {
-    for (uint32_t i = 0; i < 12; i++) {
-      Ws2812UpdateHand((i * 5000) / clksize, WS_MARKER);
-    }
-  }
-
-  Ws2812StripShow();
-}
-
-void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i)
-{
-
-
-
-
-  ColorScheme scheme = kSchemes[schemenr];
-  uint32_t curRange = i / range;
-  uint32_t rangeIndex = i % range;
-  uint32_t colorIndex = rangeIndex / gradRange;
-  uint32_t start = colorIndex;
-  uint32_t end = colorIndex +1;
-  if (curRange % 2 != 0) {
-    start = (scheme.count -1) - start;
-    end = (scheme.count -1) - end;
-  }
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  float fmyRed = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].red, scheme.colors[end].red) / dimmer;
-  float fmyGrn = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].green, scheme.colors[end].green) / dimmer;
-  float fmyBlu = (float)map(rangeIndex % gradRange, 0, gradRange, scheme.colors[start].blue, scheme.colors[end].blue) / dimmer;
-  mColor->red = (uint8_t)fmyRed;
-  mColor->green = (uint8_t)fmyGrn;
-  mColor->blue = (uint8_t)fmyBlu;
-}
-
-void Ws2812Gradient(uint32_t schemenr)
-{
-
-
-
-
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-  c.W = 0;
-#else
-  RgbColor c;
-#endif
-
-  ColorScheme scheme = kSchemes[schemenr];
-  if (scheme.count < 2) { return; }
-
-  uint32_t repeat = kWsRepeat[Settings.light_width];
-  uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat);
-  uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1));
-  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
-  uint32_t offset = speed > 0 ? Light.strip_timer_counter / speed : 0;
-
-  WsColor oldColor, currentColor;
-  Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset);
-  currentColor = oldColor;
-  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-    if (kWsRepeat[Settings.light_width] > 1) {
-      Ws2812GradientColor(schemenr, &currentColor, range, gradRange, i +offset);
-    }
-    if (Settings.light_speed > 0) {
-
-      c.R = map(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red);
-      c.G = map(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green);
-      c.B = map(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue);
-    }
-    else {
-
-      c.R = currentColor.red;
-      c.G = currentColor.green;
-      c.B = currentColor.blue;
-    }
-    strip->SetPixelColor(i, c);
-    oldColor = currentColor;
-  }
-  Ws2812StripShow();
-}
-
-void Ws2812Bars(uint32_t schemenr)
-{
-
-
-
-
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor c;
-  c.W = 0;
-#else
-  RgbColor c;
-#endif
-
-  ColorScheme scheme = kSchemes[schemenr];
-
-  uint32_t maxSize = Settings.light_pixels / scheme.count;
-  if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; }
-
-  uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
-  uint32_t offset = (speed > 0) ? Light.strip_timer_counter / speed : 0;
-
-  WsColor mcolor[scheme.count];
-  memcpy(mcolor, scheme.colors, sizeof(mcolor));
-  float dimmer = 100 / (float)Settings.light_dimmer;
-  for (uint32_t i = 0; i < scheme.count; i++) {
-    float fmyRed = (float)mcolor[i].red / dimmer;
-    float fmyGrn = (float)mcolor[i].green / dimmer;
-    float fmyBlu = (float)mcolor[i].blue / dimmer;
-    mcolor[i].red = (uint8_t)fmyRed;
-    mcolor[i].green = (uint8_t)fmyGrn;
-    mcolor[i].blue = (uint8_t)fmyBlu;
-  }
-  uint32_t colorIndex = offset % scheme.count;
-  for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-    if (maxSize) { colorIndex = ((i + offset) % (scheme.count * kWidth[Settings.light_width])) / kWidth[Settings.light_width]; }
-    c.R = mcolor[colorIndex].red;
-    c.G = mcolor[colorIndex].green;
-    c.B = mcolor[colorIndex].blue;
-    strip->SetPixelColor(i, c);
-  }
-  Ws2812StripShow();
-}
-
-void Ws2812Clear(void)
-{
-  strip->ClearTo(0);
-  strip->Show();
-  Ws2812.show_next = 1;
-}
-
-void Ws2812SetColor(uint32_t led, uint8_t red, uint8_t green, uint8_t blue, uint8_t white)
-{
-#if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor lcolor;
-  lcolor.W = white;
-#else
-  RgbColor lcolor;
-#endif
-
-  lcolor.R = red;
-  lcolor.G = green;
-  lcolor.B = blue;
-  if (led) {
-    strip->SetPixelColor(led -1, lcolor);
-  } else {
-
-    for (uint32_t i = 0; i < Settings.light_pixels; i++) {
-      strip->SetPixelColor(i, lcolor);
-    }
-  }
-
-  if (!Ws2812.suspend_update) {
-    strip->Show();
-    Ws2812.show_next = 1;
-  }
-}
-
-char* Ws2812GetColor(uint32_t led, char* scolor)
-{
-  uint8_t sl_ledcolor[4];
-
- #if (USE_WS2812_CTYPE > NEO_3LED)
-  RgbwColor lcolor = strip->GetPixelColor(led -1);
-  sl_ledcolor[3] = lcolor.W;
- #else
-  RgbColor lcolor = strip->GetPixelColor(led -1);
- #endif
-  sl_ledcolor[0] = lcolor.R;
-  sl_ledcolor[1] = lcolor.G;
-  sl_ledcolor[2] = lcolor.B;
-  scolor[0] = '\0';
-  for (uint32_t i = 0; i < Light.subtype; i++) {
-    if (Settings.flag.decimal_text) {
-      snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
-    } else {
-      snprintf_P(scolor, 25, PSTR("%s%02X"), scolor, sl_ledcolor[i]);
-    }
-  }
-  return scolor;
-}
-
-
-
-
-
-void Ws2812ForceSuspend (void)
-{
-  Ws2812.suspend_update = true;
-}
-
-void Ws2812ForceUpdate (void)
-{
-  Ws2812.suspend_update = false;
-  strip->Show();
-  Ws2812.show_next = 1;
-}
-
-
-
-bool Ws2812SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  Ws2812SetColor(0, cur_col[0], cur_col[1], cur_col[2], cur_col[3]);
-
-  return true;
-}
-
-void Ws2812ShowScheme(void)
-{
-  uint32_t scheme = Settings.light_scheme - Ws2812.scheme_offset;
-
-  switch (scheme) {
-    case 0:
-      if ((1 == state_250mS) || (Ws2812.show_next)) {
-        Ws2812Clock();
-        Ws2812.show_next = 0;
-      }
-      break;
-    default:
-      if (1 == Settings.light_fade) {
-        Ws2812Gradient(scheme -1);
-      } else {
-        Ws2812Bars(scheme -1);
-      }
-      Ws2812.show_next = 1;
-      break;
-  }
-}
-
-void Ws2812ModuleSelected(void)
-{
-  if (pin[GPIO_WS2812] < 99) {
-
-
-    strip = new NeoPixelBus<selectedNeoFeatureType, selectedNeoSpeedType>(WS2812_MAX_LEDS, pin[GPIO_WS2812]);
-    strip->Begin();
-
-    Ws2812Clear();
-
-    Ws2812.scheme_offset = Light.max_scheme +1;
-    Light.max_scheme += WS2812_SCHEMES;
-
-#if (USE_WS2812_CTYPE > NEO_3LED)
-    light_type = LT_RGBW;
-#else
-    light_type = LT_RGB;
-#endif
-    light_flg = XLGT_01;
-  }
-}
-
-
-
-void CmndLed(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= Settings.light_pixels)) {
-    if (XdrvMailbox.data_len > 0) {
-      char *p;
-      uint16_t idx = XdrvMailbox.index;
-      Ws2812ForceSuspend();
-      for (char *color = strtok_r(XdrvMailbox.data, " ", &p); color; color = strtok_r(nullptr, " ", &p)) {
-        if (LightColorEntry(color, strlen(color))) {
-          Ws2812SetColor(idx, Light.entry_color[0], Light.entry_color[1], Light.entry_color[2], Light.entry_color[3]);
-          idx++;
-          if (idx > Settings.light_pixels) { break; }
-        } else {
-          break;
-        }
-      }
-      Ws2812ForceUpdate();
-    }
-    char scolor[LIGHT_COLOR_SIZE];
-    ResponseCmndIdxChar(Ws2812GetColor(XdrvMailbox.index, scolor));
-  }
-}
-
-void CmndPixels(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= WS2812_MAX_LEDS)) {
-    Settings.light_pixels = XdrvMailbox.payload;
-    Settings.light_rotation = 0;
-    Ws2812Clear();
-    Light.update = true;
-  }
-  ResponseCmndNumber(Settings.light_pixels);
-}
-
-void CmndRotation(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < Settings.light_pixels)) {
-    Settings.light_rotation = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.light_rotation);
-}
-
-void CmndWidth(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 4)) {
-    if (1 == XdrvMailbox.index) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) {
-        Settings.light_width = XdrvMailbox.payload;
-      }
-      ResponseCmndNumber(Settings.light_width);
-    } else {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32)) {
-        Settings.ws_width[XdrvMailbox.index -2] = XdrvMailbox.payload;
-      }
-      ResponseCmndIdxNumber(Settings.ws_width[XdrvMailbox.index -2]);
-    }
-  }
-}
-
-
-
-
-
-bool Xlgt01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Ws2812SetChannels();
-      break;
-    case FUNC_SET_SCHEME:
-      Ws2812ShowScheme();
-      break;
-    case FUNC_COMMAND:
-      result = DecodeCommand(kWs2812Commands, Ws2812Command);
-      break;
-    case FUNC_MODULE_INIT:
-      Ws2812ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_02_my92x1.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_02_my92x1.ino"
-#ifdef USE_LIGHT
-#ifdef USE_MY92X1
-
-
-
-
-#define XLGT_02 2
-
-struct MY92X1 {
-  uint8_t pdi_pin = 0;
-  uint8_t pdcki_pin = 0;
-  uint8_t model = 0;
-} My92x1;
-
-extern "C" {
-  void os_delay_us(unsigned int);
-}
-
-void LightDiPulse(uint8_t times)
-{
-  for (uint32_t i = 0; i < times; i++) {
-    digitalWrite(My92x1.pdi_pin, HIGH);
-    digitalWrite(My92x1.pdi_pin, LOW);
-  }
-}
-
-void LightDckiPulse(uint8_t times)
-{
-  for (uint32_t i = 0; i < times; i++) {
-    digitalWrite(My92x1.pdcki_pin, HIGH);
-    digitalWrite(My92x1.pdcki_pin, LOW);
-  }
-}
-
-void LightMy92x1Write(uint8_t data)
-{
-  for (uint32_t i = 0; i < 4; i++) {
-    digitalWrite(My92x1.pdcki_pin, LOW);
-    digitalWrite(My92x1.pdi_pin, (data & 0x80));
-    digitalWrite(My92x1.pdcki_pin, HIGH);
-    data = data << 1;
-    digitalWrite(My92x1.pdi_pin, (data & 0x80));
-    digitalWrite(My92x1.pdcki_pin, LOW);
-    digitalWrite(My92x1.pdi_pin, LOW);
-    data = data << 1;
-  }
-}
-
-void LightMy92x1Init(void)
-{
-  uint8_t chips[3] = { 1, 2, 2 };
-
-  LightDckiPulse(chips[My92x1.model] * 32);
-  os_delay_us(12);
-
-
-  LightDiPulse(12);
-  os_delay_us(12);
-  for (uint32_t n = 0; n < chips[My92x1.model]; n++) {
-    LightMy92x1Write(0x18);
-  }
-  os_delay_us(12);
-
-
-  LightDiPulse(16);
-  os_delay_us(12);
-}
-
-void LightMy92x1Duty(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b, uint8_t duty_w, uint8_t duty_c)
-{
-  uint8_t channels[3] = { 4, 6, 6 };
-
-  uint8_t duty[3][6] = {{ duty_r, duty_g, duty_b, duty_w, 0, 0 },
-                        { duty_w, duty_c, 0, duty_g, duty_r, duty_b },
-                        { duty_r, duty_g, duty_b, duty_w, duty_w, duty_w }};
-
-  os_delay_us(12);
-  for (uint32_t channel = 0; channel < channels[My92x1.model]; channel++) {
-    LightMy92x1Write(duty[My92x1.model][channel]);
-  }
-  os_delay_us(12);
-  LightDiPulse(8);
-  os_delay_us(12);
-}
-
-
-
-bool My92x1SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
-
-  return true;
-}
-
-void My92x1ModuleSelected(void)
-{
-  if ((pin[GPIO_DCKI] < 99) && (pin[GPIO_DI] < 99)) {
-    My92x1.pdi_pin = pin[GPIO_DI];
-    My92x1.pdcki_pin = pin[GPIO_DCKI];
-
-    pinMode(My92x1.pdi_pin, OUTPUT);
-    pinMode(My92x1.pdcki_pin, OUTPUT);
-    digitalWrite(My92x1.pdi_pin, LOW);
-    digitalWrite(My92x1.pdcki_pin, LOW);
-
-    My92x1.model = 2;
-    light_type = LT_RGBW;
-    if (AILIGHT == my_module_type) {
-      My92x1.model = 0;
-
-    }
-    else if (SONOFF_B1 == my_module_type) {
-      My92x1.model = 1;
-      light_type = LT_RGBWC;
-    }
-
-    LightMy92x1Init();
-
-    light_flg = XLGT_02;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: MY29x1 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = My92x1SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      My92x1ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SM16716
-
-
-
-
-
-
-
-#define XLGT_03 3
-
-#define D_LOG_SM16716 "SM16716: "
-
-struct SM16716 {
-  uint8_t pin_clk = 0;
-  uint8_t pin_dat = 0;
-  uint8_t pin_sel = 0;
-  bool enabled = false;
-} Sm16716;
-
-void SM16716_SendBit(uint8_t v)
-{
-
-
-
-
-
-  digitalWrite(Sm16716.pin_dat, (v != 0) ? HIGH : LOW);
-
-  digitalWrite(Sm16716.pin_clk, HIGH);
-
-  digitalWrite(Sm16716.pin_clk, LOW);
-}
-
-void SM16716_SendByte(uint8_t v)
-{
-  uint8_t mask;
-
-  for (mask = 0x80; mask; mask >>= 1) {
-    SM16716_SendBit(v & mask);
-  }
-}
-
-void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
-{
-  if (Sm16716.pin_sel < 99) {
-    bool should_enable = (duty_r | duty_g | duty_b);
-    if (!Sm16716.enabled && should_enable) {
-      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color on"));
-      Sm16716.enabled = true;
-      digitalWrite(Sm16716.pin_sel, HIGH);
-
-
-      delayMicroseconds(1000);
-      SM16716_Init();
-    }
-    else if (Sm16716.enabled && !should_enable) {
-      DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "turning color off"));
-      Sm16716.enabled = false;
-      digitalWrite(Sm16716.pin_sel, LOW);
-    }
-  }
-  DEBUG_DRIVER_LOG(PSTR(D_LOG_SM16716 "Update; rgb=%02x%02x%02x"), duty_r, duty_g, duty_b);
-
-
-  SM16716_SendBit(1);
-  SM16716_SendByte(duty_r);
-  SM16716_SendByte(duty_g);
-  SM16716_SendByte(duty_b);
-
-
-
-
-
-  SM16716_SendBit(0);
-  SM16716_SendByte(0);
-  SM16716_SendByte(0);
-  SM16716_SendByte(0);
-}
-# 111 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
-void SM16716_Init(void)
-{
-  for (uint32_t t_init = 0; t_init < 50; ++t_init) {
-    SM16716_SendBit(0);
-  }
-}
-
-
-
-bool Sm16716SetChannels(void)
-{
-# 132 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-
-  SM16716_Update(cur_col[0], cur_col[1], cur_col[2]);
-
-  return true;
-}
-
-void Sm16716ModuleSelected(void)
-{
-  if ((pin[GPIO_SM16716_CLK] < 99) && (pin[GPIO_SM16716_DAT] < 99)) {
-    Sm16716.pin_clk = pin[GPIO_SM16716_CLK];
-    Sm16716.pin_dat = pin[GPIO_SM16716_DAT];
-    Sm16716.pin_sel = pin[GPIO_SM16716_SEL];
-# 157 "S:/Development/Tasmota/tasmota/xlgt_03_sm16716.ino"
-    pinMode(Sm16716.pin_clk, OUTPUT);
-    digitalWrite(Sm16716.pin_clk, LOW);
-
-    pinMode(Sm16716.pin_dat, OUTPUT);
-    digitalWrite(Sm16716.pin_dat, LOW);
-
-    if (Sm16716.pin_sel < 99) {
-      pinMode(Sm16716.pin_sel, OUTPUT);
-      digitalWrite(Sm16716.pin_sel, LOW);
-
-    } else {
-
-      SM16716_Init();
-    }
-
-    LightPwmOffset(LST_RGB);
-    light_type += LST_RGB;
-    light_flg = XLGT_03;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM16716 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt03(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Sm16716SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      Sm16716ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SM2135
-
-
-
-
-
-
-#define XLGT_04 4
-
-#define SM2135_ADDR_MC 0xC0
-#define SM2135_ADDR_CH 0xC1
-#define SM2135_ADDR_R 0xC2
-#define SM2135_ADDR_G 0xC3
-#define SM2135_ADDR_B 0xC4
-#define SM2135_ADDR_C 0xC5
-#define SM2135_ADDR_W 0xC6
-
-#define SM2135_RGB 0x00
-#define SM2135_CW 0x80
-
-#define SM2135_10MA 0x00
-#define SM2135_15MA 0x01
-#define SM2135_20MA 0x02
-#define SM2135_25MA 0x03
-#define SM2135_30MA 0x04
-#define SM2135_35MA 0x05
-#define SM2135_40MA 0x06
-#define SM2135_45MA 0x07
-#define SM2135_50MA 0x08
-#define SM2135_55MA 0x09
-#define SM2135_60MA 0x0A
-
-
-const uint8_t SM2135_CURRENT = (SM2135_20MA << 4) | SM2135_15MA;
-
-struct SM2135 {
-  uint8_t clk = 0;
-  uint8_t data = 0;
-} Sm2135;
-
-uint8_t Sm2135Write(uint8_t data)
-{
-  for (uint32_t i = 0; i < 8; i++) {
-    digitalWrite(Sm2135.clk, LOW);
-    digitalWrite(Sm2135.data, (data & 0x80));
-    digitalWrite(Sm2135.clk, HIGH);
-    data = data << 1;
-  }
-  digitalWrite(Sm2135.clk, LOW);
-  digitalWrite(Sm2135.data, HIGH);
-  pinMode(Sm2135.data, INPUT);
-  digitalWrite(Sm2135.clk, HIGH);
-  uint8_t ack = digitalRead(Sm2135.data);
-  pinMode(Sm2135.data, OUTPUT);
-  return ack;
-}
-
-void Sm2135Send(uint8_t *buffer, uint8_t size)
-{
-  digitalWrite(Sm2135.data, LOW);
-  for (uint32_t i = 0; i < size; i++) {
-    Sm2135Write(buffer[i]);
-  }
-  digitalWrite(Sm2135.clk, LOW);
-  digitalWrite(Sm2135.clk, HIGH);
-  digitalWrite(Sm2135.data, HIGH);
-}
-
-
-
-bool Sm2135SetChannels(void)
-{
-  uint8_t *cur_col = (uint8_t*)XdrvMailbox.data;
-  uint8_t data[6];
-
-  if ((0 == cur_col[0]) && (0 == cur_col[1]) && (0 == cur_col[2])) {
-# 106 "S:/Development/Tasmota/tasmota/xlgt_04_sm2135.ino"
-    data[0] = SM2135_ADDR_MC;
-    data[1] = SM2135_CURRENT;
-    data[2] = SM2135_CW;
-    Sm2135Send(data, 3);
-    delay(1);
-    data[0] = SM2135_ADDR_C;
-    data[1] = cur_col[4];
-    data[2] = cur_col[3];
-    Sm2135Send(data, 3);
-  } else {
-
-
-
-
-
-
-
-    data[0] = SM2135_ADDR_MC;
-    data[1] = SM2135_CURRENT;
-    data[2] = SM2135_RGB;
-    data[3] = cur_col[1];
-    data[4] = cur_col[0];
-    data[5] = cur_col[2];
-    Sm2135Send(data, 6);
-  }
-
-  return true;
-}
-
-void Sm2135ModuleSelected(void)
-{
-  if ((pin[GPIO_SM2135_CLK] < 99) && (pin[GPIO_SM2135_DAT] < 99)) {
-    Sm2135.clk = pin[GPIO_SM2135_CLK];
-    Sm2135.data = pin[GPIO_SM2135_DAT];
-
-    pinMode(Sm2135.data, OUTPUT);
-    digitalWrite(Sm2135.data, HIGH);
-    pinMode(Sm2135.clk, OUTPUT);
-    digitalWrite(Sm2135.clk, HIGH);
-
-    light_type = LT_RGBWC;
-    light_flg = XLGT_04;
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: SM2135 Found"));
-  }
-}
-
-
-
-
-
-bool Xlgt04(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SET_CHANNELS:
-      result = Sm2135SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      Sm2135ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_05_sonoff_l1.ino"
-#ifdef USE_LIGHT
-#ifdef USE_SONOFF_L1
-
-
-
-
-#define XLGT_05 5
-
-#define SONOFF_L1_BUFFER_SIZE 140
-
-#define SONOFF_L1_MODE_COLORFUL 1
-#define SONOFF_L1_MODE_COLORFUL_GRADIENT 2
-#define SONOFF_L1_MODE_COLORFUL_BREATH 3
-#define SONOFF_L1_MODE_DIY_GRADIENT 4
-#define SONOFF_L1_MODE_DIY_PULSE 5
-#define SONOFF_L1_MODE_DIY_BREATH 6
-#define SONOFF_L1_MODE_DIY_STROBE 7
-#define SONOFF_L1_MODE_RGB_GRADIENT 8
-#define SONOFF_L1_MODE_RGB_PULSE 9
-#define SONOFF_L1_MODE_RGB_BREATH 10
-#define SONOFF_L1_MODE_RGB_STROBE 11
-#define SONOFF_L1_MODE_SYNC_TO_MUSIC 12
-
-struct SNFL1 {
-  uint32_t unlock = 0;
-  bool receive_ready = true;
-} Snfl1;
-
-
-
-void SnfL1Send(const char *buffer)
-{
-
-
-  Serial.print(buffer);
-  Serial.write(0x1B);
-  Serial.flush();
-}
-
-void SnfL1SerialSendOk(void)
-{
-  char buffer[16];
-  snprintf_P(buffer, sizeof(buffer), PSTR("AT+SEND=ok"));
-
-  SnfL1Send(buffer);
-}
-
-bool SnfL1SerialInput(void)
-{
-  if (serial_in_byte != 0x1B) {
-    if (serial_in_byte_counter >= 140) {
-      serial_in_byte_counter = 0;
-    }
-    if (serial_in_byte_counter || (!serial_in_byte_counter && ('A' == serial_in_byte))) {
-      serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-    }
-  } else {
-    serial_in_buffer[serial_in_byte_counter++] = 0x00;
-
-
-
-
-
-
-    if (!strncmp(serial_in_buffer +3, "RESULT", 6)) {
-      Snfl1.receive_ready = true;
-    }
-    else if (!strncmp(serial_in_buffer +3, "UPDATE", 6)) {
-      char cmnd_dimmer[20];
-      char cmnd_color[20];
-      char *end_str;
-      char *string = serial_in_buffer +10;
-      char *token = strtok_r(string, ",", &end_str);
-
-      bool color_updated[3] = { false, false, false };
-      uint8_t current_color[3];
-      memcpy(current_color, Settings.light_color, 3);
-
-      bool switch_state = false;
-      bool is_power_change = false;
-      bool is_color_change = false;
-      bool is_brightness_change = false;
-
-      while (token != nullptr) {
-        char* end_token;
-        char* token2 = strtok_r(token, ":", &end_token);
-        char* token3 = strtok_r(nullptr, ":", &end_token);
-
-        if (!strncmp(token2, "\"sequence\"", 10)) {
-
-
-
-          token = nullptr;
-        }
-
-        else if (!strncmp(token2, "\"switch\"", 8)) {
-          switch_state = !strncmp(token3, "\"on\"", 4) ? true : false;
-
-
-
-          is_power_change = (switch_state != Light.power);
-        }
-
-        else if (!strncmp(token2, "\"color", 6)) {
-          char color_channel_name = token2[6];
-          int color_index;
-          switch(color_channel_name)
-          {
-            case 'R': color_index = 0;
-              break;
-            case 'G': color_index = 1;
-              break;
-            case 'B': color_index = 2;
-              break;
-          }
-          int color_value = atoi(token3);
-          current_color[color_index] = color_value;
-          color_updated[color_index] = true;
-
-          bool all_color_channels_updated = color_updated[0] && color_updated[1] && color_updated[2];
-          if (all_color_channels_updated) {
-
-
-
-
-
-            is_color_change = (Light.power && (memcmp(current_color, Settings.light_color, 3) != 0));
-          }
-          snprintf_P(cmnd_color, sizeof(cmnd_color), PSTR(D_CMND_COLOR "2 %02x%02x%02x"), current_color[0], current_color[1], current_color[2]);
-        }
-
-        else if (!strncmp(token2, "\"bright\"", 8)) {
-          uint8_t dimmer = atoi(token3);
-
-
-
-          is_brightness_change = (Light.power && (dimmer > 0) && (dimmer != Settings.light_dimmer));
-          snprintf_P(cmnd_dimmer, sizeof(cmnd_dimmer), PSTR(D_CMND_DIMMER " %d"), dimmer);
-        }
-
-        token = strtok_r(nullptr, ",", &end_str);
-      }
-
-      if (is_power_change) {
-        if (Settings.light_scheme > 0) {
-          if (!switch_state) {
-            char cmnd_scheme[20];
-            snprintf_P(cmnd_scheme, sizeof(cmnd_scheme), PSTR(D_CMND_SCHEME " 0"));
-            ExecuteCommand(cmnd_scheme, SRC_SWITCH);
-          }
-        } else {
-          ExecuteCommandPower(1, switch_state, SRC_SWITCH);
-        }
-      }
-      else if (is_brightness_change) {
-        ExecuteCommand(cmnd_dimmer, SRC_SWITCH);
-      }
-      else if (Light.power && is_color_change) {
-        if (0 == Settings.light_scheme) {
-          if (Settings.light_fade) {
-            char cmnd_fade[20];
-            snprintf_P(cmnd_fade, sizeof(cmnd_fade), PSTR(D_CMND_FADE " 0"));
-            ExecuteCommand(cmnd_fade, SRC_SWITCH);
-          }
-          ExecuteCommand(cmnd_color, SRC_SWITCH);
-        }
-      }
-    }
-
-    SnfL1SerialSendOk();
-
-    return true;
-  }
-  serial_in_byte = 0;
-  return false;
-}
-
-
-
-bool SnfL1SetChannels(void)
-{
-  if (Snfl1.receive_ready || TimeReached(Snfl1.unlock)) {
-
-    uint8_t *scale_col = (uint8_t*)XdrvMailbox.topic;
-
-    char buffer[140];
-    snprintf_P(buffer, sizeof(buffer), PSTR("AT+UPDATE=\"sequence\":\"%d%03d\",\"switch\":\"%s\",\"light_type\":1,\"colorR\":%d,\"colorG\":%d,\"colorB\":%d,\"bright\":%d,\"mode\":%d"),
-      LocalTime(), millis()%1000,
-      Light.power ? "on" : "off",
-      scale_col[0], scale_col[1], scale_col[2],
-      light_state.getDimmer(),
-      SONOFF_L1_MODE_COLORFUL);
-
-    SnfL1Send(buffer);
-
-    Snfl1.unlock = millis() + 500;
-    Snfl1.receive_ready = false;
-  }
-  return true;
-}
-
-void SnfL1ModuleSelected(void)
-{
-  if (SONOFF_L1 == my_module_type) {
-    if ((pin[GPIO_RXD] < 99) && (pin[GPIO_TXD] < 99)) {
-      SetSerial(19200, TS_SERIAL_8N1);
-
-      light_type = LT_RGB;
-      light_flg = XLGT_05;
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("LGT: Sonoff L1 Found"));
-    }
-  }
-}
-
-
-
-
-
-bool Xlgt05(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_SERIAL:
-      result = SnfL1SerialInput();
-      break;
-    case FUNC_SET_CHANNELS:
-      result = SnfL1SetChannels();
-      break;
-    case FUNC_MODULE_INIT:
-      SnfL1ModuleSelected();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xlgt_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xlgt_interface.ino"
-#ifdef USE_LIGHT
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xlgt_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xlgt_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XLGT_01
-  &Xlgt01,
-#endif
-
-#ifdef XLGT_02
-  &Xlgt02,
-#endif
-
-#ifdef XLGT_03
-  &Xlgt03,
-#endif
-
-#ifdef XLGT_04
-  &Xlgt04,
-#endif
-
-#ifdef XLGT_05
-  &Xlgt05,
-#endif
-
-#ifdef XLGT_06
-  &Xlgt06,
-#endif
-
-#ifdef XLGT_07
-  &Xlgt07,
-#endif
-
-#ifdef XLGT_08
-  &Xlgt08,
-#endif
-
-#ifdef XLGT_09
-  &Xlgt09,
-#endif
-
-#ifdef XLGT_10
-  &Xlgt10,
-#endif
-
-#ifdef XLGT_11
-  &Xlgt11,
-#endif
-
-#ifdef XLGT_12
-  &Xlgt12,
-#endif
-
-#ifdef XLGT_13
-  &Xlgt13,
-#endif
-
-#ifdef XLGT_14
-  &Xlgt14,
-#endif
-
-#ifdef XLGT_15
-  &Xlgt15,
-#endif
-
-#ifdef XLGT_16
-  &Xlgt16
-#endif
-};
-
-const uint8_t xlgt_present = sizeof(xlgt_func_ptr) / sizeof(xlgt_func_ptr[0]);
-
-uint8_t xlgt_active = 0;
-
-bool XlgtCall(uint8_t function)
-{
-  DEBUG_TRACE_LOG(PSTR("LGT: %d"), function);
-
-  if (FUNC_MODULE_INIT == function) {
-    for (uint32_t x = 0; x < xlgt_present; x++) {
-      xlgt_func_ptr[x](function);
-      if (light_flg) {
-        xlgt_active = x;
-        return true;
-      }
-    }
-  }
-  else if (light_flg) {
-    return xlgt_func_ptr[xlgt_active](function);
-  }
-  return false;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_01_hlw8012.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_01_hlw8012.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_HLW8012
-
-
-
-
-
-
-#define XNRG_01 1
-
-
-#define HLW_PREF 10000
-#define HLW_UREF 2200
-#define HLW_IREF 4545
-
-
-#define HJL_PREF 1362
-#define HJL_UREF 822
-#define HJL_IREF 3300
-
-#define HLW_POWER_PROBE_TIME 10
-#define HLW_SAMPLE_COUNT 10
-
-
-
-struct HLW {
-#ifdef HLW_DEBUG
-  unsigned long debug[HLW_SAMPLE_COUNT];
-#endif
-  unsigned long cf_pulse_length = 0;
-  unsigned long cf_pulse_last_time = 0;
-  unsigned long cf_power_pulse_length = 0;
-
-  unsigned long cf1_pulse_length = 0;
-  unsigned long cf1_pulse_last_time = 0;
-  unsigned long cf1_summed_pulse_length = 0;
-  unsigned long cf1_pulse_counter = 0;
-  unsigned long cf1_voltage_pulse_length = 0;
-  unsigned long cf1_current_pulse_length = 0;
-
-  unsigned long energy_period_counter = 0;
-
-  unsigned long power_ratio = 0;
-  unsigned long voltage_ratio = 0;
-  unsigned long current_ratio = 0;
-
-  uint8_t model_type = 0;
-  uint8_t cf1_timer = 0;
-  uint8_t power_retry = 0;
-  bool select_ui_flag = false;
-  bool ui_flag = true;
-  bool load_off = true;
-} Hlw;
-
-
-#ifndef USE_WS2812_DMA
-void HlwCfInterrupt(void) ICACHE_RAM_ATTR;
-void HlwCf1Interrupt(void) ICACHE_RAM_ATTR;
-#endif
-
-void HlwCfInterrupt(void)
-{
-  unsigned long us = micros();
-
-  if (Hlw.load_off) {
-    Hlw.cf_pulse_last_time = us;
-    Hlw.load_off = false;
-  } else {
-    Hlw.cf_pulse_length = us - Hlw.cf_pulse_last_time;
-    Hlw.cf_pulse_last_time = us;
-    Hlw.energy_period_counter++;
-  }
-  Energy.data_valid[0] = 0;
-}
-
-void HlwCf1Interrupt(void)
-{
-  unsigned long us = micros();
-
-  Hlw.cf1_pulse_length = us - Hlw.cf1_pulse_last_time;
-  Hlw.cf1_pulse_last_time = us;
-  if ((Hlw.cf1_timer > 2) && (Hlw.cf1_timer < 8)) {
-    Hlw.cf1_summed_pulse_length += Hlw.cf1_pulse_length;
-#ifdef HLW_DEBUG
-    Hlw.debug[Hlw.cf1_pulse_counter] = Hlw.cf1_pulse_length;
-#endif
-    Hlw.cf1_pulse_counter++;
-    if (HLW_SAMPLE_COUNT == Hlw.cf1_pulse_counter) {
-      Hlw.cf1_timer = 8;
-    }
-  }
-  Energy.data_valid[0] = 0;
-}
-
-
-
-void HlwEvery200ms(void)
-{
-  unsigned long cf1_pulse_length = 0;
-  unsigned long hlw_w = 0;
-  unsigned long hlw_u = 0;
-  unsigned long hlw_i = 0;
-
-  if (micros() - Hlw.cf_pulse_last_time > (HLW_POWER_PROBE_TIME * 1000000)) {
-    Hlw.cf_pulse_length = 0;
-    Hlw.load_off = true;
-  }
-  Hlw.cf_power_pulse_length = Hlw.cf_pulse_length;
-
-  if (Hlw.cf_power_pulse_length && Energy.power_on && !Hlw.load_off) {
-    hlw_w = (Hlw.power_ratio * Settings.energy_power_calibration) / Hlw.cf_power_pulse_length ;
-    Energy.active_power[0] = (float)hlw_w / 10;
-    Hlw.power_retry = 1;
-  } else {
-    if (Hlw.power_retry) {
-      Hlw.power_retry--;
-    } else {
-      Energy.active_power[0] = 0;
-    }
-  }
-
-  if (pin[GPIO_NRG_CF1] < 99) {
-    Hlw.cf1_timer++;
-    if (Hlw.cf1_timer >= 8) {
-      Hlw.cf1_timer = 0;
-      Hlw.select_ui_flag = (Hlw.select_ui_flag) ? false : true;
-      DigitalWrite(GPIO_NRG_SEL, Hlw.select_ui_flag);
-
-      if (Hlw.cf1_pulse_counter) {
-        cf1_pulse_length = Hlw.cf1_summed_pulse_length / Hlw.cf1_pulse_counter;
-      }
-
-#ifdef HLW_DEBUG
-
-      char stemp[100];
-      stemp[0] = '\0';
-      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%s %d"), stemp, Hlw.debug[i]);
-      }
-      for (uint32_t i = 0; i < Hlw.cf1_pulse_counter; i++) {
-        for (uint32_t j = i + 1; j < Hlw.cf1_pulse_counter; j++) {
-          if (Hlw.debug[i] > Hlw.debug[j]) {
-            std::swap(Hlw.debug[i], Hlw.debug[j]);
-          }
-        }
-      }
-      unsigned long median = Hlw.debug[(Hlw.cf1_pulse_counter +1) / 2];
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("NRG: power %d, ui %d, cnt %d, smpl%s, sum %d, mean %d, median %d"),
-        Hlw.cf_power_pulse_length , Hlw.select_ui_flag, Hlw.cf1_pulse_counter, stemp, Hlw.cf1_summed_pulse_length, cf1_pulse_length, median);
-#endif
-
-      if (Hlw.select_ui_flag == Hlw.ui_flag) {
-        Hlw.cf1_voltage_pulse_length = cf1_pulse_length;
-
-        if (Hlw.cf1_voltage_pulse_length && Energy.power_on) {
-          hlw_u = (Hlw.voltage_ratio * Settings.energy_voltage_calibration) / Hlw.cf1_voltage_pulse_length ;
-          Energy.voltage[0] = (float)hlw_u / 10;
-        } else {
-          Energy.voltage[0] = 0;
-        }
-
-      } else {
-        Hlw.cf1_current_pulse_length = cf1_pulse_length;
-
-        if (Hlw.cf1_current_pulse_length && Energy.active_power[0]) {
-          hlw_i = (Hlw.current_ratio * Settings.energy_current_calibration) / Hlw.cf1_current_pulse_length;
-          Energy.current[0] = (float)hlw_i / 1000;
-        } else {
-          Energy.current[0] = 0;
-        }
-
-      }
-      Hlw.cf1_summed_pulse_length = 0;
-      Hlw.cf1_pulse_counter = 0;
-    }
-  }
-}
-
-void HlwEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    Hlw.cf1_voltage_pulse_length = 0;
-    Hlw.cf1_current_pulse_length = 0;
-    Hlw.cf_power_pulse_length = 0;
-  } else {
-    unsigned long hlw_len;
-
-    if (Hlw.energy_period_counter) {
-      hlw_len = 10000 / Hlw.energy_period_counter;
-      Hlw.energy_period_counter = 0;
-      if (hlw_len) {
-        Energy.kWhtoday_delta += ((Hlw.power_ratio * Settings.energy_power_calibration) / hlw_len) / 36;
-        EnergyUpdateToday();
-      }
-    }
-  }
-}
-
-void HlwSnsInit(void)
-{
-  if (!Settings.energy_power_calibration || (4975 == Settings.energy_power_calibration)) {
-    Settings.energy_power_calibration = HLW_PREF_PULSE;
-    Settings.energy_voltage_calibration = HLW_UREF_PULSE;
-    Settings.energy_current_calibration = HLW_IREF_PULSE;
-  }
-
-  if (Hlw.model_type) {
-    Hlw.power_ratio = HJL_PREF;
-    Hlw.voltage_ratio = HJL_UREF;
-    Hlw.current_ratio = HJL_IREF;
-  } else {
-    Hlw.power_ratio = HLW_PREF;
-    Hlw.voltage_ratio = HLW_UREF;
-    Hlw.current_ratio = HLW_IREF;
-  }
-
-  if (pin[GPIO_NRG_SEL] < 99) {
-    pinMode(pin[GPIO_NRG_SEL], OUTPUT);
-    digitalWrite(pin[GPIO_NRG_SEL], Hlw.select_ui_flag);
-  }
-  if (pin[GPIO_NRG_CF1] < 99) {
-    pinMode(pin[GPIO_NRG_CF1], INPUT_PULLUP);
-    attachInterrupt(pin[GPIO_NRG_CF1], HlwCf1Interrupt, FALLING);
-  }
-  pinMode(pin[GPIO_HLW_CF], INPUT_PULLUP);
-  attachInterrupt(pin[GPIO_HLW_CF], HlwCfInterrupt, FALLING);
-}
-
-void HlwDrvInit(void)
-{
-  Hlw.model_type = 0;
-  if (pin[GPIO_HJL_CF] < 99) {
-    pin[GPIO_HLW_CF] = pin[GPIO_HJL_CF];
-    pin[GPIO_HJL_CF] = 99;
-    Hlw.model_type = 1;
-  }
-
-  if (pin[GPIO_HLW_CF] < 99) {
-
-    Hlw.ui_flag = true;
-    if (pin[GPIO_NRG_SEL_INV] < 99) {
-      pin[GPIO_NRG_SEL] = pin[GPIO_NRG_SEL_INV];
-      pin[GPIO_NRG_SEL_INV] = 99;
-      Hlw.ui_flag = false;
-    }
-
-    if (pin[GPIO_NRG_CF1] < 99) {
-      if (99 == pin[GPIO_NRG_SEL]) {
-        Energy.current_available = false;
-      }
-    } else {
-      Energy.current_available = false;
-      Energy.voltage_available = false;
-    }
-
-    energy_flg = XNRG_01;
-  }
-}
-
-bool HlwCommand(void)
-{
-  bool serviced = true;
-
-  if ((CMND_POWERCAL == Energy.command_code) || (CMND_VOLTAGECAL == Energy.command_code) || (CMND_CURRENTCAL == Energy.command_code)) {
-
-  }
-  else if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf_power_pulse_length ) {
-      Settings.energy_power_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf_power_pulse_length ) / Hlw.power_ratio;
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf1_voltage_pulse_length ) {
-      Settings.energy_voltage_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data) * 10) * Hlw.cf1_voltage_pulse_length ) / Hlw.voltage_ratio;
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Hlw.cf1_current_pulse_length) {
-      Settings.energy_current_calibration = ((unsigned long)(CharToFloat(XdrvMailbox.data)) * Hlw.cf1_current_pulse_length) / Hlw.current_ratio;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg01(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_200_MSECOND:
-      HlwEvery200ms();
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      HlwEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = HlwCommand();
-      break;
-    case FUNC_INIT:
-      HlwSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      HlwDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_02_cse7766.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_02_cse7766.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_CSE7766
-
-
-
-
-
-
-
-#define XNRG_02 2
-
-#define CSE_MAX_INVALID_POWER 128
-
-#define CSE_NOT_CALIBRATED 0xAA
-
-#define CSE_PULSES_NOT_INITIALIZED -1
-
-#define CSE_PREF 1000
-#define CSE_UREF 100
-
-#define CSE_BUFFER_SIZE 25
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *CseSerial = nullptr;
-
-struct CSE {
-  long voltage_cycle = 0;
-  long current_cycle = 0;
-  long power_cycle = 0;
-  long power_cycle_first = 0;
-  long cf_pulses = 0;
-  long cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
-
-  int byte_counter = 0;
-  uint8_t *rx_buffer = nullptr;
-  uint8_t power_invalid = 0;
-  bool received = false;
-} Cse;
-
-void CseReceived(void)
-{
-
-
-
-
-
-
-  uint8_t header = Cse.rx_buffer[0];
-  if ((header & 0xFC) == 0xFC) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Abnormal hardware"));
-    return;
-  }
-
-
-  if (HLW_UREF_PULSE == Settings.energy_voltage_calibration) {
-    long voltage_coefficient = 191200;
-    if (CSE_NOT_CALIBRATED != header) {
-      voltage_coefficient = Cse.rx_buffer[2] << 16 | Cse.rx_buffer[3] << 8 | Cse.rx_buffer[4];
-    }
-    Settings.energy_voltage_calibration = voltage_coefficient / CSE_UREF;
-  }
-  if (HLW_IREF_PULSE == Settings.energy_current_calibration) {
-    long current_coefficient = 16140;
-    if (CSE_NOT_CALIBRATED != header) {
-      current_coefficient = Cse.rx_buffer[8] << 16 | Cse.rx_buffer[9] << 8 | Cse.rx_buffer[10];
-    }
-    Settings.energy_current_calibration = current_coefficient;
-  }
-  if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
-    long power_coefficient = 5364000;
-    if (CSE_NOT_CALIBRATED != header) {
-      power_coefficient = Cse.rx_buffer[14] << 16 | Cse.rx_buffer[15] << 8 | Cse.rx_buffer[16];
-    }
-    Settings.energy_power_calibration = power_coefficient / CSE_PREF;
-  }
-
-  uint8_t adjustement = Cse.rx_buffer[20];
-  Cse.voltage_cycle = Cse.rx_buffer[5] << 16 | Cse.rx_buffer[6] << 8 | Cse.rx_buffer[7];
-  Cse.current_cycle = Cse.rx_buffer[11] << 16 | Cse.rx_buffer[12] << 8 | Cse.rx_buffer[13];
-  Cse.power_cycle = Cse.rx_buffer[17] << 16 | Cse.rx_buffer[18] << 8 | Cse.rx_buffer[19];
-  Cse.cf_pulses = Cse.rx_buffer[21] << 8 | Cse.rx_buffer[22];
-
-  if (Energy.power_on) {
-    if (adjustement & 0x40) {
-      Energy.voltage[0] = (float)(Settings.energy_voltage_calibration * CSE_UREF) / (float)Cse.voltage_cycle;
-    }
-    if (adjustement & 0x10) {
-      Cse.power_invalid = 0;
-      if ((header & 0xF2) == 0xF2) {
-        Energy.active_power[0] = 0;
-      } else {
-        if (0 == Cse.power_cycle_first) { Cse.power_cycle_first = Cse.power_cycle; }
-        if (Cse.power_cycle_first != Cse.power_cycle) {
-          Cse.power_cycle_first = -1;
-          Energy.active_power[0] = (float)(Settings.energy_power_calibration * CSE_PREF) / (float)Cse.power_cycle;
-        } else {
-          Energy.active_power[0] = 0;
-        }
-      }
-    } else {
-      if (Cse.power_invalid < Settings.param[P_CSE7766_INVALID_POWER]) {
-        Cse.power_invalid++;
-      } else {
-        Cse.power_cycle_first = 0;
-        Energy.active_power[0] = 0;
-      }
-    }
-    if (adjustement & 0x20) {
-      if (0 == Energy.active_power[0]) {
-        Energy.current[0] = 0;
-      } else {
-        Energy.current[0] = (float)Settings.energy_current_calibration / (float)Cse.current_cycle;
-      }
-    }
-  } else {
-    Cse.power_cycle_first = 0;
-    Energy.voltage[0] = 0;
-    Energy.active_power[0] = 0;
-    Energy.current[0] = 0;
-  }
-}
-
-bool CseSerialInput(void)
-{
-  while (CseSerial->available()) {
-    yield();
-    uint8_t serial_in_byte = CseSerial->read();
-
-    if (Cse.received) {
-      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
-      if (24 == Cse.byte_counter) {
-
-        AddLogBuffer(LOG_LEVEL_DEBUG_MORE, Cse.rx_buffer, 24);
-
-        uint8_t checksum = 0;
-        for (uint32_t i = 2; i < 23; i++) { checksum += Cse.rx_buffer[i]; }
-        if (checksum == Cse.rx_buffer[23]) {
-          Energy.data_valid[0] = 0;
-          CseReceived();
-          Cse.received = false;
-          return true;
-        } else {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: " D_CHECKSUM_FAILURE));
-          do {
-            memmove(Cse.rx_buffer, Cse.rx_buffer +1, 24);
-            Cse.byte_counter--;
-          } while ((Cse.byte_counter > 2) && (0x5A != Cse.rx_buffer[1]));
-          if (0x5A != Cse.rx_buffer[1]) {
-            Cse.received = false;
-            Cse.byte_counter = 0;
-          }
-        }
-      }
-    } else {
-      if ((0x5A == serial_in_byte) && (1 == Cse.byte_counter)) {
-        Cse.received = true;
-      } else {
-        Cse.byte_counter = 0;
-      }
-      Cse.rx_buffer[Cse.byte_counter++] = serial_in_byte;
-    }
-  }
-}
-
-
-
-void CseEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    Cse.voltage_cycle = 0;
-    Cse.current_cycle = 0;
-    Cse.power_cycle = 0;
-  } else {
-    long cf_frequency = 0;
-
-    if (CSE_PULSES_NOT_INITIALIZED == Cse.cf_pulses_last_time) {
-      Cse.cf_pulses_last_time = Cse.cf_pulses;
-    } else {
-      if (Cse.cf_pulses < Cse.cf_pulses_last_time) {
-        cf_frequency = (65536 - Cse.cf_pulses_last_time) + Cse.cf_pulses;
-      } else {
-        cf_frequency = Cse.cf_pulses - Cse.cf_pulses_last_time;
-      }
-      if (cf_frequency && Energy.active_power[0]) {
-        unsigned long delta = (cf_frequency * Settings.energy_power_calibration) / 36;
-
-
-
-        if (delta <= (4000*100/36) * 10 ) {
-          Cse.cf_pulses_last_time = Cse.cf_pulses;
-          Energy.kWhtoday_delta += delta;
-        }
-        else {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("CSE: Load overflow"));
-          Cse.cf_pulses_last_time = CSE_PULSES_NOT_INITIALIZED;
-        }
-        EnergyUpdateToday();
-      }
-    }
-  }
-}
-
-void CseSnsInit(void)
-{
-
-
-  CseSerial = new TasmotaSerial(pin[GPIO_CSE7766_RX], -1, 1);
-  if (CseSerial->begin(4800, 2)) {
-    if (CseSerial->hardwareSerial()) {
-      SetSerial(4800, TS_SERIAL_8E1);
-      ClaimSerial();
-    }
-    if (0 == Settings.param[P_CSE7766_INVALID_POWER]) {
-      Settings.param[P_CSE7766_INVALID_POWER] = CSE_MAX_INVALID_POWER;
-    }
-    Cse.power_invalid = Settings.param[P_CSE7766_INVALID_POWER];
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void CseDrvInit(void)
-{
-  Cse.rx_buffer = (uint8_t*)(malloc(CSE_BUFFER_SIZE));
-  if (Cse.rx_buffer != nullptr) {
-
-    if (pin[GPIO_CSE7766_RX] < 99) {
-      energy_flg = XNRG_02;
-    }
-  }
-}
-
-bool CseCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.power_cycle) {
-      Settings.energy_power_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.power_cycle) / CSE_PREF;
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.voltage_cycle) {
-      Settings.energy_voltage_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.voltage_cycle) / CSE_UREF;
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Cse.current_cycle) {
-      Settings.energy_current_calibration = (unsigned long)(CharToFloat(XdrvMailbox.data) * Cse.current_cycle) / 1000;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      if (CseSerial) { CseSerialInput(); }
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      CseEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = CseCommand();
-      break;
-    case FUNC_INIT:
-      CseSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      CseDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM004T
-# 31 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-#define XNRG_03 3
-
-const uint32_t PZEM_STABILIZE = 30;
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PzemSerial = nullptr;
-
-#define PZEM_VOLTAGE (uint8_t)0xB0
-#define RESP_VOLTAGE (uint8_t)0xA0
-
-#define PZEM_CURRENT (uint8_t)0xB1
-#define RESP_CURRENT (uint8_t)0xA1
-
-#define PZEM_POWER (uint8_t)0xB2
-#define RESP_POWER (uint8_t)0xA2
-
-#define PZEM_ENERGY (uint8_t)0xB3
-#define RESP_ENERGY (uint8_t)0xA3
-
-#define PZEM_SET_ADDRESS (uint8_t)0xB4
-#define RESP_SET_ADDRESS (uint8_t)0xA4
-
-#define PZEM_POWER_ALARM (uint8_t)0xB5
-#define RESP_POWER_ALARM (uint8_t)0xA5
-
-#define PZEM_DEFAULT_READ_TIMEOUT 500
-
-
-
-struct PZEM {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t read_state = 0;
-  uint8_t phase = 0;
-  uint8_t address = 0;
-} Pzem;
-
-struct PZEMCommand {
-  uint8_t command;
-  uint8_t addr[4];
-  uint8_t data;
-  uint8_t crc;
-};
-
-uint8_t PzemCrc(uint8_t *data)
-{
-  uint16_t crc = 0;
-  for (uint32_t i = 0; i < sizeof(PZEMCommand) -1; i++) {
-    crc += *data++;
-  }
-  return (uint8_t)(crc & 0xFF);
-}
-
-void PzemSend(uint8_t cmd)
-{
-  PZEMCommand pzem;
-
-  pzem.command = cmd;
-  pzem.addr[0] = 192;
-  pzem.addr[1] = 168;
-  pzem.addr[2] = 1;
-  pzem.addr[3] = ((PZEM_SET_ADDRESS == cmd) && Pzem.address) ? Pzem.address : 1 + Pzem.phase;
-  pzem.data = 0;
-
-  uint8_t *bytes = (uint8_t*)&pzem;
-  pzem.crc = PzemCrc(bytes);
-
-  PzemSerial->flush();
-  PzemSerial->write(bytes, sizeof(pzem));
-
-  Pzem.address = 0;
-}
-
-bool PzemReceiveReady(void)
-{
-  return PzemSerial->available() >= (int)sizeof(PZEMCommand);
-}
-
-bool PzemRecieve(uint8_t resp, float *data)
-{
-# 124 "S:/Development/Tasmota/tasmota/xnrg_03_pzem004t.ino"
-  uint8_t buffer[sizeof(PZEMCommand)] = { 0 };
-
-  unsigned long start = millis();
-  uint8_t len = 0;
-  while ((len < sizeof(PZEMCommand)) && (millis() - start < PZEM_DEFAULT_READ_TIMEOUT)) {
-    if (PzemSerial->available() > 0) {
-      uint8_t c = (uint8_t)PzemSerial->read();
-      if (!len && ((c & 0xF8) != 0xA0)) {
-        continue;
-      }
-      buffer[len++] = c;
-    }
-  }
-
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, len);
-
-  if (len != sizeof(PZEMCommand)) {
-
-    return false;
-  }
-  if (buffer[6] != PzemCrc(buffer)) {
-
-    return false;
-  }
-  if (buffer[0] != resp) {
-
-    return false;
-  }
-
-  switch (resp) {
-    case RESP_VOLTAGE:
-      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 10.0);
-      break;
-    case RESP_CURRENT:
-      *data = (float)(buffer[1] << 8) + buffer[2] + (buffer[3] / 100.0);
-      break;
-    case RESP_POWER:
-      *data = (float)(buffer[1] << 8) + buffer[2];
-      break;
-    case RESP_ENERGY:
-      *data = (float)((uint32_t)buffer[1] << 16) + ((uint16_t)buffer[2] << 8) + buffer[3];
-      break;
-  }
-  return true;
-}
-
-
-
-const uint8_t pzem_commands[] { PZEM_SET_ADDRESS, PZEM_VOLTAGE, PZEM_CURRENT, PZEM_POWER, PZEM_ENERGY };
-const uint8_t pzem_responses[] { RESP_SET_ADDRESS, RESP_VOLTAGE, RESP_CURRENT, RESP_POWER, RESP_ENERGY };
-
-void PzemEvery250ms(void)
-{
-  bool data_ready = PzemReceiveReady();
-
-  if (data_ready) {
-    float value = 0;
-    if (PzemRecieve(pzem_responses[Pzem.read_state], &value)) {
-      Energy.data_valid[Pzem.phase] = 0;
-      switch (Pzem.read_state) {
-        case 1:
-          Energy.voltage[Pzem.phase] = value;
-          break;
-        case 2:
-          Energy.current[Pzem.phase] = value;
-          break;
-        case 3:
-          Energy.active_power[Pzem.phase] = value;
-          break;
-        case 4:
-          Pzem.energy += value;
-          if (Pzem.phase == Energy.phase_count -1) {
-            if (Pzem.energy > Pzem.last_energy) {
-              if (uptime > PZEM_STABILIZE) {
-                EnergyUpdateTotal(Pzem.energy, false);
-              }
-              Pzem.last_energy = Pzem.energy;
-            }
-            Pzem.energy = 0;
-          }
-          break;
-      }
-      Pzem.read_state++;
-      if (5 == Pzem.read_state) {
-        Pzem.read_state = 1;
-      }
-
-
-    }
-  }
-
-  if (0 == Pzem.send_retry || data_ready) {
-    if (1 == Pzem.read_state) {
-      if (0 == Pzem.phase) {
-        Pzem.phase = Energy.phase_count -1;
-      } else {
-        Pzem.phase--;
-      }
-
-
-    }
-
-    if (Pzem.address) {
-      Pzem.read_state = 0;
-    }
-
-    Pzem.send_retry = 5;
-    PzemSend(pzem_commands[Pzem.read_state]);
-  }
-  else {
-    Pzem.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == Pzem.send_retry) && (uptime < PZEM_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemSnsInit(void)
-{
-
-  PzemSerial = new TasmotaSerial(pin[GPIO_PZEM004_RX], pin[GPIO_PZEM0XX_TX], 1);
-  if (PzemSerial->begin(9600)) {
-    if (PzemSerial->hardwareSerial()) {
-      ClaimSerial();
-    }
-    Energy.phase_count = 3;
-    Pzem.phase = 0;
-    Pzem.read_state = 1;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemDrvInit(void)
-{
-  if ((pin[GPIO_PZEM004_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_03;
-  }
-}
-
-bool PzemCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 4)) {
-      Pzem.address = XdrvMailbox.payload;
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg03(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (PzemSerial && (uptime > 4)) { PzemEvery250ms(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemCommand();
-      break;
-    case FUNC_INIT:
-      PzemSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_04_mcp39f501.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_MCP39F501
-
-
-
-
-
-
-
-#define XNRG_04 4
-
-#define MCP_BAUDRATE 4800
-#define MCP_TIMEOUT 4
-#define MCP_CALIBRATION_TIMEOUT 2
-
-#define MCP_CALIBRATE_POWER 0x001
-#define MCP_CALIBRATE_VOLTAGE 0x002
-#define MCP_CALIBRATE_CURRENT 0x004
-#define MCP_CALIBRATE_FREQUENCY 0x008
-#define MCP_SINGLE_WIRE_FLAG 0x100
-
-#define MCP_START_FRAME 0xA5
-#define MCP_ACK_FRAME 0x06
-#define MCP_ERROR_NAK 0x15
-#define MCP_ERROR_CRC 0x51
-
-#define MCP_SINGLE_WIRE 0xAB
-
-#define MCP_SET_ADDRESS 0x41
-
-#define MCP_READ 0x4E
-#define MCP_READ_16 0x52
-#define MCP_READ_32 0x44
-
-#define MCP_WRITE 0x4D
-#define MCP_WRITE_16 0x57
-#define MCP_WRITE_32 0x45
-
-#define MCP_SAVE_REGISTERS 0x53
-
-#define MCP_CALIBRATION_BASE 0x0028
-#define MCP_CALIBRATION_LEN 52
-
-#define MCP_FREQUENCY_REF_BASE 0x0094
-#define MCP_FREQUENCY_GAIN_BASE 0x00AE
-#define MCP_FREQUENCY_LEN 4
-
-#define MCP_BUFFER_SIZE 60
-
-#include <TasmotaSerial.h>
-TasmotaSerial *McpSerial = nullptr;
-
-typedef struct mcp_cal_registers_type {
-  uint16_t gain_current_rms;
-  uint16_t gain_voltage_rms;
-  uint16_t gain_active_power;
-  uint16_t gain_reactive_power;
-  sint32_t offset_current_rms;
-  sint32_t offset_active_power;
-  sint32_t offset_reactive_power;
-  sint16_t dc_offset_current;
-  sint16_t phase_compensation;
-  uint16_t apparent_power_divisor;
-
-  uint32_t system_configuration;
-  uint16_t dio_configuration;
-  uint32_t range;
-
-  uint32_t calibration_current;
-  uint16_t calibration_voltage;
-  uint32_t calibration_active_power;
-  uint32_t calibration_reactive_power;
-  uint16_t accumulation_interval;
-} mcp_cal_registers_type;
-
-char *mcp_buffer = nullptr;
-unsigned long mcp_window = 0;
-unsigned long mcp_kWhcounter = 0;
-uint32_t mcp_system_configuration = 0x03000000;
-uint32_t mcp_active_power;
-
-
-uint32_t mcp_current_rms;
-uint16_t mcp_voltage_rms;
-uint16_t mcp_line_frequency;
-
-uint8_t mcp_address = 0;
-uint8_t mcp_calibration_active = 0;
-uint8_t mcp_init = 0;
-uint8_t mcp_timeout = 0;
-uint8_t mcp_calibrate = 0;
-uint8_t mcp_byte_counter = 0;
-
-
-
-
-
-
-uint8_t McpChecksum(uint8_t *data)
-{
-  uint8_t checksum = 0;
-  uint8_t offset = 0;
-  uint8_t len = data[1] -1;
-
-  for (uint32_t i = offset; i < len; i++) { checksum += data[i]; }
-  return checksum;
-}
-
-unsigned long McpExtractInt(char *data, uint8_t offset, uint8_t size)
-{
- unsigned long result = 0;
- unsigned long pow = 1;
-
- for (uint32_t i = 0; i < size; i++) {
-  result = result + (uint8_t)data[offset + i] * pow;
-  pow = pow * 256;
- }
- return result;
-}
-
-void McpSetInt(unsigned long value, uint8_t *data, uint8_t offset, size_t size)
-{
- for (uint32_t i = 0; i < size; i++) {
-  data[offset + i] = ((value >> (i * 8)) & 0xFF);
- }
-}
-
-void McpSend(uint8_t *data)
-{
-  if (mcp_timeout) { return; }
-  mcp_timeout = MCP_TIMEOUT;
-
-  data[0] = MCP_START_FRAME;
-  data[data[1] -1] = McpChecksum(data);
-
-
-
-  for (uint32_t i = 0; i < data[1]; i++) {
-    McpSerial->write(data[i]);
-  }
-}
-
-
-
-void McpGetAddress(void)
-{
-  uint8_t data[] = { MCP_START_FRAME, 7, MCP_SET_ADDRESS, 0x00, 0x26, MCP_READ_16, 0x00 };
-
-  McpSend(data);
-}
-
-void McpAddressReceive(void)
-{
-
-  mcp_address = mcp_buffer[3];
-}
-
-
-
-void McpGetCalibration(void)
-{
-  if (mcp_calibration_active) { return; }
-  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
-
-  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, (MCP_CALIBRATION_BASE >> 8) & 0xFF, MCP_CALIBRATION_BASE & 0xFF, MCP_READ, MCP_CALIBRATION_LEN, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseCalibration(void)
-{
-  bool action = false;
-  mcp_cal_registers_type cal_registers;
-
-
-  cal_registers.gain_current_rms = McpExtractInt(mcp_buffer, 2, 2);
-  cal_registers.gain_voltage_rms = McpExtractInt(mcp_buffer, 4, 2);
-  cal_registers.gain_active_power = McpExtractInt(mcp_buffer, 6, 2);
-  cal_registers.gain_reactive_power = McpExtractInt(mcp_buffer, 8, 2);
-  cal_registers.offset_current_rms = McpExtractInt(mcp_buffer, 10, 4);
-  cal_registers.offset_active_power = McpExtractInt(mcp_buffer, 14, 4);
-  cal_registers.offset_reactive_power = McpExtractInt(mcp_buffer, 18, 4);
-  cal_registers.dc_offset_current = McpExtractInt(mcp_buffer, 22, 2);
-  cal_registers.phase_compensation = McpExtractInt(mcp_buffer, 24, 2);
-  cal_registers.apparent_power_divisor = McpExtractInt(mcp_buffer, 26, 2);
-
-  cal_registers.system_configuration = McpExtractInt(mcp_buffer, 28, 4);
-  cal_registers.dio_configuration = McpExtractInt(mcp_buffer, 32, 2);
-  cal_registers.range = McpExtractInt(mcp_buffer, 34, 4);
-
-  cal_registers.calibration_current = McpExtractInt(mcp_buffer, 38, 4);
-  cal_registers.calibration_voltage = McpExtractInt(mcp_buffer, 42, 2);
-  cal_registers.calibration_active_power = McpExtractInt(mcp_buffer, 44, 4);
-  cal_registers.calibration_reactive_power = McpExtractInt(mcp_buffer, 48, 4);
-  cal_registers.accumulation_interval = McpExtractInt(mcp_buffer, 52, 2);
-
-  if (mcp_calibrate & MCP_CALIBRATE_POWER) {
-    cal_registers.calibration_active_power = Settings.energy_power_calibration;
-    if (McpCalibrationCalc(&cal_registers, 16)) { action = true; }
-  }
-  if (mcp_calibrate & MCP_CALIBRATE_VOLTAGE) {
-    cal_registers.calibration_voltage = Settings.energy_voltage_calibration;
-    if (McpCalibrationCalc(&cal_registers, 0)) { action = true; }
-  }
-  if (mcp_calibrate & MCP_CALIBRATE_CURRENT) {
-    cal_registers.calibration_current = Settings.energy_current_calibration;
-    if (McpCalibrationCalc(&cal_registers, 8)) { action = true; }
-  }
-  mcp_timeout = 0;
-  if (action) { McpSetCalibration(&cal_registers); }
-
-  mcp_calibrate = 0;
-
-  Settings.energy_power_calibration = cal_registers.calibration_active_power;
-  Settings.energy_voltage_calibration = cal_registers.calibration_voltage;
-  Settings.energy_current_calibration = cal_registers.calibration_current;
-
-  mcp_system_configuration = cal_registers.system_configuration;
-
-  if (mcp_system_configuration & MCP_SINGLE_WIRE_FLAG) {
-    mcp_system_configuration &= ~MCP_SINGLE_WIRE_FLAG;
-   McpSetSystemConfiguration(2);
-  }
-}
-
-bool McpCalibrationCalc(struct mcp_cal_registers_type *cal_registers, uint8_t range_shift)
-{
-  uint32_t measured;
-  uint32_t expected;
-  uint16_t *gain;
-  uint32_t new_gain;
-
-  if (range_shift == 0) {
-    measured = mcp_voltage_rms;
-    expected = cal_registers->calibration_voltage;
-    gain = &(cal_registers->gain_voltage_rms);
-  } else if (range_shift == 8) {
-    measured = mcp_current_rms;
-    expected = cal_registers->calibration_current;
-    gain = &(cal_registers->gain_current_rms);
-  } else if (range_shift == 16) {
-    measured = mcp_active_power;
-    expected = cal_registers->calibration_active_power;
-    gain = &(cal_registers->gain_active_power);
-  } else {
-    return false;
-  }
-
-  if (measured == 0) {
-    return false;
-  }
-
-  uint32_t range = (cal_registers->range >> range_shift) & 0xFF;
-
-calc:
-  new_gain = (*gain) * expected / measured;
-
-  if (new_gain < 25000) {
-    range++;
-    if (measured > 6) {
-      measured = measured / 2;
-      goto calc;
-    }
-  }
-
-  if (new_gain > 55000) {
-    range--;
-    measured = measured * 2;
-    goto calc;
-  }
-
-  *gain = new_gain;
-  uint32_t old_range = (cal_registers->range >> range_shift) & 0xFF;
-  cal_registers->range = cal_registers->range ^ (old_range << range_shift);
-  cal_registers->range = cal_registers->range | (range << range_shift);
-
-  return true;
-}
-
-
-
-
-
-
-void McpSetCalibration(struct mcp_cal_registers_type *cal_registers)
-{
-  uint8_t data[7 + MCP_CALIBRATION_LEN + 2 + 1];
-
-  data[1] = sizeof(data);
-  data[2] = MCP_SET_ADDRESS;
-  data[3] = (MCP_CALIBRATION_BASE >> 8) & 0xFF;
-  data[4] = (MCP_CALIBRATION_BASE >> 0) & 0xFF;
-
-  data[5] = MCP_WRITE;
-  data[6] = MCP_CALIBRATION_LEN;
-
-  McpSetInt(cal_registers->gain_current_rms, data, 0+7, 2);
-  McpSetInt(cal_registers->gain_voltage_rms, data, 2+7, 2);
-  McpSetInt(cal_registers->gain_active_power, data, 4+7, 2);
-  McpSetInt(cal_registers->gain_reactive_power, data, 6+7, 2);
-  McpSetInt(cal_registers->offset_current_rms, data, 8+7, 4);
-  McpSetInt(cal_registers->offset_active_power, data, 12+7, 4);
-  McpSetInt(cal_registers->offset_reactive_power, data, 16+7, 4);
-  McpSetInt(cal_registers->dc_offset_current, data, 20+7, 2);
-  McpSetInt(cal_registers->phase_compensation, data, 22+7, 2);
-  McpSetInt(cal_registers->apparent_power_divisor, data, 24+7, 2);
-
-  McpSetInt(cal_registers->system_configuration, data, 26+7, 4);
-  McpSetInt(cal_registers->dio_configuration, data, 30+7, 2);
-  McpSetInt(cal_registers->range, data, 32+7, 4);
-
-  McpSetInt(cal_registers->calibration_current, data, 36+7, 4);
-  McpSetInt(cal_registers->calibration_voltage, data, 40+7, 2);
-  McpSetInt(cal_registers->calibration_active_power, data, 42+7, 4);
-  McpSetInt(cal_registers->calibration_reactive_power, data, 46+7, 4);
-  McpSetInt(cal_registers->accumulation_interval, data, 50+7, 2);
-
-  data[MCP_CALIBRATION_LEN+7] = MCP_SAVE_REGISTERS;
-  data[MCP_CALIBRATION_LEN+8] = mcp_address;
-
-  McpSend(data);
-}
-
-
-
-void McpSetSystemConfiguration(uint16 interval)
-{
-
-  uint8_t data[17];
-
-  data[ 1] = sizeof(data);
-  data[ 2] = MCP_SET_ADDRESS;
-  data[ 3] = 0x00;
-  data[ 4] = 0x42;
-  data[ 5] = MCP_WRITE_32;
-  data[ 6] = (mcp_system_configuration >> 24) & 0xFF;
-  data[ 7] = (mcp_system_configuration >> 16) & 0xFF;
-  data[ 8] = (mcp_system_configuration >> 8) & 0xFF;
-  data[ 9] = (mcp_system_configuration >> 0) & 0xFF;
-  data[10] = MCP_SET_ADDRESS;
-  data[11] = 0x00;
-  data[12] = 0x5A;
-  data[13] = MCP_WRITE_16;
-  data[14] = (interval >> 8) & 0xFF;
-  data[15] = (interval >> 0) & 0xFF;
-
-  McpSend(data);
-}
-
-
-
-void McpGetFrequency(void)
-{
-  if (mcp_calibration_active) { return; }
-  mcp_calibration_active = MCP_CALIBRATION_TIMEOUT;
-
-  uint8_t data[] = { MCP_START_FRAME, 11, MCP_SET_ADDRESS, (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF, MCP_FREQUENCY_REF_BASE & 0xFF, MCP_READ_16,
-                                          MCP_SET_ADDRESS, (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF, MCP_FREQUENCY_GAIN_BASE & 0xFF, MCP_READ_16, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseFrequency(void)
-{
-
-  uint16_t line_frequency_ref = mcp_buffer[2] * 256 + mcp_buffer[3];
-  uint16_t gain_line_frequency = mcp_buffer[4] * 256 + mcp_buffer[5];
-
-  if (mcp_calibrate & MCP_CALIBRATE_FREQUENCY) {
-    line_frequency_ref = Settings.energy_frequency_calibration;
-
-    if ((0xFFFF == mcp_line_frequency) || (0 == gain_line_frequency)) {
-      mcp_line_frequency = 50000;
-      gain_line_frequency = 0x8000;
-    }
-    gain_line_frequency = gain_line_frequency * line_frequency_ref / mcp_line_frequency;
-
-    mcp_timeout = 0;
-    McpSetFrequency(line_frequency_ref, gain_line_frequency);
-  }
-
-  Settings.energy_frequency_calibration = line_frequency_ref;
-
-  mcp_calibrate = 0;
-}
-
-void McpSetFrequency(uint16_t line_frequency_ref, uint16_t gain_line_frequency)
-{
-
-  uint8_t data[17];
-
-  data[ 1] = sizeof(data);
-  data[ 2] = MCP_SET_ADDRESS;
-  data[ 3] = (MCP_FREQUENCY_REF_BASE >> 8) & 0xFF;
-  data[ 4] = (MCP_FREQUENCY_REF_BASE >> 0) & 0xFF;
-
-  data[ 5] = MCP_WRITE_16;
-  data[ 6] = (line_frequency_ref >> 8) & 0xFF;
-  data[ 7] = (line_frequency_ref >> 0) & 0xFF;
-
-  data[ 8] = MCP_SET_ADDRESS;
-  data[ 9] = (MCP_FREQUENCY_GAIN_BASE >> 8) & 0xFF;
-  data[10] = (MCP_FREQUENCY_GAIN_BASE >> 0) & 0xFF;
-
-  data[11] = MCP_WRITE_16;
-  data[12] = (gain_line_frequency >> 8) & 0xFF;
-  data[13] = (gain_line_frequency >> 0) & 0xFF;
-
-  data[14] = MCP_SAVE_REGISTERS;
-  data[15] = mcp_address;
-
-  McpSend(data);
-}
-
-
-
-void McpGetData(void)
-{
-  uint8_t data[] = { MCP_START_FRAME, 8, MCP_SET_ADDRESS, 0x00, 0x04, MCP_READ, 22, 0x00 };
-
-  McpSend(data);
-}
-
-void McpParseData(void)
-{
-
-
-
-
-
-  mcp_current_rms = McpExtractInt(mcp_buffer, 2, 4);
-  mcp_voltage_rms = McpExtractInt(mcp_buffer, 6, 2);
-  mcp_active_power = McpExtractInt(mcp_buffer, 8, 4);
-
-
-  mcp_line_frequency = McpExtractInt(mcp_buffer, 22, 2);
-
-  if (Energy.power_on) {
-    Energy.data_valid[0] = 0;
-    Energy.frequency[0] = (float)mcp_line_frequency / 1000;
-    Energy.voltage[0] = (float)mcp_voltage_rms / 10;
-    Energy.active_power[0] = (float)mcp_active_power / 100;
-    if (0 == Energy.active_power[0]) {
-      Energy.current[0] = 0;
-    } else {
-      Energy.current[0] = (float)mcp_current_rms / 10000;
-    }
-  } else {
-    Energy.data_valid[0] = ENERGY_WATCHDOG;
-  }
-}
-
-
-
-void McpSerialInput(void)
-{
-  while ((McpSerial->available()) && (mcp_byte_counter < MCP_BUFFER_SIZE)) {
-    yield();
-    mcp_buffer[mcp_byte_counter++] = McpSerial->read();
-    mcp_window = millis();
-  }
-
-
-  if ((mcp_byte_counter) && (millis() - mcp_window > (24000 / MCP_BAUDRATE) +1)) {
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, (uint8_t*)mcp_buffer, mcp_byte_counter);
-
-    if (MCP_BUFFER_SIZE == mcp_byte_counter) {
-
-    }
-    else if (1 == mcp_byte_counter) {
-      if (MCP_ERROR_CRC == mcp_buffer[0]) {
-
-        mcp_timeout = 0;
-      }
-      else if (MCP_ERROR_NAK == mcp_buffer[0]) {
-
-        mcp_timeout = 0;
-      }
-    }
-    else if (MCP_ACK_FRAME == mcp_buffer[0]) {
-      if (mcp_byte_counter == mcp_buffer[1]) {
-
-        if (McpChecksum((uint8_t *)mcp_buffer) != mcp_buffer[mcp_byte_counter -1]) {
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("MCP: " D_CHECKSUM_FAILURE));
-        } else {
-          if (5 == mcp_buffer[1]) { McpAddressReceive(); }
-          if (25 == mcp_buffer[1]) { McpParseData(); }
-          if (MCP_CALIBRATION_LEN + 3 == mcp_buffer[1]) { McpParseCalibration(); }
-          if (MCP_FREQUENCY_LEN + 3 == mcp_buffer[1]) { McpParseFrequency(); }
-        }
-
-      }
-      mcp_timeout = 0;
-    }
-    else if (MCP_SINGLE_WIRE == mcp_buffer[0]) {
-      mcp_timeout = 0;
-    }
-
-    mcp_byte_counter = 0;
-    McpSerial->flush();
-  }
-}
-
-
-
-void McpEverySecond(void)
-{
-  if (Energy.data_valid[0] > ENERGY_WATCHDOG) {
-    mcp_voltage_rms = 0;
-    mcp_current_rms = 0;
-    mcp_active_power = 0;
-    mcp_line_frequency = 0;
-  }
-
-  if (mcp_active_power) {
-    Energy.kWhtoday_delta += ((mcp_active_power * 10) / 36);
-    EnergyUpdateToday();
-  }
-
-  if (mcp_timeout) {
-    mcp_timeout--;
-  }
-  else if (mcp_calibration_active) {
-    mcp_calibration_active--;
-  }
-  else if (mcp_init) {
-    if (2 == mcp_init) {
-      McpGetCalibration();
-    }
-    else if (1 == mcp_init) {
-      McpGetFrequency();
-    }
-    mcp_init--;
-  }
-  else if (!mcp_address) {
-    McpGetAddress();
-  }
-  else {
-    McpGetData();
-  }
-}
-
-void McpSnsInit(void)
-{
-
-  McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1);
-  if (McpSerial->begin(MCP_BAUDRATE)) {
-    if (McpSerial->hardwareSerial()) {
-      ClaimSerial();
-      mcp_buffer = serial_in_buffer;
-    } else {
-      mcp_buffer = (char*)(malloc(MCP_BUFFER_SIZE));
-    }
-    DigitalWrite(GPIO_MCP39F5_RST, 1);
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void McpDrvInit(void)
-{
-  if ((pin[GPIO_MCP39F5_RX] < 99) && (pin[GPIO_MCP39F5_TX] < 99)) {
-    if (pin[GPIO_MCP39F5_RST] < 99) {
-      pinMode(pin[GPIO_MCP39F5_RST], OUTPUT);
-      digitalWrite(pin[GPIO_MCP39F5_RST], 0);
-    }
-    mcp_calibrate = 0;
-    mcp_timeout = 2;
-    mcp_init = 2;
-    energy_flg = XNRG_04;
-  }
-}
-
-bool McpCommand(void)
-{
-  bool serviced = true;
-  unsigned long value = 0;
-
-  if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_active_power) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 100);
-      if ((value > 100) && (value < 200000)) {
-        Settings.energy_power_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_POWER;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_voltage_rms) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
-      if ((value > 1000) && (value < 2600)) {
-        Settings.energy_voltage_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_VOLTAGE;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_current_rms) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 10);
-      if ((value > 100) && (value < 80000)) {
-        Settings.energy_current_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_CURRENT;
-        McpGetCalibration();
-      }
-    }
-  }
-  else if (CMND_FREQUENCYSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && mcp_line_frequency) {
-      value = (unsigned long)(CharToFloat(XdrvMailbox.data) * 1000);
-      if ((value > 45000) && (value < 65000)) {
-        Settings.energy_frequency_calibration = value;
-        mcp_calibrate |= MCP_CALIBRATE_FREQUENCY;
-        McpGetFrequency();
-      }
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg04(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_LOOP:
-      if (McpSerial) { McpSerialInput(); }
-      break;
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (McpSerial) { McpEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = McpCommand();
-      break;
-    case FUNC_INIT:
-      McpSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      McpDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM_AC
-# 33 "S:/Development/Tasmota/tasmota/xnrg_05_pzem_ac.ino"
-#define XNRG_05 5
-
-const uint8_t PZEM_AC_DEVICE_ADDRESS = 0x01;
-const uint32_t PZEM_AC_STABILIZE = 30;
-
-#include <TasmotaModbus.h>
-TasmotaModbus *PzemAcModbus;
-
-struct PZEMAC {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t phase = 0;
-  uint8_t address = 0;
-  uint8_t address_step = ADDR_IDLE;
-} PzemAc;
-
-void PzemAcEverySecond(void)
-{
-  bool data_ready = PzemAcModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[30];
-
-    uint8_t registers = 10;
-    if (ADDR_RECEIVE == PzemAc.address_step) {
-      registers = 2;
-      PzemAc.address_step--;
-    }
-    uint8_t error = PzemAcModbus->ReceiveBuffer(buffer, registers);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemAcModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAC: PzemAc %d error %d"), PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, error);
-    } else {
-      Energy.data_valid[PzemAc.phase] = 0;
-      if (10 == registers) {
-
-
-
-
-
-        Energy.voltage[PzemAc.phase] = (float)((buffer[3] << 8) + buffer[4]) / 10.0;
-        Energy.current[PzemAc.phase] = (float)((buffer[7] << 24) + (buffer[8] << 16) + (buffer[5] << 8) + buffer[6]) / 1000.0;
-        Energy.active_power[PzemAc.phase] = (float)((buffer[11] << 24) + (buffer[12] << 16) + (buffer[9] << 8) + buffer[10]) / 10.0;
-        Energy.frequency[PzemAc.phase] = (float)((buffer[17] << 8) + buffer[18]) / 10.0;
-        Energy.power_factor[PzemAc.phase] = (float)((buffer[19] << 8) + buffer[20]) / 100.0;
-
-        PzemAc.energy += (float)((buffer[15] << 24) + (buffer[16] << 16) + (buffer[13] << 8) + buffer[14]);
-        if (PzemAc.phase == Energy.phase_count -1) {
-          if (PzemAc.energy > PzemAc.last_energy) {
-            if (uptime > PZEM_AC_STABILIZE) {
-              EnergyUpdateTotal(PzemAc.energy, false);
-            }
-            PzemAc.last_energy = PzemAc.energy;
-          }
-          PzemAc.energy = 0;
-        }
-
-      }
-    }
-  }
-
-  if (0 == PzemAc.send_retry || data_ready) {
-    if (0 == PzemAc.phase) {
-      PzemAc.phase = Energy.phase_count -1;
-    } else {
-      PzemAc.phase--;
-    }
-    PzemAc.send_retry = ENERGY_WATCHDOG;
-    if (ADDR_SEND == PzemAc.address_step) {
-      PzemAcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemAc.address);
-      PzemAc.address_step--;
-    } else {
-      PzemAcModbus->Send(PZEM_AC_DEVICE_ADDRESS + PzemAc.phase, 0x04, 0, 10);
-    }
-  }
-  else {
-    PzemAc.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == PzemAc.send_retry) && (uptime < PZEM_AC_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemAcSnsInit(void)
-{
-  PzemAcModbus = new TasmotaModbus(pin[GPIO_PZEM016_RX], pin[GPIO_PZEM0XX_TX]);
-  uint8_t result = PzemAcModbus->Begin(9600);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.phase_count = 3;
-    PzemAc.phase = 0;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemAcDrvInit(void)
-{
-  if ((pin[GPIO_PZEM016_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_05;
-  }
-}
-
-bool PzemAcCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    PzemAc.address = XdrvMailbox.payload;
-    PzemAc.address_step = ADDR_SEND;
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg05(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { PzemAcEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemAcCommand();
-      break;
-    case FUNC_INIT:
-      PzemAcSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemAcDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_PZEM_DC
-# 32 "S:/Development/Tasmota/tasmota/xnrg_06_pzem_dc.ino"
-#define XNRG_06 6
-
-const uint8_t PZEM_DC_DEVICE_ADDRESS = 0x01;
-const uint32_t PZEM_DC_STABILIZE = 30;
-
-#include <TasmotaModbus.h>
-TasmotaModbus *PzemDcModbus;
-
-struct PZEMDC {
-  float energy = 0;
-  float last_energy = 0;
-  uint8_t send_retry = 0;
-  uint8_t channel = 0;
-  uint8_t address = 0;
-  uint8_t address_step = ADDR_IDLE;
-} PzemDc;
-
-void PzemDcEverySecond(void)
-{
-  bool data_ready = PzemDcModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[26];
-
-    uint8_t registers = 8;
-    if (ADDR_RECEIVE == PzemDc.address_step) {
-      registers = 2;
-      PzemDc.address_step--;
-    }
-    uint8_t error = PzemDcModbus->ReceiveBuffer(buffer, registers);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, PzemDcModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PDC: PzemDc %d error %d"), PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, error);
-    } else {
-      Energy.data_valid[PzemDc.channel] = 0;
-      if (8 == registers) {
-
-
-
-
-
-        Energy.voltage[PzemDc.channel] = (float)((buffer[3] << 8) + buffer[4]) / 100.0;
-        Energy.current[PzemDc.channel] = (float)((buffer[5] << 8) + buffer[6]) / 100.0;
-        Energy.active_power[PzemDc.channel] = (float)((buffer[9] << 24) + (buffer[10] << 16) + (buffer[7] << 8) + buffer[8]) / 10.0;
-
-        PzemDc.energy += (float)((buffer[13] << 24) + (buffer[14] << 16) + (buffer[11] << 8) + buffer[12]);
-        if (PzemDc.channel == Energy.phase_count -1) {
-          if (PzemDc.energy > PzemDc.last_energy) {
-            if (uptime > PZEM_DC_STABILIZE) {
-              EnergyUpdateTotal(PzemDc.energy, false);
-            }
-            PzemDc.last_energy = PzemDc.energy;
-          }
-          PzemDc.energy = 0;
-        }
-      }
-    }
-  }
-
-  if (0 == PzemDc.send_retry || data_ready) {
-    if (0 == PzemDc.channel) {
-      PzemDc.channel = Energy.phase_count -1;
-    } else {
-      PzemDc.channel--;
-    }
-    PzemDc.send_retry = ENERGY_WATCHDOG;
-    if (ADDR_SEND == PzemDc.address_step) {
-      PzemDcModbus->Send(0xF8, 0x06, 0x0002, (uint16_t)PzemDc.address);
-      PzemDc.address_step--;
-    } else {
-      PzemDcModbus->Send(PZEM_DC_DEVICE_ADDRESS + PzemDc.channel, 0x04, 0, 8);
-    }
-  }
-  else {
-    PzemDc.send_retry--;
-    if ((Energy.phase_count > 1) && (0 == PzemDc.send_retry) && (uptime < PZEM_DC_STABILIZE)) {
-      Energy.phase_count--;
-    }
-  }
-}
-
-void PzemDcSnsInit(void)
-{
-  PzemDcModbus = new TasmotaModbus(pin[GPIO_PZEM017_RX], pin[GPIO_PZEM0XX_TX]);
-  uint8_t result = PzemDcModbus->Begin(9600, 2);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.type_dc = true;
-    Energy.phase_count = 3;
-    PzemDc.channel = 0;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void PzemDcDrvInit(void)
-{
-  if ((pin[GPIO_PZEM017_RX] < 99) && (pin[GPIO_PZEM0XX_TX] < 99)) {
-    energy_flg = XNRG_06;
-  }
-}
-
-bool PzemDcCommand(void)
-{
-  bool serviced = true;
-
-  if (CMND_MODULEADDRESS == Energy.command_code) {
-    PzemDc.address = XdrvMailbox.payload;
-    PzemDc.address_step = ADDR_SEND;
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg06(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { PzemDcEverySecond(); }
-      break;
-    case FUNC_COMMAND:
-      result = PzemDcCommand();
-      break;
-    case FUNC_INIT:
-      PzemDcSnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      PzemDcDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
-#ifdef USE_I2C
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_ADE7953
-# 31 "S:/Development/Tasmota/tasmota/xnrg_07_ade7953.ino"
-#define XNRG_07 7
-#define XI2C_07 7
-
-#define ADE7953_PREF 1540
-#define ADE7953_UREF 26000
-#define ADE7953_IREF 10000
-
-#define ADE7953_ADDR 0x38
-
-const uint16_t Ade7953Registers[] {
-  0x31B,
-  0x313,
-  0x311,
-  0x315,
-  0x31A,
-  0x312,
-  0x310,
-  0x314,
-  0x31C,
-  0x10E
-};
-
-struct Ade7953 {
-  uint32_t voltage_rms = 0;
-  uint32_t period = 0;
-  uint32_t current_rms[2] = { 0, 0 };
-  uint32_t active_power[2] = { 0, 0 };
-  uint8_t init_step = 0;
-} Ade7953;
-
-int Ade7953RegSize(uint16_t reg)
-{
-  int size = 0;
-  switch ((reg >> 8) & 0x0F) {
-    case 0x03:
-      size++;
-    case 0x02:
-      size++;
-    case 0x01:
-      size++;
-    case 0x00:
-    case 0x07:
-    case 0x08:
-      size++;
-  }
-  return size;
-}
-
-void Ade7953Write(uint16_t reg, uint32_t val)
-{
-  int size = Ade7953RegSize(reg);
-  if (size) {
-    Wire.beginTransmission(ADE7953_ADDR);
-    Wire.write((reg >> 8) & 0xFF);
-    Wire.write(reg & 0xFF);
-    while (size--) {
-      Wire.write((val >> (8 * size)) & 0xFF);
-    }
-    Wire.endTransmission();
-    delayMicroseconds(5);
-  }
-}
-
-int32_t Ade7953Read(uint16_t reg)
-{
- uint32_t response = 0;
-
-  int size = Ade7953RegSize(reg);
-  if (size) {
-    Wire.beginTransmission(ADE7953_ADDR);
-    Wire.write((reg >> 8) & 0xFF);
-    Wire.write(reg & 0xFF);
-    Wire.endTransmission(0);
-    Wire.requestFrom(ADE7953_ADDR, size);
-    if (size <= Wire.available()) {
-      for (uint32_t i = 0; i < size; i++) {
-        response = response << 8 | Wire.read();
-      }
-    }
-  }
- return response;
-}
-
-void Ade7953Init(void)
-{
-  Ade7953Write(0x102, 0x0004);
-  Ade7953Write(0x0FE, 0x00AD);
-  Ade7953Write(0x120, 0x0030);
-}
-
-void Ade7953GetData(void)
-{
-  int32_t reg[2][4];
-  for (uint32_t i = 0; i < sizeof(Ade7953Registers)/sizeof(uint16_t); i++) {
-    int32_t value = Ade7953Read(Ade7953Registers[i]);
-    if (8 == i) {
-      Ade7953.voltage_rms = value;
-    } else if (9 == i) {
-      Ade7953.period = value;
-    } else {
-      reg[i >> 2][i &3] = value;
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("ADE: %d, %d, [%d, %d, %d, %d], [%d, %d, %d, %d]"),
-    Ade7953.voltage_rms, Ade7953.period,
-    reg[0][0], reg[0][1], reg[0][2], reg[0][3],
-    reg[1][0], reg[1][1], reg[1][2], reg[1][3]);
-
-  uint32_t apparent_power[2] = { 0, 0 };
-  uint32_t reactive_power[2] = { 0, 0 };
-
-  for (uint32_t channel = 0; channel < 2; channel++) {
-    Ade7953.current_rms[channel] = reg[channel][0];
-    if (Ade7953.current_rms[channel] < 2000) {
-      Ade7953.current_rms[channel] = 0;
-      Ade7953.active_power[channel] = 0;
-    } else {
-      Ade7953.active_power[channel] = abs(reg[channel][1]);
-      apparent_power[channel] = abs(reg[channel][2]);
-      reactive_power[channel] = abs(reg[channel][3]);
-    }
-  }
-
-  uint32_t current_rms_sum = Ade7953.current_rms[0] + Ade7953.current_rms[1];
-  uint32_t active_power_sum = Ade7953.active_power[0] + Ade7953.active_power[1];
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ADE: U %d, C %d, I %d + %d = %d, P %d + %d = %d"),
-    Ade7953.voltage_rms, Ade7953.period,
-    Ade7953.current_rms[0], Ade7953.current_rms[1], current_rms_sum,
-    Ade7953.active_power[0], Ade7953.active_power[1], active_power_sum);
-
-  if (Energy.power_on) {
-    Energy.voltage[0] = (float)Ade7953.voltage_rms / Settings.energy_voltage_calibration;
-    Energy.frequency[0] = 223750.0f / ( (float)Ade7953.period + 1);
-
-    for (uint32_t channel = 0; channel < 2; channel++) {
-      Energy.data_valid[channel] = 0;
-      Energy.active_power[channel] = (float)Ade7953.active_power[channel] / (Settings.energy_power_calibration / 10);
-      Energy.reactive_power[channel] = (float)reactive_power[channel] / (Settings.energy_power_calibration / 10);
-      Energy.apparent_power[channel] = (float)apparent_power[channel] / (Settings.energy_power_calibration / 10);
-      if (0 == Energy.active_power[channel]) {
-        Energy.current[channel] = 0;
-      } else {
-        Energy.current[channel] = (float)Ade7953.current_rms[channel] / (Settings.energy_current_calibration * 10);
-      }
-    }
-  } else {
-    Energy.data_valid[0] = ENERGY_WATCHDOG;
-    Energy.data_valid[1] = ENERGY_WATCHDOG;
-  }
-
-  if (active_power_sum) {
-    Energy.kWhtoday_delta += ((active_power_sum * (100000 / (Settings.energy_power_calibration / 10))) / 3600);
-    EnergyUpdateToday();
-  }
-}
-
-void Ade7953EnergyEverySecond(void)
-{
- if (Ade7953.init_step) {
-    if (1 == Ade7953.init_step) {
-      Ade7953Init();
-   }
-    Ade7953.init_step--;
- } else {
-  Ade7953GetData();
- }
-}
-
-void Ade7953DrvInit(void)
-{
-  if (pin[GPIO_ADE7953_IRQ] < 99) {
-    delay(100);
-    if (I2cSetDevice(ADE7953_ADDR)) {
-      if (HLW_PREF_PULSE == Settings.energy_power_calibration) {
-        Settings.energy_power_calibration = ADE7953_PREF;
-        Settings.energy_voltage_calibration = ADE7953_UREF;
-        Settings.energy_current_calibration = ADE7953_IREF;
-      }
-      I2cSetActiveFound(ADE7953_ADDR, "ADE7953");
-      Ade7953.init_step = 2;
-
-      Energy.phase_count = 2;
-      Energy.voltage_common = true;
-
-      energy_flg = XNRG_07;
-    }
-  }
-}
-
-bool Ade7953Command(void)
-{
-  bool serviced = true;
-
-  uint32_t channel = (2 == XdrvMailbox.index) ? 1 : 0;
-  uint32_t value = (uint32_t)(CharToFloat(XdrvMailbox.data) * 100);
-
-  if (CMND_POWERCAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_PREF; }
-
-  }
-  else if (CMND_VOLTAGECAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_UREF; }
-
-  }
-  else if (CMND_CURRENTCAL == Energy.command_code) {
-    if (1 == XdrvMailbox.payload) { XdrvMailbox.payload = ADE7953_IREF; }
-
-  }
-  else if (CMND_POWERSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.active_power[channel]) {
-      if ((value > 100) && (value < 200000)) {
-        Settings.energy_power_calibration = (Ade7953.active_power[channel] * 1000) / value;
-      }
-    }
-  }
-  else if (CMND_VOLTAGESET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.voltage_rms) {
-      if ((value > 10000) && (value < 26000)) {
-        Settings.energy_voltage_calibration = (Ade7953.voltage_rms * 100) / value;
-      }
-    }
-  }
-  else if (CMND_CURRENTSET == Energy.command_code) {
-    if (XdrvMailbox.data_len && Ade7953.current_rms[channel]) {
-      if ((value > 2000) && (value < 1000000)) {
-        Settings.energy_current_calibration = ((Ade7953.current_rms[channel] * 100) / value) * 100;
-      }
-    }
-  }
-  else serviced = false;
-
-  return serviced;
-}
-
-
-
-
-
-bool Xnrg07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_07)) { return false; }
-
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      Ade7953EnergyEverySecond();
-      break;
-    case FUNC_COMMAND:
-      result = Ade7953Command();
-      break;
-    case FUNC_PRE_INIT:
-      Ade7953DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_08_sdm120.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_08_sdm120.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SDM120
-
-
-
-
-
-
-#define XNRG_08 8
-
-
-#ifndef SDM120_SPEED
-  #define SDM120_SPEED 2400
-#endif
-
-#ifndef SDM120_ADDR
-  #define SDM120_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Sdm120Modbus;
-
-const uint8_t sdm120_table = 8;
-const uint8_t sdm220_table = 13;
-
-const uint16_t sdm120_start_addresses[] {
-  0x0000,
-  0x0006,
-  0x000C,
-  0x0012,
-  0x0018,
-  0x001E,
-  0x0046,
-  0x0156,
-
-  0X0048,
-  0X004A,
-  0X004C,
-  0X004E,
-  0X0024
-};
-
-struct SDM120 {
-  float total_active = 0;
-  float import_active = NAN;
-  float import_reactive = 0;
-  float export_reactive = 0;
-  float phase_angle = 0;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-  uint8_t start_address_count = sdm220_table;
-} Sdm120;
-
-
-
-void SDM120Every250ms(void)
-{
-  bool data_ready = Sdm120Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Sdm120Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm120Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM120 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Sdm120.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.current[0] = value;
-          break;
-
-        case 2:
-          Energy.active_power[0] = value;
-          break;
-
-        case 3:
-          Energy.apparent_power[0] = value;
-          break;
-
-        case 4:
-          Energy.reactive_power[0] = value;
-          break;
-
-        case 5:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 6:
-          Energy.frequency[0] = value;
-          break;
-
-        case 7:
-          Sdm120.total_active = value;
-          break;
-
-        case 8:
-          Sdm120.import_active = value;
-          break;
-
-        case 9:
-          Energy.export_active = value;
-          break;
-
-        case 10:
-          Sdm120.import_reactive = value;
-          break;
-
-        case 11:
-          Sdm120.export_reactive = value;
-          break;
-
-        case 12:
-          Sdm120.phase_angle = value;
-          break;
-      }
-
-      Sdm120.read_state++;
-      if (Sdm120.read_state == Sdm120.start_address_count) {
-        Sdm120.read_state = 0;
-
-        if (Sdm120.start_address_count > sdm120_table) {
-          if (!isnan(Sdm120.import_active)) {
-            Sdm120.total_active = Sdm120.import_active;
-          } else {
-            Sdm120.start_address_count = sdm120_table;
-          }
-        }
-        EnergyUpdateTotal(Sdm120.total_active, true);
-      }
-    }
-  }
-
-  if (0 == Sdm120.send_retry || data_ready) {
-    Sdm120.send_retry = 5;
-    Sdm120Modbus->Send(SDM120_ADDR, 0x04, sdm120_start_addresses[Sdm120.read_state], 2);
-  } else {
-    Sdm120.send_retry--;
-  }
-}
-
-void Sdm120SnsInit(void)
-{
-  Sdm120Modbus = new TasmotaModbus(pin[GPIO_SDM120_RX], pin[GPIO_SDM120_TX]);
-  uint8_t result = Sdm120Modbus->Begin(SDM120_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Sdm120DrvInit(void)
-{
-  if ((pin[GPIO_SDM120_RX] < 99) && (pin[GPIO_SDM120_TX] < 99)) {
-    energy_flg = XNRG_08;
-  }
-}
-
-void Sdm220Reset(void)
-{
-  if (isnan(Sdm120.import_active)) { return; }
-
-  Sdm120.import_active = 0;
-  Sdm120.import_reactive = 0;
-  Sdm120.export_reactive = 0;
-  Sdm120.phase_angle = 0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_SDM220[] PROGMEM =
-  "{s}" D_IMPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  "{s}" D_EXPORT_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  "{s}" D_PHASE_ANGLE "{m}%s " D_UNIT_ANGLE "{e}";
-#endif
-
-void Sdm220Show(bool json)
-{
-  if (isnan(Sdm120.import_active)) { return; }
-
-  char import_active_chr[FLOATSZ];
-  dtostrfd(Sdm120.import_active, Settings.flag2.energy_resolution, import_active_chr);
-  char import_reactive_chr[FLOATSZ];
-  dtostrfd(Sdm120.import_reactive, Settings.flag2.energy_resolution, import_reactive_chr);
-  char export_reactive_chr[FLOATSZ];
-  dtostrfd(Sdm120.export_reactive, Settings.flag2.energy_resolution, export_reactive_chr);
-  char phase_angle_chr[FLOATSZ];
-  dtostrfd(Sdm120.phase_angle, 2, phase_angle_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_IMPORT_ACTIVE "\":%s,\"" D_JSON_IMPORT_REACTIVE "\":%s,\"" D_JSON_EXPORT_REACTIVE "\":%s,\"" D_JSON_PHASE_ANGLE "\":%s"),
-      import_active_chr, import_reactive_chr, export_reactive_chr, phase_angle_chr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_ENERGY_SDM220, import_reactive_chr, export_reactive_chr, phase_angle_chr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg08(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { SDM120Every250ms(); }
-      break;
-    case FUNC_JSON_APPEND:
-      Sdm220Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Sdm220Show(0);
-      break;
-#endif
-    case FUNC_ENERGY_RESET:
-      Sdm220Reset();
-      break;
-    case FUNC_INIT:
-      Sdm120SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Sdm120DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_DDS2382
-
-
-
-
-
-
-#define XNRG_09 9
-
-#ifndef DDS2382_SPEED
-#define DDS2382_SPEED 9600
-#endif
-#ifndef DDS2382_ADDR
-#define DDS2382_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Dds2382Modbus;
-
-uint8_t Dds2382_send_retry = 0;
-
-void Dds2382EverySecond(void)
-{
-  bool data_ready = Dds2382Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[46];
-
-    uint32_t error = Dds2382Modbus->ReceiveBuffer(buffer, 18);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Dds2382Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "DDS2382 response error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-# 67 "S:/Development/Tasmota/tasmota/xnrg_09_dds2382.ino"
-      Energy.voltage[0] = (float)((buffer[27] << 8) + buffer[28]) / 10.0;
-      Energy.current[0] = (float)((buffer[29] << 8) + buffer[30]) / 100.0;
-      Energy.active_power[0] = (float)((buffer[31] << 8) + buffer[32]);
-      Energy.reactive_power[0] = (float)((buffer[33] << 8) + buffer[34]);
-      Energy.power_factor[0] = (float)((buffer[35] << 8) + buffer[36]) / 1000.0;
-      Energy.frequency[0] = (float)((buffer[37] << 8) + buffer[38]) / 100.0;
-      uint8_t offset = 11;
-      if (Settings.flag3.dds2382_model) {
-        offset = 19;
-      }
-      Energy.export_active = (float)((buffer[offset] << 24) + (buffer[offset +1] << 16) + (buffer[offset +2] << 8) + buffer[offset +3]) / 100.0;
-      float import_active = (float)((buffer[offset +4] << 24) + (buffer[offset +5] << 16) + (buffer[offset +6] << 8) + buffer[offset +7]) / 100.0;
-
-      EnergyUpdateTotal(import_active, true);
-    }
-  }
-
-  if (0 == Dds2382_send_retry || data_ready) {
-    Dds2382_send_retry = 5;
-    Dds2382Modbus->Send(DDS2382_ADDR, 0x03, 0, 18);
-  } else {
-    Dds2382_send_retry--;
-  }
-}
-
-void Dds2382SnsInit(void)
-{
-  Dds2382Modbus = new TasmotaModbus(pin[GPIO_DDS2382_RX], pin[GPIO_DDS2382_TX]);
-  uint8_t result = Dds2382Modbus->Begin(DDS2382_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Dds2382DrvInit(void)
-{
-  if ((pin[GPIO_DDS2382_RX] < 99) && (pin[GPIO_DDS2382_TX] < 99)) {
-    energy_flg = XNRG_09;
-  }
-}
-
-
-
-
-
-bool Xnrg09(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_ENERGY_EVERY_SECOND:
-      if (uptime > 4) { Dds2382EverySecond(); }
-      break;
-    case FUNC_INIT:
-      Dds2382SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Dds2382DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_10_sdm630.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_10_sdm630.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SDM630
-
-
-
-
-
-
-#define XNRG_10 10
-
-
-#ifndef SDM630_SPEED
-  #define SDM630_SPEED 9600
-#endif
-
-#ifndef SDM630_ADDR
-  #define SDM630_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Sdm630Modbus;
-
-const uint16_t sdm630_start_addresses[] {
-  0x0000,
-  0x0002,
-  0x0004,
-  0x0006,
-  0x0008,
-  0x000A,
-  0x000C,
-  0x000E,
-  0x0010,
-  0x0018,
-  0x001A,
-  0x001C,
-  0x001E,
-  0x0020,
-  0x0022,
-  0x0156
-};
-
-struct SDM630 {
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-} Sdm630;
-
-
-
-void SDM630Every250ms(void)
-{
-  bool data_ready = Sdm630Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Sdm630Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Sdm630Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: SDM630 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-      Energy.data_valid[1] = 0;
-      Energy.data_valid[2] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Sdm630.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.voltage[1] = value;
-          break;
-
-        case 2:
-          Energy.voltage[2] = value;
-          break;
-
-        case 3:
-          Energy.current[0] = value;
-          break;
-
-        case 4:
-          Energy.current[1] = value;
-          break;
-
-        case 5:
-          Energy.current[2] = value;
-          break;
-
-        case 6:
-          Energy.active_power[0] = value;
-          break;
-
-        case 7:
-          Energy.active_power[1] = value;
-          break;
-
-        case 8:
-          Energy.active_power[2] = value;
-          break;
-
-        case 9:
-          Energy.reactive_power[0] = value;
-          break;
-
-        case 10:
-          Energy.reactive_power[1] = value;
-          break;
-
-        case 11:
-          Energy.reactive_power[2] = value;
-          break;
-
-        case 12:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 13:
-          Energy.power_factor[1] = value;
-          break;
-
-        case 14:
-          Energy.power_factor[2] = value;
-          break;
-
-        case 15:
-          EnergyUpdateTotal(value, true);
-          break;
-      }
-
-      Sdm630.read_state++;
-      if (sizeof(sdm630_start_addresses)/2 == Sdm630.read_state) {
-        Sdm630.read_state = 0;
-      }
-    }
-  }
-
-  if (0 == Sdm630.send_retry || data_ready) {
-    Sdm630.send_retry = 5;
-    Sdm630Modbus->Send(SDM630_ADDR, 0x04, sdm630_start_addresses[Sdm630.read_state], 2);
-  } else {
-    Sdm630.send_retry--;
-  }
-}
-
-void Sdm630SnsInit(void)
-{
-  Sdm630Modbus = new TasmotaModbus(pin[GPIO_SDM630_RX], pin[GPIO_SDM630_TX]);
-  uint8_t result = Sdm630Modbus->Begin(SDM630_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-    Energy.phase_count = 3;
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Sdm630DrvInit(void)
-{
-  if ((pin[GPIO_SDM630_RX] < 99) && (pin[GPIO_SDM630_TX] < 99)) {
-    energy_flg = XNRG_10;
-  }
-}
-
-
-
-
-
-bool Xnrg10(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { SDM630Every250ms(); }
-      break;
-    case FUNC_INIT:
-      Sdm630SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Sdm630DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_11_ddsu666.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_11_ddsu666.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_DDSU666
-
-
-
-
-#define XNRG_11 11
-
-
-#ifndef DDSU666_SPEED
-  #define DDSU666_SPEED 9600
-#endif
-
-#ifndef DDSU666_ADDR
-  #define DDSU666_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *Ddsu666Modbus;
-
-const uint16_t Ddsu666_start_addresses[] {
-  0x2000,
-  0x2002,
-  0x2004,
-  0x2006,
-  0x200A,
-  0x200E,
-  0X4000,
-  0X400A,
-};
-
-struct DDSU666 {
-  float import_active = NAN;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-} Ddsu666;
-
-
-
-void DDSU666Every250ms(void)
-{
-  bool data_ready = Ddsu666Modbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-
-    uint32_t error = Ddsu666Modbus->ReceiveBuffer(buffer, 2);
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, Ddsu666Modbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SDM: Ddsu666 error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-
-
-
-
-      float value;
-      ((uint8_t*)&value)[3] = buffer[3];
-      ((uint8_t*)&value)[2] = buffer[4];
-      ((uint8_t*)&value)[1] = buffer[5];
-      ((uint8_t*)&value)[0] = buffer[6];
-
-      switch(Ddsu666.read_state) {
-        case 0:
-          Energy.voltage[0] = value;
-          break;
-
-        case 1:
-          Energy.current[0] = value;
-          break;
-
-        case 2:
-          Energy.active_power[0] = value * 1000;
-          break;
-
-        case 3:
-          Energy.reactive_power[0] = value * 1000;
-          break;
-
-        case 4:
-          Energy.power_factor[0] = value;
-          break;
-
-        case 5:
-          Energy.frequency[0] = value;
-          break;
-
-        case 6:
-          Ddsu666.import_active = value;
-          break;
-
-        case 7:
-          Energy.export_active = value;
-          break;
-      }
-
-      Ddsu666.read_state++;
-
-      if (Ddsu666.read_state == 8) {
-        Ddsu666.read_state = 0;
-        EnergyUpdateTotal(Ddsu666.import_active, true);
-      }
-    }
-  }
-
-  if (0 == Ddsu666.send_retry || data_ready) {
-    Ddsu666.send_retry = 5;
-    Ddsu666Modbus->Send(DDSU666_ADDR, 0x04, Ddsu666_start_addresses[Ddsu666.read_state], 2);
-  } else {
-    Ddsu666.send_retry--;
-  }
-}
-
-void Ddsu666SnsInit(void)
-{
-  Ddsu666Modbus = new TasmotaModbus(pin[GPIO_DDSU666_RX], pin[GPIO_DDSU666_TX]);
-  uint8_t result = Ddsu666Modbus->Begin(DDSU666_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void Ddsu666DrvInit(void)
-{
-  if ((pin[GPIO_DDSU666_RX] < 99) && (pin[GPIO_DDSU666_TX] < 99)) {
-    energy_flg = XNRG_11;
-  }
-}
-
-
-
-
-
-bool Xnrg11(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { DDSU666Every250ms(); }
-      break;
-    case FUNC_INIT:
-      Ddsu666SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      Ddsu666DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_12_solaxX1.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_12_solaxX1.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_SOLAX_X1
-
-
-
-
-#define XNRG_12 12
-
-#ifndef SOLAXX1_SPEED
-#define SOLAXX1_SPEED 9600
-#endif
-
-#define INVERTER_ADDRESS 0x0A
-
-#define D_SOLAX_X1 "SolaxX1"
-
-#include <TasmotaSerial.h>
-
-enum solaxX1_Error
-{
-  solaxX1_ERR_NO_ERROR,
-  solaxX1_ERR_CRC_ERROR
-};
-
-union {
-  uint32_t ErrMessage;
-  struct {
-
-    uint8_t TzProtectFault:1;
-    uint8_t MainsLostFault:1;
-    uint8_t GridVoltFault:1;
-    uint8_t GridFreqFault:1;
-    uint8_t PLLLostFault:1;
-    uint8_t BusVoltFault:1;
-    uint8_t ErrBit06:1;
-    uint8_t OciFault:1;
-
-    uint8_t Dci_OCP_Fault:1;
-    uint8_t ResidualCurrentFault:1;
-    uint8_t PvVoltFault:1;
-    uint8_t Ac10Mins_Voltage_Fault:1;
-    uint8_t IsolationFault:1;
-    uint8_t TemperatureOverFault:1;
-    uint8_t FanFault:1;
-    uint8_t ErrBit15:1;
-
-    uint8_t SpiCommsFault:1;
-    uint8_t SciCommsFault:1;
-    uint8_t ErrBit18:1;
-    uint8_t InputConfigFault:1;
-    uint8_t EepromFault:1;
-    uint8_t RelayFault:1;
-    uint8_t SampleConsistenceFault:1;
-    uint8_t ResidualCurrent_DeviceFault:1;
-
-    uint8_t ErrBit24:1;
-    uint8_t ErrBit25:1;
-    uint8_t ErrBit26:1;
-    uint8_t ErrBit27:1;
-    uint8_t ErrBit28:1;
-    uint8_t DCI_DeviceFault:1;
-    uint8_t OtherDeviceFault:1;
-    uint8_t ErrBit31:1;
-  };
-} ErrCode;
-
-const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE;
-
-const char kSolaxError[] PROGMEM =
-  D_SOLAX_ERROR_0 "|" D_SOLAX_ERROR_1 "|" D_SOLAX_ERROR_2 "|" D_SOLAX_ERROR_3 "|" D_SOLAX_ERROR_4 "|" D_SOLAX_ERROR_5 "|"
-  D_SOLAX_ERROR_6 "|" D_SOLAX_ERROR_7 "|" D_SOLAX_ERROR_8;
-
-
-
-TasmotaSerial *solaxX1Serial;
-
-uint8_t solaxX1_Init = 1;
-
-struct SOLAXX1 {
-  float temperature = 0;
-  float energy_today = 0;
-  float dc1_voltage = 0;
-  float dc2_voltage = 0;
-  float dc1_current = 0;
-  float dc2_current = 0;
-  float energy_total = 0;
-  float runtime_total = 0;
-  float dc1_power = 0;
-  float dc2_power = 0;
-
-  uint8_t status = 0;
-  uint32_t errorCode = 0;
-} solaxX1;
-
-union {
-  uint8_t status;
-  struct {
-    uint8_t freeBit7:1;
-    uint8_t freeBit6:1;
-    uint8_t freeBit5:1;
-    uint8_t queryOffline:1;
-    uint8_t queryOfflineSend:1;
-    uint8_t hasAddress:1;
-    uint8_t inverterAddressSend:1;
-    uint8_t inverterSnReceived:1;
-  };
-} protocolStatus;
-
-uint8_t header[2] = {0xAA, 0x55};
-uint8_t source[2] = {0x00, 0x00};
-uint8_t destination[2] = {0x00, 0x00};
-uint8_t controlCode[1] = {0x00};
-uint8_t functionCode[1] = {0x00};
-uint8_t dataLength[1] = {0x00};
-uint8_t data[16] = {0};
-
-uint8_t message[30];
-
-
-
-bool solaxX1_RS485ReceiveReady(void)
-{
-  return (solaxX1Serial->available() > 1);
-}
-
-void solaxX1_RS485Send(uint16_t msgLen)
-{
-  memcpy(message, header, 2);
-  memcpy(message + 2, source, 2);
-  memcpy(message + 4, destination, 2);
-  memcpy(message + 6, controlCode, 1);
-  memcpy(message + 7, functionCode, 1);
-  memcpy(message + 8, dataLength, 1);
-  memcpy(message + 9, data, sizeof(data));
-  uint16_t crc = solaxX1_calculateCRC(message, msgLen);
-
-  while (solaxX1Serial->available() > 0)
-  {
-    solaxX1Serial->read();
-  }
-
-  solaxX1Serial->flush();
-  solaxX1Serial->write(message, msgLen);
-  solaxX1Serial->write(highByte(crc));
-  solaxX1Serial->write(lowByte(crc));
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, message, msgLen);
-}
-
-uint8_t solaxX1_RS485Receive(uint8_t *value)
-{
-  uint8_t len = 0;
-
-  while (solaxX1Serial->available() > 0)
-  {
-    value[len++] = (uint8_t)solaxX1Serial->read();
-  }
-
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, value, len);
-
-  uint16_t crc = solaxX1_calculateCRC(value, len - 2);
-
-  if (value[len - 1] == lowByte(crc) && value[len - 2] == highByte(crc))
-  {
-    return solaxX1_ERR_NO_ERROR;
-  }
-  else
-  {
-    return solaxX1_ERR_CRC_ERROR;
-  }
-}
-
-uint16_t solaxX1_calculateCRC(uint8_t *bExternTxPackage, uint8_t bLen)
-{
-  uint8_t i;
-  uint16_t wChkSum;
-  wChkSum = 0;
-
-  for (i = 0; i < bLen; i++)
-  {
-    wChkSum = wChkSum + bExternTxPackage[i];
-  }
-  return wChkSum;
-}
-
-void solaxX1_SendInverterAddress(void)
-{
-  source[0] = 0x00;
-  destination[0] = 0x00;
-  destination[1] = 0x00;
-  controlCode[0] = 0x10;
-  functionCode[0] = 0x01;
-  dataLength[0] = 0x0F;
-  data[14] = INVERTER_ADDRESS;
-  solaxX1_RS485Send(24);
-}
-
-void solaxX1_QueryLiveData(void)
-{
-  source[0] = 0x01;
-  destination[0] = 0x00;
-  destination[1] = INVERTER_ADDRESS;
-  controlCode[0] = 0x11;
-  functionCode[0] = 0x02;
-  dataLength[0] = 0x00;
-  solaxX1_RS485Send(9);
-}
-
-uint8_t solaxX1_ParseErrorCode(uint32_t code){
-  ErrCode.ErrMessage = code;
-
-  if (code == 0) return 0;
-  if (ErrCode.MainsLostFault) return 1;
-  if (ErrCode.GridVoltFault) return 2;
-  if (ErrCode.GridFreqFault) return 3;
-  if (ErrCode.PvVoltFault) return 4;
-  if (ErrCode.IsolationFault) return 5;
-  if (ErrCode.TemperatureOverFault) return 6;
-  if (ErrCode.FanFault) return 7;
-  if (ErrCode.OtherDeviceFault) return 8;
-}
-
-
-
-uint8_t solaxX1_send_retry = 0;
-uint8_t solaxX1_nodata_count = 0;
-
-void solaxX1250MSecond(void)
-{
-  uint8_t value[61] = {0};
-  bool data_ready = solaxX1_RS485ReceiveReady();
-
-  if (protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
-  {
-    if (data_ready)
-    {
-      uint8_t error = solaxX1_RS485Receive(value);
-      if (error)
-      {
-        DEBUG_SENSOR_LOG(PSTR("SX1: Data response CRC error"));
-      }
-      else
-      {
-        solaxX1_nodata_count = 0;
-        solaxX1_send_retry = 12;
-        Energy.data_valid[0] = 0;
-
-        solaxX1.temperature = (float)((value[9] << 8) | value[10]);
-        solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f;
-        solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f;
-        solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f;
-        solaxX1.dc1_current = (float)((value[17] << 8) | value[18]) * 0.1f;
-        solaxX1.dc2_current = (float)((value[19] << 8) | value[20]) * 0.1f;
-        Energy.current[0] = (float)((value[21] << 8) | value[22]) * 0.1f;
-        Energy.voltage[0] = (float)((value[23] << 8) | value[24]) * 0.1f;
-        Energy.frequency[0] = (float)((value[25] << 8) | value[26]) * 0.01f;
-        Energy.active_power[0] = (float)((value[27] << 8) | value[28]);
-
-        solaxX1.energy_total = (float)((value[31] << 8) | (value[32] << 8) | (value[33] << 8) | value[34]) * 0.1f;
-        solaxX1.runtime_total = (float)((value[35] << 8) | (value[36] << 8) | (value[37] << 8) | value[38]);
-        solaxX1.status = (uint8_t)((value[39] << 8) | value[40]);
-
-
-
-
-
-
-
-        solaxX1.errorCode = (uint32_t)((value[58] << 8) | (value[57] << 8) | (value[56] << 8) | value[55]);
-
-        solaxX1.dc1_power = solaxX1.dc1_voltage * solaxX1.dc1_current;
-        solaxX1.dc2_power = solaxX1.dc2_voltage * solaxX1.dc2_current;
-
-        solaxX1_QueryLiveData();
-        EnergyUpdateTotal(solaxX1.energy_total, true);
-      }
-    }
-
-    if (0 == solaxX1_send_retry && 255 != solaxX1_nodata_count) {
-      solaxX1_send_retry = 12;
-      solaxX1_QueryLiveData();
-    }
-
-
-
-    if (255 == solaxX1_nodata_count) {
-      solaxX1_nodata_count = 0;
-      solaxX1_send_retry = 12;
-    }
-  }
-  else
-  {
-    if ((solaxX1_nodata_count % 4) == 0) { DEBUG_SENSOR_LOG(PSTR("SX1: No Data count: %d"), solaxX1_nodata_count); }
-    if (solaxX1_nodata_count < 10 * 4)
-    {
-      solaxX1_nodata_count++;
-    }
-    else if (255 != solaxX1_nodata_count)
-    {
-
-      solaxX1_nodata_count = 255;
-      solaxX1_send_retry = 12;
-      protocolStatus.status = 0b00001000;
-      Energy.data_valid[0] = ENERGY_WATCHDOG;
-
-      solaxX1.temperature = solaxX1.dc1_voltage = solaxX1.dc2_voltage = solaxX1.dc1_current = solaxX1.dc2_current = solaxX1.dc1_power = 0;
-      solaxX1.dc2_power = solaxX1.status = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0;
-
-    }
-  }
-
-  if (!protocolStatus.hasAddress && (data_ready || solaxX1_send_retry == 0))
-  {
-    if (data_ready)
-    {
-
-      if (protocolStatus.inverterAddressSend)
-      {
-        uint8_t error = solaxX1_RS485Receive(value);
-        if (error)
-        {
-          DEBUG_SENSOR_LOG(PSTR("SX1: Address confirmation response CRC error"));
-        }
-        else
-        {
-          if (value[6] == 0x10 && value[7] == 0x81 && value[9] == 0x06)
-          {
-            DEBUG_SENSOR_LOG(PSTR("SX1: Set hasAddress"));
-            protocolStatus.status = 0b00100000;
-          }
-        }
-      }
-
-
-      if (protocolStatus.queryOfflineSend)
-      {
-        uint8_t error = solaxX1_RS485Receive(value);
-        if (error)
-        {
-          DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline response CRC error"));
-        }
-        else
-        {
-
-          if (value[6] == 0x10 && value[7] == 0x80 && protocolStatus.inverterSnReceived == false)
-          {
-            for (uint8_t i = 9; i <= 22; i++)
-            {
-              data[i - 9] = value[i];
-            }
-            solaxX1_SendInverterAddress();
-            protocolStatus.status = 0b1100000;
-            DEBUG_SENSOR_LOG(PSTR("SX1: Set inverterSnReceived and inverterAddressSend"));
-          }
-        }
-      }
-    }
-
-    if (solaxX1_send_retry == 0)
-    {
-      if (protocolStatus.queryOfflineSend)
-      {
-        protocolStatus.status = 0b00001000;
-        DEBUG_SENSOR_LOG(PSTR("SX1: Set Query Offline"));
-      }
-      solaxX1_send_retry = 12;
-    }
-
-
-    if (protocolStatus.queryOffline)
-    {
-
-      source[0] = 0x01;
-      destination[1] = 0x00;
-      controlCode[0] = 0x10;
-      functionCode[0] = 0x00;
-      dataLength[0] = 0x00;
-      solaxX1_RS485Send(9);
-      protocolStatus.status = 0b00010000;
-      DEBUG_SENSOR_LOG(PSTR("SX1: Query Offline Send"));
-    }
-  }
-
-  if (!data_ready)
-    solaxX1_send_retry--;
-}
-
-void solaxX1SnsInit(void)
-{
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init"));
-  DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX]);
-  protocolStatus.status = 0b00100000;
-
-  solaxX1Serial = new TasmotaSerial(pin[GPIO_SOLAXX1_RX], pin[GPIO_SOLAXX1_TX], 1);
-  if (solaxX1Serial->begin(SOLAXX1_SPEED)) {
-    if (solaxX1Serial->hardwareSerial()) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void solaxX1DrvInit(void)
-{
-  if ((pin[GPIO_SOLAXX1_RX] < 99) && (pin[GPIO_SOLAXX1_TX] < 99)) {
-    energy_flg = XNRG_12;
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_solaxX1_DATA1[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_SOLAR_POWER "{m}%s " D_UNIT_WATT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV1_POWER "{m}%s " D_UNIT_WATT "{e}";
-#ifdef SOLAXX1_PV2
-const char HTTP_SNS_solaxX1_DATA2[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_PV2_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV2_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-    "{s}" D_SOLAX_X1 " " D_PV2_POWER "{m}%s " D_UNIT_WATT "{e}";
-#endif
-const char HTTP_SNS_solaxX1_DATA3[] PROGMEM =
-    "{s}" D_SOLAX_X1 " " D_UPTIME "{m}%s " D_UNIT_HOUR "{e}"
-    "{s}" D_SOLAX_X1 " " D_STATUS "{m}%s"
-    "{s}" D_SOLAX_X1 " " D_ERROR "{m}%s";
-#endif
-
-void solaxX1Show(bool json)
-{
-  char solar_power[33];
-  dtostrfd(solaxX1.dc1_power + solaxX1.dc2_power, Settings.flag2.wattage_resolution, solar_power);
-  char pv1_voltage[33];
-  dtostrfd(solaxX1.dc1_voltage, Settings.flag2.voltage_resolution, pv1_voltage);
-  char pv1_current[33];
-  dtostrfd(solaxX1.dc1_current, Settings.flag2.current_resolution, pv1_current);
-  char pv1_power[33];
-  dtostrfd(solaxX1.dc1_power, Settings.flag2.wattage_resolution, pv1_power);
-#ifdef SOLAXX1_PV2
-  char pv2_voltage[33];
-  dtostrfd(solaxX1.dc2_voltage, Settings.flag2.voltage_resolution, pv2_voltage);
-  char pv2_current[33];
-  dtostrfd(solaxX1.dc2_current, Settings.flag2.current_resolution, pv2_current);
-  char pv2_power[33];
-  dtostrfd(solaxX1.dc2_power, Settings.flag2.wattage_resolution, pv2_power);
-#endif
-  char temperature[33];
-  dtostrfd(solaxX1.temperature, Settings.flag2.temperature_resolution, temperature);
-  char runtime[33];
-  dtostrfd(solaxX1.runtime_total, 0, runtime);
-  char status[33];
-  GetTextIndexed(status, sizeof(status), solaxX1.status, kSolaxMode);
-
-  if (json)
-  {
-    ResponseAppend_P(PSTR(",\"" D_JSON_SOLAR_POWER "\":%s,\"" D_JSON_PV1_VOLTAGE "\":%s,\"" D_JSON_PV1_CURRENT "\":%s,\"" D_JSON_PV1_POWER "\":%s"),
-                                solar_power, pv1_voltage, pv1_current, pv1_power);
-#ifdef SOLAXX1_PV2
-    ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"),
-                                pv2_voltage, pv2_current, pv2_power);
-#endif
-    ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"),
-                                temperature, runtime, status, solaxX1.errorCode);
-
-#ifdef USE_WEBSERVER
-  }
-  else
-  {
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA1, solar_power, pv1_voltage, pv1_current, pv1_power);
-#ifdef SOLAXX1_PV2
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA2, pv2_voltage, pv2_current, pv2_power);
-#endif
-    WSContentSend_PD(HTTP_SNS_TEMP, D_SOLAX_X1, temperature, TempUnit());
-    char errorCodeString[33];
-    WSContentSend_PD(HTTP_SNS_solaxX1_DATA3, runtime, status,
-      GetTextIndexed(errorCodeString, sizeof(errorCodeString), solaxX1_ParseErrorCode(solaxX1.errorCode), kSolaxError));
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg12(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) { solaxX1250MSecond(); }
-      break;
-    case FUNC_JSON_APPEND:
-      solaxX1Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      solaxX1Show(0);
-      break;
-#endif
-    case FUNC_INIT:
-      solaxX1SnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      solaxX1DrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-#ifdef USE_ENERGY_SENSOR
-#ifdef USE_LE01MR
-# 71 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-#define XNRG_13 13
-
-
-#ifndef LE01MR_SPEED
-  #define LE01MR_SPEED 2400
-#endif
-
-#ifndef LE01MR_ADDR
-  #define LE01MR_ADDR 1
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *FifLEModbus;
-
-const uint8_t le01mr_table_sz = 9;
-
-const uint16_t le01mr_register_addresses[] {
-
-  0x0130,
-  0x0131,
-  0x0158,
-  0x0139,
-  0x0140,
-  0x0148,
-  0x0150,
-  0xA000,
-  0xA01E
-};
-
-struct LE01MR {
-  float total_active = 0;
-  float total_reactive = 0;
-  uint8_t read_state = 0;
-  uint8_t send_retry = 0;
-  uint8_t start_address_count = le01mr_table_sz;
-} Le01mr;
-
-
-
-void FifLEEvery250ms(void)
-{
-  bool data_ready = FifLEModbus->ReceiveReady();
-
-  if (data_ready) {
-    uint8_t buffer[14];
-    uint8_t reg_count = 2;
-    if (Le01mr.read_state < 3) {
-      reg_count=1;
-    }
-
-    uint32_t error = FifLEModbus->ReceiveBuffer(buffer, reg_count);
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, FifLEModbus->ReceiveCount());
-
-    if (error) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("FiF-LE: LE01MR Modbus error %d"), error);
-    } else {
-      Energy.data_valid[0] = 0;
-# 146 "S:/Development/Tasmota/tasmota/xnrg_13_fif_le01mr.ino"
-      uint32_t value_buff = 0;
-
-      if (Le01mr.read_state >= 0 && Le01mr.read_state < 3) {
-        value_buff = ((uint32_t)buffer[3])<<8 | buffer[4];
-      } else {
-        value_buff = ((uint32_t)buffer[3])<<24 | ((uint32_t)buffer[4])<<16 | ((uint32_t)buffer[5])<<8 | buffer[6];
-      }
-
-      switch(Le01mr.read_state) {
-        case 0:
-          Energy.frequency[0] = value_buff * 0.01f;
-          break;
-
-        case 1:
-          Energy.voltage[0] = value_buff * 0.01f;
-          break;
-
-        case 2:
-          Energy.power_factor[0] = ((int16_t)value_buff) * 0.001f;
-          break;
-
-        case 3:
-          Energy.current[0] = value_buff * 0.001f;
-          break;
-
-        case 4:
-          Energy.active_power[0] = value_buff * 1.0f;
-          break;
-
-        case 5:
-          Energy.reactive_power[0] = value_buff * 1.0f;
-          break;
-
-        case 6:
-          Energy.apparent_power[0] = value_buff * 1.0f;
-          break;
-
-        case 7:
-          Le01mr.total_active = value_buff * 0.01f;
-          break;
-
-        case 8:
-          Le01mr.total_reactive = value_buff * 0.01f;
-          break;
-      }
-
-      Le01mr.read_state++;
-      if (Le01mr.read_state == Le01mr.start_address_count) {
-        Le01mr.read_state = 0;
-
-        EnergyUpdateTotal(Le01mr.total_active, true);
-      }
-    }
-  }
-
-  if (0 == Le01mr.send_retry || data_ready) {
-    uint8_t reg_count = 2;
-
-    Le01mr.send_retry = 5;
-
-    if (Le01mr.read_state < 3) reg_count=1;
-
-    FifLEModbus->Send(LE01MR_ADDR, 0x03, le01mr_register_addresses[Le01mr.read_state], reg_count);
-  } else {
-    Le01mr.send_retry--;
-  }
-}
-
-void FifLESnsInit(void)
-{
-  FifLEModbus = new TasmotaModbus(pin[GPIO_LE01MR_RX], pin[GPIO_LE01MR_TX]);
-  uint8_t result = FifLEModbus->Begin(LE01MR_SPEED);
-  if (result) {
-    if (2 == result) { ClaimSerial(); }
-  } else {
-    energy_flg = ENERGY_NONE;
-  }
-}
-
-void FifLEDrvInit(void)
-{
-  if ((pin[GPIO_LE01MR_RX] < 99) && (pin[GPIO_LE01MR_TX] < 99)) {
-    energy_flg = XNRG_13;
-  }
-}
-
-void FifLEReset(void)
-{
-  Le01mr.total_active = 0;
-  Le01mr.total_reactive = 0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_ENERGY_LE01MR[] PROGMEM =
-  "{s}" D_TOTAL_ACTIVE "{m}%s " D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_TOTAL_REACTIVE "{m}%s " D_UNIT_KWARH "{e}"
-  ;
-#endif
-
-void FifLEShow(bool json)
-{
-  char total_reactive_chr[FLOATSZ];
-  dtostrfd(Le01mr.total_reactive, Settings.flag2.energy_resolution, total_reactive_chr);
-  char total_active_chr[FLOATSZ];
-  dtostrfd(Le01mr.total_active, Settings.flag2.energy_resolution, total_active_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"" D_JSON_TOTAL_ACTIVE "\":%s,\"" D_JSON_TOTAL_REACTIVE "\":%s"),
-      total_active_chr, total_reactive_chr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_ENERGY_LE01MR, total_active_chr, total_reactive_chr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xnrg13(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_250_MSECOND:
-      if (uptime > 4) {
-          FifLEEvery250ms();
-      }
-      break;
-    case FUNC_JSON_APPEND:
-      FifLEShow(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      FifLEShow(0);
-      break;
-#endif
-    case FUNC_ENERGY_RESET:
-      FifLEReset();
-      break;
-    case FUNC_INIT:
-      FifLESnsInit();
-      break;
-    case FUNC_PRE_INIT:
-      FifLEDrvInit();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xnrg_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xnrg_interface.ino"
-#ifdef USE_ENERGY_SENSOR
-
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xnrg_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XNRG_01
-  &Xnrg01,
-#endif
-
-#ifdef XNRG_02
-  &Xnrg02,
-#endif
-
-#ifdef XNRG_03
-  &Xnrg03,
-#endif
-
-#ifdef XNRG_04
-  &Xnrg04,
-#endif
-
-#ifdef XNRG_05
-  &Xnrg05,
-#endif
-
-#ifdef XNRG_06
-  &Xnrg06,
-#endif
-
-#ifdef XNRG_07
-  &Xnrg07,
-#endif
-
-#ifdef XNRG_08
-  &Xnrg08,
-#endif
-
-#ifdef XNRG_09
-  &Xnrg09,
-#endif
-
-#ifdef XNRG_10
-  &Xnrg10,
-#endif
-
-#ifdef XNRG_11
-  &Xnrg11,
-#endif
-
-#ifdef XNRG_12
-  &Xnrg12,
-#endif
-
-#ifdef XNRG_13
-  &Xnrg13,
-#endif
-
-#ifdef XNRG_14
-  &Xnrg14,
-#endif
-
-#ifdef XNRG_15
-  &Xnrg15,
-#endif
-
-#ifdef XNRG_16
-  &Xnrg16
-#endif
-};
-
-const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]);
-
-uint8_t xnrg_active = 0;
-
-bool XnrgCall(uint8_t function)
-{
-  DEBUG_TRACE_LOG(PSTR("NRG: %d"), function);
-
-  if (FUNC_PRE_INIT == function) {
-    for (uint32_t x = 0; x < xnrg_present; x++) {
-      xnrg_func_ptr[x](function);
-      if (energy_flg) {
-        xnrg_active = x;
-        return true;
-      }
-    }
-  }
-  else if (energy_flg) {
-    return xnrg_func_ptr[xnrg_active](function);
-  }
-  return false;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_01_counter.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_01_counter.ino"
-#ifdef USE_COUNTER
-
-
-
-
-#define XSNS_01 1
-
-#define D_PRFX_COUNTER "Counter"
-#define D_CMND_COUNTERTYPE "Type"
-#define D_CMND_COUNTERDEBOUNCE "Debounce"
-
-const char kCounterCommands[] PROGMEM = D_PRFX_COUNTER "|"
-  "|" D_CMND_COUNTERTYPE "|" D_CMND_COUNTERDEBOUNCE ;
-
-void (* const CounterCommand[])(void) PROGMEM = {
-  &CmndCounter, &CmndCounterType, &CmndCounterDebounce };
-
-struct COUNTER {
-  uint32_t timer[MAX_COUNTERS];
-  uint8_t no_pullup = 0;
-  bool any_counter = false;
-} Counter;
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void CounterUpdate(uint8_t index) ICACHE_RAM_ATTR;
-void CounterUpdate1(void) ICACHE_RAM_ATTR;
-void CounterUpdate2(void) ICACHE_RAM_ATTR;
-void CounterUpdate3(void) ICACHE_RAM_ATTR;
-void CounterUpdate4(void) ICACHE_RAM_ATTR;
-#endif
-
-void CounterUpdate(uint8_t index)
-{
-  uint32_t time = micros();
-  uint32_t debounce_time = time - Counter.timer[index];
-  if (debounce_time > Settings.pulse_counter_debounce * 1000) {
-    Counter.timer[index] = time;
-    if (bitRead(Settings.pulse_counter_type, index)) {
-      RtcSettings.pulse_counter[index] = debounce_time;
-    } else {
-      RtcSettings.pulse_counter[index]++;
-    }
-  }
-}
-
-void CounterUpdate1(void)
-{
-  CounterUpdate(0);
-}
-
-void CounterUpdate2(void)
-{
-  CounterUpdate(1);
-}
-
-void CounterUpdate3(void)
-{
-  CounterUpdate(2);
-}
-
-void CounterUpdate4(void)
-{
-  CounterUpdate(3);
-}
-
-
-
-bool CounterPinState(void)
-{
-  if ((XdrvMailbox.index >= GPIO_CNTR1_NP) && (XdrvMailbox.index < (GPIO_CNTR1_NP + MAX_COUNTERS))) {
-    bitSet(Counter.no_pullup, XdrvMailbox.index - GPIO_CNTR1_NP);
-    XdrvMailbox.index -= (GPIO_CNTR1_NP - GPIO_CNTR1);
-    return true;
-  }
-  return false;
-}
-
-void CounterInit(void)
-{
-  typedef void (*function) () ;
-  function counter_callbacks[] = { CounterUpdate1, CounterUpdate2, CounterUpdate3, CounterUpdate4 };
-
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      Counter.any_counter = true;
-      pinMode(pin[GPIO_CNTR1 +i], bitRead(Counter.no_pullup, i) ? INPUT : INPUT_PULLUP);
-      attachInterrupt(pin[GPIO_CNTR1 +i], counter_callbacks[i], FALLING);
-    }
-  }
-}
-
-void CounterEverySecond(void)
-{
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      if (bitRead(Settings.pulse_counter_type, i)) {
-        uint32_t time = micros() - Counter.timer[i];
-        if (time > 4200000000) {
-          RtcSettings.pulse_counter[i] = 4200000000;
-        }
-      }
-    }
-  }
-}
-
-void CounterSaveState(void)
-{
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
-    }
-  }
-}
-
-void CounterShow(bool json)
-{
-  bool header = false;
-  uint8_t dsxflg = 0;
-  for (uint32_t i = 0; i < MAX_COUNTERS; i++) {
-    if (pin[GPIO_CNTR1 +i] < 99) {
-      char counter[33];
-      if (bitRead(Settings.pulse_counter_type, i)) {
-        dtostrfd((double)RtcSettings.pulse_counter[i] / 1000000, 6, counter);
-      } else {
-        dsxflg++;
-        snprintf_P(counter, sizeof(counter), PSTR("%lu"), RtcSettings.pulse_counter[i]);
-      }
-
-      if (json) {
-        if (!header) {
-          ResponseAppend_P(PSTR(",\"COUNTER\":{"));
-        }
-        ResponseAppend_P(PSTR("%s\"C%d\":%s"), (header)?",":"", i +1, counter);
-        header = true;
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (1 == dsxflg)) {
-          DomoticzSensor(DZ_COUNT, RtcSettings.pulse_counter[i]);
-          dsxflg++;
-        }
-#endif
-        if ((0 == tele_period ) && (Settings.flag3.counter_reset_on_tele)) {
-          RtcSettings.pulse_counter[i] = 0;
-        }
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(PSTR("{s}" D_COUNTER "%d{m}%s%s{e}"),
-          i +1, counter, (bitRead(Settings.pulse_counter_type, i)) ? " " D_UNIT_SECOND : "");
-#endif
-      }
-    }
-  }
-  if (header) {
-    ResponseJsonEnd();
-  }
-}
-
-
-
-
-
-void CmndCounter(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
-    if ((XdrvMailbox.data_len > 0) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
-      if ((XdrvMailbox.data[0] == '-') || (XdrvMailbox.data[0] == '+')) {
-        RtcSettings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
-        Settings.pulse_counter[XdrvMailbox.index -1] += XdrvMailbox.payload;
-      } else {
-        RtcSettings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
-        Settings.pulse_counter[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      }
-    }
-    ResponseCmndIdxNumber(RtcSettings.pulse_counter[XdrvMailbox.index -1]);
-  }
-}
-
-void CmndCounterType(void)
-{
-  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_COUNTERS)) {
-    if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1) && (pin[GPIO_CNTR1 + XdrvMailbox.index -1] < 99)) {
-      bitWrite(Settings.pulse_counter_type, XdrvMailbox.index -1, XdrvMailbox.payload &1);
-      RtcSettings.pulse_counter[XdrvMailbox.index -1] = 0;
-      Settings.pulse_counter[XdrvMailbox.index -1] = 0;
-    }
-    ResponseCmndIdxNumber(bitRead(Settings.pulse_counter_type, XdrvMailbox.index -1));
-  }
-}
-
-void CmndCounterDebounce(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 32001)) {
-    Settings.pulse_counter_debounce = XdrvMailbox.payload;
-  }
-  ResponseCmndNumber(Settings.pulse_counter_debounce);
-}
-
-
-
-
-
-bool Xsns01(uint8_t function)
-{
-  bool result = false;
-
-  if (Counter.any_counter) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        CounterEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        CounterShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        CounterShow(0);
-        break;
-#endif
-      case FUNC_SAVE_BEFORE_RESTART:
-      case FUNC_SAVE_AT_MIDNIGHT:
-        CounterSaveState();
-        break;
-      case FUNC_COMMAND:
-        result = DecodeCommand(kCounterCommands, CounterCommand);
-        break;
-    }
-  } else {
-    switch (function) {
-      case FUNC_INIT:
-        CounterInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = CounterPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
-#ifndef USE_ADC_VCC
-
-
-
-
-#define XSNS_02 2
-
-#define TO_CELSIUS(x) ((x) - 273.15)
-#define TO_KELVIN(x) ((x) + 273.15)
-
-
-#define ANALOG_V33 3.3
-#define ANALOG_T0 TO_KELVIN(25.0)
-
-
-
-
-
-#define ANALOG_NTC_BRIDGE_RESISTANCE 32000
-#define ANALOG_NTC_RESISTANCE 10000
-#define ANALOG_NTC_B_COEFFICIENT 3350
-
-
-
-
-
-#define ANALOG_LDR_BRIDGE_RESISTANCE 10000
-#define ANALOG_LDR_LUX_CALC_SCALAR 12518931
-#define ANALOG_LDR_LUX_CALC_EXPONENT -1.4050
-# 58 "S:/Development/Tasmota/tasmota/xsns_02_analog.ino"
-#define ANALOG_CT_FLAGS 0
-#define ANALOG_CT_MULTIPLIER 2146
-#define ANALOG_CT_VOLTAGE 2300
-
-#define CT_FLAG_ENERGY_RESET (1 << 0)
-
-struct {
-  float temperature = 0;
-  float current = 0;
-  float energy = 0;
-  uint32_t previous_millis = 0;
-  uint16_t last_value = 0;
-} Adc;
-
-void AdcInit(void)
-{
-  if ((Settings.adc_param_type != my_adc0) || (Settings.adc_param1 > 1000000)) {
-    if (ADC0_TEMP == my_adc0) {
-
-      Settings.adc_param_type = ADC0_TEMP;
-      Settings.adc_param1 = ANALOG_NTC_BRIDGE_RESISTANCE;
-      Settings.adc_param2 = ANALOG_NTC_RESISTANCE;
-      Settings.adc_param3 = ANALOG_NTC_B_COEFFICIENT * 10000;
-    }
-    else if (ADC0_LIGHT == my_adc0) {
-      Settings.adc_param_type = ADC0_LIGHT;
-      Settings.adc_param1 = ANALOG_LDR_BRIDGE_RESISTANCE;
-      Settings.adc_param2 = ANALOG_LDR_LUX_CALC_SCALAR;
-      Settings.adc_param3 = ANALOG_LDR_LUX_CALC_EXPONENT * 10000;
-    }
-    else if (ADC0_RANGE == my_adc0) {
-      Settings.adc_param_type = ADC0_RANGE;
-      Settings.adc_param1 = 0;
-      Settings.adc_param2 = 1023;
-      Settings.adc_param3 = 0;
-      Settings.adc_param4 = 100;
-    }
-    else if (ADC0_CT_POWER == my_adc0) {
-      Settings.adc_param_type = ADC0_CT_POWER;
-      Settings.adc_param1 = ANALOG_CT_FLAGS;
-      Settings.adc_param2 = ANALOG_CT_MULTIPLIER;
-      Settings.adc_param3 = ANALOG_CT_VOLTAGE;
-    }
-  }
-}
-
-uint16_t AdcRead(uint8_t factor)
-{
-
-
-
-
-
-  uint8_t samples = 1 << factor;
-  uint16_t analog = 0;
-  for (uint32_t i = 0; i < samples; i++) {
-    analog += analogRead(A0);
-    delay(1);
-  }
-  analog >>= factor;
-  return analog;
-}
-
-#ifdef USE_RULES
-void AdcEvery250ms(void)
-{
-  if (ADC0_INPUT == my_adc0) {
-    uint16_t new_value = AdcRead(5);
-    if ((new_value < Adc.last_value -10) || (new_value > Adc.last_value +10)) {
-      Adc.last_value = new_value;
-      uint16_t value = Adc.last_value / 10;
-      Response_P(PSTR("{\"ANALOG\":{\"A0div10\":%d}}"), (value > 99) ? 100 : value);
-      XdrvRulesProcess();
-    }
-  }
-}
-#endif
-
-uint16_t AdcGetLux(void)
-{
-  int adc = AdcRead(2);
-
-  double resistorVoltage = ((double)adc / 1023) * ANALOG_V33;
-  double ldrVoltage = ANALOG_V33 - resistorVoltage;
-  double ldrResistance = ldrVoltage / resistorVoltage * (double)Settings.adc_param1;
-  double ldrLux = (double)Settings.adc_param2 * FastPrecisePow(ldrResistance, (double)Settings.adc_param3 / 10000);
-
-  return (uint16_t)ldrLux;
-}
-
-uint16_t AdcGetRange(void)
-{
-
-
-
-  int adc = AdcRead(2);
-  double adcrange = ( ((double)Settings.adc_param2 - (double)adc) / ( ((double)Settings.adc_param2 - (double)Settings.adc_param1)) * ((double)Settings.adc_param3 - (double)Settings.adc_param4) + (double)Settings.adc_param4 );
-  return (uint16_t)adcrange;
-}
-
-void AdcGetCurrentPower(uint8_t factor)
-{
-
-
-
-
-
-  uint8_t samples = 1 << factor;
-  uint16_t analog = 0;
-  uint16_t analog_min = 1023;
-  uint16_t analog_max = 0;
-  for (uint32_t i = 0; i < samples; i++) {
-    analog = analogRead(A0);
-    if (analog < analog_min) {
-      analog_min = analog;
-    }
-    if (analog > analog_max) {
-      analog_max = analog;
-    }
-    delay(1);
-  }
-
-  Adc.current = (float)(analog_max-analog_min) * ((float)(Settings.adc_param2) / 100000);
-  float power = Adc.current * (float)(Settings.adc_param3) / 10;
-  uint32_t current_millis = millis();
-  Adc.energy = Adc.energy + ((power * (current_millis - Adc.previous_millis)) / 3600000000);
-  Adc.previous_millis = current_millis;
-}
-
-void AdcEverySecond(void)
-{
-  if (ADC0_TEMP == my_adc0) {
-    int adc = AdcRead(2);
-
-    double Rt = (adc * Settings.adc_param1) / (1024.0 * ANALOG_V33 - (double)adc);
-    double BC = (double)Settings.adc_param3 / 10000;
-    double T = BC / (BC / ANALOG_T0 + TaylorLog(Rt / (double)Settings.adc_param2));
-    Adc.temperature = ConvertTemp(TO_CELSIUS(T));
-  }
-  else if (ADC0_CT_POWER == my_adc0) {
-    AdcGetCurrentPower(5);
-  }
-}
-
-void AdcShow(bool json)
-{
-  if (ADC0_INPUT == my_adc0) {
-    uint16_t analog = AdcRead(5);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"ANALOG\":{\"A0\":%d}"), analog);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ANALOG, "", 0, analog);
-#endif
-    }
-  }
-
-  else if (ADC0_TEMP == my_adc0) {
-    char temperature[33];
-    dtostrfd(Adc.temperature, Settings.flag2.temperature_resolution, temperature);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMP, "ANALOG", temperature);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_TEMP, temperature);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Adc.temperature);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
-#endif
-    }
-  }
-
-  else if (ADC0_LIGHT == my_adc0) {
-    uint16_t adc_light = AdcGetLux();
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_ILLUMINANCE, "ANALOG", adc_light);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, adc_light);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, "", adc_light);
-#endif
-    }
-  }
-
-  else if (ADC0_RANGE == my_adc0) {
-    uint16_t adc_range = AdcGetRange();
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_RANGE, "ANALOG", adc_range);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_RANGE, "", adc_range);
-#endif
-    }
-  }
-
-  else if (ADC0_CT_POWER == my_adc0) {
-    AdcGetCurrentPower(5);
-
-    float voltage = (float)(Settings.adc_param3) / 10;
-    char voltage_chr[FLOATSZ];
-    dtostrfd(voltage, Settings.flag2.voltage_resolution, voltage_chr);
-    char current_chr[FLOATSZ];
-    dtostrfd(Adc.current, Settings.flag2.current_resolution, current_chr);
-    char power_chr[FLOATSZ];
-    dtostrfd(voltage * Adc.current, Settings.flag2.wattage_resolution, power_chr);
-    char energy_chr[FLOATSZ];
-    dtostrfd(Adc.energy, Settings.flag2.energy_resolution, energy_chr);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"ANALOG\":{\"" D_JSON_ENERGY "\":%s,\"" D_JSON_POWERUSAGE "\":%s,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s}"),
-        energy_chr, power_chr, voltage_chr, current_chr);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_POWER_ENERGY, power_chr);
-        DomoticzSensor(DZ_VOLTAGE, voltage_chr);
-        DomoticzSensor(DZ_CURRENT, current_chr);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_VOLTAGE, voltage_chr);
-      WSContentSend_PD(HTTP_SNS_CURRENT, current_chr);
-      WSContentSend_PD(HTTP_SNS_POWER, power_chr);
-      WSContentSend_PD(HTTP_SNS_ENERGY_TOTAL, energy_chr);
-#endif
-    }
-  }
-
-}
-
-
-
-
-
-const char kAdcCommands[] PROGMEM = "|"
-  D_CMND_ADC "|" D_CMND_ADCS "|" D_CMND_ADCPARAM;
-
-void (* const AdcCommand[])(void) PROGMEM = {
-  &CmndAdc, &CmndAdcs, &CmndAdcParam };
-
-void CmndAdc(void)
-{
-  if (ValidAdc() && (XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < ADC0_END)) {
-    Settings.my_adc0 = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  char stemp1[TOPSZ];
-  Response_P(PSTR("{\"" D_CMND_ADC "0\":{\"%d\":\"%s\"}}"), Settings.my_adc0, GetTextIndexed(stemp1, sizeof(stemp1), Settings.my_adc0, kAdc0Names));
-}
-
-void CmndAdcs(void)
-{
-  Response_P(PSTR("{\"" D_CMND_ADCS "\":{"));
-  bool jsflg = false;
-  char stemp1[TOPSZ];
-  for (uint32_t i = 0; i < ADC0_END; i++) {
-    if (jsflg) {
-      ResponseAppend_P(PSTR(","));
-    }
-    jsflg = true;
-    ResponseAppend_P(PSTR("\"%d\":\"%s\""), i, GetTextIndexed(stemp1, sizeof(stemp1), i, kAdc0Names));
-  }
-  ResponseJsonEndEnd();
-}
-
-void CmndAdcParam(void)
-{
-  if (XdrvMailbox.data_len) {
-    if ((ADC0_TEMP == XdrvMailbox.payload) ||
-        (ADC0_LIGHT == XdrvMailbox.payload) ||
-        (ADC0_RANGE == XdrvMailbox.payload) ||
-        (ADC0_CT_POWER == XdrvMailbox.payload)) {
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        char sub_string[XdrvMailbox.data_len +1];
-
-
-
-        Settings.adc_param_type = XdrvMailbox.payload;
-        Settings.adc_param1 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-        Settings.adc_param2 = strtol(subStr(sub_string, XdrvMailbox.data, ",", 3), nullptr, 10);
-        if (ADC0_RANGE == XdrvMailbox.payload) {
-          Settings.adc_param3 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 4), nullptr, 10));
-          Settings.adc_param4 = abs(strtol(subStr(sub_string, XdrvMailbox.data, ",", 5), nullptr, 10));
-        } else {
-          Settings.adc_param3 = (int)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 4)) * 10000);
-        }
-        if (ADC0_CT_POWER == XdrvMailbox.payload) {
-          if ((Settings.adc_param1 & CT_FLAG_ENERGY_RESET) > 0) {
-            Adc.energy = 0;
-            Settings.adc_param1 ^= CT_FLAG_ENERGY_RESET;
-          }
-        }
-      } else {
-
-
-
-
-        Settings.adc_param_type = 0;
-        AdcInit();
-      }
-    }
-  }
-
-
-  Response_P(PSTR("{\"" D_CMND_ADCPARAM "\":[%d,%d,%d"), Settings.adc_param_type, Settings.adc_param1, Settings.adc_param2);
-  if (ADC0_RANGE == my_adc0) {
-    ResponseAppend_P(PSTR(",%d,%d"), Settings.adc_param3, Settings.adc_param4);
-  } else {
-    int value = Settings.adc_param3;
-    uint8_t precision;
-    for (precision = 4; precision > 0; precision--) {
-      if (value % 10) { break; }
-      value /= 10;
-    }
-    char param3[33];
-    dtostrfd(((double)Settings.adc_param3)/10000, precision, param3);
-    ResponseAppend_P(PSTR(",%s"), param3);
-  }
-  ResponseAppend_P(PSTR("]}"));
-}
-
-
-
-
-
-bool Xsns02(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_COMMAND:
-      result = DecodeCommand(kAdcCommands, AdcCommand);
-      break;
-    default:
-      if ((ADC0_INPUT == my_adc0) ||
-          (ADC0_TEMP == my_adc0) ||
-          (ADC0_LIGHT == my_adc0) ||
-          (ADC0_RANGE == my_adc0) ||
-          (ADC0_CT_POWER == my_adc0)) {
-        switch (function) {
-#ifdef USE_RULES
-          case FUNC_EVERY_250_MSECOND:
-            AdcEvery250ms();
-            break;
-#endif
-          case FUNC_EVERY_SECOND:
-            AdcEverySecond();
-            break;
-          case FUNC_INIT:
-            AdcInit();
-            break;
-          case FUNC_JSON_APPEND:
-            AdcShow(1);
-            break;
-#ifdef USE_WEBSERVER
-          case FUNC_WEB_SENSOR:
-            AdcShow(0);
-            break;
-#endif
-        }
-      }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
-#ifdef USE_SONOFF_SC
-# 57 "S:/Development/Tasmota/tasmota/xsns_04_snfsc.ino"
-#define XSNS_04 4
-
-uint16_t sc_value[5] = { 0 };
-
-void SonoffScSend(const char *data)
-{
-  Serial.write(data);
-  Serial.write('\x1B');
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_TRANSMIT " %s"), data);
-}
-
-void SonoffScInit(void)
-{
-
-  SonoffScSend("AT+START");
-
-}
-
-void SonoffScSerialInput(char *rcvstat)
-{
-  char *p;
-  char *str;
-  uint16_t value[5] = { 0 };
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_SERIAL D_RECEIVED " %s"), rcvstat);
-
-  if (!strncasecmp_P(rcvstat, PSTR("AT+UPDATE="), 10)) {
-    int8_t i = -1;
-    for (str = strtok_r(rcvstat, ":", &p); str && i < 5; str = strtok_r(nullptr, ":", &p)) {
-      value[i++] = atoi(str);
-    }
-    if (value[0] > 0) {
-      for (uint32_t i = 0; i < 5; i++) {
-        sc_value[i] = value[i];
-      }
-      sc_value[2] = (11 - sc_value[2]) * 10;
-      sc_value[3] *= 10;
-      sc_value[4] = (11 - sc_value[4]) * 10;
-      SonoffScSend("AT+SEND=ok");
-    } else {
-      SonoffScSend("AT+SEND=fail");
-    }
-  }
-  else if (!strcasecmp_P(rcvstat, PSTR("AT+STATUS?"))) {
-    SonoffScSend("AT+STATUS=4");
-  }
-}
-
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SCPLUS[] PROGMEM =
-  "{s}" D_LIGHT "{m}%d%%{e}{s}" D_NOISE "{m}%d%%{e}{s}" D_AIR_QUALITY "{m}%d%%{e}";
-#endif
-
-void SonoffScShow(bool json)
-{
-  if (sc_value[0] > 0) {
-    float t = ConvertTemp(sc_value[1]);
-    float h = ConvertHumidity(sc_value[0]);
-
-    char temperature[33];
-    dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SonoffSC\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_LIGHT "\":%d,\"" D_JSON_NOISE "\":%d,\"" D_JSON_AIRQUALITY "\":%d}"),
-        temperature, humidity, sc_value[2], sc_value[3], sc_value[4]);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-        DomoticzSensor(DZ_ILLUMINANCE, sc_value[2]);
-        DomoticzSensor(DZ_COUNT, sc_value[3]);
-        DomoticzSensor(DZ_AIRQUALITY, 500 + ((100 - sc_value[4]) * 20));
-      }
-#endif
-
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, t);
-        KnxSensor(KNX_HUMIDITY, h);
-      }
-#endif
-
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, "", temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, "", humidity);
-      WSContentSend_PD(HTTP_SNS_SCPLUS, sc_value[2], sc_value[3], sc_value[4]);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns04(uint8_t function)
-{
-  bool result = false;
-
-  if (SONOFF_SC == my_module_type) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        SonoffScShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SonoffScShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        SonoffScInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
-#ifdef USE_DS18x20
-
-
-
-
-#define XSNS_05 5
-
-
-
-#define DS18S20_CHIPID 0x10
-#define DS1822_CHIPID 0x22
-#define DS18B20_CHIPID 0x28
-#define MAX31850_CHIPID 0x3B
-
-#define W1_SKIP_ROM 0xCC
-#define W1_CONVERT_TEMP 0x44
-#define W1_WRITE_EEPROM 0x48
-#define W1_WRITE_SCRATCHPAD 0x4E
-#define W1_READ_SCRATCHPAD 0xBE
-
-#define DS18X20_MAX_SENSORS 8
-
-const char kDs18x20Types[] PROGMEM = "DS18x20|DS18S20|DS1822|DS18B20|MAX31850";
-
-uint8_t ds18x20_chipids[] = { 0, DS18S20_CHIPID, DS1822_CHIPID, DS18B20_CHIPID, MAX31850_CHIPID };
-
-struct DS18X20STRUCT {
-  uint8_t address[8];
-  uint8_t index;
-  uint8_t valid;
-  float temperature;
-} ds18x20_sensor[DS18X20_MAX_SENSORS];
-uint8_t ds18x20_sensors = 0;
-uint8_t ds18x20_pin = 0;
-uint8_t ds18x20_pin_out = 0;
-bool ds18x20_dual_mode = false;
-char ds18x20_types[12];
-#ifdef W1_PARASITE_POWER
-uint8_t ds18x20_sensor_curr = 0;
-unsigned long w1_power_until = 0;
-#endif
-
-
-
-
-
-#define W1_MATCH_ROM 0x55
-#define W1_SEARCH_ROM 0xF0
-
-uint8_t onewire_last_discrepancy = 0;
-uint8_t onewire_last_family_discrepancy = 0;
-bool onewire_last_device_flag = false;
-unsigned char onewire_rom_id[8] = { 0 };
-
-
-
-uint8_t OneWireReset(void)
-{
-  uint8_t retries = 125;
-
-  if (!ds18x20_dual_mode) {
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-    do {
-      if (--retries == 0) {
-        return 0;
-      }
-      delayMicroseconds(2);
-    } while (!digitalRead(ds18x20_pin));
-    pinMode(ds18x20_pin, OUTPUT);
-    digitalWrite(ds18x20_pin, LOW);
-    delayMicroseconds(480);
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-  } else {
-    digitalWrite(ds18x20_pin_out, HIGH);
-    do {
-      if (--retries == 0) {
-        return 0;
-      }
-      delayMicroseconds(2);
-    } while (!digitalRead(ds18x20_pin));
-    digitalWrite(ds18x20_pin_out, LOW);
-    delayMicroseconds(480);
-    digitalWrite(ds18x20_pin_out, HIGH);
-  }
-  delayMicroseconds(70);
-  uint8_t r = !digitalRead(ds18x20_pin);
-  delayMicroseconds(410);
-  return r;
-}
-
-void OneWireWriteBit(uint8_t v)
-{
-  static const uint8_t delay_low[2] = { 65, 10 };
-  static const uint8_t delay_high[2] = { 5, 55 };
-
-  v &= 1;
-  if (!ds18x20_dual_mode) {
-    digitalWrite(ds18x20_pin, LOW);
-    pinMode(ds18x20_pin, OUTPUT);
-    delayMicroseconds(delay_low[v]);
-    digitalWrite(ds18x20_pin, HIGH);
-  } else {
-    digitalWrite(ds18x20_pin_out, LOW);
-    delayMicroseconds(delay_low[v]);
-    digitalWrite(ds18x20_pin_out, HIGH);
-  }
-  delayMicroseconds(delay_high[v]);
-}
-# 150 "S:/Development/Tasmota/tasmota/xsns_05_ds18x20.ino"
-void OneWireReadBit1(void)
-{
-  pinMode(ds18x20_pin, OUTPUT);
-  digitalWrite(ds18x20_pin, LOW);
-  delayMicroseconds(3);
-  pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-}
-
-void OneWireReadBit2(void)
-{
-  digitalWrite(ds18x20_pin_out, LOW);
-  delayMicroseconds(3);
-  digitalWrite(ds18x20_pin_out, HIGH);
-}
-
-uint8_t OneWireReadBit(void)
-{
-  if (!ds18x20_dual_mode) {
-    OneWireReadBit1();
-  } else {
-    OneWireReadBit2();
-  }
-  delayMicroseconds(10);
-  uint8_t r = digitalRead(ds18x20_pin);
-  delayMicroseconds(53);
-  return r;
-}
-
-
-
-void OneWireWrite(uint8_t v)
-{
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    OneWireWriteBit((bit_mask & v) ? 1 : 0);
-  }
-}
-
-uint8_t OneWireRead(void)
-{
-  uint8_t r = 0;
-
-  for (uint8_t bit_mask = 0x01; bit_mask; bit_mask <<= 1) {
-    if (OneWireReadBit()) {
-      r |= bit_mask;
-    }
-  }
-  return r;
-}
-
-void OneWireSelect(const uint8_t rom[8])
-{
-  OneWireWrite(W1_MATCH_ROM);
-  for (uint32_t i = 0; i < 8; i++) {
-    OneWireWrite(rom[i]);
-  }
-}
-
-void OneWireResetSearch(void)
-{
-  onewire_last_discrepancy = 0;
-  onewire_last_device_flag = false;
-  onewire_last_family_discrepancy = 0;
-  for (uint32_t i = 0; i < 8; i++) {
-    onewire_rom_id[i] = 0;
-  }
-}
-
-uint8_t OneWireSearch(uint8_t *newAddr)
-{
-  uint8_t id_bit_number = 1;
-  uint8_t last_zero = 0;
-  uint8_t rom_byte_number = 0;
-  uint8_t search_result = 0;
-  uint8_t id_bit;
-  uint8_t cmp_id_bit;
-  unsigned char rom_byte_mask = 1;
-  unsigned char search_direction;
-
-  if (!onewire_last_device_flag) {
-    if (!OneWireReset()) {
-      onewire_last_discrepancy = 0;
-      onewire_last_device_flag = false;
-      onewire_last_family_discrepancy = 0;
-      return false;
-    }
-    OneWireWrite(W1_SEARCH_ROM);
-    do {
-      id_bit = OneWireReadBit();
-      cmp_id_bit = OneWireReadBit();
-
-      if ((id_bit == 1) && (cmp_id_bit == 1)) {
-        break;
-      } else {
-        if (id_bit != cmp_id_bit) {
-          search_direction = id_bit;
-        } else {
-          if (id_bit_number < onewire_last_discrepancy) {
-            search_direction = ((onewire_rom_id[rom_byte_number] & rom_byte_mask) > 0);
-          } else {
-            search_direction = (id_bit_number == onewire_last_discrepancy);
-          }
-          if (search_direction == 0) {
-            last_zero = id_bit_number;
-            if (last_zero < 9) {
-              onewire_last_family_discrepancy = last_zero;
-            }
-          }
-        }
-        if (search_direction == 1) {
-          onewire_rom_id[rom_byte_number] |= rom_byte_mask;
-        } else {
-          onewire_rom_id[rom_byte_number] &= ~rom_byte_mask;
-        }
-        OneWireWriteBit(search_direction);
-        id_bit_number++;
-        rom_byte_mask <<= 1;
-        if (rom_byte_mask == 0) {
-          rom_byte_number++;
-          rom_byte_mask = 1;
-        }
-      }
-    } while (rom_byte_number < 8);
-    if (!(id_bit_number < 65)) {
-      onewire_last_discrepancy = last_zero;
-      if (onewire_last_discrepancy == 0) {
-        onewire_last_device_flag = true;
-      }
-      search_result = true;
-    }
-  }
-  if (!search_result || !onewire_rom_id[0]) {
-    onewire_last_discrepancy = 0;
-    onewire_last_device_flag = false;
-    onewire_last_family_discrepancy = 0;
-    search_result = false;
-  }
-  for (uint32_t i = 0; i < 8; i++) {
-    newAddr[i] = onewire_rom_id[i];
-  }
-  return search_result;
-}
-
-bool OneWireCrc8(uint8_t *addr)
-{
-  uint8_t crc = 0;
-  uint8_t len = 8;
-
-  while (len--) {
-    uint8_t inbyte = *addr++;
-    for (uint32_t i = 8; i; i--) {
-      uint8_t mix = (crc ^ inbyte) & 0x01;
-      crc >>= 1;
-      if (mix) {
-        crc ^= 0x8C;
-      }
-      inbyte >>= 1;
-    }
-  }
-  return (crc == *addr);
-}
-
-
-
-void Ds18x20Init(void)
-{
-  uint64_t ids[DS18X20_MAX_SENSORS];
-
-  ds18x20_pin = pin[GPIO_DSB];
-
-  if (pin[GPIO_DSB_OUT] < 99) {
-    ds18x20_pin_out = pin[GPIO_DSB_OUT];
-    ds18x20_dual_mode = true;
-    pinMode(ds18x20_pin_out, OUTPUT);
-    pinMode(ds18x20_pin, Settings.flag3.ds18x20_internal_pullup ? INPUT_PULLUP : INPUT);
-  }
-
-  OneWireResetSearch();
-
-  ds18x20_sensors = 0;
-  while (ds18x20_sensors < DS18X20_MAX_SENSORS) {
-    if (!OneWireSearch(ds18x20_sensor[ds18x20_sensors].address)) {
-      break;
-    }
-    if (OneWireCrc8(ds18x20_sensor[ds18x20_sensors].address) &&
-       ((ds18x20_sensor[ds18x20_sensors].address[0] == DS18S20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS1822_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == DS18B20_CHIPID) ||
-        (ds18x20_sensor[ds18x20_sensors].address[0] == MAX31850_CHIPID))) {
-      ds18x20_sensor[ds18x20_sensors].index = ds18x20_sensors;
-      ids[ds18x20_sensors] = ds18x20_sensor[ds18x20_sensors].address[0];
-      for (uint32_t j = 6; j > 0; j--) {
-        ids[ds18x20_sensors] = ids[ds18x20_sensors] << 8 | ds18x20_sensor[ds18x20_sensors].address[j];
-      }
-      ds18x20_sensors++;
-    }
-  }
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    for (uint32_t j = i + 1; j < ds18x20_sensors; j++) {
-      if (ids[ds18x20_sensor[i].index] > ids[ds18x20_sensor[j].index]) {
-        std::swap(ds18x20_sensor[i].index, ds18x20_sensor[j].index);
-      }
-    }
-  }
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSORS_FOUND " %d"), ds18x20_sensors);
-}
-
-void Ds18x20Convert(void)
-{
-  OneWireReset();
-#ifdef W1_PARASITE_POWER
-
-  if (++ds18x20_sensor_curr >= ds18x20_sensors)
-    ds18x20_sensor_curr = 0;
-  OneWireSelect(ds18x20_sensor[ds18x20_sensor_curr].address);
-#else
-  OneWireWrite(W1_SKIP_ROM);
-#endif
-  OneWireWrite(W1_CONVERT_TEMP);
-
-}
-
-bool Ds18x20Read(uint8_t sensor)
-{
-  uint8_t data[9];
-  int8_t sign = 1;
-
-  uint8_t index = ds18x20_sensor[sensor].index;
-  if (ds18x20_sensor[index].valid) { ds18x20_sensor[index].valid--; }
-  for (uint32_t retry = 0; retry < 3; retry++) {
-    OneWireReset();
-    OneWireSelect(ds18x20_sensor[index].address);
-    OneWireWrite(W1_READ_SCRATCHPAD);
-    for (uint32_t i = 0; i < 9; i++) {
-      data[i] = OneWireRead();
-    }
-    if (OneWireCrc8(data)) {
-      switch(ds18x20_sensor[index].address[0]) {
-        case DS18S20_CHIPID: {
-          if (data[1] > 0x80) {
-            data[0] = (~data[0]) +1;
-            sign = -1;
-          }
-          float temp9 = (float)(data[0] >> 1) * sign;
-          ds18x20_sensor[index].temperature = ConvertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case DS1822_CHIPID:
-        case DS18B20_CHIPID: {
-          if (data[4] != 0x7F) {
-            data[4] = 0x7F;
-            OneWireReset();
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_SCRATCHPAD);
-            OneWireWrite(data[2]);
-            OneWireWrite(data[3]);
-            OneWireWrite(data[4]);
-            OneWireSelect(ds18x20_sensor[index].address);
-            OneWireWrite(W1_WRITE_EEPROM);
-#ifdef W1_PARASITE_POWER
-            w1_power_until = millis() + 10;
-#endif
-          }
-          uint16_t temp12 = (data[1] << 8) + data[0];
-          if (temp12 > 2047) {
-            temp12 = (~temp12) +1;
-            sign = -1;
-          }
-          ds18x20_sensor[index].temperature = ConvertTemp(sign * temp12 * 0.0625);
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-        case MAX31850_CHIPID: {
-          int16_t temp14 = (data[1] << 8) + (data[0] & 0xFC);
-          ds18x20_sensor[index].temperature = ConvertTemp(temp14 * 0.0625);
-          ds18x20_sensor[index].valid = SENSOR_MAX_MISS;
-          return true;
-        }
-      }
-    }
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DSB D_SENSOR_CRC_ERROR));
-  return false;
-}
-
-void Ds18x20Name(uint8_t sensor)
-{
-  uint8_t index = sizeof(ds18x20_chipids);
-  while (index) {
-    if (ds18x20_sensor[ds18x20_sensor[sensor].index].address[0] == ds18x20_chipids[index]) {
-      break;
-    }
-    index--;
-  }
-  GetTextIndexed(ds18x20_types, sizeof(ds18x20_types), index, kDs18x20Types);
-  if (ds18x20_sensors > 1) {
-    snprintf_P(ds18x20_types, sizeof(ds18x20_types), PSTR("%s%c%d"), ds18x20_types, IndexSeparator(), sensor +1);
-  }
-}
-
-
-
-void Ds18x20EverySecond(void)
-{
-  if (!ds18x20_sensors) { return; }
-
-#ifdef W1_PARASITE_POWER
-
-  unsigned long now = millis();
-  if (now < w1_power_until)
-    return;
-#endif
-  if (uptime & 1
-#ifdef W1_PARASITE_POWER
-
-      || ds18x20_sensors >= 2
-#endif
-  ) {
-
-    Ds18x20Convert();
-  } else {
-    for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-
-      if (!Ds18x20Read(i)) {
-        Ds18x20Name(i);
-        AddLogMissed(ds18x20_types, ds18x20_sensor[ds18x20_sensor[i].index].valid);
-#ifdef USE_DS18x20_RECONFIGURE
-        if (!ds18x20_sensor[ds18x20_sensor[i].index].valid) {
-          memset(&ds18x20_sensor, 0, sizeof(ds18x20_sensor));
-          Ds18x20Init();
-        }
-#endif
-      }
-    }
-  }
-}
-
-void Ds18x20Show(bool json)
-{
-  for (uint32_t i = 0; i < ds18x20_sensors; i++) {
-    uint8_t index = ds18x20_sensor[i].index;
-
-    if (ds18x20_sensor[index].valid) {
-      char temperature[33];
-      dtostrfd(ds18x20_sensor[index].temperature, Settings.flag2.temperature_resolution, temperature);
-
-      Ds18x20Name(i);
-
-      if (json) {
-        char address[17];
-        for (uint32_t j = 0; j < 6; j++) {
-          sprintf(address+2*j, "%02X", ds18x20_sensor[index].address[6-j]);
-        }
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ID "\":\"%s\",\"" D_JSON_TEMPERATURE "\":%s}"), ds18x20_types, address, temperature);
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == i)) {
-          DomoticzSensor(DZ_TEMP, temperature);
-        }
-#endif
-#ifdef USE_KNX
-        if ((0 == tele_period) && (0 == i)) {
-          KnxSensor(KNX_TEMPERATURE, ds18x20_sensor[index].temperature);
-        }
-#endif
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, ds18x20_types, temperature, TempUnit());
-#endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool Xsns05(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_DSB] < 99) {
-    switch (function) {
-      case FUNC_INIT:
-        Ds18x20Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        Ds18x20EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Ds18x20Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ds18x20Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
-#ifdef USE_DHT_OLD
-# 29 "S:/Development/Tasmota/tasmota/xsns_06_dht_old.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint32_t dht_max_cycles;
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-void DhtReadPrep(void)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[i].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-  }
-}
-
-int32_t DhtExpectPulse(uint8_t sensor, bool level)
-{
-  int32_t count = 0;
-
-  while (digitalRead(Dht[sensor].pin) == level) {
-    if (count++ >= (int32_t)dht_max_cycles) {
-      return -1;
-    }
-  }
-  return count;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  int32_t cycles[80];
-  uint8_t error = 0;
-
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-
-
-
-  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-    Dht[sensor].lastresult = 0;
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[sensor].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-    delay(250);
-  }
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  if (GPIO_SI7021 == Dht[sensor].type) {
-    delayMicroseconds(500);
-  } else {
-    delay(20);
-  }
-
-  noInterrupts();
-  if (!dht_dual_mode) {
-    digitalWrite(Dht[sensor].pin, HIGH);
-    delayMicroseconds(40);
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-    delayMicroseconds(40);
-  }
-  delayMicroseconds(10);
-  if (-1 == DhtExpectPulse(sensor, LOW)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    error = 1;
-  }
-  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    error = 1;
-  }
-  else {
-    for (uint32_t i = 0; i < 80; i += 2) {
-      cycles[i] = DhtExpectPulse(sensor, LOW);
-      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
-    }
-  }
-  interrupts();
-
-  if (error) { return false; }
-
-  for (uint32_t i = 0; i < 40; ++i) {
-    int32_t lowCycles = cycles[2*i];
-    int32_t highCycles = cycles[2*i+1];
-    if ((-1 == lowCycles) || (-1 == highCycles)) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      return false;
-    }
-    dht_data[i/8] <<= 1;
-    if (highCycles > lowCycles) {
-      dht_data[i / 8] |= 1;
-    }
-  }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    dht_max_cycles = microsecondsToClockCycles(1000);
-
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-    DhtReadPrep();
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-#ifdef USE_DHT_V2
-# 29 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint32_t dht_max_cycles;
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-void DhtReadPrep(void)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[i].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-  }
-}
-
-int32_t DhtExpectPulse(uint8_t sensor, bool level)
-{
-  int32_t count = 0;
-
-  while (digitalRead(Dht[sensor].pin) == level) {
-    if (count++ >= (int32_t)dht_max_cycles) {
-      return -1;
-    }
-  }
-  return count;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  int32_t cycles[80];
-  uint8_t error = 0;
-
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-    Dht[sensor].lastresult = 0;
-    if (!dht_dual_mode) {
-      digitalWrite(Dht[sensor].pin, HIGH);
-    } else {
-      digitalWrite(dht_pin_out, HIGH);
-    }
-    delay(250);
-  }
-
-
-  noInterrupts();
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_SI7021:
-# 114 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-      delayMicroseconds(500);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(40);
-      break;
-
-    case GPIO_DHT22:
-# 133 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-      delayMicroseconds(1100);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(30);
-      break;
-
-    case GPIO_DHT11:
-# 151 "S:/Development/Tasmota/tasmota/xsns_06_dht_v2.ino"
-    default:
-
-      delay(20);
-      if (!dht_dual_mode) {
-        digitalWrite(Dht[sensor].pin, HIGH);
-      } else {
-        digitalWrite(dht_pin_out, HIGH);
-      }
-      delayMicroseconds(30);
-      break;
-  }
-
-
-  pinMode(Dht[sensor].pin, INPUT_PULLUP);
-
-  if (-1 == DhtExpectPulse(sensor, LOW)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    error = 1;
-  }
-  else if (-1 == DhtExpectPulse(sensor, HIGH)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    error = 1;
-  }
-  else {
-    for (uint32_t i = 0; i < 80; i += 2) {
-      cycles[i] = DhtExpectPulse(sensor, LOW);
-      cycles[i+1] = DhtExpectPulse(sensor, HIGH);
-    }
-  }
-  interrupts();
-  if (error) { return false; }
-
-
-  for (uint32_t i = 0; i < 40; ++i) {
-    int32_t lowCycles = cycles[2*i];
-    int32_t highCycles = cycles[2*i+1];
-    if ((-1 == lowCycles) || (-1 == highCycles)) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      return false;
-    }
-    dht_data[i/8] <<= 1;
-    if (highCycles > lowCycles) {
-      dht_data[i / 8] |= 1;
-    }
-  }
-
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    dht_max_cycles = microsecondsToClockCycles(1000);
-
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v2) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-    DhtReadPrep();
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
-#ifdef USE_DHT_V3
-# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v3.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtExpectPulse(uint8_t sensor, int level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (micros() > timeout) { return false; }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-int DhtReadDat(uint8_t sensor)
-{
-  uint8_t result = 0;
-  for (uint32_t i = 0; i < 8; i++) {
-    if (!DhtExpectPulse(sensor, HIGH)) { return -1; }
-
-    delayMicroseconds(35);
-    if (digitalRead(Dht[sensor].pin)) {
-      result |= (1 << (7 - i));
-    }
-
-    if (!DhtExpectPulse(sensor, LOW)) { return -1; }
-  }
-  return result;
-}
-
-bool DhtRead(uint8_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-
-      delayMicroseconds(20);
-      break;
-  }
-
-  noInterrupts();
-  if (!DhtExpectPulse(sensor, LOW)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    return false;
-  }
-  if (!DhtExpectPulse(sensor, HIGH)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_HIGH " " D_PULSE));
-    return false;
-  }
-  if (!DhtExpectPulse(sensor, LOW)) {
-    interrupts();
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_START_SIGNAL_LOW " " D_PULSE));
-    return false;
-  }
-
-  int data = 0;
-  for (uint32_t i = 0; i < 5; i++) {
-    data = DhtReadDat(sensor);
-    if (-1 == data) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " " D_PULSE));
-      break;
-    }
-    dht_data[i] = data;
-  }
-  interrupts();
-  if (-1 == data) { return false; }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint8_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v3) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-
-
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
-#ifdef USE_DHT_V4
-# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v4.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  char stype[12];
-  uint32_t lastreadtime;
-  uint8_t lastresult;
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtExpectPulse(uint32_t sensor, uint32_t level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (micros() > timeout) { return false; }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-bool DhtRead(uint32_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(20);
-      break;
-  }
-
-  uint32_t level = 9;
-  noInterrupts();
-  for (uint32_t i = 0; i < 3; i++) {
-    level = i &1;
-    if (!DhtExpectPulse(sensor, level)) { break; }
-    level = 9;
-  }
-  if (9 == level) {
-    int data = 0;
-    for (uint32_t i = 0; i < 5; i++) {
-      data = 0;
-      for (uint32_t j = 0; j < 8; j++) {
-        level = 1;
-        if (!DhtExpectPulse(sensor, level)) { break; }
-
-        delayMicroseconds(35);
-        if (digitalRead(Dht[sensor].pin)) {
-          data |= (1 << (7 - j));
-        }
-
-        level = 0;
-        if (!DhtExpectPulse(sensor, level)) { break; }
-        level = 9;
-      }
-      if (level < 2) { break; }
-
-      dht_data[i] = data;
-    }
-  }
-  interrupts();
-  if (level < 2) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE), (0 == level) ? D_START_SIGNAL_LOW : D_START_SIGNAL_HIGH);
-    return false;
-  }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  return true;
-}
-
-void DhtReadTempHum(uint32_t sensor)
-{
-  if ((NAN == Dht[sensor].h) || (Dht[sensor].lastresult > DHT_MAX_RETRY)) {
-    Dht[sensor].t = NAN;
-    Dht[sensor].h = NAN;
-  }
-  if (DhtRead(sensor)) {
-    switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      Dht[sensor].h = dht_data[0];
-      Dht[sensor].t = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      Dht[sensor].h = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      Dht[sensor].t = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        Dht[sensor].t *= -1;
-      }
-      break;
-    }
-    Dht[sensor].t = ConvertTemp(Dht[sensor].t);
-    if (Dht[sensor].h > 100) { Dht[sensor].h = 100.0; }
-    if (Dht[sensor].h < 0) { Dht[sensor].h = 0.0; }
-    Dht[sensor].h = ConvertHumidity(Dht[sensor].h);
-    Dht[sensor].lastresult = 0;
-  } else {
-    Dht[sensor].lastresult++;
-  }
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastreadtime = 0;
-      Dht[i].lastresult = 0;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v4) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-  } else {
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-
-      DhtReadTempHum(i);
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
-#ifdef USE_DHT
-# 30 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
-#define XSNS_06 6
-
-#define DHT_MAX_SENSORS 4
-#define DHT_MAX_RETRY 8
-
-uint8_t dht_data[5];
-uint8_t dht_sensors = 0;
-uint8_t dht_pin_out = 0;
-bool dht_active = true;
-bool dht_dual_mode = false;
-
-struct DHTSTRUCT {
-  uint8_t pin;
-  uint8_t type;
-  uint8_t lastresult;
-  char stype[12];
-  float t = NAN;
-  float h = NAN;
-} Dht[DHT_MAX_SENSORS];
-
-bool DhtWaitState(uint32_t sensor, uint32_t level)
-{
-  unsigned long timeout = micros() + 100;
-  while (digitalRead(Dht[sensor].pin) != level) {
-    if (TimeReachedUsec(timeout)) {
-      PrepLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_TIMEOUT_WAITING_FOR " %s " D_PULSE),
-        (level) ? D_START_SIGNAL_HIGH : D_START_SIGNAL_LOW);
-      return false;
-    }
-    delayMicroseconds(1);
-  }
-  return true;
-}
-
-bool DhtRead(uint32_t sensor)
-{
-  dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, OUTPUT);
-    digitalWrite(Dht[sensor].pin, LOW);
-  } else {
-    digitalWrite(dht_pin_out, LOW);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      delay(19);
-      break;
-    case GPIO_DHT22:
-      delay(2);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(500);
-      break;
-  }
-
-  if (!dht_dual_mode) {
-    pinMode(Dht[sensor].pin, INPUT_PULLUP);
-  } else {
-    digitalWrite(dht_pin_out, HIGH);
-  }
-
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-    case GPIO_DHT22:
-      delayMicroseconds(50);
-      break;
-    case GPIO_SI7021:
-      delayMicroseconds(20);
-      break;
-  }
-# 133 "S:/Development/Tasmota/tasmota/xsns_06_dht_v5.ino"
-  uint32_t i = 0;
-  noInterrupts();
-  if (DhtWaitState(sensor, 0) && DhtWaitState(sensor, 1) && DhtWaitState(sensor, 0)) {
-    for (i = 0; i < 40; i++) {
-      if (!DhtWaitState(sensor, 1)) { break; }
-      delayMicroseconds(35);
-      if (digitalRead(Dht[sensor].pin)) {
-        dht_data[i / 8] |= (1 << (7 - i % 8));
-      }
-      if (!DhtWaitState(sensor, 0)) { break; }
-    }
-  }
-  interrupts();
-  if (i < 40) { return false; }
-
-  uint8_t checksum = (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF;
-  if (dht_data[4] != checksum) {
-    char hex_char[15];
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT D_CHECKSUM_FAILURE " %s =? %02X"),
-      ToHex_P(dht_data, 5, hex_char, sizeof(hex_char), ' '), checksum);
-    return false;
-  }
-
-  float temperature = NAN;
-  float humidity = NAN;
-  switch (Dht[sensor].type) {
-    case GPIO_DHT11:
-      humidity = dht_data[0];
-      temperature = dht_data[2] + ((float)dht_data[3] * 0.1f);
-      break;
-    case GPIO_DHT22:
-    case GPIO_SI7021:
-      humidity = ((dht_data[0] << 8) | dht_data[1]) * 0.1;
-      temperature = (((dht_data[2] & 0x7F) << 8 ) | dht_data[3]) * 0.1;
-      if (dht_data[2] & 0x80) {
-        temperature *= -1;
-      }
-      break;
-  }
-  if (isnan(temperature) || isnan(humidity)) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
-    return false;
-  }
-
-  if (humidity > 100) { humidity = 100.0; }
-  if (humidity < 0) { humidity = 0.1; }
-  Dht[sensor].h = ConvertHumidity(humidity);
-  Dht[sensor].t = ConvertTemp(temperature);
-  Dht[sensor].lastresult = 0;
-
-  return true;
-}
-
-
-
-bool DhtPinState()
-{
-  if ((XdrvMailbox.index >= GPIO_DHT11) && (XdrvMailbox.index <= GPIO_SI7021)) {
-    if (dht_sensors < DHT_MAX_SENSORS) {
-      Dht[dht_sensors].pin = XdrvMailbox.payload;
-      Dht[dht_sensors].type = XdrvMailbox.index;
-      dht_sensors++;
-      XdrvMailbox.index = GPIO_DHT11;
-    } else {
-      XdrvMailbox.index = 0;
-    }
-    return true;
-  }
-  return false;
-}
-
-void DhtInit(void)
-{
-  if (dht_sensors) {
-    if (pin[GPIO_DHT11_OUT] < 99) {
-      dht_pin_out = pin[GPIO_DHT11_OUT];
-      dht_dual_mode = true;
-      dht_sensors = 1;
-      pinMode(dht_pin_out, OUTPUT);
-    }
-
-    for (uint32_t i = 0; i < dht_sensors; i++) {
-      pinMode(Dht[i].pin, INPUT_PULLUP);
-      Dht[i].lastresult = DHT_MAX_RETRY;
-      GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
-      if (dht_sensors > 1) {
-        snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
-      }
-    }
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "(v5) " D_SENSORS_FOUND " %d"), dht_sensors);
-  } else {
-    dht_active = false;
-  }
-}
-
-void DhtEverySecond(void)
-{
-  if (uptime &1) {
-    for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
-
-      if (!DhtRead(sensor)) {
-        Dht[sensor].lastresult++;
-        if (Dht[sensor].lastresult > DHT_MAX_RETRY) {
-          Dht[sensor].t = NAN;
-          Dht[sensor].h = NAN;
-        }
-      }
-    }
-  }
-}
-
-void DhtShow(bool json)
-{
-  for (uint32_t i = 0; i < dht_sensors; i++) {
-    char temperature[33];
-    dtostrfd(Dht[i].t, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht[i].h, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht[i].stype, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period) && (0 == i)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if ((0 == tele_period) && (0 == i)) {
-        KnxSensor(KNX_TEMPERATURE, Dht[i].t);
-        KnxSensor(KNX_HUMIDITY, Dht[i].h);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht[i].stype, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht[i].stype, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns06(uint8_t function)
-{
-  bool result = false;
-
-  if (dht_active) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DhtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        DhtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        DhtShow(0);
-        break;
-#endif
-      case FUNC_INIT:
-        DhtInit();
-        break;
-      case FUNC_PIN_STATE:
-        result = DhtPinState();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
-#ifdef USE_I2C
-#ifdef USE_SHT
-# 31 "S:/Development/Tasmota/tasmota/xsns_07_sht1x.ino"
-#define XSNS_07 7
-#define XI2C_08 8
-
-enum {
-  SHT1X_CMD_MEASURE_TEMP = B00000011,
-  SHT1X_CMD_MEASURE_RH = B00000101,
-  SHT1X_CMD_SOFT_RESET = B00011110
-};
-
-uint8_t sht_sda_pin;
-uint8_t sht_scl_pin;
-uint8_t sht_type = 0;
-char sht_types[] = "SHT1X";
-uint8_t sht_valid = 0;
-float sht_temperature = 0;
-float sht_humidity = 0;
-
-bool ShtReset(void)
-{
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-  pinMode(sht_scl_pin, OUTPUT);
-  delay(11);
-  for (uint32_t i = 0; i < 9; i++) {
-    digitalWrite(sht_scl_pin, HIGH);
-    digitalWrite(sht_scl_pin, LOW);
-  }
-  bool success = ShtSendCommand(SHT1X_CMD_SOFT_RESET);
-  delay(11);
-  return success;
-}
-
-bool ShtSendCommand(const uint8_t cmd)
-{
-  pinMode(sht_sda_pin, OUTPUT);
-
-  digitalWrite(sht_sda_pin, HIGH);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_sda_pin, LOW);
-  digitalWrite(sht_scl_pin, LOW);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_sda_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-
-  shiftOut(sht_sda_pin, sht_scl_pin, MSBFIRST, cmd);
-
-  bool ackerror = false;
-  digitalWrite(sht_scl_pin, HIGH);
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-  if (digitalRead(sht_sda_pin) != LOW) {
-    ackerror = true;
-  }
-  digitalWrite(sht_scl_pin, LOW);
-  delayMicroseconds(1);
-  if (digitalRead(sht_sda_pin) != HIGH) {
-    ackerror = true;
-  }
-  if (ackerror) {
-
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_DID_NOT_ACK_COMMAND));
-  }
-  return (!ackerror);
-}
-
-bool ShtAwaitResult(void)
-{
-
-  for (uint32_t i = 0; i < 16; i++) {
-    if (LOW == digitalRead(sht_sda_pin)) {
-      return true;
-    }
-    delay(20);
-  }
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_SHT1 D_SENSOR_BUSY));
-
-  return false;
-}
-
-int ShtReadData(void)
-{
-  int val = 0;
-
-
-  val = shiftIn(sht_sda_pin, sht_scl_pin, 8);
-  val <<= 8;
-
-  pinMode(sht_sda_pin, OUTPUT);
-  digitalWrite(sht_sda_pin, LOW);
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-  pinMode(sht_sda_pin, INPUT_PULLUP);
-
-  val |= shiftIn(sht_sda_pin, sht_scl_pin, 8);
-
-  digitalWrite(sht_scl_pin, HIGH);
-  digitalWrite(sht_scl_pin, LOW);
-  return val;
-}
-
-bool ShtRead(void)
-{
-  if (sht_valid) { sht_valid--; }
-  if (!ShtReset()) { return false; }
-  if (!ShtSendCommand(SHT1X_CMD_MEASURE_TEMP)) { return false; }
-  if (!ShtAwaitResult()) { return false; }
-  float tempRaw = ShtReadData();
-  if (!ShtSendCommand(SHT1X_CMD_MEASURE_RH)) { return false; }
-  if (!ShtAwaitResult()) { return false; }
-  float humRaw = ShtReadData();
-
-
-  const float d1 = -39.7;
-  const float d2 = 0.01;
-  sht_temperature = d1 + (tempRaw * d2);
-  const float c1 = -2.0468;
-  const float c2 = 0.0367;
-  const float c3 = -1.5955E-6;
-  const float t1 = 0.01;
-  const float t2 = 0.00008;
-  float rhLinear = c1 + c2 * humRaw + c3 * humRaw * humRaw;
-  sht_humidity = (sht_temperature - 25) * (t1 + t2 * humRaw) + rhLinear;
-  sht_temperature = ConvertTemp(sht_temperature);
-  ConvertHumidity(sht_humidity);
-
-  sht_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void ShtDetect(void)
-{
-  sht_sda_pin = pin[GPIO_I2C_SDA];
-  sht_scl_pin = pin[GPIO_I2C_SCL];
-  if (ShtRead()) {
-    sht_type = 1;
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C D_SHT1X_FOUND));
-  } else {
-    Wire.begin(sht_sda_pin, sht_scl_pin);
-    sht_type = 0;
-  }
-}
-
-void ShtEverySecond(void)
-{
-  if (!(uptime %4)) {
-
-    if (!ShtRead()) {
-      AddLogMissed(sht_types, sht_valid);
-    }
-  }
-}
-
-void ShtShow(bool json)
-{
-  if (sht_valid) {
-    char temperature[33];
-    dtostrfd(sht_temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(sht_humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, sht_types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, sht_temperature);
-        KnxSensor(KNX_HUMIDITY, sht_humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, sht_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, sht_types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns07(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_08)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    ShtDetect();
-  }
-  else if (sht_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        ShtEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        ShtShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        ShtShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
-#ifdef USE_I2C
-#ifdef USE_HTU
-# 30 "S:/Development/Tasmota/tasmota/xsns_08_htu21.ino"
-#define XSNS_08 8
-#define XI2C_09 9
-
-#define HTU21_ADDR 0x40
-
-#define SI7013_CHIPID 0x0D
-#define SI7020_CHIPID 0x14
-#define SI7021_CHIPID 0x15
-#define HTU21_CHIPID 0x32
-
-#define HTU21_READTEMP 0xE3
-#define HTU21_READHUM 0xE5
-#define HTU21_WRITEREG 0xE6
-#define HTU21_READREG 0xE7
-#define HTU21_RESET 0xFE
-#define HTU21_HEATER_WRITE 0x51
-#define HTU21_HEATER_READ 0x11
-#define HTU21_SERIAL2_READ1 0xFC
-#define HTU21_SERIAL2_READ2 0xC9
-
-#define HTU21_HEATER_ON 0x04
-#define HTU21_HEATER_OFF 0xFB
-
-#define HTU21_RES_RH12_T14 0x00
-#define HTU21_RES_RH8_T12 0x01
-#define HTU21_RES_RH10_T13 0x80
-#define HTU21_RES_RH11_T11 0x81
-
-#define HTU21_CRC8_POLYNOM 0x13100
-
-const char kHtuTypes[] PROGMEM = "HTU21|SI7013|SI7020|SI7021|T/RH?";
-
-uint8_t htu_address;
-uint8_t htu_type = 0;
-uint8_t htu_delay_temp;
-uint8_t htu_delay_humidity = 50;
-uint8_t htu_valid = 0;
-float htu_temperature = 0;
-float htu_humidity = 0;
-char htu_types[7];
-
-uint8_t HtuCheckCrc8(uint16_t data)
-{
-  for (uint32_t bit = 0; bit < 16; bit++) {
-    if (data & 0x8000) {
-      data = (data << 1) ^ HTU21_CRC8_POLYNOM;
-    } else {
-      data <<= 1;
-    }
-  }
-  return data >>= 8;
-}
-
-uint8_t HtuReadDeviceId(void)
-{
-  uint16_t deviceID = 0;
-  uint8_t checksum = 0;
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_SERIAL2_READ1);
-  Wire.write(HTU21_SERIAL2_READ2);
-  Wire.endTransmission();
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  deviceID = Wire.read() << 8;
-  deviceID |= Wire.read();
-  checksum = Wire.read();
-  if (HtuCheckCrc8(deviceID) == checksum) {
-    deviceID = deviceID >> 8;
-  } else {
-    deviceID = 0;
-  }
-  return (uint8_t)deviceID;
-}
-
-void HtuSetResolution(uint8_t resolution)
-{
-  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
-  current &= 0x7E;
-  current |= resolution;
-  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
-}
-
-void HtuReset(void)
-{
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_RESET);
-  Wire.endTransmission();
-  delay(15);
-}
-
-void HtuHeater(uint8_t heater)
-{
-  uint8_t current = I2cRead8(HTU21_ADDR, HTU21_READREG);
-
-  switch(heater)
-  {
-    case HTU21_HEATER_ON : current |= heater;
-                            break;
-    case HTU21_HEATER_OFF : current &= heater;
-                            break;
-    default : current &= heater;
-                            break;
-  }
-  I2cWrite8(HTU21_ADDR, HTU21_WRITEREG, current);
-}
-
-void HtuInit(void)
-{
-  HtuReset();
-  HtuHeater(HTU21_HEATER_OFF);
-  HtuSetResolution(HTU21_RES_RH12_T14);
-}
-
-bool HtuRead(void)
-{
-  uint8_t checksum = 0;
-  uint16_t sensorval = 0;
-
-  if (htu_valid) { htu_valid--; }
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_READTEMP);
-  if (Wire.endTransmission() != 0) { return false; }
-  delay(htu_delay_temp);
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  if (3 == Wire.available()) {
-    sensorval = Wire.read() << 8;
-    sensorval |= Wire.read();
-    checksum = Wire.read();
-  }
-  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
-
-  htu_temperature = ConvertTemp(0.002681 * (float)sensorval - 46.85);
-
-  Wire.beginTransmission(HTU21_ADDR);
-  Wire.write(HTU21_READHUM);
-  if (Wire.endTransmission() != 0) { return false; }
-  delay(htu_delay_humidity);
-
-  Wire.requestFrom(HTU21_ADDR, 3);
-  if (3 <= Wire.available()) {
-    sensorval = Wire.read() << 8;
-    sensorval |= Wire.read();
-    checksum = Wire.read();
-  }
-  if (HtuCheckCrc8(sensorval) != checksum) { return false; }
-
-  sensorval ^= 0x02;
-  htu_humidity = 0.001907 * (float)sensorval - 6;
-  if (htu_humidity > 100) { htu_humidity = 100.0; }
-  if (htu_humidity < 0) { htu_humidity = 0.01; }
-
-  if ((0.00 == htu_humidity) && (0.00 == htu_temperature)) {
-    htu_humidity = 0.0;
-  }
-  if ((htu_temperature > 0.00) && (htu_temperature < 80.00)) {
-    htu_humidity = (-0.15) * (25 - htu_temperature) + htu_humidity;
-  }
-  ConvertHumidity(htu_humidity);
-
-  htu_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void HtuDetect(void)
-{
-  htu_address = HTU21_ADDR;
-  if (I2cActive(htu_address)) { return; }
-
-  htu_type = HtuReadDeviceId();
-  if (htu_type) {
-    uint8_t index = 0;
-    HtuInit();
-    switch (htu_type) {
-      case HTU21_CHIPID:
-        htu_delay_temp = 50;
-        htu_delay_humidity = 16;
-        break;
-      case SI7021_CHIPID:
-        index++;
-      case SI7020_CHIPID:
-        index++;
-      case SI7013_CHIPID:
-        index++;
-        htu_delay_temp = 12;
-        htu_delay_humidity = 23;
-        break;
-      default:
-        index = 4;
-        htu_delay_temp = 50;
-        htu_delay_humidity = 23;
-    }
-    GetTextIndexed(htu_types, sizeof(htu_types), index, kHtuTypes);
-    I2cSetActiveFound(htu_address, htu_types);
-  }
-}
-
-void HtuEverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!HtuRead()) {
-      AddLogMissed(htu_types, htu_valid);
-    }
-  }
-}
-
-void HtuShow(bool json)
-{
-  if (htu_valid) {
-    char temperature[33];
-    dtostrfd(htu_temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(htu_humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, htu_types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, htu_temperature);
-        KnxSensor(KNX_HUMIDITY, htu_humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, htu_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, htu_types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns08(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_09)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    HtuDetect();
-  }
-  else if (htu_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        HtuEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        HtuShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HtuShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
-#ifdef USE_I2C
-#ifdef USE_BMP
-# 30 "S:/Development/Tasmota/tasmota/xsns_09_bmp.ino"
-#define XSNS_09 9
-#define XI2C_10 10
-
-#define BMP_ADDR1 0x76
-#define BMP_ADDR2 0x77
-
-#define BMP180_CHIPID 0x55
-#define BMP280_CHIPID 0x58
-#define BME280_CHIPID 0x60
-#define BME680_CHIPID 0x61
-
-#define BMP_REGISTER_CHIPID 0xD0
-
-#define BMP_REGISTER_RESET 0xE0
-
-#define BMP_CMND_RESET 0xB6
-
-#define BMP_MAX_SENSORS 2
-
-const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
-
-typedef struct {
-  uint8_t bmp_address;
-  char bmp_name[7];
-  uint8_t bmp_type;
-  uint8_t bmp_model;
-#ifdef USE_BME680
-  uint8_t bme680_state;
-  float bmp_gas_resistance;
-#endif
-  float bmp_temperature;
-  float bmp_pressure;
-  float bmp_humidity;
-} bmp_sensors_t;
-
-uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 };
-uint8_t bmp_count = 0;
-uint8_t bmp_once = 1;
-
-bmp_sensors_t *bmp_sensors = nullptr;
-
-
-
-
-
-#define BMP180_REG_CONTROL 0xF4
-#define BMP180_REG_RESULT 0xF6
-#define BMP180_TEMPERATURE 0x2E
-#define BMP180_PRESSURE3 0xF4
-
-#define BMP180_AC1 0xAA
-#define BMP180_AC2 0xAC
-#define BMP180_AC3 0xAE
-#define BMP180_AC4 0xB0
-#define BMP180_AC5 0xB2
-#define BMP180_AC6 0xB4
-#define BMP180_VB1 0xB6
-#define BMP180_VB2 0xB8
-#define BMP180_MB 0xBA
-#define BMP180_MC 0xBC
-#define BMP180_MD 0xBE
-
-#define BMP180_OSS 3
-
-typedef struct {
-  int16_t cal_ac1;
-  int16_t cal_ac2;
-  int16_t cal_ac3;
-  int16_t cal_b1;
-  int16_t cal_b2;
-  int16_t cal_mc;
-  int16_t cal_md;
-  uint16_t cal_ac4;
-  uint16_t cal_ac5;
-  uint16_t cal_ac6;
-} bmp180_cal_data_t;
-
-bmp180_cal_data_t *bmp180_cal_data = nullptr;
-
-bool Bmp180Calibration(uint8_t bmp_idx)
-{
-  if (!bmp180_cal_data) {
-    bmp180_cal_data = (bmp180_cal_data_t*)malloc(BMP_MAX_SENSORS * sizeof(bmp180_cal_data_t));
-  }
-  if (!bmp180_cal_data) { return false; }
-
-  bmp180_cal_data[bmp_idx].cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
-  bmp180_cal_data[bmp_idx].cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
-  bmp180_cal_data[bmp_idx].cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
-  bmp180_cal_data[bmp_idx].cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
-  bmp180_cal_data[bmp_idx].cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
-  bmp180_cal_data[bmp_idx].cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
-  bmp180_cal_data[bmp_idx].cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
-  bmp180_cal_data[bmp_idx].cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
-  bmp180_cal_data[bmp_idx].cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
-  bmp180_cal_data[bmp_idx].cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
-
-
-  if (!bmp180_cal_data[bmp_idx].cal_ac1 |
-      !bmp180_cal_data[bmp_idx].cal_ac2 |
-      !bmp180_cal_data[bmp_idx].cal_ac3 |
-      !bmp180_cal_data[bmp_idx].cal_ac4 |
-      !bmp180_cal_data[bmp_idx].cal_ac5 |
-      !bmp180_cal_data[bmp_idx].cal_ac6 |
-      !bmp180_cal_data[bmp_idx].cal_b1 |
-      !bmp180_cal_data[bmp_idx].cal_b2 |
-      !bmp180_cal_data[bmp_idx].cal_mc |
-      !bmp180_cal_data[bmp_idx].cal_md) {
-    return false;
-  }
-
-  if ((bmp180_cal_data[bmp_idx].cal_ac1 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac2 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac3 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac4 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac5 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_ac6 == 0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_b1 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_b2 == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_mc == (int16_t)0xFFFF) |
-      (bmp180_cal_data[bmp_idx].cal_md == (int16_t)0xFFFF)) {
-    return false;
-  }
-  return true;
-}
-
-void Bmp180Read(uint8_t bmp_idx)
-{
-  if (!bmp180_cal_data) { return; }
-
-  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_TEMPERATURE);
-  delay(5);
-  int ut = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
-  int32_t xt1 = (ut - (int32_t)bmp180_cal_data[bmp_idx].cal_ac6) * ((int32_t)bmp180_cal_data[bmp_idx].cal_ac5) >> 15;
-  int32_t xt2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_mc << 11) / (xt1 + (int32_t)bmp180_cal_data[bmp_idx].cal_md);
-  int32_t bmp180_b5 = xt1 + xt2;
-  bmp_sensors[bmp_idx].bmp_temperature = ((bmp180_b5 + 8) >> 4) / 10.0;
-
-  I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_PRESSURE3);
-  delay(2 + (4 << BMP180_OSS));
-  uint32_t up = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
-  up >>= (8 - BMP180_OSS);
-
-  int32_t b6 = bmp180_b5 - 4000;
-  int32_t x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b2 * ((b6 * b6) >> 12)) >> 11;
-  int32_t x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac2 * b6) >> 11;
-  int32_t x3 = x1 + x2;
-  int32_t b3 = ((((int32_t)bmp180_cal_data[bmp_idx].cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
-
-  x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac3 * b6) >> 13;
-  x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b1 * ((b6 * b6) >> 12)) >> 16;
-  x3 = ((x1 + x2) + 2) >> 2;
-  uint32_t b4 = ((uint32_t)bmp180_cal_data[bmp_idx].cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
-  uint32_t b7 = ((uint32_t)up - b3) * (uint32_t)(50000UL >> BMP180_OSS);
-
-  int32_t p;
-  if (b7 < 0x80000000) {
-    p = (b7 * 2) / b4;
-  }
-  else {
-    p = (b7 / b4) * 2;
-  }
-  x1 = (p >> 8) * (p >> 8);
-  x1 = (x1 * 3038) >> 16;
-  x2 = (-7357 * p) >> 16;
-  p += ((x1 + x2 + (int32_t)3791) >> 4);
-  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 100.0;
-}
-
-
-
-
-
-
-
-#define BME280_REGISTER_CONTROLHUMID 0xF2
-#define BME280_REGISTER_CONTROL 0xF4
-#define BME280_REGISTER_CONFIG 0xF5
-#define BME280_REGISTER_PRESSUREDATA 0xF7
-#define BME280_REGISTER_TEMPDATA 0xFA
-#define BME280_REGISTER_HUMIDDATA 0xFD
-
-#define BME280_REGISTER_DIG_T1 0x88
-#define BME280_REGISTER_DIG_T2 0x8A
-#define BME280_REGISTER_DIG_T3 0x8C
-#define BME280_REGISTER_DIG_P1 0x8E
-#define BME280_REGISTER_DIG_P2 0x90
-#define BME280_REGISTER_DIG_P3 0x92
-#define BME280_REGISTER_DIG_P4 0x94
-#define BME280_REGISTER_DIG_P5 0x96
-#define BME280_REGISTER_DIG_P6 0x98
-#define BME280_REGISTER_DIG_P7 0x9A
-#define BME280_REGISTER_DIG_P8 0x9C
-#define BME280_REGISTER_DIG_P9 0x9E
-#define BME280_REGISTER_DIG_H1 0xA1
-#define BME280_REGISTER_DIG_H2 0xE1
-#define BME280_REGISTER_DIG_H3 0xE3
-#define BME280_REGISTER_DIG_H4 0xE4
-#define BME280_REGISTER_DIG_H5 0xE5
-#define BME280_REGISTER_DIG_H6 0xE7
-
-typedef struct {
-  uint16_t dig_T1;
-  int16_t dig_T2;
-  int16_t dig_T3;
-  uint16_t dig_P1;
-  int16_t dig_P2;
-  int16_t dig_P3;
-  int16_t dig_P4;
-  int16_t dig_P5;
-  int16_t dig_P6;
-  int16_t dig_P7;
-  int16_t dig_P8;
-  int16_t dig_P9;
-  int16_t dig_H2;
-  int16_t dig_H4;
-  int16_t dig_H5;
-  uint8_t dig_H1;
-  uint8_t dig_H3;
-  int8_t dig_H6;
-} Bme280CalibrationData_t;
-
-Bme280CalibrationData_t *Bme280CalibrationData = nullptr;
-
-bool Bmx280Calibrate(uint8_t bmp_idx)
-{
-
-
-  if (!Bme280CalibrationData) {
-    Bme280CalibrationData = (Bme280CalibrationData_t*)malloc(BMP_MAX_SENSORS * sizeof(Bme280CalibrationData_t));
-  }
-  if (!Bme280CalibrationData) { return false; }
-
-  Bme280CalibrationData[bmp_idx].dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
-  Bme280CalibrationData[bmp_idx].dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
-  Bme280CalibrationData[bmp_idx].dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
-  Bme280CalibrationData[bmp_idx].dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
-  Bme280CalibrationData[bmp_idx].dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
-  Bme280CalibrationData[bmp_idx].dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
-  Bme280CalibrationData[bmp_idx].dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
-  Bme280CalibrationData[bmp_idx].dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
-  Bme280CalibrationData[bmp_idx].dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
-  Bme280CalibrationData[bmp_idx].dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
-  Bme280CalibrationData[bmp_idx].dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
-  Bme280CalibrationData[bmp_idx].dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
-  if (BME280_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
-    Bme280CalibrationData[bmp_idx].dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
-    Bme280CalibrationData[bmp_idx].dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
-    Bme280CalibrationData[bmp_idx].dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
-    Bme280CalibrationData[bmp_idx].dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
-    Bme280CalibrationData[bmp_idx].dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
-    Bme280CalibrationData[bmp_idx].dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x00);
-
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROLHUMID, 0x01);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONFIG, 0xA0);
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x27);
-  } else {
-    I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0xB7);
-  }
-
-  return true;
-}
-
-void Bme280Read(uint8_t bmp_idx)
-{
-  if (!Bme280CalibrationData) { return; }
-
-  int32_t adc_T = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_TEMPDATA);
-  adc_T >>= 4;
-
-  int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1 << 1))) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_T2)) >> 11;
-  int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1))) >> 12) *
-    ((int32_t)Bme280CalibrationData[bmp_idx].dig_T3)) >> 14;
-  int32_t t_fine = vart1 + vart2;
-  float T = (t_fine * 5 + 128) >> 8;
-  bmp_sensors[bmp_idx].bmp_temperature = T / 100.0;
-
-  int32_t adc_P = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_PRESSUREDATA);
-  adc_P >>= 4;
-
-  int64_t var1 = ((int64_t)t_fine) - 128000;
-  int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P6;
-  var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P5) << 17);
-  var2 = var2 + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P4) << 35);
-  var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P2) << 12);
-  var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData[bmp_idx].dig_P1) >> 33;
-  if (0 == var1) {
-    return;
-  }
-  int64_t p = 1048576 - adc_P;
-  p = (((p << 31) - var2) * 3125) / var1;
-  var1 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P9) * (p >> 13) * (p >> 13)) >> 25;
-  var2 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P8) * p) >> 19;
-  p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P7) << 4);
-  bmp_sensors[bmp_idx].bmp_pressure = (float)p / 25600.0;
-
-  if (BMP280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { return; }
-
-  int32_t adc_H = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_HUMIDDATA);
-
-  int32_t v_x1_u32r = (t_fine - ((int32_t)76800));
-  v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData[bmp_idx].dig_H4) << 20) -
-    (((int32_t)Bme280CalibrationData[bmp_idx].dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
-    (((((((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H6)) >> 10) *
-    (((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
-    ((int32_t)2097152)) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H2) + 8192) >> 14));
-  v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) *
-    ((int32_t)Bme280CalibrationData[bmp_idx].dig_H1)) >> 4));
-  v_x1_u32r = (v_x1_u32r < 0) ? 0 : v_x1_u32r;
-  v_x1_u32r = (v_x1_u32r > 419430400) ? 419430400 : v_x1_u32r;
-  float h = (v_x1_u32r >> 12);
-  bmp_sensors[bmp_idx].bmp_humidity = h / 1024.0;
-}
-
-#ifdef USE_BME680
-
-
-
-
-#include <bme680.h>
-
-struct bme680_dev *gas_sensor = nullptr;
-
-static void BmeDelayMs(uint32_t ms)
-{
-  delay(ms);
-}
-
-bool Bme680Init(uint8_t bmp_idx)
-{
-  if (!gas_sensor) {
-    gas_sensor = (bme680_dev*)malloc(BMP_MAX_SENSORS * sizeof(bme680_dev));
-  }
-  if (!gas_sensor) { return false; }
-
-  gas_sensor[bmp_idx].dev_id = bmp_sensors[bmp_idx].bmp_address;
-  gas_sensor[bmp_idx].intf = BME680_I2C_INTF;
-  gas_sensor[bmp_idx].read = &I2cReadBuffer;
-  gas_sensor[bmp_idx].write = &I2cWriteBuffer;
-  gas_sensor[bmp_idx].delay_ms = BmeDelayMs;
-
-
-
-  gas_sensor[bmp_idx].amb_temp = 25;
-
-  int8_t rslt = BME680_OK;
-  rslt = bme680_init(&gas_sensor[bmp_idx]);
-  if (rslt != BME680_OK) { return false; }
-
-
-  gas_sensor[bmp_idx].tph_sett.os_hum = BME680_OS_2X;
-  gas_sensor[bmp_idx].tph_sett.os_pres = BME680_OS_4X;
-  gas_sensor[bmp_idx].tph_sett.os_temp = BME680_OS_8X;
-  gas_sensor[bmp_idx].tph_sett.filter = BME680_FILTER_SIZE_3;
-
-
-  gas_sensor[bmp_idx].gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
-
-  gas_sensor[bmp_idx].gas_sett.heatr_temp = 320;
-  gas_sensor[bmp_idx].gas_sett.heatr_dur = 150;
-
-
-
-  gas_sensor[bmp_idx].power_mode = BME680_FORCED_MODE;
-
-
-  uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
-
-
-  rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor[bmp_idx]);
-  if (rslt != BME680_OK) { return false; }
-
-  bmp_sensors[bmp_idx].bme680_state = 0;
-
-  return true;
-}
-
-void Bme680Read(uint8_t bmp_idx)
-{
-  if (!gas_sensor) { return; }
-
-  int8_t rslt = BME680_OK;
-
-  if (BME680_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
-    if (0 == bmp_sensors[bmp_idx].bme680_state) {
-
-      rslt = bme680_set_sensor_mode(&gas_sensor[bmp_idx]);
-      if (rslt != BME680_OK) { return; }
-
-
-
-
-
-
-
-      bmp_sensors[bmp_idx].bme680_state = 1;
-    } else {
-      bmp_sensors[bmp_idx].bme680_state = 0;
-
-      struct bme680_field_data data;
-      rslt = bme680_get_sensor_data(&data, &gas_sensor[bmp_idx]);
-      if (rslt != BME680_OK) { return; }
-
-      bmp_sensors[bmp_idx].bmp_temperature = data.temperature / 100.0;
-      bmp_sensors[bmp_idx].bmp_humidity = data.humidity / 1000.0;
-      bmp_sensors[bmp_idx].bmp_pressure = data.pressure / 100.0;
-
-      if (data.status & BME680_GASM_VALID_MSK) {
-        bmp_sensors[bmp_idx].bmp_gas_resistance = data.gas_resistance / 1000.0;
-      } else {
-        bmp_sensors[bmp_idx].bmp_gas_resistance = 0;
-      }
-    }
-  }
-  return;
-}
-
-#endif
-
-
-
-void BmpDetect(void)
-{
-  int bmp_sensor_size = BMP_MAX_SENSORS * sizeof(bmp_sensors_t);
-  if (!bmp_sensors) {
-    bmp_sensors = (bmp_sensors_t*)malloc(bmp_sensor_size);
-  }
-  if (!bmp_sensors) { return; }
-  memset(bmp_sensors, 0, bmp_sensor_size);
-
-  for (uint32_t i = 0; i < BMP_MAX_SENSORS; i++) {
-    if (I2cActive(bmp_addresses[i])) { continue; }
-    uint8_t bmp_type = I2cRead8(bmp_addresses[i], BMP_REGISTER_CHIPID);
-    if (bmp_type) {
-      bmp_sensors[bmp_count].bmp_address = bmp_addresses[i];
-      bmp_sensors[bmp_count].bmp_type = bmp_type;
-      bmp_sensors[bmp_count].bmp_model = 0;
-
-      bool success = false;
-      switch (bmp_type) {
-        case BMP180_CHIPID:
-          success = Bmp180Calibration(bmp_count);
-          break;
-        case BME280_CHIPID:
-          bmp_sensors[bmp_count].bmp_model++;
-        case BMP280_CHIPID:
-          bmp_sensors[bmp_count].bmp_model++;
-          success = Bmx280Calibrate(bmp_count);
-          break;
-#ifdef USE_BME680
-        case BME680_CHIPID:
-          bmp_sensors[bmp_count].bmp_model = 3;
-          success = Bme680Init(bmp_count);
-          break;
-#endif
-      }
-      if (success) {
-        GetTextIndexed(bmp_sensors[bmp_count].bmp_name, sizeof(bmp_sensors[bmp_count].bmp_name), bmp_sensors[bmp_count].bmp_model, kBmpTypes);
-        I2cSetActiveFound(bmp_sensors[bmp_count].bmp_address, bmp_sensors[bmp_count].bmp_name);
-        bmp_count++;
-      }
-    }
-  }
-}
-
-void BmpRead(void)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    switch (bmp_sensors[bmp_idx].bmp_type) {
-      case BMP180_CHIPID:
-        Bmp180Read(bmp_idx);
-        break;
-      case BMP280_CHIPID:
-      case BME280_CHIPID:
-        Bme280Read(bmp_idx);
-        break;
-#ifdef USE_BME680
-      case BME680_CHIPID:
-        Bme680Read(bmp_idx);
-        break;
-#endif
-    }
-  }
-  ConvertTemp(bmp_sensors[0].bmp_temperature);
-  ConvertHumidity(bmp_sensors[0].bmp_humidity);
-}
-
-void BmpShow(bool json)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    if (bmp_sensors[bmp_idx].bmp_type) {
-      float bmp_sealevel = 0.0;
-      if (bmp_sensors[bmp_idx].bmp_pressure != 0.0) {
-        bmp_sealevel = (bmp_sensors[bmp_idx].bmp_pressure / FastPrecisePow(1.0 - ((float)Settings.altitude / 44330.0), 5.255)) - 21.6;
-        bmp_sealevel = ConvertPressure(bmp_sealevel);
-      }
-      float bmp_temperature = ConvertTemp(bmp_sensors[bmp_idx].bmp_temperature);
-      float bmp_pressure = ConvertPressure(bmp_sensors[bmp_idx].bmp_pressure);
-
-      char name[10];
-      strlcpy(name, bmp_sensors[bmp_idx].bmp_name, sizeof(name));
-      if (bmp_count > 1) {
-        snprintf_P(name, sizeof(name), PSTR("%s%c%02X"), name, IndexSeparator(), bmp_sensors[bmp_idx].bmp_address);
-      }
-
-      char temperature[33];
-      dtostrfd(bmp_temperature, Settings.flag2.temperature_resolution, temperature);
-      char pressure[33];
-      dtostrfd(bmp_pressure, Settings.flag2.pressure_resolution, pressure);
-      char sea_pressure[33];
-      dtostrfd(bmp_sealevel, Settings.flag2.pressure_resolution, sea_pressure);
-      char humidity[33];
-      dtostrfd(bmp_sensors[bmp_idx].bmp_humidity, Settings.flag2.humidity_resolution, humidity);
-#ifdef USE_BME680
-      char gas_resistance[33];
-      dtostrfd(bmp_sensors[bmp_idx].bmp_gas_resistance, 2, gas_resistance);
-#endif
-
-      if (json) {
-        char json_humidity[40];
-        snprintf_P(json_humidity, sizeof(json_humidity), PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-        char json_sealevel[40];
-        snprintf_P(json_sealevel, sizeof(json_sealevel), PSTR(",\"" D_JSON_PRESSUREATSEALEVEL "\":%s"), sea_pressure);
-#ifdef USE_BME680
-        char json_gas[40];
-        snprintf_P(json_gas, sizeof(json_gas), PSTR(",\"" D_JSON_GAS "\":%s"), gas_resistance);
-
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s%s}"),
-          name,
-          temperature,
-          (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "",
-          pressure,
-          (Settings.altitude != 0) ? json_sealevel : "",
-          (bmp_sensors[bmp_idx].bmp_model >= 3) ? json_gas : "");
-#else
-        ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s}"),
-          name, temperature, (bmp_sensors[bmp_idx].bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : "");
-#endif
-
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == bmp_idx)) {
-          DomoticzTempHumPressureSensor(temperature, humidity, pressure);
-#ifdef USE_BME680
-          if (bmp_sensors[bmp_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp_sensors[bmp_idx].bmp_gas_resistance); }
-#endif
-        }
-#endif
-
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, bmp_temperature);
-          KnxSensor(KNX_HUMIDITY, bmp_sensors[bmp_idx].bmp_humidity);
-        }
-#endif
-
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, name, temperature, TempUnit());
-        if (bmp_sensors[bmp_idx].bmp_model >= 2) {
-          WSContentSend_PD(HTTP_SNS_HUM, name, humidity);
-        }
-        WSContentSend_PD(HTTP_SNS_PRESSURE, name, pressure, PressureUnit().c_str());
-        if (Settings.altitude != 0) {
-          WSContentSend_PD(HTTP_SNS_SEAPRESSURE, name, sea_pressure, PressureUnit().c_str());
-        }
-#ifdef USE_BME680
-        if (bmp_sensors[bmp_idx].bmp_model >= 3) {
-          WSContentSend_PD(PSTR("{s}%s " D_GAS "{m}%s " D_UNIT_KILOOHM "{e}"), name, gas_resistance);
-        }
-#endif
-
-#endif
-      }
-    }
-  }
-}
-
-#ifdef USE_DEEPSLEEP
-
-void BMP_EnterSleep(void)
-{
-  for (uint32_t bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
-    switch (bmp_sensors[bmp_idx].bmp_type) {
-      case BMP180_CHIPID:
-      case BMP280_CHIPID:
-      case BME280_CHIPID:
-        I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP_REGISTER_RESET, BMP_CMND_RESET);
-        break;
-      default:
-        break;
-    }
-  }
-}
-
-#endif
-
-
-
-
-
-bool Xsns09(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_10)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    BmpDetect();
-  }
-  else if (bmp_count) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        BmpRead();
-        break;
-      case FUNC_JSON_APPEND:
-        BmpShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        BmpShow(0);
-        break;
-#endif
-#ifdef USE_DEEPSLEEP
-      case FUNC_SAVE_BEFORE_RESTART:
-        BMP_EnterSleep();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_10_bh1750.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_10_bh1750.ino"
-#ifdef USE_I2C
-#ifdef USE_BH1750
-
-
-
-
-
-
-#define XSNS_10 10
-#define XI2C_11 11
-
-#define BH1750_ADDR1 0x23
-#define BH1750_ADDR2 0x5C
-
-#define BH1750_CONTINUOUS_HIGH_RES_MODE 0x10
-
-uint8_t bh1750_address;
-uint8_t bh1750_addresses[] = { BH1750_ADDR1, BH1750_ADDR2 };
-uint8_t bh1750_type = 0;
-uint8_t bh1750_valid = 0;
-uint16_t bh1750_illuminance = 0;
-char bh1750_types[] = "BH1750";
-
-bool Bh1750Read(void)
-{
-  if (bh1750_valid) { bh1750_valid--; }
-
-  if (2 != Wire.requestFrom(bh1750_address, (uint8_t)2)) { return false; }
-  uint8_t msb = Wire.read();
-  uint8_t lsb = Wire.read();
-  bh1750_illuminance = ((msb << 8) | lsb) / 1.2;
-  bh1750_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Bh1750Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(bh1750_addresses); i++) {
-    bh1750_address = bh1750_addresses[i];
-    if (I2cActive(bh1750_address)) { continue; }
-    Wire.beginTransmission(bh1750_address);
-    Wire.write(BH1750_CONTINUOUS_HIGH_RES_MODE);
-    if (!Wire.endTransmission()) {
-      I2cSetActiveFound(bh1750_address, bh1750_types);
-      bh1750_type = 1;
-      break;
-    }
-  }
-}
-
-void Bh1750EverySecond(void)
-{
-
-  if (!Bh1750Read()) {
-    AddLogMissed(bh1750_types, bh1750_valid);
-  }
-}
-
-void Bh1750Show(bool json)
-{
-  if (bh1750_valid) {
-    if (json) {
-      ResponseAppend_P(JSON_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, bh1750_illuminance);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, bh1750_types, bh1750_illuminance);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns10(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_11)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Bh1750Detect();
-  }
-  else if (bh1750_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Bh1750EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Bh1750Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Bh1750Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_11_veml6070.ino"
-# 89 "S:/Development/Tasmota/tasmota/xsns_11_veml6070.ino"
-#ifdef USE_I2C
-#ifdef USE_VEML6070
-
-
-
-
-
-
-#define XSNS_11 11
-#define XI2C_12 12
-
-#define VEML6070_ADDR_H 0x39
-#define VEML6070_ADDR_L 0x38
-#define VEML6070_INTEGRATION_TIME 3
-#define VEML6070_ENABLE 1
-#define VEML6070_DISABLE 0
-#define VEML6070_RSET_DEFAULT 270000
-#define VEML6070_UV_MAX_INDEX 15
-#define VEML6070_UV_MAX_DEFAULT 11
-#define VEML6070_POWER_COEFFCIENT 0.025
-#define VEML6070_TABLE_COEFFCIENT 32.86270591
-
-
-
-
-
-const char kVemlTypes[] PROGMEM = "VEML6070";
-double uv_risk_map[VEML6070_UV_MAX_INDEX] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-double uvrisk = 0;
-double uvpower = 0;
-uint16_t uvlevel = 0;
-uint8_t veml6070_addr_low = VEML6070_ADDR_L;
-uint8_t veml6070_addr_high = VEML6070_ADDR_H;
-uint8_t itime = VEML6070_INTEGRATION_TIME;
-uint8_t veml6070_type = 0;
-char veml6070_name[9];
-char str_uvrisk_text[10];
-
-
-
-void Veml6070Detect(void)
-{
-  if (I2cActive(VEML6070_ADDR_L)) { return; }
-
-
-  Wire.beginTransmission(VEML6070_ADDR_L);
-  Wire.write((itime << 2) | 0x02);
-  uint8_t status = Wire.endTransmission();
-
-  if (!status) {
-    veml6070_type = 1;
-    Veml6070UvTableInit();
-    uint8_t veml_model = 0;
-    GetTextIndexed(veml6070_name, sizeof(veml6070_name), veml_model, kVemlTypes);
-    I2cSetActiveFound(VEML6070_ADDR_L, veml6070_name);
-  }
-}
-
-
-
-void Veml6070UvTableInit(void)
-{
-
-  for (uint32_t i = 0; i < VEML6070_UV_MAX_INDEX; i++) {
-#ifdef USE_VEML6070_RSET
-    if ( (USE_VEML6070_RSET >= 220000) && (USE_VEML6070_RSET <= 1000000) ) {
-      uv_risk_map[i] = ( (USE_VEML6070_RSET / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-    } else {
-      uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor error %d"), USE_VEML6070_RSET);
-    }
-#else
-    uv_risk_map[i] = ( (VEML6070_RSET_DEFAULT / VEML6070_TABLE_COEFFCIENT) / VEML6070_UV_MAX_DEFAULT ) * (i+1);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 resistor default used %d"), VEML6070_RSET_DEFAULT);
-#endif
-  }
-}
-
-
-
-void Veml6070EverySecond(void)
-{
-
-  Veml6070ModeCmd(1);
-  uvlevel = Veml6070ReadUv();
-  uvrisk = Veml6070UvRiskLevel(uvlevel);
-  uvpower = Veml6070UvPower(uvrisk);
-  Veml6070ModeCmd(0);
-}
-
-
-
-void Veml6070ModeCmd(bool mode_cmd)
-{
-
-
-  Wire.beginTransmission(VEML6070_ADDR_L);
-  Wire.write((mode_cmd << 0) | 0x02 | (itime << 2));
-  uint8_t status = Wire.endTransmission();
-
-  if (!status) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 mode_cmd"));
-  }
-}
-
-
-
-uint16_t Veml6070ReadUv(void)
-{
-  uint16_t uv_raw = 0;
-
-  if (Wire.requestFrom(VEML6070_ADDR_H, 1) != 1) {
-    return -1;
-  }
-  uv_raw = Wire.read();
-  uv_raw <<= 8;
-
-  if (Wire.requestFrom(VEML6070_ADDR_L, 1) != 1) {
-    return -1;
-  }
-  uv_raw |= Wire.read();
-
-  return uv_raw;
-}
-
-
-
-double Veml6070UvRiskLevel(uint16_t uv_level)
-{
-  double risk = 0;
-  if (uv_level < uv_risk_map[VEML6070_UV_MAX_INDEX-1]) {
-    risk = (double)uv_level / uv_risk_map[0];
-
-    if ( (risk >= 0) && (risk <= 2.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_1); }
-    else if ( (risk >= 3.0) && (risk <= 5.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_2); }
-    else if ( (risk >= 6.0) && (risk <= 7.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_3); }
-    else if ( (risk >= 8.0) && (risk <= 10.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_4); }
-    else if ( (risk >= 11.0) && (risk <= 12.9) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_5); }
-    else if ( (risk >= 13.0) && (risk <= 25.0) ) { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_6); }
-    else { snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7); }
-    return risk;
-  } else {
-
-    snprintf_P(str_uvrisk_text, sizeof(str_uvrisk_text), D_UV_INDEX_7);
-    return ( risk = 99 );
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "VEML6070 out of range %d"), risk);
-  }
-}
-
-
-
-double Veml6070UvPower(double uvrisk)
-{
-
-  double power = 0;
-  return ( power = VEML6070_POWER_COEFFCIENT * uvrisk );
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-#ifdef USE_VEML6070_SHOW_RAW
-  const char HTTP_SNS_UV_LEVEL[] PROGMEM = "{s}VEML6070 " D_UV_LEVEL "{m}%s " D_UNIT_INCREMENTS "{e}";
-#endif
-
-  const char HTTP_SNS_UV_INDEX[] PROGMEM = "{s}VEML6070 " D_UV_INDEX "{m}%s %s{e}";
-  const char HTTP_SNS_UV_POWER[] PROGMEM = "{s}VEML6070 " D_UV_POWER "{m}%s " D_UNIT_WATT_METER_QUADRAT "{e}";
-#endif
-
-
-
-void Veml6070Show(bool json)
-{
-
-  char str_uvlevel[33];
-  dtostrfd((double)uvlevel, 0, str_uvlevel);
-  char str_uvrisk[33];
-  dtostrfd(uvrisk, 2, str_uvrisk);
-  char str_uvpower[33];
-  dtostrfd(uvpower, 3, str_uvpower);
-  if (json) {
-#ifdef USE_VEML6070_SHOW_RAW
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_LEVEL "\":%s,\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
-      veml6070_name, str_uvlevel, str_uvrisk, str_uvrisk_text, str_uvpower);
-#else
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_UV_INDEX "\":%s,\"" D_JSON_UV_INDEX_TEXT "\":\"%s\",\"" D_JSON_UV_POWER "\":%s}"),
-      veml6070_name, str_uvrisk, str_uvrisk_text, str_uvpower);
-#endif
-#ifdef USE_DOMOTICZ
-  if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, uvlevel); }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-#ifdef USE_VEML6070_SHOW_RAW
-    WSContentSend_PD(HTTP_SNS_UV_LEVEL, str_uvlevel);
-#endif
-    WSContentSend_PD(HTTP_SNS_UV_INDEX, str_uvrisk, str_uvrisk_text);
-    WSContentSend_PD(HTTP_SNS_UV_POWER, str_uvpower);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns11(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_12)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Veml6070Detect();
-  }
-  else if (veml6070_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Veml6070EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Veml6070Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Veml6070Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
-#ifdef USE_I2C
-#ifdef USE_ADS1115
-# 43 "S:/Development/Tasmota/tasmota/xsns_12_ads1115.ino"
-#define XSNS_12 12
-#define XI2C_13 13
-
-#define ADS1115_ADDRESS_ADDR_GND 0x48
-#define ADS1115_ADDRESS_ADDR_VDD 0x49
-#define ADS1115_ADDRESS_ADDR_SDA 0x4A
-#define ADS1115_ADDRESS_ADDR_SCL 0x4B
-
-#define ADS1115_CONVERSIONDELAY (8)
-
-
-
-
-#define ADS1115_REG_POINTER_MASK (0x03)
-#define ADS1115_REG_POINTER_CONVERT (0x00)
-#define ADS1115_REG_POINTER_CONFIG (0x01)
-#define ADS1115_REG_POINTER_LOWTHRESH (0x02)
-#define ADS1115_REG_POINTER_HITHRESH (0x03)
-
-
-
-
-#define ADS1115_REG_CONFIG_OS_MASK (0x8000)
-#define ADS1115_REG_CONFIG_OS_SINGLE (0x8000)
-#define ADS1115_REG_CONFIG_OS_BUSY (0x0000)
-#define ADS1115_REG_CONFIG_OS_NOTBUSY (0x8000)
-
-#define ADS1115_REG_CONFIG_MUX_MASK (0x7000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_0_1 (0x0000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_0_3 (0x1000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_1_3 (0x2000)
-#define ADS1115_REG_CONFIG_MUX_DIFF_2_3 (0x3000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_0 (0x4000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_1 (0x5000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_2 (0x6000)
-#define ADS1115_REG_CONFIG_MUX_SINGLE_3 (0x7000)
-
-#define ADS1115_REG_CONFIG_PGA_MASK (0x0E00)
-#define ADS1115_REG_CONFIG_PGA_6_144V (0x0000)
-#define ADS1115_REG_CONFIG_PGA_4_096V (0x0200)
-#define ADS1115_REG_CONFIG_PGA_2_048V (0x0400)
-#define ADS1115_REG_CONFIG_PGA_1_024V (0x0600)
-#define ADS1115_REG_CONFIG_PGA_0_512V (0x0800)
-#define ADS1115_REG_CONFIG_PGA_0_256V (0x0A00)
-
-#define ADS1115_REG_CONFIG_MODE_MASK (0x0100)
-#define ADS1115_REG_CONFIG_MODE_CONTIN (0x0000)
-#define ADS1115_REG_CONFIG_MODE_SINGLE (0x0100)
-
-#define ADS1115_REG_CONFIG_DR_MASK (0x00E0)
-#define ADS1115_REG_CONFIG_DR_128SPS (0x0000)
-#define ADS1115_REG_CONFIG_DR_250SPS (0x0020)
-#define ADS1115_REG_CONFIG_DR_490SPS (0x0040)
-#define ADS1115_REG_CONFIG_DR_920SPS (0x0060)
-#define ADS1115_REG_CONFIG_DR_1600SPS (0x0080)
-#define ADS1115_REG_CONFIG_DR_2400SPS (0x00A0)
-#define ADS1115_REG_CONFIG_DR_3300SPS (0x00C0)
-#define ADS1115_REG_CONFIG_DR_6000SPS (0x00E0)
-
-#define ADS1115_REG_CONFIG_CMODE_MASK (0x0010)
-#define ADS1115_REG_CONFIG_CMODE_TRAD (0x0000)
-#define ADS1115_REG_CONFIG_CMODE_WINDOW (0x0010)
-
-#define ADS1115_REG_CONFIG_CPOL_MASK (0x0008)
-#define ADS1115_REG_CONFIG_CPOL_ACTVLOW (0x0000)
-#define ADS1115_REG_CONFIG_CPOL_ACTVHI (0x0008)
-
-#define ADS1115_REG_CONFIG_CLAT_MASK (0x0004)
-#define ADS1115_REG_CONFIG_CLAT_NONLAT (0x0000)
-#define ADS1115_REG_CONFIG_CLAT_LATCH (0x0004)
-
-#define ADS1115_REG_CONFIG_CQUE_MASK (0x0003)
-#define ADS1115_REG_CONFIG_CQUE_1CONV (0x0000)
-#define ADS1115_REG_CONFIG_CQUE_2CONV (0x0001)
-#define ADS1115_REG_CONFIG_CQUE_4CONV (0x0002)
-#define ADS1115_REG_CONFIG_CQUE_NONE (0x0003)
-
-struct ADS1115 {
-  uint8_t count = 0;
-  uint8_t address;
-  uint8_t addresses[4] = { ADS1115_ADDRESS_ADDR_GND, ADS1115_ADDRESS_ADDR_VDD, ADS1115_ADDRESS_ADDR_SDA, ADS1115_ADDRESS_ADDR_SCL };
-  uint8_t found[4] = {false,false,false,false};
-} Ads1115;
-
-
-
-void Ads1115StartComparator(uint8_t channel, uint16_t mode)
-{
-
-  uint16_t config = mode |
-                    ADS1115_REG_CONFIG_CQUE_NONE |
-                    ADS1115_REG_CONFIG_CLAT_NONLAT |
-                    ADS1115_REG_CONFIG_PGA_6_144V |
-                    ADS1115_REG_CONFIG_CPOL_ACTVLOW |
-                    ADS1115_REG_CONFIG_CMODE_TRAD |
-                    ADS1115_REG_CONFIG_DR_6000SPS;
-
-
-  config |= (ADS1115_REG_CONFIG_MUX_SINGLE_0 + (0x1000 * channel));
-
-
-  I2cWrite16(Ads1115.address, ADS1115_REG_POINTER_CONFIG, config);
-}
-
-int16_t Ads1115GetConversion(uint8_t channel)
-{
-  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_SINGLE);
-
-  delay(ADS1115_CONVERSIONDELAY);
-
-  I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
-
-  Ads1115StartComparator(channel, ADS1115_REG_CONFIG_MODE_CONTIN);
-  delay(ADS1115_CONVERSIONDELAY);
-
-  uint16_t res = I2cRead16(Ads1115.address, ADS1115_REG_POINTER_CONVERT);
-  return (int16_t)res;
-}
-
-
-
-void Ads1115Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(Ads1115.addresses); i++) {
-    if (!Ads1115.found[i]) {
-      Ads1115.address = Ads1115.addresses[i];
-      if (I2cActive(Ads1115.address)) { continue; }
-      uint16_t buffer;
-      if (I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONVERT) &&
-          I2cValidRead16(&buffer, Ads1115.address, ADS1115_REG_POINTER_CONFIG)) {
-        Ads1115StartComparator(i, ADS1115_REG_CONFIG_MODE_CONTIN);
-        I2cSetActiveFound(Ads1115.address, "ADS1115");
-        Ads1115.found[i] = 1;
-        Ads1115.count++;
-      }
-    }
-  }
-}
-
-void Ads1115Show(bool json)
-{
-  int16_t values[4];
-
-  for (uint32_t t = 0; t < sizeof(Ads1115.addresses); t++) {
-
-    if (Ads1115.found[t]) {
-
-      uint8_t old_address = Ads1115.address;
-      Ads1115.address = Ads1115.addresses[t];
-      for (uint32_t i = 0; i < 4; i++) {
-        values[i] = Ads1115GetConversion(i);
-
-      }
-      Ads1115.address = old_address;
-
-      char label[15];
-      if (1 == Ads1115.count) {
-
-        snprintf_P(label, sizeof(label), PSTR("ADS1115"));
-      } else {
-
-        snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
-      }
-
-      if (json) {
-        ResponseAppend_P(PSTR(",\"%s\":{"), label);
-        for (uint32_t i = 0; i < 4; i++) {
-          ResponseAppend_P(PSTR("%s\"A%d\":%d"), (0 == i) ? "" : ",", i, values[i]);
-        }
-        ResponseJsonEnd();
-      }
-#ifdef USE_WEBSERVER
-      else {
-        for (uint32_t i = 0; i < 4; i++) {
-          WSContentSend_PD(HTTP_SNS_ANALOG, label, i, values[i]);
-        }
-      }
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns12(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_13)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Ads1115Detect();
-  }
-  else if (Ads1115.count) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        Ads1115Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ads1115Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
-#ifdef USE_I2C
-#ifdef USE_INA219
-# 30 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
-#define XSNS_13 13
-#define XI2C_14 14
-
-#define INA219_ADDRESS1 (0x40)
-#define INA219_ADDRESS2 (0x41)
-#define INA219_ADDRESS3 (0x44)
-#define INA219_ADDRESS4 (0x45)
-
-#define INA219_READ (0x01)
-#define INA219_REG_CONFIG (0x00)
-
-#define INA219_CONFIG_RESET (0x8000)
-
-#define INA219_CONFIG_BVOLTAGERANGE_MASK (0x2000)
-#define INA219_CONFIG_BVOLTAGERANGE_16V (0x0000)
-#define INA219_CONFIG_BVOLTAGERANGE_32V (0x2000)
-
-#define INA219_CONFIG_GAIN_MASK (0x1800)
-#define INA219_CONFIG_GAIN_1_40MV (0x0000)
-#define INA219_CONFIG_GAIN_2_80MV (0x0800)
-#define INA219_CONFIG_GAIN_4_160MV (0x1000)
-#define INA219_CONFIG_GAIN_8_320MV (0x1800)
-
-#define INA219_CONFIG_BADCRES_MASK (0x0780)
-#define INA219_CONFIG_BADCRES_9BIT (0x0080)
-#define INA219_CONFIG_BADCRES_10BIT (0x0100)
-#define INA219_CONFIG_BADCRES_11BIT (0x0200)
-#define INA219_CONFIG_BADCRES_12BIT (0x0400)
-
-#define INA219_CONFIG_SADCRES_MASK (0x0078)
-#define INA219_CONFIG_SADCRES_9BIT_1S_84US (0x0000)
-#define INA219_CONFIG_SADCRES_10BIT_1S_148US (0x0008)
-#define INA219_CONFIG_SADCRES_11BIT_1S_276US (0x0010)
-#define INA219_CONFIG_SADCRES_12BIT_1S_532US (0x0018)
-#define INA219_CONFIG_SADCRES_12BIT_2S_1060US (0x0048)
-#define INA219_CONFIG_SADCRES_12BIT_4S_2130US (0x0050)
-#define INA219_CONFIG_SADCRES_12BIT_8S_4260US (0x0058)
-#define INA219_CONFIG_SADCRES_12BIT_16S_8510US (0x0060)
-#define INA219_CONFIG_SADCRES_12BIT_32S_17MS (0x0068)
-#define INA219_CONFIG_SADCRES_12BIT_64S_34MS (0x0070)
-#define INA219_CONFIG_SADCRES_12BIT_128S_69MS (0x0078)
-
-#define INA219_CONFIG_MODE_MASK (0x0007)
-#define INA219_CONFIG_MODE_POWERDOWN (0x0000)
-#define INA219_CONFIG_MODE_SVOLT_TRIGGERED (0x0001)
-#define INA219_CONFIG_MODE_BVOLT_TRIGGERED (0x0002)
-#define INA219_CONFIG_MODE_SANDBVOLT_TRIGGERED (0x0003)
-#define INA219_CONFIG_MODE_ADCOFF (0x0004)
-#define INA219_CONFIG_MODE_SVOLT_CONTINUOUS (0x0005)
-#define INA219_CONFIG_MODE_BVOLT_CONTINUOUS (0x0006)
-#define INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS (0x0007)
-
-#define INA219_REG_SHUNTVOLTAGE (0x01)
-#define INA219_REG_BUSVOLTAGE (0x02)
-#define INA219_REG_POWER (0x03)
-#define INA219_REG_CURRENT (0x04)
-#define INA219_REG_CALIBRATION (0x05)
-
-uint8_t ina219_type[4] = {0,0,0,0};
-uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
-
-uint32_t ina219_cal_value = 0;
-
-uint32_t ina219_current_divider_ma = 0;
-
-uint8_t ina219_valid[4] = {0,0,0,0};
-float ina219_voltage[4] = {0,0,0,0};
-float ina219_current[4] = {0,0,0,0};
-char ina219_types[] = "INA219";
-uint8_t ina219_count = 0;
-
-bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
-{
-  uint16_t config = 0;
-
-  switch (mode &3) {
-    case 0:
-    case 3:
-      ina219_cal_value = 4096;
-      ina219_current_divider_ma = 10;
-      config = INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 1:
-      ina219_cal_value = 10240;
-      ina219_current_divider_ma = 25;
-      config |= INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 2:
-      ina219_cal_value = 8192;
-      ina219_current_divider_ma = 20;
-      config |= INA219_CONFIG_BVOLTAGERANGE_16V | INA219_CONFIG_GAIN_1_40MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-  }
-
-  bool success = I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
-  if (success) {
-
-    I2cWrite16(addr, INA219_REG_CONFIG, config);
-  }
-  return success;
-}
-
-float Ina219GetShuntVoltage_mV(uint16_t addr)
-{
-
-  int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
-
-  return value * 0.01;
-}
-
-float Ina219GetBusVoltage_V(uint16_t addr)
-{
-
-
-  int16_t value = (int16_t)(((uint16_t)I2cReadS16(addr, INA219_REG_BUSVOLTAGE) >> 3) * 4);
-
-  return value * 0.001;
-}
-
-float Ina219GetCurrent_mA(uint16_t addr)
-{
-
-
-
-  I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
-
-
-  float value = I2cReadS16(addr, INA219_REG_CURRENT);
-  value /= ina219_current_divider_ma;
-
-  return value;
-}
-
-bool Ina219Read(void)
-{
-  for (int i=0; i<sizeof(ina219_type); i++) {
-    if (!ina219_type[i]) { continue; }
-    uint16_t addr = ina219_addresses[i];
-    ina219_voltage[i] = Ina219GetBusVoltage_V(addr) + (Ina219GetShuntVoltage_mV(addr) / 1000);
-    ina219_current[i] = Ina219GetCurrent_mA(addr) / 1000;
-    ina219_valid[i] = SENSOR_MAX_MISS;
-
-  }
-  return true;
-}
-# 184 "S:/Development/Tasmota/tasmota/xsns_13_ina219.ino"
-bool Ina219CommandSensor(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
-    Settings.ina219_mode = XdrvMailbox.payload;
-    restart_flag = 2;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_13, Settings.ina219_mode);
-
-  return true;
-}
-
-
-
-void Ina219Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(ina219_type); i++) {
-    uint16_t addr = ina219_addresses[i];
-    if (I2cActive(addr)) { continue; }
-    if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
-      I2cSetActiveFound(addr, ina219_types);
-      ina219_type[i] = 1;
-      ina219_count++;
-    }
-  }
-}
-
-void Ina219EverySecond(void)
-{
-
-  Ina219Read();
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_INA219_DATA[] PROGMEM =
-  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
-#endif
-
-void Ina219Show(bool json)
-{
-  int num_found=0;
-  for (int i=0; i<sizeof(ina219_type); i++)
-    if (ina219_type[i] && ina219_valid[i])
-      num_found++;
-
-  int sensor_num = 0;
-  for (int i=0; i<sizeof(ina219_type); i++) {
-    if (!ina219_type[i] || !ina219_valid[i])
-      continue;
-    sensor_num++;
-
-    char voltage[16];
-    dtostrfd(ina219_voltage[i], Settings.flag2.voltage_resolution, voltage);
-    char current[16];
-    dtostrfd(ina219_current[i], Settings.flag2.current_resolution, current);
-    char power[16];
-    dtostrfd(ina219_voltage[i] * ina219_current[i], Settings.flag2.wattage_resolution, power);
-    char name[16];
-    if (num_found>1)
-      snprintf_P(name, sizeof(name), PSTR("%s%c%d"), ina219_types, IndexSeparator(), sensor_num);
-    else
-      snprintf_P(name, sizeof(name), PSTR("%s"), ina219_types);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%02x,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
-                       name, ina219_addresses[i], voltage, current, power);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, voltage);
-        DomoticzSensor(DZ_CURRENT, current);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_INA219_DATA, name, voltage, name, current, name, power);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns13(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_14)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Ina219Detect();
-  }
-  else if (ina219_count) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_13 == XdrvMailbox.index) {
-          result = Ina219CommandSensor();
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        Ina219EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Ina219Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Ina219Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_14_sht3x.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_14_sht3x.ino"
-#ifdef USE_I2C
-#ifdef USE_SHT3X
-
-
-
-
-
-
-#define XSNS_14 14
-#define XI2C_15 15
-
-#define SHT3X_ADDR_GND 0x44
-#define SHT3X_ADDR_VDD 0x45
-#define SHTC3_ADDR 0x70
-
-#define SHT3X_MAX_SENSORS 3
-
-const char kShtTypes[] PROGMEM = "SHT3X|SHT3X|SHTC3";
-uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD, SHTC3_ADDR };
-
-uint8_t sht3x_count = 0;
-struct SHT3XSTRUCT {
-  uint8_t address;
-  char types[6];
-} sht3x_sensors[SHT3X_MAX_SENSORS];
-
-bool Sht3xRead(float &t, float &h, uint8_t sht3x_address)
-{
-  unsigned int data[6];
-
-  t = NAN;
-  h = NAN;
-
-  Wire.beginTransmission(sht3x_address);
-  if (SHTC3_ADDR == sht3x_address) {
-    Wire.write(0x35);
-    Wire.write(0x17);
-    Wire.endTransmission();
-    Wire.beginTransmission(sht3x_address);
-    Wire.write(0x78);
-    Wire.write(0x66);
-  } else {
-    Wire.write(0x2C);
-    Wire.write(0x06);
-  }
-  if (Wire.endTransmission() != 0) {
-    return false;
-  }
-  delay(30);
-  Wire.requestFrom(sht3x_address, (uint8_t)6);
-  for (uint32_t i = 0; i < 6; i++) {
-    data[i] = Wire.read();
-  };
-  t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45);
-  h = ConvertHumidity((float)((((data[3] << 8) | data[4]) * 100) / 65535.0));
-  return (!isnan(t) && !isnan(h) && (h != 0));
-}
-
-
-
-void Sht3xDetect(void)
-{
-  for (uint32_t i = 0; i < SHT3X_MAX_SENSORS; i++) {
-    if (I2cActive(sht3x_addresses[i])) { continue; }
-    float t;
-    float h;
-    if (Sht3xRead(t, h, sht3x_addresses[i])) {
-      sht3x_sensors[sht3x_count].address = sht3x_addresses[i];
-      GetTextIndexed(sht3x_sensors[sht3x_count].types, sizeof(sht3x_sensors[sht3x_count].types), i, kShtTypes);
-      I2cSetActiveFound(sht3x_sensors[sht3x_count].address, sht3x_sensors[sht3x_count].types);
-      sht3x_count++;
-    }
-  }
-}
-
-void Sht3xShow(bool json)
-{
-  for (uint32_t i = 0; i < sht3x_count; i++) {
-    float t;
-    float h;
-    if (Sht3xRead(t, h, sht3x_sensors[i].address)) {
-      char temperature[33];
-      dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-      char humidity[33];
-      dtostrfd(h, Settings.flag2.humidity_resolution, humidity);
-      char types[11];
-      snprintf_P(types, sizeof(types), PSTR("%s%c0x%02X"), sht3x_sensors[i].types, IndexSeparator(), sht3x_sensors[i].address);
-
-      if (json) {
-        ResponseAppend_P(JSON_SNS_TEMPHUM, types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-        if ((0 == tele_period) && (0 == i)) {
-          DomoticzTempHumSensor(temperature, humidity);
-        }
-#endif
-
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, t);
-        KnxSensor(KNX_HUMIDITY, h);
-      }
-#endif
-
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
-        WSContentSend_PD(HTTP_SNS_HUM, types, humidity);
-#endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool Xsns14(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_15)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Sht3xDetect();
-  }
-  else if (sht3x_count) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        Sht3xShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sht3xShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-#ifdef USE_MHZ19
-# 33 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-#define XSNS_15 15
-
-enum MhzFilterOptions {MHZ19_FILTER_OFF, MHZ19_FILTER_OFF_ALLSAMPLES, MHZ19_FILTER_FAST, MHZ19_FILTER_MEDIUM, MHZ19_FILTER_SLOW};
-
-#define MHZ19_FILTER_OPTION MHZ19_FILTER_FAST
-# 58 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-#include <TasmotaSerial.h>
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#define MHZ19_READ_TIMEOUT 400
-#define MHZ19_RETRY_COUNT 8
-
-TasmotaSerial *MhzSerial;
-
-const char kMhzModels[] PROGMEM = "|B";
-
-const char ABC_ENABLED[] = "ABC is Enabled";
-const char ABC_DISABLED[] = "ABC is Disabled";
-
-enum MhzCommands { MHZ_CMND_READPPM, MHZ_CMND_ABCENABLE, MHZ_CMND_ABCDISABLE, MHZ_CMND_ZEROPOINT, MHZ_CMND_RESET, MHZ_CMND_RANGE_1000, MHZ_CMND_RANGE_2000, MHZ_CMND_RANGE_3000, MHZ_CMND_RANGE_5000 };
-const uint8_t kMhzCommands[][4] PROGMEM = {
-
-  {0x86,0x00,0x00,0x00},
-  {0x79,0xA0,0x00,0x00},
-  {0x79,0x00,0x00,0x00},
-  {0x87,0x00,0x00,0x00},
-  {0x8D,0x00,0x00,0x00},
-  {0x99,0x00,0x03,0xE8},
-  {0x99,0x00,0x07,0xD0},
-  {0x99,0x00,0x0B,0xB8},
-  {0x99,0x00,0x13,0x88}};
-
-uint8_t mhz_type = 1;
-uint16_t mhz_last_ppm = 0;
-uint8_t mhz_filter = MHZ19_FILTER_OPTION;
-bool mhz_abc_must_apply = false;
-
-float mhz_temperature = 0;
-uint8_t mhz_retry = MHZ19_RETRY_COUNT;
-uint8_t mhz_received = 0;
-uint8_t mhz_state = 0;
-
-
-
-uint8_t MhzCalculateChecksum(uint8_t *array)
-{
-  uint8_t checksum = 0;
-  for (uint32_t i = 1; i < 8; i++) {
-    checksum += array[i];
-  }
-  checksum = 255 - checksum;
-  return (checksum +1);
-}
-
-size_t MhzSendCmd(uint8_t command_id)
-{
-  uint8_t mhz_send[9] = { 0 };
-
-  mhz_send[0] = 0xFF;
-  mhz_send[1] = 0x01;
-  memcpy_P(&mhz_send[2], kMhzCommands[command_id], sizeof(uint16_t));
-
-
-
-
-  memcpy_P(&mhz_send[6], kMhzCommands[command_id] + sizeof(uint16_t), sizeof(uint16_t));
-  mhz_send[8] = MhzCalculateChecksum(mhz_send);
-
-
-
-  return MhzSerial->write(mhz_send, sizeof(mhz_send));
-}
-
-
-
-bool MhzCheckAndApplyFilter(uint16_t ppm, uint8_t s)
-{
-  if (1 == s) {
-    return false;
-  }
-  if (mhz_last_ppm < 400 || mhz_last_ppm > 5000) {
-
-
-    mhz_last_ppm = ppm;
-    return true;
-  }
-  int32_t difference = ppm - mhz_last_ppm;
-  if (s > 0 && s < 64 && mhz_filter != MHZ19_FILTER_OFF) {
-# 154 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-    difference *= s;
-    difference /= 64;
-  }
-  if (MHZ19_FILTER_OFF == mhz_filter) {
-    if (s != 0 && s != 64) {
-      return false;
-    }
-  } else {
-    difference >>= (mhz_filter -1);
-  }
-  mhz_last_ppm = static_cast<uint16_t>(mhz_last_ppm + difference);
-  return true;
-}
-
-void MhzEverySecond(void)
-{
-  mhz_state++;
-  if (8 == mhz_state) {
-    mhz_state = 0;
-
-    if (mhz_retry) {
-      mhz_retry--;
-      if (!mhz_retry) {
-        mhz_last_ppm = 0;
-        mhz_temperature = 0;
-      }
-    }
-
-    MhzSerial->flush();
-    MhzSendCmd(MHZ_CMND_READPPM);
-    mhz_received = 0;
-  }
-
-  if ((mhz_state > 2) && !mhz_received) {
-    uint8_t mhz_response[9];
-
-    unsigned long start = millis();
-    uint8_t counter = 0;
-    while (((millis() - start) < MHZ19_READ_TIMEOUT) && (counter < 9)) {
-      if (MhzSerial->available() > 0) {
-        mhz_response[counter++] = MhzSerial->read();
-      } else {
-        delay(5);
-      }
-    }
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, mhz_response, counter);
-
-    if (counter < 9) {
-
-      return;
-    }
-
-    uint8_t crc = MhzCalculateChecksum(mhz_response);
-    if (mhz_response[8] != crc) {
-
-      return;
-    }
-    if (0xFF != mhz_response[0] || 0x86 != mhz_response[1]) {
-
-      return;
-    }
-
-    mhz_received = 1;
-
-    uint16_t u = (mhz_response[6] << 8) | mhz_response[7];
-    if (15000 == u) {
-      if (Settings.SensorBits1.mhz19b_abc_disable) {
-
-
-        mhz_abc_must_apply = true;
-      }
-    } else {
-      uint16_t ppm = (mhz_response[2] << 8) | mhz_response[3];
-      mhz_temperature = ConvertTemp((float)mhz_response[4] - 40);
-      uint8_t s = mhz_response[5];
-      mhz_type = (s) ? 1 : 2;
-      if (MhzCheckAndApplyFilter(ppm, s)) {
-        mhz_retry = MHZ19_RETRY_COUNT;
-        LightSetSignal(CO2_LOW, CO2_HIGH, mhz_last_ppm);
-
-        if (0 == s || 64 == s) {
-          if (mhz_abc_must_apply) {
-            mhz_abc_must_apply = false;
-            if (!Settings.SensorBits1.mhz19b_abc_disable) {
-              MhzSendCmd(MHZ_CMND_ABCENABLE);
-            } else {
-              MhzSendCmd(MHZ_CMND_ABCDISABLE);
-            }
-          }
-        }
-
-      }
-    }
-
-  }
-}
-# 266 "S:/Development/Tasmota/tasmota/xsns_15_mhz19.ino"
-#define D_JSON_RANGE_1000 "1000 ppm range"
-#define D_JSON_RANGE_2000 "2000 ppm range"
-#define D_JSON_RANGE_3000 "3000 ppm range"
-#define D_JSON_RANGE_5000 "5000 ppm range"
-
-bool MhzCommandSensor(void)
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      Settings.SensorBits1.mhz19b_abc_disable = true;
-      MhzSendCmd(MHZ_CMND_ABCDISABLE);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
-      break;
-    case 1:
-      Settings.SensorBits1.mhz19b_abc_disable = false;
-      MhzSendCmd(MHZ_CMND_ABCENABLE);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
-      break;
-    case 2:
-      MhzSendCmd(MHZ_CMND_ZEROPOINT);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_ZERO_POINT_CALIBRATION);
-      break;
-    case 9:
-      MhzSendCmd(MHZ_CMND_RESET);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RESET);
-      break;
-    case 1000:
-      MhzSendCmd(MHZ_CMND_RANGE_1000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_1000);
-      break;
-    case 2000:
-      MhzSendCmd(MHZ_CMND_RANGE_2000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_2000);
-      break;
-    case 3000:
-      MhzSendCmd(MHZ_CMND_RANGE_3000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_3000);
-      break;
-    case 5000:
-      MhzSendCmd(MHZ_CMND_RANGE_5000);
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_RANGE_5000);
-      break;
-    default:
-      if (!Settings.SensorBits1.mhz19b_abc_disable) {
-        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_ENABLED);
-      } else {
-        Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, ABC_DISABLED);
-      }
-  }
-
-  return serviced;
-}
-
-
-
-void MhzInit(void)
-{
-  mhz_type = 0;
-  if ((pin[GPIO_MHZ_RXD] < 99) && (pin[GPIO_MHZ_TXD] < 99)) {
-    MhzSerial = new TasmotaSerial(pin[GPIO_MHZ_RXD], pin[GPIO_MHZ_TXD], 1);
-    if (MhzSerial->begin(9600)) {
-      if (MhzSerial->hardwareSerial()) { ClaimSerial(); }
-      mhz_type = 1;
-    }
-
-  }
-}
-
-void MhzShow(bool json)
-{
-  char types[7] = "MHZ19B";
-  char temperature[33];
-  dtostrfd(mhz_temperature, Settings.flag2.temperature_resolution, temperature);
-  char model[3];
-  GetTextIndexed(model, sizeof(model), mhz_type -1, kMhzModels);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_MODEL "\":\"%s\",\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s}"), types, model, mhz_last_ppm, temperature);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) {
-      DomoticzSensor(DZ_AIRQUALITY, mhz_last_ppm);
-      DomoticzSensor(DZ_TEMP, temperature);
-    }
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, types, mhz_last_ppm);
-    WSContentSend_PD(HTTP_SNS_TEMP, types, temperature, TempUnit());
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns15(uint8_t function)
-{
-  bool result = false;
-
-  if (mhz_type) {
-    switch (function) {
-      case FUNC_INIT:
-        MhzInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        MhzEverySecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_15 == XdrvMailbox.index) {
-          result = MhzCommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MhzShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MhzShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
-#ifdef USE_I2C
-#ifdef USE_TSL2561
-# 30 "S:/Development/Tasmota/tasmota/xsns_16_tsl2561.ino"
-#define XSNS_16 16
-#define XI2C_16 16
-
-#include <Tsl2561Util.h>
-
-Tsl2561 Tsl(Wire);
-
-uint8_t tsl2561_type = 0;
-uint8_t tsl2561_valid = 0;
-uint32_t tsl2561_milliLux = 0;
-char tsl2561_types[] = "TSL2561";
-
-bool Tsl2561Read(void)
-{
-  if (tsl2561_valid) { tsl2561_valid--; }
-
-  uint8_t id;
-  bool gain;
-  Tsl2561::exposure_t exposure;
-  uint16_t scaledFull, scaledIr;
-  uint32_t full, ir;
-
-    if (Tsl.on()) {
-      if (Tsl.id(id)
-        && Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr)
-        && Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr)
-        && Tsl2561Util::milliLux(full, ir, tsl2561_milliLux, Tsl2561::packageCS(id))) {
-      } else{
-        tsl2561_milliLux = 0;
-      }
-    }
-  tsl2561_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-void Tsl2561Detect(void)
-{
-  if (I2cSetDevice(0x29) || I2cSetDevice(0x39) || I2cSetDevice(0x49)) {
-    uint8_t id;
-    Tsl.begin();
-    if (!Tsl.id(id)) return;
-    if (Tsl.on()) {
-      tsl2561_type = 1;
-      I2cSetActiveFound(Tsl.address(), tsl2561_types);
-    }
-  }
-}
-
-void Tsl2561EverySecond(void)
-{
-  if (!(uptime %2)) {
-
-    if (!Tsl2561Read()) {
-      AddLogMissed(tsl2561_types, tsl2561_valid);
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_TSL2561[] PROGMEM =
-  "{s}TSL2561 " D_ILLUMINANCE "{m}%u.%03u " D_UNIT_LUX "{e}";
-#endif
-
-void Tsl2561Show(bool json)
-{
-  if (tsl2561_valid) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"),
-        tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, (tsl2561_milliLux + 500) / 1000); }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TSL2561, tsl2561_milliLux / 1000, tsl2561_milliLux % 1000);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns16(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_16)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Tsl2561Detect();
-  }
-  else if (tsl2561_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Tsl2561EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Tsl2561Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tsl2561Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
-#ifdef USE_SENSEAIR
-# 29 "S:/Development/Tasmota/tasmota/xsns_17_senseair.ino"
-#define XSNS_17 17
-
-#define SENSEAIR_MODBUS_SPEED 9600
-#define SENSEAIR_DEVICE_ADDRESS 0xFE
-#define SENSEAIR_READ_REGISTER 0x04
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#include <TasmotaModbus.h>
-TasmotaModbus *SenseairModbus;
-
-const char kSenseairTypes[] PROGMEM = "Kx0|S8";
-
-uint8_t senseair_type = 1;
-char senseair_types[7];
-
-uint16_t senseair_co2 = 0;
-float senseair_temperature = 0;
-float senseair_humidity = 0;
-
-
-
-const uint8_t start_addresses[] { 0x1A, 0x00, 0x03, 0x04, 0x05, 0x1C, 0x0A };
-
-uint8_t senseair_read_state = 0;
-uint8_t senseair_send_retry = 0;
-
-void Senseair250ms(void)
-{
-
-
-
-
-    uint16_t value = 0;
-    bool data_ready = SenseairModbus->ReceiveReady();
-
-    if (data_ready) {
-      uint8_t error = SenseairModbus->Receive16BitRegister(&value);
-      if (error) {
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir response error %d"), error);
-      } else {
-        switch(senseair_read_state) {
-          case 0:
-            senseair_type = 2;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir type id low %04X"), value);
-            break;
-          case 1:
-            if (value) {
-              AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir error %04X"), value);
-            }
-            break;
-          case 2:
-            senseair_co2 = value;
-            LightSetSignal(CO2_LOW, CO2_HIGH, senseair_co2);
-            break;
-          case 3:
-            senseair_temperature = ConvertTemp((float)value / 100);
-            break;
-          case 4:
-            senseair_humidity = ConvertHumidity((float)value / 100);
-            break;
-          case 5:
-          {
-            bool relay_state = value >> 8 & 1;
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir relay state %d"), relay_state);
-            break;
-          }
-          case 6:
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "SenseAir temp adjustment %d"), value);
-            break;
-        }
-      }
-      senseair_read_state++;
-      if (2 == senseair_type) {
-        if (3 == senseair_read_state) {
-          senseair_read_state = 1;
-        }
-      } else {
-        if (sizeof(start_addresses) == senseair_read_state) {
-          senseair_read_state = 1;
-        }
-      }
-    }
-
-    if (0 == senseair_send_retry || data_ready) {
-      senseair_send_retry = 5;
-      SenseairModbus->Send(SENSEAIR_DEVICE_ADDRESS, SENSEAIR_READ_REGISTER, (uint16_t)start_addresses[senseair_read_state], 1);
-    } else {
-      senseair_send_retry--;
-    }
-
-
-}
-
-
-
-void SenseairInit(void)
-{
-  senseair_type = 0;
-  if ((pin[GPIO_SAIR_RX] < 99) && (pin[GPIO_SAIR_TX] < 99)) {
-    SenseairModbus = new TasmotaModbus(pin[GPIO_SAIR_RX], pin[GPIO_SAIR_TX]);
-    uint8_t result = SenseairModbus->Begin(SENSEAIR_MODBUS_SPEED);
-    if (result) {
-      if (2 == result) { ClaimSerial(); }
-      senseair_type = 1;
-    }
-  }
-}
-
-void SenseairShow(bool json)
-{
-  char temperature[33];
-  dtostrfd(senseair_temperature, Settings.flag2.temperature_resolution, temperature);
-  char humidity[33];
-  dtostrfd(senseair_humidity, Settings.flag2.temperature_resolution, humidity);
-  GetTextIndexed(senseair_types, sizeof(senseair_types), senseair_type -1, kSenseairTypes);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d"), senseair_types, senseair_co2);
-    if (senseair_type != 2) {
-      ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s"), temperature, humidity);
-    }
-    ResponseJsonEnd();
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, senseair_co2);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, senseair_types, senseair_co2);
-    if (senseair_type != 2) {
-      WSContentSend_PD(HTTP_SNS_TEMP, senseair_types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, senseair_types, humidity);
-    }
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns17(uint8_t function)
-{
-  bool result = false;
-
-  if (senseair_type) {
-    switch (function) {
-      case FUNC_INIT:
-        SenseairInit();
-        break;
-      case FUNC_EVERY_250_MSECOND:
-        Senseair250ms();
-        break;
-      case FUNC_JSON_APPEND:
-        SenseairShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SenseairShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
-#ifdef USE_PMS5003
-# 31 "S:/Development/Tasmota/tasmota/xsns_18_pms5003.ino"
-#define XSNS_18 18
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PmsSerial;
-
-uint8_t pms_type = 1;
-uint8_t pms_valid = 0;
-
-struct pmsX003data {
-  uint16_t framelen;
-  uint16_t pm10_standard, pm25_standard, pm100_standard;
-  uint16_t pm10_env, pm25_env, pm100_env;
-#ifdef PMS_MODEL_PMS3003
-  uint16_t reserved1, reserved2, reserved3;
-#else
-  uint16_t particles_03um, particles_05um, particles_10um, particles_25um, particles_50um, particles_100um;
-  uint16_t unused;
-#endif
-  uint16_t checksum;
-} pms_data;
-
-
-
-bool PmsReadData(void)
-{
-  if (! PmsSerial->available()) {
-    return false;
-  }
-  while ((PmsSerial->peek() != 0x42) && PmsSerial->available()) {
-    PmsSerial->read();
-  }
-#ifdef PMS_MODEL_PMS3003
-  if (PmsSerial->available() < 22) {
-#else
-  if (PmsSerial->available() < 32) {
-#endif
-    return false;
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  uint8_t buffer[22];
-  PmsSerial->readBytes(buffer, 22);
-#else
-  uint8_t buffer[32];
-  PmsSerial->readBytes(buffer, 32);
-#endif
-  uint16_t sum = 0;
-  PmsSerial->flush();
-
-#ifdef PMS_MODEL_PMS3003
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 22);
-#else
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, buffer, 32);
-#endif
-
-
-#ifdef PMS_MODEL_PMS3003
-  for (uint32_t i = 0; i < 20; i++) {
-#else
-  for (uint32_t i = 0; i < 30; i++) {
-#endif
-    sum += buffer[i];
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  uint16_t buffer_u16[10];
-  for (uint32_t i = 0; i < 10; i++) {
-#else
-  uint16_t buffer_u16[15];
-  for (uint32_t i = 0; i < 15; i++) {
-#endif
-    buffer_u16[i] = buffer[2 + i*2 + 1];
-    buffer_u16[i] += (buffer[2 + i*2] << 8);
-  }
-#ifdef PMS_MODEL_PMS3003
-  if (sum != buffer_u16[9]) {
-#else
-  if (sum != buffer_u16[14]) {
-#endif
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("PMS: " D_CHECKSUM_FAILURE));
-    return false;
-  }
-
-#ifdef PMS_MODEL_PMS3003
-  memcpy((void *)&pms_data, (void *)buffer_u16, 20);
-#else
-  memcpy((void *)&pms_data, (void *)buffer_u16, 30);
-#endif
-  pms_valid = 10;
-
-  return true;
-}
-
-
-
-void PmsSecond(void)
-{
-  if (PmsReadData()) {
-    pms_valid = 10;
-  } else {
-    if (pms_valid) {
-      pms_valid--;
-    }
-  }
-}
-
-
-
-void PmsInit(void)
-{
-  pms_type = 0;
-  if (pin[GPIO_PMS5003] < 99) {
-    PmsSerial = new TasmotaSerial(pin[GPIO_PMS5003], -1, 1);
-    if (PmsSerial->begin(9600)) {
-      if (PmsSerial->hardwareSerial()) { ClaimSerial(); }
-      pms_type = 1;
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-#ifdef PMS_MODEL_PMS3003
-const char HTTP_PMS3003_SNS[] PROGMEM =
-
-
-
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS3003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#else
-const char HTTP_PMS5003_SNS[] PROGMEM =
-
-
-
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.3 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 0.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
-  "{s}PMS5003 " D_PARTICALS_BEYOND " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}";
-#endif
-#endif
-
-void PmsShow(bool json)
-{
-  if (pms_valid) {
-    if (json) {
-#ifdef PMS_MODEL_PMS3003
-      ResponseAppend_P(PSTR(",\"PMS3003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d}"),
-        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
-#else
-      ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"),
-        pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
-        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
-#endif
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_COUNT, pms_data.pm10_env);
-        DomoticzSensor(DZ_VOLTAGE, pms_data.pm25_env);
-        DomoticzSensor(DZ_CURRENT, pms_data.pm100_env);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-
-#ifdef PMS_MODEL_PMS3003
-        WSContentSend_PD(HTTP_PMS3003_SNS,
-
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
-#else
-        WSContentSend_PD(HTTP_PMS5003_SNS,
-
-        pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
-        pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
-#endif
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns18(uint8_t function)
-{
-  bool result = false;
-
-  if (pms_type) {
-    switch (function) {
-      case FUNC_INIT:
-        PmsInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        PmsSecond();
-        break;
-      case FUNC_JSON_APPEND:
-        PmsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        PmsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_19_mgs.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_19_mgs.ino"
-#ifdef USE_I2C
-#ifdef USE_MGS
-
-
-
-
-
-
-
-#define XSNS_19 19
-#define XI2C_17 17
-
-#ifndef MGS_SENSOR_ADDR
-#define MGS_SENSOR_ADDR 0x04
-#endif
-
-#include "MutichannelGasSensor.h"
-
-bool mgs_detected = false;
-
-void MGSInit(void) {
-  gas.begin(MGS_SENSOR_ADDR);
-}
-
-void MGSPrepare(void)
-{
-  if (I2cActive(MGS_SENSOR_ADDR)) { return; }
-
-  gas.begin(MGS_SENSOR_ADDR);
-  if (!gas.isError()) {
-    I2cSetActiveFound(MGS_SENSOR_ADDR, "MultiGas");
-    mgs_detected = true;
-  }
-}
-
-char* measure_gas(int gas_type, char* buffer)
-{
-  float f = gas.calcGas(gas_type);
-  dtostrfd(f, 2, buffer);
-  return buffer;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_MGS_GAS[] PROGMEM = "{s}MGS %s{m}%s " D_UNIT_PARTS_PER_MILLION "{e}";
-#endif
-
-void MGSShow(bool json)
-{
-  char buffer[33];
-  if (json) {
-    ResponseAppend_P(PSTR(",\"MGS\":{\"NH3\":%s"), measure_gas(NH3, buffer));
-    ResponseAppend_P(PSTR(",\"CO\":%s"), measure_gas(CO, buffer));
-    ResponseAppend_P(PSTR(",\"NO2\":%s"), measure_gas(NO2, buffer));
-    ResponseAppend_P(PSTR(",\"C3H8\":%s"), measure_gas(C3H8, buffer));
-    ResponseAppend_P(PSTR(",\"C4H10\":%s"), measure_gas(C4H10, buffer));
-    ResponseAppend_P(PSTR(",\"CH4\":%s"), measure_gas(GAS_CH4, buffer));
-    ResponseAppend_P(PSTR(",\"H2\":%s"), measure_gas(H2, buffer));
-    ResponseAppend_P(PSTR(",\"C2H5OH\":%s}"), measure_gas(C2H5OH, buffer));
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_MGS_GAS, "NH3", measure_gas(NH3, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "CO", measure_gas(CO, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "NO2", measure_gas(NO2, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C3H8", measure_gas(C3H8, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C4H10", measure_gas(C4H10, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "CH4", measure_gas(GAS_CH4, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "H2", measure_gas(H2, buffer));
-    WSContentSend_PD(HTTP_MGS_GAS, "C2H5OH", measure_gas(C2H5OH, buffer));
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns19(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_17)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MGSPrepare();
-  }
-  else if (mgs_detected) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        MGSShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MGSShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
-#ifdef USE_NOVA_SDS
-# 30 "S:/Development/Tasmota/tasmota/xsns_20_novasds.ino"
-#define XSNS_20 20
-
-#include <TasmotaSerial.h>
-
-#ifndef STARTING_OFFSET
-#define STARTING_OFFSET 30
-#endif
-#if STARTING_OFFSET < 10
-#error "Please set STARTING_OFFSET >= 10"
-#endif
-#ifndef NOVA_SDS_RECDATA_TIMEOUT
-#define NOVA_SDS_RECDATA_TIMEOUT 150
-#endif
-#ifndef NOVA_SDS_DEVICE_ID
-#define NOVA_SDS_DEVICE_ID 0xFFFF
-#endif
-
-TasmotaSerial *NovaSdsSerial;
-
-uint8_t novasds_type = 1;
-uint8_t novasds_valid = 0;
-uint8_t cont_mode = 1;
-
-struct sds011data {
-  uint16_t pm100;
-  uint16_t pm25;
-} novasds_data;
-uint16_t pm100_sum;
-uint16_t pm25_sum;
-
-
-#define NOVA_SDS_REPORTING_MODE 2
-#define NOVA_SDS_QUERY_DATA 4
-#define NOVA_SDS_SET_DEVICE_ID 5
-#define NOVA_SDS_SLEEP_AND_WORK 6
-#define NOVA_SDS_WORKING_PERIOD 8
-#define NOVA_SDS_CHECK_FIRMWARE_VER 7
-  #define NOVA_SDS_QUERY_MODE 0
-  #define NOVA_SDS_SET_MODE 1
-  #define NOVA_SDS_REPORT_ACTIVE 0
-  #define NOVA_SDS_REPORT_QUERY 1
-  #define NOVA_SDS_SLEEP 0
-  #define NOVA_SDS_WORK 1
-
-
-bool NovaSdsCommand(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint16_t sensorid, uint8_t *buffer)
-{
-  uint8_t novasds_cmnd[19] = {0xAA, 0xB4, byte1, byte2, byte3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (uint8_t)(sensorid & 0xFF), (uint8_t)((sensorid>>8) & 0xFF), 0x00, 0xAB};
-
-
-  for (uint32_t i = 2; i < 17; i++) {
-    novasds_cmnd[17] += novasds_cmnd[i];
-  }
-
-
-
-
-
-  NovaSdsSerial->write(novasds_cmnd, sizeof(novasds_cmnd));
-  NovaSdsSerial->flush();
-
-
-  unsigned long cmndtime = millis();
-  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( ! NovaSdsSerial->available() ) );
-  if ( ! NovaSdsSerial->available() ) {
-
-    return false;
-  }
-  uint8_t recbuf[10];
-  memset(recbuf, 0, sizeof(recbuf));
-
-  while ( (TimePassedSince(cmndtime) < NOVA_SDS_RECDATA_TIMEOUT) && ( NovaSdsSerial->available() > 0) && (0xAA != (recbuf[0] = NovaSdsSerial->read())) );
-  if ( 0xAA != recbuf[0] ) {
-
-    return false;
-  }
-
-
-  NovaSdsSerial->readBytes(&recbuf[1], 9);
-  AddLogBuffer(LOG_LEVEL_DEBUG_MORE, recbuf, sizeof(recbuf));
-
-  if ( nullptr != buffer ) {
-
-    memcpy(buffer, recbuf, sizeof(recbuf));
-  }
-
-
-  if ((0xAB != recbuf[9] ) || (recbuf[8] != ((recbuf[2] + recbuf[3] + recbuf[4] + recbuf[5] + recbuf[6] + recbuf[7]) & 0xFF))) {
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR("SDS: " D_CHECKSUM_FAILURE));
-    return false;
-  }
-
-  return true;
-}
-
-void NovaSdsSetWorkPeriod(void)
-{
-
-    NovaSdsCommand(NOVA_SDS_WORKING_PERIOD, NOVA_SDS_SET_MODE, 0, NOVA_SDS_DEVICE_ID, nullptr);
-
-    NovaSdsCommand(NOVA_SDS_REPORTING_MODE, NOVA_SDS_SET_MODE, NOVA_SDS_REPORT_QUERY, NOVA_SDS_DEVICE_ID, nullptr);
-}
-
-bool NovaSdsReadData(void)
-{
-  uint8_t d[10];
-  if ( ! NovaSdsCommand(NOVA_SDS_QUERY_DATA, 0, 0, NOVA_SDS_DEVICE_ID, d) ) {
-    return false;
-  }
-  novasds_data.pm25 = (d[2] + 256 * d[3]);
-  novasds_data.pm100 = (d[4] + 256 * d[5]);
-
-  return true;
-}
-
-
-
-void NovaSdsSecond(void)
-{
-  if (!novasds_valid)
-  {
-    NovaSdsSetWorkPeriod();
-    novasds_valid=1;
-  }
-  if((Settings.tele_period - Settings.novasds_startingoffset <= 0))
-  {
-    if(!cont_mode)
-    {
-      cont_mode = 1;
-      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
-    }
-  }
-  else
-    cont_mode = 0;
-
-  if(tele_period == Settings.tele_period - Settings.novasds_startingoffset && !cont_mode)
-  {
-    NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_WORK, NOVA_SDS_DEVICE_ID, nullptr);
-  }
-  if(tele_period >= Settings.tele_period-5 && tele_period <= Settings.tele_period-2)
-  {
-    if(!(NovaSdsReadData())) novasds_valid=0;
-    pm100_sum += novasds_data.pm100;
-    pm25_sum += novasds_data.pm25;
-  }
-  if(tele_period == Settings.tele_period-1)
-  {
-    novasds_data.pm100 = pm100_sum >> 2;
-    novasds_data.pm25 = pm25_sum >> 2;
-    if(!cont_mode)
-      NovaSdsCommand(NOVA_SDS_SLEEP_AND_WORK, NOVA_SDS_SET_MODE, NOVA_SDS_SLEEP, NOVA_SDS_DEVICE_ID, nullptr);
-    pm100_sum = pm25_sum = 0;
-  }
-}
-
-
-
-
-
-
-
-bool NovaSdsCommandSensor(void)
-{
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 256)) {
-    if( XdrvMailbox.payload < 10 ) Settings.novasds_startingoffset = 10;
-    else Settings.novasds_startingoffset = XdrvMailbox.payload;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_20, Settings.novasds_startingoffset);
-
-  return true;
-}
-
-void NovaSdsInit(void)
-{
-  novasds_type = 0;
-  if (pin[GPIO_SDS0X1_RX] < 99 && pin[GPIO_SDS0X1_TX] < 99) {
-    NovaSdsSerial = new TasmotaSerial(pin[GPIO_SDS0X1_RX], pin[GPIO_SDS0X1_TX], 1);
-    if (NovaSdsSerial->begin(9600)) {
-      if (NovaSdsSerial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      novasds_type = 1;
-      NovaSdsSetWorkPeriod();
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SDS0X1_SNS[] PROGMEM =
-  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}SDS0X1 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#endif
-
-void NovaSdsShow(bool json)
-{
-  if (novasds_valid) {
-    float pm10f = (float)(novasds_data.pm100) / 10.0f;
-    float pm2_5f = (float)(novasds_data.pm25) / 10.0f;
-    char pm10[33];
-    dtostrfd(pm10f, 1, pm10);
-    char pm2_5[33];
-    dtostrfd(pm2_5f, 1, pm2_5);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SDS0X1\":{\"PM2.5\":%s,\"PM10\":%s}"), pm2_5, pm10);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, pm2_5);
-        DomoticzSensor(DZ_CURRENT, pm10);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SDS0X1_SNS, pm2_5, pm10);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns20(uint8_t function)
-{
-  bool result = false;
-
-  if (novasds_type) {
-    switch (function) {
-      case FUNC_INIT:
-        NovaSdsInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        NovaSdsSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_20 == XdrvMailbox.index) {
-          result = NovaSdsCommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        NovaSdsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        NovaSdsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
-#ifdef USE_I2C
-#ifdef USE_SGP30
-# 30 "S:/Development/Tasmota/tasmota/xsns_21_sgp30.ino"
-#define XSNS_21 21
-#define XI2C_18 18
-
-#define SGP30_ADDRESS 0x58
-
-#include "Adafruit_SGP30.h"
-Adafruit_SGP30 sgp;
-
-bool sgp30_type = false;
-bool sgp30_ready = false;
-float sgp30_abshum;
-
-
-
-void sgp30_Init(void)
-{
-  if (I2cActive(SGP30_ADDRESS)) { return; }
-
-  if (sgp.begin()) {
-    sgp30_type = true;
-
-    I2cSetActiveFound(SGP30_ADDRESS, "SGP30");
-  }
-}
-
-
-#define POW_FUNC FastPrecisePow
-
-float sgp30_AbsoluteHumidity(float temperature, float humidity,char tempUnit) {
-
-
-
-
-
-  float temp = NAN;
-  const float mw = 18.01534;
-  const float r = 8.31447215;
-
-  if (isnan(temperature) || isnan(humidity) ) {
-    return NAN;
-  }
-
-  if (tempUnit != 'C') {
-    temperature = (temperature - 32.0) * (5.0 / 9.0);
-  }
-
-  temp = POW_FUNC(2.718281828, (17.67 * temperature) / (temperature + 243.5));
-
-
-  return (6.112 * temp * humidity * mw) / ((273.15 + temperature) * r);
-}
-
-#define SAVE_PERIOD 30
-
-void Sgp30Update(void)
-{
-  sgp30_ready = false;
-  if (!sgp.IAQmeasure()) {
-    return;
-  }
-  if (global_update && (global_humidity > 0) && (global_temperature != 9999)) {
-
-    sgp30_abshum=sgp30_AbsoluteHumidity(global_temperature,global_humidity,TempUnit());
-    sgp.setHumidity(sgp30_abshum*1000);
-  }
-  sgp30_ready = true;
-
-
-  if (!(uptime%SAVE_PERIOD)) {
-
-    uint16_t TVOC_base;
-    uint16_t eCO2_base;
-
-    if (!sgp.getIAQBaseline(&eCO2_base, &TVOC_base)) return;
-
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SGP30[] PROGMEM =
-  "{s}SGP30 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
-  "{s}SGP30 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
-const char HTTP_SNS_AHUM[] PROGMEM = "{s}SGP30 Abs Humidity{m}%s g/m3{e}";
-#endif
-
-#define D_JSON_AHUM "aHumidity"
-
-void Sgp30Show(bool json)
-{
-  if (sgp30_ready) {
-    char abs_hum[33];
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SGP30\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d"), sgp.eCO2, sgp.TVOC);
-      if (global_update && global_humidity>0 && global_temperature!=9999) {
-
-        dtostrfd(sgp30_abshum,4,abs_hum);
-        ResponseAppend_P(PSTR(",\"" D_JSON_AHUM "\":%s"),abs_hum);
-      }
-      ResponseJsonEnd();
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, sgp.eCO2);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_SGP30, sgp.eCO2, sgp.TVOC);
-      if (global_update) {
-        WSContentSend_PD(HTTP_SNS_AHUM, abs_hum);
-      }
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns21(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_18)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    sgp30_Init();
-  }
-  else if (sgp30_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Sgp30Update();
-        break;
-      case FUNC_JSON_APPEND:
-        Sgp30Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sgp30Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
-#ifdef USE_SR04
-
-#include <NewPing.h>
-#include <TasmotaSerial.h>
-# 32 "S:/Development/Tasmota/tasmota/xsns_22_sr04.ino"
-#define XSNS_22 22
-
-uint8_t sr04_type = 1;
-int sr04_echo_pin = 0;
-int sr04_trig_pin = 0;
-real64_t distance;
-
-NewPing* sonar = nullptr;
-TasmotaSerial* sonar_serial = nullptr;
-
-
-
-uint8_t Sr04TModeDetect(void)
-{
-  sr04_type = 0;
-  if (pin[GPIO_SR04_ECHO]>=99) return sr04_type;
-
-  sr04_echo_pin = pin[GPIO_SR04_ECHO];
-  sr04_trig_pin = (pin[GPIO_SR04_TRIG] < 99) ? pin[GPIO_SR04_TRIG] : -1;
-  sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
-
-  if (sonar_serial->begin(9600,1)) {
-    DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode"));
-
-    if (sr04_trig_pin!=-1) {
-        sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance())!=NO_ECHO)?3:1;
-    } else {
-        sr04_type = 2;
-    }
-  } else {
-    sr04_type = 1;
-  }
-
-  if (sr04_type < 2) {
-      delete sonar_serial;
-      sonar_serial = nullptr;
-      sonar = new NewPing(sr04_trig_pin, sr04_echo_pin, 300);
-  } else {
-    if (sonar_serial->hardwareSerial()) {
-      ClaimSerial();
-    }
-  }
-
-  AddLog_P2(LOG_LEVEL_INFO,PSTR("SR04: Mode %d"), sr04_type);
-  return sr04_type;
-}
-
-uint16_t Sr04TMiddleValue(uint16_t first, uint16_t second, uint16_t third)
-{
-  uint16_t ret = first;
-  if (first > second) {
-    first = second;
-    second = ret;
-  }
-
-  if (third < first) {
-    return first;
-  } else if (third > second) {
-    return second;
-  } else {
-    return third;
-  }
-}
-
-uint16_t Sr04TMode3Distance() {
-
-    sonar_serial->write(0x55);
-    sonar_serial->flush();
-
-    return Sr04TMode2Distance();
-}
-
-uint16_t Sr04TMode2Distance(void)
-{
-  sonar_serial->setTimeout(300);
-  const char startByte = 0xff;
-
-  if (!sonar_serial->find(startByte)) {
-
-      return NO_ECHO;
-  }
-
-  delay(5);
-
-  uint8_t crc = sonar_serial->read();
-
-  uint16_t distance = ((uint16_t)crc) << 8;
-
-
-  distance += sonar_serial->read();
-  crc += distance & 0x00ff;
-  crc += 0x00FF;
-
-
-  if (crc != sonar_serial->read()) {
-    AddLog_P2(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error."));
-    return NO_ECHO;
-  }
-
-  return distance;
-}
-
-void Sr04TReading(void) {
-
-  if (sonar_serial==nullptr && sonar==nullptr) {
-    Sr04TModeDetect();
-  }
-
-  switch (sr04_type) {
-      case 3:
-        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode3Distance(),Sr04TMode3Distance(),Sr04TMode3Distance()))/ 10;
-        break;
-      case 2:
-
-        while(sonar_serial->available()) sonar_serial->read();
-        distance = (real64_t)(Sr04TMiddleValue(Sr04TMode2Distance(),Sr04TMode2Distance(),Sr04TMode2Distance()))/10;
-        break;
-      case 1:
-        distance = (real64_t)(sonar->ping_median(5))/ US_ROUNDTRIP_CM;
-        break;
-      default:
-        distance = NO_ECHO;
-  }
-
-  return;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_DISTANCE[] PROGMEM =
-  "{s}SR04 " D_DISTANCE "{m}%s" D_UNIT_CENTIMETER "{e}";
-#endif
-
-void Sr04Show(bool json)
-{
-
-  if (distance != 0) {
-    char distance_chr[33];
-    dtostrfd(distance, 3, distance_chr);
-
-    if(json) {
-      ResponseAppend_P(PSTR(",\"SR04\":{\"" D_JSON_DISTANCE "\":%s}"), distance_chr);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_COUNT, distance_chr);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_DISTANCE, distance_chr);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns22(uint8_t function)
-{
-  bool result = false;
-
-  if (sr04_type) {
-    switch (function) {
-      case FUNC_INIT:
-        result = (pin[GPIO_SR04_ECHO]<99);
-        break;
-      case FUNC_EVERY_SECOND:
-        Sr04TReading();
-        result = true;
-        break;
-      case FUNC_JSON_APPEND:
-        Sr04Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Sr04Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
-#ifdef USE_I2C
-#ifdef USE_SI1145
-# 30 "S:/Development/Tasmota/tasmota/xsns_24_si1145.ino"
-#define XSNS_24 24
-#define XI2C_19 19
-
-#define SI114X_ADDR 0X60
-
-
-
-#define SI114X_QUERY 0X80
-#define SI114X_SET 0XA0
-#define SI114X_NOP 0X00
-#define SI114X_RESET 0X01
-#define SI114X_BUSADDR 0X02
-#define SI114X_PS_FORCE 0X05
-#define SI114X_GET_CAL 0X12
-#define SI114X_ALS_FORCE 0X06
-#define SI114X_PSALS_FORCE 0X07
-#define SI114X_PS_PAUSE 0X09
-#define SI114X_ALS_PAUSE 0X0A
-#define SI114X_PSALS_PAUSE 0X0B
-#define SI114X_PS_AUTO 0X0D
-#define SI114X_ALS_AUTO 0X0E
-#define SI114X_PSALS_AUTO 0X0F
-
-
-
-#define SI114X_PART_ID 0X00
-#define SI114X_REV_ID 0X01
-#define SI114X_SEQ_ID 0X02
-#define SI114X_INT_CFG 0X03
-#define SI114X_IRQ_ENABLE 0X04
-#define SI114X_IRQ_MODE1 0x05
-#define SI114X_IRQ_MODE2 0x06
-#define SI114X_HW_KEY 0X07
-#define SI114X_MEAS_RATE0 0X08
-#define SI114X_MEAS_RATE1 0X09
-#define SI114X_PS_RATE 0X0A
-#define SI114X_PS_LED21 0X0F
-#define SI114X_PS_LED3 0X10
-#define SI114X_UCOEFF0 0X13
-#define SI114X_UCOEFF1 0X14
-#define SI114X_UCOEFF2 0X15
-#define SI114X_UCOEFF3 0X16
-#define SI114X_WR 0X17
-#define SI114X_COMMAND 0X18
-#define SI114X_RESPONSE 0X20
-#define SI114X_IRQ_STATUS 0X21
-#define SI114X_ALS_VIS_DATA0 0X22
-#define SI114X_ALS_VIS_DATA1 0X23
-#define SI114X_ALS_IR_DATA0 0X24
-#define SI114X_ALS_IR_DATA1 0X25
-#define SI114X_PS1_DATA0 0X26
-#define SI114X_PS1_DATA1 0X27
-#define SI114X_PS2_DATA0 0X28
-#define SI114X_PS2_DATA1 0X29
-#define SI114X_PS3_DATA0 0X2A
-#define SI114X_PS3_DATA1 0X2B
-#define SI114X_AUX_DATA0_UVINDEX0 0X2C
-#define SI114X_AUX_DATA1_UVINDEX1 0X2D
-#define SI114X_RD 0X2E
-#define SI114X_CHIP_STAT 0X30
-
-
-
-#define SI114X_CHLIST 0X01
-#define SI114X_CHLIST_ENUV 0x80
-#define SI114X_CHLIST_ENAUX 0x40
-#define SI114X_CHLIST_ENALSIR 0x20
-#define SI114X_CHLIST_ENALSVIS 0x10
-#define SI114X_CHLIST_ENPS1 0x01
-#define SI114X_CHLIST_ENPS2 0x02
-#define SI114X_CHLIST_ENPS3 0x04
-
-#define SI114X_PSLED12_SELECT 0X02
-#define SI114X_PSLED3_SELECT 0X03
-
-#define SI114X_PS_ENCODE 0X05
-#define SI114X_ALS_ENCODE 0X06
-
-#define SI114X_PS1_ADCMUX 0X07
-#define SI114X_PS2_ADCMUX 0X08
-#define SI114X_PS3_ADCMUX 0X09
-
-#define SI114X_PS_ADC_COUNTER 0X0A
-#define SI114X_PS_ADC_GAIN 0X0B
-#define SI114X_PS_ADC_MISC 0X0C
-
-#define SI114X_ALS_IR_ADC_MUX 0X0E
-#define SI114X_AUX_ADC_MUX 0X0F
-
-#define SI114X_ALS_VIS_ADC_COUNTER 0X10
-#define SI114X_ALS_VIS_ADC_GAIN 0X11
-#define SI114X_ALS_VIS_ADC_MISC 0X12
-
-#define SI114X_LED_REC 0X1C
-
-#define SI114X_ALS_IR_ADC_COUNTER 0X1D
-#define SI114X_ALS_IR_ADC_GAIN 0X1E
-#define SI114X_ALS_IR_ADC_MISC 0X1F
-
-
-
-
-#define SI114X_ADCMUX_SMALL_IR 0x00
-#define SI114X_ADCMUX_VISIABLE 0x02
-#define SI114X_ADCMUX_LARGE_IR 0x03
-#define SI114X_ADCMUX_NO 0x06
-#define SI114X_ADCMUX_GND 0x25
-#define SI114X_ADCMUX_TEMPERATURE 0x65
-#define SI114X_ADCMUX_VDD 0x75
-
-#define SI114X_PSLED12_SELECT_PS1_NONE 0x00
-#define SI114X_PSLED12_SELECT_PS1_LED1 0x01
-#define SI114X_PSLED12_SELECT_PS1_LED2 0x02
-#define SI114X_PSLED12_SELECT_PS1_LED3 0x04
-#define SI114X_PSLED12_SELECT_PS2_NONE 0x00
-#define SI114X_PSLED12_SELECT_PS2_LED1 0x10
-#define SI114X_PSLED12_SELECT_PS2_LED2 0x20
-#define SI114X_PSLED12_SELECT_PS2_LED3 0x40
-#define SI114X_PSLED3_SELECT_PS2_NONE 0x00
-#define SI114X_PSLED3_SELECT_PS2_LED1 0x10
-#define SI114X_PSLED3_SELECT_PS2_LED2 0x20
-#define SI114X_PSLED3_SELECT_PS2_LED3 0x40
-
-#define SI114X_ADC_GAIN_DIV1 0X00
-#define SI114X_ADC_GAIN_DIV2 0X01
-#define SI114X_ADC_GAIN_DIV4 0X02
-#define SI114X_ADC_GAIN_DIV8 0X03
-#define SI114X_ADC_GAIN_DIV16 0X04
-#define SI114X_ADC_GAIN_DIV32 0X05
-
-#define SI114X_LED_CURRENT_5MA 0X01
-#define SI114X_LED_CURRENT_11MA 0X02
-#define SI114X_LED_CURRENT_22MA 0X03
-#define SI114X_LED_CURRENT_45MA 0X04
-
-#define SI114X_ADC_COUNTER_1ADCCLK 0X00
-#define SI114X_ADC_COUNTER_7ADCCLK 0X01
-#define SI114X_ADC_COUNTER_15ADCCLK 0X02
-#define SI114X_ADC_COUNTER_31ADCCLK 0X03
-#define SI114X_ADC_COUNTER_63ADCCLK 0X04
-#define SI114X_ADC_COUNTER_127ADCCLK 0X05
-#define SI114X_ADC_COUNTER_255ADCCLK 0X06
-#define SI114X_ADC_COUNTER_511ADCCLK 0X07
-
-#define SI114X_ADC_MISC_LOWRANGE 0X00
-#define SI114X_ADC_MISC_HIGHRANGE 0X20
-#define SI114X_ADC_MISC_ADC_NORMALPROXIMITY 0X00
-#define SI114X_ADC_MISC_ADC_RAWADC 0X04
-
-#define SI114X_INT_CFG_INTOE 0X01
-
-#define SI114X_IRQEN_ALS 0x01
-#define SI114X_IRQEN_PS1 0x04
-#define SI114X_IRQEN_PS2 0x08
-#define SI114X_IRQEN_PS3 0x10
-
-uint16_t si1145_visible;
-uint16_t si1145_infrared;
-uint16_t si1145_uvindex;
-
-bool si1145_type = false;
-uint8_t si1145_valid = 0;
-
-
-
-uint8_t Si1145ReadByte(uint8_t reg)
-{
-  return I2cRead8(SI114X_ADDR, reg);
-}
-
-uint16_t Si1145ReadHalfWord(uint8_t reg)
-{
-  return I2cRead16LE(SI114X_ADDR, reg);
-}
-
-bool Si1145WriteByte(uint8_t reg, uint16_t val)
-{
-  I2cWrite8(SI114X_ADDR, reg, val);
-}
-
-uint8_t Si1145WriteParamData(uint8_t p, uint8_t v)
-{
-  Si1145WriteByte(SI114X_WR, v);
-  Si1145WriteByte(SI114X_COMMAND, p | SI114X_SET);
-  return Si1145ReadByte(SI114X_RD);
-}
-
-
-
-bool Si1145Present(void)
-{
-  return (Si1145ReadByte(SI114X_PART_ID) == 0X45);
-}
-
-void Si1145Reset(void)
-{
-  Si1145WriteByte(SI114X_MEAS_RATE0, 0);
-  Si1145WriteByte(SI114X_MEAS_RATE1, 0);
-  Si1145WriteByte(SI114X_IRQ_ENABLE, 0);
-  Si1145WriteByte(SI114X_IRQ_MODE1, 0);
-  Si1145WriteByte(SI114X_IRQ_MODE2, 0);
-  Si1145WriteByte(SI114X_INT_CFG, 0);
-  Si1145WriteByte(SI114X_IRQ_STATUS, 0xFF);
-
-  Si1145WriteByte(SI114X_COMMAND, SI114X_RESET);
-  delay(10);
-  Si1145WriteByte(SI114X_HW_KEY, 0x17);
-  delay(10);
-}
-
-void Si1145DeInit(void)
-{
-
-
-  Si1145WriteByte(SI114X_UCOEFF0, 0x29);
-  Si1145WriteByte(SI114X_UCOEFF1, 0x89);
-  Si1145WriteByte(SI114X_UCOEFF2, 0x02);
-  Si1145WriteByte(SI114X_UCOEFF3, 0x00);
-  Si1145WriteParamData(SI114X_CHLIST, SI114X_CHLIST_ENUV | SI114X_CHLIST_ENALSIR | SI114X_CHLIST_ENALSVIS | SI114X_CHLIST_ENPS1);
-
-
-
-  Si1145WriteParamData(SI114X_PS1_ADCMUX, SI114X_ADCMUX_LARGE_IR);
-  Si1145WriteByte(SI114X_PS_LED21, SI114X_LED_CURRENT_22MA);
-  Si1145WriteParamData(SI114X_PSLED12_SELECT, SI114X_PSLED12_SELECT_PS1_LED1);
-
-
-
-  Si1145WriteParamData(SI114X_PS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_PS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_PS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE | SI114X_ADC_MISC_ADC_RAWADC);
-
-
-
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_ALS_VIS_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
-
-
-
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_GAIN, SI114X_ADC_GAIN_DIV1);
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_COUNTER, SI114X_ADC_COUNTER_511ADCCLK);
-  Si1145WriteParamData(SI114X_ALS_IR_ADC_MISC, SI114X_ADC_MISC_HIGHRANGE);
-
-
-
-  Si1145WriteByte(SI114X_INT_CFG, SI114X_INT_CFG_INTOE);
-  Si1145WriteByte(SI114X_IRQ_ENABLE, SI114X_IRQEN_ALS);
-
-
-
-  Si1145WriteByte(SI114X_MEAS_RATE0, 0xFF);
-  Si1145WriteByte(SI114X_COMMAND, SI114X_PSALS_AUTO);
-}
-
-bool Si1145Begin(void)
-{
-  if (!Si1145Present()) { return false; }
-
-  Si1145Reset();
-  Si1145DeInit();
-  return true;
-}
-
-
-uint16_t Si1145ReadUV(void)
-{
-  return Si1145ReadHalfWord(SI114X_AUX_DATA0_UVINDEX0);
-}
-
-
-uint16_t Si1145ReadVisible(void)
-{
-  return Si1145ReadHalfWord(SI114X_ALS_VIS_DATA0);
-}
-
-
-uint16_t Si1145ReadIR(void)
-{
-  return Si1145ReadHalfWord(SI114X_ALS_IR_DATA0);
-}
-
-
-
-bool Si1145Read(void)
-{
-  if (si1145_valid) { si1145_valid--; }
-
-  if (!Si1145Present()) { return false; }
-
-  si1145_visible = Si1145ReadVisible();
-  si1145_infrared = Si1145ReadIR();
-  si1145_uvindex = Si1145ReadUV();
-  si1145_valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-void Si1145Detect(void)
-{
-  if (I2cActive(SI114X_ADDR)) { return; }
-
-  if (Si1145Begin()) {
-    si1145_type = true;
-    I2cSetActiveFound(SI114X_ADDR, "SI1145");
-  }
-}
-
-void Si1145Update(void)
-{
-  if (!Si1145Read()) {
-    AddLogMissed("SI1145", si1145_valid);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SI1145[] PROGMEM =
-  "{s}SI1145 " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}"
-  "{s}SI1145 " D_INFRARED "{m}%d " D_UNIT_LUX "{e}"
-  "{s}SI1145 " D_UV_INDEX "{m}%d.%d{e}";
-#endif
-
-void Si1145Show(bool json)
-{
-  if (si1145_valid) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"SI1145\":{\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_INFRARED "\":%d,\"" D_JSON_UV_INDEX "\":%d.%d}"),
-        si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_ILLUMINANCE, si1145_visible);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_SI1145, si1145_visible, si1145_infrared, si1145_uvindex /100, si1145_uvindex %100);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns24(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_19)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Si1145Detect();
-  }
-  else if (si1145_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Si1145Update();
-        break;
-      case FUNC_JSON_APPEND:
-        Si1145Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Si1145Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
-#ifdef USE_I2C
-#ifdef USE_LM75AD
-# 31 "S:/Development/Tasmota/tasmota/xsns_26_lm75ad.ino"
-#define XSNS_26 26
-#define XI2C_20 20
-
-#define LM75AD_ADDRESS1 0x48
-#define LM75AD_ADDRESS2 0x49
-#define LM75AD_ADDRESS3 0x4A
-#define LM75AD_ADDRESS4 0x4B
-#define LM75AD_ADDRESS5 0x4C
-#define LM75AD_ADDRESS6 0x4D
-#define LM75AD_ADDRESS7 0x4E
-#define LM75AD_ADDRESS8 0x4F
-
-#define LM75_TEMP_REGISTER 0x00
-#define LM75_CONF_REGISTER 0x01
-#define LM75_THYST_REGISTER 0x02
-#define LM75_TOS_REGISTER 0x03
-
-bool lm75ad_type = false;
-uint8_t lm75ad_address;
-uint8_t lm75ad_addresses[] = { LM75AD_ADDRESS1, LM75AD_ADDRESS2, LM75AD_ADDRESS3, LM75AD_ADDRESS4, LM75AD_ADDRESS5, LM75AD_ADDRESS6, LM75AD_ADDRESS7, LM75AD_ADDRESS8 };
-
-void LM75ADDetect(void)
-{
-  for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
-    lm75ad_address = lm75ad_addresses[i];
-    if (I2cActive(lm75ad_address)) {
-      continue; }
-    if (!I2cSetDevice(lm75ad_address)) {
-      break;
-    }
-    uint16_t buffer;
-    if (I2cValidRead16(&buffer, lm75ad_address, LM75_THYST_REGISTER)) {
-      if (buffer == 0x4B00) {
-        lm75ad_type = true;
-        I2cSetActiveFound(lm75ad_address, "LM75AD");
-        break;
-      }
-    }
-  }
-}
-
-float LM75ADGetTemp(void)
-{
-  int16_t sign = 1;
-
-  uint16_t t = I2cRead16(lm75ad_address, LM75_TEMP_REGISTER);
-  if (t & 0x8000) {
-    t = (~t) +0x20;
-    sign = -1;
-  }
-  t = t >> 5;
-  return ConvertTemp(sign * t * 0.125);
-}
-
-void LM75ADShow(bool json)
-{
-  float t = LM75ADGetTemp();
-  char temperature[33];
-  dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"LM75AD\":{\"" D_JSON_TEMPERATURE "\":%s}"), temperature);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TEMP, "LM75AD", temperature, TempUnit());
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns26(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_20)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    LM75ADDetect();
-  }
-  else if (lm75ad_type) {
-    switch (function) {
-      case FUNC_JSON_APPEND:
-        LM75ADShow(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        LM75ADShow(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-# 28 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-#ifdef USE_I2C
-#ifdef USE_APDS9960
-# 39 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-#define XSNS_27 27
-#define XI2C_21 21
-
-#if defined(USE_SHT) || defined(USE_VEML6070) || defined(USE_TSL2561)
-  #warning **** Turned off conflicting drivers SHT and VEML6070 ****
-  #ifdef USE_SHT
-  #undef USE_SHT
-  #endif
-  #ifdef USE_VEML6070
-  #undef USE_VEML6070
-  #endif
-  #ifdef USE_TSL2561
-  #undef USE_TSL2561
-  #endif
-#endif
-
-#define APDS9960_I2C_ADDR 0x39
-
-#define APDS9960_CHIPID_1 0xAB
-#define APDS9960_CHIPID_2 0x9C
-
-#define APDS9930_CHIPID_1 0x12
-#define APDS9930_CHIPID_2 0x39
-
-
-#define GESTURE_THRESHOLD_OUT 10
-#define GESTURE_SENSITIVITY_1 50
-#define GESTURE_SENSITIVITY_2 20
-
-uint8_t APDS9960addr;
-uint8_t APDS9960type = 0;
-char APDS9960stype[] = "APDS9960";
-char currentGesture[6];
-uint8_t gesture_mode = 1;
-
-
-volatile uint8_t recovery_loop_counter = 0;
-#define APDS9960_LONG_RECOVERY 50
-#define APDS9960_MAX_GESTURE_CYCLES 50
-bool APDS9960_overload = false;
-
-#ifdef USE_WEBSERVER
-const char HTTP_APDS_9960_SNS[] PROGMEM =
-  "{s}" "Red" "{m}%s{e}"
-  "{s}" "Green" "{m}%s{e}"
-  "{s}" "Blue" "{m}%s{e}"
-  "{s}" "Ambient" "{m}%s " D_UNIT_LUX "{e}"
-  "{s}" "CCT" "{m}%s " "K" "{e}"
-  "{s}" "Proximity" "{m}%s{e}";
-#endif
-# 97 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-#define FIFO_PAUSE_TIME 30
-
-
-#define APDS9960_ENABLE 0x80
-#define APDS9960_ATIME 0x81
-#define APDS9960_WTIME 0x83
-#define APDS9960_AILTL 0x84
-#define APDS9960_AILTH 0x85
-#define APDS9960_AIHTL 0x86
-#define APDS9960_AIHTH 0x87
-#define APDS9960_PILT 0x89
-#define APDS9960_PIHT 0x8B
-#define APDS9960_PERS 0x8C
-#define APDS9960_CONFIG1 0x8D
-#define APDS9960_PPULSE 0x8E
-#define APDS9960_CONTROL 0x8F
-#define APDS9960_CONFIG2 0x90
-#define APDS9960_ID 0x92
-#define APDS9960_STATUS 0x93
-#define APDS9960_CDATAL 0x94
-#define APDS9960_CDATAH 0x95
-#define APDS9960_RDATAL 0x96
-#define APDS9960_RDATAH 0x97
-#define APDS9960_GDATAL 0x98
-#define APDS9960_GDATAH 0x99
-#define APDS9960_BDATAL 0x9A
-#define APDS9960_BDATAH 0x9B
-#define APDS9960_PDATA 0x9C
-#define APDS9960_POFFSET_UR 0x9D
-#define APDS9960_POFFSET_DL 0x9E
-#define APDS9960_CONFIG3 0x9F
-#define APDS9960_GPENTH 0xA0
-#define APDS9960_GEXTH 0xA1
-#define APDS9960_GCONF1 0xA2
-#define APDS9960_GCONF2 0xA3
-#define APDS9960_GOFFSET_U 0xA4
-#define APDS9960_GOFFSET_D 0xA5
-#define APDS9960_GOFFSET_L 0xA7
-#define APDS9960_GOFFSET_R 0xA9
-#define APDS9960_GPULSE 0xA6
-#define APDS9960_GCONF3 0xAA
-#define APDS9960_GCONF4 0xAB
-#define APDS9960_GFLVL 0xAE
-#define APDS9960_GSTATUS 0xAF
-#define APDS9960_IFORCE 0xE4
-#define APDS9960_PICLEAR 0xE5
-#define APDS9960_CICLEAR 0xE6
-#define APDS9960_AICLEAR 0xE7
-#define APDS9960_GFIFO_U 0xFC
-#define APDS9960_GFIFO_D 0xFD
-#define APDS9960_GFIFO_L 0xFE
-#define APDS9960_GFIFO_R 0xFF
-
-
-#define APDS9960_PON 0b00000001
-#define APDS9960_AEN 0b00000010
-#define APDS9960_PEN 0b00000100
-#define APDS9960_WEN 0b00001000
-#define APSD9960_AIEN 0b00010000
-#define APDS9960_PIEN 0b00100000
-#define APDS9960_GEN 0b01000000
-#define APDS9960_GVALID 0b00000001
-
-
-#define OFF 0
-#define ON 1
-
-
-#define POWER 0
-#define AMBIENT_LIGHT 1
-#define PROXIMITY 2
-#define WAIT 3
-#define AMBIENT_LIGHT_INT 4
-#define PROXIMITY_INT 5
-#define GESTURE 6
-#define ALL 7
-
-
-#define LED_DRIVE_100MA 0
-#define LED_DRIVE_50MA 1
-#define LED_DRIVE_25MA 2
-#define LED_DRIVE_12_5MA 3
-
-
-#define PGAIN_1X 0
-#define PGAIN_2X 1
-#define PGAIN_4X 2
-#define PGAIN_8X 3
-
-
-#define AGAIN_1X 0
-#define AGAIN_4X 1
-#define AGAIN_16X 2
-#define AGAIN_64X 3
-
-
-#define GGAIN_1X 0
-#define GGAIN_2X 1
-#define GGAIN_4X 2
-#define GGAIN_8X 3
-
-
-#define LED_BOOST_100 0
-#define LED_BOOST_150 1
-#define LED_BOOST_200 2
-#define LED_BOOST_300 3
-
-
-#define GWTIME_0MS 0
-#define GWTIME_2_8MS 1
-#define GWTIME_5_6MS 2
-#define GWTIME_8_4MS 3
-#define GWTIME_14_0MS 4
-#define GWTIME_22_4MS 5
-#define GWTIME_30_8MS 6
-#define GWTIME_39_2MS 7
-
-
-#define DEFAULT_ATIME 0xdb
-#define DEFAULT_WTIME 246
-#define DEFAULT_PROX_PPULSE 0x87
-#define DEFAULT_GESTURE_PPULSE 0x89
-#define DEFAULT_POFFSET_UR 0
-#define DEFAULT_POFFSET_DL 0
-#define DEFAULT_CONFIG1 0x60
-#define DEFAULT_LDRIVE LED_DRIVE_100MA
-#define DEFAULT_PGAIN PGAIN_4X
-#define DEFAULT_AGAIN AGAIN_4X
-#define DEFAULT_PILT 0
-#define DEFAULT_PIHT 50
-#define DEFAULT_AILT 0xFFFF
-#define DEFAULT_AIHT 0
-#define DEFAULT_PERS 0x11
-#define DEFAULT_CONFIG2 0x01
-#define DEFAULT_CONFIG3 0
-#define DEFAULT_GPENTH 40
-#define DEFAULT_GEXTH 30
-#define DEFAULT_GCONF1 0x40
-#define DEFAULT_GGAIN GGAIN_4X
-#define DEFAULT_GLDRIVE LED_DRIVE_100MA
-#define DEFAULT_GWTIME GWTIME_2_8MS
-#define DEFAULT_GOFFSET 0
-#define DEFAULT_GPULSE 0xC9
-#define DEFAULT_GCONF3 0
-#define DEFAULT_GIEN 0
-
-#define ERROR 0xFF
-
-
-enum {
-  DIR_NONE,
-  DIR_LEFT,
-  DIR_RIGHT,
-  DIR_UP,
-  DIR_DOWN,
-  DIR_ALL
-};
-
-
-enum {
-  APDS9960_NA_STATE,
-  APDS9960_ALL_STATE
-};
-
-
-typedef struct gesture_data_type {
-    uint8_t u_data[32];
-    uint8_t d_data[32];
-    uint8_t l_data[32];
-    uint8_t r_data[32];
-    uint8_t index;
-    uint8_t total_gestures;
-    uint8_t in_threshold;
-    uint8_t out_threshold;
-} gesture_data_type;
-
-
- gesture_data_type gesture_data_;
- int16_t gesture_ud_delta_ = 0;
- int16_t gesture_lr_delta_ = 0;
- int16_t gesture_ud_count_ = 0;
- int16_t gesture_lr_count_ = 0;
- int16_t gesture_state_ = 0;
- int16_t gesture_motion_ = DIR_NONE;
-
- typedef struct color_data_type {
-    uint16_t a;
-    uint16_t r;
-    uint16_t g;
-    uint16_t b;
-    uint8_t p;
-    uint16_t cct;
-    uint16_t lux;
- } color_data_type;
-
- color_data_type color_data;
- uint8_t APDS9960_aTime = DEFAULT_ATIME;
-# 306 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- bool wireWriteByte(uint8_t val)
- {
-     Wire.beginTransmission(APDS9960_I2C_ADDR);
-     Wire.write(val);
-     if( Wire.endTransmission() != 0 ) {
-         return false;
-     }
-
-     return true;
- }
-# 325 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-int8_t wireReadDataBlock( uint8_t reg,
-                                        uint8_t *val,
-                                        uint16_t len)
-{
-    unsigned char i = 0;
-
-
-    if (!wireWriteByte(reg)) {
-        return -1;
-    }
-
-
-    Wire.requestFrom(APDS9960_I2C_ADDR, len);
-    while (Wire.available()) {
-        if (i >= len) {
-            return -1;
-        }
-        val[i] = Wire.read();
-        i++;
-    }
-
-    return i;
-}
-
-
-
-
-
-
-
-void calculateColorTemperature(void)
-{
-  float X, Y, Z;
-  float xc, yc;
-  float n;
-  float cct;
-
-
-
-
-
-  X = (-0.14282F * color_data.r) + (1.54924F * color_data.g) + (-0.95641F * color_data.b);
-  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b);
-  Z = (-0.68202F * color_data.r) + (0.77073F * color_data.g) + ( 0.56332F * color_data.b);
-
-
-  xc = (X) / (X + Y + Z);
-  yc = (Y) / (X + Y + Z);
-
-
-  n = (xc - 0.3320F) / (0.1858F - yc);
-
-
-  color_data.cct = (449.0F * FastPrecisePowf(n, 3)) + (3525.0F * FastPrecisePowf(n, 2)) + (6823.3F * n) + 5520.33F;
-
-  return;
-}
-# 392 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProxIntLowThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT) ;
-     return val;
- }
-
-
-
-
-
-
-  void setProxIntLowThresh(uint8_t threshold)
-  {
-        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold);
-  }
-
-
-
-
-
-
- uint8_t getProxIntHighThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
-     return val;
- }
-
-
-
-
-
-
-
- void setProxIntHighThresh(uint8_t threshold)
-   {
-         I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold);
-   }
-# 448 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getLEDDrive(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
-
-     val = (val >> 6) & 0b00000011;
-
-     return val;
- }
-# 471 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setLEDDrive(uint8_t drive)
-  {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-      drive &= 0b00000011;
-      drive = drive << 6;
-      val &= 0b00111111;
-      val |= drive;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
-  }
-# 500 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProximityGain(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL) ;
-
-     val = (val >> 2) & 0b00000011;
-
-     return val;
- }
-# 523 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setProximityGain(uint8_t drive)
- {
-     uint8_t val;
-
-
-   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-     drive &= 0b00000011;
-     drive = drive << 2;
-     val &= 0b11110011;
-     val |= drive;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
- }
-# 564 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-  void setAmbientLightGain(uint8_t drive)
-  {
-      uint8_t val;
-
-
-      val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONTROL);
-
-
-      drive &= 0b00000011;
-      val &= 0b11111100;
-      val |= drive;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONTROL, val);
-  }
-# 591 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getLEDBoost(void)
- {
-     uint8_t val;
-
-
-   val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
-
-
-     val = (val >> 4) & 0b00000011;
-
-     return val;
- }
-# 615 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setLEDBoost(uint8_t boost)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG2) ;
-
-     boost &= 0b00000011;
-     boost = boost << 4;
-     val &= 0b11001111;
-     val |= boost;
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, val) ;
- }
-
-
-
-
-
-
- uint8_t getProxGainCompEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     val = (val >> 5) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
-  void setProxGainCompEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 5;
-     val &= 0b11011111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
- }
-# 683 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getProxPhotoMask(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     val &= 0b00001111;
-
-     return val;
- }
-# 708 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setProxPhotoMask(uint8_t mask)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_CONFIG3) ;
-
-
-     mask &= 0b00001111;
-     val &= 0b11110000;
-     val |= mask;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, val) ;
- }
-
-
-
-
-
-
- uint8_t getGestureEnterThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GPENTH) ;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureEnterThresh(uint8_t threshold)
- {
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPENTH, threshold) ;
-
- }
-
-
-
-
-
-
- uint8_t getGestureExitThresh(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GEXTH) ;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureExitThresh(uint8_t threshold)
- {
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GEXTH, threshold) ;
- }
-# 786 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureGain(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val = (val >> 5) & 0b00000011;
-
-     return val;
- }
-# 810 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureGain(uint8_t gain)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     gain &= 0b00000011;
-     gain = gain << 5;
-     val &= 0b10011111;
-     val |= gain;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-# 838 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureLEDDrive(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val = (val >> 3) & 0b00000011;
-
-     return val;
- }
-# 862 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureLEDDrive(uint8_t drive)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     drive &= 0b00000011;
-     drive = drive << 3;
-     val &= 0b11100111;
-     val |= drive;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-# 894 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- uint8_t getGestureWaitTime(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     val &= 0b00000111;
-
-     return val;
- }
-# 922 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void setGestureWaitTime(uint8_t time)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF2) ;
-
-
-     time &= 0b00000111;
-     val &= 0b11111000;
-     val |= time;
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF2, val) ;
- }
-
-
-
-
-
-
- void getLightIntLowThreshold(uint16_t &threshold)
- {
-     uint8_t val_byte;
-     threshold = 0;
-
-
-     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AILTL) ;
-     threshold = val_byte;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_byte) ;
-     threshold = threshold + ((uint16_t)val_byte << 8);
- }
-
-
-
-
-
-
-
-   void setLightIntLowThreshold(uint16_t threshold)
-   {
-       uint8_t val_low;
-       uint8_t val_high;
-
-
-       val_low = threshold & 0x00FF;
-       val_high = (threshold & 0xFF00) >> 8;
-
-
-       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTL, val_low) ;
-
-
-       I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AILTH, val_high) ;
-
-   }
-
-
-
-
-
-
-
- void getLightIntHighThreshold(uint16_t &threshold)
- {
-     uint8_t val_byte;
-     threshold = 0;
-
-
-     val_byte = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AIHTL);
-     threshold = val_byte;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_byte) ;
-     threshold = threshold + ((uint16_t)val_byte << 8);
- }
-
-
-
-
-
-
-  void setLightIntHighThreshold(uint16_t threshold)
-  {
-      uint8_t val_low;
-      uint8_t val_high;
-
-
-      val_low = threshold & 0x00FF;
-      val_high = (threshold & 0xFF00) >> 8;
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTL, val_low);
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_AIHTH, val_high) ;
-  }
-
-
-
-
-
-
-
- void getProximityIntLowThreshold(uint8_t &threshold)
- {
-     threshold = 0;
-
-
-     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PILT);
-
- }
-
-
-
-
-
-
- void setProximityIntLowThreshold(uint8_t threshold)
- {
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PILT, threshold) ;
- }
-# 1055 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
- void getProximityIntHighThreshold(uint8_t &threshold)
- {
-     threshold = 0;
-
-
-     threshold = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PIHT) ;
-
- }
-
-
-
-
-
-
- void setProximityIntHighThreshold(uint8_t threshold)
- {
-
-
-   I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PIHT, threshold) ;
- }
-
-
-
-
-
-
- uint8_t getAmbientLightIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     val = (val >> 4) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setAmbientLightIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE);
-
-
-     enable &= 0b00000001;
-     enable = enable << 4;
-     val &= 0b11101111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
- }
-
-
-
-
-
-
- uint8_t getProximityIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     val = (val >> 5) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setProximityIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 5;
-     val &= 0b11011111;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, val) ;
- }
-
-
-
-
-
-
- uint8_t getGestureIntEnable(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     val = (val >> 1) & 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureIntEnable(uint8_t enable)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     enable &= 0b00000001;
-     enable = enable << 1;
-     val &= 0b11111101;
-     val |= enable;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
- }
-
-
-
-
-
- void clearAmbientLightInt(void)
- {
-     uint8_t throwaway;
-     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_AICLEAR);
- }
-
-
-
-
-
- void clearProximityInt(void)
- {
-     uint8_t throwaway;
-     throwaway = I2cRead8(APDS9960_I2C_ADDR, APDS9960_PICLEAR) ;
-
- }
-
-
-
-
-
-
- uint8_t getGestureMode(void)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     val &= 0b00000001;
-
-     return val;
- }
-
-
-
-
-
-
- void setGestureMode(uint8_t mode)
- {
-     uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GCONF4) ;
-
-
-     mode &= 0b00000001;
-     val &= 0b11111110;
-     val |= mode;
-
-
-     I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF4, val) ;
- }
-
-
-bool APDS9960_init(void)
-{
-
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, DEFAULT_ATIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, DEFAULT_WTIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_PROX_PPULSE) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_UR, DEFAULT_POFFSET_UR) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_POFFSET_DL, DEFAULT_POFFSET_DL) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG1, DEFAULT_CONFIG1) ;
-
-    setLEDDrive(DEFAULT_LDRIVE);
-
-    setProximityGain(DEFAULT_PGAIN);
-
-    setAmbientLightGain(DEFAULT_AGAIN);
-
-    setProxIntLowThresh(DEFAULT_PILT) ;
-
-    setProxIntHighThresh(DEFAULT_PIHT);
-
-    setLightIntLowThreshold(DEFAULT_AILT) ;
-
-    setLightIntHighThreshold(DEFAULT_AIHT) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PERS, DEFAULT_PERS) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG2, DEFAULT_CONFIG2) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_CONFIG3, DEFAULT_CONFIG3) ;
-
-
-    setGestureEnterThresh(DEFAULT_GPENTH);
-
-    setGestureExitThresh(DEFAULT_GEXTH) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF1, DEFAULT_GCONF1) ;
-
-    setGestureGain(DEFAULT_GGAIN) ;
-
-    setGestureLEDDrive(DEFAULT_GLDRIVE) ;
-
-    setGestureWaitTime(DEFAULT_GWTIME) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_U, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_D, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_L, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GOFFSET_R, DEFAULT_GOFFSET) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GPULSE, DEFAULT_GPULSE) ;
-
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_GCONF3, DEFAULT_GCONF3) ;
-
-    setGestureIntEnable(DEFAULT_GIEN);
-
-    disablePower();
-
-    return true;
-}
-# 1333 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-uint8_t getMode(void)
-{
-    uint8_t enable_value;
-
-
-     enable_value = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ENABLE) ;
-
-    return enable_value;
-}
-
-
-
-
-
-
-
-void setMode(uint8_t mode, uint8_t enable)
-{
-    uint8_t reg_val;
-
-
-    reg_val = getMode();
-
-
-
-    enable = enable & 0x01;
-    if( mode >= 0 && mode <= 6 ) {
-        if (enable) {
-            reg_val |= (1 << mode);
-        } else {
-            reg_val &= ~(1 << mode);
-        }
-    } else if( mode == ALL ) {
-        if (enable) {
-            reg_val = 0x7F;
-        } else {
-            reg_val = 0x00;
-        }
-    }
-
-
-      I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ENABLE, reg_val) ;
-}
-
-
-
-
-
-
-void enableLightSensor(void)
-{
-
-    setAmbientLightGain(DEFAULT_AGAIN);
-    setAmbientLightIntEnable(0);
-    enablePower() ;
-    setMode(AMBIENT_LIGHT, 1) ;
-}
-
-
-
-
-
-void disableLightSensor(void)
-{
-    setAmbientLightIntEnable(0) ;
-    setMode(AMBIENT_LIGHT, 0) ;
-}
-
-
-
-
-
-
-void enableProximitySensor(void)
-{
-
-    setProximityGain(DEFAULT_PGAIN);
-    setLEDDrive(DEFAULT_LDRIVE) ;
-    setProximityIntEnable(0) ;
-    enablePower();
-    setMode(PROXIMITY, 1) ;
-}
-
-
-
-
-
-void disableProximitySensor(void)
-{
- setProximityIntEnable(0) ;
-  setMode(PROXIMITY, 0) ;
-}
-
-
-
-
-
-
-void enableGestureSensor(void)
-{
-
-
-
-
-
-
-
-    resetGestureParameters();
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_WTIME, 0xFF) ;
-    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_PPULSE, DEFAULT_GESTURE_PPULSE) ;
-    setLEDBoost(LED_BOOST_100);
-    setGestureIntEnable(0) ;
-    setGestureMode(1);
-    enablePower() ;
-    setMode(WAIT, 1) ;
-    setMode(PROXIMITY, 1) ;
-    setMode(GESTURE, 1);
-}
-
-
-
-
-
-void disableGestureSensor(void)
-{
-    resetGestureParameters();
-    setGestureIntEnable(0) ;
-    setGestureMode(0) ;
-    setMode(GESTURE, 0) ;
-}
-
-
-
-
-
-
-bool isGestureAvailable(void)
-{
-    uint8_t val;
-
-
-     val = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS) ;
-
-
-    val &= APDS9960_GVALID;
-
-
-    if( val == 1) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-
-
-
-
-
-int16_t readGesture(void)
-{
-    uint8_t fifo_level = 0;
-    uint8_t bytes_read = 0;
-    uint8_t fifo_data[128];
-    uint8_t gstatus;
-    uint16_t motion;
-    uint16_t i;
-    uint8_t gesture_loop_counter = 0;
-
-
-    if( !isGestureAvailable() || !(getMode() & 0b01000001) ) {
-        return DIR_NONE;
-    }
-
-
-    while(1) {
-        if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){
-          disableGestureSensor();
-          APDS9960_overload = true;
-          AddLog_P(LOG_LEVEL_DEBUG, PSTR("Sensor overload"));
-        }
-        gesture_loop_counter += 1;
-
-        delay(FIFO_PAUSE_TIME);
-
-
-       gstatus = I2cRead8(APDS9960_I2C_ADDR, APDS9960_GSTATUS);
-
-
-        if( (gstatus & APDS9960_GVALID) == APDS9960_GVALID ) {
-
-
-            fifo_level = I2cRead8(APDS9960_I2C_ADDR,APDS9960_GFLVL) ;
-
-
-            if( fifo_level > 0) {
-                bytes_read = wireReadDataBlock( APDS9960_GFIFO_U,
-                                                (uint8_t*)fifo_data,
-                                                (fifo_level * 4) );
-                if( bytes_read == -1 ) {
-                    return ERROR;
-                }
-
-
-                if( bytes_read >= 4 ) {
-                    for( i = 0; i < bytes_read; i += 4 ) {
-                        gesture_data_.u_data[gesture_data_.index] = \
-                                                            fifo_data[i + 0];
-                        gesture_data_.d_data[gesture_data_.index] = \
-                                                            fifo_data[i + 1];
-                        gesture_data_.l_data[gesture_data_.index] = \
-                                                            fifo_data[i + 2];
-                        gesture_data_.r_data[gesture_data_.index] = \
-                                                            fifo_data[i + 3];
-                        gesture_data_.index++;
-                        gesture_data_.total_gestures++;
-                    }
-
-                    if( processGestureData() ) {
-                        if( decodeGesture() ) {
-
-                        }
-                    }
-
-                    gesture_data_.index = 0;
-                    gesture_data_.total_gestures = 0;
-                }
-            }
-        } else {
-
-
-            delay(FIFO_PAUSE_TIME);
-            decodeGesture();
-            motion = gesture_motion_;
-            resetGestureParameters();
-            return motion;
-        }
-    }
-}
-
-
-
-
-
-void enablePower(void)
-{
-    setMode(POWER, 1) ;
-}
-
-
-
-
-
-void disablePower(void)
-{
-    setMode(POWER, 0) ;
-}
-# 1600 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-void readAllColorAndProximityData(void)
-{
-  if (I2cReadBuffer(APDS9960_I2C_ADDR, APDS9960_CDATAL, (uint8_t *) &color_data, (uint16_t)9))
-  {
-
-
-  }
-}
-# 1616 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-void resetGestureParameters(void)
-{
-    gesture_data_.index = 0;
-    gesture_data_.total_gestures = 0;
-
-    gesture_ud_delta_ = 0;
-    gesture_lr_delta_ = 0;
-
-    gesture_ud_count_ = 0;
-    gesture_lr_count_ = 0;
-
-    gesture_state_ = 0;
-    gesture_motion_ = DIR_NONE;
-}
-
-
-
-
-
-
-bool processGestureData(void)
-{
-    uint8_t u_first = 0;
-    uint8_t d_first = 0;
-    uint8_t l_first = 0;
-    uint8_t r_first = 0;
-    uint8_t u_last = 0;
-    uint8_t d_last = 0;
-    uint8_t l_last = 0;
-    uint8_t r_last = 0;
-    uint16_t ud_ratio_first;
-    uint16_t lr_ratio_first;
-    uint16_t ud_ratio_last;
-    uint16_t lr_ratio_last;
-    uint16_t ud_delta;
-    uint16_t lr_delta;
-    uint16_t i;
-
-
-    if( gesture_data_.total_gestures <= 4 ) {
-        return false;
-    }
-
-
-    if( (gesture_data_.total_gestures <= 32) && \
-        (gesture_data_.total_gestures > 0) ) {
-
-
-        for( i = 0; i < gesture_data_.total_gestures; i++ ) {
-            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
-
-                u_first = gesture_data_.u_data[i];
-                d_first = gesture_data_.d_data[i];
-                l_first = gesture_data_.l_data[i];
-                r_first = gesture_data_.r_data[i];
-                break;
-            }
-        }
-
-
-        if( (u_first == 0) || (d_first == 0) || \
-            (l_first == 0) || (r_first == 0) ) {
-
-            return false;
-        }
-
-        for( i = gesture_data_.total_gestures - 1; i >= 0; i-- ) {
-
-            if( (gesture_data_.u_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.d_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.l_data[i] > GESTURE_THRESHOLD_OUT) &&
-                (gesture_data_.r_data[i] > GESTURE_THRESHOLD_OUT) ) {
-
-                u_last = gesture_data_.u_data[i];
-                d_last = gesture_data_.d_data[i];
-                l_last = gesture_data_.l_data[i];
-                r_last = gesture_data_.r_data[i];
-                break;
-            }
-        }
-    }
-
-
-    ud_ratio_first = ((u_first - d_first) * 100) / (u_first + d_first);
-    lr_ratio_first = ((l_first - r_first) * 100) / (l_first + r_first);
-    ud_ratio_last = ((u_last - d_last) * 100) / (u_last + d_last);
-    lr_ratio_last = ((l_last - r_last) * 100) / (l_last + r_last);
-
-
-    ud_delta = ud_ratio_last - ud_ratio_first;
-    lr_delta = lr_ratio_last - lr_ratio_first;
-
-
-    gesture_ud_delta_ += ud_delta;
-    gesture_lr_delta_ += lr_delta;
-
-
-    if( gesture_ud_delta_ >= GESTURE_SENSITIVITY_1 ) {
-        gesture_ud_count_ = 1;
-    } else if( gesture_ud_delta_ <= -GESTURE_SENSITIVITY_1 ) {
-        gesture_ud_count_ = -1;
-    } else {
-        gesture_ud_count_ = 0;
-    }
-
-
-    if( gesture_lr_delta_ >= GESTURE_SENSITIVITY_1 ) {
-        gesture_lr_count_ = 1;
-    } else if( gesture_lr_delta_ <= -GESTURE_SENSITIVITY_1 ) {
-        gesture_lr_count_ = -1;
-    } else {
-        gesture_lr_count_ = 0;
-    }
-    return false;
-}
-
-
-
-
-
-
-bool decodeGesture(void)
-{
-
-
-    if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 0) ) {
-        gesture_motion_ = DIR_UP;
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 0) ) {
-        gesture_motion_ = DIR_DOWN;
-    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == 1) ) {
-        gesture_motion_ = DIR_RIGHT;
-    } else if( (gesture_ud_count_ == 0) && (gesture_lr_count_ == -1) ) {
-        gesture_motion_ = DIR_LEFT;
-    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == 1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_UP;
-        } else {
-            gesture_motion_ = DIR_RIGHT;
-        }
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == -1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_DOWN;
-        } else {
-            gesture_motion_ = DIR_LEFT;
-        }
-    } else if( (gesture_ud_count_ == -1) && (gesture_lr_count_ == -1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_UP;
-        } else {
-            gesture_motion_ = DIR_LEFT;
-        }
-    } else if( (gesture_ud_count_ == 1) && (gesture_lr_count_ == 1) ) {
-        if( abs(gesture_ud_delta_) > abs(gesture_lr_delta_) ) {
-            gesture_motion_ = DIR_DOWN;
-        } else {
-            gesture_motion_ = DIR_RIGHT;
-        }
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
-void handleGesture(void) {
-    if (isGestureAvailable() ) {
-    switch (readGesture()) {
-      case DIR_UP:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("UP"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up"));
-        break;
-      case DIR_DOWN:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("DOWN"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down"));
-        break;
-      case DIR_LEFT:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LEFT"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
-        break;
-      case DIR_RIGHT:
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("RIGHT"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
-        break;
-      default:
-      if(APDS9960_overload)
-      {
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("LONG"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
-      }
-      else{
-        AddLog_P(LOG_LEVEL_DEBUG, PSTR("NONE"));
-        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
-      }
-    }
-    MqttPublishSensor();
-  }
-}
-
-void APDS9960_adjustATime(void)
-{
-
-  I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);
-
-
-  if (color_data.a < (uint16_t)20){
-    APDS9960_aTime = 0x40;
-  }
-  else if (color_data.a < (uint16_t)40){
-    APDS9960_aTime = 0x80;
-  }
-  else if (color_data.a < (uint16_t)50){
-    APDS9960_aTime = DEFAULT_ATIME;
-  }
-  else if (color_data.a < (uint16_t)70){
-    APDS9960_aTime = 0xc0;
-  }
-  if (color_data.a < 200){
-    APDS9960_aTime = 0xe9;
-  }
-
-
-
-  else{
-    APDS9960_aTime = 0xff;
-  }
-
-
-  I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, APDS9960_aTime);
-  enablePower();
-  enableLightSensor();
-  delay(20);
-}
-
-
-void APDS9960_loop(void)
-{
-  if (recovery_loop_counter > 0){
-    recovery_loop_counter -= 1;
-  }
-  if (recovery_loop_counter == 1 && APDS9960_overload){
-    enableGestureSensor();
-    APDS9960_overload = false;
-    Response_P(PSTR("{\"Gesture\":\"On\"}"));
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-    gesture_mode = 1;
-  }
-
-  if (gesture_mode) {
-      if (recovery_loop_counter == 0){
-      handleGesture();
-
-        if (APDS9960_overload)
-        {
-        disableGestureSensor();
-        recovery_loop_counter = APDS9960_LONG_RECOVERY;
-        Response_P(PSTR("{\"Gesture\":\"Off\"}"));
-        MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
-        gesture_mode = 0;
-        }
-      }
-  }
-}
-
-void APDS9960_detect(void)
-{
-  if (APDS9960type || I2cActive(APDS9960_I2C_ADDR)) { return; }
-
-  APDS9960type = I2cRead8(APDS9960_I2C_ADDR, APDS9960_ID);
-  if (APDS9960type == APDS9960_CHIPID_1 || APDS9960type == APDS9960_CHIPID_2) {
-    if (APDS9960_init()) {
-      I2cSetActiveFound(APDS9960_I2C_ADDR, APDS9960stype);
-
-      enableProximitySensor();
-      enableGestureSensor();
-    } else {
-      APDS9960type = 0;
-    }
-  } else {
-    APDS9960type = 0;
-  }
-  currentGesture[0] = '\0';
-}
-
-
-
-
-
-void APDS9960_show(bool json)
-{
-  if (!APDS9960type) { return; }
-
-  if (!gesture_mode && !APDS9960_overload) {
-    char red_chr[10];
-    char green_chr[10];
-    char blue_chr[10];
-    char ambient_chr[10];
-    char cct_chr[10];
-    char prox_chr[10];
-
-    readAllColorAndProximityData();
-
-    sprintf (ambient_chr, "%u", color_data.a/4);
-    sprintf (red_chr, "%u", color_data.r);
-    sprintf (green_chr, "%u", color_data.g);
-    sprintf (blue_chr, "%u", color_data.b );
-    sprintf (prox_chr, "%u", color_data.p );
-
-
-
-
-
-    calculateColorTemperature();
-    sprintf (cct_chr, "%u", color_data.cct);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"CCT\":%s,\"Proximity\":%s}"),
-        APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr);
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_APDS_9960_SNS, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr );
-#endif
-    }
-  }
-  else {
-    if (json && (currentGesture[0] != '\0' )) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":1}"), APDS9960stype, currentGesture);
-      currentGesture[0] = '\0';
-    }
-  }
-}
-# 1961 "S:/Development/Tasmota/tasmota/xsns_27_apds9960.ino"
-bool APDS9960CommandSensor(void)
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      disableGestureSensor();
-      gesture_mode = 0;
-      enableLightSensor();
-      APDS9960_overload = false;
-      break;
-    case 1:
-      if (APDS9960type) {
-        setGestureGain(DEFAULT_GGAIN);
-        setProximityGain(DEFAULT_PGAIN);
-        disableLightSensor();
-        enableGestureSensor();
-        gesture_mode = 1;
-      }
-      break;
-    case 2:
-      if (APDS9960type) {
-        setGestureGain(GGAIN_2X);
-        setProximityGain(PGAIN_2X);
-        disableLightSensor();
-        enableGestureSensor();
-        gesture_mode = 1;
-      }
-      break;
-    default:
-      int temp_aTime = (uint8_t)XdrvMailbox.payload;
-      if (temp_aTime > 2 && temp_aTime < 256){
-        disablePower();
-        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, temp_aTime);
-        enablePower();
-        enableLightSensor();
-      }
-    break;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_27, GetStateText(gesture_mode));
-
-  return serviced;
-}
-
-
-
-
-
-bool Xsns27(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_21)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    APDS9960_detect();
-  }
-  else if (APDS9960type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-          APDS9960_loop();
-          break;
-      case FUNC_COMMAND_SENSOR:
-          if (XSNS_27 == XdrvMailbox.index) {
-          result = APDS9960CommandSensor();
-          }
-          break;
-      case FUNC_JSON_APPEND:
-          APDS9960_show(1);
-          break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        APDS9960_show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
-#ifdef USE_TM1638
-
-
-
-
-
-
-#define XSNS_28 28
-
-#define TM1638_COLOR_NONE 0
-#define TM1638_COLOR_RED 1
-#define TM1638_COLOR_GREEN 2
-
-#define TM1638_CLOCK_DELAY 1
-
-uint8_t tm1638_type = 1;
-uint8_t tm1638_clock_pin = 0;
-uint8_t tm1638_data_pin = 0;
-uint8_t tm1638_strobe_pin = 0;
-uint8_t tm1638_displays = 8;
-uint8_t tm1638_active_display = 1;
-uint8_t tm1638_intensity = 0;
-uint8_t tm1638_state = 0;
-
-
-
-
-
-
-void Tm16XXSend(uint8_t data)
-{
- for (uint32_t i = 0; i < 8; i++) {
-    digitalWrite(tm1638_data_pin, !!(data & (1 << i)));
-    digitalWrite(tm1638_clock_pin, LOW);
-    delayMicroseconds(TM1638_CLOCK_DELAY);
-    digitalWrite(tm1638_clock_pin, HIGH);
-  }
-}
-
-void Tm16XXSendCommand(uint8_t cmd)
-{
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(cmd);
-  digitalWrite(tm1638_strobe_pin, HIGH);
-}
-
-void TM16XXSendData(uint8_t address, uint8_t data)
-{
-  Tm16XXSendCommand(0x44);
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(0xC0 | address);
-  Tm16XXSend(data);
-  digitalWrite(tm1638_strobe_pin, HIGH);
-}
-
-uint8_t Tm16XXReceive(void)
-{
-  uint8_t temp = 0;
-
-
-  pinMode(tm1638_data_pin, INPUT);
-  digitalWrite(tm1638_data_pin, HIGH);
-
-  for (uint32_t i = 0; i < 8; ++i) {
-    digitalWrite(tm1638_clock_pin, LOW);
-    delayMicroseconds(TM1638_CLOCK_DELAY);
-    temp |= digitalRead(tm1638_data_pin) << i;
-    digitalWrite(tm1638_clock_pin, HIGH);
-  }
-
-
-  pinMode(tm1638_data_pin, OUTPUT);
-  digitalWrite(tm1638_data_pin, LOW);
-
-  return temp;
-}
-
-
-
-void Tm16XXClearDisplay(void)
-{
-  for (uint32_t i = 0; i < tm1638_displays; i++) {
-    TM16XXSendData(i << 1, 0);
-  }
-}
-
-void Tm1638SetLED(uint8_t color, uint8_t pos)
-{
-  TM16XXSendData((pos << 1) + 1, color);
-}
-
-void Tm1638SetLEDs(word leds)
-{
-  for (uint32_t i = 0; i < tm1638_displays; i++) {
-    uint8_t color = 0;
-
-    if ((leds & (1 << i)) != 0) {
-      color |= TM1638_COLOR_RED;
-    }
-
-    if ((leds & (1 << (i + 8))) != 0) {
-      color |= TM1638_COLOR_GREEN;
-    }
-
-    Tm1638SetLED(color, i);
-  }
-}
-
-uint8_t Tm1638GetButtons(void)
-{
-  uint8_t keys = 0;
-
-  digitalWrite(tm1638_strobe_pin, LOW);
-  Tm16XXSend(0x42);
-  for (uint32_t i = 0; i < 4; i++) {
-    keys |= Tm16XXReceive() << i;
-  }
-  digitalWrite(tm1638_strobe_pin, HIGH);
-
-  return keys;
-}
-
-
-
-void TmInit(void)
-{
-  tm1638_type = 0;
-  if ((pin[GPIO_TM16CLK] < 99) && (pin[GPIO_TM16DIO] < 99) && (pin[GPIO_TM16STB] < 99)) {
-    tm1638_clock_pin = pin[GPIO_TM16CLK];
-    tm1638_data_pin = pin[GPIO_TM16DIO];
-    tm1638_strobe_pin = pin[GPIO_TM16STB];
-
-    pinMode(tm1638_data_pin, OUTPUT);
-    pinMode(tm1638_clock_pin, OUTPUT);
-    pinMode(tm1638_strobe_pin, OUTPUT);
-
-    digitalWrite(tm1638_strobe_pin, HIGH);
-    digitalWrite(tm1638_clock_pin, HIGH);
-
-    Tm16XXSendCommand(0x40);
-    Tm16XXSendCommand(0x80 | (tm1638_active_display ? 8 : 0) | tmin(7, tm1638_intensity));
-
-    digitalWrite(tm1638_strobe_pin, LOW);
-    Tm16XXSend(0xC0);
-    for (uint32_t i = 0; i < 16; i++) {
-      Tm16XXSend(0x00);
-    }
-    digitalWrite(tm1638_strobe_pin, HIGH);
-
-    tm1638_type = 1;
-    tm1638_state = 1;
-  }
-}
-
-void TmLoop(void)
-{
-  if (tm1638_state) {
-    uint8_t buttons = Tm1638GetButtons();
-    for (uint32_t i = 0; i < MAX_SWITCHES; i++) {
-      SwitchSetVirtual(i, (buttons &1) ^1);
-      uint8_t color = (SwitchGetVirtual(i)) ? TM1638_COLOR_NONE : TM1638_COLOR_RED;
-      Tm1638SetLED(color, i);
-      buttons >>= 1;
-    }
-    SwitchHandler(1);
-  }
-}
-# 201 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
-bool Xsns28(uint8_t function)
-{
-  bool result = false;
-
-  if (tm1638_type) {
-    switch (function) {
-      case FUNC_INIT:
-        TmInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        TmLoop();
-        break;
-# 223 "S:/Development/Tasmota/tasmota/xsns_28_tm1638.ino"
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-#ifdef USE_I2C
-#ifdef USE_MCP230xx
-# 31 "S:/Development/Tasmota/tasmota/xsns_29_mcp230xx.ino"
-#define XSNS_29 29
-#define XI2C_22 22
-
-
-
-
-
-uint8_t MCP230xx_IODIR = 0x00;
-uint8_t MCP230xx_GPINTEN = 0x02;
-uint8_t MCP230xx_IOCON = 0x05;
-uint8_t MCP230xx_GPPU = 0x06;
-uint8_t MCP230xx_INTF = 0x07;
-uint8_t MCP230xx_INTCAP = 0x08;
-uint8_t MCP230xx_GPIO = 0x09;
-
-uint8_t mcp230xx_type = 0;
-uint8_t mcp230xx_pincount = 0;
-uint8_t mcp230xx_int_en = 0;
-uint8_t mcp230xx_int_prio_counter = 0;
-uint8_t mcp230xx_int_counter_en = 0;
-uint8_t mcp230xx_int_retainer_en = 0;
-uint8_t mcp230xx_int_sec_counter = 0;
-
-uint8_t mcp230xx_int_report_defer_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-uint16_t mcp230xx_int_counter[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-uint8_t mcp230xx_int_retainer[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-unsigned long int_millis[16];
-
-const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL_UP\":\"%s\",\"INT_MODE\":\"%s\",\"STATE\":\"%s\"}}";
-
-const char MCP230XX_INTCFG_RESPONSE[] PROGMEM = "{\"MCP230xx_INT%s\":{\"D_%i\":%i}}";
-
-#ifdef USE_MCP230xx_OUTPUT
-const char MCP230XX_CMND_RESPONSE[] PROGMEM = "{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"}}";
-#endif
-
-void MCP230xx_CheckForIntCounter(void) {
-  uint8_t en = 0;
-  for (uint32_t ca=0;ca<16;ca++) {
-    if (Settings.mcp230xx_config[ca].int_count_en) {
-      en=1;
-    }
-  }
-  if (!Settings.mcp230xx_int_timer) en=0;
-  mcp230xx_int_counter_en=en;
-  if (!mcp230xx_int_counter_en) {
-    for (uint32_t ca=0;ca<16;ca++) {
-      mcp230xx_int_counter[ca] = 0;
-    }
-  }
-}
-
-void MCP230xx_CheckForIntRetainer(void) {
-  uint8_t en = 0;
-  for (uint32_t ca=0;ca<16;ca++) {
-    if (Settings.mcp230xx_config[ca].int_retain_flag) {
-      en=1;
-    }
-  }
-  mcp230xx_int_retainer_en=en;
-  if (!mcp230xx_int_retainer_en) {
-    for (uint32_t ca=0;ca<16;ca++) {
-      mcp230xx_int_retainer[ca] = 0;
-    }
-  }
-}
-
-const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) {
-#ifdef USE_MCP230xx_OUTPUT
-if ((6 == pinmod) && (statu < 2)) { statu = abs(statu-1); }
-#endif
-  switch (statu) {
-    case 0:
-      return "OFF";
-      break;
-    case 1:
-      return "ON";
-      break;
-#ifdef USE_MCP230xx_OUTPUT
-    case 2:
-      return "TOGGLE";
-      break;
-#endif
-  }
-  return "";
-}
-
-const char* IntModeTxt(uint8_t intmo) {
-  switch (intmo) {
-    case 0:
-      return "ALL";
-      break;
-    case 1:
-      return "EVENT";
-      break;
-    case 2:
-      return "TELE";
-      break;
-    case 3:
-      return "DISABLED";
-      break;
-  }
-  return "";
-}
-
-uint8_t MCP230xx_readGPIO(uint8_t port) {
-  return I2cRead8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port);
-}
-
-void MCP230xx_ApplySettings(void)
-{
-  uint8_t int_en = 0;
-  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
-    uint8_t reg_gppu = 0;
-    uint8_t reg_gpinten = 0;
-    uint8_t reg_iodir = 0xFF;
-#ifdef USE_MCP230xx_OUTPUT
-    uint8_t reg_portpins = 0x00;
-#endif
-    for (uint32_t idx = 0; idx < 8; idx++) {
-      switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) {
-        case 0 ... 1:
-          reg_iodir |= (1 << idx);
-          break;
-        case 2 ... 4:
-          reg_iodir |= (1 << idx);
-          reg_gpinten |= (1 << idx);
-          int_en = 1;
-          break;
-#ifdef USE_MCP230xx_OUTPUT
-        case 5 ... 6:
-          reg_iodir &= ~(1 << idx);
-          if (Settings.flag.save_state) {
-            reg_portpins |= (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].saved_state << idx);
-          } else {
-            if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
-              reg_portpins |= (1 << idx);
-            }
-          }
-          break;
-#endif
-        default:
-          break;
-      }
-#ifdef USE_MCP230xx_OUTPUT
-      if ((Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) {
-        reg_gppu |= (1 << idx);
-      }
-#else
-      if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
-        reg_gppu |= (1 << idx);
-      }
-#endif
-    }
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPPU+mcp230xx_port, reg_gppu);
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten);
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IODIR+mcp230xx_port, reg_iodir);
-#ifdef USE_MCP230xx_OUTPUT
-    I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO+mcp230xx_port, reg_portpins);
-#endif
-  }
-  for (uint32_t idx=0;idx<mcp230xx_pincount;idx++) {
-    int_millis[idx]=millis();
-  }
-  mcp230xx_int_en = int_en;
-  MCP230xx_CheckForIntCounter();
-  MCP230xx_CheckForIntRetainer();
-}
-
-void MCP230xx_Detect(void)
-{
-  if (I2cActive(USE_MCP230xx_ADDR)) { return; }
-
-  uint8_t buffer;
-
-  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x80);
-  if (I2cValidRead8(&buffer, USE_MCP230xx_ADDR, MCP230xx_IOCON)) {
-    if (0x00 == buffer) {
-      mcp230xx_type = 1;
-      I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23008");
-      mcp230xx_pincount = 8;
-      MCP230xx_ApplySettings();
-    } else {
-      if (0x80 == buffer) {
-        mcp230xx_type = 2;
-        I2cSetActiveFound(USE_MCP230xx_ADDR, "MCP23017");
-        mcp230xx_pincount = 16;
-
-        I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_IOCON, 0x00);
-
-        MCP230xx_GPINTEN = 0x04;
-        MCP230xx_GPPU = 0x0C;
-        MCP230xx_INTF = 0x0E;
-        MCP230xx_INTCAP = 0x10;
-        MCP230xx_GPIO = 0x12;
-        MCP230xx_ApplySettings();
-      }
-    }
-  }
-}
-
-void MCP230xx_CheckForInterrupt(void) {
-  uint8_t intf;
-  uint8_t mcp230xx_intcap = 0;
-  uint8_t report_int;
-  for (uint32_t mcp230xx_port = 0; mcp230xx_port < mcp230xx_type; mcp230xx_port++) {
-    if (I2cValidRead8(&intf,USE_MCP230xx_ADDR,MCP230xx_INTF+mcp230xx_port)) {
-      if (intf > 0) {
-        if (I2cValidRead8(&mcp230xx_intcap, USE_MCP230xx_ADDR, MCP230xx_INTCAP+mcp230xx_port)) {
-          for (uint32_t intp = 0; intp < 8; intp++) {
-            if ((intf >> intp) & 0x01) {
-              report_int = 0;
-              if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode > 1) {
-                switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].pinmode) {
-                  case 2:
-                    report_int = 1;
-                    break;
-                  case 3:
-                    if (((mcp230xx_intcap >> intp) & 0x01) == 0) report_int = 1;
-                    break;
-                  case 4:
-                    if (((mcp230xx_intcap >> intp) & 0x01) == 1) report_int = 1;
-                    break;
-                  default:
-                    break;
-                }
-
-                if ((mcp230xx_int_counter_en) && (report_int)) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
-                    mcp230xx_int_counter[intp+(mcp230xx_port*8)]++;
-                  }
-                }
-
-                if (report_int) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
-                    mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]++;
-                    if (mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)] >= Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_defer) {
-                      mcp230xx_int_report_defer_counter[intp+(mcp230xx_port*8)]=0;
-                    } else {
-                      report_int = 0;
-                    }
-                  }
-                }
-
-                if (report_int) {
-                  if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_retain_flag) {
-                    mcp230xx_int_retainer[intp+(mcp230xx_port*8)] = 1;
-                    report_int = 0;
-                  }
-                }
-                if (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_count_en) {
-                  report_int = 0;
-                }
-                if (report_int) {
-                  bool int_tele = false;
-                  bool int_event = false;
-                  unsigned long millis_now = millis();
-                  unsigned long millis_since_last_int = millis_now - int_millis[intp+(mcp230xx_port*8)];
-                  int_millis[intp+(mcp230xx_port*8)]=millis_now;
-                  switch (Settings.mcp230xx_config[intp+(mcp230xx_port*8)].int_report_mode) {
-                    case 0:
-                      int_tele=true;
-                      int_event=true;
-                      break;
-                    case 1:
-                      int_event=true;
-                      break;
-                    case 2:
-                      int_tele=true;
-                      break;
-                  }
-                  if (int_tele) {
-                    ResponseTime_P(PSTR(",\"MCP230XX_INT\":{\"D%i\":%i,\"MS\":%lu}}"),
-                      intp+(mcp230xx_port*8), ((mcp230xx_intcap >> intp) & 0x01),millis_since_last_int);
-                    MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("MCP230XX_INT"));
-                  }
-                  if (int_event) {
-                    char command[19];
-                    sprintf(command,"event MCPINT_D%i=%i",intp+(mcp230xx_port*8),((mcp230xx_intcap >> intp) & 0x01));
-                    ExecuteCommand(command, SRC_RULE);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-void MCP230xx_Show(bool json)
-{
-  if (json) {
-    uint8_t gpio = MCP230xx_readGPIO(0);
-    ResponseAppend_P(PSTR(",\"MCP230XX\":{\"D0\":%i,\"D1\":%i,\"D2\":%i,\"D3\":%i,\"D4\":%i,\"D5\":%i,\"D6\":%i,\"D7\":%i"),
-                (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
-    if (2 == mcp230xx_type) {
-      gpio = MCP230xx_readGPIO(1);
-      ResponseAppend_P(PSTR(",\"D8\":%i,\"D9\":%i,\"D10\":%i,\"D11\":%i,\"D12\":%i,\"D13\":%i,\"D14\":%i,\"D15\":%i"),
-                  (gpio>>0)&1,(gpio>>1)&1,(gpio>>2)&1,(gpio>>3)&1,(gpio>>4)&1,(gpio>>5)&1,(gpio>>6)&1,(gpio>>7)&1);
-    }
-    ResponseJsonEnd();
-  }
-}
-
-#ifdef USE_MCP230xx_OUTPUT
-
-void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
-  uint8_t portpins;
-  uint8_t port = 0;
-  uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode;
-  uint8_t interlock = Settings.flag.interlock;
-  int pinadd = (pin % 2)+1-(3*(pin % 2));
-  char cmnd[7], stt[4];
-  if (pin > 7) { port = 1; }
-  portpins = MCP230xx_readGPIO(port);
-  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
-    if (pinstate < 2) {
-      if (6 == pinmo) {
-        if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins |= (1 << (pin+pinadd-(port*8))),portpins &= ~(1 << (pin-(port*8)));
-      } else {
-        if (pinstate) portpins &= ~(1 << (pin+pinadd-(port*8))),portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
-      }
-    } else {
-      if (6 == pinmo) {
-      portpins |= (1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
-      } else {
-      portpins &= ~(1 << (pin+pinadd-(port*8))),portpins ^= (1 << (pin-(port*8)));
-      }
-    }
-  } else {
-    if (pinstate < 2) {
-      if (pinstate) portpins |= (1 << (pin-(port*8))); else portpins &= ~(1 << (pin-(port*8)));
-    } else {
-      portpins ^= (1 << (pin-(port*8)));
-    }
-  }
-  I2cWrite8(USE_MCP230xx_ADDR, MCP230xx_GPIO + port, portpins);
-  if (Settings.flag.save_state) {
-    Settings.mcp230xx_config[pin].saved_state=portpins>>(pin-(port*8))&1;
-    Settings.mcp230xx_config[pin+pinadd].saved_state=portpins>>(pin+pinadd-(port*8))&1;
-  }
-  sprintf(cmnd,ConvertNumTxt(pinstate, pinmo));
-  sprintf(stt,ConvertNumTxt((portpins >> (pin-(port*8))&1), pinmo));
-  if (interlock && (pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode)) {
-    char stt1[4];
-    sprintf(stt1,ConvertNumTxt((portpins >> (pin+pinadd-(port*8))&1), pinmo));
-    Response_P(PSTR("{\"S29cmnd_D%i\":{\"COMMAND\":\"%s\",\"STATE\":\"%s\"},\"S29cmnd_D%i\":{\"STATE\":\"%s\"}}"),pin, cmnd, stt, pin+pinadd, stt1);
-  } else {
-    Response_P(MCP230XX_CMND_RESPONSE, pin, cmnd, stt);
-  }
-}
-
-#endif
-
-void MCP230xx_Reset(uint8_t pinmode) {
-  uint8_t pullup = 0;
-  if ((pinmode > 1) && (pinmode < 5)) { pullup=1; }
-  for (uint32_t pinx=0;pinx<16;pinx++) {
-    Settings.mcp230xx_config[pinx].pinmode=pinmode;
-    Settings.mcp230xx_config[pinx].pullup=pullup;
-    Settings.mcp230xx_config[pinx].saved_state=0;
-    if ((pinmode > 1) && (pinmode < 5)) {
-      Settings.mcp230xx_config[pinx].int_report_mode=0;
-    } else {
-      Settings.mcp230xx_config[pinx].int_report_mode=3;
-    }
-    Settings.mcp230xx_config[pinx].int_report_defer=0;
-    Settings.mcp230xx_config[pinx].int_count_en=0;
-    Settings.mcp230xx_config[pinx].int_retain_flag=0;
-    Settings.mcp230xx_config[pinx].spare13=0;
-    Settings.mcp230xx_config[pinx].spare14=0;
-    Settings.mcp230xx_config[pinx].spare15=0;
-  }
-  Settings.mcp230xx_int_prio = 0;
-  Settings.mcp230xx_int_timer = 0;
-  MCP230xx_ApplySettings();
-  char pulluptxt[7];
-  char intmodetxt[9];
-  sprintf(pulluptxt,ConvertNumTxt(pullup));
-  uint8_t intmode = 3;
-  if ((pinmode > 1) && (pinmode < 5)) { intmode = 0; }
-  sprintf(intmodetxt,IntModeTxt(intmode));
-  Response_P(MCP230XX_SENSOR_RESPONSE,99,pinmode,pulluptxt,intmodetxt,"");
-}
-
-bool MCP230xx_Command(void)
-{
-  bool serviced = true;
-  bool validpin = false;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { MCP230xx_Reset(1); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET1")) { MCP230xx_Reset(1); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET2")) { MCP230xx_Reset(2); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET3")) { MCP230xx_Reset(3); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET4")) { MCP230xx_Reset(4); return serviced; }
-#ifdef USE_MCP230xx_OUTPUT
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET5")) { MCP230xx_Reset(5); return serviced; }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET6")) { MCP230xx_Reset(6); return serviced; }
-#endif
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTPRI")) {
-    if (paramcount > 1) {
-      uint8_t intpri = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((intpri >= 0) && (intpri <= 20)) {
-        Settings.mcp230xx_int_prio = intpri;
-        Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
-        return serviced;
-      }
-    } else {
-      Response_P(MCP230XX_INTCFG_RESPONSE,"PRI",99,Settings.mcp230xx_int_prio);
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTTIMER")) {
-    if (paramcount > 1) {
-      uint8_t inttim = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if ((inttim >= 0) && (inttim <= 3600)) {
-        Settings.mcp230xx_int_timer = inttim;
-        MCP230xx_CheckForIntCounter();
-        Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
-        return serviced;
-      }
-    } else {
-      Response_P(MCP230XX_INTCFG_RESPONSE,"TIMER",99,Settings.mcp230xx_int_timer);
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTDEF")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t intdef = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((intdef >= 0) && (intdef <= 15)) {
-            Settings.mcp230xx_config[pin].int_report_defer=intdef;
-            if (Settings.mcp230xx_config[pin].int_count_en) {
-              Settings.mcp230xx_config[pin].int_count_en=0;
-              MCP230xx_CheckForIntCounter();
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTCNT for pin D%i"),pin);
-            }
-            Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"DEF",pin,Settings.mcp230xx_config[pin].int_report_defer);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTCNT")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t intcnt = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((intcnt >= 0) && (intcnt <= 1)) {
-            Settings.mcp230xx_config[pin].int_count_en=intcnt;
-            if (Settings.mcp230xx_config[pin].int_report_defer) {
-              Settings.mcp230xx_config[pin].int_report_defer=0;
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled INTDEF for pin D%i"),pin);
-            }
-            if (Settings.mcp230xx_config[pin].int_report_mode < 3) {
-              Settings.mcp230xx_config[pin].int_report_mode=3;
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - Disabled immediate interrupt/telemetry reporting for pin D%i"),pin);
-            }
-            if ((Settings.mcp230xx_config[pin].int_count_en) && (!Settings.mcp230xx_int_timer)) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("*** WARNING *** - INTCNT enabled for pin D%i but global INTTIMER is disabled!"),pin);
-            }
-            MCP230xx_CheckForIntCounter();
-            Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"CNT",pin,Settings.mcp230xx_config[pin].int_count_en);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"INTRETAIN")) {
-    if (paramcount > 1) {
-      uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-      if (pin < mcp230xx_pincount) {
-        if (pin == 0) {
-          if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0")) validpin=true;
-        } else {
-          validpin = true;
-        }
-      }
-      if (validpin) {
-        if (paramcount > 2) {
-          uint8_t int_retain = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-          if ((int_retain >= 0) && (int_retain <= 1)) {
-            Settings.mcp230xx_config[pin].int_retain_flag=int_retain;
-            Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
-            MCP230xx_CheckForIntRetainer();
-            return serviced;
-          } else {
-            serviced=false;
-            return serviced;
-          }
-        } else {
-          Response_P(MCP230XX_INTCFG_RESPONSE,"INT_RETAIN",pin,Settings.mcp230xx_config[pin].int_retain_flag);
-          return serviced;
-        }
-      }
-      serviced = false;
-      return serviced;
-    } else {
-      serviced = false;
-      return serviced;
-    }
-  }
-
-  uint8_t pin = atoi(subStr(sub_string, XdrvMailbox.data, ",", 1));
-
-  if (pin < mcp230xx_pincount) {
-    if (0 == pin) {
-      if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1), "0")) validpin=true;
-    } else {
-      validpin=true;
-    }
-  }
-  if (validpin && (paramcount > 1)) {
-    if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "?")) {
-      uint8_t port = 0;
-      if (pin > 7) { port = 1; }
-      uint8_t portdata = MCP230xx_readGPIO(port);
-      char pulluptxtr[7],pinstatustxtr[7];
-      char intmodetxt[9];
-      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
-      sprintf(pulluptxtr,ConvertNumTxt(Settings.mcp230xx_config[pin].pullup));
-#ifdef USE_MCP230xx_OUTPUT
-      uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode;
-      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod));
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,intmodetxt,pinstatustxtr);
-#else
-      sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1));
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,intmodetxt,pinstatustxtr);
-#endif
-      return serviced;
-    }
-#ifdef USE_MCP230xx_OUTPUT
-    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
-      uint8_t pincmd = Settings.mcp230xx_config[pin].pinmode - 5;
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "ON")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "1"))) {
-        MCP230xx_SetOutPin(pin,abs(pincmd-1));
-        return serviced;
-      }
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "OFF")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "0"))) {
-        MCP230xx_SetOutPin(pin,pincmd);
-        return serviced;
-      }
-      if ((!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "T")) || (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 2), "2"))) {
-        MCP230xx_SetOutPin(pin,2);
-        return serviced;
-      }
-    }
-#endif
-    uint8_t pinmode = 0;
-    uint8_t pullup = 0;
-    uint8_t intmode = 0;
-    if (paramcount > 1) {
-      pinmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
-    }
-    if (paramcount > 2) {
-      pullup = atoi(subStr(sub_string, XdrvMailbox.data, ",", 3));
-    }
-    if (paramcount > 3) {
-      intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
-    }
-#ifdef USE_MCP230xx_OUTPUT
-    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2) && (paramcount > 2)) {
-#else
-    if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2) && (paramcount > 2)) {
-#endif
-      Settings.mcp230xx_config[pin].pinmode=pinmode;
-      Settings.mcp230xx_config[pin].pullup=pullup;
-      if ((pinmode > 1) && (pinmode < 5)) {
-        if ((intmode >= 0) && (intmode <= 3)) {
-          Settings.mcp230xx_config[pin].int_report_mode=intmode;
-        }
-      } else {
-        Settings.mcp230xx_config[pin].int_report_mode=3;
-      }
-      MCP230xx_ApplySettings();
-      uint8_t port = 0;
-      if (pin > 7) { port = 1; }
-      uint8_t portdata = MCP230xx_readGPIO(port);
-      char pulluptxtc[7], pinstatustxtc[7];
-      char intmodetxt[9];
-      sprintf(pulluptxtc,ConvertNumTxt(pullup));
-      sprintf(intmodetxt,IntModeTxt(Settings.mcp230xx_config[pin].int_report_mode));
-#ifdef USE_MCP230xx_OUTPUT
-      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1,Settings.mcp230xx_config[pin].pinmode));
-#else
-      sprintf(pinstatustxtc,ConvertNumTxt(portdata>>(pin-(port*8))&1));
-#endif
-      Response_P(MCP230XX_SENSOR_RESPONSE,pin,pinmode,pulluptxtc,intmodetxt,pinstatustxtc);
-      return serviced;
-    }
-  } else {
-    serviced=false;
-    return serviced;
-  }
-  return serviced;
-}
-
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-
-const char HTTP_SNS_MCP230xx_OUTPUT[] PROGMEM = "{s}MCP230XX D%d{m}%s{e}";
-
-void MCP230xx_UpdateWebData(void)
-{
-  uint8_t gpio1 = MCP230xx_readGPIO(0);
-  uint8_t gpio2 = 0;
-  if (2 == mcp230xx_type) {
-    gpio2 = MCP230xx_readGPIO(1);
-  }
-  uint16_t gpio = (gpio2 << 8) + gpio1;
-  for (uint32_t pin = 0; pin < mcp230xx_pincount; pin++) {
-    if (Settings.mcp230xx_config[pin].pinmode >= 5) {
-      char stt[7];
-      sprintf(stt,ConvertNumTxt((gpio>>pin)&1,Settings.mcp230xx_config[pin].pinmode));
-      WSContentSend_PD(HTTP_SNS_MCP230xx_OUTPUT, pin, stt);
-    }
-  }
-}
-
-#endif
-
-#ifdef USE_MCP230xx_OUTPUT
-
-void MCP230xx_OutputTelemetry(void)
-{
-  uint8_t outputcount = 0;
-  uint16_t gpiototal = 0;
-  uint8_t gpioa = 0;
-  uint8_t gpiob = 0;
-  gpioa=MCP230xx_readGPIO(0);
-  if (2 == mcp230xx_type) { gpiob=MCP230xx_readGPIO(1); }
-  gpiototal=((uint16_t)gpiob << 8) | gpioa;
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].pinmode >= 5) outputcount++;
-  }
-  if (outputcount) {
-    char stt[7];
-    ResponseTime_P(PSTR(",\"MCP230_OUT\":{"));
-    for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-      if (Settings.mcp230xx_config[pinx].pinmode >= 5) {
-        sprintf(stt,ConvertNumTxt(((gpiototal>>pinx)&1),Settings.mcp230xx_config[pinx].pinmode));
-        ResponseAppend_P(PSTR("\"OUT_D%i\":\"%s\","),pinx,stt);
-      }
-    }
-    ResponseAppend_P(PSTR("\"END\":1}}"));
-    MqttPublishTeleSensor();
-  }
-}
-
-#endif
-
-void MCP230xx_Interrupt_Counter_Report(void) {
-  ResponseTime_P(PSTR(",\"MCP230_INTTIMER\":{"));
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].int_count_en) {
-      ResponseAppend_P(PSTR("\"INTCNT_D%i\":%i,"),pinx,mcp230xx_int_counter[pinx]);
-      mcp230xx_int_counter[pinx]=0;
-    }
-  }
-  ResponseAppend_P(PSTR("\"END\":1}}"));
-  MqttPublishTeleSensor();
-  mcp230xx_int_sec_counter = 0;
-}
-
-void MCP230xx_Interrupt_Retain_Report(void) {
-  uint16_t retainresult = 0;
-  ResponseTime_P(PSTR(",\"MCP_INTRETAIN\":{"));
-  for (uint32_t pinx = 0;pinx < mcp230xx_pincount;pinx++) {
-    if (Settings.mcp230xx_config[pinx].int_retain_flag) {
-      ResponseAppend_P(PSTR("\"D%i\":%i,"),pinx,mcp230xx_int_retainer[pinx]);
-      retainresult |= (((mcp230xx_int_retainer[pinx])&1) << pinx);
-      mcp230xx_int_retainer[pinx]=0;
-    }
-  }
-  ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult);
-  MqttPublishTeleSensor();
-}
-
-
-
-
-
-bool Xsns29(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_22)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-      MCP230xx_Detect();
-  }
-  else if (mcp230xx_type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        if (mcp230xx_int_en) {
-          mcp230xx_int_prio_counter++;
-          if ((mcp230xx_int_prio_counter) >= (Settings.mcp230xx_int_prio)) {
-            MCP230xx_CheckForInterrupt();
-            mcp230xx_int_prio_counter=0;
-          }
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        if (mcp230xx_int_counter_en) {
-          mcp230xx_int_sec_counter++;
-          if (mcp230xx_int_sec_counter >= Settings.mcp230xx_int_timer) {
-            MCP230xx_Interrupt_Counter_Report();
-          }
-        }
-        if (tele_period == 0) {
-          if (mcp230xx_int_retainer_en) {
-            MCP230xx_Interrupt_Retain_Report();
-          }
-#ifdef USE_MCP230xx_OUTPUT
-          MCP230xx_OutputTelemetry();
-#endif
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MCP230xx_Show(1);
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_29 == XdrvMailbox.index) {
-          result = MCP230xx_Command();
-        }
-        break;
-#ifdef USE_WEBSERVER
-#ifdef USE_MCP230xx_OUTPUT
-#ifdef USE_MCP230xx_DISPLAYOUTPUT
-      case FUNC_WEB_SENSOR:
-        MCP230xx_UpdateWebData();
-        break;
-#endif
-#endif
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-# 46 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-#ifdef USE_I2C
-#ifdef USE_MPR121
-
-
-
-
-
-#define XSNS_30 30
-#define XI2C_23 23
-
-
-
-
-
-
-
-#define MPR121_ELEX_REG 0x00
-
-
-#define MPR121_MHDR_REG 0x2B
-
-
-#define MPR121_MHDR_VAL 0x01
-
-
-#define MPR121_NHDR_REG 0x2C
-
-
-#define MPR121_NHDR_VAL 0x01
-
-
-#define MPR121_NCLR_REG 0x2D
-
-
-#define MPR121_NCLR_VAL 0x0E
-
-
-#define MPR121_MHDF_REG 0x2F
-
-
-#define MPR121_MHDF_VAL 0x01
-
-
-#define MPR121_NHDF_REG 0x30
-
-
-#define MPR121_NHDF_VAL 0x05
-
-
-#define MPR121_NCLF_REG 0x31
-
-
-#define MPR121_NCLF_VAL 0x01
-
-
-#define MPR121_MHDPROXR_REG 0x36
-
-
-#define MPR121_MHDPROXR_VAL 0x3F
-
-
-#define MPR121_NHDPROXR_REG 0x37
-
-
-#define MPR121_NHDPROXR_VAL 0x5F
-
-
-#define MPR121_NCLPROXR_REG 0x38
-
-
-#define MPR121_NCLPROXR_VAL 0x04
-
-
-#define MPR121_FDLPROXR_REG 0x39
-
-
-#define MPR121_FDLPROXR_VAL 0x00
-
-
-#define MPR121_MHDPROXF_REG 0x3A
-
-
-#define MPR121_MHDPROXF_VAL 0x01
-
-
-#define MPR121_NHDPROXF_REG 0x3B
-
-
-#define MPR121_NHDPROXF_VAL 0x01
-
-
-#define MPR121_NCLPROXF_REG 0x3C
-
-
-#define MPR121_NCLPROXF_VAL 0x1F
-
-
-#define MPR121_FDLPROXF_REG 0x3D
-
-
-#define MPR121_FDLPROXF_VAL 0x04
-
-
-#define MPR121_E0TTH_REG 0x41
-
-
-#define MPR121_E0TTH_VAL 12
-
-
-#define MPR121_E0RTH_REG 0x42
-
-
-#define MPR121_E0RTH_VAL 6
-
-
-#define MPR121_CDT_REG 0x5D
-
-
-#define MPR121_CDT_VAL 0x20
-
-
-#define MPR121_ECR_REG 0x5E
-
-
-#define MPR121_ECR_VAL 0x8F
-
-
-
-#define MPR121_SRST_REG 0x80
-
-
-#define MPR121_SRST_VAL 0x63
-
-
-#define BITC(sensor,position) ((pS->current[sensor] >> position) & 1)
-
-
-#define BITP(sensor,position) ((pS->previous[sensor] >> position) & 1)
-# 195 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-typedef struct mpr121 mpr121;
-struct mpr121 {
- const uint8_t i2c_addr[4] = { 0x5A, 0x5B, 0x5C, 0x5D };
- const char id[4] = { 'A', 'B', 'C', 'D' };
- bool connected[4] = { false, false, false, false };
- bool running[4] = { false, false, false, false };
- uint16_t current[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
- uint16_t previous[4] = { 0x0000, 0x0000, 0x0000, 0x0000 };
-};
-
-bool mpr21_found = false;
-# 217 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-void Mpr121Init(struct mpr121 *pS, bool initial)
-{
-
- for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
-
-    if (initial && I2cActive(pS->i2c_addr[i])) { continue; }
-
-
-  pS->connected[i] = (I2cWrite8(pS->i2c_addr[i], MPR121_SRST_REG, MPR121_SRST_VAL)
-        && (0x24 == I2cRead8(pS->i2c_addr[i], 0x5D)));
-  if (pS->connected[i]) {
-
-
-      mpr21_found = true;
-   char device_name[16];
-   snprintf_P(device_name, sizeof(device_name), PSTR("MPR121(%c)"), pS->id[i]);
-      I2cSetActiveFound(pS->i2c_addr[i], device_name);
-
-
-   for (uint32_t j = 0; j < 13; j++) {
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_E0TTH_REG + 2 * j, MPR121_E0TTH_VAL);
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_E0RTH_REG + 2 * j, MPR121_E0RTH_VAL);
-   }
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDR_REG, MPR121_MHDR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDR_REG, MPR121_NHDR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLR_REG, MPR121_NCLR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDF_REG, MPR121_MHDF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDF_REG, MPR121_NHDF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLF_REG, MPR121_NCLF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXR_REG, MPR121_MHDPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXR_REG, MPR121_NHDPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXR_REG, MPR121_NCLPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXR_REG, MPR121_FDLPROXR_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_MHDPROXF_REG, MPR121_MHDPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NHDPROXF_REG, MPR121_NHDPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_NCLPROXF_REG, MPR121_NCLPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_FDLPROXF_REG, MPR121_FDLPROXF_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_CDT_REG, MPR121_CDT_VAL);
-
-
-   I2cWrite8(pS->i2c_addr[i], MPR121_ECR_REG, MPR121_ECR_VAL);
-
-
-   pS->running[i] = (0x00 != I2cRead8(pS->i2c_addr[i], MPR121_ECR_REG));
-
-   AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_I2C "MPR121%c: %sRunning"), pS->id[i], (pS->running[i]) ? "" : "NOT");
-
-  } else {
-
-
-   pS->running[i] = false;
-  }
- }
-
-
- if (!(pS->connected[0] || pS->connected[1] || pS->connected[2]
-       || pS->connected[3])) {
-  AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_I2C "MPR121: No sensors found"));
- }
-}
-# 326 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-void Mpr121Show(struct mpr121 *pS, uint8_t function)
-{
-
-
- for (uint32_t i = 0; i < sizeof(pS->i2c_addr[i]); i++) {
-
-
-  if (pS->connected[i]) {
-
-
-   if (!I2cValidRead16LE(&pS->current[i], pS->i2c_addr[i], MPR121_ELEX_REG)) {
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Cannot read data!"), pS->id[i]);
-    Mpr121Init(pS, false);
-    return;
-   }
-
-   if (BITC(i, 15)) {
-
-
-    I2cWrite8(pS->i2c_addr[i], MPR121_ELEX_REG, 0x00);
-    AddLog_P2(LOG_LEVEL_ERROR, PSTR(D_LOG_I2C "MPR121%c: ERROR: Excess current detected! Fix circuits if it happens repeatedly! Soft-resetting MPR121 ..."), pS->id[i]);
-    Mpr121Init(pS, false);
-    return;
-   }
-  }
-
-  if (pS->running[i]) {
-
-
-   if (FUNC_JSON_APPEND == function) {
-    ResponseAppend_P(PSTR(",\"MPR121%c\":{"), pS->id[i]);
-   }
-
-   for (uint32_t j = 0; j < 13; j++) {
-
-
-    if ((FUNC_EVERY_50_MSECOND == function)
-        && (BITC(i, j) != BITP(i, j))) {
-     Response_P(PSTR("{\"MPR121%c\":{\"Button%i\":%i}}"), pS->id[i], j, BITC(i, j));
-     MqttPublishPrefixTopic_P(RESULT_OR_STAT, mqtt_data);
-    }
-
-#ifdef USE_WEBSERVER
-    if (FUNC_WEB_SENSOR == function) {
-     WSContentSend_PD(PSTR("{s}MPR121%c Button%d{m}%d{e}"), pS->id[i], j, BITC(i, j));
-    }
-#endif
-
-
-    if (FUNC_JSON_APPEND == function) {
-     ResponseAppend_P(PSTR("%s\"Button%i\":%i"), (j > 0 ? "," : ""), j, BITC(i, j));
-    }
-   }
-
-
-   pS->previous[i] = pS->current[i];
-
-
-   if (FUNC_JSON_APPEND == function) {
-        ResponseJsonEnd();
-   }
-  }
- }
-}
-# 410 "S:/Development/Tasmota/tasmota/xsns_30_mpr121.ino"
-bool Xsns30(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_23)) { return false; }
-
- bool result = false;
-
-
- static struct mpr121 mpr121;
-
-  if (FUNC_INIT == function) {
-
-  Mpr121Init(&mpr121, true);
-  }
-  else if (mpr21_found) {
-
-  switch (function) {
-
-
-  case FUNC_EVERY_50_MSECOND:
-   Mpr121Show(&mpr121, FUNC_EVERY_50_MSECOND);
-   break;
-
-
-  case FUNC_JSON_APPEND:
-   Mpr121Show(&mpr121, FUNC_JSON_APPEND);
-   break;
-
-#ifdef USE_WEBSERVER
-
-  case FUNC_WEB_SENSOR:
-   Mpr121Show(&mpr121, FUNC_WEB_SENSOR);
-   break;
-#endif
-  }
- }
-
- return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
-#ifdef USE_I2C
-#ifdef USE_CCS811
-# 30 "S:/Development/Tasmota/tasmota/xsns_31_ccs811.ino"
-#define XSNS_31 31
-#define XI2C_24 24
-
-#define EVERYNSECONDS 5
-
-#include "Adafruit_CCS811.h"
-
-Adafruit_CCS811 ccs;
-uint8_t CCS811_ready = 0;
-uint8_t CCS811_type = 0;;
-uint16_t eCO2;
-uint16_t TVOC;
-uint8_t tcnt = 0;
-uint8_t ecnt = 0;
-
-
-
-void CCS811Detect(void)
-{
-  if (I2cActive(CCS811_ADDRESS)) { return; }
-
-  if (!ccs.begin(CCS811_ADDRESS)) {
-    CCS811_type = 1;
-    I2cSetActiveFound(CCS811_ADDRESS, "CCS811");
-  }
-}
-
-void CCS811Update(void)
-{
-  tcnt++;
-  if (tcnt >= EVERYNSECONDS) {
-    tcnt = 0;
-    CCS811_ready = 0;
-    if (ccs.available()) {
-      if (!ccs.readData()){
-        TVOC = ccs.getTVOC();
-        eCO2 = ccs.geteCO2();
-        CCS811_ready = 1;
-        if (global_update && global_humidity>0 && global_temperature!=9999) { ccs.setEnvironmentalData((uint8_t)global_humidity, global_temperature); }
-        ecnt = 0;
-      }
-    } else {
-
-      ecnt++;
-      if (ecnt > 6) {
-
-        ccs.begin(CCS811_ADDRESS);
-      }
-    }
-  }
-}
-
-const char HTTP_SNS_CCS811[] PROGMEM =
-  "{s}CCS811 " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"
-  "{s}CCS811 " D_TVOC "{m}%d " D_UNIT_PARTS_PER_BILLION "{e}";
-
-void CCS811Show(bool json)
-{
-  if (CCS811_ready) {
-    if (json) {
-      ResponseAppend_P(PSTR(",\"CCS811\":{\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TVOC "\":%d}"), eCO2,TVOC);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, eCO2);
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_CCS811, eCO2, TVOC);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns31(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_24)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    CCS811Detect();
-  }
-  else if (CCS811_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        CCS811Update();
-        break;
-      case FUNC_JSON_APPEND:
-        CCS811Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        CCS811Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
-#ifdef USE_I2C
-#ifdef USE_MPU6050
-# 30 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
-#define XSNS_32 32
-#define XI2C_25 25
-
-#define D_SENSOR_MPU6050 "MPU6050"
-
-#define MPU_6050_ADDR_AD0_LOW 0x68
-#define MPU_6050_ADDR_AD0_HIGH 0x69
-
-uint8_t MPU_6050_address;
-uint8_t MPU_6050_addresses[] = { MPU_6050_ADDR_AD0_LOW, MPU_6050_ADDR_AD0_HIGH };
-uint8_t MPU_6050_found;
-
-int16_t MPU_6050_ax = 0, MPU_6050_ay = 0, MPU_6050_az = 0;
-int16_t MPU_6050_gx = 0, MPU_6050_gy = 0, MPU_6050_gz = 0;
-int16_t MPU_6050_temperature = 0;
-
-#ifdef USE_MPU6050_DMP
-  #include "MPU6050_6Axis_MotionApps20.h"
-  #include "I2Cdev.h"
-  #include <helper_3dmath.h>
-  typedef struct MPU6050_DMP{
-  uint8_t devStatus;
-  uint16_t packetSize;
-  uint16_t fifoCount;
-  uint8_t fifoBuffer[64];
-  Quaternion q;
-  VectorInt16 aa;
-  VectorInt16 aaReal;
-  VectorFloat gravity;
-  float euler[3];
-  float yawPitchRoll[3];
-  } MPU6050_DMP;
-
-  MPU6050_DMP MPU6050_dmp;
-#else
-  #include <MPU6050.h>
-#endif
-MPU6050 mpu6050;
-
-void MPU_6050PerformReading(void)
-{
-#ifdef USE_MPU6050_DMP
-    mpu6050.resetFIFO();
-    MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
-    while (MPU6050_dmp.fifoCount < MPU6050_dmp.packetSize) MPU6050_dmp.fifoCount = mpu6050.getFIFOCount();
-    mpu6050.getFIFOBytes(MPU6050_dmp.fifoBuffer, MPU6050_dmp.packetSize);
-    MPU6050_dmp.fifoCount -= MPU6050_dmp.packetSize;
-
-    mpu6050.dmpGetQuaternion(&MPU6050_dmp.q, MPU6050_dmp.fifoBuffer);
-    mpu6050.dmpGetEuler(MPU6050_dmp.euler, &MPU6050_dmp.q);
-    mpu6050.dmpGetAccel(&MPU6050_dmp.aa, MPU6050_dmp.fifoBuffer);
-    mpu6050.dmpGetGravity(&MPU6050_dmp.gravity, &MPU6050_dmp.q);
-    mpu6050.dmpGetLinearAccel(&MPU6050_dmp.aaReal, &MPU6050_dmp.aa, &MPU6050_dmp.gravity);
-    mpu6050.dmpGetYawPitchRoll(MPU6050_dmp.yawPitchRoll, &MPU6050_dmp.q, &MPU6050_dmp.gravity);
-    MPU_6050_gx = MPU6050_dmp.euler[0] * 180/M_PI;
-    MPU_6050_gy = MPU6050_dmp.euler[1] * 180/M_PI;
-    MPU_6050_gz = MPU6050_dmp.euler[2] * 180/M_PI;
-    MPU_6050_ax = MPU6050_dmp.aaReal.x;
-    MPU_6050_ay = MPU6050_dmp.aaReal.y;
-    MPU_6050_az = MPU6050_dmp.aaReal.z;
-#else
-  mpu6050.getMotion6(
-    &MPU_6050_ax,
-    &MPU_6050_ay,
-    &MPU_6050_az,
-    &MPU_6050_gx,
-    &MPU_6050_gy,
-    &MPU_6050_gz
-  );
-#endif
-  MPU_6050_temperature = mpu6050.getTemperature();
-}
-# 119 "S:/Development/Tasmota/tasmota/xsns_32_mpu6050.ino"
-void MPU_6050Detect(void)
-{
-  for (uint32_t i = 0; i < sizeof(MPU_6050_addresses); i++)
-  {
-    MPU_6050_address = MPU_6050_addresses[i];
-    if (!I2cSetDevice(MPU_6050_address)) { break; }
-    mpu6050.setAddr(MPU_6050_addresses[i]);
-
-#ifdef USE_MPU6050_DMP
-    MPU6050_dmp.devStatus = mpu6050.dmpInitialize();
-    mpu6050.setXGyroOffset(220);
-    mpu6050.setYGyroOffset(76);
-    mpu6050.setZGyroOffset(-85);
-    mpu6050.setZAccelOffset(1788);
-    if (MPU6050_dmp.devStatus == 0) {
-      mpu6050.setDMPEnabled(true);
-      MPU6050_dmp.packetSize = mpu6050.dmpGetFIFOPacketSize();
-      MPU_6050_found = true;
-    }
-#else
-    mpu6050.initialize();
-    MPU_6050_found = mpu6050.testConnection();
-#endif
-    Settings.flag2.axis_resolution = 2;
-  }
-
-  if (MPU_6050_found) {
-    I2cSetActiveFound(MPU_6050_address, D_SENSOR_MPU6050);
-  }
-}
-
-#define D_YAW "Yaw"
-#define D_PITCH "Pitch"
-#define D_ROLL "Roll"
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_AXIS[] PROGMEM =
-  "{s}" D_SENSOR_MPU6050 " " D_AX_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_AY_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_AZ_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GX_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GY_AXIS "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_GZ_AXIS "{m}%s{e}";
-#ifdef USE_MPU6050_DMP
-const char HTTP_SNS_YPR[] PROGMEM =
-  "{s}" D_SENSOR_MPU6050 " " D_YAW "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_PITCH "{m}%s{e}"
-  "{s}" D_SENSOR_MPU6050 " " D_ROLL "{m}%s{e}";
-#endif
-#endif
-
-#define D_JSON_AXIS_AX "AccelXAxis"
-#define D_JSON_AXIS_AY "AccelYAxis"
-#define D_JSON_AXIS_AZ "AccelZAxis"
-#define D_JSON_AXIS_GX "GyroXAxis"
-#define D_JSON_AXIS_GY "GyroYAxis"
-#define D_JSON_AXIS_GZ "GyroZAxis"
-#define D_JSON_YAW "Yaw"
-#define D_JSON_PITCH "Pitch"
-#define D_JSON_ROLL "Roll"
-
-void MPU_6050Show(bool json)
-{
-  MPU_6050PerformReading();
-
-  double tempConv = (MPU_6050_temperature / 340.0 + 35.53);
-  char temperature[33];
-  dtostrfd(tempConv, Settings.flag2.temperature_resolution, temperature);
-  char axis_ax[33];
-  dtostrfd(MPU_6050_ax, Settings.flag2.axis_resolution, axis_ax);
-  char axis_ay[33];
-  dtostrfd(MPU_6050_ay, Settings.flag2.axis_resolution, axis_ay);
-  char axis_az[33];
-  dtostrfd(MPU_6050_az, Settings.flag2.axis_resolution, axis_az);
-  char axis_gx[33];
-  dtostrfd(MPU_6050_gx, Settings.flag2.axis_resolution, axis_gx);
-  char axis_gy[33];
-  dtostrfd(MPU_6050_gy, Settings.flag2.axis_resolution, axis_gy);
-  char axis_gz[33];
-  dtostrfd(MPU_6050_gz, Settings.flag2.axis_resolution, axis_gz);
-#ifdef USE_MPU6050_DMP
-  char axis_yaw[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[0] / PI * 180.0, Settings.flag2.axis_resolution, axis_yaw);
-  char axis_pitch[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[1] / PI * 180.0, Settings.flag2.axis_resolution, axis_pitch);
-  char axis_roll[33];
-  dtostrfd(MPU6050_dmp.yawPitchRoll[2] / PI * 180.0, Settings.flag2.axis_resolution, axis_roll);
-#endif
-
-  if (json) {
-    char json_axis_ax[25];
-    snprintf_P(json_axis_ax, sizeof(json_axis_ax), PSTR(",\"" D_JSON_AXIS_AX "\":%s"), axis_ax);
-    char json_axis_ay[25];
-    snprintf_P(json_axis_ay, sizeof(json_axis_ay), PSTR(",\"" D_JSON_AXIS_AY "\":%s"), axis_ay);
-    char json_axis_az[25];
-    snprintf_P(json_axis_az, sizeof(json_axis_az), PSTR(",\"" D_JSON_AXIS_AZ "\":%s"), axis_az);
-    char json_axis_gx[25];
-    snprintf_P(json_axis_gx, sizeof(json_axis_gx), PSTR(",\"" D_JSON_AXIS_GX "\":%s"), axis_gx);
-    char json_axis_gy[25];
-    snprintf_P(json_axis_gy, sizeof(json_axis_gy), PSTR(",\"" D_JSON_AXIS_GY "\":%s"), axis_gy);
-    char json_axis_gz[25];
-    snprintf_P(json_axis_gz, sizeof(json_axis_gz), PSTR(",\"" D_JSON_AXIS_GZ "\":%s"), axis_gz);
-#ifdef USE_MPU6050_DMP
-    char json_ypr_y[25];
-    snprintf_P(json_ypr_y, sizeof(json_ypr_y), PSTR(",\"" D_JSON_YAW "\":%s"), axis_yaw);
-    char json_ypr_p[25];
-    snprintf_P(json_ypr_p, sizeof(json_ypr_p), PSTR(",\"" D_JSON_PITCH "\":%s"), axis_pitch);
-    char json_ypr_r[25];
-    snprintf_P(json_ypr_r, sizeof(json_ypr_r), PSTR(",\"" D_JSON_ROLL "\":%s"), axis_roll);
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s%s%s%s}"),
-      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz,
-      json_ypr_y, json_ypr_p, json_ypr_r);
-#else
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s%s%s%s%s%s}"),
-      D_SENSOR_MPU6050, temperature, json_axis_ax, json_axis_ay, json_axis_az, json_axis_gx, json_axis_gy, json_axis_gz);
-#endif
-#ifdef USE_DOMOTICZ
-    DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TEMP, D_SENSOR_MPU6050, temperature, TempUnit());
-    WSContentSend_PD(HTTP_SNS_AXIS, axis_ax, axis_ay, axis_az, axis_gx, axis_gy, axis_gz);
-#ifdef USE_MPU6050_DMP
-    WSContentSend_PD(HTTP_SNS_YPR, axis_yaw, axis_pitch, axis_roll);
-#endif
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns32(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_25)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MPU_6050Detect();
-  }
-  else if (MPU_6050_found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        if (tele_period == Settings.tele_period -3) {
-          MPU_6050PerformReading();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MPU_6050Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MPU_6050Show(0);
-        MPU_6050PerformReading();
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
-#ifdef USE_I2C
-#ifdef USE_DS3231
-# 35 "S:/Development/Tasmota/tasmota/xsns_33_ds3231.ino"
-#define XSNS_33 33
-#define XI2C_26 26
-
-
-#ifndef USE_RTC_ADDR
-#define USE_RTC_ADDR 0x68
-#endif
-
-
-#define RTC_SECONDS 0x00
-#define RTC_MINUTES 0x01
-#define RTC_HOURS 0x02
-#define RTC_DAY 0x03
-#define RTC_DATE 0x04
-#define RTC_MONTH 0x05
-#define RTC_YEAR 0x06
-#define RTC_CONTROL 0x0E
-#define RTC_STATUS 0x0F
-
-#define OSF 7
-#define EOSC 7
-#define BBSQW 6
-#define CONV 5
-#define RS2 4
-#define RS1 3
-#define INTCN 2
-
-
-#define HR1224 6
-#define CENTURY 7
-#define DYDT 6
-bool ds3231ReadStatus = false;
-bool ds3231WriteStatus = false;
-bool DS3231chipDetected = false;
-
-
-
-
-void DS3231Detect(void)
-{
-  if (I2cActive(USE_RTC_ADDR)) { return; }
-
-  if (I2cValidRead(USE_RTC_ADDR, RTC_STATUS, 1)) {
-    I2cSetActiveFound(USE_RTC_ADDR, "DS3231");
-    DS3231chipDetected = true;
-  }
-}
-
-
-
-
-uint8_t bcd2dec(uint8_t n)
-{
-  return n - 6 * (n >> 4);
-}
-
-
-
-
-uint8_t dec2bcd(uint8_t n)
-{
-  return n + 6 * (n / 10);
-}
-
-
-
-
-uint32_t ReadFromDS3231(void)
-{
-  TIME_T tm;
-  tm.second = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_SECONDS));
-  tm.minute = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MINUTES));
-  tm.hour = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_HOURS) & ~_BV(HR1224));
-  tm.day_of_week = I2cRead8(USE_RTC_ADDR, RTC_DAY);
-  tm.day_of_month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_DATE));
-  tm.month = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_MONTH) & ~_BV(CENTURY));
-  tm.year = bcd2dec(I2cRead8(USE_RTC_ADDR, RTC_YEAR));
-  return MakeTime(tm);
-}
-
-
-
-void SetDS3231Time (uint32_t epoch_time) {
-  TIME_T tm;
-  BreakTime(epoch_time, tm);
-  I2cWrite8(USE_RTC_ADDR, RTC_SECONDS, dec2bcd(tm.second));
-  I2cWrite8(USE_RTC_ADDR, RTC_MINUTES, dec2bcd(tm.minute));
-  I2cWrite8(USE_RTC_ADDR, RTC_HOURS, dec2bcd(tm.hour));
-  I2cWrite8(USE_RTC_ADDR, RTC_DAY, tm.day_of_week);
-  I2cWrite8(USE_RTC_ADDR, RTC_DATE, dec2bcd(tm.day_of_month));
-  I2cWrite8(USE_RTC_ADDR, RTC_MONTH, dec2bcd(tm.month));
-  I2cWrite8(USE_RTC_ADDR, RTC_YEAR, dec2bcd(tm.year));
-  I2cWrite8(USE_RTC_ADDR, RTC_STATUS, I2cRead8(USE_RTC_ADDR, RTC_STATUS) & ~_BV(OSF));
-}
-
-void DS3231EverySecond(void)
-{
-  TIME_T tmpTime;
-  if (!ds3231ReadStatus && Rtc.utc_time < START_VALID_TIME ) {
-    ntp_force_sync = true;
-    Rtc.utc_time = ReadFromDS3231();
-
-
-    BreakTime(Rtc.utc_time, tmpTime);
-    if (Rtc.utc_time < START_VALID_TIME ) {
-      ds3231ReadStatus = true;
-    }
-    RtcTime.year = tmpTime.year + 1970;
-    Rtc.daylight_saving_time = RuleToTime(Settings.tflag[1], RtcTime.year);
-    Rtc.standard_time = RuleToTime(Settings.tflag[0], RtcTime.year);
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Set time from DS3231 to RTC (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
-    if (Rtc.local_time < START_VALID_TIME) {
-      rules_flag.time_init = 1;
-    } else {
-      rules_flag.time_set = 1;
-    }
-  }
-  else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs(Rtc.utc_time - ReadFromDS3231()) > 60) {
-    AddLog_P2(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
-                GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str());
-    SetDS3231Time (Rtc.utc_time);
-    ds3231WriteStatus = true;
-  }
-}
-
-
-
-
-
-bool Xsns33(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_26)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    DS3231Detect();
-  }
-  else if (DS3231chipDetected) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        DS3231EverySecond();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
-#ifdef USE_HX711
-# 35 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
-#define XSNS_34 34
-
-#ifndef HX_MAX_WEIGHT
-#define HX_MAX_WEIGHT 20000
-#endif
-#ifndef HX_REFERENCE
-#define HX_REFERENCE 250
-#endif
-#ifndef HX_SCALE
-#define HX_SCALE 120
-#endif
-
-#define HX_TIMEOUT 120
-#define HX_SAMPLES 10
-#define HX_CAL_TIMEOUT 15
-
-#define HX_GAIN_128 1
-#define HX_GAIN_32 2
-#define HX_GAIN_64 3
-
-#define D_JSON_WEIGHT_REF "WeightRef"
-#define D_JSON_WEIGHT_CAL "WeightCal"
-#define D_JSON_WEIGHT_MAX "WeightMax"
-#define D_JSON_WEIGHT_ITEM "WeightItem"
-#define D_JSON_WEIGHT_CHANGE "WeightChange"
-#define D_JSON_WEIGHT_RAW "WeightRaw"
-#define D_JSON_WEIGHT_DELTA "WeightDelta"
-
-enum HxCalibrationSteps { HX_CAL_END, HX_CAL_LIMBO, HX_CAL_FINISH, HX_CAL_FAIL, HX_CAL_DONE, HX_CAL_FIRST, HX_CAL_RESET, HX_CAL_START };
-
-const char kHxCalibrationStates[] PROGMEM = D_HX_CAL_FAIL "|" D_HX_CAL_DONE "|" D_HX_CAL_REFERENCE "|" D_HX_CAL_REMOVE;
-
-struct HX {
-  long weight = 0;
-  long raw = 0;
-  long last_weight = 0;
-  long sum_weight = 0;
-  long sum_raw = 0;
-  long offset = 0;
-  long scale = 1;
-  long weight_diff = 0;
-  uint8_t type = 1;
-  uint8_t sample_count = 0;
-  uint8_t calibrate_step = HX_CAL_END;
-  uint8_t calibrate_timer = 0;
-  uint8_t calibrate_msg = 0;
-  uint8_t pin_sck;
-  uint8_t pin_dout;
-  bool tare_flg = false;
-  bool weight_changed = false;
-  uint16_t weight_delta = 4;
-} Hx;
-
-
-
-bool HxIsReady(uint16_t timeout)
-{
-
-  uint32_t start = millis();
-  while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) { yield(); }
-  return (digitalRead(Hx.pin_dout) == LOW);
-}
-
-long HxRead(void)
-{
-  if (!HxIsReady(HX_TIMEOUT)) { return -1; }
-
-  uint8_t data[3] = { 0 };
-  uint8_t filler = 0x00;
-
-
-  data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-  data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-  data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
-
-
-  for (unsigned int i = 0; i < HX_GAIN_128; i++) {
-    digitalWrite(Hx.pin_sck, HIGH);
-    digitalWrite(Hx.pin_sck, LOW);
-  }
-
-
-  if (data[2] & 0x80) { filler = 0xFF; }
-
-
-  unsigned long value = ( static_cast<unsigned long>(filler) << 24
-                        | static_cast<unsigned long>(data[2]) << 16
-                        | static_cast<unsigned long>(data[1]) << 8
-                        | static_cast<unsigned long>(data[0]) );
-
-  return static_cast<long>(value);
-}
-
-
-
-void HxResetPart(void)
-{
-  Hx.tare_flg = true;
-  Hx.sum_weight = 0;
-  Hx.sample_count = 0;
-  Hx.last_weight = 0;
-}
-
-void HxReset(void)
-{
-  HxResetPart();
-  Settings.energy_frequency_calibration = 0;
-}
-
-void HxCalibrationStateTextJson(uint8_t msg_id)
-{
-  char cal_text[30];
-
-  Hx.calibrate_msg = msg_id;
-  Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
-
-  if (msg_id < 3) { MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR("Sensor34")); }
-}
-
-void SetWeightDelta()
-{
-
-  if (Settings.weight_change == 0) {
-    Hx.weight_delta = 4;
-    return;
-  }
-
-
-  if (Settings.weight_change > 100) {
-    Hx.weight_delta = (Settings.weight_change - 100) * 10 + 100;
-    return;
-  }
-
-
-  Hx.weight_delta = Settings.weight_change - 1;
-}
-# 192 "S:/Development/Tasmota/tasmota/xsns_34_hx711.ino"
-bool HxCommand(void)
-{
-  bool serviced = true;
-  bool show_parms = false;
-  char sub_string[XdrvMailbox.data_len +1];
-
-  for (uint32_t ca = 0; ca < XdrvMailbox.data_len; ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-  }
-
-  switch (XdrvMailbox.payload) {
-    case 1:
-      HxReset();
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, "Reset");
-      break;
-    case 2:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-      }
-      Hx.scale = 1;
-      HxReset();
-      Hx.calibrate_step = HX_CAL_START;
-      Hx.calibrate_timer = 1;
-      HxCalibrationStateTextJson(3);
-      break;
-    case 3:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_reference = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-      }
-      show_parms = true;
-      break;
-    case 4:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_calibration = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
-        Hx.scale = Settings.weight_calibration;
-      }
-      show_parms = true;
-      break;
-    case 5:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_max = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) / 1000;
-      }
-      show_parms = true;
-      break;
-    case 6:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.weight_item = (unsigned long)(CharToFloat(subStr(sub_string, XdrvMailbox.data, ",", 2)) * 10);
-      }
-      show_parms = true;
-      break;
-    case 7:
-      Settings.energy_frequency_calibration = Hx.weight;
-      Response_P(S_JSON_SENSOR_INDEX_SVALUE, XSNS_34, D_JSON_DONE);
-      break;
-    case 8:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
-        Settings.SensorBits1.hx711_json_weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10) & 1;
-      }
-      show_parms = true;
-      break;
-    case 9:
-      if (strstr(XdrvMailbox.data, ",") != nullptr) {
- Settings.weight_change = strtol(subStr(sub_string, XdrvMailbox.data, ",", 2), nullptr, 10);
- SetWeightDelta();
-      }
-      show_parms = true;
-      break;
-    default:
-      show_parms = true;
-  }
-
-  if (show_parms) {
-    char item[33];
-    dtostrfd((float)Settings.weight_item / 10, 1, item);
-    Response_P(PSTR("{\"Sensor34\":{\"" D_JSON_WEIGHT_REF "\":%d,\"" D_JSON_WEIGHT_CAL "\":%d,\"" D_JSON_WEIGHT_MAX "\":%d,\""
-      D_JSON_WEIGHT_ITEM "\":%s,\"" D_JSON_WEIGHT_CHANGE "\":%s,\"" D_JSON_WEIGHT_DELTA "\":%d}}"),
-        Settings.weight_reference, Settings.weight_calibration, Settings.weight_max * 1000,
-        item, GetStateText(Settings.SensorBits1.hx711_json_weight_change), Settings.weight_change);
-  }
-
-  return serviced;
-}
-
-
-
-long HxWeight(void)
-{
-  return (Hx.calibrate_step < HX_CAL_FAIL) ? Hx.weight : 0;
-}
-
-void HxInit(void)
-{
-  Hx.type = 0;
-  if ((pin[GPIO_HX711_DAT] < 99) && (pin[GPIO_HX711_SCK] < 99)) {
-    Hx.pin_sck = pin[GPIO_HX711_SCK];
-    Hx.pin_dout = pin[GPIO_HX711_DAT];
-
-    pinMode(Hx.pin_sck, OUTPUT);
-    pinMode(Hx.pin_dout, INPUT);
-
-    digitalWrite(Hx.pin_sck, LOW);
-
-    SetWeightDelta();
-
-    if (HxIsReady(8 * HX_TIMEOUT)) {
-      if (!Settings.weight_max) { Settings.weight_max = HX_MAX_WEIGHT / 1000; }
-      if (!Settings.weight_calibration) { Settings.weight_calibration = HX_SCALE; }
-      if (!Settings.weight_reference) { Settings.weight_reference = HX_REFERENCE; }
-      Hx.scale = Settings.weight_calibration;
-      HxRead();
-      HxResetPart();
-      Hx.type = 1;
-    }
-  }
-}
-
-void HxEvery100mSecond(void)
-{
-  long raw = HxRead();
-  Hx.sum_raw += raw;
-  Hx.sum_weight += raw;
-
-  Hx.sample_count++;
-  if (HX_SAMPLES == Hx.sample_count) {
-    long average = Hx.sum_weight / Hx.sample_count;
-    long raw_average = Hx.sum_raw / Hx.sample_count;
-    long value = average - Hx.offset;
-    Hx.weight = value / Hx.scale;
-    Hx.raw = raw_average / Hx.scale;
-    if (Hx.weight < 0) {
-      if (Settings.energy_frequency_calibration) {
-        long difference = Settings.energy_frequency_calibration + Hx.weight;
-        Hx.last_weight = difference;
-        if (difference < 0) { HxReset(); }
-      }
-      Hx.weight = 0;
-    } else {
-      Hx.last_weight = Settings.energy_frequency_calibration;
-    }
-
-    if (Hx.tare_flg) {
-      Hx.tare_flg = false;
-      Hx.offset = average;
-    }
-
-    if (Hx.calibrate_step) {
-      Hx.calibrate_timer--;
-
-      if (HX_CAL_START == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
-      }
-      else if (HX_CAL_RESET == Hx.calibrate_step) {
-        if (Hx.calibrate_timer) {
-          if (Hx.weight < (long)Settings.weight_reference) {
-            Hx.calibrate_step--;
-            Hx.calibrate_timer = HX_CAL_TIMEOUT * (10 / HX_SAMPLES);
-            HxCalibrationStateTextJson(2);
-          }
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-      else if (HX_CAL_FIRST == Hx.calibrate_step) {
-        if (Hx.calibrate_timer) {
-          if (Hx.weight > (long)Settings.weight_reference) {
-            Hx.calibrate_step--;
-          }
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-      else if (HX_CAL_DONE == Hx.calibrate_step) {
-        if (Hx.weight > (long)Settings.weight_reference) {
-          Hx.calibrate_step = HX_CAL_FINISH;
-          Settings.weight_calibration = Hx.weight / Settings.weight_reference;
-          Hx.weight = 0;
-          HxCalibrationStateTextJson(1);
-        } else {
-          Hx.calibrate_step = HX_CAL_FAIL;
-        }
-      }
-
-      if (HX_CAL_FAIL == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.tare_flg = true;
-        HxCalibrationStateTextJson(0);
-      }
-      if (HX_CAL_FINISH == Hx.calibrate_step) {
-        Hx.calibrate_step--;
-        Hx.calibrate_timer = 3 * (10 / HX_SAMPLES);
-        Hx.scale = Settings.weight_calibration;
-      }
-
-      if (!Hx.calibrate_timer) {
-        Hx.calibrate_step = HX_CAL_END;
-      }
-    } else {
-      Hx.weight += Hx.last_weight;
-
-      if (Settings.SensorBits1.hx711_json_weight_change) {
-        if (abs(Hx.weight - Hx.weight_diff) > Hx.weight_delta) {
-          Hx.weight_diff = Hx.weight;
-          Hx.weight_changed = true;
-        }
-        else if (Hx.weight_changed && (Hx.weight == Hx.weight_diff)) {
-          mqtt_data[0] = '\0';
-          ResponseAppendTime();
-          HxShow(true);
-          ResponseJsonEnd();
-          MqttPublishTeleSensor();
-          Hx.weight_changed = false;
-        }
-      }
-    }
-
-    Hx.sum_weight = 0;
-    Hx.sum_raw = 0;
-    Hx.sample_count = 0;
-  }
-}
-
-void HxSaveBeforeRestart(void)
-{
-  Settings.energy_frequency_calibration = Hx.weight;
-  Hx.sample_count = HX_SAMPLES +1;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_HX711_WEIGHT[] PROGMEM =
-  "{s}HX711 " D_WEIGHT "{m}%s " D_UNIT_KILOGRAM "{e}";
-const char HTTP_HX711_COUNT[] PROGMEM =
-  "{s}HX711 " D_COUNT "{m}%d{e}";
-const char HTTP_HX711_CAL[] PROGMEM =
-  "{s}HX711 %s{m}{e}";
-#endif
-
-void HxShow(bool json)
-{
-  char scount[30] = { 0 };
-
-  uint16_t count = 0;
-  float weight = 0;
-  if (Hx.calibrate_step < HX_CAL_FAIL) {
-    if (Hx.weight && Settings.weight_item) {
-      count = (Hx.weight * 10) / Settings.weight_item;
-      if (count > 1) {
-        snprintf_P(scount, sizeof(scount), PSTR(",\"" D_JSON_COUNT "\":%d"), count);
-      }
-    }
-    weight = (float)Hx.weight / 1000;
-  }
-  char weight_chr[33];
-  dtostrfd(weight, Settings.flag2.weight_resolution, weight_chr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"HX711\":{\"" D_JSON_WEIGHT "\":%s%s, \"" D_JSON_WEIGHT_RAW "\":%d}"), weight_chr, scount, Hx.raw);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_HX711_WEIGHT, weight_chr);
-    if (count > 1) {
-      WSContentSend_PD(HTTP_HX711_COUNT, count);
-    }
-    if (Hx.calibrate_step) {
-      char cal_text[30];
-      WSContentSend_PD(HTTP_HX711_CAL, GetTextIndexed(cal_text, sizeof(cal_text), Hx.calibrate_msg, kHxCalibrationStates));
-    }
-#endif
-  }
-}
-
-#ifdef USE_WEBSERVER
-#ifdef USE_HX711_GUI
-
-
-
-
-#define WEB_HANDLE_HX711 "s34"
-
-const char S_CONFIGURE_HX711[] PROGMEM = D_CONFIGURE_HX711;
-
-const char HTTP_BTN_MENU_MAIN_HX711[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button name='reset'>" D_RESET_HX711 "</button></form></p>";
-
-const char HTTP_BTN_MENU_HX711[] PROGMEM =
-  "<p><form action='" WEB_HANDLE_HX711 "' method='get'><button>" D_CONFIGURE_HX711 "</button></form></p>";
-
-const char HTTP_FORM_HX711[] PROGMEM =
-  "<fieldset><legend><b>&nbsp;" D_CALIBRATION "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
-  "<p><b>" D_REFERENCE_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' step='0.001' id='p1' placeholder='0' value='%s'></p>"
-  "<br><button name='calibrate' type='submit'>" D_CALIBRATE "</button>"
-  "</form>"
-  "</fieldset><br><br>"
-
-  "<fieldset><legend><b>&nbsp;" D_HX711_PARAMETERS "&nbsp;</b></legend>"
-  "<form method='post' action='" WEB_HANDLE_HX711 "'>"
-  "<p><b>" D_ITEM_WEIGHT "</b> (" D_UNIT_KILOGRAM ")<br><input type='number' max='6.5535' step='0.0001' id='p2' placeholder='0.0' value='%s'></p>";
-
-void HandleHxAction(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_HX711);
-
-  if (WebServer->hasArg("save")) {
-    HxSaveSettings();
-    HandleConfiguration();
-    return;
-  }
-
-  char stemp1[20];
-
-  if (WebServer->hasArg("reset")) {
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 1"));
-    ExecuteWebCommand(stemp1, SRC_WEBGUI);
-
-    HandleRoot();
-    return;
-  }
-
-  if (WebServer->hasArg("calibrate")) {
-    WebGetArg("p1", stemp1, sizeof(stemp1));
-    Settings.weight_reference = (!strlen(stemp1)) ? 0 : (unsigned long)(CharToFloat(stemp1) * 1000);
-
-    HxLogUpdates();
-
-    snprintf_P(stemp1, sizeof(stemp1), PSTR("Sensor34 2"));
-    ExecuteWebCommand(stemp1, SRC_WEBGUI);
-
-    HandleRoot();
-    return;
-  }
-
-  WSContentStart_P(S_CONFIGURE_HX711);
-  WSContentSendStyle();
-  dtostrfd((float)Settings.weight_reference / 1000, 3, stemp1);
-  char stemp2[20];
-  dtostrfd((float)Settings.weight_item / 10000, 4, stemp2);
-  WSContentSend_P(HTTP_FORM_HX711, stemp1, stemp2);
-  WSContentSend_P(HTTP_FORM_END);
-  WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentStop();
-}
-
-void HxSaveSettings(void)
-{
-  char tmp[100];
-
-  WebGetArg("p2", tmp, sizeof(tmp));
-  Settings.weight_item = (!strlen(tmp)) ? 0 : (unsigned long)(CharToFloat(tmp) * 10000);
-
-  HxLogUpdates();
-}
-
-void HxLogUpdates(void)
-{
-  char weigth_ref_chr[33];
-  dtostrfd((float)Settings.weight_reference / 1000, Settings.flag2.weight_resolution, weigth_ref_chr);
-  char weigth_item_chr[33];
-  dtostrfd((float)Settings.weight_item / 10000, 4, weigth_item_chr);
-
-  AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_JSON_WEIGHT_REF " %s, " D_JSON_WEIGHT_ITEM " %s"), weigth_ref_chr, weigth_item_chr);
-}
-
-#endif
-#endif
-
-
-
-
-
-bool Xsns34(uint8_t function)
-{
-  bool result = false;
-
-  if (Hx.type) {
-    switch (function) {
-      case FUNC_EVERY_100_MSECOND:
-        HxEvery100mSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_34 == XdrvMailbox.index) {
-          result = HxCommand();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        HxShow(1);
-        break;
-      case FUNC_SAVE_BEFORE_RESTART:
-        HxSaveBeforeRestart();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HxShow(0);
-        break;
-#ifdef USE_HX711_GUI
-      case FUNC_WEB_ADD_MAIN_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_MAIN_HX711);
-        break;
-      case FUNC_WEB_ADD_BUTTON:
-        WSContentSend_P(HTTP_BTN_MENU_HX711);
-        break;
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/" WEB_HANDLE_HX711, HandleHxAction);
-        break;
-#endif
-#endif
-      case FUNC_INIT:
-        HxInit();
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
-#if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
-#if defined(USE_TX20_WIND_SENSOR) && defined(USE_TX23_WIND_SENSOR)
-#undef USE_TX20_WIND_SENSOR
-#warning **** use USE_TX20_WIND_SENSOR or USE_TX23_WIND_SENSOR but not both together, TX20 disabled ****
-#endif
-# 41 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
-#define XSNS_35 35
-
-#define TX2X_BIT_TIME 1220
-#define TX2X_RESET_VALUES 60
-
-
-
-extern "C" {
-#include "gpio.h"
-}
-
-#ifdef USE_TX20_WIND_SENSOR
-  #define D_TX2x_NAME "TX20"
-#else
-  #define D_TX2x_NAME "TX23"
-#endif
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_TX2X[] PROGMEM =
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s (%s&deg;){e}";
-#endif
-
-const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
-                                       D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
-                                       D_TX20_EAST "|"
-                                       D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
-                                       D_TX20_SOUTH "|"
-                                       D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
-                                       D_TX20_WEST "|"
-                                       D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
-                                       D_TX20_NORTH D_TX20_WEST "|"
-                                       D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
-
-uint8_t tx2x_sa = 0;
-uint8_t tx2x_sb = 0;
-uint8_t tx2x_sd = 0;
-uint8_t tx2x_se = 0;
-uint16_t tx2x_sc = 0;
-uint16_t tx2x_sf = 0;
-
-float tx2x_wind_speed_kmh = 0;
-float tx2x_wind_speed_max = 0;
-float tx2x_wind_speed_avg = 0;
-float tx2x_wind_sum = 0;
-int tx2x_count = 0;
-uint8_t tx2x_wind_direction = 0;
-
-bool tx2x_available = false;
-
-#ifdef USE_TX23_WIND_SENSOR
-uint8_t tx23_stage = 0;
-#endif
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void TX2xStartRead(void) ICACHE_RAM_ATTR;
-#endif
-
-void TX2xStartRead(void)
-{
-# 135 "S:/Development/Tasmota/tasmota/xsns_35_tx20.ino"
-#ifdef USE_TX23_WIND_SENSOR
-  if (0!=tx23_stage)
-  {
-    if ((2==tx23_stage) || (3==tx23_stage))
-    {
-#endif
-      tx2x_available = false;
-
-      tx2x_sa = 0;
-      tx2x_sb = 0;
-      tx2x_sd = 0;
-      tx2x_se = 0;
-      tx2x_sc = 0;
-      tx2x_sf = 0;
-
-      delayMicroseconds(TX2X_BIT_TIME / 2);
-
-      for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
-        uint8_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
-#ifdef USE_TX23_WIND_SENSOR
-        if (bitcount > 41 - 5) {
-
-          tx2x_sa = (tx2x_sa << 1) | (dpin);
-        } else if (bitcount > 41 - 5 - 4) {
-
-          tx2x_sb = tx2x_sb >> 1 | ((dpin) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12) {
-
-          tx2x_sc = tx2x_sc >> 1 | ((dpin) << 11);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
-
-          tx2x_sd = tx2x_sd >> 1 | ((dpin) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
-
-          tx2x_se = tx2x_se >> 1 | ((dpin ^ 1) << 3);
-        } else {
-
-          tx2x_sf = tx2x_sf >> 1 | ((dpin ^ 1) << 11);
-        }
-#else
-        if (bitcount > 41 - 5) {
-
-          tx2x_sa = (tx2x_sa << 1) | (dpin ^ 1);
-        } else if (bitcount > 41 - 5 - 4) {
-
-          tx2x_sb = tx2x_sb >> 1 | ((dpin ^ 1) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12) {
-
-          tx2x_sc = tx2x_sc >> 1 | ((dpin ^ 1) << 11);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4) {
-
-          tx2x_sd = tx2x_sd >> 1 | ((dpin ^ 1) << 3);
-        } else if (bitcount > 41 - 5 - 4 - 12 - 4 - 4) {
-
-          tx2x_se = tx2x_se >> 1 | (dpin << 3);
-        } else {
-
-          tx2x_sf = tx2x_sf >> 1 | (dpin << 11);
-        }
-#endif
-        delayMicroseconds(TX2X_BIT_TIME);
-      }
-
-      uint8_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
-      chk &= 0xf;
-
-#ifdef USE_TX23_WIND_SENSOR
-
-      if ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
-        tx2x_available = true;
-      }
-#else
-      if ((chk == tx2x_sd) && (tx2x_sc < 511)) {
-        tx2x_available = true;
-      }
-#endif
-#ifdef USE_TX23_WIND_SENSOR
-    }
-    tx23_stage++;
-  }
-#endif
-
-
-
-  GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX2X_TXD_BLACK]);
-}
-
-void Tx2xReset(void)
-{
-    tx2x_count = 0;
-    tx2x_wind_sum = 0;
-    tx2x_wind_speed_max = 0;
-}
-
-void Tx2xRead(void)
-{
-#ifdef USE_TX23_WIND_SENSOR
-
-
-  if ((uptime % 3)==0) {
-
-
-    tx23_stage = 0;
-    pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
-    digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
-  } else if ((uptime % 3)==1) {
-
-
-    tx23_stage = 1;
-    pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT_PULLUP);
-  }
-#endif
-  if (0==Settings.tele_period && !(uptime % TX2X_RESET_VALUES)) {
-    Tx2xReset();
-  }
-  else if (tx2x_available) {
-
-    tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
-    if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
-      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
-    }
-    tx2x_count++;
-    tx2x_wind_sum += tx2x_wind_speed_kmh;
-    tx2x_wind_speed_avg = tx2x_wind_sum / tx2x_count;
-    tx2x_wind_direction = tx2x_sb;
-  }
-}
-
-void Tx2xInit(void)
-{
-#ifdef USE_TX23_WIND_SENSOR
-  tx23_stage = 0;
-  pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
-  digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
-#else
-  pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT);
-#endif
-  attachInterrupt(pin[GPIO_TX2X_TXD_BLACK], TX2xStartRead, RISING);
-}
-
-void Tx2xShow(bool json)
-{
-  char wind_speed_string[33];
-  dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
-  char wind_speed_max_string[33];
-  dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
-  char wind_speed_avg_string[33];
-  dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
-  char wind_direction_string[4];
-  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx2x_wind_direction, kTx2xDirections);
-  char wind_direction_degree[33];
-  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
-      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
-    Tx2xReset();
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_TX2X, wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns35(uint8_t function)
-{
-  bool result = false;
-
-  if (pin[GPIO_TX2X_TXD_BLACK] < 99) {
-    switch (function) {
-      case FUNC_INIT:
-        Tx2xInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        Tx2xRead();
-        break;
-      case FUNC_JSON_APPEND:
-        Tx2xShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tx2xShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
-# 22 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
-#ifdef USE_I2C
-#ifdef USE_MGC3130
-# 35 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
-#define XSNS_36 36
-#define XI2C_27 27
-
-#warning **** MGC3130: It is recommended to disable all unneeded I2C-drivers ****
-
-#define MGC3130_I2C_ADDR 0x42
-
-#define MGC3130_xfer pin[GPIO_MGC3130_XFER]
-#define MGC3130_reset pin[GPIO_MGC3130_RESET]
-
-
-bool MGC3130_type = false;
-char MGC3130stype[] = "MGC3130";
-
-
-#define MGC3130_SYSTEM_STATUS 0x15
-#define MGC3130_REQUEST_MSG 0x06
-#define MGC3130_FW_VERSION 0x83
-#define MGC3130_SET_RUNTIME 0xA2
-#define MGC3130_SENSOR_DATA 0x91
-
-
-#define MGC3130_GESTURE_GARBAGE 1
-#define MGC3130_FLICK_WEST_EAST 2
-#define MGC3130_FLICK_EAST_WEST 3
-#define MGC3130_FLICK_SOUTH_NORTH 4
-#define MGC3130_FLICK_NORTH_SOUTH 5
-#define MGC3130_CIRCLE_CLOCKWISE 6
-#define MGC3130_CIRCLE_CCLOCKWISE 7
-
-#define MGC3130_MIN_ROTVALUE 0
-#define MGC3130_MAX_ROTVALUE 1023
-#define MGC3130_MIN_ZVALUE 32768
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_MGC_3130_SNS[] PROGMEM =
-  "{s}" "%s" "{m}%s{e}"
-  "{s}" "HwRev" "{m}%u.%u{e}"
-  "{s}" "loaderVer" "{m}%u.%u{e}"
-  "{s}" "platVer" "{m}%u{e}";
-#endif
-
-
-
-
-
-
-
-#pragma pack(1)
-union MGC3130_Union{
-  uint8_t buffer[132];
-  struct
-  {
-
-    uint8_t msgSize;
-    uint8_t flag;
-    uint8_t counter;
-    uint8_t id;
-
-    struct {
-        uint8_t DSPStatus:1;
-        uint8_t gestureInfo:1;
-        uint8_t touchInfo:1;
-        uint8_t airWheelInfo:1;
-        uint8_t xyzPosition:1;
-        uint8_t noisePower:1;
-        uint8_t reserved:2;
-        uint8_t electrodeConfiguration:3;
-        uint8_t CICData:1;
-        uint8_t SDData:1;
-        uint16_t reserved2:3;
-    } outputConfigMask;
-    uint8_t timestamp;
-    struct {
-        uint8_t positionValid:1;
-        uint8_t airWheelValid:1;
-        uint8_t rawDataValid:1;
-        uint8_t noisePowerValid:1;
-        uint8_t environmentalNoise:1;
-        uint8_t clipping:1;
-        uint8_t reserved:1;
-        uint8_t DSPRunning:1;
-    } systemInfo;
-    uint16_t dspInfo;
-    struct {
-        uint8_t gestureCode:8;
-        uint8_t reserved:4;
-        uint8_t gestureType:4;
-        uint8_t edgeFlick:1;
-        uint16_t reserved2:14;
-        uint8_t gestureInProgress:1;
-    } gestureInfo;
-    struct {
-        uint8_t touchSouth:1;
-        uint8_t touchWest:1;
-        uint8_t touchNorth:1;
-        uint8_t touchEast:1;
-        uint8_t touchCentre:1;
-        uint8_t tapSouth:1;
-        uint8_t tapWest:1;
-        uint8_t tapNorth:1;
-        uint8_t tapEast :1;
-        uint8_t tapCentre:1;
-        uint8_t doubleTapSouth:1;
-        uint8_t doubleTapWest:1;
-        uint8_t doubleTapNorth:1;
-        uint8_t doubleTapEast:1;
-        uint8_t doubleTapCentre:1;
-        uint8_t reserved:1;
-        uint8_t touchCounter;
-        uint8_t reserved2;
-    } touchInfo;
-    int8_t airWheel;
-    uint8_t reserved;
-    uint16_t x;
-    uint16_t y;
-    uint16_t z;
-    float noisePower;
-    float CICData[4];
-    float SDData[4];
-  } out;
-  struct {
-    uint8_t header[3];
-
-    uint8_t valid;
-    uint8_t hwRev[2];
-    uint8_t parameterStartAddr;
-    uint8_t loaderVersion[2];
-    uint8_t loaderPlatform;
-    uint8_t fwStartAddr;
-    char fwVersion[120];
-  } fw;
-  struct{
-    uint8_t id;
-    uint8_t size;
-    uint16_t error;
-    uint32_t reserved;
-    uint32_t reserved1;
-  } status;
-} MGC_data;
-#pragma pack()
-
-char MGC3130_currentGesture[12];
-
-int8_t MGC3130_delta, MGC3130_lastrotation = 0;
-int16_t MGC3130_rotValue, MGC3130_lastSentRotValue = 0;
-
-uint16_t MGC3130_lastSentX, MGC3130_lastSentY, MGC3130_lastSentZ = 0;
-
-uint8_t hwRev[2], loaderVersion[2], loaderPlatform = 0;
-char MGC3130_firmwareInfo[20];
-
-uint8_t MGC3130_touchTimeout = 0;
-uint16_t MGC3130_touchCounter = 1;
-uint32_t MGC3130_touchTimeStamp = millis();
-bool MGC3130_triggeredByTouch = false;
-
-uint8_t MGC3130_mode = 1;
-
-
-
-uint8_t MGC3130autoCal[] = {0x10, 0x00, 0x00, 0xA2, 0x80, 0x00 , 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF};
-uint8_t MGC3130disableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-uint8_t MGC3130enableAirwheel[] = {0x10, 0x00, 0x00, 0xA2, 0x90, 0x00 , 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00};
-
-void MGC3130_handleSensorData(){
-      if ( MGC_data.out.outputConfigMask.touchInfo && MGC3130_touchTimeout == 0){
-        if (MGC3130_handleTouch()){
-            MGC3130_triggeredByTouch = true;
-            MqttPublishSensor();
-        }
-      }
-
-      if(MGC3130_mode == 1){
-        if( MGC_data.out.outputConfigMask.gestureInfo && MGC_data.out.gestureInfo.gestureCode > 0){
-          MGC3130_handleGesture();
-          MqttPublishSensor();
-        }
-      }
-      if(MGC3130_mode == 2){
-        if(MGC_data.out.outputConfigMask.airWheelInfo && MGC_data.out.systemInfo.airWheelValid){
-          MGC3130_handleAirWheel();
-          MqttPublishSensor();
-        }
-      }
-      if(MGC3130_mode == 3){
-        if(MGC_data.out.systemInfo.positionValid && (MGC_data.out.z > MGC3130_MIN_ZVALUE)){
-          MqttPublishSensor();
-        }
-      }
-}
-
-void MGC3130_sendMessage(uint8_t data[], uint8_t length){
-   Wire.beginTransmission(MGC3130_I2C_ADDR);
-    Wire.write(data,length);
-   Wire.endTransmission();
-    delay(2);
-    MGC3130_receiveMessage();
-}
-
-
-void MGC3130_handleGesture(){
-
-  char edge[5];
-  if (MGC_data.out.gestureInfo.edgeFlick){
-    snprintf_P(edge, sizeof(edge), PSTR("ED_"));
-  }
-  else{
-    snprintf_P(edge, sizeof(edge), PSTR(""));
-  }
-  switch(MGC_data.out.gestureInfo.gestureCode){
-    case MGC3130_GESTURE_GARBAGE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("NONE"));
-    break;
-    case MGC3130_FLICK_WEST_EAST:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_WE"), edge);
-    break;
-    case MGC3130_FLICK_EAST_WEST:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_EW"), edge);
-    break;
-    case MGC3130_FLICK_SOUTH_NORTH:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_SN"), edge);
-    break;
-    case MGC3130_FLICK_NORTH_SOUTH:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("%sFL_NS"), edge);
-    break;
-    case MGC3130_CIRCLE_CLOCKWISE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CW"));
-    break;
-    case MGC3130_CIRCLE_CCLOCKWISE:
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("CCW"));
-    break;
-  }
-
-}
-
-bool MGC3130_handleTouch(){
-
-  bool success = false;
-    if (MGC_data.out.touchInfo.doubleTapCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_C"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_E"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_N"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_W"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.doubleTapSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("DT_S"));
-    MGC3130_touchTimeout = 5;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    if (MGC_data.out.touchInfo.tapCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_C"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_E"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_N"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_W"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.tapSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TP_S"));
-    MGC3130_touchTimeout = 2;
-    success = true;
-    MGC3130_touchCounter = 1;
-    }
-    else if (MGC_data.out.touchInfo.touchCentre && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_C"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchEast && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_E"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchNorth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_N"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchWest && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_W"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-    else if (MGC_data.out.touchInfo.touchSouth && !success){
-
-    snprintf_P(MGC3130_currentGesture, sizeof(MGC3130_currentGesture), PSTR("TH_S"));
-    success = true;
-    MGC3130_touchCounter++;
-    }
-
-  return success;
-}
-
-void MGC3130_handleAirWheel(){
-  MGC3130_delta = MGC_data.out.airWheel - MGC3130_lastrotation;
-  MGC3130_lastrotation = MGC_data.out.airWheel;
-
-      MGC3130_rotValue = MGC3130_rotValue + MGC3130_delta;
-      if(MGC3130_rotValue < MGC3130_MIN_ROTVALUE){
-        MGC3130_rotValue = MGC3130_MIN_ROTVALUE;
-      }
-      if(MGC3130_rotValue > MGC3130_MAX_ROTVALUE){
-        MGC3130_rotValue = MGC3130_MAX_ROTVALUE;
-      }
-}
-
-void MGC3130_handleSystemStatus(){
-
-}
-
-bool MGC3130_receiveMessage(){
-  if(MGC3130_readData()){
-      switch(MGC_data.out.id){
-        case MGC3130_SENSOR_DATA:
-          MGC3130_handleSensorData();
-          break;
-        case MGC3130_SYSTEM_STATUS:
-          MGC3130_handleSystemStatus();
-          break;
-        case MGC3130_FW_VERSION:
-          hwRev[0] = MGC_data.fw.hwRev[1];
-          hwRev[1] = MGC_data.fw.hwRev[0];
-          loaderVersion[0] = MGC_data.fw.loaderVersion[0];
-          loaderVersion[1] = MGC_data.fw.loaderVersion[1];
-          loaderPlatform = MGC_data.fw.loaderPlatform;
-          snprintf_P(MGC3130_firmwareInfo, sizeof(MGC3130_firmwareInfo), PSTR("FW: %s"), MGC_data.fw.fwVersion);
-          MGC3130_firmwareInfo[20] = '\0';
-
-          break;
-      }
-    return true;
-  }
-  return false;
-}
-
-bool MGC3130_readData()
-{
-  bool success = false;
-  if (!digitalRead(MGC3130_xfer)){
-    pinMode(MGC3130_xfer, OUTPUT);
-    digitalWrite(MGC3130_xfer, LOW);
-    Wire.requestFrom(MGC3130_I2C_ADDR, (uint16_t)32);
-
-    MGC_data.buffer[0] = 4;
-    unsigned char i = 0;
-    while(Wire.available() && (i < MGC_data.buffer[0])){
-      MGC_data.buffer[i] = Wire.read();
-      i++;
-      }
-    digitalWrite(MGC3130_xfer, HIGH);
-    pinMode(MGC3130_xfer, INPUT);
-    success = true;
-  }
-  return success;
-}
-
-void MGC3130_nextMode(){
-  if (MGC3130_mode < 3){
-    MGC3130_mode++;
-  }
-  else{
-    MGC3130_mode = 1;
-  }
-  switch(MGC3130_mode){
-    case 1:
-    MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-    case 2:
-    MGC3130_sendMessage(MGC3130enableAirwheel,16);
-    break;
-    case 3:
-    MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-  }
-}
-
-void MGC3130_loop()
-{
-  if(MGC3130_touchTimeout > 0){
-    MGC3130_touchTimeout--;
-  }
-  MGC3130_receiveMessage();
-}
-
-void MGC3130_detect(void)
-{
-  if (MGC3130_type || I2cActive(MGC3130_I2C_ADDR)) { return; }
-
-  pinMode(MGC3130_xfer, INPUT_PULLUP);
-  pinMode(MGC3130_reset, OUTPUT);
-  digitalWrite(MGC3130_reset, LOW);
-  delay(10);
-  digitalWrite(MGC3130_reset, HIGH);
-  delay(50);
-
-  if (MGC3130_receiveMessage()) {
-    I2cSetActiveFound(MGC3130_I2C_ADDR, MGC3130stype);
-    MGC3130_currentGesture[0] = '\0';
-    MGC3130_type = true;
-  }
-}
-
-
-
-
-
-void MGC3130_show(bool json)
-{
-  if (!MGC3130_type) { return; }
-
-  char status_chr[2];
-  if (MGC_data.out.systemInfo.DSPRunning) {
-    sprintf (status_chr, "1");
-  }
-  else{
-    sprintf (status_chr, "0");
-  }
-
-  if (json) {
-    if (MGC3130_mode == 3 && !MGC3130_triggeredByTouch) {
-      if (MGC_data.out.systemInfo.positionValid && !(MGC_data.out.x == MGC3130_lastSentX && MGC_data.out.y == MGC3130_lastSentY && MGC_data.out.z == MGC3130_lastSentZ)) {
-        ResponseAppend_P(PSTR(",\"%s\":{\"X\":%u,\"Y\":%u,\"Z\":%u}"),
-          MGC3130stype, MGC_data.out.x/64, MGC_data.out.y/64, (MGC_data.out.z-(uint16_t)MGC3130_MIN_ZVALUE)/64);
-        MGC3130_lastSentX = MGC_data.out.x;
-        MGC3130_lastSentY = MGC_data.out.y;
-        MGC3130_lastSentZ = MGC_data.out.z;
-      }
-    }
-    MGC3130_triggeredByTouch = false;
-
-    if (MGC3130_mode == 2) {
-      if (MGC_data.out.systemInfo.airWheelValid && (MGC3130_rotValue != MGC3130_lastSentRotValue)) {
-        ResponseAppend_P(PSTR(",\"%s\":{\"AW\":%i}"), MGC3130stype, MGC3130_rotValue);
-        MGC3130_lastSentRotValue = MGC3130_rotValue;
-      }
-    }
-
-    if (MGC3130_currentGesture[0] != '\0') {
-      if (millis() - MGC3130_touchTimeStamp > 220 ) {
-        MGC3130_touchCounter = 1;
-      }
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), MGC3130stype, MGC3130_currentGesture, MGC3130_touchCounter);
-      MGC3130_currentGesture[0] = '\0';
-      MGC3130_touchTimeStamp = millis();
-    }
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_MGC_3130_SNS, MGC3130stype, status_chr, hwRev[0], hwRev[1], loaderVersion[0], loaderVersion[1], loaderPlatform );
-#endif
-  }
-}
-# 557 "S:/Development/Tasmota/tasmota/xsns_36_mgc3130.ino"
-bool MGC3130CommandSensor()
-{
-  bool serviced = true;
-
-  switch (XdrvMailbox.payload) {
-    case 0:
-      MGC3130_nextMode();
-      break;
-    case 1:
-      MGC3130_mode = 1;
-      MGC3130_sendMessage(MGC3130disableAirwheel,16);
-      break;
-    case 2:
-      MGC3130_mode = 2;
-      MGC3130_sendMessage(MGC3130enableAirwheel,16);
-      break;
-    case 3:
-      MGC3130_mode = 3;
-      MGC3130_sendMessage(MGC3130disableAirwheel,16);
-    break;
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns36(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_27)) { return false; }
-
-  bool result = false;
-
-  if ((FUNC_INIT == function) && (pin[GPIO_MGC3130_XFER] < 99) && (pin[GPIO_MGC3130_RESET] < 99)) {
-    MGC3130_detect();
-  }
-  else if (MGC3130_type) {
-    switch (function) {
-      case FUNC_EVERY_50_MSECOND:
-        MGC3130_loop();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_36 == XdrvMailbox.index) {
-          result = MGC3130CommandSensor();
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        MGC3130_show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MGC3130_show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#ifdef USE_RF_SENSOR
-# 33 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define XSNS_37 37
-
-
-
-
-#define RFSNS_VALID_WINDOW 1800
-
-#define RFSNS_LOOPS_PER_MILLI 1900
-#define RFSNS_RAW_BUFFER_SIZE 180
-#define RFSNS_MIN_RAW_PULSES 112
-
-#define RFSNS_MIN_PULSE_LENGTH 300
-#define RFSNS_RAWSIGNAL_SAMPLE 50
-#define RFSNS_SIGNAL_TIMEOUT 10
-#define RFSNS_SIGNAL_REPEAT_TIME 500
-
-typedef struct RawSignalStruct
-{
-  int Number;
-  uint8_t Repeats;
-  uint8_t Multiply;
-  unsigned long Time;
-  uint8_t Pulses[RFSNS_RAW_BUFFER_SIZE+2];
-
-} raw_signal_t;
-
-raw_signal_t *rfsns_raw_signal = nullptr;
-uint8_t rfsns_rf_bit;
-uint8_t rfsns_rf_port;
-uint8_t rfsns_any_sensor = 0;
-
-
-
-
-
-bool RfSnsFetchSignal(uint8_t DataPin, bool StateSignal)
-{
-  uint8_t Fbit = digitalPinToBitMask(DataPin);
-  uint8_t Fport = digitalPinToPort(DataPin);
-  uint8_t FstateMask = (StateSignal ? Fbit : 0);
-
-  if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
-    const unsigned long LoopsPerMilli = RFSNS_LOOPS_PER_MILLI;
-
-
-
-
-
-
-    unsigned long PulseLength = 0;
-    if (rfsns_raw_signal->Time) {
-      if (rfsns_raw_signal->Repeats && (rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) {
-        PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
-        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && (PulseLength > micros())) {
-          if ((*portInputRegister(Fport) & Fbit) == FstateMask) {
-            PulseLength = micros() + RFSNS_SIGNAL_TIMEOUT *1000;
-          }
-        }
-        while (((rfsns_raw_signal->Time + RFSNS_SIGNAL_REPEAT_TIME) > millis()) && ((*portInputRegister(Fport) & Fbit) != FstateMask));
-      }
-    }
-
-    int RawCodeLength = 1;
-    bool Ftoggle = false;
-    unsigned long numloops = 0;
-    unsigned long maxloops = RFSNS_SIGNAL_TIMEOUT * LoopsPerMilli;
-    rfsns_raw_signal->Multiply = RFSNS_RAWSIGNAL_SAMPLE;
-    do {
-      numloops = 0;
-      while(((*portInputRegister(Fport) & Fbit) == FstateMask) ^ Ftoggle) {
-        if (numloops++ == maxloops) { break; }
-      }
-      PulseLength = (numloops *1000) / LoopsPerMilli;
-      if (PulseLength < RFSNS_MIN_PULSE_LENGTH) { break; }
-      Ftoggle = !Ftoggle;
-      rfsns_raw_signal->Pulses[RawCodeLength++] = PulseLength / (unsigned long)rfsns_raw_signal->Multiply;
-    }
-    while(RawCodeLength < RFSNS_RAW_BUFFER_SIZE && numloops <= maxloops);
-
-    if ((RawCodeLength >= RFSNS_MIN_RAW_PULSES) && (RawCodeLength < RFSNS_RAW_BUFFER_SIZE -1)) {
-      rfsns_raw_signal->Repeats = 0;
-      rfsns_raw_signal->Number = RawCodeLength -1;
-      rfsns_raw_signal->Pulses[rfsns_raw_signal->Number] = 0;
-      rfsns_raw_signal->Time = millis();
-      return true;
-    }
-    else
-      rfsns_raw_signal->Number = 0;
-  }
-
-  return false;
-}
-
-#ifdef USE_THEO_V2
-# 149 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define RFSNS_THEOV2_MAX_CHANNEL 2
-
-#define RFSNS_THEOV2_PULSECOUNT 114
-#define RFSNS_THEOV2_RF_PULSE_MID 1000
-
-typedef struct {
-  uint32_t time;
-  int16_t temp;
-  uint16_t lux;
-  uint8_t volt;
-} theo_v2_t1_t;
-
-typedef struct {
-  uint32_t time;
-  int16_t temp;
-  uint16_t hum;
-  uint8_t volt;
-} theo_v2_t2_t;
-
-theo_v2_t1_t *rfsns_theo_v2_t1 = nullptr;
-theo_v2_t2_t *rfsns_theo_v2_t2 = nullptr;
-
-void RfSnsInitTheoV2(void)
-{
-  rfsns_theo_v2_t1 = (theo_v2_t1_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t1_t));
-  rfsns_theo_v2_t2 = (theo_v2_t2_t*)malloc(RFSNS_THEOV2_MAX_CHANNEL * sizeof(theo_v2_t2_t));
-  rfsns_any_sensor++;
-}
-
-void RfSnsAnalyzeTheov2(void)
-{
-  if (rfsns_raw_signal->Number != RFSNS_THEOV2_PULSECOUNT) { return; }
-
-  uint8_t Checksum;
-  uint8_t Channel;
-  uint8_t Type;
-  uint8_t Voltage;
-  int Payload1;
-  int Payload2;
-
-  uint8_t b, bytes, bits, id;
-
-  uint8_t idx = 3;
-  uint8_t chksum = 0;
-  for (bytes = 0; bytes < 7; bytes++) {
-    b = 0;
-    for (bits = 0; bits <= 7; bits++)
-    {
-      if ((rfsns_raw_signal->Pulses[idx] * rfsns_raw_signal->Multiply) > RFSNS_THEOV2_RF_PULSE_MID) {
-        b |= 1 << bits;
-      }
-      idx += 2;
-    }
-    if (bytes > 0) { chksum += b; }
-
-    switch (bytes) {
-    case 0:
-      Checksum = b;
-      break;
-    case 1:
-      id = b;
-      Channel = b & 0x7;
-      Type = (b >> 3) & 0x1f;
-      break;
-    case 2:
-      Voltage = b;
-      break;
-    case 3:
-      Payload1 = b;
-      break;
-    case 4:
-      Payload1 = (b << 8) | Payload1;
-      break;
-    case 5:
-      Payload2 = b;
-      break;
-    case 6:
-      Payload2 = (b << 8) | Payload2;
-      break;
-    }
-  }
-
-  if (Checksum != chksum) { return; }
-  if ((Channel == 0) || (Channel > RFSNS_THEOV2_MAX_CHANNEL)) { return; }
-  Channel--;
-
-  rfsns_raw_signal->Repeats = 1;
-
-  int Payload3 = Voltage & 0x3f;
-
-  switch (Type) {
-  case 1:
-    rfsns_theo_v2_t1[Channel].time = LocalTime();
-    rfsns_theo_v2_t1[Channel].volt = Payload3;
-    rfsns_theo_v2_t1[Channel].temp = Payload1;
-    rfsns_theo_v2_t1[Channel].lux = Payload2;
-    break;
-  case 2:
-    rfsns_theo_v2_t2[Channel].time = LocalTime();
-    rfsns_theo_v2_t2[Channel].volt = Payload3;
-    rfsns_theo_v2_t2[Channel].temp = Payload1;
-    rfsns_theo_v2_t2[Channel].hum = Payload2;
-    break;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: TheoV2, ChkCalc %d, Chksum %d, id %d, Type %d, Ch %d, Volt %d, BattLo %d, Pld1 %d, Pld2 %d"),
-    chksum, Checksum, id, Type, Channel +1, Payload3, (Voltage & 0x80) >> 7, Payload1, Payload2);
-}
-
-void RfSnsTheoV2Show(bool json)
-{
-  bool sensor_once = false;
-
-  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
-    if (rfsns_theo_v2_t1[i].time) {
-      char sensor[10];
-      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T1C%d"), i +1);
-      char voltage[33];
-      dtostrfd((float)rfsns_theo_v2_t1[i].volt / 10, 1, voltage);
-
-      if (rfsns_theo_v2_t1[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED "\":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, GetDT(rfsns_theo_v2_t1[i].time).c_str(), voltage);
-        }
-      } else {
-        char temperature[33];
-        dtostrfd(ConvertTemp((float)rfsns_theo_v2_t1[i].temp / 100), Settings.flag2.temperature_resolution, temperature);
-
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_ILLUMINANCE "\":%d,\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, temperature, rfsns_theo_v2_t1[i].lux, voltage);
-#ifdef USE_DOMOTICZ
-          if ((0 == tele_period) && !sensor_once) {
-            DomoticzSensor(DZ_TEMP, temperature);
-            DomoticzSensor(DZ_ILLUMINANCE, rfsns_theo_v2_t1[i].lux);
-            sensor_once = true;
-          }
-#endif
-#ifdef USE_WEBSERVER
-        } else {
-          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
-          WSContentSend_PD(HTTP_SNS_ILLUMINANCE, sensor, rfsns_theo_v2_t1[i].lux);
-#endif
-        }
-      }
-    }
-  }
-
-  sensor_once = false;
-  for (uint32_t i = 0; i < RFSNS_THEOV2_MAX_CHANNEL; i++) {
-    if (rfsns_theo_v2_t2[i].time) {
-      char sensor[10];
-      snprintf_P(sensor, sizeof(sensor), PSTR("TV2T2C%d"), i +1);
-      char voltage[33];
-      dtostrfd((float)rfsns_theo_v2_t2[i].volt / 10, 1, voltage);
-
-      if (rfsns_theo_v2_t2[i].time < LocalTime() - RFSNS_VALID_WINDOW) {
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_RFRECEIVED" \":\"%s\",\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, GetDT(rfsns_theo_v2_t2[i].time).c_str(), voltage);
-        }
-      } else {
-        float temp = ConvertTemp((float)rfsns_theo_v2_t2[i].temp / 100);
-        float humi = ConvertHumidity((float)rfsns_theo_v2_t2[i].hum / 100);
-        char temperature[33];
-        dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
-        char humidity[33];
-        dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
-
-        if (json) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"" D_JSON_VOLTAGE "\":%s}"),
-            sensor, temperature, humidity, voltage);
-          if ((0 == tele_period) && !sensor_once) {
-#ifdef USE_DOMOTICZ
-            DomoticzTempHumSensor(temperature, humidity);
-#endif
-#ifdef USE_KNX
-            KnxSensor(KNX_TEMPERATURE, temp);
-            KnxSensor(KNX_HUMIDITY, humi);
-#endif
-            sensor_once = true;
-          }
-#ifdef USE_WEBSERVER
-        } else {
-          WSContentSend_PD(HTTP_SNS_TEMP, sensor, temperature, TempUnit());
-          WSContentSend_PD(HTTP_SNS_HUM, sensor, humidity);
-#endif
-        }
-      }
-    }
-  }
-}
-
-#endif
-
-#ifdef USE_ALECTO_V2
-# 392 "S:/Development/Tasmota/tasmota/xsns_37_rfsensor.ino"
-#define RFSNS_DKW2012_PULSECOUNT 176
-#define RFSNS_ACH2010_MIN_PULSECOUNT 160
-#define RFSNS_ACH2010_MAX_PULSECOUNT 160
-
-#define D_ALECTOV2 "AlectoV2"
-
-const char kAlectoV2Directions[] PROGMEM = D_TX20_NORTH "|"
-                                           D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_EAST D_TX20_NORTH D_TX20_EAST "|"
-                                           D_TX20_EAST "|"
-                                           D_TX20_EAST D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_EAST "|"
-                                           D_TX20_SOUTH "|"
-                                           D_TX20_SOUTH D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_WEST D_TX20_SOUTH D_TX20_WEST "|"
-                                           D_TX20_WEST "|"
-                                           D_TX20_WEST D_TX20_NORTH D_TX20_WEST "|"
-                                           D_TX20_NORTH D_TX20_WEST "|"
-                                           D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
-
-typedef struct {
-  uint32_t time;
-  float temp;
-  float rain;
-  float wind;
-  float gust;
-  uint8_t type;
-  uint8_t humi;
-  uint8_t wdir;
-} alecto_v2_t;
-
-alecto_v2_t *rfsns_alecto_v2 = nullptr;
-uint16_t rfsns_alecto_rain_base = 0;
-
-void RfSnsInitAlectoV2(void)
-{
-  rfsns_alecto_v2 = (alecto_v2_t*)malloc(sizeof(alecto_v2_t));
-  rfsns_any_sensor++;
-}
-
-void RfSnsAnalyzeAlectov2()
-{
-  if (!(((rfsns_raw_signal->Number >= RFSNS_ACH2010_MIN_PULSECOUNT) &&
-         (rfsns_raw_signal->Number <= RFSNS_ACH2010_MAX_PULSECOUNT)) || (rfsns_raw_signal->Number == RFSNS_DKW2012_PULSECOUNT))) { return; }
-
-  uint8_t c = 0;
-  uint8_t rfbit;
-  uint8_t data[9] = { 0 };
-  uint8_t msgtype = 0;
-  uint8_t rc = 0;
-  int temp;
-  uint8_t checksum = 0;
-  uint8_t checksumcalc = 0;
-  uint8_t maxidx = 8;
-  unsigned long atime;
-  float factor;
-  char buf1[16];
-
-  if (rfsns_raw_signal->Number > RFSNS_ACH2010_MAX_PULSECOUNT) { maxidx = 9; }
-
-  uint8_t idx = maxidx;
-  for (uint32_t x = rfsns_raw_signal->Number; x > 0; x = x-2) {
-    if (rfsns_raw_signal->Pulses[x-1] * rfsns_raw_signal->Multiply < 0x300) {
-      rfbit = 0x80;
-    } else {
-      rfbit = 0;
-    }
-    data[idx] = (data[idx] >> 1) | rfbit;
-    c++;
-    if (c == 8) {
-      if (idx == 0) { break; }
-      c = 0;
-      idx--;
-    }
-  }
-
-  checksum = data[maxidx];
-  checksumcalc = RfSnsAlectoCRC8(data, maxidx);
-
-  msgtype = (data[0] >> 4) & 0xf;
-  rc = (data[0] << 4) | (data[1] >> 4);
-
-  if (checksum != checksumcalc) { return; }
-  if ((msgtype != 10) && (msgtype != 5)) { return; }
-
-  rfsns_raw_signal->Repeats = 1;
-
-
-
-
-
-  factor = 1.22;
-
-
-
-
-
-  rfsns_alecto_v2->time = LocalTime();
-  rfsns_alecto_v2->type = (RFSNS_DKW2012_PULSECOUNT == rfsns_raw_signal->Number);
-  rfsns_alecto_v2->temp = (float)(((data[1] & 0x3) * 256 + data[2]) - 400) / 10;
-  rfsns_alecto_v2->humi = data[3];
-  uint16_t rain = (data[6] * 256) + data[7];
-
-  if (rain < rfsns_alecto_rain_base) { rfsns_alecto_rain_base = rain; }
-  if (rfsns_alecto_rain_base > 0) {
-    rfsns_alecto_v2->rain += ((float)rain - rfsns_alecto_rain_base) * 0.30;
-  }
-  rfsns_alecto_rain_base = rain;
-  rfsns_alecto_v2->wind = (float)data[4] * factor;
-  rfsns_alecto_v2->gust = (float)data[5] * factor;
-  if (rfsns_alecto_v2->type) {
-    rfsns_alecto_v2->wdir = data[8] & 0xf;
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: " D_ALECTOV2 ", ChkCalc %d, Chksum %d, rc %d, Temp %d, Hum %d, Rain %d, Wind %d, Gust %d, Dir %d, Factor %s"),
-    checksumcalc, checksum, rc, ((data[1] & 0x3) * 256 + data[2]) - 400, data[3], (data[6] * 256) + data[7], data[4], data[5], data[8] & 0xf, dtostrfd(factor, 3, buf1));
-}
-
-void RfSnsAlectoResetRain(void)
-{
-  if ((RtcTime.hour == 0) && (RtcTime.minute == 0) && (RtcTime.second == 5)) {
-    rfsns_alecto_v2->rain = 0;
-  }
-}
-
-
-
-
-
-
-
-uint8_t RfSnsAlectoCRC8(uint8_t *addr, uint8_t len)
-{
-  uint8_t crc = 0;
-  while (len--) {
-    uint8_t inbyte = *addr++;
-    for (uint32_t i = 8; i; i--) {
-      uint8_t mix = (crc ^ inbyte) & 0x80;
-      crc <<= 1;
-      if (mix) { crc ^= 0x31; }
-      inbyte <<= 1;
-    }
-  }
-  return crc;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_ALECTOV2[] PROGMEM =
-  "{s}" D_ALECTOV2 " " D_RAIN "{m}%s " D_UNIT_MILLIMETER "{e}"
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}";
-const char HTTP_SNS_ALECTOV2_WDIR[] PROGMEM =
-  "{s}" D_ALECTOV2 " " D_TX20_WIND_DIRECTION "{m}%s{e}";
-#endif
-
-void RfSnsAlectoV2Show(bool json)
-{
-  if (rfsns_alecto_v2->time) {
-    if (rfsns_alecto_v2->time < LocalTime() - RFSNS_VALID_WINDOW) {
-      if (json) {
-        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_RFRECEIVED "\":\"%s\"}"), GetDT(rfsns_alecto_v2->time).c_str());
-      }
-    } else {
-      float temp = ConvertTemp(rfsns_alecto_v2->temp);
-      char temperature[33];
-      dtostrfd(temp, Settings.flag2.temperature_resolution, temperature);
-      float humi = ConvertHumidity((float)rfsns_alecto_v2->humi);
-      char humidity[33];
-      dtostrfd(humi, Settings.flag2.humidity_resolution, humidity);
-      char rain[33];
-      dtostrfd(rfsns_alecto_v2->rain, 2, rain);
-      char wind[33];
-      dtostrfd(rfsns_alecto_v2->wind, 2, wind);
-      char gust[33];
-      dtostrfd(rfsns_alecto_v2->gust, 2, gust);
-      char wdir[4];
-      char direction[20];
-      if (rfsns_alecto_v2->type) {
-        GetTextIndexed(wdir, sizeof(wdir), rfsns_alecto_v2->wdir, kAlectoV2Directions);
-        snprintf_P(direction, sizeof(direction), PSTR(",\"Direction\":\"%s\""), wdir);
-      }
-
-      if (json) {
-        ResponseAppend_P(PSTR(",\"" D_ALECTOV2 "\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s,\"Rain\":%s,\"Wind\":%s,\"Gust\":%s%s}"),
-          temperature, humidity, rain, wind, gust, (rfsns_alecto_v2->type) ? direction : "");
-        if (0 == tele_period) {
-#ifdef USE_DOMOTICZ
-
-
-
-
-#endif
-        }
-#ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_TEMP, D_ALECTOV2, temperature, TempUnit());
-        WSContentSend_PD(HTTP_SNS_HUM, D_ALECTOV2, humidity);
-        WSContentSend_PD(HTTP_SNS_ALECTOV2, rain, wind, gust);
-        if (rfsns_alecto_v2->type) {
-          WSContentSend_PD(HTTP_SNS_ALECTOV2_WDIR, wdir);
-        }
-#endif
-      }
-    }
-  }
-}
-#endif
-
-void RfSnsInit(void)
-{
-  rfsns_raw_signal = (raw_signal_t*)(malloc(sizeof(raw_signal_t)));
-  if (rfsns_raw_signal) {
-    memset(rfsns_raw_signal, 0, sizeof(raw_signal_t));
-#ifdef USE_THEO_V2
-    RfSnsInitTheoV2();
-#endif
-#ifdef USE_ALECTO_V2
-    RfSnsInitAlectoV2();
-#endif
-    if (rfsns_any_sensor) {
-      rfsns_rf_bit = digitalPinToBitMask(pin[GPIO_RF_SENSOR]);
-      rfsns_rf_port = digitalPinToPort(pin[GPIO_RF_SENSOR]);
-      pinMode(pin[GPIO_RF_SENSOR], INPUT);
-    } else {
-      free(rfsns_raw_signal);
-      rfsns_raw_signal = nullptr;
-    }
-  }
-}
-
-void RfSnsAnalyzeRawSignal(void)
-{
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RFS: Pulses %d"), (int)rfsns_raw_signal->Number);
-
-#ifdef USE_THEO_V2
-    RfSnsAnalyzeTheov2();
-#endif
-#ifdef USE_ALECTO_V2
-    RfSnsAnalyzeAlectov2();
-#endif
-}
-
-void RfSnsEverySecond(void)
-{
-#ifdef USE_ALECTO_V2
-  RfSnsAlectoResetRain();
-#endif
-}
-
-void RfSnsShow(bool json)
-{
-#ifdef USE_THEO_V2
-  RfSnsTheoV2Show(json);
-#endif
-#ifdef USE_ALECTO_V2
-  RfSnsAlectoV2Show(json);
-#endif
-}
-
-
-
-
-
-bool Xsns37(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_RF_SENSOR] < 99) && (FUNC_INIT == function)) {
-    RfSnsInit();
-  }
-  else if (rfsns_raw_signal) {
-    switch (function) {
-      case FUNC_LOOP:
-        if ((*portInputRegister(rfsns_rf_port) &rfsns_rf_bit) == rfsns_rf_bit) {
-          if (RfSnsFetchSignal(pin[GPIO_RF_SENSOR], HIGH)) {
-            RfSnsAnalyzeRawSignal();
-          }
-        }
-        sleep = 0;
-        break;
-      case FUNC_EVERY_SECOND:
-        RfSnsEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        RfSnsShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        RfSnsShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
-#ifdef USE_AZ7798
-
-#define XSNS_38 38
-# 112 "S:/Development/Tasmota/tasmota/xsns_38_az7798.ino"
-#include <TasmotaSerial.h>
-
-#ifndef CO2_LOW
-#define CO2_LOW 800
-#endif
-#ifndef CO2_HIGH
-#define CO2_HIGH 1200
-#endif
-
-#define AZ_READ_TIMEOUT 400
-
-#define AZ_CLOCK_UPDATE_INTERVAL (24UL * 60 * 60)
-#define AZ_EPOCH (946684800UL)
-
-TasmotaSerial *AzSerial;
-
-const char ktype[] = "AZ7798";
-uint8_t az_type = 1;
-uint16_t az_co2 = 0;
-double az_temperature = 0;
-double az_humidity = 0;
-uint8_t az_received = 0;
-uint8_t az_state = 0;
-unsigned long az_clock_update = 10;
-
-
-
-void AzEverySecond(void)
-{
-  unsigned long start = millis();
-
-  az_state++;
-  if (5 == az_state) {
-    az_state = 0;
-
-    AzSerial->flush();
-    AzSerial->write(":\r", 2);
-    az_received = 0;
-
-    uint8_t az_response[32];
-    uint8_t counter = 0;
-    uint8_t i, j;
-    uint8_t response_substr[16];
-
-    do {
-      if (AzSerial->available() > 0) {
-        az_response[counter] = AzSerial->read();
-        if(az_response[counter] == 0x0d) { az_received = 1; }
-        counter++;
-      } else {
-        delay(5);
-      }
-    } while(((millis() - start) < AZ_READ_TIMEOUT) && (counter < sizeof(az_response)) && !az_received);
-
-    AddLogBuffer(LOG_LEVEL_DEBUG_MORE, az_response, counter);
-
-    if (!az_received) {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 comms timeout"));
-      return;
-    }
-
-    i = 0;
-    while((az_response[i] != 'T') && (i < counter)) {i++;}
-    if(az_response[i] != 'T') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find start of response"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != 'C') && (az_response[i] != 'F') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if((az_response[i] != 'C') && (az_response[i] != 'F')){
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of temperature"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_temperature = CharToFloat((char*)response_substr);
-    if(az_response[i] == 'C') {
-      az_temperature = ConvertTemp((float)az_temperature);
-    } else {
-      az_temperature = ConvertTemp((az_temperature - 32) / 1.8);
-    }
-    i++;
-    if(az_response[i] != ':') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error first delimiter"));
-      return;
-    }
-    i++;
-    if(az_response[i] != 'C') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of CO2"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != 'p') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if(az_response[i] != 'p') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of CO2"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_co2 = atoi((char*)response_substr);
-    LightSetSignal(CO2_LOW, CO2_HIGH, az_co2);
-    i += 3;
-    if(az_response[i] != ':') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error second delimiter"));
-      return;
-    }
-    i++;
-    if(az_response[i] != 'H') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 error start of humidity"));
-      return;
-    }
-    i++;
-    j = 0;
-
-    while((az_response[i] != '%') && (i < counter)) {
-      response_substr[j++] = az_response[i++];
-    }
-    if(az_response[i] != '%') {
-      AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 failed to find end of humidity"));
-      return;
-    }
-    response_substr[j] = 0;
-    az_humidity = ConvertHumidity(CharToFloat((char*)response_substr));
-  }
-
-
-  if ((az_clock_update == 0) && (LocalTime() > AZ_EPOCH)) {
-    char tmpString[16];
-    sprintf(tmpString, "C %d\r", (int)(LocalTime() - AZ_EPOCH));
-    AzSerial->write(tmpString);
-
-    do {
-      if (AzSerial->available() > 0) {
-        if(AzSerial->read() == 0x0d) { break; }
-      } else {
-        delay(5);
-      }
-    } while(((millis() - start) < AZ_READ_TIMEOUT));
-    az_clock_update = AZ_CLOCK_UPDATE_INTERVAL;
-    AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DEBUG "AZ7798 clock updated"));
-  } else {
-    az_clock_update--;
-  }
-}
-
-
-
-void AzInit(void)
-{
-  az_type = 0;
-  if ((pin[GPIO_AZ_RXD] < 99) && (pin[GPIO_AZ_TXD] < 99)) {
-    AzSerial = new TasmotaSerial(pin[GPIO_AZ_RXD], pin[GPIO_AZ_TXD], 1);
-    if (AzSerial->begin(9600)) {
-      if (AzSerial->hardwareSerial()) { ClaimSerial(); }
-      az_type = 1;
-    }
-  }
-}
-
-void AzShow(bool json)
-{
-  char temperature[33];
-  dtostrfd(az_temperature, Settings.flag2.temperature_resolution, temperature);
-  char humidity[33];
-  dtostrfd(az_humidity, Settings.flag2.humidity_resolution, humidity);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"), ktype, az_co2, temperature, humidity);
-#ifdef USE_DOMOTICZ
-    if (0 == tele_period) DomoticzSensor(DZ_AIRQUALITY, az_co2);
-#endif
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_CO2, ktype, az_co2);
-    WSContentSend_PD(HTTP_SNS_TEMP, ktype, temperature, TempUnit());
-    WSContentSend_PD(HTTP_SNS_HUM, ktype, humidity);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns38(uint8_t function)
-{
-  bool result = false;
-
-  if(az_type){
-    switch (function) {
-      case FUNC_INIT:
-        AzInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        AzEverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        AzShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        AzShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_39_max31855.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_39_max31855.ino"
-#ifdef USE_MAX31855
-
-#define XSNS_39 39
-
-bool initialized = false;
-
-struct MAX31855_ResultStruct{
-    uint8_t ErrorCode;
-    float ProbeTemperature;
-    float ReferenceTemperature;
-} MAX31855_Result;
-
-void MAX31855_Init(void){
-    if(initialized)
-        return;
-
-
-    pinMode(pin[GPIO_MAX31855CS], OUTPUT);
-    pinMode(pin[GPIO_MAX31855CLK], OUTPUT);
-    pinMode(pin[GPIO_MAX31855DO], INPUT);
-
-
-    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
-    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-
-    initialized = true;
-}
-
-
-
-
-
-void MAX31855_GetResult(void){
-    int32_t RawData = MAX31855_ShiftIn(32);
-    uint8_t probeerror = RawData & 0x7;
-
-    MAX31855_Result.ErrorCode = probeerror;
-    MAX31855_Result.ReferenceTemperature = MAX31855_GetReferenceTemperature(RawData);
-    if(probeerror)
-        MAX31855_Result.ProbeTemperature = NAN;
-    else
-        MAX31855_Result.ProbeTemperature = MAX31855_GetProbeTemperature(RawData);
-}
-
-
-
-
-
-
-float MAX31855_GetProbeTemperature(int32_t RawData){
-    if(RawData & 0x80000000)
-        RawData = (RawData >> 18) | 0xFFFFC000;
-    else
-        RawData >>= 18;
-
-    float result = (RawData * 0.25);
-
-    return ConvertTemp(result);
-}
-
-
-
-
-
-float MAX31855_GetReferenceTemperature(int32_t RawData){
-    if(RawData & 0x8000)
-        RawData = (RawData >> 4) | 0xFFFFF000;
-    else
-        RawData = (RawData >> 4) & 0x00000FFF;
-
-    float result = (RawData * 0.0625);
-
-    return ConvertTemp(result);
-}
-
-
-
-
-
-int32_t MAX31855_ShiftIn(uint8_t Length){
-    int32_t dataIn = 0;
-
-    digitalWrite(pin[GPIO_MAX31855CS], LOW);
-    delayMicroseconds(1);
-
-    for (uint32_t i = 0; i < Length; i++)
-    {
-        digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-        delayMicroseconds(1);
-        dataIn <<= 1;
-        if(digitalRead(pin[GPIO_MAX31855DO]))
-            dataIn |= 1;
-        digitalWrite(pin[GPIO_MAX31855CLK], HIGH);
-        delayMicroseconds(1);
-    }
-
-    digitalWrite(pin[GPIO_MAX31855CS], HIGH);
-    digitalWrite(pin[GPIO_MAX31855CLK], LOW);
-    return dataIn;
-}
-
-void MAX31855_Show(bool Json){
-    char probetemp[33];
-    char referencetemp[33];
-    dtostrfd(MAX31855_Result.ProbeTemperature, Settings.flag2.temperature_resolution, probetemp);
-    dtostrfd(MAX31855_Result.ReferenceTemperature, Settings.flag2.temperature_resolution, referencetemp);
-
-    if(Json){
-        ResponseAppend_P(PSTR(",\"MAX31855\":{\"" D_JSON_PROBETEMPERATURE "\":%s,\"" D_JSON_REFERENCETEMPERATURE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
-          probetemp, referencetemp, MAX31855_Result.ErrorCode);
-#ifdef USE_DOMOTICZ
-        if (0 == tele_period) {
-          DomoticzSensor(DZ_TEMP, probetemp);
-        }
-#endif
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, MAX31855_Result.ProbeTemperature);
-        }
-#endif
-    } else {
-#ifdef USE_WEBSERVER
-        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31855", probetemp, TempUnit());
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns39(uint8_t function)
-{
-  bool result = false;
-  if((pin[GPIO_MAX31855CS] < 99) && (pin[GPIO_MAX31855CLK] < 99) && (pin[GPIO_MAX31855DO] < 99)){
-
-    switch (function) {
-      case FUNC_INIT:
-        MAX31855_Init();
-        break;
-      case FUNC_EVERY_SECOND:
-        MAX31855_GetResult();
-        break;
-      case FUNC_JSON_APPEND:
-        MAX31855_Show(true);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MAX31855_Show(false);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
-#ifdef USE_PN532_HSU
-
-#define XSNS_40 40
-
-#include <TasmotaSerial.h>
-
-TasmotaSerial *PN532_Serial;
-
-#define PN532_INVALID_ACK -1
-#define PN532_TIMEOUT -2
-#define PN532_INVALID_FRAME -3
-#define PN532_NO_SPACE -4
-
-#define PN532_PREAMBLE 0x00
-#define PN532_STARTCODE1 0x00
-#define PN532_STARTCODE2 0xFF
-#define PN532_POSTAMBLE 0x00
-
-#define PN532_HOSTTOPN532 0xD4
-#define PN532_PN532TOHOST 0xD5
-
-#define PN532_ACK_WAIT_TIME 0x0A
-
-#define PN532_COMMAND_GETFIRMWAREVERSION 0x02
-#define PN532_COMMAND_SAMCONFIGURATION 0x14
-#define PN532_COMMAND_RFCONFIGURATION 0x32
-#define PN532_COMMAND_INDATAEXCHANGE 0x40
-#define PN532_COMMAND_INLISTPASSIVETARGET 0x4A
-
-#define PN532_MIFARE_ISO14443A 0x00
-#define MIFARE_CMD_READ 0x30
-#define MIFARE_CMD_AUTH_A 0x60
-#define MIFARE_CMD_AUTH_B 0x61
-#define MIFARE_CMD_WRITE 0xA0
-
-uint8_t pn532_model = 0;
-uint8_t pn532_command = 0;
-uint8_t pn532_scantimer = 0;
-
-uint8_t pn532_packetbuffer[64];
-
-#ifdef USE_PN532_DATA_FUNCTION
-uint8_t pn532_function = 0;
-uint8_t pn532_newdata[16];
-uint8_t pn532_newdata_len = 0;
-#endif
-
-void PN532_Init(void)
-{
-  if ((pin[GPIO_PN532_RXD] < 99) && (pin[GPIO_PN532_TXD] < 99)) {
-    PN532_Serial = new TasmotaSerial(pin[GPIO_PN532_RXD], pin[GPIO_PN532_TXD], 1);
-    if (PN532_Serial->begin(115200)) {
-      if (PN532_Serial->hardwareSerial()) { ClaimSerial(); }
-      PN532_wakeup();
-      uint32_t ver = PN532_getFirmwareVersion();
-      if (ver) {
-        PN532_setPassiveActivationRetries(0xFF);
-        PN532_SAMConfig();
-        pn532_model = 1;
-        AddLog_P2(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected (V%u.%u)",(ver>>16) & 0xFF, (ver>>8) & 0xFF);
-      }
-    }
-  }
-}
-
-int8_t PN532_receive(uint8_t *buf, int len, uint16_t timeout)
-{
-  int read_bytes = 0;
-  int ret;
-  unsigned long start_millis;
-  while (read_bytes < len) {
-    start_millis = millis();
-    do {
-      ret = PN532_Serial->read();
-      if (ret >= 0) {
-        break;
-      }
-    } while((timeout == 0) || ((millis()- start_millis ) < timeout));
-
-    if (ret < 0) {
-      if (read_bytes) {
-        return read_bytes;
-      } else {
-        return PN532_TIMEOUT;
-      }
-    }
-    buf[read_bytes] = (uint8_t)ret;
-    read_bytes++;
-  }
-  return read_bytes;
-}
-
-int8_t PN532_readAckFrame(void)
-{
-  const uint8_t PN532_ACK[] = {0, 0, 0xFF, 0, 0xFF, 0};
-  uint8_t ackBuf[sizeof(PN532_ACK)];
-
-  if (PN532_receive(ackBuf, sizeof(PN532_ACK), PN532_ACK_WAIT_TIME) <= 0) {
-    return PN532_TIMEOUT;
-  }
-
-  if (memcmp(&ackBuf, &PN532_ACK, sizeof(PN532_ACK))) {
-    return PN532_INVALID_ACK;
-  }
-  return 0;
-}
-
-int8_t PN532_writeCommand(const uint8_t *header, uint8_t hlen, const uint8_t *body = 0, uint8_t blen = 0)
-{
-
-  PN532_Serial->flush();
-
-  pn532_command = header[0];
-  PN532_Serial->write((uint8_t)PN532_PREAMBLE);
-  PN532_Serial->write((uint8_t)PN532_STARTCODE1);
-  PN532_Serial->write(PN532_STARTCODE2);
-
-  uint8_t length = hlen + blen + 1;
-  PN532_Serial->write(length);
-  PN532_Serial->write(~length + 1);
-
-  PN532_Serial->write(PN532_HOSTTOPN532);
-  uint8_t sum = PN532_HOSTTOPN532;
-
-  PN532_Serial->write(header, hlen);
-  for (uint32_t i = 0; i < hlen; i++) {
-    sum += header[i];
-  }
-
-  PN532_Serial->write(body, blen);
-  for (uint32_t i = 0; i < blen; i++) {
-    sum += body[i];
-  }
-
-  uint8_t checksum = ~sum + 1;
-  PN532_Serial->write(checksum);
-  PN532_Serial->write((uint8_t)PN532_POSTAMBLE);
-
-  return PN532_readAckFrame();
-}
-
-int16_t PN532_readResponse(uint8_t buf[], uint8_t len, uint16_t timeout = 50)
-{
-  uint8_t tmp[3];
-
-
-  if (PN532_receive(tmp, 3, timeout)<=0) {
-    return PN532_TIMEOUT;
-  }
-  if (0 != tmp[0] || 0!= tmp[1] || 0xFF != tmp[2]) {
-    return PN532_INVALID_FRAME;
-  }
-
-
-  uint8_t length[2];
-  if (PN532_receive(length, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-
-  if (0 != (uint8_t)(length[0] + length[1])) {
-    return PN532_INVALID_FRAME;
-  }
-  length[0] -= 2;
-  if (length[0] > len) {
-    return PN532_NO_SPACE;
-  }
-
-
-  uint8_t cmd = pn532_command + 1;
-  if (PN532_receive(tmp, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-  if (PN532_PN532TOHOST != tmp[0] || cmd != tmp[1]) {
-    return PN532_INVALID_FRAME;
-  }
-
-  if (PN532_receive(buf, length[0], timeout) != length[0]) {
-    return PN532_TIMEOUT;
-  }
-
-  uint8_t sum = PN532_PN532TOHOST + cmd;
-  for (uint32_t i=0; i<length[0]; i++) {
-    sum += buf[i];
-  }
-
-
-  if (PN532_receive(tmp, 2, timeout) <= 0) {
-    return PN532_TIMEOUT;
-  }
-  if (0 != (uint8_t)(sum + tmp[0]) || 0 != tmp[1]) {
-    return PN532_INVALID_FRAME;
-  }
-
-  return length[0];
-}
-
-uint32_t PN532_getFirmwareVersion(void)
-{
-  uint32_t response;
-
-  pn532_packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
-
-  if (PN532_writeCommand(pn532_packetbuffer, 1)) {
-    return 0;
-  }
-
-
-  int16_t status = PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-  if (0 > status) {
-    return 0;
-  }
-
-  response = pn532_packetbuffer[0];
-  response <<= 8;
-  response |= pn532_packetbuffer[1];
-  response <<= 8;
-  response |= pn532_packetbuffer[2];
-  response <<= 8;
-  response |= pn532_packetbuffer[3];
-
-  return response;
-}
-
-void PN532_wakeup(void)
-{
-  uint8_t wakeup[5] = {0x55, 0x55, 0, 0, 0 };
-  PN532_Serial->write(wakeup,sizeof(wakeup));
-
-
-  PN532_Serial->flush();
-}
-
-bool PN532_readPassiveTargetID(uint8_t cardbaudrate, uint8_t *uid, uint8_t *uidLength, uint16_t timeout = 50)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
-  pn532_packetbuffer[1] = 1;
-  pn532_packetbuffer[2] = cardbaudrate;
-  if (PN532_writeCommand(pn532_packetbuffer, 3)) {
-    return 0x0;
-  }
-
-  if (PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer), timeout) < 0) {
-    return 0x0;
-  }
-# 274 "S:/Development/Tasmota/tasmota/xsns_40_pn532.ino"
-  if (pn532_packetbuffer[0] != 1) {
-    return 0;
-  }
-
-  uint16_t sens_res = pn532_packetbuffer[2];
-  sens_res <<= 8;
-  sens_res |= pn532_packetbuffer[3];
-
-
-  *uidLength = pn532_packetbuffer[5];
-
-  for (uint32_t i = 0; i < pn532_packetbuffer[5]; i++) {
-    uid[i] = pn532_packetbuffer[6 + i];
-  }
-
-  return 1;
-}
-
-bool PN532_setPassiveActivationRetries(uint8_t maxRetries)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_RFCONFIGURATION;
-  pn532_packetbuffer[1] = 5;
-  pn532_packetbuffer[2] = 0xFF;
-  pn532_packetbuffer[3] = 0x01;
-  pn532_packetbuffer[4] = maxRetries;
-  if (PN532_writeCommand(pn532_packetbuffer, 5)) {
-    return 0;
-  }
-  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-bool PN532_SAMConfig(void)
-{
-  pn532_packetbuffer[0] = PN532_COMMAND_SAMCONFIGURATION;
-  pn532_packetbuffer[1] = 0x01;
-  pn532_packetbuffer[2] = 0x14;
-  pn532_packetbuffer[3] = 0x00;
-  if (PN532_writeCommand(pn532_packetbuffer, 4)) {
-    return false;
-  }
-  return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-#ifdef USE_PN532_DATA_FUNCTION
-
-uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData)
-{
-    uint8_t i;
-    uint8_t _key[6];
-    uint8_t _uid[7];
-    uint8_t _uidLen;
-
-
-    memcpy(&_key, keyData, 6);
-    memcpy(&_uid, uid, uidLen);
-    _uidLen = uidLen;
-
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = (keyNumber) ? MIFARE_CMD_AUTH_B : MIFARE_CMD_AUTH_A;
-    pn532_packetbuffer[3] = blockNumber;
-    memcpy(&pn532_packetbuffer[4], &_key, 6);
-    for (i = 0; i < _uidLen; i++) {
-        pn532_packetbuffer[10 + i] = _uid[i];
-    }
-
-    if (PN532_writeCommand(pn532_packetbuffer, 10 + _uidLen)) { return 0; }
-
-
-    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-
-
-
-
-    if (pn532_packetbuffer[0] != 0x00) {
-
-        return 0;
-    }
-
-    return 1;
-}
-
-uint8_t mifareclassic_ReadDataBlock (uint8_t blockNumber, uint8_t *data)
-{
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = MIFARE_CMD_READ;
-    pn532_packetbuffer[3] = blockNumber;
-
-
-    if (PN532_writeCommand(pn532_packetbuffer, 4)) {
-        return 0;
-    }
-
-
-    PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer));
-
-
-    if (pn532_packetbuffer[0] != 0x00) {
-        return 0;
-    }
-
-
-
-    memcpy (data, &pn532_packetbuffer[1], 16);
-
-    return 1;
-}
-
-uint8_t mifareclassic_WriteDataBlock (uint8_t blockNumber, uint8_t *data)
-{
-
-    pn532_packetbuffer[0] = PN532_COMMAND_INDATAEXCHANGE;
-    pn532_packetbuffer[1] = 1;
-    pn532_packetbuffer[2] = MIFARE_CMD_WRITE;
-    pn532_packetbuffer[3] = blockNumber;
-    memcpy(&pn532_packetbuffer[4], data, 16);
-
-
-    if (PN532_writeCommand(pn532_packetbuffer, 20)) {
-        return 0;
-    }
-
-
-    return (0 < PN532_readResponse(pn532_packetbuffer, sizeof(pn532_packetbuffer)));
-}
-
-#endif
-
-void PN532_ScanForTag(void)
-{
-  if (!pn532_model) { return; }
-  uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };
-  uint8_t uid_len = 0;
-  uint8_t card_data[16];
-  bool erase_success = false;
-  bool set_success = false;
-  if (PN532_readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uid_len)) {
-      char uids[15];
-
-#ifdef USE_PN532_DATA_FUNCTION
-      char card_datas[34];
-#endif
-
-      ToHex_P((unsigned char*)uid, uid_len, uids, sizeof(uids));
-
-#ifdef USE_PN532_DATA_FUNCTION
-      if (uid_len == 4) {
-        uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-        if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) {
-          if (mifareclassic_ReadDataBlock(1, card_data)) {
-#ifdef USE_PN532_DATA_RAW
-            memcpy(&card_datas,&card_data,sizeof(card_data));
-#else
-            for (uint32_t i = 0;i < sizeof(card_data);i++) {
-              if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) {
-                card_datas[i] = char(card_data[i]);
-              } else {
-                card_datas[i] = '\0';
-              }
-            }
-#endif
-          }
-          if (pn532_function == 1) {
-            for (uint32_t i = 0;i<16;i++) {
-              card_data[i] = 0x00;
-            }
-            if (mifareclassic_WriteDataBlock(1, card_data)) {
-              erase_success = true;
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase success"));
-              memcpy(&card_datas,&card_data,sizeof(card_data));
-            }
-          }
-          if (pn532_function == 2) {
-#ifdef USE_PN532_DATA_RAW
-            memcpy(&card_data,&pn532_newdata,sizeof(card_data));
-            if (mifareclassic_WriteDataBlock(1, card_data)) {
-              set_success = true;
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
-              memcpy(&card_datas,&card_data,sizeof(card_data));
-            }
-#else
-            bool IsAlphaNumeric = true;
-            for (uint32_t i = 0;i < pn532_newdata_len;i++) {
-              if ((!isalpha(pn532_newdata[i])) && (!isdigit(pn532_newdata[i]))) {
-                IsAlphaNumeric = false;
-              }
-            }
-            if (IsAlphaNumeric) {
-              memcpy(&card_data,&pn532_newdata,pn532_newdata_len);
-              card_data[pn532_newdata_len] = '\0';
-              if (mifareclassic_WriteDataBlock(1, card_data)) {
-                set_success = true;
-                AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
-                memcpy(&card_datas,&card_data,sizeof(card_data));
-              }
-            } else {
-              AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data must be alphanumeric"));
-            }
-#endif
-          }
-        } else {
-          sprintf(card_datas,"AUTHFAIL");
-        }
-      }
-      switch (pn532_function) {
-        case 0x01:
-          if (!erase_success) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Erase fail - exiting erase mode"));
-          }
-          break;
-        case 0x02:
-          if (!set_success) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Write failed - exiting set mode"));
-          }
-        default:
-          break;
-      }
-      pn532_function = 0;
-#endif
-
-#ifdef USE_PN532_DATA_FUNCTION
-      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\", \"DATA\":\"%s\"}}"), uids, card_datas);
-#else
-      ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids);
-#endif
-
-      MqttPublishTeleSensor();
-
-#ifdef USE_PN532_CAUSE_EVENTS
-
-      char command[71];
-#ifdef USE_PN532_DATA_FUNCTION
-      sprintf(command,"backlog event PN532_UID=%s;event PN532_DATA=%s",uids,card_datas);
-#else
-      sprintf(command,"event PN532_UID=%s",uids);
-#endif
-      ExecuteCommand(command, SRC_RULE);
-#endif
-
-      pn532_scantimer = 7;
-  }
-}
-
-#ifdef USE_PN532_DATA_FUNCTION
-
-bool PN532_Command(void)
-{
-  bool serviced = true;
-  uint8_t paramcount = 0;
-  if (XdrvMailbox.data_len > 0) {
-    paramcount=1;
-  } else {
-    serviced = false;
-    return serviced;
-  }
-  char sub_string[XdrvMailbox.data_len];
-  char sub_string_tmp[XdrvMailbox.data_len];
-  for (uint32_t ca=0;ca<XdrvMailbox.data_len;ca++) {
-    if ((' ' == XdrvMailbox.data[ca]) || ('=' == XdrvMailbox.data[ca])) { XdrvMailbox.data[ca] = ','; }
-    if (',' == XdrvMailbox.data[ca]) { paramcount++; }
-  }
-  UpperCase(XdrvMailbox.data,XdrvMailbox.data);
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"E")) {
-    pn532_function = 1;
-    AddLog_P(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be erased"));
-    ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"E\"}}"));
-    return serviced;
-  }
-  if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"S")) {
-    if (paramcount > 1) {
-      if (XdrvMailbox.data[XdrvMailbox.data_len-1] == ',') {
-        serviced = false;
-        return serviced;
-      }
-      sprintf(sub_string_tmp,subStr(sub_string, XdrvMailbox.data, ",", 2));
-      pn532_newdata_len = strlen(sub_string_tmp);
-      if (pn532_newdata_len > 15) { pn532_newdata_len = 15; }
-      memcpy(&pn532_newdata,&sub_string_tmp,pn532_newdata_len);
-      pn532_newdata[pn532_newdata_len] = 0x00;
-      pn532_function = 2;
-      AddLog_P2(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Next scanned tag data block 1 will be set to '%s'"), pn532_newdata);
-      ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"S\"}}"));
-      return serviced;
-    }
-  }
-}
-
-#endif
-
-bool Xsns40(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_INIT:
-      PN532_Init();
-      result = true;
-      break;
-    case FUNC_EVERY_50_MSECOND:
-      break;
-    case FUNC_EVERY_100_MSECOND:
-      break;
-    case FUNC_EVERY_250_MSECOND:
-      if (pn532_scantimer > 0) {
-        pn532_scantimer--;
-      } else {
-        PN532_ScanForTag();
-      }
-      break;
-    case FUNC_EVERY_SECOND:
-      break;
-#ifdef USE_PN532_DATA_FUNCTION
-    case FUNC_COMMAND_SENSOR:
-      if (XSNS_40 == XdrvMailbox.index) {
-        result = PN532_Command();
-      }
-      break;
-#endif
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_41_max44009.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_41_max44009.ino"
-#ifdef USE_I2C
-#ifdef USE_MAX44009
-
-
-
-
-
-
-#define XSNS_41 41
-#define XI2C_28 28
-
-#define MAX44009_ADDR1 0x4A
-#define MAX44009_ADDR2 0x4B
-#define MAX44009_NO_REGISTERS 8
-#define REG_CONFIG 0x02
-#define REG_LUMINANCE 0x03
-#define REG_LOWER_THRESHOLD 0x06
-#define REG_THRESHOLD_TIMER 0x07
-
-#define MAX44009_CONTINUOUS_AUTO_MODE 0x80
-
-uint8_t max44009_address;
-uint8_t max44009_addresses[] = { MAX44009_ADDR1, MAX44009_ADDR2, 0 };
-uint8_t max44009_found = 0;
-uint8_t max44009_valid = 0;
-float max44009_illuminance = 0;
-char max44009_types[] = "MAX44009";
-
-bool Max4409Read_lum(void)
-{
-  max44009_valid = 0;
-  uint8_t regdata[2];
-
-
-  if (I2cValidRead16((uint16_t *)&regdata, max44009_address, REG_LUMINANCE)) {
-    int exponent = (regdata[0] & 0xF0) >> 4;
-    int mantissa = ((regdata[0] & 0x0F) << 4) | (regdata[1] & 0x0F);
-    max44009_illuminance = (float)(((0x00000001 << exponent) * (float)mantissa) * 0.045);
-    max44009_valid = 1;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-
-
-void Max4409Detect(void)
-{
-  uint8_t buffer1;
-  uint8_t buffer2;
-  for (uint32_t i = 0; 0 != max44009_addresses[i]; i++) {
-
-    max44009_address = max44009_addresses[i];
-    if (I2cActive(max44009_address)) { continue; }
-
-    if ((I2cValidRead8(&buffer1, max44009_address, REG_LOWER_THRESHOLD)) &&
-        (I2cValidRead8(&buffer2, max44009_address, REG_THRESHOLD_TIMER))) {
-
-      if ((0x00 == buffer1) &&
-          (0xFF == buffer2)) {
-
-
-
-        Wire.beginTransmission(max44009_address);
-
-
-        Wire.write(REG_CONFIG);
-        Wire.write(MAX44009_CONTINUOUS_AUTO_MODE);
-        if (0 == Wire.endTransmission()) {
-          I2cSetActiveFound(max44009_address, max44009_types);
-          max44009_found = 1;
-          break;
-        }
-      }
-    }
-  }
-}
-
-void Max4409EverySecond(void)
-{
-  Max4409Read_lum();
-}
-
-void Max4409Show(bool json)
-{
-  char illum_str[8];
-
-  if (max44009_valid) {
-
-
-
-    uint8_t prec = 0;
-    if (10 > max44009_illuminance ) {
-      prec = 3;
-    } else if (100 > max44009_illuminance) {
-      prec = 2;
-    } else if (1000 > max44009_illuminance) {
-      prec = 1;
-    }
-    dtostrf(max44009_illuminance, sizeof(illum_str) -1, prec, illum_str);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ILLUMINANCE "\":%s}"), max44009_types, illum_str);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_ILLUMINANCE, illum_str);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-
-      WSContentSend_PD(HTTP_SNS_ILLUMINANCE, max44009_types, (int)max44009_illuminance);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns41(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_28)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Max4409Detect();
-  }
-  else if (max44009_found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Max4409EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Max4409Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Max4409Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_42_scd30.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_42_scd30.ino"
-#ifdef USE_I2C
-#ifdef USE_SCD30
-
-#define XSNS_42 42
-#define XI2C_29 29
-
-
-
-#define SCD30_ADDRESS 0x61
-
-#define SCD30_MAX_MISSED_READS 3
-#define SCD30_STATE_NO_ERROR 0
-#define SCD30_STATE_ERROR_DATA_CRC 1
-#define SCD30_STATE_ERROR_READ_MEAS 2
-#define SCD30_STATE_ERROR_SOFT_RESET 3
-#define SCD30_STATE_ERROR_I2C_RESET 4
-#define SCD30_STATE_ERROR_UNKNOWN 5
-
-#include "Arduino.h"
-#include <FrogmoreScd30.h>
-
-#define D_CMND_SCD30 "SCD30"
-
-const char S_JSON_SCD30_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d}";
-const char S_JSON_SCD30_COMMAND_NFW_VALUE[] PROGMEM = "{\"" D_CMND_SCD30 "%s\":%d.%d}";
-const char S_JSON_SCD30_COMMAND[] PROGMEM = "{\"" D_CMND_SCD30 "%s\"}";
-const char kSCD30_Commands[] PROGMEM = "Alt|Auto|Cal|FW|Int|Pres|TOff";
-
-
-
-
-
-enum SCD30_Commands {
-  CMND_SCD30_ALTITUDE,
-  CMND_SCD30_AUTOMODE,
-  CMND_SCD30_CALIBRATE,
-  CMND_SCD30_FW,
-  CMND_SCD30_INTERVAL,
-  CMND_SCD30_PRESSURE,
-  CMND_SCD30_TEMPOFFSET
-};
-
-FrogmoreScd30 scd30;
-
-bool scd30Found = false;
-bool scd30IsDataValid = false;
-int scd30ErrorState = SCD30_STATE_NO_ERROR;
-uint16_t scd30Interval_sec;
-int scd30Loop_count = 0;
-int scd30DataNotAvailable_count = 0;
-int scd30GoodMeas_count = 0;
-int scd30Reset_count = 0;
-int scd30CrcError_count = 0;
-int scd30Co2Zero_count = 0;
-int i2cReset_count = 0;
-uint16_t scd30_CO2 = 0;
-uint16_t scd30_CO2EAvg = 0;
-float scd30_Humid = 0.0;
-float scd30_Temp = 0.0;
-
-void Scd30Detect(void)
-{
-  if (I2cActive(SCD30_ADDRESS)) { return; }
-
-  scd30.begin();
-
-  uint8_t major = 0;
-  uint8_t minor = 0;
-  if (scd30.getFirmwareVersion(&major, &minor)) { return; }
-  uint16_t interval_sec;
-  if (scd30.getMeasurementInterval(&scd30Interval_sec)) { return; }
-  if (scd30.beginMeasuring()) { return; }
-
-  I2cSetActiveFound(SCD30_ADDRESS, "SCD30");
-  scd30Found = true;
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SCD: FW v%d.%d"), major, minor);
-}
-
-
-void Scd30Update(void)
-{
-  scd30Loop_count++;
-  if (scd30Loop_count > (scd30Interval_sec - 1)) {
-    int error = 0;
-    switch (scd30ErrorState) {
-      case SCD30_STATE_NO_ERROR: {
-        error = scd30.readMeasurement(&scd30_CO2, &scd30_CO2EAvg, &scd30_Temp, &scd30_Humid);
-        switch (error) {
-          case ERROR_SCD30_NO_ERROR:
-            scd30Loop_count = 0;
-            scd30IsDataValid = true;
-            scd30GoodMeas_count++;
-            break;
-
-          case ERROR_SCD30_NO_DATA:
-            scd30DataNotAvailable_count++;
-            break;
-
-          case ERROR_SCD30_CRC_ERROR:
-            scd30ErrorState = SCD30_STATE_ERROR_DATA_CRC;
-            scd30CrcError_count++;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CRC error, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
-              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-#endif
-            break;
-
-          case ERROR_SCD30_CO2_ZERO:
-            scd30Co2Zero_count++;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: CO2 zero, CRC error: %ld, CO2 zero: %ld, good: %ld, no data: %ld, sc30_reset: %ld, i2c_reset: %ld"),
-              scd30CrcError_count, scd30Co2Zero_count, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-#endif
-            break;
-
-          default: {
-            scd30ErrorState = SCD30_STATE_ERROR_READ_MEAS;
-#ifdef SCD30_DEBUG
-            AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: Update: ReadMeasurement error: 0x%lX, counter: %ld"), error, scd30Loop_count);
-#endif
-             return;
-          }
-          break;
-        }
-      }
-      break;
-
-      case SCD30_STATE_ERROR_DATA_CRC: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: got CRC error, try again, counter: %ld"), scd30Loop_count);
-#endif
-        scd30ErrorState = ERROR_SCD30_NO_ERROR;
-      }
-      break;
-
-      case SCD30_STATE_ERROR_READ_MEAS: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: not answering, sending soft reset, counter: %ld"), scd30Loop_count);
-#endif
-        scd30Reset_count++;
-        error = scd30.softReset();
-        if (error) {
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: resetting got error: 0x%lX"), error);
-#endif
-          error >>= 8;
-          if (error == 4) {
-            scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
-          } else {
-            scd30ErrorState = SCD30_STATE_ERROR_UNKNOWN;
-          }
-        } else {
-          scd30ErrorState = ERROR_SCD30_NO_ERROR;
-        }
-      }
-      break;
-
-      case SCD30_STATE_ERROR_SOFT_RESET: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: in error state: %d, good: %ld, no data: %ld, sc30 reset: %ld, i2c reset: %ld"),
-          scd30ErrorState, scd30GoodMeas_count, scd30DataNotAvailable_count, scd30Reset_count, i2cReset_count);
-        AddLog_P(LOG_LEVEL_ERROR, PSTR("SCD30: clearing i2c bus"));
-#endif
-        i2cReset_count++;
-        error = scd30.clearI2CBus();
-        if (error) {
-          scd30ErrorState = SCD30_STATE_ERROR_I2C_RESET;
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error clearing i2c bus: 0x%lX"), error);
-#endif
-        } else {
-          scd30ErrorState = ERROR_SCD30_NO_ERROR;
-        }
-      }
-      break;
-
-      default: {
-
-#ifdef SCD30_DEBUG
-        AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: unknown error state: 0x%lX"), scd30ErrorState);
-#endif
-        scd30ErrorState = SCD30_STATE_ERROR_SOFT_RESET;
-      }
-    }
-
-    if (scd30Loop_count > (SCD30_MAX_MISSED_READS * scd30Interval_sec)) {
-      scd30IsDataValid = false;
-    }
-  }
-}
-
-
-int Scd30GetCommand(int command_code, uint16_t *pvalue)
-{
-  switch (command_code)
-  {
-    case CMND_SCD30_ALTITUDE:
-      return scd30.getAltitudeCompensation(pvalue);
-      break;
-
-    case CMND_SCD30_AUTOMODE:
-      return scd30.getCalibrationType(pvalue);
-      break;
-
-    case CMND_SCD30_CALIBRATE:
-      return scd30.getForcedRecalibrationFactor(pvalue);
-      break;
-
-    case CMND_SCD30_INTERVAL:
-      return scd30.getMeasurementInterval(pvalue);
-      break;
-
-    case CMND_SCD30_PRESSURE:
-      return scd30.getAmbientPressure(pvalue);
-      break;
-
-    case CMND_SCD30_TEMPOFFSET:
-      return scd30.getTemperatureOffset(pvalue);
-      break;
-
-      default:
-
-      break;
-  }
-}
-
-int Scd30SetCommand(int command_code, uint16_t value)
-{
-  switch (command_code)
-  {
-    case CMND_SCD30_ALTITUDE:
-      return scd30.setAltitudeCompensation(value);
-      break;
-
-    case CMND_SCD30_AUTOMODE:
-      return scd30.setCalibrationType(value);
-      break;
-
-    case CMND_SCD30_CALIBRATE:
-      return scd30.setForcedRecalibrationFactor(value);
-      break;
-
-    case CMND_SCD30_INTERVAL:
-    {
-      int error = scd30.setMeasurementInterval(value);
-      if (!error)
-      {
-        scd30Interval_sec = value;
-      }
-
-      return error;
-    }
-      break;
-
-    case CMND_SCD30_PRESSURE:
-      return scd30.setAmbientPressure(value);
-      break;
-
-    case CMND_SCD30_TEMPOFFSET:
-      return scd30.setTemperatureOffset(value);
-      break;
-
-      default:
-
-      break;
-  }
-}
-
-
-
-
-
-bool Scd30CommandSensor()
-{
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t prefix_len = strlen(D_CMND_SCD30);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_SCD30), prefix_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + prefix_len, kSCD30_Commands);
-
-    switch (command_code) {
-      case CMND_SCD30_ALTITUDE:
-      case CMND_SCD30_AUTOMODE:
-      case CMND_SCD30_CALIBRATE:
-      case CMND_SCD30_INTERVAL:
-      case CMND_SCD30_PRESSURE:
-      case CMND_SCD30_TEMPOFFSET:
-      {
-        uint16_t value = 0;
-        if (XdrvMailbox.data_len > 0)
-        {
-          value = XdrvMailbox.payload;
-          Scd30SetCommand(command_code, value);
-        }
-        else
-        {
-          Scd30GetCommand(command_code, &value);
-        }
-
-        Response_P(S_JSON_SCD30_COMMAND_NVALUE, command, value);
-      }
-        break;
-
-      case CMND_SCD30_FW:
-      {
-        uint8_t major = 0;
-        uint8_t minor = 0;
-        int error;
-        error = scd30.getFirmwareVersion(&major, &minor);
-        if (error)
-        {
-#ifdef SCD30_DEBUG
-          AddLog_P2(LOG_LEVEL_ERROR, PSTR("SCD30: error getting FW version: 0x%lX"), error);
-#endif
-          serviced = false;
-        }
-        else
-        {
-          Response_P(S_JSON_SCD30_COMMAND_NFW_VALUE, command, major, minor);
-        }
-      }
-        break;
-
-      default:
-
-        serviced = false;
-      break;
-    }
-  }
-  return serviced;
-}
-
-void Scd30Show(bool json)
-{
-  if (scd30IsDataValid)
-  {
-    char humidity[10];
-    dtostrfd(ConvertHumidity(scd30_Humid), Settings.flag2.humidity_resolution, humidity);
-    char temperature[10];
-    dtostrfd(ConvertTemp(scd30_Temp), Settings.flag2.temperature_resolution, temperature);
-
-    if (json) {
-
-      ResponseAppend_P(PSTR(",\"SCD30\":{\"" D_JSON_CO2 "\":%d,\"" D_JSON_ECO2 "\":%d,\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_HUMIDITY "\":%s}"),
-        scd30_CO2, scd30_CO2EAvg, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period)
-      {
-        DomoticzSensor(DZ_AIRQUALITY, scd30_CO2);
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_CO2EAVG, "SCD30", scd30_CO2EAvg);
-      WSContentSend_PD(HTTP_SNS_CO2, "SCD30", scd30_CO2);
-      WSContentSend_PD(HTTP_SNS_TEMP, "SCD30", temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, "SCD30", humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns42(byte function)
-{
-  if (!I2cEnabled(XI2C_29)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Scd30Detect();
-  }
-  else if (scd30Found) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Scd30Update();
-        break;
-      case FUNC_COMMAND:
-        result = Scd30CommandSensor();
-        break;
-      case FUNC_JSON_APPEND:
-        Scd30Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Scd30Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
-#ifdef USE_HRE
-# 49 "S:/Development/Tasmota/tasmota/xsns_43_hre.ino"
-#define XSNS_43 43
-
-enum hre_states {
-   hre_idle,
-   hre_sync,
-   hre_syncing,
-   hre_read,
-   hre_reading,
-   hre_sleep,
-   hre_sleeping
-};
-
-hre_states hre_state = hre_idle;
-
-float hre_usage = 0;
-float hre_rate = 0;
-uint32_t hre_usage_time = 0;
-
-int hre_read_errors = 0;
-bool hre_good = false;
-
-
-
-int hreReadBit()
-{
-   digitalWrite(pin[GPIO_HRE_CLOCK], HIGH);
-   delay(1);
-   int bit = digitalRead(pin[GPIO_HRE_DATA]);
-   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
-   delay(1);
-   return bit;
-}
-
-
-
-char hreReadChar(int &parity_errors)
-{
-
-   hreReadBit();
-
-   unsigned ch=0;
-   int sum=0;
-   for (uint32_t i=0; i<7; i++)
-   {
-      int b = hreReadBit();
-      ch |= b << i;
-      sum += b;
-   }
-
-
-   if ( (sum & 0x1) != hreReadBit())
-      parity_errors++;
-
-
-   hreReadBit();
-
-   return ch;
-}
-
-void hreInit(void)
-{
-   hre_read_errors = 0;
-   hre_good = false;
-
-   pinMode(pin[GPIO_HRE_CLOCK], OUTPUT);
-   pinMode(pin[GPIO_HRE_DATA], INPUT);
-
-
-
-   digitalWrite(pin[GPIO_HRE_CLOCK], LOW);
-
-   hre_state = hre_sync;
-}
-
-
-void hreEvery50ms(void)
-{
-   static int sync_counter = 0;
-   static int sync_run = 0;
-
-   static uint32_t curr_start = 0;
-   static int read_counter = 0;
-   static int parity_errors = 0;
-   static char buff[46];
-
-   static char ch;
-   static size_t i;
-
-   switch (hre_state)
-   {
-      case hre_sync:
-         if (uptime < 10)
-            break;
-         sync_run = 0;
-         sync_counter = 0;
-         hre_state = hre_syncing;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_syncing"));
-         break;
-
-      case hre_syncing:
-
-
-         for (uint32_t i=0; i<20; i++)
-         {
-            if (hreReadBit())
-               sync_run++;
-            else
-               sync_run = 0;
-            if (sync_run == 62)
-            {
-               hre_state = hre_read;
-               break;
-            }
-            sync_counter++;
-         }
-
-         if (sync_counter > 1000)
-         {
-            hre_state = hre_sleep;
-            AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE D_ERROR));
-         }
-         break;
-
-
-      case hre_read:
-         AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "sync_run:%d, sync_counter:%d"), sync_run, sync_counter);
-         read_counter = 0;
-         parity_errors = 0;
-         curr_start = uptime;
-         memset(buff, 0, sizeof(buff));
-         hre_state = hre_reading;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_reading"));
-
-
-
-
-
-      case hre_reading:
-
-         buff[read_counter++] = hreReadChar(parity_errors);
-         buff[read_counter++] = hreReadChar(parity_errors);
-
-         if (read_counter == 46)
-         {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "pe:%d, re:%d, buff:%s"),
-                      parity_errors, hre_read_errors, buff);
-            if (parity_errors == 0)
-            {
-               float curr_usage;
-               curr_usage = 0.01 * atol(buff+24);
-               if (hre_usage_time)
-               {
-                  double dt = 1.666e-2 * (curr_start - hre_usage_time);
-                  hre_rate = (curr_usage - hre_usage)/dt;
-               }
-               hre_usage = curr_usage;
-               hre_usage_time = curr_start;
-               hre_good = true;
-
-               hre_state = hre_sleep;
-            }
-            else
-            {
-               hre_read_errors++;
-               hre_state = hre_sleep;
-            }
-         }
-         break;
-
-      case hre_sleep:
-         hre_usage_time = curr_start;
-         hre_state = hre_sleeping;
-         AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HRE "hre_state:hre_sleeping"));
-
-      case hre_sleeping:
-
-
-         if (uptime - hre_usage_time >= 27)
-            hre_state = hre_sync;
-   }
-}
-
-void hreShow(boolean json)
-{
-   if (!hre_good)
-      return;
-
-   const char *id = "HRE";
-
-   char usage[16];
-   char rate[16];
-   dtostrfd(hre_usage, 2, usage);
-   dtostrfd(hre_rate, 3, rate);
-
-   if (json)
-   {
-      ResponseAppend_P(JSON_SNS_GNGPM, id, usage, rate);
-#ifdef USE_WEBSERVER
-   }
-   else
-   {
-      WSContentSend_PD(HTTP_SNS_GALLONS, id, usage);
-      WSContentSend_PD(HTTP_SNS_GPM, id, rate);
-#endif
-   }
-}
-
-
-
-
-
-bool Xsns43(byte function)
-{
-
-   if (pin[GPIO_HRE_CLOCK] >= 99 || pin[GPIO_HRE_DATA] >= 99)
-      return false;
-
-   switch (function)
-   {
-      case FUNC_INIT:
-         hreInit();
-         break;
-      case FUNC_EVERY_50_MSECOND:
-         hreEvery50ms();
-         break;
-      case FUNC_EVERY_SECOND:
-         break;
-      case FUNC_JSON_APPEND:
-         hreShow(1);
-         break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-         hreShow(0);
-         break;
-#endif
-   }
-   return false;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_44_sps30.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_44_sps30.ino"
-#ifdef USE_I2C
-#ifdef USE_SPS30
-
-#define XSNS_44 44
-#define XI2C_30 30
-
-#define SPS30_ADDR 0x69
-
-#include <Wire.h>
-#include <twi.h>
-
-uint8_t sps30_ready = 0;
-uint8_t sps30_running;
-
-struct SPS30 {
-  float PM1_0;
-  float PM2_5;
-  float PM4_0;
-  float PM10;
-  float NCPM0_5;
-  float NCPM1_0;
-  float NCPM2_5;
-  float NCPM4_0;
-  float NCPM10;
-  float TYPSIZ;
-} sps30_result;
-
-#define SPS_CMD_START_MEASUREMENT 0x0010
-#define SPS_CMD_START_MEASUREMENT_ARG 0x0300
-#define SPS_CMD_STOP_MEASUREMENT 0x0104
-#define SPS_CMD_READ_MEASUREMENT 0x0300
-#define SPS_CMD_GET_DATA_READY 0x0202
-#define SPS_CMD_AUTOCLEAN_INTERVAL 0x8004
-#define SPS_CMD_CLEAN 0x5607
-#define SPS_CMD_GET_ACODE 0xd025
-#define SPS_CMD_GET_SERIAL 0xd033
-#define SPS_CMD_RESET 0xd304
-#define SPS_WRITE_DELAY_US 20000
-#define SPS_MAX_SERIAL_LEN 32
-
-uint8_t sps30_calc_CRC(uint8_t *data) {
-    uint8_t crc = 0xFF;
-    for (uint32_t i = 0; i < 2; i++) {
-        crc ^= data[i];
-        for (uint32_t bit = 8; bit > 0; --bit) {
-            if(crc & 0x80) {
-                crc = (crc << 1) ^ 0x31u;
-            } else {
-                crc = (crc << 1);
-            }
-        }
-    }
-    return crc;
-}
-
-void CmdClean(void);
-
-unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
-
-void sps30_get_data(uint16_t cmd, uint8_t *data, uint8_t dlen) {
-unsigned char cmdb[2];
-uint8_t tmp[3];
-uint8_t index=0;
-memset(data,0,dlen);
-uint8_t twi_buff[64];
-
-  Wire.beginTransmission(SPS30_ADDR);
-  cmdb[0]=cmd>>8;
-  cmdb[1]=cmd;
-  Wire.write(cmdb,2);
-  Wire.endTransmission();
-
-
-  dlen/=2;
-  dlen*=3;
-
-  twi_readFrom(SPS30_ADDR,twi_buff,dlen,1);
-
-  uint8_t bind=0;
-  while (bind<dlen) {
-    tmp[0] = twi_buff[bind++];
-    tmp[1] = twi_buff[bind++];
-    tmp[2] = twi_buff[bind++];
-    if (sps30_calc_CRC(tmp)!=tmp[2]) {
-
-      index+=2;
-    } else {
-      data[index++]=tmp[0];
-      data[index++]=tmp[1];
-    }
-  }
-}
-
-void sps30_cmd(uint16_t cmd) {
-unsigned char cmdb[6];
-  Wire.beginTransmission(SPS30_ADDR);
-  cmdb[0]=cmd>>8;
-  cmdb[1]=cmd;
-
-  if (cmd==SPS_CMD_START_MEASUREMENT) {
-    cmdb[2]=SPS_CMD_START_MEASUREMENT_ARG>>8;
-    cmdb[3]=SPS_CMD_START_MEASUREMENT_ARG&0xff;
-    cmdb[4]=sps30_calc_CRC(&cmdb[2]);
-    Wire.write(cmdb,5);
-  } else {
-    Wire.write(cmdb,2);
-  }
-  Wire.endTransmission();
-}
-
-void SPS30_Detect(void)
-{
-  if (!I2cSetDevice(SPS30_ADDR)) { return; }
-  I2cSetActiveFound(SPS30_ADDR, "SPS30");
-
-  uint8_t dcode[32];
-  sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode));
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode);
-  sps30_cmd(SPS_CMD_START_MEASUREMENT);
-  sps30_running = 1;
-  sps30_ready = 1;
-}
-
-#define D_UNIT_PM "ug/m3"
-#define D_UNIT_NCPM "#/m3"
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_PM "{e}";
-const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_NCPM "{e}";
-const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
-#endif
-
-#define PMDP 2
-
-#define SPS30_HOURS Settings.sps30_inuse_hours
-
-
-
-void SPS30_Every_Second() {
-  if (!sps30_running) return;
-
-  if (uptime%10==0) {
-    uint8_t vars[sizeof(float)*10];
-    sps30_get_data(SPS_CMD_READ_MEASUREMENT,vars,sizeof(vars));
-    float *fp=&sps30_result.PM1_0;
-
-    typedef union {
-    uint8_t array[4];
-    float value;
-    } ByteToFloat;
-
-    ByteToFloat conv;
-
-    for (uint32_t count=0; count<10; count++) {
-      for (uint32_t i = 0; i < 4; i++){
-        conv.array[3-i] = vars[count*sizeof(float)+i];
-      }
-      *fp++=conv.value;
-    }
-  }
-
-  if (uptime%3600==0 && uptime>60) {
-
-
-    SPS30_HOURS++;
-    if (SPS30_HOURS>(7*24)) {
-      CmdClean();
-      SPS30_HOURS=0;
-    }
-  }
-
-}
-
-void SPS30_Show(bool json)
-{
-  if (!sps30_running) { return; }
-
-  char str[64];
-  if (json) {
-    dtostrfd(sps30_result.PM1_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str);
-    dtostrfd(sps30_result.PM2_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM2_5" "\":%s"), str);
-    dtostrfd(sps30_result.PM4_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM4_0" "\":%s"), str);
-    dtostrfd(sps30_result.PM10,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "PM10" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM0_5" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM1_0" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM2_5" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM4_0" "\":%s"), str);
-    dtostrfd(sps30_result.NCPM10,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "NCPM10" "\":%s"), str);
-    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
-    ResponseAppend_P(PSTR(",\"" "TYPSIZ" "\":%s}"), str);
-
-#ifdef USE_WEBSERVER
-  } else {
-    dtostrfd(sps30_result.PM1_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 1.0",str);
-    dtostrfd(sps30_result.PM2_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 2.5",str);
-    dtostrfd(sps30_result.PM4_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 4.0",str);
-    dtostrfd(sps30_result.PM10,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 10",str);
-    dtostrfd(sps30_result.NCPM0_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 0.5",str);
-    dtostrfd(sps30_result.NCPM1_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 1.0",str);
-    dtostrfd(sps30_result.NCPM2_5,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 2.5",str);
-    dtostrfd(sps30_result.NCPM4_0,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 4.0",str);
-    dtostrfd(sps30_result.NCPM10,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 10",str);
-    dtostrfd(sps30_result.TYPSIZ,PMDP,str);
-    WSContentSend_PD(HTTP_SNS_SPS30_c,str);
-#endif
-  }
-}
-
-void CmdClean(void)
-{
-  sps30_cmd(SPS_CMD_CLEAN);
-  ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
-  MqttPublishTeleSensor();
-}
-
-bool SPS30_cmd(void)
-{
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp=='c') {
-
-        CmdClean();
-      } else if (*cp=='0' || *cp=='1') {
-        sps30_running=*cp&1;
-        sps30_cmd(sps30_running?SPS_CMD_START_MEASUREMENT:SPS_CMD_STOP_MEASUREMENT);
-      } else {
-        serviced=false;
-      }
-  }
-  Response_P(PSTR("{\"SPS30\":\"%s\"}"), sps30_running?"running":"stopped");
-
-  return serviced;
-}
-
-
-
-
-
-bool Xsns44(byte function)
-{
-  if (!I2cEnabled(XI2C_30)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    SPS30_Detect();
-  }
-  else if (sps30_ready) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        SPS30_Every_Second();
-        break;
-      case FUNC_JSON_APPEND:
-        SPS30_Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SPS30_Show(0);
-        break;
-  #endif
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_44 == XdrvMailbox.index) {
-          result = SPS30_cmd();
-        }
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_45_vl53l0x.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_45_vl53l0x.ino"
-#ifdef USE_I2C
-#ifdef USE_VL53L0X
-
-#define XSNS_45 45
-#define XI2C_31 31
-
-#include <Wire.h>
-#include "VL53L0X.h"
-VL53L0X sensor;
-
-uint8_t vl53l0x_ready = 0;
-uint16_t vl53l0x_distance;
-uint16_t Vl53l0_buffer[5];
-uint8_t Vl53l0_index;
-
-
-
-void Vl53l0Detect(void)
-{
-  if (!I2cSetDevice(0x29)) { return; }
-
-  if (!sensor.init()) { return; }
-
-  I2cSetActiveFound(sensor.getAddress(), "VL53L0X");
-
-  sensor.setTimeout(500);
-
-
-
-
-
-  sensor.startContinuous();
-  vl53l0x_ready = 1;
-
-  Vl53l0_index=0;
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_VL53L0X[] PROGMEM =
- "{s}VL53L0X " D_DISTANCE "{m}%d" D_UNIT_MILLIMETER "{e}";
-#endif
-
-#define USE_VL_MEDIAN 
-
-void Vl53l0Every_250MSecond(void)
-{
-  uint16_t tbuff[5],tmp;
-  uint8_t flag;
-
-
-  uint16_t dist = sensor.readRangeContinuousMillimeters();
-  if (dist==0 || dist>2000) {
-    dist=9999;
-  }
-
-#ifdef USE_VL_MEDIAN
-
-  Vl53l0_buffer[Vl53l0_index]=dist;
-  Vl53l0_index++;
-  if (Vl53l0_index>=5) Vl53l0_index=0;
-
-
-  memmove(tbuff,Vl53l0_buffer,sizeof(tbuff));
-  for (byte ocnt=0; ocnt<5; ocnt++) {
-    flag=0;
-    for (byte count=0; count<4; count++) {
-      if (tbuff[count]>tbuff[count+1]) {
-        tmp=tbuff[count];
-        tbuff[count]=tbuff[count+1];
-        tbuff[count+1]=tmp;
-        flag=1;
-      }
-    }
-    if (!flag) break;
-  }
-  vl53l0x_distance=tbuff[2];
-#else
-  vl53l0x_distance=dist;
-#endif
-}
-
-void Vl53l0Show(boolean json)
-{
-  if (json) {
-    ResponseAppend_P(PSTR(",\"VL53L0X\":{\"" D_JSON_DISTANCE "\":%d}"), vl53l0x_distance);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_SNS_VL53L0X, vl53l0x_distance);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns45(byte function)
-{
-  if (!I2cEnabled(XI2C_31)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Vl53l0Detect();
-  }
-  else if (vl53l0x_ready) {
-    switch (function) {
-      case FUNC_EVERY_250_MSECOND:
-        Vl53l0Every_250MSecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Vl53l0Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Vl53l0Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_46_MLX90614.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_46_MLX90614.ino"
-#ifdef USE_I2C
-#ifdef USE_MLX90614
-
-#define XSNS_46 46
-#define XI2C_32 32
-
-#define I2_ADR_IRT 0x5a
-
-#define MLX90614_RAWIR1 0x04
-#define MLX90614_RAWIR2 0x05
-#define MLX90614_TA 0x06
-#define MLX90614_TOBJ1 0x07
-#define MLX90614_TOBJ2 0x08
-
-struct {
-  union {
-    uint16_t value;
-    uint32_t i2c_buf;
-    };
-  float obj_temp;
-  float amb_temp;
-  bool ready = false;
-} mlx90614;
-
-void MLX90614_Init(void)
-{
-  if (!I2cSetDevice(I2_ADR_IRT)) { return; }
-  I2cSetActiveFound(I2_ADR_IRT, "MLX90614");
-  mlx90614.ready = true;
-}
-
-void MLX90614_Every_Second(void)
-{
-    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT, MLX90614_TOBJ1);
-    if (mlx90614.value & 0x8000) {
-      mlx90614.obj_temp = -999;
-    } else {
-      mlx90614.obj_temp = ((float)mlx90614.value * 0.02) - 273.15;
-    }
-    mlx90614.i2c_buf = I2cRead24(I2_ADR_IRT,MLX90614_TA);
-    if (mlx90614.value & 0x8000) {
-      mlx90614.amb_temp = -999;
-    } else {
-      mlx90614.amb_temp = ((float)mlx90614.value * 0.02) - 273.15;
-    }
-}
-
-#ifdef USE_WEBSERVER
- const char HTTP_IRTMP[] PROGMEM =
-  "{s}MXL90614 " "OBJ-" D_TEMPERATURE "{m}%s C" "{e}"
-  "{s}MXL90614 " "AMB-" D_TEMPERATURE "{m}%s C" "{e}";
-#endif
-
-void MLX90614_Show(uint8_t json)
-{
-  char obj_tstr[16];
-  dtostrfd(mlx90614.obj_temp, Settings.flag2.temperature_resolution, obj_tstr);
-  char amb_tstr[16];
-  dtostrfd(mlx90614.amb_temp, Settings.flag2.temperature_resolution, amb_tstr);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"MLX90614\":{\"OBJTMP\":%s,\"AMBTMP\":%s}"), obj_tstr, amb_tstr);
-#ifdef USE_WEBSERVER
-  } else {
-    WSContentSend_PD(HTTP_IRTMP, obj_tstr, amb_tstr);
-#endif
-  }
-}
-
-
-
-
-
-bool Xsns46(byte function)
-{
-  if (!I2cEnabled(XI2C_32)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    MLX90614_Init();
-  }
-  else if (mlx90614.ready) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        MLX90614_Every_Second();
-        break;
-      case FUNC_JSON_APPEND:
-        MLX90614_Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MLX90614_Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_47_max31865.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_47_max31865.ino"
-#ifdef USE_MAX31865
-
-#ifndef USE_SPI
-#error "MAX31865 requires USE_SPI enabled"
-#endif
-
-#include "Adafruit_MAX31865.h"
-
-#define XSNS_47 47
-
-#if MAX31865_PTD_WIRES == 4
-  #define PTD_WIRES MAX31865_4WIRE
-#elif MAX31865_PTD_WIRES == 3
-  #define PTD_WIRES MAX31865_3WIRE
-#else
-  #define PTD_WIRES MAX31865_2WIRE
-#endif
-
-int8_t init_status = 0;
-
-Adafruit_MAX31865 max31865;
-
-struct MAX31865_Result_Struct {
-    uint8_t ErrorCode;
-    uint16_t Rtd;
-    float PtdResistance;
-    float PtdTemp;
-} MAX31865_Result;
-
-void MAX31865_Init(void){
-    if(init_status)
-        return;
-
-  max31865.setPins(
-    pin[GPIO_SSPI_CS],
-    pin[GPIO_SSPI_MOSI],
-    pin[GPIO_SSPI_MISO],
-    pin[GPIO_SSPI_SCLK]
-  );
-
-  if(max31865.begin(PTD_WIRES))
-    init_status = 1;
-  else
-    init_status = -1;
-}
-
-
-
-
-
-void MAX31865_GetResult(void){
-    uint16_t rtd;
-
-    rtd = max31865.readRTD();
-    MAX31865_Result.Rtd = rtd;
-    MAX31865_Result.PtdResistance = max31865.rtd_to_resistance(rtd, MAX31865_REF_RES);
-    MAX31865_Result.PtdTemp = max31865.rtd_to_temperature(rtd, MAX31865_PTD_RES, MAX31865_REF_RES) + MAX31865_PTD_BIAS;
-}
-
-void MAX31865_Show(bool Json){
-    char temperature[33];
-    char resistance[33];
-
-    dtostrfd(MAX31865_Result.PtdResistance, Settings.flag2.temperature_resolution, resistance);
-    dtostrfd(MAX31865_Result.PtdTemp, Settings.flag2.temperature_resolution, temperature);
-
-    if(Json){
-        ResponseAppend_P(PSTR(",\"MAX31865\":{\"" D_JSON_TEMPERATURE "\":%s,\"" D_JSON_RESISTANCE "\":%s,\"" D_JSON_ERROR "\":%d}"), \
-          temperature, resistance, MAX31865_Result.ErrorCode);
-#ifdef USE_DOMOTICZ
-        if (0 == tele_period) {
-          DomoticzSensor(DZ_TEMP, temperature);
-        }
-#endif
-#ifdef USE_KNX
-        if (0 == tele_period) {
-          KnxSensor(KNX_TEMPERATURE, MAX31865_Result.PtdTemp);
-        }
-#endif
-    } else {
-#ifdef USE_WEBSERVER
-        WSContentSend_PD(HTTP_SNS_TEMP, "MAX31865", temperature, TempUnit());
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns47(uint8_t function)
-{
-  bool result = false;
-  if((pin[GPIO_SSPI_MISO] < 99) && (pin[GPIO_SSPI_MOSI] < 99) &&
-     (pin[GPIO_SSPI_SCLK] < 99) && (pin[GPIO_SSPI_CS] < 99)) {
-
-    switch (function) {
-      case FUNC_INIT:
-        MAX31865_Init();
-        break;
-
-      case FUNC_EVERY_SECOND:
-        MAX31865_GetResult();
-        break;
-
-      case FUNC_JSON_APPEND:
-        MAX31865_Show(true);
-        break;
-
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MAX31865_Show(false);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
-# 35 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
-#ifdef USE_I2C
-#ifdef USE_CHIRP
-# 47 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
-#define XSNS_48 48
-#define XI2C_33 33
-
-#define CHIRP_MAX_SENSOR_COUNT 3
-
-#define CHIRP_ADDR_STANDARD 0x20
-
-
-
-
-
-#define D_CMND_CHIRP "CHIRP"
-
-const char S_JSON_CHIRP_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_CHIRP "%s\":%d}";
-const char S_JSON_CHIRP_COMMAND[] PROGMEM = "{\"" D_CMND_CHIRP "%s\"}";
-const char kCHIRP_Commands[] PROGMEM = "Select|Set|Scan|Reset|Sleep|Wake";
-
-const char kChirpTypes[] PROGMEM = "CHIRP";
-
-
-
-
-
-enum CHIRP_Commands {
-  CMND_CHIRP_SELECT,
-  CMND_CHIRP_SET,
-  CMND_CHIRP_SCAN,
-  CMND_CHIRP_RESET,
-  CMND_CHIRP_SLEEP,
-  CMND_CHIRP_WAKE };
-
-
-
-
-
-
-#define CHIRP_GET_CAPACITANCE 0x00
-#define CHIRP_SET_ADDRESS 0x01
-#define CHIRP_GET_ADDRESS 0x02
-#define CHIRP_MEASURE_LIGHT 0x03
-#define CHIRP_GET_LIGHT 0x04
-#define CHIRP_GET_TEMPERATURE 0x05
-#define CHIRP_RESET 0x06
-#define CHIRP_GET_VERSION 0x07
-#define CHIRP_SLEEP 0x08
-#define CHIRP_GET_BUSY 0x09
-
-
-
-
-
-void ChirpWriteI2CRegister(uint8_t addr, uint8_t reg) {
-  Wire.beginTransmission(addr);
-  Wire.write(reg);
-  Wire.endTransmission();
-}
-
-uint16_t ChirpFinishReadI2CRegister16bit(uint8_t addr) {
-  Wire.requestFrom(addr,(uint8_t)2);
-  uint16_t t = Wire.read() << 8;
-  t = t | Wire.read();
-  return t;
-}
-
-
-
-
-
-uint8_t chirp_current = 0;
-uint8_t chirp_found_sensors = 0;
-
-char chirp_name[7];
-uint8_t chirp_next_job = 0;
-uint32_t chirp_timeout_count = 0;
-
-#pragma pack(1)
-struct ChirpSensor_t{
-    uint16_t moisture = 0;
-    uint16_t light = 0;
-    int16_t temperature = 0;
-    uint8_t version = 0;
-    uint8_t address:7;
-    uint8_t explicitSleep:1;
-};
-#pragma pack()
-
-ChirpSensor_t chirp_sensor[CHIRP_MAX_SENSOR_COUNT];
-
-
-
-void ChirpReset(uint8_t addr) {
-    ChirpWriteI2CRegister(addr, CHIRP_RESET);
-}
-
-
-
-void ChirpResetAll(void) {
-    for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-      if (chirp_sensor[i].version) {
-        ChirpReset(chirp_sensor[i].address);
-        }
-    }
-}
-
-
-void ChirpClockSet() {
-    Wire.setClockStretchLimit(4000);
-    Wire.setClock(50000);
-}
-
-
-
-void ChirpSleep(uint8_t addr) {
-    ChirpWriteI2CRegister(addr, CHIRP_SLEEP);
-}
-# 185 "S:/Development/Tasmota/tasmota/xsns_48_chirp.ino"
-void ChirpSelect(uint8_t sensor) {
-  if(sensor < chirp_found_sensors) {
-    chirp_current = sensor;
-    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u now active."), chirp_current);
-  }
-  if (sensor == 255) {
-    DEBUG_SENSOR_LOG(PSTR("CHIRP: Sensor %u active at address 0x%x."), chirp_current, chirp_sensor[chirp_current].address);
-  }
-}
-
-
-
-uint8_t ChirpReadVersion(uint8_t addr) {
-  return (I2cRead8(addr, CHIRP_GET_VERSION));
-}
-
-
-
-bool ChirpSet(uint8_t addr) {
-  if(addr < 128){
-    if (I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr)){
-      if(chirp_sensor[chirp_current].version>0x25 && chirp_sensor[chirp_current].version != 255){
-        delay(5);
-        I2cWrite8(chirp_sensor[chirp_current].address, CHIRP_SET_ADDRESS, addr);
-
-      }
-      DEBUG_SENSOR_LOG(PSTR("CHIRP: Wrote adress %u "), addr);
-      ChirpReset(chirp_sensor[chirp_current].address);
-      chirp_sensor[chirp_current].address = addr;
-      chirp_timeout_count = 10;
-      chirp_next_job = 0;
-      if(chirp_sensor[chirp_current].version == 255){
-          AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: wrote new address %u, please power off device"), addr);
-          chirp_sensor[chirp_current].version == 0;
-      }
-      return true;
-    }
-  }
-  AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: address %u incorrect and not used"), addr);
-  return false;
-}
-
-
-
-bool ChirpScan()
-{
-  ChirpClockSet();
-  chirp_found_sensors = 0;
-  for (uint8_t address = 1; address <= 127; address++) {
-    chirp_sensor[chirp_found_sensors].version = 0;
-    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
-    delay(2);
-    chirp_sensor[chirp_found_sensors].version = ChirpReadVersion(address);
-    if (chirp_sensor[chirp_found_sensors].version > 0) {
-      I2cSetActiveFound(address, "CHIRP");
-      if (chirp_found_sensors<CHIRP_MAX_SENSOR_COUNT) {
-        chirp_sensor[chirp_found_sensors].address = address;
-        AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CHIRP: fw %x"), chirp_sensor[chirp_found_sensors].version);
-      }
-      chirp_found_sensors++;
-    }
-  }
-
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Found %u CHIRP sensor(s)."), chirp_found_sensors);
-  return (chirp_found_sensors > 0);
-}
-
-
-
-void ChirpDetect(void)
-{
-  if (chirp_next_job > 0) { return; }
-
-  DEBUG_SENSOR_LOG(PSTR("CHIRP: scan will start ..."));
-  if (ChirpScan()) {
-    uint8_t chirp_model = 0;
-    GetTextIndexed(chirp_name, sizeof(chirp_name), chirp_model, kChirpTypes);
-  }
-}
-
-
-void ChirpServiceAllSensors(uint8_t job){
-  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-    if (chirp_sensor[i].version && !chirp_sensor[i].explicitSleep) {
-      DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare for sensor at address 0x%x"), chirp_sensor[i].address);
-      switch(job){
-        case 0:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_CAPACITANCE);
-        break;
-        case 1:
-        chirp_sensor[i].moisture = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        case 2:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_TEMPERATURE);
-        break;
-        case 3:
-        chirp_sensor[i].temperature = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        case 4:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_MEASURE_LIGHT);
-        break;
-        case 5:
-        ChirpWriteI2CRegister(chirp_sensor[i].address, CHIRP_GET_LIGHT);
-        break;
-        case 6:
-        chirp_sensor[i].light = ChirpFinishReadI2CRegister16bit(chirp_sensor[i].address);
-        break;
-        default:
-        break;
-      }
-    }
-  }
-}
-
-
-
-void ChirpEvery100MSecond(void)
-{
-
-  if(chirp_timeout_count == 0) {
-      switch(chirp_next_job) {
-          case 0:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: reset all"));
-          ChirpResetAll();
-          chirp_timeout_count = 10;
-          chirp_next_job++;
-          break;
-          case 1:
-
-
-          chirp_next_job++;
-          break;
-          case 2:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read"));
-          ChirpServiceAllSensors(0);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 3:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read"));
-          ChirpServiceAllSensors(1);
-          chirp_next_job++;
-          break;
-          case 4:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare moisture read - 2nd"));
-          ChirpServiceAllSensors(0);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 5:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish moisture read - 2nd"));
-          ChirpServiceAllSensors(1);
-          chirp_next_job++;
-          break;
-          case 6:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read"));
-          ChirpServiceAllSensors(2);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 7:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read"));
-          ChirpServiceAllSensors(3);
-          chirp_next_job++;
-          break;
-          case 8:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare temperature read - 2nd"));
-          ChirpServiceAllSensors(2);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 9:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish temperature read - 2nd"));
-          ChirpServiceAllSensors(3);
-          chirp_next_job++;
-          break;
-          case 10:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: start light measure process"));
-          ChirpServiceAllSensors(4);
-          chirp_timeout_count = 90;
-          chirp_next_job++;
-          break;
-          case 11:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: prepare light read"));
-          ChirpServiceAllSensors(5);
-          chirp_timeout_count = 11;
-          chirp_next_job++;
-          break;
-          case 12:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: finish light read"));
-          ChirpServiceAllSensors(6);
-          chirp_next_job++;
-          break;
-          case 13:
-          DEBUG_SENSOR_LOG(PSTR("CHIRP: paused, waiting for TELE"));
-          break;
-          case 14:
-          if (Settings.tele_period > 16){
-              chirp_timeout_count = (Settings.tele_period - 17) * 10;
-              DEBUG_SENSOR_LOG(PSTR("CHIRP: timeout 1/10 sec: %u, tele: %u"), chirp_timeout_count, Settings.tele_period);
-            }
-          else{
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("CHIRP: TELEPERIOD must be > 16 seconds !"));
-
-          }
-          chirp_next_job = 1;
-          break;
-      }
-  }
-  else {
-      chirp_timeout_count--;
-  }
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-
-const char HTTP_SNS_DARKNESS[] PROGMEM = "{s} " D_JSON_DARKNESS "{m}%s %%{e}";
-const char HTTP_SNS_CHIRPVER[] PROGMEM = "{s} CHIRP-sensor %u at address{m}0x%x{e}"
-                                         "{s} FW-version{m}%s {e}"; ;
-const char HTTP_SNS_CHIRPSLEEP[] PROGMEM = "{s} {m} is sleeping ...{e}";
-#endif
-
-
-
-void ChirpShow(bool json)
-{
-  for (uint32_t i = 0; i < chirp_found_sensors; i++) {
-    if (chirp_sensor[i].version) {
-
-      char str_temperature[33];
-      double t_temperature = ((double) chirp_sensor[i].temperature )/10.0;
-      dtostrfd(t_temperature, Settings.flag2.temperature_resolution, str_temperature);
-      char str_light[33];
-      dtostrfd(chirp_sensor[i].light, 0, str_light);
-      char str_version[7];
-      if(chirp_sensor[i].version == 0xff){
-        strncpy_P(str_version, PSTR("Chirp!"), sizeof(str_version));
-      }
-      else{
-        sprintf(str_version, "%x", chirp_sensor[i].version);
-      }
-
-      if (json) {
-        if(!chirp_sensor[i].explicitSleep) {
-          ResponseAppend_P(PSTR(",\"%s%u\":{\"" D_JSON_MOISTURE "\":%d"), chirp_name, i, chirp_sensor[i].moisture);
-          if(chirp_sensor[i].temperature!=-1){
-            ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%s"),str_temperature);
-          }
-          ResponseAppend_P(PSTR(",\"" D_JSON_DARKNESS "\":%s}"),str_light);
-        }
-        else {
-          ResponseAppend_P(PSTR(",\"%s%u\":{\"sleeping\"}"),chirp_name, i);
-        }
-  #ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        char str_moisture[33];
-        dtostrfd(chirp_sensor[i].moisture, 0, str_moisture);
-        DomoticzTempHumSensor(str_temperature, str_moisture);
-        DomoticzSensor(DZ_ILLUMINANCE,chirp_sensor[i].light);
-      }
-  #endif
-  #ifdef USE_WEBSERVER
-      } else {
-        WSContentSend_PD(HTTP_SNS_CHIRPVER, i, chirp_sensor[i].address, str_version);
-        if (chirp_sensor[i].explicitSleep){
-          WSContentSend_PD(HTTP_SNS_CHIRPSLEEP);
-        }
-        else {
-          WSContentSend_PD(HTTP_SNS_MOISTURE, "", chirp_sensor[i].moisture);
-          WSContentSend_PD(HTTP_SNS_DARKNESS, str_light);
-          if (chirp_sensor[i].temperature!=-1) {
-            WSContentSend_PD(HTTP_SNS_TEMP, "", str_temperature, TempUnit());
-          }
-        }
-
-  #endif
-      }
-    }
-  }
-}
-
-
-
-
-
-bool ChirpCmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_CHIRP);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_CHIRP), disp_len)) {
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kCHIRP_Commands);
-
-    switch (command_code) {
-      case CMND_CHIRP_SELECT:
-      case CMND_CHIRP_SET:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(XdrvMailbox.payload); }
-          if (command_code == CMND_CHIRP_SET) { ChirpSet((uint8_t)XdrvMailbox.payload); }
-        Response_P(S_JSON_CHIRP_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        }
-        else {
-          if (command_code == CMND_CHIRP_SELECT) { ChirpSelect(255); }
-        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
-        }
-        break;
-      case CMND_CHIRP_SCAN:
-      case CMND_CHIRP_SLEEP:
-      case CMND_CHIRP_WAKE:
-      case CMND_CHIRP_RESET:
-        if (command_code == CMND_CHIRP_SCAN) { chirp_next_job = 0;
-                                                    ChirpDetect(); }
-        if (command_code == CMND_CHIRP_SLEEP) { chirp_sensor[chirp_current].explicitSleep = true;
-                                                    ChirpSleep(chirp_sensor[chirp_current].address); }
-        if (command_code == CMND_CHIRP_WAKE) { chirp_sensor[chirp_current].explicitSleep = false;
-                                                    ChirpReadVersion(chirp_sensor[chirp_current].address); }
-        if (command_code == CMND_CHIRP_RESET) { ChirpReset(chirp_sensor[chirp_current].address); }
-        Response_P(S_JSON_CHIRP_COMMAND, command, XdrvMailbox.payload);
-        break;
-      default:
-
-        serviced = false;
-      break;
-    }
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns48(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_33)) { return false; }
-
-  bool result = false;
-
-  switch (function) {
-    case FUNC_EVERY_100_MSECOND:
-      if(chirp_found_sensors > 0){
-        ChirpEvery100MSecond();
-      }
-      break;
-    case FUNC_COMMAND:
-      result = ChirpCmd();
-      break;
-    case FUNC_JSON_APPEND:
-      ChirpShow(1);
-      chirp_next_job = 14;
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      ChirpShow(0);
-      break;
-#endif
-    case FUNC_INIT:
-      ChirpDetect();
-      break;
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
-# 31 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
-#ifdef USE_I2C
-#ifdef USE_PAJ7620
-
-
-
-
-
-
-#define XSNS_50 50
-#define XI2C_34 34
-
-#define PAJ7620_ADDR 0x73
-
-#define PAJ7620_BANK_SEL 0xEF
-
-
-
-#define PAJ7620_GET_GESTURE 0x43
-#define PAJ7620_PROXIMITY_AVG_Y 0x6c
-
-#define PAJ7620_OBJECT_CENTER_X 0xad
-#define PAJ7620_OBJECT_CENTER_Y 0xaf
-
-#define PAJ7620_DOWN 1
-#define PAJ7620_UP 2
-#define PAJ7620_RIGHT 4
-#define PAJ7620_LEFT 8
-#define PAJ7620_NEAR 16
-#define PAJ7620_FAR 32
-#define PAJ7620_CW 64
-#define PAJ7620_CCW 128
-
-
-
-
-const uint8_t PAJ7620initRegisterArray[][2] PROGMEM = {
-  {0xEF,0x00},
- {0x32,0x29}, {0x33,0x01}, {0x34,0x00}, {0x35,0x01}, {0x36,0x00}, {0x37,0x07}, {0x38,0x17}, {0x39,0x06},
- {0x3A,0x12}, {0x3F,0x00}, {0x40,0x02}, {0x41,0xFF}, {0x42,0x01}, {0x46,0x2D}, {0x47,0x0F}, {0x48,0x3C},
- {0x49,0x00}, {0x4A,0x1E}, {0x4B,0x00}, {0x4C,0x20}, {0x4D,0x00}, {0x4E,0x1A}, {0x4F,0x14}, {0x50,0x00},
- {0x51,0x10}, {0x52,0x00}, {0x5C,0x02}, {0x5D,0x00}, {0x5E,0x10}, {0x5F,0x3F}, {0x60,0x27}, {0x61,0x28},
- {0x62,0x00}, {0x63,0x03}, {0x64,0xF7}, {0x65,0x03}, {0x66,0xD9}, {0x67,0x03}, {0x68,0x01}, {0x69,0xC8},
- {0x6A,0x40}, {0x6D,0x04}, {0x6E,0x00}, {0x6F,0x00}, {0x70,0x80}, {0x71,0x00}, {0x72,0x00}, {0x73,0x00},
- {0x74,0xF0}, {0x75,0x00}, {0x80,0x42}, {0x81,0x44}, {0x82,0x04}, {0x83,0x20}, {0x84,0x20}, {0x85,0x00},
- {0x86,0x10}, {0x87,0x00}, {0x88,0x05}, {0x89,0x18}, {0x8A,0x10}, {0x8B,0x01}, {0x8C,0x37}, {0x8D,0x00},
- {0x8E,0xF0}, {0x8F,0x81}, {0x90,0x06}, {0x91,0x06}, {0x92,0x1E}, {0x93,0x0D}, {0x94,0x0A}, {0x95,0x0A},
- {0x96,0x0C}, {0x97,0x05}, {0x98,0x0A}, {0x99,0x41}, {0x9A,0x14}, {0x9B,0x0A}, {0x9C,0x3F}, {0x9D,0x33},
- {0x9E,0xAE}, {0x9F,0xF9}, {0xA0,0x48}, {0xA1,0x13}, {0xA2,0x10}, {0xA3,0x08}, {0xA4,0x30}, {0xA5,0x19},
- {0xA6,0x10}, {0xA7,0x08}, {0xA8,0x24}, {0xA9,0x04}, {0xAA,0x1E}, {0xAB,0x1E}, {0xCC,0x19}, {0xCD,0x0B},
- {0xCE,0x13}, {0xCF,0x64}, {0xD0,0x21}, {0xD1,0x0F}, {0xD2,0x88}, {0xE0,0x01}, {0xE1,0x04}, {0xE2,0x41},
- {0xE3,0xD6}, {0xE4,0x00}, {0xE5,0x0C}, {0xE6,0x0A}, {0xE7,0x00}, {0xE8,0x00}, {0xE9,0x00}, {0xEE,0x07},
- {0xEF,0x01},
- {0x00,0x1E}, {0x01,0x1E}, {0x02,0x0F}, {0x03,0x10}, {0x04,0x02}, {0x05,0x00}, {0x06,0xB0}, {0x07,0x04},
- {0x08,0x0D}, {0x09,0x0E}, {0x0A,0x9C}, {0x0B,0x04}, {0x0C,0x05}, {0x0D,0x0F}, {0x0E,0x02}, {0x0F,0x12},
- {0x10,0x02}, {0x11,0x02}, {0x12,0x00}, {0x13,0x01}, {0x14,0x05}, {0x15,0x07}, {0x16,0x05}, {0x17,0x07},
- {0x18,0x01}, {0x19,0x04}, {0x1A,0x05}, {0x1B,0x0C}, {0x1C,0x2A}, {0x1D,0x01}, {0x1E,0x00}, {0x21,0x00},
- {0x22,0x00}, {0x23,0x00}, {0x25,0x01}, {0x26,0x00}, {0x27,0x39}, {0x28,0x7F}, {0x29,0x08}, {0x30,0x03},
- {0x31,0x00}, {0x32,0x1A}, {0x33,0x1A}, {0x34,0x07}, {0x35,0x07}, {0x36,0x01}, {0x37,0xFF}, {0x38,0x36},
- {0x39,0x07}, {0x3A,0x00}, {0x3E,0xFF}, {0x3F,0x00}, {0x40,0x77}, {0x41,0x40}, {0x42,0x00}, {0x43,0x30},
- {0x44,0xA0}, {0x45,0x5C}, {0x46,0x00}, {0x47,0x00}, {0x48,0x58}, {0x4A,0x1E}, {0x4B,0x1E}, {0x4C,0x00},
- {0x4D,0x00}, {0x4E,0xA0}, {0x4F,0x80}, {0x50,0x00}, {0x51,0x00}, {0x52,0x00}, {0x53,0x00}, {0x54,0x00},
- {0x57,0x80}, {0x59,0x10}, {0x5A,0x08}, {0x5B,0x94}, {0x5C,0xE8}, {0x5D,0x08}, {0x5E,0x3D}, {0x5F,0x99},
- {0x60,0x45}, {0x61,0x40}, {0x63,0x2D}, {0x64,0x02}, {0x65,0x96}, {0x66,0x00}, {0x67,0x97}, {0x68,0x01},
- {0x69,0xCD}, {0x6A,0x01}, {0x6B,0xB0}, {0x6C,0x04}, {0x6D,0x2C}, {0x6E,0x01}, {0x6F,0x32}, {0x71,0x00},
- {0x72,0x01}, {0x73,0x35}, {0x74,0x00}, {0x75,0x33}, {0x76,0x31}, {0x77,0x01}, {0x7C,0x84}, {0x7D,0x03},
- {0x7E,0x01},
-  {0xEF,0x00}
-};
-
-
-
-
-
-const char kPaj7620Directions[] PROGMEM = "Down|Up|Right|Left|Near|Far|CW|CCW";
-
-const uint8_t PAJ7620_PIN[]= {1,2,3,4};
-
-
-
-
-
-char PAJ7620_name[] = "PAJ7620";
-
-uint32_t PAJ7620_timeout_counter = 10;
-uint32_t PAJ7620_next_job = 0;
-uint32_t PAJ7620_mode = 1;
-
-struct {
-  uint8_t current;
-  uint8_t last;
-  uint8_t same;
-  uint8_t unfinished;
-} PAJ7620_gesture;
-
-bool PAJ7620_finished_gesture = false;
-char PAJ7620_currentGestureName[6];
-
-struct{
-  uint8_t x;
-  uint8_t y;
-  uint8_t last_x;
-  uint8_t last_y;
-  uint8_t proximity;
-  uint8_t last_proximity;
-  uint8_t corner;
-  struct {
-    uint8_t step:3;
-    uint8_t countdown:3;
-    uint8_t valid:1;
-    } PIN;
-} PAJ7620_state;
-
-
-
-
-
-void PAJ7620SelectBank(uint8_t bank)
-{
-  I2cWrite(PAJ7620_ADDR, PAJ7620_BANK_SEL, bank &1, 1);
-}
-
-
-
-void PAJ7620DecodeGesture(void)
-{
-  uint32_t index = 0;
-  switch (PAJ7620_gesture.current) {
-    case PAJ7620_LEFT:
-      index++;
-    case PAJ7620_RIGHT:
-      index++;
-    case PAJ7620_UP:
-      index++;
-    case PAJ7620_DOWN:
-      if (PAJ7620_gesture.unfinished) {
-        PAJ7620_finished_gesture = true;
-        break;
-      }
-      PAJ7620_gesture.unfinished = PAJ7620_gesture.current;
-      PAJ7620_timeout_counter = 5;
-      break;
-    case PAJ7620_NEAR:
-      index = 4;
-      PAJ7620_finished_gesture = true;
-      PAJ7620_timeout_counter = 25;
-      break;
-    case PAJ7620_FAR:
-      index = 5;
-      PAJ7620_finished_gesture = true;
-      PAJ7620_timeout_counter = 25;
-      break;
-    case PAJ7620_CW:
-      index = 6;
-      PAJ7620_finished_gesture = true;
-      break;
-    case PAJ7620_CCW:
-      index = 7;
-      PAJ7620_finished_gesture = true;
-      break;
-    default:
-      index = 8;
-      if (PAJ7620_gesture.unfinished) {
-        PAJ7620_finished_gesture = true;
-      }
-      break;
-  }
-  if (index < 8) {
-    GetTextIndexed(PAJ7620_currentGestureName, sizeof(PAJ7620_currentGestureName), index, kPaj7620Directions);
-  }
-
-  if (PAJ7620_finished_gesture) {
-    if (PAJ7620_gesture.unfinished) {
-      if ((PAJ7620_gesture.current != PAJ7620_NEAR) && (PAJ7620_gesture.current != PAJ7620_FAR)) {
-        PAJ7620_gesture.current = PAJ7620_gesture.unfinished;
-      }
-    }
-    if (PAJ7620_gesture.current == PAJ7620_gesture.last) {
-      PAJ7620_gesture.same++;
-    } else {
-      PAJ7620_gesture.same = 1;
-    }
-    PAJ7620_gesture.last = PAJ7620_gesture.current;
-    PAJ7620_finished_gesture = false;
-    PAJ7620_gesture.unfinished = 0;
-    PAJ7620_timeout_counter += 3;
-    MqttPublishSensor();
-  }
-}
-
-
-
-void PAJ7620ReadGesture(void)
-{
-  switch (PAJ7620_mode) {
-    case 1:
-      PAJ7620_gesture.current = I2cRead8(PAJ7620_ADDR,PAJ7620_GET_GESTURE);
-      if ((PAJ7620_gesture.current > 0) || PAJ7620_gesture.unfinished) {
-        DEBUG_SENSOR_LOG(PSTR("PAJ: gesture: %u"), PAJ7620_gesture.current);
-        PAJ7620DecodeGesture();
-      }
-      break;
-    case 2:
-      PAJ7620_state.proximity = I2cRead8(PAJ7620_ADDR, PAJ7620_PROXIMITY_AVG_Y);
-      if ((PAJ7620_state.proximity > 0) || (PAJ7620_state.last_proximity > 0)) {
-        if (PAJ7620_state.proximity != PAJ7620_state.last_proximity) {
-          PAJ7620_state.last_proximity = PAJ7620_state.proximity;
-          DEBUG_SENSOR_LOG(PSTR("PAJ: Proximity: %u"), PAJ7620_state.proximity);
-          MqttPublishSensor();
-        }
-      }
-      break;
-    case 3:
-    case 4:
-    case 5:
-      PAJ7620_state.x = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_X);
-      PAJ7620_state.y = I2cRead8(PAJ7620_ADDR, PAJ7620_OBJECT_CENTER_Y);
-      if ((PAJ7620_state.y > 0) && (PAJ7620_state.x > 0)) {
-        if ((PAJ7620_state.y != PAJ7620_state.last_y) || (PAJ7620_state.x != PAJ7620_state.last_x)) {
-          PAJ7620_state.last_y = PAJ7620_state.y;
-          PAJ7620_state.last_x = PAJ7620_state.x;
-          DEBUG_SENSOR_LOG(PSTR("PAJ: x: %u   y: %u"), PAJ7620_state.x, PAJ7620_state.y);
-
-          PAJ7620_state.corner = 0;
-
-
-
-          switch (PAJ7620_state.y) {
-            case 0: case 1: case 2: case 3: case 4: case 5:
-              PAJ7620_state.corner = 3;
-              break;
-            case 9: case 10: case 11: case 12: case 13: case 14:
-              PAJ7620_state.corner = 1;
-              break;
-          }
-          if (PAJ7620_state.corner != 0) {
-            switch (PAJ7620_state.x) {
-              case 0: case 1: case 2: case 3: case 4: case 5:
-                break;
-              case 9: case 10: case 11: case 12: case 13: case 14:
-                PAJ7620_state.corner++;
-                break;
-              default:
-                PAJ7620_state.corner = 0;
-                break;
-            }
-          }
-          DEBUG_SENSOR_LOG(PSTR("PAJ: corner: %u"), PAJ7620_state.corner);
-
-          if (PAJ7620_state.PIN.countdown == 0) {
-            PAJ7620_state.PIN.step = 0;
-            PAJ7620_state.PIN.valid = 0;
-          }
-          if (!PAJ7620_state.PIN.step) {
-            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
-              PAJ7620_state.PIN.step = 1;
-              PAJ7620_state.PIN.countdown = 7;
-            }
-          } else {
-            if (PAJ7620_state.corner == PAJ7620_PIN[PAJ7620_state.PIN.step]) {
-              PAJ7620_state.PIN.step += 1;
-              PAJ7620_state.PIN.countdown = 7;
-            } else {
-              PAJ7620_state.PIN.countdown -= 1;
-            }
-          }
-          if (PAJ7620_state.PIN.step == 4) {
-            PAJ7620_state.PIN.valid = 1;
-            DEBUG_SENSOR_LOG(PSTR("PAJ: PIN valid!!"));
-            PAJ7620_state.PIN.countdown = 0;
-          }
-          MqttPublishSensor();
-        }
-      }
-      break;
-  }
-}
-
-
-
-void PAJ7620Detect(void)
-{
-  if (I2cActive(PAJ7620_ADDR)) { return; }
-
-  PAJ7620SelectBank(0);
-  PAJ7620SelectBank(0);
-  uint16_t PAJ7620_id = I2cRead16LE(PAJ7620_ADDR,0);
- uint8_t PAJ7620_ver = I2cRead8(PAJ7620_ADDR,2);
-  if (0x7620 == PAJ7620_id) {
-    I2cSetActiveFound(PAJ7620_ADDR, PAJ7620_name);
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PAJ: ID: 0x%x and VER: %u"), PAJ7620_id, PAJ7620_ver);
-    PAJ7620_next_job = 1;
-  }
-  else {
-    DEBUG_SENSOR_LOG(PSTR("PAJ: sensor not found, false ID 0x%x"), PAJ7620_id);
-  }
-}
-
-
-
-void PAJ7620Init(void)
-{
-  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor start %u"),millis());
-  union{
-    uint32_t raw;
-    uint8_t reg_val[4];
-  } buf;
-
-  for (uint32_t i = 0; i < (sizeof(PAJ7620initRegisterArray) / 2); i += 2)
- {
-    buf.raw = pgm_read_dword(PAJ7620initRegisterArray + i);
-    DEBUG_SENSOR_LOG("PAJ: %x %x %x %x",buf.reg_val[0],buf.reg_val[1],buf.reg_val[2],buf.reg_val[3]);
-    I2cWrite(PAJ7620_ADDR, buf.reg_val[0], buf.reg_val[1], 1);
-    I2cWrite(PAJ7620_ADDR, buf.reg_val[2], buf.reg_val[3], 1);
- }
-  DEBUG_SENSOR_LOG(PSTR("PAJ: init sensor done %u"),millis());
-  PAJ7620_next_job = 2;
-}
-
-
-
-void PAJ7620Loop(void)
-{
-  if (0 == PAJ7620_timeout_counter) {
-    switch (PAJ7620_next_job) {
-      case 1:
-        PAJ7620Init();
-        break;
-      case 2:
-        if (PAJ7620_mode != 0) {
-          PAJ7620ReadGesture();
-        }
-        break;
-    }
-  } else {
-    PAJ7620_timeout_counter--;
-  }
-}
-
-
-
-void PAJ7620Show(bool json)
-{
-  if (json) {
-    if (PAJ7620_currentGestureName[0] != '\0' ) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%u}"), PAJ7620_name, PAJ7620_currentGestureName, PAJ7620_gesture.same);
-      PAJ7620_currentGestureName[0] = '\0';
-      return;
-    }
-    switch (PAJ7620_mode) {
-      case 2:
-        ResponseAppend_P(PSTR(",\"%s\":{\"Proximity\":%u}"), PAJ7620_name, PAJ7620_state.proximity);
-        break;
-      case 3:
-        if (PAJ7620_state.corner > 0) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"Corner\":%u}"), PAJ7620_name, PAJ7620_state.corner);
-        }
-        break;
-      case 4:
-        if (PAJ7620_state.PIN.valid) {
-          ResponseAppend_P(PSTR(",\"%s\":{\"PIN\":%u}"), PAJ7620_name, 1);
-          PAJ7620_state.PIN.valid = 0;
-        }
-        break;
-      case 5:
-        ResponseAppend_P(PSTR(",\"%s\":{\"x\":%u,\"y\":%u}"), PAJ7620_name, PAJ7620_state.x, PAJ7620_state.y);
-        break;
-    }
-  }
-}
-# 411 "S:/Development/Tasmota/tasmota/xsns_50_paj7620.ino"
-bool PAJ7620CommandSensor(void)
-{
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
-    PAJ7620_mode = XdrvMailbox.payload;
-  }
-  Response_P(S_JSON_SENSOR_INDEX_NVALUE, XSNS_50, PAJ7620_mode);
-
-  return true;
-}
-
-
-
-
-
-bool Xsns50(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_34)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    PAJ7620Detect();
-  }
-  else if (PAJ7620_next_job) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_50 == XdrvMailbox.index){
-          result = PAJ7620CommandSensor();
-        }
-        break;
-      case FUNC_EVERY_100_MSECOND:
-        PAJ7620Loop();
-        break;
-      case FUNC_JSON_APPEND:
-        PAJ7620Show(1);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_51_rdm6300.ino"
-# 21 "S:/Development/Tasmota/tasmota/xsns_51_rdm6300.ino"
-#ifdef USE_RDM6300
-
-#define XSNS_51 51
-
-#define RDM6300_BAUDRATE 9600
-
-#include <TasmotaSerial.h>
-
-#define RDM_TIMEOUT 100
-char rdm_uid_str[10];
-
-
-#define RDM6300_BLOCK 2*10
-
-uint8_t rdm_blcnt;
-TasmotaSerial *RDM6300_Serial = nullptr;
-
-void RDM6300_Init() {
-  if (pin[GPIO_RDM6300_RX] < 99) {
-    RDM6300_Serial = new TasmotaSerial(pin[GPIO_RDM6300_RX],-1,1);
-    if (RDM6300_Serial->begin(RDM6300_BAUDRATE)) {
-      if (RDM6300_Serial->hardwareSerial()) {
-        ClaimSerial();
-      }
-    }
-  }
-  rdm_blcnt=0;
-}
-
-
-void RDM6300_ScanForTag() {
-  char rdm_buffer[14];
-  uint8_t rdm_index;
-  uint8_t rdm_array[6];
-
-  if (!RDM6300_Serial) return;
-
-  if (rdm_blcnt>0) {
-    rdm_blcnt--;
-    while (RDM6300_Serial->available()) RDM6300_Serial->read();
-    return;
-  }
-
-  if (RDM6300_Serial->available()) {
-
-    char c=RDM6300_Serial->read();
-    if (c!=2) return;
-
-
-    rdm_index=0;
-    uint32_t cmillis=millis();
-    while (1) {
-      if (RDM6300_Serial->available()) {
-        char c=RDM6300_Serial->read();
-        if (c==3) {
-
-          break;
-        }
-        rdm_buffer[rdm_index++]=c;
-        if (rdm_index>13) {
-
-          return;
-        }
-      }
-      if ((millis()-cmillis)>RDM_TIMEOUT) {
-
-        return;
-      }
-    }
-
-
-    rdm_blcnt=RDM6300_BLOCK;
-
-
-    rm6300_hstring_to_array(rdm_array,sizeof(rdm_array),rdm_buffer);
-    uint8_t accu=0;
-    for (uint8_t count=0;count<5;count++) {
-      accu^=rdm_array[count];
-    }
-    if (accu!=rdm_array[5]) {
-
-      return;
-    }
-
-
-    memcpy(rdm_uid_str,&rdm_buffer[2],8);
-    rdm_uid_str[9]=0;
-
-    ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str);
-    MqttPublishTeleSensor();
-
-
-
-
-
-  }
-
-
-}
-
-uint8_t rm6300_hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
-  }
-  return rVal;
-}
-
-
-void rm6300_hstring_to_array(uint8_t array[], uint8_t len, char buffer[])
-{
-  char *cp=buffer;
-  for (uint8_t i = 0; i < len; i++) {
-    uint8_t val = rm6300_hexnibble(*cp++) << 4;
-    array[i]= val | rm6300_hexnibble(*cp++);
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_RDM6300[] PROGMEM =
- "{s}RDM6300 " "UID" "{m}%s" "{e}";
-
-void RDM6300_Show(void) {
-  if (!RDM6300_Serial) return;
-  if (!rdm_uid_str[0]) strcpy(rdm_uid_str,"????");
-  WSContentSend_PD(HTTP_RDM6300,rdm_uid_str);
-}
-#endif
-
-
-
-
-
-bool Xsns51(byte function)
-{
-  bool result = false;
-
-    switch (function) {
-      case FUNC_INIT:
-        RDM6300_Init();
-        break;
-      case FUNC_EVERY_100_MSECOND:
-        RDM6300_ScanForTag();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        RDM6300_Show();
-        break;
-#endif
-    }
-    return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
-#ifdef USE_IBEACON
-
-
-
-#define XSNS_52 52
-
-#include <TasmotaSerial.h>
-
-#define HM17_BAUDRATE 9600
-
-#define IBEACON_DEBUG 
-
-
-#define HM17_V110 
-
-
-
-#define IB_TIMEOUT_INTERVAL 30
-
-#define IB_UPDATE_TIME_INTERVAL 10
-
-TasmotaSerial *IBEACON_Serial = nullptr;
-
-
-uint8_t hm17_found,hm17_cmd,hm17_flag;
-
-#ifdef IBEACON_DEBUG
-uint8_t hm17_debug=0;
-#endif
-
-
-
-#define HM17_BSIZ 128
-char hm17_sbuffer[HM17_BSIZ];
-uint8_t hm17_sindex,hm17_result,hm17_scanning,hm17_connecting;
-uint32_t hm17_lastms;
-char ib_mac[14];
-
-
-#if 1
-uint8_t ib_upd_interval,ib_tout_interval;
-#define IB_UPDATE_TIME ib_upd_interval
-#define IB_TIMEOUT_TIME ib_tout_interval
-#else
-#undef IB_UPDATE_TIME
-#undef IB_TIMEOUT_TIME
-#define IB_UPDATE_TIME Settings.ib_upd_interval
-#define IB_TIMEOUT_TIME Settings.ib_tout_interval
-#endif
-
-enum {HM17_TEST,HM17_ROLE,HM17_IMME,HM17_DISI,HM17_IBEA,HM17_SCAN,HM17_DISC,HM17_RESET,HM17_RENEW,HM17_CON};
-#define HM17_SUCESS 99
-
-struct IBEACON {
-  char FACID[8];
-  char UID[32];
-  char MAJOR[4];
-  char MINOR[4];
-  char PWR[2];
-  char MAC[12];
-  char RSSI[4];
-};
-
-#define MAX_IBEACONS 16
-
-struct IBEACON_UID {
-  char MAC[12];
-  char RSSI[4];
-  uint8_t FLAGS;
-  uint8_t TIME;
-} ibeacons[MAX_IBEACONS];
-
-
-void IBEACON_Init() {
-
-  hm17_found=0;
-
-
-  if ((pin[GPIO_IBEACON_RX] < 99) && (pin[GPIO_IBEACON_TX] < 99)) {
-    IBEACON_Serial = new TasmotaSerial(pin[GPIO_IBEACON_RX], pin[GPIO_IBEACON_TX],1);
-    if (IBEACON_Serial->begin(HM17_BAUDRATE)) {
-      if (IBEACON_Serial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      hm17_sendcmd(HM17_TEST);
-      hm17_lastms=millis();
-
-      IB_UPDATE_TIME=IB_UPDATE_TIME_INTERVAL;
-      IB_TIMEOUT_TIME=IB_TIMEOUT_INTERVAL;
-    }
-  }
-}
-
-void hm17_every_second(void) {
-  if (!IBEACON_Serial) return;
-
-  if (hm17_found) {
-    if (IB_UPDATE_TIME && (uptime%IB_UPDATE_TIME==0)) {
-      if (hm17_cmd!=99) {
-        if (hm17_flag&2) {
-          ib_sendbeep();
-        } else {
-          if (!hm17_connecting) {
-            hm17_sendcmd(HM17_DISI);
-          }
-        }
-      }
-    }
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (ibeacons[cnt].FLAGS) {
-        ibeacons[cnt].TIME++;
-        if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) {
-          ibeacons[cnt].FLAGS=0;
-          ibeacon_mqtt(ibeacons[cnt].MAC,"0000");
-        }
-      }
-    }
-  } else {
-    if (uptime%20==0) {
-      hm17_sendcmd(HM17_TEST);
-    }
-  }
-}
-
-void hm17_sbclr(void) {
-  memset(hm17_sbuffer,0,HM17_BSIZ);
-  hm17_sindex=0;
-  IBEACON_Serial->flush();
-}
-
-void hm17_sendcmd(uint8_t cmd) {
-  hm17_sbclr();
-  hm17_cmd=cmd;
-#ifdef IBEACON_DEBUG
-  if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("hm17cmd %d"),cmd);
-#endif
-  switch (cmd) {
-    case HM17_TEST:
-      IBEACON_Serial->write("AT");
-      break;
-    case HM17_ROLE:
-      IBEACON_Serial->write("AT+ROLE1");
-      break;
-    case HM17_IMME:
-      IBEACON_Serial->write("AT+IMME1");
-      break;
-    case HM17_DISI:
-      IBEACON_Serial->write("AT+DISI?");
-      hm17_scanning=1;
-      break;
-    case HM17_IBEA:
-      IBEACON_Serial->write("AT+IBEA1");
-      break;
-    case HM17_RESET:
-      IBEACON_Serial->write("AT+RESET");
-      break;
-    case HM17_RENEW:
-      IBEACON_Serial->write("AT+RENEW");
-      break;
-    case HM17_SCAN:
-      IBEACON_Serial->write("AT+SCAN5");
-      break;
-    case HM17_DISC:
-      IBEACON_Serial->write("AT+DISC?");
-      hm17_scanning=1;
-      break;
-    case HM17_CON:
-      IBEACON_Serial->write((const uint8_t*)"AT+CON",6);
-      IBEACON_Serial->write((const uint8_t*)ib_mac,12);
-      hm17_connecting=1;
-      break;
-  }
-}
-
-uint32_t ibeacon_add(struct IBEACON *ib) {
-
-  if (!strncmp(ib->MAC,"FFFF",4) || strncmp(ib->FACID,"00000000",8)) {
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (ibeacons[cnt].FLAGS) {
-        if (!strncmp(ibeacons[cnt].MAC,ib->MAC,12)) {
-
-          memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
-          ibeacons[cnt].TIME=0;
-          return 1;
-        }
-      }
-    }
-    for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-      if (!ibeacons[cnt].FLAGS) {
-        memcpy(ibeacons[cnt].MAC,ib->MAC,12);
-        memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
-        ibeacons[cnt].FLAGS=1;
-        ibeacons[cnt].TIME=0;
-        return 1;
-      }
-    }
-  }
-  return 0;
-}
-
-void hm17_decode(void) {
-  struct IBEACON ib;
-  switch (hm17_cmd) {
-    case HM17_TEST:
-      if (!strncmp(hm17_sbuffer,"OK",2)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("AT OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-        hm17_found=1;
-      }
-      break;
-    case HM17_ROLE:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("ROLE OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_IMME:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IMME OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_IBEA:
-      if (!strncmp(hm17_sbuffer,"OK+Set:1",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("IBEA OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_SCAN:
-        if (!strncmp(hm17_sbuffer,"OK+Set:5",8)) {
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("SCAN OK"));
-#endif
-          hm17_sbclr();
-          hm17_result=HM17_SUCESS;
-        }
-        break;
-    case HM17_RESET:
-      if (!strncmp(hm17_sbuffer,"OK+RESET",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RESET OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_RENEW:
-      if (!strncmp(hm17_sbuffer,"OK+RENEW",8)) {
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("RENEW OK"));
-#endif
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-      }
-      break;
-    case HM17_CON:
-      if (!strncmp(hm17_sbuffer,"OK+CONNA",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNA OK"));
-#endif
-        hm17_connecting=2;
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+CONNE",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNE ERROR"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+CONNF",8)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONNF ERROR"));
-#endif
-        break;
-      }
-      if (hm17_connecting==2 && !strncmp(hm17_sbuffer,"OK+CONN",7)) {
-        hm17_sbclr();
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("CONN OK"));
-#endif
-        hm17_connecting=3;
-        hm17_sendcmd(HM17_TEST);
-        hm17_connecting=0;
-        break;
-      }
-      break;
-
-    case HM17_DISI:
-    case HM17_DISC:
-      if (!strncmp(hm17_sbuffer,"OK+DISCS",8)) {
-        hm17_sbclr();
-        hm17_result=1;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCS OK"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISIS",8)) {
-        hm17_sbclr();
-        hm17_result=1;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISIS OK"));
-#endif
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISCE",8)) {
-        hm17_sbclr();
-        hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-        if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR("DISCE OK"));
-#endif
-        hm17_scanning=0;
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+NAME:",8)) {
-        if (hm17_sbuffer[hm17_sindex-1]=='\n') {
-          hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) {
-            AddLog_P2(LOG_LEVEL_INFO, PSTR("NAME OK"));
-            AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-          }
-#endif
-          hm17_sbclr();
-        }
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DIS0:",8)) {
-        if (hm17_cmd==HM17_DISI) {
-#ifdef HM17_V110
-          goto hm17_v110;
-#endif
-        } else {
-          if (hm17_sindex==20) {
-            hm17_result=HM17_SUCESS;
-#ifdef IBEACON_DEBUG
-            if (hm17_debug) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("DIS0 OK"));
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-            }
-#endif
-            hm17_sbclr();
-          }
-        }
-        break;
-      }
-      if (!strncmp(hm17_sbuffer,"OK+DISC:",8)) {
-hm17_v110:
-        if (hm17_cmd==HM17_DISI) {
-          if (hm17_sindex==78) {
-#ifdef IBEACON_DEBUG
-            if (hm17_debug) {
-              AddLog_P2(LOG_LEVEL_INFO, PSTR("DISC: OK"));
-
-              AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-            }
-#endif
-            memcpy(ib.FACID,&hm17_sbuffer[8],8);
-            memcpy(ib.UID,&hm17_sbuffer[8+8+1],32);
-            memcpy(ib.MAJOR,&hm17_sbuffer[8+8+1+32+1],4);
-            memcpy(ib.MINOR,&hm17_sbuffer[8+8+1+32+1+4],4);
-            memcpy(ib.PWR,&hm17_sbuffer[8+8+1+32+1+4+4],2);
-            memcpy(ib.MAC,&hm17_sbuffer[8+8+1+32+1+4+4+2+1],12);
-            memcpy(ib.RSSI,&hm17_sbuffer[8+8+1+32+1+4+4+2+1+12+1],4);
-
-            if (ibeacon_add(&ib)) {
-              ibeacon_mqtt(ib.MAC,ib.RSSI);
-            }
-            hm17_sbclr();
-            hm17_result=1;
-          }
-        } else {
-#ifdef IBEACON_DEBUG
-          if (hm17_debug) AddLog_P2(LOG_LEVEL_INFO, PSTR(">>%s"),&hm17_sbuffer[8]);
-#endif
-        }
-        break;
-      }
-  }
-}
-
-void IBEACON_loop() {
-
-  if (!IBEACON_Serial) return;
-
-uint32_t difftime=millis()-hm17_lastms;
-
-  while (IBEACON_Serial->available()) {
-    hm17_lastms=millis();
-
-    if (hm17_sindex<HM17_BSIZ) {
-      hm17_sbuffer[hm17_sindex]=IBEACON_Serial->read();
-      hm17_sindex++;
-      hm17_decode();
-    } else {
-      hm17_sindex=0;
-      break;
-    }
-  }
-
-  if (hm17_cmd==99) {
-   if (hm17_sindex>=HM17_BSIZ-2 || (hm17_sindex && (difftime>100))) {
-     AddLog_P2(LOG_LEVEL_INFO, PSTR("%s"),hm17_sbuffer);
-     hm17_sbclr();
-   }
-  }
-
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_IBEACON[] PROGMEM =
- "{s}IBEACON-UID : %s" " - RSSI : %s" "{m}{e}";
-
-void IBEACON_Show(void) {
-char mac[14];
-char rssi[6];
-
-  for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
-    if (ibeacons[cnt].FLAGS) {
-      memcpy(mac,ibeacons[cnt].MAC,12);
-      mac[12]=0;
-      memcpy(rssi,ibeacons[cnt].RSSI,4);
-      rssi[4]=0;
-      WSContentSend_PD(HTTP_IBEACON,mac,rssi);
-    }
-  }
-
-}
-#endif
-# 485 "S:/Development/Tasmota/tasmota/xsns_52_ibeacon.ino"
-bool xsns52_cmd(void) {
-  bool serviced = true;
-  const char S_JSON_IBEACON[] = "{\"" D_CMND_SENSOR "%d\":%s:%d}";
-  const char S_JSON_IBEACON1[] = "{\"" D_CMND_SENSOR "%d\":%s:%s}";
-  uint16_t len=XdrvMailbox.data_len;
-  if (len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp>='0' && *cp<='8') {
-        hm17_sendcmd(*cp&7);
-        Response_P(S_JSON_IBEACON, XSNS_52,"hm17cmd",*cp&7);
-      } else if (*cp=='s') {
-        cp++;
-        len--;
-        while (*cp==' ') {
-          len--;
-          cp++;
-        }
-        IBEACON_Serial->write((uint8_t*)cp,len);
-        hm17_cmd=99;
-        Response_P(S_JSON_IBEACON1, XSNS_52,"hm17cmd",cp);
-      } else if (*cp=='u') {
-        cp++;
-        if (*cp) IB_UPDATE_TIME=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"uintv",IB_UPDATE_TIME);
-      } else if (*cp=='t') {
-        cp++;
-        if (*cp) IB_TIMEOUT_TIME=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"lintv",IB_TIMEOUT_TIME);
-      } else if (*cp=='c') {
-        for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) ibeacons[cnt].FLAGS=0;
-        Response_P(S_JSON_IBEACON1, XSNS_52,"clr list","");
-      }
-#ifdef IBEACON_DEBUG
-      else if (*cp=='d') {
-        cp++;
-        if (*cp) hm17_debug=atoi(cp);
-        Response_P(S_JSON_IBEACON, XSNS_52,"debug",hm17_debug);
-      }
-#endif
-  } else {
-    serviced=false;
-  }
-  return serviced;
-}
-
-#define D_CMND_IBEACON "IBEACON"
-
-bool ibeacon_cmd(void) {
-  ib_mac[0]=0;
-  int16_t rssi=0;
-  const char S_JSON_IBEACON[] = "{\"" D_CMND_IBEACON "_%s_RSSI\":%d}";
-  uint8_t cmd_len = strlen(D_CMND_IBEACON);
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_IBEACON), cmd_len)) {
-
-    rssi = XdrvMailbox.payload;
-    if (rssi==99) {
-      memcpy(ib_mac,XdrvMailbox.topic+cmd_len+1,12);
-      ib_mac[12]=0;
-      if (hm17_scanning) {
-
-        hm17_flag|=2;
-      } else {
-        ib_sendbeep();
-      }
-    }
-    Response_P(S_JSON_IBEACON,ib_mac,rssi);
-    return true;
-  }
-  return false;
-}
-
-void ib_sendbeep(void) {
-  hm17_flag=0;
-  hm17_sendcmd(HM17_CON);
-}
-
-void ibeacon_mqtt(const char *mac,const char *rssi) {
-  char s_mac[14];
-  char s_rssi[6];
-  memcpy(s_mac,mac,12);
-  s_mac[12]=0;
-  memcpy(s_rssi,rssi,4);
-  s_rssi[4]=0;
-  int16_t n_rssi=atoi(s_rssi);
-  ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi);
-  MqttPublishTeleSensor();
-}
-
-
-
-
-
-
-bool Xsns52(byte function)
-{
-  bool result = false;
-
-    switch (function) {
-      case FUNC_INIT:
-        IBEACON_Init();
-        break;
-      case FUNC_LOOP:
-        IBEACON_loop();
-        break;
-      case FUNC_EVERY_SECOND:
-        hm17_every_second();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_52 == XdrvMailbox.index) {
-          result = xsns52_cmd();
-        }
-        break;
-      case FUNC_COMMAND:
-        result=ibeacon_cmd();
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        if (hm17_found) IBEACON_Show();
-        break;
-#endif
-    }
-    return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-# 24 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-#ifdef USE_SML_M
-
-#define XSNS_53 53
-
-
-#define SML_BAUDRATE 9600
-# 45 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-#include <TasmotaSerial.h>
-
-
-#define SPECIAL_SS 
-
-
-
-
-
-#if MY_LANGUAGE==de-DE
-
-#define D_TPWRIN "Verbrauch"
-#define D_TPWROUT "Einspeisung"
-#define D_TPWRCURR "Aktueller Verbrauch"
-#define D_TPWRCURR1 "Verbrauch P1"
-#define D_TPWRCURR2 "Verbrauch P2"
-#define D_TPWRCURR3 "Verbrauch P3"
-#define D_Strom_L1 "Strom L1"
-#define D_Strom_L2 "Strom L2"
-#define D_Strom_L3 "Strom L3"
-#define D_Spannung_L1 "Spannung L1"
-#define D_Spannung_L2 "Spannung L2"
-#define D_Spannung_L3 "Spannung L3"
-#define D_METERNR "Zähler Nr"
-#define D_METERSID "Service ID"
-#define D_GasIN "Zählerstand"
-#define D_H2oIN "Zählerstand"
-#define D_StL1L2L3 "Ströme L1+L2+L3"
-#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
-
-#else
-
-#undef D_TPWRIN
-#undef D_TPWROUT
-#undef D_TPWRCURR
-#undef D_TPWRCURR1
-#undef D_TPWRCURR2
-#undef D_TPWRCURR3
-#undef D_Strom_L1
-#undef D_Strom_L2
-#undef D_Strom_L3
-#undef D_Spannung_L1
-#undef D_Spannung_L2
-#undef D_Spannung_L3
-#undef D_METERNR
-#undef D_METERSID
-#undef D_GasIN
-#undef D_H2oIN
-#undef D_StL1L2L3
-#undef D_SpL1L2L3
-
-#define D_TPWRIN "Total-In"
-#define D_TPWROUT "Total-Out"
-#define D_TPWRCURR "Current-In/Out"
-#define D_TPWRCURR1 "Current-In p1"
-#define D_TPWRCURR2 "Current-In p2"
-#define D_TPWRCURR3 "Current-In p3"
-#define D_Strom_L1 "Current L1"
-#define D_Strom_L2 "Current L2"
-#define D_Strom_L3 "Current L3"
-#define D_Spannung_L1 "Voltage L1"
-#define D_Spannung_L2 "Voltage L2"
-#define D_Spannung_L3 "Voltage L3"
-#define D_METERNR "Meter_number"
-#define D_METERSID "Service ID"
-#define D_GasIN "Counter"
-#define D_H2oIN "Counter"
-#define D_StL1L2L3 "Current L1+L2+L3"
-#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
-
-#endif
-
-
-
-#define DJ_TPWRIN "Total_in"
-#define DJ_TPWROUT "Total_out"
-#define DJ_TPWRCURR "Power_curr"
-#define DJ_TPWRCURR1 "Power_p1"
-#define DJ_TPWRCURR2 "Power_p2"
-#define DJ_TPWRCURR3 "Power_p3"
-#define DJ_CURR1 "Curr_p1"
-#define DJ_CURR2 "Curr_p2"
-#define DJ_CURR3 "Curr_p3"
-#define DJ_VOLT1 "Volt_p1"
-#define DJ_VOLT2 "Volt_p2"
-#define DJ_VOLT3 "Volt_p3"
-#define DJ_METERNR "Meter_number"
-#define DJ_METERSID "Meter_id"
-#define DJ_CSUM "Curr_summ"
-#define DJ_VAVG "Volt_avg"
-#define DJ_COUNTER "Count"
-
-struct METER_DESC {
-  uint8_t srcpin;
-  uint8_t type;
-  uint16_t flag;
-  int32_t params;
-  char prefix[8];
-  int8_t trxpin;
-  uint8_t tsecs;
-  char *txmem;
-  uint8_t index;
-  uint8_t max_index;
-};
-
-
-
-
-
-
-#define EHZ161_0 1
-#define EHZ161_1 2
-#define EHZ363 3
-#define EHZH 4
-#define EDL300 5
-#define Q3B 6
-#define COMBO3 7
-#define COMBO2 8
-#define COMBO3a 9
-#define Q3B_V1 10
-#define EHZ363_2 11
-#define COMBO3b 12
-#define WGS_COMBO 13
-#define EBZD_G 14
-
-
-#define METER EHZ161_1
-
-
-#if METER==EHZ161_0
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
-"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
-"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
-"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-
-
-#if METER==EHZ161_1
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZ363
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZH
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-
-
-#if METER==EDL300
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,770701000f0700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-#if METER==EBZD_G
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"strom",-1,1,0}};
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
-
-"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100600100ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-
-#if METER==Q3B
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020801ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0";
-#endif
-
-#if METER==COMBO3
-
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
-  [1]={14,'s',0,SML_BAUDRATE,"SML",-1,1,0},
-  [2]={4,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.0*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.0*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,1-0:21.7.0*255(@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",0|"
-"1,1-0:41.7.0*255(@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",0|"
-"1,1-0:61.7.0*255(@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",0|"
-"1,=m 3+4+5 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"2,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"3,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-#if METER==COMBO2
-
-#undef METERS_USED
-#define METERS_USED 2
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
-  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-
-"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-#if METER==COMBO3a
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS1",-1,1,0},
-  [1]={14,'o',0,SML_BAUDRATE,"OBIS2",-1,1,0},
-  [2]={1,'o',0,SML_BAUDRATE,"OBIS3",-1,1,0}};
-
-
-const uint8_t meter[]=
-"1,=h --- Zähler Nr 1 ---|"
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"2,=h --- Zähler Nr 2 ---|"
-"2,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"2,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"2,=d 6 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"2,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-"3,=h --- Zähler Nr 3 ---|"
-"3,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"3,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"3,=d 10 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"3,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-
-#endif
-
-
-
-#if METER==Q3B_V1
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-[0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0}};
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,=d 1 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-
-#if METER==EHZ363_2
-#undef METERS_USED
-#define METERS_USED 1
-struct METER_DESC const meter_desc[METERS_USED]={
-[0]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-"1,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-
-"1,77070100020800ff@1000," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-
-"1,77070100010801ff@1000," D_TPWRCURR1 ",KWh," DJ_TPWRCURR1 ",4|"
-
-"1,77070100010802ff@1000," D_TPWRCURR2 ",KWh," DJ_TPWRCURR2 ",4|"
-
-"1,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-
-"1,77070100000009ff@#," D_METERNR ",," DJ_METERNR ",0";
-#endif
-
-
-#if METER==COMBO3b
-#undef METERS_USED
-#define METERS_USED 3
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={3,'o',0,SML_BAUDRATE,"OBIS",-1,1,0},
-  [1]={14,'c',0,50,"Gas"},
-  [2]={1,'c',0,10,"Wasser"}};
-
-
-const uint8_t meter[]=
-"1,1-0:1.8.1*255(@1," D_TPWRIN ",KWh," DJ_TPWRIN ",4|"
-"1,1-0:2.8.1*255(@1," D_TPWROUT ",KWh," DJ_TPWROUT ",4|"
-"1,=d 2 10 @1," D_TPWRCURR ",W," DJ_TPWRCURR ",0|"
-"1,1-0:0.0.0*255(@#)," D_METERNR ",," DJ_METERNR ",0|"
-
-
-"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",2|"
-
-"3,1-0:1.8.0*255(@100," D_H2oIN ",cbm," DJ_COUNTER ",2";
-#endif
-
-
-#if METER==WGS_COMBO
-#undef METERS_USED
-#define METERS_USED 3
-
-struct METER_DESC const meter_desc[METERS_USED]={
-  [0]={1,'c',0,10,"H20",-1,1,0},
-  [1]={4,'c',0,50,"GAS",-1,1,0},
-  [2]={3,'s',0,SML_BAUDRATE,"SML",-1,1,0}};
-
-const uint8_t meter[]=
-
-
-"1,1-0:1.8.0*255(@10000," D_H2oIN ",cbm," DJ_COUNTER ",4|"
-
-
-"2,=h==================|"
-"2,1-0:1.8.0*255(@100," D_GasIN ",cbm," DJ_COUNTER ",3|"
-
-"3,=h==================|"
-
-"3,77070100010800ff@1000," D_TPWRIN ",KWh," DJ_TPWRIN ",3|"
-"3,=h==================|"
-
-"3,77070100100700ff@1," D_TPWRCURR ",W," DJ_TPWRCURR ",2|"
-"3,=h -------------------------------|"
-"3,=m 10+11+12 @100," D_StL1L2L3 ",A," DJ_CSUM ",2|"
-
-"3,=m 13+14+15/#3 @100," D_SpL1L2L3 ",V," DJ_VAVG ",2|"
-"3,=h==================|"
-
-"3,77070100240700ff@1," D_TPWRCURR1 ",W," DJ_TPWRCURR1 ",2|"
-
-"3,77070100380700ff@1," D_TPWRCURR2 ",W," DJ_TPWRCURR2 ",2|"
-
-"3,770701004c0700ff@1," D_TPWRCURR3 ",W," DJ_TPWRCURR3 ",2|"
-"3,=h -------------------------------|"
-
-"3,770701001f0700ff@100," D_Strom_L1 ",A," DJ_CURR1 ",2|"
-
-"3,77070100330700ff@100," D_Strom_L2 ",A," DJ_CURR2 ",2|"
-
-"3,77070100470700ff@100," D_Strom_L3 ",A," DJ_CURR3 ",2|"
-"3,=h -------------------------------|"
-
-"3,77070100200700ff@100," D_Spannung_L1 ",V," DJ_VOLT1 ",2|"
-
-"3,77070100340700ff@100," D_Spannung_L2 ",V," DJ_VOLT2 ",2|"
-
-"3,77070100480700ff@100," D_Spannung_L3 ",V," DJ_VOLT3 ",2|"
-"3,=h==================|"
-
-"3,77070100000009ff@#," D_METERSID ",," DJ_METERSID ",0|"
-"3,=h--------------------------------";
-#endif
-# 499 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-#define USE_SML_MEDIAN_FILTER 
-
-
-#ifndef SML_MAX_VARS
-#define SML_MAX_VARS 20
-#endif
-
-
-#define MAX_METERS 5
-double meter_vars[SML_MAX_VARS];
-
-#define MAX_DVARS MAX_METERS*2
-double dvalues[MAX_DVARS];
-uint32_t dtimes[MAX_DVARS];
-uint8_t meters_used;
-
-struct METER_DESC const *meter_desc_p;
-const uint8_t *meter_p;
-uint8_t meter_spos[MAX_METERS];
-
-
-TasmotaSerial *meter_ss[MAX_METERS];
-
-
-#define SML_BSIZ 48
-uint8_t smltbuf[MAX_METERS][SML_BSIZ];
-
-
-#define METER_ID_SIZE 24
-char meter_id[MAX_METERS][METER_ID_SIZE];
-
-#define EBUS_SYNC 0xaa
-#define EBUS_ESC 0xa9
-
-uint8_t sml_send_blocks;
-uint8_t sml_100ms_cnt;
-uint8_t sml_desc_cnt;
-
-#ifdef USE_SML_MEDIAN_FILTER
-
-#define MEDIAN_SIZE 5
-struct SML_MEDIAN_FILTER {
-double buffer[MEDIAN_SIZE];
-int8_t index;
-} sml_mf[SML_MAX_VARS];
-
-#ifndef FLT_MAX
-#define FLT_MAX 99999999
-#endif
-
-double sml_median_array(double *array,uint8_t len) {
-      uint8_t ind[len];
-      uint8_t mind=0,index=0,flg;
-      double min=FLT_MAX;
-
-      for (uint8_t hcnt=0; hcnt<len/2+1; hcnt++) {
-          for (uint8_t mcnt=0; mcnt<len; mcnt++) {
-              flg=0;
-              for (uint8_t icnt=0; icnt<index; icnt++) {
-                  if (ind[icnt]==mcnt) {
-                      flg=1;
-                  }
-              }
-              if (!flg) {
-                  if (array[mcnt]<min) {
-                      min=array[mcnt];
-                      mind=mcnt;
-                  }
-              }
-          }
-          ind[index]=mind;
-          index++;
-          min=FLT_MAX;
-      }
-      return array[ind[len/2]];
-  }
-
-
-
-double sml_median(struct SML_MEDIAN_FILTER* mf, double in) {
-
-
-  mf->buffer[mf->index]=in;
-  mf->index++;
-  if (mf->index>=MEDIAN_SIZE) mf->index=0;
-
-  return sml_median_array(mf->buffer,MEDIAN_SIZE);
-# 603 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-}
-#endif
-
-#ifdef ANALOG_OPTO_SENSOR
-
-uint8_t ads1115_up;
-
-
-#define SAMPLE_BIT (0x8000)
-
-#define ADS1115_COMP_QUEUE_SHIFT 0
-#define ADS1115_COMP_LATCH_SHIFT 2
-#define ADS1115_COMP_POLARITY_SHIFT 3
-#define ADS1115_COMP_MODE_SHIFT 4
-#define ADS1115_DATA_RATE_SHIFT 5
-#define ADS1115_MODE_SHIFT 8
-#define ADS1115_PGA_SHIFT 9
-#define ADS1115_MUX_SHIFT 12
-
-enum ads1115_comp_queue {
- ADS1115_COMP_QUEUE_AFTER_ONE = 0,
- ADS1115_COMP_QUEUE_AFTER_TWO = 0x1 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_AFTER_FOUR = 0x2 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_DISABLE = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
- ADS1115_COMP_QUEUE_MASK = 0x3 << ADS1115_COMP_QUEUE_SHIFT,
-};
-
-enum ads1115_comp_latch {
- ADS1115_COMP_LATCH_NO = 0,
- ADS1115_COMP_LATCH_YES = 1 << ADS1115_COMP_LATCH_SHIFT,
- ADS1115_COMP_LATCH_MASK = 1 << ADS1115_COMP_LATCH_SHIFT,
-};
-
-enum ads1115_comp_polarity {
- ADS1115_COMP_POLARITY_ACTIVE_LOW = 0,
- ADS1115_COMP_POLARITY_ACTIVE_HIGH = 1 << ADS1115_COMP_POLARITY_SHIFT,
- ADS1115_COMP_POLARITY_MASK = 1 << ADS1115_COMP_POLARITY_SHIFT,
-};
-
-enum ads1115_comp_mode {
- ADS1115_COMP_MODE_WINDOW = 0,
- ADS1115_COMP_MODE_HYSTERESIS = 1 << ADS1115_COMP_MODE_SHIFT,
- ADS1115_COMP_MODE_MASK = 1 << ADS1115_COMP_MODE_SHIFT,
-};
-
-enum ads1115_data_rate {
- ADS1115_DATA_RATE_8_SPS = 0,
- ADS1115_DATA_RATE_16_SPS = 0x1 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_32_SPS = 0x2 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_64_SPS = 0x3 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_128_SPS = 0x4 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_250_SPS = 0x5 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_475_SPS = 0x6 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_860_SPS = 0x7 << ADS1115_DATA_RATE_SHIFT,
- ADS1115_DATA_RATE_MASK = 0x7 << ADS1115_DATA_RATE_SHIFT,
-};
-
-enum ads1115_mode {
- ADS1115_MODE_CONTINUOUS = 0,
- ADS1115_MODE_SINGLE_SHOT = 1 << ADS1115_MODE_SHIFT,
- ADS1115_MODE_MASK = 1 << ADS1115_MODE_SHIFT,
-};
-
-enum ads1115_pga {
- ADS1115_PGA_TWO_THIRDS = 0,
- ADS1115_PGA_ONE = 0x1 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_TWO = 0x2 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_FOUR = 0x3 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_EIGHT = 0x4 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_SIXTEEN = 0x5 << ADS1115_PGA_SHIFT,
- ADS1115_PGA_MASK = 0x7 << ADS1115_PGA_SHIFT,
-};
-
-
-enum ads1115_mux {
- ADS1115_MUX_DIFF_AIN0_AIN1 = 0,
- ADS1115_MUX_DIFF_AIN0_AIN3 = 0x1 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_DIFF_AIN1_AIN3 = 0x2 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_DIFF_AIN2_AIN3 = 0x3 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN0 = 0x4 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN1 = 0x5 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN2 = 0x6 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_GND_AIN3 = 0x7 << ADS1115_MUX_SHIFT,
- ADS1115_MUX_MASK = 0x7 << ADS1115_MUX_SHIFT,
-};
-
-class ADS1115 {
-public:
- ADS1115(uint8_t address = 0x48);
-
- void begin();
- uint8_t trigger_sample();
- uint8_t reset();
- bool is_sample_in_progress();
- int16_t read_sample();
- float sample_to_float(int16_t val);
- float read_sample_float();
-
- void set_comp_queue(enum ads1115_comp_queue val) { set_config(val, ADS1115_COMP_QUEUE_MASK); }
- void set_comp_latching(enum ads1115_comp_latch val) { set_config(val, ADS1115_COMP_LATCH_MASK); }
- void set_comp_polarity(enum ads1115_comp_polarity val) { set_config(val, ADS1115_COMP_POLARITY_MASK); }
- void set_comp_mode(enum ads1115_comp_mode val) { set_config(val, ADS1115_COMP_MODE_MASK); }
- void set_data_rate(enum ads1115_data_rate val) { set_config(val, ADS1115_DATA_RATE_MASK); }
- void set_mode(enum ads1115_mode val) { set_config(val, ADS1115_MODE_MASK); }
- void set_pga(enum ads1115_pga val) { set_config(val, ADS1115_PGA_MASK); m_voltage_range = val >> ADS1115_PGA_SHIFT; }
- void set_mux(enum ads1115_mux val) { set_config(val, ADS1115_MUX_MASK); }
-
-private:
- void set_config(uint16_t val, uint16_t mask) {
-  m_config = (m_config & ~mask) | val;
- }
-
- uint8_t write_register(uint8_t reg, uint16_t val);
- uint16_t read_register(uint8_t reg);
-
- uint8_t m_address;
- uint16_t m_config;
- int m_voltage_range;
-};
-
-
-enum ads1115_register {
- ADS1115_REGISTER_CONVERSION = 0,
- ADS1115_REGISTER_CONFIG = 1,
- ADS1115_REGISTER_LOW_THRESH = 2,
- ADS1115_REGISTER_HIGH_THRESH = 3,
-};
-
-#define FACTOR 32768.0
-static float ranges[] = { 6.144 / FACTOR, 4.096 / FACTOR, 2.048 / FACTOR, 1.024 / FACTOR, 0.512 / FACTOR, 0.256 / FACTOR};
-
-ADS1115::ADS1115(uint8_t address)
-{
-        m_address = address;
-        m_config = ADS1115_COMP_QUEUE_AFTER_ONE |
-                   ADS1115_COMP_LATCH_NO |
-                   ADS1115_COMP_POLARITY_ACTIVE_LOW |
-                   ADS1115_COMP_MODE_WINDOW |
-                   ADS1115_DATA_RATE_128_SPS |
-                   ADS1115_MODE_SINGLE_SHOT |
-                   ADS1115_MUX_GND_AIN0;
-        set_pga(ADS1115_PGA_ONE);
-}
-
-uint8_t ADS1115::write_register(uint8_t reg, uint16_t val)
-{
-        Wire.beginTransmission(m_address);
-        Wire.write(reg);
-        Wire.write(val>>8);
-        Wire.write(val & 0xFF);
-        return Wire.endTransmission();
-}
-
-uint16_t ADS1115::read_register(uint8_t reg)
-{
-        Wire.beginTransmission(m_address);
-        Wire.write(reg);
-        Wire.endTransmission();
-
-        uint8_t result = Wire.requestFrom((int)m_address, 2, 1);
-        if (result != 2) {
-          return 0;
-        }
-
-        uint16_t val;
-
-        val = Wire.read() << 8;
-        val |= Wire.read();
-        return val;
-}
-
-void ADS1115::begin()
-{
-        Wire.begin();
-}
-
-uint8_t ADS1115::trigger_sample()
-{
-        return write_register(ADS1115_REGISTER_CONFIG, m_config | SAMPLE_BIT);
-}
-
-uint8_t ADS1115::reset()
-{
- Wire.beginTransmission(0);
- Wire.write(0x6);
- return Wire.endTransmission();
-}
-
-bool ADS1115::is_sample_in_progress()
-{
- uint16_t val = read_register(ADS1115_REGISTER_CONFIG);
- return (val & SAMPLE_BIT) == 0;
-}
-
-int16_t ADS1115::read_sample()
-{
-        return read_register(ADS1115_REGISTER_CONVERSION);
-}
-
-float ADS1115::sample_to_float(int16_t val)
-{
- return val * ranges[m_voltage_range];
-}
-
-float ADS1115::read_sample_float()
-{
- return sample_to_float(read_sample());
-}
-
-ADS1115 adc;
-
-void ADS1115_init(void) {
-
-  ads1115_up=0;
-  if (!i2c_flg) return;
-
-  adc.begin();
-  adc.set_data_rate(ADS1115_DATA_RATE_128_SPS);
-  adc.set_mode(ADS1115_MODE_CONTINUOUS);
-  adc.set_mux(ADS1115_MUX_DIFF_AIN0_AIN3);
-  adc.set_pga(ADS1115_PGA_TWO);
-
-  int16_t val = adc.read_sample();
-  ads1115_up=1;
-}
-
-#endif
-
-char sml_start;
-uint8_t dump2log=0;
-
-#define SML_SAVAILABLE Serial_available()
-#define SML_SREAD Serial_read()
-#define SML_SPEAK Serial_peek()
-
-bool Serial_available() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->available();
-}
-
-uint8_t Serial_read() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->read();
-}
-
-uint8_t Serial_peek() {
-  uint8_t num=dump2log&7;
-  if (num<1 || num>meters_used) num=1;
-  return meter_ss[num-1]->peek();
-}
-
-uint8_t sml_logindex;
-
-void Dump2log(void) {
-
-int16_t index=0,hcnt=0;
-uint32_t d_lastms;
-uint8_t dchars[16];
-
-
-
-  if (dump2log&8) {
-
-    while (SML_SAVAILABLE) {
-      log_data[index]=':';
-      index++;
-      log_data[index]=' ';
-      index++;
-      d_lastms=millis();
-      while ((millis()-d_lastms)<40) {
-        if (SML_SAVAILABLE) {
-          uint8_t c=SML_SREAD;
-          sprintf(&log_data[index],"%02x ",c);
-          dchars[hcnt]=c;
-          index+=3;
-          hcnt++;
-          if (hcnt>15) {
-
-            log_data[index]='=';
-            index++;
-            log_data[index]='>';
-            index++;
-            log_data[index]=' ';
-            index++;
-            for (uint8_t ccnt=0; ccnt<16; ccnt++) {
-              if (isprint(dchars[ccnt])) {
-                log_data[index]=dchars[ccnt];
-              } else {
-                log_data[index]=' ';
-              }
-              index++;
-            }
-            break;
-          }
-        }
-      }
-      if (index>0) {
-        log_data[index]=0;
-        AddLog(LOG_LEVEL_INFO);
-        index=0;
-        hcnt=0;
-      }
-    }
-  } else {
-    if (meter_desc_p[(dump2log&7)-1].type=='o') {
-
-      while (SML_SAVAILABLE) {
-        char c=SML_SREAD&0x7f;
-        if (c=='\n' || c=='\r') {
-          log_data[sml_logindex]=0;
-          AddLog(LOG_LEVEL_INFO);
-          sml_logindex=2;
-          log_data[0]=':';
-          log_data[1]=' ';
-          break;
-        }
-        log_data[sml_logindex]=c;
-        if (sml_logindex<sizeof(log_data)-2) {
-          sml_logindex++;
-        }
-      }
-    } else {
-
-      index=0;
-      log_data[index]=':';
-      index++;
-      log_data[index]=' ';
-      index++;
-      d_lastms=millis();
-      while ((millis()-d_lastms)<40) {
-        if (SML_SAVAILABLE) {
-          unsigned char c;
-          if (meter_desc_p[(dump2log&7)-1].type=='e') {
-
-            c=SML_SREAD;
-            sprintf(&log_data[index],"%02x ",c);
-            index+=3;
-            if (c==EBUS_SYNC) break;
-          } else {
-
-            if (sml_start==0x77) {
-              sml_start=0;
-            } else {
-              c=SML_SPEAK;
-              if (c==0x77) {
-                sml_start=c;
-                break;
-              }
-            }
-            c=SML_SREAD;
-            sprintf(&log_data[index],"%02x ",c);
-            index+=3;
-          }
-        }
-      }
-      if (index>2) {
-        log_data[index]=0;
-        AddLog(LOG_LEVEL_INFO);
-      }
-    }
-  }
-}
-
-
-uint8_t *skip_sml(uint8_t *cp,int16_t *res) {
-    uint8_t len,len1,type;
-    len=*cp&0xf;
-    type=*cp&0x70;
-    if (type==0x70) {
-
-
-        cp++;
-        while (len--) {
-            len1=*cp&0x0f;
-            cp+=len1;
-        }
-         *res=0;
-    } else {
-
-        *res=(signed char)*(cp+1);
-        cp+=len;
-    }
-    return cp;
-}
-
-
-
-double sml_getvalue(unsigned char *cp,uint8_t index) {
-uint8_t len,unit,type;
-int16_t scaler,result;
-int64_t value;
-double dval;
-
-
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-
-  cp=skip_sml(cp,&result);
-  scaler=result;
-
-  type=*cp&0x70;
-  len=*cp&0x0f;
-  cp++;
-    if (type==0x50 || type==0x60) {
-
-        uint64_t uvalue=0;
-        uint8_t nlen=len;
-        while (--nlen) {
-            uvalue<<=8;
-            uvalue|=*cp++;
-        }
-        if (type==0x50) {
-
-            switch (len-1) {
-                case 1:
-
-                    value=(signed char)uvalue;
-                    break;
-                case 2:
-
-#ifdef DWS74_BUG
-                    if (scaler==-2) {
-                      value=(uint32_t)uvalue;
-                    } else {
-                      value=(int16_t)uvalue;
-                    }
-#else
-                    value=(int16_t)uvalue;
-#endif
-                    break;
-                case 3:
-                case 4:
-
-                    value=(int32_t)uvalue;
-                    break;
-                case 5:
-                case 6:
-                case 7:
-                case 8:
-
-                    value=(int64_t)uvalue;
-                    break;
-            }
-        } else {
-
-            value=uvalue;
-        }
-
-    } else {
-        if (!(type&0xf0)) {
-
-
-
-            if (len==9) {
-
-                cp++;
-                uint32_t s1,s2;
-                s1=*cp<<16|*(cp+1)<<8|*(cp+2);
-                cp+=4;
-                s2=*cp<<16|*(cp+1)<<8|*(cp+2);
-                sprintf(&meter_id[index][0],"%u-%u",s1,s2);
-            } else {
-
-                char *str=&meter_id[index][0];
-                for (type=0; type<len-1; type++) {
-                    sprintf(str,"%02x",*cp++);
-                    str+=2;
-                }
-            }
-            value=0;
-        } else {
-            value=999999;
-            scaler=0;
-        }
-    }
-    dval=value;
-    if (scaler==-1) {
-      dval/=10;
-    } else if (scaler==-2) {
-      dval/=100;
-    } else if (scaler==-3) {
-      dval/=1000;
-    } else if (scaler==-4) {
-      dval/=10000;
-    } else if (scaler==1) {
-      dval*=10;
-    } else if (scaler==2) {
-      dval*=100;
-    } else if (scaler==3) {
-      dval*=1000;
-    }
-    return dval;
-}
-
-uint8_t hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    chr=toupper(chr);
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-  }
-  return rVal;
-}
-
-uint8_t sb_counter;
-
-
-double CharToDouble(const char *str)
-{
-
-  char strbuf[24];
-
-  strlcpy(strbuf, str, sizeof(strbuf));
-  char *pt = strbuf;
-  while ((*pt != '\0') && isblank(*pt)) { pt++; }
-
-  signed char sign = 1;
-  if (*pt == '-') { sign = -1; }
-  if (*pt == '-' || *pt=='+') { pt++; }
-
-  double left = 0;
-  if (*pt != '.') {
-    left = atoi(pt);
-    while (isdigit(*pt)) { pt++; }
-  }
-
-  double right = 0;
-  if (*pt == '.') {
-    pt++;
-    right = atoi(pt);
-    while (isdigit(*pt)) {
-      pt++;
-      right /= 10.0;
-    }
-  }
-
-  double result = left + right;
-  if (sign < 0) {
-    return -result;
-  }
-  return result;
-}
-
-
-
-void ebus_esc(uint8_t *ebus_buffer, unsigned char len) {
-    short count,count1;
-    for (count=0; count<len; count++) {
-        if (ebus_buffer[count]==EBUS_ESC) {
-
-            ebus_buffer[count]+=ebus_buffer[count+1];
-
-            count++;
-            for (count1=count; count1<len; count1++) {
-                ebus_buffer[count1]=ebus_buffer[count1+1];
-            }
-        }
-    }
-
-}
-
-uint8_t ebus_crc8(uint8_t data, uint8_t crc_init) {
- uint8_t crc;
- uint8_t polynom;
- int i;
-
- crc = crc_init;
- for (i = 0; i < 8; i++) {
-  if (crc & 0x80) {
-   polynom = (uint8_t) 0x9B;
-  }
-  else {
-   polynom = (uint8_t) 0;
-  }
-  crc = (uint8_t)((crc & ~0x80) << 1);
-  if (data & 0x80) {
-   crc = (uint8_t)(crc | 1) ;
-  }
-  crc = (uint8_t)(crc ^ polynom);
-  data = (uint8_t)(data << 1);
- }
- return (crc);
-}
-
-
-uint8_t ebus_CalculateCRC( uint8_t *Data, uint16_t DataLen ) {
- uint16_t i;
- uint8_t Crc = 0;
- for(i = 0 ; i < DataLen ; ++i, ++Data ) {
-      Crc = ebus_crc8( *Data, Crc );
-   }
-   return Crc;
-}
-
-void sml_empty_receiver(uint32_t meters) {
-  while (meter_ss[meters]->available()) {
-    meter_ss[meters]->read();
-  }
-}
-
-
-void sml_shift_in(uint32_t meters,uint32_t shard) {
-  uint32_t count;
-  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') {
-
-    for (count=0; count<SML_BSIZ-1; count++) {
-      smltbuf[meters][count]=smltbuf[meters][count+1];
-    }
-  }
-  uint8_t iob=(uint8_t)meter_ss[meters]->read();
-
-  if (meter_desc_p[meters].type=='o') {
-    smltbuf[meters][SML_BSIZ-1]=iob&0x7f;
-  } else if (meter_desc_p[meters].type=='s') {
-    smltbuf[meters][SML_BSIZ-1]=iob;
-  } else if (meter_desc_p[meters].type=='r') {
-    smltbuf[meters][SML_BSIZ-1]=iob;
-  } else if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M') {
-    smltbuf[meters][meter_spos[meters]] = iob;
-    meter_spos[meters]++;
-    if (meter_spos[meters]>=9) {
-      SML_Decode(meters);
-      sml_empty_receiver(meters);
-      meter_spos[meters]=0;
-    }
-  } else if (meter_desc_p[meters].type=='p') {
-    smltbuf[meters][meter_spos[meters]] = iob;
-    meter_spos[meters]++;
-    if (meter_spos[meters]>=7) {
-      SML_Decode(meters);
-      sml_empty_receiver(meters);
-      meter_spos[meters]=0;
-    }
-  } else {
-    if (iob==EBUS_SYNC) {
-
-
-      if (meter_spos[meters]>4+5) {
-
-        uint8_t tlen=smltbuf[meters][4]+5;
-
-        if (smltbuf[meters][tlen]=ebus_CalculateCRC(smltbuf[meters],tlen)) {
-            ebus_esc(smltbuf[meters],tlen);
-            SML_Decode(meters);
-        } else {
-
-
-        }
-      }
-      meter_spos[meters]=0;
-      return;
-    }
-  smltbuf[meters][meter_spos[meters]] = iob;
-  meter_spos[meters]++;
-  if (meter_spos[meters]>=SML_BSIZ) {
-   meter_spos[meters]=0;
-  }
-  }
-  sb_counter++;
-  if (meter_desc_p[meters].type!='e' && meter_desc_p[meters].type!='m' && meter_desc_p[meters].type!='M' && meter_desc_p[meters].type!='p') SML_Decode(meters);
-}
-
-
-
-void SML_Poll(void) {
-uint32_t meters;
-
-    for (meters=0; meters<meters_used; meters++) {
-      if (meter_desc_p[meters].type!='c') {
-
-        while (meter_ss[meters]->available()) {
-          sml_shift_in(meters,0);
-        }
-      }
-    }
-}
-
-
-void SML_Decode(uint8_t index) {
-  const char *mp=(const char*)meter_p;
-  int8_t mindex;
-  uint8_t *cp;
-  uint8_t dindex=0,vindex=0;
-  delay(0);
-  while (mp != NULL) {
-
-
-
-    mindex=((*mp)&7)-1;
-
-    if (mindex<0 || mindex>=meters_used) mindex=0;
-    mp+=2;
-    if (*mp=='=' && *(mp+1)=='h') {
-      mp = strchr(mp, '|');
-      if (mp) mp++;
-      continue;
-    }
-
-    if (index!=mindex) goto nextsect;
-
-
-    cp=&smltbuf[mindex][0];
-
-
-    if (*mp=='=') {
-
-      mp++;
-
-      if (*mp=='m' && !sb_counter) {
-
-
-        mp++;
-        while (*mp==' ') mp++;
-
-        double dvar;
-        uint8_t opr;
-        uint32_t ind;
-        ind=atoi(mp);
-        while (*mp>='0' && *mp<='9') mp++;
-        if (ind<1 || ind>SML_MAX_VARS) ind=1;
-        dvar=meter_vars[ind-1];
-        for (uint8_t p=0;p<5;p++) {
-          if (*mp=='@') {
-
-            meter_vars[vindex]=dvar;
-            mp++;
-            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            break;
-          }
-          opr=*mp;
-          mp++;
-          uint8_t iflg=0;
-          if (*mp=='#') {
-            iflg=1;
-            mp++;
-          }
-          ind=atoi(mp);
-          while (*mp>='0' && *mp<='9') mp++;
-          if (ind<1 || ind>SML_MAX_VARS) ind=1;
-          switch (opr) {
-              case '+':
-                if (iflg) dvar+=ind;
-                else dvar+=meter_vars[ind-1];
-                break;
-              case '-':
-                if (iflg) dvar-=ind;
-                else dvar-=meter_vars[ind-1];
-                break;
-              case '*':
-                if (iflg) dvar*=ind;
-                else dvar*=meter_vars[ind-1];
-                break;
-              case '/':
-                if (iflg) dvar/=ind;
-                else dvar/=meter_vars[ind-1];
-                break;
-          }
-          while (*mp==' ') mp++;
-          if (*mp=='@') {
-
-            meter_vars[vindex]=dvar;
-            mp++;
-            SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            break;
-          }
-        }
-      } else if (*mp=='d') {
-
-        if (dindex<MAX_DVARS) {
-
-          mp++;
-          while (*mp==' ') mp++;
-          uint8_t ind=atoi(mp);
-          while (*mp>='0' && *mp<='9') mp++;
-          if (ind<1 || ind>SML_MAX_VARS) ind=1;
-          uint32_t delay=atoi(mp)*1000;
-          uint32_t dtime=millis()-dtimes[dindex];
-          if (dtime>delay) {
-
-            dtimes[dindex]=millis();
-            double vdiff = meter_vars[ind-1]-dvalues[dindex];
-            dvalues[dindex]=meter_vars[ind-1];
-            meter_vars[vindex]=(double)360000.0*vdiff/((double)dtime/10000.0);
-
-            mp=strchr(mp,'@');
-            if (mp) {
-              mp++;
-              SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-            }
-          }
-          dindex++;
-        }
-      } else if (*mp=='h') {
-
-        mp = strchr(mp, '|');
-        if (mp) mp++;
-        continue;
-      }
-    } else {
-
-      uint8_t found=1;
-      uint32_t ebus_dval=99;
-      float mbus_dval=99;
-      while (*mp!='@') {
-        if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
-          if (*mp++!=*cp++) {
-            found=0;
-          }
-        } else {
-          if (meter_desc_p[mindex].type=='s') {
-
-            uint8_t val = hexnibble(*mp++) << 4;
-            val |= hexnibble(*mp++);
-            if (val!=*cp++) {
-              found=0;
-            }
-          } else {
-
-
-            if (*mp=='x' && *(mp+1)=='x') {
-
-              mp+=2;
-              cp++;
-            } else if (!strncmp(mp,"UUuuUUuu",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='U' && *(mp+1)=='U' && *(mp+2)=='u' && *(mp+3)=='u'){
-              uint16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (!strncmp(mp,"SSssSSss",8)) {
-              int32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='u' && *(mp+1)=='u' && *(mp+2)=='U' && *(mp+3)=='U'){
-              uint16_t val = cp[0]|(cp[1]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='u' && *(mp+1)=='u') {
-              uint8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            } else if (*mp=='s' && *(mp+1)=='s' && *(mp+2)=='S' && *(mp+3)=='S') {
-              int16_t val = *cp|(*(cp+1)<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='S' && *(mp+1)=='S' && *(mp+2)=='s' && *(mp+3)=='s') {
-              int16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            }
-            else if (*mp=='s' && *(mp+1)=='s') {
-              int8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            }
-            else if (!strncmp(mp,"ffffffff",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"FFffFFff",8)) {
-
-              uint32_t val= (cp[1]<<0)|(cp[0]<<8)|(cp[3]<<16)|(cp[2]<<24);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"eeeeee",6)) {
-              uint32_t val=(cp[0]<<16)|(cp[1]<<8)|(cp[2]<<0);
-              mbus_dval=val;
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"vvvvvv",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/10.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"cccccc",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/100.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"pppp",4)) {
-              mbus_dval=(float)((cp[0]<<8)|cp[1]);
-              mp+=4;
-              cp+=2;
-            }
-            else {
-              uint8_t val = hexnibble(*mp++) << 4;
-              val |= hexnibble(*mp++);
-              if (val!=*cp++) {
-                found=0;
-              }
-            }
-          }
-        }
-      }
-      if (found) {
-
-        mp++;
-        if (*mp=='#') {
-
-          mp++;
-          if (meter_desc_p[mindex].type=='o') {
-            for (uint8_t p=0;p<METER_ID_SIZE;p++) {
-              if (*cp==*mp) {
-                meter_id[mindex][p]=0;
-                break;
-              }
-              meter_id[mindex][p]=*cp++;
-            }
-          } else {
-            sml_getvalue(cp,mindex);
-          }
-        } else {
-          double dval;
-          if (meter_desc_p[mindex].type!='e' && meter_desc_p[mindex].type!='r' && meter_desc_p[mindex].type!='m' && meter_desc_p[mindex].type!='M' && meter_desc_p[mindex].type!='p') {
-
-            if (meter_desc_p[mindex].type=='o' || meter_desc_p[mindex].type=='c') {
-              dval=CharToDouble((char*)cp);
-            } else {
-              dval=sml_getvalue(cp,mindex);
-            }
-          } else {
-
-            if (*mp=='b') {
-              mp++;
-              uint8_t shift=*mp&7;
-              ebus_dval>>=shift;
-              ebus_dval&=1;
-              mp+=2;
-            }
-            if (*mp=='i') {
-
-              mp++;
-              uint8_t mb_index=strtol((char*)mp,(char**)&mp,10);
-              if (mb_index!=meter_desc_p[mindex].index) {
-                goto nextsect;
-              }
-              uint16_t crc = MBUS_calculateCRC(&smltbuf[mindex][0],7);
-              if (lowByte(crc)!=smltbuf[mindex][7]) goto nextsect;
-              if (highByte(crc)!=smltbuf[mindex][8]) goto nextsect;
-              dval=mbus_dval;
-
-              mp++;
-            } else {
-              if (meter_desc_p[mindex].type=='p') {
-                uint8_t crc = SML_PzemCrc(&smltbuf[mindex][0],6);
-                if (crc!=smltbuf[mindex][6]) goto nextsect;
-                dval=mbus_dval;
-              } else {
-                dval=ebus_dval;
-              }
-            }
-
-          }
-#ifdef USE_SML_MEDIAN_FILTER
-          if (meter_desc_p[mindex].flag&16) {
-            meter_vars[vindex]=sml_median(&sml_mf[vindex],dval);
-          } else {
-            meter_vars[vindex]=dval;
-          }
-#else
-          meter_vars[vindex]=dval;
-#endif
-
-
-          double fac=CharToDouble((char*)mp);
-          meter_vars[vindex]/=fac;
-          SML_Immediate_MQTT((const char*)mp,vindex,mindex);
-        }
-      }
-    }
-nextsect:
-
-    if (vindex<SML_MAX_VARS-1) {
-      vindex++;
-    }
-    mp = strchr(mp, '|');
-    if (mp) mp++;
-  }
-}
-
-
-void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
-  char tpowstr[32];
-  char jname[24];
-
-
-  char *cp=strchr(mp,',');
-  if (cp) {
-    cp++;
-
-    cp=strchr(cp,',');
-    if (cp) {
-      cp++;
-
-      cp=strchr(cp,',');
-      if (cp) {
-        cp++;
-
-        for (uint8_t count=0;count<sizeof(jname);count++) {
-          if (*cp==',') {
-            jname[count]=0;
-            break;
-          }
-          jname[count]=*cp++;
-        }
-        cp++;
-        uint8_t dp=atoi(cp);
-        if (dp&0x10) {
-
-          dtostrfd(meter_vars[index],dp&0xf,tpowstr);
-          ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr);
-          MqttPublishTeleSensor();
-        }
-      }
-    }
-  }
-}
-
-
-void SML_Show(boolean json) {
-  int8_t count,mindex,cindex=0;
-  char tpowstr[32];
-  char name[24];
-  char unit[8];
-  char jname[24];
-  int8_t index=0,mid=0;
-  char *mp=(char*)meter_p;
-  char *cp;
-
-
-
-    int8_t lastmind=((*mp)&7)-1;
-    if (lastmind<0 || lastmind>=meters_used) lastmind=0;
-    while (mp != NULL) {
-
-        mindex=((*mp)&7)-1;
-        if (mindex<0 || mindex>=meters_used) mindex=0;
-        mp+=2;
-        if (*mp=='=' && *(mp+1)=='h') {
-          mp+=2;
-
-          if (json) {
-            mp = strchr(mp, '|');
-            if (mp) mp++;
-            continue;
-          }
-
-          uint8_t i;
-          for (i=0;i<sizeof(tpowstr)-2;i++) {
-            if (*mp=='|' || *mp==0) break;
-            tpowstr[i]=*mp++;
-          }
-          tpowstr[i]=0;
-
-
-          WSContentSend_PD(PSTR("{s}%s{e}"),tpowstr);
-
-          mp--;
-          mp = strchr(mp, '|');
-          if (mp) mp++;
-          continue;
-        }
-
-        cp=strchr(mp,'@');
-        if (cp) {
-          cp++;
-          if (*cp=='#') {
-
-            sprintf(tpowstr,"\"%s\"",&meter_id[mindex][0]);
-            mid=1;
-          } else {
-            mid=0;
-          }
-
-          cp=strchr(cp,',');
-          if (cp) {
-
-            cp++;
-            for (count=0;count<sizeof(name);count++) {
-              if (*cp==',') {
-                name[count]=0;
-                break;
-              }
-              name[count]=*cp++;
-            }
-            cp++;
-
-            for (count=0;count<sizeof(unit);count++) {
-              if (*cp==',') {
-                unit[count]=0;
-                break;
-              }
-              unit[count]=*cp++;
-            }
-            cp++;
-
-            for (count=0;count<sizeof(jname);count++) {
-              if (*cp==',') {
-                jname[count]=0;
-                break;
-              }
-              jname[count]=*cp++;
-            }
-
-            cp++;
-
-            if (!mid) {
-              uint8_t dp=atoi(cp)&0xf;
-              dtostrfd(meter_vars[index],dp,tpowstr);
-            }
-
-            if (json) {
-
-              if (index==0) {
-
-                ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
-              }
-              else {
-                if (lastmind!=mindex) {
-
-
-                  ResponseAppend_P(PSTR("}"));
-
-
-                  ResponseAppend_P(PSTR(",\"%s\":{\"%s\":%s"),meter_desc_p[mindex].prefix,jname,tpowstr);
-                  lastmind=mindex;
-                } else {
-
-                  ResponseAppend_P(PSTR(",\"%s\":%s"),jname,tpowstr);
-                }
-              }
-            } else {
-
-
-              WSContentSend_PD(PSTR("{s}%s %s: {m}%s %s{e}"),meter_desc_p[mindex].prefix,name,tpowstr,unit);
-            }
-          }
-        }
-        if (index<SML_MAX_VARS-1) {
-          index++;
-        }
-
-        mp = strchr(cp, '|');
-        if (mp) mp++;
-    }
-    if (json) {
-
-
-     ResponseAppend_P(PSTR("}"));
-   } else {
-
-   }
-# 1802 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-}
-
-struct SML_COUNTER {
-  uint8_t sml_cnt_debounce;
-  uint8_t sml_cnt_old_state;
-  uint32_t sml_cnt_last_ts;
-  uint32_t sml_counter_ltime;
-  uint16_t sml_debounce;
-
-#ifdef ANALOG_OPTO_SENSOR
-  int16_t ana_curr;
-  int16_t ana_max;
-  int16_t ana_min;
-  int16_t ana_cmpl;
-  int16_t ana_cmph;
-#endif
-} sml_counters[MAX_COUNTERS];
-
-
-#ifndef ARDUINO_ESP8266_RELEASE_2_3_0
-void SML_CounterUpd(uint8_t index) ICACHE_RAM_ATTR;
-void SML_CounterUpd1(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd2(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd3(void) ICACHE_RAM_ATTR;
-void SML_CounterUpd4(void) ICACHE_RAM_ATTR;
-#endif
-
-void SML_CounterUpd(uint8_t index) {
-
-  uint8_t level=digitalRead(meter_desc_p[sml_counters[index].sml_cnt_old_state].srcpin);
-  if (!level) {
-
-    uint32_t ltime=millis()-sml_counters[index].sml_counter_ltime;
-    sml_counters[index].sml_counter_ltime=millis();
-    if (ltime>sml_counters[index].sml_debounce) {
-      RtcSettings.pulse_counter[index]++;
-      InjektCounterValue(sml_counters[index].sml_cnt_old_state,RtcSettings.pulse_counter[index]);
-    }
-  } else {
-
-    sml_counters[index].sml_counter_ltime=millis();
-  }
-}
-
-void SML_CounterUpd1(void) {
-  SML_CounterUpd(0);
-}
-
-void SML_CounterUpd2(void) {
-  SML_CounterUpd(1);
-}
-
-void SML_CounterUpd3(void) {
-  SML_CounterUpd(2);
-}
-
-void SML_CounterUpd4(void) {
-  SML_CounterUpd(3);
-}
-
-#ifdef USE_SCRIPT
-struct METER_DESC script_meter_desc[MAX_METERS];
-uint8_t *script_meter;
-#endif
-
-#ifndef METER_DEF_SIZE
-#define METER_DEF_SIZE 3000
-#endif
-
-bool Gpio_used(uint8_t gpiopin) {
-  for (uint16_t i=0;i<GPIO_SENSOR_END;i++) {
-    if (pin[i]==gpiopin) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void SML_Init(void) {
-  meters_used=METERS_USED;
-  meter_desc_p=meter_desc;
-  meter_p=meter;
-
-  sml_desc_cnt=0;
-
-  for (uint32_t cnt=0;cnt<SML_MAX_VARS;cnt++) {
-    meter_vars[cnt]=0;
-  }
-
-  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
-    meter_spos[cnt]=0;
-  }
-
-#ifdef USE_SCRIPT
-
-  for (uint32_t cnt=0;cnt<MAX_METERS;cnt++) {
-    if (script_meter_desc[cnt].txmem) {
-     free(script_meter_desc[cnt].txmem);
-     script_meter_desc[cnt].txmem=0;
-    }
-  }
-
-  uint8_t meter_script=Run_Scripter(">M",-2,0);
-  if (meter_script==99) {
-
-    if (script_meter) free(script_meter);
-    script_meter=0;
-    uint8_t *tp=0;
-    uint16_t index=0;
-    uint8_t section=0;
-    uint8_t srcpin=0;
-    char *lp=glob_script_mem.scriptptr;
-    sml_send_blocks=0;
-    while (lp) {
-      if (!section) {
-        if (*lp=='>' && *(lp+1)=='M') {
-          lp+=2;
-          meters_used=strtol(lp,0,10);
-          section=1;
-          uint32_t mlen=0;
-          for (uint32_t cnt=0;cnt<METER_DEF_SIZE-1;cnt++) {
-            if (lp[cnt]=='\n' && lp[cnt+1]=='#') {
-              mlen=cnt+3;
-              break;
-            }
-          }
-          if (mlen==0) return;
-          script_meter=(uint8_t*)calloc(mlen,1);
-          if (!script_meter) {
-            goto dddef_exit;
-          }
-          tp=script_meter;
-          goto next_line;
-        }
-      }
-      else {
-        if (!*lp || *lp=='#' || *lp=='>') {
-          if (*(tp-1)=='|') *(tp-1)=0;
-          break;
-        }
-        if (*lp=='+') {
-
-
-          lp++;
-          index=*lp&7;
-          lp+=2;
-          if (index<1 || index>meters_used) goto next_line;
-          index--;
-          srcpin=strtol(lp,&lp,10);
-          if (Gpio_used(srcpin)) {
-            AddLog_P(LOG_LEVEL_INFO, PSTR("gpio rx double define!"));
-dddef_exit:
-            if (script_meter) free(script_meter);
-            script_meter=0;
-            meters_used=METERS_USED;
-            goto init10;
-          }
-          script_meter_desc[index].srcpin=srcpin;
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].type=*lp;
-          lp+=2;
-          script_meter_desc[index].flag=strtol(lp,&lp,10);
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].params=strtol(lp,&lp,10);
-          if (*lp!=',') goto next_line;
-          lp++;
-          script_meter_desc[index].prefix[7]=0;
-          for (uint32_t cnt=0; cnt<8; cnt++) {
-            if (*lp==SCRIPT_EOL || *lp==',') {
-              script_meter_desc[index].prefix[cnt]=0;
-              break;
-            }
-            script_meter_desc[index].prefix[cnt]=*lp++;
-          }
-          if (*lp==',') {
-            lp++;
-            script_meter_desc[index].trxpin=strtol(lp,&lp,10);
-            if (Gpio_used(script_meter_desc[index].trxpin)) {
-              AddLog_P(LOG_LEVEL_INFO, PSTR("gpio tx double define!"));
-              goto dddef_exit;
-            }
-            if (*lp!=',') goto next_line;
-            lp++;
-            script_meter_desc[index].tsecs=strtol(lp,&lp,10);
-            if (*lp==',') {
-              lp++;
-              char txbuff[256];
-              uint32_t txlen=0,tx_entries=1;
-              for (uint32_t cnt=0; cnt<sizeof(txbuff); cnt++) {
-                if (*lp==SCRIPT_EOL) {
-                  txbuff[cnt]=0;
-                  txlen=cnt;
-                  break;
-                }
-                if (*lp==',') tx_entries++;
-                txbuff[cnt]=*lp++;
-              }
-              if (txlen) {
-                script_meter_desc[index].txmem=(char*)calloc(txlen+2,1);
-                if (script_meter_desc[index].txmem) {
-                  strcpy(script_meter_desc[index].txmem,txbuff);
-                }
-                script_meter_desc[index].index=0;
-                script_meter_desc[index].max_index=tx_entries;
-                sml_send_blocks++;
-              }
-            }
-          }
-          if (*lp==SCRIPT_EOL) lp--;
-          goto next_line;
-        }
-
-        if (*lp=='-' || isdigit(*lp)) {
-
-
-          if (*lp=='-') lp++;
-          uint8_t mnum=strtol(lp,0,10);
-          if (mnum<1 || mnum>meters_used) goto next_line;
-          while (1) {
-            if (*lp==SCRIPT_EOL) {
-              if (*(tp-1)!='|') *tp++='|';
-              goto next_line;
-            }
-            *tp++=*lp++;
-            index++;
-            if (index>=METER_DEF_SIZE) break;
-          }
-        }
-
-      }
-
-next_line:
-      if (*lp==SCRIPT_EOL) {
-        lp++;
-      } else {
-        lp = strchr(lp, SCRIPT_EOL);
-        if (!lp) break;
-        lp++;
-      }
-    }
-    *tp=0;
-    meter_desc_p=script_meter_desc;
-    meter_p=script_meter;
-  }
-#endif
-
-init10:
-  typedef void (*function)();
-  function counter_callbacks[] = {SML_CounterUpd1,SML_CounterUpd2,SML_CounterUpd3,SML_CounterUpd4};
-  uint8_t cindex=0;
-
-  for (byte i = 0; i < MAX_COUNTERS; i++) {
-      RtcSettings.pulse_counter[i]=Settings.pulse_counter[i];
-      sml_counters[i].sml_cnt_last_ts=millis();
-  }
-  for (uint8_t meters=0; meters<meters_used; meters++) {
-    if (meter_desc_p[meters].type=='c') {
-        if (meter_desc_p[meters].flag&2) {
-
-#ifdef ANALOG_OPTO_SENSOR
-          ADS1115_init();
-          sml_counters[cindex].ana_max=-32768;
-          sml_counters[cindex].ana_min=+32767;
-#endif
-        } else {
-
-          if (meter_desc_p[meters].flag&1) {
-            pinMode(meter_desc_p[meters].srcpin,INPUT_PULLUP);
-          } else {
-            pinMode(meter_desc_p[meters].srcpin,INPUT);
-          }
-
-          if (meter_desc_p[meters].params<=0) {
-
-            attachInterrupt(meter_desc_p[meters].srcpin, counter_callbacks[cindex], CHANGE);
-            sml_counters[cindex].sml_cnt_old_state=meters;
-            sml_counters[cindex].sml_debounce=-meter_desc_p[meters].params;
-          }
-          InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-          cindex++;
-        }
-    } else {
-
-#ifdef SPECIAL_SS
-        if (meter_desc_p[meters].type=='m' || meter_desc_p[meters].type=='M' || meter_desc_p[meters].type=='p') {
-          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
-        } else {
-          meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1);
-        }
-#else
-        meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1);
-#endif
-        if (meter_ss[meters]->begin(meter_desc_p[meters].params)) {
-          meter_ss[meters]->flush();
-        }
-        if (meter_ss[meters]->hardwareSerial()) {
-          if (meter_desc_p[meters].type=='M') {
-            Serial.begin(meter_desc_p[meters].params, SERIAL_8E1);
-          }
-          ClaimSerial();
-        }
-
-    }
-  }
-
-}
-
-
-#ifdef USE_SML_SCRIPT_CMD
-uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
-  if (meter<1 || meter>meters_used) return 0;
-  meter--;
-  if (!meter_ss[meter]) return 0;
-  if (meter_ss[meter]->begin(br)) {
-    meter_ss[meter]->flush();
-  }
-  if (meter_ss[meter]->hardwareSerial()) {
-    if (meter_desc_p[meter].type=='M') {
-      Serial.begin(br, SERIAL_8E1);
-    }
-  }
-  return 1;
-}
-
-uint32_t SML_Write(uint32_t meter,char *hstr) {
-  if (meter<1 || meter>meters_used) return 0;
-  meter--;
-  if (!meter_ss[meter]) return 0;
-  SML_Send_Seq(meter,hstr);
-  return 1;
-}
-#endif
-
-
-void SetDBGLed(uint8_t srcpin, uint8_t ledpin) {
-    pinMode(ledpin, OUTPUT);
-    if (digitalRead(srcpin)) {
-      digitalWrite(ledpin,LOW);
-    } else {
-      digitalWrite(ledpin,HIGH);
-    }
-}
-
-
-void SML_Counter_Poll(void) {
-uint16_t meters,cindex=0;
-uint32_t ctime=millis();
-
-  for (meters=0; meters<meters_used; meters++) {
-    if (meter_desc_p[meters].type=='c') {
-
-      if (meter_desc_p[meters].params>0) {
-        if (ctime-sml_counters[cindex].sml_cnt_last_ts>meter_desc_p[meters].params) {
-          sml_counters[cindex].sml_cnt_last_ts=ctime;
-
-          if (meter_desc_p[meters].flag&2) {
-
-#ifdef ANALOG_OPTO_SENSOR
-            if (ads1115_up) {
-              int16_t val = adc.read_sample();
-              if (val>sml_counters[cindex].ana_max) sml_counters[cindex].ana_max=val;
-              if (val<sml_counters[cindex].ana_min) sml_counters[cindex].ana_min=val;
-              sml_counters[cindex].ana_curr=val;
-              int16_t range=sml_counters[cindex].ana_max-sml_counters[cindex].ana_min;
-            }
-#endif
-          } else {
-
-            uint8_t state;
-            sml_counters[cindex].sml_cnt_debounce<<=1;
-            sml_counters[cindex].sml_cnt_debounce|=(digitalRead(meter_desc_p[meters].srcpin)&1)|0x80;
-            if (sml_counters[cindex].sml_cnt_debounce==0xc0) {
-
-              state=1;
-            } else {
-
-              state=0;
-            }
-            if (sml_counters[cindex].sml_cnt_old_state!=state) {
-
-              sml_counters[cindex].sml_cnt_old_state=state;
-              if (state==0) {
-
-                RtcSettings.pulse_counter[cindex]++;
-                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-              }
-            }
-          }
-        }
-#ifdef DEBUG_CNT_LED1
-        if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
-#endif
-#ifdef DEBUG_CNT_LED2
-        if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
-#endif
-      } else {
-        if (ctime-sml_counters[cindex].sml_cnt_last_ts>10) {
-          sml_counters[cindex].sml_cnt_last_ts=ctime;
-#ifdef DEBUG_CNT_LED1
-          if (cindex==0) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED1);
-#endif
-#ifdef DEBUG_CNT_LED2
-          if (cindex==1) SetDBGLed(meter_desc_p[meters].srcpin,DEBUG_CNT_LED2);
-#endif
-        }
-      }
-      cindex++;
-    }
-  }
-}
-
-#ifdef USE_SCRIPT
-char *SML_Get_Sequence(char *cp,uint32_t index) {
-  if (!index) return cp;
-  uint32_t cindex=0;
-  while (cp) {
-    cp=strchr(cp,',');
-    if (cp) {
-      cp++;
-      cindex++;
-      if (cindex==index) {
-        return cp;
-      }
-    }
-  }
-}
-
-void SML_Check_Send(void) {
-  sml_100ms_cnt++;
-  char *cp;
-  for (uint32_t cnt=sml_desc_cnt; cnt<meters_used; cnt++) {
-    if (script_meter_desc[cnt].trxpin>=0 && script_meter_desc[cnt].txmem) {
-      if ((sml_100ms_cnt%script_meter_desc[cnt].tsecs)==0) {
-        if (script_meter_desc[cnt].max_index>1) {
-          script_meter_desc[cnt].index++;
-          if (script_meter_desc[cnt].index>=script_meter_desc[cnt].max_index) {
-            script_meter_desc[cnt].index=0;
-            sml_desc_cnt++;
-          }
-          cp=SML_Get_Sequence(script_meter_desc[cnt].txmem,script_meter_desc[cnt].index);
-
-        } else {
-          cp=script_meter_desc[cnt].txmem;
-
-          sml_desc_cnt++;
-        }
-
-        SML_Send_Seq(cnt,cp);
-        if (sml_desc_cnt>=meters_used) {
-          sml_desc_cnt=0;
-        }
-        break;
-      }
-    } else {
-      sml_desc_cnt++;
-    }
-
-    if (sml_desc_cnt>=meters_used) {
-      sml_desc_cnt=0;
-    }
-  }
-}
-
-uint8_t sml_hexnibble(char chr) {
-  uint8_t rVal = 0;
-  if (isdigit(chr)) {
-    rVal = chr - '0';
-  } else {
-    if (chr >= 'A' && chr <= 'F') rVal = chr + 10 - 'A';
-    if (chr >= 'a' && chr <= 'f') rVal = chr + 10 - 'a';
-  }
-  return rVal;
-}
-
-
-void SML_Send_Seq(uint32_t meter,char *seq) {
-  uint8_t sbuff[32];
-  uint8_t *ucp=sbuff,slen=0;
-  char *cp=seq;
-  while (*cp) {
-    if (!*cp || !*(cp+1)) break;
-    if (*cp==',') break;
-    uint8_t iob=(sml_hexnibble(*cp) << 4) | sml_hexnibble(*(cp+1));
-    cp+=2;
-    *ucp++=iob;
-    slen++;
-    if (slen>=sizeof(sbuff)) break;
-  }
-  if (script_meter_desc[meter].type=='m' || script_meter_desc[meter].type=='M') {
-    *ucp++=0;
-    *ucp++=2;
-
-    uint16_t crc = MBUS_calculateCRC(sbuff,6);
-    *ucp++=lowByte(crc);
-    *ucp++=highByte(crc);
-    slen+=4;
-  }
-  if (script_meter_desc[meter].type=='o') {
-    for (uint32_t cnt=0;cnt<slen;cnt++) {
-      sbuff[cnt]|=(CalcEvenParity(sbuff[cnt])<<7);
-    }
-  }
-  if (script_meter_desc[meter].type=='p') {
-    *ucp++=0xc0;
-    *ucp++=0xa8;
-    *ucp++=1;
-    *ucp++=1;
-    *ucp++=0;
-    *ucp++=SML_PzemCrc(sbuff,6);
-    slen+=6;
-  }
-  meter_ss[meter]->write(sbuff,slen);
-}
-#endif
-
-uint16_t MBUS_calculateCRC(uint8_t *frame, uint8_t num) {
-  uint16_t crc, flag;
-  crc = 0xFFFF;
-  for (uint32_t i = 0; i < num; i++) {
-    crc ^= frame[i];
-    for (uint32_t j = 8; j; j--) {
-      if ((crc & 0x0001) != 0) {
-        crc >>= 1;
-        crc ^= 0xA001;
-      } else {
-        crc >>= 1;
-      }
-    }
-  }
-  return crc;
-}
-
-uint8_t SML_PzemCrc(uint8_t *data, uint8_t len) {
-  uint16_t crc = 0;
-  for (uint32_t i = 0; i < len; i++) crc += *data++;
-  return (uint8_t)(crc & 0xFF);
-}
-
-
-uint8_t CalcEvenParity(uint8_t data) {
-uint8_t parity=0;
-
-  while(data) {
-    parity^=(data &1);
-    data>>=1;
-  }
-  return parity;
-}
-# 2361 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-bool XSNS_53_cmd(void) {
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-      char *cp=XdrvMailbox.data;
-      if (*cp=='d') {
-
-        cp++;
-        uint8_t index=atoi(cp);
-        if ((index&7)>meters_used) index=1;
-        if (index>0 && meter_desc_p[(index&7)-1].type=='c') {
-          index=0;
-        }
-        dump2log=index;
-        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"dump: %d\"}}"),dump2log);
-      } else if (*cp=='c') {
-
-          cp++;
-          uint8_t index=*cp&7;
-          if (index<1 || index>MAX_COUNTERS) index=1;
-          cp++;
-          while (*cp==' ') cp++;
-          if (isdigit(*cp)) {
-            uint32_t cval=atoi(cp);
-            while (isdigit(*cp)) cp++;
-            RtcSettings.pulse_counter[index-1]=cval;
-            uint8_t cindex=0;
-            for (uint8_t meters=0; meters<meters_used; meters++) {
-              if (meter_desc_p[meters].type=='c') {
-                InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
-                cindex++;
-              }
-            }
-          }
-          ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"counter%d: %d\"}}"),index,RtcSettings.pulse_counter[index-1]);
-      } else if (*cp=='r') {
-
-        ResponseTime_P(PSTR(",\"SML\":{\"CMD\":\"restart\"}}"));
-        SML_CounterSaveState();
-        SML_Init();
-      } else {
-        serviced=false;
-      }
-  }
-  return serviced;
-}
-
-void InjektCounterValue(uint8_t meter,uint32_t counter) {
-  sprintf((char*)&smltbuf[meter][0],"1-0:1.8.0*255(%d)",counter);
-  SML_Decode(meter);
-}
-
-void SML_CounterSaveState(void) {
-  for (byte i = 0; i < MAX_COUNTERS; i++) {
-      Settings.pulse_counter[i] = RtcSettings.pulse_counter[i];
-  }
-}
-# 2425 "S:/Development/Tasmota/tasmota/xsns_53_sml.ino"
-bool Xsns53(byte function) {
-  bool result = false;
-    switch (function) {
-      case FUNC_INIT:
-        SML_Init();
-        break;
-      case FUNC_LOOP:
-        SML_Counter_Poll();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        if (dump2log) Dump2log();
-        else SML_Poll();
-        break;
-#ifdef USE_SCRIPT
-      case FUNC_EVERY_100_MSECOND:
-        SML_Check_Send();
-        break;
-#endif
-      case FUNC_JSON_APPEND:
-        SML_Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        SML_Show(0);
-        break;
-#endif
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_53 == XdrvMailbox.index) {
-          result = XSNS_53_cmd();
-        }
-        break;
-      case FUNC_SAVE_BEFORE_RESTART:
-      case FUNC_SAVE_AT_MIDNIGHT:
-        SML_CounterSaveState();
-        break;
-    }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-#ifdef USE_I2C
-#ifdef USE_INA226
-# 70 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-#define XSNS_54 54
-#define XI2C_35 35
-
-#define INA226_MAX_ADDRESSES 4
-#define INA226_ADDRESS1 (0x40)
-#define INA226_ADDRESS2 (0x41)
-#define INA226_ADDRESS3 (0x44)
-#define INA226_ADDRESS4 (0x45)
-
-#define INA226_REG_CONFIG (0x00)
-#define INA226_RES_CONFIG (0x4127)
-#define INA226_DEF_CONFIG (0x42FF)
-#define INA226_CONFIG_RESET (0x8000)
-
-#define INA226_REG_SHUNTVOLTAGE (0x01)
-#define INA226_REG_BUSVOLTAGE (0x02)
-#define INA226_REG_POWER (0x03)
-#define INA226_REG_CURRENT (0x04)
-#define INA226_REG_CALIBRATION (0x05)
-
-
-typedef struct Ina226SlaveInfo_tag {
-  uint8_t address;
-  uint16_t calibrationValue;
-  uint16_t config;
-  uint8_t present : 1;
-  float i_lsb;
-} Ina226SlaveInfo_t;
-
-
-
-
-
-static const uint8_t PROGMEM probeAddresses[INA226_MAX_ADDRESSES] = {INA226_ADDRESS1, INA226_ADDRESS2, INA226_ADDRESS3, INA226_ADDRESS4};
-
-
-
-
-
-
-static char Ina226Str[] = "INA226";
-static uint8_t slavesFound = 0;
-static uint8_t schedule_reinit = 0;
-static Ina226SlaveInfo_t slaveInfo[4] = {0};
-
-static float voltages[4];
-static float currents[4];
-static float powers[4];
-
-
-
-
-
-
-static void _debug_fval(const char *str, float fval, uint8_t prec = 4 )
-{
-  char fstr[32];
-  dtostrfd(fval, prec, fstr);
-  AddLog_P2( LOG_LEVEL_DEBUG, PSTR("%s: %s"), str, fstr );
-}
-# 138 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-static uint32_t _expand_r_shunt(uint16_t compact_r_shunt)
-{
-
-  uint32_t r_shunt_uohms = (compact_r_shunt & 0x8000) ?
-  (((uint32_t)(compact_r_shunt & 0x7FFF)) * 1000ul) :
-  (compact_r_shunt & 0x7FFF);
-  return r_shunt_uohms;
-}
-
-
-
-
-
-void Ina226SetCalibration(uint8_t slaveIndex)
-{
-
-Ina226SlaveInfo_t *si = slaveInfo + slaveIndex;
-
-I2cWrite16( si->address, INA226_REG_CALIBRATION, si->calibrationValue);
-
-}
-
-
-
-
-
-
-bool Ina226TestPresence(uint8_t device)
-{
-
-
-
-  uint16_t config = I2cRead16( slaveInfo[device].address, INA226_REG_CONFIG );
-
-
-  if (config != slaveInfo[device].config)
-    return false;
-
-  return true;
-
-}
-
-void Ina226ResetActive(void)
-{
-  Ina226SlaveInfo_t *p = slaveInfo;
-
-  for (uint32_t i = 0; i < INA226_MAX_ADDRESSES; i++) {
-    p = &slaveInfo[i];
-
-    uint8_t addr = p->address;
-    if (addr) {
-      I2cResetActive(addr);
-    }
-  }
-}
-
-
-
-
-
-void Ina226Init()
-{
-  uint32_t i;
-
-  slavesFound = 0;
-
-  Ina226SlaveInfo_t *p = slaveInfo;
-# 215 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-  for (i = 0; i < 4; i++){
-    *p = {0};
-  }
-
-
-
-
-
-  for (i = 0; i < INA226_MAX_ADDRESSES; i++){
-    uint8_t addr = pgm_read_byte(probeAddresses + i);
-
-    if (I2cActive(addr)) { continue; }
-
-
-
-
-    if (!Settings.ina226_i_fs[i])
-      continue;
-
-
-
-
-
-
-    if (!I2cWrite16( addr, INA226_REG_CONFIG, INA226_CONFIG_RESET)){
-
-      AddLog_P2( LOG_LEVEL_DEBUG, "No INA226 at address: %02X", addr);
-      continue;
-    }
-
-
-
-    uint16_t config = I2cRead16( addr, INA226_REG_CONFIG );
-
-
-    if (INA226_RES_CONFIG != config)
-      continue;
-
-
-    config = INA226_DEF_CONFIG;
-
-
-    if (!I2cWrite16( addr, INA226_REG_CONFIG, config))
-        continue;
-
-
-    p = &slaveInfo[i];
-
-    p->address = addr;
-
-    p->config = config;
-
-
-    p->i_lsb = (((float) Settings.ina226_i_fs[i])/10.0f)/32768.0f;
-
-
-
-    uint32_t r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[i]);
-
-
-
-    p->calibrationValue = ((uint16_t) (0.00512/(p->i_lsb * r_shunt_uohms/1000000.0f)));
-
-    p->present = true;
-
-
-    Ina226SetCalibration(i);
-
-    I2cSetActiveFound(addr, Ina226Str);
-
-    slavesFound++;
-  }
-}
-
-
-
-
-
-float Ina226ReadBus_v(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_bus_v = I2cReadS16( addr, INA226_REG_BUSVOLTAGE);
-
-  float result = ((float) reg_bus_v) * 0.00125f;
-
-  return result;
-
-}
-
-
-
-
-
-float Ina226ReadShunt_i(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_CURRENT);
-
-  float result = ((float) reg_shunt_i) * slaveInfo[device].i_lsb;
-
-  return result;
-}
-
-
-
-
-
-float Ina226ReadPower_w(uint8_t device)
-{
-  uint8_t addr = slaveInfo[device].address;
-  int16_t reg_shunt_i = I2cReadS16( addr, INA226_REG_POWER);
-
-  float result = ((float) reg_shunt_i) * (slaveInfo[device].i_lsb * 25.0);
-
-  return result;
-}
-
-
-
-
-
-
-void Ina226Read(uint8_t device)
-{
-
-  voltages[device] = Ina226ReadBus_v(device);
-  currents[device] = Ina226ReadShunt_i(device);
-  powers[device] = Ina226ReadPower_w(device);
-
-
-
-
-}
-
-
-
-
-
-void Ina226EverySecond()
-{
-
-  for (uint8_t device = 0; device < INA226_MAX_ADDRESSES; device++){
-
-    if (slavesFound && slaveInfo[device].present && Ina226TestPresence(device)){
-      Ina226Read(device);
-    }
-    else {
-        powers[device] = currents[device] = voltages[device] = 0.0f;
-
-
-
-
-
-
-        slaveInfo[device].present = false;
-    }
-  }
-}
-
-
-
-
-
-bool Ina226CommandSensor()
-{
-  bool serviced = true;
-  bool show_config = false;
-  char param_str[64];
-  char *cp, *params[4];
-  uint8_t i, param_count, device, p1 = XdrvMailbox.payload;
-  uint32_t r_shunt_uohms;
-  uint16_t compact_r_shunt_uohms;
-
-
-
-
-
-  if (XdrvMailbox.data_len > 62){
-    return false;
-  }
-
-  strncpy(param_str, XdrvMailbox.data, XdrvMailbox.data_len + 1);
-  param_str[XdrvMailbox.data_len] = 0;
-
-
-  for (cp = param_str, i = 0, param_count = 0; *cp && (i < XdrvMailbox.data_len + 1) && (param_count <= 3); i++)
-    if (param_str[i] == ' ' || param_str[i] == ',' || param_str[i] == 0){
-      param_str[i] = 0;
-      params[param_count] = cp;
-
-      param_count++;
-      cp = param_str + i + 1;
-    }
-
-
-  if (p1 < 10 || p1 >= 50){
-
-    switch (p1){
-      case 1:
-        Ina226ResetActive();
-        Ina226Init();
-        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"SlavesFound\":%d}}"),slavesFound);
-        break;
-
-      case 2:
-        restart_flag = 2;
-        Response_P(PSTR("{\"Sensor54-Command-Result\":{\"Restart_flag\":%d}}"),restart_flag);
-        break;
-
-      default:
-        serviced = false;
-    }
-  }
-  else if (p1 < 50){
-
-    device = (p1 / 10) - 1;
-    switch (p1 % 10){
-      case 0:
-        show_config = true;
-        break;
-
-      case 1:
-        r_shunt_uohms = (uint32_t) ((CharToFloat(params[1])) * 1000000.0f);
-
-
-
-        if (r_shunt_uohms > 32767){
-          uint32_t r_shunt_mohms = r_shunt_uohms/1000UL;
-          Settings.ina226_r_shunt[device] = (uint16_t) (r_shunt_mohms | 0x8000);
-        }
-        else
-          Settings.ina226_r_shunt[device] = (uint16_t) r_shunt_uohms;
-
-
-        show_config = true;
-        break;
-
-      case 2:
-        Settings.ina226_i_fs[device] = (uint16_t) ((CharToFloat(params[1])) * 10.0f);
-
-        show_config = true;
-        break;
-
-
-      default:
-        serviced = false;
-        break;
-    }
-  }
-  else
-    serviced = false;
-
-  if (show_config) {
-    char shunt_r_str[16];
-    char fs_i_str[16];
-
-
-    r_shunt_uohms = _expand_r_shunt(Settings.ina226_r_shunt[device]);
-    dtostrfd(((float)r_shunt_uohms)/1000000.0f, 6, shunt_r_str);
-
-    dtostrfd(((float)Settings.ina226_i_fs[device])/10.0f, 1, fs_i_str);
-
-    Response_P(PSTR("{\"Sensor54-device-settings-%d\":{\"SHUNT_R\":%s,\"FS_I\":%s}}"),
-      device + 1, shunt_r_str, fs_i_str);
-  }
-
-  return serviced;
-}
-
-
-
-
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_INA226_DATA[] PROGMEM =
-  "{s}%s " D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"
-  "{s}%s " D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"
-  "{s}%s " D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";
-#endif
-
-void Ina226Show(bool json)
-{
-  int i, num_found;
-  for (num_found = 0, i = 0; i < INA226_MAX_ADDRESSES; i++) {
-
-    if (!slaveInfo[i].present)
-      continue;
-
-    num_found++;
-
-    char voltage[16];
-    dtostrfd(voltages[i], Settings.flag2.voltage_resolution, voltage);
-    char current[16];
-    dtostrfd(currents[i], Settings.flag2.current_resolution, current);
-    char power[16];
-    dtostrfd(powers[i], Settings.flag2.wattage_resolution, power);
-    char name[16];
-    snprintf_P(name, sizeof(name), PSTR("INA226%c%d"),IndexSeparator(), i + 1);
-
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"Id\":%d,\"" D_JSON_VOLTAGE "\":%s,\"" D_JSON_CURRENT "\":%s,\"" D_JSON_POWERUSAGE "\":%s}"),
-                       name, i, voltage, current, power);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, voltage);
-        DomoticzSensor(DZ_CURRENT, current);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_INA226_DATA, name, voltage, name, current, name, power);
-#endif
-    }
-
-  }
-
-}
-# 546 "S:/Development/Tasmota/tasmota/xsns_54_ina226.ino"
-bool Xsns54(byte callback_id)
-{
-  if (!I2cEnabled(XI2C_35)) { return false; }
-
-
-  bool result = false;
-
-
-  switch (callback_id) {
-    case FUNC_EVERY_SECOND:
-      Ina226EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      Ina226Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Ina226Show(0);
-      break;
-#endif
-    case FUNC_COMMAND_SENSOR:
-      if (XSNS_54 == XdrvMailbox.index) {
-        result = Ina226CommandSensor();
-      }
-      break;
-    case FUNC_INIT:
-      Ina226Init();
-      break;
-  }
-
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
-#ifdef USE_I2C
-#ifdef USE_HIH6
-# 33 "S:/Development/Tasmota/tasmota/xsns_55_hih_series.ino"
-#define XSNS_55 55
-#define XI2C_36 36
-
-#define HIH6_ADDR 0x27
-
-struct HIH6 {
-  float temperature = 0;
-  float humidity = 0;
-  uint8_t valid = 0;
-  uint8_t type = 0;
-  char types[4] = "HIH";
-} Hih6;
-
-bool Hih6Read(void)
-{
-  Wire.beginTransmission(HIH6_ADDR);
-  if (Wire.endTransmission() != 0) { return false; }
-
-  delay(40);
-
-  uint8_t data[4];
-  Wire.requestFrom(HIH6_ADDR, 4);
-  if (4 == Wire.available()) {
-    data[0] = Wire.read();
-    data[1] = Wire.read();
-    data[2] = Wire.read();
-    data[3] = Wire.read();
-  } else { return false; }
-
-
-
-  Hih6.humidity = ConvertHumidity(((float)(((data[0] & 0x3F) << 8) | data[1]) * 100.0) / 16383.0);
-
-  int temp = ((data[2] << 8) | (data[3] & 0xFC)) / 4;
-  Hih6.temperature = ConvertTemp(((float)temp / 16384.0) * 165.0 - 40.0);
-
-  Hih6.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Hih6Detect(void)
-{
-  if (I2cActive(HIH6_ADDR)) { return; }
-
-  if (uptime < 2) { delay(20); }
-  Hih6.type = Hih6Read();
-  if (Hih6.type) {
-    I2cSetActiveFound(HIH6_ADDR, Hih6.types);
-  }
-}
-
-void Hih6EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!Hih6Read()) {
-      AddLogMissed(Hih6.types, Hih6.valid);
-    }
-  }
-}
-
-void Hih6Show(bool json)
-{
-  if (Hih6.valid) {
-    char temperature[33];
-    dtostrfd(Hih6.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Hih6.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Hih6.types, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Hih6.temperature);
-        KnxSensor(KNX_HUMIDITY, Hih6.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Hih6.types, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Hih6.types, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns55(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_36)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Hih6Detect();
-  }
-  else if (Hih6.type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Hih6EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Hih6Show(1);
-        break;
-  #ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Hih6Show(0);
-        break;
-  #endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
-# 21 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
-#ifdef USE_HPMA
-# 31 "S:/Development/Tasmota/tasmota/xsns_56_hpma.ino"
-#define XSNS_56 56
-
-#include <hpma115S0.h>
-#include <TasmotaSerial.h>
-
-TasmotaSerial *HpmaSerial;
-HPMA115S0 *hpma115S0;
-
-uint8_t hpma_type = 1;
-uint8_t hpma_valid = 0;
-
-struct hpmadata {
-  unsigned int pm10;
-  unsigned int pm2_5;
-} hpma_data;
-
-
-
-void HpmaSecond(void)
-{
-  unsigned int pm2_5, pm10;
-
-
-
-
-  if (hpma115S0->ReadParticleMeasurement(&pm2_5, &pm10)) {
-    hpma_data.pm2_5 = pm2_5;
-    hpma_data.pm10 = pm10;
-    hpma_valid = 1;
-  }
-
-}
-
-void HpmaInit(void)
-{
-  hpma_type = 0;
-  if (pin[GPIO_HPMA_RX] < 99 && pin[GPIO_HPMA_TX] < 99) {
-    HpmaSerial = new TasmotaSerial(pin[GPIO_HPMA_RX], pin[GPIO_HPMA_TX], 1);
-    hpma115S0 = new HPMA115S0(*HpmaSerial);
-
-    if (HpmaSerial->begin(9600)) {
-      if (HpmaSerial->hardwareSerial()) {
-        ClaimSerial();
-      }
-      hpma_type = 1;
-      hpma115S0->Init();
-      hpma115S0->StartParticleMeasurement();
-    }
-  }
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_HPMA_SNS[] PROGMEM =
-  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "2.5 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}"
-  "{s}HPMA " D_ENVIRONMENTAL_CONCENTRATION "10 " D_UNIT_MICROMETER "{m}%s " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}";
-#endif
-
-void HpmaShow(bool json)
-{
-  if (hpma_valid) {
-    char pm10[33];
-    snprintf_P(pm10, 33, PSTR("%d"), hpma_data.pm10);
-    char pm2_5[33];
-    snprintf_P(pm2_5, 33, PSTR("%d"), hpma_data.pm2_5);
-
-    if (json) {
-      ResponseAppend_P(PSTR(",\"HPMA\":{\"PM2.5\":%d,\"PM10\":%d}"), hpma_data.pm2_5, hpma_data.pm10);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) {
-        DomoticzSensor(DZ_VOLTAGE, pm2_5);
-        DomoticzSensor(DZ_CURRENT, pm10);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_HPMA_SNS, pm2_5, pm10);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns56(uint8_t function)
-{
-  bool result = false;
-
-  if (hpma_type) {
-    switch (function) {
-      case FUNC_INIT:
-        HpmaInit();
-        break;
-      case FUNC_EVERY_SECOND:
-        HpmaSecond();
-        break;
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_56 == XdrvMailbox.index) {
-          return true;
-        }
-        break;
-      case FUNC_JSON_APPEND:
-        HpmaShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HpmaShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_57_tsl2591.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_57_tsl2591.ino"
-#ifdef USE_I2C
-#ifdef USE_TSL2591
-
-
-
-
-
-
-
-#define XSNS_57 57
-#define XI2C_40 40
-
-#define TSL2591_ADDRESS 0x29
-
-#include <Adafruit_TSL2591.h>
-
-Adafruit_TSL2591 tsl = Adafruit_TSL2591();
-
-uint8_t tsl2591_type = 0;
-uint8_t tsl2591_valid = 0;
-float tsl2591_lux = 0;
-
-void Tsl2591Init(void)
-{
-
-  if (I2cSetDevice(0x29)) {
-    if (tsl.begin()) {
-      tsl.setGain(TSL2591_GAIN_MED);
-      tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
-      tsl2591_type = 1;
-      I2cSetActiveFound(TSL2591_ADDRESS, "TSL2591");
-    }
-  }
-}
-
-bool Tsl2591Read(void)
-{
-  uint32_t lum = tsl.getFullLuminosity();
-  uint16_t ir, full;
-  ir = lum >> 16;
-  full = lum & 0xFFFF;
-  tsl2591_lux = tsl.calculateLux(full, ir);
-  tsl2591_valid = 1;
-}
-
-void Tsl2591EverySecond(void)
-{
-  Tsl2591Read();
-}
-
-#ifdef USE_WEBSERVER
-const char HTTP_SNS_TSL2591[] PROGMEM =
-  "{s}TSL2591 " D_ILLUMINANCE "{m}%s " D_UNIT_LUX "{e}";
-#endif
-
-void Tsl2591Show(bool json)
-{
-  if (tsl2591_valid) {
-    char lux_str[10];
-    dtostrf(tsl2591_lux, sizeof(lux_str)-1, 3, lux_str);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"TSL2591\":{\"" D_JSON_ILLUMINANCE "\":%s}"), lux_str);
-#ifdef USE_DOMOTICZ
-      if (0 == tele_period) { DomoticzSensor(DZ_ILLUMINANCE, tsl2591_lux); }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TSL2591, lux_str);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns57(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_40)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Tsl2591Init();
-  }
-  else if (tsl2591_type) {
-    switch (function) {
-      case FUNC_EVERY_SECOND:
-        Tsl2591EverySecond();
-        break;
-      case FUNC_JSON_APPEND:
-        Tsl2591Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        Tsl2591Show(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_58_dht12.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_58_dht12.ino"
-#ifdef USE_I2C
-#ifdef USE_DHT12
-
-
-
-
-
-
-#define XSNS_58 58
-#define XI2C_41 41
-
-#define DHT12_ADDR 0x5C
-
-struct DHT12 {
-  float temperature = NAN;
-  float humidity = NAN;
-  uint8_t valid = 0;
-  uint8_t count = 0;
-  char name[6] = "DHT12";
-} Dht12;
-
-bool Dht12Read(void)
-{
-  if (Dht12.valid) { Dht12.valid--; }
-
-  Wire.beginTransmission(DHT12_ADDR);
-  Wire.write(0);
-  if (Wire.endTransmission() != 0) { return false; }
-
-  delay(50);
-
-  Wire.requestFrom(DHT12_ADDR, 5);
-  delay(5);
-  uint8_t humidity = Wire.read();
-  uint8_t humidityTenth = Wire.read();
-  uint8_t temp = Wire.read();
-  uint8_t tempTenth = Wire.read();
-  uint8_t checksum = Wire.read();
-
-  Dht12.humidity = ConvertHumidity( (float) humidity + (float) humidityTenth/(float) 10.0 );
-  Dht12.temperature = ConvertTemp( (float) temp + (float) tempTenth/(float) 10.0 );
-
-  if (isnan(Dht12.temperature) || isnan(Dht12.humidity)) { return false; }
-
-  Dht12.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-void Dht12Detect(void)
-{
-  if (I2cActive(DHT12_ADDR)) { return; }
-
-  if (Dht12Read()) {
-    I2cSetActiveFound(DHT12_ADDR, Dht12.name);
-    Dht12.count = 1;
-  }
-}
-
-void Dht12EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!Dht12Read()) {
-      AddLogMissed(Dht12.name, Dht12.valid);
-    }
-  }
-}
-
-void Dht12Show(bool json)
-{
-  if (Dht12.valid) {
-    char temperature[33];
-    dtostrfd(Dht12.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(Dht12.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, Dht12.name, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, Dht12.temperature);
-        KnxSensor(KNX_HUMIDITY, Dht12.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, Dht12.name, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, Dht12.name, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns58(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_41)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    Dht12Detect();
-  }
-  else if (Dht12.count) {
-    switch (function) {
-    case FUNC_EVERY_SECOND:
-      Dht12EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      Dht12Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      Dht12Show(0);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_59_ds1624.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_59_ds1624.ino"
-#ifdef USE_I2C
-#ifdef USE_DS1624
-
-
-
-
-
-
-
-#define XSNS_59 59
-#define XI2C_42 42
-
-#define DS1624_MEM_REGISTER 0x17
-#define DS1624_CONF_REGISTER 0xAC
-#define DS1624_TEMP_REGISTER 0xAA
-#define DS1624_START_REGISTER 0xEE
-#define DS1624_STOP_REGISTER 0x22
-
-#define DS1621_COUNTER_REGISTER 0xA8
-#define DS1621_SLOPE_REGISTER 0xA9
-
-#define DS1621_CFG_1SHOT (1<<0)
-#define DS1621_CFG_DONE (1<<7)
-
-enum {
-  DS1624_TYPE_DS1624,
-  DS1624_TYPE_DS1621
-};
-
-#define DS1624_MAX_SENSORS 8
-
-bool ds1624_init = false;
-
-struct {
-  float value;
-  uint8_t type;
-  int errcnt;
-  int misscnt;
-  bool valid;
-  char name[9];
-} ds1624_sns[DS1624_MAX_SENSORS];
-
-uint32_t DS1624_Idx2Addr(uint32_t idx) {
-  return 0x48 + idx;
-}
-
-int DS1624_Restart(uint8_t config, uint32_t idx) {
-  uint32_t addr = DS1624_Idx2Addr(idx);
-  if ((config & 1) == 1) {
-    config &= ~(DS1621_CFG_DONE|DS1621_CFG_1SHOT);
-    I2cWrite8(addr, DS1624_CONF_REGISTER, config);
-    delay(10);
-    AddLog_P2(LOG_LEVEL_ERROR, "%s addr %x is reset, reconfig: %x", ds1624_sns[idx].name, addr, config);
-  }
-  I2cValidRead(addr, DS1624_START_REGISTER, 1);
-}
-
-void DS1624_HotPlugUp(uint32_t idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-
-  if (I2cActive(addr)) { return; }
-  if (!I2cSetDevice(addr)) { return; }
-
-  uint8_t config;
-  if (I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
-    uint8_t tmp;
-    ds1624_sns[idx].type = (I2cValidRead8(&tmp, addr, DS1624_MEM_REGISTER)) ? DS1624_TYPE_DS1624 : DS1624_TYPE_DS1621;
-
-    snprintf_P(ds1624_sns[idx].name, sizeof(ds1624_sns[idx].name), PSTR("DS162%c%c%d"),
-      (ds1624_sns[idx].type == DS1624_TYPE_DS1621) ? '1' : '4', IndexSeparator(), idx);
-    I2cSetActiveFound(addr, ds1624_sns[idx].name);
-
-    ds1624_sns[idx].valid = true;
-    ds1624_sns[idx].errcnt = 0;
-    ds1624_sns[idx].misscnt = 0;
-    DS1624_Restart(config,idx);
-    AddLog_P2(LOG_LEVEL_INFO, "Hot Plug %s addr %x config: %x", ds1624_sns[idx].name, addr, config);
-  }
-}
-
-void DS1624_HotPlugDown(int idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-  if (!I2cActive(addr)) { return; }
-  I2cResetActive(addr);
-  ds1624_sns[idx].valid = false;
-  AddLog_P2(LOG_LEVEL_INFO, "Hot UnPlug %s", ds1624_sns[idx].name);
-}
-
-bool DS1624GetTemp(float *value, int idx)
-{
-  uint32_t addr = DS1624_Idx2Addr(idx);
-
-  uint8_t config;
-  if (!I2cValidRead8(&config, addr, DS1624_CONF_REGISTER)) {
-    ds1624_sns[idx].misscnt++;
-    AddLog_P2(LOG_LEVEL_INFO, "%s device missing (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].misscnt);
-    return false;
-  }
-  ds1624_sns[idx].misscnt=0;
-  if (config & (DS1621_CFG_1SHOT|DS1621_CFG_DONE)) {
-    ds1624_sns[idx].errcnt++;
-    AddLog_P2(LOG_LEVEL_INFO, "%s config error, restart... (errors: %i)", ds1624_sns[idx].name, ds1624_sns[idx].errcnt);
-    DS1624_Restart(config, idx);
-    return false;
-  }
-
-  uint16_t t;
-  if (!I2cValidRead16(&t, DS1624_Idx2Addr(idx), DS1624_TEMP_REGISTER)) { return false; }
-  if (ds1624_sns[idx].type == DS1624_TYPE_DS1624) {
-    *value = ((float)(int8_t)(t>>8)) + ((t>>4)&0xf)*0.0625;
-  } else {
-
-    *value = ((float)(int8_t)(t>>8));
-    uint8_t remain;
-    if (!I2cValidRead8(&remain, addr, DS1621_COUNTER_REGISTER)) { return true; }
-    uint8_t perc;
-    if (!I2cValidRead8(&perc, addr, DS1621_SLOPE_REGISTER)) { return true; }
-    float fix=(float)(perc - remain)/(float)perc;
-    *value+=fix;
-  }
-  ds1624_sns[idx].errcnt=0;
-  config &= ~(DS1621_CFG_DONE);
-  I2cWrite8(addr, DS1624_CONF_REGISTER, config);
-  return true;
-}
-
-void DS1624HotPlugScan(void)
-{
-  uint16_t t;
-
-  for (uint32_t idx = 0; idx < DS1624_MAX_SENSORS; idx++) {
-    uint32_t addr = DS1624_Idx2Addr(idx);
-    if (I2cActive(addr) && !ds1624_sns[idx].valid) {
-      continue;
-    }
-    if (ds1624_sns[idx].valid) {
-      if ((ds1624_sns[idx].misscnt>2)||(ds1624_sns[idx].errcnt>2)) {
-        DS1624_HotPlugDown(idx);
-        continue;
-      }
-    }
-    DS1624_HotPlugUp(idx);
-  }
-}
-
-void DS1624EverySecond(void)
-{
-  float t;
-  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (!ds1624_sns[i].valid) { continue; }
-    if (!DS1624GetTemp(&t, i)) { continue; }
-    ds1624_sns[i].value = ConvertTemp(t);
-  }
-}
-
-void DS1624Show(bool json)
-{
-  char temperature[33];
-  bool once = true;
-
-  for (uint32_t i = 0; i < DS1624_MAX_SENSORS; i++) {
-    if (!ds1624_sns[i].valid) { continue; }
-
-    dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
-    if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature);
-      if ((0 == tele_period) && once) {
-#ifdef USE_DOMOTICZ
-        DomoticzSensor(DZ_TEMP, temperature);
-#endif
-#ifdef USE_KNX
-        KnxSensor(KNX_TEMPERATURE, temperature);
-#endif
-        once = false;
-      }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, ds1624_sns[i].name, temperature, TempUnit());
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns59(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_42)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    if (!ds1624_init) {
-      memset(ds1624_sns, 0, sizeof(ds1624_sns));
-      ds1624_init = true;
-      DS1624HotPlugScan();
-    }
-  }
-  switch (function) {
-    case FUNC_HOTPLUG_SCAN:
-      DS1624HotPlugScan();
-      break;
-    case FUNC_EVERY_SECOND:
-      DS1624EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      DS1624Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      DS1624Show(0);
-      break;
-#endif
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
-#ifdef USE_GPS
-# 113 "S:/Development/Tasmota/tasmota/xsns_60_GPS.ino"
-#define XSNS_60 60
-
-#include "NTPServer.h"
-#include "NTPPacket.h"
-
-
-
-
-
-#define D_CMND_UBX "UBX"
-
-const char S_JSON_UBX_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_UBX "%s\":%d}";
-
-const char kUBXTypes[] PROGMEM = "UBX";
-
-#define UBX_LAT_LON_THRESHOLD 1000
-
-#define UBX_SERIAL_BUFFER_SIZE 256
-#define UBX_TCP_PORT 1234
-
-
-
-
-
-const char UBLOX_INIT[] PROGMEM = {
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x24,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x2B,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x02,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x32,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x39,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x04,0x00,0x00,0x00,0x00,0x00,0x01,0x04,0x40,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0xF0,0x05,0x00,0x00,0x00,0x00,0x00,0x01,0x05,0x47,
-
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xDC,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xB9,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0xC0,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x92,
-
-
-
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x13,0xBE,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x03,0x00,0x01,0x00,0x00,0x00,0x00,0x14,0xC5,
-  0xB5,0x62,0x06,0x01,0x08,0x00,0x01,0x21,0x00,0x01,0x00,0x00,0x00,0x00,0x32,0x97,
-
-
-
-
-
-
-};
-
-char UBX_name[4];
-
-struct UBX_t {
-  const char UBX_HEADER[2] = { 0xB5, 0x62 };
-  const char NAV_POSLLH_HEADER[2] = { 0x01, 0x02 };
-  const char NAV_STATUS_HEADER[2] = { 0x01, 0x03 };
-  const char NAV_TIME_HEADER[2] = { 0x01, 0x21 };
-
-  struct entry_t {
-          int32_t lat;
-          int32_t lon;
-          uint32_t time;
-    };
-
-  union {
-    entry_t values;
-    uint8_t bytes[sizeof(entry_t)];
-    } rec_buffer;
-
-  struct POLL_MSG {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t zero;
-  };
-
-  struct NAV_POSLLH {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    int32_t lon;
-    int32_t lat;
-    int32_t alt;
-    int32_t hMSL;
-    uint32_t hAcc;
-    uint32_t vAcc;
-    };
-
-  struct NAV_STATUS {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    uint8_t gpsFix;
-    uint8_t flags;
-    uint8_t fixStat;
-    uint8_t flags2;
-    uint32_t ttff;
-    uint32_t msss;
-    };
-
-  struct NAV_TIME_UTC {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint32_t iTOW;
-    uint32_t tAcc;
-    int32_t nano;
-    uint16_t year;
-    uint8_t month;
-    uint8_t day;
-    uint8_t hour;
-    uint8_t min;
-    uint8_t sec;
-    struct {
-      uint8_t UTC:1;
-      uint8_t WKN:1;
-      uint8_t TOW:1;
-      uint8_t padding:5;
-      } valid;
-    };
-
-  struct CFG_RATE {
-    uint8_t cls;
-    uint8_t id;
-    uint16_t len;
-    uint16_t measRate;
-    uint16_t navRate;
-    uint16_t timeRef;
-    char CK[2];
-    };
-
-  struct {
-    uint32_t last_iTOW;
-    int32_t last_alt;
-    uint32_t last_hAcc;
-    uint32_t last_vAcc;
-    uint8_t gpsFix;
-    uint8_t non_empty_loops;
-    uint16_t log_interval;
-  } state;
-
-  struct {
-    uint32_t init:1;
-    uint32_t filter_noise:1;
-    uint32_t send_when_new:1;
-    uint32_t send_UI_only:1;
-    uint32_t runningNTP:1;
-    uint32_t forceUTCupdate:1;
-    uint32_t runningVPort:1;
-
-  } mode;
-
-  union {
-    NAV_POSLLH navPosllh;
-    NAV_STATUS navStatus;
-    NAV_TIME_UTC navTime;
-    POLL_MSG pollMsg;
-    CFG_RATE cfgRate;
-    } Message;
-
-  uint8_t TCPbuf[UBX_SERIAL_BUFFER_SIZE];
-  size_t TCPbufSize;
-} UBX;
-
-enum UBXMsgType {
-  MT_NONE,
-  MT_NAV_POSLLH,
-  MT_NAV_STATUS,
-  MT_NAV_TIME,
-  MT_POLL
-};
-
-#ifdef USE_FLOG
-FLOG *Flog = nullptr;
-#endif
-TasmotaSerial *UBXSerial;
-
-NtpServer timeServer(PortUdp);
-
-WiFiServer vPortServer(UBX_TCP_PORT);
-WiFiClient vPortClient;
-
-
-
-
-
-void UBXcalcChecksum(char* CK, size_t msgSize)
-{
-  memset(CK, 0, 2);
-  for (int i = 0; i < msgSize; i++) {
-    CK[0] += ((char*)(&UBX.Message))[i];
-    CK[1] += CK[0];
-  }
-}
-
-bool UBXcompareMsgHeader(const char* msgHeader)
-{
-  char* ptr = (char*)(&UBX.Message);
-  return ptr[0] == msgHeader[0] && ptr[1] == msgHeader[1];
-}
-
-void UBXinitCFG(void)
-{
-  for (uint32_t i = 0; i < sizeof(UBLOX_INIT); i++) {
-    UBXSerial->write( pgm_read_byte(UBLOX_INIT+i) );
-  }
-  DEBUG_SENSOR_LOG(PSTR("UBX: turn off NMEA"));
-}
-
-void UBXTriggerTele(void)
-{
-  mqtt_data[0] = '\0';
-  if (MqttShowSensor()) {
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
-#ifdef USE_RULES
-    RulesTeleperiod();
-#endif
-  }
-}
-
-
-
-void UBXDetect(void)
-{
-  UBX.mode.init = 0;
-  if ((pin[GPIO_GPS_RX] < 99) && (pin[GPIO_GPS_TX] < 99)) {
-    UBXSerial = new TasmotaSerial(pin[GPIO_GPS_RX], pin[GPIO_GPS_TX], 1, 0, UBX_SERIAL_BUFFER_SIZE);
-    if (UBXSerial->begin(9600)) {
-      DEBUG_SENSOR_LOG(PSTR("UBX: started serial"));
-      if (UBXSerial->hardwareSerial()) {
-        ClaimSerial();
-        DEBUG_SENSOR_LOG(PSTR("UBX: claim HW"));
-      }
-    }
-  }
-  else {
-    return;
-  }
-
-  UBXinitCFG();
-  UBX.mode.init = 1;
-
-#ifdef USE_FLOG
-  if (!Flog) {
-    Flog = new FLOG;
-    Flog->init();
-  }
-#endif
-
-  UBX.state.log_interval = 10;
-  UBX.mode.send_UI_only = true;
-  UBXTriggerTele();
-}
-
-uint32_t UBXprocessGPS()
-{
-  static uint32_t fpos = 0;
-  static char checksum[2];
-  static uint8_t currentMsgType = MT_NONE;
-  static size_t payloadSize = sizeof(UBX.Message);
-
-
-  uint32_t data_bytes = 0;
-  while ( UBXSerial->available() ) {
-    data_bytes++;
-    byte c = UBXSerial->read();
-    if (UBX.mode.runningVPort){
-      UBX.TCPbuf[data_bytes-1] = c;
-      UBX.TCPbufSize = data_bytes;
-    }
-    if ( fpos < 2 ) {
-
-      if ( c == UBX.UBX_HEADER[fpos] ) {
-        fpos++;
-      } else {
-        fpos = 0;
-      }
-    } else {
-
-
-
-
-
-      if ( (fpos-2) < payloadSize ) {
-        ((char*)(&UBX.Message))[fpos-2] = c;
-      }
-      fpos++;
-
-      if ( fpos == 4 ) {
-
-
-        if ( UBXcompareMsgHeader(UBX.NAV_POSLLH_HEADER) ) {
-          currentMsgType = MT_NAV_POSLLH;
-          payloadSize = sizeof(UBX_t::NAV_POSLLH);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_POSLLH"));
-        }
-        else if ( UBXcompareMsgHeader(UBX.NAV_STATUS_HEADER) ) {
-          currentMsgType = MT_NAV_STATUS;
-          payloadSize = sizeof(UBX_t::NAV_STATUS);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_STATUS"));
-        }
-        else if ( UBXcompareMsgHeader(UBX.NAV_TIME_HEADER) ) {
-          currentMsgType = MT_NAV_TIME;
-          payloadSize = sizeof(UBX_t::NAV_TIME_UTC);
-          DEBUG_SENSOR_LOG(PSTR("UBX: got NAV_TIME_UTC"));
-        }
-        else {
-
-          fpos = 0;
-          continue;
-        }
-      }
-
-      if ( fpos == (payloadSize+2) ) {
-
-
-        UBXcalcChecksum(checksum, payloadSize);
-      }
-      else if ( fpos == (payloadSize+3) ) {
-
-
-        if ( c != checksum[0] ) {
-
-          fpos = 0;
-        }
-      }
-      else if ( fpos == (payloadSize+4) ) {
-
-
-        fpos = 0;
-        if ( c == checksum[1] ) {
-
-          return currentMsgType;
-        }
-      }
-      else if ( fpos > (payloadSize+4) ) {
-
-
-        fpos = 0;
-      }
-    }
-  }
-
-  if (data_bytes!=0) {
-    UBX.state.non_empty_loops++;
-    DEBUG_SENSOR_LOG(PSTR("UBX: got %u bytes, non-empty-loop: %u"), data_bytes, UBX.state.non_empty_loops);
-  } else {
-    UBX.state.non_empty_loops = 0;
-  }
-  return MT_NONE;
-}
-
-
-
-
-
-#ifdef USE_FLOG
-void UBXsendHeader(void)
-{
-  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-  WebServer->sendHeader(F("Content-Disposition"), F("attachment; filename=TASMOTA.gpx"));
-  WSSend(200, CT_STREAM, F(
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\r\n"
-    "<GPX version=\"1.1\" creator=\"TASMOTA\" xmlns=\"http://www.topografix.com/GPX/1/1\" \r\n"
-    "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n"
-    "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\r\n"
-    "<trk>\r\n<trkseg>\r\n"));
-}
-
-void UBXsendRecord(uint8_t *buf)
-{
- char record[100];
- char stime[32];
- UBX_t::entry_t *entry = (UBX_t::entry_t*)buf;
- snprintf_P(stime, sizeof(stime), GetDT(entry->time).c_str());
- char lat[12];
- char lon[12];
- dtostrfd((double)entry->lat/10000000.0f,7,lat);
- dtostrfd((double)entry->lon/10000000.0f,7,lon);
- snprintf_P(record, sizeof(record),PSTR("<trkpt\n\t lat=\"%s\" lon=\"%s\">\n\t<time>%s</time>\n</trkpt>\n"),lat ,lon, stime);
-
- WebServer->sendContent_P(record);
-}
-
-void UBXsendFooter(void)
-{
-  WebServer->sendContent(F("</trkseg>\n</trk>\n</gpx>"));
-  WebServer->sendContent("");
-  Rtc.user_time_entry = false;
-}
-
-
-
-void UBXsendFile(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-  Flog->startDownload(sizeof(UBX.rec_buffer),UBXsendHeader,UBXsendRecord,UBXsendFooter);
-}
-#endif
-
-
-
-void UBXSetRate(uint16_t interval)
-{
-  UBX.Message.cfgRate.cls = 0x06;
-  UBX.Message.cfgRate.id = 0x08;
-  UBX.Message.cfgRate.len = 6;
-  uint32_t measRate = (1000*(uint32_t)interval);
-  if (measRate > 0xffff) {
-    measRate = 0xffff;
-  }
-  UBX.Message.cfgRate.measRate = (uint16_t)measRate;
-  UBX.Message.cfgRate.navRate = 1;
-  UBX.Message.cfgRate.timeRef = 1;
-  UBXcalcChecksum(UBX.Message.cfgRate.CK, sizeof(UBX.Message.cfgRate)-sizeof(UBX.Message.cfgRate.CK));
-  DEBUG_SENSOR_LOG(PSTR("UBX: requested interval: %u seconds measRate: %u ms"), interval, UBX.Message.cfgRate.measRate);
-  UBXSerial->write(UBX.UBX_HEADER[0]);
-  UBXSerial->write(UBX.UBX_HEADER[1]);
-  for (uint32_t i =0; i<sizeof(UBX.Message.cfgRate); i++) {
-    UBXSerial->write(((uint8_t*)(&UBX.Message.cfgRate))[i]);
-    DEBUG_SENSOR_LOG(PSTR("UBX: cfgRate byte %u: %x"), i, ((uint8_t*)(&UBX.Message.cfgRate))[i]);
-  }
-  UBX.state.log_interval = 10*interval;
-}
-
-void UBXSelectMode(uint16_t mode)
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: set mode to %u"),mode);
-  switch(mode){
-#ifdef USE_FLOG
-    case 0:
-      Flog->mode = 0;
-      break;
-    case 1:
-      Flog->mode = 1;
-      break;
-    case 2:
-      UBX.mode.filter_noise = true;
-      break;
-    case 3:
-      UBX.mode.filter_noise = false;
-      break;
-    case 4:
-      Flog->startRecording(true);
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - appending"));
-      break;
-    case 5:
-      Flog->startRecording(false);
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: start recording - new log"));
-      break;
-    case 6:
-      if(Flog->recording == true){
-        Flog->stopRecording();
-      }
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: stop recording"));
-      break;
-#endif
-    case 7:
-      UBX.mode.send_when_new = 1;
-      break;
-    case 8:
-      UBX.mode.send_when_new = 0;
-      break;
-    case 9:
-      if (timeServer.beginListening()) {
-        UBX.mode.runningNTP = true;
-      }
-      break;
-    case 10:
-      UBX.mode.runningNTP = false;
-      break;
-    case 11:
-      UBX.mode.forceUTCupdate = true;
-      break;
-    case 12:
-      UBX.mode.forceUTCupdate = false;
-      break;
-    case 13:
-      Settings.latitude = UBX.rec_buffer.values.lat/10;
-      Settings.longitude = UBX.rec_buffer.values.lon/10;
-      break;
-    case 14:
-      vPortServer.begin();
-      UBX.mode.runningVPort = 1;
-      break;
-    case 15:
-
-      UBX.mode.runningVPort = 0;
-      break;
-    default:
-      if (mode>1000 && mode <1066) {
-
-        UBXSetRate(mode-1000);
-      }
-      break;
-  }
-  UBX.mode.send_UI_only = true;
-  UBXTriggerTele();
-}
-
-
-
-bool UBXHandlePOSLLH()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: iTOW: %u"),UBX.Message.navPosllh.iTOW);
-  if (UBX.state.gpsFix>1) {
-    if (UBX.mode.filter_noise) {
-      if ((UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat<abs(UBX_LAT_LON_THRESHOLD))||(UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon<abs(UBX_LAT_LON_THRESHOLD))) {
-        DEBUG_SENSOR_LOG(PSTR("UBX: Diff lat: %u lon: %u "),UBX.Message.navPosllh.lat-UBX.rec_buffer.values.lat, UBX.Message.navPosllh.lon-UBX.rec_buffer.values.lon);
-        return false;
-      }
-    }
-    UBX.rec_buffer.values.lat = UBX.Message.navPosllh.lat;
-    UBX.rec_buffer.values.lon = UBX.Message.navPosllh.lon;
-    DEBUG_SENSOR_LOG(PSTR("UBX: lat/lon: %i / %i"), UBX.rec_buffer.values.lat, UBX.rec_buffer.values.lon);
-    DEBUG_SENSOR_LOG(PSTR("UBX: hAcc: %d"), UBX.Message.navPosllh.hAcc);
-    UBX.state.last_iTOW = UBX.Message.navPosllh.iTOW;
-    UBX.state.last_alt = UBX.Message.navPosllh.alt;
-    UBX.state.last_vAcc = UBX.Message.navPosllh.vAcc;
-    UBX.state.last_hAcc = UBX.Message.navPosllh.hAcc;
-    if (UBX.mode.send_when_new) {
-      UBXTriggerTele();
-    }
-    return true;
-  } else {
-    DEBUG_SENSOR_LOG(PSTR("UBX: no valid position data"));
-  }
-  return false;
-}
-
-void UBXHandleSTATUS()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: gpsFix: %u, valid: %u"), UBX.Message.navStatus.gpsFix, (UBX.Message.navStatus.flags)&1);
-  if ((UBX.Message.navStatus.flags)&1) {
-    UBX.state.gpsFix = UBX.Message.navStatus.gpsFix;
-  } else {
-    UBX.state.gpsFix = 0;
-  }
-}
-
-void UBXHandleTIME()
-{
-  DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time: %u-%u-%u %u:%u:%u"), UBX.Message.navTime.year, UBX.Message.navTime.month ,UBX.Message.navTime.day,UBX.Message.navTime.hour,UBX.Message.navTime.min,UBX.Message.navTime.sec);
-  if (UBX.Message.navTime.valid.UTC == 1) {
-    DEBUG_SENSOR_LOG(PSTR("UBX: UTC-Time is valid"));
-    if (Rtc.user_time_entry == false || UBX.mode.forceUTCupdate) {
-      AddLog_P(LOG_LEVEL_INFO, PSTR("UBX: UTC-Time is valid, set system time"));
-      TIME_T gpsTime;
-      gpsTime.year = UBX.Message.navTime.year - 1970;
-      gpsTime.month = UBX.Message.navTime.month;
-      gpsTime.day_of_month = UBX.Message.navTime.day;
-      gpsTime.hour = UBX.Message.navTime.hour;
-      gpsTime.minute = UBX.Message.navTime.min;
-      gpsTime.second = UBX.Message.navTime.sec;
-      Rtc.utc_time = MakeTime(gpsTime);
-      Rtc.user_time_entry = true;
-    }
-  }
-}
-
-void UBXHandleOther(void)
-{
-  if (UBX.state.non_empty_loops>6) {
-    if(UBX.mode.runningVPort) return;
-    UBXinitCFG();
-    AddLog_P(LOG_LEVEL_ERROR, PSTR("UBX: possible device-reset, will re-init"));
-    UBXSerial->flush();
-    UBX.state.non_empty_loops = 0;
-  }
-}
-
-
-
-void UBXLoop50msec(void)
-{
-
-  if (UBX.mode.runningVPort){
-    if(!vPortClient.connected()) {
-      vPortClient = vPortServer.available();
-    }
-    while(vPortClient.available()) {
-      byte _newByte = vPortClient.read();
-      UBXSerial->write(_newByte);
-    }
-
-    if (UBX.TCPbufSize!=0){
-      vPortClient.write((char*)UBX.TCPbuf, UBX.TCPbufSize);
-      UBX.TCPbufSize = 0;
-    }
-  }
-
-  if(UBX.mode.runningNTP){
-    timeServer.processOneRequest(Rtc.utc_time, UBX.state.last_iTOW%1000);
-  }
-}
-
-void UBXLoop(void)
-{
-  static uint16_t counter;
-  static bool new_position;
-
-  uint32_t msgType = UBXprocessGPS();
-
-  switch(msgType){
-    case MT_NAV_POSLLH:
-      new_position = UBXHandlePOSLLH();
-      break;
-    case MT_NAV_STATUS:
-      UBXHandleSTATUS();
-      break;
-    case MT_NAV_TIME:
-      UBXHandleTIME();
-      break;
-    default:
-      UBXHandleOther();
-      break;
-  }
-
-#ifdef USE_FLOG
-  if (counter>UBX.state.log_interval) {
-    if (Flog->recording && new_position) {
-      UBX.rec_buffer.values.time = Rtc.local_time;
-      Flog->addToBuffer(UBX.rec_buffer.bytes, sizeof(UBX.rec_buffer.bytes));
-      counter = 0;
-    }
-  }
-#endif
-
-  counter++;
-}
-
-
-
-
-#ifdef USE_WEBSERVER
-
-
-#ifdef USE_FLOG
-#ifdef DEBUG_TASMOTA_SENSOR
-  const char HTTP_SNS_FLOGVER[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} FLOG with %u sectors: {m}%u bytes{e}"
-                                          "{s} FLOG next sector for REC: {m} %u {e}"
-                                          "{s} %u sector(s) with data at sector: {m} %u {e}";
-  const char HTTP_SNS_FLOGREC[] PROGMEM = "{s} RECORDING (bytes in buffer) {m}%u{e}";
-#endif
-
-  const char HTTP_SNS_FLOG[] PROGMEM = "{s}<hr>{m}<hr>{e}{s} Flash-Log {m} %s{e}";
-  const char kFLOG_STATE0[] PROGMEM = "ready";
-  const char kFLOG_STATE1[] PROGMEM = "recording";
-  const char * kFLOG_STATE[] ={kFLOG_STATE0, kFLOG_STATE1};
-
-  const char HTTP_BTN_FLOG_DL[] PROGMEM = "<button><a href='/UBX'>Download GPX-File</a></button>";
-
-#endif
-  const char HTTP_SNS_NTPSERVER[] PROGMEM = "{s} NTP server {m}active{e}";
-
-  const char HTTP_SNS_GPS[] PROGMEM = "{s} GPS latitude {m}%s{e}"
-                                      "{s} GPS longitude {m}%s{e}"
-                                      "{s} GPS altitude {m}%s   m{e}"
-                                      "{s} GPS hor. Accuracy {m}%s   m{e}"
-                                      "{s} GPS vert. Accuracy {m}%s   m{e}"
-                                      "{s} GPS sat-fix status {m}%s{e}";
-
-  const char kGPSFix0[] PROGMEM = "no fix";
-  const char kGPSFix1[] PROGMEM = "dead reckoning only";
-  const char kGPSFix2[] PROGMEM = "2D-fix";
-  const char kGPSFix3[] PROGMEM = "3D-fix";
-  const char kGPSFix4[] PROGMEM = "GPS + dead reckoning combined";
-  const char kGPSFix5[] PROGMEM = "Time only fix";
-  const char * kGPSFix[] PROGMEM ={kGPSFix0, kGPSFix1, kGPSFix2, kGPSFix3, kGPSFix4, kGPSFix5};
-
-
-
-
-#endif
-
-
-
-void UBXShow(bool json)
-{
-  char lat[12];
-  char lon[12];
-  char alt[12];
-  char hAcc[12];
-  char vAcc[12];
-  dtostrfd((double)UBX.rec_buffer.values.lat/10000000.0f,7,lat);
-  dtostrfd((double)UBX.rec_buffer.values.lon/10000000.0f,7,lon);
-  dtostrfd((double)UBX.state.last_alt/1000.0f,3,alt);
-  dtostrfd((double)UBX.state.last_vAcc/1000.0f,3,hAcc);
-  dtostrfd((double)UBX.state.last_hAcc/1000.0f,3,vAcc);
-
-  if (json) {
-    ResponseAppend_P(PSTR(",\"GPS\":{"));
-    if (UBX.mode.send_UI_only) {
-      uint32_t i = UBX.state.log_interval / 10;
-      ResponseAppend_P(PSTR("\"fil\":%u,\"int\":%u}"), UBX.mode.filter_noise, i);
-    } else {
-      ResponseAppend_P(PSTR("\"lat\":%s,\"lon\":%s,\"alt\":%s,\"hAcc\":%s,\"vAcc\":%s}"), lat, lon, alt, hAcc, vAcc);
-    }
-#ifdef USE_FLOG
-    ResponseAppend_P(PSTR(",\"FLOG\":{\"rec\":%u,\"mode\":%u,\"sec\":%u}"), Flog->recording, Flog->mode, Flog->sectors_left);
-#endif
-    UBX.mode.send_UI_only = false;
-#ifdef USE_WEBSERVER
-  } else {
-      WSContentSend_PD(HTTP_SNS_GPS, lat, lon, alt, hAcc, vAcc, kGPSFix[UBX.state.gpsFix]);
-
-#ifdef DEBUG_TASMOTA_SENSOR
-#ifdef USE_FLOG
-    WSContentSend_PD(HTTP_SNS_FLOGVER, Flog->num_sectors, Flog->size, Flog->current_sector, Flog->sectors_left, Flog->sector.header.physical_start_sector);
-    if (Flog->recording) {
-      WSContentSend_PD(HTTP_SNS_FLOGREC, Flog->sector.header.buf_pointer - 8);
-    }
-#endif
-#endif
-#ifdef USE_FLOG
-    if (Flog->ready) {
-      WSContentSend_P(HTTP_SNS_FLOG,kFLOG_STATE[Flog->recording]);
-    }
-    if (!Flog->recording && Flog->found_saved_data) {
-      WSContentSend_P(HTTP_BTN_FLOG_DL);
-    }
-#endif
-    if (UBX.mode.runningNTP) {
-      WSContentSend_P(HTTP_SNS_NTPSERVER);
-    }
-#endif
-  }
-}
-
-
-
-
-
-bool UBXCmd(void)
-{
-  bool serviced = true;
-  if (XdrvMailbox.data_len > 0) {
-    UBXSelectMode(XdrvMailbox.payload);
-    Response_P(S_JSON_UBX_COMMAND_NVALUE, XdrvMailbox.command, XdrvMailbox.payload);
-  }
-  return serviced;
-}
-
-
-
-
-
-bool Xsns60(uint8_t function)
-{
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    UBXDetect();
-  }
-
-  if (UBX.mode.init) {
-    switch (function) {
-      case FUNC_COMMAND_SENSOR:
-        if (XSNS_60 == XdrvMailbox.index) {
-          result = UBXCmd();
-        }
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        UBXLoop50msec();
-        break;
-      case FUNC_EVERY_100_MSECOND:
-#ifdef USE_FLOG
-        if (!Flog->running_download)
-#endif
-        {
-          UBXLoop();
-        }
-        break;
-#ifdef USE_FLOG
-      case FUNC_WEB_ADD_HANDLER:
-        WebServer->on("/UBX", UBXsendFile);
-        break;
-#endif
-      case FUNC_JSON_APPEND:
-        UBXShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-#ifdef USE_FLOG
-        if (!Flog->running_download)
-#endif
-        {
-          UBXShow(0);
-        }
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-# 38 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-#ifdef USE_SPI
-#ifdef USE_NRF24
-#ifdef USE_MIBLE
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  #define MINRF_LOG_BUFFER(x) MINRFshowBuffer(x);
-#else
-  #define MINRF_LOG_BUFFER(x)
-#endif
-# 56 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-#define XSNS_61 61
-
-#include <vector>
-
-#define FLORA 1
-#define MJ_HT_V1 2
-#define LYWSD02 3
-#define LYWSD03 4
-#define CGG1 5
-
-const uint16_t kMINRFSlaveID[5]={ 0x0098,
-                                  0x01aa,
-                                  0x045b,
-                                  0x055b,
-                                  0x0347
-                                  };
-
-const char kMINRFSlaveType1[] PROGMEM = "Flora";
-const char kMINRFSlaveType2[] PROGMEM = "MJ_HT_V1";
-const char kMINRFSlaveType3[] PROGMEM = "LYWSD02";
-const char kMINRFSlaveType4[] PROGMEM = "LYWSD03";
-const char kMINRFSlaveType5[] PROGMEM = "CGG1";
-const char * kMINRFSlaveType[] PROGMEM = {kMINRFSlaveType1,kMINRFSlaveType2,kMINRFSlaveType3,kMINRFSlaveType4,kMINRFSlaveType5};
-
-
-const uint32_t kMINRFFloPDU[3] = {0x3eaa857d,0xef3b8730,0x71da7b46};
-const uint32_t kMINRFMJPDU[3] = {0x4760cd66,0xdbcc0cd3,0x33048df5};
-const uint32_t kMINRFL2PDU[3] = {0x3eaa057d,0xef3b0730,0x71da7646};
-
-const uint32_t kMINRFL3PDU[3] = {0x4760cb78,0xdbcc0acd,0x33048beb};
-const uint32_t kMINRFCGPDU[3] = {0x4760cd6e,0xdbcc0cdb,0x33048dfd};
-
-
-const uint8_t kMINRFlsfrList_A[3] = {0x4b,0x17,0x23};
-const uint8_t kMINRFlsfrList_B[3] = {0x21,0x72,0x43};
-
-
-#pragma pack(1)
-struct MJ_HT_V1Header_t {
-  uint8_t padding[3];
-  uint8_t mesSize;
-  uint8_t padding2;
-  uint16_t uuid;
-  uint16_t type;
-  uint8_t padding3[2];
-  uint8_t counter;
-  uint8_t serial[6];
-  uint8_t mode;
-  uint8_t padding5;
-  uint8_t effectiveDataLength;
-  };
-
-struct FlowerHeader_t {
-  uint8_t padding[4];
-  uint8_t padding2;
-  uint16_t uuid;
-  uint8_t mesSize;
-  uint8_t padding22;
-  uint16_t uuid2;
-  uint16_t type;
-  uint8_t padding3[2];
-  uint8_t counter;
-  uint8_t serial[6];
-  uint8_t padding4;
-  uint8_t mode;
-  };
-
-union floraPacket_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } T;
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint32_t data:24;
-  } L;
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint8_t data;
-  } M;
-  struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } F;
-};
-
-union MJ_HT_V1Packet_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t temp;
-      uint16_t hum;
-  } TH;
-      struct {
-      uint8_t padding[3];
-      uint8_t serial[6];
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint8_t battery;
-  } B;
-
-};
-
-union LYWSD02Packet_t {
-  struct {
-      uint16_t idWord;
-      uint8_t padding;
-      uint8_t serial[6];
-      uint8_t padding4;
-      uint8_t mode;
-      uint8_t valueTen;
-      uint8_t effectiveDataLength;
-      uint16_t data;
-  } TH;
-};
-
-struct bleAdvPacket_t {
-  uint8_t pduType;
-  uint8_t payloadSize;
-  uint8_t mac[6];
-  union {
-    uint8_t payload[24];
-    MJ_HT_V1Header_t header;
-    FlowerHeader_t flowerHeader;
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-        uint8_t hum_lb;
-    } TH;
-    struct {
-        uint8_t padding[21];
-        uint16_t temp;
-    } T;
-    struct {
-        uint8_t padding[21];
-        uint16_t hum;
-    } H;
-    struct {
-        uint8_t padding[21];
-        uint8_t battery;
-    } B;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-    } F_T;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-        uint8_t data2;
-    } F_L;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint8_t data;
-    } F_M;
-    struct {
-        uint8_t padding[2];
-        uint8_t mode;
-        uint16_t size;
-        uint16_t data;
-    } F_F;
-  };
-};
-
-union FIFO_t{
-  bleAdvPacket_t bleAdv;
-  floraPacket_t floraPacket;
-  MJ_HT_V1Packet_t MJ_HT_V1Packet;
-  LYWSD02Packet_t LYWSD02Packet;
-  uint8_t raw[32];
-};
-
-#pragma pack(0)
-
-struct {
-  const uint8_t channel[3] = {37,38,39};
-  const uint8_t frequency[3] = { 2,26,80};
-
-  uint16_t timer;
-  uint8_t currentChan=0;
-  FIFO_t buffer;
-  uint8_t packetMode;
-
-#ifdef DEBUG_TASMOTA_SENSOR
-  uint8_t streamBuffer[sizeof(buffer)];
-  uint8_t lsfrBuffer[sizeof(buffer)];
-#endif
-
-} MINRF;
-
-struct mi_sensor_t{
-  uint8_t type;
-  uint8_t serial[6];
-  uint8_t showedUp;
-  float temp;
-  union {
-    struct {
-      float moisture;
-      float fertility;
-      uint32_t lux;
-    };
-    struct {
-      float hum;
-      uint8_t bat;
-    };
-  };
-};
-
-std::vector<mi_sensor_t> MIBLEsensors;
-
-
-
-
-bool MINRFinitBLE(uint8_t _mode)
-{
-  if (MINRF.timer%1000 == 0){
-    NRF24radio.begin(pin[GPIO_SPI_CS],pin[GPIO_SPI_DC]);
-    NRF24radio.setAutoAck(false);
-    NRF24radio.setDataRate(RF24_1MBPS);
-    NRF24radio.disableCRC();
-    NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
-    NRF24radio.setRetries(0,0);
-    NRF24radio.setPALevel(RF24_PA_MIN);
-    NRF24radio.setAddressWidth(4);
-
-
-    NRF24radio.powerUp();
-  }
-  if(NRF24radio.isChipConnected()){
-
-    MINRFchangePacketModeTo(_mode);
-    return true;
-  }
-
-  return false;
-}
-
-void MINRFhopChannel()
-{
-  MINRF.currentChan++;
-  if(MINRF.currentChan >= sizeof(MINRF.channel)) {
-    MINRF.currentChan = 0;
-  }
-  NRF24radio.setChannel( MINRF.frequency[MINRF.currentChan] );
-}
-
-
-
-
-
-
-
-bool MINRFreceivePacket(void)
-{
-  if(!NRF24radio.available()) {
-    return false;
-  }
-  while(NRF24radio.available()) {
-
-
-    NRF24radio.read( &MINRF.buffer, sizeof(MINRF.buffer) );
-#ifdef DEBUG_TASMOTA_SENSOR
-    memcpy(&MINRF.streamBuffer, &MINRF.buffer, sizeof(MINRF.buffer));
-#endif
-    MINRFswapbuf( sizeof(MINRF.buffer) );
-
-
-
-    switch (MINRF.packetMode) {
-      case 0:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), MINRF.channel[MINRF.currentChan] | 0x40);
-      break;
-      case 1:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
-      break;
-      case 2:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
-      break;
-      case 3:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_A[MINRF.currentChan]);
-      break;
-      case 4:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
-      break;
-      case 5:
-      MINRFwhiten((uint8_t *)&MINRF.buffer, sizeof(MINRF.buffer), kMINRFlsfrList_B[MINRF.currentChan]);
-      break;
-    }
-
-
-  }
-
-  return true;
-}
-
-#ifdef DEBUG_TASMOTA_SENSOR
-void MINRFshowBuffer(uint8_t (&buf)[32]){
-
-
-
-
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Buffer: %02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x "
-                                        "%02x %02x %02x %02x %02x %02x %02x %02x ")
-  ,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],buf[8],buf[9],buf[10],buf[11],
-  buf[12],buf[13],buf[14],buf[15],buf[16],buf[17],buf[18],buf[19],buf[20],buf[21],buf[22],buf[23],
-  buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30],buf[31]
-  );
-}
-#endif
-
-
-
-
-
-
-void MINRFswapbuf(uint8_t len)
-{
-  uint8_t* buf = (uint8_t*)&MINRF.buffer;
-  while(len--) {
-    uint8_t a = *buf;
-    uint8_t v = 0;
-    if (a & 0x80) v |= 0x01;
-    if (a & 0x40) v |= 0x02;
-    if (a & 0x20) v |= 0x04;
-    if (a & 0x10) v |= 0x08;
-    if (a & 0x08) v |= 0x10;
-    if (a & 0x04) v |= 0x20;
-    if (a & 0x02) v |= 0x40;
-    if (a & 0x01) v |= 0x80;
-    *(buf++) = v;
-  }
-}
-# 430 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-void MINRFwhiten(uint8_t *buf, uint8_t len, uint8_t lfsr)
-{
-  while(len--) {
-    uint8_t res = 0;
-
-    for (uint8_t i = 1; i; i <<= 1) {
-      if (lfsr & 0x01) {
-        lfsr ^= 0x88;
-        res |= i;
-      }
-      lfsr >>= 1;
-    }
-    *(buf++) ^= res;
-#ifdef DEBUG_TASMOTA_SENSOR
-    MINRF.lsfrBuffer[31-len] = lfsr;
-#endif
-  }
-}
-
-void MINRFreverseMAC(uint8_t _mac[]){
-  uint8_t _reversedMAC[6];
-  for (uint8_t i=0; i<6; i++){
-    _reversedMAC[5-i] = _mac[i];
-  }
-  memcpy(_mac,_reversedMAC, sizeof(_reversedMAC));
-}
-
-
-
-
-
-
-void MINRFchangePacketModeTo(uint8_t _mode) {
-  uint32_t (_nextchannel) = MINRF.currentChan+1;
-  if (_nextchannel>2) _nextchannel=0;
-
-  switch(_mode){
-    case 0:
-      NRF24radio.openReadingPipe(0,0x6B7D9171);
-    break;
-    case 1:
-      NRF24radio.openReadingPipe(0,kMINRFFloPDU[_nextchannel]);
-    break;
-    case 2:
-      NRF24radio.openReadingPipe(0,kMINRFMJPDU[_nextchannel]);
-    break;
-    case 3:
-      NRF24radio.openReadingPipe(0,kMINRFL2PDU[_nextchannel]);
-    break;
-    case 4:
-      if(kMINRFL3PDU[_nextchannel]==0xffffffff) break;
-      NRF24radio.openReadingPipe(0,kMINRFL3PDU[_nextchannel]);
-    break;
-    case 5:
-      NRF24radio.openReadingPipe(0,kMINRFCGPDU[_nextchannel]);
-    break;
-  }
-
-  MINRF.packetMode = _mode;
-}
-# 498 "S:/Development/Tasmota/tasmota/xsns_61_MI_NRF24.ino"
-uint32_t MINRFgetSensorSlot(uint8_t (&_serial)[6], uint16_t _type){
-
-  DEBUG_SENSOR_LOG(PSTR("MINRF: will test ID-type: %x"), _type);
-  bool _success = false;
-  for (uint32_t i=0;i<5;i++){
-    if(_type == kMINRFSlaveID[i]){
-      DEBUG_SENSOR_LOG(PSTR("MINRF: ID is type %u"), i);
-      _type = i+1;
-      _success = true;
-    }
-    else {
-      DEBUG_SENSOR_LOG(PSTR("MINRF: ID-type is not: %x"),kMINRFSlaveID[i]);
-    }
-  }
-  if(!_success) return 0xff;
-
-  DEBUG_SENSOR_LOG(PSTR("MINRF: vector size %u"), MIBLEsensors.size());
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
-      DEBUG_SENSOR_LOG(PSTR("MINRF: known sensor at slot: %u"), i);
-      if(MIBLEsensors.at(i).showedUp < 3){
-        MIBLEsensors.at(i).showedUp++;
-      }
-      return i;
-    }
-    DEBUG_SENSOR_LOG(PSTR("MINRF i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[5], MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[0]);
-    DEBUG_SENSOR_LOG(PSTR("MINRF n: %x %x %x %x %x %x"), _serial[5], _serial[4], _serial[3],_serial[2],_serial[1],_serial[0]);
-  }
-  DEBUG_SENSOR_LOG(PSTR("MINRF: found new sensor"));
-  mi_sensor_t _newSensor;
-  memcpy(_newSensor.serial,_serial, sizeof(_serial));
-  _newSensor.type = _type;
-  _newSensor.showedUp = 1;
-  _newSensor.temp =-1000.0f;
-  switch (_type)
-    {
-    case 1:
-      _newSensor.moisture =-1000.0f;
-      _newSensor.fertility =-1000.0f;
-      _newSensor.lux = 0x00ffffff;
-      break;
-    case 2: case 3: case 4:
-      _newSensor.hum=-1.0f;
-      _newSensor.bat=0xff;
-      break;
-    default:
-      break;
-    }
-  MIBLEsensors.push_back(_newSensor);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: new sensor at slot: %u"), MIBLEsensors.size()-1);
-  return MIBLEsensors.size()-1;
-};
-
-
-
-
-
-
-void MINRFpurgeFakeSensors(void){
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(MIBLEsensors.at(i).showedUp<3){
-      DEBUG_SENSOR_LOG(PSTR("MINRF: remove FAKE sensor at slot: %u"), i);
-      MIBLEsensors.erase(MIBLEsensors.begin()+i);
-    }
-  }
-}
-
-
-void MINRFhandleFloraPacket(void){
-  if(MINRF.buffer.floraPacket.T.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected Flora packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.floraPacket.T.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.floraPacket.T.serial, MINRF.buffer.floraPacket.T.idWord);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.floraPacket.L.mode) {
-    case 4:
-    _tempFloat=(float)(MINRF.buffer.floraPacket.T.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 4: U16:  %x Temp"), MINRF.buffer.floraPacket.T.data );
-    break;
-    case 7:
-    if(true){
-        MIBLEsensors.at(_slot).lux=MINRF.buffer.floraPacket.L.data;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 7: U24: %x Lux"), MINRF.buffer.floraPacket.L.data);
-    break;
-    case 8:
-    _tempFloat =(float)MINRF.buffer.floraPacket.M.data;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).moisture=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Flora: Mode 8: U8: %x Moisture"), MINRF.buffer.floraPacket.M.data);
-    break;
-    case 9:
-    _tempFloat=(float)(MINRF.buffer.floraPacket.F.data);
-    if(_tempFloat<65535){
-        MIBLEsensors.at(_slot).fertility=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("Mode 9: U16: %x Fertility"), MINRF.buffer.floraPacket.F.data);
-    break;
-  }
-}
-
-void MINRFhandleMJ_HT_V1Packet(void){
-  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected MJ_HT_V1-packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
-    case 0x0d:
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: temp updated"));
-    }
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).hum = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: hum updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
-    break;
-    case 0x0a:
-    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
-        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
-        DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1: bat updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("MJ_HT_V1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
-    break;
-  }
-}
-
-void MINRFhandleLYWSD02Packet(void){
-  if(MINRF.buffer.LYWSD02Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected LYWSD02-packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.LYWSD02Packet.TH.mode) {
-    case 4:
-    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 4: U16:  %x Temp"), MINRF.buffer.LYWSD02Packet.TH.data );
-    break;
-    case 6:
-    _tempFloat=(float)(MINRF.buffer.LYWSD02Packet.TH.data)/10.0f;
-    if(_tempFloat<101){
-        MIBLEsensors.at(_slot).hum=_tempFloat;
-    }
-    DEBUG_SENSOR_LOG(PSTR("LYWSD02: Mode 6: U16:  %x Hum"), MINRF.buffer.LYWSD02Packet.TH.data );
-    break;
-  }
-}
-
-void MINRFhandleLYWSD03Packet(void){
-
-  MINRFreverseMAC(MINRF.buffer.LYWSD02Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.LYWSD02Packet.TH.serial, MINRF.buffer.LYWSD02Packet.TH.idWord);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-    if(_slot==0xff) return;
-
-  MINRF_LOG_BUFFER(MINRF.streamBuffer);
-  MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
-  MINRF_LOG_BUFFER(MINRF.buffer.raw);
-}
-
-void MINRFhandleCGG1Packet(void){
-  if(MINRF.buffer.MJ_HT_V1Packet.TH.valueTen!=0x10){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: unexpected CGG1-packet"));
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    return;
-  }
-  MINRFreverseMAC(MINRF.buffer.MJ_HT_V1Packet.TH.serial);
-  uint32_t _slot = MINRFgetSensorSlot(MINRF.buffer.MJ_HT_V1Packet.TH.serial, MINRF.buffer.MJ_HT_V1Packet.TH.idWord);
-  DEBUG_SENSOR_LOG(PSTR("MINRF: Sensor slot: %u"), _slot);
-  if(_slot==0xff) return;
-
-  static float _tempFloat;
-  switch(MINRF.buffer.MJ_HT_V1Packet.TH.mode) {
-    case 0x0d:
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.temp)/10.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("CGG1: temp updated"));
-    }
-    _tempFloat=(float)(MINRF.buffer.MJ_HT_V1Packet.TH.hum)/10.0f;
-    if(_tempFloat<100){
-        MIBLEsensors.at(_slot).hum = _tempFloat;
-        DEBUG_SENSOR_LOG(PSTR("CGG1: hum updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0d: U16:  %x Temp U16: %x Hum"), MINRF.buffer.MJ_HT_V1Packet.TH.temp, MINRF.buffer.MJ_HT_V1Packet.TH.hum);
-    break;
-    case 0x0a:
-    if(MINRF.buffer.MJ_HT_V1Packet.B.battery<101){
-        MIBLEsensors.at(_slot).bat = MINRF.buffer.MJ_HT_V1Packet.B.battery;
-        DEBUG_SENSOR_LOG(PSTR("CGG1: bat updated"));
-    }
-    DEBUG_SENSOR_LOG(PSTR("CGG1 mode:0x0a: U8: %x %%"), MINRF.buffer.MJ_HT_V1Packet.B.battery);
-    break;
-  }
-}
-
-
-
-
-
-void MINRF_EVERY_50_MSECOND() {
-
-  if(MINRF.timer>6000){
-    DEBUG_SENSOR_LOG(PSTR("MINRF: check for FAKE sensors"));
-    MINRFpurgeFakeSensors();
-    MINRF.timer=0;
-  }
-  MINRF.timer++;
-
-  if (!MINRFreceivePacket()){
-
-  }
-
-  else if(MINRF.buffer.bleAdv.header.uuid==0xfe95){
-    MINRF_LOG_BUFFER(MINRF.streamBuffer);
-    MINRF_LOG_BUFFER(MINRF.lsfrBuffer);
-    MINRF_LOG_BUFFER(MINRF.buffer.raw);
-    DEBUG_SENSOR_LOG(PSTR("MINRF: Type: %x"), MINRF.buffer.bleAdv.header.type);
-    switch(MINRF.buffer.bleAdv.header.type){
-      case 0x2050:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: MJ_HT_V1 Packet"));
-      break;
-      case 0x1613:case 0x1614:case 0x1615:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: Flora Packet"));
-      break;
-      default:
-      DEBUG_SENSOR_LOG(PSTR("MINRF: unknown Packet"));
-      break;
-    }
-  }
-  else if (MINRF.packetMode == FLORA){
-    MINRFhandleFloraPacket();
-  }
-  else if (MINRF.packetMode == MJ_HT_V1){
-    MINRFhandleMJ_HT_V1Packet();
-  }
-  else if (MINRF.packetMode == LYWSD02){
-    MINRFhandleLYWSD02Packet();
-  }
-  else if (MINRF.packetMode == LYWSD03){
-    MINRFhandleLYWSD03Packet();
-  }
-  else if (MINRF.packetMode == CGG1){
-    MINRFhandleCGG1Packet();
-  }
-  if (MINRF.packetMode == CGG1){
-    MINRFinitBLE(1);
-  }
-  else {
-    MINRFinitBLE(++MINRF.packetMode);
-  }
-
-  MINRFhopChannel();
-  NRF24radio.startListening();
-}
-
-
-
-
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
-const char HTTP_MINRF_MAC[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-const char HTTP_MINRF_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
-const char HTTP_MINRF_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
-
-void MINRFShow(bool json)
-{
-  if (json) {
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      if(MIBLEsensors.at(i).showedUp < 3){
-        DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
-        break;
-        }
-      char slave[33];
-      sprintf_P(slave,"%s-%02x%02x%02x",kMINRFSlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-
-      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          char lux[33];
-          char moisture[33];
-          char fertility[33];
-          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
-          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
-          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
-          }
-        }
-        ResponseAppend_P(PSTR("}"));
-    }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_NRF24, NRF24type, NRF24.chipType);
-      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        if(MIBLEsensors.at(i).showedUp < 3){
-          DEBUG_SENSOR_LOG(PSTR("MINRF: sensor not fully registered yet"));
-          break;
-          }
-        WSContentSend_PD(HTTP_MINRF_HL);
-        WSContentSend_PD(HTTP_MINRF_MAC, kMINRFSlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-          WSContentSend_PD(HTTP_SNS_TEMP, kMINRFSlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          if(MIBLEsensors.at(i).lux!=0x00ffffff){
-            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_MOISTURE, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            char fertility[33];
-            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-            WSContentSend_PD(HTTP_MINRF_FLORA_DATA, kMINRFSlaveType[MIBLEsensors.at(i).type-1], fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-            char humidity[33];
-            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-            WSContentSend_PD(HTTP_SNS_HUM, kMINRFSlaveType[MIBLEsensors.at(i).type-1], humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            WSContentSend_PD(HTTP_BATTERY, kMINRFSlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
-          }
-        }
-      }
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns61(uint8_t function)
-{
-  bool result = false;
-
-  if (NRF24.chipType) {
-    switch (function) {
-      case FUNC_INIT:
-        MINRFinitBLE(1);
-        AddLog_P2(LOG_LEVEL_INFO,PSTR("MINRF: started"));
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        MINRF_EVERY_50_MSECOND();
-        break;
-      case FUNC_JSON_APPEND:
-        MINRFShow(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        MINRFShow(0);
-        break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-# 30 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-#ifdef USE_HM10
-
-#define XSNS_62 62
-
-#include <TasmotaSerial.h>
-#include <vector>
-
-TasmotaSerial *HM10Serial;
-#define HM10_BAUDRATE 115200
-
-#define HM10_MAX_TASK_NUMBER 12
-uint8_t HM10_TASK_LIST[HM10_MAX_TASK_NUMBER+1][2];
-
-#define HM10_MAX_RX_BUF 512
-char HM10_RX_STRING[HM10_MAX_RX_BUF] = {0};
-
-struct {
-  uint8_t current_task_delay;
-  uint8_t last_command;
-  uint16_t firmware;
-  uint32_t period;
-  uint32_t serialSpeed;
-  union {
-    uint32_t time;
-    uint8_t timebuf[4];
-  };
-  struct {
-    uint32_t init:1;
-    uint32_t pending_task:1;
-    uint32_t connected:1;
-    uint32_t subscribed:1;
-    uint32_t awaitingHT:1;
-    uint32_t awaitingB:1;
-
-  } mode;
-  struct {
-    uint8_t sensor;
-
-  } state;
-} HM10;
-
-#pragma pack(1)
-struct {
-  uint16_t temp;
-  uint8_t hum;
-} LYWSD0x_HT;
-#pragma pack(0)
-
-struct mi_sensor_t{
-  uint8_t type;
-  uint8_t serial[6];
-  uint8_t showedUp;
-  float temp;
-  union {
-    struct {
-      float moisture;
-      float fertility;
-      uint16_t lux;
-    };
-    struct {
-      float hum;
-      uint8_t bat;
-    };
-  };
-};
-
-std::vector<mi_sensor_t> MIBLEsensors;
-
-
-
-
-
-#define D_CMND_HM10 "HM10"
-
-const char S_JSON_HM10_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_HM10 "%s\":%d}";
-const char S_JSON_HM10_COMMAND[] PROGMEM = "{\"" D_CMND_HM10 "%s%s\"}";
-const char kHM10_Commands[] PROGMEM = "Scan|AT|Period|Baud|Time";
-
-#define FLORA 1
-#define MJ_HT_V1 2
-#define LYWSD02 3
-#define LYWSD03MMC 4
-
-uint8_t kHM10SlaveID[4][3] = { 0xC4,0x7C,0x8D,
-                                0x58,0x2D,0x34,
-                                0xE7,0x2E,0x00,
-                                0xA4,0xC1,0x38,
-                                };
-
-const char kHM10SlaveType1[] PROGMEM = "Flora";
-const char kHM10SlaveType2[] PROGMEM = "MJ_HT_V1";
-const char kHM10SlaveType3[] PROGMEM = "LYWSD02";
-const char kHM10SlaveType4[] PROGMEM = "LYWSD03";
-const char * kHM10SlaveType[] PROGMEM = {kHM10SlaveType1,kHM10SlaveType2,kHM10SlaveType3,kHM10SlaveType4};
-
-
-
-
-
-enum HM10_Commands {
-  CMND_HM10_DISC_SCAN,
-  CMND_HM10_AT,
-  CMND_HM10_PERIOD,
-  CMND_HM10_BAUD,
-  CMND_HM10_TIME
-  };
-
-
-
-
-
-#define TASK_HM10_NOTASK 0
-#define TASK_HM10_ROLE1 1
-#define TASK_HM10_IMME1 2
-#define TASK_HM10_RENEW 3
-#define TASK_HM10_RESET 4
-#define TASK_HM10_DISC 5
-#define TASK_HM10_CONN 6
-#define TASK_HM10_VERSION 7
-#define TASK_HM10_NAME 8
-#define TASK_HM10_FEEDBACK 9
-#define TASK_HM10_DISCONN 10
-#define TASK_HM10_SUB_L3 11
-#define TASK_HM10_READ_HT 12
-#define TASK_HM10_FINDALLCHARS 13
-#define TASK_HM10_UN_L3 14
-#define TASK_HM10_DELAY_SUB 15
-#define TASK_HM10_READ_BT_L3 16
-#define TASK_HM10_SUB_L2 17
-#define TASK_HM10_UN_L2 18
-#define TASK_HM10_READ_BT_L2 19
-#define TASK_HM10_TIME_L2 20
-
-#define TASK_HM10_DONE 99
-
-
-
-
-
-void HM10_Launchtask(uint8_t task, uint8_t slot, uint8_t delay){
-                          HM10_TASK_LIST[slot][0] = task;
-                          HM10_TASK_LIST[slot][1] = delay;
-                          HM10_TASK_LIST[slot+1][0] = TASK_HM10_NOTASK;
-                          HM10.current_task_delay = HM10_TASK_LIST[0][1];
-}
-
-void HM10_TaskReplaceInSlot(uint8_t task, uint8_t slot){
-                          HM10.last_command = HM10_TASK_LIST[slot][0];
-                          HM10_TASK_LIST[slot][0] = task;
-}
-
-
-
-
-
-void HM10_Reset(void) { HM10_Launchtask(TASK_HM10_DISCONN,0,1);
-                          HM10_Launchtask(TASK_HM10_ROLE1,1,1);
-                          HM10_Launchtask(TASK_HM10_IMME1,2,1);
-                          HM10_Launchtask(TASK_HM10_RESET,3,1);
-                          HM10_Launchtask(TASK_HM10_VERSION,4,10);
-                          HM10_Launchtask(TASK_HM10_DISC,5,50);
-                          }
-
-void HM10_Discovery_Scan(void) {
-                          HM10_Launchtask(TASK_HM10_DISCONN,0,1);
-                          HM10_Launchtask(TASK_HM10_DISC,1,1);
-                          }
-
-void HM10_Read_LYWSD03(void) {
-                          HM10_Launchtask(TASK_HM10_CONN,0,1);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
-                          HM10_Launchtask(TASK_HM10_SUB_L3,2,20);
-                          HM10_Launchtask(TASK_HM10_UN_L3,3,80);
-                          HM10_Launchtask(TASK_HM10_READ_BT_L3,4,5);
-                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
-                          }
-
-void HM10_Read_LYWSD02(void) {
-                          HM10_Launchtask(TASK_HM10_CONN,0,1);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,1,35);
-                          HM10_Launchtask(TASK_HM10_SUB_L2,2,20);
-                          HM10_Launchtask(TASK_HM10_UN_L2,3,80);
-                          HM10_Launchtask(TASK_HM10_READ_BT_L2,4,5);
-                          HM10_Launchtask(TASK_HM10_DISCONN,5,5);
-                          }
-
-void HM10_Time_LYWSD02(void) {
-                          HM10_Launchtask(TASK_HM10_DISCONN,0,0);
-                          HM10_Launchtask(TASK_HM10_CONN,1,5);
-                          HM10_Launchtask(TASK_HM10_FEEDBACK,2,35);
-                          HM10_Launchtask(TASK_HM10_TIME_L2,3,20);
-                          HM10_Launchtask(TASK_HM10_DISCONN,4,5);
-                          }
-# 231 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-uint32_t MIBLEgetSensorSlot(uint8_t (&_serial)[6], uint8_t _type){
-  if(_type==0xff){
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: will test MAC-type"));
-    for (uint32_t i=0;i<4;i++){
-      if(memcmp(_serial,kHM10SlaveID+i,3)==0){
-        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC is type %u"), i);
-        _type = i+1;
-      }
-      else {
-        DEBUG_SENSOR_LOG(PSTR("MIBLE: MAC-type is unknown"));
-      }
-    }
-  }
-  if(_type==0xff) return _type;
-
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: vector size %u"), MIBLEsensors.size());
-  for(uint32_t i=0; i<MIBLEsensors.size(); i++){
-    if(memcmp(_serial,MIBLEsensors.at(i).serial,sizeof(_serial))==0){
-      DEBUG_SENSOR_LOG(PSTR("MIBLE: known sensor at slot: %u"), i);
-      if(MIBLEsensors.at(i).showedUp < 3){
-        MIBLEsensors.at(i).showedUp++;
-      }
-      return i;
-    }
-    DEBUG_SENSOR_LOG(PSTR("MIBLE i: %x %x %x %x %x %x"), MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-    DEBUG_SENSOR_LOG(PSTR("MIBLE n: %x %x %x %x %x %x"), _serial[0], _serial[1], _serial[2],_serial[3],_serial[4],_serial[5]);
-  }
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: found new sensor"));
-  mi_sensor_t _newSensor;
-  memcpy(_newSensor.serial,_serial, sizeof(_serial));
-  _newSensor.type = _type;
-  _newSensor.showedUp = 1;
-  _newSensor.temp =-1000.0f;
-  switch (_type)
-    {
-    case 1:
-      _newSensor.moisture =-1000.0f;
-      _newSensor.fertility =-1000.0f;
-      _newSensor.lux = 0xffff;
-      break;
-    case 2: case 3: case 4:
-      _newSensor.hum=-1.0f;
-      _newSensor.bat=0xff;
-      break;
-    default:
-      break;
-    }
-  MIBLEsensors.push_back(_newSensor);
-  DEBUG_SENSOR_LOG(PSTR("MIBLE: new sensor at slot: %u"), MIBLEsensors.size()-1);
-  return MIBLEsensors.size()-1;
-};
-
-
-
-
-
-
-
-void HM10SerialInit(void) {
-  HM10.mode.init = false;
-  HM10.serialSpeed = HM10_BAUDRATE;
-  HM10Serial = new TasmotaSerial(pin[GPIO_HM10_RX], pin[GPIO_HM10_TX], 1, 0, HM10_MAX_RX_BUF);
-  if (HM10Serial->begin(HM10.serialSpeed)) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start serial communication fixed to 115200 baud"),D_CMND_HM10);
-    if (HM10Serial->hardwareSerial()) {
-      ClaimSerial();
-      DEBUG_SENSOR_LOG(PSTR("HM10: claim HW"));
-    }
-    HM10_Reset();
-    HM10.mode.pending_task = 1;
-    HM10.mode.init = 1;
-    HM10.period = Settings.tele_period;
-    DEBUG_SENSOR_LOG(PSTR("%s_TASK_LIST initialized, now return to main loop"),D_CMND_HM10);
-  }
-  return;
-}
-# 315 "S:/Development/Tasmota/tasmota/xsns_62_MI_HM10.ino"
-void HM10MACStringToBytes(const char* string, uint8_t _mac[]) {
-    uint32_t index = 0;
-    while (index < 12) {
-        char c = string[index];
-        uint32_t value = 0;
-        if(c >= '0' && c <= '9')
-          value = (c - '0');
-        else if (c >= 'A' && c <= 'F')
-          value = (10 + (c - 'A'));
-        _mac[(index/2)] += value << (((index + 1) % 2) * 4);
-
-        index++;
-    }
-    DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_mac[0],_mac[1],_mac[2],_mac[3],_mac[4],_mac[5]);
-}
-
-
-
-
-
-
-void HM10ParseResponse(char *buf) {
-    if (!strncmp(buf,"OK",2)) {
-       DEBUG_SENSOR_LOG(PSTR("HM10: got OK"));
-     }
-    if (!strncmp(buf,"HMSoft",6)) {
-      const char* _fw = "000";
-      memcpy((void *)_fw,(void *)(buf+8),3);
-      HM10.firmware = atoi(_fw);
-      DEBUG_SENSOR_LOG(PSTR("HM10: Firmware: %d"), HM10.firmware);
-      return;
-     }
-    char * _pos = strstr(buf, "IS0:");
-    if(_pos) {
-      const char* _mac = "000000000000";
-      memcpy((void *)_mac,(void *)(_pos+4),12);
-      DEBUG_SENSOR_LOG(PSTR("HM10: found Mac: %s"), _mac);
-      uint8_t _newMacArray[6] = {0};
-      HM10MACStringToBytes(_mac, _newMacArray);
-      DEBUG_SENSOR_LOG(PSTR("HM10:  MAC-array: %x%x%x%x%x%x"),_newMacArray[0],_newMacArray[1],_newMacArray[2],_newMacArray[3],_newMacArray[4],_newMacArray[5]);
-      MIBLEgetSensorSlot(_newMacArray, 0xff);
-    }
-    if (strstr(buf, "LOST")){
-      HM10.mode.connected = false;
-    }
-    else {
-      DEBUG_SENSOR_LOG(PSTR("HM10: empty response"));
-    }
-}
-
-void HM10readTempHum(char *_buf){
-  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
-  if(_buf[0] != 0 && _buf[1] != 0){
-    memcpy(&LYWSD0x_HT,(void *)_buf,3);
-    DEBUG_SENSOR_LOG(PSTR("HM10: Temperature * 100: %u, Humidity: %u"),LYWSD0x_HT.temp,LYWSD0x_HT.hum);
-    uint32_t _slot = HM10.state.sensor;
-
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-    static float _tempFloat;
-    _tempFloat=(float)(LYWSD0x_HT.temp)/100.0f;
-    if(_tempFloat<60){
-        MIBLEsensors.at(_slot).temp=_tempFloat;
-        HM10.mode.awaitingHT = false;
-        HM10.current_task_delay = 0;
-    }
-    _tempFloat=(float)LYWSD0x_HT.hum;
-    if(_tempFloat<100){
-      MIBLEsensors.at(_slot).hum = _tempFloat;
-      DEBUG_SENSOR_LOG(PSTR("LYWSD03: hum updated"));
-    }
-  }
-}
-
-bool HM10readBat(char *_buf){
-  DEBUG_SENSOR_LOG(PSTR("HM10: raw data: %x%x%x%x%x%x%x"),_buf[0],_buf[1],_buf[2],_buf[3],_buf[4],_buf[5],_buf[6]);
-  if(_buf[0] != 0){
-    DEBUG_SENSOR_LOG(PSTR("HM10: Battery: %u"),_buf[0]);
-    uint32_t _slot = HM10.state.sensor;
-    DEBUG_SENSOR_LOG(PSTR("MIBLE: Sensor slot: %u"), _slot);
-    if(_buf[0]<101){
-        MIBLEsensors.at(_slot).bat=_buf[0];
-        return true;
-    }
-  }
-  return false;
-}
-
-
-
-
-
-bool HM10SerialHandleFeedback(){
-  bool success = false;
-  uint32_t i = 0;
-  char ret[HM10_MAX_RX_BUF] = {0};
-
-
-  while(HM10Serial->available()) {
-
-    if(i<HM10_MAX_RX_BUF){
-      ret[i] = HM10Serial->read();
-    }
-    i++;
-    success = true;
-  }
-  if(HM10.mode.awaitingHT) {
-    if (HM10.mode.connected) HM10readTempHum(ret);
-  }
-  else if(HM10.mode.awaitingB) {
-    if (HM10.mode.connected) {
-      if (HM10readBat(ret)){
-        HM10.mode.awaitingB = false;
-        HM10.current_task_delay = 0;
-      }
-    }
-  }
-  else if(success) {
-    AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s response: %s"),D_CMND_HM10, (char *)ret);
-    HM10ParseResponse(ret);
-  }
-  else {
-
-  }
-  return success;
-}
-
-
-
-
-
-void HM10_TaskEvery100ms(){
-  if (HM10.current_task_delay == 0) {
-    uint8_t i = 0;
-    bool runningTaskLoop = true;
-    while (runningTaskLoop) {
-      switch(HM10_TASK_LIST[i][0]) {
-        case TASK_HM10_ROLE1:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set role to 1"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+ROLE1");
-          break;
-        case TASK_HM10_IMME1:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set imme to 1"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+IMME1");
-          break;
-        case TASK_HM10_DISC:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start discovery"),D_CMND_HM10);
-          HM10.current_task_delay = 35;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+DISC?");
-          break;
-        case TASK_HM10_VERSION:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read version"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+VERR?");
-          break;
-        case TASK_HM10_NAME:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read name"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NAME?");
-          break;
-        case TASK_HM10_CONN:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s connect"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          char _con[20];
-          sprintf_P(_con,"AT+CON%02x%02x%02x%02x%02x%02x",MIBLEsensors.at(HM10.state.sensor).serial[0],MIBLEsensors.at(HM10.state.sensor).serial[1],MIBLEsensors.at(HM10.state.sensor).serial[2],MIBLEsensors.at(HM10.state.sensor).serial[3],MIBLEsensors.at(HM10.state.sensor).serial[4],MIBLEsensors.at(HM10.state.sensor).serial[5]);
-          HM10Serial->write(_con);
-          HM10.mode.awaitingB = false;
-          HM10.mode.connected = true;
-          break;
-        case TASK_HM10_DISCONN:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s disconnect"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT");
-          break;
-        case TASK_HM10_RESET:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s Reset Device"),D_CMND_HM10);
-          HM10Serial->write("AT+RESET");
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_SUB_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 25;
-          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NOTIFY_ON0037");
-          break;
-        case TASK_HM10_UN_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.mode.awaitingHT = false;
-          HM10Serial->write("AT+NOTIFYOFF0037");
-          break;
-        case TASK_HM10_SUB_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 25;
-          HM10_TaskReplaceInSlot(TASK_HM10_DELAY_SUB,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+NOTIFY_ON003C");
-          break;
-        case TASK_HM10_UN_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s un-subscribe"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.mode.awaitingHT = false;
-          HM10Serial->write("AT+NOTIFYOFF003C");
-          break;
-        case TASK_HM10_TIME_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s set time"),D_CMND_HM10);
-          HM10.current_task_delay = 5;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10.time = Rtc.utc_time;
-          HM10Serial->write("AT+SEND_DATAWR002F");
-          HM10Serial->write(HM10.timebuf,4);
-          HM10Serial->write(Rtc.time_timezone / 60);
-          AddLog_P2(LOG_LEVEL_DEBUG,PSTR("%s Time-string: %x%x%x%x%x"),D_CMND_HM10, HM10.timebuf[0],HM10.timebuf[1],HM10.timebuf[2],HM10.timebuf[3],(Rtc.time_timezone /60));
-          break;
-        case TASK_HM10_READ_HT:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0036"),D_CMND_HM10);
-          HM10.current_task_delay = 0;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA0036?");
-          HM10.mode.awaitingHT = true;
-          break;
-        case TASK_HM10_READ_BT_L3:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 003A"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA003A?");
-          HM10.mode.awaitingB = true;
-          break;
-        case TASK_HM10_READ_BT_L2:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s read handle 0043"),D_CMND_HM10);
-          HM10.current_task_delay = 2;
-          HM10_TaskReplaceInSlot(TASK_HM10_FEEDBACK,i);
-          runningTaskLoop = false;
-          HM10Serial->write("AT+READDATA0043?");
-          HM10.mode.awaitingB = true;
-          break;
-
-
-
-
-
-
-
-        case TASK_HM10_FEEDBACK:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s get response"),D_CMND_HM10);
-          HM10SerialHandleFeedback();
-          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
-          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_DELAY_SUB:
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("%s start reading"),D_CMND_HM10);
-          HM10SerialHandleFeedback();
-          HM10.current_task_delay = HM10_TASK_LIST[i+1][1];;
-          HM10_TASK_LIST[i][0] = TASK_HM10_DONE;
-          HM10.mode.awaitingHT = true;
-          runningTaskLoop = false;
-          break;
-        case TASK_HM10_DONE:
-
-
-          if(HM10_TASK_LIST[i+1][0] == TASK_HM10_NOTASK) {
-            DEBUG_SENSOR_LOG(PSTR("%sno Tasks left"),D_CMND_HM10);
-            DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK_DONE current slot %u"),D_CMND_HM10, i);
-            for (uint8_t j = 0; j < HM10_MAX_TASK_NUMBER+1; j++) {
-              DEBUG_SENSOR_LOG(PSTR("%sHM10_TASK cleanup slot %u"),D_CMND_HM10, j);
-              HM10_TASK_LIST[j][0] = TASK_HM10_NOTASK;
-              HM10_TASK_LIST[j][1] = 0;
-            }
-            runningTaskLoop = false;
-            HM10.mode.pending_task = 0;
-            break;
-          }
-      }
-      i++;
-    }
-  }
-  else {
-    HM10.current_task_delay--;
-  }
-}
-
-
-
-
-
-
-void HM10EverySecond(){
-  if(HM10.firmware == 0) return;
-  if(HM10.mode.pending_task == 1) return;
-  if (MIBLEsensors.size()==0) return;
-
-  static uint32_t _counter = 0;
-  static uint32_t _nextSensorSlot = 0;
-  if(_counter==0) {
-    HM10.state.sensor = _nextSensorSlot;
-    _nextSensorSlot++;
-    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD03MMC) {
-      HM10.mode.pending_task = 1;
-      HM10_Read_LYWSD03();
-    }
-    if(MIBLEsensors.at(HM10.state.sensor).type==LYWSD02) {
-      HM10.mode.pending_task = 1;
-      HM10_Read_LYWSD02();
-    }
-    if (HM10.state.sensor==MIBLEsensors.size()-1) {
-      _nextSensorSlot= 0;
-      _counter++;
-    }
-    DEBUG_SENSOR_LOG(PSTR("%s active sensor now: %u"),D_CMND_HM10, HM10.state.sensor);
-  }
-  else _counter++;
-  if (_counter>HM10.period) _counter = 0;
-}
-
-bool HM10Cmd(void) {
-  char command[CMDSZ];
-  bool serviced = true;
-  uint8_t disp_len = strlen(D_CMND_HM10);
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_HM10), disp_len)) {
-    uint32_t command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kHM10_Commands);
-    switch (command_code) {
-      case CMND_HM10_PERIOD:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_HM10_PERIOD) { HM10.period = XdrvMailbox.payload; }
-        }
-        else {
-          if (command_code == CMND_HM10_PERIOD) XdrvMailbox.payload = HM10.period;
-        }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_BAUD:
-        if (XdrvMailbox.data_len > 0) {
-          if (command_code == CMND_HM10_BAUD) {
-            HM10.serialSpeed = XdrvMailbox.payload;
-            HM10Serial->begin(HM10.serialSpeed);
-            }
-        }
-        else {
-          if (command_code == CMND_HM10_BAUD) XdrvMailbox.payload = HM10.serialSpeed;
-        }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_TIME:
-        if (XdrvMailbox.data_len > 0) {
-          if(MIBLEsensors.size()>XdrvMailbox.payload){
-            if(MIBLEsensors.at(XdrvMailbox.payload).type == LYWSD02){
-              HM10.state.sensor = XdrvMailbox.payload;
-              HM10_Time_LYWSD02();
-              }
-            }
-          }
-        Response_P(S_JSON_HM10_COMMAND_NVALUE, command, XdrvMailbox.payload);
-        break;
-      case CMND_HM10_AT:
-        HM10Serial->write("AT");
-        if (strlen(XdrvMailbox.data)!=0) {
-          HM10Serial->write("+");
-          HM10Serial->write(XdrvMailbox.data);
-          Response_P(S_JSON_HM10_COMMAND, ":AT+",XdrvMailbox.data);
-        }
-        else Response_P(S_JSON_HM10_COMMAND, ":AT",XdrvMailbox.data);
-        break;
-      case CMND_HM10_DISC_SCAN:
-        if (command_code == CMND_HM10_DISC_SCAN) { HM10_Discovery_Scan(); }
-        Response_P(S_JSON_HM10_COMMAND, command, "");
-        break;
-      default:
-
-       serviced = false;
-     break;
-    }
-  } else {
-    return false;
-  }
-  return serviced;
-}
-
-
-
-
-
-
-const char HTTP_HM10[] PROGMEM = "{s}HM10" " Firmware " "{m}%u{e}";
-const char HTTP_HM10_SERIAL[] PROGMEM = "{s}%s %s{m}%02x:%02x:%02x:%02x:%02x:%02x%{e}";
-const char HTTP_BATTERY[] PROGMEM = "{s}%s" " Battery" "{m}%u%%{e}";
-const char HTTP_HM10_FLORA_DATA[] PROGMEM = "{s}%s" " Fertility" "{m}%sus/cm{e}";
-const char HTTP_HM10_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
-
-void HM10Show(bool json)
-{
-  if (json) {
-    for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-      char slave[33];
-      sprintf_P(slave,"%s-%02x%02x%02x",kHM10SlaveType[MIBLEsensors.at(i).type-1],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-      char temperature[33];
-      dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-
-      ResponseAppend_P(PSTR(",\"%s\":{"),slave);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"), temperature);
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          char lux[33];
-          char moisture[33];
-          char fertility[33];
-          dtostrfd((float)MIBLEsensors.at(i).lux, 0, lux);
-          dtostrfd(MIBLEsensors.at(i).moisture, 0, moisture);
-          dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            ResponseAppend_P(PSTR(",\"" D_JSON_ILLUMINANCE "\":%s"), lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"" D_JSON_MOISTURE "\":%s"), moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            ResponseAppend_P(PSTR(",\"Fertility\":%s"), fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          char humidity[33];
-          dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-              ResponseAppend_P(PSTR(",\"" D_JSON_HUMIDITY "\":%s"), humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            ResponseAppend_P(PSTR(",\"Battery\":%u"), MIBLEsensors.at(i).bat);
-          }
-        }
-        ResponseAppend_P(PSTR("}"));
-    }
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_HM10, HM10.firmware);
-      for (uint32_t i = 0; i < MIBLEsensors.size(); i++) {
-        WSContentSend_PD(HTTP_HM10_HL);
-        WSContentSend_PD(HTTP_HM10_SERIAL, kHM10SlaveType[MIBLEsensors.at(i).type-1], D_MAC_ADDRESS, MIBLEsensors.at(i).serial[0], MIBLEsensors.at(i).serial[1],MIBLEsensors.at(i).serial[2],MIBLEsensors.at(i).serial[3],MIBLEsensors.at(i).serial[4],MIBLEsensors.at(i).serial[5]);
-        if(MIBLEsensors.at(i).temp!=-1000.0f){
-          char temperature[33];
-          dtostrfd(MIBLEsensors.at(i).temp, Settings.flag2.temperature_resolution, temperature);
-          WSContentSend_PD(HTTP_SNS_TEMP, kHM10SlaveType[MIBLEsensors.at(i).type-1], temperature, TempUnit());
-        }
-        if (MIBLEsensors.at(i).type==FLORA){
-          if(MIBLEsensors.at(i).lux!=0xffff){
-            WSContentSend_PD(HTTP_SNS_ILLUMINANCE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).lux);
-          }
-          if(MIBLEsensors.at(i).moisture!=-1000.0f){
-            WSContentSend_PD(HTTP_SNS_MOISTURE, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).moisture);
-          }
-          if(MIBLEsensors.at(i).fertility!=-1000.0f){
-            char fertility[33];
-            dtostrfd(MIBLEsensors.at(i).fertility, 0, fertility);
-            WSContentSend_PD(HTTP_HM10_FLORA_DATA, kHM10SlaveType[MIBLEsensors.at(i).type-1], fertility);
-          }
-        }
-        if (MIBLEsensors.at(i).type>FLORA){
-          if(MIBLEsensors.at(i).hum!=-1.0f){
-            char humidity[33];
-            dtostrfd(MIBLEsensors.at(i).hum, Settings.flag2.humidity_resolution, humidity);
-            WSContentSend_PD(HTTP_SNS_HUM, kHM10SlaveType[MIBLEsensors.at(i).type-1], humidity);
-          }
-          if(MIBLEsensors.at(i).bat!=0xff){
-            WSContentSend_PD(HTTP_BATTERY, kHM10SlaveType[MIBLEsensors.at(i).type-1], MIBLEsensors.at(i).bat);
-          }
-        }
-      }
-#endif
-    }
-}
-
-
-
-
-
-bool Xsns62(uint8_t function)
-{
-  bool result = false;
-
-  if ((pin[GPIO_HM10_RX] < 99) && (pin[GPIO_HM10_TX] < 99)) {
-    switch (function) {
-      case FUNC_INIT:
-        HM10SerialInit();
-        break;
-      case FUNC_EVERY_50_MSECOND:
-        HM10SerialHandleFeedback();
-       break;
-      case FUNC_EVERY_100_MSECOND:
-        if (HM10_TASK_LIST[0][0] != TASK_HM10_NOTASK) {
-          HM10_TaskEvery100ms();
-        }
-        break;
-      case FUNC_EVERY_SECOND:
-        HM10EverySecond();
-        break;
-      case FUNC_COMMAND:
-        result = HM10Cmd();
-        break;
-      case FUNC_JSON_APPEND:
-        HM10Show(1);
-        break;
-#ifdef USE_WEBSERVER
-      case FUNC_WEB_SENSOR:
-        HM10Show(0);
-        break;
-#endif
-      }
-  }
-  return result;
-}
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_63_aht1x.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_63_aht1x.ino"
-#ifdef USE_I2C
-#ifdef USE_AHT1x
-
-
-
-
-
-
-#define XSNS_63 63
-#define XI2C_43 43
-
-#define AHT10_ADDR 0x38
-
-uint8_t eSensorCalibrateCmd[3] = {0xE1, 0x08, 0x00};
-uint8_t eSensorNormalCmd[3] = {0xA8, 0x00, 0x00};
-uint8_t eSensorMeasureCmd[3] = {0xAC, 0x33, 0x00};
-uint8_t eSensorResetCmd = 0xBA;
-
-struct AHT10 {
-  float humidity = NAN;
-  float temperature = NAN;
-  uint8_t valid = 0;
-  uint8_t count = 0;
-  char name[6] = "AHT1x";
-} AHT10;
-
-bool AHT10Read(void)
-{
-  if (AHT10.valid) { AHT10.valid--; }
-
-  uint8_t data[6];
-
-  Wire.beginTransmission(AHT10_ADDR);
-  Wire.write(eSensorMeasureCmd, 3);
-  Wire.endTransmission();
-  delay(100);
-
-  Wire.requestFrom(AHT10_ADDR, 6);
-  for (uint32_t i = 0; Wire.available() > 0; i++) {
-    data[i] = Wire.read();
-  }
-
-  uint32_t result_h = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
-  uint32_t result_t = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
-
-  float humidity = result_h * 100 / 1048576;
-  float temperature = ((200 * result_t) / 1048576) - 50;
-
-  if (isnan(temperature) || isnan(humidity)) { return false; }
-
-  AHT10.humidity = ConvertHumidity(humidity);
-  AHT10.temperature = ConvertTemp(temperature);
-
-  AHT10.valid = SENSOR_MAX_MISS;
-  return true;
-}
-
-
-
-bool AHT10Init(void)
-{
-  Wire.begin(AHT10_ADDR);
-  Wire.beginTransmission(AHT10_ADDR);
-  Wire.write(eSensorCalibrateCmd, 3);
-  Wire.endTransmission();
-
-  delay(500);
-
-  return (0x08 == (AHT10ReadStatus() & 0x68));
-}
-
-uint8_t AHT10ReadStatus(void)
-{
-  Wire.requestFrom(AHT10_ADDR, 1);
-  uint8_t result = Wire.read();
-  return result;
-}
-
-void AHT10Reset(void)
-{
-  Wire.beginTransmission(AHT10_ADDR);
-  Wire.write(eSensorResetCmd);
-  Wire.endTransmission();
-  delay(20);
-}
-
-
-
-void AHT10Detect(void)
-{
-  if (I2cActive(AHT10_ADDR)) { return; }
-
-  if (AHT10Init()) {
-    I2cSetActiveFound(AHT10_ADDR, AHT10.name);
-    AHT10.count = 1;
-  }
-}
-
-void AHT10EverySecond(void)
-{
-  if (uptime &1) {
-
-    if (!AHT10Read()) {
-      AddLogMissed(AHT10.name, AHT10.valid);
-    }
-  }
-}
-
-void AHT10Show(bool json)
-{
-  if (AHT10.valid) {
-    char temperature[33];
-    dtostrfd(AHT10.temperature, Settings.flag2.temperature_resolution, temperature);
-    char humidity[33];
-    dtostrfd(AHT10.humidity, Settings.flag2.humidity_resolution, humidity);
-
-    if (json) {
-      ResponseAppend_P(JSON_SNS_TEMPHUM, AHT10.name, temperature, humidity);
-#ifdef USE_DOMOTICZ
-      if ((0 == tele_period)) {
-        DomoticzTempHumSensor(temperature, humidity);
-      }
-#endif
-#ifdef USE_KNX
-      if (0 == tele_period) {
-        KnxSensor(KNX_TEMPERATURE, AHT10.temperature);
-        KnxSensor(KNX_HUMIDITY, AHT10.humidity);
-      }
-#endif
-#ifdef USE_WEBSERVER
-    } else {
-      WSContentSend_PD(HTTP_SNS_TEMP, AHT10.name, temperature, TempUnit());
-      WSContentSend_PD(HTTP_SNS_HUM, AHT10.name, humidity);
-#endif
-    }
-  }
-}
-
-
-
-
-
-bool Xsns63(uint8_t function)
-{
-  if (!I2cEnabled(XI2C_43)) { return false; }
-
-  bool result = false;
-
-  if (FUNC_INIT == function) {
-    AHT10Detect();
-  }
-  else if (AHT10.count) {
-    switch (function) {
-    case FUNC_EVERY_SECOND:
-      AHT10EverySecond();
-      break;
-    case FUNC_JSON_APPEND:
-      AHT10Show(1);
-      break;
-#ifdef USE_WEBSERVER
-    case FUNC_WEB_SENSOR:
-      AHT10Show(0);
-      break;
-#endif
-    }
-  }
-  return result;
-}
-
-#endif
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
-# 22 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
-#ifdef USE_PROMETHEUS
-
-
-
-
-#define XSNS_91 91
-
-void HandleMetrics(void)
-{
-  if (!HttpCheckPriviledgedAccess()) { return; }
-
-  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR("Prometheus"));
-
-  WSContentBegin(200, CT_PLAIN);
-
-
-  char parameter[FLOATSZ];
-
-  if (global_temperature != 9999) {
-    dtostrfd(global_temperature, Settings.flag2.temperature_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_temperature gauge\nglobal_temperature %s\n"), parameter);
-  }
-  if (global_humidity != 0) {
-    dtostrfd(global_humidity, Settings.flag2.humidity_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_humidity gauge\nglobal_humidity %s\n"), parameter);
-  }
-  if (global_pressure != 0) {
-    dtostrfd(global_pressure, Settings.flag2.pressure_resolution, parameter);
-    WSContentSend_P(PSTR("# TYPE global_pressure gauge\nglobal_pressure %s\n"), parameter);
-  }
-
-#ifdef USE_ENERGY_SENSOR
-  dtostrfd(Energy.voltage[0], Settings.flag2.voltage_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE voltage gauge\nvoltage %s\n"), parameter);
-  dtostrfd(Energy.current[0], Settings.flag2.current_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE current gauge\ncurrent %s\n"), parameter);
-  dtostrfd(Energy.active_power[0], Settings.flag2.wattage_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE active_power gauge\nactive_power %s\n"), parameter);
-  dtostrfd(Energy.daily, Settings.flag2.energy_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE energy_daily gauge\nenergy_daily %s\n"), parameter);
-  dtostrfd(Energy.total, Settings.flag2.energy_resolution, parameter);
-  WSContentSend_P(PSTR("# TYPE energy_total counter\nenergy_total %s\n"), parameter);
-#endif
-# 80 "S:/Development/Tasmota/tasmota/xsns_91_prometheus.ino"
-  WSContentEnd();
-}
-
-
-
-
-
-bool Xsns91(uint8_t function)
-{
-  bool result = false;
-
-  switch (function) {
-    case FUNC_WEB_ADD_HANDLER:
-      WebServer->on("/metrics", HandleMetrics);
-      break;
-  }
-  return result;
-}
-
-#endif
-# 1 "S:/Development/Tasmota/tasmota/xsns_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xsns_interface.ino"
-#ifdef XFUNC_PTR_IN_ROM
-bool (* const xsns_func_ptr[])(uint8_t) PROGMEM = {
-#else
-bool (* const xsns_func_ptr[])(uint8_t) = {
-#endif
-
-#ifdef XSNS_01
-  &Xsns01,
-#endif
-
-#ifdef XSNS_02
-  &Xsns02,
-#endif
-
-#ifdef XSNS_03
-  &Xsns03,
-#endif
-
-#ifdef XSNS_04
-  &Xsns04,
-#endif
-
-#ifdef XSNS_05
-  &Xsns05,
-#endif
-
-#ifdef XSNS_06
-  &Xsns06,
-#endif
-
-#ifdef XSNS_07
-  &Xsns07,
-#endif
-
-#ifdef XSNS_08
-  &Xsns08,
-#endif
-
-#ifdef XSNS_09
-  &Xsns09,
-#endif
-
-#ifdef XSNS_10
-  &Xsns10,
-#endif
-
-#ifdef XSNS_11
-  &Xsns11,
-#endif
-
-#ifdef XSNS_12
-  &Xsns12,
-#endif
-
-#ifdef XSNS_13
-  &Xsns13,
-#endif
-
-#ifdef XSNS_14
-  &Xsns14,
-#endif
-
-#ifdef XSNS_15
-  &Xsns15,
-#endif
-
-#ifdef XSNS_16
-  &Xsns16,
-#endif
-
-#ifdef XSNS_17
-  &Xsns17,
-#endif
-
-#ifdef XSNS_18
-  &Xsns18,
-#endif
-
-#ifdef XSNS_19
-  &Xsns19,
-#endif
-
-#ifdef XSNS_20
-  &Xsns20,
-#endif
-
-#ifdef XSNS_21
-  &Xsns21,
-#endif
-
-#ifdef XSNS_22
-  &Xsns22,
-#endif
-
-#ifdef XSNS_23
-  &Xsns23,
-#endif
-
-#ifdef XSNS_24
-  &Xsns24,
-#endif
-
-#ifdef XSNS_25
-  &Xsns25,
-#endif
-
-#ifdef XSNS_26
-  &Xsns26,
-#endif
-
-#ifdef XSNS_27
-  &Xsns27,
-#endif
-
-#ifdef XSNS_28
-  &Xsns28,
-#endif
-
-#ifdef XSNS_29
-  &Xsns29,
-#endif
-
-#ifdef XSNS_30
-  &Xsns30,
-#endif
-
-#ifdef XSNS_31
-  &Xsns31,
-#endif
-
-#ifdef XSNS_32
-  &Xsns32,
-#endif
-
-#ifdef XSNS_33
-  &Xsns33,
-#endif
-
-#ifdef XSNS_34
-  &Xsns34,
-#endif
-
-#ifdef XSNS_35
-  &Xsns35,
-#endif
-
-#ifdef XSNS_36
-  &Xsns36,
-#endif
-
-#ifdef XSNS_37
-  &Xsns37,
-#endif
-
-#ifdef XSNS_38
-  &Xsns38,
-#endif
-
-#ifdef XSNS_39
-  &Xsns39,
-#endif
-
-#ifdef XSNS_40
-  &Xsns40,
-#endif
-
-#ifdef XSNS_41
-  &Xsns41,
-#endif
-
-#ifdef XSNS_42
-  &Xsns42,
-#endif
-
-#ifdef XSNS_43
-  &Xsns43,
-#endif
-
-#ifdef XSNS_44
-  &Xsns44,
-#endif
-
-#ifdef XSNS_45
-  &Xsns45,
-#endif
-
-#ifdef XSNS_46
-  &Xsns46,
-#endif
-
-#ifdef XSNS_47
-  &Xsns47,
-#endif
-
-#ifdef XSNS_48
-  &Xsns48,
-#endif
-
-#ifdef XSNS_49
-  &Xsns49,
-#endif
-
-#ifdef XSNS_50
-  &Xsns50,
-#endif
-
-#ifdef XSNS_51
-  &Xsns51,
-#endif
-
-#ifdef XSNS_52
-  &Xsns52,
-#endif
-
-#ifdef XSNS_53
-  &Xsns53,
-#endif
-
-#ifdef XSNS_54
-  &Xsns54,
-#endif
-
-#ifdef XSNS_55
-  &Xsns55,
-#endif
-
-#ifdef XSNS_56
-  &Xsns56,
-#endif
-
-#ifdef XSNS_57
-  &Xsns57,
-#endif
-
-#ifdef XSNS_58
-  &Xsns58,
-#endif
-
-#ifdef XSNS_59
-  &Xsns59,
-#endif
-
-#ifdef XSNS_60
-  &Xsns60,
-#endif
-
-#ifdef XSNS_61
-  &Xsns61,
-#endif
-
-#ifdef XSNS_62
-  &Xsns62,
-#endif
-
-#ifdef XSNS_63
-  &Xsns63,
-#endif
-
-#ifdef XSNS_64
-  &Xsns64,
-#endif
-
-#ifdef XSNS_65
-  &Xsns65,
-#endif
-
-#ifdef XSNS_66
-  &Xsns66,
-#endif
-
-#ifdef XSNS_67
-  &Xsns67,
-#endif
-
-#ifdef XSNS_68
-  &Xsns68,
-#endif
-
-#ifdef XSNS_69
-  &Xsns69,
-#endif
-
-#ifdef XSNS_70
-  &Xsns70,
-#endif
-
-#ifdef XSNS_71
-  &Xsns71,
-#endif
-
-#ifdef XSNS_72
-  &Xsns72,
-#endif
-
-#ifdef XSNS_73
-  &Xsns73,
-#endif
-
-#ifdef XSNS_74
-  &Xsns74,
-#endif
-
-#ifdef XSNS_75
-  &Xsns75,
-#endif
-
-#ifdef XSNS_76
-  &Xsns76,
-#endif
-
-#ifdef XSNS_77
-  &Xsns77,
-#endif
-
-#ifdef XSNS_78
-  &Xsns78,
-#endif
-
-#ifdef XSNS_79
-  &Xsns79,
-#endif
-
-#ifdef XSNS_80
-  &Xsns80,
-#endif
-
-#ifdef XSNS_81
-  &Xsns81,
-#endif
-
-#ifdef XSNS_82
-  &Xsns82,
-#endif
-
-#ifdef XSNS_83
-  &Xsns83,
-#endif
-
-#ifdef XSNS_84
-  &Xsns84,
-#endif
-
-#ifdef XSNS_85
-  &Xsns85,
-#endif
-
-#ifdef XSNS_86
-  &Xsns86,
-#endif
-
-#ifdef XSNS_87
-  &Xsns87,
-#endif
-
-#ifdef XSNS_88
-  &Xsns88,
-#endif
-
-#ifdef XSNS_89
-  &Xsns89,
-#endif
-
-#ifdef XSNS_90
-  &Xsns90,
-#endif
-
-#ifdef XSNS_91
-  &Xsns91,
-#endif
-
-#ifdef XSNS_92
-  &Xsns92,
-#endif
-
-#ifdef XSNS_93
-  &Xsns93,
-#endif
-
-#ifdef XSNS_94
-  &Xsns94,
-#endif
-
-#ifdef XSNS_95
-  &Xsns95,
-#endif
-
-#ifdef XSNS_96
-  &Xsns96,
-#endif
-
-#ifdef XSNS_97
-  &Xsns97,
-#endif
-
-#ifdef XSNS_98
-  &Xsns98,
-#endif
-
-#ifdef XSNS_99
-  &Xsns99
-#endif
-};
-
-const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]);
-
-
-
-
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kXsnsList[] PROGMEM = {
-#else
-const uint8_t kXsnsList[] = {
-#endif
-
-#ifdef XSNS_01
-  XSNS_01,
-#endif
-
-#ifdef XSNS_02
-  XSNS_02,
-#endif
-
-#ifdef XSNS_03
-  XSNS_03,
-#endif
-
-#ifdef XSNS_04
-  XSNS_04,
-#endif
-
-#ifdef XSNS_05
-  XSNS_05,
-#endif
-
-#ifdef XSNS_06
-  XSNS_06,
-#endif
-
-#ifdef XSNS_07
-  XSNS_07,
-#endif
-
-#ifdef XSNS_08
-  XSNS_08,
-#endif
-
-#ifdef XSNS_09
-  XSNS_09,
-#endif
-
-#ifdef XSNS_10
-  XSNS_10,
-#endif
-
-#ifdef XSNS_11
-  XSNS_11,
-#endif
-
-#ifdef XSNS_12
-  XSNS_12,
-#endif
-
-#ifdef XSNS_13
-  XSNS_13,
-#endif
-
-#ifdef XSNS_14
-  XSNS_14,
-#endif
-
-#ifdef XSNS_15
-  XSNS_15,
-#endif
-
-#ifdef XSNS_16
-  XSNS_16,
-#endif
-
-#ifdef XSNS_17
-  XSNS_17,
-#endif
-
-#ifdef XSNS_18
-  XSNS_18,
-#endif
-
-#ifdef XSNS_19
-  XSNS_19,
-#endif
-
-#ifdef XSNS_20
-  XSNS_20,
-#endif
-
-#ifdef XSNS_21
-  XSNS_21,
-#endif
-
-#ifdef XSNS_22
-  XSNS_22,
-#endif
-
-#ifdef XSNS_23
-  XSNS_23,
-#endif
-
-#ifdef XSNS_24
-  XSNS_24,
-#endif
-
-#ifdef XSNS_25
-  XSNS_25,
-#endif
-
-#ifdef XSNS_26
-  XSNS_26,
-#endif
-
-#ifdef XSNS_27
-  XSNS_27,
-#endif
-
-#ifdef XSNS_28
-  XSNS_28,
-#endif
-
-#ifdef XSNS_29
-  XSNS_29,
-#endif
-
-#ifdef XSNS_30
-  XSNS_30,
-#endif
-
-#ifdef XSNS_31
-  XSNS_31,
-#endif
-
-#ifdef XSNS_32
-  XSNS_32,
-#endif
-
-#ifdef XSNS_33
-  XSNS_33,
-#endif
-
-#ifdef XSNS_34
-  XSNS_34,
-#endif
-
-#ifdef XSNS_35
-  XSNS_35,
-#endif
-
-#ifdef XSNS_36
-  XSNS_36,
-#endif
-
-#ifdef XSNS_37
-  XSNS_37,
-#endif
-
-#ifdef XSNS_38
-  XSNS_38,
-#endif
-
-#ifdef XSNS_39
-  XSNS_39,
-#endif
-
-#ifdef XSNS_40
-  XSNS_40,
-#endif
-
-#ifdef XSNS_41
-  XSNS_41,
-#endif
-
-#ifdef XSNS_42
-  XSNS_42,
-#endif
-
-#ifdef XSNS_43
-  XSNS_43,
-#endif
-
-#ifdef XSNS_44
-  XSNS_44,
-#endif
-
-#ifdef XSNS_45
-  XSNS_45,
-#endif
-
-#ifdef XSNS_46
-  XSNS_46,
-#endif
-
-#ifdef XSNS_47
-  XSNS_47,
-#endif
-
-#ifdef XSNS_48
-  XSNS_48,
-#endif
-
-#ifdef XSNS_49
-  XSNS_49,
-#endif
-
-#ifdef XSNS_50
-  XSNS_50,
-#endif
-
-#ifdef XSNS_51
-  XSNS_51,
-#endif
-
-#ifdef XSNS_52
-  XSNS_52,
-#endif
-
-#ifdef XSNS_53
-  XSNS_53,
-#endif
-
-#ifdef XSNS_54
-  XSNS_54,
-#endif
-
-#ifdef XSNS_55
-  XSNS_55,
-#endif
-
-#ifdef XSNS_56
-  XSNS_56,
-#endif
-
-#ifdef XSNS_57
-  XSNS_57,
-#endif
-
-#ifdef XSNS_58
-  XSNS_58,
-#endif
-
-#ifdef XSNS_59
-  XSNS_59,
-#endif
-
-#ifdef XSNS_60
-  XSNS_60,
-#endif
-
-#ifdef XSNS_61
-  XSNS_61,
-#endif
-
-#ifdef XSNS_62
-  XSNS_62,
-#endif
-
-#ifdef XSNS_63
-  XSNS_63,
-#endif
-
-#ifdef XSNS_64
-  XSNS_64,
-#endif
-
-#ifdef XSNS_65
-  XSNS_65,
-#endif
-
-#ifdef XSNS_66
-  XSNS_66,
-#endif
-
-#ifdef XSNS_67
-  XSNS_67,
-#endif
-
-#ifdef XSNS_68
-  XSNS_68,
-#endif
-
-#ifdef XSNS_69
-  XSNS_69,
-#endif
-
-#ifdef XSNS_70
-  XSNS_70,
-#endif
-
-#ifdef XSNS_71
-  XSNS_71,
-#endif
-
-#ifdef XSNS_72
-  XSNS_72,
-#endif
-
-#ifdef XSNS_73
-  XSNS_73,
-#endif
-
-#ifdef XSNS_74
-  XSNS_74,
-#endif
-
-#ifdef XSNS_75
-  XSNS_75,
-#endif
-
-#ifdef XSNS_76
-  XSNS_76,
-#endif
-
-#ifdef XSNS_77
-  XSNS_77,
-#endif
-
-#ifdef XSNS_78
-  XSNS_78,
-#endif
-
-#ifdef XSNS_79
-  XSNS_79,
-#endif
-
-#ifdef XSNS_80
-  XSNS_80,
-#endif
-
-#ifdef XSNS_81
-  XSNS_81,
-#endif
-
-#ifdef XSNS_82
-  XSNS_82,
-#endif
-
-#ifdef XSNS_83
-  XSNS_83,
-#endif
-
-#ifdef XSNS_84
-  XSNS_84,
-#endif
-
-#ifdef XSNS_85
-  XSNS_85,
-#endif
-
-#ifdef XSNS_86
-  XSNS_86,
-#endif
-
-#ifdef XSNS_87
-  XSNS_87,
-#endif
-
-#ifdef XSNS_88
-  XSNS_88,
-#endif
-
-#ifdef XSNS_89
-  XSNS_89,
-#endif
-
-#ifdef XSNS_90
-  XSNS_90,
-#endif
-
-#ifdef XSNS_91
-  XSNS_91,
-#endif
-
-#ifdef XSNS_92
-  XSNS_92,
-#endif
-
-#ifdef XSNS_93
-  XSNS_93,
-#endif
-
-#ifdef XSNS_94
-  XSNS_94,
-#endif
-
-#ifdef XSNS_95
-  XSNS_95,
-#endif
-
-#ifdef XSNS_96
-  XSNS_96,
-#endif
-
-#ifdef XSNS_97
-  XSNS_97,
-#endif
-
-#ifdef XSNS_98
-  XSNS_98,
-#endif
-
-#ifdef XSNS_99
-  XSNS_99
-#endif
-};
-
-
-
-bool XsnsEnabled(uint32_t sns_index)
-{
-  if (sns_index < sizeof(kXsnsList)) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t index = pgm_read_byte(kXsnsList + sns_index);
-#else
-    uint32_t index = kXsnsList[sns_index];
-#endif
-    return bitRead(Settings.sensors[index / 32], index % 32);
-  }
-  return true;
-}
-
-void XsnsSensorState(void)
-{
-  ResponseAppend_P(PSTR("\""));
-  for (uint32_t i = 0; i < sizeof(kXsnsList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t sensorid = pgm_read_byte(kXsnsList + i);
-#else
-    uint32_t sensorid = kXsnsList[i];
-#endif
-    bool disabled = false;
-    if (sensorid < MAX_XSNS_DRIVERS) {
-      disabled = !bitRead(Settings.sensors[sensorid / 32], sensorid % 32);
-    }
-    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", sensorid);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-
-
-
-
-bool XsnsNextCall(uint8_t Function, uint8_t &xsns_index)
-{
-  xsns_index++;
-  if (xsns_index == xsns_present) { xsns_index = 0; }
-
-#ifndef USE_DEBUG_DRIVER
-  if (FUNC_WEB_SENSOR == Function) {
-#endif
-    uint32_t max_disabled = xsns_present;
-    while (!XsnsEnabled(xsns_index) && max_disabled--) {
-      xsns_index++;
-      if (xsns_index == xsns_present) { xsns_index = 0; }
-    }
-#ifndef USE_DEBUG_DRIVER
-  }
-#endif
-
-  return xsns_func_ptr[xsns_index](Function);
-}
-
-bool XsnsCall(uint8_t Function)
-{
-  bool result = false;
-
-  DEBUG_TRACE_LOG(PSTR("SNS: %d"), Function);
-
-#ifdef PROFILE_XSNS_EVERY_SECOND
-  uint32_t profile_start_millis = millis();
-#endif
-
-  for (uint32_t x = 0; x < xsns_present; x++) {
-#ifdef USE_DEBUG_DRIVER
-    if (XsnsEnabled(x)) {
-#endif
-
-      if ((FUNC_WEB_SENSOR == Function) && !XsnsEnabled(x)) { continue; }
-
-#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
-      uint32_t profile_start_millis = millis();
-#endif
-      result = xsns_func_ptr[x](Function);
-
-#ifdef PROFILE_XSNS_SENSOR_EVERY_SECOND
-      uint32_t profile_millis = millis() - profile_start_millis;
-      if (profile_millis) {
-        if (FUNC_EVERY_SECOND == Function) {
-          AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d to Sensor %d took %u mS"), uptime, Function, x, profile_millis);
-        }
-      }
-#endif
-
-      if (result && ((FUNC_COMMAND == Function) ||
-                     (FUNC_PIN_STATE == Function) ||
-                     (FUNC_COMMAND_SENSOR == Function)
-                    )) {
-        break;
-      }
-#ifdef USE_DEBUG_DRIVER
-    }
-#endif
-  }
-
-#ifdef PROFILE_XSNS_EVERY_SECOND
-  uint32_t profile_millis = millis() - profile_start_millis;
-  if (profile_millis) {
-    if (FUNC_EVERY_SECOND == Function) {
-      AddLog_P2(LOG_LEVEL_DEBUG, PSTR("PRF: At %08u XsnsCall %d took %u mS"), uptime, Function, profile_millis);
-    }
-  }
-#endif
-
-  return result;
-}
-# 1 "S:/Development/Tasmota/tasmota/xx2c_interface.ino"
-# 20 "S:/Development/Tasmota/tasmota/xx2c_interface.ino"
-#ifdef USE_I2C
-
-#ifdef XFUNC_PTR_IN_ROM
-const uint8_t kI2cList[] PROGMEM = {
-#else
-const uint8_t kI2cList[] = {
-#endif
-
-#ifdef XI2C_01
-  XI2C_01,
-#endif
-
-#ifdef XI2C_02
-  XI2C_02,
-#endif
-
-#ifdef XI2C_03
-  XI2C_03,
-#endif
-
-#ifdef XI2C_04
-  XI2C_04,
-#endif
-
-#ifdef XI2C_05
-  XI2C_05,
-#endif
-
-#ifdef XI2C_06
-  XI2C_06,
-#endif
-
-#ifdef XI2C_07
-  XI2C_07,
-#endif
-
-#ifdef XI2C_08
-  XI2C_08,
-#endif
-
-#ifdef XI2C_09
-  XI2C_09,
-#endif
-
-#ifdef XI2C_10
-  XI2C_10,
-#endif
-
-#ifdef XI2C_11
-  XI2C_11,
-#endif
-
-#ifdef XI2C_12
-  XI2C_12,
-#endif
-
-#ifdef XI2C_13
-  XI2C_13,
-#endif
-
-#ifdef XI2C_14
-  XI2C_14,
-#endif
-
-#ifdef XI2C_15
-  XI2C_15,
-#endif
-
-#ifdef XI2C_16
-  XI2C_16,
-#endif
-
-#ifdef XI2C_17
-  XI2C_17,
-#endif
-
-#ifdef XI2C_18
-  XI2C_18,
-#endif
-
-#ifdef XI2C_19
-  XI2C_19,
-#endif
-
-#ifdef XI2C_20
-  XI2C_20,
-#endif
-
-#ifdef XI2C_21
-  XI2C_21,
-#endif
-
-#ifdef XI2C_22
-  XI2C_22,
-#endif
-
-#ifdef XI2C_23
-  XI2C_23,
-#endif
-
-#ifdef XI2C_24
-  XI2C_24,
-#endif
-
-#ifdef XI2C_25
-  XI2C_25,
-#endif
-
-#ifdef XI2C_26
-  XI2C_26,
-#endif
-
-#ifdef XI2C_27
-  XI2C_27,
-#endif
-
-#ifdef XI2C_28
-  XI2C_28,
-#endif
-
-#ifdef XI2C_29
-  XI2C_29,
-#endif
-
-#ifdef XI2C_30
-  XI2C_30,
-#endif
-
-#ifdef XI2C_31
-  XI2C_31,
-#endif
-
-#ifdef XI2C_32
-  XI2C_32,
-#endif
-
-#ifdef XI2C_33
-  XI2C_33,
-#endif
-
-#ifdef XI2C_34
-  XI2C_34,
-#endif
-
-#ifdef XI2C_35
-  XI2C_35,
-#endif
-
-#ifdef XI2C_36
-  XI2C_36,
-#endif
-
-#ifdef XI2C_37
-  XI2C_37,
-#endif
-
-#ifdef XI2C_38
-  XI2C_38,
-#endif
-
-#ifdef XI2C_39
-  XI2C_39,
-#endif
-
-#ifdef XI2C_40
-  XI2C_40,
-#endif
-
-#ifdef XI2C_41
-  XI2C_41,
-#endif
-
-#ifdef XI2C_42
-  XI2C_42,
-#endif
-
-#ifdef XI2C_43
-  XI2C_43,
-#endif
-
-#ifdef XI2C_44
-  XI2C_44,
-#endif
-
-#ifdef XI2C_45
-  XI2C_45,
-#endif
-
-#ifdef XI2C_46
-  XI2C_46,
-#endif
-
-#ifdef XI2C_47
-  XI2C_47,
-#endif
-
-#ifdef XI2C_48
-  XI2C_48,
-#endif
-
-#ifdef XI2C_49
-  XI2C_49,
-#endif
-
-#ifdef XI2C_50
-  XI2C_50,
-#endif
-
-#ifdef XI2C_51
-  XI2C_51,
-#endif
-
-#ifdef XI2C_52
-  XI2C_52,
-#endif
-
-#ifdef XI2C_53
-  XI2C_53,
-#endif
-
-#ifdef XI2C_54
-  XI2C_54,
-#endif
-
-#ifdef XI2C_55
-  XI2C_55,
-#endif
-
-#ifdef XI2C_56
-  XI2C_56,
-#endif
-
-#ifdef XI2C_57
-  XI2C_57,
-#endif
-
-#ifdef XI2C_58
-  XI2C_58,
-#endif
-
-#ifdef XI2C_59
-  XI2C_59,
-#endif
-
-#ifdef XI2C_60
-  XI2C_60,
-#endif
-
-#ifdef XI2C_61
-  XI2C_61,
-#endif
-
-#ifdef XI2C_62
-  XI2C_62,
-#endif
-
-#ifdef XI2C_63
-  XI2C_63,
-#endif
-
-#ifdef XI2C_64
-  XI2C_64,
-#endif
-
-#ifdef XI2C_65
-  XI2C_65,
-#endif
-
-#ifdef XI2C_66
-  XI2C_66,
-#endif
-
-#ifdef XI2C_67
-  XI2C_67,
-#endif
-
-#ifdef XI2C_68
-  XI2C_68,
-#endif
-
-#ifdef XI2C_69
-  XI2C_69,
-#endif
-
-#ifdef XI2C_70
-  XI2C_70,
-#endif
-
-#ifdef XI2C_71
-  XI2C_71,
-#endif
-
-#ifdef XI2C_72
-  XI2C_72,
-#endif
-
-#ifdef XI2C_73
-  XI2C_73,
-#endif
-
-#ifdef XI2C_74
-  XI2C_74,
-#endif
-
-#ifdef XI2C_75
-  XI2C_75,
-#endif
-
-#ifdef XI2C_76
-  XI2C_76,
-#endif
-
-#ifdef XI2C_77
-  XI2C_77,
-#endif
-
-#ifdef XI2C_78
-  XI2C_78,
-#endif
-
-#ifdef XI2C_79
-  XI2C_79,
-#endif
-
-#ifdef XI2C_80
-  XI2C_80,
-#endif
-
-#ifdef XI2C_81
-  XI2C_81,
-#endif
-
-#ifdef XI2C_82
-  XI2C_82,
-#endif
-
-#ifdef XI2C_83
-  XI2C_83,
-#endif
-
-#ifdef XI2C_84
-  XI2C_84,
-#endif
-
-#ifdef XI2C_85
-  XI2C_85,
-#endif
-
-#ifdef XI2C_86
-  XI2C_86,
-#endif
-
-#ifdef XI2C_87
-  XI2C_87,
-#endif
-
-#ifdef XI2C_88
-  XI2C_88,
-#endif
-
-#ifdef XI2C_89
-  XI2C_89,
-#endif
-
-#ifdef XI2C_90
-  XI2C_90,
-#endif
-
-#ifdef XI2C_91
-  XI2C_91,
-#endif
-
-#ifdef XI2C_92
-  XI2C_92,
-#endif
-
-#ifdef XI2C_93
-  XI2C_93,
-#endif
-
-#ifdef XI2C_94
-  XI2C_94,
-#endif
-
-#ifdef XI2C_95
-  XI2C_95,
-#endif
-
-#ifdef XI2C_96
-  XI2C_96
-#endif
-};
-
-
-
-bool I2cEnabled(uint32_t i2c_index)
-{
-  return (i2c_flg && bitRead(Settings.i2c_drivers[i2c_index / 32], i2c_index % 32));
-}
-
-void I2cDriverState(void)
-{
-  ResponseAppend_P(PSTR("\""));
-  for (uint32_t i = 0; i < sizeof(kI2cList); i++) {
-#ifdef XFUNC_PTR_IN_ROM
-    uint32_t i2c_driver_id = pgm_read_byte(kI2cList + i);
-#else
-    uint32_t i2c_driver_id = kI2cList[i];
-#endif
-    bool disabled = false;
-    if (i2c_driver_id < MAX_I2C_DRIVERS) {
-      disabled = !bitRead(Settings.i2c_drivers[i2c_driver_id / 32], i2c_driver_id % 32);
-    }
-    ResponseAppend_P(PSTR("%s%s%d"), (i) ? "," : "", (disabled) ? "!" : "", i2c_driver_id);
-  }
-  ResponseAppend_P(PSTR("\""));
-}
-
-#endif
\ No newline at end of file

From 631d9045f136c7fcde3525021ac73ce19b24401f Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 20:52:06 -0600
Subject: [PATCH 326/403] Deal with late device group initializaton

---
 tasmota/xdrv_35_pwm_dimmer.ino | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index ea3211563..fca67efe6 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -80,7 +80,6 @@ bool button_hold_sent[3];
 bool button_pressed[3] = { false, false, false };
 #ifdef USE_PWM_DIMMER_REMOTE
 struct remote_pwm_dimmer * remote_pwm_dimmers;
-struct device_group * active_device_group;
 struct remote_pwm_dimmer * active_remote_pwm_dimmer;
 uint8_t buttons_pressed = 0;
 bool active_device_is_local;
@@ -136,13 +135,12 @@ void PWMDimmerInit(void)
   if (Settings.flag3.remote_device_mode) {
     if (device_group_count > 1) {
       if ((remote_pwm_dimmers = (struct remote_pwm_dimmer *) calloc(device_group_count - 1, sizeof(struct remote_pwm_dimmer))) == nullptr) {
-        AddLog_P2(LOG_LEVEL_ERROR, "PWMDimmer: error allocating PWM dimmer array");
+        AddLog_P2(LOG_LEVEL_ERROR, PSTR("PWMDimmer: error allocating PWM dimmer array"));
         Settings.flag3.remote_device_mode = false;
       }
     }
   }
 
-  active_device_group = &device_groups[0];
   active_device_is_local = true;
 #endif  // USE_PWM_DIMMER_REMOTE
 }
@@ -220,7 +218,6 @@ void PWMDimmerAnimate(bool no_fade)
   if (relay_is_on != (current_bri > 0)) {
     bool power_is_on = ((power & 1) != 0);
     if (power_is_on == relay_is_on) {
-AddLog_P2(LOG_LEVEL_DEBUG, "****************** ExecuteCommandPower(1, %d, SRC_SWITCH)", (relay_is_on ? 0 : 1));
       ExecuteCommandPower(1, (relay_is_on ? POWER_OFF : POWER_ON), SRC_SWITCH);
     }
 
@@ -377,8 +374,7 @@ void PWMDimmerHandleButton()
         power_button_index = button_index;
         up_button_index = (button_index == 2 ? 1 : 2);
         down_button_index = (button_index ? 0 : 1);
-        active_device_group = &device_groups[power_button_index];
-        active_device_is_local = active_device_group->local;
+        active_device_is_local = device_groups[power_button_index].local;
         if (!active_device_is_local) active_remote_pwm_dimmer = &remote_pwm_dimmers[power_button_index - 1];
       }
       if (button_index == power_button_index) {
@@ -553,11 +549,11 @@ void PWMDimmerHandleButton()
                 // Publish MQTT Event SwitchTrigger#.
                 char topic[TOPSZ];
 #ifdef USE_PWM_DIMMER_REMOTE
-                snprintf(topic, sizeof(topic), "%s/cmnd/Event", active_device_group->group_name);
+                snprintf_P(topic, sizeof(topic), PSTR("%s/cmnd/Event"), device_groups[power_button_index].group_name);
 #else  // USE_PWM_DIMMER_REMOTE
-                snprintf(topic, sizeof(topic), "%s/cmnd/Event", SettingsText(SET_MQTT_GRP_TOPIC));
+                snprintf_P(topic, sizeof(topic), PSTR("%s/cmnd/Event"), SettingsText(SET_MQTT_GRP_TOPIC));
 #endif  // USE_PWM_DIMMER_REMOTE
-                sprintf(mqtt_data, "SwitchTrigger%u", (down_button_is_held ? 1 : 2));
+                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (down_button_is_held ? 1 : 2));
                 MqttPublish(topic);
               }
               break;

From 66ce8399e56dbad4dd305997bf246c9e8d49ee6e Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Mon, 24 Feb 2020 21:09:38 -0600
Subject: [PATCH 327/403] Update enable option

---
 Device_Groups.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Device_Groups.md b/Device_Groups.md
index 3384132b4..4f2e9530e 100644
--- a/Device_Groups.md
+++ b/Device_Groups.md
@@ -6,7 +6,7 @@ UDP multicasts, followed by UDP unicasts if necessary, are used to send updates
 
 To include device groups support in the build, define USE_DEVICE_GROUPS in your user_config_override. This adds 3.5K to the code size. All devices in a group must be running firmware with device group support and have device groups enabled.
 
-To enable device groups, set Option16 to 1 and **restart the device**.
+To enable device groups, set Option85 to 1.
 
 
 ## Device Groups Operation

From 4df7f9fe10aeb2659e37541efeae102d6bf2c95c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 11:08:47 +0100
Subject: [PATCH 328/403] Disable for now

---
 tasmota/my_user_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 836fbeb10..264c548de 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,7 +415,7 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-#define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
+//#define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //

From 78991578711a3be78f692ad62f1cdaa851ad3376 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 25 Feb 2020 11:44:09 +0100
Subject: [PATCH 329/403] Using Arduino ESP8266 commit abdd2bd...

for Tasmota stage freezed builds
---
 platformio_override_sample.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 0c63c6e8f..814c1e75c 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -180,7 +180,7 @@ build_flags               = ${esp82xx_defaults.build_flags}
 [tasmota_core_stage]
 ; *** Esp8266 core for Arduino version stable beta
 platform                  = espressif8266@2.3.3
-platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf
+platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#abdd2bdbb6a5caf31807d82ebd7b447947a9c360
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK221

From 0475289532b7e23411e1de3bd18b9ff0f63896ae Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 11:52:52 +0100
Subject: [PATCH 330/403] Fix compilation when no emulation is selected

Fix compilation when no emulation is selected (#7790)
---
 tasmota/xdrv_01_webserver.ino | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index e8c728024..33efee99b 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -2824,6 +2824,7 @@ void (* const WebCommand[])(void) PROGMEM = {
 #ifdef USE_EMULATION
 void CmndEmulation(void)
 {
+#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
 #if defined(USE_EMULATION_WEMO) && defined(USE_EMULATION_HUE)
   if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
 #else
@@ -2837,6 +2838,7 @@ void CmndEmulation(void)
     Settings.flag2.emulation = XdrvMailbox.payload;
     restart_flag = 2;
   }
+#endif
   ResponseCmndNumber(Settings.flag2.emulation);
 }
 #endif  // USE_EMULATION

From 9962b311d595d4f4f903a12035ace1dbcc188c5d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 12:13:49 +0100
Subject: [PATCH 331/403] Add support for UDP Group commands

Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
---
 RELEASENOTES.md             | 2 ++
 tasmota/CHANGELOG.md        | 3 ++-
 tasmota/my_user_config.h    | 2 +-
 tasmota/support_command.ino | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e5e08674c..1c4197a19 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -105,3 +105,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add another new DHT driver based on ESPEasy. The old driver can still be used using define USE_DHT_OLD. The previous new driver can be used with define USE_DHT_V2 (#7717)
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
+- Add Zigbee enhanced commands decoding, added ``ZbPing``
+- Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ef9ce17f4..fc1538101 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,10 +3,11 @@
 ### 8.1.0.9 20200220
 
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
+- Fix Zigbee auto-increment transaction number (#7757)
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
-- Fix Zigbee auto-increment transaction number (#7757)
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
+- Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 264c548de..29cb700ab 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,7 +415,7 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//#define USE_DEVICE_GROUPS                      // Add support for device groups (+4k code)
+//#define USE_DEVICE_GROUPS                      // Add support for device groups (+5k6 code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 59d6b11d5..ac44b9850 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1677,7 +1677,7 @@ void CmndDevGroupShare(void)
   ParseParameters(2, parm);
   Settings.device_group_share_in = parm[0];
   Settings.device_group_share_out = parm[1];
-  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":%x,\"Out\":%x}}"), Settings.device_group_share_in, Settings.device_group_share_out);
+  Response_P(PSTR("{\"" D_CMND_DEVGROUP_SHARE "\":{\"In\":\"%X\",\"Out\":\"%X\"}}"), Settings.device_group_share_in, Settings.device_group_share_out);
 }
 #endif  // USE_DEVICE_GROUPS
 

From 3146bcf23aee09a940a7e72c0f266990f1844813 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 16:49:19 +0100
Subject: [PATCH 332/403] Add some wifi debug options

---
 tasmota/settings.h       |  2 +-
 tasmota/settings.ino     | 16 ++------
 tasmota/support_wifi.ino | 80 ++++++++++++++++++++++++++++++----------
 tasmota/tasmota_post.h   |  4 +-
 4 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index 7952dd9cf..ec81d5345 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -132,7 +132,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t spare28 : 1;
     uint32_t spare29 : 1;
     uint32_t spare30 : 1;
-    uint32_t spare31 : 1;
+    uint32_t force_sdk_erase : 1;          // bit 31 (v8.1.0.9)  - SetOption113 - Force erase of SDK wifi calibrate secore on restart
   };
 } SysBitfield4;
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index c2ddc6607..1563897b0 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -745,6 +745,7 @@ void SettingsErase(uint8_t type)
     1 = Erase 16k SDK parameter area near end of flash as seen by SDK (0x0xFCxxx - 0x0xFFFFF) solving possible wifi errors
     2 = Erase Tasmota parameter area (0x0xF3xxx - 0x0xFBFFF)
     3 = Erase Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
+    4 = Erase SDK parameter area used for wifi calibration (0x0FCxxx - 0x0FCFFF)
   */
 
 #ifndef FIRMWARE_MINIMAL
@@ -762,16 +763,17 @@ void SettingsErase(uint8_t type)
     _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;                       // Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
     _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;             // Flash size as seen by SDK
   }
-#ifdef USE_WIFI_SDK_ERASE
   else if (4 == type) {
+//    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;     // SDK phy area and Core calibration sector (0x0FC000)
     _sectorStart = SETTINGS_LOCATION +1;                                  // SDK phy area and Core calibration sector (0x0FC000)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0x0FCFFF)
   }
+/*
   else if (5 == type) {
     _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;  // SDK phy area and Core calibration sector (0xxFC000)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
   }
-#endif  // USE_WIFI_SDK_ERASE
+*/
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
@@ -786,16 +788,6 @@ void SettingsSdkErase(void)
   delay(1000);
 }
 
-#ifdef USE_WIFI_SDK_ERASE
-void SettingsSdkWifiErase(void)
-{
-  WiFi.disconnect(false);    // Delete SDK wifi config
-  SettingsErase(4);
-  SettingsErase(5);
-  delay(200);
-}
-#endif  // USE_WIFI_SDK_ERASE
-
 /********************************************************************************************/
 
 void SettingsDefault(void)
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index dd8d2441c..93dba06a9 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -21,6 +21,10 @@
  * Wifi
 \*********************************************************************************************/
 
+// Enable only one of two below debug options
+//#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
+#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
+
 #ifndef WIFI_RSSI_THRESHOLD
 #define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
 #endif
@@ -609,6 +613,32 @@ void WifiSetOutputPower(void)
   WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
 }
 
+/*
+  See Esp.h, core_esp8266_phy.cpp and test_overrides.ino
+  RF_DEFAULT = 0,  // RF_CAL or not after deep-sleep wake up, depends on init data byte 108.
+  RF_CAL = 1,      // RF_CAL after deep-sleep wake up, there will be large current.
+  RF_NO_CAL = 2,   // no RF_CAL after deep-sleep wake up, there will only be small current.
+  RF_DISABLED = 4  // disable RF after deep-sleep wake up, just like modem sleep, there will be the smallest current.
+*/
+#ifdef WIFI_RF_MODE_RF_CAL
+#ifndef USE_DEEPSLEEP
+RF_MODE(RF_CAL);
+#endif  // USE_DEEPSLEEP
+#endif  // WIFI_RF_MODE_RF_CAL
+
+#ifdef WIFI_RF_PRE_INIT
+bool rf_pre_init_flag = false;
+RF_PRE_INIT()
+{
+#ifndef USE_DEEPSLEEP
+  system_deep_sleep_set_option(1);   // The option is 1 by default.
+  system_phy_set_rfoption(RF_CAL);
+#endif  // USE_DEEPSLEEP
+  system_phy_set_powerup_option(3);  // 3: RF initialization will do the whole RF calibration which will take about 200ms; this increases the current consumption.
+  rf_pre_init_flag = true;
+}
+#endif  // WIFI_RF_PRE_INIT
+
 void WifiConnect(void)
 {
   WifiSetState(0);
@@ -618,37 +648,47 @@ void WifiConnect(void)
   Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
+
+#ifdef WIFI_RF_PRE_INIT
+  if (rf_pre_init_flag) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Pre-init done"));
+  }
+#endif  // WIFI_RF_PRE_INIT
 }
 
-// Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
-// Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
-void WifiDisconnect(void)
-{
-#ifdef USE_WIFI_SDK_ERASE     // Do not enable with DeepSleep as it will wear out flash
-  SettingsSdkWifiErase();
-#else
-  // Courtesy of EspEasy
-  WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
-  ETS_UART_INTR_DISABLE();
-  wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
-  ETS_UART_INTR_ENABLE();
-  WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
-  delay(100);                 // Flush anything in the network buffers.
-#endif  // USE_WIFI_SDK_ERASE
-}
-
-void WifiShutdown(void)
+void WifiShutdown(bool option = false)
 {
+  // option = false - Legacy disconnect also used by DeepSleep
+  // option = true  - Disconnect with SDK wifi calibrate sector erase
   delay(100);                 // Allow time for message xfer - disabled v6.1.0b
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif  // USE_EMULATION
+
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     MqttDisconnect();
   }
-  WifiDisconnect();
+
+  if (option && Settings.flag4.force_sdk_erase) {  // SetOption113 - Force erase of SDK wifi calibrate sector on restart
+    WiFi.disconnect(false);   // Disconnect wifi
+    SettingsErase(4);         // Delete SDK wifi config and calibrate data
+  } else {
+    // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
+    // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
+    // Courtesy of EspEasy
+    WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
+    ETS_UART_INTR_DISABLE();
+    wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
+    ETS_UART_INTR_ENABLE();
+    WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
+  }
+  delay(100);                 // Flush anything in the network buffers.
 }
 
 void EspRestart(void)
 {
-  WifiShutdown();
+  WifiShutdown(true);
   CrashDumpClear();           // Clear the stack dump in RTC
 //  ESP.restart();            // This results in exception 3 on restarts on core 2.3.0
   ESP.reset();
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index e27213b5a..448fcc6b2 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -694,11 +694,11 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #endif
 
 #ifndef MESSZ
-//#define MESSZ                  1040              // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)
+//#define MESSZ                  1040            // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)
 #define MESSZ                  (MQTT_MAX_PACKET_SIZE -TOPSZ -7)  // Max number of characters in JSON message string
 #endif
 
-//#include <core_version.h>                        // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)
+//#include <core_version.h>                      // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)
 #ifndef ARDUINO_ESP8266_RELEASE
 #define ARDUINO_ESP8266_RELEASE "STAGE"
 #endif

From ec161d5810fc7cc1ed7b8cdb7fefcd4ca5b1ebf4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 16:52:07 +0100
Subject: [PATCH 333/403] Restore default wifi functionality

---
 tasmota/support_wifi.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 93dba06a9..8f7de0f96 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -23,7 +23,7 @@
 
 // Enable only one of two below debug options
 //#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
-#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
+//#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
 
 #ifndef WIFI_RSSI_THRESHOLD
 #define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network

From 78e707e73699a19b741b2178d7053069fa7938ee Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Tue, 25 Feb 2020 17:55:45 +0100
Subject: [PATCH 334/403] minor bug fixes and enhancements

- fix bug in multi-push from last commit
- remove rules execution every second. only at start and stop
- enable rules for Shutter#Button
- tbd: How to correctly detect a simultaneous button push
---
 tasmota/xdrv_27_shutter.ino | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 6f4d711d7..1131a5f70 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -255,6 +255,7 @@ void ShutterInit(void)
 void ShutterReportPosition(bool always)
 {
   Response_P(PSTR("{"));
+  rules_flag.shutter_moving = 0;
   for (uint32_t i = 0; i < shutters_present; i++) {
     //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
     uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
@@ -268,7 +269,6 @@ void ShutterReportPosition(bool always)
   ResponseJsonEnd();
   if (always || (rules_flag.shutter_moving)) {
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-    XdrvRulesProcess();
   }
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
 
@@ -299,18 +299,23 @@ void ShutterUpdatePosition(void)
         int32_t  max_freq_change_per_sec =  Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
         int32_t  min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
         int32_t  velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency  * Shutter.direction[i] ;
+        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency * Shutter.direction[i] ;
 
         int32_t  next_possible_stop = Shutter.real_position[i] + minstopway ;
         stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+        if (Shutter.time[i] == 1) {
+          ShutterReportPosition(true);
+          rules_flag.shutter_moving = 1;
+          XdrvRulesProcess();
+        }
         //Shutter.accelerator[i] = tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
         //int32_t act_freq_change = max_freq_change_per_sec/20;
         AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
                                       Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
 
-        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
+        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > (Shutter.target_position[i]- (100 * Shutter.direction[i])) * Shutter.direction[i] ) {
 
-            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
+            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
             //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Ramp down: acc: %d"),   Shutter.accelerator[i]);
         } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] ==  max_frequency) {
           Shutter.accelerator[i] = 0;
@@ -348,7 +353,7 @@ void ShutterUpdatePosition(void)
             }
             analogWrite(pin[GPIO_PWM1+i], 0);
             Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
 
             if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
               ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
@@ -422,6 +427,8 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
     Shutter.time[i] = 0;
     Shutter.skip_relay_change = 0;
     Shutter.direction[i] = direction;
+    rules_flag.shutter_moving = 1;
+    rules_flag.shutter_moved  = 0;
     //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: real %d, start %d, counter %d, max_freq %d, dir %d, freq %d"),Shutter.real_position[i], Shutter.start_position[i] ,RtcSettings.pulse_counter[i],Shutter.max_pwm_frequency , Shutter.direction[i] ,Shutter.max_pwm_frequency );
   }
   //AddLog_P2(LOG_LEVEL_INFO,  PSTR("SHT: Start shutter: %d from %d to %d in directin %d"), i, Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i]);
@@ -538,6 +545,7 @@ void ShutterButtonHandler(void)
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
       } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+        Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
       }
     }
     blinks = 201;
@@ -590,15 +598,16 @@ void ShutterButtonHandler(void)
           // check for simultaneous shutter button press
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d, i %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter, i);
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (i != button_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: min_shutterbutton_press_counter %d"), min_shutterbutton_press_counter);
             }
 
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: simultanous presss deteced"));
             press_index = Button.press_counter[button_index];
             for (uint32_t i = 0; i < MAX_KEYS; i++)
               if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
@@ -678,6 +687,7 @@ void ShutterButtonHandler(void)
     ResponseJsonEnd();
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
     XdrvRulesProcess();
+
   }
 }
 

From 91dfc7aa0ba518e8a70b9792b5ff615d4821b1d3 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Tue, 25 Feb 2020 20:47:48 +0100
Subject: [PATCH 335/403] Send the calculated command bitstream twice, to be
 more robust against missed commands on the receiving side.

---
 tasmota/xdrv_35_keeloq.ino | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/tasmota/xdrv_35_keeloq.ino b/tasmota/xdrv_35_keeloq.ino
index c360fdb8e..2ead3b904 100644
--- a/tasmota/xdrv_35_keeloq.ino
+++ b/tasmota/xdrv_35_keeloq.ino
@@ -69,15 +69,15 @@ void CmdSet(void)
       Settings.keeloq_master_lsb = param[1];
       Settings.keeloq_serial = param[2];
       Settings.keeloq_count = param[3];
-      
+
       jaroliftDevice.serial = param[2];
       jaroliftDevice.count = param[3];
- 
+
       GenerateDeviceCryptKey();
       ResponseCmndDone();
     } else {
       AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("no payload"));      
-    } 
+    }
   } else {
     AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("no param"));
   }
@@ -88,7 +88,7 @@ void GenerateDeviceCryptKey()
   Keeloq k(Settings.keeloq_master_msb, Settings.keeloq_master_lsb);
   jaroliftDevice.device_key_msb = k.decrypt(jaroliftDevice.serial | 0x60000000L);
   jaroliftDevice.device_key_lsb = k.decrypt(jaroliftDevice.serial | 0x20000000L);
-  
+
   AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("device keys: %08x %08x"), jaroliftDevice.device_key_msb, jaroliftDevice.device_key_lsb);
 }
 
@@ -96,7 +96,7 @@ void CmdSendButton(void)
 {
   noInterrupts();
   entertx();
-  
+
   if (XdrvMailbox.data_len > 0)
   {
     if (XdrvMailbox.payload > 0)
@@ -107,24 +107,27 @@ void CmdSendButton(void)
       AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("count: %08x"), jaroliftDevice.count);
       AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("serial: %08x"), jaroliftDevice.serial);
       AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("disc: %08x"), jaroliftDevice.disc);
-      
+
       CreateKeeloqPacket();
       jaroliftDevice.count++;
       Settings.keeloq_count = jaroliftDevice.count;
 
-      AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("sync frame"));
-      digitalWrite(TX_PORT, LOW);      // CC1101 in TX Mode+
-      delayMicroseconds(1150);
-      SendSyncPreamble(13);
-      delayMicroseconds(3500);
-      for(int i=72; i>0; i--)
+      for(int repeat = 0; repeat <= 1; repeat++)
       {
-        SendBit(jaroliftDevice.pack & 0x0000000000000001);
-        jaroliftDevice.pack >>= 1;
+        AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("sync frame"));
+        digitalWrite(TX_PORT, LOW);      // CC1101 in TX Mode+
+        delayMicroseconds(1150);
+        SendSyncPreamble(13);
+        delayMicroseconds(3500);
+        for(int i=72; i>0; i--)
+        {
+          SendBit(jaroliftDevice.pack & 0x0000000000000001);
+          jaroliftDevice.pack >>= 1;
+        }
+        AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
+
+        delay(16); // delay in loop context is save for wdt
       }
-      AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
-  
-      delay(16); // delay in loop context is save for wdt
     }
   }
 
@@ -157,7 +160,7 @@ void CmndSendRaw(void)
   AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("cmd send called at %d"), micros());
   noInterrupts();
   entertx();
-  for(int repeat = 0; repeat < 1; repeat++)
+  for(int repeat = 0; repeat <= 1; repeat++)
   {
     if (XdrvMailbox.data_len > 0)
     {
@@ -172,7 +175,7 @@ void CmndSendRaw(void)
         SendBit(XdrvMailbox.data[i] == '1');
       }
       AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
-  
+
       delay(16);                       // delay in loop context is save for wdt
     }
     interrupts();
@@ -190,11 +193,8 @@ void enterrx() {
   {
     if (micros() - rx_time > 50000) break; // Quit when marcState does not change...
   }
-} // void enterrx
+}
 
-//####################################################################
-// put CC1101 to send mode
-//####################################################################
 void entertx() {
   unsigned char marcState = 0;
   cc1101.setTxState();
@@ -204,7 +204,7 @@ void entertx() {
   {
     if (micros() - rx_time > 50000) break; // Quit when marcState does not change...
   }
-} // void entertx
+}
 
 void SendSyncPreamble(int l)
 {
@@ -257,7 +257,7 @@ void InitKeeloq()
 bool Xdrv35(uint8_t function)
 {
   bool result = false;
-     
+
   switch (function) {
     case FUNC_INIT:
       InitKeeloq();

From 407334be6b2450bc64ee5b19fecd87ec9f872ab7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 26 Feb 2020 13:45:46 +0100
Subject: [PATCH 336/403] Clean up wifi connection / disconnection

---
 tasmota/settings.h            |  2 +-
 tasmota/settings.ino          |  4 ++++
 tasmota/support_wifi.ino      | 22 ++++++++++++++--------
 tasmota/xdrv_01_webserver.ino |  4 ++++
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index ec81d5345..886fe7ccf 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -132,7 +132,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t spare28 : 1;
     uint32_t spare29 : 1;
     uint32_t spare30 : 1;
-    uint32_t force_sdk_erase : 1;          // bit 31 (v8.1.0.9)  - SetOption113 - Force erase of SDK wifi calibrate secore on restart
+    uint32_t spare31 : 1;                  // bit 31
   };
 } SysBitfield4;
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 1563897b0..5ebf970d4 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -774,6 +774,10 @@ void SettingsErase(uint8_t type)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
   }
 */
+  else {
+    return;
+  }
+
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 8f7de0f96..c98bdc226 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -21,7 +21,8 @@
  * Wifi
 \*********************************************************************************************/
 
-// Enable only one of two below debug options
+// Enable one of three below options for wifi re-connection debugging
+//#define WIFI_FORCE_RF_CAL_ERASE            // Erase rf calibration sector on restart only
 //#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
 //#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
 
@@ -34,7 +35,7 @@
 
 const uint8_t WIFI_CONFIG_SEC = 180;       // seconds before restart
 const uint8_t WIFI_CHECK_SEC = 20;         // seconds
-const uint8_t WIFI_RETRY_OFFSET_SEC = 20;  // seconds
+const uint8_t WIFI_RETRY_OFFSET_SEC = 12;  // seconds
 
 #include <ESP8266WiFi.h>                   // Wifi, MQTT, Ota, WifiManager
 #if LWIP_IPV6
@@ -645,7 +646,7 @@ void WifiConnect(void)
   WifiSetOutputPower();
   WiFi.persistent(false);     // Solve possible wifi init errors
   Wifi.status = 0;
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);  // Add extra delay to stop overrun by simultanous re-connects
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
 
@@ -659,29 +660,34 @@ void WifiConnect(void)
 void WifiShutdown(bool option = false)
 {
   // option = false - Legacy disconnect also used by DeepSleep
-  // option = true  - Disconnect with SDK wifi calibrate sector erase
+  // option = true  - Disconnect with SDK wifi calibrate sector erase when WIFI_FORCE_RF_CAL_ERASE enabled
   delay(100);                 // Allow time for message xfer - disabled v6.1.0b
 
 #ifdef USE_EMULATION
   UdpDisconnect();
+  delay(100);                 // Flush anything in the network buffers.
 #endif  // USE_EMULATION
 
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     MqttDisconnect();
+    delay(100);               // Flush anything in the network buffers.
   }
 
-  if (option && Settings.flag4.force_sdk_erase) {  // SetOption113 - Force erase of SDK wifi calibrate sector on restart
+#ifdef WIFI_FORCE_RF_CAL_ERASE
+  if (option) {
     WiFi.disconnect(false);   // Disconnect wifi
     SettingsErase(4);         // Delete SDK wifi config and calibrate data
-  } else {
+  } else
+#endif  // WIFI_FORCE_RF_CAL_ERASE
+  {
     // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
     // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
     // Courtesy of EspEasy
-    WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
+    WiFi.persistent(true);    // use SDK storage of SSID/WPA parameters
     ETS_UART_INTR_DISABLE();
     wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
     ETS_UART_INTR_ENABLE();
-    WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
+    WiFi.persistent(false);   // Do not use SDK storage of SSID/WPA parameters
   }
   delay(100);                 // Flush anything in the network buffers.
 }
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 33efee99b..3b408cf66 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1882,6 +1882,7 @@ void HandleOtherConfiguration(void)
   }
 
 #ifdef USE_EMULATION
+#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
   WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));  // Keep close to Friendlynames so do not use <br>
   for (uint32_t i = 0; i < EMUL_MAX; i++) {
 #ifndef USE_EMULATION_WEMO
@@ -1899,6 +1900,7 @@ void HandleOtherConfiguration(void)
     }
   }
   WSContentSend_P(PSTR("</p></fieldset>"));
+#endif  // USE_EMULATION_WEMO || USE_EMULATION_HUE
 #endif  // USE_EMULATION
 
   WSContentSend_P(HTTP_FORM_END);
@@ -1917,8 +1919,10 @@ void OtherSaveSettings(void)
   SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
   Settings.flag.mqtt_enabled = WebServer->hasArg("b1");  // SetOption3 - Enable MQTT
 #ifdef USE_EMULATION
+#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
   WebGetArg("b2", tmp, sizeof(tmp));
   Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
+#endif  // USE_EMULATION_WEMO || USE_EMULATION_HUE
 #endif  // USE_EMULATION
 
   snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);

From f57a4d217cea3baee93bee60c667545f79cb15c4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 26 Feb 2020 14:39:27 +0100
Subject: [PATCH 337/403] Prepare for PWM Dimmer

Prepare for PWM Dimmer (#7791)
---
 tasmota/settings.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index 886fe7ccf..20000aa9f 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -105,9 +105,9 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
     uint32_t device_groups_enabled : 1;    // bit 3 (v8.1.0.9)   - SetOption85 - Enable Device Groups
-    uint32_t spare04 : 1;
-    uint32_t spare05 : 1;
-    uint32_t spare06 : 1;
+    uint32_t led_timeout : 1;              // bit 4 (v8.1.0.9)   - SetOption86 - Turn brightness LED's off 5 seconds after last change
+    uint32_t powered_off_led : 1;          // bit 5 (v8.1.0.9)   - SetOption87 - Turn red LED on when powered off
+    uint32_t remote_device_mode : 1;       // bit 6 (v8.1.0.9)   - SetOption88 - Buttons control remote devices
     uint32_t spare07 : 1;
     uint32_t spare08 : 1;
     uint32_t spare09 : 1;
@@ -465,9 +465,13 @@ struct SYSCFG {
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
   uint8_t       hotplug_scan;              // F03
-  uint8_t       reserved1;                 // F04 - reserved for s-hadinger
+  uint8_t       bri_power_on;              // F04
+  uint8_t       bri_min;                   // F05
+  uint8_t       bri_preset_low;            // F06
+  uint8_t       bri_preset_high;           // F07
+  uint8_t       button_devices;            // F08
 
-  uint8_t       free_f05[199];             // F05
+  uint8_t       free_f05[195];             // F09
 
   uint32_t      device_group_share_in;     // FCC - Bitmask of device group items imported
   uint32_t      device_group_share_out;    // FD0 - Bitmask of device group items exported

From 8dbfa7d6b539869835685563c62b1f8e1ba11386 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Wed, 26 Feb 2020 19:46:44 +0100
Subject: [PATCH 338/403] fixed repeated sending of code

---
 tasmota/xdrv_35_keeloq.ino | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_35_keeloq.ino b/tasmota/xdrv_35_keeloq.ino
index c1fec39fe..ce6185923 100644
--- a/tasmota/xdrv_35_keeloq.ino
+++ b/tasmota/xdrv_35_keeloq.ino
@@ -113,14 +113,15 @@ void CmdSendButton(void)
 
       for(int repeat = 0; repeat <= 1; repeat++)
       {
-        digitalWrite(TX_PORT, LOW);      // CC1101 in TX Mode+
+        uint64_t bitsToSend = jaroliftDevice.pack;
+        digitalWrite(TX_PORT, LOW);
         delayMicroseconds(1150);
         SendSyncPreamble(13);
         delayMicroseconds(3500);
         for(int i=72; i>0; i--)
         {
-          SendBit(jaroliftDevice.pack & 0x0000000000000001);
-          jaroliftDevice.pack >>= 1;
+          SendBit(bitsToSend & 0x0000000000000001);
+          bitsToSend >>= 1;
         }
         DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("finished sending bits at %d"), micros());
 

From 71340dc8b6204f18e546f11df0895719f1182937 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Wed, 26 Feb 2020 20:10:29 +0100
Subject: [PATCH 339/403] push travis, since it had an environment issue during
 last build

---
 tasmota/settings.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index 37f23a085..6ce07c30e 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -470,8 +470,7 @@ struct SYSCFG {
   uint8_t       bri_preset_low;            // F06
   uint8_t       bri_preset_high;           // F07
   uint8_t       button_devices;            // F08
-
-  uint8_t       free_f05[179];             // F09
+  uint8_t       free_f09[179];             // F09
 
   uint32_t      keeloq_master_msb;         // FBC
   uint32_t      keeloq_master_lsb;         // FC0

From 5d54356a25d851696b7210ddda406a6a1ee40c79 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 26 Feb 2020 21:43:46 +0100
Subject: [PATCH 340/403] Remove code with no effect

---
 tasmota/support_wifi.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index c98bdc226..f4e88a49d 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -683,11 +683,11 @@ void WifiShutdown(bool option = false)
     // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
     // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
     // Courtesy of EspEasy
-    WiFi.persistent(true);    // use SDK storage of SSID/WPA parameters
+    // WiFi.persistent(true);    // use SDK storage of SSID/WPA parameters
     ETS_UART_INTR_DISABLE();
     wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
     ETS_UART_INTR_ENABLE();
-    WiFi.persistent(false);   // Do not use SDK storage of SSID/WPA parameters
+    // WiFi.persistent(false);   // Do not use SDK storage of SSID/WPA parameters
   }
   delay(100);                 // Flush anything in the network buffers.
 }

From 792f5cfb19e7c2c0561843b30093999662ea9ee0 Mon Sep 17 00:00:00 2001
From: Barbudor <barbudor@barbudor.net>
Date: Wed, 26 Feb 2020 22:14:08 +0100
Subject: [PATCH 341/403] Allow Sensor13 to define customer value for shunt
 resistor, including code refactoring

---
 tasmota/xsns_13_ina219.ino | 148 +++++++++++++++++++++++--------------
 1 file changed, 94 insertions(+), 54 deletions(-)

diff --git a/tasmota/xsns_13_ina219.ino b/tasmota/xsns_13_ina219.ino
index e1177e35f..f5539cf31 100644
--- a/tasmota/xsns_13_ina219.ino
+++ b/tasmota/xsns_13_ina219.ino
@@ -51,23 +51,30 @@
 #define INA219_CONFIG_GAIN_8_320MV              (0x1800)  // Gain 8, 320mV Range
 
 #define INA219_CONFIG_BADCRES_MASK              (0x0780)  // Bus ADC Resolution Mask
-#define INA219_CONFIG_BADCRES_9BIT              (0x0080)  // 9-bit bus res = 0..511
-#define INA219_CONFIG_BADCRES_10BIT             (0x0100)  // 10-bit bus res = 0..1023
-#define INA219_CONFIG_BADCRES_11BIT             (0x0200)  // 11-bit bus res = 0..2047
-#define INA219_CONFIG_BADCRES_12BIT             (0x0400)  // 12-bit bus res = 0..4097
+#define INA219_CONFIG_BADCRES_9BIT_1S_84US      (0x0<<7)  // 9-bit bus res = 0..511
+#define INA219_CONFIG_BADCRES_10BIT_1S_148US    (0x1<<7)  // 10-bit bus res = 0..1023
+#define INA219_CONFIG_BADCRES_11BIT_1S_276US    (0x2<<7)  // 11-bit bus res = 0..2047
+#define INA219_CONFIG_BADCRES_12BIT_1S_532US    (0x3<<7)  // 12-bit bus res = 0..4097
+#define INA219_CONFIG_BADCRES_12BIT_2S_1060US   (0x9<<7)  // 2 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_4S_2130US   (0xA<<7)  // 4 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_8S_4260US   (0xB<<7)  // 8 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_16S_8510US  (0xC<<7)  // 16 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_32S_17MS    (0xD<<7)  // 32 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_64S_34MS    (0xE<<7)  // 64 x 12-bit bus samples averaged together
+#define INA219_CONFIG_BADCRES_12BIT_128S_69MS   (0xF<<7)  // 128 x 12-bit bus samples averaged together
 
 #define INA219_CONFIG_SADCRES_MASK              (0x0078)  // Shunt ADC Resolution and Averaging Mask
-#define INA219_CONFIG_SADCRES_9BIT_1S_84US      (0x0000)  // 1 x 9-bit shunt sample
-#define INA219_CONFIG_SADCRES_10BIT_1S_148US    (0x0008)  // 1 x 10-bit shunt sample
-#define INA219_CONFIG_SADCRES_11BIT_1S_276US    (0x0010)  // 1 x 11-bit shunt sample
-#define INA219_CONFIG_SADCRES_12BIT_1S_532US    (0x0018)  // 1 x 12-bit shunt sample
-#define INA219_CONFIG_SADCRES_12BIT_2S_1060US   (0x0048)  // 2 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_4S_2130US   (0x0050)  // 4 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_8S_4260US   (0x0058)  // 8 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_16S_8510US  (0x0060)  // 16 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_32S_17MS    (0x0068)  // 32 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_64S_34MS    (0x0070)  // 64 x 12-bit shunt samples averaged together
-#define INA219_CONFIG_SADCRES_12BIT_128S_69MS   (0x0078)  // 128 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_9BIT_1S_84US      (0x0<<3)  // 1 x 9-bit shunt sample
+#define INA219_CONFIG_SADCRES_10BIT_1S_148US    (0x1<<3)  // 1 x 10-bit shunt sample
+#define INA219_CONFIG_SADCRES_11BIT_1S_276US    (0x2<<3)  // 1 x 11-bit shunt sample
+#define INA219_CONFIG_SADCRES_12BIT_1S_532US    (0x3<<3)  // 1 x 12-bit shunt sample
+#define INA219_CONFIG_SADCRES_12BIT_2S_1060US   (0x9<<3)  // 2 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_4S_2130US   (0xA<<3)  // 4 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_8S_4260US   (0xB<<3)  // 8 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_16S_8510US  (0xC<<3)  // 16 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_32S_17MS    (0xD<<3)  // 32 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_64S_34MS    (0xE<<3)  // 64 x 12-bit shunt samples averaged together
+#define INA219_CONFIG_SADCRES_12BIT_128S_69MS   (0xF<<3)  // 128 x 12-bit shunt samples averaged together
 
 #define INA219_CONFIG_MODE_MASK                 (0x0007)  // Operating Mode Mask
 #define INA219_CONFIG_MODE_POWERDOWN            (0x0000)
@@ -85,12 +92,20 @@
 #define INA219_REG_CURRENT                      (0x04)
 #define INA219_REG_CALIBRATION                  (0x05)
 
+#define INA219_DEFAULT_SHUNT_RESISTOR_MILLIOHMS (100.0) // 0.1 Ohm
+
 uint8_t ina219_type[4] = {0,0,0,0};
 uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
 
-uint32_t ina219_cal_value = 0;
-// The following multiplier is used to convert raw current values to mA, taking into account the current config settings
-uint32_t ina219_current_divider_ma = 0;
+#define __DEBUG__(a)
+
+__DEBUG__(char __dbg1[20];)
+__DEBUG__(char __dbg2[20];)
+
+// The following multiplier is used to convert shunt voltage (in mV) to current (in A)
+// Current_A = ShuntVoltage_mV / ShuntResistor_milliOhms = ShuntVoltage_mV * ina219_current_multiplier
+// ina219_current_multiplier = 1 / ShuntResistor_milliOhms
+float ina219_current_multiplier;
 
 uint8_t ina219_valid[4] = {0,0,0,0};
 float ina219_voltage[4] = {0,0,0,0};
@@ -98,54 +113,71 @@ float ina219_current[4] = {0,0,0,0};
 char ina219_types[] = "INA219";
 uint8_t ina219_count = 0;
 
+/*********************************************************************************************\
+ * Calculate current multiplier depending on the selected mode
+ * For mode = 0, 1, 2 : legacy modes simplified as Vmax: 32V, Imax: 3.2A range
+ * For mode = 10..255 : specify Rshunt encoded as RRM where resistor value is RR * 10^M milliOhms
+ *                      Vmax: 32V, Imax: 0.320 / Rshunt
+ * Exemple:
+ *     10: Rshunt = 1 * 10^0 =  1 millOhms   => Max current = 320A !
+ *     11: Rshunt = 1 * 10^1 = 10 milliOhms  => Max current = 32A
+ *     21: Rshunt = 2 * 10^1 = 20 milliOhms  => Max current = 16A
+ *     12: Rshunt = 1 * 10^2 = 100 milliOhms => Max current = 3.2A == mode 0,1,2
+ *     13: Rshunt = 1 * 10^3 =   1 Ohms      => Max current = 320mA
+ * Note that some shunt values can be represented by 2 different encoded values such as
+ *     11 or 100 both present 10 milliOhms
+ * Because it is difficult to make a range check on such encoded value, none is performed
+\*********************************************************************************************/
 bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
 {
   uint16_t config = 0;
 
-  switch (mode &3) {
-    case 0:  // 32V 2A
-    case 3:
-      ina219_cal_value = 4096;
-      ina219_current_divider_ma = 10;  // Current LSB = 100uA per bit (1000/100 = 10)
-      config = INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 1:  // 32V 1A
-      ina219_cal_value = 10240;
-      ina219_current_divider_ma = 25;  // Current LSB = 40uA per bit (1000/40 = 25)
-      config |= INA219_CONFIG_BVOLTAGERANGE_32V | INA219_CONFIG_GAIN_8_320MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
-    case 2:  // 16V 0.4A
-      ina219_cal_value = 8192;
-      ina219_current_divider_ma = 20;  // Current LSB = 50uA per bit (1000/50 = 20)
-      config |= INA219_CONFIG_BVOLTAGERANGE_16V | INA219_CONFIG_GAIN_1_40MV | INA219_CONFIG_BADCRES_12BIT | INA219_CONFIG_SADCRES_12BIT_1S_532US | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
-      break;
+  __DEBUG__(printf("mode = %d\n",mode);)
+  if (mode < 5)
+  {
+    // All legacy modes 0..2 are handled the same and consider default 0.1 shunt resistor
+    ina219_current_multiplier = 1.0 / INA219_DEFAULT_SHUNT_RESISTOR_MILLIOHMS;
+    __DEBUG__(dtostrfd(ina219_current_multiplier,5,__dbg1);)
+    __DEBUG__(printf("cur_mul=%s\n",__dbg1);)
   }
-  // Set Calibration register to 'Cal' calculated above
-  bool success = I2cWrite16(addr, INA219_REG_CALIBRATION, ina219_cal_value);
-  if (success) {
-    // Set Config register to take into account the settings above
-    I2cWrite16(addr, INA219_REG_CONFIG, config);
+  else if (mode >= 10)
+  {
+    int mult = mode % 10;
+    int shunt_milliOhms = mode / 10;
+    for ( ; mult > 0 ; mult-- )
+      shunt_milliOhms *= 10;
+    ina219_current_multiplier = 1.0 / shunt_milliOhms;
+    __DEBUG__(dtostrfd(ina219_current_multiplier,5,__dbg1);)
+    __DEBUG__(printf("shunt = %dmO => cur_mul=%s\n",shunt_milliOhms,__dbg1);)
   }
-  return success;
+  config = INA219_CONFIG_BVOLTAGERANGE_32V
+         | INA219_CONFIG_GAIN_8_320MV               // Use max scale
+         | INA219_CONFIG_BADCRES_12BIT_16S_8510US   // use averaging to improve accuracy
+         | INA219_CONFIG_SADCRES_12BIT_16S_8510US   // use averaging to improve accuracy
+         | INA219_CONFIG_MODE_SANDBVOLT_CONTINUOUS;
+  // Set Config register to take into account the settings above
+  return I2cWrite16(addr, INA219_REG_CONFIG, config);
 }
 
 float Ina219GetShuntVoltage_mV(uint16_t addr)
 {
   // raw shunt voltage (16-bit signed integer, so +-32767)
   int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
-  // shunt voltage in mV (so +-327mV)
+  __DEBUG__(printf("ShR = 0x%04X\n",value);)
+  // convert to shunt voltage in mV (so +-327mV) (LSB=10µV=0.01mV)
   return value * 0.01;
 }
 
 float Ina219GetBusVoltage_V(uint16_t addr)
 {
-  // Shift to the right 3 to drop CNVR and OVF and multiply by LSB
-  // raw bus voltage (16-bit signed integer, so +-32767)
-  int16_t value = (int16_t)(((uint16_t)I2cReadS16(addr, INA219_REG_BUSVOLTAGE) >> 3) * 4);
-  // bus voltage in volts
-  return value * 0.001;
+  // Shift 3 to the right to drop CNVR and OVF as unsigned
+  uint16_t value = I2cRead16(addr, INA219_REG_BUSVOLTAGE) >> 3;
+  __DEBUG__(printf("BusR = 0x%04X\n",value);)
+  // and multiply by LSB raw bus voltage to return bus voltage in volts (LSB=4mV=0.004V)
+  return value * 0.004;
 }
 
+/*
 float Ina219GetCurrent_mA(uint16_t addr)
 {
   // Sometimes a sharp load will reset the INA219, which will reset the cal register,
@@ -159,14 +191,25 @@ float Ina219GetCurrent_mA(uint16_t addr)
   // current value in mA, taking into account the config settings and current LSB
   return value;
 }
+*/
 
 bool Ina219Read(void)
 {
   for (int i=0; i<sizeof(ina219_type); i++) {
     if (!ina219_type[i]) { continue; }
     uint16_t addr = ina219_addresses[i];
-    ina219_voltage[i] = Ina219GetBusVoltage_V(addr) + (Ina219GetShuntVoltage_mV(addr) / 1000);
-    ina219_current[i] = Ina219GetCurrent_mA(addr) / 1000;
+    float bus_voltage_V = Ina219GetBusVoltage_V(addr);
+    float shunt_voltage_mV = Ina219GetShuntVoltage_mV(addr);
+    __DEBUG__(dtostrfd(bus_voltage_V,5,__dbg1);)
+    __DEBUG__(dtostrfd(shunt_voltage_mV,5,__dbg2);)
+    __DEBUG__(printf("bV=%sV, sV=%smV\n",__dbg1,__dbg2);)
+    // we return the power-supply-side voltage (as bus_voltage register provides the load-side voltage)
+    ina219_voltage[i] = bus_voltage_V + (shunt_voltage_mV / 1000);
+    // current is simply calculted from shunt voltage using pre-calculated multiplier
+    ina219_current[i] = shunt_voltage_mV * ina219_current_multiplier;
+    __DEBUG__(dtostrfd(ina219_voltage[i],5,__dbg1);)
+    __DEBUG__(dtostrfd(ina219_current[i],5,__dbg2);)
+    __DEBUG__(printf("V=%sV, I=%smA\n",__dbg1,__dbg2);)
     ina219_valid[i] = SENSOR_MAX_MISS;
     //  AddLogMissed(ina219_types, ina219_valid);
   }
@@ -175,15 +218,11 @@ bool Ina219Read(void)
 
 /*********************************************************************************************\
  * Command Sensor13
- *
- * 0 - Max 32V 2A range
- * 1 - Max 32V 1A range
- * 2 - Max 16V 0.4A range
 \*********************************************************************************************/
 
 bool Ina219CommandSensor(void)
 {
-  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
     Settings.ina219_mode = XdrvMailbox.payload;
     restart_flag = 2;
   }
@@ -201,6 +240,7 @@ void Ina219Detect(void)
     if (I2cActive(addr)) { continue; }
     if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
       I2cSetActiveFound(addr, ina219_types);
+      __DEBUG__(printf("found INA#%d @ 0x%02X\n",i,addr);)
       ina219_type[i] = 1;
       ina219_count++;
     }

From b3d918f46595579ecb58e2e4599bdd5779c4d9e9 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Tue, 25 Feb 2020 06:19:12 -0600
Subject: [PATCH 342/403] Add MQTT commands

---
 PWM_Dimmer.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index 528b3f9fb..172a7663a 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -97,6 +97,8 @@ Holding the power button, pressing the down/up buttons a given number of times a
 
 Holding any button for over 10 seconds executes the WiFiConfig 2 command.
 
+Pressing and releasing a button publishes an MQTT TOGGLE command. Holding a button publishes an MQTT HOLD command followed by an MQTT OFF command when the button is released.
+
 When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness presets are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
 
 

From 1655c1b3aa94055d58535f539081a6b91c0a5e3d Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 16:49:19 +0100
Subject: [PATCH 343/403] Add some wifi debug options

---
 tasmota/settings.h       |  2 +-
 tasmota/settings.ino     | 16 ++------
 tasmota/support_wifi.ino | 80 ++++++++++++++++++++++++++++++----------
 tasmota/tasmota_post.h   |  4 +-
 4 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index fe7c31549..d2570d9ba 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -132,7 +132,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t spare28 : 1;
     uint32_t spare29 : 1;
     uint32_t spare30 : 1;
-    uint32_t spare31 : 1;
+    uint32_t force_sdk_erase : 1;          // bit 31 (v8.1.0.9)  - SetOption113 - Force erase of SDK wifi calibrate secore on restart
   };
 } SysBitfield4;
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index c2ddc6607..1563897b0 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -745,6 +745,7 @@ void SettingsErase(uint8_t type)
     1 = Erase 16k SDK parameter area near end of flash as seen by SDK (0x0xFCxxx - 0x0xFFFFF) solving possible wifi errors
     2 = Erase Tasmota parameter area (0x0xF3xxx - 0x0xFBFFF)
     3 = Erase Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
+    4 = Erase SDK parameter area used for wifi calibration (0x0FCxxx - 0x0FCFFF)
   */
 
 #ifndef FIRMWARE_MINIMAL
@@ -762,16 +763,17 @@ void SettingsErase(uint8_t type)
     _sectorStart = SETTINGS_LOCATION - CFG_ROTATES;                       // Tasmota and SDK parameter area (0x0F3xxx - 0x0FFFFF)
     _sectorEnd = ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE;             // Flash size as seen by SDK
   }
-#ifdef USE_WIFI_SDK_ERASE
   else if (4 == type) {
+//    _sectorStart = (ESP.getFlashChipSize() / SPI_FLASH_SEC_SIZE) - 4;     // SDK phy area and Core calibration sector (0x0FC000)
     _sectorStart = SETTINGS_LOCATION +1;                                  // SDK phy area and Core calibration sector (0x0FC000)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0x0FCFFF)
   }
+/*
   else if (5 == type) {
     _sectorStart = (ESP.getFlashChipRealSize() / SPI_FLASH_SEC_SIZE) -4;  // SDK phy area and Core calibration sector (0xxFC000)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
   }
-#endif  // USE_WIFI_SDK_ERASE
+*/
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
@@ -786,16 +788,6 @@ void SettingsSdkErase(void)
   delay(1000);
 }
 
-#ifdef USE_WIFI_SDK_ERASE
-void SettingsSdkWifiErase(void)
-{
-  WiFi.disconnect(false);    // Delete SDK wifi config
-  SettingsErase(4);
-  SettingsErase(5);
-  delay(200);
-}
-#endif  // USE_WIFI_SDK_ERASE
-
 /********************************************************************************************/
 
 void SettingsDefault(void)
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index dd8d2441c..93dba06a9 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -21,6 +21,10 @@
  * Wifi
 \*********************************************************************************************/
 
+// Enable only one of two below debug options
+//#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
+#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
+
 #ifndef WIFI_RSSI_THRESHOLD
 #define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network
 #endif
@@ -609,6 +613,32 @@ void WifiSetOutputPower(void)
   WiFi.setOutputPower((float)(Settings.wifi_output_power) / 10);
 }
 
+/*
+  See Esp.h, core_esp8266_phy.cpp and test_overrides.ino
+  RF_DEFAULT = 0,  // RF_CAL or not after deep-sleep wake up, depends on init data byte 108.
+  RF_CAL = 1,      // RF_CAL after deep-sleep wake up, there will be large current.
+  RF_NO_CAL = 2,   // no RF_CAL after deep-sleep wake up, there will only be small current.
+  RF_DISABLED = 4  // disable RF after deep-sleep wake up, just like modem sleep, there will be the smallest current.
+*/
+#ifdef WIFI_RF_MODE_RF_CAL
+#ifndef USE_DEEPSLEEP
+RF_MODE(RF_CAL);
+#endif  // USE_DEEPSLEEP
+#endif  // WIFI_RF_MODE_RF_CAL
+
+#ifdef WIFI_RF_PRE_INIT
+bool rf_pre_init_flag = false;
+RF_PRE_INIT()
+{
+#ifndef USE_DEEPSLEEP
+  system_deep_sleep_set_option(1);   // The option is 1 by default.
+  system_phy_set_rfoption(RF_CAL);
+#endif  // USE_DEEPSLEEP
+  system_phy_set_powerup_option(3);  // 3: RF initialization will do the whole RF calibration which will take about 200ms; this increases the current consumption.
+  rf_pre_init_flag = true;
+}
+#endif  // WIFI_RF_PRE_INIT
+
 void WifiConnect(void)
 {
   WifiSetState(0);
@@ -618,37 +648,47 @@ void WifiConnect(void)
   Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
+
+#ifdef WIFI_RF_PRE_INIT
+  if (rf_pre_init_flag) {
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_WIFI "Pre-init done"));
+  }
+#endif  // WIFI_RF_PRE_INIT
 }
 
-// Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
-// Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
-void WifiDisconnect(void)
-{
-#ifdef USE_WIFI_SDK_ERASE     // Do not enable with DeepSleep as it will wear out flash
-  SettingsSdkWifiErase();
-#else
-  // Courtesy of EspEasy
-  WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
-  ETS_UART_INTR_DISABLE();
-  wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
-  ETS_UART_INTR_ENABLE();
-  WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
-  delay(100);                 // Flush anything in the network buffers.
-#endif  // USE_WIFI_SDK_ERASE
-}
-
-void WifiShutdown(void)
+void WifiShutdown(bool option = false)
 {
+  // option = false - Legacy disconnect also used by DeepSleep
+  // option = true  - Disconnect with SDK wifi calibrate sector erase
   delay(100);                 // Allow time for message xfer - disabled v6.1.0b
+
+#ifdef USE_EMULATION
+  UdpDisconnect();
+#endif  // USE_EMULATION
+
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     MqttDisconnect();
   }
-  WifiDisconnect();
+
+  if (option && Settings.flag4.force_sdk_erase) {  // SetOption113 - Force erase of SDK wifi calibrate sector on restart
+    WiFi.disconnect(false);   // Disconnect wifi
+    SettingsErase(4);         // Delete SDK wifi config and calibrate data
+  } else {
+    // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
+    // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
+    // Courtesy of EspEasy
+    WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
+    ETS_UART_INTR_DISABLE();
+    wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
+    ETS_UART_INTR_ENABLE();
+    WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
+  }
+  delay(100);                 // Flush anything in the network buffers.
 }
 
 void EspRestart(void)
 {
-  WifiShutdown();
+  WifiShutdown(true);
   CrashDumpClear();           // Clear the stack dump in RTC
 //  ESP.restart();            // This results in exception 3 on restarts on core 2.3.0
   ESP.reset();
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 5f031a2f9..d8a8ea5d1 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -708,11 +708,11 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #endif
 
 #ifndef MESSZ
-//#define MESSZ                  1040              // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)
+//#define MESSZ                  1040            // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)
 #define MESSZ                  (MQTT_MAX_PACKET_SIZE -TOPSZ -7)  // Max number of characters in JSON message string
 #endif
 
-//#include <core_version.h>                        // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)
+//#include <core_version.h>                      // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)
 #ifndef ARDUINO_ESP8266_RELEASE
 #define ARDUINO_ESP8266_RELEASE "STAGE"
 #endif

From 8ca95996f98d64e868945097a023d5d66ac1526c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 25 Feb 2020 16:52:07 +0100
Subject: [PATCH 344/403] Restore default wifi functionality

---
 tasmota/support_wifi.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 93dba06a9..8f7de0f96 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -23,7 +23,7 @@
 
 // Enable only one of two below debug options
 //#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
-#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
+//#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
 
 #ifndef WIFI_RSSI_THRESHOLD
 #define WIFI_RSSI_THRESHOLD     10         // Difference in dB between current network and scanned network

From 344187cf94d03464408c9f15dd8cdd126e44f065 Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Tue, 25 Feb 2020 17:55:45 +0100
Subject: [PATCH 345/403] minor bug fixes and enhancements

- fix bug in multi-push from last commit
- remove rules execution every second. only at start and stop
- enable rules for Shutter#Button
- tbd: How to correctly detect a simultaneous button push
---
 tasmota/xdrv_27_shutter.ino | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 6f4d711d7..1131a5f70 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -255,6 +255,7 @@ void ShutterInit(void)
 void ShutterReportPosition(bool always)
 {
   Response_P(PSTR("{"));
+  rules_flag.shutter_moving = 0;
   for (uint32_t i = 0; i < shutters_present; i++) {
     //AddLog_P2(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d: Real Pos: %d"), i+1,Shutter.real_position[i]);
     uint32_t position = ShutterRealToPercentPosition(Shutter.real_position[i], i);
@@ -268,7 +269,6 @@ void ShutterReportPosition(bool always)
   ResponseJsonEnd();
   if (always || (rules_flag.shutter_moving)) {
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
-    XdrvRulesProcess();
   }
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
 
@@ -299,18 +299,23 @@ void ShutterUpdatePosition(void)
         int32_t  max_freq_change_per_sec =  Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
         int32_t  min_runtime_ms = Shutter.pwm_frequency[i]*1000 / max_freq_change_per_sec;
         int32_t  velocity = Shutter.direction[i] == 1 ? 100 : Shutter.close_velocity[i];
-        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency  * Shutter.direction[i] ;
+        int32_t  minstopway = min_runtime_ms * velocity / 100 * Shutter.pwm_frequency[i] / max_frequency * Shutter.direction[i] ;
 
         int32_t  next_possible_stop = Shutter.real_position[i] + minstopway ;
         stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
+        if (Shutter.time[i] == 1) {
+          ShutterReportPosition(true);
+          rules_flag.shutter_moving = 1;
+          XdrvRulesProcess();
+        }
         //Shutter.accelerator[i] = tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
         //int32_t act_freq_change = max_freq_change_per_sec/20;
         AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
                                       Shutter.pwm_frequency[i],max_frequency, Shutter.accelerator[i],min_runtime_ms,Shutter.real_position[i], next_possible_stop,Shutter.target_position[i]);
 
-        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > Shutter.target_position[i] * Shutter.direction[i] ) {
+        if (Shutter.accelerator[i] < 0 || next_possible_stop * Shutter.direction[i] > (Shutter.target_position[i]- (100 * Shutter.direction[i])) * Shutter.direction[i] ) {
 
-            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*12/200);
+            Shutter.accelerator[i] = - tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
             //AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Ramp down: acc: %d"),   Shutter.accelerator[i]);
         } else if (  Shutter.accelerator[i] > 0 && Shutter.pwm_frequency[i] ==  max_frequency) {
           Shutter.accelerator[i] = 0;
@@ -348,7 +353,7 @@ void ShutterUpdatePosition(void)
             }
             analogWrite(pin[GPIO_PWM1+i], 0);
             Shutter.real_position[i] = ShutterCounterBasedPosition(i);
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Real %d, pulsecount %d, start %d"), Shutter.real_position[i],RtcSettings.pulse_counter[i], Shutter.start_position[i]);
 
             if ((1 << (Settings.shutter_startrelay[i]-1)) & power) {
               ExecuteCommandPower(Settings.shutter_startrelay[i], 0, SRC_SHUTTER);
@@ -422,6 +427,8 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
     Shutter.time[i] = 0;
     Shutter.skip_relay_change = 0;
     Shutter.direction[i] = direction;
+    rules_flag.shutter_moving = 1;
+    rules_flag.shutter_moved  = 0;
     //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: real %d, start %d, counter %d, max_freq %d, dir %d, freq %d"),Shutter.real_position[i], Shutter.start_position[i] ,RtcSettings.pulse_counter[i],Shutter.max_pwm_frequency , Shutter.direction[i] ,Shutter.max_pwm_frequency );
   }
   //AddLog_P2(LOG_LEVEL_INFO,  PSTR("SHT: Start shutter: %d from %d to %d in directin %d"), i, Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i]);
@@ -538,6 +545,7 @@ void ShutterButtonHandler(void)
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
       } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
+        Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
       }
     }
     blinks = 201;
@@ -590,15 +598,16 @@ void ShutterButtonHandler(void)
           // check for simultaneous shutter button press
           uint32 min_shutterbutton_press_counter = -1;
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d, i %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter, i);
+            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (i != button_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
+              AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: min_shutterbutton_press_counter %d"), min_shutterbutton_press_counter);
             }
 
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
-            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT:simultanous presss deteced"));
+            AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: simultanous presss deteced"));
             press_index = Button.press_counter[button_index];
             for (uint32_t i = 0; i < MAX_KEYS; i++)
               if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) != shutter_index))
@@ -678,6 +687,7 @@ void ShutterButtonHandler(void)
     ResponseJsonEnd();
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
     XdrvRulesProcess();
+
   }
 }
 

From f2074932f7113b7143d375539cc89324b7d12493 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 26 Feb 2020 13:45:46 +0100
Subject: [PATCH 346/403] Clean up wifi connection / disconnection

---
 tasmota/settings.h            |  2 +-
 tasmota/settings.ino          |  4 ++++
 tasmota/support_wifi.ino      | 22 ++++++++++++++--------
 tasmota/xdrv_01_webserver.ino |  4 ++++
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index d2570d9ba..be9e7bf40 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -132,7 +132,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t spare28 : 1;
     uint32_t spare29 : 1;
     uint32_t spare30 : 1;
-    uint32_t force_sdk_erase : 1;          // bit 31 (v8.1.0.9)  - SetOption113 - Force erase of SDK wifi calibrate secore on restart
+    uint32_t spare31 : 1;                  // bit 31
   };
 } SysBitfield4;
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 1563897b0..5ebf970d4 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -774,6 +774,10 @@ void SettingsErase(uint8_t type)
     _sectorEnd = _sectorStart +1;                                         // SDK end of phy area and Core calibration sector (0xxFCFFF)
   }
 */
+  else {
+    return;
+  }
+
   AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_ERASE " from 0x%08X to 0x%08X"), _sectorStart * SPI_FLASH_SEC_SIZE, (_sectorEnd * SPI_FLASH_SEC_SIZE) -1);
 
 //  EspErase(_sectorStart, _sectorEnd);                                     // Arduino core and SDK - erases flash as seen by SDK
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 8f7de0f96..c98bdc226 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -21,7 +21,8 @@
  * Wifi
 \*********************************************************************************************/
 
-// Enable only one of two below debug options
+// Enable one of three below options for wifi re-connection debugging
+//#define WIFI_FORCE_RF_CAL_ERASE            // Erase rf calibration sector on restart only
 //#define WIFI_RF_MODE_RF_CAL                // Set RF_MODE to RF_CAL for restart and deepsleep during user_rf_pre_init
 //#define WIFI_RF_PRE_INIT                   // Set RF_MODE to RF_CAL for restart, deepsleep and power on during user_rf_pre_init
 
@@ -34,7 +35,7 @@
 
 const uint8_t WIFI_CONFIG_SEC = 180;       // seconds before restart
 const uint8_t WIFI_CHECK_SEC = 20;         // seconds
-const uint8_t WIFI_RETRY_OFFSET_SEC = 20;  // seconds
+const uint8_t WIFI_RETRY_OFFSET_SEC = 12;  // seconds
 
 #include <ESP8266WiFi.h>                   // Wifi, MQTT, Ota, WifiManager
 #if LWIP_IPV6
@@ -645,7 +646,7 @@ void WifiConnect(void)
   WifiSetOutputPower();
   WiFi.persistent(false);     // Solve possible wifi init errors
   Wifi.status = 0;
-  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
+  Wifi.retry_init = WIFI_RETRY_OFFSET_SEC + (ESP.getChipId() & 0xF);  // Add extra delay to stop overrun by simultanous re-connects
   Wifi.retry = Wifi.retry_init;
   Wifi.counter = 1;
 
@@ -659,29 +660,34 @@ void WifiConnect(void)
 void WifiShutdown(bool option = false)
 {
   // option = false - Legacy disconnect also used by DeepSleep
-  // option = true  - Disconnect with SDK wifi calibrate sector erase
+  // option = true  - Disconnect with SDK wifi calibrate sector erase when WIFI_FORCE_RF_CAL_ERASE enabled
   delay(100);                 // Allow time for message xfer - disabled v6.1.0b
 
 #ifdef USE_EMULATION
   UdpDisconnect();
+  delay(100);                 // Flush anything in the network buffers.
 #endif  // USE_EMULATION
 
   if (Settings.flag.mqtt_enabled) {  // SetOption3 - Enable MQTT
     MqttDisconnect();
+    delay(100);               // Flush anything in the network buffers.
   }
 
-  if (option && Settings.flag4.force_sdk_erase) {  // SetOption113 - Force erase of SDK wifi calibrate sector on restart
+#ifdef WIFI_FORCE_RF_CAL_ERASE
+  if (option) {
     WiFi.disconnect(false);   // Disconnect wifi
     SettingsErase(4);         // Delete SDK wifi config and calibrate data
-  } else {
+  } else
+#endif  // WIFI_FORCE_RF_CAL_ERASE
+  {
     // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
     // Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
     // Courtesy of EspEasy
-    WiFi.persistent(true);      // use SDK storage of SSID/WPA parameters
+    WiFi.persistent(true);    // use SDK storage of SSID/WPA parameters
     ETS_UART_INTR_DISABLE();
     wifi_station_disconnect();  // this will store empty ssid/wpa into sdk storage
     ETS_UART_INTR_ENABLE();
-    WiFi.persistent(false);     // Do not use SDK storage of SSID/WPA parameters
+    WiFi.persistent(false);   // Do not use SDK storage of SSID/WPA parameters
   }
   delay(100);                 // Flush anything in the network buffers.
 }
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 705bd4a15..7e7292a8c 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1893,6 +1893,7 @@ void HandleOtherConfiguration(void)
   }
 
 #ifdef USE_EMULATION
+#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
   WSContentSend_P(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));  // Keep close to Friendlynames so do not use <br>
   for (uint32_t i = 0; i < EMUL_MAX; i++) {
 #ifndef USE_EMULATION_WEMO
@@ -1910,6 +1911,7 @@ void HandleOtherConfiguration(void)
     }
   }
   WSContentSend_P(PSTR("</p></fieldset>"));
+#endif  // USE_EMULATION_WEMO || USE_EMULATION_HUE
 #endif  // USE_EMULATION
 
   WSContentSend_P(HTTP_FORM_END);
@@ -1928,8 +1930,10 @@ void OtherSaveSettings(void)
   SettingsUpdateText(SET_WEBPWD, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? SettingsText(SET_WEBPWD) : tmp);
   Settings.flag.mqtt_enabled = WebServer->hasArg("b1");  // SetOption3 - Enable MQTT
 #ifdef USE_EMULATION
+#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
   WebGetArg("b2", tmp, sizeof(tmp));
   Settings.flag2.emulation = (!strlen(tmp)) ? 0 : atoi(tmp);
+#endif  // USE_EMULATION_WEMO || USE_EMULATION_HUE
 #endif  // USE_EMULATION
 
   snprintf_P(message, sizeof(message), PSTR(D_LOG_OTHER D_MQTT_ENABLE " %s, " D_CMND_EMULATION " %d, " D_CMND_FRIENDLYNAME), GetStateText(Settings.flag.mqtt_enabled), Settings.flag2.emulation);

From 878d93ebdbd45e47b0704adc4ff23d4508b12630 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 26 Feb 2020 14:39:27 +0100
Subject: [PATCH 347/403] Prepare for PWM Dimmer

Prepare for PWM Dimmer (#7791)
---
 tasmota/settings.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index be9e7bf40..13b4d03a1 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -105,9 +105,9 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
     uint32_t device_groups_enabled : 1;    // bit 3 (v8.1.0.9)   - SetOption85 - Enable Device Groups
-    uint32_t spare04 : 1;
-    uint32_t spare05 : 1;
-    uint32_t spare06 : 1;
+    uint32_t led_timeout : 1;              // bit 4 (v8.1.0.9)   - SetOption86 - Turn brightness LED's off 5 seconds after last change
+    uint32_t powered_off_led : 1;          // bit 5 (v8.1.0.9)   - SetOption87 - Turn red LED on when powered off
+    uint32_t remote_device_mode : 1;       // bit 6 (v8.1.0.9)   - SetOption88 - Buttons control remote devices
     uint32_t spare07 : 1;
     uint32_t spare08 : 1;
     uint32_t spare09 : 1;
@@ -465,9 +465,13 @@ struct SYSCFG {
   uint8_t       mqttlog_level;             // F01
   uint8_t       sps30_inuse_hours;         // F02
   uint8_t       hotplug_scan;              // F03
-  uint8_t       reserved1;                 // F04 - reserved for s-hadinger
+  uint8_t       bri_power_on;              // F04
+  uint8_t       bri_min;                   // F05
+  uint8_t       bri_preset_low;            // F06
+  uint8_t       bri_preset_high;           // F07
+  uint8_t       button_devices;            // F08
 
-  uint8_t       free_f05[199];             // F05
+  uint8_t       free_f05[195];             // F09
 
   uint32_t      device_group_share_in;     // FCC - Bitmask of device group items imported
   uint32_t      device_group_share_out;    // FD0 - Bitmask of device group items exported

From 1f1c956b26a79511929dfa535b820c844010f2a5 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Wed, 26 Feb 2020 21:27:09 -0600
Subject: [PATCH 348/403] Use newly allocated settings and flags

---
 tasmota/my_user_config.h       |  4 +-
 tasmota/settings.h             | 17 +--------
 tasmota/xdrv_35_pwm_dimmer.ino | 68 +++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0aedea795..0ae6d4663 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -415,9 +415,9 @@
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//#define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
+#define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
 #define USE_PWM_DIMMER                          // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
-//#define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
+#define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 13b4d03a1..da8da2f29 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -469,9 +469,8 @@ struct SYSCFG {
   uint8_t       bri_min;                   // F05
   uint8_t       bri_preset_low;            // F06
   uint8_t       bri_preset_high;           // F07
-  uint8_t       button_devices;            // F08
 
-  uint8_t       free_f05[195];             // F09
+  uint8_t       free_f05[196];             // F08
 
   uint32_t      device_group_share_in;     // FCC - Bitmask of device group items imported
   uint32_t      device_group_share_out;    // FD0 - Bitmask of device group items exported
@@ -579,18 +578,4 @@ typedef union {
   ADC_MODE(ADC_VCC);                       // Set ADC input for Power Supply Voltage usage
 #endif
 
-// Settings re-purposed for the PWM_DIMMER module
-#ifdef USE_PWM_DIMMER
-#define led_timeout            light_signal       // SetOption18 - Turn brightness LED's off 5 seconds after last change
-#define powered_off_led        buzzer_enable      // SetOption67 - Turn red LED on when powered off
-#define bri_power_on           pcf8574_config[0]  // Brightness when next powered-on
-#define bri_min                pcf8574_config[1]  // Minimum brightness
-#define bri_preset_low         pcf8574_config[2]  // Bri preset low
-#define bri_preset_high        pcf8574_config[3]  // Bri preset high
-#define button_devices         pcf8574_config[4]  // Button-device map
-#ifdef USE_PWM_DIMMER_REMOTE
-#define remote_device_mode     dds2382_model      // SetOption71 - Buttons control remote devices
-#endif  // USE_PWM_DIMMER_REMOTE
-#endif // USE_PWM_DIMMER
-
 #endif  // _SETTINGS_H_
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index fca67efe6..94bc4ea38 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -48,10 +48,10 @@ void (* const PWMDimmerCommand[])(void) PROGMEM = {
 struct remote_pwm_dimmer {
   power_t power;
   uint8_t light_speed;
-  uint8_t x_bri_power_on;
-  uint8_t x_bri_min;
-  uint8_t x_bri_preset_low;
-  uint8_t x_bri_preset_high;
+  uint8_t bri_power_on;
+  uint8_t bri_min;
+  uint8_t bri_preset_low;
+  uint8_t bri_preset_high;
   uint8_t fixed_color_index;
   uint8_t bri;
   bool power_button_increases_bri;
@@ -98,14 +98,14 @@ void PWMModuleInit()
   Settings.flag.pwm_control = 0;  // Use basic PWM control instead of Light    
 
   if (Settings.last_module != Settings.module) {
-    Settings.bri_min = 8;
+    Settings.bri_min = 25;
     Settings.bri_power_on = 50;
-    Settings.bri_preset_low = 8;
+    Settings.bri_preset_low = 25;
     Settings.bri_preset_high = 255;
     Settings.last_module = Settings.module;
   }
   else {
-    if (Settings.bri_min < 1) Settings.bri_min = 8;
+    if (Settings.bri_min < 1) Settings.bri_min = 25;
     PWMDimmerCheckBri(&Settings.bri_power_on);
     PWMDimmerCheckBri(&Settings.bri_preset_low);
     PWMDimmerCheckBri(&Settings.bri_preset_high);
@@ -132,11 +132,11 @@ void PWMModuleInit()
 void PWMDimmerInit(void)
 {
 #ifdef USE_PWM_DIMMER_REMOTE
-  if (Settings.flag3.remote_device_mode) {
+  if (Settings.flag4.remote_device_mode) {
     if (device_group_count > 1) {
       if ((remote_pwm_dimmers = (struct remote_pwm_dimmer *) calloc(device_group_count - 1, sizeof(struct remote_pwm_dimmer))) == nullptr) {
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("PWMDimmer: error allocating PWM dimmer array"));
-        Settings.flag3.remote_device_mode = false;
+        Settings.flag4.remote_device_mode = false;
       }
     }
   }
@@ -166,7 +166,7 @@ void PWMDimmerSetBrightnessLeds(int32_t operation)
     }
 
     // If enabled, set the LED timeout.
-    if (!operation) led_timeout_time = (current_bri && Settings.flag.led_timeout ? millis() + 5000 : 0);
+    if (!operation) led_timeout_time = (current_bri && Settings.flag4.led_timeout ? millis() + 5000 : 0);
   }
 }
 
@@ -174,7 +174,7 @@ void PWMDimmerSetPoweredOffLed(void)
 {
   // Set the powered-off LED state.
   if (pin[GPIO_LEDLNK] < 99) {
-    bool power_off_led_on = !power && Settings.flag3.powered_off_led;
+    bool power_off_led_on = !power && Settings.flag4.powered_off_led;
     if (ledlnk_inverted) power_off_led_on ^= 1;
     digitalWrite(pin[GPIO_LEDLNK], power_off_led_on);
   }
@@ -370,7 +370,7 @@ void PWMDimmerHandleButton()
 
       // If there are no other buttons pressed right now and remote mode is enabled, make the device
       // associated with this button the device we're going to control.
-      if (buttons_pressed == 1 && Settings.flag3.remote_device_mode) {
+      if (buttons_pressed == 1 && Settings.flag4.remote_device_mode) {
         power_button_index = button_index;
         up_button_index = (button_index == 2 ? 1 : 2);
         down_button_index = (button_index ? 0 : 1);
@@ -439,7 +439,7 @@ void PWMDimmerHandleButton()
         else {
 #ifdef USE_PWM_DIMMER_REMOTE
           if (!active_device_is_local) {
-            active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->x_bri_preset_low;
+            active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->bri_preset_low;
             active_remote_pwm_dimmer->power_button_increases_bri = true;
           }
           else {
@@ -496,7 +496,7 @@ void PWMDimmerHandleButton()
               else {
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->x_bri_preset_low : active_remote_pwm_dimmer->x_bri_preset_high);
+                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
                 else
 #endif  // USE_PWM_DIMMER_REMOTE
                   target_bri = (down_button_is_held ? Settings.bri_preset_low : Settings.bri_preset_high);
@@ -563,7 +563,7 @@ void PWMDimmerHandleButton()
                 // Decrease/increase the minimum brightness.
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  uint8_value = active_remote_pwm_dimmer->x_bri_min;
+                  uint8_value = active_remote_pwm_dimmer->bri_min;
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_min;
@@ -575,8 +575,8 @@ void PWMDimmerHandleButton()
                 }
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local) {
-                  active_remote_pwm_dimmer->x_bri_min = uint8_value;
-                  if (active_remote_pwm_dimmer->x_bri_power_on < uint8_value) active_remote_pwm_dimmer->x_bri_power_on = uint8_value;
+                  active_remote_pwm_dimmer->bri_min = uint8_value;
+                  if (active_remote_pwm_dimmer->bri_power_on < uint8_value) active_remote_pwm_dimmer->bri_power_on = uint8_value;
                 }
                 else {
 #endif // USE_PWM_DIMMER_REMOTE
@@ -618,8 +618,8 @@ void PWMDimmerHandleButton()
                 // Decrease/increase the low brightness preset.
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local) {
-                  uint8_value = active_remote_pwm_dimmer->x_bri_preset_low;
-                  min_uint8_value =active_remote_pwm_dimmer->x_bri_min;
+                  uint8_value = active_remote_pwm_dimmer->bri_preset_low;
+                  min_uint8_value =active_remote_pwm_dimmer->bri_min;
                 }
                 else {
 #endif // USE_PWM_DIMMER_REMOTE
@@ -636,7 +636,7 @@ void PWMDimmerHandleButton()
                 }
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  active_remote_pwm_dimmer->x_bri_preset_low = uint8_value;
+                  active_remote_pwm_dimmer->bri_preset_low = uint8_value;
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   Settings.bri_preset_low = uint8_value;
@@ -647,7 +647,7 @@ void PWMDimmerHandleButton()
                 // Decrease/increase the high brightness preset.
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  uint8_value = active_remote_pwm_dimmer->x_bri_preset_high;
+                  uint8_value = active_remote_pwm_dimmer->bri_preset_high;
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_high;
@@ -659,7 +659,7 @@ void PWMDimmerHandleButton()
                 }
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  active_remote_pwm_dimmer->x_bri_preset_high = uint8_value;
+                  active_remote_pwm_dimmer->bri_preset_high = uint8_value;
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   Settings.bri_preset_high = uint8_value;
@@ -714,7 +714,7 @@ void PWMDimmerHandleButton()
 #endif  // USE_DEVICE_GROUPS
 #ifdef USE_PWM_DIMMER_REMOTE
         if (!active_device_is_local)
-          active_remote_pwm_dimmer->x_bri_power_on = active_remote_pwm_dimmer->bri = new_bri;
+          active_remote_pwm_dimmer->bri_power_on = active_remote_pwm_dimmer->bri = new_bri;
         else {
 #endif  // USE_PWM_DIMMER_REMOTE
           Settings.bri_power_on = target_bri = new_bri;
@@ -772,7 +772,7 @@ void PWMDimmerHandleButton()
 #ifdef USE_PWM_DIMMER_REMOTE
               if (active_device_is_local) {
 #endif // USE_PWM_DIMMER_REMOTE
-                Settings.flag3.powered_off_led ^= 1;
+                Settings.flag4.powered_off_led ^= 1;
                 PWMDimmerSetPoweredOffLed();
 #ifdef USE_PWM_DIMMER_REMOTE
               }
@@ -803,8 +803,8 @@ void PWMDimmerHandleButton()
 #ifdef USE_PWM_DIMMER_REMOTE
               if (active_device_is_local) {
 #endif // USE_PWM_DIMMER_REMOTE
-                Settings.flag.led_timeout ^= 1;
-                if (relay_is_on) PWMDimmerSetBrightnessLeds(Settings.flag.led_timeout ? -1 : 0);
+                Settings.flag4.led_timeout ^= 1;
+                if (relay_is_on) PWMDimmerSetBrightnessLeds(Settings.flag4.led_timeout ? -1 : 0);
 #ifdef USE_PWM_DIMMER_REMOTE
               }
 #endif // USE_PWM_DIMMER_REMOTE
@@ -818,7 +818,7 @@ void PWMDimmerHandleButton()
       else {
 #ifdef USE_PWM_DIMMER_REMOTE
         if (!active_device_is_local)
-          active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->x_bri_power_on;
+          active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->bri_power_on;
         else
 #endif  // USE_PWM_DIMMER_REMOTE
           target_bri = Settings.bri_power_on;
@@ -1021,14 +1021,14 @@ void CmndLedTimeout(void)
   switch (XdrvMailbox.payload) {
   case 0: // Off
   case 1: // On
-    Settings.flag.led_timeout = XdrvMailbox.payload;
+    Settings.flag4.led_timeout = XdrvMailbox.payload;
     break;
   case 2: // Toggle
-    Settings.flag.led_timeout ^= 1;
+    Settings.flag4.led_timeout ^= 1;
     break;
   }
   if (relay_is_on) PWMDimmerSetBrightnessLeds(0);
-  ResponseCmndStateText(Settings.flag.led_timeout);
+  ResponseCmndStateText(Settings.flag4.led_timeout);
 }
 
 void CmndPoweredOffLed(void)
@@ -1037,14 +1037,14 @@ void CmndPoweredOffLed(void)
   switch (XdrvMailbox.payload) {
   case 0: // Off
   case 1: // On
-    Settings.flag3.powered_off_led = XdrvMailbox.payload;
+    Settings.flag4.powered_off_led = XdrvMailbox.payload;
     break;
   case 2: // Toggle
-    Settings.flag3.powered_off_led ^= 1;
+    Settings.flag4.powered_off_led ^= 1;
     break;
   }
   PWMDimmerSetPoweredOffLed();
-  ResponseCmndStateText(Settings.flag3.powered_off_led);
+  ResponseCmndStateText(Settings.flag4.powered_off_led);
 }
 
 /*********************************************************************************************\
@@ -1118,7 +1118,7 @@ bool Xdrv35(uint8_t function)
 #ifdef USE_PWM_DIMMER_REMOTE
       // If remote device mode is enabled, set the device group count to the number of buttons
       // present.
-      if (Settings.flag3.remote_device_mode) {
+      if (Settings.flag4.remote_device_mode) {
         for (uint32_t button_index = 0; button_index < MAX_KEYS; button_index++) {
           if (pin[GPIO_KEY1 + button_index] < 99) device_group_count++;
         }

From d8fcb396f6da31187fe2dc9179e5826b3f977202 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Wed, 26 Feb 2020 21:30:30 -0600
Subject: [PATCH 349/403] Doc update

---
 PWM_Dimmer.md | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index 172a7663a..cc45466a3 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -11,7 +11,7 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster as higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
@@ -99,7 +99,7 @@ Holding any button for over 10 seconds executes the WiFiConfig 2 command.
 
 Pressing and releasing a button publishes an MQTT TOGGLE command. Holding a button publishes an MQTT HOLD command followed by an MQTT OFF command when the button is released.
 
-When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness presets are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
+When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness presets, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
 
 
 ### Commands
@@ -125,7 +125,7 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness
   <tr>
    <td>BriPreset
    </td>
-   <td><low>,&lt;high> = set brightness low and high presets
+   <td> &lt;low>,&lt;high> = set brightness low and high presets
 <p>
 1..255 = set brightness preset
 <p>
@@ -178,6 +178,36 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness
 - = decrease speed
    </td>
   </tr>
+  <tr>
+   <td>SetOption86
+   </td>
+   <td>Set brightness LED timeout
+<p>
+0 = disable timeout (default)
+<p>
+1 = enable timeout
+   </td>
+  </tr>
+  <tr>
+   <td>SetOption87
+   </td>
+   <td>Set powered-off LED (nightlight)
+<p>
+0 = disable powered-off LED (default)
+<p>
+1 = enable powered-off LED
+   </td>
+  </tr>
+  <tr>
+   <td>SetOption88
+   </td>
+   <td>Set remote device mode
+<p>
+0 = disable remote device mode(default)
+<p>
+1 = enable remote device mode
+   </td>
+  </tr>
 </table>
 
 

From 33a6f28ae3c8f63893631d809fd952186643b4c3 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Wed, 26 Feb 2020 21:46:09 -0600
Subject: [PATCH 350/403] Doc update

---
 PWM_Dimmer.md | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index 172a7663a..cc45466a3 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -11,7 +11,7 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster as higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
@@ -99,7 +99,7 @@ Holding any button for over 10 seconds executes the WiFiConfig 2 command.
 
 Pressing and releasing a button publishes an MQTT TOGGLE command. Holding a button publishes an MQTT HOLD command followed by an MQTT OFF command when the button is released.
 
-When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness presets are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
+When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness presets, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
 
 
 ### Commands
@@ -125,7 +125,7 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness
   <tr>
    <td>BriPreset
    </td>
-   <td><low>,&lt;high> = set brightness low and high presets
+   <td> &lt;low>,&lt;high> = set brightness low and high presets
 <p>
 1..255 = set brightness preset
 <p>
@@ -178,6 +178,36 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness and brightness
 - = decrease speed
    </td>
   </tr>
+  <tr>
+   <td>SetOption86
+   </td>
+   <td>Set brightness LED timeout
+<p>
+0 = disable timeout (default)
+<p>
+1 = enable timeout
+   </td>
+  </tr>
+  <tr>
+   <td>SetOption87
+   </td>
+   <td>Set powered-off LED (nightlight)
+<p>
+0 = disable powered-off LED (default)
+<p>
+1 = enable powered-off LED
+   </td>
+  </tr>
+  <tr>
+   <td>SetOption88
+   </td>
+   <td>Set remote device mode
+<p>
+0 = disable remote device mode(default)
+<p>
+1 = enable remote device mode
+   </td>
+  </tr>
 </table>
 
 

From 47925c6f6281ed1f47f85b7b82543c92d2b50228 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Wed, 26 Feb 2020 21:47:08 -0600
Subject: [PATCH 351/403] Correct remote device mode option in doc

---
 PWM_Dimmer.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index cc45466a3..da687bcf2 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -218,7 +218,7 @@ Remote device mode allows PWM Dimmer switches to control remote devices. With re
 
 To include remote device mode support in the build, define USE_PWM_DIMMER_REMOTE in your user_config_override. Remote device mode support requires device group support so USE_DEVICE_GROUPS is automatically defined if USE_PWM_DIMMER_REMOTE is defined. Remote device mode support adds 0.7K to the code size in addition to the code size required for device groups support.
 
-To enable remote device mode, set Option71 to 1. Each remote device must be running firmware with device group support and have remote device support enabled. The remote devices do not need to be built with PWM dimmer support nor do they need to be switches.
+To enable remote device mode, set Option88 to 1. Each remote device must be running firmware with device group support and have remote device support enabled. The remote devices do not need to be built with PWM dimmer support nor do they need to be switches.
 
 If a remote device is a PWM dimmer, the device acts like a 3-way dimmer switch would and may or may not have a load connected to it. It’s also possible to use a PWM dimmer switch without a load to act as a wall switch to control the power, brightness and color of one or more smart lights with Tasmota with device group support loaded on them.
 

From edf223e4ac47ddc82d5e87913856ecf7b989cbb2 Mon Sep 17 00:00:00 2001
From: stefanbode <stefan_bode@web.de>
Date: Thu, 27 Feb 2020 08:32:05 +0100
Subject: [PATCH 352/403] Ensure rule execution at start

- fix report of TARGET in Teleperiod message
- enhance Rules support to ensure rule is triggered at start ALWAYS and not crashes on complex rules
- Fixes wong TARGET on shutterinvert=1
---
 tasmota/xdrv_27_shutter.ino | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 1131a5f70..96d9ccf5c 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -75,6 +75,7 @@ struct SHUTTER {
   uint16_t max_close_pwm_frequency[MAX_SHUTTERS];// maximum of PWM frequency for closeing the shutter. depend on the motor and drivers
   uint8_t skip_relay_change;                 // avoid overrun at endstops
   int32_t accelerator[MAX_SHUTTERS];         // speed of ramp-up, ramp down of shutter
+  uint8_t start_reported = 0;
 } Shutter;
 
 void ShutterLogPos(uint32_t i)
@@ -264,12 +265,15 @@ void ShutterReportPosition(bool always)
       ShutterLogPos(i);
     }
     if (i) { ResponseAppend_P(PSTR(",")); }
-    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i], ShutterRealToPercentPosition(Shutter.target_position[i], i));
+    uint32_t target = ShutterRealToPercentPosition(Shutter.target_position[i], i);
+    ResponseAppend_P(JSON_SHUTTER_POS, i+1, (Settings.shutter_options[i] & 1) ? 100-position : position, Shutter.direction[i],(Settings.shutter_options[i] & 1) ? 100-target : target );
   }
   ResponseJsonEnd();
   if (always || (rules_flag.shutter_moving)) {
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
+    //XdrvRulesProcess();  //removed because to many exceptions and reboots.
   }
+
   //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: rules_flag.shutter_moving: %d, moved %d"), rules_flag.shutter_moving, rules_flag.shutter_moved);
 
 }
@@ -294,6 +298,11 @@ void ShutterUpdatePosition(void)
         // Calculate position with counter. Much more accurate and no need for motordelay workaround
         //                        adding some steps to stop early
         Shutter.real_position[i] =  ShutterCounterBasedPosition(i);
+        if (!Shutter.start_reported) {
+          ShutterReportPosition(true);
+          XdrvRulesProcess();
+          Shutter.start_reported = 1;
+        }
 
         int32_t  max_frequency = Shutter.direction[i] == 1 ? Shutter.max_pwm_frequency : Shutter.max_close_pwm_frequency[i];
         int32_t  max_freq_change_per_sec =  Shutter.max_pwm_frequency*steps_per_second / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
@@ -303,11 +312,7 @@ void ShutterUpdatePosition(void)
 
         int32_t  next_possible_stop = Shutter.real_position[i] + minstopway ;
         stop_position_delta =200 * Shutter.pwm_frequency[i]/max_frequency + Shutter.direction[i] * (next_possible_stop - Shutter.target_position[i]);
-        if (Shutter.time[i] == 1) {
-          ShutterReportPosition(true);
-          rules_flag.shutter_moving = 1;
-          XdrvRulesProcess();
-        }
+
         //Shutter.accelerator[i] = tmin(tmax(max_freq_change_per_sec*(100-(Shutter.direction[i]*(Shutter.target_position[i]-next_possible_stop)    ))/2000 , max_freq_change_per_sec*9/200), max_freq_change_per_sec*11/200);
         //int32_t act_freq_change = max_freq_change_per_sec/20;
         AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: time: %d, velocity %d, minstopway %d,cur_freq %d, max_frequency %d, act_freq_change %d, min_runtime_ms %d, act.pos %d, next_stop %d, target: %d"),Shutter.time[i],velocity,minstopway,
@@ -415,10 +420,7 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
       Shutter.pwm_frequency[i] = 0;
       analogWriteFreq(Shutter.pwm_frequency[i]);
       analogWrite(pin[GPIO_PWM1+i], 0);
-      // can be operated without counter, but then not that acurate.
-      if (pin[GPIO_CNTR1+i] < 99) {
-        RtcSettings.pulse_counter[i] = 0;
-      }
+      RtcSettings.pulse_counter[i] = 0;
       Shutter.accelerator[i] = Shutter.max_pwm_frequency / (Shutter.motordelay[i]>0 ? Shutter.motordelay[i] : 1);
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Ramp up: %d"), Shutter.accelerator[i]);
     }
@@ -429,6 +431,7 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
     Shutter.direction[i] = direction;
     rules_flag.shutter_moving = 1;
     rules_flag.shutter_moved  = 0;
+    Shutter.start_reported = 0;
     //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: real %d, start %d, counter %d, max_freq %d, dir %d, freq %d"),Shutter.real_position[i], Shutter.start_position[i] ,RtcSettings.pulse_counter[i],Shutter.max_pwm_frequency , Shutter.direction[i] ,Shutter.max_pwm_frequency );
   }
   //AddLog_P2(LOG_LEVEL_INFO,  PSTR("SHT: Start shutter: %d from %d to %d in directin %d"), i, Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i]);
@@ -1155,9 +1158,11 @@ bool Xdrv27(uint8_t function)
         break;
       case FUNC_JSON_APPEND:
         for (uint8_t i = 0; i < shutters_present; i++) {
-          uint8_t position =  (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i]: Settings.shutter_position[i];
+          uint8_t position = (Settings.shutter_options[i] & 1) ? 100 - Settings.shutter_position[i] : Settings.shutter_position[i];
+          uint8_t target   = (Settings.shutter_options[i] & 1) ? 100 - ShutterRealToPercentPosition(Shutter.target_position[i], i) : ShutterRealToPercentPosition(Shutter.target_position[i], i);
+
           ResponseAppend_P(",");
-          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i]);
+          ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter.direction[i],target);
 #ifdef USE_DOMOTICZ
           if ((0 == tele_period) && (0 == i)) {
              DomoticzSensor(DZ_SHUTTER, position);

From b4b5eb878cf5735523084f9dd10228ee498aad03 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 27 Feb 2020 11:16:38 +0100
Subject: [PATCH 353/403] Add support for PWM dimmer

Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
---
 RELEASENOTES.md          | 1 +
 tasmota/CHANGELOG.md     | 1 +
 tasmota/my_user_config.h | 8 ++++----
 tasmota/tasmota_post.h   | 8 ++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1c4197a19..40de48d5f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -107,3 +107,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
 - Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
+- Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index fc1538101..17da327d6 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
 - Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
+- Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
 
 ### 8.1.0.8 20200212
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 0ae6d4663..50b988201 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -413,11 +413,11 @@
 //#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+11k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
 //#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
-//  #define EXS_MCU_CMNDS                            // Add command to send MCU commands (+0k8 code)
+//  #define EXS_MCU_CMNDS                          // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-#define USE_DEVICE_GROUPS                       // Add support for device groups (+3k5 code)
-#define USE_PWM_DIMMER                          // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
-#define USE_PWM_DIMMER_REMOTE                   // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
+//#define USE_DEVICE_GROUPS                        // Add support for device groups (+5k6 code)
+#define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+//  #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index d8a8ea5d1..e4834331d 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -76,9 +76,9 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #ifdef USE_PWM_DIMMER_REMOTE
 #ifdef USE_PWM_DIMMER
 #ifndef USE_DEVICE_GROUPS
-#define USE_DEVICE_GROUPS 
+#define USE_DEVICE_GROUPS
 #endif  // USE_DEVICE_GROUPS
-#else  // USE_PWM_DIMMER
+#else   // USE_PWM_DIMMER
 #undef USE_PWM_DIMMER_REMOTE
 #endif  // USE_PWM_DIMMER
 #endif  // USE_PWM_DIMMER_REMOTE
@@ -115,6 +115,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
 #define USE_EXS_DIMMER                           // Add support for EX-Store WiFi Dimmer
 #define USE_HOTPLUG                              // Add support for sensor HotPlug
+#define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 
 // -- Optional light modules ----------------------
 #define USE_LIGHT                                // Add Dimmer/Light support
@@ -299,6 +300,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
+#undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors (-14k code)
@@ -377,6 +379,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
+#undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 
 // -- Optional light modules ----------------------
@@ -600,6 +603,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
+#undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 
 // -- Optional light modules ----------------------

From 5cfe247611ee4b674e2fc3292bc7cff9696c9ae3 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 27 Feb 2020 15:10:42 +0100
Subject: [PATCH 354/403] Change default my_user_config.h driver and sensor
 support

Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
---
 BUILDS.md                    | 34 ++++++++++++++++++----------------
 RELEASENOTES.md              |  3 ++-
 tasmota/CHANGELOG.md         |  4 ++++
 tasmota/my_user_config.h     | 32 ++++++++++++++++----------------
 tasmota/settings.h           |  6 +++---
 tasmota/support_features.ino |  9 ++++++---
 tasmota/tasmota_post.h       | 20 ++++++++++++--------
 tasmota/tasmota_version.h    |  2 +-
 tools/decode-status.py       |  9 ++++++---
 9 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/BUILDS.md b/BUILDS.md
index 88ee58cd0..d2ca20438 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -32,16 +32,18 @@
 | ROTARY_V1             | - | - | - | - | - | - | - |
 | USE_SONOFF_RF         | - | - | x | x | x | - | - |
 | USE_RF_FLASH          | - | - | x | x | x | - | - |
-| USE_SONOFF_SC         | - | - | x | - | x | - | - |
+| USE_SONOFF_SC         | - | - | x | x | x | - | - |
 | USE_TUYA_MCU          | - | x | x | x | x | - | x |
 | USE_ARMTRONIX_DIMMERS | - | - | x | x | - | - | - |
 | USE_PS_16_DZ          | - | - | x | x | x | - | - |
 | USE_SONOFF_IFAN       | - | - | x | x | x | - | - |
 | USE_BUZZER            | - | - | x | x | x | - | - |
 | USE_ARILUX_RF         | - | - | x | x | x | - | - |
-| USE_SHUTTER           | - | - | - | - | - | - | - |
+| USE_SHUTTER           | - | - | x | x | - | - | - |
 | USE_DEEPSLEEP         | - | - | x | - | x | - | - |
 | USE_EXS_DIMMER        | - | - | x | x | - | - | - |
+| USE_DEVICE_GROUPS     | - | - | x | - | - | - | - |
+| USE_PWM_DIMMER        | - | - | x | x | - | - | - |
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_LIGHT             | - | x | x | x | x | x | x |
@@ -73,28 +75,28 @@
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_I2C               | - | - | x | x | x | - | x |
-| USE_SHT               | - | - | x | x | x | - | x |
-| USE_HTU               | - | - | x | x | x | - | x |
-| USE_BMP               | - | - | x | x | x | - | x |
+| USE_SHT               | - | - | - | - | x | - | - |
+| USE_HTU               | - | - | - | - | x | - | - |
+| USE_BMP               | - | - | - | - | x | - | - |
 | USE_BME680            | - | - | - | - | x | - | - |
-| USE_BH1750            | - | - | x | x | x | - | x |
+| USE_BH1750            | - | - | - | - | x | - | - |
 | USE_VEML6070          | - | - | - | - | x | - | - |
 | USE_ADS1115           | - | - | - | - | x | - | - |
 | USE_ADS1115_I2CDEV    | - | - | - | - | - | - | - |
 | USE_INA219            | - | - | - | - | x | - | - |
 | USE_INA226            | - | - | - | - | - | - | - |
-| USE_SHT3X             | - | - | x | x | x | - | x |
+| USE_SHT3X             | - | - | - | - | x | - | - |
 | USE_TSL2561           | - | - | - | - | x | - | - |
 | USE_TSL2591           | - | - | - | - | - | - | - |
 | USE_MGS               | - | - | - | - | x | - | - |
-| USE_SGP30             | - | - | x | x | x | - | x |
+| USE_SGP30             | - | - | - | - | x | - | - |
 | USE_SI1145            | - | - | - | - | - | - | - |
-| USE_LM75AD            | - | - | x | x | x | - | x |
+| USE_LM75AD            | - | - | - | - | x | - | - |
 | USE_APDS9960          | - | - | - | - | - | - | - |
 | USE_MCP230xx          | - | - | - | - | - | - | - |
 | USE_PCA9685           | - | - | - | - | - | - | - |
 | USE_MPR121            | - | - | - | - | - | - | - |
-| USE_CCS811            | - | - | - | - | - | - | - |
+| USE_CCS811            | - | - | - | - | x | - | - |
 | USE_MPU6050           | - | - | - | - | - | - | - |
 | USE_DS3231            | - | - | - | - | - | - | - |
 | USE_MGC3130           | - | - | - | - | - | - | - |
@@ -115,10 +117,10 @@
 |                       |   |   |   |   |   |   |   |
 | Feature or Sensor     | minimal | lite | tasmota | knx | sensors | ir | display | Remarks
 | USE_SPI               | - | - | - | - | - | - | x |
-| USE_MHZ19             | - | - | x | x | x | - | x |
-| USE_SENSEAIR          | - | - | x | x | x | - | x |
-| USE_PMS5003           | - | - | x | x | x | - | x |
-| USE_NOVA_SDS          | - | - | x | x | x | - | x |
+| USE_MHZ19             | - | - | - | - | x | - | - |
+| USE_SENSEAIR          | - | - | - | - | x | - | - |
+| USE_PMS5003           | - | - | - | - | x | - | - |
+| USE_NOVA_SDS          | - | - | - | - | x | - | - |
 | USE_HPMA              | - | - | - | - | x | - | - |
 | USE_SERIAL_BRIDGE     | - | - | x | x | x | - | x |
 | USE_MP3_PLAYER        | - | - | - | - | x | - | - |
@@ -137,9 +139,9 @@
 | USE_IR_RECEIVE        | - | - | x | x | x | x | x |
 | USE_IR_REMOTE_FULL    | - | - | - | - | - | x | - | Enable ALL protocols
 |                       |   |   |   |   |   |   |   |
-| USE_SR04              | - | - | x | x | x | - | x |
+| USE_SR04              | - | - | - | - | x | - | - |
 | USE_TM1638            | - | - | - | - | x | - | - |
-| USE_HX711             | - | - | x | x | x | - | x |
+| USE_HX711             | - | - | - | - | x | - | - |
 | USE_TX20_WIND_SENSOR  | - | - | - | - | x | - | - |
 | USE_RC_SWITCH         | - | - | - | - | x | - | - |
 | USE_RF_SENSOR         | - | - | - | - | x | - | - | AlectoV2 only
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 40de48d5f..c06ce9fd9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,8 +52,9 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 
 ## Changelog
 
-### Version 8.1.0.9
+### Version 8.1.0.10
 
+- Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
 - Change IRremoteESP8266 library updated to v2.7.3
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 17da327d6..da6df2e37 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased (development)
 
+### 8.1.0.10 20200227
+
+- Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
+
 ### 8.1.0.9 20200220
 
 - Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621)
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 50b988201..2bd4c6d7c 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -410,14 +410,14 @@
 #define USE_SONOFF_IFAN                          // Add support for Sonoff iFan02 and iFan03 (+2k code)
 #define USE_BUZZER                               // Add support for a buzzer (+0k6 code)
 #define USE_ARILUX_RF                            // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0))
-//#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+11k code)
+#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+11k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
-//#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
+#define USE_EXS_DIMMER                           // Add support for ES-Store WiFi Dimmer (+1k5 code)
 //  #define EXS_MCU_CMNDS                          // Add command to send MCU commands (+0k8 code)
 //#define USE_HOTPLUG                              // Add support for sensor HotPlug
-//#define USE_DEVICE_GROUPS                        // Add support for device groups (+5k6 code)
+#define USE_DEVICE_GROUPS                        // Add support for device groups (+5k6 code)
 #define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
-//  #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
+  #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
@@ -443,25 +443,25 @@
 #define USE_I2C                                  // I2C using library wire (+10k code, 0k2 mem, 124 iram)
 
 #ifdef USE_I2C
-  #define USE_SHT                                // [I2cDriver8] Enable SHT1X sensor (+1k4 code)
-  #define USE_HTU                                // [I2cDriver9] Enable HTU21/SI7013/SI7020/SI7021 sensor (I2C address 0x40) (+1k5 code)
-  #define USE_BMP                                // [I2cDriver10] Enable BMP085/BMP180/BMP280/BME280 sensors (I2C addresses 0x76 and 0x77) (+4k4 code)
+//  #define USE_SHT                                // [I2cDriver8] Enable SHT1X sensor (+1k4 code)
+//  #define USE_HTU                                // [I2cDriver9] Enable HTU21/SI7013/SI7020/SI7021 sensor (I2C address 0x40) (+1k5 code)
+//  #define USE_BMP                                // [I2cDriver10] Enable BMP085/BMP180/BMP280/BME280 sensors (I2C addresses 0x76 and 0x77) (+4k4 code)
 //    #define USE_BME680                           // Enable support for BME680 sensor using Bosch BME680 library (+4k code)
-  #define USE_BH1750                             // [I2cDriver11] Enable BH1750 sensor (I2C address 0x23 or 0x5C) (+0k5 code)
+//  #define USE_BH1750                             // [I2cDriver11] Enable BH1750 sensor (I2C address 0x23 or 0x5C) (+0k5 code)
 //  #define USE_VEML6070                           // [I2cDriver12] Enable VEML6070 sensor (I2C addresses 0x38 and 0x39) (+1k5 code)
     #define USE_VEML6070_RSET    270000          // VEML6070, Rset in Ohm used on PCB board, default 270K = 270000ohm, range for this sensor: 220K ... 1Meg
     #define USE_VEML6070_SHOW_RAW                // VEML6070, shows the raw value of UV-A
 //  #define USE_ADS1115                            // [I2cDriver13] Enable ADS1115 16 bit A/D converter (I2C address 0x48, 0x49, 0x4A or 0x4B) based on Adafruit ADS1x15 library (no library needed) (+0k7 code)
 //  #define USE_INA219                             // [I2cDriver14] Enable INA219 (I2C address 0x40, 0x41 0x44 or 0x45) Low voltage and current sensor (+1k code)
 //  #define USE_INA226                             // [I2cDriver35] Enable INA226 (I2C address 0x40, 0x41 0x44 or 0x45) Low voltage and current sensor (+2k3 code)
-  #define USE_SHT3X                              // [I2cDriver15] Enable SHT3x (I2C address 0x44 or 0x45) or SHTC3 (I2C address 0x70) sensor (+0k7 code)
+//  #define USE_SHT3X                              // [I2cDriver15] Enable SHT3x (I2C address 0x44 or 0x45) or SHTC3 (I2C address 0x70) sensor (+0k7 code)
 //  #define USE_TSL2561                            // [I2cDriver16] Enable TSL2561 sensor (I2C address 0x29, 0x39 or 0x49) using library Joba_Tsl2561 (+2k3 code)
 //  #define USE_TSL2591                            // [I2cDriver40] Enable TSL2591 sensor (I2C address 0x29) using library Adafruit_TSL2591 (+1k6 code)
 //  #define USE_MGS                                // [I2cDriver17] Enable Xadow and Grove Mutichannel Gas sensor using library Multichannel_Gas_Sensor (+10k code)
     #define MGS_SENSOR_ADDR    0x04              // Default Mutichannel Gas sensor i2c address
 //  #define USE_SGP30                              // [I2cDriver18] Enable SGP30 sensor (I2C address 0x58) (+1k1 code)
 //  #define USE_SI1145                             // [I2cDriver19] Enable SI1145/46/47 sensor (I2C address 0x60) (+1k code)
-  #define USE_LM75AD                             // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
+//  #define USE_LM75AD                             // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
 //  #define USE_APDS9960                           // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
 //  #define USE_MCP230xx                           // [I2cDriver22] Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
 //    #define USE_MCP230xx_ADDR 0x20               // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x26 - set according to your wired setup)
@@ -530,13 +530,13 @@
 #endif  // USE_SPI
 
 // -- Serial sensors ------------------------------
-#define USE_MHZ19                                // Add support for MH-Z19 CO2 sensor (+2k code)
-#define USE_SENSEAIR                             // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
+//#define USE_MHZ19                                // Add support for MH-Z19 CO2 sensor (+2k code)
+//#define USE_SENSEAIR                             // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
   #define CO2_LOW              800               // Below this CO2 value show green light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1)
   #define CO2_HIGH             1200              // Above this CO2 value show red light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1)
-#define USE_PMS5003                              // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
+//#define USE_PMS5003                              // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
   //#define PMS_MODEL_PMS3003                      // Enable support of PMS3003 instead of PMS5003/PMS7003 (needs the USE_PMS5003 above)
-#define USE_NOVA_SDS                             // Add support for SDS011 and SDS021 particle concentration sensor (+1k5 code)
+//#define USE_NOVA_SDS                             // Add support for SDS011 and SDS021 particle concentration sensor (+1k5 code)
   #define STARTING_OFFSET      30                // Turn on NovaSDS XX-seconds before tele_period is reached
 //#define USE_HPMA                                 // Add support for Honeywell HPMA115S0 particle concentration sensor (+1k4)
 #define USE_SERIAL_BRIDGE                        // Add support for software Serial Bridge (+0k8 code)
@@ -618,10 +618,10 @@
 
 // -- Other sensors/drivers -----------------------
 
-#define USE_SR04                                 // Add support for HC-SR04 ultrasonic devices (+1k code)
+//#define USE_SR04                                 // Add support for HC-SR04 ultrasonic devices (+1k code)
 
 //#define USE_TM1638                               // Add support for TM1638 switches copying Switch1 .. Switch8 (+1k code)
-#define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
+//#define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
 //  #define USE_HX711_GUI                          // Add optional web GUI to HX711 as scale (+1k8 code)
 
 // Select none or only one of the below defines
diff --git a/tasmota/settings.h b/tasmota/settings.h
index da8da2f29..0a200ead5 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -105,9 +105,9 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t zigbee_use_names : 1;         // bit 1 (v8.1.0.4)   - SetOption83 - Use FriendlyNames instead of ShortAddresses when possible
     uint32_t awsiot_shadow : 1;            // bit 2 (v8.1.0.5)   - SetOption84 - (AWS IoT) publish MQTT state to a device shadow
     uint32_t device_groups_enabled : 1;    // bit 3 (v8.1.0.9)   - SetOption85 - Enable Device Groups
-    uint32_t led_timeout : 1;              // bit 4 (v8.1.0.9)   - SetOption86 - Turn brightness LED's off 5 seconds after last change
-    uint32_t powered_off_led : 1;          // bit 5 (v8.1.0.9)   - SetOption87 - Turn red LED on when powered off
-    uint32_t remote_device_mode : 1;       // bit 6 (v8.1.0.9)   - SetOption88 - Buttons control remote devices
+    uint32_t led_timeout : 1;              // bit 4 (v8.1.0.9)   - SetOption86 - PWM Dimmer Turn brightness LED's off 5 seconds after last change
+    uint32_t powered_off_led : 1;          // bit 5 (v8.1.0.9)   - SetOption87 - PWM Dimmer Turn red LED on when powered off
+    uint32_t remote_device_mode : 1;       // bit 6 (v8.1.0.9)   - SetOption88 - PWM Dimmer Buttons control remote devices
     uint32_t spare07 : 1;
     uint32_t spare08 : 1;
     uint32_t spare09 : 1;
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index b6101b1cf..6cb81522a 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -519,9 +519,12 @@ void GetFeatures(void)
 #ifdef USE_WEMOS_MOTOR_V1
   feature5 |= 0x20000000;  // xdrv_34_wemos_motor_v1.ino
 #endif
-
-//  feature5 |= 0x40000000;
-//  feature5 |= 0x80000000;
+#ifdef USE_DEVICE_GROUPS
+  feature5 |= 0x40000000;  // support_device_groups.ino
+#endif
+#ifdef USE_PWM_DIMMER
+  feature5 |= 0x80000000;  // xdrv_35_pwm_dimmer
+#endif
 
 /*********************************************************************************************/
 
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index e4834331d..8a7c45bbe 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -106,16 +106,17 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #ifndef TUYA_DIMMER_ID
   #define TUYA_DIMMER_ID       0                 // Default dimmer Id
 #endif
-//#define USE_ARMTRONIX_DIMMERS                    // Add support for Armtronix Dimmers (+1k4 code)
+#undef USE_ARMTRONIX_DIMMERS                     // Disable support for Armtronix Dimmers (+1k4 code)
 #define USE_PS_16_DZ                             // Add support for PS-16-DZ Dimmer (+2k code)
 #define USE_SONOFF_IFAN                          // Add support for Sonoff iFan02 and iFan03 (+2k code)
 #define USE_BUZZER                               // Add support for a buzzer (+0k6 code)
 #define USE_ARILUX_RF                            // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0))
-//#define USE_SHUTTER                              // Add Shutter support for up to 4 shutter with different motortypes (+6k code)
+#undef USE_SHUTTER                               // Disable Shutter support for up to 4 shutter with different motortypes (+6k code)
 #define USE_DEEPSLEEP                            // Add support for deepsleep (+1k code)
-#define USE_EXS_DIMMER                           // Add support for EX-Store WiFi Dimmer
+#undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #define USE_HOTPLUG                              // Add support for sensor HotPlug
-#define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+5k6 code)
+#undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 
 // -- Optional light modules ----------------------
 #define USE_LIGHT                                // Add Dimmer/Light support
@@ -153,8 +154,6 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_SGP30                                // Add I2C code for SGP30 sensor (+1k1 code)
 //#define USE_SI1145                               // Add I2C code for SI1145/46/47 sensor (+1k code)
 #define USE_LM75AD                               // Add I2C code for LM75AD sensor (+0k5 code)
-#define USE_DHT12                                // Add I2C code for DHT12 temperature and humidity sensor (+0k7 code)
-#define USE_DS1624                               // Add I2C code for DS1624, DS1621 sensor
 //#define USE_APDS9960                             // Add I2C code for APDS9960 Proximity Sensor. Disables SHT and VEML6070 (+4k7 code)
 //#define USE_MCP230xx                             // Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
 //  #define USE_MCP230xx_ADDR 0x20                 // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x27 - set according to your wired setup)
@@ -164,7 +163,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //  #define USE_PCA9685_ADDR 0x40                  // Enable PCA9685 I2C Address to use (Must be within range 0x40 through 0x47 - set according to your wired setup)
 //  #define USE_PCA9685_FREQ 50                    // Define default PWM frequency in Hz to be used (must be within 24 to 1526) - If other value is used, it will rever to 50Hz
 //#define USE_MPR121                               // Enable MPR121 controller (I2C addresses 0x5A, 0x5B, 0x5C and 0x5D) in input mode for touch buttons (+1k3 code)
-//#define USE_CCS811                               // Add I2C code for CCS811 sensor (+2k2 code)
+#define USE_CCS811                               // Add I2C code for CCS811 sensor (+2k2 code)
 //#define USE_MPU6050                              // Enable MPU6050 sensor (I2C address 0x68 AD0 low or 0x69 AD0 high) (+2k6 code)
 //#define USE_DS3231                               // Enable DS3231 external RTC in case no Wifi is avaliable. See docs in the source file (+1k2 code)
 //#define USE_MGC3130                              // Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
@@ -178,6 +177,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 //#define USE_PAJ7620                              // Enable PAJ7620 gesture sensor (I2C address 0x73) (+2.5k code)
 //#define USE_PCF8574                              // Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x26 and 0x39 - 0x3F) (+1k9 code)
 #define USE_HIH6                                 // Enable Honywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
+#define USE_DHT12                                // Add I2C code for DHT12 temperature and humidity sensor (+0k7 code)
+#define USE_DS1624                               // Add I2C code for DS1624, DS1621 sensor
 //#define USE_AHT1x                                // Enable AHT10/15 humidity and temperature sensor (I2C address 0x38) (+0k8 code)
 #define USE_WEMOS_MOTOR_V1                       // Enable Wemos motor driver V1 (I2C addresses 0x2D - 0x30) (+0k7 code)
   #define WEMOS_MOTOR_V1_ADDR  0x30              // Default I2C address 0x30
@@ -260,8 +261,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EMULATION                             // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem)
 #undef USE_EMULATION_HUE                         // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common)
 #undef USE_EMULATION_WEMO                        // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common)
+#undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
-#undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 #undef DEBUG_THEO                                // Disable debug code
 #undef USE_DEBUG_DRIVER                          // Disable debug code
 #endif  // FIRMWARE_KNX_NO_EMULATION
@@ -488,6 +489,9 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_EXS_DIMMER                            // Disable support for EX-Store WiFi Dimmer
 #undef USE_HOTPLUG                               // Disable support for HotPlug
+#undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
+#undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+#undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index b1e4eba9f..b9b08b46e 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08010009;
+const uint32_t VERSION = 0x0801000A;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 3838d8faf..192696ad8 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -139,13 +139,16 @@ a_setoption = [[
     "Reduced CT range for Alexa",
     "Use FriendlyNames instead of ShortAddresses when possible",
     "(AWS IoT) publish MQTT state to a device shadow",
+    "Enable Device Groups",
+    "PWM Dimmer Turn brightness LED's off 5 seconds after last change",
+    "PWM Dimmer Turn red LED on when powered off",
+    "PWM Dimmer Buttons control remote devices",
     "",
     "","","","",
     "","","","",
     "","","","",
     "","","","",
     "","","","",
-    "","","","",
     "","","",""
     ]]
 
@@ -193,7 +196,7 @@ a_features = [[
     "USE_ARDUINO_SLAVE","USE_HIH6","USE_HPMA","USE_TSL2591",
     "USE_DHT12","USE_DS1624","USE_GPS","USE_HOTPLUG",
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
-    "USE_AHT1x","USE_WEMOS_MOTOR_V1","",""
+    "USE_AHT1x","USE_WEMOS_MOTOR_V1","USE_DEVICE_GROUPS","USE_PWM_DIMMER"
     ],[
     "","","","",
     "","","","",
@@ -236,7 +239,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200222 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200227 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 714ee878a7d5c2bc98ce2ab8a364d34d211d11c0 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Thu, 27 Feb 2020 17:28:29 +0100
Subject: [PATCH 355/403] advanced keeloq driver number to 36

---
 tasmota/{xdrv_35_keeloq.ino => xdrv_36_keeloq.ino} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename tasmota/{xdrv_35_keeloq.ino => xdrv_36_keeloq.ino} (99%)

diff --git a/tasmota/xdrv_35_keeloq.ino b/tasmota/xdrv_36_keeloq.ino
similarity index 99%
rename from tasmota/xdrv_35_keeloq.ino
rename to tasmota/xdrv_36_keeloq.ino
index ce6185923..f961a2454 100644
--- a/tasmota/xdrv_35_keeloq.ino
+++ b/tasmota/xdrv_36_keeloq.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_35
+  xdrv_36
 
   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
@@ -17,7 +17,7 @@
 
 #ifdef USE_KEELOQ
 
-#define XDRV_35 35
+#define XDRV_36 36
 
 #include "cc1101.h"
 #include <KeeloqLib.h>
@@ -252,7 +252,7 @@ void InitKeeloq()
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
-bool Xdrv35(uint8_t function)
+bool Xdrv36(uint8_t function)
 {
   bool result = false;
 

From 92442a7a8f2e46dfc9594d6ad0d1c7e2cfec3671 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 27 Feb 2020 17:35:42 +0100
Subject: [PATCH 356/403] Fix KNX compilation

---
 tasmota/tasmota_post.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 8a7c45bbe..8f5038387 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -263,6 +263,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_EMULATION_WEMO                        // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common)
 #undef USE_DEEPSLEEP                             // Disable support for deepsleep (+1k code)
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
+#undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
 #undef DEBUG_THEO                                // Disable debug code
 #undef USE_DEBUG_DRIVER                          // Disable debug code
 #endif  // FIRMWARE_KNX_NO_EMULATION

From 1973bb2474fb4f04d0a4cf68eed5c9a0acbeb646 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 27 Feb 2020 17:48:27 +0100
Subject: [PATCH 357/403] Add support for Jarolift rollers by Keeloq algorithm

Add support for Jarolift rollers by Keeloq algorithm
---
 RELEASENOTES.md          | 1 +
 tasmota/CHANGELOG.md     | 1 +
 tasmota/my_user_config.h | 2 +-
 tasmota/settings.h       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c06ce9fd9..d07bb254a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -109,3 +109,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
 - Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
 - Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
+- Add support for Jarolift rollers by Keeloq algorithm
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index da6df2e37..b304bf95b 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 8.1.0.10 20200227
 
 - Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
+- Add support for Jarolift rollers by Keeloq algorithm
 
 ### 8.1.0.9 20200220
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index b752bbfde..5b0282481 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -418,7 +418,7 @@
 #define USE_DEVICE_GROUPS                        // Add support for device groups (+5k6 code)
 #define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
   #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
-//#define USE_KEELOQ                             // Add support for controling Jarolift rollers by Keeloq algorithm
+//#define USE_KEELOQ                               // Add support for Jarolift rollers by Keeloq algorithm (+4k5 code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 3dff66f8d..be108ac33 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -469,6 +469,7 @@ struct SYSCFG {
   uint8_t       bri_min;                   // F05
   uint8_t       bri_preset_low;            // F06
   uint8_t       bri_preset_high;           // F07
+
   uint8_t       free_f08[180];             // F08
 
   uint32_t      keeloq_master_msb;         // FBC

From fb87a03dbccbfd12f37179497311b43e1a1b2ab1 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 27 Feb 2020 17:52:27 +0100
Subject: [PATCH 358/403] Prep for Sonoff D1

---
 tasmota/tasmota_template.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 6f5aa0f8c..cb603d602 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -419,6 +419,7 @@ enum SupportedModules {
   SONOFF_IFAN03,
   EXS_DIMMER,
   PWM_DIMMER,
+  SONOFF_D1,
   MAXMODULE};
 
 #define USER_MODULE        255
@@ -808,6 +809,9 @@ const uint8_t kModuleNiceList[] PROGMEM = {
   SONOFF_T11,
   SONOFF_T12,
   SONOFF_T13,
+#ifdef USE_SONOFF_D1
+  SONOFF_D1,           // Sonoff D1
+#endif
   SONOFF_LED,          // Sonoff Light Devices
   SONOFF_BN,
 #ifdef USE_SONOFF_L1
@@ -2235,6 +2239,21 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_KEY1_INV,    // GPIO15 Power button
      GPIO_REL1_INV,    // GPIO16 Power relay/Level 1 LED
      0
+  },
+  { "Sonoff D1",       // SONOFF_D1 - Sonoff D1 RF Dimmer 433 (ESP8285)
+     GPIO_USER,        // GPIO00 Pad
+     GPIO_TXD,         // GPIO01 D1 control
+     0,                // GPIO02
+     GPIO_RXD,         // GPIO03 D1 control
+     0,                // GPIO04 DEBUG_RX
+     0,                // GPIO05 DEBUG_TX
+                       // GPIO06 (SD_CLK   Flash)
+                       // GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT)
+                       // GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT)
+     0,                // GPIO09
+     0,                // GPIO10
+                       // GPIO11 (SD_CMD   Flash)
+     0, 0, 0, 0, 0, 0
   }
 };
 

From a9626627437420be9190071381b588425f65c200 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 27 Feb 2020 13:38:33 -0600
Subject: [PATCH 359/403] Rescale Bri to DimmerRange,  Remove BriMin,
 LedTimeout and PoweredOffLed commands

---
 PWM_Dimmer.md                     |  84 +++----------
 tasmota/i18n.h                    |   2 -
 tasmota/support_device_groups.ino |   4 +-
 tasmota/tasmota.h                 |   6 +-
 tasmota/xdrv_04_light.ino         |   9 +-
 tasmota/xdrv_35_pwm_dimmer.ino    | 199 +++++++-----------------------
 6 files changed, 75 insertions(+), 229 deletions(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index da687bcf2..a89b0e752 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -11,7 +11,7 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The BriMin command defines the lowest value the brightness can be decreased to.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command set the minimum and maximum PWM values. Brightness values (0 - 255) are scaled to dimmerMin to dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
@@ -99,7 +99,7 @@ Holding any button for over 10 seconds executes the WiFiConfig 2 command.
 
 Pressing and releasing a button publishes an MQTT TOGGLE command. Holding a button publishes an MQTT HOLD command followed by an MQTT OFF command when the button is released.
 
-When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness presets, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
+When Device Groups are enabled, the PWM Dimmer brightness presets, dimmer minimum and maximum values, fade and speed settings are kept in sync across all switches in the group. The powered-off LED and LED timeout settings are specific to each switch. Changing them does not replicate the change to the other switches in the group.
 
 
 ### Commands
@@ -112,99 +112,43 @@ When Device Groups are enabled, the PWM Dimmer minimum brightness, brightness pr
    <td><strong>Parameters</strong>
    </td>
   </tr>
-  <tr>
-   <td>BriMin
-   </td>
-   <td>1..255 = set minimum brightness
-<p>
-+ = increase minimum brightness
-<p>
-- = decrease minimum brightness
-   </td>
-  </tr>
   <tr>
    <td>BriPreset
    </td>
-   <td> &lt;low>,&lt;high> = set brightness low and high presets
-<p>
-1..255 = set brightness preset
-<p>
-+ = increase brightness preset
-<p>
+   <td> &lt;low>,&lt;high> = set brightness low and high presets<br>
+1..255 = set brightness preset<br>
++ = increase brightness preset<br>
 - = decrease brightness preset
    </td>
   </tr>
   <tr>
-   <td>Dimmer
+   <td>DimmerRange
    </td>
-   <td>0..100 = set dimmer value from 0 to 100%
-<p>
-+ = increase by 10
-<p>
-- = decrease by 10
-   </td>
-  </tr>
-  <tr>
-   <td>Fade
-   </td>
-   <td>0 = do not use fade <em>(default)</em>
-<p>
-1 = use fade
-   </td>
-  </tr>
-  <tr>
-   <td>LedTimeout
-   </td>
-   <td>0 = disable LED timeout
-<p>
-1 = enable LED timeout
-   </td>
-  </tr>
-  <tr>
-   <td>PoweredOffLed
-   </td>
-   <td>0 = disable powered-off LED
-<p>
-1 = disable powered-off LED
-   </td>
-  </tr>
-  <tr>
-   <td>Speed
-   </td>
-   <td>1..20 = set fade speed from fast 1 to very slow 20
-<p>
-+ = increase speed
-<p>
-- = decrease speed
+   <td>Change dimming range<br>
+<dimmerMin>,<DimmerMax> = set minimum and maximum PWM values. Dimmer/brightness is scaled to this range.<br>
    </td>
   </tr>
   <tr>
    <td>SetOption86
    </td>
-   <td>Set brightness LED timeout
-<p>
-0 = disable timeout (default)
-<p>
+   <td>Set brightness LED timeout<br>
+0 = disable timeout (default)<br>
 1 = enable timeout
    </td>
   </tr>
   <tr>
    <td>SetOption87
    </td>
-   <td>Set powered-off LED (nightlight)
-<p>
-0 = disable powered-off LED (default)
-<p>
+   <td>Set powered-off LED (nightlight)<br>
+0 = disable powered-off LED (default)<br>
 1 = enable powered-off LED
    </td>
   </tr>
   <tr>
    <td>SetOption88
    </td>
-   <td>Set remote device mode
-<p>
-0 = disable remote device mode(default)
-<p>
+   <td>Set remote device mode<br>
+0 = disable remote device mode(default)<br>
 1 = enable remote device mode
    </td>
   </tr>
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 1e1e6b909..903224c99 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -539,8 +539,6 @@
 #ifdef USE_PWM_DIMMER
 #define D_CMND_BRI_MIN "BriMin"
 #define D_CMND_BRI_PRESET "BriPreset"
-#define D_CMND_LED_TIMEOUT "LedTimeout"
-#define D_CMND_POWERED_OFF_LED "PoweredOffLed"
 #endif
 
 // Commands xsns_02_analog.ino
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index c94ea2f57..faf3e0b6d 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -112,8 +112,8 @@ bool DeviceGroupItemShared(bool incoming, uint8_t item)
     case DGR_ITEM_LIGHT_SPEED:
       mask = DGR_SHARE_LIGHT_FADE;
       break;
-    case DGR_ITEM_BRI_MIN:
-      mask = DGR_SHARE_BRI_MIN;
+    case DGR_ITEM_DIMMER_RANGE:
+      mask = DGR_SHARE_DIMMER_RANGE;
       break;
   }
   return (!mask || ((incoming ? Settings.device_group_share_in : Settings.device_group_share_out) & mask));
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index 5745ff9c6..a9ff6f57f 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -309,14 +309,14 @@ enum DeviceGroupMessageFlag { DGR_FLAG_RESET = 1, DGR_FLAG_STATUS_REQUEST = 2, D
 
 enum DeviceGroupItem { DGR_ITEM_EOL, DGR_ITEM_STATUS,
                        DGR_ITEM_LIGHT_FADE, DGR_ITEM_LIGHT_SPEED, DGR_ITEM_LIGHT_BRI, DGR_ITEM_LIGHT_SCHEME, DGR_ITEM_LIGHT_FIXED_COLOR,
-                       DGR_ITEM_BRI_MIN, DGR_ITEM_BRI_PRESET_LOW, DGR_ITEM_BRI_PRESET_HIGH, DGR_ITEM_BRI_POWER_ON,
+                       DGR_ITEM_BRI_PRESET_LOW, DGR_ITEM_BRI_PRESET_HIGH, DGR_ITEM_BRI_POWER_ON,
                        // Add new 8-bit items before this line
                        DGR_ITEM_LAST_8BIT, DGR_ITEM_MAX_8BIT = 63,
                        DGR_ITEM_ACK,
                        DGR_ITEM_ANALOG1, DGR_ITEM_ANALOG2, DGR_ITEM_ANALOG3, DGR_ITEM_ANALOG4, DGR_ITEM_ANALOG5,
                        // Add new 16-bit items before this line
                        DGR_ITEM_LAST_16BIT, DGR_ITEM_MAX_16BIT = 127,
-                       DGR_ITEM_POWER,
+                       DGR_ITEM_POWER, DGR_ITEM_DIMMER_RANGE,
                        // Add new 32-bit items before this line
                        DGR_ITEM_LAST_32BIT, DGR_ITEM_MAX_32BIT = 191,                       
                        // Add new string items before this line
@@ -324,7 +324,7 @@ enum DeviceGroupItem { DGR_ITEM_EOL, DGR_ITEM_STATUS,
                        DGR_ITEM_LIGHT_CHANNELS };
 
 enum DeviceGroupShareItem { DGR_SHARE_POWER = 1, DGR_SHARE_LIGHT_BRI = 2, DGR_SHARE_LIGHT_FADE = 4, DGR_SHARE_LIGHT_SCHEME = 8,
-                            DGR_SHARE_LIGHT_COLOR = 16, DGR_SHARE_BRI_MIN = 32 };
+                            DGR_SHARE_LIGHT_COLOR = 16, DGR_SHARE_DIMMER_RANGE = 32 };
 
 enum CommandSource { SRC_IGNORE, SRC_MQTT, SRC_RESTART, SRC_BUTTON, SRC_SWITCH, SRC_BACKLOG, SRC_SERIAL, SRC_WEBGUI, SRC_WEBCOMMAND, SRC_WEBCONSOLE, SRC_PULSETIMER,
                      SRC_TIMER, SRC_RULE, SRC_MAXPOWER, SRC_MAXENERGY, SRC_OVERTEMP, SRC_LIGHT, SRC_KNX, SRC_DISPLAY, SRC_WEMO, SRC_HUE, SRC_RETRY, SRC_REMOTE, SRC_SHUTTER,
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index d54598077..d46ae7eef 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2526,6 +2526,8 @@ void CmndDimmer(void)
   }
 }
 
+#endif  // USE_LIGHT
+#if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
 void CmndDimmerRange(void)
 {
   // DimmerRange       - Show current dimmer range as used by Tuya and PS16DZ Dimmers
@@ -2542,10 +2544,15 @@ void CmndDimmerRange(void)
       Settings.dimmer_hw_min = parm[1];
       Settings.dimmer_hw_max = parm[0];
     }
-    restart_flag = 2;
+#ifdef USE_DEVICE_GROUPS
+    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16);
+#endif  // USE_DEVICE_GROUPS
+    if (PWM_DIMMER != my_module_type) restart_flag = 2;
   }
   Response_P(PSTR("{\"" D_CMND_DIMMER_RANGE "\":{\"Min\":%d,\"Max\":%d}}"), Settings.dimmer_hw_min, Settings.dimmer_hw_max);
 }
+#endif  // #if defined(USE_LIGHT) || defined(USE_PWM_DIMMER)
+#ifdef USE_LIGHT
 
 void CmndLedTable(void)
 {
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index 94bc4ea38..c1269ccc3 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -36,20 +36,19 @@
 #define MAX_FIXED_COLOR     12
 #endif  // MAX_FIXED_COLOR
 
+// Note: CmndFade and CmndSpeed are in xdrv_04_light.
 const char kPWMDimmerCommands[] PROGMEM = "|"  // No prefix
-   D_CMND_BRI_MIN "|" D_CMND_BRI_PRESET "|" D_CMND_DIMMER "|" D_CMND_FADE "|" D_CMND_LED_TIMEOUT "|"
-   D_CMND_POWERED_OFF_LED "|" D_CMND_SPEED;
+   D_CMND_BRI_PRESET "|" D_CMND_DIMMER "|" D_CMND_DIMMER_RANGE "|" D_CMND_FADE "|" D_CMND_SPEED;
 
 void (* const PWMDimmerCommand[])(void) PROGMEM = {
-  &CmndBriMin, &CmndBriPreset, &PWMDmmerCmndDimmer, &CmndFade, &CmndLedTimeout,
-  &CmndPoweredOffLed, &CmndSpeed };
+  CmndBriPreset, &PWMDmmerCmndDimmer, &CmndDimmerRange, &CmndFade, &CmndSpeed };
 
 #ifdef USE_PWM_DIMMER_REMOTE
 struct remote_pwm_dimmer {
   power_t power;
+  uint32_t dimmer_range;
   uint8_t light_speed;
   uint8_t bri_power_on;
-  uint8_t bri_min;
   uint8_t bri_preset_low;
   uint8_t bri_preset_high;
   uint8_t fixed_color_index;
@@ -85,11 +84,6 @@ uint8_t buttons_pressed = 0;
 bool active_device_is_local;
 #endif  // USE_PWM_DIMMER_REMOTE
 
-void PWMDimmerCheckBri(uint8_t * value_ptr)
-{
-  if (*value_ptr < Settings.bri_min) *value_ptr = Settings.bri_min;
-}
-
 void PWMModuleInit()
 {
   Settings.seriallog_level = 0;
@@ -98,28 +92,22 @@ void PWMModuleInit()
   Settings.flag.pwm_control = 0;  // Use basic PWM control instead of Light    
 
   if (Settings.last_module != Settings.module) {
-    Settings.bri_min = 25;
+    Settings.dimmer_hw_min = 102;
+    Settings.dimmer_hw_max = 1023;
     Settings.bri_power_on = 50;
     Settings.bri_preset_low = 25;
     Settings.bri_preset_high = 255;
     Settings.last_module = Settings.module;
   }
-  else {
-    if (Settings.bri_min < 1) Settings.bri_min = 25;
-    PWMDimmerCheckBri(&Settings.bri_power_on);
-    PWMDimmerCheckBri(&Settings.bri_preset_low);
-    PWMDimmerCheckBri(&Settings.bri_preset_high);
-  }
 
   if (Settings.light_speed < 1) Settings.light_speed = 1;
 
   target_bri = ((Settings.power & 1) ? changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255) : 0);
-  PWMDimmerCheckBri(&target_bri);
   current_bri = target_bri;
 
   if (pin[GPIO_PWM1] < 99) {
-    uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
-    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
+    uint32_t pwm_value = (current_bri ? changeUIntScale(current_bri, 1, 255, Settings.dimmer_hw_min, Settings.dimmer_hw_max) : 0);
+    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.dimmer_hw_max - pwm_value : pwm_value);
   }
 
   relay_is_on = (current_bri > 0);
@@ -149,7 +137,7 @@ void PWMDimmerInit(void)
 void PWMDimmerSetBrightnessLeds(int32_t operation)
 {
   if (leds_present) {
-    uint32_t step = (!operation ? (255 - Settings.bri_min) / (leds_present + 1) : operation < 0 ? 255 : 0);
+    uint32_t step = (!operation ? 256 / (leds_present + 1) : operation < 0 ? 255 : 0);
     uint32_t level = step;
     SetLedPowerIdx(0, current_bri >= level);
     if (leds_present > 1) {
@@ -188,30 +176,23 @@ void PWMDimmerAnimate(bool no_fade)
 
   // Advance the current brightness towards the target.
   if (!no_fade && Settings.light_fade) {
-    if (current_bri < Settings.bri_min) {
-      current_bri = Settings.bri_min;
-    }
-    else {
-      uint8_t offset = current_bri / Settings.light_speed / 5 + 1;
-      uint8_t max_offset = abs(target_bri - current_bri);
-      if (offset > max_offset) offset = max_offset;
-      if (current_bri < target_bri)
-        current_bri += offset;
-      else
-        current_bri -= offset;
-    }
+    uint8_t offset = current_bri / Settings.light_speed / 5 + 1;
+    uint8_t max_offset = abs(target_bri - current_bri);
+    if (offset > max_offset) offset = max_offset;
+    if (current_bri < target_bri)
+      current_bri += offset;
+    else
+      current_bri -= offset;
   }
   else {
     current_bri = target_bri;
   }
 
-  // If the current brightness is now < bri_min, set the current and target brightness to 0.
-  if (current_bri < Settings.bri_min) current_bri = target_bri = 0;
-
-  // Sset the new PWM value.
+  // Set the new PWM value.
   if (pin[GPIO_PWM1] < 99) {
-    uint32_t pwm_value = changeUIntScale(current_bri, 0, 255, 0, Settings.pwm_range);
-    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.pwm_range - pwm_value : pwm_value);
+    uint32_t pwm_value = (current_bri ? changeUIntScale(current_bri, 1, 255, Settings.dimmer_hw_min, Settings.dimmer_hw_max) : 0);
+//AddLog_P2(LOG_LEVEL_INFO, PSTR("PWMDimmerAnimate: current_bri=%u, pwm_value =%u"), current_bri, pwm_value);
+    analogWrite(pin[GPIO_PWM1], bitRead(pwm_inverted, 0) ? Settings.dimmer_hw_max - pwm_value : pwm_value);
   }
 
   // Handle a power state change.
@@ -236,7 +217,6 @@ void PWMDimmerSetBri(uint8_t bri)
 {
   if (bri == target_bri) return;
   target_bri = bri;
-  if (target_bri && target_bri < Settings.bri_min) target_bri = Settings.bri_min;
   Settings.bri_power_on = target_bri;
   Settings.light_dimmer = changeUIntScale(target_bri, 0, 255, 0, 100);
   if (Settings.flag3.hass_tele_on_power) {  // SetOption59 - Send tele/%topic%/STATE in addition to stat/%topic%/RESULT
@@ -249,20 +229,7 @@ void PWMDimmerSetBri(uint8_t bri)
 void PWMDimmerHandleDeviceGroupRequest()
 {
   static bool send_state = false;
-  uint8_t value = XdrvMailbox.payload;
-  switch (XdrvMailbox.command_code) {
-    case DGR_ITEM_BRI_MIN:
-      Settings.bri_min = 1;
-    case DGR_ITEM_BRI_PRESET_LOW:
-    case DGR_ITEM_BRI_PRESET_HIGH:
-    case DGR_ITEM_BRI_POWER_ON:
-      PWMDimmerCheckBri(&value);
-      break;
-    case DGR_ITEM_LIGHT_BRI:
-      if (value) PWMDimmerCheckBri(&value);
-      break;
-  }
-
+  uint32_t value = XdrvMailbox.payload;
   switch (XdrvMailbox.command_code) {
     case DGR_ITEM_EOL:
       if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
@@ -284,11 +251,9 @@ void PWMDimmerHandleDeviceGroupRequest()
         send_state = true;
       }
       break;
-    case DGR_ITEM_BRI_MIN:
-      if (Settings.bri_min != value) {
-        Settings.bri_min = value;
-        send_state = true;
-      }
+    case DGR_ITEM_DIMMER_RANGE:
+      Settings.dimmer_hw_min = value & 0xffff;
+      Settings.dimmer_hw_max = value >> 16;
       break;
     case DGR_ITEM_BRI_PRESET_LOW:
       if (Settings.bri_preset_low != value) {
@@ -311,8 +276,9 @@ void PWMDimmerHandleDeviceGroupRequest()
     case DGR_ITEM_STATUS:
       SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
         DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
-        DGR_ITEM_BRI_MIN, Settings.bri_min, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
-        DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high, DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
+        DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
+        DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
+        DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
       break;
   }
 }
@@ -473,12 +439,12 @@ void PWMDimmerHandleButton()
       if (active_device_is_local == !button_pressed[power_button_index]) {
 #endif  // USE_PWM_DIMMER_REMOTE
         if (button_hold_time[button_index] < now) {
-
           uint8_t uint8_value;
-          uint8_t min_uint8_value;
           bool down_button_is_held = (button_index == down_button_index);
           bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
           uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
+          uint16_t uint16_value;
+
           switch (tap_count) {
             case 0:
               // If the power is on, adjust the brightness. Set the direction based on which button is
@@ -563,30 +529,29 @@ void PWMDimmerHandleButton()
                 // Decrease/increase the minimum brightness.
 #ifdef USE_PWM_DIMMER_REMOTE
                 if (!active_device_is_local)
-                  uint8_value = active_remote_pwm_dimmer->bri_min;
+                  uint16_value = active_remote_pwm_dimmer->dimmer_range & 0xffff;
                 else
 #endif // USE_PWM_DIMMER_REMOTE
-                  uint8_value = Settings.bri_min;
+                  uint16_value = Settings.dimmer_hw_min;
                 if (down_button_is_held) {
-                  if (uint8_value > 4) uint8_value--;
+                  if (uint16_value > 0) uint16_value--;
                 }
-                else if (uint8_value < 255) {
-                  uint8_value++;
+                else if (uint16_value < 65535) {
+                  uint16_value++;
                 }
 #ifdef USE_PWM_DIMMER_REMOTE
+                dgr_item = DGR_ITEM_DIMMER_RANGE;
                 if (!active_device_is_local) {
-                  active_remote_pwm_dimmer->bri_min = uint8_value;
-                  if (active_remote_pwm_dimmer->bri_power_on < uint8_value) active_remote_pwm_dimmer->bri_power_on = uint8_value;
+                  active_remote_pwm_dimmer->dimmer_range &= 0xffff0000 | uint16_value;
+                  dgr_value = active_remote_pwm_dimmer->dimmer_range;
                 }
                 else {
 #endif // USE_PWM_DIMMER_REMOTE
-                  Settings.bri_min = uint8_value;
-                  if (Settings.bri_power_on < uint8_value) Settings.bri_power_on = uint8_value;
+                  Settings.dimmer_hw_min = uint16_value;
+                  dgr_value = Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16;
 #ifdef USE_PWM_DIMMER_REMOTE
                 }
 #endif // USE_PWM_DIMMER_REMOTE
-                dgr_item = DGR_ITEM_BRI_MIN;
-                dgr_value = uint8_value;
               }
               else {
                 // Decrease/increase the fade speed.
@@ -617,19 +582,13 @@ void PWMDimmerHandleButton()
               if (down_button_was_tapped) {
                 // Decrease/increase the low brightness preset.
 #ifdef USE_PWM_DIMMER_REMOTE
-                if (!active_device_is_local) {
+                if (!active_device_is_local)
                   uint8_value = active_remote_pwm_dimmer->bri_preset_low;
-                  min_uint8_value =active_remote_pwm_dimmer->bri_min;
-                }
-                else {
+                else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_low;
-                  min_uint8_value = Settings.bri_min;
-#ifdef USE_PWM_DIMMER_REMOTE
-                }
-#endif // USE_PWM_DIMMER_REMOTE
                 if (down_button_is_held) {
-                  if (uint8_value > min_uint8_value) uint8_value--;
+                  if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
                   uint8_value++;
@@ -652,7 +611,7 @@ void PWMDimmerHandleButton()
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_high;
                 if (down_button_is_held) {
-                  if (uint8_value > 4) uint8_value--;
+                  if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
                   uint8_value++;
@@ -706,7 +665,7 @@ void PWMDimmerHandleButton()
       }
       else {
         new_bri = bri - offset;
-        if (new_bri < Settings.bri_min) new_bri = Settings.bri_min;
+        if (new_bri < 3) new_bri = 3;
       }
       if (new_bri != bri) {
 #ifdef USE_DEVICE_GROUPS
@@ -917,36 +876,6 @@ void PWMDimmerHandleButton()
  * Commands
 \*********************************************************************************************/
 
-void CmndBriMin(void)
-{
-  uint8_t new_bri_min = Settings.bri_min;
-  if (XdrvMailbox.payload > 0 && XdrvMailbox.payload <= 255) {
-    new_bri_min = (XdrvMailbox.payload < 4 ? 4 : XdrvMailbox.payload);
-  }
-  else if (1 == XdrvMailbox.data_len) {
-    if ('-' == XdrvMailbox.data[0]) {
-      if (new_bri_min > 4) new_bri_min--;
-    }
-    else if ('+' == XdrvMailbox.data[0] && new_bri_min < 255)
-      new_bri_min++;
-  }
-
-  if (new_bri_min != Settings.bri_min) {
-    Settings.bri_min = new_bri_min;
-    PWMDimmerCheckBri(&Settings.bri_power_on);
-    PWMDimmerCheckBri(&Settings.bri_preset_low);
-    PWMDimmerCheckBri(&Settings.bri_preset_high);
-
-#ifdef DEVICE_GROUPS
-    SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_MIN, Settings.bri_min,
-      DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low,
-      DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
-#endif  // DEVICE_GROUPS
-  }
-
-  ResponseCmndNumber(Settings.bri_min);
-}
-
 void CmndBriPreset(void)
 {
   if (XdrvMailbox.data_len > 0) {
@@ -962,7 +891,7 @@ void CmndBriPreset(void)
         if (parm[i] < 255) parm[i]++;
       }
       else if (*ptr == '-') {
-        if (parm[i] > Settings.bri_min) parm[i]--;
+        if (parm[i] > 0) parm[i]--;
       }
       else {
         value = strtoul(ptr, &ptr, 0);
@@ -971,7 +900,7 @@ void CmndBriPreset(void)
           break;
         }
         parm[i] = value;
-        PWMDimmerCheckBri(&parm[i]);
+
         if (*ptr != ',') break;
       }
       ptr++;
@@ -985,9 +914,9 @@ void CmndBriPreset(void)
         Settings.bri_preset_low = parm[1];
         Settings.bri_preset_high = parm[0];
       }
-#ifdef DEVICE_GROUPS
+#ifdef USE_DEVICE_GROUPS
       SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high);
-#endif  // DEVICE_GROUPS
+#endif  // USE_DEVICE_GROUPS
     }
   }
   Response_P(PSTR("{\"" D_CMND_BRI_PRESET "\":{\"Low\":%d,\"High\":%d}}"), Settings.bri_preset_low, Settings.bri_preset_high);
@@ -1015,38 +944,6 @@ void PWMDmmerCmndDimmer(void)
   ResponseCmndNumber(Settings.light_dimmer);
 }
 
-void CmndLedTimeout(void)
-{
-  // Set the brightness LED timeout state.
-  switch (XdrvMailbox.payload) {
-  case 0: // Off
-  case 1: // On
-    Settings.flag4.led_timeout = XdrvMailbox.payload;
-    break;
-  case 2: // Toggle
-    Settings.flag4.led_timeout ^= 1;
-    break;
-  }
-  if (relay_is_on) PWMDimmerSetBrightnessLeds(0);
-  ResponseCmndStateText(Settings.flag4.led_timeout);
-}
-
-void CmndPoweredOffLed(void)
-{
-  // Set the powered-off LED state.
-  switch (XdrvMailbox.payload) {
-  case 0: // Off
-  case 1: // On
-    Settings.flag4.powered_off_led = XdrvMailbox.payload;
-    break;
-  case 2: // Toggle
-    Settings.flag4.powered_off_led ^= 1;
-    break;
-  }
-  PWMDimmerSetPoweredOffLed();
-  ResponseCmndStateText(Settings.flag4.powered_off_led);
-}
-
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/

From 23ca2ff36d238ad368169f6c1c856e49f9884bd0 Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Thu, 27 Feb 2020 21:03:05 +0100
Subject: [PATCH 360/403] user pin selection for CC1101 gpios

---
 tasmota/tasmota_template.h | 7 ++++++-
 tasmota/xdrv_36_keeloq.ino | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index cb603d602..3c85707df 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -222,6 +222,8 @@ enum UserSelectablePins {
   GPIO_HM10_TX,        // HM10-BLE-Mijia-bridge serial interface
   GPIO_LE01MR_RX,      // F&F LE-01MR energy meter
   GPIO_LE01MR_TX,      // F&F LE-01MR energy meter
+  GPIO_CC1101_GDO0,    // CC1101 pin for RX
+  GPIO_CC1101_GDO2,    // CC1101 pin for RX
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -790,7 +792,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
 #ifdef USE_DEEPSLEEP
   GPIO_DEEPSLEEP,
 #endif
-
+#ifdef USE_KEELOQ
+  GPIO_CC1101_GDO0,    // CC1101 pin for RX
+  GPIO_CC1101_GDO2,    // CC1101 pin for RX
+#endif
 };
 
 const uint8_t kModuleNiceList[] PROGMEM = {
diff --git a/tasmota/xdrv_36_keeloq.ino b/tasmota/xdrv_36_keeloq.ino
index f961a2454..edac0ee23 100644
--- a/tasmota/xdrv_36_keeloq.ino
+++ b/tasmota/xdrv_36_keeloq.ino
@@ -27,8 +27,8 @@
 #define Lowpulse         400
 #define Highpulse        800
 
-#define TX_PORT            4              // Outputport for transmission
-#define RX_PORT            5              // Inputport for reception
+#define TX_PORT          pin[GPIO_CC1101_GDO2]              // Outputport for transmission
+#define RX_PORT          pin[GPIO_CC1101_GDO0]              // Inputport for reception
 
 const char kJaroliftCommands[] PROGMEM = "Keeloq|" // prefix
   "SendRaw|SendButton|Set";

From cc8dfc22a83cb6cb22f3de51469bae32b93d8d9d Mon Sep 17 00:00:00 2001
From: "he.so" <hsommerkamp@gmail.com>
Date: Thu, 27 Feb 2020 21:31:19 +0100
Subject: [PATCH 361/403] define language keys for CC1101 pins

---
 tasmota/language/bg-BG.h   | 2 ++
 tasmota/language/cs-CZ.h   | 2 ++
 tasmota/language/de-DE.h   | 2 ++
 tasmota/language/el-GR.h   | 2 ++
 tasmota/language/en-GB.h   | 2 ++
 tasmota/language/es-ES.h   | 2 ++
 tasmota/language/fr-FR.h   | 2 ++
 tasmota/language/he-HE.h   | 2 ++
 tasmota/language/hu-HU.h   | 2 ++
 tasmota/language/it-IT.h   | 2 ++
 tasmota/language/ko-KO.h   | 2 ++
 tasmota/language/nl-NL.h   | 2 ++
 tasmota/language/pl-PL.h   | 2 ++
 tasmota/language/pt-BR.h   | 2 ++
 tasmota/language/pt-PT.h   | 2 ++
 tasmota/language/ru-RU.h   | 2 ++
 tasmota/language/sk-SK.h   | 2 ++
 tasmota/language/sv-SE.h   | 2 ++
 tasmota/language/tr-TR.h   | 2 ++
 tasmota/language/uk-UA.h   | 2 ++
 tasmota/language/zh-CN.h   | 2 ++
 tasmota/language/zh-TW.h   | 2 ++
 tasmota/tasmota_template.h | 3 ++-
 23 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 8acbff8e1..9a6ce8abc 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index 2d15ac443..d98361640 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index e87624bfa..05835a49c 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index dbeb71a68..0ddd43918 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index 792c2b597..b175cc193 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 77e7c6047..12e732bc2 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index a63955ab7..e9c31da46 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index 86af3c35a..f836a92b9 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index d9348dde1..da313caaa 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index e5ee2f1aa..efaecc1a5 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index f8cd83e99..794b97e84 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index bc9b1876e..288da67d5 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index 9cc522fa7..e15ccbbc2 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index 4909fc08c..9b24d05c8 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 1e49c449c..9565fc7a5 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index a312000b7..700958875 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "А"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index f5041901a..dbee001e9 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index 7741c8937..a8e5aa6a8 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 51f0a3ddb..430289372 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index a7bcfa5da..2b4873e7a 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE                    "А"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 53e05b1f4..5a71e95dc 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 2e9994046..9883972f1 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -641,6 +641,8 @@
 #define D_SENSOR_HM10_TX       "HM10 TX"
 #define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 3c85707df..5494fbcf3 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -307,7 +307,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_GPS_RX "|" D_SENSOR_GPS_TX "|"
   D_SENSOR_DS18X20 "o|" D_SENSOR_DHT11 "o|"
   D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX "|"
-  D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX
+  D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX "|"
+  D_SENSOR_CC1101_GDO0 "|" D_SENSOR_CC1101_GDO2
   ;
 
 const char kSensorNamesFixed[] PROGMEM =

From 0083e1d9960c45ca6736f807993c2fe1bd793399 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Thu, 27 Feb 2020 22:08:31 +0100
Subject: [PATCH 362/403] Zigbee fix skipped attributes

---
 tasmota/xdrv_23_zigbee_3_devices.ino | 7 ++++++-
 tasmota/xdrv_23_zigbee_8_parsers.ino | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index 71752f4e3..c7c1f2d11 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -659,7 +659,12 @@ bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
   for (auto kv : values) {
     String key_string = kv.key;
 
-    if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {  // exception = ignore duplicates for LinkQuality
+    if (0 == strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_ENDPOINT))) {
+      // attribute "Endpoint"
+      if (kv.value.as<unsigned int>() != device.json->get<unsigned int>(kv.key)) {
+        return true;
+      }
+    } else if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {  // exception = ignore duplicates for LinkQuality
       if (device.json->containsKey(kv.key)) {
         return true;          // conflict!
       }
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index b67add374..9e336d0c1 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -504,10 +504,9 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
     if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
       // there is conflicting values, force a publish of the previous message now and don't coalesce
       zigbee_devices.jsonPublishFlush(srcaddr);
-    } else {
-      zigbee_devices.jsonAppend(srcaddr, json);
-      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
     }
+    zigbee_devices.jsonAppend(srcaddr, json);
+    zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
   } else {
     // Publish immediately
     zigbee_devices.jsonPublishNow(srcaddr, json);

From 25556be8d301536d6319a2cb609d5fc178afd205 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 27 Feb 2020 20:41:29 -0600
Subject: [PATCH 363/403] Handle remote switch updates, Make tap/hold functions
 available only when power is off

---
 PWM_Dimmer.md                     |   6 +-
 tasmota/support_device_groups.ino |   7 +-
 tasmota/xdrv_35_pwm_dimmer.ino    | 164 ++++++++++++++++++++----------
 3 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index a89b0e752..5ba143fec 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -11,17 +11,17 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command set the minimum and maximum PWM values. Brightness values (0 - 255) are scaled to dimmerMin to dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command sets the minimum and maximum PWM values. Brightness values (0 through 255) are scaled to dimmerMin through dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
-When the power is off, holding the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
+When the power is off, pressing the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
 
 If there are LED’s defined in the template, they are turned on to indicate the current brightness. More LEDs are turned on at higher brightnesses. The LedTimeout command enables/disables an LED timeout. If LED timeout is enabled, the LED’s turn off five seconds after the last change in brightness. Note that the lowest LED and the blue power LED are always on when the power is on.
 
 The LEDLink LED can be used as a nightlight/powered-off indicator. The PoweredOffLed command enables/disables turning the LEDLink LED on when the power is off.
 
-Tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
+When the power is on, tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
 
 
 <table>
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index faf3e0b6d..01404b1cb 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -502,7 +502,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     bool          grpflg
     bool          usridx
     uint16_t      command_code    Item code
-    uint32_t      index           Flags
+    uint32_t      index           0:15 Flags, 16:23 Device group index
     uint32_t      data_len        String item value length
     int32_t       payload         Integer item value
     char         *topic
@@ -510,7 +510,8 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     char         *command         nullptr
   */
   XdrvMailbox.command = nullptr;  // Indicates the source is a device group update
-  XdrvMailbox.index = flags;
+  XdrvMailbox.index = flags | device_group_index << 16;
+
   light_fade = Settings.light_fade;
   if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
 
@@ -526,12 +527,12 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       case DGR_ITEM_LIGHT_BRI:
       case DGR_ITEM_LIGHT_SCHEME:
       case DGR_ITEM_LIGHT_FIXED_COLOR:
-      case DGR_ITEM_BRI_MIN:
       case DGR_ITEM_BRI_PRESET_LOW:
       case DGR_ITEM_BRI_PRESET_HIGH:
       case DGR_ITEM_BRI_POWER_ON:
       case DGR_ITEM_POWER:
       case DGR_ITEM_LIGHT_CHANNELS:
+      case DGR_ITEM_DIMMER_RANGE:
         break;
       default:
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index c1269ccc3..4365b9774 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -230,6 +230,12 @@ void PWMDimmerHandleDeviceGroupRequest()
 {
   static bool send_state = false;
   uint32_t value = XdrvMailbox.payload;
+#ifdef USE_PWM_DIMMER_REMOTE
+  uint8_t device_group_index = XdrvMailbox.index >> 16 & 0xff;
+  bool device_is_local = device_groups[device_group_index].local;
+  struct remote_pwm_dimmer * remote_pwm_dimmer = &remote_pwm_dimmers[device_group_index];
+#endif  // USE_PWM_DIMMER_REMOTE
+
   switch (XdrvMailbox.command_code) {
     case DGR_ITEM_EOL:
       if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
@@ -240,45 +246,92 @@ void PWMDimmerHandleDeviceGroupRequest()
       }
       break;
     case DGR_ITEM_LIGHT_BRI:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->bri = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (target_bri != value) {
         PWMDimmerSetBri(value);
         send_state = true;
       }
       break;
     case DGR_ITEM_LIGHT_SPEED:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->light_speed = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.light_speed != value && value > 0 && value <= 40) {
         Settings.light_speed = value;
         send_state = true;
       }
       break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->fixed_color_index = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
+        fixed_color_index = value;
+      break;
     case DGR_ITEM_DIMMER_RANGE:
-      Settings.dimmer_hw_min = value & 0xffff;
-      Settings.dimmer_hw_max = value >> 16;
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->dimmer_range = value;
+      else {
+#endif  // USE_PWM_DIMMER_REMOTE
+        Settings.dimmer_hw_min = value & 0xffff;
+        Settings.dimmer_hw_max = value >> 16;
+#ifdef USE_PWM_DIMMER_REMOTE
+      }
+#endif  // USE_PWM_DIMMER_REMOTE
       break;
     case DGR_ITEM_BRI_PRESET_LOW:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_low = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_low != value) {
         Settings.bri_preset_low = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_BRI_PRESET_HIGH:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_high = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_high != value) {
         Settings.bri_preset_high = value;
         send_state = true;
       }
    break;
     case DGR_ITEM_BRI_POWER_ON:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_power_on = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_power_on != value) {
         Settings.bri_power_on = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_STATUS:
-      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
-        DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
-        DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
-        DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
-        DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (device_is_local)
+#endif  // USE_PWM_DIMMER_REMOTE
+        SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
+          DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
+          DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
+          DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
+          DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
       break;
   }
 }
@@ -356,7 +409,7 @@ void PWMDimmerHandleButton()
 
       // If this is not about the power button, load the new hold time. Note that the hold time for
       // the power button is longer than the hold time for the other buttons.
-      button_hold_time[button_index] = now + 250;
+      button_hold_time[button_index] = now + 100;
     }
 
     // If the button is being held, send a button hold.
@@ -432,50 +485,50 @@ void PWMDimmerHandleButton()
         ignore_power_button_release = ignore_power_button_hold = true;
       }
 
-      // If the active device is local or the power button if also pressed, then if the down/up
-      // button has been held, handle the action based on the number of times the down or up button
-      // was pressed and released before holding it.
+      // If the active device is local or the power button if also pressed, ...
 #ifdef USE_PWM_DIMMER_REMOTE
       if (active_device_is_local == !button_pressed[power_button_index]) {
 #endif  // USE_PWM_DIMMER_REMOTE
-        if (button_hold_time[button_index] < now) {
+        bool is_down_button = (button_index == down_button_index);
+
+        // If the power is not on, turn it on using a temporary brightness of bri_preset_low if the
+        // down button is pressed or bri_preset_low if the up button is pressed.
+#ifdef USE_PWM_DIMMER_REMOTE
+        if ((!active_device_is_local ? !active_remote_pwm_dimmer->power : !power)) {
+#else // USE_PWM_DIMMER_REMOTE
+        if (!power) {
+#endif  // USE_PWM_DIMMER_REMOTE
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local)
+            active_remote_pwm_dimmer->bri = (is_down_button ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            target_bri = (is_down_button ? Settings.bri_preset_low : Settings.bri_preset_high);
+          toggle_power = true;
+          button_hold_time[button_index] = now + 500;
+
+          // If the power button is also pressed, set the power button hold dimmer direction
+          // so holding the power switch adjusts the brightness away from the brightness we
+          // just set.
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = is_down_button;
+#endif  // USE_PWM_DIMMER_REMOTE
+        }
+
+        // If the power is on and the down/up button has been held, handle the action based on the
+        // number of times the down or up button was pressed and released before holding it.
+        else if (button_hold_time[button_index] < now) {
           uint8_t uint8_value;
-          bool down_button_is_held = (button_index == down_button_index);
+          bool is_down_button = (button_index == down_button_index);
           bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
           uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
           uint16_t uint16_value;
 
           switch (tap_count) {
             case 0:
-              // If the power is on, adjust the brightness. Set the direction based on which button is
-              // pressed. The new brightness will be calculated below.
-#ifdef USE_PWM_DIMMER_REMOTE
-              if ((!active_device_is_local ? active_remote_pwm_dimmer->power : power)) {
-#else // USE_PWM_DIMMER_REMOTE
-              if (power) {
-#endif  // USE_PWM_DIMMER_REMOTE
-                bri_direction = (down_button_is_held ? -1 : 1);
-              }
-
-              // If the power is not on, turn it on using a temporary brightness of bri_preset_low if
-              // the down button is pressed or bri_preset_low if the up button is pressed.
-              else {
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (!active_device_is_local)
-                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
-                else
-#endif  // USE_PWM_DIMMER_REMOTE
-                  target_bri = (down_button_is_held ? Settings.bri_preset_low : Settings.bri_preset_high);
-                toggle_power = true;
-                button_hold_time[button_index] = now + 1000;
-
-                // If the power button is also pressed, set the power button hold dimmer direction
-                // so holding the power switch adjusts the brightness away from the brightness we
-                // just set.
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = down_button_is_held;
-#endif  // USE_PWM_DIMMER_REMOTE
-              }
+              // Adjust the brightness. Set the direction based on which button is pressed. The new
+              // brightness will be calculated below.
+              bri_direction = (is_down_button ? -1 : 1);
               break;
 
             case 1:
@@ -488,7 +541,7 @@ void PWMDimmerHandleButton()
                 else
 #endif  // USE_PWM_DIMMER_REMOTE
                   uint8_value = fixed_color_index;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value)
                     uint8_value--;
                   else
@@ -519,7 +572,7 @@ void PWMDimmerHandleButton()
 #else  // USE_PWM_DIMMER_REMOTE
                 snprintf_P(topic, sizeof(topic), PSTR("%s/cmnd/Event"), SettingsText(SET_MQTT_GRP_TOPIC));
 #endif  // USE_PWM_DIMMER_REMOTE
-                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (down_button_is_held ? 1 : 2));
+                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (is_down_button ? 1 : 2));
                 MqttPublish(topic);
               }
               break;
@@ -533,7 +586,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint16_value = Settings.dimmer_hw_min;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint16_value > 0) uint16_value--;
                 }
                 else if (uint16_value < 65535) {
@@ -561,7 +614,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.light_speed;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 1) uint8_value--;
                 }
                 else if (uint8_value < 40) {
@@ -587,7 +640,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_low;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -610,7 +663,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_high;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -630,18 +683,14 @@ void PWMDimmerHandleButton()
 
           button_was_held = true;
 
-          // If the button was tapped before it was held, reset the button hold time to one second and
-          // turn all the brightness LEDs on for 250ms.
+          // If the button was tapped before it was held, reset the button hold time to 1/2 second
+          // and turn all the brightness LEDs on for 250ms.
           if (tap_count > 0) {
-            button_hold_time[button_index] = now + 1000;
+            button_hold_time[button_index] = now + 500;
             turn_off_brightness_leds_time = now + 250;
             PWMDimmerSetBrightnessLeds(1);
           }
         }
-        else if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
-          turn_off_brightness_leds_time = 0;
-          PWMDimmerSetBrightnessLeds(-1);
-        }
 #ifdef USE_PWM_DIMMER_REMOTE
       }
 #endif // USE_PWM_DIMMER_REMOTE
@@ -870,6 +919,11 @@ void PWMDimmerHandleButton()
       MqttPublishTeleState();
     }
   }
+
+  if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
+    turn_off_brightness_leds_time = 0;
+    PWMDimmerSetBrightnessLeds(-1);
+  }
 }
 
 /*********************************************************************************************\

From 248288d549b6d1c7e1c10ef82c0151c258e898f6 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 27 Feb 2020 20:41:29 -0600
Subject: [PATCH 364/403] Handle remote switch updates, Make tap/hold functions
 available only when power is on

---
 PWM_Dimmer.md                     |   6 +-
 tasmota/support_device_groups.ino |   7 +-
 tasmota/xdrv_35_pwm_dimmer.ino    | 164 ++++++++++++++++++++----------
 3 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/PWM_Dimmer.md b/PWM_Dimmer.md
index a89b0e752..5ba143fec 100644
--- a/PWM_Dimmer.md
+++ b/PWM_Dimmer.md
@@ -11,17 +11,17 @@ To enable PWM dimmer operation, select the PWM Dimmer module.
 
 Pressing and releasing the power button toggles the power on/off. If the toggle turns the power on, the load is returned to the last brightness it was adjusted to. If Fade is enabled, the load is faded on/off at the rate defined by the Speed setting.
 
-When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command set the minimum and maximum PWM values. Brightness values (0 - 255) are scaled to dimmerMin to dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
+When the power is on, holding the down or up button decreases/increases the brightness (PWM value). The brightness is changed faster at higher brightnesses. The DimmerRange command sets the minimum and maximum PWM values. Brightness values (0 through 255) are scaled to dimmerMin through dimmerMax. Typically, dimmerMin would be set to the lowest value at which the lights show visible light and dimmerMax would be set 1023. If you want to increase the lowest brightness level and/or decrease the highest brightness level, set higher dimmerMin and/or lower dimmerMax values.
 
 The brightness can also be changed using just the power button. When the power is on, holding the power button alternately increases or decreases the brightness. Initially, holding the power button increases the brightness. Releasing and then holding the power button again decreases the brightness.
 
-When the power is off, holding the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
+When the power is off, pressing the down or up button turns the power on at a temporary brightness of the low/high levels set by the BriPreset command (default =10,255). Turning the power on at the low preset can also be accomplished by holding the power button while the power is off. The brightness presets are intended to enable quickly turning on a light to a dim or bright level without changing the normal desired brightness. Turning the power on to a preset does not change the brightness the load will be set to when the switch is turned on the next time. For example, if the light is on and you adjust the brightness to 80 and then turn the light off, when you turn it back on, the brightness will return to 80. If you turn the power off again and then press the down button, the light will be turned on with a brightness of the low preset. If you then turn the light off and on again, the brightness will return to 80.
 
 If there are LED’s defined in the template, they are turned on to indicate the current brightness. More LEDs are turned on at higher brightnesses. The LedTimeout command enables/disables an LED timeout. If LED timeout is enabled, the LED’s turn off five seconds after the last change in brightness. Note that the lowest LED and the blue power LED are always on when the power is on.
 
 The LEDLink LED can be used as a nightlight/powered-off indicator. The PoweredOffLed command enables/disables turning the LEDLink LED on when the power is off.
 
-Tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
+When the power is on, tapping (pressing and releasing quickly) the down or up buttons a given number of times and then holding the down or up button decreases or increases settings according to the table below. For example, tapping the down button once and then holding the up button sets all RGB lights in the device group to the next fixed color. Tapping the up button three times and then holding the down button decreases the high brightness preset.
 
 
 <table>
diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index faf3e0b6d..01404b1cb 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -502,7 +502,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     bool          grpflg
     bool          usridx
     uint16_t      command_code    Item code
-    uint32_t      index           Flags
+    uint32_t      index           0:15 Flags, 16:23 Device group index
     uint32_t      data_len        String item value length
     int32_t       payload         Integer item value
     char         *topic
@@ -510,7 +510,8 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
     char         *command         nullptr
   */
   XdrvMailbox.command = nullptr;  // Indicates the source is a device group update
-  XdrvMailbox.index = flags;
+  XdrvMailbox.index = flags | device_group_index << 16;
+
   light_fade = Settings.light_fade;
   if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
 
@@ -526,12 +527,12 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
       case DGR_ITEM_LIGHT_BRI:
       case DGR_ITEM_LIGHT_SCHEME:
       case DGR_ITEM_LIGHT_FIXED_COLOR:
-      case DGR_ITEM_BRI_MIN:
       case DGR_ITEM_BRI_PRESET_LOW:
       case DGR_ITEM_BRI_PRESET_HIGH:
       case DGR_ITEM_BRI_POWER_ON:
       case DGR_ITEM_POWER:
       case DGR_ITEM_LIGHT_CHANNELS:
+      case DGR_ITEM_DIMMER_RANGE:
         break;
       default:
         AddLog_P2(LOG_LEVEL_ERROR, PSTR("DGR: ********** invalid item=%u received from device group %s member %s"), item, device_group->group_name, IPAddressToString(remote_ip));
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index c1269ccc3..4365b9774 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -230,6 +230,12 @@ void PWMDimmerHandleDeviceGroupRequest()
 {
   static bool send_state = false;
   uint32_t value = XdrvMailbox.payload;
+#ifdef USE_PWM_DIMMER_REMOTE
+  uint8_t device_group_index = XdrvMailbox.index >> 16 & 0xff;
+  bool device_is_local = device_groups[device_group_index].local;
+  struct remote_pwm_dimmer * remote_pwm_dimmer = &remote_pwm_dimmers[device_group_index];
+#endif  // USE_PWM_DIMMER_REMOTE
+
   switch (XdrvMailbox.command_code) {
     case DGR_ITEM_EOL:
       if (send_state && !(XdrvMailbox.index & DGR_FLAG_MORE_TO_COME)) {
@@ -240,45 +246,92 @@ void PWMDimmerHandleDeviceGroupRequest()
       }
       break;
     case DGR_ITEM_LIGHT_BRI:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->bri = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (target_bri != value) {
         PWMDimmerSetBri(value);
         send_state = true;
       }
       break;
     case DGR_ITEM_LIGHT_SPEED:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->light_speed = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.light_speed != value && value > 0 && value <= 40) {
         Settings.light_speed = value;
         send_state = true;
       }
       break;
+    case DGR_ITEM_LIGHT_FIXED_COLOR:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local) {
+        remote_pwm_dimmer->fixed_color_index = value;
+      }
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
+        fixed_color_index = value;
+      break;
     case DGR_ITEM_DIMMER_RANGE:
-      Settings.dimmer_hw_min = value & 0xffff;
-      Settings.dimmer_hw_max = value >> 16;
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->dimmer_range = value;
+      else {
+#endif  // USE_PWM_DIMMER_REMOTE
+        Settings.dimmer_hw_min = value & 0xffff;
+        Settings.dimmer_hw_max = value >> 16;
+#ifdef USE_PWM_DIMMER_REMOTE
+      }
+#endif  // USE_PWM_DIMMER_REMOTE
       break;
     case DGR_ITEM_BRI_PRESET_LOW:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_low = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_low != value) {
         Settings.bri_preset_low = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_BRI_PRESET_HIGH:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_preset_high = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_preset_high != value) {
         Settings.bri_preset_high = value;
         send_state = true;
       }
    break;
     case DGR_ITEM_BRI_POWER_ON:
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (!device_is_local)
+        remote_pwm_dimmer->bri_power_on = value;
+      else
+#endif  // USE_PWM_DIMMER_REMOTE
       if (Settings.bri_power_on != value) {
         Settings.bri_power_on = value;
         send_state = true;
       }
       break;
     case DGR_ITEM_STATUS:
-      SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
-        DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
-        DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
-        DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
-        DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
+#ifdef USE_PWM_DIMMER_REMOTE
+      if (device_is_local)
+#endif  // USE_PWM_DIMMER_REMOTE
+        SendLocalDeviceGroupMessage(DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade,
+          DGR_ITEM_LIGHT_SPEED, Settings.light_speed, DGR_ITEM_LIGHT_BRI, target_bri,
+          DGR_ITEM_BRI_PRESET_LOW, Settings.bri_preset_low, DGR_ITEM_BRI_PRESET_HIGH, Settings.bri_preset_high,
+          DGR_ITEM_DIMMER_RANGE, Settings.dimmer_hw_min | Settings.dimmer_hw_max << 16,
+          DGR_ITEM_BRI_POWER_ON, Settings.bri_power_on);
       break;
   }
 }
@@ -356,7 +409,7 @@ void PWMDimmerHandleButton()
 
       // If this is not about the power button, load the new hold time. Note that the hold time for
       // the power button is longer than the hold time for the other buttons.
-      button_hold_time[button_index] = now + 250;
+      button_hold_time[button_index] = now + 100;
     }
 
     // If the button is being held, send a button hold.
@@ -432,50 +485,50 @@ void PWMDimmerHandleButton()
         ignore_power_button_release = ignore_power_button_hold = true;
       }
 
-      // If the active device is local or the power button if also pressed, then if the down/up
-      // button has been held, handle the action based on the number of times the down or up button
-      // was pressed and released before holding it.
+      // If the active device is local or the power button if also pressed, ...
 #ifdef USE_PWM_DIMMER_REMOTE
       if (active_device_is_local == !button_pressed[power_button_index]) {
 #endif  // USE_PWM_DIMMER_REMOTE
-        if (button_hold_time[button_index] < now) {
+        bool is_down_button = (button_index == down_button_index);
+
+        // If the power is not on, turn it on using a temporary brightness of bri_preset_low if the
+        // down button is pressed or bri_preset_low if the up button is pressed.
+#ifdef USE_PWM_DIMMER_REMOTE
+        if ((!active_device_is_local ? !active_remote_pwm_dimmer->power : !power)) {
+#else // USE_PWM_DIMMER_REMOTE
+        if (!power) {
+#endif  // USE_PWM_DIMMER_REMOTE
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (!active_device_is_local)
+            active_remote_pwm_dimmer->bri = (is_down_button ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            target_bri = (is_down_button ? Settings.bri_preset_low : Settings.bri_preset_high);
+          toggle_power = true;
+          button_hold_time[button_index] = now + 500;
+
+          // If the power button is also pressed, set the power button hold dimmer direction
+          // so holding the power switch adjusts the brightness away from the brightness we
+          // just set.
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = is_down_button;
+#endif  // USE_PWM_DIMMER_REMOTE
+        }
+
+        // If the power is on and the down/up button has been held, handle the action based on the
+        // number of times the down or up button was pressed and released before holding it.
+        else if (button_hold_time[button_index] < now) {
           uint8_t uint8_value;
-          bool down_button_is_held = (button_index == down_button_index);
+          bool is_down_button = (button_index == down_button_index);
           bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
           uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
           uint16_t uint16_value;
 
           switch (tap_count) {
             case 0:
-              // If the power is on, adjust the brightness. Set the direction based on which button is
-              // pressed. The new brightness will be calculated below.
-#ifdef USE_PWM_DIMMER_REMOTE
-              if ((!active_device_is_local ? active_remote_pwm_dimmer->power : power)) {
-#else // USE_PWM_DIMMER_REMOTE
-              if (power) {
-#endif  // USE_PWM_DIMMER_REMOTE
-                bri_direction = (down_button_is_held ? -1 : 1);
-              }
-
-              // If the power is not on, turn it on using a temporary brightness of bri_preset_low if
-              // the down button is pressed or bri_preset_low if the up button is pressed.
-              else {
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (!active_device_is_local)
-                  active_remote_pwm_dimmer->bri = (down_button_is_held ? active_remote_pwm_dimmer->bri_preset_low : active_remote_pwm_dimmer->bri_preset_high);
-                else
-#endif  // USE_PWM_DIMMER_REMOTE
-                  target_bri = (down_button_is_held ? Settings.bri_preset_low : Settings.bri_preset_high);
-                toggle_power = true;
-                button_hold_time[button_index] = now + 1000;
-
-                // If the power button is also pressed, set the power button hold dimmer direction
-                // so holding the power switch adjusts the brightness away from the brightness we
-                // just set.
-#ifdef USE_PWM_DIMMER_REMOTE
-                if (button_pressed[power_button_index]) active_remote_pwm_dimmer->power_button_increases_bri = down_button_is_held;
-#endif  // USE_PWM_DIMMER_REMOTE
-              }
+              // Adjust the brightness. Set the direction based on which button is pressed. The new
+              // brightness will be calculated below.
+              bri_direction = (is_down_button ? -1 : 1);
               break;
 
             case 1:
@@ -488,7 +541,7 @@ void PWMDimmerHandleButton()
                 else
 #endif  // USE_PWM_DIMMER_REMOTE
                   uint8_value = fixed_color_index;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value)
                     uint8_value--;
                   else
@@ -519,7 +572,7 @@ void PWMDimmerHandleButton()
 #else  // USE_PWM_DIMMER_REMOTE
                 snprintf_P(topic, sizeof(topic), PSTR("%s/cmnd/Event"), SettingsText(SET_MQTT_GRP_TOPIC));
 #endif  // USE_PWM_DIMMER_REMOTE
-                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (down_button_is_held ? 1 : 2));
+                sprintf_P(mqtt_data, PSTR("SwitchTrigger%u"), (is_down_button ? 1 : 2));
                 MqttPublish(topic);
               }
               break;
@@ -533,7 +586,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint16_value = Settings.dimmer_hw_min;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint16_value > 0) uint16_value--;
                 }
                 else if (uint16_value < 65535) {
@@ -561,7 +614,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.light_speed;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 1) uint8_value--;
                 }
                 else if (uint8_value < 40) {
@@ -587,7 +640,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_low;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -610,7 +663,7 @@ void PWMDimmerHandleButton()
                 else
 #endif // USE_PWM_DIMMER_REMOTE
                   uint8_value = Settings.bri_preset_high;
-                if (down_button_is_held) {
+                if (is_down_button) {
                   if (uint8_value > 3) uint8_value--;
                 }
                 else if (uint8_value < 255) {
@@ -630,18 +683,14 @@ void PWMDimmerHandleButton()
 
           button_was_held = true;
 
-          // If the button was tapped before it was held, reset the button hold time to one second and
-          // turn all the brightness LEDs on for 250ms.
+          // If the button was tapped before it was held, reset the button hold time to 1/2 second
+          // and turn all the brightness LEDs on for 250ms.
           if (tap_count > 0) {
-            button_hold_time[button_index] = now + 1000;
+            button_hold_time[button_index] = now + 500;
             turn_off_brightness_leds_time = now + 250;
             PWMDimmerSetBrightnessLeds(1);
           }
         }
-        else if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
-          turn_off_brightness_leds_time = 0;
-          PWMDimmerSetBrightnessLeds(-1);
-        }
 #ifdef USE_PWM_DIMMER_REMOTE
       }
 #endif // USE_PWM_DIMMER_REMOTE
@@ -870,6 +919,11 @@ void PWMDimmerHandleButton()
       MqttPublishTeleState();
     }
   }
+
+  if (turn_off_brightness_leds_time && turn_off_brightness_leds_time < millis()) {
+    turn_off_brightness_leds_time = 0;
+    PWMDimmerSetBrightnessLeds(-1);
+  }
 }
 
 /*********************************************************************************************\

From 5f5becfac61e5fc7665ebc45943372e9e1796a43 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 27 Feb 2020 21:35:13 -0600
Subject: [PATCH 365/403] Fix up/down release after power on

---
 tasmota/xdrv_35_pwm_dimmer.ino | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index 4365b9774..103b2a2ee 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -72,6 +72,7 @@ uint8_t button_press_count[3] = { 0, 0, 0 };
 bool relay_is_on = false;
 bool ignore_power_button_hold;
 bool ignore_power_button_release;
+bool ignore_up_down_button_release = false;
 bool button_was_held = false;
 bool power_button_increases_bri = true;
 bool invert_power_button_bri_direction = false;
@@ -506,6 +507,7 @@ void PWMDimmerHandleButton()
             target_bri = (is_down_button ? Settings.bri_preset_low : Settings.bri_preset_high);
           toggle_power = true;
           button_hold_time[button_index] = now + 500;
+          ignore_up_down_button_release = true;
 
           // If the power button is also pressed, set the power button hold dimmer direction
           // so holding the power switch adjusts the brightness away from the brightness we
@@ -519,7 +521,6 @@ void PWMDimmerHandleButton()
         // number of times the down or up button was pressed and released before holding it.
         else if (button_hold_time[button_index] < now) {
           uint8_t uint8_value;
-          bool is_down_button = (button_index == down_button_index);
           bool down_button_was_tapped = (button_press_count[down_button_index] > 0);
           uint8_t tap_count = (down_button_was_tapped ? button_press_count[down_button_index] : button_press_count[up_button_index]);
           uint16_t uint16_value;
@@ -864,8 +865,13 @@ void PWMDimmerHandleButton()
         button_press_count[button_index] = 0;
       }
 
-      // If the button was tapped (pressed and released quickly), increment the count of how many
-      // times this button has been pressed.
+      // If the power was off and we turned it on with the down or up button, ignore it's release.
+      if (ignore_up_down_button_release) {
+        ignore_up_down_button_release = false;
+      }
+
+      // If the button was tapped (pressed and released quickly) and the power is on, increment the
+      // count of how many times this button has been pressed.
       else if (button_hold_time[button_index] >= now) {
         button_press_count[button_index]++;
       }
@@ -899,7 +905,7 @@ void PWMDimmerHandleButton()
       SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_BRI, new_bri, DGR_ITEM_POWER, new_power);
     else
       SendDeviceGroupMessage(power_button_index, DGR_MSGTYP_UPDATE, DGR_ITEM_POWER, new_power);
-#endif  // USE_DEVICE_GROUPS
+#endif  //0 USE_DEVICE_GROUPS
 
 #ifdef USE_PWM_DIMMER_REMOTE
     // The target brightness has already been set. Execute the toggle power command with a source of

From b27b18a8e62fe663c8a5716de8c79508d3c6fe96 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 27 Feb 2020 23:38:55 -0600
Subject: [PATCH 366/403] Add button press count timeout

---
 tasmota/xdrv_04_light.ino      |  3 +++
 tasmota/xdrv_35_pwm_dimmer.ino | 30 +++++++++++++-----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index d46ae7eef..fc684f5f7 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2123,7 +2123,9 @@ void LightHandleDeviceGroupRequest()
       break;
     case DGR_ITEM_LIGHT_FIXED_COLOR:
       {
+        struct XDRVMAILBOX save_XdrvMailbox;
         power_t save_power = Light.power;
+
         if (value) {
           bool save_decimal_text = Settings.flag.decimal_text;
           char str[16];
@@ -2143,6 +2145,7 @@ void LightHandleDeviceGroupRequest()
           XdrvMailbox.index = save_power;
           LightSetPower();
         }
+        XdrvMailbox = save_XdrvMailbox;
         send_state = true;
       }
       break;
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index 103b2a2ee..cf7dee97a 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -60,6 +60,7 @@ struct remote_pwm_dimmer {
 
 uint32_t led_timeout_time = 0;
 uint32_t turn_off_brightness_leds_time = 0;
+uint32_t button_press_count_timeout = 0;
 uint32_t button_hold_time[3];
 uint8_t current_bri;
 uint8_t target_bri;
@@ -68,6 +69,7 @@ uint8_t power_button_index = 0;
 uint8_t down_button_index = 1;
 uint8_t up_button_index = 2;
 uint8_t fixed_color_index;
+uint8_t buttons_pressed = 0;
 uint8_t button_press_count[3] = { 0, 0, 0 };
 bool relay_is_on = false;
 bool ignore_power_button_hold;
@@ -81,7 +83,6 @@ bool button_pressed[3] = { false, false, false };
 #ifdef USE_PWM_DIMMER_REMOTE
 struct remote_pwm_dimmer * remote_pwm_dimmers;
 struct remote_pwm_dimmer * active_remote_pwm_dimmer;
-uint8_t buttons_pressed = 0;
 bool active_device_is_local;
 #endif  // USE_PWM_DIMMER_REMOTE
 
@@ -378,15 +379,13 @@ void PWMDimmerHandleButton()
   if (!XdrvMailbox.payload) {
     int8_t bri_direction = 0;
 
-    // If the button was just pressed, reset the press count if it was released for longer than 1
-    // second, flag the button as pressed, clear the hold sent flag and increment the buttons
-    // pressed count.
+    // If the button was just pressed, flag the button as pressed, clear the hold sent flag and
+    // increment the buttons pressed count.
     if (!button_pressed[button_index]) {
-      if (now > button_hold_time[button_index] && now - button_hold_time[button_index] > 1000) button_press_count[button_index] = 0;
       button_pressed[button_index] = true;
       button_hold_sent[button_index] = false;
-#ifdef USE_PWM_DIMMER_REMOTE
       buttons_pressed++;
+#ifdef USE_PWM_DIMMER_REMOTE
 
       // If there are no other buttons pressed right now and remote mode is enabled, make the device
       // associated with this button the device we're going to control.
@@ -410,7 +409,7 @@ void PWMDimmerHandleButton()
 
       // If this is not about the power button, load the new hold time. Note that the hold time for
       // the power button is longer than the hold time for the other buttons.
-      button_hold_time[button_index] = now + 100;
+      button_hold_time[button_index] = now + 500;
     }
 
     // If the button is being held, send a button hold.
@@ -842,16 +841,9 @@ void PWMDimmerHandleButton()
       if (button_was_held) {
         button_was_held = false;
 
-        // If the button was tapped before it was held, we used the brightness LEDs to inidcate the
-        // operation so reset the brightness LEDs.
-        if (button_press_count[down_button_index] > 0 || button_press_count[up_button_index]) {
-          turn_off_brightness_leds_time = 0;
-          PWMDimmerSetBrightnessLeds(0);
-        }
-
         // If the button was not tapped before it was held, we changed the brightness and sent
         // updates with the more-to-come message type. Send a final update.
-        else {
+        if (button_press_count[down_button_index] == 0 && button_press_count[up_button_index == 0]) {
           dgr_item = DGR_ITEM_LIGHT_BRI;
 #ifdef USE_PWM_DIMMER_REMOTE
           if (!active_device_is_local)
@@ -879,9 +871,13 @@ void PWMDimmerHandleButton()
 
     // Flag the button as released.
     button_pressed[button_index] = false;
-#ifdef USE_PWM_DIMMER_REMOTE
     buttons_pressed--;
-#endif  // USE_PWM_DIMMER_REMOTE
+    button_press_count_timeout = now + 500;
+  }
+
+  // If 
+  else if (buttons_pressed == 0 && button_press_count_timeout && button_press_count_timeout < now) {
+    button_press_count[0] = button_press_count[1] = button_press_count[2] = 0;
   }
 
   if (toggle_power) {

From 94f5321db45f0254620e0ea505108ee05d51a683 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 28 Feb 2020 16:35:19 +0100
Subject: [PATCH 367/403] Fix keeloq functionality

---
 tasmota/support_features.ino |  4 ++-
 tasmota/xdrv_36_keeloq.ino   | 54 +++++++++++++++++++++++-------------
 tools/decode-status.py       |  4 +--
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 6cb81522a..6a13573c1 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -530,7 +530,9 @@ void GetFeatures(void)
 
   feature6 = 0x00000000;
 
-//  feature6 |= 0x00000001;
+#ifdef USE_KEELOQ
+  feature6 |= 0x00000001;  // xdrv_36keeloq.ino
+#endif
 //  feature6 |= 0x00000002;
 //  feature6 |= 0x00000004;
 //  feature6 |= 0x00000008;
diff --git a/tasmota/xdrv_36_keeloq.ino b/tasmota/xdrv_36_keeloq.ino
index edac0ee23..d975a5a79 100644
--- a/tasmota/xdrv_36_keeloq.ino
+++ b/tasmota/xdrv_36_keeloq.ino
@@ -1,5 +1,7 @@
 /*
-  xdrv_36
+  xdrv_36_keeloq.ino - Jarolift Keeloq shutter support for Tasmota
+
+  Copyright (C) 2020  he-so
 
   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
@@ -16,6 +18,14 @@
 */
 
 #ifdef USE_KEELOQ
+/*********************************************************************************************\
+ * Keeloq shutter support
+ *
+ * Uses hardware SPI and two user configurable GPIO's (CC1101 GDO0 and CC1101 GDO2)
+ *
+ * Considering the implementation these two user GPIO's are fake.
+ * Only CC1101 GDO0 is used and must always be GPIO05 dictated by the used CC1101 library.
+\*********************************************************************************************/
 
 #define XDRV_36 36
 
@@ -27,9 +37,6 @@
 #define Lowpulse         400
 #define Highpulse        800
 
-#define TX_PORT          pin[GPIO_CC1101_GDO2]              // Outputport for transmission
-#define RX_PORT          pin[GPIO_CC1101_GDO0]              // Inputport for reception
-
 const char kJaroliftCommands[] PROGMEM = "Keeloq|" // prefix
   "SendRaw|SendButton|Set";
 
@@ -47,6 +54,8 @@ struct JAROLIFT_DEVICE {
   uint64_t pack            = 0;   // Contains data to send.
   int count                = 0;
   uint32_t serial          = 0x0;
+  uint8_t port_tx;
+  uint8_t port_rx;
 } jaroliftDevice;
 
 void CmdSet(void)
@@ -75,7 +84,7 @@ void CmdSet(void)
       GenerateDeviceCryptKey();
       ResponseCmndDone();
     } else {
-      DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("no payload"));      
+      DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("no payload"));
     }
   } else {
     DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("no param"));
@@ -114,7 +123,7 @@ void CmdSendButton(void)
       for(int repeat = 0; repeat <= 1; repeat++)
       {
         uint64_t bitsToSend = jaroliftDevice.pack;
-        digitalWrite(TX_PORT, LOW);
+        digitalWrite(jaroliftDevice.port_tx, LOW);
         delayMicroseconds(1150);
         SendSyncPreamble(13);
         delayMicroseconds(3500);
@@ -140,16 +149,16 @@ void SendBit(byte bitToSend)
 {
   if (bitToSend==1)
   {
-    digitalWrite(TX_PORT, LOW);  // Simple encoding of bit state 1
+    digitalWrite(jaroliftDevice.port_tx, LOW);  // Simple encoding of bit state 1
     delayMicroseconds(Lowpulse);
-    digitalWrite(TX_PORT, HIGH);
+    digitalWrite(jaroliftDevice.port_tx, HIGH);
     delayMicroseconds(Highpulse);
   }
   else
   {
-    digitalWrite(TX_PORT, LOW);  // Simple encoding of bit state 0
+    digitalWrite(jaroliftDevice.port_tx, LOW);  // Simple encoding of bit state 0
     delayMicroseconds(Highpulse);
-    digitalWrite(TX_PORT, HIGH);
+    digitalWrite(jaroliftDevice.port_tx, HIGH);
     delayMicroseconds(Lowpulse);
   }
 }
@@ -163,7 +172,7 @@ void CmndSendRaw(void)
   {
     if (XdrvMailbox.data_len > 0)
     {
-      digitalWrite(TX_PORT, LOW);
+      digitalWrite(jaroliftDevice.port_tx, LOW);
       delayMicroseconds(1150);
       SendSyncPreamble(13);
       delayMicroseconds(3500);
@@ -208,9 +217,9 @@ void SendSyncPreamble(int l)
 {
   for (int i = 0; i < l; ++i)
   {
-    digitalWrite(TX_PORT, LOW);
+    digitalWrite(jaroliftDevice.port_tx, LOW);
     delayMicroseconds(400);
-    digitalWrite(TX_PORT, HIGH);
+    digitalWrite(jaroliftDevice.port_tx, HIGH);
     delayMicroseconds(380);
   }
 }
@@ -231,8 +240,11 @@ void CreateKeeloqPacket()
   AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR("pack low:  %08x"), jaroliftDevice.pack);
 }
 
-void InitKeeloq()
+void KeeloqInit()
 {
+  jaroliftDevice.port_tx = pin[GPIO_CC1101_GDO2];              // Output port for transmission
+  jaroliftDevice.port_rx = pin[GPIO_CC1101_GDO0];              // Input port for reception
+
   DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("cc1101.init()"));
   delay(100);
   cc1101.init();
@@ -241,8 +253,8 @@ void InitKeeloq()
   cc1101.setCarrierFreq(CFREQ_433);
   cc1101.disableAddressCheck();
 
-  pinMode(TX_PORT, OUTPUT); 
-  pinMode(RX_PORT, INPUT_PULLUP);
+  pinMode(jaroliftDevice.port_tx, OUTPUT);
+  pinMode(jaroliftDevice.port_rx, INPUT_PULLUP);
 
   jaroliftDevice.serial = Settings.keeloq_serial;
   jaroliftDevice.count = Settings.keeloq_count;
@@ -254,17 +266,19 @@ void InitKeeloq()
 \*********************************************************************************************/
 bool Xdrv36(uint8_t function)
 {
+  if ((99 == pin[GPIO_CC1101_GDO0]) || (99 == pin[GPIO_CC1101_GDO2])) { return false; }
+
   bool result = false;
 
   switch (function) {
-    case FUNC_INIT:
-      InitKeeloq();
-      DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("init done."));
-      break;
     case FUNC_COMMAND:
       AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("calling command"));
       result = DecodeCommand(kJaroliftCommands, jaroliftCommand);
       break;
+    case FUNC_INIT:
+      KeeloqInit();
+      DEBUG_DRIVER_LOG(LOG_LEVEL_DEBUG_MORE, PSTR("init done."));
+      break;
   }
 
   return result;
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 192696ad8..126b050aa 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -198,7 +198,7 @@ a_features = [[
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
     "USE_AHT1x","USE_WEMOS_MOTOR_V1","USE_DEVICE_GROUPS","USE_PWM_DIMMER"
     ],[
-    "","","","",
+    "USE_KEELOQ","","","",
     "","","","",
     "","","","",
     "","","","",
@@ -239,7 +239,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200227 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200228 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 1ef284cdf2d82a64e36d8011f9d14325e78ae15c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 28 Feb 2020 18:09:23 +0100
Subject: [PATCH 368/403] Experimental support Sonoff D1

Experimental support Sonoff D1 (#7598)
---
 tasmota/xdrv_39_sonoff_d1.ino | 217 ++++++++++++++++++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 tasmota/xdrv_39_sonoff_d1.ino

diff --git a/tasmota/xdrv_39_sonoff_d1.ino b/tasmota/xdrv_39_sonoff_d1.ino
new file mode 100644
index 000000000..c30bea290
--- /dev/null
+++ b/tasmota/xdrv_39_sonoff_d1.ino
@@ -0,0 +1,217 @@
+/*
+  xdrv_39_sonoff_d1.ino - sonoff D1 dimmer support for Tasmota
+
+  Copyright (C) 2020  Theo Arends and robbz23 (protocol analysis)
+
+  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/>.
+*/
+
+//#define USE_SONOFF_D1
+
+#ifdef USE_SONOFF_D1
+/*********************************************************************************************\
+ * Sonoff D1 dimmer 433
+ *
+ *  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10
+ * AA 55                                              - Header
+ *       01 04                                        - Version?
+ *             00 0A                                  - Following data length (10 bytes)
+ *                   01                               - Power state (00 = off, 01 = on, FF = ignore)
+ *                      64                            - Dimmer percentage (01 to 64 = 1 to 100%)
+ *                         FF FF FF FF FF FF FF FF    - Not used
+ *                                                 6C - CRC over bytes 2 to F (Addition)
+ *
+ * Based on Gravitate1:
+ * When I switch the light ON via the app, I get:
+ * AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C
+ *
+ * When I switch it OFF, I get:
+ * AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B
+ *
+ * When I set it to 1%, I get:
+ * AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07
+ * AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09
+ *
+ * When I set it to 6%, I get:
+ * AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C
+ * AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E
+ *
+ * When I set it to 100%, I get:
+ * AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A
+ * AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C
+ *
+ * Based on robbz23:
+ * 00:17:59 CMD: Baudrate 9600
+ * 00:17:59 SER: Set to 8N1 9600 bit/s
+ * 00:17:59 RSL: stat/tasmota_D9E56D/RESULT = {"Baudrate":9600}
+ *
+ * 00:25:32 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 29
+ * 00:25:32 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ *
+ * 00:26:35 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 2a
+ * 00:26:35 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ * 00:26:35 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
+ *
+ * 00:28:58 CMD: SerialSend5 aa 55 01 04 00 0a 01 01 ffffffffffffffff 09
+ * 00:28:58 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ * 00:28:58 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
+ *
+ * 00:29:12 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 3C FF FF FF FF FF FF FF FF 44}
+ * 00:29:43 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 01 FF FF FF FF FF FF FF FF 09}
+ * 00:29:53 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C}
+ *
+ * 00:30:02 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A FF 1E FF FF FF FF FF FF FF FF 24}
+\*********************************************************************************************/
+
+#define XDRV_39                   39
+
+struct SONOFFD1 {
+  uint8_t receive_flag = 0;
+  uint8_t dimmer;
+} SnfD1;
+
+/********************************************************************************************/
+
+void SonoffD1Received(void)
+{
+  char svalue[32];
+
+  uint8_t action = serial_in_buffer[6];
+  uint8_t dimmer = serial_in_buffer[7];
+
+  if (action < 2) {
+    // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
+    // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
+    bool is_switch_change = (action != power);
+    if (is_switch_change) {
+      ExecuteCommandPower(1, action, SRC_SWITCH);
+    }
+  }
+  else if (0xFF == action) {
+    SnfD1.dimmer = dimmer;
+    bool is_brightness_change = SnfD1.dimmer != Settings.light_dimmer;
+    if (power && (SnfD1.dimmer > 0) && is_brightness_change) {
+      char scmnd[20];
+      snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), SnfD1.dimmer);
+      ExecuteCommand(scmnd, SRC_SWITCH);
+    }
+  }
+
+  // Send Acknowledge - Copy first 5 bytes, reset byte 6 and store crc in byte 7
+  // AA 55 01 04 00 00 05
+  serial_in_buffer[5] = 0;                      // Ack
+  serial_in_buffer[6] = 0;                      // Crc
+  for (uint32_t i = 0; i < 7; i++) {
+    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+}
+
+bool SonoffD1SerialInput(void)
+{
+  uint8_t packet_length = 0;
+
+  if (0xAA == serial_in_byte) {               // 0xAA - Start of text
+    serial_in_byte_counter = 0;
+    SnfD1.receive_flag = true;
+  }
+  if (SnfD1.receive_flag) {
+    serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+    if (serial_in_byte_counter == 5) {
+      packet_length = 7 + serial_in_byte;  // 8 or 17
+    }
+    if (serial_in_byte_counter == packet_length) {
+
+      // Sonoff D1 codes
+      // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
+      // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
+      // AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07 - Power ignore, Dimmer 1%
+      // AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09 - Response 2
+      // AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C - Power ignore, Dimmer 6%
+      // AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E - Response 2
+      // AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A - Power ignore, Dimmer 100%
+      // AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C - Response 2
+
+      AddLogSerial(LOG_LEVEL_DEBUG);
+      uint8_t crc = 0;
+      for (uint32_t i = 2; i < packet_length -1; i++) {
+        crc += serial_in_buffer[i];
+      }
+      if (crc == serial_in_buffer[packet_length -1]) {
+        SonoffD1Received();
+        SnfD1.receive_flag = false;
+        return true;
+      }
+    }
+    serial_in_byte = 0;
+  }
+  return false;
+}
+
+/********************************************************************************************/
+
+bool SonoffD1SendPower(void)
+{
+  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+
+  buffer[6] = XdrvMailbox.payload;
+
+  for (uint32_t i = 0; i < sizeof(buffer); i++) {
+    if ((i > 1) && (i < sizeof(buffer) -1)) { serial_in_buffer[16] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+  return true;
+}
+
+bool SonoffD1SendDimmer(void)
+{
+  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0xFF,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+
+  buffer[7] = light_state.getDimmer();
+
+  for (uint32_t i = 0; i < sizeof(buffer); i++) {
+    if ((i > 1) && (i < sizeof(buffer) -1)) { serial_in_buffer[16] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+  return true;
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv39(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_D1 == my_module_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = SonoffD1SerialInput();
+        break;
+      case FUNC_SET_DEVICE_POWER:
+        result = SonoffD1SendPower();
+        break;
+      case FUNC_SET_CHANNELS:
+        result = SonoffD1SendDimmer();
+        break;
+      case FUNC_MODULE_INIT:
+        SetSerial(9600, TS_SERIAL_8N1);
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_SONOFF_D1

From 6d79d569565fd1711205cf1aaa52216de6ca2fdc Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 28 Feb 2020 18:15:04 +0100
Subject: [PATCH 369/403] Experimental support Sonoff D1

Experimental support Sonoff D1 (#7598)
---
 tasmota/my_user_config.h      | 1 +
 tasmota/xdrv_39_sonoff_d1.ino | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 5b0282481..8fc58ac4d 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -419,6 +419,7 @@
 #define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
   #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 //#define USE_KEELOQ                               // Add support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+//#define USE_SONOFF_D1                            // Add support for Sonoff D1
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/xdrv_39_sonoff_d1.ino b/tasmota/xdrv_39_sonoff_d1.ino
index c30bea290..9d58f3782 100644
--- a/tasmota/xdrv_39_sonoff_d1.ino
+++ b/tasmota/xdrv_39_sonoff_d1.ino
@@ -17,8 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-//#define USE_SONOFF_D1
-
 #ifdef USE_SONOFF_D1
 /*********************************************************************************************\
  * Sonoff D1 dimmer 433

From a8585bdba7bf8c8a40a2a21155bb044bf22a1ca9 Mon Sep 17 00:00:00 2001
From: Barbudor <barbudor@barbudor.net>
Date: Fri, 28 Feb 2020 23:37:35 +0100
Subject: [PATCH 370/403] Use DEBUG_SENSOR macros for debug messages

---
 tasmota/xsns_13_ina219.ino | 46 ++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/tasmota/xsns_13_ina219.ino b/tasmota/xsns_13_ina219.ino
index f5539cf31..854cca5cd 100644
--- a/tasmota/xsns_13_ina219.ino
+++ b/tasmota/xsns_13_ina219.ino
@@ -97,10 +97,11 @@
 uint8_t ina219_type[4] = {0,0,0,0};
 uint8_t ina219_addresses[] = { INA219_ADDRESS1, INA219_ADDRESS2, INA219_ADDRESS3, INA219_ADDRESS4 };
 
-#define __DEBUG__(a)
-
-__DEBUG__(char __dbg1[20];)
-__DEBUG__(char __dbg2[20];)
+#ifdef DEBUG_TASMOTA_SENSOR
+// temporary strings for floating point in debug messages
+char __ina219_dbg1[10];
+char __ina219_dbg2[10];
+#endif
 
 // The following multiplier is used to convert shunt voltage (in mV) to current (in A)
 // Current_A = ShuntVoltage_mV / ShuntResistor_milliOhms = ShuntVoltage_mV * ina219_current_multiplier
@@ -132,13 +133,15 @@ bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
 {
   uint16_t config = 0;
 
-  __DEBUG__(printf("mode = %d\n",mode);)
+  DEBUG_SENSOR_LOG("Ina219SetCalibration: mode=%d",mode);
   if (mode < 5)
   {
     // All legacy modes 0..2 are handled the same and consider default 0.1 shunt resistor
     ina219_current_multiplier = 1.0 / INA219_DEFAULT_SHUNT_RESISTOR_MILLIOHMS;
-    __DEBUG__(dtostrfd(ina219_current_multiplier,5,__dbg1);)
-    __DEBUG__(printf("cur_mul=%s\n",__dbg1);)
+    #ifdef DEBUG_TASMOTA_SENSOR
+    dtostrfd(ina219_current_multiplier,5,__ina219_dbg1);
+    DEBUG_SENSOR_LOG("Ina219SetCalibration: cur_mul=%s",__ina219_dbg1);
+    #endif
   }
   else if (mode >= 10)
   {
@@ -147,8 +150,10 @@ bool Ina219SetCalibration(uint8_t mode, uint16_t addr)
     for ( ; mult > 0 ; mult-- )
       shunt_milliOhms *= 10;
     ina219_current_multiplier = 1.0 / shunt_milliOhms;
-    __DEBUG__(dtostrfd(ina219_current_multiplier,5,__dbg1);)
-    __DEBUG__(printf("shunt = %dmO => cur_mul=%s\n",shunt_milliOhms,__dbg1);)
+    #ifdef DEBUG_TASMOTA_SENSOR
+    dtostrfd(ina219_current_multiplier,5,__ina219_dbg1);
+    DEBUG_SENSOR_LOG("Ina219SetCalibration: shunt=%dmO => cur_mul=%s",shunt_milliOhms,__ina219_dbg1);
+    #endif
   }
   config = INA219_CONFIG_BVOLTAGERANGE_32V
          | INA219_CONFIG_GAIN_8_320MV               // Use max scale
@@ -163,7 +168,7 @@ float Ina219GetShuntVoltage_mV(uint16_t addr)
 {
   // raw shunt voltage (16-bit signed integer, so +-32767)
   int16_t value = I2cReadS16(addr, INA219_REG_SHUNTVOLTAGE);
-  __DEBUG__(printf("ShR = 0x%04X\n",value);)
+  DEBUG_SENSOR_LOG("Ina219GetShuntVoltage_mV: ShReg = 0x%04X",value);
   // convert to shunt voltage in mV (so +-327mV) (LSB=10µV=0.01mV)
   return value * 0.01;
 }
@@ -172,12 +177,12 @@ float Ina219GetBusVoltage_V(uint16_t addr)
 {
   // Shift 3 to the right to drop CNVR and OVF as unsigned
   uint16_t value = I2cRead16(addr, INA219_REG_BUSVOLTAGE) >> 3;
-  __DEBUG__(printf("BusR = 0x%04X\n",value);)
+  DEBUG_SENSOR_LOG("Ina219GetBusVoltage_V: BusReg = 0x%04X",value);
   // and multiply by LSB raw bus voltage to return bus voltage in volts (LSB=4mV=0.004V)
   return value * 0.004;
 }
 
-/*
+/* Not used any more
 float Ina219GetCurrent_mA(uint16_t addr)
 {
   // Sometimes a sharp load will reset the INA219, which will reset the cal register,
@@ -200,16 +205,20 @@ bool Ina219Read(void)
     uint16_t addr = ina219_addresses[i];
     float bus_voltage_V = Ina219GetBusVoltage_V(addr);
     float shunt_voltage_mV = Ina219GetShuntVoltage_mV(addr);
-    __DEBUG__(dtostrfd(bus_voltage_V,5,__dbg1);)
-    __DEBUG__(dtostrfd(shunt_voltage_mV,5,__dbg2);)
-    __DEBUG__(printf("bV=%sV, sV=%smV\n",__dbg1,__dbg2);)
+    #ifdef DEBUG_TASMOTA_SENSOR
+    dtostrfd(bus_voltage_V,5,__ina219_dbg1);
+    dtostrfd(shunt_voltage_mV,5,__ina219_dbg2);
+    DEBUG_SENSOR_LOG("Ina219Read: bV=%sV, sV=%smV",__ina219_dbg1,__ina219_dbg2);
+    #endif
     // we return the power-supply-side voltage (as bus_voltage register provides the load-side voltage)
     ina219_voltage[i] = bus_voltage_V + (shunt_voltage_mV / 1000);
     // current is simply calculted from shunt voltage using pre-calculated multiplier
     ina219_current[i] = shunt_voltage_mV * ina219_current_multiplier;
-    __DEBUG__(dtostrfd(ina219_voltage[i],5,__dbg1);)
-    __DEBUG__(dtostrfd(ina219_current[i],5,__dbg2);)
-    __DEBUG__(printf("V=%sV, I=%smA\n",__dbg1,__dbg2);)
+    #ifdef DEBUG_TASMOTA_SENSOR
+    dtostrfd(ina219_voltage[i],5,__ina219_dbg1);
+    dtostrfd(ina219_current[i],5,__ina219_dbg2);
+    DEBUG_SENSOR_LOG("Ina219Read: V=%sV, I=%smA",__ina219_dbg1,__ina219_dbg2);
+    #endif
     ina219_valid[i] = SENSOR_MAX_MISS;
     //  AddLogMissed(ina219_types, ina219_valid);
   }
@@ -240,7 +249,6 @@ void Ina219Detect(void)
     if (I2cActive(addr)) { continue; }
     if (Ina219SetCalibration(Settings.ina219_mode, addr)) {
       I2cSetActiveFound(addr, ina219_types);
-      __DEBUG__(printf("found INA#%d @ 0x%02X\n",i,addr);)
       ina219_type[i] = 1;
       ina219_count++;
     }

From c7ac3c833ceaa76f2d486d01b060ffd849cab21b Mon Sep 17 00:00:00 2001
From: Jon Little <burundiocibu@gmail.com>
Date: Thu, 27 Feb 2020 18:28:06 -0600
Subject: [PATCH 371/403] Adding support for MaxBotix HRXL line of sonar
 ranging sensors

---
 tasmota/language/bg-BG.h   |   1 +
 tasmota/language/cs-CZ.h   |   1 +
 tasmota/language/de-DE.h   |   1 +
 tasmota/language/el-GR.h   |   1 +
 tasmota/language/en-GB.h   |   1 +
 tasmota/language/es-ES.h   |   1 +
 tasmota/language/fr-FR.h   |   1 +
 tasmota/language/he-HE.h   |   1 +
 tasmota/language/hu-HU.h   |   1 +
 tasmota/language/it-IT.h   |   1 +
 tasmota/language/ko-KO.h   |   1 +
 tasmota/language/nl-NL.h   |   1 +
 tasmota/language/pl-PL.h   |   1 +
 tasmota/language/pt-BR.h   |   1 +
 tasmota/language/pt-PT.h   |   1 +
 tasmota/language/ru-RU.h   |   1 +
 tasmota/language/sk-SK.h   |   1 +
 tasmota/language/sv-SE.h   |   1 +
 tasmota/language/tr-TR.h   |   1 +
 tasmota/language/uk-UA.h   |   1 +
 tasmota/language/zh-CN.h   |   1 +
 tasmota/language/zh-TW.h   |   1 +
 tasmota/tasmota_template.h |   7 ++-
 tasmota/xsns_64_hrxl.ino   | 126 +++++++++++++++++++++++++++++++++++++
 24 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 tasmota/xsns_64_hrxl.ino

diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 9a6ce8abc..16bf2f2c0 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index d98361640..5f066e2fc 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 05835a49c..ed8d7b612 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 0ddd43918..215d42733 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index b175cc193..783c6e343 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 12e732bc2..3b68654c5 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index e9c31da46..15b9b06fb 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index f836a92b9..32e114af9 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index da313caaa..74143fac2 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index efaecc1a5..7297a9b74 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 794b97e84..a32ec4b10 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 288da67d5..f78f63a8b 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index e15ccbbc2..2424fecdb 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index 9b24d05c8..f6526e5f1 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 9565fc7a5..5a0903b9d 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 700958875..d1f1a975c 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "А"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index dbee001e9..a5d98e87a 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index a8e5aa6a8..403416835 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 430289372..6303befea 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 2b4873e7a..ee335b8e5 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE                    "А"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 5a71e95dc..8c409882e 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 9883972f1..5ca55679a 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -643,6 +643,7 @@
 #define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
 #define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
 #define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
 
 // Units
 #define D_UNIT_AMPERE "安"
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 5494fbcf3..cdc976bb0 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -224,6 +224,7 @@ enum UserSelectablePins {
   GPIO_LE01MR_TX,      // F&F LE-01MR energy meter
   GPIO_CC1101_GDO0,    // CC1101 pin for RX
   GPIO_CC1101_GDO2,    // CC1101 pin for RX
+  GPIO_HRXL_RX,       // Data from MaxBotix HRXL sonar range sensor
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -308,7 +309,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_DS18X20 "o|" D_SENSOR_DHT11 "o|"
   D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX "|"
   D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX "|"
-  D_SENSOR_CC1101_GDO0 "|" D_SENSOR_CC1101_GDO2
+  D_SENSOR_CC1101_GDO0 "|" D_SENSOR_CC1101_GDO2 "|"
+  D_SENSOR_HRXL_RX
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -797,6 +799,9 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_CC1101_GDO0,    // CC1101 pin for RX
   GPIO_CC1101_GDO2,    // CC1101 pin for RX
 #endif
+#ifdef USE_HRXL
+  GPIO_HRXL_RX,
+#endif
 };
 
 const uint8_t kModuleNiceList[] PROGMEM = {
diff --git a/tasmota/xsns_64_hrxl.ino b/tasmota/xsns_64_hrxl.ino
new file mode 100644
index 000000000..a82134c94
--- /dev/null
+++ b/tasmota/xsns_64_hrxl.ino
@@ -0,0 +1,126 @@
+/*
+  xsns_64_hrxl.ino - MaxBotix HRXL serial interface
+
+  Copyright (C) 2020  Jon Little
+
+  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/>.
+*/
+
+#ifdef USE_HRXL
+/*********************************************************************************************\
+ * MaxBotix HRXL-MaxSonar ultrasonic range finders
+ * Source: https://www.maxbotix.com/documents/HRXL-MaxSonar-WR_Datasheet.pdf
+ *
+ * Hardware Serial will be selected if GPIO1 = [HRXL Rx]
+\*********************************************************************************************/
+
+#define XSNS_64                      64
+
+#include <TasmotaSerial.h>
+
+#define HRXL_READ_TIMEOUT        400 // us; enough for 6 bytes@9600bps
+
+TasmotaSerial *HRXLSerial = nullptr;
+
+uint32_t hrxl_distance_mm = 0;  // distance, mm
+bool hrxl_found = false;
+
+/*********************************************************************************************/
+
+void HRXLInit(void)
+{
+    hrxl_found = false;
+    if ((pin[GPIO_HRXL_RX] < 99))
+    {
+        HRXLSerial = new TasmotaSerial(pin[GPIO_HRXL_RX], -1, 1);
+        if (HRXLSerial->begin(9600))
+        {
+            if (HRXLSerial->hardwareSerial())
+                ClaimSerial();
+            hrxl_found = true;
+            HRXLSerial->setTimeout(HRXL_READ_TIMEOUT);
+        }
+    }
+}
+
+void HRXLEverySecond(void)
+{
+    if (!hrxl_found)
+        return;
+
+    int num_read=0;
+    int sum=0;
+    while (HRXLSerial->available()>5)
+    {
+        if (HRXLSerial->read() != 'R')
+            continue;
+
+        int d = HRXLSerial->parseInt();
+        if (d >= 30 && d<=5000)
+        {
+            sum += d;
+            num_read++;
+        }
+    }
+    if (num_read>1)
+        hrxl_distance_mm = int(sum / num_read);
+
+}
+
+
+void HRXLShow(bool json)
+{
+   char types[5] = "HRXL";
+   if (json)
+   {
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_DISTANCE "\":%d}"), types, hrxl_distance_mm);
+#ifdef USE_WEBSERVER
+   }
+   else
+   {
+      WSContentSend_PD(HTTP_SNS_RANGE, types, hrxl_distance_mm);
+#endif  // USE_WEBSERVER
+   }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns64(uint8_t function)
+{
+   if (pin[GPIO_HRXL_RX] >= 99)
+      return false;
+
+   switch (function)
+   {
+      case FUNC_INIT:
+         HRXLInit();
+         break;
+      case FUNC_EVERY_SECOND:
+         HRXLEverySecond();
+         break;
+      case FUNC_JSON_APPEND:
+         HRXLShow(1);
+         break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_SENSOR:
+         HRXLShow(0);
+         break;
+#endif  // USE_WEBSERVER
+   }
+   return false;
+}
+
+#endif  // USE_HRXL

From 4008b9ed3eb65c2f5ae644ef1a93b92835d5240e Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sat, 29 Feb 2020 13:51:16 +0100
Subject: [PATCH 372/403] Change IRremoteESP8266 library updated to v2.7.4

---
 .../CPPLINT.cfg                               |   0
 .../LICENSE.txt                               |   0
 .../README.md                                 |   4 +-
 .../README_fr.md                              |   4 +-
 .../ReleaseNotes.md                           |  20 +
 .../SupportedProtocols.md                     |   7 +-
 .../CommonAcControl/CommonAcControl.ino       |   0
 .../examples/CommonAcControl/platformio.ini   |   0
 .../ControlSamsungAC/ControlSamsungAC.ino     |   0
 .../examples/ControlSamsungAC/platformio.ini  |   0
 .../DumbIRRepeater/DumbIRRepeater.ino         |   0
 .../examples/DumbIRRepeater/platformio.ini    |   0
 .../examples/IRGCSendDemo/IRGCSendDemo.ino    |   0
 .../examples/IRGCSendDemo/platformio.ini      |   0
 .../examples/IRGCTCPServer/IRGCTCPServer.ino  |   0
 .../examples/IRGCTCPServer/platformio.ini     |   0
 .../examples/IRMQTTServer/IRMQTTServer.h      |   2 +-
 .../examples/IRMQTTServer/IRMQTTServer.ino    |  26 +-
 .../examples/IRMQTTServer/platformio.ini      |   0
 .../examples/IRServer/IRServer.ino            |   0
 .../examples/IRServer/platformio.ini          |   0
 .../examples/IRrecvDemo/IRrecvDemo.ino        |   0
 .../examples/IRrecvDemo/platformio.ini        |   0
 .../examples/IRrecvDump/IRrecvDump.ino        |   0
 .../examples/IRrecvDump/platformio.ini        |   0
 .../examples/IRrecvDumpV2/IRrecvDumpV2.ino    |   2 +-
 .../examples/IRrecvDumpV2/platformio.ini      |   0
 .../examples/IRsendDemo/IRsendDemo.ino        |   0
 .../examples/IRsendDemo/platformio.ini        |   0
 .../IRsendProntoDemo/IRsendProntoDemo.ino     |   0
 .../examples/IRsendProntoDemo/platformio.ini  |   0
 .../JVCPanasonicSendDemo.ino                  |   0
 .../JVCPanasonicSendDemo/platformio.ini       |   0
 .../examples/LGACSend/LGACSend.ino            |   0
 .../examples/LGACSend/platformio.ini          |   0
 .../SmartIRRepeater/SmartIRRepeater.ino       |   0
 .../examples/SmartIRRepeater/platformio.ini   |   0
 .../examples/TurnOnArgoAC/TurnOnArgoAC.ino    |   0
 .../examples/TurnOnArgoAC/platformio.ini      |   0
 .../TurnOnDaikinAC/TurnOnDaikinAC.ino         |   0
 .../examples/TurnOnDaikinAC/platformio.ini    |   0
 .../TurnOnFujitsuAC/TurnOnFujitsuAC.ino       |   0
 .../examples/TurnOnFujitsuAC/platformio.ini   |   0
 .../TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino |   0
 .../TurnOnKelvinatorAC/platformio.ini         |   0
 .../TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino |   0
 .../TurnOnMitsubishiAC/platformio.ini         |   0
 .../TurnOnMitsubishiHeavyAc.ino               |   0
 .../TurnOnMitsubishiHeavyAc/platformio.ini    |   0
 .../TurnOnPanasonicAC/TurnOnPanasonicAC.ino   |   0
 .../examples/TurnOnPanasonicAC/platformio.ini |   0
 .../TurnOnToshibaAC/TurnOnToshibaAC.ino       |   0
 .../examples/TurnOnToshibaAC/platformio.ini   |   0
 .../TurnOnTrotecAC/TurnOnTrotecAC.ino         |   0
 .../examples/TurnOnTrotecAC/platformio.ini    |   0
 .../examples/Web-AC-control/README.md         |   0
 .../Web-AC-control/Web-AC-control.ino         |   0
 .../examples/Web-AC-control/platformio.ini    |   0
 .../examples/Web-AC-control/printscreen.png   | Bin
 .../Web-AC-control/upload/favicon.ico         | Bin
 .../Web-AC-control/upload/level_1_off.svg     |   0
 .../Web-AC-control/upload/level_1_on.svg      |   0
 .../Web-AC-control/upload/level_2_off.svg     |   0
 .../Web-AC-control/upload/level_2_on.svg      |   0
 .../Web-AC-control/upload/level_3_off.svg     |   0
 .../Web-AC-control/upload/level_3_on.svg      |   0
 .../Web-AC-control/upload/level_4_off.svg     |   0
 .../Web-AC-control/upload/level_4_on.svg      |   0
 .../examples/Web-AC-control/upload/ui.html    |   0
 .../examples/Web-AC-control/upload/ui.js      |   0
 .../keywords.txt                              |  19 +
 .../library.json                              |   2 +-
 .../library.properties                        |   4 +-
 .../pylintrc                                  |   0
 .../src/CPPLINT.cfg                           |   0
 .../src/IRac.cpp                              |  33 +-
 .../src/IRac.h                                |   7 +-
 .../src/IRrecv.cpp                            | 455 +++++++++++-------
 .../src/IRrecv.h                              | 237 +++++----
 .../src/IRremoteESP8266.h                     |  30 +-
 .../src/IRsend.cpp                            |  11 +-
 .../src/IRsend.h                              |   7 +-
 .../src/IRtext.cpp                            |   0
 .../src/IRtext.h                              |   0
 .../src/IRtimer.cpp                           |   0
 .../src/IRtimer.h                             |   0
 .../src/IRutils.cpp                           |   5 +
 .../src/IRutils.h                             |   0
 .../src/i18n.h                                |   0
 .../src/ir_Aiwa.cpp                           |   8 +-
 .../src/ir_Amcor.cpp                          |  10 +-
 .../src/ir_Amcor.h                            |   0
 .../src/ir_Argo.cpp                           |   7 +-
 .../src/ir_Argo.h                             |   0
 .../src/ir_Carrier.cpp                        |   9 +-
 .../src/ir_Coolix.cpp                         |  10 +-
 .../src/ir_Coolix.h                           |   0
 .../src/ir_Daikin.cpp                         |  64 +--
 .../src/ir_Daikin.h                           |   0
 .../src/ir_Denon.cpp                          |  11 +-
 .../src/ir_Dish.cpp                           |   8 +-
 .../src/ir_Electra.cpp                        |  45 +-
 .../src/ir_Electra.h                          |  23 +-
 lib/IRremoteESP8266-2.7.4/src/ir_Epson.cpp    | 114 +++++
 .../src/ir_Fujitsu.cpp                        |  13 +-
 .../src/ir_Fujitsu.h                          |   0
 .../src/ir_GICable.cpp                        |   7 +-
 .../src/ir_GlobalCache.cpp                    |   0
 .../src/ir_Goodweather.cpp                    |   7 +-
 .../src/ir_Goodweather.h                      |   0
 .../src/ir_Gree.cpp                           |  13 +-
 .../src/ir_Gree.h                             |   0
 .../src/ir_Haier.cpp                          |  18 +-
 .../src/ir_Haier.h                            |   0
 .../src/ir_Hitachi.cpp                        |  20 +-
 .../src/ir_Hitachi.h                          |   0
 .../src/ir_Inax.cpp                           |   7 +-
 .../src/ir_JVC.cpp                            |   8 +-
 .../src/ir_Kelvinator.cpp                     |  13 +-
 .../src/ir_Kelvinator.h                       |   0
 .../src/ir_LG.cpp                             |  14 +-
 .../src/ir_LG.h                               |   0
 .../src/ir_Lasertag.cpp                       |   9 +-
 .../src/ir_Lego.cpp                           |   8 +-
 .../src/ir_Lutron.cpp                         |   9 +-
 .../src/ir_MWM.cpp                            |   8 +-
 .../src/ir_Magiquest.cpp                      |  11 +-
 .../src/ir_Magiquest.h                        |   0
 .../src/ir_Midea.cpp                          |  10 +-
 .../src/ir_Midea.h                            |   0
 .../src/ir_Mitsubishi.cpp                     |  51 +-
 .../src/ir_Mitsubishi.h                       |   0
 .../src/ir_MitsubishiHeavy.cpp                |   9 +-
 .../src/ir_MitsubishiHeavy.h                  |   0
 .../src/ir_NEC.cpp                            |  18 +-
 .../src/ir_NEC.h                              |   0
 .../src/ir_Neoclima.cpp                       |   7 +-
 .../src/ir_Neoclima.h                         |   0
 .../src/ir_Nikai.cpp                          |   6 +-
 .../src/ir_Panasonic.cpp                      |  20 +-
 .../src/ir_Panasonic.h                        |   0
 .../src/ir_Pioneer.cpp                        |   9 +-
 .../src/ir_Pronto.cpp                         |   0
 .../src/ir_RC5_RC6.cpp                        |  20 +-
 .../src/ir_RCMM.cpp                           |   8 +-
 .../src/ir_Samsung.cpp                        |  52 +-
 .../src/ir_Samsung.h                          |  10 +
 .../src/ir_Sanyo.cpp                          |  10 +-
 .../src/ir_Sharp.cpp                          |  24 +-
 .../src/ir_Sharp.h                            |   0
 .../src/ir_Sherwood.cpp                       |   0
 .../src/ir_Sony.cpp                           |   8 +-
 .../src/ir_Tcl.cpp                            |   0
 .../src/ir_Tcl.h                              |   0
 .../src/ir_Teco.cpp                           |   5 +-
 .../src/ir_Teco.h                             |   0
 .../src/ir_Toshiba.cpp                        |   8 +-
 .../src/ir_Toshiba.h                          |   0
 .../src/ir_Trotec.cpp                         |   9 +-
 .../src/ir_Trotec.h                           |   0
 .../src/ir_Vestel.cpp                         |   7 +-
 .../src/ir_Vestel.h                           |   0
 .../src/ir_Whirlpool.cpp                      |  11 +-
 .../src/ir_Whirlpool.h                        |   0
 .../src/ir_Whynter.cpp                        |   9 +-
 .../src/locale/README.md                      |   0
 .../src/locale/de-CH.h                        |   0
 .../src/locale/de-DE.h                        |   0
 .../src/locale/defaults.h                     |   0
 .../src/locale/en-AU.h                        |   0
 .../src/locale/en-IE.h                        |   0
 .../src/locale/en-UK.h                        |   0
 .../src/locale/en-US.h                        |   0
 .../src/locale/es-ES.h                        |   0
 .../src/locale/fr-FR.h                        |   0
 lib/IRremoteESP8266-2.7.4/src/locale/it-IT.h  | 157 ++++++
 .../test/IRac_test.cpp                        |  92 +++-
 .../test/IRrecv_test.cpp                      | 347 ++++++++++++-
 .../test/IRrecv_test.h                        |   0
 .../test/IRsend_test.cpp                      |   2 +-
 .../test/IRsend_test.h                        |   0
 .../test/IRutils_test.cpp                     |   0
 .../test/Makefile                             |  13 +-
 .../test/ir_Aiwa_test.cpp                     |  55 ++-
 .../test/ir_Amcor_test.cpp                    |   0
 .../test/ir_Argo_test.cpp                     |   0
 .../test/ir_Carrier_test.cpp                  |   6 +-
 .../test/ir_Coolix_test.cpp                   |  78 ++-
 .../test/ir_Daikin_test.cpp                   |  36 ++
 .../test/ir_Denon_test.cpp                    |  24 +-
 .../test/ir_Dish_test.cpp                     |  27 +-
 .../test/ir_Electra_test.cpp                  | 121 ++++-
 .../test/ir_Epson_test.cpp                    | 159 ++++++
 .../test/ir_Fujitsu_test.cpp                  |   0
 .../test/ir_GICable_test.cpp                  |   0
 .../test/ir_GlobalCache_test.cpp              |   0
 .../test/ir_Goodweather_test.cpp              |   0
 .../test/ir_Gree_test.cpp                     |   0
 .../test/ir_Haier_test.cpp                    |   3 +-
 .../test/ir_Hitachi_test.cpp                  |   0
 .../test/ir_Inax_test.cpp                     |   0
 .../test/ir_JVC_test.cpp                      |  34 +-
 .../test/ir_Kelvinator_test.cpp               |   0
 .../test/ir_LG_test.cpp                       |  60 +--
 .../test/ir_Lasertag_test.cpp                 |   0
 .../test/ir_Lego_test.cpp                     |   0
 .../test/ir_Lutron_test.cpp                   |   0
 .../test/ir_MWM_test.cpp                      |   0
 .../test/ir_Magiquest_test.cpp                |   9 +-
 .../test/ir_Midea_test.cpp                    |  40 +-
 .../test/ir_MitsubishiHeavy_test.cpp          |   0
 .../test/ir_Mitsubishi_test.cpp               |  56 ++-
 .../test/ir_NEC_test.cpp                      |  18 +-
 .../test/ir_Neoclima_test.cpp                 |   0
 .../test/ir_Nikai_test.cpp                    |  27 +-
 .../test/ir_Panasonic_test.cpp                |  57 ++-
 .../test/ir_Pioneer_test.cpp                  |   0
 .../test/ir_Pronto_test.cpp                   |  25 +
 .../test/ir_RC5_RC6_test.cpp                  | 101 ++--
 .../test/ir_RCMM_test.cpp                     |  30 +-
 .../test/ir_Samsung_test.cpp                  | 114 +++--
 .../test/ir_Sanyo_test.cpp                    |  47 +-
 .../test/ir_Sharp_test.cpp                    |  35 +-
 .../test/ir_Sherwood_test.cpp                 |   0
 .../test/ir_Sony_test.cpp                     |  73 ++-
 .../test/ir_Tcl_test.cpp                      |   0
 .../test/ir_Teco_test.cpp                     |   3 +-
 .../test/ir_Toshiba_test.cpp                  |   0
 .../test/ir_Trotec_test.cpp                   |   0
 .../test/ir_Vestel_test.cpp                   |   3 +-
 .../test/ir_Whirlpool_test.cpp                |   0
 .../test/ir_Whynter_test.cpp                  |  19 +-
 .../tools/Makefile                            |   5 +-
 .../tools/RawToGlobalCache.sh                 |   0
 .../tools/auto_analyse_raw_data.py            |   0
 .../tools/auto_analyse_raw_data_test.py       |   0
 .../tools/gc_decode.cpp                       |  27 +-
 .../tools/generate_irtext_h.sh                |   0
 .../tools/mkkeywords                          |   0
 .../tools/mode2_decode.cpp                    |   0
 .../tools/scrape_supported_devices.py         |   0
 tasmota/CHANGELOG.md                          |   1 +
 242 files changed, 2623 insertions(+), 941 deletions(-)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/LICENSE.txt (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/README.md (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/README_fr.md (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/ReleaseNotes.md (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/SupportedProtocols.md (95%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/CommonAcControl/CommonAcControl.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/CommonAcControl/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/ControlSamsungAC/ControlSamsungAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/ControlSamsungAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/DumbIRRepeater/DumbIRRepeater.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/DumbIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRGCSendDemo/IRGCSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRGCSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRGCTCPServer/IRGCTCPServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRGCTCPServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRMQTTServer/IRMQTTServer.h (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRMQTTServer/IRMQTTServer.ino (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRMQTTServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRServer/IRServer.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRServer/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDemo/IRrecvDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDump/IRrecvDump.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDump/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDumpV2/IRrecvDumpV2.ino (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRrecvDumpV2/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRsendDemo/IRsendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRsendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRsendProntoDemo/IRsendProntoDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/IRsendProntoDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/JVCPanasonicSendDemo/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/LGACSend/LGACSend.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/LGACSend/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/SmartIRRepeater/SmartIRRepeater.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/SmartIRRepeater/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnArgoAC/TurnOnArgoAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnArgoAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnDaikinAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnFujitsuAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnKelvinatorAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnMitsubishiAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnMitsubishiHeavyAc/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnPanasonicAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnToshibaAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/TurnOnTrotecAC/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/Web-AC-control.ino (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/platformio.ini (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/printscreen.png (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/favicon.ico (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_1_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_1_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_2_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_2_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_3_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_3_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_4_off.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/level_4_on.svg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/ui.html (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/examples/Web-AC-control/upload/ui.js (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/keywords.txt (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/library.json (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/library.properties (83%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/pylintrc (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/CPPLINT.cfg (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRac.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRac.h (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRrecv.cpp (72%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRrecv.h (63%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRremoteESP8266.h (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRsend.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRsend.h (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRtext.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRtext.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRtimer.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRtimer.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRutils.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/IRutils.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/i18n.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Aiwa.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Amcor.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Amcor.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Argo.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Argo.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Carrier.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Coolix.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Coolix.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Daikin.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Daikin.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Denon.cpp (89%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Dish.cpp (93%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Electra.cpp (88%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Electra.h (81%)
 create mode 100644 lib/IRremoteESP8266-2.7.4/src/ir_Epson.cpp
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Fujitsu.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Fujitsu.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_GICable.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_GlobalCache.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Goodweather.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Goodweather.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Gree.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Gree.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Haier.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Haier.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Hitachi.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Hitachi.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Inax.cpp (90%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_JVC.cpp (93%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Kelvinator.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Kelvinator.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_LG.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_LG.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Lasertag.cpp (90%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Lego.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Lutron.cpp (93%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_MWM.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Magiquest.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Magiquest.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Midea.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Midea.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Mitsubishi.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Mitsubishi.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_MitsubishiHeavy.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_MitsubishiHeavy.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_NEC.cpp (89%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_NEC.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Neoclima.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Neoclima.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Nikai.cpp (90%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Panasonic.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Panasonic.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Pioneer.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Pronto.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_RC5_RC6.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_RCMM.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Samsung.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Samsung.h (93%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Sanyo.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Sharp.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Sharp.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Sherwood.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Sony.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Tcl.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Tcl.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Teco.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Teco.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Toshiba.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Toshiba.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Trotec.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Trotec.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Vestel.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Vestel.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Whirlpool.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Whirlpool.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/ir_Whynter.cpp (91%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/README.md (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/de-CH.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/de-DE.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/defaults.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/en-AU.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/en-IE.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/en-UK.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/en-US.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/es-ES.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/src/locale/fr-FR.h (100%)
 create mode 100644 lib/IRremoteESP8266-2.7.4/src/locale/it-IT.h
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRac_test.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRrecv_test.cpp (74%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRrecv_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRsend_test.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRsend_test.h (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/IRutils_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/Makefile (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Aiwa_test.cpp (83%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Amcor_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Argo_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Carrier_test.cpp (97%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Coolix_test.cpp (91%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Daikin_test.cpp (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Denon_test.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Dish_test.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Electra_test.cpp (69%)
 create mode 100644 lib/IRremoteESP8266-2.7.4/test/ir_Epson_test.cpp
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Fujitsu_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_GICable_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_GlobalCache_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Goodweather_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Gree_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Haier_test.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Hitachi_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Inax_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_JVC_test.cpp (88%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Kelvinator_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_LG_test.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Lasertag_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Lego_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Lutron_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_MWM_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Magiquest_test.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Midea_test.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_MitsubishiHeavy_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Mitsubishi_test.cpp (96%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_NEC_test.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Neoclima_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Nikai_test.cpp (87%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Panasonic_test.cpp (95%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Pioneer_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Pronto_test.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_RC5_RC6_test.cpp (88%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_RCMM_test.cpp (86%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Samsung_test.cpp (93%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Sanyo_test.cpp (81%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Sharp_test.cpp (94%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Sherwood_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Sony_test.cpp (88%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Tcl_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Teco_test.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Toshiba_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Trotec_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Vestel_test.cpp (99%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Whirlpool_test.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/test/ir_Whynter_test.cpp (92%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/Makefile (98%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/RawToGlobalCache.sh (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/auto_analyse_raw_data.py (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/auto_analyse_raw_data_test.py (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/gc_decode.cpp (84%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/generate_irtext_h.sh (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/mkkeywords (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/mode2_decode.cpp (100%)
 rename lib/{IRremoteESP8266-2.7.3 => IRremoteESP8266-2.7.4}/tools/scrape_supported_devices.py (100%)

diff --git a/lib/IRremoteESP8266-2.7.3/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.4/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.4/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.3/LICENSE.txt b/lib/IRremoteESP8266-2.7.4/LICENSE.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/LICENSE.txt
rename to lib/IRremoteESP8266-2.7.4/LICENSE.txt
diff --git a/lib/IRremoteESP8266-2.7.3/README.md b/lib/IRremoteESP8266-2.7.4/README.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/README.md
rename to lib/IRremoteESP8266-2.7.4/README.md
index 9ca606af8..093b15cc1 100644
--- a/lib/IRremoteESP8266-2.7.3/README.md
+++ b/lib/IRremoteESP8266-2.7.4/README.md
@@ -9,8 +9,8 @@
 This library enables you to **send _and_ receive** infra-red signals on an [ESP8266](https://github.com/esp8266/Arduino) or an
 [ESP32](https://github.com/espressif/arduino-esp32) using the [Arduino framework](https://www.arduino.cc/) using common 940nm IR LEDs and common IR receiver modules. e.g. TSOP{17,22,24,36,38,44,48}* demodulators etc.
 
-## v2.7.3 Now Available
-Version 2.7.3 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
+## v2.7.4 Now Available
+Version 2.7.4 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
 
 #### Upgrading from pre-v2.0
 Usage of the library has been slightly changed in v2.0. You will need to change your usage to work with v2.0 and beyond. You can read more about the changes required on our [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.3/README_fr.md b/lib/IRremoteESP8266-2.7.4/README_fr.md
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/README_fr.md
rename to lib/IRremoteESP8266-2.7.4/README_fr.md
index ca31b3b7b..f95bcc945 100644
--- a/lib/IRremoteESP8266-2.7.3/README_fr.md
+++ b/lib/IRremoteESP8266-2.7.4/README_fr.md
@@ -9,8 +9,8 @@
 Cette librairie vous permetra de **recevoir et d'envoyer des signaux** infrarouge sur le protocole [ESP8266](https://github.com/esp8266/Arduino) ou sur le protocole
 [ESP32](https://github.com/espressif/arduino-esp32) en utilisant le [Arduino framework](https://www.arduino.cc/) qui utilise la norme 940nm IR LEDs et le module basique de reception d'onde IR. Exemple : TSOP{17,22,24,36,38,44,48}* modules etc.
 
-## v2.7.3 disponible
-Version 2.7.3 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
+## v2.7.4 disponible
+Version 2.7.4 de la libraire est maintenant [disponible](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). Vous pouvez voir le [Release Notes](ReleaseNotes.md) pour tous les changements importants.
 
 #### mise à jour depuis pre-v2.0
 L'utilisation de la librairie à un peu changer depuis la version in v2.0. Si vous voulez l'utiliser vous devrez changer votre utilisation aussi. Vous pouvez vous renseigner sur les précondition d'utilisation ici : [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.7.3/ReleaseNotes.md b/lib/IRremoteESP8266-2.7.4/ReleaseNotes.md
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/ReleaseNotes.md
rename to lib/IRremoteESP8266-2.7.4/ReleaseNotes.md
index a7218fc07..4c6b1a967 100644
--- a/lib/IRremoteESP8266-2.7.3/ReleaseNotes.md
+++ b/lib/IRremoteESP8266-2.7.4/ReleaseNotes.md
@@ -1,5 +1,25 @@
 # Release Notes
 
+## _v2.7.4 (20200226)_
+
+**[Bug Fixes]**
+- IRMQTTServer: Fix bug when receiving an IR A/C message and not re-transmitting it. (#1035, #1038)
+- Coolix: `setRaw()` doesn't update power state. (#1040, #1041)
+
+**[Features]**
+- Electra: Add improved feature support. (#1033, #1051)
+- Add support for Epson protocol. (#1034, #1050)
+- Add options to `decode()` to aid detection. Improve NEC detection. (#1042, #1046)
+- SamsungAc: Add support for Light & Ion (VirusDoctor). (#1045, #1048, #1049)
+- Add Italian (it-IT) locale/language support. (#1047) (kudos @egueli)
+- gc_decode: Add repeat support for pronto codes. (#1034, #1043)
+
+**[Misc]**
+- Update supported SamsungAc devices (#1045)
+- Coolix: Subtle protocol timing adjustments (#1036, #1037)
+- Add supported Electra device model info (#1033)
+
+
 ## _v2.7.3 (20200130)_
 
 **[Features]**
diff --git a/lib/IRremoteESP8266-2.7.3/SupportedProtocols.md b/lib/IRremoteESP8266-2.7.4/SupportedProtocols.md
similarity index 95%
rename from lib/IRremoteESP8266-2.7.3/SupportedProtocols.md
rename to lib/IRremoteESP8266-2.7.4/SupportedProtocols.md
index c9b2f85c7..04661c3bb 100644
--- a/lib/IRremoteESP8266-2.7.3/SupportedProtocols.md
+++ b/lib/IRremoteESP8266-2.7.4/SupportedProtocols.md
@@ -1,6 +1,6 @@
 <!--- WARNING: Do NOT edit this file directly.
       It is generated by './tools/scrape_supported_devices.py'.
-      Last generated: Thu Jan 30 20:05:33 2020 --->
+      Last generated: Wed Feb 26 16:31:08 2020 --->
 # IR Protocols supported by this library
 
 | Protocol | Brand | Model | A/C Model | Detailed A/C Support |
@@ -16,6 +16,8 @@
 | [Denon](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Denon.cpp) | **Unknown** |  |  | - |
 | [Dish](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Dish.cpp) | **DISH NETWORK** | echostar 301 |  | - |
 | [Electra](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.cpp) | **[AUX](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.h)** | KFR-35GW/BpNFW=3 A/C<BR>YKR-T/011 remote |  | Yes |
+| [Electra](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.cpp) | **[Electra](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.h)** | Classic INV 17 / AXW12DCS A/C<BR>YKR-M/003E remote |  | Yes |
+| [Epson](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Epson.cpp) | **Unknown** |  |  | - |
 | [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AGTV14LAC A/C<BR>AR-DB1 remote<BR>AR-DL10 remote<BR>AR-RAC1E remote<BR>AR-RAE1E remote<BR>AR-RAH2E remote<BR>AR-REB1E remote<BR>AR-RY4 remote<BR>AST9RSGCW A/C<BR>ASTB09LBC A/C<BR>ASU30C1 A/C<BR>ASYG30LFCA A/C<BR>ASYG7LMCA A/C | ARDB1<BR>ARJW2<BR>ARRAH2E<BR>ARREB1E<BR>ARRY4 | Yes |
 | [Fujitsu](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.cpp) | **[Fujitsu General](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Fujitsu.h)** | AR-JW2 remote | ARDB1<BR>ARJW2<BR>ARRAH2E<BR>ARREB1E<BR>ARRY4 | Yes |
 | [GICable](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_GICable.cpp) | **Unknown** |  |  | - |
@@ -54,7 +56,7 @@
 | [Pronto](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Pronto.cpp) | **Unknown** |  |  | - |
 | [RC5_RC6](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_RC5_RC6.cpp) | **Unknown** |  |  | - |
 | [RCMM](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_RCMM.cpp) | **Microsoft** | XBOX 360 |  | - |
-| [Samsung](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Samsung.cpp) | **[Samsung](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Samsung.h)** | AR12HSSDBWKNEU A/C<BR>AR12KSFPEWQNET A/C<BR>IEC-R03 remote<BR>UA55H6300 TV |  | Yes |
+| [Samsung](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Samsung.cpp) | **[Samsung](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Samsung.h)** | AR09FSSDAWKNFA A/C<BR>AR12HSSDBWKNEU A/C<BR>AR12KSFPEWQNET A/C<BR>DB63-03556X003 remote<BR>IEC-R03 remote<BR>UA55H6300 TV |  | Yes |
 | [Sanyo](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sanyo.cpp) | **Unknown** |  |  | - |
 | [Sharp](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sharp.cpp) | **[Sharp](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sharp.h)** | AY-ZP40KR A/C<BR>LC-52D62U TV |  | Yes |
 | [Sherwood](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Sherwood.cpp) | **Sherwood** | RC-138 remote<BR>RD6505(B) Receiver |  | - |
@@ -94,6 +96,7 @@
 - DENON
 - DISH
 - ELECTRA_AC
+- EPSON
 - FUJITSU_AC
 - GICABLE
 - GOODWEATHER
diff --git a/lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/CommonAcControl.ino b/lib/IRremoteESP8266-2.7.4/examples/CommonAcControl/CommonAcControl.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/CommonAcControl.ino
rename to lib/IRremoteESP8266-2.7.4/examples/CommonAcControl/CommonAcControl.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/CommonAcControl/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/CommonAcControl/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/CommonAcControl/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/ControlSamsungAC.ino b/lib/IRremoteESP8266-2.7.4/examples/ControlSamsungAC/ControlSamsungAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/ControlSamsungAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/ControlSamsungAC/ControlSamsungAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/ControlSamsungAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/ControlSamsungAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/ControlSamsungAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/DumbIRRepeater.ino b/lib/IRremoteESP8266-2.7.4/examples/DumbIRRepeater/DumbIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/DumbIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.4/examples/DumbIRRepeater/DumbIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/DumbIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/DumbIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/DumbIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/IRremoteESP8266-2.7.4/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRGCSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRGCSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/IRremoteESP8266-2.7.4/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRGCTCPServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRGCTCPServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h b/lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h
rename to lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.h
index 0693a4908..b363d98b9 100644
--- a/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.h
+++ b/lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.h
@@ -239,7 +239,7 @@ const uint16_t kJsonAcStateMaxSize = 1024;  // Bytes
 // ----------------- End of User Configuration Section -------------------------
 
 // Constants
-#define _MY_VERSION_ "v1.4.5"
+#define _MY_VERSION_ "v1.4.6"
 
 const uint8_t kRebootTime = 15;  // Seconds
 const uint8_t kQuickDisplayTime = 2;  // Seconds
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino b/lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.ino
index 1824c660a..efcf25431 100644
--- a/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/IRMQTTServer.ino
+++ b/lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/IRMQTTServer.ino
@@ -2679,7 +2679,7 @@ uint64_t getUInt64fromHex(char const *str) {
 //   code:     Numeric payload of the IR message. Most protocols use this.
 //   code_str: The unparsed code to be sent. Used by complex protocol encodings.
 //   bits:     Nr. of bits in the protocol. 0 means use the protocol's default.
-//   repeat:   Nr. of times the message is to be repeated. (Not all protcols.)
+//   repeat:   Nr. of times the message is to be repeated. (Not all protocols.)
 // Returns:
 //   bool: Successfully sent or not.
 bool sendIRCode(IRsend *irsend, decode_type_t const ir_type,
@@ -3071,6 +3071,10 @@ bool sendClimate(const String topic_prefix, const bool retain,
     lastClimateIr.reset();
     irClimateCounter++;
   }
+  // Mark the "next" value as old/previous.
+  if (ac != NULL) {
+    ac->markAsSent();
+  }
   return success;
 }
 
@@ -3098,20 +3102,20 @@ bool decodeCommonAc(const decode_results *decode) {
   }
 #if IGNORE_DECODED_AC_PROTOCOL
   if (climate[0]->next.protocol != decode_type_t::UNKNOWN) {
-    // Use the previous protcol/model if set.
+    // Use the previous protocol/model if set.
     state.protocol = climate[0]->next.protocol;
     state.model = climate[0]->next.model;
   }
 #endif  // IGNORE_DECODED_AC_PROTOCOL
-// Continue to use the previously prefered temperature units.
-// i.e. Keep using Celsius or Fahrenheit.
-if (climate[0]->next.celsius != state.celsius) {
-  // We've got a mismatch, so we need to convert.
-  state.degrees = climate[0]->next.celsius ? fahrenheitToCelsius(state.degrees)
-                                           : celsiusToFahrenheit(state.degrees);
-  state.celsius = climate[0]->next.celsius;
-}
-climate[0]->next = state;  // Copy over the new climate state.
+  // Continue to use the previously prefered temperature units.
+  // i.e. Keep using Celsius or Fahrenheit.
+  if (climate[0]->next.celsius != state.celsius) {
+    // We've got a mismatch, so we need to convert.
+    state.degrees = climate[0]->next.celsius ?
+        fahrenheitToCelsius(state.degrees) : celsiusToFahrenheit(state.degrees);
+    state.celsius = climate[0]->next.celsius;
+  }
+  climate[0]->next = state;  // Copy over the new climate state.
 #if MQTT_ENABLE
   sendClimate(genStatTopic(0), true, false, REPLAY_DECODED_AC_MESSAGE,
               REPLAY_DECODED_AC_MESSAGE, climate[0]);
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRMQTTServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRMQTTServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266-2.7.4/examples/IRServer/IRServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRServer/IRServer.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRServer/IRServer.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRServer/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRServer/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDemo/IRrecvDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/IRrecvDump.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDump/IRrecvDump.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDump/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDump/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDumpV2/IRrecvDumpV2.ino
index beed6c746..8ea98b687 100644
--- a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/IRrecvDumpV2.ino
+++ b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDumpV2/IRrecvDumpV2.ino
@@ -17,7 +17,7 @@
  *   Version 0.4 July, 2018
  *     - Minor improvements and more A/C unit support.
  *   Version 0.3 November, 2017
- *     - Support for A/C decoding for some protcols.
+ *     - Support for A/C decoding for some protocols.
  *   Version 0.2 April, 2017
  *     - Decode from a copy of the data so we can start capturing faster thus
  *       reduce the likelihood of miscaptures.
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRrecvDumpV2/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRrecvDumpV2/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266-2.7.4/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/IRsendDemo.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRsendDemo/IRsendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRsendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRsendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266-2.7.4/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/IRremoteESP8266-2.7.4/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/IRsendProntoDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/IRsendProntoDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266-2.7.4/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/IRremoteESP8266-2.7.4/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266-2.7.4/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/LGACSend/LGACSend.ino
rename to lib/IRremoteESP8266-2.7.4/examples/LGACSend/LGACSend.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/LGACSend/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/LGACSend/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/LGACSend/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/IRremoteESP8266-2.7.4/examples/SmartIRRepeater/SmartIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/SmartIRRepeater.ino
rename to lib/IRremoteESP8266-2.7.4/examples/SmartIRRepeater/SmartIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/SmartIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/SmartIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/SmartIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnArgoAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnArgoAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnDaikinAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnDaikinAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiHeavyAc/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnMitsubishiHeavyAc/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnMitsubishiHeavyAc/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnPanasonicAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnPanasonicAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnPanasonicAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnToshibaAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnToshibaAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266-2.7.4/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/TurnOnTrotecAC/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/TurnOnTrotecAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/README.md b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/README.md
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/README.md
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/Web-AC-control.ino b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/Web-AC-control.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/Web-AC-control.ino
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/Web-AC-control.ino
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/platformio.ini b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/platformio.ini
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/printscreen.png b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/printscreen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/printscreen.png
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/printscreen.png
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/favicon.ico b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/favicon.ico
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/favicon.ico
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/favicon.ico
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_off.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_1_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_off.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_1_off.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_on.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_1_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_1_on.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_1_on.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_off.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_2_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_off.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_2_off.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_on.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_2_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_2_on.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_2_on.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_off.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_3_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_off.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_3_off.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_on.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_3_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_3_on.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_3_on.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_off.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_4_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_off.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_4_off.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_on.svg b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_4_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/level_4_on.svg
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/level_4_on.svg
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.html b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/ui.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.html
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/ui.html
diff --git a/lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.js b/lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/ui.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/examples/Web-AC-control/upload/ui.js
rename to lib/IRremoteESP8266-2.7.4/examples/Web-AC-control/upload/ui.js
diff --git a/lib/IRremoteESP8266-2.7.3/keywords.txt b/lib/IRremoteESP8266-2.7.4/keywords.txt
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/keywords.txt
rename to lib/IRremoteESP8266-2.7.4/keywords.txt
index 65b0d8b2e..077c0bc74 100644
--- a/lib/IRremoteESP8266-2.7.3/keywords.txt
+++ b/lib/IRremoteESP8266-2.7.4/keywords.txt
@@ -133,6 +133,7 @@ convertSwingV	KEYWORD2
 coolix	KEYWORD2
 copyIrParams	KEYWORD2
 countBits	KEYWORD2
+crudeNoiseFilter	KEYWORD2
 daikin	KEYWORD2
 daikin128	KEYWORD2
 daikin152	KEYWORD2
@@ -156,6 +157,7 @@ decodeDaikin2	KEYWORD2
 decodeDaikin216	KEYWORD2
 decodeDenon	KEYWORD2
 decodeElectraAC	KEYWORD2
+decodeEpson	KEYWORD2
 decodeFujitsuAC	KEYWORD2
 decodeGICable	KEYWORD2
 decodeGoodweather	KEYWORD2
@@ -252,6 +254,7 @@ getCorrectedRawLength	KEYWORD2
 getCurrTime	KEYWORD2
 getCurrentDay	KEYWORD2
 getCurrentTime	KEYWORD2
+getDisplay	KEYWORD2
 getEcono	KEYWORD2
 getEye	KEYWORD2
 getEyeAuto	KEYWORD2
@@ -355,6 +358,7 @@ ledOff	KEYWORD2
 ledOn	KEYWORD2
 lg	KEYWORD2
 mark	KEYWORD2
+markAsSent	KEYWORD2
 match	KEYWORD2
 matchAtLeast	KEYWORD2
 matchBytes	KEYWORD2
@@ -406,6 +410,7 @@ sendDaikin216	KEYWORD2
 sendData	KEYWORD2
 sendDenon	KEYWORD2
 sendElectraAC	KEYWORD2
+sendEpson	KEYWORD2
 sendExtended	KEYWORD2
 sendFujitsuAC	KEYWORD2
 sendGC	KEYWORD2
@@ -484,6 +489,7 @@ setCommand	KEYWORD2
 setCurrTime	KEYWORD2
 setCurrentDay	KEYWORD2
 setCurrentTime	KEYWORD2
+setDisplay	KEYWORD2
 setEcono	KEYWORD2
 setEye	KEYWORD2
 setEyeAuto	KEYWORD2
@@ -666,6 +672,7 @@ DECODE_DAIKIN216	LITERAL1
 DECODE_DENON	LITERAL1
 DECODE_DISH	LITERAL1
 DECODE_ELECTRA_AC	LITERAL1
+DECODE_EPSON	LITERAL1
 DECODE_FUJITSU_AC	LITERAL1
 DECODE_GICABLE	LITERAL1
 DECODE_GLOBALCACHE	LITERAL1
@@ -728,6 +735,8 @@ DG11J191	LITERAL1
 DISH	LITERAL1
 DISH_BITS	LITERAL1
 ELECTRA_AC	LITERAL1
+ENABLE_NOISE_FILTER_OPTION	LITERAL1
+EPSON	LITERAL1
 FUJITSU_AC	LITERAL1
 FUJITSU_AC_BITS	LITERAL1
 FUJITSU_AC_CMD_STAY_ON	LITERAL1
@@ -964,6 +973,7 @@ SEND_DAIKIN216	LITERAL1
 SEND_DENON	LITERAL1
 SEND_DISH	LITERAL1
 SEND_ELECTRA_AC	LITERAL1
+SEND_EPSON	LITERAL1
 SEND_FUJITSU_AC	LITERAL1
 SEND_GICABLE	LITERAL1
 SEND_GLOBALCACHE	LITERAL1
@@ -1634,6 +1644,7 @@ kEconoStr	LITERAL1
 kElectraAcAuto	LITERAL1
 kElectraAcBitMark	LITERAL1
 kElectraAcBits	LITERAL1
+kElectraAcCleanOffset	LITERAL1
 kElectraAcCool	LITERAL1
 kElectraAcDry	LITERAL1
 kElectraAcFan	LITERAL1
@@ -1646,6 +1657,9 @@ kElectraAcFanSize	LITERAL1
 kElectraAcHdrMark	LITERAL1
 kElectraAcHdrSpace	LITERAL1
 kElectraAcHeat	LITERAL1
+kElectraAcLightToggleMask	LITERAL1
+kElectraAcLightToggleOff	LITERAL1
+kElectraAcLightToggleOn	LITERAL1
 kElectraAcMaxTemp	LITERAL1
 kElectraAcMessageGap	LITERAL1
 kElectraAcMinRepeat	LITERAL1
@@ -1662,7 +1676,10 @@ kElectraAcSwingVOffset	LITERAL1
 kElectraAcTempDelta	LITERAL1
 kElectraAcTempOffset	LITERAL1
 kElectraAcTempSize	LITERAL1
+kElectraAcTurboOffset	LITERAL1
 kElectraAcZeroSpace	LITERAL1
+kEpsonBits	LITERAL1
+kEpsonMinRepeat	LITERAL1
 kEyeAutoStr	LITERAL1
 kEyeStr	LITERAL1
 kFalseStr	LITERAL1
@@ -2763,6 +2780,7 @@ kSamsungAcClean10Offset	LITERAL1
 kSamsungAcClean11Offset	LITERAL1
 kSamsungAcCool	LITERAL1
 kSamsungAcDefaultRepeat	LITERAL1
+kSamsungAcDisplayOffset	LITERAL1
 kSamsungAcDry	LITERAL1
 kSamsungAcExtendedBits	LITERAL1
 kSamsungAcExtendedStateLength	LITERAL1
@@ -2778,6 +2796,7 @@ kSamsungAcFanTurbo	LITERAL1
 kSamsungAcHdrMark	LITERAL1
 kSamsungAcHdrSpace	LITERAL1
 kSamsungAcHeat	LITERAL1
+kSamsungAcIonOffset	LITERAL1
 kSamsungAcMaxTemp	LITERAL1
 kSamsungAcMinTemp	LITERAL1
 kSamsungAcModeOffset	LITERAL1
diff --git a/lib/IRremoteESP8266-2.7.3/library.json b/lib/IRremoteESP8266-2.7.4/library.json
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/library.json
rename to lib/IRremoteESP8266-2.7.4/library.json
index b28b1b218..f135c19e7 100644
--- a/lib/IRremoteESP8266-2.7.3/library.json
+++ b/lib/IRremoteESP8266-2.7.4/library.json
@@ -1,6 +1,6 @@
 {
   "name": "IRremoteESP8266",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "keywords": "infrared, ir, remote, esp8266, esp32",
   "description": "Send and receive infrared signals with multiple protocols (ESP8266/ESP32)",
   "repository":
diff --git a/lib/IRremoteESP8266-2.7.3/library.properties b/lib/IRremoteESP8266-2.7.4/library.properties
similarity index 83%
rename from lib/IRremoteESP8266-2.7.3/library.properties
rename to lib/IRremoteESP8266-2.7.4/library.properties
index b22e7f8cc..e98cd3f3b 100644
--- a/lib/IRremoteESP8266-2.7.3/library.properties
+++ b/lib/IRremoteESP8266-2.7.4/library.properties
@@ -1,7 +1,7 @@
 name=IRremoteESP8266
-version=2.7.3
+version=2.7.4
 author=David Conran, Sebastien Warin, Mark Szabo, Ken Shirriff
-maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto
+maintainer=David Conran, Mark Szabo, Sebastien Warin, Roi Dayan, Massimiliano Pinto
 sentence=Send and receive infrared signals with multiple protocols (ESP8266/ESP32)
 paragraph=This library enables you to send and receive infra-red signals on an ESP8266 or an ESP32.
 category=Device Control
diff --git a/lib/IRremoteESP8266-2.7.3/pylintrc b/lib/IRremoteESP8266-2.7.4/pylintrc
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/pylintrc
rename to lib/IRremoteESP8266-2.7.4/pylintrc
diff --git a/lib/IRremoteESP8266-2.7.3/src/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.4/src/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.7.4/src/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRac.cpp b/lib/IRremoteESP8266-2.7.4/src/IRac.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/src/IRac.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRac.cpp
index b2dc6f63e..d3be30b80 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRac.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/IRac.cpp
@@ -45,7 +45,7 @@ IRac::IRac(const uint16_t pin, const bool inverted, const bool use_modulation) {
   _inverted = inverted;
   _modulation = use_modulation;
   initState(&next);
-  _prev = next;
+  this->markAsSent();
 }
 
 void IRac::initState(stdAc::state_t *state,
@@ -466,7 +466,8 @@ void IRac::electra(IRElectraAc *ac,
                    const bool on, const stdAc::opmode_t mode,
                    const float degrees, const stdAc::fanspeed_t fan,
                    const stdAc::swingv_t swingv,
-                   const stdAc::swingh_t swingh) {
+                   const stdAc::swingh_t swingh, const bool turbo,
+                   const bool lighttoggle, const bool clean) {
   ac->begin();
   ac->setPower(on);
   ac->setMode(ac->convertMode(mode));
@@ -475,11 +476,12 @@ void IRac::electra(IRElectraAc *ac,
   ac->setSwingV(swingv != stdAc::swingv_t::kOff);
   ac->setSwingH(swingh != stdAc::swingh_t::kOff);
   // No Quiet setting available.
-  // No Turbo setting available.
+  ac->setTurbo(turbo);
+  ac->setLightToggle(lighttoggle);
   // No Light setting available.
   // No Econo setting available.
   // No Filter setting available.
-  // No Clean setting available.
+  ac->setClean(clean);
   // No Beep setting available.
   // No Sleep setting available.
   // No Clock setting available.
@@ -968,7 +970,8 @@ void IRac::samsung(IRSamsungAc *ac,
                    const bool on, const stdAc::opmode_t mode,
                    const float degrees,
                    const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
-                   const bool quiet, const bool turbo, const bool clean,
+                   const bool quiet, const bool turbo, const bool light,
+                   const bool filter, const bool clean,
                    const bool beep, const bool prevpower,
                    const bool forcepower) {
   ac->begin();
@@ -981,9 +984,9 @@ void IRac::samsung(IRSamsungAc *ac,
   // No Horizontal swing setting available.
   ac->setQuiet(quiet);
   ac->setPowerful(turbo);
-  // No Light setting available.
+  ac->setDisplay(light);
   // No Econo setting available.
-  // No Filter setting available.
+  ac->setIon(filter);
   ac->setClean(clean);
   ac->setBeep(beep);
   // No Sleep setting available.
@@ -1219,6 +1222,9 @@ stdAc::state_t IRac::handleToggles(const stdAc::state_t desired,
         result.power = desired.power ^ prev->power;
         result.light = desired.light ^ prev->light;
         break;
+      case decode_type_t::ELECTRA_AC:
+        result.light = desired.light ^ prev->light;
+        break;
       case decode_type_t::MIDEA:
       case decode_type_t::HITACHI_AC424:
         if ((desired.swingv == stdAc::swingv_t::kOff) ^
@@ -1389,7 +1395,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     {
       IRElectraAc ac(_pin, _inverted, _modulation);
       electra(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
-              send.swingh);
+              send.swingh, send.turbo, send.light, send.clean);
       break;
     }
 #endif  // SEND_ELECTRA_AC
@@ -1557,7 +1563,8 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
     {
       IRSamsungAc ac(_pin, _inverted, _modulation);
       samsung(&ac, send.power, send.mode, degC, send.fanspeed, send.swingv,
-              send.quiet, send.turbo, send.clean, send.beep, prev->power);
+              send.quiet, send.turbo, send.light, send.filter, send.clean,
+              send.beep, prev->power);
       break;
     }
 #endif  // SEND_SAMSUNG_AC
@@ -1628,13 +1635,18 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) {
   return true;  // Success.
 }
 
+// Update the previous state to the current one.
+void IRac::markAsSent(void) {
+  _prev = next;
+}
+
 // Send an A/C message based soley on our internal state.
 //
 // Returns:
 //   boolean: True, if accepted/converted/attempted. False, if unsupported.
 bool IRac::sendAc(void) {
   bool success = this->sendAc(next, &_prev);
-  _prev = next;
+  if (success) this->markAsSent();
   return success;
 }
 
@@ -2232,7 +2244,6 @@ namespace IRAcUtils {
 #if DECODE_COOLIX
       case decode_type_t::COOLIX: {
         IRCoolixAC ac(kGpioUnused);
-        ac.on();
         ac.setRaw(decode->value);  // Uses value instead of state.
         *result = ac.toCommon(prev);
         break;
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRac.h b/lib/IRremoteESP8266-2.7.4/src/IRac.h
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/IRac.h
rename to lib/IRremoteESP8266-2.7.4/src/IRac.h
index 4945bfac9..f38865e50 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRac.h
+++ b/lib/IRremoteESP8266-2.7.4/src/IRac.h
@@ -54,6 +54,7 @@ class IRac {
                         const bool beep, const int16_t sleep,
                         const int16_t clock);
   static void initState(stdAc::state_t *state);
+  void markAsSent(void);
   bool sendAc(void);
   bool sendAc(const stdAc::state_t desired, const stdAc::state_t *prev = NULL);
   bool sendAc(const decode_type_t vendor, const int16_t model,
@@ -170,7 +171,8 @@ void electra(IRElectraAc *ac,
              const bool on, const stdAc::opmode_t mode,
              const float degrees, const stdAc::fanspeed_t fan,
              const stdAc::swingv_t swingv,
-             const stdAc::swingh_t swingh);
+             const stdAc::swingh_t swingh, const bool turbo,
+             const bool lighttoggle, const bool clean);
 #endif  // SEND_ELECTRA_AC
 #if SEND_FUJITSU_AC
   void fujitsu(IRFujitsuAC *ac, const fujitsu_ac_remote_model_t model,
@@ -299,7 +301,8 @@ void electra(IRElectraAc *ac,
   void samsung(IRSamsungAc *ac,
                const bool on, const stdAc::opmode_t mode, const float degrees,
                const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
-               const bool quiet, const bool turbo, const bool clean,
+               const bool quiet, const bool turbo, const bool light,
+               const bool filter, const bool clean,
                const bool beep, const bool prevpower = true,
                const bool forcepower = true);
 #endif  // SEND_SAMSUNG_AC
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRrecv.cpp b/lib/IRremoteESP8266-2.7.4/src/IRrecv.cpp
similarity index 72%
rename from lib/IRremoteESP8266-2.7.3/src/IRrecv.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRrecv.cpp
index c2c1b5394..e629fc218 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRrecv.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/IRrecv.cpp
@@ -307,6 +307,37 @@ void IRrecv::setTolerance(const uint8_t percent) {
 // Get the base tolerance percentage for matching incoming IR messages.
 uint8_t IRrecv::getTolerance(void) { return _tolerance; }
 
+#if ENABLE_NOISE_FILTER_OPTION
+// Remove or merge pulses in the capture buffer that are too short.
+// Args:
+//   results:  Ptr to the decode_results we are going to filter/modify.
+//   floor:  Only allow values in the buffer large than this. (in micro seconds)
+void IRrecv::crudeNoiseFilter(decode_results *results, const uint16_t floor) {
+  if (floor == 0) return;  // Nothing to do.
+  const uint16_t kTickFloor = floor / kRawTick;
+  const uint16_t kBufSize = getBufSize();
+  uint16_t offset = kStartOffset;
+  while (offset < results->rawlen && offset + 2 < kBufSize) {
+    uint16_t curr = results->rawbuf[offset];
+    uint16_t next = results->rawbuf[offset + 1];
+    uint16_t addition = curr + next;
+    if (curr < kTickFloor) {  // Is it too short?
+      // Shuffle the buffer down. i.e. Remove the mark & space pair.
+      // Note: `memcpy()` can't be used as rawbuf is `volatile`.
+      for (uint16_t i = offset + 2; i <= results->rawlen && i < kBufSize; i++)
+        results->rawbuf[i - 2] = results->rawbuf[i];
+      if (offset > 1) {  // There is a previous pair we can add to.
+        // Merge this pair into into the previous space.
+        results->rawbuf[offset - 1] += addition;
+      }
+      results->rawlen -= 2;  // Adjust the length.
+    } else {
+      offset++;  // Move along.
+    }
+  }
+}
+#endif  // ENABLE_NOISE_FILTER_OPTION
+
 // Decodes the received IR message.
 // If the interrupt state is saved, we will immediately resume waiting
 // for the next IR message to avoid missing messages.
@@ -317,9 +348,41 @@ uint8_t IRrecv::getTolerance(void) { return _tolerance; }
 //   results:  A pointer to where the decoded IR message will be stored.
 //   save:  A pointer to an irparams_t instance in which to save
 //          the interrupt's memory/state. NULL means don't save it.
+//   max_skip:  Maximum Nr. of pulses at the begining of a capture we can skip
+//              when attempting to find a protocol we can successfully decode.
+//              This parameter can dramatically improve detection of protocols
+//              when there is light IR interference just before an incoming IR
+//              message, however, it comes at a steep performace price.
+//              CAUTION: Increasing this value will dramatically (linnearly)
+//                       increase the cpu time & usage to decode protocols.
+//                       e.g. 0 -> 1 will be a 2x increase in cpu usage/time.
+//                            0 -> 2 will be a 3x increase etc.
+//                       If you are going to do this, consider disabling
+//                       protocol decoding for protocols you are not expecting.
+//              (Default is 0. No skipping.)
+//   noise_floor:  Pulses below this size (in usecs) will be removed or merged
+//                 prior to any decoding. This is to try to remove noise/poor
+//                 readings & slighly increase the chances of a successful
+//                 decode but at the cost of data fidelity & integrity.
+//                 (Defaults to 0 usecs. i.e. Don't filter; which is safe!)
+//                 DANGER: **Here Be Dragons!**
+//                   If you set the `filter_floor` value too high, it **WILL**
+//                   break decoding of some protocols. You have been warned!
+//                   **Any** non-zero value has the potential to **cook** the
+//                   captured raw data. i.e. The data is going to lie to you.
+//                   It may obscure hardware, circuit, & environment issues thus
+//                   making it impossible to support you accurately or
+//                   confidently.
+//                   Values of <= 50 usecs will probably be safe.
+//                   51 - 100 usecs **might** be okay.
+//                   100 - 150 usecs is "Danger, Will Robinson!".
+//                   150 - 200 usecs expect broken protocols.
+//                   At 200+ usecs, you **have** protocols you can't decode!!
+//
 // Returns:
 //   A boolean indicating if an IR message is ready or not.
-bool IRrecv::decode(decode_results *results, irparams_t *save) {
+bool IRrecv::decode(decode_results *results, irparams_t *save,
+                    uint8_t max_skip, uint16_t noise_floor) {
   // Proceed only if an IR message been received.
 #ifndef UNIT_TEST
   if (irparams.rcvstate != kStopState) return false;
@@ -365,320 +428,342 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
   results->command = 0;
   results->repeat = false;
 
+#if ENABLE_NOISE_FILTER_OPTION
+  crudeNoiseFilter(results, noise_floor);
+#endif  // ENABLE_NOISE_FILTER_OPTION
+  // Keep looking for protocols until we've run out of entries to skip or we
+  // find a valid protocol message.
+  for (uint16_t offset = kStartOffset;
+       offset <= (max_skip * 2) + kStartOffset;
+       offset += 2) {
 #if DECODE_AIWA_RC_T501
-  DPRINTLN("Attempting Aiwa RC T501 decode");
-  // Try decodeAiwaRCT501() before decodeSanyoLC7461() & decodeNEC()
-  // because the protocols are similar. This protocol is more specific than
-  // those ones, so should got before them.
-  if (decodeAiwaRCT501(results)) return true;
+    DPRINTLN("Attempting Aiwa RC T501 decode");
+    // Try decodeAiwaRCT501() before decodeSanyoLC7461() & decodeNEC()
+    // because the protocols are similar. This protocol is more specific than
+    // those ones, so should go before them.
+    if (decodeAiwaRCT501(results, offset)) return true;
 #endif
 #if DECODE_SANYO
-  DPRINTLN("Attempting Sanyo LC7461 decode");
-  // Try decodeSanyoLC7461() before decodeNEC() because the protocols are
-  // similar in timings & structure, but the Sanyo one is much longer than the
-  // NEC protocol (42 vs 32 bits) so this one should be tried first to try to
-  // reduce false detection as a NEC packet.
-  if (decodeSanyoLC7461(results)) return true;
+    DPRINTLN("Attempting Sanyo LC7461 decode");
+    // Try decodeSanyoLC7461() before decodeNEC() because the protocols are
+    // similar in timings & structure, but the Sanyo one is much longer than the
+    // NEC protocol (42 vs 32 bits) so this one should be tried first to try to
+    // reduce false detection as a NEC packet.
+    if (decodeSanyoLC7461(results, offset)) return true;
 #endif
 #if DECODE_CARRIER_AC
-  DPRINTLN("Attempting Carrier AC decode");
-  // Try decodeCarrierAC() before decodeNEC() because the protocols are
-  // similar in timings & structure, but the Carrier one is much longer than the
-  // NEC protocol (3x32 bits vs 1x32 bits) so this one should be tried first to
-  // try to reduce false detection as a NEC packet.
-  if (decodeCarrierAC(results)) return true;
+    DPRINTLN("Attempting Carrier AC decode");
+    // Try decodeCarrierAC() before decodeNEC() because the protocols are
+    // similar in timings & structure, but the Carrier one is much longer than
+    // the NEC protocol (3x32 bits vs 1x32 bits) so this one should be tried
+    // first to try to reduce false detection as a NEC packet.
+    if (decodeCarrierAC(results, offset)) return true;
 #endif
 #if DECODE_PIONEER
-  DPRINTLN("Attempting Pioneer decode");
-  // Try decodePioneer() before decodeNEC() because the protocols are
-  // similar in timings & structure, but the Pioneer one is much longer than the
-  // NEC protocol (2x32 bits vs 1x32 bits) so this one should be tried first to
-  // try to reduce false detection as a NEC packet.
-  if (decodePioneer(results)) return true;
+    DPRINTLN("Attempting Pioneer decode");
+    // Try decodePioneer() before decodeNEC() because the protocols are
+    // similar in timings & structure, but the Pioneer one is much longer than
+    // the NEC protocol (2x32 bits vs 1x32 bits) so this one should be tried
+    // first to try to reduce false detection as a NEC packet.
+    if (decodePioneer(results, offset)) return true;
+#endif
+#if DECODE_EPSON
+  DPRINTLN("Attempting Epson decode");
+  // Try decodeEpson() before decodeNEC() because the protocols are
+  // similar in timings & structure, but the Epson one is much longer than the
+  // NEC protocol (3x32 identical bits vs 1x32 bits) so this one should be tried
+  // first to try to reduce false detection as a NEC packet.
+  if (decodeEpson(results, offset)) return true;
 #endif
 #if DECODE_NEC
-  DPRINTLN("Attempting NEC decode");
-  if (decodeNEC(results)) return true;
+    DPRINTLN("Attempting NEC decode");
+    if (decodeNEC(results, offset)) return true;
 #endif
 #if DECODE_SONY
-  DPRINTLN("Attempting Sony decode");
-  if (decodeSony(results)) return true;
+    DPRINTLN("Attempting Sony decode");
+    if (decodeSony(results, offset)) return true;
 #endif
 #if DECODE_MITSUBISHI
-  DPRINTLN("Attempting Mitsubishi decode");
-  if (decodeMitsubishi(results)) return true;
+    DPRINTLN("Attempting Mitsubishi decode");
+    if (decodeMitsubishi(results, offset)) return true;
 #endif
 #if DECODE_MITSUBISHI_AC
-  DPRINTLN("Attempting Mitsubishi AC decode");
-  if (decodeMitsubishiAC(results)) return true;
+    DPRINTLN("Attempting Mitsubishi AC decode");
+    if (decodeMitsubishiAC(results, offset)) return true;
 #endif
 #if DECODE_MITSUBISHI2
-  DPRINTLN("Attempting Mitsubishi2 decode");
-  if (decodeMitsubishi2(results)) return true;
+    DPRINTLN("Attempting Mitsubishi2 decode");
+    if (decodeMitsubishi2(results, offset)) return true;
 #endif
 #if DECODE_RC5
-  DPRINTLN("Attempting RC5 decode");
-  if (decodeRC5(results)) return true;
+    DPRINTLN("Attempting RC5 decode");
+    if (decodeRC5(results, offset)) return true;
 #endif
 #if DECODE_RC6
-  DPRINTLN("Attempting RC6 decode");
-  if (decodeRC6(results)) return true;
+    DPRINTLN("Attempting RC6 decode");
+    if (decodeRC6(results, offset)) return true;
 #endif
 #if DECODE_RCMM
-  DPRINTLN("Attempting RC-MM decode");
-  if (decodeRCMM(results)) return true;
+    DPRINTLN("Attempting RC-MM decode");
+    if (decodeRCMM(results, offset)) return true;
 #endif
 #if DECODE_FUJITSU_AC
-  // Fujitsu A/C needs to precede Panasonic and Denon as it has a short
-  // message which looks exactly the same as a Panasonic/Denon message.
-  DPRINTLN("Attempting Fujitsu A/C decode");
-  if (decodeFujitsuAC(results)) return true;
+    // Fujitsu A/C needs to precede Panasonic and Denon as it has a short
+    // message which looks exactly the same as a Panasonic/Denon message.
+    DPRINTLN("Attempting Fujitsu A/C decode");
+    if (decodeFujitsuAC(results, offset)) return true;
 #endif
 #if DECODE_DENON
-  // Denon needs to precede Panasonic as it is a special case of Panasonic.
-  DPRINTLN("Attempting Denon decode");
-  if (decodeDenon(results, kDenon48Bits) || decodeDenon(results, kDenonBits) ||
-      decodeDenon(results, kDenonLegacyBits))
-    return true;
+    // Denon needs to precede Panasonic as it is a special case of Panasonic.
+    DPRINTLN("Attempting Denon decode");
+    if (decodeDenon(results, offset, kDenon48Bits) ||
+        decodeDenon(results, offset, kDenonBits) ||
+        decodeDenon(results, offset, kDenonLegacyBits))
+      return true;
 #endif
 #if DECODE_PANASONIC
-  DPRINTLN("Attempting Panasonic decode");
-  if (decodePanasonic(results)) return true;
+    DPRINTLN("Attempting Panasonic decode");
+    if (decodePanasonic(results, offset)) return true;
 #endif
 #if DECODE_LG
-  DPRINTLN("Attempting LG (28-bit) decode");
-  if (decodeLG(results, kLgBits, true)) return true;
-  DPRINTLN("Attempting LG (32-bit) decode");
-  // LG32 should be tried before Samsung
-  if (decodeLG(results, kLg32Bits, true)) return true;
+    DPRINTLN("Attempting LG (28-bit) decode");
+    if (decodeLG(results, offset, kLgBits, true)) return true;
+    DPRINTLN("Attempting LG (32-bit) decode");
+    // LG32 should be tried before Samsung
+    if (decodeLG(results, offset, kLg32Bits, true)) return true;
 #endif
 #if DECODE_GICABLE
-  // Note: Needs to happen before JVC decode, because it looks similar except
-  //       with a required NEC-like repeat code.
-  DPRINTLN("Attempting GICable decode");
-  if (decodeGICable(results)) return true;
+    // Note: Needs to happen before JVC decode, because it looks similar except
+    //       with a required NEC-like repeat code.
+    DPRINTLN("Attempting GICable decode");
+    if (decodeGICable(results, offset)) return true;
 #endif
 #if DECODE_JVC
-  DPRINTLN("Attempting JVC decode");
-  if (decodeJVC(results)) return true;
+    DPRINTLN("Attempting JVC decode");
+    if (decodeJVC(results, offset)) return true;
 #endif
 #if DECODE_SAMSUNG
-  DPRINTLN("Attempting SAMSUNG decode");
-  if (decodeSAMSUNG(results)) return true;
+    DPRINTLN("Attempting SAMSUNG decode");
+    if (decodeSAMSUNG(results, offset)) return true;
 #endif
 #if DECODE_SAMSUNG36
-  DPRINTLN("Attempting Samsung36 decode");
-  if (decodeSamsung36(results)) return true;
+    DPRINTLN("Attempting Samsung36 decode");
+    if (decodeSamsung36(results, offset)) return true;
 #endif
 #if DECODE_WHYNTER
-  DPRINTLN("Attempting Whynter decode");
-  if (decodeWhynter(results)) return true;
+    DPRINTLN("Attempting Whynter decode");
+    if (decodeWhynter(results, offset)) return true;
 #endif
 #if DECODE_DISH
-  DPRINTLN("Attempting DISH decode");
-  if (decodeDISH(results)) return true;
+    DPRINTLN("Attempting DISH decode");
+    if (decodeDISH(results, offset)) return true;
 #endif
 #if DECODE_SHARP
-  DPRINTLN("Attempting Sharp decode");
-  if (decodeSharp(results)) return true;
+    DPRINTLN("Attempting Sharp decode");
+    if (decodeSharp(results, offset)) return true;
 #endif
 #if DECODE_COOLIX
-  DPRINTLN("Attempting Coolix decode");
-  if (decodeCOOLIX(results)) return true;
+    DPRINTLN("Attempting Coolix decode");
+    if (decodeCOOLIX(results, offset)) return true;
 #endif
 #if DECODE_NIKAI
-  DPRINTLN("Attempting Nikai decode");
-  if (decodeNikai(results)) return true;
+    DPRINTLN("Attempting Nikai decode");
+    if (decodeNikai(results, offset)) return true;
 #endif
 #if DECODE_KELVINATOR
-  // Kelvinator based-devices use a similar code to Gree ones, to avoid false
-  // matches this needs to happen before decodeGree().
-  DPRINTLN("Attempting Kelvinator decode");
-  if (decodeKelvinator(results)) return true;
+    // Kelvinator based-devices use a similar code to Gree ones, to avoid false
+    // matches this needs to happen before decodeGree().
+    DPRINTLN("Attempting Kelvinator decode");
+    if (decodeKelvinator(results, offset)) return true;
 #endif
 #if DECODE_DAIKIN
-  DPRINTLN("Attempting Daikin decode");
-  if (decodeDaikin(results)) return true;
+    DPRINTLN("Attempting Daikin decode");
+    if (decodeDaikin(results, offset)) return true;
 #endif
 #if DECODE_DAIKIN2
-  DPRINTLN("Attempting Daikin2 decode");
-  if (decodeDaikin2(results)) return true;
+    DPRINTLN("Attempting Daikin2 decode");
+    if (decodeDaikin2(results, offset)) return true;
 #endif
 #if DECODE_DAIKIN216
-  DPRINTLN("Attempting Daikin216 decode");
-  if (decodeDaikin216(results)) return true;
+    DPRINTLN("Attempting Daikin216 decode");
+    if (decodeDaikin216(results, offset)) return true;
 #endif
 #if DECODE_TOSHIBA_AC
-  DPRINTLN("Attempting Toshiba AC decode");
-  if (decodeToshibaAC(results)) return true;
+    DPRINTLN("Attempting Toshiba AC decode");
+    if (decodeToshibaAC(results, offset)) return true;
 #endif
 #if DECODE_MIDEA
-  DPRINTLN("Attempting Midea decode");
-  if (decodeMidea(results)) return true;
+    DPRINTLN("Attempting Midea decode");
+    if (decodeMidea(results, offset)) return true;
 #endif
 #if DECODE_MAGIQUEST
-  DPRINTLN("Attempting Magiquest decode");
-  if (decodeMagiQuest(results)) return true;
+    DPRINTLN("Attempting Magiquest decode");
+    if (decodeMagiQuest(results, offset)) return true;
 #endif
-/* NOTE: Disabled due to poor quality.
+  /* NOTE: Disabled due to poor quality.
 #if DECODE_SANYO
-  // The Sanyo S866500B decoder is very poor quality & depricated.
-  // *IF* you are going to enable it, do it near last to avoid false positive
-  // matches.
-  DPRINTLN("Attempting Sanyo SA8650B decode");
-  if (decodeSanyo(results))
-    return true;
+    // The Sanyo S866500B decoder is very poor quality & depricated.
+    // *IF* you are going to enable it, do it near last to avoid false positive
+    // matches.
+    DPRINTLN("Attempting Sanyo SA8650B decode");
+    if (decodeSanyo(results, offset))
+      return true;
 #endif
-*/
+  */
 #if DECODE_NEC
-  // Some devices send NEC-like codes that don't follow the true NEC spec.
-  // This should detect those. e.g. Apple TV remote etc.
-  // This needs to be done after all other codes that use strict and some
-  // other protocols that are NEC-like as well, as turning off strict may
-  // cause this to match other valid protocols.
-  DPRINTLN("Attempting NEC (non-strict) decode");
-  if (decodeNEC(results, kNECBits, false)) {
-    results->decode_type = NEC_LIKE;
-    return true;
-  }
+    // Some devices send NEC-like codes that don't follow the true NEC spec.
+    // This should detect those. e.g. Apple TV remote etc.
+    // This needs to be done after all other codes that use strict and some
+    // other protocols that are NEC-like as well, as turning off strict may
+    // cause this to match other valid protocols.
+    DPRINTLN("Attempting NEC (non-strict) decode");
+    if (decodeNEC(results, offset, kNECBits, false)) {
+      results->decode_type = NEC_LIKE;
+      return true;
+    }
 #endif
 #if DECODE_LASERTAG
-  DPRINTLN("Attempting Lasertag decode");
-  if (decodeLasertag(results)) return true;
+    DPRINTLN("Attempting Lasertag decode");
+    if (decodeLasertag(results, offset)) return true;
 #endif
 #if DECODE_GREE
-  // Gree based-devices use a similar code to Kelvinator ones, to avoid false
-  // matches this needs to happen after decodeKelvinator().
-  DPRINTLN("Attempting Gree decode");
-  if (decodeGree(results)) return true;
+    // Gree based-devices use a similar code to Kelvinator ones, to avoid false
+    // matches this needs to happen after decodeKelvinator().
+    DPRINTLN("Attempting Gree decode");
+    if (decodeGree(results, offset)) return true;
 #endif
 #if DECODE_HAIER_AC
-  DPRINTLN("Attempting Haier AC decode");
-  if (decodeHaierAC(results)) return true;
+    DPRINTLN("Attempting Haier AC decode");
+    if (decodeHaierAC(results, offset)) return true;
 #endif
 #if DECODE_HAIER_AC_YRW02
-  DPRINTLN("Attempting Haier AC YR-W02 decode");
-  if (decodeHaierACYRW02(results)) return true;
+    DPRINTLN("Attempting Haier AC YR-W02 decode");
+    if (decodeHaierACYRW02(results, offset)) return true;
 #endif
 #if DECODE_HITACHI_AC424
-  // HitachiAc424 should be checked before HitachiAC & HitachiAC2
-  DPRINTLN("Attempting Hitachi AC 424 decode");
-  if (decodeHitachiAc424(results, kHitachiAc424Bits)) return true;
+    // HitachiAc424 should be checked before HitachiAC & HitachiAC2
+    DPRINTLN("Attempting Hitachi AC 424 decode");
+    if (decodeHitachiAc424(results, offset, kHitachiAc424Bits)) return true;
 #endif  // DECODE_HITACHI_AC2
 #if DECODE_HITACHI_AC2
-  // HitachiAC2 should be checked before HitachiAC
-  DPRINTLN("Attempting Hitachi AC2 decode");
-  if (decodeHitachiAC(results, kHitachiAc2Bits)) return true;
+    // HitachiAC2 should be checked before HitachiAC
+    DPRINTLN("Attempting Hitachi AC2 decode");
+    if (decodeHitachiAC(results, offset, kHitachiAc2Bits)) return true;
 #endif  // DECODE_HITACHI_AC2
 #if DECODE_HITACHI_AC
-  DPRINTLN("Attempting Hitachi AC decode");
-  if (decodeHitachiAC(results, kHitachiAcBits)) return true;
+    DPRINTLN("Attempting Hitachi AC decode");
+    if (decodeHitachiAC(results, offset, kHitachiAcBits)) return true;
 #endif
 #if DECODE_HITACHI_AC1
-  DPRINTLN("Attempting Hitachi AC1 decode");
-  if (decodeHitachiAC(results, kHitachiAc1Bits)) return true;
+    DPRINTLN("Attempting Hitachi AC1 decode");
+    if (decodeHitachiAC(results, offset, kHitachiAc1Bits)) return true;
 #endif
 #if DECODE_WHIRLPOOL_AC
-  DPRINTLN("Attempting Whirlpool AC decode");
-  if (decodeWhirlpoolAC(results)) return true;
+    DPRINTLN("Attempting Whirlpool AC decode");
+    if (decodeWhirlpoolAC(results, offset)) return true;
 #endif
 #if DECODE_SAMSUNG_AC
-  DPRINTLN("Attempting Samsung AC (extended) decode");
-  // Check the extended size first, as it should fail fast due to longer length.
-  if (decodeSamsungAC(results, kSamsungAcExtendedBits, false)) return true;
-  // Now check for the more common length.
-  DPRINTLN("Attempting Samsung AC decode");
-  if (decodeSamsungAC(results, kSamsungAcBits)) return true;
+    DPRINTLN("Attempting Samsung AC (extended) decode");
+    // Check the extended size first, as it should fail fast due to longer
+    // length.
+    if (decodeSamsungAC(results, offset, kSamsungAcExtendedBits, false))
+      return true;
+    // Now check for the more common length.
+    DPRINTLN("Attempting Samsung AC decode");
+    if (decodeSamsungAC(results, offset, kSamsungAcBits)) return true;
 #endif
 #if DECODE_ELECTRA_AC
-  DPRINTLN("Attempting Electra AC decode");
-  if (decodeElectraAC(results)) return true;
+    DPRINTLN("Attempting Electra AC decode");
+    if (decodeElectraAC(results, offset)) return true;
 #endif
 #if DECODE_PANASONIC_AC
-  DPRINTLN("Attempting Panasonic AC decode");
-  if (decodePanasonicAC(results)) return true;
-  DPRINTLN("Attempting Panasonic AC short decode");
-  if (decodePanasonicAC(results, kPanasonicAcShortBits)) return true;
+    DPRINTLN("Attempting Panasonic AC decode");
+    if (decodePanasonicAC(results, offset)) return true;
+    DPRINTLN("Attempting Panasonic AC short decode");
+    if (decodePanasonicAC(results, offset, kPanasonicAcShortBits)) return true;
 #endif
 #if DECODE_LUTRON
-  DPRINTLN("Attempting Lutron decode");
-  if (decodeLutron(results)) return true;
+    DPRINTLN("Attempting Lutron decode");
+    if (decodeLutron(results, offset)) return true;
 #endif
 #if DECODE_MWM
-  DPRINTLN("Attempting MWM decode");
-  if (decodeMWM(results)) return true;
+    DPRINTLN("Attempting MWM decode");
+    if (decodeMWM(results, offset)) return true;
 #endif
 #if DECODE_VESTEL_AC
-  DPRINTLN("Attempting Vestel AC decode");
-  if (decodeVestelAc(results)) return true;
+    DPRINTLN("Attempting Vestel AC decode");
+    if (decodeVestelAc(results, offset)) return true;
 #endif
 #if DECODE_MITSUBISHI112 || DECODE_TCL112AC
-  // Mitsubish112 and Tcl112 share the same decoder.
-  DPRINTLN("Attempting Mitsubishi112/TCL112AC decode");
-  if (decodeMitsubishi112(results)) return true;
+    // Mitsubish112 and Tcl112 share the same decoder.
+    DPRINTLN("Attempting Mitsubishi112/TCL112AC decode");
+    if (decodeMitsubishi112(results, offset)) return true;
 #endif  // DECODE_MITSUBISHI112 || DECODE_TCL112AC
 #if DECODE_TECO
-  DPRINTLN("Attempting Teco decode");
-  if (decodeTeco(results)) return true;
+    DPRINTLN("Attempting Teco decode");
+    if (decodeTeco(results, offset)) return true;
 #endif
 #if DECODE_LEGOPF
-  DPRINTLN("Attempting LEGOPF decode");
-  if (decodeLegoPf(results)) return true;
+    DPRINTLN("Attempting LEGOPF decode");
+    if (decodeLegoPf(results, offset)) return true;
 #endif
 #if DECODE_MITSUBISHIHEAVY
-  DPRINTLN("Attempting MITSUBISHIHEAVY (152 bit) decode");
-  if (decodeMitsubishiHeavy(results, kMitsubishiHeavy152Bits)) return true;
-  DPRINTLN("Attempting MITSUBISHIHEAVY (88 bit) decode");
-  if (decodeMitsubishiHeavy(results, kMitsubishiHeavy88Bits)) return true;
+    DPRINTLN("Attempting MITSUBISHIHEAVY (152 bit) decode");
+    if (decodeMitsubishiHeavy(results, offset, kMitsubishiHeavy152Bits))
+      return true;
+    DPRINTLN("Attempting MITSUBISHIHEAVY (88 bit) decode");
+    if (decodeMitsubishiHeavy(results, offset, kMitsubishiHeavy88Bits))
+      return true;
 #endif
 #if DECODE_ARGO
-  DPRINTLN("Attempting Argo decode");
-  if (decodeArgo(results)) return true;
+    DPRINTLN("Attempting Argo decode");
+    if (decodeArgo(results, offset)) return true;
 #endif  // DECODE_ARGO
 #if DECODE_SHARP_AC
-  DPRINTLN("Attempting SHARP_AC decode");
-  if (decodeSharpAc(results)) return true;
+    DPRINTLN("Attempting SHARP_AC decode");
+    if (decodeSharpAc(results, offset)) return true;
 #endif
 #if DECODE_GOODWEATHER
-  DPRINTLN("Attempting GOODWEATHER decode");
-  if (decodeGoodweather(results)) return true;
+    DPRINTLN("Attempting GOODWEATHER decode");
+    if (decodeGoodweather(results, offset)) return true;
 #endif  // DECODE_GOODWEATHER
 #if DECODE_INAX
-  DPRINTLN("Attempting Inax decode");
-  if (decodeInax(results)) return true;
+    DPRINTLN("Attempting Inax decode");
+    if (decodeInax(results, offset)) return true;
 #endif  // DECODE_INAX
 #if DECODE_TROTEC
-  DPRINTLN("Attempting Trotec decode");
-  if (decodeTrotec(results)) return true;
+    DPRINTLN("Attempting Trotec decode");
+    if (decodeTrotec(results, offset)) return true;
 #endif  // DECODE_TROTEC
 #if DECODE_DAIKIN160
-  DPRINTLN("Attempting Daikin160 decode");
-  if (decodeDaikin160(results)) return true;
+    DPRINTLN("Attempting Daikin160 decode");
+    if (decodeDaikin160(results, offset)) return true;
 #endif  // DECODE_DAIKIN160
 #if DECODE_NEOCLIMA
-  DPRINTLN("Attempting Neoclima decode");
-  if (decodeNeoclima(results)) return true;
+    DPRINTLN("Attempting Neoclima decode");
+    if (decodeNeoclima(results, offset)) return true;
 #endif  // DECODE_NEOCLIMA
 #if DECODE_DAIKIN176
-  DPRINTLN("Attempting Daikin176 decode");
-  if (decodeDaikin176(results)) return true;
+    DPRINTLN("Attempting Daikin176 decode");
+    if (decodeDaikin176(results, offset)) return true;
 #endif  // DECODE_DAIKIN176
 #if DECODE_DAIKIN128
-  DPRINTLN("Attempting Daikin128 decode");
-  if (decodeDaikin128(results)) return true;
+    DPRINTLN("Attempting Daikin128 decode");
+    if (decodeDaikin128(results, offset)) return true;
 #endif  // DECODE_DAIKIN128
 #if DECODE_AMCOR
-  DPRINTLN("Attempting Amcor decode");
-  if (decodeAmcor(results)) return true;
+    DPRINTLN("Attempting Amcor decode");
+    if (decodeAmcor(results, offset)) return true;
 #endif  // DECODE_AMCOR
 #if DECODE_DAIKIN152
-  DPRINTLN("Attempting Daikin152 decode");
-  if (decodeDaikin152(results)) return true;
+    DPRINTLN("Attempting Daikin152 decode");
+    if (decodeDaikin152(results, offset)) return true;
 #endif  // DECODE_DAIKIN152
 #if DECODE_MITSUBISHI136
-  DPRINTLN("Attempting Mitsubishi136 decode");
-  if (decodeMitsubishi136(results)) return true;
+    DPRINTLN("Attempting Mitsubishi136 decode");
+    if (decodeMitsubishi136(results, offset)) return true;
 #endif  // DECODE_MITSUBISHI136
+  }
   // Typically new protocols are added above this line.
 #if DECODE_HASH
   // decodeHash returns a hash on any input.
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRrecv.h b/lib/IRremoteESP8266-2.7.4/src/IRrecv.h
similarity index 63%
rename from lib/IRremoteESP8266-2.7.3/src/IRrecv.h
rename to lib/IRremoteESP8266-2.7.4/src/IRrecv.h
index 2424f0463..60559981c 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRrecv.h
+++ b/lib/IRremoteESP8266-2.7.4/src/IRrecv.h
@@ -125,7 +125,8 @@ class IRrecv {
   ~IRrecv(void);                                                  // Destructor
   void setTolerance(const uint8_t percent = kTolerance);
   uint8_t getTolerance(void);
-  bool decode(decode_results *results, irparams_t *save = NULL);
+  bool decode(decode_results *results, irparams_t *save = NULL,
+              uint8_t max_skip = 0, uint16_t noise_floor = 0);
   void enableIRIn(const bool pullup = false);
   void disableIRIn(void);
   void resume(void);
@@ -220,52 +221,64 @@ class IRrecv {
                         const uint8_t tolerance = kUseDefTol,
                         const int16_t excess = kMarkExcess,
                         const bool MSBfirst = true);
+  void crudeNoiseFilter(decode_results *results, const uint16_t floor = 0);
   bool decodeHash(decode_results *results);
 #if (DECODE_NEC || DECODE_SHERWOOD || DECODE_AIWA_RC_T501 || SEND_SANYO)
-  bool decodeNEC(decode_results *results, uint16_t nbits = kNECBits,
-                 bool strict = true);
+  bool decodeNEC(decode_results *results, uint16_t offset = kStartOffset,
+                 const uint16_t nbits = kNECBits, const bool strict = true);
 #endif
 #if DECODE_ARGO
-  bool decodeArgo(decode_results *results, const uint16_t nbits = kArgoBits,
-                  const bool strict = true);
+  bool decodeArgo(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kArgoBits, const bool strict = true);
 #endif  // DECODE_ARGO
 #if DECODE_SONY
-  bool decodeSony(decode_results *results, uint16_t nbits = kSonyMinBits,
-                  bool strict = false);
+  bool decodeSony(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kSonyMinBits,
+                  const bool strict = false);
 #endif
 #if DECODE_SANYO
   // DISABLED due to poor quality.
-  // bool decodeSanyo(decode_results *results,
+  // bool decodeSanyo(decode_results *results, uint16_t offset = kStartOffset,
   //                  uint16_t nbits = kSanyoSA8650BBits,
   //                  bool strict = false);
   bool decodeSanyoLC7461(decode_results *results,
-                         uint16_t nbits = kSanyoLC7461Bits, bool strict = true);
+                         uint16_t offset = kStartOffset,
+                         const uint16_t nbits = kSanyoLC7461Bits,
+                         bool strict = true);
 #endif
 #if DECODE_MITSUBISHI
-  bool decodeMitsubishi(decode_results *results,
-                        uint16_t nbits = kMitsubishiBits, bool strict = true);
+  bool decodeMitsubishi(decode_results *results, uint16_t offset = kStartOffset,
+                        const uint16_t nbits = kMitsubishiBits,
+                        const bool strict = true);
 #endif
 #if DECODE_MITSUBISHI2
   bool decodeMitsubishi2(decode_results *results,
-                         uint16_t nbits = kMitsubishiBits, bool strict = true);
+                         uint16_t offset = kStartOffset,
+                         const uint16_t nbits = kMitsubishiBits,
+                         const bool strict = true);
 #endif
 #if DECODE_MITSUBISHI_AC
   bool decodeMitsubishiAC(decode_results *results,
-                          uint16_t nbits = kMitsubishiACBits,
-                          bool strict = false);
+                          uint16_t offset = kStartOffset,
+                          const uint16_t nbits = kMitsubishiACBits,
+                          const bool strict = false);
 #endif
 #if DECODE_MITSUBISHI136
   bool decodeMitsubishi136(decode_results *results,
+                           uint16_t offset = kStartOffset,
                            const uint16_t nbits = kMitsubishi136Bits,
                            const bool strict = true);
 #endif
 #if DECODE_MITSUBISHI112
   bool decodeMitsubishi112(decode_results *results,
+                           uint16_t offset = kStartOffset,
                            const uint16_t nbits = kMitsubishi112Bits,
                            const bool strict = true);
 #endif
 #if DECODE_MITSUBISHIHEAVY
-  bool decodeMitsubishiHeavy(decode_results *results, const uint16_t nbits,
+  bool decodeMitsubishiHeavy(decode_results *results,
+                             uint16_t offset = kStartOffset,
+                             const uint16_t nbits = kMitsubishiHeavy152Bits,
                              const bool strict = true);
 #endif
 #if (DECODE_RC5 || DECODE_R6 || DECODE_LASERTAG || DECODE_MWM)
@@ -275,236 +288,276 @@ class IRrecv {
                      uint8_t maxwidth = 3);
 #endif
 #if DECODE_RC5
-  bool decodeRC5(decode_results *results, uint16_t nbits = kRC5XBits,
-                 bool strict = true);
+  bool decodeRC5(decode_results *results, uint16_t offset = kStartOffset,
+                 const uint16_t nbits = kRC5XBits,
+                 const bool strict = true);
 #endif
 #if DECODE_RC6
-  bool decodeRC6(decode_results *results, uint16_t nbits = kRC6Mode0Bits,
-                 bool strict = false);
+  bool decodeRC6(decode_results *results, uint16_t offset = kStartOffset,
+                 const uint16_t nbits = kRC6Mode0Bits,
+                 const bool strict = false);
 #endif
 #if DECODE_RCMM
-  bool decodeRCMM(decode_results *results, uint16_t nbits = kRCMMBits,
-                  bool strict = false);
+  bool decodeRCMM(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kRCMMBits,
+                  const bool strict = false);
 #endif
 #if (DECODE_PANASONIC || DECODE_DENON)
-  bool decodePanasonic(decode_results *results,
+  bool decodePanasonic(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kPanasonicBits,
                        const bool strict = false,
                        const uint32_t manufacturer = kPanasonicManufacturer);
 #endif
 #if DECODE_LG
-  bool decodeLG(decode_results *results, uint16_t nbits = kLgBits,
-                bool strict = false);
+  bool decodeLG(decode_results *results, uint16_t offset = kStartOffset,
+                const uint16_t nbits = kLgBits,
+                const bool strict = false);
 #endif
 #if DECODE_INAX
-  bool decodeInax(decode_results *results, const uint16_t nbits = kInaxBits,
+  bool decodeInax(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kInaxBits,
                   const bool strict = true);
 #endif  // DECODE_INAX
 #if DECODE_JVC
-  bool decodeJVC(decode_results *results, uint16_t nbits = kJvcBits,
-                 bool strict = true);
+  bool decodeJVC(decode_results *results, uint16_t offset = kStartOffset,
+                 const uint16_t nbits = kJvcBits,
+                 const bool strict = true);
 #endif
 #if DECODE_SAMSUNG
-  bool decodeSAMSUNG(decode_results *results,
+  bool decodeSAMSUNG(decode_results *results, uint16_t offset = kStartOffset,
                      const uint16_t nbits = kSamsungBits,
                      const bool strict = true);
 #endif
 #if DECODE_SAMSUNG
-  bool decodeSamsung36(decode_results *results,
+  bool decodeSamsung36(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kSamsung36Bits,
                        const bool strict = true);
 #endif
 #if DECODE_SAMSUNG_AC
-  bool decodeSamsungAC(decode_results *results,
+  bool decodeSamsungAC(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kSamsungAcBits,
                        const bool strict = true);
 #endif
 #if DECODE_WHYNTER
-  bool decodeWhynter(decode_results *results, uint16_t nbits = kWhynterBits,
-                     bool strict = true);
+  bool decodeWhynter(decode_results *results, uint16_t offset = kStartOffset,
+                     const uint16_t nbits = kWhynterBits,
+                     const bool strict = true);
 #endif
 #if DECODE_COOLIX
-  bool decodeCOOLIX(decode_results *results, uint16_t nbits = kCoolixBits,
-                    bool strict = true);
+  bool decodeCOOLIX(decode_results *results, uint16_t offset = kStartOffset,
+                    const uint16_t nbits = kCoolixBits,
+                    const bool strict = true);
 #endif
 #if DECODE_DENON
-  bool decodeDenon(decode_results *results, uint16_t nbits = kDenonBits,
-                   bool strict = true);
+  bool decodeDenon(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kDenonBits,
+                   const bool strict = true);
 #endif
 #if DECODE_DISH
-  bool decodeDISH(decode_results *results, uint16_t nbits = kDishBits,
-                  bool strict = true);
+  bool decodeDISH(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kDishBits,
+                  const bool strict = true);
 #endif
 #if (DECODE_SHARP || DECODE_DENON)
-  bool decodeSharp(decode_results *results, const uint16_t nbits = kSharpBits,
+  bool decodeSharp(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kSharpBits,
                    const bool strict = true, const bool expansion = true);
 #endif
 #if DECODE_SHARP_AC
-  bool decodeSharpAc(decode_results *results,
+  bool decodeSharpAc(decode_results *results, uint16_t offset = kStartOffset,
                      const uint16_t nbits = kSharpAcBits,
                      const bool strict = true);
 #endif
 #if DECODE_AIWA_RC_T501
-  bool decodeAiwaRCT501(decode_results *results,
-                        uint16_t nbits = kAiwaRcT501Bits, bool strict = true);
+  bool decodeAiwaRCT501(decode_results *results, uint16_t offset = kStartOffset,
+                        const uint16_t nbits = kAiwaRcT501Bits,
+                        const bool strict = true);
 #endif
 #if DECODE_NIKAI
-  bool decodeNikai(decode_results *results, uint16_t nbits = kNikaiBits,
-                   bool strict = true);
+  bool decodeNikai(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kNikaiBits,
+                   const bool strict = true);
 #endif
 #if DECODE_MAGIQUEST
-  bool decodeMagiQuest(decode_results *results, uint16_t nbits = kMagiquestBits,
-                       bool strict = true);
+  bool decodeMagiQuest(decode_results *results, uint16_t offset = kStartOffset,
+                       const uint16_t nbits = kMagiquestBits,
+                       const bool strict = true);
 #endif
 #if DECODE_KELVINATOR
-  bool decodeKelvinator(decode_results *results,
-                        uint16_t nbits = kKelvinatorBits, bool strict = true);
+  bool decodeKelvinator(decode_results *results, uint16_t offset = kStartOffset,
+                        const uint16_t nbits = kKelvinatorBits,
+                        const bool strict = true);
 #endif
 #if DECODE_DAIKIN
-  bool decodeDaikin(decode_results *results, const uint16_t nbits = kDaikinBits,
+  bool decodeDaikin(decode_results *results, uint16_t offset = kStartOffset,
+                    const uint16_t nbits = kDaikinBits,
                     const bool strict = true);
 #endif
 #if DECODE_DAIKIN128
-  bool decodeDaikin128(decode_results *results,
+  bool decodeDaikin128(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kDaikin128Bits,
                        const bool strict = true);
 #endif  // DECODE_DAIKIN128
 #if DECODE_DAIKIN152
-  bool decodeDaikin152(decode_results *results,
+  bool decodeDaikin152(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kDaikin152Bits,
                        const bool strict = true);
 #endif  // DECODE_DAIKIN152
 #if DECODE_DAIKIN160
-  bool decodeDaikin160(decode_results *results,
+  bool decodeDaikin160(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kDaikin160Bits,
                        const bool strict = true);
 #endif  // DECODE_DAIKIN160
 #if DECODE_DAIKIN176
-  bool decodeDaikin176(decode_results *results,
+  bool decodeDaikin176(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kDaikin176Bits,
                        const bool strict = true);
 #endif  // DECODE_DAIKIN176
 #if DECODE_DAIKIN2
-  bool decodeDaikin2(decode_results *results, uint16_t nbits = kDaikin2Bits,
-                     bool strict = true);
+  bool decodeDaikin2(decode_results *results, uint16_t offset = kStartOffset,
+                     const uint16_t nbits = kDaikin2Bits,
+                     const bool strict = true);
 #endif
 #if DECODE_DAIKIN216
-  bool decodeDaikin216(decode_results *results,
+  bool decodeDaikin216(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kDaikin216Bits,
                        const bool strict = true);
 #endif
 #if DECODE_TOSHIBA_AC
-  bool decodeToshibaAC(decode_results *results,
+  bool decodeToshibaAC(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbytes = kToshibaACBits,
                        const bool strict = true);
 #endif
 #if DECODE_TROTEC
-  bool decodeTrotec(decode_results *results, const uint16_t nbits = kTrotecBits,
+  bool decodeTrotec(decode_results *results, uint16_t offset = kStartOffset,
+                    const uint16_t nbits = kTrotecBits,
                     const bool strict = true);
 #endif  // DECODE_TROTEC
 #if DECODE_MIDEA
-  bool decodeMidea(decode_results *results, uint16_t nbits = kMideaBits,
-                   bool strict = true);
+  bool decodeMidea(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kMideaBits,
+                   const bool strict = true);
 #endif
 #if DECODE_FUJITSU_AC
-  bool decodeFujitsuAC(decode_results *results, uint16_t nbits = kFujitsuAcBits,
-                       bool strict = false);
+  bool decodeFujitsuAC(decode_results *results, uint16_t offset = kStartOffset,
+                       const uint16_t nbits = kFujitsuAcBits,
+                       const bool strict = false);
 #endif
 #if DECODE_LASERTAG
-  bool decodeLasertag(decode_results *results, uint16_t nbits = kLasertagBits,
-                      bool strict = true);
+  bool decodeLasertag(decode_results *results, uint16_t offset = kStartOffset,
+                      const uint16_t nbits = kLasertagBits,
+                      const bool strict = true);
 #endif
 #if DECODE_CARRIER_AC
-  bool decodeCarrierAC(decode_results *results, uint16_t nbits = kCarrierAcBits,
-                       bool strict = true);
+  bool decodeCarrierAC(decode_results *results, uint16_t offset = kStartOffset,
+                       const uint16_t nbits = kCarrierAcBits,
+                       const bool strict = true);
 #endif
 #if DECODE_GOODWEATHER
   bool decodeGoodweather(decode_results *results,
+                         uint16_t offset = kStartOffset,
                          const uint16_t nbits = kGoodweatherBits,
                          const bool strict = true);
 #endif  // DECODE_GOODWEATHER
 #if DECODE_GREE
-  bool decodeGree(decode_results *results, uint16_t nbits = kGreeBits,
-                  bool strict = true);
+  bool decodeGree(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kGreeBits,
+                  const bool strict = true);
 #endif
 #if (DECODE_HAIER_AC | DECODE_HAIER_AC_YRW02)
-  bool decodeHaierAC(decode_results *results, uint16_t nbits = kHaierACBits,
-                     bool strict = true);
+  bool decodeHaierAC(decode_results *results, uint16_t offset = kStartOffset,
+                     const uint16_t nbits = kHaierACBits,
+                     const bool strict = true);
 #endif
 #if DECODE_HAIER_AC_YRW02
   bool decodeHaierACYRW02(decode_results *results,
-                          uint16_t nbits = kHaierACYRW02Bits,
-                          bool strict = true);
+                          uint16_t offset = kStartOffset,
+                          const uint16_t nbits = kHaierACYRW02Bits,
+                          const bool strict = true);
 #endif
 #if (DECODE_HITACHI_AC || DECODE_HITACHI_AC2)
-  bool decodeHitachiAC(decode_results *results,
+  bool decodeHitachiAC(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kHitachiAcBits,
                        const bool strict = true);
 #endif
 #if DECODE_HITACHI_AC1
-  bool decodeHitachiAC1(decode_results *results,
+  bool decodeHitachiAC1(decode_results *results, uint16_t offset = kStartOffset,
                         const uint16_t nbits = kHitachiAc1Bits,
                         const bool strict = true);
 #endif
 #if DECODE_HITACHI_AC424
   bool decodeHitachiAc424(decode_results *results,
+                          uint16_t offset = kStartOffset,
                           const uint16_t nbits = kHitachiAc424Bits,
                           const bool strict = true);
 #endif  // DECODE_HITACHI_AC424
 #if DECODE_GICABLE
-  bool decodeGICable(decode_results *results, uint16_t nbits = kGicableBits,
-                     bool strict = true);
+  bool decodeGICable(decode_results *results, uint16_t offset = kStartOffset,
+                     const uint16_t nbits = kGicableBits,
+                     const bool strict = true);
 #endif
 #if DECODE_WHIRLPOOL_AC
   bool decodeWhirlpoolAC(decode_results *results,
+                         uint16_t offset = kStartOffset,
                          const uint16_t nbits = kWhirlpoolAcBits,
                          const bool strict = true);
 #endif
 #if DECODE_LUTRON
-  bool decodeLutron(decode_results *results, uint16_t nbits = kLutronBits,
-                    bool strict = true);
+  bool decodeLutron(decode_results *results, uint16_t offset = kStartOffset,
+                    const uint16_t nbits = kLutronBits,
+                    const bool strict = true);
 #endif
 #if DECODE_ELECTRA_AC
-  bool decodeElectraAC(decode_results *results, uint16_t nbits = kElectraAcBits,
-                       bool strict = true);
+  bool decodeElectraAC(decode_results *results, uint16_t offset = kStartOffset,
+                       const uint16_t nbits = kElectraAcBits,
+                       const bool strict = true);
 #endif
 #if DECODE_PANASONIC_AC
   bool decodePanasonicAC(decode_results *results,
+                         uint16_t offset = kStartOffset,
                          const uint16_t nbits = kPanasonicAcBits,
                          const bool strict = true);
 #endif
 #if DECODE_PIONEER
-  bool decodePioneer(decode_results *results,
+  bool decodePioneer(decode_results *results, uint16_t offset = kStartOffset,
                      const uint16_t nbits = kPioneerBits,
                      const bool strict = true);
 #endif
 #if DECODE_MWM
-  bool decodeMWM(decode_results *results, uint16_t nbits = 24,
-                 bool strict = true);
+  bool decodeMWM(decode_results *results, uint16_t offset = kStartOffset,
+                 const uint16_t nbits = 24,
+                 const bool strict = true);
 #endif
 #if DECODE_VESTEL_AC
-  bool decodeVestelAc(decode_results *results,
+  bool decodeVestelAc(decode_results *results, uint16_t offset = kStartOffset,
                       const uint16_t nbits = kVestelAcBits,
                       const bool strict = true);
 #endif
 #if DECODE_TECO
-  bool decodeTeco(decode_results *results, const uint16_t nbits = kTecoBits,
+  bool decodeTeco(decode_results *results, uint16_t offset = kStartOffset,
+                  const uint16_t nbits = kTecoBits,
                   const bool strict = false);
 #endif
 #if DECODE_LEGOPF
-  bool decodeLegoPf(decode_results *results, const uint16_t nbits = kLegoPfBits,
+  bool decodeLegoPf(decode_results *results, uint16_t offset = kStartOffset,
+                    const uint16_t nbits = kLegoPfBits,
                     const bool strict = true);
 #endif
 #if DECODE_NEOCLIMA
-bool decodeNeoclima(decode_results *results,
-                    const uint16_t nbits = kNeoclimaBits,
-                    const bool strict = true);
+  bool decodeNeoclima(decode_results *results, uint16_t offset = kStartOffset,
+                      const uint16_t nbits = kNeoclimaBits,
+                      const bool strict = true);
 #endif  // DECODE_NEOCLIMA
 #if DECODE_AMCOR
-bool decodeAmcor(decode_results *results,
-                 const uint16_t nbits = kAmcorBits,
-                 const bool strict = true);
+  bool decodeAmcor(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kAmcorBits,
+                   const bool strict = true);
 #endif  // DECODE_AMCOR
+#if DECODE_EPSON
+  bool decodeEpson(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kEpsonBits,
+                   const bool strict = true);
+#endif  // DECODE_EPSON
 };
 
 #endif  // IRRECV_H_
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h b/lib/IRremoteESP8266-2.7.4/src/IRremoteESP8266.h
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h
rename to lib/IRremoteESP8266-2.7.4/src/IRremoteESP8266.h
index eb8a67f5c..a048e23fc 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRremoteESP8266.h
+++ b/lib/IRremoteESP8266-2.7.4/src/IRremoteESP8266.h
@@ -52,7 +52,7 @@
 #endif  // UNIT_TEST
 
 // Library Version
-#define _IRREMOTEESP8266_VERSION_ "2.7.3"
+#define _IRREMOTEESP8266_VERSION_ "2.7.4"
 
 // Set the language & locale for the library. See the `locale` dir for options.
 #ifndef _IR_LOCALE_
@@ -565,6 +565,13 @@
 #define SEND_HITACHI_AC424     _IR_ENABLE_DEFAULT_
 #endif  // SEND_HITACHI_AC424
 
+#ifndef DECODE_EPSON
+#define DECODE_EPSON   _IR_ENABLE_DEFAULT_
+#endif  // DECODE_EPSON
+#ifndef SEND_EPSON
+#define SEND_EPSON     _IR_ENABLE_DEFAULT_
+#endif  // SEND_EPSON
+
 #if (DECODE_ARGO || DECODE_DAIKIN || DECODE_FUJITSU_AC || DECODE_GREE || \
      DECODE_KELVINATOR || DECODE_MITSUBISHI_AC || DECODE_TOSHIBA_AC || \
      DECODE_TROTEC || DECODE_HAIER_AC || DECODE_HITACHI_AC || \
@@ -589,6 +596,22 @@
 #define ALLOW_DELAY_CALLS true
 #endif  // ALLOW_DELAY_CALLS
 
+// Enable a run-time settable high-pass filter on captured data **before**
+// trying any protocol decoding.
+// i.e. Try to remove/merge any really short pulses detected in the raw data.
+// Note: Even when this option is enabled, it is _off_ by default, and requires
+//       a user who knows what they are doing to enable it.
+//       The option to disable this feature is here if your project is _really_
+//       tight on resources. i.e. Saves a small handful of bytes and cpu time.
+// WARNING: If you use this feature at runtime, you can no longer trust the
+//          **raw** data captured. It will now have been slightly **cooked**!
+// DANGER: If you set the `noise_floor` value too high, it **WILL** break
+//         decoding of some protocols. You have been warned. Here Be Dragons!
+//
+// See: `irrecv::decode()` in IRrecv.cpp for more info.
+#ifndef ENABLE_NOISE_FILTER_OPTION
+#define ENABLE_NOISE_FILTER_OPTION true
+#endif  // ENABLE_NOISE_FILTER_OPTION
 /*
  * Always add to the end of the list and should never remove entries
  * or change order. Projects may save the type number for later usage
@@ -671,8 +694,9 @@ enum decode_type_t {
   MITSUBISHI112,
   HITACHI_AC424,
   SONY_38K,
+  EPSON,  // 75
   // Add new entries before this one, and update it to point to the last entry.
-  kLastDecodeType = SONY_38K,
+  kLastDecodeType = EPSON,
 };
 
 // Message lengths & required repeat values
@@ -720,6 +744,8 @@ const uint16_t kDenon48Bits = 48;
 const uint16_t kDenonLegacyBits = 14;
 const uint16_t kDishBits = 16;
 const uint16_t kDishMinRepeat = 3;
+const uint16_t kEpsonBits = 32;
+const uint16_t kEpsonMinRepeat = 2;
 const uint16_t kElectraAcStateLength = 13;
 const uint16_t kElectraAcBits = kElectraAcStateLength * 8;
 const uint16_t kElectraAcMinRepeat = kNoRepeat;
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRsend.cpp b/lib/IRremoteESP8266-2.7.4/src/IRsend.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/src/IRsend.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRsend.cpp
index 4bc16a75c..8bc12949b 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRsend.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/IRsend.cpp
@@ -477,7 +477,8 @@ void IRsend::sendGeneric(const uint16_t headermark, const uint32_t headerspace,
 //
 // Ref:
 //   examples/IRrecvDumpV2/IRrecvDumpV2.ino
-void IRsend::sendRaw(uint16_t buf[], uint16_t len, uint16_t hz) {
+void IRsend::sendRaw(const uint16_t buf[], const uint16_t len,
+                     const uint16_t hz) {
   // Set IR carrier frequency
   enableIROut(hz);
   for (uint16_t i = 0; i < len; i++) {
@@ -517,6 +518,8 @@ uint16_t IRsend::minRepeats(const decode_type_t protocol) {
       return kSonyMinRepeat;
     case SONY_38K:
       return kSonyMinRepeat + 1;
+    case EPSON:
+      return kEpsonMinRepeat;
     default:
       return kNoRepeat;
   }
@@ -558,6 +561,7 @@ uint16_t IRsend::defaultBits(const decode_type_t protocol) {
     case LG2:
       return 28;
     case CARRIER_AC:
+    case EPSON:
     case NEC:
     case NEC_LIKE:
     case SAMSUNG:
@@ -687,6 +691,11 @@ bool IRsend::send(const decode_type_t type, const uint64_t data,
       sendDISH(data, nbits, min_repeat);
       break;
 #endif
+#if SEND_EPSON
+    case EPSON:
+      sendEpson(data, nbits, min_repeat);
+      break;
+#endif
 #if SEND_GICABLE
     case GICABLE:
       sendGICable(data, nbits, min_repeat);
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRsend.h b/lib/IRremoteESP8266-2.7.4/src/IRsend.h
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/src/IRsend.h
rename to lib/IRremoteESP8266-2.7.4/src/IRsend.h
index ff801210d..902f22010 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRsend.h
+++ b/lib/IRremoteESP8266-2.7.4/src/IRsend.h
@@ -158,7 +158,7 @@ class IRsend {
   VIRTUAL uint16_t mark(uint16_t usec);
   VIRTUAL void space(uint32_t usec);
   int8_t calibrate(uint16_t hz = 38000U);
-  void sendRaw(uint16_t buf[], uint16_t len, uint16_t hz);
+  void sendRaw(const uint16_t buf[], const uint16_t len, const uint16_t hz);
   void sendData(uint16_t onemark, uint32_t onespace, uint16_t zeromark,
                 uint32_t zerospace, uint64_t data, uint16_t nbits,
                 bool MSBfirst = true);
@@ -535,7 +535,10 @@ class IRsend {
                  const uint16_t nbytes = kAmcorStateLength,
                  const uint16_t repeat = kAmcorDefaultRepeat);
 #endif  // SEND_AMCOR
-
+#if SEND_EPSON
+  void sendEpson(uint64_t data, uint16_t nbits = kEpsonBits,
+                 uint16_t repeat = kEpsonMinRepeat);
+#endif
 
  protected:
 #ifdef UNIT_TEST
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRtext.cpp b/lib/IRremoteESP8266-2.7.4/src/IRtext.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/IRtext.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRtext.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRtext.h b/lib/IRremoteESP8266-2.7.4/src/IRtext.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/IRtext.h
rename to lib/IRremoteESP8266-2.7.4/src/IRtext.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRtimer.cpp b/lib/IRremoteESP8266-2.7.4/src/IRtimer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/IRtimer.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRtimer.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRtimer.h b/lib/IRremoteESP8266-2.7.4/src/IRtimer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/IRtimer.h
rename to lib/IRremoteESP8266-2.7.4/src/IRtimer.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRutils.cpp b/lib/IRremoteESP8266-2.7.4/src/IRutils.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/src/IRutils.cpp
rename to lib/IRremoteESP8266-2.7.4/src/IRutils.cpp
index bbb9ed491..230b24809 100644
--- a/lib/IRremoteESP8266-2.7.3/src/IRutils.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/IRutils.cpp
@@ -125,6 +125,8 @@ decode_type_t strToDecodeType(const char * const str) {
     return decode_type_t::DISH;
   else if (!strcasecmp(str, "ELECTRA_AC"))
     return decode_type_t::ELECTRA_AC;
+  else if (!strcasecmp(str, "EPSON"))
+    return decode_type_t::EPSON;
   else if (!strcasecmp(str, "FUJITSU_AC"))
     return decode_type_t::FUJITSU_AC;
   else if (!strcasecmp(str, "GICABLE"))
@@ -310,6 +312,9 @@ String typeToString(const decode_type_t protocol, const bool isRepeat) {
     case ELECTRA_AC:
       result = F("ELECTRA_AC");
       break;
+    case EPSON:
+      result = F("EPSON");
+      break;
     case FUJITSU_AC:
       result = F("FUJITSU_AC");
       break;
diff --git a/lib/IRremoteESP8266-2.7.3/src/IRutils.h b/lib/IRremoteESP8266-2.7.4/src/IRutils.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/IRutils.h
rename to lib/IRremoteESP8266-2.7.4/src/IRutils.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/i18n.h b/lib/IRremoteESP8266-2.7.4/src/i18n.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/i18n.h
rename to lib/IRremoteESP8266-2.7.4/src/i18n.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Aiwa.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Aiwa.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Aiwa.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Aiwa.cpp
index 70dbc85b2..95dffe1aa 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Aiwa.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Aiwa.cpp
@@ -53,6 +53,8 @@ void IRsend::sendAiwaRCT501(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kAiwaRcT501Bits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -69,8 +71,8 @@ void IRsend::sendAiwaRCT501(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   http://www.sbprojects.com/knowledge/ir/nec.php
-bool IRrecv::decodeAiwaRCT501(decode_results *results, uint16_t nbits,
-                              bool strict) {
+bool IRrecv::decodeAiwaRCT501(decode_results *results, uint16_t offset,
+                              const uint16_t nbits, const bool strict) {
   // Compliance
   if (strict && nbits != kAiwaRcT501Bits)
     return false;  // Doesn't match our protocol defn.
@@ -82,7 +84,7 @@ bool IRrecv::decodeAiwaRCT501(decode_results *results, uint16_t nbits,
     return false;  // We can't possibly match something that big.
   // Decode it as a much bigger (non-standard) NEC message, so we have to turn
   // off strict mode checking for NEC.
-  if (!decodeNEC(results, expected_nbits, false))
+  if (!decodeNEC(results, offset, expected_nbits, false))
     return false;  // The NEC decode had a problem, so we should too.
   uint16_t actual_bits = results->bits;
   new_data = results->value;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Amcor.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Amcor.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Amcor.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Amcor.cpp
index b36c6d15a..b29933906 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Amcor.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Amcor.cpp
@@ -56,6 +56,8 @@ void IRsend::sendAmcor(const unsigned char data[], const uint16_t nbytes,
 // Decode the supplied Amcor HVAC message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kAmcorBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -64,15 +66,13 @@ void IRsend::sendAmcor(const unsigned char data[], const uint16_t nbytes,
 //
 // Status: STABLE / Reported as working.
 //
-bool IRrecv::decodeAmcor(decode_results *results, uint16_t nbits,
-                         bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader - 1)
+bool IRrecv::decodeAmcor(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= 2 * nbits + kHeader - 1 + offset)
     return false;  // Can't possibly be a valid Amcor message.
   if (strict && nbits != kAmcorBits)
     return false;  // We expect Amcor to be 64 bits of message.
 
-  uint16_t offset = kStartOffset;
-
   uint16_t used;
   // Header + Data Block (64 bits) + Footer
   used = matchGeneric(results->rawbuf + offset, results->state,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Amcor.h b/lib/IRremoteESP8266-2.7.4/src/ir_Amcor.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Amcor.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Amcor.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Argo.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Argo.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Argo.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Argo.cpp
index f1806ebcd..11e8336e3 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Argo.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Argo.cpp
@@ -378,6 +378,8 @@ String IRArgoAC::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kArgoBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -388,12 +390,11 @@ String IRArgoAC::toString(void) {
 // Note:
 //   This decoder is based soley off sendArgo(). We have no actual captures
 //   to test this against. If you have one of these units, please let us know.
-bool IRrecv::decodeArgo(decode_results *results, const uint16_t nbits,
+bool IRrecv::decodeArgo(decode_results *results, uint16_t offset,
+                        const uint16_t nbits,
                         const bool strict) {
   if (strict && nbits != kArgoBits) return false;
 
-  uint16_t offset = kStartOffset;
-
   // Match Header + Data
   if (!matchGeneric(results->rawbuf + offset, results->state,
                     results->rawlen - offset, nbits,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Argo.h b/lib/IRremoteESP8266-2.7.4/src/ir_Argo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Argo.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Argo.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Carrier.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Carrier.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Carrier.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Carrier.cpp
index e31ddd55f..7b2b00d58 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Carrier.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Carrier.cpp
@@ -53,6 +53,8 @@ void IRsend::sendCarrierAC(uint64_t data, uint16_t nbits, uint16_t repeat) {
 // i.e. normal + inverted + normal
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kCarrierAcBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -61,16 +63,15 @@ void IRsend::sendCarrierAC(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Status: ALPHA / Untested.
 //
-bool IRrecv::decodeCarrierAC(decode_results *results, uint16_t nbits,
-                             bool strict) {
-  if (results->rawlen < ((2 * nbits + kHeader + kFooter) * 3) - 1)
+bool IRrecv::decodeCarrierAC(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < ((2 * nbits + kHeader + kFooter) * 3) - 1 + offset)
     return false;  // Can't possibly be a valid Carrier message.
   if (strict && nbits != kCarrierAcBits)
     return false;  // We expect Carrier to be 32 bits of message.
 
   uint64_t data = 0;
   uint64_t prev_data = 0;
-  uint16_t offset = kStartOffset;
 
   for (uint8_t i = 0; i < 3; i++) {
     prev_data = data;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Coolix.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Coolix.cpp
index 8b184bf9f..a8d98301c 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Coolix.cpp
@@ -130,6 +130,7 @@ void IRCoolixAC::send(const uint16_t repeat) {
 uint32_t IRCoolixAC::getRaw() { return remote_state; }
 
 void IRCoolixAC::setRaw(const uint32_t new_code) {
+  powerFlag = true;  // Everything that is not the special power off mesg is On.
   if (!handleSpecialState(new_code)) {
     // it isn`t special so might affect Temp|mode|Fan
     if (new_code == kCoolixCmdFan) {
@@ -578,17 +579,19 @@ String IRCoolixAC::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kCoolixBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: BETA / Probably working.
-bool IRrecv::decodeCOOLIX(decode_results *results, uint16_t nbits,
-                          bool strict) {
+bool IRrecv::decodeCOOLIX(decode_results *results, uint16_t offset,
+                          const uint16_t nbits, const bool strict) {
   // The protocol sends the data normal + inverted, alternating on
   // each byte. Hence twice the number of expected data bits.
-  if (results->rawlen < 2 * 2 * nbits + kHeader + kFooter - 1)
+  if (results->rawlen <= 2 * 2 * nbits + kHeader + kFooter - 1 + offset)
     return false;  // Can't possibly be a valid COOLIX message.
   if (strict && nbits != kCoolixBits)
     return false;      // Not strictly a COOLIX message.
@@ -597,7 +600,6 @@ bool IRrecv::decodeCOOLIX(decode_results *results, uint16_t nbits,
 
   uint64_t data = 0;
   uint64_t inverted = 0;
-  uint16_t offset = kStartOffset;
 
   if (nbits > sizeof(data) * 8)
     return false;  // We can't possibly capture a Coolix packet that big.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Coolix.h b/lib/IRremoteESP8266-2.7.4/src/ir_Coolix.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Coolix.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Coolix.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Daikin.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Daikin.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Daikin.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Daikin.cpp
index 678e43f88..4941fe977 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Daikin.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Daikin.cpp
@@ -513,6 +513,8 @@ String IRDaikinESP::toString(void) {
 // Decode the supplied Daikin A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikinBits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -522,17 +524,17 @@ String IRDaikinESP::toString(void) {
 //
 // Ref:
 //   https://github.com/mharizanov/Daikin-AC-remote-control-over-the-Internet/tree/master/IRremote
-bool IRrecv::decodeDaikin(decode_results *results, const uint16_t nbits,
-                          const bool strict) {
+bool IRrecv::decodeDaikin(decode_results *results, uint16_t offset,
+                          const uint16_t nbits, const bool strict) {
   // Is there enough data to match successfully?
   if (results->rawlen < (2 * (nbits + kDaikinHeaderLength) +
-                         kDaikinSections * (kHeader + kFooter) + kFooter - 1))
+                         kDaikinSections * (kHeader + kFooter) + kFooter - 1) +
+                         offset)
     return false;
 
   // Compliance
   if (strict && nbits != kDaikinBits) return false;
 
-  uint16_t offset = kStartOffset;
   match_result_t data_result;
 
   // Header #1 - Doesn't count as data.
@@ -1206,6 +1208,8 @@ String IRDaikin2::toString(void) {
 // Decode the supplied Daikin2 A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin2Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -1219,15 +1223,14 @@ String IRDaikin2::toString(void) {
 //
 // Ref:
 //   https://github.com/mharizanov/Daikin-AC-remote-control-over-the-Internet/tree/master/IRremote
-bool IRrecv::decodeDaikin2(decode_results *results, uint16_t nbits,
-                           bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader + kFooter) + kHeader - 1)
+bool IRrecv::decodeDaikin2(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader + kFooter) + kHeader - 1 + offset)
     return false;
 
   // Compliance
   if (strict && nbits != kDaikin2Bits) return false;
 
-  uint16_t offset = kStartOffset;
   const uint8_t ksectionSize[kDaikin2Sections] = {kDaikin2Section1Length,
                                                   kDaikin2Section2Length};
 
@@ -1552,6 +1555,8 @@ String IRDaikin216::toString(void) {
 // Decode the supplied Daikin 216 bit A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin216Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -1565,15 +1570,14 @@ String IRDaikin216::toString(void) {
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/689
 //   https://github.com/danny-source/Arduino_DY_IRDaikin
-bool IRrecv::decodeDaikin216(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1)
+bool IRrecv::decodeDaikin216(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1 + offset)
     return false;
 
   // Compliance
   if (strict && nbits != kDaikin216Bits) return false;
 
-  uint16_t offset = kStartOffset;
   const uint8_t ksectionSize[kDaikin216Sections] = {kDaikin216Section1Length,
                                                     kDaikin216Section2Length};
   // Sections
@@ -1905,6 +1909,8 @@ String IRDaikin160::toString(void) {
 // Decode the supplied Daikin 160 bit A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin160Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -1917,15 +1923,14 @@ String IRDaikin160::toString(void) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/731
-bool IRrecv::decodeDaikin160(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1)
+bool IRrecv::decodeDaikin160(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1 + offset)
     return false;
 
   // Compliance
   if (strict && nbits != kDaikin160Bits) return false;
 
-  uint16_t offset = kStartOffset;
   const uint8_t ksectionSize[kDaikin160Sections] = {kDaikin160Section1Length,
                                                     kDaikin160Section2Length};
 
@@ -2268,6 +2273,8 @@ String IRDaikin176::toString(void) {
 // Decode the supplied Daikin 176 bit A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin176Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -2279,15 +2286,15 @@ String IRDaikin176::toString(void) {
 // Status: BETA / Probably works.
 //
 
-bool IRrecv::decodeDaikin176(decode_results *results, const uint16_t nbits,
+bool IRrecv::decodeDaikin176(decode_results *results, uint16_t offset,
+                             const uint16_t nbits,
                              const bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1)
+  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1 + offset)
     return false;
 
   // Compliance
   if (strict && nbits != kDaikin176Bits) return false;
 
-  uint16_t offset = kStartOffset;
   const uint8_t ksectionSize[kDaikin176Sections] = {kDaikin176Section1Length,
                                                     kDaikin176Section2Length};
 
@@ -2762,6 +2769,8 @@ stdAc::state_t IRDaikin128::toCommon(const stdAc::state_t *prev) {
 // Decode the supplied Daikin 128 bit A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin128Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -2773,17 +2782,15 @@ stdAc::state_t IRDaikin128::toCommon(const stdAc::state_t *prev) {
 // Status: STABLE / Known Working.
 //
 // Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
-bool IRrecv::decodeDaikin128(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader) + kFooter - 1)
+bool IRrecv::decodeDaikin128(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader) + kFooter - 1 + offset)
     return false;
   if (nbits / 8 <= kDaikin128SectionLength) return false;
 
   // Compliance
   if (strict && nbits != kDaikin128Bits) return false;
 
-  uint16_t offset = kStartOffset;
-
   // Leader
   for (uint8_t i = 0; i < 2; i++) {
     if (!matchMark(results->rawbuf[offset++], kDaikin128LeaderMark,
@@ -2862,6 +2869,8 @@ void IRsend::sendDaikin152(const unsigned char data[], const uint16_t nbytes,
 // Decode the supplied Daikin 152 bit A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kDaikin152Bits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -2873,16 +2882,15 @@ void IRsend::sendDaikin152(const unsigned char data[], const uint16_t nbytes,
 // Status: STABLE / Known working.
 //
 // Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/873
-bool IRrecv::decodeDaikin152(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * (5 + nbits + kFooter) + kHeader - 1)
+bool IRrecv::decodeDaikin152(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (5 + nbits + kFooter) + kHeader - 1 + offset)
     return false;
   if (nbits / 8 < kDaikin152StateLength) return false;
 
   // Compliance
   if (strict && nbits != kDaikin152Bits) return false;
 
-  uint16_t offset = kStartOffset;
   uint16_t used;
 
   // Leader
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Daikin.h b/lib/IRremoteESP8266-2.7.4/src/ir_Daikin.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Daikin.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Daikin.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Denon.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Denon.cpp
similarity index 89%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Denon.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Denon.cpp
index 8a32ae261..bd4940714 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Denon.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Denon.cpp
@@ -64,7 +64,10 @@ void IRsend::sendDenon(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Expected nr. of data bits. (Typically kDenonBits)
+//   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
@@ -72,7 +75,8 @@ void IRsend::sendDenon(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Denon.cpp
-bool IRrecv::decodeDenon(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeDenon(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict) {
   // Compliance
   if (strict) {
     switch (nbits) {
@@ -92,15 +96,14 @@ bool IRrecv::decodeDenon(decode_results *results, uint16_t nbits, bool strict) {
   // Ditto for Panasonic, it's the same except for a different
   // manufacturer code.
 
-  if (!decodeSharp(results, nbits, true, false) &&
-      !decodePanasonic(results, nbits, true, kDenonManufacturer)) {
+  if (!decodeSharp(results, offset, nbits, true, false) &&
+      !decodePanasonic(results, offset, nbits, true, kDenonManufacturer)) {
     // We couldn't decode it as expected, so try the old legacy method.
     // NOTE: I don't think this following protocol actually exists.
     //       Looks like a partial version of the Sharp protocol.
     if (strict && nbits != kDenonLegacyBits) return false;
 
     uint64_t data = 0;
-    uint16_t offset = kStartOffset;
 
     // Match Header + Data + Footer
     if (!matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Dish.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Dish.cpp
similarity index 93%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Dish.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Dish.cpp
index b217da763..834ceda04 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Dish.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Dish.cpp
@@ -69,6 +69,8 @@ void IRsend::sendDISH(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. Typically kDishBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -84,13 +86,11 @@ void IRsend::sendDISH(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //   http://www.hifi-remote.com/wiki/index.php?title=Dish
 //   http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx
 //   https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Dish.cpp
-bool IRrecv::decodeDISH(decode_results *results, uint16_t nbits, bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
-    return false;  // Not enough entries to be valid.
+bool IRrecv::decodeDISH(decode_results *results, uint16_t offset,
+                        const uint16_t nbits, const bool strict) {
   if (strict && nbits != kDishBits) return false;  // Not strictly compliant.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Electra.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Electra.cpp
similarity index 88%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Electra.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Electra.cpp
index e423bfa0a..16c753f35 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Electra.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Electra.cpp
@@ -66,7 +66,7 @@ IRElectraAc::IRElectraAc(const uint16_t pin, const bool inverted,
 void IRElectraAc::stateReset(void) {
   for (uint8_t i = 1; i < kElectraAcStateLength - 2; i++) remote_state[i] = 0;
   remote_state[0] = 0xC3;
-  remote_state[11] = 0x08;
+  remote_state[11] = kElectraAcLightToggleOff;
   // [12] is the checksum.
 }
 
@@ -233,6 +233,30 @@ bool IRElectraAc::getSwingH(void) {
                    kElectraAcSwingSize);
 }
 
+void IRElectraAc::setLightToggle(const bool on) {
+  remote_state[11] = on ? kElectraAcLightToggleOn : kElectraAcLightToggleOff;
+}
+
+bool IRElectraAc::getLightToggle(void) {
+  return (remote_state[11] & kElectraAcLightToggleMask) ==
+      kElectraAcLightToggleMask;
+}
+
+void IRElectraAc::setClean(const bool on) {
+  setBit(&remote_state[9], kElectraAcCleanOffset, on);
+}
+
+bool IRElectraAc::getClean(void) {
+  return GETBIT8(remote_state[9], kElectraAcCleanOffset);
+}
+
+void IRElectraAc::setTurbo(const bool on) {
+  setBit(&remote_state[5], kElectraAcTurboOffset, on);
+}
+
+bool IRElectraAc::getTurbo(void) {
+  return GETBIT8(remote_state[5], kElectraAcTurboOffset);
+}
 // Convert the A/C state to it's common equivalent.
 stdAc::state_t IRElectraAc::toCommon(void) {
   stdAc::state_t result;
@@ -246,13 +270,13 @@ stdAc::state_t IRElectraAc::toCommon(void) {
                                     : stdAc::swingv_t::kOff;
   result.swingh = this->getSwingH() ? stdAc::swingh_t::kAuto
                                     : stdAc::swingh_t::kOff;
+  result.light = this->getLightToggle();
+  result.turbo = this->getTurbo();
+  result.clean = this->getClean();
   // Not supported.
   result.model = -1;  // No models used.
   result.quiet = false;
-  result.turbo = false;
   result.econo = false;
-  result.clean = false;
-  result.light = false;
   result.filter = false;
   result.beep = false;
   result.sleep = -1;
@@ -263,7 +287,7 @@ stdAc::state_t IRElectraAc::toCommon(void) {
 // Convert the internal state into a human readable string.
 String IRElectraAc::toString(void) {
   String result = "";
-  result.reserve(80);  // Reserve some heap for the string to reduce fragging.
+  result.reserve(130);  // Reserve some heap for the string to reduce fragging.
   result += addBoolToString(getPower(), kPowerStr, false);
   result += addModeToString(getMode(), kElectraAcAuto, kElectraAcCool,
                             kElectraAcHeat, kElectraAcDry, kElectraAcFan);
@@ -273,6 +297,9 @@ String IRElectraAc::toString(void) {
                            kElectraAcFanMed);
   result += addBoolToString(getSwingV(), kSwingVStr);
   result += addBoolToString(getSwingH(), kSwingHStr);
+  result += addLabeledString(getLightToggle() ? kToggleStr : "-", kLightStr);
+  result += addBoolToString(getClean(), kCleanStr);
+  result += addBoolToString(getTurbo(), kTurboStr);
   return result;
 }
 
@@ -281,6 +308,8 @@ String IRElectraAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kElectraAcBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -288,14 +317,14 @@ String IRElectraAc::toString(void) {
 //
 // Status: STABLE / Known working.
 //
-bool IRrecv::decodeElectraAC(decode_results *results, uint16_t nbits,
-                             bool strict) {
+bool IRrecv::decodeElectraAC(decode_results *results, uint16_t offset,
+                             const uint16_t nbits,
+                             const bool strict) {
   if (strict) {
     if (nbits != kElectraAcBits)
       return false;  // Not strictly a ELECTRA_AC message.
   }
 
-  uint16_t offset = kStartOffset;
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, results->state,
                     results->rawlen - offset, nbits,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Electra.h b/lib/IRremoteESP8266-2.7.4/src/ir_Electra.h
similarity index 81%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Electra.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Electra.h
index a120bcd28..2d5fe09f5 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Electra.h
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Electra.h
@@ -50,6 +50,10 @@ const uint8_t kElectraAcFanAuto =    0b101;
 const uint8_t kElectraAcFanLow =     0b011;
 const uint8_t kElectraAcFanMed =     0b010;
 const uint8_t kElectraAcFanHigh =    0b001;
+// state[5]
+//                      TurboMask =    0b01000000;
+const uint8_t kElectraAcTurboOffset = 6;
+
 // state[6]
 //                            Mode 0b11100000
 const uint8_t kElectraAcModeOffset = 5;
@@ -59,7 +63,18 @@ const uint8_t kElectraAcDry =      0b010;
 const uint8_t kElectraAcHeat =     0b100;
 const uint8_t kElectraAcFan =      0b110;
 // state[9]
-const uint8_t kElectraAcPowerOffset = 5;
+//
+const uint8_t kElectraAcCleanOffset = 2;  // Bit 0b00000100
+const uint8_t kElectraAcPowerOffset = 5;  // Bit 0b00100000
+// state[11]
+//
+const uint8_t kElectraAcLightToggleOn  = 0x15;
+// Light has known ON values of 0x15 (0b00010101) or 0x19 (0b00011001)
+//   Thus common bits ON are: 0b00010001 (0x11)
+// We will use this for the getLightToggle() test.
+const uint8_t kElectraAcLightToggleMask = 0x11;
+// and known OFF values of 0x08 (0b00001000) & 0x05 (0x00000101)
+const uint8_t kElectraAcLightToggleOff = 0x08;
 
 
 // Classes
@@ -88,6 +103,12 @@ class IRElectraAc {
   bool getSwingV(void);
   void setSwingH(const bool on);
   bool getSwingH(void);
+  void setClean(const bool on);
+  bool getClean(void);
+  void setLightToggle(const bool on);
+  bool getLightToggle(void);
+  void setTurbo(const bool on);
+  bool getTurbo(void);
   uint8_t* getRaw(void);
   void setRaw(const uint8_t new_code[],
               const uint16_t length = kElectraAcStateLength);
diff --git a/lib/IRremoteESP8266-2.7.4/src/ir_Epson.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Epson.cpp
new file mode 100644
index 000000000..40973a947
--- /dev/null
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Epson.cpp
@@ -0,0 +1,114 @@
+// Copyright 2020 David Conran
+
+// Epson is an NEC-like protocol, except it doesn't use the NEC style repeat.
+
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+#include <algorithm>
+#include "IRrecv.h"
+#include "IRsend.h"
+#include "IRutils.h"
+#include "ir_NEC.h"
+
+#if SEND_EPSON
+// Send an Epson formatted message.
+//
+// Args:
+//   data:   The message to be sent.
+//   nbits:  The number of bits of the message to be sent. Typically kEpsonBits.
+//   repeat: The number of times the command is to be repeated.
+//
+// Status: Beta / Probably works.
+//
+// Ref:
+//  https://github.com/crankyoldgit/IRremoteESP8266/issues/1034
+void IRsend::sendEpson(uint64_t data, uint16_t nbits, uint16_t repeat) {
+  sendGeneric(kNecHdrMark, kNecHdrSpace, kNecBitMark, kNecOneSpace, kNecBitMark,
+              kNecZeroSpace, kNecBitMark, kNecMinGap, kNecMinCommandLength,
+              data, nbits, 38, true, repeat, 33);
+}
+
+#endif  // SEND_EPSON
+
+#if DECODE_EPSON
+// Decode the supplied Epson message.
+//
+// Args:
+//   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
+//   nbits:   The number of data bits to expect. Typically kNECBits.
+//   strict:  Flag indicating if we should perform strict matching.
+// Returns:
+//   boolean: True if it can decode it, false if it can't.
+//
+// Status: Beta / Probably works.
+//
+// Notes:
+//   Experimental data indicates there are at least three
+//   messages (first + 2 repeats). We only require the first + a single repeat
+//   to match. This helps us distinguish it from NEC messages which are near
+//   identical.
+//
+// Ref:
+//  https://github.com/crankyoldgit/IRremoteESP8266/issues/1034
+bool IRrecv::decodeEpson(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict) {
+  const uint8_t kEpsonMinMesgsForDecode = 2;
+
+  if (results->rawlen < kEpsonMinMesgsForDecode * (2 * nbits + kHeader +
+                                                   kFooter) + offset - 1)
+    return false;  // Can't possibly be a valid Epson message.
+  if (strict && nbits != kEpsonBits)
+    return false;  // Not strictly an Epson message.
+
+  uint64_t data = 0;
+  uint64_t first_data = 0;
+  bool first = true;
+
+  for (uint8_t i = 0; i < kEpsonMinMesgsForDecode; i++) {
+    // Match Header + Data + Footer
+    uint16_t delta = matchGeneric(results->rawbuf + offset, &data,
+                                  results->rawlen - offset, nbits,
+                                  kNecHdrMark, kNecHdrSpace,
+                                  kNecBitMark, kNecOneSpace,
+                                  kNecBitMark, kNecZeroSpace,
+                                  kNecBitMark, kNecMinGap, true);
+    if (!delta) return false;
+    offset += delta;
+    if (first)
+      first_data = data;
+    else if (data != first_data) return false;
+    first = false;  // No longer the first message.
+  }
+  // Compliance
+  // Calculate command and optionally enforce integrity checking.
+  uint8_t command = (data & 0xFF00) >> 8;
+  // Command is sent twice, once as plain and then inverted.
+  if ((command ^ 0xFF) != (data & 0xFF)) {
+    if (strict) return false;  // Command integrity failed.
+    command = 0;  // The command value isn't valid, so default to zero.
+  }
+
+  // Success
+  results->bits = nbits;
+  results->value = data;
+  results->decode_type = EPSON;
+  // Epson command and address are technically in LSB first order so the
+  // final versions have to be reversed.
+  results->command = reverseBits(command, 8);
+  // Normal Epson (NEC) protocol has an 8 bit address sent,
+  // followed by it inverted.
+  uint8_t address = (data & 0xFF000000) >> 24;
+  uint8_t address_inverted = (data & 0x00FF0000) >> 16;
+  if (address == (address_inverted ^ 0xFF))
+    // Inverted, so it is normal Epson (NEC) protocol.
+    results->address = reverseBits(address, 8);
+  else
+    // Not inverted, so must be Extended Epson (NEC) protocol,
+    // thus 16 bit address.
+    results->address = reverseBits((data >> 16) & UINT16_MAX, 16);
+  results->repeat = !first;
+  return true;
+}
+#endif  // DECODE_EPSON
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Fujitsu.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Fujitsu.cpp
index 4b0095b1e..583a441ba 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Fujitsu.cpp
@@ -684,22 +684,25 @@ String IRFujitsuAC::toString(void) {
 // Places successful decode information in the results pointer.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kFujitsuAcBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
-// Status:  ALPHA / Untested.
+// Status:  STABLE / Working.
 //
 // Ref:
 //
-bool IRrecv::decodeFujitsuAC(decode_results* results, uint16_t nbits,
-                             bool strict) {
-  uint16_t offset = kStartOffset;
+bool IRrecv::decodeFujitsuAC(decode_results* results, uint16_t offset,
+                             const uint16_t nbits,
+                             const bool strict) {
   uint16_t dataBitsSoFar = 0;
 
   // Have we got enough data to successfully decode?
-  if (results->rawlen < (2 * kFujitsuAcMinBits) + kHeader + kFooter - 1)
+  if (results->rawlen < (2 * kFujitsuAcMinBits) + kHeader + kFooter - 1 +
+      offset)
     return false;  // Can't possibly be a valid message.
 
   // Compliance
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.h b/lib/IRremoteESP8266-2.7.4/src/ir_Fujitsu.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Fujitsu.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Fujitsu.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_GICable.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_GICable.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/src/ir_GICable.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_GICable.cpp
index 6b3849b4c..ef68199cb 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_GICable.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_GICable.cpp
@@ -58,19 +58,20 @@ void IRsend::sendGICable(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kGicableBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: Alpha / Not tested against a real device.
-bool IRrecv::decodeGICable(decode_results *results, uint16_t nbits,
-                           bool strict) {
+bool IRrecv::decodeGICable(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
   if (strict && nbits != kGicableBits)
     return false;  // Not strictly an GICABLE message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   // Match Header + Data + Footer
   uint16_t used;
   used = matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_GlobalCache.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_GlobalCache.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_GlobalCache.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_GlobalCache.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Goodweather.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Goodweather.cpp
index 4c5aa3513..8b7e0b76e 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Goodweather.cpp
@@ -370,23 +370,24 @@ String IRGoodweatherAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kGoodweatherBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: ALPHA / Untested.
-bool IRrecv::decodeGoodweather(decode_results* results,
+bool IRrecv::decodeGoodweather(decode_results* results, uint16_t offset,
                                const uint16_t nbits,
                                const bool strict) {
-  if (results->rawlen < 2 * (2 * nbits) + kHeader + 2 * kFooter - 1)
+  if (results->rawlen < 2 * (2 * nbits) + kHeader + 2 * kFooter - 1 + offset)
     return false;  // Can't possibly be a valid Goodweather message.
   if (strict && nbits != kGoodweatherBits)
     return false;  // Not strictly a Goodweather message.
 
   uint64_t dataSoFar = 0;
   uint16_t dataBitsSoFar = 0;
-  uint16_t offset = kStartOffset;
   match_result_t data_result;
 
   // Header
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.h b/lib/IRremoteESP8266-2.7.4/src/ir_Goodweather.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Goodweather.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Goodweather.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Gree.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Gree.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Gree.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Gree.cpp
index 2dbebe84b..735e3b88c 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Gree.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Gree.cpp
@@ -513,21 +513,22 @@ String IRGreeAC::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kGreeBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
-// Status: ALPHA / Untested.
-bool IRrecv::decodeGree(decode_results* results, uint16_t nbits, bool strict) {
-  if (results->rawlen <
-      2 * (nbits + kGreeBlockFooterBits) + (kHeader + kFooter + 1))
+// Status: STABLE / Working.
+bool IRrecv::decodeGree(decode_results* results, uint16_t offset,
+                        const uint16_t nbits, bool const strict) {
+  if (results->rawlen <=
+      2 * (nbits + kGreeBlockFooterBits) + (kHeader + kFooter + 1) - 1 + offset)
     return false;  // Can't possibly be a valid Gree message.
   if (strict && nbits != kGreeBits)
     return false;  // Not strictly a Gree message.
 
-  uint16_t offset = kStartOffset;
-
   // There are two blocks back-to-back in a full Gree IR message
   // sequence.
 
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Gree.h b/lib/IRremoteESP8266-2.7.4/src/ir_Gree.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Gree.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Gree.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Haier.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Haier.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Haier.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Haier.cpp
index ac8be71ac..cac4320cf 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Haier.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Haier.cpp
@@ -853,6 +853,8 @@ String IRHaierACYRW02::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kHaierACBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -860,18 +862,16 @@ String IRHaierACYRW02::toString(void) {
 //
 // Status: STABLE / Known to be working.
 //
-bool IRrecv::decodeHaierAC(decode_results* results, uint16_t nbits,
-                           bool strict) {
+bool IRrecv::decodeHaierAC(decode_results* results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
   if (strict) {
     if (nbits != kHaierACBits)
       return false;  // Not strictly a HAIER_AC message.
   }
 
-  if (results->rawlen < (2 * nbits + kHeader) + kFooter - 1)
+  if (results->rawlen <= (2 * nbits + kHeader) + kFooter - 1 + offset)
     return false;  // Can't possibly be a valid HAIER_AC message.
 
-  uint16_t offset = kStartOffset;
-
   // Pre-Header
   if (!matchMark(results->rawbuf[offset++], kHaierAcHdr)) return false;
   if (!matchSpace(results->rawbuf[offset++], kHaierAcHdr)) return false;
@@ -903,6 +903,8 @@ bool IRrecv::decodeHaierAC(decode_results* results, uint16_t nbits,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kHaierACYRW02Bits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -910,15 +912,15 @@ bool IRrecv::decodeHaierAC(decode_results* results, uint16_t nbits,
 //
 // Status: BETA / Appears to be working.
 //
-bool IRrecv::decodeHaierACYRW02(decode_results* results, uint16_t nbits,
-                                bool strict) {
+bool IRrecv::decodeHaierACYRW02(decode_results* results, uint16_t offset,
+                                const uint16_t nbits, const bool strict) {
   if (strict) {
     if (nbits != kHaierACYRW02Bits)
       return false;  // Not strictly a HAIER_AC_YRW02 message.
   }
 
   // The protocol is almost exactly the same as HAIER_AC
-  if (!decodeHaierAC(results, nbits, false)) return false;
+  if (!decodeHaierAC(results, offset, nbits, false)) return false;
 
   // Compliance
   if (strict) {
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Haier.h b/lib/IRremoteESP8266-2.7.4/src/ir_Haier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Haier.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Haier.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Hitachi.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Hitachi.cpp
index fcbcb5fec..02489d010 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Hitachi.cpp
@@ -359,13 +359,15 @@ String IRHitachiAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //            Typically kHitachiAcBits, kHitachiAc1Bits, kHitachiAc2Bits
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
-// Status: ALPHA / Untested.
+// Status: BETA / Probably works.
 //
 // Supported devices:
 //  Hitachi A/C Series VI (Circa 2007) / Remote: LT0541-HTA
@@ -373,11 +375,10 @@ String IRHitachiAc::toString(void) {
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/417
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/453
-bool IRrecv::decodeHitachiAC(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
+bool IRrecv::decodeHitachiAC(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
   const uint8_t k_tolerance = _tolerance + 5;
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
-    return false;  // Can't possibly be a valid HitachiAC message.
+
   if (strict) {
     switch (nbits) {
       case kHitachiAcBits:
@@ -388,7 +389,6 @@ bool IRrecv::decodeHitachiAC(decode_results *results, const uint16_t nbits,
         return false;  // Not strictly a Hitachi message.
     }
   }
-  uint16_t offset = kStartOffset;
   uint16_t hmark;
   uint32_t hspace;
   if (nbits == kHitachiAc1Bits) {
@@ -475,6 +475,8 @@ void IRsend::sendHitachiAc424(const uint8_t data[], const uint16_t nbytes,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kHitachiAc424Bits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -489,14 +491,14 @@ void IRsend::sendHitachiAc424(const uint8_t data[], const uint16_t nbytes,
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/973
-bool IRrecv::decodeHitachiAc424(decode_results *results, const uint16_t nbits,
+bool IRrecv::decodeHitachiAc424(decode_results *results, uint16_t offset,
+                                const uint16_t nbits,
                                 const bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + kHeader + kFooter - 1)
+  if (results->rawlen < 2 * nbits + kHeader + kHeader + kFooter - 1 + offset)
     return false;  // Too short a message to match.
   if (strict && nbits != kHitachiAc424Bits)
     return false;
 
-  uint16_t offset = kStartOffset;
   uint16_t used;
 
   // Leader
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.h b/lib/IRremoteESP8266-2.7.4/src/ir_Hitachi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Hitachi.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Hitachi.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Inax.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Inax.cpp
similarity index 90%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Inax.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Inax.cpp
index 073580fae..9822e750b 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Inax.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Inax.cpp
@@ -49,6 +49,8 @@ void IRsend::sendInax(const uint64_t data, const uint16_t nbits,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kInaxBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -57,13 +59,12 @@ void IRsend::sendInax(const uint64_t data, const uint16_t nbits,
 //
 // Status: Stable / Known working.
 //
-bool IRrecv::decodeInax(decode_results *results, const uint16_t nbits,
-                        const bool strict) {
+bool IRrecv::decodeInax(decode_results *results, uint16_t offset,
+                        const uint16_t nbits, const bool strict) {
   if (strict && nbits != kInaxBits)
     return false;  // We expect Inax to be a certain sized message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_JVC.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_JVC.cpp
similarity index 93%
rename from lib/IRremoteESP8266-2.7.3/src/ir_JVC.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_JVC.cpp
index 7038e9d3e..128efdf08 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_JVC.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_JVC.cpp
@@ -92,6 +92,8 @@ uint16_t IRsend::encodeJVC(uint8_t address, uint8_t command) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits of data to expect. Typically kJvcBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -103,14 +105,14 @@ uint16_t IRsend::encodeJVC(uint8_t address, uint8_t command) {
 //   JVC repeat codes don't have a header.
 // Ref:
 //   http://www.sbprojects.com/knowledge/ir/jvc.php
-bool IRrecv::decodeJVC(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeJVC(decode_results *results, uint16_t offset,
+                       const uint16_t nbits, const bool strict) {
   if (strict && nbits != kJvcBits)
     return false;  // Must be called with the correct nr. of bits.
-  if (results->rawlen < 2 * nbits + kFooter - 1)
+  if (results->rawlen <= 2 * nbits + kFooter - 1 + offset)
     return false;  // Can't possibly be a valid JVC message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   bool isRepeat = true;
 
   // Header
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Kelvinator.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Kelvinator.cpp
index 320458b30..4a4fac276 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Kelvinator.cpp
@@ -414,22 +414,23 @@ String IRKelvinatorAC::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kKelvinatorBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: STABLE / Known working.
-bool IRrecv::decodeKelvinator(decode_results *results, uint16_t nbits,
-                              bool strict) {
-  if (results->rawlen <
-      2 * (nbits + kKelvinatorCmdFooterBits) + (kHeader + kFooter + 1) * 2 - 1)
+bool IRrecv::decodeKelvinator(decode_results *results, uint16_t offset,
+                              const uint16_t nbits, const bool strict) {
+  if (results->rawlen <=
+      2 * (nbits + kKelvinatorCmdFooterBits) + (kHeader + kFooter + 1) * 2 - 1 +
+      offset)
     return false;  // Can't possibly be a valid Kelvinator message.
   if (strict && nbits != kKelvinatorBits)
     return false;  // Not strictly a Kelvinator message.
 
-  uint16_t offset = kStartOffset;
-
   // There are two messages back-to-back in a full Kelvinator IR message
   // sequence.
   int8_t pos = 0;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.h b/lib/IRremoteESP8266-2.7.4/src/ir_Kelvinator.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Kelvinator.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Kelvinator.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_LG.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_LG.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_LG.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_LG.cpp
index ce0a36d3d..b30dba082 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_LG.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_LG.cpp
@@ -176,13 +176,15 @@ uint32_t IRsend::encodeLG(uint16_t address, uint16_t command) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kLgBits or kLg32Bits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
-// Status: BETA / Should work.
+// Status: STABLE / Working.
 //
 // Note:
 //   LG 32bit protocol appears near identical to the Samsung protocol.
@@ -193,19 +195,18 @@ uint32_t IRsend::encodeLG(uint16_t address, uint16_t command) {
 
 // Ref:
 //   https://funembedded.wordpress.com/2014/11/08/ir-remote-control-for-lg-conditioner-using-stm32f302-mcu-on-mbed-platform/
-bool IRrecv::decodeLG(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeLG(decode_results *results, uint16_t offset,
+                      const uint16_t nbits, const bool strict) {
   if (nbits >= kLg32Bits) {
-    if (results->rawlen < 2 * nbits + 2 * (kHeader + kFooter) - 1)
+    if (results->rawlen <= 2 * nbits + 2 * (kHeader + kFooter) - 1 + offset)
       return false;  // Can't possibly be a valid LG32 message.
   } else {
-    if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
+    if (results->rawlen <= 2 * nbits + kHeader - 1 + offset)
       return false;  // Can't possibly be a valid LG message.
   }
   if (strict && nbits != kLgBits && nbits != kLg32Bits)
     return false;  // Doesn't comply with expected LG protocol.
-
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   bool isLg2 = false;
 
   // Header
@@ -280,7 +281,6 @@ bool IRrecv::decodeLG(decode_results *results, uint16_t nbits, bool strict) {
 
   if (strict && (data & 0xF) != calcLGChecksum(command))
     return false;  // The last 4 bits sent are the expected checksum.
-
   // Success
   if (isLg2)
     results->decode_type = LG2;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_LG.h b/lib/IRremoteESP8266-2.7.4/src/ir_LG.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_LG.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_LG.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Lasertag.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Lasertag.cpp
similarity index 90%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Lasertag.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Lasertag.cpp
index f52b7477a..14a059084 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Lasertag.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Lasertag.cpp
@@ -56,6 +56,8 @@ void IRsend::sendLasertag(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -67,14 +69,13 @@ void IRsend::sendLasertag(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //   http://www.sbprojects.com/knowledge/ir/rc5.php
 //   https://en.wikipedia.org/wiki/RC-5
 //   https://en.wikipedia.org/wiki/Manchester_code
-bool IRrecv::decodeLasertag(decode_results *results, uint16_t nbits,
-                            bool strict) {
-  if (results->rawlen < kLasertagMinSamples) return false;
+bool IRrecv::decodeLasertag(decode_results *results, uint16_t offset,
+                            const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= kLasertagMinSamples + offset) return false;
 
   // Compliance
   if (strict && nbits != kLasertagBits) return false;
 
-  uint16_t offset = kStartOffset;
   uint16_t used = 0;
   uint64_t data = 0;
   uint16_t actual_bits = 0;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Lego.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Lego.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Lego.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Lego.cpp
index 932a568d0..502352218 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Lego.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Lego.cpp
@@ -67,20 +67,20 @@ void IRsend::sendLegoPf(const uint64_t data, const uint16_t nbits,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kLegoPfBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
-// Status: Alpha / Untested.
-bool IRrecv::decodeLegoPf(decode_results* results,
+// Status: BETA / Appears to work.
+bool IRrecv::decodeLegoPf(decode_results* results, uint16_t offset,
                           const uint16_t nbits, const bool strict) {
   // Check if can possibly be a valid LEGO message.
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1) return false;
   if (strict && nbits != kLegoPfBits) return false;  // Not what is expected
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Lutron.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Lutron.cpp
similarity index 93%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Lutron.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Lutron.cpp
index 7c9835047..094932e5d 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Lutron.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Lutron.cpp
@@ -58,6 +58,8 @@ void IRsend::sendLutron(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kLutronBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -69,8 +71,8 @@ void IRsend::sendLutron(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/515
-bool IRrecv::decodeLutron(decode_results *results, uint16_t nbits,
-                          bool strict) {
+bool IRrecv::decodeLutron(decode_results *results, uint16_t offset,
+                          const uint16_t nbits, const bool strict) {
   // Technically the smallest number of entries for the smallest message is '1'.
   // i.e. All the bits set to 1, would produce a single huge mark signal.
   // So no minimum length check is required.
@@ -81,8 +83,7 @@ bool IRrecv::decodeLutron(decode_results *results, uint16_t nbits,
   int16_t bitsSoFar = -1;
 
   if (nbits > sizeof(data) * 8) return false;  // To large to store the data.
-  for (uint16_t offset = kStartOffset;
-       bitsSoFar < nbits && offset < results->rawlen; offset++) {
+  for (; bitsSoFar < nbits && offset < results->rawlen; offset++) {
     uint16_t entry = results->rawbuf[offset];
     // It has to be large enough to qualify as a bit.
     if (!matchAtLeast(entry, kLutronTick, 0, kLutronDelta)) {
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_MWM.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_MWM.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_MWM.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_MWM.cpp
index b747b224b..eefc4a57e 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_MWM.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_MWM.cpp
@@ -74,6 +74,8 @@ void IRsend::sendMWM(const uint8_t data[], const uint16_t nbytes,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -81,16 +83,16 @@ void IRsend::sendMWM(const uint8_t data[], const uint16_t nbytes,
 //
 // Status: Implemented.
 //
-bool IRrecv::decodeMWM(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeMWM(decode_results *results, uint16_t offset,
+                       const uint16_t nbits, const bool strict) {
   DPRINTLN("DEBUG: decodeMWM");
 
   // Compliance
-  if (results->rawlen < kMWMMinSamples) {
+  if (results->rawlen <= kMWMMinSamples + offset) {
     DPRINTLN("DEBUG: decodeMWM: too few samples");
     return false;
   }
 
-  uint16_t offset = kStartOffset;
   uint16_t used = 0;
   uint64_t data = 0;
   uint16_t frame_bits = 0;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Magiquest.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Magiquest.cpp
index 863aa0ec3..2c15612f4 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Magiquest.cpp
@@ -67,6 +67,8 @@ uint64_t IRsend::encodeMagiQuest(uint32_t wand_id, uint16_t magnitude) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion, inc. the 8 bit header.
 //            Typically kMagiquestBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -77,17 +79,16 @@ uint64_t IRsend::encodeMagiQuest(uint32_t wand_id, uint16_t magnitude) {
 //
 // Ref:
 //   https://github.com/kitlaan/Arduino-IRremote/blob/master/ir_Magiquest.cpp
-bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t nbits,
-                             bool strict) {
+bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
   uint16_t bits = 0;
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
-  if (results->rawlen < (2 * kMagiquestBits)) {
+  if (results->rawlen < (2 * kMagiquestBits) + offset - 1) {
     DPRINT("Not enough bits to be Magiquest - Rawlen: ");
     DPRINT(results->rawlen);
     DPRINT(" Expected: ");
-    DPRINTLN((2 * kMagiquestBits));
+    DPRINTLN(2 * kMagiquestBits + offset - 1);
     return false;
   }
 
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.h b/lib/IRremoteESP8266-2.7.4/src/ir_Magiquest.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Magiquest.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Magiquest.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Midea.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Midea.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Midea.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Midea.cpp
index ce373ebfe..bbf9bedfa 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Midea.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Midea.cpp
@@ -64,7 +64,7 @@ void IRsend::sendMidea(uint64_t data, uint16_t nbits, uint16_t repeat) {
   enableIROut(38);
 
   for (uint16_t r = 0; r <= repeat; r++) {
-    // The protcol sends the message, then follows up with an entirely
+    // The protocol sends the message, then follows up with an entirely
     // inverted payload.
     for (size_t inner_loop = 0; inner_loop < 2; inner_loop++) {
       // Header
@@ -397,6 +397,8 @@ String IRMideaAC::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kMideaBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -404,7 +406,8 @@ String IRMideaAC::toString(void) {
 //
 // Status: Alpha / Needs testing against a real device.
 //
-bool IRrecv::decodeMidea(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeMidea(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict) {
   uint8_t min_nr_of_messages = 1;
   if (strict) {
     if (nbits != kMideaBits) return false;  // Not strictly a MIDEA message.
@@ -414,12 +417,11 @@ bool IRrecv::decodeMidea(decode_results *results, uint16_t nbits, bool strict) {
   // The protocol sends the data normal + inverted, alternating on
   // each byte. Hence twice the number of expected data bits.
   if (results->rawlen <
-      min_nr_of_messages * (2 * nbits + kHeader + kFooter) - 1)
+      min_nr_of_messages * (2 * nbits + kHeader + kFooter) - 1 + offset)
     return false;  // Can't possibly be a valid MIDEA message.
 
   uint64_t data = 0;
   uint64_t inverted = 0;
-  uint16_t offset = kStartOffset;
 
   if (nbits > sizeof(data) * 8)
     return false;  // We can't possibly capture a Midea packet that big.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Midea.h b/lib/IRremoteESP8266-2.7.4/src/ir_Midea.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Midea.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Midea.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Mitsubishi.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Mitsubishi.cpp
index cf5c573fc..68098f40a 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Mitsubishi.cpp
@@ -127,6 +127,8 @@ void IRsend::sendMitsubishi(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -139,12 +141,11 @@ void IRsend::sendMitsubishi(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   GlobalCache's Control Tower's Mitsubishi TV data.
-bool IRrecv::decodeMitsubishi(decode_results *results, uint16_t nbits,
-                              bool strict) {
+bool IRrecv::decodeMitsubishi(decode_results *results, uint16_t offset,
+                              const uint16_t nbits, const bool strict) {
   if (strict && nbits != kMitsubishiBits)
     return false;  // Request is out of spec.
 
-  uint16_t offset = kStartOffset;
   uint64_t data = 0;
 
   // Match Data + Footer
@@ -206,6 +207,8 @@ void IRsend::sendMitsubishi2(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -219,14 +222,13 @@ void IRsend::sendMitsubishi2(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/441
-bool IRrecv::decodeMitsubishi2(decode_results *results, uint16_t nbits,
-                               bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + (kFooter * 2) - 1)
+bool IRrecv::decodeMitsubishi2(decode_results *results, uint16_t offset,
+                               const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= 2 * nbits + kHeader + (kFooter * 2) - 1 + offset)
     return false;  // Shorter than shortest possibly expected.
   if (strict && nbits != kMitsubishiBits)
     return false;  // Request is out of spec.
 
-  uint16_t offset = kStartOffset;
   results->value = 0;
 
   // Header
@@ -287,6 +289,8 @@ void IRsend::sendMitsubishiAC(const unsigned char data[], const uint16_t nbytes,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -296,9 +300,10 @@ void IRsend::sendMitsubishiAC(const unsigned char data[], const uint16_t nbytes,
 //
 // Ref:
 // https://www.analysir.com/blog/2015/01/06/reverse-engineering-mitsubishi-ac-infrared-protocol/
-bool IRrecv::decodeMitsubishiAC(decode_results *results, uint16_t nbits,
-                                bool strict) {
-  if (results->rawlen < ((kMitsubishiACBits * 2) + 2)) {
+bool IRrecv::decodeMitsubishiAC(decode_results *results, uint16_t offset,
+                                const uint16_t nbits,
+                                const bool strict) {
+  if (results->rawlen <= ((kMitsubishiACBits * 2) + 2) + offset) {
     DPRINTLN("Shorter than shortest possibly expected.");
     return false;  // Shorter than shortest possibly expected.
   }
@@ -306,10 +311,7 @@ bool IRrecv::decodeMitsubishiAC(decode_results *results, uint16_t nbits,
     DPRINTLN("Request is out of spec.");
     return false;  // Request is out of spec.
   }
-  uint16_t offset = kStartOffset;
-  for (uint8_t i = 0; i < kMitsubishiACStateLength; i++) {
-    results->state[i] = 0;
-  }
+  for (uint8_t i = 0; i < kMitsubishiACStateLength; i++) results->state[i] = 0;
   bool failure = false;
   uint8_t rep = 0;
   do {
@@ -825,6 +827,8 @@ void IRsend::sendMitsubishi136(const unsigned char data[],
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -834,16 +838,15 @@ void IRsend::sendMitsubishi136(const unsigned char data[],
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/888
-bool IRrecv::decodeMitsubishi136(decode_results *results, const uint16_t nbits,
+bool IRrecv::decodeMitsubishi136(decode_results *results, uint16_t offset,
+                                 const uint16_t nbits,
                                  const bool strict) {
-  // Too short to match?
-  if (results->rawlen < (2 * nbits) + kHeader + kFooter - 1) return false;
   if (nbits % 8 != 0) return false;  // Not a multiple of an 8 bit byte.
   if (strict) {  // Do checks to see if it matches the spec.
     if (nbits != kMitsubishi136Bits) return false;
   }
-  uint16_t used = matchGeneric(results->rawbuf + kStartOffset, results->state,
-                               results->rawlen - kStartOffset, nbits,
+  uint16_t used = matchGeneric(results->rawbuf + offset, results->state,
+                               results->rawlen - offset, nbits,
                                kMitsubishi136HdrMark, kMitsubishi136HdrSpace,
                                kMitsubishi136BitMark, kMitsubishi136OneSpace,
                                kMitsubishi136BitMark, kMitsubishi136ZeroSpace,
@@ -1174,6 +1177,8 @@ void IRsend::sendMitsubishi112(const unsigned char data[],
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -1191,14 +1196,14 @@ void IRsend::sendMitsubishi112(const unsigned char data[],
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/619
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/947
-bool IRrecv::decodeMitsubishi112(decode_results *results, const uint16_t nbits,
-                                 const bool strict) {
-  if (results->rawlen < ((2 * nbits) + kHeader + kFooter - 1)) return false;
+bool IRrecv::decodeMitsubishi112(decode_results *results, uint16_t offset,
+                                 const uint16_t nbits, const bool strict) {
+  if (results->rawlen < (2 * nbits) + kHeader + kFooter - 1 + offset)
+    return false;
   if (nbits % 8 != 0) return false;  // Not a multiple of an 8 bit byte.
   if (strict) {  // Do checks to see if it matches the spec.
     if (nbits != kMitsubishi112Bits && nbits != kTcl112AcBits) return false;
   }
-  uint16_t offset = kStartOffset;
   decode_type_t typeguess = decode_type_t::UNKNOWN;
   uint16_t hdrspace;
   uint16_t bitmark;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.h b/lib/IRremoteESP8266-2.7.4/src/ir_Mitsubishi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Mitsubishi.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Mitsubishi.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_MitsubishiHeavy.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_MitsubishiHeavy.cpp
index cc6d066f3..39bd3d8d6 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_MitsubishiHeavy.cpp
@@ -959,17 +959,17 @@ String IRMitsubishiHeavy88Ac::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
-//            Typically kMitsubishiHeavy88Bits or kMitsubishiHeavy152Bits.
+//            Typically kMitsubishiHeavy88Bits or kMitsubishiHeavy152Bits (def).
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: BETA / Appears to be working. Needs testing against a real device.
-bool IRrecv::decodeMitsubishiHeavy(decode_results* results,
+bool IRrecv::decodeMitsubishiHeavy(decode_results* results, uint16_t offset,
                                    const uint16_t nbits, const bool strict) {
-  // Check if can possibly be a valid MitsubishiHeavy message.
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1) return false;
   if (strict) {
     switch (nbits) {
       case kMitsubishiHeavy88Bits:
@@ -980,7 +980,6 @@ bool IRrecv::decodeMitsubishiHeavy(decode_results* results,
     }
   }
 
-  uint16_t offset = kStartOffset;
   uint16_t used;
   used = matchGeneric(results->rawbuf + offset, results->state,
                       results->rawlen - offset, nbits,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.h b/lib/IRremoteESP8266-2.7.4/src/ir_MitsubishiHeavy.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_MitsubishiHeavy.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_MitsubishiHeavy.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_NEC.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_NEC.cpp
similarity index 89%
rename from lib/IRremoteESP8266-2.7.3/src/ir_NEC.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_NEC.cpp
index 03f68c1d9..2f870f58c 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_NEC.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_NEC.cpp
@@ -68,6 +68,8 @@ uint32_t IRsend::encodeNEC(uint16_t address, uint16_t command) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kNECBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -85,22 +87,22 @@ uint32_t IRsend::encodeNEC(uint16_t address, uint16_t command) {
 //
 // Ref:
 //   http://www.sbprojects.com/knowledge/ir/nec.php
-bool IRrecv::decodeNEC(decode_results *results, uint16_t nbits, bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1 &&
-      results->rawlen != kNecRptLength)
+bool IRrecv::decodeNEC(decode_results *results, uint16_t offset,
+                       const uint16_t nbits, const bool strict) {
+  if (results->rawlen < kNecRptLength + offset - 1)
     return false;  // Can't possibly be a valid NEC message.
   if (strict && nbits != kNECBits)
     return false;  // Not strictly an NEC message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
-  // Header
+  // Header - All NEC messages have this Header Mark.
   if (!matchMark(results->rawbuf[offset++], kNecHdrMark)) return false;
   // Check if it is a repeat code.
-  if (results->rawlen == kNecRptLength &&
-      matchSpace(results->rawbuf[offset], kNecRptSpace) &&
-      matchMark(results->rawbuf[offset + 1], kNecBitMark)) {
+  if (matchSpace(results->rawbuf[offset], kNecRptSpace) &&
+      matchMark(results->rawbuf[offset + 1], kNecBitMark) &&
+      (offset + 2 <= results->rawlen ||
+       matchAtLeast(results->rawbuf[offset + 2], kNecMinGap))) {
     results->value = kRepeat;
     results->decode_type = NEC;
     results->bits = 0;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_NEC.h b/lib/IRremoteESP8266-2.7.4/src/ir_NEC.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_NEC.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_NEC.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Neoclima.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Neoclima.cpp
index 8b944293e..0e410ca67 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Neoclima.cpp
@@ -463,6 +463,8 @@ String IRNeoclimaAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect. Typically kNeoclimaBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -472,13 +474,12 @@ String IRNeoclimaAc::toString(void) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/764
-bool IRrecv::decodeNeoclima(decode_results *results, const uint16_t nbits,
-                            const bool strict) {
+bool IRrecv::decodeNeoclima(decode_results *results, uint16_t offset,
+                            const uint16_t nbits, const bool strict) {
   // Compliance
   if (strict && nbits != kNeoclimaBits)
     return false;  // Incorrect nr. of bits per spec.
 
-  uint16_t offset = kStartOffset;
   // Match Main Header + Data + Footer
   uint16_t used;
   used = matchGeneric(results->rawbuf + offset, results->state,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.h b/lib/IRremoteESP8266-2.7.4/src/ir_Neoclima.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Neoclima.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Neoclima.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Nikai.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Nikai.cpp
similarity index 90%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Nikai.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Nikai.cpp
index 12e99c278..5e6f9fbe5 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Nikai.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Nikai.cpp
@@ -48,6 +48,8 @@ void IRsend::sendNikai(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kNikaiBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -56,12 +58,12 @@ void IRsend::sendNikai(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Status: STABLE / Working.
 //
-bool IRrecv::decodeNikai(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeNikai(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict) {
   if (strict && nbits != kNikaiBits)
     return false;  // We expect Nikai to be a certain sized message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Panasonic.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Panasonic.cpp
index 511986a11..bf472de88 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Panasonic.cpp
@@ -142,6 +142,8 @@ uint64_t IRsend::encodePanasonic(const uint16_t manufacturer,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -153,13 +155,13 @@ uint64_t IRsend::encodePanasonic(const uint16_t manufacturer,
 // Ref:
 //   http://www.remotecentral.com/cgi-bin/mboard/rc-pronto/thread.cgi?26152
 //   http://www.hifi-remote.com/wiki/index.php?title=Panasonic
-bool IRrecv::decodePanasonic(decode_results *results, const uint16_t nbits,
-                             const bool strict, const uint32_t manufacturer) {
+bool IRrecv::decodePanasonic(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict,
+                             const uint32_t manufacturer) {
   if (strict && nbits != kPanasonicBits)
     return false;  // Request is out of spec.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
@@ -810,6 +812,8 @@ String IRPanasonicAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kPanasonicAcBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -825,20 +829,18 @@ String IRPanasonicAc::toString(void) {
 //   A/C Remotes:
 //     A75C3747 (Confirmed)
 //     A75C3704
-bool IRrecv::decodePanasonicAC(decode_results *results, const uint16_t nbits,
-                               const bool strict) {
+bool IRrecv::decodePanasonicAC(decode_results *results, uint16_t offset,
+                               const uint16_t nbits, const bool strict) {
   uint8_t min_nr_of_messages = 1;
   if (strict) {
     if (nbits != kPanasonicAcBits && nbits != kPanasonicAcShortBits)
       return false;  // Not strictly a PANASONIC_AC message.
   }
 
-  if (results->rawlen <
-      min_nr_of_messages * (2 * nbits + kHeader + kFooter) - 1)
+  if (results->rawlen <=
+      min_nr_of_messages * (2 * nbits + kHeader + kFooter) - 1 + offset)
     return false;  // Can't possibly be a valid PANASONIC_AC message.
 
-  uint16_t offset = kStartOffset;
-
   // Match Header + Data #1 + Footer
   uint16_t used;
   used = matchGeneric(results->rawbuf + offset, results->state,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.h b/lib/IRremoteESP8266-2.7.4/src/ir_Panasonic.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Panasonic.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Panasonic.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Pioneer.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Pioneer.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Pioneer.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Pioneer.cpp
index 490ea9440..85343a117 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Pioneer.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Pioneer.cpp
@@ -96,6 +96,8 @@ uint64_t IRsend::encodePioneer(const uint16_t address, const uint16_t command) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kPioneerBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -103,15 +105,14 @@ uint64_t IRsend::encodePioneer(const uint16_t address, const uint16_t command) {
 //
 // Status: BETA / Should be working. (Self decodes & real examples)
 //
-bool IRrecv::decodePioneer(decode_results *results, const uint16_t nbits,
-                           const bool strict) {
-  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1)
+bool IRrecv::decodePioneer(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1 + offset)
     return false;  // Can't possibly be a valid Pioneer message.
   if (strict && nbits != kPioneerBits)
     return false;  // Not strictly an Pioneer message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   results->value = 0;
   for (uint16_t section = 0; section < 2; section++) {
     // Match Header + Data + Footer
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Pronto.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Pronto.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Pronto.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Pronto.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_RC5_RC6.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_RC5_RC6.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.3/src/ir_RC5_RC6.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_RC5_RC6.cpp
index b79416692..ce69aaa3a 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_RC5_RC6.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_RC5_RC6.cpp
@@ -347,6 +347,8 @@ int16_t IRrecv::getRClevel(decode_results *results, uint16_t *offset,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -363,14 +365,14 @@ int16_t IRrecv::getRClevel(decode_results *results, uint16_t *offset,
 //   https://en.wikipedia.org/wiki/Manchester_code
 // TODO(anyone):
 //   Serious testing of the RC-5X and strict aspects needs to be done.
-bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
-  if (results->rawlen < kRc5SamplesMin + kHeader - 1) return false;
+bool IRrecv::decodeRC5(decode_results *results, uint16_t offset,
+                       const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= kRc5SamplesMin + kHeader - 1 + offset) return false;
 
   // Compliance
   if (strict && nbits != kRC5Bits && nbits != kRC5XBits)
     return false;  // It's neither RC-5 or RC-5X.
 
-  uint16_t offset = kStartOffset;
   uint16_t used = 0;
   bool is_rc5x = false;
   uint64_t data = 0;
@@ -432,6 +434,8 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -444,8 +448,10 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
 //   https://en.wikipedia.org/wiki/Manchester_code
 // TODO(anyone):
 //   Testing of the strict compliance aspects.
-bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
-  if (results->rawlen < kHeader + 2 + 4)  // Up to the double-wide T bit.
+bool IRrecv::decodeRC6(decode_results *results, uint16_t offset,
+                       const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= kHeader + 2 + 4 + offset)
+    // Up to the double-wide T bit.
     return false;  // Smaller than absolute smallest possible RC6 message.
 
   if (strict) {  // Compliance
@@ -455,7 +461,7 @@ bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
     // Also due to potential melding with the start bit, we can only count
     // the start bit as 1, instead of a more typical 2 value. The header still
     // remains as normal.
-    if (results->rawlen < nbits + kHeader + 1)
+    if (results->rawlen <= nbits + kHeader + 1 + offset)
       return false;  // Don't have enough entries/samples to be valid.
     switch (nbits) {
       case kRC6Mode0Bits:
@@ -466,8 +472,6 @@ bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
     }
   }
 
-  uint16_t offset = kStartOffset;
-
   // Header
   if (!matchMark(results->rawbuf[offset], kRc6HdrMark)) return false;
   // Calculate how long the common tick time is based on the header mark.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_RCMM.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_RCMM.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_RCMM.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_RCMM.cpp
index 4e8f43891..a2542e467 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_RCMM.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_RCMM.cpp
@@ -95,6 +95,8 @@ void IRsend::sendRCMM(uint64_t data, uint16_t nbits, uint16_t repeat) {
 // Places successful decode information in the results pointer.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. Typically kRCMMBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -104,11 +106,11 @@ void IRsend::sendRCMM(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   http://www.sbprojects.com/knowledge/ir/rcmm.php
-bool IRrecv::decodeRCMM(decode_results *results, uint16_t nbits, bool strict) {
+bool IRrecv::decodeRCMM(decode_results *results, uint16_t offset,
+                        const uint16_t nbits, const bool strict) {
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
-  if (results->rawlen <= 4)
+  if (results->rawlen <= 4 + offset - 1)
     return false;  // Not enough entries to ever be RCMM.
 
   // Calc the maximum size in bits, the message can be, or that we can accept.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Samsung.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Samsung.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Samsung.cpp
index 1ca7a2b4a..a31e76953 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Samsung.cpp
@@ -109,6 +109,8 @@ uint32_t IRsend::encodeSAMSUNG(const uint8_t customer, const uint8_t command) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. Typically kSamsungBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -121,15 +123,12 @@ uint32_t IRsend::encodeSAMSUNG(const uint8_t customer, const uint8_t command) {
 //   They differ on their compliance criteria and how they repeat.
 // Ref:
 //  http://elektrolab.wz.cz/katalog/samsung_protocol.pdf
-bool IRrecv::decodeSAMSUNG(decode_results *results, const uint16_t nbits,
-                           const bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
-    return false;  // Can't possibly be a valid Samsung message.
+bool IRrecv::decodeSAMSUNG(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
   if (strict && nbits != kSamsungBits)
     return false;  // We expect Samsung to be 32 bits of message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
@@ -201,6 +200,8 @@ void IRsend::sendSamsung36(const uint64_t data, const uint16_t nbits,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion.
 //            Typically kSamsung36Bits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
@@ -214,9 +215,9 @@ void IRsend::sendSamsung36(const uint64_t data, const uint16_t nbits,
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/621
-bool IRrecv::decodeSamsung36(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + kFooter * 2 - 1)
+bool IRrecv::decodeSamsung36(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * nbits + kHeader + kFooter * 2 - 1 + offset)
     return false;  // Can't possibly be a valid Samsung message.
   // We need to be looking for > 16 bits to make sense.
   if (nbits <= 16) return false;
@@ -224,7 +225,6 @@ bool IRrecv::decodeSamsung36(decode_results *results, const uint16_t nbits,
     return false;  // We expect nbits to be 36 bits of message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Header + Data + Footer
   uint16_t used;
@@ -570,6 +570,22 @@ void IRSamsungAc::setPowerful(const bool on) {
   }
 }
 
+bool IRSamsungAc::getDisplay(void) {
+  return GETBIT8(remote_state[10], kSamsungAcDisplayOffset);
+}
+
+void IRSamsungAc::setDisplay(const bool on) {
+  setBit(&remote_state[10], kSamsungAcDisplayOffset, on);
+}
+
+bool IRSamsungAc::getIon(void) {
+  return GETBIT8(remote_state[11], kSamsungAcIonOffset);
+}
+
+void IRSamsungAc::setIon(const bool on) {
+  setBit(&remote_state[11], kSamsungAcIonOffset, on);
+}
+
 // Convert a standard A/C mode into its native mode.
 uint8_t IRSamsungAc::convertMode(const stdAc::opmode_t mode) {
   switch (mode) {
@@ -631,11 +647,11 @@ stdAc::state_t IRSamsungAc::toCommon(void) {
   result.turbo = this->getPowerful();
   result.clean = this->getClean();
   result.beep = this->getBeep();
+  result.light = this->getDisplay();
+  result.filter = this->getIon();
   // Not supported.
   result.swingh = stdAc::swingh_t::kOff;
   result.econo = false;
-  result.filter = false;
-  result.light = false;
   result.sleep = -1;
   result.clock = -1;
   return result;
@@ -644,7 +660,7 @@ stdAc::state_t IRSamsungAc::toCommon(void) {
 // Convert the internal state into a human readable string.
 String IRSamsungAc::toString(void) {
   String result = "";
-  result.reserve(100);  // Reserve some heap for the string to reduce fragging.
+  result.reserve(115);  // Reserve some heap for the string to reduce fragging.
   result += addBoolToString(getPower(), kPowerStr, false);
   result += addModeToString(getMode(), kSamsungAcAuto, kSamsungAcCool,
                             kSamsungAcHeat, kSamsungAcDry,
@@ -679,6 +695,8 @@ String IRSamsungAc::toString(void) {
   result += addBoolToString(getClean(), kCleanStr);
   result += addBoolToString(getQuiet(), kQuietStr);
   result += addBoolToString(getPowerful(), kPowerfulStr);
+  result += addBoolToString(getDisplay(), kLightStr);
+  result += addBoolToString(getIon(), kIonStr);
   return result;
 }
 
@@ -687,6 +705,8 @@ String IRSamsungAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kSamsungAcBits
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -696,14 +716,12 @@ String IRSamsungAc::toString(void) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/505
-bool IRrecv::decodeSamsungAC(decode_results *results, const uint16_t nbits,
-                             const bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader * 3 + kFooter * 2 - 1)
+bool IRrecv::decodeSamsungAC(decode_results *results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * nbits + kHeader * 3 + kFooter * 2 - 1 + offset)
     return false;  // Can't possibly be a valid Samsung A/C message.
   if (nbits != kSamsungAcBits && nbits != kSamsungAcExtendedBits) return false;
 
-  uint16_t offset = kStartOffset;
-
   // Message Header
   if (!matchMark(results->rawbuf[offset++], kSamsungAcBitMark)) return false;
   if (!matchSpace(results->rawbuf[offset++], kSamsungAcHdrSpace)) return false;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.h b/lib/IRremoteESP8266-2.7.4/src/ir_Samsung.h
similarity index 93%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Samsung.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Samsung.h
index de2172444..52a781b65 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Samsung.h
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Samsung.h
@@ -18,7 +18,9 @@
 
 // Supports:
 //   Brand: Samsung,  Model: UA55H6300 TV
+//   Brand: Samsung,  Model: DB63-03556X003 remote
 //   Brand: Samsung,  Model: IEC-R03 remote
+//   Brand: Samsung,  Model: AR09FSSDAWKNFA A/C
 //   Brand: Samsung,  Model: AR12KSFPEWQNET A/C
 //   Brand: Samsung,  Model: AR12HSSDBWKNEU A/C
 
@@ -58,6 +60,8 @@ const uint8_t kSamsungAcQuiet5Offset = 5;
 const uint8_t kSamsungAcPowerfulMask8 = 0b01010000;
 const uint8_t kSamsungAcPowerful10Offset = 1;  // Mask 0b00000110
 const uint8_t kSamsungAcPowerful10Size = 1;  // Mask 0b00000110
+const uint8_t kSamsungAcDisplayOffset = 4;  // Mask 0b00010000
+const uint8_t kSamsungAcIonOffset = 0;  // Mask 0b00000001
 
 const uint16_t kSamsungACSectionLength = 7;
 const uint64_t kSamsungAcPowerSection = 0x1D20F00000000;
@@ -99,6 +103,12 @@ class IRSamsungAc {
   bool getQuiet(void);
   void setPowerful(const bool on);
   bool getPowerful(void);
+
+  void setDisplay(const bool on);
+  bool getDisplay(void);
+  void setIon(const bool on);
+  bool getIon(void);
+
   uint8_t* getRaw(void);
   void setRaw(const uint8_t new_code[],
               const uint16_t length = kSamsungAcStateLength);
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Sanyo.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Sanyo.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Sanyo.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Sanyo.cpp
index b05e76766..f797fb678 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Sanyo.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Sanyo.cpp
@@ -96,7 +96,7 @@ uint64_t IRsend::encodeSanyoLC7461(uint16_t address, uint8_t command) {
 //   https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Sanyo.cpp
 //   http://pdf.datasheetcatalog.com/datasheet/sanyo/LC7461.pdf
 void IRsend::sendSanyoLC7461(uint64_t data, uint16_t nbits, uint16_t repeat) {
-  // This protocol appears to be another 42-bit variant of the NEC protcol.
+  // This protocol appears to be another 42-bit variant of the NEC protocol.
   sendNEC(data, nbits, repeat);
 }
 #endif  // SEND_SANYO
@@ -106,6 +106,8 @@ void IRsend::sendSanyoLC7461(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -123,12 +125,12 @@ void IRsend::sendSanyoLC7461(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //   http://slydiman.narod.ru/scr/kb/sanyo.htm
 //   https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Sanyo.cpp
 //   http://pdf.datasheetcatalog.com/datasheet/sanyo/LC7461.pdf
-bool IRrecv::decodeSanyoLC7461(decode_results *results, uint16_t nbits,
-                               bool strict) {
+bool IRrecv::decodeSanyoLC7461(decode_results *results, uint16_t offset,
+                               const uint16_t nbits, const bool strict) {
   if (strict && nbits != kSanyoLC7461Bits)
     return false;  // Not strictly in spec.
   // This protocol is basically a 42-bit variant of the NEC protocol.
-  if (!decodeNEC(results, nbits, false))
+  if (!decodeNEC(results, offset, nbits, false))
     return false;  // Didn't match a NEC format (without strict)
 
   // Bits 30 to 42+.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Sharp.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Sharp.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Sharp.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Sharp.cpp
index abd93ecf6..f28ca0f4d 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Sharp.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Sharp.cpp
@@ -168,6 +168,8 @@ void IRsend::sendSharp(const uint16_t address, uint16_t const command,
 //
 // Args:
 //   results:   Ptr to the data to decode and where to store the decode result.
+//   offset:    The starting index to use when attempting to decode the raw data
+//              Typically/Defaults to kStartOffset.
 //   nbits:     Nr. of data bits to expect. Typically kSharpBits.
 //   strict:    Flag indicating if we should perform strict matching.
 //   expansion: Should we expect the expansion bit to be set. Default is true.
@@ -185,9 +187,10 @@ void IRsend::sendSharp(const uint16_t address, uint16_t const command,
 //   http://www.sbprojects.com/knowledge/ir/sharp.php
 //   http://www.mwftr.com/ucF08/LEC14%20PIC%20IR.pdf
 //   http://www.hifi-remote.com/johnsfine/DecodeIR.html#Sharp
-bool IRrecv::decodeSharp(decode_results *results, const uint16_t nbits,
-                         const bool strict, const bool expansion) {
-  if (results->rawlen < 2 * nbits + kFooter - 1)
+bool IRrecv::decodeSharp(decode_results *results, uint16_t offset,
+                         const uint16_t nbits, const bool strict,
+                         const bool expansion) {
+  if (results->rawlen <= 2 * nbits + kFooter - 1 + offset)
     return false;  // Not enough entries to be a Sharp message.
   // Compliance
   if (strict) {
@@ -196,12 +199,12 @@ bool IRrecv::decodeSharp(decode_results *results, const uint16_t nbits,
 #ifdef UNIT_TEST
     // An in spec message has the data sent normally, then inverted. So we
     // expect twice as many entries than to just get the results.
-    if (results->rawlen < 2 * (2 * nbits + kFooter)) return false;
+    if (results->rawlen <= (2 * (2 * nbits + kFooter)) - 1 + offset)
+      return false;
 #endif
   }
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   // Match Data + Footer
   uint16_t used;
@@ -496,6 +499,8 @@ String IRSharpAc::toString(void) {
 // Decode the supplied Sharp A/C message.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of bits to expect in the data portion. (kSharpAcBits)
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -506,16 +511,11 @@ String IRSharpAc::toString(void) {
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/638
 //   https://github.com/ToniA/arduino-heatpumpir/blob/master/SharpHeatpumpIR.cpp
-bool IRrecv::decodeSharpAc(decode_results *results, const uint16_t nbits,
-                           const bool strict) {
-  // Is there enough data to match successfully?
-  if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
-    return false;
-
+bool IRrecv::decodeSharpAc(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
   // Compliance
   if (strict && nbits != kSharpAcBits) return false;
 
-  uint16_t offset = kStartOffset;
   // Match Header + Data + Footer
   uint16_t used;
   used = matchGeneric(results->rawbuf + offset, results->state,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Sharp.h b/lib/IRremoteESP8266-2.7.4/src/ir_Sharp.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Sharp.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Sharp.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Sherwood.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Sherwood.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Sherwood.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Sherwood.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Sony.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Sony.cpp
index d0f4b3c7a..c346eb293 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Sony.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Sony.cpp
@@ -134,6 +134,8 @@ uint32_t IRsend::encodeSony(uint16_t nbits, uint16_t command, uint16_t address,
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -145,8 +147,9 @@ uint32_t IRsend::encodeSony(uint16_t nbits, uint16_t command, uint16_t address,
 //   SONY protocol, SIRC (Serial Infra-Red Control) can be 12,15,20 bits long.
 // Ref:
 // http://www.sbprojects.com/knowledge/ir/sirc.php
-bool IRrecv::decodeSony(decode_results *results, uint16_t nbits, bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader - 1)
+bool IRrecv::decodeSony(decode_results *results, uint16_t offset,
+                        const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= 2 * nbits + kHeader - 1 + offset)
     return false;  // Message is smaller than we expected.
 
   // Compliance
@@ -162,7 +165,6 @@ bool IRrecv::decodeSony(decode_results *results, uint16_t nbits, bool strict) {
   }
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   uint16_t actualBits;
 
   // Header
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Tcl.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Tcl.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Tcl.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Tcl.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Tcl.h b/lib/IRremoteESP8266-2.7.4/src/ir_Tcl.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Tcl.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Tcl.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Teco.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Teco.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Teco.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Teco.cpp
index 200f1954d..8e33e04ec 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Teco.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Teco.cpp
@@ -298,18 +298,19 @@ String IRTecoAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kTecoBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
 //   boolean: True if it can decode it, false if it can't.
 //
 // Status: STABLE / Tested.
-bool IRrecv::decodeTeco(decode_results* results,
+bool IRrecv::decodeTeco(decode_results* results, uint16_t offset,
                         const uint16_t nbits, const bool strict) {
   if (strict && nbits != kTecoBits) return false;  // Not what is expected
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
   // Match Header + Data + Footer
   if (!matchGeneric(results->rawbuf + offset, &data,
                     results->rawlen - offset, nbits,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Teco.h b/lib/IRremoteESP8266-2.7.4/src/ir_Teco.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Teco.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Teco.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Toshiba.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Toshiba.cpp
index ba1ca5424..3113e1b09 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Toshiba.cpp
@@ -316,6 +316,8 @@ String IRToshibaAC::toString(void) {
 // Places successful decode information in the results pointer.
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kToshibaACBits.
 //   strict:  Flag to indicate if we strictly adhere to the specification.
 // Returns:
@@ -325,10 +327,8 @@ String IRToshibaAC::toString(void) {
 //
 // Ref:
 //
-bool IRrecv::decodeToshibaAC(decode_results* results, const uint16_t nbits,
-                             const bool strict) {
-  uint16_t offset = kStartOffset;
-
+bool IRrecv::decodeToshibaAC(decode_results* results, uint16_t offset,
+                             const uint16_t nbits, const bool strict) {
   // Compliance
   if (strict && nbits != kToshibaACBits)
     return false;  // Must be called with the correct nr. of bytes.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.h b/lib/IRremoteESP8266-2.7.4/src/ir_Toshiba.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Toshiba.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Toshiba.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Trotec.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Trotec.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Trotec.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Trotec.cpp
index cb923b5fc..563564d36 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Trotec.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Trotec.cpp
@@ -238,6 +238,8 @@ String IRTrotecESP::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kTrotecBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -246,13 +248,12 @@ String IRTrotecESP::toString(void) {
 // Status: BETA / Probably works. Untested on real devices.
 //
 // Ref:
-bool IRrecv::decodeTrotec(decode_results *results, const uint16_t nbits,
-                          const bool strict) {
-  if (results->rawlen < 2 * nbits + kHeader + 2 * kFooter - 1)
+bool IRrecv::decodeTrotec(decode_results *results, uint16_t offset,
+                          const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= 2 * nbits + kHeader + 2 * kFooter - 1 + offset)
     return false;  // Can't possibly be a valid Samsung A/C message.
   if (strict && nbits != kTrotecBits) return false;
 
-  uint16_t offset = kStartOffset;
   uint16_t used;
   // Header + Data + Footer #1
   used = matchGeneric(results->rawbuf + offset, results->state,
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Trotec.h b/lib/IRremoteESP8266-2.7.4/src/ir_Trotec.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Trotec.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Trotec.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Vestel.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Vestel.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Vestel.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Vestel.cpp
index c2a3a905b..4378497e0 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Vestel.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Vestel.cpp
@@ -512,6 +512,8 @@ String IRVestelAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kVestelBits.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -519,8 +521,8 @@ String IRVestelAc::toString(void) {
 //
 // Status: Alpha / Needs testing against a real device.
 //
-bool IRrecv::decodeVestelAc(decode_results* results, const uint16_t nbits,
-                            const bool strict) {
+bool IRrecv::decodeVestelAc(decode_results* results, uint16_t offset,
+                            const uint16_t nbits, const bool strict) {
   if (nbits % 8 != 0)  // nbits has to be a multiple of nr. of bits in a byte.
     return false;
 
@@ -529,7 +531,6 @@ bool IRrecv::decodeVestelAc(decode_results* results, const uint16_t nbits,
       return false;  // Not strictly a Vestel AC message.
 
   uint64_t data = 0;
-  uint16_t offset = kStartOffset;
 
   if (nbits > sizeof(data) * 8)
     return false;  // We can't possibly capture a Vestel packet that big.
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Vestel.h b/lib/IRremoteESP8266-2.7.4/src/ir_Vestel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Vestel.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Vestel.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Whirlpool.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Whirlpool.cpp
index 9dbdf62e5..e1ca2e6db 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Whirlpool.cpp
@@ -542,6 +542,8 @@ String IRWhirlpoolAc::toString(void) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   The number of data bits to expect. Typically kWhirlpoolAcBits
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -552,16 +554,15 @@ String IRWhirlpoolAc::toString(void) {
 //
 // Ref:
 //   https://github.com/crankyoldgit/IRremoteESP8266/issues/509
-bool IRrecv::decodeWhirlpoolAC(decode_results *results, const uint16_t nbits,
-                               const bool strict) {
-  if (results->rawlen < 2 * nbits + 4 + kHeader + kFooter - 1)
+bool IRrecv::decodeWhirlpoolAC(decode_results *results, uint16_t offset,
+                               const uint16_t nbits, const bool strict) {
+  if (results->rawlen < 2 * nbits + 4 + kHeader + kFooter - 1 + offset)
     return false;  // Can't possibly be a valid Whirlpool A/C message.
   if (strict) {
     if (nbits != kWhirlpoolAcBits) return false;
   }
 
-  uint16_t offset = kStartOffset;
-  uint8_t sectionSize[kWhirlpoolAcSections] = {6, 8, 7};
+  const uint8_t sectionSize[kWhirlpoolAcSections] = {6, 8, 7};
 
   // Header
   if (!matchMark(results->rawbuf[offset++], kWhirlpoolAcHdrMark)) return false;
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.h b/lib/IRremoteESP8266-2.7.4/src/ir_Whirlpool.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Whirlpool.h
rename to lib/IRremoteESP8266-2.7.4/src/ir_Whirlpool.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/ir_Whynter.cpp b/lib/IRremoteESP8266-2.7.4/src/ir_Whynter.cpp
similarity index 91%
rename from lib/IRremoteESP8266-2.7.3/src/ir_Whynter.cpp
rename to lib/IRremoteESP8266-2.7.4/src/ir_Whynter.cpp
index c5634f381..118eb7559 100644
--- a/lib/IRremoteESP8266-2.7.3/src/ir_Whynter.cpp
+++ b/lib/IRremoteESP8266-2.7.4/src/ir_Whynter.cpp
@@ -69,6 +69,8 @@ void IRsend::sendWhynter(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Args:
 //   results: Ptr to the data to decode and where to store the decode result.
+//   offset:  The starting index to use when attempting to decode the raw data.
+//            Typically/Defaults to kStartOffset.
 //   nbits:   Nr. of data bits to expect.
 //   strict:  Flag indicating if we should perform strict matching.
 // Returns:
@@ -78,16 +80,15 @@ void IRsend::sendWhynter(uint64_t data, uint16_t nbits, uint16_t repeat) {
 //
 // Ref:
 //   https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Whynter.cpp
-bool IRrecv::decodeWhynter(decode_results *results, uint16_t nbits,
-                           bool strict) {
-  if (results->rawlen < 2 * nbits + 2 * kHeader + kFooter - 1)
+bool IRrecv::decodeWhynter(decode_results *results, uint16_t offset,
+                           const uint16_t nbits, const bool strict) {
+  if (results->rawlen <= 2 * nbits + 2 * kHeader + kFooter - 1 + offset)
     return false;  // We don't have enough entries to possibly match.
 
   // Compliance
   if (strict && nbits != kWhynterBits)
     return false;  // Incorrect nr. of bits per spec.
 
-  uint16_t offset = kStartOffset;
   uint64_t data = 0;
   // Pre-Header
   // Sequence begins with a bit mark and a zero space.
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/README.md b/lib/IRremoteESP8266-2.7.4/src/locale/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/README.md
rename to lib/IRremoteESP8266-2.7.4/src/locale/README.md
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/de-CH.h b/lib/IRremoteESP8266-2.7.4/src/locale/de-CH.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/de-CH.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/de-CH.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/de-DE.h b/lib/IRremoteESP8266-2.7.4/src/locale/de-DE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/de-DE.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/de-DE.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/defaults.h b/lib/IRremoteESP8266-2.7.4/src/locale/defaults.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/defaults.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/defaults.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/en-AU.h b/lib/IRremoteESP8266-2.7.4/src/locale/en-AU.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/en-AU.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/en-AU.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/en-IE.h b/lib/IRremoteESP8266-2.7.4/src/locale/en-IE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/en-IE.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/en-IE.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/en-UK.h b/lib/IRremoteESP8266-2.7.4/src/locale/en-UK.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/en-UK.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/en-UK.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/en-US.h b/lib/IRremoteESP8266-2.7.4/src/locale/en-US.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/en-US.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/en-US.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/es-ES.h b/lib/IRremoteESP8266-2.7.4/src/locale/es-ES.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/es-ES.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/es-ES.h
diff --git a/lib/IRremoteESP8266-2.7.3/src/locale/fr-FR.h b/lib/IRremoteESP8266-2.7.4/src/locale/fr-FR.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/src/locale/fr-FR.h
rename to lib/IRremoteESP8266-2.7.4/src/locale/fr-FR.h
diff --git a/lib/IRremoteESP8266-2.7.4/src/locale/it-IT.h b/lib/IRremoteESP8266-2.7.4/src/locale/it-IT.h
new file mode 100644
index 000000000..b078a7319
--- /dev/null
+++ b/lib/IRremoteESP8266-2.7.4/src/locale/it-IT.h
@@ -0,0 +1,157 @@
+// Copyright 2020 - Enrico Gueli (@egueli)
+// Locale/language file for Italian.
+// This file will override the default values located in `defaults.h`.
+
+#ifndef LOCALE_IT_IT_H_
+#define LOCALE_IT_IT_H_
+
+#define D_STR_UNKNOWN "SCONOSCIUTO"
+#define D_STR_PROTOCOL "Protocollo"
+#define D_STR_POWER "Accensione"
+#define D_STR_ON "Acceso"
+#define D_STR_OFF "Spento"
+#define D_STR_MODE "Modalità"
+#define D_STR_TOGGLE "Alterna"
+#define D_STR_SLEEP "Sonno"
+#define D_STR_LIGHT "Leggero"
+#define D_STR_POWERFUL "Forte"
+#define D_STR_QUIET "Silenzioso"
+#define D_STR_ECONO "Eco"
+#define D_STR_SWING "Swing"
+#define D_STR_SWINGH D_STR_SWING"(O)"  // Set `D_STR_SWING` first!
+#define D_STR_SWINGV D_STR_SWING"(V)"  // Set `D_STR_SWING` first!
+#define D_STR_MOULD "Muffa"
+#define D_STR_CLEAN "Pulizia"
+#define D_STR_PURIFY "Purifica"
+#define D_STR_TIMER "Timer"
+#define D_STR_ONTIMER D_STR_ON " " D_STR_TIMER  // Set `D_STR_ON` first!
+#define D_STR_OFFTIMER D_STR_OFF " " D_STR_TIMER  // Set `D_STR_OFF` first!
+#define D_STR_CLOCK "Orologio"
+#define D_STR_COMMAND "Comando"
+#define D_STR_MODEL "Modello"
+#define D_STR_TEMP "Temp"
+#define D_STR_HUMID "Umido"
+#define D_STR_SAVE "Salva"
+#define D_STR_EYE "Occhio"
+#define D_STR_FOLLOW "Segui"
+#define D_STR_ION "Ioni"
+#define D_STR_FRESH "Fresco"
+#define D_STR_HOLD "Mantieni"
+#define D_STR_8C_HEAT "8C " D_STR_HEAT  // Set `D_STR_HEAT` first!
+#define D_STR_BUTTON "Pulsante"
+#define D_STR_NIGHT "Notte"
+#define D_STR_SILENT "Silenzioso"
+#define D_STR_FILTER "Filtro"
+#define D_STR_UP "Su"
+#define D_STR_TEMPUP D_STR_TEMP " " D_STR_UP  // Set `D_STR_TEMP` first!
+#define D_STR_DOWN "Giù"
+#define D_STR_TEMPDOWN D_STR_TEMP " " D_STR_DOWN  // Set `D_STR_TEMP` first!
+#define D_STR_CHANGE "Cambia"
+#define D_STR_START "Avvia"
+#define D_STR_STOP "Ferma"
+#define D_STR_MOVE "Muovi"
+#define D_STR_SET "Imposta"
+#define D_STR_CANCEL "Annulla"
+#define D_STR_SENSOR "Sensore"
+#define D_STR_WEEKLY "Settimanale"
+#define D_STR_WEEKLYTIMER D_STR_WEEKLY " " D_STR_TIMER  // Needs `D_STR_WEEKLY`!
+#define D_STR_LAST "Ultimo"
+#define D_STR_FAST "Veloce"
+#define D_STR_SLOW "Lento"
+#define D_STR_AIRFLOW "Flusso d'aria"
+#define D_STR_STEP "Passo"
+#define D_STR_NA "N/D"
+#define D_STR_OUTSIDE "Esterno"
+#define D_STR_LOUD "Rumoroso"
+#define D_STR_UPPER "Superiore"
+#define D_STR_LOWER "Inferiore"
+#define D_STR_CIRCULATE "Circolare"
+#define D_STR_CEILING "Soffitto"
+#define D_STR_WALL "Muro"
+#define D_STR_ROOM "Camera"
+#define D_STR_FIXED "Fisso"
+
+#define D_STR_AUTO "Auto"
+#define D_STR_AUTOMATIC "Automatico"
+#define D_STR_MANUAL "Manuale"
+#define D_STR_COOL "Fresco"
+#define D_STR_HEAT "Caldo"
+#define D_STR_FAN "Ventola"
+#define D_STR_FANONLY "solo_ventola"
+#define D_STR_DRY "Secco"
+
+#define D_STR_MAX "Max"
+#define D_STR_MAXIMUM "Massimo"
+#define D_STR_MINIMUM "Minimo"
+#define D_STR_MEDIUM "Medio"
+
+#define D_STR_HIGHEST "Molto alto"
+#define D_STR_HIGH "Alto"
+#define D_STR_MID "Med"
+#define D_STR_MIDDLE "Medio"
+#define D_STR_LOW "Basso"
+#define D_STR_LOWEST "Bassissimo"
+#define D_STR_RIGHT "Destra"
+#define D_STR_MAXRIGHT D_STR_MAX " " D_STR_RIGHT  // Set `D_STR_MAX` first!
+#define D_STR_RIGHTMAX_NOSPACE D_STR_RIGHT D_STR_MAX  // Set `D_STR_MAX` first!
+#define D_STR_LEFT "Sinistra"
+#define D_STR_MAXLEFT D_STR_MAX " " D_STR_LEFT  // Set `D_STR_MAX` first!
+#define D_STR_LEFTMAX_NOSPACE D_STR_LEFT D_STR_MAX  // Set `D_STR_MAX` first!
+#define D_STR_WIDE "Largo"
+#define D_STR_CENTRE "Centro"
+#define D_STR_TOP "Superiore"
+#define D_STR_BOTTOM "Inferiore"
+// Compound words/phrases/descriptions from pre-defined words.
+// Note: Obviously these need to be defined *after* their component words.
+
+#define D_STR_EYEAUTO D_STR_EYE " " D_STR_AUTO
+#define D_STR_LIGHTTOGGLE D_STR_LIGHT " " D_STR_TOGGLE
+#define D_STR_OUTSIDEQUIET D_STR_OUTSIDE " " D_STR_QUIET
+#define D_STR_POWERTOGGLE D_STR_POWER " " D_STR_TOGGLE
+#define D_STR_SENSORTEMP D_STR_SENSOR " " D_STR_TEMP
+#define D_STR_SLEEP_TIMER D_STR_SLEEP " " D_STR_TIMER
+#define D_STR_SWINGVMODE D_STR_SWINGV " " D_STR_MODE
+#define D_STR_SWINGVTOGGLE D_STR_SWINGV " " D_STR_TOGGLE
+// Separators
+#ifndef D_CHR_TIME_SEP
+#define D_CHR_TIME_SEP '.'
+#endif  // D_CHR_TIME_SEP
+
+#define D_STR_SPACELBRACE " ("
+#define D_STR_COMMASPACE ", "
+#define D_STR_COLONSPACE ": "
+
+#define D_STR_DAY "Giorno"
+#define D_STR_DAYS D_STR_DAY "s"
+#define D_STR_HOUR "Ore"
+#define D_STR_HOURS D_STR_HOUR "s"
+#define D_STR_MINUTE "Minuti"
+#define D_STR_MINUTES D_STR_MINUTE "s"
+#define D_STR_SECOND "Secondi"
+#define D_STR_SECONDS D_STR_SECOND "s"
+#define D_STR_NOW "Adesso"
+#define D_STR_THREELETTERDAYS "DomLunMarMerGioVenSab"
+
+#define D_STR_YES "Sì"
+#define D_STR_TRUE "Vero"
+#define D_STR_FALSE "Falso"
+
+#define D_STR_REPEAT "Ripeti"
+#define D_STR_CODE "Codice"
+#define D_STR_BITS "Bit"
+// IRrecvDumpV2
+
+#define D_STR_LIBRARY "Libreria"
+#define D_STR_MESGDESC "Desc. Mess."
+#define D_STR_IRRECVDUMP_STARTUP \
+    "IRrecvDumpV2 è ora attivo e in attesa di segnali IR dal pin %d"
+
+#ifndef D_WARN_BUFFERFULL
+#define D_WARN_BUFFERFULL \
+    "ATTENZIONE: il codice IR è troppo grande per il buffer (>= %d). " \
+    "Non fare affidamento a questi risultati finché questo problema " \
+    "non è risolto." \
+    "Modifica e aumenta `kCaptureBufferSize`."
+#endif  // D_WARN_BUFFERFULL
+
+#endif  // LOCALE_IT_IT_H_
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp b/lib/IRremoteESP8266-2.7.4/test/IRac_test.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/IRac_test.cpp
index 875485eee..c8c231621 100644
--- a/lib/IRremoteESP8266-2.7.3/test/IRac_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/IRac_test.cpp
@@ -332,21 +332,24 @@ TEST(TestIRac, Daikin216) {
 }
 
 TEST(TestIRac, Electra) {
-  IRElectraAc ac(0);
-  IRac irac(0);
-  IRrecv capture(0);
+  IRElectraAc ac(kGpioUnused);
+  IRac irac(kGpioUnused);
+  IRrecv capture(kGpioUnused);
   char expected[] =
       "Power: On, Mode: 6 (Fan), Temp: 26C, Fan: 1 (High), "
-      "Swing(V): On, Swing(H): On";
+      "Swing(V): On, Swing(H): On, Light: Toggle, Clean: On, Turbo: On";
 
   ac.begin();
   irac.electra(&ac,
-                 true,                        // Power
-                 stdAc::opmode_t::kFan,       // Mode
-                 26,                          // Celsius
-                 stdAc::fanspeed_t::kHigh,    // Fan speed
-                 stdAc::swingv_t::kAuto,      // Veritcal swing
-                 stdAc::swingh_t::kLeft);     // Horizontal swing
+               true,                        // Power
+               stdAc::opmode_t::kFan,       // Mode
+               26,                          // Celsius
+               stdAc::fanspeed_t::kHigh,    // Fan speed
+               stdAc::swingv_t::kAuto,      // Veritcal swing
+               stdAc::swingh_t::kLeft,      // Horizontal swing
+               true,                        // Turbo
+               true,                        // Light (toggle)
+               true);                       // Clean
   ASSERT_EQ(expected, ac.toString());
   ac._irsend.makeDecodeResult();
   EXPECT_TRUE(capture.decode(&ac._irsend.capture));
@@ -892,7 +895,7 @@ TEST(TestIRac, Samsung) {
   IRrecv capture(0);
   char expected[] =
       "Power: On, Mode: 0 (Auto), Temp: 28C, Fan: 6 (Auto), Swing: On, "
-      "Beep: On, Clean: On, Quiet: On, Powerful: Off";
+      "Beep: On, Clean: On, Quiet: On, Powerful: Off, Light: On, Ion: Off";
 
   ac.begin();
   irac.samsung(&ac,
@@ -903,6 +906,8 @@ TEST(TestIRac, Samsung) {
                stdAc::swingv_t::kAuto,      // Veritcal swing
                true,                        // Quiet
                false,                       // Turbo
+               true,                        // Light (Display)
+               false,                       // Filter (Ion)
                true,                        // Clean
                true,                        // Beep
                true,                        // Previous power state
@@ -923,6 +928,8 @@ TEST(TestIRac, Samsung) {
                stdAc::swingv_t::kAuto,      // Veritcal swing
                true,                        // Quiet
                false,                       // Turbo
+               true,                        // Light (Display)
+               false,                       // Filter (Ion)
                true,                        // Clean
                true,                        // Beep
                true,                        // Previous power state
@@ -936,7 +943,7 @@ TEST(TestIRac, Samsung) {
   // desired state.
   char expected_on[] =
       "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off";
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off";
   ASSERT_EQ(expected_on, IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
 
@@ -1600,3 +1607,64 @@ TEST(TestIRac, Issue1001) {
             "Command: 1 (Power)",
             IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
+
+// Check power switching in Daikin2 common a/c handling when from an IR message.
+TEST(TestIRac, Issue1035) {
+  stdAc::state_t prev;     // Previously desired state
+  stdAc::state_t result;   // State we need to send to get to `desired`
+  prev.protocol = decode_type_t::DAIKIN2;
+  prev.model = -1;
+  prev.power = false;
+  prev.mode = stdAc::opmode_t::kAuto;
+  prev.degrees = 24;
+  prev.celsius = true;
+  prev.fanspeed = stdAc::fanspeed_t::kAuto;
+  prev.swingv = stdAc::swingv_t::kOff;
+  prev.swingh = stdAc::swingh_t::kOff;
+  prev.quiet = false;
+  prev.turbo = false;
+  prev.econo = false;
+  prev.light = false;
+  prev.filter = false;
+  prev.clean = false;
+  prev.beep = false;
+  prev.sleep = -1;
+
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/1035#issuecomment-580963572
+  const uint8_t on_code[kDaikin2StateLength] = {
+      0x11, 0xDA, 0x27, 0x00, 0x01, 0x15, 0x43, 0x90, 0x29, 0x0C, 0x80, 0x04,
+      0xC0, 0x16, 0x24, 0x00, 0x00, 0xBE, 0xC1, 0x2D, 0x11, 0xDA, 0x27, 0x00,
+      0x00, 0x09, 0x2A, 0x00, 0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC1,
+      0x90, 0x60, 0x0C};
+  const uint8_t off_code[kDaikin2StateLength] = {
+      0x11, 0xDA, 0x27, 0x00, 0x01, 0x15, 0xC3, 0x90, 0x29, 0x0C, 0x80, 0x04,
+      0xC0, 0x16, 0x24, 0x00, 0x00, 0xBE, 0xD1, 0xBD, 0x11, 0xDA, 0x27, 0x00,
+      0x00, 0x08, 0x2A, 0x00, 0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC1,
+      0x90, 0x60, 0x0B};
+
+  IRac irac(kGpioUnused);
+  IRrecv capture(kGpioUnused);
+  IRDaikin2 ac(kGpioUnused);
+
+  ac.begin();
+  ac.setRaw(on_code);
+  ac.send();
+  ac._irsend.makeDecodeResult();
+  ASSERT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(DAIKIN2, ac._irsend.capture.decode_type);
+  ASSERT_FALSE(prev.power);
+  ASSERT_TRUE(IRAcUtils::decodeToState(&ac._irsend.capture, &result, &prev));
+  ASSERT_TRUE(result.power);
+
+  prev = result;
+
+  ac._irsend.reset();
+  ac.setRaw(off_code);
+  ac.send();
+  ac._irsend.makeDecodeResult();
+  ASSERT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(DAIKIN2, ac._irsend.capture.decode_type);
+  ASSERT_TRUE(prev.power);
+  ASSERT_TRUE(IRAcUtils::decodeToState(&ac._irsend.capture, &result, &prev));
+  ASSERT_FALSE(result.power);
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp b/lib/IRremoteESP8266-2.7.4/test/IRrecv_test.cpp
similarity index 74%
rename from lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/IRrecv_test.cpp
index 9dff78c75..fa025a2cb 100644
--- a/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/IRrecv_test.cpp
@@ -168,7 +168,8 @@ TEST(TestDecode, DecodePanasonic) {
   irsend.reset();
   irsend.sendPanasonic64(0x40040190ED7C);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
@@ -1244,3 +1245,347 @@ TEST(TestIRrecv, Tolerance) {
   result = irrecv.matchData(irsend.capture.rawbuf + 1, 5, 1500, 500, 500, 1500);
   ASSERT_FALSE(result.success);
 }
+
+TEST(TestDecode, SkippingInDecode) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(1);
+  irsend.begin();
+
+  // Normal (default) usage.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+
+  // Explicitly use the default (no skipping)
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  // Enable the least amount of actual skipping.
+  // Should still decode normal data.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 1));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+
+  // Crank up the amount of actual skipping.
+  // Should still decode normal data.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 10));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+
+  // Introduce some noise before the actual message.
+
+  // Should not match as NEC anymore.
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  // Now with explicit default options set.
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+
+  // Now with 1 skip, which it should match as NEC as there is only one
+  // mark + space pair of noise.
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 1));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+
+  // Now with more than 1 skip, which it should match as NEC as there is only
+  // one mark + space pair of noise.
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 5));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+
+  // Test multiple noise pairs.
+
+  irsend.reset();
+  irsend.mark(160);
+  irsend.space(60);
+  irsend.mark(60);
+  irsend.space(160);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  // Default decode parameters should fail to detect as NEC.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  // A single skip should fail to detect as NEC, as there are two pairs of noise
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 1));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  // However, two skips should match it correctly.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 2));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  // And so should more than 2 skips.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 10));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+}
+
+TEST(TestCrudeNoiseFilter, General) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(1);
+  irsend.begin();
+
+  // Normal (default) usage.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // Explicitly no filtering.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 0));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // Filter out anything less than 100usecs of which there should be none.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // Add small noise at the start, but don't filter it
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 0));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(69 + 2, irsend.capture.rawlen);
+
+  // Add small noise at the start, but filter it this time
+  irsend.reset();
+  irsend.mark(60);
+  irsend.space(60);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  irsend.reset();
+  irsend.mark(60);  // Less than the filter floor.
+  irsend.space(560);
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  irsend.reset();
+  irsend.mark(100);  // Higher than the filter floor.
+  irsend.space(200);  // Higher than the filter floor.
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_NE(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(69 + 2, irsend.capture.rawlen);
+
+  irsend.reset();
+  irsend.mark(160);  // Higher than the filter floor.
+  irsend.space(60);  // Lower than the filter floor.
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // Multiple noise at the start
+  irsend.reset();
+  irsend.mark(60);  // Lower than the filter floor.
+  irsend.space(60);  // Lower than the filter floor.
+  irsend.mark(60);  // Lower than the filter floor.
+  irsend.space(60);  // Lower than the filter floor.
+  irsend.mark(60);  // Lower than the filter floor.
+  irsend.space(60);  // Lower than the filter floor.
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // A mix of noise that should be removed.
+  irsend.reset();
+  irsend.mark(60);    // Lower than the filter floor.
+  irsend.space(160);  // Higher than the filter floor.
+  irsend.mark(160);   // Higher than the filter floor.
+  irsend.space(60);   // Lower than the filter floor.
+  irsend.mark(160);   // Higher than the filter floor.
+  irsend.space(60);   // Lower than the filter floor.
+  irsend.sendNEC(0x4BB640BF);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+
+  // Add noise that should be removed to the end of a message.
+  irsend.reset();
+  irsend.sendNEC(0x4BB640BF);
+  irsend.mark(60);    // Lower than the filter floor.
+  irsend.space(160);  // Higher than the filter floor.
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 100));
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x4BB640BF, irsend.capture.value);
+  EXPECT_EQ(69, irsend.capture.rawlen);
+}
+
+TEST(TestCrudeNoiseFilter, NoiseMidSample) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(1);
+  irsend.begin();
+
+  // Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1042#issuecomment-583895303
+  uint16_t rawData[71] = {
+      482, 1370, 9082, 1558, 342, 2514, 662, 470, 660, 468, 658, 1588, 662, 466,
+      662, 466, 662, 466, 662, 466, 662, 466, 662, 1586, 660, 1588, 662, 466,
+      662, 1588, 662, 1586, 662, 1586, 660, 1588, 662, 1586, 662, 468, 660,
+      1588, 662, 468, 662, 466, 660, 466, 662, 464, 662, 466, 662, 466, 662,
+      1588, 660, 466, 662, 1586, 662, 1588, 660, 1586, 662, 1586, 662, 1586,
+      664, 1594, 662};  // UNKNOWN B0784C9E
+
+  irsend.reset();
+  irsend.sendRaw(rawData, 71, 38);
+  irsend.makeDecodeResult();
+  // Try with no filter first.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 1, 0));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  const uint16_t prev_length = irsend.capture.rawlen;
+  // Now with the filter set to 350, to remove the 342 mark at rawData[4].
+  // Note: a mark of 350us is huge.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 1, 350));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x20DF40BF, irsend.capture.value);
+  EXPECT_EQ(prev_length - 2, irsend.capture.rawlen);
+  EXPECT_EQ(
+      "uint16_t rawData[69] = {482, 1370,  9082, 4414,  662, 470,  660, 468,  "
+      "658, 1588,  662, 466,  662, 466,  662, 466,  662, 466,  662, 466,  662, "
+      "1586,  660, 1588,  662, 466,  662, 1588,  662, 1586,  662, 1586,  660, "
+      "1588,  662, 1586,  662, 468,  660, 1588,  662, 468,  662, 466,  660, "
+      "466,  662, 464,  662, 466,  662, 466,  662, 1588,  660, 466,  662, "
+      "1586,  662, 1588,  660, 1586,  662, 1586,  662, 1586,  664, 1594,  "
+      "662};  // NEC 20DF40BF\n"
+      "uint32_t address = 0x4;\n"
+      "uint32_t command = 0x2;\n"
+      "uint64_t data = 0x20DF40BF;\n",
+      resultToSourceCode(&irsend.capture));
+
+  // Data modified as rawData2[3] which was 882 is too far out of spec. for a
+  // NEC bit mark.
+  uint16_t rawData2[7] = {
+      9066, 2026, 600, 13906, 222, 992, 734};  // UNKNOWN 8FDE36A7
+  irsend.reset();
+  irsend.sendRaw(rawData2, 7, 38);
+  irsend.makeDecodeResult();
+  // Try with no filter first.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 0));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(0, irsend.capture.bits);
+  EXPECT_TRUE(irsend.capture.repeat);
+  // Now with the filter set to 250, to remove the 222 mark at rawData2[4].
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 350));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(0, irsend.capture.bits);
+  EXPECT_TRUE(irsend.capture.repeat);
+  EXPECT_EQ(
+      "uint16_t rawData[5] = {9066, 2026,  600, 15120,  734};  "
+      "// NEC (Repeat) FFFFFFFFFFFFFFFF\n"
+      "uint64_t data = 0xFFFFFFFFFFFFFFFF;\n",
+      resultToSourceCode(&irsend.capture));
+}
+
+TEST(TestCrudeNoiseFilter, NoiseAtEndOfSample) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(1);
+  irsend.begin();
+
+  // Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1042#issuecomment-583895303
+  uint16_t rawData[69] = {  // UNKNOWN B52869E1
+      9078, 4386, 662, 468, 660, 466, 662, 1588, 660, 468, 660, 468, 662, 466,
+      662, 466, 662, 466, 662, 1588, 660, 1588, 660, 466, 662, 1590, 660, 1586,
+      662, 1586, 662, 1588, 662, 1584, 662, 1588, 662, 1588, 660, 466, 686, 442,
+      662, 466, 662, 466, 662, 466, 662, 468, 662, 466, 662, 466, 662, 1586,
+      662, 1588, 662, 1586, 644, 1600, 662, 1586, 688, 1566, 684, 2638, 146};
+  irsend.reset();
+  irsend.sendRaw(rawData, 69, 38);
+  irsend.makeDecodeResult();
+  // Try with no filter first.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 0));
+  EXPECT_NE(NEC, irsend.capture.decode_type);
+  const uint16_t prev_length = irsend.capture.rawlen;
+
+  // Now with the filter set to 200, to remove the 146 mark at at the end.
+  EXPECT_TRUE(irrecv.decode(&irsend.capture, NULL, 0, 200));
+  EXPECT_EQ(NEC, irsend.capture.decode_type);
+  EXPECT_EQ(kNECBits, irsend.capture.bits);
+  EXPECT_EQ(0x20DFC03F, irsend.capture.value);
+  EXPECT_EQ(prev_length - 2, irsend.capture.rawlen);
+  EXPECT_EQ(
+      "uint16_t rawData[67] = {9078, 4386,  662, 468,  660, 466,  662, 1588,  "
+      "660, 468,  660, 468,  662, 466,  662, 466,  662, 466,  662, 1588,  660, "
+      "1588,  660, 466,  662, 1590,  660, 1586,  662, 1586,  662, 1588,  662, "
+      "1584,  662, 1588,  662, 1588,  660, 466,  686, 442,  662, 466,  662, "
+      "466,  662, 466,  662, 468,  662, 466,  662, 466,  662, 1586,  662, 1588,"
+      "  662, 1586,  644, 1600,  662, 1586,  688, 1566,  684};  "
+      "// NEC 20DFC03F\n"
+      "uint32_t address = 0x4;\n"
+      "uint32_t command = 0x3;\n"
+      "uint64_t data = 0x20DFC03F;\n",
+      resultToSourceCode(&irsend.capture));
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRrecv_test.h b/lib/IRremoteESP8266-2.7.4/test/IRrecv_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/IRrecv_test.h
rename to lib/IRremoteESP8266-2.7.4/test/IRrecv_test.h
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRsend_test.cpp b/lib/IRremoteESP8266-2.7.4/test/IRsend_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/test/IRsend_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/IRsend_test.cpp
index fbf8ba229..f2e280504 100644
--- a/lib/IRremoteESP8266-2.7.3/test/IRsend_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/IRsend_test.cpp
@@ -193,7 +193,7 @@ TEST(TestSendRaw, GeneralUse) {
   irsend.reset();
   irsend.sendRaw(rawData, 67, 38);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, kNECBits, false));
+  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, kNECBits, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0xC3E0E0E8, irsend.capture.value);
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRsend_test.h b/lib/IRremoteESP8266-2.7.4/test/IRsend_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/IRsend_test.h
rename to lib/IRremoteESP8266-2.7.4/test/IRsend_test.h
diff --git a/lib/IRremoteESP8266-2.7.3/test/IRutils_test.cpp b/lib/IRremoteESP8266-2.7.4/test/IRutils_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/IRutils_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/IRutils_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/Makefile b/lib/IRremoteESP8266-2.7.4/test/Makefile
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/test/Makefile
rename to lib/IRremoteESP8266-2.7.4/test/Makefile
index cdf133913..7b1a4b379 100644
--- a/lib/IRremoteESP8266-2.7.3/test/Makefile
+++ b/lib/IRremoteESP8266-2.7.4/test/Makefile
@@ -39,7 +39,7 @@ TESTS = IRutils_test IRsend_test ir_NEC_test ir_GlobalCache_test \
 	ir_Whirlpool_test ir_Lutron_test ir_Electra_test ir_Pioneer_test \
   ir_MWM_test ir_Vestel_test ir_Teco_test ir_Tcl_test ir_Lego_test IRac_test \
 	ir_MitsubishiHeavy_test ir_Trotec_test ir_Argo_test ir_Goodweather_test \
-	ir_Inax_test ir_Neoclima_test ir_Amcor_test
+	ir_Inax_test ir_Neoclima_test ir_Amcor_test ir_Epson_test
 
 # All Google Test headers.  Usually you shouldn't change this
 # definition.
@@ -85,7 +85,7 @@ PROTOCOLS = ir_NEC.o ir_Sony.o ir_Samsung.o ir_JVC.o ir_RCMM.o ir_RC5_RC6.o \
 	ir_Hitachi.o ir_GICable.o ir_Whirlpool.o ir_Lutron.o ir_Electra.o \
 	ir_Pioneer.o ir_MWM.o ir_Vestel.o ir_Teco.o ir_Tcl.o ir_Lego.o ir_Argo.o \
 	ir_Trotec.o ir_MitsubishiHeavy.o ir_Goodweather.o ir_Inax.o ir_Neoclima.o \
-  ir_Amcor.o
+  ir_Amcor.o ir_Epson.o
 
 # All the IR Protocol header files.
 PROTOCOLS_H = $(USER_DIR)/ir_Amcor.h \
@@ -623,3 +623,12 @@ ir_Amcor_test.o : ir_Amcor_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
 
 ir_Amcor_test : $(COMMON_OBJ) ir_Amcor_test.o
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
+
+ir_Epson.o : $(USER_DIR)/ir_Epson.cpp $(COMMON_DEPS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_Epson.cpp
+
+ir_Epson_test.o : ir_Epson_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c ir_Epson_test.cpp
+
+ir_Epson_test : $(COMMON_OBJ) ir_Epson_test.o
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Aiwa_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Aiwa_test.cpp
similarity index 83%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Aiwa_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Aiwa_test.cpp
index 2fa63afe6..f87d5c5e2 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Aiwa_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Aiwa_test.cpp
@@ -130,7 +130,8 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendAiwaRCT501(0x7F);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                      kAiwaRcT501Bits, true));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
   EXPECT_EQ(0x7F, irsend.capture.value);
@@ -142,7 +143,8 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendAiwaRCT501(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                      kAiwaRcT501Bits, true));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -154,7 +156,8 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendAiwaRCT501(0x7FFF);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                      kAiwaRcT501Bits, true));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
   EXPECT_EQ(0x7FFF, irsend.capture.value);
@@ -173,7 +176,8 @@ TEST(TestDecodeAiwa, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendAiwaRCT501(0x7F, kAiwaRcT501Bits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                      kAiwaRcT501Bits, true));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
   EXPECT_EQ(0x7F, irsend.capture.value);
@@ -193,7 +197,8 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictValues) {
   irsend.sendNEC(0x1D8113F00FF, 42, kAiwaRcT501MinRepeats);
   irsend.makeDecodeResult();
   // MUST pass with strict on.
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                      kAiwaRcT501Bits, true));
   ASSERT_EQ(0x7F, irsend.capture.value);
 
   irsend.reset();
@@ -202,10 +207,12 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictValues) {
   irsend.sendNEC(0x1234567890A, 42, kAiwaRcT501MinRepeats);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                       kAiwaRcT501Bits, true));
   // Should fail if strict off too.
   ASSERT_FALSE(
-      irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, false));
+      irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, kAiwaRcT501Bits,
+                              false));
 
   irsend.reset();
   // Use sendNEC(data, 42) to make/send an illegal value Aiwa message.
@@ -213,7 +220,8 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictValues) {
   irsend.sendNEC(0x1D8113F00FE, 42, kAiwaRcT501MinRepeats);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                       kAiwaRcT501Bits, true));
   // Should fail if strict off too.
   ASSERT_FALSE(
       irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, false));
@@ -224,10 +232,12 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictValues) {
   irsend.sendNEC(0x0D8113F00FF, 42, kAiwaRcT501MinRepeats);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                       kAiwaRcT501Bits, true));
   // Should fail if strict off too.
   ASSERT_FALSE(
-      irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, false));
+      irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, kAiwaRcT501Bits,
+                              false));
 }
 
 // Decode unsupported Aiwa messages.
@@ -240,9 +250,10 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictSizes) {
   irsend.sendAiwaRCT501(0x0, 8);  // Illegal size Aiwa 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                       kAiwaRcT501Bits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -251,12 +262,15 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictSizes) {
   irsend.sendAiwaRCT501(0x12345678, 32);  // Illegal size Aiwa 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset,
+                                       kAiwaRcT501Bits, true));
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, 32,
+                                       true));
 
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, 32,
+                                      false));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -273,7 +287,8 @@ TEST(TestDecodeAiwa, Decode64BitMessages) {
   irsend.sendAiwaRCT501(0x1FFFFFFFFF, 37);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 37, false));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, 37,
+                                      false));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(37, irsend.capture.bits);
   EXPECT_EQ(0x1FFFFFFFFF, irsend.capture.value);
@@ -283,7 +298,8 @@ TEST(TestDecodeAiwa, Decode64BitMessages) {
   irsend.sendNEC(0x76044FFFFFFFFFFF, 64, kAiwaRcT501MinRepeats);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 37, false));
+  ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, 37,
+                                      false));
   EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
   EXPECT_EQ(37, irsend.capture.bits);
   EXPECT_EQ(0x1FFFFFFFFF, irsend.capture.value);
@@ -316,7 +332,7 @@ TEST(TestDecodeAiwa, DecodeGlobalCacheExample) {
   EXPECT_FALSE(irsend.capture.repeat);
 
   // Confirm what the 42-bit NEC decode is.
-  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, 42, false));
+  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 42, false));
   EXPECT_EQ(0x1D8113F00FF, irsend.capture.value);
 }
 
@@ -336,5 +352,6 @@ TEST(TestDecodeAiwa, FailToDecodeNonAiwaExample) {
 
   ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture));
   ASSERT_FALSE(
-      irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits, false));
+      irrecv.decodeAiwaRCT501(&irsend.capture, kStartOffset, kAiwaRcT501Bits,
+                              false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Amcor_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Amcor_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Amcor_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Amcor_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Argo_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Argo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Argo_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Argo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Carrier_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Carrier_test.cpp
similarity index 97%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Carrier_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Carrier_test.cpp
index 053b31dd4..f62a9d0f5 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Carrier_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Carrier_test.cpp
@@ -161,7 +161,8 @@ TEST(TestDecodeCarrierAC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendCarrierAC(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kCarrierAcBits, true));
+  ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kStartOffset,
+                                     kCarrierAcBits, true));
   EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
   EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -172,7 +173,8 @@ TEST(TestDecodeCarrierAC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendCarrierAC(0xB335ABE2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kCarrierAcBits, true));
+  ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kStartOffset,
+                                     kCarrierAcBits, true));
   EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
   EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
   EXPECT_EQ(0xB335ABE2, irsend.capture.value);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Coolix_test.cpp
similarity index 91%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Coolix_test.cpp
index 226e1aa68..20a46c7b4 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Coolix_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Coolix_test.cpp
@@ -215,7 +215,8 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendCOOLIX(0x123456);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+              true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0x123456, irsend.capture.value);
@@ -227,7 +228,8 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendCOOLIX(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                  true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -239,7 +241,8 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendCOOLIX(0xFFFFFF);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                  true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFF, irsend.capture.value);
@@ -258,20 +261,23 @@ TEST(TestDecodeCoolix, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendCOOLIX(0x123456, kCoolixBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                  true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0x123456, irsend.capture.value);
   EXPECT_FALSE(irsend.capture.repeat);
 
   irsend.makeDecodeResult(4 * kCoolixBits + 4);
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                  true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0x123456, irsend.capture.value);
 
   irsend.makeDecodeResult(2 * (4 * kCoolixBits + 4));
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                  true));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(kCoolixBits, irsend.capture.bits);
   EXPECT_EQ(0x123456, irsend.capture.value);
@@ -287,9 +293,10 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
   irsend.sendCOOLIX(0x12, 8);  // Illegal value Coolix 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                   true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x12, irsend.capture.value);
@@ -298,13 +305,14 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
   irsend.sendCOOLIX(0x12345678, 32);  // Illegal value Coolix 32-bit message.
   irsend.makeDecodeResult();
   // Shouldn't pass with strict when we ask for less bits than we got.
-  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
+  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                   true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -313,7 +321,7 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
   irsend.reset();
   irsend.sendCOOLIX(0x123456, kCoolixBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, 9, false));
+  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, 9, false));
 }
 
 // Decode (non-standard) 64-bit messages.
@@ -327,7 +335,7 @@ TEST(TestDecodeCoolix, Decode64BitMessages) {
   irsend.sendCOOLIX(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(COOLIX, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -349,7 +357,8 @@ TEST(TestDecodeCoolix, FailToDecodeNonCoolixExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, false));
+  ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kStartOffset, kCoolixBits,
+                                   false));
 }
 
 // Tests for the IRCoolixAC class.
@@ -800,3 +809,44 @@ TEST(TestCoolixACClass, Issue985) {
   EXPECT_EQ(kCoolixOff, ac._irsend.capture.value);
   EXPECT_EQ("Power: Off", IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
+
+TEST(TestCoolixACClass, PowerStateWithSetRaw) {
+  IRrecv irrecv(kGpioUnused);
+  IRCoolixAC ac(kGpioUnused);
+
+  // Problem reported that power is always off via decodeToState()
+  // Ref:
+  //   https://github.com/crankyoldgit/IRremoteESP8266/pull/1040
+  //   https://github.com/arendst/Tasmota/issues/7660
+
+  const uint32_t on_code =  0xB2BFCC;  // A valid "on" message.
+
+  // Check the off case.
+  ac.setRaw(kCoolixOff);
+  ASSERT_FALSE(ac.getPower());
+  EXPECT_FALSE(ac.toCommon().power);
+
+  // Check the "on" case.
+  ac.setRaw(on_code);
+  ASSERT_TRUE(ac.getPower());
+  EXPECT_TRUE(ac.toCommon().power);
+  // Now check the reported decodeToState() is also fixed.
+  ac._irsend.reset();
+  ac.send();
+  ac._irsend.makeDecodeResult();
+  ASSERT_TRUE(irrecv.decode(&ac._irsend.capture));
+  EXPECT_EQ(COOLIX, ac._irsend.capture.decode_type);
+  EXPECT_EQ(kCoolixBits, ac._irsend.capture.bits);
+  EXPECT_EQ(on_code, ac._irsend.capture.value);
+  EXPECT_EQ(
+      "Power: On, Mode: 3 (Heat), Fan: 5 (Auto), Temp: 25C, Zone Follow: Off, "
+      "Sensor Temp: Off", IRAcUtils::resultAcToString(&ac._irsend.capture));
+  stdAc::state_t result;
+  ASSERT_TRUE(IRAcUtils::decodeToState(&ac._irsend.capture, &result));
+  EXPECT_TRUE(result.power);
+
+  // Recheck the off case to ensure it changes.
+  ac.setRaw(kCoolixOff);
+  ASSERT_FALSE(ac.getPower());
+  EXPECT_FALSE(ac.toCommon().power);
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Daikin_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Daikin_test.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Daikin_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Daikin_test.cpp
index 9fcaabcb0..60d39d9a3 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Daikin_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Daikin_test.cpp
@@ -3364,3 +3364,39 @@ TEST(TestDaikin152Class, BuildKnownState) {
       0x00, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x6F};
   EXPECT_STATE_EQ(expectedState, ac.getRaw(), kDaikin152Bits);
 }
+
+TEST(TestDaikin2Class, Issue1035) {
+  IRDaikin2 ac(kGpioUnused);
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/1035#issuecomment-580963572
+  const uint8_t on_code[kDaikin2StateLength] = {
+      0x11, 0xDA, 0x27, 0x00, 0x01, 0x15, 0x43, 0x90, 0x29, 0x0C, 0x80, 0x04,
+      0xC0, 0x16, 0x24, 0x00, 0x00, 0xBE, 0xC1, 0x2D, 0x11, 0xDA, 0x27, 0x00,
+      0x00, 0x09, 0x2A, 0x00, 0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC1,
+      0x90, 0x60, 0x0C};
+  const uint8_t off_code[kDaikin2StateLength] = {
+      0x11, 0xDA, 0x27, 0x00, 0x01, 0x15, 0xC3, 0x90, 0x29, 0x0C, 0x80, 0x04,
+      0xC0, 0x16, 0x24, 0x00, 0x00, 0xBE, 0xD1, 0xBD, 0x11, 0xDA, 0x27, 0x00,
+      0x00, 0x08, 0x2A, 0x00, 0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC1,
+      0x90, 0x60, 0x0B};
+
+  ac.setRaw(on_code);
+  EXPECT_EQ(
+      "Power: On, Mode: 0 (Auto), Temp: 21C, Fan: 11 (Quiet), "
+      "Swing(V): 1 (Highest), Swing(H): 190 (Auto), Clock: 13:09, "
+      "On Timer: Off, Off Timer: Off, Sleep Timer: Off, Beep: 2 (Loud), "
+      "Light: 1 (High), Mould: On, Clean: On, Fresh: On, Eye: Off, "
+      "Eye Auto: Off, Quiet: Off, Powerful: Off, Purify: On, Econo: Off",
+      ac.toString());
+  ASSERT_TRUE(ac.toCommon().power);
+  ASSERT_NE(ac.toCommon().mode, stdAc::opmode_t::kOff);
+
+  ac.setRaw(off_code);
+  EXPECT_EQ(
+      "Power: Off, Mode: 0 (Auto), Temp: 21C, Fan: 11 (Quiet), "
+      "Swing(V): 1 (Highest), Swing(H): 190 (Auto), Clock: 13:09, "
+      "On Timer: Off, Off Timer: Off, Sleep Timer: Off, Beep: 2 (Loud), "
+      "Light: 1 (High), Mould: On, Clean: On, Fresh: On, Eye: Off, "
+      "Eye Auto: Off, Quiet: Off, Powerful: Off, Purify: On, Econo: Off",
+      ac.toString());
+  ASSERT_FALSE(ac.toCommon().power);
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Denon_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Denon_test.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Denon_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Denon_test.cpp
index bfb554bb5..64be43f97 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Denon_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Denon_test.cpp
@@ -185,7 +185,8 @@ TEST(TestDecodeDenon, NormalDecodeWithStrict) {
   irsend.sendDenon(0x2278);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenonBits, true));
+  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kStartOffset, kDenonBits,
+                                 true));
   EXPECT_EQ(DENON, irsend.capture.decode_type);
   EXPECT_EQ(kDenonBits, irsend.capture.bits);
   EXPECT_EQ(0x2278, irsend.capture.value);
@@ -198,7 +199,8 @@ TEST(TestDecodeDenon, NormalDecodeWithStrict) {
   irsend.sendDenon(0x1278, kDenonLegacyBits);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenonLegacyBits, true));
+  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kStartOffset,
+                                 kDenonLegacyBits, true));
   EXPECT_EQ(DENON, irsend.capture.decode_type);
   EXPECT_EQ(kDenonLegacyBits, irsend.capture.bits);
   EXPECT_EQ(0x1278, irsend.capture.value);
@@ -210,7 +212,8 @@ TEST(TestDecodeDenon, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendDenon(0x2A4C028D6CE3, kDenon48Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenon48Bits, true));
+  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kStartOffset,
+                                 kDenon48Bits, true));
   EXPECT_EQ(DENON, irsend.capture.decode_type);
   EXPECT_EQ(kDenon48Bits, irsend.capture.bits);
   EXPECT_EQ(0x2A4C028D6CE3, irsend.capture.value);
@@ -235,7 +238,8 @@ TEST(TestDecodeDenon, DecodeGlobalCacheExample) {
   irsend.sendGC(gc_test_power, 67);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenonBits, true));
+  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kStartOffset, kDenonBits,
+                                 true));
   EXPECT_EQ(DENON, irsend.capture.decode_type);
   EXPECT_EQ(kDenonBits, irsend.capture.bits);
   EXPECT_EQ(0x2278, irsend.capture.value);
@@ -256,7 +260,8 @@ TEST(TestDecodeDenon, DecodeGlobalCacheExample) {
   irsend.sendGC(gc_test_eco, 103);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenon48Bits, true));
+  ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kStartOffset, kDenon48Bits,
+                                 true));
   EXPECT_EQ(DENON, irsend.capture.decode_type);
   EXPECT_EQ(kDenon48Bits, irsend.capture.bits);
   EXPECT_EQ(0x2A4C028D6CE3, irsend.capture.value);
@@ -280,7 +285,10 @@ TEST(TestDecodeDenon, FailToDecodeNonDenonExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kDenonLegacyBits, false));
-  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kDenonBits, false));
-  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kDenon48Bits, false));
+  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kStartOffset,
+                                  kDenonLegacyBits, false));
+  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kStartOffset, kDenonBits,
+                                  false));
+  ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kStartOffset, kDenon48Bits,
+                                  false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Dish_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Dish_test.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Dish_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Dish_test.cpp
index 21286b7ac..d74564811 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Dish_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Dish_test.cpp
@@ -189,7 +189,8 @@ TEST(TestDecodeDish, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendDISH(0x9C00);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
+  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kStartOffset, kDishBits,
+                                true));
   EXPECT_EQ(DISH, irsend.capture.decode_type);
   EXPECT_EQ(kDishBits, irsend.capture.bits);
   EXPECT_EQ(0x9C00, irsend.capture.value);
@@ -208,13 +209,14 @@ TEST(TestDecodeDish, DecodeWithNonStrictSize) {
   irsend.sendDISH(0x12, 8);  // Illegal size Dish message. (smaller)
   irsend.makeDecodeResult();
 
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, kDishBits,
+                                 true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, 8, true));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 8, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(DISH, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x12, irsend.capture.value);
@@ -225,13 +227,14 @@ TEST(TestDecodeDish, DecodeWithNonStrictSize) {
   irsend.sendDISH(0x12345678, 32);  // Illegal size Dish message. (larger)
   irsend.makeDecodeResult();
 
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, kDishBits,
+                                 true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(DISH, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -249,9 +252,9 @@ TEST(TestDecodeDish, Decode64BitMessages) {
   // Illegal value & size Dish 64-bit message.
   irsend.sendDISH(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 64, true));
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(DISH, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -299,7 +302,8 @@ TEST(TestDecodeDish, DecodeGlobalCacheExample) {
   irsend.sendGC(gc_test_hopper, 73);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
+  ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kStartOffset, kDishBits,
+                                true));
   EXPECT_EQ(DISH, irsend.capture.decode_type);
   EXPECT_EQ(kDishBits, irsend.capture.bits);
   EXPECT_EQ(0x9C00, irsend.capture.value);
@@ -332,5 +336,6 @@ TEST(TestDecodeDish, FailToDecodeNonDishExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, false));
+  ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kStartOffset, kDishBits,
+                                 false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Electra_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Electra_test.cpp
similarity index 69%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Electra_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Electra_test.cpp
index 43ea456c6..b49482433 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Electra_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Electra_test.cpp
@@ -101,7 +101,7 @@ TEST(TestDecodeElectraAC, RealExampleDecode) {
   EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 3 (Low), "
-      "Swing(V): Off, Swing(H): Off",
+      "Swing(V): Off, Swing(H): Off, Light: -, Clean: Off, Turbo: Off",
       IRAcUtils::resultAcToString(&irsend.capture));
 }
 
@@ -199,24 +199,25 @@ TEST(TestIRElectraAcClass, toCommon) {
   ac.setFan(kElectraAcFanHigh);
   ac.setSwingV(true);
   ac.setSwingH(true);
+  ac.setClean(true);
+  ac.setLightToggle(true);
   // Now test it.
   ASSERT_EQ(decode_type_t::ELECTRA_AC, ac.toCommon().protocol);
   ASSERT_EQ(-1, ac.toCommon().model);
   ASSERT_TRUE(ac.toCommon().power);
   ASSERT_TRUE(ac.toCommon().celsius);
   ASSERT_EQ(20, ac.toCommon().degrees);
-
   ASSERT_EQ(stdAc::opmode_t::kCool, ac.toCommon().mode);
   ASSERT_EQ(stdAc::fanspeed_t::kMax, ac.toCommon().fanspeed);
   ASSERT_EQ(stdAc::swingv_t::kAuto, ac.toCommon().swingv);
   ASSERT_EQ(stdAc::swingh_t::kAuto, ac.toCommon().swingh);
+  ASSERT_TRUE(ac.toCommon().clean);
+  ASSERT_TRUE(ac.toCommon().light);
   // Unsupported.
   ASSERT_FALSE(ac.toCommon().turbo);
   ASSERT_FALSE(ac.toCommon().filter);
-  ASSERT_FALSE(ac.toCommon().light);
   ASSERT_FALSE(ac.toCommon().quiet);
   ASSERT_FALSE(ac.toCommon().econo);
-  ASSERT_FALSE(ac.toCommon().clean);
   ASSERT_FALSE(ac.toCommon().beep);
   ASSERT_EQ(-1, ac.toCommon().sleep);
   ASSERT_EQ(-1, ac.toCommon().clock);
@@ -232,19 +233,125 @@ TEST(TestIRElectraAcClass, HumanReadable) {
   ac.setRaw(on_cool_32C_auto_voff);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 32C, Fan: 5 (Auto), "
-      "Swing(V): Off, Swing(H): Off", ac.toString());
+      "Swing(V): Off, Swing(H): Off, Light: -, Clean: Off, Turbo: Off",
+      ac.toString());
   uint8_t on_cool_16C_auto_voff[13] = {
       0xC3, 0x47, 0xE0, 0x00, 0xA0, 0x00, 0x20,
       0x00, 0x00, 0x20, 0x00, 0x41, 0x0B};
   ac.setRaw(on_cool_16C_auto_voff);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 5 (Auto), "
-      "Swing(V): Off, Swing(H): Off", ac.toString());
+      "Swing(V): Off, Swing(H): Off, Light: -, Clean: Off, Turbo: Off",
+      ac.toString());
   uint8_t on_cool_16C_low_voff[13] = {
       0xC3, 0x47, 0xE0, 0x00, 0x60, 0x00, 0x20,
       0x00, 0x00, 0x20, 0x00, 0x41, 0xCB};
   ac.setRaw(on_cool_16C_low_voff);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 3 (Low), "
-      "Swing(V): Off, Swing(H): Off", ac.toString());
+      "Swing(V): Off, Swing(H): Off, Light: -, Clean: Off, Turbo: Off",
+      ac.toString());
+}
+
+TEST(TestIRElectraAcClass, Clean) {
+  IRElectraAc ac(kGpioUnused);
+  ac.begin();
+
+  ac.setClean(true);
+  EXPECT_TRUE(ac.getClean());
+
+  ac.setClean(false);
+  EXPECT_FALSE(ac.getClean());
+
+  ac.setClean(true);
+  EXPECT_TRUE(ac.getClean());
+
+  ac.setClean(false);
+  // ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1033#issuecomment-581133127
+  uint8_t on[13] = {0xC3, 0x87, 0xE0, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x24,
+                    0x00, 0x19, 0xE7};
+  ac.setRaw(on);
+  EXPECT_EQ(
+      "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 3 (Low), "
+      "Swing(V): Off, Swing(H): Off, Light: Toggle, Clean: On, Turbo: Off",
+      ac.toString());
+}
+
+TEST(TestIRElectraAcClass, Turbo) {
+  IRElectraAc ac(kGpioUnused);
+  ac.begin();
+
+  ac.setTurbo(true);
+  EXPECT_TRUE(ac.getTurbo());
+
+  ac.setTurbo(false);
+  EXPECT_FALSE(ac.getTurbo());
+
+  ac.setTurbo(true);
+  EXPECT_TRUE(ac.getTurbo());
+
+  ac.setTurbo(false);
+  // ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1033#issuecomment-583888046
+  const uint8_t on[13] = {
+      0xC3, 0x87, 0xE0, 0x00, 0x60, 0x40, 0x20, 0x00, 0x00, 0x20, 0x00, 0x08,
+      0x12};
+
+  ac.setRaw(on);
+  EXPECT_EQ(
+      "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 3 (Low), "
+      "Swing(V): Off, Swing(H): Off, Light: -, Clean: Off, Turbo: On",
+      ac.toString());
+}
+
+TEST(TestIRElectraAcClass, LightToggle) {
+  IRElectraAc ac(kGpioUnused);
+  ac.begin();
+
+  ac.setLightToggle(true);
+  EXPECT_TRUE(ac.getLightToggle());
+
+  ac.setLightToggle(false);
+  EXPECT_FALSE(ac.getLightToggle());
+
+  ac.setLightToggle(true);
+  EXPECT_TRUE(ac.getLightToggle());
+
+  ac.setLightToggle(false);
+  // ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/1033#issuecomment-581133127
+  uint8_t on[13] = {0xC3, 0x87, 0xE0, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x24,
+                    0x00, 0x19, 0xE7};
+  ac.setRaw(on);
+  EXPECT_EQ(
+      "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 3 (Low), "
+      "Swing(V): Off, Swing(H): Off, Light: Toggle, Clean: On, Turbo: Off",
+       ac.toString());
+}
+
+TEST(TestIRElectraAcClass, ConstructKnownState) {
+  IRElectraAc ac(kGpioUnused);
+  // Data from:
+  //   https://github.com/crankyoldgit/IRremoteESP8266/issues/1033#issuecomment-581133127
+  // A/C on - Cooling mode - 24° - Fan speed set to 1 - Light set to toggle
+  // - flaps off - turbo off - clean on
+  const uint8_t on_cool_24C_fan1_swing_off_turbo_off_clean_on[13] = {
+      0xC3, 0x87, 0xE0, 0x00, 0x60, 0x00, 0x20,
+      // 0x00, 0x00, 0x24, 0x00, 0x19, 0xE7};  // Real captured data
+      // TODO(ShonP40): Explain `state[11]` difference.
+      0x00, 0x00, 0x24, 0x00, 0x15, 0xE3};  // state[11] hacked to pass test.
+  ac.stateReset();
+  ac.on();
+  ac.setMode(kElectraAcCool);
+  ac.setTemp(24);
+  ac.setSwingH(false);
+  ac.setSwingV(false);
+  ac.setFan(kElectraAcFanLow);
+  ac.setLightToggle(true);
+  ac.setClean(true);
+
+  EXPECT_EQ(
+      "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 3 (Low), "
+      "Swing(V): Off, Swing(H): Off, Light: Toggle, Clean: On, Turbo: Off",
+      ac.toString());
+  EXPECT_STATE_EQ(on_cool_24C_fan1_swing_off_turbo_off_clean_on,
+                  ac.getRaw(), kElectraAcBits);
 }
diff --git a/lib/IRremoteESP8266-2.7.4/test/ir_Epson_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Epson_test.cpp
new file mode 100644
index 000000000..d1df3f9ac
--- /dev/null
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Epson_test.cpp
@@ -0,0 +1,159 @@
+// Copyright 2020 David Conran
+
+#include "IRac.h"
+#include "IRrecv.h"
+#include "IRrecv_test.h"
+#include "IRsend.h"
+#include "IRsend_test.h"
+#include "gtest/gtest.h"
+
+// Tests for sendEpson().
+
+// Test sending typical data only.
+TEST(TestSendEpson, SendDataOnly) {
+  IRsendTest irsend(kGpioUnused);
+  irsend.begin();
+  irsend.sendEpson(0xC1AA09F6);
+  EXPECT_EQ(
+      "f38000d33"
+      "m8960s4480"
+      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s1680"
+      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s560m560s1680"
+      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
+      "m560s41440"
+      "m8960s4480"
+      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s1680"
+      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s560m560s1680"
+      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
+      "m560s41440"
+      "m8960s4480"
+      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560m560s1680"
+      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s560m560s1680"
+      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
+      "m560s41440",
+      irsend.outputStr());
+}
+
+// Tests for decodeEpson().
+
+// Decode normal Epson messages.
+TEST(TestDecodeEpson, SyntheticSelfDecode) {
+  IRsendTest irsend(kGpioUnused);
+  IRrecv irrecv(kGpioUnused);
+  irsend.begin();
+
+  // Real-life Epson code from an actual capture/decode.
+  irsend.reset();
+  irsend.sendEpson(0xC1AA09F6);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(EPSON, irsend.capture.decode_type);
+  EXPECT_EQ(kEpsonBits, irsend.capture.bits);
+  EXPECT_EQ(0xC1AA09F6, irsend.capture.value);
+  EXPECT_EQ(0x5583, irsend.capture.address);
+  EXPECT_EQ(0x90, irsend.capture.command);
+  EXPECT_TRUE(irsend.capture.repeat);
+}
+
+// Decode a real Epson message.
+TEST(TestDecodeEpson, RealMessageDecode) {
+  IRsendTest irsend(kGpioUnused);
+  IRrecv irrecv(kGpioUnused);
+  irsend.begin();
+
+  // Real-life Epson code from an actual capture/decode.
+  irsend.reset();
+  const uint16_t rawData_0[203] = {
+      8976, 4496, 542, 1690, 542, 1688, 542, 588, 518, 612, 542, 586, 518, 610,
+      518, 610, 542, 1688, 516, 1714, 542, 614, 516, 1688, 542, 612, 516, 1690,
+      540, 614, 514, 1690, 520, 638, 516, 584, 518, 612, 542, 586, 540, 588,
+      542, 1688, 520, 610, 540, 586, 520, 1712, 540, 1692, 542, 1688, 542, 1690,
+      520, 1710, 518, 610, 518, 1712, 518, 1716, 544, 584, 544, 40870,
+      8978, 4496, 542, 1690, 542, 1688, 520, 610, 542, 584, 516, 638, 514, 588,
+      540, 588, 540, 1690, 516, 1716, 516, 614, 542, 1688, 518, 612, 542, 1688,
+      540, 614, 514, 1692, 542, 588, 538, 590, 542, 586, 542, 612, 516, 612,
+      514, 1692, 516, 612, 540, 586, 520, 1712, 518, 1714, 542, 1688, 518, 1716,
+      542, 1688, 516, 614, 542, 1686, 518, 1714, 516, 612, 532, 40882,
+      8976, 4498, 516, 1716, 542, 1690, 540, 614, 516, 614, 516, 614, 514, 588,
+      540, 588, 544, 1688, 522, 1710, 518, 638, 516, 1688, 520, 636, 492, 1714,
+      542, 586, 542, 1690, 542, 588, 542, 584, 542, 612, 516, 612, 514, 614,
+      516, 1690, 542, 586, 542, 586, 540, 1690, 518, 1712, 518, 1716, 518, 1714,
+      542, 1690, 542, 586, 540, 1690, 542, 1690, 542, 588, 540};
+  irsend.sendRaw(rawData_0, 203, 38000);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(EPSON, irsend.capture.decode_type);
+  EXPECT_EQ(kEpsonBits, irsend.capture.bits);
+  EXPECT_EQ(0xC1AA09F6, irsend.capture.value);
+  EXPECT_EQ(0x5583, irsend.capture.address);
+  EXPECT_EQ(0x90, irsend.capture.command);
+  EXPECT_TRUE(irsend.capture.repeat);
+}
+
+TEST(TestDecodeEpson, RequiresARepeat) {
+  IRsendTest irsend(kGpioUnused);
+  IRrecv irrecv(kGpioUnused);
+  irsend.begin();
+
+  // Simulate sending only two messages (mesg + repeat)
+  irsend.reset();
+  irsend.sendEpson(0xC1AA09F6, kEpsonBits, 1);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(EPSON, irsend.capture.decode_type);
+  EXPECT_EQ(kEpsonBits, irsend.capture.bits);
+  EXPECT_EQ(0xC1AA09F6, irsend.capture.value);
+  EXPECT_EQ(0x5583, irsend.capture.address);
+  EXPECT_EQ(0x90, irsend.capture.command);
+  EXPECT_TRUE(irsend.capture.repeat);
+
+  // Simulate sending no repeats (just 1 message) which should fail to be
+  // detected as Epson.
+  irsend.reset();
+  irsend.sendEpson(0xC1AA09F6, kEpsonBits, 0);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  ASSERT_NE(EPSON, irsend.capture.decode_type);
+}
+
+TEST(TestDecodeEpson, DecodeOnlyIfRepeatIsTheSame) {
+  IRsendTest irsend(kGpioUnused);
+  IRrecv irrecv(kGpioUnused);
+  irsend.begin();
+
+  // Simulate sending only two identical messages.
+  // This should succeed.
+  irsend.reset();
+  irsend.sendEpson(0xC1AA09F6, kEpsonBits, 0);
+  irsend.sendEpson(0xC1AA09F6, kEpsonBits, 0);
+
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(EPSON, irsend.capture.decode_type);
+  EXPECT_EQ(kEpsonBits, irsend.capture.bits);
+  EXPECT_EQ(0xC1AA09F6, irsend.capture.value);
+  EXPECT_EQ(0x5583, irsend.capture.address);
+  EXPECT_EQ(0x90, irsend.capture.command);
+  EXPECT_TRUE(irsend.capture.repeat);
+
+  // Simulate sending a repeat but with a different code.
+  // This should fail.
+  irsend.reset();
+  irsend.sendEpson(0xC1AA09F6, kEpsonBits, 0);  // Valid code.
+  irsend.sendEpson(0x4BB640BF, kEpsonBits, 0);  // Valid code but different.
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  ASSERT_NE(EPSON, irsend.capture.decode_type);
+}
+
+TEST(TestUtils, Housekeeping) {
+  ASSERT_EQ("EPSON", typeToString(decode_type_t::EPSON));
+  ASSERT_EQ(decode_type_t::EPSON, strToDecodeType("EPSON"));
+  ASSERT_FALSE(hasACState(decode_type_t::EPSON));
+  ASSERT_FALSE(IRac::isProtocolSupported(decode_type_t::EPSON));
+  ASSERT_EQ(kEpsonBits, IRsendTest::defaultBits(decode_type_t::EPSON));
+  ASSERT_EQ(kEpsonMinRepeat, IRsendTest::minRepeats(decode_type_t::EPSON));
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Fujitsu_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Fujitsu_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Fujitsu_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_GICable_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_GICable_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_GICable_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_GICable_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_GlobalCache_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_GlobalCache_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_GlobalCache_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Goodweather_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Goodweather_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Goodweather_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Goodweather_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Gree_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Gree_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Gree_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Gree_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Haier_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Haier_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Haier_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Haier_test.cpp
index db824a28e..ee55d2866 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Haier_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Haier_test.cpp
@@ -768,7 +768,8 @@ TEST(TestDecodeHaierAC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendHaierAC(expectedState);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeHaierAC(&irsend.capture, kHaierACBits, true));
+  ASSERT_TRUE(irrecv.decodeHaierAC(&irsend.capture, kStartOffset, kHaierACBits,
+                                   true));
   EXPECT_EQ(HAIER_AC, irsend.capture.decode_type);
   EXPECT_EQ(kHaierACBits, irsend.capture.bits);
   EXPECT_FALSE(irsend.capture.repeat);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Hitachi_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Hitachi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Hitachi_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Hitachi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Inax_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Inax_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Inax_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Inax_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_JVC_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_JVC_test.cpp
similarity index 88%
rename from lib/IRremoteESP8266-2.7.3/test/ir_JVC_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_JVC_test.cpp
index 3cd99c3aa..51b16b82c 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_JVC_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_JVC_test.cpp
@@ -110,7 +110,7 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendJVC(0xC2B8);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -122,7 +122,7 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendJVC(irsend.encodeJVC(0x07, 0x99));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0xE099, irsend.capture.value);
@@ -134,7 +134,7 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendJVC(irsend.encodeJVC(0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0x8080, irsend.capture.value);
@@ -153,7 +153,7 @@ TEST(TestDecodeJVC, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendJVC(0xC2B8, kJvcBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -162,14 +162,14 @@ TEST(TestDecodeJVC, NormalDecodeWithRepeatAndStrict) {
   EXPECT_FALSE(irsend.capture.repeat);
 
   irsend.makeDecodeResult(2 * kJvcBits + 4);
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
   EXPECT_TRUE(irsend.capture.repeat);
 
   irsend.makeDecodeResult(2 * kJvcBits + 4 + 2 * kJvcBits + 2);
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(kJvcBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -203,9 +203,9 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
   irsend.sendJVC(0x0, 8);  // Illegal value JVC 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -216,13 +216,13 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
   irsend.sendJVC(0x12345678, 32);  // Illegal value JVC 32-bit message.
   irsend.makeDecodeResult();
   // Should not pass with strict when we ask for less bits than we got.
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits, true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -235,11 +235,12 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
   irsend.makeDecodeResult();
 
   // Shouldn't pass if strict off and the wrong expected bits.
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, false));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits,
+                                false));
 
   // Re-decode with correct bit size.
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, 36, true));
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 36, false));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 36, true));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 36, false));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0x40C0, irsend.capture.value);
@@ -258,7 +259,7 @@ TEST(TestDecodeJVC, Decode64BitMessages) {
   irsend.sendJVC(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(JVC, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -307,5 +308,6 @@ TEST(TestDecodeJVC, FailToDecodeNonJVCExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, false));
+  ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kStartOffset, kJvcBits,
+                                false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Kelvinator_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Kelvinator_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Kelvinator_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_LG_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_LG_test.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/test/ir_LG_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_LG_test.cpp
index 1c2b2a856..703ea3c6c 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_LG_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_LG_test.cpp
@@ -151,7 +151,7 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendLG(0x4B4AE51, kLgBits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLgBits, irsend.capture.bits);
   EXPECT_EQ(0x4B4AE51, irsend.capture.value);
@@ -163,7 +163,7 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendLG(0xB4B4AE51, kLg32Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, false));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLg32Bits, irsend.capture.bits);
   EXPECT_EQ(0xB4B4AE51, irsend.capture.value);
@@ -175,7 +175,7 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendLG(irsend.encodeLG(0x07, 0x99));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLgBits, irsend.capture.bits);
   EXPECT_EQ(0x700992, irsend.capture.value);
@@ -187,7 +187,7 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendLG(irsend.encodeLG(0x800, 0x8000), kLg32Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLg32Bits, irsend.capture.bits);
   EXPECT_EQ(0x80080008, irsend.capture.value);
@@ -206,7 +206,7 @@ TEST(TestDecodeLG, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendLG(irsend.encodeLG(0x07, 0x99), kLgBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLgBits, irsend.capture.bits);
   EXPECT_EQ(0x700992, irsend.capture.value);
@@ -218,7 +218,7 @@ TEST(TestDecodeLG, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendLG(irsend.encodeLG(0x07, 0x99), kLg32Bits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLg32Bits, irsend.capture.bits);
   EXPECT_EQ(0x700992, irsend.capture.value);
@@ -238,19 +238,20 @@ TEST(TestDecodeLG, DecodeWithNonStrictValues) {
   irsend.reset();
   irsend.sendLG(0x1);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits,
+                               false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, false));
 
   // Illegal LG 32-bit message value.
   irsend.reset();
   irsend.sendLG(0x1111111, kLg32Bits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
 
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, false));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLg32Bits, irsend.capture.bits);
   EXPECT_EQ(0x1111111, irsend.capture.value);
@@ -261,7 +262,7 @@ TEST(TestDecodeLG, DecodeWithNonStrictValues) {
   irsend.reset();
   irsend.sendLG(0x1111111, kLg32Bits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, false));
 }
 
 // Decode unsupported LG message sizes.
@@ -276,13 +277,14 @@ TEST(TestDecodeLG, DecodeWithNonStrictSizes) {
   irsend.sendLG(irsend.encodeLG(0x07, 0x99), 16);
   irsend.makeDecodeResult();
   // Should fail when unexpected against different bit sizes.
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits,
+                               false));
 
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, 16, false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, 16, false));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(16, irsend.capture.bits);
   EXPECT_EQ(0x992, irsend.capture.value);
@@ -294,12 +296,13 @@ TEST(TestDecodeLG, DecodeWithNonStrictSizes) {
   irsend.sendLG(0x123456789, 36);  // Illegal value LG 36-bit message.
   irsend.makeDecodeResult();
   // Should fail when unexpected against different bit sizes.
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits,
+                               false));
 
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, 36, false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, 36, false));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0x123456789, irsend.capture.value);
@@ -318,9 +321,9 @@ TEST(TestDecodeLG, Decode64BitMessages) {
   // Illegal value & size LG 64-bit message.
   irsend.sendLG(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, 64, true));
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -346,7 +349,7 @@ TEST(TestDecodeLG, DecodeGlobalCacheExample) {
   irsend.sendGC(gc_test, 75);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
+  ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLg32Bits, true));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(kLg32Bits, irsend.capture.bits);
   EXPECT_EQ(0xB4B4AE51, irsend.capture.value);
@@ -371,7 +374,7 @@ TEST(TestDecodeLG, FailToDecodeNonLGExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeLG(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
+  ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kStartOffset, kLgBits, false));
 }
 
 // Tests for sendLG2().
@@ -451,6 +454,7 @@ TEST(TestDecodeLG, Issue620) {
       532, 512,  530, 484, 556, 1536, 532};  // LG 8808721
   irsend.sendRaw(rawData, 59, 38000);
   irsend.makeDecodeResult();
+
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
   EXPECT_EQ(LG, irsend.capture.decode_type);
   EXPECT_EQ(28, irsend.capture.bits);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Lasertag_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Lasertag_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Lasertag_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Lasertag_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Lego_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Lego_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Lego_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Lego_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Lutron_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Lutron_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Lutron_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Lutron_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_MWM_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_MWM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_MWM_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_MWM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Magiquest_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Magiquest_test.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Magiquest_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Magiquest_test.cpp
index bbc5f3366..1e5faf5c0 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Magiquest_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Magiquest_test.cpp
@@ -93,7 +93,8 @@ TEST(TestDecodeMagiQuest, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMagiQuest(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kMagiquestBits, true));
+  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kStartOffset,
+                                     kMagiquestBits, true));
   EXPECT_EQ(MAGIQUEST, irsend.capture.decode_type);
   EXPECT_EQ(kMagiquestBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -104,7 +105,8 @@ TEST(TestDecodeMagiQuest, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMagiQuest(irsend.encodeMagiQuest(0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kMagiquestBits, true));
+  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kStartOffset,
+                                     kMagiquestBits, true));
   EXPECT_EQ(MAGIQUEST, irsend.capture.decode_type);
   EXPECT_EQ(kMagiquestBits, irsend.capture.bits);
   EXPECT_EQ(0x10001, irsend.capture.value);
@@ -115,7 +117,8 @@ TEST(TestDecodeMagiQuest, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMagiQuest(irsend.encodeMagiQuest(0x12345678, 0xABCD));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kMagiquestBits, true));
+  ASSERT_TRUE(irrecv.decodeMagiQuest(&irsend.capture, kStartOffset,
+                                     kMagiquestBits, true));
   EXPECT_EQ(MAGIQUEST, irsend.capture.decode_type);
   EXPECT_EQ(kMagiquestBits, irsend.capture.bits);
   EXPECT_EQ(0x12345678ABCD, irsend.capture.value);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Midea_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Midea_test.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Midea_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Midea_test.cpp
index ebe291048..a43076fea 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Midea_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Midea_test.cpp
@@ -478,7 +478,8 @@ TEST(TestDecodeMidea, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMidea(0x1234567890DF);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0x1234567890DF, irsend.capture.value);
@@ -490,7 +491,8 @@ TEST(TestDecodeMidea, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMidea(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -502,7 +504,8 @@ TEST(TestDecodeMidea, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMidea(0xFFFFFFFFFFA0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFA0, irsend.capture.value);
@@ -534,20 +537,23 @@ TEST(TestDecodeMidea, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendMidea(0xA18263FFFF6E, kMideaBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0xA18263FFFF6E, irsend.capture.value);
   EXPECT_FALSE(irsend.capture.repeat);
 
   irsend.makeDecodeResult(2 * (2 * kMideaBits + 4));
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0xA18263FFFF6E, irsend.capture.value);
 
   irsend.makeDecodeResult(4 * (2 * kMideaBits + 4));
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 true));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(0xA18263FFFF6E, irsend.capture.value);
@@ -563,9 +569,10 @@ TEST(TestDecodeMidea, DecodeWithNonStrictSizes) {
   irsend.sendMidea(0x12, 8);  // Illegal value Midea 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                  true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x12, irsend.capture.value);
@@ -574,13 +581,14 @@ TEST(TestDecodeMidea, DecodeWithNonStrictSizes) {
   irsend.sendMidea(0x12345678, 32);  // Illegal value Midea 32-bit message.
   irsend.makeDecodeResult();
   // Shouldn't pass with strict when we ask for less bits than we got.
-  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kMideaBits, true));
+  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                  true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -589,7 +597,7 @@ TEST(TestDecodeMidea, DecodeWithNonStrictSizes) {
   irsend.reset();
   irsend.sendMidea(0x123456, kMideaBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, 9, false));
+  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kStartOffset, 9, false));
 }
 
 // Decode (non-standard) 64-bit messages.
@@ -603,7 +611,7 @@ TEST(TestDecodeMidea, Decode64BitMessages) {
   irsend.sendMidea(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -625,7 +633,8 @@ TEST(TestDecodeMidea, FailToDecodeNonMideaExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kMideaBits, false));
+  ASSERT_FALSE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                  false));
 }
 
 // Decode against a real capture reported by a user. See issue #354
@@ -768,7 +777,8 @@ TEST(TestDecodeMidea, Issue887) {
   irsend.reset();
   irsend.sendMidea(hwaddr);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeMidea(&irsend.capture, kMideaBits, false));
+  EXPECT_TRUE(irrecv.decodeMidea(&irsend.capture, kStartOffset, kMideaBits,
+                                 false));
   EXPECT_EQ(MIDEA, irsend.capture.decode_type);
   EXPECT_EQ(kMideaBits, irsend.capture.bits);
   EXPECT_EQ(hwaddr, irsend.capture.value);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_MitsubishiHeavy_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_MitsubishiHeavy_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_MitsubishiHeavy_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_MitsubishiHeavy_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Mitsubishi_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Mitsubishi_test.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Mitsubishi_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Mitsubishi_test.cpp
index 8236777b5..4f759c046 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Mitsubishi_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Mitsubishi_test.cpp
@@ -143,7 +143,8 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMitsubishi(0xC2B8);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                      kMitsubishiBits, true));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -154,7 +155,8 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMitsubishi(0x0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                      kMitsubishiBits, true));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -165,7 +167,8 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendMitsubishi(0xFFFF);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                      kMitsubishiBits, true));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
   EXPECT_EQ(0xFFFF, irsend.capture.value);
@@ -178,17 +181,24 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithStrict) {
   // 12 bits.
   irsend.sendMitsubishi(0xFFF, 12);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 12, true));
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                       kMitsubishiBits, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 12,
+                                       true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 64,
+                                       true));
 
   // 32 bits.
   irsend.sendMitsubishi(0xFFF, 32);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 12, true));
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 32, true));
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                       kMitsubishiBits, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 12,
+                                       true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 32,
+                                       true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 64,
+                                       true));
 }
 
 // Decode normal repeated Mitsubishi messages.
@@ -201,7 +211,8 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendMitsubishi(0xC2B8, kMitsubishiBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                      kMitsubishiBits, true));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -213,7 +224,8 @@ TEST(TestDecodeMitsubishi, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendMitsubishi(0xC2B8, kMitsubishiBits, 0);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                      kMitsubishiBits, true));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
   EXPECT_EQ(0xC2B8, irsend.capture.value);
@@ -232,31 +244,36 @@ TEST(TestDecodeMitsubishi, DecodeWithNonStrictValues) {
   irsend.sendMitsubishi(0x0, 8);  // Illegal sized Mitsubishi 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                        kMitsubishiBits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
   EXPECT_EQ(0x0, irsend.capture.address);
   EXPECT_EQ(0x0, irsend.capture.command);
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 64, false));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 64,
+                                       false));
 
   irsend.reset();
   // Illegal sized Mitsubishi 64-bit message.
   irsend.sendMitsubishi(0xFEDCBA9876543210, 64);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, true));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset,
+                                       kMitsubishiBits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 64,
+                                      false));
   EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFEDCBA9876543210, irsend.capture.value);
   EXPECT_EQ(0x0, irsend.capture.address);
   EXPECT_EQ(0x0, irsend.capture.command);
   // Should fail when we are after a shorter message than we got.
-  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, 8, false));
+  ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, 8,
+                                       false));
 }
 
 // Decode a 'real' example via GlobalCache
@@ -299,7 +316,8 @@ TEST(TestDecodeMitsubishi, FailToDecodeNonMitsubishiExample) {
 
   ASSERT_FALSE(irrecv.decodeMitsubishi(&irsend.capture));
   ASSERT_FALSE(
-      irrecv.decodeMitsubishi(&irsend.capture, kMitsubishiBits, false));
+      irrecv.decodeMitsubishi(&irsend.capture, kStartOffset, kMitsubishiBits,
+                              false));
 }
 
 // Tests for Mitsubishi A/C methods.
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_NEC_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_NEC_test.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/test/ir_NEC_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_NEC_test.cpp
index c881b7b44..f7598c981 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_NEC_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_NEC_test.cpp
@@ -162,7 +162,7 @@ TEST(TestDecodeNEC, NormalNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x0);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, 32, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(kNECBits, irsend.capture.bits);
   EXPECT_EQ(0, irsend.capture.value);
@@ -172,7 +172,7 @@ TEST(TestDecodeNEC, NormalNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x12345678);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, 32, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(kNECBits, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -189,7 +189,7 @@ TEST(TestDecodeNEC, ShortNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x0, 16);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, 16, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 16, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(16, irsend.capture.bits);
   EXPECT_EQ(0, irsend.capture.value);
@@ -200,13 +200,13 @@ TEST(TestDecodeNEC, ShortNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x0, 32);
   irsend.makeDecodeResult();
-  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, 16, false));
+  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 16, false));
 
   // Send 16 bits of data, but fail because we are expecting 17.
   irsend.reset();
   irsend.sendNEC(0x0, 16);
   irsend.makeDecodeResult();
-  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, 17, false));
+  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 17, false));
 }
 
 // Longer NEC-like messages (without strict naturally)
@@ -218,7 +218,7 @@ TEST(TestDecodeNEC, LongerNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x1234567890ABCDEF, 64);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, 64, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0x1234567890ABCDEF, irsend.capture.value);
@@ -229,7 +229,7 @@ TEST(TestDecodeNEC, LongerNECDecodeWithoutStrict) {
   irsend.reset();
   irsend.sendNEC(0x0, 63);
   irsend.makeDecodeResult();
-  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, 64, false));
+  EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 64, false));
 }
 
 // Incorrect decoding reported in Issue #243
@@ -299,7 +299,7 @@ TEST(TestDecodeNEC, NonStrictNECDecode_Issue264) {
   irsend.sendRaw(rawData, 67, 38);
   irsend.makeDecodeResult();
   EXPECT_FALSE(irrecv.decodeNEC(&irsend.capture));  // Not strictly NEC
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kNECBits, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, kNECBits, false));
   EXPECT_EQ(0x77E1A040, irsend.capture.value);
 
   // Do it all again, but with a normal decode.
@@ -331,7 +331,7 @@ TEST(TestDecodeNEC, AutoReceiveCalibration) {
 
   irsend.sendRaw(rawData, 67, 38);
   irsend.makeDecodeResult();
-  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kNECBits, false));
+  EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, kNECBits, false));
   EXPECT_EQ(NEC, irsend.capture.decode_type);
   EXPECT_EQ(kNECBits, irsend.capture.bits);
   EXPECT_EQ(0x77E1A040, irsend.capture.value);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Neoclima_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Neoclima_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Neoclima_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Neoclima_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Nikai_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Nikai_test.cpp
similarity index 87%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Nikai_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Nikai_test.cpp
index fff242326..98d6d806d 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Nikai_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Nikai_test.cpp
@@ -77,7 +77,8 @@ TEST(TestDecodeNikai, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendNikai(0x123456);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, true));
+  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                 true));
   EXPECT_EQ(NIKAI, irsend.capture.decode_type);
   EXPECT_EQ(kNikaiBits, irsend.capture.bits);
   EXPECT_EQ(0x123456, irsend.capture.value);
@@ -85,7 +86,8 @@ TEST(TestDecodeNikai, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendNikai(0x101);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, true));
+  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                 true));
   EXPECT_EQ(NIKAI, irsend.capture.decode_type);
   EXPECT_EQ(kNikaiBits, irsend.capture.bits);
   EXPECT_EQ(0x101, irsend.capture.value);
@@ -101,7 +103,8 @@ TEST(TestDecodeNikai, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendNikai(0xD5F2A, kNikaiBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, true));
+  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                 true));
   EXPECT_EQ(NIKAI, irsend.capture.decode_type);
   EXPECT_EQ(kNikaiBits, irsend.capture.bits);
   EXPECT_EQ(0xD5F2A, irsend.capture.value);
@@ -117,18 +120,20 @@ TEST(TestDecodeNikai, NormalDecodeWithNonStrict) {
   irsend.sendNikai(0x0, 16);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, true));
+  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                  true));
   // And it should fail when we expect more bits.
-  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, false));
+  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                  false));
 
   // Should pass if strict off if we ask for correct nr. of bits sent.
-  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, 16, false));
+  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kStartOffset, 16, false));
   EXPECT_EQ(NIKAI, irsend.capture.decode_type);
   EXPECT_EQ(16, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
 
   // Should fail as we are expecting less bits than there are.
-  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, 12, false));
+  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kStartOffset, 12, false));
 }
 
 // Decode (non-standard) 64-bit messages.
@@ -142,9 +147,10 @@ TEST(TestDecodeNikai, Decode64BitMessages) {
   // Illegal size Nikai 64-bit message.
   irsend.sendNikai(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, true));
+  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                  true));
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(NIKAI, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -211,5 +217,6 @@ TEST(TestDecodeNikai, FailToDecodeNonNikaiExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kNikaiBits, false));
+  ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, kStartOffset, kNikaiBits,
+                                  false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Panasonic_test.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Panasonic_test.cpp
index 97f9bbb28..7f022ed17 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Panasonic_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Panasonic_test.cpp
@@ -219,7 +219,8 @@ TEST(TestDecodePanasonic, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendPanasonic64(0x40040190ED7C);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
@@ -231,7 +232,8 @@ TEST(TestDecodePanasonic, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendPanasonic64(irsend.encodePanasonic(0x4004, 0x12, 0x34, 0x56));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x400412345670, irsend.capture.value);
@@ -243,7 +245,8 @@ TEST(TestDecodePanasonic, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendPanasonic64(irsend.encodePanasonic(0x4004, 0x1, 0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x400401010101, irsend.capture.value);
@@ -262,7 +265,8 @@ TEST(TestDecodePanasonic, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendPanasonic64(0x40040190ED7C, kPanasonicBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
@@ -271,13 +275,15 @@ TEST(TestDecodePanasonic, NormalDecodeWithRepeatAndStrict) {
   EXPECT_FALSE(irsend.capture.repeat);
 
   irsend.makeDecodeResult(2 * kPanasonicBits + 4);
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
 
   irsend.makeDecodeResult(2 * (2 * kPanasonicBits + 4));
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
@@ -293,9 +299,11 @@ TEST(TestDecodePanasonic, DecodeWithNonStrictValues) {
   irsend.sendPanasonic64(0x0);  // Illegal value Panasonic 48-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, false));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, false));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -307,9 +315,11 @@ TEST(TestDecodePanasonic, DecodeWithNonStrictValues) {
   irsend.sendPanasonic64(irsend.encodePanasonic(0, 1, 2, 3));
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, false));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, false));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x1020300, irsend.capture.value);
@@ -327,13 +337,14 @@ TEST(TestDecodePanasonic, DecodeWithNonStrictSize) {
   irsend.sendPanasonic64(0x12345678, 32);  // Illegal size Panasonic message.
   irsend.makeDecodeResult();
 
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -345,12 +356,14 @@ TEST(TestDecodePanasonic, DecodeWithNonStrictSize) {
   irsend.sendPanasonic64(irsend.encodePanasonic(0x4004, 1, 2, 3), 56);
   irsend.makeDecodeResult();
 
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, true));
   // Shouldn't pass if strict off and wrong bit size.
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, false));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, false));
   // Re-decode with correct bit size.
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, 56, true));
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, 56, false));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 56, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 56, false));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(56, irsend.capture.bits);
   EXPECT_EQ(0x400401020300, irsend.capture.value);
@@ -368,9 +381,9 @@ TEST(TestDecodePanasonic, Decode64BitMessages) {
   // Illegal value & size Panasonic 64-bit message.
   irsend.sendPanasonic64(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 64, true));
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -397,7 +410,8 @@ TEST(TestDecodePanasonic, DecodeGlobalCacheExample) {
   irsend.sendGC(gc_test, 103);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
+  ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                     kPanasonicBits, true));
   EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
   EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
   EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
@@ -430,7 +444,8 @@ TEST(TestDecodePanasonic, FailToDecodeNonPanasonicExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, false));
+  ASSERT_FALSE(irrecv.decodePanasonic(&irsend.capture, kStartOffset,
+                                      kPanasonicBits, false));
 }
 
 // Failing to decode Panasonic in Issue #245
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Pioneer_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Pioneer_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Pioneer_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Pioneer_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Pronto_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Pronto_test.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Pronto_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Pronto_test.cpp
index 513f985da..b5020987f 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Pronto_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Pronto_test.cpp
@@ -366,3 +366,28 @@ TEST(TestSendPronto, NormalPlusRepeatSequence) {
       "m8892s2210m546s95212",
       irsend.outputStr());
 }
+
+// Tests for #1034
+TEST(TestSendPronto, Issue1034) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  irsend.begin();
+
+  // JVC code allegedly.
+  uint16_t pronto_test[40] = {
+      0x0000, 0x006c, 0x0001, 0x0011, 0x0140, 0x00a0, 0x0014, 0x003c, 0x0014,
+      0x003c, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014, 0x003c,
+      0x0014, 0x0014, 0x0014, 0x003c, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014,
+      0x0014, 0x0014, 0x0014, 0x0014, 0x003c, 0x0014, 0x0014, 0x0014, 0x0014,
+      0x0014, 0x0014, 0x0014, 0x0384};
+
+  irsend.reset();
+  irsend.sendPronto(pronto_test, 40, 1);
+  irsend.makeDecodeResult();
+  EXPECT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(JVC, irsend.capture.decode_type);
+  EXPECT_EQ(kJvcBits, irsend.capture.bits);
+  EXPECT_EQ(0xc508, irsend.capture.value);
+  EXPECT_EQ(0xa3, irsend.capture.address);
+  EXPECT_EQ(0x10, irsend.capture.command);
+}
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_RC5_RC6_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_RC5_RC6_test.cpp
similarity index 88%
rename from lib/IRremoteESP8266-2.7.3/test/ir_RC5_RC6_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_RC5_RC6_test.cpp
index da9fa027c..0b46bad7f 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_RC5_RC6_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_RC5_RC6_test.cpp
@@ -202,7 +202,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(0x175);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -214,7 +214,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(0x175);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -227,7 +227,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(0x175, kRC5XBits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -239,7 +239,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(irsend.encodeRC5(0x00, 0x0B, true));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x80B, irsend.capture.value);
@@ -251,7 +251,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(irsend.encodeRC5X(0x02, 0x41, true), kRC5XBits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits, true));
   EXPECT_EQ(RC5X, irsend.capture.decode_type);
   EXPECT_EQ(kRC5XBits, irsend.capture.bits);
   EXPECT_EQ(0x1881, irsend.capture.value);
@@ -264,7 +264,7 @@ TEST(TestDecodeRC5, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC5(irsend.encodeRC5X(0x02, 0x41, true), kRC5XBits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
 }
 
 // Decode normal repeated RC5 messages.
@@ -277,7 +277,7 @@ TEST(TestDecodeRC5, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC5(0x174, kRC5Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x174, irsend.capture.value);
@@ -288,7 +288,7 @@ TEST(TestDecodeRC5, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC5(0x175, kRC5Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(kRC5Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -299,7 +299,7 @@ TEST(TestDecodeRC5, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC5(irsend.encodeRC5X(0x02, 0x41, true), kRC5XBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits, true));
   EXPECT_EQ(RC5X, irsend.capture.decode_type);
   EXPECT_EQ(kRC5XBits, irsend.capture.bits);
   EXPECT_EQ(0x1881, irsend.capture.value);
@@ -317,10 +317,11 @@ TEST(TestDecodeRC5, DecodeWithNonStrictValues) {
   irsend.sendRC5(0xFA, 8);  // Illegal value RC5 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits,
+                                true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0xFA, irsend.capture.value);
@@ -331,14 +332,15 @@ TEST(TestDecodeRC5, DecodeWithNonStrictValues) {
   irsend.sendRC5(0x12345678, 32);  // Illegal size RC5 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits,
+                                true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(RC5, irsend.capture.decode_type);
   EXPECT_EQ(31, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -347,14 +349,15 @@ TEST(TestDecodeRC5, DecodeWithNonStrictValues) {
   irsend.sendRC5(0x87654321, 32);  // Illegal size RC5 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5XBits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5XBits,
+                                true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(RC5X, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x87654321, irsend.capture.value);
@@ -371,7 +374,7 @@ TEST(TestDecodeRC5, Decode64BitMessages) {
   irsend.sendRC5(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeRC5(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(RC5X, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -392,7 +395,8 @@ TEST(TestDecodeRC5, FailToDecodeNonRC5Example) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kRC5Bits, false));
+  ASSERT_FALSE(irrecv.decodeRC5(&irsend.capture, kStartOffset, kRC5Bits,
+                                false));
 }
 
 //                      RRRRRR   CCCCC            666
@@ -688,7 +692,8 @@ TEST(TestDecodeRC6, NormalMode0DecodeWithStrict) {
   irsend.reset();
   irsend.sendRC6(0x175);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -700,7 +705,8 @@ TEST(TestDecodeRC6, NormalMode0DecodeWithStrict) {
   irsend.reset();
   irsend.sendRC6(irsend.encodeRC6(0x1234567, 0x89, kRC6Mode0Bits));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
   EXPECT_EQ(0x56789, irsend.capture.value);
@@ -712,7 +718,8 @@ TEST(TestDecodeRC6, NormalMode0DecodeWithStrict) {
   irsend.reset();
   irsend.sendRC6(0x123456789, kRC6Mode0Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
   EXPECT_EQ(0x56789, irsend.capture.value);
@@ -731,7 +738,8 @@ TEST(TestDecodeRC6, Normal36BitDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC6(0x175, kRC6_36Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -743,7 +751,8 @@ TEST(TestDecodeRC6, Normal36BitDecodeWithStrict) {
   irsend.reset();
   irsend.sendRC6(irsend.encodeRC6(0x1234567, 0x89, kRC6_36Bits), kRC6_36Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
   EXPECT_EQ(0x123456789, irsend.capture.value);
@@ -762,7 +771,8 @@ TEST(TestDecodeRC6, NormalMode0DecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC6(0x174, kRC6Mode0Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
   EXPECT_EQ(0x174, irsend.capture.value);
@@ -773,7 +783,8 @@ TEST(TestDecodeRC6, NormalMode0DecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC6(0x175, kRC6Mode0Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -791,7 +802,8 @@ TEST(TestDecodeRC6, Normal36BitDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC6(0x175, kRC6_36Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
   EXPECT_EQ(0x175, irsend.capture.value);
@@ -802,7 +814,8 @@ TEST(TestDecodeRC6, Normal36BitDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendRC6(0x174, kRC6_36Bits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                               true));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
   EXPECT_EQ(0x174, irsend.capture.value);
@@ -881,7 +894,7 @@ TEST(TestDecodeRC6, Decode36BitGlobalCacheExample) {
   irsend.sendGC(gc_test, 65);
   irsend.makeDecodeResult();
 
-  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits));
+  ASSERT_TRUE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits));
   EXPECT_EQ(RC6, irsend.capture.decode_type);
   EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
   EXPECT_EQ(0xC800F742A, irsend.capture.value);
@@ -905,18 +918,26 @@ TEST(TestDecodeRC5, FailToDecodeNonRC6Example) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, false));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, false));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                                true));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                                false));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                                true));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, kStartOffset,
+                                false));
 
   irsend.reset();
   irsend.sendRC5(0x0);
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6Mode0Bits, false));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, true));
-  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, false));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                                true));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6Mode0Bits,
+                                false));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kStartOffset, kRC6_36Bits,
+                                true));
+  ASSERT_FALSE(irrecv.decodeRC6(&irsend.capture, kRC6_36Bits, kStartOffset,
+                                false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_RCMM_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_RCMM_test.cpp
similarity index 86%
rename from lib/IRremoteESP8266-2.7.3/test/ir_RCMM_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_RCMM_test.cpp
index 22306a59b..ef37d87a6 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_RCMM_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_RCMM_test.cpp
@@ -91,7 +91,8 @@ TEST(TestDecodeRCMM, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRCMM(0xe0a600);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kRCMMBits, true));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, kRCMMBits,
+                                true));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(kRCMMBits, irsend.capture.bits);
   EXPECT_EQ(0xe0a600, irsend.capture.value);
@@ -103,7 +104,7 @@ TEST(TestDecodeRCMM, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRCMM(0x600, 12);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 12, true));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 12, true));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(12, irsend.capture.bits);
   EXPECT_EQ(0x600, irsend.capture.value);
@@ -115,7 +116,7 @@ TEST(TestDecodeRCMM, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRCMM(0x28e0a600, 32);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 32, true));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 32, true));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x28e0a600, irsend.capture.value);
@@ -134,15 +135,15 @@ TEST(TestDecodeRCMM, IllegalDecodeWithStrict) {
   irsend.reset();
   irsend.sendRCMM(0x0, 8);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, 8, true));
-  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, 12, true));
+  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 8, true));
+  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 12, true));
 
   // Illegal RCMM 36-bit message.
   irsend.reset();
   irsend.sendRCMM(0x0, 36);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, 12, true));
-  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, 36, true));
+  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 12, true));
+  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 36, true));
 }
 
 // Decodes without strict mode.
@@ -155,13 +156,13 @@ TEST(TestDecodeRCMM, DecodeWithoutStrict) {
   irsend.reset();
   irsend.sendRCMM(0x55, 8);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x55, irsend.capture.value);
   EXPECT_EQ(0x0, irsend.capture.address);
   EXPECT_EQ(0x0, irsend.capture.command);
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 12, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 12, false));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x55, irsend.capture.value);
@@ -172,18 +173,18 @@ TEST(TestDecodeRCMM, DecodeWithoutStrict) {
   irsend.reset();
   irsend.sendRCMM(0x123456789, 36);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 12, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 12, false));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0x123456789, irsend.capture.value);
   EXPECT_EQ(0x0, irsend.capture.address);
   EXPECT_EQ(0x0, irsend.capture.command);
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 24, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 24, false));
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0x123456789, irsend.capture.value);
   EXPECT_EQ(0x0, irsend.capture.address);
   EXPECT_EQ(0x0, irsend.capture.command);
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 36, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 36, false));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0x123456789, irsend.capture.value);
@@ -202,7 +203,7 @@ TEST(TestDecodeRCMM, Decode64BitMessages) {
   irsend.sendRCMM(0xFEDCBA9876543210, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(RCMM, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFEDCBA9876543210, irsend.capture.value);
@@ -226,7 +227,8 @@ TEST(TestDecodeRCMM, FailToDecodeNonRCMMExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kRCMMBits, false));
+  ASSERT_FALSE(irrecv.decodeRCMM(&irsend.capture, kStartOffset, kRCMMBits,
+                                 false));
 }
 
 // Issue 281 Debugging
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Samsung_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Samsung_test.cpp
similarity index 93%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Samsung_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Samsung_test.cpp
index 9a572c631..c44572934 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Samsung_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Samsung_test.cpp
@@ -107,7 +107,8 @@ TEST(TestDecodeSamsung, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSAMSUNG(0xE0E09966);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   true));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0xE0E09966, irsend.capture.value);
@@ -118,7 +119,8 @@ TEST(TestDecodeSamsung, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSAMSUNG(irsend.encodeSAMSUNG(0x07, 0x99));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   true));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0xE0E09966, irsend.capture.value);
@@ -129,7 +131,8 @@ TEST(TestDecodeSamsung, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSAMSUNG(irsend.encodeSAMSUNG(0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   true));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0x8080807F, irsend.capture.value);
@@ -147,7 +150,8 @@ TEST(TestDecodeSamsung, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendSAMSUNG(0xE0E09966, kSamsungBits, 2);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   true));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0xE0E09966, irsend.capture.value);
@@ -165,9 +169,11 @@ TEST(TestDecodeSamsung, DecodeWithNonStrictValues) {
   irsend.sendSAMSUNG(0x0);  // Illegal value Samsung 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, false));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   false));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -178,9 +184,11 @@ TEST(TestDecodeSamsung, DecodeWithNonStrictValues) {
   irsend.sendSAMSUNG(0x12345678);  // Illegal value Samsung 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, false));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                   false));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(kSamsungBits, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -192,12 +200,14 @@ TEST(TestDecodeSamsung, DecodeWithNonStrictValues) {
   irsend.sendSAMSUNG(irsend.encodeSAMSUNG(0, 0), 36);
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    true));
   // Shouldn't pass if strict off and wrong expected bit size.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, false));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    false));
   // Re-decode with correct bit size.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, 36, true));
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, 36, false));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, 36, true));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, 36, false));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(36, irsend.capture.bits);
   EXPECT_EQ(0xFF, irsend.capture.value);  // We told it to expect 8 bits less.
@@ -214,7 +224,7 @@ TEST(TestDecodeSamsung, DecodeWithNonStrictValues) {
   ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, false));
 
   // Should pass if strict off if we ask for correct nr. of bits sent.
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, 16, false));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, 16, false));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(16, irsend.capture.bits);
   EXPECT_EQ(0xFF, irsend.capture.value);  // We told it to expect 4 bits less.
@@ -222,7 +232,7 @@ TEST(TestDecodeSamsung, DecodeWithNonStrictValues) {
   EXPECT_EQ(0x00, irsend.capture.command);
 
   // Should fail as we are expecting less bits than there are.
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, 12, false));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, 12, false));
 }
 
 // Decode (non-standard) 64-bit messages.
@@ -236,9 +246,10 @@ TEST(TestDecodeSamsung, Decode64BitMessages) {
   // Illegal value & size Samsung 64-bit message.
   irsend.sendSAMSUNG(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, true));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    true));
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -289,7 +300,8 @@ TEST(TestDecodeSamsung, FailToDecodeNonSamsungExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kSamsungBits, false));
+  ASSERT_FALSE(irrecv.decodeSAMSUNG(&irsend.capture, kStartOffset, kSamsungBits,
+                                    false));
 }
 
 // General housekeeping
@@ -451,6 +463,26 @@ TEST(TestIRSamsungAcClass, SetAndGetBeep) {
   EXPECT_TRUE(samsung.getBeep());
 }
 
+TEST(TestIRSamsungAcClass, SetAndGetDisplay) {
+  IRSamsungAc ac(0);
+  ac.setDisplay(true);
+  EXPECT_TRUE(ac.getDisplay());
+  ac.setDisplay(false);
+  EXPECT_FALSE(ac.getDisplay());
+  ac.setDisplay(true);
+  EXPECT_TRUE(ac.getDisplay());
+}
+
+TEST(TestIRSamsungAcClass, SetAndGetIon) {
+  IRSamsungAc ac(0);
+  ac.setIon(true);
+  EXPECT_TRUE(ac.getIon());
+  ac.setIon(false);
+  EXPECT_FALSE(ac.getIon());
+  ac.setIon(true);
+  EXPECT_TRUE(ac.getIon());
+}
+
 TEST(TestIRSamsungAcClass, SetAndGetTemp) {
   IRSamsungAc samsung(0);
   samsung.setTemp(25);
@@ -549,7 +581,8 @@ TEST(TestIRSamsungAcClass, SetAndGetPowerful) {
   EXPECT_EQ(kSamsungAcFanTurbo, ac.getFan());
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 7 (Turbo), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: On", ac.toString());
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: On, Light: On, Ion: Off",
+      ac.toString());
 
   uint8_t off[kSamsungAcStateLength] = {
       0x02, 0x92, 0x0F, 0x00, 0x00, 0x00, 0xF0,
@@ -559,7 +592,8 @@ TEST(TestIRSamsungAcClass, SetAndGetPowerful) {
   EXPECT_NE(kSamsungAcFanTurbo, ac.getFan());
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off", ac.toString());
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
+      ac.toString());
 }
 
 TEST(TestIRSamsungAcClass, QuietAndPowerfulAreMutuallyExclusive) {
@@ -624,7 +658,7 @@ TEST(TestIRSamsungAcClass, HumanReadable) {
   IRSamsungAc samsung(0);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 2 (Low), Swing: On, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
   samsung.setTemp(kSamsungAcMaxTemp);
   samsung.setMode(kSamsungAcHeat);
@@ -635,18 +669,24 @@ TEST(TestIRSamsungAcClass, HumanReadable) {
   samsung.setClean(true);
   EXPECT_EQ(
       "Power: Off, Mode: 4 (Heat), Temp: 30C, Fan: 5 (High), Swing: Off, "
-      "Beep: On, Clean: On, Quiet: Off, Powerful: Off",
+      "Beep: On, Clean: On, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
   samsung.setQuiet(true);
   EXPECT_EQ(
       "Power: Off, Mode: 4 (Heat), Temp: 30C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: On, Clean: On, Quiet: On, Powerful: Off",
+      "Beep: On, Clean: On, Quiet: On, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
   samsung.setQuiet(false);
   samsung.setPowerful(true);
   EXPECT_EQ(
       "Power: Off, Mode: 4 (Heat), Temp: 30C, Fan: 7 (Turbo), Swing: Off, "
-      "Beep: On, Clean: On, Quiet: Off, Powerful: On",
+      "Beep: On, Clean: On, Quiet: Off, Powerful: On, Light: On, Ion: Off",
+      samsung.toString());
+  samsung.setIon(true);
+  samsung.setDisplay(false);
+  EXPECT_EQ(
+      "Power: Off, Mode: 4 (Heat), Temp: 30C, Fan: 7 (Turbo), Swing: Off, "
+      "Beep: On, Clean: On, Quiet: Off, Powerful: On, Light: Off, Ion: On",
       samsung.toString());
 }
 
@@ -750,7 +790,7 @@ TEST(TestDecodeSamsungAC, DecodeRealExample) {
   samsung.setRaw(irsend.capture.state);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 2 (Low), Swing: On, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -799,7 +839,7 @@ TEST(TestDecodeSamsungAC, DecodeRealExample2) {
   samsung.setRaw(irsend.capture.state);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -858,7 +898,7 @@ TEST(TestDecodeSamsungAC, DecodePowerOnSample) {
   samsung.setRaw(irsend.capture.state, kSamsungAcExtendedStateLength);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 24C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -918,7 +958,7 @@ TEST(TestDecodeSamsungAC, DecodePowerOffSample) {
   samsung.setRaw(irsend.capture.state, kSamsungAcExtendedStateLength);
   EXPECT_EQ(
       "Power: Off, Mode: 1 (Cool), Temp: 24C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -965,7 +1005,7 @@ TEST(TestDecodeSamsungAC, DecodeHeatSample) {
   samsung.setRaw(irsend.capture.state);
   EXPECT_EQ(
       "Power: On, Mode: 4 (Heat), Temp: 17C, Fan: 0 (Auto), Swing: On, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -1012,7 +1052,7 @@ TEST(TestDecodeSamsungAC, DecodeCoolSample) {
   samsung.setRaw(irsend.capture.state);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 20C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -1070,7 +1110,7 @@ TEST(TestDecodeSamsungAC, Issue604DecodeExtended) {
   samsung.setRaw(irsend.capture.state, irsend.capture.bits / 8);
   EXPECT_EQ(
       "Power: Off, Mode: 4 (Heat), Temp: 30C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       samsung.toString());
 }
 
@@ -1267,7 +1307,7 @@ TEST(TestIRSamsungAcClass, Issue604SendPowerHack) {
       "m586s100000";
   std::string text = "Power: On, Mode: 1 (Cool), Temp: 23C, Fan: 4 (Med), "
                      "Swing: On, Beep: Off, Clean: Off, Quiet: Off, "
-                     "Powerful: Off";
+                     "Powerful: Off, Light: On, Ion: Off";
   // Don't do a setPower()/on()/off() as that will trigger the special message.
   // So it should only be the normal "settings" message.
   ac.setTemp(23);
@@ -1328,6 +1368,8 @@ TEST(TestIRSamsungAcClass, toCommon) {
   ac.setBeep(true);
   ac.setClean(true);
   ac.setQuiet(true);
+  ac.setDisplay(true);
+  ac.setIon(true);
   // Now test it.
   ASSERT_EQ(decode_type_t::SAMSUNG_AC, ac.toCommon().protocol);
   ASSERT_EQ(-1, ac.toCommon().model);
@@ -1339,13 +1381,13 @@ TEST(TestIRSamsungAcClass, toCommon) {
   ASSERT_EQ(stdAc::swingv_t::kAuto, ac.toCommon().swingv);
   ASSERT_FALSE(ac.toCommon().turbo);
   ASSERT_TRUE(ac.toCommon().quiet);
+  ASSERT_TRUE(ac.toCommon().light);
+  ASSERT_TRUE(ac.toCommon().filter);
   ASSERT_TRUE(ac.toCommon().clean);
   ASSERT_TRUE(ac.toCommon().beep);
   // Unsupported.
   ASSERT_EQ(stdAc::swingh_t::kOff, ac.toCommon().swingh);
   ASSERT_FALSE(ac.toCommon().econo);
-  ASSERT_FALSE(ac.toCommon().light);
-  ASSERT_FALSE(ac.toCommon().filter);
   ASSERT_EQ(-1, ac.toCommon().sleep);
   ASSERT_EQ(-1, ac.toCommon().clock);
 }
@@ -1392,7 +1434,7 @@ TEST(TestDecodeSamsungAC, Issue734QuietSetting) {
   ac.setRaw(irsend.capture.state, irsend.capture.bits / 8);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: On, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: On, Powerful: Off, Light: On, Ion: Off",
       ac.toString());
 
   // Make sure the ac class state is in something wildly different first.
@@ -1414,7 +1456,7 @@ TEST(TestDecodeSamsungAC, Issue734QuietSetting) {
   ac.setQuiet(true);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: On, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: On, Powerful: Off, Light: On, Ion: Off",
       ac.toString());
   // Check it matches the known good/expected state.
   EXPECT_STATE_EQ(expectedState, ac.getRaw(), kSamsungAcBits);
@@ -1464,6 +1506,6 @@ TEST(TestDecodeSamsungAC, Issue734PowerfulOff) {
   ac.setRaw(irsend.capture.state, irsend.capture.bits / 8);
   EXPECT_EQ(
       "Power: On, Mode: 1 (Cool), Temp: 16C, Fan: 0 (Auto), Swing: Off, "
-      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off",
+      "Beep: Off, Clean: Off, Quiet: Off, Powerful: Off, Light: On, Ion: Off",
       ac.toString());
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Sanyo_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Sanyo_test.cpp
similarity index 81%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Sanyo_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Sanyo_test.cpp
index 165e29f17..c59113cda 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Sanyo_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Sanyo_test.cpp
@@ -71,7 +71,8 @@ TEST(TestDecodeSanyoLC7461, NormalDecodeWithStrict) {
   irsend.sendSanyoLC7461(0x1D8113F00FF);
   irsend.makeDecodeResult();
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x1D8113F00FF, irsend.capture.value);
@@ -84,7 +85,8 @@ TEST(TestDecodeSanyoLC7461, NormalDecodeWithStrict) {
   irsend.sendSanyoLC7461(irsend.encodeSanyoLC7461(0x1234, 0x56));
   irsend.makeDecodeResult();
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x2468DCB56A9, irsend.capture.value);
@@ -97,7 +99,8 @@ TEST(TestDecodeSanyoLC7461, NormalDecodeWithStrict) {
   irsend.sendSanyoLC7461(irsend.encodeSanyoLC7461(0x1, 0x1));
   irsend.makeDecodeResult();
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x3FFE01FE, irsend.capture.value);
@@ -117,7 +120,8 @@ TEST(TestDecodeSanyoLC7461, NormalDecodeWithRepeatAndStrict) {
   irsend.sendSanyoLC7461(0x3FFE01FE, kSanyoLC7461Bits, 1);
   irsend.makeDecodeResult();
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x3FFE01FE, irsend.capture.value);
@@ -137,10 +141,12 @@ TEST(TestDecodeSanyoLC7461, DecodeWithNonStrictValues) {
   irsend.makeDecodeResult();
   // Should fail with strict on.
   ASSERT_FALSE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   // Should pass if strict off.
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, false));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               false));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -152,17 +158,22 @@ TEST(TestDecodeSanyoLC7461, DecodeWithNonStrictValues) {
   irsend.sendSanyoLC7461(0x1234567890A);
   irsend.makeDecodeResult();
   ASSERT_FALSE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
 
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, 32, true));
-  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, 64, true));
+  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, 32,
+                                        true));
+  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, 64,
+                                        true));
   // And should fail for a bad value.
   ASSERT_FALSE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   // Should pass if strict off.
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, false));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               false));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x1234567890A, irsend.capture.value);
@@ -170,7 +181,8 @@ TEST(TestDecodeSanyoLC7461, DecodeWithNonStrictValues) {
   EXPECT_EQ(0x89, irsend.capture.command);
 
   // Shouldn't pass if strict off and looking for a smaller size.
-  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, 34, false));
+  ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, 34,
+                                        false));
 }
 
 // Decode (non-standard) 64-bit messages.
@@ -184,7 +196,8 @@ TEST(TestDecodeSanyoLC7461, Decode64BitMessages) {
   irsend.sendSanyoLC7461(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeSanyoLC7461(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, 64,
+                                       false));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -210,7 +223,8 @@ TEST(TestDecodeSanyoLC7461, DecodeGlobalCacheExample) {
   irsend.makeDecodeResult();
 
   ASSERT_TRUE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, true));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               true));
   EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
   EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
   EXPECT_EQ(0x1D8113F00FF, irsend.capture.value);
@@ -219,7 +233,7 @@ TEST(TestDecodeSanyoLC7461, DecodeGlobalCacheExample) {
   EXPECT_FALSE(irsend.capture.repeat);
 
   // Confirm what the 42-bit NEC decode is.
-  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, 42, false));
+  ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, kStartOffset, 42, false));
   EXPECT_EQ(0x1D8113F00FF, irsend.capture.value);
 }
 
@@ -240,5 +254,6 @@ TEST(TestDecodeSanyoLC7461, FailToDecodeNonSanyoLC7461Example) {
 
   ASSERT_FALSE(irrecv.decodeSanyoLC7461(&irsend.capture));
   ASSERT_FALSE(
-      irrecv.decodeSanyoLC7461(&irsend.capture, kSanyoLC7461Bits, false));
+      irrecv.decodeSanyoLC7461(&irsend.capture, kStartOffset, kSanyoLC7461Bits,
+                               false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Sharp_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Sharp_test.cpp
similarity index 94%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Sharp_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Sharp_test.cpp
index 571e59859..e605e0d05 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Sharp_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Sharp_test.cpp
@@ -196,7 +196,8 @@ TEST(TestDecodeSharp, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSharpRaw(0x454A);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  EXPECT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                 true));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(kSharpBits, irsend.capture.bits);
   EXPECT_EQ(0x454A, irsend.capture.value);
@@ -208,7 +209,8 @@ TEST(TestDecodeSharp, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSharpRaw(irsend.encodeSharp(0x07, 0x99));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                 true));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(kSharpBits, irsend.capture.bits);
   EXPECT_EQ(0x7266, irsend.capture.value);
@@ -220,7 +222,8 @@ TEST(TestDecodeSharp, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendSharpRaw(irsend.encodeSharp(0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                 true));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(kSharpBits, irsend.capture.bits);
   EXPECT_EQ(0x4202, irsend.capture.value);
@@ -239,7 +242,8 @@ TEST(TestDecodeSharp, NormalDecodeWithRepeatAndStrict) {
   irsend.reset();
   irsend.sendSharpRaw(0x7266, kSharpBits, 1);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                 true));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(kSharpBits, irsend.capture.bits);
   EXPECT_EQ(0x7266, irsend.capture.value);
@@ -247,7 +251,8 @@ TEST(TestDecodeSharp, NormalDecodeWithRepeatAndStrict) {
   EXPECT_EQ(0x99, irsend.capture.command);
 
   irsend.makeDecodeResult(2 * (2 * kSharpBits + kFooter));
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                 true));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(kSharpBits, irsend.capture.bits);
   EXPECT_EQ(0x7266, irsend.capture.value);
@@ -263,9 +268,10 @@ TEST(TestDecodeSharp, DecodeWithNonStrict) {
   irsend.sendSharpRaw(0x0, 8);  // Illegal length Sharp 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                  true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x0, irsend.capture.value);
@@ -276,12 +282,13 @@ TEST(TestDecodeSharp, DecodeWithNonStrict) {
   irsend.sendSharpRaw(0x12345678, 32);  // Illegal length Sharp 32-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kSharpBits, true));
+  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                  true));
 
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, 32, true));
+  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kStartOffset, 32, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, 32, false));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, 32, false));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(32, irsend.capture.bits);
   EXPECT_EQ(0x12345678, irsend.capture.value);
@@ -300,7 +307,7 @@ TEST(TestDecodeSharp, Decode64BitMessages) {
   irsend.sendSharpRaw(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeSharp(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(SHARP, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -350,7 +357,8 @@ TEST(TestDecodeSharp, FailToDecodeNonSharpExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kSharpBits, false));
+  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                  false));
 
   // Test only half of a good message, as it is sent (sort of) twice.
   uint16_t gc_half[35] = {38000, 1,  1,  10, 70, 10, 30, 10, 30, 10, 30,  10,
@@ -361,7 +369,8 @@ TEST(TestDecodeSharp, FailToDecodeNonSharpExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kSharpBits, false));
+  ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kStartOffset, kSharpBits,
+                                  false));
 }
 
 // https://github.com/crankyoldgit/IRremoteESP8266/issues/638#issue-421064165
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Sherwood_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Sherwood_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Sherwood_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Sherwood_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Sony_test.cpp
similarity index 88%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Sony_test.cpp
index 18fc58334..c69d40e67 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Sony_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Sony_test.cpp
@@ -193,7 +193,7 @@ TEST(TestDecodeSony, SonyDecodeWithUnexpectedLegalSize) {
   irsend.reset();
   irsend.sendSony(irsend.encodeSony(kSony20Bits, 0x1, 0x1, 0x1));
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSonyMinBits));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSonyMinBits));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
   EXPECT_EQ(kSony20Bits, irsend.capture.bits);
   EXPECT_EQ(0x81080, irsend.capture.value);
@@ -204,7 +204,7 @@ TEST(TestDecodeSony, SonyDecodeWithUnexpectedLegalSize) {
   irsend.reset();
   irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony20Bits));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
   EXPECT_EQ(kSony12Bits, irsend.capture.bits);
   EXPECT_EQ(0xA90, irsend.capture.value);
@@ -215,22 +215,28 @@ TEST(TestDecodeSony, SonyDecodeWithUnexpectedLegalSize) {
   irsend.reset();
   irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
 
   // 15-bit message should be regected when using strict and a different size.
   irsend.reset();
   irsend.sendSony(irsend.encodeSony(kSony15Bits, 21, 1), kSony15Bits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
 
   // 20-bit message should be regected when using strict and a different size.
   irsend.reset();
   irsend.sendSony(irsend.encodeSony(kSony20Bits, 1, 1, 1), kSony20Bits);
   irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
 }
 
 // Decode unsupported Sony messages. i.e non-standard sizes.
@@ -243,10 +249,14 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
   irsend.sendSony(0xFF, 8);  // Illegal 8-bit Sony-like message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSonyMinBits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
   // Should work with a 'normal' match (not strict)
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -259,10 +269,14 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
   irsend.sendSony(0x1FFF, 13);  // Illegal 13-bit Sony-like message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSonyMinBits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
   // Should work with a 'normal' match (not strict)
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -275,10 +289,14 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
   irsend.sendSony(0x1FFFF, 17);  // Illegal 17-bit Sony-like message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSonyMinBits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
   // Should work with a 'normal' match (not strict)
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -291,10 +309,14 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
   irsend.sendSony(0x1FFFFF, 21);  // Illegal 21-bit Sony-like message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSonyMinBits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony15Bits,
+                                 true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony20Bits,
+                                 true));
   // Should work with a 'normal' match (not strict)
   ASSERT_TRUE(irrecv.decode(&irsend.capture));
   EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -336,7 +358,8 @@ TEST(TestDecodeSony, DecodeGlobalCacheExample) {
   EXPECT_EQ(0x1, irsend.capture.address);
   EXPECT_EQ(0x2E, irsend.capture.command);
   // With strict and correct size.
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kStartOffset, kSony12Bits,
+                                true));
 }
 
 // Encoding & Decode 20 bit Sony messages. Issue #476
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Tcl_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Tcl_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Tcl_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Tcl_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Teco_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Teco_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Teco_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Teco_test.cpp
index cb6c8bcd9..635e93a44 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Teco_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Teco_test.cpp
@@ -353,7 +353,8 @@ TEST(TestDecodeTeco, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendTeco(expectedState);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeTeco(&irsend.capture, kTecoBits, true));
+  ASSERT_TRUE(irrecv.decodeTeco(&irsend.capture, kStartOffset, kTecoBits,
+                                true));
   EXPECT_EQ(TECO, irsend.capture.decode_type);
   EXPECT_EQ(kTecoBits, irsend.capture.bits);
   EXPECT_FALSE(irsend.capture.repeat);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Toshiba_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Toshiba_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Toshiba_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Toshiba_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Trotec_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Trotec_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Trotec_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Trotec_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Vestel_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Vestel_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Vestel_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Vestel_test.cpp
index 4164386f7..d20a882a6 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Vestel_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Vestel_test.cpp
@@ -407,7 +407,8 @@ TEST(TestDecodeVestelAc, NormalDecodeWithStrict) {
   irsend.reset();
   irsend.sendVestelAc(expectedState);
   irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeVestelAc(&irsend.capture, kVestelAcBits, true));
+  ASSERT_TRUE(irrecv.decodeVestelAc(&irsend.capture, kStartOffset,
+                                    kVestelAcBits, true));
   EXPECT_EQ(VESTEL_AC, irsend.capture.decode_type);
   EXPECT_EQ(kVestelAcBits, irsend.capture.bits);
   EXPECT_FALSE(irsend.capture.repeat);
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Whirlpool_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Whirlpool_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Whirlpool_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/test/ir_Whynter_test.cpp b/lib/IRremoteESP8266-2.7.4/test/ir_Whynter_test.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.7.3/test/ir_Whynter_test.cpp
rename to lib/IRremoteESP8266-2.7.4/test/ir_Whynter_test.cpp
index 0c45f2654..eaccf0ea1 100644
--- a/lib/IRremoteESP8266-2.7.3/test/ir_Whynter_test.cpp
+++ b/lib/IRremoteESP8266-2.7.4/test/ir_Whynter_test.cpp
@@ -199,10 +199,11 @@ TEST(TestDecodeWhynter, DecodeWithNonStrictSizes) {
   irsend.sendWhynter(0x12, 8);  // Illegal sized Whynter 8-bit message.
   irsend.makeDecodeResult();
   // Should fail with strict on.
-  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kWhynterBits, true));
-  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, 8, true));
+  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, kWhynterBits,
+                                    true));
+  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, 8, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, 8, false));
+  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, 8, false));
   EXPECT_EQ(WHYNTER, irsend.capture.decode_type);
   EXPECT_EQ(8, irsend.capture.bits);
   EXPECT_EQ(0x12, irsend.capture.value);
@@ -213,13 +214,14 @@ TEST(TestDecodeWhynter, DecodeWithNonStrictSizes) {
   irsend.sendWhynter(0x1234567890, 40);  // Illegal size Whynter 40-bit message.
   irsend.makeDecodeResult();
   // Shouldn't pass with strict when we ask for less bits than we got.
-  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kWhynterBits, true));
+  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, kWhynterBits,
+                                    true));
 
   irsend.makeDecodeResult();
   // Should fail with strict when we ask for the wrong bit size.
-  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, 40, true));
+  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, 40, true));
   // Should pass if strict off.
-  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, 40, false));
+  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, 40, false));
   EXPECT_EQ(WHYNTER, irsend.capture.decode_type);
   EXPECT_EQ(40, irsend.capture.bits);
   EXPECT_EQ(0x1234567890, irsend.capture.value);
@@ -238,7 +240,7 @@ TEST(TestDecodeWhynter, Decode64BitMessages) {
   irsend.sendWhynter(0xFFFFFFFFFFFFFFFF, 64);
   irsend.makeDecodeResult();
   // Should work with a 'normal' match (not strict)
-  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, 64, false));
+  ASSERT_TRUE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, 64, false));
   EXPECT_EQ(WHYNTER, irsend.capture.decode_type);
   EXPECT_EQ(64, irsend.capture.bits);
   EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
@@ -262,5 +264,6 @@ TEST(TestDecodeWhynter, FailToDecodeNonWhynterExample) {
   irsend.makeDecodeResult();
 
   ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture));
-  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kWhynterBits, false));
+  ASSERT_FALSE(irrecv.decodeWhynter(&irsend.capture, kStartOffset, kWhynterBits,
+                                    false));
 }
diff --git a/lib/IRremoteESP8266-2.7.3/tools/Makefile b/lib/IRremoteESP8266-2.7.4/tools/Makefile
similarity index 98%
rename from lib/IRremoteESP8266-2.7.3/tools/Makefile
rename to lib/IRremoteESP8266-2.7.4/tools/Makefile
index 6868f97db..0ee8cc563 100644
--- a/lib/IRremoteESP8266-2.7.3/tools/Makefile
+++ b/lib/IRremoteESP8266-2.7.4/tools/Makefile
@@ -51,7 +51,7 @@ PROTOCOLS = ir_NEC.o ir_Sony.o ir_Samsung.o ir_JVC.o ir_RCMM.o ir_RC5_RC6.o \
             ir_GICable.o ir_Whirlpool.o ir_Lutron.o ir_Electra.o ir_Pioneer.o \
             ir_MWM.o ir_Vestel.o ir_Teco.o ir_Tcl.o ir_Lego.o \
             ir_MitsubishiHeavy.o ir_Goodweather.o ir_Inax.o ir_Argo.o \
-						ir_Trotec.o ir_Neoclima.o ir_Amcor.o
+						ir_Trotec.o ir_Neoclima.o ir_Amcor.o ir_Epson.o
 
 # Common object files
 COMMON_OBJ = IRutils.o IRtimer.o IRsend.o IRrecv.o IRtext.o IRac.o $(PROTOCOLS)
@@ -234,5 +234,8 @@ ir_Neoclima.o : $(USER_DIR)/ir_Neoclima.cpp $(USER_DIR)/ir_Neoclima.h $(COMMON_D
 ir_Amcor.o : $(USER_DIR)/ir_Amcor.cpp $(USER_DIR)/ir_Amcor.h $(GTEST_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_Amcor.cpp
 
+ir_Epson.o : $(USER_DIR)/ir_Epson.cpp $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c $(USER_DIR)/ir_Epson.cpp
+
 IRac.o : $(USER_DIR)/IRac.cpp $(USER_DIR)/IRac.h $(COMMON_DEPS) $(GTEST_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)  -c $(USER_DIR)/IRac.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/tools/RawToGlobalCache.sh b/lib/IRremoteESP8266-2.7.4/tools/RawToGlobalCache.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/RawToGlobalCache.sh
rename to lib/IRremoteESP8266-2.7.4/tools/RawToGlobalCache.sh
diff --git a/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data.py b/lib/IRremoteESP8266-2.7.4/tools/auto_analyse_raw_data.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data.py
rename to lib/IRremoteESP8266-2.7.4/tools/auto_analyse_raw_data.py
diff --git a/lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data_test.py b/lib/IRremoteESP8266-2.7.4/tools/auto_analyse_raw_data_test.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/auto_analyse_raw_data_test.py
rename to lib/IRremoteESP8266-2.7.4/tools/auto_analyse_raw_data_test.py
diff --git a/lib/IRremoteESP8266-2.7.3/tools/gc_decode.cpp b/lib/IRremoteESP8266-2.7.4/tools/gc_decode.cpp
similarity index 84%
rename from lib/IRremoteESP8266-2.7.3/tools/gc_decode.cpp
rename to lib/IRremoteESP8266-2.7.4/tools/gc_decode.cpp
index a1d828d1c..f1c374bbe 100644
--- a/lib/IRremoteESP8266-2.7.3/tools/gc_decode.cpp
+++ b/lib/IRremoteESP8266-2.7.4/tools/gc_decode.cpp
@@ -27,18 +27,20 @@ void str_to_uint16(char *str, uint16_t *res, uint8_t base) {
 void usage_error(char *name) {
   std::cerr << "Usage: " << name << " [-gc] [-rawdump] <global_code>"
             << std::endl
-            << "Usage: " << name << " -prontohex [-rawdump] <prontohex_code>"
+            << "Usage: " << name
+            << " -prontohex [-rawdump] [-repeats num] <prontohex_code>"
             << std::endl
             << "Usage: " << name << " -raw [-rawdump] <raw_code>" << std::endl;
 }
 
 int main(int argc, char *argv[]) {
   int argv_offset = 1;
+  int repeats = 0;
   bool dumpraw = false;
   enum decode_type_t input_type = GLOBALCACHE;
   const uint16_t raw_freq = 38;
   // Check the invocation/calling usage.
-  if (argc < 2 || argc > 4) {
+  if (argc < 2 || argc > 6) {
     usage_error(argv[0]);
     return 1;
   }
@@ -52,11 +54,24 @@ int main(int argc, char *argv[]) {
     argv_offset++;
   }
 
-  if (strncmp("-rawdump", argv[argv_offset], 7) == 0) {
+  if (strncmp("-rawdump", argv[argv_offset], 8) == 0) {
     dumpraw = true;
     argv_offset++;
   }
 
+  if (input_type == PRONTO && strncmp("-repeats", argv[argv_offset], 8) == 0) {
+    argv_offset++;
+    if (argc - argv_offset <= 1) {
+      usage_error(argv[0]);
+      return 1;
+    }
+    repeats = atoi(argv[argv_offset++]);
+    if (repeats < 0) {
+      usage_error(argv[0]);
+      return 1;
+    }
+  }
+
   if (argc - argv_offset != 1) {
     usage_error(argv[0]);
     return 1;
@@ -80,8 +95,8 @@ int main(int argc, char *argv[]) {
     index++;
   }
 
-  IRsendTest irsend(4);
-  IRrecv irrecv(4);
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
   irsend.begin();
   irsend.reset();
 
@@ -90,7 +105,7 @@ int main(int argc, char *argv[]) {
       irsend.sendGC(gc_test, index);
       break;
     case PRONTO:
-      irsend.sendPronto(gc_test, index);
+      irsend.sendPronto(gc_test, index, repeats);
       break;
     case RAW:
       irsend.sendRaw(gc_test, index, raw_freq);
diff --git a/lib/IRremoteESP8266-2.7.3/tools/generate_irtext_h.sh b/lib/IRremoteESP8266-2.7.4/tools/generate_irtext_h.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/generate_irtext_h.sh
rename to lib/IRremoteESP8266-2.7.4/tools/generate_irtext_h.sh
diff --git a/lib/IRremoteESP8266-2.7.3/tools/mkkeywords b/lib/IRremoteESP8266-2.7.4/tools/mkkeywords
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/mkkeywords
rename to lib/IRremoteESP8266-2.7.4/tools/mkkeywords
diff --git a/lib/IRremoteESP8266-2.7.3/tools/mode2_decode.cpp b/lib/IRremoteESP8266-2.7.4/tools/mode2_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/mode2_decode.cpp
rename to lib/IRremoteESP8266-2.7.4/tools/mode2_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.3/tools/scrape_supported_devices.py b/lib/IRremoteESP8266-2.7.4/tools/scrape_supported_devices.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.3/tools/scrape_supported_devices.py
rename to lib/IRremoteESP8266-2.7.4/tools/scrape_supported_devices.py
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b304bf95b..ee767851a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
 - Add support for Jarolift rollers by Keeloq algorithm
+- Change IRremoteESP8266 library updated to v2.7.4
 
 ### 8.1.0.9 20200220
 

From 6874dddf035fa28031d2b82158d38c816fdd4b68 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:34:58 +0100
Subject: [PATCH 373/403] Delete eagle.flash.1m0.ld

---
 .../tools/sdk/ld/eagle.flash.1m0.ld            | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 arduino/version 2.3.0/tools/sdk/ld/eagle.flash.1m0.ld

diff --git a/arduino/version 2.3.0/tools/sdk/ld/eagle.flash.1m0.ld b/arduino/version 2.3.0/tools/sdk/ld/eagle.flash.1m0.ld
deleted file mode 100644
index 250962962..000000000
--- a/arduino/version 2.3.0/tools/sdk/ld/eagle.flash.1m0.ld	
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Flash Split for 1M chips, no SPIFFS */
-/* sketch 999KB */
-/* eeprom 20KB */
-
-MEMORY
-{
-  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
-  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0x8000
-  irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
-}
-
-PROVIDE ( _SPIFFS_start = 0x402FB000 );
-PROVIDE ( _SPIFFS_end = 0x402FB000 );
-PROVIDE ( _SPIFFS_page = 0 );
-PROVIDE ( _SPIFFS_block = 0 );
-
-INCLUDE "../ld/eagle.app.v6.common.ld"

From 53a622ee3dcf052d19520ec3273d1bdf4a669d50 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:35:56 +0100
Subject: [PATCH 374/403] Delete boards.txt

---
 arduino/version 2.3.0/boards.txt | 1897 ------------------------------
 1 file changed, 1897 deletions(-)
 delete mode 100644 arduino/version 2.3.0/boards.txt

diff --git a/arduino/version 2.3.0/boards.txt b/arduino/version 2.3.0/boards.txt
deleted file mode 100644
index 9b3f2db8d..000000000
--- a/arduino/version 2.3.0/boards.txt	
+++ /dev/null
@@ -1,1897 +0,0 @@
-menu.UploadSpeed=Upload Speed
-menu.CpuFrequency=CPU Frequency
-menu.FlashSize=Flash Size
-menu.FlashMode=Flash Mode
-menu.FlashFreq=Flash Frequency
-menu.UploadTool=Upload Using
-menu.ResetMethod=Reset Method
-menu.ESPModule=Module
-menu.Debug=Debug port
-menu.DebugLevel=Debug Level
-menu.LwIPVariant=lwIP Variant
-
-##############################################################
-generic.name=Generic ESP8266 Module
-
-generic.upload.tool=esptool
-generic.upload.speed=115200
-generic.upload.resetmethod=ck
-generic.upload.maximum_size=434160
-generic.upload.maximum_data_size=81920
-generic.upload.wait_for_upload_port=true
-generic.serial.disableDTR=true
-generic.serial.disableRTS=true
-
-generic.build.mcu=esp8266
-generic.build.f_cpu=80000000L
-generic.build.board=ESP8266_ESP01
-generic.build.core=esp8266
-generic.build.variant=generic
-generic.build.flash_mode=qio
-generic.build.spiffs_pagesize=256
-generic.build.debug_port=
-generic.build.debug_level=
-
-generic.menu.UploadTool.esptool=Serial
-generic.menu.UploadTool.esptool.upload.tool=esptool
-generic.menu.UploadTool.esptool.upload.verbose=-vv
-generic.menu.UploadTool.espupload=OTA_upload
-generic.menu.UploadTool.espupload.upload.tool=espupload
-
-generic.menu.CpuFrequency.80=80 MHz
-generic.menu.CpuFrequency.80.build.f_cpu=80000000L
-generic.menu.CpuFrequency.160=160 MHz
-generic.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-generic.menu.FlashFreq.40=40MHz
-generic.menu.FlashFreq.40.build.flash_freq=40
-generic.menu.FlashFreq.80=80MHz
-generic.menu.FlashFreq.80.build.flash_freq=80
-
-generic.menu.FlashMode.dio=DIO
-generic.menu.FlashMode.dio.build.flash_mode=dio
-generic.menu.FlashMode.qio=QIO
-generic.menu.FlashMode.qio.build.flash_mode=qio
-generic.menu.FlashMode.dout=DOUT
-generic.menu.FlashMode.dout.build.flash_mode=dout
-generic.menu.FlashMode.qout=QOUT
-generic.menu.FlashMode.qout.build.flash_mode=qout
-
-generic.menu.UploadSpeed.115200=115200
-generic.menu.UploadSpeed.115200.upload.speed=115200
-generic.menu.UploadSpeed.9600=9600
-generic.menu.UploadSpeed.9600.upload.speed=9600
-generic.menu.UploadSpeed.57600=57600
-generic.menu.UploadSpeed.57600.upload.speed=57600
-generic.menu.UploadSpeed.256000.windows=256000
-generic.menu.UploadSpeed.256000.upload.speed=256000
-generic.menu.UploadSpeed.230400.linux=230400
-generic.menu.UploadSpeed.230400.macosx=230400
-generic.menu.UploadSpeed.230400.upload.speed=230400
-generic.menu.UploadSpeed.460800.linux=460800
-generic.menu.UploadSpeed.460800.macosx=460800
-generic.menu.UploadSpeed.460800.upload.speed=460800
-generic.menu.UploadSpeed.512000.windows=512000
-generic.menu.UploadSpeed.512000.upload.speed=512000
-generic.menu.UploadSpeed.921600=921600
-generic.menu.UploadSpeed.921600.upload.speed=921600
-
-generic.menu.FlashSize.512K64=512K (64K SPIFFS)
-generic.menu.FlashSize.512K64.build.flash_size=512K
-generic.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-generic.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-generic.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-generic.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-generic.menu.FlashSize.512K64.upload.maximum_size=434160
-
-generic.menu.FlashSize.512K128=512K (128K SPIFFS)
-generic.menu.FlashSize.512K128.build.flash_size=512K
-generic.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-generic.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-generic.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-generic.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-generic.menu.FlashSize.512K128.upload.maximum_size=368624
-
-generic.menu.FlashSize.512K0=512K (no SPIFFS)
-generic.menu.FlashSize.512K0.build.flash_size=512K
-generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-generic.menu.FlashSize.512K0.upload.maximum_size=499696
-
-generic.menu.FlashSize.1M512=1M (512K SPIFFS)
-generic.menu.FlashSize.1M512.build.flash_size=1M
-generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-generic.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-generic.menu.FlashSize.1M512.upload.maximum_size=499696
-
-generic.menu.FlashSize.1M256=1M (256K SPIFFS)
-generic.menu.FlashSize.1M256.build.flash_size=1M
-generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-generic.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M256.upload.maximum_size=761840
-
-generic.menu.FlashSize.1M192=1M (192K SPIFFS)
-generic.menu.FlashSize.1M192.build.flash_size=1M
-generic.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-generic.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-generic.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M192.upload.maximum_size=827376
-
-generic.menu.FlashSize.1M160=1M (160K SPIFFS)
-generic.menu.FlashSize.1M160.build.flash_size=1M
-generic.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-generic.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-generic.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M160.upload.maximum_size=860144
-
-generic.menu.FlashSize.1M144=1M (144K SPIFFS)
-generic.menu.FlashSize.1M144.build.flash_size=1M
-generic.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-generic.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-generic.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M144.upload.maximum_size=876528
-
-generic.menu.FlashSize.1M128=1M (128K SPIFFS)
-generic.menu.FlashSize.1M128.build.flash_size=1M
-generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-generic.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M128.upload.maximum_size=892912
-
-generic.menu.FlashSize.1M64=1M (64K SPIFFS)
-generic.menu.FlashSize.1M64.build.flash_size=1M
-generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M64.upload.maximum_size=958448
-
-generic.menu.FlashSize.1M0=1M (no SPIFFS)
-generic.menu.FlashSize.1M0.build.flash_size=1M
-generic.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-generic.menu.FlashSize.1M0.upload.maximum_size=1023984
-
-generic.menu.FlashSize.2M=2M (1M SPIFFS)
-generic.menu.FlashSize.2M.build.flash_size=2M
-generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
-generic.menu.FlashSize.2M.build.spiffs_start=0x100000
-generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
-generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.2M.upload.maximum_size=1044464
-
-generic.menu.FlashSize.4M1M=4M (1M SPIFFS)
-generic.menu.FlashSize.4M1M.build.flash_size=4M
-generic.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-generic.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-generic.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-generic.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-generic.menu.FlashSize.4M3M=4M (3M SPIFFS)
-generic.menu.FlashSize.4M3M.build.flash_size=4M
-generic.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-generic.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-generic.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-generic.menu.ResetMethod.ck=ck
-generic.menu.ResetMethod.ck.upload.resetmethod=ck
-generic.menu.ResetMethod.nodemcu=nodemcu
-generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-
-generic.menu.Debug.Disabled=Disabled
-generic.menu.Debug.Disabled.build.debug_port=
-generic.menu.Debug.Serial=Serial
-generic.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-generic.menu.Debug.Serial1=Serial1
-generic.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-generic.menu.DebugLevel.None____=None
-generic.menu.DebugLevel.None____.build.debug_level=
-generic.menu.DebugLevel.Core____=Core
-generic.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-generic.menu.DebugLevel.SSL_____=Core + SSL
-generic.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-generic.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-generic.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-generic.menu.DebugLevel.WiFic___=Core + WiFi
-generic.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-generic.menu.DebugLevel.WiFi____=WiFi
-generic.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-generic.menu.DebugLevel.HTTPClient=HTTPClient
-generic.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-generic.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-generic.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-generic.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-generic.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-generic.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-generic.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-generic.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-generic.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-generic.menu.DebugLevel.HTTPServer=HTTPServer
-generic.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.UPDATER=Updater
-generic.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-generic.menu.DebugLevel.OTA_____=OTA
-generic.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-generic.menu.DebugLevel.OTA2____=OTA + Updater
-generic.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-generic.menu.DebugLevel.all_____=All
-generic.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
-
-# disabled because espressif's bootloader refuses to write above 4M
-# generic.menu.FlashSize.8M=8M (7M SPIFFS)
-# generic.menu.FlashSize.8M.build.flash_size=1M
-# generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
-# generic.menu.FlashSize.8M.build.spiffs_start=0x100000
-# generic.menu.FlashSize.8M.build.spiffs_end=0x800000
-# generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
-# generic.menu.FlashSize.16M=16M (15M SPIFFS)
-# generic.menu.FlashSize.16M.build.flash_size=1M
-# generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
-# generic.menu.FlashSize.16M.build.spiffs_start=0x100000
-# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
-# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
-
-##############################################################
-# ESP8285 chip has built-in 1MB flash
-
-esp8285.name=Generic ESP8285 Module
-
-esp8285.upload.tool=esptool
-esp8285.upload.speed=115200
-esp8285.upload.resetmethod=ck
-esp8285.upload.maximum_size=434160
-esp8285.upload.maximum_data_size=81920
-esp8285.upload.wait_for_upload_port=true
-esp8285.serial.disableDTR=true
-esp8285.serial.disableRTS=true
-
-esp8285.build.mcu=esp8266
-esp8285.build.f_cpu=80000000L
-esp8285.build.board=ESP8266_ESP01
-esp8285.build.core=esp8266
-esp8285.build.variant=generic
-esp8285.build.flash_mode=dout
-esp8285.build.flash_freq=40
-esp8285.build.spiffs_pagesize=256
-esp8285.build.debug_port=
-esp8285.build.debug_level=
-
-esp8285.menu.UploadTool.esptool=Serial
-esp8285.menu.UploadTool.esptool.upload.tool=esptool
-esp8285.menu.UploadTool.esptool.upload.verbose=-vv
-esp8285.menu.UploadTool.espupload=OTA_upload
-esp8285.menu.UploadTool.espupload.upload.tool=espupload
-
-esp8285.menu.CpuFrequency.80=80 MHz
-esp8285.menu.CpuFrequency.80.build.f_cpu=80000000L
-esp8285.menu.CpuFrequency.160=160 MHz
-esp8285.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-esp8285.menu.UploadSpeed.115200=115200
-esp8285.menu.UploadSpeed.115200.upload.speed=115200
-esp8285.menu.UploadSpeed.9600=9600
-esp8285.menu.UploadSpeed.9600.upload.speed=9600
-esp8285.menu.UploadSpeed.57600=57600
-esp8285.menu.UploadSpeed.57600.upload.speed=57600
-esp8285.menu.UploadSpeed.256000.windows=256000
-esp8285.menu.UploadSpeed.256000.upload.speed=256000
-esp8285.menu.UploadSpeed.230400.linux=230400
-esp8285.menu.UploadSpeed.230400.macosx=230400
-esp8285.menu.UploadSpeed.230400.upload.speed=230400
-esp8285.menu.UploadSpeed.460800.linux=460800
-esp8285.menu.UploadSpeed.460800.macosx=460800
-esp8285.menu.UploadSpeed.460800.upload.speed=460800
-esp8285.menu.UploadSpeed.512000.windows=512000
-esp8285.menu.UploadSpeed.512000.upload.speed=512000
-esp8285.menu.UploadSpeed.921600=921600
-esp8285.menu.UploadSpeed.921600.upload.speed=921600
-
-esp8285.menu.FlashSize.1M512=1M (512K SPIFFS)
-esp8285.menu.FlashSize.1M512.build.flash_size=1M
-esp8285.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-esp8285.menu.FlashSize.1M512.upload.maximum_size=499696
-
-esp8285.menu.FlashSize.1M256=1M (256K SPIFFS)
-esp8285.menu.FlashSize.1M256.build.flash_size=1M
-esp8285.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-esp8285.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-esp8285.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M256.upload.maximum_size=761840
-
-esp8285.menu.FlashSize.1M192=1M (192K SPIFFS)
-esp8285.menu.FlashSize.1M192.build.flash_size=1M
-esp8285.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-esp8285.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-esp8285.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M192.upload.maximum_size=827376
-
-esp8285.menu.FlashSize.1M160=1M (160K SPIFFS)
-esp8285.menu.FlashSize.1M160.build.flash_size=1M
-esp8285.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-esp8285.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-esp8285.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M160.upload.maximum_size=860144
-
-esp8285.menu.FlashSize.1M144=1M (144K SPIFFS)
-esp8285.menu.FlashSize.1M144.build.flash_size=1M
-esp8285.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-esp8285.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-esp8285.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M144.upload.maximum_size=876528
-
-esp8285.menu.FlashSize.1M128=1M (128K SPIFFS)
-esp8285.menu.FlashSize.1M128.build.flash_size=1M
-esp8285.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-esp8285.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-esp8285.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M128.upload.maximum_size=892912
-
-esp8285.menu.FlashSize.1M64=1M (64K SPIFFS)
-esp8285.menu.FlashSize.1M64.build.flash_size=1M
-esp8285.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-esp8285.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-esp8285.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M64.upload.maximum_size=958448
-
-esp8285.menu.FlashSize.1M0=1M (no SPIFFS)
-esp8285.menu.FlashSize.1M0.build.flash_size=1M
-esp8285.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-esp8285.menu.FlashSize.1M0.upload.maximum_size=1023984
-
-##############################################################
-
-espduino.name=ESPDuino (ESP-13 Module)
-
-espduino.upload.tool=esptool
-espduino.upload.speed=115200
-espduino.upload.resetmethod=ck
-espduino.upload.maximum_size=1044464
-espduino.upload.maximum_data_size=81920
-espduino.upload.wait_for_upload_port=true
-espduino.serial.disableDTR=true
-espduino.serial.disableRTS=true
-
-espduino.build.mcu=esp8266
-espduino.build.f_cpu=80000000L
-espduino.build.board=ESP8266_ESP13
-espduino.build.core=esp8266
-espduino.build.variant=ESPDuino
-espduino.build.flash_mode=dio
-espduino.build.flash_size=4M
-espduino.build.flash_freq=40
-espduino.build.debug_port=
-espduino.build.debug_level=
-
-espduino.menu.CpuFrequency.80=80 MHz
-espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
-espduino.menu.CpuFrequency.160=160 MHz
-espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-espduino.menu.UploadSpeed.115200=115200
-espduino.menu.UploadSpeed.115200.upload.speed=115200
-espduino.menu.UploadSpeed.9600=9600
-espduino.menu.UploadSpeed.9600.upload.speed=9600
-espduino.menu.UploadSpeed.57600=57600
-espduino.menu.UploadSpeed.57600.upload.speed=57600
-espduino.menu.UploadSpeed.256000.windows=256000
-espduino.menu.UploadSpeed.256000.upload.speed=256000
-espduino.menu.UploadSpeed.230400.linux=230400
-espduino.menu.UploadSpeed.230400.macosx=230400
-espduino.menu.UploadSpeed.230400.macosx=230400
-espduino.menu.UploadSpeed.230400.upload.speed=230400
-espduino.menu.UploadSpeed.460800.linux=460800
-espduino.menu.UploadSpeed.460800.macosx=460800
-espduino.menu.UploadSpeed.460800.upload.speed=460800
-espduino.menu.UploadSpeed.512000.windows=512000
-espduino.menu.UploadSpeed.512000.upload.speed=512000
-espduino.menu.UploadSpeed.921600=921600
-espduino.menu.UploadSpeed.921600.upload.speed=921600
-
-espduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espduino.menu.FlashSize.4M3M.build.flash_size=4M
-espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-espduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espduino.menu.FlashSize.4M1M.build.flash_size=4M
-espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-##############################################################
-huzzah.name=Adafruit HUZZAH ESP8266
-
-huzzah.upload.tool=esptool
-huzzah.upload.speed=115200
-huzzah.upload.resetmethod=nodemcu
-huzzah.upload.maximum_size=1044464
-huzzah.upload.maximum_data_size=81920
-huzzah.upload.wait_for_upload_port=true
-huzzah.serial.disableDTR=true
-huzzah.serial.disableRTS=true
-
-huzzah.build.mcu=esp8266
-huzzah.build.f_cpu=80000000L
-huzzah.build.board=ESP8266_ESP12
-huzzah.build.core=esp8266
-huzzah.build.variant=adafruit
-huzzah.build.flash_mode=qio
-huzzah.build.flash_size=4M
-huzzah.build.flash_freq=40
-huzzah.build.debug_port=
-huzzah.build.debug_level=
-
-huzzah.menu.CpuFrequency.80=80 MHz
-huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
-huzzah.menu.CpuFrequency.160=160 MHz
-huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-huzzah.menu.UploadSpeed.115200=115200
-huzzah.menu.UploadSpeed.115200.upload.speed=115200
-huzzah.menu.UploadSpeed.9600=9600
-huzzah.menu.UploadSpeed.9600.upload.speed=9600
-huzzah.menu.UploadSpeed.57600=57600
-huzzah.menu.UploadSpeed.57600.upload.speed=57600
-huzzah.menu.UploadSpeed.256000=256000
-huzzah.menu.UploadSpeed.256000.upload.speed=256000
-huzzah.menu.UploadSpeed.921600=921600
-huzzah.menu.UploadSpeed.921600.upload.speed=921600
-
-huzzah.menu.FlashSize.4M3M=4M (3M SPIFFS)
-huzzah.menu.FlashSize.4M3M.build.flash_size=4M
-huzzah.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-huzzah.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-huzzah.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-huzzah.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-huzzah.menu.FlashSize.4M1M=4M (1M SPIFFS)
-huzzah.menu.FlashSize.4M1M.build.flash_size=4M
-huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-huzzah.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-##############################################################
-espresso_lite_v1.name=ESPresso Lite 1.0
-espresso_lite_v1.upload.tool=esptool
-espresso_lite_v1.upload.speed=115200
-espresso_lite_v1.upload.maximum_size=1044464
-espresso_lite_v1.upload.maximum_data_size=81920
-espresso_lite_v1.upload.wait_for_upload_port=true
-
-espresso_lite_v1.build.mcu=esp8266
-espresso_lite_v1.build.f_cpu=80000000L
-espresso_lite_v1.build.board=ESP8266_ESPRESSO_LITE_V1
-espresso_lite_v1.build.core=esp8266
-espresso_lite_v1.build.variant=espresso_lite_v1
-espresso_lite_v1.build.flash_mode=dio
-espresso_lite_v1.build.flash_size=4M
-espresso_lite_v1.build.flash_freq=40
-
-espresso_lite_v1.menu.CpuFrequency.80=80 MHz
-espresso_lite_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
-espresso_lite_v1.menu.CpuFrequency.160=160 MHz
-espresso_lite_v1.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-espresso_lite_v1.menu.UploadSpeed.115200=115200
-espresso_lite_v1.menu.UploadSpeed.115200.upload.speed=115200
-espresso_lite_v1.menu.UploadSpeed.57600=57600
-espresso_lite_v1.menu.UploadSpeed.57600.upload.speed=57600
-espresso_lite_v1.menu.UploadSpeed.256000.windows=256000
-espresso_lite_v1.menu.UploadSpeed.256000.upload.speed=256000
-espresso_lite_v1.menu.UploadSpeed.230400.linux=230400
-espresso_lite_v1.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v1.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v1.menu.UploadSpeed.230400.upload.speed=230400
-espresso_lite_v1.menu.UploadSpeed.460800.linux=460800
-espresso_lite_v1.menu.UploadSpeed.460800.macosx=460800
-espresso_lite_v1.menu.UploadSpeed.460800.upload.speed=460800
-espresso_lite_v1.menu.UploadSpeed.512000.windows=512000
-espresso_lite_v1.menu.UploadSpeed.512000.upload.speed=512000
-espresso_lite_v1.menu.UploadSpeed.921600=921600
-espresso_lite_v1.menu.UploadSpeed.921600.upload.speed=921600
-
-espresso_lite_v1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espresso_lite_v1.menu.FlashSize.4M3M.build.flash_size=4M
-espresso_lite_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espresso_lite_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-espresso_lite_v1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espresso_lite_v1.menu.FlashSize.4M1M.build.flash_size=4M
-espresso_lite_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espresso_lite_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-espresso_lite_v1.menu.ResetMethod.ck=ck
-espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-
-espresso_lite_v1.menu.Debug.Disabled=Disabled
-espresso_lite_v1.menu.Debug.Disabled.build.debug_port=
-espresso_lite_v1.menu.Debug.Serial=Serial
-espresso_lite_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espresso_lite_v1.menu.Debug.Serial1=Serial1
-espresso_lite_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-espresso_lite_v1.menu.DebugLevel.None____=None
-espresso_lite_v1.menu.DebugLevel.None____.build.debug_level=
-espresso_lite_v1.menu.DebugLevel.Core____=Core
-espresso_lite_v1.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-espresso_lite_v1.menu.DebugLevel.SSL_____=Core + SSL
-espresso_lite_v1.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-espresso_lite_v1.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-espresso_lite_v1.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-espresso_lite_v1.menu.DebugLevel.WiFic___=Core + WiFi
-espresso_lite_v1.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-espresso_lite_v1.menu.DebugLevel.WiFi____=WiFi
-espresso_lite_v1.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-espresso_lite_v1.menu.DebugLevel.HTTPClient=HTTPClient
-espresso_lite_v1.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-espresso_lite_v1.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-espresso_lite_v1.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-espresso_lite_v1.menu.DebugLevel.HTTPServer=HTTPServer
-espresso_lite_v1.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.UPDATER=Updater
-espresso_lite_v1.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-espresso_lite_v1.menu.DebugLevel.OTA_____=OTA
-espresso_lite_v1.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-espresso_lite_v1.menu.DebugLevel.OTA2____=OTA + Updater
-espresso_lite_v1.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-espresso_lite_v1.menu.DebugLevel.all_____=All
-espresso_lite_v1.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
-
-espresso_lite_v1.build.debug_port=
-espresso_lite_v1.build.debug_level=
-
-##############################################################
-espresso_lite_v2.name=ESPresso Lite 2.0
-espresso_lite_v2.upload.tool=esptool
-espresso_lite_v2.upload.speed=115200
-espresso_lite_v2.upload.maximum_size=1044464
-espresso_lite_v2.upload.maximum_data_size=81920
-espresso_lite_v2.upload.wait_for_upload_port=true
-
-espresso_lite_v2.build.mcu=esp8266
-espresso_lite_v2.build.f_cpu=80000000L
-espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2
-espresso_lite_v2.build.core=esp8266
-espresso_lite_v2.build.variant=espresso_lite_v2
-espresso_lite_v2.build.flash_mode=dio
-espresso_lite_v2.build.flash_size=4M
-espresso_lite_v2.build.flash_freq=40
-
-espresso_lite_v2.menu.CpuFrequency.80=80 MHz
-espresso_lite_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
-espresso_lite_v2.menu.CpuFrequency.160=160 MHz
-espresso_lite_v2.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-espresso_lite_v2.menu.UploadSpeed.115200=115200
-espresso_lite_v2.menu.UploadSpeed.115200.upload.speed=115200
-espresso_lite_v2.menu.UploadSpeed.57600=57600
-espresso_lite_v2.menu.UploadSpeed.57600.upload.speed=57600
-espresso_lite_v2.menu.UploadSpeed.256000.windows=256000
-espresso_lite_v2.menu.UploadSpeed.256000.upload.speed=256000
-espresso_lite_v2.menu.UploadSpeed.230400.linux=230400
-espresso_lite_v2.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v2.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v2.menu.UploadSpeed.230400.upload.speed=230400
-espresso_lite_v2.menu.UploadSpeed.460800.linux=460800
-espresso_lite_v2.menu.UploadSpeed.460800.macosx=460800
-espresso_lite_v2.menu.UploadSpeed.460800.upload.speed=460800
-espresso_lite_v2.menu.UploadSpeed.512000.windows=512000
-espresso_lite_v2.menu.UploadSpeed.512000.upload.speed=512000
-espresso_lite_v2.menu.UploadSpeed.921600=921600
-espresso_lite_v2.menu.UploadSpeed.921600.upload.speed=921600
-
-espresso_lite_v2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espresso_lite_v2.menu.FlashSize.4M3M.build.flash_size=4M
-espresso_lite_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espresso_lite_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-espresso_lite_v2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espresso_lite_v2.menu.FlashSize.4M1M.build.flash_size=4M
-espresso_lite_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espresso_lite_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-espresso_lite_v2.menu.ResetMethod.ck=ck
-espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-
-espresso_lite_v2.menu.Debug.Disabled=Disabled
-espresso_lite_v2.menu.Debug.Disabled.build.debug_port=
-espresso_lite_v2.menu.Debug.Serial=Serial
-espresso_lite_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espresso_lite_v2.menu.Debug.Serial1=Serial1
-espresso_lite_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-espresso_lite_v2.menu.DebugLevel.None____=None
-espresso_lite_v2.menu.DebugLevel.None____.build.debug_level=
-espresso_lite_v2.menu.DebugLevel.Core____=Core
-espresso_lite_v2.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-espresso_lite_v2.menu.DebugLevel.SSL_____=Core + SSL
-espresso_lite_v2.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-espresso_lite_v2.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-espresso_lite_v2.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-espresso_lite_v2.menu.DebugLevel.WiFic___=Core + WiFi
-espresso_lite_v2.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-espresso_lite_v2.menu.DebugLevel.WiFi____=WiFi
-espresso_lite_v2.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-espresso_lite_v2.menu.DebugLevel.HTTPClient=HTTPClient
-espresso_lite_v2.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-espresso_lite_v2.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-espresso_lite_v2.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-espresso_lite_v2.menu.DebugLevel.HTTPServer=HTTPServer
-espresso_lite_v2.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.UPDATER=Updater
-espresso_lite_v2.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-espresso_lite_v2.menu.DebugLevel.OTA_____=OTA
-espresso_lite_v2.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-espresso_lite_v2.menu.DebugLevel.OTA2____=OTA + Updater
-espresso_lite_v2.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-espresso_lite_v2.menu.DebugLevel.all_____=All
-espresso_lite_v2.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
-
-espresso_lite_v2.build.debug_port=
-espresso_lite_v2.build.debug_level=
-
-##############################################################
-phoenix_v1.name=Phoenix 1.0
-phoenix_v1.upload.tool=esptool
-phoenix_v1.upload.speed=115200
-phoenix_v1.upload.maximum_size=1044464
-phoenix_v1.upload.maximum_data_size=81920
-phoenix_v1.upload.wait_for_upload_port=true
-
-phoenix_v1.build.mcu=esp8266
-phoenix_v1.build.f_cpu=80000000L
-phoenix_v1.build.board=ESP8266_PHOENIX_V1
-phoenix_v1.build.core=esp8266
-phoenix_v1.build.variant=phoenix_v1
-phoenix_v1.build.flash_mode=dio
-phoenix_v1.build.flash_size=4M
-phoenix_v1.build.flash_freq=40
-
-phoenix_v1.menu.CpuFrequency.80=80 MHz
-phoenix_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
-phoenix_v1.menu.CpuFrequency.160=160 MHz
-phoenix_v1.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-phoenix_v1.menu.UploadSpeed.115200=115200
-phoenix_v1.menu.UploadSpeed.115200.upload.speed=115200
-phoenix_v1.menu.UploadSpeed.57600=57600
-phoenix_v1.menu.UploadSpeed.57600.upload.speed=57600
-phoenix_v1.menu.UploadSpeed.256000.windows=256000
-phoenix_v1.menu.UploadSpeed.256000.upload.speed=256000
-phoenix_v1.menu.UploadSpeed.230400.linux=230400
-phoenix_v1.menu.UploadSpeed.230400.macosx=230400
-phoenix_v1.menu.UploadSpeed.230400.macosx=230400
-phoenix_v1.menu.UploadSpeed.230400.upload.speed=230400
-phoenix_v1.menu.UploadSpeed.460800.linux=460800
-phoenix_v1.menu.UploadSpeed.460800.macosx=460800
-phoenix_v1.menu.UploadSpeed.460800.upload.speed=460800
-phoenix_v1.menu.UploadSpeed.512000.windows=512000
-phoenix_v1.menu.UploadSpeed.512000.upload.speed=512000
-phoenix_v1.menu.UploadSpeed.921600=921600
-phoenix_v1.menu.UploadSpeed.921600.upload.speed=921600
-
-phoenix_v1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-phoenix_v1.menu.FlashSize.4M3M.build.flash_size=4M
-phoenix_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-phoenix_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-phoenix_v1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-phoenix_v1.menu.FlashSize.4M1M.build.flash_size=4M
-phoenix_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-phoenix_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-phoenix_v1.menu.ResetMethod.ck=ck
-phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-
-phoenix_v1.menu.Debug.Disabled=Disabled
-phoenix_v1.menu.Debug.Disabled.build.debug_port=
-phoenix_v1.menu.Debug.Serial=Serial
-phoenix_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-phoenix_v1.menu.Debug.Serial1=Serial1
-phoenix_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-phoenix_v1.menu.DebugLevel.None____=None
-phoenix_v1.menu.DebugLevel.None____.build.debug_level=
-phoenix_v1.menu.DebugLevel.Core____=Core
-phoenix_v1.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-phoenix_v1.menu.DebugLevel.SSL_____=Core + SSL
-phoenix_v1.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-phoenix_v1.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-phoenix_v1.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-phoenix_v1.menu.DebugLevel.WiFic___=Core + WiFi
-phoenix_v1.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-phoenix_v1.menu.DebugLevel.WiFi____=WiFi
-phoenix_v1.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-phoenix_v1.menu.DebugLevel.HTTPClient=HTTPClient
-phoenix_v1.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-phoenix_v1.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-phoenix_v1.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-phoenix_v1.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-phoenix_v1.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-phoenix_v1.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-phoenix_v1.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-phoenix_v1.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-phoenix_v1.menu.DebugLevel.HTTPServer=HTTPServer
-phoenix_v1.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.UPDATER=Updater
-phoenix_v1.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-phoenix_v1.menu.DebugLevel.OTA_____=OTA
-phoenix_v1.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-phoenix_v1.menu.DebugLevel.OTA2____=OTA + Updater
-phoenix_v1.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-phoenix_v1.menu.DebugLevel.all_____=All
-phoenix_v1.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
-
-phoenix_v1.build.debug_port=
-phoenix_v1.build.debug_level=
-
-##############################################################
-phoenix_v2.name=Phoenix 2.0
-phoenix_v2.upload.tool=esptool
-phoenix_v2.upload.speed=115200
-phoenix_v2.upload.maximum_size=1044464
-phoenix_v2.upload.maximum_data_size=81920
-phoenix_v2.upload.wait_for_upload_port=true
-
-phoenix_v2.build.mcu=esp8266
-phoenix_v2.build.f_cpu=80000000L
-phoenix_v2.build.board=ESP8266_PHOENIX_V2
-phoenix_v2.build.core=esp8266
-phoenix_v2.build.variant=phoenix_v2
-phoenix_v2.build.flash_mode=dio
-phoenix_v2.build.flash_size=4M
-phoenix_v2.build.flash_freq=40
-
-phoenix_v2.menu.CpuFrequency.80=80 MHz
-phoenix_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
-phoenix_v2.menu.CpuFrequency.160=160 MHz
-phoenix_v2.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-phoenix_v2.menu.UploadSpeed.115200=115200
-phoenix_v2.menu.UploadSpeed.115200.upload.speed=115200
-phoenix_v2.menu.UploadSpeed.57600=57600
-phoenix_v2.menu.UploadSpeed.57600.upload.speed=57600
-phoenix_v2.menu.UploadSpeed.256000.windows=256000
-phoenix_v2.menu.UploadSpeed.256000.upload.speed=256000
-phoenix_v2.menu.UploadSpeed.230400.linux=230400
-phoenix_v2.menu.UploadSpeed.230400.macosx=230400
-phoenix_v2.menu.UploadSpeed.230400.macosx=230400
-phoenix_v2.menu.UploadSpeed.230400.upload.speed=230400
-phoenix_v2.menu.UploadSpeed.460800.linux=460800
-phoenix_v2.menu.UploadSpeed.460800.macosx=460800
-phoenix_v2.menu.UploadSpeed.460800.upload.speed=460800
-phoenix_v2.menu.UploadSpeed.512000.windows=512000
-phoenix_v2.menu.UploadSpeed.512000.upload.speed=512000
-phoenix_v2.menu.UploadSpeed.921600=921600
-phoenix_v2.menu.UploadSpeed.921600.upload.speed=921600
-
-phoenix_v2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-phoenix_v2.menu.FlashSize.4M3M.build.flash_size=4M
-phoenix_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-phoenix_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-phoenix_v2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-phoenix_v2.menu.FlashSize.4M1M.build.flash_size=4M
-phoenix_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-phoenix_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-phoenix_v2.menu.ResetMethod.ck=ck
-phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-
-phoenix_v2.menu.Debug.Disabled=Disabled
-phoenix_v2.menu.Debug.Disabled.build.debug_port=
-phoenix_v2.menu.Debug.Serial=Serial
-phoenix_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-phoenix_v2.menu.Debug.Serial1=Serial1
-phoenix_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-phoenix_v2.menu.DebugLevel.None____=None
-phoenix_v2.menu.DebugLevel.None____.build.debug_level=
-phoenix_v2.menu.DebugLevel.Core____=Core
-phoenix_v2.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-phoenix_v2.menu.DebugLevel.SSL_____=Core + SSL
-phoenix_v2.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-phoenix_v2.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-phoenix_v2.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-phoenix_v2.menu.DebugLevel.WiFic___=Core + WiFi
-phoenix_v2.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-phoenix_v2.menu.DebugLevel.WiFi____=WiFi
-phoenix_v2.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-phoenix_v2.menu.DebugLevel.HTTPClient=HTTPClient
-phoenix_v2.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-phoenix_v2.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-phoenix_v2.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-phoenix_v2.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-phoenix_v2.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-phoenix_v2.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-phoenix_v2.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-phoenix_v2.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-phoenix_v2.menu.DebugLevel.HTTPServer=HTTPServer
-phoenix_v2.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.UPDATER=Updater
-phoenix_v2.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-phoenix_v2.menu.DebugLevel.OTA_____=OTA
-phoenix_v2.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-phoenix_v2.menu.DebugLevel.OTA2____=OTA + Updater
-phoenix_v2.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-phoenix_v2.menu.DebugLevel.all_____=All
-phoenix_v2.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
-
-phoenix_v2.build.debug_port=
-phoenix_v2.build.debug_level=
-
-##############################################################
-nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
-
-nodemcu.upload.tool=esptool
-nodemcu.upload.speed=115200
-nodemcu.upload.resetmethod=nodemcu
-nodemcu.upload.maximum_size=1044464
-nodemcu.upload.maximum_data_size=81920
-nodemcu.upload.wait_for_upload_port=true
-nodemcu.serial.disableDTR=true
-nodemcu.serial.disableRTS=true
-
-nodemcu.build.mcu=esp8266
-nodemcu.build.f_cpu=80000000L
-nodemcu.build.board=ESP8266_NODEMCU
-nodemcu.build.core=esp8266
-nodemcu.build.variant=nodemcu
-nodemcu.build.flash_mode=qio
-nodemcu.build.flash_size=4M
-nodemcu.build.flash_freq=40
-nodemcu.build.debug_port=
-nodemcu.build.debug_level=
-
-nodemcu.menu.CpuFrequency.80=80 MHz
-nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
-nodemcu.menu.CpuFrequency.160=160 MHz
-nodemcu.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-nodemcu.menu.UploadSpeed.115200=115200
-nodemcu.menu.UploadSpeed.115200.upload.speed=115200
-nodemcu.menu.UploadSpeed.9600=9600
-nodemcu.menu.UploadSpeed.9600.upload.speed=9600
-nodemcu.menu.UploadSpeed.57600=57600
-nodemcu.menu.UploadSpeed.57600.upload.speed=57600
-nodemcu.menu.UploadSpeed.256000.windows=256000
-nodemcu.menu.UploadSpeed.256000.upload.speed=256000
-nodemcu.menu.UploadSpeed.230400.linux=230400
-nodemcu.menu.UploadSpeed.230400.macosx=230400
-nodemcu.menu.UploadSpeed.230400.macosx=230400
-nodemcu.menu.UploadSpeed.230400.upload.speed=230400
-nodemcu.menu.UploadSpeed.460800.linux=460800
-nodemcu.menu.UploadSpeed.460800.macosx=460800
-nodemcu.menu.UploadSpeed.460800.upload.speed=460800
-nodemcu.menu.UploadSpeed.512000.windows=512000
-nodemcu.menu.UploadSpeed.512000.upload.speed=512000
-nodemcu.menu.UploadSpeed.921600=921600
-nodemcu.menu.UploadSpeed.921600.upload.speed=921600
-
-nodemcu.menu.FlashSize.4M3M=4M (3M SPIFFS)
-nodemcu.menu.FlashSize.4M3M.build.flash_size=4M
-nodemcu.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-nodemcu.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-nodemcu.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-nodemcu.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-nodemcu.menu.FlashSize.4M1M=4M (1M SPIFFS)
-nodemcu.menu.FlashSize.4M1M.build.flash_size=4M
-nodemcu.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-nodemcu.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-nodemcu.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-nodemcu.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-nodemcu.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-##############################################################
-nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
-
-nodemcuv2.upload.tool=esptool
-nodemcuv2.upload.speed=115200
-nodemcuv2.upload.resetmethod=nodemcu
-nodemcuv2.upload.maximum_size=1044464
-nodemcuv2.upload.maximum_data_size=81920
-nodemcuv2.upload.wait_for_upload_port=true
-nodemcuv2.serial.disableDTR=true
-nodemcuv2.serial.disableRTS=true
-
-nodemcuv2.build.mcu=esp8266
-nodemcuv2.build.f_cpu=80000000L
-nodemcuv2.build.board=ESP8266_NODEMCU
-nodemcuv2.build.core=esp8266
-nodemcuv2.build.variant=nodemcu
-nodemcuv2.build.flash_mode=dio
-nodemcuv2.build.flash_size=4M
-nodemcuv2.build.flash_freq=40
-nodemcuv2.build.debug_port=
-nodemcuv2.build.debug_level=
-
-nodemcuv2.menu.CpuFrequency.80=80 MHz
-nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
-nodemcuv2.menu.CpuFrequency.160=160 MHz
-nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-nodemcuv2.menu.UploadSpeed.115200=115200
-nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
-nodemcuv2.menu.UploadSpeed.9600=9600
-nodemcuv2.menu.UploadSpeed.9600.upload.speed=9600
-nodemcuv2.menu.UploadSpeed.57600=57600
-nodemcuv2.menu.UploadSpeed.57600.upload.speed=57600
-nodemcuv2.menu.UploadSpeed.256000.windows=256000
-nodemcuv2.menu.UploadSpeed.256000.upload.speed=256000
-nodemcuv2.menu.UploadSpeed.230400.linux=230400
-nodemcuv2.menu.UploadSpeed.230400.macosx=230400
-nodemcuv2.menu.UploadSpeed.230400.macosx=230400
-nodemcuv2.menu.UploadSpeed.230400.upload.speed=230400
-nodemcuv2.menu.UploadSpeed.460800.linux=460800
-nodemcuv2.menu.UploadSpeed.460800.macosx=460800
-nodemcuv2.menu.UploadSpeed.460800.upload.speed=460800
-nodemcuv2.menu.UploadSpeed.512000.windows=512000
-nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
-nodemcuv2.menu.UploadSpeed.921600=921600
-nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
-
-nodemcuv2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-nodemcuv2.menu.FlashSize.4M3M.build.flash_size=4M
-nodemcuv2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-nodemcuv2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-nodemcuv2.menu.FlashSize.4M1M.build.flash_size=4M
-nodemcuv2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-
-##############################################################
-modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
-
-modwifi.upload.tool=esptool
-modwifi.upload.speed=115200
-modwifi.upload.resetmethod=ck
-modwifi.upload.maximum_size=1044464
-modwifi.upload.maximum_data_size=81920
-modwifi.upload.wait_for_upload_port=true
-modwifi.serial.disableDTR=true
-modwifi.serial.disableRTS=true
-
-modwifi.build.mcu=esp8266
-modwifi.build.f_cpu=80000000L
-modwifi.build.board=MOD_WIFI_ESP8266
-modwifi.build.core=esp8266
-modwifi.build.variant=generic
-# Winbond W25Q16 flash
-modwifi.build.flash_mode=qio
-modwifi.build.flash_size=2M
-modwifi.build.flash_freq=40
-modwifi.build.flash_ld=eagle.flash.2m.ld
-modwifi.build.spiffs_start=0x100000
-modwifi.build.spiffs_end=0x1FB000
-modwifi.build.spiffs_pagesize=256
-modwifi.build.spiffs_blocksize=8192
-modwifi.build.debug_port=
-modwifi.build.debug_level=
-
-modwifi.menu.CpuFrequency.80=80 MHz
-modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
-modwifi.menu.CpuFrequency.160=160 MHz
-modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-modwifi.menu.UploadSpeed.115200=115200
-modwifi.menu.UploadSpeed.115200.upload.speed=115200
-modwifi.menu.UploadSpeed.9600=9600
-modwifi.menu.UploadSpeed.9600.upload.speed=9600
-modwifi.menu.UploadSpeed.57600=57600
-modwifi.menu.UploadSpeed.57600.upload.speed=57600
-modwifi.menu.UploadSpeed.256000.windows=256000
-modwifi.menu.UploadSpeed.256000.upload.speed=256000
-modwifi.menu.UploadSpeed.230400.linux=230400
-modwifi.menu.UploadSpeed.230400.macosx=230400
-modwifi.menu.UploadSpeed.230400.macosx=230400
-modwifi.menu.UploadSpeed.230400.upload.speed=230400
-modwifi.menu.UploadSpeed.460800.linux=460800
-modwifi.menu.UploadSpeed.460800.macosx=460800
-modwifi.menu.UploadSpeed.460800.upload.speed=460800
-modwifi.menu.UploadSpeed.512000.windows=512000
-modwifi.menu.UploadSpeed.512000.upload.speed=512000
-modwifi.menu.UploadSpeed.921600=921600
-modwifi.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-thing.name=SparkFun ESP8266 Thing
-
-thing.upload.tool=esptool
-thing.upload.speed=921600
-thing.upload.resetmethod=ck
-thing.upload.maximum_size=434160
-thing.upload.maximum_data_size=81920
-thing.upload.wait_for_upload_port=true
-thing.serial.disableDTR=true
-thing.serial.disableRTS=true
-
-thing.build.mcu=esp8266
-thing.build.f_cpu=80000000L
-thing.build.board=ESP8266_THING
-thing.build.core=esp8266
-thing.build.variant=thing
-thing.build.flash_mode=qio
-# flash chip: AT25SF041 (512 kbyte, 4Mbit)
-thing.build.flash_size=512K
-thing.build.flash_ld=eagle.flash.512k64.ld
-thing.build.flash_freq=40
-thing.build.spiffs_start=0x6B000
-thing.build.spiffs_end=0x7B000
-thing.build.spiffs_blocksize=4096
-thing.build.spiffs_pagesize=256
-thing.build.debug_port=
-thing.build.debug_level=
-
-thing.menu.CpuFrequency.80=80 MHz
-thing.menu.CpuFrequency.80.build.f_cpu=80000000L
-thing.menu.CpuFrequency.160=160 MHz
-thing.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-thing.menu.UploadSpeed.115200=115200
-thing.menu.UploadSpeed.115200.upload.speed=115200
-thing.menu.UploadSpeed.9600=9600
-thing.menu.UploadSpeed.9600.upload.speed=9600
-thing.menu.UploadSpeed.57600=57600
-thing.menu.UploadSpeed.57600.upload.speed=57600
-thing.menu.UploadSpeed.256000.windows=256000
-thing.menu.UploadSpeed.256000.upload.speed=256000
-thing.menu.UploadSpeed.230400.linux=230400
-thing.menu.UploadSpeed.230400.macosx=230400
-thing.menu.UploadSpeed.230400.upload.speed=230400
-thing.menu.UploadSpeed.460800.linux=460800
-thing.menu.UploadSpeed.460800.macosx=460800
-thing.menu.UploadSpeed.460800.upload.speed=460800
-thing.menu.UploadSpeed.512000.windows=512000
-thing.menu.UploadSpeed.512000.upload.speed=512000
-thing.menu.UploadSpeed.921600=921600
-thing.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-thingdev.name=SparkFun ESP8266 Thing Dev
-
-thingdev.upload.tool=esptool
-thingdev.upload.speed=921600
-thingdev.upload.resetmethod=nodemcu
-thingdev.upload.maximum_size=434160
-thingdev.upload.maximum_data_size=81920
-thingdev.upload.wait_for_upload_port=true
-thingdev.serial.disableDTR=true
-thingdev.serial.disableRTS=true
-
-thingdev.build.mcu=esp8266
-thingdev.build.f_cpu=80000000L
-thingdev.build.board=ESP8266_THING_DEV
-thingdev.build.core=esp8266
-thingdev.build.variant=thing
-thingdev.build.flash_mode=dio
-# flash chip: AT25SF041 (512 kbyte, 4Mbit)
-thingdev.build.flash_size=512K
-thingdev.build.flash_ld=eagle.flash.512k64.ld
-thingdev.build.flash_freq=40
-thingdev.build.debug_port=
-thingdev.build.debug_level=
-
-thingdev.menu.CpuFrequency.80=80 MHz
-thingdev.menu.CpuFrequency.80.build.f_cpu=80000000L
-thingdev.menu.CpuFrequency.160=160 MHz
-thingdev.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-thingdev.menu.UploadSpeed.115200=115200
-thingdev.menu.UploadSpeed.115200.upload.speed=115200
-thingdev.menu.UploadSpeed.9600=9600
-thingdev.menu.UploadSpeed.9600.upload.speed=9600
-thingdev.menu.UploadSpeed.57600=57600
-thingdev.menu.UploadSpeed.57600.upload.speed=57600
-thingdev.menu.UploadSpeed.256000.windows=256000
-thingdev.menu.UploadSpeed.256000.upload.speed=256000
-thingdev.menu.UploadSpeed.230400.linux=230400
-thingdev.menu.UploadSpeed.230400.macosx=230400
-thingdev.menu.UploadSpeed.230400.upload.speed=230400
-thingdev.menu.UploadSpeed.460800.linux=460800
-thingdev.menu.UploadSpeed.460800.macosx=460800
-thingdev.menu.UploadSpeed.460800.upload.speed=460800
-thingdev.menu.UploadSpeed.512000.windows=512000
-thingdev.menu.UploadSpeed.512000.upload.speed=512000
-thingdev.menu.UploadSpeed.921600=921600
-thingdev.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-esp210.name=SweetPea ESP-210
-
-esp210.upload.tool=esptool
-esp210.upload.speed=115200
-esp210.upload.resetmethod=ck
-esp210.upload.maximum_size=1044464
-esp210.upload.maximum_data_size=81920
-esp210.upload.wait_for_upload_port=true
-esp210.serial.disableDTR=true
-esp210.serial.disableRTS=true
-
-esp210.build.mcu=esp8266
-esp210.build.f_cpu=80000000L
-esp210.build.board=ESP8266_ESP210
-esp210.build.core=esp8266
-esp210.build.variant=generic
-esp210.build.flash_mode=qio
-esp210.build.flash_size=4M
-esp210.build.flash_freq=40
-esp210.build.debug_port=
-esp210.build.debug_level=
-
-esp210.menu.CpuFrequency.80=80 MHz
-esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
-esp210.menu.CpuFrequency.160=160 MHz
-esp210.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-esp210.menu.UploadSpeed.57600=57600
-esp210.menu.UploadSpeed.57600.upload.speed=57600
-esp210.menu.UploadSpeed.115200=115200
-esp210.menu.UploadSpeed.115200.upload.speed=115200
-esp210.menu.UploadSpeed.256000.windows=256000
-esp210.menu.UploadSpeed.256000.upload.speed=256000
-esp210.menu.UploadSpeed.230400.linux=230400
-esp210.menu.UploadSpeed.230400.macosx=230400
-esp210.menu.UploadSpeed.230400.macosx=230400
-esp210.menu.UploadSpeed.230400.upload.speed=230400
-esp210.menu.UploadSpeed.460800.linux=460800
-esp210.menu.UploadSpeed.460800.macosx=460800
-esp210.menu.UploadSpeed.460800.upload.speed=460800
-esp210.menu.UploadSpeed.512000.windows=512000
-esp210.menu.UploadSpeed.512000.upload.speed=512000
-esp210.menu.UploadSpeed.921600=921600
-esp210.menu.UploadSpeed.921600.upload.speed=921600
-
-esp210.menu.FlashSize.4M3M=4M (3M SPIFFS)
-esp210.menu.FlashSize.4M3M.build.flash_size=4M
-esp210.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-esp210.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-esp210.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-esp210.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-esp210.menu.FlashSize.4M1M=4M (1M SPIFFS)
-esp210.menu.FlashSize.4M1M.build.flash_size=4M
-esp210.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-esp210.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-esp210.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-esp210.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-##############################################################
-# wifio.name=Wifio
-#
-# wifio.upload.tool=esptool
-# wifio.upload.speed=115200
-# wifio.upload.resetmethod=wifio
-# wifio.upload.maximum_size=524288
-# wifio.upload.wait_for_upload_port=true
-#
-# wifio.build.mcu=esp8266
-# wifio.build.f_cpu=80000000L
-# wifio.build.board=ESP8266_WIFIO
-# wifio.build.core=esp8266
-# wifio.build.variant=wifio
-# wifio.build.flash_mode=qio
-# wifio.build.flash_size=512K
-# wifio.build.flash_freq=40
-# wifio.build.flash_ld=eagle.flash.512k64.ld
-# wifio.build.spiffs_start=0x6B000
-# wifio.build.spiffs_end=0x7B000
-#
-# wifio.menu.CpuFrequency.80=80MHz
-# wifio.menu.CpuFrequency.80.build.f_cpu=80000000L
-# wifio.menu.CpuFrequency.160=160MHz
-# wifio.menu.CpuFrequency.160.build.f_cpu=160000000L
-#
-# wifio.upload.tool=esptool
-#
-
-##############################################################
-d1_mini.name=WeMos D1 R2 & mini
-
-d1_mini.upload.tool=esptool
-d1_mini.upload.speed=460800
-d1_mini.upload.resetmethod=nodemcu
-d1_mini.upload.maximum_size=1044464
-d1_mini.upload.maximum_data_size=81920
-d1_mini.upload.wait_for_upload_port=true
-d1_mini.serial.disableDTR=true
-d1_mini.serial.disableRTS=true
-
-d1_mini.build.mcu=esp8266
-d1_mini.build.f_cpu=80000000L
-d1_mini.build.board=ESP8266_WEMOS_D1MINI
-d1_mini.build.core=esp8266
-d1_mini.build.variant=d1_mini
-d1_mini.build.flash_mode=dio
-d1_mini.build.flash_size=4M
-d1_mini.build.flash_freq=40
-d1_mini.build.debug_port=
-d1_mini.build.debug_level=
-
-d1_mini.menu.CpuFrequency.80=80 MHz
-d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1_mini.menu.CpuFrequency.160=160 MHz
-d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-d1_mini.menu.UploadSpeed.921600=921600
-d1_mini.menu.UploadSpeed.921600.upload.speed=921600
-d1_mini.menu.UploadSpeed.115200=115200
-d1_mini.menu.UploadSpeed.115200.upload.speed=115200
-d1_mini.menu.UploadSpeed.9600=9600
-d1_mini.menu.UploadSpeed.9600.upload.speed=9600
-d1_mini.menu.UploadSpeed.57600=57600
-d1_mini.menu.UploadSpeed.57600.upload.speed=57600
-d1_mini.menu.UploadSpeed.256000.windows=256000
-d1_mini.menu.UploadSpeed.256000.upload.speed=256000
-d1_mini.menu.UploadSpeed.230400.linux=230400
-d1_mini.menu.UploadSpeed.230400.macosx=230400
-d1_mini.menu.UploadSpeed.230400.macosx=230400
-d1_mini.menu.UploadSpeed.230400.upload.speed=230400
-d1_mini.menu.UploadSpeed.460800.linux=460800
-d1_mini.menu.UploadSpeed.460800.macosx=460800
-d1_mini.menu.UploadSpeed.460800.upload.speed=460800
-d1_mini.menu.UploadSpeed.512000.windows=512000
-d1_mini.menu.UploadSpeed.512000.upload.speed=512000
-
-
-d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
-d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
-d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
-d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
-d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-##############################################################
-d1.name=WeMos D1(Retired)
-
-d1.upload.tool=esptool
-d1.upload.speed=460800
-d1.upload.resetmethod=nodemcu
-d1.upload.maximum_size=1044464
-d1.upload.maximum_data_size=81920
-d1.upload.wait_for_upload_port=true
-d1.serial.disableDTR=true
-d1.serial.disableRTS=true
-
-d1.build.mcu=esp8266
-d1.build.f_cpu=80000000L
-d1.build.board=ESP8266_WEMOS_D1MINI
-d1.build.core=esp8266
-d1.build.variant=d1
-d1.build.flash_mode=dio
-d1.build.flash_size=4M
-d1.build.flash_freq=40
-d1.build.debug_port=
-d1.build.debug_level=
-
-d1.menu.CpuFrequency.80=80 MHz
-d1.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1.menu.CpuFrequency.160=160 MHz
-d1.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-d1.menu.UploadSpeed.921600=921600
-d1.menu.UploadSpeed.921600.upload.speed=921600
-d1.menu.UploadSpeed.115200=115200
-d1.menu.UploadSpeed.115200.upload.speed=115200
-d1.menu.UploadSpeed.9600=9600
-d1.menu.UploadSpeed.9600.upload.speed=9600
-d1.menu.UploadSpeed.57600=57600
-d1.menu.UploadSpeed.57600.upload.speed=57600
-d1.menu.UploadSpeed.256000.windows=256000
-d1.menu.UploadSpeed.256000.upload.speed=256000
-d1.menu.UploadSpeed.230400.linux=230400
-d1.menu.UploadSpeed.230400.macosx=230400
-d1.menu.UploadSpeed.230400.macosx=230400
-d1.menu.UploadSpeed.230400.upload.speed=230400
-d1.menu.UploadSpeed.460800.linux=460800
-d1.menu.UploadSpeed.460800.macosx=460800
-d1.menu.UploadSpeed.460800.upload.speed=460800
-d1.menu.UploadSpeed.512000.windows=512000
-d1.menu.UploadSpeed.512000.upload.speed=512000
-
-
-d1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-d1.menu.FlashSize.4M3M.build.flash_size=4M
-d1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-d1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-d1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-d1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-d1.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-d1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-d1.menu.FlashSize.4M1M.build.flash_size=4M
-d1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-d1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-d1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-d1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-
-##############################################################
-
-espino.name=ESPino (ESP-12 Module)
-
-espino.upload.tool=esptool
-espino.upload.speed=115200
-espino.upload.resetmethod=ck
-espino.upload.maximum_size=1044464
-espino.upload.maximum_data_size=81920
-espino.upload.wait_for_upload_port=true
-espino.serial.disableDTR=true
-espino.serial.disableRTS=true
-
-espino.build.mcu=esp8266
-espino.build.f_cpu=80000000L
-espino.build.board=ESP8266_ESP12
-espino.build.core=esp8266
-espino.build.variant=espino
-espino.build.flash_mode=qio
-espino.build.flash_size=4M
-espino.build.flash_freq=40
-espino.build.spiffs_pagesize=256
-espino.build.debug_port=
-espino.build.debug_level=
-
-espino.menu.CpuFrequency.80=80 MHz
-espino.menu.CpuFrequency.80.build.f_cpu=80000000L
-espino.menu.CpuFrequency.160=160 MHz
-espino.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-espino.menu.FlashMode.dio=DIO
-espino.menu.FlashMode.dio.build.flash_mode=dio
-espino.menu.FlashMode.qio=QIO
-espino.menu.FlashMode.qio.build.flash_mode=qio
-
-espino.menu.UploadSpeed.115200=115200
-espino.menu.UploadSpeed.115200.upload.speed=115200
-espino.menu.UploadSpeed.9600=9600
-espino.menu.UploadSpeed.9600.upload.speed=9600
-espino.menu.UploadSpeed.57600=57600
-espino.menu.UploadSpeed.57600.upload.speed=57600
-espino.menu.UploadSpeed.256000.windows=256000
-espino.menu.UploadSpeed.256000.upload.speed=256000
-espino.menu.UploadSpeed.230400.linux=230400
-espino.menu.UploadSpeed.230400.macosx=230400
-espino.menu.UploadSpeed.230400.upload.speed=230400
-espino.menu.UploadSpeed.460800.linux=460800
-espino.menu.UploadSpeed.460800.macosx=460800
-espino.menu.UploadSpeed.460800.upload.speed=460800
-espino.menu.UploadSpeed.512000.windows=512000
-espino.menu.UploadSpeed.512000.upload.speed=512000
-espino.menu.UploadSpeed.921600=921600
-espino.menu.UploadSpeed.921600.upload.speed=921600
-
-espino.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espino.menu.FlashSize.4M1M.build.flash_size=4M
-espino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espino.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-espino.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espino.menu.FlashSize.4M3M.build.flash_size=4M
-espino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espino.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-espino.menu.ResetMethod.ck=ck
-espino.menu.ResetMethod.ck.upload.resetmethod=ck
-espino.menu.ResetMethod.nodemcu=nodemcu
-espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-
-##############################################################
-espinotee.name=ThaiEasyElec's ESPino
-
-espinotee.upload.tool=esptool
-espinotee.upload.speed=115200
-espinotee.upload.resetmethod=nodemcu
-espinotee.upload.maximum_size=1044464
-espinotee.upload.maximum_data_size=81920
-espinotee.upload.wait_for_upload_port=true
-espinotee.serial.disableDTR=true
-espinotee.serial.disableRTS=true
-
-espinotee.build.mcu=esp8266
-espinotee.build.f_cpu=80000000L
-espinotee.build.board=ESP8266_ESP13
-espinotee.build.core=esp8266
-espinotee.build.variant=espinotee
-espinotee.build.flash_mode=qio
-espinotee.build.flash_size=4M
-espinotee.build.flash_freq=40
-espinotee.build.debug_port=
-espinotee.build.debug_level=
-
-espinotee.menu.CpuFrequency.80=80 MHz
-espinotee.menu.CpuFrequency.80.build.f_cpu=80000000L
-espinotee.menu.CpuFrequency.160=160 MHz
-espinotee.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-espinotee.menu.UploadSpeed.115200=115200
-espinotee.menu.UploadSpeed.115200.upload.speed=115200
-espinotee.menu.UploadSpeed.9600=9600
-espinotee.menu.UploadSpeed.9600.upload.speed=9600
-espinotee.menu.UploadSpeed.57600=57600
-espinotee.menu.UploadSpeed.57600.upload.speed=57600
-espinotee.menu.UploadSpeed.256000.windows=256000
-espinotee.menu.UploadSpeed.256000.upload.speed=256000
-espinotee.menu.UploadSpeed.230400.linux=230400
-espinotee.menu.UploadSpeed.230400.macosx=230400
-espinotee.menu.UploadSpeed.230400.macosx=230400
-espinotee.menu.UploadSpeed.230400.upload.speed=230400
-espinotee.menu.UploadSpeed.460800.linux=460800
-espinotee.menu.UploadSpeed.460800.macosx=460800
-espinotee.menu.UploadSpeed.460800.upload.speed=460800
-espinotee.menu.UploadSpeed.512000.windows=512000
-espinotee.menu.UploadSpeed.512000.upload.speed=512000
-espinotee.menu.UploadSpeed.921600=921600
-espinotee.menu.UploadSpeed.921600.upload.speed=921600
-
-espinotee.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espinotee.menu.FlashSize.4M3M.build.flash_size=4M
-espinotee.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espinotee.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espinotee.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espinotee.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espinotee.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-
-espinotee.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espinotee.menu.FlashSize.4M1M.build.flash_size=4M
-espinotee.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espinotee.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espinotee.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espinotee.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espinotee.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-
-##############################################################
-wifinfo.name=WifInfo
-
-wifinfo.upload.tool=esptool
-wifinfo.upload.speed=115200
-wifinfo.upload.resetmethod=nodemcu
-wifinfo.upload.maximum_size=434160
-wifinfo.upload.maximum_data_size=81920
-wifinfo.upload.wait_for_upload_port=true
-wifinfo.serial.disableDTR=true
-wifinfo.serial.disableRTS=true
-
-wifinfo.build.mcu=esp8266
-wifinfo.build.core=esp8266
-wifinfo.build.variant=wifinfo
-wifinfo.build.board=WIFINFO
-wifinfo.build.spiffs_pagesize=256
-wifinfo.build.debug_port=Serial1
-wifinfo.build.debug_level=Wifinfo
-
-wifinfo.menu.Debug.Disabled=Disabled
-wifinfo.menu.Debug.Disabled.build.debug_port=
-wifinfo.menu.Debug.Serial=Serial
-wifinfo.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-wifinfo.menu.Debug.Serial1=Serial1
-wifinfo.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-wifinfo.menu.DebugLevel.None=None
-wifinfo.menu.DebugLevel.None.build.debug_level=
-wifinfo.menu.DebugLevel.Wifinfo=Wifinfo
-wifinfo.menu.DebugLevel.Wifinfo.build.debug_level=-DDEBUG_ESP_WIFINFO
-
-#wifinfo.menu.ESPModule.ESP07512=ESP07 (1M/512K SPIFFS)
-#wifinfo.menu.ESPModule.ESP07512.build.board=ESP8266_ESP07
-#wifinfo.menu.ESPModule.ESP07512.build.flash_size=1M
-#wifinfo.menu.ESPModule.ESP07512.build.flash_ld=eagle.flash.1m512.ld
-#wifinfo.menu.ESPModule.ESP07512.build.spiffs_start=0x7B000
-#wifinfo.menu.ESPModule.ESP07512.build.spiffs_end=0xFB000
-#wifinfo.menu.ESPModule.ESP07512.build.spiffs_blocksize=8192
-#wifinfo.menu.ESPModule.ESP07512.upload.maximum_size=499696
-
-#wifinfo.menu.ESPModule.ESP07256=ESP07 (1M/256K SPIFFS)
-#wifinfo.menu.ESPModule.ESP07256.build.board=ESP8266_ESP07
-#wifinfo.menu.ESPModule.ESP07256.build.flash_size=1M
-#wifinfo.menu.ESPModule.ESP07256.build.flash_ld=eagle.flash.1m256.ld
-#wifinfo.menu.ESPModule.ESP07256.build.spiffs_start=0xBB000
-#wifinfo.menu.ESPModule.ESP07256.build.spiffs_end=0xFB000
-##wifinfo.menu.ESPModule.ESP07256.build.spiffs_blocksize=4096
-#wifinfo.menu.ESPModule.ESP07256.upload.maximum_size=761840
-
-wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
-wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
-wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
-wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
-wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
-
-#wifinfo.menu.ESPModule.ESP07160=ESP07 (1M/160K SPIFFS)
-#wifinfo.menu.ESPModule.ESP07160.build.board=ESP8266_ESP07
-#wifinfo.menu.ESPModule.ESP07160.build.flash_size=1M
-#wifinfo.menu.ESPModule.ESP07160.build.flash_ld=eagle.flash.1m160.ld
-#wifinfo.menu.ESPModule.ESP07160.build.spiffs_start=0xD3000
-#wifinfo.menu.ESPModule.ESP07160.build.spiffs_end=0xFB000
-#wifinfo.menu.ESPModule.ESP07160.build.spiffs_blocksize=4096
-#wifinfo.menu.ESPModule.ESP07160.upload.maximum_size=860144
-#
-#wifinfo.menu.ESPModule.ESP07144=ESP07 (1M/144K SPIFFS)
-#wifinfo.menu.ESPModule.ESP07144.build.board=ESP8266_ESP07
-#wifinfo.menu.ESPModule.ESP07144.build.flash_size=1M
-#wifinfo.menu.ESPModule.ESP07144.build.flash_ld=eagle.flash.1m144.ld
-#wifinfo.menu.ESPModule.ESP07144.build.spiffs_start=0xD7000
-#wifinfo.menu.ESPModule.ESP07144.build.spiffs_end=0xFB000
-#wifinfo.menu.ESPModule.ESP07144.build.spiffs_blocksize=4096
-#wifinfo.menu.ESPModule.ESP07144.upload.maximum_size=876528
-#
-#wifinfo.menu.ESPModule.ESP07=ESP07 (1M/64K SPIFFS)
-#wifinfo.menu.ESPModule.ESP07.build.board=ESP8266_ESP07
-#wifinfo.menu.ESPModule.ESP07.build.flash_size=1M
-#wifinfo.menu.ESPModule.ESP07.build.flash_ld=eagle.flash.1m64.ld
-#wifinfo.menu.ESPModule.ESP07.build.spiffs_start=0xEB000
-#wifinfo.menu.ESPModule.ESP07.build.spiffs_end=0xFB000
-#wifinfo.menu.ESPModule.ESP07.build.spiffs_blocksize=4096
-#wifinfo.menu.ESPModule.ESP07.upload.maximum_size=958448
-
-wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
-wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
-wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
-wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
-wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
-wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
-wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
-wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
-wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
-
-wifinfo.menu.CpuFrequency.160=160 MHz
-wifinfo.menu.CpuFrequency.160.build.f_cpu=160000000L
-wifinfo.menu.CpuFrequency.80=80 MHz
-wifinfo.menu.CpuFrequency.80.build.f_cpu=80000000L
-
-wifinfo.menu.FlashFreq.40=40MHz
-wifinfo.menu.FlashFreq.40.build.flash_freq=40
-wifinfo.menu.FlashFreq.80=80MHz
-wifinfo.menu.FlashFreq.80.build.flash_freq=80
-
-wifinfo.menu.FlashMode.qio=QIO
-wifinfo.menu.FlashMode.qio.build.flash_mode=qio
-wifinfo.menu.FlashMode.dio=DIO
-wifinfo.menu.FlashMode.dio.build.flash_mode=dio
-
-wifinfo.menu.UploadSpeed.115200=115200
-wifinfo.menu.UploadSpeed.115200.upload.speed=115200
-wifinfo.menu.UploadSpeed.9600=9600
-wifinfo.menu.UploadSpeed.9600.upload.speed=9600
-wifinfo.menu.UploadSpeed.57600=57600
-wifinfo.menu.UploadSpeed.57600.upload.speed=57600
-wifinfo.menu.UploadSpeed.256000.windows=256000
-wifinfo.menu.UploadSpeed.256000.upload.speed=256000
-wifinfo.menu.UploadSpeed.230400.linux=230400
-wifinfo.menu.UploadSpeed.230400.macosx=230400
-wifinfo.menu.UploadSpeed.230400.upload.speed=230400
-wifinfo.menu.UploadSpeed.460800.linux=460800
-wifinfo.menu.UploadSpeed.460800.macosx=460800
-wifinfo.menu.UploadSpeed.460800.upload.speed=460800
-wifinfo.menu.UploadSpeed.512000.windows=512000
-wifinfo.menu.UploadSpeed.512000.upload.speed=512000
-wifinfo.menu.UploadSpeed.921600=921600
-wifinfo.menu.UploadSpeed.921600.upload.speed=921600
-
-
-##############################################################
-coredev.name=Core Development Module
-
-coredev.upload.tool=esptool
-coredev.upload.speed=115200
-coredev.upload.resetmethod=ck
-coredev.upload.maximum_size=434160
-coredev.upload.maximum_data_size=81920
-coredev.upload.wait_for_upload_port=true
-coredev.serial.disableDTR=true
-coredev.serial.disableRTS=true
-
-coredev.build.mcu=esp8266
-coredev.build.f_cpu=80000000L
-coredev.build.board=ESP8266_ESP01
-coredev.build.core=esp8266
-coredev.build.variant=generic
-coredev.build.flash_mode=qio
-coredev.build.spiffs_pagesize=256
-coredev.build.debug_port=
-coredev.build.debug_level=
-coredev.build.lwip_lib=-llwip
-coredev.build.lwip_flags=
-
-
-coredev.menu.LwIPVariant.Espressif=Espressif (xcc)
-coredev.menu.LwIPVariant.Espressif.build.lwip_lib=-llwip
-coredev.menu.LwIPVariant.Espressif.build.lwip_flags=
-coredev.menu.LwIPVariant.Prebuilt=Prebuilt Source (gcc)
-coredev.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-coredev.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-coredev.menu.LwIPVariant.OpenSource=Open Source (gcc)
-coredev.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-coredev.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-coredev.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-
-coredev.menu.CpuFrequency.80=80 MHz
-coredev.menu.CpuFrequency.80.build.f_cpu=80000000L
-coredev.menu.CpuFrequency.160=160 MHz
-coredev.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-coredev.menu.FlashFreq.40=40MHz
-coredev.menu.FlashFreq.40.build.flash_freq=40
-coredev.menu.FlashFreq.80=80MHz
-coredev.menu.FlashFreq.80.build.flash_freq=80
-
-coredev.menu.FlashMode.dio=DIO
-coredev.menu.FlashMode.dio.build.flash_mode=dio
-coredev.menu.FlashMode.qio=QIO
-coredev.menu.FlashMode.qio.build.flash_mode=qio
-coredev.menu.FlashMode.dout=DOUT
-coredev.menu.FlashMode.dout.build.flash_mode=dout
-coredev.menu.FlashMode.qout=QOUT
-coredev.menu.FlashMode.qout.build.flash_mode=qout
-
-coredev.menu.UploadSpeed.115200=115200
-coredev.menu.UploadSpeed.115200.upload.speed=115200
-coredev.menu.UploadSpeed.9600=9600
-coredev.menu.UploadSpeed.9600.upload.speed=9600
-coredev.menu.UploadSpeed.57600=57600
-coredev.menu.UploadSpeed.57600.upload.speed=57600
-coredev.menu.UploadSpeed.256000.windows=256000
-coredev.menu.UploadSpeed.256000.upload.speed=256000
-coredev.menu.UploadSpeed.230400.linux=230400
-coredev.menu.UploadSpeed.230400.macosx=230400
-coredev.menu.UploadSpeed.230400.upload.speed=230400
-coredev.menu.UploadSpeed.460800.linux=460800
-coredev.menu.UploadSpeed.460800.macosx=460800
-coredev.menu.UploadSpeed.460800.upload.speed=460800
-coredev.menu.UploadSpeed.512000.windows=512000
-coredev.menu.UploadSpeed.512000.upload.speed=512000
-coredev.menu.UploadSpeed.921600=921600
-coredev.menu.UploadSpeed.921600.upload.speed=921600
-
-coredev.menu.FlashSize.512K64=512K (64K SPIFFS)
-coredev.menu.FlashSize.512K64.build.flash_size=512K
-coredev.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-coredev.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-coredev.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-coredev.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.512K64.upload.maximum_size=434160
-
-coredev.menu.FlashSize.512K128=512K (128K SPIFFS)
-coredev.menu.FlashSize.512K128.build.flash_size=512K
-coredev.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-coredev.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-coredev.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-coredev.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.512K128.upload.maximum_size=368624
-
-coredev.menu.FlashSize.512K0=512K (no SPIFFS)
-coredev.menu.FlashSize.512K0.build.flash_size=512K
-coredev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-coredev.menu.FlashSize.512K0.upload.maximum_size=499696
-
-coredev.menu.FlashSize.1M512=1M (512K SPIFFS)
-coredev.menu.FlashSize.1M512.build.flash_size=1M
-coredev.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-coredev.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-coredev.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-coredev.menu.FlashSize.1M512.upload.maximum_size=499696
-
-coredev.menu.FlashSize.1M256=1M (256K SPIFFS)
-coredev.menu.FlashSize.1M256.build.flash_size=1M
-coredev.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-coredev.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-coredev.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M256.upload.maximum_size=761840
-
-coredev.menu.FlashSize.1M192=1M (192K SPIFFS)
-coredev.menu.FlashSize.1M192.build.flash_size=1M
-coredev.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-coredev.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-coredev.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M192.upload.maximum_size=827376
-
-coredev.menu.FlashSize.1M160=1M (160K SPIFFS)
-coredev.menu.FlashSize.1M160.build.flash_size=1M
-coredev.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-coredev.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-coredev.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M160.upload.maximum_size=860144
-
-coredev.menu.FlashSize.1M144=1M (144K SPIFFS)
-coredev.menu.FlashSize.1M144.build.flash_size=1M
-coredev.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-coredev.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-coredev.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M144.upload.maximum_size=876528
-
-coredev.menu.FlashSize.1M128=1M (128K SPIFFS)
-coredev.menu.FlashSize.1M128.build.flash_size=1M
-coredev.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-coredev.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-coredev.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M128.upload.maximum_size=892912
-
-coredev.menu.FlashSize.1M64=1M (64K SPIFFS)
-coredev.menu.FlashSize.1M64.build.flash_size=1M
-coredev.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-coredev.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-coredev.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-coredev.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-coredev.menu.FlashSize.1M64.upload.maximum_size=958448
-
-coredev.menu.FlashSize.2M=2M (1M SPIFFS)
-coredev.menu.FlashSize.2M.build.flash_size=2M
-coredev.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
-coredev.menu.FlashSize.2M.build.spiffs_start=0x100000
-coredev.menu.FlashSize.2M.build.spiffs_end=0x1FB000
-coredev.menu.FlashSize.2M.build.spiffs_blocksize=8192
-coredev.menu.FlashSize.2M.upload.maximum_size=1044464
-
-coredev.menu.FlashSize.4M1M=4M (1M SPIFFS)
-coredev.menu.FlashSize.4M1M.build.flash_size=4M
-coredev.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-coredev.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-coredev.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-coredev.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-coredev.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-coredev.menu.FlashSize.4M1M.upload.maximum_size=1044464
-
-coredev.menu.FlashSize.4M3M=4M (3M SPIFFS)
-coredev.menu.FlashSize.4M3M.build.flash_size=4M
-coredev.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-coredev.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-coredev.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-coredev.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-coredev.menu.FlashSize.4M3M.upload.maximum_size=1044464
-
-coredev.menu.ResetMethod.ck=ck
-coredev.menu.ResetMethod.ck.upload.resetmethod=ck
-coredev.menu.ResetMethod.nodemcu=nodemcu
-coredev.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-
-coredev.menu.Debug.Disabled=Disabled
-coredev.menu.Debug.Disabled.build.debug_port=
-coredev.menu.Debug.Serial=Serial
-coredev.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-coredev.menu.Debug.Serial1=Serial1
-coredev.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-
-coredev.menu.DebugLevel.None____=None
-coredev.menu.DebugLevel.None____.build.debug_level=
-coredev.menu.DebugLevel.Core____=Core
-coredev.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
-coredev.menu.DebugLevel.SSL_____=Core + SSL
-coredev.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
-coredev.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
-coredev.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
-coredev.menu.DebugLevel.WiFic___=Core + WiFi
-coredev.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
-coredev.menu.DebugLevel.WiFi____=WiFi
-coredev.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
-coredev.menu.DebugLevel.HTTPClient=HTTPClient
-coredev.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
-coredev.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
-coredev.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
-coredev.menu.DebugLevel.HTTPUpdate=HTTPUpdate
-coredev.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
-coredev.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
-coredev.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
-coredev.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
-coredev.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
-coredev.menu.DebugLevel.HTTPServer=HTTPServer
-coredev.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
-coredev.menu.DebugLevel.UPDATER=Updater
-coredev.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
-coredev.menu.DebugLevel.OTA_____=OTA
-coredev.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
-coredev.menu.DebugLevel.OTA2____=OTA + Updater
-coredev.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
-coredev.menu.DebugLevel.all_____=All
-coredev.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM

From 44cf79777848e42ce5b52a92d108cb7a710fe043 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:36:07 +0100
Subject: [PATCH 375/403] Delete platform.txt

---
 arduino/version 2.3.0/platform.txt | 130 -----------------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 arduino/version 2.3.0/platform.txt

diff --git a/arduino/version 2.3.0/platform.txt b/arduino/version 2.3.0/platform.txt
deleted file mode 100644
index d9c60b3f1..000000000
--- a/arduino/version 2.3.0/platform.txt	
+++ /dev/null
@@ -1,130 +0,0 @@
-
-# ESP8266 platform
-# ------------------------------
-
-# For more info:
-# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
-
-name=ESP8266 Modules
-version=2.2.0
-
-
-
-
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-
-build.lwip_lib=-llwip_gcc
-build.lwip_flags=-DLWIP_OPEN_SRC
-
-compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
-compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{build.path}/core"
-
-compiler.c.cmd=xtensa-lx106-elf-gcc
-compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
-
-compiler.S.cmd=xtensa-lx106-elf-gcc
-compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
-
-compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy
-
-compiler.c.elf.cmd=xtensa-lx106-elf-gcc
-compiler.c.elf.libs=-lm -lgcc -lhal -lphy -lpp -lnet80211 -lwpa -lcrypto -lmain -lwps -laxtls -lsmartconfig -lmesh -lwpa2 {build.lwip_lib} -lstdc++
-
-compiler.cpp.cmd=xtensa-lx106-elf-g++
-compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
-
-compiler.as.cmd=xtensa-lx106-elf-as
-
-compiler.ar.cmd=xtensa-lx106-elf-ar
-compiler.ar.flags=cru
-
-compiler.elf2hex.cmd=esptool
-compiler.elf2hex.flags=
-
-compiler.size.cmd=xtensa-lx106-elf-size
-
-compiler.esptool.cmd=esptool
-compiler.esptool.cmd.windows=esptool.exe
-
-# This can be overriden in boards.txt
-build.extra_flags=-DESP8266
-
-# These can be overridden in platform.local.txt
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.S.extra_flags=
-compiler.cpp.extra_flags=
-compiler.ar.extra_flags=
-compiler.objcopy.eep.extra_flags=
-compiler.elf2hex.extra_flags=
-
-## generate file with git version number
-## needs bash, git, and echo
-
-## windows-compatible version may be added later
-
-
-## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Create archives
-recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"
-
-## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group  "-L{build.path}"
-
-## Create eeprom
-recipe.objcopy.eep.pattern=
-
-## Create hex
-#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
-
-recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
-
-## Save hex
-recipe.output.tmp_file={build.project_name}.bin
-recipe.output.save_file={build.project_name}.{build.variant}.bin
-
-## Compute size
-recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
-recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
-#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-
-# ------------------------------
-
-tools.esptool.cmd=esptool
-tools.esptool.cmd.windows=esptool.exe
-tools.esptool.path={runtime.tools.esptool.path}
-tools.esptool.network_cmd=python
-tools.esptool.network_cmd.windows=python.exe
-
-tools.esptool.upload.protocol=esp
-tools.esptool.upload.params.verbose=-vv
-tools.esptool.upload.params.quiet=
-tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
-tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
-
-tools.mkspiffs.cmd=mkspiffs
-tools.mkspiffs.cmd.windows=mkspiffs.exe
-tools.mkspiffs.path={runtime.tools.mkspiffs.path}
-
-tools.espupload.cmd=python
-tools.espupload.cmd.windows=python.exe
-tools.espupload.path={runtime.platform.path}/tools
-
-tools.espupload.upload.protocol=espupload
-tools.espupload.upload.params.verbose=
-tools.espupload.upload.params.quiet=
-tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"

From 6dde795e0cb18b949bd2736d6dc7ae6df7878cf6 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:36:21 +0100
Subject: [PATCH 376/403] Delete boards.txt

---
 arduino/version 2.4.2/boards.txt | 4829 ------------------------------
 1 file changed, 4829 deletions(-)
 delete mode 100644 arduino/version 2.4.2/boards.txt

diff --git a/arduino/version 2.4.2/boards.txt b/arduino/version 2.4.2/boards.txt
deleted file mode 100644
index ead81b6f0..000000000
--- a/arduino/version 2.4.2/boards.txt	
+++ /dev/null
@@ -1,4829 +0,0 @@
-#
-# Do not create pull-requests for this file only, CI will not accept them.
-# You *must* edit/modify/run boards.txt.py to regenerate boards.txt.
-# All modified files after running with option "--allgen" must be included in the pull-request.
-#
-
-menu.BoardModel=Model
-menu.UploadSpeed=Upload Speed
-menu.UploadTool=Upload Using
-menu.CpuFrequency=CPU Frequency
-menu.CrystalFreq=Crystal Frequency
-menu.FlashSize=Flash Size
-menu.FlashMode=Flash Mode
-menu.FlashFreq=Flash Frequency
-menu.ResetMethod=Reset Method
-menu.ESPModule=Module
-menu.Debug=Debug port
-menu.DebugLevel=Debug Level
-menu.LwIPVariant=lwIP Variant
-menu.VTable=VTables
-menu.led=Builtin Led
-menu.FlashErase=Erase Flash
-
-##############################################################
-generic.name=Generic ESP8266 Module
-generic.build.board=ESP8266_GENERIC
-generic.upload.tool=esptool
-generic.upload.maximum_data_size=81920
-generic.upload.wait_for_upload_port=true
-generic.upload.erase_cmd=
-generic.serial.disableDTR=true
-generic.serial.disableRTS=true
-generic.build.mcu=esp8266
-generic.build.core=esp8266
-generic.build.variant=generic
-generic.build.spiffs_pagesize=256
-generic.build.debug_port=
-generic.build.debug_level=
-
-generic.menu.UploadTool.esptool=Serial
-generic.menu.UploadTool.esptool.upload.tool=esptool
-generic.menu.UploadTool.esptool.upload.verbose=-vv
-generic.menu.UploadTool.espupload=OTA_upload
-generic.menu.UploadTool.espupload.upload.tool=espupload
-
-generic.menu.CpuFrequency.80=80 MHz
-generic.menu.CpuFrequency.80.build.f_cpu=80000000L
-generic.menu.CpuFrequency.160=160 MHz
-generic.menu.CpuFrequency.160.build.f_cpu=160000000L
-generic.menu.VTable.flash=Flash
-generic.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-generic.menu.VTable.heap=Heap
-generic.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-generic.menu.VTable.iram=IRAM
-generic.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-generic.menu.ResetMethod.ck=ck
-generic.menu.ResetMethod.ck.upload.resetmethod=ck
-generic.menu.ResetMethod.nodemcu=nodemcu
-generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-generic.menu.ResetMethod.none=none
-generic.menu.ResetMethod.none.upload.resetmethod=none
-generic.menu.ResetMethod.dtrset=dtrset
-generic.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
-generic.menu.CrystalFreq.26=26 MHz
-generic.menu.CrystalFreq.40=40 MHz
-generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-generic.menu.FlashFreq.40=40MHz
-generic.menu.FlashFreq.40.build.flash_freq=40
-generic.menu.FlashFreq.80=80MHz
-generic.menu.FlashFreq.80.build.flash_freq=80
-generic.menu.FlashMode.qio=QIO
-generic.menu.FlashMode.qio.build.flash_mode=qio
-generic.menu.FlashMode.qout=QOUT
-generic.menu.FlashMode.qout.build.flash_mode=qout
-generic.menu.FlashMode.dio=DIO
-generic.menu.FlashMode.dio.build.flash_mode=dio
-generic.menu.FlashMode.dout=DOUT
-generic.menu.FlashMode.dout.build.flash_mode=dout
-generic.menu.FlashSize.512K0=512K (no SPIFFS)
-generic.menu.FlashSize.512K0.build.flash_size=512K
-generic.menu.FlashSize.512K0.build.flash_size_bytes=0x80000
-generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-generic.menu.FlashSize.512K0.build.spiffs_pagesize=256
-generic.menu.FlashSize.512K0.upload.maximum_size=499696
-generic.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
-generic.menu.FlashSize.512K32=512K (32K SPIFFS)
-generic.menu.FlashSize.512K32.build.flash_size=512K
-generic.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
-generic.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
-generic.menu.FlashSize.512K32.build.spiffs_pagesize=256
-generic.menu.FlashSize.512K32.upload.maximum_size=466928
-generic.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
-generic.menu.FlashSize.512K32.build.spiffs_start=0x73000
-generic.menu.FlashSize.512K32.build.spiffs_end=0x7B000
-generic.menu.FlashSize.512K32.build.spiffs_blocksize=4096
-generic.menu.FlashSize.512K64=512K (64K SPIFFS)
-generic.menu.FlashSize.512K64.build.flash_size=512K
-generic.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
-generic.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-generic.menu.FlashSize.512K64.build.spiffs_pagesize=256
-generic.menu.FlashSize.512K64.upload.maximum_size=434160
-generic.menu.FlashSize.512K64.build.rfcal_addr=0x7C000
-generic.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-generic.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-generic.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-generic.menu.FlashSize.512K128=512K (128K SPIFFS)
-generic.menu.FlashSize.512K128.build.flash_size=512K
-generic.menu.FlashSize.512K128.build.flash_size_bytes=0x80000
-generic.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-generic.menu.FlashSize.512K128.build.spiffs_pagesize=256
-generic.menu.FlashSize.512K128.upload.maximum_size=368624
-generic.menu.FlashSize.512K128.build.rfcal_addr=0x7C000
-generic.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-generic.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-generic.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M0=1M (no SPIFFS)
-generic.menu.FlashSize.1M0.build.flash_size=1M
-generic.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-generic.menu.FlashSize.1M0.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M0.upload.maximum_size=1023984
-generic.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M64=1M (64K SPIFFS)
-generic.menu.FlashSize.1M64.build.flash_size=1M
-generic.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-generic.menu.FlashSize.1M64.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M64.upload.maximum_size=958448
-generic.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M128=1M (128K SPIFFS)
-generic.menu.FlashSize.1M128.build.flash_size=1M
-generic.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-generic.menu.FlashSize.1M128.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M128.upload.maximum_size=892912
-generic.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M144=1M (144K SPIFFS)
-generic.menu.FlashSize.1M144.build.flash_size=1M
-generic.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-generic.menu.FlashSize.1M144.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M144.upload.maximum_size=876528
-generic.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-generic.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M160=1M (160K SPIFFS)
-generic.menu.FlashSize.1M160.build.flash_size=1M
-generic.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-generic.menu.FlashSize.1M160.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M160.upload.maximum_size=860144
-generic.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-generic.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M192=1M (192K SPIFFS)
-generic.menu.FlashSize.1M192.build.flash_size=1M
-generic.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-generic.menu.FlashSize.1M192.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M192.upload.maximum_size=827376
-generic.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-generic.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M256=1M (256K SPIFFS)
-generic.menu.FlashSize.1M256.build.flash_size=1M
-generic.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-generic.menu.FlashSize.1M256.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M256.upload.maximum_size=761840
-generic.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M512=1M (512K SPIFFS)
-generic.menu.FlashSize.1M512.build.flash_size=1M
-generic.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
-generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-generic.menu.FlashSize.1M512.build.spiffs_pagesize=256
-generic.menu.FlashSize.1M512.upload.maximum_size=499696
-generic.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
-generic.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-generic.menu.FlashSize.2M=2M (1M SPIFFS)
-generic.menu.FlashSize.2M.build.flash_size=2M
-generic.menu.FlashSize.2M.build.flash_size_bytes=0x200000
-generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
-generic.menu.FlashSize.2M.build.spiffs_pagesize=256
-generic.menu.FlashSize.2M.upload.maximum_size=1044464
-generic.menu.FlashSize.2M.build.rfcal_addr=0x1FC000
-generic.menu.FlashSize.2M.build.spiffs_start=0x100000
-generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
-generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M1M=4M (1M SPIFFS)
-generic.menu.FlashSize.4M1M.build.flash_size=4M
-generic.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-generic.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-generic.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-generic.menu.FlashSize.4M1M.upload.maximum_size=1044464
-generic.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-generic.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-generic.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M2M=4M (2M SPIFFS)
-generic.menu.FlashSize.4M2M.build.flash_size=4M
-generic.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-generic.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-generic.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-generic.menu.FlashSize.4M2M.upload.maximum_size=1044464
-generic.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-generic.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-generic.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M3M=4M (3M SPIFFS)
-generic.menu.FlashSize.4M3M.build.flash_size=4M
-generic.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-generic.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-generic.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-generic.menu.FlashSize.4M3M.upload.maximum_size=1044464
-generic.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-generic.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-generic.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.8M7M=8M (7M SPIFFS)
-generic.menu.FlashSize.8M7M.build.flash_size=8M
-generic.menu.FlashSize.8M7M.build.flash_size_bytes=0x800000
-generic.menu.FlashSize.8M7M.build.flash_ld=eagle.flash.8m.ld
-generic.menu.FlashSize.8M7M.build.spiffs_pagesize=256
-generic.menu.FlashSize.8M7M.upload.maximum_size=1044464
-generic.menu.FlashSize.8M7M.build.rfcal_addr=0x7FC000
-generic.menu.FlashSize.8M7M.build.spiffs_start=0x100000
-generic.menu.FlashSize.8M7M.build.spiffs_end=0x7FB000
-generic.menu.FlashSize.8M7M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.16M15M=16M (15M SPIFFS)
-generic.menu.FlashSize.16M15M.build.flash_size=16M
-generic.menu.FlashSize.16M15M.build.flash_size_bytes=0x1000000
-generic.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld
-generic.menu.FlashSize.16M15M.build.spiffs_pagesize=256
-generic.menu.FlashSize.16M15M.upload.maximum_size=1044464
-generic.menu.FlashSize.16M15M.build.rfcal_addr=0xFFC000
-generic.menu.FlashSize.16M15M.build.spiffs_start=0x100000
-generic.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000
-generic.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
-generic.menu.led.2=2
-generic.menu.led.2.build.led=-DLED_BUILTIN=2
-generic.menu.led.0=0
-generic.menu.led.0.build.led=-DLED_BUILTIN=0
-generic.menu.led.1=1
-generic.menu.led.1.build.led=-DLED_BUILTIN=1
-generic.menu.led.3=3
-generic.menu.led.3.build.led=-DLED_BUILTIN=3
-generic.menu.led.4=4
-generic.menu.led.4.build.led=-DLED_BUILTIN=4
-generic.menu.led.5=5
-generic.menu.led.5.build.led=-DLED_BUILTIN=5
-generic.menu.led.6=6
-generic.menu.led.6.build.led=-DLED_BUILTIN=6
-generic.menu.led.7=7
-generic.menu.led.7.build.led=-DLED_BUILTIN=7
-generic.menu.led.8=8
-generic.menu.led.8.build.led=-DLED_BUILTIN=8
-generic.menu.led.9=9
-generic.menu.led.9.build.led=-DLED_BUILTIN=9
-generic.menu.led.10=10
-generic.menu.led.10.build.led=-DLED_BUILTIN=10
-generic.menu.led.11=11
-generic.menu.led.11.build.led=-DLED_BUILTIN=11
-generic.menu.led.12=12
-generic.menu.led.12.build.led=-DLED_BUILTIN=12
-generic.menu.led.13=13
-generic.menu.led.13.build.led=-DLED_BUILTIN=13
-generic.menu.led.14=14
-generic.menu.led.14.build.led=-DLED_BUILTIN=14
-generic.menu.led.15=15
-generic.menu.led.15.build.led=-DLED_BUILTIN=15
-generic.menu.LwIPVariant.v2mss536=v2 Lower Memory
-generic.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-generic.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-generic.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-generic.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-generic.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-generic.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-generic.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-generic.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-generic.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-generic.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-generic.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-generic.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-generic.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-generic.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-generic.menu.Debug.Disabled=Disabled
-generic.menu.Debug.Disabled.build.debug_port=
-generic.menu.Debug.Serial=Serial
-generic.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-generic.menu.Debug.Serial1=Serial1
-generic.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-generic.menu.DebugLevel.None____=None
-generic.menu.DebugLevel.None____.build.debug_level=
-generic.menu.DebugLevel.SSL=SSL
-generic.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-generic.menu.DebugLevel.TLS_MEM=TLS_MEM
-generic.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-generic.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-generic.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-generic.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-generic.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-generic.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-generic.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-generic.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-generic.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-generic.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-generic.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-generic.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-generic.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-generic.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-generic.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-generic.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-generic.menu.DebugLevel.CORE=CORE
-generic.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-generic.menu.DebugLevel.WIFI=WIFI
-generic.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-generic.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-generic.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-generic.menu.DebugLevel.UPDATER=UPDATER
-generic.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-generic.menu.DebugLevel.OTA=OTA
-generic.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-generic.menu.DebugLevel.OOM=OOM
-generic.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-generic.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-generic.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-generic.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-generic.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-generic.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-generic.menu.FlashErase.none=Only Sketch
-generic.menu.FlashErase.none.upload.erase_cmd=
-generic.menu.FlashErase.sdk=Sketch + WiFi Settings
-generic.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-generic.menu.FlashErase.all=All Flash Contents
-generic.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-generic.menu.UploadSpeed.115200=115200
-generic.menu.UploadSpeed.115200.upload.speed=115200
-generic.menu.UploadSpeed.9600=9600
-generic.menu.UploadSpeed.9600.upload.speed=9600
-generic.menu.UploadSpeed.57600=57600
-generic.menu.UploadSpeed.57600.upload.speed=57600
-generic.menu.UploadSpeed.230400.linux=230400
-generic.menu.UploadSpeed.230400.macosx=230400
-generic.menu.UploadSpeed.230400.upload.speed=230400
-generic.menu.UploadSpeed.256000.windows=256000
-generic.menu.UploadSpeed.256000.upload.speed=256000
-generic.menu.UploadSpeed.460800.linux=460800
-generic.menu.UploadSpeed.460800.macosx=460800
-generic.menu.UploadSpeed.460800.upload.speed=460800
-generic.menu.UploadSpeed.512000.windows=512000
-generic.menu.UploadSpeed.512000.upload.speed=512000
-generic.menu.UploadSpeed.921600=921600
-generic.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-esp8285.name=Generic ESP8285 Module
-esp8285.build.board=ESP8266_ESP01
-esp8285.upload.tool=esptool
-esp8285.upload.maximum_data_size=81920
-esp8285.upload.wait_for_upload_port=true
-esp8285.upload.erase_cmd=
-esp8285.serial.disableDTR=true
-esp8285.serial.disableRTS=true
-esp8285.build.mcu=esp8266
-esp8285.build.core=esp8266
-esp8285.build.variant=generic
-esp8285.build.spiffs_pagesize=256
-esp8285.build.debug_port=
-esp8285.build.debug_level=
-esp8285.menu.CpuFrequency.80=80 MHz
-esp8285.menu.CpuFrequency.80.build.f_cpu=80000000L
-esp8285.menu.CpuFrequency.160=160 MHz
-esp8285.menu.CpuFrequency.160.build.f_cpu=160000000L
-esp8285.menu.VTable.flash=Flash
-esp8285.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-esp8285.menu.VTable.heap=Heap
-esp8285.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-esp8285.menu.VTable.iram=IRAM
-esp8285.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-esp8285.menu.ResetMethod.ck=ck
-esp8285.menu.ResetMethod.ck.upload.resetmethod=ck
-esp8285.menu.ResetMethod.nodemcu=nodemcu
-esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-esp8285.menu.ResetMethod.none=none
-esp8285.menu.ResetMethod.none.upload.resetmethod=none
-esp8285.menu.ResetMethod.dtrset=dtrset
-esp8285.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
-esp8285.menu.CrystalFreq.26=26 MHz
-esp8285.menu.CrystalFreq.40=40 MHz
-esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-esp8285.build.flash_mode=dout
-esp8285.build.flash_freq=40
-esp8285.menu.FlashSize.1M0=1M (no SPIFFS)
-esp8285.menu.FlashSize.1M0.build.flash_size=1M
-esp8285.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-esp8285.menu.FlashSize.1M0.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M0.upload.maximum_size=1023984
-esp8285.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M64=1M (64K SPIFFS)
-esp8285.menu.FlashSize.1M64.build.flash_size=1M
-esp8285.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-esp8285.menu.FlashSize.1M64.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M64.upload.maximum_size=958448
-esp8285.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-esp8285.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M128=1M (128K SPIFFS)
-esp8285.menu.FlashSize.1M128.build.flash_size=1M
-esp8285.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-esp8285.menu.FlashSize.1M128.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M128.upload.maximum_size=892912
-esp8285.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-esp8285.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M144=1M (144K SPIFFS)
-esp8285.menu.FlashSize.1M144.build.flash_size=1M
-esp8285.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-esp8285.menu.FlashSize.1M144.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M144.upload.maximum_size=876528
-esp8285.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-esp8285.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M160=1M (160K SPIFFS)
-esp8285.menu.FlashSize.1M160.build.flash_size=1M
-esp8285.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-esp8285.menu.FlashSize.1M160.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M160.upload.maximum_size=860144
-esp8285.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-esp8285.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M192=1M (192K SPIFFS)
-esp8285.menu.FlashSize.1M192.build.flash_size=1M
-esp8285.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-esp8285.menu.FlashSize.1M192.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M192.upload.maximum_size=827376
-esp8285.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-esp8285.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M256=1M (256K SPIFFS)
-esp8285.menu.FlashSize.1M256.build.flash_size=1M
-esp8285.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-esp8285.menu.FlashSize.1M256.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M256.upload.maximum_size=761840
-esp8285.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-esp8285.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-esp8285.menu.FlashSize.1M512=1M (512K SPIFFS)
-esp8285.menu.FlashSize.1M512.build.flash_size=1M
-esp8285.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
-esp8285.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-esp8285.menu.FlashSize.1M512.build.spiffs_pagesize=256
-esp8285.menu.FlashSize.1M512.upload.maximum_size=499696
-esp8285.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
-esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-esp8285.menu.led.2=2
-esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
-esp8285.menu.led.0=0
-esp8285.menu.led.0.build.led=-DLED_BUILTIN=0
-esp8285.menu.led.1=1
-esp8285.menu.led.1.build.led=-DLED_BUILTIN=1
-esp8285.menu.led.3=3
-esp8285.menu.led.3.build.led=-DLED_BUILTIN=3
-esp8285.menu.led.4=4
-esp8285.menu.led.4.build.led=-DLED_BUILTIN=4
-esp8285.menu.led.5=5
-esp8285.menu.led.5.build.led=-DLED_BUILTIN=5
-esp8285.menu.led.6=6
-esp8285.menu.led.6.build.led=-DLED_BUILTIN=6
-esp8285.menu.led.7=7
-esp8285.menu.led.7.build.led=-DLED_BUILTIN=7
-esp8285.menu.led.8=8
-esp8285.menu.led.8.build.led=-DLED_BUILTIN=8
-esp8285.menu.led.9=9
-esp8285.menu.led.9.build.led=-DLED_BUILTIN=9
-esp8285.menu.led.10=10
-esp8285.menu.led.10.build.led=-DLED_BUILTIN=10
-esp8285.menu.led.11=11
-esp8285.menu.led.11.build.led=-DLED_BUILTIN=11
-esp8285.menu.led.12=12
-esp8285.menu.led.12.build.led=-DLED_BUILTIN=12
-esp8285.menu.led.13=13
-esp8285.menu.led.13.build.led=-DLED_BUILTIN=13
-esp8285.menu.led.14=14
-esp8285.menu.led.14.build.led=-DLED_BUILTIN=14
-esp8285.menu.led.15=15
-esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
-esp8285.menu.LwIPVariant.v2mss536=v2 Lower Memory
-esp8285.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-esp8285.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-esp8285.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-esp8285.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-esp8285.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-esp8285.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-esp8285.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-esp8285.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-esp8285.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-esp8285.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-esp8285.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-esp8285.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-esp8285.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-esp8285.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-esp8285.menu.Debug.Disabled=Disabled
-esp8285.menu.Debug.Disabled.build.debug_port=
-esp8285.menu.Debug.Serial=Serial
-esp8285.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-esp8285.menu.Debug.Serial1=Serial1
-esp8285.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-esp8285.menu.DebugLevel.None____=None
-esp8285.menu.DebugLevel.None____.build.debug_level=
-esp8285.menu.DebugLevel.SSL=SSL
-esp8285.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-esp8285.menu.DebugLevel.TLS_MEM=TLS_MEM
-esp8285.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-esp8285.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-esp8285.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-esp8285.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-esp8285.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-esp8285.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-esp8285.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-esp8285.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-esp8285.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-esp8285.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-esp8285.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-esp8285.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-esp8285.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-esp8285.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-esp8285.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp8285.menu.DebugLevel.CORE=CORE
-esp8285.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-esp8285.menu.DebugLevel.WIFI=WIFI
-esp8285.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-esp8285.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-esp8285.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-esp8285.menu.DebugLevel.UPDATER=UPDATER
-esp8285.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-esp8285.menu.DebugLevel.OTA=OTA
-esp8285.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-esp8285.menu.DebugLevel.OOM=OOM
-esp8285.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-esp8285.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-esp8285.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-esp8285.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-esp8285.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-esp8285.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-esp8285.menu.FlashErase.none=Only Sketch
-esp8285.menu.FlashErase.none.upload.erase_cmd=
-esp8285.menu.FlashErase.sdk=Sketch + WiFi Settings
-esp8285.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-esp8285.menu.FlashErase.all=All Flash Contents
-esp8285.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-esp8285.menu.UploadSpeed.115200=115200
-esp8285.menu.UploadSpeed.115200.upload.speed=115200
-esp8285.menu.UploadSpeed.9600=9600
-esp8285.menu.UploadSpeed.9600.upload.speed=9600
-esp8285.menu.UploadSpeed.57600=57600
-esp8285.menu.UploadSpeed.57600.upload.speed=57600
-esp8285.menu.UploadSpeed.230400.linux=230400
-esp8285.menu.UploadSpeed.230400.macosx=230400
-esp8285.menu.UploadSpeed.230400.upload.speed=230400
-esp8285.menu.UploadSpeed.256000.windows=256000
-esp8285.menu.UploadSpeed.256000.upload.speed=256000
-esp8285.menu.UploadSpeed.460800.linux=460800
-esp8285.menu.UploadSpeed.460800.macosx=460800
-esp8285.menu.UploadSpeed.460800.upload.speed=460800
-esp8285.menu.UploadSpeed.512000.windows=512000
-esp8285.menu.UploadSpeed.512000.upload.speed=512000
-esp8285.menu.UploadSpeed.921600=921600
-esp8285.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-espduino.name=ESPDuino (ESP-13 Module)
-espduino.build.board=ESP8266_ESP13
-espduino.build.variant=ESPDuino
-espduino.menu.ResetMethod.v2=ESPduino-V2
-espduino.menu.ResetMethod.v2.upload.resetmethod=nodemcu
-espduino.menu.ResetMethod.v1=ESPduino-V1
-espduino.menu.ResetMethod.v1.upload.resetmethod=ck
-espduino.menu.UploadTool.esptool=Serial
-espduino.menu.UploadTool.esptool.upload.tool=esptool
-espduino.menu.UploadTool.esptool.upload.verbose=-vv
-espduino.menu.UploadTool.espota=OTA
-espduino.menu.UploadTool.espota.upload.tool=espota
-espduino.upload.tool=esptool
-espduino.upload.maximum_data_size=81920
-espduino.upload.wait_for_upload_port=true
-espduino.upload.erase_cmd=
-espduino.serial.disableDTR=true
-espduino.serial.disableRTS=true
-espduino.build.mcu=esp8266
-espduino.build.core=esp8266
-espduino.build.spiffs_pagesize=256
-espduino.build.debug_port=
-espduino.build.debug_level=
-espduino.menu.CpuFrequency.80=80 MHz
-espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
-espduino.menu.CpuFrequency.160=160 MHz
-espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
-espduino.menu.VTable.flash=Flash
-espduino.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-espduino.menu.VTable.heap=Heap
-espduino.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-espduino.menu.VTable.iram=IRAM
-espduino.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-espduino.build.flash_mode=dio
-espduino.build.flash_freq=40
-espduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espduino.menu.FlashSize.4M1M.build.flash_size=4M
-espduino.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espduino.menu.FlashSize.4M1M.upload.maximum_size=1044464
-espduino.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espduino.menu.FlashSize.4M2M=4M (2M SPIFFS)
-espduino.menu.FlashSize.4M2M.build.flash_size=4M
-espduino.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-espduino.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-espduino.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-espduino.menu.FlashSize.4M2M.upload.maximum_size=1044464
-espduino.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-espduino.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-espduino.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-espduino.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-espduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espduino.menu.FlashSize.4M3M.build.flash_size=4M
-espduino.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-espduino.menu.FlashSize.4M3M.upload.maximum_size=1044464
-espduino.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espduino.menu.LwIPVariant.v2mss536=v2 Lower Memory
-espduino.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-espduino.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-espduino.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-espduino.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-espduino.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-espduino.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-espduino.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-espduino.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-espduino.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-espduino.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-espduino.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-espduino.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-espduino.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-espduino.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-espduino.menu.Debug.Disabled=Disabled
-espduino.menu.Debug.Disabled.build.debug_port=
-espduino.menu.Debug.Serial=Serial
-espduino.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espduino.menu.Debug.Serial1=Serial1
-espduino.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-espduino.menu.DebugLevel.None____=None
-espduino.menu.DebugLevel.None____.build.debug_level=
-espduino.menu.DebugLevel.SSL=SSL
-espduino.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-espduino.menu.DebugLevel.TLS_MEM=TLS_MEM
-espduino.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-espduino.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-espduino.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-espduino.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-espduino.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-espduino.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-espduino.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-espduino.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-espduino.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-espduino.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espduino.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-espduino.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-espduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-espduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espduino.menu.DebugLevel.CORE=CORE
-espduino.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-espduino.menu.DebugLevel.WIFI=WIFI
-espduino.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-espduino.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-espduino.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-espduino.menu.DebugLevel.UPDATER=UPDATER
-espduino.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-espduino.menu.DebugLevel.OTA=OTA
-espduino.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-espduino.menu.DebugLevel.OOM=OOM
-espduino.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-espduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espduino.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-espduino.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-espduino.menu.FlashErase.none=Only Sketch
-espduino.menu.FlashErase.none.upload.erase_cmd=
-espduino.menu.FlashErase.sdk=Sketch + WiFi Settings
-espduino.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-espduino.menu.FlashErase.all=All Flash Contents
-espduino.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-espduino.menu.UploadSpeed.115200=115200
-espduino.menu.UploadSpeed.115200.upload.speed=115200
-espduino.menu.UploadSpeed.9600=9600
-espduino.menu.UploadSpeed.9600.upload.speed=9600
-espduino.menu.UploadSpeed.57600=57600
-espduino.menu.UploadSpeed.57600.upload.speed=57600
-espduino.menu.UploadSpeed.230400.linux=230400
-espduino.menu.UploadSpeed.230400.macosx=230400
-espduino.menu.UploadSpeed.230400.upload.speed=230400
-espduino.menu.UploadSpeed.256000.windows=256000
-espduino.menu.UploadSpeed.256000.upload.speed=256000
-espduino.menu.UploadSpeed.460800.linux=460800
-espduino.menu.UploadSpeed.460800.macosx=460800
-espduino.menu.UploadSpeed.460800.upload.speed=460800
-espduino.menu.UploadSpeed.512000.windows=512000
-espduino.menu.UploadSpeed.512000.upload.speed=512000
-espduino.menu.UploadSpeed.921600=921600
-espduino.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-huzzah.name=Adafruit Feather HUZZAH ESP8266
-huzzah.build.board=ESP8266_ESP12
-huzzah.build.variant=adafruit
-huzzah.upload.tool=esptool
-huzzah.upload.maximum_data_size=81920
-huzzah.upload.wait_for_upload_port=true
-huzzah.upload.erase_cmd=
-huzzah.serial.disableDTR=true
-huzzah.serial.disableRTS=true
-huzzah.build.mcu=esp8266
-huzzah.build.core=esp8266
-huzzah.build.spiffs_pagesize=256
-huzzah.build.debug_port=
-huzzah.build.debug_level=
-huzzah.menu.CpuFrequency.80=80 MHz
-huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
-huzzah.menu.CpuFrequency.160=160 MHz
-huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
-huzzah.menu.VTable.flash=Flash
-huzzah.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-huzzah.menu.VTable.heap=Heap
-huzzah.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-huzzah.menu.VTable.iram=IRAM
-huzzah.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-huzzah.upload.resetmethod=nodemcu
-huzzah.build.flash_mode=qio
-huzzah.build.flash_freq=40
-huzzah.menu.FlashSize.4M1M=4M (1M SPIFFS)
-huzzah.menu.FlashSize.4M1M.build.flash_size=4M
-huzzah.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-huzzah.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-huzzah.menu.FlashSize.4M1M.upload.maximum_size=1044464
-huzzah.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-huzzah.menu.FlashSize.4M2M=4M (2M SPIFFS)
-huzzah.menu.FlashSize.4M2M.build.flash_size=4M
-huzzah.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-huzzah.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-huzzah.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-huzzah.menu.FlashSize.4M2M.upload.maximum_size=1044464
-huzzah.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-huzzah.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-huzzah.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-huzzah.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-huzzah.menu.FlashSize.4M3M=4M (3M SPIFFS)
-huzzah.menu.FlashSize.4M3M.build.flash_size=4M
-huzzah.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-huzzah.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-huzzah.menu.FlashSize.4M3M.upload.maximum_size=1044464
-huzzah.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-huzzah.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-huzzah.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-huzzah.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-huzzah.menu.LwIPVariant.v2mss536=v2 Lower Memory
-huzzah.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-huzzah.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-huzzah.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-huzzah.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-huzzah.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-huzzah.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-huzzah.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-huzzah.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-huzzah.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-huzzah.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-huzzah.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-huzzah.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-huzzah.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-huzzah.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-huzzah.menu.Debug.Disabled=Disabled
-huzzah.menu.Debug.Disabled.build.debug_port=
-huzzah.menu.Debug.Serial=Serial
-huzzah.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-huzzah.menu.Debug.Serial1=Serial1
-huzzah.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-huzzah.menu.DebugLevel.None____=None
-huzzah.menu.DebugLevel.None____.build.debug_level=
-huzzah.menu.DebugLevel.SSL=SSL
-huzzah.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-huzzah.menu.DebugLevel.TLS_MEM=TLS_MEM
-huzzah.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-huzzah.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-huzzah.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-huzzah.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-huzzah.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-huzzah.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-huzzah.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-huzzah.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-huzzah.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-huzzah.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-huzzah.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-huzzah.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-huzzah.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-huzzah.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-huzzah.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-huzzah.menu.DebugLevel.CORE=CORE
-huzzah.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-huzzah.menu.DebugLevel.WIFI=WIFI
-huzzah.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-huzzah.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-huzzah.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-huzzah.menu.DebugLevel.UPDATER=UPDATER
-huzzah.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-huzzah.menu.DebugLevel.OTA=OTA
-huzzah.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-huzzah.menu.DebugLevel.OOM=OOM
-huzzah.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-huzzah.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-huzzah.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-huzzah.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-huzzah.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-huzzah.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-huzzah.menu.FlashErase.none=Only Sketch
-huzzah.menu.FlashErase.none.upload.erase_cmd=
-huzzah.menu.FlashErase.sdk=Sketch + WiFi Settings
-huzzah.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-huzzah.menu.FlashErase.all=All Flash Contents
-huzzah.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-huzzah.menu.UploadSpeed.115200=115200
-huzzah.menu.UploadSpeed.115200.upload.speed=115200
-huzzah.menu.UploadSpeed.9600=9600
-huzzah.menu.UploadSpeed.9600.upload.speed=9600
-huzzah.menu.UploadSpeed.57600=57600
-huzzah.menu.UploadSpeed.57600.upload.speed=57600
-huzzah.menu.UploadSpeed.230400.linux=230400
-huzzah.menu.UploadSpeed.230400.macosx=230400
-huzzah.menu.UploadSpeed.230400.upload.speed=230400
-huzzah.menu.UploadSpeed.256000.windows=256000
-huzzah.menu.UploadSpeed.256000.upload.speed=256000
-huzzah.menu.UploadSpeed.460800.linux=460800
-huzzah.menu.UploadSpeed.460800.macosx=460800
-huzzah.menu.UploadSpeed.460800.upload.speed=460800
-huzzah.menu.UploadSpeed.512000.windows=512000
-huzzah.menu.UploadSpeed.512000.upload.speed=512000
-huzzah.menu.UploadSpeed.921600=921600
-huzzah.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-cw01.name=XinaBox CW01
-cw01.build.board=ESP8266_GENERIC
-cw01.build.variant=xinabox
-cw01.upload.tool=esptool
-cw01.upload.maximum_data_size=81920
-cw01.upload.wait_for_upload_port=true
-cw01.upload.erase_cmd=
-cw01.serial.disableDTR=true
-cw01.serial.disableRTS=true
-cw01.build.mcu=esp8266
-cw01.build.core=esp8266
-cw01.build.spiffs_pagesize=256
-cw01.build.debug_port=
-cw01.build.debug_level=
-cw01.menu.CpuFrequency.80=80 MHz
-cw01.menu.CpuFrequency.80.build.f_cpu=80000000L
-cw01.menu.CpuFrequency.160=160 MHz
-cw01.menu.CpuFrequency.160.build.f_cpu=160000000L
-cw01.menu.VTable.flash=Flash
-cw01.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-cw01.menu.VTable.heap=Heap
-cw01.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-cw01.menu.VTable.iram=IRAM
-cw01.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-cw01.upload.resetmethod=nodemcu
-cw01.menu.CrystalFreq.26=26 MHz
-cw01.menu.CrystalFreq.40=40 MHz
-cw01.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-cw01.build.flash_mode=qio
-cw01.build.flash_freq=40
-cw01.menu.FlashSize.4M1M=4M (1M SPIFFS)
-cw01.menu.FlashSize.4M1M.build.flash_size=4M
-cw01.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-cw01.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-cw01.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-cw01.menu.FlashSize.4M1M.upload.maximum_size=1044464
-cw01.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-cw01.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-cw01.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-cw01.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-cw01.menu.FlashSize.4M2M=4M (2M SPIFFS)
-cw01.menu.FlashSize.4M2M.build.flash_size=4M
-cw01.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-cw01.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-cw01.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-cw01.menu.FlashSize.4M2M.upload.maximum_size=1044464
-cw01.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-cw01.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-cw01.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-cw01.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-cw01.menu.FlashSize.4M3M=4M (3M SPIFFS)
-cw01.menu.FlashSize.4M3M.build.flash_size=4M
-cw01.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-cw01.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-cw01.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-cw01.menu.FlashSize.4M3M.upload.maximum_size=1044464
-cw01.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-cw01.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-cw01.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-cw01.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-cw01.menu.LwIPVariant.v2mss536=v2 Lower Memory
-cw01.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-cw01.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-cw01.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-cw01.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-cw01.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-cw01.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-cw01.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-cw01.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-cw01.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-cw01.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-cw01.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-cw01.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-cw01.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-cw01.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-cw01.menu.Debug.Disabled=Disabled
-cw01.menu.Debug.Disabled.build.debug_port=
-cw01.menu.Debug.Serial=Serial
-cw01.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-cw01.menu.Debug.Serial1=Serial1
-cw01.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-cw01.menu.DebugLevel.None____=None
-cw01.menu.DebugLevel.None____.build.debug_level=
-cw01.menu.DebugLevel.SSL=SSL
-cw01.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-cw01.menu.DebugLevel.TLS_MEM=TLS_MEM
-cw01.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-cw01.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-cw01.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-cw01.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-cw01.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-cw01.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-cw01.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-cw01.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-cw01.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-cw01.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-cw01.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-cw01.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-cw01.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-cw01.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-cw01.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-cw01.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-cw01.menu.DebugLevel.CORE=CORE
-cw01.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-cw01.menu.DebugLevel.WIFI=WIFI
-cw01.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-cw01.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-cw01.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-cw01.menu.DebugLevel.UPDATER=UPDATER
-cw01.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-cw01.menu.DebugLevel.OTA=OTA
-cw01.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-cw01.menu.DebugLevel.OOM=OOM
-cw01.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-cw01.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-cw01.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-cw01.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-cw01.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-cw01.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-cw01.menu.FlashErase.none=Only Sketch
-cw01.menu.FlashErase.none.upload.erase_cmd=
-cw01.menu.FlashErase.sdk=Sketch + WiFi Settings
-cw01.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-cw01.menu.FlashErase.all=All Flash Contents
-cw01.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-cw01.menu.UploadSpeed.115200=115200
-cw01.menu.UploadSpeed.115200.upload.speed=115200
-cw01.menu.UploadSpeed.9600=9600
-cw01.menu.UploadSpeed.9600.upload.speed=9600
-cw01.menu.UploadSpeed.57600=57600
-cw01.menu.UploadSpeed.57600.upload.speed=57600
-cw01.menu.UploadSpeed.230400.linux=230400
-cw01.menu.UploadSpeed.230400.macosx=230400
-cw01.menu.UploadSpeed.230400.upload.speed=230400
-cw01.menu.UploadSpeed.256000.windows=256000
-cw01.menu.UploadSpeed.256000.upload.speed=256000
-cw01.menu.UploadSpeed.460800.linux=460800
-cw01.menu.UploadSpeed.460800.macosx=460800
-cw01.menu.UploadSpeed.460800.upload.speed=460800
-cw01.menu.UploadSpeed.512000.windows=512000
-cw01.menu.UploadSpeed.512000.upload.speed=512000
-cw01.menu.UploadSpeed.921600=921600
-cw01.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-espresso_lite_v1.name=ESPresso Lite 1.0
-espresso_lite_v1.build.board=ESP8266_ESPRESSO_LITE_V1
-espresso_lite_v1.build.variant=espresso_lite_v1
-espresso_lite_v1.upload.tool=esptool
-espresso_lite_v1.upload.maximum_data_size=81920
-espresso_lite_v1.upload.wait_for_upload_port=true
-espresso_lite_v1.upload.erase_cmd=
-espresso_lite_v1.serial.disableDTR=true
-espresso_lite_v1.serial.disableRTS=true
-espresso_lite_v1.build.mcu=esp8266
-espresso_lite_v1.build.core=esp8266
-espresso_lite_v1.build.spiffs_pagesize=256
-espresso_lite_v1.build.debug_port=
-espresso_lite_v1.build.debug_level=
-espresso_lite_v1.menu.CpuFrequency.80=80 MHz
-espresso_lite_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
-espresso_lite_v1.menu.CpuFrequency.160=160 MHz
-espresso_lite_v1.menu.CpuFrequency.160.build.f_cpu=160000000L
-espresso_lite_v1.menu.VTable.flash=Flash
-espresso_lite_v1.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-espresso_lite_v1.menu.VTable.heap=Heap
-espresso_lite_v1.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-espresso_lite_v1.menu.VTable.iram=IRAM
-espresso_lite_v1.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-espresso_lite_v1.build.flash_mode=dio
-espresso_lite_v1.build.flash_freq=40
-espresso_lite_v1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espresso_lite_v1.menu.FlashSize.4M1M.build.flash_size=4M
-espresso_lite_v1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-espresso_lite_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espresso_lite_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464
-espresso_lite_v1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espresso_lite_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espresso_lite_v1.menu.FlashSize.4M2M=4M (2M SPIFFS)
-espresso_lite_v1.menu.FlashSize.4M2M.build.flash_size=4M
-espresso_lite_v1.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-espresso_lite_v1.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-espresso_lite_v1.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-espresso_lite_v1.menu.FlashSize.4M2M.upload.maximum_size=1044464
-espresso_lite_v1.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-espresso_lite_v1.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-espresso_lite_v1.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-espresso_lite_v1.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-espresso_lite_v1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espresso_lite_v1.menu.FlashSize.4M3M.build.flash_size=4M
-espresso_lite_v1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-espresso_lite_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-espresso_lite_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464
-espresso_lite_v1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espresso_lite_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espresso_lite_v1.menu.ResetMethod.ck=ck
-espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-espresso_lite_v1.menu.LwIPVariant.v2mss536=v2 Lower Memory
-espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-espresso_lite_v1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-espresso_lite_v1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-espresso_lite_v1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-espresso_lite_v1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-espresso_lite_v1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-espresso_lite_v1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-espresso_lite_v1.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-espresso_lite_v1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-espresso_lite_v1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-espresso_lite_v1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-espresso_lite_v1.menu.Debug.Disabled=Disabled
-espresso_lite_v1.menu.Debug.Disabled.build.debug_port=
-espresso_lite_v1.menu.Debug.Serial=Serial
-espresso_lite_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espresso_lite_v1.menu.Debug.Serial1=Serial1
-espresso_lite_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-espresso_lite_v1.menu.DebugLevel.None____=None
-espresso_lite_v1.menu.DebugLevel.None____.build.debug_level=
-espresso_lite_v1.menu.DebugLevel.SSL=SSL
-espresso_lite_v1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-espresso_lite_v1.menu.DebugLevel.TLS_MEM=TLS_MEM
-espresso_lite_v1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-espresso_lite_v1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v1.menu.DebugLevel.CORE=CORE
-espresso_lite_v1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-espresso_lite_v1.menu.DebugLevel.WIFI=WIFI
-espresso_lite_v1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-espresso_lite_v1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-espresso_lite_v1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v1.menu.DebugLevel.UPDATER=UPDATER
-espresso_lite_v1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-espresso_lite_v1.menu.DebugLevel.OTA=OTA
-espresso_lite_v1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-espresso_lite_v1.menu.DebugLevel.OOM=OOM
-espresso_lite_v1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-espresso_lite_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espresso_lite_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espresso_lite_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espresso_lite_v1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-espresso_lite_v1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-espresso_lite_v1.menu.FlashErase.none=Only Sketch
-espresso_lite_v1.menu.FlashErase.none.upload.erase_cmd=
-espresso_lite_v1.menu.FlashErase.sdk=Sketch + WiFi Settings
-espresso_lite_v1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-espresso_lite_v1.menu.FlashErase.all=All Flash Contents
-espresso_lite_v1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-espresso_lite_v1.menu.UploadSpeed.115200=115200
-espresso_lite_v1.menu.UploadSpeed.115200.upload.speed=115200
-espresso_lite_v1.menu.UploadSpeed.9600=9600
-espresso_lite_v1.menu.UploadSpeed.9600.upload.speed=9600
-espresso_lite_v1.menu.UploadSpeed.57600=57600
-espresso_lite_v1.menu.UploadSpeed.57600.upload.speed=57600
-espresso_lite_v1.menu.UploadSpeed.230400.linux=230400
-espresso_lite_v1.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v1.menu.UploadSpeed.230400.upload.speed=230400
-espresso_lite_v1.menu.UploadSpeed.256000.windows=256000
-espresso_lite_v1.menu.UploadSpeed.256000.upload.speed=256000
-espresso_lite_v1.menu.UploadSpeed.460800.linux=460800
-espresso_lite_v1.menu.UploadSpeed.460800.macosx=460800
-espresso_lite_v1.menu.UploadSpeed.460800.upload.speed=460800
-espresso_lite_v1.menu.UploadSpeed.512000.windows=512000
-espresso_lite_v1.menu.UploadSpeed.512000.upload.speed=512000
-espresso_lite_v1.menu.UploadSpeed.921600=921600
-espresso_lite_v1.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-espresso_lite_v2.name=ESPresso Lite 2.0
-espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2
-espresso_lite_v2.build.variant=espresso_lite_v2
-espresso_lite_v2.upload.tool=esptool
-espresso_lite_v2.upload.maximum_data_size=81920
-espresso_lite_v2.upload.wait_for_upload_port=true
-espresso_lite_v2.upload.erase_cmd=
-espresso_lite_v2.serial.disableDTR=true
-espresso_lite_v2.serial.disableRTS=true
-espresso_lite_v2.build.mcu=esp8266
-espresso_lite_v2.build.core=esp8266
-espresso_lite_v2.build.spiffs_pagesize=256
-espresso_lite_v2.build.debug_port=
-espresso_lite_v2.build.debug_level=
-espresso_lite_v2.menu.CpuFrequency.80=80 MHz
-espresso_lite_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
-espresso_lite_v2.menu.CpuFrequency.160=160 MHz
-espresso_lite_v2.menu.CpuFrequency.160.build.f_cpu=160000000L
-espresso_lite_v2.menu.VTable.flash=Flash
-espresso_lite_v2.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-espresso_lite_v2.menu.VTable.heap=Heap
-espresso_lite_v2.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-espresso_lite_v2.menu.VTable.iram=IRAM
-espresso_lite_v2.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-espresso_lite_v2.build.flash_mode=dio
-espresso_lite_v2.build.flash_freq=40
-espresso_lite_v2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espresso_lite_v2.menu.FlashSize.4M1M.build.flash_size=4M
-espresso_lite_v2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-espresso_lite_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espresso_lite_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464
-espresso_lite_v2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espresso_lite_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espresso_lite_v2.menu.FlashSize.4M2M=4M (2M SPIFFS)
-espresso_lite_v2.menu.FlashSize.4M2M.build.flash_size=4M
-espresso_lite_v2.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-espresso_lite_v2.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-espresso_lite_v2.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-espresso_lite_v2.menu.FlashSize.4M2M.upload.maximum_size=1044464
-espresso_lite_v2.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-espresso_lite_v2.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-espresso_lite_v2.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-espresso_lite_v2.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-espresso_lite_v2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espresso_lite_v2.menu.FlashSize.4M3M.build.flash_size=4M
-espresso_lite_v2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-espresso_lite_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-espresso_lite_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464
-espresso_lite_v2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espresso_lite_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espresso_lite_v2.menu.ResetMethod.ck=ck
-espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-espresso_lite_v2.menu.LwIPVariant.v2mss536=v2 Lower Memory
-espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-espresso_lite_v2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-espresso_lite_v2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-espresso_lite_v2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-espresso_lite_v2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-espresso_lite_v2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-espresso_lite_v2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-espresso_lite_v2.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-espresso_lite_v2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-espresso_lite_v2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-espresso_lite_v2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-espresso_lite_v2.menu.Debug.Disabled=Disabled
-espresso_lite_v2.menu.Debug.Disabled.build.debug_port=
-espresso_lite_v2.menu.Debug.Serial=Serial
-espresso_lite_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espresso_lite_v2.menu.Debug.Serial1=Serial1
-espresso_lite_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-espresso_lite_v2.menu.DebugLevel.None____=None
-espresso_lite_v2.menu.DebugLevel.None____.build.debug_level=
-espresso_lite_v2.menu.DebugLevel.SSL=SSL
-espresso_lite_v2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-espresso_lite_v2.menu.DebugLevel.TLS_MEM=TLS_MEM
-espresso_lite_v2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-espresso_lite_v2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espresso_lite_v2.menu.DebugLevel.CORE=CORE
-espresso_lite_v2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-espresso_lite_v2.menu.DebugLevel.WIFI=WIFI
-espresso_lite_v2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-espresso_lite_v2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-espresso_lite_v2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-espresso_lite_v2.menu.DebugLevel.UPDATER=UPDATER
-espresso_lite_v2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-espresso_lite_v2.menu.DebugLevel.OTA=OTA
-espresso_lite_v2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-espresso_lite_v2.menu.DebugLevel.OOM=OOM
-espresso_lite_v2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-espresso_lite_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espresso_lite_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espresso_lite_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espresso_lite_v2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-espresso_lite_v2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-espresso_lite_v2.menu.FlashErase.none=Only Sketch
-espresso_lite_v2.menu.FlashErase.none.upload.erase_cmd=
-espresso_lite_v2.menu.FlashErase.sdk=Sketch + WiFi Settings
-espresso_lite_v2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-espresso_lite_v2.menu.FlashErase.all=All Flash Contents
-espresso_lite_v2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-espresso_lite_v2.menu.UploadSpeed.115200=115200
-espresso_lite_v2.menu.UploadSpeed.115200.upload.speed=115200
-espresso_lite_v2.menu.UploadSpeed.9600=9600
-espresso_lite_v2.menu.UploadSpeed.9600.upload.speed=9600
-espresso_lite_v2.menu.UploadSpeed.57600=57600
-espresso_lite_v2.menu.UploadSpeed.57600.upload.speed=57600
-espresso_lite_v2.menu.UploadSpeed.230400.linux=230400
-espresso_lite_v2.menu.UploadSpeed.230400.macosx=230400
-espresso_lite_v2.menu.UploadSpeed.230400.upload.speed=230400
-espresso_lite_v2.menu.UploadSpeed.256000.windows=256000
-espresso_lite_v2.menu.UploadSpeed.256000.upload.speed=256000
-espresso_lite_v2.menu.UploadSpeed.460800.linux=460800
-espresso_lite_v2.menu.UploadSpeed.460800.macosx=460800
-espresso_lite_v2.menu.UploadSpeed.460800.upload.speed=460800
-espresso_lite_v2.menu.UploadSpeed.512000.windows=512000
-espresso_lite_v2.menu.UploadSpeed.512000.upload.speed=512000
-espresso_lite_v2.menu.UploadSpeed.921600=921600
-espresso_lite_v2.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-phoenix_v1.name=Phoenix 1.0
-phoenix_v1.build.board=ESP8266_PHOENIX_V1
-phoenix_v1.build.variant=phoenix_v1
-phoenix_v1.upload.tool=esptool
-phoenix_v1.upload.maximum_data_size=81920
-phoenix_v1.upload.wait_for_upload_port=true
-phoenix_v1.upload.erase_cmd=
-phoenix_v1.serial.disableDTR=true
-phoenix_v1.serial.disableRTS=true
-phoenix_v1.build.mcu=esp8266
-phoenix_v1.build.core=esp8266
-phoenix_v1.build.spiffs_pagesize=256
-phoenix_v1.build.debug_port=
-phoenix_v1.build.debug_level=
-phoenix_v1.menu.CpuFrequency.80=80 MHz
-phoenix_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
-phoenix_v1.menu.CpuFrequency.160=160 MHz
-phoenix_v1.menu.CpuFrequency.160.build.f_cpu=160000000L
-phoenix_v1.menu.VTable.flash=Flash
-phoenix_v1.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-phoenix_v1.menu.VTable.heap=Heap
-phoenix_v1.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-phoenix_v1.menu.VTable.iram=IRAM
-phoenix_v1.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-phoenix_v1.build.flash_mode=dio
-phoenix_v1.build.flash_freq=40
-phoenix_v1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-phoenix_v1.menu.FlashSize.4M1M.build.flash_size=4M
-phoenix_v1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-phoenix_v1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-phoenix_v1.menu.FlashSize.4M1M.upload.maximum_size=1044464
-phoenix_v1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-phoenix_v1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-phoenix_v1.menu.FlashSize.4M2M=4M (2M SPIFFS)
-phoenix_v1.menu.FlashSize.4M2M.build.flash_size=4M
-phoenix_v1.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-phoenix_v1.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-phoenix_v1.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-phoenix_v1.menu.FlashSize.4M2M.upload.maximum_size=1044464
-phoenix_v1.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-phoenix_v1.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-phoenix_v1.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-phoenix_v1.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-phoenix_v1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-phoenix_v1.menu.FlashSize.4M3M.build.flash_size=4M
-phoenix_v1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-phoenix_v1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-phoenix_v1.menu.FlashSize.4M3M.upload.maximum_size=1044464
-phoenix_v1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-phoenix_v1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-phoenix_v1.menu.ResetMethod.ck=ck
-phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-phoenix_v1.menu.LwIPVariant.v2mss536=v2 Lower Memory
-phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-phoenix_v1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-phoenix_v1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-phoenix_v1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-phoenix_v1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-phoenix_v1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-phoenix_v1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-phoenix_v1.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-phoenix_v1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-phoenix_v1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-phoenix_v1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-phoenix_v1.menu.Debug.Disabled=Disabled
-phoenix_v1.menu.Debug.Disabled.build.debug_port=
-phoenix_v1.menu.Debug.Serial=Serial
-phoenix_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-phoenix_v1.menu.Debug.Serial1=Serial1
-phoenix_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-phoenix_v1.menu.DebugLevel.None____=None
-phoenix_v1.menu.DebugLevel.None____.build.debug_level=
-phoenix_v1.menu.DebugLevel.SSL=SSL
-phoenix_v1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-phoenix_v1.menu.DebugLevel.TLS_MEM=TLS_MEM
-phoenix_v1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-phoenix_v1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-phoenix_v1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-phoenix_v1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v1.menu.DebugLevel.CORE=CORE
-phoenix_v1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-phoenix_v1.menu.DebugLevel.WIFI=WIFI
-phoenix_v1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-phoenix_v1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-phoenix_v1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-phoenix_v1.menu.DebugLevel.UPDATER=UPDATER
-phoenix_v1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-phoenix_v1.menu.DebugLevel.OTA=OTA
-phoenix_v1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-phoenix_v1.menu.DebugLevel.OOM=OOM
-phoenix_v1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-phoenix_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-phoenix_v1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-phoenix_v1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-phoenix_v1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-phoenix_v1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-phoenix_v1.menu.FlashErase.none=Only Sketch
-phoenix_v1.menu.FlashErase.none.upload.erase_cmd=
-phoenix_v1.menu.FlashErase.sdk=Sketch + WiFi Settings
-phoenix_v1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-phoenix_v1.menu.FlashErase.all=All Flash Contents
-phoenix_v1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-phoenix_v1.menu.UploadSpeed.115200=115200
-phoenix_v1.menu.UploadSpeed.115200.upload.speed=115200
-phoenix_v1.menu.UploadSpeed.9600=9600
-phoenix_v1.menu.UploadSpeed.9600.upload.speed=9600
-phoenix_v1.menu.UploadSpeed.57600=57600
-phoenix_v1.menu.UploadSpeed.57600.upload.speed=57600
-phoenix_v1.menu.UploadSpeed.230400.linux=230400
-phoenix_v1.menu.UploadSpeed.230400.macosx=230400
-phoenix_v1.menu.UploadSpeed.230400.upload.speed=230400
-phoenix_v1.menu.UploadSpeed.256000.windows=256000
-phoenix_v1.menu.UploadSpeed.256000.upload.speed=256000
-phoenix_v1.menu.UploadSpeed.460800.linux=460800
-phoenix_v1.menu.UploadSpeed.460800.macosx=460800
-phoenix_v1.menu.UploadSpeed.460800.upload.speed=460800
-phoenix_v1.menu.UploadSpeed.512000.windows=512000
-phoenix_v1.menu.UploadSpeed.512000.upload.speed=512000
-phoenix_v1.menu.UploadSpeed.921600=921600
-phoenix_v1.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-phoenix_v2.name=Phoenix 2.0
-phoenix_v2.build.board=ESP8266_PHOENIX_V2
-phoenix_v2.build.variant=phoenix_v2
-phoenix_v2.upload.tool=esptool
-phoenix_v2.upload.maximum_data_size=81920
-phoenix_v2.upload.wait_for_upload_port=true
-phoenix_v2.upload.erase_cmd=
-phoenix_v2.serial.disableDTR=true
-phoenix_v2.serial.disableRTS=true
-phoenix_v2.build.mcu=esp8266
-phoenix_v2.build.core=esp8266
-phoenix_v2.build.spiffs_pagesize=256
-phoenix_v2.build.debug_port=
-phoenix_v2.build.debug_level=
-phoenix_v2.menu.CpuFrequency.80=80 MHz
-phoenix_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
-phoenix_v2.menu.CpuFrequency.160=160 MHz
-phoenix_v2.menu.CpuFrequency.160.build.f_cpu=160000000L
-phoenix_v2.menu.VTable.flash=Flash
-phoenix_v2.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-phoenix_v2.menu.VTable.heap=Heap
-phoenix_v2.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-phoenix_v2.menu.VTable.iram=IRAM
-phoenix_v2.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-phoenix_v2.build.flash_mode=dio
-phoenix_v2.build.flash_freq=40
-phoenix_v2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-phoenix_v2.menu.FlashSize.4M1M.build.flash_size=4M
-phoenix_v2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-phoenix_v2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-phoenix_v2.menu.FlashSize.4M1M.upload.maximum_size=1044464
-phoenix_v2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-phoenix_v2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-phoenix_v2.menu.FlashSize.4M2M=4M (2M SPIFFS)
-phoenix_v2.menu.FlashSize.4M2M.build.flash_size=4M
-phoenix_v2.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-phoenix_v2.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-phoenix_v2.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-phoenix_v2.menu.FlashSize.4M2M.upload.maximum_size=1044464
-phoenix_v2.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-phoenix_v2.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-phoenix_v2.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-phoenix_v2.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-phoenix_v2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-phoenix_v2.menu.FlashSize.4M3M.build.flash_size=4M
-phoenix_v2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-phoenix_v2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-phoenix_v2.menu.FlashSize.4M3M.upload.maximum_size=1044464
-phoenix_v2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-phoenix_v2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-phoenix_v2.menu.ResetMethod.ck=ck
-phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-phoenix_v2.menu.LwIPVariant.v2mss536=v2 Lower Memory
-phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-phoenix_v2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-phoenix_v2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-phoenix_v2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-phoenix_v2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-phoenix_v2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-phoenix_v2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-phoenix_v2.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-phoenix_v2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-phoenix_v2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-phoenix_v2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-phoenix_v2.menu.Debug.Disabled=Disabled
-phoenix_v2.menu.Debug.Disabled.build.debug_port=
-phoenix_v2.menu.Debug.Serial=Serial
-phoenix_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-phoenix_v2.menu.Debug.Serial1=Serial1
-phoenix_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-phoenix_v2.menu.DebugLevel.None____=None
-phoenix_v2.menu.DebugLevel.None____.build.debug_level=
-phoenix_v2.menu.DebugLevel.SSL=SSL
-phoenix_v2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-phoenix_v2.menu.DebugLevel.TLS_MEM=TLS_MEM
-phoenix_v2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-phoenix_v2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-phoenix_v2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-phoenix_v2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-phoenix_v2.menu.DebugLevel.CORE=CORE
-phoenix_v2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-phoenix_v2.menu.DebugLevel.WIFI=WIFI
-phoenix_v2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-phoenix_v2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-phoenix_v2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-phoenix_v2.menu.DebugLevel.UPDATER=UPDATER
-phoenix_v2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-phoenix_v2.menu.DebugLevel.OTA=OTA
-phoenix_v2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-phoenix_v2.menu.DebugLevel.OOM=OOM
-phoenix_v2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-phoenix_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-phoenix_v2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-phoenix_v2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-phoenix_v2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-phoenix_v2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-phoenix_v2.menu.FlashErase.none=Only Sketch
-phoenix_v2.menu.FlashErase.none.upload.erase_cmd=
-phoenix_v2.menu.FlashErase.sdk=Sketch + WiFi Settings
-phoenix_v2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-phoenix_v2.menu.FlashErase.all=All Flash Contents
-phoenix_v2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-phoenix_v2.menu.UploadSpeed.115200=115200
-phoenix_v2.menu.UploadSpeed.115200.upload.speed=115200
-phoenix_v2.menu.UploadSpeed.9600=9600
-phoenix_v2.menu.UploadSpeed.9600.upload.speed=9600
-phoenix_v2.menu.UploadSpeed.57600=57600
-phoenix_v2.menu.UploadSpeed.57600.upload.speed=57600
-phoenix_v2.menu.UploadSpeed.230400.linux=230400
-phoenix_v2.menu.UploadSpeed.230400.macosx=230400
-phoenix_v2.menu.UploadSpeed.230400.upload.speed=230400
-phoenix_v2.menu.UploadSpeed.256000.windows=256000
-phoenix_v2.menu.UploadSpeed.256000.upload.speed=256000
-phoenix_v2.menu.UploadSpeed.460800.linux=460800
-phoenix_v2.menu.UploadSpeed.460800.macosx=460800
-phoenix_v2.menu.UploadSpeed.460800.upload.speed=460800
-phoenix_v2.menu.UploadSpeed.512000.windows=512000
-phoenix_v2.menu.UploadSpeed.512000.upload.speed=512000
-phoenix_v2.menu.UploadSpeed.921600=921600
-phoenix_v2.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
-nodemcu.build.board=ESP8266_NODEMCU
-nodemcu.build.variant=nodemcu
-nodemcu.upload.tool=esptool
-nodemcu.upload.maximum_data_size=81920
-nodemcu.upload.wait_for_upload_port=true
-nodemcu.upload.erase_cmd=
-nodemcu.serial.disableDTR=true
-nodemcu.serial.disableRTS=true
-nodemcu.build.mcu=esp8266
-nodemcu.build.core=esp8266
-nodemcu.build.spiffs_pagesize=256
-nodemcu.build.debug_port=
-nodemcu.build.debug_level=
-nodemcu.menu.CpuFrequency.80=80 MHz
-nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
-nodemcu.menu.CpuFrequency.160=160 MHz
-nodemcu.menu.CpuFrequency.160.build.f_cpu=160000000L
-nodemcu.menu.VTable.flash=Flash
-nodemcu.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-nodemcu.menu.VTable.heap=Heap
-nodemcu.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-nodemcu.menu.VTable.iram=IRAM
-nodemcu.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-nodemcu.upload.resetmethod=nodemcu
-nodemcu.build.flash_mode=qio
-nodemcu.build.flash_freq=40
-nodemcu.menu.FlashSize.4M1M=4M (1M SPIFFS)
-nodemcu.menu.FlashSize.4M1M.build.flash_size=4M
-nodemcu.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-nodemcu.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-nodemcu.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-nodemcu.menu.FlashSize.4M1M.upload.maximum_size=1044464
-nodemcu.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-nodemcu.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-nodemcu.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-nodemcu.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-nodemcu.menu.FlashSize.4M2M=4M (2M SPIFFS)
-nodemcu.menu.FlashSize.4M2M.build.flash_size=4M
-nodemcu.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-nodemcu.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-nodemcu.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-nodemcu.menu.FlashSize.4M2M.upload.maximum_size=1044464
-nodemcu.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-nodemcu.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-nodemcu.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-nodemcu.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-nodemcu.menu.FlashSize.4M3M=4M (3M SPIFFS)
-nodemcu.menu.FlashSize.4M3M.build.flash_size=4M
-nodemcu.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-nodemcu.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-nodemcu.menu.FlashSize.4M3M.upload.maximum_size=1044464
-nodemcu.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-nodemcu.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-nodemcu.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-nodemcu.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-nodemcu.menu.LwIPVariant.v2mss536=v2 Lower Memory
-nodemcu.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-nodemcu.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-nodemcu.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-nodemcu.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-nodemcu.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-nodemcu.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-nodemcu.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-nodemcu.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-nodemcu.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-nodemcu.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-nodemcu.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-nodemcu.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-nodemcu.menu.Debug.Disabled=Disabled
-nodemcu.menu.Debug.Disabled.build.debug_port=
-nodemcu.menu.Debug.Serial=Serial
-nodemcu.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-nodemcu.menu.Debug.Serial1=Serial1
-nodemcu.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-nodemcu.menu.DebugLevel.None____=None
-nodemcu.menu.DebugLevel.None____.build.debug_level=
-nodemcu.menu.DebugLevel.SSL=SSL
-nodemcu.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-nodemcu.menu.DebugLevel.TLS_MEM=TLS_MEM
-nodemcu.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-nodemcu.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-nodemcu.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-nodemcu.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-nodemcu.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-nodemcu.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-nodemcu.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-nodemcu.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-nodemcu.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-nodemcu.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-nodemcu.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcu.menu.DebugLevel.CORE=CORE
-nodemcu.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-nodemcu.menu.DebugLevel.WIFI=WIFI
-nodemcu.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-nodemcu.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-nodemcu.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-nodemcu.menu.DebugLevel.UPDATER=UPDATER
-nodemcu.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-nodemcu.menu.DebugLevel.OTA=OTA
-nodemcu.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-nodemcu.menu.DebugLevel.OOM=OOM
-nodemcu.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-nodemcu.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-nodemcu.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-nodemcu.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-nodemcu.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-nodemcu.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-nodemcu.menu.FlashErase.none=Only Sketch
-nodemcu.menu.FlashErase.none.upload.erase_cmd=
-nodemcu.menu.FlashErase.sdk=Sketch + WiFi Settings
-nodemcu.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-nodemcu.menu.FlashErase.all=All Flash Contents
-nodemcu.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-nodemcu.menu.UploadSpeed.115200=115200
-nodemcu.menu.UploadSpeed.115200.upload.speed=115200
-nodemcu.menu.UploadSpeed.9600=9600
-nodemcu.menu.UploadSpeed.9600.upload.speed=9600
-nodemcu.menu.UploadSpeed.57600=57600
-nodemcu.menu.UploadSpeed.57600.upload.speed=57600
-nodemcu.menu.UploadSpeed.230400.linux=230400
-nodemcu.menu.UploadSpeed.230400.macosx=230400
-nodemcu.menu.UploadSpeed.230400.upload.speed=230400
-nodemcu.menu.UploadSpeed.256000.windows=256000
-nodemcu.menu.UploadSpeed.256000.upload.speed=256000
-nodemcu.menu.UploadSpeed.460800.linux=460800
-nodemcu.menu.UploadSpeed.460800.macosx=460800
-nodemcu.menu.UploadSpeed.460800.upload.speed=460800
-nodemcu.menu.UploadSpeed.512000.windows=512000
-nodemcu.menu.UploadSpeed.512000.upload.speed=512000
-nodemcu.menu.UploadSpeed.921600=921600
-nodemcu.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
-nodemcuv2.build.board=ESP8266_NODEMCU
-nodemcuv2.build.variant=nodemcu
-nodemcuv2.upload.tool=esptool
-nodemcuv2.upload.maximum_data_size=81920
-nodemcuv2.upload.wait_for_upload_port=true
-nodemcuv2.upload.erase_cmd=
-nodemcuv2.serial.disableDTR=true
-nodemcuv2.serial.disableRTS=true
-nodemcuv2.build.mcu=esp8266
-nodemcuv2.build.core=esp8266
-nodemcuv2.build.spiffs_pagesize=256
-nodemcuv2.build.debug_port=
-nodemcuv2.build.debug_level=
-nodemcuv2.menu.CpuFrequency.80=80 MHz
-nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
-nodemcuv2.menu.CpuFrequency.160=160 MHz
-nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
-nodemcuv2.menu.VTable.flash=Flash
-nodemcuv2.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-nodemcuv2.menu.VTable.heap=Heap
-nodemcuv2.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-nodemcuv2.menu.VTable.iram=IRAM
-nodemcuv2.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-nodemcuv2.upload.resetmethod=nodemcu
-nodemcuv2.build.flash_mode=dio
-nodemcuv2.build.flash_freq=40
-nodemcuv2.menu.FlashSize.4M1M=4M (1M SPIFFS)
-nodemcuv2.menu.FlashSize.4M1M.build.flash_size=4M
-nodemcuv2.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-nodemcuv2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-nodemcuv2.menu.FlashSize.4M1M.upload.maximum_size=1044464
-nodemcuv2.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-nodemcuv2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-nodemcuv2.menu.FlashSize.4M2M=4M (2M SPIFFS)
-nodemcuv2.menu.FlashSize.4M2M.build.flash_size=4M
-nodemcuv2.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-nodemcuv2.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-nodemcuv2.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-nodemcuv2.menu.FlashSize.4M2M.upload.maximum_size=1044464
-nodemcuv2.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-nodemcuv2.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-nodemcuv2.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-nodemcuv2.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-nodemcuv2.menu.FlashSize.4M3M=4M (3M SPIFFS)
-nodemcuv2.menu.FlashSize.4M3M.build.flash_size=4M
-nodemcuv2.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-nodemcuv2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-nodemcuv2.menu.FlashSize.4M3M.upload.maximum_size=1044464
-nodemcuv2.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-nodemcuv2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-nodemcuv2.menu.LwIPVariant.v2mss536=v2 Lower Memory
-nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-nodemcuv2.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-nodemcuv2.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-nodemcuv2.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-nodemcuv2.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-nodemcuv2.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-nodemcuv2.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-nodemcuv2.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-nodemcuv2.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-nodemcuv2.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-nodemcuv2.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-nodemcuv2.menu.Debug.Disabled=Disabled
-nodemcuv2.menu.Debug.Disabled.build.debug_port=
-nodemcuv2.menu.Debug.Serial=Serial
-nodemcuv2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-nodemcuv2.menu.Debug.Serial1=Serial1
-nodemcuv2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-nodemcuv2.menu.DebugLevel.None____=None
-nodemcuv2.menu.DebugLevel.None____.build.debug_level=
-nodemcuv2.menu.DebugLevel.SSL=SSL
-nodemcuv2.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-nodemcuv2.menu.DebugLevel.TLS_MEM=TLS_MEM
-nodemcuv2.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-nodemcuv2.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-nodemcuv2.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-nodemcuv2.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-nodemcuv2.menu.DebugLevel.CORE=CORE
-nodemcuv2.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-nodemcuv2.menu.DebugLevel.WIFI=WIFI
-nodemcuv2.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-nodemcuv2.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-nodemcuv2.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-nodemcuv2.menu.DebugLevel.UPDATER=UPDATER
-nodemcuv2.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-nodemcuv2.menu.DebugLevel.OTA=OTA
-nodemcuv2.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-nodemcuv2.menu.DebugLevel.OOM=OOM
-nodemcuv2.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-nodemcuv2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-nodemcuv2.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-nodemcuv2.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-nodemcuv2.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-nodemcuv2.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-nodemcuv2.menu.FlashErase.none=Only Sketch
-nodemcuv2.menu.FlashErase.none.upload.erase_cmd=
-nodemcuv2.menu.FlashErase.sdk=Sketch + WiFi Settings
-nodemcuv2.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-nodemcuv2.menu.FlashErase.all=All Flash Contents
-nodemcuv2.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-nodemcuv2.menu.UploadSpeed.115200=115200
-nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
-nodemcuv2.menu.UploadSpeed.9600=9600
-nodemcuv2.menu.UploadSpeed.9600.upload.speed=9600
-nodemcuv2.menu.UploadSpeed.57600=57600
-nodemcuv2.menu.UploadSpeed.57600.upload.speed=57600
-nodemcuv2.menu.UploadSpeed.230400.linux=230400
-nodemcuv2.menu.UploadSpeed.230400.macosx=230400
-nodemcuv2.menu.UploadSpeed.230400.upload.speed=230400
-nodemcuv2.menu.UploadSpeed.256000.windows=256000
-nodemcuv2.menu.UploadSpeed.256000.upload.speed=256000
-nodemcuv2.menu.UploadSpeed.460800.linux=460800
-nodemcuv2.menu.UploadSpeed.460800.macosx=460800
-nodemcuv2.menu.UploadSpeed.460800.upload.speed=460800
-nodemcuv2.menu.UploadSpeed.512000.windows=512000
-nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
-nodemcuv2.menu.UploadSpeed.921600=921600
-nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
-modwifi.build.board=MOD_WIFI_ESP8266
-modwifi.build.variant=modwifi
-modwifi.upload.tool=esptool
-modwifi.upload.maximum_data_size=81920
-modwifi.upload.wait_for_upload_port=true
-modwifi.upload.erase_cmd=
-modwifi.serial.disableDTR=true
-modwifi.serial.disableRTS=true
-modwifi.build.mcu=esp8266
-modwifi.build.core=esp8266
-modwifi.build.spiffs_pagesize=256
-modwifi.build.debug_port=
-modwifi.build.debug_level=
-modwifi.menu.CpuFrequency.80=80 MHz
-modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
-modwifi.menu.CpuFrequency.160=160 MHz
-modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L
-modwifi.menu.VTable.flash=Flash
-modwifi.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-modwifi.menu.VTable.heap=Heap
-modwifi.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-modwifi.menu.VTable.iram=IRAM
-modwifi.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-modwifi.upload.resetmethod=ck
-modwifi.build.flash_mode=qio
-modwifi.build.flash_freq=40
-modwifi.menu.FlashSize.2M=2M (1M SPIFFS)
-modwifi.menu.FlashSize.2M.build.flash_size=2M
-modwifi.menu.FlashSize.2M.build.flash_size_bytes=0x200000
-modwifi.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
-modwifi.menu.FlashSize.2M.build.spiffs_pagesize=256
-modwifi.menu.FlashSize.2M.upload.maximum_size=1044464
-modwifi.menu.FlashSize.2M.build.rfcal_addr=0x1FC000
-modwifi.menu.FlashSize.2M.build.spiffs_start=0x100000
-modwifi.menu.FlashSize.2M.build.spiffs_end=0x1FB000
-modwifi.menu.FlashSize.2M.build.spiffs_blocksize=8192
-modwifi.menu.LwIPVariant.v2mss536=v2 Lower Memory
-modwifi.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-modwifi.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-modwifi.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-modwifi.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-modwifi.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-modwifi.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-modwifi.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-modwifi.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-modwifi.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-modwifi.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-modwifi.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-modwifi.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-modwifi.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-modwifi.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-modwifi.menu.Debug.Disabled=Disabled
-modwifi.menu.Debug.Disabled.build.debug_port=
-modwifi.menu.Debug.Serial=Serial
-modwifi.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-modwifi.menu.Debug.Serial1=Serial1
-modwifi.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-modwifi.menu.DebugLevel.None____=None
-modwifi.menu.DebugLevel.None____.build.debug_level=
-modwifi.menu.DebugLevel.SSL=SSL
-modwifi.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-modwifi.menu.DebugLevel.TLS_MEM=TLS_MEM
-modwifi.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-modwifi.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-modwifi.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-modwifi.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-modwifi.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-modwifi.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-modwifi.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-modwifi.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-modwifi.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-modwifi.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-modwifi.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-modwifi.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-modwifi.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-modwifi.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-modwifi.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-modwifi.menu.DebugLevel.CORE=CORE
-modwifi.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-modwifi.menu.DebugLevel.WIFI=WIFI
-modwifi.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-modwifi.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-modwifi.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-modwifi.menu.DebugLevel.UPDATER=UPDATER
-modwifi.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-modwifi.menu.DebugLevel.OTA=OTA
-modwifi.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-modwifi.menu.DebugLevel.OOM=OOM
-modwifi.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-modwifi.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-modwifi.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-modwifi.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-modwifi.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-modwifi.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-modwifi.menu.FlashErase.none=Only Sketch
-modwifi.menu.FlashErase.none.upload.erase_cmd=
-modwifi.menu.FlashErase.sdk=Sketch + WiFi Settings
-modwifi.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-modwifi.menu.FlashErase.all=All Flash Contents
-modwifi.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-modwifi.menu.UploadSpeed.115200=115200
-modwifi.menu.UploadSpeed.115200.upload.speed=115200
-modwifi.menu.UploadSpeed.9600=9600
-modwifi.menu.UploadSpeed.9600.upload.speed=9600
-modwifi.menu.UploadSpeed.57600=57600
-modwifi.menu.UploadSpeed.57600.upload.speed=57600
-modwifi.menu.UploadSpeed.230400.linux=230400
-modwifi.menu.UploadSpeed.230400.macosx=230400
-modwifi.menu.UploadSpeed.230400.upload.speed=230400
-modwifi.menu.UploadSpeed.256000.windows=256000
-modwifi.menu.UploadSpeed.256000.upload.speed=256000
-modwifi.menu.UploadSpeed.460800.linux=460800
-modwifi.menu.UploadSpeed.460800.macosx=460800
-modwifi.menu.UploadSpeed.460800.upload.speed=460800
-modwifi.menu.UploadSpeed.512000.windows=512000
-modwifi.menu.UploadSpeed.512000.upload.speed=512000
-modwifi.menu.UploadSpeed.921600=921600
-modwifi.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-thing.name=SparkFun ESP8266 Thing
-thing.build.board=ESP8266_THING
-thing.build.variant=thing
-thing.upload.tool=esptool
-thing.upload.maximum_data_size=81920
-thing.upload.wait_for_upload_port=true
-thing.upload.erase_cmd=
-thing.serial.disableDTR=true
-thing.serial.disableRTS=true
-thing.build.mcu=esp8266
-thing.build.core=esp8266
-thing.build.spiffs_pagesize=256
-thing.build.debug_port=
-thing.build.debug_level=
-thing.menu.CpuFrequency.80=80 MHz
-thing.menu.CpuFrequency.80.build.f_cpu=80000000L
-thing.menu.CpuFrequency.160=160 MHz
-thing.menu.CpuFrequency.160.build.f_cpu=160000000L
-thing.menu.VTable.flash=Flash
-thing.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-thing.menu.VTable.heap=Heap
-thing.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-thing.menu.VTable.iram=IRAM
-thing.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-thing.upload.resetmethod=ck
-thing.build.flash_mode=qio
-thing.build.flash_freq=40
-thing.menu.FlashSize.512K0=512K (no SPIFFS)
-thing.menu.FlashSize.512K0.build.flash_size=512K
-thing.menu.FlashSize.512K0.build.flash_size_bytes=0x80000
-thing.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-thing.menu.FlashSize.512K0.build.spiffs_pagesize=256
-thing.menu.FlashSize.512K0.upload.maximum_size=499696
-thing.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
-thing.menu.FlashSize.512K32=512K (32K SPIFFS)
-thing.menu.FlashSize.512K32.build.flash_size=512K
-thing.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
-thing.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
-thing.menu.FlashSize.512K32.build.spiffs_pagesize=256
-thing.menu.FlashSize.512K32.upload.maximum_size=466928
-thing.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
-thing.menu.FlashSize.512K32.build.spiffs_start=0x73000
-thing.menu.FlashSize.512K32.build.spiffs_end=0x7B000
-thing.menu.FlashSize.512K32.build.spiffs_blocksize=4096
-thing.menu.FlashSize.512K64=512K (64K SPIFFS)
-thing.menu.FlashSize.512K64.build.flash_size=512K
-thing.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
-thing.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-thing.menu.FlashSize.512K64.build.spiffs_pagesize=256
-thing.menu.FlashSize.512K64.upload.maximum_size=434160
-thing.menu.FlashSize.512K64.build.rfcal_addr=0x7C000
-thing.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-thing.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-thing.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-thing.menu.FlashSize.512K128=512K (128K SPIFFS)
-thing.menu.FlashSize.512K128.build.flash_size=512K
-thing.menu.FlashSize.512K128.build.flash_size_bytes=0x80000
-thing.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-thing.menu.FlashSize.512K128.build.spiffs_pagesize=256
-thing.menu.FlashSize.512K128.upload.maximum_size=368624
-thing.menu.FlashSize.512K128.build.rfcal_addr=0x7C000
-thing.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-thing.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-thing.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-thing.menu.LwIPVariant.v2mss536=v2 Lower Memory
-thing.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-thing.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-thing.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-thing.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-thing.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-thing.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-thing.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-thing.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-thing.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-thing.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-thing.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-thing.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-thing.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-thing.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-thing.menu.Debug.Disabled=Disabled
-thing.menu.Debug.Disabled.build.debug_port=
-thing.menu.Debug.Serial=Serial
-thing.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-thing.menu.Debug.Serial1=Serial1
-thing.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-thing.menu.DebugLevel.None____=None
-thing.menu.DebugLevel.None____.build.debug_level=
-thing.menu.DebugLevel.SSL=SSL
-thing.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-thing.menu.DebugLevel.TLS_MEM=TLS_MEM
-thing.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-thing.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-thing.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-thing.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-thing.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-thing.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-thing.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-thing.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-thing.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-thing.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-thing.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-thing.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-thing.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-thing.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-thing.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-thing.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thing.menu.DebugLevel.CORE=CORE
-thing.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-thing.menu.DebugLevel.WIFI=WIFI
-thing.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-thing.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-thing.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-thing.menu.DebugLevel.UPDATER=UPDATER
-thing.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-thing.menu.DebugLevel.OTA=OTA
-thing.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-thing.menu.DebugLevel.OOM=OOM
-thing.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-thing.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-thing.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-thing.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-thing.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-thing.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-thing.menu.FlashErase.none=Only Sketch
-thing.menu.FlashErase.none.upload.erase_cmd=
-thing.menu.FlashErase.sdk=Sketch + WiFi Settings
-thing.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-thing.menu.FlashErase.all=All Flash Contents
-thing.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-thing.menu.UploadSpeed.115200=115200
-thing.menu.UploadSpeed.115200.upload.speed=115200
-thing.menu.UploadSpeed.9600=9600
-thing.menu.UploadSpeed.9600.upload.speed=9600
-thing.menu.UploadSpeed.57600=57600
-thing.menu.UploadSpeed.57600.upload.speed=57600
-thing.menu.UploadSpeed.230400.linux=230400
-thing.menu.UploadSpeed.230400.macosx=230400
-thing.menu.UploadSpeed.230400.upload.speed=230400
-thing.menu.UploadSpeed.256000.windows=256000
-thing.menu.UploadSpeed.256000.upload.speed=256000
-thing.menu.UploadSpeed.460800.linux=460800
-thing.menu.UploadSpeed.460800.macosx=460800
-thing.menu.UploadSpeed.460800.upload.speed=460800
-thing.menu.UploadSpeed.512000.windows=512000
-thing.menu.UploadSpeed.512000.upload.speed=512000
-thing.menu.UploadSpeed.921600=921600
-thing.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-thingdev.name=SparkFun ESP8266 Thing Dev
-thingdev.build.board=ESP8266_THING_DEV
-thingdev.build.variant=thing
-thingdev.upload.tool=esptool
-thingdev.upload.maximum_data_size=81920
-thingdev.upload.wait_for_upload_port=true
-thingdev.upload.erase_cmd=
-thingdev.serial.disableDTR=true
-thingdev.serial.disableRTS=true
-thingdev.build.mcu=esp8266
-thingdev.build.core=esp8266
-thingdev.build.spiffs_pagesize=256
-thingdev.build.debug_port=
-thingdev.build.debug_level=
-thingdev.menu.CpuFrequency.80=80 MHz
-thingdev.menu.CpuFrequency.80.build.f_cpu=80000000L
-thingdev.menu.CpuFrequency.160=160 MHz
-thingdev.menu.CpuFrequency.160.build.f_cpu=160000000L
-thingdev.menu.VTable.flash=Flash
-thingdev.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-thingdev.menu.VTable.heap=Heap
-thingdev.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-thingdev.menu.VTable.iram=IRAM
-thingdev.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-thingdev.upload.resetmethod=nodemcu
-thingdev.build.flash_mode=dio
-thingdev.build.flash_freq=40
-thingdev.menu.FlashSize.512K0=512K (no SPIFFS)
-thingdev.menu.FlashSize.512K0.build.flash_size=512K
-thingdev.menu.FlashSize.512K0.build.flash_size_bytes=0x80000
-thingdev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-thingdev.menu.FlashSize.512K0.build.spiffs_pagesize=256
-thingdev.menu.FlashSize.512K0.upload.maximum_size=499696
-thingdev.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
-thingdev.menu.FlashSize.512K32=512K (32K SPIFFS)
-thingdev.menu.FlashSize.512K32.build.flash_size=512K
-thingdev.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
-thingdev.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
-thingdev.menu.FlashSize.512K32.build.spiffs_pagesize=256
-thingdev.menu.FlashSize.512K32.upload.maximum_size=466928
-thingdev.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
-thingdev.menu.FlashSize.512K32.build.spiffs_start=0x73000
-thingdev.menu.FlashSize.512K32.build.spiffs_end=0x7B000
-thingdev.menu.FlashSize.512K32.build.spiffs_blocksize=4096
-thingdev.menu.FlashSize.512K64=512K (64K SPIFFS)
-thingdev.menu.FlashSize.512K64.build.flash_size=512K
-thingdev.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
-thingdev.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-thingdev.menu.FlashSize.512K64.build.spiffs_pagesize=256
-thingdev.menu.FlashSize.512K64.upload.maximum_size=434160
-thingdev.menu.FlashSize.512K64.build.rfcal_addr=0x7C000
-thingdev.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-thingdev.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-thingdev.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-thingdev.menu.FlashSize.512K128=512K (128K SPIFFS)
-thingdev.menu.FlashSize.512K128.build.flash_size=512K
-thingdev.menu.FlashSize.512K128.build.flash_size_bytes=0x80000
-thingdev.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-thingdev.menu.FlashSize.512K128.build.spiffs_pagesize=256
-thingdev.menu.FlashSize.512K128.upload.maximum_size=368624
-thingdev.menu.FlashSize.512K128.build.rfcal_addr=0x7C000
-thingdev.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-thingdev.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-thingdev.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-thingdev.menu.LwIPVariant.v2mss536=v2 Lower Memory
-thingdev.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-thingdev.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-thingdev.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-thingdev.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-thingdev.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-thingdev.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-thingdev.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-thingdev.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-thingdev.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-thingdev.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-thingdev.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-thingdev.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-thingdev.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-thingdev.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-thingdev.menu.Debug.Disabled=Disabled
-thingdev.menu.Debug.Disabled.build.debug_port=
-thingdev.menu.Debug.Serial=Serial
-thingdev.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-thingdev.menu.Debug.Serial1=Serial1
-thingdev.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-thingdev.menu.DebugLevel.None____=None
-thingdev.menu.DebugLevel.None____.build.debug_level=
-thingdev.menu.DebugLevel.SSL=SSL
-thingdev.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-thingdev.menu.DebugLevel.TLS_MEM=TLS_MEM
-thingdev.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-thingdev.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-thingdev.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-thingdev.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-thingdev.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-thingdev.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-thingdev.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-thingdev.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-thingdev.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-thingdev.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-thingdev.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-thingdev.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-thingdev.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-thingdev.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-thingdev.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-thingdev.menu.DebugLevel.CORE=CORE
-thingdev.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-thingdev.menu.DebugLevel.WIFI=WIFI
-thingdev.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-thingdev.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-thingdev.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-thingdev.menu.DebugLevel.UPDATER=UPDATER
-thingdev.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-thingdev.menu.DebugLevel.OTA=OTA
-thingdev.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-thingdev.menu.DebugLevel.OOM=OOM
-thingdev.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-thingdev.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-thingdev.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-thingdev.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-thingdev.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-thingdev.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-thingdev.menu.FlashErase.none=Only Sketch
-thingdev.menu.FlashErase.none.upload.erase_cmd=
-thingdev.menu.FlashErase.sdk=Sketch + WiFi Settings
-thingdev.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-thingdev.menu.FlashErase.all=All Flash Contents
-thingdev.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-thingdev.menu.UploadSpeed.115200=115200
-thingdev.menu.UploadSpeed.115200.upload.speed=115200
-thingdev.menu.UploadSpeed.9600=9600
-thingdev.menu.UploadSpeed.9600.upload.speed=9600
-thingdev.menu.UploadSpeed.57600=57600
-thingdev.menu.UploadSpeed.57600.upload.speed=57600
-thingdev.menu.UploadSpeed.230400.linux=230400
-thingdev.menu.UploadSpeed.230400.macosx=230400
-thingdev.menu.UploadSpeed.230400.upload.speed=230400
-thingdev.menu.UploadSpeed.256000.windows=256000
-thingdev.menu.UploadSpeed.256000.upload.speed=256000
-thingdev.menu.UploadSpeed.460800.linux=460800
-thingdev.menu.UploadSpeed.460800.macosx=460800
-thingdev.menu.UploadSpeed.460800.upload.speed=460800
-thingdev.menu.UploadSpeed.512000.windows=512000
-thingdev.menu.UploadSpeed.512000.upload.speed=512000
-thingdev.menu.UploadSpeed.921600=921600
-thingdev.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-esp210.name=SweetPea ESP-210
-esp210.build.board=ESP8266_ESP210
-esp210.upload.tool=esptool
-esp210.upload.maximum_data_size=81920
-esp210.upload.wait_for_upload_port=true
-esp210.upload.erase_cmd=
-esp210.serial.disableDTR=true
-esp210.serial.disableRTS=true
-esp210.build.mcu=esp8266
-esp210.build.core=esp8266
-esp210.build.variant=generic
-esp210.build.spiffs_pagesize=256
-esp210.build.debug_port=
-esp210.build.debug_level=
-esp210.menu.CpuFrequency.80=80 MHz
-esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
-esp210.menu.CpuFrequency.160=160 MHz
-esp210.menu.CpuFrequency.160.build.f_cpu=160000000L
-esp210.menu.VTable.flash=Flash
-esp210.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-esp210.menu.VTable.heap=Heap
-esp210.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-esp210.menu.VTable.iram=IRAM
-esp210.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-esp210.upload.resetmethod=ck
-esp210.build.flash_mode=qio
-esp210.build.flash_freq=40
-esp210.menu.FlashSize.4M1M=4M (1M SPIFFS)
-esp210.menu.FlashSize.4M1M.build.flash_size=4M
-esp210.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-esp210.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-esp210.menu.FlashSize.4M1M.upload.maximum_size=1044464
-esp210.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-esp210.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-esp210.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-esp210.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-esp210.menu.FlashSize.4M2M=4M (2M SPIFFS)
-esp210.menu.FlashSize.4M2M.build.flash_size=4M
-esp210.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-esp210.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-esp210.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-esp210.menu.FlashSize.4M2M.upload.maximum_size=1044464
-esp210.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-esp210.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-esp210.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-esp210.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-esp210.menu.FlashSize.4M3M=4M (3M SPIFFS)
-esp210.menu.FlashSize.4M3M.build.flash_size=4M
-esp210.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-esp210.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-esp210.menu.FlashSize.4M3M.upload.maximum_size=1044464
-esp210.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-esp210.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-esp210.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-esp210.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-esp210.menu.LwIPVariant.v2mss536=v2 Lower Memory
-esp210.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-esp210.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-esp210.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-esp210.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-esp210.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-esp210.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-esp210.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-esp210.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-esp210.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-esp210.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-esp210.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-esp210.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-esp210.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-esp210.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-esp210.menu.Debug.Disabled=Disabled
-esp210.menu.Debug.Disabled.build.debug_port=
-esp210.menu.Debug.Serial=Serial
-esp210.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-esp210.menu.Debug.Serial1=Serial1
-esp210.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-esp210.menu.DebugLevel.None____=None
-esp210.menu.DebugLevel.None____.build.debug_level=
-esp210.menu.DebugLevel.SSL=SSL
-esp210.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-esp210.menu.DebugLevel.TLS_MEM=TLS_MEM
-esp210.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-esp210.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-esp210.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-esp210.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-esp210.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-esp210.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-esp210.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-esp210.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-esp210.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-esp210.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-esp210.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-esp210.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-esp210.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-esp210.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-esp210.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-esp210.menu.DebugLevel.CORE=CORE
-esp210.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-esp210.menu.DebugLevel.WIFI=WIFI
-esp210.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-esp210.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-esp210.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-esp210.menu.DebugLevel.UPDATER=UPDATER
-esp210.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-esp210.menu.DebugLevel.OTA=OTA
-esp210.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-esp210.menu.DebugLevel.OOM=OOM
-esp210.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-esp210.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-esp210.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-esp210.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-esp210.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-esp210.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-esp210.menu.FlashErase.none=Only Sketch
-esp210.menu.FlashErase.none.upload.erase_cmd=
-esp210.menu.FlashErase.sdk=Sketch + WiFi Settings
-esp210.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-esp210.menu.FlashErase.all=All Flash Contents
-esp210.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-esp210.menu.UploadSpeed.57600=57600
-esp210.menu.UploadSpeed.57600.upload.speed=57600
-esp210.menu.UploadSpeed.9600=9600
-esp210.menu.UploadSpeed.9600.upload.speed=9600
-esp210.menu.UploadSpeed.115200=115200
-esp210.menu.UploadSpeed.115200.upload.speed=115200
-esp210.menu.UploadSpeed.230400.linux=230400
-esp210.menu.UploadSpeed.230400.macosx=230400
-esp210.menu.UploadSpeed.230400.upload.speed=230400
-esp210.menu.UploadSpeed.256000.windows=256000
-esp210.menu.UploadSpeed.256000.upload.speed=256000
-esp210.menu.UploadSpeed.460800.linux=460800
-esp210.menu.UploadSpeed.460800.macosx=460800
-esp210.menu.UploadSpeed.460800.upload.speed=460800
-esp210.menu.UploadSpeed.512000.windows=512000
-esp210.menu.UploadSpeed.512000.upload.speed=512000
-esp210.menu.UploadSpeed.921600=921600
-esp210.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-d1_mini.name=LOLIN(WEMOS) D1 R2 & mini
-d1_mini.build.board=ESP8266_WEMOS_D1MINI
-d1_mini.build.variant=d1_mini
-d1_mini.upload.tool=esptool
-d1_mini.upload.maximum_data_size=81920
-d1_mini.upload.wait_for_upload_port=true
-d1_mini.upload.erase_cmd=
-d1_mini.serial.disableDTR=true
-d1_mini.serial.disableRTS=true
-d1_mini.build.mcu=esp8266
-d1_mini.build.core=esp8266
-d1_mini.build.spiffs_pagesize=256
-d1_mini.build.debug_port=
-d1_mini.build.debug_level=
-d1_mini.menu.CpuFrequency.80=80 MHz
-d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1_mini.menu.CpuFrequency.160=160 MHz
-d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
-d1_mini.menu.VTable.flash=Flash
-d1_mini.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-d1_mini.menu.VTable.heap=Heap
-d1_mini.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-d1_mini.menu.VTable.iram=IRAM
-d1_mini.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-d1_mini.upload.resetmethod=nodemcu
-d1_mini.build.flash_mode=dio
-d1_mini.build.flash_freq=40
-d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
-d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
-d1_mini.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-d1_mini.menu.FlashSize.4M1M.upload.maximum_size=1044464
-d1_mini.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-d1_mini.menu.FlashSize.4M2M=4M (2M SPIFFS)
-d1_mini.menu.FlashSize.4M2M.build.flash_size=4M
-d1_mini.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-d1_mini.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-d1_mini.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-d1_mini.menu.FlashSize.4M2M.upload.maximum_size=1044464
-d1_mini.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-d1_mini.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-d1_mini.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-d1_mini.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
-d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
-d1_mini.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-d1_mini.menu.FlashSize.4M3M.upload.maximum_size=1044464
-d1_mini.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-d1_mini.menu.LwIPVariant.v2mss536=v2 Lower Memory
-d1_mini.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-d1_mini.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-d1_mini.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-d1_mini.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-d1_mini.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-d1_mini.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-d1_mini.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-d1_mini.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-d1_mini.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-d1_mini.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-d1_mini.menu.Debug.Disabled=Disabled
-d1_mini.menu.Debug.Disabled.build.debug_port=
-d1_mini.menu.Debug.Serial=Serial
-d1_mini.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-d1_mini.menu.Debug.Serial1=Serial1
-d1_mini.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-d1_mini.menu.DebugLevel.None____=None
-d1_mini.menu.DebugLevel.None____.build.debug_level=
-d1_mini.menu.DebugLevel.SSL=SSL
-d1_mini.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-d1_mini.menu.DebugLevel.TLS_MEM=TLS_MEM
-d1_mini.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-d1_mini.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-d1_mini.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-d1_mini.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-d1_mini.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-d1_mini.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-d1_mini.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-d1_mini.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-d1_mini.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-d1_mini.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini.menu.DebugLevel.CORE=CORE
-d1_mini.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-d1_mini.menu.DebugLevel.WIFI=WIFI
-d1_mini.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-d1_mini.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-d1_mini.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-d1_mini.menu.DebugLevel.UPDATER=UPDATER
-d1_mini.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-d1_mini.menu.DebugLevel.OTA=OTA
-d1_mini.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-d1_mini.menu.DebugLevel.OOM=OOM
-d1_mini.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-d1_mini.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-d1_mini.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-d1_mini.menu.FlashErase.none=Only Sketch
-d1_mini.menu.FlashErase.none.upload.erase_cmd=
-d1_mini.menu.FlashErase.sdk=Sketch + WiFi Settings
-d1_mini.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-d1_mini.menu.FlashErase.all=All Flash Contents
-d1_mini.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-d1_mini.menu.UploadSpeed.921600=921600
-d1_mini.menu.UploadSpeed.921600.upload.speed=921600
-d1_mini.menu.UploadSpeed.9600=9600
-d1_mini.menu.UploadSpeed.9600.upload.speed=9600
-d1_mini.menu.UploadSpeed.57600=57600
-d1_mini.menu.UploadSpeed.57600.upload.speed=57600
-d1_mini.menu.UploadSpeed.115200=115200
-d1_mini.menu.UploadSpeed.115200.upload.speed=115200
-d1_mini.menu.UploadSpeed.230400.linux=230400
-d1_mini.menu.UploadSpeed.230400.macosx=230400
-d1_mini.menu.UploadSpeed.230400.upload.speed=230400
-d1_mini.menu.UploadSpeed.256000.windows=256000
-d1_mini.menu.UploadSpeed.256000.upload.speed=256000
-d1_mini.menu.UploadSpeed.460800.linux=460800
-d1_mini.menu.UploadSpeed.460800.macosx=460800
-d1_mini.menu.UploadSpeed.460800.upload.speed=460800
-d1_mini.menu.UploadSpeed.512000.windows=512000
-d1_mini.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-d1_mini_pro.name=LOLIN(WEMOS) D1 mini Pro
-d1_mini_pro.build.board=ESP8266_WEMOS_D1MINIPRO
-d1_mini_pro.build.variant=d1_mini
-d1_mini_pro.upload.tool=esptool
-d1_mini_pro.upload.maximum_data_size=81920
-d1_mini_pro.upload.wait_for_upload_port=true
-d1_mini_pro.upload.erase_cmd=
-d1_mini_pro.serial.disableDTR=true
-d1_mini_pro.serial.disableRTS=true
-d1_mini_pro.build.mcu=esp8266
-d1_mini_pro.build.core=esp8266
-d1_mini_pro.build.spiffs_pagesize=256
-d1_mini_pro.build.debug_port=
-d1_mini_pro.build.debug_level=
-d1_mini_pro.menu.CpuFrequency.80=80 MHz
-d1_mini_pro.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1_mini_pro.menu.CpuFrequency.160=160 MHz
-d1_mini_pro.menu.CpuFrequency.160.build.f_cpu=160000000L
-d1_mini_pro.menu.VTable.flash=Flash
-d1_mini_pro.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-d1_mini_pro.menu.VTable.heap=Heap
-d1_mini_pro.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-d1_mini_pro.menu.VTable.iram=IRAM
-d1_mini_pro.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-d1_mini_pro.upload.resetmethod=nodemcu
-d1_mini_pro.build.flash_mode=dio
-d1_mini_pro.build.flash_freq=40
-d1_mini_pro.menu.FlashSize.16M15M=16M (15M SPIFFS)
-d1_mini_pro.menu.FlashSize.16M15M.build.flash_size=16M
-d1_mini_pro.menu.FlashSize.16M15M.build.flash_size_bytes=0x1000000
-d1_mini_pro.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld
-d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_pagesize=256
-d1_mini_pro.menu.FlashSize.16M15M.upload.maximum_size=1044464
-d1_mini_pro.menu.FlashSize.16M15M.build.rfcal_addr=0xFFC000
-d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_start=0x100000
-d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000
-d1_mini_pro.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
-d1_mini_pro.menu.LwIPVariant.v2mss536=v2 Lower Memory
-d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-d1_mini_pro.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-d1_mini_pro.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-d1_mini_pro.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-d1_mini_pro.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-d1_mini_pro.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-d1_mini_pro.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini_pro.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-d1_mini_pro.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-d1_mini_pro.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini_pro.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-d1_mini_pro.menu.Debug.Disabled=Disabled
-d1_mini_pro.menu.Debug.Disabled.build.debug_port=
-d1_mini_pro.menu.Debug.Serial=Serial
-d1_mini_pro.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-d1_mini_pro.menu.Debug.Serial1=Serial1
-d1_mini_pro.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-d1_mini_pro.menu.DebugLevel.None____=None
-d1_mini_pro.menu.DebugLevel.None____.build.debug_level=
-d1_mini_pro.menu.DebugLevel.SSL=SSL
-d1_mini_pro.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-d1_mini_pro.menu.DebugLevel.TLS_MEM=TLS_MEM
-d1_mini_pro.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-d1_mini_pro.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_pro.menu.DebugLevel.CORE=CORE
-d1_mini_pro.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-d1_mini_pro.menu.DebugLevel.WIFI=WIFI
-d1_mini_pro.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-d1_mini_pro.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-d1_mini_pro.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-d1_mini_pro.menu.DebugLevel.UPDATER=UPDATER
-d1_mini_pro.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-d1_mini_pro.menu.DebugLevel.OTA=OTA
-d1_mini_pro.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-d1_mini_pro.menu.DebugLevel.OOM=OOM
-d1_mini_pro.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-d1_mini_pro.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini_pro.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini_pro.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini_pro.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-d1_mini_pro.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-d1_mini_pro.menu.FlashErase.none=Only Sketch
-d1_mini_pro.menu.FlashErase.none.upload.erase_cmd=
-d1_mini_pro.menu.FlashErase.sdk=Sketch + WiFi Settings
-d1_mini_pro.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-d1_mini_pro.menu.FlashErase.all=All Flash Contents
-d1_mini_pro.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-d1_mini_pro.menu.UploadSpeed.921600=921600
-d1_mini_pro.menu.UploadSpeed.921600.upload.speed=921600
-d1_mini_pro.menu.UploadSpeed.9600=9600
-d1_mini_pro.menu.UploadSpeed.9600.upload.speed=9600
-d1_mini_pro.menu.UploadSpeed.57600=57600
-d1_mini_pro.menu.UploadSpeed.57600.upload.speed=57600
-d1_mini_pro.menu.UploadSpeed.115200=115200
-d1_mini_pro.menu.UploadSpeed.115200.upload.speed=115200
-d1_mini_pro.menu.UploadSpeed.230400.linux=230400
-d1_mini_pro.menu.UploadSpeed.230400.macosx=230400
-d1_mini_pro.menu.UploadSpeed.230400.upload.speed=230400
-d1_mini_pro.menu.UploadSpeed.256000.windows=256000
-d1_mini_pro.menu.UploadSpeed.256000.upload.speed=256000
-d1_mini_pro.menu.UploadSpeed.460800.linux=460800
-d1_mini_pro.menu.UploadSpeed.460800.macosx=460800
-d1_mini_pro.menu.UploadSpeed.460800.upload.speed=460800
-d1_mini_pro.menu.UploadSpeed.512000.windows=512000
-d1_mini_pro.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-d1_mini_lite.name=LOLIN(WEMOS) D1 mini Lite
-d1_mini_lite.build.board=ESP8266_WEMOS_D1MINILITE
-d1_mini_lite.build.variant=d1_mini
-d1_mini_lite.upload.tool=esptool
-d1_mini_lite.upload.maximum_data_size=81920
-d1_mini_lite.upload.wait_for_upload_port=true
-d1_mini_lite.upload.erase_cmd=
-d1_mini_lite.serial.disableDTR=true
-d1_mini_lite.serial.disableRTS=true
-d1_mini_lite.build.mcu=esp8266
-d1_mini_lite.build.core=esp8266
-d1_mini_lite.build.spiffs_pagesize=256
-d1_mini_lite.build.debug_port=
-d1_mini_lite.build.debug_level=
-d1_mini_lite.menu.CpuFrequency.80=80 MHz
-d1_mini_lite.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1_mini_lite.menu.CpuFrequency.160=160 MHz
-d1_mini_lite.menu.CpuFrequency.160.build.f_cpu=160000000L
-d1_mini_lite.menu.VTable.flash=Flash
-d1_mini_lite.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-d1_mini_lite.menu.VTable.heap=Heap
-d1_mini_lite.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-d1_mini_lite.menu.VTable.iram=IRAM
-d1_mini_lite.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-d1_mini_lite.upload.resetmethod=nodemcu
-d1_mini_lite.build.flash_mode=dout
-d1_mini_lite.build.flash_freq=40
-d1_mini_lite.menu.FlashSize.1M0=1M (no SPIFFS)
-d1_mini_lite.menu.FlashSize.1M0.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-d1_mini_lite.menu.FlashSize.1M0.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M0.upload.maximum_size=1023984
-d1_mini_lite.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M64=1M (64K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M64.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-d1_mini_lite.menu.FlashSize.1M64.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M64.upload.maximum_size=958448
-d1_mini_lite.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-d1_mini_lite.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M128=1M (128K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M128.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-d1_mini_lite.menu.FlashSize.1M128.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M128.upload.maximum_size=892912
-d1_mini_lite.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-d1_mini_lite.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M144=1M (144K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M144.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-d1_mini_lite.menu.FlashSize.1M144.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M144.upload.maximum_size=876528
-d1_mini_lite.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-d1_mini_lite.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M160=1M (160K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M160.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-d1_mini_lite.menu.FlashSize.1M160.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M160.upload.maximum_size=860144
-d1_mini_lite.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-d1_mini_lite.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M192=1M (192K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M192.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-d1_mini_lite.menu.FlashSize.1M192.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M192.upload.maximum_size=827376
-d1_mini_lite.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-d1_mini_lite.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M256=1M (256K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M256.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-d1_mini_lite.menu.FlashSize.1M256.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M256.upload.maximum_size=761840
-d1_mini_lite.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-d1_mini_lite.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-d1_mini_lite.menu.FlashSize.1M512=1M (512K SPIFFS)
-d1_mini_lite.menu.FlashSize.1M512.build.flash_size=1M
-d1_mini_lite.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
-d1_mini_lite.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-d1_mini_lite.menu.FlashSize.1M512.build.spiffs_pagesize=256
-d1_mini_lite.menu.FlashSize.1M512.upload.maximum_size=499696
-d1_mini_lite.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
-d1_mini_lite.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-d1_mini_lite.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-d1_mini_lite.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-d1_mini_lite.menu.LwIPVariant.v2mss536=v2 Lower Memory
-d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-d1_mini_lite.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-d1_mini_lite.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-d1_mini_lite.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-d1_mini_lite.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-d1_mini_lite.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-d1_mini_lite.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini_lite.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-d1_mini_lite.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-d1_mini_lite.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-d1_mini_lite.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-d1_mini_lite.menu.Debug.Disabled=Disabled
-d1_mini_lite.menu.Debug.Disabled.build.debug_port=
-d1_mini_lite.menu.Debug.Serial=Serial
-d1_mini_lite.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-d1_mini_lite.menu.Debug.Serial1=Serial1
-d1_mini_lite.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-d1_mini_lite.menu.DebugLevel.None____=None
-d1_mini_lite.menu.DebugLevel.None____.build.debug_level=
-d1_mini_lite.menu.DebugLevel.SSL=SSL
-d1_mini_lite.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-d1_mini_lite.menu.DebugLevel.TLS_MEM=TLS_MEM
-d1_mini_lite.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-d1_mini_lite.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1_mini_lite.menu.DebugLevel.CORE=CORE
-d1_mini_lite.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-d1_mini_lite.menu.DebugLevel.WIFI=WIFI
-d1_mini_lite.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-d1_mini_lite.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-d1_mini_lite.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-d1_mini_lite.menu.DebugLevel.UPDATER=UPDATER
-d1_mini_lite.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-d1_mini_lite.menu.DebugLevel.OTA=OTA
-d1_mini_lite.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-d1_mini_lite.menu.DebugLevel.OOM=OOM
-d1_mini_lite.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-d1_mini_lite.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini_lite.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1_mini_lite.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1_mini_lite.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-d1_mini_lite.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-d1_mini_lite.menu.FlashErase.none=Only Sketch
-d1_mini_lite.menu.FlashErase.none.upload.erase_cmd=
-d1_mini_lite.menu.FlashErase.sdk=Sketch + WiFi Settings
-d1_mini_lite.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-d1_mini_lite.menu.FlashErase.all=All Flash Contents
-d1_mini_lite.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-d1_mini_lite.menu.UploadSpeed.921600=921600
-d1_mini_lite.menu.UploadSpeed.921600.upload.speed=921600
-d1_mini_lite.menu.UploadSpeed.9600=9600
-d1_mini_lite.menu.UploadSpeed.9600.upload.speed=9600
-d1_mini_lite.menu.UploadSpeed.57600=57600
-d1_mini_lite.menu.UploadSpeed.57600.upload.speed=57600
-d1_mini_lite.menu.UploadSpeed.115200=115200
-d1_mini_lite.menu.UploadSpeed.115200.upload.speed=115200
-d1_mini_lite.menu.UploadSpeed.230400.linux=230400
-d1_mini_lite.menu.UploadSpeed.230400.macosx=230400
-d1_mini_lite.menu.UploadSpeed.230400.upload.speed=230400
-d1_mini_lite.menu.UploadSpeed.256000.windows=256000
-d1_mini_lite.menu.UploadSpeed.256000.upload.speed=256000
-d1_mini_lite.menu.UploadSpeed.460800.linux=460800
-d1_mini_lite.menu.UploadSpeed.460800.macosx=460800
-d1_mini_lite.menu.UploadSpeed.460800.upload.speed=460800
-d1_mini_lite.menu.UploadSpeed.512000.windows=512000
-d1_mini_lite.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-d1.name=WeMos D1 R1
-d1.build.board=ESP8266_WEMOS_D1R1
-d1.build.variant=d1
-d1.upload.tool=esptool
-d1.upload.maximum_data_size=81920
-d1.upload.wait_for_upload_port=true
-d1.upload.erase_cmd=
-d1.serial.disableDTR=true
-d1.serial.disableRTS=true
-d1.build.mcu=esp8266
-d1.build.core=esp8266
-d1.build.spiffs_pagesize=256
-d1.build.debug_port=
-d1.build.debug_level=
-d1.menu.CpuFrequency.80=80 MHz
-d1.menu.CpuFrequency.80.build.f_cpu=80000000L
-d1.menu.CpuFrequency.160=160 MHz
-d1.menu.CpuFrequency.160.build.f_cpu=160000000L
-d1.menu.VTable.flash=Flash
-d1.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-d1.menu.VTable.heap=Heap
-d1.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-d1.menu.VTable.iram=IRAM
-d1.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-d1.upload.resetmethod=nodemcu
-d1.build.flash_mode=dio
-d1.build.flash_freq=40
-d1.menu.FlashSize.4M1M=4M (1M SPIFFS)
-d1.menu.FlashSize.4M1M.build.flash_size=4M
-d1.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-d1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-d1.menu.FlashSize.4M1M.upload.maximum_size=1044464
-d1.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-d1.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-d1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-d1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-d1.menu.FlashSize.4M2M=4M (2M SPIFFS)
-d1.menu.FlashSize.4M2M.build.flash_size=4M
-d1.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-d1.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-d1.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-d1.menu.FlashSize.4M2M.upload.maximum_size=1044464
-d1.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-d1.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-d1.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-d1.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-d1.menu.FlashSize.4M3M=4M (3M SPIFFS)
-d1.menu.FlashSize.4M3M.build.flash_size=4M
-d1.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-d1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-d1.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-d1.menu.FlashSize.4M3M.upload.maximum_size=1044464
-d1.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-d1.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-d1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-d1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-d1.menu.LwIPVariant.v2mss536=v2 Lower Memory
-d1.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-d1.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-d1.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-d1.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-d1.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-d1.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-d1.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-d1.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-d1.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-d1.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-d1.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-d1.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-d1.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-d1.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-d1.menu.Debug.Disabled=Disabled
-d1.menu.Debug.Disabled.build.debug_port=
-d1.menu.Debug.Serial=Serial
-d1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-d1.menu.Debug.Serial1=Serial1
-d1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-d1.menu.DebugLevel.None____=None
-d1.menu.DebugLevel.None____.build.debug_level=
-d1.menu.DebugLevel.SSL=SSL
-d1.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-d1.menu.DebugLevel.TLS_MEM=TLS_MEM
-d1.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-d1.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-d1.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-d1.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-d1.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-d1.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-d1.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-d1.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-d1.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-d1.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-d1.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-d1.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-d1.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-d1.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-d1.menu.DebugLevel.CORE=CORE
-d1.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-d1.menu.DebugLevel.WIFI=WIFI
-d1.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-d1.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-d1.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-d1.menu.DebugLevel.UPDATER=UPDATER
-d1.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-d1.menu.DebugLevel.OTA=OTA
-d1.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-d1.menu.DebugLevel.OOM=OOM
-d1.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-d1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-d1.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-d1.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-d1.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-d1.menu.FlashErase.none=Only Sketch
-d1.menu.FlashErase.none.upload.erase_cmd=
-d1.menu.FlashErase.sdk=Sketch + WiFi Settings
-d1.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-d1.menu.FlashErase.all=All Flash Contents
-d1.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-d1.menu.UploadSpeed.921600=921600
-d1.menu.UploadSpeed.921600.upload.speed=921600
-d1.menu.UploadSpeed.9600=9600
-d1.menu.UploadSpeed.9600.upload.speed=9600
-d1.menu.UploadSpeed.57600=57600
-d1.menu.UploadSpeed.57600.upload.speed=57600
-d1.menu.UploadSpeed.115200=115200
-d1.menu.UploadSpeed.115200.upload.speed=115200
-d1.menu.UploadSpeed.230400.linux=230400
-d1.menu.UploadSpeed.230400.macosx=230400
-d1.menu.UploadSpeed.230400.upload.speed=230400
-d1.menu.UploadSpeed.256000.windows=256000
-d1.menu.UploadSpeed.256000.upload.speed=256000
-d1.menu.UploadSpeed.460800.linux=460800
-d1.menu.UploadSpeed.460800.macosx=460800
-d1.menu.UploadSpeed.460800.upload.speed=460800
-d1.menu.UploadSpeed.512000.windows=512000
-d1.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-espino.name=ESPino (ESP-12 Module)
-espino.build.board=ESP8266_ESP12
-espino.build.variant=espino
-espino.upload.tool=esptool
-espino.upload.maximum_data_size=81920
-espino.upload.wait_for_upload_port=true
-espino.upload.erase_cmd=
-espino.serial.disableDTR=true
-espino.serial.disableRTS=true
-espino.build.mcu=esp8266
-espino.build.core=esp8266
-espino.build.spiffs_pagesize=256
-espino.build.debug_port=
-espino.build.debug_level=
-espino.menu.CpuFrequency.80=80 MHz
-espino.menu.CpuFrequency.80.build.f_cpu=80000000L
-espino.menu.CpuFrequency.160=160 MHz
-espino.menu.CpuFrequency.160.build.f_cpu=160000000L
-espino.menu.VTable.flash=Flash
-espino.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-espino.menu.VTable.heap=Heap
-espino.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-espino.menu.VTable.iram=IRAM
-espino.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-espino.menu.ResetMethod.ck=ck
-espino.menu.ResetMethod.ck.upload.resetmethod=ck
-espino.menu.ResetMethod.nodemcu=nodemcu
-espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-espino.build.flash_mode=qio
-espino.build.flash_freq=40
-espino.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espino.menu.FlashSize.4M1M.build.flash_size=4M
-espino.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-espino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espino.menu.FlashSize.4M1M.upload.maximum_size=1044464
-espino.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-espino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espino.menu.FlashSize.4M2M=4M (2M SPIFFS)
-espino.menu.FlashSize.4M2M.build.flash_size=4M
-espino.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-espino.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-espino.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-espino.menu.FlashSize.4M2M.upload.maximum_size=1044464
-espino.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-espino.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-espino.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-espino.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-espino.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espino.menu.FlashSize.4M3M.build.flash_size=4M
-espino.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-espino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-espino.menu.FlashSize.4M3M.upload.maximum_size=1044464
-espino.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-espino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espino.menu.LwIPVariant.v2mss536=v2 Lower Memory
-espino.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-espino.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-espino.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-espino.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-espino.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-espino.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-espino.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-espino.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-espino.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-espino.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-espino.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-espino.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-espino.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-espino.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-espino.menu.Debug.Disabled=Disabled
-espino.menu.Debug.Disabled.build.debug_port=
-espino.menu.Debug.Serial=Serial
-espino.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espino.menu.Debug.Serial1=Serial1
-espino.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-espino.menu.DebugLevel.None____=None
-espino.menu.DebugLevel.None____.build.debug_level=
-espino.menu.DebugLevel.SSL=SSL
-espino.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-espino.menu.DebugLevel.TLS_MEM=TLS_MEM
-espino.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-espino.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-espino.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-espino.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-espino.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-espino.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-espino.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-espino.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-espino.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-espino.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-espino.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espino.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-espino.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-espino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-espino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espino.menu.DebugLevel.CORE=CORE
-espino.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-espino.menu.DebugLevel.WIFI=WIFI
-espino.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-espino.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-espino.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-espino.menu.DebugLevel.UPDATER=UPDATER
-espino.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-espino.menu.DebugLevel.OTA=OTA
-espino.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-espino.menu.DebugLevel.OOM=OOM
-espino.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-espino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espino.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-espino.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-espino.menu.FlashErase.none=Only Sketch
-espino.menu.FlashErase.none.upload.erase_cmd=
-espino.menu.FlashErase.sdk=Sketch + WiFi Settings
-espino.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-espino.menu.FlashErase.all=All Flash Contents
-espino.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-espino.menu.UploadSpeed.115200=115200
-espino.menu.UploadSpeed.115200.upload.speed=115200
-espino.menu.UploadSpeed.9600=9600
-espino.menu.UploadSpeed.9600.upload.speed=9600
-espino.menu.UploadSpeed.57600=57600
-espino.menu.UploadSpeed.57600.upload.speed=57600
-espino.menu.UploadSpeed.230400.linux=230400
-espino.menu.UploadSpeed.230400.macosx=230400
-espino.menu.UploadSpeed.230400.upload.speed=230400
-espino.menu.UploadSpeed.256000.windows=256000
-espino.menu.UploadSpeed.256000.upload.speed=256000
-espino.menu.UploadSpeed.460800.linux=460800
-espino.menu.UploadSpeed.460800.macosx=460800
-espino.menu.UploadSpeed.460800.upload.speed=460800
-espino.menu.UploadSpeed.512000.windows=512000
-espino.menu.UploadSpeed.512000.upload.speed=512000
-espino.menu.UploadSpeed.921600=921600
-espino.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-espinotee.name=ThaiEasyElec's ESPino
-espinotee.build.board=ESP8266_ESP13
-espinotee.build.variant=espinotee
-espinotee.upload.tool=esptool
-espinotee.upload.maximum_data_size=81920
-espinotee.upload.wait_for_upload_port=true
-espinotee.upload.erase_cmd=
-espinotee.serial.disableDTR=true
-espinotee.serial.disableRTS=true
-espinotee.build.mcu=esp8266
-espinotee.build.core=esp8266
-espinotee.build.spiffs_pagesize=256
-espinotee.build.debug_port=
-espinotee.build.debug_level=
-espinotee.menu.CpuFrequency.80=80 MHz
-espinotee.menu.CpuFrequency.80.build.f_cpu=80000000L
-espinotee.menu.CpuFrequency.160=160 MHz
-espinotee.menu.CpuFrequency.160.build.f_cpu=160000000L
-espinotee.menu.VTable.flash=Flash
-espinotee.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-espinotee.menu.VTable.heap=Heap
-espinotee.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-espinotee.menu.VTable.iram=IRAM
-espinotee.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-espinotee.upload.resetmethod=nodemcu
-espinotee.build.flash_mode=qio
-espinotee.build.flash_freq=40
-espinotee.menu.FlashSize.4M1M=4M (1M SPIFFS)
-espinotee.menu.FlashSize.4M1M.build.flash_size=4M
-espinotee.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-espinotee.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-espinotee.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-espinotee.menu.FlashSize.4M1M.upload.maximum_size=1044464
-espinotee.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-espinotee.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-espinotee.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-espinotee.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-espinotee.menu.FlashSize.4M2M=4M (2M SPIFFS)
-espinotee.menu.FlashSize.4M2M.build.flash_size=4M
-espinotee.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-espinotee.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-espinotee.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-espinotee.menu.FlashSize.4M2M.upload.maximum_size=1044464
-espinotee.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-espinotee.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-espinotee.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-espinotee.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-espinotee.menu.FlashSize.4M3M=4M (3M SPIFFS)
-espinotee.menu.FlashSize.4M3M.build.flash_size=4M
-espinotee.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-espinotee.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-espinotee.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-espinotee.menu.FlashSize.4M3M.upload.maximum_size=1044464
-espinotee.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-espinotee.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-espinotee.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-espinotee.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-espinotee.menu.LwIPVariant.v2mss536=v2 Lower Memory
-espinotee.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-espinotee.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-espinotee.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-espinotee.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-espinotee.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-espinotee.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-espinotee.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-espinotee.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-espinotee.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-espinotee.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-espinotee.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-espinotee.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-espinotee.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-espinotee.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-espinotee.menu.Debug.Disabled=Disabled
-espinotee.menu.Debug.Disabled.build.debug_port=
-espinotee.menu.Debug.Serial=Serial
-espinotee.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-espinotee.menu.Debug.Serial1=Serial1
-espinotee.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-espinotee.menu.DebugLevel.None____=None
-espinotee.menu.DebugLevel.None____.build.debug_level=
-espinotee.menu.DebugLevel.SSL=SSL
-espinotee.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-espinotee.menu.DebugLevel.TLS_MEM=TLS_MEM
-espinotee.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-espinotee.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-espinotee.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-espinotee.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-espinotee.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-espinotee.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-espinotee.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-espinotee.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-espinotee.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-espinotee.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espinotee.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-espinotee.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-espinotee.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-espinotee.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espinotee.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-espinotee.menu.DebugLevel.CORE=CORE
-espinotee.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-espinotee.menu.DebugLevel.WIFI=WIFI
-espinotee.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-espinotee.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-espinotee.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-espinotee.menu.DebugLevel.UPDATER=UPDATER
-espinotee.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-espinotee.menu.DebugLevel.OTA=OTA
-espinotee.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-espinotee.menu.DebugLevel.OOM=OOM
-espinotee.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-espinotee.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espinotee.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-espinotee.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-espinotee.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-espinotee.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-espinotee.menu.FlashErase.none=Only Sketch
-espinotee.menu.FlashErase.none.upload.erase_cmd=
-espinotee.menu.FlashErase.sdk=Sketch + WiFi Settings
-espinotee.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-espinotee.menu.FlashErase.all=All Flash Contents
-espinotee.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-espinotee.menu.UploadSpeed.115200=115200
-espinotee.menu.UploadSpeed.115200.upload.speed=115200
-espinotee.menu.UploadSpeed.9600=9600
-espinotee.menu.UploadSpeed.9600.upload.speed=9600
-espinotee.menu.UploadSpeed.57600=57600
-espinotee.menu.UploadSpeed.57600.upload.speed=57600
-espinotee.menu.UploadSpeed.230400.linux=230400
-espinotee.menu.UploadSpeed.230400.macosx=230400
-espinotee.menu.UploadSpeed.230400.upload.speed=230400
-espinotee.menu.UploadSpeed.256000.windows=256000
-espinotee.menu.UploadSpeed.256000.upload.speed=256000
-espinotee.menu.UploadSpeed.460800.linux=460800
-espinotee.menu.UploadSpeed.460800.macosx=460800
-espinotee.menu.UploadSpeed.460800.upload.speed=460800
-espinotee.menu.UploadSpeed.512000.windows=512000
-espinotee.menu.UploadSpeed.512000.upload.speed=512000
-espinotee.menu.UploadSpeed.921600=921600
-espinotee.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-wifinfo.name=WifInfo
-wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
-wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
-wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
-wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
-wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
-wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
-wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
-wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
-wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
-wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
-wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
-wifinfo.build.board=WIFINFO
-wifinfo.build.variant=wifinfo
-wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
-wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
-wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
-wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
-wifinfo.upload.tool=esptool
-wifinfo.upload.maximum_data_size=81920
-wifinfo.upload.wait_for_upload_port=true
-wifinfo.upload.erase_cmd=
-wifinfo.serial.disableDTR=true
-wifinfo.serial.disableRTS=true
-wifinfo.build.mcu=esp8266
-wifinfo.build.core=esp8266
-wifinfo.build.spiffs_pagesize=256
-wifinfo.build.debug_port=
-wifinfo.build.debug_level=
-wifinfo.menu.CpuFrequency.80=80 MHz
-wifinfo.menu.CpuFrequency.80.build.f_cpu=80000000L
-wifinfo.menu.CpuFrequency.160=160 MHz
-wifinfo.menu.CpuFrequency.160.build.f_cpu=160000000L
-wifinfo.menu.VTable.flash=Flash
-wifinfo.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-wifinfo.menu.VTable.heap=Heap
-wifinfo.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-wifinfo.menu.VTable.iram=IRAM
-wifinfo.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-wifinfo.upload.resetmethod=nodemcu
-wifinfo.build.flash_mode=qio
-wifinfo.menu.FlashFreq.40=40MHz
-wifinfo.menu.FlashFreq.40.build.flash_freq=40
-wifinfo.menu.FlashFreq.80=80MHz
-wifinfo.menu.FlashFreq.80.build.flash_freq=80
-wifinfo.menu.FlashSize.1M0=1M (no SPIFFS)
-wifinfo.menu.FlashSize.1M0.build.flash_size=1M
-wifinfo.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-wifinfo.menu.FlashSize.1M0.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M0.upload.maximum_size=1023984
-wifinfo.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M64=1M (64K SPIFFS)
-wifinfo.menu.FlashSize.1M64.build.flash_size=1M
-wifinfo.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-wifinfo.menu.FlashSize.1M64.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M64.upload.maximum_size=958448
-wifinfo.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-wifinfo.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M128=1M (128K SPIFFS)
-wifinfo.menu.FlashSize.1M128.build.flash_size=1M
-wifinfo.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-wifinfo.menu.FlashSize.1M128.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M128.upload.maximum_size=892912
-wifinfo.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-wifinfo.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M144=1M (144K SPIFFS)
-wifinfo.menu.FlashSize.1M144.build.flash_size=1M
-wifinfo.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-wifinfo.menu.FlashSize.1M144.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M144.upload.maximum_size=876528
-wifinfo.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-wifinfo.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M160=1M (160K SPIFFS)
-wifinfo.menu.FlashSize.1M160.build.flash_size=1M
-wifinfo.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-wifinfo.menu.FlashSize.1M160.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M160.upload.maximum_size=860144
-wifinfo.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-wifinfo.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M192=1M (192K SPIFFS)
-wifinfo.menu.FlashSize.1M192.build.flash_size=1M
-wifinfo.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-wifinfo.menu.FlashSize.1M192.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M192.upload.maximum_size=827376
-wifinfo.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-wifinfo.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M256=1M (256K SPIFFS)
-wifinfo.menu.FlashSize.1M256.build.flash_size=1M
-wifinfo.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-wifinfo.menu.FlashSize.1M256.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M256.upload.maximum_size=761840
-wifinfo.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-wifinfo.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-wifinfo.menu.FlashSize.1M512=1M (512K SPIFFS)
-wifinfo.menu.FlashSize.1M512.build.flash_size=1M
-wifinfo.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
-wifinfo.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-wifinfo.menu.FlashSize.1M512.build.spiffs_pagesize=256
-wifinfo.menu.FlashSize.1M512.upload.maximum_size=499696
-wifinfo.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
-wifinfo.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-wifinfo.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-wifinfo.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-wifinfo.menu.LwIPVariant.v2mss536=v2 Lower Memory
-wifinfo.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-wifinfo.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-wifinfo.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-wifinfo.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-wifinfo.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-wifinfo.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-wifinfo.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-wifinfo.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-wifinfo.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-wifinfo.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-wifinfo.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-wifinfo.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-wifinfo.menu.Debug.Disabled=Disabled
-wifinfo.menu.Debug.Disabled.build.debug_port=
-wifinfo.menu.Debug.Serial=Serial
-wifinfo.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-wifinfo.menu.Debug.Serial1=Serial1
-wifinfo.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-wifinfo.menu.DebugLevel.None____=None
-wifinfo.menu.DebugLevel.None____.build.debug_level=
-wifinfo.menu.DebugLevel.SSL=SSL
-wifinfo.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-wifinfo.menu.DebugLevel.TLS_MEM=TLS_MEM
-wifinfo.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-wifinfo.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-wifinfo.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-wifinfo.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-wifinfo.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-wifinfo.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-wifinfo.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-wifinfo.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-wifinfo.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-wifinfo.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifinfo.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifinfo.menu.DebugLevel.CORE=CORE
-wifinfo.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-wifinfo.menu.DebugLevel.WIFI=WIFI
-wifinfo.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-wifinfo.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-wifinfo.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-wifinfo.menu.DebugLevel.UPDATER=UPDATER
-wifinfo.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-wifinfo.menu.DebugLevel.OTA=OTA
-wifinfo.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-wifinfo.menu.DebugLevel.OOM=OOM
-wifinfo.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-wifinfo.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifinfo.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifinfo.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifinfo.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-wifinfo.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-wifinfo.menu.FlashErase.none=Only Sketch
-wifinfo.menu.FlashErase.none.upload.erase_cmd=
-wifinfo.menu.FlashErase.sdk=Sketch + WiFi Settings
-wifinfo.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-wifinfo.menu.FlashErase.all=All Flash Contents
-wifinfo.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-wifinfo.menu.UploadSpeed.115200=115200
-wifinfo.menu.UploadSpeed.115200.upload.speed=115200
-wifinfo.menu.UploadSpeed.9600=9600
-wifinfo.menu.UploadSpeed.9600.upload.speed=9600
-wifinfo.menu.UploadSpeed.57600=57600
-wifinfo.menu.UploadSpeed.57600.upload.speed=57600
-wifinfo.menu.UploadSpeed.230400.linux=230400
-wifinfo.menu.UploadSpeed.230400.macosx=230400
-wifinfo.menu.UploadSpeed.230400.upload.speed=230400
-wifinfo.menu.UploadSpeed.256000.windows=256000
-wifinfo.menu.UploadSpeed.256000.upload.speed=256000
-wifinfo.menu.UploadSpeed.460800.linux=460800
-wifinfo.menu.UploadSpeed.460800.macosx=460800
-wifinfo.menu.UploadSpeed.460800.upload.speed=460800
-wifinfo.menu.UploadSpeed.512000.windows=512000
-wifinfo.menu.UploadSpeed.512000.upload.speed=512000
-wifinfo.menu.UploadSpeed.921600=921600
-wifinfo.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-arduino-esp8266.name=Arduino
-arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
-arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
-arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
-arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
-arduino-esp8266.menu.BoardModel.primo=Primo
-arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
-arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
-arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
-arduino-esp8266.build.board=ESP8266_ARDUINO
-arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
-arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
-arduino-esp8266.upload.tool=esptool
-arduino-esp8266.upload.maximum_data_size=81920
-arduino-esp8266.upload.wait_for_upload_port=true
-arduino-esp8266.upload.erase_cmd=
-arduino-esp8266.serial.disableDTR=true
-arduino-esp8266.serial.disableRTS=true
-arduino-esp8266.build.mcu=esp8266
-arduino-esp8266.build.core=esp8266
-arduino-esp8266.build.variant=generic
-arduino-esp8266.build.spiffs_pagesize=256
-arduino-esp8266.build.debug_port=
-arduino-esp8266.build.debug_level=
-arduino-esp8266.menu.CpuFrequency.80=80 MHz
-arduino-esp8266.menu.CpuFrequency.80.build.f_cpu=80000000L
-arduino-esp8266.menu.CpuFrequency.160=160 MHz
-arduino-esp8266.menu.CpuFrequency.160.build.f_cpu=160000000L
-arduino-esp8266.menu.VTable.flash=Flash
-arduino-esp8266.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-arduino-esp8266.menu.VTable.heap=Heap
-arduino-esp8266.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-arduino-esp8266.menu.VTable.iram=IRAM
-arduino-esp8266.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-arduino-esp8266.upload.resetmethod=ck
-arduino-esp8266.build.flash_mode=qio
-arduino-esp8266.build.flash_freq=40
-arduino-esp8266.menu.FlashSize.4M1M=4M (1M SPIFFS)
-arduino-esp8266.menu.FlashSize.4M1M.build.flash_size=4M
-arduino-esp8266.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-arduino-esp8266.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-arduino-esp8266.menu.FlashSize.4M1M.upload.maximum_size=1044464
-arduino-esp8266.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-arduino-esp8266.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-arduino-esp8266.menu.FlashSize.4M2M=4M (2M SPIFFS)
-arduino-esp8266.menu.FlashSize.4M2M.build.flash_size=4M
-arduino-esp8266.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-arduino-esp8266.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-arduino-esp8266.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-arduino-esp8266.menu.FlashSize.4M2M.upload.maximum_size=1044464
-arduino-esp8266.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-arduino-esp8266.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-arduino-esp8266.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-arduino-esp8266.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-arduino-esp8266.menu.FlashSize.4M3M=4M (3M SPIFFS)
-arduino-esp8266.menu.FlashSize.4M3M.build.flash_size=4M
-arduino-esp8266.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-arduino-esp8266.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-arduino-esp8266.menu.FlashSize.4M3M.upload.maximum_size=1044464
-arduino-esp8266.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-arduino-esp8266.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-arduino-esp8266.menu.LwIPVariant.v2mss536=v2 Lower Memory
-arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-arduino-esp8266.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-arduino-esp8266.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-arduino-esp8266.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-arduino-esp8266.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-arduino-esp8266.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-arduino-esp8266.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-arduino-esp8266.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-arduino-esp8266.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-arduino-esp8266.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-arduino-esp8266.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-arduino-esp8266.menu.Debug.Disabled=Disabled
-arduino-esp8266.menu.Debug.Disabled.build.debug_port=
-arduino-esp8266.menu.Debug.Serial=Serial
-arduino-esp8266.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-arduino-esp8266.menu.Debug.Serial1=Serial1
-arduino-esp8266.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-arduino-esp8266.menu.DebugLevel.None____=None
-arduino-esp8266.menu.DebugLevel.None____.build.debug_level=
-arduino-esp8266.menu.DebugLevel.SSL=SSL
-arduino-esp8266.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-arduino-esp8266.menu.DebugLevel.TLS_MEM=TLS_MEM
-arduino-esp8266.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-arduino-esp8266.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-arduino-esp8266.menu.DebugLevel.CORE=CORE
-arduino-esp8266.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-arduino-esp8266.menu.DebugLevel.WIFI=WIFI
-arduino-esp8266.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-arduino-esp8266.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-arduino-esp8266.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-arduino-esp8266.menu.DebugLevel.UPDATER=UPDATER
-arduino-esp8266.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-arduino-esp8266.menu.DebugLevel.OTA=OTA
-arduino-esp8266.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-arduino-esp8266.menu.DebugLevel.OOM=OOM
-arduino-esp8266.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-arduino-esp8266.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-arduino-esp8266.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-arduino-esp8266.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-arduino-esp8266.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-arduino-esp8266.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-arduino-esp8266.menu.FlashErase.none=Only Sketch
-arduino-esp8266.menu.FlashErase.none.upload.erase_cmd=
-arduino-esp8266.menu.FlashErase.sdk=Sketch + WiFi Settings
-arduino-esp8266.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-arduino-esp8266.menu.FlashErase.all=All Flash Contents
-arduino-esp8266.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-arduino-esp8266.menu.UploadSpeed.115200=115200
-arduino-esp8266.menu.UploadSpeed.115200.upload.speed=115200
-arduino-esp8266.menu.UploadSpeed.9600=9600
-arduino-esp8266.menu.UploadSpeed.9600.upload.speed=9600
-arduino-esp8266.menu.UploadSpeed.57600=57600
-arduino-esp8266.menu.UploadSpeed.57600.upload.speed=57600
-arduino-esp8266.menu.UploadSpeed.230400.linux=230400
-arduino-esp8266.menu.UploadSpeed.230400.macosx=230400
-arduino-esp8266.menu.UploadSpeed.230400.upload.speed=230400
-arduino-esp8266.menu.UploadSpeed.256000.windows=256000
-arduino-esp8266.menu.UploadSpeed.256000.upload.speed=256000
-arduino-esp8266.menu.UploadSpeed.460800.linux=460800
-arduino-esp8266.menu.UploadSpeed.460800.macosx=460800
-arduino-esp8266.menu.UploadSpeed.460800.upload.speed=460800
-arduino-esp8266.menu.UploadSpeed.512000.windows=512000
-arduino-esp8266.menu.UploadSpeed.512000.upload.speed=512000
-arduino-esp8266.menu.UploadSpeed.921600=921600
-arduino-esp8266.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-gen4iod.name=4D Systems gen4 IoD Range
-gen4iod.build.board=GEN4_IOD
-gen4iod.build.f_cpu=160000000L
-gen4iod.build.variant=generic
-gen4iod.upload.tool=esptool
-gen4iod.upload.maximum_data_size=81920
-gen4iod.upload.wait_for_upload_port=true
-gen4iod.upload.erase_cmd=
-gen4iod.serial.disableDTR=true
-gen4iod.serial.disableRTS=true
-gen4iod.build.mcu=esp8266
-gen4iod.build.core=esp8266
-gen4iod.build.spiffs_pagesize=256
-gen4iod.build.debug_port=
-gen4iod.build.debug_level=
-gen4iod.menu.CpuFrequency.80=80 MHz
-gen4iod.menu.CpuFrequency.80.build.f_cpu=80000000L
-gen4iod.menu.CpuFrequency.160=160 MHz
-gen4iod.menu.CpuFrequency.160.build.f_cpu=160000000L
-gen4iod.menu.VTable.flash=Flash
-gen4iod.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-gen4iod.menu.VTable.heap=Heap
-gen4iod.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-gen4iod.menu.VTable.iram=IRAM
-gen4iod.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-gen4iod.upload.resetmethod=nodemcu
-gen4iod.build.flash_mode=dio
-gen4iod.build.flash_freq=80
-gen4iod.menu.FlashSize.512K0=512K (no SPIFFS)
-gen4iod.menu.FlashSize.512K0.build.flash_size=512K
-gen4iod.menu.FlashSize.512K0.build.flash_size_bytes=0x80000
-gen4iod.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
-gen4iod.menu.FlashSize.512K0.build.spiffs_pagesize=256
-gen4iod.menu.FlashSize.512K0.upload.maximum_size=499696
-gen4iod.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
-gen4iod.menu.FlashSize.512K32=512K (32K SPIFFS)
-gen4iod.menu.FlashSize.512K32.build.flash_size=512K
-gen4iod.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
-gen4iod.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
-gen4iod.menu.FlashSize.512K32.build.spiffs_pagesize=256
-gen4iod.menu.FlashSize.512K32.upload.maximum_size=466928
-gen4iod.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
-gen4iod.menu.FlashSize.512K32.build.spiffs_start=0x73000
-gen4iod.menu.FlashSize.512K32.build.spiffs_end=0x7B000
-gen4iod.menu.FlashSize.512K32.build.spiffs_blocksize=4096
-gen4iod.menu.FlashSize.512K64=512K (64K SPIFFS)
-gen4iod.menu.FlashSize.512K64.build.flash_size=512K
-gen4iod.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
-gen4iod.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
-gen4iod.menu.FlashSize.512K64.build.spiffs_pagesize=256
-gen4iod.menu.FlashSize.512K64.upload.maximum_size=434160
-gen4iod.menu.FlashSize.512K64.build.rfcal_addr=0x7C000
-gen4iod.menu.FlashSize.512K64.build.spiffs_start=0x6B000
-gen4iod.menu.FlashSize.512K64.build.spiffs_end=0x7B000
-gen4iod.menu.FlashSize.512K64.build.spiffs_blocksize=4096
-gen4iod.menu.FlashSize.512K128=512K (128K SPIFFS)
-gen4iod.menu.FlashSize.512K128.build.flash_size=512K
-gen4iod.menu.FlashSize.512K128.build.flash_size_bytes=0x80000
-gen4iod.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
-gen4iod.menu.FlashSize.512K128.build.spiffs_pagesize=256
-gen4iod.menu.FlashSize.512K128.upload.maximum_size=368624
-gen4iod.menu.FlashSize.512K128.build.rfcal_addr=0x7C000
-gen4iod.menu.FlashSize.512K128.build.spiffs_start=0x5B000
-gen4iod.menu.FlashSize.512K128.build.spiffs_end=0x7B000
-gen4iod.menu.FlashSize.512K128.build.spiffs_blocksize=4096
-gen4iod.menu.LwIPVariant.v2mss536=v2 Lower Memory
-gen4iod.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-gen4iod.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-gen4iod.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-gen4iod.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-gen4iod.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-gen4iod.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-gen4iod.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-gen4iod.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-gen4iod.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-gen4iod.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-gen4iod.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-gen4iod.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-gen4iod.menu.Debug.Disabled=Disabled
-gen4iod.menu.Debug.Disabled.build.debug_port=
-gen4iod.menu.Debug.Serial=Serial
-gen4iod.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-gen4iod.menu.Debug.Serial1=Serial1
-gen4iod.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-gen4iod.menu.DebugLevel.None____=None
-gen4iod.menu.DebugLevel.None____.build.debug_level=
-gen4iod.menu.DebugLevel.SSL=SSL
-gen4iod.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-gen4iod.menu.DebugLevel.TLS_MEM=TLS_MEM
-gen4iod.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-gen4iod.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-gen4iod.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-gen4iod.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-gen4iod.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-gen4iod.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-gen4iod.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-gen4iod.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-gen4iod.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-gen4iod.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-gen4iod.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-gen4iod.menu.DebugLevel.CORE=CORE
-gen4iod.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-gen4iod.menu.DebugLevel.WIFI=WIFI
-gen4iod.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-gen4iod.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-gen4iod.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-gen4iod.menu.DebugLevel.UPDATER=UPDATER
-gen4iod.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-gen4iod.menu.DebugLevel.OTA=OTA
-gen4iod.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-gen4iod.menu.DebugLevel.OOM=OOM
-gen4iod.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-gen4iod.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-gen4iod.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-gen4iod.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-gen4iod.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-gen4iod.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-gen4iod.menu.FlashErase.none=Only Sketch
-gen4iod.menu.FlashErase.none.upload.erase_cmd=
-gen4iod.menu.FlashErase.sdk=Sketch + WiFi Settings
-gen4iod.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-gen4iod.menu.FlashErase.all=All Flash Contents
-gen4iod.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-gen4iod.menu.UploadSpeed.115200=115200
-gen4iod.menu.UploadSpeed.115200.upload.speed=115200
-gen4iod.menu.UploadSpeed.9600=9600
-gen4iod.menu.UploadSpeed.9600.upload.speed=9600
-gen4iod.menu.UploadSpeed.57600=57600
-gen4iod.menu.UploadSpeed.57600.upload.speed=57600
-gen4iod.menu.UploadSpeed.230400.linux=230400
-gen4iod.menu.UploadSpeed.230400.macosx=230400
-gen4iod.menu.UploadSpeed.230400.upload.speed=230400
-gen4iod.menu.UploadSpeed.256000.windows=256000
-gen4iod.menu.UploadSpeed.256000.upload.speed=256000
-gen4iod.menu.UploadSpeed.460800.linux=460800
-gen4iod.menu.UploadSpeed.460800.macosx=460800
-gen4iod.menu.UploadSpeed.460800.upload.speed=460800
-gen4iod.menu.UploadSpeed.512000.windows=512000
-gen4iod.menu.UploadSpeed.512000.upload.speed=512000
-gen4iod.menu.UploadSpeed.921600=921600
-gen4iod.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-oak.name=Digistump Oak
-oak.build.board=ESP8266_OAK
-oak.build.variant=oak
-oak.upload.maximum_size=1040368
-oak.upload.tool=esptool
-oak.upload.maximum_data_size=81920
-oak.upload.wait_for_upload_port=true
-oak.upload.erase_cmd=
-oak.serial.disableDTR=true
-oak.serial.disableRTS=true
-oak.build.mcu=esp8266
-oak.build.core=esp8266
-oak.build.spiffs_pagesize=256
-oak.build.debug_port=
-oak.build.debug_level=
-oak.menu.CpuFrequency.80=80 MHz
-oak.menu.CpuFrequency.80.build.f_cpu=80000000L
-oak.menu.CpuFrequency.160=160 MHz
-oak.menu.CpuFrequency.160.build.f_cpu=160000000L
-oak.menu.VTable.flash=Flash
-oak.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-oak.menu.VTable.heap=Heap
-oak.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-oak.menu.VTable.iram=IRAM
-oak.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-oak.upload.resetmethod=none
-oak.build.flash_mode=dio
-oak.build.flash_freq=40
-oak.menu.FlashSize.4M1M=4M (1M SPIFFS)
-oak.menu.FlashSize.4M1M.build.flash_size=4M
-oak.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-oak.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-oak.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-oak.menu.FlashSize.4M1M.upload.maximum_size=1044464
-oak.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-oak.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-oak.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-oak.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-oak.menu.FlashSize.4M2M=4M (2M SPIFFS)
-oak.menu.FlashSize.4M2M.build.flash_size=4M
-oak.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-oak.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-oak.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-oak.menu.FlashSize.4M2M.upload.maximum_size=1044464
-oak.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-oak.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-oak.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-oak.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-oak.menu.FlashSize.4M3M=4M (3M SPIFFS)
-oak.menu.FlashSize.4M3M.build.flash_size=4M
-oak.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-oak.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-oak.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-oak.menu.FlashSize.4M3M.upload.maximum_size=1044464
-oak.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-oak.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-oak.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-oak.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-oak.menu.LwIPVariant.v2mss536=v2 Lower Memory
-oak.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-oak.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-oak.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-oak.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-oak.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-oak.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-oak.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-oak.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-oak.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-oak.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-oak.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-oak.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-oak.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-oak.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-oak.menu.Debug.Disabled=Disabled
-oak.menu.Debug.Disabled.build.debug_port=
-oak.menu.Debug.Serial=Serial
-oak.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-oak.menu.Debug.Serial1=Serial1
-oak.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-oak.menu.DebugLevel.None____=None
-oak.menu.DebugLevel.None____.build.debug_level=
-oak.menu.DebugLevel.SSL=SSL
-oak.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-oak.menu.DebugLevel.TLS_MEM=TLS_MEM
-oak.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-oak.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-oak.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-oak.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-oak.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-oak.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-oak.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-oak.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-oak.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-oak.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-oak.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-oak.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-oak.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-oak.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-oak.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-oak.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-oak.menu.DebugLevel.CORE=CORE
-oak.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-oak.menu.DebugLevel.WIFI=WIFI
-oak.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-oak.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-oak.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-oak.menu.DebugLevel.UPDATER=UPDATER
-oak.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-oak.menu.DebugLevel.OTA=OTA
-oak.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-oak.menu.DebugLevel.OOM=OOM
-oak.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-oak.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-oak.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-oak.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-oak.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-oak.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-oak.menu.FlashErase.none=Only Sketch
-oak.menu.FlashErase.none.upload.erase_cmd=
-oak.menu.FlashErase.sdk=Sketch + WiFi Settings
-oak.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-oak.menu.FlashErase.all=All Flash Contents
-oak.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-oak.menu.UploadSpeed.921600=921600
-oak.menu.UploadSpeed.921600.upload.speed=921600
-oak.menu.UploadSpeed.9600=9600
-oak.menu.UploadSpeed.9600.upload.speed=9600
-oak.menu.UploadSpeed.57600=57600
-oak.menu.UploadSpeed.57600.upload.speed=57600
-oak.menu.UploadSpeed.115200=115200
-oak.menu.UploadSpeed.115200.upload.speed=115200
-oak.menu.UploadSpeed.230400.linux=230400
-oak.menu.UploadSpeed.230400.macosx=230400
-oak.menu.UploadSpeed.230400.upload.speed=230400
-oak.menu.UploadSpeed.256000.windows=256000
-oak.menu.UploadSpeed.256000.upload.speed=256000
-oak.menu.UploadSpeed.460800.linux=460800
-oak.menu.UploadSpeed.460800.macosx=460800
-oak.menu.UploadSpeed.460800.upload.speed=460800
-oak.menu.UploadSpeed.512000.windows=512000
-oak.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-wifiduino.name=WiFiduino
-wifiduino.build.board=WIFIDUINO_ESP8266
-wifiduino.build.variant=wifiduino
-wifiduino.upload.tool=esptool
-wifiduino.upload.maximum_data_size=81920
-wifiduino.upload.wait_for_upload_port=true
-wifiduino.upload.erase_cmd=
-wifiduino.serial.disableDTR=true
-wifiduino.serial.disableRTS=true
-wifiduino.build.mcu=esp8266
-wifiduino.build.core=esp8266
-wifiduino.build.spiffs_pagesize=256
-wifiduino.build.debug_port=
-wifiduino.build.debug_level=
-wifiduino.menu.CpuFrequency.80=80 MHz
-wifiduino.menu.CpuFrequency.80.build.f_cpu=80000000L
-wifiduino.menu.CpuFrequency.160=160 MHz
-wifiduino.menu.CpuFrequency.160.build.f_cpu=160000000L
-wifiduino.menu.VTable.flash=Flash
-wifiduino.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-wifiduino.menu.VTable.heap=Heap
-wifiduino.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-wifiduino.menu.VTable.iram=IRAM
-wifiduino.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-wifiduino.upload.resetmethod=nodemcu
-wifiduino.build.flash_mode=dio
-wifiduino.build.flash_freq=40
-wifiduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
-wifiduino.menu.FlashSize.4M1M.build.flash_size=4M
-wifiduino.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-wifiduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-wifiduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-wifiduino.menu.FlashSize.4M1M.upload.maximum_size=1044464
-wifiduino.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-wifiduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-wifiduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-wifiduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-wifiduino.menu.FlashSize.4M2M=4M (2M SPIFFS)
-wifiduino.menu.FlashSize.4M2M.build.flash_size=4M
-wifiduino.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-wifiduino.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-wifiduino.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-wifiduino.menu.FlashSize.4M2M.upload.maximum_size=1044464
-wifiduino.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-wifiduino.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-wifiduino.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-wifiduino.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-wifiduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
-wifiduino.menu.FlashSize.4M3M.build.flash_size=4M
-wifiduino.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-wifiduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-wifiduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-wifiduino.menu.FlashSize.4M3M.upload.maximum_size=1044464
-wifiduino.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-wifiduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-wifiduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-wifiduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-wifiduino.menu.LwIPVariant.v2mss536=v2 Lower Memory
-wifiduino.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-wifiduino.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-wifiduino.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-wifiduino.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-wifiduino.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-wifiduino.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-wifiduino.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-wifiduino.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-wifiduino.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-wifiduino.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-wifiduino.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-wifiduino.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-wifiduino.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-wifiduino.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-wifiduino.menu.Debug.Disabled=Disabled
-wifiduino.menu.Debug.Disabled.build.debug_port=
-wifiduino.menu.Debug.Serial=Serial
-wifiduino.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-wifiduino.menu.Debug.Serial1=Serial1
-wifiduino.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-wifiduino.menu.DebugLevel.None____=None
-wifiduino.menu.DebugLevel.None____.build.debug_level=
-wifiduino.menu.DebugLevel.SSL=SSL
-wifiduino.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-wifiduino.menu.DebugLevel.TLS_MEM=TLS_MEM
-wifiduino.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-wifiduino.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-wifiduino.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-wifiduino.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-wifiduino.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-wifiduino.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-wifiduino.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-wifiduino.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-wifiduino.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-wifiduino.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifiduino.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifiduino.menu.DebugLevel.CORE=CORE
-wifiduino.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-wifiduino.menu.DebugLevel.WIFI=WIFI
-wifiduino.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-wifiduino.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-wifiduino.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-wifiduino.menu.DebugLevel.UPDATER=UPDATER
-wifiduino.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-wifiduino.menu.DebugLevel.OTA=OTA
-wifiduino.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-wifiduino.menu.DebugLevel.OOM=OOM
-wifiduino.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-wifiduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifiduino.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifiduino.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifiduino.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-wifiduino.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-wifiduino.menu.FlashErase.none=Only Sketch
-wifiduino.menu.FlashErase.none.upload.erase_cmd=
-wifiduino.menu.FlashErase.sdk=Sketch + WiFi Settings
-wifiduino.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-wifiduino.menu.FlashErase.all=All Flash Contents
-wifiduino.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-wifiduino.menu.UploadSpeed.921600=921600
-wifiduino.menu.UploadSpeed.921600.upload.speed=921600
-wifiduino.menu.UploadSpeed.9600=9600
-wifiduino.menu.UploadSpeed.9600.upload.speed=9600
-wifiduino.menu.UploadSpeed.57600=57600
-wifiduino.menu.UploadSpeed.57600.upload.speed=57600
-wifiduino.menu.UploadSpeed.115200=115200
-wifiduino.menu.UploadSpeed.115200.upload.speed=115200
-wifiduino.menu.UploadSpeed.230400.linux=230400
-wifiduino.menu.UploadSpeed.230400.macosx=230400
-wifiduino.menu.UploadSpeed.230400.upload.speed=230400
-wifiduino.menu.UploadSpeed.256000.windows=256000
-wifiduino.menu.UploadSpeed.256000.upload.speed=256000
-wifiduino.menu.UploadSpeed.460800.linux=460800
-wifiduino.menu.UploadSpeed.460800.macosx=460800
-wifiduino.menu.UploadSpeed.460800.upload.speed=460800
-wifiduino.menu.UploadSpeed.512000.windows=512000
-wifiduino.menu.UploadSpeed.512000.upload.speed=512000
-
-##############################################################
-wifi_slot.name=Amperka WiFi Slot
-wifi_slot.build.board=AMPERKA_WIFI_SLOT
-wifi_slot.build.variant=wifi_slot
-wifi_slot.upload.tool=esptool
-wifi_slot.upload.maximum_data_size=81920
-wifi_slot.upload.wait_for_upload_port=true
-wifi_slot.upload.erase_cmd=
-wifi_slot.serial.disableDTR=true
-wifi_slot.serial.disableRTS=true
-wifi_slot.build.mcu=esp8266
-wifi_slot.build.core=esp8266
-wifi_slot.build.spiffs_pagesize=256
-wifi_slot.build.debug_port=
-wifi_slot.build.debug_level=
-wifi_slot.menu.CpuFrequency.80=80 MHz
-wifi_slot.menu.CpuFrequency.80.build.f_cpu=80000000L
-wifi_slot.menu.CpuFrequency.160=160 MHz
-wifi_slot.menu.CpuFrequency.160.build.f_cpu=160000000L
-wifi_slot.menu.VTable.flash=Flash
-wifi_slot.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-wifi_slot.menu.VTable.heap=Heap
-wifi_slot.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-wifi_slot.menu.VTable.iram=IRAM
-wifi_slot.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-wifi_slot.upload.resetmethod=nodemcu
-wifi_slot.menu.FlashFreq.40=40MHz
-wifi_slot.menu.FlashFreq.40.build.flash_freq=40
-wifi_slot.menu.FlashFreq.80=80MHz
-wifi_slot.menu.FlashFreq.80.build.flash_freq=80
-wifi_slot.menu.FlashMode.qio=QIO
-wifi_slot.menu.FlashMode.qio.build.flash_mode=qio
-wifi_slot.menu.FlashMode.qout=QOUT
-wifi_slot.menu.FlashMode.qout.build.flash_mode=qout
-wifi_slot.menu.FlashMode.dio=DIO
-wifi_slot.menu.FlashMode.dio.build.flash_mode=dio
-wifi_slot.menu.FlashMode.dout=DOUT
-wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
-wifi_slot.menu.FlashSize.1M0=1M (no SPIFFS)
-wifi_slot.menu.FlashSize.1M0.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M0.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M0.build.flash_ld=eagle.flash.1m0.ld
-wifi_slot.menu.FlashSize.1M0.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M0.upload.maximum_size=1023984
-wifi_slot.menu.FlashSize.1M0.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M64=1M (64K SPIFFS)
-wifi_slot.menu.FlashSize.1M64.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M64.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
-wifi_slot.menu.FlashSize.1M64.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M64.upload.maximum_size=958448
-wifi_slot.menu.FlashSize.1M64.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M64.build.spiffs_start=0xEB000
-wifi_slot.menu.FlashSize.1M64.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M64.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M128=1M (128K SPIFFS)
-wifi_slot.menu.FlashSize.1M128.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M128.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
-wifi_slot.menu.FlashSize.1M128.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M128.upload.maximum_size=892912
-wifi_slot.menu.FlashSize.1M128.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M128.build.spiffs_start=0xDB000
-wifi_slot.menu.FlashSize.1M128.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M144=1M (144K SPIFFS)
-wifi_slot.menu.FlashSize.1M144.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M144.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
-wifi_slot.menu.FlashSize.1M144.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M144.upload.maximum_size=876528
-wifi_slot.menu.FlashSize.1M144.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M144.build.spiffs_start=0xD7000
-wifi_slot.menu.FlashSize.1M144.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M144.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M160=1M (160K SPIFFS)
-wifi_slot.menu.FlashSize.1M160.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M160.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
-wifi_slot.menu.FlashSize.1M160.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M160.upload.maximum_size=860144
-wifi_slot.menu.FlashSize.1M160.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M160.build.spiffs_start=0xD3000
-wifi_slot.menu.FlashSize.1M160.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M160.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M192=1M (192K SPIFFS)
-wifi_slot.menu.FlashSize.1M192.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M192.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
-wifi_slot.menu.FlashSize.1M192.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M192.upload.maximum_size=827376
-wifi_slot.menu.FlashSize.1M192.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M192.build.spiffs_start=0xCB000
-wifi_slot.menu.FlashSize.1M192.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M192.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M256=1M (256K SPIFFS)
-wifi_slot.menu.FlashSize.1M256.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M256.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
-wifi_slot.menu.FlashSize.1M256.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M256.upload.maximum_size=761840
-wifi_slot.menu.FlashSize.1M256.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M256.build.spiffs_start=0xBB000
-wifi_slot.menu.FlashSize.1M256.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-wifi_slot.menu.FlashSize.1M512=1M (512K SPIFFS)
-wifi_slot.menu.FlashSize.1M512.build.flash_size=1M
-wifi_slot.menu.FlashSize.1M512.build.flash_size_bytes=0x100000
-wifi_slot.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
-wifi_slot.menu.FlashSize.1M512.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.1M512.upload.maximum_size=499696
-wifi_slot.menu.FlashSize.1M512.build.rfcal_addr=0xFC000
-wifi_slot.menu.FlashSize.1M512.build.spiffs_start=0x7B000
-wifi_slot.menu.FlashSize.1M512.build.spiffs_end=0xFB000
-wifi_slot.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-wifi_slot.menu.FlashSize.2M=2M (1M SPIFFS)
-wifi_slot.menu.FlashSize.2M.build.flash_size=2M
-wifi_slot.menu.FlashSize.2M.build.flash_size_bytes=0x200000
-wifi_slot.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
-wifi_slot.menu.FlashSize.2M.build.spiffs_pagesize=256
-wifi_slot.menu.FlashSize.2M.upload.maximum_size=1044464
-wifi_slot.menu.FlashSize.2M.build.rfcal_addr=0x1FC000
-wifi_slot.menu.FlashSize.2M.build.spiffs_start=0x100000
-wifi_slot.menu.FlashSize.2M.build.spiffs_end=0x1FB000
-wifi_slot.menu.FlashSize.2M.build.spiffs_blocksize=8192
-wifi_slot.menu.LwIPVariant.v2mss536=v2 Lower Memory
-wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-wifi_slot.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-wifi_slot.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-wifi_slot.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-wifi_slot.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-wifi_slot.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-wifi_slot.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-wifi_slot.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-wifi_slot.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-wifi_slot.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-wifi_slot.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-wifi_slot.menu.Debug.Disabled=Disabled
-wifi_slot.menu.Debug.Disabled.build.debug_port=
-wifi_slot.menu.Debug.Serial=Serial
-wifi_slot.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-wifi_slot.menu.Debug.Serial1=Serial1
-wifi_slot.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-wifi_slot.menu.DebugLevel.None____=None
-wifi_slot.menu.DebugLevel.None____.build.debug_level=
-wifi_slot.menu.DebugLevel.SSL=SSL
-wifi_slot.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-wifi_slot.menu.DebugLevel.TLS_MEM=TLS_MEM
-wifi_slot.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-wifi_slot.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-wifi_slot.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-wifi_slot.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-wifi_slot.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-wifi_slot.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-wifi_slot.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-wifi_slot.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-wifi_slot.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-wifi_slot.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifi_slot.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wifi_slot.menu.DebugLevel.CORE=CORE
-wifi_slot.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-wifi_slot.menu.DebugLevel.WIFI=WIFI
-wifi_slot.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-wifi_slot.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-wifi_slot.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-wifi_slot.menu.DebugLevel.UPDATER=UPDATER
-wifi_slot.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-wifi_slot.menu.DebugLevel.OTA=OTA
-wifi_slot.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-wifi_slot.menu.DebugLevel.OOM=OOM
-wifi_slot.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-wifi_slot.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifi_slot.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wifi_slot.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wifi_slot.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-wifi_slot.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-wifi_slot.menu.FlashErase.none=Only Sketch
-wifi_slot.menu.FlashErase.none.upload.erase_cmd=
-wifi_slot.menu.FlashErase.sdk=Sketch + WiFi Settings
-wifi_slot.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-wifi_slot.menu.FlashErase.all=All Flash Contents
-wifi_slot.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-wifi_slot.menu.UploadSpeed.115200=115200
-wifi_slot.menu.UploadSpeed.115200.upload.speed=115200
-wifi_slot.menu.UploadSpeed.9600=9600
-wifi_slot.menu.UploadSpeed.9600.upload.speed=9600
-wifi_slot.menu.UploadSpeed.57600=57600
-wifi_slot.menu.UploadSpeed.57600.upload.speed=57600
-wifi_slot.menu.UploadSpeed.230400.linux=230400
-wifi_slot.menu.UploadSpeed.230400.macosx=230400
-wifi_slot.menu.UploadSpeed.230400.upload.speed=230400
-wifi_slot.menu.UploadSpeed.256000.windows=256000
-wifi_slot.menu.UploadSpeed.256000.upload.speed=256000
-wifi_slot.menu.UploadSpeed.460800.linux=460800
-wifi_slot.menu.UploadSpeed.460800.macosx=460800
-wifi_slot.menu.UploadSpeed.460800.upload.speed=460800
-wifi_slot.menu.UploadSpeed.512000.windows=512000
-wifi_slot.menu.UploadSpeed.512000.upload.speed=512000
-wifi_slot.menu.UploadSpeed.921600=921600
-wifi_slot.menu.UploadSpeed.921600.upload.speed=921600
-
-##############################################################
-wiolink.name=Seeed Wio Link
-wiolink.build.board=ESP8266_WIO_LINK
-wiolink.build.variant=wiolink
-wiolink.upload.tool=esptool
-wiolink.upload.maximum_data_size=81920
-wiolink.upload.wait_for_upload_port=true
-wiolink.upload.erase_cmd=
-wiolink.serial.disableDTR=true
-wiolink.serial.disableRTS=true
-wiolink.build.mcu=esp8266
-wiolink.build.core=esp8266
-wiolink.build.spiffs_pagesize=256
-wiolink.build.debug_port=
-wiolink.build.debug_level=
-wiolink.menu.CpuFrequency.80=80 MHz
-wiolink.menu.CpuFrequency.80.build.f_cpu=80000000L
-wiolink.menu.CpuFrequency.160=160 MHz
-wiolink.menu.CpuFrequency.160.build.f_cpu=160000000L
-wiolink.menu.VTable.flash=Flash
-wiolink.menu.VTable.flash.build.vtable_flags=-DVTABLES_IN_FLASH
-wiolink.menu.VTable.heap=Heap
-wiolink.menu.VTable.heap.build.vtable_flags=-DVTABLES_IN_DRAM
-wiolink.menu.VTable.iram=IRAM
-wiolink.menu.VTable.iram.build.vtable_flags=-DVTABLES_IN_IRAM
-wiolink.upload.resetmethod=nodemcu
-wiolink.build.flash_mode=qio
-wiolink.build.flash_freq=40
-wiolink.menu.FlashSize.4M1M=4M (1M SPIFFS)
-wiolink.menu.FlashSize.4M1M.build.flash_size=4M
-wiolink.menu.FlashSize.4M1M.build.flash_size_bytes=0x400000
-wiolink.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
-wiolink.menu.FlashSize.4M1M.build.spiffs_pagesize=256
-wiolink.menu.FlashSize.4M1M.upload.maximum_size=1044464
-wiolink.menu.FlashSize.4M1M.build.rfcal_addr=0x3FC000
-wiolink.menu.FlashSize.4M1M.build.spiffs_start=0x300000
-wiolink.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
-wiolink.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-wiolink.menu.FlashSize.4M2M=4M (2M SPIFFS)
-wiolink.menu.FlashSize.4M2M.build.flash_size=4M
-wiolink.menu.FlashSize.4M2M.build.flash_size_bytes=0x400000
-wiolink.menu.FlashSize.4M2M.build.flash_ld=eagle.flash.4m2m.ld
-wiolink.menu.FlashSize.4M2M.build.spiffs_pagesize=256
-wiolink.menu.FlashSize.4M2M.upload.maximum_size=1044464
-wiolink.menu.FlashSize.4M2M.build.rfcal_addr=0x3FC000
-wiolink.menu.FlashSize.4M2M.build.spiffs_start=0x200000
-wiolink.menu.FlashSize.4M2M.build.spiffs_end=0x3FB000
-wiolink.menu.FlashSize.4M2M.build.spiffs_blocksize=8192
-wiolink.menu.FlashSize.4M3M=4M (3M SPIFFS)
-wiolink.menu.FlashSize.4M3M.build.flash_size=4M
-wiolink.menu.FlashSize.4M3M.build.flash_size_bytes=0x400000
-wiolink.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
-wiolink.menu.FlashSize.4M3M.build.spiffs_pagesize=256
-wiolink.menu.FlashSize.4M3M.upload.maximum_size=1044464
-wiolink.menu.FlashSize.4M3M.build.rfcal_addr=0x3FC000
-wiolink.menu.FlashSize.4M3M.build.spiffs_start=0x100000
-wiolink.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
-wiolink.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
-wiolink.menu.LwIPVariant.v2mss536=v2 Lower Memory
-wiolink.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
-wiolink.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
-wiolink.menu.LwIPVariant.v2mss536.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536
-wiolink.menu.LwIPVariant.v2mss1460=v2 Higher Bandwidth
-wiolink.menu.LwIPVariant.v2mss1460.build.lwip_include=lwip2/include
-wiolink.menu.LwIPVariant.v2mss1460.build.lwip_lib=-llwip2_1460
-wiolink.menu.LwIPVariant.v2mss1460.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460
-wiolink.menu.LwIPVariant.Prebuilt=v1.4 Higher Bandwidth
-wiolink.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
-wiolink.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
-wiolink.menu.LwIPVariant.OpenSource=v1.4 Compile from source
-wiolink.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
-wiolink.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
-wiolink.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
-wiolink.menu.Debug.Disabled=Disabled
-wiolink.menu.Debug.Disabled.build.debug_port=
-wiolink.menu.Debug.Serial=Serial
-wiolink.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
-wiolink.menu.Debug.Serial1=Serial1
-wiolink.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
-wiolink.menu.DebugLevel.None____=None
-wiolink.menu.DebugLevel.None____.build.debug_level=
-wiolink.menu.DebugLevel.SSL=SSL
-wiolink.menu.DebugLevel.SSL.build.debug_level= -DDEBUG_ESP_SSL
-wiolink.menu.DebugLevel.TLS_MEM=TLS_MEM
-wiolink.menu.DebugLevel.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
-wiolink.menu.DebugLevel.HTTP_CLIENT=HTTP_CLIENT
-wiolink.menu.DebugLevel.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
-wiolink.menu.DebugLevel.HTTP_SERVER=HTTP_SERVER
-wiolink.menu.DebugLevel.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.SSLTLS_MEM=SSL+TLS_MEM
-wiolink.menu.DebugLevel.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
-wiolink.menu.DebugLevel.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
-wiolink.menu.DebugLevel.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
-wiolink.menu.DebugLevel.SSLHTTP_SERVER=SSL+HTTP_SERVER
-wiolink.menu.DebugLevel.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
-wiolink.menu.DebugLevel.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wiolink.menu.DebugLevel.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
-wiolink.menu.DebugLevel.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
-wiolink.menu.DebugLevel.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
-wiolink.menu.DebugLevel.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wiolink.menu.DebugLevel.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
-wiolink.menu.DebugLevel.CORE=CORE
-wiolink.menu.DebugLevel.CORE.build.debug_level= -DDEBUG_ESP_CORE
-wiolink.menu.DebugLevel.WIFI=WIFI
-wiolink.menu.DebugLevel.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
-wiolink.menu.DebugLevel.HTTP_UPDATE=HTTP_UPDATE
-wiolink.menu.DebugLevel.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
-wiolink.menu.DebugLevel.UPDATER=UPDATER
-wiolink.menu.DebugLevel.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
-wiolink.menu.DebugLevel.OTA=OTA
-wiolink.menu.DebugLevel.OTA.build.debug_level= -DDEBUG_ESP_OTA
-wiolink.menu.DebugLevel.OOM=OOM
-wiolink.menu.DebugLevel.OOM.build.debug_level= -DDEBUG_ESP_OOM
-wiolink.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wiolink.menu.DebugLevel.COREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM
-wiolink.menu.DebugLevel.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM
-wiolink.menu.DebugLevel.NoAssert-NDEBUG=NoAssert-NDEBUG
-wiolink.menu.DebugLevel.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
-wiolink.menu.FlashErase.none=Only Sketch
-wiolink.menu.FlashErase.none.upload.erase_cmd=
-wiolink.menu.FlashErase.sdk=Sketch + WiFi Settings
-wiolink.menu.FlashErase.sdk.upload.erase_cmd=-ca "{build.rfcal_addr}" -cz 0x4000
-wiolink.menu.FlashErase.all=All Flash Contents
-wiolink.menu.FlashErase.all.upload.erase_cmd=-ca 0x0 -cz "{build.flash_size_bytes}"
-wiolink.menu.UploadSpeed.115200=115200
-wiolink.menu.UploadSpeed.115200.upload.speed=115200
-wiolink.menu.UploadSpeed.9600=9600
-wiolink.menu.UploadSpeed.9600.upload.speed=9600
-wiolink.menu.UploadSpeed.57600=57600
-wiolink.menu.UploadSpeed.57600.upload.speed=57600
-wiolink.menu.UploadSpeed.230400.linux=230400
-wiolink.menu.UploadSpeed.230400.macosx=230400
-wiolink.menu.UploadSpeed.230400.upload.speed=230400
-wiolink.menu.UploadSpeed.256000.windows=256000
-wiolink.menu.UploadSpeed.256000.upload.speed=256000
-wiolink.menu.UploadSpeed.460800.linux=460800
-wiolink.menu.UploadSpeed.460800.macosx=460800
-wiolink.menu.UploadSpeed.460800.upload.speed=460800
-wiolink.menu.UploadSpeed.512000.windows=512000
-wiolink.menu.UploadSpeed.512000.upload.speed=512000
-wiolink.menu.UploadSpeed.921600=921600
-wiolink.menu.UploadSpeed.921600.upload.speed=921600
-

From d8e43829bc5501c561be4ba47ffa91bf8a28780b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:36:31 +0100
Subject: [PATCH 377/403] Delete platform.txt

---
 arduino/version 2.4.2/platform.txt | 143 -----------------------------
 1 file changed, 143 deletions(-)
 delete mode 100644 arduino/version 2.4.2/platform.txt

diff --git a/arduino/version 2.4.2/platform.txt b/arduino/version 2.4.2/platform.txt
deleted file mode 100644
index 097ec545c..000000000
--- a/arduino/version 2.4.2/platform.txt	
+++ /dev/null
@@ -1,143 +0,0 @@
-
-# ESP8266 platform
-# ------------------------------
-
-# For more info:
-# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
-
-name=ESP8266 Modules
-version=2.4.2
-
-
-
-
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-
-build.lwip_lib=-llwip_gcc
-build.lwip_include=lwip/include
-build.lwip_flags=-DLWIP_OPEN_SRC
-
-build.vtable_flags=-DVTABLES_IN_FLASH
-
-#build.float=-u _printf_float -u _scanf_float
-build.float=
-build.led=
-build.noextra4kheap=
-
-compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
-compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
-compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
-
-compiler.c.cmd=xtensa-lx106-elf-gcc
-compiler.c.flags=-c {compiler.warning_flags} {build.noextra4kheap} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
-
-compiler.S.cmd=xtensa-lx106-elf-gcc
-compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
-
-compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u app_entry {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
-
-compiler.c.elf.cmd=xtensa-lx106-elf-gcc
-compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -lbearssl -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 -lstdc++ -lm -lc -lgcc
-
-compiler.cpp.cmd=xtensa-lx106-elf-g++
-compiler.cpp.flags=-c {compiler.warning_flags} {build.noextra4kheap} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
-
-compiler.as.cmd=xtensa-lx106-elf-as
-
-compiler.ar.cmd=xtensa-lx106-elf-ar
-compiler.ar.flags=cru
-
-compiler.elf2hex.cmd=esptool
-compiler.elf2hex.flags=
-
-compiler.size.cmd=xtensa-lx106-elf-size
-
-compiler.esptool.cmd=esptool
-compiler.esptool.cmd.windows=esptool.exe
-
-# This can be overriden in boards.txt
-build.extra_flags=-DESP8266
-
-# These can be overridden in platform.local.txt
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.S.extra_flags=
-compiler.cpp.extra_flags=
-compiler.ar.extra_flags=
-compiler.objcopy.eep.extra_flags=
-compiler.elf2hex.extra_flags=
-
-## generate file with git version number
-## needs bash, git, and echo
-
-
-## windows-compatible version without git
-
-
-
-## Build the app.ld linker file
-recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld"
-
-## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Create archives
-recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"
-
-## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" -Wl,-Map "-Wl,{build.path}/{build.project_name}.map" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group  "-L{build.path}"
-
-## Create eeprom
-recipe.objcopy.eep.pattern=
-
-## Create hex
-#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
-
-recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
-
-## Save hex
-recipe.output.tmp_file={build.project_name}.bin
-recipe.output.save_file={build.project_name}.{build.variant}.bin
-
-## Compute size
-recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
-recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
-#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-
-# ------------------------------
-
-tools.esptool.cmd=esptool
-tools.esptool.cmd.windows=esptool.exe
-tools.esptool.path={runtime.tools.esptool.path}
-tools.esptool.network_cmd=python
-tools.esptool.network_cmd.windows=python.exe
-
-tools.esptool.upload.protocol=esp
-tools.esptool.upload.params.verbose=-vv
-tools.esptool.upload.params.quiet=
-tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" {upload.erase_cmd} -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
-tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
-
-tools.mkspiffs.cmd=mkspiffs
-tools.mkspiffs.cmd.windows=mkspiffs.exe
-tools.mkspiffs.path={runtime.tools.mkspiffs.path}
-
-tools.espupload.cmd=python
-tools.espupload.cmd.windows=python.exe
-tools.espupload.path={runtime.platform.path}/tools
-tools.espupload.upload.protocol=espupload
-tools.espupload.upload.params.verbose=
-tools.espupload.upload.params.quiet=
-tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"

From 9b8b8ca376d19963cb8160020665d2e21830a0fe Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:39:23 +0100
Subject: [PATCH 378/403] Delete esp8266.flash.1m0.ld

---
 esp8266.flash.1m0.ld | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 esp8266.flash.1m0.ld

diff --git a/esp8266.flash.1m0.ld b/esp8266.flash.1m0.ld
deleted file mode 100644
index 1f9b56a87..000000000
--- a/esp8266.flash.1m0.ld
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Flash Split for 1M chips */
-/* sketch 999KB */
-/* eeprom 20KB */
-
-MEMORY
-{
-  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
-  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = 0x8000
-  irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
-}
-
-PROVIDE ( _SPIFFS_start = 0x402FB000 );
-PROVIDE ( _SPIFFS_end = 0x402FB000 );
-PROVIDE ( _SPIFFS_page = 0 );
-PROVIDE ( _SPIFFS_block = 0 );
-
-INCLUDE "esp8266.flash.common.ld"

From 94dbc4d1a220489a5440aaf80ac279ae67deedbc Mon Sep 17 00:00:00 2001
From: Norbert Richter <norbert.richter@prsolution.eu>
Date: Sat, 29 Feb 2020 16:11:59 +0100
Subject: [PATCH 379/403] refactor TX2x sensor driver

---
 API.md                      |   2 +-
 BUILDS.md                   |   2 +-
 tasmota/language/bg-BG.h    |   2 -
 tasmota/language/cs-CZ.h    |   2 -
 tasmota/language/de-DE.h    |   2 -
 tasmota/language/el-GR.h    |   2 -
 tasmota/language/en-GB.h    |   2 -
 tasmota/language/es-ES.h    |   2 -
 tasmota/language/fr-FR.h    |   2 -
 tasmota/language/he-HE.h    |   2 -
 tasmota/language/hu-HU.h    |   2 -
 tasmota/language/it-IT.h    |   2 -
 tasmota/language/ko-KO.h    |   2 -
 tasmota/language/nl-NL.h    |   2 -
 tasmota/language/pl-PL.h    |   2 -
 tasmota/language/pt-BR.h    |   2 -
 tasmota/language/pt-PT.h    |   2 -
 tasmota/language/ru-RU.h    |   2 -
 tasmota/language/sk-SK.h    |   2 -
 tasmota/language/sv-SE.h    |   2 -
 tasmota/language/tr-TR.h    |   2 -
 tasmota/language/uk-UA.h    |   2 -
 tasmota/language/zh-CN.h    |   2 -
 tasmota/language/zh-TW.h    |   2 -
 tasmota/my_user_config.h    |   4 +-
 tasmota/support_tasmota.ino |   1 +
 tasmota/tasmota_post.h      |   4 +-
 tasmota/xsns_35_tx20.ino    | 418 ++++++++++++++++++++++++++++--------
 28 files changed, 336 insertions(+), 139 deletions(-)

diff --git a/API.md b/API.md
index 354382cfc..f10ae2c93 100644
--- a/API.md
+++ b/API.md
@@ -25,7 +25,7 @@ FUNC_EVERY_250_MSECOND      |      |  1   |  3   |  2   |      |
 FUNC_EVERY_SECOND           |      |  1   |  2   |      |      |
 FUNC_SAVE_AT_MIDNIGHT       |      |      |  x   |      |      | At midnight
 FUNC_SAVE_BEFORE_RESTART    |      |  2   |  1   |      |      | Just before a planned restart
-FUNC_AFTER_TELEPERIOD       |      |  x   |      |      |      | At end of teleperiod
+FUNC_AFTER_TELEPERIOD       |      |  2   |  1   |      |      | At end of teleperiod
 FUNC_JSON_APPEND            |      |  2   |  1   |  3   |      | Extend teleperiod JSON text
 FUNC_WEB_SENSOR             |      |  2   |  1   |  3   |      | Add sensor data to web GUI
 FUNC_COMMAND                |  x   |  1   |  2   |  3   |  4   | When a command is not recognized
diff --git a/BUILDS.md b/BUILDS.md
index d2ca20438..f09de3125 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -142,7 +142,7 @@
 | USE_SR04              | - | - | - | - | x | - | - |
 | USE_TM1638            | - | - | - | - | x | - | - |
 | USE_HX711             | - | - | - | - | x | - | - |
-| USE_TX20_WIND_SENSOR  | - | - | - | - | x | - | - |
+| USE_TX2x_WIND_SENSOR  | - | - | - | - | - | - | - |
 | USE_RC_SWITCH         | - | - | - | - | x | - | - |
 | USE_RF_SENSOR         | - | - | - | - | x | - | - | AlectoV2 only
 | USE_HRE               | - | - | - | - | x | - | - |
diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h
index 9a6ce8abc..b2b151644 100644
--- a/tasmota/language/bg-BG.h
+++ b/tasmota/language/bg-BG.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Посока на вятъра"
-#define D_TX20_WIND_DEGREES "Степени на вятъра"
 #define D_TX20_WIND_SPEED "Скорост на вятъра"
-#define D_TX20_WIND_SPEED_AVG "Средна скорост на вятъра"
 #define D_TX20_WIND_SPEED_MIN "Мини. скорост на вятъра"
 #define D_TX20_WIND_SPEED_MAX "Макс. скорост на вятъра"
 #define D_TX20_NORTH "С"
diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h
index d98361640..332a45920 100644
--- a/tasmota/language/cs-CZ.h
+++ b/tasmota/language/cs-CZ.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Směr větru"
-#define D_TX20_WIND_DEGREES "Úhel větru"
 #define D_TX20_WIND_SPEED "Rychlost větru"
-#define D_TX20_WIND_SPEED_AVG "Průměrná rychlost větru"
 #define D_TX20_WIND_SPEED_MIN "Minimální rychlost větru"
 #define D_TX20_WIND_SPEED_MAX "Maximální rychlost větru"
 #define D_TX20_NORTH "S"
diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h
index 05835a49c..1f534f27f 100644
--- a/tasmota/language/de-DE.h
+++ b/tasmota/language/de-DE.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Windrichtung"
-#define D_TX20_WIND_DEGREES "Windrichtung Grad"
 #define D_TX20_WIND_SPEED "Windgeschwindigkeit"
-#define D_TX20_WIND_SPEED_AVG "Windgeschwindigkeit Ø"
 #define D_TX20_WIND_SPEED_MIN "Windgeschwindigkeit Min"
 #define D_TX20_WIND_SPEED_MAX "Windgeschwindigkeit Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h
index 0ddd43918..fc540043e 100644
--- a/tasmota/language/el-GR.h
+++ b/tasmota/language/el-GR.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Κατεύθυνση ανέμου"
-#define D_TX20_WIND_DEGREES "Βαθμός ανέμου"
 #define D_TX20_WIND_SPEED "Ταχύτητα ανέμου"
-#define D_TX20_WIND_SPEED_AVG "Μέση ταχύτητα ανέμου"
 #define D_TX20_WIND_SPEED_MIN "Ελάχιστη ταχύτητα ανέμου"
 #define D_TX20_WIND_SPEED_MAX "Μέγιστη ταχύτητα ανέμου"
 #define D_TX20_NORTH "Β"
diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h
index b175cc193..e5a82f411 100644
--- a/tasmota/language/en-GB.h
+++ b/tasmota/language/en-GB.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
-#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
-#define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
 #define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h
index 12e732bc2..9331a3f62 100644
--- a/tasmota/language/es-ES.h
+++ b/tasmota/language/es-ES.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Dirección del Viento"
-#define D_TX20_WIND_DEGREES "Ángulo del Viento"
 #define D_TX20_WIND_SPEED "Vel. del Viento"
-#define D_TX20_WIND_SPEED_AVG "Vel. Prom. del Viento"
 #define D_TX20_WIND_SPEED_MIN "Vel. Min. del Viento"
 #define D_TX20_WIND_SPEED_MAX "Vel. Max. del Viento"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h
index e9c31da46..1ca53402e 100644
--- a/tasmota/language/fr-FR.h
+++ b/tasmota/language/fr-FR.h
@@ -504,9 +504,7 @@
 
 //xsns_35_TX20.ino
 #define D_TX20_WIND_DIRECTION "Direction du vent"
-#define D_TX20_WIND_DEGREES "Degré de vent"
 #define D_TX20_WIND_SPEED "Vitesse du vent"
-#define D_TX20_WIND_SPEED_AVG "Vitesse Moy."
 #define D_TX20_WIND_SPEED_MIN "Vitesse Min"
 #define D_TX20_WIND_SPEED_MAX "Vitesse Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h
index f836a92b9..a8f3ba572 100644
--- a/tasmota/language/he-HE.h
+++ b/tasmota/language/he-HE.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "כיוון הרוח"
-#define D_TX20_WIND_DEGREES "זווית הרוח"
 #define D_TX20_WIND_SPEED "מהירות הרוח"
-#define D_TX20_WIND_SPEED_AVG "מהירות הרוח ממוצעת"
 #define D_TX20_WIND_SPEED_MIN "מהירות הרוח היא מינימלית"
 #define D_TX20_WIND_SPEED_MAX "מהירות הרוח מקסימלית"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h
index da313caaa..2d888bd81 100644
--- a/tasmota/language/hu-HU.h
+++ b/tasmota/language/hu-HU.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Szélirány"
-#define D_TX20_WIND_DEGREES "Szél mértéke"
 #define D_TX20_WIND_SPEED "Szélsebesség"
-#define D_TX20_WIND_SPEED_AVG "Átlag szélsebesség"
 #define D_TX20_WIND_SPEED_MIN "Min. szélsebesség"
 #define D_TX20_WIND_SPEED_MAX "Max. szélsebesség"
 #define D_TX20_NORTH "É"
diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h
index efaecc1a5..3ec7e9773 100644
--- a/tasmota/language/it-IT.h
+++ b/tasmota/language/it-IT.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direzione Vento"
-#define D_TX20_WIND_DEGREES "Angolo Vento"
 #define D_TX20_WIND_SPEED "Velocità Vento"
-#define D_TX20_WIND_SPEED_AVG "Velocità Media Vento"
 #define D_TX20_WIND_SPEED_MIN "Velocità Minima Vento"
 #define D_TX20_WIND_SPEED_MAX "Velocità Massima Vento"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h
index 794b97e84..2377fadb1 100644
--- a/tasmota/language/ko-KO.h
+++ b/tasmota/language/ko-KO.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "풍향"
-#define D_TX20_WIND_DEGREES "바람 정도"
 #define D_TX20_WIND_SPEED "풍속"
-#define D_TX20_WIND_SPEED_AVG "평균 풍속"
 #define D_TX20_WIND_SPEED_MIN "풍속 최소"
 #define D_TX20_WIND_SPEED_MAX "풍속 최대"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h
index 288da67d5..24bdc17e6 100644
--- a/tasmota/language/nl-NL.h
+++ b/tasmota/language/nl-NL.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Windrichting"
-#define D_TX20_WIND_DEGREES "Wind graad"
 #define D_TX20_WIND_SPEED "Windsnelheid"
-#define D_TX20_WIND_SPEED_AVG "Windsnelheid gemiddeld"
 #define D_TX20_WIND_SPEED_MIN "Windsnelhied minimum"
 #define D_TX20_WIND_SPEED_MAX "Windsnelhied maximaal"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h
index e15ccbbc2..c96df7c95 100644
--- a/tasmota/language/pl-PL.h
+++ b/tasmota/language/pl-PL.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Kierunek"
-#define D_TX20_WIND_DEGREES "Grad"
 #define D_TX20_WIND_SPEED "Prędkość"
-#define D_TX20_WIND_SPEED_AVG "Średnia prędkość"
 #define D_TX20_WIND_SPEED_MIN "Minimalna prędkość"
 #define D_TX20_WIND_SPEED_MAX "Maksymalna prędkość"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h
index 9b24d05c8..38c1e4b48 100644
--- a/tasmota/language/pt-BR.h
+++ b/tasmota/language/pt-BR.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direção do vento"
-#define D_TX20_WIND_DEGREES "Ângulo do vento"
 #define D_TX20_WIND_SPEED "Velocidade do vento"
-#define D_TX20_WIND_SPEED_AVG "Velocidade média do vento"
 #define D_TX20_WIND_SPEED_MIN "Velocidade do vento Mínima"
 #define D_TX20_WIND_SPEED_MAX "Velocidade do vento Máxima"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h
index 9565fc7a5..4ed7d874d 100644
--- a/tasmota/language/pt-PT.h
+++ b/tasmota/language/pt-PT.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Direção do vento"
-#define D_TX20_WIND_DEGREES "Ângulo do vento"
 #define D_TX20_WIND_SPEED "Velocidade do vento"
-#define D_TX20_WIND_SPEED_AVG "Velocidade média do vento"
 #define D_TX20_WIND_SPEED_MIN "Velocidade mínima do vento"
 #define D_TX20_WIND_SPEED_MAX "Velocidade máxima do vento"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h
index 700958875..92307ba89 100644
--- a/tasmota/language/ru-RU.h
+++ b/tasmota/language/ru-RU.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
-#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
-#define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
 #define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h
index dbee001e9..327b4c11f 100644
--- a/tasmota/language/sk-SK.h
+++ b/tasmota/language/sk-SK.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Smer vetra"
-#define D_TX20_WIND_DEGREES "Uhol vetra"
 #define D_TX20_WIND_SPEED "Rýchlosť vetra"
-#define D_TX20_WIND_SPEED_AVG "Priemerná rýchlosť vetra"
 #define D_TX20_WIND_SPEED_MIN "Minimálna rýchlosť vetra"
 #define D_TX20_WIND_SPEED_MAX "Maximálna rýchlosť vetra"
 #define D_TX20_NORTH "S"
diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h
index a8e5aa6a8..30434d696 100644
--- a/tasmota/language/sv-SE.h
+++ b/tasmota/language/sv-SE.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Vindriktning"
-#define D_TX20_WIND_DEGREES "Vindvinkel"
 #define D_TX20_WIND_SPEED "Vindstyrka"
-#define D_TX20_WIND_SPEED_AVG "Vindstyrka medel"
 #define D_TX20_WIND_SPEED_MIN "Vindstyrka min"
 #define D_TX20_WIND_SPEED_MAX "Vindstyrka max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h
index 430289372..637899101 100644
--- a/tasmota/language/tr-TR.h
+++ b/tasmota/language/tr-TR.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
-#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
-#define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
 #define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h
index 2b4873e7a..0bf4736cb 100644
--- a/tasmota/language/uk-UA.h
+++ b/tasmota/language/uk-UA.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Напрям вітру"
-#define D_TX20_WIND_DEGREES "Кут вітру"
 #define D_TX20_WIND_SPEED "Швидкість вітру"
-#define D_TX20_WIND_SPEED_AVG "Середня швидкість вітру"
 #define D_TX20_WIND_SPEED_MIN "Мінімальна швидкість вітру"
 #define D_TX20_WIND_SPEED_MAX "Максимальна швидкість вітру"
 #define D_TX20_NORTH "Пн"
diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h
index 5a71e95dc..6e2621b4e 100644
--- a/tasmota/language/zh-CN.h
+++ b/tasmota/language/zh-CN.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "风向"
-#define D_TX20_WIND_DEGREES "风度"
 #define D_TX20_WIND_SPEED "风速"
-#define D_TX20_WIND_SPEED_AVG "平均风速"
 #define D_TX20_WIND_SPEED_MIN "最低风速"
 #define D_TX20_WIND_SPEED_MAX "最高风速"
 #define D_TX20_NORTH "北"
diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h
index 9883972f1..b5445a3f6 100644
--- a/tasmota/language/zh-TW.h
+++ b/tasmota/language/zh-TW.h
@@ -504,9 +504,7 @@
 
 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
-#define D_TX20_WIND_DEGREES "Wind Degrees"
 #define D_TX20_WIND_SPEED "Wind Speed"
-#define D_TX20_WIND_SPEED_AVG "Wind Speed Avg"
 #define D_TX20_WIND_SPEED_MIN "Wind Speed Min"
 #define D_TX20_WIND_SPEED_MAX "Wind Speed Max"
 #define D_TX20_NORTH "N"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 8fc58ac4d..06901fa12 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -627,8 +627,8 @@
 //  #define USE_HX711_GUI                          // Add optional web GUI to HX711 as scale (+1k8 code)
 
 // Select none or only one of the below defines
-//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+1k3 code)
-//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+1k4 code)
+//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+2k6/0k8 code)
+//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+2k7/1k code)
 
 //#define USE_RC_SWITCH                            // Add support for RF transceiver using library RcSwitch (+2k7 code, 460 iram)
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index ad9b38165..d7396267b 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -787,6 +787,7 @@ void PerformEverySecond(void)
 #endif  // USE_RULES
         }
 
+        XsnsCall(FUNC_AFTER_TELEPERIOD);
         XdrvCall(FUNC_AFTER_TELEPERIOD);
       }
     }
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 8f5038387..2e3ed1e26 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -230,8 +230,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_TM1638                               // Add support for TM1638 switches copying Switch1 .. Switch8 (+1k code)
 #define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
 //#define USE_HX711_GUI                            // Add optional web GUI to HX711 as scale (+1k8 code)
-//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+1k3 code)
-//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+1k4 code)
+//#define USE_TX20_WIND_SENSOR                     // Add support for La Crosse TX20 anemometer (+2k6/0k8 code)
+//#define USE_TX23_WIND_SENSOR                     // Add support for La Crosse TX23 anemometer (+2k7/1k code)
 #define USE_RC_SWITCH                            // Add support for RF transceiver using library RcSwitch (+2k7 code, 460 iram)
 #define USE_RF_SENSOR                            // Add support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
 //  #define USE_THEO_V2                            // Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver (+1k4 code)
diff --git a/tasmota/xsns_35_tx20.ino b/tasmota/xsns_35_tx20.ino
index 14fd5c9f9..69844fda4 100644
--- a/tasmota/xsns_35_tx20.ino
+++ b/tasmota/xsns_35_tx20.ino
@@ -18,10 +18,7 @@
 */
 
 #if defined(USE_TX20_WIND_SENSOR) || defined(USE_TX23_WIND_SENSOR)
-#if defined(USE_TX20_WIND_SENSOR) && defined(USE_TX23_WIND_SENSOR)
-#undef USE_TX20_WIND_SENSOR
-#warning **** use USE_TX20_WIND_SENSOR or USE_TX23_WIND_SENSOR but not both together, TX20 disabled ****
-#endif
+
 /*********************************************************************************************\
  * La Crosse TX20/TX23 Anemometer
  *
@@ -30,18 +27,39 @@
  * https://www.john.geek.nz/2011/07/la-crosse-tx20-anemometer-communication-protocol/
  * http://www.rd-1000.com/chpm78/lacrosse/Lacrosse_TX23_protocol.html
  * https://www.john.geek.nz/2012/08/la-crosse-tx23u-anemometer-communication-protocol/
- * 
+ *
  * TX23 RJ11 connection:
  *  1 yellow      - GND
  *  2 green       - NC
  *  3 red         - Vcc 3.3V
  *  4 black/brown - TxD Signal (GPIOxx)
+ *
+ * Reads speed and direction
+ *
+ * Calculate statistics:
+ *  speed avg/min/max
+ *  direction avg/min/max/range
+ *
+ * avg values are updated continuously (using exponentially weighted average)
+ * min/max/range values are reset after TelePeriod time or TX2X_WEIGHT_AVG_SAMPLE seconds
+ * (if TelePeriod is disabled)
+ *
+ * Statistic calculation can be disabled by defining USE_TX2X_WIND_SENSOR_NOSTATISTICS
+ * (saves 1k8)
 \*********************************************************************************************/
 
 #define XSNS_35                  35
 
+#if defined(USE_TX20_WIND_SENSOR) && defined(USE_TX23_WIND_SENSOR)
+#undef USE_TX20_WIND_SENSOR
+#warning **** use USE_TX20_WIND_SENSOR or USE_TX23_WIND_SENSOR but not both together, TX20 disabled ****
+#endif // USE_TX20_WIND_SENSOR && USE_TX23_WIND_SENSOR
+
+// #define USE_TX2X_WIND_SENSOR_NOSTATISTICS        // suppress statistics (speed/dir avg/min/max/range)
+
 #define TX2X_BIT_TIME          1220  // microseconds
 #define TX2X_WEIGHT_AVG_SAMPLE  150  // seconds
+#define TX2X_TIMEOUT             10  // seconds
 #define TX23_READ_INTERVAL        4  // seconds (don't use less than 3)
 
 // The Arduino standard GPIO routines are not enough,
@@ -51,20 +69,36 @@ extern "C" {
 }
 
 #ifdef USE_TX20_WIND_SENSOR
-  #define D_TX2x_NAME "TX20"
-#else 
-  #define D_TX2x_NAME "TX23"
-#endif
+#undef D_TX2x_NAME
+#define D_TX2x_NAME "TX20"
+#else  //  USE_TX20_WIND_SENSOR
+#undef D_TX2x_NAME
+#define D_TX2x_NAME "TX23"
+#endif  //  USE_TX20_WIND_SENSOR
 
 #ifdef USE_WEBSERVER
+#define D_TX20_WIND_AVG "&empty;"
+#define D_TX20_WIND_ANGLE "&ang;"
 const char HTTP_SNS_TX2X[] PROGMEM =
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED " " D_TX20_WIND_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MIN "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
    "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s %s&deg;{e}";
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s %s&deg;{e}"
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_AVG "{m}%s %s&deg;{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_ANGLE "{m}%s&deg; (%s&deg;,%s&deg;)";
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+   ;
 #endif  // USE_WEBSERVER
 
+// float saves 48 byte
+float const ff_pi           = 3.1415926535897932384626433;  // Pi
+float const ff_halfpi       = ff_pi / 2.0;
+float const ff_pi180        = ff_pi / 180.0;
+
 const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
                                        D_TX20_NORTH D_TX20_EAST "|"
@@ -82,26 +116,38 @@ const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_WEST "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
 
-uint8_t tx2x_sa = 0;
-uint8_t tx2x_sb = 0;
-uint8_t tx2x_sd = 0;
-uint8_t tx2x_se = 0;
-uint16_t tx2x_sc = 0;
-uint16_t tx2x_sf = 0;
-
 float tx2x_wind_speed_kmh = 0;
+int32_t tx2x_wind_direction = 0;
+
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
 float tx2x_wind_speed_min = 200.0;
 float tx2x_wind_speed_max = 0;
 float tx2x_wind_speed_avg = 0;
-uint8_t tx2x_wind_direction = 0;
-int tx2x_count = 0;
-uint16_t tx2x_avg_samples;
+float tx2x_wind_direction_avg_x = 0;
+float tx2x_wind_direction_avg_y = 0;
+float tx2x_wind_direction_avg = 0;
+int32_t tx2x_wind_direction_min = 0;
+int32_t tx2x_wind_direction_max = 0;
 
-bool tx2x_available = false;
+uint32_t tx2x_count = 0;
+uint32_t tx2x_avg_samples;
+uint32_t last_uptime = 0;
+bool tx2x_valuesread = false;
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+
+#ifdef DEBUG_TASMOTA_SENSOR
+uint32_t tx2x_sa = 0;
+uint32_t tx2x_sb = 0;
+uint32_t tx2x_sc = 0;
+uint32_t tx2x_sd = 0;
+uint32_t tx2x_se = 0;
+uint32_t tx2x_sf = 0;
+#endif  // DEBUG_TASMOTA_SENSOR
+uint32_t last_available = 0;
 
 #ifdef USE_TX23_WIND_SENSOR
-uint8_t tx23_stage = 0;
-#endif
+uint32_t tx23_stage = 0;
+#endif  // USE_TX23_WIND_SENSOR
 
 #ifndef ARDUINO_ESP8266_RELEASE_2_3_0      // Fix core 2.5.x ISR not in IRAM Exception
 void TX2xStartRead(void) ICACHE_RAM_ATTR;  // As iram is tight and it works this way too
@@ -120,7 +166,7 @@ void TX2xStartRead(void)
    * sd - Checksum (invert)
    * se - Wind direction 0 - 15
    * sf - Wind speed 0 - 511
-   * 
+   *
    * La Crosse TX23 Anemometer datagram after setting TxD to low/high
    * 1-1 0 1 0-0 11011 0011 111010101111 0101 1100 000101010000 1-1 - Received pin data at 1200 uSec per bit
    *     t s c   sa    sb   sc           sd   se   sf
@@ -139,23 +185,30 @@ void TX2xStartRead(void)
   {
     if ((2==tx23_stage) || (3==tx23_stage))
     {
-#endif
-      tx2x_available = false;
-
+#endif  // USE_TX23_WIND_SENSOR
+#ifdef DEBUG_TASMOTA_SENSOR
       tx2x_sa = 0;
       tx2x_sb = 0;
+      tx2x_sc = 0;
       tx2x_sd = 0;
       tx2x_se = 0;
-      tx2x_sc = 0;
       tx2x_sf = 0;
+#else  // DEBUG_TASMOTA_SENSOR
+      uint32_t tx2x_sa = 0;
+      uint32_t tx2x_sb = 0;
+      uint32_t tx2x_sc = 0;
+      uint32_t tx2x_sd = 0;
+      uint32_t tx2x_se = 0;
+      uint32_t tx2x_sf = 0;
+#endif  // DEBUG_TASMOTA_SENSOR
 
       delayMicroseconds(TX2X_BIT_TIME / 2);
 
       for (int32_t bitcount = 41; bitcount > 0; bitcount--) {
-        uint8_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
+        uint32_t dpin = (digitalRead(pin[GPIO_TX2X_TXD_BLACK]));
 #ifdef USE_TX23_WIND_SENSOR
         dpin ^= 1;
-#endif
+#endif  // USE_TX23_WIND_SENSOR
         if (bitcount > 41 - 5) {
           // start frame (invert)
           tx2x_sa = (tx2x_sa << 1) | (dpin ^ 1);
@@ -178,27 +231,64 @@ void TX2xStartRead(void)
         delayMicroseconds(TX2X_BIT_TIME);
       }
 
-      uint8_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
+      uint32_t chk = (tx2x_sb + (tx2x_sc & 0xf) + ((tx2x_sc >> 4) & 0xf) + ((tx2x_sc >> 8) & 0xf));
       chk &= 0xf;
 
-      // check checksum, non-inverted with inverted values and max. speed
-      tx2x_available = ((chk == tx2x_sd) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511));
+      // check checksum, start frame,non-inverted==inverted values and max. speed
+      ;
+      if ((chk == tx2x_sd) && (0x1b==tx2x_sa) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
+        last_available = uptime;
+        // Wind speed spec: 0 to 180 km/h (0 to 50 m/s)
+        tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+        tx2x_wind_direction = tx2x_sb;
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+        if (!tx2x_valuesread) {
+          tx2x_wind_direction_min = tx2x_wind_direction;
+          tx2x_wind_direction_max = tx2x_wind_direction;
+          tx2x_valuesread = true;
+        }
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+      }
+
 #ifdef USE_TX23_WIND_SENSOR
     }
     tx23_stage++;
   }
-#endif
+#endif  // USE_TX23_WIND_SENSOR
 
   // Must clear this bit in the interrupt register,
   // it gets set even when interrupts are disabled
   GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << pin[GPIO_TX2X_TXD_BLACK]);
 }
 
-void Tx2xResetStat(void) 
+bool Tx2xAvailable(void)
 {
-  tx2x_wind_speed_min = tx2x_wind_speed_kmh;
-  tx2x_wind_speed_max = tx2x_wind_speed_kmh;
-  uint16_t tx2x_prev_avg_samples = tx2x_avg_samples;
+  return ((uptime - last_available) < TX2X_TIMEOUT);
+}
+
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+float atan2f(float a, float b)
+{
+    float atan2val;
+    if (b > 0) {
+        atan2val = atanf(a/b);
+    } else if ((b < 0) && (a >= 0)) {
+        atan2val = atanf(a/b) + ff_pi;
+    } else if ((b < 0) && (a < 0)) {
+        atan2val = atanf(a/b) - ff_pi;
+    } else if ((b == 0) && (a > 0)) {
+        atan2val = ff_halfpi;
+    } else if ((b == 0) && (a < 0)) {
+        atan2val = 0 - (ff_halfpi);
+    } else if ((b == 0) && (a == 0)) {
+        atan2val = 1000;               //represents undefined
+    }
+    return atan2val;
+}
+
+void Tx2xCheckSampleCount(void)
+{
+  uint32_t tx2x_prev_avg_samples = tx2x_avg_samples;
   if (Settings.tele_period) {
     // number for avg samples = teleperiod value if set
     tx2x_avg_samples = Settings.tele_period;
@@ -212,6 +302,23 @@ void Tx2xResetStat(void)
   }
 }
 
+void Tx2xResetStat(void)
+{
+  DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": reset statistics"));
+  last_uptime = uptime;
+  Tx2xResetStatData();
+}
+
+void Tx2xResetStatData(void)
+{
+  tx2x_wind_speed_min = tx2x_wind_speed_kmh;
+  tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+
+  tx2x_wind_direction_min = tx2x_wind_direction;
+  tx2x_wind_direction_max = tx2x_wind_direction;
+}
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+
 void Tx2xRead(void)
 {
 #ifdef USE_TX23_WIND_SENSOR
@@ -220,7 +327,7 @@ void Tx2xRead(void)
   //            |____| |___________|   |_|   |__XXXXXXXXXX
   //           trigger  start conv  Startframe  Data
   //
-  // note: TX23 speed calculation is unstable when conversion starts 
+  // note: TX23 speed calculation is unstable when conversion starts
   //       less than 2 seconds after last request
   if ((uptime % TX23_READ_INTERVAL)==0) {
     // TX23 start transmission by pulling down TxD line for at minimum 500ms
@@ -234,22 +341,21 @@ void Tx2xRead(void)
     tx23_stage = 1; // first rising signal is invalid
     pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT_PULLUP);
   }
-#endif
-  if (0!=Settings.tele_period && Settings.tele_period!=tx2x_avg_samples) {
-    // new teleperiod value
-    Tx2xResetStat();
-  }
-  if (tx2x_available) {
-    // Wind speed spec: 0 to 180 km/h (0 to 50 m/s)
-    tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+#endif  // USE_TX23_WIND_SENSOR
+  if (Tx2xAvailable()) {
+#ifdef DEBUG_TASMOTA_SENSOR
+    DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": sa=0x%02lx sb=%ld (0x%02lx), sc=%ld (0x%03lx), sd=0x%02lx, se=%ld, sf=%ld"), tx2x_sa,tx2x_sb,tx2x_sb,tx2x_sc,tx2x_sc,tx2x_sd,tx2x_se,tx2x_sf);
+#endif  // DEBUG_TASMOTA_SENSOR
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
     if (tx2x_wind_speed_kmh < tx2x_wind_speed_min) {
       tx2x_wind_speed_min = tx2x_wind_speed_kmh;
     }
     if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
       tx2x_wind_speed_max = tx2x_wind_speed_kmh;
     }
-    // exponentially weighted average is not quite as smooth as the arithmetic average 
-    // but close enough to the moving average and does not require the regular reset 
+
+    // exponentially weighted average is not quite as smooth as the arithmetic average
+    // but close enough to the moving average and does not require the regular reset
     // of the divider with the associated jump in avg values after period is over
     if (tx2x_count <= tx2x_avg_samples) {
       tx2x_count++;
@@ -257,72 +363,200 @@ void Tx2xRead(void)
     tx2x_wind_speed_avg -= tx2x_wind_speed_avg / tx2x_count;
     tx2x_wind_speed_avg += tx2x_wind_speed_kmh / tx2x_count;
 
-    tx2x_wind_direction = tx2x_sb;
-
-    if (!(uptime % tx2x_avg_samples)) {
-      tx2x_wind_speed_min = tx2x_wind_speed_kmh;
-      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
-
+    tx2x_wind_direction_avg_x -= tx2x_wind_direction_avg_x / tx2x_count;
+    tx2x_wind_direction_avg_x += cosf((tx2x_wind_direction*22.5) * ff_pi180) / tx2x_count;
+    tx2x_wind_direction_avg_y -= tx2x_wind_direction_avg_y / tx2x_count;
+    tx2x_wind_direction_avg_y += sinf((tx2x_wind_direction*22.5) * ff_pi180) / tx2x_count;
+    tx2x_wind_direction_avg = atan2f(tx2x_wind_direction_avg_y, tx2x_wind_direction_avg_x) * 180.0f / ff_pi;
+    if (tx2x_wind_direction_avg<0.0) {
+      tx2x_wind_direction_avg += 360.0;
     }
+    if (tx2x_wind_direction_avg>360.0) {
+      tx2x_wind_direction_avg -= 360.0;
+    }
+
+    int32_t tx2x_wind_direction_avg_int = int((tx2x_wind_direction_avg/22.5)+0.5) % 16;
+
+    // degrees min/max
+    if (tx2x_wind_direction > tx2x_wind_direction_avg_int) {
+      // clockwise or left-handed rotation
+      if ((tx2x_wind_direction-tx2x_wind_direction_avg_int)>8) {
+        // diff > 180°
+        if ((tx2x_wind_direction - 16) < tx2x_wind_direction_min) {
+          // new min (negative values < 0)
+          tx2x_wind_direction_min = tx2x_wind_direction - 16;
+        }
+      } else {
+        // diff <= 180°
+        if (tx2x_wind_direction > tx2x_wind_direction_max) {
+          // new max (origin max)
+          tx2x_wind_direction_max = tx2x_wind_direction;
+        }
+      }
+    } else {
+      // also clockwise or left-handed rotation but needs other tests
+      if ((tx2x_wind_direction_avg_int-tx2x_wind_direction)>8) {
+        // diff > 180°
+        if ((tx2x_wind_direction + 16) > tx2x_wind_direction_max) {
+          // new max (overflow values > 15)
+          tx2x_wind_direction_max = tx2x_wind_direction + 16;
+        }
+      } else {
+        // diff <= 180°
+        if (tx2x_wind_direction < tx2x_wind_direction_min) {
+          // new min (origin min)
+          tx2x_wind_direction_min = tx2x_wind_direction;
+        }
+      }
+    }
+
+#ifdef DEBUG_TASMOTA_SENSOR
+    char diravg[33];
+    dtostrfd(tx2x_wind_direction_avg, 1, diravg);
+    char cosx[33];
+    dtostrfd(tx2x_wind_direction_avg_x, 1, cosx);
+    char siny[33];
+    dtostrfd(tx2x_wind_direction_avg_y, 1, siny);
+    DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": dir stat - counter=%ld, actint=%ld, avgint=%ld, avg=%s (cosx=%s, siny=%s), min %d, max %d"),
+      (uptime-last_uptime),
+      tx2x_wind_direction,
+      tx2x_wind_direction_avg_int,
+      diravg,
+      cosx,
+      siny,
+      tx2x_wind_direction_min,
+      tx2x_wind_direction_max
+    );
+#endif  // DEBUG_TASMOTA_SENSOR
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+  } else {
+    DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": not available"));
+    tx2x_wind_speed_kmh = 0;
+    tx2x_wind_direction = 0;
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+    tx2x_wind_speed_avg = 0;
+    tx2x_wind_direction_avg = 0;
+    Tx2xResetStatData();
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
   }
+
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+  Tx2xCheckSampleCount();
+  if (0==Settings.tele_period && (uptime-last_uptime)>=tx2x_avg_samples) {
+    Tx2xResetStat();
+  }
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 }
 
-void Tx2xInit(void) 
+void Tx2xInit(void)
 {
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+  tx2x_valuesread = false;
   Tx2xResetStat();
+  Tx2xCheckSampleCount();
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 #ifdef USE_TX23_WIND_SENSOR
   tx23_stage = 0;
   pinMode(pin[GPIO_TX2X_TXD_BLACK], OUTPUT);
   digitalWrite(pin[GPIO_TX2X_TXD_BLACK], LOW);
-#else
+#else  // USE_TX23_WIND_SENSOR
   pinMode(pin[GPIO_TX2X_TXD_BLACK], INPUT);
-#endif
+#endif // USE_TX23_WIND_SENSOR
   attachInterrupt(pin[GPIO_TX2X_TXD_BLACK], TX2xStartRead, RISING);
 }
 
+int32_t Tx2xNormalize(int32_t value)
+{
+  while (value>15) {
+    value -= 16;
+  }
+  while (value<0) {
+    value += 16;
+  }
+  return value;
+}
+
 void Tx2xShow(bool json)
 {
-  char wind_speed_string[33];
+  char wind_speed_string[17];
   dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
-  char wind_speed_min_string[33];
+  char wind_direction_string[17];
+  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_string);
+  char wind_direction_cardinal_string[4];
+  GetTextIndexed(wind_direction_cardinal_string, sizeof(wind_direction_cardinal_string), tx2x_wind_direction, kTx2xDirections);
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+  char wind_speed_min_string[17];
   dtostrfd(tx2x_wind_speed_min, 1, wind_speed_min_string);
-  char wind_speed_max_string[33];
+  char wind_speed_max_string[17];
   dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
-  char wind_speed_avg_string[33];
+  char wind_speed_avg_string[17];
   dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
-  char wind_direction_degree_string[33];
-  dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_degree_string);
-  char wind_direction_string[4];
-  GetTextIndexed(wind_direction_string, sizeof(wind_direction_string), tx2x_wind_direction, kTx2xDirections);
+  char wind_direction_avg_string[17];
+  dtostrfd(tx2x_wind_direction_avg, 1, wind_direction_avg_string);
+  char wind_direction_avg_cardinal_string[4];
+  GetTextIndexed(wind_direction_avg_cardinal_string, sizeof(wind_direction_avg_cardinal_string), int((tx2x_wind_direction_avg/22.5f)+0.5f) % 16, kTx2xDirections);
+  char wind_direction_range_string[17];
+  dtostrfd(Tx2xNormalize(tx2x_wind_direction_max-tx2x_wind_direction_min)*22.5, 1, wind_direction_range_string);
+  char wind_direction_min_string[17];
+  dtostrfd(Tx2xNormalize(tx2x_wind_direction_min)*22.5, 1, wind_direction_min_string);
+  char wind_direction_max_string[17];
+  dtostrfd(Tx2xNormalize(tx2x_wind_direction_max)*22.5, 1, wind_direction_max_string);
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 
   if (json) {
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
 #ifdef USE_TX2x_LEGACY_JSON
-    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
-      wind_speed_string, wind_speed_avg_string, wind_speed_max_string, wind_direction_string, wind_direction_degree);
-#else
-    // new format grouped by Speed and Dir(ection)
-    // Card = cardianal (N../O../S../W..)
-    // Deg = Degree
-    ResponseAppend_P(
-      PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Direction\":{\"Cardinal\":\"%s\",\"Degree\":%s}}"),
-      wind_speed_string, 
-      wind_speed_avg_string, 
-      wind_speed_min_string, 
-      wind_speed_max_string, 
-      wind_direction_string, 
-      wind_direction_degree_string
+    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"):PSTR(""),
+      wind_speed_string,
+      wind_speed_avg_string,
+      wind_speed_max_string,
+      wind_direction_cardinal_string,
+      wind_direction_string
     );
-#endif
+#else  // USE_TX2x_LEGACY_JSON
+    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s,\"Avg\":%s,\"AvgCard\":\"%s\",\"Min\":%s,\"Max\":%s,\"Range\":%s}}"):PSTR(""),
+      wind_speed_string,
+      wind_speed_avg_string,
+      wind_speed_min_string,
+      wind_speed_max_string,
+      wind_direction_cardinal_string,
+      wind_direction_string,
+      wind_direction_avg_string,
+      wind_direction_avg_cardinal_string,
+      wind_direction_min_string,
+      wind_direction_max_string,
+      wind_direction_range_string
+    );
+#endif  // USE_TX2x_LEGACY_JSON
+#else  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+#ifdef USE_TX2x_LEGACY_JSON
+    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"Direction\":\"%s\",\"Degree\":%s}"):PSTR(""),
+      wind_speed_string, wind_direction_cardinal_string, wind_direction_string);
+#else  // USE_TX2x_LEGACY_JSON
+    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s}}"):PSTR(""),
+      wind_speed_string, wind_direction_cardinal_string, wind_direction_string);
+#endif  // USE_TX2x_LEGACY_JSON
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+
 #ifdef USE_WEBSERVER
   } else {
     WSContentSend_PD(
-      HTTP_SNS_TX2X, 
-      wind_speed_string, 
-      wind_speed_avg_string, 
-      wind_speed_min_string, 
-      wind_speed_max_string, 
-      wind_direction_string, 
-      wind_direction_degree_string
+      Tx2xAvailable()?HTTP_SNS_TX2X:PSTR(""),
+      wind_speed_string,
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+      wind_speed_avg_string,
+      wind_speed_min_string,
+      wind_speed_max_string,
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
+      wind_direction_cardinal_string,
+      wind_direction_string
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+      ,wind_direction_avg_cardinal_string,
+      wind_direction_avg_string,
+      wind_direction_range_string,
+      wind_direction_min_string,
+      wind_direction_max_string
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
     );
 #endif  // USE_WEBSERVER
   }
@@ -344,6 +578,11 @@ bool Xsns35(uint8_t function)
       case FUNC_EVERY_SECOND:
         Tx2xRead();
         break;
+#ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
+      case FUNC_AFTER_TELEPERIOD:
+        Tx2xResetStat();
+        break;
+#endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
       case FUNC_JSON_APPEND:
         Tx2xShow(true);
         break;
@@ -352,6 +591,7 @@ bool Xsns35(uint8_t function)
         Tx2xShow(false);
         break;
 #endif  // USE_WEBSERVER
+
     }
   }
   return result;

From 9498cde5e5a7ec1c833c3180af731f63178780cc Mon Sep 17 00:00:00 2001
From: Phonog <jeanmarc.delaplace@gmail.com>
Date: Sun, 1 Mar 2020 09:42:59 +0000
Subject: [PATCH 380/403] Fix switchmode 6 according to issue 7778

---
 .theia/launch.json         |  6 ++++++
 tasmota/support_switch.ino | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 .theia/launch.json

diff --git a/.theia/launch.json b/.theia/launch.json
new file mode 100644
index 000000000..a2ea02c46
--- /dev/null
+++ b/.theia/launch.json
@@ -0,0 +1,6 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  "version": "0.2.0",
+  "configurations": []
+}
diff --git a/tasmota/support_switch.ino b/tasmota/support_switch.ino
index 24470ff93..49b9428b0 100644
--- a/tasmota/support_switch.ino
+++ b/tasmota/support_switch.ino
@@ -214,20 +214,20 @@ void SwitchHandler(uint8_t mode)
           break;
         case PUSHBUTTONHOLD:
           if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;  // Start timer on button press
           }
           if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;   // Toggle with pushbutton to Gnd
+            Switch.hold_timer[i] = 0;    // Button released and hold timer not expired : stop timer...
+            switchflag = POWER_TOGGLE;   // ...and Toggle 
           }
           break;
         case PUSHBUTTONHOLD_INV:
-          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
-            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;
+          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = loops_per_second * Settings.param[P_HOLD_TIME] / 10;  // Start timer on button press...
+            switchflag = POWER_TOGGLE;   // ...and Toggle
           }
-          if ((PRESSED == button) && (NOT_PRESSED == Switch.last_state[i]) && (Switch.hold_timer[i])) {
-            Switch.hold_timer[i] = 0;
-            switchflag = POWER_TOGGLE;   // Toggle with pushbutton to Gnd
+          if ((NOT_PRESSED == button) && (PRESSED == Switch.last_state[i])) {
+            Switch.hold_timer[i] = 0;   // Button released : stop timer.
           }
           break;
         case TOGGLEMULTI:

From 7cf8c1750f28c9113722f0c4cd3ae8dced7ceed9 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Sun, 1 Mar 2020 11:25:59 +0100
Subject: [PATCH 381/403] Add Zigbee features and improvements

---
 tasmota/CHANGELOG.md                      |   1 +
 tasmota/i18n.h                            |  12 +-
 tasmota/xdrv_23_zigbee_0_constants.ino    | 112 ++++----
 tasmota/xdrv_23_zigbee_3_devices.ino      |  58 ++--
 tasmota/xdrv_23_zigbee_5_converters.ino   | 325 ++++++++++++++--------
 tasmota/xdrv_23_zigbee_6_commands.ino     |  93 +++++--
 tasmota/xdrv_23_zigbee_7_statemachine.ino |   5 +-
 tasmota/xdrv_23_zigbee_8_parsers.ino      | 113 +++++---
 tasmota/xdrv_23_zigbee_9_impl.ino         | 111 ++++++--
 9 files changed, 550 insertions(+), 280 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index ee767851a..579d19975 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
 - Add support for Jarolift rollers by Keeloq algorithm
 - Change IRremoteESP8266 library updated to v2.7.4
+- Add Zigbee features and improvements
 
 ### 8.1.0.9 20200220
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 903224c99..0f1988944 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -470,10 +470,10 @@
 
 // Commands xdrv_23_zigbee.ino
 #define D_PRFX_ZB "Zb"
-#define D_PRFX_ZIGBEE "Zigbee"
 #define D_ZIGBEE_NOT_STARTED "Zigbee not started (yet)"
 #define D_CMND_ZIGBEE_PERMITJOIN "PermitJoin"
 #define D_CMND_ZIGBEE_STATUS "Status"
+  #define D_JSON_ZIGBEE_Status "Status"
 #define D_CMND_ZIGBEE_RESET "Reset"
   #define D_JSON_ZIGBEE_CC2530 "CC2530"
 #define D_CMND_ZIGBEEZNPRECEIVE "ZNPReceive"      // only for debug
@@ -486,19 +486,27 @@
   #define D_JSON_ZIGBEE_DEVICE "Device"
   #define D_JSON_ZIGBEE_NAME "Name"
 #define D_CMND_ZIGBEE_NAME "Name"
+#define D_CMND_ZIGBEE_MODELID "ModelId"
+  #define D_JSON_ZIGBEE_MODELID "ModelId"
 #define D_CMND_ZIGBEE_PROBE "Probe"
 #define D_CMND_ZIGBEE_FORGET "Forget"
 #define D_CMND_ZIGBEE_SAVE "Save"
   #define D_CMND_ZIGBEE_LINKQUALITY "LinkQuality"
   #define D_CMND_ZIGBEE_ENDPOINT "Endpoint"
+  #define D_CMND_ZIGBEE_GROUP "Group"
 #define D_CMND_ZIGBEE_READ "Read"
 #define D_CMND_ZIGBEE_SEND "Send"
   #define D_JSON_ZIGBEE_ZCL_SENT "ZbZCLSent"
 #define D_JSON_ZIGBEE_RECEIVED "ZbReceived"
-#define D_JSON_ZIGBEE_RECEIVED_LEGACY "ZigbeeReceived"
 #define D_CMND_ZIGBEE_BIND "Bind"
+  #define D_JSON_ZIGBEE_BIND "ZbBind"
 #define D_CMND_ZIGBEE_PING "Ping"
   #define D_JSON_ZIGBEE_PING "ZbPing"
+  #define D_JSON_ZIGBEE_IEEE "IEEEAddr"
+#define D_JSON_ZIGBEE_RESPONSE "ZbResponse"
+  #define D_JSON_ZIGBEE_CMD "Command"
+  #define D_JSON_ZIGBEE_STATUS "Status"
+  #define D_JSON_ZIGBEE_STATUS_MSG "StatusMessage"
 
 // Commands xdrv_25_A4988_Stepper.ino
 #define D_CMND_MOTOR "MOTOR"
diff --git a/tasmota/xdrv_23_zigbee_0_constants.ino b/tasmota/xdrv_23_zigbee_0_constants.ino
index a37969f8b..cc88fadc2 100644
--- a/tasmota/xdrv_23_zigbee_0_constants.ino
+++ b/tasmota/xdrv_23_zigbee_0_constants.ino
@@ -169,43 +169,6 @@ enum Z_configuration {
   ZNP_HAS_CONFIGURED = 0xF00
 };
 
-// enum Z_nvItemIds {
-//   SCENE_TABLE = 145,
-//   MIN_FREE_NWK_ADDR = 146,
-//   MAX_FREE_NWK_ADDR = 147,
-//   MIN_FREE_GRP_ID = 148,
-//   MAX_FREE_GRP_ID = 149,
-//   MIN_GRP_IDS = 150,
-//   MAX_GRP_IDS = 151,
-//   OTA_BLOCK_REQ_DELAY = 152,
-//   SAPI_ENDPOINT = 161,
-//   SAS_SHORT_ADDR = 177,
-//   SAS_EXT_PANID = 178,
-//   SAS_PANID = 179,
-//   SAS_CHANNEL_MASK = 180,
-//   SAS_PROTOCOL_VER = 181,
-//   SAS_STACK_PROFILE = 182,
-//   SAS_STARTUP_CTRL = 183,
-//   SAS_TC_ADDR = 193,
-//   SAS_TC_MASTER_KEY = 194,
-//   SAS_NWK_KEY = 195,
-//   SAS_USE_INSEC_JOIN = 196,
-//   SAS_PRECFG_LINK_KEY = 197,
-//   SAS_NWK_KEY_SEQ_NUM = 198,
-//   SAS_NWK_KEY_TYPE = 199,
-//   SAS_NWK_MGR_ADDR = 200,
-//   SAS_CURR_TC_MASTER_KEY = 209,
-//   SAS_CURR_NWK_KEY = 210,
-//   SAS_CURR_PRECFG_LINK_KEY = 211,
-//   TCLK_TABLE_START = 257,
-//   TCLK_TABLE_END = 511,
-//   APS_LINK_KEY_DATA_START = 513,
-//   APS_LINK_KEY_DATA_END = 767,
-//   DUPLICATE_BINDING_TABLE = 768,
-//   DUPLICATE_DEVICE_LIST = 769,
-//   DUPLICATE_DEVICE_LIST_KA_TIMEOUT = 770,
-//};
-
 //
 enum Z_Status {
   Z_Success = 0x00,
@@ -261,16 +224,14 @@ enum Z_Device_Ids {
   // 0x0403	IAS Warning Device
 };
 
-// enum class AddrMode : uint8_t {
-//   NotPresent = 0,
-//   Group = 1,
-//   ShortAddress = 2,
-//   IEEEAddress = 3,
-//   Broadcast = 0xFF
-// };
-//
-//
-//
+ enum Z_AddrMode : uint8_t {
+  Z_Addr_NotPresent = 0,
+  Z_Addr_Group = 1,
+  Z_Addr_ShortAddress = 2,
+  Z_Addr_IEEEAddress = 3,
+  Z_Addr_Broadcast = 0xFF
+};
+
 // Commands in the AF subsystem
 enum AfCommand : uint8_t {
   AF_REGISTER = 0x00,
@@ -286,7 +247,7 @@ enum AfCommand : uint8_t {
   AF_INCOMING_MSG = 0x81,
   AF_INCOMING_MSG_EXT = 0x82
 };
-//
+
 // Commands in the ZDO subsystem
 enum : uint8_t {
   ZDO_NWK_ADDR_REQ = 0x00,
@@ -371,7 +332,7 @@ enum ZdoStates {
   ZDO_DEV_ZB_COORD = 0x09,          // Started as a a Zigbee Coordinator
   ZDO_DEV_NWK_ORPHAN = 0x0A,        // Device has lost information about its parent.
 };
-//
+
 // Commands in the UTIL subsystem
 enum Z_Util {
   Z_UTIL_GET_DEVICE_INFO = 0x00,
@@ -427,4 +388,57 @@ enum ZCL_Global_Commands {
 const uint16_t Z_ProfileIds[]   PROGMEM = { 0x0104, 0x0109, 0xA10E, 0xC05E };
 const char     Z_ProfileNames[] PROGMEM = "ZigBee Home Automation|ZigBee Smart Energy|ZigBee Green Power|ZigBee Light Link";
 
+typedef struct Z_StatusLine {
+  uint32_t     status;          // no need to use uint8_t since it uses 32 bits anyways
+  const char * status_msg;
+} Z_StatusLine;
+
+const Z_StatusLine Z_Status[] PROGMEM = {
+  0x00,   "SUCCESS",
+  0x01,   "FAILURE",
+  0x7E,   "NOT_AUTHORIZED",
+  0x7F,   "RESERVED_FIELD_NOT_ZERO",
+  0x80,   "MALFORMED_COMMAND",
+  0x81,   "UNSUP_CLUSTER_COMMAND",
+  0x82,   "UNSUP_GENERAL_COMMAND",
+  0x83,   "UNSUP_MANUF_CLUSTER_COMMAND",
+  0x84,   "UNSUP_MANUF_GENERAL_COMMAND",
+  0x85,   "INVALID_FIELD",
+  0x86,   "UNSUPPORTED_ATTRIBUTE",
+  0x87,   "INVALID_VALUE",
+  0x88,   "READ_ONLY",
+  0x89,   "INSUFFICIENT_SPACE",
+  0x8A,   "DUPLICATE_EXISTS",
+  0x8B,   "NOT_FOUND",
+  0x8C,   "UNREPORTABLE_ATTRIBUTE",
+  0x8D,   "INVALID_DATA_TYPE",
+  0x8E,   "INVALID_SELECTOR",
+  0x8F,   "WRITE_ONLY",
+  0x90,   "INCONSISTENT_STARTUP_STATE",
+  0x91,   "DEFINED_OUT_OF_BAND",
+  0x92,   "INCONSISTENT",
+  0x93,   "ACTION_DENIED",
+  0x94,   "TIMEOUT",
+  0x95,   "ABORT",
+  0x96,   "INVALID_IMAGE",
+  0x97,   "WAIT_FOR_DATA",
+  0x98,   "NO_IMAGE_AVAILABLE",
+  0x99,   "REQUIRE_MORE_IMAGE",
+  0x9A,   "NOTIFICATION_PENDING",
+  0xC0,   "HARDWARE_FAILURE",
+  0xC1,   "SOFTWARE_FAILURE",
+  0xC2,   "CALIBRATION_ERROR",
+  0xC3,   "UNSUPPORTED_CLUSTER",
+};
+
+const __FlashStringHelper* getZigbeeStatusMessage(uint8_t status) {
+  for (uint32_t i = 0; i < sizeof(Z_Status) / sizeof(Z_Status[0]); i++) {
+    const Z_StatusLine *statl = &Z_Status[i];
+    if (statl->status == status) {
+      return (const __FlashStringHelper*) statl->status_msg;
+    }
+  }
+  return nullptr;
+}
+
 #endif // USE_ZIGBEE
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index c7c1f2d11..d814a8c0c 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -19,10 +19,6 @@
 
 #ifdef USE_ZIGBEE
 
-#ifndef ZIGBEERECEIVED
-#define ZIGBEERECEIVED 1
-#endif
-
 #include <vector>
 #include <map>
 
@@ -97,7 +93,8 @@ public:
   void setManufId(uint16_t shortaddr, const char * str);
   void setModelId(uint16_t shortaddr, const char * str);
   void setFriendlyName(uint16_t shortaddr, const char * str);
-  const String * getFriendlyName(uint16_t) const;
+  const String * getFriendlyName(uint16_t shortaddr) const;
+  const String * getModelId(uint16_t shortaddr) const;
 
   // device just seen on the network, update the lastSeen field
   void updateLastSeen(uint16_t shortaddr);
@@ -537,6 +534,17 @@ const String * Z_Devices::getFriendlyName(uint16_t shortaddr) const {
   return nullptr;
 }
 
+const String * Z_Devices::getModelId(uint16_t shortaddr) const {
+  int32_t found = findShortAddr(shortaddr);
+  if (found >= 0) {
+    const Z_Device & device = devicesAt(found);
+    if (device.modelId.length() > 0) {
+      return &device.modelId;
+    }
+  }
+  return nullptr;
+}
+
 // device just seen on the network, update the lastSeen field
 void Z_Devices::updateLastSeen(uint16_t shortaddr) {
   Z_Device & device = getShortAddr(shortaddr);
@@ -656,13 +664,31 @@ bool Z_Devices::jsonIsConflict(uint16_t shortaddr, const JsonObject &values) {
     return false;                                           // if no previous value, no conflict
   }
 
+  // compare groups
+  uint16_t group1 = 0;
+  uint16_t group2 = 0;
+  if (device.json->containsKey(D_CMND_ZIGBEE_GROUP)) {
+    group1 = device.json->get<unsigned int>(D_CMND_ZIGBEE_GROUP);
+  }
+  if (values.containsKey(D_CMND_ZIGBEE_GROUP)) {
+    group2 = values.get<unsigned int>(D_CMND_ZIGBEE_GROUP);
+  }
+  if (group1 != group2) {
+    return true;      // if group addresses differ, then conflict
+  }
+
+  // parse all other parameters
   for (auto kv : values) {
     String key_string = kv.key;
 
-    if (0 == strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_ENDPOINT))) {
-      // attribute "Endpoint"
-      if (kv.value.as<unsigned int>() != device.json->get<unsigned int>(kv.key)) {
-        return true;
+    if (0 == strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_GROUP))) {
+      // ignore group, it was handled already
+    } else if (0 == strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_ENDPOINT))) {
+      // attribute "Endpoint" or "Group"
+      if (device.json->containsKey(kv.key)) {
+        if (kv.value.as<unsigned int>() != device.json->get<unsigned int>(kv.key)) {
+          return true;
+        }
       }
     } else if (strcasecmp_P(kv.key, PSTR(D_CMND_ZIGBEE_LINKQUALITY))) {  // exception = ignore duplicates for LinkQuality
       if (device.json->containsKey(kv.key)) {
@@ -734,25 +760,11 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
-#if ZIGBEERECEIVED
-    // DEPRECATED TODO
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#endif
   } else {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
     MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
     XdrvRulesProcess();
-#if ZIGBEERECEIVED
-    // DEPRECATED TODO
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED_LEGACY "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
-#endif
   }
-  // MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-  // XdrvRulesProcess();
 }
 
 void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {
diff --git a/tasmota/xdrv_23_zigbee_5_converters.ino b/tasmota/xdrv_23_zigbee_5_converters.ino
index 4debd73fd..6d71d5ccf 100644
--- a/tasmota/xdrv_23_zigbee_5_converters.ino
+++ b/tasmota/xdrv_23_zigbee_5_converters.ino
@@ -112,6 +112,7 @@ public:
   static void generateAttributeName(const JsonObject& json, uint16_t cluster, uint16_t attr, char *key, size_t key_len);
   void parseRawAttributes(JsonObject& json, uint8_t offset = 0);
   void parseReadAttributes(JsonObject& json, uint8_t offset = 0);
+  void parseResponse(void);
   void parseClusterSpecificCommand(JsonObject& json, uint8_t offset = 0);
   void postProcessAttributes(uint16_t shortaddr, JsonObject& json);
 
@@ -484,6 +485,51 @@ void ZCLFrame::parseReadAttributes(JsonObject& json, uint8_t offset) {
   }
 }
 
+// ZCL_DEFAULT_RESPONSE
+void ZCLFrame::parseResponse(void) {
+  if (_payload.len() < 2) { return; }   // wrong format
+  uint8_t cmd = _payload.get8(0);
+  uint8_t status = _payload.get8(1);
+
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+
+  // "Device"
+  char s[12];
+  snprintf_P(s, sizeof(s), PSTR("0x%04X"), _srcaddr);
+  json[F(D_JSON_ZIGBEE_DEVICE)] = s;
+  // "Name"
+  const String * friendlyName = zigbee_devices.getFriendlyName(_srcaddr);
+  if (friendlyName) {
+    json[F(D_JSON_ZIGBEE_NAME)] = *friendlyName;
+  }
+  // "Command"
+  snprintf_P(s, sizeof(s), PSTR("%04X!%02X"), _cluster_id, cmd);
+  json[F(D_JSON_ZIGBEE_CMD)] = s;
+  // "Status"
+  json[F(D_JSON_ZIGBEE_STATUS)] = status;
+  // "StatusMessage"
+  const __FlashStringHelper* statm = getZigbeeStatusMessage(status);
+  if (statm) {
+    json[F(D_JSON_ZIGBEE_STATUS_MSG)] = statm;
+  }
+  // Add Endpoint
+  json[F(D_CMND_ZIGBEE_ENDPOINT)] = _srcendpoint;
+  // Add Group if non-zero
+  if (_group_id) {
+    json[F(D_CMND_ZIGBEE_GROUP)] = _group_id;
+  }
+  // Add linkquality
+  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = _linkquality;
+
+  String msg("");
+  msg.reserve(100);
+  json.printTo(msg);
+  Response_P(PSTR("{\"" D_JSON_ZIGBEE_RESPONSE "\":%s}"), msg.c_str());
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+}
+
 
 // Parse non-normalized attributes
 void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
@@ -519,7 +565,7 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   // Power Configuration cluster
   { 0x0001, 0x0000,  "MainsVoltage",         &Z_Copy },
   { 0x0001, 0x0001,  "MainsFrequency",       &Z_Copy },
-  { 0x0001, 0x0020,  "BatteryVoltage",       &Z_Copy },
+  { 0x0001, 0x0020,  "BatteryVoltage",       &Z_FloatDiv10 },
   { 0x0001, 0x0021,  "BatteryPercentageRemaining",&Z_Copy },
 
   // Device Temperature Configuration cluster
@@ -564,78 +610,112 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   { 0x000B, 0x0000,  "QualityMeasure",       &Z_Copy },
   { 0x000B, 0x0000,  "NumberOfDevices",      &Z_Copy },
   // Analog Input cluster
-  { 0x000C, 0x0004,  "ActiveText",           &Z_Copy },
-  { 0x000C, 0x001C,  "Description",          &Z_Copy },
-  { 0x000C, 0x002E,  "InactiveText",         &Z_Copy },
-  { 0x000C, 0x0041,  "MaxPresentValue",      &Z_Copy },
-  { 0x000C, 0x0045,  "MinPresentValue",      &Z_Copy },
-  { 0x000C, 0x0051,  "OutOfService",         &Z_Copy },
+  { 0x000C, 0x0004,  "AnalogInActiveText",   &Z_Copy },
+  { 0x000C, 0x001C,  "AnalogInDescription",  &Z_Copy },
+  { 0x000C, 0x002E,  "AnalogInInactiveText", &Z_Copy },
+  { 0x000C, 0x0041,  "AnalogInMaxValue",     &Z_Copy },
+  { 0x000C, 0x0045,  "AnalogInMinValue",     &Z_Copy },
+  { 0x000C, 0x0051,  "AnalogInOutOfService", &Z_Copy },
   { 0x000C, 0x0055,  "AqaraRotate",          &Z_Copy },
-  { 0x000C, 0x0057,  "PriorityArray",        &Z_Copy },
-  { 0x000C, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x000C, 0x0068,  "RelinquishDefault",    &Z_Copy },
-  { 0x000C, 0x006A,  "Resolution",           &Z_Copy },
-  { 0x000C, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x000C, 0x0075,  "EngineeringUnits",     &Z_Copy },
-  { 0x000C, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x000C, 0x0057,  "AnalogInPriorityArray",&Z_Copy },
+  { 0x000C, 0x0067,  "AnalogInReliability",  &Z_Copy },
+  { 0x000C, 0x0068,  "AnalogInRelinquishDefault",&Z_Copy },
+  { 0x000C, 0x006A,  "AnalogInResolution",   &Z_Copy },
+  { 0x000C, 0x006F,  "AnalogInStatusFlags",  &Z_Copy },
+  { 0x000C, 0x0075,  "AnalogInEngineeringUnits",&Z_Copy },
+  { 0x000C, 0x0100,  "AnalogInApplicationType",&Z_Copy },
   { 0x000C, 0xFF05,  "Aqara_FF05",           &Z_Copy },
+  // Analog Output cluster
+  { 0x000D, 0x001C,  "AnalogOutDescription", &Z_Copy },
+  { 0x000D, 0x0041,  "AnalogOutMaxValue",    &Z_Copy },
+  { 0x000D, 0x0045,  "AnalogOutMinValue",    &Z_Copy },
+  { 0x000D, 0x0051,  "AnalogOutOutOfService",&Z_Copy },
+  { 0x000D, 0x0055,  "AnalogOutValue",       &Z_Copy },
+  { 0x000D, 0x0057,  "AnalogOutPriorityArray",&Z_Copy },
+  { 0x000D, 0x0067,  "AnalogOutReliability", &Z_Copy },
+  { 0x000D, 0x0068,  "AnalogOutRelinquishDefault",&Z_Copy },
+  { 0x000D, 0x006A,  "AnalogOutResolution",  &Z_Copy },
+  { 0x000D, 0x006F,  "AnalogOutStatusFlags", &Z_Copy },
+  { 0x000D, 0x0075,  "AnalogOutEngineeringUnits",&Z_Copy },
+  { 0x000D, 0x0100,  "AnalogOutApplicationType",&Z_Copy },
+  // Analog Value cluster
+  { 0x000E, 0x001C,  "AnalogDescription",    &Z_Copy },
+  { 0x000E, 0x0051,  "AnalogOutOfService",   &Z_Copy },
+  { 0x000E, 0x0055,  "AnalogValue",          &Z_Copy },
+  { 0x000E, 0x0057,  "AnalogPriorityArray",  &Z_Copy },
+  { 0x000E, 0x0067,  "AnalogReliability",    &Z_Copy },
+  { 0x000E, 0x0068,  "AnalogRelinquishDefault",&Z_Copy },
+  { 0x000E, 0x006F,  "AnalogStatusFlags",    &Z_Copy },
+  { 0x000E, 0x0075,  "AnalogEngineeringUnits",&Z_Copy },
+  { 0x000E, 0x0100,  "AnalogApplicationType",&Z_Copy },
+  // Binary Input cluster
+  { 0x000F, 0x0004,  "BinaryInActiveText",  &Z_Copy },
+  { 0x000F, 0x001C,  "BinaryInDescription", &Z_Copy },
+  { 0x000F, 0x002E,  "BinaryInInactiveText",&Z_Copy },
+  { 0x000F, 0x0051,  "BinaryInOutOfService",&Z_Copy },
+  { 0x000F, 0x0054,  "BinaryInPolarity",    &Z_Copy },
+  { 0x000F, 0x0055,  "BinaryInValue",       &Z_Copy },
+  { 0x000F, 0x0057,  "BinaryInPriorityArray",&Z_Copy },
+  { 0x000F, 0x0067,  "BinaryInReliability", &Z_Copy },
+  { 0x000F, 0x006F,  "BinaryInStatusFlags", &Z_Copy },
+  { 0x000F, 0x0100,  "BinaryInApplicationType",&Z_Copy },
   // Binary Output cluster
-  { 0x0010, 0x0004,  "ActiveText",           &Z_Copy },
-  { 0x0010, 0x001C,  "Description",          &Z_Copy },
-  { 0x0010, 0x002E,  "InactiveText",         &Z_Copy },
-  { 0x0010, 0x0042,  "MinimumOffTime",       &Z_Copy },
-  { 0x0010, 0x0043,  "MinimumOnTime",        &Z_Copy },
-  { 0x0010, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0010, 0x0054,  "Polarity",             &Z_Copy },
-  { 0x0010, 0x0055,  "PresentValue",         &Z_Copy },
-  { 0x0010, 0x0057,  "PriorityArray",        &Z_Copy },
-  { 0x0010, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x0010, 0x0068,  "RelinquishDefault",    &Z_Copy },
-  { 0x0010, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x0010, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x0010, 0x0004,  "BinaryOutActiveText",  &Z_Copy },
+  { 0x0010, 0x001C,  "BinaryOutDescription", &Z_Copy },
+  { 0x0010, 0x002E,  "BinaryOutInactiveText",&Z_Copy },
+  { 0x0010, 0x0042,  "BinaryOutMinimumOffTime",&Z_Copy },
+  { 0x0010, 0x0043,  "BinaryOutMinimumOnTime",&Z_Copy },
+  { 0x0010, 0x0051,  "BinaryOutOutOfService",&Z_Copy },
+  { 0x0010, 0x0054,  "BinaryOutPolarity",    &Z_Copy },
+  { 0x0010, 0x0055,  "BinaryOutValue",       &Z_Copy },
+  { 0x0010, 0x0057,  "BinaryOutPriorityArray",&Z_Copy },
+  { 0x0010, 0x0067,  "BinaryOutReliability", &Z_Copy },
+  { 0x0010, 0x0068,  "BinaryOutRelinquishDefault",&Z_Copy },
+  { 0x0010, 0x006F,  "BinaryOutStatusFlags", &Z_Copy },
+  { 0x0010, 0x0100,  "BinaryOutApplicationType",&Z_Copy },
   // Binary Value cluster
-  { 0x0011, 0x0004,  "ActiveText",           &Z_Copy },
-  { 0x0011, 0x001C,  "Description",          &Z_Copy },
-  { 0x0011, 0x002E,  "InactiveText",         &Z_Copy },
-  { 0x0011, 0x0042,  "MinimumOffTime",       &Z_Copy },
-  { 0x0011, 0x0043,  "MinimumOnTime",        &Z_Copy },
-  { 0x0011, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0011, 0x0055,  "PresentValue",         &Z_Copy },
-  { 0x0011, 0x0057,  "PriorityArray",        &Z_Copy },
-  { 0x0011, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x0011, 0x0068,  "RelinquishDefault",    &Z_Copy },
-  { 0x0011, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x0011, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x0011, 0x0004,  "BinaryActiveText",     &Z_Copy },
+  { 0x0011, 0x001C,  "BinaryDescription",    &Z_Copy },
+  { 0x0011, 0x002E,  "BinaryInactiveText",   &Z_Copy },
+  { 0x0011, 0x0042,  "BinaryMinimumOffTime", &Z_Copy },
+  { 0x0011, 0x0043,  "BinaryMinimumOnTime",  &Z_Copy },
+  { 0x0011, 0x0051,  "BinaryOutOfService",   &Z_Copy },
+  { 0x0011, 0x0055,  "BinaryValue",          &Z_Copy },
+  { 0x0011, 0x0057,  "BinaryPriorityArray",  &Z_Copy },
+  { 0x0011, 0x0067,  "BinaryReliability",    &Z_Copy },
+  { 0x0011, 0x0068,  "BinaryRelinquishDefault",&Z_Copy },
+  { 0x0011, 0x006F,  "BinaryStatusFlags",    &Z_Copy },
+  { 0x0011, 0x0100,  "BinaryApplicationType",&Z_Copy },
   // Multistate Input cluster
-  { 0x0012, 0x000E,  "StateText",            &Z_Copy },
-  { 0x0012, 0x001C,  "Description",          &Z_Copy },
-  { 0x0012, 0x004A,  "NumberOfStates",       &Z_Copy },
-  { 0x0012, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0012, 0x0055,  "PresentValue",         &Z_AqaraCube },
-  { 0x0012, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x0012, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x0012, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x0012, 0x000E,  "MultiInStateText",     &Z_Copy },
+  { 0x0012, 0x001C,  "MultiInDescription",   &Z_Copy },
+  { 0x0012, 0x004A,  "MultiInNumberOfStates",&Z_Copy },
+  { 0x0012, 0x0051,  "MultiInOutOfService",  &Z_Copy },
+  { 0x0012, 0x0055,  "MultiInValue",         &Z_AqaraCube },
+  { 0x0012, 0x0067,  "MultiInReliability",   &Z_Copy },
+  { 0x0012, 0x006F,  "MultiInStatusFlags",   &Z_Copy },
+  { 0x0012, 0x0100,  "MultiInApplicationType",&Z_Copy },
   // Multistate output
-  { 0x0013, 0x000E,  "StateText",            &Z_Copy },
-  { 0x0013, 0x001C,  "Description",          &Z_Copy },
-  { 0x0013, 0x004A,  "NumberOfStates",       &Z_Copy },
-  { 0x0013, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0013, 0x0055,  "PresentValue",         &Z_Copy },
-  { 0x0013, 0x0057,  "PriorityArray",        &Z_Copy },
-  { 0x0013, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x0013, 0x0068,  "RelinquishDefault",    &Z_Copy },
-  { 0x0013, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x0013, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x0013, 0x000E,  "MultiOutStateText",    &Z_Copy },
+  { 0x0013, 0x001C,  "MultiOutDescription",  &Z_Copy },
+  { 0x0013, 0x004A,  "MultiOutNumberOfStates",&Z_Copy },
+  { 0x0013, 0x0051,  "MultiOutOutOfService", &Z_Copy },
+  { 0x0013, 0x0055,  "MultiOutValue",        &Z_Copy },
+  { 0x0013, 0x0057,  "MultiOutPriorityArray",&Z_Copy },
+  { 0x0013, 0x0067,  "MultiOutReliability",  &Z_Copy },
+  { 0x0013, 0x0068,  "MultiOutRelinquishDefault",&Z_Copy },
+  { 0x0013, 0x006F,  "MultiOutStatusFlags",  &Z_Copy },
+  { 0x0013, 0x0100,  "MultiOutApplicationType",&Z_Copy },
   // Multistate Value cluster
-  { 0x0014, 0x000E,  "StateText",            &Z_Copy },
-  { 0x0014, 0x001C,  "Description",          &Z_Copy },
-  { 0x0014, 0x004A,  "NumberOfStates",       &Z_Copy },
-  { 0x0014, 0x0051,  "OutOfService",         &Z_Copy },
-  { 0x0014, 0x0055,  "PresentValue",         &Z_Copy },
-  { 0x0014, 0x0067,  "Reliability",          &Z_Copy },
-  { 0x0014, 0x0068,  "RelinquishDefault",    &Z_Copy },
-  { 0x0014, 0x006F,  "StatusFlags",          &Z_Copy },
-  { 0x0014, 0x0100,  "ApplicationType",      &Z_Copy },
+  { 0x0014, 0x000E,  "MultiStateText",       &Z_Copy },
+  { 0x0014, 0x001C,  "MultiDescription",     &Z_Copy },
+  { 0x0014, 0x004A,  "MultiNumberOfStates",  &Z_Copy },
+  { 0x0014, 0x0051,  "MultiOutOfService",    &Z_Copy },
+  { 0x0014, 0x0055,  "MultiValue",           &Z_Copy },
+  { 0x0014, 0x0067,  "MultiReliability",     &Z_Copy },
+  { 0x0014, 0x0068,  "MultiRelinquishDefault",&Z_Copy },
+  { 0x0014, 0x006F,  "MultiStatusFlags",     &Z_Copy },
+  { 0x0014, 0x0100,  "MultiApplicationType", &Z_Copy },
   // Power Profile cluster
   { 0x001A, 0x0000,  "TotalProfileNum",      &Z_Copy },
   { 0x001A, 0x0001,  "MultipleScheduling",   &Z_Copy },
@@ -682,12 +762,12 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
   { 0x0102, 0x0009,  "CurrentPositionTiltPercentage",&Z_Copy },
   { 0x0102, 0x0010,  "InstalledOpenLimitLift",&Z_Copy },
   { 0x0102, 0x0011,  "InstalledClosedLimitLift",&Z_Copy },
-  { 0x0102, 0x0012,  "InstalledOpenLimitTilt",  &Z_Copy },
-  { 0x0102, 0x0013,  "InstalledClosedLimitTilt",  &Z_Copy },
-  { 0x0102, 0x0014,  "VelocityLift",&Z_Copy },
+  { 0x0102, 0x0012,  "InstalledOpenLimitTilt",&Z_Copy },
+  { 0x0102, 0x0013,  "InstalledClosedLimitTilt",&Z_Copy },
+  { 0x0102, 0x0014,  "VelocityLift",         &Z_Copy },
   { 0x0102, 0x0015,  "AccelerationTimeLift",&Z_Copy },
-  { 0x0102, 0x0016,  "DecelerationTimeLift",         &Z_Copy },
-  { 0x0102, 0x0017,  "Mode",&Z_Copy },
+  { 0x0102, 0x0016,  "DecelerationTimeLift", &Z_Copy },
+  { 0x0102, 0x0017,  "Mode",                 &Z_Copy },
   { 0x0102, 0x0018,  "IntermediateSetpointsLift",&Z_Copy },
   { 0x0102, 0x0019,  "IntermediateSetpointsTilt",&Z_Copy },
 
@@ -725,49 +805,49 @@ const Z_AttributeConverter Z_PostProcess[] PROGMEM = {
 
   // Illuminance Measurement cluster
   { 0x0400, 0x0000,  D_JSON_ILLUMINANCE,     &Z_Copy },    // Illuminance (in Lux)
-  { 0x0400, 0x0001,  "MinMeasuredValue",     &Z_Copy },    //
-  { 0x0400, 0x0002,  "MaxMeasuredValue",     &Z_Copy },    //
-  { 0x0400, 0x0003,  "Tolerance",            &Z_Copy },    //
-  { 0x0400, 0x0004,  "LightSensorType",      &Z_Copy },    //
+  { 0x0400, 0x0001,  "IlluminanceMinMeasuredValue",     &Z_Copy },    //
+  { 0x0400, 0x0002,  "IlluminanceMaxMeasuredValue",     &Z_Copy },    //
+  { 0x0400, 0x0003,  "IlluminanceTolerance",            &Z_Copy },    //
+  { 0x0400, 0x0004,  "IlluminanceLightSensorType",      &Z_Copy },    //
   { 0x0400, 0xFFFF,  nullptr,                &Z_Remove },    // Remove all other values
 
   // Illuminance Level Sensing cluster
-  { 0x0401, 0x0000,  "LevelStatus",          &Z_Copy },    // Illuminance (in Lux)
-  { 0x0401, 0x0001,  "LightSensorType",      &Z_Copy },    // LightSensorType
+  { 0x0401, 0x0000,  "IlluminanceLevelStatus",          &Z_Copy },    // Illuminance (in Lux)
+  { 0x0401, 0x0001,  "IlluminanceLightSensorType",      &Z_Copy },    // LightSensorType
   { 0x0401, 0xFFFF,  nullptr,                &Z_Remove },    // Remove all other values
 
   // Temperature Measurement cluster
   { 0x0402, 0x0000,  D_JSON_TEMPERATURE,     &Z_FloatDiv100 },   // Temperature
-  { 0x0402, 0x0001,  "MinMeasuredValue",     &Z_FloatDiv100 },    //
-  { 0x0402, 0x0002,  "MaxMeasuredValue",     &Z_FloatDiv100 },    //
-  { 0x0402, 0x0003,  "Tolerance",            &Z_FloatDiv100 },    //
+  { 0x0402, 0x0001,  "TemperatureMinMeasuredValue",     &Z_FloatDiv100 },    //
+  { 0x0402, 0x0002,  "TemperatureMaxMeasuredValue",     &Z_FloatDiv100 },    //
+  { 0x0402, 0x0003,  "TemperatureTolerance",            &Z_FloatDiv100 },    //
   { 0x0402, 0xFFFF,  nullptr,                &Z_Remove },     // Remove all other values
 
   // Pressure Measurement cluster
   { 0x0403, 0x0000,  D_JSON_PRESSURE_UNIT,   &Z_AddPressureUnit },     // Pressure Unit
   { 0x0403, 0x0000,  D_JSON_PRESSURE,        &Z_Copy },     // Pressure
-  { 0x0403, 0x0001,  "MinMeasuredValue",     &Z_Copy },    //
-  { 0x0403, 0x0002,  "MaxMeasuredValue",     &Z_Copy },    //
-  { 0x0403, 0x0003,  "Tolerance",            &Z_Copy },    //
-  { 0x0403, 0x0010,  "ScaledValue",          &Z_Copy },    //
-  { 0x0403, 0x0011,  "MinScaledValue",       &Z_Copy },    //
-  { 0x0403, 0x0012,  "MaxScaledValue",       &Z_Copy },    //
-  { 0x0403, 0x0013,  "ScaledTolerance",      &Z_Copy },    //
-  { 0x0403, 0x0014,  "Scale",                &Z_Copy },    //
+  { 0x0403, 0x0001,  "PressureMinMeasuredValue",     &Z_Copy },    //
+  { 0x0403, 0x0002,  "PressureMaxMeasuredValue",     &Z_Copy },    //
+  { 0x0403, 0x0003,  "PressureTolerance",            &Z_Copy },    //
+  { 0x0403, 0x0010,  "PressureScaledValue",          &Z_Copy },    //
+  { 0x0403, 0x0011,  "PressureMinScaledValue",       &Z_Copy },    //
+  { 0x0403, 0x0012,  "PressureMaxScaledValue",       &Z_Copy },    //
+  { 0x0403, 0x0013,  "PressureScaledTolerance",      &Z_Copy },    //
+  { 0x0403, 0x0014,  "PressureScale",                &Z_Copy },    //
   { 0x0403, 0xFFFF,  nullptr,                &Z_Remove },     // Remove all other Pressure values
 
   // Flow Measurement cluster
   { 0x0404, 0x0000,  D_JSON_FLOWRATE,        &Z_FloatDiv10 },    // Flow (in m3/h)
-  { 0x0404, 0x0001,  "MinMeasuredValue",     &Z_Copy },    //
-  { 0x0404, 0x0002,  "MaxMeasuredValue",     &Z_Copy },    //
-  { 0x0404, 0x0003,  "Tolerance",            &Z_Copy },    //
+  { 0x0404, 0x0001,  "FlowMinMeasuredValue", &Z_Copy },    //
+  { 0x0404, 0x0002,  "FlowMaxMeasuredValue", &Z_Copy },    //
+  { 0x0404, 0x0003,  "FlowTolerance",        &Z_Copy },    //
   { 0x0404, 0xFFFF,  nullptr,                &Z_Remove },    // Remove all other values
 
   // Relative Humidity Measurement cluster
   { 0x0405, 0x0000,  D_JSON_HUMIDITY,        &Z_FloatDiv100 },   // Humidity
-  { 0x0405, 0x0001,  "MinMeasuredValue",     &Z_Copy },    //
-  { 0x0405, 0x0002,  "MaxMeasuredValue",     &Z_Copy },    //
-  { 0x0405, 0x0003,  "Tolerance",            &Z_Copy },    //
+  { 0x0405, 0x0001,  "HumidityMinMeasuredValue",     &Z_Copy },    //
+  { 0x0405, 0x0002,  "HumidityMaxMeasuredValue",     &Z_Copy },    //
+  { 0x0405, 0x0003,  "HumidityTolerance",            &Z_Copy },    //
   { 0x0405, 0xFFFF,  nullptr,                &Z_Remove },     // Remove all other values
 
   // Occupancy Sensing cluster
@@ -837,6 +917,11 @@ int32_t Z_FloatDiv10(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject&
   json[new_name] = ((float)value) / 10.0f;
   return 1;   // remove original key
 }
+// Convert int to float and divide by 10
+int32_t Z_FloatDiv2(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject& json, const char *name, JsonVariant& value, const String &new_name, uint16_t cluster, uint16_t attr) {
+  json[new_name] = ((float)value) / 2.0f;
+  return 1;   // remove original key
+}
 
 // Publish a message for `"Occupancy":0` when the timer expired
 int32_t Z_OccupancyCallback(uint16_t shortaddr, uint16_t cluster, uint16_t endpoint, uint32_t value) {
@@ -947,9 +1032,6 @@ int32_t Z_AqaraVibration(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObje
         int32_t Angle_X = 0.5f + atanf(X/sqrtf(z*z+y*y)) * f_180pi;
         int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(x*x+z*z)) * f_180pi;
         int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(x*x+y*y)) * f_180pi;
-        // int32_t Angle_X = 0.5f + atanf(X/sqrtf(Z*Z+Y*Y)) * f_180pi;
-        // int32_t Angle_Y = 0.5f + atanf(Y/sqrtf(X*X+Z*Z)) * f_180pi;
-        // int32_t Angle_Z = 0.5f + atanf(Z/sqrtf(X*X+Y*Y)) * f_180pi;
         JsonArray& angles = json.createNestedArray(F("AqaraAngles"));
         angles.add(Angle_X);
         angles.add(Angle_Y);
@@ -968,6 +1050,7 @@ int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject&
   char tmp[] = "tmp";   // for obscure reasons, it must be converted from const char* to char*, otherwise ArduinoJson gets confused
 
   JsonVariant sub_value;
+  const String * modelId = zigbee_devices.getModelId(shortaddr);  // null if unknown
 
   while (len - i >= 2) {
     uint8_t attrid = buf2.get8(i++);
@@ -975,25 +1058,43 @@ int32_t Z_AqaraSensor(const class ZCLFrame *zcl, uint16_t shortaddr, JsonObject&
     i += parseSingleAttribute(json, tmp, buf2, i, len);
     float val = json[tmp];
     json.remove(tmp);
+    bool translated = false;    // were we able to translate to a known format?
     if (0x01 == attrid) {
       json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
       json[F("Battery")] = toPercentageCR2032(val);
-    } else if (0 == zcl->getManufCode()) {
-      // onla Aqara Temp/Humidity has manuf_code of zero. If non-zero we skip the parameters
-      if (0x64 == attrid) {
-        json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
-      } else if (0x65 == attrid) {
-        json[F(D_JSON_HUMIDITY)] = val / 100.0f;
-      } else if (0x66 == attrid) {
-        json[F(D_JSON_PRESSURE)] = val / 100.0f;
-        json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);   // hPa
-      } else if (0x01 == attrid) {
-        json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
-        json[F("Battery")] = toPercentageCR2032(val);
+    } else if ((nullptr != modelId) && (0 == zcl->getManufCode())) {
+      translated = true;
+      if (modelId->startsWith(F("lumi.sensor_ht")) ||
+          modelId->startsWith(F("lumi.weather"))) {     // Temp sensor
+        // Filter according to prefix of model name
+        // onla Aqara Temp/Humidity has manuf_code of zero. If non-zero we skip the parameters
+        if (0x64 == attrid) {
+          json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
+        } else if (0x65 == attrid) {
+          json[F(D_JSON_HUMIDITY)] = val / 100.0f;
+        } else if (0x66 == attrid) {
+          json[F(D_JSON_PRESSURE)] = val / 100.0f;
+          json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE);   // hPa
+        }
+      } else if (modelId->startsWith(F("lumi.sensor_smoke"))) {   // gas leak
+        if (0x64 == attrid) {
+          json[F("SmokeDensity")] = val;
+        }
+      } else if (modelId->startsWith(F("lumi.sensor_natgas"))) {   // gas leak
+        if (0x64 == attrid) {
+          json[F("GasDensity")] = val;
+        }
+      } else {
+        translated = false;     // we didn't find a match
+      }
+ //   } else if (0x115F == zcl->getManufCode()) {      // Aqara Motion Sensor, still unknown field
+    }
+    if (!translated) {
+      if (attrid >= 100) {    // payload is always above 0x64 or 100
+        char attr_name[12];
+        snprintf_P(attr_name, sizeof(attr_name), PSTR("Xiaomi_%02X"), attrid);
+        json[attr_name] = val;
       }
-    } else if (0x115F == zcl->getManufCode()) {
-      // Aqara Motion Sensor, still unknown field
-      json[F("AqaraUnknown")] = val;
     }
   }
   return 1;   // remove original key
diff --git a/tasmota/xdrv_23_zigbee_6_commands.ino b/tasmota/xdrv_23_zigbee_6_commands.ino
index 5c3e3fc1b..3d8d378b0 100644
--- a/tasmota/xdrv_23_zigbee_6_commands.ino
+++ b/tasmota/xdrv_23_zigbee_6_commands.ino
@@ -36,8 +36,14 @@ typedef struct Z_XYZ_Var {    // Holds values for vairables X, Y and Z
   uint8_t     z_type = 0;
 } Z_XYZ_Var;
 
-// list of post-processing directives
-const Z_CommandConverter Z_Commands[] = {
+// Cluster specific commands
+// Note: the table is both for sending commands, but also displaying received commands
+// - tasmota_cmd: the human-readable name of the command as entered or displayed, use '|' to split into multiple commands when displayed
+// - cluster: cluster number of the command
+// - cmd: the command number, of 0xFF if it's actually a variable to be assigned from 'xx'
+// - direction: the direction of the command (bit field). 0x01=from client to server (coord to device), 0x02= from server to client (response), 0x80=needs specific decoding
+// - param: the paylod template, x/y/z are substituted with arguments, little endian. For command display, payload must match until x/y/z character or until the end of the paylod. '??' means ignore.
+const Z_CommandConverter Z_Commands[] PROGMEM = {
   // Group adress commands
   { "AddGroup",       0x0004, 0x00, 0x01,   "xxxx00" },       // Add group id, group name is not supported
   { "ViewGroup",      0x0004, 0x01, 0x01,   "xxxx" },         // Ask for the group name
@@ -65,7 +71,7 @@ const Z_CommandConverter Z_Commands[] = {
   { "ShutterTilt",    0x0102, 0x08, 0x01,   "xx" },            // Tilt percentage
   { "Shutter",        0x0102, 0xFF, 0x01,   "" },
   // Blitzwolf PIR
-  { "Occupancy",      0xEF00, 0x01, 0x01,   "xx"},                // Specific decoder for Blitzwolf PIR, empty name means special treatment
+  { "Occupancy",      0xEF00, 0x01, 0x82,   ""},                // Specific decoder for Blitzwolf PIR, empty name means special treatment
   // Decoders only - normally not used to send, and names may be masked by previous definitions
   { "Dimmer",         0x0008, 0x00, 0x01,   "xx" },
   { "DimmerMove",     0x0008, 0x01, 0x01,   "xx0A" },
@@ -85,15 +91,14 @@ const Z_CommandConverter Z_Commands[] = {
   { "ArrowHold",      0x0005, 0x08, 0x01,   "xx" },         // xx == 0x01 = left, 0x00 = right
   { "ArrowRelease",   0x0005, 0x09, 0x01,   "" },
   // IAS - Intruder Alarm System + leak/fire detection
-  { "ZoneStatusChange",0x0500, 0x00, 0x02,  "xxxxyyzz" },   // xxxx = zone status, yy = extended status, zz = zone id, Delay is ignored
+  { "ZoneStatusChange",0x0500, 0x00, 0x82,  "xxxxyyzz" },   // xxxx = zone status, yy = extended status, zz = zone id, Delay is ignored
   // responses for Group cluster commands
-  { "AddGroupResp",   0x0004, 0x00, 0x02,   "xxyyyy" },       // xx = status, yy = group id
-  { "ViewGroupResp",  0x0004, 0x01, 0x02,   "xxyyyy" },       // xx = status, yy = group id, name ignored
-  { "GetGroupResp",   0x0004, 0x02, 0x02,   "xxyyzzzz" },     // xx = capacity, yy = count, zzzz = first group id, following groups ignored
-  { "RemoveGroup",    0x0004, 0x03, 0x02,   "xxyyyy" },       // xx = status, yy = group id
+  { "AddGroup",       0x0004, 0x00, 0x82,   "xxyyyy" },       // xx = status, yy = group id
+  { "ViewGroup",      0x0004, 0x01, 0x82,   "xxyyyy" },       // xx = status, yy = group id, name ignored
+  { "GetGroup",       0x0004, 0x02, 0x82,   "xxyyzzzz" },     // xx = capacity, yy = count, zzzz = first group id, following groups ignored
+  { "RemoveGroup",    0x0004, 0x03, 0x82,   "xxyyyy" },       // xx = status, yy = group id
 };
 
-
 #define ZLE(x) ((x) & 0xFF), ((x) >> 8)     // Little Endian
 
 // Below are the attributes we wand to read from each cluster
@@ -235,16 +240,20 @@ void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, boo
   ToHex_P((unsigned char*)payload.getBuffer(), payload.len(), hex_char, hex_char_len);
 
   const __FlashStringHelper* command_name = nullptr;
+  uint8_t conv_direction;
   Z_XYZ_Var xyz;
 
 //AddLog_P2(LOG_LEVEL_INFO, PSTR(">>> len = %d - %02X%02X%02X"), payload.len(), payload.get8(0), payload.get8(1), payload.get8(2));
   for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
     const Z_CommandConverter *conv = &Z_Commands[i];
-    if (conv->cluster == cluster) {
+    uint16_t conv_cluster = pgm_read_word(&conv->cluster);
+    if (conv_cluster == cluster) {
       // cluster match
-      if ((0xFF == conv->cmd) || (cmd == conv->cmd)) {
+      uint8_t conv_cmd = pgm_read_byte(&conv->cmd);
+      conv_direction = pgm_read_byte(&conv->direction);
+      if ((0xFF == conv_cmd) || (cmd == conv_cmd)) {
           // cmd match
-        if ((direction && (conv->direction & 0x02)) || (!direction && (conv->direction & 0x01))) {
+        if ((direction && (conv_direction & 0x02)) || (!direction && (conv_direction & 0x01))) {
           // check if we have a match for params too
           // Match if:
           //  - payload exactly matches conv->param (conv->param may be longer)
@@ -271,7 +280,7 @@ void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, boo
           if (match) {
             command_name = (const __FlashStringHelper*) conv->tasmota_cmd;
             parseXYZ(conv->param, payload, &xyz);
-            if (0xFF == conv->cmd) {
+            if (0xFF == conv_cmd) {
               // shift all values
               xyz.z = xyz.y;
               xyz.z_type = xyz.y_type;
@@ -296,31 +305,63 @@ void convertClusterSpecific(JsonObject& json, uint16_t cluster, uint8_t cmd, boo
   free(hex_char);
 
   if (command_name) {
-    if (0 == xyz.x_type) {
-      json[command_name] = true;    // no parameter
-    } else if (0 == xyz.y_type) {
-      json[command_name] = xyz.x;       // 1 parameter
+    // Now try to transform into a human readable format
+    // if (direction & 0x80) then specific transform
+    if (conv_direction & 0x80) {
+      // TODO need to create a specific command
+      // IAS
+      String command_name2 = String(command_name);
+      if ((cluster == 0x0500) && (cmd == 0x00)) {
+        // "ZoneStatusChange"
+        json[command_name] = xyz.x;
+        json[command_name2 + "Ext"] = xyz.y;
+        json[command_name2 + "Zone"] = xyz.z;
+      } else if ((cluster == 0x0004) && ((cmd == 0x00) || (cmd == 0x01) || (cmd == 0x03))) {
+        // AddGroupResp or ViewGroupResp (group name ignored) or RemoveGroup
+        json[command_name] = xyz.y;
+        json[command_name2 + "Status"] = xyz.x;
+        json[command_name2 + "StatusMsg"] = getZigbeeStatusMessage(xyz.x);
+      } else if ((cluster == 0x0004) && (cmd == 0x02)) {
+        // GetGroupResp
+        json[command_name2 + "Capacity"] = xyz.x;
+        json[command_name2 + "Count"] = xyz.y;
+        JsonArray &arr = json.createNestedArray(command_name);
+        for (uint32_t i = 0; i < xyz.y; i++) {
+          arr.add(payload.get16(2 + 2*i));
+        }
+        //arr.add(xyz.z);
+      }
     } else {
-      // multiple answers, create an array
-      JsonArray &arr = json.createNestedArray(command_name);
-      arr.add(xyz.x);
-      arr.add(xyz.y);
-      if (xyz.z_type) {
-        arr.add(xyz.z);
+      if (0 == xyz.x_type) {
+        json[command_name] = true;    // no parameter
+      } else if (0 == xyz.y_type) {
+        json[command_name] = xyz.x;       // 1 parameter
+      } else {
+        // multiple answers, create an array
+        JsonArray &arr = json.createNestedArray(command_name);
+        arr.add(xyz.x);
+        arr.add(xyz.y);
+        if (xyz.z_type) {
+          arr.add(xyz.z);
+        }
       }
     }
   }
 }
 
 // Find the command details by command name
+// Only take commands outgoing, i.e. direction == 0
 // If not found:
 //  - returns nullptr
 const __FlashStringHelper* zigbeeFindCommand(const char *command, uint16_t *cluster, uint16_t *cmd) {
   for (uint32_t i = 0; i < sizeof(Z_Commands) / sizeof(Z_Commands[0]); i++) {
     const Z_CommandConverter *conv = &Z_Commands[i];
-    if (0 == strcasecmp_P(command, conv->tasmota_cmd)) {
-      *cluster = conv->cluster;
-      *cmd = conv->cmd;
+    uint8_t conv_direction = pgm_read_byte(&conv->direction);
+    uint8_t conv_cmd = pgm_read_byte(&conv->cmd);
+    uint16_t conv_cluster = pgm_read_word(&conv->cluster);
+    if ((conv_direction & 0x01) && (0 == strcasecmp_P(command, conv->tasmota_cmd))) {
+      *cluster = conv_cluster;
+      *cmd = conv_cmd;
       return (const __FlashStringHelper*) conv->param;
     }
   }
diff --git a/tasmota/xdrv_23_zigbee_7_statemachine.ino b/tasmota/xdrv_23_zigbee_7_statemachine.ino
index d0616a40b..015a07ab4 100644
--- a/tasmota/xdrv_23_zigbee_7_statemachine.ino
+++ b/tasmota/xdrv_23_zigbee_7_statemachine.ino
@@ -33,7 +33,7 @@ const uint8_t  ZIGBEE_STATUS_NODE_DESC = 31;            // Node descriptor
 const uint8_t  ZIGBEE_STATUS_ACTIVE_EP = 32;            // Endpoints descriptor
 const uint8_t  ZIGBEE_STATUS_SIMPLE_DESC = 33;          // Simple Descriptor (clusters)
 const uint8_t  ZIGBEE_STATUS_DEVICE_INDICATION = 34;    // Device announces its address
-const uint8_t  ZIGBEE_STATUS_DEVICE_IEEE = 35;          // Request of device address
+//const uint8_t  ZIGBEE_STATUS_DEVICE_IEEE = 35;          // Request of device address
 const uint8_t  ZIGBEE_STATUS_CC_VERSION = 50;           // Status: CC2530 ZNP Version
 const uint8_t  ZIGBEE_STATUS_CC_INFO = 51;              // Status: CC2530 Device Configuration
 const uint8_t  ZIGBEE_STATUS_UNSUPPORTED_VERSION = 98;  // Unsupported ZNP version
@@ -49,9 +49,6 @@ typedef union Zigbee_Instruction {
     uint16_t d16;    // 16 bits data
   } i;
   const void *p;              // pointer
-  // const void *m;           // for type checking only, message
-  // const ZB_Func f;
-  // const ZB_RecvMsgFunc fr;
 } Zigbee_Instruction;
 //
 // Zigbee_Instruction z1 = { .i = {1,2,3}};
diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index 9e336d0c1..859351438 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -39,7 +39,7 @@ int32_t Z_ReceiveDeviceInfo(int32_t res, class SBuffer &buf) {
   char hex[20];
   Uint64toHex(long_adr, hex, 64);
   Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                  "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+                  "\"Status\":%d,\"IEEEAddr\":\"0x%s\",\"ShortAddr\":\"0x%04X\""
                   ",\"DeviceType\":%d,\"DeviceState\":%d"
                   ",\"NumAssocDevices\":%d"),
                   ZIGBEE_STATUS_CC_INFO, hex, short_adr, device_type, device_state,
@@ -355,21 +355,24 @@ int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
     zigbee_devices.updateDevice(nwkAddr, ieeeAddr);
     char hex[20];
     Uint64toHex(ieeeAddr, hex, 64);
-    Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
-                    "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
-                    "}}"),
-                    ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
-                    );
+    // Response_P(PSTR("{\"" D_JSON_ZIGBEE_STATE "\":{"
+    //                 "\"Status\":%d,\"IEEEAddr\":\"%s\",\"ShortAddr\":\"0x%04X\""
+    //                 "}}"),
+    //                 ZIGBEE_STATUS_DEVICE_IEEE, hex, nwkAddr
+    //                 );
 
-    MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
-    XdrvRulesProcess();
+    // MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+    // XdrvRulesProcess();
     // Ping response
     const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
     if (friendlyName) {
       Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
-                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, friendlyName->c_str());
+                      ",\"" D_JSON_ZIGBEE_IEEE "\":\"0x%s\""
+                      ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\"}}"), nwkAddr, hex, friendlyName->c_str());
     } else {
-      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\"}}"), nwkAddr);
+      Response_P(PSTR("{\"" D_JSON_ZIGBEE_PING "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                      ",\"" D_JSON_ZIGBEE_IEEE "\":\"0x%s\""
+                      "}}"), nwkAddr, hex);
     }
 
     MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
@@ -378,6 +381,27 @@ int32_t Z_ReceiveIEEEAddr(int32_t res, const class SBuffer &buf) {
   return -1;
 }
 
+int32_t Z_BindRsp(int32_t res, const class SBuffer &buf) {
+  Z_ShortAddress    nwkAddr = buf.get16(2);
+  uint8_t           status = buf.get8(4);
+
+  const String * friendlyName = zigbee_devices.getFriendlyName(nwkAddr);
+  if (friendlyName) {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_BIND "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                    ",\"" D_JSON_ZIGBEE_NAME "\":\"%s\""
+                    ",\"" D_JSON_ZIGBEE_Status "\":%d"
+                    "}}"), nwkAddr, friendlyName->c_str(), status);
+  } else {
+    Response_P(PSTR("{\"" D_JSON_ZIGBEE_BIND "\":{\"" D_JSON_ZIGBEE_DEVICE "\":\"0x%04X\""
+                    ",\"" D_JSON_ZIGBEE_Status "\":%d"
+                    "}}"), nwkAddr, status);
+  }
+  MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEEZCL_RECEIVED));
+  XdrvRulesProcess();
+
+  return -1;
+}
+
 int32_t Z_ReceiveEndDeviceAnnonce(int32_t res, const class SBuffer &buf) {
   Z_ShortAddress    srcAddr = buf.get16(2);
   Z_ShortAddress    nwkAddr = buf.get16(4);
@@ -480,36 +504,45 @@ int32_t Z_ReceiveAfIncomingMessage(int32_t res, const class SBuffer &buf) {
   DynamicJsonBuffer jsonBuffer;
   JsonObject& json = jsonBuffer.createObject();
 
-  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
-    zcl_received.parseRawAttributes(json);
-    if (clusterid) { defer_attributes = true; }  // don't defer system Cluster=0 messages
-  } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
-    zcl_received.parseReadAttributes(json);
-  } else if (zcl_received.isClusterSpecificCommand()) {
-    zcl_received.parseClusterSpecificCommand(json);
-  }
-  String msg("");
-  msg.reserve(100);
-  json.printTo(msg);
-  AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
-
-  zcl_received.postProcessAttributes(srcaddr, json);
-  // Add Endpoint
-  json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
-  // Add linkquality
-  json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
-
-  if (defer_attributes) {
-    // Prepare for publish
-    if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
-      // there is conflicting values, force a publish of the previous message now and don't coalesce
-      zigbee_devices.jsonPublishFlush(srcaddr);
+  if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_DEFAULT_RESPONSE == zcl_received.getCmdId())) {
+      zcl_received.parseResponse();
+  } else {  
+    // Build the ZbReceive json
+    if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_REPORT_ATTRIBUTES == zcl_received.getCmdId())) {
+      zcl_received.parseRawAttributes(json);
+      if (clusterid) { defer_attributes = true; }  // don't defer system Cluster=0 messages
+    } else if ( (!zcl_received.isClusterSpecificCommand()) && (ZCL_READ_ATTRIBUTES_RESPONSE == zcl_received.getCmdId())) {
+      zcl_received.parseReadAttributes(json);
+    } else if (zcl_received.isClusterSpecificCommand()) {
+      zcl_received.parseClusterSpecificCommand(json);
+    }
+    String msg("");
+    msg.reserve(100);
+    json.printTo(msg);
+    AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_ZIGBEE D_JSON_ZIGBEEZCL_RAW_RECEIVED ": {\"0x%04X\":%s}"), srcaddr, msg.c_str());
+
+    zcl_received.postProcessAttributes(srcaddr, json);
+    // Add Endpoint
+    json[F(D_CMND_ZIGBEE_ENDPOINT)] = srcendpoint;
+    // Add Group if non-zero
+    if (groupid) {
+      json[F(D_CMND_ZIGBEE_GROUP)] = groupid;
+    }
+    // Add linkquality
+    json[F(D_CMND_ZIGBEE_LINKQUALITY)] = linkquality;
+
+    if (defer_attributes) {
+      // Prepare for publish
+      if (zigbee_devices.jsonIsConflict(srcaddr, json)) {
+        // there is conflicting values, force a publish of the previous message now and don't coalesce
+        zigbee_devices.jsonPublishFlush(srcaddr);
+      }
+      zigbee_devices.jsonAppend(srcaddr, json);
+      zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
+    } else {
+      // Publish immediately
+      zigbee_devices.jsonPublishNow(srcaddr, json);
     }
-    zigbee_devices.jsonAppend(srcaddr, json);
-    zigbee_devices.setTimer(srcaddr, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, 0, &Z_PublishAttributes);
-  } else {
-    // Publish immediately
-    zigbee_devices.jsonPublishNow(srcaddr, json);
   }
   return -1;
 }
@@ -527,6 +560,7 @@ ZBM(AREQ_PERMITJOIN_OPEN_XX, Z_AREQ | Z_ZDO, ZDO_PERMIT_JOIN_IND )    // 45CB
 ZBM(AREQ_ZDO_ACTIVEEPRSP, Z_AREQ | Z_ZDO, ZDO_ACTIVE_EP_RSP)    // 4585
 ZBM(AREQ_ZDO_SIMPLEDESCRSP, Z_AREQ | Z_ZDO, ZDO_SIMPLE_DESC_RSP)    // 4584
 ZBM(AREQ_ZDO_IEEE_ADDR_RSP, Z_AREQ | Z_ZDO, ZDO_IEEE_ADDR_RSP)    // 4581
+ZBM(AREQ_ZDO_BIND_RSP, Z_AREQ | Z_ZDO, ZDO_BIND_RSP)    // 45A1
 
 const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_AF_INCOMING_MESSAGE,     &Z_ReceiveAfIncomingMessage },
@@ -537,6 +571,7 @@ const Z_Dispatcher Z_DispatchTable[] PROGMEM = {
   { AREQ_ZDO_ACTIVEEPRSP,         &Z_ReceiveActiveEp },
   { AREQ_ZDO_SIMPLEDESCRSP,       &Z_ReceiveSimpleDesc },
   { AREQ_ZDO_IEEE_ADDR_RSP,       &Z_ReceiveIEEEAddr },
+  { AREQ_ZDO_BIND_RSP,            &Z_BindRsp },
 };
 
 int32_t Z_Recv_Default(int32_t res, const class SBuffer &buf) {
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index 08055ba9e..3ed971b0e 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -33,22 +33,16 @@ const char kZbCommands[] PROGMEM = D_PRFX_ZB "|"    // prefix
   D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
   D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
   D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
-  D_CMND_ZIGBEE_PING ;
-
-const char kZigbeeCommands[] PROGMEM = D_PRFX_ZIGBEE "|"    // legacy prefix -- deprecated
-  D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEE_PERMITJOIN "|"
-  D_CMND_ZIGBEE_STATUS "|" D_CMND_ZIGBEE_RESET "|" D_CMND_ZIGBEE_SEND "|"
-  D_CMND_ZIGBEE_PROBE "|" D_CMND_ZIGBEE_READ "|" D_CMND_ZIGBEEZNPRECEIVE "|"
-  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|" D_CMND_ZIGBEE_BIND "|"
-  D_CMND_ZIGBEE_PING ;
+  D_CMND_ZIGBEE_FORGET "|" D_CMND_ZIGBEE_SAVE "|" D_CMND_ZIGBEE_NAME "|"
+  D_CMND_ZIGBEE_BIND "|" D_CMND_ZIGBEE_PING "|" D_CMND_ZIGBEE_MODELID
+  ;
 
 void (* const ZigbeeCommand[])(void) PROGMEM = {
   &CmndZbZNPSend, &CmndZbPermitJoin,
   &CmndZbStatus, &CmndZbReset, &CmndZbSend,
   &CmndZbProbe, &CmndZbRead, &CmndZbZNPReceive,
-  &CmndZbForget, &CmndZbSave, &CmndZbName, &CmndZbBind,
-  &CmndZbPing,
+  &CmndZbForget, &CmndZbSave, &CmndZbName,
+  &CmndZbBind, &CmndZbPing, &CmndZbModelId,
   };
 
 int32_t ZigbeeProcessInput(class SBuffer &buf) {
@@ -547,35 +541,75 @@ void CmndZbBind(void) {
 
   // params
   // static char delim[] = ", ";    // delimiters for parameters
-  uint16_t device = 0xFFFF;         // 0xFFFF is broadcast, so considered valid
-  uint8_t  endpoint = 0x00;         // 0x00 is invalid for the dst endpoint
+  uint16_t srcDevice = 0xFFFF;         // 0xFFFF is broadcast, so considered invalid
+  uint16_t dstDevice = 0xFFFF;      // 0xFFFF is broadcast, so considered invalid
+  uint64_t dstLongAddr = 0;
+  uint8_t  endpoint = 0x00;         // 0x00 is invalid for the src endpoint
+  uint8_t  toendpoint = 0x00;       // 0x00 is invalid for the dst endpoint
+  uint16_t toGroup = 0x0000;        // group address
   uint16_t cluster  = 0;            // 0xFFFF is invalid
   uint32_t group = 0xFFFFFFFF;      // 16 bits values, otherwise 0xFFFFFFFF is unspecified
 
+  // Information about source device: "Device", "Endpoint", "Cluster"
+  //  - the source endpoint must have a known IEEE address
   const JsonVariant &val_device = getCaseInsensitive(json, PSTR("Device"));
   if (nullptr != &val_device) {
-    device = zigbee_devices.parseDeviceParam(val_device.as<char*>());
-    if (0xFFFF == device) { ResponseCmndChar("Invalid parameter"); return; }
+    srcDevice = zigbee_devices.parseDeviceParam(val_device.as<char*>());
+    if (0xFFFF == srcDevice) { ResponseCmndChar("Invalid parameter"); return; }
   }
-  if ((nullptr == &val_device) || (0x000 == device)) { ResponseCmndChar("Unknown device"); return; }
-
+  if ((nullptr == &val_device) || (0x0000 == srcDevice)) { ResponseCmndChar("Unknown source device"); return; }
+  // check if IEEE address is known
+  uint64_t srcLongAddr = zigbee_devices.getDeviceLongAddr(srcDevice);
+  if (0 == srcLongAddr) { ResponseCmndChar("Unknown source IEEE address"); return; }
+  // look for source endpoint
   const JsonVariant &val_endpoint = getCaseInsensitive(json, PSTR("Endpoint"));
   if (nullptr != &val_endpoint) { endpoint = strToUInt(val_endpoint); }
+  // look for source cluster
   const JsonVariant &val_cluster = getCaseInsensitive(json, PSTR("Cluster"));
   if (nullptr != &val_cluster) { cluster = strToUInt(val_cluster); }
 
-  // TODO compute endpoint from cluster
+  // Either Device address
+  // In this case the following parameters are mandatory
+  //  - "ToDevice" and the device must have a known IEEE address
+  //  - "ToEndpoint"
+  const JsonVariant &dst_device = getCaseInsensitive(json, PSTR("ToDevice"));
+  if (nullptr != &dst_device) {
+    dstDevice = zigbee_devices.parseDeviceParam(dst_device.as<char*>());
+    if (0xFFFF == dstDevice) { ResponseCmndChar("Invalid parameter"); return; }
+    if (0x0000 == dstDevice) {
+      dstLongAddr = localIEEEAddr;
+    } else {
+      dstLongAddr = zigbee_devices.getDeviceLongAddr(dstDevice);
+    }
+    if (0 == dstLongAddr) { ResponseCmndChar("Unknown dest IEEE address"); return; }
+
+    const JsonVariant &val_toendpoint = getCaseInsensitive(json, PSTR("ToEndpoint"));
+    if (nullptr != &val_toendpoint) { toendpoint = strToUInt(val_endpoint); } else { toendpoint = endpoint; }
+  }
+
+  // Or Group Address - we don't need a dstEndpoint in this case
+  const JsonVariant &to_group = getCaseInsensitive(json, PSTR("ToGroup"));
+  if (nullptr != &to_group) { toGroup = strToUInt(to_group); }
+
+  // make sure we don't have conflicting parameters
+  if (toGroup && dstLongAddr) { ResponseCmndChar("Cannot have both \"ToDevice\" and \"ToGroup\""); return; }
+  if (!toGroup && !dstLongAddr) { ResponseCmndChar("Missing \"ToDevice\" or \"ToGroup\""); return; }
 
   SBuffer buf(sizeof(ZBS_BIND_REQ));
   buf.add8(Z_SREQ | Z_ZDO);
   buf.add8(ZDO_BIND_REQ);
-  buf.add16(device);
-  buf.add64(zigbee_devices.getDeviceLongAddr(device));
+  buf.add16(srcDevice);
+  buf.add64(srcLongAddr);
   buf.add8(endpoint);
   buf.add16(cluster);
-  buf.add8(0x03);             // DstAddrMode - 0x03 = ADDRESS_64_BIT
-  buf.add64(localIEEEAddr);   // coordinatore IEEE address
-  buf.add8(0x01);             // local endpoint = 1
+  if (dstLongAddr) {
+    buf.add8(Z_Addr_IEEEAddress);         // DstAddrMode - 0x03 = ADDRESS_64_BIT
+    buf.add64(dstLongAddr);
+    buf.add8(toendpoint);
+  } else {
+    buf.add8(Z_Addr_Group);               // DstAddrMode - 0x01 = GROUP_ADDRESS
+    buf.add16(toGroup);
+  }
 
   ZigbeeZNPSend(buf.getBuffer(), buf.len());
 
@@ -635,6 +669,35 @@ void CmndZbName(void) {
   }
 }
 
+// Specify, read or erase a ModelId, only for debug purposes
+void CmndZbModelId(void) {
+  // Syntax is:
+  //  ZigbeeName <device_id>,<friendlyname>  - assign a friendly name
+  //  ZigbeeName <device_id>                 - display the current friendly name
+  //  ZigbeeName <device_id>,                - remove friendly name
+  //
+  // Where <device_id> can be: short_addr, long_addr, device_index, friendly_name
+
+  if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
+
+  // check if parameters contain a comma ','
+  char *p;
+  char *str = strtok_r(XdrvMailbox.data, ", ", &p);
+
+  // parse first part, <device_id>
+  uint16_t shortaddr = zigbee_devices.parseDeviceParam(XdrvMailbox.data, true);  // in case of short_addr, it must be already registered
+  if (0x0000 == shortaddr) { ResponseCmndChar("Unknown device"); return; }
+  if (0xFFFF == shortaddr) { ResponseCmndChar("Invalid parameter"); return; }
+
+  if (p == nullptr) {
+    const String * modelId = zigbee_devices.getModelId(shortaddr);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_MODELID "\":\"%s\"}}"), shortaddr, modelId ? modelId->c_str() : "");
+  } else {
+    zigbee_devices.setModelId(shortaddr, p);
+    Response_P(PSTR("{\"0x%04X\":{\"" D_JSON_ZIGBEE_MODELID "\":\"%s\"}}"), shortaddr, p);
+  }
+}
+
 // Remove an old Zigbee device from the list of known devices, use ZigbeeStatus to know all registered devices
 void CmndZbForget(void) {
   if (zigbee.init_phase) { ResponseCmndChar(D_ZIGBEE_NOT_STARTED); return; }
@@ -775,7 +838,6 @@ bool Xdrv23(uint8_t function)
       case FUNC_LOOP:
         if (ZigbeeSerial) { ZigbeeInput(); }
 				if (zigbee.state_machine) {
-					//ZigbeeStateMachine();
           ZigbeeStateMachine_Run();
 				}
         break;
@@ -784,7 +846,6 @@ bool Xdrv23(uint8_t function)
         break;
       case FUNC_COMMAND:
         result = DecodeCommand(kZbCommands, ZigbeeCommand);
-        result = result || DecodeCommand(kZigbeeCommands, ZigbeeCommand);   // deprecated
         break;
     }
   }

From 82954e2928253a89edc8dfdd298abe4d78aa1263 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 1 Mar 2020 13:52:01 +0100
Subject: [PATCH 382/403] Delete launch.json

---
 .theia/launch.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .theia/launch.json

diff --git a/.theia/launch.json b/.theia/launch.json
deleted file mode 100644
index a2ea02c46..000000000
--- a/.theia/launch.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  "version": "0.2.0",
-  "configurations": []
-}

From 3343164da9a83f4ce432542d07e6c45c2237cbad Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:20:19 +0100
Subject: [PATCH 383/403] Add support for MaxBotix HRXL-MaxSonar

Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
---
 BUILDS.md                    | 1 +
 RELEASENOTES.md              | 5 ++++-
 tasmota/CHANGELOG.md         | 6 ++++--
 tasmota/my_user_config.h     | 1 +
 tasmota/support_features.ino | 6 ++++--
 tasmota/tasmota_post.h       | 4 ++++
 tools/decode-status.py       | 4 ++--
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/BUILDS.md b/BUILDS.md
index f09de3125..53ebba456 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -130,6 +130,7 @@
 | USE_IBEACON           | - | - | - | - | x | - | - |
 | USE_GPS               | - | - | - | - | - | - | - |
 | USE_HM10              | - | - | - | - | x | - | - |
+| USE_HRXL              | - | - | - | - | x | - | - |
 |                       |   |   |   |   |   |   |   |
 | USE_NRF24             | - | - | - | - | - | - | - |
 | USE_MIBLE             | - | - | - | - | - | - | - |
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d07bb254a..38ba097b4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -57,10 +57,11 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
 - Change Lights: simplified gamma correction and 10 bits internal computation
 - Change commands ``Prefix``, ``Ssid``, ``StateText``, ``NTPServer``, and ``FriendlyName`` displaying all items
-- Change IRremoteESP8266 library updated to v2.7.3
+- Change IRremoteESP8266 library updated to v2.7.4
 - Change Zigbee command prefix from ``Zigbee*`` to ``Zb*``
 - Change MQTT message size with additional 200 characters
 - Change display of some date and time messages from "Wed Feb 19 10:45:12 2020" to "2020-02-19T10:45:12"
+- Change switchmode 6 according to issue 7778 (#7831)
 - Fix Sonoff Bridge, Sc, L1, iFan03 and CSE7766 serial interface to forced speed, config and disable logging
 - Fix commands ``Display`` and ``Counter`` from overruling command processing (#7322)
 - Fix ``White`` added to light status (#7142)
@@ -107,6 +108,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
+- Add Zigbee features and improvements
 - Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
 - Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
 - Add support for Jarolift rollers by Keeloq algorithm
+- Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 579d19975..4a30b6cad 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -3,9 +3,11 @@
 ### 8.1.0.10 20200227
 
 - Change default my_user_config.h driver and sensor support removing most sensors and adding most drivers
-- Add support for Jarolift rollers by Keeloq algorithm
 - Change IRremoteESP8266 library updated to v2.7.4
-- Add Zigbee features and improvements
+- Change switchmode 6 according to issue 7778 (#7831)
+- Add support for Jarolift rollers by Keeloq algorithm
+- Add Zigbee features and improvements and remove support for Zigbee commands starting with ``Zigbee...``
+- Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
 
 ### 8.1.0.9 20200220
 
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 06901fa12..b6300c9a4 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -554,6 +554,7 @@
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+3k1 code, +132 bytes RAM)
 //  #define USE_FLOG                               // Add support for GPS logging in OTA's Flash (Experimental) (+2k9 code, +8 bytes RAM)
 //#define USE_HM10                                 // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
+//#define USE_HRXL                                 // Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 
 // -- Power monitoring sensors --------------------
 #define USE_ENERGY_MARGIN_DETECTION              // Add support for Energy Margin detection (+1k6 code)
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 6a13573c1..c37216c14 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -531,9 +531,11 @@ void GetFeatures(void)
   feature6 = 0x00000000;
 
 #ifdef USE_KEELOQ
-  feature6 |= 0x00000001;  // xdrv_36keeloq.ino
+  feature6 |= 0x00000001;  // xdrv_36_keeloq.ino
+#endif
+#ifdef USE_HRXL
+  feature6 |= 0x00000002;  // xsns_64_hrxl.ino
 #endif
-//  feature6 |= 0x00000002;
 //  feature6 |= 0x00000004;
 //  feature6 |= 0x00000008;
 
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index 2e3ed1e26..fd0183dc9 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -205,6 +205,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_IBEACON                              // Add support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 //#define USE_GPS                                  // Add support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 #define USE_HM10                                 // Add support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
+#define USE_HRXL                                 // Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 
 #define USE_ENERGY_SENSOR                        // Add energy sensors (-14k code)
 #define USE_PZEM004T                             // Add support for PZEM004T Energy monitor (+2k code)
@@ -424,6 +425,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 #undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
+#undef USE_HRXL                                  // Disable support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 
 //#define USE_DHT                                  // Add support for DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321) and SI7021 Temperature and Humidity sensor
 #undef USE_MAX31855                              // Disable MAX31855 K-Type thermocouple sensor using softSPI
@@ -521,6 +523,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 #undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
+#undef USE_HRXL                                  // Disable support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 
 //#undef USE_ENERGY_SENSOR                         // Disable energy sensors
 #undef USE_PZEM004T                              // Disable PZEM004T energy sensor
@@ -640,6 +643,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_IBEACON                               // Disable support for bluetooth LE passive scan of ibeacon devices (uses HM17 module)
 #undef USE_GPS                                   // Disable support for GPS and NTP Server for becoming Stratus 1 Time Source (+ 3.1kb flash, +132 bytes RAM)
 #undef USE_HM10                                  // Disable support for HM-10 as a BLE-bridge for the LYWSD03 (+5k1 code)
+#undef USE_HRXL                                  // Disable support for MaxBotix HRXL-MaxSonar ultrasonic range finders (+0k7)
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors
 #undef USE_PZEM004T                              // Disable PZEM004T energy sensor
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 126b050aa..756f27dff 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -198,7 +198,7 @@ a_features = [[
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
     "USE_AHT1x","USE_WEMOS_MOTOR_V1","USE_DEVICE_GROUPS","USE_PWM_DIMMER"
     ],[
-    "USE_KEELOQ","","","",
+    "USE_KEELOQ","USE_HRXL","","",
     "","","","",
     "","","","",
     "","","","",
@@ -239,7 +239,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200228 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200301 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From 473892d5c925a0aef9975f299915d8f01b18391e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 1 Mar 2020 15:31:08 +0100
Subject: [PATCH 384/403] Add updated experimental Sonoff D1 support

Add updated experimental Sonoff D1 support (#7598)
---
 tasmota/my_user_config.h      |   2 +-
 tasmota/support_features.ino  |   4 +-
 tasmota/tasmota_post.h        |  10 ++
 tasmota/tasmota_template.h    |   4 +-
 tasmota/xdrv_37_sonoff_d1.ino | 225 ++++++++++++++++++++++++++++++++++
 tools/decode-status.py        |   2 +-
 6 files changed, 243 insertions(+), 4 deletions(-)
 create mode 100644 tasmota/xdrv_37_sonoff_d1.ino

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index b6300c9a4..77c0771ee 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -419,7 +419,7 @@
 #define USE_PWM_DIMMER                           // Add support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
   #define USE_PWM_DIMMER_REMOTE                  // Add support for remote switches to PWM Dimmer, also adds device groups support (+0k7 code, also includes device groups)
 //#define USE_KEELOQ                               // Add support for Jarolift rollers by Keeloq algorithm (+4k5 code)
-//#define USE_SONOFF_D1                            // Add support for Sonoff D1
+#define USE_SONOFF_D1                            // Add support for Sonoff D1 Dimmer (+0k7 code)
 
 // -- Optional light modules ----------------------
 #define USE_WS2812                               // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index c37216c14..4049d9cfe 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -536,7 +536,9 @@ void GetFeatures(void)
 #ifdef USE_HRXL
   feature6 |= 0x00000002;  // xsns_64_hrxl.ino
 #endif
-//  feature6 |= 0x00000004;
+#ifdef USE_SONOFF_D1
+  feature6 |= 0x00000004;
+#endif
 //  feature6 |= 0x00000008;
 
 //  feature6 |= 0x00000010;
diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h
index fd0183dc9..7cf0fff75 100644
--- a/tasmota/tasmota_post.h
+++ b/tasmota/tasmota_post.h
@@ -117,6 +117,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #define USE_HOTPLUG                              // Add support for sensor HotPlug
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+5k6 code)
 #undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
+#undef USE_KEELOQ                                // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+#define USE_SONOFF_D1                            // Add support for Sonoff D1 Dimmer (+0k7 code)
 
 // -- Optional light modules ----------------------
 #define USE_LIGHT                                // Add Dimmer/Light support
@@ -305,6 +307,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 #undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
+#undef USE_KEELOQ                                // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+#undef USE_SONOFF_D1                             // Disable support for Sonoff D1 Dimmer (+0k7 code)
 
 #undef USE_ENERGY_SENSOR                         // Disable energy sensors (-14k code)
   #undef USE_PZEM004T                            // Disable PZEM004T energy sensor
@@ -384,6 +388,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 #undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
+#undef USE_KEELOQ                                // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+#undef USE_SONOFF_D1                             // Disable support for Sonoff D1 Dimmer (+0k7 code)
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
@@ -495,6 +501,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 #undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
+#undef USE_KEELOQ                                // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+//#undef USE_SONOFF_D1                             // Disable support for Sonoff D1 Dimmer (+0k7 code)
 
 // -- Optional light modules ----------------------
 //#undef USE_LIGHT                                 // Also disable all Dimmer/Light support
@@ -613,6 +621,8 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack
 #undef USE_DEVICE_GROUPS                         // Disable support for device groups (+3k5 code)
 #undef USE_PWM_DIMMER                            // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code)
 #undef USE_PWM_DIMMER_REMOTE                     // Disbale support for remote switches to PWM Dimmer
+#undef USE_KEELOQ                                // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code)
+#undef USE_SONOFF_D1                             // Disable support for Sonoff D1 Dimmer (+0k7 code)
 
 // -- Optional light modules ----------------------
 #undef USE_LIGHT                                 // Disable support for lights
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index cdc976bb0..a45c456f8 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -2264,7 +2264,9 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      0,                // GPIO09
      0,                // GPIO10
                        // GPIO11 (SD_CMD   Flash)
-     0, 0, 0, 0, 0, 0
+     0,                // GPIO12
+     GPIO_LED1_INV,    // GPIO13 WiFi Blue Led - Link and Power status
+     0, 0, 0, 0
   }
 };
 
diff --git a/tasmota/xdrv_37_sonoff_d1.ino b/tasmota/xdrv_37_sonoff_d1.ino
new file mode 100644
index 000000000..b7f98c352
--- /dev/null
+++ b/tasmota/xdrv_37_sonoff_d1.ino
@@ -0,0 +1,225 @@
+/*
+  xdrv_37_sonoff_d1.ino - sonoff D1 dimmer support for Tasmota
+
+  Copyright (C) 2020  Theo Arends and robbz23 (protocol analysis)
+
+  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/>.
+*/
+
+#ifdef USE_SONOFF_D1
+/*********************************************************************************************\
+ * Sonoff D1 dimmer 433
+ *
+ *  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10
+ * AA 55                                              - Header
+ *       01 04                                        - Version?
+ *             00 0A                                  - Following data length (10 bytes)
+ *                   01                               - Power state (00 = off, 01 = on, FF = ignore)
+ *                      64                            - Dimmer percentage (01 to 64 = 1 to 100%)
+ *                         FF FF FF FF FF FF FF FF    - Not used
+ *                                                 6C - CRC over bytes 2 to F (Addition)
+ *
+ * Based on Gravitate1:
+ * When I switch the light ON via the app, I get:
+ * AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C
+ *
+ * When I switch it OFF, I get:
+ * AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B
+ *
+ * When I set it to 1%, I get:
+ * AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07
+ * AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09
+ *
+ * When I set it to 6%, I get:
+ * AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C
+ * AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E
+ *
+ * When I set it to 100%, I get:
+ * AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A
+ * AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C
+ *
+ * Based on robbz23:
+ * 00:17:59 CMD: Baudrate 9600
+ * 00:17:59 SER: Set to 8N1 9600 bit/s
+ * 00:17:59 RSL: stat/tasmota_D9E56D/RESULT = {"Baudrate":9600}
+ *
+ * 00:25:32 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 29
+ * 00:25:32 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ *
+ * 00:26:35 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 2a
+ * 00:26:35 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ * 00:26:35 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
+ *
+ * 00:28:58 CMD: SerialSend5 aa 55 01 04 00 0a 01 01 ffffffffffffffff 09
+ * 00:28:58 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
+ * 00:28:58 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
+ *
+ * 00:29:12 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 3C FF FF FF FF FF FF FF FF 44}
+ * 00:29:43 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 01 FF FF FF FF FF FF FF FF 09}
+ * 00:29:53 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C}
+ *
+ * 00:30:02 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A FF 1E FF FF FF FF FF FF FF FF 24}
+\*********************************************************************************************/
+
+#define XDRV_37                   37
+
+struct SONOFFD1 {
+  uint8_t receive_flag = 0;
+  uint8_t dimmer;
+} SnfD1;
+
+/********************************************************************************************/
+
+void SonoffD1Received(void)
+{
+  char svalue[32];
+
+  uint8_t action = serial_in_buffer[6];
+  uint8_t dimmer = serial_in_buffer[7];
+
+  if (action < 2) {
+    // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
+    // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
+    bool is_switch_change = (action != power);
+    if (is_switch_change) {
+      ExecuteCommandPower(1, action, SRC_SWITCH);
+    }
+  }
+  else if (0xFF == action) {
+    SnfD1.dimmer = dimmer;
+    bool is_brightness_change = SnfD1.dimmer != Settings.light_dimmer;
+    if (power && (SnfD1.dimmer > 0) && is_brightness_change) {
+      char scmnd[20];
+      snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), SnfD1.dimmer);
+      ExecuteCommand(scmnd, SRC_SWITCH);
+    }
+  }
+
+  // Send Acknowledge - Copy first 5 bytes, reset byte 6 and store crc in byte 7
+  // AA 55 01 04 00 00 05
+  serial_in_buffer[5] = 0;                      // Ack
+  serial_in_buffer[6] = 0;                      // Crc
+  for (uint32_t i = 0; i < 7; i++) {
+    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
+    Serial.write(serial_in_buffer[i]);
+  }
+}
+
+bool SonoffD1SerialInput(void)
+{
+  uint8_t packet_length = 0;
+
+  if (0xAA == serial_in_byte) {               // 0xAA - Start of text
+    serial_in_byte_counter = 0;
+    SnfD1.receive_flag = true;
+  }
+  if (SnfD1.receive_flag) {
+    serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
+    if (serial_in_byte_counter == 6) {
+      packet_length = 7 + serial_in_byte;  // 8 or 17
+    }
+    if (serial_in_byte_counter == packet_length) {
+
+      // Sonoff D1 codes
+      // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
+      // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
+      // AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07 - Power ignore, Dimmer 1%
+      // AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09 - Response 2
+      // AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C - Power ignore, Dimmer 6%
+      // AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E - Response 2
+      // AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A - Power ignore, Dimmer 100%
+      // AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C - Response 2
+
+      AddLogSerial(LOG_LEVEL_DEBUG);
+      uint8_t crc = 0;
+      for (uint32_t i = 2; i < packet_length -1; i++) {
+        crc += serial_in_buffer[i];
+      }
+      if (crc == serial_in_buffer[packet_length -1]) {
+        SonoffD1Received();
+        SnfD1.receive_flag = false;
+        return true;
+      }
+    }
+    serial_in_byte = 0;
+  }
+  return false;
+}
+
+/********************************************************************************************/
+
+bool SonoffD1SendPower(void)
+{
+  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+
+  buffer[6] = XdrvMailbox.index;
+
+  for (uint32_t i = 0; i < sizeof(buffer); i++) {
+    if ((i > 1) && (i < sizeof(buffer) -1)) { buffer[16] += buffer[i]; }
+    Serial.write(buffer[i]);
+  }
+  return true;
+}
+
+bool SonoffD1SendDimmer(void)
+{
+  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0xFF,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+
+  buffer[7] = changeUIntScale(((uint16_t *)XdrvMailbox.data)[0], 0, 255, 0, 100);
+
+  for (uint32_t i = 0; i < sizeof(buffer); i++) {
+    if ((i > 1) && (i < sizeof(buffer) -1)) { buffer[16] += buffer[i]; }
+    Serial.write(buffer[i]);
+  }
+  return true;
+}
+
+bool SonoffD1ModuleSelected(void)
+{
+  SetSerial(9600, TS_SERIAL_8N1);
+
+  devices_present++;
+  light_type = LT_SERIAL1;
+
+  return true;
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv37(uint8_t function)
+{
+  bool result = false;
+
+  if (SONOFF_D1 == my_module_type) {
+    switch (function) {
+      case FUNC_SERIAL:
+        result = SonoffD1SerialInput();
+        break;
+      case FUNC_SET_DEVICE_POWER:
+        result = SonoffD1SendPower();
+        break;
+      case FUNC_SET_CHANNELS:
+        result = SonoffD1SendDimmer();
+        break;
+      case FUNC_MODULE_INIT:
+        result = SonoffD1ModuleSelected();
+        break;
+    }
+  }
+  return result;
+}
+
+#endif  // USE_SONOFF_D1
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 756f27dff..6c5dd6a5b 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -198,7 +198,7 @@ a_features = [[
     "USE_NRF24","USE_MIBLE","USE_HM10","USE_LE01MR",
     "USE_AHT1x","USE_WEMOS_MOTOR_V1","USE_DEVICE_GROUPS","USE_PWM_DIMMER"
     ],[
-    "USE_KEELOQ","USE_HRXL","","",
+    "USE_KEELOQ","USE_HRXL","USE_SONOFF_D1","",
     "","","","",
     "","","","",
     "","","","",

From 2b438328ddaff4ef832b5aa741a9d8a7f3f667fc Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 1 Mar 2020 16:13:59 +0100
Subject: [PATCH 385/403] Add DimmerRange support to Sonoff D1

Add DimmerRange support to Sonoff D1 (#7598)
---
 tasmota/xdrv_37_sonoff_d1.ino | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tasmota/xdrv_37_sonoff_d1.ino b/tasmota/xdrv_37_sonoff_d1.ino
index b7f98c352..d00d58162 100644
--- a/tasmota/xdrv_37_sonoff_d1.ino
+++ b/tasmota/xdrv_37_sonoff_d1.ino
@@ -159,29 +159,33 @@ bool SonoffD1SerialInput(void)
 
 /********************************************************************************************/
 
-bool SonoffD1SendPower(void)
+void SonoffD1Send(uint8_t lpower, uint8_t dimmer)
 {
-  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+  //                        0    1    2    3    4    5    6    7    8    9   10   11   12   13   14   15   16
+  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
 
-  buffer[6] = XdrvMailbox.index;
+  buffer[6] = lpower;
+  buffer[7] = dimmer;
 
   for (uint32_t i = 0; i < sizeof(buffer); i++) {
     if ((i > 1) && (i < sizeof(buffer) -1)) { buffer[16] += buffer[i]; }
     Serial.write(buffer[i]);
   }
+}
+
+bool SonoffD1SendPower(void)
+{
+  SonoffD1Send(XdrvMailbox.index &1, 0xFF);
   return true;
 }
 
 bool SonoffD1SendDimmer(void)
 {
-  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0xFF,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
+  uint8_t dimmer = changeUIntScale(((uint16_t *)XdrvMailbox.data)[0], 0, 255, 0, 100);
+  dimmer = (dimmer < Settings.dimmer_hw_min) ? Settings.dimmer_hw_min : dimmer;
+  dimmer = (dimmer > Settings.dimmer_hw_max) ? Settings.dimmer_hw_max : dimmer;
 
-  buffer[7] = changeUIntScale(((uint16_t *)XdrvMailbox.data)[0], 0, 255, 0, 100);
-
-  for (uint32_t i = 0; i < sizeof(buffer); i++) {
-    if ((i > 1) && (i < sizeof(buffer) -1)) { buffer[16] += buffer[i]; }
-    Serial.write(buffer[i]);
-  }
+  SonoffD1Send(0xFF, dimmer);
   return true;
 }
 

From a837a8ac7ce4d65b3d590a7a258e030448d7cec0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 1 Mar 2020 22:13:02 +0100
Subject: [PATCH 386/403] Fix compile error

---
 tasmota/xdrv_39_sonoff_d1.ino | 215 ----------------------------------
 1 file changed, 215 deletions(-)
 delete mode 100644 tasmota/xdrv_39_sonoff_d1.ino

diff --git a/tasmota/xdrv_39_sonoff_d1.ino b/tasmota/xdrv_39_sonoff_d1.ino
deleted file mode 100644
index 9d58f3782..000000000
--- a/tasmota/xdrv_39_sonoff_d1.ino
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-  xdrv_39_sonoff_d1.ino - sonoff D1 dimmer support for Tasmota
-
-  Copyright (C) 2020  Theo Arends and robbz23 (protocol analysis)
-
-  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/>.
-*/
-
-#ifdef USE_SONOFF_D1
-/*********************************************************************************************\
- * Sonoff D1 dimmer 433
- *
- *  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F 10
- * AA 55                                              - Header
- *       01 04                                        - Version?
- *             00 0A                                  - Following data length (10 bytes)
- *                   01                               - Power state (00 = off, 01 = on, FF = ignore)
- *                      64                            - Dimmer percentage (01 to 64 = 1 to 100%)
- *                         FF FF FF FF FF FF FF FF    - Not used
- *                                                 6C - CRC over bytes 2 to F (Addition)
- *
- * Based on Gravitate1:
- * When I switch the light ON via the app, I get:
- * AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C
- *
- * When I switch it OFF, I get:
- * AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B
- *
- * When I set it to 1%, I get:
- * AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07
- * AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09
- *
- * When I set it to 6%, I get:
- * AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C
- * AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E
- *
- * When I set it to 100%, I get:
- * AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A
- * AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C
- *
- * Based on robbz23:
- * 00:17:59 CMD: Baudrate 9600
- * 00:17:59 SER: Set to 8N1 9600 bit/s
- * 00:17:59 RSL: stat/tasmota_D9E56D/RESULT = {"Baudrate":9600}
- *
- * 00:25:32 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 29
- * 00:25:32 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
- *
- * 00:26:35 CMD: SerialSend5 aa 55 01 04 00 0a 01 22 ffffffffffffffff 2a
- * 00:26:35 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
- * 00:26:35 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
- *
- * 00:28:58 CMD: SerialSend5 aa 55 01 04 00 0a 01 01 ffffffffffffffff 09
- * 00:28:58 RSL: stat/tasmota_D9E56D/RESULT = {"SerialSend":"Done"}
- * 00:28:58 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 00 05}
- *
- * 00:29:12 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 3C FF FF FF FF FF FF FF FF 44}
- * 00:29:43 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 01 FF FF FF FF FF FF FF FF 09}
- * 00:29:53 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C}
- *
- * 00:30:02 RSL: tele/tasmota_D9E56D/RESULT = {"SerialReceived":AA 55 01 04 00 0A FF 1E FF FF FF FF FF FF FF FF 24}
-\*********************************************************************************************/
-
-#define XDRV_39                   39
-
-struct SONOFFD1 {
-  uint8_t receive_flag = 0;
-  uint8_t dimmer;
-} SnfD1;
-
-/********************************************************************************************/
-
-void SonoffD1Received(void)
-{
-  char svalue[32];
-
-  uint8_t action = serial_in_buffer[6];
-  uint8_t dimmer = serial_in_buffer[7];
-
-  if (action < 2) {
-    // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
-    // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
-    bool is_switch_change = (action != power);
-    if (is_switch_change) {
-      ExecuteCommandPower(1, action, SRC_SWITCH);
-    }
-  }
-  else if (0xFF == action) {
-    SnfD1.dimmer = dimmer;
-    bool is_brightness_change = SnfD1.dimmer != Settings.light_dimmer;
-    if (power && (SnfD1.dimmer > 0) && is_brightness_change) {
-      char scmnd[20];
-      snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), SnfD1.dimmer);
-      ExecuteCommand(scmnd, SRC_SWITCH);
-    }
-  }
-
-  // Send Acknowledge - Copy first 5 bytes, reset byte 6 and store crc in byte 7
-  // AA 55 01 04 00 00 05
-  serial_in_buffer[5] = 0;                      // Ack
-  serial_in_buffer[6] = 0;                      // Crc
-  for (uint32_t i = 0; i < 7; i++) {
-    if ((i > 1) && (i < 6)) { serial_in_buffer[6] += serial_in_buffer[i]; }
-    Serial.write(serial_in_buffer[i]);
-  }
-}
-
-bool SonoffD1SerialInput(void)
-{
-  uint8_t packet_length = 0;
-
-  if (0xAA == serial_in_byte) {               // 0xAA - Start of text
-    serial_in_byte_counter = 0;
-    SnfD1.receive_flag = true;
-  }
-  if (SnfD1.receive_flag) {
-    serial_in_buffer[serial_in_byte_counter++] = serial_in_byte;
-    if (serial_in_byte_counter == 5) {
-      packet_length = 7 + serial_in_byte;  // 8 or 17
-    }
-    if (serial_in_byte_counter == packet_length) {
-
-      // Sonoff D1 codes
-      // AA 55 01 04 00 0A 01 64 FF FF FF FF FF FF FF FF 6C - Power On, Dimmer 100%
-      // AA 55 01 04 00 0A 00 64 FF FF FF FF FF FF FF FF 6B - Power Off, Dimmer 100%
-      // AA 55 01 04 00 0A FF 01 FF FF FF FF FF FF FF FF 07 - Power ignore, Dimmer 1%
-      // AB 55 FD F7 FF FF F5 01 FF FF FF FF FF FF FF FF 09 - Response 2
-      // AA 55 01 04 00 0A FF 06 FF FF FF FF FF FF FF FF 0C - Power ignore, Dimmer 6%
-      // AB 55 FD F7 FF FF F5 06 FF FF FF FF FF FF FF FF 0E - Response 2
-      // AA 55 01 04 00 0A FF 64 FF FF FF FF FF FF FF FF 6A - Power ignore, Dimmer 100%
-      // AB 55 FD F7 FF FF F5 64 FF FF FF FF FF FF FF FF 6C - Response 2
-
-      AddLogSerial(LOG_LEVEL_DEBUG);
-      uint8_t crc = 0;
-      for (uint32_t i = 2; i < packet_length -1; i++) {
-        crc += serial_in_buffer[i];
-      }
-      if (crc == serial_in_buffer[packet_length -1]) {
-        SonoffD1Received();
-        SnfD1.receive_flag = false;
-        return true;
-      }
-    }
-    serial_in_byte = 0;
-  }
-  return false;
-}
-
-/********************************************************************************************/
-
-bool SonoffD1SendPower(void)
-{
-  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
-
-  buffer[6] = XdrvMailbox.payload;
-
-  for (uint32_t i = 0; i < sizeof(buffer); i++) {
-    if ((i > 1) && (i < sizeof(buffer) -1)) { serial_in_buffer[16] += serial_in_buffer[i]; }
-    Serial.write(serial_in_buffer[i]);
-  }
-  return true;
-}
-
-bool SonoffD1SendDimmer(void)
-{
-  uint8_t buffer[17] = { 0xAA,0x55,0x01,0x04,0x00,0x0A,0xFF,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00 };
-
-  buffer[7] = light_state.getDimmer();
-
-  for (uint32_t i = 0; i < sizeof(buffer); i++) {
-    if ((i > 1) && (i < sizeof(buffer) -1)) { serial_in_buffer[16] += serial_in_buffer[i]; }
-    Serial.write(serial_in_buffer[i]);
-  }
-  return true;
-}
-
-/*********************************************************************************************\
- * Interface
-\*********************************************************************************************/
-
-bool Xdrv39(uint8_t function)
-{
-  bool result = false;
-
-  if (SONOFF_D1 == my_module_type) {
-    switch (function) {
-      case FUNC_SERIAL:
-        result = SonoffD1SerialInput();
-        break;
-      case FUNC_SET_DEVICE_POWER:
-        result = SonoffD1SendPower();
-        break;
-      case FUNC_SET_CHANNELS:
-        result = SonoffD1SendDimmer();
-        break;
-      case FUNC_MODULE_INIT:
-        SetSerial(9600, TS_SERIAL_8N1);
-        break;
-    }
-  }
-  return result;
-}
-
-#endif  // USE_SONOFF_D1

From 669f88a5aab6b99e534bced6bbe80ec23d82a3bb Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 2 Mar 2020 14:00:57 +0100
Subject: [PATCH 387/403] Add Settings.flag2.speed_conversion

---
 tasmota/settings.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tasmota/settings.h b/tasmota/settings.h
index be108ac33..37734b32a 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -140,10 +140,8 @@ typedef union {
   uint32_t data;                           // Allow bit manipulation
   struct {
     uint32_t spare00 : 1;
-    uint32_t spare01 : 1;
-    uint32_t spare02 : 1;
-    uint32_t spare03 : 1;
-    uint32_t time_format : 2;              // (v6.6.0.9) - CMND_TIME
+    uint32_t speed_conversion : 3;         // (v8.1.0.10) - Tx2x sensor
+    uint32_t time_format : 2;              // (v6.6.0.9)  - CMND_TIME
     uint32_t calc_resolution : 3;
     uint32_t weight_resolution : 2;
     uint32_t frequency_resolution : 2;

From 71d810aac451f6f88591dbc69b51f081efcc5181 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 2 Mar 2020 15:51:33 +0100
Subject: [PATCH 388/403] Update Tx2x Sensor

Update Tx2x Sensor with command SpeedUnit (#7843)
---
 tasmota/i18n.h              |  13 ++++
 tasmota/support.ino         |  12 ++++
 tasmota/support_command.ino |  10 +++
 tasmota/support_tasmota.ino |   3 +
 tasmota/xdrv_10_rules.ino   |   9 ++-
 tasmota/xsns_35_tx20.ino    | 132 +++++++++++++++++++-----------------
 6 files changed, 115 insertions(+), 64 deletions(-)

diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 0f1988944..f36f37977 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -139,6 +139,8 @@
 #define D_JSON_SERIALRECEIVED "SerialReceived"
 #define D_JSON_SET "Set"
 #define D_JSON_SIGNAL "Signal"
+#define D_JSON_SPEED "Speed"
+#define D_JSON_SPEED_UNIT "SpeedUnit"
 #define D_JSON_SSID "SSId"
 #define D_JSON_STARTDST "StartDST"       // Start Daylight Savings Time
 #define D_JSON_STARTED "Started"
@@ -287,6 +289,7 @@
 #define D_CMND_LEDSTATE "LedState"
 #define D_CMND_LEDMASK "LedMask"
 #define D_CMND_WIFIPOWER "WifiPower"
+#define D_CMND_SPEEDUNIT "SpeedUnit"
 #define D_CMND_I2CSCAN "I2CScan"
 #define D_CMND_I2CDRIVER "I2CDriver"
 #define D_CMND_DEVGROUP_SHARE "DevGroupShare"
@@ -647,6 +650,16 @@ const char S_OFFLINE[] PROGMEM = D_OFFLINE;
 // support.ino
 static const char kMonthNames[] = D_MONTH3LIST;
 
+const char kSpeedUnit[] PROGMEM = "|m/s|km/h|kn|mph|ft/s|yd/s";
+const float kSpeedConversionFactor[] = {1,            // none
+                                        1,            // m/s
+                                        3.6,          // km/h
+                                        1.943844492,  // kn
+                                        2.236936292,  // mph
+                                        3.280839895,  // ft/s
+                                        1.093613298   // yd/s
+                                       };
+
 // xdrv_02_webserver.ino
 #ifdef USE_WEBSERVER
 // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
diff --git a/tasmota/support.ino b/tasmota/support.ino
index ed2cea4c1..8587c034b 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -641,6 +641,18 @@ String PressureUnit(void)
   return (Settings.flag.pressure_conversion) ? String(D_UNIT_MILLIMETER_MERCURY) : String(D_UNIT_PRESSURE);
 }
 
+float ConvertSpeed(float s)
+{
+  // Entry in m/s
+  return s * kSpeedConversionFactor[Settings.flag2.speed_conversion];
+}
+
+String SpeedUnit(void)
+{
+  char speed[8];
+  return String(GetTextIndexed(speed, sizeof(speed), Settings.flag2.speed_conversion, kSpeedUnit));
+}
+
 void ResetGlobalValues(void)
 {
   if ((uptime - global_update) > GLOBAL_VALUES_VALID) {  // Reset after 5 minutes
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index ac44b9850..43db86430 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -27,6 +27,7 @@ const char kTasmotaCommands[] PROGMEM = "|"  // No prefix
   D_CMND_SERIALDELIMITER "|" D_CMND_IPADDRESS "|" D_CMND_NTPSERVER "|" D_CMND_AP "|" D_CMND_SSID "|" D_CMND_PASSWORD "|" D_CMND_HOSTNAME "|" D_CMND_WIFICONFIG "|"
   D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_INTERLOCK "|" D_CMND_TELEPERIOD "|" D_CMND_RESET "|" D_CMND_TIME "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|"
   D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_LEDMASK "|" D_CMND_WIFIPOWER "|" D_CMND_TEMPOFFSET "|"
+  D_CMND_SPEEDUNIT "|"
 #ifdef USE_I2C
   D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
 #endif
@@ -45,6 +46,7 @@ void (* const TasmotaCommand[])(void) PROGMEM = {
   &CmndSerialDelimiter, &CmndIpAddress, &CmndNtpServer, &CmndAp, &CmndSsid, &CmndPassword, &CmndHostname, &CmndWifiConfig,
   &CmndFriendlyname, &CmndSwitchMode, &CmndInterlock, &CmndTeleperiod, &CmndReset, &CmndTime, &CmndTimezone, &CmndTimeStd,
   &CmndTimeDst, &CmndAltitude, &CmndLedPower, &CmndLedState, &CmndLedMask, &CmndWifiPower, &CmndTempOffset,
+  &CmndSpeedUnit,
 #ifdef USE_I2C
   &CmndI2cScan, CmndI2cDriver,
 #endif
@@ -877,6 +879,14 @@ void CmndWeightResolution(void)
   ResponseCmndNumber(Settings.flag2.weight_resolution);
 }
 
+void CmndSpeedUnit(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6)) {
+    Settings.flag2.speed_conversion = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings.flag2.speed_conversion);
+}
+
 void CmndModule(void)
 {
   if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= MAXMODULE)) {
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index d7396267b..43e73321d 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -696,6 +696,9 @@ bool MqttShowSensor(void)
   if (strstr_P(mqtt_data, PSTR(D_JSON_TEMPERATURE)) != nullptr) {
     ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE_UNIT "\":\"%c\""), TempUnit());
   }
+  if ((strstr_P(mqtt_data, PSTR(D_JSON_SPEED)) != nullptr) && Settings.flag2.speed_conversion) {
+    ResponseAppend_P(PSTR(",\"" D_JSON_SPEED_UNIT "\":\"%s\""), SpeedUnit().c_str());
+  }
   ResponseJsonEnd();
 
   if (json_data_available) { XdrvCall(FUNC_SHOW_SENSOR); }
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index 27c7787e0..2509d6f6f 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -289,8 +289,8 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     str_value = (*obj)[rule_name];                     // "CURRENT"
   }
 
-//  AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Task %s, Name %s, Value |%s|, TrigCnt %d, TrigSt %d, Source %s, Json %s"),
-//    rule_task.c_str(), rule_name.c_str(), rule_svalue, Rules.trigger_count[rule_set], bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set]), event.c_str(), (str_value) ? str_value : "none");
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Task %s, Name %s, Value |%s|, TrigCnt %d, TrigSt %d, Source %s, Json %s"),
+//  rule_task.c_str(), rule_name.c_str(), rule_svalue, Rules.trigger_count[rule_set], bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set]), event.c_str(), (str_value) ? str_value : "none");
 
   Rules.event_value = str_value;                       // Prepare %value%
 
@@ -330,6 +330,9 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     }
   } else match = true;
 
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 1 %d"), match);
+
+
   if (bitRead(Settings.rule_once, rule_set)) {
     if (match) {                                       // Only allow match state changes
       if (!bitRead(Rules.triggers[rule_set], Rules.trigger_count[rule_set])) {
@@ -342,6 +345,8 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     }
   }
 
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 2 %d"), match);
+
   return match;
 }
 
diff --git a/tasmota/xsns_35_tx20.ino b/tasmota/xsns_35_tx20.ino
index 69844fda4..c9c1fcee7 100644
--- a/tasmota/xsns_35_tx20.ino
+++ b/tasmota/xsns_35_tx20.ino
@@ -56,7 +56,6 @@
 #endif // USE_TX20_WIND_SENSOR && USE_TX23_WIND_SENSOR
 
 // #define USE_TX2X_WIND_SENSOR_NOSTATISTICS        // suppress statistics (speed/dir avg/min/max/range)
-
 #define TX2X_BIT_TIME          1220  // microseconds
 #define TX2X_WEIGHT_AVG_SAMPLE  150  // seconds
 #define TX2X_TIMEOUT             10  // seconds
@@ -79,26 +78,28 @@ extern "C" {
 #ifdef USE_WEBSERVER
 #define D_TX20_WIND_AVG "&empty;"
 #define D_TX20_WIND_ANGLE "&ang;"
+#define D_TX20_WIND_DEGREE "&deg;"
 const char HTTP_SNS_TX2X[] PROGMEM =
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED "{m}%s %s{e}"
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED " " D_TX20_WIND_AVG "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MIN "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s " D_UNIT_KILOMETER_PER_HOUR "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED " " D_TX20_WIND_AVG "{m}%s %s{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MIN "{m}%s %s{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_SPEED_MAX "{m}%s %s{e}"
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s %s&deg;{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION "{m}%s %s" D_TX20_WIND_DEGREE "{e}"
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_AVG "{m}%s %s&deg;{e}"
-   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_ANGLE "{m}%s&deg; (%s&deg;,%s&deg;)";
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_AVG "{m}%s %s" D_TX20_WIND_DEGREE "{e}"
+   "{s}" D_TX2x_NAME " " D_TX20_WIND_DIRECTION " " D_TX20_WIND_ANGLE "{m}%s" D_TX20_WIND_DEGREE " (%s,%s)" D_TX20_WIND_DEGREE;
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
    ;
 #endif  // USE_WEBSERVER
 
 // float saves 48 byte
-float const ff_pi           = 3.1415926535897932384626433;  // Pi
-float const ff_halfpi       = ff_pi / 2.0;
-float const ff_pi180        = ff_pi / 180.0;
+float const tx2x_f_pi           = 3.1415926535897932384626433;  // Pi
+float const tx2x_f_halfpi       = tx2x_f_pi / 2.0;
+float const tx2x_f_pi180        = tx2x_f_pi / 180.0;
 
+#define TX2X_DIRECTIONS_MAXSIZE   3
 const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_EAST "|"
                                        D_TX20_NORTH D_TX20_EAST "|"
@@ -116,12 +117,12 @@ const char kTx2xDirections[] PROGMEM = D_TX20_NORTH "|"
                                        D_TX20_NORTH D_TX20_WEST "|"
                                        D_TX20_NORTH D_TX20_NORTH D_TX20_WEST;
 
-float tx2x_wind_speed_kmh = 0;
+int32_t tx2x_wind_speed = 0;
 int32_t tx2x_wind_direction = 0;
 
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
-float tx2x_wind_speed_min = 200.0;
-float tx2x_wind_speed_max = 0;
+int32_t tx2x_wind_speed_min = 0xfff;
+int32_t tx2x_wind_speed_max = 0;
 float tx2x_wind_speed_avg = 0;
 float tx2x_wind_direction_avg_x = 0;
 float tx2x_wind_direction_avg_y = 0;
@@ -131,7 +132,7 @@ int32_t tx2x_wind_direction_max = 0;
 
 uint32_t tx2x_count = 0;
 uint32_t tx2x_avg_samples;
-uint32_t last_uptime = 0;
+uint32_t tx2x_last_uptime = 0;
 bool tx2x_valuesread = false;
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 
@@ -143,7 +144,7 @@ uint32_t tx2x_sd = 0;
 uint32_t tx2x_se = 0;
 uint32_t tx2x_sf = 0;
 #endif  // DEBUG_TASMOTA_SENSOR
-uint32_t last_available = 0;
+uint32_t tx2x_last_available = 0;
 
 #ifdef USE_TX23_WIND_SENSOR
 uint32_t tx23_stage = 0;
@@ -237,9 +238,9 @@ void TX2xStartRead(void)
       // check checksum, start frame,non-inverted==inverted values and max. speed
       ;
       if ((chk == tx2x_sd) && (0x1b==tx2x_sa) && (tx2x_sb==tx2x_se) && (tx2x_sc==tx2x_sf) && (tx2x_sc < 511)) {
-        last_available = uptime;
+        tx2x_last_available = uptime;
         // Wind speed spec: 0 to 180 km/h (0 to 50 m/s)
-        tx2x_wind_speed_kmh = float(tx2x_sc) * 0.36;
+        tx2x_wind_speed = tx2x_sc;
         tx2x_wind_direction = tx2x_sb;
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
         if (!tx2x_valuesread) {
@@ -263,7 +264,7 @@ void TX2xStartRead(void)
 
 bool Tx2xAvailable(void)
 {
-  return ((uptime - last_available) < TX2X_TIMEOUT);
+  return ((uptime - tx2x_last_available) < TX2X_TIMEOUT);
 }
 
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
@@ -273,13 +274,13 @@ float atan2f(float a, float b)
     if (b > 0) {
         atan2val = atanf(a/b);
     } else if ((b < 0) && (a >= 0)) {
-        atan2val = atanf(a/b) + ff_pi;
+        atan2val = atanf(a/b) + tx2x_f_pi;
     } else if ((b < 0) && (a < 0)) {
-        atan2val = atanf(a/b) - ff_pi;
+        atan2val = atanf(a/b) - tx2x_f_pi;
     } else if ((b == 0) && (a > 0)) {
-        atan2val = ff_halfpi;
+        atan2val = tx2x_f_halfpi;
     } else if ((b == 0) && (a < 0)) {
-        atan2val = 0 - (ff_halfpi);
+        atan2val = 0 - (tx2x_f_halfpi);
     } else if ((b == 0) && (a == 0)) {
         atan2val = 1000;               //represents undefined
     }
@@ -297,7 +298,7 @@ void Tx2xCheckSampleCount(void)
     tx2x_avg_samples = TX2X_WEIGHT_AVG_SAMPLE;
   }
   if (tx2x_prev_avg_samples != tx2x_avg_samples) {
-    tx2x_wind_speed_avg = tx2x_wind_speed_kmh;
+    tx2x_wind_speed_avg = tx2x_wind_speed;
     tx2x_count = 0;
   }
 }
@@ -305,14 +306,14 @@ void Tx2xCheckSampleCount(void)
 void Tx2xResetStat(void)
 {
   DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": reset statistics"));
-  last_uptime = uptime;
+  tx2x_last_uptime = uptime;
   Tx2xResetStatData();
 }
 
 void Tx2xResetStatData(void)
 {
-  tx2x_wind_speed_min = tx2x_wind_speed_kmh;
-  tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+  tx2x_wind_speed_min = tx2x_wind_speed;
+  tx2x_wind_speed_max = tx2x_wind_speed;
 
   tx2x_wind_direction_min = tx2x_wind_direction;
   tx2x_wind_direction_max = tx2x_wind_direction;
@@ -347,11 +348,11 @@ void Tx2xRead(void)
     DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": sa=0x%02lx sb=%ld (0x%02lx), sc=%ld (0x%03lx), sd=0x%02lx, se=%ld, sf=%ld"), tx2x_sa,tx2x_sb,tx2x_sb,tx2x_sc,tx2x_sc,tx2x_sd,tx2x_se,tx2x_sf);
 #endif  // DEBUG_TASMOTA_SENSOR
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
-    if (tx2x_wind_speed_kmh < tx2x_wind_speed_min) {
-      tx2x_wind_speed_min = tx2x_wind_speed_kmh;
+    if (tx2x_wind_speed < tx2x_wind_speed_min) {
+      tx2x_wind_speed_min = tx2x_wind_speed;
     }
-    if (tx2x_wind_speed_kmh > tx2x_wind_speed_max) {
-      tx2x_wind_speed_max = tx2x_wind_speed_kmh;
+    if (tx2x_wind_speed > tx2x_wind_speed_max) {
+      tx2x_wind_speed_max = tx2x_wind_speed;
     }
 
     // exponentially weighted average is not quite as smooth as the arithmetic average
@@ -361,13 +362,13 @@ void Tx2xRead(void)
       tx2x_count++;
     }
     tx2x_wind_speed_avg -= tx2x_wind_speed_avg / tx2x_count;
-    tx2x_wind_speed_avg += tx2x_wind_speed_kmh / tx2x_count;
+    tx2x_wind_speed_avg += float(tx2x_wind_speed) / tx2x_count;
 
     tx2x_wind_direction_avg_x -= tx2x_wind_direction_avg_x / tx2x_count;
-    tx2x_wind_direction_avg_x += cosf((tx2x_wind_direction*22.5) * ff_pi180) / tx2x_count;
+    tx2x_wind_direction_avg_x += cosf((tx2x_wind_direction*22.5) * tx2x_f_pi180) / tx2x_count;
     tx2x_wind_direction_avg_y -= tx2x_wind_direction_avg_y / tx2x_count;
-    tx2x_wind_direction_avg_y += sinf((tx2x_wind_direction*22.5) * ff_pi180) / tx2x_count;
-    tx2x_wind_direction_avg = atan2f(tx2x_wind_direction_avg_y, tx2x_wind_direction_avg_x) * 180.0f / ff_pi;
+    tx2x_wind_direction_avg_y += sinf((tx2x_wind_direction*22.5) * tx2x_f_pi180) / tx2x_count;
+    tx2x_wind_direction_avg = atan2f(tx2x_wind_direction_avg_y, tx2x_wind_direction_avg_x) * 180.0f / tx2x_f_pi;
     if (tx2x_wind_direction_avg<0.0) {
       tx2x_wind_direction_avg += 360.0;
     }
@@ -411,14 +412,14 @@ void Tx2xRead(void)
     }
 
 #ifdef DEBUG_TASMOTA_SENSOR
-    char diravg[33];
+    char diravg[FLOATSZ];
     dtostrfd(tx2x_wind_direction_avg, 1, diravg);
-    char cosx[33];
+    char cosx[FLOATSZ];
     dtostrfd(tx2x_wind_direction_avg_x, 1, cosx);
-    char siny[33];
+    char siny[FLOATSZ];
     dtostrfd(tx2x_wind_direction_avg_y, 1, siny);
     DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": dir stat - counter=%ld, actint=%ld, avgint=%ld, avg=%s (cosx=%s, siny=%s), min %d, max %d"),
-      (uptime-last_uptime),
+      (uptime-tx2x_last_uptime),
       tx2x_wind_direction,
       tx2x_wind_direction_avg_int,
       diravg,
@@ -431,7 +432,7 @@ void Tx2xRead(void)
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
   } else {
     DEBUG_SENSOR_LOG(PSTR(D_TX2x_NAME ": not available"));
-    tx2x_wind_speed_kmh = 0;
+    tx2x_wind_speed = 0;
     tx2x_wind_direction = 0;
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
     tx2x_wind_speed_avg = 0;
@@ -442,7 +443,7 @@ void Tx2xRead(void)
 
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
   Tx2xCheckSampleCount();
-  if (0==Settings.tele_period && (uptime-last_uptime)>=tx2x_avg_samples) {
+  if (0==Settings.tele_period && (uptime-tx2x_last_uptime)>=tx2x_avg_samples) {
     Tx2xResetStat();
   }
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
@@ -450,6 +451,9 @@ void Tx2xRead(void)
 
 void Tx2xInit(void)
 {
+  if (!Settings.flag2.speed_conversion) {
+    Settings.flag2.speed_conversion = 2;  // 0 = none, 1 = m/s, 2 = km/h, 3 = kn, 4 = mph, 5 = ft/s, 6 = yd/s
+  }
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
   tx2x_valuesread = false;
   Tx2xResetStat();
@@ -478,35 +482,37 @@ int32_t Tx2xNormalize(int32_t value)
 
 void Tx2xShow(bool json)
 {
-  char wind_speed_string[17];
-  dtostrfd(tx2x_wind_speed_kmh, 1, wind_speed_string);
-  char wind_direction_string[17];
+  if (!Tx2xAvailable()) { return; }
+
+  char wind_speed_string[FLOATSZ];
+  dtostrfd(ConvertSpeed(tx2x_wind_speed)/10, 1, wind_speed_string);
+  char wind_direction_string[FLOATSZ];
   dtostrfd(tx2x_wind_direction*22.5, 1, wind_direction_string);
-  char wind_direction_cardinal_string[4];
+  char wind_direction_cardinal_string[TX2X_DIRECTIONS_MAXSIZE+1];
   GetTextIndexed(wind_direction_cardinal_string, sizeof(wind_direction_cardinal_string), tx2x_wind_direction, kTx2xDirections);
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
-  char wind_speed_min_string[17];
-  dtostrfd(tx2x_wind_speed_min, 1, wind_speed_min_string);
-  char wind_speed_max_string[17];
-  dtostrfd(tx2x_wind_speed_max, 1, wind_speed_max_string);
-  char wind_speed_avg_string[17];
-  dtostrfd(tx2x_wind_speed_avg, 1, wind_speed_avg_string);
-  char wind_direction_avg_string[17];
+  char wind_speed_min_string[FLOATSZ];
+  dtostrfd(ConvertSpeed(tx2x_wind_speed_min)/10, 1, wind_speed_min_string);
+  char wind_speed_max_string[FLOATSZ];
+  dtostrfd(ConvertSpeed(tx2x_wind_speed_max)/10, 1, wind_speed_max_string);
+  char wind_speed_avg_string[FLOATSZ];
+  dtostrfd(ConvertSpeed(tx2x_wind_speed_avg)/10, 1, wind_speed_avg_string);
+  char wind_direction_avg_string[FLOATSZ];
   dtostrfd(tx2x_wind_direction_avg, 1, wind_direction_avg_string);
   char wind_direction_avg_cardinal_string[4];
   GetTextIndexed(wind_direction_avg_cardinal_string, sizeof(wind_direction_avg_cardinal_string), int((tx2x_wind_direction_avg/22.5f)+0.5f) % 16, kTx2xDirections);
-  char wind_direction_range_string[17];
+  char wind_direction_range_string[FLOATSZ];
   dtostrfd(Tx2xNormalize(tx2x_wind_direction_max-tx2x_wind_direction_min)*22.5, 1, wind_direction_range_string);
-  char wind_direction_min_string[17];
+  char wind_direction_min_string[FLOATSZ];
   dtostrfd(Tx2xNormalize(tx2x_wind_direction_min)*22.5, 1, wind_direction_min_string);
-  char wind_direction_max_string[17];
+  char wind_direction_max_string[FLOATSZ];
   dtostrfd(Tx2xNormalize(tx2x_wind_direction_max)*22.5, 1, wind_direction_max_string);
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 
   if (json) {
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
 #ifdef USE_TX2x_LEGACY_JSON
-    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"):PSTR(""),
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"" D_JSON_SPEED "\":%s,\"SpeedAvg\":%s,\"SpeedMax\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
       wind_speed_string,
       wind_speed_avg_string,
       wind_speed_max_string,
@@ -514,7 +520,7 @@ void Tx2xShow(bool json)
       wind_direction_string
     );
 #else  // USE_TX2x_LEGACY_JSON
-    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s,\"Avg\":%s,\"AvgCard\":\"%s\",\"Min\":%s,\"Max\":%s,\"Range\":%s}}"):PSTR(""),
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s,\"Avg\":%s,\"Min\":%s,\"Max\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s,\"Avg\":%s,\"AvgCard\":\"%s\",\"Min\":%s,\"Max\":%s,\"Range\":%s}}"),
       wind_speed_string,
       wind_speed_avg_string,
       wind_speed_min_string,
@@ -530,23 +536,25 @@ void Tx2xShow(bool json)
 #endif  // USE_TX2x_LEGACY_JSON
 #else  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
 #ifdef USE_TX2x_LEGACY_JSON
-    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":%s,\"Direction\":\"%s\",\"Degree\":%s}"):PSTR(""),
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"" D_JSON_SPEED "\":%s,\"Direction\":\"%s\",\"Degree\":%s}"),
       wind_speed_string, wind_direction_cardinal_string, wind_direction_string);
 #else  // USE_TX2x_LEGACY_JSON
-    ResponseAppend_P(Tx2xAvailable()?PSTR(",\"" D_TX2x_NAME "\":{\"Speed\":{\"Act\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s}}"):PSTR(""),
+    ResponseAppend_P(PSTR(",\"" D_TX2x_NAME "\":{\"" D_JSON_SPEED "\":{\"Act\":%s},\"Dir\":{\"Card\":\"%s\",\"Deg\":%s}}"),
       wind_speed_string, wind_direction_cardinal_string, wind_direction_string);
 #endif  // USE_TX2x_LEGACY_JSON
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
-
 #ifdef USE_WEBSERVER
   } else {
-    WSContentSend_PD(
-      Tx2xAvailable()?HTTP_SNS_TX2X:PSTR(""),
+    WSContentSend_PD(HTTP_SNS_TX2X,
       wind_speed_string,
+      SpeedUnit().c_str(),
 #ifndef USE_TX2X_WIND_SENSOR_NOSTATISTICS
       wind_speed_avg_string,
+      SpeedUnit().c_str(),
       wind_speed_min_string,
+      SpeedUnit().c_str(),
       wind_speed_max_string,
+      SpeedUnit().c_str(),
 #endif  // USE_TX2X_WIND_SENSOR_NOSTATISTICS
       wind_direction_cardinal_string,
       wind_direction_string

From 0ce89e53e3ffa25988f36ac1bd0d32e295d2586c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:48:19 +0100
Subject: [PATCH 389/403] Fix Arduino IDE compile error

---
 arduino/version 2.6.3/boards.txt   | 7124 ++++++++++++++++++++++++++++
 arduino/version 2.6.3/platform.txt |  171 +
 tasmota/tasmota.ino                |    9 +-
 tasmota/xdrv_01_webserver.ino      |    2 +
 4 files changed, 7304 insertions(+), 2 deletions(-)
 create mode 100644 arduino/version 2.6.3/boards.txt
 create mode 100644 arduino/version 2.6.3/platform.txt

diff --git a/arduino/version 2.6.3/boards.txt b/arduino/version 2.6.3/boards.txt
new file mode 100644
index 000000000..3fbb48f33
--- /dev/null
+++ b/arduino/version 2.6.3/boards.txt	
@@ -0,0 +1,7124 @@
+#
+# Do not create pull-requests for this file only, CI will not accept them.
+# You *must* edit/modify/run boards.txt.py to regenerate boards.txt.
+# All modified files after running with option "--allgen" must be included in the pull-request.
+#
+
+menu.BoardModel=Model
+menu.ESPModule=Module
+
+menu.UploadTool=Upload Using
+
+menu.led=Builtin Led
+menu.baud=Upload Speed
+menu.xtal=CPU Frequency
+menu.CrystalFreq=Crystal Frequency
+menu.eesz=Flash Size
+menu.FlashMode=Flash Mode
+menu.FlashFreq=Flash Frequency
+menu.ResetMethod=Reset Method
+menu.dbg=Debug port
+menu.lvl=Debug Level
+menu.ip=lwIP Variant
+menu.vt=VTables
+menu.exception=Exceptions
+menu.wipe=Erase Flash
+menu.sdk=Espressif FW
+menu.ssl=SSL Support
+
+##############################################################
+generic.name=Generic ESP8266 Module
+generic.build.board=ESP8266_GENERIC
+generic.upload.tool=esptool
+generic.upload.maximum_data_size=81920
+generic.upload.wait_for_upload_port=true
+generic.upload.erase_cmd=
+generic.serial.disableDTR=true
+generic.serial.disableRTS=true
+generic.build.mcu=esp8266
+generic.build.core=esp8266
+generic.build.variant=generic
+generic.build.spiffs_pagesize=256
+generic.build.debug_port=
+generic.build.debug_level=
+
+generic.menu.UploadTool.esptool=Serial
+generic.menu.UploadTool.esptool.upload.tool=esptool
+generic.menu.UploadTool.esptool.upload.verbose=-vv
+generic.menu.UploadTool.espupload=OTA_upload
+generic.menu.UploadTool.espupload.upload.tool=espupload
+
+generic.menu.xtal.80=80 MHz
+generic.menu.xtal.80.build.f_cpu=80000000L
+generic.menu.xtal.160=160 MHz
+generic.menu.xtal.160.build.f_cpu=160000000L
+generic.menu.vt.flash=Flash
+generic.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+generic.menu.vt.heap=Heap
+generic.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+generic.menu.vt.iram=IRAM
+generic.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+generic.menu.exception.legacy=Legacy (new can return nullptr)
+generic.menu.exception.legacy.build.exception_flags=-fno-exceptions
+generic.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+generic.menu.exception.disabled=Disabled (new can abort)
+generic.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+generic.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+generic.menu.exception.enabled=Enabled
+generic.menu.exception.enabled.build.exception_flags=-fexceptions
+generic.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+generic.menu.ssl.all=All SSL ciphers (most compatible)
+generic.menu.ssl.all.build.sslflags=
+generic.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+generic.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+generic.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+generic.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+generic.menu.ResetMethod.ck=no dtr (aka ck)
+generic.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+generic.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
+generic.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
+generic.menu.CrystalFreq.26=26 MHz
+generic.menu.CrystalFreq.40=40 MHz
+generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+generic.menu.FlashFreq.40=40MHz
+generic.menu.FlashFreq.40.build.flash_freq=40
+generic.menu.FlashFreq.80=80MHz
+generic.menu.FlashFreq.80.build.flash_freq=80
+generic.menu.FlashFreq.20=20MHz
+generic.menu.FlashFreq.20.build.flash_freq=20
+generic.menu.FlashFreq.26=26MHz
+generic.menu.FlashFreq.26.build.flash_freq=26
+generic.menu.FlashMode.dout=DOUT (compatible)
+generic.menu.FlashMode.dout.build.flash_mode=dout
+generic.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
+generic.menu.FlashMode.dio=DIO
+generic.menu.FlashMode.dio.build.flash_mode=dio
+generic.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
+generic.menu.FlashMode.qout=QOUT
+generic.menu.FlashMode.qout.build.flash_mode=qout
+generic.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
+generic.menu.FlashMode.qio=QIO (fast)
+generic.menu.FlashMode.qio.build.flash_mode=qio
+generic.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
+generic.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+generic.menu.eesz.1M64.build.flash_size=1M
+generic.menu.eesz.1M64.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+generic.menu.eesz.1M64.build.spiffs_pagesize=256
+generic.menu.eesz.1M64.upload.maximum_size=958448
+generic.menu.eesz.1M64.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M64.build.spiffs_start=0xEB000
+generic.menu.eesz.1M64.build.spiffs_end=0xFB000
+generic.menu.eesz.1M64.build.spiffs_blocksize=4096
+generic.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+generic.menu.eesz.1M128.build.flash_size=1M
+generic.menu.eesz.1M128.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+generic.menu.eesz.1M128.build.spiffs_pagesize=256
+generic.menu.eesz.1M128.upload.maximum_size=892912
+generic.menu.eesz.1M128.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M128.build.spiffs_start=0xDB000
+generic.menu.eesz.1M128.build.spiffs_end=0xFB000
+generic.menu.eesz.1M128.build.spiffs_blocksize=4096
+generic.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+generic.menu.eesz.1M144.build.flash_size=1M
+generic.menu.eesz.1M144.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+generic.menu.eesz.1M144.build.spiffs_pagesize=256
+generic.menu.eesz.1M144.upload.maximum_size=876528
+generic.menu.eesz.1M144.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M144.build.spiffs_start=0xD7000
+generic.menu.eesz.1M144.build.spiffs_end=0xFB000
+generic.menu.eesz.1M144.build.spiffs_blocksize=4096
+generic.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+generic.menu.eesz.1M160.build.flash_size=1M
+generic.menu.eesz.1M160.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+generic.menu.eesz.1M160.build.spiffs_pagesize=256
+generic.menu.eesz.1M160.upload.maximum_size=860144
+generic.menu.eesz.1M160.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M160.build.spiffs_start=0xD3000
+generic.menu.eesz.1M160.build.spiffs_end=0xFB000
+generic.menu.eesz.1M160.build.spiffs_blocksize=4096
+generic.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+generic.menu.eesz.1M192.build.flash_size=1M
+generic.menu.eesz.1M192.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+generic.menu.eesz.1M192.build.spiffs_pagesize=256
+generic.menu.eesz.1M192.upload.maximum_size=827376
+generic.menu.eesz.1M192.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M192.build.spiffs_start=0xCB000
+generic.menu.eesz.1M192.build.spiffs_end=0xFB000
+generic.menu.eesz.1M192.build.spiffs_blocksize=4096
+generic.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+generic.menu.eesz.1M256.build.flash_size=1M
+generic.menu.eesz.1M256.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+generic.menu.eesz.1M256.build.spiffs_pagesize=256
+generic.menu.eesz.1M256.upload.maximum_size=761840
+generic.menu.eesz.1M256.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M256.build.spiffs_start=0xBB000
+generic.menu.eesz.1M256.build.spiffs_end=0xFB000
+generic.menu.eesz.1M256.build.spiffs_blocksize=4096
+generic.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+generic.menu.eesz.1M512.build.flash_size=1M
+generic.menu.eesz.1M512.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+generic.menu.eesz.1M512.build.spiffs_pagesize=256
+generic.menu.eesz.1M512.upload.maximum_size=499696
+generic.menu.eesz.1M512.build.rfcal_addr=0xFC000
+generic.menu.eesz.1M512.build.spiffs_start=0x7B000
+generic.menu.eesz.1M512.build.spiffs_end=0xFB000
+generic.menu.eesz.1M512.build.spiffs_blocksize=8192
+generic.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+generic.menu.eesz.1M.build.flash_size=1M
+generic.menu.eesz.1M.build.flash_size_bytes=0x100000
+generic.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+generic.menu.eesz.1M.build.spiffs_pagesize=256
+generic.menu.eesz.1M.upload.maximum_size=1023984
+generic.menu.eesz.1M.build.rfcal_addr=0xFC000
+generic.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+generic.menu.eesz.2M64.build.flash_size=2M
+generic.menu.eesz.2M64.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+generic.menu.eesz.2M64.build.spiffs_pagesize=256
+generic.menu.eesz.2M64.upload.maximum_size=1044464
+generic.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+generic.menu.eesz.2M64.build.spiffs_start=0x1F0000
+generic.menu.eesz.2M64.build.spiffs_end=0x1FB000
+generic.menu.eesz.2M64.build.spiffs_blocksize=4096
+generic.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+generic.menu.eesz.2M128.build.flash_size=2M
+generic.menu.eesz.2M128.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+generic.menu.eesz.2M128.build.spiffs_pagesize=256
+generic.menu.eesz.2M128.upload.maximum_size=1044464
+generic.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+generic.menu.eesz.2M128.build.spiffs_start=0x1E0000
+generic.menu.eesz.2M128.build.spiffs_end=0x1FB000
+generic.menu.eesz.2M128.build.spiffs_blocksize=4096
+generic.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+generic.menu.eesz.2M256.build.flash_size=2M
+generic.menu.eesz.2M256.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+generic.menu.eesz.2M256.build.spiffs_pagesize=256
+generic.menu.eesz.2M256.upload.maximum_size=1044464
+generic.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+generic.menu.eesz.2M256.build.spiffs_start=0x1C0000
+generic.menu.eesz.2M256.build.spiffs_end=0x1FB000
+generic.menu.eesz.2M256.build.spiffs_blocksize=4096
+generic.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+generic.menu.eesz.2M512.build.flash_size=2M
+generic.menu.eesz.2M512.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+generic.menu.eesz.2M512.build.spiffs_pagesize=256
+generic.menu.eesz.2M512.upload.maximum_size=1044464
+generic.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+generic.menu.eesz.2M512.build.spiffs_start=0x180000
+generic.menu.eesz.2M512.build.spiffs_end=0x1FA000
+generic.menu.eesz.2M512.build.spiffs_blocksize=8192
+generic.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+generic.menu.eesz.2M1M.build.flash_size=2M
+generic.menu.eesz.2M1M.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+generic.menu.eesz.2M1M.build.spiffs_pagesize=256
+generic.menu.eesz.2M1M.upload.maximum_size=1044464
+generic.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+generic.menu.eesz.2M1M.build.spiffs_start=0x100000
+generic.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+generic.menu.eesz.2M1M.build.spiffs_blocksize=8192
+generic.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+generic.menu.eesz.2M.build.flash_size=2M
+generic.menu.eesz.2M.build.flash_size_bytes=0x200000
+generic.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+generic.menu.eesz.2M.build.spiffs_pagesize=256
+generic.menu.eesz.2M.upload.maximum_size=1044464
+generic.menu.eesz.2M.build.rfcal_addr=0x1FC000
+generic.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+generic.menu.eesz.4M2M.build.flash_size=4M
+generic.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+generic.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+generic.menu.eesz.4M2M.build.spiffs_pagesize=256
+generic.menu.eesz.4M2M.upload.maximum_size=1044464
+generic.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+generic.menu.eesz.4M2M.build.spiffs_start=0x200000
+generic.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+generic.menu.eesz.4M2M.build.spiffs_blocksize=8192
+generic.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+generic.menu.eesz.4M3M.build.flash_size=4M
+generic.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+generic.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+generic.menu.eesz.4M3M.build.spiffs_pagesize=256
+generic.menu.eesz.4M3M.upload.maximum_size=1044464
+generic.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+generic.menu.eesz.4M3M.build.spiffs_start=0x100000
+generic.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+generic.menu.eesz.4M3M.build.spiffs_blocksize=8192
+generic.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+generic.menu.eesz.4M1M.build.flash_size=4M
+generic.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+generic.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+generic.menu.eesz.4M1M.build.spiffs_pagesize=256
+generic.menu.eesz.4M1M.upload.maximum_size=1044464
+generic.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+generic.menu.eesz.4M1M.build.spiffs_start=0x300000
+generic.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+generic.menu.eesz.4M1M.build.spiffs_blocksize=8192
+generic.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+generic.menu.eesz.4M.build.flash_size=4M
+generic.menu.eesz.4M.build.flash_size_bytes=0x400000
+generic.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+generic.menu.eesz.4M.build.spiffs_pagesize=256
+generic.menu.eesz.4M.upload.maximum_size=1044464
+generic.menu.eesz.4M.build.rfcal_addr=0x3FC000
+generic.menu.eesz.8M6M=8MB (FS:6MB OTA:~1019KB)
+generic.menu.eesz.8M6M.build.flash_size=8M
+generic.menu.eesz.8M6M.build.flash_size_bytes=0x800000
+generic.menu.eesz.8M6M.build.flash_ld=eagle.flash.8m6m.ld
+generic.menu.eesz.8M6M.build.spiffs_pagesize=256
+generic.menu.eesz.8M6M.upload.maximum_size=1044464
+generic.menu.eesz.8M6M.build.rfcal_addr=0x7FC000
+generic.menu.eesz.8M6M.build.spiffs_start=0x200000
+generic.menu.eesz.8M6M.build.spiffs_end=0x7FA000
+generic.menu.eesz.8M6M.build.spiffs_blocksize=8192
+generic.menu.eesz.8M7M=8MB (FS:7MB OTA:~512KB)
+generic.menu.eesz.8M7M.build.flash_size=8M
+generic.menu.eesz.8M7M.build.flash_size_bytes=0x800000
+generic.menu.eesz.8M7M.build.flash_ld=eagle.flash.8m7m.ld
+generic.menu.eesz.8M7M.build.spiffs_pagesize=256
+generic.menu.eesz.8M7M.upload.maximum_size=1044464
+generic.menu.eesz.8M7M.build.rfcal_addr=0x7FC000
+generic.menu.eesz.8M7M.build.spiffs_start=0x100000
+generic.menu.eesz.8M7M.build.spiffs_end=0x7FA000
+generic.menu.eesz.8M7M.build.spiffs_blocksize=8192
+generic.menu.eesz.16M14M=16MB (FS:14MB OTA:~1019KB)
+generic.menu.eesz.16M14M.build.flash_size=16M
+generic.menu.eesz.16M14M.build.flash_size_bytes=0x1000000
+generic.menu.eesz.16M14M.build.flash_ld=eagle.flash.16m14m.ld
+generic.menu.eesz.16M14M.build.spiffs_pagesize=256
+generic.menu.eesz.16M14M.upload.maximum_size=1044464
+generic.menu.eesz.16M14M.build.rfcal_addr=0xFFC000
+generic.menu.eesz.16M14M.build.spiffs_start=0x200000
+generic.menu.eesz.16M14M.build.spiffs_end=0xFFA000
+generic.menu.eesz.16M14M.build.spiffs_blocksize=8192
+generic.menu.eesz.16M15M=16MB (FS:15MB OTA:~512KB)
+generic.menu.eesz.16M15M.build.flash_size=16M
+generic.menu.eesz.16M15M.build.flash_size_bytes=0x1000000
+generic.menu.eesz.16M15M.build.flash_ld=eagle.flash.16m15m.ld
+generic.menu.eesz.16M15M.build.spiffs_pagesize=256
+generic.menu.eesz.16M15M.upload.maximum_size=1044464
+generic.menu.eesz.16M15M.build.rfcal_addr=0xFFC000
+generic.menu.eesz.16M15M.build.spiffs_start=0x100000
+generic.menu.eesz.16M15M.build.spiffs_end=0xFFA000
+generic.menu.eesz.16M15M.build.spiffs_blocksize=8192
+generic.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
+generic.menu.eesz.512K32.build.flash_size=512K
+generic.menu.eesz.512K32.build.flash_size_bytes=0x80000
+generic.menu.eesz.512K32.build.flash_ld=eagle.flash.512k32.ld
+generic.menu.eesz.512K32.build.spiffs_pagesize=256
+generic.menu.eesz.512K32.upload.maximum_size=466928
+generic.menu.eesz.512K32.build.rfcal_addr=0x7C000
+generic.menu.eesz.512K32.build.spiffs_start=0x73000
+generic.menu.eesz.512K32.build.spiffs_end=0x7B000
+generic.menu.eesz.512K32.build.spiffs_blocksize=4096
+generic.menu.eesz.512K64=512KB (FS:64KB OTA:~214KB)
+generic.menu.eesz.512K64.build.flash_size=512K
+generic.menu.eesz.512K64.build.flash_size_bytes=0x80000
+generic.menu.eesz.512K64.build.flash_ld=eagle.flash.512k64.ld
+generic.menu.eesz.512K64.build.spiffs_pagesize=256
+generic.menu.eesz.512K64.upload.maximum_size=434160
+generic.menu.eesz.512K64.build.rfcal_addr=0x7C000
+generic.menu.eesz.512K64.build.spiffs_start=0x6B000
+generic.menu.eesz.512K64.build.spiffs_end=0x7B000
+generic.menu.eesz.512K64.build.spiffs_blocksize=4096
+generic.menu.eesz.512K128=512KB (FS:128KB OTA:~182KB)
+generic.menu.eesz.512K128.build.flash_size=512K
+generic.menu.eesz.512K128.build.flash_size_bytes=0x80000
+generic.menu.eesz.512K128.build.flash_ld=eagle.flash.512k128.ld
+generic.menu.eesz.512K128.build.spiffs_pagesize=256
+generic.menu.eesz.512K128.upload.maximum_size=368624
+generic.menu.eesz.512K128.build.rfcal_addr=0x7C000
+generic.menu.eesz.512K128.build.spiffs_start=0x5B000
+generic.menu.eesz.512K128.build.spiffs_end=0x7B000
+generic.menu.eesz.512K128.build.spiffs_blocksize=4096
+generic.menu.eesz.512K=512KB (FS:none OTA:~246KB)
+generic.menu.eesz.512K.build.flash_size=512K
+generic.menu.eesz.512K.build.flash_size_bytes=0x80000
+generic.menu.eesz.512K.build.flash_ld=eagle.flash.512k.ld
+generic.menu.eesz.512K.build.spiffs_pagesize=256
+generic.menu.eesz.512K.upload.maximum_size=499696
+generic.menu.eesz.512K.build.rfcal_addr=0x7C000
+generic.menu.led.2=2
+generic.menu.led.2.build.led=-DLED_BUILTIN=2
+generic.menu.led.0=0
+generic.menu.led.0.build.led=-DLED_BUILTIN=0
+generic.menu.led.1=1
+generic.menu.led.1.build.led=-DLED_BUILTIN=1
+generic.menu.led.3=3
+generic.menu.led.3.build.led=-DLED_BUILTIN=3
+generic.menu.led.4=4
+generic.menu.led.4.build.led=-DLED_BUILTIN=4
+generic.menu.led.5=5
+generic.menu.led.5.build.led=-DLED_BUILTIN=5
+generic.menu.led.6=6
+generic.menu.led.6.build.led=-DLED_BUILTIN=6
+generic.menu.led.7=7
+generic.menu.led.7.build.led=-DLED_BUILTIN=7
+generic.menu.led.8=8
+generic.menu.led.8.build.led=-DLED_BUILTIN=8
+generic.menu.led.9=9
+generic.menu.led.9.build.led=-DLED_BUILTIN=9
+generic.menu.led.10=10
+generic.menu.led.10.build.led=-DLED_BUILTIN=10
+generic.menu.led.11=11
+generic.menu.led.11.build.led=-DLED_BUILTIN=11
+generic.menu.led.12=12
+generic.menu.led.12.build.led=-DLED_BUILTIN=12
+generic.menu.led.13=13
+generic.menu.led.13.build.led=-DLED_BUILTIN=13
+generic.menu.led.14=14
+generic.menu.led.14.build.led=-DLED_BUILTIN=14
+generic.menu.led.15=15
+generic.menu.led.15.build.led=-DLED_BUILTIN=15
+generic.menu.led.16=16
+generic.menu.led.16.build.led=-DLED_BUILTIN=16
+generic.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
+generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
+generic.menu.sdk.nonosdk_191122=nonos-sdk 2.2.1+119 (191122)
+generic.menu.sdk.nonosdk_191122.build.sdk=NONOSDK22x_191122
+generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
+generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
+generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
+generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
+generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
+generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
+generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
+generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
+generic.menu.ip.lm2f=v2 Lower Memory
+generic.menu.ip.lm2f.build.lwip_include=lwip2/include
+generic.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+generic.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+generic.menu.ip.hb2f=v2 Higher Bandwidth
+generic.menu.ip.hb2f.build.lwip_include=lwip2/include
+generic.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+generic.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+generic.menu.ip.lm2n=v2 Lower Memory (no features)
+generic.menu.ip.lm2n.build.lwip_include=lwip2/include
+generic.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+generic.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+generic.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+generic.menu.ip.hb2n.build.lwip_include=lwip2/include
+generic.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+generic.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+generic.menu.ip.lm6f=v2 IPv6 Lower Memory
+generic.menu.ip.lm6f.build.lwip_include=lwip2/include
+generic.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+generic.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+generic.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+generic.menu.ip.hb6f.build.lwip_include=lwip2/include
+generic.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+generic.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+generic.menu.ip.hb1=v1.4 Higher Bandwidth
+generic.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+generic.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+generic.menu.ip.src=v1.4 Compile from source
+generic.menu.ip.src.build.lwip_lib=-llwip_src
+generic.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+generic.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+generic.menu.dbg.Disabled=Disabled
+generic.menu.dbg.Disabled.build.debug_port=
+generic.menu.dbg.Serial=Serial
+generic.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+generic.menu.dbg.Serial1=Serial1
+generic.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+generic.menu.lvl.None____=None
+generic.menu.lvl.None____.build.debug_level=
+generic.menu.lvl.SSL=SSL
+generic.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+generic.menu.lvl.TLS_MEM=TLS_MEM
+generic.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+generic.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+generic.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+generic.menu.lvl.HTTP_SERVER=HTTP_SERVER
+generic.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+generic.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+generic.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+generic.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+generic.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+generic.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+generic.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+generic.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+generic.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+generic.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+generic.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+generic.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+generic.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+generic.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+generic.menu.lvl.CORE=CORE
+generic.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+generic.menu.lvl.WIFI=WIFI
+generic.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+generic.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+generic.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+generic.menu.lvl.UPDATER=UPDATER
+generic.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+generic.menu.lvl.OTA=OTA
+generic.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+generic.menu.lvl.OOM=OOM
+generic.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+generic.menu.lvl.MDNS=MDNS
+generic.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+generic.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+generic.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+generic.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+generic.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+generic.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+generic.menu.wipe.none=Only Sketch
+generic.menu.wipe.none.upload.erase_cmd=
+generic.menu.wipe.sdk=Sketch + WiFi Settings
+generic.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+generic.menu.wipe.all=All Flash Contents
+generic.menu.wipe.all.upload.erase_cmd=erase_flash
+generic.menu.baud.115200=115200
+generic.menu.baud.115200.upload.speed=115200
+generic.menu.baud.57600=57600
+generic.menu.baud.57600.upload.speed=57600
+generic.menu.baud.230400.linux=230400
+generic.menu.baud.230400.macosx=230400
+generic.menu.baud.230400.upload.speed=230400
+generic.menu.baud.256000.windows=256000
+generic.menu.baud.256000.upload.speed=256000
+generic.menu.baud.460800.linux=460800
+generic.menu.baud.460800.macosx=460800
+generic.menu.baud.460800.upload.speed=460800
+generic.menu.baud.512000.windows=512000
+generic.menu.baud.512000.upload.speed=512000
+generic.menu.baud.921600=921600
+generic.menu.baud.921600.upload.speed=921600
+generic.menu.baud.3000000=3000000
+generic.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+esp8285.name=Generic ESP8285 Module
+esp8285.build.board=ESP8266_ESP01
+esp8285.build.variant=esp8285
+esp8285.upload.tool=esptool
+esp8285.upload.maximum_data_size=81920
+esp8285.upload.wait_for_upload_port=true
+esp8285.upload.erase_cmd=
+esp8285.serial.disableDTR=true
+esp8285.serial.disableRTS=true
+esp8285.build.mcu=esp8266
+esp8285.build.core=esp8266
+esp8285.build.spiffs_pagesize=256
+esp8285.build.debug_port=
+esp8285.build.debug_level=
+esp8285.menu.xtal.80=80 MHz
+esp8285.menu.xtal.80.build.f_cpu=80000000L
+esp8285.menu.xtal.160=160 MHz
+esp8285.menu.xtal.160.build.f_cpu=160000000L
+esp8285.menu.vt.flash=Flash
+esp8285.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+esp8285.menu.vt.heap=Heap
+esp8285.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+esp8285.menu.vt.iram=IRAM
+esp8285.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+esp8285.menu.exception.legacy=Legacy (new can return nullptr)
+esp8285.menu.exception.legacy.build.exception_flags=-fno-exceptions
+esp8285.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+esp8285.menu.exception.disabled=Disabled (new can abort)
+esp8285.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+esp8285.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+esp8285.menu.exception.enabled=Enabled
+esp8285.menu.exception.enabled.build.exception_flags=-fexceptions
+esp8285.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+esp8285.menu.ssl.all=All SSL ciphers (most compatible)
+esp8285.menu.ssl.all.build.sslflags=
+esp8285.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+esp8285.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+esp8285.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+esp8285.menu.ResetMethod.ck=no dtr (aka ck)
+esp8285.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+esp8285.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
+esp8285.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
+esp8285.menu.CrystalFreq.26=26 MHz
+esp8285.menu.CrystalFreq.40=40 MHz
+esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+esp8285.build.flash_mode=dout
+esp8285.build.flash_flags=-DFLASHMODE_DOUT
+esp8285.build.flash_freq=40
+esp8285.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+esp8285.menu.eesz.1M64.build.flash_size=1M
+esp8285.menu.eesz.1M64.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+esp8285.menu.eesz.1M64.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M64.upload.maximum_size=958448
+esp8285.menu.eesz.1M64.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M64.build.spiffs_start=0xEB000
+esp8285.menu.eesz.1M64.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M64.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+esp8285.menu.eesz.1M128.build.flash_size=1M
+esp8285.menu.eesz.1M128.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+esp8285.menu.eesz.1M128.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M128.upload.maximum_size=892912
+esp8285.menu.eesz.1M128.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M128.build.spiffs_start=0xDB000
+esp8285.menu.eesz.1M128.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M128.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+esp8285.menu.eesz.1M144.build.flash_size=1M
+esp8285.menu.eesz.1M144.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+esp8285.menu.eesz.1M144.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M144.upload.maximum_size=876528
+esp8285.menu.eesz.1M144.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M144.build.spiffs_start=0xD7000
+esp8285.menu.eesz.1M144.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M144.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+esp8285.menu.eesz.1M160.build.flash_size=1M
+esp8285.menu.eesz.1M160.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+esp8285.menu.eesz.1M160.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M160.upload.maximum_size=860144
+esp8285.menu.eesz.1M160.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M160.build.spiffs_start=0xD3000
+esp8285.menu.eesz.1M160.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M160.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+esp8285.menu.eesz.1M192.build.flash_size=1M
+esp8285.menu.eesz.1M192.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+esp8285.menu.eesz.1M192.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M192.upload.maximum_size=827376
+esp8285.menu.eesz.1M192.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M192.build.spiffs_start=0xCB000
+esp8285.menu.eesz.1M192.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M192.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+esp8285.menu.eesz.1M256.build.flash_size=1M
+esp8285.menu.eesz.1M256.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+esp8285.menu.eesz.1M256.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M256.upload.maximum_size=761840
+esp8285.menu.eesz.1M256.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M256.build.spiffs_start=0xBB000
+esp8285.menu.eesz.1M256.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M256.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+esp8285.menu.eesz.1M512.build.flash_size=1M
+esp8285.menu.eesz.1M512.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+esp8285.menu.eesz.1M512.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M512.upload.maximum_size=499696
+esp8285.menu.eesz.1M512.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.1M512.build.spiffs_start=0x7B000
+esp8285.menu.eesz.1M512.build.spiffs_end=0xFB000
+esp8285.menu.eesz.1M512.build.spiffs_blocksize=8192
+esp8285.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+esp8285.menu.eesz.1M.build.flash_size=1M
+esp8285.menu.eesz.1M.build.flash_size_bytes=0x100000
+esp8285.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+esp8285.menu.eesz.1M.build.spiffs_pagesize=256
+esp8285.menu.eesz.1M.upload.maximum_size=1023984
+esp8285.menu.eesz.1M.build.rfcal_addr=0xFC000
+esp8285.menu.led.2=2
+esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
+esp8285.menu.led.0=0
+esp8285.menu.led.0.build.led=-DLED_BUILTIN=0
+esp8285.menu.led.1=1
+esp8285.menu.led.1.build.led=-DLED_BUILTIN=1
+esp8285.menu.led.3=3
+esp8285.menu.led.3.build.led=-DLED_BUILTIN=3
+esp8285.menu.led.4=4
+esp8285.menu.led.4.build.led=-DLED_BUILTIN=4
+esp8285.menu.led.5=5
+esp8285.menu.led.5.build.led=-DLED_BUILTIN=5
+esp8285.menu.led.6=6
+esp8285.menu.led.6.build.led=-DLED_BUILTIN=6
+esp8285.menu.led.7=7
+esp8285.menu.led.7.build.led=-DLED_BUILTIN=7
+esp8285.menu.led.8=8
+esp8285.menu.led.8.build.led=-DLED_BUILTIN=8
+esp8285.menu.led.9=9
+esp8285.menu.led.9.build.led=-DLED_BUILTIN=9
+esp8285.menu.led.10=10
+esp8285.menu.led.10.build.led=-DLED_BUILTIN=10
+esp8285.menu.led.11=11
+esp8285.menu.led.11.build.led=-DLED_BUILTIN=11
+esp8285.menu.led.12=12
+esp8285.menu.led.12.build.led=-DLED_BUILTIN=12
+esp8285.menu.led.13=13
+esp8285.menu.led.13.build.led=-DLED_BUILTIN=13
+esp8285.menu.led.14=14
+esp8285.menu.led.14.build.led=-DLED_BUILTIN=14
+esp8285.menu.led.15=15
+esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
+esp8285.menu.led.16=16
+esp8285.menu.led.16.build.led=-DLED_BUILTIN=16
+esp8285.menu.ip.lm2f=v2 Lower Memory
+esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
+esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+esp8285.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+esp8285.menu.ip.hb2f=v2 Higher Bandwidth
+esp8285.menu.ip.hb2f.build.lwip_include=lwip2/include
+esp8285.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+esp8285.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+esp8285.menu.ip.lm2n=v2 Lower Memory (no features)
+esp8285.menu.ip.lm2n.build.lwip_include=lwip2/include
+esp8285.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+esp8285.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+esp8285.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+esp8285.menu.ip.hb2n.build.lwip_include=lwip2/include
+esp8285.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+esp8285.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+esp8285.menu.ip.lm6f=v2 IPv6 Lower Memory
+esp8285.menu.ip.lm6f.build.lwip_include=lwip2/include
+esp8285.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+esp8285.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+esp8285.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+esp8285.menu.ip.hb6f.build.lwip_include=lwip2/include
+esp8285.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+esp8285.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+esp8285.menu.ip.hb1=v1.4 Higher Bandwidth
+esp8285.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+esp8285.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+esp8285.menu.ip.src=v1.4 Compile from source
+esp8285.menu.ip.src.build.lwip_lib=-llwip_src
+esp8285.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+esp8285.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+esp8285.menu.dbg.Disabled=Disabled
+esp8285.menu.dbg.Disabled.build.debug_port=
+esp8285.menu.dbg.Serial=Serial
+esp8285.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+esp8285.menu.dbg.Serial1=Serial1
+esp8285.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+esp8285.menu.lvl.None____=None
+esp8285.menu.lvl.None____.build.debug_level=
+esp8285.menu.lvl.SSL=SSL
+esp8285.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+esp8285.menu.lvl.TLS_MEM=TLS_MEM
+esp8285.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+esp8285.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+esp8285.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+esp8285.menu.lvl.HTTP_SERVER=HTTP_SERVER
+esp8285.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+esp8285.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+esp8285.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+esp8285.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+esp8285.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+esp8285.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+esp8285.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+esp8285.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+esp8285.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+esp8285.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+esp8285.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+esp8285.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+esp8285.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+esp8285.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp8285.menu.lvl.CORE=CORE
+esp8285.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+esp8285.menu.lvl.WIFI=WIFI
+esp8285.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+esp8285.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+esp8285.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+esp8285.menu.lvl.UPDATER=UPDATER
+esp8285.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+esp8285.menu.lvl.OTA=OTA
+esp8285.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+esp8285.menu.lvl.OOM=OOM
+esp8285.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+esp8285.menu.lvl.MDNS=MDNS
+esp8285.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+esp8285.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+esp8285.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+esp8285.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+esp8285.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+esp8285.menu.wipe.none=Only Sketch
+esp8285.menu.wipe.none.upload.erase_cmd=
+esp8285.menu.wipe.sdk=Sketch + WiFi Settings
+esp8285.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+esp8285.menu.wipe.all=All Flash Contents
+esp8285.menu.wipe.all.upload.erase_cmd=erase_flash
+esp8285.menu.baud.115200=115200
+esp8285.menu.baud.115200.upload.speed=115200
+esp8285.menu.baud.57600=57600
+esp8285.menu.baud.57600.upload.speed=57600
+esp8285.menu.baud.230400.linux=230400
+esp8285.menu.baud.230400.macosx=230400
+esp8285.menu.baud.230400.upload.speed=230400
+esp8285.menu.baud.256000.windows=256000
+esp8285.menu.baud.256000.upload.speed=256000
+esp8285.menu.baud.460800.linux=460800
+esp8285.menu.baud.460800.macosx=460800
+esp8285.menu.baud.460800.upload.speed=460800
+esp8285.menu.baud.512000.windows=512000
+esp8285.menu.baud.512000.upload.speed=512000
+esp8285.menu.baud.921600=921600
+esp8285.menu.baud.921600.upload.speed=921600
+esp8285.menu.baud.3000000=3000000
+esp8285.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espduino.name=ESPDuino (ESP-13 Module)
+espduino.build.board=ESP8266_ESP13
+espduino.build.variant=ESPDuino
+espduino.menu.ResetMethod.v1=ESPduino-V1
+espduino.menu.ResetMethod.v1.upload.resetmethod=--before no_reset --after soft_reset
+espduino.menu.ResetMethod.v2=ESPduino-V2
+espduino.menu.ResetMethod.v2.upload.resetmethod=--before default_reset --after hard_reset
+espduino.menu.UploadTool.espota=OTA
+espduino.menu.UploadTool.espota.upload.tool=espota
+espduino.menu.UploadTool.esptool=Serial
+espduino.menu.UploadTool.esptool.upload.tool=esptool
+espduino.menu.UploadTool.esptool.upload.verbose=--trace
+espduino.upload.tool=esptool
+espduino.upload.maximum_data_size=81920
+espduino.upload.wait_for_upload_port=true
+espduino.upload.erase_cmd=
+espduino.serial.disableDTR=true
+espduino.serial.disableRTS=true
+espduino.build.mcu=esp8266
+espduino.build.core=esp8266
+espduino.build.spiffs_pagesize=256
+espduino.build.debug_port=
+espduino.build.debug_level=
+espduino.menu.xtal.80=80 MHz
+espduino.menu.xtal.80.build.f_cpu=80000000L
+espduino.menu.xtal.160=160 MHz
+espduino.menu.xtal.160.build.f_cpu=160000000L
+espduino.menu.vt.flash=Flash
+espduino.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espduino.menu.vt.heap=Heap
+espduino.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espduino.menu.vt.iram=IRAM
+espduino.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espduino.menu.exception.legacy=Legacy (new can return nullptr)
+espduino.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espduino.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espduino.menu.exception.disabled=Disabled (new can abort)
+espduino.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espduino.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espduino.menu.exception.enabled=Enabled
+espduino.menu.exception.enabled.build.exception_flags=-fexceptions
+espduino.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espduino.menu.ssl.all=All SSL ciphers (most compatible)
+espduino.menu.ssl.all.build.sslflags=
+espduino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espduino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espduino.build.flash_mode=dio
+espduino.build.flash_flags=-DFLASHMODE_DIO
+espduino.build.flash_freq=40
+espduino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espduino.menu.eesz.4M2M.build.flash_size=4M
+espduino.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espduino.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espduino.menu.eesz.4M2M.build.spiffs_pagesize=256
+espduino.menu.eesz.4M2M.upload.maximum_size=1044464
+espduino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espduino.menu.eesz.4M2M.build.spiffs_start=0x200000
+espduino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espduino.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espduino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espduino.menu.eesz.4M3M.build.flash_size=4M
+espduino.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espduino.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espduino.menu.eesz.4M3M.build.spiffs_pagesize=256
+espduino.menu.eesz.4M3M.upload.maximum_size=1044464
+espduino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espduino.menu.eesz.4M3M.build.spiffs_start=0x100000
+espduino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espduino.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espduino.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espduino.menu.eesz.4M1M.build.flash_size=4M
+espduino.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espduino.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espduino.menu.eesz.4M1M.build.spiffs_pagesize=256
+espduino.menu.eesz.4M1M.upload.maximum_size=1044464
+espduino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espduino.menu.eesz.4M1M.build.spiffs_start=0x300000
+espduino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espduino.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espduino.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espduino.menu.eesz.4M.build.flash_size=4M
+espduino.menu.eesz.4M.build.flash_size_bytes=0x400000
+espduino.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espduino.menu.eesz.4M.build.spiffs_pagesize=256
+espduino.menu.eesz.4M.upload.maximum_size=1044464
+espduino.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espduino.menu.ip.lm2f=v2 Lower Memory
+espduino.menu.ip.lm2f.build.lwip_include=lwip2/include
+espduino.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espduino.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espduino.menu.ip.hb2f=v2 Higher Bandwidth
+espduino.menu.ip.hb2f.build.lwip_include=lwip2/include
+espduino.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espduino.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espduino.menu.ip.lm2n=v2 Lower Memory (no features)
+espduino.menu.ip.lm2n.build.lwip_include=lwip2/include
+espduino.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espduino.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espduino.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espduino.menu.ip.hb2n.build.lwip_include=lwip2/include
+espduino.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espduino.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espduino.menu.ip.lm6f=v2 IPv6 Lower Memory
+espduino.menu.ip.lm6f.build.lwip_include=lwip2/include
+espduino.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espduino.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espduino.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espduino.menu.ip.hb6f.build.lwip_include=lwip2/include
+espduino.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espduino.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espduino.menu.ip.hb1=v1.4 Higher Bandwidth
+espduino.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espduino.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espduino.menu.ip.src=v1.4 Compile from source
+espduino.menu.ip.src.build.lwip_lib=-llwip_src
+espduino.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espduino.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espduino.menu.dbg.Disabled=Disabled
+espduino.menu.dbg.Disabled.build.debug_port=
+espduino.menu.dbg.Serial=Serial
+espduino.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espduino.menu.dbg.Serial1=Serial1
+espduino.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espduino.menu.lvl.None____=None
+espduino.menu.lvl.None____.build.debug_level=
+espduino.menu.lvl.SSL=SSL
+espduino.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espduino.menu.lvl.TLS_MEM=TLS_MEM
+espduino.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espduino.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espduino.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espduino.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espduino.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espduino.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espduino.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espduino.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espduino.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espduino.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espduino.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espduino.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espduino.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espduino.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espduino.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espduino.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espduino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espduino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espduino.menu.lvl.CORE=CORE
+espduino.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espduino.menu.lvl.WIFI=WIFI
+espduino.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espduino.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espduino.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espduino.menu.lvl.UPDATER=UPDATER
+espduino.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espduino.menu.lvl.OTA=OTA
+espduino.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espduino.menu.lvl.OOM=OOM
+espduino.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espduino.menu.lvl.MDNS=MDNS
+espduino.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espduino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espduino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espduino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espduino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espduino.menu.wipe.none=Only Sketch
+espduino.menu.wipe.none.upload.erase_cmd=
+espduino.menu.wipe.sdk=Sketch + WiFi Settings
+espduino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espduino.menu.wipe.all=All Flash Contents
+espduino.menu.wipe.all.upload.erase_cmd=erase_flash
+espduino.menu.baud.115200=115200
+espduino.menu.baud.115200.upload.speed=115200
+espduino.menu.baud.57600=57600
+espduino.menu.baud.57600.upload.speed=57600
+espduino.menu.baud.230400.linux=230400
+espduino.menu.baud.230400.macosx=230400
+espduino.menu.baud.230400.upload.speed=230400
+espduino.menu.baud.256000.windows=256000
+espduino.menu.baud.256000.upload.speed=256000
+espduino.menu.baud.460800.linux=460800
+espduino.menu.baud.460800.macosx=460800
+espduino.menu.baud.460800.upload.speed=460800
+espduino.menu.baud.512000.windows=512000
+espduino.menu.baud.512000.upload.speed=512000
+espduino.menu.baud.921600=921600
+espduino.menu.baud.921600.upload.speed=921600
+espduino.menu.baud.3000000=3000000
+espduino.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+huzzah.name=Adafruit Feather HUZZAH ESP8266
+huzzah.build.board=ESP8266_ESP12
+huzzah.build.variant=adafruit
+huzzah.upload.tool=esptool
+huzzah.upload.maximum_data_size=81920
+huzzah.upload.wait_for_upload_port=true
+huzzah.upload.erase_cmd=
+huzzah.serial.disableDTR=true
+huzzah.serial.disableRTS=true
+huzzah.build.mcu=esp8266
+huzzah.build.core=esp8266
+huzzah.build.spiffs_pagesize=256
+huzzah.build.debug_port=
+huzzah.build.debug_level=
+huzzah.menu.xtal.80=80 MHz
+huzzah.menu.xtal.80.build.f_cpu=80000000L
+huzzah.menu.xtal.160=160 MHz
+huzzah.menu.xtal.160.build.f_cpu=160000000L
+huzzah.menu.vt.flash=Flash
+huzzah.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+huzzah.menu.vt.heap=Heap
+huzzah.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+huzzah.menu.vt.iram=IRAM
+huzzah.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+huzzah.menu.exception.legacy=Legacy (new can return nullptr)
+huzzah.menu.exception.legacy.build.exception_flags=-fno-exceptions
+huzzah.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+huzzah.menu.exception.disabled=Disabled (new can abort)
+huzzah.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+huzzah.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+huzzah.menu.exception.enabled=Enabled
+huzzah.menu.exception.enabled.build.exception_flags=-fexceptions
+huzzah.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+huzzah.menu.ssl.all=All SSL ciphers (most compatible)
+huzzah.menu.ssl.all.build.sslflags=
+huzzah.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+huzzah.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+huzzah.upload.resetmethod=--before default_reset --after hard_reset
+huzzah.build.flash_mode=qio
+huzzah.build.flash_flags=-DFLASHMODE_QIO
+huzzah.build.flash_freq=40
+huzzah.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+huzzah.menu.eesz.4M2M.build.flash_size=4M
+huzzah.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+huzzah.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+huzzah.menu.eesz.4M2M.build.spiffs_pagesize=256
+huzzah.menu.eesz.4M2M.upload.maximum_size=1044464
+huzzah.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+huzzah.menu.eesz.4M2M.build.spiffs_start=0x200000
+huzzah.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+huzzah.menu.eesz.4M2M.build.spiffs_blocksize=8192
+huzzah.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+huzzah.menu.eesz.4M3M.build.flash_size=4M
+huzzah.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+huzzah.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+huzzah.menu.eesz.4M3M.build.spiffs_pagesize=256
+huzzah.menu.eesz.4M3M.upload.maximum_size=1044464
+huzzah.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+huzzah.menu.eesz.4M3M.build.spiffs_start=0x100000
+huzzah.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+huzzah.menu.eesz.4M3M.build.spiffs_blocksize=8192
+huzzah.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+huzzah.menu.eesz.4M1M.build.flash_size=4M
+huzzah.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+huzzah.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+huzzah.menu.eesz.4M1M.build.spiffs_pagesize=256
+huzzah.menu.eesz.4M1M.upload.maximum_size=1044464
+huzzah.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+huzzah.menu.eesz.4M1M.build.spiffs_start=0x300000
+huzzah.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+huzzah.menu.eesz.4M1M.build.spiffs_blocksize=8192
+huzzah.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+huzzah.menu.eesz.4M.build.flash_size=4M
+huzzah.menu.eesz.4M.build.flash_size_bytes=0x400000
+huzzah.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+huzzah.menu.eesz.4M.build.spiffs_pagesize=256
+huzzah.menu.eesz.4M.upload.maximum_size=1044464
+huzzah.menu.eesz.4M.build.rfcal_addr=0x3FC000
+huzzah.menu.ip.lm2f=v2 Lower Memory
+huzzah.menu.ip.lm2f.build.lwip_include=lwip2/include
+huzzah.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+huzzah.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+huzzah.menu.ip.hb2f=v2 Higher Bandwidth
+huzzah.menu.ip.hb2f.build.lwip_include=lwip2/include
+huzzah.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+huzzah.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+huzzah.menu.ip.lm2n=v2 Lower Memory (no features)
+huzzah.menu.ip.lm2n.build.lwip_include=lwip2/include
+huzzah.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+huzzah.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+huzzah.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+huzzah.menu.ip.hb2n.build.lwip_include=lwip2/include
+huzzah.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+huzzah.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+huzzah.menu.ip.lm6f=v2 IPv6 Lower Memory
+huzzah.menu.ip.lm6f.build.lwip_include=lwip2/include
+huzzah.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+huzzah.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+huzzah.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+huzzah.menu.ip.hb6f.build.lwip_include=lwip2/include
+huzzah.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+huzzah.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+huzzah.menu.ip.hb1=v1.4 Higher Bandwidth
+huzzah.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+huzzah.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+huzzah.menu.ip.src=v1.4 Compile from source
+huzzah.menu.ip.src.build.lwip_lib=-llwip_src
+huzzah.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+huzzah.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+huzzah.menu.dbg.Disabled=Disabled
+huzzah.menu.dbg.Disabled.build.debug_port=
+huzzah.menu.dbg.Serial=Serial
+huzzah.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+huzzah.menu.dbg.Serial1=Serial1
+huzzah.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+huzzah.menu.lvl.None____=None
+huzzah.menu.lvl.None____.build.debug_level=
+huzzah.menu.lvl.SSL=SSL
+huzzah.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+huzzah.menu.lvl.TLS_MEM=TLS_MEM
+huzzah.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+huzzah.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+huzzah.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+huzzah.menu.lvl.HTTP_SERVER=HTTP_SERVER
+huzzah.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+huzzah.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+huzzah.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+huzzah.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+huzzah.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+huzzah.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+huzzah.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+huzzah.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+huzzah.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+huzzah.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+huzzah.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+huzzah.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+huzzah.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+huzzah.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+huzzah.menu.lvl.CORE=CORE
+huzzah.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+huzzah.menu.lvl.WIFI=WIFI
+huzzah.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+huzzah.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+huzzah.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+huzzah.menu.lvl.UPDATER=UPDATER
+huzzah.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+huzzah.menu.lvl.OTA=OTA
+huzzah.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+huzzah.menu.lvl.OOM=OOM
+huzzah.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+huzzah.menu.lvl.MDNS=MDNS
+huzzah.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+huzzah.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+huzzah.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+huzzah.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+huzzah.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+huzzah.menu.wipe.none=Only Sketch
+huzzah.menu.wipe.none.upload.erase_cmd=
+huzzah.menu.wipe.sdk=Sketch + WiFi Settings
+huzzah.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+huzzah.menu.wipe.all=All Flash Contents
+huzzah.menu.wipe.all.upload.erase_cmd=erase_flash
+huzzah.menu.baud.115200=115200
+huzzah.menu.baud.115200.upload.speed=115200
+huzzah.menu.baud.57600=57600
+huzzah.menu.baud.57600.upload.speed=57600
+huzzah.menu.baud.230400.linux=230400
+huzzah.menu.baud.230400.macosx=230400
+huzzah.menu.baud.230400.upload.speed=230400
+huzzah.menu.baud.256000.windows=256000
+huzzah.menu.baud.256000.upload.speed=256000
+huzzah.menu.baud.460800.linux=460800
+huzzah.menu.baud.460800.macosx=460800
+huzzah.menu.baud.460800.upload.speed=460800
+huzzah.menu.baud.512000.windows=512000
+huzzah.menu.baud.512000.upload.speed=512000
+huzzah.menu.baud.921600=921600
+huzzah.menu.baud.921600.upload.speed=921600
+huzzah.menu.baud.3000000=3000000
+huzzah.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+inventone.name=Invent One
+inventone.build.board=ESP8266_GENERIC
+inventone.build.variant=inventone
+inventone.upload.tool=esptool
+inventone.upload.maximum_data_size=81920
+inventone.upload.wait_for_upload_port=true
+inventone.upload.erase_cmd=
+inventone.serial.disableDTR=true
+inventone.serial.disableRTS=true
+inventone.build.mcu=esp8266
+inventone.build.core=esp8266
+inventone.build.spiffs_pagesize=256
+inventone.build.debug_port=
+inventone.build.debug_level=
+inventone.menu.xtal.80=80 MHz
+inventone.menu.xtal.80.build.f_cpu=80000000L
+inventone.menu.xtal.160=160 MHz
+inventone.menu.xtal.160.build.f_cpu=160000000L
+inventone.menu.vt.flash=Flash
+inventone.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+inventone.menu.vt.heap=Heap
+inventone.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+inventone.menu.vt.iram=IRAM
+inventone.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+inventone.menu.exception.legacy=Legacy (new can return nullptr)
+inventone.menu.exception.legacy.build.exception_flags=-fno-exceptions
+inventone.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+inventone.menu.exception.disabled=Disabled (new can abort)
+inventone.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+inventone.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+inventone.menu.exception.enabled=Enabled
+inventone.menu.exception.enabled.build.exception_flags=-fexceptions
+inventone.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+inventone.menu.ssl.all=All SSL ciphers (most compatible)
+inventone.menu.ssl.all.build.sslflags=
+inventone.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+inventone.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+inventone.upload.resetmethod=--before default_reset --after hard_reset
+inventone.build.flash_mode=dio
+inventone.build.flash_flags=-DFLASHMODE_DIO
+inventone.build.flash_freq=40
+inventone.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+inventone.menu.eesz.4M2M.build.flash_size=4M
+inventone.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+inventone.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+inventone.menu.eesz.4M2M.build.spiffs_pagesize=256
+inventone.menu.eesz.4M2M.upload.maximum_size=1044464
+inventone.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+inventone.menu.eesz.4M2M.build.spiffs_start=0x200000
+inventone.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+inventone.menu.eesz.4M2M.build.spiffs_blocksize=8192
+inventone.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+inventone.menu.eesz.4M3M.build.flash_size=4M
+inventone.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+inventone.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+inventone.menu.eesz.4M3M.build.spiffs_pagesize=256
+inventone.menu.eesz.4M3M.upload.maximum_size=1044464
+inventone.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+inventone.menu.eesz.4M3M.build.spiffs_start=0x100000
+inventone.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+inventone.menu.eesz.4M3M.build.spiffs_blocksize=8192
+inventone.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+inventone.menu.eesz.4M1M.build.flash_size=4M
+inventone.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+inventone.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+inventone.menu.eesz.4M1M.build.spiffs_pagesize=256
+inventone.menu.eesz.4M1M.upload.maximum_size=1044464
+inventone.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+inventone.menu.eesz.4M1M.build.spiffs_start=0x300000
+inventone.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+inventone.menu.eesz.4M1M.build.spiffs_blocksize=8192
+inventone.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+inventone.menu.eesz.4M.build.flash_size=4M
+inventone.menu.eesz.4M.build.flash_size_bytes=0x400000
+inventone.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+inventone.menu.eesz.4M.build.spiffs_pagesize=256
+inventone.menu.eesz.4M.upload.maximum_size=1044464
+inventone.menu.eesz.4M.build.rfcal_addr=0x3FC000
+inventone.menu.ip.lm2f=v2 Lower Memory
+inventone.menu.ip.lm2f.build.lwip_include=lwip2/include
+inventone.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+inventone.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+inventone.menu.ip.hb2f=v2 Higher Bandwidth
+inventone.menu.ip.hb2f.build.lwip_include=lwip2/include
+inventone.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+inventone.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+inventone.menu.ip.lm2n=v2 Lower Memory (no features)
+inventone.menu.ip.lm2n.build.lwip_include=lwip2/include
+inventone.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+inventone.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+inventone.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+inventone.menu.ip.hb2n.build.lwip_include=lwip2/include
+inventone.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+inventone.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+inventone.menu.ip.lm6f=v2 IPv6 Lower Memory
+inventone.menu.ip.lm6f.build.lwip_include=lwip2/include
+inventone.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+inventone.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+inventone.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+inventone.menu.ip.hb6f.build.lwip_include=lwip2/include
+inventone.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+inventone.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+inventone.menu.ip.hb1=v1.4 Higher Bandwidth
+inventone.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+inventone.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+inventone.menu.ip.src=v1.4 Compile from source
+inventone.menu.ip.src.build.lwip_lib=-llwip_src
+inventone.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+inventone.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+inventone.menu.dbg.Disabled=Disabled
+inventone.menu.dbg.Disabled.build.debug_port=
+inventone.menu.dbg.Serial=Serial
+inventone.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+inventone.menu.dbg.Serial1=Serial1
+inventone.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+inventone.menu.lvl.None____=None
+inventone.menu.lvl.None____.build.debug_level=
+inventone.menu.lvl.SSL=SSL
+inventone.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+inventone.menu.lvl.TLS_MEM=TLS_MEM
+inventone.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+inventone.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+inventone.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+inventone.menu.lvl.HTTP_SERVER=HTTP_SERVER
+inventone.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+inventone.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+inventone.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+inventone.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+inventone.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+inventone.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+inventone.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+inventone.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+inventone.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+inventone.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+inventone.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+inventone.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+inventone.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+inventone.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+inventone.menu.lvl.CORE=CORE
+inventone.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+inventone.menu.lvl.WIFI=WIFI
+inventone.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+inventone.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+inventone.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+inventone.menu.lvl.UPDATER=UPDATER
+inventone.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+inventone.menu.lvl.OTA=OTA
+inventone.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+inventone.menu.lvl.OOM=OOM
+inventone.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+inventone.menu.lvl.MDNS=MDNS
+inventone.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+inventone.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+inventone.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+inventone.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+inventone.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+inventone.menu.wipe.none=Only Sketch
+inventone.menu.wipe.none.upload.erase_cmd=
+inventone.menu.wipe.sdk=Sketch + WiFi Settings
+inventone.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+inventone.menu.wipe.all=All Flash Contents
+inventone.menu.wipe.all.upload.erase_cmd=erase_flash
+inventone.menu.baud.115200=115200
+inventone.menu.baud.115200.upload.speed=115200
+inventone.menu.baud.57600=57600
+inventone.menu.baud.57600.upload.speed=57600
+inventone.menu.baud.230400.linux=230400
+inventone.menu.baud.230400.macosx=230400
+inventone.menu.baud.230400.upload.speed=230400
+inventone.menu.baud.256000.windows=256000
+inventone.menu.baud.256000.upload.speed=256000
+inventone.menu.baud.460800.linux=460800
+inventone.menu.baud.460800.macosx=460800
+inventone.menu.baud.460800.upload.speed=460800
+inventone.menu.baud.512000.windows=512000
+inventone.menu.baud.512000.upload.speed=512000
+inventone.menu.baud.921600=921600
+inventone.menu.baud.921600.upload.speed=921600
+inventone.menu.baud.3000000=3000000
+inventone.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+cw01.name=XinaBox CW01
+cw01.build.board=ESP8266_GENERIC
+cw01.build.variant=xinabox
+cw01.upload.tool=esptool
+cw01.upload.maximum_data_size=81920
+cw01.upload.wait_for_upload_port=true
+cw01.upload.erase_cmd=
+cw01.serial.disableDTR=true
+cw01.serial.disableRTS=true
+cw01.build.mcu=esp8266
+cw01.build.core=esp8266
+cw01.build.spiffs_pagesize=256
+cw01.build.debug_port=
+cw01.build.debug_level=
+cw01.menu.xtal.80=80 MHz
+cw01.menu.xtal.80.build.f_cpu=80000000L
+cw01.menu.xtal.160=160 MHz
+cw01.menu.xtal.160.build.f_cpu=160000000L
+cw01.menu.vt.flash=Flash
+cw01.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+cw01.menu.vt.heap=Heap
+cw01.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+cw01.menu.vt.iram=IRAM
+cw01.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+cw01.menu.exception.legacy=Legacy (new can return nullptr)
+cw01.menu.exception.legacy.build.exception_flags=-fno-exceptions
+cw01.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+cw01.menu.exception.disabled=Disabled (new can abort)
+cw01.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+cw01.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+cw01.menu.exception.enabled=Enabled
+cw01.menu.exception.enabled.build.exception_flags=-fexceptions
+cw01.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+cw01.menu.ssl.all=All SSL ciphers (most compatible)
+cw01.menu.ssl.all.build.sslflags=
+cw01.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+cw01.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+cw01.upload.resetmethod=--before default_reset --after hard_reset
+cw01.menu.CrystalFreq.26=26 MHz
+cw01.menu.CrystalFreq.40=40 MHz
+cw01.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+cw01.build.flash_mode=dio
+cw01.build.flash_flags=-DFLASHMODE_DIO
+cw01.build.flash_freq=40
+cw01.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+cw01.menu.eesz.4M2M.build.flash_size=4M
+cw01.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+cw01.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+cw01.menu.eesz.4M2M.build.spiffs_pagesize=256
+cw01.menu.eesz.4M2M.upload.maximum_size=1044464
+cw01.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+cw01.menu.eesz.4M2M.build.spiffs_start=0x200000
+cw01.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+cw01.menu.eesz.4M2M.build.spiffs_blocksize=8192
+cw01.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+cw01.menu.eesz.4M3M.build.flash_size=4M
+cw01.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+cw01.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+cw01.menu.eesz.4M3M.build.spiffs_pagesize=256
+cw01.menu.eesz.4M3M.upload.maximum_size=1044464
+cw01.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+cw01.menu.eesz.4M3M.build.spiffs_start=0x100000
+cw01.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+cw01.menu.eesz.4M3M.build.spiffs_blocksize=8192
+cw01.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+cw01.menu.eesz.4M1M.build.flash_size=4M
+cw01.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+cw01.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+cw01.menu.eesz.4M1M.build.spiffs_pagesize=256
+cw01.menu.eesz.4M1M.upload.maximum_size=1044464
+cw01.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+cw01.menu.eesz.4M1M.build.spiffs_start=0x300000
+cw01.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+cw01.menu.eesz.4M1M.build.spiffs_blocksize=8192
+cw01.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+cw01.menu.eesz.4M.build.flash_size=4M
+cw01.menu.eesz.4M.build.flash_size_bytes=0x400000
+cw01.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+cw01.menu.eesz.4M.build.spiffs_pagesize=256
+cw01.menu.eesz.4M.upload.maximum_size=1044464
+cw01.menu.eesz.4M.build.rfcal_addr=0x3FC000
+cw01.menu.ip.lm2f=v2 Lower Memory
+cw01.menu.ip.lm2f.build.lwip_include=lwip2/include
+cw01.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+cw01.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+cw01.menu.ip.hb2f=v2 Higher Bandwidth
+cw01.menu.ip.hb2f.build.lwip_include=lwip2/include
+cw01.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+cw01.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+cw01.menu.ip.lm2n=v2 Lower Memory (no features)
+cw01.menu.ip.lm2n.build.lwip_include=lwip2/include
+cw01.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+cw01.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+cw01.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+cw01.menu.ip.hb2n.build.lwip_include=lwip2/include
+cw01.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+cw01.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+cw01.menu.ip.lm6f=v2 IPv6 Lower Memory
+cw01.menu.ip.lm6f.build.lwip_include=lwip2/include
+cw01.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+cw01.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+cw01.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+cw01.menu.ip.hb6f.build.lwip_include=lwip2/include
+cw01.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+cw01.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+cw01.menu.ip.hb1=v1.4 Higher Bandwidth
+cw01.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+cw01.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+cw01.menu.ip.src=v1.4 Compile from source
+cw01.menu.ip.src.build.lwip_lib=-llwip_src
+cw01.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+cw01.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+cw01.menu.dbg.Disabled=Disabled
+cw01.menu.dbg.Disabled.build.debug_port=
+cw01.menu.dbg.Serial=Serial
+cw01.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+cw01.menu.dbg.Serial1=Serial1
+cw01.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+cw01.menu.lvl.None____=None
+cw01.menu.lvl.None____.build.debug_level=
+cw01.menu.lvl.SSL=SSL
+cw01.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+cw01.menu.lvl.TLS_MEM=TLS_MEM
+cw01.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+cw01.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+cw01.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+cw01.menu.lvl.HTTP_SERVER=HTTP_SERVER
+cw01.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+cw01.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+cw01.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+cw01.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+cw01.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+cw01.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+cw01.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+cw01.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+cw01.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+cw01.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+cw01.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+cw01.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+cw01.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+cw01.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+cw01.menu.lvl.CORE=CORE
+cw01.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+cw01.menu.lvl.WIFI=WIFI
+cw01.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+cw01.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+cw01.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+cw01.menu.lvl.UPDATER=UPDATER
+cw01.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+cw01.menu.lvl.OTA=OTA
+cw01.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+cw01.menu.lvl.OOM=OOM
+cw01.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+cw01.menu.lvl.MDNS=MDNS
+cw01.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+cw01.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+cw01.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+cw01.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+cw01.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+cw01.menu.wipe.none=Only Sketch
+cw01.menu.wipe.none.upload.erase_cmd=
+cw01.menu.wipe.sdk=Sketch + WiFi Settings
+cw01.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+cw01.menu.wipe.all=All Flash Contents
+cw01.menu.wipe.all.upload.erase_cmd=erase_flash
+cw01.menu.baud.115200=115200
+cw01.menu.baud.115200.upload.speed=115200
+cw01.menu.baud.57600=57600
+cw01.menu.baud.57600.upload.speed=57600
+cw01.menu.baud.230400.linux=230400
+cw01.menu.baud.230400.macosx=230400
+cw01.menu.baud.230400.upload.speed=230400
+cw01.menu.baud.256000.windows=256000
+cw01.menu.baud.256000.upload.speed=256000
+cw01.menu.baud.460800.linux=460800
+cw01.menu.baud.460800.macosx=460800
+cw01.menu.baud.460800.upload.speed=460800
+cw01.menu.baud.512000.windows=512000
+cw01.menu.baud.512000.upload.speed=512000
+cw01.menu.baud.921600=921600
+cw01.menu.baud.921600.upload.speed=921600
+cw01.menu.baud.3000000=3000000
+cw01.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espresso_lite_v1.name=ESPresso Lite 1.0
+espresso_lite_v1.build.board=ESP8266_ESPRESSO_LITE_V1
+espresso_lite_v1.build.variant=espresso_lite_v1
+espresso_lite_v1.upload.tool=esptool
+espresso_lite_v1.upload.maximum_data_size=81920
+espresso_lite_v1.upload.wait_for_upload_port=true
+espresso_lite_v1.upload.erase_cmd=
+espresso_lite_v1.serial.disableDTR=true
+espresso_lite_v1.serial.disableRTS=true
+espresso_lite_v1.build.mcu=esp8266
+espresso_lite_v1.build.core=esp8266
+espresso_lite_v1.build.spiffs_pagesize=256
+espresso_lite_v1.build.debug_port=
+espresso_lite_v1.build.debug_level=
+espresso_lite_v1.menu.xtal.80=80 MHz
+espresso_lite_v1.menu.xtal.80.build.f_cpu=80000000L
+espresso_lite_v1.menu.xtal.160=160 MHz
+espresso_lite_v1.menu.xtal.160.build.f_cpu=160000000L
+espresso_lite_v1.menu.vt.flash=Flash
+espresso_lite_v1.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espresso_lite_v1.menu.vt.heap=Heap
+espresso_lite_v1.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espresso_lite_v1.menu.vt.iram=IRAM
+espresso_lite_v1.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espresso_lite_v1.menu.exception.legacy=Legacy (new can return nullptr)
+espresso_lite_v1.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espresso_lite_v1.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espresso_lite_v1.menu.exception.disabled=Disabled (new can abort)
+espresso_lite_v1.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espresso_lite_v1.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espresso_lite_v1.menu.exception.enabled=Enabled
+espresso_lite_v1.menu.exception.enabled.build.exception_flags=-fexceptions
+espresso_lite_v1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espresso_lite_v1.menu.ssl.all=All SSL ciphers (most compatible)
+espresso_lite_v1.menu.ssl.all.build.sslflags=
+espresso_lite_v1.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espresso_lite_v1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espresso_lite_v1.build.flash_mode=dio
+espresso_lite_v1.build.flash_flags=-DFLASHMODE_DIO
+espresso_lite_v1.build.flash_freq=40
+espresso_lite_v1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espresso_lite_v1.menu.eesz.4M2M.build.flash_size=4M
+espresso_lite_v1.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espresso_lite_v1.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espresso_lite_v1.menu.eesz.4M2M.build.spiffs_pagesize=256
+espresso_lite_v1.menu.eesz.4M2M.upload.maximum_size=1044464
+espresso_lite_v1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espresso_lite_v1.menu.eesz.4M2M.build.spiffs_start=0x200000
+espresso_lite_v1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espresso_lite_v1.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espresso_lite_v1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espresso_lite_v1.menu.eesz.4M3M.build.flash_size=4M
+espresso_lite_v1.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espresso_lite_v1.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espresso_lite_v1.menu.eesz.4M3M.build.spiffs_pagesize=256
+espresso_lite_v1.menu.eesz.4M3M.upload.maximum_size=1044464
+espresso_lite_v1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espresso_lite_v1.menu.eesz.4M3M.build.spiffs_start=0x100000
+espresso_lite_v1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espresso_lite_v1.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espresso_lite_v1.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espresso_lite_v1.menu.eesz.4M1M.build.flash_size=4M
+espresso_lite_v1.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espresso_lite_v1.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espresso_lite_v1.menu.eesz.4M1M.build.spiffs_pagesize=256
+espresso_lite_v1.menu.eesz.4M1M.upload.maximum_size=1044464
+espresso_lite_v1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espresso_lite_v1.menu.eesz.4M1M.build.spiffs_start=0x300000
+espresso_lite_v1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espresso_lite_v1.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espresso_lite_v1.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espresso_lite_v1.menu.eesz.4M.build.flash_size=4M
+espresso_lite_v1.menu.eesz.4M.build.flash_size_bytes=0x400000
+espresso_lite_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espresso_lite_v1.menu.eesz.4M.build.spiffs_pagesize=256
+espresso_lite_v1.menu.eesz.4M.upload.maximum_size=1044464
+espresso_lite_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espresso_lite_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espresso_lite_v1.menu.ResetMethod.ck=no dtr (aka ck)
+espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+espresso_lite_v1.menu.ip.lm2f=v2 Lower Memory
+espresso_lite_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espresso_lite_v1.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espresso_lite_v1.menu.ip.hb2f=v2 Higher Bandwidth
+espresso_lite_v1.menu.ip.hb2f.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espresso_lite_v1.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espresso_lite_v1.menu.ip.lm2n=v2 Lower Memory (no features)
+espresso_lite_v1.menu.ip.lm2n.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espresso_lite_v1.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espresso_lite_v1.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espresso_lite_v1.menu.ip.hb2n.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espresso_lite_v1.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espresso_lite_v1.menu.ip.lm6f=v2 IPv6 Lower Memory
+espresso_lite_v1.menu.ip.lm6f.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espresso_lite_v1.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espresso_lite_v1.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espresso_lite_v1.menu.ip.hb6f.build.lwip_include=lwip2/include
+espresso_lite_v1.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espresso_lite_v1.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espresso_lite_v1.menu.ip.hb1=v1.4 Higher Bandwidth
+espresso_lite_v1.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espresso_lite_v1.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espresso_lite_v1.menu.ip.src=v1.4 Compile from source
+espresso_lite_v1.menu.ip.src.build.lwip_lib=-llwip_src
+espresso_lite_v1.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espresso_lite_v1.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espresso_lite_v1.menu.dbg.Disabled=Disabled
+espresso_lite_v1.menu.dbg.Disabled.build.debug_port=
+espresso_lite_v1.menu.dbg.Serial=Serial
+espresso_lite_v1.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espresso_lite_v1.menu.dbg.Serial1=Serial1
+espresso_lite_v1.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espresso_lite_v1.menu.lvl.None____=None
+espresso_lite_v1.menu.lvl.None____.build.debug_level=
+espresso_lite_v1.menu.lvl.SSL=SSL
+espresso_lite_v1.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espresso_lite_v1.menu.lvl.TLS_MEM=TLS_MEM
+espresso_lite_v1.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espresso_lite_v1.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espresso_lite_v1.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v1.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espresso_lite_v1.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espresso_lite_v1.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espresso_lite_v1.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espresso_lite_v1.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v1.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v1.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.lvl.CORE=CORE
+espresso_lite_v1.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espresso_lite_v1.menu.lvl.WIFI=WIFI
+espresso_lite_v1.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espresso_lite_v1.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espresso_lite_v1.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v1.menu.lvl.UPDATER=UPDATER
+espresso_lite_v1.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espresso_lite_v1.menu.lvl.OTA=OTA
+espresso_lite_v1.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espresso_lite_v1.menu.lvl.OOM=OOM
+espresso_lite_v1.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espresso_lite_v1.menu.lvl.MDNS=MDNS
+espresso_lite_v1.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espresso_lite_v1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espresso_lite_v1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espresso_lite_v1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espresso_lite_v1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espresso_lite_v1.menu.wipe.none=Only Sketch
+espresso_lite_v1.menu.wipe.none.upload.erase_cmd=
+espresso_lite_v1.menu.wipe.sdk=Sketch + WiFi Settings
+espresso_lite_v1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espresso_lite_v1.menu.wipe.all=All Flash Contents
+espresso_lite_v1.menu.wipe.all.upload.erase_cmd=erase_flash
+espresso_lite_v1.menu.baud.115200=115200
+espresso_lite_v1.menu.baud.115200.upload.speed=115200
+espresso_lite_v1.menu.baud.57600=57600
+espresso_lite_v1.menu.baud.57600.upload.speed=57600
+espresso_lite_v1.menu.baud.230400.linux=230400
+espresso_lite_v1.menu.baud.230400.macosx=230400
+espresso_lite_v1.menu.baud.230400.upload.speed=230400
+espresso_lite_v1.menu.baud.256000.windows=256000
+espresso_lite_v1.menu.baud.256000.upload.speed=256000
+espresso_lite_v1.menu.baud.460800.linux=460800
+espresso_lite_v1.menu.baud.460800.macosx=460800
+espresso_lite_v1.menu.baud.460800.upload.speed=460800
+espresso_lite_v1.menu.baud.512000.windows=512000
+espresso_lite_v1.menu.baud.512000.upload.speed=512000
+espresso_lite_v1.menu.baud.921600=921600
+espresso_lite_v1.menu.baud.921600.upload.speed=921600
+espresso_lite_v1.menu.baud.3000000=3000000
+espresso_lite_v1.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espresso_lite_v2.name=ESPresso Lite 2.0
+espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2
+espresso_lite_v2.build.variant=espresso_lite_v2
+espresso_lite_v2.upload.tool=esptool
+espresso_lite_v2.upload.maximum_data_size=81920
+espresso_lite_v2.upload.wait_for_upload_port=true
+espresso_lite_v2.upload.erase_cmd=
+espresso_lite_v2.serial.disableDTR=true
+espresso_lite_v2.serial.disableRTS=true
+espresso_lite_v2.build.mcu=esp8266
+espresso_lite_v2.build.core=esp8266
+espresso_lite_v2.build.spiffs_pagesize=256
+espresso_lite_v2.build.debug_port=
+espresso_lite_v2.build.debug_level=
+espresso_lite_v2.menu.xtal.80=80 MHz
+espresso_lite_v2.menu.xtal.80.build.f_cpu=80000000L
+espresso_lite_v2.menu.xtal.160=160 MHz
+espresso_lite_v2.menu.xtal.160.build.f_cpu=160000000L
+espresso_lite_v2.menu.vt.flash=Flash
+espresso_lite_v2.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espresso_lite_v2.menu.vt.heap=Heap
+espresso_lite_v2.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espresso_lite_v2.menu.vt.iram=IRAM
+espresso_lite_v2.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espresso_lite_v2.menu.exception.legacy=Legacy (new can return nullptr)
+espresso_lite_v2.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espresso_lite_v2.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espresso_lite_v2.menu.exception.disabled=Disabled (new can abort)
+espresso_lite_v2.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espresso_lite_v2.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espresso_lite_v2.menu.exception.enabled=Enabled
+espresso_lite_v2.menu.exception.enabled.build.exception_flags=-fexceptions
+espresso_lite_v2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espresso_lite_v2.menu.ssl.all=All SSL ciphers (most compatible)
+espresso_lite_v2.menu.ssl.all.build.sslflags=
+espresso_lite_v2.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espresso_lite_v2.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espresso_lite_v2.build.flash_mode=dio
+espresso_lite_v2.build.flash_flags=-DFLASHMODE_DIO
+espresso_lite_v2.build.flash_freq=40
+espresso_lite_v2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espresso_lite_v2.menu.eesz.4M2M.build.flash_size=4M
+espresso_lite_v2.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espresso_lite_v2.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espresso_lite_v2.menu.eesz.4M2M.build.spiffs_pagesize=256
+espresso_lite_v2.menu.eesz.4M2M.upload.maximum_size=1044464
+espresso_lite_v2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espresso_lite_v2.menu.eesz.4M2M.build.spiffs_start=0x200000
+espresso_lite_v2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espresso_lite_v2.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espresso_lite_v2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espresso_lite_v2.menu.eesz.4M3M.build.flash_size=4M
+espresso_lite_v2.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espresso_lite_v2.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espresso_lite_v2.menu.eesz.4M3M.build.spiffs_pagesize=256
+espresso_lite_v2.menu.eesz.4M3M.upload.maximum_size=1044464
+espresso_lite_v2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espresso_lite_v2.menu.eesz.4M3M.build.spiffs_start=0x100000
+espresso_lite_v2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espresso_lite_v2.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espresso_lite_v2.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espresso_lite_v2.menu.eesz.4M1M.build.flash_size=4M
+espresso_lite_v2.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espresso_lite_v2.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espresso_lite_v2.menu.eesz.4M1M.build.spiffs_pagesize=256
+espresso_lite_v2.menu.eesz.4M1M.upload.maximum_size=1044464
+espresso_lite_v2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espresso_lite_v2.menu.eesz.4M1M.build.spiffs_start=0x300000
+espresso_lite_v2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espresso_lite_v2.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espresso_lite_v2.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espresso_lite_v2.menu.eesz.4M.build.flash_size=4M
+espresso_lite_v2.menu.eesz.4M.build.flash_size_bytes=0x400000
+espresso_lite_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espresso_lite_v2.menu.eesz.4M.build.spiffs_pagesize=256
+espresso_lite_v2.menu.eesz.4M.upload.maximum_size=1044464
+espresso_lite_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espresso_lite_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espresso_lite_v2.menu.ResetMethod.ck=no dtr (aka ck)
+espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+espresso_lite_v2.menu.ip.lm2f=v2 Lower Memory
+espresso_lite_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espresso_lite_v2.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espresso_lite_v2.menu.ip.hb2f=v2 Higher Bandwidth
+espresso_lite_v2.menu.ip.hb2f.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espresso_lite_v2.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espresso_lite_v2.menu.ip.lm2n=v2 Lower Memory (no features)
+espresso_lite_v2.menu.ip.lm2n.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espresso_lite_v2.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espresso_lite_v2.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espresso_lite_v2.menu.ip.hb2n.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espresso_lite_v2.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espresso_lite_v2.menu.ip.lm6f=v2 IPv6 Lower Memory
+espresso_lite_v2.menu.ip.lm6f.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espresso_lite_v2.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espresso_lite_v2.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espresso_lite_v2.menu.ip.hb6f.build.lwip_include=lwip2/include
+espresso_lite_v2.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espresso_lite_v2.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espresso_lite_v2.menu.ip.hb1=v1.4 Higher Bandwidth
+espresso_lite_v2.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espresso_lite_v2.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espresso_lite_v2.menu.ip.src=v1.4 Compile from source
+espresso_lite_v2.menu.ip.src.build.lwip_lib=-llwip_src
+espresso_lite_v2.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espresso_lite_v2.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espresso_lite_v2.menu.dbg.Disabled=Disabled
+espresso_lite_v2.menu.dbg.Disabled.build.debug_port=
+espresso_lite_v2.menu.dbg.Serial=Serial
+espresso_lite_v2.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espresso_lite_v2.menu.dbg.Serial1=Serial1
+espresso_lite_v2.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espresso_lite_v2.menu.lvl.None____=None
+espresso_lite_v2.menu.lvl.None____.build.debug_level=
+espresso_lite_v2.menu.lvl.SSL=SSL
+espresso_lite_v2.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espresso_lite_v2.menu.lvl.TLS_MEM=TLS_MEM
+espresso_lite_v2.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espresso_lite_v2.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espresso_lite_v2.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v2.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espresso_lite_v2.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espresso_lite_v2.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espresso_lite_v2.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espresso_lite_v2.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v2.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v2.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.lvl.CORE=CORE
+espresso_lite_v2.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espresso_lite_v2.menu.lvl.WIFI=WIFI
+espresso_lite_v2.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espresso_lite_v2.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espresso_lite_v2.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v2.menu.lvl.UPDATER=UPDATER
+espresso_lite_v2.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espresso_lite_v2.menu.lvl.OTA=OTA
+espresso_lite_v2.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espresso_lite_v2.menu.lvl.OOM=OOM
+espresso_lite_v2.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espresso_lite_v2.menu.lvl.MDNS=MDNS
+espresso_lite_v2.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espresso_lite_v2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espresso_lite_v2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espresso_lite_v2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espresso_lite_v2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espresso_lite_v2.menu.wipe.none=Only Sketch
+espresso_lite_v2.menu.wipe.none.upload.erase_cmd=
+espresso_lite_v2.menu.wipe.sdk=Sketch + WiFi Settings
+espresso_lite_v2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espresso_lite_v2.menu.wipe.all=All Flash Contents
+espresso_lite_v2.menu.wipe.all.upload.erase_cmd=erase_flash
+espresso_lite_v2.menu.baud.115200=115200
+espresso_lite_v2.menu.baud.115200.upload.speed=115200
+espresso_lite_v2.menu.baud.57600=57600
+espresso_lite_v2.menu.baud.57600.upload.speed=57600
+espresso_lite_v2.menu.baud.230400.linux=230400
+espresso_lite_v2.menu.baud.230400.macosx=230400
+espresso_lite_v2.menu.baud.230400.upload.speed=230400
+espresso_lite_v2.menu.baud.256000.windows=256000
+espresso_lite_v2.menu.baud.256000.upload.speed=256000
+espresso_lite_v2.menu.baud.460800.linux=460800
+espresso_lite_v2.menu.baud.460800.macosx=460800
+espresso_lite_v2.menu.baud.460800.upload.speed=460800
+espresso_lite_v2.menu.baud.512000.windows=512000
+espresso_lite_v2.menu.baud.512000.upload.speed=512000
+espresso_lite_v2.menu.baud.921600=921600
+espresso_lite_v2.menu.baud.921600.upload.speed=921600
+espresso_lite_v2.menu.baud.3000000=3000000
+espresso_lite_v2.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+phoenix_v1.name=Phoenix 1.0
+phoenix_v1.build.board=ESP8266_PHOENIX_V1
+phoenix_v1.build.variant=phoenix_v1
+phoenix_v1.upload.tool=esptool
+phoenix_v1.upload.maximum_data_size=81920
+phoenix_v1.upload.wait_for_upload_port=true
+phoenix_v1.upload.erase_cmd=
+phoenix_v1.serial.disableDTR=true
+phoenix_v1.serial.disableRTS=true
+phoenix_v1.build.mcu=esp8266
+phoenix_v1.build.core=esp8266
+phoenix_v1.build.spiffs_pagesize=256
+phoenix_v1.build.debug_port=
+phoenix_v1.build.debug_level=
+phoenix_v1.menu.xtal.80=80 MHz
+phoenix_v1.menu.xtal.80.build.f_cpu=80000000L
+phoenix_v1.menu.xtal.160=160 MHz
+phoenix_v1.menu.xtal.160.build.f_cpu=160000000L
+phoenix_v1.menu.vt.flash=Flash
+phoenix_v1.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+phoenix_v1.menu.vt.heap=Heap
+phoenix_v1.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+phoenix_v1.menu.vt.iram=IRAM
+phoenix_v1.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+phoenix_v1.menu.exception.legacy=Legacy (new can return nullptr)
+phoenix_v1.menu.exception.legacy.build.exception_flags=-fno-exceptions
+phoenix_v1.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+phoenix_v1.menu.exception.disabled=Disabled (new can abort)
+phoenix_v1.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+phoenix_v1.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+phoenix_v1.menu.exception.enabled=Enabled
+phoenix_v1.menu.exception.enabled.build.exception_flags=-fexceptions
+phoenix_v1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+phoenix_v1.menu.ssl.all=All SSL ciphers (most compatible)
+phoenix_v1.menu.ssl.all.build.sslflags=
+phoenix_v1.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+phoenix_v1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+phoenix_v1.build.flash_mode=dio
+phoenix_v1.build.flash_flags=-DFLASHMODE_DIO
+phoenix_v1.build.flash_freq=40
+phoenix_v1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+phoenix_v1.menu.eesz.4M2M.build.flash_size=4M
+phoenix_v1.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+phoenix_v1.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+phoenix_v1.menu.eesz.4M2M.build.spiffs_pagesize=256
+phoenix_v1.menu.eesz.4M2M.upload.maximum_size=1044464
+phoenix_v1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+phoenix_v1.menu.eesz.4M2M.build.spiffs_start=0x200000
+phoenix_v1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+phoenix_v1.menu.eesz.4M2M.build.spiffs_blocksize=8192
+phoenix_v1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+phoenix_v1.menu.eesz.4M3M.build.flash_size=4M
+phoenix_v1.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+phoenix_v1.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+phoenix_v1.menu.eesz.4M3M.build.spiffs_pagesize=256
+phoenix_v1.menu.eesz.4M3M.upload.maximum_size=1044464
+phoenix_v1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+phoenix_v1.menu.eesz.4M3M.build.spiffs_start=0x100000
+phoenix_v1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+phoenix_v1.menu.eesz.4M3M.build.spiffs_blocksize=8192
+phoenix_v1.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+phoenix_v1.menu.eesz.4M1M.build.flash_size=4M
+phoenix_v1.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+phoenix_v1.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+phoenix_v1.menu.eesz.4M1M.build.spiffs_pagesize=256
+phoenix_v1.menu.eesz.4M1M.upload.maximum_size=1044464
+phoenix_v1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+phoenix_v1.menu.eesz.4M1M.build.spiffs_start=0x300000
+phoenix_v1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+phoenix_v1.menu.eesz.4M1M.build.spiffs_blocksize=8192
+phoenix_v1.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+phoenix_v1.menu.eesz.4M.build.flash_size=4M
+phoenix_v1.menu.eesz.4M.build.flash_size_bytes=0x400000
+phoenix_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+phoenix_v1.menu.eesz.4M.build.spiffs_pagesize=256
+phoenix_v1.menu.eesz.4M.upload.maximum_size=1044464
+phoenix_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
+phoenix_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+phoenix_v1.menu.ResetMethod.ck=no dtr (aka ck)
+phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+phoenix_v1.menu.ip.lm2f=v2 Lower Memory
+phoenix_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+phoenix_v1.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+phoenix_v1.menu.ip.hb2f=v2 Higher Bandwidth
+phoenix_v1.menu.ip.hb2f.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+phoenix_v1.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+phoenix_v1.menu.ip.lm2n=v2 Lower Memory (no features)
+phoenix_v1.menu.ip.lm2n.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+phoenix_v1.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+phoenix_v1.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+phoenix_v1.menu.ip.hb2n.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+phoenix_v1.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+phoenix_v1.menu.ip.lm6f=v2 IPv6 Lower Memory
+phoenix_v1.menu.ip.lm6f.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+phoenix_v1.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+phoenix_v1.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+phoenix_v1.menu.ip.hb6f.build.lwip_include=lwip2/include
+phoenix_v1.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+phoenix_v1.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+phoenix_v1.menu.ip.hb1=v1.4 Higher Bandwidth
+phoenix_v1.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+phoenix_v1.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+phoenix_v1.menu.ip.src=v1.4 Compile from source
+phoenix_v1.menu.ip.src.build.lwip_lib=-llwip_src
+phoenix_v1.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+phoenix_v1.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+phoenix_v1.menu.dbg.Disabled=Disabled
+phoenix_v1.menu.dbg.Disabled.build.debug_port=
+phoenix_v1.menu.dbg.Serial=Serial
+phoenix_v1.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+phoenix_v1.menu.dbg.Serial1=Serial1
+phoenix_v1.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+phoenix_v1.menu.lvl.None____=None
+phoenix_v1.menu.lvl.None____.build.debug_level=
+phoenix_v1.menu.lvl.SSL=SSL
+phoenix_v1.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+phoenix_v1.menu.lvl.TLS_MEM=TLS_MEM
+phoenix_v1.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+phoenix_v1.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+phoenix_v1.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v1.menu.lvl.HTTP_SERVER=HTTP_SERVER
+phoenix_v1.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+phoenix_v1.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+phoenix_v1.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+phoenix_v1.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v1.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+phoenix_v1.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+phoenix_v1.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v1.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+phoenix_v1.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+phoenix_v1.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+phoenix_v1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+phoenix_v1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v1.menu.lvl.CORE=CORE
+phoenix_v1.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+phoenix_v1.menu.lvl.WIFI=WIFI
+phoenix_v1.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+phoenix_v1.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+phoenix_v1.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+phoenix_v1.menu.lvl.UPDATER=UPDATER
+phoenix_v1.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+phoenix_v1.menu.lvl.OTA=OTA
+phoenix_v1.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+phoenix_v1.menu.lvl.OOM=OOM
+phoenix_v1.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+phoenix_v1.menu.lvl.MDNS=MDNS
+phoenix_v1.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+phoenix_v1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+phoenix_v1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+phoenix_v1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+phoenix_v1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+phoenix_v1.menu.wipe.none=Only Sketch
+phoenix_v1.menu.wipe.none.upload.erase_cmd=
+phoenix_v1.menu.wipe.sdk=Sketch + WiFi Settings
+phoenix_v1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+phoenix_v1.menu.wipe.all=All Flash Contents
+phoenix_v1.menu.wipe.all.upload.erase_cmd=erase_flash
+phoenix_v1.menu.baud.115200=115200
+phoenix_v1.menu.baud.115200.upload.speed=115200
+phoenix_v1.menu.baud.57600=57600
+phoenix_v1.menu.baud.57600.upload.speed=57600
+phoenix_v1.menu.baud.230400.linux=230400
+phoenix_v1.menu.baud.230400.macosx=230400
+phoenix_v1.menu.baud.230400.upload.speed=230400
+phoenix_v1.menu.baud.256000.windows=256000
+phoenix_v1.menu.baud.256000.upload.speed=256000
+phoenix_v1.menu.baud.460800.linux=460800
+phoenix_v1.menu.baud.460800.macosx=460800
+phoenix_v1.menu.baud.460800.upload.speed=460800
+phoenix_v1.menu.baud.512000.windows=512000
+phoenix_v1.menu.baud.512000.upload.speed=512000
+phoenix_v1.menu.baud.921600=921600
+phoenix_v1.menu.baud.921600.upload.speed=921600
+phoenix_v1.menu.baud.3000000=3000000
+phoenix_v1.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+phoenix_v2.name=Phoenix 2.0
+phoenix_v2.build.board=ESP8266_PHOENIX_V2
+phoenix_v2.build.variant=phoenix_v2
+phoenix_v2.upload.tool=esptool
+phoenix_v2.upload.maximum_data_size=81920
+phoenix_v2.upload.wait_for_upload_port=true
+phoenix_v2.upload.erase_cmd=
+phoenix_v2.serial.disableDTR=true
+phoenix_v2.serial.disableRTS=true
+phoenix_v2.build.mcu=esp8266
+phoenix_v2.build.core=esp8266
+phoenix_v2.build.spiffs_pagesize=256
+phoenix_v2.build.debug_port=
+phoenix_v2.build.debug_level=
+phoenix_v2.menu.xtal.80=80 MHz
+phoenix_v2.menu.xtal.80.build.f_cpu=80000000L
+phoenix_v2.menu.xtal.160=160 MHz
+phoenix_v2.menu.xtal.160.build.f_cpu=160000000L
+phoenix_v2.menu.vt.flash=Flash
+phoenix_v2.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+phoenix_v2.menu.vt.heap=Heap
+phoenix_v2.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+phoenix_v2.menu.vt.iram=IRAM
+phoenix_v2.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+phoenix_v2.menu.exception.legacy=Legacy (new can return nullptr)
+phoenix_v2.menu.exception.legacy.build.exception_flags=-fno-exceptions
+phoenix_v2.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+phoenix_v2.menu.exception.disabled=Disabled (new can abort)
+phoenix_v2.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+phoenix_v2.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+phoenix_v2.menu.exception.enabled=Enabled
+phoenix_v2.menu.exception.enabled.build.exception_flags=-fexceptions
+phoenix_v2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+phoenix_v2.menu.ssl.all=All SSL ciphers (most compatible)
+phoenix_v2.menu.ssl.all.build.sslflags=
+phoenix_v2.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+phoenix_v2.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+phoenix_v2.build.flash_mode=dio
+phoenix_v2.build.flash_flags=-DFLASHMODE_DIO
+phoenix_v2.build.flash_freq=40
+phoenix_v2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+phoenix_v2.menu.eesz.4M2M.build.flash_size=4M
+phoenix_v2.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+phoenix_v2.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+phoenix_v2.menu.eesz.4M2M.build.spiffs_pagesize=256
+phoenix_v2.menu.eesz.4M2M.upload.maximum_size=1044464
+phoenix_v2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+phoenix_v2.menu.eesz.4M2M.build.spiffs_start=0x200000
+phoenix_v2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+phoenix_v2.menu.eesz.4M2M.build.spiffs_blocksize=8192
+phoenix_v2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+phoenix_v2.menu.eesz.4M3M.build.flash_size=4M
+phoenix_v2.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+phoenix_v2.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+phoenix_v2.menu.eesz.4M3M.build.spiffs_pagesize=256
+phoenix_v2.menu.eesz.4M3M.upload.maximum_size=1044464
+phoenix_v2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+phoenix_v2.menu.eesz.4M3M.build.spiffs_start=0x100000
+phoenix_v2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+phoenix_v2.menu.eesz.4M3M.build.spiffs_blocksize=8192
+phoenix_v2.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+phoenix_v2.menu.eesz.4M1M.build.flash_size=4M
+phoenix_v2.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+phoenix_v2.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+phoenix_v2.menu.eesz.4M1M.build.spiffs_pagesize=256
+phoenix_v2.menu.eesz.4M1M.upload.maximum_size=1044464
+phoenix_v2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+phoenix_v2.menu.eesz.4M1M.build.spiffs_start=0x300000
+phoenix_v2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+phoenix_v2.menu.eesz.4M1M.build.spiffs_blocksize=8192
+phoenix_v2.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+phoenix_v2.menu.eesz.4M.build.flash_size=4M
+phoenix_v2.menu.eesz.4M.build.flash_size_bytes=0x400000
+phoenix_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+phoenix_v2.menu.eesz.4M.build.spiffs_pagesize=256
+phoenix_v2.menu.eesz.4M.upload.maximum_size=1044464
+phoenix_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
+phoenix_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+phoenix_v2.menu.ResetMethod.ck=no dtr (aka ck)
+phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+phoenix_v2.menu.ip.lm2f=v2 Lower Memory
+phoenix_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+phoenix_v2.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+phoenix_v2.menu.ip.hb2f=v2 Higher Bandwidth
+phoenix_v2.menu.ip.hb2f.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+phoenix_v2.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+phoenix_v2.menu.ip.lm2n=v2 Lower Memory (no features)
+phoenix_v2.menu.ip.lm2n.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+phoenix_v2.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+phoenix_v2.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+phoenix_v2.menu.ip.hb2n.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+phoenix_v2.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+phoenix_v2.menu.ip.lm6f=v2 IPv6 Lower Memory
+phoenix_v2.menu.ip.lm6f.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+phoenix_v2.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+phoenix_v2.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+phoenix_v2.menu.ip.hb6f.build.lwip_include=lwip2/include
+phoenix_v2.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+phoenix_v2.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+phoenix_v2.menu.ip.hb1=v1.4 Higher Bandwidth
+phoenix_v2.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+phoenix_v2.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+phoenix_v2.menu.ip.src=v1.4 Compile from source
+phoenix_v2.menu.ip.src.build.lwip_lib=-llwip_src
+phoenix_v2.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+phoenix_v2.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+phoenix_v2.menu.dbg.Disabled=Disabled
+phoenix_v2.menu.dbg.Disabled.build.debug_port=
+phoenix_v2.menu.dbg.Serial=Serial
+phoenix_v2.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+phoenix_v2.menu.dbg.Serial1=Serial1
+phoenix_v2.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+phoenix_v2.menu.lvl.None____=None
+phoenix_v2.menu.lvl.None____.build.debug_level=
+phoenix_v2.menu.lvl.SSL=SSL
+phoenix_v2.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+phoenix_v2.menu.lvl.TLS_MEM=TLS_MEM
+phoenix_v2.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+phoenix_v2.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+phoenix_v2.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v2.menu.lvl.HTTP_SERVER=HTTP_SERVER
+phoenix_v2.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+phoenix_v2.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+phoenix_v2.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+phoenix_v2.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v2.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+phoenix_v2.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+phoenix_v2.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v2.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+phoenix_v2.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+phoenix_v2.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+phoenix_v2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+phoenix_v2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+phoenix_v2.menu.lvl.CORE=CORE
+phoenix_v2.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+phoenix_v2.menu.lvl.WIFI=WIFI
+phoenix_v2.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+phoenix_v2.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+phoenix_v2.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+phoenix_v2.menu.lvl.UPDATER=UPDATER
+phoenix_v2.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+phoenix_v2.menu.lvl.OTA=OTA
+phoenix_v2.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+phoenix_v2.menu.lvl.OOM=OOM
+phoenix_v2.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+phoenix_v2.menu.lvl.MDNS=MDNS
+phoenix_v2.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+phoenix_v2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+phoenix_v2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+phoenix_v2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+phoenix_v2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+phoenix_v2.menu.wipe.none=Only Sketch
+phoenix_v2.menu.wipe.none.upload.erase_cmd=
+phoenix_v2.menu.wipe.sdk=Sketch + WiFi Settings
+phoenix_v2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+phoenix_v2.menu.wipe.all=All Flash Contents
+phoenix_v2.menu.wipe.all.upload.erase_cmd=erase_flash
+phoenix_v2.menu.baud.115200=115200
+phoenix_v2.menu.baud.115200.upload.speed=115200
+phoenix_v2.menu.baud.57600=57600
+phoenix_v2.menu.baud.57600.upload.speed=57600
+phoenix_v2.menu.baud.230400.linux=230400
+phoenix_v2.menu.baud.230400.macosx=230400
+phoenix_v2.menu.baud.230400.upload.speed=230400
+phoenix_v2.menu.baud.256000.windows=256000
+phoenix_v2.menu.baud.256000.upload.speed=256000
+phoenix_v2.menu.baud.460800.linux=460800
+phoenix_v2.menu.baud.460800.macosx=460800
+phoenix_v2.menu.baud.460800.upload.speed=460800
+phoenix_v2.menu.baud.512000.windows=512000
+phoenix_v2.menu.baud.512000.upload.speed=512000
+phoenix_v2.menu.baud.921600=921600
+phoenix_v2.menu.baud.921600.upload.speed=921600
+phoenix_v2.menu.baud.3000000=3000000
+phoenix_v2.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
+nodemcu.build.board=ESP8266_NODEMCU
+nodemcu.build.variant=nodemcu
+nodemcu.upload.tool=esptool
+nodemcu.upload.maximum_data_size=81920
+nodemcu.upload.wait_for_upload_port=true
+nodemcu.upload.erase_cmd=
+nodemcu.serial.disableDTR=true
+nodemcu.serial.disableRTS=true
+nodemcu.build.mcu=esp8266
+nodemcu.build.core=esp8266
+nodemcu.build.spiffs_pagesize=256
+nodemcu.build.debug_port=
+nodemcu.build.debug_level=
+nodemcu.menu.xtal.80=80 MHz
+nodemcu.menu.xtal.80.build.f_cpu=80000000L
+nodemcu.menu.xtal.160=160 MHz
+nodemcu.menu.xtal.160.build.f_cpu=160000000L
+nodemcu.menu.vt.flash=Flash
+nodemcu.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+nodemcu.menu.vt.heap=Heap
+nodemcu.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+nodemcu.menu.vt.iram=IRAM
+nodemcu.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+nodemcu.menu.exception.legacy=Legacy (new can return nullptr)
+nodemcu.menu.exception.legacy.build.exception_flags=-fno-exceptions
+nodemcu.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+nodemcu.menu.exception.disabled=Disabled (new can abort)
+nodemcu.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+nodemcu.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+nodemcu.menu.exception.enabled=Enabled
+nodemcu.menu.exception.enabled.build.exception_flags=-fexceptions
+nodemcu.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+nodemcu.menu.ssl.all=All SSL ciphers (most compatible)
+nodemcu.menu.ssl.all.build.sslflags=
+nodemcu.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+nodemcu.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+nodemcu.build.flash_mode=qio
+nodemcu.build.flash_flags=-DFLASHMODE_QIO
+nodemcu.build.flash_freq=40
+nodemcu.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+nodemcu.menu.eesz.4M2M.build.flash_size=4M
+nodemcu.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+nodemcu.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+nodemcu.menu.eesz.4M2M.build.spiffs_pagesize=256
+nodemcu.menu.eesz.4M2M.upload.maximum_size=1044464
+nodemcu.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+nodemcu.menu.eesz.4M2M.build.spiffs_start=0x200000
+nodemcu.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+nodemcu.menu.eesz.4M2M.build.spiffs_blocksize=8192
+nodemcu.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+nodemcu.menu.eesz.4M3M.build.flash_size=4M
+nodemcu.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+nodemcu.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+nodemcu.menu.eesz.4M3M.build.spiffs_pagesize=256
+nodemcu.menu.eesz.4M3M.upload.maximum_size=1044464
+nodemcu.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+nodemcu.menu.eesz.4M3M.build.spiffs_start=0x100000
+nodemcu.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+nodemcu.menu.eesz.4M3M.build.spiffs_blocksize=8192
+nodemcu.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+nodemcu.menu.eesz.4M1M.build.flash_size=4M
+nodemcu.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+nodemcu.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcu.menu.eesz.4M1M.build.spiffs_pagesize=256
+nodemcu.menu.eesz.4M1M.upload.maximum_size=1044464
+nodemcu.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+nodemcu.menu.eesz.4M1M.build.spiffs_start=0x300000
+nodemcu.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+nodemcu.menu.eesz.4M1M.build.spiffs_blocksize=8192
+nodemcu.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+nodemcu.menu.eesz.4M.build.flash_size=4M
+nodemcu.menu.eesz.4M.build.flash_size_bytes=0x400000
+nodemcu.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+nodemcu.menu.eesz.4M.build.spiffs_pagesize=256
+nodemcu.menu.eesz.4M.upload.maximum_size=1044464
+nodemcu.menu.eesz.4M.build.rfcal_addr=0x3FC000
+nodemcu.menu.ip.lm2f=v2 Lower Memory
+nodemcu.menu.ip.lm2f.build.lwip_include=lwip2/include
+nodemcu.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+nodemcu.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+nodemcu.menu.ip.hb2f=v2 Higher Bandwidth
+nodemcu.menu.ip.hb2f.build.lwip_include=lwip2/include
+nodemcu.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+nodemcu.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+nodemcu.menu.ip.lm2n=v2 Lower Memory (no features)
+nodemcu.menu.ip.lm2n.build.lwip_include=lwip2/include
+nodemcu.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+nodemcu.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+nodemcu.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+nodemcu.menu.ip.hb2n.build.lwip_include=lwip2/include
+nodemcu.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+nodemcu.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+nodemcu.menu.ip.lm6f=v2 IPv6 Lower Memory
+nodemcu.menu.ip.lm6f.build.lwip_include=lwip2/include
+nodemcu.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+nodemcu.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+nodemcu.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+nodemcu.menu.ip.hb6f.build.lwip_include=lwip2/include
+nodemcu.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+nodemcu.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+nodemcu.menu.ip.hb1=v1.4 Higher Bandwidth
+nodemcu.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+nodemcu.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+nodemcu.menu.ip.src=v1.4 Compile from source
+nodemcu.menu.ip.src.build.lwip_lib=-llwip_src
+nodemcu.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+nodemcu.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+nodemcu.menu.dbg.Disabled=Disabled
+nodemcu.menu.dbg.Disabled.build.debug_port=
+nodemcu.menu.dbg.Serial=Serial
+nodemcu.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+nodemcu.menu.dbg.Serial1=Serial1
+nodemcu.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+nodemcu.menu.lvl.None____=None
+nodemcu.menu.lvl.None____.build.debug_level=
+nodemcu.menu.lvl.SSL=SSL
+nodemcu.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+nodemcu.menu.lvl.TLS_MEM=TLS_MEM
+nodemcu.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+nodemcu.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+nodemcu.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+nodemcu.menu.lvl.HTTP_SERVER=HTTP_SERVER
+nodemcu.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+nodemcu.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+nodemcu.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+nodemcu.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+nodemcu.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+nodemcu.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+nodemcu.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+nodemcu.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+nodemcu.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+nodemcu.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+nodemcu.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+nodemcu.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcu.menu.lvl.CORE=CORE
+nodemcu.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+nodemcu.menu.lvl.WIFI=WIFI
+nodemcu.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+nodemcu.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+nodemcu.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+nodemcu.menu.lvl.UPDATER=UPDATER
+nodemcu.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+nodemcu.menu.lvl.OTA=OTA
+nodemcu.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+nodemcu.menu.lvl.OOM=OOM
+nodemcu.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+nodemcu.menu.lvl.MDNS=MDNS
+nodemcu.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+nodemcu.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+nodemcu.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+nodemcu.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+nodemcu.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+nodemcu.menu.wipe.none=Only Sketch
+nodemcu.menu.wipe.none.upload.erase_cmd=
+nodemcu.menu.wipe.sdk=Sketch + WiFi Settings
+nodemcu.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+nodemcu.menu.wipe.all=All Flash Contents
+nodemcu.menu.wipe.all.upload.erase_cmd=erase_flash
+nodemcu.menu.baud.115200=115200
+nodemcu.menu.baud.115200.upload.speed=115200
+nodemcu.menu.baud.57600=57600
+nodemcu.menu.baud.57600.upload.speed=57600
+nodemcu.menu.baud.230400.linux=230400
+nodemcu.menu.baud.230400.macosx=230400
+nodemcu.menu.baud.230400.upload.speed=230400
+nodemcu.menu.baud.256000.windows=256000
+nodemcu.menu.baud.256000.upload.speed=256000
+nodemcu.menu.baud.460800.linux=460800
+nodemcu.menu.baud.460800.macosx=460800
+nodemcu.menu.baud.460800.upload.speed=460800
+nodemcu.menu.baud.512000.windows=512000
+nodemcu.menu.baud.512000.upload.speed=512000
+nodemcu.menu.baud.921600=921600
+nodemcu.menu.baud.921600.upload.speed=921600
+nodemcu.menu.baud.3000000=3000000
+nodemcu.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
+nodemcuv2.build.board=ESP8266_NODEMCU
+nodemcuv2.build.variant=nodemcu
+nodemcuv2.upload.tool=esptool
+nodemcuv2.upload.maximum_data_size=81920
+nodemcuv2.upload.wait_for_upload_port=true
+nodemcuv2.upload.erase_cmd=
+nodemcuv2.serial.disableDTR=true
+nodemcuv2.serial.disableRTS=true
+nodemcuv2.build.mcu=esp8266
+nodemcuv2.build.core=esp8266
+nodemcuv2.build.spiffs_pagesize=256
+nodemcuv2.build.debug_port=
+nodemcuv2.build.debug_level=
+nodemcuv2.menu.xtal.80=80 MHz
+nodemcuv2.menu.xtal.80.build.f_cpu=80000000L
+nodemcuv2.menu.xtal.160=160 MHz
+nodemcuv2.menu.xtal.160.build.f_cpu=160000000L
+nodemcuv2.menu.vt.flash=Flash
+nodemcuv2.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+nodemcuv2.menu.vt.heap=Heap
+nodemcuv2.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+nodemcuv2.menu.vt.iram=IRAM
+nodemcuv2.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+nodemcuv2.menu.exception.legacy=Legacy (new can return nullptr)
+nodemcuv2.menu.exception.legacy.build.exception_flags=-fno-exceptions
+nodemcuv2.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+nodemcuv2.menu.exception.disabled=Disabled (new can abort)
+nodemcuv2.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+nodemcuv2.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+nodemcuv2.menu.exception.enabled=Enabled
+nodemcuv2.menu.exception.enabled.build.exception_flags=-fexceptions
+nodemcuv2.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+nodemcuv2.menu.ssl.all=All SSL ciphers (most compatible)
+nodemcuv2.menu.ssl.all.build.sslflags=
+nodemcuv2.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+nodemcuv2.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+nodemcuv2.upload.resetmethod=--before default_reset --after hard_reset
+nodemcuv2.build.flash_mode=dio
+nodemcuv2.build.flash_flags=-DFLASHMODE_DIO
+nodemcuv2.build.flash_freq=40
+nodemcuv2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+nodemcuv2.menu.eesz.4M2M.build.flash_size=4M
+nodemcuv2.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+nodemcuv2.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+nodemcuv2.menu.eesz.4M2M.build.spiffs_pagesize=256
+nodemcuv2.menu.eesz.4M2M.upload.maximum_size=1044464
+nodemcuv2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+nodemcuv2.menu.eesz.4M2M.build.spiffs_start=0x200000
+nodemcuv2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+nodemcuv2.menu.eesz.4M2M.build.spiffs_blocksize=8192
+nodemcuv2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+nodemcuv2.menu.eesz.4M3M.build.flash_size=4M
+nodemcuv2.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+nodemcuv2.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+nodemcuv2.menu.eesz.4M3M.build.spiffs_pagesize=256
+nodemcuv2.menu.eesz.4M3M.upload.maximum_size=1044464
+nodemcuv2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+nodemcuv2.menu.eesz.4M3M.build.spiffs_start=0x100000
+nodemcuv2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+nodemcuv2.menu.eesz.4M3M.build.spiffs_blocksize=8192
+nodemcuv2.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+nodemcuv2.menu.eesz.4M1M.build.flash_size=4M
+nodemcuv2.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+nodemcuv2.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcuv2.menu.eesz.4M1M.build.spiffs_pagesize=256
+nodemcuv2.menu.eesz.4M1M.upload.maximum_size=1044464
+nodemcuv2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+nodemcuv2.menu.eesz.4M1M.build.spiffs_start=0x300000
+nodemcuv2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+nodemcuv2.menu.eesz.4M1M.build.spiffs_blocksize=8192
+nodemcuv2.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+nodemcuv2.menu.eesz.4M.build.flash_size=4M
+nodemcuv2.menu.eesz.4M.build.flash_size_bytes=0x400000
+nodemcuv2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+nodemcuv2.menu.eesz.4M.build.spiffs_pagesize=256
+nodemcuv2.menu.eesz.4M.upload.maximum_size=1044464
+nodemcuv2.menu.eesz.4M.build.rfcal_addr=0x3FC000
+nodemcuv2.menu.led.2=2
+nodemcuv2.menu.led.2.build.led=-DLED_BUILTIN=2
+nodemcuv2.menu.led.16=16
+nodemcuv2.menu.led.16.build.led=-DLED_BUILTIN=16
+nodemcuv2.menu.ip.lm2f=v2 Lower Memory
+nodemcuv2.menu.ip.lm2f.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+nodemcuv2.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+nodemcuv2.menu.ip.hb2f=v2 Higher Bandwidth
+nodemcuv2.menu.ip.hb2f.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+nodemcuv2.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+nodemcuv2.menu.ip.lm2n=v2 Lower Memory (no features)
+nodemcuv2.menu.ip.lm2n.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+nodemcuv2.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+nodemcuv2.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+nodemcuv2.menu.ip.hb2n.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+nodemcuv2.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+nodemcuv2.menu.ip.lm6f=v2 IPv6 Lower Memory
+nodemcuv2.menu.ip.lm6f.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+nodemcuv2.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+nodemcuv2.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+nodemcuv2.menu.ip.hb6f.build.lwip_include=lwip2/include
+nodemcuv2.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+nodemcuv2.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+nodemcuv2.menu.ip.hb1=v1.4 Higher Bandwidth
+nodemcuv2.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+nodemcuv2.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+nodemcuv2.menu.ip.src=v1.4 Compile from source
+nodemcuv2.menu.ip.src.build.lwip_lib=-llwip_src
+nodemcuv2.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+nodemcuv2.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+nodemcuv2.menu.dbg.Disabled=Disabled
+nodemcuv2.menu.dbg.Disabled.build.debug_port=
+nodemcuv2.menu.dbg.Serial=Serial
+nodemcuv2.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+nodemcuv2.menu.dbg.Serial1=Serial1
+nodemcuv2.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+nodemcuv2.menu.lvl.None____=None
+nodemcuv2.menu.lvl.None____.build.debug_level=
+nodemcuv2.menu.lvl.SSL=SSL
+nodemcuv2.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+nodemcuv2.menu.lvl.TLS_MEM=TLS_MEM
+nodemcuv2.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+nodemcuv2.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+nodemcuv2.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+nodemcuv2.menu.lvl.HTTP_SERVER=HTTP_SERVER
+nodemcuv2.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+nodemcuv2.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+nodemcuv2.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+nodemcuv2.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+nodemcuv2.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+nodemcuv2.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+nodemcuv2.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+nodemcuv2.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+nodemcuv2.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+nodemcuv2.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+nodemcuv2.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+nodemcuv2.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+nodemcuv2.menu.lvl.CORE=CORE
+nodemcuv2.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+nodemcuv2.menu.lvl.WIFI=WIFI
+nodemcuv2.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+nodemcuv2.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+nodemcuv2.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+nodemcuv2.menu.lvl.UPDATER=UPDATER
+nodemcuv2.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+nodemcuv2.menu.lvl.OTA=OTA
+nodemcuv2.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+nodemcuv2.menu.lvl.OOM=OOM
+nodemcuv2.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+nodemcuv2.menu.lvl.MDNS=MDNS
+nodemcuv2.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+nodemcuv2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+nodemcuv2.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+nodemcuv2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+nodemcuv2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+nodemcuv2.menu.wipe.none=Only Sketch
+nodemcuv2.menu.wipe.none.upload.erase_cmd=
+nodemcuv2.menu.wipe.sdk=Sketch + WiFi Settings
+nodemcuv2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+nodemcuv2.menu.wipe.all=All Flash Contents
+nodemcuv2.menu.wipe.all.upload.erase_cmd=erase_flash
+nodemcuv2.menu.baud.115200=115200
+nodemcuv2.menu.baud.115200.upload.speed=115200
+nodemcuv2.menu.baud.57600=57600
+nodemcuv2.menu.baud.57600.upload.speed=57600
+nodemcuv2.menu.baud.230400.linux=230400
+nodemcuv2.menu.baud.230400.macosx=230400
+nodemcuv2.menu.baud.230400.upload.speed=230400
+nodemcuv2.menu.baud.256000.windows=256000
+nodemcuv2.menu.baud.256000.upload.speed=256000
+nodemcuv2.menu.baud.460800.linux=460800
+nodemcuv2.menu.baud.460800.macosx=460800
+nodemcuv2.menu.baud.460800.upload.speed=460800
+nodemcuv2.menu.baud.512000.windows=512000
+nodemcuv2.menu.baud.512000.upload.speed=512000
+nodemcuv2.menu.baud.921600=921600
+nodemcuv2.menu.baud.921600.upload.speed=921600
+nodemcuv2.menu.baud.3000000=3000000
+nodemcuv2.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
+modwifi.build.board=MOD_WIFI_ESP8266
+modwifi.build.variant=modwifi
+modwifi.upload.tool=esptool
+modwifi.upload.maximum_data_size=81920
+modwifi.upload.wait_for_upload_port=true
+modwifi.upload.erase_cmd=
+modwifi.serial.disableDTR=true
+modwifi.serial.disableRTS=true
+modwifi.build.mcu=esp8266
+modwifi.build.core=esp8266
+modwifi.build.spiffs_pagesize=256
+modwifi.build.debug_port=
+modwifi.build.debug_level=
+modwifi.menu.xtal.80=80 MHz
+modwifi.menu.xtal.80.build.f_cpu=80000000L
+modwifi.menu.xtal.160=160 MHz
+modwifi.menu.xtal.160.build.f_cpu=160000000L
+modwifi.menu.vt.flash=Flash
+modwifi.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+modwifi.menu.vt.heap=Heap
+modwifi.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+modwifi.menu.vt.iram=IRAM
+modwifi.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+modwifi.menu.exception.legacy=Legacy (new can return nullptr)
+modwifi.menu.exception.legacy.build.exception_flags=-fno-exceptions
+modwifi.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+modwifi.menu.exception.disabled=Disabled (new can abort)
+modwifi.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+modwifi.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+modwifi.menu.exception.enabled=Enabled
+modwifi.menu.exception.enabled.build.exception_flags=-fexceptions
+modwifi.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+modwifi.menu.ssl.all=All SSL ciphers (most compatible)
+modwifi.menu.ssl.all.build.sslflags=
+modwifi.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+modwifi.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+modwifi.upload.resetmethod=--before no_reset --after soft_reset
+modwifi.build.flash_mode=qio
+modwifi.build.flash_flags=-DFLASHMODE_QIO
+modwifi.build.flash_freq=40
+modwifi.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+modwifi.menu.eesz.2M64.build.flash_size=2M
+modwifi.menu.eesz.2M64.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+modwifi.menu.eesz.2M64.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M64.upload.maximum_size=1044464
+modwifi.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+modwifi.menu.eesz.2M64.build.spiffs_start=0x1F0000
+modwifi.menu.eesz.2M64.build.spiffs_end=0x1FB000
+modwifi.menu.eesz.2M64.build.spiffs_blocksize=4096
+modwifi.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+modwifi.menu.eesz.2M128.build.flash_size=2M
+modwifi.menu.eesz.2M128.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+modwifi.menu.eesz.2M128.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M128.upload.maximum_size=1044464
+modwifi.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+modwifi.menu.eesz.2M128.build.spiffs_start=0x1E0000
+modwifi.menu.eesz.2M128.build.spiffs_end=0x1FB000
+modwifi.menu.eesz.2M128.build.spiffs_blocksize=4096
+modwifi.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+modwifi.menu.eesz.2M256.build.flash_size=2M
+modwifi.menu.eesz.2M256.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+modwifi.menu.eesz.2M256.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M256.upload.maximum_size=1044464
+modwifi.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+modwifi.menu.eesz.2M256.build.spiffs_start=0x1C0000
+modwifi.menu.eesz.2M256.build.spiffs_end=0x1FB000
+modwifi.menu.eesz.2M256.build.spiffs_blocksize=4096
+modwifi.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+modwifi.menu.eesz.2M512.build.flash_size=2M
+modwifi.menu.eesz.2M512.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+modwifi.menu.eesz.2M512.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M512.upload.maximum_size=1044464
+modwifi.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+modwifi.menu.eesz.2M512.build.spiffs_start=0x180000
+modwifi.menu.eesz.2M512.build.spiffs_end=0x1FA000
+modwifi.menu.eesz.2M512.build.spiffs_blocksize=8192
+modwifi.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+modwifi.menu.eesz.2M1M.build.flash_size=2M
+modwifi.menu.eesz.2M1M.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+modwifi.menu.eesz.2M1M.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M1M.upload.maximum_size=1044464
+modwifi.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+modwifi.menu.eesz.2M1M.build.spiffs_start=0x100000
+modwifi.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+modwifi.menu.eesz.2M1M.build.spiffs_blocksize=8192
+modwifi.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+modwifi.menu.eesz.2M.build.flash_size=2M
+modwifi.menu.eesz.2M.build.flash_size_bytes=0x200000
+modwifi.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+modwifi.menu.eesz.2M.build.spiffs_pagesize=256
+modwifi.menu.eesz.2M.upload.maximum_size=1044464
+modwifi.menu.eesz.2M.build.rfcal_addr=0x1FC000
+modwifi.menu.ip.lm2f=v2 Lower Memory
+modwifi.menu.ip.lm2f.build.lwip_include=lwip2/include
+modwifi.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+modwifi.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+modwifi.menu.ip.hb2f=v2 Higher Bandwidth
+modwifi.menu.ip.hb2f.build.lwip_include=lwip2/include
+modwifi.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+modwifi.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+modwifi.menu.ip.lm2n=v2 Lower Memory (no features)
+modwifi.menu.ip.lm2n.build.lwip_include=lwip2/include
+modwifi.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+modwifi.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+modwifi.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+modwifi.menu.ip.hb2n.build.lwip_include=lwip2/include
+modwifi.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+modwifi.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+modwifi.menu.ip.lm6f=v2 IPv6 Lower Memory
+modwifi.menu.ip.lm6f.build.lwip_include=lwip2/include
+modwifi.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+modwifi.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+modwifi.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+modwifi.menu.ip.hb6f.build.lwip_include=lwip2/include
+modwifi.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+modwifi.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+modwifi.menu.ip.hb1=v1.4 Higher Bandwidth
+modwifi.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+modwifi.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+modwifi.menu.ip.src=v1.4 Compile from source
+modwifi.menu.ip.src.build.lwip_lib=-llwip_src
+modwifi.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+modwifi.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+modwifi.menu.dbg.Disabled=Disabled
+modwifi.menu.dbg.Disabled.build.debug_port=
+modwifi.menu.dbg.Serial=Serial
+modwifi.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+modwifi.menu.dbg.Serial1=Serial1
+modwifi.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+modwifi.menu.lvl.None____=None
+modwifi.menu.lvl.None____.build.debug_level=
+modwifi.menu.lvl.SSL=SSL
+modwifi.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+modwifi.menu.lvl.TLS_MEM=TLS_MEM
+modwifi.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+modwifi.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+modwifi.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+modwifi.menu.lvl.HTTP_SERVER=HTTP_SERVER
+modwifi.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+modwifi.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+modwifi.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+modwifi.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+modwifi.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+modwifi.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+modwifi.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+modwifi.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+modwifi.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+modwifi.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+modwifi.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+modwifi.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+modwifi.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+modwifi.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+modwifi.menu.lvl.CORE=CORE
+modwifi.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+modwifi.menu.lvl.WIFI=WIFI
+modwifi.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+modwifi.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+modwifi.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+modwifi.menu.lvl.UPDATER=UPDATER
+modwifi.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+modwifi.menu.lvl.OTA=OTA
+modwifi.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+modwifi.menu.lvl.OOM=OOM
+modwifi.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+modwifi.menu.lvl.MDNS=MDNS
+modwifi.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+modwifi.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+modwifi.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+modwifi.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+modwifi.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+modwifi.menu.wipe.none=Only Sketch
+modwifi.menu.wipe.none.upload.erase_cmd=
+modwifi.menu.wipe.sdk=Sketch + WiFi Settings
+modwifi.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+modwifi.menu.wipe.all=All Flash Contents
+modwifi.menu.wipe.all.upload.erase_cmd=erase_flash
+modwifi.menu.baud.115200=115200
+modwifi.menu.baud.115200.upload.speed=115200
+modwifi.menu.baud.57600=57600
+modwifi.menu.baud.57600.upload.speed=57600
+modwifi.menu.baud.230400.linux=230400
+modwifi.menu.baud.230400.macosx=230400
+modwifi.menu.baud.230400.upload.speed=230400
+modwifi.menu.baud.256000.windows=256000
+modwifi.menu.baud.256000.upload.speed=256000
+modwifi.menu.baud.460800.linux=460800
+modwifi.menu.baud.460800.macosx=460800
+modwifi.menu.baud.460800.upload.speed=460800
+modwifi.menu.baud.512000.windows=512000
+modwifi.menu.baud.512000.upload.speed=512000
+modwifi.menu.baud.921600=921600
+modwifi.menu.baud.921600.upload.speed=921600
+modwifi.menu.baud.3000000=3000000
+modwifi.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+thing.name=SparkFun ESP8266 Thing
+thing.build.board=ESP8266_THING
+thing.build.variant=thing
+thing.upload.tool=esptool
+thing.upload.maximum_data_size=81920
+thing.upload.wait_for_upload_port=true
+thing.upload.erase_cmd=
+thing.serial.disableDTR=true
+thing.serial.disableRTS=true
+thing.build.mcu=esp8266
+thing.build.core=esp8266
+thing.build.spiffs_pagesize=256
+thing.build.debug_port=
+thing.build.debug_level=
+thing.menu.xtal.80=80 MHz
+thing.menu.xtal.80.build.f_cpu=80000000L
+thing.menu.xtal.160=160 MHz
+thing.menu.xtal.160.build.f_cpu=160000000L
+thing.menu.vt.flash=Flash
+thing.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+thing.menu.vt.heap=Heap
+thing.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+thing.menu.vt.iram=IRAM
+thing.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+thing.menu.exception.legacy=Legacy (new can return nullptr)
+thing.menu.exception.legacy.build.exception_flags=-fno-exceptions
+thing.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+thing.menu.exception.disabled=Disabled (new can abort)
+thing.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+thing.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+thing.menu.exception.enabled=Enabled
+thing.menu.exception.enabled.build.exception_flags=-fexceptions
+thing.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+thing.menu.ssl.all=All SSL ciphers (most compatible)
+thing.menu.ssl.all.build.sslflags=
+thing.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+thing.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+thing.upload.resetmethod=--before no_reset --after soft_reset
+thing.build.flash_mode=qio
+thing.build.flash_flags=-DFLASHMODE_QIO
+thing.build.flash_freq=40
+thing.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
+thing.menu.eesz.512K32.build.flash_size=512K
+thing.menu.eesz.512K32.build.flash_size_bytes=0x80000
+thing.menu.eesz.512K32.build.flash_ld=eagle.flash.512k32.ld
+thing.menu.eesz.512K32.build.spiffs_pagesize=256
+thing.menu.eesz.512K32.upload.maximum_size=466928
+thing.menu.eesz.512K32.build.rfcal_addr=0x7C000
+thing.menu.eesz.512K32.build.spiffs_start=0x73000
+thing.menu.eesz.512K32.build.spiffs_end=0x7B000
+thing.menu.eesz.512K32.build.spiffs_blocksize=4096
+thing.menu.eesz.512K64=512KB (FS:64KB OTA:~214KB)
+thing.menu.eesz.512K64.build.flash_size=512K
+thing.menu.eesz.512K64.build.flash_size_bytes=0x80000
+thing.menu.eesz.512K64.build.flash_ld=eagle.flash.512k64.ld
+thing.menu.eesz.512K64.build.spiffs_pagesize=256
+thing.menu.eesz.512K64.upload.maximum_size=434160
+thing.menu.eesz.512K64.build.rfcal_addr=0x7C000
+thing.menu.eesz.512K64.build.spiffs_start=0x6B000
+thing.menu.eesz.512K64.build.spiffs_end=0x7B000
+thing.menu.eesz.512K64.build.spiffs_blocksize=4096
+thing.menu.eesz.512K128=512KB (FS:128KB OTA:~182KB)
+thing.menu.eesz.512K128.build.flash_size=512K
+thing.menu.eesz.512K128.build.flash_size_bytes=0x80000
+thing.menu.eesz.512K128.build.flash_ld=eagle.flash.512k128.ld
+thing.menu.eesz.512K128.build.spiffs_pagesize=256
+thing.menu.eesz.512K128.upload.maximum_size=368624
+thing.menu.eesz.512K128.build.rfcal_addr=0x7C000
+thing.menu.eesz.512K128.build.spiffs_start=0x5B000
+thing.menu.eesz.512K128.build.spiffs_end=0x7B000
+thing.menu.eesz.512K128.build.spiffs_blocksize=4096
+thing.menu.eesz.512K=512KB (FS:none OTA:~246KB)
+thing.menu.eesz.512K.build.flash_size=512K
+thing.menu.eesz.512K.build.flash_size_bytes=0x80000
+thing.menu.eesz.512K.build.flash_ld=eagle.flash.512k.ld
+thing.menu.eesz.512K.build.spiffs_pagesize=256
+thing.menu.eesz.512K.upload.maximum_size=499696
+thing.menu.eesz.512K.build.rfcal_addr=0x7C000
+thing.menu.ip.lm2f=v2 Lower Memory
+thing.menu.ip.lm2f.build.lwip_include=lwip2/include
+thing.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+thing.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+thing.menu.ip.hb2f=v2 Higher Bandwidth
+thing.menu.ip.hb2f.build.lwip_include=lwip2/include
+thing.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+thing.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+thing.menu.ip.lm2n=v2 Lower Memory (no features)
+thing.menu.ip.lm2n.build.lwip_include=lwip2/include
+thing.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+thing.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+thing.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+thing.menu.ip.hb2n.build.lwip_include=lwip2/include
+thing.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+thing.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+thing.menu.ip.lm6f=v2 IPv6 Lower Memory
+thing.menu.ip.lm6f.build.lwip_include=lwip2/include
+thing.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+thing.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+thing.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+thing.menu.ip.hb6f.build.lwip_include=lwip2/include
+thing.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+thing.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+thing.menu.ip.hb1=v1.4 Higher Bandwidth
+thing.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+thing.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+thing.menu.ip.src=v1.4 Compile from source
+thing.menu.ip.src.build.lwip_lib=-llwip_src
+thing.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+thing.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+thing.menu.dbg.Disabled=Disabled
+thing.menu.dbg.Disabled.build.debug_port=
+thing.menu.dbg.Serial=Serial
+thing.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+thing.menu.dbg.Serial1=Serial1
+thing.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+thing.menu.lvl.None____=None
+thing.menu.lvl.None____.build.debug_level=
+thing.menu.lvl.SSL=SSL
+thing.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+thing.menu.lvl.TLS_MEM=TLS_MEM
+thing.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+thing.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+thing.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+thing.menu.lvl.HTTP_SERVER=HTTP_SERVER
+thing.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+thing.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+thing.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+thing.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+thing.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+thing.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+thing.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+thing.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+thing.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+thing.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+thing.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+thing.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+thing.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+thing.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thing.menu.lvl.CORE=CORE
+thing.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+thing.menu.lvl.WIFI=WIFI
+thing.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+thing.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+thing.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+thing.menu.lvl.UPDATER=UPDATER
+thing.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+thing.menu.lvl.OTA=OTA
+thing.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+thing.menu.lvl.OOM=OOM
+thing.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+thing.menu.lvl.MDNS=MDNS
+thing.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+thing.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+thing.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+thing.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+thing.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+thing.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+thing.menu.wipe.none=Only Sketch
+thing.menu.wipe.none.upload.erase_cmd=
+thing.menu.wipe.sdk=Sketch + WiFi Settings
+thing.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+thing.menu.wipe.all=All Flash Contents
+thing.menu.wipe.all.upload.erase_cmd=erase_flash
+thing.menu.baud.115200=115200
+thing.menu.baud.115200.upload.speed=115200
+thing.menu.baud.57600=57600
+thing.menu.baud.57600.upload.speed=57600
+thing.menu.baud.230400.linux=230400
+thing.menu.baud.230400.macosx=230400
+thing.menu.baud.230400.upload.speed=230400
+thing.menu.baud.256000.windows=256000
+thing.menu.baud.256000.upload.speed=256000
+thing.menu.baud.460800.linux=460800
+thing.menu.baud.460800.macosx=460800
+thing.menu.baud.460800.upload.speed=460800
+thing.menu.baud.512000.windows=512000
+thing.menu.baud.512000.upload.speed=512000
+thing.menu.baud.921600=921600
+thing.menu.baud.921600.upload.speed=921600
+thing.menu.baud.3000000=3000000
+thing.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+thingdev.name=SparkFun ESP8266 Thing Dev
+thingdev.build.board=ESP8266_THING_DEV
+thingdev.build.variant=thing
+thingdev.upload.tool=esptool
+thingdev.upload.maximum_data_size=81920
+thingdev.upload.wait_for_upload_port=true
+thingdev.upload.erase_cmd=
+thingdev.serial.disableDTR=true
+thingdev.serial.disableRTS=true
+thingdev.build.mcu=esp8266
+thingdev.build.core=esp8266
+thingdev.build.spiffs_pagesize=256
+thingdev.build.debug_port=
+thingdev.build.debug_level=
+thingdev.menu.xtal.80=80 MHz
+thingdev.menu.xtal.80.build.f_cpu=80000000L
+thingdev.menu.xtal.160=160 MHz
+thingdev.menu.xtal.160.build.f_cpu=160000000L
+thingdev.menu.vt.flash=Flash
+thingdev.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+thingdev.menu.vt.heap=Heap
+thingdev.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+thingdev.menu.vt.iram=IRAM
+thingdev.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+thingdev.menu.exception.legacy=Legacy (new can return nullptr)
+thingdev.menu.exception.legacy.build.exception_flags=-fno-exceptions
+thingdev.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+thingdev.menu.exception.disabled=Disabled (new can abort)
+thingdev.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+thingdev.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+thingdev.menu.exception.enabled=Enabled
+thingdev.menu.exception.enabled.build.exception_flags=-fexceptions
+thingdev.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+thingdev.menu.ssl.all=All SSL ciphers (most compatible)
+thingdev.menu.ssl.all.build.sslflags=
+thingdev.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+thingdev.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+thingdev.upload.resetmethod=--before default_reset --after hard_reset
+thingdev.build.flash_mode=dio
+thingdev.build.flash_flags=-DFLASHMODE_DIO
+thingdev.build.flash_freq=40
+thingdev.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
+thingdev.menu.eesz.512K32.build.flash_size=512K
+thingdev.menu.eesz.512K32.build.flash_size_bytes=0x80000
+thingdev.menu.eesz.512K32.build.flash_ld=eagle.flash.512k32.ld
+thingdev.menu.eesz.512K32.build.spiffs_pagesize=256
+thingdev.menu.eesz.512K32.upload.maximum_size=466928
+thingdev.menu.eesz.512K32.build.rfcal_addr=0x7C000
+thingdev.menu.eesz.512K32.build.spiffs_start=0x73000
+thingdev.menu.eesz.512K32.build.spiffs_end=0x7B000
+thingdev.menu.eesz.512K32.build.spiffs_blocksize=4096
+thingdev.menu.eesz.512K64=512KB (FS:64KB OTA:~214KB)
+thingdev.menu.eesz.512K64.build.flash_size=512K
+thingdev.menu.eesz.512K64.build.flash_size_bytes=0x80000
+thingdev.menu.eesz.512K64.build.flash_ld=eagle.flash.512k64.ld
+thingdev.menu.eesz.512K64.build.spiffs_pagesize=256
+thingdev.menu.eesz.512K64.upload.maximum_size=434160
+thingdev.menu.eesz.512K64.build.rfcal_addr=0x7C000
+thingdev.menu.eesz.512K64.build.spiffs_start=0x6B000
+thingdev.menu.eesz.512K64.build.spiffs_end=0x7B000
+thingdev.menu.eesz.512K64.build.spiffs_blocksize=4096
+thingdev.menu.eesz.512K128=512KB (FS:128KB OTA:~182KB)
+thingdev.menu.eesz.512K128.build.flash_size=512K
+thingdev.menu.eesz.512K128.build.flash_size_bytes=0x80000
+thingdev.menu.eesz.512K128.build.flash_ld=eagle.flash.512k128.ld
+thingdev.menu.eesz.512K128.build.spiffs_pagesize=256
+thingdev.menu.eesz.512K128.upload.maximum_size=368624
+thingdev.menu.eesz.512K128.build.rfcal_addr=0x7C000
+thingdev.menu.eesz.512K128.build.spiffs_start=0x5B000
+thingdev.menu.eesz.512K128.build.spiffs_end=0x7B000
+thingdev.menu.eesz.512K128.build.spiffs_blocksize=4096
+thingdev.menu.eesz.512K=512KB (FS:none OTA:~246KB)
+thingdev.menu.eesz.512K.build.flash_size=512K
+thingdev.menu.eesz.512K.build.flash_size_bytes=0x80000
+thingdev.menu.eesz.512K.build.flash_ld=eagle.flash.512k.ld
+thingdev.menu.eesz.512K.build.spiffs_pagesize=256
+thingdev.menu.eesz.512K.upload.maximum_size=499696
+thingdev.menu.eesz.512K.build.rfcal_addr=0x7C000
+thingdev.menu.ip.lm2f=v2 Lower Memory
+thingdev.menu.ip.lm2f.build.lwip_include=lwip2/include
+thingdev.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+thingdev.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+thingdev.menu.ip.hb2f=v2 Higher Bandwidth
+thingdev.menu.ip.hb2f.build.lwip_include=lwip2/include
+thingdev.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+thingdev.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+thingdev.menu.ip.lm2n=v2 Lower Memory (no features)
+thingdev.menu.ip.lm2n.build.lwip_include=lwip2/include
+thingdev.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+thingdev.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+thingdev.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+thingdev.menu.ip.hb2n.build.lwip_include=lwip2/include
+thingdev.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+thingdev.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+thingdev.menu.ip.lm6f=v2 IPv6 Lower Memory
+thingdev.menu.ip.lm6f.build.lwip_include=lwip2/include
+thingdev.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+thingdev.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+thingdev.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+thingdev.menu.ip.hb6f.build.lwip_include=lwip2/include
+thingdev.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+thingdev.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+thingdev.menu.ip.hb1=v1.4 Higher Bandwidth
+thingdev.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+thingdev.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+thingdev.menu.ip.src=v1.4 Compile from source
+thingdev.menu.ip.src.build.lwip_lib=-llwip_src
+thingdev.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+thingdev.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+thingdev.menu.dbg.Disabled=Disabled
+thingdev.menu.dbg.Disabled.build.debug_port=
+thingdev.menu.dbg.Serial=Serial
+thingdev.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+thingdev.menu.dbg.Serial1=Serial1
+thingdev.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+thingdev.menu.lvl.None____=None
+thingdev.menu.lvl.None____.build.debug_level=
+thingdev.menu.lvl.SSL=SSL
+thingdev.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+thingdev.menu.lvl.TLS_MEM=TLS_MEM
+thingdev.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+thingdev.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+thingdev.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+thingdev.menu.lvl.HTTP_SERVER=HTTP_SERVER
+thingdev.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+thingdev.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+thingdev.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+thingdev.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+thingdev.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+thingdev.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+thingdev.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+thingdev.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+thingdev.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+thingdev.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+thingdev.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+thingdev.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+thingdev.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+thingdev.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+thingdev.menu.lvl.CORE=CORE
+thingdev.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+thingdev.menu.lvl.WIFI=WIFI
+thingdev.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+thingdev.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+thingdev.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+thingdev.menu.lvl.UPDATER=UPDATER
+thingdev.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+thingdev.menu.lvl.OTA=OTA
+thingdev.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+thingdev.menu.lvl.OOM=OOM
+thingdev.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+thingdev.menu.lvl.MDNS=MDNS
+thingdev.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+thingdev.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+thingdev.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+thingdev.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+thingdev.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+thingdev.menu.wipe.none=Only Sketch
+thingdev.menu.wipe.none.upload.erase_cmd=
+thingdev.menu.wipe.sdk=Sketch + WiFi Settings
+thingdev.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+thingdev.menu.wipe.all=All Flash Contents
+thingdev.menu.wipe.all.upload.erase_cmd=erase_flash
+thingdev.menu.baud.115200=115200
+thingdev.menu.baud.115200.upload.speed=115200
+thingdev.menu.baud.57600=57600
+thingdev.menu.baud.57600.upload.speed=57600
+thingdev.menu.baud.230400.linux=230400
+thingdev.menu.baud.230400.macosx=230400
+thingdev.menu.baud.230400.upload.speed=230400
+thingdev.menu.baud.256000.windows=256000
+thingdev.menu.baud.256000.upload.speed=256000
+thingdev.menu.baud.460800.linux=460800
+thingdev.menu.baud.460800.macosx=460800
+thingdev.menu.baud.460800.upload.speed=460800
+thingdev.menu.baud.512000.windows=512000
+thingdev.menu.baud.512000.upload.speed=512000
+thingdev.menu.baud.921600=921600
+thingdev.menu.baud.921600.upload.speed=921600
+thingdev.menu.baud.3000000=3000000
+thingdev.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+blynk.name=SparkFun Blynk Board
+blynk.build.board=ESP8266_THING
+blynk.build.variant=thing
+blynk.upload.tool=esptool
+blynk.upload.maximum_data_size=81920
+blynk.upload.wait_for_upload_port=true
+blynk.upload.erase_cmd=
+blynk.serial.disableDTR=true
+blynk.serial.disableRTS=true
+blynk.build.mcu=esp8266
+blynk.build.core=esp8266
+blynk.build.spiffs_pagesize=256
+blynk.build.debug_port=
+blynk.build.debug_level=
+blynk.menu.xtal.80=80 MHz
+blynk.menu.xtal.80.build.f_cpu=80000000L
+blynk.menu.xtal.160=160 MHz
+blynk.menu.xtal.160.build.f_cpu=160000000L
+blynk.menu.vt.flash=Flash
+blynk.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+blynk.menu.vt.heap=Heap
+blynk.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+blynk.menu.vt.iram=IRAM
+blynk.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+blynk.menu.exception.legacy=Legacy (new can return nullptr)
+blynk.menu.exception.legacy.build.exception_flags=-fno-exceptions
+blynk.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+blynk.menu.exception.disabled=Disabled (new can abort)
+blynk.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+blynk.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+blynk.menu.exception.enabled=Enabled
+blynk.menu.exception.enabled.build.exception_flags=-fexceptions
+blynk.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+blynk.menu.ssl.all=All SSL ciphers (most compatible)
+blynk.menu.ssl.all.build.sslflags=
+blynk.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+blynk.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+blynk.upload.resetmethod=--before default_reset --after hard_reset
+blynk.build.flash_mode=qio
+blynk.build.flash_flags=-DFLASHMODE_QIO
+blynk.build.flash_freq=40
+blynk.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+blynk.menu.eesz.4M2M.build.flash_size=4M
+blynk.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+blynk.menu.eesz.4M2M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M2M.upload.maximum_size=1044464
+blynk.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M2M.build.spiffs_start=0x200000
+blynk.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M2M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+blynk.menu.eesz.4M3M.build.flash_size=4M
+blynk.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+blynk.menu.eesz.4M3M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M3M.upload.maximum_size=1044464
+blynk.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M3M.build.spiffs_start=0x100000
+blynk.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M3M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+blynk.menu.eesz.4M1M.build.flash_size=4M
+blynk.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+blynk.menu.eesz.4M1M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M1M.upload.maximum_size=1044464
+blynk.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M1M.build.spiffs_start=0x300000
+blynk.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M1M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+blynk.menu.eesz.4M.build.flash_size=4M
+blynk.menu.eesz.4M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+blynk.menu.eesz.4M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M.upload.maximum_size=1044464
+blynk.menu.eesz.4M.build.rfcal_addr=0x3FC000
+blynk.menu.ip.lm2f=v2 Lower Memory
+blynk.menu.ip.lm2f.build.lwip_include=lwip2/include
+blynk.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+blynk.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+blynk.menu.ip.hb2f=v2 Higher Bandwidth
+blynk.menu.ip.hb2f.build.lwip_include=lwip2/include
+blynk.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+blynk.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+blynk.menu.ip.lm2n=v2 Lower Memory (no features)
+blynk.menu.ip.lm2n.build.lwip_include=lwip2/include
+blynk.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+blynk.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+blynk.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+blynk.menu.ip.hb2n.build.lwip_include=lwip2/include
+blynk.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+blynk.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+blynk.menu.ip.lm6f=v2 IPv6 Lower Memory
+blynk.menu.ip.lm6f.build.lwip_include=lwip2/include
+blynk.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+blynk.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+blynk.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+blynk.menu.ip.hb6f.build.lwip_include=lwip2/include
+blynk.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+blynk.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+blynk.menu.ip.hb1=v1.4 Higher Bandwidth
+blynk.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+blynk.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+blynk.menu.ip.src=v1.4 Compile from source
+blynk.menu.ip.src.build.lwip_lib=-llwip_src
+blynk.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+blynk.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+blynk.menu.dbg.Disabled=Disabled
+blynk.menu.dbg.Disabled.build.debug_port=
+blynk.menu.dbg.Serial=Serial
+blynk.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+blynk.menu.dbg.Serial1=Serial1
+blynk.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+blynk.menu.lvl.None____=None
+blynk.menu.lvl.None____.build.debug_level=
+blynk.menu.lvl.SSL=SSL
+blynk.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+blynk.menu.lvl.TLS_MEM=TLS_MEM
+blynk.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+blynk.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+blynk.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.HTTP_SERVER=HTTP_SERVER
+blynk.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+blynk.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+blynk.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+blynk.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+blynk.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.CORE=CORE
+blynk.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+blynk.menu.lvl.WIFI=WIFI
+blynk.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+blynk.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+blynk.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+blynk.menu.lvl.UPDATER=UPDATER
+blynk.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+blynk.menu.lvl.OTA=OTA
+blynk.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+blynk.menu.lvl.OOM=OOM
+blynk.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+blynk.menu.lvl.MDNS=MDNS
+blynk.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+blynk.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+blynk.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+blynk.menu.wipe.none=Only Sketch
+blynk.menu.wipe.none.upload.erase_cmd=
+blynk.menu.wipe.sdk=Sketch + WiFi Settings
+blynk.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+blynk.menu.wipe.all=All Flash Contents
+blynk.menu.wipe.all.upload.erase_cmd=erase_flash
+blynk.menu.baud.115200=115200
+blynk.menu.baud.115200.upload.speed=115200
+blynk.menu.baud.57600=57600
+blynk.menu.baud.57600.upload.speed=57600
+blynk.menu.baud.230400.linux=230400
+blynk.menu.baud.230400.macosx=230400
+blynk.menu.baud.230400.upload.speed=230400
+blynk.menu.baud.256000.windows=256000
+blynk.menu.baud.256000.upload.speed=256000
+blynk.menu.baud.460800.linux=460800
+blynk.menu.baud.460800.macosx=460800
+blynk.menu.baud.460800.upload.speed=460800
+blynk.menu.baud.512000.windows=512000
+blynk.menu.baud.512000.upload.speed=512000
+blynk.menu.baud.921600=921600
+blynk.menu.baud.921600.upload.speed=921600
+blynk.menu.baud.3000000=3000000
+blynk.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+esp210.name=SweetPea ESP-210
+esp210.build.board=ESP8266_ESP210
+esp210.upload.tool=esptool
+esp210.upload.maximum_data_size=81920
+esp210.upload.wait_for_upload_port=true
+esp210.upload.erase_cmd=
+esp210.serial.disableDTR=true
+esp210.serial.disableRTS=true
+esp210.build.mcu=esp8266
+esp210.build.core=esp8266
+esp210.build.variant=generic
+esp210.build.spiffs_pagesize=256
+esp210.build.debug_port=
+esp210.build.debug_level=
+esp210.menu.xtal.80=80 MHz
+esp210.menu.xtal.80.build.f_cpu=80000000L
+esp210.menu.xtal.160=160 MHz
+esp210.menu.xtal.160.build.f_cpu=160000000L
+esp210.menu.vt.flash=Flash
+esp210.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+esp210.menu.vt.heap=Heap
+esp210.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+esp210.menu.vt.iram=IRAM
+esp210.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+esp210.menu.exception.legacy=Legacy (new can return nullptr)
+esp210.menu.exception.legacy.build.exception_flags=-fno-exceptions
+esp210.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+esp210.menu.exception.disabled=Disabled (new can abort)
+esp210.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+esp210.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+esp210.menu.exception.enabled=Enabled
+esp210.menu.exception.enabled.build.exception_flags=-fexceptions
+esp210.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+esp210.menu.ssl.all=All SSL ciphers (most compatible)
+esp210.menu.ssl.all.build.sslflags=
+esp210.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+esp210.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+esp210.upload.resetmethod=--before no_reset --after soft_reset
+esp210.build.flash_mode=qio
+esp210.build.flash_flags=-DFLASHMODE_QIO
+esp210.build.flash_freq=40
+esp210.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+esp210.menu.eesz.4M2M.build.flash_size=4M
+esp210.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+esp210.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+esp210.menu.eesz.4M2M.build.spiffs_pagesize=256
+esp210.menu.eesz.4M2M.upload.maximum_size=1044464
+esp210.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+esp210.menu.eesz.4M2M.build.spiffs_start=0x200000
+esp210.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+esp210.menu.eesz.4M2M.build.spiffs_blocksize=8192
+esp210.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+esp210.menu.eesz.4M3M.build.flash_size=4M
+esp210.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+esp210.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+esp210.menu.eesz.4M3M.build.spiffs_pagesize=256
+esp210.menu.eesz.4M3M.upload.maximum_size=1044464
+esp210.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+esp210.menu.eesz.4M3M.build.spiffs_start=0x100000
+esp210.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+esp210.menu.eesz.4M3M.build.spiffs_blocksize=8192
+esp210.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+esp210.menu.eesz.4M1M.build.flash_size=4M
+esp210.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+esp210.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+esp210.menu.eesz.4M1M.build.spiffs_pagesize=256
+esp210.menu.eesz.4M1M.upload.maximum_size=1044464
+esp210.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+esp210.menu.eesz.4M1M.build.spiffs_start=0x300000
+esp210.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+esp210.menu.eesz.4M1M.build.spiffs_blocksize=8192
+esp210.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+esp210.menu.eesz.4M.build.flash_size=4M
+esp210.menu.eesz.4M.build.flash_size_bytes=0x400000
+esp210.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+esp210.menu.eesz.4M.build.spiffs_pagesize=256
+esp210.menu.eesz.4M.upload.maximum_size=1044464
+esp210.menu.eesz.4M.build.rfcal_addr=0x3FC000
+esp210.menu.ip.lm2f=v2 Lower Memory
+esp210.menu.ip.lm2f.build.lwip_include=lwip2/include
+esp210.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+esp210.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+esp210.menu.ip.hb2f=v2 Higher Bandwidth
+esp210.menu.ip.hb2f.build.lwip_include=lwip2/include
+esp210.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+esp210.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+esp210.menu.ip.lm2n=v2 Lower Memory (no features)
+esp210.menu.ip.lm2n.build.lwip_include=lwip2/include
+esp210.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+esp210.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+esp210.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+esp210.menu.ip.hb2n.build.lwip_include=lwip2/include
+esp210.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+esp210.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+esp210.menu.ip.lm6f=v2 IPv6 Lower Memory
+esp210.menu.ip.lm6f.build.lwip_include=lwip2/include
+esp210.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+esp210.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+esp210.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+esp210.menu.ip.hb6f.build.lwip_include=lwip2/include
+esp210.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+esp210.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+esp210.menu.ip.hb1=v1.4 Higher Bandwidth
+esp210.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+esp210.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+esp210.menu.ip.src=v1.4 Compile from source
+esp210.menu.ip.src.build.lwip_lib=-llwip_src
+esp210.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+esp210.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+esp210.menu.dbg.Disabled=Disabled
+esp210.menu.dbg.Disabled.build.debug_port=
+esp210.menu.dbg.Serial=Serial
+esp210.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+esp210.menu.dbg.Serial1=Serial1
+esp210.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+esp210.menu.lvl.None____=None
+esp210.menu.lvl.None____.build.debug_level=
+esp210.menu.lvl.SSL=SSL
+esp210.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+esp210.menu.lvl.TLS_MEM=TLS_MEM
+esp210.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+esp210.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+esp210.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+esp210.menu.lvl.HTTP_SERVER=HTTP_SERVER
+esp210.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+esp210.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+esp210.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+esp210.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+esp210.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+esp210.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+esp210.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+esp210.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+esp210.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+esp210.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+esp210.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+esp210.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+esp210.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+esp210.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+esp210.menu.lvl.CORE=CORE
+esp210.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+esp210.menu.lvl.WIFI=WIFI
+esp210.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+esp210.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+esp210.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+esp210.menu.lvl.UPDATER=UPDATER
+esp210.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+esp210.menu.lvl.OTA=OTA
+esp210.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+esp210.menu.lvl.OOM=OOM
+esp210.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+esp210.menu.lvl.MDNS=MDNS
+esp210.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+esp210.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+esp210.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+esp210.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+esp210.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+esp210.menu.wipe.none=Only Sketch
+esp210.menu.wipe.none.upload.erase_cmd=
+esp210.menu.wipe.sdk=Sketch + WiFi Settings
+esp210.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+esp210.menu.wipe.all=All Flash Contents
+esp210.menu.wipe.all.upload.erase_cmd=erase_flash
+esp210.menu.baud.57600=57600
+esp210.menu.baud.57600.upload.speed=57600
+esp210.menu.baud.115200=115200
+esp210.menu.baud.115200.upload.speed=115200
+esp210.menu.baud.230400.linux=230400
+esp210.menu.baud.230400.macosx=230400
+esp210.menu.baud.230400.upload.speed=230400
+esp210.menu.baud.256000.windows=256000
+esp210.menu.baud.256000.upload.speed=256000
+esp210.menu.baud.460800.linux=460800
+esp210.menu.baud.460800.macosx=460800
+esp210.menu.baud.460800.upload.speed=460800
+esp210.menu.baud.512000.windows=512000
+esp210.menu.baud.512000.upload.speed=512000
+esp210.menu.baud.921600=921600
+esp210.menu.baud.921600.upload.speed=921600
+esp210.menu.baud.3000000=3000000
+esp210.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+d1_mini.name=LOLIN(WEMOS) D1 R2 & mini
+d1_mini.build.board=ESP8266_WEMOS_D1MINI
+d1_mini.build.variant=d1_mini
+d1_mini.upload.tool=esptool
+d1_mini.upload.maximum_data_size=81920
+d1_mini.upload.wait_for_upload_port=true
+d1_mini.upload.erase_cmd=
+d1_mini.serial.disableDTR=true
+d1_mini.serial.disableRTS=true
+d1_mini.build.mcu=esp8266
+d1_mini.build.core=esp8266
+d1_mini.build.spiffs_pagesize=256
+d1_mini.build.debug_port=
+d1_mini.build.debug_level=
+d1_mini.menu.xtal.80=80 MHz
+d1_mini.menu.xtal.80.build.f_cpu=80000000L
+d1_mini.menu.xtal.160=160 MHz
+d1_mini.menu.xtal.160.build.f_cpu=160000000L
+d1_mini.menu.vt.flash=Flash
+d1_mini.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+d1_mini.menu.vt.heap=Heap
+d1_mini.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+d1_mini.menu.vt.iram=IRAM
+d1_mini.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+d1_mini.menu.exception.legacy=Legacy (new can return nullptr)
+d1_mini.menu.exception.legacy.build.exception_flags=-fno-exceptions
+d1_mini.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+d1_mini.menu.exception.disabled=Disabled (new can abort)
+d1_mini.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+d1_mini.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+d1_mini.menu.exception.enabled=Enabled
+d1_mini.menu.exception.enabled.build.exception_flags=-fexceptions
+d1_mini.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+d1_mini.menu.ssl.all=All SSL ciphers (most compatible)
+d1_mini.menu.ssl.all.build.sslflags=
+d1_mini.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+d1_mini.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+d1_mini.upload.resetmethod=--before default_reset --after hard_reset
+d1_mini.build.flash_mode=dio
+d1_mini.build.flash_flags=-DFLASHMODE_DIO
+d1_mini.build.flash_freq=40
+d1_mini.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+d1_mini.menu.eesz.4M2M.build.flash_size=4M
+d1_mini.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+d1_mini.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+d1_mini.menu.eesz.4M2M.build.spiffs_pagesize=256
+d1_mini.menu.eesz.4M2M.upload.maximum_size=1044464
+d1_mini.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+d1_mini.menu.eesz.4M2M.build.spiffs_start=0x200000
+d1_mini.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+d1_mini.menu.eesz.4M2M.build.spiffs_blocksize=8192
+d1_mini.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+d1_mini.menu.eesz.4M3M.build.flash_size=4M
+d1_mini.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+d1_mini.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+d1_mini.menu.eesz.4M3M.build.spiffs_pagesize=256
+d1_mini.menu.eesz.4M3M.upload.maximum_size=1044464
+d1_mini.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+d1_mini.menu.eesz.4M3M.build.spiffs_start=0x100000
+d1_mini.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+d1_mini.menu.eesz.4M3M.build.spiffs_blocksize=8192
+d1_mini.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+d1_mini.menu.eesz.4M1M.build.flash_size=4M
+d1_mini.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+d1_mini.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+d1_mini.menu.eesz.4M1M.build.spiffs_pagesize=256
+d1_mini.menu.eesz.4M1M.upload.maximum_size=1044464
+d1_mini.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+d1_mini.menu.eesz.4M1M.build.spiffs_start=0x300000
+d1_mini.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+d1_mini.menu.eesz.4M1M.build.spiffs_blocksize=8192
+d1_mini.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+d1_mini.menu.eesz.4M.build.flash_size=4M
+d1_mini.menu.eesz.4M.build.flash_size_bytes=0x400000
+d1_mini.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+d1_mini.menu.eesz.4M.build.spiffs_pagesize=256
+d1_mini.menu.eesz.4M.upload.maximum_size=1044464
+d1_mini.menu.eesz.4M.build.rfcal_addr=0x3FC000
+d1_mini.menu.ip.lm2f=v2 Lower Memory
+d1_mini.menu.ip.lm2f.build.lwip_include=lwip2/include
+d1_mini.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+d1_mini.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini.menu.ip.hb2f=v2 Higher Bandwidth
+d1_mini.menu.ip.hb2f.build.lwip_include=lwip2/include
+d1_mini.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+d1_mini.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini.menu.ip.lm2n=v2 Lower Memory (no features)
+d1_mini.menu.ip.lm2n.build.lwip_include=lwip2/include
+d1_mini.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+d1_mini.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+d1_mini.menu.ip.hb2n.build.lwip_include=lwip2/include
+d1_mini.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+d1_mini.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini.menu.ip.lm6f=v2 IPv6 Lower Memory
+d1_mini.menu.ip.lm6f.build.lwip_include=lwip2/include
+d1_mini.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+d1_mini.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+d1_mini.menu.ip.hb6f.build.lwip_include=lwip2/include
+d1_mini.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+d1_mini.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini.menu.ip.hb1=v1.4 Higher Bandwidth
+d1_mini.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+d1_mini.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini.menu.ip.src=v1.4 Compile from source
+d1_mini.menu.ip.src.build.lwip_lib=-llwip_src
+d1_mini.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+d1_mini.menu.dbg.Disabled=Disabled
+d1_mini.menu.dbg.Disabled.build.debug_port=
+d1_mini.menu.dbg.Serial=Serial
+d1_mini.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+d1_mini.menu.dbg.Serial1=Serial1
+d1_mini.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+d1_mini.menu.lvl.None____=None
+d1_mini.menu.lvl.None____.build.debug_level=
+d1_mini.menu.lvl.SSL=SSL
+d1_mini.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+d1_mini.menu.lvl.TLS_MEM=TLS_MEM
+d1_mini.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+d1_mini.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+d1_mini.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+d1_mini.menu.lvl.HTTP_SERVER=HTTP_SERVER
+d1_mini.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+d1_mini.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+d1_mini.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+d1_mini.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+d1_mini.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+d1_mini.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+d1_mini.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+d1_mini.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+d1_mini.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+d1_mini.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini.menu.lvl.CORE=CORE
+d1_mini.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+d1_mini.menu.lvl.WIFI=WIFI
+d1_mini.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+d1_mini.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+d1_mini.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+d1_mini.menu.lvl.UPDATER=UPDATER
+d1_mini.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+d1_mini.menu.lvl.OTA=OTA
+d1_mini.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+d1_mini.menu.lvl.OOM=OOM
+d1_mini.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+d1_mini.menu.lvl.MDNS=MDNS
+d1_mini.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+d1_mini.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+d1_mini.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+d1_mini.menu.wipe.none=Only Sketch
+d1_mini.menu.wipe.none.upload.erase_cmd=
+d1_mini.menu.wipe.sdk=Sketch + WiFi Settings
+d1_mini.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+d1_mini.menu.wipe.all=All Flash Contents
+d1_mini.menu.wipe.all.upload.erase_cmd=erase_flash
+d1_mini.menu.baud.921600=921600
+d1_mini.menu.baud.921600.upload.speed=921600
+d1_mini.menu.baud.57600=57600
+d1_mini.menu.baud.57600.upload.speed=57600
+d1_mini.menu.baud.115200=115200
+d1_mini.menu.baud.115200.upload.speed=115200
+d1_mini.menu.baud.230400.linux=230400
+d1_mini.menu.baud.230400.macosx=230400
+d1_mini.menu.baud.230400.upload.speed=230400
+d1_mini.menu.baud.256000.windows=256000
+d1_mini.menu.baud.256000.upload.speed=256000
+d1_mini.menu.baud.460800.linux=460800
+d1_mini.menu.baud.460800.macosx=460800
+d1_mini.menu.baud.460800.upload.speed=460800
+d1_mini.menu.baud.512000.windows=512000
+d1_mini.menu.baud.512000.upload.speed=512000
+d1_mini.menu.baud.3000000=3000000
+d1_mini.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+d1_mini_pro.name=LOLIN(WEMOS) D1 mini Pro
+d1_mini_pro.build.board=ESP8266_WEMOS_D1MINIPRO
+d1_mini_pro.build.variant=d1_mini
+d1_mini_pro.upload.tool=esptool
+d1_mini_pro.upload.maximum_data_size=81920
+d1_mini_pro.upload.wait_for_upload_port=true
+d1_mini_pro.upload.erase_cmd=
+d1_mini_pro.serial.disableDTR=true
+d1_mini_pro.serial.disableRTS=true
+d1_mini_pro.build.mcu=esp8266
+d1_mini_pro.build.core=esp8266
+d1_mini_pro.build.spiffs_pagesize=256
+d1_mini_pro.build.debug_port=
+d1_mini_pro.build.debug_level=
+d1_mini_pro.menu.xtal.80=80 MHz
+d1_mini_pro.menu.xtal.80.build.f_cpu=80000000L
+d1_mini_pro.menu.xtal.160=160 MHz
+d1_mini_pro.menu.xtal.160.build.f_cpu=160000000L
+d1_mini_pro.menu.vt.flash=Flash
+d1_mini_pro.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+d1_mini_pro.menu.vt.heap=Heap
+d1_mini_pro.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+d1_mini_pro.menu.vt.iram=IRAM
+d1_mini_pro.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+d1_mini_pro.menu.exception.legacy=Legacy (new can return nullptr)
+d1_mini_pro.menu.exception.legacy.build.exception_flags=-fno-exceptions
+d1_mini_pro.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+d1_mini_pro.menu.exception.disabled=Disabled (new can abort)
+d1_mini_pro.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+d1_mini_pro.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+d1_mini_pro.menu.exception.enabled=Enabled
+d1_mini_pro.menu.exception.enabled.build.exception_flags=-fexceptions
+d1_mini_pro.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+d1_mini_pro.menu.ssl.all=All SSL ciphers (most compatible)
+d1_mini_pro.menu.ssl.all.build.sslflags=
+d1_mini_pro.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+d1_mini_pro.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+d1_mini_pro.upload.resetmethod=--before default_reset --after hard_reset
+d1_mini_pro.build.flash_mode=dio
+d1_mini_pro.build.flash_flags=-DFLASHMODE_DIO
+d1_mini_pro.build.flash_freq=40
+d1_mini_pro.menu.eesz.16M14M=16MB (FS:14MB OTA:~1019KB)
+d1_mini_pro.menu.eesz.16M14M.build.flash_size=16M
+d1_mini_pro.menu.eesz.16M14M.build.flash_size_bytes=0x1000000
+d1_mini_pro.menu.eesz.16M14M.build.flash_ld=eagle.flash.16m14m.ld
+d1_mini_pro.menu.eesz.16M14M.build.spiffs_pagesize=256
+d1_mini_pro.menu.eesz.16M14M.upload.maximum_size=1044464
+d1_mini_pro.menu.eesz.16M14M.build.rfcal_addr=0xFFC000
+d1_mini_pro.menu.eesz.16M14M.build.spiffs_start=0x200000
+d1_mini_pro.menu.eesz.16M14M.build.spiffs_end=0xFFA000
+d1_mini_pro.menu.eesz.16M14M.build.spiffs_blocksize=8192
+d1_mini_pro.menu.eesz.16M15M=16MB (FS:15MB OTA:~512KB)
+d1_mini_pro.menu.eesz.16M15M.build.flash_size=16M
+d1_mini_pro.menu.eesz.16M15M.build.flash_size_bytes=0x1000000
+d1_mini_pro.menu.eesz.16M15M.build.flash_ld=eagle.flash.16m15m.ld
+d1_mini_pro.menu.eesz.16M15M.build.spiffs_pagesize=256
+d1_mini_pro.menu.eesz.16M15M.upload.maximum_size=1044464
+d1_mini_pro.menu.eesz.16M15M.build.rfcal_addr=0xFFC000
+d1_mini_pro.menu.eesz.16M15M.build.spiffs_start=0x100000
+d1_mini_pro.menu.eesz.16M15M.build.spiffs_end=0xFFA000
+d1_mini_pro.menu.eesz.16M15M.build.spiffs_blocksize=8192
+d1_mini_pro.menu.ip.lm2f=v2 Lower Memory
+d1_mini_pro.menu.ip.lm2f.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+d1_mini_pro.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini_pro.menu.ip.hb2f=v2 Higher Bandwidth
+d1_mini_pro.menu.ip.hb2f.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+d1_mini_pro.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini_pro.menu.ip.lm2n=v2 Lower Memory (no features)
+d1_mini_pro.menu.ip.lm2n.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+d1_mini_pro.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini_pro.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+d1_mini_pro.menu.ip.hb2n.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+d1_mini_pro.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini_pro.menu.ip.lm6f=v2 IPv6 Lower Memory
+d1_mini_pro.menu.ip.lm6f.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+d1_mini_pro.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini_pro.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+d1_mini_pro.menu.ip.hb6f.build.lwip_include=lwip2/include
+d1_mini_pro.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+d1_mini_pro.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini_pro.menu.ip.hb1=v1.4 Higher Bandwidth
+d1_mini_pro.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+d1_mini_pro.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini_pro.menu.ip.src=v1.4 Compile from source
+d1_mini_pro.menu.ip.src.build.lwip_lib=-llwip_src
+d1_mini_pro.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini_pro.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+d1_mini_pro.menu.dbg.Disabled=Disabled
+d1_mini_pro.menu.dbg.Disabled.build.debug_port=
+d1_mini_pro.menu.dbg.Serial=Serial
+d1_mini_pro.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+d1_mini_pro.menu.dbg.Serial1=Serial1
+d1_mini_pro.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+d1_mini_pro.menu.lvl.None____=None
+d1_mini_pro.menu.lvl.None____.build.debug_level=
+d1_mini_pro.menu.lvl.SSL=SSL
+d1_mini_pro.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+d1_mini_pro.menu.lvl.TLS_MEM=TLS_MEM
+d1_mini_pro.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+d1_mini_pro.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+d1_mini_pro.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_pro.menu.lvl.HTTP_SERVER=HTTP_SERVER
+d1_mini_pro.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+d1_mini_pro.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+d1_mini_pro.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+d1_mini_pro.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_pro.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+d1_mini_pro.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini_pro.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_pro.menu.lvl.CORE=CORE
+d1_mini_pro.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+d1_mini_pro.menu.lvl.WIFI=WIFI
+d1_mini_pro.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+d1_mini_pro.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+d1_mini_pro.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+d1_mini_pro.menu.lvl.UPDATER=UPDATER
+d1_mini_pro.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+d1_mini_pro.menu.lvl.OTA=OTA
+d1_mini_pro.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+d1_mini_pro.menu.lvl.OOM=OOM
+d1_mini_pro.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+d1_mini_pro.menu.lvl.MDNS=MDNS
+d1_mini_pro.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+d1_mini_pro.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini_pro.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini_pro.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+d1_mini_pro.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+d1_mini_pro.menu.wipe.none=Only Sketch
+d1_mini_pro.menu.wipe.none.upload.erase_cmd=
+d1_mini_pro.menu.wipe.sdk=Sketch + WiFi Settings
+d1_mini_pro.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+d1_mini_pro.menu.wipe.all=All Flash Contents
+d1_mini_pro.menu.wipe.all.upload.erase_cmd=erase_flash
+d1_mini_pro.menu.baud.921600=921600
+d1_mini_pro.menu.baud.921600.upload.speed=921600
+d1_mini_pro.menu.baud.57600=57600
+d1_mini_pro.menu.baud.57600.upload.speed=57600
+d1_mini_pro.menu.baud.115200=115200
+d1_mini_pro.menu.baud.115200.upload.speed=115200
+d1_mini_pro.menu.baud.230400.linux=230400
+d1_mini_pro.menu.baud.230400.macosx=230400
+d1_mini_pro.menu.baud.230400.upload.speed=230400
+d1_mini_pro.menu.baud.256000.windows=256000
+d1_mini_pro.menu.baud.256000.upload.speed=256000
+d1_mini_pro.menu.baud.460800.linux=460800
+d1_mini_pro.menu.baud.460800.macosx=460800
+d1_mini_pro.menu.baud.460800.upload.speed=460800
+d1_mini_pro.menu.baud.512000.windows=512000
+d1_mini_pro.menu.baud.512000.upload.speed=512000
+d1_mini_pro.menu.baud.3000000=3000000
+d1_mini_pro.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+d1_mini_lite.name=LOLIN(WEMOS) D1 mini Lite
+d1_mini_lite.build.board=ESP8266_WEMOS_D1MINILITE
+d1_mini_lite.build.variant=d1_mini
+d1_mini_lite.upload.tool=esptool
+d1_mini_lite.upload.maximum_data_size=81920
+d1_mini_lite.upload.wait_for_upload_port=true
+d1_mini_lite.upload.erase_cmd=
+d1_mini_lite.serial.disableDTR=true
+d1_mini_lite.serial.disableRTS=true
+d1_mini_lite.build.mcu=esp8266
+d1_mini_lite.build.core=esp8266
+d1_mini_lite.build.spiffs_pagesize=256
+d1_mini_lite.build.debug_port=
+d1_mini_lite.build.debug_level=
+d1_mini_lite.menu.xtal.80=80 MHz
+d1_mini_lite.menu.xtal.80.build.f_cpu=80000000L
+d1_mini_lite.menu.xtal.160=160 MHz
+d1_mini_lite.menu.xtal.160.build.f_cpu=160000000L
+d1_mini_lite.menu.vt.flash=Flash
+d1_mini_lite.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+d1_mini_lite.menu.vt.heap=Heap
+d1_mini_lite.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+d1_mini_lite.menu.vt.iram=IRAM
+d1_mini_lite.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+d1_mini_lite.menu.exception.legacy=Legacy (new can return nullptr)
+d1_mini_lite.menu.exception.legacy.build.exception_flags=-fno-exceptions
+d1_mini_lite.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+d1_mini_lite.menu.exception.disabled=Disabled (new can abort)
+d1_mini_lite.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+d1_mini_lite.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+d1_mini_lite.menu.exception.enabled=Enabled
+d1_mini_lite.menu.exception.enabled.build.exception_flags=-fexceptions
+d1_mini_lite.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+d1_mini_lite.menu.ssl.all=All SSL ciphers (most compatible)
+d1_mini_lite.menu.ssl.all.build.sslflags=
+d1_mini_lite.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+d1_mini_lite.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+d1_mini_lite.upload.resetmethod=--before default_reset --after hard_reset
+d1_mini_lite.build.flash_mode=dout
+d1_mini_lite.build.flash_flags=-DFLASHMODE_DOUT
+d1_mini_lite.build.flash_freq=40
+d1_mini_lite.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+d1_mini_lite.menu.eesz.1M64.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M64.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+d1_mini_lite.menu.eesz.1M64.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M64.upload.maximum_size=958448
+d1_mini_lite.menu.eesz.1M64.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M64.build.spiffs_start=0xEB000
+d1_mini_lite.menu.eesz.1M64.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M64.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+d1_mini_lite.menu.eesz.1M128.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M128.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+d1_mini_lite.menu.eesz.1M128.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M128.upload.maximum_size=892912
+d1_mini_lite.menu.eesz.1M128.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M128.build.spiffs_start=0xDB000
+d1_mini_lite.menu.eesz.1M128.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M128.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+d1_mini_lite.menu.eesz.1M144.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M144.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+d1_mini_lite.menu.eesz.1M144.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M144.upload.maximum_size=876528
+d1_mini_lite.menu.eesz.1M144.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M144.build.spiffs_start=0xD7000
+d1_mini_lite.menu.eesz.1M144.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M144.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+d1_mini_lite.menu.eesz.1M160.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M160.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+d1_mini_lite.menu.eesz.1M160.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M160.upload.maximum_size=860144
+d1_mini_lite.menu.eesz.1M160.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M160.build.spiffs_start=0xD3000
+d1_mini_lite.menu.eesz.1M160.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M160.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+d1_mini_lite.menu.eesz.1M192.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M192.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+d1_mini_lite.menu.eesz.1M192.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M192.upload.maximum_size=827376
+d1_mini_lite.menu.eesz.1M192.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M192.build.spiffs_start=0xCB000
+d1_mini_lite.menu.eesz.1M192.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M192.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+d1_mini_lite.menu.eesz.1M256.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M256.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+d1_mini_lite.menu.eesz.1M256.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M256.upload.maximum_size=761840
+d1_mini_lite.menu.eesz.1M256.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M256.build.spiffs_start=0xBB000
+d1_mini_lite.menu.eesz.1M256.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M256.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+d1_mini_lite.menu.eesz.1M512.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M512.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+d1_mini_lite.menu.eesz.1M512.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M512.upload.maximum_size=499696
+d1_mini_lite.menu.eesz.1M512.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.eesz.1M512.build.spiffs_start=0x7B000
+d1_mini_lite.menu.eesz.1M512.build.spiffs_end=0xFB000
+d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=8192
+d1_mini_lite.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+d1_mini_lite.menu.eesz.1M.build.flash_size=1M
+d1_mini_lite.menu.eesz.1M.build.flash_size_bytes=0x100000
+d1_mini_lite.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+d1_mini_lite.menu.eesz.1M.build.spiffs_pagesize=256
+d1_mini_lite.menu.eesz.1M.upload.maximum_size=1023984
+d1_mini_lite.menu.eesz.1M.build.rfcal_addr=0xFC000
+d1_mini_lite.menu.ip.lm2f=v2 Lower Memory
+d1_mini_lite.menu.ip.lm2f.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+d1_mini_lite.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini_lite.menu.ip.hb2f=v2 Higher Bandwidth
+d1_mini_lite.menu.ip.hb2f.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+d1_mini_lite.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_mini_lite.menu.ip.lm2n=v2 Lower Memory (no features)
+d1_mini_lite.menu.ip.lm2n.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+d1_mini_lite.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini_lite.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+d1_mini_lite.menu.ip.hb2n.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+d1_mini_lite.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_mini_lite.menu.ip.lm6f=v2 IPv6 Lower Memory
+d1_mini_lite.menu.ip.lm6f.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+d1_mini_lite.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini_lite.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+d1_mini_lite.menu.ip.hb6f.build.lwip_include=lwip2/include
+d1_mini_lite.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+d1_mini_lite.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_mini_lite.menu.ip.hb1=v1.4 Higher Bandwidth
+d1_mini_lite.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+d1_mini_lite.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini_lite.menu.ip.src=v1.4 Compile from source
+d1_mini_lite.menu.ip.src.build.lwip_lib=-llwip_src
+d1_mini_lite.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+d1_mini_lite.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+d1_mini_lite.menu.dbg.Disabled=Disabled
+d1_mini_lite.menu.dbg.Disabled.build.debug_port=
+d1_mini_lite.menu.dbg.Serial=Serial
+d1_mini_lite.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+d1_mini_lite.menu.dbg.Serial1=Serial1
+d1_mini_lite.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+d1_mini_lite.menu.lvl.None____=None
+d1_mini_lite.menu.lvl.None____.build.debug_level=
+d1_mini_lite.menu.lvl.SSL=SSL
+d1_mini_lite.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+d1_mini_lite.menu.lvl.TLS_MEM=TLS_MEM
+d1_mini_lite.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+d1_mini_lite.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+d1_mini_lite.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_lite.menu.lvl.HTTP_SERVER=HTTP_SERVER
+d1_mini_lite.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+d1_mini_lite.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+d1_mini_lite.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+d1_mini_lite.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_lite.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+d1_mini_lite.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini_lite.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_mini_lite.menu.lvl.CORE=CORE
+d1_mini_lite.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+d1_mini_lite.menu.lvl.WIFI=WIFI
+d1_mini_lite.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+d1_mini_lite.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+d1_mini_lite.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+d1_mini_lite.menu.lvl.UPDATER=UPDATER
+d1_mini_lite.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+d1_mini_lite.menu.lvl.OTA=OTA
+d1_mini_lite.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+d1_mini_lite.menu.lvl.OOM=OOM
+d1_mini_lite.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+d1_mini_lite.menu.lvl.MDNS=MDNS
+d1_mini_lite.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+d1_mini_lite.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini_lite.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_mini_lite.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+d1_mini_lite.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+d1_mini_lite.menu.wipe.none=Only Sketch
+d1_mini_lite.menu.wipe.none.upload.erase_cmd=
+d1_mini_lite.menu.wipe.sdk=Sketch + WiFi Settings
+d1_mini_lite.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+d1_mini_lite.menu.wipe.all=All Flash Contents
+d1_mini_lite.menu.wipe.all.upload.erase_cmd=erase_flash
+d1_mini_lite.menu.baud.921600=921600
+d1_mini_lite.menu.baud.921600.upload.speed=921600
+d1_mini_lite.menu.baud.57600=57600
+d1_mini_lite.menu.baud.57600.upload.speed=57600
+d1_mini_lite.menu.baud.115200=115200
+d1_mini_lite.menu.baud.115200.upload.speed=115200
+d1_mini_lite.menu.baud.230400.linux=230400
+d1_mini_lite.menu.baud.230400.macosx=230400
+d1_mini_lite.menu.baud.230400.upload.speed=230400
+d1_mini_lite.menu.baud.256000.windows=256000
+d1_mini_lite.menu.baud.256000.upload.speed=256000
+d1_mini_lite.menu.baud.460800.linux=460800
+d1_mini_lite.menu.baud.460800.macosx=460800
+d1_mini_lite.menu.baud.460800.upload.speed=460800
+d1_mini_lite.menu.baud.512000.windows=512000
+d1_mini_lite.menu.baud.512000.upload.speed=512000
+d1_mini_lite.menu.baud.3000000=3000000
+d1_mini_lite.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+d1.name=WeMos D1 R1
+d1.build.board=ESP8266_WEMOS_D1R1
+d1.build.variant=d1
+d1.upload.tool=esptool
+d1.upload.maximum_data_size=81920
+d1.upload.wait_for_upload_port=true
+d1.upload.erase_cmd=
+d1.serial.disableDTR=true
+d1.serial.disableRTS=true
+d1.build.mcu=esp8266
+d1.build.core=esp8266
+d1.build.spiffs_pagesize=256
+d1.build.debug_port=
+d1.build.debug_level=
+d1.menu.xtal.80=80 MHz
+d1.menu.xtal.80.build.f_cpu=80000000L
+d1.menu.xtal.160=160 MHz
+d1.menu.xtal.160.build.f_cpu=160000000L
+d1.menu.vt.flash=Flash
+d1.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+d1.menu.vt.heap=Heap
+d1.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+d1.menu.vt.iram=IRAM
+d1.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+d1.menu.exception.legacy=Legacy (new can return nullptr)
+d1.menu.exception.legacy.build.exception_flags=-fno-exceptions
+d1.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+d1.menu.exception.disabled=Disabled (new can abort)
+d1.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+d1.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+d1.menu.exception.enabled=Enabled
+d1.menu.exception.enabled.build.exception_flags=-fexceptions
+d1.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+d1.menu.ssl.all=All SSL ciphers (most compatible)
+d1.menu.ssl.all.build.sslflags=
+d1.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+d1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+d1.upload.resetmethod=--before default_reset --after hard_reset
+d1.build.flash_mode=dio
+d1.build.flash_flags=-DFLASHMODE_DIO
+d1.build.flash_freq=40
+d1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+d1.menu.eesz.4M2M.build.flash_size=4M
+d1.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+d1.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+d1.menu.eesz.4M2M.build.spiffs_pagesize=256
+d1.menu.eesz.4M2M.upload.maximum_size=1044464
+d1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+d1.menu.eesz.4M2M.build.spiffs_start=0x200000
+d1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+d1.menu.eesz.4M2M.build.spiffs_blocksize=8192
+d1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+d1.menu.eesz.4M3M.build.flash_size=4M
+d1.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+d1.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+d1.menu.eesz.4M3M.build.spiffs_pagesize=256
+d1.menu.eesz.4M3M.upload.maximum_size=1044464
+d1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+d1.menu.eesz.4M3M.build.spiffs_start=0x100000
+d1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+d1.menu.eesz.4M3M.build.spiffs_blocksize=8192
+d1.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+d1.menu.eesz.4M1M.build.flash_size=4M
+d1.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+d1.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+d1.menu.eesz.4M1M.build.spiffs_pagesize=256
+d1.menu.eesz.4M1M.upload.maximum_size=1044464
+d1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+d1.menu.eesz.4M1M.build.spiffs_start=0x300000
+d1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+d1.menu.eesz.4M1M.build.spiffs_blocksize=8192
+d1.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+d1.menu.eesz.4M.build.flash_size=4M
+d1.menu.eesz.4M.build.flash_size_bytes=0x400000
+d1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+d1.menu.eesz.4M.build.spiffs_pagesize=256
+d1.menu.eesz.4M.upload.maximum_size=1044464
+d1.menu.eesz.4M.build.rfcal_addr=0x3FC000
+d1.menu.ip.lm2f=v2 Lower Memory
+d1.menu.ip.lm2f.build.lwip_include=lwip2/include
+d1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+d1.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1.menu.ip.hb2f=v2 Higher Bandwidth
+d1.menu.ip.hb2f.build.lwip_include=lwip2/include
+d1.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+d1.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1.menu.ip.lm2n=v2 Lower Memory (no features)
+d1.menu.ip.lm2n.build.lwip_include=lwip2/include
+d1.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+d1.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+d1.menu.ip.hb2n.build.lwip_include=lwip2/include
+d1.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+d1.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1.menu.ip.lm6f=v2 IPv6 Lower Memory
+d1.menu.ip.lm6f.build.lwip_include=lwip2/include
+d1.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+d1.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+d1.menu.ip.hb6f.build.lwip_include=lwip2/include
+d1.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+d1.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1.menu.ip.hb1=v1.4 Higher Bandwidth
+d1.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+d1.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+d1.menu.ip.src=v1.4 Compile from source
+d1.menu.ip.src.build.lwip_lib=-llwip_src
+d1.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+d1.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+d1.menu.dbg.Disabled=Disabled
+d1.menu.dbg.Disabled.build.debug_port=
+d1.menu.dbg.Serial=Serial
+d1.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+d1.menu.dbg.Serial1=Serial1
+d1.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+d1.menu.lvl.None____=None
+d1.menu.lvl.None____.build.debug_level=
+d1.menu.lvl.SSL=SSL
+d1.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+d1.menu.lvl.TLS_MEM=TLS_MEM
+d1.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+d1.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+d1.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+d1.menu.lvl.HTTP_SERVER=HTTP_SERVER
+d1.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+d1.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+d1.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+d1.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+d1.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+d1.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+d1.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+d1.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+d1.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+d1.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+d1.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1.menu.lvl.CORE=CORE
+d1.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+d1.menu.lvl.WIFI=WIFI
+d1.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+d1.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+d1.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+d1.menu.lvl.UPDATER=UPDATER
+d1.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+d1.menu.lvl.OTA=OTA
+d1.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+d1.menu.lvl.OOM=OOM
+d1.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+d1.menu.lvl.MDNS=MDNS
+d1.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+d1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+d1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+d1.menu.wipe.none=Only Sketch
+d1.menu.wipe.none.upload.erase_cmd=
+d1.menu.wipe.sdk=Sketch + WiFi Settings
+d1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+d1.menu.wipe.all=All Flash Contents
+d1.menu.wipe.all.upload.erase_cmd=erase_flash
+d1.menu.baud.921600=921600
+d1.menu.baud.921600.upload.speed=921600
+d1.menu.baud.57600=57600
+d1.menu.baud.57600.upload.speed=57600
+d1.menu.baud.115200=115200
+d1.menu.baud.115200.upload.speed=115200
+d1.menu.baud.230400.linux=230400
+d1.menu.baud.230400.macosx=230400
+d1.menu.baud.230400.upload.speed=230400
+d1.menu.baud.256000.windows=256000
+d1.menu.baud.256000.upload.speed=256000
+d1.menu.baud.460800.linux=460800
+d1.menu.baud.460800.macosx=460800
+d1.menu.baud.460800.upload.speed=460800
+d1.menu.baud.512000.windows=512000
+d1.menu.baud.512000.upload.speed=512000
+d1.menu.baud.3000000=3000000
+d1.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espino.name=ESPino (ESP-12 Module)
+espino.build.board=ESP8266_ESP12
+espino.build.variant=espino
+espino.upload.tool=esptool
+espino.upload.maximum_data_size=81920
+espino.upload.wait_for_upload_port=true
+espino.upload.erase_cmd=
+espino.serial.disableDTR=true
+espino.serial.disableRTS=true
+espino.build.mcu=esp8266
+espino.build.core=esp8266
+espino.build.spiffs_pagesize=256
+espino.build.debug_port=
+espino.build.debug_level=
+espino.menu.xtal.80=80 MHz
+espino.menu.xtal.80.build.f_cpu=80000000L
+espino.menu.xtal.160=160 MHz
+espino.menu.xtal.160.build.f_cpu=160000000L
+espino.menu.vt.flash=Flash
+espino.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espino.menu.vt.heap=Heap
+espino.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espino.menu.vt.iram=IRAM
+espino.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espino.menu.exception.legacy=Legacy (new can return nullptr)
+espino.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espino.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espino.menu.exception.disabled=Disabled (new can abort)
+espino.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espino.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espino.menu.exception.enabled=Enabled
+espino.menu.exception.enabled.build.exception_flags=-fexceptions
+espino.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espino.menu.ssl.all=All SSL ciphers (most compatible)
+espino.menu.ssl.all.build.sslflags=
+espino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espino.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espino.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espino.menu.ResetMethod.ck=no dtr (aka ck)
+espino.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+espino.build.flash_mode=qio
+espino.build.flash_flags=-DFLASHMODE_QIO
+espino.build.flash_freq=40
+espino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espino.menu.eesz.4M2M.build.flash_size=4M
+espino.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espino.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espino.menu.eesz.4M2M.build.spiffs_pagesize=256
+espino.menu.eesz.4M2M.upload.maximum_size=1044464
+espino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espino.menu.eesz.4M2M.build.spiffs_start=0x200000
+espino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espino.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espino.menu.eesz.4M3M.build.flash_size=4M
+espino.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espino.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espino.menu.eesz.4M3M.build.spiffs_pagesize=256
+espino.menu.eesz.4M3M.upload.maximum_size=1044464
+espino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espino.menu.eesz.4M3M.build.spiffs_start=0x100000
+espino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espino.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espino.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espino.menu.eesz.4M1M.build.flash_size=4M
+espino.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espino.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espino.menu.eesz.4M1M.build.spiffs_pagesize=256
+espino.menu.eesz.4M1M.upload.maximum_size=1044464
+espino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espino.menu.eesz.4M1M.build.spiffs_start=0x300000
+espino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espino.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espino.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espino.menu.eesz.4M.build.flash_size=4M
+espino.menu.eesz.4M.build.flash_size_bytes=0x400000
+espino.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espino.menu.eesz.4M.build.spiffs_pagesize=256
+espino.menu.eesz.4M.upload.maximum_size=1044464
+espino.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espino.menu.ip.lm2f=v2 Lower Memory
+espino.menu.ip.lm2f.build.lwip_include=lwip2/include
+espino.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espino.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espino.menu.ip.hb2f=v2 Higher Bandwidth
+espino.menu.ip.hb2f.build.lwip_include=lwip2/include
+espino.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espino.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espino.menu.ip.lm2n=v2 Lower Memory (no features)
+espino.menu.ip.lm2n.build.lwip_include=lwip2/include
+espino.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espino.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espino.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espino.menu.ip.hb2n.build.lwip_include=lwip2/include
+espino.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espino.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espino.menu.ip.lm6f=v2 IPv6 Lower Memory
+espino.menu.ip.lm6f.build.lwip_include=lwip2/include
+espino.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espino.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espino.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espino.menu.ip.hb6f.build.lwip_include=lwip2/include
+espino.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espino.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espino.menu.ip.hb1=v1.4 Higher Bandwidth
+espino.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espino.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espino.menu.ip.src=v1.4 Compile from source
+espino.menu.ip.src.build.lwip_lib=-llwip_src
+espino.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espino.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espino.menu.dbg.Disabled=Disabled
+espino.menu.dbg.Disabled.build.debug_port=
+espino.menu.dbg.Serial=Serial
+espino.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espino.menu.dbg.Serial1=Serial1
+espino.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espino.menu.lvl.None____=None
+espino.menu.lvl.None____.build.debug_level=
+espino.menu.lvl.SSL=SSL
+espino.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espino.menu.lvl.TLS_MEM=TLS_MEM
+espino.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espino.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espino.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espino.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espino.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espino.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espino.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espino.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espino.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espino.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espino.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espino.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espino.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espino.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espino.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espino.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espino.menu.lvl.CORE=CORE
+espino.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espino.menu.lvl.WIFI=WIFI
+espino.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espino.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espino.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espino.menu.lvl.UPDATER=UPDATER
+espino.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espino.menu.lvl.OTA=OTA
+espino.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espino.menu.lvl.OOM=OOM
+espino.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espino.menu.lvl.MDNS=MDNS
+espino.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espino.menu.wipe.none=Only Sketch
+espino.menu.wipe.none.upload.erase_cmd=
+espino.menu.wipe.sdk=Sketch + WiFi Settings
+espino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espino.menu.wipe.all=All Flash Contents
+espino.menu.wipe.all.upload.erase_cmd=erase_flash
+espino.menu.baud.115200=115200
+espino.menu.baud.115200.upload.speed=115200
+espino.menu.baud.57600=57600
+espino.menu.baud.57600.upload.speed=57600
+espino.menu.baud.230400.linux=230400
+espino.menu.baud.230400.macosx=230400
+espino.menu.baud.230400.upload.speed=230400
+espino.menu.baud.256000.windows=256000
+espino.menu.baud.256000.upload.speed=256000
+espino.menu.baud.460800.linux=460800
+espino.menu.baud.460800.macosx=460800
+espino.menu.baud.460800.upload.speed=460800
+espino.menu.baud.512000.windows=512000
+espino.menu.baud.512000.upload.speed=512000
+espino.menu.baud.921600=921600
+espino.menu.baud.921600.upload.speed=921600
+espino.menu.baud.3000000=3000000
+espino.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espinotee.name=ThaiEasyElec's ESPino
+espinotee.build.board=ESP8266_ESP13
+espinotee.build.variant=espinotee
+espinotee.upload.tool=esptool
+espinotee.upload.maximum_data_size=81920
+espinotee.upload.wait_for_upload_port=true
+espinotee.upload.erase_cmd=
+espinotee.serial.disableDTR=true
+espinotee.serial.disableRTS=true
+espinotee.build.mcu=esp8266
+espinotee.build.core=esp8266
+espinotee.build.spiffs_pagesize=256
+espinotee.build.debug_port=
+espinotee.build.debug_level=
+espinotee.menu.xtal.80=80 MHz
+espinotee.menu.xtal.80.build.f_cpu=80000000L
+espinotee.menu.xtal.160=160 MHz
+espinotee.menu.xtal.160.build.f_cpu=160000000L
+espinotee.menu.vt.flash=Flash
+espinotee.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espinotee.menu.vt.heap=Heap
+espinotee.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espinotee.menu.vt.iram=IRAM
+espinotee.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espinotee.menu.exception.legacy=Legacy (new can return nullptr)
+espinotee.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espinotee.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espinotee.menu.exception.disabled=Disabled (new can abort)
+espinotee.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espinotee.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espinotee.menu.exception.enabled=Enabled
+espinotee.menu.exception.enabled.build.exception_flags=-fexceptions
+espinotee.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espinotee.menu.ssl.all=All SSL ciphers (most compatible)
+espinotee.menu.ssl.all.build.sslflags=
+espinotee.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espinotee.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espinotee.upload.resetmethod=--before default_reset --after hard_reset
+espinotee.build.flash_mode=qio
+espinotee.build.flash_flags=-DFLASHMODE_QIO
+espinotee.build.flash_freq=40
+espinotee.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espinotee.menu.eesz.4M2M.build.flash_size=4M
+espinotee.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espinotee.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espinotee.menu.eesz.4M2M.build.spiffs_pagesize=256
+espinotee.menu.eesz.4M2M.upload.maximum_size=1044464
+espinotee.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espinotee.menu.eesz.4M2M.build.spiffs_start=0x200000
+espinotee.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espinotee.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espinotee.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espinotee.menu.eesz.4M3M.build.flash_size=4M
+espinotee.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espinotee.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espinotee.menu.eesz.4M3M.build.spiffs_pagesize=256
+espinotee.menu.eesz.4M3M.upload.maximum_size=1044464
+espinotee.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espinotee.menu.eesz.4M3M.build.spiffs_start=0x100000
+espinotee.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espinotee.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espinotee.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espinotee.menu.eesz.4M1M.build.flash_size=4M
+espinotee.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espinotee.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espinotee.menu.eesz.4M1M.build.spiffs_pagesize=256
+espinotee.menu.eesz.4M1M.upload.maximum_size=1044464
+espinotee.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espinotee.menu.eesz.4M1M.build.spiffs_start=0x300000
+espinotee.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espinotee.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espinotee.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espinotee.menu.eesz.4M.build.flash_size=4M
+espinotee.menu.eesz.4M.build.flash_size_bytes=0x400000
+espinotee.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espinotee.menu.eesz.4M.build.spiffs_pagesize=256
+espinotee.menu.eesz.4M.upload.maximum_size=1044464
+espinotee.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espinotee.menu.ip.lm2f=v2 Lower Memory
+espinotee.menu.ip.lm2f.build.lwip_include=lwip2/include
+espinotee.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espinotee.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espinotee.menu.ip.hb2f=v2 Higher Bandwidth
+espinotee.menu.ip.hb2f.build.lwip_include=lwip2/include
+espinotee.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espinotee.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espinotee.menu.ip.lm2n=v2 Lower Memory (no features)
+espinotee.menu.ip.lm2n.build.lwip_include=lwip2/include
+espinotee.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espinotee.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espinotee.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espinotee.menu.ip.hb2n.build.lwip_include=lwip2/include
+espinotee.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espinotee.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espinotee.menu.ip.lm6f=v2 IPv6 Lower Memory
+espinotee.menu.ip.lm6f.build.lwip_include=lwip2/include
+espinotee.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espinotee.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espinotee.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espinotee.menu.ip.hb6f.build.lwip_include=lwip2/include
+espinotee.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espinotee.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espinotee.menu.ip.hb1=v1.4 Higher Bandwidth
+espinotee.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espinotee.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espinotee.menu.ip.src=v1.4 Compile from source
+espinotee.menu.ip.src.build.lwip_lib=-llwip_src
+espinotee.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espinotee.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espinotee.menu.dbg.Disabled=Disabled
+espinotee.menu.dbg.Disabled.build.debug_port=
+espinotee.menu.dbg.Serial=Serial
+espinotee.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espinotee.menu.dbg.Serial1=Serial1
+espinotee.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espinotee.menu.lvl.None____=None
+espinotee.menu.lvl.None____.build.debug_level=
+espinotee.menu.lvl.SSL=SSL
+espinotee.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espinotee.menu.lvl.TLS_MEM=TLS_MEM
+espinotee.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espinotee.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espinotee.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espinotee.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espinotee.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espinotee.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espinotee.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espinotee.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espinotee.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espinotee.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espinotee.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espinotee.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espinotee.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espinotee.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espinotee.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espinotee.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espinotee.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espinotee.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espinotee.menu.lvl.CORE=CORE
+espinotee.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espinotee.menu.lvl.WIFI=WIFI
+espinotee.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espinotee.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espinotee.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espinotee.menu.lvl.UPDATER=UPDATER
+espinotee.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espinotee.menu.lvl.OTA=OTA
+espinotee.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espinotee.menu.lvl.OOM=OOM
+espinotee.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espinotee.menu.lvl.MDNS=MDNS
+espinotee.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espinotee.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espinotee.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espinotee.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espinotee.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espinotee.menu.wipe.none=Only Sketch
+espinotee.menu.wipe.none.upload.erase_cmd=
+espinotee.menu.wipe.sdk=Sketch + WiFi Settings
+espinotee.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espinotee.menu.wipe.all=All Flash Contents
+espinotee.menu.wipe.all.upload.erase_cmd=erase_flash
+espinotee.menu.baud.115200=115200
+espinotee.menu.baud.115200.upload.speed=115200
+espinotee.menu.baud.57600=57600
+espinotee.menu.baud.57600.upload.speed=57600
+espinotee.menu.baud.230400.linux=230400
+espinotee.menu.baud.230400.macosx=230400
+espinotee.menu.baud.230400.upload.speed=230400
+espinotee.menu.baud.256000.windows=256000
+espinotee.menu.baud.256000.upload.speed=256000
+espinotee.menu.baud.460800.linux=460800
+espinotee.menu.baud.460800.macosx=460800
+espinotee.menu.baud.460800.upload.speed=460800
+espinotee.menu.baud.512000.windows=512000
+espinotee.menu.baud.512000.upload.speed=512000
+espinotee.menu.baud.921600=921600
+espinotee.menu.baud.921600.upload.speed=921600
+espinotee.menu.baud.3000000=3000000
+espinotee.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+wifinfo.name=WifInfo
+wifinfo.build.board=WIFINFO
+wifinfo.build.variant=wifinfo
+wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
+wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
+wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
+wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
+wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
+wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
+wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
+wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
+wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
+wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
+wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
+wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
+wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
+wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
+wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
+wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
+wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
+wifinfo.upload.tool=esptool
+wifinfo.upload.maximum_data_size=81920
+wifinfo.upload.wait_for_upload_port=true
+wifinfo.upload.erase_cmd=
+wifinfo.serial.disableDTR=true
+wifinfo.serial.disableRTS=true
+wifinfo.build.mcu=esp8266
+wifinfo.build.core=esp8266
+wifinfo.build.spiffs_pagesize=256
+wifinfo.build.debug_port=
+wifinfo.build.debug_level=
+wifinfo.menu.xtal.80=80 MHz
+wifinfo.menu.xtal.80.build.f_cpu=80000000L
+wifinfo.menu.xtal.160=160 MHz
+wifinfo.menu.xtal.160.build.f_cpu=160000000L
+wifinfo.menu.vt.flash=Flash
+wifinfo.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+wifinfo.menu.vt.heap=Heap
+wifinfo.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+wifinfo.menu.vt.iram=IRAM
+wifinfo.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+wifinfo.menu.exception.legacy=Legacy (new can return nullptr)
+wifinfo.menu.exception.legacy.build.exception_flags=-fno-exceptions
+wifinfo.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+wifinfo.menu.exception.disabled=Disabled (new can abort)
+wifinfo.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+wifinfo.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+wifinfo.menu.exception.enabled=Enabled
+wifinfo.menu.exception.enabled.build.exception_flags=-fexceptions
+wifinfo.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+wifinfo.menu.ssl.all=All SSL ciphers (most compatible)
+wifinfo.menu.ssl.all.build.sslflags=
+wifinfo.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+wifinfo.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+wifinfo.upload.resetmethod=--before default_reset --after hard_reset
+wifinfo.build.flash_mode=qio
+wifinfo.build.flash_flags=-DFLASHMODE_QIO
+wifinfo.menu.FlashFreq.40=40MHz
+wifinfo.menu.FlashFreq.40.build.flash_freq=40
+wifinfo.menu.FlashFreq.80=80MHz
+wifinfo.menu.FlashFreq.80.build.flash_freq=80
+wifinfo.menu.FlashFreq.20=20MHz
+wifinfo.menu.FlashFreq.20.build.flash_freq=20
+wifinfo.menu.FlashFreq.26=26MHz
+wifinfo.menu.FlashFreq.26.build.flash_freq=26
+wifinfo.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+wifinfo.menu.eesz.1M64.build.flash_size=1M
+wifinfo.menu.eesz.1M64.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+wifinfo.menu.eesz.1M64.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M64.upload.maximum_size=958448
+wifinfo.menu.eesz.1M64.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M64.build.spiffs_start=0xEB000
+wifinfo.menu.eesz.1M64.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M64.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+wifinfo.menu.eesz.1M128.build.flash_size=1M
+wifinfo.menu.eesz.1M128.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+wifinfo.menu.eesz.1M128.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M128.upload.maximum_size=892912
+wifinfo.menu.eesz.1M128.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M128.build.spiffs_start=0xDB000
+wifinfo.menu.eesz.1M128.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M128.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+wifinfo.menu.eesz.1M144.build.flash_size=1M
+wifinfo.menu.eesz.1M144.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+wifinfo.menu.eesz.1M144.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M144.upload.maximum_size=876528
+wifinfo.menu.eesz.1M144.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M144.build.spiffs_start=0xD7000
+wifinfo.menu.eesz.1M144.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M144.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+wifinfo.menu.eesz.1M160.build.flash_size=1M
+wifinfo.menu.eesz.1M160.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+wifinfo.menu.eesz.1M160.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M160.upload.maximum_size=860144
+wifinfo.menu.eesz.1M160.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M160.build.spiffs_start=0xD3000
+wifinfo.menu.eesz.1M160.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M160.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+wifinfo.menu.eesz.1M192.build.flash_size=1M
+wifinfo.menu.eesz.1M192.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+wifinfo.menu.eesz.1M192.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M192.upload.maximum_size=827376
+wifinfo.menu.eesz.1M192.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M192.build.spiffs_start=0xCB000
+wifinfo.menu.eesz.1M192.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M192.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+wifinfo.menu.eesz.1M256.build.flash_size=1M
+wifinfo.menu.eesz.1M256.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+wifinfo.menu.eesz.1M256.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M256.upload.maximum_size=761840
+wifinfo.menu.eesz.1M256.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M256.build.spiffs_start=0xBB000
+wifinfo.menu.eesz.1M256.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M256.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+wifinfo.menu.eesz.1M512.build.flash_size=1M
+wifinfo.menu.eesz.1M512.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+wifinfo.menu.eesz.1M512.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M512.upload.maximum_size=499696
+wifinfo.menu.eesz.1M512.build.rfcal_addr=0xFC000
+wifinfo.menu.eesz.1M512.build.spiffs_start=0x7B000
+wifinfo.menu.eesz.1M512.build.spiffs_end=0xFB000
+wifinfo.menu.eesz.1M512.build.spiffs_blocksize=8192
+wifinfo.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+wifinfo.menu.eesz.1M.build.flash_size=1M
+wifinfo.menu.eesz.1M.build.flash_size_bytes=0x100000
+wifinfo.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+wifinfo.menu.eesz.1M.build.spiffs_pagesize=256
+wifinfo.menu.eesz.1M.upload.maximum_size=1023984
+wifinfo.menu.eesz.1M.build.rfcal_addr=0xFC000
+wifinfo.menu.ip.lm2f=v2 Lower Memory
+wifinfo.menu.ip.lm2f.build.lwip_include=lwip2/include
+wifinfo.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+wifinfo.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifinfo.menu.ip.hb2f=v2 Higher Bandwidth
+wifinfo.menu.ip.hb2f.build.lwip_include=lwip2/include
+wifinfo.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+wifinfo.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifinfo.menu.ip.lm2n=v2 Lower Memory (no features)
+wifinfo.menu.ip.lm2n.build.lwip_include=lwip2/include
+wifinfo.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+wifinfo.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifinfo.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+wifinfo.menu.ip.hb2n.build.lwip_include=lwip2/include
+wifinfo.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+wifinfo.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifinfo.menu.ip.lm6f=v2 IPv6 Lower Memory
+wifinfo.menu.ip.lm6f.build.lwip_include=lwip2/include
+wifinfo.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+wifinfo.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifinfo.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+wifinfo.menu.ip.hb6f.build.lwip_include=lwip2/include
+wifinfo.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+wifinfo.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifinfo.menu.ip.hb1=v1.4 Higher Bandwidth
+wifinfo.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+wifinfo.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+wifinfo.menu.ip.src=v1.4 Compile from source
+wifinfo.menu.ip.src.build.lwip_lib=-llwip_src
+wifinfo.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+wifinfo.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+wifinfo.menu.dbg.Disabled=Disabled
+wifinfo.menu.dbg.Disabled.build.debug_port=
+wifinfo.menu.dbg.Serial=Serial
+wifinfo.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+wifinfo.menu.dbg.Serial1=Serial1
+wifinfo.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+wifinfo.menu.lvl.None____=None
+wifinfo.menu.lvl.None____.build.debug_level=
+wifinfo.menu.lvl.SSL=SSL
+wifinfo.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+wifinfo.menu.lvl.TLS_MEM=TLS_MEM
+wifinfo.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+wifinfo.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+wifinfo.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+wifinfo.menu.lvl.HTTP_SERVER=HTTP_SERVER
+wifinfo.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+wifinfo.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+wifinfo.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+wifinfo.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+wifinfo.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+wifinfo.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+wifinfo.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifinfo.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+wifinfo.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+wifinfo.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+wifinfo.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifinfo.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifinfo.menu.lvl.CORE=CORE
+wifinfo.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+wifinfo.menu.lvl.WIFI=WIFI
+wifinfo.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+wifinfo.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+wifinfo.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+wifinfo.menu.lvl.UPDATER=UPDATER
+wifinfo.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+wifinfo.menu.lvl.OTA=OTA
+wifinfo.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+wifinfo.menu.lvl.OOM=OOM
+wifinfo.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+wifinfo.menu.lvl.MDNS=MDNS
+wifinfo.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+wifinfo.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifinfo.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifinfo.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+wifinfo.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+wifinfo.menu.wipe.none=Only Sketch
+wifinfo.menu.wipe.none.upload.erase_cmd=
+wifinfo.menu.wipe.sdk=Sketch + WiFi Settings
+wifinfo.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+wifinfo.menu.wipe.all=All Flash Contents
+wifinfo.menu.wipe.all.upload.erase_cmd=erase_flash
+wifinfo.menu.baud.115200=115200
+wifinfo.menu.baud.115200.upload.speed=115200
+wifinfo.menu.baud.57600=57600
+wifinfo.menu.baud.57600.upload.speed=57600
+wifinfo.menu.baud.230400.linux=230400
+wifinfo.menu.baud.230400.macosx=230400
+wifinfo.menu.baud.230400.upload.speed=230400
+wifinfo.menu.baud.256000.windows=256000
+wifinfo.menu.baud.256000.upload.speed=256000
+wifinfo.menu.baud.460800.linux=460800
+wifinfo.menu.baud.460800.macosx=460800
+wifinfo.menu.baud.460800.upload.speed=460800
+wifinfo.menu.baud.512000.windows=512000
+wifinfo.menu.baud.512000.upload.speed=512000
+wifinfo.menu.baud.921600=921600
+wifinfo.menu.baud.921600.upload.speed=921600
+wifinfo.menu.baud.3000000=3000000
+wifinfo.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+arduino-esp8266.name=Arduino
+arduino-esp8266.build.board=ESP8266_ARDUINO
+arduino-esp8266.menu.BoardModel.primo=Primo
+arduino-esp8266.menu.BoardModel.primo.build.board=ESP8266_ARDUINO_PRIMO
+arduino-esp8266.menu.BoardModel.primo.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.primo.build.variant=arduino_spi
+arduino-esp8266.menu.BoardModel.starottodeved=Star OTTO
+arduino-esp8266.menu.BoardModel.starottodeved.build.board=ESP8266_ARDUINO_STAR_OTTO
+arduino-esp8266.menu.BoardModel.starottodeved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.starottodeved.build.variant=arduino_uart
+arduino-esp8266.menu.BoardModel.unowifideved=Uno WiFi
+arduino-esp8266.menu.BoardModel.unowifideved.build.board=ESP8266_ARDUINO_UNOWIFI
+arduino-esp8266.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
+arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
+arduino-esp8266.upload.tool=esptool
+arduino-esp8266.upload.maximum_data_size=81920
+arduino-esp8266.upload.wait_for_upload_port=true
+arduino-esp8266.upload.erase_cmd=
+arduino-esp8266.serial.disableDTR=true
+arduino-esp8266.serial.disableRTS=true
+arduino-esp8266.build.mcu=esp8266
+arduino-esp8266.build.core=esp8266
+arduino-esp8266.build.variant=generic
+arduino-esp8266.build.spiffs_pagesize=256
+arduino-esp8266.build.debug_port=
+arduino-esp8266.build.debug_level=
+arduino-esp8266.menu.xtal.80=80 MHz
+arduino-esp8266.menu.xtal.80.build.f_cpu=80000000L
+arduino-esp8266.menu.xtal.160=160 MHz
+arduino-esp8266.menu.xtal.160.build.f_cpu=160000000L
+arduino-esp8266.menu.vt.flash=Flash
+arduino-esp8266.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+arduino-esp8266.menu.vt.heap=Heap
+arduino-esp8266.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+arduino-esp8266.menu.vt.iram=IRAM
+arduino-esp8266.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+arduino-esp8266.menu.exception.legacy=Legacy (new can return nullptr)
+arduino-esp8266.menu.exception.legacy.build.exception_flags=-fno-exceptions
+arduino-esp8266.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+arduino-esp8266.menu.exception.disabled=Disabled (new can abort)
+arduino-esp8266.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+arduino-esp8266.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+arduino-esp8266.menu.exception.enabled=Enabled
+arduino-esp8266.menu.exception.enabled.build.exception_flags=-fexceptions
+arduino-esp8266.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+arduino-esp8266.menu.ssl.all=All SSL ciphers (most compatible)
+arduino-esp8266.menu.ssl.all.build.sslflags=
+arduino-esp8266.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+arduino-esp8266.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+arduino-esp8266.upload.resetmethod=--before no_reset --after soft_reset
+arduino-esp8266.build.flash_mode=qio
+arduino-esp8266.build.flash_flags=-DFLASHMODE_QIO
+arduino-esp8266.build.flash_freq=40
+arduino-esp8266.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+arduino-esp8266.menu.eesz.4M2M.build.flash_size=4M
+arduino-esp8266.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+arduino-esp8266.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+arduino-esp8266.menu.eesz.4M2M.build.spiffs_pagesize=256
+arduino-esp8266.menu.eesz.4M2M.upload.maximum_size=1044464
+arduino-esp8266.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+arduino-esp8266.menu.eesz.4M2M.build.spiffs_start=0x200000
+arduino-esp8266.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+arduino-esp8266.menu.eesz.4M2M.build.spiffs_blocksize=8192
+arduino-esp8266.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+arduino-esp8266.menu.eesz.4M3M.build.flash_size=4M
+arduino-esp8266.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+arduino-esp8266.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+arduino-esp8266.menu.eesz.4M3M.build.spiffs_pagesize=256
+arduino-esp8266.menu.eesz.4M3M.upload.maximum_size=1044464
+arduino-esp8266.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+arduino-esp8266.menu.eesz.4M3M.build.spiffs_start=0x100000
+arduino-esp8266.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+arduino-esp8266.menu.eesz.4M3M.build.spiffs_blocksize=8192
+arduino-esp8266.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+arduino-esp8266.menu.eesz.4M1M.build.flash_size=4M
+arduino-esp8266.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+arduino-esp8266.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+arduino-esp8266.menu.eesz.4M1M.build.spiffs_pagesize=256
+arduino-esp8266.menu.eesz.4M1M.upload.maximum_size=1044464
+arduino-esp8266.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+arduino-esp8266.menu.eesz.4M1M.build.spiffs_start=0x300000
+arduino-esp8266.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+arduino-esp8266.menu.eesz.4M1M.build.spiffs_blocksize=8192
+arduino-esp8266.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+arduino-esp8266.menu.eesz.4M.build.flash_size=4M
+arduino-esp8266.menu.eesz.4M.build.flash_size_bytes=0x400000
+arduino-esp8266.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+arduino-esp8266.menu.eesz.4M.build.spiffs_pagesize=256
+arduino-esp8266.menu.eesz.4M.upload.maximum_size=1044464
+arduino-esp8266.menu.eesz.4M.build.rfcal_addr=0x3FC000
+arduino-esp8266.menu.ip.lm2f=v2 Lower Memory
+arduino-esp8266.menu.ip.lm2f.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+arduino-esp8266.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+arduino-esp8266.menu.ip.hb2f=v2 Higher Bandwidth
+arduino-esp8266.menu.ip.hb2f.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+arduino-esp8266.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+arduino-esp8266.menu.ip.lm2n=v2 Lower Memory (no features)
+arduino-esp8266.menu.ip.lm2n.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+arduino-esp8266.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+arduino-esp8266.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+arduino-esp8266.menu.ip.hb2n.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+arduino-esp8266.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+arduino-esp8266.menu.ip.lm6f=v2 IPv6 Lower Memory
+arduino-esp8266.menu.ip.lm6f.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+arduino-esp8266.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+arduino-esp8266.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+arduino-esp8266.menu.ip.hb6f.build.lwip_include=lwip2/include
+arduino-esp8266.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+arduino-esp8266.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+arduino-esp8266.menu.ip.hb1=v1.4 Higher Bandwidth
+arduino-esp8266.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+arduino-esp8266.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+arduino-esp8266.menu.ip.src=v1.4 Compile from source
+arduino-esp8266.menu.ip.src.build.lwip_lib=-llwip_src
+arduino-esp8266.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+arduino-esp8266.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+arduino-esp8266.menu.dbg.Disabled=Disabled
+arduino-esp8266.menu.dbg.Disabled.build.debug_port=
+arduino-esp8266.menu.dbg.Serial=Serial
+arduino-esp8266.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+arduino-esp8266.menu.dbg.Serial1=Serial1
+arduino-esp8266.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+arduino-esp8266.menu.lvl.None____=None
+arduino-esp8266.menu.lvl.None____.build.debug_level=
+arduino-esp8266.menu.lvl.SSL=SSL
+arduino-esp8266.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+arduino-esp8266.menu.lvl.TLS_MEM=TLS_MEM
+arduino-esp8266.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+arduino-esp8266.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+arduino-esp8266.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+arduino-esp8266.menu.lvl.HTTP_SERVER=HTTP_SERVER
+arduino-esp8266.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+arduino-esp8266.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+arduino-esp8266.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+arduino-esp8266.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+arduino-esp8266.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+arduino-esp8266.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+arduino-esp8266.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+arduino-esp8266.menu.lvl.CORE=CORE
+arduino-esp8266.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+arduino-esp8266.menu.lvl.WIFI=WIFI
+arduino-esp8266.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+arduino-esp8266.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+arduino-esp8266.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+arduino-esp8266.menu.lvl.UPDATER=UPDATER
+arduino-esp8266.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+arduino-esp8266.menu.lvl.OTA=OTA
+arduino-esp8266.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+arduino-esp8266.menu.lvl.OOM=OOM
+arduino-esp8266.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+arduino-esp8266.menu.lvl.MDNS=MDNS
+arduino-esp8266.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+arduino-esp8266.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+arduino-esp8266.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+arduino-esp8266.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+arduino-esp8266.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+arduino-esp8266.menu.wipe.none=Only Sketch
+arduino-esp8266.menu.wipe.none.upload.erase_cmd=
+arduino-esp8266.menu.wipe.sdk=Sketch + WiFi Settings
+arduino-esp8266.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+arduino-esp8266.menu.wipe.all=All Flash Contents
+arduino-esp8266.menu.wipe.all.upload.erase_cmd=erase_flash
+arduino-esp8266.menu.baud.115200=115200
+arduino-esp8266.menu.baud.115200.upload.speed=115200
+arduino-esp8266.menu.baud.57600=57600
+arduino-esp8266.menu.baud.57600.upload.speed=57600
+arduino-esp8266.menu.baud.230400.linux=230400
+arduino-esp8266.menu.baud.230400.macosx=230400
+arduino-esp8266.menu.baud.230400.upload.speed=230400
+arduino-esp8266.menu.baud.256000.windows=256000
+arduino-esp8266.menu.baud.256000.upload.speed=256000
+arduino-esp8266.menu.baud.460800.linux=460800
+arduino-esp8266.menu.baud.460800.macosx=460800
+arduino-esp8266.menu.baud.460800.upload.speed=460800
+arduino-esp8266.menu.baud.512000.windows=512000
+arduino-esp8266.menu.baud.512000.upload.speed=512000
+arduino-esp8266.menu.baud.921600=921600
+arduino-esp8266.menu.baud.921600.upload.speed=921600
+arduino-esp8266.menu.baud.3000000=3000000
+arduino-esp8266.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+gen4iod.name=4D Systems gen4 IoD Range
+gen4iod.build.board=GEN4_IOD
+gen4iod.build.f_cpu=160000000L
+gen4iod.build.variant=generic
+gen4iod.upload.tool=esptool
+gen4iod.upload.maximum_data_size=81920
+gen4iod.upload.wait_for_upload_port=true
+gen4iod.upload.erase_cmd=
+gen4iod.serial.disableDTR=true
+gen4iod.serial.disableRTS=true
+gen4iod.build.mcu=esp8266
+gen4iod.build.core=esp8266
+gen4iod.build.spiffs_pagesize=256
+gen4iod.build.debug_port=
+gen4iod.build.debug_level=
+gen4iod.menu.xtal.80=80 MHz
+gen4iod.menu.xtal.80.build.f_cpu=80000000L
+gen4iod.menu.xtal.160=160 MHz
+gen4iod.menu.xtal.160.build.f_cpu=160000000L
+gen4iod.menu.vt.flash=Flash
+gen4iod.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+gen4iod.menu.vt.heap=Heap
+gen4iod.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+gen4iod.menu.vt.iram=IRAM
+gen4iod.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+gen4iod.menu.exception.legacy=Legacy (new can return nullptr)
+gen4iod.menu.exception.legacy.build.exception_flags=-fno-exceptions
+gen4iod.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+gen4iod.menu.exception.disabled=Disabled (new can abort)
+gen4iod.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+gen4iod.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+gen4iod.menu.exception.enabled=Enabled
+gen4iod.menu.exception.enabled.build.exception_flags=-fexceptions
+gen4iod.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+gen4iod.menu.ssl.all=All SSL ciphers (most compatible)
+gen4iod.menu.ssl.all.build.sslflags=
+gen4iod.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+gen4iod.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+gen4iod.upload.resetmethod=--before default_reset --after hard_reset
+gen4iod.build.flash_mode=dio
+gen4iod.build.flash_flags=-DFLASHMODE_DIO
+gen4iod.build.flash_freq=80
+gen4iod.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
+gen4iod.menu.eesz.512K32.build.flash_size=512K
+gen4iod.menu.eesz.512K32.build.flash_size_bytes=0x80000
+gen4iod.menu.eesz.512K32.build.flash_ld=eagle.flash.512k32.ld
+gen4iod.menu.eesz.512K32.build.spiffs_pagesize=256
+gen4iod.menu.eesz.512K32.upload.maximum_size=466928
+gen4iod.menu.eesz.512K32.build.rfcal_addr=0x7C000
+gen4iod.menu.eesz.512K32.build.spiffs_start=0x73000
+gen4iod.menu.eesz.512K32.build.spiffs_end=0x7B000
+gen4iod.menu.eesz.512K32.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.512K64=512KB (FS:64KB OTA:~214KB)
+gen4iod.menu.eesz.512K64.build.flash_size=512K
+gen4iod.menu.eesz.512K64.build.flash_size_bytes=0x80000
+gen4iod.menu.eesz.512K64.build.flash_ld=eagle.flash.512k64.ld
+gen4iod.menu.eesz.512K64.build.spiffs_pagesize=256
+gen4iod.menu.eesz.512K64.upload.maximum_size=434160
+gen4iod.menu.eesz.512K64.build.rfcal_addr=0x7C000
+gen4iod.menu.eesz.512K64.build.spiffs_start=0x6B000
+gen4iod.menu.eesz.512K64.build.spiffs_end=0x7B000
+gen4iod.menu.eesz.512K64.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.512K128=512KB (FS:128KB OTA:~182KB)
+gen4iod.menu.eesz.512K128.build.flash_size=512K
+gen4iod.menu.eesz.512K128.build.flash_size_bytes=0x80000
+gen4iod.menu.eesz.512K128.build.flash_ld=eagle.flash.512k128.ld
+gen4iod.menu.eesz.512K128.build.spiffs_pagesize=256
+gen4iod.menu.eesz.512K128.upload.maximum_size=368624
+gen4iod.menu.eesz.512K128.build.rfcal_addr=0x7C000
+gen4iod.menu.eesz.512K128.build.spiffs_start=0x5B000
+gen4iod.menu.eesz.512K128.build.spiffs_end=0x7B000
+gen4iod.menu.eesz.512K128.build.spiffs_blocksize=4096
+gen4iod.menu.eesz.512K=512KB (FS:none OTA:~246KB)
+gen4iod.menu.eesz.512K.build.flash_size=512K
+gen4iod.menu.eesz.512K.build.flash_size_bytes=0x80000
+gen4iod.menu.eesz.512K.build.flash_ld=eagle.flash.512k.ld
+gen4iod.menu.eesz.512K.build.spiffs_pagesize=256
+gen4iod.menu.eesz.512K.upload.maximum_size=499696
+gen4iod.menu.eesz.512K.build.rfcal_addr=0x7C000
+gen4iod.menu.ip.lm2f=v2 Lower Memory
+gen4iod.menu.ip.lm2f.build.lwip_include=lwip2/include
+gen4iod.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+gen4iod.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+gen4iod.menu.ip.hb2f=v2 Higher Bandwidth
+gen4iod.menu.ip.hb2f.build.lwip_include=lwip2/include
+gen4iod.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+gen4iod.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+gen4iod.menu.ip.lm2n=v2 Lower Memory (no features)
+gen4iod.menu.ip.lm2n.build.lwip_include=lwip2/include
+gen4iod.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+gen4iod.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+gen4iod.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+gen4iod.menu.ip.hb2n.build.lwip_include=lwip2/include
+gen4iod.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+gen4iod.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+gen4iod.menu.ip.lm6f=v2 IPv6 Lower Memory
+gen4iod.menu.ip.lm6f.build.lwip_include=lwip2/include
+gen4iod.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+gen4iod.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+gen4iod.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+gen4iod.menu.ip.hb6f.build.lwip_include=lwip2/include
+gen4iod.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+gen4iod.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+gen4iod.menu.ip.hb1=v1.4 Higher Bandwidth
+gen4iod.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+gen4iod.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+gen4iod.menu.ip.src=v1.4 Compile from source
+gen4iod.menu.ip.src.build.lwip_lib=-llwip_src
+gen4iod.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+gen4iod.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+gen4iod.menu.dbg.Disabled=Disabled
+gen4iod.menu.dbg.Disabled.build.debug_port=
+gen4iod.menu.dbg.Serial=Serial
+gen4iod.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+gen4iod.menu.dbg.Serial1=Serial1
+gen4iod.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+gen4iod.menu.lvl.None____=None
+gen4iod.menu.lvl.None____.build.debug_level=
+gen4iod.menu.lvl.SSL=SSL
+gen4iod.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+gen4iod.menu.lvl.TLS_MEM=TLS_MEM
+gen4iod.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+gen4iod.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+gen4iod.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+gen4iod.menu.lvl.HTTP_SERVER=HTTP_SERVER
+gen4iod.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+gen4iod.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+gen4iod.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+gen4iod.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+gen4iod.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+gen4iod.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+gen4iod.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+gen4iod.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+gen4iod.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+gen4iod.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+gen4iod.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+gen4iod.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+gen4iod.menu.lvl.CORE=CORE
+gen4iod.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+gen4iod.menu.lvl.WIFI=WIFI
+gen4iod.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+gen4iod.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+gen4iod.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+gen4iod.menu.lvl.UPDATER=UPDATER
+gen4iod.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+gen4iod.menu.lvl.OTA=OTA
+gen4iod.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+gen4iod.menu.lvl.OOM=OOM
+gen4iod.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+gen4iod.menu.lvl.MDNS=MDNS
+gen4iod.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+gen4iod.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+gen4iod.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+gen4iod.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+gen4iod.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+gen4iod.menu.wipe.none=Only Sketch
+gen4iod.menu.wipe.none.upload.erase_cmd=
+gen4iod.menu.wipe.sdk=Sketch + WiFi Settings
+gen4iod.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+gen4iod.menu.wipe.all=All Flash Contents
+gen4iod.menu.wipe.all.upload.erase_cmd=erase_flash
+gen4iod.menu.baud.115200=115200
+gen4iod.menu.baud.115200.upload.speed=115200
+gen4iod.menu.baud.57600=57600
+gen4iod.menu.baud.57600.upload.speed=57600
+gen4iod.menu.baud.230400.linux=230400
+gen4iod.menu.baud.230400.macosx=230400
+gen4iod.menu.baud.230400.upload.speed=230400
+gen4iod.menu.baud.256000.windows=256000
+gen4iod.menu.baud.256000.upload.speed=256000
+gen4iod.menu.baud.460800.linux=460800
+gen4iod.menu.baud.460800.macosx=460800
+gen4iod.menu.baud.460800.upload.speed=460800
+gen4iod.menu.baud.512000.windows=512000
+gen4iod.menu.baud.512000.upload.speed=512000
+gen4iod.menu.baud.921600=921600
+gen4iod.menu.baud.921600.upload.speed=921600
+gen4iod.menu.baud.3000000=3000000
+gen4iod.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+oak.name=Digistump Oak
+oak.build.board=ESP8266_OAK
+oak.build.variant=oak
+oak.upload.maximum_size=1040368
+oak.upload.tool=esptool
+oak.upload.maximum_data_size=81920
+oak.upload.wait_for_upload_port=true
+oak.upload.erase_cmd=
+oak.serial.disableDTR=true
+oak.serial.disableRTS=true
+oak.build.mcu=esp8266
+oak.build.core=esp8266
+oak.build.spiffs_pagesize=256
+oak.build.debug_port=
+oak.build.debug_level=
+oak.menu.xtal.80=80 MHz
+oak.menu.xtal.80.build.f_cpu=80000000L
+oak.menu.xtal.160=160 MHz
+oak.menu.xtal.160.build.f_cpu=160000000L
+oak.menu.vt.flash=Flash
+oak.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+oak.menu.vt.heap=Heap
+oak.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+oak.menu.vt.iram=IRAM
+oak.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+oak.menu.exception.legacy=Legacy (new can return nullptr)
+oak.menu.exception.legacy.build.exception_flags=-fno-exceptions
+oak.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+oak.menu.exception.disabled=Disabled (new can abort)
+oak.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+oak.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+oak.menu.exception.enabled=Enabled
+oak.menu.exception.enabled.build.exception_flags=-fexceptions
+oak.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+oak.menu.ssl.all=All SSL ciphers (most compatible)
+oak.menu.ssl.all.build.sslflags=
+oak.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+oak.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+oak.upload.resetmethod=--before no_reset --after soft_reset
+oak.build.flash_mode=dio
+oak.build.flash_flags=-DFLASHMODE_DIO
+oak.build.flash_freq=40
+oak.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+oak.menu.eesz.4M2M.build.flash_size=4M
+oak.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+oak.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+oak.menu.eesz.4M2M.build.spiffs_pagesize=256
+oak.menu.eesz.4M2M.upload.maximum_size=1044464
+oak.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+oak.menu.eesz.4M2M.build.spiffs_start=0x200000
+oak.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+oak.menu.eesz.4M2M.build.spiffs_blocksize=8192
+oak.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+oak.menu.eesz.4M3M.build.flash_size=4M
+oak.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+oak.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+oak.menu.eesz.4M3M.build.spiffs_pagesize=256
+oak.menu.eesz.4M3M.upload.maximum_size=1044464
+oak.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+oak.menu.eesz.4M3M.build.spiffs_start=0x100000
+oak.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+oak.menu.eesz.4M3M.build.spiffs_blocksize=8192
+oak.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+oak.menu.eesz.4M1M.build.flash_size=4M
+oak.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+oak.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+oak.menu.eesz.4M1M.build.spiffs_pagesize=256
+oak.menu.eesz.4M1M.upload.maximum_size=1044464
+oak.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+oak.menu.eesz.4M1M.build.spiffs_start=0x300000
+oak.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+oak.menu.eesz.4M1M.build.spiffs_blocksize=8192
+oak.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+oak.menu.eesz.4M.build.flash_size=4M
+oak.menu.eesz.4M.build.flash_size_bytes=0x400000
+oak.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+oak.menu.eesz.4M.build.spiffs_pagesize=256
+oak.menu.eesz.4M.upload.maximum_size=1044464
+oak.menu.eesz.4M.build.rfcal_addr=0x3FC000
+oak.menu.ip.lm2f=v2 Lower Memory
+oak.menu.ip.lm2f.build.lwip_include=lwip2/include
+oak.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+oak.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+oak.menu.ip.hb2f=v2 Higher Bandwidth
+oak.menu.ip.hb2f.build.lwip_include=lwip2/include
+oak.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+oak.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+oak.menu.ip.lm2n=v2 Lower Memory (no features)
+oak.menu.ip.lm2n.build.lwip_include=lwip2/include
+oak.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+oak.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+oak.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+oak.menu.ip.hb2n.build.lwip_include=lwip2/include
+oak.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+oak.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+oak.menu.ip.lm6f=v2 IPv6 Lower Memory
+oak.menu.ip.lm6f.build.lwip_include=lwip2/include
+oak.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+oak.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+oak.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+oak.menu.ip.hb6f.build.lwip_include=lwip2/include
+oak.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+oak.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+oak.menu.ip.hb1=v1.4 Higher Bandwidth
+oak.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+oak.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+oak.menu.ip.src=v1.4 Compile from source
+oak.menu.ip.src.build.lwip_lib=-llwip_src
+oak.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+oak.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+oak.menu.dbg.Disabled=Disabled
+oak.menu.dbg.Disabled.build.debug_port=
+oak.menu.dbg.Serial=Serial
+oak.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+oak.menu.dbg.Serial1=Serial1
+oak.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+oak.menu.lvl.None____=None
+oak.menu.lvl.None____.build.debug_level=
+oak.menu.lvl.SSL=SSL
+oak.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+oak.menu.lvl.TLS_MEM=TLS_MEM
+oak.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+oak.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+oak.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+oak.menu.lvl.HTTP_SERVER=HTTP_SERVER
+oak.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+oak.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+oak.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+oak.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+oak.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+oak.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+oak.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+oak.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+oak.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+oak.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+oak.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+oak.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+oak.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+oak.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+oak.menu.lvl.CORE=CORE
+oak.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+oak.menu.lvl.WIFI=WIFI
+oak.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+oak.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+oak.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+oak.menu.lvl.UPDATER=UPDATER
+oak.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+oak.menu.lvl.OTA=OTA
+oak.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+oak.menu.lvl.OOM=OOM
+oak.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+oak.menu.lvl.MDNS=MDNS
+oak.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+oak.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+oak.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+oak.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+oak.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+oak.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+oak.menu.wipe.none=Only Sketch
+oak.menu.wipe.none.upload.erase_cmd=
+oak.menu.wipe.sdk=Sketch + WiFi Settings
+oak.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+oak.menu.wipe.all=All Flash Contents
+oak.menu.wipe.all.upload.erase_cmd=erase_flash
+oak.menu.baud.921600=921600
+oak.menu.baud.921600.upload.speed=921600
+oak.menu.baud.57600=57600
+oak.menu.baud.57600.upload.speed=57600
+oak.menu.baud.115200=115200
+oak.menu.baud.115200.upload.speed=115200
+oak.menu.baud.230400.linux=230400
+oak.menu.baud.230400.macosx=230400
+oak.menu.baud.230400.upload.speed=230400
+oak.menu.baud.256000.windows=256000
+oak.menu.baud.256000.upload.speed=256000
+oak.menu.baud.460800.linux=460800
+oak.menu.baud.460800.macosx=460800
+oak.menu.baud.460800.upload.speed=460800
+oak.menu.baud.512000.windows=512000
+oak.menu.baud.512000.upload.speed=512000
+oak.menu.baud.3000000=3000000
+oak.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+wifiduino.name=WiFiduino
+wifiduino.build.board=WIFIDUINO_ESP8266
+wifiduino.build.variant=wifiduino
+wifiduino.upload.tool=esptool
+wifiduino.upload.maximum_data_size=81920
+wifiduino.upload.wait_for_upload_port=true
+wifiduino.upload.erase_cmd=
+wifiduino.serial.disableDTR=true
+wifiduino.serial.disableRTS=true
+wifiduino.build.mcu=esp8266
+wifiduino.build.core=esp8266
+wifiduino.build.spiffs_pagesize=256
+wifiduino.build.debug_port=
+wifiduino.build.debug_level=
+wifiduino.menu.xtal.80=80 MHz
+wifiduino.menu.xtal.80.build.f_cpu=80000000L
+wifiduino.menu.xtal.160=160 MHz
+wifiduino.menu.xtal.160.build.f_cpu=160000000L
+wifiduino.menu.vt.flash=Flash
+wifiduino.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+wifiduino.menu.vt.heap=Heap
+wifiduino.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+wifiduino.menu.vt.iram=IRAM
+wifiduino.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+wifiduino.menu.exception.legacy=Legacy (new can return nullptr)
+wifiduino.menu.exception.legacy.build.exception_flags=-fno-exceptions
+wifiduino.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+wifiduino.menu.exception.disabled=Disabled (new can abort)
+wifiduino.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+wifiduino.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+wifiduino.menu.exception.enabled=Enabled
+wifiduino.menu.exception.enabled.build.exception_flags=-fexceptions
+wifiduino.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+wifiduino.menu.ssl.all=All SSL ciphers (most compatible)
+wifiduino.menu.ssl.all.build.sslflags=
+wifiduino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+wifiduino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+wifiduino.upload.resetmethod=--before default_reset --after hard_reset
+wifiduino.build.flash_mode=dio
+wifiduino.build.flash_flags=-DFLASHMODE_DIO
+wifiduino.build.flash_freq=40
+wifiduino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+wifiduino.menu.eesz.4M2M.build.flash_size=4M
+wifiduino.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+wifiduino.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+wifiduino.menu.eesz.4M2M.build.spiffs_pagesize=256
+wifiduino.menu.eesz.4M2M.upload.maximum_size=1044464
+wifiduino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+wifiduino.menu.eesz.4M2M.build.spiffs_start=0x200000
+wifiduino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+wifiduino.menu.eesz.4M2M.build.spiffs_blocksize=8192
+wifiduino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+wifiduino.menu.eesz.4M3M.build.flash_size=4M
+wifiduino.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+wifiduino.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+wifiduino.menu.eesz.4M3M.build.spiffs_pagesize=256
+wifiduino.menu.eesz.4M3M.upload.maximum_size=1044464
+wifiduino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+wifiduino.menu.eesz.4M3M.build.spiffs_start=0x100000
+wifiduino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+wifiduino.menu.eesz.4M3M.build.spiffs_blocksize=8192
+wifiduino.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+wifiduino.menu.eesz.4M1M.build.flash_size=4M
+wifiduino.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+wifiduino.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+wifiduino.menu.eesz.4M1M.build.spiffs_pagesize=256
+wifiduino.menu.eesz.4M1M.upload.maximum_size=1044464
+wifiduino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+wifiduino.menu.eesz.4M1M.build.spiffs_start=0x300000
+wifiduino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+wifiduino.menu.eesz.4M1M.build.spiffs_blocksize=8192
+wifiduino.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+wifiduino.menu.eesz.4M.build.flash_size=4M
+wifiduino.menu.eesz.4M.build.flash_size_bytes=0x400000
+wifiduino.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+wifiduino.menu.eesz.4M.build.spiffs_pagesize=256
+wifiduino.menu.eesz.4M.upload.maximum_size=1044464
+wifiduino.menu.eesz.4M.build.rfcal_addr=0x3FC000
+wifiduino.menu.ip.lm2f=v2 Lower Memory
+wifiduino.menu.ip.lm2f.build.lwip_include=lwip2/include
+wifiduino.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+wifiduino.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifiduino.menu.ip.hb2f=v2 Higher Bandwidth
+wifiduino.menu.ip.hb2f.build.lwip_include=lwip2/include
+wifiduino.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+wifiduino.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifiduino.menu.ip.lm2n=v2 Lower Memory (no features)
+wifiduino.menu.ip.lm2n.build.lwip_include=lwip2/include
+wifiduino.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+wifiduino.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifiduino.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+wifiduino.menu.ip.hb2n.build.lwip_include=lwip2/include
+wifiduino.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+wifiduino.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifiduino.menu.ip.lm6f=v2 IPv6 Lower Memory
+wifiduino.menu.ip.lm6f.build.lwip_include=lwip2/include
+wifiduino.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+wifiduino.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifiduino.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+wifiduino.menu.ip.hb6f.build.lwip_include=lwip2/include
+wifiduino.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+wifiduino.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifiduino.menu.ip.hb1=v1.4 Higher Bandwidth
+wifiduino.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+wifiduino.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+wifiduino.menu.ip.src=v1.4 Compile from source
+wifiduino.menu.ip.src.build.lwip_lib=-llwip_src
+wifiduino.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+wifiduino.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+wifiduino.menu.dbg.Disabled=Disabled
+wifiduino.menu.dbg.Disabled.build.debug_port=
+wifiduino.menu.dbg.Serial=Serial
+wifiduino.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+wifiduino.menu.dbg.Serial1=Serial1
+wifiduino.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+wifiduino.menu.lvl.None____=None
+wifiduino.menu.lvl.None____.build.debug_level=
+wifiduino.menu.lvl.SSL=SSL
+wifiduino.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+wifiduino.menu.lvl.TLS_MEM=TLS_MEM
+wifiduino.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+wifiduino.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+wifiduino.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+wifiduino.menu.lvl.HTTP_SERVER=HTTP_SERVER
+wifiduino.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+wifiduino.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+wifiduino.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+wifiduino.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+wifiduino.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+wifiduino.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+wifiduino.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifiduino.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+wifiduino.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+wifiduino.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+wifiduino.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifiduino.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifiduino.menu.lvl.CORE=CORE
+wifiduino.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+wifiduino.menu.lvl.WIFI=WIFI
+wifiduino.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+wifiduino.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+wifiduino.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+wifiduino.menu.lvl.UPDATER=UPDATER
+wifiduino.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+wifiduino.menu.lvl.OTA=OTA
+wifiduino.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+wifiduino.menu.lvl.OOM=OOM
+wifiduino.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+wifiduino.menu.lvl.MDNS=MDNS
+wifiduino.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+wifiduino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifiduino.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifiduino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+wifiduino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+wifiduino.menu.wipe.none=Only Sketch
+wifiduino.menu.wipe.none.upload.erase_cmd=
+wifiduino.menu.wipe.sdk=Sketch + WiFi Settings
+wifiduino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+wifiduino.menu.wipe.all=All Flash Contents
+wifiduino.menu.wipe.all.upload.erase_cmd=erase_flash
+wifiduino.menu.baud.921600=921600
+wifiduino.menu.baud.921600.upload.speed=921600
+wifiduino.menu.baud.57600=57600
+wifiduino.menu.baud.57600.upload.speed=57600
+wifiduino.menu.baud.115200=115200
+wifiduino.menu.baud.115200.upload.speed=115200
+wifiduino.menu.baud.230400.linux=230400
+wifiduino.menu.baud.230400.macosx=230400
+wifiduino.menu.baud.230400.upload.speed=230400
+wifiduino.menu.baud.256000.windows=256000
+wifiduino.menu.baud.256000.upload.speed=256000
+wifiduino.menu.baud.460800.linux=460800
+wifiduino.menu.baud.460800.macosx=460800
+wifiduino.menu.baud.460800.upload.speed=460800
+wifiduino.menu.baud.512000.windows=512000
+wifiduino.menu.baud.512000.upload.speed=512000
+wifiduino.menu.baud.3000000=3000000
+wifiduino.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+wifi_slot.name=Amperka WiFi Slot
+wifi_slot.build.board=AMPERKA_WIFI_SLOT
+wifi_slot.build.variant=wifi_slot
+wifi_slot.upload.tool=esptool
+wifi_slot.upload.maximum_data_size=81920
+wifi_slot.upload.wait_for_upload_port=true
+wifi_slot.upload.erase_cmd=
+wifi_slot.serial.disableDTR=true
+wifi_slot.serial.disableRTS=true
+wifi_slot.build.mcu=esp8266
+wifi_slot.build.core=esp8266
+wifi_slot.build.spiffs_pagesize=256
+wifi_slot.build.debug_port=
+wifi_slot.build.debug_level=
+wifi_slot.menu.xtal.80=80 MHz
+wifi_slot.menu.xtal.80.build.f_cpu=80000000L
+wifi_slot.menu.xtal.160=160 MHz
+wifi_slot.menu.xtal.160.build.f_cpu=160000000L
+wifi_slot.menu.vt.flash=Flash
+wifi_slot.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+wifi_slot.menu.vt.heap=Heap
+wifi_slot.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+wifi_slot.menu.vt.iram=IRAM
+wifi_slot.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+wifi_slot.menu.exception.legacy=Legacy (new can return nullptr)
+wifi_slot.menu.exception.legacy.build.exception_flags=-fno-exceptions
+wifi_slot.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+wifi_slot.menu.exception.disabled=Disabled (new can abort)
+wifi_slot.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+wifi_slot.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+wifi_slot.menu.exception.enabled=Enabled
+wifi_slot.menu.exception.enabled.build.exception_flags=-fexceptions
+wifi_slot.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+wifi_slot.menu.ssl.all=All SSL ciphers (most compatible)
+wifi_slot.menu.ssl.all.build.sslflags=
+wifi_slot.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+wifi_slot.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+wifi_slot.upload.resetmethod=--before default_reset --after hard_reset
+wifi_slot.menu.FlashFreq.40=40MHz
+wifi_slot.menu.FlashFreq.40.build.flash_freq=40
+wifi_slot.menu.FlashFreq.80=80MHz
+wifi_slot.menu.FlashFreq.80.build.flash_freq=80
+wifi_slot.menu.FlashFreq.20=20MHz
+wifi_slot.menu.FlashFreq.20.build.flash_freq=20
+wifi_slot.menu.FlashFreq.26=26MHz
+wifi_slot.menu.FlashFreq.26.build.flash_freq=26
+wifi_slot.menu.FlashMode.dout=DOUT (compatible)
+wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
+wifi_slot.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
+wifi_slot.menu.FlashMode.dio=DIO
+wifi_slot.menu.FlashMode.dio.build.flash_mode=dio
+wifi_slot.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
+wifi_slot.menu.FlashMode.qout=QOUT
+wifi_slot.menu.FlashMode.qout.build.flash_mode=qout
+wifi_slot.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
+wifi_slot.menu.FlashMode.qio=QIO (fast)
+wifi_slot.menu.FlashMode.qio.build.flash_mode=qio
+wifi_slot.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
+wifi_slot.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+wifi_slot.menu.eesz.1M64.build.flash_size=1M
+wifi_slot.menu.eesz.1M64.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+wifi_slot.menu.eesz.1M64.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M64.upload.maximum_size=958448
+wifi_slot.menu.eesz.1M64.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M64.build.spiffs_start=0xEB000
+wifi_slot.menu.eesz.1M64.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M64.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+wifi_slot.menu.eesz.1M128.build.flash_size=1M
+wifi_slot.menu.eesz.1M128.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+wifi_slot.menu.eesz.1M128.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M128.upload.maximum_size=892912
+wifi_slot.menu.eesz.1M128.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M128.build.spiffs_start=0xDB000
+wifi_slot.menu.eesz.1M128.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M128.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+wifi_slot.menu.eesz.1M144.build.flash_size=1M
+wifi_slot.menu.eesz.1M144.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+wifi_slot.menu.eesz.1M144.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M144.upload.maximum_size=876528
+wifi_slot.menu.eesz.1M144.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M144.build.spiffs_start=0xD7000
+wifi_slot.menu.eesz.1M144.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M144.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+wifi_slot.menu.eesz.1M160.build.flash_size=1M
+wifi_slot.menu.eesz.1M160.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+wifi_slot.menu.eesz.1M160.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M160.upload.maximum_size=860144
+wifi_slot.menu.eesz.1M160.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M160.build.spiffs_start=0xD3000
+wifi_slot.menu.eesz.1M160.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M160.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+wifi_slot.menu.eesz.1M192.build.flash_size=1M
+wifi_slot.menu.eesz.1M192.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+wifi_slot.menu.eesz.1M192.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M192.upload.maximum_size=827376
+wifi_slot.menu.eesz.1M192.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M192.build.spiffs_start=0xCB000
+wifi_slot.menu.eesz.1M192.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M192.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+wifi_slot.menu.eesz.1M256.build.flash_size=1M
+wifi_slot.menu.eesz.1M256.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+wifi_slot.menu.eesz.1M256.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M256.upload.maximum_size=761840
+wifi_slot.menu.eesz.1M256.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M256.build.spiffs_start=0xBB000
+wifi_slot.menu.eesz.1M256.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M256.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+wifi_slot.menu.eesz.1M512.build.flash_size=1M
+wifi_slot.menu.eesz.1M512.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+wifi_slot.menu.eesz.1M512.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M512.upload.maximum_size=499696
+wifi_slot.menu.eesz.1M512.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.1M512.build.spiffs_start=0x7B000
+wifi_slot.menu.eesz.1M512.build.spiffs_end=0xFB000
+wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=8192
+wifi_slot.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+wifi_slot.menu.eesz.1M.build.flash_size=1M
+wifi_slot.menu.eesz.1M.build.flash_size_bytes=0x100000
+wifi_slot.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+wifi_slot.menu.eesz.1M.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.1M.upload.maximum_size=1023984
+wifi_slot.menu.eesz.1M.build.rfcal_addr=0xFC000
+wifi_slot.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+wifi_slot.menu.eesz.2M64.build.flash_size=2M
+wifi_slot.menu.eesz.2M64.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+wifi_slot.menu.eesz.2M64.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M64.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+wifi_slot.menu.eesz.2M64.build.spiffs_start=0x1F0000
+wifi_slot.menu.eesz.2M64.build.spiffs_end=0x1FB000
+wifi_slot.menu.eesz.2M64.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+wifi_slot.menu.eesz.2M128.build.flash_size=2M
+wifi_slot.menu.eesz.2M128.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+wifi_slot.menu.eesz.2M128.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M128.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+wifi_slot.menu.eesz.2M128.build.spiffs_start=0x1E0000
+wifi_slot.menu.eesz.2M128.build.spiffs_end=0x1FB000
+wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+wifi_slot.menu.eesz.2M256.build.flash_size=2M
+wifi_slot.menu.eesz.2M256.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+wifi_slot.menu.eesz.2M256.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M256.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+wifi_slot.menu.eesz.2M256.build.spiffs_start=0x1C0000
+wifi_slot.menu.eesz.2M256.build.spiffs_end=0x1FB000
+wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+wifi_slot.menu.eesz.2M512.build.flash_size=2M
+wifi_slot.menu.eesz.2M512.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+wifi_slot.menu.eesz.2M512.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M512.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+wifi_slot.menu.eesz.2M512.build.spiffs_start=0x180000
+wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FA000
+wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=8192
+wifi_slot.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+wifi_slot.menu.eesz.2M1M.build.flash_size=2M
+wifi_slot.menu.eesz.2M1M.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+wifi_slot.menu.eesz.2M1M.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M1M.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+wifi_slot.menu.eesz.2M1M.build.spiffs_start=0x100000
+wifi_slot.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+wifi_slot.menu.eesz.2M1M.build.spiffs_blocksize=8192
+wifi_slot.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+wifi_slot.menu.eesz.2M.build.flash_size=2M
+wifi_slot.menu.eesz.2M.build.flash_size_bytes=0x200000
+wifi_slot.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+wifi_slot.menu.eesz.2M.build.spiffs_pagesize=256
+wifi_slot.menu.eesz.2M.upload.maximum_size=1044464
+wifi_slot.menu.eesz.2M.build.rfcal_addr=0x1FC000
+wifi_slot.menu.ip.lm2f=v2 Lower Memory
+wifi_slot.menu.ip.lm2f.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+wifi_slot.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifi_slot.menu.ip.hb2f=v2 Higher Bandwidth
+wifi_slot.menu.ip.hb2f.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+wifi_slot.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wifi_slot.menu.ip.lm2n=v2 Lower Memory (no features)
+wifi_slot.menu.ip.lm2n.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+wifi_slot.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifi_slot.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+wifi_slot.menu.ip.hb2n.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+wifi_slot.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wifi_slot.menu.ip.lm6f=v2 IPv6 Lower Memory
+wifi_slot.menu.ip.lm6f.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+wifi_slot.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifi_slot.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+wifi_slot.menu.ip.hb6f.build.lwip_include=lwip2/include
+wifi_slot.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+wifi_slot.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wifi_slot.menu.ip.hb1=v1.4 Higher Bandwidth
+wifi_slot.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+wifi_slot.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+wifi_slot.menu.ip.src=v1.4 Compile from source
+wifi_slot.menu.ip.src.build.lwip_lib=-llwip_src
+wifi_slot.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+wifi_slot.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+wifi_slot.menu.dbg.Disabled=Disabled
+wifi_slot.menu.dbg.Disabled.build.debug_port=
+wifi_slot.menu.dbg.Serial=Serial
+wifi_slot.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+wifi_slot.menu.dbg.Serial1=Serial1
+wifi_slot.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+wifi_slot.menu.lvl.None____=None
+wifi_slot.menu.lvl.None____.build.debug_level=
+wifi_slot.menu.lvl.SSL=SSL
+wifi_slot.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+wifi_slot.menu.lvl.TLS_MEM=TLS_MEM
+wifi_slot.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+wifi_slot.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+wifi_slot.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.lvl.HTTP_SERVER=HTTP_SERVER
+wifi_slot.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+wifi_slot.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+wifi_slot.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+wifi_slot.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+wifi_slot.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+wifi_slot.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+wifi_slot.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wifi_slot.menu.lvl.CORE=CORE
+wifi_slot.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+wifi_slot.menu.lvl.WIFI=WIFI
+wifi_slot.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+wifi_slot.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+wifi_slot.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+wifi_slot.menu.lvl.UPDATER=UPDATER
+wifi_slot.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+wifi_slot.menu.lvl.OTA=OTA
+wifi_slot.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+wifi_slot.menu.lvl.OOM=OOM
+wifi_slot.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+wifi_slot.menu.lvl.MDNS=MDNS
+wifi_slot.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+wifi_slot.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifi_slot.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wifi_slot.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+wifi_slot.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+wifi_slot.menu.wipe.none=Only Sketch
+wifi_slot.menu.wipe.none.upload.erase_cmd=
+wifi_slot.menu.wipe.sdk=Sketch + WiFi Settings
+wifi_slot.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+wifi_slot.menu.wipe.all=All Flash Contents
+wifi_slot.menu.wipe.all.upload.erase_cmd=erase_flash
+wifi_slot.menu.baud.115200=115200
+wifi_slot.menu.baud.115200.upload.speed=115200
+wifi_slot.menu.baud.57600=57600
+wifi_slot.menu.baud.57600.upload.speed=57600
+wifi_slot.menu.baud.230400.linux=230400
+wifi_slot.menu.baud.230400.macosx=230400
+wifi_slot.menu.baud.230400.upload.speed=230400
+wifi_slot.menu.baud.256000.windows=256000
+wifi_slot.menu.baud.256000.upload.speed=256000
+wifi_slot.menu.baud.460800.linux=460800
+wifi_slot.menu.baud.460800.macosx=460800
+wifi_slot.menu.baud.460800.upload.speed=460800
+wifi_slot.menu.baud.512000.windows=512000
+wifi_slot.menu.baud.512000.upload.speed=512000
+wifi_slot.menu.baud.921600=921600
+wifi_slot.menu.baud.921600.upload.speed=921600
+wifi_slot.menu.baud.3000000=3000000
+wifi_slot.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+wiolink.name=Seeed Wio Link
+wiolink.build.board=ESP8266_WIO_LINK
+wiolink.build.variant=wiolink
+wiolink.upload.tool=esptool
+wiolink.upload.maximum_data_size=81920
+wiolink.upload.wait_for_upload_port=true
+wiolink.upload.erase_cmd=
+wiolink.serial.disableDTR=true
+wiolink.serial.disableRTS=true
+wiolink.build.mcu=esp8266
+wiolink.build.core=esp8266
+wiolink.build.spiffs_pagesize=256
+wiolink.build.debug_port=
+wiolink.build.debug_level=
+wiolink.menu.xtal.80=80 MHz
+wiolink.menu.xtal.80.build.f_cpu=80000000L
+wiolink.menu.xtal.160=160 MHz
+wiolink.menu.xtal.160.build.f_cpu=160000000L
+wiolink.menu.vt.flash=Flash
+wiolink.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+wiolink.menu.vt.heap=Heap
+wiolink.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+wiolink.menu.vt.iram=IRAM
+wiolink.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+wiolink.menu.exception.legacy=Legacy (new can return nullptr)
+wiolink.menu.exception.legacy.build.exception_flags=-fno-exceptions
+wiolink.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+wiolink.menu.exception.disabled=Disabled (new can abort)
+wiolink.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+wiolink.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+wiolink.menu.exception.enabled=Enabled
+wiolink.menu.exception.enabled.build.exception_flags=-fexceptions
+wiolink.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+wiolink.menu.ssl.all=All SSL ciphers (most compatible)
+wiolink.menu.ssl.all.build.sslflags=
+wiolink.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+wiolink.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+wiolink.upload.resetmethod=--before default_reset --after hard_reset
+wiolink.build.flash_mode=qio
+wiolink.build.flash_flags=-DFLASHMODE_QIO
+wiolink.build.flash_freq=40
+wiolink.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+wiolink.menu.eesz.4M2M.build.flash_size=4M
+wiolink.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+wiolink.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+wiolink.menu.eesz.4M2M.build.spiffs_pagesize=256
+wiolink.menu.eesz.4M2M.upload.maximum_size=1044464
+wiolink.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+wiolink.menu.eesz.4M2M.build.spiffs_start=0x200000
+wiolink.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+wiolink.menu.eesz.4M2M.build.spiffs_blocksize=8192
+wiolink.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+wiolink.menu.eesz.4M3M.build.flash_size=4M
+wiolink.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+wiolink.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+wiolink.menu.eesz.4M3M.build.spiffs_pagesize=256
+wiolink.menu.eesz.4M3M.upload.maximum_size=1044464
+wiolink.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+wiolink.menu.eesz.4M3M.build.spiffs_start=0x100000
+wiolink.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+wiolink.menu.eesz.4M3M.build.spiffs_blocksize=8192
+wiolink.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+wiolink.menu.eesz.4M1M.build.flash_size=4M
+wiolink.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+wiolink.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+wiolink.menu.eesz.4M1M.build.spiffs_pagesize=256
+wiolink.menu.eesz.4M1M.upload.maximum_size=1044464
+wiolink.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+wiolink.menu.eesz.4M1M.build.spiffs_start=0x300000
+wiolink.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+wiolink.menu.eesz.4M1M.build.spiffs_blocksize=8192
+wiolink.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+wiolink.menu.eesz.4M.build.flash_size=4M
+wiolink.menu.eesz.4M.build.flash_size_bytes=0x400000
+wiolink.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+wiolink.menu.eesz.4M.build.spiffs_pagesize=256
+wiolink.menu.eesz.4M.upload.maximum_size=1044464
+wiolink.menu.eesz.4M.build.rfcal_addr=0x3FC000
+wiolink.menu.ip.lm2f=v2 Lower Memory
+wiolink.menu.ip.lm2f.build.lwip_include=lwip2/include
+wiolink.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+wiolink.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wiolink.menu.ip.hb2f=v2 Higher Bandwidth
+wiolink.menu.ip.hb2f.build.lwip_include=lwip2/include
+wiolink.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+wiolink.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+wiolink.menu.ip.lm2n=v2 Lower Memory (no features)
+wiolink.menu.ip.lm2n.build.lwip_include=lwip2/include
+wiolink.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+wiolink.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wiolink.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+wiolink.menu.ip.hb2n.build.lwip_include=lwip2/include
+wiolink.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+wiolink.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+wiolink.menu.ip.lm6f=v2 IPv6 Lower Memory
+wiolink.menu.ip.lm6f.build.lwip_include=lwip2/include
+wiolink.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+wiolink.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wiolink.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+wiolink.menu.ip.hb6f.build.lwip_include=lwip2/include
+wiolink.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+wiolink.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+wiolink.menu.ip.hb1=v1.4 Higher Bandwidth
+wiolink.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+wiolink.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+wiolink.menu.ip.src=v1.4 Compile from source
+wiolink.menu.ip.src.build.lwip_lib=-llwip_src
+wiolink.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+wiolink.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+wiolink.menu.dbg.Disabled=Disabled
+wiolink.menu.dbg.Disabled.build.debug_port=
+wiolink.menu.dbg.Serial=Serial
+wiolink.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+wiolink.menu.dbg.Serial1=Serial1
+wiolink.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+wiolink.menu.lvl.None____=None
+wiolink.menu.lvl.None____.build.debug_level=
+wiolink.menu.lvl.SSL=SSL
+wiolink.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+wiolink.menu.lvl.TLS_MEM=TLS_MEM
+wiolink.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+wiolink.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+wiolink.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+wiolink.menu.lvl.HTTP_SERVER=HTTP_SERVER
+wiolink.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+wiolink.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+wiolink.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+wiolink.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+wiolink.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+wiolink.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+wiolink.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wiolink.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+wiolink.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+wiolink.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+wiolink.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+wiolink.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+wiolink.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wiolink.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+wiolink.menu.lvl.CORE=CORE
+wiolink.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+wiolink.menu.lvl.WIFI=WIFI
+wiolink.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+wiolink.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+wiolink.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+wiolink.menu.lvl.UPDATER=UPDATER
+wiolink.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+wiolink.menu.lvl.OTA=OTA
+wiolink.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+wiolink.menu.lvl.OOM=OOM
+wiolink.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+wiolink.menu.lvl.MDNS=MDNS
+wiolink.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+wiolink.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wiolink.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+wiolink.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+wiolink.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+wiolink.menu.wipe.none=Only Sketch
+wiolink.menu.wipe.none.upload.erase_cmd=
+wiolink.menu.wipe.sdk=Sketch + WiFi Settings
+wiolink.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+wiolink.menu.wipe.all=All Flash Contents
+wiolink.menu.wipe.all.upload.erase_cmd=erase_flash
+wiolink.menu.baud.115200=115200
+wiolink.menu.baud.115200.upload.speed=115200
+wiolink.menu.baud.57600=57600
+wiolink.menu.baud.57600.upload.speed=57600
+wiolink.menu.baud.230400.linux=230400
+wiolink.menu.baud.230400.macosx=230400
+wiolink.menu.baud.230400.upload.speed=230400
+wiolink.menu.baud.256000.windows=256000
+wiolink.menu.baud.256000.upload.speed=256000
+wiolink.menu.baud.460800.linux=460800
+wiolink.menu.baud.460800.macosx=460800
+wiolink.menu.baud.460800.upload.speed=460800
+wiolink.menu.baud.512000.windows=512000
+wiolink.menu.baud.512000.upload.speed=512000
+wiolink.menu.baud.921600=921600
+wiolink.menu.baud.921600.upload.speed=921600
+wiolink.menu.baud.3000000=3000000
+wiolink.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espectro.name=ESPectro Core
+espectro.build.board=ESP8266_ESPECTRO_CORE
+espectro.build.variant=espectro
+espectro.upload.tool=esptool
+espectro.upload.maximum_data_size=81920
+espectro.upload.wait_for_upload_port=true
+espectro.upload.erase_cmd=
+espectro.serial.disableDTR=true
+espectro.serial.disableRTS=true
+espectro.build.mcu=esp8266
+espectro.build.core=esp8266
+espectro.build.spiffs_pagesize=256
+espectro.build.debug_port=
+espectro.build.debug_level=
+espectro.menu.xtal.80=80 MHz
+espectro.menu.xtal.80.build.f_cpu=80000000L
+espectro.menu.xtal.160=160 MHz
+espectro.menu.xtal.160.build.f_cpu=160000000L
+espectro.menu.vt.flash=Flash
+espectro.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espectro.menu.vt.heap=Heap
+espectro.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espectro.menu.vt.iram=IRAM
+espectro.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espectro.menu.exception.legacy=Legacy (new can return nullptr)
+espectro.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espectro.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espectro.menu.exception.disabled=Disabled (new can abort)
+espectro.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espectro.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espectro.menu.exception.enabled=Enabled
+espectro.menu.exception.enabled.build.exception_flags=-fexceptions
+espectro.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espectro.menu.ssl.all=All SSL ciphers (most compatible)
+espectro.menu.ssl.all.build.sslflags=
+espectro.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espectro.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espectro.upload.resetmethod=--before default_reset --after hard_reset
+espectro.build.flash_mode=dio
+espectro.build.flash_flags=-DFLASHMODE_DIO
+espectro.build.flash_freq=40
+espectro.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+espectro.menu.eesz.4M2M.build.flash_size=4M
+espectro.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+espectro.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+espectro.menu.eesz.4M2M.build.spiffs_pagesize=256
+espectro.menu.eesz.4M2M.upload.maximum_size=1044464
+espectro.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+espectro.menu.eesz.4M2M.build.spiffs_start=0x200000
+espectro.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+espectro.menu.eesz.4M2M.build.spiffs_blocksize=8192
+espectro.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+espectro.menu.eesz.4M3M.build.flash_size=4M
+espectro.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+espectro.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+espectro.menu.eesz.4M3M.build.spiffs_pagesize=256
+espectro.menu.eesz.4M3M.upload.maximum_size=1044464
+espectro.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+espectro.menu.eesz.4M3M.build.spiffs_start=0x100000
+espectro.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+espectro.menu.eesz.4M3M.build.spiffs_blocksize=8192
+espectro.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+espectro.menu.eesz.4M1M.build.flash_size=4M
+espectro.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+espectro.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espectro.menu.eesz.4M1M.build.spiffs_pagesize=256
+espectro.menu.eesz.4M1M.upload.maximum_size=1044464
+espectro.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+espectro.menu.eesz.4M1M.build.spiffs_start=0x300000
+espectro.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+espectro.menu.eesz.4M1M.build.spiffs_blocksize=8192
+espectro.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+espectro.menu.eesz.4M.build.flash_size=4M
+espectro.menu.eesz.4M.build.flash_size_bytes=0x400000
+espectro.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+espectro.menu.eesz.4M.build.spiffs_pagesize=256
+espectro.menu.eesz.4M.upload.maximum_size=1044464
+espectro.menu.eesz.4M.build.rfcal_addr=0x3FC000
+espectro.menu.ip.lm2f=v2 Lower Memory
+espectro.menu.ip.lm2f.build.lwip_include=lwip2/include
+espectro.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espectro.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espectro.menu.ip.hb2f=v2 Higher Bandwidth
+espectro.menu.ip.hb2f.build.lwip_include=lwip2/include
+espectro.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espectro.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espectro.menu.ip.lm2n=v2 Lower Memory (no features)
+espectro.menu.ip.lm2n.build.lwip_include=lwip2/include
+espectro.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espectro.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espectro.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espectro.menu.ip.hb2n.build.lwip_include=lwip2/include
+espectro.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espectro.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espectro.menu.ip.lm6f=v2 IPv6 Lower Memory
+espectro.menu.ip.lm6f.build.lwip_include=lwip2/include
+espectro.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espectro.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espectro.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espectro.menu.ip.hb6f.build.lwip_include=lwip2/include
+espectro.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espectro.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espectro.menu.ip.hb1=v1.4 Higher Bandwidth
+espectro.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espectro.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espectro.menu.ip.src=v1.4 Compile from source
+espectro.menu.ip.src.build.lwip_lib=-llwip_src
+espectro.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espectro.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espectro.menu.dbg.Disabled=Disabled
+espectro.menu.dbg.Disabled.build.debug_port=
+espectro.menu.dbg.Serial=Serial
+espectro.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espectro.menu.dbg.Serial1=Serial1
+espectro.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espectro.menu.lvl.None____=None
+espectro.menu.lvl.None____.build.debug_level=
+espectro.menu.lvl.SSL=SSL
+espectro.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espectro.menu.lvl.TLS_MEM=TLS_MEM
+espectro.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espectro.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espectro.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espectro.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espectro.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espectro.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espectro.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espectro.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espectro.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espectro.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espectro.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espectro.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espectro.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espectro.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espectro.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espectro.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espectro.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espectro.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espectro.menu.lvl.CORE=CORE
+espectro.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espectro.menu.lvl.WIFI=WIFI
+espectro.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espectro.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espectro.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espectro.menu.lvl.UPDATER=UPDATER
+espectro.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espectro.menu.lvl.OTA=OTA
+espectro.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espectro.menu.lvl.OOM=OOM
+espectro.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espectro.menu.lvl.MDNS=MDNS
+espectro.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espectro.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espectro.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espectro.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espectro.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espectro.menu.wipe.none=Only Sketch
+espectro.menu.wipe.none.upload.erase_cmd=
+espectro.menu.wipe.sdk=Sketch + WiFi Settings
+espectro.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espectro.menu.wipe.all=All Flash Contents
+espectro.menu.wipe.all.upload.erase_cmd=erase_flash
+espectro.menu.baud.115200=115200
+espectro.menu.baud.115200.upload.speed=115200
+espectro.menu.baud.57600=57600
+espectro.menu.baud.57600.upload.speed=57600
+espectro.menu.baud.230400.linux=230400
+espectro.menu.baud.230400.macosx=230400
+espectro.menu.baud.230400.upload.speed=230400
+espectro.menu.baud.256000.windows=256000
+espectro.menu.baud.256000.upload.speed=256000
+espectro.menu.baud.460800.linux=460800
+espectro.menu.baud.460800.macosx=460800
+espectro.menu.baud.460800.upload.speed=460800
+espectro.menu.baud.512000.windows=512000
+espectro.menu.baud.512000.upload.speed=512000
+espectro.menu.baud.921600=921600
+espectro.menu.baud.921600.upload.speed=921600
+espectro.menu.baud.3000000=3000000
+espectro.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+sonoff.name=ITEAD Sonoff
+sonoff.build.board=SONOFF_SV
+sonoff.build.extra_flags=-DESP8266
+sonoff.build.flash_size=1M
+sonoff.build.variant=itead
+sonoff.menu.BoardModel.sonoffBasic=ITEAD Sonoff Basic
+sonoff.menu.BoardModel.sonoffBasic.build.board=SONOFF_BASIC
+sonoff.menu.BoardModel.sonoffS20=ITEAD Sonoff S20
+sonoff.menu.BoardModel.sonoffS20.build.board=SONOFF_S20
+sonoff.menu.BoardModel.sonoffSV=ITEAD Sonoff SV
+sonoff.menu.BoardModel.sonoffSV.build.board=SONOFF_SV
+sonoff.menu.BoardModel.sonoffTH=ITEAD Sonoff TH
+sonoff.menu.BoardModel.sonoffTH.build.board=SONOFF_TH
+sonoff.upload.tool=esptool
+sonoff.upload.maximum_data_size=81920
+sonoff.upload.wait_for_upload_port=true
+sonoff.upload.erase_cmd=
+sonoff.serial.disableDTR=true
+sonoff.serial.disableRTS=true
+sonoff.build.mcu=esp8266
+sonoff.build.core=esp8266
+sonoff.build.spiffs_pagesize=256
+sonoff.build.debug_port=
+sonoff.build.debug_level=
+sonoff.menu.xtal.80=80 MHz
+sonoff.menu.xtal.80.build.f_cpu=80000000L
+sonoff.menu.xtal.160=160 MHz
+sonoff.menu.xtal.160.build.f_cpu=160000000L
+sonoff.menu.vt.flash=Flash
+sonoff.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+sonoff.menu.vt.heap=Heap
+sonoff.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+sonoff.menu.vt.iram=IRAM
+sonoff.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+sonoff.menu.exception.legacy=Legacy (new can return nullptr)
+sonoff.menu.exception.legacy.build.exception_flags=-fno-exceptions
+sonoff.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+sonoff.menu.exception.disabled=Disabled (new can abort)
+sonoff.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+sonoff.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+sonoff.menu.exception.enabled=Enabled
+sonoff.menu.exception.enabled.build.exception_flags=-fexceptions
+sonoff.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+sonoff.menu.ssl.all=All SSL ciphers (most compatible)
+sonoff.menu.ssl.all.build.sslflags=
+sonoff.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+sonoff.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+sonoff.upload.resetmethod=--before no_reset --after soft_reset
+sonoff.build.flash_mode=dout
+sonoff.build.flash_flags=-DFLASHMODE_DOUT
+sonoff.build.flash_freq=40
+sonoff.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+sonoff.menu.eesz.1M64.build.flash_size=1M
+sonoff.menu.eesz.1M64.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+sonoff.menu.eesz.1M64.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M64.upload.maximum_size=958448
+sonoff.menu.eesz.1M64.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M64.build.spiffs_start=0xEB000
+sonoff.menu.eesz.1M64.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M64.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+sonoff.menu.eesz.1M128.build.flash_size=1M
+sonoff.menu.eesz.1M128.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+sonoff.menu.eesz.1M128.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M128.upload.maximum_size=892912
+sonoff.menu.eesz.1M128.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M128.build.spiffs_start=0xDB000
+sonoff.menu.eesz.1M128.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M128.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+sonoff.menu.eesz.1M144.build.flash_size=1M
+sonoff.menu.eesz.1M144.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+sonoff.menu.eesz.1M144.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M144.upload.maximum_size=876528
+sonoff.menu.eesz.1M144.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M144.build.spiffs_start=0xD7000
+sonoff.menu.eesz.1M144.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M144.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+sonoff.menu.eesz.1M160.build.flash_size=1M
+sonoff.menu.eesz.1M160.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+sonoff.menu.eesz.1M160.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M160.upload.maximum_size=860144
+sonoff.menu.eesz.1M160.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M160.build.spiffs_start=0xD3000
+sonoff.menu.eesz.1M160.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M160.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+sonoff.menu.eesz.1M192.build.flash_size=1M
+sonoff.menu.eesz.1M192.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+sonoff.menu.eesz.1M192.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M192.upload.maximum_size=827376
+sonoff.menu.eesz.1M192.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M192.build.spiffs_start=0xCB000
+sonoff.menu.eesz.1M192.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M192.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+sonoff.menu.eesz.1M256.build.flash_size=1M
+sonoff.menu.eesz.1M256.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+sonoff.menu.eesz.1M256.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M256.upload.maximum_size=761840
+sonoff.menu.eesz.1M256.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M256.build.spiffs_start=0xBB000
+sonoff.menu.eesz.1M256.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M256.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+sonoff.menu.eesz.1M512.build.flash_size=1M
+sonoff.menu.eesz.1M512.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+sonoff.menu.eesz.1M512.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M512.upload.maximum_size=499696
+sonoff.menu.eesz.1M512.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M512.build.spiffs_start=0x7B000
+sonoff.menu.eesz.1M512.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M512.build.spiffs_blocksize=8192
+sonoff.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+sonoff.menu.eesz.1M.build.flash_size=1M
+sonoff.menu.eesz.1M.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+sonoff.menu.eesz.1M.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M.upload.maximum_size=1023984
+sonoff.menu.eesz.1M.build.rfcal_addr=0xFC000
+sonoff.menu.ip.lm2f=v2 Lower Memory
+sonoff.menu.ip.lm2f.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+sonoff.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+sonoff.menu.ip.hb2f=v2 Higher Bandwidth
+sonoff.menu.ip.hb2f.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+sonoff.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+sonoff.menu.ip.lm2n=v2 Lower Memory (no features)
+sonoff.menu.ip.lm2n.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+sonoff.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+sonoff.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+sonoff.menu.ip.hb2n.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+sonoff.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+sonoff.menu.ip.lm6f=v2 IPv6 Lower Memory
+sonoff.menu.ip.lm6f.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+sonoff.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+sonoff.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+sonoff.menu.ip.hb6f.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+sonoff.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+sonoff.menu.ip.hb1=v1.4 Higher Bandwidth
+sonoff.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+sonoff.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+sonoff.menu.ip.src=v1.4 Compile from source
+sonoff.menu.ip.src.build.lwip_lib=-llwip_src
+sonoff.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+sonoff.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+sonoff.menu.dbg.Disabled=Disabled
+sonoff.menu.dbg.Disabled.build.debug_port=
+sonoff.menu.dbg.Serial=Serial
+sonoff.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+sonoff.menu.dbg.Serial1=Serial1
+sonoff.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+sonoff.menu.lvl.None____=None
+sonoff.menu.lvl.None____.build.debug_level=
+sonoff.menu.lvl.SSL=SSL
+sonoff.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+sonoff.menu.lvl.TLS_MEM=TLS_MEM
+sonoff.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+sonoff.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+sonoff.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.HTTP_SERVER=HTTP_SERVER
+sonoff.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+sonoff.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+sonoff.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+sonoff.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.CORE=CORE
+sonoff.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+sonoff.menu.lvl.WIFI=WIFI
+sonoff.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+sonoff.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+sonoff.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+sonoff.menu.lvl.UPDATER=UPDATER
+sonoff.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+sonoff.menu.lvl.OTA=OTA
+sonoff.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+sonoff.menu.lvl.OOM=OOM
+sonoff.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+sonoff.menu.lvl.MDNS=MDNS
+sonoff.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+sonoff.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+sonoff.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+sonoff.menu.wipe.none=Only Sketch
+sonoff.menu.wipe.none.upload.erase_cmd=
+sonoff.menu.wipe.sdk=Sketch + WiFi Settings
+sonoff.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+sonoff.menu.wipe.all=All Flash Contents
+sonoff.menu.wipe.all.upload.erase_cmd=erase_flash
+sonoff.menu.baud.115200=115200
+sonoff.menu.baud.115200.upload.speed=115200
+sonoff.menu.baud.57600=57600
+sonoff.menu.baud.57600.upload.speed=57600
+sonoff.menu.baud.230400.linux=230400
+sonoff.menu.baud.230400.macosx=230400
+sonoff.menu.baud.230400.upload.speed=230400
+sonoff.menu.baud.256000.windows=256000
+sonoff.menu.baud.256000.upload.speed=256000
+sonoff.menu.baud.460800.linux=460800
+sonoff.menu.baud.460800.macosx=460800
+sonoff.menu.baud.460800.upload.speed=460800
+sonoff.menu.baud.512000.windows=512000
+sonoff.menu.baud.512000.upload.speed=512000
+sonoff.menu.baud.921600=921600
+sonoff.menu.baud.921600.upload.speed=921600
+sonoff.menu.baud.3000000=3000000
+sonoff.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espmxdevkit.name=DOIT ESP-Mx DevKit (ESP8285)
+espmxdevkit.build.board=ESP8266_ESP01
+espmxdevkit.build.led=-DLED_BUILTIN=16
+espmxdevkit.build.variant=esp8285
+espmxdevkit.upload.tool=esptool
+espmxdevkit.upload.maximum_data_size=81920
+espmxdevkit.upload.wait_for_upload_port=true
+espmxdevkit.upload.erase_cmd=
+espmxdevkit.serial.disableDTR=true
+espmxdevkit.serial.disableRTS=true
+espmxdevkit.build.mcu=esp8266
+espmxdevkit.build.core=esp8266
+espmxdevkit.build.spiffs_pagesize=256
+espmxdevkit.build.debug_port=
+espmxdevkit.build.debug_level=
+espmxdevkit.menu.xtal.80=80 MHz
+espmxdevkit.menu.xtal.80.build.f_cpu=80000000L
+espmxdevkit.menu.xtal.160=160 MHz
+espmxdevkit.menu.xtal.160.build.f_cpu=160000000L
+espmxdevkit.menu.vt.flash=Flash
+espmxdevkit.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espmxdevkit.menu.vt.heap=Heap
+espmxdevkit.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espmxdevkit.menu.vt.iram=IRAM
+espmxdevkit.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espmxdevkit.menu.exception.legacy=Legacy (new can return nullptr)
+espmxdevkit.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espmxdevkit.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espmxdevkit.menu.exception.disabled=Disabled (new can abort)
+espmxdevkit.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espmxdevkit.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espmxdevkit.menu.exception.enabled=Enabled
+espmxdevkit.menu.exception.enabled.build.exception_flags=-fexceptions
+espmxdevkit.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espmxdevkit.menu.ssl.all=All SSL ciphers (most compatible)
+espmxdevkit.menu.ssl.all.build.sslflags=
+espmxdevkit.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espmxdevkit.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espmxdevkit.upload.resetmethod=--before default_reset --after hard_reset
+espmxdevkit.build.flash_mode=dout
+espmxdevkit.build.flash_flags=-DFLASHMODE_DOUT
+espmxdevkit.build.flash_freq=40
+espmxdevkit.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+espmxdevkit.menu.eesz.1M64.build.flash_size=1M
+espmxdevkit.menu.eesz.1M64.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+espmxdevkit.menu.eesz.1M64.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M64.upload.maximum_size=958448
+espmxdevkit.menu.eesz.1M64.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M64.build.spiffs_start=0xEB000
+espmxdevkit.menu.eesz.1M64.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M64.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+espmxdevkit.menu.eesz.1M128.build.flash_size=1M
+espmxdevkit.menu.eesz.1M128.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+espmxdevkit.menu.eesz.1M128.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M128.upload.maximum_size=892912
+espmxdevkit.menu.eesz.1M128.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M128.build.spiffs_start=0xDB000
+espmxdevkit.menu.eesz.1M128.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M128.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+espmxdevkit.menu.eesz.1M144.build.flash_size=1M
+espmxdevkit.menu.eesz.1M144.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+espmxdevkit.menu.eesz.1M144.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M144.upload.maximum_size=876528
+espmxdevkit.menu.eesz.1M144.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M144.build.spiffs_start=0xD7000
+espmxdevkit.menu.eesz.1M144.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M144.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+espmxdevkit.menu.eesz.1M160.build.flash_size=1M
+espmxdevkit.menu.eesz.1M160.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+espmxdevkit.menu.eesz.1M160.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M160.upload.maximum_size=860144
+espmxdevkit.menu.eesz.1M160.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M160.build.spiffs_start=0xD3000
+espmxdevkit.menu.eesz.1M160.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M160.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+espmxdevkit.menu.eesz.1M192.build.flash_size=1M
+espmxdevkit.menu.eesz.1M192.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+espmxdevkit.menu.eesz.1M192.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M192.upload.maximum_size=827376
+espmxdevkit.menu.eesz.1M192.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M192.build.spiffs_start=0xCB000
+espmxdevkit.menu.eesz.1M192.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M192.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+espmxdevkit.menu.eesz.1M256.build.flash_size=1M
+espmxdevkit.menu.eesz.1M256.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+espmxdevkit.menu.eesz.1M256.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M256.upload.maximum_size=761840
+espmxdevkit.menu.eesz.1M256.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M256.build.spiffs_start=0xBB000
+espmxdevkit.menu.eesz.1M256.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M256.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+espmxdevkit.menu.eesz.1M512.build.flash_size=1M
+espmxdevkit.menu.eesz.1M512.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+espmxdevkit.menu.eesz.1M512.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M512.upload.maximum_size=499696
+espmxdevkit.menu.eesz.1M512.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M512.build.spiffs_start=0x7B000
+espmxdevkit.menu.eesz.1M512.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M512.build.spiffs_blocksize=8192
+espmxdevkit.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+espmxdevkit.menu.eesz.1M.build.flash_size=1M
+espmxdevkit.menu.eesz.1M.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+espmxdevkit.menu.eesz.1M.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M.upload.maximum_size=1023984
+espmxdevkit.menu.eesz.1M.build.rfcal_addr=0xFC000
+espmxdevkit.menu.ip.lm2f=v2 Lower Memory
+espmxdevkit.menu.ip.lm2f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espmxdevkit.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.hb2f=v2 Higher Bandwidth
+espmxdevkit.menu.ip.hb2f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espmxdevkit.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.lm2n=v2 Lower Memory (no features)
+espmxdevkit.menu.ip.lm2n.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espmxdevkit.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espmxdevkit.menu.ip.hb2n.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espmxdevkit.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.lm6f=v2 IPv6 Lower Memory
+espmxdevkit.menu.ip.lm6f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espmxdevkit.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espmxdevkit.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espmxdevkit.menu.ip.hb6f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espmxdevkit.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espmxdevkit.menu.ip.hb1=v1.4 Higher Bandwidth
+espmxdevkit.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espmxdevkit.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espmxdevkit.menu.ip.src=v1.4 Compile from source
+espmxdevkit.menu.ip.src.build.lwip_lib=-llwip_src
+espmxdevkit.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espmxdevkit.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espmxdevkit.menu.dbg.Disabled=Disabled
+espmxdevkit.menu.dbg.Disabled.build.debug_port=
+espmxdevkit.menu.dbg.Serial=Serial
+espmxdevkit.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espmxdevkit.menu.dbg.Serial1=Serial1
+espmxdevkit.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espmxdevkit.menu.lvl.None____=None
+espmxdevkit.menu.lvl.None____.build.debug_level=
+espmxdevkit.menu.lvl.SSL=SSL
+espmxdevkit.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espmxdevkit.menu.lvl.TLS_MEM=TLS_MEM
+espmxdevkit.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espmxdevkit.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espmxdevkit.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espmxdevkit.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espmxdevkit.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.CORE=CORE
+espmxdevkit.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espmxdevkit.menu.lvl.WIFI=WIFI
+espmxdevkit.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espmxdevkit.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espmxdevkit.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espmxdevkit.menu.lvl.UPDATER=UPDATER
+espmxdevkit.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espmxdevkit.menu.lvl.OTA=OTA
+espmxdevkit.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espmxdevkit.menu.lvl.OOM=OOM
+espmxdevkit.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espmxdevkit.menu.lvl.MDNS=MDNS
+espmxdevkit.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espmxdevkit.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espmxdevkit.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espmxdevkit.menu.wipe.none=Only Sketch
+espmxdevkit.menu.wipe.none.upload.erase_cmd=
+espmxdevkit.menu.wipe.sdk=Sketch + WiFi Settings
+espmxdevkit.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espmxdevkit.menu.wipe.all=All Flash Contents
+espmxdevkit.menu.wipe.all.upload.erase_cmd=erase_flash
+espmxdevkit.menu.baud.115200=115200
+espmxdevkit.menu.baud.115200.upload.speed=115200
+espmxdevkit.menu.baud.57600=57600
+espmxdevkit.menu.baud.57600.upload.speed=57600
+espmxdevkit.menu.baud.230400.linux=230400
+espmxdevkit.menu.baud.230400.macosx=230400
+espmxdevkit.menu.baud.230400.upload.speed=230400
+espmxdevkit.menu.baud.256000.windows=256000
+espmxdevkit.menu.baud.256000.upload.speed=256000
+espmxdevkit.menu.baud.460800.linux=460800
+espmxdevkit.menu.baud.460800.macosx=460800
+espmxdevkit.menu.baud.460800.upload.speed=460800
+espmxdevkit.menu.baud.512000.windows=512000
+espmxdevkit.menu.baud.512000.upload.speed=512000
+espmxdevkit.menu.baud.921600=921600
+espmxdevkit.menu.baud.921600.upload.speed=921600
+espmxdevkit.menu.baud.3000000=3000000
+espmxdevkit.menu.baud.3000000.upload.speed=3000000
+
diff --git a/arduino/version 2.6.3/platform.txt b/arduino/version 2.6.3/platform.txt
new file mode 100644
index 000000000..204b5793b
--- /dev/null
+++ b/arduino/version 2.6.3/platform.txt	
@@ -0,0 +1,171 @@
+
+# ESP8266 platform
+# ------------------------------
+
+# For more info:
+# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
+
+name=ESP8266 Boards (2.6.3)
+version=2.6.3
+
+# These will be removed by the packager script when doing a JSON release
+
+
+
+
+runtime.tools.signing={runtime.platform.path}/tools/signing.py
+runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
+runtime.tools.sizes={runtime.platform.path}/tools/sizes.py
+runtime.tools.makecorever={runtime.platform.path}/tools/makecorever.py
+runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
+
+compiler.warning_flags=-w
+compiler.warning_flags.none=-w
+compiler.warning_flags.default=
+compiler.warning_flags.more=-Wall
+compiler.warning_flags.all=-Wall -Wextra
+
+build.lwip_lib=-llwip_gcc
+build.lwip_include=lwip/include
+build.lwip_flags=-DLWIP_OPEN_SRC
+
+build.vtable_flags=-DVTABLES_IN_FLASH
+
+build.sslflags=
+
+build.exception_flags=-fno-exceptions
+build.stdcpp_lib=-lstdc++
+build.stdcpp_level=-std=gnu++11
+
+#build.float=-u _printf_float -u _scanf_float
+build.float=
+build.led=
+
+# default SDK for all boards
+# (generic board overrides this variable)
+build.sdk=NONOSDK22x_190703
+#build.sdk=NONOSDK22x_191024
+#build.sdk=NONOSDK22x_191105
+
+compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
+compiler.sdk.path={runtime.platform.path}/tools/sdk
+
+compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
+compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
+
+compiler.c.cmd=xtensa-lx106-elf-gcc
+compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
+
+compiler.S.cmd=xtensa-lx106-elf-gcc
+compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
+
+compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u app_entry {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/lib/{build.sdk}" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
+
+compiler.c.elf.cmd=xtensa-lx106-elf-gcc
+compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -lbearssl -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 {build.stdcpp_lib} -lm -lc -lgcc
+
+compiler.cpp.cmd=xtensa-lx106-elf-g++
+compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-rtti -falign-functions=4 {build.stdcpp_level} -MMD -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
+
+compiler.as.cmd=xtensa-lx106-elf-as
+
+compiler.ar.cmd=xtensa-lx106-elf-ar
+compiler.ar.flags=cru
+
+compiler.elf2hex.cmd=esptool
+compiler.elf2hex.flags=
+
+compiler.size.cmd=xtensa-lx106-elf-size
+
+# This can be overriden in boards.txt
+build.extra_flags=-DESP8266
+
+# These can be overridden in platform.local.txt
+compiler.c.extra_flags=
+compiler.c.elf.extra_flags=
+compiler.S.extra_flags=
+compiler.cpp.extra_flags=
+compiler.ar.extra_flags=
+compiler.objcopy.eep.extra_flags=
+compiler.elf2hex.extra_flags=
+
+## generate file with git version number
+## needs git
+recipe.hooks.sketch.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
+# This is quite a working hack. This form of prebuild hook, while intuitive, is not explicitly documented.
+
+
+## Build the app.ld linker file
+recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
+
+## Compile c files
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+
+## Compile c++ files
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+
+## Compile S files
+recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+
+## Create archives
+recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
+
+## Combine gc-sections, archives, and objects
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {build.exception_flags} -Wl,-Map "-Wl,{build.path}/{build.project_name}.map" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{archive_file_path}" {compiler.c.elf.libs} -Wl,--end-group  "-L{build.path}"
+
+## Create eeprom
+recipe.objcopy.eep.pattern=
+
+## Create hex
+recipe.objcopy.hex.1.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.elf2bin}" --eboot "{runtime.tools.eboot}" --app "{build.path}/{build.project_name}.elf" --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin" --out "{build.path}/{build.project_name}.bin"
+recipe.objcopy.hex.2.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode sign --privatekey "{build.source.path}/private.key" --bin "{build.path}/{build.project_name}.bin" --out "{build.path}/{build.project_name}.bin.signed" --legacy "{build.path}/{build.project_name}.bin.legacy_sig"
+recipe.objcopy.hex.3.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.sizes}" --elf "{build.path}/{build.project_name}.elf" --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin"
+
+## Save hex
+recipe.output.tmp_file={build.project_name}.bin
+recipe.output.save_file={build.project_name}.{build.variant}.bin
+
+## Compute size
+recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
+recipe.size.regex=^(?:\.irom0\.text|\.text|\.text1|\.data|\.rodata|)\s+([0-9]+).*
+recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
+#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
+
+# ------------------------------
+
+tools.esptool.path=
+# Because the variable expansion doesn't allow one tool to find another, the following lines
+# will point to "{runtime.platform.path}/tools/python3/python3" in GIT and
+# "{runtime.tools.python3.path}/python3" for JSON board manager releases.
+tools.esptool.cmd={runtime.tools.python3.path}/python3
+tools.esptool.network_cmd={runtime.tools.python3.path}/python3
+
+
+
+tools.esptool.upload.protocol=esp
+# esptool.py --trace option is a debug option, not a verbose option
+tools.esptool.upload.params.verbose=
+tools.esptool.upload.params.quiet=
+
+# First, potentially perform an erase or nothing
+# Next, do the binary upload
+# Combined in one rule because Arduino doesn't suport upload.1.pattern/upload.3.pattern
+tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} {upload.resetmethod} write_flash 0x0 "{build.path}/{build.project_name}.bin"
+
+tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
+
+tools.mkspiffs.cmd=mkspiffs
+tools.mkspiffs.cmd.windows=mkspiffs.exe
+tools.mkspiffs.path={runtime.tools.mkspiffs.path}
+
+tools.mklittlefs.cmd=mklittlefs
+tools.mklittlefs.cmd.windows=mklittlefs.exe
+tools.mklittlefs.path={runtime.platform.path}/tools/mklittlefs
+
+tools.espupload.cmd=python
+tools.espupload.cmd.windows=python.exe
+tools.espupload.path={runtime.platform.path}/tools
+tools.espupload.upload.protocol=espupload
+tools.espupload.upload.params.verbose=
+tools.espupload.upload.params.quiet=
+tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 8e9546ed6..08d5fcd95 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -21,8 +21,13 @@
     - Change libraries/PubSubClient/src/PubSubClient.h
         #define MQTT_MAX_PACKET_SIZE 1200
 
-    - Select IDE Tools - Flash Mode: "DOUT"
-    - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
+  Arduino IDE 1.8.12 and up parameters
+    - Select IDE Tools - Board: "Generic ESP8266 Module"
+    - Select IDE Tools - Flash Mode: "DOUT (compatible)"
+    - Select IDE Tools - Flash Size: "1M (FS:none OTA:~502KB)"
+    - Select IDE Tools - LwIP Variant: "v2 Higher Bandwidth (no feature)"
+    - Select IDE Tools - VTables: "Flash"
+    - Select IDE Tools - Espressif FW: "nonos-sdk-2.2.1+100 (190703)"
   ====================================================*/
 
 // Location specific includes
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 7e7292a8c..6bc4d2b16 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -991,6 +991,7 @@ void HandleWifiLogin(void)
   WSContentStop();
 }
 
+#ifdef USE_LIGHT
 void WebSliderColdWarm(void)
 {
   WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT,  // Cold Warm
@@ -1001,6 +1002,7 @@ void WebSliderColdWarm(void)
     LightGetColorTemp(),
     't', 0);         // t0 - Value id releated to lc("t0", value) and WebGetArg("t0", tmp, sizeof(tmp));
 }
+#endif  // USE_LIGHT
 
 void HandleRoot(void)
 {

From 02ba705ecae60a40a68d5078310e7486145477b7 Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 2 Mar 2020 20:32:55 +0100
Subject: [PATCH 390/403] Shutterbutton does not work for 1 button, fixes #7793

---
 tasmota/xdrv_27_shutter.ino | 64 +++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 96d9ccf5c..b157da933 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -34,7 +34,7 @@ uint16_t messwerte[5] = {30,50,70,90,100};
 uint16_t last_execute_step;
 
 enum ShutterModes { SHT_OFF_OPEN__OFF_CLOSE, SHT_OFF_ON__OPEN_CLOSE, SHT_PULSE_OPEN__PULSE_CLOSE, SHT_OFF_ON__OPEN_CLOSE_STEPPER,};
-enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
+enum ShutterButtonStates { SHT_NOT_PRESSED, SHT_PRESSED_MULTI, SHT_PRESSED_HOLD, SHT_PRESSED_IMMEDIATE, SHT_PRESSED_EXT_HOLD, SHT_PRESSED_MULTI_SIMULTANEOUS, SHT_PRESSED_HOLD_SIMULTANEOUS, SHT_PRESSED_EXT_HOLD_SIMULTANEOUS,};
 
 const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
   D_CMND_SHUTTER_OPEN "|" D_CMND_SHUTTER_CLOSE "|" D_CMND_SHUTTER_STOP "|" D_CMND_SHUTTER_POSITION  "|"
@@ -520,12 +520,12 @@ void ShutterRelayChanged(void)
 
 bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_index) {
   // check for simultaneous shutter button hold
-  uint32 min_shutterbutton_hold_timer = -1;
+  uint32 min_shutterbutton_hold_timer = -1; // -1 == max(uint32)
   for (uint32_t i = 0; i < MAX_KEYS; i++) {
-    if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
+    if ((button_index != i) && (Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (Button.hold_timer[i] < min_shutterbutton_hold_timer))
       min_shutterbutton_hold_timer = Button.hold_timer[i];
   }
-  return (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1));
+  return ((-1 != min_shutterbutton_hold_timer) && (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1)));
 }
 
 void ShutterButtonHandler(void)
@@ -535,8 +535,8 @@ void ShutterButtonHandler(void)
   uint8_t press_index;
   uint32_t button_index = XdrvMailbox.index;
   uint8_t shutter_index = Settings.shutter_button[button_index] & 0x03;
-
   uint16_t loops_per_second = 1000 / Settings.button_debounce;  // ButtonDebounce (50)
+
   if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
     if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action
         buttonState = SHT_PRESSED_MULTI;
@@ -582,11 +582,13 @@ void ShutterButtonHandler(void)
         Button.press_counter[button_index] = 0;
       }
       if ((Button.press_counter[button_index]==0) && (Button.hold_timer[button_index] == loops_per_second * IMMINENT_RESET_FACTOR * Settings.param[P_HOLD_TIME] / 10)) {  // SetOption32 (40) - Button held for factor times longer
+        press_index = -1;
         // check for simultaneous shutter button extend hold
         if (ShutterButtonIsSimultaneousHold(button_index, shutter_index)) {
           // simultaneous shutter button extend hold detected
-          press_index = 0;
           buttonState = SHT_PRESSED_EXT_HOLD_SIMULTANEOUS;
+        } else {
+          buttonState = SHT_PRESSED_EXT_HOLD;
         }
       }
     }
@@ -599,14 +601,13 @@ void ShutterButtonHandler(void)
       if (!restart_flag && !Button.hold_timer[button_index] && (Button.press_counter[button_index] > 0)) {
         if (Button.press_counter[button_index]<99) {
           // check for simultaneous shutter button press
-          uint32 min_shutterbutton_press_counter = -1;
+          uint32 min_shutterbutton_press_counter = -1; // -1 == max(uint32)
           for (uint32_t i = 0; i < MAX_KEYS; i++) {
             AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: Settings.shutter_button[i] %ld, shutter_index %d, Button.press_counter[i] %d, min_shutterbutton_press_counter %d, i %d"), Settings.shutter_button[i], shutter_index, Button.press_counter[i] , min_shutterbutton_press_counter, i);
-            if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (i != button_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
+            if ((button_index != i) && (Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index) && (i != button_index) && (Button.press_counter[i] < min_shutterbutton_press_counter)) {
               min_shutterbutton_press_counter = Button.press_counter[i];
               AddLog_P2(LOG_LEVEL_DEBUG, PSTR("SHT: min_shutterbutton_press_counter %d"), min_shutterbutton_press_counter);
             }
-
           }
           if (min_shutterbutton_press_counter == Button.press_counter[button_index]) {
             // simultaneous shutter button press detected
@@ -628,23 +629,32 @@ void ShutterButtonHandler(void)
     }
   }
 
- if (buttonState != SHT_NOT_PRESSED) {
-   if (buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) {
-     if ((press_index>=5) && (press_index<=7) && (!Settings.flag.button_restrict)) { // 5x..7x && no SetOption1 (0)
-       // simultaneous shutter button press 5x, 6x, 7x detected
-       char scmnd[20];
-       GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) {
-     if (!Settings.flag.button_restrict) { // no SetOption1 (0)
-       char scmnd[20];
-       snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
-       ExecuteCommand(scmnd, SRC_BUTTON);
-       return;
-     }
-   } else if (buttonState <= SHT_PRESSED_IMMEDIATE) {
+  if (buttonState != SHT_NOT_PRESSED) {
+    if ((!Settings.flag.button_restrict) && (((press_index>=5) && (press_index<=7)) || (buttonState == SHT_PRESSED_EXT_HOLD) || (buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS))){
+      // check number of buttons for this shutter
+      uint8_t shutter_index_num_buttons = 0;
+      for (uint32_t i = 0; i < MAX_KEYS; i++) {
+        if ((Settings.shutter_button[i] & (1<<31)) && ((Settings.shutter_button[i] & 0x03) == shutter_index)) {
+          shutter_index_num_buttons++;
+        }
+      }
+      if ((buttonState == SHT_PRESSED_MULTI_SIMULTANEOUS) || ((shutter_index_num_buttons==1) && (buttonState == SHT_PRESSED_MULTI))){
+        // 5x..7x && no SetOption1 (0) checked above
+        // simultaneous or stand alone button press 5x, 6x, 7x detected
+        char scmnd[20];
+        GetTextIndexed(scmnd, sizeof(scmnd), press_index -3, kCommands);
+        ExecuteCommand(scmnd, SRC_BUTTON);
+        return;
+      } else if ((buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) || ((shutter_index_num_buttons==1) && (buttonState == SHT_PRESSED_EXT_HOLD))){
+        // no SetOption1 (0) checked above
+        // simultaneous or stand alone button extended hold detected
+        char scmnd[20];
+        snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
+        ExecuteCommand(scmnd, SRC_BUTTON);
+        return;
+      }
+    }
+    if (buttonState <= SHT_PRESSED_IMMEDIATE) {
       if (Settings.shutter_startrelay[shutter_index] && Settings.shutter_startrelay[shutter_index] <9) {
         uint8_t pos_press_index = (buttonState == SHT_PRESSED_HOLD) ? 3 : (press_index-1);
         if (pos_press_index>3) pos_press_index=3;
@@ -686,7 +696,7 @@ void ShutterButtonHandler(void)
       } // if   if (Settings.shutter_startrelay[shutter_index]
     }
     Response_P(PSTR("{"));
-    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_IMMEDIATE) ? (button_index+1) : 0, press_index);
+    ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, (buttonState <= SHT_PRESSED_EXT_HOLD) ? (button_index+1) : 0, press_index);
     ResponseJsonEnd();
     MqttPublishPrefixTopic_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
     XdrvRulesProcess();

From 543f83218eb5f5fb4798c6017888f33993404f5a Mon Sep 17 00:00:00 2001
From: to-scho <tobias.scholand@gmail.com>
Date: Mon, 2 Mar 2020 20:49:11 +0100
Subject: [PATCH 391/403] extended multipress window from 0.5s to 0.75s

---
 tasmota/xdrv_27_shutter.ino | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasmota/xdrv_27_shutter.ino b/tasmota/xdrv_27_shutter.ino
index 96d9ccf5c..f31c9dbc2 100644
--- a/tasmota/xdrv_27_shutter.ino
+++ b/tasmota/xdrv_27_shutter.ino
@@ -548,7 +548,8 @@ void ShutterButtonHandler(void)
         Button.press_counter[button_index] = 99; // Remember to discard further action for press & hold within button timings
       } else {
         Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;
-        Button.window_timer[button_index] = loops_per_second / 2;  // 0.5 second multi press window
+        // Button.window_timer[button_index] = (Button.press_counter[button_index]==1) ? loops_per_second / 2 : loops_per_second;  // 0.5 second multi press window after 1st press, 1s afterwards
+        Button.window_timer[button_index] = (loops_per_second >> 2) * 3; // 0.75 second multi press window 
       }
     }
     blinks = 201;

From 3a2a3cde8892f44472c854ffa6245d180baacaeb Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 4 Mar 2020 08:59:45 +0100
Subject: [PATCH 392/403] Sync with
 https://github.com/esp8266/Arduino/pull/7057

---
 tasmota/core_esp8266_waveform.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tasmota/core_esp8266_waveform.cpp b/tasmota/core_esp8266_waveform.cpp
index 2a0e8415b..0e4beeef2 100644
--- a/tasmota/core_esp8266_waveform.cpp
+++ b/tasmota/core_esp8266_waveform.cpp
@@ -170,6 +170,13 @@ static inline ICACHE_RAM_ATTR uint32_t min_u32(uint32_t a, uint32_t b) {
   return b;
 }
 
+static inline ICACHE_RAM_ATTR int32_t max_32(int32_t a, int32_t b) {
+    if (a < b) {
+        return b;
+    }
+    return a;
+}
+
 // Stops a waveform on a pin
 int ICACHE_RAM_ATTR stopWaveform(uint8_t pin) {
   // Can't possibly need to stop anything if there is no timer active
@@ -261,6 +268,13 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
         // Check for toggles
         int32_t cyclesToGo = wave->nextServiceCycle - now;
         if (cyclesToGo < 0) {
+          // See #7057
+          // The following is a no-op unless we have overshot by an entire waveform cycle.
+          // As modulus is an expensive operation, this code is removed for now:
+          // cyclesToGo = -((-cyclesToGo) % (wave->nextTimeHighCycles + wave->nextTimeLowCycles));
+          //
+          // Alternative version with lower CPU impact:
+          // while (-cyclesToGo > wave->nextTimeHighCycles + wave->nextTimeLowCycles) { cyclesToGo += wave->nextTimeHighCycles + wave->nextTimeLowCycles)};
           waveformState ^= mask;
           if (waveformState & mask) {
             if (i == 16) {
@@ -268,16 +282,16 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
             } else {
               SetGPIO(mask);
             }
-            wave->nextServiceCycle = now + wave->nextTimeHighCycles + cyclesToGo;
-            nextEventCycles = min_u32(nextEventCycles, min_u32(wave->nextTimeHighCycles + cyclesToGo, 1));
+            wave->nextServiceCycle += wave->nextTimeHighCycles;
+            nextEventCycles = min_u32(nextEventCycles, max_32(wave->nextTimeHighCycles + cyclesToGo, microsecondsToClockCycles(1)));
           } else {
             if (i == 16) {
               GP16O &= ~1; // GPIO16 write slow as it's RMW
             } else {
               ClearGPIO(mask);
             }
-            wave->nextServiceCycle = now + wave->nextTimeLowCycles + cyclesToGo;
-            nextEventCycles = min_u32(nextEventCycles, min_u32(wave->nextTimeLowCycles + cyclesToGo, 1));
+            wave->nextServiceCycle += wave->nextTimeLowCycles;
+            nextEventCycles = min_u32(nextEventCycles, max_32(wave->nextTimeLowCycles + cyclesToGo, microsecondsToClockCycles(1)));
           }
         } else {
           uint32_t deltaCycles = wave->nextServiceCycle - now;

From f0a8305b136d96097090fc68405d8c00ddb8f99c Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 11:56:35 +0100
Subject: [PATCH 393/403] Add localization for Romanian

---
 .travis.yml                |   1 +
 platformio.ini             |   1 +
 platformio_tasmota_env.ini |   3 +
 tasmota/language/ro-RO.h   | 728 +++++++++++++++++++++++++++++++++++++
 tasmota/my_user_config.h   |   1 +
 5 files changed, 734 insertions(+)
 create mode 100644 tasmota/language/ro-RO.h

diff --git a/.travis.yml b/.travis.yml
index 88e971a06..5e5885f65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ env:
   - ENV=tasmota-NL
   - ENV=tasmota-PL
   - ENV=tasmota-PT
+  - ENV=tasmota-RO
   - ENV=tasmota-RU
   - ENV=tasmota-SE
   - ENV=tasmota-SK
diff --git a/platformio.ini b/platformio.ini
index 552408790..198e47264 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -40,6 +40,7 @@ default_envs =
 ;                tasmota-NL
 ;                tasmota-PL
 ;                tasmota-PT
+;                tasmota-RO
 ;                tasmota-RU
 ;                tasmota-SE
 ;                tasmota-SK
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index cfcd53686..a09f01ecd 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -82,6 +82,9 @@ build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
 [env:tasmota-PT]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
 
+[env:tasmota-RO]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=ro-RO
+
 [env:tasmota-RU]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
 
diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h
new file mode 100644
index 000000000..cc75273af
--- /dev/null
+++ b/tasmota/language/ro-RO.h
@@ -0,0 +1,728 @@
+/*
+  ro-RO.h - localization for Romanian - Romania and Moldova for Tasmota
+
+  Copyright (C) 2020  Theo Arends
+
+  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 _LANGUAGE_RO_RO_H_
+#define _LANGUAGE_RO_RO_H_
+
+/*************************** ATTENTION *******************************\
+ *
+ * Due to memory constraints only UTF-8 is supported.
+ * To save code space keep text as short as possible.
+ * Time and Date provided by SDK can not be localized (yet).
+ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
+ * Use online command Prefix to translate cmnd, stat and tele.
+ *
+ * Updated until v8.1.0.10
+\*********************************************************************/
+
+//#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
+// https://www.science.co.il/language/Locale-codes.php
+#define LANGUAGE_LCID 2072
+// HTML (ISO 639-1) Language Code
+#define D_HTML_LANGUAGE "ro"
+
+// "2017-03-07T11:08:02" - ISO8601:2004
+#define D_YEAR_MONTH_SEPARATOR "-"
+#define D_MONTH_DAY_SEPARATOR "-"
+#define D_DATE_TIME_SEPARATOR "T"
+#define D_HOUR_MINUTE_SEPARATOR ":"
+#define D_MINUTE_SECOND_SEPARATOR ":"
+
+#define D_DAY3LIST "DumLunMarMieJoiVinSâm"
+#define D_MONTH3LIST "IanFebMarAprMaiIunIulAugSepOctNoeDec"
+
+// Non JSON decimal separator
+#define D_DECIMAL_SEPARATOR "."
+
+// Common
+#define D_ADMIN "Admin"
+#define D_AIR_QUALITY "Calitatea aerului"
+#define D_AP "AP"                    // Access Point
+#define D_AS "as"
+#define D_AUTO "AUTO"
+#define D_BLINK "Blink"
+#define D_BLINKOFF "BlinkOff"
+#define D_BOOT_COUNT "Boot Count"
+#define D_BRIGHTLIGHT "Strălucire"
+#define D_BSSID "BSSId"
+#define D_BUTTON "Buton"
+#define D_BY "de"                    // Written by me
+#define D_BYTES "Bytes"
+#define D_CELSIUS "Celsius"
+#define D_CHANNEL "Canal"
+#define D_CO2 "Dioxid de carbon"
+#define D_CODE "cod"                // Button code
+#define D_COLDLIGHT "Rece"
+#define D_COMMAND "Comandă"
+#define D_CONNECTED "Conectat"
+#define D_CORS_DOMAIN "Domeniu CORS"
+#define D_COUNT "Numărătoare"
+#define D_COUNTER "Contor"
+#define D_CT_POWER "Putere Transformată"
+#define D_CURRENT "Curent"          // As in Voltage and Current
+#define D_DA;TA "Date"
+#define D_DARKLIGHT "Întunecat"
+#define D_DEBUG "Depanare"
+#define D_DISABLED "Dezactivat"
+#define D_DISTANCE "Distanță"
+#define D_DNS_SERVER "Server DNS"
+#define D_DONE "Terminat"
+#define D_DST_TIME "DST"
+#define D_ECO2 "eCO₂"
+#define D_EMULATION "Emulație"
+#define D_ENABLED "Abilitat"
+#define D_ERASE "Șterge"
+#define D_ERROR "Eroare"
+#define D_FAHRENHEIT "Fahrenheit"
+#define D_FAILED "Eșuat"
+#define D_FALLBACK "Rezervă"
+#define D_FALLBACK_TOPIC "Listă de rezervă"
+#define D_FALSE "Fals"
+#define D_FILE "Fișier"
+#define D_FLOW_RATE "Debit"
+#define D_FREE_MEMORY "Memorie Liberă"
+#define D_FREQUENCY "Frecvență"
+#define D_GAS "Gaz"
+#define D_GATEWAY "Gateway"
+#define D_GROUP "Grup"
+#define D_HOST "Gazdă"
+#define D_HOSTNAME "Hostname"
+#define D_HUMIDITY "Umiditate"
+#define D_ILLUMINANCE "Iluminare"
+#define D_IMMEDIATE "imediat"      // Button immediate
+#define D_INDEX "Index"
+#define D_INFO "Info"
+#define D_INFRARED "Infraroșu"
+#define D_INITIALIZED "Inițializat"
+#define D_IP_ADDRESS "Adresă IP"
+#define D_LIGHT "Lumină"
+#define D_LWT "LWT"
+#define D_MODULE "Modul"
+#define D_MOISTURE "Umezeală"
+#define D_MQTT "MQTT"
+#define D_MULTI_PRESS "selectare multiplă"
+#define D_NOISE "Zgomot"
+#define D_NONE "Lipsă"
+#define D_OFF "Închis"
+#define D_OFFLINE "Offline"
+#define D_OK "Ok"
+#define D_ON "Aprins"
+#define D_ONLINE "Online"
+#define D_PASSWORD "Parolă"
+#define D_PORT "Port"
+#define D_POWER_FACTOR "Factor de Putere"
+#define D_POWERUSAGE "Putere"
+#define D_POWERUSAGE_ACTIVE "Putere Activă"
+#define D_POWERUSAGE_APPARENT "Putere Aparentă"
+#define D_POWERUSAGE_REACTIVE "Putere Reactivă"
+#define D_PRESSURE "Presiune"
+#define D_PRESSUREATSEALEVEL "Presiune atmosferică"
+#define D_PROGRAM_FLASH_SIZE "Mărimea Programului Flash"
+#define D_PROGRAM_SIZE "Mărimea Programului"
+#define D_PROJECT "Proiect"
+#define D_RAIN "Ploaie"
+#define D_RANGE "Distanță"
+#define D_RECEIVED "Primit"
+#define D_RESTART "Restart"
+#define D_RESTARTING "Restartare"
+#define D_RESTART_REASON "Motiv Restartare"
+#define D_RESTORE "Restaurare"
+#define D_RETAINED "Păstrare"
+#define D_RULE "Regulă"
+#define D_SAVE "Salvare"
+#define D_SENSOR "Senzor"
+#define D_SSID "SSId"
+#define D_START "Start"
+#define D_STD_TIME "STD"
+#define D_STOP "Stop"
+#define D_SUBNET_MASK "Subnet Mask"
+#define D_SUBSCRIBE_TO "Înscriere la"
+#define D_UNSUBSCRIBE_FROM "Renunțare de la"
+#define D_SUCCESSFUL "Succes"
+#define D_SUNRISE "Răsărit"
+#define D_SUNSET "Apus"
+#define D_TEMPERATURE "Temperatură"
+#define D_TO "la"
+#define D_TOGGLE "Comută"
+#define D_TOPIC "Topic"
+#define D_TOTAL_USAGE "Folosință totală"
+#define D_TRANSMIT "Transmitere"
+#define D_TRUE "Adevărat"
+#define D_TVOC "TVOC"
+#define D_UPGRADE "actualizare"
+#define D_UPLOAD "Încarcare"
+#define D_UPTIME "Folosință"
+#define D_USER "Utilizator"
+#define D_UTC_TIME "UTC"
+#define D_UV_INDEX "Index UV"
+#define D_UV_INDEX_1 "Mic"
+#define D_UV_INDEX_2 "Mediu"
+#define D_UV_INDEX_3 "Mare"
+#define D_UV_INDEX_4 "Pericol"
+#define D_UV_INDEX_5 "ArdereL1/2"
+#define D_UV_INDEX_6 "ArdereL3"
+#define D_UV_INDEX_7 "În afara intervalului"         // Out of Range
+#define D_UV_LEVEL "Nivel UV"
+#define D_UV_POWER "Putere UV"
+#define D_VERSION "Versiune"
+#define D_VOLTAGE "Voltaj"
+#define D_WEIGHT "Greutate"
+#define D_WARMLIGHT "Cald"
+#define D_WEB_SERVER "Server Web"
+
+// tasmota.ino
+#define D_WARNING_MINIMAL_VERSION "ATENȚIE Această versiune nu suportă setări permanente"
+#define D_LEVEL_10 "nivel 1-0"
+#define D_LEVEL_01 "nivel 0-1"
+#define D_SERIAL_LOGGING_DISABLED "Logare serială dezactivată"
+#define D_SYSLOG_LOGGING_REENABLED "Logare Syslog activată"
+
+#define D_SET_BAUDRATE_TO "Setare Baudrate la"
+#define D_RECEIVED_TOPIC "Listă Primită"
+#define D_DATA_SIZE "Mărime Date"
+#define D_ANALOG_INPUT "Analog"
+
+// support.ino
+#define D_OSWATCH "osWatch"
+#define D_BLOCKED_LOOP "Circuit blocat"
+#define D_WPS_FAILED_WITH_STATUS "status WPSconfig EȘUAT"
+#define D_ACTIVE_FOR_3_MINUTES "activ pentru 3 minute"
+#define D_FAILED_TO_START "start eșuat"
+#define D_PATCH_ISSUE_2186 "emitere patch 2186"
+#define D_CONNECTING_TO_AP "Conectare la AP"
+#define D_IN_MODE "in mode"
+#define D_CONNECT_FAILED_NO_IP_ADDRESS "Conexiune eșuată, lipsă primire adresă IP"
+#define D_CONNECT_FAILED_AP_NOT_REACHED "Conexiune eșuată,nu s-a găsit AP"
+#define D_CONNECT_FAILED_WRONG_PASSWORD "Conexiune eșuată,parolă greșită AP"
+#define D_CONNECT_FAILED_AP_TIMEOUT "Conexiune eșuată,expirare timp AP"
+#define D_ATTEMPTING_CONNECTION "Conectare in curs ..."
+#define D_CHECKING_CONNECTION "Verificare conexiune..."
+#define D_QUERY_DONE "Query terminat. Servicii MQTT găsite"
+#define D_MQTT_SERVICE_FOUND "Servicii MQTT găsite"
+#define D_FOUND_AT "Găsite la"
+#define D_SYSLOG_HOST_NOT_FOUND "Lipsă gazdă Syslog"
+
+// settings.ino
+#define D_SAVED_TO_FLASH_AT "Salvat pe flash la"
+#define D_LOADED_FROM_FLASH_AT "Încărcat din flash la"
+#define D_USE_DEFAULTS "Folosește setari fabrica"
+#define D_ERASED_SECTOR "Sector șters"
+
+// xdrv_02_webserver.ino
+#define D_NOSCRIPT "Pentru a folosi Tasmota, vă rugăm abilitați JavaScript"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "firmware MINIMAL<br>vă rugăm actualizați"
+#define D_WEBSERVER_ACTIVE_ON "Server Web activ"
+#define D_WITH_IP_ADDRESS "cu adresa IP "
+#define D_WEBSERVER_STOPPED "Server Web oprit"
+#define D_FILE_NOT_FOUND "Lipsă fișier"
+#define D_REDIRECTED "Redirecționat la captive portal"
+#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager set AccessPoint cu păstrare Stație"
+#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager set AccessPoint"
+#define D_TRYING_TO_CONNECT "Încercare conectare la rețea"
+
+#define D_RESTART_IN "Restart în"
+#define D_SECONDS "secunde"
+#define D_DEVICE_WILL_RESTART "echipamentul va reporni în cateva secunde"
+#define D_BUTTON_TOGGLE "Comutare"
+#define D_CONFIGURATION "Configurație"
+#define D_INFORMATION "Informație"
+#define D_FIRMWARE_UPGRADE "Actualizare Firmware"
+#define D_CONSOLE "Consolă"
+#define D_CONFIRM_RESTART "Confirmare Restart"
+
+#define D_CONFIGURE_MODULE "Configurare Modul"
+#define D_CONFIGURE_WIFI "Configurare WiFi"
+#define D_CONFIGURE_MQTT "Configurare MQTT"
+#define D_CONFIGURE_DOMOTICZ "Configurare Domoticz"
+#define D_CONFIGURE_LOGGING "Configurare Logging"
+#define D_CONFIGURE_OTHER "Altă configurare"
+#define D_CONFIRM_RESET_CONFIGURATION "Confirmă Reset Configurare"
+#define D_RESET_CONFIGURATION "Reseteaza Configurare"
+#define D_BACKUP_CONFIGURATION "Backup Configurare"
+#define D_RESTORE_CONFIGURATION "Restaurează Configurație"
+#define D_MAIN_MENU "Meniu Principal"
+
+#define D_MODULE_PARAMETERS "Parametri modul"
+#define D_MODULE_TYPE "Tip modul"
+#define D_PULLUP_ENABLE "Fără Buton/Întrerupător"
+#define D_ADC "ADC"
+#define D_GPIO "GPIO"
+#define D_SERIAL_IN "Intrare Serială"
+#define D_SERIAL_OUT "Ieșire Serială"
+
+#define D_WIFI_PARAMETERS "Parameteri Wifi"
+#define D_SCAN_FOR_WIFI_NETWORKS "Scanare rețele wifi"
+#define D_SCAN_DONE "Scanare terminată"
+#define D_NO_NETWORKS_FOUND "Lipsă rețele găsite"
+#define D_REFRESH_TO_SCAN_AGAIN "Refresh pentru o nouă scanare"
+#define D_DUPLICATE_ACCESSPOINT "Clonează AccessPoint"
+#define D_SKIPPING_LOW_QUALITY "Omite,joasă calitate"
+#define D_RSSI "RSSI"
+#define D_WEP "WEP"
+#define D_WPA_PSK "WPA PSK"
+#define D_WPA2_PSK "WPA2 PSK"
+#define D_AP1_SSID "AP1 SSId"
+#define D_AP1_PASSWORD "Parolă AP1"
+#define D_AP2_SSID "AP2 SSId"
+#define D_AP2_PASSWORD "Parolă AP2"
+
+#define D_MQTT_PARAMETERS "parametri MQTT"
+#define D_CLIENT "Client"
+#define D_FULL_TOPIC "Full Topic"
+
+#define D_LOGGING_PARAMETERS "parametri Logging"
+#define D_SERIAL_LOG_LEVEL "Nivel Serial log"
+#define D_MQTT_LOG_LEVEL "Nivel Mqtt log"
+#define D_WEB_LOG_LEVEL "Nivel Web log"
+#define D_SYS_LOG_LEVEL "Nivel Syslog"
+#define D_MORE_DEBUG "Depanare detailată"
+#define D_SYSLOG_HOST "Syslog Gazdă "
+#define D_SYSLOG_PORT "Syslog port"
+#define D_TELEMETRY_PERIOD "Perioadă Telemetrie"
+
+#define D_OTHER_PARAMETERS "Alți paramatri"
+#define D_TEMPLATE "Template"
+#define D_ACTIVATE "Activare"
+#define D_WEB_ADMIN_PASSWORD "Parolă Web Admin"
+#define D_MQTT_ENABLE "Abilitare MQTT"
+#define D_FRIENDLY_NAME "Friendly Name"
+#define D_BELKIN_WEMO "Belkin WeMo"
+#define D_HUE_BRIDGE "Hue Bridge"
+#define D_SINGLE_DEVICE "echipament unic"
+#define D_MULTI_DEVICE "echipament multiplu"
+
+#define D_CONFIGURE_TEMPLATE "Configurare Template"
+#define D_TEMPLATE_PARAMETERS "Parametri Template"
+#define D_TEMPLATE_NAME "Nume"
+#define D_BASE_TYPE "Bazat pe"
+#define D_TEMPLATE_FLAGS "Opțiuni"
+
+#define D_SAVE_CONFIGURATION "Salvează configurația"
+#define D_CONFIGURATION_SAVED "Configurația salvată"
+#define D_CONFIGURATION_RESET "Configurația resetată"
+
+#define D_PROGRAM_VERSION "Versiunea Program"
+#define D_BUILD_DATE_AND_TIME "Creare Data & Timp"
+#define D_CORE_AND_SDK_VERSION "Versiunea Core/SDK"
+#define D_FLASH_WRITE_COUNT "Spațiu Flash scris"
+#define D_MAC_ADDRESS "Adresă MAC"
+#define D_MQTT_HOST "Gazdă MQTT"
+#define D_MQTT_PORT "Port MQTT"
+#define D_MQTT_CLIENT "Client MQTT"
+#define D_MQTT_USER "Uilizator MQTT"
+#define D_MQTT_TOPIC "Listă MQTT"
+#define D_MQTT_GROUP_TOPIC "Listă Grup MQTT"
+#define D_MQTT_FULL_TOPIC "Listă Întreagă MQTT"
+#define D_MDNS_DISCOVERY "Descoperă mDNS"
+#define D_MDNS_ADVERTISE "Publică mDNS"
+#define D_ESP_CHIP_ID "ESP Chip Id"
+#define D_FLASH_CHIP_ID "Flash Chip Id"
+#define D_FLASH_CHIP_SIZE "Mărime Flash"
+#define D_FREE_PROGRAM_SPACE "Spațiu Disponibil Program"
+
+#define D_UPGRADE_BY_WEBSERVER "Actualizat de web server"
+#define D_OTA_URL "OTA Url"
+#define D_START_UPGRADE "Porneste actualizare"
+#define D_UPGRADE_BY_FILE_UPLOAD "Actualizare cu încărcare fișier"
+#define D_UPLOAD_STARTED "Încărcare începută"
+#define D_UPGRADE_STARTED "Actualizare începută"
+#define D_UPLOAD_DONE "Încărcare terminată"
+#define D_UPLOAD_ERR_1 "Nici un fișier selectat"
+#define D_UPLOAD_ERR_2 "Spațiu insuficient"
+#define D_UPLOAD_ERR_3 "Magic byte nu este 0xE9"
+#define D_UPLOAD_ERR_4 "Dimensiunea programului este mai mare decât mărimea memoriei"
+#define D_UPLOAD_ERR_5 "Încărcare buffer necomparabil"
+#define D_UPLOAD_ERR_6 "Încărcare eșuată. Abilitează logging 3"
+#define D_UPLOAD_ERR_7 "Încărcare aulată"
+#define D_UPLOAD_ERR_8 "Fișier invalid"
+#define D_UPLOAD_ERR_9 "Fișier prea mare"
+#define D_UPLOAD_ERR_10 "Inițiere chip RF eșuată"
+#define D_UPLOAD_ERR_11 "Ștergere chip RF eșuată"
+#define D_UPLOAD_ERR_12 "Scriere chip RF eșuată"
+#define D_UPLOAD_ERR_13 "Decodare RF firmware eșuată"
+#define D_UPLOAD_ERR_14 "Incompatibil"
+#define D_UPLOAD_ERROR_CODE "Încărcare cod eroare"
+
+#define D_ENTER_COMMAND "Introdu comandă"
+#define D_ENABLE_WEBLOG_FOR_RESPONSE "Abilitează weblog 2 dacă există răspunsul așteptat"
+#define D_NEED_USER_AND_PASSWORD "Necesită utilizator=<nume utilizator>&parolă=<parolă>"
+
+// xdrv_01_mqtt.ino
+#define D_FINGERPRINT "Verifică amprenta TLS..."
+#define D_TLS_CONNECT_FAILED_TO "Conexiune TLS eșuată"
+#define D_RETRY_IN "Reâncearcă în"
+#define D_VERIFIED "Verificat folosind amprenta"
+#define D_INSECURE "Conexiune nesigură din cauza amprentei eșuate"
+#define D_CONNECT_FAILED_TO "Eșuare conectare la"
+
+// xplg_wemohue.ino
+#define D_MULTICAST_DISABLED "Multicast dezabilitat"
+#define D_MULTICAST_REJOINED "Multicast (re)conectat"
+#define D_MULTICAST_JOIN_FAILED "Multicast conectare eșuată"
+#define D_FAILED_TO_SEND_RESPONSE "Trimitere răspuns eșuată"
+
+#define D_WEMO "WeMo"
+#define D_WEMO_BASIC_EVENT "WeMo eveniment basic"
+#define D_WEMO_EVENT_SERVICE "WeMo service eveniment"
+#define D_WEMO_META_SERVICE "WeMo meta service"
+#define D_WEMO_SETUP "Configurare WeMo"
+#define D_RESPONSE_SENT "Răspuns trimis"
+
+#define D_HUE "Hue"
+#define D_HUE_BRIDGE_SETUP "Configurare Hue"
+#define D_HUE_API_NOT_IMPLEMENTED "Hue API neimplementat"
+#define D_HUE_API "Hue API"
+#define D_HUE_POST_ARGS "Hue POST args"
+#define D_3_RESPONSE_PACKETS_SENT "3 pachete de răspuns trimise"
+
+// xdrv_07_domoticz.ino
+#define D_DOMOTICZ_PARAMETERS "Parametri Domoticz"
+#define D_DOMOTICZ_IDX "Idx"
+#define D_DOMOTICZ_KEY_IDX "Key idx"
+#define D_DOMOTICZ_SWITCH_IDX "Întrerupator idx"
+#define D_DOMOTICZ_SENSOR_IDX "Senzor idx"
+  #define D_DOMOTICZ_TEMP "Temp"
+  #define D_DOMOTICZ_TEMP_HUM "Temp,U!mid"
+  #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Umid,Baro"
+  #define D_DOMOTICZ_POWER_ENERGY "Putere,Energie"
+  #define D_DOMOTICZ_ILLUMINANCE "Iluminare"
+  #define D_DOMOTICZ_COUNT "Contor/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltaj/PM2.5"
+  #define D_DOMOTICZ_CURRENT "Curent/PM10"
+  #define D_DOMOTICZ_AIRQUALITY "Calitatea Aerului"
+  #define D_DOMOTICZ_P1_SMART_METER "P1SmartMeter"
+#define D_DOMOTICZ_UPDATE_TIMER "Actualizare Cronometrare"
+
+// xdrv_09_timers.ino
+#define D_CONFIGURE_TIMER "Configurare Cronometrare"
+#define D_TIMER_PARAMETERS "Parameteri Cronometrare"
+#define D_TIMER_ENABLE "Abilitează Cronometrare"
+#define D_TIMER_ARM "Arm"
+#define D_TIMER_TIME "Timp"
+#define D_TIMER_DAYS "Zile"
+#define D_TIMER_REPEAT "Repetă"
+#define D_TIMER_OUTPUT "Ieșire"
+#define D_TIMER_ACTION "Acțiune"
+
+// xdrv_10_knx.ino
+#define D_CONFIGURE_KNX "Configurare KNX"
+#define D_KNX_PARAMETERS "Parameteri KNX"
+#define D_KNX_GENERAL_CONFIG "General"
+#define D_KNX_PHYSICAL_ADDRESS "Adresă fizică"
+#define D_KNX_PHYSICAL_ADDRESS_NOTE "(Trebuie să fie unică în rețeaua KNX)"
+#define D_KNX_ENABLE "Abilitează KNX"
+#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data de trimis la adresele grupului"
+#define D_ADD "Adaugă"
+#define D_DELETE "Șterge"
+#define D_REPLY "Răspunde"
+#define D_KNX_GROUP_ADDRESS_TO_READ "Datele primite pentru adresele grupului"
+#define D_RECEIVED_FROM "Primit de la"
+#define D_KNX_COMMAND_WRITE "Scrie"
+#define D_KNX_COMMAND_READ "Citește"
+#define D_KNX_COMMAND_OTHER "Altele"
+#define D_SENT_TO "trimite la"
+#define D_KNX_WARNING "Adresa grupului ( 0 / 0 / 0 ) este rezervată și nu se poate folosi."
+#define D_KNX_ENHANCEMENT "Îmbunătățire Communicație"
+#define D_KNX_TX_SLOT "KNX TX"
+#define D_KNX_RX_SLOT "KNX RX"
+
+// xdrv_03_energy.ino
+#define D_ENERGY_TODAY "Energia de Azi"
+#define D_ENERGY_YESTERDAY "Energia de Ieri"
+#define D_ENERGY_TOTAL "Energia Totală"
+
+// xdrv_27_shutter.ino
+#define D_OPEN "Deschide"
+#define D_CLOSE "Inchide"
+#define D_DOMOTICZ_SHUTTER "Shutter"
+
+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configurează PCF8574"
+#define D_PCF8574_PARAMETERS "Parameteri PCF8574"
+#define D_INVERT_PORTS "Inversează Porturile"
+#define D_DEVICE "echipament"
+#define D_DEVICE_INPUT "Intrare"
+#define D_DEVICE_OUTPUT "Ieșire"
+
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Senzor ocupat"
+#define D_SENSOR_CRC_ERROR "Eroare senzor CRC"
+#define D_SENSORS_FOUND "Descoperit senzor"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Timp expirat așteptare pentru"
+#define D_START_SIGNAL_LOW "Semnal inițiere mic"
+#define D_START_SIGNAL_HIGH "Semnal inițiere mare"
+#define D_PULSE "puls"
+#define D_CHECKSUM_FAILURE "Eroare Checksum"
+
+// xsns_07_sht1x.ino
+#define D_SENSOR_DID_NOT_ACK_COMMAND "Senzorul nu a primit comanda ACK"
+#define D_SHT1X_FOUND " Descoperit SHT1X"
+
+// xsns_18_pms5003.ino
+#define D_STANDARD_CONCENTRATION "CF-1 PM"     // Standard Particle CF-1 Particle Matter
+#define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
+#define D_PARTICALS_BEYOND "Particule"
+
+// xsns_32_mpu6050.ino
+#define D_AX_AXIS "Accel.Axa-X"
+#define D_AY_AXIS "Accel.Axa-Y"
+#define D_AZ_AXIS "Accel.Axa-Z"
+#define D_GX_AXIS "Gyro Axa-X"
+#define D_GY_AXIS "Gyro Axa-Y"
+#define D_GZ_AXIS "Gyro Axa-Z"
+
+// xsns_34_hx711.ino
+#define D_HX_CAL_REMOVE "Elimină greutatea"
+#define D_HX_CAL_REFERENCE "Așează greutatea de referință"
+#define D_HX_CAL_DONE "Calibrat"
+#define D_HX_CAL_FAIL "Eroare Calibrare"
+#define D_RESET_HX711 "Reset Balanța"
+#define D_CONFIGURE_HX711 "Configurare Balanța"
+#define D_HX711_PARAMETERS "Parametri Balanța"
+#define D_ITEM_WEIGHT "Greutatea obiectului"
+#define D_REFERENCE_WEIGHT "Greutatea de referință"
+#define D_CALIBRATE "Calibrează"
+#define D_CALIBRATION "Execută Calibrarea"
+
+//xsns_35_tx20.ino
+#define D_TX20_WIND_DIRECTION "Direcția vântului"
+#define D_TX20_WIND_SPEED "Viteza vântului"
+#define D_TX20_WIND_SPEED_MIN "Viteza vântului Min"
+#define D_TX20_WIND_SPEED_MAX "Viteza vântului Max"
+#define D_TX20_NORTH "N"
+#define D_TX20_EAST "E"
+#define D_TX20_SOUTH "S"
+#define D_TX20_WEST "V"
+
+// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
+#define D_SENSOR_NONE          "Fără"
+#define D_SENSOR_USER          "Utilizator"
+#define D_SENSOR_DHT11         "DHT11"
+#define D_SENSOR_AM2301        "AM2301"
+#define D_SENSOR_SI7021        "SI7021"
+#define D_SENSOR_DS18X20       "DS18x20"
+#define D_SENSOR_I2C_SCL       "I2C SCL"
+#define D_SENSOR_I2C_SDA      ; "I2C SDA"
+#define D_SENSOR_WS2812        "WS2812"
+#define D_SENSOR_DFR562        "MP3 Player"
+#define D_SENSOR_IRSEND        "IRsend"
+#define D_SENSOR_SWITCH        "Întrerupator"     // Suffix "1"
+#define D_SENSOR_BUTTON        "Buton"     // Suffix "1"
+#define D_SENSOR_RELAY         "Releu"      // Suffix "1i"
+#define D_SENSOR_LED           "Led"        // Suffix "1i"
+#define D_SENSOR_LED_LINK      "LedLink"    // Suffix "i"
+#define D_SENSOR_PWM           "PWM"        // Suffix "1"
+#define D_SENSOR_COUNTER       "Contor"    // Suffix "1"
+#define D_SENSOR_IRRECV        "IRrecv"
+#define D_SENSOR_MHZ_RX        "MHZ Rx"
+#define D_SENSOR_MHZ_TX        "MHZ Tx"
+#define D_SENSOR_PZEM004_RX    "PZEM004 Rx"
+#define D_SENSOR_PZEM016_RX    "PZEM016 Rx"
+#define D_SENSOR_PZEM017_RX    "PZEM017 Rx"
+#define D_SENSOR_PZEM0XX_TX    "PZEM0XX Tx"
+#define D_SENSOR_SAIR_RX       "SAir Rx"
+#define D_SENSOR_SAIR_TX       "SAir Tx"
+#define D_SENSOR_SPI_CS        "SPI CS"
+#define D_SENSOR_SPI_DC        "SPI DC"
+#define D_SENSOR_SPI_MISO      "SPI MISO"
+#define D_SENSOR_SPI_MOSI      "SPI MOSI"
+#define D_SENSOR_SPI_CLK       "SPI CLK"
+#define D_SENSOR_BACKLIGHT     "Backlight"
+#define D_SENSOR_PMS5003       "PMS5003"
+#define D_SENSOR_SDS0X1_RX     "SDS0X1 Rx"
+#define D_SENSOR_SDS0X1_TX     "SDS0X1 Tx"
+#define D_SENSOR_HPMA_RX       "HPMA Rx"
+#define D_SENSOR_HPMA_TX       "HPMA Tx"
+#define D_SENSOR_SBR_RX        "SerBr Rx"
+#define D_SENSOR_SBR_TX        "SerBr Tx"
+#define D_SENSOR_SR04_TRIG     "SR04 Tri/TX"
+#define D_SENSOR_SR04_ECHO     "SR04 Ech/RX"
+#define D_SENSOR_SDM120_TX     "SDMx20 Tx"
+#define D_SENSOR_SDM120_RX     "SDMx20 Rx"
+#define D_SENSOR_SDM630_TX     "SDM630 Tx"
+#define D_SENSOR_SDM630_RX     "SDM630 Rx"
+#define D_SENSOR_TM1638_CLK    "TM16 CLK"
+#define D_SENSOR_TM1638_DIO    "TM16 DIO"
+#define D_SENSOR_TM1638_STB    "TM16 STB"
+#define D_SENSOR_HX711_SCK     "HX711 SCK"
+#define D_SENSOR_HX711_DAT     "HX711 DAT"
+#define D_SENSOR_TX2X_TX       "TX2x"
+#define D_SENSOR_RFSEND        "RFSend"
+#define D_SENSOR_RFRECV        "RFrecv"
+#define D_SENSOR_TUYA_TX       "Tuya Tx"
+#define D_SENSOR_TUYA_RX       "Tuya Rx"
+#define D_SENSOR_MGC3130_XFER  "MGC3130 Xfr"
+#define D_SENSOR_MGC3130_RESET "MGC3130 Rst"
+#define D_SENSOR_SSPI_MISO     "SSPI MISO"
+#define D_SENSOR_SSPI_MOSI     "SSPI MOSI"
+#define D_SENSOR_SSPI_SCLK     "SSPI SCLK"
+#define D_SENSOR_SSPI_CS       "SSPI CS"
+#define D_SENSOR_SSPI_DC       "SSPI DC"
+#define D_SENSOR_RF_SENSOR     "RF Sensor"
+#define D_SENSOR_AZ_RX         "AZ Rx"
+#define D_SENSOR_AZ_TX         "AZ Tx"
+#define D_SENSOR_MAX31855_CS   "MX31855 CS"
+#define D_SENSOR_MAX31855_CLK  "MX31855 CLK"
+#define D_SENSOR_MAX31855_DO   "MX31855 DO"
+#define D_SENSOR_NRG_SEL       "HLWBL SEL"  // Suffix "i"
+#define D_SENSOR_NRG_CF1       "HLWBL CF1"
+#define D_SENSOR_HLW_CF        "HLW8012 CF"
+#define D_SENSOR_HJL_CF        "BL0937 CF"
+#define D_SENSOR_MCP39F5_TX    "MCP39F5 Tx"
+#define D_SENSOR_MCP39F5_RX    "MCP39F5 Rx"
+#define D_SENSOR_MCP39F5_RST   "MCP39F5 Rst"
+#define D_SENSOR_CSE7766_TX    "CSE7766 Tx"
+#define D_SENSOR_CSE7766_RX    "CSE7766 Rx"
+#define D_SENSOR_PN532_TX      "PN532 Tx"
+#define D_SENSOR_PN532_RX      "PN532 Rx"
+#define D_SENSOR_SM16716_CLK   "SM16716 CLK"
+#define D_SENSOR_SM16716_DAT   "SM16716 DAT"
+#define D_SENSOR_SM16716_POWER "SM16716 PWR"
+#define D_SENSOR_MY92X1_DI     "MY92x1 DI"
+#define D_SENSOR_MY92X1_DCKI   "MY92x1 DCKI"
+#define D_SENSOR_ARIRFRCV      "ALux IrRcv"
+#define D_SENSOR_ARIRFSEL      "ALux IrSel"
+#define D_SENSOR_TXD           "Serial Tx"
+#define D_SENSOR_RXD           "Serial Rx"
+#define D_SENSOR_ROTARY        "Rotary"     // Suffix "1A"
+#define D_SENSOR_HRE_CLOCK     "HRE Clock"
+#define D_SENSOR_HRE_DATA      "HRE Data"
+#define D_SENSOR_ADE7953_IRQ   "ADE7953 IRQ"
+#define D_SENSOR_BUZZER        "Buzzer"
+#define D_SENSOR_OLED_RESET    "OLED Reset"
+#define D_SENSOR_ZIGBEE_TXD    "Zigbee Tx"
+#define D_SENSOR_ZIGBEE_RXD    "Zigbee Rx"
+#define D_SENSOR_SOLAXX1_TX    "SolaxX1 Tx"
+#define D_SENSOR_SOLAXX1_RX    "SolaxX1 Rx"
+#define D_SENSOR_IBEACON_TX    "iBeacon TX"
+#define D_SENSOR_IBEACON_RX    "iBeacon RX"
+#define D_SENSOR_RDM6300_RX    "RDM6300 RX"
+#define D_SENSOR_CC1101_CS     "CC1101 CS"
+#define D_SENSOR_A4988_DIR     "A4988 DIR"
+#define D_SENSOR_A4988_STP     "A4988 STP"
+#define D_SENSOR_A4988_ENA     "A4988 ENA"
+#define D_SENSOR_A4988_MS1     "A4988 MS1"
+#define D_SENSOR_A4988_MS2     "A4988 MS2"
+#define D_SENSOR_A4988_MS3     "A4988 MS3"
+#define D_SENSOR_DDS2382_TX    "DDS238-2 Tx"
+#define D_SENSOR_DDS2382_RX    "DDS238-2 Rx"
+#define D_SENSOR_DDSU666_TX    "DDSU666 Tx"
+#define D_SENSOR_DDSU666_RX    "DDSU666 Rx"
+#define D_SENSOR_SM2135_CLK    "SM2135 Clk"
+#define D_SENSOR_SM2135_DAT    "SM2135 Dat"
+#define D_SENSOR_DEEPSLEEP     "DeepSleep"
+#define D_SENSOR_EXS_ENABLE    "EXS Enable"
+#define D_SENSOR_SLAVE_TX    "Slave TX"
+#define D_SENSOR_SLAVE_RX    "Slave RX"
+#define D_SENSOR_SLAVE_RESET "Slave RST"
+#define D_SENSOR_GPS_RX        "GPS RX"
+#define D_SENSOR_GPS_TX        "GPS TX"
+#define D_SENSOR_HM10_RX       "HM10 RX"
+#define D_SENSOR_HM10_TX       "HM10 TX"
+#define D_SENSOR_LE01MR_RX     "LE-01MR Rx"
+#define D_SENSOR_LE01MR_TX     "LE-01MR Tx"
+#define D_SENSOR_CC1101_GDO0   "CC1101 GDO0"
+#define D_SENSOR_CC1101_GDO2   "CC1101 GDO2"
+#define D_SENSOR_HRXL_RX       "HRXL Rx"
+
+// Units
+#define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
+#define D_UNIT_HERTZ "Hz"
+#define D_UNIT_HOUR "h"
+#define D_UNIT_GALLONS "gal"
+#define D_UNIT_GALLONS_PER_MIN "g/m"
+#define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
+#define D_UNIT_KILOOHM "kΩ"
+#define D_UNIT_KILOWATTHOUR "kWh"
+#define D_UNIT_LUX "lx"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "µg/m³"
+#define D_UNIT_MICROMETER "µm"
+#define D_UNIT_MICROSECOND "µs"
+#define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
+#define D_UNIT_MILLIMETER_MERCURY "mmHg"
+#define D_UNIT_MILLISECOND "ms"
+#define D_UNIT_MINUTE "Min"
+#define D_UNIT_PARTS_PER_BILLION "ppb"
+#define D_UNIT_PARTS_PER_DECILITER "ppd"
+#define D_UNIT_PARTS_PER_MILLION "ppm"
+#define D_UNIT_PRESSURE "hPa"
+#define D_UNIT_SECOND "sec"
+#define D_UNIT_SECTORS "sectors"
+#define D_UNIT_VA "VA"
+#define D_UNIT_VAR "VAr"
+#define D_UNIT_VOLT "V"
+#define D_UNIT_WATT "W"
+#define D_UNIT_WATTHOUR "Wh"
+#define D_UNIT_WATT_METER_QUADRAT "W/m²"
+
+//SDM220, SDM120, LE01MR
+#define D_PHASE_ANGLE     "Unghi de fază"
+#define D_IMPORT_ACTIVE   "Import Activ"
+#define D_EXPORT_ACTIVE   "Export Activ"
+#define D_IMPORT_REACTIVE "Import Reactiv"
+#define D_EXPORT_REACTIVE "Export Reactiv"
+#define D_TOTAL_REACTIVE  "Total Reactiv"
+#define D_UNIT_KWARH      "kVArh"
+#define D_UNIT_ANGLE      "Deg"
+#define D_TOTAL_ACTIVE    "Total Activ"
+
+//SOLAXX1
+#define D_PV1_VOLTAGE     "PV1 Voltaj"
+#define D_PV1_CURRENT     "PV1 Curent"
+#define D_PV1_POWER       "PV1 Putere"
+#define D_PV2_VOLTAGE     "PV2 Voltaj"
+#define D_PV2_CURRENT     "PV2 Curent"
+#define D_PV2_POWER       "PV2 Putere"
+#define D_SOLAR_POWER     "Putere Solară"
+#define D_INVERTER_POWER  "Invertor Putere"
+#define D_STATUS          "Status"
+#define D_WAITING         "Așteptare"
+#define D_CHECKING        "Verificare"
+#define D_WORKING         "Lucrează"
+#define D_FAILURE         "Eroare"
+#define D_SOLAX_ERROR_0   "Fără cod de eroare"
+#define D_SOLAX_ERROR_1   "Eroare zona"
+#define D_SOLAX_ERROR_2   "Eroare zona voltaj"
+#define D_SOLAX_ERROR_3   "Eroare zona frecvență"
+#define D_SOLAX_ERROR_4   "Pv Eroare Voltaj"
+#define D_SOLAX_ERROR_5   "Eroare Isolație"
+#define D_SOLAX_ERROR_6   "Eroare temperatură ridicată"
+#define D_SOLAX_ERROR_7   "Eroare ventilator"
+#define D_SOLAX_ERROR_8   "Eroare alt echipament"
+
+//xdrv_10_scripter.ino
+#define D_CONFIGURE_SCRIPT     "Configurare script"
+#define D_SCRIPT               "editează script"
+#define D_SDCARD_UPLOAD        "Încarcă fișier"
+#define D_SDCARD_DIR           "director sd card"
+#define D_UPL_DONE             "Terminat"
+#define D_SCRIPT_CHARS_LEFT    "caractere rămase"
+#define D_SCRIPT_CHARS_NO_MORE "caractere terminate"
+#define D_SCRIPT_DOWNLOAD      "Descarcă"
+#define D_SCRIPT_ENABLE        "abilitează script"
+#define D_SCRIPT_UPLOAD        "Încarcă"
+#define D_SCRIPT_UPLOAD_FILES  "Încarcă fișiere"
+
+#endif  // _LANGUAGE_RO_RO_H_
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 77c0771ee..a62c6d191 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -326,6 +326,7 @@
 //#define MY_LANGUAGE            pl-PL           // Polish in Poland
 //#define MY_LANGUAGE            pt-BR           // Portuguese in Brazil
 //#define MY_LANGUAGE            pt-PT           // Portuguese in Portugal
+//#define MY_LANGUAGE            ro-RO           // Romanian in Romania
 //#define MY_LANGUAGE            ru-RU           // Russian in Russia
 //#define MY_LANGUAGE            sk-SK           // Slovak in Slovakia
 //#define MY_LANGUAGE            sv-SE           // Swedish in Sweden

From 46e6c3a7964d540c7c7b4a5db476e590e886c869 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 12:18:32 +0100
Subject: [PATCH 394/403] Fix RO compilation

---
 RELEASENOTES.md          | 1 +
 tasmota/CHANGELOG.md     | 1 +
 tasmota/language/ro-RO.h | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 38ba097b4..ceec8285b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -113,3 +113,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
 - Add support for Jarolift rollers by Keeloq algorithm
 - Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
+- Add support for Romanian language translations by Augustin Marti
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 4a30b6cad..f33d217bb 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add support for Jarolift rollers by Keeloq algorithm
 - Add Zigbee features and improvements and remove support for Zigbee commands starting with ``Zigbee...``
 - Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
+- Add support for Romanian language translations by Augustin Marti
 
 ### 8.1.0.9 20200220
 
diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h
index cc75273af..2db7cf4ba 100644
--- a/tasmota/language/ro-RO.h
+++ b/tasmota/language/ro-RO.h
@@ -1,7 +1,7 @@
 /*
   ro-RO.h - localization for Romanian - Romania and Moldova for Tasmota
 
-  Copyright (C) 2020  Theo Arends
+  Copyright (C) 2020  Augustin Marti
 
   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
@@ -76,7 +76,7 @@
 #define D_COUNTER "Contor"
 #define D_CT_POWER "Putere Transformată"
 #define D_CURRENT "Curent"          // As in Voltage and Current
-#define D_DA;TA "Date"
+#define D_DATA "Date"
 #define D_DARKLIGHT "Întunecat"
 #define D_DEBUG "Depanare"
 #define D_DISABLED "Dezactivat"
@@ -520,7 +520,7 @@
 #define D_SENSOR_SI7021        "SI7021"
 #define D_SENSOR_DS18X20       "DS18x20"
 #define D_SENSOR_I2C_SCL       "I2C SCL"
-#define D_SENSOR_I2C_SDA      ; "I2C SDA"
+#define D_SENSOR_I2C_SDA       "I2C SDA"
 #define D_SENSOR_WS2812        "WS2812"
 #define D_SENSOR_DFR562        "MP3 Player"
 #define D_SENSOR_IRSEND        "IRsend"

From 71e702c6594eeab81308bdfbc8b14dda906bdc59 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:36:37 +0100
Subject: [PATCH 395/403] Change minimal filename construction

---
 tasmota/support_tasmota.ino | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 43e73321d..fe0153f78 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -921,14 +921,17 @@ void Every250mSeconds(void)
             // Replace tasmota.xyz                                     with tasmota-minimal.xyz
             // Replace tasmota.bin.gz                                  with tasmota-minimal.bin.gz
             // Replace tasmota.xyz.gz                                  with tasmota-minimal.xyz.gz
+            // Replace tasmota.ino.bin                                 with tasmota-minimal.ino.bin
             // Replace http://domus1:80/api/arduino/tasmota.bin        with http://domus1:80/api/arduino/tasmota-minimal.bin
             // Replace http://domus1:80/api/arduino/tasmota.bin.gz     with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
             // Replace http://domus1:80/api/arduino/tasmota-DE.bin.gz  with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
             // Replace http://domus1:80/api/ard-uino/tasmota-DE.bin.gz with http://domus1:80/api/ard-uino/tasmota-minimal.bin.gz
+            // Replace http://192.168.2.17:80/api/arduino/tasmota.bin  with http://192.168.2.17:80/api/arduino/tasmota-minimal.bin
+            // Replace http://192.168.2.17/api/arduino/tasmota.bin.gz  with http://192.168.2.17/api/arduino/tasmota-minimal.bin.gz
 
             char *bch = strrchr(mqtt_data, '/');                       // Only consider filename after last backslash prevent change of urls having "-" in it
             if (bch == nullptr) { bch = mqtt_data; }                   // No path found so use filename only
-
+/*
             char *ech = strrchr(bch, '.');                             // Find file type in filename (none, .bin or .gz)
             if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
               char *fch = ech;
@@ -936,9 +939,14 @@ void Every250mSeconds(void)
               ech = strrchr(bch, '.');                                 // Find file type .bin.gz
               *fch = '.';
             }
+*/
+            char *ech = strchr(bch, '.');                              // Find file type in filename (none, .ino.bin, .ino.bin.gz, .bin, .bin.gz or .gz)
             if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
+
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: File type [%s]"), ech);
+
             char ota_url_type[strlen(ech) +1];
-            strncpy(ota_url_type, ech, sizeof(ota_url_type));          // Either empty, .bin or .bin.gz
+            strncpy(ota_url_type, ech, sizeof(ota_url_type));          // Either empty, .ino.bin, .ino.bin.gz, .bin, .bin.gz or .gz
 
             char *pch = strrchr(bch, '-');                             // Find last dash (-) and ignore remainder - handles tasmota-DE
             if (pch == nullptr) { pch = ech; }                         // No dash so ignore filetype

From 50b19712ac04ff32d2118c929a74be7431c2baa9 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:51:50 +0100
Subject: [PATCH 396/403] Fix DS1624 with KNX compilation error

Fix DS1624 with KNX compilation error (#7853)
---
 tasmota/xsns_59_ds1624.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/xsns_59_ds1624.ino b/tasmota/xsns_59_ds1624.ino
index be0bcf9e5..f3ffcd1f1 100644
--- a/tasmota/xsns_59_ds1624.ino
+++ b/tasmota/xsns_59_ds1624.ino
@@ -190,7 +190,7 @@ void DS1624Show(bool json)
         DomoticzSensor(DZ_TEMP, temperature);
 #endif  // USE_DOMOTICZ
 #ifdef USE_KNX
-        KnxSensor(KNX_TEMPERATURE, temperature);
+        KnxSensor(KNX_TEMPERATURE, ds1624_sns[i].value);
 #endif // USE_KNX
         once = false;
       }

From 74f1ad8a1beeb34a47fac3b3dc2a93f22aa3629e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 16:34:06 +0100
Subject: [PATCH 397/403] Fix APDS9960 compile error

---
 tasmota/xsns_27_apds9960.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasmota/xsns_27_apds9960.ino b/tasmota/xsns_27_apds9960.ino
index fe8f0ffec..c426d535a 100644
--- a/tasmota/xsns_27_apds9960.ino
+++ b/tasmota/xsns_27_apds9960.ino
@@ -240,7 +240,7 @@ const char HTTP_APDS_9960_SNS[] PROGMEM =
 #define DEFAULT_GCONF3          0       // All photodiodes active during gesture
 #define DEFAULT_GIEN            0       // Disable gesture interrupts
 
-#define ERROR                   0xFF
+#define APDS9960_ERROR          0xFF
 
 /* Direction definitions */
 enum {
@@ -1530,7 +1530,7 @@ int16_t readGesture(void)
                                                 (uint8_t*)fifo_data,
                                                 (fifo_level * 4) );
                 if( bytes_read == -1 ) {
-                    return ERROR;
+                    return APDS9960_ERROR;
                 }
 
                 /* If at least 1 set of data, sort the data into U/D/L/R */

From 0006d44e6304dc28534c560a97de94f5eacf2003 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 4 Mar 2020 18:02:27 +0100
Subject: [PATCH 398/403] Fix HASS button discovery

---
 tasmota/support_tasmota.ino        |  6 ++++--
 tasmota/xdrv_02_mqtt.ino           |  7 +++++++
 tasmota/xdrv_12_home_assistant.ino | 20 ++++++++++++--------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index fe0153f78..19f592a18 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -424,6 +424,7 @@ bool SendKey(uint32_t key, uint32_t device, uint32_t state)
   char scommand[CMDSZ];
   char key_topic[TOPSZ];
   bool result = false;
+  uint32_t device_save = device;
 
   char *tmp = (key) ? SettingsText(SET_MQTT_SWITCH_TOPIC) : SettingsText(SET_MQTT_BUTTON_TOPIC);
   Format(key_topic, tmp, sizeof(key_topic));
@@ -459,7 +460,7 @@ bool SendKey(uint32_t key, uint32_t device, uint32_t state)
     result = XdrvRulesProcess();
   }
   int32_t payload_save = XdrvMailbox.payload;
-  XdrvMailbox.payload = key << 16 | state << 8 | device;
+  XdrvMailbox.payload = device_save << 24 | key << 16 | state << 8 | device;
   XdrvCall(FUNC_ANY_KEY);
   XdrvMailbox.payload = payload_save;
   return result;
@@ -922,6 +923,7 @@ void Every250mSeconds(void)
             // Replace tasmota.bin.gz                                  with tasmota-minimal.bin.gz
             // Replace tasmota.xyz.gz                                  with tasmota-minimal.xyz.gz
             // Replace tasmota.ino.bin                                 with tasmota-minimal.ino.bin
+            // Replace tasmota.ino.bin.gz                              with tasmota-minimal.ino.bin.gz
             // Replace http://domus1:80/api/arduino/tasmota.bin        with http://domus1:80/api/arduino/tasmota-minimal.bin
             // Replace http://domus1:80/api/arduino/tasmota.bin.gz     with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
             // Replace http://domus1:80/api/arduino/tasmota-DE.bin.gz  with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
@@ -941,7 +943,7 @@ void Every250mSeconds(void)
             }
 */
             char *ech = strchr(bch, '.');                              // Find file type in filename (none, .ino.bin, .ino.bin.gz, .bin, .bin.gz or .gz)
-            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
+            if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }  // Point to '/0' at end of mqtt_data becoming an empty string
 
 //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("OTA: File type [%s]"), ech);
 
diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino
index b7bd00aa7..c766ab247 100644
--- a/tasmota/xdrv_02_mqtt.ino
+++ b/tasmota/xdrv_02_mqtt.ino
@@ -712,6 +712,13 @@ void MqttCheck(void)
   }
 }
 
+bool ButtonTopicActive(void)
+{
+  char key_topic[TOPSZ];
+  Format(key_topic, SettingsText(SET_MQTT_BUTTON_TOPIC), sizeof(key_topic));
+  return ((strlen(key_topic) != 0) && strcmp(key_topic, "0"));
+}
+
 /*********************************************************************************************\
  * Commands
 \*********************************************************************************************/
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index fde47a623..7da0ad380 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -53,9 +53,9 @@ const char HASS_DISCOVER_BASE[] PROGMEM =
     "\"pl_not_avail\":\"" D_OFFLINE "\"";        // Offline
 
 const char HASS_DISCOVER_RELAY[] PROGMEM =
-    ",\"cmd_t\":\"%s\","                         // cmnd/dualr2/POWER2	                           
-    "\"val_tpl\":\"{{value_json.%s}}\","         // POWER2	  
-    "\"pl_off\":\"%s\","                         // OFF	  
+    ",\"cmd_t\":\"%s\","                         // cmnd/dualr2/POWER2
+    "\"val_tpl\":\"{{value_json.%s}}\","         // POWER2
+    "\"pl_off\":\"%s\","                         // OFF
     "\"pl_on\":\"%s\"";                          // ON
 
 const char HASS_DISCOVER_BUTTON_TOGGLE[] PROGMEM =
@@ -368,7 +368,7 @@ void HAssAnnounceSensor(const char *sensorname, const char *subsensortype, const
   char unique_id[30];
 
   mqtt_data[0] = '\0'; // Clear retained message
-  // Clear or Set topic  
+  // Clear or Set topic
   char subname[20];
   NoAlNumToUnderscore(subname, MultiSubName); //Replace all non alphaumeric characters to '_' to avoid topic name issues
   snprintf_P(unique_id, sizeof(unique_id), PSTR("%06X_%s_%s"), ESP.getChipId(), sensorname, subname);
@@ -504,7 +504,7 @@ void HAssAnnounceStatusSensor(void)
     TryResponseAppend_P(HASS_DISCOVER_SENSOR_HASS_STATUS, state_topic);
     TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO, unique_id, ESP.getChipId(), WiFi.macAddress().c_str(),
                         SettingsText(SET_FRIENDLYNAME1), ModuleName().c_str(), my_version, my_image);
-  
+
     TryResponseAppend_P(PSTR("}"));
   }
   MqttPublish(stopic, true);
@@ -568,9 +568,13 @@ void HAssAnyKey(void)
     return;
   } // SetOption19 - Control Home Assistantautomatic discovery (See SetOption59)
 
-  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;
-  uint32_t device = XdrvMailbox.payload & 0xFF;
-  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;
+  uint32_t key = (XdrvMailbox.payload >> 16) & 0xFF;   // 0 = Button, 1 = Switch
+  uint32_t device = XdrvMailbox.payload & 0xFF;        // Device number or 1 if more Buttons than Devices
+  uint32_t state = (XdrvMailbox.payload >> 8) & 0xFF;  // 0 = Off, 1 = On, 2 = Toggle
+
+  if (!key && ButtonTopicActive()) {                   // Button and ButtonTopic is active
+    device = (XdrvMailbox.payload >> 24) & 0xFF;       // Button number
+  }
 
   char scommand[CMDSZ];
   snprintf_P(scommand, sizeof(scommand), PSTR("%s%d"), (key) ? "SWITCH" : "BUTTON", device);

From 8855d2a2185ce507a58857d94f96eab29d636cf2 Mon Sep 17 00:00:00 2001
From: Hadinger <hadinger@f45c89a46965.ant.amazon.com>
Date: Wed, 4 Mar 2020 21:00:57 +0100
Subject: [PATCH 399/403] Add Zigbee use distinct MQTT topics per device for
 SENSOR, allowing retained messages (#7835)

---
 tasmota/CHANGELOG.md                 |  1 +
 tasmota/settings.h                   |  2 +-
 tasmota/xdrv_23_zigbee_3_devices.ino | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index f33d217bb..b1d84e701 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Add Zigbee features and improvements and remove support for Zigbee commands starting with ``Zigbee...``
 - Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
 - Add support for Romanian language translations by Augustin Marti
+- Add Zigbee use distinct MQTT topics per device for SENSOR, allowing retained messages (#7835)
 
 ### 8.1.0.9 20200220
 
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 37734b32a..673758890 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -108,7 +108,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t led_timeout : 1;              // bit 4 (v8.1.0.9)   - SetOption86 - PWM Dimmer Turn brightness LED's off 5 seconds after last change
     uint32_t powered_off_led : 1;          // bit 5 (v8.1.0.9)   - SetOption87 - PWM Dimmer Turn red LED on when powered off
     uint32_t remote_device_mode : 1;       // bit 6 (v8.1.0.9)   - SetOption88 - PWM Dimmer Buttons control remote devices
-    uint32_t spare07 : 1;
+    uint32_t zigbee_distinct_topics : 1;   // bit 7 (v8.1.0.10)  - SetOption89 - Distinct MQTT topics per device for Zigbee (#7835)
     uint32_t spare08 : 1;
     uint32_t spare09 : 1;
     uint32_t spare10 : 1;
diff --git a/tasmota/xdrv_23_zigbee_3_devices.ino b/tasmota/xdrv_23_zigbee_3_devices.ino
index d814a8c0c..121961eda 100644
--- a/tasmota/xdrv_23_zigbee_3_devices.ino
+++ b/tasmota/xdrv_23_zigbee_3_devices.ino
@@ -758,13 +758,17 @@ void Z_Devices::jsonPublishFlush(uint16_t shortaddr) {
 
   if (use_fname) {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"%s\":%s}}"), fname->c_str(), msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
   } else {
     Response_P(PSTR("{\"" D_JSON_ZIGBEE_RECEIVED "\":{\"0x%04X\":%s}}"), shortaddr, msg.c_str());
-    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR));
-    XdrvRulesProcess();
   }
+  if (Settings.flag4.zigbee_distinct_topics) {
+    char subtopic[16];
+    snprintf_P(subtopic, sizeof(subtopic), PSTR("%04X/" D_RSLT_SENSOR), shortaddr);
+    MqttPublishPrefixTopic_P(TELE, subtopic, Settings.flag.mqtt_sensor_retain);
+  } else {
+    MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
+  }
+  XdrvRulesProcess();
 }
 
 void Z_Devices::jsonPublishNow(uint16_t shortaddr, JsonObject & values) {

From a8e369e5cefd09847f01a3fac5be2356e8844a97 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 5 Mar 2020 14:00:47 +0100
Subject: [PATCH 400/403] Update feature information

---
 RELEASENOTES.md              | 8 ++++++--
 tasmota/CHANGELOG.md         | 7 +++++--
 tasmota/support_features.ino | 2 +-
 tools/decode-status.py       | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ceec8285b..da7f0cf31 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -78,7 +78,12 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix relation between RSSI and signal strength
 - Add command ``SetOption79 0/1`` to enable reset of counters at teleperiod time by Andre Thomas (#7355)
 - Add command ``SetOption82 0/1`` to limit the CT range for Alexa to 200..380
-- Add command ``SetOption84 1`` to send AWS IoT device shadow updates (alternative to retained)
+- Add command ``SetOption84 0/1`` to send AWS IoT device shadow updates (alternative to retained)
+- Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
+- Add command ``SetOption86 0/1`` for PWM dimmer to turn brightness LED's off 5 seconds after last change
+- Add command ``SetOption87 0/1`` for PWM dimmer to turn red LED on when powered off
+- Add command ``SetOption88 0/1`` for PWM dimmer to let buttons control remote devices
+- Add command ``SetOption89 0/1`` for Zigbee distinct MQTT topics per device for SENSOR, allowing retained messages (#7835)
 - Add command ``ShutterButton <parameters>`` to control shutter(s) by to-scho (#7403)
 - Add commands ``SwitchMode 8`` ToggleMulti, ``SwitchMode 9`` FollowMulti and ``SwitchMode 10`` FollowMultiInverted (#7522)
 - Add commands ``SwitchMode 11`` PushHoldMulti and ``SwitchMode 12`` PushHoldInverted (#7603)
@@ -109,7 +114,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add support for Wemos Motor Shield V1 by Denis Sborets (#7764)
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
 - Add Zigbee features and improvements
-- Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
 - Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
 - Add support for Jarolift rollers by Keeloq algorithm
 - Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index b1d84e701..90f2a711a 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -9,7 +9,7 @@
 - Add Zigbee features and improvements and remove support for Zigbee commands starting with ``Zigbee...``
 - Add support for MaxBotix HRXL-MaxSonar ultrasonic range finders by Jon Little (#7814)
 - Add support for Romanian language translations by Augustin Marti
-- Add Zigbee use distinct MQTT topics per device for SENSOR, allowing retained messages (#7835)
+- Add command ``SetOption89 0/1`` for Zigbee distinct MQTT topics per device for SENSOR, allowing retained messages (#7835)
 
 ### 8.1.0.9 20200220
 
@@ -20,6 +20,9 @@
 - Add Zigbee enhanced commands decoding, added ``ZbPing``
 - Add commands ``SetOption85 0/1`` and ``DevGroupShare`` supporting UDP Group command using ``GroupTopic`` without MQTT by Paul Diem (#7790)
 - Add support for Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM dimmer switches by Paul Diem (#7791)
+- Add command ``SetOption86 0/1`` for PWM dimmer to turn brightness LED's off 5 seconds after last change
+- Add command ``SetOption87 0/1`` for PWM dimmer to turn red LED on when powered off
+- Add command ``SetOption88 0/1`` for PWM dimmer to let buttons control remote devices
 
 ### 8.1.0.8 20200212
 
@@ -52,7 +55,7 @@
 - Change wifi connectivity stability (#7602)
 - Change IRremoteESP8266 library updated to v2.7.3
 - Fix PWM flickering at low levels (#7415)
-- Add ``SetOption84 1`` sends AWS IoT device shadow updates (alternative to retained)
+- Add ``SetOption84 0/1`` sends AWS IoT device shadow updates (alternative to retained)
 - Add ``ZbBind`` (experimental) and bug fixes
 
 ### 8.1.0.4 20200116
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 4049d9cfe..961dd1091 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -537,7 +537,7 @@ void GetFeatures(void)
   feature6 |= 0x00000002;  // xsns_64_hrxl.ino
 #endif
 #ifdef USE_SONOFF_D1
-  feature6 |= 0x00000004;
+  feature6 |= 0x00000004;  // xdrv_37_sonoff_d1.ino
 #endif
 //  feature6 |= 0x00000008;
 
diff --git a/tools/decode-status.py b/tools/decode-status.py
index 6c5dd6a5b..fe80630cc 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -143,7 +143,7 @@ a_setoption = [[
     "PWM Dimmer Turn brightness LED's off 5 seconds after last change",
     "PWM Dimmer Turn red LED on when powered off",
     "PWM Dimmer Buttons control remote devices",
-    "",
+    "Distinct MQTT topics per device for Zigbee",
     "","","","",
     "","","","",
     "","","","",
@@ -239,7 +239,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20200301 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20200305 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))
 

From f4047b43379a290373a3fa08321ae8fe0e1b4772 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 5 Mar 2020 14:53:51 +0100
Subject: [PATCH 401/403] Fix GUI channel offset

Fix GUI channel offset when relays are present (#7855)
---
 tasmota/xdrv_01_webserver.ino | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 6bc4d2b16..31398f60d 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1274,12 +1274,13 @@ bool HandleRootStatusRefresh(void)
     snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_WHITE " %s"), tmp);
     ExecuteWebCommand(svalue, SRC_WEBGUI);
   }
+  uint32_t light_device = LightDevice();  // Channel number offset
   uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7);
-  for (uint32_t j = 1; j <= pwm_channels; j++) {
-    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j);
+  for (uint32_t j = 0; j < pwm_channels; j++) {
+    snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j +1);
     WebGetArg(webindex, tmp, sizeof(tmp));  // 0 - 100 percent
     if (strlen(tmp)) {
-      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp);
+      snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j +light_device, tmp);
       ExecuteWebCommand(svalue, SRC_WEBGUI);
     }
   }

From c52680f836c948c3dd42140076af13aace5c2f9e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 5 Mar 2020 18:45:43 +0100
Subject: [PATCH 402/403] Fix -minimal compile error

---
 tasmota/xdrv_01_webserver.ino | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
index 31398f60d..2dff240ad 100644
--- a/tasmota/xdrv_01_webserver.ino
+++ b/tasmota/xdrv_01_webserver.ino
@@ -1264,6 +1264,7 @@ bool HandleRootStatusRefresh(void)
     }
 #endif  // USE_SONOFF_IFAN
   }
+#ifdef USE_LIGHT
   WebGetArg("d0", tmp, sizeof(tmp));  // 0 - 100 Dimmer value
   if (strlen(tmp)) {
     snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp);
@@ -1299,6 +1300,7 @@ bool HandleRootStatusRefresh(void)
     snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR  "2 %s"), tmp);
     ExecuteWebCommand(svalue, SRC_WEBGUI);
   }
+#endif  // USE_LIGHT
 #ifdef USE_SHUTTER
   for (uint32_t j = 1; j <= shutters_present; j++) {
     snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j);

From d16f1a7a0fe44851bc7dd937b6d94f10979ef455 Mon Sep 17 00:00:00 2001
From: Paul C Diem <PCDiem@FoxValley.net>
Date: Thu, 5 Mar 2020 17:51:22 -0600
Subject: [PATCH 403/403] Add Light skip_light_fade flag and Dimmer3 command,
 Ignore MCU dimmer changes after sending dimmer command

---
 tasmota/support_device_groups.ino |  9 ++-------
 tasmota/tasmota.ino               |  1 +
 tasmota/xdrv_04_light.ino         | 19 +++++++++++++++++--
 tasmota/xdrv_16_tuyamcu.ino       | 17 +++++++++++------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/tasmota/support_device_groups.ino b/tasmota/support_device_groups.ino
index 01404b1cb..b6df25606 100644
--- a/tasmota/support_device_groups.ino
+++ b/tasmota/support_device_groups.ino
@@ -511,9 +511,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
   */
   XdrvMailbox.command = nullptr;  // Indicates the source is a device group update
   XdrvMailbox.index = flags | device_group_index << 16;
-
-  light_fade = Settings.light_fade;
-  if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) Settings.light_fade = false;
+  if (flags & (DGR_FLAG_MORE_TO_COME | DGR_FLAG_DIRECT)) skip_light_fade = true;
 
   for (;;) {
     if (packet_length - (message_ptr - packet) < 1) goto badmsg;  // Malformed message
@@ -549,9 +547,6 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
           value |= *message_ptr++ << 24;
         }
       }
-      else if (item == DGR_ITEM_LIGHT_FADE) {
-        light_fade = value;
-      }
 #ifdef DEVICE_GROUPS_DEBUG
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("<item=%u, value=%u"), item, value);
 #endif  // DEVICE_GROUPS_DEBUG
@@ -595,7 +590,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
 
   XdrvMailbox.command_code = DGR_ITEM_EOL;
   XdrvCall(FUNC_DEVICE_GROUP_REQUEST);
-  Settings.light_fade = light_fade;
+  skip_light_fade = false;
 
   processing_remote_device_message = false;
 #ifdef DEVICE_GROUPS_DEBUG
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 08d5fcd95..6572be777 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -159,6 +159,7 @@ bool spi_flg = false;                       // SPI configured
 bool soft_spi_flg = false;                  // Software SPI configured
 bool ntp_force_sync = false;                // Force NTP sync
 bool is_8285 = false;                       // Hardware device ESP8266EX (0) or ESP8285 (1)
+bool skip_light_fade;                       // Temporarily skip light fading
 myio my_module;                             // Active copy of Module GPIOs (17 x 8 bits)
 gpio_flag my_module_flag;                   // Active copy of Template GPIO flags
 StateBitfield global_state;                 // Global states (currently Wifi and Mqtt) (8 bits)
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index fc684f5f7..4c331b273 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1832,7 +1832,7 @@ void LightAnimate(void)
         cur_col_10[i] = orig_col_10bits[Light.color_remap[i]];
       }
 
-      if (!Settings.light_fade || power_off || (!Light.fade_initialized)) { // no fade
+      if (!Settings.light_fade || skip_light_fade || power_off || (!Light.fade_initialized)) { // no fade
         // record the current value for a future Fade
         memcpy(Light.fade_start_10, cur_col_10, sizeof(Light.fade_start_10));
         // push the final values at 8 and 10 bits resolution to the PWMs
@@ -2149,6 +2149,12 @@ void LightHandleDeviceGroupRequest()
         send_state = true;
       }
       break;
+    case DGR_ITEM_LIGHT_FADE:
+      if (Settings.light_fade != value) {
+        Settings.light_fade = value;
+        send_state = true;
+      }
+      break;
     case DGR_ITEM_LIGHT_SPEED:
       if (Settings.light_speed != value && value > 0 && value <= 40) {
         Settings.light_speed = value;
@@ -2488,10 +2494,17 @@ void CmndDimmer(void)
   // Dimmer0 0..100 - Change both RGB and W(W) Dimmers
   // Dimmer1 0..100 - Change RGB Dimmer
   // Dimmer2 0..100 - Change W(W) Dimmer
+  // Dimmer3 0..100 - Change both RGB and W(W) Dimmers with no fading
   // Dimmer<x> +    - Incerement Dimmer in steps of 10
   // Dimmer<x> -    - Decrement Dimmer in steps of 10
   uint32_t dimmer;
-  if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
+  if (XdrvMailbox.index == 3) {
+    skip_light_fade = true;
+    XdrvMailbox.index = 0;
+  }
+  else if (XdrvMailbox.index > 2) {
+    XdrvMailbox.index = 1;
+  }
 
   if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
     dimmer = light_state.getDimmer();
@@ -2524,9 +2537,11 @@ void CmndDimmer(void)
       }
     }
     Light.update = true;
+    if (skip_light_fade) LightAnimate();
   } else {
     ResponseCmndNumber(dimmer);
   }
+  skip_light_fade = false;
 }
 
 #endif  // USE_LIGHT
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index f250f6409..466c3faf1 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -68,6 +68,7 @@ struct TUYA {
   int byte_counter = 0;                  // Index in serial receive buffer
   bool low_power_mode = false;           // Normal or Low power mode protocol
   bool send_success_next_second = false; // Second command success in low power mode
+  uint32_t ignore_dimmer_cmd_timeout = 0;// Time until which received dimmer commands should be ignored
 } Tuya;
 
 
@@ -366,6 +367,7 @@ bool TuyaSetPower(void)
 
   if (source != SRC_SWITCH && TuyaSerial) {  // ignore to prevent loop from pushing state from faceplate interaction
     TuyaSendBool(dpid, bitRead(rpower, active_device-1) ^ bitRead(rel_inverted, active_device-1));
+    delay(20); // Hack when power is off and dimmer is set then both commands go too soon to Serial out.
     status = true;
   }
   return status;
@@ -374,7 +376,7 @@ bool TuyaSetPower(void)
 bool TuyaSetChannels(void)
 {
   LightSerialDuty(((uint8_t*)XdrvMailbox.data)[0]);
-  delay(20); // Hack when power is off and dimmer is set then both commands go too soon to Serial out.
+  //delay(20); // Hack when power is off and dimmer is set then both commands go too soon to Serial out.
   return true;
 }
 
@@ -386,6 +388,7 @@ void LightSerialDuty(uint16_t duty)
     if (duty < Settings.dimmer_hw_min) { duty = Settings.dimmer_hw_min; }  // dimming acts odd below 25(10%) - this mirrors the threshold set on the faceplate itself
     if (Tuya.new_dim != duty) {
       AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim value=%d (id=%d)"), duty, dpid);
+      Tuya.ignore_dimmer_cmd_timeout = millis() + 250; // Ignore serial received dim commands for the next 250ms
       TuyaSendValue(dpid, duty);
     }
   } else if (dpid > 0) {
@@ -456,12 +459,14 @@ void TuyaProcessStatePacket(void) {
         if (fnId == TUYA_MCU_FUNC_DIMMER) {
           AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Dim State=%d"), packetValue);
           Tuya.new_dim = changeUIntScale(packetValue, 0, Settings.dimmer_hw_max, 0, 100);
-          if ((power || Settings.flag3.tuya_apply_o20) &&  // SetOption54 - Apply SetOption20 settings to Tuya device
-              (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
-            Tuya.ignore_dim = true;
+          if (Tuya.ignore_dimmer_cmd_timeout < millis()) {
+            if ((power || Settings.flag3.tuya_apply_o20) &&  // SetOption54 - Apply SetOption20 settings to Tuya device
+                (Tuya.new_dim > 0) && (abs(Tuya.new_dim - Settings.light_dimmer) > 1)) {
+              Tuya.ignore_dim = true;
 
-            snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER " %d"), Tuya.new_dim );
-            ExecuteCommand(scmnd, SRC_SWITCH);
+              snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER "3 %d"), Tuya.new_dim );
+              ExecuteCommand(scmnd, SRC_SWITCH);
+            }
           }
         }